Development branch for TIPs 22 and 33 kennykb_tip_22_33_botched

743 files changed, 0 insertions, 393637 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index b9d5dc4..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,991 +0,0 @@
-1999-04-15    <stanton@scriptics.com>
-
-	* Merged 8.1 back into the main trunk
-
-1999-04-13    <stanton@scriptics.com>
-
-	* library/encoding/gb2312.enc:
-	* library/encoding/euc-cn.enc:
-	* tools/encoding/gb2312.txt:
-	* tools/encoding/cp950.txt:
-	* tools/encoding/Makefile: Restored the double byte definition of
-	GB2312 and added the EUC-CN encoding.  EUC-CN is a variant of
-	GB2312 that shifts the characters into bytes with the high bit set
-	and includes ASCII as a subset. [Bug: 632]
-
-1999-04-13    <redman@scriptics.com>
-
-	* win/tclWinSock.c: Apply patch to allow write access to a socket
-	if FD_WRITE is sent but FD_CONNECT is not.  Some strange problem
-	with either Win32 or a socket driver.  [Bug: 1664 1776]
-
-1999-04-09    <redman@scriptics.com>
-
-	* unix/tclUnixNotfy.c: Fixed notifier deadlock situation when the
-	pipe used to talk back notifier thread is filled with data.  When
-	calling the write() function to feed data down that pipe, unlock
-	the notifierMutex to allow the notifier to wake up again.  Found
-	as a result of the focus.test for Tk hanging. [Bug: 1700]
-
-1999-04-06    <stanton@scriptics.com>
-
-	* tests/unixNotfy.test: Fixed hang in tests when built with thread
-	support. 
-
-	* tests/httpold.test: Fixed broken test that didn't wait long
-	enough for events to arrive.
-
-	* tests/unixInit.test: Fixed race condition in test.
-	
-	* tests/unixInit.test: 
-	* tests/fileName.test: Minor test nits.
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): Fixed bad initial
-	encoding string.
-
-1999-04-06    <surles@scriptics.com>
-
-	* generic/tclVar.c: 
-	* generic/tclEnv.c: Moved the "array set" C level code into a
-	common routine (TclArraySet).  The TclSetupEnv routine now uses
-	this API to create an env array w/ no elements.
-
-	* generic/tclEnv.c:
-	* generic/tclWinInit.h:
-	* generic/tclUnixInit.h:
-	* generic/tclInt.h: Made the Env module I18N compliant.  Changed the
-	FindVariable routine to TclpFindVariable, that now does a case
-	insensitive string comparison on Windows, and not on UNIX. [Bug:
-	1299, 1500]
-
-1999-04-05    <stanton@scriptics.com>
-
-	* tests/io.test: Minor test cleanup.
-
-	* generic/tclEncoding.c (Tcl_CreateEncoding): Minor lint to make
-	it easier to compile on Digital-unix. [Bug: 1659]
-
-	* unix/configure.in: 
-	* unix/tclUnixPort.h: Applied patch for OS/390 to handle lack of
-	sys/param.h. [Bug: 1725]
-
-	* unix/configure.in: Fixed BSD/OS 4.* configuration to support
-	shared libraries properly. [Bug: 1730]
-	
-1999-04-05    <redman@scriptics.com>
-
-	* win/tclWinDde.c: decrease timeout value for DDE calls to 30k
-	[Bug: 1639]
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h:
-	* generic/tclIntDecls.h:
-	* generic/tclStubInit.c:
-	* generic/tclUtil.c: Added more functions to the Tcl stubs table,
-	including all Tcl_ functions not already in it (except Cmd
-	functions) and Tcl_GetCwd() and Tcl_Chdir() (new functions).
-	
-	* tests/safe.test:
-	* doc/safe.n:
-	* generic/tclBasic.c:
-	* library/safe.tcl: The encoding command is not safe as-is, so
-	create a safe alias to mask out the "encoding system <name>" but
-	allow all other uses including "encoding system". Added test cases
-	and updated the man page for Safe Tcl.
-
-1999-04-05    <stanton@scriptics.com>
-
-	* tests/winTime.test: 
-	* win/tclWinTime.c: Fixed crash in clock command that occurred
-	when manipulating negative time values in timezones east of
-	GMT. [Bug: 1142, 1458]
-	
-	* tests/platform.test: 
-	* tests/fileName.test: Fixed broken tests.
-	
-	* generic/tclFileName.c: Moved global regexps into thread local
-	storage.
-
-	* tests/socket.test: Changed so tests don't reuse sockets,
-	since Windows is slow to release sockets.
-
-	* win/tclWinConsole.c: 
-	* win/tclWinPipe.c: 
-	* win/tclWinSerial.c: Fixed race condition where background
-	threads were terminated while they still held a lock in the
-	notifier. 
-
-1999-04-02    <stanton@scriptics.com>
-
-	* tests/http.test: Fixed bad test initialization code.
-
-	* generic/tclThreadTest.c (ThreadExitProc): Fixed bug where static
-	memory was being returned instead of a dynamically allocated
-	result in error cases.
-
-1999-04-02    <redman@scriptics.com>
-
-	* doc/dde.n:
-	* tools/tcl.wse.in:
-	* win/makefile.vc:
-	* win/pkgIndex.tcl:
-	* win/tclWinDde.c:  Add new DDE package, code removed from Tk now
-	separated into its own package.  Changed DDE-based send code into
-	"dde eval" command.  Can be loaded into tclsh (not just wish).
-	Windows only.
-
-1999-04-02    <stanton@scriptics.com>
-
-	* tests/expr.test: 
-	* tests/for-old.test: 
-	* tests/for.test: 
-	* tests/foreach.test: 
-	* tests/format.test: 
-	* tests/httpold.test: 
-	* tests/if.test: 
-	* tests/init.test: 
-	* tests/interp.test: 
-	* tests/while.test:  Added some tests for known bugs (marked with
-	knownBug constraint), and cleaned up a few bad tests.
-
-	* generic/regc_locale.c: 
-	* generic/regcustom.h: 
-	* generic/tcl.decls: 
-	* generic/tclCmdIL.c: 
-	* generic/tclCmdMZ.c: 
-	* generic/tclInt.h: 
-	* generic/tclRegexp.c: 
-	* generic/tclScan.c: 
-	* generic/tclTest.c:
-	* generic/tclUtf.c: 
-	* win/tclWinFCmd.c: 
-	* win/tclWinFile.c: Made various Unicode utility functions
-	public. The following functions were made public and added to the
-	stubs table: 
-		Tcl_UtfToUniCharDString, Tcl_UniCharToUtfDString,
-		Tcl_UniCharLen, Tcl_UniCharNcmp, Tcl_UniCharIsAlnum,
-		Tcl_UniCharIsAlpha, Tcl_UniCharIsDigit, Tcl_UniCharIsLower,
-		Tcl_UniCharIsSpace, Tcl_UniCharIsUpper, Tcl_UniCharIsWordChar
-
-1999-04-01    <stanton@scriptics.com>
-
-	* tests/registry.test: 
-	* win/tclWinReg.c: Internationalized the registry code.  It now
-	uses Unicode interfaces on NT. [Bug: 1197]
-
-	* tests/parse.test: 
-	* generic/tclParse.c: Fixed crash due to multiple frees in parser
-	during error cleanup when parsing commands with more tokens than
-	will fit in the static area of the parse structure. [Bug: 1681]
-
-	* generic/tclInt.h: Removed duplicate declarations.
-
-	* generic/tclInt.decls: 
-	* generic/tcl.decls: Added Tcl_WinUtfToTChar and Tcl_WinTCharToUtf
-	to the tclPlat table.
-
-1999-04-01    <redman@scriptics.com>
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/StubInit.c:
-	* tools/genStubs.tcl:
-	* unix/Makefile.in:
-	* win/makefile.vc: Applied patch from Jan Nijtmans to fix Ultrix
-	multiple symbol definition problem.  Now, even Tcl includes a copy
-	of the Tcl stub library.  Also fixed TCL_MEM_DEBUG mode (for Tk).
-
-1999-03-31    <redman@scriptics.com>
-
-	* win/tclWinConsole.c: WinNT has a bug when reading a single
-	character from the console.  Rewrote the code for the console to
-	read an entire line at a time using the reader thread.
-
-1999-03-30    <stanton@scriptics.com>
-
-	* unix/Makefile.in: Removed trailing backslash that broke the
-	"depend" target.
-
-	* unix/tclUnixInit.c (TclpSetInitialEncodings): Changed to avoid
-	calling setlocale().  We now look directly at env(LANG) and
-	env(LC_CTYPE) instead. [Bug: 1636]
-
-	* generic/tclFileName.c: 
-	* generic/tclDecls.h: 
-	* generic/tcl.decls: Removed CONST from Tcl_JoinPath and
-	Tcl_TranslateFileName because it changes the signature of
-	Tcl_JoinPath in an incompatible manner.
-
-	* generic/tclInt.h: 
-	* generic/tclLoad.c (TclFinalizeLoad): 
-	* generic/tclEvent.c (Tcl_Finalize): Defer unloading of loadable
-	modules until all exit handlers have been invoked.
-	[Bug: 998, 1273, 1573, 1593]
-
-1999-03-29    <stanton@scriptics.com>
-
-	* generic/tclFileName.c: 
-	* generic/tclDecls.h: 
-	* generic/tcl.decls: Added CONST to Tcl_JoinPath and
-	Tcl_TranslateFileName.
-
-1999-03-29    <redman@scriptics.com>
-
-	* tools/genStubs.tcl:
-	* unix/configure.in:
-	* unix/Makefile.in:
-	* win/makefile.vc:
-	* generic/tcl.h:
-	* generic/tclBasic.c:
-	* generic/tclDecls.h:
-	* generic/tclIntDecls.h:
-	* generic/tclPlatDecls.h:
-	* generic/tclIntPlatDecls.h: Removed the stub functions and
-	changed the stub macros to just use the name without params. Pass
-	&tclStubs into the interp (don't use tclStubsPtr because of
-	collisions with the stubs on Solaris).
-	
-1999-03-27    <redman@scriptics.com>
-
-	* win/makefile.bc: Removed makefile for Borland compiler, no
-	longer supported.
-
-1999-03-26    <redman@scriptics.com>
-
-	* win/tclWinSerial.c:
-	* win/tclWinConsole.c:
-	* win/tclWinPipe.c: Don't close the Win32 handle for a channel if
-	it's a stdio handle (GetStdHandle()) during shutdown of a thread
-	to prevent it from destroying the stdio of other threads.
-
-1999-03-26    <suresh@scriptics.com>
-
-	* unix/configure.in
-	--nameble-shared is now the default and build Tcl as a shared
-	library; specify --disable-shared to build a static Tcl library
-	and shell.
-
-1999-03-25    <stanton@scriptics.com>
-
-	* tests/interp.test: 
-	* generic/tclInterp.c (AliasObjCmd): Changed so aliases are
-	invoked at current scope in the target interpreter instead of at
-	the global scope.  This was an incompatibility introduced in 8.1
-	that is being removed. [Bug: 1153, 1556]
-	
-	* library/encoding/big5.enc:
-	* library/encoding/gb2312.enc:
-	* tools/encoding/big5.enc:
-	* tools/encoding/gb2312.enc: Added ASCII to big5 and gb2312
-	encodings. [Bug: 632]
-	
-	* generic/tclPkg.c (Tcl_PkgRequireEx): Fixed broken clientData
-	initialization in package code.
-
-	* unix/Makefile.in (dist): Added tcl.decls and tclInt.decls to
-	source distribution. [Bug: 1571]
-
-	* doc/Thread.3: Updated documentation of Tcl_MutexLock to indicate
-	that the recursive locking behavior is undefined.  On Windows, it
-	does not block, on Unix it deadlocks. [Bug: 1275]
-
-1999-03-24    <stanton@scriptics.com>
-
-	* tests/execute.test: 
-	* generic/tclExecute.c (TclExecuteByteCode): Fixed expression code
-	that incorrectly returned floating point values for integers if
-	the internal rep happened to be a double.  Now we check to see if
-	the object has a string rep that looks like an integer before
-	using the double internal rep. [Bug: 1516]
-
-1999-03-24    <redman@scriptics.com>
-
-	* generic/tclAlloc.c:
-	* generic/tclEncoding.c:
-	* generic/tclProc.c:
-	* unix/tclUnixTime.c:
-	* win/tclWinSerial.c: Fixed compilation warnings/errors for VC++
-	5.0 and 6.0 and HP-UX native compiler without -Aa or -Ae. 
-	[Bug: 1323 1518 1324 1583 1585 1586]
-
-	* win/tclWinSock.c: Make sockets thread-safe on Windows. The
-	current implementation uses windows to handle events on the
-	socket, one for each thread (thread local storage). Previously,
-	there was only one window shared between threads, which didn't
-	work. [Bug: 1326]
-
-1999-03-23    <stanton@scriptics.com>
-
-	* tools/tcl.wse: Fixed file association to look in the right place
-	for the wish icon. [Bug: 1544]
-
-	* tests/winNotify.test: 
-	* tests/ioCmd.test: 
-	* tests/event.test: Changed to use new style conditionals.
-
-	* tests/encoding.test: Fixed nonportable test.
-
-	* unix/dltest/configure.in: 
-	* unix/dltest/Makefile.in: Added missing DBGX macros. [Bug: 1564]
-
-	* tests/winNotify.test: 
-	* mac/tclMacNotify.c: 
-	* win/tclWinNotify.c: 
-	* unix/tclUnixNotfy.c:
-	* generic/tclNotify.c: Added a new Tcl_ServiceModeHook interface
-	that is invoked whenever the service mode changes.  This is needed
-	to allow the Windows notifier to create a communication window the
-	first time Tcl is about to enter an external modal event loop
-	instead of at startup time.  This will avoid the various problems
-	that people have been seeing where the system hangs when tclsh
-	is running outside of the event loop. [Bug: 783]
-
-	* generic/tclInt.h: 
-	* generic/tcl.decls: Renamed TclpAlertNotifier back to
-	Tcl_AlertNotifier since it is part of the public notifier driver
-	API.
-
-1999-03-23    <redman@scriptics.com>
-
-	* win/tclWinSerial.c: Fixed problem with fileevent on the serial
-	port and nonblocking mode.  Gets no longer hangs, fileevents fire
-	whenever there is any character data on the port.
-	
-	* tests/winConsole.test:
-	* win/tclWinConsole.c: Fixed problem with fileevents and gets from
-	a console stdin.  Previously, fileevents were firing before an
-	entire line was available for reading, which meant that when you
-	did a gets or read, it blocked (even in nonblocking mode). Now, it
-	should work the same as Unix: fileevents fire when an entire line
-	is ready, and gets and read do not block in non-blocking mode.
-	Added an interactive test case to check for this.
-
-1999-03-22    <stanton@scriptics.com>
-
-	* tests/reg.test: 
-	* generic/regc_color.c: Applied regexp bug fix from Henry Spencer.
-
-1999-03-19    <redman@scriptics.com>
-
-	* generic/tclCmdIL.c: Fixed the initialization of an array so that
- 	the Sun 5.0 C compiler wouldn't complain.
-
-	* unix/configure.in: Added support for --enable-64bit.  For now,
- 	this is only supported on Solaris 7 64bit (SunOS 5.7) using the Sun 
-	compiler (not gcc).
-	
-1999-03-18    <stanton@scriptics.com>
-
-	* win/tclWinChan.c (TclpOpenFileChannel, Tcl_MakeFileChannel):
-	Changed to only test for console or comm handles when the type is
-	FILE_TYPE_CHAR to avoid useless tests on simple files.  Also
-	reordered tests so consoles are tested first as this is more
-	common.
-
-	* win/makefile.vc: Regularized usage of mkd and rmd and rm.
-
-	* library/encoding/shiftjis.enc: 
-	* tools/encoding/shiftjis.txt: Missing/incorrect characters in
-	shift-jis table. [Bug: 1008, 1526]
-
-	* generic/tclInt.decls:
-	* generic/tcl.decls: Eliminated use of "string" and "list" from
-	argument lists to avoid conflicts with C++ STL. [Bug: 1181]
-
-	* win/tclWinFile.c (TclpMatchFiles): Changed to ignore the
-	FS_CASE_IS_PRESERVED bit and always return exactly what we get
-	from the system.
-
-1999-03-17    <stanton@GASPODE>
-
-	* win/README.binary: 
-	* win/README: 
-	* unix/configure.in: 
-	* generic/tcl.h: 
-	* README: Updated version to 8.1b3.
-
-1999-03-14    <stanton@GASPODE>
-
-	* win/tclWinConsole.c: 
-	* win/tclWinPipe.c: 
-	* win/tclWinSerial.c: Changed so channel drivers wait for the
-	reader/writer threads to exit before returning during a close
-	operation.  This ensures that the main thread is the last thread
-	to exit, so the process return value is set properly.
-
-	* generic/tclIntDecls.h: 
-	* generic/tclIntPlatDecls.h: 
-	* generic/tclIntPlatStubs.c: 
-	* generic/tclIntStubs.c: 
-	* generic/tclPlatDecls.h: 
-	* generic/tclPlatStubs.c: 
-	* generic/tclStubInit.c: 
-	* generic/tclStubs.c: Fixed bad eol characters.
-	
-	* generic/tclInt.decls: Changed "const" to "CONST" in
-	declarations for better portability.
-
-	* generic/tcl.decls: Renamed panic and panicVA to Tcl_Panic and
-	Tcl_PanicVA in the stub files.
-
-	* generic/tclInterp.c (Tcl_MakeSafe): Remove tcl_platform(user)
-	from safe interps.
-
-1999-03-11    <stanton@GASPODE>
-
-	* unix/Makefile.in:
-	* unix/configure.in: Include compat files in the stub library in
-	addition to the main library.  Compat files are now built for
-	dynamic use in all cases.
-	
-	* generic/tcl.h: Changed magic number so it doesn't match the plus
-	patch, at Jan's request.
-	
-	* unix/tclConfig.sh.in:
-	* unix/dltest/Makefile.in:
-	* unix/dltest/configure.in:
-	* unix/dltest/pkga.c:
-	* unix/dltest/pkgb.c:
-	* unix/dltest/pkgc.c:
-	* unix/dltest/pkgd.c:
-	* unix/dltest/pkge.c:
-	* unix/dltest/pkgf.c: Changed package tests to build against the
-	stubs library.
-
-1999-03-10    <stanton@GASPODE>
-
-	* generic/tcl.h: 
-	* generic/tcl.decls: Changed Tcl_ReleaseType from an enum to
-	macros so it can be used in .rc files.
-	Added Tcl_GetString.
-
-	* mac/tclMacNotify.c:
-	* generic/tclNotify.c:
-	* generic/tclInt.h: 
-	* win/tclWinNotify.c: 
-	* generic/tcl.h: Renamed Tcl_AlertNotifier to TclpAlertNotifier.
-
-	* generic/tclInt.decls: Added TclWinAddProcess to make it possible
-	for expect to use Tcl_WaitForPid().  This patch is from Gordon
-	Chaffee. 
-
-	* mac/tclMacPort.h: 
-	* win/tclWinInit.c: 
-	* unix/tclUnixPort.h: 
-	* generic/tclAsync.c: Added TclpAsyncMark to fix bug in async
-	handling on Windows where async events don't wake up the event
-	loop.  This patch comes from Gordon Chaffee.
-
-	* generic/tcl.decls: Fixed declarations of reserved slots.
-	
-1999-03-10    <redman@scriptic.com>
-
-	* generic/tclCompile.h: Ensure that the ByteCode struct is binary
-	compatible with the version in 8.0.6.
-
-	* generic/tcl.h:
-	* generic/tclBasic.c: Add Tcl_GetVersion() function to the public
-	C API to allow programs to check the version number of the Tcl
-	library at runtime.  Also added an enum to clarify the release
-	level (alpha, beta, final).
-
-1999-03-09    <stanton@GASPODE>
-
-	* Integrated changes from Tcl 8.0 including:
-		stubs mechanism
-		configure patches from Jan Nijtmans
-		rename of panic to Tcl_Panic
-	
-1999-03-08    <lfb@scriptics.com>
-
-	* win/tclWin32Dll.c: Removed Dll instance from thread-local
-	storage.
-
-1999-03-08    <stanton@GASPODE>
-	
-	* generic/tcl.h: Moved Tcl_Mutex, etc. macros above the inclusion
-	of tclDecls.h to avoid macro conflicts.
-
-	* generic/tclInt.h:
-	* generic/regc_color.c: 
-	* generic/regcomp.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdAH.c:
-	* generic/tclIOCmd.c:
-	* generic/tclParse.c:
-	* generic/tclStringObj.c:
-	* unix/tclUnixNotfy.c: Cleaned up various compiler warnings,
-	eliminated UCHAR bugs.
-	
-	* unix/tclUnixNotfy.c:
-	* unix/tclUnixThrd.c:
-	* generic/tclThreadTest.c:
-	* mac/tclMacThrd.c: Changed TclpCondition*() to Tcl_Condition*().
-	
-	* INTEGRATED PATCHES FROM 8.0.6:
-
-	* generic/tcl.decls:
-	* generic/tcl.h:
-	* generic/tclBasic.c: 
-	* generic/tclDecls.h:
-	* generic/tclInt.decls:
-	* generic/tclInt.h: 
-	* generic/tclIntDecls.h:
-	* generic/tclIntPlatDecls.h:
-	* generic/tclIntPlatStubs.c:
-	* generic/tclIntStubs.c:
-	* generic/tclPlatDecls.h:
-	* generic/tclPlatStubs.c:
-	* generic/tclStubInit.c:
-	* generic/tclStubLib.c:
-	* generic/tclStubs.c:
-	* tools/genStubs.tcl:
-	* unix/configure.in:
-	* unix/Makefile.in:
-	* unix/tclConfig.sh.in:
-	* win/makefile.vc:  
-	* win/tclWinPort.h: Added Tcl stubs implementation.  There are
-	now two new macros USE_TCL_STUBS and USE_TCL_STUB_PROCS that
-	enable use of stubs and disable stub macros respectively.  All of
-	the public and private function declarations from tcl.h and
-	tclInt.h have moved into the *.decls files and the *Stubs.c and
-	*Decls.h files are generated using the genStubs.tcl script.
-
-	* unix/Makefile.in:
-	* unix/configure.in: 
-	* unix/ldAix: Enhanced AIX shared library support.
-
-	* win/tclWinSock.c: Removed a bunch of extraneous PASCAL FAR
-	attributes from internal functions.
-
-	* win/tclWinReg.c: Changed registry package to use stubs mechanism
-	so it no longer depends on the specific version of Tcl.
-
-	* doc/AddErrInfo.3: 
-	* doc/Eval.3: 
-	* doc/PkgRequire.3: 
-	* doc/SetResult.3: 
-	* doc/StringObj.3: 
-	* generic/tcl.h:
-	* generic/tclBasic.c: 
-	* generic/tclPanic.c:
-	* generic/tclStringObj.c:
-	* generic/tclUtil.c:
-	* unix/mkLinks: Added va_list versions of all VARARGS
-	functions so they can be invoked from the stub functions.
-
-	* doc/package.n: 
-	* doc/PkgRequire.3: 
-	* generic/tclPkg.c: Added Tcl_PkgProvideEx, Tcl_RequireEx,
-	Tcl_PresentEx, and Tcl_PkgPresent.  Added "package present"
-	command.
-
-	* generic/tclFileName.c: 
-	* mac/tclMacFile.c: 
-	* mac/tclMacShLib.exp: 
-	* unix/tclUnixFile.c: 
-	* win/tclWinFile.c: Changed so TclGetUserHome is defined on
-	all platforms, even though it is currently a noop on mac and
-	windows, and renamed it to TclpGetUserHome.
-
-	* generic/tclPanic.c:
-	* generic/panic.c: Renamed panic to Tcl_Panic.
-	
-1999-02-25    <redman@scriptics.com>
-
-	* win/makefile.vc: Added tclWinConsole.c and tclWinSerial.c
-	
-	* win/tclWinConsole.c: New code to properly deal with fileevents
-	and nonblocking mode on consoles.
-	
-	* win/tclWinSerial.c: New code to properly deal with fileevents
-	and nonblocking mode on serial ports.
-
-	* win/tclWinPipe.c: 
-	* win/tclWinPort.h: Exported functions to allow creation of pipe
-	channels from tclWinChan.c
-
-	* win/tclWinChan.c: Check the type of a channel, including for the
-	standard (stdin/stdout/stderr), and use the correct channel type
-	to create the channel (file, serial, console, or pipe).
-
-1999-02-11    <stanton@GASPODE>
-
-	* README: 
-	* generic/tcl.h: 
-	* win/README.binary: 
-	* win/README: 
-	* unix/configure.in: 
-	* mac/README: Updated version numbers to 8.1b2.
-
-1999-02-10    <stanton@GASPODE>
-
-	* library/auto.tcl: Fixed auto_mkindex so it handles .tbc files.
-	Did some general cleanup to handle bad eval statements that didn't
-	use "list".
-
-	* unix/mkLinks:
-	* doc/SetVar.3:
-	* generic/tcl.h:
-	* generic/tclVar.c: Restored Tcl_ObjGetVar2 and Tcl_ObjSetVar2
-	from 8.0. Renamed Tcl_Get/SetObjVar2 to Tcl_GetVar2Ex and
-	Tcl_SetVar2Ex.
-
-1999-02-10    <stanton@GASPODE>
-
-	INTEGRATED PATCHES FROM 8.0.5b2: 
-
-	* test/winPipe.test: Changed to remove echoArgs.tcl temporary file
-	when done.
-	
-	* tests/cmdAH.test:
-	* generic/tclFileName.c (TclGetExtension): Changed behavior so the
-	split happens at the last period in the name instead of the first
-	period of the last run of periods.  So, "foo..o" is split into
-	"foo." and ".o" now. [Bug: 1126]
-	
-	* win/makefile.vc: Added better support for paths with spaces in
-	the name. Added .lib and support .dlls to the install-binaries
-	target.  Added generate of a pkgIndex.tcl script to the
-	install-libraries target.
-
-	* win/tclAppInit.c: 
-	* unix/tclAppInit.c: 
-	* mac/tclMacAppInit.c: 
-	* generic/tclTest.c: Changed some EXTERN declarations to extern
-	since they are not defining exported interfaces.  This avoids
-	generating useless declspec() attributes and makes the windows
-	makefile simpler.
-
-	* generic/tcl.h: Moved Tcl_AppInit declaration to end and cleared
-	out TCL_STORAGE_CLASS so it is not declared with a declspec().
-
-	* tests/interp.test:
-	* generic/tclInterp.c (DeleteAlias): Changed to use
-	Tcl_DeleteCommandFromToken so we handle renames properly. This
-	avoids senseless panic. [Bug: 736]
-
-	* unix/tclUnixChan.c: 
-	* win/tclWinSock.c: 
-	* doc/socket.n: Applied Gordon Chaffee's patch to handle failures
-	during asynchronous socket connection operations.  This adds a new
-	"-error" fconfgure option to socket channels. [Bug: 893]
-
-	* generic/tclProc.c:
-	* generic/tclNamesp.c:
-	* generic/tclInt.h: 
-	* generic/tclCmdIL.c: 
-	* generic/tclBasic.c: 
-	* generic/tclVar.c: Applied patch from Viktor Dukhovni to
-	rationalize TCL_LEAVE_ERR_MSG behavior when creating variables.
-	
-	* generic/tclVar.c: Fixed bug in namespace tail computation.
-	Fixed bug where upvar could resurrect a namespace variable whose
-	namespace had been deleted.
-
-	* generic/tclCompile.c (TclCompileExprCmd): Eliminated yet another
-	bogus optimization in expression compilation.
-
-	* unix/configure.in: Added branch for BSD/OS-4* to shared library
-	case statement. [Bug: 975]
-	Fixed to correctly handle IRIX 6.5 n32 library support. [Bug: 1117]
-	
-	* win/winDumpExts.c: Patched to be pickier about stripping
-	@'s. [Bug: 920]
-
-	* library/http2.0/http.tcl: Added catch around eof test in
-	CopyDone since the user may have already called http::reset.
-	[Bug: 1108] 
-
-	* unix/configure.in: Changed Linux and IRIX to set SHLIB_LIBS to
-	LIBS so shared libraries are linked with the system
-	libraries. [Bug: 1018]
-
-	* generic/tclCompile.c (CompileExprWord): Fixed exception stack
-	overflow bug caused by missing statement. [Bug: 928]
-
-	* generic/tclIOCmd.c: 
-	* generic/tclBasic.c: Objectified the "open" command. [Bug: 1113] 
-
-	* generic/tclPosixStr.c (Tcl_ErrnoId, Tcl_ErrnoMsg): When using
-	egcs, ENOTSUP and EOPNOTSUPP are the same, so now we handle that
-	case. [Bug: 1137]
-
-	* library/init.tcl: Various small changes requested by Jan Nijtmans.
-	- If the variable $tcl_library contains the empty string, this
-	empty string will be put in $auto_path. This is not useful at all,
-	it only slows down later package processing.
-	- If the variable tcl_pkgPath is not set, the "unset __dir"
-	fails. Thich makes init.tcl totally unusable. Better put a "catch"
-	around it. 
-	- In the function tcl_findLibraries, the "string match" function
-	only works correctly if $tcl_patchLevel is in one of the forms
-	"?.?a?", "?.?b?" or "?.?.?". Could a "regexp" be used instead,
-	then it allows anything to be appended to the patchLevel
-	string. And it is more efficient.
-	- The tclPkgSetup function assumes that if $type != "load" then
-	the type must be "source". This needn't be true. Some users want
-	to add their own setup types.
-	[RFE: 1138] [Bug: 978]
-
-	* win/tclWinReg.c: 
-	* doc/registry.n: Added support for HKEY_PERFORMANCE_DATA and
-	HKEY_DYN_DATA keys. [Bug: 1109]
-
-	* win/tclWinInit.c (TclPlatformInit): Added code to ensure
-	tcl_pkgPath is set to "" when no registry entry is found. [Bug: 978]
-
-1999-02-01    <stanton@GASPODE>
-
-	* generic/tclBasic.c:
-	* generic/tclCmdAH.c:
-	* generic/tclCmdIL.c:
-	* generic/tclCmdMZ.c:
-	* generic/tclExecute.c:
-	* generic/tclHistory.c:
-	* generic/tclIO.c:
-	* generic/tclIOUtil.c:
-	* generic/tclInterp.c:
-	* generic/tclMain.c:
-	* generic/tclNamesp.c:
-	* generic/tclParse.c:
-	* generic/tclProc.c:
-	* generic/tclTest.c:
-	* generic/tclTimer.c:
-	* generic/tcl.h: Made eval interfaces compatible with 8.0 by
-	renaming Tcl_EvalObj to Tcl_EvalObjEx, renaming Tcl_Eval2 to
-	Tcl_EvalEx and restoring Tcl_EvalObj and Tcl_GlobalEvalObj
-	interfaces so they match Tcl 8.0.
-
-1999-01-28    <stanton@GASPODE>
-
-	* Merged Tcl 8.0.5b1 changes.
-	
-	* generic/tclUtil.c (Tcl_DStringSetLength): Changed so the buffer
-	overallocates in a manner similar to Tcl_DStringAppend.  This
-	should improve performance for TclUniCharToUtfDString.
-
-1998-12-11    === Tcl 8.1b1 Release ===
-	
-1998-12-10    <stanton@GASPODE>
-
-	* Fixed lots of files that used TCL_THREAD instead of TCL_THREADS.
-	
-	* generic/tclEncoding.c (Tcl_FreeEncoding): Moved most of the code
-	into a static FreeEncoding routine that does not grab the
-	encodingMutex to avoid deadlocks/races when called from other
-	routines that already have the mutex.
-
-1998-12-09    <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: Fixed bad export list, fixed so
-	all locale strings are converted to lower case, including file
-	names.
-
-	* generic/regcomp.c (makescan): Fixed bug in longest match case
-	that caused anchored patterns to fail. [Bug: 897]
-
-1998-12-08    <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: changed mc to invoke mcunknown in
-	the calling context, changed locale lookups to be case insensitive
-
-1998-12-07    <stanton@GASPODE>
-
-	* generic/tclAlloc.c (TclpRealloc): Fixed a memory allocation bug
-	where big blocks that were reallocated into a different heap
-	location were not being placed into the bigBlocks list. [Bug: 933]
-
-	* tests/msgcat.test: Added message catalog test suite.
-
-	* library/msgcat1.0/msgcat.tcl: minor bug fixes, integrated latest
-	changes from Mark Harrison.
-
-1998-12-04    <stanton@GASPODE>
-
-	* library/msgcat1.0/msgcat.tcl: Changed code to conform to Tcl
-	coding standards.  Changed to use file join for portability.
-
-	* library/msgcat1.0: Added initial implementaion of Tcl message
-	catalog package contributed by Mark Harrison.
-
-1998-12-03    <stanton@GASPODE>
-
-	* win/tclWinPipe.c (BuildCommandLine): Fixed bug that kept
-	arguments containing spaces from being properly quoted.
-
-	* tests/defs: Changed so auto_path is set to only contain the Tcl
-	library directory.  This keeps the tests from accidentally picking
-	up stuff in installed packages. 
-
-	* generic/tclUtil.c (Tcl_StringMatch): Changed to match 8.0
-	behavior in corner case where there is no closing bracket.
-
-1998-12-02    <stanton@GASPODE>
-
-	* win/tclWinPipe.c (TclpCreateCommandChannel): Changed
-	reader/writer threads to have THREAD_PRIORITY_HIGHEST so they will
-	have a chance to run whenever there is something to do.
-
-	* generic/tclIO.c (WriteBytes, WriteChars): Fixed so extraneous
-	flushes do not happen in line mode.
-	(TranslateOutputEOL): Made translation more efficient in line mode
-	and fixed a buffer overflow bug in CRLF translation. [Bug: 887]
-
-1998-12-02    <welch@SAGE>
-
-	* Updated patchlevel to 8.1b1
-
-1998-12-02    <stanton@GASPODE>
-
-	* generic/regc_color.c (subcolor): Added check for error case to
-	avoid an out of bounds array reference.
-
-	* generic/tclCmdAH.c (Tcl_EncodingObjCmd): Changed to avoid using
-	Tcl_DStringResult because it is not binary clean.
-
-	* generic/tclParse.c (Tcl_ParseCommand): Fixed bug in comment
-	parsing where a trailing comment looked like an incomplete
-	command. 
-
-1998-12-02    <welch@SAGE>
-
-	* Merged changes from 8.0.4, especially the new pkg_mkIndex
-
-1998-12-01    <stanton@GASPODE>
-
-	* generic/tclIO.c (Tcl_ReadChars): Added a call to UpdateInterest
-	so we don't block when there is data sitting in the buffers.
-
-	* generic/tclTest.c (TestevalobjvObjCmd): Updated for EvalObjv
-	change.
-
-	* tests/parse.test: Updated tests for EvalObjv change.
-
-	* generic/tclParse.c (EvalObjv, Tcl_EvalObjv): Changed
-	Tcl_EvalObjv interface to remove string and length arguments,
-	preserved original interface as EvalObjv for internal use.
-
-	* generic/tcl.h: Changed Tcl_EvalObjv interface to remove string
-	and length arguments.
-
-	* doc/Eval.3: Updated documentation for Tcl_EvalObjv to remove
-	string and length arguments.
-
-	* generic/tclCompCmds.c (TclCompileForeachCmd): Fixed code that
-	corrupted the exceptDepth value in the compile environment when
-	foreach failed to compile inline. [Bug: 884]
-
-	* library/encoding/euc-kr.enc: 
-	* library/encoding/ksc5601.enc: 
-	* tools/encoding/ksc5601.txt: 
-	* unix/tclUnixInit.c: Added support for Korean EUC. 
-
-	* win/tclWinChan.c (TclpGetDefaultStdChannel): added check for a
-	failure during Tcl_MakeFileChannel.
-
-1998-11-30    <stanton@GASPODE>
-
-	* unix/tclUnixNotfy.c (Tcl_WaitForEvent): Fixed hang that occurs
-	when trying to close a pipe that is currently being waited on by
-	the notifier thread. [Bug: 607]
-
-	* unix/tclUnixFCmd.c (GetPermissionsAttribute): Increase size of
-	returnString buffer to avoid overflow. [Bug: 584]
-
-	* generic/tclThreadTest.c (TclThreadSend): Fixed memory leak due
-	to use of TCL_VOLATILE instead of TCL_DYNAMIC.
-
-	* generic/tclThread.c (TclRememberSyncObject): Fixed memory leak
-	caused by failure to reuse condition variables.
-
-	* unix/tclUnixNotfy.c: 	(Tcl_AlertNotifier, Tcl_WaitForEvent,
-	NotifierThreadProc, Tcl_InitNotifier): Fixed race condition caused
-	by incorrect use of condition variables when sending messages
-	between threads.. [Bug: 607]
-
-	* generic/tclTestObj.c (TeststringobjCmd): MAX_STRINGS was off by one
-	so the strings array was too small.
-
-	* generic/tclCkalloc.c (Tcl_DbCkfree): Moved mutex lock so
-	ValidateMemory is done inside the mutex to avoid a race condition
-	when validate_memory is enabled. [Bug: 880]
-
-1998-11-23    <stanton@GASPODE>
-
-	* regexec.c: more performance tuning from Henry Spencer.
-
-1998-11-17    <stanton@GASPODE>
-
-	* tclScan.c: moved "scan" implementation out of tclCmdMZ.c and
-	added Unicode support.  This required a complete reimplementation
-	of the command to avoid using scanf(), which isn't Unicode aware.
-	Two new features were added in the process: %n to return the
-	current number of characters consumed, and XPG3-style %n$ argument
-	order specifiers similar to those provided by the "format"
-	command. [Bug: 833]
-
-	* tclAlloc.c: changed so allocated memory is always 8-byte aligned
-	to improve memory performance and to ensure that it will work on
-	systems that don't like accessing 4-byte aligned values
-	(e.g. Solaris and HP-UX). [Bug: 834]
-
-1998-11-06    <stanton@GASPODE>
-
-	* tclVar.c (TclGetIndexedScalar): Fixed bug 796, var name was
-	getting lost before being passed to CallTraces.
-
-1998-10-21    <stanton@GASPODE>
-
-	* added "encoding" command
-	
-	* Moved internal regexp declarations from tclInt.h to tclRegexp.h
-
-	* integrated regexp updates from Henry Spencer
-
-1998-10-15    <stanton@GASPODE>
-
-	* tclUtf.c: added Unicode character table support
-
-	* tclInt.h: added TclUniCharIsWordChar
-
-	* tclCmdMZ.c (Tcl_StringObjCmd): added "totitle" subcommand,
-	changed "wordend" and "wordstart" to properly handle Unicode word
-	characters and connector punctuation
-
-1998-10-05    <stanton@GASPODE>
-
-	* auto.tcl, package.tcl: fixed SCCS strings
-
-	* tclIndex: updated index to reflect 8.1 files
-
-	* tclCompile.c (TclCompileScript): changed to avoid modifying the
-	input string in place because name lookup operations could have
-	arbitrary side effects
-
-	* tclInterp.c: added guard against deleting current interpreter
-
-	* tclMacFile.c, tclUnixFile.c, tclWinFile.c, tclFileName.c: added
-	warnings around code that modifies strings in place
-
-	* tclExecute.c: fixed off-by-one copying error, fixed merge bugs
-
-	* tclEvent.c: changed so USE_TCLALLOC is tested for value instead
-	of definition
-
-	* tclCompCmds.c: replaced SCCS strings, added warnings around code
-	that modifies strings in place
-
-	* interp.test: added test for interp deleting itself
-
-1998-09-30    <stanton@GASPODE>
-
-	* makefile.vc: fixed so TCL_LIBRARY is set before running tcltest
-
-	* tclWin32Dll.c: removed TclpFinalize, cleanup of merges
-
diff --git a/README b/README
deleted file mode 100644
index 00e549d..0000000
--- a/README
+++ /dev/null
@@ -1,401 +0,0 @@
-README:  Tcl
-
-	Tcl is maintained, enhanced, and distributed freely as a
-	service to the Tcl community by Scriptics Corporation.
-
-RCS: @(#) $Id: README,v 1.16 1999/04/16 00:46:29 stanton Exp $
-
-Contents
---------
-    1. Introduction
-    2. Documentation
-    3. Compiling and installing Tcl
-    4. Summary of changes in Tcl 8.1
-    5. Development tools
-    6. Tcl newsgroup
-    7. Tcl contributed archive
-    8. Tcl Resource Center
-    9. Mailing lists
-    10. Support and bug fixes
-    11. Tcl version numbers
-
-1. Introduction
----------------
-
-Tcl provides a powerful platform for creating integration
-applications that tie together diverse applications, protocols,
-devices, and frameworks.  When paired with the Tk toolkit, Tcl
-provides the fastest and most powerful way to create GUI applications
-that run on PCs, Unix, and the Macintosh.  Tcl can also be used for a
-variety of web-related tasks and for creating powerful command
-languages for applications.
-
-This directory contains the sources and documentation for Tcl.  The
-information here corresponds to release 8.1b3, which is the third
-beta release for Tcl 8.1.  This release is mostly feature complete but
-may have bugs and be missing some minor features.  This release is for
-early adopters who are willing to help us find and fix problems.
-Please let us know about any problems you uncover.
-
-Tcl 8.1 includes four major new features: Unicode support (all internal
-strings are now stored in UTF-8 form), a new regular expression matcher
-with most of the Perl features, support for multithreading, and a new
-message catalog package.  For details on features, incompatibilities, and
-potential problems with this release, see the Tcl/Tk 8.1 Web page at
-http://www.scriptics.com/software/8.1.html or refer to the "changes" file
-in this directory, which contains a historical record of all changes to
-Tcl.
-
-Tcl is a freely available open source package.  You can do virtually
-anything you like with it, such as modifying it, redistributing it,
-and selling it either in whole or in part.  See the file
-"license.terms" for complete information.
-
-2. Documentation
-----------------
-
-The best way to get started with Tcl is to read about Tcl on the
-Scriptics Web site at:
-
-	http://www.scriptics.com/scripting
-
-Another good way to get started with Tcl is to read one of the
-introductory books on Tcl:
-
-    Practical Programming in Tcl and Tk, 2nd Edition, by Brent Welch,
-    Prentice-Hall, 1997, ISBN 0-13-616830-2
-
-    Tcl and the Tk Toolkit, by John Ousterhout,
-    Addison-Wesley, 1994, ISBN 0-201-63337-X
-
-    Exploring Expect, by Don Libes,
-    O'Reilly and Associates, 1995, ISBN 1-56592-090-2
-
-Other books are listed at
-http://www.scriptics.com/resource/doc/books/
-
-There is also an official home for Tcl and Tk on the Scriptics Web site:
-
-	http://www.scriptics.com
-
-These Web pages include information about the latest releases, products
-related to Tcl and Tk, reports on bug fixes and porting issues, HTML
-versions of the manual pages, and pointers to many other Tcl/Tk Web
-pages at other sites.  Check them out!
-
-2a. Unix Documentation
-----------------------
-
-The "doc" subdirectory in this release contains a complete set of
-reference manual entries for Tcl.  Files with extension ".1" are for
-programs (for example, tclsh.1); files with extension ".3" are for C
-library procedures; and files with extension ".n" describe Tcl
-commands.  The file "doc/Tcl.n" gives a quick summary of the Tcl
-language syntax.  To print any of the man pages on Unix, cd to the
-"doc" directory and invoke your favorite variant of troff using the
-normal -man macros, for example
-
-		ditroff -man Tcl.n
-
-to print Tcl.n.  If Tcl has been installed correctly and your "man"
-program supports it, you should be able to access the Tcl manual entries
-using the normal "man" mechanisms, such as
-
-		man Tcl
-
-2b. Windows Documentation
--------------------------
-
-The "doc/help" subdirectory in this release contains a complete set of
-Windows help files for TclPro.  Once you install this Tcl release, a
-shortcut to the Windows help Tcl documentation will appear in the
-"Start" menu:
-
-	Start | Programs | Tcl | Tcl Help
-
-3. Compiling and installing Tcl
--------------------------------
-
-This release contains everything you should need to compile and run
-Tcl under UNIX, PCs (either Windows NT, Windows 95, or Win 3.1 with
-Win32s), and Macintoshes.
-
-Before trying to compile Tcl you should do the following things:
-
-    (a) Check for a binary release.  Pre-compiled binary releases are
-        available now for PCs, Macintoshes, and several flavors of UNIX.
-        Binary releases are much easier to install than source releases.
-        To find out whether a binary release is available for your
-        platform, check the Scriptics Tcl Resource Center
-        (http://www.scriptics.com/resource).  Also, check in
-        the FTP directory from which you retrieved the base
-        distribution.
-
-    (b) Make sure you have the most recent patch release.  Look in the
-	FTP directory from which you retrieved this distribution to see
-	if it has been updated with patches.  Patch releases fix bugs
-	without changing any features, so you should normally use the
-	latest patch release for the version of Tcl that you want. 
-
-Once you've done this, change to the "unix" subdirectory if you're
-compiling under UNIX, "win" if you're compiling under Windows, or
-"mac" if you're compiling on a Macintosh.  Then follow the instructions
-in the README file in that directory for compiling Tcl, installing it,
-and running the test suite.
-
-4. Summary of changes in Tcl 8.1
---------------------------------
-
-Here are the most significant changes in Tcl 8.1.  In addition to these
-changes, there are several smaller changes and bug fixes.  See the file
-"changes" for a complete list of all changes.
-
-    1. Internationalization. Tcl has undergone a major revision to
-    support international character sets:
-
-    All strings in Tcl are now represented in UTF-8 instead of ASCII,
-    so that Tcl now supports the full Unicode character set.  The
-    representation of ASCII characters is unchanged (in UTF-8 anything
-    that looks like an ASCII character is an ASCII character), but
-    characters with the high-order bit set, such as those in ISO-8859,
-    are represented with multi-byte sequences, as are all Unicode
-    characters with values greater than 127.  This change does not
-    affect Tcl scripts but it does affect C code that parses strings.
-    Tcl automatically translates between UTF-8 and the normal encoding
-    for the platform during interactions with the system.
-
-    In Tcl scripts the backslash sequence \u can be used to enter
-    16-bit Unicode characters.  \o and \x generate only 8-bit
-    characters as before.
-
-    There is a new "encoding" command that allows scripts to determine
-    what encodings are available as well as to convert strings between
-    different encodings.  The fconfigure command now supports a
-    -encoding option for specifying the encoding of an open file or
-    socket.  Tcl will automatically translate between the specified
-    encoding and UTF-8 during I/O.
-
-    There are several new C APIs that support UTF-8 and various
-    encodings.  See the manual entry Utf.3 for procedures that
-    translate between Unicode and UTF-8 and manipulate UTF-8 strings.
-    See Encoding.3 for procedures that create new encodings and
-    translate between encodings.  See ToUpper.3 for procedures that
-    perform case conversions on UTF-8 strings.
-
-    2. Binary data.  Binary data is handled differently in Tcl 8.1
-    than in Tcl 8.0.  Tcl 8.1 uses the UTF-8 facilities to represent
-    binary data: the character value zero is represented with a
-    multi-byte sequence, so that (once again) strings in Tcl 8.1 never
-    contain null bytes.  This means that binary data is now accepted
-    everywhere in Tcl and Tk (in Tcl 8.0 the support for binary data
-    was incomplete).  If you have C code that needs to manipulate the
-    bytes of binary data (as opposed to just passing the data through)
-    you should use a new object type called "byte array".  See the
-    manual entry ByteArrObj.3 for information about procedures such as
-    Tcl_GetByteArrayFromObj.
-
-    3. Regular expressions.  Tcl 8.1 contains a brand new
-    implementation of regular expressions from Henry Spencer.  The
-    regular expression syntax has been greatly expanded to include
-    most of the features in Perl.  In addition, the regexp engine
-    supports Unicode and binary data.  See the doc/regexp.n manual
-    entry for more details.
-
-    4. Threads.  If configured with the --enable-threads flag, Tcl can
-    now be compiled for use in a multi-threaded application.
-    Individual threads are allowed to use one or more interpreters as
-    long as each interpreter (and any slave interpreters) is only
-    accessed by one thread.  Each thread runs its own event loop, and
-    you can post events to other threads. There are new C APIs for
-    mutexes, condition variables, and thread local storage.  See the
-    doc/Thread.3 manual entry for more details.  Tk 8.1 is not yet
-    multi-thread safe.  There is not yet support for tcl level use of
-    threading except for a test command. (Compile tcltest and try
-    testthread.)
-
-    5. Message catalog. There is a new message catalog package which makes
-    it easy to localize the strings in a script.  See the doc/msgcat.n
-    manual entry for more details.
-
-    6. Stubbs library for building extensions.  There is now a new
-    way to build extensions for Tcl.  Instead of linking with the
-    tcl shared library you can now link to a stubs library that gets
-    built in this release.  By linking with the stubs library it
-    is possible to use dynamically loaded extensions in staticlly
-    built applications.  It will also be possible for some extensions
-    to work for both Tcl 8.0 & 8.1 with out having to recompile.
-
-5. Development tools
---------------------
-
-A high quality set of commercial development tools is now available to
-accelerate your Tcl application development.  Scriptics' TclPro
-product provides a debugger, static code checker, packaging utility,
-and bytecode compiler.  Visit the Scriptics Web site at:
-
-	http://www.scriptics.com/tclpro
-
-for more information on TclPro and for a free 30-day evaluation
-download.
-
-6. Tcl newsgroup
-----------------
-
-There is a network news group "comp.lang.tcl" intended for the
-exchange of information about Tcl, Tk, and related applications.  The
-newsgroup is a greata place to ask general information questions.  For
-bug reports, please see the "Support and bug fixes" section below.
-
-7. Tcl contributed archive
---------------------------
-
-Many people have created exciting packages and applications based on Tcl
-and/or Tk and made them freely available to the Tcl community.  An archive
-of these contributions is kept on the machine ftp.neosoft.com.  You
-can access the archive using anonymous FTP;  the Tcl contributed archive is
-in the directory "/pub/tcl".  The archive also contains several FAQ
-("frequently asked questions") documents that provide solutions to problems
-that are commonly encountered by TCL newcomers.
-
-8. Tcl Resource Center
-----------------------
-
-Visit http://www.scriptics.com/resource/ to see an annotated index of
-many Tcl resources available on the World Wide Web.  This includes
-papers, books, and FAQs, as well as development tools, extensions,
-applications, binary releases, and patches.  You can also recommend
-additional URLs for the resource center using the forms labeled "Add a
-Resource".
-
-9. Mailing lists
-----------------
-
-A couple of  Mailing List have been set up to discuss Macintosh or
-Windows related Tcl issues.  To subscribe send a message to:
-	
-	wintcl-request@tclconsortium.org
-	mactcl-request@tclconsortium.org
-	
-In the body of the message (the subject will be ignored) put:
-	
-	subscribe mactcl Joe Smith
-	
-Replacing Joe Smith with your real name, of course.  (Use wintcl
-instead of mactcl if your interested in the Windows list.)  If you
-would just like to receive more information about the list without
-subscribing put the line:
-
-	information mactcl
-	
-in the body instead (or wintcl).
-
-10. Support and bug fixes
--------------------------
-
-Scriptics is very interested in receiving bug reports, patches, and
-suggestions for improvements.  We prefer that you send this
-information to us via the bug form on the Scriptics Web site, rather
-than emailing us directly.  The bug form is at:
-
-	http://www.scriptics.com/support/bugForm.html
-
-The bug form was designed to give uniform structure to bug reports as
-well as to solicit enough information to minimize followup questions.
-The bug form also includes an option to automatically post your report
-on comp.lang.tcl.  We strongly recommend that you select this option
-because someone else who reads comp.lang.tcl may be able to offer a
-solution.
-
-When reporting bugs, please provide full information about the Tcl/Tk
-version and the platform on which you are running Tcl/Tk.  Also,
-please include a short tclsh script that we can use to reproduce the
-bug.  Make sure that the script runs with a bare-bones tclsh and
-doesn't depend on any extensions or other programs, particularly those
-that exist only at your site.  Also, please include three additional
-pieces of information with the script:
-
-    (a) how do we use the script to make the problem happen (e.g.
-	what things do we click on, in what order)?
-    (b) what happens when you do these things (presumably this is
-        undesirable)?
-    (c) what did you expect to happen instead?
-
-We will log and follow-up on each bug, although we cannot promise a
-specific turn-around time.  Enhancements may take longer and may not
-happen at all unless there is widespread support for them (we're
-trying to slow the rate at which Tcl/Tk turns into a kitchen sink).
-It's very difficult to make incompatible changes to Tcl/Tk at this
-point, due to the size of the installed base.
-
-The Tcl community is too large for us to provide much individual
-support for users.  If you need help we suggest that you post
-questions to comp.lang.tcl.  We read the newsgroup and will attempt to
-answer esoteric questions for which no-one else is likely to know the
-answer.  In addition, Tcl/Tk support and training are available
-commercially from Scriptics at:
-
-	http://www.scriptics.com/training
-
-Also see the following Web site for links to other organizations that
-offer Tcl/Tk training:
-
-	http://www.scriptics.com/resource/commercial/training
-
-11. Tcl version numbers
------------------------
-
-You can test the current version of Tcl by examining the
-tcl_version and tcl_patchLevel variables.  The tcl_patchLevel
-variable follows the naming rules outlined below (e.g., 8.0.5).
-The tcl_version just has the major.minor numbers in it (e.g., 8.0)
-
-Each Tcl release is identified by two numbers separated by a dot, e.g.
-6.7 or 7.0.  If a new release contains changes that are likely to break
-existing C code or Tcl scripts then the major release number increments
-and the minor number resets to zero: 6.0, 7.0, etc.  If a new release
-contains only bug fixes and compatible changes, then the minor number
-increments without changing the major number, e.g. 7.1, 7.2, etc.  If
-you have C code or Tcl scripts that work with release X.Y, then they
-should also work with any release X.Z as long as Z > Y.
-
-Alpha and beta releases have an additional suffix of the form a2 or b1.
-For example, Tcl 7.0b1 is the first beta release of Tcl version 7.0,
-Tcl 7.0b2 is the second beta release, and so on.  A beta release is an
-initial version of a new release, used to fix bugs and bad features before
-declaring the release stable.  An alpha release is like a beta release,
-except it's likely to need even more work before it's "ready for prime
-time".  New releases are normally preceded by one or more alpha and beta
-releases.  We hope that lots of people will try out the alpha and beta
-releases and report problems.  We'll make new alpha/beta releases to fix
-the problems, until eventually there is a beta release that appears to
-be stable.  Once this occurs we'll make the final release.
-
-We can't promise to maintain compatibility among alpha and beta releases.
-For example, release 7.1b2 may not be backward compatible with 7.1b1, even
-though the final 7.1 release will be backward compatible with 7.0.  This
-allows us to change new features as we find problems during beta testing.
-We'll try to minimize incompatibilities between beta releases, but if
-a major problem turns up then we'll fix it even if it introduces an
-incompatibility.  Once the official release is made then there won't
-be any more incompatibilities until the next release with a new major
-version number.
-
-(Note: This compatibility is true for Tcl scripts, but historically
-the Tcl C APIs have changed enough between releases that you may need
-to work a bit to upgrade extensions.)
-
-Patch releases now have a suffix such as ".4" or ".5".  Prior to
-version 8.0.3, patch releases had the suffix "p1" or "p2".  So, the
-8.0 release went to 8.0p1, 8.0p2, 8.0.3, 8.0.4, and 8.0.5.  The alphas
-and betas continue to use the 'a' and 'b' letters in their
-tcl_patchLevel.  Patch releases normally contain bug fixes only.  A
-patch release (e.g Tcl 8.0.5) should be completely compatible with the
-base release from which it is derived (e.g. Tcl 8.0), and you should
-normally use the highest available patch release.
-
-12. Thank You
--------------
-
-We'd like to express our thanks to the Tcl community for all the
-helpful suggestions, bug reports, and patches we have received.
-Tcl/Tk has improved vastly and will continue to do so with your help.
diff --git a/changes b/changes
deleted file mode 100644
index 7ee8d72..0000000
--- a/changes
+++ /dev/null
@@ -1,4309 +0,0 @@
-Recent user-visible changes to Tcl:
-
-RCS: @(#) $Id: changes,v 1.43 1999/04/16 00:46:29 stanton Exp $
-
-1. No more [command1] [command2] construct for grouping multiple
-commands on a single command line.
-
-2. Semi-colon now available for grouping commands on a line.
-
-3. For a command to span multiple lines, must now use backslash-return
-at the end of each line but the last.
-
-4. "Var" command has been changed to "set".
-
-5. Double-quotes now available as an argument grouping character.
-
-6. "Return" may be used at top-level.
-
-7. More backslash sequences available now.  In particular, backslash-newline
-may be used to join lines in command files.
-
-8. New or modified built-in commands:  case, return, for, glob, info,
-print, return, set, source, string, uplevel.
-
-9. After an error, the variable "errorInfo" is filled with a stack
-trace showing what was being executed when the error occurred.
-
-10. Command abbreviations are accepted when parsing commands, but
-are not recommended except for purely-interactive commands.
-
-11. $, set, and expr all complain now if a non-existent variable is
-referenced.
-
-12. History facilities exist now.  See Tcl.man and Tcl_RecordAndEval.man.
-
-13. Changed to distinguish between empty variables and those that don't
-exist at all.  Interfaces to Tcl_GetVar and Tcl_ParseVar have changed
-(NULL return value is now possible).  *** POTENTIAL INCOMPATIBILITY ***
-
-14. Changed meaning of "level" argument to "uplevel" command (1 now means
-"go up one level", not "go to level 1"; "#1" means "go to level 1").
-*** POTENTIAL INCOMPATIBILITY ***
-
-15. 3/19/90 Added "info exists" option to see if variable exists.
-
-16. 3/19/90 Added "noAbbrev" variable to prohibit command abbreviations.
-
-17. 3/19/90 Added extra errorInfo option to "error" command.
-
-18. 3/21/90 Double-quotes now only affect space:  command, variable,
-and backslash substitutions still occur inside double-quotes.
-*** POTENTIAL INCOMPATIBILITY ***
-
-19. 3/21/90 Added support for \r.
-
-20. 3/21/90 List, concat, eval, and glob commands all expect at least
-one argument now.  *** POTENTIAL INCOMPATIBILITY ***
-
-21. 3/22/90 Added "?:" operators to expressions.
-
-22. 3/25/90 Fixed bug in Tcl_Result that caused memory to get trashed.
-
-------------------- Released version 3.1 ---------------------
-
-23. 3/29/90 Fixed bug that caused "file a.b/c ext" to return ".b/c".
-
-24. 3/29/90 Semi-colon is not treated specially when enclosed in
-double-quotes.
-
-------------------- Released version 3.2 ---------------------
-
-25. 4/16/90 Rewrote "exec" not to use select or signals anymore.
-Should be more Sys-V compatible, and no slower in the normal case.
-
-26. 4/18/90 Rewrote "glob" to eliminate GNU code (there's no GNU code
-left in Tcl, now), and added Tcl_TildeSubst procedure.  Added automatic
-tilde-substitution in many commands, including "glob".
-
-------------------- Released version 3.3 ---------------------
-
-27. 7/11/90 Added "Tcl_AppendResult" procedure.
-
-28. 7/20/90 "History" with no options now defaults to "history info"
-rather than to "history redo".  Although this is a backward incompatibility,
-it should only be used interactively and thus shouldn't present any
-compatibility problems with scripts.
-
-29. 7/20/90 Added "Tcl_GetInteger", "Tcl_GetDouble", and "Tcl_GetBoolean"
-procedures.
-
-30. 7/22/90 Removed "Tcl_WatchInterp" procedure:  doesn't seem to be
-necessary, since the same effect can be achieved with the deletion
-callbacks on individual commands.  *** POTENTIAL INCOMPATIBILITY ***
-
-31. 7/23/90 Added variable tracing:  Tcl_TraceVar, Tcl_UnTraceVar,
-and Tcl_VarTraceInfo procedures, "trace" command.
-
-32. 8/9/90 Mailed out list of all bug fixes since 3.3 release.
-
-33. 8/29/90 Fixed bugs in Tcl_Merge relating to backslashes and
-semi-colons.  Mailed out patch.
-
-34. 9/3/90 Fixed bug in tclBasic.c: quotes weren't quoting ]'s.
-Mailed out patch.
-
-35. 9/19/90 Rewrote exec to always use files both for input and
-output to the process.  The old pipe-based version didn't work if
-the exec'ed process forked a child and then exited:  Tcl waited
-around for stdout to get closed, which didn't happen until the
-grandchild exited.
-
-36. 11/5/90 ERR_IN_PROGRESS flag wasn't being cleared soon enough
-in Tcl_Eval, allowing error messages from different commands to
-pile up in $errorInfo.  Fixed by re-arranging code in Tcl_Eval that
-re-initializes result and ERR_IN_PROGRESS flag.  Didn't mail out
-patch:  changes too complicated to describe.
-
-37. 12/19/90 Added Tcl_VarEval procedure as a convenience for
-assembling and executing Tcl commands.
-
-38. 1/29/91 Fixed core leak in Tcl_AddErrorInfo.  Also changed procedure
-and Tcl_Eval so that first call to Tcl_AddErrorInfo need not come from
-Tcl_Eval.
-
------------------ Released version 5.0 with Tk ------------------
-
-39. 4/3/91 Removed change bars from manual entries, leaving only those
-that came after version 3.3 was released.
-
-40. 5/17/91 Changed tests to conform to Mary Ann May-Pumphrey's approach.
- 
-41. 5/23/91 Massive revision to Tcl parser to simplify the implementation
-of string and floating-point support in expressions.  Newlines inside
-[] are now treated as command separators rather than word separators
-(this makes newline treatment consistent throughout Tcl).
-*** POTENTIAL INCOMPATIBILITY ***
-
-42. 5/23/91 Massive rewrite of expression code to support floating-point
-values and simple string comparisons.  The C interfaces to expression
-routines have changed (Tcl_Expr is replaced by Tcl_ExprLong, Tcl_ExprDouble,
-etc.), but all old Tcl expression strings should be accepted by the new
-expression code.
-*** POTENTIAL INCOMPATIBILITY ***
-
-43. 5/23/91 Modified tclHistory.c to check for negative "keep" value.
-
-44. 5/23/91 Modified Tcl_Backslash to handle backslash-newline.  It now
-returns 0 to indicate that a backslash sequence should be replaced by
-no character at all.
-*** POTENTIAL INCOMPATIBILITY ***
-
-45. 5/29/91 Modified to use ANSI C function prototypes.  Must set
-"USE_ANSI" switch when compiling to get prototypes.
-
-46. 5/29/91 Completed test suite by providing tests for all of the
-built-in Tcl commands.
-
-47. 5/29/91 Changed Tcl_Concat to eliminate leading and trailing
-white-space in each of the things it concatenates and to ignore
-elements that are empty or have only white space in them.  This
-produces cleaner output from the "concat" command.
-*** POTENTIAL INCOMPATIBILITY ***
-
-48. 5/31/91 Changed "set" command and Tcl_SetVar procedure to return
-new value of variable.
-
-49. 6/1/91 Added "while" and "cd" commands.
-
-50. 6/1/91 Changed "exec" to delete the last character of program
-output if it is a newline.  In most cases this makes it easier to
-process program-generated output.
-*** POTENTIAL INCOMPATIBILITY ***
-
-51. 6/1/91 Made sure that pointers are never used after freeing them.
-
-52. 6/1/91 Fixed bug in TclWordEnd where it wasn't dealing with
-[] inside quotes correctly.
-
-53. 6/8/91 Fixed exec.test to accept return values of either 1 or
-255 from "false" command.
-
-54. 7/6/91 Massive overhaul of variable management.  Associative
-arrays now available, along with "unset" command (and Tcl_UnsetVar
-procedure).  Variable traces have been completely reworked:
-interfaces different both from Tcl and C, and multiple traces may
-exist on same variable.  Can no longer redefine existing local
-variable to be global.  Calling sequences have changed slightly
-for Tcl_GetVar and Tcl_SetVar ("global" is now "flags"). Tcl_SetVar
-can fail and return a NULL result.  New forms of variable-manipulation
-procedures:  Tcl_GetVar2, Tcl_SetVar2, etc.  Syntax of variable
-$-notation changed to support array indexing.
-*** POTENTIAL INCOMPATIBILITY ***
-
-55. 7/6/91 Added new list-manipulation procedures:  Tcl_ScanElement,
-Tcl_ConvertElement, Tcl_AppendElement.
-
-56. 7/12/91 Created new procedure Tcl_EvalFile, which does most of the
-work of the "source" command.
-
-57. 7/20/91 Major reworking of "exec" command to allow pipelines,
-more redirection, background.  Added new procedures Tcl_Fork,
-Tcl_WaitPids, Tcl_DetachPids, and Tcl_CreatePipeline.  The old
-"< input" notation has been replaced by "<< input" ("<" is for
-redirection from a file).  Also handles error returns and abnormal
-terminations (e.g. signals) differently.
-*** POTENTIAL INCOMPATIBILITY ***
-
-58. 7/21/91 Added "append" and "lappend" commands.
-
-59. 7/22/91 Reworked error messages and manual entries to use
-?x? as the notation for an optional argument x, instead of [x].  The
-bracket notation was often confused with the use of brackets for
-command substitution.  Also modified error messages to be more
-consistent.
-
-60. 7/23/91 Tcl_DeleteCommand now returns an indication of whether
-or not the command actually existed, and the "rename" command uses
-this information to return an error if an attempt is made to delete
-a non-existent command.
-*** POTENTIAL INCOMPATIBILITY ***
-
-61. 7/25/91 Added new "errorCode" mechanism, along with procedures
-Tcl_SetErrorCode, Tcl_UnixError, and Tcl_ResetResult.  Renamed
-Tcl_Return to Tcl_SetResult, but left a #define for Tcl_Return to
-avoid compatibility problems.
-
-62. 7/26/91 Extended "case" command with alternate syntax where all
-patterns and commands are together in a single list argument:  makes
-it easier to write multi-line case statements.
-
-63. 7/27/91 Changed "print" command to perform tilde-substitution on
-the file name.
-
-64. 7/27/91 Added "tolower", "toupper", "trim", "trimleft", and "trimright"
-options to "string" command.
-
-65. 7/29/91 Added "atime", "mtime", "size", and "stat" options to "file"
-command.
-
-66. 8/1/91 Added "split" and "join" commands.
-
-67. 8/11/91 Added commands for file I/O, including "open", "close",
-"read", "gets", "puts", "flush", "eof", "seek", and "tell".
-
-68. 8/14/91 Switched to use a hash table for command lookups.  Command
-abbreviations no longer have direct support in the Tcl interpreter, but
-it should be possible to simulate them with the auto-load features
-described below.  The "noAbbrev" variable is no longer used by Tcl.
-*** POTENTIAL INCOMPATIBILITY ***
-
-68.5 8/15/91 Added support for "unknown" command, which can be used to
-complete abbreviations, auto-load library files, auto-exec shell
-commands, etc.
-
-69. 8/15/91 Added -nocomplain switch to "glob" command.
-
-70. 8/20/91 Added "info library" option and TCL_LIBRARY #define.  Also
-added "info script" option.
-
-71. 8/20/91 Changed "file" command to take "option" argument as first
-argument (before file name), for consistency with other Tcl commands.
-*** POTENTIAL INCOMPATIBILITY ***
-
-72. 8/20/91 Changed format of information in $errorInfo variable:
-comments such as 
-    ("while" body line 1)
-are now on separate lines from commands being executed.
-*** POTENTIAL INCOMPATIBILITY ***
-
-73. 8/20/91 Changed Tcl_AppendResult so that it (eventually) frees
-large buffers that it allocates.
-
-74. 8/21/91 Added "linsert", "lreplace", "lsearch", and "lsort"
-commands.
-
-75. 8/28/91 Added "incr" and "exit" commands.
-
-76. 8/30/91 Added "regexp" and "regsub" commands.
-
-77. 9/4/91 Changed "dynamic" field in interpreters to "freeProc" (procedure
-address).  This allows for alternative storage managers.
-*** POTENTIAL INCOMPATIBILITY ***
-
-78. 9/6/91 Added "index", "length", and "range" options to "string"
-command.  Added "lindex", "llength", and "lrange" commands.
-
-79. 9/8/91 Removed "index", "length", "print" and "range" commands.
-"Print" is redundant with "puts", but less general, and the other
-commands are replaced with the new commands described in change 78
-above.
-*** POTENTIAL INCOMPATIBILITY ***
-
-80. 9/8/91 Changed history revision to occur even when history command
-is nested;  needed in order to allow "history" to be invoked from
-"unknown" procedure.
-
-81. 9/13/91 Changed "panic" not to use vfprintf (it's uglier and less
-general now, but makes it easier to run Tcl on systems that don't
-have vfprintf).  Also changed "strerror" not to redeclare sys_errlist.
-
-82. 9/19/91 Lots of changes to improve portability to different UNIX
-systems, including addition of "config" script to adapt Tcl to the
-configuration of the system it's being compiled on.
-
-83. 9/22/91 Added "pwd" command.
-
-84. 9/22/91 Renamed manual pages so that their filenames are no more
-than 14 characters in length, moved to "doc" subdirectory.
-
-85. 9/24/91 Redid manual entries so they contain the supplemental
-macros that they need;  can just print with "troff -man" or "man"
-now.
-
-86. 9/26/91 Created initial version of script library, including
-a version of "unknown" that does auto-loading, auto-execution, and
-abbreviation expansion.  This library is used by tclTest
-automatically.  See the "library" manual entry for details.
-
------------------ Released version 6.0, 9/26/91 ------------------
-
-87. 9/30/91 Made "string tolower" and "string toupper" check case
-before converting:  on some systems, "tolower" and "toupper" assume
-that character already has particular case.
-
-88. 9/30/91 Fixed bug in Tcl_SetResult:  wasn't always setting freeProc
-correctly when called with NULL value.  This tended to cause memory
-allocation errors later.
-
-89. 10/3/91 Added "upvar" command.
-
-90. 10/4/91 Changed "format" so that internally it converts %D to %ld,
-%U to %lu, %O to %lo, and %F to %f.  This eliminates some compatibility
-problems on some machines without affecting behavior.
-
-91. 10/10/91 Fixed bug in "regsub" that caused core dumps with the -all
-option when the last match wasn't at the end of the string.
-
-92. 10/17/91 Fixed problems with backslash sequences:  \r support was
-incomplete and \f and \v weren't supported at all.
-
-93. 10/24/91 Added Tcl_InitHistory procedure.
-
-94. 10/24/91 Changed "regexp" to store "-1 -1" in subMatchVars that
-don't match, rather than returning an error.
-
-95. 10/27/91 Modified "regexp" to return actual strings in matchVar
-and subMatchVars instead of indices.  Added "-indices" switch to cause
-indices to be returned.
-*** POTENTIAL INCOMPATIBILITY ***
-
-96. 10/27/91 Fixed bug in "scan" where it used hardwired constants for
-sizes of floats and doubles instead of using "sizeof".
-
-97. 10/31/91 Fixed bug in tclParse.c where parse-related error messages
-weren't being storage-managed correctly, causing spurious free's.
-
-98. 10/31/91 Form feed and vertical tab characters are now considered
-to be space characters by the parser.
-
-99. 10/31/91 Added TCL_LEAVE_ERR_MSG flag to procedures like Tcl_SetVar.
-
-100. 11/7/91 Fixed bug in "case" where "in" argument couldn't be omitted
-if all case branches were embedded in a single list.
-
-101. 11/7/91 Switched to use "pid_t" and "uid_t" and other official
-POSIC types and function prototypes.
-
------------------ Released version 6.1, 11/7/91 ------------------
-
-102. 12/2/91 Modified Tcl_ScanElement and Tcl_ConvertElement in several
-ways.  First, allowed caller to request that only backslashes be used
-(no braces).  Second, made Tcl_ConvertElement more aggressive in using
-backslashes for braces and quotes.
-
-103. 12/5/91 Added "type", "lstat", and "readlink" options to "file"
-command, plus added new "type" element to output of "stat" and "lstat"
-options.
-
-104. 12/10/91 Manual entries had first lines that caused "man" program
-to try weird preprocessor.  Added blank comment lines to fix problem.
-
-105. 12/16/91 Fixed a few bugs in auto_mkindex proc:  wasn't handling
-errors properly, and hadn't been upgraded for new "regexp" syntax.
-
-106. 1/2/92 Fixed bug in "file" command where it didn't properly handle
-a file names containing tildes where the indicated user doesn't exist.
-
-107. 1/2/92 Fixed lots of cases in tclUnixStr.c where two different
-errno symbols (e.g. EWOULDBLOCK and EAGAIN) have the same number;  Tcl
-will only use one of them.
-
-108. 1/2/92 Lots of changes to configuration script to handle many more
-systems more gracefully.  E.g. should now detect the bogus strtoul that
-comes with AIX and substitute Tcl's own version instead.
-
------------------ Released version 6.2, 1/10/92 ------------------
-
-109. 1/20/92 Config didn't have code to actually use "uid_t" variable
-to set TCL_UIT_T #define.
-
-110. 2/10/92 Tcl_Eval didn't properly reset "numLevels" variable when
-too-deep recursion occurred.
-
-111. 2/29/92 Added "on" and "off" to keywords accepted by Tcl_GetBoolean.
-
-112. 3/19/92 Config wasn't installing default version of strtod.c for
-systems that don't have one in libc.a.
-
-113. 3/23/92 Fixed bug in tclExpr.c where numbers with leading "."s,
-like 0.75, couldn't be properly substituted into expressions with
-variable or command substitution.
-
-114. 3/25/92 Fixed bug in tclUnixAZ.c where "gets" command wasn't
-checking to make sure that it was able to write the variable OK.
-
-115. 4/16/92 Fixed bug in tclUnixAZ.c where "read" command didn't
-compute file size right for device files.
-
-116. 4/23/92 Fixed but in tclCmdMZ.c where "trace vinfo" was overwriting
-the trace command.
-
------------------ Released version 6.3, 5/1/92 ------------------
-
-117. 5/1/92 Added Tcl_GlobalEval.
-
-118. 6/1/92 Changed auto-load facility to source files at global level.
-
-119. 6/8/92 Tcl_ParseVar wasn't always setting termPtr after errors, which
-sometimes caused core dumps.
-
-120. 6/21/92 Fixed bug in initialization of regexp pattern cache.  This
-bug caused segmentation violations in regexp commands under some conditions.
-
-121. 6/22/92 Changed implementation of "glob" command to eliminate
-trailing slashes on directory names:  they confuse some systems.  There
-shouldn't be any user-visible changes in functionality except for names
-in error messages not having trailing slashes.
-
-122. 7/2/92 Fixed bug that caused 'string match ** ""' to return 0.
-
-123. 7/2/92 Fixed bug in Tcl_CreateCmdBuf where it wasn't initializing
-the buffer to an empty string.
-
-124. 7/6/92 Fixed bug in "case" command where it used NULL pattern string
-after errors in the "default" clause.
-
-125. 7/25/92 Speeded up auto_load procedure:  don't reread all the index
-files unless the path has changed.
-
-126. 8/3/92 Changed tclUnix.h to define MAXPATHLEN from PATH_MAX, not
-_POSIX_PATH_MAX.
-
------------------ Released version 6.4, 8/7/92 ------------------
-
-127. 8/10/92 Changed tclBasic.c so that comment lines can be continued by
-putting a backslash before the newline.
-
-128. 8/21/92 Modified "unknown" to allow the source-ing of a file for
-an auto-load to trigger other nested auto-loads, as long as there isn't
-any recursion on the same command name.
-
-129. 8/25/92 Modified "format" command to allow " " and "+" flags, and
-allow flags in any order.
-
-130. 9/14/92 Modified Tcl_ParseVar so that it doesn't actually attempt
-to look up the variable if "noEval" mode is in effect in the interpreter
-(it just parses the name).  This avoids the errors that used to occur
-in statements like "expr {[info exists foo] && $foo}".
-
-131. 9/14/92 Fixed bug in "uplevel" command where it didn't output the
-correct error message if a level was specified but no command.
-
-132. 9/14/92 Renamed manual entries to have extensions like .3 and .n,
-and added "install" target to Makefile.
-
-133. 9/18/92 Modified "unknown" command to emulate !!, !<num>, and
-^<old>^<new> csh history substitutions.
-
-134. 9/21/92 Made the config script cleverer about figuring out which
-switches to pass to "nm".
-
-135. 9/23/92 Fixed tclVar.c to be sure to copy flags when growing variables.
-Used to forget about traces in progress and make extra recursive calls
-on trace procs.
-
-136. 9/28/92 Fixed bug in auto_reset where it was unsetting variables
-that might not exist.
-
-137. 10/7/92 Changed "parray" library procedure to print any array
-accessible to caller, local or global.
-
-138. 10/15/92 Fixed bug where propagation of new environment variable
-values among interpreters took N! time if there exist N interpreters.
-
-139. 10/16/92 Changed auto_reset procedure so that it also deletes any
-existing procedures that are in the auto_load index (the assumption is
-that they should be re-loaded to get the latest versions).
-
-140. 10/21/92 Fixed bug that caused lists to be incorrectly generated
-for elements that contained backslash-newline sequences.
-
-141. 12/9/92 Added support for TCL_LIBRARY environment variable:  use
-it as library location if it's present.
-
-142. 12/9/92 Added "info complete" command, Tcl_CommandComplete procedure.
-
-143. 12/16/92 Changed the Makefile to check to make sure "config" has been
-run (can't run config directly from the Makefile because it modifies the
-Makefile;  thus make has to be run again after running config).
-
------------------ Released version 6.5, 12/17/92 ------------------
-
-144. 12/21/92 Changed config to look in several places for libc file.
-
-145. 12/23/92 Added "elseif" support to if.  Also, "then", "else", and
-"elseif" may no longer be abbreviated.
-*** POTENTIAL INCOMPATIBILITY ***
-
-146. 12/28/92 Changed "puts" and "read" to support initial "-nonewline"
-switch instead of additional "nonewline" argument.  The old form is
-still supported, but it is discouraged and is no longer documented.
-Also changed "puts" to make the file argument default to stdout: e.g.
-"puts foo" will print foo on standard output.
-
-147. 1/6/93 Fixed bug whereby backslash-newline wasn't working when
-typed interactively, or in "info complete".
-
-148. 1/22/93 Fixed bugs in "lreplace" and "linsert" where close
-quotes were being lost from last element before replacement or
-insertion.
-
-149. 1/29/93 Fixed bug in Tcl_AssembleCmd where it wasn't requiring
-a newline at the end of a line before considering a command to be
-complete.  The bug caused some very long lines in script files to
-be processed as multiple separate commands.
-
-150. 1/29/93 Various changes in Makefile to add more configuration
-options, simplify installation, fix bugs (e.g. don't use -f switch
-for cp), etc.
-
-151. 1/29/93 Changed "name1" and "name2" identifiers to "part1" and
-"part2" to avoid name conflicts with stupid C++ implementations that
-use "name1" and "name2" in a reserved way.
-
-152. 2/1/93 Added "putenv" procedure to replace the standard system
-version so that it will work correctly with Tcl's environment handling.
-
------------------ Released version 6.6, 2/5/93 ------------------
-
-153. 2/10/93 Fixed bugs in config script:  missing "endif" in libc loop,
-and tried to use strncasecmp.c instead of strcasecmp.c.
-
-154. 2/10/93 Makefile improvements:  added RANLIB variable for easier
-Sys-V configuration, added SHELL variable for SGI systems.
-
------------------ Released version 6.7, 2/11/93 ------------------
-
-153. 2/6/93 Changes in backslash processing:
-    - \Cx, \Mx, \CMx, \e sequences no longer special
-    - \<newline> also eats up any space after the newline, replacing
-      the whole sequence with a single space character
-    - Hex sequences like \x24 are now supported, along with ANSI C's \a.
-    - "format" no longer does backslash processing on its format string
-    - there is no longer any special meaning to a 0 return value from
-      Tcl_Backslash
-    - unknown backslash sequences, like (e.g. \*), are replaced with
-      the following character (e.g. *), instead of just treating the
-      backslash as an ordinary character.
-*** POTENTIAL INCOMPATIBILITY ***
-
-154. 2/6/93 Updated all copyright notices.  The meaning hasn't changed
-at all but the wording does a better job of protecting U.C. from
-liability (according to U.C. lawyers, anyway).
-
-155. 2/6/93 Changed "regsub" so that it overwrites the result variable
-in all cases, even if there is no match.
-*** POTENTIAL INCOMPATIBILITY ***
-
-156. 2/8/93 Added support for XPG3 %n$ conversion specifiers to "format"
-command.
-
-157. 2/17/93 Fixed bug in Tcl_Eval where errors due to infinite
-recursion could result in core dumps.
-
-158. 2/17/93 Improved the auto-load mechanism to deal gracefully (i.e.
-return an error) with a situation where a library file that supposedly
-defines a procedure doesn't actually define it.
-
-159. 2/17/93 Renamed Tcl_UnixError procedure to Tcl_PosixError, and
-changed errorCode variable usage to use POSIX as keyword instead of
-UNIX.
-*** POTENTIAL INCOMPATIBILITY ***
-
-160. 2/19/93 Changes to exec and process control:
-    - Added support for >>, >&, >>&, |&, <@, >@, and >&@ forms of redirection.
-    - When exec puts processes into background, it returns a list of
-      their pids as result.
-    - Added support for <file, >file, etc. (i.e. no space between
-      ">" and file name.
-    - Added -keepnewline option.
-    - Deleted Tcl_Fork and Tcl_WaitPids procedures (just use fork and
-      waitpid instead).
-    - Added waitpid compatibility procedure for systems that don't have
-      it.
-    - Added Tcl_ReapDetachedProcs procedure.
-    - Changed "exec" to return an error if there is stderr output, even
-      if the command returns a 0 exit status (it's always been documented
-      this way, but the implementation wasn't correct).
-    - If a process returns a non-zero exit status but doesn't generate
-      any diagnostic output, then Tcl generates an error message for it.
-*** POTENTIAL INCOMPATIBILITY ***
-
-161. 2/25/93 Fixed two memory-management problems having to do with
-managing the old result during variable trace callbacks.
-
-162. 3/1/93 Added dynamic string library:  Tcl_DStringInit, Tcl_DStringAppend,
-Tcl_DStringFree, Tcl_DStringResult, etc.
-
-163. 3/1/93 Modified glob command to only return the names of files that
-exist, and to only return names ending in "/" if the file is a directory.
-*** POTENTIAL INCOMPATIBILITY ***
-
-164. 3/19/93 Modified not to use system calls like "read" directly,
-but instead to use special Tcl procedures that retry automatically
-if interrupted by signals.
-
-165. 4/3/93 Eliminated "noSep" argument to Tcl_AppendElement, plus
-TCL_NO_SPACE flag for Tcl_SetVar and Tcl_SetVar2.
-*** POTENTIAL INCOMPATIBILITY ***
-
-166. 4/3/93 Eliminated "flags" and "termPtr" arguments to Tcl_Eval.
-*** POTENTIAL INCOMPATIBILITY ***
-
-167. 4/3/93 Changes to expressions:
-    - The "expr" command now accepts multiple arguments, which are
-      concatenated together with space separators.
-    - Integers aren't automatically promoted to floating-point if they
-      overflow the word size:  errors are generated instead.
-    - Tcl can now handle "NaN" and other special values if the underlying
-      library procedures handle them.
-    - When printing floating-point numbers, Tcl ensures that there is a "."
-      or "e" in the number, so it can't be treated as an integer accidentally.
-      The procedure Tcl_PrintDouble is available to provide this function
-      in other contexts.  Also, the variable "tcl_precision" can be used
-      to set the precision for printing (must be a decimal number giving
-      digits of precision).
-    - Expressions now support transcendental and other functions, e.g. sin,
-      acos, hypot, ceil, and round.  Can add new math functions with
-      Tcl_CreateMathFunc().
-    - Boolean expressions can now have any of the string values accepted
-      by Tcl_GetBoolean, such as "yes" or "no".
-*** POTENTIAL INCOMPATIBILITY ***
-
-168. 4/5/93 Changed Tcl_UnsetVar and Tcl_UnsetVar2 to return TCL_OK
-or TCL_ERROR instead of 0 or -1.
-*** POTENTIAL INCOMPATIBILITY ***
-
-169. 4/5/93 Eliminated Tcl_CmdBuf structure and associated procedures;
-can use Tcl_DStrings instead.
-*** POTENTIAL INCOMPATIBILITY ***
-
-170. 4/8/93 Changed interface to Tcl_TildeSubst to use a dynamic
-string for buffer space.  This makes the procedure re-entrant and
-thread-safe, whereas it wasn't before.
-*** POTENTIAL INCOMPATIBILITY ***
-
-171. 4/14/93 Eliminated tclHash.h, and moved everything from it to
-tcl.h
-*** POTENTIAL INCOMPATIBILITY ***
-
-172. 4/15/93 Eliminated Tcl_InitHistory, made "history" command always
-be part of interpreter.
-*** POTENTIAL INCOMPATIBILITY ***
-
-173. 4/16/93 Modified "file" command so that "readable" option always
-exists, even on machines that don't support symbolic links (always returns
-same error as if the file wasn't a symbolic link).
-
-174. 4/26/93 Fixed bugs in "regsub" where ^ patterns didn't get handled
-right (pretended not to match when it really did, and looped infinitely
-if -all was specified).
-
-175. 4/29/93 Various improvements in the handling of variables:
-    - Can create variables and array elements during a read trace.
-    - Can delete variables during traces (note: unset traces will be
-      invoked when this happens).
-    - Can upvar to array elements.
-    - Can retarget an upvar to another variable by re-issuing the
-      upvar command with a different "other" variable.
-
-176. 5/3/93 Added Tcl_GetCommandInfo, which returns info about a Tcl
-command such as whether it exists and its ClientData.  Also added
-Tcl_SetCommandInfo, which allows any of this information to be modified
-and also allows a command's delete procedure to have a different
-ClientData value than its command procedure.
-
-177. 5/5/93 Added Tcl_RegExpMatch procedure.
-
-178. 5/6/93 Fixed bug in "scan" where it didn't properly handle
-%% conversion specifiers.  Also changed "scan" to use Tcl_PrintDouble
-for printing real values.
-
-179. 5/7/93 Added "-exact", "-glob", and "-regexp" options to "lsearch"
-command to allow different kinds of pattern matching.
-
-180. 5/7/93 Added many new switches to "lsort" to control the sorting
-process: "-ascii", "-integer", "-real", "-command", "-increasing",
-and "-decreasing".
-
-181. 5/10/93 Changes to file I/O:
-    - Modified "open" command to support a list of POSIX access flags
-      like {WRONLY CREAT TRUNC} in addition to current fopen-style
-      access modes.  Also added "permissions" argument to set permissions
-      of newly-created files.
-    - Fixed Scott Bolte's bug (can close stdin etc. in application and
-      then re-open them with Tcl commands).
-    - Exported access to Tcl's file table with new procedures Tcl_EnterFile
-      and Tcl_GetOpenFile.
-
-182. 5/15/93 Added new "pid" command, which can be used to retrieve
-either the current process id or a list of the process ids in a
-pipeline opened with "open |..."
-
-183. 6/3/93 Changed to use GNU autoconfig for configuration instead of
-the home-brew "config" script.  Also made many other configuration-related
-changes, such as using <unistd.h> instead of explicitly declaring system
-calls in tclUnix.h.
-
-184. 6/4/93 Fixed bug where core-dumps could occur if a procedure
-redefined itself (the memory for the procedure's body could get
-reallocated in the middle of evaluating the body);  implemented
-simple reference count mechanism.
-
-185. 6/5/93 Changed tclIndex file format in two ways:  (a) it's now
-eval-ed instead of parsed, which makes it 3-4x faster; (b) the entries
-in auto_index are now commands to evaluate, which allows commands to
-be loaded in different ways such as dynamic-loading of C code.  The
-old tclIndex file format is still supported.
-
-186. 6/7/93 Eliminated tclTest program, added new "tclsh" program
-that is more like wish (allows script files to be invoked automatically
-using "#!/usr/local/bin/tclsh", makes arguments available to script,
-etc.).  Added support for Tcl_AppInit plus default version;  this
-allows new Tcl applications to be created without modifying the
-main program for tclsh.
-
-187. 6/7/93 Fixed bug in TclWordEnd that kept backslash-newline from
-working correctly in some cases during interactive input.
-
-188. 6/9/93 Added Tcl_LinkVar and related procedures, which automatically
-keep a Tcl variable in sync with a C variable.
-
-189. 6/16/93 Increased maximum nesting depth from 100 to 1000.
-
-190. 6/16/93 Modified "trace var" command so that error messages from
-within traces are returned properly as the result of the variable
-access, instead of the generic "access disallowed by trace command"
-message.
-
-191. 6/16/93 Added Tcl_CallWhenDeleted to provide callbacks when an
-interpreter is deleted (same functionality as Tcl_WatchInterp, which
-used to exist in versions before 6.0).
-
-193. 6/16/93 Added "-code" argument to "return" command;  it's there
-primarily for completeness, so that procedures implementing control
-constructs can reflect exceptional conditions back to their callers.
-
-194. 6/16/93 Split up Tcl.n to make separate manual entries for each
-Tcl command.  Tcl.n now contains a summary of the language syntax.
-
-195. 6/17/93 Added new "switch" command to replace "case": allows
-alternate forms of pattern matching (exact, glob, regexp), replaces
-pattern lists with single patterns (but you can use "-" bodies to
-share one body among several patterns), eliminates "in" noise word.
-"Case" command is now obsolete.
-
-196. 6/17/93 Changed the "exec", "glob", "regexp", and "regsub" commands
-to include a "--" switch.  All initial arguments starting with "-" are now
-treated as switches unless a "--" switch is present to end the list.
-*** POTENTIAL INCOMPATIBILITY ***
-
-197. 6/17/93 Changed auto-exec so that the subprocess gets stdin, stdout,
-and stderr from the parent.  This allows truly interactive sub-processes
-(e.g. vi) to be auto-exec'ed from a tcl shell command line.
-
-198. 6/18/93 Added patchlevel.h, for use in coordinating future patch
-releases, and also added "info patchlevel" command to make the patch
-level available to Tcl scripts.
-
-199. 6/19/93 Modified "glob" command so that a leading "//" in a name
-gets left as is (this is needed for systems like Apollos where "//" is
-the super-root;  Tcl used to collapse the two slashes into a single
-slash).
-
-200. 7/7/93 Added Tcl_SetRecursionLimit procedure so that the maximum
-allowable nesting depth can be controlled for an interpreter from C.
-
------------------ Released version 7.0 Beta 1, 7/9/93 ------------------
-
-201. 7/12/93 Modified Tcl_GetInt and tclExpr.c so that full-precision
-unsigned integers can be specified without overflow errors.
-
-202. 7/12/93 Configuration changes:  eliminate leading blank line in
-configure script;  provide separate targets in Makefile for installing
-binary and non-binary information; check for size_t and a few other
-potentially missing typedefs; don't put tclAppInit.o into libtcl.a;
-better checks for matherr support.
-
-203. 7/14/93 Changed tclExpr.c to check the termination pointer before
-errno after strtod calls, to avoid problems with some versions of
-strtod that set errno in unexpected ways.
-
-204. 7/16/93 Changed "scan" command to be more ANSI-conformant:
-eliminated %F, %D, etc., added code to ignore "l", "h", and "L"
-modifiers but always convert %e, %f, and %g with implicit "l";
-also added support for %u and %i.  Also changed "format" command
-to eliminate %D, %U, %O, and add %i.
-*** POTENTIAL INCOMPATIBILITY ***
-
-205. 7/17/93 Changed "uplevel" and "upvar" so that they can be used
-from global level to global level:  this used to generate an error.
-
-206. 7/19/93 Renamed "setenv", "putenv", and "unsetenv" procedures
-to avoid conflicts with system procedures with the same names.  If
-you want Tcl's procedures to override the system procedures, do it
-in the Makefile (instructions are in the Makefile).
-*** POTENTIAL INCOMPATIBILITY ***
-
------------------ Released version 7.0 Beta 2, 7/21/93 ------------------
-
-207. 7/21/93 Fixed bug in tclVar.c where freed memory was accidentally
-used if a procedure returned an element of a local array.
-
-208. 7/22/93 Fixed bug in "unknown" where it didn't properly handle
-errors occurring in the "auto_load" procedure, leaving its state
-inconsistent.
-
-209. 7/23/93 Changed exec's ">2" redirection operator to "2>" for
-consistency with sh.  This is incompatible with earlier beta releases
-of 7.0 but not with pre-7.0 releases, which didn't support either
-operator.
-
-210. 7/28/93 Changed backslash-newline handling so that the resulting
-space character *is* treated as a word separator unless the backslash
-sequence is in quotes or braces.  This is incompatible with 7.0b1
-and 7.0b2 but is more compatible with pre-7.0 versions that the b1
-and b2 releases were.
-
-211. 7/28/93 Eliminated Tcl_LinkedVarWritable, added TCL_LINK_READ_ONLY to
-Tcl_LinkVar to accomplish same purpose.  This change is incompatible
-with earlier beta releases, but not with releases before Tcl 7.0.
-
-212. 7/29/93 Renamed regexp C functions so they won't clash with POSIX
-regexp functions that use the same name.
-
-213. 8/3/93 Added "-errorinfo" and "-errorcode" options to "return"
-command: these allow for much better handling of the errorInfo
-and errorCode variables in some cases.
-
-214. 8/12/93 Changed "expr" so that % always returns a remainder with
-the same sign as the divisor and absolute value smaller than the
-divisor.
-
-215. 8/14/93 Turned off auto-exec in "unknown" unless the command
-was typed interactively.  This means you must use "exec" when
-invoking subprocesses, unless it's a command that's typed interactively.
-*** POTENTIAL INCOMPATIBILITY ***
-
-216. 8/14/93 Added support for tcl_prompt1 and tcl_prompt2 variables
-to tclMain.c:  makes prompts user-settable.
-
-217. 8/14/93 Added asynchronous handlers (Tcl_AsyncCreate etc.) so
-that signals can be taken cleanly by Tcl applications.
-
-218. 8/16/93 Moved information about open files from the interpreter
-structure to global variables so that a file can be opened in one
-interpreter and read or written in another.
-
-219. 8/16/93 Removed ENV_FLAGS from Makefile, so that there's no
-official support for overriding setenv, unsetenv, and putenv.
-
-220. 8/20/93 Various configuration improvements:  coerce chars
-to unsigned chars before using macros like isspace;  source ~/.tclshrc
-file during initialization if it exists and program is running
-interactively;  allow there to be directories in auto_path that don't
-exist or don't have tclIndex files (ignore them); added Tcl_Init
-procedure and changed Tcl_AppInit to call it.
-
-221. 8/21/93 Fixed bug in expr where "+", "-", and " " were all
-getting treated as integers with value 0.
-
-222. 8/26/93 Added "tcl_interactive" variable to tclsh.
-
-223. 8/27/93 Added procedure Tcl_FilePermissions to return whether a
-given file can be read or written or both.  Modified Tcl_EnterFile
-to take a permissions mask rather than separate read and write arguments.
-
-224. 8/28/93 Fixed performance bug in "glob" command (unnecessary call
-to "access" for each file caused a 5-10x slow-down for big directories).
-
------------------ Released version 7.0 Beta 3, 8/28/93 ------------------
-
-225. 9/9/93 Renamed regexp.h to tclRegexp.h to avoid conflicts with system
-include file by same name.
-
-226. 9/9/93 Added Tcl_DontCallWhenDeleted.
-
-227. 9/16/93 Changed not to call exit C procedure directly;  instead
-always invoke "exit" Tcl command so that application can redefine the
-command to do additional cleanup.
-
-228. 9/17/93 Changed auto-exec to handle names that contain slashes
-(i.e. don't use PATH for them).
-
-229. 9/23/93 Fixed bug in "read" and "gets" commands where they didn't
-clear EOF conditions.
-
------------------ Released version 7.0, 9/29/93 ------------------
-
-230. 10/7/93 "Scan" command wasn't properly aligning things in memory,
-so segmentation faults could arise under some circumstances.
-
-231. 10/7/93 Fixed bug in Tcl_ConvertElement where it forgot to
-backslash leading curly brace when creating lists.
-
-232. 10/7/93 Eliminated dependency of tclMain.c on tclInt.h and
-tclUnix.h, so that people can copy the file out of the Tcl source
-directory to make modified private versions.
-
-233. 10/8/93 Fixed bug in auto-loader that reversed the priority order
-of entries in auto_path for new-style index files.  Now things are
-back to the way they were before 3.0:  first in auto_path is always
-highest priority.
-
-234. 10/13/93 Fixed bug where Tcl_CommandComplete didn't recognize
-comments and treat them as such.  Thus if you typed the line
-    # {
-interactively, Tcl would think that the command wasn't complete and
-wait for more input before evaluating the script.
-
-235. 10/14/93 Fixed bug where "regsub" didn't set the output variable
-if the input string was empty.
-
-236. 10/23/93 Fixed bug where Tcl_CreatePipeline didn't close off enough
-file descriptors in child processes, causing children not to exit
-properly in some cases.
-
-237. 10/28/93 Changed "list" and "concat" commands not to generate
-errors if given zero arguments, but instead to just return an empty
-string.
-
------------------ Released version 7.1, 11/4/93 ------------------
-
-Note: there is no 7.2 release.  It was flawed and was thus withdrawn
-shortly after it was released.
-
-238. 11/10/93 TclMain.c didn't compile on some systems because of
-R_OK in call to "access".  Changed to eliminate call to "access".
-
------------------ Released version 7.3, 11/26/93 ------------------
-
-239. 11/6/93 Modified "lindex", "linsert", "lrange", and "lreplace"
-so that "end" can be specified as an index.
-
-240. 11/6/93 Modified "append" and "lappend" to allow only two
-words total (i.e., nothing to append) without generating an error.
-
-241. 12/2/93 Changed to use EAGAIN as the errno for non-blocking
-I/O instead of EWOULDBLOCK:  this should fix problem where non-blocking
-I/O didn't work correctly on System-V systems.
-
-242. 12/22/93 Fixed bug in expressions where cancelled evaluation
-wasn't always working correctly (e.g. "set one 1; eval {1 || 1/$one}"
-failed with a divide by zero error).
-
-243. 1/6/94 Changed TCL_VOLATILE definition from -1 to the address of
-a dummy procedure Tcl_Volatile, since -1 causes portability problems on
-some machines (e.g., Crays).
-
-244. 2/4/94 Added support for unary plus.
-
-245. 2/17/94 Changed Tcl_RecordAndEval and "history" command to
-call Tcl_GlobalEval instead of Tcl_Eval.  Otherwise, invocation of
-these facilities in nested procedures can cause unwanted results.
-
-246. 2/17/94 Fixed bug in tclExpr.c where an expression such as
-"expr {"12398712938788234-1298379" != ""}" triggers an integer
-overflow error for the number in quotes, even though it isn't really
-a proper integer anyway.
-
-247. 2/19/94 Added new procedure Tcl_DStringGetResult to move result
-from interpreter to a dynamic string.
-
-248. 2/19/94 Fixed bug in Tcl_DStringResult that caused it to overwrite
-the contents of a static result in some situations.  This can cause
-bizarre errors such as variables suddenly having empty values.
-
-249. 2/21/94 Fixed bug in Tcl_AppendElement, Tcl_DStringAppendElement,
-and the "lappend" command that caused improper omission of a separator
-space in some cases.  For example, the script
-    set x "abc{"; lappend x "def"
-used to return the result "abc{def" instead of "abc{ def".
-
-250. 3/3/94 Tcl_ConvertElement was outputting empty elements as \0 if
-TCL_DONT_USE_BRACES was set.  This depends on old pre-7.0 meaning of
-\0, which is no longer in effect, so it didn't really work.  Changed
-to output empty elements as {} always.
-
-251. 3/3/94 Renamed Tcl_DStringTrunc to Tcl_DStringSetLength and extended
-it so that it can be used to lengthen a string as well as shorten it.
-Tcl_DStringTrunc is defined as a macro for backward compatibility, but
-it is deprecated.
-
-252. 3/3/94 Added Tcl_AllowExceptions procedure.
-
-253. 3/13/94 Fixed bug in Tcl_FormatCmd that could cause "format"
-to mis-behave on 64-bit Big-Endian machines.
-
-254. 3/13/94 Changed to use vfork instead of fork on systems where
-vfork exists.
-
-255. 3/23/94 Fixed bug in expressions where ?: didn't associate
-right-to-left as they should.
-
-256. 4/3/94 Fixed "exec" to flush any files used in >@ or >&@
-redirection in exec, so that data buffered for them is written
-before any new data added by the subprocess.
-
-257. 4/3/94 Added "subst" command.
-
-258. 5/20/94 The tclsh main program is now called Tcl_Main;  tclAppInit.c
-has a "main" procedure that calls Tcl_Main.  This makes it easier to use
-Tcl with C++ programs, which need their own main programs, and it also
-allows an application to prefilter the argument list before calling
-Tcl_Main.
-*** POTENTIAL INCOMPATIBILITY ***
-
-259. 6/6/94 Fixed bug in procedure returns where the errorInfo variable
-could get truncated if an unset trace was invoked as part of returning
-from the procedure.
-
-260. 6/13/94 Added "wordstart" and "wordend" options to "string" command.
-
-261. 6/27/94 Fixed bug in expressions where they didn't properly cancel
-the evaluation of math functions in &&, ||, and ?:.
-
-262. 7/11/94 Incorrect boolean values, like "ogle", weren't being
-handled properly.
-
-263. 7/15/94 Added Tcl_RegExpCompile, Tcl_RegExpExec, and Tcl_RegExpRange,
-which provide lower-level access to regular expression pattern matching.
-
-264. 7/22/94 Fixed bug in "glob" command where "glob -nocomplain ~bad_user"
-would complain about a missing user.  Now it doesn't complain anymore.
-
-265. 8/4/94 Fixed bug with linked variables where they didn't behave
-correctly when accessed via upvars.
-
-266. 8/17/94 Fixed bug in Tcl_EvalFile where it didn't clear interp->result.
-
-267. 8/31/94 Modified "open" command so that errors in exec-ing
-subprocesses are returned by the open immediately, rather than
-being delayed until the "close" is executed.
-
-268. 9/9/94 Modified "expr" command to generate errors for integer
-overflow (includes addition, subtraction, negation, multiplication,
-division).
-
-269. 9/23/94 Modified "regsub" to return a count of the number of
-matches and replacements, rather than 0/1.
-
-279. 10/4/94 Added new features to "array" command:
-    - added "get" and "set" commands for easy conversion between arrays
-      and lists.
-    - added "exists" command to see if a variable is an array, changed
-      "names" and "size" commands to treat a non-existent array (or scalar
-      variable) just like an empty one.
-    - added pattern option to "names" command.
-
-280. 10/6/94 Modified Tcl_SetVar2 so that read traces on variables get
-called during append operations.
-
-281. 10/20/94 Fixed bug in "read" command where reading from stdin
-required two control-D's to stop the reading.
-
-282. 11/3/94 Changed "expr" command to use longs for division just like
-all other expr operators;  it previously used ints for division.
-
-283. 11/4/94 Fixed bugs in "unknown" procedure:  it wasn't properly
-handling exception returns from commands that were executed after
-being auto-loaded.
-
------------------ Released version 7.4b1, 12/23/94 ------------------
-
-284. 12/26/94 Fixed "install" target in Makefile (couldn't always
-find install program).
-
-285. 12/26/94 Added strcncasecmp procedure to compat directory.
-
-286. 1/3/95 Fixed all procedure calls to explicitly cast arguments:
-implicit conversions from prototypes (especially integer->double)
-don't work when compiling under non-ANSI compilers.  Tcl is now clean
-under gcc -Wconversion.
-
-287. 1/4/95 Fixed problem in Tcl_ArrayCmd where same name was used for
-both a label and a variable;  caused problems on several older compilers,
-making array command misbehave and causing many errors in Tcl test suite.
-
------------------ Released version 7.4b2, 1/12/95 ------------------
-
-288. 2/9/95 Modified Tcl_CreateCommand to return a token, and added
-Tcl_GetCommandName procedure.  Together, these procedures make it possible
-to track renames of a command.
-
-289. 2/13/95 Fixed bug in expr where "089" was interpreted as a
-floating-point number rather than a bogus octal number.
-*** POTENTIAL INCOMPATIBILITY ***
-
-290. 2/14/95 Added code to Tcl_GetInt and Tcl_GetDouble to check for
-overflows when reading in numbers.
-
-291. 2/18/95 Changed "array set" to stop after first error, rather than
-continuing after error.
-
-292. 2/20/95 Upgraded to use autoconf version 2.2.
-
-293. 2/20/95 Fixed core dump that could occur in "scan" command if a
-close bracket was omitted.
-
-294. 2/27/95 Changed Makefile to always use install-sh for installations:
-there's just too much variation among "install" system programs, which
-makes installation flakey.
-
------------------ Released version 7.4b3, 3/24/95 ------------------
-
-3/25/95 (bug fix) Changed "install" to "./install" in Makefile so that
-"make install" will work even when "." isn't in the search path.
-
-3/29/95 (bug fix) Fixed bug where the auto-loading mechanism wasn't
-protecting the values of the errorCode and errorInfo variables.
-
-3/29/95 (new feature) Added optional pattern argument to "parray" procedure.
-
-3/29/95 (bug fix) Made the full functionality of
-    "return -code ... -errorcode ..."
-work not just inside procedures, but also in sourced files and at
-top level.
-
-4/6/95 (new feature) Added "pattern" option to "array names" command.
-
-4/18/95 (bug fix) Fixed bug in parser where it didn't allow backslash-newline
-immediately after an argument in braces or quotes.
-
-4/19/95 (new feature) Added tcl_library variable, which application can
-set to override default library directory.
-
-4/30/95 (bug fix) During trace callbacks for array elements, the variable
-name used in the original reference would be temporarily modified to
-separate the array name and element name;  if the trace callback used
-the same name string, it would get the wrong name (the array name without
-element).  Fixed to restore the variable name before making trace
-callbacks.
-
-4/30/95 (new feature) Added -nobackslashes, -nocommands, and -novariables
-switches to "subst" command.
-
-5/4/95 (new feature) Added TCL_EVAL_GLOBAL flag to Tcl_RecordAndEval.
-
-5/5/95 (bug fix)  Format command would overrun memory when printing
-integers with very large precision, as in "format %.1000d 0".
-
-5/5/95 (portability improvement) Changed to use BSDgettimeofday on
-IRIX machines, to avoid compilation problems with the gettimeofday
-declaration.
-
-5/6/95 (bug fix) Changed manual entries to use the standard .TH
-macro instead of a custom .HS macro;  the .HS macro confuses index
-generators like makewhatis.
-
-5/9/95 (bug fix) Modified configure script to check for Solaris bug
-that makes vfork unreliable (core dumps result if vforked child
-changes a signal handler);  will use fork instead of vfork if the
-bug is present.
-
-6/5/95 (bug fix) Modified "lsort" command to disallow recursive calls
-to lsort from a comparison function.  This is needed because qsort
-is not reentrant.
-
-6/5/95 (bug fix) Undid change 243 above:  changed TCL_VOLATILE and
-TCL_DYNAMIC back to integer constants rather than procedure addresses.
-This was needed because procedure addresses can have multiple values
-under some dynamic loading systems (e.g. SunOS 4.1 and Windows).
-
-6/8/95 (feature change) Modified interface to Tcl_Main to pass in the
-address of the application-specific initialization procedure.
-Tcl_AppInit is no longer hardwired into Tcl_Main.  This is needed
-in order to make Tcl a shared library. 
-
-6/8/95 (feature change) Modified Makefile so that the installed versions
-of tclsh and libtcl.a have version number in them (e.g. tclsh7.4 and
-libtcl7.4.a) and the library directory name also has an embedded version
-number (e.g., /usr/local/lib/tcl7.4).  This should make it easier for
-Tcl 7.4 to coexist with earlier versions.
-
------------------ Released version 7.4b4, 6/16/95 ------------------
-
-6/19/95 (bug fix) Fixed bugs in tclCkalloc.c that caused core dumps
-if TCL_MEM_DEBUG was enabled on word-addressed machines such as Crays.
-
-6/21/95 (feature removal) Removed overflow checks for integer arithmetic:
-they just cause too much trouble (e.g. for random  number generators).
-
-6/28/95 (new features) Added tcl_patchLevel and tcl_version variables,
-for consistency with Tk.
-
-6/29/95 (bug fix) Fixed problem in Tcl_Eval where it didn't record
-the right termination character if a script ended with a comment.  This
-caused erroneous output for the following command, among others:
-puts "[
-expr 1+1
-# duh!
-]"
-
-6/29/95 (message change) Changed the error message for ECHILD slightly
-to provide a hint about why the problem is occurring.
-
------------------ Released version 7.4, 7/1/95 ------------------
-
-7/18/95 (bug fix) Changed "lreplace" so that nothing is deleted if
-the last index is less than the first index or if the last index
-is < 0.
-
-7/18/95 (bug fix) Fixed bugs with backslashes in comments:
-Tcl_CommandComplete (and "info complete") didn't properly handle
-strings ending in backslash-newline, and neither Tcl_CommandComplete
-nor the Tcl parser handled other backslash sequences right, such
-as two backslashes before a newline.
-
-7/19/95 (bug fix) Modified Tcl_DeleteCommand to delete the hash table
-entry for the command before invoking its callback.  This is needed in
-order to deal with reentrancy.
-
-7/22/95 (bug fix) "exec" wasn't reaping processes correctly after
-certain errors (e.g. if the name of the executable was bogus, as
-in "exec foobar").
-
-7/27/95 (bug fix) Makefile.in wasn't using the LIBS variable provided
-by the "configure" script.  This caused problems on some SCO systems.
-
-7/27/95 (bug fix) The version of strtod in fixstrtod.c didn't properly
-handle the case where endPtr == NULL.
-
------------------ Released patch 7.4p1, 7/29/95 -----------------------
-
-8/4/95 (bug fix) C-level trace callbacks for variables were sometimes
-receiving the PART1_NOT_PARSED flag, which could cause errors in
-subsequent Tcl library calls using the flags. (JO)
-
-8/4/95 (bug fix) Calls to toupper and tolower weren't using the
-UCHAR macros, which caused trouble in non-U.S. locales. (JO)
-
-8/10/95 (new feature) Added the "load" command for dynamic loading of
-binary packages, and the Tcl_PackageInitProc prototype for package
-initialization procedures. (JO)
-
-8/23/95 (new features) Added "info sharedlibextension" and
-"info nameofexecutable" commands, plus Tcl_FindExtension procedure. (JO)
-
-8/25/95 (bug fix) If the target of an "upvar" was non-existent but
-had traces set, the traces were silently lost.  Change to generate
-an error instead. (JO)
-
-8/25/95 (bug fix) Undid change from 7/19, so that commands can stay
-around while their deletion callbacks execute.  Added lots of code to
-handle all of the reentrancy problems that this opens up. (JO)
-
-8/25/95 (bug fix) Fixed core dump that could occur in TclDeleteVars
-if there was an upvar from one entry in the table to the next entry
-in the same table. (JO)
-
-8/28/95 (bug fix) Exec wasn't handling bad user names properly, as
-in "exec ~bogus_user/foo". (JO)
-
-8/29/95 (bug fixes) Changed backslash-newline handling to correct two
-problems:
-    - Only spaces and tabs following the backslash-newline are now
-      absorbed as part of the backslash-newline.  Newlinew are no
-      longer absorbed (add another backslash if you want to absorb
-      another newline).
-    - TclWordEnd returns the character just before the backslash in
-      the sequence as the end of the sequence;  it used to not consider
-      the backslash-newline as a word separator. (JO)
-
-8/31/95 (new feature) Changed man page installation (with "mkLinks"
-script) to create additional links for manual pages corresponding to
-each of the procedure and command names described in the pages. (JO)
-
-9/10/95 Reorganized Tcl sources for Windows and Mac ports.  All sources
-are now in subdirectories:  "generic" contains sources that work on all
-platforms, "windows", "mac", and "unix" directories contain platform-
-specific sources.  Some UNIX sources are also used on other platforms. (SS)
-
-9/10/95 (feature change) Eliminated exported global variables (they
-don't work with Windows DLLs).  Replaced tcl_AsyncReady and
-tcl_FileCloseProc with procedures Tcl_AsyncReady() and
-Tcl_SetFileCloseProc().  Replaced C variable tcl_RcFileName with
-a Tcl variable tcl_rcFileName. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-9/11/95 (new feature) Added procedure Tcl_SetPanicProc to override
-the default implementation of "panic". (SS)
-
-9/11/95 (new feature) Added "interp" command to allow creation of
-new interpreters and execution of untrusted scripts.  Added many new
-procedures, such as Tcl_CreateSlave, Tcl_CreateAlias,and Tcl_MakeSafe,
-to provide C-level access to the interpreter facility. This mechanism
-now provides almost all of the generic functions of Borenstein's and
-Rose's Safe-Tcl (but not any Tk or email-related stuff).  (JL)
-
-9/11/95 (feature change) Changed file management so that files are
-no longer shared between interpreters:  a file cannot normally be
-referenced in one interpreter if it was opened in another.  This
-feature is needed to support safe interpreters.  Added Tcl_ShareHandle()
-procedure for allowing files to be shared, and added "interp" argument
-to Tcl_FilePermissions procedure. (JL)
-*** POTENTIAL INCOMPATIBILITY ***
-
-9/11/95 (new feature) Added "AssocData" mechanism, whereby extensions
-can associate their own data with an interpreter and get called back
-when the interpreter is deleted.  This is visible at C level via the
-procedures Tcl_SetAssocData and Tcl_GetAssocData.  (JL)
-
-9/11/95 (new feature) Added Tcl_ErrnoMsg to translate an errno value
-into a human-readable string.  This is now used instead of calling
-strerror because strerror mesages vary dramatically from platform
-to platform, which messes up Tcl tests.  Tcl_ErrnoMsg uses the standard
-POSIX messages for all the common signals, and calls strerror for
-signals it doesn't understand.
-
------------------ Released patch 7.5p2, 9/15/95 -----------------------
-
------------------ Released 7.5a1, 9/15/95 -----------------------
-
-9/22/95 (bug fix) Changed auto_mkindex to create tclIndex files that
-handle directories whose paths might contain spaces. (RJ)
-
-9/27/95 (bug fix) The "format" command didn't check for huge or negative
-width specifiers, which could cause core dumps. (JO)
-
-9/27/95 (bug fix) Core dumps could occur if an interactive command typed
-to tclsh returned a very long result for tclsh to print out.  The bug is
-actually in printf (in Solaris 2.3 and 2.4, at least);  switched to use
-puts instead.  (JO)
-
-9/28/95 (bug fix) Changed makefile.bc to eliminate a false dependency
-for tcl1675.dll on the Borland run time library. (SS)
-
-9/28/95 (bug fix) Fixed tcl75.dll so it looks for tcl1675.dll instead
-of tcl16.dll. (SS)
-
-9/28/95 (bug fix) Tcl was not correctly detecting the difference
-between Win32s and Windows '95. (SS)
-
-9/28/95 (bug fix) "exec" was not passing environment changes to child
-processes under Windows. (SS)
-
-9/28/95 (bug fix) Changed Tcl to ensure that open files are not passed
-to child processes under Windows. (SS)
-
-9/28/95 (bug fix) Fixed Windows '95 and NT versions of exec so it can
-handle both console and windows apps.   (SS)
-
-9/28/95 (bug fix) Fixed Windows version of exec so it no longer leaves
-temp files lying around.  Also changed it so the temp files are
-created in the appropriate system dependent temp directory. (SS)
-
-9/28/95 (bug fix) Eliminated source dependency on the Win32s Universal
-Thunk header file, since it is not bundled with VC++. (SS)
-
-9/28/95 (bug fix) Under Windows, Tcl now constructs the HOME
-environment variable from HOMEPATH and HOMEDRIVE when HOME is not
-already set. (SS)
-
-9/28/95 (bug fix) Added support for "info nameofexecutable" and "info
-sharedlibextension" to the Windows version. (SS)
-
-9/28/95 (bug fix) Changed tclsh to correctly parse command line
-arguments so that backslashes are preserved under Windows. (SS)
-
-9/29/95 (bug fix) Tcl 7.5a1 treated either return or newline as end
-of line in "gets", which caused lines ending in CRLF to be treated as
-two separate lines.  Changed to allow only character as end-of-line:
-carriage return on Macs, newline elsewhere. (JO)
-
-9/29/95 (new feature) Changed to install "configInfo" file in same
-directory as library scripts.  It didn't used to get installed. (JO)
-
-9/29/95 (bug fix) Tcl was not converting Win32 errors into POSIX
-errors under some circumstances. (SS)
-
-10/2/95 (bug fix) Safe interpreters no longer get initialized with
-a call to Tcl_Init(). (JL)
-
-10/1/95 (new feature) Added "tcl_platform" global variable to provide
-environment information such as the instruction set and operating
-system. (JO)
-
-10/1/95 (bug fix) "exec" command wasn't always generating the
-"child process exited abnormally" message when it should have.  (JO)
-
-10/2/95 (bug fix) Changed "mkLinks.tcl" so that the scripts it generates
-won't create links that overwrite original manual entries (there was
-a problem where pack-old.n was overwriting pack.n).  (JO)
-
-10/2/95 (feature change) Changed to use -ldl for dynamic loading under
-Linux if it is available, but fall back to -ldld if it isn't.  (JO)
-
-10/2/95 (bug fix) File sharing was causing refcounts to reach 0
-prematurely for stdin, stdout and stderr, under some circumstances. (JL)
-
-10/2/95 (platform support) Added support for Visual C++ compiler on
-Windows, Windows '95 and Windows NT, code donated by Gordon Chaffee. (JL)
-
-10/3/95 (bug fix) Tcl now frees any libraries that it loads before it
-exits. (SS)
-
-10/03/95 (bug fix) Fixed bug in Macintosh ls command where the -l
-and -C options would fail in anything but the HOME directory. (RJ)
-
------------------ Released 7.5a2, 10/6/95 -----------------------
-
-10/10/95 (bug fix) "file dirnam /." was returning ":" on UNIX instead
-of "/". (JO)
-
-10/13/95 (bug fix) Eliminated dependency on MKS toolkit for generating
-the tcl.def file from Borland object files. (SS)
-
-10/17/95 (new features) Moved the event loop from Tcl to Tk, made major
-revisions along the way:
-    - New Tcl commands:  after, update, vwait (replaces "tkwait variable").
-    - "tkerror" is now replaced with "bgerror".
-    - The following procedures are similar to their old Tk counterparts:
-      Tcl_DoOneEvent, Tcl_Sleep, Tcl_DoWhenIdle, Tcl_CancelIdleCall,
-      Tcl_CreateFileHandler, Tcl_DeleteFileHandler, Tcl_CreateTimerHandler,
-      Tcl_DeleteTimerHandler, Tcl_BackgroundError.
-    - Revised notifier, add new concept of "event source" with the following
-      procedures:  Tcl_CreateEventSource, Tcl_DeleteEventSource,
-      Tcl_WatchFile, Tcl_SetMaxBlockTime, Tcl_FileReady, Tcl_QueueEvent,
-      Tcl_WaitForEvent. (JO)
-
-10/31/95 (new features) Implemented cross platform file name support to make
-it easier to write cross platform scripts.  Tcl now understands 4 file naming
-conventions: Windows (both DOS and UNC), Mac, Unix, and Network.  The network
-convention is a new naming mechanism that can be used to paths in a platform
-independent fashion.  See the "file" command manual page for more details.
-The primary interfaces changes are:
-    - All Tcl commands that expect a file name now accept both network and
-      native form.
-    - Two new "file" subcommands, "nativename" and "networkname", provide a
-      way to convert between network and native form.
-    - Renamed Tcl_TildeSubst to Tcl_TranslateFileName, and changed it so that
-      it always returns a filename in native form.  Tcl_TildeSubst is defined
-      as a macro for backward compatibility, but it is deprecated. (SS)
-
-11/5/95 (new feature) Made "tkerror" and "bgerror" synonyms, so that
-either name can be used to manipulate the command (provides temporary
-backward compatibility for existing scripts that use tkerror). (JO)
-
-11/5/95 (new feature) Added exit handlers and new C procedures
-Tcl_CreateExitHandler, Tcl_DeleteExitHandler, and Tcl_Exit. (JO)
-
-11/6/95 (new feature) Added pid command for Macintosh version of
-Tcl (it didn't previously exist on the Mac). (RJ)
-
-11/7/95 (new feature) New generic IO facility and support for IO to
-files, pipes and sockets based on a common buffering scheme. Support
-for asynchronous (non-blocking) IO and for event driver IO. Support
-for automatic (background) asynchronous flushing and asynchronous
-closing of channels. (JL)
-
-11/7/95 (new feature)  Added new commands "fconfigure" and "fblocked"
-to support new I/O features such as nonblocking I/O.  Added "socket"
-command for creating TCP client and server sockets. (JL).
-
-11/7/95 (new feature) Complete set of C APIs to the new generic IO
-facility:
-    - Opening channels: Tcl_OpenFileChannel, Tcl_OpenCommandChannel,
-      Tcl_OpenTcpClient, Tcl_OpenTcpServer.
-    - I/O procedures on channels, which roughly mirror the ANSI C stdio
-      library:  Tcl_Read, Tcl_Gets, Tcl_Write, Tcl_Flush, Tcl_Seek,
-      Tcl_Tell, Tcl_Close, Tcl_Eof, Tcl_InputBlocked, Tcl_GetChannelOption,
-      Tcl_SetChannelOption.
-    - Extension mechanism for creating new kinds of channels:
-      Tcl_CreateChannel, Tcl_GetChannelInstanceData, Tcl_GetChannelType,
-      Tcl_GetChannelName, Tcl_GetChannelFile, Tcl_RegisterChannel,
-      Tcl_UnregisterChannel, Tcl_GetChannel.
-    - Event-driven I/O on channels: Tcl_CreateChannelHandler,
-      Tcl_DeleteChannelHandler. (JL)
-
-11/7/95 (new feature) Channel driver interface specification to allow
-new types of channels to be added easily to Tcl. Currently being used
-in three drivers - for files, pipes and TCP-based sockets. (JL).
-
-11/7/95 (new feature) interp delete now takes any number of path
-names of interpreters to delete, including zero. (JL).
-
-11/8/95 (new feature) implemented 'info hostname' and Tcl_GetHostName
-command to get host name of machine on which the Tcl process is running. (JL)
-
-11/9/95 (new feature) Implemented file APIs for access to low level files
-on each system. The APIs are: Tcl_CloseFile, Tcl_OpenFile, Tcl_ReadFile,
-Tcl_WriteFile and Tcl_SeekFile. Also implemented Tcl_WaitPid which waits
-in a system dependent manner for a child process. (JL)
-
-11/9/95 (new feature) Added Tcl_UpdateLinkedVar procedure to force a
-Tcl variable to be updated after its C variable changes. (JO)
-
-11/9/95 (bug fix) The glob command has been totally reimplemented so
-that it can support different file name conventions.  It now handles
-Windows file names (both UNC and drive-relative) properly.  It also
-supports nested braces correctly now. (SS)
-
-11/13/95 (bug fix) Fixed Makefile.in so that configure can be run
-from a clean directory separate from the Tcl source tree, and compilations
-can be performed there. (JO)
-
-11/14/95 (bug fix) Fixed file sharing between interpreters and file
-transferring between interpreters to correctly manage the refcount so that
-files are closed when the last reference to them is discarded. (JL)
-
-11/14/95 (bug fix) Fixed gettimeofday implementation for the
-Macintosh.  This fixes several timing related bugs. (RJ)
-
-11/17/95 (new feature) Added missing support for info nameofexecutable
-on the Macintosh. (RJ)
-
-11/17/95 (bug fix) The Tcl variables argc argv and argv0 now return
-something reasonable on the Mac.  (RJ)
-
-11/22/95 (new feature) Implemented "auto-detect" mode for end of line
-translations. On input, standalone "\r" mean MAC mode, standalone "\n"
-mean Unix mode and "\r\n" means Windows mode. On output, the mode is
-modified to whatever the platform specific mode for that platform is. (JL)
-
-11/24/95 (feature change) Replaced "configInfo" file with tclConfig.sh,
-which is more complete and uses slightly different names.  Also
-arranged for tclConfig.sh to be installed in the platform-specific
-library directory instead of Tcl's script library directory. (JO)
-*** POTENTIAL INCOMPATIBILITY with Tcl 7.5a2, but not with Tcl 7.4 ***
-
------------------ Released patch 7.4p3, 11/28/95 -----------------------
-
-12/5/95 (new feature) Added Tcl_File facility to support platform-
-independent file handles.  Changed all interfaces that used Unix-
-style integer fd's to use Tcl_File's instead. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-12/5/95 (new feature) Added a new "clock" command to Tcl.  The command
-allows you to get the current "clicks" or seconds & allows you to
-format or scan human readable time/date strings. (RJ)
-
-12/18/95 (new feature) Moved Tk_Preserve, Tk_Release, and Tk_EventuallyFree
-to Tcl, renamed to Tcl_Preserve, Tcl_Release, and Tcl_EventuallyFree. (JO)
-
-12/18/95 (new feature) Added new "package" command and associated
-procedures Tcl_PkgRequire and Tcl_PkgProvide.   Also wrote
-pkg_mkIndex library procedure to create index files from binaries
-and scripts. (JO)
-
-12/20/95 (new feature) Added Tcl_WaitForFile procedure. (JO)
-
-12/21/95 (new features) Made package name argument to "load" optional
-(Tcl will now attempt to guess the package name if necessary).  Also
-added Tcl_StaticPackage and support in "load" for statically linked
-packages.  (JO)
-
-12/22/95 (new feature) Upgraded the foreach command to accept multiple
-loop variables and multiple value lists.  This lets you iterate over
-multiple lists in parallel, and/or assign multiple loop variables from
-one value list during each iteration. The only potential compatibility
-problem is with scripts that used loop variables with a name that could be
-construed to be a list of variable names (i.e. contained spaces).  (BW)
-
-1/5/96 (new feature) Changed tclsh so it builds as a console mode
-application under Windows.  Now tclsh can be used from the command
-line with pipes or interactively.  Note that this only works under
-Windows 95 or NT. (SS)
-
-1/17/96 (new feature) Modified Makefile and configure script to allow
-Tcl to be compiled as a shared library:  use the --enable-shared option
-when configuing.  (JO)
-
-1/17/96 (removed obsolete features)  Removed the procedures Tcl_EnterFile
-and Tcl_GetOpenFile:  these no longer make sense with the new I/O system. (JL)
-*** POTENTIAL INCOMPATIBILITY ***
-
-1/19/96 (bug fixes) Prevented formation of circular aliases, through the
-Tcl 'interp alias' command and through the 'rename' command, as well as
-through the C API Tcl_CreateAlias. (JL)
-
-1/19/96 (bug fixes) Fixed several bugs in direct deletion of interpreters
-with Tcl_DeleteInterp when the interpreter is a slave; fixes based on a
-patch received from Viktor Dukhovni of ESM. (JL)
-
-1/19/96 (new feature) Implemented on-close handlers for channels; added
-the C APIs Tcl_CreateCloseHandler and Tcl_DeleteCloseHandler. (JL)
-
-1/19/96 (new feature) Implemented portable error reporting mechanism; added
-the C APIs Tcl_SetErrno and Tcl_GetErrno. (JL)
-
-1/24/96 (bug fix) Unknown command processing properly invokes external
-commands under Windows NT and Windows '95 now. (SS)
-
-1/23/96 (bug fix) Eliminated extremely long startup times under Windows '95.
-The problem was a result of the option database initialization code that
-concatenated $HOME with /.Xdefaults, resulting in a // in the middle of the
-file name.  Under Windows '95, this is incorrectly interpreted as a UNC
-path.  They delays came from the network timeouts needed to determine that
-the file name was invalid.  Tcl_TranslateFileName now suppresses duplicate
-slashes that aren't at the beginning of the file name. (SS)
-				     
-1/25/96 (bug fix) Changed exec and open to create children so they are
-attached to the application's console if it exists. (SS)
-
-1/31/96 (bug fix) Fixed command line parsing to handle embedded
-spaces under Windows. (SS)
-
------------------ Released 7.5b1, 2/1/96 -----------------------
-
-2/7/96 (bug fix) Fixed off by one error in argument parsing code under
-Windows. (SS)
-
-2/7/96 (bug fix) Fixed bugs in VC++ makefile that improperly
-initialized the tcl75.dll.  Fixed bugs in Borland makefile that caused
-build failures under Windows NT. (SS)
-
-2/9/96 (bug fix) Fixed deadlock problem in AUTO end of line translation
-mode which would cause a socket server with several concurrent clients
-writing in CRLF mode to hang. (JL)
-
-2/9/96 (API change) Replaced -linemode option to fconfigure with a
-new -buffering option, added "none" setting to enable immediate write. (JL)
-*** INCOMPATIBILITY with b1 ***
-
-2/9/96 (new feature) Added C API Tcl_InputBuffered which returns the count
-of bytes currently buffered in the input buffer of a channel, and o for
-output only channels. (JL)
-
-2/9/96 (new feature) Implemented asynchronous connect for sockets. (JL)
-
-2/9/96 (new feature) Added C API Tcl_SetDefaultTranslation to set (per
-channel) the default end of line translation mode. This is the mode that
-will be installed if an output operation is done on the channel while it is
-still in AUTO mode. (JL)
-
-2/9/96 (bug fix) Changed Tcl_OpenCommandChannel interface to properly
-handle all of the combinations of stdio inheritance in background
-pipelines.  See the Tcl_OpenFileChannel(3) man page for more
-info.  This change fixes the bug where exec of a background pipeline
-was not getting passed the stdio handles properly. (SS)
-
-2/9/96 (bug fix) Removed the new Tcl_CreatePipeline interface, and
-restored the old version for Unix platforms only.  All new code should
-use Tcl_CreateCommandChannel instead. (SS)
-
-2/9/96 (bug fix) Changed Makefile.in to use -L and -ltcl7.5 for Tcl
-library so that shared libraries are more likely to be found correctly
-on more platforms. (JO)
-
-2/13/96 (new feature) Added C API Tcl_SetNotifierData and
-Tcl_GetNotifierData to allow notifier and channel driver writers to
-associate data with a Tcl_File.  The result of this change is that
-Tcl_GetFileInfo now always returns an OS file handle, and Tcl_GetFile
-can be used to construct a Tcl_File for an externally constructed OS
-handle. (SS)
-
-2/13/96 (bug fix) Changed Windows socket implementation so it doesn't
-set SO_REUSEADDR on server sockets.  Now attempts to create a server
-socket on a port that is already in use will be properly identified
-and an error will be generated. (SS)
-
-2/13/96 (bug fix) Fixed problems with DLL initialization under Visual
-C++ that left the C run time library uninitialized. (SS)
-
-2/13/96 (bug fix) Fixed Windows socket initialization so it loads
-winsock the first time it is used, rather than at the time tcl75.dll
-is loaded.  This should fix the bug where the modem immediately starts
-trying to connect to a service provider when wish or tclsh are
-started. (SS)
-
-2/13/96 (new feature) Added C APIs Tcl_MakeFileChannel and
-Tcl_MakeTcpClientChannel to wrap up existing fds and sockets into
-channels. Provided implementations on Unix and Windows. (JL)
-
-2/13/96 (bug fix) Fixed bug with seek leaving EOF and BLOCKING set. (JL)
-
-2/14/96 (bug fix) Fixed reentrancy problem in fileevent handling
-and made it more robust in the face of errors. (JL)
-
-2/14/96 (feature change) Made generic IO level emulate blocking mode if the
-channel driver is unable to provide it, e.g. if the low level device is
-always nonblocking. Thus, now blocking behavior is an advisory setting for
-channel drivers and can be ignored safely if the channel driver is unable
-to provide it. (JL)
-
-2/15/96 (new feature) Added "binary" end of line translation mode, which is
-a synonym of "lf" mode. (JL)
-
-2/15/96 (bug fix) Fixed reentrancy problem in fileevent handling vs
-deletion of channel event handlers. (JL)
-
-2/15/96 (bug fix) Fixed bug in event handling which would cause a
-nonblocking channel to not see further readable events after the first
-readable event that had insufficient input. (JL)
-
-2/17/96 (bug fix) "info complete" didn't properly handle comments
-in nested commands. (JO)
-
-2/21/96 (bug fix) "exec" under Windows NT/95 did not properly handle
-very long command lines (>200 chars). (SS)
-
-2/21/96 (bug fix) Sockets could get into an infinite loop if a read
-event arrived after all of the available data had been read. (SS)
-
-2/22/96 (bug fix) Added cast of st_size elements to (long) before
-sprintf-ing in "file size" command.  This is needed to handle systems
-like NetBSD with 64-bit file offsets.  (JO)
-
------------------ Released 7.5b2, 2/23/96 -----------------------
-
-2/23/96 (bug fix) TCL_VARARGS macro in tcl.h wasn't defined properly
-when compiling with C++.  (JO)
-
-2/24/96 (bug fix) Removed dependencies on Makefile in the UNIX Makefile:
-this caused problems on some platforms (like Linux?). (JO)
-
-2/24/96 (bug fix) Fixed configuration bug that made Tcl not compile
-correctly on Linux machines with neither -ldl or -ldld. (JO)
-
-2/24/96 (new feature) Added a block of comments and definitions to
-Makefile.in to make it easier to have Tcl's TclSetEnv etc. replace
-the library procedures setenv etc, so that calls to setenv etc. in
-the application automatically update the Tcl "env" variable. (JO)
-
-2/27/96 (feature change) Added optional Tcl_Interp * argument (may be NULL)
-to C API Tcl_Close and simplified closing of command channels. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-2/27/96 (feature change) Added optional Tcl_Interp * argument (may be NULL)
-to C type definition Tcl_DriverCloseProc; modified all channel drivers to
-implement close procedures that accept the additional argument. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-2/28/96 (bug fix) Fixed memory leak that could occur if an upvar
-referred to an element of an array in the same stack frame as the
-upvar. (JO)
-
-2/29/96 (feature change) Modified both Tcl_DoOneEvent and Tcl_WaitForEvent
-so that they return immediately in cases where they would otherwise
-block forever (e.g. if there are no event handlers of any sort). (JO)
-
-2/29/96 (new feature) Added C APIs Tcl_GetChannelBufferSize and
-Tcl_SetChannelBufferSize to set and retrieve the size, in bytes, for
-buffers allocated to store input or output in a channel. (JL)
-
-2/29/96 (new feature) Added option -buffersize to Tcl fconfigure command
-to allow Tcl scripts to query and set the size of channel buffers. (JL)
-
-2/29/96 (feature removed) Removed channel driver function to specify
-the buffer size to use when allocating a buffer. Removed the C typedef
-for Tcl_DriverBufferSizeProc. Channels are now created with a default
-buffer size of 4K. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-2/29/96 (feature change) The channel driver function for setting blocking
-mode on the device may now be NULL. If the generic code detects that the
-function is NULL, operations that set the blocking mode on the channel
-simply succeed. (JL)
-
-3/2/96 (bug fix) Fixed core dump that could occur if a syntax error
-(such as missing close paren) occurred in an array reference with a
-very long array name. (JO)
-
-3/4/96 (bug fix) Removed code in the "auto_load" procedure that deletes
-all existing auto-load information whenever the "auto_path" variable
-is changed.  Instead, new information adds to what was already there.
-Otherwise, changing the "auto_path" variable causes all package-
-related information to be lost.  If you really want to get rid of
-existing auto-load information, use auto_reset before setting auto_path. (JO)
-
-3/5/96 (new feature) Added version suffix to shared library names so that
-Tcl will compile under NetBSD and FreeBSD (I hope).  (JO)
-
-3/6/96 (bug fix) Cleaned up error messages in new I/O system to correspond
-more closely to old I/O system. (JO)
-
-3/6/96 (new feature) Added -myaddr and -myport options to the socket
-command, removed -tcp and -- options.  This lets clients and servers
-choose a particular interface.  Also changed the default server address
-from the hostname to INADDR_ANY.  The server accept callback now gets
-passed the client's port as well as IP address.  The C interfaces for
-Tcl_OpenTcpClient and Tcl_OpenTcpServer have changed to support the
-above changes. (BW)
-*** POTENTIAL INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-3/6/96 (changed feature) The library function auto_mkindex will now
-default to using the pattern "*.tcl" if no pattern is given. (RJ)
-
-3/6/96 (bug fix) The socket channel code for the Macintosh has been
-rewritten to use native MacTcp.  (RJ)
-
-3/7/96 (new feature) Added Tcl_SetStdChannel and Tcl_GetStdChannel
-interfaces to allow applications to explicitly set and get the global
-standard channels. (SS)
-
-3/7/96 (bug fix) Tcl did close not the file descriptors associated
-with "stdout", etc. when the corresponding channels were closed.  (SS)
-
-3/7/96 (bug fix) Reworked shared library and dynamic loading stuff to
-try to get it working under AIX.  Added new @SHLIB_LD_LIBS@ autoconf
-symbol as part of this.  AIX probably doesn't work yet, but it should
-be a lot closer. (JO)
-
-3/7/96 (feature change) Added Tcl_ChannelProc typedef and changed the
-signature of Tcl_CreateChannelHandler and Tcl_DeleteChannelHandler to take
-Tcl_ChannelProc arguments instead of Tcl_FileProc arguments. This change
-should not affect any code outside Tcl because the signatures of
-Tcl_ChannelProc and Tcl_FileProc are compatible. (JL)
-
-3/7/96 (API change) Modified signature of Tcl_GetChannelOption to return
-an int instead of char *, and to take a Tcl_DString * argument. Modified
-the implementation so that the option name can be NULL, to mean that the
-call should retrieve a list of alternating option names and values. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-3/7/96 (API change) Added Tcl_DriverSetOptionProc, Tcl_DriverGetOptionProc
-typedefs, added two slots setOptionProc and getOptionProc to the channel
-type structure. These may be NULL to indicate that the channel type does
-not support any options. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b2, but not with Tcl 7.4 ***
-
-3/7/96 (feature change) stdin, stdout and stderr can now be put into
-nonblocking mode. (JL)
-
-3/8/96 (feature change) Eliminated dependence on the registry for
-finding the Tcl library files. (SS)
-
------------------ Released 7.5b3, 3/8/96 -----------------------
-
-3/12/96 (feature improvement) Modified startup script to look in several
-different places for the Tcl library directory.  This should allow Tcl
-to find the libraries under all but the weirdest conditions, even without
-the TCL_LIBRARY environment variable being set. (JO)
-
-3/13/96 (bug fix) Eliminated use of the "linger" option from the Windows
-socket implementation. (JL)
-
-3/13/96 (new feature) Added -peername and -sockname options for fconfigure
-for socket channels. Code contributed by John Haxby of HP. (JL)
-
-3/13/96 (bug fix) Fixed panic and core dump that would occur if the accept
-callback script on a server socket encountered an error. (JL)
-
-3/13/96 (feature change) Added -async option to the Tcl socket command.
-If the command is creating a client socket and the flag is present, the
-client is connected asynchronously. If the option is absent (the default),
-the client socket is connected synchronously, and the command returns only
-when the connection has been completed or failed. This change was suggested
-by Mark Diekhans. (JL)
-
-3/13/96 (feature change) Modified the signature of Tcl_OpenTcpClient to
-take an additional int argument, async. If nonzero, the client is connected
-to the server asynchronously. If the value is zero, the connection is made
-synchronously, and the call to Tcl_OpenTcpClient returns only when the
-connection fails or succeeds. This change was suggested by Mark Diekhans. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b3, but not with Tcl 7.4 ***
-
-3/14/96 (bug fix) "tclsh bogus_file_name" didn't print an error message. (JO)
-
-3/14/96 (bug fix) Added new procedures to tclCkalloc.c so that libraries
-and applications can be compiled with TCL_MEM_DEBUG even if Tcl isn't
-(however, the converse is still not true).  Patches provided by Jan
-Nijtmans. (JO)
-
-3/15/96 (bug fix) Marked standard IO handles of a process as close-on-exec
-to fix bug in Ultrix where exec was not sharing standard IO handles with
-subprocesses. Fix suggested by Mark Diekhans. (JL)
-
-3/15/96 (bug fix) Fixed asynchronous close mechanism so that it closes the
-channel instead of leaking system resources. The manifestation was that Tcl
-would eventually run out of file descriptors if it was handling a large
-number of nonblocking sockets or pipes with high congestion. (JL)
-
-3/15/96 (bug fix) Fixed tests so that they no longer leak file descriptors.
-The manifestation was that Tcl would eventually run out of file descriptors
-if the tests were rerun many times (> a hundred times on Solaris). (JL)
-
-3/15/96 (bug fix) Fixed channel creation code so that it never creates
-unnamed channels. This would cause a panic and core dump when the channel
-was closed. (JL)
-
-3/16/96 (bug fixes) Made lots of changes in configuration stuff to get
-Tcl working under AIX (finally).  Tcl should now support the "load"
-command under AIX and should work either with or without shared
-libraries for Tcl and Tk. (JO)
-
-3/21/96 (configuration improvement) Changed configure script so it
-doesn't use version numbers (as in -ltcl7.5 and libtcl7.5.so) under
-SunOS 4.1, where they don't work anyway.  (JO)
-
-3/22/96 (new feature) Added C API Tcl_InterpDeleted that allows extension
-writers to discover when an interpreter is being deleted. (JL)
-
-3/22/96 (bug fix) The standard IO channels are now added to each
-trusted interpreter as soon as the interpreter is created. This ensures
-against the bug where a child would do IO before the master had done any,
-and then the child is destroyed - the standard IO channels would be then
-closed and the master would be unable to do any IO. (JL)
-
-3/22/96 (bug fix) Made Tcl more robust against interpreter deletion, by
-using Tcl_Preserve, Tcl_Release and Tcl_EventuallyFree to split the process
-of interpreter deletion into two distinct phases. Also went through all of
-Tcl and added calls to Tcl_Preserve and Tcl_Delete where needed. (JL)
-
-3/22/96 (bug fix) Fixed several places where C code was reading and writing
-into freed memory, especially during interpreter deletion. (JL)
-
-3/22/96 (bug fix) Fixed very deep bug in Tcl_Release that caused memory to
-be freed twice if the release callback did Tcl_Preserve and Tcl_Release on
-the same memory as the chunk currently being freed. (JL)
-
-3/22/96 (bug fix) Removed several memory leaks that would cause memory
-buildup on half-K chunks in the generic IO level. (JL)
-
-3/22/96 (bug fix) Fixed several core dumps which occurred when new
-AssocData was being created during the cleanups in interpreter deletion.
-The solution implemented now is to loop repeatedly over the AssocData until
-none is left to clean up. (JL)
-
-3/22/96 (bug fix) Fixed a bug in event handling which caused an infinite
-loop if there were no files being watched and no timer. Fix suggested by
-Jan Nijtmans. (JL)
-
-3/22/96 (bug fix) Fixed Tcl_CreateCommand, Tcl_DeleteCommand to be more
-robust if the interpreter is being deleted. Also fixed several order
-dependency bugs in Tcl_DeleteCommand which kicked in when an interpreter
-was being deleted. (JL)
-
-3/26/96 (bug fix) Upon a "short read", the generic code no longer calls
-the driver for more input. Doing this caused blocking on some platforms
-even on nonblocking channels. Bug and fix courtesy Mark Roseman. (JL)
-
-3/26/96 (new feature) Added 'package Tcltest' which is present only in
-test versions of Tcl; this allows the testing commands to be loaded into
-new interpreters besides the main one. (JL)
-
-3/26/96 (restored feature) Recreated the Tcl_GetOpenFile C API. You can
-now get a FILE * from a registered channel; Unix only. (JL)
-
-3/27/96 (bug fix) The regular expression code did not support more
-than 9 subexpressions.  It now supports up to 20. (SS)
-
-4/1/96 (bug fixes) The CHANNEL_BLOCKED bit was being left on on a short
-read, so that fileevents wouldn't fire correctly. Bug reported by Mark
-Roseman.(JL, RJ)
-
-4/1/96 (bug fix) Moved Tcl_Release to match Tcl_Preserve exactly, in
-tclInterp.c; previously interpreters were being freed only conditionally
-and sometimes not at all. (JL)
-
-4/1/96 (bug fix) Fixed error reporting in slave interpreters when the
-error message was being generated directly by C code. Fix suggested by
-Viktor Dukhovni of ESM. (JL)
-
-4/2/96 (bug fixes) Fixed a series of bugs in Windows sockets that caused
-events to variously get lost, to get sent multiple times, or to be ignored
-by the driver. The manifestation was blocking if the channel is blocking,
-and either getting EAGAIN or infinite loops if the channel is nonblocking.
-This series of bugs was found by Ian Wallis of Cisco. Now all tests (also
-those that were previously commented out) in socket.test pass.  (JL, SS)
-
-4/2/96 (feature change/bug fix) Eliminated network name support in
-favor of better native name support.  Added "file split", "file join",
-and "file pathtype" commands.  See the "file" man page for more
-details. (SS)
-*** INCOMPATIBILITY with Tcl 7.5b3, but not with Tcl 7.4 ***
-
-4/2/96 (bug fix) Changed implementation of auto_mkindex so tclIndex
-files will properly handle path names in a cross platform context. (SS)
-
-4/5/96 (bug fix) Fixed Tcl_ReadCmd to use the channel buffer size as the
-chunk size it reads, instead of a fixed 4K size. Thus, on large reads, the
-user can set the channel buffer size to a large size and the read will
-occur orders of magnitude faster. For example, on a 2MB file, reading in 4K
-chunks took 34 seconds, while reading in 1MB chunks took 1.5 seconds (on a
-SS-20). Problem identified and fix suggested by John Haxby of HP. (JL)
-
-4/5/96 (bug fix) Fixed socket creation code to invoke gethostbyname only if
-inet_addr failed (very unlikely). Before this change the order was reversed
-and this made things much slower than they needed to be (gethostbyname
-generally requires an RPC, which is slow). Problem identified and fix
-suggested by John Loverso of OSF. (JL)
-
-4/9/96 (feature change) Modified "auto" translation mode so that it
-recognizes any of "\n", "\r" and "\r\n" in input as end of line, so
-that a file can have mixed end-of-line sequences. It now outputs
-the platform specific end of line sequence on each platform for files and
-pipes, and for sockets it produces crlf in output on all platforms. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b3, but not with Tcl 7.4 ***
-
-4/11/96 (new feature) Added -eofchar option to Tcl_SetChannelOption to allow
-setting of an end of file character for input and output. If an input eof
-char is set, it is recognized as EOF and further input from the channel is
-not presented to the caller. If an output eof char is set, on output, that
-byte is appended to the channel when it is closed. On Unix and Macintosh,
-all channels start with no eof char set for input or output. On Windows,
-files and pipes start with input and output eof chars set to Crlt-Z (ascii
-26), and sockets start with no input or output eof char. (JL)
-*** INCOMPATIBILITY with Tcl 7.5b3, but not with Tcl 7.4 ***
-
-4/17/96 (bug fix) Fixed series of bugs with handling of crlf sequence split
-across buffer boundaries in input, in AUTO mode. (JL, BW)
-
-4/17/96 (test suite improvement) Fixed test suite so that tests that
-depend on the availability of Unix commands such as echo, cat and others
-are not run if these commands are not present. (JL)
-
-4/17/96 (test suite improvement) The socket test now automatically starts,
-on platformst that support exec, a separate process for remote testsing. (JL)
-
------------------ Released 7.5, 4/21/96 -----------------------
-
-5/1/96 (bug fix) "file tail ~" did not correctly return the tail
-portion of the user's home directory. (SS)
-
-5/1/96 (bug fix) Fixed bug in TclGetEnv where it didn't lookup environment
-variables correctly:  could confuse "H" and "HOME", for example.  (JO)
-
-5/1/96 (bug fix) Changed to install tclConfig.sh under "make install-binaries",
-not "make install-libraries".  (JO)
-
-5/2/96 (bug fix) Changed pkg_mkIndex not to attempt to "load" a file unless
-it has the standard shared library extension.  On SunOS, attempts to load
-Tcl scripts cause the whole application to be aborted (there's no way to
-get the error back into Tcl).  (JO)
-
-5/7/96 (bug fix) Moved initScript in tclUnixInit.c to writable memory to
-avoid potential core dumps. (JO)
-
-5/7/96 (bug fix) Auto_reset procedure was removing procedure from init.tcl,
-such as pkg_mkIndex.  (JO)
-
-5/7/96 (bug fix) Fixed cast on socket address resolution code that
-would cause a failure to connect on Dec Alphas. (JL)
-
-5/7/96 (bug fix) Added "time", "subst" and "fileevent" commands to set of
-commands available in a safe interpreter. (JL)
-
-5/13/96 (bug fix) Preventing OS level handles for stdin, stdout and stderr
-from being implicitly closed when the last reference to the standard
-channel containing that handle is discarded when an interpreter is deleted.
-Explicitly closing standard channels by using "close" still works. (JL)
-
-5/21/96 (bug fix) Do not create channels for stdin, stdout and stderr on
-Unix if the devices are closed. This prevents a duplicate channel name
-panic later on when the fd is used to open a channel and the channel is
-registered in an interpreter. (JL)
-
-5/23/96 (bug fix) Fixed bug that prevented the use of standard channels in
-interpreters created after the last interpreter was destroyed. In the sequence
-
-	interp = Tcl_CreateInterp();
-	Tcl_DeleteInterp(interp);
-	interp = Tcl_CreateInterp();
-
-channels for stdio would not be available in the second interpreter. (JL)
-
-5/23/96 (bug fix) Fixed bug that allowed Tcl_MakeFileChannel to create new
-channels with Tcl_Files in them that are already used by another channel.
-This would cause core dumps when the Tcl_Files were being freed twice. (JL)
-
-5/23/96 (bug fix) Fixed a logical timing bug that caused a standard channel
-to be removed from the standard channel table too early when the channel
-was being closed. If the channel was being flushed asynchronously, it could
-get recreated before being actually destroyed, and the recreated channel
-would contain the same Tcl_File as the one being closed, leading to
-dangling pointers and core dumps. (JL)
-
-5/27/96 (bug fix) Fixed a bug in Tcl_GetChannelOption which caused it to
-always return a list of one element, a list of the settings, for
--translation and -eofchar options. Now correctly returns the value
-described by the documentation (Mark Diekhans found this, thanks!). (JL)
-
-5/30/96 (bug fix) Fixed a couple of syntax errors in io.test. (JL)
-
-5/30/96 (bug fix) If a fileevent scripts gets an error, delete it before
-causing a background error. This is to allow the error handler to reinstall
-the fileevent and to prevent infinite loops if the event loop is reentered
-in the error handler. (JL)
-
-5/31/96 (bug fix) Channels now will get properly flushed on exit. (JL)
-
-6/5/96 (bug fix) Changed Tcl_Ckalloc, Tcl_Ckfree, and Tcl_Ckrealloc to
-Tcl_Alloc, Tcl_Free, and Tcl_Realloc.  Added documentation for these
-routines now that they are officially supported.  Extension writers
-should use these routines instead of free() and malloc(). (SS)
-
-6/10/96 (bug fix) Changes the Tcl close command so that it no longer
-waits on nonblocking pipes for the piped processes to exit; instead it
-reaps them in the background. (JL)
-
-6/11/96 (bug fix) Increased the length of the listen queue for server
-sockets on Unix from 5 to 100. Some OSes will disregard this and reset it
-to 5, but we should try to get as long a queue as we can, for performance
-reasons. (JL)
-
-6/11/96 (bug fix) Fixed windows sockets bug that caused a cascade of events
-if the fileevent script read less than was available. Now reading less than
-is available does not cause a flood of Tcl events. (JL, SS)
-
-6/11/96 (bug fix) Fixed bug in background flushing on closed channels that
-would prevent the last buffer from getting flushed. (JL)
-
-6/13/96 (bug fix) Fixed bug in Windows sockets that caused a core dump if
-a DLL linked with tcl.dll and referred to e.g. ntohs() without opening a
-Tcl socket. The problem was that the indirection table was not being
-initialized. (JL)
-
-6/13/96 (bug fix) Fixed OS level resource leak that would occur when a
-Tcl channel was still registered in some interpreter when the process
-exits. Previously the channel was not being closed and the OS level handles
-were not being released; the output was being flushed but the device was
-not being closed. Now the device is properly closed. This was only a
-problem on Win3.1 and MacOS. (JL, SS)
-
-6/28/96 (bug fix) Fixed bug where transient errors were leaving an error
-code around, so that it would erroneously get reported later. This bug was
-exercised intermittently by closing a channel to a file on a very loaded
-NFS server, or to a socket whose other end blocked. (JL, BW)
-
-7/3/96 (bug fix) Fileevents declared in an interpreter are now deleted
-when the channel is closed in that interpreter. Before this fix, the
-fileevent would hang around until the channel is completely closed, and
-would cause errors if events happened before the channel was closed. This
-could happen in two cases: first if the channel is shared between several
-interpreters, and second if an async flush is in progress that prevents the
-channel from being closed until the flush finishes. (JL)
-
-7/10/96 (bug fix) Fixed bugs in both "lrange" and "lreplace" commands
-where too much white space was being removed. For example, the command
-		lreplace {\}\     hello} end end
-was returning "\}\", losing the significant space in the first list
-element and corrupting the list. (JO)
-
-7/20/96 (bug fix) The procedure pkg_mkIndex didn't work properly for
-extensions that depend on Tk, because it didn't load Tk into the child
-interpreter before loading the extension.  Now it loads Tk if Tk is
-present in the parent. (JO)
-
-7/23/96 (bug fix) Added compat version of strftime to fix crashes
-resulting from bad implementations under Windows. (SS)
-
-7/23/96 (bug fix) Standard implementations of gmtime() and localtime()
-under Windows did not handle dates before 1970, so they were replaced
-with a revised implementation. (SS)
-
-7/23/96 (bug fix) Tcl would crash on exit under Borland 5.0 because
-the global environ pointer was left pointing to freed memory. (SS)
-
-7/29/96 (bug fix) Fixed memory leak in Tcl_LoadCmd that could occur if
-a package's AppInit procedure called Tcl_StaticPackage to register
-static packages. (JO)
-
-8/1/96 (bug fix) Fixed a series of bugs in Windows sockets so that async
-writebehind in the presence of read event handlers now works, and so that
-async writebehind also works on sockets for which a read event handler was
-declared and whose channels were then closed before the async write
-finished. The bug was reported by John Loverso and Steven Wahl,
-independently, test case supplied by John Loverso. (JL)
-
------------------ Released patch 7.5p1, 8/2/96 -----------------------
-
-5/8/96 (new feature) Added Tcl_GetChannelMode C API for retrieving whether
-a channel is open for reading and writing. (JL)
-
-5/8/96 (API changes) Revised C APIs for channel drivers:
-    - Removed all Tcl_Files from channel driver interface; you can now have
-      channels that are not based on Tcl_Files.
-    - Added channelReadyProc and watchChannelProc procedures to interface;
-      these are used to implement event notification for channels.
-    - Added getFileProc to channel driver, to allow the generic IO code
-      to retrieve a Tcl_File from a channel (presumably if the channel
-      uses Tcl_Files they will be stored inside its instanceData). (JL)
-*** INCOMPATIBILITY with Tcl 7.5 ***
-
-5/8/96 (API change) The Tcl_CreateChannel C API was modified to not take
-Tcl_File arguments, and instead to take a mask specifying whether the
-channel is readable and/or writable. (JL)
-*** INCOMPATIBILITY with Tcl 7.5 ***
-
-6/3/96 (bug fix) Made Tcl_SetVar2 robust against the case where the value
-of the variable is a NULL pointer instead of "". (JL)
-
-6/17/96 (bug fix) Fixed "reading uninitialized memory" error reported by
-Purify, in Tcl_Preserve/Tcl_Release. (JL)
-
-8/9/96 (bug fix) Fixed bug in init.tcl that caused incorrect error message
-if the act of autoloading a procedure caused the procedure to be invoked
-again. (JO)
-
-8/9/96 (bug fix) Configure script produced bad library names and extensions
-under SunOS and a few other platforms if the --disable-load switch was used.
-(JO)
-
-8/9/96 (bug fix) Tcl_UpdateLinkedVar generated an error if the variable
-being updated was read-only. (JO)
-
-8/14/96 (bug fix) The macintosh now supports synchronous socket
-connections.  Other minor bugs were also fixed. (RJ)
-
-8/15/96 (configuration improvement) Changed the file patchlevel.h
-to be tclPatch.h.  This avoids conflict with the Tk file and is now
-in 8.3 format on the Windows platform. (RJ)
-
-8/20/96 (bug fix) Fixed core dump in interp alias command for interpreters
-created with Tcl_CreateInterp (as opposed to with Tcl_CreateSlave). (JL)
-
-8/20/96 (bug fix) No longer masking ECONNRESET on Windows sockets so
-that the higher level of the IO mechanism sees the error instead of
-entering an infinite loop. (JL)
-
-8/20/96 (bug fix) Destroying the last interpreter no longer closes the
-standard channels. (JL)
-
-8/20/96 (bug fix) Closing one of the stdin, stdout or stderr channels and
-then opening a new channel now correctly assigns the new channel as the
-standard channel that was closed. (JL)
-
-8/20/96 (bug fix) Added code to unix/tclUnixChan.c for using ioctl with
-FIONBIO instead of fcntl with O_NONBLOCK, for those versions of Unix where
-either O_NONBLOCK is not supported or implemented incorrectly. (JL)
-
-8/21/96 (bug fix) Fixed "file extension" so it correctly returns the
-extension on files like "foo..c" as "..c" instead of ".c". (SS)
-
-8/22/96 (bug fix) If environ[] contains static strings, Tcl would core
-dump in TclSetupEnv because it was trying to write NULLs into the actual
-data in environ[]. Now we instead copy as appropriate. (JL)
-
-8/22/96 (added impl) Added missing implementation of Tcl_MakeTcpClientChannel
-for Windows platform. Code contributed by Mark Diekhans. (JL)
-
-8/22/96 (new feature) Added a new memory allocator for the Macintosh
-version of Tcl.  It's quite a bit faster than MetroWerk's version. (RJ)
-
-8/26/96 (documentation update) Removed old change bars (for all changes
-in Tcl 7.5 and earlier releases) from manual entries. (JO)
-
-8/27/96 (enhancement) The exec and open commands behave better and work in 
-more situations under Windows NT and Windows 95.  Documentation describes 
-what is still lacking. (CS)
-
-8/27/96 (enhancement) The Windows makefiles will now compile even if the
-compiler is not in the path and/or the compiler's environment variables
-have not been set up. (CS) 
-
-8/27/96 (configuration improvement) The Windows resource files are 
-automatically updated when the version/patch level changes.  The header file
-now has a comment that reminds the user which other files must be manually
-updated when the version/patch level changes. (CS)
-
-8/28/96 (new feature) Added file manipulation features (copy, rename, delete,
-mkdir) that are supported on all platforms. They are implemented as 
-subcommands to the "file" command. See the documentation for the "file"
-command for more information. (JH)
-
------------------ Released 7.6b1, 8/30/96 -----------------------
-
-9/3/96 (bug fix) Simplified code so that standard channels are created
-lazily, they are added to an interpreter lazily, and they are never added
-to a safe interpreter. (JL)
-
-9/3/96 (bug fix) Closing a channel after closing a standard channel, e.g.
-stdout, would cause the implicit recreation of that standard channel. (JL)
-
-9/3/96 (new feature) Now calling Tcl_RegisterChannel with a NULL
-interpreter increments the refcount so that code outside any interpreter
-can use channels that are also registered in interpreters, without worrying
-that the channel may turn into a dangling pointer at any time. Calling
-Tcl_UnregisterChannel with a NULL interpreter only decrements the recount
-so that code outside any interpreter can safely declare it is no longer
-interested in a channel. (JL)
-
-9/4/96 (new features) Two changes to dynamic loading:
-    - If the file name is empty in the "load" command and there is no
-      statically loaded version of the package, a dynamically loaded
-      version will be used if there is one.
-    - Tcl_StaticPackage ignores redundant calls for the same package. (JO)
-
-9/6/96 (bug fix) Platform specific procedures for manipulating files are
-no longer macros and have been prefixed with "Tclp", such as TclpRenameFile.
-Unix file code now handles symbolic links and other special files correctly.
-The semantics of file copy and file rename has been changed so that if
-a target directory exists, the source files will NOT be merged with the
-existing files. (JH)
-
-9/6/96 (bug fix) If standard channel is NULL, because Tcl cannot connect
-to the standard channel, do not increment the refcount. The channel can
-be NULL if there is for example no standard input. (JL)
-
-9/6/96 (portability improvement) Changed parsing of backslash sequences
-like \n to translate directly to absolute values like 0xa instead of
-letting the compiler do the translation.  This guarantees that the
-translation is done the same everywhere. (JO)
-
-9/9/96 (bug fix) If channel is opened and not associated with any
-interpreter, but Tcl decides to use it as one of the standard channels, it
-became impossible to close the channel with Tcl_Close -- instead you had
-to call Tcl_UnregisterChannel. Fixed now so that it's safe to call
-Tcl_Close even when Tcl is using the channel as one of the standard ones. (JL)
-
-9/11/96 (feature change) The Tcl library is now placed in the Tcl
-shared libraries resource.  You no longer need to place the Tcl files
-in your applications explicitly.  (RJ)
-
-9/11/96 (feature change) Extensions no longer automatically have the
-resource fork of the extension opened for it.  Instead you need to
-use the tclMacLibrary.c file in your extension.  (RJ)
-*** POTENTIAL INCOMPATIBILITY ***
-
-9/12/96 (bug fix) The extension loading mechanism on the Macintosh now
-looks at the 'cfrg' resource to determine where to load the code
-fragment from.  This means FAT fragments should now work. (RJ)
-
-9/18/96 (enhancement) The exec and open commands behave better and work in
-more situations under Windows 3.X.  Documentation describes what is still
-lacking.  (CS)
-
-9/19/96 (bug fix) Fixed a panic which would occur if you delete a
-non-existent alias before any aliases are created. Now instead correctly
-returns an error that the alias is not found. (JL)
-
-9/19/96 (bug fix) Slave interpreters could rename aliases and they would
-not get deleted when the alias was being redefined. This led to dangling
-pointers etc. (JL)
-
-9/19/96 (bug fix) Fixed a panic where a hash table entry was being deleted
-twice during alias management operations. (JL)
-
-9/19/96 (bug fix) Fixed bug in event loop that could cause the input focus
-in Tk to get confused during menu traversal, among other problems.  The
-problem was related to handling of the "marker" when its event was
-deleted. (JO)
-
-9/26/96 (bug fix) Windows was losing EOF on a socket if the FD_CLOSE event
-happened to precede any left over FD_READ events. Now correctly remembers
-seeing FD_CLOSE, so that trailing FD_READ events are not discarded if they
-do not contain any data. This allows Tcl to correctly get a zero read and
-notice EOF. (JL)
-
-9/26/96 (bug fix) Was not resetting READABLE state properly on sockets
-under Windows if the driver discarded an FD_READ event because no data was
-present. Now correctly resets the state. (JL)
-
-9/30/96 (bug fix) Made EOF sticky on Windows sockets, so that fileevent
-readable will fire repeatedly until the socket is closed. Previously the
-fileevent fired only once. This could lead to never-closed connections if
-the Tcl script in the fileevent wasn't closing the socket immediately. (JL)
-
-10/2/96 (new feature) Improved the package loader:
-    - Added new variable tcl_pkgPath, which holds the default
-      directories under which packages are normally installed (each
-      package goes in a separate subdirectory of a directory in
-      $tcl_pkgPath).  These directories are included in auto_path by
-      default.
-    - Changed the package auto-loader to look for pkgIndex.tcl files 
-      not only in the auto_path directories but also in their immediate
-      children.  This should make it easier to install and uninstall
-      packages (don't have to change auto_path or merge pkgIndex.tcl
-      files). (JO)
-
-10/3/96 (bug fix) Changed tclsh to look for tclshrc.tcl instead of
-tclsh.rc on startup under Windows.  This is more consistent with wish and
-uses the right extension. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-10/8/96 (bug fix) Convertclock does not parse 24-hour times of the
-form "hhmm" correctly when hour = 00.  In the parse code, hour must be
->= 100 for minutes to be non-zero.  Thanks to Lint LaCour for this
-bug fix. (RJ)
-
-10/11/96 (bug fix) Under Windows, the pid command returned the process
-handle instead of the process id. (SS)
-
------------------ Released 7.6, 10/16/96 -----------------------
-
-10/29/96 (bug fix) Under Windows, sockets would consume 100% CPU time after
-the first accept(), due to a typo. (JL)
-
-10/29/96 (bug fix) Incorrect refcount management caused standard channels
-not to get deleted at process exit or DLL unload time, causing a memory
-leak of upwards of 20K each time. (JL)
-
-11/7/96 (bug fix) Auto-exec didn't work on file names that contained
-spaces. (JO)
-
-11/8/96 (bug fix) Fixed core dump that would occur if more than one call
-to Tcl_DeleteChannelHandler was made to delete a given channel handler. (JL)
-
-11/8/96 (bug fix) Fixed test for return value in Tcl_Seek and Tcl_SeekCmd
-to only treat -1 as error, instead of all negative numbers. (JL)
-
-11/12/96 (bug fix) Do not blocking waiting for processes at the end of a
-pipe during exit cleanup. (JL)
-
-11/12/96 (bug fix) If we are in exit cleanup, do not close the system level
-file descriptors 0, 1 and 2. Previously they were being closed which is
-incorrect, in the embedded case. This led to weird behavior for programs
-that want to interpose on I/O through the standard file descriptors (e.g.
-Netscape Navigator). (JL)
-
-11/15/96 (bug fix) Fixed core dump on Windows sockets due to dependency on
-deletion order at exit. Now all socket functions check to see if sockets
-are (still) initialized, before calling through function pointers. Before,
-they would call and might end up calling unloaded object code. (JL)
-
-11/15/96 (bug fix) Fixed core dump in Windows socket initialization routine
-if sockets were not installed on the system. Before, it was not properly
-checking the result of attempting to load the socket DLL, so it would call
-through uninitialized function pointers. (JL)
-
-11/15/96 (bug fix) Fixed memory leak in Windows sockets which left socket
-DLL handle open and could hold the socket DLL in memory uneccessarily,
-until a reboot. (JL)
-
-12/4/96 (bug fix) Fixed bug in Macintosh socket code that could result
-in lost data if a client was closed too soon after sending data. (RJ)
-
-12/17/96 (bug fix) Fixed deadlock bug in Windows sockets due to losing an
-event. This was happening because of an interaction between buffering and
-nonblocking mode on sockets. Now switched to sockets being blocking by
-default, so we are also no longer emulating blocking through a private
-event loop. (JL)
-
-1/21/97 (performance bug fix) Client TCP connections were slow to create
-because getservbyname was always called on the port.  Now this is only
-done if Tcl_GetInt fails. (BW)
-
-1/21/97 (configuration fix) Made it possible to override TCL_PACKAGE_PATH
-during make.  Previously it was only set during autoconf process.
-
-1/29/97 (bug fix) Fixed some problems with the clock command that
-impacted how dates were scaned after the year 2000. (RJ)
-
------------------ Released 7.6p2, 1/31/97 -----------------------
-
-2/5/97 (bug fix) Fixed a bug where in CR-LF translation mode, \r bytes
-in the input stream were not being handled correctly. (JL)
-
-2/24/97 (bug fix) Fix bug with exec under Win32s not being able to create
-stderr file which caused all execs to fail.  Fixed temp file leak under
-Win32s.  Fixed optional parameter bug with SearchPath that only happened
-under Win32s 1.25. (CCS)
-
-----------------------------------------------------------
-Changes for Tcl 7.6 go above this line.
-Changes for Tcl 7.7 go below this line.
-----------------------------------------------------------
-
-5/8/96 (new feature) Added Tcl_Ungets C API for putting a sequence of bytes
-into a channel's input buffer. This can be used for "push" model channels
-where the input is obtained via callbacks instead of by request of the
-generic IO code. No Tcl procedure yet. (JL)
-
-11/15/96 (new feature) Implemented hidden commands. New C APIs:
-	Tcl_HideCommand		-- hides an existing exposed command.
-	Tcl_ExposeCommand	-- exposes an existing hidden command.
-New tcl APIs:
-	interp invokehidden	-- invokes a hidden command in a slave.
-	interp hide		-- hides an existing exposed command.
-	interp expose		-- exposes an existing hidden command.
-	interp hidden		-- returns a list of hidden commands.
-The implementation of Safe Tcl now uses the new hidden commands facility
-to implement the safe base, instead of deleting the commands from a safe
-interpreter. (JL)
-
-11/15/96 (new feature) Implemented the safe base, a mechanism for
-installing and requesting security policies, purely in Tcl code. Overloads
-the package command to also allow an interpreter to "require" a policy. The
-following new library commands are provided:
-	tcl_safeCreateInterp	-- creates a slave an initializes the
-				   policy mechanism.
-	tcl_safeInitInterp	-- initializes an existing slave with the
-				   policy mechanism.
-	tcl_safeDeleteInterp	-- deletes a slave and deinitializes the
-				   policy mechanism.
-Added a new file to the library, safeinit.tcl, to hold implementation. (JL)
-On 7/9/97, removed the policy loading mechanism from the Safe Base. Left
-only the Safe Base aliases dealing with auto-loading and source. (JL)
-
-12/6/96 (new feature) Implemented Tcl_Finalize, an API that should be
-called by a process when it is done using Tcl. This API runs all the exit
-handlers to allow them to clean up resources etc. (JL)
-
-12/17/96 (new feature) Add an http Tcl script package to the Tcl library.
-This package implements the client side of HTTP/1.0; the GET, HEAD,
-and POST requests. (BW)
-
-1/21/97 (new feature) Added a "marktrusted" subcommand to the "interp" and
-to the interpreter object command. It removes the "safe" mark on an
-interpreter and disables hard-wired checks for safety in the C sources. (JL)
-
-1/21/97 (removed feature) Removed "vwait" from set of commands available in
-a safe interpreter. (JL)
-
-2/11/97 (new feature, bug fix) http package.  Added -accept to http_config
-so you can set the Accept header.  Added -handler option to http_get so
-you can supply your own data handler.  Also fixed POST operation to
-set the correct MIME type on the request. (BW)
-
-----------------------------------------------------------
-Changes for Tcl 7.7 go above this line.
-Changes for Tcl 8.0 go below this line.
-----------------------------------------------------------
-
-9/17/96 (bug fix) Using "upvar" it was possible to turn an array element
-into an array itself.  Changed to disallow this; it was quirky and didn't
-really work correctly anyway. (JO)
-
-10/21/96 (new feature) The core of the Tcl interpreter has been replaced
-with an on-the-fly compiler that translates Tcl scripts to bytecoded
-instructions; a new interpreter then executes the bytecodes. The compiler
-introduces only a few minor changes at the level of Tcl scripts. The biggest
-changes are to expressions and lists.
-    - A second level of substitutions is no longer done for expressions.
-      This substantially improves their execution time. This means that
-      the expression "$x*4" produces a different result than in the past
-      if x is "$y+2". Fortunately, not much code depends on the old
-      two-level semantics. Some expressions that do, such as
-      "expr [join $list +]" can be recoded to work in Tcl8.0 by adding
-      an eval: e.g., "eval expr [join $list +]".
-    - Lists are now completely parsed on the first list operation to
-      create a faster internal representation. In the past, if you had a
-      misformed list but the erroneous part was after the point you
-      inserted or extracted an element, then you never saw an error.
-      In Tcl8.0 an error will be reported. This should only effect
-      incorrect programs that took advantage of behavior of the old
-      implementation that was not documented in the man pages.
-Other changes to Tcl scripts are discussed in the web page at
-http://www.scriptics.com/doc/compiler.html. (BL)
-*** POTENTIAL INCOMPATIBILITY ***
-
-10/21/96 (new feature) In earlier versions of Tcl, strings were used as a
-universal representation; in Tcl 8.0 strings are replaced with Tcl_Obj
-structures ("objects") that can hold both a string value and an internal
-form such as a binary integer or compiled bytecodes. The new objects make it
-possible to store information in efficient internal forms and avoid the
-constant translations to and from strings that occurred with the old
-interpreter. There are new many new C APIs for managing objects. Some of the
-new library procedures for objects (such as Tcl_EvalObj) resemble existing
-string-based procedures (such as Tcl_Eval) but take advantage of the
-internal form stored in Tcl objects for greater speed. Other new procedures
-manage objects and allow extension writers to define new kinds of objects.
-See the manual entries doc/*Obj*.3 (BL)
-
-10/24/96 (bug fix) Fixed memory leak on exit caused by some IO related
-data structures not being deallocated on exit because their refcount was
-artificially boosted. (JL)
-
-10/24/96 (bug fix) Fixed core dump in Tcl_Close if called with NULL
-Tcl_Channel. (JL)
-
-11/19/96 (new feature) Added library procedures for finding word
-breaks in strings in a platform specific manner.  See the library.n
-manual entry for more information. (SS)
-
-11/22/96 (feature improvements) Added support for different levels of
-tracing during bytecode compilation and execution. This should help in
-tracking down suspected problems with the compiler or with converting
-existing code to use Tcl8.0. Two global Tcl variables, traceCompile
-and traceExec, can be set to generate tracing information in stdout:
-    - traceCompile: 0  no tracing (default)
-                    1  trace compilations of top level commands and procs
-                    2  trace and display instructions for all compilations
-    - traceExec:    0  no tracing
-                    1  trace only calls to Tcl procs
-                    2  trace invocations of all commands including procs
-                    3  detailed trace showing the result of each instruction
-traceExec >= 2 provides a one line summary of each called command and
-its arguments. Commands that have been "compiled away" such as set are
-not shown. (BL)
-
-11/30/96 (bug fix) The command "info nameofexecutable" could sometimes
-return the name of a directory. (JO)
-
-11/30/96 (feature improvements) Changed the code in library/init.tcl
-that reads in pkgIndex.tcl so that (a) it reads the files from child
-directories before those in the parent, so that the parent gets
-precedence, and (b) it doesn't quit if there is an error in a
-pkgIndex.tcl file;  instead, it prints an error message on standard
-error and continues. (JO)
-
-10/5/96 (feature improvements) Partial implementation of binary string
-support: the ability for Tcl string values to contain embedded null bytes.
-Changed the Tcl object-based APIs to take a byte pointer and length pair
-instead of a null-terminated C string. Modified several object type managers
-to support binary strings but not, for example, the list type manager.
-Existing string-based C APIs are unchanged and will truncate binary
-strings. Compiled scripts containing nulls are also truncated. (BL)
-
-12/12/96 (feature change) Removed the commands "cp", "mkdir", "mv",
-"rm", and "rmdir" from the Macintosh version of Tcl.  They were never
-officially supported and their functionality is now available via
-the file command. (RJ)
-
------------------ Released 8.0a1, 12/20/96 -----------------------
-
-1/7/97 (bug fix) Under Windows, "file stat c:" was returning error instead
-of stat for current dir on c: drive.
-
-1/10/97 (new feature) Added Tcl_GetIndexFromObj procedure for quick
-lookups of keyword arguments. (JO)
-
-1/12/97 (new feature) Serial IO channel drivers for Windows and Unix,
-available by using Tcl open command to open pseudo-files like "com1:" or
-"/dev/ttya".  New option to Tcl fconfigure command for serial files:  
-"-mode baud,parity,data,stop" to specify baud rate, parity, data bits, and
-stop bits.  Serial IO is not yet available on Mac.
-
-1/16/97 (feature change) Restored the Tcl7.x "two level substitution
-semantics" for expressions. Expressions not enclosed in braces are
-implemented, in general, by calling the expr command procedure
-(Tcl_ExprObjCmd) at runtime after the Tcl interpreter has already done a
-first round of substitutions. This is slow (about Tcl7.x speed) because new
-code for the expression is generally compiled each time. However, if the
-expression has only variable substitutions (and not command substitutions),
-"optimistic" fast code is generated inline. This inline code will fail if a
-second round of substitutions is needed (i.e., if the value of a substituted
-variable itself requires more substitutions). The optimistic code will
-catch the error and back off to call the slower but guaranteed correct
-expr command procedure. (BL)
-
-1/16/97 (feature improvements) Added Tcl_ExprLongObj and Tcl_ExprDoubleObj
-to round out expression-related procedures. (BL)
-
-1/16/97 (feature change) Under Windows, at startup the environment variables
-"path", "comspec", and "windir" in any capitalization are converted
-automatically to upper case.  The PATH variable could be spelled as path,
-Path, PaTh, etc. and it makes programming rather annoying.  All other
-environment variables are left alone. (CS)
-
-1/20/97 (new features) Rewrote the "lsort" command:
-    - The new version is based on reentrant merge sort code provided
-      by Richard Hipp, so it eliminates the reentrancy and stability
-      problems with the old qsort-based implementation.
-    - The new version supports a -dictionary option for sorting, and
-      it also supports a -index option for sorting lists using one
-      element for comparison.
-    - The new version is an object command, so it works well with the
-      Tcl compiler, especially in conjunction with the new -index
-      option.  When the -index option is used, this version of lsort
-      is more than 100 times faster than the Tcl 7.6 lsort, which had
-      to use the -command option to get the same effect. (JO)
-
-1/20/97 (feature improvements) Added the improved debugging support for Tcl
-objects prototyped by Karl Lehenbauer <karl@hammer1.ops.NeoSoft.com>.
-If TCL_MEM_DEBUG is defined, the object creation calls use Tcl_DbCkalloc
-directly in order to record the caller's source file name and line
-number. (BL)
-
-1/21/97 (removed feature) Desupported the tcl_precision variable: if
-set, it is ignored.  Tcl now uses the full 17 digits of precision when
-converting real numbers to strings (with the new object system real
-numbers are rarely converted to strings so there is no efficiency
-disadvantage to printing all 17 digits; the new scheme improves
-accuracy and simplifies several APIs). (JO)
-*** POTENTIAL INCOMPATIBILITY ***
-
-1/21/97 (feature change) Removed the "interp" argument for the
-procedures Tcl_GetStringFromObj, Tcl_StringObjAppend, and
-Tcl_StringObjAppendObj.  Also removed the "interp" argument for
-the updateStringProc procedure in Tcl_ObjType structures.  With
-the tcl_precision changes above, these are no longer needed. (JO)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a1, but not with Tcl 7.6 ***
-
-1/22/97 (bug fix) Fixed http.tcl so that http_reset does not result in
-an extra call to the command callback.  In addition, if the transaction
-gets a premature eof, the state(status) is "eof", not "ok". (BW)
-
------------------ Released 8.0a2, 1/24/97 -----------------------
-
-1/29/97 (feature change) Changed how two digit years are parsed in the
-clock command.  The old interface just added 1900 which will seem
-broken by the year 2000.  The new scheme follows the POSIX standard
-and treats dates 70-99 as 1970-1999 and dates 00-38 as 2000-2038.  All
-other two digit dates are undefined. (RJ)
-*** POTENTIAL INCOMPATIBILITY ***
-
-2/4/97 (bug fix) Fixed bug in clock code that dealt with relative
-dates.  Using the relative month code you could get an invalid date
-because it jumped into a non-existant day.  (For example, Jan 31
-to Feb 31.)  The code now will return the last valid day of the
-month in these situations.  Thanks to Hume Smith for sending in
-this bug fix.  (RJ)
-
-2/10/97 (feature change) Eliminated Tcl_StringObjAppend and 
-Tcl_StringObjAppendObj procedures, replaced them with Tcl_AppendToObj
-and Tcl_AppendStringsToObj procedures.  Added new procedure
-Tcl_SetObjLength. (JO)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a2, but not with Tcl 7.6 ***
-
-2/10/97 (new feature) Added Tcl_WrongNumArgs procedure for generating
-error messages about incorrect number of arguments. (JO)
-
-2/11/97 (new feature, bug fix) http package.  Added -accept to http_config
-so you can set the Accept header.  Added -handler option to http_get so
-you can supply your own data handler.  Also fixed POST operation to
-set the correct MIME type on the request. (BW)
-
-2/22/97 (bug fix) Fixed bug that caused $tcl_platform(osVersion) to be
-computed incorrectly under AIX. (JO)
-
-2/25/97 (new feature, feature change) Added support for both int and long
-integer objects. Added Tcl_NewLongObj/Tcl_GetLongFromObj/Tcl_SetLongFromObj
-procedures and renamed the Tcl_Obj internalRep intValue member to
-longValue. Tcl_GetIntFromObj now checks for integer values too large to
-represent as non-long integers. Changed Tcl_GetAllObjTypes to
-Tcl_AppendAllObjTypes. (BL)
-
-3/5/97 (new feature) Added new Tcl_SetListObj procedure to round out
-collection of procedures that set the type and value of existing Tcl
-objects. (BL)
-
-3/6/97 (new feature) Added -global flag for interp invokehidden. (JL)
-
-3/6/97 (new feature, feature change) Added isNativeObjectProc field to the
-Tcl_CmdInfo structure to indicate (when 1) if the command has an
-object-based command procedure. Removed the nameLength arg from
-Tcl_CreateObjCommand since command names can't contain null characters. (BL)
-
-3/6/97 (bug fix) Fixed bug in "unknown" procedure that caused auto-
-loading to fail on commands whose names begin with digits. (JO)
-
-3/7/97 (bug fix) Auto-loading now works in Safe Base. Safe interpreters
-only accept the Version 2 and onwards tclIndex files. (JL)
-
-3/13/97 (bug fix) Fixed core dump due to interaction between aliases and
-hidden commands. Bug found by Lindsay Marshall. (JL)
-
-3/14/97 (bug fix) Fixed mac bugs relating to time.  The -gmt option
-now adjusts the time in the correct direction.  (Thanks to Ed Hume for
-reporting a fix to this problem.)  Also fixed file "mtime" etc. to
-return times from GMT rather than local time zone.  (RJ)
-
-3/18/97 (feature change) Declaration of objv in Tcl_ObjCmdProc function
-changed from "Tcl_Obj *objv[]" to "Tcl_Obj *CONST objv[]".  All Tcl object
-commands changed to use new declaration of objv.  Naive translation of
-string-based command procs to object-based command procs could very easily
-have yielded code where the contents of the objv array were changed.  This
-is not a problem with string-based command procs, but doing something as
-simple as objv[2] = objv[3] would corrupt the runtime stack and cause Tcl to
-crash.  Introduced CONST in declaration of objv so that attempted assignment
-of new pointer values to elements of the objv array will be caught by the
-compiler. (CCS)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a2 ***
-
-3/19/97 (bug fix) Fixed panic due to object sharing. The root cause was
-that old code was using Tcl_ResetResult instead of Tcl_ResetObjResult. (JL)
-
-3/20/97 (new feature) Added a new subcommand for the file
-command. file attributes filename can give a list of platform-specific
-options (such as file/creator type on the Mac, permissions on Unix) or
-set the values of them. Added a new subcommand for the file
-command. file nativename name gives back the platform-specific form
-for the file. This is useful when the filename is needed to pass to
-the OS, such as exec under Windows 95 or AppleScript on the Mac. For
-more info, see file.n. (SRP)
-
-3/24/97 (removed feature) Removed the tcl_safePolicyPath procedure. Now
-the policy path is computed from the auto_path by appending the directory
-'policies' to each element. Also fixed several bugs in automatic tracking
-of auto_path by computed policy path. (JL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a2 but not with Tcl 7.6 ***
-
-4/8/97 (new feature) If the variable whose name is passed to lappend doesn't
-already exist, and there are no value arguments, lappend now creates the
-variable with an empty value instead of returning an error. Change suggested
-by Tom Tromey. (BL)
-
-4/9/97 (feature change) Changed the name of the TCL_PART1_NOT_PARSED flag to
-TCL_PARSE_PART1. (BL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a2 but not with Tcl 7.6 ***
-
-4/10/97 (bug fixes) Fixed various compilation-related bugs:
-    - "UpdateStringOfCmdName should never be invoked" panic.
-    - Bad code generated for expressions not in {}'s inside catch commands.
-    - Segmentation fault in some command procedures when two argument
-      object pointers refer to the same object.
-    - Second level of substitutions were never done for expressions not
-      in {}'s that consist of a single variable reference: e.g.,
-      "set x 27; set bool {$x}; if $bool {puts foo}" would fail with error.
-    - Bad code generated when code storage was grown while compiling some
-      expressions: ones with compilation errors or consisting of only a
-      variable reference.
-    - Bugs involving multiple interpreters: wasn't checking that a
-      procedure's code was compiled for the same interpreter as the one
-      executing it, and didn't invalidate code on hidden-exposed command
-      transitions.
-    - "Bad stack top" panic when executing scripts that require a huge
-      amount of stack space.
-    - Incorrect sharing of code for procedure bodies, and procedure code
-      deallocated before last execution of the procedure finished.
-    - Fixed compilation of expression words in quotes. For example,
-      if "0 < 3" {puts foo}.
-    - Fixed performance bug in array set command with large assignments.
-    - Tcl_SetObjLength segmentation fault setting length of empty object.
-    - If Tcl_SetObjectResult was passed the same object as the interpreter's
-      result object, it freed the object instead of doing nothing. Bug fix
-      by Michael J. McLennan.
-    - Tcl_ListObjAppendList inserted elements from the wrong list. Bug fix
-      by Michael J. McLennan.
-    - Segmentation fault if empty variable list was specified in a foreach
-      command. Bug fix by Jan Nijtmans.
-    - NULL command name was always passed to Tcl_CreateTrace callback
-      procedure.
-    - Wrong string representation generated for the value LONG_MIN.
-      For example, expr 1<<31 printed incorrectly on a 32 bit machine.
-    - "set {a($x)} 1" stored value in wrong variable.
-    - Tcl_GetBooleanFromObj was not checking for garbage after a numeric
-      value.
-    - Garbled "bad operand type" error message when evaluating expressions
-      not surrounded by {}'s. (BL)
-
-4/16/97 (new feature) The expr command now has the "rand()" and
-"srand()" functions for getting random numbers in expr. (RJ)
-
-4/23/97 (bug fix) Fixed core dump in bgerror when the error handler command
-deletes the current interpreter. Found by Juergen Schoenwald. (JL)
-
-4/23/97 (feature change) The notifier interfaces have been redesigned
-to make embedding in applications with external event loops possible.
-A number of interfaces in the notifier and the channel drivers have
-changed.  Refer to the Notifier.3 and CrtChannel.3 manual entries for
-more details. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-4/23/97 (removed feature) The Tcl_File interfaces have been removed.
-The Tcl_CreateFileHandler/Tcl_DeleteFileHandler interfaces now take
-Unix fd's and are only supported on the Unix platform.
-Tcl_GetChannelFile has been replaced with Tcl_GetChannelHandle.
-Tcl_MakeFileChannel now takes a platform specific file handle. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-4/23/97 (removed feature) The modal timeout interface has been
-removed (Tcl_CreateModalTimeout/Tcl_DeleteModalTimeout) (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-4/23/97 (feature change) Channel drivers are now required to correctly
-implement blocking behavior when they are in blocking mode. (SS)
-*** POTENTIAL INCOMPATIBILITY ***
-
-4/23/97 (new feature) Added the "binary" command for manipulating
-binary strings. Also, changed the "puts", "gets", and "read" commands
-to preserve embedded nulls.  (SS)
-
-4/23/97 (new feature) Added tcl_platform(byteOrder) element to the
-tcl_platform array to identify the native byte order for the current
-host. (SS)
-
-4/23/97 (bug fix) Fixed bug in date parsing around year boundaries. (SS)
-
-4/24/97 (bug fix) In the process of copying a file owned by another user,
-Tcl was changing the owner of the copy back to the owner of the original
-file, therefore causing further file operations to fail because the current
-user didn't own the copy anymore.  The owner of the copy is now left as the
-current user. (CCS)
-
-4/24/97 (feature change) Under Windows, don't automatically uppercase the
-environment variable "windir" -- it's supposed to be lower case.  (CCS)
-
-4/29/97 (new feature) Added namespace support based on a namespace
-implementation by Michael J. McLennan of Lucent Technologies. A namespace
-encapsulates a collection of commands and variables to ensure that they
-won't interfere the commands and variables of other namespaces. The global
-namespace holds all global variables and commands. Additional namespaces are
-created with the new namespace command. The new variable command lets you
-create Tcl variables inside a namespace. The names of Tcl variables and
-commands may now be qualified by the name of the namespace containing them.
-The key namespace-related commands are summarized below:
-    - namespace ?eval? name arg ?arg...?
-         Used to define the commands and variables in a namespace.
-         Optionally creates the namespace.
-    - namespace export ?-clear? ?pattern pattern...?
-         Specifies which commands are exported from a namespace. These
-         are the ones that can be imported into another namespace.
-    - namespace import ?-force? ?pattern pattern...?
-         Makes the specified commands accessible in the current namespace.
-    - namespace current
-         Returns the name of the current namespace.
-    - variable name ?value? ?name ?value?...?
-         Creates one or more namespace variables. (BTL)
-
-5/1/97 (bug fix) Under Windows, file times were reported in GMT.  Should be
-reported in local time. (CCS)
-
-5/2/97 (feature change) Changed the name of the two Tcl variables used for
-tracing bytecode compilation and execution to tcl_traceCompile and
-tcl_traceExec respectively. These variables are now documented in the
-tclvars man page. (BL)
-
-5/5/97 (new feature) Support "end" as the index for "lsort -index". (BW)
-
-5/5/97 (bug fixes) Cleaned up the way the http package resets connections (BW)
-
-5/8/97 (feature change) Newly created Tcl objects now have a reference count
-of zero instead of one. This simplifies C code that stores newly created
-objects in Tcl variables or in data structures such as list objects. That C
-code must increment the new object's reference count since the variable or
-data structure will contain a long-term reference to the object. Formerly,
-when new objects started out with reference count one, it was necessary to
-decrement the new object's reference count after the store to make sure it
-was left with the correct value; this is no longer necessary. (BL)
-
-5/9/97 (new feature) Added the Tcl_GetsObj interface that takes an
-object reference instead of a dynamic string (as in Tcl_Gets). (SS)
-
-5/12/97 (new feature) Added Tcl_CreateAliasObj and Tcl_GetAliasObj C APIs
-to allow an alias command to be created with a vector of Tcl_Obj structures
-and to get the vector back later. (JL)
-
-5/12/97 (feature change) Changed Tcl_ExposeCommand and Tcl_HideCommand to
-leave an object result instead of a string result. (JL)
-
-5/14/97 (feature change) Improved the handling of the interpreter result.
-This is still either an object or a string, but the two values are now kept
-consistent unless some C code reads or writes interp->result directly. See
-the SetResult man page for details. Removed the Tcl_ResetObjResult
-procedure. (BL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0a2 ***
-
-5/16/97 (new feature) Added "fcopy" command to move data between
-channels.  Refer to the manual page for more information.  Removed the
-"unsupported0" command since it is obsolete now.  (SS)
-
-5/16/97 (new feature) Added Tcl_GetStringResult procedure to allow programs
-to get an interpreter's result as a string. If the result was previously set
-to an object, this procedure will convert the object to a string. Use of
-Tcl_GetStringResult is intended to replace direct access to interp->result,
-which is not safe. (BL)
-
-5/20/97 (new features) Fixed "fcopy" to return the number of bytes
-transferred in the blocking case.  Updated the http package to use
-fcopy instead of unsupported0.  Added -timeout and -handler options to
-http_get.  http_get is now blocking by default.  It is only non-blocking
-if you supply a -command argument. (BW)
-
-5/22/97 (bug fix) Fixed several bugs in the "lsort" command having to do
-with the -dictionary option and the presence of numbers embedded in the
-strings.  (JO)
-
------------------ Released 8.0b1, 5/27/97 -----------------------
-
-6/2/97 (bug fix) Fixed bug in startup code that caused a problem in
-finding the library files when they are installed in a directory
-containing a space in the name. (SS)
-
-6/2/97 (bug fix) Fixed bug in Unix notifier where the select mask was
-not being cleared under some circumstances. (SS)
-
-6/4/97 (bug fix) Fixed bug that prevented creation of Tk widgets in
-namespaces. Tcl_CreateObjCommand and Tcl_CreateCommand now always create
-commands in the global namespace unless the command names are qualified. Tcl
-procedures continue to be created in the current namespace by default. (BL)
-
-6/6/97 (new features) Added new namespace API procedures
-Tcl_AppendExportList and Tcl_Export to allow C code to get and set a
-namespace's export list. (BL)
-
-6/11/97 (new feature) Added Tcl_ConcatObj. This object-based routine
-parallels the string-based routine Tcl_Concat. (SRP)
-
-6/11/97 (new feature) Added Tcl_SetObjErrorCode. This object-based
-routines parallels the string-based routine Tcl_SetErrorCode. (SRP)
-
-6/12/97 (bug fix) Fix the "unknown" procedure so that wish under Windows
-will exec an external program, instead of always complaining "console1 not
-opened for writing". (CCS)
-
-6/12/97 (bug fix) Fixed core dump experienced by the following simple
-script:
-	interp create x
-	x alias exec exec
-	interp delete x
-This panic was caused by not installing the new CmdDeleteProc when exec
-got redefined by the alias creation step. Reported by Lindsay Marshal (JL)
-
-6/13/97 (new features) Tcl objects newly created by Tcl_NewObj now have a
-string representation that points to a shared heap string of length 1. (They
-used to have NULL bytes and typePtr fields. This was treated as a special
-case to indicate an empty string, but made type manager implementations
-complex and error prone.) The new procedure Tcl_InvalidateStringRep is used
-to mark an object's string representation invalid and to free any storage
-associated with the old string representation. (BL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b1, but not with Tcl7.6 ***
-
-6/16/97 (bug fix) Tcl_ScanCountedElement could leave braces unmatched
-if the string ended with a backslash. (JO)
-
-6/17/97 (bug fix) Fixed channel event bug where readable events would be
-lost during recursive events loops if the input buffers contained
-data. (SS)
-
-6/17/97 (bug fix) Fixed bug in Windows socket code that didn't
-reenable read events in the case where an external entity is also
-reading from the socket. (SS)
-
-6/18/97 (bug fix) Changed initial setting of the notifier service mode
-to TCL_SERVICE_NONE to avoid unexpected event handling during
-initialization. (SS)
-
-6/19/97 (bug fix/feature change) The command callback to fcopy is now
-called in case of errors during the background copy.  This adds a second,
-optional argument to the callback that is the error string.  The callback
-in case of errors is required for proper cleanup by the user of fcopy. (BW)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b1, but not with Tcl 7.6 ***
-
-6/19/97 (bug fix) Fixed a panic due to the following four line script:
-	interp create x
-	x alias foo bar
-	x eval rename foo blotz
-	x alias foo {}
-The problem was that the interp code was not using the actual current name
-of the command to be deleted as a result of un-aliasing foo. (JL)
-
-6/19/97 (feature change) Pass interp down to the ChannelOption and
-driver specific calls so system errors can be differentiated from syntax
-ones. Changed Tcl_DriverGetOptionProc type. Affects Tcl_GetChannelOption,
-TcpGetOptionProc,  TtyGetOptionProc, etc. (DL)
-*** POTENTIAL INCOMPATIBILITY ***
-
-6/19/97 (new feature) Added Tcl_BadChannelOption for use by by driver
-specific option procedures (Set and Get) to return a complete and
-meaningful error message. (DL)
-
-6/19/97 (bug fixes) If a system call error occurs while doing an
-fconfigure on tcp or tty/com channel: return the appropriate error
-message (instead of the syntax error one or none). (Fixed for Unix and
-most of the Win and Mac drivers). (DL)
-
-6/20/97 (feature change) Eval is no longer assumed as the subcommand name
-in namespace commands: you must now write "namespace eval nsName {...}".
-Abbreviations of namespace subcommand names are now allowed. (BL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b1, but not with Tcl7.6 ***
-
-6/20/97 (feature change) Changed the errorInfo traceback message for
-compilation errors from "invoked from within" to "while compiling". (BL)
-
-6/20/97 (bug fixes) Fixed various compilation-related bugs:
-    - "UpdateStringOfCmdName should never be called" and
-      "UpdateStringOfByteCode should never be called" panics.
-    - Segfault in TclObjInterpProc getting procedure name after evaluation
-      stack is reallocated (grown).
-    - Could not use ":" at end of variable and command names.
-    - Bad code generated for while and for commands with test expressions
-      enclosed in quotes: e.g., "set i 0; while "$i > 5" {}".
-    - Command trace procedures would crash if they did a Tcl_EvalObj that
-      reallocated the evaluation stack.
-    - Break and continue commands did not reset the interpreter result.
-    - The Tcl_ExprXXX routines, both string- or object-based, always
-      modified the interpreter result even if there was no error.
-    - The argument parsing procedure used by several compile procedures
-      always treated "]" as end of a command: e.g., "set a ]" would fail.
-    - Changed errorInfo traceback message for compilation errors from 
-      "invoked from within" to "while compiling".
-    - Problem initializing Tcl object managers during interpreter creation.
-    - Added check and error message if formal parameter to a procedure is
-      an array element. (BL)
-
-6/23/97 (new feature) Added "registry" package to allow manipulation
-of the Windows system registry.  See manual entry for details. (SS)
-
-6/24/97 (feature change) Converted http to a package and added the
-http1.0 subdirectory of the Tcl script library.  This means you have
-to do a "package require http" to use this, as advertised in the man page. (BW)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b1, but not with Tcl 7.6 ***
-
-6/24/97 (bug fix) Ensure that Tcl_Set/GetVar C APIs, when called without
-TCL_LEAVE_ERR_MSG, don't touch the interp result. (DL)
-
-6/26/97 (feature change) Changed name of Tcl_ExprStringObj to
-Tcl_ExprObj. (BL)
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b1, but not with Tcl 7.6 ***
-
------------------ Released 8.0b2, 6/30/97 -----------------------
-
-7/1/97 (new feature) TCL_BUILD_SHARED flag set in tclConfig.sh
-when Tcl has been built with --enable-shared. A new tclLibObjs
-make target, echoing the list of the .o's needed to build a tcl
-library, is now provided. (DL)
-
-7/1/97 (feature change) compat/getcwd.c removed and changed the
-only place where getcwd is used so a new USEGETWD flag selects
-the use of the replacement "getwd". Adding this flag is recommended
-for SunOS 4 (because getcwd on SunOS 4 uses a pipe to pwd(1)!). (DL)
-
-7/7/97 (feature change) The split command now supports binary data (i.e.,
-null characters in strings). (BL)
-
-7/7/97 (bug fix) string first returned the wrong result if the first
-argument string was empty. (BL)
-
-7/8/97 (bug fix) Fixed core dump in fcopy that could occur when a command
-callback was supplied and an error or eof condition caused no background
-activity.  A refcount bug triggered a panic in Tcl_ListObjAppendElement. (BW)
-
-7/8/97 (bug fix) Relaxed the pattern matching on http_get so you do not
-need a trailing path component.  You can now get away with just
-http_get www.scriptics.com					(BW)
-
-7/9/97 (bug fix) Creating anonymous interpreters no longer smashes existing
-commands with names similar to the generated name. Previously creating an
-anonymous interpreter could smash an existing command, now it skips until
-it finds a command name that isn't being used. (JL)
-
-7/9/97 (feature change) Removed the policy management mechanism from the
-Safe Base; left the aliases to source and load modules, and to do a limited
-form of the "file" command. See entry of 11/15/96. (JL)
-
-7/9/97 (bug fixes) Fixed various compilation-related bugs:
-    - Line numbers in errorInfo now are the same as those in Tcl7.6 unless
-there are compilation errors. Compilation error messages now include the
-entire command in error.
-    - Trailing ::s after namespace names weren't being ignored.
-    - Could not refer to an namespace variable with an empty name using a
-name of the form "n::". (BL)
-
-7/9/97 (bug fix) Fixed bug in Tcl_Export that prevented you from exporting
-from other than the current namespace. (BL)
-
-7/9/97 (bug fix) env.test was removing env var needed for proper finding
-of libraries in child process. (DL)
-
-7/10/97 (bug fixes/new feature) Cleanup in Tcl_MakeSafe. Less information
-is leaked to safe interps. Error message fixes for interp sub commands.
-Likewise changes in safealias.tcl; tcl_safeCreateInterp can now be called
-without argument to generate the slave name (like in interp create). (DL)
-
-7/10/97 (bug fixes) Bytecode compiler now generates more detailed 
-command location information: subcommands as well as commands now have
-location information. This means command trace procedures now get the
-correct source string for each command in their command parameter. (BL)
-
-7/22/97 (bug fixes) Performance improvement in Safe interpreters
-handling. Added new mask value to (tclInt.h) Interp.flags record. (DL)
-
-7/22/97 (bug fix) Fixed panic in 'interp target {} foo'. This bug
-was present since Tcl 7.6. (JL)
-
-7/22/97 (bug fix) Fixed bug in compilation of procedures in namespaces: the
-procedure's namespace must be used to look up compile procedures, not the
-current namespace. (BL)
-
-7/22/97 (bug fix) Use of the -channel option of http_get was not setting
-the end of line translations mode on the channel, so copying binary data
-with the -channel option was corrupting the result on non-unix platforms. (BW)
-
-7/22/97 (bug fixes) file commands and ~user (seg fault and other
-improper returns). (DL)
-
-7/23/97 (feature change) Reenabled "vwait" in Safe Base. (JL)
-
-7/23/97 (bug fixes) Fixed two bugs involving read traces on array variables
-in procedures: trace procedures were sometimes not called, and reading
-nonexistant array elements didn't create undefined element variables that
-could later be defined by trace procedures. (BL)
-
-7/24/97 (bug fix) Windows memory allocation performance was
-superlinear in some cases.  Made the Mac allocator generic and changed
-both the Mac and Windows platforms to use the new allocator instead of
-malloc and free. (SS)
-
-7/24/97 - 8/12/97 (bug fixes/change of features) Completely revamped safe
-sourcing/loading (see safe.n) to hide pathnames, use virtual
-paths tokens instead, improved security in several respects and made it
-more tunable. Multi level interp loading can work too now. Package auto
-loading now works in safe interps as long as the package directory is in 
-the auto_path (no deep crawling allowed in safe interps). (DL)
-*** POTENTIAL INCOMPATIBILITY with previous alpha and beta releases ***
-
-7/24/97 (bug fixes) Made Tcl_SetVar* and Tcl_NewString* treat a NULL value
-as an empty string. (This fixes hairy crash case where you would crash
-because load command for other interps assumed presence of
-errorInfo...). (DL)
-
-7/28/97 (bug fix) Fixed pkg_mkIndex to understand namespaces.  It will
-use the export list of a namespace and create auto_index entries for
-all export commands.  Those names are in their fully qualified form in the
-auto_index.  Therefore, I tweaked unknown to try both $cmd and ::$cmd.
-Also fixed pkg_mkIndex so you can have "package require" commands inside
-your packages.  These commands are ignored, which is mostly ok except
-when you must load another package before loading yours because of
-linking dependencies. (BW)
-
-7/28/97 (bug fix) A variable created by the variable command now persists
-until the namespace is destroyed or the variable is unset. This is true even
-if the variable has not been initialized; these variables used to be
-destroyed if an error occurred when accessing them. In addition, the "info
-vars" command lists uninitialized namespace variables, while the "info
-exists" command returns 0 for them. (BL)
-
-7/29/97 (feature change)  Changed the http package to use the ::http
-namespace. http_get renamed to http::geturl, http_config renamed to
-http::config, http_formatQuery renamed to http::formatQuery.
-It now provides the 2.0 version of the package.  
-The 1.0 version is still available with the old names.
-*** POTENTIAL INCOMPATIBILITY with Tcl 8.0b2 but not with Tcl 7.6 ***
-
-7/29/97 (bug fix, new feature) Tcl_Main now uses Tcl objects internally to
-preserve NULLs in commands and command output. Added new API procedure
-Tcl_RecordAndEvalObj that resembles Tcl_RecordAndEval but takes an object
-containing a command. (BL)
-
-7/30/97 (bug fix) Tcl freed strings in the environ array even if it
-did not allocate them. (SS)
-
-7/30/97 (bug fix) If a procedure is renamed into a different namespace, it
-now executes in the context of that namespace. (BL)
-
-7/30/97 (bug fix) Prevent renaming of commands into and from namespaces as
-part of hiding them. (JL)
-
-7/31/97 (feature change) Moved the history command from C to tcl.
-This uses the ::history namespace.  The "words" and "substitute" options
-are no longer supported.  In addition, the "keep" option without a value
-returns the current keep limit.  There is a new "clear" option.
-The unknown command now supports !! again. (BW)
-*** POTENTIAL INCOMPATIBILTY  ***
-
-7/30/97 (bug fix) Made sure that a slave can not fool the master into
-hiding the wrong command. Made sure we don't crash in hiding + namespaces
-issues. (DL)
-
-8/4/97 (bug fix) Concat, eval, uplevel, and similar commands were
-incorrectly trimming trailing space characters from their arguments
-even when the space characters were preceded by a backslash. (JO)
-
-8/4/97 (bug fix) Removed the hard link between bgerror and tkerror.
-Only bgerror is supported in tcl core. Tk will still look for a
-tkerror but using regular tcl code for that feature. (DL)
-*** POTENTIAL INCOMPATIBILTY with code relying on the hard link ***
-
-8/6/97 (bug fix) Reduced size required for compiled bytecodes by using a
-more compact encoding for the command pc-to-source map. (BL)
-
-8/6/97 (new feature) Added support for additional compilation and execution
-statistics when Tcl is compiled with the TCL_COMPILE_STATS flag. (BL)
-
-8/7/97 (bug fix) Expressions not in {}s that have a comparison operator as
-the topmost operator must be compiled out-of-line (call the expr cmd at
-runtime) to properly support expr's two-level substitution semantics. An
-example is "set a 2; set b {$a}; puts [expr $b == 2]". (BL)
-
-8/11/97 (bug fix) The catch command would sometimes crash if a variable name
-was given and the bytecode evaluation stack was grown when executing the
-argument script. (BL)
-
-8/12/97 (feature change) Reinstated the variable tcl_precision to control
-the number of digits used when floating-point values are converted to
-strings, with default of 12 digits.  However, had to make tcl_precision
-shared among all interpreters (except that safe interpreters can't
-modify it).  This makes the Tcl 8.0 behavior almost identical to 7.6
-except that the default precision is 12 instead of 6. (JO)
-*** POTENTIAL INCOMPATIBILITY ***
-
------------------ Released 8.0, 8/18/97 -----------------------
-
-8/19/97 (bug fix) Minimal fix for glob -nocomplain bugs:
-"glob -nocomplain unreadableDir/*" was generating an anonymous 
-error. More in depth fixes will come with 8.1. (DL).
-
-8/20/97 (bug fix) Removed check for FLT_MIN in binary command so
-underflow conditions are handled by the compiler automatic
-conversions. (SS)
-
-8/20/97 (bug fixes) Fixed several compilation-related bugs:
-    - Array cmd wasn't detecting arrays that, while compiled, do not yet
-      exist (e.g., are marked undefined since they haven't been assigned
-      to yet).
-    - The GetToken procedure in tclCompExpr.c wasn't recognizing properly
-      whether an integer token was invalid. For example, "0x$" is not
-      a valid integer.
-    - Performance bug in TclExecuteByteCode: the size of its stack frame
-      was reduced by over 20% by moving errorInfo code elsewhere.
-    - Uninitialized memory read error in tclCompile.c. (BL)
-
-8/21/97 (bug fix) safe::interpConfigure now behave like Tk widget's
-configure : it changes only the options you provide and you can get
-the current value of any single option. New ?-nested boolean? and
-?-statics boolean? for all safe::interp* commands but we still
-accept (upward compatibility) the previously defined non valued
-flags ?-noStatics? and ?-nestedLoadOk?. Improved the documentation. (DL).
-
-8/22/97 (bug fix) Updated PrintDbl.3 to reflect the fact that the
-tcl_precision variable is still used and that it is now shared by all
-interpreters. (BL)
-
-8/25/97 (bug fix) Fixed array access bug in IllegalExprOperandType
-procedure in tclExecute.c: it was not properly supporting the || and &&
-operators. (BL)
-
-8/27/97 (bug fix) In cases where a channel handler was created with an
-empty event mask while data was still buffered in the channel, the
-channel code would get stuck spinning on a timer that would starve
-idle handlers.  This mostly happened in Tk when reading from stdin. (SS)
-
-9/4/97 (bug fix) Slave interps now inherit the maximum recursion limit
-of their parent instead of starting back at the default. {nb: this still
-does not prevent stack overflow by multi-interps recursion or aliasing} (DL)
-
-9/11/97 (bug fix) An uninitialized variable in Tcl_WaitPid caused
-pipes to fail to report eof properly under Windows. (SS)
-
-9/12/97 (bug fix) "exec" was misidentifying some DOS executables as not 
-executable. (CCS)
-
-9/14/97 (bug fix) Was using the wrong structure in sizeof operation in
-tclUnixChan.c. (JL)
-
-9/15/97 (bug fix) Fixed notifier to break out of do-one-event loop if
-Tcl_WaitForEvent returns 1, so that callers of Tcl_DoOneEvent will get
-a chance to check whether the event just handled is significant. This
-affected mainly recursive calls to Tcl_VWaitCmd; these did not get a
-chance to notice that the variable they were waiting for has been set
-and thus they didn't terminate the vwait. (JL, DL, SS)
-
-9/15/97 (bug fix) Alignment problems in "binary format" would cause a
-crash on some platforms when formatting floating point numbers. (SS)
-
-9/15/97 (bug fix) Fixed bug in Macintosh socket code.  Now passes all
-tests in socket.test that are not platform specific. (Thanks to Mark
-Roseman for the pointer on the fix.)  (RJ)
-
-9/18/97 (bug fix) Fixed bug -dictionary option of lsort that could
-cause the compare function to run off the end of an array if the
-number only contained 0's. (Thanks to Greg Couch for the report.) (RJ)
-
-9/18/97 (bug fix) TclFinalizeEnvironment was not cleaning up 
-properly. (DL, JI)
-
-9/18/97 (bug fix) Fixed long-standing bug where an "array get" command
-did not trigger traces on the array or its elements. (BL)
-
-9/18/97 (bug fixes) Fixed compilation-related bugs:
-    - Fixed errorInfo traceback information for toplevel coomands that
-      contain nested commands.
-    - In the expr command, && and || now accept boolean operands as well
-      as numeric ones. (BL)
-
-9/22/97 (bug fix) Fixed bug that prevented translation modes from being
-set independently for input and output on sockets if input was "auto". (JL)
-
-9/24/97 (bug fix) Tcl_EvalFile(3) and thus source(n) now works fine on
-files containing NUL chars. (DL)
-
-9/26/97 (bug fix) Fixed use of uninitialized memory in the environ array
-that later could cause random core dumps. Applies to all platforms. (JL)
-
-9/26/97 (bug fix) Fixed use of uninitialized memory in socket address data
-structure under some circumstances. This could cause random core dumps.
-This applies only to Unix. (JL)
-
-9/26/97 (bug fix) Opening files on PC-NFS volumes would cause a hang
-until the system timed after the file was closed. (SS)
-
-10/6/97 (bug fix) The join(n) command, though objectified, was loosing
-NULs in the joinString and in list elements after the 2nd one.
-Now you can "join $list \0" for instance. (DL)
-
-10/9/97 (bug fix) Under windows, if env(TMP) or env(TEMP) referred to a
-non-existent directory, exec would fail when trying to create its temporary
-files. (CCS)
-
-10/9/97 (bug fix) Under mac and windows, "info hostname" would crash if 
-sockets were installed but the hostname could not be determined anyhow.
-Tcl_GetHostName() was returning NULL when it should have been returning 
-an empty string. (CCS)
-
-10/10/97 (bug fix) "file attribute /" returned error on windows. (CCS)
-
-10/10/97 (bug fix) Fixed the auto_load procedure to handle procedures
-defined in namespaces better.  Also fixed pgk_mkIndex so it sees procedures
-defined in nested namespaces.  Index entries are still only made for
-exported procedures. (BW)
-
-10/13/97 (bug fix) On unix, for files with unknown group or owner
-attributes, querying the "file attributes" would return an error rather than
-returning the group's or owner's id number, although tha command accepts
-numbers when setting the file's group or owner.  (CCS)
-
-10/22/97 (bug fix) "fcopy" did not eval the callback script at the
-global scope. (SS)
-
-10/22/97 (bug fix) Fixed the signature of the CopyDone callback used in
-the http package(s) so they can handle error cases properly. (BW)
-
-10/28/97 (bug fixes) Fixed a problem where lappend would free the Tcl object
-in a variable if a Tcl_ObjSetVar2 failed because of an error calling a trace
-on the variable. (BL)
-
-10/28/97 (bug fix) Changed binary scan to properly handle sign
-extension of integers on 64-bit or larger machines. (SS)
-
-11/3/97 (bug fixes) Fixed several bugs:
-    - expressions such as "expr ($x)" must be compiled out-of-line
-      (call the expr command procedure at runtime) to ensure the correct
-      behavior when "$x" is an expression such as "5+10".
-    - "array set a {}" now creates a new array var with an empty array
-      value if the var didn't already exist.
-    - "lreplace $foo end end" no longer returns an error (just an empty
-      list) if foo is empty.
-    - upvar will no longer create a variable in a namespace that refers
-      to a variable in a procedure.
-    - deleting a command trace within a command trace callback would
-      make the code that calls traces to reference freed memory.
-    - significantly sped up "string first" and "string last" (fix from
-      darrel@gemstone.com).
-    - seg fault in Tcl_NewStringObj() when a NULL is passed as the byte
-      pointer argument and Tcl is compiled with -DTCL_MEM_DEBUG.
-    - documentation and error msg fixes. (BL)
-
-11/3/97 (bug fix) Fixed a number of I/O bugs related to word sizes on
-64-bit machines. (SS)
-
-11/6/97 (bug fix) The exit code of the first process created by Tcl
-on Windows was not properly reported due to an initialization
-problem. (SS)
-
------------------ Released 8.0p1, 11/7/97 -----------------------
-
-11/19/97 (bug fix) Fixed bug in linsert where it sometimes accidently
-cleared out a shared argument list object. (BL).
-
-11/19/97 (bug fix) Autoloading in namespaces was not working properly.
-auto_mkindex is still not really namespace aware but most common
-cases should now be handled properly (see init.test). (BW, DL)
-
-11/20/97 (enhancement) Made the changes required by the new Apple
-Universal Headers V.3.0, so that Tcl will compile with CW Pro 2.
-
-11/24/97 (bug fix) Fixed tests in clock test suite that needed the
--gmt flag set.  Thanks to Jan Nijtmans for reporting the problem. (RJ)
-
------------------ Released 8.0p2, 11/25/97 -----------------------
-
-12/3/97 (bug fix/optimization) Removed uneeded and potentially dangerous
-instances of double evaluations if "if" and "expr" statements from
-the library files. It is recommended that unless you need a double
-evaluation you always use "expr {...}" instead of "expr ..." and
-"if {...} ..." instead of "if ... ...". It will also be faster
-thanks to the byte compiler. (DL)
-
----- Shipped as part of the plugin2.0b5 as 8.0p2Plugin1, Dec 8th 97 ----
-
-12/8/97 (bug fix) Need to protect the newly accepted channel in an
-accept callback on a socket, otherwise the callback may close it and
-cause an error, which would cause the C code to attempt to close the
-now deleted channel. Bumping the refcount assures that the channel sticks
-around to be really closed in this case. (JL)
-
-12/8/97 (bug fix) Need to protect the channel in a fileevent so that it
-is not deleted before the fileevent handler returns. (CS, JL)
-
-12/18/97 (bug fix) In the opt argument parsing package: if the description 
-had only flags, the "too many arguments" case was not detected. The default
-value was not used for the special "args" ending argument. (DL)
-
-1/15/98 (improvement) Moved common part of initScript in common file.
-Moved windows specific initialization to init.tcl so you can initialize
-Tcl in windows without having to call Tcl_Init which is now only
-searching for init.tcl {back ported from 8.1}. (DL)
-
----- Shipped as part of the plugin as 8.0p2Plugin2, Jan 15th 98 ----
-
-5/27/98 (bug fix) Windows socket driver did not notice new data arriving
-on nonblocking sockets until the event loop was entered. (SS)
-
-5/27/98 (bug fix) Windows socket driver used FIONREAD, which is not
-supported correctly by WinSock. (SS)
-
-6/9/98 (bug fix) Generic channel code failed to report readable file
-events on buffered data that was left behind by a gets or read that
-did not consume all available data. (SS)
-
-6/18/98 (bug fix) Compilation of loop expressions was too aggressive
-and incorrectly inlined non-literal expressions. (SS)
-
-6/18/98 (bug fix) "info var" and "info locals" incorrectly reported
-the existence of compiler temporary variables. (SS)
-
-6/18/98 (bug fix) Dictionary sorting used signed character
-comparisons. (SS)
-
-6/18/98 (bug fix) Compile procs corrupted the exception stack in some
-cases. (SS)
-
-6/18/98 (bug fix) Array set had erratic behavior when initializing a
-variable from an empty value list. (SS)
-
-6/18/98 (bug fix) The Windows registry package had a bad bounds check
-that could lead to a crash. (SS)
-
-6/18/98 (bug fix) The foreach compile proc did not correctly handle
-non-local variable references. (SS)
-
-6/25/98 (new features) Added name resolution hooks to support [incr Tcl].
-There are new internal Tcl_*Resolver* APIs to add, query and remove the hooks. 
-With this changes it should be possible to dynamically load [incr Tcl]
-as an extension. (MM)
-
-7/1/97 (bug fix) The commands "info args, body, default, procs" did
-not correctly handle imported procedures. (RJ)
-
-7/6/98 (improvement) pkg_mkIndex now implements the "package require"
-command.  This makes it possible to create index files for packages
-that require another package and then execute code from that package in
-their file. Previously, this would throw an error because the required
-package had not been loaded.  The -nopkgrequied flag is provided to
-revert back to the old functionality. (EMS)
-
-7/6/98 (improvement) back-ported the -direct flag from 8.1 into
-pkg_mkIndex.  This results in pkgIndex.tcl files that contain direct
-source or load commands instead of tclPkgSetup commands. (EMS)
-
-7/6/98 (improvement) made changes to the AuxData items structures to support
-storage of compiled scripts on disk. Also some related minor changes in
-the compilation and execution engine. (EMS)
-
-6/4/98 (enhancement) Added new internal routines to support inserting
-and deleting from the stat, access, and open-file-channel mechanisms.
-TclAccessInsertProc, TclStatInsertProc, & TclOpenFileChannelInsertProc
-insert pointers to such routines; TclAccessDeleteProc, TclStatDeleteProc,
-& TclOpenFileChannelDeleteProc delete pointers to such routines.  See
-the file generic/tclIOUtils.c for more details. (SKS)
- 
-7/1/98 (enhancement) Added a new internal C variable
-tclPreInitScript.  This is a pointer to a string that may hold an
-initialization script; If this pointer is non-NULL it is evaluated in
-Tcl_Init() prior to the built-in initialization script defined in the
-file generic/tclInitScript.h.  (SKS)
-
-7/6/98 (bug fix) Removed dead code in PlatformInitExitHandler so that
-the TCL_LIBRARY value can be safely patched in binaries. (BW)
-
-7/24/98 (enhancement) Incorporated a new version of auto_mkindex that
-can support the [incr Tcl] class structures.  This version will index
-all procedures in a source file, not just those where "proc" starts
-at the beginning of the line.  If you want the old behavior, use the
-auto_mkindex_old procedure. (MM)
-
-7/24/98 (feature change) Changed the Windows registry key to be
-HKEY_LOCAL_MACHINE\Software\Scriptics\Tcl\8.0, and to store the path
-in the default value instead of "Root".  Also, this key can be
-specified at compile time in case Tcl is being used in a different
-context where it needs an alternate library path from the standard Tcl
-installation. (SS)
-
-7/24/98 (feature change) Changed the search order for init.tcl.  The
-tcl_library variable can now be set before calling Tcl_Init to avoid
-doing any searches.  If it isn't set, then Tcl checks
-env(TCL_LIBRARY), the static value set at compile time, an install
-directory relative to the executable, a source directory relative to
-the executable, and a tcl directory relative to the source heirarchy
-containing the executable.  See the comment at the top of
-generic/tclInitScript.h for more details. (SS)
-
-7/27/98 (config change) Changed the use of the DBGX flag in configure.in
-and the makefile to be TCL_DBGX.  Users of tclConfig.sh may need to pass
-this through their configure files with AC_SUBST. (BW)
-
-729/98 (bug fix) Changed [info body] to return a copy of the body of a
-compiled procedure instead of the body itself, to avoid invalidation
-of the internal rep and loss of the byte-codes. (EMS)
-
-8/5/98 (bug fix) The platform init code could walk off the end of a
-buffer when reading the PkgPath registry value on Windows. (SS)
-
-8/5/98 (Windows makefile change) Introduced a set of macros to deal with
-exporting symbols when compiling DLLS on Windows. See win/README for
-details. (EMS)
-
-8/5/98 (addendum) Added a second Windows registry key under
-HKEY_LOCAL_MACHINE\Software\Scriptics\Tcl\8.0, named "pkgPath".
-This is a multi-string value used to initialize the tcl_pkgPath
-variable. This is required if extension DLLs are in architecture specific
-subdirectories. (SS)
-
-8/6/98 (new feature) Added tcl_findLibrary to init.tcl for use by
-extensions, including Tk.  This searches in a canonical way for
-an extensions library directory and initialization file. (BW)
-
-8/10/98 (bug fix) Imported commands used to get lost if the target
-of the import was redefined.  Tcl_CreateCommand and Tcl_CreateObjCommand
-were updated to restore import links. (Note that if you rename a command,
-the import links move to the new name, and if you delete a command then
-the import links get lost. These semantics have not changed.) (MC)
-
--------- Released 8.0.3 to the Tcl Consortium CD-ROM project, 8/10/98 ------
-
-9/3/98 (bug fix) Tcl_Realloc was failing under Windows because the
-GlobalReAlloc API was not correctly re-allocating blocks that were
-32k+.  The fix was to use newer Win32 APIs (HeapAlloc, HeapFree, and
-HeapReAlloc.) (BS)
-
-10/5/98 (bug fix) Fixed bug in pkg_mkIndex that caused some files that do
-a "package require" of packages in the Tcl libraries to give a warning like
-	warning: "xx.tcl" provides more than one package ({xx 2.0} {yy 0.3})
-and generate a broken pkgIndex.tcl file. (EMS)
-
-10/5/98 (bug fix) Pkg_mkIndex was not doing a case-insensitive comparison
-of extensions to determine whether to load or source a file. Thus, under
-Windows, MYDLLNAME.DLL was sourced, and mydllname.dll loaded. (EMS)
-
-10/5/98 (new feature) Created a new Tcl_Obj type, "procbody". This object's
-internal representation holds a pointer to a Proc structure. Extended
-TclCreateProc to take both strings and "procbody". (EMS)
-
-10/13/98 (bug fix) The "info complete" command can now handle strings
-with NULLs embedded.  Thanks to colin@field.medicine.adelaide.edu.au 
-for providing this fix. (RJ)
-
-10/13/98 (bug fix) The "lsort -dictionary" command did not properly
-handle some numbers starting with 0.  Thanks to Richard Hipp
-<drh@acm.org> for submitting the fix to Scriptics. (RJ)
-
-10/13/98 (bug fix) The function Tcl_SetListObj was creating an invalid
-Tcl_Obj if the list had zero elements (despite what the comments said
-it would do).  Thanks to Sebastian Wangnick for reporting the
-problem. (RJ)
-
-10/20/98 (new feature) Added tcl_platform(debug) element to the
-tcl_platform array on Windows platform.  The existence of the debug
-element of the tcl_platform array indicates that the particular Tcl
-shell has been compiled with debug information.  Using
-"info exists tcl_platform(debug)" a Tcl script can direct the
-interpreter to load debug versions of DLLs with the load
-command. (SKS)
-
-10/20/98 (feature change) The Makefile and configure scripts have been
-changed for IRIX to build n32 binaries instead of the old 32 abi
-format.  If you have extensions built with the o32 abi's you will need
-to update them to n32 for them to work with Tcl.  (RJ)
-*** POTENTIAL INCOMPATIBILITY ***
-
-10/23/98 (bug fix) tcl_findLibrary had a stray ] in one of the
-pathnames it searched for the initialization script.  tclInitScript.h
-was incorrectly adding the parent of tcl_library to tcl_pkgPath.  This
-logic was moved into init.tcl, and the initialization of auto_path was
-documented.  Thanks to Donald Porter and Tom Silva for related
-patches. (BW)
-
-10/29/98 (bug fix) Fixed Tcl_NotifyChannel to use Tcl_Preserve instead
-of Tcl_RegisterChannel so that 1) unregistered channels do not get
-closed after their first fileevent, and 2) errors that occur during
-close in a fileevent script are actually reflected by the close
-command. (BW)
-
-10/30/98 (bug fix) Overhaul of pkg_mkIndex to deal with transitive
-package requires and packages split among scripts and binary files.
-Also fixed ommision of global for errorInfo in tcl_findLibrary. (BW)
-
-11/08/98 (bug fix) Fixed the resource command to always detect
-the case where a file is opened a second time with the same
-permissions.  IM claims that this will always cause the same
-FileRef to be returned, but in MacOS 8.1+, this is no longer the case,
-so we have to test for this explicitly. (JI)
-
-11/10/98 (feature change) When compiling with Metrowerk's MSL, use the
-exit function from MSL rather than ExitToShell.  This allows MSL to
-clean up its temporary files. Thanks to Vince Darley for this
-improvement. (JI)
-
------------------ Released 8.0.4, 11/19/98 -------------------------
-
-11/20/98 (bug fix) Handle possible NULL return in TclGetStdFiles. (RJ)
-
-11/20/98 (bug fix) The dltests would not build on SGI.  They reported
-that you could not mix n32 with 032 binaries.  The configure script
-has been modified to get the EXTRA_CFLAGS from the tcl configure
-script.  [Bug id: 840] (RJ)
-
-12/3/98 (bug fix) Windows NT creates sockets so they are inheritable
-by default.  Fixed socket code so it turns off this bit right after
-creation so sockets aren't kept open by exec'ed processes. [Bug: 892]
-Thanks to Kevin Kenny for this fix.  (SS)
-
-1/11/98 (bug fix)  On HP, "info sharedlibextension" was returning 
-empty string on static apps.  It now always returns ".sl".  (RJ)
-
-1/28/99 (configure change) Now support -pipe option on gcc.  (RJ)
-
-2/2/99 (bug fix) Fixed initialization problem on Windows where no
-searching for init.tcl would be performed if the registry keys were
-missing.  (stanton)
-
-2/2/99 (bug fix) Added support for HKEY_PERFORMANCE_DATA and
-HKEY_DYN_DATA keys in the "registry" command. (stanton)
-
-2/2/99 (bug fix) ENOTSUP and EOPNOTSUPP clashed on some Linux
-variants. (stanton)
-
-2/2/99 (enhancement) The "open" command has been changed to use the
-object interfaces. (stanton)
-
-2/2/99 (bug fix) In some cases Tcl would crash due to an overflow of
-the exception stack resulting from a missing byte code in some
-expressions. (stanton)
-
-2/2/99 (bug fix) Changed configure so Linux and IRIX shared libraries
-are linked with the system libraries. (stanton)
-
-2/2/99 (bug fix) Added support for BSDI 4.x (BSD/OS-4*) to the
-configure script. (stanton)
-
-2/2/99 (bug fix) Fixed bug where upvar could resurrect a namespace
-variable after the namespace had been deleted. (stanton)
-
-2/2/99 (bug fix) In some cases when creating variables, the
-interpreter result was being modified even if the TCL_LEAVE_ERR_MSG
-flag was set. (stanton)
-
-2/2/99 (bug fix & new feature) Changed the socket drivers to properly
-handle failures during an async socket connection.  Added a new
-fconfigure option "-error" to retrieve the failure message.  See the
-socket.n manual entry for details. (stanton)
-
-2/2/99 (bug fix) Deleting a renamed interp alias could result in a
-panic. (stanton)
-
-2/2/99 (feature change/bug fix) Changed the behavior of "file
-extension" so that it splits at the last period.  Now the extension of
-a file like "foo..o" is ".o" instead of "..o" as in previous versions. 
-*** POTENTIAL INCOMPATIBILITY ***
-
------------------ Released 8.0.5, 3/9/99 -------------------------
-
-======== Changes for 8.0 go above this line ========
-======== Changes for 8.1 go below this line ========
-
-6/18/97 (new feature) Tcl now supports international character sets:
-    - All C APIs now accept UTF-8 strings instead of iso8859-1 strings,
-      wherever you see "char *", unless explicitly noted otherwise.
-    - All Tcl strings represented in UTF-8, which is a convenient
-      multi-byte encoding of Unicode.  Variable names, procedure names,
-      and all other values in Tcl may include arbitrary Unicode characters.
-      For example, the Tcl command "string length" returns how many
-      Unicode characters are in the argument string.
-    - For Java compatibility, embedded null bytes in C strings are
-      represented as \xC080 in UTF-8 strings, but the null byte at the end
-      of a UTF-8 string remains \0.  Thus Tcl strings once again do not
-      contain null bytes, except for termination bytes.
-    - For Java compatibility, "\uXXXX" is used in Tcl to enter a Unicode
-      character.  "\u0000" through "\uffff" are acceptable Unicode 
-      characters.  
-    - "\xXX" is used to enter a small Unicode character (between 0 and 255)
-      in Tcl.
-    - Tcl automatically translates between UTF-8 and the normal encoding for
-      the platform during interactions with the system.
-    - The fconfigure command now supports a -encoding option for specifying
-      the encoding of an open file or socket.  Tcl will automatically
-      translate between the specified encoding and UTF-8 during I/O. 
-      See the directory library/encoding to find out what encodings are
-      supported (eventually there will be an "encoding" command that
-      makes this information more accessible).
-    - There are several new C APIs that support UTF-8 and various encodings.
-      See Utf.3 for procedures that translate between Unicode and UTF-8
-      and manipulate UTF-8 strings. See Encoding.3 for procedures that
-      create new encodings and translate between encodings.  See
-      ToUpper.3 for procedures that perform case conversions on UTF-8
-      strings.
-
-9/18/97 (enhancement) Literal objects are now shared by the ByteCode
-structures created when compiled different scripts. This saves up to 45%
-of the total memory needed for all literals. (BL)
-
-9/24/97 (bug fixes) Fixed Tcl_ParseCommand parsing of backslash-newline
-sequences at start of command words. Suppressed Tcl_EvalDirect error logging
-if non-TCL_OK result wasn't an error. (BL)
-
-10/17/97 (feature enhancement) "~username" now refers to the users' home
-directory on Windows (previously always returned failure). (CCS)
-
-10/20/97 (implementation change) The Tcl parser has been completely rewritten
-to make it more modular.  It can now be used to parse a script without actually
-executing it.  The APIs for the new parser are not correctly exported, but
-they will eventually be exported and augmented with Tcl commands so that
-Tcl scripts can parse other Tcl scripts. (JO)
-
-10/21/97 (API change) Added "flags" argument to Tcl_EvalObj, removed
-Tcl_GlobalEvalObj procedure.  Added new procedures Tcl_Eval2 and
-Tcl_EvalObjv. (JO)
-*** POTENTIAL INCOMPATIBILITY ***
-
-10/22/97 (API change) Renamed Tcl_ObjSetVar2 and Tcl_ObjGetVar2 to
-Tcl_SetObjVar2 and Tcl_GetObjVar2 (for consistency with other C APIs)
-and changed the name arguments to be strings instead of objects.  (JO)
-*** POTENTIAL INCOMPATIBILITY ***
-
-10/27/97 (enhancement) Bytecode compiler rewritten to use the new Tcl
-parser. (BL)
-
-11/3/97 (New routines) Added Tcl_AppendObjToObj, which appends the
-string rep of one Tcl_Obj to another. Added Tcl_GetIndexFromObjStruct,
-which is similar to Tcl_GetIndexFromObj, except that you can give an
-offset between strings. This allows Tcl_GetIndexFromObjStruct to be
-called with a table of records which have strings in them. (SRP)
-
-12/4/97 (enhancement) New Tcl expression parser added. Added new procedure
-Tcl_ParseExpr and new token types TCL_TOKEN_SUB_EXPR and
-TCL_TOKEN_OPERATOR. Expression compiler is reimplemented to use this
-parser. (BL)
-
-12/9/97 (bug fix) Tcl_EvalObj() increments/decrements the refcount of the
-script object to prevent the object from deleting itself while in the
-middle of being evaluated. (CCS)
-
-12/9/97 (bug fix) Memory leak in Tcl_GetsObjCmd(). (CCS)
-
-12/11/97 (bug fix) Environment array leaked memory when compiled with
-Visual C++. (SS)
-
-12/11/97 (bug fix) File events and non-blocking I/O did not work on
-pipes under Windows.  Changed to use threads to achieve non-blocking
-behavior. (SS)
-
-12/18/97 (bug fixes) Fixed segfault in "namespace import"; importing a
-procedure that causes a cycle now returns an error. Modified "info procs",
-"info args", "info body", and "info default" to return information about
-imported procedures as well as procedures defined in a namespace. (BL)
-
-12/19/97 (enhancement) Added new Tcl_GetString() procedure that can be used
-in place of Tcl_GetStringFromObj() if the string representation's length
-isn't needed. (BL)
-
-12/18/97 (bug fix) In the opt argument parsing package: if the description 
-had only flags, the "too many arguments" case was not detected. The default
-value was not used for the special "args" ending argument. (DL)
-
-1/7/98 (clean up) Moved everything not absolutly necessary out of init.tcl
-procs now in auto.tcl and package.tcl can be autoloaded if needed. (DL)
-
-1/7/98 (enhancement) tcltest made at install time will search for it's
-init.tcl where it is, even when using virtual path compilation. (DL)
-
-1/8/98 (os bug workaround) when needed, using a replacement for memcmp so 
-string compare "char with high bit set" "char w/o high bit set" returns
-the expected value on all platforms. (DL)
-
-1/8/98 (unix portability/configure) building from .../unix/targetName/ 
-subdirectories and simply using "../configure" should now work fine. (DL)
-
-1/14/98 (enhancement) Added new regular expression package that
-supports AREs, EREs, and BREs.  The new package includes new escape
-characters, meta-syntax, and character classes inside brackets.
-Regexps involving backslashes may behave differently.  (MH)
-*** POTENTIAL INCOMPATIBILITY ***
-
-1/16/98 (os workaround) Under windows, "file volume" was causing chatter
-and/or several seconds of hanging when querying empty floppy drives.
-Changed implementation to call an empirically-derived function that doesn't
-cause this. (CCS)
-
-1/16/98 (enhancement) Converted regular expressions to a Tcl_Obj type so
-their compiled form gets cached automatically.  Reduced NSUBEXP from 100
-to 20. (BW)
-
-1/16/98 (documentation) Change unclear documentation and comments for
-functions like Tcl_TranslateFileName() and Tcl_ExternalToUtfDString().  Now
-it explicitly says they take an uninitialized or free DString.  A DString
-that is "empty" or "not holding anything" could have been interpreted as one
-currently with a zero length, but with a large dynamically allocated buffer.
-(CCS)
-
------------------ Released 8.1a1, 1/22/98 -----------------------
-
-1/28/98 (new feature) Added a "-direct" optional flag to pkg_mkIndex
-to generate direct loading package indexes (such those you need
-if you use namespaces and plan on using namespace import just after
-package require). pkg_mkIndex still has limitations regarding
-package dependencies but errors are now ignored and with -direct, correct
-package indexes can be generated even if there are dependencies as long 
-as the "package provide" are done early enough in the files. (DL)
-
-1/28/98 (enhancement) Performance tuning of regexp and regsub. (CCS)
-
-1/28/98 (bug fix) regexp and regsub with "-indices" returned the byte-offsets
-of the characters in the UTF-8 representation, not the character offsets
-themselves. (CCS)
-
-1/28/98 (bug fix) "clock format 0 -format %Z -gmt 1" would return the local
-timezone string instead of "GMT" on Solaris and Windows.
-
-1/28/98 (bug fix) Restore tty settings when closing serial device on Unix.
-This is good behavior when closing real serial devices, essential when
-closing the pseudo-device /dev/tty because the user's terminal settings
-would be left useless, in raw mode, when tcl quit. (CCS)
-
-1/28/98 (bug fix) Tcl_OpenCommandChannel() was modifying the contents of the
-argv array passed to it, causing problems for any caller that wanted to
-continue to use the argv array after calling Tcl_OpenCommandChannel(). (CCS)
-
-2/1/98 (bug fix) More bugs with %Z in format string argument to strftime():
-1. Borland always returned empty string.
-2. MSVC always returned the timezone string for the current time, not the
-   timezone string for the specified time.  
-3. With MSVC, "clock format 0 -format %Z -gmt 1" would return "GMT" the first
-   time it was called, but would return the current timezone string on all
-   subsequent calls. (CCS)
-
-2/1/98 (bug fix) "file stat" was broken on Windows.
-1. "file stat" of a root directory (local or network) or a relative path that
-   resolved to a root directory (c:. when in pwd was c:/) was returning error.
-2. "file stat" on a regular file (S_IFREG), the st_mode was sign extended to
-   a negative int if the platform-dependant type "mode_t" was declared as a
-   short instead of an unsigned short.
-3. "file stat" of a network directory, the st_dev was incorrectly reported
-   as the id of the last accessed local drive rather than the id of the
-   network drive. (CCS)
-
-2/1/98 (bug fix) "file attributes" of a relative path that resolved to a
-root directory was returning error. (CCS)
-
-2/1/98 (bug fix) Change error message when "file attribute" could not
-determine the attributes for a file.  Previously it would return different
-error messages on Unix vs.  Windows vs. Mac. (CCS)
-
-2/4/98 (bug fixes) Fixed several instances of bugs where the parser/compiler 
-would reach outside the range of allocated memory. Improved the array
-lookup algorithm in set compilation. (DL)
-
-2/5/98 (change) The TCL_PARSE_PART1 flag for Set/Get(Obj)Var2 C APIs is now
-deprecated and ignored. The part1 is always parsed when the part2 argument
-is NULL. This is to avoid a pattern of errors for extension writers converting
-from string based Tcl_SetVar() to new Tcl_SetObjVar2() and who could easily
-forget to provide the flag and thus get code working for normal variables 
-but not for array elements. The performance hit is minimal. A side effect
-of that change is that is is no longer possible to create scalar variables
-that can't be accessed by tcl scripts because of their invalid name 
-(ending with parenthesis). Likewise it is also parsed and checked to 
-ensure that you don't create array elements of array whose name is a valid 
-array element because they would not be accessible from scripts anyway. 
-Note: There is still duplicate array elements parsing code. (DL)
-*** POTENTIAL INCOMPATIBILITY ***
-
-2/11/98 (bug fix) Sharing objects between interps, such as by "interp
-eval" or "send" could cause a crash later when dereferencing an interp
-that had been deleted, given code such as:
-	set a {set x y}
-	interp create foo
-	interp eval foo $a
-	interp delete foo
-	unset a
-Interp "foo" was gone, but "a" had a internal rep consisting of bytecodes
-containing a dangling pointer to "foo".  Unsetting "a" would attempt to
-return resources back to "foo", causing a crash as random memory was
-accessed.  The lesson is that that if an object's internal rep depends on
-an interp (or any other data structure) it must preserve that data in
-some fashion. (CCS)
-
-2/11/98 (enhancement) The "interp" command was returning inconsistent error
-messages when the specified slave interp could not be found. (CCS)
-
-2/11/98 (bug fix) Result codes like TCL_BREAK and TCL_CONTINUE were not
-propagating through the master/slave interp boundaries, such as "interp
-eval" and "interp alias".  TCL_OK, TCL_ERROR, and non-standard codes like
-teh integer 57 work.  There is still a question as to whether TCL_RETURN
-can/should propagate. (CCS)
-
-2/11/98 (bug fix) TclCompileScript() was derefering memory 1 byte before
-start of the string to compile, looking for ']'. (CCS,DL)
-
-2/11/98 (bug fix) Tcl_Eval2() was derefering memory 1 byte before start
-of the string to eval, looking for ']'. (CCS,DL)
-
-2/11/98 (bug fix) Compiling "set a(b" was running off end of string. (CCS,DL)
-
-2/11/98 (bug fix) Windows initialization code was dereferencing
-uninitialized memory if TCL_LIBRARY environment didn't exist. (CCS)
-
-2/11/98 (bug fix) Windows "registry" command was dereferencing
-uninitialized memory when constructing the $errorCode for a failed
-registry call. (CCS)
-
-2/11/98 (enhancement) Eliminate the TCL_USE_TIMEZONE_VAR definition from
-configure.in, because it was the same information as the already existing
-HAVE_TM_ZONE definition.  The lack of HAVE_TM_ZONE is used to work around a
-Solaris and Windows bug where "clock format [clock sec] -format %Z -gmt 1" 
-produces the local timezone string instead of "GMT". (CCS)
-
-2/11/98 (bug fix) Memleaks and dereferencing of uninitialized memory in
-regexp if an error occurred while compiling a regular expression. (CCS).
-
-2/18/98 (new feature) Added mutexes and thread local storage in order
-to make Tcl thread safe.  For testing purposes, there is a testthread
-command that creates a new thread and an interpreter inside it.  See
-thread.test for examples, but this script-level interface is not fixed.
-Each thread has its own notifier instance to manage its own events,
-and threads can post messages to each other's message queue.
-This uses pthreads on UNIX, and native thread support on other platforms.
-You enable this by configuring with --enable-threads.  Note that at
-this time *Tk* is still not thread safe. Special thanks to
-Richard Hipp: his earlier implementation inspired this work. (BW, SS, JI)
-
-2/18/98 (hidden feature change) The way the env() array is shared among
-interpreters changed.  Updates to env used to trigger write traces in
-other interpreters.  This undocumented feature is no longer implemented.
-Instead, variable tracing is used to keep the C-level environ array in sync
-with the Tcl-level env array. This required adding TCL_TRACE_ARRAY support
-to Tcl_TraceVar2 so that array names works properly. (BW)
-*** POTENTIAL INCOMPATIBILITY ***
-
-2/18/98 (enhancement) Conditional compilation for unix systems (e.g.,
-IRIX, SCO) that use f_bsize instead of st_blksize to determine disk block
-size. (CCS)
-
-2/23/98 (bug fix) Fixed the emulation of polling selects in the threaded
-version of the Unix notifier.  The bug was showing up on a multiprocessor
-as starvation of the notifier thread. (BW)
-
------------------ Released 8.1a2, Feb 23 1998 -----------------------
-
-9/22/98 (bug fix) Changed the value of TCL_TRACE_ARRAY so it no longer
-conflicts with the deprecated TCL_PARSE_PART1 flag.  This should
-improve portability of C code. (stanton)
-
-10/6/98 (bug fix) The compile procedure for "if" incorrectly attempted
-to match against the literal string "if", resulting in a stack
-overflow when "::if" was compiled.  It also would incorrectly accept
-"if" instead of "elsif" in later clauses.  (stanton)
-
-10/15/98 (new feature) Added a "totitle" subcommand to the "string"
-command to convert strings to capitalize the first character of a string
-and lowercase all of the other characters. (stanton)
-
-10/15/98 (bug fix) Changed regexp and string commands to properly
-handle case folding according to the Unicode character
-tables. (stanton)
-
-10/21/98 (new feature) Added an "encoding" command to facilitate
-translations of strings between different character encodings.  See
-the encoding.n manual entry for more details. (stanton)
-
-11/3/98 (bug fix) The regular expression character classification
-syntax now includes Unicode characters in the supported
-classes. (stanton)
-
-11/6/98 (bug fix) Variable traces were causing crashes when upvar
-variables went out of scope. [Bug: 796] (stanton)
-
-11/9/98 (bug fix) "format" now correctly handles multibyte characters
-in %s format strings. (stanton)
-
-11/10/98 (new feature) "regexp" now accepts three new switches
-("-line", "-lineanchor", and "-linestop") that control how regular
-expressions treat line breaks. See the regexp manual entry for more
-details. (stanton)
-
-11/17/98 (bug fix) "scan" now correctly handles Unicode
-characters. (stanton)
-
-11/17/98 (new feature) "scan" now supports XPG3 position specifiers
-and the "%n" conversion character.  See the "scan" manual entry for
-more details. (stanton)
-
-11/17/98 (bug fix) The Tcl memory allocator now returns 8-byte aligned
-chunks of memory which improves performance on Windows and avoids
-crashes on other platforms. [Bug: 834] (stanton)
-
-11/23/98 (bug fix) Applied various regular expression performance bug
-fixes supplied by Henry Spencer. (stanton)
-
-11/30/98 (bug fix) Fixed various thread related race conditions. [Bug:
-880 & 607] (stanton)
-
-11/30/98 (bug fix) Fixed a number of memory overflow and leak
-bugs. [Bug: 584] (stanton)
-
-12/1/98 (new feaure) Added support for Korean encodings. (stanton)
-
-12/1/98 (feature change) Changed the Tcl_EvalObjv interface to remove
-the string and length arguments.
-*** POTENTIAL INCOMPATIBILITY with previous alpha releases ***
-
-12/2/98 (bug fix) Fixed various bugs related to line feed
-translation. [Bug: 887] (stanton)
-
-12/4/98 (new feature) Added a message catalog facility to help with
-localizing Tcl scripts.  Thanks to Mark Harrison for contributing the
-initial implementation of the "msgcat" package. (stanton)
-
-12/7/98 (bug fix) The memory allocator was failing to update the
-block list for large memory blocks that were reallocated into a
-different address. [Bug: 933] (stanton)
-
------------------ Released 8.1b1, Dec 10 1998 -----------------------
-
-12/22/98 (performance improvement) Improved the -command option of the
-lsort command to better use the object system for improved
-performance (about 5x speed up).  Thanks to Syd Polk for suppling the
-patch. [RFE: 726] (rjohnson)
-
-2/10/99 (bug fix) Restored the Tcl_ObjSetVar2/Tcl_ObjGetVar2
-interfaces from 8.0 and renamed the Tcl_GetObjVar2/Tcl_SetObjVar2
-interfaces to Tcl_GetVar2Ex and Tcl_SetVar2Ex.  This should provide
-better compatibility with 8.0. (stanton)
-*** POTENTIAL INCOMPATIBILITY with previous alpha/beta releases ***
-
-2/10/99 (bug fix) Made the eval interfaces compatible with 8.0 by
-renaming Tcl_EvalObj to Tcl_EvalObjEx, renaming Tcl_Eval2 to
-Tcl_EvalEx and restoring Tcl_EvalObj and Tcl_GlobalEvalObj interfaces
-so they match Tcl 8.0. (stanton)
-*** POTENTIAL INCOMPATIBILITY with previous alpha/beta releases ***
-
-2/25/99 (bug fix/new feature) On Windows, the channel drivers for
-consoles and serial ports now completely support file events. (redman)
-
-3/5/99 (bug fix) Integrated patches to fix various configure problems
-that affected HP-UX-11, 64-bit IRIX, Linux, and Solaris. (stanton)
-
-3/9/99 (bug fix) Integrated various AIX related patches to improve
-support for shared libraries. (stanton)
-
-3/9/99 (new feature) Added tcl_platform(user) to provide a portable
-way to get the name of the current user. (welch)
-
-3/9/99 (new feature) Integrated the stub library mechanism contributed
-by Jan Nijtmans, Paul Duffin, and Jean-Claude Wippler.  This feature
-should make it possible to write extensions that support multiple
-versions of Tcl simultaneously.  It also makes it possible to
-dynamically load extensions into statically linked interpreters.  This
-patch includes the following changes:
-      -	Added a Tcl_InitStubs() interface
-      -	Added Tcl_PkgProvideEx, Tcl_PkgRequireEx, Tcl_PkgPresentEx,
-      	and Tcl_PkgPresent.
-      - Added va_list versions of all VARARGS functions so they can be
-	invoked from wrapper functions.
-See the manual for more information. (stanton)
-
-
-3/10/99 (feature change) Replaced Tcl_AlertNotifier with
-Tcl_ThreadAlert since the Tcl_AlertNotifier function relied on passing
-internal data structures. (stanton)
-*** POTENTIAL INCOMPATIBILITY with previous alpha/beta releases ***
-
-3/10/99 (new feature) Added a Tcl_GetVersion API to make it easier to
-check the Tcl version and patch level from C. (redman)
-
-3/14/99 (feature change) Tried to unify the TclpInitLibrary path
-routines to look in similar places from Windows to UNIX.  The new
-library search path is: TCL_LIBRARY, TCL_LIBRARY/../tcl8.1, relative
-to DLL (Windows Only) relative to installed executable, relative to
-develop executable, and relative to compiled-in in location (UNIX
-Only.)  This fix included:
-    - Defining a TclpFindExecutable
-    - Moving Tcl_FindExecutable to a common area in tclEncoding.c
-    - Modifying the TclpInitLibraryPath routines.
-(surles)
-
-3/14/99 (feature change) Added hooks for TclPro Wrapper to initialize
-the location of the encoding files and libraries.  This fix included:
-    - Adding the TclSetPerInitScript routine.
-    - Modifying the Tcl_Init routines to evaluate the non-NULL
-      pre-init script.
-    - Adding the Tcl_SetdefaultEncodingDir and Tcl_GetDefaultEncodingDir
-      routines.
-    - Modifying the TclpInitLibrary routines to append the default
-      encoding dir.
-(surles)
-
-3/14/99 (feature change) Test suite now uses "test" namespace to
-define the test procedure and other auxiliary procedures as well as
-global variables.
-    - Global array testConfige is now called ::test::testConfig.
-    - Global variable VERBOSE is now called ::test::verbose, and
-      ::test::verbose no longer works with numerical values.  We've
-      switched to a bitwise character string.  You can set
-      ::test::verbose by using the -verbose option on the Tcl command
-      line.
-    - Global variable TESTS is now called ::test::matchingTests, and
-      can be set on the Tcl command line via the -match option.
-    - There is now a ::test::skipTests variable (works similarly to
-      ::test::matchTests) that can be set on the Tcl command line via
-      the -match option.
-    - The test suite can now be run in any working directory.  When
-      you run "make test", the working directory is nolonger switched
-      to ../tests.
-(hirschl)
-*** POTENTIAL INCOMPATIBILITY ***
-
---------------- Released 8.1b2, March 16, 1999 ----------------------
-
-3/18/99 (bug fix) Fixed missing/incorrect characters in shift-jis table
-(stanton)
-
-3/18/99 (feature change) The glob command ignores the
-FS_CASE_IS_PRESERVED bit on file systesm and always returns
-exactly what it gets from the system. (stanton)
-*** POTENTIAL INCOMPATIBILITY ***
-
-3/19/99 (new feature) Added support for --enable-64bit.  For now,
-this is only supported on Solaris 7 64bit (SunOS 5.7) using the Sun
-compiler. (redman)
-
-3/23/99 (bug fix) Fixed fileevents and gets on Windows consoles and
-serial devices so that non-blocking channels do not block on partial
-input lines.  (redman)
-
-3/23/99 (bug fix) Added a new Tcl_ServiceModeHook interface.
-This is used on Windows to avoid the various problems that people
-have been seeing where the system hangs when tclsh is running
-outside of the event loop. As part of this, renamed
-TclpAlertNotifier back to Tcl_AlertNotifier since it is public.
-(stanton)
-
-3/23/99 (feature change) Test suite now uses "tcltest" namespace to
-define the test procedure and other auxiliary procedures as well as
-global variables.  The previously chosen "test" namespace was thought
-to be too generic and likely to create conflits.
-(hirschl)
-*** POTENTIAL INCOMPATIBILITY ***
-
-3/24/99 (bug fix) Make sockets thread safe on Windows.
-(redman)
-
-3/24/99 (bug fix) Fix cases where expr would incorrect return
-a floating point value instead of an integer. (stanton)
-
-3/25/99 (bug fix) Added ASCII to big5 and gb2312 encodings.
-(stanton)
-
-3/25/99 (feature change) Changed so aliases are invoked at current
-scope in the target interpreter instead of at the global scope.  This
-was an incompatibility introduced in 8.1 that is being removed.
-(stanton)
-*** POTENTIAL INCOMPATIBILITY with previous beta releases ***
-
-3/26/99 (feature change) --nameble-shared is now the default and build
-Tcl as a shared library; specify --disable-shared to build a static Tcl
-library and shell.
-*** POTENTIAL INCOMPATIBILITY ***
-
-3/29/99 (bug fix)  Removed the stub functions and changed the stub
-macros to just use the name without params. Pass &tclStubs into the
-interp (don't use tclStubsPtr because of collisions with the stubs on
-Solaris). (redman)
-
-3/30/99 (bug fix) Loadable modules are now unloaded at the last
-possible moment during Tcl_Finalize to fix various exit-time crashes.
-(welch)
-
-3/30/99 (bug fix) Tcl no longer calls setlocale().  It looks at
-env(LANG) and env(LC_TYPE) instead.  (stanton)
-
-4/1/99 (bug fix) Fixed the Ultrix multiple symbol definition problem.
-Now, even Tcl includes a copy of the Tcl stub library. (redman)
-
-4/1/99 (bug fix) Internationalized the registry package.
-
-4/1/99 (bug fix) Changed the implemenation of Tcl_ConditionWait and
-Tcl_ConditionNotify on Windows.  The new algorithm eliminates a race
-condition and was suggested by Jim Davidson. (welch)
-
-4/2/99 (new apis)  Made various Unicode utility functions public.
-Tcl_UtfToUniCharDString, Tcl_UniCharToUtfDString, Tcl_UniCharLen,
-Tcl_UniCharNcmp, Tcl_UniCharIsAlnum, Tcl_UniCharIsAlpha,
-Tcl_UniCharIsDigit, Tcl_UniCharIsLower, Tcl_UniCharIsSpace,
-Tcl_UniCharIsUpper, Tcl_UniCharIsWordChar, Tcl_WinUtfToTChar,
-Tcl_WinTCharToUtf (stanton)
-
-4/2/99 (feature change) Add new DDE package and removed the Tk
-send command from the Windows version.  Changed DDE-based send
-code into "dde eval" command.  The DDE package can be loaded
-into tclsh, not just wish.  Windows only. (redman)
-
-4/5/99 (bug fix) Changed safe-tcl so that the encoding command
-is an alias that masks out the "encoding system" subcommand.
-(redman)
-
-4/5/99 (bug fix) Configure patches to improve support for
-OS/390 and BSD/OS 4.*. (stanton)
-
-4/5/99 (bug fix) Fixed crash in the clock command that occurred
-with negative time values in timezones east of GMT. (stanton)
-
-4/6/99 (bug fix) Moved the "array set" C level code into a common
-routine (TclArraySet).  The TclSetupEnv routine now uses this API to
-create an env array w/ no elements.  This fixes the bug caused when
-every environ varaible is removed, and the Tcl env variable is
-synched.  If no environ vars existed, the Tcl env var would never be
-created. (surles)
-
-4/6/99 (bug fix) Made the Env module I18N compliant. (surles)
-
-4/6/99 (bug fix) Changed the FindVariable routine to TclpFindVariable,
-that now does a case insensitive string comparison on Windows, and not
-on UNIX. (surles)
-
-
---------------- Released 8.1b3, April 6, 1999 ----------------------
-
diff --git a/compat/README b/compat/README
deleted file mode 100644
index 38b9b05..0000000
--- a/compat/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory contains various header and code files that are
-used make Tcl compatible with various releases of UNIX and UNIX-like
-systems.  Typically, files from this directory are used to compile
-Tcl when a system doesn't contain the corresponding files or when
-they are known to be incorrect.  When the whole world becomes POSIX-
-compliant this directory should be unnecessary.
-
-RCS: @(#) $Id: README,v 1.2 1998/09/14 18:39:44 stanton Exp $
diff --git a/compat/dirent.h b/compat/dirent.h
deleted file mode 100644
index 1368018..0000000
--- a/compat/dirent.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * dirent.h --
- *
- *	This file is a replacement for <dirent.h> in systems that
- *	support the old BSD-style <sys/dir.h> with a "struct direct".
- *
- * Copyright (c) 1991 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: dirent.h,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#ifndef _DIRENT
-#define _DIRENT
-
-#include <sys/dir.h>
-
-#define dirent direct
-
-#endif /* _DIRENT */
diff --git a/compat/dirent2.h b/compat/dirent2.h
deleted file mode 100644
index 7c2406c..0000000
--- a/compat/dirent2.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * dirent.h --
- *
- *	Declarations of a library of directory-reading procedures
- *	in the POSIX style ("struct dirent").
- *
- * Copyright (c) 1991 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: dirent2.h,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#ifndef _DIRENT
-#define _DIRENT
-
-#ifndef _TCL
-#include <tcl.h>
-#endif
-
-/*
- * Dirent structure, which holds information about a single
- * directory entry.
- */
-
-#define MAXNAMLEN 255
-#define DIRBLKSIZ 512
-
-struct dirent {
-    long d_ino;			/* Inode number of entry */
-    short d_reclen;		/* Length of this record */
-    short d_namlen;		/* Length of string in d_name */
-    char d_name[MAXNAMLEN + 1];	/* Name must be no longer than this */
-};
-
-/*
- * State that keeps track of the reading of a directory (clients
- * should never look inside this structure;  the fields should
- * only be accessed by the library procedures).
- */
-
-typedef struct _dirdesc {
-    int dd_fd;
-    long dd_loc;
-    long dd_size;
-    char dd_buf[DIRBLKSIZ];
-} DIR;
-
-/*
- * Procedures defined for reading directories:
- */
-
-extern void		closedir _ANSI_ARGS_((DIR *dirp));
-extern DIR *		opendir _ANSI_ARGS_((char *name));
-extern struct dirent *	readdir _ANSI_ARGS_((DIR *dirp));
-
-#endif /* _DIRENT */
diff --git a/compat/dlfcn.h b/compat/dlfcn.h
deleted file mode 100644
index 1dee078..0000000
--- a/compat/dlfcn.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* 
- * dlfcn.h --
- *
- *	This file provides a replacement for the header file "dlfcn.h"
- *	on systems where dlfcn.h is missing.  It's primary use is for
- *	AIX, where Tcl emulates the dl library.
- *
- *	This file is subject to the following copyright notice, which is
- *	different from the notice used elsewhere in Tcl but rougly
- *	equivalent in meaning.
- *
- *	Copyright (c) 1992,1993,1995,1996, Jens-Uwe Mager, Helios Software GmbH
- *	Not derived from licensed software.
- *
- *	Permission is granted to freely use, copy, modify, and redistribute
- *	this software, provided that the author is not construed to be liable
- *	for any results of using the software, alterations are clearly marked
- *	as such, and this notice is not modified.
- *
- * RCS: @(#) $Id: dlfcn.h,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-/*
- * @(#)dlfcn.h	1.4 revision of 95/04/25  09:36:52
- * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
- * 30159 Hannover, Germany
- */
-
-#ifndef __dlfcn_h__
-#define __dlfcn_h__
-
-#ifndef _TCL
-#include <tcl.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Mode flags for the dlopen routine.
- */
-#define RTLD_LAZY	1	/* lazy function call binding */
-#define RTLD_NOW	2	/* immediate function call binding */
-#define RTLD_GLOBAL	0x100	/* allow symbols to be global */
-
-/*
- * To be able to intialize, a library may provide a dl_info structure
- * that contains functions to be called to initialize and terminate.
- */
-struct dl_info {
-	void (*init) _ANSI_ARGS_((void));
-	void (*fini) _ANSI_ARGS_((void));
-};
-
-VOID *dlopen _ANSI_ARGS_((const char *path, int mode));
-VOID *dlsym _ANSI_ARGS_((void *handle, const char *symbol));
-char *dlerror _ANSI_ARGS_((void));
-int dlclose _ANSI_ARGS_((void *handle));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __dlfcn_h__ */
diff --git a/compat/fixstrtod.c b/compat/fixstrtod.c
deleted file mode 100644
index 165b7d1..0000000
--- a/compat/fixstrtod.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
- * fixstrtod.c --
- *
- *	Source code for the "fixstrtod" procedure.  This procedure is
- *	used in place of strtod under Solaris 2.4, in order to fix
- *	a bug where the "end" pointer gets set incorrectly.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: fixstrtod.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#include <stdio.h>
-
-#undef strtod
-
-/*
- * Declare strtod explicitly rather than including stdlib.h, since in
- * somes systems (e.g. SunOS 4.1.4) stdlib.h doesn't declare strtod.
- */
-
-extern double strtod();
-
-double
-fixstrtod(string, endPtr)
-    char *string;
-    char **endPtr;
-{
-    double d;
-    d = strtod(string, endPtr);
-    if ((endPtr != NULL) && (*endPtr != string) && ((*endPtr)[-1] == 0)) {
-	*endPtr -= 1;
-    }
-    return d;
-}
diff --git a/compat/float.h b/compat/float.h
deleted file mode 100644
index 049f4a8..0000000
--- a/compat/float.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * float.h --
- *
- *	This is a dummy header file to #include in Tcl when there
- *	is no float.h in /usr/include.  Right now this file is empty:
- *	Tcl contains #ifdefs to deal with the lack of definitions;
- *	all it needs is for the #include statement to work.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: float.h,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
diff --git a/compat/gettod.c b/compat/gettod.c
deleted file mode 100644
index 9fc0ca5..0000000
--- a/compat/gettod.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * gettod.c --
- *
- *	This file provides the gettimeofday function on systems
- *	that only have the System V ftime function.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: gettod.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclPort.h"
-#include <sys/timeb.h>
-
-#undef timezone
-
-int
-gettimeofday(tp, tz)
-struct timeval *tp;
-struct timezone *tz;
-{
-    struct timeb t;
-    ftime(&t);
-    tp->tv_sec = t.time;
-    tp->tv_usec = t. millitm * 1000;
-    return 0;
-}
-
diff --git a/compat/limits.h b/compat/limits.h
deleted file mode 100644
index 96b0b50..0000000
--- a/compat/limits.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * limits.h --
- *
- *	This is a dummy header file to #include in Tcl when there
- *	is no limits.h in /usr/include.  There are only a few
- *	definitions here;  also see tclPort.h, which already
- *	#defines some of the things here if they're not arleady
- *	defined.
- *
- * Copyright (c) 1991 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: limits.h,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#define LONG_MIN		0x80000000
-#define LONG_MAX		0x7fffffff
-#define INT_MIN			0x80000000
-#define INT_MAX			0x7fffffff
-#define SHRT_MIN		0x8000
-#define SHRT_MAX		0x7fff
diff --git a/compat/memcmp.c b/compat/memcmp.c
deleted file mode 100644
index 09a5724..0000000
--- a/compat/memcmp.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 
- * memcmp.c --
- *
- *	Source code for the "memcmp" library routine.
- *
- * Copyright (c) 1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) memcmp.c 1.2 98/01/19 10:48:58
- */
-
-#include "tcl.h"
-#include "tclPort.h"
-
-/*
- * Here is the prototype just in case it is not included
- * in tclPort.h.
- */
-
-int		memcmp _ANSI_ARGS_((CONST VOID *s1,
-			    CONST VOID *s2, size_t n));
-
-/*
- *----------------------------------------------------------------------
- *
- * memcmp --
- *
- *	Compares two bytes sequences.
- *
- * Results:
- *     compares  its  arguments, looking at the first n
- *     bytes (each interpreted as an unsigned char), and  returns
- *     an integer less than, equal to, or greater than 0, accord-
- *     ing as s1 is less  than,  equal  to,  or
- *     greater than s2 when taken to be unsigned 8 bit numbers.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-memcmp(s1, s2, n)
-    CONST VOID *s1;			/* First string. */
-    CONST VOID *s2;			/* Second string. */
-    size_t      n;                      /* Length to compare. */
-{
-    unsigned char u1, u2;
-
-    for ( ; n-- ; s1++, s2++) {
-	u1 = * (unsigned char *) s1;
-	u2 = * (unsigned char *) s2;
-	if ( u1 != u2) {
-	    return (u1-u2);
-	}
-    }
-    return 0;
-}
diff --git a/compat/opendir.c b/compat/opendir.c
deleted file mode 100644
index 8eec7db..0000000
--- a/compat/opendir.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* 
- * opendir.c --
- *
- *	This file provides dirent-style directory-reading procedures
- *	for V7 Unix systems that don't have such procedures.  The
- *	origin of this code is unclear, but it seems to have come
- *	originally from Larry Wall.
- *
- *
- * RCS: @(#) $Id: opendir.c,v 1.2 1998/09/14 18:39:44 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-#undef DIRSIZ
-#define DIRSIZ(dp) \
-    ((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-
-/*
- * open a directory.
- */
-DIR *
-opendir(name)
-char *name;
-{
-	register DIR *dirp;
-	register int fd;
-	char *myname;
-
-	myname = ((*name == '\0') ? "." : name);
-	if ((fd = open(myname, 0, 0)) == -1)
-		return NULL;
-	if ((dirp = (DIR *)ckalloc(sizeof(DIR))) == NULL) {
-		close (fd);
-		return NULL;
-	}
-	dirp->dd_fd = fd;
-	dirp->dd_loc = 0;
-	return dirp;
-}
-
-/*
- * read an old style directory entry and present it as a new one
- */
-#ifndef pyr
-#define	ODIRSIZ	14
-
-struct	olddirect {
-	ino_t	od_ino;
-	char	od_name[ODIRSIZ];
-};
-#else	/* a Pyramid in the ATT universe */
-#define	ODIRSIZ	248
-
-struct	olddirect {
-	long	od_ino;
-	short	od_fill1, od_fill2;
-	char	od_name[ODIRSIZ];
-};
-#endif
-
-/*
- * get next entry in a directory.
- */
-struct dirent *
-readdir(dirp)
-register DIR *dirp;
-{
-	register struct olddirect *dp;
-	static struct dirent dir;
-
-	for (;;) {
-		if (dirp->dd_loc == 0) {
-			dirp->dd_size = read(dirp->dd_fd, dirp->dd_buf,
-			    DIRBLKSIZ);
-			if (dirp->dd_size <= 0)
-				return NULL;
-		}
-		if (dirp->dd_loc >= dirp->dd_size) {
-			dirp->dd_loc = 0;
-			continue;
-		}
-		dp = (struct olddirect *)(dirp->dd_buf + dirp->dd_loc);
-		dirp->dd_loc += sizeof(struct olddirect);
-		if (dp->od_ino == 0)
-			continue;
-		dir.d_ino = dp->od_ino;
-		strncpy(dir.d_name, dp->od_name, ODIRSIZ);
-		dir.d_name[ODIRSIZ] = '\0'; /* insure null termination */
-		dir.d_namlen = strlen(dir.d_name);
-		dir.d_reclen = DIRSIZ(&dir);
-		return (&dir);
-	}
-}
-
-/*
- * close a directory.
- */
-void
-closedir(dirp)
-register DIR *dirp;
-{
-	close(dirp->dd_fd);
-	dirp->dd_fd = -1;
-	dirp->dd_loc = 0;
-	ckfree((char *) dirp);
-}
diff --git a/compat/stdlib.h b/compat/stdlib.h
deleted file mode 100644
index 6edeeae..0000000
--- a/compat/stdlib.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * stdlib.h --
- *
- *	Declares facilities exported by the "stdlib" portion of
- *	the C library.  This file isn't complete in the ANSI-C
- *	sense;  it only declares things that are needed by Tcl.
- *	This file is needed even on many systems with their own
- *	stdlib.h (e.g. SunOS) because not all stdlib.h files
- *	declare all the procedures needed here (such as strtod).
- *
- * Copyright (c) 1991 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: stdlib.h,v 1.3 1999/04/16 00:46:30 stanton Exp $
- */
-
-#ifndef _STDLIB
-#define _STDLIB
-
-#include <tcl.h>
-
-extern void		abort _ANSI_ARGS_((void));
-extern double		atof _ANSI_ARGS_((CONST char *string));
-extern int		atoi _ANSI_ARGS_((CONST char *string));
-extern long		atol _ANSI_ARGS_((CONST char *string));
-extern char *		calloc _ANSI_ARGS_((unsigned int numElements,
-			    unsigned int size));
-extern void		exit _ANSI_ARGS_((int status));
-extern int		free _ANSI_ARGS_((char *blockPtr));
-extern char *		getenv _ANSI_ARGS_((CONST char *name));
-extern char *		malloc _ANSI_ARGS_((unsigned int numBytes));
-extern void		qsort _ANSI_ARGS_((VOID *base, int n, int size,
-			    int (*compar)(CONST VOID *element1, CONST VOID
-			    *element2)));
-extern char *		realloc _ANSI_ARGS_((char *ptr, unsigned int numBytes));
-extern double		strtod _ANSI_ARGS_((CONST char *string, char **endPtr));
-extern long		strtol _ANSI_ARGS_((CONST char *string, char **endPtr,
-			    int base));
-extern unsigned long	strtoul _ANSI_ARGS_((CONST char *string,
-			    char **endPtr, int base));
-
-#endif /* _STDLIB */
diff --git a/compat/strftime.c b/compat/strftime.c
deleted file mode 100644
index d588433..0000000
--- a/compat/strftime.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* 
- * strftime.c --
- *
- *	This file contains a modified version of the BSD 4.4 strftime
- *	function.
- *
- * This file is a modified version of the strftime.c file from the BSD 4.4
- * source.  See the copyright notice below for details on redistribution
- * restrictions.  The "license.terms" file does not apply to this file.
- *
- * RCS: @(#) $Id: strftime.c,v 1.3 1999/04/16 00:46:30 stanton Exp $
- */
-
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS)
-static char *rcsid = "$Id: strftime.c,v 1.3 1999/04/16 00:46:30 stanton Exp $";
-#endif /* LIBC_SCCS */
-
-#include <time.h>
-#include <string.h>
-#include <locale.h>
-#include "tclInt.h"
-#include "tclPort.h"
-
-#define TM_YEAR_BASE   1900
-
-typedef struct {
-    const char *abday[7];
-    const char *day[7];
-    const char *abmon[12];
-    const char *mon[12];
-    const char *am_pm[2];
-    const char *d_t_fmt;
-    const char *d_fmt;
-    const char *t_fmt;
-    const char *t_fmt_ampm;
-} _TimeLocale;
- 
-static const _TimeLocale _DefaultTimeLocale = 
-{
-    {
-	"Sun","Mon","Tue","Wed","Thu","Fri","Sat",
-    },
-    {
-	"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
-	"Friday", "Saturday"
-    },
-    {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-    },
-    {
-	"January", "February", "March", "April", "May", "June", "July",
-	"August", "September", "October", "November", "December"
-    },
-    {
-	"AM", "PM"
-    },
-    "%a %b %d %H:%M:%S %Y",
-    "%m/%d/%y",
-    "%H:%M:%S",
-    "%I:%M:%S %p"
-};
-
-static const _TimeLocale *_CurrentTimeLocale = &_DefaultTimeLocale;
-
-static size_t gsize;
-static char *pt;
-static int		 _add _ANSI_ARGS_((const char* str));
-static int		_conv _ANSI_ARGS_((int n, int digits, int pad));
-static int		_secs _ANSI_ARGS_((const struct tm *t));
-static size_t		_fmt _ANSI_ARGS_((const char *format,
-			    const struct tm *t));
-
-size_t
-TclpStrftime(s, maxsize, format, t)
-    char *s;
-    size_t maxsize;
-    const char *format;
-    const struct tm *t;
-{
-    tzset();
-
-    pt = s;
-    if ((gsize = maxsize) < 1)
-	return(0);
-    if (_fmt(format, t)) {
-	*pt = '\0';
-	return(maxsize - gsize);
-    }
-    return(0);
-}
-
-#define SUN_WEEK(t)	(((t)->tm_yday + 7 - \
-				((t)->tm_wday)) / 7)
-#define MON_WEEK(t)	(((t)->tm_yday + 7 - \
-				((t)->tm_wday ? (t)->tm_wday - 1 : 6)) / 7)
-
-static size_t
-_fmt(format, t)
-    const char *format;
-    const struct tm *t;
-{
-    for (; *format; ++format) {
-	if (*format == '%') {
-	    ++format;
-	    if (*format == 'E') {
-				/* Alternate Era */
-		++format;
-	    } else if (*format == 'O') {
-				/* Alternate numeric symbols */
-		++format;
-	    }
-	    switch(*format) {
-		case '\0':
-		    --format;
-		    break;
-		case 'A':
-		    if (t->tm_wday < 0 || t->tm_wday > 6)
-			return(0);
-		    if (!_add(_CurrentTimeLocale->day[t->tm_wday]))
-			return(0);
-		    continue;
-		case 'a':
-		    if (t->tm_wday < 0 || t->tm_wday > 6)
-			return(0);
-		    if (!_add(_CurrentTimeLocale->abday[t->tm_wday]))
-			return(0);
-		    continue;
-		case 'B':
-		    if (t->tm_mon < 0 || t->tm_mon > 11)
-			return(0);
-		    if (!_add(_CurrentTimeLocale->mon[t->tm_mon]))
-			return(0);
-		    continue;
-		case 'b':
-		case 'h':
-		    if (t->tm_mon < 0 || t->tm_mon > 11)
-			return(0);
-		    if (!_add(_CurrentTimeLocale->abmon[t->tm_mon]))
-			return(0);
-		    continue;
-		case 'C':
-		    if (!_conv((t->tm_year + TM_YEAR_BASE) / 100,
-			    2, '0'))
-			return(0);
-		    continue;
-		case 'c':
-		    if (!_fmt(_CurrentTimeLocale->d_t_fmt, t))
-			return(0);
-		    continue;
-		case 'D':
-		    if (!_fmt("%m/%d/%y", t))
-			return(0);
-		    continue;
-		case 'd':
-		    if (!_conv(t->tm_mday, 2, '0'))
-			return(0);
-		    continue;
-		case 'e':
-		    if (!_conv(t->tm_mday, 2, ' '))
-			return(0);
-		    continue;
-		case 'H':
-		    if (!_conv(t->tm_hour, 2, '0'))
-			return(0);
-		    continue;
-		case 'I':
-		    if (!_conv(t->tm_hour % 12 ?
-			    t->tm_hour % 12 : 12, 2, '0'))
-			return(0);
-		    continue;
-		case 'j':
-		    if (!_conv(t->tm_yday + 1, 3, '0'))
-			return(0);
-		    continue;
-		case 'k':
-		    if (!_conv(t->tm_hour, 2, ' '))
-			return(0);
-		    continue;
-		case 'l':
-		    if (!_conv(t->tm_hour % 12 ?
-			    t->tm_hour % 12: 12, 2, ' '))
-			return(0);
-		    continue;
-		case 'M':
-		    if (!_conv(t->tm_min, 2, '0'))
-			return(0);
-		    continue;
-		case 'm':
-		    if (!_conv(t->tm_mon + 1, 2, '0'))
-			return(0);
-		    continue;
-		case 'n':
-		    if (!_add("\n"))
-			return(0);
-		    continue;
-		case 'p':
-		    if (!_add(_CurrentTimeLocale->am_pm[t->tm_hour >= 12]))
-			return(0);
-		    continue;
-		case 'R':
-		    if (!_fmt("%H:%M", t))
-			return(0);
-		    continue;
-		case 'r':
-		    if (!_fmt(_CurrentTimeLocale->t_fmt_ampm, t))
-			return(0);
-		    continue;
-		case 'S':
-		    if (!_conv(t->tm_sec, 2, '0'))
-			return(0);
-		    continue;
-		case 's':
-		    if (!_secs(t))
-			return(0);
-		    continue;
-		case 'T':
-		    if (!_fmt("%H:%M:%S", t))
-			return(0);
-		    continue;
-		case 't':
-		    if (!_add("\t"))
-			return(0);
-		    continue;
-		case 'U':
-		    if (!_conv(SUN_WEEK(t), 2, '0'))
-			return(0);
-		    continue;
-		case 'u':
-		    if (!_conv(t->tm_wday ? t->tm_wday : 7, 1, '0'))
-			return(0);
-		    continue;
-		case 'V':
-		{
-				/* ISO 8601 Week Of Year:
-				   If the week (Monday - Sunday) containing
-				   January 1 has four or more days in the new 
-				   year, then it is week 1; otherwise it is 
-				   week 53 of the previous year and the next
-				   week is week one. */
-				 
-		    int week = MON_WEEK(t);
-
-		    int days = (((t)->tm_yday + 7 - \
-			    ((t)->tm_wday ? (t)->tm_wday - 1 : 6)) % 7);
-
-
-		    if (days >= 4) {
-			week++;
-		    } else if (week == 0) {
-			week = 53;
-		    }
-
-		    if (!_conv(week, 2, '0'))
-			return(0);
-		    continue;
-		}
-		case 'W':
-		    if (!_conv(MON_WEEK(t), 2, '0'))
-			return(0);
-		    continue;
-		case 'w':
-		    if (!_conv(t->tm_wday, 1, '0'))
-			return(0);
-		    continue;
-		case 'x':
-		    if (!_fmt(_CurrentTimeLocale->d_fmt, t))
-			return(0);
-		    continue;
-		case 'X':
-		    if (!_fmt(_CurrentTimeLocale->t_fmt, t))
-			return(0);
-		    continue;
-		case 'y':
-		    if (!_conv((t->tm_year + TM_YEAR_BASE) % 100,
-			    2, '0'))
-			return(0);
-		    continue;
-		case 'Y':
-		    if (!_conv((t->tm_year + TM_YEAR_BASE), 4, '0'))
-			return(0);
-		    continue;
-#ifndef MAC_TCL
-		case 'Z': {
-		    char *name = TclpGetTZName(t->tm_isdst);
-		    if (name && !_add(name)) {
-			return 0;
-		    }
-		    continue;
-		}
-#endif
-		case '%':
-		    /*
-		     * X311J/88-090 (4.12.3.5): if conversion char is
-		     * undefined, behavior is undefined.  Print out the
-		     * character itself as printf(3) does.
-		     */
-		default:
-		    break;
-	    }
-	}
-	if (!gsize--)
-	    return(0);
-	*pt++ = *format;
-    }
-    return(gsize);
-}
-
-static int
-_secs(t)
-    const struct tm *t;
-{
-    static char buf[15];
-    register time_t s;
-    register char *p;
-    struct tm tmp;
-
-    /* Make a copy, mktime(3) modifies the tm struct. */
-    tmp = *t;
-    s = mktime(&tmp);
-    for (p = buf + sizeof(buf) - 2; s > 0 && p > buf; s /= 10)
-	*p-- = (char)(s % 10 + '0');
-    return(_add(++p));
-}
-
-static int
-_conv(n, digits, pad)
-    int n, digits;
-    int pad;
-{
-    static char buf[10];
-    register char *p;
-
-    for (p = buf + sizeof(buf) - 2; n > 0 && p > buf; n /= 10, --digits)
-	*p-- = (char)(n % 10 + '0');
-    while (p > buf && digits-- > 0)
-	*p-- = (char) pad;
-    return(_add(++p));
-}
-
-static int
-_add(str)
-    const char *str;
-{
-    for (;; ++pt, --gsize) {
-	if (!gsize)
-	    return(0);
-	if (!(*pt = *str++))
-	    return(1);
-    }
-}
diff --git a/compat/string.h b/compat/string.h
deleted file mode 100644
index b7a0653..0000000
--- a/compat/string.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * string.h --
- *
- *	Declarations of ANSI C library procedures for string handling.
- *
- * Copyright (c) 1991-1993 The Regents of the University of California.
- * Copyright (c) 1994-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: string.h,v 1.3 1999/04/16 00:46:30 stanton Exp $
- */
-
-#ifndef _STRING
-#define _STRING
-
-#include <tcl.h>
-
-/*
- * The following #include is needed to define size_t. (This used to
- * include sys/stdtypes.h but that doesn't exist on older versions
- * of SunOS, e.g. 4.0.2, so I'm trying sys/types.h now.... hopefully
- * it exists everywhere)
- */
-
-#ifndef MAC_TCL
-#include <sys/types.h>
-#endif
-
-extern char *		memchr _ANSI_ARGS_((CONST VOID *s, int c, size_t n));
-extern int		memcmp _ANSI_ARGS_((CONST VOID *s1, CONST VOID *s2,
-			    size_t n));
-extern char *		memcpy _ANSI_ARGS_((VOID *t, CONST VOID *f, size_t n));
-#ifdef NO_MEMMOVE
-#define memmove(d, s, n) bcopy ((s), (d), (n))
-#else
-extern char *		memmove _ANSI_ARGS_((VOID *t, CONST VOID *f,
-			    size_t n));
-#endif
-extern char *		memset _ANSI_ARGS_((VOID *s, int c, size_t n));
-
-extern int		strcasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2));
-extern char *		strcat _ANSI_ARGS_((char *dst, CONST char *src));
-extern char *		strchr _ANSI_ARGS_((CONST char *string, int c));
-extern int		strcmp _ANSI_ARGS_((CONST char *s1, CONST char *s2));
-extern char *		strcpy _ANSI_ARGS_((char *dst, CONST char *src));
-extern size_t		strcspn _ANSI_ARGS_((CONST char *string,
-			    CONST char *chars));
-extern char *		strdup _ANSI_ARGS_((CONST char *string));
-extern char *		strerror _ANSI_ARGS_((int error));
-extern size_t		strlen _ANSI_ARGS_((CONST char *string));
-extern int		strncasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2, size_t n));
-extern char *		strncat _ANSI_ARGS_((char *dst, CONST char *src,
-			    size_t numChars));
-extern int		strncmp _ANSI_ARGS_((CONST char *s1, CONST char *s2,
-			    size_t nChars));
-extern char *		strncpy _ANSI_ARGS_((char *dst, CONST char *src,
-			    size_t numChars));
-extern char *		strpbrk _ANSI_ARGS_((CONST char *string, char *chars));
-extern char *		strrchr _ANSI_ARGS_((CONST char *string, int c));
-extern size_t		strspn _ANSI_ARGS_((CONST char *string,
-			    CONST char *chars));
-extern char *		strstr _ANSI_ARGS_((CONST char *string,
-			    CONST char *substring));
-extern char *		strtok _ANSI_ARGS_((CONST char *s, CONST char *delim));
-
-#endif /* _STRING */
diff --git a/compat/strncasecmp.c b/compat/strncasecmp.c
deleted file mode 100644
index ca2bf91..0000000
--- a/compat/strncasecmp.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * strncasecmp.c --
- *
- *	Source code for the "strncasecmp" library routine.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: strncasecmp.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include "tclPort.h"
-
-/*
- * This array is designed for mapping upper and lower case letter
- * together for a case independent comparison.  The mappings are
- * based upon ASCII character sequences.
- */
-
-static unsigned char charmap[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-    0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-    0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-    0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-    0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-    0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-    0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-    0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-    0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-    0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-    0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-    0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-    0xc0, 0xe1, 0xe2, 0xe3, 0xe4, 0xc5, 0xe6, 0xe7,
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-    0xf8, 0xf9, 0xfa, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-    0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-    0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-    0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-};
-
-/*
- * Here are the prototypes just in case they are not included
- * in tclPort.h.
- */
-int		strncasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2, size_t n));
-
-int		strcasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2));
-
-/*
- *----------------------------------------------------------------------
- *
- * strcasecmp --
- *
- *	Compares two strings, ignoring case differences.
- *
- * Results:
- *	Compares two null-terminated strings s1 and s2, returning -1, 0,
- *	or 1 if s1 is lexicographically less than, equal to, or greater
- *	than s2.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-strcasecmp(s1, s2)
-    CONST char *s1;			/* First string. */
-    CONST char *s2;			/* Second string. */
-{
-    unsigned char u1, u2;
-
-    for ( ; ; s1++, s2++) {
-	u1 = (unsigned char) *s1;
-	u2 = (unsigned char) *s2;
-	if ((u1 == '\0') || (charmap[u1] != charmap[u2])) {
-	    break;
-	}
-    }
-    return charmap[u1] - charmap[u2];
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * strncasecmp --
- *
- *	Compares two strings, ignoring case differences.
- *
- * Results:
- *	Compares up to length chars of s1 and s2, returning -1, 0, or 1
- *	if s1 is lexicographically less than, equal to, or greater
- *	than s2 over those characters.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-strncasecmp(s1, s2, length)
-    CONST char *s1;		/* First string. */
-    CONST char *s2;		/* Second string. */
-    size_t length;		/* Maximum number of characters to compare
-				 * (stop earlier if the end of either string
-				 * is reached). */
-{
-    unsigned char u1, u2;
-
-    for (; length != 0; length--, s1++, s2++) {
-	u1 = (unsigned char) *s1;
-	u2 = (unsigned char) *s2;
-	if (charmap[u1] != charmap[u2]) {
-	    return charmap[u1] - charmap[u2];
-	}
-	if (u1 == '\0') {
-	    return 0;
-	}
-    }
-    return 0;
-}
diff --git a/compat/strstr.c b/compat/strstr.c
deleted file mode 100644
index de0c26a..0000000
--- a/compat/strstr.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- * strstr.c --
- *
- *	Source code for the "strstr" library routine.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: strstr.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-/*
- *----------------------------------------------------------------------
- *
- * strstr --
- *
- *	Locate the first instance of a substring in a string.
- *
- * Results:
- *	If string contains substring, the return value is the
- *	location of the first matching instance of substring
- *	in string.  If string doesn't contain substring, the
- *	return value is 0.  Matching is done on an exact
- *	character-for-character basis with no wildcards or special
- *	characters.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-strstr(string, substring)
-    register char *string;	/* String to search. */
-    char *substring;		/* Substring to try to find in string. */
-{
-    register char *a, *b;
-
-    /* First scan quickly through the two strings looking for a
-     * single-character match.  When it's found, then compare the
-     * rest of the substring.
-     */
-
-    b = substring;
-    if (*b == 0) {
-	return string;
-    }
-    for ( ; *string != 0; string += 1) {
-	if (*string != *b) {
-	    continue;
-	}
-	a = string;
-	while (1) {
-	    if (*b == 0) {
-		return string;
-	    }
-	    if (*a++ != *b++) {
-		break;
-	    }
-	}
-	b = substring;
-    }
-    return (char *) 0;
-}
diff --git a/compat/strtod.c b/compat/strtod.c
deleted file mode 100644
index 744c7c8..0000000
--- a/compat/strtod.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* 
- * strtod.c --
- *
- *	Source code for the "strtod" library procedure.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: strtod.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include "tcl.h"
-#ifdef NO_STDLIB_H
-#   include "../compat/stdlib.h"
-#else
-#   include <stdlib.h>
-#endif
-#include <ctype.h>
-
-#ifndef TRUE
-#define TRUE 1
-#define FALSE 0
-#endif
-#ifndef NULL
-#define NULL 0
-#endif
-
-static int maxExponent = 511;	/* Largest possible base 10 exponent.  Any
-				 * exponent larger than this will already
-				 * produce underflow or overflow, so there's
-				 * no need to worry about additional digits.
-				 */
-static double powersOf10[] = {	/* Table giving binary powers of 10.  Entry */
-    10.,			/* is 10^2^i.  Used to convert decimal */
-    100.,			/* exponents into floating-point numbers. */
-    1.0e4,
-    1.0e8,
-    1.0e16,
-    1.0e32,
-    1.0e64,
-    1.0e128,
-    1.0e256
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * strtod --
- *
- *	This procedure converts a floating-point number from an ASCII
- *	decimal representation to internal double-precision format.
- *
- * Results:
- *	The return value is the double-precision floating-point
- *	representation of the characters in string.  If endPtr isn't
- *	NULL, then *endPtr is filled in with the address of the
- *	next character after the last one that was part of the
- *	floating-point number.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-double
-strtod(string, endPtr)
-    CONST char *string;		/* A decimal ASCII floating-point number,
-				 * optionally preceded by white space.
-				 * Must have form "-I.FE-X", where I is the
-				 * integer part of the mantissa, F is the
-				 * fractional part of the mantissa, and X
-				 * is the exponent.  Either of the signs
-				 * may be "+", "-", or omitted.  Either I
-				 * or F may be omitted, or both.  The decimal
-				 * point isn't necessary unless F is present.
-				 * The "E" may actually be an "e".  E and X
-				 * may both be omitted (but not just one).
-				 */
-    char **endPtr;		/* If non-NULL, store terminating character's
-				 * address here. */
-{
-    int sign, expSign = FALSE;
-    double fraction, dblExp, *d;
-    register CONST char *p;
-    register int c;
-    int exp = 0;		/* Exponent read from "EX" field. */
-    int fracExp = 0;		/* Exponent that derives from the fractional
-				 * part.  Under normal circumstatnces, it is
-				 * the negative of the number of digits in F.
-				 * However, if I is very long, the last digits
-				 * of I get dropped (otherwise a long I with a
-				 * large negative exponent could cause an
-				 * unnecessary overflow on I alone).  In this
-				 * case, fracExp is incremented one for each
-				 * dropped digit. */
-    int mantSize;		/* Number of digits in mantissa. */
-    int decPt;			/* Number of mantissa digits BEFORE decimal
-				 * point. */
-    CONST char *pExp;		/* Temporarily holds location of exponent
-				 * in string. */
-
-    /*
-     * Strip off leading blanks and check for a sign.
-     */
-
-    p = string;
-    while (isspace(*p)) {
-	p += 1;
-    }
-    if (*p == '-') {
-	sign = TRUE;
-	p += 1;
-    } else {
-	if (*p == '+') {
-	    p += 1;
-	}
-	sign = FALSE;
-    }
-
-    /*
-     * Count the number of digits in the mantissa (including the decimal
-     * point), and also locate the decimal point.
-     */
-
-    decPt = -1;
-    for (mantSize = 0; ; mantSize += 1)
-    {
-	c = *p;
-	if (!isdigit(c)) {
-	    if ((c != '.') || (decPt >= 0)) {
-		break;
-	    }
-	    decPt = mantSize;
-	}
-	p += 1;
-    }
-
-    /*
-     * Now suck up the digits in the mantissa.  Use two integers to
-     * collect 9 digits each (this is faster than using floating-point).
-     * If the mantissa has more than 18 digits, ignore the extras, since
-     * they can't affect the value anyway.
-     */
-    
-    pExp  = p;
-    p -= mantSize;
-    if (decPt < 0) {
-	decPt = mantSize;
-    } else {
-	mantSize -= 1;			/* One of the digits was the point. */
-    }
-    if (mantSize > 18) {
-	fracExp = decPt - 18;
-	mantSize = 18;
-    } else {
-	fracExp = decPt - mantSize;
-    }
-    if (mantSize == 0) {
-	fraction = 0.0;
-	p = string;
-	goto done;
-    } else {
-	int frac1, frac2;
-	frac1 = 0;
-	for ( ; mantSize > 9; mantSize -= 1)
-	{
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac1 = 10*frac1 + (c - '0');
-	}
-	frac2 = 0;
-	for (; mantSize > 0; mantSize -= 1)
-	{
-	    c = *p;
-	    p += 1;
-	    if (c == '.') {
-		c = *p;
-		p += 1;
-	    }
-	    frac2 = 10*frac2 + (c - '0');
-	}
-	fraction = (1.0e9 * frac1) + frac2;
-    }
-
-    /*
-     * Skim off the exponent.
-     */
-
-    p = pExp;
-    if ((*p == 'E') || (*p == 'e')) {
-	p += 1;
-	if (*p == '-') {
-	    expSign = TRUE;
-	    p += 1;
-	} else {
-	    if (*p == '+') {
-		p += 1;
-	    }
-	    expSign = FALSE;
-	}
-	while (isdigit(*p)) {
-	    exp = exp * 10 + (*p - '0');
-	    p += 1;
-	}
-    }
-    if (expSign) {
-	exp = fracExp - exp;
-    } else {
-	exp = fracExp + exp;
-    }
-
-    /*
-     * Generate a floating-point number that represents the exponent.
-     * Do this by processing the exponent one bit at a time to combine
-     * many powers of 2 of 10. Then combine the exponent with the
-     * fraction.
-     */
-    
-    if (exp < 0) {
-	expSign = TRUE;
-	exp = -exp;
-    } else {
-	expSign = FALSE;
-    }
-    if (exp > maxExponent) {
-	exp = maxExponent;
-    }
-    dblExp = 1.0;
-    for (d = powersOf10; exp != 0; exp >>= 1, d += 1) {
-	if (exp & 01) {
-	    dblExp *= *d;
-	}
-    }
-    if (expSign) {
-	fraction /= dblExp;
-    } else {
-	fraction *= dblExp;
-    }
-
-done:
-    if (endPtr != NULL) {
-	*endPtr = (char *) p;
-    }
-
-    if (sign) {
-	return -fraction;
-    }
-    return fraction;
-}
diff --git a/compat/strtol.c b/compat/strtol.c
deleted file mode 100644
index c2f336b..0000000
--- a/compat/strtol.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* 
- * strtol.c --
- *
- *	Source code for the "strtol" library procedure.
- *
- * Copyright (c) 1988 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: strtol.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include <ctype.h>
-
-
-/*
- *----------------------------------------------------------------------
- *
- * strtol --
- *
- *	Convert an ASCII string into an integer.
- *
- * Results:
- *	The return value is the integer equivalent of string.  If endPtr
- *	is non-NULL, then *endPtr is filled in with the character
- *	after the last one that was part of the integer.  If string
- *	doesn't contain a valid integer value, then zero is returned
- *	and *endPtr is set to string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-long int
-strtol(string, endPtr, base)
-    char *string;		/* String of ASCII digits, possibly
-				 * preceded by white space.  For bases
-				 * greater than 10, either lower- or
-				 * upper-case digits may be used.
-				 */
-    char **endPtr;		/* Where to store address of terminating
-				 * character, or NULL. */
-    int base;			/* Base for conversion.  Must be less
-				 * than 37.  If 0, then the base is chosen
-				 * from the leading characters of string:
-				 * "0x" means hex, "0" means octal, anything
-				 * else means decimal.
-				 */
-{
-    register char *p;
-    int result;
-
-    /*
-     * Skip any leading blanks.
-     */
-
-    p = string;
-    while (isspace(*p)) {
-	p += 1;
-    }
-
-    /*
-     * Check for a sign.
-     */
-
-    if (*p == '-') {
-	p += 1;
-	result = -(strtoul(p, endPtr, base));
-    } else {
-	if (*p == '+') {
-	    p += 1;
-	}
-	result = strtoul(p, endPtr, base);
-    }
-    if ((result == 0) && (endPtr != 0) && (*endPtr == p)) {
-	*endPtr = string;
-    }
-    return result;
-}
diff --git a/compat/strtoul.c b/compat/strtoul.c
deleted file mode 100644
index 3b7918c..0000000
--- a/compat/strtoul.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* 
- * strtoul.c --
- *
- *	Source code for the "strtoul" library procedure.
- *
- * Copyright (c) 1988 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: strtoul.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include <ctype.h>
-
-/*
- * The table below is used to convert from ASCII digits to a
- * numerical equivalent.  It maps from '0' through 'z' to integers
- * (100 for non-digit characters).
- */
-
-static char cvtIn[] = {
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,		/* '0' - '9' */
-    100, 100, 100, 100, 100, 100, 100,		/* punctuation */
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,	/* 'A' - 'Z' */
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 34, 35,
-    100, 100, 100, 100, 100, 100,		/* punctuation */
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,	/* 'a' - 'z' */
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-    30, 31, 32, 33, 34, 35};
-
-/*
- *----------------------------------------------------------------------
- *
- * strtoul --
- *
- *	Convert an ASCII string into an integer.
- *
- * Results:
- *	The return value is the integer equivalent of string.  If endPtr
- *	is non-NULL, then *endPtr is filled in with the character
- *	after the last one that was part of the integer.  If string
- *	doesn't contain a valid integer value, then zero is returned
- *	and *endPtr is set to string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-unsigned long int
-strtoul(string, endPtr, base)
-    char *string;		/* String of ASCII digits, possibly
-				 * preceded by white space.  For bases
-				 * greater than 10, either lower- or
-				 * upper-case digits may be used.
-				 */
-    char **endPtr;		/* Where to store address of terminating
-				 * character, or NULL. */
-    int base;			/* Base for conversion.  Must be less
-				 * than 37.  If 0, then the base is chosen
-				 * from the leading characters of string:
-				 * "0x" means hex, "0" means octal, anything
-				 * else means decimal.
-				 */
-{
-    register char *p;
-    register unsigned long int result = 0;
-    register unsigned digit;
-    int anyDigits = 0;
-
-    /*
-     * Skip any leading blanks.
-     */
-
-    p = string;
-    while (isspace(*p)) {
-	p += 1;
-    }
-
-    /*
-     * If no base was provided, pick one from the leading characters
-     * of the string.
-     */
-    
-    if (base == 0)
-    {
-	if (*p == '0') {
-	    p += 1;
-	    if (*p == 'x') {
-		p += 1;
-		base = 16;
-	    } else {
-
-		/*
-		 * Must set anyDigits here, otherwise "0" produces a
-		 * "no digits" error.
-		 */
-
-		anyDigits = 1;
-		base = 8;
-	    }
-	}
-	else base = 10;
-    } else if (base == 16) {
-
-	/*
-	 * Skip a leading "0x" from hex numbers.
-	 */
-
-	if ((p[0] == '0') && (p[1] == 'x')) {
-	    p += 2;
-	}
-    }
-
-    /*
-     * Sorry this code is so messy, but speed seems important.  Do
-     * different things for base 8, 10, 16, and other.
-     */
-
-    if (base == 8) {
-	for ( ; ; p += 1) {
-	    digit = *p - '0';
-	    if (digit > 7) {
-		break;
-	    }
-	    result = (result << 3) + digit;
-	    anyDigits = 1;
-	}
-    } else if (base == 10) {
-	for ( ; ; p += 1) {
-	    digit = *p - '0';
-	    if (digit > 9) {
-		break;
-	    }
-	    result = (10*result) + digit;
-	    anyDigits = 1;
-	}
-    } else if (base == 16) {
-	for ( ; ; p += 1) {
-	    digit = *p - '0';
-	    if (digit > ('z' - '0')) {
-		break;
-	    }
-	    digit = cvtIn[digit];
-	    if (digit > 15) {
-		break;
-	    }
-	    result = (result << 4) + digit;
-	    anyDigits = 1;
-	}
-    } else {
-	for ( ; ; p += 1) {
-	    digit = *p - '0';
-	    if (digit > ('z' - '0')) {
-		break;
-	    }
-	    digit = cvtIn[digit];
-	    if (digit >= base) {
-		break;
-	    }
-	    result = result*base + digit;
-	    anyDigits = 1;
-	}
-    }
-
-    /*
-     * See if there were any digits at all.
-     */
-
-    if (!anyDigits) {
-	p = string;
-    }
-
-    if (endPtr != 0) {
-	*endPtr = p;
-    }
-
-    return result;
-}
diff --git a/compat/tclErrno.h b/compat/tclErrno.h
deleted file mode 100644
index df87385..0000000
--- a/compat/tclErrno.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * tclErrno.h --
- *
- *	This header file contains the various POSIX errno definitions that
- *	are used by Tcl.  This file is derived from the spec POSIX 2.4 and
- *	previous implementations for Berkeley UNIX.
- *
- * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclErrno.h,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-extern int errno;			/* global error number */
-
-#define	EPERM		1		/* Operation not permitted */
-#define	ENOENT		2		/* No such file or directory */
-#define	ESRCH		3		/* No such process */
-#define	EINTR		4		/* Interrupted system call */
-#define	EIO		5		/* Input/output error */
-#define	ENXIO		6		/* Device not configured */
-#define	E2BIG		7		/* Argument list too long */
-#define	ENOEXEC		8		/* Exec format error */
-#define	EBADF		9		/* Bad file descriptor */
-#define	ECHILD		10		/* No child processes */
-#define	EDEADLK		11		/* Resource deadlock avoided */
-					/* 11 was EAGAIN */
-#define	ENOMEM		12		/* Cannot allocate memory */
-#define	EACCES		13		/* Permission denied */
-#define	EFAULT		14		/* Bad address */
-#define	ENOTBLK		15		/* Block device required */
-#define	EBUSY		16		/* Device busy */
-#define	EEXIST		17		/* File exists */
-#define	EXDEV		18		/* Cross-device link */
-#define	ENODEV		19		/* Operation not supported by device */
-#define	ENOTDIR		20		/* Not a directory */
-#define	EISDIR		21		/* Is a directory */
-#define	EINVAL		22		/* Invalid argument */
-#define	ENFILE		23		/* Too many open files in system */
-#define	EMFILE		24		/* Too many open files */
-#define	ENOTTY		25		/* Inappropriate ioctl for device */
-#define	ETXTBSY		26		/* Text file busy */
-#define	EFBIG		27		/* File too large */
-#define	ENOSPC		28		/* No space left on device */
-#define	ESPIPE		29		/* Illegal seek */
-#define	EROFS		30		/* Read-only file system */
-#define	EMLINK		31		/* Too many links */
-#define	EPIPE		32		/* Broken pipe */
-#define	EDOM		33		/* Numerical argument out of domain */
-#define	ERANGE		34		/* Result too large */
-#define	EAGAIN		35		/* Resource temporarily unavailable */
-#define	EWOULDBLOCK	EAGAIN		/* Operation would block */
-#define	EINPROGRESS	36		/* Operation now in progress */
-#define	EALREADY	37		/* Operation already in progress */
-#define	ENOTSOCK	38		/* Socket operation on non-socket */
-#define	EDESTADDRREQ	39		/* Destination address required */
-#define	EMSGSIZE	40		/* Message too long */
-#define	EPROTOTYPE	41		/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	42		/* Protocol not available */
-#define	EPROTONOSUPPORT	43		/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	44		/* Socket type not supported */
-#define	EOPNOTSUPP	45		/* Operation not supported on socket */
-#define	EPFNOSUPPORT	46		/* Protocol family not supported */
-#define	EAFNOSUPPORT	47		/* Address family not supported by protocol family */
-#define	EADDRINUSE	48		/* Address already in use */
-#define	EADDRNOTAVAIL	49		/* Can't assign requested address */
-#define	ENETDOWN	50		/* Network is down */
-#define	ENETUNREACH	51		/* Network is unreachable */
-#define	ENETRESET	52		/* Network dropped connection on reset */
-#define	ECONNABORTED	53		/* Software caused connection abort */
-#define	ECONNRESET	54		/* Connection reset by peer */
-#define	ENOBUFS		55		/* No buffer space available */
-#define	EISCONN		56		/* Socket is already connected */
-#define	ENOTCONN	57		/* Socket is not connected */
-#define	ESHUTDOWN	58		/* Can't send after socket shutdown */
-#define	ETOOMANYREFS	59		/* Too many references: can't splice */
-#define	ETIMEDOUT	60		/* Connection timed out */
-#define	ECONNREFUSED	61		/* Connection refused */
-#define	ELOOP		62		/* Too many levels of symbolic links */
-#define	ENAMETOOLONG	63		/* File name too long */
-#define	EHOSTDOWN	64		/* Host is down */
-#define	EHOSTUNREACH	65		/* No route to host */
-#define	ENOTEMPTY	66		/* Directory not empty */
-#define	EPROCLIM	67		/* Too many processes */
-#define	EUSERS		68		/* Too many users */
-#define	EDQUOT		69		/* Disc quota exceeded */
-#define	ESTALE		70		/* Stale NFS file handle */
-#define	EREMOTE		71		/* Too many levels of remote in path */
-#define	EBADRPC		72		/* RPC struct is bad */
-#define	ERPCMISMATCH	73		/* RPC version wrong */
-#define	EPROGUNAVAIL	74		/* RPC prog. not avail */
-#define	EPROGMISMATCH	75		/* Program version wrong */
-#define	EPROCUNAVAIL	76		/* Bad procedure for program */
-#define	ENOLCK		77		/* No locks available */
-#define	ENOSYS		78		/* Function not implemented */
-#define	EFTYPE		79		/* Inappropriate file type or format */
-
diff --git a/compat/tmpnam.c b/compat/tmpnam.c
deleted file mode 100644
index 89bfc6a..0000000
--- a/compat/tmpnam.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific written prior permission. This software
- * is provided ``as is'' without express or implied warranty.
- *
- * RCS: @(#) $Id: tmpnam.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <stdio.h>
-
-/*
- * Use /tmp instead of /usr/tmp, because L_tmpname is only 14 chars
- * on some machines (like NeXT machines) and /usr/tmp will cause
- * buffer overflows.
- */
-
-#ifdef P_tmpdir
-#   undef P_tmpdir
-#endif
-#define	P_tmpdir	"/tmp"
-
-char *
-tmpnam(s)
-	char *s;
-{
-	static char name[50];
-	char *mktemp();
-
-	if (!s)
-		s = name;
-	(void)sprintf(s, "%s/XXXXXX", P_tmpdir);
-	return(mktemp(s));
-}
diff --git a/compat/unistd.h b/compat/unistd.h
deleted file mode 100644
index 0b791e0..0000000
--- a/compat/unistd.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * unistd.h --
- *
- *      Macros, CONSTants and prototypes for Posix conformance.
- *
- * Copyright 1989 Regents of the University of California
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- *
- * RCS: @(#) $Id: unistd.h,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#ifndef _UNISTD
-#define _UNISTD
-
-#include <sys/types.h>
-#ifndef _TCL
-#   include "tcl.h"
-#endif
-
-#ifndef NULL
-#define NULL    0
-#endif
-
-/* 
- * Strict POSIX stuff goes here.  Extensions go down below, in the 
- * ifndef _POSIX_SOURCE section.
- */
-
-extern void _exit _ANSI_ARGS_((int status));
-extern int access _ANSI_ARGS_((CONST char *path, int mode));
-extern int chdir _ANSI_ARGS_((CONST char *path));
-extern int chown _ANSI_ARGS_((CONST char *path, uid_t owner, gid_t group));
-extern int close _ANSI_ARGS_((int fd));
-extern int dup _ANSI_ARGS_((int oldfd));
-extern int dup2 _ANSI_ARGS_((int oldfd, int newfd));
-extern int execl _ANSI_ARGS_((CONST char *path, ...));
-extern int execle _ANSI_ARGS_((CONST char *path, ...));
-extern int execlp _ANSI_ARGS_((CONST char *file, ...));
-extern int execv _ANSI_ARGS_((CONST char *path, char **argv));
-extern int execve _ANSI_ARGS_((CONST char *path, char **argv, char **envp));
-extern int execvp _ANSI_ARGS_((CONST char *file, char **argv));
-extern pid_t fork _ANSI_ARGS_((void));
-extern char *getcwd _ANSI_ARGS_((char *buf, size_t size));
-extern gid_t getegid _ANSI_ARGS_((void));
-extern uid_t geteuid _ANSI_ARGS_((void));
-extern gid_t getgid _ANSI_ARGS_((void));
-extern int getgroups _ANSI_ARGS_((int bufSize, int *buffer));
-extern pid_t getpid _ANSI_ARGS_((void));
-extern uid_t getuid _ANSI_ARGS_((void));
-extern int isatty _ANSI_ARGS_((int fd));
-extern long lseek _ANSI_ARGS_((int fd, long offset, int whence));
-extern int pipe _ANSI_ARGS_((int *fildes));
-extern int read _ANSI_ARGS_((int fd, char *buf, size_t size));
-extern int setgid _ANSI_ARGS_((gid_t group));
-extern int setuid _ANSI_ARGS_((uid_t user));
-extern unsigned sleep _ANSI_ARGS_ ((unsigned seconds));
-extern char *ttyname _ANSI_ARGS_((int fd));
-extern int unlink _ANSI_ARGS_((CONST char *path));
-extern int write _ANSI_ARGS_((int fd, CONST char *buf, size_t size));
-
-#ifndef	_POSIX_SOURCE
-extern char *crypt _ANSI_ARGS_((CONST char *, CONST char *));
-extern int fchown _ANSI_ARGS_((int fd, uid_t owner, gid_t group));
-extern int flock _ANSI_ARGS_((int fd, int operation));
-extern int ftruncate _ANSI_ARGS_((int fd, unsigned long length));
-extern int ioctl _ANSI_ARGS_((int fd, int request, ...));
-extern int readlink _ANSI_ARGS_((CONST char *path, char *buf, int bufsize));
-extern int setegid _ANSI_ARGS_((gid_t group));
-extern int seteuid _ANSI_ARGS_((uid_t user));
-extern int setreuid _ANSI_ARGS_((int ruid, int euid));
-extern int symlink _ANSI_ARGS_((CONST char *, CONST char *));
-extern int ttyslot _ANSI_ARGS_((void));
-extern int truncate _ANSI_ARGS_((CONST char *path, unsigned long length));
-extern int vfork _ANSI_ARGS_((void));
-#endif /* _POSIX_SOURCE */
-
-#endif /* _UNISTD */
-
diff --git a/compat/waitpid.c b/compat/waitpid.c
deleted file mode 100644
index 1069f56..0000000
--- a/compat/waitpid.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* 
- * waitpid.c --
- *
- *	This procedure emulates the POSIX waitpid kernel call on
- *	BSD systems that don't have waitpid but do have wait3.
- *	This code is based on a prototype version written by
- *	Mark Diekhans and Karl Lehenbauer.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: waitpid.c,v 1.2 1998/09/14 18:39:45 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * A linked list of the following structures is used to keep track
- * of processes for which we received notification from the kernel,
- * but the application hasn't waited for them yet (this can happen
- * because wait may not return the process we really want).  We
- * save the information here until the application finally does
- * wait for the process.
- */
-
-typedef struct WaitInfo {
-    int pid;				/* Pid of process that exited. */
-    WAIT_STATUS_TYPE status;		/* Status returned when child exited
-					 * or suspended. */
-    struct WaitInfo *nextPtr;		/* Next in list of exited processes. */
-} WaitInfo;
-
-static WaitInfo *deadList = NULL;	/* First in list of all dead
-					 * processes. */
-
-/*
- *----------------------------------------------------------------------
- *
- * waitpid --
- *
- *	This procedure emulates the functionality of the POSIX
- *	waitpid kernel call, using the BSD wait3 kernel call.
- *	Note:  it doesn't emulate absolutely all of the waitpid
- *	functionality, in that it doesn't support pid's of 0
- *	or < -1.
- *
- * Results:
- *	-1 is returned if there is an error in the wait kernel call.
- *	Otherwise the pid of an exited or suspended process is
- *	returned and *statusPtr is set to the status value of the
- *	process.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef waitpid
-#   undef waitpid
-#endif
-
-int
-waitpid(pid, statusPtr, options)
-    int pid;			/* The pid to wait on.  Must be -1 or
-				 * greater than zero. */
-    int *statusPtr;		/* Where to store wait status for the
-				 * process. */
-    int options;		/* OR'ed combination of WNOHANG and
-				 * WUNTRACED. */
-{
-    register WaitInfo *waitPtr, *prevPtr;
-    int result;
-    WAIT_STATUS_TYPE status;
-
-    if ((pid < -1) || (pid == 0)) {
-	errno = EINVAL;
-	return -1;
-    }
-
-    /*
-     * See if there's a suitable process that has already stopped or
-     * exited. If so, remove it from the list of exited processes and
-     * return its information.
-     */
-
-    for (waitPtr = deadList, prevPtr = NULL; waitPtr != NULL;
-	    prevPtr = waitPtr, waitPtr = waitPtr->nextPtr) {
-	if ((pid != waitPtr->pid) && (pid != -1)) {
-	    continue;
-	}
-	if (!(options & WUNTRACED) && (WIFSTOPPED(waitPtr->status))) {
-	    continue;
-	}
-	result = waitPtr->pid;
-	*statusPtr = *((int *) &waitPtr->status);
-	if (prevPtr == NULL) {
-	    deadList = waitPtr->nextPtr;
-	} else {
-	    prevPtr->nextPtr = waitPtr->nextPtr;
-	}
-	ckfree((char *) waitPtr);
-	return result;
-    }
-
-    /*
-     * Wait for any process to stop or exit.  If it's an acceptable one
-     * then return it to the caller;  otherwise store information about it
-     * in the list of exited processes and try again.  On systems that
-     * have only wait but not wait3, there are several situations we can't
-     * handle, but we do the best we can (e.g. can still handle some
-     * combinations of options by invoking wait instead of wait3).
-     */
-
-    while (1) {
-#if NO_WAIT3
-	if (options & WNOHANG) {
-	    return 0;
-	}
-	if (options != 0) {
-	    errno = EINVAL;
-	    return -1;
-	}
-	result = wait(&status);
-#else
-	result = wait3(&status, options, 0);
-#endif
-	if ((result == -1) && (errno == EINTR)) {
-	    continue;
-	}
-	if (result <= 0) {
-	    return result;
-	}
-
-	if ((pid != result) && (pid != -1)) {
-	    goto saveInfo;
-	}
-	if (!(options & WUNTRACED) && (WIFSTOPPED(status))) {
-	    goto saveInfo;
-	}
-	*statusPtr = *((int *) &status);
-	return result;
-
-	/*
-	 * Can't return this info to caller.  Save it in the list of
-	 * stopped or exited processes.  Tricky point: first check for
-	 * an existing entry for the process and overwrite it if it
-	 * exists (e.g. a previously stopped process might now be dead).
-	 */
-
-	saveInfo:
-	for (waitPtr = deadList; waitPtr != NULL; waitPtr = waitPtr->nextPtr) {
-	    if (waitPtr->pid == result) {
-		waitPtr->status = status;
-		goto waitAgain;
-	    }
-	}
-	waitPtr = (WaitInfo *) ckalloc(sizeof(WaitInfo));
-	waitPtr->pid = result;
-	waitPtr->status = status;
-	waitPtr->nextPtr = deadList;
-	deadList = waitPtr;
-
-	waitAgain: continue;
-    }
-}
diff --git a/doc/AddErrInfo.3 b/doc/AddErrInfo.3
deleted file mode 100644
index b1820af..0000000
--- a/doc/AddErrInfo.3
+++ /dev/null
@@ -1,174 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: AddErrInfo.3,v 1.3 1999/03/10 05:52:45 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_AddErrorInfo 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_AddObjErrorInfo, Tcl_AddErrorInfo, Tcl_SetErrorCode, Tcl_SetErrorCodeVA, Tcl_PosixError \- record information about errors
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_AddObjErrorInfo\fR(\fIinterp, message, length\fR)
-.sp
-\fBTcl_AddErrorInfo\fR(\fIinterp, message\fR)
-.sp
-\fBTcl_SetObjErrorCode\fR(\fIinterp, errorObjPtr\fR)
-.sp
-\fBTcl_SetErrorCode\fR(\fIinterp, element, element, ... \fB(char *) NULL\fR)
-.sp
-\fBTcl_SetErrorCodeVA\fR(\fIinterp, argList\fR)
-.sp
-char *
-\fBTcl_PosixError\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *message
-.AP Tcl_Interp *interp in
-Interpreter in which to record information.
-.AP char *message in
-For \fBTcl_AddObjErrorInfo\fR,
-this points to the first byte of an array of bytes
-containing a string to record in the \fBerrorInfo\fR variable.
-This byte array may contain embedded null bytes
-unless \fIlength\fR is negative.
-For \fBTcl_AddErrorInfo\fR,
-this is a conventional C string to record in the \fBerrorInfo\fR variable.
-.AP int length in
-The number of bytes to copy from \fImessage\fR when
-setting the \fBerrorInfo\fR variable.
-If negative, all bytes up to the first null byte are used.
-.AP Tcl_Obj *errorObjPtr in
-This variable \fBerrorCode\fR will be set to this value.
-.AP char *element in
-String to record as one element of \fBerrorCode\fR variable.
-Last \fIelement\fR argument must be NULL.
-.AP va_list argList in
-An argument list which must have been initialised using
-\fBTCL_VARARGS_START\fR, and cleared using \fBva_end\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to manipulate two Tcl global variables
-that hold information about errors.
-The variable \fBerrorInfo\fR holds a stack trace of the
-operations that were in progress when an error occurred,
-and is intended to be human-readable.
-The variable \fBerrorCode\fR holds a list of items that
-are intended to be machine-readable.
-The first item in \fBerrorCode\fR identifies the class of
-error that occurred
-(e.g. POSIX means an error occurred in a POSIX system call)
-and additional elements in \fBerrorCode\fR hold additional pieces
-of information that depend on the class.
-See the Tcl overview manual entry for details on the various
-formats for \fBerrorCode\fR.
-.PP
-The \fBerrorInfo\fR variable is gradually built up as an
-error unwinds through the nested operations.
-Each time an error code is returned to \fBTcl_EvalObj\fR
-(or \fBTcl_Eval\fR, which calls \fBTcl_EvalObj\fR)
-it calls the procedure \fBTcl_AddObjErrorInfo\fR to add
-additional text to \fBerrorInfo\fR describing the
-command that was being executed when the error occurred.
-By the time the error has been passed all the way back
-to the application, it will contain a complete trace
-of the activity in progress when the error occurred.
-.PP
-It is sometimes useful to add additional information to
-\fBerrorInfo\fR beyond what can be supplied automatically
-by \fBTcl_EvalObj\fR.
-\fBTcl_AddObjErrorInfo\fR may be used for this purpose:
-its \fImessage\fR and \fIlength\fR arguments describe an additional
-string to be appended to \fBerrorInfo\fR.
-For example, the \fBsource\fR command calls \fBTcl_AddObjErrorInfo\fR
-to record the name of the file being processed and the
-line number on which the error occurred;
-for Tcl procedures, the procedure name and line number
-within the procedure are recorded, and so on.
-The best time to call \fBTcl_AddObjErrorInfo\fR is just after
-\fBTcl_EvalObj\fR has returned \fBTCL_ERROR\fR.
-In calling \fBTcl_AddObjErrorInfo\fR, you may find it useful to
-use the \fBerrorLine\fR field of the interpreter (see the
-\fBTcl_Interp\fR manual entry for details).
-.PP
-\fBTcl_AddErrorInfo\fR resembles \fBTcl_AddObjErrorInfo\fR
-but differs in initializing \fBerrorInfo\fR from the string
-value of the interpreter's result
-if the error is just starting to be logged.
-It does not use the result as a Tcl object
-so any embedded null characters in the result
-will cause information to be lost.
-It also takes a conventional C string in \fImessage\fR
-instead of \fBTcl_AddObjErrorInfo\fR's counted string.
-.PP
-The procedure \fBTcl_SetObjErrorCode\fR is used to set the
-\fBerrorCode\fR variable. \fIerrorObjPtr\fR contains a list object
-built up by the caller. \fBerrorCode\fR is set to this
-value. \fBTcl_SetObjErrorCode\fR is typically invoked just 
-before returning an error in an object command. If an error is
-returned without calling \fBTcl_SetObjErrorCode\fR or
-\fBTcl_SetErrorCode\fR the Tcl interpreter automatically sets
-\fBerrorCode\fR to \fBNONE\fR.
-.PP
-The procedure \fBTcl_SetErrorCode\fR is also used to set the
-\fBerrorCode\fR variable. However, it takes one or more strings to
-record instead of an object. Otherwise, it is similar to
-\fBTcl_SetObjErrorCode\fR in behavior.
-.PP
-\fBTcl_SetErrorCodeVA\fR is the same as \fBTcl_SetErrorCode\fR except that
-instead of taking a variable number of arguments it takes an argument list.
-.PP
-\fBTcl_PosixError\fR
-sets the \fBerrorCode\fR variable after an error in a POSIX kernel call.
-It reads the value of the \fBerrno\fR C variable and calls
-\fBTcl_SetErrorCode\fR to set \fBerrorCode\fR in the \fBPOSIX\fR format.
-The caller must previously have called \fBTcl_SetErrno\fR to set
-\fBerrno\fR; this is necessary on some platforms (e.g. Windows) where Tcl
-is linked into an application as a shared library, or when the error
-occurs in a dynamically loaded extension. See the manual entry for
-\fBTcl_SetErrno\fR for more information.
-.PP
-\fBTcl_PosixError\fR returns a human-readable diagnostic message
-for the error
-(this is the same value that will appear as the third element
-in \fBerrorCode\fR).
-It may be convenient to include this string as part of the
-error message returned to the application in
-the interpreter's result.
-.PP
-It is important to call the procedures described here rather than
-setting \fBerrorInfo\fR or \fBerrorCode\fR directly with
-\fBTcl_ObjSetVar2\fR.
-The reason for this is that the Tcl interpreter keeps information
-about whether these procedures have been called.
-For example, the first time \fBTcl_AddObjErrorInfo\fR is called
-for an error, it clears the existing value of \fBerrorInfo\fR
-and adds the error message in the interpreter's result to the variable
-before appending \fImessage\fR;
-in subsequent calls, it just appends the new \fImessage\fR.
-When \fBTcl_SetErrorCode\fR is called, it sets a flag indicating
-that \fBerrorCode\fR has been set;
-this allows the Tcl interpreter to set \fBerrorCode\fR to \fBNONE\fR
-if it receives an error return
-when \fBTcl_SetErrorCode\fR hasn't been called.
-.PP
-If the procedure \fBTcl_ResetResult\fR is called,
-it clears all of the state associated with
-\fBerrorInfo\fR and \fBerrorCode\fR
-(but it doesn't actually modify the variables).
-If an error had occurred, this will clear the error state to
-make it appear as if no error had occurred after all.
-
-.SH "SEE ALSO"
-Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_Interp, Tcl_ResetResult, Tcl_SetErrno
-
-.SH KEYWORDS
-error, object, object result, stack, trace, variable
diff --git a/doc/Alloc.3 b/doc/Alloc.3
deleted file mode 100644
index 405d7fa..0000000
--- a/doc/Alloc.3
+++ /dev/null
@@ -1,52 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Alloc.3,v 1.2 1998/09/14 18:39:45 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Alloc 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Alloc, Tcl_Free, Tcl_Realloc \- allocate or free heap memory
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_Alloc\fR(\fIsize\fR)
-.sp
-\fBTcl_Free\fR(\fIptr\fR)
-.sp
-char *
-\fBTcl_Realloc\fR(\fIptr, size\fR)
-.SH ARGUMENTS
-.AS char *size
-.AP int size in
-Size in bytes of the memory block to allocate.
-.AP char *ptr in
-Pointer to memory block to free or realloc.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures provide a platform and compiler independent interface
-for memory allocation.  Programs that need to transfer ownership of
-memory blocks between Tcl and other modules should use these routines
-rather than the native \fBmalloc()\fR and \fBfree()\fR routines
-provided by the C run-time library.
-.PP
-\fBTcl_Alloc\fR returns a pointer to a block of at least \fIsize\fR
-bytes suitably aligned for any use.
-.PP
-\fBTcl_Free\fR makes the space referred to by \fIptr\fR available for
-further allocation.
-.PP
-\fBTcl_Realloc\fR changes the size of the block pointed to by
-\fIptr\fR to \fIsize\fR bytes and returns a pointer to the new block.
-The contents will be unchanged up to the lesser of the new and old
-sizes.  The returned location may be different from \fIptr\fR.
-.SH KEYWORDS
-alloc, allocation, free, malloc, memory, realloc
diff --git a/doc/AllowExc.3 b/doc/AllowExc.3
deleted file mode 100644
index 1145fa4..0000000
--- a/doc/AllowExc.3
+++ /dev/null
@@ -1,42 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: AllowExc.3,v 1.2 1998/09/14 18:39:45 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_AllowExceptions 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_AllowExceptions \- allow all exceptions in next script evaluation
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_AllowExceptions\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *doublePtr
-.AP Tcl_Interp *interp in
-Interpreter in which script will be evaluated.
-.BE
-
-.SH DESCRIPTION
-.PP
-If a script is evaluated at top-level (i.e. no other scripts are
-pending evaluation when the script is invoked), and if the script
-terminates with a completion code other than TCL_OK, TCL_CONTINUE
-or TCL_RETURN, then Tcl normally converts this into a TCL_ERROR
-return with an appropriate message.
-.PP
-However, if \fBTcl_AllowExceptions\fR is invoked immediately before
-calling a procedure such as \fBTcl_Eval\fR, then arbitrary completion
-codes are permitted from the script, and they are returned without
-modification.
-This is useful in cases where the caller can deal with exceptions
-such as TCL_BREAK or TCL_CONTINUE in a meaningful way.
-
-.SH KEYWORDS
-continue, break, exception, interpreter
diff --git a/doc/AppInit.3 b/doc/AppInit.3
deleted file mode 100644
index 15ea1e8..0000000
--- a/doc/AppInit.3
+++ /dev/null
@@ -1,73 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: AppInit.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_AppInit 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_AppInit \- perform application-specific initialization
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_AppInit\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-Interpreter for the application.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_AppInit\fR is a ``hook'' procedure that is invoked by
-the main programs for Tcl applications such as \fBtclsh\fR and \fBwish\fR.
-Its purpose is to allow new Tcl applications to be created without
-modifying the main programs provided as part of Tcl and Tk.
-To create a new application you write a new version of
-\fBTcl_AppInit\fR to replace the default version provided by Tcl,
-then link your new \fBTcl_AppInit\fR with the Tcl library.
-.PP
-\fBTcl_AppInit\fR is invoked after by \fBTcl_Main\fR and \fBTk_Main\fR
-after their own initialization and before entering the main loop
-to process commands.
-Here are some examples of things that \fBTcl_AppInit\fR might do:
-.IP [1]
-Call initialization procedures for various packages used by
-the application.
-Each initialization procedure adds new commands to \fIinterp\fR
-for its package and performs other package-specific initialization.
-.IP [2]
-Process command-line arguments, which can be accessed from the
-Tcl variables \fBargv\fR and \fBargv0\fR in \fIinterp\fR.
-.IP [3]
-Invoke a startup script to initialize the application.
-.LP
-\fBTcl_AppInit\fR returns TCL_OK or TCL_ERROR.
-If it returns TCL_ERROR then it must leave an error message in
-\fIinterp->result\fR;  otherwise the result is ignored.
-.PP
-In addition to \fBTcl_AppInit\fR, your application should also contain
-a procedure \fBmain\fR that calls \fBTcl_Main\fR as follows:
-.CS
-Tcl_Main(argc, argv, Tcl_AppInit);
-.CE
-The third argument to \fBTcl_Main\fR gives the address of the
-application-specific initialization procedure to invoke.
-This means that you don't have to use the name \fBTcl_AppInit\fR
-for the procedure, but in practice the name is nearly always
-\fBTcl_AppInit\fR (in versions before Tcl 7.4 the name \fBTcl_AppInit\fR
-was implicit;  there was no way to specify the procedure explicitly).
-The best way to get started is to make a copy of the file
-\fBtclAppInit.c\fR from the Tcl library or source directory.
-It already contains a \fBmain\fR procedure and a template for
-\fBTcl_AppInit\fR that you can modify for your application.
-
-.SH KEYWORDS
-application, argument, command, initialization, interpreter
diff --git a/doc/AssocData.3 b/doc/AssocData.3
deleted file mode 100644
index 9b68c43..0000000
--- a/doc/AssocData.3
+++ /dev/null
@@ -1,89 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" 
-'\" RCS: @(#) $Id: AssocData.3,v 1.3 1999/04/16 00:46:30 stanton Exp $
-.so man.macros
-.TH Tcl_SetAssocData 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetAssocData, Tcl_SetAssocData, Tcl_DeleteAssocData \- manage
-associations of string keys and user specified data with Tcl
-interpreters.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-ClientData
-\fBTcl_GetAssocData\fR(\fIinterp, key, delProcPtr\fR)
-.sp
-\fBTcl_SetAssocData\fR(\fIinterp, key, delProc, clientData\fR)
-.sp
-\fBTcl_DeleteAssocData\fR(\fIinterp, key\fR)
-.SH ARGUMENTS
-.AS Tcl_InterpDeleteProc *delProcPtr
-.AP Tcl_Interp *interp in
-Interpreter in which to execute the specified command.
-.AP char *key in
-Key for association with which to store data or from which to delete or
-retrieve data.  Typically the module prefix for a package.
-.AP Tcl_InterpDeleteProc *delProc in
-Procedure to call when \fIinterp\fR is deleted.
-.AP Tcl_InterpDeleteProc **delProcPtr in
-Pointer to location in which to store address of current deletion procedure
-for association.  Ignored if NULL.
-.AP ClientData clientData in
-Arbitrary one-word value associated with the given key in this
-interpreter.  This data is owned by the caller.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures allow extensions to associate their own data with
-a Tcl interpreter.
-An association consists of a string key, typically the name of
-the extension, and a one-word value, which is typically a pointer
-to a data structure holding data specific to the extension.
-Tcl makes no interpretation of either the key or the value for
-an association.
-.PP
-Storage management is facilitated by storing with each association a
-procedure to call when the interpreter is deleted. This
-procedure can dispose of the storage occupied by the client's data in any
-way it sees fit.
-.PP
-\fBTcl_SetAssocData\fR creates an association between a string
-key and a user specified datum in the given interpreter.
-If there is already an association with the given \fIkey\fR,
-\fBTcl_SetAssocData\fR overwrites it with the new information.
-It is up to callers to organize their use of names to avoid conflicts,
-for example, by using package names as the keys.
-If the \fIdeleteProc\fR argument is non-NULL it specifies the address of a
-procedure to invoke if the interpreter is deleted before the association
-is deleted.  \fIDeleteProc\fR should have arguments and result that match
-the type \fBTcl_InterpDeleteProc\fR:
-.CS
-typedef void Tcl_InterpDeleteProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR);
-.CE
-When \fIdeleteProc\fR is invoked the \fIclientData\fR and \fIinterp\fR
-arguments will be the same as the corresponding arguments passed to
-\fBTcl_SetAssocData\fR.
-The deletion procedure will \fInot\fR be invoked if the association
-is deleted before the interpreter is deleted.
-.PP
-\fBTcl_GetAssocData\fR returns the datum stored in the association with the
-specified key in the given interpreter, and if the \fIdelProcPtr\fR field
-is non-\fBNULL\fR, the address indicated by it gets the address of the
-delete procedure stored with this association. If no association with the
-specified key exists in the given interpreter \fBTcl_GetAssocData\fR
-returns \fBNULL\fR.
-.PP
-\fBTcl_DeleteAssocData\fR deletes an association with a specified key in
-the given interpreter.  Then it calls the deletion procedure.
-.SH KEYWORDS
-association, data, deletion procedure, interpreter, key
diff --git a/doc/Async.3 b/doc/Async.3
deleted file mode 100644
index 5086557..0000000
--- a/doc/Async.3
+++ /dev/null
@@ -1,156 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Async.3,v 1.3 1999/04/16 00:46:30 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_AsyncCreate 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_AsyncCreate, Tcl_AsyncMark, Tcl_AsyncInvoke, Tcl_AsyncDelete, Tcl_AsyncReady \- handle asynchronous events
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_AsyncHandler
-\fBTcl_AsyncCreate\fR(\fIproc, clientData\fR)
-.sp
-\fBTcl_AsyncMark\fR(\fIasync\fR)
-.sp
-int
-\fBTcl_AsyncInvoke\fR(\fIinterp, code\fR)
-.sp
-\fBTcl_AsyncDelete\fR(\fIasync\fR)
-.sp
-int
-\fBTcl_AsyncReady\fR()
-.SH ARGUMENTS
-.AS Tcl_AsyncHandler clientData
-.AP Tcl_AsyncProc *proc in
-Procedure to invoke to handle an asynchronous event.
-.AP ClientData clientData in
-One-word value to pass to \fIproc\fR.
-.AP Tcl_AsyncHandler async in
-Token for asynchronous event handler.
-.AP Tcl_Interp *interp in
-Tcl interpreter in which command was being evaluated when handler was
-invoked, or NULL if handler was invoked when there was no interpreter
-active.
-.AP int code in
-Completion code from command that just completed in \fIinterp\fR,
-or 0 if \fIinterp\fR is NULL.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures provide a safe mechanism for dealing with
-asynchronous events such as signals.
-If an event such as a signal occurs while a Tcl script is being
-evaluated then it isn't safe to take any substantive action to
-process the event.
-For example, it isn't safe to evaluate a Tcl script since the
-interpreter may already be in the middle of evaluating a script;
-it may not even be safe to allocate memory, since a memory
-allocation could have been in progress when the event occurred.
-The only safe approach is to set a flag indicating that the event
-occurred, then handle the event later when the world has returned
-to a clean state, such as after the current Tcl command completes.
-.PP
-\fBTcl_AsyncCreate\fR creates an asynchronous handler and returns
-a token for it.
-The asynchronous handler must be created before
-any occurrences of the asynchronous event that it is intended
-to handle (it is not safe to create a handler at the time of
-an event).
-When an asynchronous event occurs the code that detects the event
-(such as a signal handler) should call \fBTcl_AsyncMark\fR with the
-token for the handler.
-\fBTcl_AsyncMark\fR will mark the handler as ready to execute, but it
-will not invoke the handler immediately.
-Tcl will call the \fIproc\fR associated with the handler later, when
-the world is in a safe state, and \fIproc\fR can then carry out
-the actions associated with the asynchronous event.
-\fIProc\fR should have arguments and result that match the
-type \fBTcl_AsyncProc\fR:
-.CS
-typedef int Tcl_AsyncProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	int \fIcode\fR);
-.CE
-The \fIclientData\fR will be the same as the \fIclientData\fR
-argument passed to \fBTcl_AsyncCreate\fR when the handler was
-created.
-If \fIproc\fR is invoked just after a command has completed
-execution in an interpreter, then \fIinterp\fR will identify
-the interpreter in which the command was evaluated and
-\fIcode\fR will be the completion code returned by that
-command.
-The command's result will be present in \fIinterp->result\fR.
-When \fIproc\fR returns, whatever it leaves in \fIinterp->result\fR
-will be returned as the result of the command and the integer
-value returned by \fIproc\fR will be used as the new completion
-code for the command.
-.PP
-It is also possible for \fIproc\fR to be invoked when no interpreter
-is active.
-This can happen, for example, if an asynchronous event occurs while
-the application is waiting for interactive input or an X event.
-In this case \fIinterp\fR will be NULL and \fIcode\fR will be
-0, and the return value from \fIproc\fR will be ignored.
-.PP
-The procedure \fBTcl_AsyncInvoke\fR is called to invoke all of the
-handlers that are ready.
-The procedure \fBTcl_AsyncReady\fR will return non-zero whenever any
-asynchronous handlers are ready;  it can be checked to avoid calls
-to \fBTcl_AsyncInvoke\fR when there are no ready handlers.
-Tcl calls \fBTcl_AsyncReady\fR after each command is evaluated
-and calls \fBTcl_AsyncInvoke\fR if needed.
-Applications may also call \fBTcl_AsyncInvoke\fR at interesting
-times for that application.
-For example, Tcl's event handler calls \fBTcl_AsyncReady\fR
-after each event and calls \fBTcl_AsyncInvoke\fR if needed.
-The \fIinterp\fR and \fIcode\fR arguments to \fBTcl_AsyncInvoke\fR
-have the same meaning as for \fIproc\fR:  they identify the active
-interpreter, if any, and the completion code from the command
-that just completed.
-.PP
-\fBTcl_AsyncDelete\fR removes an asynchronous handler so that
-its \fIproc\fR will never be invoked again.
-A handler can be deleted even when ready, and it will still
-not be invoked.
-.PP
-If multiple handlers become active at the same time, the
-handlers are invoked in the order they were created (oldest
-handler first).
-The \fIcode\fR and \fIinterp->result\fR for later handlers
-reflect the values returned by earlier handlers, so that
-the most recently created handler has last say about
-the interpreter's result and completion code.
-If new handlers become ready while handlers are executing,
-\fBTcl_AsyncInvoke\fR will invoke them all;  at each point it
-invokes the highest-priority (oldest) ready handler, repeating
-this over and over until there are no longer any ready handlers.
-
-.SH WARNING
-.PP
-It is almost always a bad idea for an asynchronous event
-handler to modify \fIinterp->result\fR or return a code different
-from its \fIcode\fR argument.
-This sort of behavior can disrupt the execution of scripts in
-subtle ways and result in bugs that are extremely difficult
-to track down.
-If an asynchronous event handler needs to evaluate Tcl scripts
-then it should first save \fIinterp->result\fR plus the values
-of the variables \fBerrorInfo\fR and \fBerrorCode\fR (this can
-be done, for example, by storing them in dynamic strings).
-When the asynchronous handler is finished it should restore
-\fIinterp->result\fR, \fBerrorInfo\fR, and \fBerrorCode\fR,
-and return the \fIcode\fR argument.
-
-.SH KEYWORDS
-asynchronous event, handler, signal
diff --git a/doc/BackgdErr.3 b/doc/BackgdErr.3
deleted file mode 100644
index 72d1530..0000000
--- a/doc/BackgdErr.3
+++ /dev/null
@@ -1,58 +0,0 @@
-'\"
-'\" Copyright (c) 1992-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: BackgdErr.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_BackgroundError 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_BackgroundError \- report Tcl error that occurred in background processing
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_BackgroundError\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-Interpreter in which the error occurred.
-.BE
-
-.SH DESCRIPTION
-.PP
-This procedure is typically invoked when a Tcl error occurs during
-``background processing'' such as executing an event handler.
-When such an error occurs, the error condition is reported to Tcl
-or to a widget or some other C code, and there is not usually any
-obvious way for that code to report the error to the user.
-In these cases the code calls \fBTcl_BackgroundError\fR with an
-\fIinterp\fR argument identifying the interpreter in which the
-error occurred.  At the time \fBTcl_BackgroundError\fR is invoked,
-\fIinterp->result\fR is expected to contain an error message.
-\fBTcl_BackgroundError\fR will invoke the \fBbgerror\fR
-Tcl command to report the error in an application-specific fashion.
-If no \fBbgerror\fR command exists, or if it returns with an error condition,
-then \fBTcl_BackgroundError\fR reports the error itself by printing
-a message on the standard error file.
-.PP
-\fBTcl_BackgroundError\fR does not invoke \fBbgerror\fR immediately
-because this could potentially interfere with scripts that are in process
-at the time the error occurred.
-Instead, it invokes \fBbgerror\fR later as an idle callback.
-\fBTcl_BackgroundError\fR saves the values of the \fBerrorInfo\fR and
-\fBerrorCode\fR variables and restores these values just before
-invoking \fBbgerror\fR.
-.PP
-It is possible for many background errors to accumulate before
-\fBbgerror\fR is invoked.  When this happens, each of the errors
-is processed in order.  However, if \fBbgerror\fR returns a
-break exception, then all remaining error reports for the
-interpreter are skipped.
-
-.SH KEYWORDS
-background, bgerror, error
diff --git a/doc/Backslash.3 b/doc/Backslash.3
deleted file mode 100644
index 95fc7e8..0000000
--- a/doc/Backslash.3
+++ /dev/null
@@ -1,53 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Backslash.3,v 1.3 1999/04/16 00:46:30 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Backslash 3 "8.1" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Backslash \- parse a backslash sequence
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char
-\fBTcl_Backslash\fR(\fIsrc, countPtr\fR)
-.SH ARGUMENTS
-.AS char *countPtr
-.AP char *src in
-Pointer to a string starting with a backslash.
-.AP int *countPtr out
-If \fIcountPtr\fR isn't NULL, \fI*countPtr\fR gets filled
-in with number of characters in the backslash sequence, including
-the backslash character.
-.BE
-
-.SH DESCRIPTION
-.PP
-.VS 8.1
-The use of \fBTcl_Backslash\fR is deprecated in favor of
-\fBTcl_UtfBackslash\fR.
-.PP
-This is a utility procedure provided for backwards compatibilty with
-non-internationalized Tcl extensions.  It parses a backslash sequence and
-returns the low byte of the Unicode character corresponding to the sequence. 
-.VE
-\fBTcl_Backslash\fR modifies \fI*countPtr\fR to contain the number of
-characters in the backslash sequence.
-.PP
-See the Tcl manual entry for information on the valid backslash sequences.
-All of the sequences described in the Tcl manual entry are supported by
-\fBTcl_Backslash\fR.
-.VS 8.1 br
-.SH "SEE ALSO"
-Tcl(n), Tcl_UtfBackslash(3)
-.VE
-
-.SH KEYWORDS
-backslash, parse
diff --git a/doc/BoolObj.3 b/doc/BoolObj.3
deleted file mode 100644
index 2306350..0000000
--- a/doc/BoolObj.3
+++ /dev/null
@@ -1,83 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: BoolObj.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_BooleanObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewBooleanObj, Tcl_SetBooleanObj, Tcl_GetBooleanFromObj \- manipulate Tcl objects as boolean values
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewBooleanObj\fR(\fIboolValue\fR)
-.sp
-\fBTcl_SetBooleanObj\fR(\fIobjPtr, boolValue\fR)
-.sp
-int
-\fBTcl_GetBooleanFromObj\fR(\fIinterp, objPtr, boolPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP int boolValue in
-Integer value used to initialize or set a boolean object.
-If the integer is nonzero, the boolean object is set to 1;
-otherwise the boolean object is set to 0.
-.AP Tcl_Obj *objPtr in/out
-For \fBTcl_SetBooleanObj\fR, this points to the object to be converted
-to boolean type.
-For \fBTcl_GetBooleanFromObj\fR, this refers to the object
-from which to get a boolean value; 
-if \fIobjPtr\fR does not already point to a boolean object,
-an attempt will be made to convert it to one.
-.AP Tcl_Interp *interp in/out
-If an error occurs during conversion,
-an error message is left in the interpreter's result object
-unless \fIinterp\fR is NULL.
-.AP int *boolPtr out
-Points to place where \fBTcl_GetBooleanFromObj\fR
-stores the boolean value (0 or 1) obtained from \fIobjPtr\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to create, modify, and read
-boolean Tcl objects from C code.
-\fBTcl_NewBooleanObj\fR and \fBTcl_SetBooleanObj\fR
-will create a new object of boolean type
-or modify an existing object to have boolean type. 
-Both of these procedures set the object to have the
-boolean value (0 or 1) specified by \fIboolValue\fR;
-if \fIboolValue\fR is nonzero, the object is set to 1,
-otherwise to 0.
-\fBTcl_NewBooleanObj\fR returns a pointer to a newly created object
-with reference count zero.
-Both procedures set the object's type to be boolean
-and assign the boolean value to the object's internal representation
-\fIlongValue\fR member.
-\fBTcl_SetBooleanObj\fR invalidates any old string representation
-and, if the object is not already a boolean object,
-frees any old internal representation.
-.PP
-\fBTcl_GetBooleanFromObj\fR attempts to return a boolean value
-from the Tcl object \fIobjPtr\fR.
-If the object is not already a boolean object,
-it will attempt to convert it to one.
-If an error occurs during conversion, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-unless \fIinterp\fR is NULL.
-Otherwise, \fBTcl_GetBooleanFromObj\fR returns \fBTCL_OK\fR
-and stores the boolean value in the address given by \fIboolPtr\fR.
-If the object is not already a boolean object,
-the conversion will free any old internal representation.
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
-
-.SH KEYWORDS
-boolean, boolean object, boolean type, internal representation, object, object type, string representation
diff --git a/doc/ByteArrObj.3 b/doc/ByteArrObj.3
deleted file mode 100644
index b3ed34f..0000000
--- a/doc/ByteArrObj.3
+++ /dev/null
@@ -1,91 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ByteArrObj.3,v 1.2 1999/03/03 00:38:36 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ByteArrayObj 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewByteArrayObj, Tcl_SetByteArrayObj, Tcl_GetByteArrayFromObj, Tcl_SetByteArrayLength \- manipulate Tcl objects as a arrays of bytes 
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewByteArrayObj\fR(\fIbytes, length\fR)
-.sp
-void 
-\fBTcl_SetByteArrayObj\fR(\fIobjPtr, bytes, length\fR)
-.sp
-unsigned char *
-\fBTcl_GetByteArrayFromObj\fR(\fIobjPtr, lengthPtr\fR)
-.sp
-unsigned char *
-\fBTcl_SetByteArrayLength\fR(\fIobjPtr, length\fR)
-.SH ARGUMENTS
-.AS "unsigned char" *lengthPtr in/out
-.AP "unsigned char" *bytes in
-The array of bytes used to initialize or set a byte-array object.
-.AP int length in
-The length of the array of bytes.  It must be >= 0.
-.AP Tcl_Obj *objPtr in/out
-For \fBTcl_SetByteArrayObj\fR, this points to the object to be converted to
-byte-array type.  For \fBTcl_GetByteArrayFromObj\fR and
-\fBTcl_SetByteArrayLength\fR, this points to the object from which to get
-the byte-array value; if \fIobjPtr\fR does not already point to a byte-array
-object, it will be converted to one.
-.AP int *lengthPtr out
-If non-NULL, filled with the length of the array of bytes in the object.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to create, modify, and read Tcl byte-array objects
-from C code.  Byte-array objects are typically used to hold the
-results of binary IO operations or data structures created with the
-\fBbinary\fR command.  In Tcl, an array of bytes is not equivalent to a
-string.  Conceptually, a string is an array of Unicode characters, while a
-byte-array is an array of 8-bit quantities with no implicit meaning.
-Accesser functions are provided to get the string representation of a
-byte-array or to convert an arbitrary object to a byte-array.  Obtaining the
-string representation of a byte-array object (by calling
-\fBTcl_GetStringFromObj\fR) produces a properly formed UTF-8 sequence with a
-one-to-one mapping between the bytes in the internal representation and the
-UTF-8 characters in the string representation.  
-.PP
-\fBTcl_NewByteArrayObj\fR and \fBTcl_SetByteArrayObj\fR will
-create a new object of byte-array type or modify an existing object to have a
-byte-array type.  Both of these procedures set the object's type to be
-byte-array and set the object's internal representation to a copy of the
-array of bytes given by \fIbytes\fR. \fBTcl_NewByteArrayObj\fR returns a
-pointer to a newly allocated object with a reference count of zero.
-\fBTcl_SetByteArrayObj\fR invalidates any old string representation and, if
-the object is not already a byte-array object, frees any old internal
-representation.
-.PP
-\fBTcl_GetByteArrayFromObj\fR converts a Tcl object to byte-array type and
-returns a pointer to the object's new internal representation as an array of
-bytes.  The length of this array is stored in \fIlengthPtr\fR if
-\fIlengthPtr\fR is non-NULL.  The storage for the array of bytes is owned by
-the object and should not be freed.  The contents of the array may be
-modified by the caller only if the object is not shared and the caller
-invalidates the string representation.  
-.PP
-\fBTcl_SetByteArrayLength\fR converts the Tcl object to byte-array type
-and changes the length of the object's internal representation as an
-array of bytes.  If \fIlength\fR is greater than the space currently
-allocated for the array, the array is reallocated to the new length; the
-newly allocated bytes at the end of the array have arbitrary values.  If
-\fIlength\fR is less than the space currently allocated for the array,
-the length of array is reduced to the new length.  The return value is a
-pointer to the object's new array of bytes.  
-
-.SH "SEE ALSO"
-Tcl_GetStringFromObj, Tcl_NewObj, Tcl_IncrRefCount, Tcl_DecrRefCount
-
-.SH KEYWORDS
-object, byte array, utf, unicode, internationalization
diff --git a/doc/CallDel.3 b/doc/CallDel.3
deleted file mode 100644
index 089a922..0000000
--- a/doc/CallDel.3
+++ /dev/null
@@ -1,63 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CallDel.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CallWhenDeleted 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CallWhenDeleted, Tcl_DontCallWhenDeleted \- Arrange for callback when interpreter is deleted
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_CallWhenDeleted\fR(\fIinterp\fR, \fIproc\fR, \fIclientData\fR)
-.sp
-\fBTcl_DontCallWhenDeleted\fR(\fIinterp\fR, \fIproc\fR, \fIclientData\fR)
-.SH ARGUMENTS
-.AS Tcl_InterpDeleteProc clientData
-.AP Tcl_Interp *interp in
-Interpreter with which to associated callback.
-.AP Tcl_InterpDeleteProc *proc in
-Procedure to call when \fIinterp\fR is deleted.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CallWhenDeleted\fR arranges for \fIproc\fR to be called by
-\fBTcl_DeleteInterp\fR if/when \fIinterp\fR is deleted at some future
-time.  \fIProc\fR will be invoked just before the interpreter
-is deleted, but the interpreter will still be valid at the
-time of the call.
-\fIProc\fR should have arguments and result that match the
-type \fBTcl_InterpDeleteProc\fR:
-.CS
-typedef void Tcl_InterpDeleteProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR);
-.CE
-The \fIclientData\fR and \fIinterp\fR parameters are
-copies of the \fIclientData\fR and \fIinterp\fR arguments given
-to \fBTcl_CallWhenDeleted\fR.
-Typically, \fIclientData\fR points to an application-specific
-data structure that \fIproc\fR uses to perform cleanup when an
-interpreter is about to go away.
-\fIProc\fR does not return a value.
-.PP
-\fBTcl_DontCallWhenDeleted\fR cancels a previous call to
-\fBTcl_CallWhenDeleted\fR with the same arguments, so that
-\fIproc\fR won't be called after all when \fIinterp\fR is
-deleted.
-If there is no deletion callback that matches \fIinterp\fR,
-\fIproc\fR, and \fIclientData\fR then the call to
-\fBTcl_DontCallWhenDeleted\fR has no effect.
-
-.SH KEYWORDS
-callback, delete, interpreter
diff --git a/doc/CmdCmplt.3 b/doc/CmdCmplt.3
deleted file mode 100644
index b7effed..0000000
--- a/doc/CmdCmplt.3
+++ /dev/null
@@ -1,36 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CmdCmplt.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CommandComplete 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CommandComplete \- Check for unmatched braces in a Tcl command
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_CommandComplete\fR(\fIcmd\fR)
-.SH ARGUMENTS
-.AS char *cmd
-.AP char *cmd in
-Command string to test for completeness.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CommandComplete\fR takes a Tcl command string
-as argument and determines whether it contains one or more
-complete commands (i.e. there are no unclosed quotes, braces,
-brackets, or variable references).
-If the command string is complete then it returns 1; otherwise it returns 0.
-
-.SH KEYWORDS
-complete command, partial command
diff --git a/doc/Concat.3 b/doc/Concat.3
deleted file mode 100644
index edebc01..0000000
--- a/doc/Concat.3
+++ /dev/null
@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Concat.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Concat 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Concat \- concatenate a collection of strings
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_Concat\fR(\fIargc, argv\fR)
-.SH ARGUMENTS
-.AP int argc in
-Number of strings.
-.AP char *argv[] in
-Array of strings to concatenate.  Must have \fIargc\fR entries.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_Concat\fR is a utility procedure used by several of the
-Tcl commands.  Given a collection of strings, it concatenates
-them together into a single string, with the original strings
-separated by spaces.  This procedure behaves differently than
-\fBTcl_Merge\fR, in that the arguments are simply concatenated:
-no effort is made to ensure proper list structure.
-However, in most common usage the arguments will all be proper
-lists themselves;  if this is true, then the result will also have
-proper list structure.
-.PP
-\fBTcl_Concat\fR eliminates leading and trailing white space as it
-copies strings from \fBargv\fR to the result.  If an element of
-\fBargv\fR consists of nothing but white space, then that string
-is ignored entirely.  This white-space removal was added to make
-the output of the \fBconcat\fR command cleaner-looking.
-.PP
-.VS
-The result string is dynamically allocated
-using \fBTcl_Alloc\fR;  the caller must eventually release the space
-by calling \fBTcl_Free\fR.
-.VE
-.VS
-.SH "SEE ALSO"
-Tcl_ConcatObj
-.SH KEYWORDS
-concatenate, strings
diff --git a/doc/CrtChannel.3 b/doc/CrtChannel.3
deleted file mode 100644
index dc0f91b..0000000
--- a/doc/CrtChannel.3
+++ /dev/null
@@ -1,592 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: CrtChannel.3,v 1.3 1999/04/16 00:46:30 stanton Exp $
-.so man.macros
-.TH Tcl_CreateChannel 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_CreateChannel, Tcl_GetChannelInstanceData, Tcl_GetChannelType, Tcl_GetChannelName, Tcl_GetChannelHandle, Tcl_GetChannelMode, Tcl_GetChannelBufferSize, Tcl_SetChannelBufferSize, Tcl_NotifyChannel, Tcl_BadChannelOption \- procedures for creating and manipulating channels
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Channel
-\fBTcl_CreateChannel\fR(\fItypePtr, channelName, instanceData, mask\fR)
-.sp
-ClientData
-\fBTcl_GetChannelInstanceData\fR(\fIchannel\fR)
-.sp
-Tcl_ChannelType *
-\fBTcl_GetChannelType\fR(\fIchannel\fR)
-.sp
-char *
-\fBTcl_GetChannelName\fR(\fIchannel\fR)
-.VS
-.sp
-int
-\fBTcl_GetChannelHandle\fR(\fIchannel, direction, handlePtr\fR)
-.VE
-.sp
-int
-\fBTcl_GetChannelBufferSize\fR(\fIchannel\fR)
-.sp
-\fBTcl_SetChannelBufferSize\fR(\fIchannel, size\fR)
-.sp
-.VS
-\fBTcl_NotifyChannel\fR(\fIchannel, mask\fR)
-.sp
-int
-\fBTcl_BadChannelOption\fR(\fIinterp, optionName, optionList\fR)
-.VE
-.sp
-.SH ARGUMENTS
-.AS Tcl_EolTranslation *channelName in
-.AP Tcl_ChannelType *typePtr in
-Points to a structure containing the addresses of procedures that
-can be called to perform I/O and other functions on the channel.
-.AP char *channelName in
-The name of this channel, such as \fBfile3\fR; must not be in use
-by any other channel. Can be NULL, in which case the channel is
-created without a name.
-.AP ClientData instanceData in
-Arbitrary one-word value to be associated with this channel.  This
-value is passed to procedures in \fItypePtr\fR when they are invoked.
-.AP int mask in
-OR-ed combination of \fBTCL_READABLE\fR and \fBTCL_WRITABLE\fR to indicate
-whether a channel is readable and writable.
-.AP Tcl_Channel channel in
-The channel to operate on.
-.VS
-.AP int direction in
-\fBTCL_READABLE\fR means the input handle is wanted; \fBTCL_WRITABLE\fR
-means the output handle is wanted.
-.AP ClientData *handlePtr out
-Points to the location where the desired OS-specific handle should be
-stored.
-.VE
-.AP Tcl_EolTranslation transMode in
-The translation mode; one of the constants \fBTCL_TRANSLATE_AUTO\fR,
-\fBTCL_TRANSLATE_CR\fR, \fBTCL_TRANSLATE_LF\fR and \fBTCL_TRANSLATE_CRLF\fR.
-.AP int size in
-The size, in bytes, of buffers to allocate in this channel.
-.VS
-.AP int mask in
-An OR-ed combination of \fBTCL_READABLE\fR, \fBTCL_WRITABLE\fR
-and \fBTCL_EXCEPTION\fR that indicates events that have occurred on
-this channel.
-.AP Tcl_Interp *interp in
-Current interpreter. (can be NULL)
-.AP char *optionName in
-Name of the invalid option.
-.AP char *optionList in
-Specific options list (space separated words, without "-") 
-to append to the standard generic options list.
-Can be NULL for generic options error message only.
-.VE
-
-.BE
-
-.SH DESCRIPTION
-.PP
-Tcl uses a two-layered channel architecture. It provides a generic upper
-layer to enable C and Tcl programs to perform input and output using the
-same APIs for a variety of files, devices, sockets etc. The generic C APIs
-are described in the manual entry for \fBTcl_OpenFileChannel\fR.
-.PP
-The lower layer provides type-specific channel drivers for each type
-of device supported on each platform.  This manual entry describes the
-C APIs used to communicate between the generic layer and the
-type-specific channel drivers.  It also explains how new types of
-channels can be added by providing new channel drivers.
-.PP
-Channel drivers consist of a number of components: First, each channel
-driver provides a \fBTcl_ChannelType\fR structure containing pointers to
-functions implementing the various operations used by the generic layer to
-communicate with the channel driver. The \fBTcl_ChannelType\fR structure
-and the functions referenced by it are described in the section
-TCL_CHANNELTYPE, below.
-.PP
-Second, channel drivers usually provide a Tcl command to create
-instances of that type of channel. For example, the Tcl \fBopen\fR
-command creates channels that use the file and command channel
-drivers, and the Tcl \fBsocket\fR command creates channels that use
-TCP sockets for network communication.
-.PP
-Third, a channel driver optionally provides a C function to open
-channel instances of that type. For example, \fBTcl_OpenFileChannel\fR
-opens a channel that uses the file channel driver, and
-\fBTcl_OpenTcpClient\fR opens a channel that uses the TCP network
-protocol.  These creation functions typically use
-\fBTcl_CreateChannel\fR internally to open the channel.
-.PP
-To add a new type of channel you must implement a C API or a Tcl command
-that opens a channel by invoking \fBTcl_CreateChannel\fR.
-When your driver calls \fBTcl_CreateChannel\fR it passes in
-a \fBTcl_ChannelType\fR structure describing the driver's I/O
-procedures.
-The generic layer will then invoke the functions referenced in that
-structure to perform operations on the channel.
-.PP
-\fBTcl_CreateChannel\fR opens a new channel and associates the supplied
-\fItypePtr\fR and \fIinstanceData\fR with it. The channel is opened in the
-mode indicated by \fImask\fR.
-For a discussion of channel drivers, their operations and the
-\fBTcl_ChannelType\fR structure, see the section TCL_CHANNELTYPE, below.
-.PP
-\fBTcl_GetChannelInstanceData\fR returns the instance data associated with
-the channel in \fIchannel\fR. This is the same as the \fIinstanceData\fR
-argument in the call to \fBTcl_CreateChannel\fR that created this channel.
-.PP
-\fBTcl_GetChannelType\fR returns a pointer to the \fBTcl_ChannelType\fR
-structure used by the channel in the \fIchannel\fR argument. This is
-the same as the \fItypePtr\fR argument in the call to
-\fBTcl_CreateChannel\fR that created this channel.
-.PP
-\fBTcl_GetChannelName\fR returns a string containing the name associated
-with the channel, or NULL if the \fIchannelName\fR argument to
-\fBTcl_CreateChannel\fR was NULL.
-.PP
-.VS
-\fBTcl_GetChannelHandle\fR places the OS-specific device handle
-associated with \fIchannel\fR for the given \fIdirection\fR in the
-location specified by \fIhandlePtr\fR and returns \fBTCL_OK\fR.  If
-the channel does not have a device handle for the specified direction,
-then \fBTCL_ERROR\fR is returned instead.  Different channel drivers
-will return different types of handle.  Refer to the manual entries
-for each driver to determine what type of handle is returned.
-.VE
-.PP
-\fBTcl_GetChannelMode\fR returns an OR-ed combination of \fBTCL_READABLE\fR
-and \fBTCL_WRITABLE\fR, indicating whether the channel is open for input
-and output.
-.PP
- \fBTcl_GetChannelBufferSize\fR returns the size, in bytes, of buffers
-allocated to store input or output in \fIchan\fR. If the value was not set
-by a previous call to \fBTcl_SetChannelBufferSize\fR, described below, then
-the default value of 4096 is returned.
-.PP
-\fBTcl_SetChannelBufferSize\fR sets the size, in bytes, of buffers that
-will be allocated in subsequent operations on the channel to store input or
-output. The \fIsize\fR argument should be between ten and one million,
-allowing buffers of ten bytes to one million bytes. If \fIsize\fR is
-outside this range, \fBTcl_SetChannelBufferSize\fR sets the buffer size to
-4096.
-.PP
-.VS
-\fBTcl_NotifyChannel\fR is called by a channel driver to indicate to
-the generic layer that the events specified by \fImask\fR have
-occurred on the channel.  Channel drivers are responsible for invoking
-this function whenever the channel handlers need to be called for the
-channel.  See \fBWATCHPROC\fR below for more details.
-.VE
-.PP
-.VS
-\fBTcl_BadChannelOption\fR is called from driver specific set or get option
-procs to generate a complete error message.
-.VE
-
-.SH TCL_CHANNELTYPE
-.PP
-A channel driver provides a \fBTcl_ChannelType\fR structure that contains
-pointers to functions that implement the various operations on a channel;
-these operations are invoked as needed by the generic layer. The
-\fBTcl_ChannelType\fR structure contains the following fields:
-.PP
-.VS
-.CS
-typedef struct Tcl_ChannelType {
-	char *\fItypeName\fR;
-	Tcl_DriverBlockModeProc *\fIblockModeProc\fR;	
-	Tcl_DriverCloseProc *\fIcloseProc\fR;
-	Tcl_DriverInputProc *\fIinputProc\fR;
-	Tcl_DriverOutputProc *\fIoutputProc\fR;
-	Tcl_DriverSeekProc *\fIseekProc\fR;
-	Tcl_DriverSetOptionProc *\fIsetOptionProc\fR;
-	Tcl_DriverGetOptionProc *\fIgetOptionProc\fR;
-	Tcl_DriverWatchProc *\fIwatchProc\fR;
-	Tcl_DriverGetHandleProc *\fIgetHandleProc\fR;
-	Tcl_DriverClose2Proc *\fIclose2Proc\fR;
-} Tcl_ChannelType;
-.CE
-.VE
-.PP
-The driver must provide implementations for all functions except
-\fIblockModeProc\fR, \fIseekProc\fR, \fIsetOptionProc\fR,
-.VS
-\fIgetOptionProc\fR, and \fIclose2Proc\fR, which may be specified as
-.VE
-NULL.  Other functions that can not be implemented for this type of
-device should return \fBEINVAL\fR when invoked to indicate that they
-are not implemented.
-
-.SH TYPENAME
-.PP
-The \fItypeName\fR field contains a null-terminated string that
-identifies the type of the device implemented by this driver, e.g.
-\fBfile\fR or \fBsocket\fR.
-
-.SH BLOCKMODEPROC
-.PP
-The \fIblockModeProc\fR field contains the address of a function called by
-the generic layer to set blocking and nonblocking mode on the device.
-\fIBlockModeProc\fR should match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverBlockModeProc(
-	ClientData \fIinstanceData\fR,
-	int \fImode\fR);
-.CE
-.PP
-The \fIinstanceData\fR is the same as the value passed to
-\fBTcl_CreateChannel\fR when this channel was created.  The \fImode\fR
-argument is either \fBTCL_MODE_BLOCKING\fR or \fBTCL_MODE_NONBLOCKING\fR to
-set the device into blocking or nonblocking mode. The function should
-return zero if the operation was successful, or a nonzero POSIX error code
-if the operation failed.
-.PP
-If the operation is successful, the function can modify the supplied
-\fIinstanceData\fR to record that the channel entered blocking or
-nonblocking mode and to implement the blocking or nonblocking behavior.
-For some device types, the blocking and nonblocking behavior can be
-implemented by the underlying operating system; for other device types, the
-behavior must be emulated in the channel driver.
-
-.SH CLOSEPROC AND CLOSE2PROC
-.PP
-The \fIcloseProc\fR field contains the address of a function called by the
-generic layer to clean up driver-related information when the channel is
-closed. \fICloseProc\fR must match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverCloseProc(
-	ClientData \fIinstanceData\fR,
-	Tcl_Interp *\fIinterp\fR);
-.CE
-.PP
-The \fIinstanceData\fR argument is the same as the value provided to
-\fBTcl_CreateChannel\fR when the channel was created. The function should
-release any storage maintained by the channel driver for this channel, and
-close the input and output devices encapsulated by this channel. All queued
-output will have been flushed to the device before this function is called,
-and no further driver operations will be invoked on this instance after
-calling the \fIcloseProc\fR. If the close operation is successful, the
-procedure should return zero; otherwise it should return a nonzero POSIX
-error code. In addition, if an error occurs and \fIinterp\fR is not NULL,
-the procedure should store an error message in \fIinterp->result\fR.
-.PP
-.VS
-Alternatively, channels that support closing the read and write sides
-independently may set \fIcloseProc\fR to \fBTCL_CLOSE2PROC\fR and set
-\fIclose2Proc\fR to the address of a function that matches the
-following prototype:
-.PP
-.CS
-typedef int Tcl_DriverClose2Proc(
-	ClientData \fIinstanceData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	int \fIflags\fR);
-.CE
-.PP
-The \fIclose2Proc\fR will be called with \fIflags\fR set to an OR'ed
-combination of \fBTCL_CLOSE_READ\fR or \fBTCL_CLOSE_WRITE\fR to
-indicate that the driver should close the read and/or write side of
-the channel.  The channel driver may be invoked to perform
-additional operations on the channel after \fIclose2Proc\fR is
-called to close one or both sides of the channel.  If \fIflags\fR is
-\fB0\fR (zero), the driver should close the channel in the manner
-described above for \fIcloseProc\fR.  No further operations will be
-invoked on this instance after \fIclose2Proc\fR is called with all
-flags cleared.  In all cases, the \fIclose2Proc\fR function should
-return zero if the close operation was successful; otherwise it should
-return a nonzero POSIX error code. In addition, if an error occurs and
-\fIinterp\fR is not NULL, the procedure should store an error message
-in \fIinterp->result\fR.
-.VE
-
-.SH INPUTPROC
-.PP
-The \fIinputProc\fR field contains the address of a function called by the
-generic layer to read data from the file or device and store it in an
-internal buffer. \fIInputProc\fR must match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverInputProc(
-	ClientData \fIinstanceData\fR,
-	char *\fIbuf\fR,
-	int \fIbufSize\fR,
-	int *\fIerrorCodePtr\fR);
-.CE
-.PP
-\fIInstanceData\fR is the same as the value passed to
-\fBTcl_CreateChannel\fR when the channel was created.  The \fIbuf\fR
-argument points to an array of bytes in which to store input from the
-device, and the \fIbufSize\fR argument indicates how many bytes are
-available at \fIbuf\fR.
-.PP
-The \fIerrorCodePtr\fR argument points to an integer variable provided by
-the generic layer. If an error occurs, the function should set the variable
-to a POSIX error code that identifies the error that occurred.
-.PP
-The function should read data from the input device encapsulated by the
-channel and store it at \fIbuf\fR.  On success, the function should return
-a nonnegative integer indicating how many bytes were read from the input
-device and stored at \fIbuf\fR. On error, the function should return -1. If
-an error occurs after some data has been read from the device, that data is
-lost.
-.PP
-If \fIinputProc\fR can determine that the input device has some data
-available but less than requested by the \fIbufSize\fR argument, the
-function should only attempt to read as much data as is available and
-return without blocking. If the input device has no data available
-whatsoever and the channel is in nonblocking mode, the function should
-return an \fBEAGAIN\fR error. If the input device has no data available
-whatsoever and the channel is in blocking mode, the function should block
-for the shortest possible time until at least one byte of data can be read
-from the device; then, it should return as much data as it can read without
-blocking.
-
-.SH OUTPUTPROC
-.PP
-The \fIoutputProc\fR field contains the address of a function called by the
-generic layer to transfer data from an internal buffer to the output device.
-\fIOutputProc\fR must match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverOutputProc(
-	ClientData \fIinstanceData\fR,
-	char *\fIbuf\fR,
-	int \fItoWrite\fR,
-	int *\fIerrorCodePtr\fR);
-.CE
-.PP
-\fIInstanceData\fR is the same as the value passed to
-\fBTcl_CreateChannel\fR when the channel was created. The \fIbuf\fR
-argument contains an array of bytes to be written to the device, and the
-\fItoWrite\fR argument indicates how many bytes are to be written from the
-\fIbuf\fR argument.
-.PP
-The \fIerrorCodePtr\fR argument points to an integer variable provided by
-the generic layer. If an error occurs, the function should set this
-variable to a POSIX error code that identifies the error.
-.PP
-The function should write the data at \fIbuf\fR to the output device
-encapsulated by the channel. On success, the function should return a
-nonnegative integer indicating how many bytes were written to the output
-device.  The return value is normally the same as \fItoWrite\fR, but may be
-less in some cases such as if the output operation is interrupted by a
-signal. If an error occurs the function should return -1.  In case of
-error, some data may have been written to the device.
-.PP
-If the channel is nonblocking and the output device is unable to absorb any
-data whatsoever, the function should return -1 with an \fBEAGAIN\fR error
-without writing any data.
-
-.SH SEEKPROC
-.PP
-The \fIseekProc\fR field contains the address of a function called by the
-generic layer to move the access point at which subsequent input or output
-operations will be applied. \fISeekProc\fR must match the following
-prototype:
-.PP
-.CS
-typedef int Tcl_DriverSeekProc(
-	ClientData \fIinstanceData\fR,
-	long \fIoffset\fR,
-	int \fIseekMode\fR,
-	int *\fIerrorCodePtr\fR);
-.CE
-.PP
-The \fIinstanceData\fR argument is the same as the value given to
-\fBTcl_CreateChannel\fR when this channel was created.  \fIOffset\fR and
-\fIseekMode\fR have the same meaning as for the \fBTcl_Seek\fR
-procedure (described in the manual entry for \fBTcl_OpenFileChannel\fR).
-.PP
-The \fIerrorCodePtr\fR argument points to an integer variable provided by
-the generic layer for returning \fBerrno\fR values from the function.  The
-function should set this variable to a POSIX error code if an error occurs.
-The function should store an \fBEINVAL\fR error code if the channel type
-does not implement seeking.
-.PP
-The return value is the new access point or -1 in case of error. If an
-error occurred, the function should not move the access point.
-
-.SH SETOPTIONPROC
-.PP
-The \fIsetOptionProc\fR field contains the address of a function called by
-the generic layer to set a channel type specific option on a channel.
-\fIsetOptionProc\fR must match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverSetOptionProc(
-	ClientData \fIinstanceData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	char *\fIoptionName\fR,
-	char *\fIoptionValue\fR);
-.CE
-.PP
-\fIoptionName\fR is the name of an option to set, and \fIoptionValue\fR is
-the new value for that option, as a string. The \fIinstanceData\fR is the
-same as the value given to \fBTcl_CreateChannel\fR when this channel was
-created. The function should do whatever channel type specific action is
-required to implement the new value of the option.
-.PP
-Some options are handled by the generic code and this function is never
-called to set them, e.g. \fB-blockmode\fR. Other options are specific to
-each channel type and the \fIsetOptionProc\fR procedure of the channel
-driver will get called to implement them. The \fIsetOptionProc\fR field can
-be NULL, which indicates that this channel type supports no type specific
-options. 
-.PP
-If the option value is successfully modified to the new value, the function
-returns \fBTCL_OK\fR.
-.VS
-It should call \fBTcl_BadChannelOption\fR which itself returns
-\fBTCL_ERROR\fR if the \fIoptionName\fR is
-unrecognized. 
-.VE
-If \fIoptionValue\fR specifies a value for the option that
-is not supported or if a system call error occurs,
-the function should leave an error message in the
-\fIresult\fR field of \fIinterp\fR if \fIinterp\fR is not NULL. The
-function should also call \fBTcl_SetErrno\fR to store an appropriate POSIX
-error code.
-
-.SH GETOPTIONPROC
-.PP
-The \fIgetOptionProc\fR field contains the address of a function called by
-the generic layer to get the value of a channel type specific option on a
-channel. \fIgetOptionProc\fR must match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverGetOptionProc(
-	ClientData \fIinstanceData\fR,
-.VS
-	Tcl_Interp *\fIinterp\fR,
-.VE
-	char *\fIoptionName\fR,
-	Tcl_DString *\fIdsPtr\fR);
-.CE
-.PP
-\fIOptionName\fR is the name of an option supported by this type of
-channel. If the option name is not NULL, the function stores its current
-value, as a string, in the Tcl dynamic string \fIdsPtr\fR.
-If \fIoptionName\fR is NULL, the function stores in \fIdsPtr\fR an
-alternating list of all supported options and their current values.
-On success, the function returns \fBTCL_OK\fR. 
-.VS
-It should call \fBTcl_BadChannelOption\fR which itself returns
-\fBTCL_ERROR\fR if the \fIoptionName\fR is
-unrecognized. If a system call error occurs,
-the function should leave an error message in the
-\fIresult\fR field of \fIinterp\fR if \fIinterp\fR is not NULL. The
-function should also call \fBTcl_SetErrno\fR to store an appropriate POSIX
-error code.
-.VE
-.PP
-Some options are handled by the generic code and this function is never
-called to retrieve their value, e.g. \fB-blockmode\fR. Other options are
-specific to each channel type and the \fIgetOptionProc\fR procedure of the
-channel driver will get called to implement them. The \fIgetOptionProc\fR
-field can be NULL, which indicates that this channel type supports no type
-specific options.
-
-.SH WATCHPROC
-.VS
-.PP
-The \fIwatchProc\fR field contains the address of a function called
-by the generic layer to initialize the event notification mechanism to
-notice events of interest on this channel.
-\fIWatchProc\fR should match the following prototype:
-.PP
-.CS
-typedef void Tcl_DriverWatchProc(
-	ClientData \fIinstanceData\fR,
-	int \fImask\fR);
-.CE
-.VE
-.PP
-The \fIinstanceData\fR is the same as the value passed to
-\fBTcl_CreateChannel\fR when this channel was created. The \fImask\fR
-argument is an OR-ed combination of \fBTCL_READABLE\fR, \fBTCL_WRITABLE\fR
-and \fBTCL_EXCEPTION\fR; it indicates events the caller is interested in
-noticing on this channel.
-.PP
-.VS
-The function should initialize device type specific mechanisms to
-notice when an event of interest is present on the channel.  When one
-or more of the designated events occurs on the channel, the channel
-driver is responsible for calling \fBTcl_NotifyChannel\fR to inform
-the generic channel module.  The driver should take care not to starve
-other channel drivers or sources of callbacks by invoking
-Tcl_NotifyChannel too frequently.  Fairness can be insured by using
-the Tcl event queue to allow the channel event to be scheduled in sequence
-with other events.  See the description of \fBTcl_QueueEvent\fR for
-details on how to queue an event.
-
-.SH GETHANDLEPROC
-.PP
-The \fIgetHandleProc\fR field contains the address of a function called by
-the generic layer to retrieve a device-specific handle from the channel.
-\fIGetHandleProc\fR should match the following prototype:
-.PP
-.CS
-typedef int Tcl_DriverGetHandleProc(
-	ClientData \fIinstanceData\fR,
-	int \fIdirection\fR,
-	ClientData *\fIhandlePtr\fR);
-.CE
-.PP
-\fIInstanceData is the same as the value passed to
-\fBTcl_CreateChannel\fR when this channel was created. The \fIdirection\fR
-argument is either \fBTCL_READABLE\fR to retrieve the handle used
-for input, or \fBTCL_WRITABLE\fR to retrieve the handle used for
-output.
-.PP
-If the channel implementation has device-specific handles, the
-function should retrieve the appropriate handle associated with the
-channel, according the \fIdirection\fR argument.  The handle should be
-stored in the location referred to by \fIhandlePtr\fR, and
-\fBTCL_OK\fR should be returned.  If the channel is not open for the
-specified direction, or if the channel implementation does not use
-device handles, the function should return \fBTCL_ERROR\fR.
-.VE
-
-.VS
-.SH TCL_BADCHANNELOPTION
-.PP
-This procedure generates a "bad option" error message in an
-(optional) interpreter.  It is used by channel drivers when 
-a invalid Set/Get option is requested. Its purpose is to concatenate
-the generic options list to the specific ones and factorize
-the generic options error message string.
-.PP
-It always return \fBTCL_ERROR\fR
-.PP
-An error message is generated in interp's result object to
-indicate that a command was invoked with the a bad option
-The message has the form
-.CS
-    bad option "blah": should be one of 
-    <...generic options...>+<...specific options...>
-so you get for instance:
-    bad option "-blah": should be one of -blocking,
-    -buffering, -buffersize, -eofchar, -translation,
-    -peername, or -sockname
-when called with optionList="peername sockname"
-.CE
-"blah" is the optionName argument and "<specific options>"
-is a space separated list of specific option words.
-The function takes good care of inserting minus signs before
-each option, commas after, and an "or" before the last option.
-.VE
-
-.SH "SEE ALSO"
-Tcl_Close(3), Tcl_OpenFileChannel(3), Tcl_SetErrno(3), Tcl_QueueEvent(3)
-
-.SH KEYWORDS
-blocking, channel driver, channel registration, channel type, nonblocking
diff --git a/doc/CrtChnlHdlr.3 b/doc/CrtChnlHdlr.3
deleted file mode 100644
index 4536ef6..0000000
--- a/doc/CrtChnlHdlr.3
+++ /dev/null
@@ -1,92 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: CrtChnlHdlr.3,v 1.2 1998/09/14 18:39:46 stanton Exp $
-.so man.macros
-.TH Tcl_CreateChannelHandler 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_CreateChannelHandler, Tcl_DeleteChannelHandler \- call a procedure when a channel becomes readable or writable
-.SH SYNOPSIS
-.nf
-.nf
-\fB#include <tcl.h>\fR
-.sp
-void
-\fBTcl_CreateChannelHandler\fR(\fIchannel, mask, proc, clientData\fR)
-.sp
-void
-\fBTcl_DeleteChannelHandler\fR(\fIchannel, proc, clientData\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_ChannelProc clientData
-.AP Tcl_Channel channel in
-Tcl channel such as returned by \fBTcl_CreateChannel\fR.
-.AP int mask in
-Conditions under which \fIproc\fR should be called: OR-ed combination of
-\fBTCL_READABLE\fR, \fBTCL_WRITABLE\fR and \fBTCL_EXCEPTION\fR. Specify
-a zero value to temporarily disable an existing handler.
-.AP Tcl_FileProc *proc in
-Procedure to invoke whenever the channel indicated by \fIchannel\fR meets
-the conditions specified by \fImask\fR.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateChannelHandler\fR arranges for \fIproc\fR to be called in the
-future whenever input or output becomes possible on the channel identified
-by \fIchannel\fR, or whenever an exceptional condition exists for
-\fIchannel\fR. The conditions of interest under which \fIproc\fR will be
-invoked are specified by the \fImask\fR argument.
-See the manual entry for \fBfileevent\fR for a precise description of
-what it means for a channel to be readable or writable.
-\fIProc\fR must conform to the following prototype:
-.CS
-typedef void Tcl_ChannelProc(
-	ClientData \fIclientData\fR,
-	int \fImask\fR);
-.CE
-.PP
-The \fIclientData\fR argument is the same as the value passed to
-\fBTcl_CreateChannelHandler\fR when the handler was created. Typically,
-\fIclientData\fR points to a data structure containing application-specific
-information about the channel. \fIMask\fR is an integer mask indicating
-which of the requested conditions actually exists for the channel; it will
-contain a subset of the bits from the \fImask\fR argument to
-\fBTcl_CreateChannelHandler\fR when the handler was created.
-.PP
-Each channel handler is identified by a unique combination of \fIchannel\fR,
-\fIproc\fR and \fIclientData\fR.
-There may be many handlers for a given channel as long as they don't
-have the same \fIchannel\fR, \fIproc\fR, and \fIclientData\fR.
-If \fBTcl_CreateChannelHandler\fR is invoked when there is already a handler
-for \fIchannel\fR, \fIproc\fR, and \fIclientData\fR, then no new
-handler is created;  instead, the \fImask\fR is changed for the
-existing handler.
-.PP
-\fBTcl_DeleteChannelHandler\fR deletes a channel handler identified by
-\fIchannel\fR, \fIproc\fR and \fIclientData\fR; if no such handler exists,
-the call has no effect.
-.PP
-Channel handlers are invoked via the Tcl event mechanism, so they
-are only useful in applications that are event-driven.
-Note also that the conditions specified in the \fImask\fR argument
-to \fIproc\fR may no longer exist when \fIproc\fR is invoked:  for
-example, if there are two handlers for \fBTCL_READABLE\fR on the same
-channel, the first handler could consume all of the available input
-so that the channel is no longer readable when the second handler
-is invoked.
-For this reason it may be useful to use nonblocking I/O on channels
-for which there are event handlers.
-
-.SH "SEE ALSO"
-Notifier(3), Tcl_CreateChannel(3), Tcl_OpenFileChannel(3), vwait(n).
-
-.SH KEYWORDS
-blocking, callback, channel, events, handler, nonblocking.
diff --git a/doc/CrtCloseHdlr.3 b/doc/CrtCloseHdlr.3
deleted file mode 100644
index 8f7b4ba..0000000
--- a/doc/CrtCloseHdlr.3
+++ /dev/null
@@ -1,59 +0,0 @@
-'\"
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: CrtCloseHdlr.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-.so man.macros
-.TH Tcl_CreateCloseHandler 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_CreateCloseHandler, Tcl_DeleteCloseHandler \- arrange for callbacks when channels are closed
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-void
-\fBTcl_CreateCloseHandler\fR(\fIchannel, proc, clientData\fR)
-.sp
-void
-\fBTcl_DeleteCloseHandler\fR(\fIchannel, proc, clientData\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_CloseProc callbackData in
-.AP Tcl_Channel channel in
-The channel for which to create or delete a close callback.
-.AP Tcl_CloseProc *proc in
-The procedure to call as the callback.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateCloseHandler\fR arranges for \fIproc\fR to be called when
-\fIchannel\fR is closed with \fBTcl_Close\fR or
-\fBTcl_UnregisterChannel\fR, or using the Tcl \fBclose\fR command.
-\fIProc\fR should match the following prototype:
-.PP
-.CS
-typedef void Tcl_CloseProc(
-	ClientData \fIclientData\fR);
-.CE
-.PP
-The \fIclientData\fR is the same as the value provided in the call to
-\fBTcl_CreateCloseHandler\fR.
-.PP
-\fBTcl_DeleteCloseHandler\fR removes a close callback for \fIchannel\fR.
-The \fIproc\fR and \fIclientData\fR identify which close callback to
-remove; \fBTcl_DeleteCloseHandler\fR does nothing if its \fIproc\fR and
-\fIclientData\fR arguments do not match the \fIproc\fR and \fIclientData\fR
-for a  close handler for \fIchannel\fR.
-
-.SH "SEE ALSO"
-close(n), Tcl_Close(3), Tcl_UnregisterChannel(3)
-
-.SH KEYWORDS
-callback, channel closing
diff --git a/doc/CrtCommand.3 b/doc/CrtCommand.3
deleted file mode 100644
index f2f6cea..0000000
--- a/doc/CrtCommand.3
+++ /dev/null
@@ -1,143 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtCommand.3,v 1.3 1998/10/05 17:35:53 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateCommand 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateCommand \- implement new commands in C
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Command
-\fBTcl_CreateCommand\fR(\fIinterp, cmdName, proc, clientData, deleteProc\fR)
-.SH ARGUMENTS
-.AS Tcl_CmdDeleteProc **deleteProcPtr
-.AP Tcl_Interp *interp in
-Interpreter in which to create new command.
-.AP char *cmdName in
-Name of command.
-.AP Tcl_CmdProc *proc in
-Implementation of new command:  \fIproc\fR will be called whenever
-\fIcmdName\fR is invoked as a command.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR and \fIdeleteProc\fR.
-.AP Tcl_CmdDeleteProc *deleteProc in
-Procedure to call before \fIcmdName\fR is deleted from the interpreter;
-allows for command-specific cleanup.  If NULL, then no procedure is
-called before the command is deleted.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateCommand\fR defines a new command in \fIinterp\fR and associates
-it with procedure \fIproc\fR such that whenever \fIcmdName\fR is
-invoked as a Tcl command (via a call to \fBTcl_Eval\fR) the Tcl interpreter
-will call \fIproc\fR to process the command.
-It differs from \fBTcl_CreateObjCommand\fR in that a new string-based
-command is defined;
-that is, a command procedure is defined that takes an array of
-argument strings instead of objects.
-The object-based command procedures registered by \fBTcl_CreateObjCommand\fR
-can execute significantly faster than the string-based command procedures
-defined by \fBTcl_CreateCommand\fR.
-This is because they take Tcl objects as arguments
-and those objects can retain an internal representation that
-can be manipulated more efficiently.
-Also, Tcl's interpreter now uses objects internally.
-In order to invoke a string-based command procedure
-registered by \fBTcl_CreateCommand\fR,
-it must generate and fetch a string representation
-from each argument object before the call
-and create a new Tcl object to hold the string result returned by the
-string-based command procedure.
-New commands should be defined using \fBTcl_CreateObjCommand\fR.
-We support \fBTcl_CreateCommand\fR for backwards compatibility.
-.PP
-The procedures \fBTcl_DeleteCommand\fR, \fBTcl_GetCommandInfo\fR,
-and \fBTcl_SetCommandInfo\fR are used in conjunction with
-\fBTcl_CreateCommand\fR.
-.PP
-\fBTcl_CreateCommand\fR will delete an existing command \fIcmdName\fR,
-if one is already associated with the interpreter.
-It returns a token that may be used to refer
-to the command in subsequent calls to \fBTcl_GetCommandName\fR.
-If \fIcmdName\fR contains any \fB::\fR namespace qualifiers,
-then the command is added to the specified namespace;
-otherwise the command is added to the global namespace.
-If \fBTcl_CreateCommand\fR is called for an interpreter that is in
-the process of being deleted, then it does not create a new command
-and it returns NULL.
-\fIProc\fR should have arguments and result that match the type
-\fBTcl_CmdProc\fR:
-.CS
-typedef int Tcl_CmdProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	int \fIargc\fR,
-	char *\fIargv\fR[]);
-.CE
-When \fIproc\fR is invoked the \fIclientData\fR and \fIinterp\fR
-parameters will be copies of the \fIclientData\fR and \fIinterp\fR
-arguments given to \fBTcl_CreateCommand\fR.
-Typically, \fIclientData\fR points to an application-specific
-data structure that describes what to do when the command procedure
-is invoked.  \fIArgc\fR and \fIargv\fR describe the arguments to
-the command, \fIargc\fR giving the number of arguments (including
-the command name) and \fIargv\fR giving the values of the arguments
-as strings.  The \fIargv\fR array will contain \fIargc\fR+1 values;
-the first \fIargc\fR values point to the argument strings, and the
-last value is NULL.  
-.VS
-Note that the argument strings should not be modified as they may
-point to constant strings or may be shared with other parts of the
-interpreter.
-.VE
-.PP
-\fIProc\fR must return an integer code that is either \fBTCL_OK\fR, \fBTCL_ERROR\fR,
-\fBTCL_RETURN\fR, \fBTCL_BREAK\fR, or \fBTCL_CONTINUE\fR.  See the Tcl overview man page
-for details on what these codes mean.  Most normal commands will only
-return \fBTCL_OK\fR or \fBTCL_ERROR\fR.  In addition, \fIproc\fR must set
-the interpreter result to point to a string value;
-in the case of a \fBTCL_OK\fR return code this gives the result
-of the command, and in the case of \fBTCL_ERROR\fR it gives an error message.
-The \fBTcl_SetResult\fR procedure provides an easy interface for setting
-the return value;  for complete details on how the the interpreter result
-field is managed, see the \fBTcl_Interp\fR man page.
-Before invoking a command procedure,
-\fBTcl_Eval\fR sets the interpreter result to point to an empty string,
-so simple commands can return an empty result by doing nothing at all.
-.PP
-The contents of the \fIargv\fR array belong to Tcl and are not
-guaranteed to persist once \fIproc\fR returns:  \fIproc\fR should
-not modify them, nor should it set the interpreter result to point
-anywhere within the \fIargv\fR values.
-Call \fBTcl_SetResult\fR with status \fBTCL_VOLATILE\fR if you want
-to return something from the \fIargv\fR array.
-.PP
-\fIDeleteProc\fR will be invoked when (if) \fIcmdName\fR is deleted.
-This can occur through a call to \fBTcl_DeleteCommand\fR or \fBTcl_DeleteInterp\fR,
-or by replacing \fIcmdName\fR in another call to \fBTcl_CreateCommand\fR.
-\fIDeleteProc\fR is invoked before the command is deleted, and gives the
-application an opportunity to release any structures associated
-with the command.  \fIDeleteProc\fR should have arguments and
-result that match the type \fBTcl_CmdDeleteProc\fR:
-.CS
-typedef void Tcl_CmdDeleteProc(ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR argument will be the same as the \fIclientData\fR
-argument passed to \fBTcl_CreateCommand\fR.
-.PP
-
-.SH "SEE ALSO"
-Tcl_CreateObjCommand, Tcl_DeleteCommand, Tcl_GetCommandInfo, Tcl_SetCommandInfo, Tcl_GetCommandName, Tcl_SetObjResult
-
-.SH KEYWORDS
-bind, command, create, delete, interpreter, namespace
diff --git a/doc/CrtFileHdlr.3 b/doc/CrtFileHdlr.3
deleted file mode 100644
index b660170..0000000
--- a/doc/CrtFileHdlr.3
+++ /dev/null
@@ -1,100 +0,0 @@
-'\"
-'\" Copyright (c) 1990-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtFileHdlr.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateFileHandler 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateFileHandler, Tcl_DeleteFileHandler \- associate procedure callbacks with files or devices (Unix only)
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.VS
-.sp
-\fBTcl_CreateFileHandler\fR(\fIfd, mask, proc, clientData\fR)
-.sp
-\fBTcl_DeleteFileHandler\fR(\fIfd\fR)
-.VE
-.SH ARGUMENTS
-.AS Tcl_FileProc clientData
-.VS
-.AP int fd in
-Unix file descriptor for an open file or device.
-.VE
-.AP int mask in
-Conditions under which \fIproc\fR should be called:
-OR-ed combination of \fBTCL_READABLE\fR, \fBTCL_WRITABLE\fR,
-and \fBTCL_EXCEPTION\fR.  May be set to 0 to temporarily disable
-a handler.
-.AP Tcl_FileProc *proc in
-Procedure to invoke whenever the file or device indicated
-by \fIfile\fR meets the conditions specified by \fImask\fR.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-.VS
-\fBTcl_CreateFileHandler\fR arranges for \fIproc\fR to be
-invoked in the future whenever I/O becomes possible on a file
-or an exceptional condition exists for the file.  The file
-is indicated by \fIfd\fR, and the conditions of interest
-.VE
-are indicated by \fImask\fR.  For example, if \fImask\fR
-is \fBTCL_READABLE\fR, \fIproc\fR will be called when
-the file is readable.
-The callback to \fIproc\fR is made by \fBTcl_DoOneEvent\fR, so
-\fBTcl_CreateFileHandler\fR is only useful in programs that dispatch
-events through \fBTcl_DoOneEvent\fR or through Tcl commands such
-as \fBvwait\fR.
-.PP
-\fIProc\fR should have arguments and result that match the
-type \fBTcl_FileProc\fR:
-.CS
-typedef void Tcl_FileProc(
-	ClientData \fIclientData\fR,
-	int \fImask\fR);
-.CE
-The \fIclientData\fR parameter to \fIproc\fR is a copy
-of the \fIclientData\fR
-argument given to \fBTcl_CreateFileHandler\fR when the callback
-was created.  Typically, \fIclientData\fR points to a data
-structure containing application-specific information about
-the file.  \fIMask\fR is an integer mask indicating which
-of the requested conditions actually exists for the file;  it
-will contain a subset of the bits in the \fImask\fR argument
-to \fBTcl_CreateFileHandler\fR.
-.PP
-.PP
-There may exist only one handler for a given file at a given time.
-If \fBTcl_CreateFileHandler\fR is called when a handler already
-exists for \fIfd\fR, then the new callback replaces the information
-that was previously recorded.
-.PP
-\fBTcl_DeleteFileHandler\fR may be called to delete the
-file handler for \fIfd\fR;  if no handler exists for the
-file given by \fIfd\fR then the procedure has no effect.
-.PP
-The purpose of file handlers is to enable an application to respond to
-events while waiting for files to become ready for I/O.  For this to work
-correctly, the application may need to use non-blocking I/O operations on
-the files for which handlers are declared.  Otherwise the application may
-block if it reads or writes too much data; while waiting for the I/O to
-complete the application won't be able to service other events. Use
-\fBTcl_SetChannelOption\fR with \fB\-blocking\fR to set the channel into
-blocking or nonblocking mode as required.
-.PP
-.VS
-Note that these interfaces are only supported by the Unix
-implementation of the Tcl notifier.   
-.VE
-
-.SH KEYWORDS
-callback, file, handler
diff --git a/doc/CrtInterp.3 b/doc/CrtInterp.3
deleted file mode 100644
index 62055d9..0000000
--- a/doc/CrtInterp.3
+++ /dev/null
@@ -1,131 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtInterp.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateInterp 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateInterp, Tcl_DeleteInterp, Tcl_InterpDeleted \- create and delete Tcl command interpreters
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Interp *
-\fBTcl_CreateInterp\fR()
-.sp
-\fBTcl_DeleteInterp\fR(\fIinterp\fR)
-.sp
-int
-\fBTcl_InterpDeleted\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-Token for interpreter to be destroyed.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateInterp\fR creates a new interpreter structure and returns
-a token for it.  The token is required in calls to most other Tcl
-procedures, such as \fBTcl_CreateCommand\fR, \fBTcl_Eval\fR, and
-\fBTcl_DeleteInterp\fR.
-Clients are only allowed to access a few of the fields of
-Tcl_Interp structures;  see the Tcl_Interp
-and \fBTcl_CreateCommand\fR man pages for details.
-The new interpreter is initialized with no defined variables and only
-the built-in Tcl commands.  To bind in additional commands, call
-\fBTcl_CreateCommand\fR.
-.PP
-\fBTcl_DeleteInterp\fR marks an interpreter as deleted; the interpreter
-will eventually be deleted when all calls to \fBTcl_Preserve\fR for it have
-been matched by calls to \fBTcl_Release\fR. At that time, all of the
-resources associated with it, including variables, procedures, and
-application-specific command bindings, will be deleted.  After
-\fBTcl_DeleteInterp\fR returns any attempt to use \fBTcl_Eval\fR on the
-interpreter will fail and return \fBTCL_ERROR\fR. After the call to
-\fBTcl_DeleteInterp\fR it is safe to examine \fIinterp->result\fR, query or
-set the values of variables, define, undefine or retrieve procedures, and
-examine the runtime evaluation stack. See below, in the section
-\fBINTERPRETERS AND MEMORY MANAGEMENT\fR for details.
-.PP
-\fBTcl_InterpDeleted\fR returns nonzero if \fBTcl_DeleteInterp\fR was
-called with \fIinterp\fR as its argument; this indicates that the
-interpreter will eventually be deleted, when the last call to
-\fBTcl_Preserve\fR for it is matched by a call to \fBTcl_Release\fR. If
-nonzero is returned, further calls to \fBTcl_Eval\fR in this interpreter
-will return \fBTCL_ERROR\fR.
-.PP
-\fBTcl_InterpDeleted\fR is useful in deletion callbacks to distinguish
-between when only the memory the callback is responsible for is being
-deleted and when the whole interpreter is being deleted. In the former case
-the callback may recreate the data being deleted, but this would lead to an
-infinite loop if the interpreter were being deleted.
-
-.SH "INTERPRETERS AND MEMORY MANAGEMENT"
-.PP
-\fBTcl_DeleteInterp\fR can be called at any time on an interpreter that may
-be used by nested evaluations and C code in various extensions. Tcl
-implements a simple mechanism that allows callers to use interpreters
-without worrying about the interpreter being deleted in a nested call, and
-without requiring special code to protect the interpreter, in most cases.
-This mechanism ensures that nested uses of an interpreter can safely
-continue using it even after \fBTcl_DeleteInterp\fR is called.
-.PP
-The mechanism relies on matching up calls to \fBTcl_Preserve\fR with calls
-to \fBTcl_Release\fR. If \fBTcl_DeleteInterp\fR has been called, only when
-the last call to \fBTcl_Preserve\fR is matched by a call to
-\fBTcl_Release\fR, will the interpreter be freed. See the manual entry for
-\fBTcl_Preserve\fR for a description of these functions.
-.PP
-The rules for when the user of an interpreter must call \fBTcl_Preserve\fR
-and \fBTcl_Release\fR are simple:
-.TP
-Interpreters Passed As Arguments
-Functions that are passed an interpreter as an argument can safely use the
-interpreter without any special protection. Thus, when you write an
-extension consisting of new Tcl commands, no special code is needed to
-protect interpreters received as arguments. This covers the majority of all
-uses.
-.TP
-Interpreter Creation And Deletion
-When a new interpreter is created and used in a call to \fBTcl_Eval\fR,
-\fBTcl_VarEval\fR, \fBTcl_GlobalEval\fR, \fBTcl_SetVar\fR, or
-\fBTcl_GetVar\fR, a pair of calls to \fBTcl_Preserve\fR and
-\fBTcl_Release\fR should be wrapped around all uses of the interpreter.
-Remember that it is unsafe to use the interpreter once \fBTcl_Release\fR
-has been called. To ensure that the interpreter is properly deleted when
-it is no longer needed, call \fBTcl_InterpDeleted\fR to test if some other
-code already called \fBTcl_DeleteInterp\fR; if not, call
-\fBTcl_DeleteInterp\fR before calling \fBTcl_Release\fR in your own code.
-Do not call \fBTcl_DeleteInterp\fR on an interpreter for which
-\fBTcl_InterpDeleted\fR returns nonzero.
-.TP
-Retrieving An Interpreter From A Data Structure
-When an interpreter is retrieved from a data structure (e.g. the client
-data of a callback) for use in \fBTcl_Eval\fR, \fBTcl_VarEval\fR,
-\fBTcl_GlobalEval\fR, \fBTcl_SetVar\fR, or \fBTcl_GetVar\fR, a pair of
-calls to \fBTcl_Preserve\fR and \fBTcl_Release\fR should be wrapped around
-all uses of the interpreter; it is unsafe to reuse the interpreter once
-\fBTcl_Release\fR has been called.  If an interpreter is stored inside a
-callback data structure, an appropriate deletion cleanup mechanism should
-be set up by the code that creates the data structure so that the
-interpreter is removed from the data structure (e.g. by setting the field
-to NULL) when the interpreter is deleted. Otherwise, you may be using an
-interpreter that has been freed and whose memory may already have been
-reused.
-.PP
-All uses of interpreters in Tcl and Tk have already been protected.
-Extension writers should ensure that their code also properly protects any
-additional interpreters used, as described above.
-
-.SH KEYWORDS
-command, create, delete, interpreter
-
-.SH "SEE ALSO"
-Tcl_Preserve(3), Tcl_Release(3)
diff --git a/doc/CrtMathFnc.3 b/doc/CrtMathFnc.3
deleted file mode 100644
index 21a7761..0000000
--- a/doc/CrtMathFnc.3
+++ /dev/null
@@ -1,93 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtMathFnc.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateMathFunc 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateMathFunc \- Define a new math function for expressions
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_CreateMathFunc\fR(\fIinterp, name, numArgs, argTypes, proc, clientData\fR)
-.SH ARGUMENTS
-.AS Tcl_ValueType clientData
-.AP Tcl_Interp *interp in
-Interpreter in which new function will be defined.
-.AP char *name in
-Name for new function.
-.AP int numArgs in
-Number of arguments to new function;  also gives size of \fIargTypes\fR array.
-.AP Tcl_ValueType *argTypes in
-Points to an array giving the permissible types for each argument to
-function.
-.AP Tcl_MathProc *proc in
-Procedure that implements the function.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR when it is invoked.
-.BE
-
-.SH DESCRIPTION
-.PP
-Tcl allows a number of mathematical functions to be used in
-expressions, such as \fBsin\fR, \fBcos\fR, and \fBhypot\fR.
-\fBTcl_CreateMathFunc\fR allows applications to add additional functions
-to those already provided by Tcl or to replace existing functions.
-\fIName\fR is the name of the function as it will appear in expressions.
-If \fIname\fR doesn't already exist as a function then a new function
-is created.  If it does exist, then the existing function is replaced.
-\fINumArgs\fR and \fIargTypes\fR describe the arguments to the function.
-Each entry in the \fIargTypes\fR array must be either TCL_INT, TCL_DOUBLE,
-or TCL_EITHER to indicate whether the corresponding argument must be an
-integer, a double-precision floating value, or either, respectively.
-.PP
-Whenever the function is invoked in an expression Tcl will invoke
-\fIproc\fR.  \fIProc\fR should have arguments and result that match
-the type \fBTcl_MathProc\fR:
-.CS
-typedef int Tcl_MathProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	Tcl_Value *\fIargs\fR,
-	Tcl_Value *\fIresultPtr\fR);
-.CE
-.PP
-When \fIproc\fR is invoked the \fIclientData\fR and \fIinterp\fR
-arguments will be the same as those passed to \fBTcl_CreateMathFunc\fR.
-\fIArgs\fR will point to an array of \fInumArgs\fR Tcl_Value structures,
-which describe the actual arguments to the function:
-.CS
-typedef struct Tcl_Value {
-	Tcl_ValueType \fItype\fR;
-	long \fIintValue\fR;
-	double \fIdoubleValue\fR;
-} Tcl_Value;
-.CE
-.PP
-The \fItype\fR field indicates the type of the argument and is
-either TCL_INT or TCL_DOUBLE.
-It will match the \fIargTypes\fR value specified for the function unless
-the \fIargTypes\fR value was TCL_EITHER. Tcl converts
-the argument supplied in the expression to the type requested in
-\fIargTypes\fR, if that is necessary.
-Depending on the value of the \fItype\fR field, the \fIintValue\fR
-or \fIdoubleValue\fR field will contain the actual value of the argument.
-.PP
-\fIProc\fR should compute its result and store it either as an integer
-in \fIresultPtr->intValue\fR or as a floating value in
-\fIresultPtr->doubleValue\fR.
-It should set also \fIresultPtr->type\fR to either TCL_INT or TCL_DOUBLE
-to indicate which value was set.
-Under normal circumstances \fIproc\fR should return TCL_OK.
-If an error occurs while executing the function, \fIproc\fR should
-return TCL_ERROR and leave an error message in \fIinterp->result\fR.
-
-.SH KEYWORDS
-expression, mathematical function
diff --git a/doc/CrtObjCmd.3 b/doc/CrtObjCmd.3
deleted file mode 100644
index 756b970..0000000
--- a/doc/CrtObjCmd.3
+++ /dev/null
@@ -1,261 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtObjCmd.3,v 1.3 1999/04/16 00:46:30 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateObjCommand 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateObjCommand, Tcl_DeleteCommand, Tcl_DeleteCommandFromToken, Tcl_GetCommandInfo, Tcl_SetCommandInfo, Tcl_GetCommandName \- implement new commands in C
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Command
-\fBTcl_CreateObjCommand\fR(\fIinterp, cmdName, proc, clientData, deleteProc\fR)
-.sp
-int
-\fBTcl_DeleteCommand\fR(\fIinterp, cmdName\fR)
-.sp
-int
-\fBTcl_DeleteCommandFromToken\fR(\fIinterp, token\fR)
-.sp
-int
-\fBTcl_GetCommandInfo\fR(\fIinterp, cmdName, infoPtr\fR)
-.sp
-int
-\fBTcl_SetCommandInfo\fR(\fIinterp, cmdName, infoPtr\fR)
-.sp
-char *
-\fBTcl_GetCommandName\fR(\fIinterp, token\fR)
-.SH ARGUMENTS
-.AS Tcl_ObjCmdProc *deleteProc in/out
-.AP Tcl_Interp *interp in
-Interpreter in which to create a new command or that contains a command.
-.AP char *cmdName in
-Name of command.
-.AP Tcl_ObjCmdProc *proc in
-Implementation of the new command: \fIproc\fR will be called whenever
-\fIcmdName\fR is invoked as a command.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR and \fIdeleteProc\fR.
-.AP Tcl_CmdDeleteProc *deleteProc in
-Procedure to call before \fIcmdName\fR is deleted from the interpreter;
-allows for command-specific cleanup. If NULL, then no procedure is
-called before the command is deleted.
-.AP Tcl_Command token in
-Token for command, returned by previous call to \fBTcl_CreateObjCommand\fR.
-The command must not have been deleted.
-.AP Tcl_CmdInfo *infoPtr in/out
-Pointer to structure containing various information about a
-Tcl command.
-.BE
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateObjCommand\fR defines a new command in \fIinterp\fR
-and associates it with procedure \fIproc\fR
-such that whenever \fIname\fR is
-invoked as a Tcl command (e.g., via a call to \fBTcl_EvalObj\fR)
-the Tcl interpreter will call \fIproc\fR to process the command.
-.PP
-\fBTcl_CreateObjCommand\fR deletes any existing command
-\fIname\fR already associated with the interpreter
-(however see below for an exception where the existing command
-is not deleted).
-It returns a token that may be used to refer
-to the command in subsequent calls to \fBTcl_GetCommandName\fR.
-If \fIname\fR contains any \fB::\fR namespace qualifiers,
-then the command is added to the specified namespace;
-otherwise the command is added to the global namespace.
-If \fBTcl_CreateObjCommand\fR is called for an interpreter that is in
-the process of being deleted, then it does not create a new command
-and it returns NULL.
-\fIproc\fR should have arguments and result that match the type
-\fBTcl_ObjCmdProc\fR:
-.CS
-typedef int Tcl_ObjCmdProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	int \fIobjc\fR,
-.VS
-	Tcl_Obj *CONST \fIobjv\fR[]);
-.CE
-When \fIproc\fR is invoked, the \fIclientData\fR and \fIinterp\fR parameters
-will be copies of the \fIclientData\fR and \fIinterp\fR arguments given to
-\fBTcl_CreateObjCommand\fR.  Typically, \fIclientData\fR points to an
-application-specific data structure that describes what to do when the
-command procedure is invoked. \fIObjc\fR and \fIobjv\fR describe the
-arguments to the command, \fIobjc\fR giving the number of argument objects
-(including the command name) and \fIobjv\fR giving the values of the
-arguments.  The \fIobjv\fR array will contain \fIobjc\fR values, pointing to
-the argument objects.  Unlike \fIargv\fR[\fIargv\fR] used in a
-string-based command procedure, \fIobjv\fR[\fIobjc\fR] will not contain NULL.
-.PP
-Additionally, when \fIproc\fR is invoked, it must not modify the contents
-of the \fIobjv\fR array by assigning new pointer values to any element of the
-array (for example, \fIobjv\fR[\fB2\fR] = \fBNULL\fR) because this will
-cause memory to be lost and the runtime stack to be corrupted.  The
-\fBCONST\fR in the declaration of \fIobjv\fR will cause ANSI-compliant
-compilers to report any such attempted assignment as an error.  However,
-it is acceptable to modify the internal representation of any individual
-object argument.  For instance, the user may call
-\fBTcl_GetIntFromObj\fR on \fIobjv\fR[\fB2\fR] to obtain the integer
-representation of that object; that call may change the type of the object
-that \fIobjv\fR[\fB2\fR] points at, but will not change where
-\fIobjv\fR[\fB2\fR] points.
-.VE
-.PP
-\fIproc\fR must return an integer code that is either \fBTCL_OK\fR,
-\fBTCL_ERROR\fR, \fBTCL_RETURN\fR, \fBTCL_BREAK\fR, or \fBTCL_CONTINUE\fR.
-See the Tcl overview man page
-for details on what these codes mean.  Most normal commands will only
-return \fBTCL_OK\fR or \fBTCL_ERROR\fR.
-In addition, if \fIproc\fR needs to return a non-empty result,
-it can call \fBTcl_SetObjResult\fR to set the interpreter's result.
-In the case of a \fBTCL_OK\fR return code this gives the result
-of the command,
-and in the case of \fBTCL_ERROR\fR this gives an error message.
-Before invoking a command procedure,
-\fBTcl_EvalObj\fR sets interpreter's result to
-point to an object representing an empty string, so simple
-commands can return an empty result by doing nothing at all.
-.PP
-The contents of the \fIobjv\fR array belong to Tcl and are not
-guaranteed to persist once \fIproc\fR returns: \fIproc\fR should
-not modify them.
-Call \fBTcl_SetObjResult\fR if you want
-to return something from the \fIobjv\fR array.
-.PP
-Ordinarily, \fBTcl_CreateObjCommand\fR deletes any existing command
-\fIname\fR already associated with the interpreter.
-However, if the existing command was created by a previous call to
-\fBTcl_CreateCommand\fR,
-\fBTcl_CreateObjCommand\fR does not delete the command
-but instead arranges for the Tcl interpreter to call the
-\fBTcl_ObjCmdProc\fR \fIproc\fR in the future.
-The old string-based \fBTcl_CmdProc\fR associated with the command
-is retained and its address can be obtained by subsequent 
-\fBTcl_GetCommandInfo\fR calls. This is done for backwards compatibility.
-.PP
-\fIDeleteProc\fR will be invoked when (if) \fIname\fR is deleted.
-This can occur through a call to \fBTcl_DeleteCommand\fR,
-\fBTcl_DeleteCommandFromToken\fR, or \fBTcl_DeleteInterp\fR,
-or by replacing \fIname\fR in another call to \fBTcl_CreateObjCommand\fR.
-\fIDeleteProc\fR is invoked before the command is deleted, and gives the
-application an opportunity to release any structures associated
-with the command.  \fIDeleteProc\fR should have arguments and
-result that match the type \fBTcl_CmdDeleteProc\fR:
-.CS
-typedef void Tcl_CmdDeleteProc(ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR argument will be the same as the \fIclientData\fR
-argument passed to \fBTcl_CreateObjCommand\fR.
-.PP
-\fBTcl_DeleteCommand\fR deletes a command from a command interpreter.
-Once the call completes, attempts to invoke \fIcmdName\fR in
-\fIinterp\fR will result in errors.
-If \fIcmdName\fR isn't bound as a command in \fIinterp\fR then
-\fBTcl_DeleteCommand\fR does nothing and returns -1;  otherwise
-it returns 0.
-There are no restrictions on \fIcmdName\fR:  it may refer to
-a built-in command, an application-specific command, or a Tcl procedure.
-If \fIname\fR contains any \fB::\fR namespace qualifiers,
-the command is deleted from the specified namespace.
-.PP
-Given a token returned by \fBTcl_CreateObjCommand\fR,
-\fBTcl_DeleteCommandFromToken\fR deletes the command
-from a command interpreter.
-It will delete a command even if that command has been renamed.
-Once the call completes, attempts to invoke the command in
-\fIinterp\fR will result in errors.
-If the command corresponding to \fItoken\fR
-has already been deleted from \fIinterp\fR then
-\fBTcl_DeleteCommand\fR does nothing and returns -1;
-otherwise it returns 0.
-.PP
-\fBTcl_GetCommandInfo\fR checks to see whether its \fIcmdName\fR argument
-exists as a command in \fIinterp\fR.
-\fIcmdName\fR may include \fB::\fR namespace qualifiers
-to identify a command in a particular namespace.
-If the command is not found, then it returns 0.
-Otherwise it places information about the command
-in the \fBTcl_CmdInfo\fR structure
-pointed to by \fIinfoPtr\fR and returns 1.
-A \fBTcl_CmdInfo\fR structure has the following fields:
-.CS
-typedef struct Tcl_CmdInfo {
-    int isNativeObjectProc;
-    Tcl_ObjCmdProc *objProc;
-    ClientData objClientData;
-    Tcl_CmdProc *proc;
-    ClientData clientData;
-    Tcl_CmdDeleteProc *deleteProc;
-    ClientData deleteData;
-    Tcl_Namespace *namespacePtr;
-} Tcl_CmdInfo;
-.CE
-The \fIisNativeObjectProc\fR field has the value 1
-if \fBTcl_CreateObjCommand\fR was called to register the command;
-it is 0 if only \fBTcl_CreateCommand\fR was called.
-It allows a program to determine whether it is faster to
-call \fIobjProc\fR or \fIproc\fR:
-\fIobjProc\fR is normally faster
-if \fIisNativeObjectProc\fR has the value 1.
-The fields \fIobjProc\fR and \fIobjClientData\fR
-have the same meaning as the \fIproc\fR and \fIclientData\fR
-arguments to \fBTcl_CreateObjCommand\fR;
-they hold information about the object-based command procedure
-that the Tcl interpreter calls to implement the command.
-The fields \fIproc\fR and \fIclientData\fR
-hold information about the string-based command procedure
-that implements the command.
-If \fBTcl_CreateCommand\fR was called for this command,
-this is the procedure passed to it;
-otherwise, this is a compatibility procedure
-registered by \fBTcl_CreateObjCommand\fR
-that simply calls the command's
-object-based procedure after converting its string arguments to Tcl objects.
-The field \fIdeleteData\fR is the ClientData value
-to pass to \fIdeleteProc\fR;  it is normally the same as
-\fIclientData\fR but may be set independently using the
-\fBTcl_SetCommandInfo\fR procedure.
-The field \fInamespacePtr\fR holds a pointer to the
-Tcl_Namespace that contains the command.
-.PP
-\fBTcl_SetCommandInfo\fR is used to modify the procedures and
-ClientData values associated with a command.
-Its \fIcmdName\fR argument is the name of a command in \fIinterp\fR.
-\fIcmdName\fR may include \fB::\fR namespace qualifiers
-to identify a command in a particular namespace.
-If this command does not exist then \fBTcl_SetCommandInfo\fR returns 0.
-Otherwise, it copies the information from \fI*infoPtr\fR to
-Tcl's internal structure for the command and returns 1.
-Note that this procedure allows the ClientData for a command's
-deletion procedure to be given a different value than the ClientData
-for its command procedure.
-Note that \fBTcl_SetCmdInfo\fR will not change a command's namespace;
-you must use \fBTcl_RenameCommand\fR to do that.
-.PP
-\fBTcl_GetCommandName\fR provides a mechanism for tracking commands
-that have been renamed.
-Given a token returned by \fBTcl_CreateObjCommand\fR
-when the command was created, \fBTcl_GetCommandName\fR returns the
-string name of the command.  If the command has been renamed since it
-was created, then \fBTcl_GetCommandName\fR returns the current name.
-This name does not include any \fB::\fR namespace qualifiers.
-The command corresponding to \fItoken\fR must not have been deleted.
-The string returned by \fBTcl_GetCommandName\fR is in dynamic memory
-owned by Tcl and is only guaranteed to retain its value as long as the
-command isn't deleted or renamed;  callers should copy the string if
-they need to keep it for a long time.
-.PP
-
-.SH "SEE ALSO"
-Tcl_CreateCommand, Tcl_ResetResult, Tcl_SetObjResult
-
-.SH KEYWORDS
-bind, command, create, delete, namespace, object
diff --git a/doc/CrtSlave.3 b/doc/CrtSlave.3
deleted file mode 100644
index 940ae57..0000000
--- a/doc/CrtSlave.3
+++ /dev/null
@@ -1,230 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtSlave.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateSlave 3 7.6 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_IsSafe, Tcl_MakeSafe, Tcl_CreateSlave, Tcl_GetSlave, Tcl_GetMaster, Tcl_GetInterpPath, Tcl_CreateAlias, Tcl_CreateAliasObj, Tcl_GetAlias, Tcl_GetAliasObj, Tcl_ExposeCommand, Tcl_HideCommand \- manage multiple Tcl interpreters, aliases and hidden commands.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_IsSafe\fR(\fIinterp\fR)
-.sp
-int
-\fBTcl_MakeSafe\fR(\fIinterp\fR)
-.sp
-Tcl_Interp *
-\fBTcl_CreateSlave\fR(\fIinterp, slaveName, isSafe\fR)
-.sp
-Tcl_Interp *
-\fBTcl_GetSlave\fR(\fIinterp, slaveName\fR)
-.sp
-Tcl_Interp *
-\fBTcl_GetMaster\fR(\fIinterp\fR)
-.sp
-int
-\fBTcl_GetInterpPath\fR(\fIaskingInterp, slaveInterp\fR)
-.sp
-.VS
-int
-\fBTcl_CreateAlias\fR(\fIslaveInterp, srcCmd, targetInterp, targetCmd, argc, argv\fR)
-.sp
-int
-\fBTcl_CreateAliasObj\fR(\fIslaveInterp, srcCmd, targetInterp, targetCmd, objc, objv\fR)
-.VE
-.sp
-int
-\fBTcl_GetAlias\fR(\fIinterp, srcCmd, targetInterpPtr, targetCmdPtr, argcPtr, argvPtr\fR)
-.sp
-.VS
-int
-\fBTcl_GetAliasObj\fR(\fIinterp, srcCmd, targetInterpPtr, targetCmdPtr, objcPtr, objvPtr\fR)
-.sp
-int
-\fBTcl_ExposeCommand\fR(\fIinterp, hiddenCmdName, cmdName\fR)
-.sp
-int
-\fBTcl_HideCommand\fR(\fIinterp, cmdName, hiddenCmdName\fR)
-.SH ARGUMENTS
-.AS Tcl_InterpDeleteProc **hiddenCmdName
-.AP Tcl_Interp *interp in
-Interpreter in which to execute the specified command.
-.AP char *slaveName in
-Name of slave interpreter to create or manipulate.
-.AP int isSafe in
-If non-zero, a ``safe'' slave that is suitable for running untrusted code
-is created, otherwise a trusted slave is created.
-.AP Tcl_Interp *slaveInterp in
-Interpreter to use for creating the source command for an alias (see
-below).
-.AP char *srcCmd in
-Name of source command for alias.
-.AP Tcl_Interp *targetInterp in
-Interpreter that contains the target command for an alias.
-.AP char *targetCmd in
-Name of target command for alias in \fItargetInterp\fR.
-.AP int argc in
-Count of additional arguments to pass to the alias command.
-.AP char **argv in
-Vector of strings, the additional arguments to pass to the alias command.
-This storage is owned by the caller.
-.AP int objc in
-Count of additional object arguments to pass to the alias object command.
-.AP Tcl_Object **objv in
-Vector of Tcl_Obj structures, the additional object argumenst to pass to
-the alias object command.
-This storage is owned by the caller.
-.AP Tcl_Interp **targetInterpPtr in
-Pointer to location to store the address of the interpreter where a target
-command is defined for an alias.
-.AP char **targetCmdPtr out
-Pointer to location to store the address of the name of the target command
-for an alias.
-.AP int *argcPtr out
-Pointer to location to store count of additional arguments to be passed to
-the alias. The location is in storage owned by the caller.
-.AP char ***argvPtr out
-Pointer to location to store a vector of strings, the additional arguments
-to pass to an alias. The location is in storage owned by the caller, the
-vector of strings is owned by the called function.
-.AP int *objcPtr out
-Pointer to location to store count of additional object arguments to be
-passed to the alias. The location is in storage owned by the caller.
-.AP Tcl_Obj ***objvPtr out
-Pointer to location to store a vector of Tcl_Obj structures, the additional
-arguments to pass to an object alias command. The location is in storage
-owned by the caller, the vector of Tcl_Obj structures is owned by the
-called function.
-.VS
-.AP char *cmdName in
-Name of an exposed command to hide or create.
-.AP char *hiddenCmdName in
-Name under which a hidden command is stored and with which it can be
-exposed or invoked.
-.VE
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are intended for access to the multiple interpreter
-facility from inside C programs. They enable managing multiple interpreters
-in a hierarchical relationship, and the management of aliases, commands
-that when invoked in one interpreter execute a command in another
-interpreter. The return value for those procedures that return an \fBint\fR
-is either \fBTCL_OK\fR or \fBTCL_ERROR\fR. If \fBTCL_ERROR\fR is returned
-then the \fBresult\fR field of the interpreter contains an error message.
-.PP
-\fBTcl_CreateSlave\fR creates a new interpreter as a slave of \fIinterp\fR.
-It also creates a slave command named \fIslaveName\fR in \fIinterp\fR which 
-allows \fIinterp\fR to manipulate the new slave. 
-If \fIisSafe\fR is zero, the command creates a trusted slave in which Tcl
-code has access to all the Tcl commands.
-If it is \fB1\fR, the command creates a ``safe'' slave in which Tcl code
-has access only to set of Tcl commands defined as ``Safe Tcl''; see the
-manual entry for the Tcl \fBinterp\fR command for details.
-If the creation of the new slave interpreter failed, \fBNULL\fR is returned.
-.PP
-\fBTcl_IsSafe\fR returns \fB1\fR if \fIinterp\fR is ``safe'' (was created
-with the \fBTCL_SAFE_INTERPRETER\fR flag specified),
-\fB0\fR otherwise.
-.PP
-\fBTcl_MakeSafe\fR makes \fIinterp\fR ``safe'' by removing all
-non-core and core unsafe functionality. Note that if you call this after
-adding some extension to an interpreter, all traces of that extension will
-be removed from the interpreter.
-.PP
-\fBTcl_GetSlave\fR returns a pointer to a slave interpreter of
-\fIinterp\fR. The slave interpreter is identified by \fIslaveName\fR.
-If no such slave interpreter exists, \fBNULL\fR is returned.
-.PP
-\fBTcl_GetMaster\fR returns a pointer to the master interpreter of
-\fIinterp\fR. If \fIinterp\fR has no master (it is a
-top-level interpreter) then \fBNULL\fR is returned.
-.PP
-\fBTcl_GetInterpPath\fR sets the \fIresult\fR field in \fIaskingInterp\fR
-to the relative path between \fIaskingInterp\fR and \fIslaveInterp\fR;
-\fIslaveInterp\fR must be a slave of \fIaskingInterp\fR. If the computation
-of the relative path succeeds, \fBTCL_OK\fR is returned, else
-\fBTCL_ERROR\fR is returned and the \fIresult\fR field in
-\fIaskingInterp\fR contains the error message.
-.PP
-.VS
-\fBTcl_CreateAlias\fR creates an object command named \fIsrcCmd\fR in
-\fIslaveInterp\fR that when invoked, will cause the command \fItargetCmd\fR
-to be invoked in \fItargetInterp\fR. The arguments specified by the strings
-contained in \fIargv\fR are always prepended to any arguments supplied in the
-invocation of \fIsrcCmd\fR and passed to \fItargetCmd\fR.
-This operation returns \fBTCL_OK\fR if it succeeds, or \fBTCL_ERROR\fR if
-it fails; in that case, an error message is left in the object result
-of \fIslaveInterp\fR.
-Note that there are no restrictions on the ancestry relationship (as
-created by \fBTcl_CreateSlave\fR) between \fIslaveInterp\fR and
-\fItargetInterp\fR. Any two interpreters can be used, without any
-restrictions on how they are related.
-.PP
-\fBTcl_CreateAliasObj\fR is similar to \fBTcl_CreateAliasObj\fR except 
-that it takes a vector of objects to pass as additional arguments instead
-of a vector of strings.
-.VE
-.PP
-\fBTcl_GetAlias\fR returns information about an alias \fIaliasName\fR
-in \fIinterp\fR. Any of the result fields can be \fBNULL\fR, in
-which case the corresponding datum is not returned. If a result field is
-non\-\fBNULL\fR, the address indicated is set to the corresponding datum.
-For example, if \fItargetNamePtr\fR is non\-\fBNULL\fR it is set to a
-pointer to the string containing the name of the target command.
-.VS
-.PP
-\fBTcl_GetAliasObj\fR is similar to \fBTcl_GetAlias\fR except that it
-returns a pointer to a vector of Tcl_Obj structures instead of a vector of
-strings.
-.PP
-\fBTcl_ExposeCommand\fR moves the command named \fIhiddenCmdName\fR from
-the set of hidden commands to the set of exposed commands, putting
-it under the name
-\fIcmdName\fR. 
-\fIHiddenCmdName\fR must be the name of an existing hidden
-command, or the operation will return \fBTCL_ERROR\fR and leave an error
-message in the \fIresult\fR field in \fIinterp\fR.
-If an exposed command named \fIcmdName\fR already exists,
-the operation returns \fBTCL_ERROR\fR and leaves an error message in the
-object result of \fIinterp\fR.
-If the operation succeeds, it returns \fBTCL_OK\fR.
-After executing this command, attempts to use \fIcmdName\fR in a call to
-\fBTcl_Eval\fR or with the Tcl \fBeval\fR command will again succeed.
-.PP
-\fBTcl_HideCommand\fR moves the command named \fIcmdName\fR from the set of
-exposed commands to the set of hidden commands, under the name
-\fIhiddenCmdName\fR.
-\fICmdName\fR must be the name of an existing exposed
-command, or the operation will return \fBTCL_ERROR\fR and leave an error
-message in the object result of \fIinterp\fR.
-Currently both \fIcmdName\fR and \fIhiddenCmdName\fR must not contain
-namespace qualifiers, or the operation will return \fBTCL_ERROR\fR and
-leave an error message in the object result of \fIinterp\fR.
-The \fICmdName\fR will be looked up in the global namespace, and not
-relative to the current namespace, even if the current namespace is not the
-global one.
-If a hidden command whose name is \fIhiddenCmdName\fR already
-exists, the operation also returns \fBTCL_ERROR\fR and the \fIresult\fR
-field in \fIinterp\fR contains an error message.
-If the operation succeeds, it returns \fBTCL_OK\fR.
-After executing this command, attempts to use \fIcmdName\fR in a call to
-\fBTcl_Eval\fR or with the Tcl \fBeval\fR command will fail.
-.PP
-.SH "SEE ALSO"
-For a description of the Tcl interface to multiple interpreters, see
-\fIinterp(n)\fR.
-
-.SH KEYWORDS
-alias, command, exposed commands, hidden commands, interpreter, invoke,
-master, slave, 
-
diff --git a/doc/CrtTimerHdlr.3 b/doc/CrtTimerHdlr.3
deleted file mode 100644
index ecfa4c3..0000000
--- a/doc/CrtTimerHdlr.3
+++ /dev/null
@@ -1,76 +0,0 @@
-'\"
-'\" Copyright (c) 1990 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtTimerHdlr.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateTimerHandler 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateTimerHandler, Tcl_DeleteTimerHandler \- call a procedure at a
-given time
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_TimerToken
-\fBTcl_CreateTimerHandler\fR(\fImilliseconds, proc, clientData\fR)
-.sp
-\fBTcl_DeleteTimerHandler\fR(\fItoken\fR)
-.SH ARGUMENTS
-.AS Tcl_TimerToken milliseconds
-.AP int milliseconds  in
-How many milliseconds to wait before invoking \fIproc\fR.
-.AP Tcl_TimerProc *proc in
-Procedure to invoke after \fImilliseconds\fR have elapsed.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.AP Tcl_TimerToken token in
-Token for previously-created timer handler (the return value
-from some previous call to \fBTcl_CreateTimerHandler\fR).
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateTimerHandler\fR arranges for \fIproc\fR to be
-invoked at a time \fImilliseconds\fR milliseconds in the
-future.
-The callback to \fIproc\fR will be made by \fBTcl_DoOneEvent\fR,
-so \fBTcl_CreateTimerHandler\fR is only useful in programs that
-dispatch events through \fBTcl_DoOneEvent\fR or through Tcl commands
-such as \fBvwait\fR.
-The call to \fIproc\fR may not be made at the exact time given by
-\fImilliseconds\fR:  it will be made at the next opportunity
-after that time.  For example, if \fBTcl_DoOneEvent\fR isn't
-called until long after the time has elapsed, or if there
-are other pending events to process before the call to
-\fIproc\fR, then the call to \fIproc\fR will be delayed.
-.PP
-\fIProc\fR should have arguments and return value that match
-the type \fBTcl_TimerProc\fR:
-.CS
-typedef void Tcl_TimerProc(ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR parameter to \fIproc\fR is a
-copy of the \fIclientData\fR argument given to
-\fBTcl_CreateTimerHandler\fR when the callback
-was created.  Typically, \fIclientData\fR points to a data
-structure containing application-specific information about
-what to do in \fIproc\fR.
-.PP
-\fBTcl_DeleteTimerHandler\fR may be called to delete a
-previously-created timer handler.  It deletes the handler
-indicated by \fItoken\fR so that no call to \fIproc\fR
-will be made;  if that handler no longer exists
-(e.g. because the time period has already elapsed and \fIproc\fR
-has been invoked then \fBTcl_DeleteTimerHandler\fR does nothing.
-The tokens returned by \fBTcl_CreateTimerHandler\fR never have
-a value of NULL, so if NULL is passed to \fBTcl_DeleteTimerHandler\fR
-then the procedure does nothing.
-
-.SH KEYWORDS
-callback, clock, handler, timer
diff --git a/doc/CrtTrace.3 b/doc/CrtTrace.3
deleted file mode 100644
index dff97d1..0000000
--- a/doc/CrtTrace.3
+++ /dev/null
@@ -1,106 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: CrtTrace.3,v 1.2 1998/09/14 18:39:47 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_CreateTrace 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_CreateTrace, Tcl_DeleteTrace \- arrange for command execution to be traced
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Trace
-\fBTcl_CreateTrace\fR(\fIinterp, level, proc, clientData\fR)
-.sp
-\fBTcl_DeleteTrace\fR(\fIinterp, trace\fR)
-.SH ARGUMENTS
-.AS Tcl_CmdTraceProc (clientData)()
-.AP Tcl_Interp *interp in
-Interpreter containing command to be traced or untraced.
-.AP int level in
-Only commands at or below this nesting level will be traced.  1 means
-top-level commands only, 2 means top-level commands or those that are
-invoked as immediate consequences of executing top-level commands
-(procedure bodies, bracketed commands, etc.) and so on.
-.AP Tcl_CmdTraceProc *proc in
-Procedure to call for each command that's executed.  See below for
-details on the calling sequence.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.AP Tcl_Trace trace in
-Token for trace to be removed (return value from previous call
-to \fBTcl_CreateTrace\fR).
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_CreateTrace\fR arranges for command tracing.  From now on, \fIproc\fR
-will be invoked before Tcl calls command procedures to process
-commands in \fIinterp\fR.  The return value from
-\fBTcl_CreateTrace\fR is a token for the trace,
-which may be passed to \fBTcl_DeleteTrace\fR to remove the trace.  There may
-be many traces in effect simultaneously for the same command interpreter.
-.PP
-\fIProc\fR should have arguments and result that match the
-type \fBTcl_CmdTraceProc\fR:
-.CS
-typedef void Tcl_CmdTraceProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	int \fIlevel\fR,
-	char *\fIcommand\fR,
-	Tcl_CmdProc *\fIcmdProc\fR,
-	ClientData \fIcmdClientData\fR,
-	int \fIargc\fR,
-	char *\fIargv\fR[]);
-.CE
-The \fIclientData\fR and \fIinterp\fR parameters are
-copies of the corresponding arguments given to \fBTcl_CreateTrace\fR.
-\fIClientData\fR typically points to an application-specific
-data structure that describes what to do when \fIproc\fR
-is invoked.  \fILevel\fR gives the nesting level of the command
-(1 for top-level commands passed to \fBTcl_Eval\fR by the application,
-2 for the next-level commands passed to \fBTcl_Eval\fR as part of parsing
-or interpreting level-1 commands, and so on).  \fICommand\fR
-points to a string containing the text of the
-command, before any argument substitution.
-\fICmdProc\fR contains the address of the command procedure that
-will be called to process the command (i.e. the \fIproc\fR argument
-of some previous call to \fBTcl_CreateCommand\fR) and \fIcmdClientData\fR
-contains the associated client data for \fIcmdProc\fR (the \fIclientData\fR
-value passed to \fBTcl_CreateCommand\fR).  \fIArgc\fR and \fIargv\fR give
-the final argument information that will be passed to \fIcmdProc\fR, after
-command, variable, and backslash substitution.
-\fIProc\fR must not modify the \fIcommand\fR or \fIargv\fR strings.
-.PP
-Tracing will only occur for commands at nesting level less than
-or equal to the \fIlevel\fR parameter (i.e. the \fIlevel\fR
-parameter to \fIproc\fR will always be less than or equal to the
-\fIlevel\fR parameter to \fBTcl_CreateTrace\fR).
-.PP
-Calls to \fIproc\fR will be made by the Tcl parser immediately before
-it calls the command procedure for the command (\fIcmdProc\fR).  This
-occurs after argument parsing and substitution, so tracing for
-substituted commands occurs before tracing of the commands
-containing the substitutions.  If there is a syntax error in a
-command, or if there is no command procedure associated with a
-command name, then no tracing will occur for that command.  If a
-string passed to Tcl_Eval contains multiple commands (bracketed, or
-on different lines) then multiple calls to \fIproc\fR will occur,
-one for each command.  The \fIcommand\fR string for each of these
-trace calls will reflect only a single command, not the entire string
-passed to Tcl_Eval.
-.PP
-\fBTcl_DeleteTrace\fR removes a trace, so that no future calls will be
-made to the procedure associated with the trace.  After \fBTcl_DeleteTrace\fR
-returns, the caller should never again use the \fItrace\fR token.
-
-.SH KEYWORDS
-command, create, delete, interpreter, trace
diff --git a/doc/DString.3 b/doc/DString.3
deleted file mode 100644
index e8cc5e1..0000000
--- a/doc/DString.3
+++ /dev/null
@@ -1,145 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: DString.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_DString 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_DStringInit, Tcl_DStringAppend, Tcl_DStringAppendElement, Tcl_DStringStartSublist, Tcl_DStringEndSublist, Tcl_DStringLength, Tcl_DStringValue, Tcl_DStringSetLength, Tcl_DStringFree, Tcl_DStringResult, Tcl_DStringGetResult \- manipulate dynamic strings
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_DStringInit\fR(\fIdsPtr\fR)
-.sp
-char *
-\fBTcl_DStringAppend\fR(\fIdsPtr, string, length\fR)
-.sp
-char *
-\fBTcl_DStringAppendElement\fR(\fIdsPtr, string\fR)
-.sp
-\fBTcl_DStringStartSublist\fR(\fIdsPtr\fR)
-.sp
-\fBTcl_DStringEndSublist\fR(\fIdsPtr\fR)
-.sp
-int
-\fBTcl_DStringLength\fR(\fIdsPtr\fR)
-.sp
-char *
-\fBTcl_DStringValue\fR(\fIdsPtr\fR)
-.sp
-\fBTcl_DStringSetLength\fR(\fIdsPtr, newLength\fR)
-.sp
-\fBTcl_DStringFree\fR(\fIdsPtr\fR)
-.sp
-\fBTcl_DStringResult\fR(\fIinterp, dsPtr\fR)
-.sp
-\fBTcl_DStringGetResult\fR(\fIinterp, dsPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_DString newLength
-.AP Tcl_DString *dsPtr in/out
-Pointer to structure that is used to manage a dynamic string.
-.AP char *string in
-Pointer to characters to add to dynamic string.
-.AP int length in
-Number of characters from string to add to dynamic string.  If -1,
-add all characters up to null terminating character.
-.AP int newLength in
-New length for dynamic string, not including null terminating
-character.
-.AP Tcl_Interp *interp in/out
-Interpreter whose result is to be set from or moved to the
-dynamic string.
-.BE
-
-.SH DESCRIPTION
-.PP
-Dynamic strings provide a mechanism for building up arbitrarily long
-strings by gradually appending information.  If the dynamic string is
-short then there will be no memory allocation overhead;  as the string
-gets larger, additional space will be allocated as needed.
-.PP
-\fBTcl_DStringInit\fR initializes a dynamic string to zero length.
-The Tcl_DString structure must have been allocated by the caller.
-No assumptions are made about the current state of the structure;
-anything already in it is discarded.
-If the structure has been used previously, \fBTcl_DStringFree\fR should
-be called first to free up any memory allocated for the old
-string.
-.PP
-\fBTcl_DStringAppend\fR adds new information to a dynamic string,
-allocating more memory for the string if needed.
-If \fIlength\fR is less than zero then everything in \fIstring\fR
-is appended to the dynamic string;  otherwise \fIlength\fR
-specifies the number of bytes to append.
-\fBTcl_DStringAppend\fR returns a pointer to the characters of
-the new string.  The string can also be retrieved from the
-\fIstring\fR field of the Tcl_DString structure.
-.PP
-\fBTcl_DStringAppendElement\fR is similar to \fBTcl_DStringAppend\fR
-except that it doesn't take a \fIlength\fR argument (it appends
-all of \fIstring\fR) and it converts the string to a proper list element
-before appending.
-\fBTcl_DStringAppendElement\fR adds a separator space before the
-new list element unless the new list element is the first in a
-list or sub-list (i.e. either the current string is empty, or it
-contains the single character ``{'', or the last two characters of
-the current string are `` {'').
-\fBTcl_DStringAppendElement\fR returns a pointer to the
-characters of the new string.
-.PP
-\fBTcl_DStringStartSublist\fR and \fBTcl_DStringEndSublist\fR can be
-used to create nested lists.
-To append a list element that is itself a sublist, first
-call \fBTcl_DStringStartSublist\fR, then call \fBTcl_DStringAppendElement\fR
-for each of the elements in the sublist, then call
-\fBTcl_DStringEndSublist\fR to end the sublist.
-\fBTcl_DStringStartSublist\fR appends a space character if needed,
-followed by an open brace;  \fBTcl_DStringEndSublist\fR appends
-a close brace.
-Lists can be nested to any depth.
-.PP
-\fBTcl_DStringLength\fR is a macro that returns the current length
-of a dynamic string (not including the terminating null character).
-\fBTcl_DStringValue\fR is a  macro that returns a pointer to the
-current contents of a dynamic string.
-.PP
-.PP
-\fBTcl_DStringSetLength\fR changes the length of a dynamic string.
-If \fInewLength\fR is less than the string's current length, then
-the string is truncated.
-If \fInewLength\fR is greater than the string's current length,
-then the string will become longer and new space will be allocated
-for the string if needed.
-However, \fBTcl_DStringSetLength\fR will not initialize the new
-space except to provide a terminating null character;  it is up to the
-caller to fill in the new space.
-\fBTcl_DStringSetLength\fR does not free up the string's storage space
-even if the string is truncated to zero length, so \fBTcl_DStringFree\fR
-will still need to be called.
-.PP
-\fBTcl_DStringFree\fR should be called when you're finished using
-the string.  It frees up any memory that was allocated for the string
-and reinitializes the string's value to an empty string.
-.PP
-\fBTcl_DStringResult\fR sets the result of \fIinterp\fR to the value of
-the dynamic string given by \fIdsPtr\fR.  It does this by moving
-a pointer from \fIdsPtr\fR to \fIinterp->result\fR.
-This saves the cost of allocating new memory and copying the string.
-\fBTcl_DStringResult\fR also reinitializes the dynamic string to
-an empty string.
-.PP
-\fBTcl_DStringGetResult\fR does the opposite of \fBTcl_DStringResult\fR.
-It sets the value of \fIdsPtr\fR to the result of \fIinterp\fR and
-it clears \fIinterp\fR's result.
-If possible it does this by moving a pointer rather than by copying
-the string.
-
-.SH KEYWORDS
-append, dynamic string, free, result
diff --git a/doc/DetachPids.3 b/doc/DetachPids.3
deleted file mode 100644
index 23b16c5..0000000
--- a/doc/DetachPids.3
+++ /dev/null
@@ -1,62 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: DetachPids.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_DetachPids 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_DetachPids, Tcl_ReapDetachedProcs \- manage child processes in background
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_DetachPids\fR(\fInumPids, pidPtr\fR)
-.sp
-\fBTcl_ReapDetachedProcs\fR()
-.SH ARGUMENTS
-.AS int *statusPtr
-.AP int numPids in
-Number of process ids contained in the array pointed to by \fIpidPtr\fR.
-.AP int *pidPtr in
-Address of array containing \fInumPids\fR process ids.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_DetachPids\fR and \fBTcl_ReapDetachedProcs\fR provide a
-mechanism for managing subprocesses that are running in background.
-These procedures are needed because the parent of a process must
-eventually invoke the \fBwaitpid\fR kernel call (or one of a few other
-similar kernel calls) to wait for the child to exit.  Until the
-parent waits for the child, the child's state cannot be completely
-reclaimed by the system.  If a parent continually creates children
-and doesn't wait on them, the system's process table will eventually
-overflow, even if all the children have exited.
-.PP
-\fBTcl_DetachPids\fR may be called to ask Tcl to take responsibility
-for one or more processes whose process ids are contained in the
-\fIpidPtr\fR array passed as argument.  The caller presumably
-has started these processes running in background and doesn't
-want to have to deal with them again.
-.PP
-\fBTcl_ReapDetachedProcs\fR invokes the \fBwaitpid\fR kernel call
-on each of the background processes so that its state can be cleaned
-up if it has exited.  If the process hasn't exited yet,
-\fBTcl_ReapDetachedProcs\fR doesn't wait for it to exit;  it will check again
-the next time it is invoked.
-Tcl automatically calls \fBTcl_ReapDetachedProcs\fR each time the
-\fBexec\fR command is executed, so in most cases it isn't necessary
-for any code outside of Tcl to invoke \fBTcl_ReapDetachedProcs\fR.
-However, if you call \fBTcl_DetachPids\fR in situations where the
-\fBexec\fR command may never get executed, you may wish to call
-\fBTcl_ReapDetachedProcs\fR from time to time so that background
-processes can be cleaned up.
-
-.SH KEYWORDS
-background, child, detach, process, wait
diff --git a/doc/DoOneEvent.3 b/doc/DoOneEvent.3
deleted file mode 100644
index 8ae7a88..0000000
--- a/doc/DoOneEvent.3
+++ /dev/null
@@ -1,108 +0,0 @@
-'\"
-'\" Copyright (c) 1990-1992 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: DoOneEvent.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_DoOneEvent 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_DoOneEvent \- wait for events and invoke event handlers
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_DoOneEvent\fR(\fIflags\fR)
-.SH ARGUMENTS
-.AS int flags
-.AP int flags in
-This parameter is normally zero.  It may be an OR-ed combination
-of any of the following flag bits:  
-TCL_WINDOW_EVENTS,
-TCL_FILE_EVENTS, TCL_TIMER_EVENTS, TCL_IDLE_EVENTS, TCL_ALL_EVENTS, or
-TCL_DONT_WAIT.
-.BE
-
-.SH DESCRIPTION
-.PP
-This procedure is the entry point to Tcl's event loop; it is responsible for
-waiting for events and dispatching event handlers created with
-procedures such as \fBTk_CreateEventHandler\fR, \fBTcl_CreateFileHandler\fR,
-\fBTcl_CreateTimerHandler\fR, and \fBTcl_DoWhenIdle\fR.
-\fBTcl_DoOneEvent\fR checks to see if
-events are already present on the Tcl event queue; if so,
-it calls the handler(s) for the first (oldest) event, removes it from
-the queue, and returns.
-If there are no events ready to be handled, then \fBTcl_DoOneEvent\fR
-checks for new events from all possible sources.
-If any are found, it puts all of them on Tcl's event queue, calls
-handlers for the first event on the queue, and returns.
-If no events are found, \fBTcl_DoOneEvent\fR checks for \fBTcl_DoWhenIdle\fR
-callbacks; if any are found, it invokes all of them and returns.
-Finally, if no events or idle callbacks have been found, then
-\fBTcl_DoOneEvent\fR sleeps until an event occurs; then it adds any 
-new events to the Tcl event queue, calls handlers for the first event,
-and returns.
-The normal return value is 1 to signify that some event
-was processed (see below for other alternatives).
-.PP
-If the \fIflags\fR argument to \fBTcl_DoOneEvent\fR is non-zero,
-it restricts the kinds of events that will be processed by
-\fBTcl_DoOneEvent\fR.
-\fIFlags\fR may be an OR-ed combination of any of the following bits:
-.TP 27
-\fBTCL_WINDOW_EVENTS\fR \-
-Process window system events.
-.TP 27
-\fBTCL_FILE_EVENTS\fR \-
-Process file events.
-.TP 27
-\fBTCL_TIMER_EVENTS\fR \-
-Process timer events.
-.TP 27
-\fBTCL_IDLE_EVENTS\fR \-
-Process idle callbacks.
-.TP 27
-\fBTCL_ALL_EVENTS\fR \-
-Process all kinds of events:  equivalent to OR-ing together all of the
-above flags or specifying none of them.
-.TP 27
-\fBTCL_DONT_WAIT\fR \-
-Don't sleep:  process only events that are ready at the time of the
-call.
-.LP
-If any of the flags \fBTCL_WINDOW_EVENTS\fR, \fBTCL_FILE_EVENTS\fR,
-\fBTCL_TIMER_EVENTS\fR, or \fBTCL_IDLE_EVENTS\fR is set, then the only
-events that will be considered are those for which flags are set.
-Setting none of these flags is equivalent to the value
-\fBTCL_ALL_EVENTS\fR, which causes all event types to be processed.
-If an application has defined additional event sources with
-\fBTcl_CreateEventSource\fR, then additional \fIflag\fR values
-may also be valid, depending on those event sources.
-.PP
-The \fBTCL_DONT_WAIT\fR flag causes \fBTcl_DoOneEvent\fR not to put
-the process to sleep:  it will check for events but if none are found
-then it returns immediately with a return value of 0 to indicate
-that no work was done.
-\fBTcl_DoOneEvent\fR will also return 0 without doing anything if
-the only alternative is to block forever (this can happen, for example,
-if \fIflags\fR is \fBTCL_IDLE_EVENTS\fR and there are no
-\fBTcl_DoWhenIdle\fR callbacks pending, or if no event handlers or
-timer handlers exist).
-.PP
-\fBTcl_DoOneEvent\fR may be invoked recursively.  For example,
-it is possible to invoke \fBTcl_DoOneEvent\fR recursively
-from a handler called by \fBTcl_DoOneEvent\fR.  This sort
-of operation is useful in some modal situations, such
-as when a
-notification dialog has been popped up and an application wishes to
-wait for the user to click a button in the dialog before
-doing anything else.
-
-.SH KEYWORDS
-callback, event, handler, idle, timer
diff --git a/doc/DoWhenIdle.3 b/doc/DoWhenIdle.3
deleted file mode 100644
index 90a6aa7..0000000
--- a/doc/DoWhenIdle.3
+++ /dev/null
@@ -1,86 +0,0 @@
-'\"
-'\" Copyright (c) 1990 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: DoWhenIdle.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_DoWhenIdle 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_DoWhenIdle, Tcl_CancelIdleCall \- invoke a procedure when there are no pending events
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_DoWhenIdle\fR(\fIproc, clientData\fR)
-.sp
-\fBTcl_CancelIdleCall\fR(\fIproc, clientData\fR)
-.SH ARGUMENTS
-.AS Tcl_IdleProc clientData
-.AP Tcl_IdleProc *proc in
-Procedure to invoke.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_DoWhenIdle\fR arranges for \fIproc\fR to be invoked
-when the application becomes idle.  The application is
-considered to be idle when \fBTcl_DoOneEvent\fR has been
-called, couldn't find any events to handle, and is about
-to go to sleep waiting for an event to occur.  At this
-point all pending \fBTcl_DoWhenIdle\fR handlers are
-invoked.  For each call to \fBTcl_DoWhenIdle\fR there will
-be a single call to \fIproc\fR;  after \fIproc\fR is
-invoked the handler is automatically removed.
-\fBTcl_DoWhenIdle\fR is only usable in programs that
-use \fBTcl_DoOneEvent\fR to dispatch events.
-.PP
-\fIProc\fR should have arguments and result that match the
-type \fBTcl_IdleProc\fR:
-.CS
-typedef void Tcl_IdleProc(ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR parameter to \fIproc\fR is a copy of the \fIclientData\fR
-argument given to \fBTcl_DoWhenIdle\fR.  Typically, \fIclientData\fR
-points to a data structure containing application-specific information about
-what \fIproc\fR should do.
-.PP
-\fBTcl_CancelIdleCall\fR
-may be used to cancel one or more previous
-calls to \fBTcl_DoWhenIdle\fR:  if there is a \fBTcl_DoWhenIdle\fR
-handler registered for \fIproc\fR and \fIclientData\fR, then it
-is removed without invoking it.  If there is more than one
-handler on the idle list that refers to \fIproc\fR and \fIclientData\fR,
-all of the handlers are removed.  If no existing handlers match
-\fIproc\fR and \fIclientData\fR then nothing happens.
-.PP
-\fBTcl_DoWhenIdle\fR is most useful in situations where
-(a) a piece of work will have to be done but (b) it's
-possible that something will happen in the near future
-that will change what has to be done or require something
-different to be done.  \fBTcl_DoWhenIdle\fR allows the
-actual work to be deferred until all pending events have
-been processed.  At this point the exact work to be done
-will presumably be known and it can be done exactly once.
-.PP
-For example, \fBTcl_DoWhenIdle\fR might be used by an editor
-to defer display updates until all pending commands have
-been processed.  Without this feature, redundant redisplays
-might occur in some situations, such as the processing of
-a command file.
-.SH BUGS
-.PP
-At present it is not safe for an idle callback to reschedule itself
-continuously.  This will interact badly with certain features of Tk
-that attempt to wait for all idle callbacks to complete.  If you would
-like for an idle callback to reschedule itself continuously, it is
-better to use a timer handler with a zero timeout period.
-
-.SH KEYWORDS
-callback, defer, idle callback
diff --git a/doc/DoubleObj.3 b/doc/DoubleObj.3
deleted file mode 100644
index 164d4c9..0000000
--- a/doc/DoubleObj.3
+++ /dev/null
@@ -1,79 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: DoubleObj.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_DoubleObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewDoubleObj, Tcl_SetDoubleObj, Tcl_GetDoubleFromObj \- manipulate Tcl objects as floating-point values
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewDoubleObj\fR(\fIdoubleValue\fR)
-.sp
-\fBTcl_SetDoubleObj\fR(\fIobjPtr, doubleValue\fR)
-.sp
-int
-\fBTcl_GetDoubleFromObj\fR(\fIinterp, objPtr, doublePtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp doubleValue in/out
-.AP double doubleValue in
-A double-precision floating point value used to initialize or set a double object.
-.AP Tcl_Obj *objPtr in/out
-For \fBTcl_SetDoubleObj\fR, this points to the object to be converted
-to double type.
-For \fBTcl_GetDoubleFromObj\fR, this refers to the object
-from which to get a double value; 
-if \fIobjPtr\fR does not already point to a double object,
-an attempt will be made to convert it to one.
-.AP Tcl_Interp *interp in/out
-If an error occurs during conversion,
-an error message is left in the interpreter's result object
-unless \fIinterp\fR is NULL.
-.AP double *doublePtr out
-Points to place to store the double value
-obtained from \fIobjPtr\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to create, modify, and read
-double Tcl objects from C code.
-\fBTcl_NewDoubleObj\fR and \fBTcl_SetDoubleObj\fR
-will create a new object of double type
-or modify an existing object to have double type. 
-Both of these procedures set the object to have the
-double-precision floating point value given by \fIdoubleValue\fR;
-\fBTcl_NewDoubleObj\fR returns a pointer to a newly created object
-with reference count zero.
-Both procedures set the object's type to be double
-and assign the double value to the object's internal representation
-\fIdoubleValue\fR member.
-\fBTcl_SetDoubleObj\fR invalidates any old string representation
-and, if the object is not already a double object,
-frees any old internal representation.
-.PP
-\fBTcl_GetDoubleFromObj\fR attempts to return a double value
-from the Tcl object \fIobjPtr\fR.
-If the object is not already a double object,
-it will attempt to convert it to one.
-If an error occurs during conversion, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-unless \fIinterp\fR is NULL.
-Otherwise, it returns \fBTCL_OK\fR and stores the double value
-in the address given by \fIdoublePtr\fR.
-If the object is not already a double object,
-the conversion will free any old internal representation.
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
-
-.SH KEYWORDS
-double, double object, double type, internal representation, object, object type, string representation
diff --git a/doc/Encoding.3 b/doc/Encoding.3
deleted file mode 100644
index e9329dd..0000000
--- a/doc/Encoding.3
+++ /dev/null
@@ -1,484 +0,0 @@
-'\"
-'\" Copyright (c) 1997-1998 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Encoding.3,v 1.2 1999/04/16 00:46:31 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetEncoding 3 "8.1" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetEncoding, Tcl_FreeEncoding, Tcl_ExternalToUtfDString, Tcl_ExternalToUtf, Tcl_UtfToExternalDString, Tcl_UtfToExternal, Tcl_GetEncodingName, Tcl_SetSystemEncoding, Tcl_GetEncodingNames, Tcl_CreateEncoding, Tcl_GetDefaultEncodingDir, Tcl_SetDefaultEncodingDir \- procedures for creating and using encodings.
-
-
-
-
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Encoding
-\fBTcl_GetEncoding\fR(\fIinterp, name\fR)
-.sp
-void
-\fBTcl_FreeEncoding\fR(\fIencoding\fR)
-.sp
-void 
-\fBTcl_ExternalToUtfDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
-.sp
-int
-\fBTcl_ExternalToUtf\fR(\fIinterp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, 
-	dstCharsPtr\fR)
-.sp
-void 
-\fBTcl_UtfToExternalDString\fR(\fIencoding, src, srcLen, dstPtr\fR)
-.sp
-int
-\fBTcl_UtfToExternal\fR(\fIinterp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, 
-	dstCharsPtr\fR)
-.sp
-char *
-\fBTcl_GetEncodingName\fR(\fIencoding\fR)
-.sp
-int
-\fBTcl_SetSystemEncoding\fR(\fIinterp, name\fR)
-.sp
-void
-\fBTcl_GetEncodingNames\fR(\fIinterp\fR)
-.sp
-Tcl_Encoding
-\fBTcl_CreateEncoding\fR(\fItypePtr\fR)
-
-.sp
-char *
-\fBTcl_GetDefaultEncodingDir\fR(\fIvoid\fR)
-.sp
-void
-\fBTcl_SetDefaultEncodingDir\fR(\fIpath\fR)
-
-
-.SH ARGUMENTS
-.AS Tcl_EncodingState *dstWrotePtr
-.AP Tcl_Interp *interp in
-Interpreter to use for error reporting, or NULL if no error reporting is
-desired.
-.AP "CONST char" *name in
-Name of encoding to load.
-.AP Tcl_Encoding encoding in
-The encoding to query, free, or use for converting text.  If \fIencoding\fR is 
-NULL, the current system encoding is used.
-.AP "CONST char" *src in
-For the \fBTcl_ExternalToUtf\fR functions, an array of bytes in the
-specified encoding that are to be converted to UTF-8.  For the
-\fBTcl_UtfToExternal\fR functions, an array of UTF-8 characters to be
-converted to the specified encoding.  
-.AP int srcLen in 
-Length of \fIsrc\fR in bytes.  If the length is negative, the 
-encoding-specific length of the string is used.
-.AP Tcl_DString *dstPtr out
-Pointer to an uninitialized or free \fBTcl_DString\fR in which the converted
-result will be stored.
-.AP int flags in
-Various flag bits OR-ed together.  
-TCL_ENCODING_START signifies that the
-source buffer is the first block in a (potentially multi-block) input
-stream, telling the conversion routine to reset to an initial state and
-perform any initialization that needs to occur before the first byte is
-converted.  TCL_ENCODING_END signifies that the source buffer is the last
-block in a (potentially multi-block) input stream, telling the conversion
-routine to perform any finalization that needs to occur after the last
-byte is converted and then to reset to an initial state.
-TCL_ENCODING_STOPONERROR signifies that the conversion routine should
-return immediately upon reading a source character that doesn't exist in
-the target encoding; otherwise a default fallback character will
-automatically be substituted.  
-.AP Tcl_EncodingState *statePtr in/out
-Used when converting a (generally long or indefinite length) byte stream
-in a piece by piece fashion.  The conversion routine stores its current
-state in \fI*statePtr\fR after \fIsrc\fR (the buffer containing the
-current piece) has been converted; that state information must be passed
-back when converting the next piece of the stream so the conversion
-routine knows what state it was in when it left off at the end of the
-last piece.  May be NULL, in which case the value specified for \fIflags\fR 
-is ignored and the source buffer is assumed to contain the complete string to
-convert.
-.AP char *dst out
-Buffer in which the converted result will be stored.  No more than
-\fIdstLen\fR bytes will be stored in \fIdst\fR.
-.AP int dstLen in
-The maximum length of the output buffer \fIdst\fR in bytes.
-.AP int *srcReadPtr out
-Filled with the number of bytes from \fIsrc\fR that were actually
-converted.  This may be less than the original source length if there was
-a problem converting some source characters.  May be NULL.
-.AP int *dstWrotePtr out
-Filled with the number of bytes that were actually stored in the output
-buffer as a result of the conversion.  May be NULL.
-.AP int *dstCharsPtr out
-Filled with the number of characters that correspond to the number of bytes
-stored in the output buffer.  May be NULL.
-.AP Tcl_EncodingType *typePtr in
-Structure that defines a new type of encoding.  
-.AP char *path in
-A path to the location of the encoding file.  
-.BE
-.SH INTRODUCTION
-.PP
-These routines convert between Tcl's internal character representation,
-UTF-8, and character representations used by various operating systems or
-file systems, such as Unicode, ASCII, or Shift-JIS.  When operating on
-strings, such as such as obtaining the names of files or displaying
-characters using international fonts, the strings must be translated into
-one or possibly multiple formats that the various system calls can use.  For
-instance, on a Japanese Unix workstation, a user might obtain a filename
-represented in the EUC-JP file encoding and then translate the characters to
-the jisx0208 font encoding in order to display the filename in a Tk widget.
-The purpose of the encoding package is to help bridge the translation gap.
-UTF-8 provides an intermediate staging ground for all the various
-encodings.  In the example above, text would be translated into UTF-8 from
-whatever file encoding the operating system is using.  Then it would be
-translated from UTF-8 into whatever font encoding the display routines
-require.
-.PP
-Some basic encodings are compiled into Tcl.  Others can be defined by the
-user or dynamically loaded from encoding files in a
-platform-independent manner.
-.SH DESCRIPTION
-.PP
-\fBTcl_GetEncoding\fR finds an encoding given its \fIname\fR.  The name may
-refer to a builtin Tcl encoding, a user-defined encoding registered by
-calling \fBTcl_CreateEncoding\fR, or a dynamically-loadable encoding
-file.  The return value is a token that represents the encoding and can be
-used in subsequent calls to procedures such as \fBTcl_GetEncodingName\fR,
-\fBTcl_FreeEncoding\fR, and \fBTcl_UtfToExternal\fR.  If the name did not
-refer to any known or loadable encoding, NULL is returned and an error
-message is returned in \fIinterp\fR.
-.PP
-The encoding package maintains a database of all encodings currently in use.
-The first time \fIname\fR is seen, \fBTcl_GetEncoding\fR returns an
-encoding with a reference count of 1.  If the same \fIname\fR is requested
-further times, then the reference count for that encoding is incremented
-without the overhead of allocating a new encoding and all its associated
-data structures.  
-.PP
-When an \fIencoding\fR is no longer needed, \fBTcl_FreeEncoding\fR
-should be called to release it.  When an \fIencoding\fR is no longer in use
-anywhere (i.e., it has been freed as many times as it has been gotten)
-\fBTcl_FreeEncoding\fR will release all storage the encoding was using
-and delete it from the database. 
-.PP
-\fBTcl_ExternalToUtfDString\fR converts a source buffer \fIsrc\fR from the
-specified \fIencoding\fR into UTF-8.  The converted bytes are stored in 
-\fIdstPtr\fR, which is then NULL terminated.  The caller should eventually
-call \fBTcl_DStringFree\fR to free any information stored in \fIdstPtr\fR.
-When converting, if any of the characters in the source buffer cannot be
-represented in the target encoding, a default fallback character will be
-used.  
-.PP
-\fBTcl_ExternalToUtf\fR converts a source buffer \fIsrc\fR from the specified
-\fIencoding\fR into UTF-8.  Up to \fIsrcLen\fR bytes are converted from the
-source buffer and up to \fIdstLen\fR converted bytes are stored in \fIdst\fR.
-In all cases, \fI*srcReadPtr\fR is filled with the number of bytes that were
-successfully converted from \fIsrc\fR and \fI*dstWrotePtr\fR is filled with
-the corresponding number of bytes that were stored in \fIdst\fR.  The return
-value is one of the following:
-.RS
-.IP \fBTCL_OK\fR 29
-All bytes of \fIsrc\fR were converted.
-.IP \fBTCL_CONVERT_NOSPACE\fR 29
-The destination buffer was not large enough for all of the converted data; as
-many characters as could fit were converted though.
-.IP \fBTCL_CONVERT_MULTIBYTE\fR 29
-The last fews bytes in the source buffer were the beginning of a multibyte
-sequence, but more bytes were needed to complete this sequence.  A
-subsequent call to the conversion routine should pass a buffer containing
-the unconverted bytes that remained in \fIsrc\fR plus some further bytes
-from the source stream to properly convert the formerly split-up multibyte
-sequence.  
-.IP \fBTCL_CONVERT_SYNTAX\fR 29
-The source buffer contained an invalid character sequence.  This may occur
-if the input stream has been damaged or if the input encoding method was
-misidentified.
-.IP \fBTCL_CONVERT_UNKNOWN\fR 29
-The source buffer contained a character that could not be represented in
-the target encoding and TCL_ENCODING_STOPONERROR was specified.  
-.RE
-.LP
-\fBTcl_UtfToExternalDString\fR converts a source buffer \fIsrc\fR from UTF-8 
-into the specified \fIencoding\fR.  The converted bytes are stored in
-\fIdstPtr\fR, which is then terminated with the appropriate encoding-specific
-NULL.  The caller should eventually call \fBTcl_DStringFree\fR to free any
-information stored in \fIdstPtr\fR.  When converting, if any of the
-characters in the source buffer cannot be represented in the target
-encoding, a default fallback character will be used.  
-.PP
-\fBTcl_UtfToExternal\fR converts a source buffer \fIsrc\fR from UTF-8 into
-the specified \fIencoding\fR.  Up to \fIsrcLen\fR bytes are converted from
-the source buffer and up to \fIdstLen\fR converted bytes are stored in
-\fIdst\fR.  In all cases, \fI*srcReadPtr\fR is filled with the number of
-bytes that were successfully converted from \fIsrc\fR and \fI*dstWrotePtr\fR
-is filled with the corresponding number of bytes that were stored in
-\fIdst\fR.  The return values are the same as the return values for
-\fBTcl_ExternalToUtf\fR.
-.PP
-\fBTcl_GetEncodingName\fR is roughly the inverse of \fBTk_GetEncoding\fR.
-Given an \fIencoding\fR, the return value is the \fIname\fR argument that
-was used to create the encoding.  The string returned by 
-\fBTcl_GetEncodingName\fR is only guaranteed to persist until the
-\fIencoding\fR is deleted.  The caller must not modify this string.
-.PP
-\fBTcl_SetSystemEncoding\fR sets the default encoding that should be used
-whenever the user passes a NULL value for the \fIencoding\fR argument to
-any of the other encoding functions.  If \fIname\fR is NULL, the system
-encoding is reset to the default system encoding, \fBbinary\fR.  If the
-name did not refer to any known or loadable encoding, TCL_ERROR is
-returned and an error message is left in \fIinterp\fR.  Otherwise, this
-procedure increments the reference count of the new system encoding,
-decrements the reference count of the old system encoding, and returns
-TCL_OK.
-.PP
-\fBTcl_GetEncodingNames\fR sets the \fIinterp\fR result to a list
-consisting of the names of all the encodings that are currently defined
-or can be dynamically loaded, searching the encoding path specified by
-\fBTcl_SetDefaultEncodingDir\fR.  This procedure does not ensure that the
-dynamically-loadable encoding files contain valid data, but merely that they
-exist.
-.PP
-\fBTcl_CreateEncoding\fR defines a new encoding and registers the C
-procedures that are called back to convert between the encoding and
-UTF-8.  Encodings created by \fBTcl_CreateEncoding\fR are thereafter
-visible in the database used by \fBTcl_GetEncoding\fR.  Just as with the
-\fBTcl_GetEncoding\fR procedure, the return value is a token that
-represents the encoding and can be used in subsequent calls to other
-encoding functions.  \fBTcl_CreateEncoding\fR returns an encoding with a
-reference count of 1. If an encoding with the specified \fIname\fR
-already exists, then its entry in the database is replaced with the new
-encoding; the token for the old encoding will remain valid and continue
-to behave as before, but users of the new token will now call the new
-encoding procedures.  
-.PP
-The \fItypePtr\fR argument to \fBTcl_CreateEncoding\fR contains information 
-about the name of the encoding and the procedures that will be called to
-convert between this encoding and UTF-8.  It is defined as follows:
-.PP
-.CS
-typedef struct Tcl_EncodingType {
-	CONST char *\fIencodingName\fR;
-	Tcl_EncodingConvertProc *\fItoUtfProc\fR;
-	Tcl_EncodingConvertProc *\fIfromUtfProc\fR;
-	Tcl_EncodingFreeProc *\fIfreeProc\fR;
-	ClientData \fIclientData\fR;
-	int \fInullSize\fR;
-} Tcl_EncodingType;  
-.CE
-.PP
-The \fIencodingName\fR provides a string name for the encoding, by
-which it can be referred in other procedures such as
-\fBTcl_GetEncoding\fR.  The \fItoUtfProc\fR refers to a callback
-procedure to invoke to convert text from this encoding into UTF-8.
-The \fIfromUtfProc\fR refers to a callback procedure to invoke to
-convert text from UTF-8 into this encoding.  The \fIfreeProc\fR refers
-to a callback procedure to invoke when this encoding is deleted.  The
-\fIfreeProc\fR field may be NULL.  The \fIclientData\fR contains an
-arbitrary one-word value passed to \fItoUtfProc\fR, \fIfromUtfProc\fR,
-and \fIfreeProc\fR whenever they are called.  Typically, this is a
-pointer to a data structure containing encoding-specific information
-that can be used by the callback procedures.  For instance, two very
-similar encodings such as \fBascii\fR and \fBmacRoman\fR may use the
-same callback procedure, but use different values of \fIclientData\fR
-to control its behavior.  The \fInullSize\fR specifies the number of
-zero bytes that signify end-of-string in this encoding.  It must be
-\fB1\fR (for single-byte or multi-byte encodings like ASCII or
-Shift-JIS) or \fB2\fR (for double-byte encodings like Unicode).
-Constant-sized encodings with 3 or more bytes per character (such as
-CNS11643) are not accepted.
-.PP
-The callback procedures \fItoUtfProc\fR and \fIfromUtfProc\fR should match the
-type \fBTcl_EncodingConvertProc\fR:
-.PP
-.CS
-typedef int Tcl_EncodingConvertProc(
-	ClientData \fIclientData\fR,
-	CONST char *\fIsrc\fR, 
-	int \fIsrcLen\fR, 
-	int \fIflags\fR, 
-	Tcl_Encoding *\fIstatePtr\fR,
-	char *\fIdst\fR, 
-	int \fIdstLen\fR, 
-	int *\fIsrcReadPtr\fR,
-	int *\fIdstWrotePtr\fR,
-	int *\fIdstCharsPtr\fR);
-.CE
-.PP
-The \fItoUtfProc\fR and \fIfromUtfProc\fR procedures are called by the
-\fBTcl_ExternalToUtf\fR or \fBTcl_UtfToExternal\fR family of functions to
-perform the actual conversion.  The \fIclientData\fR parameter to these
-procedures is the same as the \fIclientData\fR field specified to
-\fBTcl_CreateEncoding\fR when the encoding was created.  The remaining
-arguments to the callback procedures are the same as the arguments,
-documented at the top, to \fBTcl_ExternalToUtf\fR or
-\fBTcl_UtfToExternal\fR, with the following exceptions.  If the
-\fIsrcLen\fR argument to one of those high-level functions is negative,
-the value passed to the callback procedure will be the appropriate
-encoding-specific string length of \fIsrc\fR.  If any of the \fIsrcReadPtr\fR, 
-\fIdstWrotePtr\fR, or \fIdstCharsPtr\fR arguments to one of the high-level
-functions is NULL, the corresponding value passed to the callback
-procedure will be a non-NULL location.
-.PP
-The callback procedure \fIfreeProc\fR, if non-NULL, should match the type 
-\fBTcl_EncodingFreeProc\fR:
-.CS
-typedef void Tcl_EncodingFreeProc(
-	ClientData \fIclientData\fR);
-.CE
-.PP
-This \fIfreeProc\fR function is called when the encoding is deleted.  The
-\fIclientData\fR parameter is the same as the \fIclientData\fR field
-specified to \fBTcl_CreateEncoding\fR when the encoding was created.  
-.PP
-
-\fBTcl_GetDefaultEncodingDir\fR and \fBTcl_SetDefaultEncodingDir\fR
-access and set the directory to use when locating the default encoding
-files.  If this value is not NULL, the \fBTclpInitLibraryPath\fR routine
-appends the path to the head of the search path, and uses this path as
-the first place to look into when trying to locate the encoding file.
-
-.SH ENCODING FILES
-Space would prohibit precompiling into Tcl every possible encoding
-algorithm, so many encodings are stored on disk as dynamically-loadable
-encoding files.  This behavior also allows the user to create additional
-encoding files that can be loaded using the same mechanism.  These
-encoding files contain information about the tables and/or escape
-sequences used to map between an external encoding and Unicode.  The
-external encoding may consist of single-byte, multi-byte, or double-byte
-characters.  
-.PP
-Each dynamically-loadable encoding is represented as a text file.  The
-initial line of the file, beginning with a ``#'' symbol, is a comment
-that provides a human-readable description of the file.  The next line
-identifies the type of encoding file.  It can be one of the following
-letters:
-.IP "[1]   \fBS\fR"
-A single-byte encoding, where one character is always one byte long in the
-encoding.  An example is \fBiso8859-1\fR, used by many European languages.
-.IP "[2]   \fBD\fR"
-A double-byte encoding, where one character is always two bytes long in the
-encoding.  An example is \fBbig5\fR, used for Chinese text.
-.IP "[3]   \fBM\fR"
-A multi-byte encoding, where one character may be either one or two bytes long.
-Certain bytes are a lead bytes, indicating that another byte must follow
-and that together the two bytes represent one character.  Other bytes are not
-lead bytes and represent themselves.  An example is \fBshiftjis\fR, used by
-many Japanese computers.
-.IP "[4]   \fBE\fR"
-An escape-sequence encoding, specifying that certain sequences of bytes
-do not represent characters, but commands that describe how following bytes
-should be interpreted.  
-.PP
-The rest of the lines in the file depend on the type.  
-.PP
-Cases [1], [2], and [3] are collectively referred to as table-based encoding
-files.  The lines in a table-based encoding file are in the same
-format as this example taken from the \fBshiftjis\fR encoding (this is not
-the complete file):
-.CS
-# Encoding file: shiftjis, multi-byte
-M
-003F 0 40
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D203E007F
-0080000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8FF3E
-FFE3FF3F30FD30FE309D309E30034EDD30053006300730FC20152010FF0F005C
-301C2016FF5C2026202520182019201C201DFF08FF0930143015FF3BFF3DFF5B
-FF5D30083009300A300B300C300D300E300F30103011FF0B221200B100D70000
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF0400A200A3FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC203B301221922190219121933013000000000000
-000000000000000000000000000000002208220B2286228722822283222A2229
-000000000000000000000000000000002227222800AC21D221D4220022030000
-0000000000000000000000000000000000000000222022A52312220222072261
-2252226A226B221A223D221D2235222B222C0000000000000000000000000000
-212B2030266F266D266A2020202100B6000000000000000025EF000000000000
-.CE
-.PP
-The third line of the file is three numbers.  The first number is the
-fallback character (in base 16) to use when converting from UTF-8 to this
-encoding.  The second number is a \fB1\fR if this file represents the
-encoding for a symbol font, or \fB0\fR otherwise.  The last number (in base
-10) is how many pages of data follow.  
-.PP
-Subsequent lines in the example above are pages that describe how to map
-from the encoding into 2-byte Unicode.  The first line in a page identifies
-the page number.  Following it are 256 double-byte numbers, arranged as 16
-rows of 16 numbers.  Given a character in the encoding, the high byte of
-that character is used to select which page, and the low byte of that
-character is used as an index to select one of the double-byte numbers in
-that page \- the value obtained being the corresponding Unicode character.
-By examination of the example above, one can see that the characters 0x7E
-and 0x8163 in \fBshiftjis\fR map to 203E and 2026 in Unicode, respectively.
-.PP
-Following the first page will be all the other pages, each in the same
-format as the first: one number identifying the page followed by 256
-double-byte Unicode characters.  If a character in the encoding maps to the
-Unicode character 0000, it means that the character doesn't actually exist.
-If all characters on a page would map to 0000, that page can be omitted.
-.PP
-Case [4] is the escape-sequence encoding file.  The lines in an this type of
-file are in the same format as this example taken from the \fBiso2022-jp\fR
-encoding:
-.CS
-.ta 1.5i
-# Encoding file: iso2022-jp, escape-driven
-E
-init		{}
-final		{}
-iso8859-1	\\x1b(B
-jis0201		\\x1b(J
-jis0208		\\x1b$@
-jis0208		\\x1b$B
-jis0212		\\x1b$(D
-gb2312		\\x1b$A
-ksc5601		\\x1b$(C
-.CE
-.PP
-In the file, the first column represents an option and the second column
-is the associated value.  \fBinit\fR is a string to emit or expect before
-the first character is converted, while \fBfinal\fR is a string to emit
-or expect after the last character.  All other options are names of
-table-based encodings; the associated value is the escape-sequence that
-marks that encoding.  Tcl syntax is used for the values; in the above
-example, for instance, ``\fB{}\fR'' represents the empty string and
-``\fB\\x1b\fR'' represents character 27.
-.PP
-When \fBTcl_GetEncoding\fR encounters an encoding \fIname\fR that has not
-been loaded, it attempts to load an encoding file called \fIname\fB.enc\fR
-from the \fBencoding\fR subdirectory of each directory specified in the
-library path \fB$tcl_libPath\fR.  If the encoding file exists, but is
-malformed, an error message will be left in \fIinterp\fR.
-.SH KEYWORDS
-utf, encoding, convert
-
-
-
diff --git a/doc/Eval.3 b/doc/Eval.3
deleted file mode 100644
index bc0effc..0000000
--- a/doc/Eval.3
+++ /dev/null
@@ -1,196 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Eval.3,v 1.4 1999/04/16 00:46:31 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Eval 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_EvalObjEx, Tcl_EvalFile, Tcl_EvalObjv, Tcl_Eval, Tcl_EvalEx, Tcl_GlobalEval, Tcl_GlobalEvalObj, Tcl_VarEval, Tcl_VarEvalVA \- execute Tcl scripts
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-.VS
-int
-\fBTcl_EvalObjEx\fR(\fIinterp, objPtr, flags\fR)
-.sp
-int
-\fBTcl_EvalFile\fR(\fIinterp, fileName\fR)
-.sp
-int
-\fBTcl_EvalObjv\fR(\fIinterp, objc, objv, flags\fR)
-.sp
-int
-\fBTcl_Eval\fR(\fIinterp, script\fR)
-.sp
-int
-\fBTcl_EvalEx\fR(\fIinterp, script, numBytes, flags\fR)
-.sp
-int
-\fBTcl_GlobalEval\fR(\fIinterp, script\fR)
-.sp
-int
-\fBTcl_GlobalEvalObj\fR(\fIinterp, objPtr, flags\fR)
-.sp
-int
-\fBTcl_VarEval\fR(\fIinterp, string, string, ... \fB(char *) NULL\fR)
-.sp
-int
-\fBTcl_VarEvalVA\fR(\fIinterp, argList\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp **termPtr;
-.AP Tcl_Interp *interp in
-Interpreter in which to execute the script.  The interpreter's result is
-modified to hold the result or error message from the script.
-.AP Tcl_Obj *objPtr in
-A Tcl object containing the script to execute.
-.AP int flags in
-ORed combination of flag bits that specify additional options.
-\fBTCL_EVAL_GLOBAL\fR and \fBTCL_EVAL_DIRECT\fR are currently supported.
-.AP char *fileName in
-Name of a file containing a Tcl script.
-.AP int *objc in
-The number of objects in the array pointed to by \fIobjPtr\fR;
-this is also the number of words in the command.
-.AP Tcl_Obj **objv in
-Points to an array of pointers to objects; each object holds the
-value of a single word in the command to execute.
-.AP int numBytes in
-The number of bytes in \fIscript\fR, not including any
-null terminating character.  If \-1, then all characters up to the
-first null byte are used.
-.AP char *script in
-Points to first byte of script to execute.  This script must be in
-writable memory: temporary modifications are made to it during
-parsing.
-.AP char *string in
-String forming part of a Tcl script.
-.AP va_list argList in
-An argument list which must have been initialised using
-\fBTCL_VARARGS_START\fR, and cleared using \fBva_end\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-The procedures described here are invoked to execute Tcl scripts in
-various forms.
-\fBTcl_EvalObjEx\fR is the core procedure and is used by many of the others.
-It executes the commands in the script stored in \fIobjPtr\fR
-until either an error occurs or the end of the script is reached.
-If this is the first time \fIobjPtr\fR has been executed,
-its commands are compiled into bytecode instructions
-which are then executed.  The
-bytecodes are saved in \fIobjPtr\fR so that the compilation step
-can be skipped if the object is evaluated again in the future.
-.PP
-The return value from \fBTcl_EvalObjEx\fR (and all the other procedures
-described here) is a Tcl completion code with
-one of the values \fBTCL_OK\fR, \fBTCL_ERROR\fR, \fBTCL_RETURN\fR,
-\fBTCL_BREAK\fR, or \fBTCL_CONTINUE\fR.
-In addition, a result value or error message is left in \fIinterp\fR's
-result; it can be retrieved using \fBTcl_GetObjResult\fR.
-.PP
-\fBTcl_EvalFile\fR reads the file given by \fIfileName\fR and evaluates
-its contents as a Tcl script.  It returns the same information as
-\fBTcl_EvalObjEx\fR.
-If the file couldn't be read then a Tcl error is returned to describe
-why the file couldn't be read.
-.PP
-\fBTcl_EvalObjv\fR executes a single pre-parsed command instead of a
-script.  The \fIobjc\fR and \fIobjv\fR arguments contain the values
-of the words for the Tcl command, one word in each object in
-\fIobjv\fR.  \fBTcl_EvalObjv\fR evaluates the command and returns
-a completion code and result just like \fBTcl_EvalObjEx\fR.
-.PP
-\fBTcl_Eval\fR is similar to \fBTcl_EvalObjEx\fR except that
-the script to be executed is supplied as a string instead of an
-object and no compilation occurs.  The string is parsed and executed
-directly (using \fBTcl_EvalObjv\fR) instead of compiling it and
-executing the bytecodes.  In situations where it is known that the
-script will never be executed again, \fBTcl_Eval\fR may be
-faster than \fBTcl_EvalObjEx\fR.  \fBTcl_Eval\fR returns a completion
-code and result just like \fBTcl_EvalObjEx\fR.  Note: for backward
-compatibility with versions before Tcl 8.0, \fBTcl_Eval\fR
-copies the object result in \fIinterp\fR to \fIinterp->result\fR
-where it can be accessed directly.  This makes \fBTcl_Eval\fR somewhat
-slower than \fBTcl_EvalEx\fR, which doesn't do the copy.
-.PP
-\fBTcl_EvalEx\fR is an extended version of \fBTcl_Eval\fR that takes
-additional arguments \fInumBytes\fR and \fIflags\fR.  For the
-efficiency reason given above, \fBTcl_EvalEx\fR is generally preferred
-over \fBTcl_Eval\fR.
-.PP
-\fBTcl_GlobalEval\fR and \fBTcl_GlobalEvalObj\fR are older procedures
-that are now deprecated.  They are similar to \fBTcl_EvalEx\fR and
-\fBTcl_EvalObjEx\fR except that the script is evaluated in the global
-namespace and its variable context consists of global variables only
-(it ignores any Tcl procedures that are active).  These functions are
-equivalent to using the \fBTCL_EVAL_GLOBAL\fR flag (see below).
-.PP
-\fBTcl_VarEval\fR takes any number of string arguments
-of any length, concatenates them into a single string,
-then calls \fBTcl_Eval\fR to execute that string as a Tcl command.
-It returns the result of the command and also modifies
-\fIinterp->result\fR in the same way as \fBTcl_Eval\fR.
-The last argument to \fBTcl_VarEval\fR must be NULL to indicate the end
-of arguments.  \fBTcl_VarEval\fR is now deprecated.
-.PP
-\fBTcl_VarEvalVA\fR is the same as \fBTcl_VarEval\fR except that
-instead of taking a variable number of arguments it takes an argument
-list. Like \fBTcl_VarEval\fR, \fBTcl_VarEvalVA\fR is deprecated.
-
-.SH "FLAG BITS"
-Any ORed combination of the following values may be used for the
-\fIflags\fR argument to procedures such as \fBTcl_EvalObjEx\fR:
-.TP 23
-\fBTCL_EVAL_DIRECT\fR
-This flag is only used by \fBTcl_EvalObjEx\fR; it is ignored by
-other procedures.  If this flag bit is set, the script is not
-compiled to bytecodes; instead it is executed directly
-as is done by \fBTcl_EvalEx\fR.  The
-\fBTCL_EVAL_DIRECT\fR flag is useful in situations where the
-contents of an object are going to change immediately, so the
-bytecodes won't be reused in a future execution.  In this case,
-it's faster to execute the script directly.
-.TP 23
-\fBTCL_EVAL_GLOBAL\fR
-If this flag is set, the script is processed at global level.  This
-means that it is evaluated in the global namespace and its variable
-context consists of global variables only (it ignores any Tcl
-procedures at are active).
-
-.SH "MISCELLANEOUS DETAILS"
-.PP
-During the processing of a Tcl command it is legal to make nested
-calls to evaluate other commands (this is how procedures and
-some control structures are implemented).
-If a code other than \fBTCL_OK\fR is returned
-from a nested \fBTcl_EvalObjEx\fR invocation,
-then the caller should normally return immediately,
-passing that same return code back to its caller,
-and so on until the top-level application is reached.
-A few commands, like \fBfor\fR, will check for certain
-return codes, like \fBTCL_BREAK\fR and \fBTCL_CONTINUE\fR, and process them
-specially without returning.
-.PP
-\fBTcl_EvalObjEx\fR keeps track of how many nested \fBTcl_EvalObjEx\fR
-invocations are in progress for \fIinterp\fR.
-If a code of \fBTCL_RETURN\fR, \fBTCL_BREAK\fR, or \fBTCL_CONTINUE\fR is
-about to be returned from the topmost \fBTcl_EvalObjEx\fR
-invocation for \fIinterp\fR,
-it converts the return code to \fBTCL_ERROR\fR
-and sets \fIinterp\fR's result to an error message indicating that
-the \fBreturn\fR, \fBbreak\fR, or \fBcontinue\fR command was
-invoked in an inappropriate place.
-This means that top-level applications should never see a return code
-from \fBTcl_EvalObjEx\fR other then \fBTCL_OK\fR or \fBTCL_ERROR\fR.
-.VE
-
-.SH KEYWORDS
-execute, file, global, object, result, script
diff --git a/doc/Exit.3 b/doc/Exit.3
deleted file mode 100644
index c533efe..0000000
--- a/doc/Exit.3
+++ /dev/null
@@ -1,131 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Exit.3,v 1.3 1999/04/16 00:46:31 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Exit 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Exit, Tcl_Finalize, Tcl_FinalizeThread, Tcl_CreateExitHandler, Tcl_DeleteExitHandler, Tcl_CreateThreadExitHandler, Tcl_DeleteThreadExitHandler \- end the application or thread (and invoke exit handlers)
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_Exit\fR(\fIstatus\fR)
-.sp
-\fBTcl_Finalize\fR()
-.sp
-\fBTcl_CreateExitHandler\fR(\fIproc, clientData\fR)
-.sp
-\fBTcl_DeleteExitHandler\fR(\fIproc, clientData\fR)
-.sp
-\fBTcl_ExitThread\fR(\fIstatus\fR)
-.sp
-\fBTcl_FinalizeThread\fR()
-.sp
-\fBTcl_CreateThreadExitHandler\fR(\fIproc, clientData\fR)
-.sp
-\fBTcl_DeleteThreadExitHandler\fR(\fIproc, clientData\fR)
-.SH ARGUMENTS
-.AS Tcl_ExitProc clientData
-.AP int status  in
-Provides information about why the application or thread exited.
-Exact meaning may
-be platform-specific.  0 usually means a normal exit, any nonzero value
-usually means that an error occurred.
-.AP Tcl_ExitProc *proc in
-Procedure to invoke before exiting application.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-The procedures described here provide a graceful mechanism to end the
-execution of a \fBTcl\fR application. Exit handlers are invoked to cleanup the
-application's state before ending the execution of \fBTcl\fR code.
-.PP
-Invoke \fBTcl_Exit\fR to end a \fBTcl\fR application and to exit from this
-process. This procedure is invoked by the \fBexit\fR command, and can be
-invoked anyplace else to terminate the application.
-No-one should ever invoke the \fBexit\fR system procedure directly;  always
-invoke \fBTcl_Exit\fR instead, so that it can invoke exit handlers.
-Note that if other code invokes \fBexit\fR system procedure directly, or
-otherwise causes the application to terminate without calling
-\fBTcl_Exit\fR, the exit handlers will not be run.
-\fBTcl_Exit\fR internally invokes the \fBexit\fR system call, thus it never
-returns control to its caller.
-.PP
-\fBTcl_Finalize\fR is similar to \fBTcl_Exit\fR except that it does not
-exit from the current process.
-It is useful for cleaning up when a process is finished using \fBTcl\fR but
-wishes to continue executing, and when \fBTcl\fR is used in a dynamically
-loaded extension that is about to be unloaded.
-On some systems \fBTcl\fR is automatically notified when it is being
-unloaded, and it calls \fBTcl_Finalize\fR internally; on these systems it
-not necessary for the caller to explicitly call \fBTcl_Finalize\fR.
-However, to ensure portability, your code should always invoke
-\fBTcl_Finalize\fR when \fBTcl\fR is being unloaded, to ensure that the
-code will work on all platforms. \fBTcl_Finalize\fR can be safely called
-more than once.
-.PP
-.VS
-\fBTcl_ExitThread\fR is used to terminate the current thread and invoke
-per-thread exit handlers.  This finalization is done by
-\fBTcl_FinalizeThread\fR, which you can call if you just want to clean
-up per-thread state and invoke the thread exit handlers.
-\fBTcl_Finalize\fR calls \fBTcl_FinalizeThread\fR for the current
-thread automatically.
-.VE
-.PP
-\fBTcl_CreateExitHandler\fR arranges for \fIproc\fR to be invoked
-by \fBTcl_Finalize\fR and \fBTcl_Exit\fR.
-\fBTcl_CreateThreadExitHandler\fR arranges for \fIproc\fR to be invoked
-by \fBTcl_FinalizeThread\fR and \fBTcl_ExitThread\fR.
-This provides a hook for cleanup operations such as flushing buffers
-and freeing global memory.
-\fIProc\fR should match the type \fBTcl_ExitProc\fR:
-.CS
-typedef void Tcl_ExitProc(ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR parameter to \fIproc\fR is a
-copy of the \fIclientData\fR argument given to
-\fBTcl_CreateExitHandler\fR or \fBTcl_CreateThreadExitHandler\fR when
-the callback
-was created.  Typically, \fIclientData\fR points to a data
-structure containing application-specific information about
-what to do in \fIproc\fR.
-.PP
-\fBTcl_DeleteExitHandler\fR and \fBTcl_DeleteThreadExitHandler\fR may be
-called to delete a
-previously-created exit handler.  It removes the handler
-indicated by \fIproc\fR and \fIclientData\fR so that no call
-to \fIproc\fR will be made.  If no such handler exists then
-\fBTcl_DeleteExitHandler\fR or \fBTcl_DeleteThreadExitHandler\fR does nothing.
-.PP
-.VS
-.PP
-\fBTcl_Finalize\fR and \fBTcl_Exit\fR execute all registered exit handlers,
-in reverse order from the order in which they were registered.
-This matches the natural order in which extensions are loaded and unloaded;
-if extension \fBA\fR loads extension \fBB\fR, it usually
-unloads \fBB\fR before it itself is unloaded.
-If extension \fBA\fR registers its exit handlers before loading extension
-\fBB\fR, this ensures that any exit handlers for \fBB\fR will be executed
-before the exit handlers for \fBA\fR.
-.VE
-.VS
-.PP
-\fBTcl_Finalize\fR and \fBTcl_Exit\fR call \fBTcl_FinalizeThread\fR 
-and the thread exit handlers \fIafter\fR
-the process-wide exit handlers.  This is because thread finalization shuts
-down the I/O channel system, so any attempt at I/O by the global exit
-handlers will vanish into the bitbucket.
-.VE
-
-.SH KEYWORDS
-callback, cleanup, dynamic loading, end application, exit, unloading, thread
diff --git a/doc/ExprLong.3 b/doc/ExprLong.3
deleted file mode 100644
index ba15782..0000000
--- a/doc/ExprLong.3
+++ /dev/null
@@ -1,114 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ExprLong.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ExprLong 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_ExprLong, Tcl_ExprDouble, Tcl_ExprBoolean, Tcl_ExprString \- evaluate an expression
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_ExprLong\fR(\fIinterp, string, longPtr\fR)
-.sp
-int
-\fBTcl_ExprDouble\fR(\fIinterp, string, doublePtr\fR)
-.sp
-int
-\fBTcl_ExprBoolean\fR(\fIinterp, string, booleanPtr\fR)
-.sp
-int
-\fBTcl_ExprString\fR(\fIinterp, string\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *booleanPtr
-.AP Tcl_Interp *interp in
-Interpreter in whose context to evaluate \fIstring\fR or \fIobjPtr\fR.
-.AP char *string in
-Expression to be evaluated.  Must be in writable memory (the expression
-parser makes temporary modifications to the string during parsing, which
-it undoes before returning).
-.AP long *longPtr out
-Pointer to location in which to store the integer value of the
-expression.
-.AP int *doublePtr out
-Pointer to location in which to store the floating-point value of the
-expression.
-.AP int *booleanPtr out
-Pointer to location in which to store the 0/1 boolean value of the
-expression.
-.BE
-
-.SH DESCRIPTION
-.PP
-These four procedures all evaluate the expression
-given by the \fIstring\fR argument
-and return the result in one of four different forms.
-The expression can have any of the forms accepted by the \fBexpr\fR command.
-Note that these procedures have been largely replaced by the
-object-based procedures \fBTcl_ExprLongObj\fR, \fBTcl_ExprDoubleObj\fR,
-\fBTcl_ExprBooleanObj\fR, and \fBTcl_ExprStringObj\fR.
-Those object-based procedures evaluate an expression held in a Tcl object
-instead of a string.
-The object argument can retain an internal representation
-that is more efficient to execute.
-.PP
-The \fIinterp\fR argument refers to an interpreter used to
-evaluate the expression (e.g. for variables and nested Tcl
-commands) and to return error information.
-\fIinterp->result\fR is assumed to be initialized
-in the standard fashion when they are invoked.
-.PP
-For all of these procedures the return value is a standard
-Tcl result: \fBTCL_OK\fR means the expression was successfully
-evaluated, and \fBTCL_ERROR\fR means that an error occurred while
-evaluating the expression.
-If \fBTCL_ERROR\fR is returned then
-\fIinterp->result\fR will hold a message describing the error.
-If an error occurs while executing a Tcl command embedded in
-the expression then that error will be returned.
-.PP
-If the expression is successfully evaluated, then its value is
-returned in one of four forms, depending on which procedure
-is invoked.
-\fBTcl_ExprLong\fR stores an integer value at \fI*longPtr\fR.
-If the expression's actual value is a floating-point number,
-then it is truncated to an integer.
-If the expression's actual value is a non-numeric string then
-an error is returned.
-.PP
-\fBTcl_ExprDouble\fR stores a floating-point value at \fI*doublePtr\fR.
-If the expression's actual value is an integer, it is converted to
-floating-point.
-If the expression's actual value is a non-numeric string then
-an error is returned.
-.PP
-\fBTcl_ExprBoolean\fR stores a 0/1 integer value at \fI*booleanPtr\fR.
-If the expression's actual value is an integer or floating-point
-number, then they store 0 at \fI*booleanPtr\fR if
-the value was zero and 1 otherwise.
-If the expression's actual value is a non-numeric string then
-it must be one of the values accepted by \fBTcl_GetBoolean\fR
-such as ``yes'' or ``no'', or else an error occurs.
-.PP
-\fBTcl_ExprString\fR returns the value of the expression as a
-string stored in \fIinterp->result\fR.
-If the expression's actual value is an integer
-then \fBTcl_ExprString\fR converts it to a string using \fBsprintf\fR
-with a ``%d'' converter.
-If the expression's actual value is a floating-point
-number, then \fBTcl_ExprString\fR calls \fBTcl_PrintDouble\fR
-to convert it to a string.
-
-.SH "SEE ALSO"
-Tcl_ExprLongObj, Tcl_ExprDoubleObj, Tcl_ExprBooleanObj, Tcl_ExprObj
-
-.SH KEYWORDS
-boolean, double, evaluate, expression, integer, object, string
diff --git a/doc/ExprLongObj.3 b/doc/ExprLongObj.3
deleted file mode 100644
index f1e500d..0000000
--- a/doc/ExprLongObj.3
+++ /dev/null
@@ -1,104 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ExprLongObj.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ExprLongObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_ExprLongObj, Tcl_ExprDoubleObj, Tcl_ExprBooleanObj, Tcl_ExprObj \- evaluate an expression
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_ExprLongObj\fR(\fIinterp, objPtr, longPtr\fR)
-.sp
-int
-\fBTcl_ExprDoubleObj\fR(\fIinterp, objPtr, doublePtr\fR)
-.sp
-int
-\fBTcl_ExprBooleanObj\fR(\fIinterp, objPtr, booleanPtr\fR)
-.sp
-int
-\fBTcl_ExprObj\fR(\fIinterp, objPtr, resultPtrPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *resultPtrPtr out
-.AP Tcl_Interp *interp in
-Interpreter in whose context to evaluate \fIstring\fR or \fIobjPtr\fR.
-.AP Tcl_Obj *objPtr in
-Pointer to an object containing the expression to evaluate.
-.AP long *longPtr out
-Pointer to location in which to store the integer value of the
-expression.
-.AP int *doublePtr out
-Pointer to location in which to store the floating-point value of the
-expression.
-.AP int *booleanPtr out
-Pointer to location in which to store the 0/1 boolean value of the
-expression.
-.AP Tcl_Obj *resultPtrPtr out
-Pointer to location in which to store a pointer to the object
-that is the result of the expression.
-.BE
-
-.SH DESCRIPTION
-.PP
-These four procedures all evaluate an expression, returning
-the result in one of four different forms.
-The expression is given by the \fIobjPtr\fR argument, and it
-can have any of the forms accepted by the \fBexpr\fR command.
-.PP
-The \fIinterp\fR argument refers to an interpreter used to
-evaluate the expression (e.g. for variables and nested Tcl
-commands) and to return error information.
-.PP
-For all of these procedures the return value is a standard
-Tcl result: \fBTCL_OK\fR means the expression was successfully
-evaluated, and \fBTCL_ERROR\fR means that an error occurred while
-evaluating the expression.
-If \fBTCL_ERROR\fR is returned,
-then a message describing the error
-can be retrieved using \fBTcl_GetObjResult\fR.
-If an error occurs while executing a Tcl command embedded in
-the expression then that error will be returned.
-.PP
-If the expression is successfully evaluated, then its value is
-returned in one of four forms, depending on which procedure
-is invoked.
-\fBTcl_ExprLongObj\fR stores an integer value at \fI*longPtr\fR.
-If the expression's actual value is a floating-point number,
-then it is truncated to an integer.
-If the expression's actual value is a non-numeric string then
-an error is returned.
-.PP
-\fBTcl_ExprDoubleObj\fR stores a floating-point value at \fI*doublePtr\fR.
-If the expression's actual value is an integer, it is converted to
-floating-point.
-If the expression's actual value is a non-numeric string then
-an error is returned.
-.PP
-\fBTcl_ExprBooleanObj\fR stores a 0/1 integer value at \fI*booleanPtr\fR.
-If the expression's actual value is an integer or floating-point
-number, then they store 0 at \fI*booleanPtr\fR if
-the value was zero and 1 otherwise.
-If the expression's actual value is a non-numeric string then
-it must be one of the values accepted by \fBTcl_GetBoolean\fR
-such as ``yes'' or ``no'', or else an error occurs.
-.PP
-If \fBTcl_ExprObj\fR successfully evaluates the expression,
-it stores a pointer to the Tcl object
-containing the expression's value at \fI*resultPtrPtr\fR.
-In this case, the caller is responsible for calling
-\fBTcl_DecrRefCount\fR to decrement the object's reference count
-when it is finished with the object.
-
-.SH "SEE ALSO"
-Tcl_ExprLong, Tcl_ExprDouble, Tcl_ExprBoolean, Tcl_ExprString, Tcl_GetObjResult
-
-.SH KEYWORDS
-boolean, double, evaluate, expression, integer, object, string
diff --git a/doc/FindExec.3 b/doc/FindExec.3
deleted file mode 100644
index 098c7a2..0000000
--- a/doc/FindExec.3
+++ /dev/null
@@ -1,56 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: FindExec.3,v 1.3 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_FindExecutable 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_FindExecutable, Tcl_GetNameOfExecutable \- identify or return the name of the binary file containing the application
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_FindExecutable\fR(\fIargv0\fR)
-.sp
-CONST char *
-\fBTcl_GetNameOfExecutable\fR()
-.SH ARGUMENTS
-.AS char *argv0 in
-.AP char *argv0 in
-The first command-line argument to the program, which gives the
-application's name.
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBTcl_FindExecutable\fR procedure computes the full path name of
-the executable file from which the application was invoked and saves
-it for Tcl's internal use.
-The executable's path name is needed for several purposes in
-Tcl.  For example, it is needed on some platforms in the
-implementation of the \fBload\fR command.
-It is also returned by the \fBinfo nameofexecutable\fR command.
-.PP
-On UNIX platforms this procedure is typically invoked as the very
-first thing in the application's main program;  it must be passed
-\fIargv[0]\fR as its argument.  \fBTcl_FindExecutable\fR uses \fIargv0\fR
-along with the \fBPATH\fR environment variable to find the
-application's executable, if possible.  If it fails to find
-the binary, then future calls to \fBinfo nameofexecutable\fR
-will return an empty string.
-.PP
-\fBTcl_GetNameOfExecutable\fR simply returns a pointer to the
-internal full path name of the executable file as computed by
-\fBTcl_FindExecutable\fR.  This procedure call is the C API
-equivalent to the \fBinfo nameofexecutable\fR command.  NULL
-is returned if the internal full path name has not been
-computed or unknown.
-
-.SH KEYWORDS
-binary, executable file
diff --git a/doc/GetCwd.3 b/doc/GetCwd.3
deleted file mode 100755
index 4c8d65d..0000000
--- a/doc/GetCwd.3
+++ /dev/null
@@ -1,54 +0,0 @@
-'\"
-'\" Copyright (c) 1998-1999 Scriptics Corportation
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetCwd.3,v 1.2 1999/04/16 00:46:31 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetCwd 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetCwd, Tcl_Chdir \- manipulate the current working directory
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_GetCwd\fR(\fIinterp\fR, \fIbufferPtr\fR)
-.sp
-int
-\fBTcl_Chdir\fR(\fIpath\fR)
-.SH ARGUMENTS
-.AS Tcl_DString *bufferPtr
-.AP Tcl_Interp *interp in
-Interpreter in which to report an error, if any.
-.AP Tcl_DString *bufferPtr in/out
-This dynamic string is used to store the current working directory.
-At the time of the call it should be uninitialized or free.  The
-caller must eventually call \fBTcl_DStringFree\fR to free up
-anything stored here.
-.AP char *path in
-File path in UTF\-8 format.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures may be used to manipulate the current working
-directory for the application.  They provide C\-level access to
-the same functionality as the Tcl \fBpwd\fR command.
-.PP
-\fBTcl_GetCwd\fR returns a pointer to a string specifying the current
-directory, or NULL if the current directory could not be determined.
-If NULL is returned, an error message is left in the interp's result.
-Storage for the result string is allocated in bufferPtr; the caller
-must call \fBTcl_DStringFree()\fR when the result is no longer needed.
-The format of the path is UTF\-8.
-.PP
-\fBTcl_Chdir\fR changes the applications current working directory to
-the value specified in \fIpath\fR.  The format of the passed in string
-must be UTF\-8.  The function returns -1 on error or 0 on success.
-
-.SH KEYWORDS
-pwd
diff --git a/doc/GetIndex.3 b/doc/GetIndex.3
deleted file mode 100644
index 342069a..0000000
--- a/doc/GetIndex.3
+++ /dev/null
@@ -1,100 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetIndex.3,v 1.3 1999/04/16 00:46:31 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetIndexFromObj 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetIndexFromObj \- lookup string in table of keywords
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_GetIndexFromObj\fR(\fIinterp, objPtr, tablePtr, msg, flags,
-indexPtr\fR)
-.VS
-.sp
-int
-\fBTcl_GetIndexFromObjStruct\fR(\fIinterp, objPtr, tablePtr, offset,
-msg, flags, indexPtr\fR)
-.VE
-.SH ARGUMENTS
-.AS Tcl_Interp **tablePtr
-.AP Tcl_Interp *interp in
-Interpreter to use for error reporting; if NULL, then no message is
-provided on errors.
-.AP Tcl_Obj *objPtr in/out
-The string value of this object is used to search through \fItablePtr\fR.
-The internal representation is modified to hold the index of the matching
-table entry.
-.AP char **tablePtr in
-An array of null-terminated strings.  The end of the array is marked
-by a NULL string pointer.
-.VS
-.AP int offset in
-The offset to add to tablePtr to get to the next string in the
-list. The end of the array is marked by a NULL string pointer.
-.VE
-.AP char *msg in
-Null-terminated string describing what is being looked up, such as
-\fBoption\fR.  This string is included in error messages.
-.AP int flags in
-OR-ed combination of bits providing additional information for
-operation.  The only bit that is currently defined is \fBTCL_EXACT\fR.
-.AP int *indexPtr out
-The index of the string in \fItablePtr\fR that matches the value of
-\fIobjPtr\fR is returned here.
-.BE
-
-.SH DESCRIPTION
-.PP
-This procedure provides an efficient way for looking up keywords,
-switch names, option names, and similar things where the value of
-an object must be one of a predefined set of values.
-\fIObjPtr\fR is compared against each of
-the strings in \fItablePtr\fR to find a match.  A match occurs if
-\fIobjPtr\fR's string value is identical to one of the strings in
-\fItablePtr\fR, or if it is a unique abbreviation
-for exactly one of the strings in \fItablePtr\fR and the
-\fBTCL_EXACT\fR flag was not specified; in either case
-the index of the matching entry is stored at \fI*indexPtr\fR
-and TCL_OK is returned.
-.PP
-If there is no matching entry,
-TCL_ERROR is returned and an error message is left in \fIinterp\fR's
-result if \fIinterp\fR isn't NULL.  \fIMsg\fR is included in the
-error message to indicate what was being looked up.  For example,
-if \fImsg\fR is \fBoption\fR the error message will have a form like
-\fBbad option "firt": must be first, second, or third\fR.
-.PP
-If \fBTcl_GetIndexFromObj\fR completes successfully it modifies the
-internal representation of \fIobjPtr\fR to hold the address of
-the table and the index of the matching entry.  If \fBTcl_GetIndexFromObj\fR
-is invoked again with the same \fIobjPtr\fR and \fItablePtr\fR
-arguments (e.g. during a reinvocation of a Tcl command), it returns
-the matching index immediately without having to redo the lookup
-operation.  Note: \fBTcl_GetIndexFromObj\fR assumes that the entries
-in \fItablePtr\fR are static: they must not change between
-invocations.
-.VS
-.PP
-\fBTcl_GetIndexFromObjStruct\fR works just like
-\fBTcl_GetIndexFromObj\fR, except that instead of treating
-\fItablePtr\fR as an array of string pointers, it treats it as the
-first in a series of string ptrs that are spaced apart by \fIoffset\fR
-bytes. This is particularly useful when processing things like
-\fBTk_ConfigurationSpec\fR, whose string keys are in the same place in
-each of several array elements.
-.VE
-
-.SH "SEE ALSO"
-Tcl_WrongNumArgs
-
-.SH KEYWORDS
-index, object, table lookup
diff --git a/doc/GetInt.3 b/doc/GetInt.3
deleted file mode 100644
index 473a12f..0000000
--- a/doc/GetInt.3
+++ /dev/null
@@ -1,81 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetInt.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetInt 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetInt, Tcl_GetDouble, Tcl_GetBoolean \- convert from string to integer, double, or boolean
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_GetInt\fR(\fIinterp, string, intPtr\fR)
-.sp
-int
-\fBTcl_GetDouble\fR(\fIinterp, string, doublePtr\fR)
-.sp
-int
-\fBTcl_GetBoolean\fR(\fIinterp, string, boolPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *doublePtr
-.AP Tcl_Interp *interp in
-Interpreter to use for error reporting.
-.AP char *string in
-Textual value to be converted.
-.AP int *intPtr out
-Points to place to store integer value converted from \fIstring\fR.
-.AP double *doublePtr out
-Points to place to store double-precision floating-point
-value converted from \fIstring\fR.
-.AP int *boolPtr out
-Points to place to store boolean value (0 or 1) converted from \fIstring\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures convert from strings to integers or double-precision
-floating-point values or booleans (represented as 0- or 1-valued
-integers).  Each of the procedures takes a \fIstring\fR argument,
-converts it to an internal form of a particular type, and stores
-the converted value at the location indicated by the procedure's
-third argument.  If all goes well, each of the procedures returns
-TCL_OK.  If \fIstring\fR doesn't have the proper syntax for the
-desired type then TCL_ERROR is returned, an error message is left
-in \fIinterp->result\fR, and nothing is stored at *\fIintPtr\fR
-or *\fIdoublePtr\fR or *\fIboolPtr\fR.
-.PP
-\fBTcl_GetInt\fR expects \fIstring\fR to consist of a collection
-of integer digits, optionally signed and optionally preceded by
-white space.  If the first two characters of \fIstring\fR are ``0x''
-then \fIstring\fR is expected to be in hexadecimal form;  otherwise,
-if the first character of \fIstring\fR is ``0'' then \fIstring\fR
-is expected to be in octal form;  otherwise, \fIstring\fR is
-expected to be in decimal form.
-.PP
-\fBTcl_GetDouble\fR expects \fIstring\fR to consist of a floating-point
-number, which is:  white space;  a sign; a sequence of digits;  a
-decimal point;  a sequence of digits;  the letter ``e'';  and a
-signed decimal exponent.  Any of the fields may be omitted, except that
-the digits either before or after the decimal point must be present
-and if the ``e'' is present then it must be followed by the
-exponent number.
-.PP
-\fBTcl_GetBoolean\fR expects \fIstring\fR to specify a boolean
-value.  If \fIstring\fR is any of \fB0\fR, \fBfalse\fR,
-\fBno\fR, or \fBoff\fR, then \fBTcl_GetBoolean\fR stores a zero
-value at \fI*boolPtr\fR.
-If \fIstring\fR is any of \fB1\fR, \fBtrue\fR, \fByes\fR, or \fBon\fR,
-then 1 is stored at \fI*boolPtr\fR.
-Any of these values may be abbreviated, and upper-case spellings
-are also acceptable.
-
-.SH KEYWORDS
-boolean, conversion, double, floating-point, integer
diff --git a/doc/GetOpnFl.3 b/doc/GetOpnFl.3
deleted file mode 100644
index 38c7a07..0000000
--- a/doc/GetOpnFl.3
+++ /dev/null
@@ -1,61 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetOpnFl.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-.so man.macros
-.TH Tcl_GetOpenFile 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetOpenFile \- Get a standard IO File * handle from a channel. (Unix only)
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_GetOpenFile\fR(\fIinterp, string, write, checkUsage, filePtr\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_Interp checkUsage
-.AP Tcl_Interp *interp in
-Tcl interpreter from which file handle is to be obtained.
-.AP char *string in
-String identifying channel, such as \fBstdin\fR or \fBfile4\fR.
-.AP int write in
-Non-zero means the file will be used for writing, zero means it will
-be used for reading.
-.AP int checkUsage in
-If non-zero, then an error will be generated if the file wasn't opened
-for the access indicated by \fIwrite\fR.
-.AP ClientData *filePtr out
-Points to word in which to store pointer to FILE structure for
-the file given by \fIstring\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_GetOpenFile\fR takes as argument a file identifier of the form
-returned by the \fBopen\fR command and
-returns at \fI*filePtr\fR a pointer to the FILE structure for
-the file.
-The \fIwrite\fR argument indicates whether the FILE pointer will
-be used for reading or writing.
-In some cases, such as a channel that connects to a pipeline of
-subprocesses, different FILE pointers will be returned for reading
-and writing.
-\fBTcl_GetOpenFile\fR normally returns TCL_OK.
-If an error occurs in \fBTcl_GetOpenFile\fR (e.g. \fIstring\fR didn't
-make any sense or \fIcheckUsage\fR was set and the file wasn't opened
-for the access specified by \fIwrite\fR) then TCL_ERROR is returned
-and \fIinterp->result\fR will contain an error message.
-In the current implementation \fIcheckUsage\fR is ignored and consistency
-checks are always performed.
-.VS
-.PP
-Note that this interface is only supported on the Unix platform.
-.VE
-
-.SH KEYWORDS
-channel, file handle, permissions, pipeline, read, write
diff --git a/doc/GetStdChan.3 b/doc/GetStdChan.3
deleted file mode 100644
index 565eaa7..0000000
--- a/doc/GetStdChan.3
+++ /dev/null
@@ -1,73 +0,0 @@
-'\"
-'\" Copyright (c) 1996 by Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetStdChan.3,v 1.2 1998/09/14 18:39:48 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetStdChannel 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_GetStdChannel, Tcl_SetStdChannel \- procedures for retrieving and replacing the standard channels
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Channel
-\fBTcl_GetStdChannel\fR(\fItype\fR)
-.sp
-\fBTcl_SetStdChannel\fR(\fIchannel, type\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_Channel channel in
-.AP int type in
-The identifier for the standard channel to retrieve or modify.  Must be one of
-\fBTCL_STDIN\fR, \fBTCL_STDOUT\fR, or \fBTCL_STDERR\fR.
-.AP Tcl_Channel channel in
-The channel to use as the new value for the specified standard channel.
-.BE
-
-.SH DESCRIPTION
-.PP
-Tcl defines three special channels that are used by various I/O related
-commands if no other channels are specified.  The standard input channel
-has a channel name of \fBstdin\fR and is used by \fBread\fR and \fBgets\fR.
-The standard output channel is named \fBstdout\fR and is used by
-\fBputs\fR.  The standard error channel is named \fBstderr\fR and is used for 
-reporting errors.  In addition, the standard channels are inherited by any
-child processes created using \fBexec\fR or \fBopen\fR in the absence of any
-other redirections.
-.PP
-The standard channels are actually aliases for other normal channels.  The
-current channel associated with a standard channel can be retrieved by calling
-\fBTcl_GetStdChannel\fR with one of 
-\fBTCL_STDIN\fR, \fBTCL_STDOUT\fR, or \fBTCL_STDERR\fR as the \fItype\fR.  The
-return value will be a valid channel, or NULL.
-.PP
-A new channel can be set for the standard channel specified by \fItype\fR 
-by calling \fBTcl_SetStdChannel\fR with a new channel or NULL in the
-\fIchannel\fR argument.  If the specified channel is closed by a later call to
-\fBTcl_Close\fR, then the corresponding standard channel will automatically be
-set to NULL.
-.PP
-If \fBTcl_GetStdChannel\fR is called before \fBTcl_SetStdChannel\fR, Tcl will
-construct a new channel to wrap the appropriate platform-specific standard 
-file handle.  If \fBTcl_SetStdChannel\fR is called before
-\fBTcl_GetStdChannel\fR, then the default channel will not be created.
-.PP
-If one of the standard channels is set to NULL, either by calling
-\fBTcl_SetStdChannel\fR with a null \fIchannel\fR argument, or by calling
-\fBTcl_Close\fR on the channel, then the next call to \fBTcl_CreateChannel\fR
-will automatically set the standard channel with the newly created channel.  If
-more than one standard channel is NULL, then the standard channels will be
-assigned starting with standard input, followed by standard output, with
-standard error being last.
-
-.SH "SEE ALSO"
-Tcl_Close(3), Tcl_CreateChannel(3)
-
-.SH KEYWORDS
-standard channel, standard input, standard output, standard error
diff --git a/doc/GetVersion.3 b/doc/GetVersion.3
deleted file mode 100755
index 0b88dc5..0000000
--- a/doc/GetVersion.3
+++ /dev/null
@@ -1,49 +0,0 @@
-'\"
-'\" Copyright (c) 1999 Scriptics Corporation
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: GetVersion.3,v 1.2 1999/04/16 00:46:32 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_GetVersion 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetVersion \- get the version of the library at runtime
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_GetVersion\fR(\fImajor, minor, patchLevel, type\fR)
-.SH ARGUMENTS
-.AP int *major out
-Major version number of the Tcl library.
-.AP int *minor out
-Minor version number of the Tcl library.
-.AP int *patchLevel out
-The patch level of the Tcl library (or alpha or beta number).
-.AP Tcl_ReleaseType *type out
-The type of release, also indicates the type of patch level. Can be
-one of \fBTCL_ALPHA_RELEASE\fR, \fBTCL_BETA_RELEASE\fR, or 
-\fBTCL_FINAL_RELEASE\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_GetVersion\fR should be used to query the version number
-of the Tcl library at runtime.  This is useful when using a 
-dynamically loaded Tcl library or when writing a stubs-aware
-extension.  For instance, if you write an extension that is
-linked against the Tcl stubs library, it could be loaded into
-a program linked to an older version of Tcl than you expected.
-Use \fBTcl_GetVersion\fR to verify that fact, and possibly to
-change the behavior of your extension.
-.PP
-If may pass a NULL for any of the arguments. For instance if 
-you do not care about the \fIpatchLevel\fR of the library, pass
-a NULL for the \fIpatchLevel\fR argument.
-
-.SH KEYWORDS
-version, patchlevel, major, minor, alpha, beta, release
-
diff --git a/doc/Hash.3 b/doc/Hash.3
deleted file mode 100644
index 0c5bb35..0000000
--- a/doc/Hash.3
+++ /dev/null
@@ -1,208 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Hash.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Hash 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_InitHashTable, Tcl_DeleteHashTable, Tcl_CreateHashEntry, Tcl_DeleteHashEntry, Tcl_FindHashEntry, Tcl_GetHashValue, Tcl_SetHashValue, Tcl_GetHashKey, Tcl_FirstHashEntry, Tcl_NextHashEntry, Tcl_HashStats \- procedures to manage hash tables
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_InitHashTable\fR(\fItablePtr, keyType\fR)
-.sp
-\fBTcl_DeleteHashTable\fR(\fItablePtr\fR)
-.sp
-Tcl_HashEntry *
-\fBTcl_CreateHashEntry\fR(\fItablePtr, key, newPtr\fR)
-.sp
-\fBTcl_DeleteHashEntry\fR(\fIentryPtr\fR)
-.sp
-Tcl_HashEntry *
-\fBTcl_FindHashEntry\fR(\fItablePtr, key\fR)
-.sp
-ClientData
-\fBTcl_GetHashValue\fR(\fIentryPtr\fR)
-.sp
-\fBTcl_SetHashValue\fR(\fIentryPtr, value\fR)
-.sp
-char *
-\fBTcl_GetHashKey\fR(\fItablePtr, entryPtr\fR)
-.sp
-Tcl_HashEntry *
-\fBTcl_FirstHashEntry\fR(\fItablePtr, searchPtr\fR)
-.sp
-Tcl_HashEntry *
-\fBTcl_NextHashEntry\fR(\fIsearchPtr\fR)
-.sp
-char *
-\fBTcl_HashStats\fR(\fItablePtr\fR)
-.SH ARGUMENTS
-.AS Tcl_HashSearch *searchPtr
-.AP Tcl_HashTable *tablePtr in
-Address of hash table structure (for all procedures but
-\fBTcl_InitHashTable\fR, this must have been initialized by
-previous call to \fBTcl_InitHashTable\fR).
-.AP int keyType in
-Kind of keys to use for new hash table.  Must be either
-TCL_STRING_KEYS, TCL_ONE_WORD_KEYS, or an integer value
-greater than 1.
-.AP char *key in
-Key to use for probe into table.  Exact form depends on
-\fIkeyType\fR used to create table.
-.AP int *newPtr out
-The word at \fI*newPtr\fR is set to 1 if a new entry was created
-and 0 if there was already an entry for \fIkey\fR.
-.AP Tcl_HashEntry *entryPtr in
-Pointer to hash table entry.
-.AP ClientData value in
-New value to assign to hash table entry.  Need not have type
-ClientData, but must fit in same space as ClientData.
-.AP Tcl_HashSearch *searchPtr in
-Pointer to record to use to keep track of progress in enumerating
-all the entries in a hash table.
-.BE
-
-.SH DESCRIPTION
-.PP
-A hash table consists of zero or more entries, each consisting of
-a key and a value.
-Given the key for an entry, the hashing routines can very quickly
-locate the entry, and hence its value.
-There may be at most one entry in a hash table with a
-particular key, but many entries may have the same value.
-Keys can take one of three forms:  strings,
-one-word values, or integer arrays.
-All of the keys in a given table have the same form, which is
-specified when the table is initialized.
-.PP
-The value of a hash table entry can be anything that fits in
-the same space as a ``char *'' pointer.
-Values for hash table entries are managed entirely by clients,
-not by the hash module itself.
-Typically each entry's value is a pointer to a data structure
-managed by client code.
-.PP
-Hash tables grow gracefully as the number of entries increases,
-so that there are always less than three entries per hash bucket,
-on average.
-This allows for fast lookups regardless of the number of entries
-in a table.
-.PP
-\fBTcl_InitHashTable\fR initializes a structure that describes
-a new hash table.
-The space for the structure is provided by the caller, not by
-the hash module.
-The value of \fIkeyType\fR indicates what kinds of keys will
-be used for all entries in the table.  \fIKeyType\fR must have
-one of the following values:
-.IP \fBTCL_STRING_KEYS\fR 25
-Keys are null-terminated ASCII strings.
-They are passed to hashing routines using the address of the
-first character of the string.
-.IP \fBTCL_ONE_WORD_KEYS\fR 25
-Keys are single-word values;  they are passed to hashing routines
-and stored in hash table entries as ``char *'' values.
-The pointer value is the key;  it need not (and usually doesn't)
-actually point to a string.
-.IP \fIother\fR 25
-If \fIkeyType\fR is not TCL_STRING_KEYS or TCL_ONE_WORD_KEYS,
-then it must be an integer value greater than 1.
-In this case the keys will be arrays of ``int'' values, where
-\fIkeyType\fR gives the number of ints in each key.
-This allows structures to be used as keys.
-All keys must have the same size.
-Array keys are passed into hashing functions using the address
-of the first int in the array.
-.PP
-\fBTcl_DeleteHashTable\fR deletes all of the entries in a hash
-table and frees up the memory associated with the table's
-bucket array and entries.
-It does not free the actual table structure (pointed to
-by \fItablePtr\fR), since that memory is assumed to be managed
-by the client.
-\fBTcl_DeleteHashTable\fR also does not free or otherwise
-manipulate the values of the hash table entries.
-If the entry values point to dynamically-allocated memory, then
-it is the client's responsibility to free these structures
-before deleting the table.
-.PP
-\fBTcl_CreateHashEntry\fR locates the entry corresponding to a
-particular key, creating a new entry in the table if there
-wasn't already one with the given key.
-If an entry already existed with the given key then \fI*newPtr\fR
-is set to zero.
-If a new entry was created, then \fI*newPtr\fR is set to a non-zero
-value and the value of the new entry will be set to zero.
-The return value from \fBTcl_CreateHashEntry\fR is a pointer to
-the entry, which may be used to retrieve and modify the entry's
-value or to delete the entry from the table.
-.PP
-\fBTcl_DeleteHashEntry\fR will remove an existing entry from a
-table.
-The memory associated with the entry itself will be freed, but
-the client is responsible for any cleanup associated with the
-entry's value, such as freeing a structure that it points to.
-.PP
-\fBTcl_FindHashEntry\fR is similar to \fBTcl_CreateHashEntry\fR
-except that it doesn't create a new entry if the key doesn't exist;
-instead, it returns NULL as result.
-.PP
-\fBTcl_GetHashValue\fR and \fBTcl_SetHashValue\fR are used to
-read and write an entry's value, respectively.
-Values are stored and retrieved as type ``ClientData'', which is
-large enough to hold a pointer value.  On almost all machines this is
-large enough to hold an integer value too.
-.PP
-\fBTcl_GetHashKey\fR returns the key for a given hash table entry,
-either as a pointer to a string, a one-word (``char *'') key, or
-as a pointer to the first word of an array of integers, depending
-on the \fIkeyType\fR used to create a hash table.
-In all cases \fBTcl_GetHashKey\fR returns a result with type
-``char *''.
-When the key is a string or array, the result of \fBTcl_GetHashKey\fR
-points to information in the table entry;  this information will
-remain valid until the entry is deleted or its table is deleted.
-.PP
-\fBTcl_FirstHashEntry\fR and \fBTcl_NextHashEntry\fR may be used
-to scan all of the entries in a hash table.
-A structure of type ``Tcl_HashSearch'', provided by the client,
-is used to keep track of progress through the table.
-\fBTcl_FirstHashEntry\fR initializes the search record and
-returns the first entry in the table (or NULL if the table is
-empty).
-Each subsequent call to \fBTcl_NextHashEntry\fR returns the
-next entry in the table or
-NULL if the end of the table has been reached.
-A call to \fBTcl_FirstHashEntry\fR followed by calls to
-\fBTcl_NextHashEntry\fR will return each of the entries in
-the table exactly once, in an arbitrary order.
-It is unadvisable to modify the structure of the table, e.g.
-by creating or deleting entries, while the search is in
-progress.
-.PP
-\fBTcl_HashStats\fR returns a dynamically-allocated string with
-overall information about a hash table, such as the number of
-entries it contains, the number of buckets in its hash array,
-and the utilization of the buckets.
-It is the caller's responsibility to free the result string
-by passing it to \fBfree\fR.
-.PP
-The header file \fBtcl.h\fR defines the actual data structures
-used to implement hash tables.
-This is necessary so that clients can allocate Tcl_HashTable
-structures and so that macros can be used to read and write
-the values of entries.
-However, users of the hashing routines should never refer directly
-to any of the fields of any of the hash-related data structures;
-use the procedures and macros defined here.
-
-.SH KEYWORDS
-hash table, key, lookup, search, value
diff --git a/doc/IntObj.3 b/doc/IntObj.3
deleted file mode 100644
index 6222498..0000000
--- a/doc/IntObj.3
+++ /dev/null
@@ -1,104 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: IntObj.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_IntObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewIntObj, Tcl_NewLongObj, Tcl_SetIntObj, Tcl_SetLongObj, Tcl_GetIntFromObj, Tcl_GetLongFromObj \- manipulate Tcl objects as integers
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewIntObj\fR(\fIintValue\fR)
-.sp
-Tcl_Obj *
-\fBTcl_NewLongObj\fR(\fIlongValue\fR)
-.sp
-\fBTcl_SetIntObj\fR(\fIobjPtr, intValue\fR)
-.sp
-\fBTcl_SetLongObj\fR(\fIobjPtr, longValue\fR)
-.sp
-int
-\fBTcl_GetIntFromObj\fR(\fIinterp, objPtr, intPtr\fR)
-.sp
-int
-\fBTcl_GetLongFromObj\fR(\fIinterp, objPtr, longPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP int intValue in
-Integer value used to initialize or set an integer object.
-.AP long longValue in
-Long integer value used to initialize or set an integer object.
-.AP Tcl_Obj *objPtr in/out
-For \fBTcl_SetIntObj\fR and \fBTcl_SetLongObj\fR,
-this points to the object to be converted to integer type.
-For \fBTcl_GetIntFromObj\fR and \fBTcl_GetLongFromObj\fR,
-this refers to the object
-from which to get an integer or long integer value; 
-if \fIobjPtr\fR does not already point to an integer object,
-an attempt will be made to convert it to one.
-.AP Tcl_Interp *interp in/out
-If an error occurs during conversion,
-an error message is left in the interpreter's result object
-unless \fIinterp\fR is NULL.
-.AP int *intPtr out
-Points to place to store the integer value
-obtained by \fBTcl_GetIntFromObj\fR from \fIobjPtr\fR.
-.AP long *longPtr out
-Points to place to store the long integer value
-obtained by \fBTcl_GetLongFromObj\fR from \fIobjPtr\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to create, modify, and read
-integer Tcl objects from C code.
-\fBTcl_NewIntObj\fR, \fBTcl_NewLongObj\fR,
-\fBTcl_SetIntObj\fR, and \fBTcl_SetLongObj\fR
-create a new object of integer type
-or modify an existing object to have integer type. 
-\fBTcl_NewIntObj\fR and \fBTcl_SetIntObj\fR set the object to have the
-integer value given by \fIintValue\fR,
-while \fBTcl_NewLongObj\fR and \fBTcl_SetLongObj\fR
-set the object to have the
-long integer value given by \fIlongValue\fR.
-\fBTcl_NewIntObj\fR and \fBTcl_NewLongObj\fR
-return a pointer to a newly created object with reference count zero.
-These procedures set the object's type to be integer
-and assign the integer value to the object's internal representation
-\fIlongValue\fR member.
-\fBTcl_SetIntObj\fR and \fBTcl_SetLongObj\fR
-invalidate any old string representation and,
-if the object is not already an integer object,
-free any old internal representation.
-.PP
-\fBTcl_GetIntFromObj\fR and \fBTcl_GetLongFromObj\fR
-attempt to return an integer value from the Tcl object \fIobjPtr\fR.
-If the object is not already an integer object,
-they will attempt to convert it to one.
-If an error occurs during conversion, they return \fBTCL_ERROR\fR
-and leave an error message in the interpreter's result object
-unless \fIinterp\fR is NULL.
-Also, if the long integer held in the object's internal representation
-\fIlongValue\fR member can not be represented in a (non-long) integer,
-\fBTcl_GetIntFromObj\fR returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-unless \fIinterp\fR is NULL.
-Otherwise, both procedures return \fBTCL_OK\fR and
-store the integer or the long integer value
-in the address given by \fIintPtr\fR and \fIlongPtr\fR respectively.
-If the object is not already an integer object,
-the conversion will free any old internal representation.
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
-
-.SH KEYWORDS
-integer, integer object, integer type, internal representation, object, object type, string representation
diff --git a/doc/Interp.3 b/doc/Interp.3
deleted file mode 100644
index db08dcd..0000000
--- a/doc/Interp.3
+++ /dev/null
@@ -1,125 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Interp.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Interp 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Interp \- client-visible fields of interpreter structures
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-typedef struct {
-	char *\fIresult\fR;
-	Tcl_FreeProc *\fIfreeProc\fR;
-	int \fIerrorLine\fR;
-} Tcl_Interp;
-
-typedef void Tcl_FreeProc(char *\fIblockPtr\fR);
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBTcl_CreateInterp\fR procedure returns a pointer to a Tcl_Interp
-structure.  This pointer is then passed into other Tcl procedures
-to process commands in the interpreter and perform other operations
-on the interpreter.  Interpreter structures contain many many fields
-that are used by Tcl, but only three that may be accessed by
-clients:  \fIresult\fR, \fIfreeProc\fR, and \fIerrorLine\fR.
-.PP
-The \fIresult\fR and \fIfreeProc\fR fields are used to return
-results or error messages from commands.
-This information is returned by command procedures back to \fBTcl_Eval\fR,
-and by \fBTcl_Eval\fR back to its callers.
-The \fIresult\fR field points to the string that represents the
-result or error message, and the \fIfreeProc\fR field tells how
-to dispose of the storage for the string when it isn't needed anymore.
-The easiest way for command procedures to manipulate these
-fields is to call procedures like \fBTcl_SetResult\fR
-or \fBTcl_AppendResult\fR;  they
-will hide all the details of managing the fields.
-The description below is for those procedures that manipulate the
-fields directly.
-.PP
-Whenever a command procedure returns, it must ensure
-that the \fIresult\fR field of its interpreter points to the string
-being returned by the command.
-The \fIresult\fR field must always point to a valid string.
-If a command wishes to return no result then \fIinterp->result\fR
-should point to an empty string.
-Normally, results are assumed to be statically allocated,
-which means that the contents will not change before the next time
-\fBTcl_Eval\fR is called or some other command procedure is invoked.
-.VS
-In this case, the \fIfreeProc\fR field must be zero.
-Alternatively, a command procedure may dynamically
-allocate its return value (e.g. using \fBTcl_Alloc\fR)
-and store a pointer to it in \fIinterp->result\fR.
-In this case, the command procedure must also set \fIinterp->freeProc\fR
-to the address of a procedure that can free the value, or \fBTCL_DYNAMIC\fR
-if the storage was allocated directly by Tcl or by a call to
-\fBTcl_Alloc\fR. 
-.VE
-If \fIinterp->freeProc\fR is non-zero, then Tcl will call \fIfreeProc\fR
-to free the space pointed to by \fIinterp->result\fR before it
-invokes the next command.
-If a client procedure overwrites \fIinterp->result\fR when
-\fIinterp->freeProc\fR is non-zero, then it is responsible for calling
-\fIfreeProc\fR to free the old \fIinterp->result\fR (the \fBTcl_FreeResult\fR
-macro should be used for this purpose).
-.PP
-\fIFreeProc\fR should have arguments and result that match the
-\fBTcl_FreeProc\fR declaration above:  it receives a single
-argument which is a pointer to the result value to free.
-.VS
-In most applications \fBTCL_DYNAMIC\fR is the only non-zero value ever
-used for \fIfreeProc\fR.
-.VE
-However, an application may store a different procedure address
-in \fIfreeProc\fR in order to use an alternate memory allocator
-or in order to do other cleanup when the result memory is freed.
-.PP
-As part of processing each command, \fBTcl_Eval\fR initializes
-\fIinterp->result\fR
-and \fIinterp->freeProc\fR just before calling the command procedure for
-the command.  The \fIfreeProc\fR field will be initialized to zero,
-and \fIinterp->result\fR will point to an empty string.  Commands that
-do not return any value can simply leave the fields alone.
-Furthermore, the empty string pointed to by \fIresult\fR is actually
-part of an array of \fBTCL_RESULT_SIZE\fR characters (approximately 200).
-If a command wishes to return a short string, it can simply copy
-it to the area pointed to by \fIinterp->result\fR.  Or, it can use
-the sprintf procedure to generate a short result string at the location
-pointed to by \fIinterp->result\fR.
-.PP
-It is a general convention in Tcl-based applications that the result
-of an interpreter is normally in the initialized state described
-in the previous paragraph.
-Procedures that manipulate an interpreter's result (e.g. by
-returning an error) will generally assume that the result
-has been initialized when the procedure is called.
-If such a procedure is to be called after the result has been
-changed, then \fBTcl_ResetResult\fR should be called first to
-reset the result to its initialized state.
-.PP
-The \fIerrorLine\fR
-field is valid only after \fBTcl_Eval\fR returns
-a \fBTCL_ERROR\fR return code.  In this situation the \fIerrorLine\fR
-field identifies the line number of the command being executed when
-the error occurred.  The line numbers are relative to the command
-being executed:  1 means the first line of the command passed to
-\fBTcl_Eval\fR, 2 means the second line, and so on.
-The \fIerrorLine\fR field is typically used in conjunction with
-\fBTcl_AddErrorInfo\fR to report information about where an error
-occurred.
-\fIErrorLine\fR should not normally be modified except by \fBTcl_Eval\fR.
-
-.SH KEYWORDS
-free, initialized, interpreter, malloc, result
diff --git a/doc/LinkVar.3 b/doc/LinkVar.3
deleted file mode 100644
index 25d3c17..0000000
--- a/doc/LinkVar.3
+++ /dev/null
@@ -1,115 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: LinkVar.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_LinkVar 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_LinkVar, Tcl_UnlinkVar, Tcl_UpdateLinkedVar \- link Tcl variable to C variable
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_LinkVar\fR(\fIinterp, varName, addr, type\fR)
-.sp
-\fBTcl_UnlinkVar\fR(\fIinterp, varName\fR)
-.sp
-\fBTcl_UpdateLinkedVar\fR(\fIinterp, varName\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp writable
-.AP Tcl_Interp *interp in
-Interpreter that contains \fIvarName\fR.
-Also used by \fBTcl_LinkVar\fR to return error messages.
-.AP char *varName in
-Name of global variable.  Must be in writable memory: Tcl may make
-temporary modifications to it while parsing the variable name.
-.AP char *addr in
-Address of C variable that is to be linked to \fIvarName\fR.
-.AP int type in
-Type of C variable.  Must be one of TCL_LINK_INT, TCL_LINK_DOUBLE,
-TCL_LINK_BOOLEAN, or TCL_LINK_STRING, optionally OR'ed with
-TCL_LINK_READ_ONLY to make Tcl variable read-only.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_LinkVar\fR uses variable traces to keep the Tcl variable
-named by \fIvarName\fR in sync with the C variable at the address
-given by \fIaddr\fR.
-Whenever the Tcl variable is read the value of the C variable will
-be returned, and whenever the Tcl variable is written the C
-variable will be updated to have the same value.
-\fBTcl_LinkVar\fR normally returns TCL_OK;  if an error occurs
-while setting up the link (e.g. because \fIvarName\fR is the
-name of array) then TCL_ERROR is returned and \fIinterp->result\fR
-contains an error message.
-.PP
-The \fItype\fR argument specifies the type of the C variable,
-and must have one of the following values, optionally OR'ed with
-TCL_LINK_READ_ONLY:
-.TP
-\fBTCL_LINK_INT\fR
-The C variable is of type \fBint\fR.
-Any value written into the Tcl variable must have a proper integer
-form acceptable to \fBTcl_GetInt\fR;  attempts to write
-non-integer values into \fIvarName\fR will be rejected with
-Tcl errors.
-.TP
-\fBTCL_LINK_DOUBLE\fR
-The C variable is of type \fBdouble\fR.
-Any value written into the Tcl variable must have a proper real
-form acceptable to \fBTcl_GetDouble\fR;  attempts to write
-non-real values into \fIvarName\fR will be rejected with
-Tcl errors.
-.TP
-\fBTCL_LINK_BOOLEAN\fR
-The C variable is of type \fBint\fR.
-If its value is zero then it will read from Tcl as ``0'';
-otherwise it will read from Tcl as ``1''.
-Whenever \fIvarName\fR is
-modified, the C variable will be set to a 0 or 1 value.
-Any value written into the Tcl variable must have a proper boolean
-form acceptable to \fBTcl_GetBoolean\fR;  attempts to write
-non-boolean values into \fIvarName\fR will be rejected with
-Tcl errors.
-.TP
-\fBTCL_LINK_STRING\fR
-The C variable is of type \fBchar *\fR.
-.VS
-If its value is not null then it must be a pointer to a string
-allocated with \fBTcl_Alloc\fR.
-.VE
-Whenever the Tcl variable is modified the current C string will be
-freed and new memory will be allocated to hold a copy of the variable's
-new value.
-If the C variable contains a null pointer then the Tcl variable
-will read as ``NULL''.
-.PP
-If the TCL_LINK_READ_ONLY flag is present in \fItype\fR then the
-variable will be read-only from Tcl, so that its value can only be
-changed by modifying the C variable.
-Attempts to write the variable from Tcl will be rejected with errors.
-.PP
-\fBTcl_UnlinkVar\fR removes the link previously set up for the
-variable given by \fIvarName\fR.  If there does not exist a link
-for \fIvarName\fR then the procedure has no effect.
-.PP
-\fBTcl_UpdateLinkedVar\fR may be invoked after the C variable has
-changed to force the Tcl variable to be updated immediately.
-In many cases this procedure is not needed, since any attempt to
-read the Tcl variable will return the latest value of the C variable.
-However, if a trace has been set on the Tcl variable (such as a
-Tk widget that wishes to display the value of the variable), the
-trace will not trigger when the C variable has changed.
-\fBTcl_UpdateLinkedVar\fR ensures that any traces on the Tcl
-variable are invoked.
-
-.SH KEYWORDS
-boolean, integer, link, read-only, real, string, traces, variable
diff --git a/doc/ListObj.3 b/doc/ListObj.3
deleted file mode 100644
index c36bdfe..0000000
--- a/doc/ListObj.3
+++ /dev/null
@@ -1,249 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ListObj.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ListObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_ListObjAppendList, Tcl_ListObjAppendElement, Tcl_NewListObj, Tcl_SetListObj, Tcl_ListObjGetElements, Tcl_ListObjLength, Tcl_ListObjIndex, Tcl_ListObjReplace \- manipulate Tcl objects as lists
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_ListObjAppendList\fR(\fIinterp, listPtr, elemListPtr\fR)
-.sp
-int
-\fBTcl_ListObjAppendElement\fR(\fIinterp, listPtr, objPtr\fR)
-.sp
-Tcl_Obj *
-\fBTcl_NewListObj\fR(\fIobjc, objv\fR)
-.sp
-\fBTcl_SetListObj\fR(\fIobjPtr, objc, objv\fR)
-.sp
-int
-\fBTcl_ListObjGetElements\fR(\fIinterp, listPtr, objcPtr, objvPtr\fR)
-.sp
-int
-\fBTcl_ListObjLength\fR(\fIinterp, listPtr, intPtr\fR)
-.sp
-int
-\fBTcl_ListObjIndex\fR(\fIinterp, listPtr, index, objPtrPtr\fR)
-.sp
-int
-\fBTcl_ListObjReplace\fR(\fIinterp, listPtr, first, count, objc, objv\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp "*CONST objv[]" out
-.AP Tcl_Interp *interp in
-If an error occurs while converting an object to be a list object,
-an error message is left in the interpreter's result object
-unless \fIinterp\fR is NULL.
-.AP Tcl_Obj *listPtr in/out
-Points to the list object to be manipulated.
-If \fIlistPtr\fR does not already point to a list object,
-an attempt will be made to convert it to one.
-.AP Tcl_Obj *elemListPtr in/out
-For \fBTcl_ListObjAppendList\fR, this points to a list object
-containing elements to be appended onto \fIlistPtr\fR.
-Each element of *\fIelemListPtr\fR will
-become a new element of \fIlistPtr\fR.
-If *\fIelemListPtr\fR is not NULL and
-does not already point to a list object,
-an attempt will be made to convert it to one.
-.AP Tcl_Obj *objPtr in
-For \fBTcl_ListObjAppendElement\fR,
-points to the Tcl object that will be appended to \fIlistPtr\fR.
-For \fBTcl_SetListObj\fR,
-this points to the Tcl object that will be converted to a list object
-containing the \fIobjc\fR elements of the array referenced by \fIobjv\fR.
-.AP int *objcPtr in
-Points to location where \fBTcl_ListObjGetElements\fR
-stores the number of element objects in \fIlistPtr\fR.
-.AP Tcl_Obj ***objvPtr out
-A location where \fBTcl_ListObjGetElements\fR stores a pointer to an array
-of pointers to the element objects of \fIlistPtr\fR.  
-.AP int objc in
-The number of Tcl objects that \fBTcl_NewListObj\fR
-will insert into a new list object,
-and \fBTcl_ListObjReplace\fR will insert into \fIlistPtr\fR.
-For \fBTcl_SetListObj\fR,
-the number of Tcl objects to insert into \fIobjPtr\fR.
-.VS
-.TP 
-Tcl_Obj	*CONST \fIobjv\fR[]	(in)
-.
-An array of pointers to objects.
-\fBTcl_NewListObj\fR will insert these objects into a new list object
-and \fBTcl_ListObjReplace\fR will insert them into an existing \fIlistPtr\fR.
-Each object will become a separate list element.  
-.VE
-.AP int *intPtr out
-Points to location where \fBTcl_ListObjLength\fR
-stores the length of the list.
-.AP int index in
-Index of the list element that \fBTcl_ListObjIndex\fR
-is to return.
-The first element has index 0.
-.AP Tcl_Obj **objPtrPtr out
-Points to place where \fBTcl_ListObjIndex\fR is to store
-a pointer to the resulting list element object.
-.AP int first in
-Index of the starting list element that \fBTcl_ListObjReplace\fR
-is to replace.
-The list's first element has index 0.
-.AP int count in
-The number of elements that \fBTcl_ListObjReplace\fR
-is to replace.
-.BE
-
-.SH DESCRIPTION
-.PP
-Tcl list objects have an internal representation that supports
-the efficient indexing and appending.
-The procedures described in this man page are used to
-create, modify, index, and append to Tcl list objects from C code.
-.PP
-\fBTcl_ListObjAppendList\fR and \fBTcl_ListObjAppendElement\fR
-both add one or more objects
-to the end of the list object referenced by \fIlistPtr\fR.
-\fBTcl_ListObjAppendList\fR appends each element of the list object
-referenced by \fIelemListPtr\fR while
-\fBTcl_ListObjAppendElement\fR appends the single object
-referenced by \fIobjPtr\fR.
-Both procedures will convert the object referenced by \fIlistPtr\fR
-to a list object if necessary.
-If an error occurs during conversion,
-both procedures return \fBTCL_ERROR\fR and leave an error message
-in the interpreter's result object if \fIinterp\fR is not NULL.
-Similarly, if \fIelemListPtr\fR does not already refer to a list object,
-\fBTcl_ListObjAppendList\fR will attempt to convert it to one
-and if an error occurs during conversion,
-will return \fBTCL_ERROR\fR
-and leave an error message in the interpreter's result object
-if interp is not NULL.
-Both procedures invalidate any old string representation of \fIlistPtr\fR
-and, if it was converted to a list object,
-free any old internal representation.
-Similarly, \fBTcl_ListObjAppendList\fR frees any old internal representation
-of \fIelemListPtr\fR if it converts it to a list object.
-After appending each element in \fIelemListPtr\fR,
-\fBTcl_ListObjAppendList\fR increments the element's reference count
-since \fIlistPtr\fR now also refers to it.
-For the same reason, \fBTcl_ListObjAppendElement\fR
-increments \fIobjPtr\fR's reference count.
-If no error occurs,
-the two procedures return \fBTCL_OK\fR after appending the objects.
-.PP
-\fBTcl_NewListObj\fR and \fBTcl_SetListObj\fR
-create a new object or modify an existing object to hold 
-the \fIobjc\fR elements of the array referenced by \fIobjv\fR
-where each element is a pointer to a Tcl object.
-If \fIobjc\fR is less than or equal to zero,
-they return an empty object.
-The new object's string representation is left invalid.
-The two procedures increment the reference counts
-of the elements in \fIobjc\fR since the list object now refers to them.
-The new list object returned by \fBTcl_NewListObj\fR
-has reference count zero.
-.PP
-\fBTcl_ListObjGetElements\fR returns a count and
-a pointer to an array of the elements in a list object.
-It returns the count by storing it in the address \fIobjcPtr\fR.
-Similarly, it returns the array pointer by storing it
-in the address \fIobjvPtr\fR.
-If \fIlistPtr\fR is not already a list object,
-\fBTcl_ListObjGetElements\fR will attempt to convert it to one;
-if the conversion fails, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-if \fIinterp\fR is not NULL.
-Otherwise it returns \fBTCL_OK\fR after storing the count and array pointer.
-.PP
-\fBTcl_ListObjLength\fR returns the number of elements in the list object
-referenced by \fIlistPtr\fR.
-It returns this count by storing an integer in the address \fIintPtr\fR.
-If the object is not already a list object,
-\fBTcl_ListObjLength\fR will attempt to convert it to one;
-if the conversion fails, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-if \fIinterp\fR is not NULL.
-Otherwise it returns \fBTCL_OK\fR after storing the list's length.
-.PP
-The procedure \fBTcl_ListObjIndex\fR returns a pointer to the object
-at element \fIindex\fR in the list referenced by \fIlistPtr\fR.
-It returns this object by storing a pointer to it
-in the address \fIobjPtrPtr\fR.
-If \fIlistPtr\fR does not already refer to a list object,
-\fBTcl_ListObjIndex\fR will attempt to convert it to one;
-if the conversion fails, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-if \fIinterp\fR is not NULL.
-If the index is out of range,
-that is, \fIindex\fR is negative or
-greater than or equal to the number of elements in the list,
-\fBTcl_ListObjIndex\fR stores a NULL in \fIobjPtrPtr\fR
-and returns \fBTCL_OK\fR.
-Otherwise it returns \fBTCL_OK\fR after storing the element's
-object pointer.
-The reference count for the list element is not incremented;
-the caller must do that if it needs to retain a pointer to the element.
-.PP
-\fBTcl_ListObjReplace\fR replaces zero or more elements
-of the list referenced by \fIlistPtr\fR
-with the \fIobjc\fR objects in the array referenced by \fIobjv\fR.
-If \fIlistPtr\fR does not point to a list object,
-\fBTcl_ListObjReplace\fR will attempt to convert it to one;
-if the conversion fails, it returns \fBTCL_ERROR\fR
-and leaves an error message in the interpreter's result object
-if \fIinterp\fR is not NULL.
-Otherwise, it returns \fBTCL_OK\fR after replacing the objects.
-If \fIobjv\fR is NULL, no new elements are added.
-If the argument \fIfirst\fR is zero or negative,
-it refers to the first element.
-If \fIfirst\fR is greater than or equal to the
-number of elements in the list, then no elements are deleted;
-the new elements are appended to the list.
-\fIcount\fR gives the number of elements to replace.
-If \fIcount\fR is zero or negative then no elements are deleted;
-the new elements are simply inserted before the one
-designated by \fIfirst\fR.
-\fBTcl_ListObjReplace\fR invalidates \fIlistPtr\fR's
-old string representation.
-The reference counts of any elements inserted from \fIobjv\fR
-are incremented since the resulting list now refers to them.
-Similarly, the reference counts for any replaced objects are decremented.
-.PP
-Because \fBTcl_ListObjReplace\fR combines
-both element insertion and deletion,
-it can be used to implement a number of list operations.
-For example, the following code inserts the \fIobjc\fR objects
-referenced by the array of object pointers \fIobjv\fR
-just before the element \fIindex\fR of the list referenced by \fIlistPtr\fR:
-.CS
-result = Tcl_ListObjReplace(interp, listPtr, index, 0, objc, objv);
-.CE
-Similarly, the following code appends the \fIobjc\fR objects
-referenced by the array \fIobjv\fR
-to the end of the list \fIlistPtr\fR:
-.CS
-result = Tcl_ListObjLength(interp, listPtr, &length);
-if (result == TCL_OK) {
-	result = Tcl_ListObjReplace(interp, listPtr, length, 0, objc, objv);
-}
-.CE
-The \fIcount\fR list elements starting at \fIfirst\fR can be deleted
-by simply calling \fBTcl_ListObjReplace\fR
-with a NULL \fIobjvPtr\fR:
-.CS
-result = Tcl_ListObjReplace(interp, listPtr, first, count, 0, NULL);
-.CE
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
-
-.SH KEYWORDS
-append, index, insert, internal representation, length, list, list object, list type, object, object type, replace, string representation
diff --git a/doc/Notifier.3 b/doc/Notifier.3
deleted file mode 100644
index dcd8250..0000000
--- a/doc/Notifier.3
+++ /dev/null
@@ -1,537 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Notifier.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Notifier 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.VS
-.SH NAME
-Tcl_CreateEventSource, Tcl_DeleteEventSource, Tcl_SetMaxBlockTime, Tcl_QueueEvent, Tcl_DeleteEvents, Tcl_WaitForEvent, Tcl_SetTimer, Tcl_ServiceAll, Tcl_ServiceEvent, Tcl_GetServiceMode, Tcl_SetServiceMode \- the event queue and notifier interfaces
-
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_CreateEventSource\fR(\fIsetupProc, checkProc, clientData\fB)\fR
-.sp
-\fBTcl_DeleteEventSource\fR(\fIsetupProc, checkProc, clientData\fB)\fR
-.sp
-\fBTcl_SetMaxBlockTime\fR(\fItimePtr\fB)\fR
-.sp
-\fBTcl_QueueEvent\fR(\fIevPtr, position\fR)
-.VS
-.sp
-\fBTcl_DeleteEvents\fR(\fIdeleteProc, clientData\fR)
-.sp
-int
-\fBTcl_WaitForEvent\fR(\fItimePtr\fR)
-.sp
-\fBTcl_SetTimer\fR(\fItimePtr\fR)
-.sp
-int
-\fBTcl_ServiceAll\fR()
-.sp
-int
-\fBTcl_ServiceEvent\fR(\fIflags\fR)
-.sp
-int
-\fBTcl_GetServiceMode\fR()
-.sp
-int		
-\fBTcl_SetServiceMode\fR(\fImode\fR)
-.VE
-
-.SH ARGUMENTS
-.AS Tcl_EventDeleteProc milliseconds
-.AS Tcl_EventSetupProc *setupProc
-.AP Tcl_EventSetupProc *setupProc in
-Procedure to invoke to prepare for event wait in \fBTcl_DoOneEvent\fR.
-.AP Tcl_EventCheckProc *checkProc in
-Procedure for \fBTcl_DoOneEvent\fR to invoke after waiting for
-events.  Checks to see if any events have occurred and, if so,
-queues them.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIsetupProc\fR, \fIcheckProc\fR, or
-\fIdeleteProc\fR.
-.AP Tcl_Time *timePtr in
-Indicates the maximum amount of time to wait for an event.  This
-is specified as an interval (how long to wait), not an absolute
-time (when to wakeup).  If the pointer passed to \fBTcl_WaitForEvent\fR
-is NULL, it means there is no maximum wait time:  wait forever if
-necessary.
-.AP Tcl_Event *evPtr in
-An event to add to the event queue.  The storage for the event must
-have been allocated by the caller using \fBTcl_Alloc\fR or \fBckalloc\fR.
-.AP Tcl_QueuePosition position in
-Where to add the new event in the queue:  \fBTCL_QUEUE_TAIL\fR,
-\fBTCL_QUEUE_HEAD\fR, or \fBTCL_QUEUE_MARK\fR.
-.AP int flags in
-What types of events to service.  These flags are the same as those
-passed to \fBTcl_DoOneEvent\fR.
-.AP Tcl_EventDeleteProc *deleteProc in
-Procedure to invoke for each queued event in \fBTcl_DeleteEvents\fR.
-.VS
-.AP int mode in
-Inidicates whether events should be serviced by \fBTcl_ServiceAll\fR.
-Must be one of \fBTCL_SERVICE_NONE\fR or \fBTCL_SERVICE_ALL\fR.
-.VE
-.BE
-
-.SH INTRODUCTION
-.PP
-.VS
-The interfaces described here are used to customize the Tcl event
-loop.  The two most common customizations are to add new sources of
-events and to merge Tcl's event loop with some other event loop, such
-as one provided by an application in which Tcl is embedded.  Each of
-these tasks is described in a separate section below.
-.VE
-.PP
-The procedures in this manual entry are the building blocks out of which
-the Tcl event notifier is constructed.  The event notifier is the lowest
-layer in the Tcl event mechanism.  It consists of three things:
-.IP [1]
-Event sources: these represent the ways in which events can be
-generated.  For example, there is a timer event source that implements
-the \fBTcl_CreateTimerHandler\fR procedure and the \fBafter\fR
-command, and there is a file event source that implements the
-\fBTcl_CreateFileHandler\fR procedure on Unix systems.  An event
-source must work with the notifier to detect events at the right
-times, record them on the event queue, and eventually notify
-higher-level software that they have occurred.  The procedures
-\fBTcl_CreateEventSource\fR, \fBTcl_DeleteEventSource\fR,
-and \fBTcl_SetMaxBlockTime\fR, \fBTcl_QueueEvent\fR, and
-\fBTcl_DeleteEvents\fR are used primarily by event sources.
-.IP [2]
-The event queue: there is a single queue for the whole application,
-containing events that have been detected but not yet serviced.  Event
-sources place events onto the queue so that they may be processed in
-order at appropriate times during the event loop. The event queue
-guarantees a fair discipline of event handling, so that no event
-source can starve the others.  It also allows events to be saved for
-servicing at a future time.
-.VS
-\fBTcl_QueueEvent\fR is used (primarily
-by event sources) to add events to the event queue and 
-\fBTcl_DeleteEvents\fR is used to remove events from the queue without
-processing them.
-.IP [3]
-The event loop: in order to detect and process events, the application
-enters a loop that waits for events to occur, places them on the event
-queue, and then processes them.  Most applications will do this by
-calling the procedure \fBTcl_DoOneEvent\fR, which is described in a
-separate manual entry.
-.PP
-Most Tcl applications need not worry about any of the internals of
-the Tcl notifier.  However, the notifier now has enough flexibility
-to be retargeted either for a new platform or to use an external event
-loop (such as the Motif event loop, when Tcl is embedded in a Motif
-application).  The procedures \fBTcl_WaitForEvent\fR and
-\fBTcl_SetTimer\fR are normally implemented by Tcl, but may be
-replaced with new versions to retarget the notifier (the \fBTcl_Sleep\fR,
-\fBTcl_CreateFileHandler\fR, and \fBTcl_DeleteFileHandler\fR must
-also be replaced; see CREATING A NEW NOTIFIER below for details).
-The procedures \fBTcl_ServiceAll\fR, \fBTcl_ServiceEvent\fR,
-\fBTcl_GetServiceMode\fR, and \fBTcl_SetServiceMode\fR are provided
-to help connect Tcl's event loop to an external event loop such as
-Motif's.
-.SH "NOTIFIER BASICS"
-.VE
-.PP
-The easiest way to understand how the notifier works is to consider
-what happens when \fBTcl_DoOneEvent\fR is called.
-\fBTcl_DoOneEvent\fR is passed a \fIflags\fR argument that indicates
-what sort of events it is OK to process and also whether or not to
-block if no events are ready.  \fBTcl_DoOneEvent\fR does the following
-things:
-.IP [1]
-Check the event queue to see if it contains any events that can
-be serviced.  If so, service the first possible event, remove it
-.VS
-from the queue, and return.  It does this by calling
-\fBTcl_ServiceEvent\fR and passing in the \fIflags\fR argument.
-.VE
-.IP [2]
-Prepare to block for an event.  To do this, \fBTcl_DoOneEvent\fR
-invokes a \fIsetup procedure\fR in each event source.
-The event source will perform event-source specific initialization and
-.VS
-possibly call \fBTcl_SetMaxBlockTime\fR to limit how long
-.VE
-\fBTcl_WaitForEvent\fR will block if no new events occur.
-.IP [3]
-Call \fBTcl_WaitForEvent\fR.  This procedure is implemented differently
-on different platforms;  it waits for an event to occur, based on the
-information provided by the event sources.
-It may cause the application to block if \fItimePtr\fR specifies
-an interval other than 0.
-\fBTcl_WaitForEvent\fR returns when something has happened,
-such as a file becoming readable or the interval given by \fItimePtr\fR
-expiring.  If there are no events for \fBTcl_WaitForEvent\fR to
-wait for, so that it would block forever, then it returns immediately
-and \fBTcl_DoOneEvent\fR returns 0.
-.IP [4]
-Call a \fIcheck procedure\fR in each event source.  The check
-procedure determines whether any events of interest to this source
-occurred.  If so, the events are added to the event queue.
-.IP [5]
-Check the event queue to see if it contains any events that can
-be serviced.  If so, service the first possible event, remove it
-from the queue, and return.
-.IP [6]
-See if there are idle callbacks pending. If so, invoke all of them and
-return.
-.IP [7]
-Either return 0 to indicate that no events were ready, or go back to
-step [2] if blocking was requested by the caller.
-
-.SH "CREATING A NEW EVENT SOURCE"
-.PP
-An event source consists of three procedures invoked by the notifier,
-plus additional C procedures that are invoked by higher-level code
-to arrange for event-driven callbacks.  The three procedures called
-by the notifier consist of the setup and check procedures described
-above, plus an additional procedure that is invoked when an event
-is removed from the event queue for servicing.
-.PP
-The procedure \fBTcl_CreateEventSource\fR creates a new event source.
-Its arguments specify the setup procedure and check procedure for
-the event source.
-\fISetupProc\fR should match the following prototype:
-.CS
-typedef void Tcl_EventSetupProc(
-	ClientData \fIclientData\fR,
-	int \fIflags\fR);
-.CE
-The \fIclientData\fR argument will be the same as the \fIclientData\fR
-argument to \fBTcl_CreateEventSource\fR;  it is typically used to
-point to private information managed by the event source.
-The \fIflags\fR argument will be the same as the \fIflags\fR
-argument passed to \fBTcl_DoOneEvent\fR except that it will never
-be 0 (\fBTcl_DoOneEvent\fR replaces 0 with \fBTCL_ALL_EVENTS\fR).
-\fIFlags\fR indicates what kinds of events should be considered;
-if the bit corresponding to this event source isn't set, the event
-source should return immediately without doing anything.  For
-example, the file event source checks for the \fBTCL_FILE_EVENTS\fR
-bit.
-.PP
-\fISetupProc\fR's job is to make sure that the application wakes up
-when events of the desired type occur.  This is typically done in a
-platform-dependent fashion.  For example, under Unix an event source
-might call \fBTcl_CreateFileHandler\fR; under Windows it might
-request notification with a Windows event.  For timer-driven event
-sources such as timer events or any polled event, the event source
-can call \fBTcl_SetMaxBlockTime\fR to force the application to wake
-up after a specified time even if no events have occurred.
-.VS
-If no event source calls \fBTcl_SetMaxBlockTime\fR
-then \fBTcl_WaitForEvent\fR will wait as long as necessary for an
-event to occur; otherwise, it will only wait as long as the shortest
-interval passed to \fBTcl_SetMaxBlockTime\fR by one of the event
-sources.  If an event source knows that it already has events ready to
-report, it can request a zero maximum block time.  For example, the
-setup procedure for the X event source looks to see if there are
-events already queued.  If there are, it calls
-\fBTcl_SetMaxBlockTime\fR with a 0 block time so that
-\fBTcl_WaitForEvent\fR does not block if there is no new data on the X
-connection.
-.VE
-The \fItimePtr\fR argument to \fBTcl_WaitForEvent\fR points to
-a structure that describes a time interval in seconds and
-microseconds:
-.CS
-typedef struct Tcl_Time {
-	long \fIsec\fR;
-	long \fIusec\fR;
-} Tcl_Time;
-.CE
-The \fIusec\fR field should be less than 1000000.
-.PP
-.VS
-Information provided to \fBTcl_SetMaxBlockTime\fR
-is only used for the next call to \fBTcl_WaitForEvent\fR; it is
-discarded after \fBTcl_WaitForEvent\fR returns.
-.VE
-The next time an event wait is done each of the event sources'
-setup procedures will be called again, and they can specify new
-information for that event wait.
-.PP
-.VS
-If the application uses an external event loop rather than
-\fBTcl_DoOneEvent\fR, the event sources may need to call
-\fBTcl_SetMaxBlockTime\fR at other times.  For example, if a new event
-handler is registered that needs to poll for events, the event source
-may call \fBTcl_SetMaxBlockTime\fR to set the block time to zero to
-force the external event loop to call Tcl.  In this case,
-\fBTcl_SetMaxBlockTime\fR invokes \fBTcl_SetTimer\fR with the shortest
-interval seen since the last call to \fBTcl_DoOneEvent\fR or
-\fBTcl_ServiceAll\fR.
-.PP
-In addition to the generic procedure \fBTcl_SetMaxBlockTime\fR, other
-platform-specific procedures may also be available for
-\fIsetupProc\fR, if there is additional information needed by
-\fBTcl_WaitForEvent\fR on that platform.  For example, on Unix systems
-the \fBTcl_CreateFileHandler\fR interface can be used to wait for file events.
-.VE
-.PP
-The second procedure provided by each event source is its check
-procedure, indicated by the \fIcheckProc\fR argument to
-\fBTcl_CreateEventSource\fR.  \fICheckProc\fR must match the
-following prototype:
-.CS
-typedef void Tcl_EventCheckProc(
-	ClientData \fIclientData\fR,
-	int \fIflags\fR);
-.CE
-The arguments to this procedure are the same as those for \fIsetupProc\fR.
-\fBCheckProc\fR is invoked by \fBTcl_DoOneEvent\fR after it has waited
-for events.  Presumably at least one event source is now prepared to
-queue an event.  \fBTcl_DoOneEvent\fR calls each of the event sources
-in turn, so they all have a chance to queue any events that are ready.
-The check procedure does two things.  First, it must see if any events
-have triggered.  Different event sources do this in different ways.
-.PP
-If an event source's check procedure detects an interesting event, it
-must add the event to Tcl's event queue.  To do this, the event source
-calls \fBTcl_QueueEvent\fR.  The \fIevPtr\fR argument is a pointer to
-a dynamically allocated structure containing the event (see below for
-more information on memory management issues).  Each event source can
-define its own event structure with whatever information is relevant
-to that event source.  However, the first element of the structure
-must be a structure of type \fBTcl_Event\fR, and the address of this
-structure is used when communicating between the event source and the
-rest of the notifier.  A \fBTcl_Event\fR has the following definition:
-.CS
-typedef struct Tcl_Event {
-    Tcl_EventProc *\fIproc\fR;
-    struct Tcl_Event *\fInextPtr\fR;
-};
-.CE
-The event source must fill in the \fIproc\fR field of
-the event before calling \fBTcl_QueueEvent\fR.
-The \fInextPtr\fR is used to link together the events in the queue
-and should not be modified by the event source.
-.PP
-An event may be added to the queue at any of three positions, depending
-on the \fIposition\fR argument to \fBTcl_QueueEvent\fR:
-.IP \fBTCL_QUEUE_TAIL\fR 24
-Add the event at the back of the queue, so that all other pending
-events will be serviced first.  This is almost always the right
-place for new events.
-.IP \fBTCL_QUEUE_HEAD\fR 24
-Add the event at the front of the queue, so that it will be serviced
-before all other queued events.
-.IP \fBTCL_QUEUE_MARK\fR 24
-Add the event at the front of the queue, unless there are other
-events at the front whose position is \fBTCL_QUEUE_MARK\fR;  if so,
-add the new event just after all other \fBTCL_QUEUE_MARK\fR events.
-This value of \fIposition\fR is used to insert an ordered sequence of
-events at the front of the queue, such as a series of
-Enter and Leave events synthesized during a grab or ungrab operation
-in Tk.
-.PP
-.VS
-When it is time to handle an event from the queue (steps 1 and 4
-above) \fBTcl_ServiceEvent\fR will invoke the \fIproc\fR specified
-.VE
-in the first queued \fBTcl_Event\fR structure.
-\fIProc\fR must match the following prototype:
-.CS
-typedef int Tcl_EventProc(
-	Tcl_Event *\fIevPtr\fR,
-	int \fIflags\fR);
-.CE
-The first argument to \fIproc\fR is a pointer to the event, which will
-be the same as the first argument to the \fBTcl_QueueEvent\fR call that
-added the event to the queue.
-The second argument to \fIproc\fR is the \fIflags\fR argument for the
-.VS
-current call to \fBTcl_ServiceEvent\fR;  this is used by the event source
-.VE
-to return immediately if its events are not relevant.
-.PP
-It is up to \fIproc\fR to handle the event, typically by invoking
-one or more Tcl commands or C-level callbacks.
-Once the event source has finished handling the event it returns 1
-to indicate that the event can be removed from the queue.
-If for some reason the event source decides that the event cannot
-be handled at this time, it may return 0 to indicate that the event
-.VS
-should be deferred for processing later;  in this case \fBTcl_ServiceEvent\fR
-.VE
-will go on to the next event in the queue and attempt to service it.
-There are several reasons why an event source might defer an event.
-One possibility is that events of this type are excluded by the
-\fIflags\fR argument.
-For example, the file event source will always return 0 if the
-\fBTCL_FILE_EVENTS\fR bit isn't set in \fIflags\fR.
-Another example of deferring events happens in Tk if
-\fBTk_RestrictEvents\fR has been invoked to defer certain kinds
-of window events.
-.PP
-.VS
-When \fIproc\fR returns 1, \fBTcl_ServiceEvent\fR will remove the
-event from the event queue and free its storage.
-Note that the storage for an event must be allocated by
-the event source (using \fBTcl_Alloc\fR or the Tcl macro \fBckalloc\fR)
-before calling \fBTcl_QueueEvent\fR, but it
-will be freed by \fBTcl_ServiceEvent\fR, not by the event source.
-.PP
-\fBTcl_DeleteEvents\fR can be used to explicitly remove one or more
-events from the event queue.  \fBTcl_DeleteEvents\fR calls \fIproc\fR
-for each event in the queue, deleting those for with the procedure
-returns 1.  Events for which the procedure returns 0 are left in the
-queue.  \fIProc\fR should match the following prototype:
-.CS
-typedef int Tcl_EventDeleteProc(
-	Tcl_Event *\fIevPtr\fR,
-	ClientData \fIclientData\fR);
-.CE
-The \fIclientData\fR argument will be the same as the \fIclientData\fR
-argument to \fBTcl_DeleteEvents\fR; it is typically used to point to
-private information managed by the event source.  The \fIevPtr\fR will
-point to the next event in the queue.
-.VE
-
-.SH "CREATING A NEW NOTIFIER"
-.PP
-The notifier consists of all the procedures described in this manual
-entry, plus \fBTcl_DoOneEvent\fR and \fBTcl_Sleep\fR, which are
-.VS
-available on all platforms, and \fBTcl_CreateFileHandler\fR and
-\fBTcl_DeleteFileHandler\fR, which are Unix-specific.  Most of these
-procedures are generic, in that they are the same for all notifiers.
-However, five of the procedures are notifier-dependent:
-\fBTcl_SetTimer\fR, \fBTcl_Sleep\fR, \fBTcl_WaitForEvent\fR,
-\fBTcl_CreateFileHandler\fR and \fBTcl_DeleteFileHandler\fR.  To
-support a new platform or to integrate Tcl with an
-application-specific event loop, you must write new versions of these
-procedures.
-.PP
-\fBTcl_WaitForEvent\fR is the lowest-level procedure in the notifier;
-it is responsible for waiting for an ``interesting'' event to occur or
-for a given time to elapse.  Before \fBTcl_WaitForEvent\fR is invoked,
-each of the event sources' setup procedure will have been invoked.
-The \fItimePtr\fR argument to
-\fBTcl_WaitForEvent\fR gives the maximum time to block for an event,
-based on calls to \fBTcl_SetMaxBlockTime\fR made by setup procedures
-and on other information (such as the \fBTCL_DONT_WAIT\fR bit in
-\fIflags\fR).
-.PP
-Ideally, \fBTcl_WaitForEvent\fR should only wait for an event
-to occur; it should not actually process the event in any way.
-Later on, the
-event sources will process the raw events and create Tcl_Events on
-the event queue in their \fIcheckProc\fR procedures.
-However, on some platforms (such as Windows) this isn't possible;
-events may be processed in \fBTcl_WaitForEvent\fR, including queuing
-Tcl_Events and more (for example, callbacks for native widgets may be
-invoked).  The return value from \fBTcl_WaitForEvent\fR must be either
-0, 1, or \-1.  On platforms such as Windows where events get processed in
-\fBTcl_WaitForEvent\fR, a return value of 1 means that there may be more
-events still pending that haven't been processed.  This is a sign to the
-caller that it must call \fBTcl_WaitForEvent\fR again if it wants all
-pending events to be processed. A 0 return value means that calling
-\fBTcl_WaitForEvent\fR again will not have any effect: either this is a
-platform where \fBTcl_WaitForEvent\fR only waits without doing any event
-processing, or \fBTcl_WaitForEvent\fR knows for sure that there are no
-additional events to process (e.g. it returned because the time
-elapsed).  Finally, a return value of \-1 means that the event loop is
-no longer operational and the application should probably unwind and
-terminate.  Under Windows this happens when a WM_QUIT message is received;
-under Unix it happens when \fBTcl_WaitForEvent\fR would have waited
-forever because there were no active event sources and the timeout was
-infinite.
-.PP
-If the notifier will be used with an external event loop, then it must
-also support the \fBTcl_SetTimer\fR interface.  \fBTcl_SetTimer\fR is
-invoked by \fBTcl_SetMaxBlockTime\fR whenever the maximum blocking
-time has been reduced.  \fBTcl_SetTimer\fR should arrange for the
-external event loop to invoke \fBTcl_ServiceAll\fR after the specified
-interval even if no events have occurred.  This interface is needed
-because \fBTcl_WaitForEvent\fR isn't invoked when there is an external
-event loop.  If the
-notifier will only be used from \fBTcl_DoOneEvent\fR, then
-\fBTcl_SetTimer\fR need not do anything.
-.PP
-On Unix systems, the file event source also needs support from the
-notifier.  The file event source consists of the
-\fBTcl_CreateFileHandler\fR and \fBTcl_DeleteFileHandler\fR
-procedures, which are described elsewhere.
-.PP
-The \fBTcl_Sleep\fR and \fBTcl_DoOneEvent\fR interfaces are described
-elsewhere.
-.PP
-The easiest way to create a new notifier is to look at the code
-for an existing notifier, such as the files \fBunix/tclUnixNotfy.c\fR
-or \fBwin/tclWinNotify.c\fR in the Tcl source distribution.
-
-.SH "EXTERNAL EVENT LOOPS"
-.PP
-The notifier interfaces are designed so that Tcl can be embedded into
-applications that have their own private event loops.  In this case,
-the application does not call \fBTcl_DoOneEvent\fR except in the case
-of recursive event loops such as calls to the Tcl commands \fBupdate\fR
-or \fBvwait\fR.  Most of the time is spent in the external event loop
-of the application.  In this case the notifier must arrange for the
-external event loop to call back into Tcl when something
-happens on the various Tcl event sources.  These callbacks should
-arrange for appropriate Tcl events to be placed on the Tcl event queue.
-.PP
-Because the external event loop is not calling \fBTcl_DoOneEvent\fR on
-a regular basis, it is up to the notifier to arrange for
-\fBTcl_ServiceEvent\fR to be called whenever events are pending on the
-Tcl event queue.  The easiest way to do this is to invoke
-\fBTcl_ServiceAll\fR at the end of each callback from the external
-event loop.  This will ensure that all of the event sources are
-polled, any queued events are serviced, and any pending idle handlers
-are processed before returning control to the application.  In
-addition, event sources that need to poll for events can call
-\fBTcl_SetMaxBlockTime\fR to force the external event loop to call
-Tcl even if no events are available on the system event queue.
-.PP
-As a side effect of processing events detected in the main external
-event loop, Tcl may invoke \fBTcl_DoOneEvent\fR to start a recursive event
-loop in commands like \fBvwait\fR.  \fBTcl_DoOneEvent\fR will invoke
-the external event loop, which will result in callbacks as described
-in the preceding paragraph, which will result in calls to
-\fBTcl_ServiceAll\fR.  However, in these cases it is undesirable to
-service events in \fBTcl_ServiceAll\fR.  Servicing events there is
-unnecessary because control will immediately return to the
-external event loop and hence to \fBTcl_DoOneEvent\fR, which can
-service the events itself.  Furthermore, \fBTcl_DoOneEvent\fR is
-supposed to service only a single event, whereas \fBTcl_ServiceAll\fR
-normally services all pending events.  To handle this situation,
-\fBTcl_DoOneEvent\fR sets a flag for \fBTcl_ServiceAll\fR
-that causes it to return without servicing any events.
-This flag is called the \fIservice mode\fR;
-\fBTcl_DoOneEvent\fR restores it to its previous value before it returns.
-.PP
-In some cases, however, it may be necessary for \fBTcl_ServiceAll\fR
-to service events
-even when it has been invoked from \fBTcl_DoOneEvent\fR.  This happens
-when there is yet another recursive event loop invoked via an
-event handler called by \fBTcl_DoOneEvent\fR (such as one that is
-part of a native widget).  In this case, \fBTcl_DoOneEvent\fR may not
-have a chance to service events so \fBTcl_ServiceAll\fR must service
-them all.  Any recursive event loop that calls an external event
-loop rather than \fBTcl_DoOneEvent\fR must reset the service mode so
-that all events get processed in \fBTcl_ServiceAll\fR.  This is done
-by invoking the \fBTcl_SetServiceMode\fR procedure.  If
-\fBTcl_SetServiceMode\fR is passed \fBTCL_SERVICE_NONE\fR, then calls
-to \fBTcl_ServiceAll\fR will return immediately without processing any
-events.  If \fBTcl_SetServiceMode\fR is passed \fBTCL_SERVICE_ALL\fR,
-then calls to \fBTcl_ServiceAll\fR will behave normally.
-\fBTcl_SetServiceMode\fR returns the previous value of the service
-mode, which should be restored when the recursive loop exits.
-\fBTcl_GetServiceMode\fR returns the current value of the service
-mode.
-.VE
-
-.SH KEYWORDS
-event, notifier, event queue, event sources, file events, timer, idle, service mode
diff --git a/doc/Object.3 b/doc/Object.3
deleted file mode 100644
index 214695f..0000000
--- a/doc/Object.3
+++ /dev/null
@@ -1,337 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Object.3,v 1.3 1999/04/16 00:46:32 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Obj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewObj, Tcl_DuplicateObj, Tcl_IncrRefCount, Tcl_DecrRefCount, Tcl_IsShared \- manipulate Tcl objects
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewObj\fR()
-.sp
-Tcl_Obj *
-\fBTcl_DuplicateObj\fR(\fIobjPtr\fR)
-.sp
-\fBTcl_IncrRefCount\fR(\fIobjPtr\fR)
-.sp
-\fBTcl_DecrRefCount\fR(\fIobjPtr\fR)
-.sp
-int
-\fBTcl_IsShared\fR(\fIobjPtr\fR)
-.sp
-\fBTcl_InvalidateStringRep\fR(\fIobjPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Obj *objPtr in
-.AP Tcl_Obj *objPtr in
-Points to an object;
-must have been the result of a previous call to \fBTcl_NewObj\fR.
-.BE
-
-.SH INTRODUCTION
-.PP
-This man page presents an overview of Tcl objects and how they are used.
-It also describes generic procedures for managing Tcl objects.
-These procedures are used to create and copy objects,
-and increment and decrement the count of references (pointers) to objects.
-The procedures are used in conjunction with ones
-that operate on specific types of objects such as
-\fBTcl_GetIntFromObj\fR and \fBTcl_ListObjAppendElement\fR.
-The individual procedures are described along with the data structures
-they manipulate.
-.PP
-Tcl's \fIdual-ported\fR objects provide a general-purpose mechanism
-for storing and exchanging Tcl values.
-They largely replace the use of strings in Tcl.
-For example, they are used to store variable values,
-command arguments, command results, and scripts.
-Tcl objects behave like strings but also hold an internal representation
-that can be manipulated more efficiently.
-For example, a Tcl list is now represented as an object
-that holds the list's string representation
-as well as an array of pointers to the objects for each list element.
-Dual-ported objects avoid most runtime type conversions.
-They also improve the speed of many operations
-since an appropriate representation is immediately available.
-The compiler itself uses Tcl objects to
-cache the instruction bytecodes resulting from compiling scripts.
-.PP
-The two representations are a cache of each other and are computed lazily.
-That is, each representation is only computed when necessary,
-it is computed from the other representation,
-and, once computed, it is saved.
-In addition, a change in one representation invalidates the other one.
-As an example, a Tcl program doing integer calculations can
-operate directly on a variable's internal machine integer
-representation without having to constantly convert
-between integers and strings.
-Only when it needs a string representing the variable's value,
-say to print it,
-will the program regenerate the string representation from the integer.
-Although objects contain an internal representation,
-their semantics are defined in terms of strings:
-an up-to-date string can always be obtained,
-and any change to the object will be reflected in that string
-when the object's string representation is fetched.
-Because of this representation invalidation and regeneration,
-it is dangerous for extension writers to access
-\fBTcl_Obj\fR fields directly.
-It is better to access Tcl_Obj information using
-procedures like \fBTcl_GetStringFromObj\fR and \fBTcl_GetString\fR.
-.PP
-Objects are allocated on the heap
-and are referenced using a pointer to their \fBTcl_Obj\fR structure.
-Objects are shared as much as possible.
-This significantly reduces storage requirements
-because some objects such as long lists are very large.
-Also, most Tcl values are only read and never modified.
-This is especially true for procedure arguments,
-which can be shared between the caller and the called procedure.
-Assignment and argument binding is done by
-simply assigning a pointer to the value. 
-Reference counting is used to determine when it is safe to
-reclaim an object's storage.
-.PP
-Tcl objects are typed.
-An object's internal representation is controlled by its type.
-Seven types are predefined in the Tcl core
-including integer, double, list, and bytecode.
-Extension writers can extend the set of types
-by using the procedure \fBTcl_RegisterObjType\fR .
-
-.SH "THE TCL_OBJ STRUCTURE"
-.PP
-Each Tcl object is represented by a \fBTcl_Obj\fR structure
-which is defined as follows.
-.CS
-typedef struct Tcl_Obj {
-	int \fIrefCount\fR;
-	char *\fIbytes\fR;
-	int \fIlength\fR;
-	Tcl_ObjType *\fItypePtr\fR;
-	union {
-		long \fIlongValue\fR;
-		double \fIdoubleValue\fR;
-		VOID *\fIotherValuePtr\fR;
-		struct {
-			VOID *\fIptr1\fR;
-			VOID *\fIptr2\fR;
-		} \fItwoPtrValue\fR;
-	} \fIinternalRep\fR;
-} Tcl_Obj;
-.CE
-The \fIbytes\fR and the \fIlength\fR members together hold
-an object's string representation,
-which is a \fIcounted\fR or \fIbinary string\fR
-that may contain binary data with embedded null bytes.
-\fIbytes\fR points to the first byte of the string representation.
-The \fIlength\fR member gives the number of bytes.
-The byte array must always have a null after the last byte,
-at offset \fIlength\fR;
-this allows string representations that do not contain nulls
-to be treated as conventional null-terminated C strings.
-C programs use \fBTcl_GetStringFromObj\fR and \fBTcl_GetString\fR to get
-an object's string representation.
-If \fIbytes\fR is NULL,
-the string representation is invalid.
-.PP
-An object's type manages its internal representation.
-The member \fItypePtr\fR points to the Tcl_ObjType structure
-that describes the type.
-If \fItypePtr\fR is NULL,
-the internal representation is invalid.
-.PP
-The \fIinternalRep\fR union member holds
-an object's internal representation.
-This is either a (long) integer, a double-precision floating point number,
-a pointer to a value containing additional information
-needed by the object's type to represent the object,
-or two arbitrary pointers.
-.PP
-The \fIrefCount\fR member is used to tell when it is safe to free
-an object's storage.
-It holds the count of active references to the object.
-Maintaining the correct reference count is a key responsibility
-of extension writers.
-Reference counting is discussed below
-in the section \fBSTORAGE MANAGEMENT OF OBJECTS\fR.
-.PP
-Although extension writers can directly access
-the members of a Tcl_Obj structure,
-it is much better to use the appropriate procedures and macros.
-For example, extension writers should never
-read or update \fIrefCount\fR directly;
-they should use macros such as
-\fBTcl_IncrRefCount\fR and \fBTcl_IsShared\fR instead.
-.PP
-A key property of Tcl objects is that they hold two representations.
-An object typically starts out containing only a string representation:
-it is untyped and has a NULL \fItypePtr\fR.
-An object containing an empty string or a copy of a specified string
-is created using \fBTcl_NewObj\fR or \fBTcl_NewStringObj\fR respectively.
-An object's string value is gotten with
-\fBTcl_GetStringFromObj\fR or \fBTcl_GetString\fR
-and changed with \fBTcl_SetStringObj\fR.
-If the object is later passed to a procedure like \fBTcl_GetIntFromObj\fR
-that requires a specific internal representation,
-the procedure will create one and set the object's \fItypePtr\fR.
-The internal representation is computed from the string representation.
-An object's two representations are duals of each other:
-changes made to one are reflected in the other.
-For example, \fBTcl_ListObjReplace\fR will modify an object's
-internal representation and the next call to \fBTcl_GetStringFromObj\fR
-or \fBTcl_GetString\fR will reflect that change.
-.PP
-Representations are recomputed lazily for efficiency.
-A change to one representation made by a procedure
-such as \fBTcl_ListObjReplace\fR is not reflected immediately
-in the other representation.
-Instead, the other representation is marked invalid
-so that it is only regenerated if it is needed later.
-Most C programmers never have to be concerned with how this is done
-and simply use procedures such as \fBTcl_GetBooleanFromObj\fR or
-\fBTcl_ListObjIndex\fR.
-Programmers that implement their own object types
-must check for invalid representations
-and mark representations invalid when necessary.
-The procedure \fBTcl_InvalidateStringRep\fR is used
-to mark an object's string representation invalid and to
-free any storage associated with the old string representation.
-.PP
-Objects usually remain one type over their life,
-but occasionally an object must be converted from one type to another.
-For example, a C program might build up a string in an object
-with repeated calls to \fBTcl_AppendToObj\fR,
-and then call \fBTcl_ListObjIndex\fR to extract a list element from
-the object.
-The same object holding the same string value
-can have several different internal representations
-at different times.
-Extension writers can also force an object to be converted from one type
-to another using the \fBTcl_ConvertToType\fR procedure.
-Only programmers that create new object types need to be concerned
-about how this is done.
-A procedure defined as part of the object type's implementation
-creates a new internal representation for an object
-and changes its \fItypePtr\fR.
-See the man page for \fBTcl_RegisterObjType\fR
-to see how to create a new object type.
-
-.SH "EXAMPLE OF THE LIFETIME OF AN OBJECT"
-.PP
-As an example of the lifetime of an object,
-consider the following sequence of commands:
-.CS
-\fBset x 123\fR
-.CE
-This assigns to \fIx\fR an untyped object whose
-\fIbytes\fR member points to \fB123\fR and \fIlength\fR member contains 3.
-The object's \fItypePtr\fR member is NULL.
-.CS
-\fBputs "x is $x"\fR
-.CE
-\fIx\fR's string representation is valid (since \fIbytes\fR is non-NULL)
-and is fetched for the command.
-.CS
-\fBincr x\fR
-.CE
-The \fBincr\fR command first gets an integer from \fIx\fR's object
-by calling \fBTcl_GetIntFromObj\fR.
-This procedure checks whether the object is already an integer object.
-Since it is not, it converts the object
-by setting the object's \fIinternalRep.longValue\fR member
-to the integer \fB123\fR
-and setting the object's \fItypePtr\fR
-to point to the integer Tcl_ObjType structure.
-Both representations are now valid.
-\fBincr\fR increments the object's integer internal representation
-then invalidates its string representation
-(by calling \fBTcl_InvalidateStringRep\fR)
-since the string representation
-no longer corresponds to the internal representation.
-.CS
-\fBputs "x is now $x"\fR
-.CE
-The string representation of \fIx\fR's object is needed
-and is recomputed.
-The string representation is now \fB124\fR.
-and both representations are again valid.
-
-.SH "STORAGE MANAGEMENT OF OBJECTS"
-.PP
-Tcl objects are allocated on the heap and are shared as much as possible
-to reduce storage requirements.
-Reference counting is used to determine when an object is
-no longer needed and can safely be freed.
-An object just created by \fBTcl_NewObj\fR or \fBTcl_NewStringObj\fR
-has \fIrefCount\fR 0.
-The macro \fBTcl_IncrRefCount\fR increments the reference count
-when a new reference to the object is created.
-The macro \fBTcl_DecrRefCount\fR decrements the count
-when a reference is no longer needed and,
-if the object's reference count drops to zero, frees its storage.
-An object shared by different code or data structures has
-\fIrefCount\fR greater than 1.
-Incrementing an object's reference count ensures that
-it won't be freed too early or have its value change accidently.
-.PP
-As an example, the bytecode interpreter shares argument objects
-between calling and called Tcl procedures to avoid having to copy objects.
-It assigns the call's argument objects to the procedure's
-formal parameter variables.
-In doing so, it calls \fBTcl_IncrRefCount\fR to increment
-the reference count of each argument since there is now a new
-reference to it from the formal parameter.
-When the called procedure returns,
-the interpreter calls \fBTcl_DecrRefCount\fR to decrement
-each argument's reference count.
-When an object's reference count drops to zero,
-\fBTcl_DecrRefCount\fR reclaims its storage.
-Most command procedures do not have to be concerned about
-reference counting since they use an object's value immediately
-and don't retain a pointer to the object after they return.
-However, if they do retain a pointer to an object in a data structure,
-they must be careful to increment its reference count
-since the retained pointer is a new reference.
-.PP
-Command procedures that directly modify objects
-such as those for \fBlappend\fR and \fBlinsert\fR must be careful to
-copy a shared object before changing it.
-They must first check whether the object is shared
-by calling \fBTcl_IsShared\fR.
-If the object is shared they must copy the object
-by using \fBTcl_DuplicateObj\fR;
-this returns a new duplicate of the original object
-that has \fIrefCount\fR 0.
-If the object is not shared,
-the command procedure "owns" the object and can safely modify it directly.
-For example, the following code appears in the command procedure
-that implements \fBlinsert\fR.
-This procedure modifies the list object passed to it in \fIobjv[1]\fR
-by inserting \fIobjc-3\fR new elements before \fIindex\fR.
-.CS
-listPtr = objv[1];
-if (Tcl_IsShared(listPtr)) {
-	listPtr = Tcl_DuplicateObj(listPtr);
-}
-result = Tcl_ListObjReplace(interp, listPtr, index, 0, (objc-3), &(objv[3]));
-.CE
-As another example, \fBincr\fR's command procedure
-must check whether the variable's object is shared before
-incrementing the integer in its internal representation.
-If it is shared, it needs to duplicate the object
-in order to avoid accidently changing values in other data structures.
-
-.SH "SEE ALSO"
-Tcl_ConvertToType, Tcl_GetIntFromObj, Tcl_ListObjAppendElement, Tcl_ListObjIndex, Tcl_ListObjReplace, Tcl_RegisterObjType
-
-.SH KEYWORDS
-internal representation, object, object creation, object type, reference counting, string representation, type conversion
diff --git a/doc/ObjectType.3 b/doc/ObjectType.3
deleted file mode 100644
index df79219..0000000
--- a/doc/ObjectType.3
+++ /dev/null
@@ -1,198 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ObjectType.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ObjType 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_RegisterObjType, Tcl_GetObjType, Tcl_AppendAllObjTypes, Tcl_ConvertToType  \- manipulate Tcl object types
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_RegisterObjType\fR(\fItypePtr\fR)
-.sp
-Tcl_ObjType *
-\fBTcl_GetObjType\fR(\fItypeName\fR)
-.sp
-int
-\fBTcl_AppendAllObjTypes\fR(\fIinterp, objPtr\fR)
-.sp
-int
-\fBTcl_ConvertToType\fR(\fIinterp, objPtr, typePtr\fR)
-.SH ARGUMENTS
-.AS Tcl_ObjType *typeName in
-.AP Tcl_ObjType *typePtr in
-Points to the structure containing information about the Tcl object type.
-This storage must must live forever,
-typically by being statically allocated.
-.AP char *typeName in
-The name of a Tcl object type that \fBTcl_GetObjType\fR should look up.
-.AP Tcl_Interp *interp in
-Interpreter to use for error reporting.
-.AP Tcl_Obj *objPtr in
-For \fBTcl_AppendAllObjTypes\fR, this points to the object onto which
-it appends the name of each object type as a list element.
-For \fBTcl_ConvertToType\fR, this points to an object that
-must have been the result of a previous call to \fBTcl_NewObj\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-The procedures in this man page manage Tcl object types.
-The are used to register new object types,
-look up types,
-and force conversions from one type to another.
-.PP
-\fBTcl_RegisterObjType\fR registers a new Tcl object type
-in the table of all object types supported by Tcl.
-The argument \fItypePtr\fR points to a Tcl_ObjType structure that
-describes the new type by giving its name
-and by supplying pointers to four procedures
-that implement the type.
-If the type table already containes a type
-with the same name as in \fItypePtr\fR,
-it is replaced with the new type.
-The Tcl_ObjType structure is described
-in the section \fBTHE TCL_OBJTYPE STRUCTURE\fR below.
-.PP
-\fBTcl_GetObjType\fR returns a pointer to the Tcl_ObjType
-with name \fItypeName\fR.
-It returns NULL if no type with that name is registered.
-.PP
-\fBTcl_AppendAllObjTypes\fR appends the name of each object type
-as a list element onto the Tcl object referenced by \fIobjPtr\fR.
-The return value is \fBTCL_OK\fR unless there was an error
-converting \fIobjPtr\fR to a list object;
-in that case \fBTCL_ERROR\fR is returned.
-.PP
-\fBTcl_ConvertToType\fR converts an object from one type to another
-if possible.
-It creates a new internal representation for \fIobjPtr\fR
-appropriate for the target type \fItypePtr\fR
-and sets its \fItypePtr\fR member to that type.
-Any internal representation for \fIobjPtr\fR's old type is freed.
-If an error occurs during conversion, it returns \fBTCL_ERROR\fR
-and leaves an error message in the result object for \fIinterp\fR
-unless \fIinterp\fR is NULL.
-Otherwise, it returns \fBTCL_OK\fR.
-Passing a NULL \fIinterp\fR allows this procedure to be used
-as a test whether the conversion can be done (and in fact was done).
-
-.SH "THE TCL_OBJTYPE STRUCTURE"
-.PP
-Extension writers can define new object types by defining four
-procedures,
-initializing a Tcl_ObjType structure to describe the type,
-and calling \fBTcl_RegisterObjType\fR.
-The \fBTcl_ObjType\fR structure is defined as follows:
-.CS
-typedef struct Tcl_ObjType {
-	char *\fIname\fR;
-	Tcl_FreeInternalRepProc *\fIfreeIntRepProc\fR;
-	Tcl_DupInternalRepProc *\fIdupIntRepProc\fR;
-	Tcl_UpdateStringProc *\fIupdateStringProc\fR;
-	Tcl_SetFromAnyProc *\fIsetFromAnyProc\fR;
-} Tcl_ObjType;
-.CE
-.PP
-The \fIname\fR member describes the name of the type, e.g. \fBint\fR.
-Extension writers can look up an object type using its name
-with the \fBTcl_GetObjType\fR procedure.
-The remaining four members are pointers to procedures
-called by the generic Tcl object code:
-.PP
-The \fIsetFromAnyProc\fR member contains the address of a function
-called to create a valid internal representation
-from an object's string representation.
-.CS
-typedef int (Tcl_SetFromAnyProc) (Tcl_Interp *\fIinterp\fR, Tcl_Obj *\fIobjPtr\fR);
-.CE
-If an internal representation can't be created from the string,
-it returns \fBTCL_ERROR\fR and puts a message
-describing the error in the result object for \fIinterp\fR
-unless \fIinterp\fR is NULL.
-If \fIsetFromAnyProc\fR is successful,
-it stores the new internal representation,
-sets \fIobjPtr\fR's \fItypePtr\fR member to point to
-\fIsetFromAnyProc\fR's \fBTcl_ObjType\fR, and returns \fBTCL_OK\fR.
-Before setting the new internal representation,
-the \fIsetFromAnyProc\fR must free any internal representation
-of \fIobjPtr\fR's old type;
-it does this by calling the old type's \fIfreeIntRepProc\fR
-if it is not NULL.
-As an example, the \fIsetFromAnyProc\fR for the builtin Tcl integer type
-gets an up-to-date string representation for \fIobjPtr\fR
-by calling \fBTcl_GetStringFromObj\fR.
-It parses the string to obtain an integer and,
-if this succeeds,
-stores the integer in \fIobjPtr\fR's internal representation
-and sets \fIobjPtr\fR's \fItypePtr\fR member to point to the integer type's
-Tcl_ObjType structure.
-.PP
-The \fIupdateStringProc\fR member contains the address of a function
-called to create a valid string representation
-from an object's internal representation.
-.CS
-typedef void (Tcl_UpdateStringProc) (Tcl_Obj *\fIobjPtr\fR);
-.CE
-\fIobjPtr\fR's \fIbytes\fR member is always NULL when it is called.
-It must always set \fIbytes\fR non-NULL before returning.
-We require the string representation's byte array
-to have a null after the last byte, at offset \fIlength\fR;
-this allows string representations that do not contain null bytes
-to be treated as conventional null character-terminated C strings.
-Storage for the byte array must be allocated in the heap by \fBTcl_Alloc\fR.
-Note that \fIupdateStringProc\fRs must allocate
-enough storage for the string's bytes and the terminating null byte.
-The \fIupdateStringProc\fR for Tcl's builtin list type, for example,
-builds an array of strings for each element object
-and then calls \fBTcl_Merge\fR
-to construct a string with proper Tcl list structure.
-It stores this string as the list object's string representation.
-.PP
-The \fIdupIntRepProc\fR member contains the address of a function
-called to copy an internal representation from one object to another.
-.CS
-typedef void (Tcl_DupInternalRepProc) (Tcl_Obj *\fIsrcPtr\fR, Tcl_Obj *\fIdupPtr\fR);
-.CE
-\fIdupPtr\fR's internal representation is made a copy of \fIsrcPtr\fR's
-internal representation.
-Before the call,
-\fIsrcPtr\fR's internal representation is valid and \fIdupPtr\fR's is not.
-\fIsrcPtr\fR's object type determines what
-copying its internal representation means.
-For example, the \fIdupIntRepProc\fR for the Tcl integer type
-simply copies an integer.
-The builtin list type's \fIdupIntRepProc\fR
-allocates a new array that points at the original element objects;
-the elements are shared between the two lists
-(and their reference counts are incremented to reflect the new references).
-.PP
-The \fIfreeIntRepProc\fR member contains the address of a function
-that is called when an object is freed.
-.CS
-typedef void (Tcl_FreeInternalRepProc) (Tcl_Obj *\fIobjPtr\fR);
-.CE
-The \fIfreeIntRepProc\fR function can deallocate the storage
-for the object's internal representation
-and do other type-specific processing necessary when an object is freed.
-For example, Tcl list objects have an \fIinternalRep.otherValuePtr\fR
-that points to an array of pointers to each element in the list.
-The list type's \fIfreeIntRepProc\fR decrements
-the reference count for each element object
-(since the list will no longer refer to those objects),
-then deallocates the storage for the array of pointers.
-The \fIfreeIntRepProc\fR member can be set to NULL
-to indicate that the internal representation does not require freeing.
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount
-
-.SH KEYWORDS
-internal representation, object, object type, string representation, type conversion
diff --git a/doc/OpenFileChnl.3 b/doc/OpenFileChnl.3
deleted file mode 100644
index e9205e3..0000000
--- a/doc/OpenFileChnl.3
+++ /dev/null
@@ -1,566 +0,0 @@
-'\"
-'\" Copyright (c) 1996-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: OpenFileChnl.3,v 1.3 1999/04/16 00:46:32 stanton Exp $
-.so man.macros
-.TH Tcl_OpenFileChannel 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_OpenFileChannel, Tcl_OpenCommandChannel, Tcl_MakeFileChannel, Tcl_GetChannel, Tcl_RegisterChannel, Tcl_UnregisterChannel, Tcl_Close, Tcl_ReadChars, Tcl_Read, Tcl_GetsObj, Tcl_Gets, Tcl_WriteObj, Tcl_WriteChars, Tcl_Write, Tcl_Flush, Tcl_Seek, Tcl_Tell, Tcl_GetChannelOption, Tcl_SetChannelOption, Tcl_Eof, Tcl_InputBlocked, Tcl_InputBuffered,  \- buffered I/O facilities using channels
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-typedef ... Tcl_Channel;
-.sp
-Tcl_Channel
-\fBTcl_OpenFileChannel\fR(\fIinterp, fileName, mode, permissions\fR)
-.sp
-Tcl_Channel
-\fBTcl_OpenCommandChannel\fR(\fIinterp, argc, argv, flags\fR)
-.VS 8.0
-.sp
-Tcl_Channel
-\fBTcl_MakeFileChannel\fR(\fIhandle, readOrWrite\fR)
-.VE
-.sp
-Tcl_Channel
-\fBTcl_GetChannel\fR(\fIinterp, channelName, modePtr\fR)
-.sp
-void
-\fBTcl_RegisterChannel\fR(\fIinterp, channel\fR)
-.sp
-int
-\fBTcl_UnregisterChannel\fR(\fIinterp, channel\fR)
-.sp
-int
-\fBTcl_Close\fR(\fIinterp, channel\fR)
-.sp
-.VS 8.1
-int
-\fBTcl_ReadChars\fR(\fIchannel, readObjPtr, charsToRead, appendFlag\fR)
-.sp
-int
-\fBTcl_Read\fR(\fIchannel, byteBuf, bytesToRead\fR)
-.sp
-int
-\fBTcl_GetsObj\fR(\fIchannel, lineObjPtr\fR)
-.sp
-int
-\fBTcl_Gets\fR(\fIchannel, lineRead\fR)
-.sp
-int
-\fBTcl_WriteObj\fR(\fIchannel, writeObjPtr\fR)
-.sp
-int
-\fBTcl_WriteChars\fR(\fIchannel, charBuf, bytesToWrite\fR)
-.sp
-int
-\fBTcl_Write\fR(\fIchannel, byteBuf, bytesToWrite\fR)
-.VE
-.sp
-int
-\fBTcl_Flush\fR(\fIchannel\fR)
-.sp
-int
-\fBTcl_Seek\fR(\fIchannel, offset, seekMode\fR)
-.sp
-int
-\fBTcl_Tell\fR(\fIchannel\fR)
-.sp
-int
-\fBTcl_GetChannelOption\fR(\fIinterp, channel, optionName, optionValue\fR)
-.sp
-int
-\fBTcl_SetChannelOption\fR(\fIinterp, channel, optionName, newValue\fR)
-.sp
-int
-\fBTcl_Eof\fR(\fIchannel\fR)
-.sp
-int
-\fBTcl_InputBlocked\fR(\fIchannel\fR)
-.sp
-int
-\fBTcl_InputBuffered\fR(\fIchannel\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_ChannelType newClientProcPtr in
-.AP Tcl_Interp *interp in
-Used for error reporting and to look up a channel registered in it.
-.AP char *fileName in
-The name of a local or network file.
-.AP char *mode in
-Specifies how the file is to be accessed.  May have any of the values
-allowed for the \fImode\fR argument to the Tcl \fBopen\fR command.  For
-\fBTcl_OpenCommandChannel\fR, may be NULL.
-.AP int permissions in
-POSIX-style permission flags such as 0644.  If a new file is created, these
-permissions will be set on the created file.
-.AP int argc in
-The number of elements in \fIargv\fR.
-.AP char **argv in
-Arguments for constructing a command pipeline.  These values have the same
-meaning as the non-switch arguments to the Tcl \fBexec\fR command.
-.AP int flags in
-Specifies the disposition of the stdio handles in pipeline: OR-ed
-combination of \fBTCL_STDIN\fR, \fBTCL_STDOUT\fR, \fBTCL_STDERR\fR, and
-\fBTCL_ENFORCE_MODE\fR. If \fBTCL_STDIN\fR is set, stdin for the first child
-in the pipe is the pipe channel, otherwise it is the same as the standard
-input of the invoking process; likewise for \fBTCL_STDOUT\fR and
-\fBTCL_STDERR\fR. If \fBTCL_ENFORCE_MODE\fR is not set, then the pipe can
-redirect stdio handles to override the stdio handles for which
-\fBTCL_STDIN\fR, \fBTCL_STDOUT\fR and \fBTCL_STDERR\fR have been set.  If it
-is set, then such redirections cause an error.
-.VS 8.0
-.AP ClientData handle in
-Operating system specific handle for I/O to a file. For Unix this is a
-file descriptor, for Windows it is a HANDLE.
-.AP int readOrWrite in
-OR-ed combination of \fBTCL_READABLE\fR and \fBTCL_WRITABLE\fR to indicate
-what operations are valid on \fIhandle\fR.
-.AP char *channelName in
-The name of the channel. 
-.VE
-.AP int *modePtr out
-Points at an integer variable that will receive an OR-ed combination of
-\fBTCL_READABLE\fR and \fBTCL_WRITABLE\fR denoting whether the channel is
-open for reading and writing.
-.AP Tcl_Channel channel in
-A Tcl channel for input or output.  Must have been the return value
-from a procedure such as \fBTcl_OpenFileChannel\fR.
-.VS 8.1 br
-.AP Tcl_Obj *readObjPtr in/out
-A pointer to a Tcl Object in which to store the characters read from the
-channel.
-.AP int charsToRead in
-The number of characters to read from the channel.  If the channel's encoding 
-is \fBbinary\fR, this is equivalent to the number of bytes to read from the 
-channel.
-.AP int appendFlag in
-If non-zero, data read from the channel will be appended to the object.
-Otherwise, the data will replace the existing contents of the object.
-.AP char *readBuf out
-A buffer in which to store the bytes read from the channel.
-.AP int bytesToRead in
-The number of bytes to read from the channel.  The buffer \fIreadBuf\fR must
-be large enough to hold this many bytes.
-.AP Tcl_Obj *lineObjPtr in/out
-A pointer to a Tcl object in which to store the line read from the
-channel.  The line read will be appended to the current value of the
-object. 
-.AP Tcl_DString *lineRead in/out
-A pointer to a Tcl dynamic string in which to store the line read from the
-channel.  Must have been initialized by the caller.  The line read will be
-appended to any data already in the dynamic string.
-.AP Tcl_Obj *writeObjPtr in
-A pointer to a Tcl Object whose contents will be output to the channel.
-.AP "CONST char" *charBuf in
-A buffer containing the characters to output to the channel.
-.AP char *byteBuf in
-A buffer containing the bytes to output to the channel.
-.AP int bytesToWrite in
-The number of bytes to consume from \fIcharBuf\fR or \fIbyteBuf\fR and
-output to the channel.
-.VE
-.AP int offset in
-How far to move the access point in the channel at which the next input or
-output operation will be applied, measured in bytes from the position
-given by \fIseekMode\fR.  May be either positive or negative.
-.AP int seekMode in
-Relative to which point to seek; used with \fIoffset\fR to calculate the new
-access point for the channel. Legal values are \fBSEEK_SET\fR,
-\fBSEEK_CUR\fR, and \fBSEEK_END\fR.
-.AP char *optionName in
-The name of an option applicable to this channel, such as \fB\-blocking\fR.
-May have any of the values accepted by the \fBfconfigure\fR command.
-.AP Tcl_DString *optionValue in
-Where to store the value of an option or a list of all options and their
-values. Must have been initialized by the caller.
-.AP char *newValue in
-New value for the option given by \fIoptionName\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-The Tcl channel mechanism provides a device-independent and
-platform-independent mechanism for performing buffered input
-and output operations on a variety of file, socket, and device
-types.
-The channel mechanism is extensible to new channel types, by
-providing a low level channel driver for the new type; the channel driver
-interface is described in the manual entry for \fBTcl_CreateChannel\fR. The
-channel mechanism provides a buffering scheme modeled after
-Unix's standard I/O, and it also allows for nonblocking I/O on
-channels.
-.PP
-The procedures described in this manual entry comprise the C APIs of the
-generic layer of the channel architecture. For a description of the channel
-driver architecture and how to implement channel drivers for new types of
-channels, see the manual entry for \fBTcl_CreateChannel\fR.
-
-.SH TCL_OPENFILECHANNEL
-.PP
-\fBTcl_OpenFileChannel\fR opens a file specified by \fIfileName\fR and
-returns a channel handle that can be used to perform input and output on
-the file. This API is modeled after the \fBfopen\fR procedure of
-the Unix standard I/O library.
-The syntax and meaning of all arguments is similar to those
-given in the Tcl \fBopen\fR command when opening a file.
-If an error occurs while opening the channel, \fBTcl_OpenFileChannel\fR
-returns NULL and records a POSIX error code that can be
-retrieved with \fBTcl_GetErrno\fR.
-In addition, if \fIinterp\fR is non-NULL, \fBTcl_OpenFileChannel\fR
-leaves an error message in \fIinterp\fR's result after any error.
-.PP
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR, described below.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.SH TCL_OPENCOMMANDCHANNEL
-.PP
-\fBTcl_OpenCommandChannel\fR provides a C-level interface to the
-functions of the \fBexec\fR and \fBopen\fR commands.
-It creates a sequence of subprocesses specified
-by the \fIargv\fR and \fIargc\fR arguments and returns a channel that can
-be used to communicate with these subprocesses.
-The \fIflags\fR argument indicates what sort of communication will
-exist with the command pipeline.
-.PP
-If the \fBTCL_STDIN\fR flag is set then the standard input for the
-first subprocess will be tied to the channel: writing to the channel
-will provide input to the subprocess.  If \fBTCL_STDIN\fR is not set,
-then standard input for the first subprocess will be the same as this
-application's standard input.  If \fBTCL_STDOUT\fR is set then
-standard output from the last subprocess can be read from the channel;
-otherwise it goes to this application's standard output.  If
-\fBTCL_STDERR\fR is set, standard error output for all subprocesses is
-returned to the channel and results in an error when the channel is
-closed; otherwise it goes to this application's standard error.  If
-\fBTCL_ENFORCE_MODE\fR is not set, then \fIargc\fR and \fIargv\fR can
-redirect the stdio handles to override \fBTCL_STDIN\fR,
-\fBTCL_STDOUT\fR, and \fBTCL_STDERR\fR; if it is set, then it is an
-error for argc and argv to override stdio channels for which
-\fBTCL_STDIN\fR, \fBTCL_STDOUT\fR, and \fBTCL_STDERR\fR have been set.
-.PP
-If an error occurs while opening the channel, \fBTcl_OpenCommandChannel\fR
-returns NULL and records a POSIX error code that can be retrieved with
-\fBTcl_GetErrno\fR.
-In addition, \fBTcl_OpenCommandChannel\fR leaves an error message in
-\fIinterp->result\fR if \fIinterp\fR is not NULL.
-.PP
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR, described below.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.SH TCL_MAKEFILECHANNEL
-.PP
-\fBTcl_MakeFileChannel\fR makes a \fBTcl_Channel\fR from an existing,
-platform-specific, file handle.
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR, described below.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.SH TCL_GETCHANNEL
-.PP
-\fBTcl_GetChannel\fR returns a channel given the \fIchannelName\fR used to
-create it with \fBTcl_CreateChannel\fR and a pointer to a Tcl interpreter in
-\fIinterp\fR. If a channel by that name is not registered in that interpreter,
-the procedure returns NULL. If the \fImode\fR argument is not NULL, it
-points at an integer variable that will receive an OR-ed combination of
-\fBTCL_READABLE\fR and \fBTCL_WRITABLE\fR describing whether the channel is
-open for reading and writing.
-
-.SH TCL_REGISTERCHANNEL
-.PP
-\fBTcl_RegisterChannel\fR adds a channel to the set of channels accessible
-in \fIinterp\fR. After this call, Tcl programs executing in that
-interpreter can refer to the channel in input or output operations using
-the name given in the call to \fBTcl_CreateChannel\fR.  After this call,
-the channel becomes the property of the interpreter, and the caller should
-not call \fBTcl_Close\fR for the channel; the channel will be closed
-automatically when it is unregistered from the interpreter.
-.PP
-Code executing outside of any Tcl interpreter can call
-\fBTcl_RegisterChannel\fR with \fIinterp\fR as NULL, to indicate that it
-wishes to hold a reference to this channel. Subsequently, the channel can
-be registered in a Tcl interpreter and it will only be closed when the
-matching number of calls to \fBTcl_UnregisterChannel\fR have been made.
-This allows code executing outside of any interpreter to safely hold a
-reference to a channel that is also registered in a Tcl interpreter.
-
-.SH TCL_UNREGISTERCHANNEL
-.PP
-\fBTcl_UnregisterChannel\fR removes a channel from the set of channels
-accessible in \fIinterp\fR. After this call, Tcl programs will no longer be
-able to use the channel's name to refer to the channel in that interpreter.
-If this operation removed the last registration of the channel in any
-interpreter, the channel is also closed and destroyed.
-.PP
-Code not associated with a Tcl interpreter can call
-\fBTcl_UnregisterChannel\fR with \fIinterp\fR as NULL, to indicate to Tcl
-that it no longer holds a reference to that channel. If this is the last
-reference to the channel, it will now be closed.
-
-.SH TCL_CLOSE
-.PP
-\fBTcl_Close\fR destroys the channel \fIchannel\fR, which must denote a
-currently open channel. The channel should not be registered in any
-interpreter when \fBTcl_Close\fR is called. Buffered output is flushed to
-the channel's output device prior to destroying the channel, and any
-buffered input is discarded.  If this is a blocking channel, the call does
-not return until all buffered data is successfully sent to the channel's
-output device.  If this is a nonblocking channel and there is buffered
-output that cannot be written without blocking, the call returns
-immediately; output is flushed in the background and the channel will be
-closed once all of the buffered data has been output.  In this case errors
-during flushing are not reported.
-.PP
-If the channel was closed successfully, \fBTcl_Close\fR returns \fBTCL_OK\fR.
-If an error occurs, \fBTcl_Close\fR returns \fBTCL_ERROR\fR and records a
-POSIX error code that can be retrieved with \fBTcl_GetErrno\fR.
-If the channel is being closed synchronously and an error occurs during
-closing of the channel and \fIinterp\fR is not NULL, an error message is
-left in \fIinterp->result\fR.
-.PP
-Note: it is not safe to call \fBTcl_Close\fR on a channel that has been
-registered using \fBTcl_RegisterChannel\fR; see the documentation for
-\fBTcl_RegisterChannel\fR, above, for details. If the channel has ever
-been given as the \fBchan\fR argument in a call to
-\fBTcl_RegisterChannel\fR, you should instead use
-\fBTcl_UnregisterChannel\fR, which will internally call \fBTcl_Close\fR
-when all calls to \fBTcl_RegisterChannel\fR have been matched by
-corresponding calls to \fBTcl_UnregisterChannel\fR.
-
-.VS 8.1 br
-.SH TCL_READCHARS AND TCL_READ
-.PP
-\fBTcl_ReadChars\fR consumes bytes from \fIchannel\fR, converting the bytes
-to UTF-8 based on the channel's encoding and storing the produced data in 
-\fIreadObjPtr\fR's string representation.  The return value of
-\fBTcl_ReadChars\fR is the number of characters, up to \fIcharsToRead\fR,
-that were stored in \fIobjPtr\fR.  If an error occurs while reading, the
-return value is \-1 and \fBTcl_ReadChars\fR records a POSIX error code that
-can be retrieved with \fBTcl_GetErrno\fR.
-.PP
-The return value may be smaller than the value to read, indicating that less
-data than requested was available.  This is called a \fIshort read\fR.  In
-blocking mode, this can only happen on an end-of-file.  In nonblocking mode,
-a short read can also occur if there is not enough input currently
-available:  \fBTcl_ReadChars\fR returns a short count rather than waiting
-for more data.
-.PP
-If the channel is in blocking mode, a return value of zero indicates an
-end-of-file condition.  If the channel is in nonblocking mode, a return
-value of zero indicates either that no input is currently available or an
-end-of-file condition.  Use \fBTcl_Eof\fR and \fBTcl_InputBlocked\fR to tell
-which of these conditions actually occurred.
-.PP
-\fBTcl_ReadChars\fR translates the various end-of-line representations into
-the canonical \fB\en\fR internal representation according to the current
-end-of-line recognition mode.  End-of-line recognition and the various
-platform-specific modes are described in the manual entry for the Tcl
-\fBfconfigure\fR command.
-.PP
-As a performance optimization, when reading from a channel with the encoding
-\fBbinary\fR, the bytes are not converted to UTF-8 as they are read.
-Instead, they are stored in \fIreadObjPtr\fR's internal representation as a
-byte-array object.  The string representation of this object will only be
-constructed if it is needed (e.g., because of a call to
-\fBTcl_GetStringFromObj\fR).  In this way, byte-oriented data can be read
-from a channel, manipulated by calling \fBTcl_GetByteArrayFromObj\fR and
-related functions, and then written to a channel without the expense of ever
-converting to or from UTF-8.
-.PP
-\fBTcl_Read\fR is similar to \fBTcl_ReadChars\fR, except that it doesn't do
-encoding conversions, regardless of the channel's encoding.  It is deprecated
-and exists for backwards compatibility with non-internationalized Tcl
-extensions.  It consumes bytes from \fIchannel\fR and stores them in
-\fIbuf\fR, performing end-of-line translations on the way.  The return value
-of \fBTcl_Read\fR is the number of bytes, up to \fItoRead\fR, written in
-\fIbuf\fR.  The buffer produced by \fBTcl_Read\fR is not NULL terminated.
-Its contents are valid from the zeroth position up to and excluding the
-position indicated by the return value.  
-
-.SH TCL_GETSOBJ AND TCL_GETS
-.PP
-\fBTcl_GetsObj\fR consumes bytes from \fIchannel\fR, converting the bytes to
-UTF-8 based on the channel's encoding, until a full line of input has been
-seen.  If the channel's encoding is \fBbinary\fR, each byte read from the
-channel is treated as an individual Unicode character.  All of the
-characters of the line except for the terminating end-of-line character(s)
-are appended to \fIlineObjPtr\fR's string representation.  The end-of-line
-character(s) are read and discarded.
-.PP
-If a line was successfully read, the return value is greater than or equal
-to zero and indicates the number of bytes stored in \fIlineObjPtr\fR.  If an
-error occurs, \fBTcl_GetsObj\fR returns \-1 and records a POSIX error code
-that can be retrieved with \fBTcl_GetErrno\fR.  \fBTcl_GetsObj\fR also
-returns \-1 if the end of the file is reached; the \fBTcl_Eof\fR procedure
-can be used to distinguish an error from an end-of-file condition.
-.PP
-If the channel is in nonblocking mode, the return value can also be \-1 if
-no data was available or the data that was available did not contain an
-end-of-line character.  When \-1 is returned, the \fBTcl_InputBlocked\fR
-procedure may be invoked to determine if the channel is blocked because
-of input unavailability.
-.PP
-\fBTcl_Gets\fR is the same as \fBTcl_GetsObj\fR except the resulting
-characters are appended to the appended to the dynamic string given by
-\fIdsPtr\fR rather than a Tcl object.
-
-.SH TCL_WRITECHARS, TCL_WRITEOBJ, AND TCL_WRITE
-.PP
-\fBTcl_WriteChars\fR accepts \fIbytesToWrite\fR bytes of character data at
-\fIcharBuf\fR.  The UTF-8 characters in the buffer are converted to the
-channel's encoding and queued for output to \fIchannel\fR.  If
-\fIbytesToWrite\fR is negative, \fBTcl_WriteChars\fR expects \fIcharBuf\fR
-to be NULL terminated and it outputs everything up to the NULL.
-.PP
-Data queued for output may not appear on the output device immediately, due
-to internal buffering.  If the data should appear immediately, call
-\fBTcl_Flush\fR after the call to \fBTcl_WriteChars\fR, or set the 
-\fB\-buffering\fR option on the channel to \fBnone\fR.  If you wish the data
-to appear as soon as a complete line is accepted for output, set the
-\fB\-buffering\fR option on the channel to \fBline\fR mode.
-.PP
-The return value of \fBTcl_WriteChars\fR is a count of how many bytes were
-accepted for output to the channel.  This is either greater than zero to
-indicate success or \-1 to indicate that an error occurred.  If an error
-occurs, \fBTcl_WriteChars\fR records a POSIX error code that may be
-retrieved with \fBTcl_GetErrno\fR.
-.PP
-Newline characters in the output data are translated to platform-specific
-end-of-line sequences according to the \fB\-translation\fR option for the
-channel.  This is done even if the channel has no encoding.
-.PP
-\fBTcl_WriteObj\fR is similar to \fBTcl_WriteChars\fR except it
-accepts a Tcl object whose contents will be output to the channel.  The
-UTF-8 characters in \fIwriteObjPtr\fR's string representation are converted
-to the channel's encoding and queued for output to \fIchannel\fR.  
-As a performance optimization, when writing to a channel with the encoding
-\fBbinary\fR, UTF-8 characters are not converted as they are written.
-Instead, the bytes in \fIwriteObjPtr\fR's internal representation as a
-byte-array object are written to the channel.  The byte-array representation
-of the object will be constructed if it is needed.  In this way,
-byte-oriented data can be read from a channel, manipulated by calling
-\fBTcl_GetByteArrayFromObj\fR and related functions, and then written to a
-channel without the expense of ever converting to or from UTF-8.
-.PP
-\fBTcl_Write\fR is similar to \fBTcl_WriteChars\fR except that it doesn't do
-encoding conversions, regardless of the channel's encoding.  It is
-deprecated and exists for backwards compatibility with non-internationalized
-Tcl extensions.  It accepts \fIbytesToWrite\fR bytes of data at
-\fIbyteBuf\fR and queues them for output to \fIchannel\fR.  If
-\fIbytesToWrite\fR is negative, \fBTcl_Write\fR expects \fIbyteBuf\fR to be
-NULL terminated and it outputs everything up to the NULL.
-.VE
-
-.SH TCL_FLUSH
-.PP
-\fBTcl_Flush\fR causes all of the buffered output data for \fIchannel\fR
-to be written to its underlying file or device as soon as possible.
-If the channel is in blocking mode, the call does not return until
-all the buffered data has been sent to the channel or some error occurred.
-The call returns immediately if the channel is nonblocking; it starts
-a background flush that will write the buffered data to the channel
-eventually, as fast as the channel is able to absorb it.
-.PP
-The return value is normally \fBTCL_OK\fR.
-If an error occurs, \fBTcl_Flush\fR returns \fBTCL_ERROR\fR and
-records a POSIX error code that can be retrieved with \fBTcl_GetErrno\fR.
-
-.SH TCL_SEEK
-.PP
-\fBTcl_Seek\fR moves the access point in \fIchannel\fR where subsequent
-data will be read or written. Buffered output is flushed to the channel and
-buffered input is discarded, prior to the seek operation.
-.PP
-\fBTcl_Seek\fR normally returns the new access point.
-If an error occurs, \fBTcl_Seek\fR returns \-1 and records a POSIX error
-code that can be retrieved with \fBTcl_GetErrno\fR.
-After an error, the access point may or may not have been moved.
-
-.SH TCL_TELL
-.PP
-\fBTcl_Tell\fR returns the current access point for a channel. The returned
-value is \-1 if the channel does not support seeking.
-
-.SH TCL_GETCHANNELOPTION
-.PP
-\fBTcl_GetChannelOption\fR retrieves, in \fIdsPtr\fR, the value of one of
-the options currently in effect for a channel, or a list of all options and
-their values.  The \fIchannel\fR argument identifies the channel for which
-to query an option or retrieve all options and their values.
-If \fIoptionName\fR is not NULL, it is the name of the
-option to query; the option's value is copied to the Tcl dynamic string
-denoted by \fIoptionValue\fR. If
-\fIoptionName\fR is NULL, the function stores an alternating list of option
-names and their values in \fIoptionValue\fR, using a series of calls to
-\fBTcl_DStringAppendElement\fR. The various preexisting options and
-their possible values are described in the manual entry for the Tcl
-\fBfconfigure\fR command. Other options can be added by each channel type.
-These channel type specific options are described in the manual entry for
-the Tcl command that creates a channel of that type; for example, the
-additional options for TCP based channels are described in the manual entry
-for the Tcl \fBsocket\fR command.
-The procedure normally returns \fBTCL_OK\fR. If an error occurs, it returns
-\fBTCL_ERROR\fR and calls \fBTcl_SetErrno\fR to store an appropriate POSIX
-error code.
-
-.SH TCL_SETCHANNELOPTION
-.PP
-\fBTcl_SetChannelOption\fR sets a new value for an option on \fIchannel\fR.
-\fIOptionName\fR is the option to set and \fInewValue\fR is the value to
-set.
-The procedure normally returns \fBTCL_OK\fR.  If an error occurs,
-it returns \fBTCL_ERROR\fR;  in addition, if \fIinterp\fR is non-NULL,
-\fBTcl_SetChannelOption\fR leaves an error message in \fIinterp->result\fR.
-
-.SH TCL_EOF
-.PP
-\fBTcl_Eof\fR returns a nonzero value if \fIchannel\fR encountered
-an end of file during the last input operation.
-
-.SH TCL_INPUTBLOCKED
-.PP
-\fBTcl_InputBlocked\fR returns a nonzero value if \fIchannel\fR is in
-nonblocking mode and the last input operation returned less data than
-requested because there was insufficient data available.
-The call always returns zero if the channel is in blocking mode.
-
-.SH TCL_INPUTBUFFERED
-.PP
-\fBTcl_InputBuffered\fR returns the number of bytes of input currently
-buffered in the internal buffers for a channel. If the channel is not open
-for reading, this function always returns zero.
-
-.VS 8.0
-.SH "PLATFORM ISSUES"
-.PP
-The handles returned from \fBTcl_GetChannelHandle\fR depend on the
-platform and the channel type.  On Unix platforms, the handle is
-always a Unix file descriptor as returned from the \fBopen\fR system
-call.  On Windows platforms, the handle is a file \fBHANDLE\fR when
-the channel was created with \fBTcl_OpenFileChannel\fR,
-\fBTcl_OpenCommandChannel\fR, or \fBTcl_MakeFileChannel\fR.  Other
-channel types may return a different type of handle on Windows
-platforms.  On the Macintosh platform, the handle is a file reference
-number as returned from \fBHOpenDF\fR.
-.VE
-
-.SH "SEE ALSO"
-DString(3), fconfigure(n), filename(n), fopen(2), Tcl_CreateChannel(3)
-
-.SH KEYWORDS
-access point, blocking, buffered I/O, channel, channel driver, end of file,
-flush, input, nonblocking, output, read, seek, write
diff --git a/doc/OpenTcp.3 b/doc/OpenTcp.3
deleted file mode 100644
index 6f5da00..0000000
--- a/doc/OpenTcp.3
+++ /dev/null
@@ -1,179 +0,0 @@
-'\"
-'\" Copyright (c) 1996-7 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: OpenTcp.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-.so man.macros
-.TH Tcl_OpenTcpClient 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Tcl_OpenTcpClient, Tcl_MakeTcpClientChannel, Tcl_OpenTcpServer \- procedures to open channels using TCP sockets
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h> \fR
-.sp
-Tcl_Channel
-\fBTcl_OpenTcpClient\fR(\fIinterp, port, host, myaddr, myport, async\fR)
-.sp
-Tcl_Channel
-\fBTcl_MakeTcpClientChannel\fR(\fIsock\fR)
-.sp
-Tcl_Channel
-\fBTcl_OpenTcpServer\fR(\fIinterp, port, myaddr, proc, clientData\fR)
-.sp
-.SH ARGUMENTS
-.AS Tcl_ChannelType newClientProcPtr in
-.AP Tcl_Interp *interp in
-Tcl interpreter to use for error reporting.  If non-NULL and an
-error occurs, an error message is left in \fIinterp->result\fR.
-.AP int port in
-A port number to connect to as a client or to listen on as a server.
-.AP char *host in
-A string specifying a host name or address for the remote end of the connection.
-.AP int myport in
-A port number for the client's end of the socket.  If 0, a port number
-is allocated at random.
-.AP char *myaddr in
-A string specifying the host name or address for network interface to use
-for the local end of the connection.  If NULL, a default interface is
-chosen.
-.AP int async in
-If nonzero, the client socket is connected asynchronously to the server.
-.AP ClientData sock in
-Platform-specific handle for client TCP socket.
-.AP Tcl_TcpAcceptProc *proc in
-Pointer to a procedure to invoke each time a new connection is
-accepted via the socket.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These functions are convenience procedures for creating
-channels that communicate over TCP sockets.
-The operations on a channel
-are described in the manual entry for \fBTcl_OpenFileChannel\fR.
-
-.SH TCL_OPENTCPCLIENT
-.PP
-\fBTcl_OpenTcpClient\fR opens a client TCP socket connected to a \fIport\fR
-on a specific \fIhost\fR, and returns a channel that can be used to
-communicate with the server. The host to connect to can be specified either
-as a domain name style name (e.g. \fBwww.sunlabs.com\fR), or as a string
-containing the alphanumeric representation of its four-byte address (e.g.
-\fB127.0.0.1\fR). Use the string \fBlocalhost\fR to connect to a TCP socket on
-the host on which the function is invoked.
-.PP
-The \fImyaddr\fR and \fImyport\fR arguments allow a client to specify an
-address for the local end of the connection.  If \fImyaddr\fR is NULL, then
-an interface is chosen automatically by the operating system.
-If \fImyport\fR is 0, then a port number is chosen at random by
-the operating system.
-.PP
-If \fIasync\fR is zero, the call to \fBTcl_OpenTcpClient\fR returns only
-after the client socket has either successfully connected to the server, or
-the attempted connection has failed.
-If \fIasync\fR is nonzero the socket is connected asynchronously and the
-returned channel may not yet be connected to the server when the call to
-\fBTcl_OpenTcpClient\fR returns. If the channel is in blocking mode and an
-input or output operation is done on the channel before the connection is
-completed or fails, that operation will wait until the connection either
-completes successfully or fails. If the channel is in nonblocking mode, the
-input or output operation will return immediately and a subsequent call to
-\fBTcl_InputBlocked\fR on the channel will return nonzero.
-.PP
-The returned channel is opened for reading and writing.
-If an error occurs in opening the socket, \fBTcl_OpenTcpClient\fR returns
-NULL and records a POSIX error code that can be retrieved
-with \fBTcl_GetErrno\fR.
-In addition, if \fIinterp\fR is non-NULL, an error message
-is left in \fIinterp->result\fR.
-.PP
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.SH TCL_MAKETCPCLIENTCHANNEL
-.PP
-\fBTcl_MakeTcpClientChannel\fR creates a \fBTcl_Channel\fR around an
-existing, platform specific, handle for a client TCP socket.
-.PP
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.SH TCL_OPENTCPSERVER
-.PP
-\fBTcl_OpenTcpServer\fR opens a TCP socket on the local host on a specified
-\fIport\fR and uses the Tcl event mechanism to accept requests from clients
-to connect to it.  The \fImyaddr\fP argument specifies the network interface.
-If \fImyaddr\fP is NULL the special address INADDR_ANY should be used to
-allow connections from any network interface.
-Each time a client connects to this socket, Tcl creates a channel
-for the new connection and invokes \fIproc\fR with information about
-the channel.  \fIProc\fR must match the following prototype:
-.CS
-typedef void Tcl_TcpAcceptProc(
-	ClientData \fIclientData\fR,
-	Tcl_Channel \fIchannel\fR,
-	char *\fIhostName\fR,
-	int \fIport\fP);
-.CE
-.PP
-The \fIclientData\fR argument will be the same as the \fIclientData\fR
-argument to \fBTcl_OpenTcpServer\fR, \fIchannel\fR will be the handle
-for the new channel, \fIhostName\fR points to a string containing
-the name of the client host making the connection, and \fIport\fP
-will contain the client's port number.
-The new channel
-is opened for both input and output. 
-If \fIproc\fR raises an error, the connection is closed automatically.
-\fIProc\fR has no return value, but if it wishes to reject the
-connection it can close \fIchannel\fR.
-.PP
-\fBTcl_OpenTcpServer\fR normally returns a pointer to a channel
-representing the server socket.
-If an error occurs, \fBTcl_OpenTcpServer\fR returns NULL and
-records a POSIX error code that can be retrieved with \fBTcl_GetErrno\fR.
-In addition, if \fIinterp->result\fR is non-NULL, an error message
-is left in \fIinterp->result\fR.
-.PP
-The channel returned by \fBTcl_OpenTcpServer\fR cannot be used for
-either input or output.
-It is simply a handle for the socket used to accept connections.
-The caller can close the channel to shut down the server and disallow
-further connections from new clients.
-.PP
-TCP server channels operate correctly only in applications that dispatch
-events through \fBTcl_DoOneEvent\fR or through Tcl commands such as
-\fBvwait\fR; otherwise Tcl will never notice that a connection request from
-a remote client is pending.
-.PP
-The newly created channel is not registered in the supplied interpreter; to
-register it, use \fBTcl_RegisterChannel\fR.
-If one of the standard channels, \fBstdin, stdout\fR or \fBstderr\fR was
-previously closed, the act of creating the new channel also assigns it as a
-replacement for the standard channel.
-
-.VS
-.SH "PLATFORM ISSUES"
-.PP
-On Unix platforms, the socket handle is a Unix file descriptor as
-returned by the \fBsocket\fR system call.  On the Windows platform, the
-socket handle is a \fBSOCKET\fR as defined in the WinSock API.  On the
-Macintosh platform, the socket handle is a \fBStreamPtr\fR.
-.VE
-
-.SH "SEE ALSO"
-Tcl_OpenFileChannel(3), Tcl_RegisterChannel(3), vwait(n)
-
-.SH KEYWORDS
-client, server, TCP
diff --git a/doc/ParseCmd.3 b/doc/ParseCmd.3
deleted file mode 100644
index 2a180a6..0000000
--- a/doc/ParseCmd.3
+++ /dev/null
@@ -1,426 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ParseCmd.3,v 1.2 1999/04/16 00:46:32 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ParseCommand 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_ParseCommand, Tcl_ParseExpr, Tcl_ParseBraces, Tcl_ParseQuotedString, Tcl_ParseVarName, Tcl_FreeParse, Tcl_EvalTokens \- parse Tcl scripts and expressions
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_ParseCommand\fR(\fIinterp, string, numBytes, nested, parsePtr\fR)
-.sp
-int
-\fBTcl_ParseExpr\fR(\fIinterp, string, numBytes, parsePtr\fR)
-.sp
-int
-\fBTcl_ParseBraces\fR(\fIinterp, string, numBytes, parsePtr, append, termPtr\fR)
-.sp
-int
-\fBTcl_ParseQuotedString\fR(\fIinterp, string, numBytes, parsePtr, append, termPtr\fR)
-.sp
-int
-\fBTcl_ParseVarName\fR(\fIinterp, string, numBytes, parsePtr, append\fR)
-.sp
-\fBTcl_FreeParse\fR(\fIusedParsePtr\fR)
-.sp
-Tcl_Obj *
-\fBTcl_EvalTokens\fR(\fIinterp, tokenPtr, numTokens\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *usedParsePtr
-.AP Tcl_Interp *interp out
-For procedures other than \fBTcl_FreeParse\fR and \fBTcl_EvalTokens\fR,
-used only for error reporting;
-if NULL, then no error messages are left after errors.
-For \fBTcl_EvalTokens\fR, determines the context for evaluating the
-script and also is used for error reporting; must not be NULL.
-.AP char *string in
-Pointer to first character in string to parse.
-.AP int numBytes in
-Number of bytes in \fIstring\fR, not including any terminating null
-character.  If less than 0 then the script consists of all characters
-in \fIstring\fR up to the first null character.
-.AP int nested in
-Non-zero means that the script is part of a command substitution so an
-unquoted close bracket should be treated as a command terminator.  If zero,
-close brackets have no special meaning. 
-.AP int append in
-Non-zero means that \fI*parsePtr\fR already contains valid tokens; the new
-tokens should be appended to those already present.  Zero means that
-\fI*parsePtr\fR is uninitialized; any information in it is ignored.
-This argument is normally 0.
-.AP Tcl_Parse *parsePtr out
-Points to structure to fill in with information about the parsed
-command, expression, variable name, etc.
-Any previous information in this structure
-is ignored, unless \fIappend\fR is non-zero in a call to
-\fBTcl_ParseBraces\fR, \fBTcl_ParseQuotedString\fR,
-or \fBTcl_ParseVarName\fR.
-.AP char **termPtr out
-If not NULL, points to a location where
-\fBTcl_ParseBraces\fR and \fBTcl_ParseQuotedString\fR
-will store a pointer to the character
-just after the terminating close-brace or close-quote (respectively)
-if the parse was successful.
-.AP Tcl_Parse *usedParsePtr in
-Points to structure that was filled in by a previous call to
-\fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseVarName\fR, etc.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures parse Tcl commands or portions of Tcl commands such as
-expressions or references to variables.
-Each procedure takes a pointer to a script (or portion thereof)
-and fills in the structure pointed to by \fIparsePtr\fR
-with a collection of tokens describing the information that was parsed.
-The procedures normally return \fBTCL_OK\fR.
-However, if an error occurs then they return \fBTCL_ERROR\fR,
-leave an error message in \fIinterp's\fR result
-(if \fIinterp\fR is not NULL),
-and leave nothing in \fIparsePtr\fR.
-.PP
-\fBTcl_ParseCommand\fR is a procedure that parses Tcl
-scripts.  Given a pointer to a script, it
-parses the first command from the script.  If the command was parsed
-successfully, \fBTcl_ParseCommand\fR returns \fBTCL_OK\fR and fills in the
-structure pointed to by \fIparsePtr\fR with information about the
-structure of the command (see below for details).
-If an error occurred in parsing the command then
-\fBTCL_ERROR\fR is returned, an error message is left in \fIinterp\fR's
-result, and no information is left at \fI*parsePtr\fR.
-.PP
-\fBTcl_ParseExpr\fR parses Tcl expressions.
-Given a pointer to a script containing an expression,
-\fBTcl_ParseCommand\fR parses the expression.
-If the expression was parsed successfully,
-\fBTcl_ParseExpr\fR returns \fBTCL_OK\fR and fills in the
-structure pointed to by \fIparsePtr\fR with information about the
-structure of the expression (see below for details).
-If an error occurred in parsing the command then
-\fBTCL_ERROR\fR is returned, an error message is left in \fIinterp\fR's
-result, and no information is left at \fI*parsePtr\fR.
-.PP
-\fBTcl_ParseBraces\fR parses a string or command argument
-enclosed in braces such as
-\fB{hello}\fR or \fB{string \\t with \\t tabs}\fR
-from the beginning of its argument \fIstring\fR.
-The first character of \fIstring\fR must be \fB{\fR. 
-If the braced string was parsed successfully,
-\fBTcl_ParseBraces\fR returns \fBTCL_OK\fR,
-fills in the structure pointed to by \fIparsePtr\fR
-with information about the structure of the string
-(see below for details),
-and stores a pointer to the character just after the terminating \fB}\fR
-in the location given by \fI*termPtr\fR.
-If an error occurrs while parsing the string
-then \fBTCL_ERROR\fR is returned,
-an error message is left in \fIinterp\fR's result,
-and no information is left at \fI*parsePtr\fR or \fI*termPtr\fR.
-.PP
-\fBTcl_ParseQuotedString\fR parses a double-quoted string such as
-\fB"sum is [expr $a+$b]"\fR
-from the beginning of the argument \fIstring\fR.
-The first character of \fIstring\fR must be \fB"\fR. 
-If the double-quoted string was parsed successfully,
-\fBTcl_ParseQuotedString\fR returns \fBTCL_OK\fR,
-fills in the structure pointed to by \fIparsePtr\fR
-with information about the structure of the string
-(see below for details),
-and stores a pointer to the character just after the terminating \fB"\fR
-in the location given by \fI*termPtr\fR.
-If an error occurrs while parsing the string
-then \fBTCL_ERROR\fR is returned,
-an error message is left in \fIinterp\fR's result,
-and no information is left at \fI*parsePtr\fR or \fI*termPtr\fR.
-.PP
-\fBTcl_ParseVarName\fR parses a Tcl variable reference such as
-\fB$abc\fR or \fB$x([expr $index + 1])\fR from the beginning of its
-\fIstring\fR argument.
-The first character of \fIstring\fR must be \fB$\fR. 
-If a variable name was parsed successfully, \fBTcl_ParseVarName\fR
-returns \fBTCL_OK\fR and fills in the structure pointed to by
-\fIparsePtr\fR with information about the structure of the variable name
-(see below for details).  If an error
-occurrs while parsing the command then \fBTCL_ERROR\fR is returned, an
-error message is left in \fIinterp\fR's result (if \fIinterp\fR isn't
-NULL), and no information is left at \fI*parsePtr\fR.
-.PP
-The information left at \fI*parsePtr\fR
-by \fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseBraces\fR,
-\fBTcl_ParseQuotedString\fR, and \fBTcl_ParseVarName\fR
-may include dynamically allocated memory.
-If these five parsing procedures return \fBTCL_OK\fR
-then the caller must invoke \fBTcl_FreeParse\fR to release
-the storage at \fI*parsePtr\fR.
-These procedures ignore any existing information in
-\fI*parsePtr\fR (unless \fIappend\fR is non-zero),
-so if repeated calls are being made to any of them
-then \fBTcl_FreeParse\fR must be invoked once after each call.
-.PP
-\fBTcl_EvalTokens\fR evaluates a sequence of parse tokens from a Tcl_Parse
-structure.  The tokens typically consist
-of all the tokens in a word or all the tokens that make up the index for
-a reference to an array variable.  \fBTcl_EvalTokens\fR performs the
-substitutions requested by the tokens, concatenates the
-resulting values, and returns the result in a new Tcl_Obj.  The
-reference count of the object returned as result has been
-incremented, so the caller must
-invoke \fBTcl_DecrRefCount\fR when it is finished with the object.
-If an error occurs while evaluating the tokens (such as a reference to
-a non-existent variable) then the return value is NULL and an error
-message is left in \fIinterp\fR's result.
-
-.SH  TCL_PARSE STRUCTURE
-.PP
-\fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseBraces\fR,
-\fBTcl_ParseQuotedString\fR, and \fBTcl_ParseVarName\fR
-return parse information in two data structures, Tcl_Parse and Tcl_Token:
-.CS
-typedef struct Tcl_Parse {
-	char *\fIcommentStart\fR;
-	int \fIcommentSize\fR;
-	char *\fIcommandStart\fR;
-	int \fIcommandSize\fR;
-	int \fInumWords\fR;
-	Tcl_Token *\fItokenPtr\fR;
-	int \fInumTokens\fR;
-	...
-} Tcl_Parse;
-
-typedef struct Tcl_Token {
-    int \fItype\fR;
-    char *\fIstart\fR;
-    int \fIsize\fR;
-    int \fInumComponents\fR;
-} Tcl_Token;
-.CE
-.PP
-The first five fields of a Tcl_Parse structure
-are filled in only by \fBTcl_ParseCommand\fR.
-These fields are not used by the other parsing procedures.
-.PP
-\fBTcl_ParseCommand\fR fills in a Tcl_Parse structure
-with information that describes one Tcl command and any comments that
-precede the command.
-If there are comments,
-the \fIcommentStart\fR field points to the \fB#\fR character that begins
-the first comment and \fIcommentSize\fR indicates the number of bytes
-in all of the comments preceding the command, including the newline
-character that terminates the last comment.
-If the command is not preceded by any comments, \fIcommentSize\fR is 0.
-\fBTcl_ParseCommand\fR also sets the \fIcommandStart\fR field
-to point to the first character of the first
-word in the command (skipping any comments and leading space) and 
-\fIcommandSize\fR gives the total number of bytes in the command,
-including the character pointed to by \fIcommandStart\fR up to and
-including the newline, close bracket, or semicolon character that
-terminates the command.  The \fInumWords\fR field gives the
-total number of words in the command.
-.PP
-All parsing procedures set the remaining fields,
-\fItokenPtr\fR and \fInumTokens\fR.
-The \fItokenPtr\fR field points to the first in an array of Tcl_Token
-structures that describe the components of the entity being parsed.
-The \fInumTokens\fR field gives the total number of tokens
-present in the array.
-Each token contains four fields.
-The \fItype\fR field selects one of several token types
-that are described below.  The \fIstart\fR field
-points to the first character in the token and the \fIsize\fR field
-gives the total number of characters in the token.  Some token types,
-such as \fBTCL_TOKEN_WORD\fR and \fBTCL_TOKEN_VARIABLE\fR, consist of
-several component tokens, which immediately follow the parent token;
-the \fInumComponents\fR field describes how many of these there are.
-The \fItype\fR field has one of the following values:
-.TP 20
-\fBTCL_TOKEN_WORD\fR
-This token ordinarily describes one word of a command
-but it may also describe a quoted or braced string in an expression.
-The token describes a component of the script that is
-the result of concatenating together a sequence of subcomponents,
-each described by a separate subtoken.
-The token starts with the first non-blank
-character of the component (which may be a double-quote or open brace)
-and includes all characters in the component up to but not including the
-space, semicolon, close bracket, close quote, or close brace that
-terminates the component.  The \fInumComponents\fR field counts the total
-number of sub-tokens that make up the word, including sub-tokens
-of \fBTCL_TOKEN_VARIABLE\fR and \fBTCL_TOKEN_BS\fR tokens.
-.TP
-\fBTCL_TOKEN_SIMPLE_WORD\fR
-This token has the same meaning as \fBTCL_TOKEN_WORD\fR, except that
-the word is guaranteed to consist of a single \fBTCL_TOKEN_TEXT\fR
-sub-token.  The \fInumComponents\fR field is always 1.
-.TP
-\fBTCL_TOKEN_TEXT\fR
-The token describes a range of literal text that is part of a word.
-The \fInumComponents\fR field is always 0.
-.TP
-\fBTCL_TOKEN_BS\fR
-The token describes a backslash sequence such as \fB\en\fR or \fB\e0xa3\fR.
-The \fInumComponents\fR field is always 0.
-.TP
-\fBTCL_TOKEN_COMMAND\fR
-The token describes a command whose result result must be substituted into
-the word.  The token includes the square brackets that surround the
-command.  The \fInumComponents\fR field is always 0 (the nested command
-is not parsed; call \fBTcl_ParseCommand\fR recursively if you want to
-see its tokens).
-.TP
-\fBTCL_TOKEN_VARIABLE\fR
-The token describes a variable substitution, including the
-\fB$\fR, variable name, and array index (if there is one) up through the
-close parenthesis that terminates the index.  This token is followed
-by one or more additional tokens that describe the variable name and
-array index.  If \fInumComponents\fR  is 1 then the variable is a
-scalar and the next token is a \fBTCL_TOKEN_TEXT\fR token that gives the
-variable name.  If \fInumComponents\fR is greater than 1 then the
-variable is an array: the first sub-token is a \fBTCL_TOKEN_TEXT\fR
-token giving the array name and the remaining sub-tokens are
-\fBTCL_TOKEN_TEXT\fR, \fBTCL_TOKEN_BS\fR, \fBTCL_TOKEN_COMMAND\fR, and
-\fBTCL_TOKEN_VARIABLE\fR tokens that must be concatenated to produce the
-array index. The \fInumComponents\fR field includes nested sub-tokens
-that are part of \fBTCL_TOKEN_VARIABLE\fR tokens in the array index.
-.TP
-\fBTCL_TOKEN_SUB_EXPR\fR
-The token describes one subexpression of an expression
-(or an entire expression).
-A subexpression may consist of a value
-such as an integer literal, variable substitution,
-or parenthesized subexpression;
-it may also consist of an operator and its operands.
-The token starts with the first non-blank character of the subexpression
-up to but not including the space, brace, close-paren, or bracket
-that terminates the subexpression.
-This token is followed by one or more additional tokens
-that describe the subexpression.
-If the first sub-token after the \fBTCL_TOKEN_SUB_EXPR\fR token
-is a \fBTCL_TOKEN_OPERATOR\fR token,
-the subexpression consists of an operator and its token operands.
-If the operator has no operands, the subexpression consists of
-just the \fBTCL_TOKEN_OPERATOR\fR token.
-Each operand is described by a \fBTCL_TOKEN_SUB_EXPR\fR token.
-Otherwise, the subexpression is a value described by
-one of the token types \fBTCL_TOKEN_WORD\fR, \fBTCL_TOKEN_TEXT\fR,
-\fBTCL_TOKEN_BS\fR, \fBTCL_TOKEN_COMMAND\fR, 
-\fBTCL_TOKEN_VARIABLE\fR, and \fBTCL_TOKEN_SUB_EXPR\fR.
-The \fInumComponents\fR field
-counts the total number of sub-tokens that make up the subexpression;
-this includes the sub-tokens for any nested \fBTCL_TOKEN_SUB_EXPR\fR tokens.
-.TP
-\fBTCL_TOKEN_OPERATOR\fR
-The token describes one operator of an expression
-such as \fB&&\fR or \fBhypot\fR.
-An \fBTCL_TOKEN_OPERATOR\fR token is always preceeded by a
-\fBTCL_TOKEN_SUB_EXPR\fR token
-that describes the operator and its operands;
-the \fBTCL_TOKEN_SUB_EXPR\fR token's \fInumComponents\fR field
-can be used to determine the number of operands.
-A binary operator such as \fB*\fR
-is followed by two \fBTCL_TOKEN_SUB_EXPR\fR tokens
-that describe its operands.
-A unary operator like \fB-\fR
-is followed by a single \fBTCL_TOKEN_SUB_EXPR\fR token
-for its operand.
-If the operator is a math function such as \fBlog10\fR,
-the \fBTCL_TOKEN_OPERATOR\fR token will give its name and
-the following \fBTCL_TOKEN_SUB_EXPR\fR tokens will describe
-its operands;
-if there are no operands (as with \fBrand\fR),
-no \fBTCL_TOKEN_SUB_EXPR\fR tokens follow.
-There is one trinary operator, \fB?\fR,
-that appears in if-then-else subexpressions
-such as \fIx\fB?\fIy\fB:\fIz\fR;
-in this case, the \fB?\fR \fBTCL_TOKEN_OPERATOR\fR token
-is followed by three \fBTCL_TOKEN_SUB_EXPR\fR tokens for the operands
-\fIx\fR, \fIy\fR, and \fIz\fR.
-The \fInumComponents\fR field for a \fBTCL_TOKEN_OPERATOR\fR token
-is always 0.
-.PP
-After \fBTcl_ParseCommand\fR returns, the first token pointed to by
-the \fItokenPtr\fR field of the
-Tcl_Parse structure always has type \fBTCL_TOKEN_WORD\fR or
-\fBTCL_TOKEN_SIMPLE_WORD\fR.  It is followed by the sub-tokens
-that must be concatenated to produce the value of that word.
-The next token is the \fBTCL_TOKEN_WORD\fR or \fBTCL_TOKEN_SIMPLE_WORD\fR
-token for the second word, followed by sub-tokens for that
-word, and so on until all \fInumWords\fR have been accounted
-for.
-.PP
-After \fBTcl_ParseExpr\fR returns, the first token pointed to by
-the \fItokenPtr\fR field of the
-Tcl_Parse structure always has type \fBTCL_TOKEN_SUB_EXPR\fR.
-It is followed by the sub-tokens that must be evaluated
-to produce the value of the expression.
-Only the token information in the Tcl_Parse structure
-is modified: the \fIcommentStart\fR, \fIcommentSize\fR,
-\fIcommandStart\fR, and \fIcommandSize\fR fields are not modified
-by \fBTcl_ParseExpr\fR.
-.PP
-After \fBTcl_ParseBraces\fR returns,
-the array of tokens pointed to by the \fItokenPtr\fR field of the
-Tcl_Parse structure will contain a single \fBTCL_TOKEN_TEXT\fR token
-if the braced string does not contain any backslash-newlines.
-If the string does contain backslash-newlines,
-the array of tokens will contain one or more
-\fBTCL_TOKEN_TEXT\fR or \fBTCL_TOKEN_BS\fR sub-tokens
-that must be concatenated to produce the value of the string.
-If the braced string was just \fB{}\fR
-(that is, the string was empty),
-the single \fBTCL_TOKEN_TEXT\fR token will have a \fIsize\fR field
-containing zero;
-this ensures that at least one token appears
-to describe the braced string.
-Only the token information in the Tcl_Parse structure
-is modified: the \fIcommentStart\fR, \fIcommentSize\fR,
-\fIcommandStart\fR, and \fIcommandSize\fR fields are not modified
-by \fBTcl_ParseBraces\fR.
-.PP
-After \fBTcl_ParseQuotedString\fR returns,
-the array of tokens pointed to by the \fItokenPtr\fR field of the
-Tcl_Parse structure depends on the contents of the quoted string.
-It will consist of one or more \fBTCL_TOKEN_TEXT\fR, \fBTCL_TOKEN_BS\fR,
-\fBTCL_TOKEN_COMMAND\fR, and \fBTCL_TOKEN_VARIABLE\fR sub-tokens.
-The array always contains at least one token;
-for example, if the argument \fIstring\fR is empty,
-the array returned consists of a single \fBTCL_TOKEN_TEXT\fR token
-with a zero \fIsize\fR field.
-Only the token information in the Tcl_Parse structure
-is modified: the \fIcommentStart\fR, \fIcommentSize\fR,
-\fIcommandStart\fR, and \fIcommandSize\fR fields are not modified.
-.PP
-After \fBTcl_ParseVarName\fR returns, the first token pointed to by
-the \fItokenPtr\fR field of the
-Tcl_Parse structure always has type \fBTCL_TOKEN_VARIABLE\fR.  It
-is followed by the sub-tokens that make up the variable name as
-described above.  The total length of the variable name is
-contained in the \fIsize\fR field of the first token.
-As in \fBTcl_ParseExpr\fR,
-only the token information in the Tcl_Parse structure
-is modified by \fBTcl_ParseVarName\fR:
-the \fIcommentStart\fR, \fIcommentSize\fR,
-\fIcommandStart\fR, and \fIcommandSize\fR fields are not modified.
-.PP
-All of the character pointers in the
-Tcl_Parse and Tcl_Token structures refer
-to characters in the \fIstring\fR argument passed to
-\fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseBraces\fR,
-\fBTcl_ParseQuotedString\fR, and \fBTcl_ParseVarName\fR.
-.PP
-There are additional fields in the Tcl_Parse structure after the
-\fInumTokens\fR field, but these are for the private use of
-\fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseBraces\fR,
-\fBTcl_ParseQuotedString\fR, and \fBTcl_ParseVarName\fR; they should not be
-referenced by code outside of these procedures.
-
-.SH KEYWORDS
-backslash substitution, braces, command, expression, parse, token, variable substitution
diff --git a/doc/PkgRequire.3 b/doc/PkgRequire.3
deleted file mode 100644
index 796ee6f..0000000
--- a/doc/PkgRequire.3
+++ /dev/null
@@ -1,87 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: PkgRequire.3,v 1.3 1999/03/10 05:52:45 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_PkgRequire 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_PkgRequire, Tcl_PkgRequireEx, Tcl_PkgPresent, Tcl_PkgPresentEx, Tcl_PkgProvide, Tcl_PkgProvideEx \- package version control
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_PkgRequire\fR(\fIinterp, name, version, exact\fR)
-.sp
-char *
-\fBTcl_PkgRequireEx\fR(\fIinterp, name, version, exact, clientDataPtr\fR)
-.sp
-char *
-\fBTcl_PkgPresent\fR(\fIinterp, name, version, exact\fR)
-.sp
-char *
-\fBTcl_PkgPresentEx\fR(\fIinterp, name, version, exact, clientDataPtr\fR)
-.sp
-int
-\fBTcl_PkgProvide\fR(\fIinterp, name, version\fR)
-.sp
-int
-\fBTcl_PkgProvideEx\fR(\fIinterp, name, version, clientData\fR)
-.SH ARGUMENTS
-.AS Tcl_FreeProc clientDataPtr
-.AP Tcl_Interp *interp in
-Interpreter where package is needed or available.
-.AP char *name in
-Name of package.
-.AP char *version in
-A version string consisting of one or more decimal numbers
-separated by dots.
-.AP int exact in
-Non-zero means that only the particular version specified by
-\fIversion\fR is acceptable.
-Zero means that newer versions than \fIversion\fR are also
-acceptable as long as they have the same major version number
-as \fIversion\fR.
-.AP ClientData clientData in
-Arbitrary value to be associated with the package.
-.AP ClientData *clientDataPtr out
-Pointer to place to store the value associated with the matching
-package. It is only changed if the pointer is not NULL and the
-function completed successfully.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures provide C-level interfaces to Tcl's package and
-version management facilities.
-.PP
-\fBTcl_PkgRequire\fR is equivalent to the \fBpackage require\fR
-command, \fBTcl_PkgPresent\fR is equivalent to the \fBpackage present\fR
-command, and \fBTcl_PkgProvide\fR is equivalent to the
-\fBpackage provide\fR command.
-.PP
-See the documentation for the Tcl commands for details on what these
-procedures do.
-.PP
-If \fBTcl_PkgPresent\fR or \fBTcl_PkgRequire\fR complete successfully
-they return a pointer to the version string for the version of the package
-that is provided in the interpreter (which may be different than 
-\fIversion\fR); if an error occurs they return NULL and leave an error 
-message in \fIinterp->result\fR.
-.PP
-\fBTcl_PkgProvide\fR returns TCL_OK if it completes successfully;
-if an error occurs it returns TCL_ERROR and leaves an error message
-in \fIinterp->result\fR.
-.PP
-\fBTcl_PkgProvideEx\fR, \fBTcl_PkgPresentEx\fR and \fBTcl_PkgRequireEx\fR
-allow the setting and retrieving of the client data associated with
-the package. In all other respects they are equivalent to the matching
-functions.
-
-.SH KEYWORDS
-package, present, provide, require, version
diff --git a/doc/Preserve.3 b/doc/Preserve.3
deleted file mode 100644
index 07c6476..0000000
--- a/doc/Preserve.3
+++ /dev/null
@@ -1,103 +0,0 @@
-'\"
-'\" Copyright (c) 1990 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Preserve.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Preserve 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Preserve, Tcl_Release, Tcl_EventuallyFree \- avoid freeing storage while it's being used
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_Preserve\fR(\fIclientData\fR)
-.sp
-\fBTcl_Release\fR(\fIclientData\fR)
-.sp
-\fBTcl_EventuallyFree\fR(\fIclientData, freeProc\fR)
-.SH ARGUMENTS
-.AS Tcl_FreeProc clientData
-.AP ClientData clientData in
-Token describing structure to be freed or reallocated.  Usually a pointer
-to memory for structure.
-.AP Tcl_FreeProc *freeProc in
-Procedure to invoke to free \fIclientData\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These three procedures help implement a simple reference count mechanism
-for managing storage.  They are designed to solve a problem
-having to do with widget deletion, but are also useful in many other
-situations.  When a widget is deleted, its
-widget record (the structure holding information specific to the
-widget) must be returned to the storage allocator.
-However, it's possible that the widget record is in active use
-by one of the procedures on the stack at the time of the deletion.
-This can happen, for example, if the command associated with a button
-widget causes the button to be destroyed:  an X event causes an
-event-handling C procedure in the button to be invoked, which in
-turn causes the button's associated Tcl command to be executed,
-which in turn causes the button to be deleted, which in turn causes
-the button's widget record to be de-allocated.
-Unfortunately, when the Tcl command returns, the button's
-event-handling procedure will need to reference the
-button's widget record.
-Because of this, the widget record must not be freed as part of the
-deletion, but must be retained until the event-handling procedure has
-finished with it.
-In other situations where the widget is deleted, it may be possible
-to free the widget record immediately.
-.PP
-\fBTcl_Preserve\fR and \fBTcl_Release\fR
-implement short-term reference counts for their \fIclientData\fR
-argument.
-The \fIclientData\fR argument identifies an object and usually
-consists of the address of a structure.
-The reference counts guarantee that an object will not be freed
-until each call to \fBTcl_Preserve\fR for the object has been
-matched by calls to \fBTcl_Release\fR.
-There may be any number of unmatched \fBTcl_Preserve\fR calls
-in effect at once.
-.PP
-\fBTcl_EventuallyFree\fR is invoked to free up its \fIclientData\fR
-argument.
-It checks to see if there are unmatched \fBTcl_Preserve\fR calls
-for the object.
-If not, then \fBTcl_EventuallyFree\fR calls \fIfreeProc\fR immediately.
-Otherwise \fBTcl_EventuallyFree\fR records the fact that \fIclientData\fR
-needs eventually to be freed.
-When all calls to \fBTcl_Preserve\fR have been matched with
-calls to \fBTcl_Release\fR then \fIfreeProc\fR will be called by
-\fBTcl_Release\fR to do the cleanup.
-.PP
-All the work of freeing the object is carried out by \fIfreeProc\fR.
-\fIFreeProc\fR must have arguments and result that match the
-type \fBTcl_FreeProc\fR:
-.CS
-typedef void Tcl_FreeProc(char *\fIblockPtr\fR);
-.CE
-The \fIblockPtr\fR argument to \fIfreeProc\fR will be the
-same as the \fIclientData\fR argument to \fBTcl_EventuallyFree\fR.
-The type of \fIblockPtr\fR (\fBchar *\fR) is different than the type of the
-\fIclientData\fR argument to \fBTcl_EventuallyFree\fR for historical
-reasons, but the value is the same.
-.PP
-This mechanism can be used to solve the problem described above
-by placing \fBTcl_Preserve\fR and \fBTcl_Release\fR calls around
-actions that may cause undesired storage re-allocation.  The
-mechanism is intended only for short-term use (i.e. while procedures
-are pending on the stack);  it will not work efficiently as a
-mechanism for long-term reference counts.
-The implementation does not depend in any way on the internal
-structure of the objects being freed;  it keeps the reference
-counts in a separate structure.
-
-.SH KEYWORDS
-free, reference count, storage
diff --git a/doc/PrintDbl.3 b/doc/PrintDbl.3
deleted file mode 100644
index 81af506..0000000
--- a/doc/PrintDbl.3
+++ /dev/null
@@ -1,47 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: PrintDbl.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_PrintDouble 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_PrintDouble \- Convert floating value to string
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_PrintDouble\fR(\fIinterp, value, dst\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-.VS
-Before Tcl 8.0, the \fBtcl_precision\fR variable in this interpreter
-controlled the conversion.  As of Tcl 8.0, this argument is ignored and
-the conversion is controlled by the \fBtcl_precision\fR variable
-that is now shared by all interpreters.
-.VE
-.AP double value in
-Floating-point value to be converted.
-.AP char *dst out
-Where to store string representing \fIvalue\fR.  Must have at
-least TCL_DOUBLE_SPACE characters of storage.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_PrintDouble\fR generates a string that represents the value
-of \fIvalue\fR and stores it in memory at the location given by
-\fIdst\fR.  It uses \fB%g\fR format to generate the string, with one
-special twist: the string is guaranteed to contain either
-a ``.'' or an ``e'' so that it doesn't look like an integer.  Where
-\fB%g\fR would generate an integer with no decimal point, \fBTcl_PrintDouble\fR
-adds ``.0''.
-
-.SH KEYWORDS
-conversion, double-precision, floating-point, string
diff --git a/doc/RecEvalObj.3 b/doc/RecEvalObj.3
deleted file mode 100644
index 6af989f..0000000
--- a/doc/RecEvalObj.3
+++ /dev/null
@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: RecEvalObj.3,v 1.2 1998/09/14 18:39:49 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_RecordAndEvalObj 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_RecordAndEvalObj \- save command on history list before evaluating
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_RecordAndEvalObj\fR(\fIinterp, cmdPtr, flags\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp;
-.AP Tcl_Interp *interp in
-Tcl interpreter in which to evaluate command.
-.AP Tcl_Obj *cmdPtr in
-Points to a Tcl object containing a command (or sequence of commands)
-to execute.
-.AP int flags in
-An OR'ed combination of flag bits.  TCL_NO_EVAL means record the
-command but don't evaluate it.  TCL_EVAL_GLOBAL means evaluate
-the command at global level instead of the current stack level.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_RecordAndEvalObj\fR is invoked to record a command as an event
-on the history list and then execute it using \fBTcl_EvalObj\fR
-(or \fBTcl_GlobalEvalObj\fR if the TCL_EVAL_GLOBAL bit is set
-in \fIflags\fR).
-It returns a completion code such as TCL_OK just like \fBTcl_EvalObj\fR,
-as well as a result object containing additional information
-(a result value or error message)
-that can be retrieved using \fBTcl_GetObjResult\fR.
-If you don't want the command recorded on the history list then
-you should invoke \fBTcl_EvalObj\fR instead of \fBTcl_RecordAndEvalObj\fR.
-Normally \fBTcl_RecordAndEvalObj\fR is only called with top-level
-commands typed by the user, since the purpose of history is to
-allow the user to re-issue recently-invoked commands.
-If the \fIflags\fR argument contains the TCL_NO_EVAL bit then
-the command is recorded without being evaluated.
-
-.SH "SEE ALSO"
-Tcl_EvalObj, Tcl_GetObjResult
-
-.SH KEYWORDS
-command, event, execute, history, interpreter, object, record
diff --git a/doc/RecordEval.3 b/doc/RecordEval.3
deleted file mode 100644
index 090a56d..0000000
--- a/doc/RecordEval.3
+++ /dev/null
@@ -1,57 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: RecordEval.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_RecordAndEval 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_RecordAndEval \- save command on history list before evaluating
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_RecordAndEval\fR(\fIinterp, cmd, flags\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp;
-.AP Tcl_Interp *interp in
-Tcl interpreter in which to evaluate command.
-.AP char *cmd in
-Command (or sequence of commands) to execute.
-.AP int flags in
-An OR'ed combination of flag bits.  TCL_NO_EVAL means record the
-command but don't evaluate it.  TCL_EVAL_GLOBAL means evaluate
-the command at global level instead of the current stack level.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_RecordAndEval\fR is invoked to record a command as an event
-on the history list and then execute it using \fBTcl_Eval\fR
-(or \fBTcl_GlobalEval\fR if the TCL_EVAL_GLOBAL bit is set in \fIflags\fR).
-It returns a completion code such as TCL_OK just like \fBTcl_Eval\fR
-and it leaves information in \fIinterp->result\fR.
-If you don't want the command recorded on the history list then
-you should invoke \fBTcl_Eval\fR instead of \fBTcl_RecordAndEval\fR.
-Normally \fBTcl_RecordAndEval\fR is only called with top-level
-commands typed by the user, since the purpose of history is to
-allow the user to re-issue recently-invoked commands.
-If the \fIflags\fR argument contains the TCL_NO_EVAL bit then
-the command is recorded without being evaluated.
-.PP
-Note that \fBTcl_RecordAndEval\fR has been largely replaced by the
-object-based procedure \fBTcl_RecordAndEvalObj\fR.
-That object-based procedure records and optionally executes
-a command held in a Tcl object instead of a string.
-
-.SH "SEE ALSO"
-Tcl_RecordAndEvalObj
-
-.SH KEYWORDS
-command, event, execute, history, interpreter, record
diff --git a/doc/RegExp.3 b/doc/RegExp.3
deleted file mode 100644
index 1f1064d..0000000
--- a/doc/RegExp.3
+++ /dev/null
@@ -1,131 +0,0 @@
-'\"
-'\" Copyright (c) 1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\" Copyright (c) 1998-1999 Scriptics Corportation
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: RegExp.3,v 1.3 1999/04/16 00:46:32 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_RegExpMatch 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_GetRegExpFromObj, Tcl_RegExpMatch, Tcl_RegExpCompile, Tcl_RegExpExec, Tcl_RegExpRange \- Pattern matching with regular expressions
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_RegExp
-\fBTcl_GetRegExpFromObj\fR(\fIinterp\fR, \fIpatObj\fR, \fIflags\fR)
-.sp
-int
-\fBTcl_RegExpMatch\fR(\fIinterp\fR, \fIstring\fR, \fIpattern\fR)
-.sp
-Tcl_RegExp
-\fBTcl_RegExpCompile\fR(\fIinterp\fR, \fIpattern\fR)
-.sp
-int
-\fBTcl_RegExpExec\fR(\fIinterp\fR, \fIregexp\fR, \fIstring\fR, \fIstart\fR)
-.sp
-\fBTcl_RegExpRange\fR(\fIregexp\fR, \fIindex\fR, \fIstartPtr\fR, \fIendPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-Tcl interpreter to use for error reporting.
-.AP char *string in
-String to check for a match with a regular expression.
-.AP char *pattern in
-String in the form of a regular expression pattern.
-.AP Tcl_Obj *patObj in
-Refers to the object from which to get a compiled regular expression.
-.AP int flags in
-Various flags to control regular expression compile options.
-.AP Tcl_RegExp regexp in
-Compiled regular expression.  Must have been returned previously
-by \fBTcl_GetRegExpFromObj\fR.
-.AP char *start in
-If \fIstring\fR is just a portion of some other string, this argument
-identifies the beginning of the larger string.
-If it isn't the same as \fIstring\fR, then no \fB^\fR matches
-will be allowed.
-.AP int index in
-Specifies which range is desired:  0 means the range of the entire
-match, 1 or greater means the range that matched a parenthesized
-sub-expression.
-.AP char **startPtr out
-The address of the first character in the range is stored here, or
-NULL if there is no such range.
-.AP char **endPtr out
-The address of the character just after the last one in the range
-is stored here, or NULL if there is no such range.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_GetRegExpFromObj\fR attepts to return a compiled regular 
-expression from the Tcl obj \fIpatObj\fR.  If the object does not
-already contain a compiled regular expression it will attempt to
-create one from the string in the Tcl obj and assign it to the
-internal representation of the \fIpatObj\fR.  The return value
-of this function is of type \fBTcl_RegExp\fR.
-.PP
-\fBTcl_RegExpMatch\fR determines whether its \fIpattern\fR argument
-matches \fIregexp\fR, where \fIregexp\fR is interpreted
-as a regular expression using the same rules as for the
-\fBregexp\fR Tcl command.
-If there is a match then \fBTcl_RegExpMatch\fR returns 1.
-If there is no match then \fBTcl_RegExpMatch\fR returns 0.
-If an error occurs in the matching process (e.g. \fIpattern\fR
-is not a valid regular expression) then \fBTcl_RegExpMatch\fR
-returns \-1 and leaves an error message in \fIinterp->result\fR.
-.PP
-\fBTcl_RegExpCompile\fR, \fBTcl_RegExpExec\fR, and \fBTcl_RegExpRange\fR
-provide lower-level access to the regular expression pattern matcher.
-\fBTcl_RegExpCompile\fR compiles a regular expression string into
-the internal form used for efficient pattern matching.
-The return value is a token for this compiled form, which can be
-used in subsequent calls to \fBTcl_RegExpExec\fR or \fBTcl_RegExpRange\fR.
-If an error occurs while compiling the regular expression then
-\fBTcl_RegExpCompile\fR returns NULL and leaves an error message
-in \fIinterp->result\fR.
-Note:  the return value from \fBTcl_RegExpCompile\fR is only valid
-up to the next call to \fBTcl_RegExpCompile\fR;  it is not safe to
-retain these values for long periods of time.
-.PP
-\fBTcl_RegExpExec\fR executes the regular expression pattern matcher.
-It returns 1 if \fIstring\fR contains a range of characters that
-match \fIregexp\fR, 0 if no match is found, and
-\-1 if an error occurs.
-In the case of an error, \fBTcl_RegExpExec\fR leaves an error
-message in \fIinterp->result\fR.
-When searching a string for multiple matches of a pattern,
-it is important to distinguish between the start of the original
-string and the start of the current search.
-For example, when searching for the second occurrence of a
-match, the \fIstring\fR argument might point to the character
-just after the first match;  however, it is important for the
-pattern matcher to know that this is not the start of the entire string,
-so that it doesn't allow \fB^\fR atoms in the pattern to match.
-The \fIstart\fR argument provides this information by pointing
-to the start of the overall string containing \fIstring\fR.
-\fIStart\fR will be less than or equal to \fIstring\fR;  if it
-is less than \fIstring\fR then no \fB^\fR matches will be allowed.
-.PP
-\fBTcl_RegExpRange\fR may be invoked after \fBTcl_RegExpExec\fR
-returns;  it provides detailed information about what ranges of
-the string matched what parts of the pattern.
-\fBTcl_RegExpRange\fR returns a pair of pointers in \fI*startPtr\fR
-and \fI*endPtr\fR that identify a range of characters in
-the source string for the most recent call to \fBTcl_RegExpExec\fR.
-\fIIndex\fR indicates which of several ranges is desired:
-if \fIindex\fR is 0, information is returned about the overall range
-of characters that matched the entire pattern;  otherwise,
-information is returned about the range of characters that matched the
-\fIindex\fR'th parenthesized subexpression within the pattern.
-If there is no range corresponding to \fIindex\fR then NULL
-is stored in \fI*firstPtr\fR and \fI*lastPtr\fR.
-
-.SH KEYWORDS
-match, pattern, regular expression, string, subexpression
diff --git a/doc/SaveResult.3 b/doc/SaveResult.3
deleted file mode 100644
index 6a0a051..0000000
--- a/doc/SaveResult.3
+++ /dev/null
@@ -1,65 +0,0 @@
-'\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SaveResult.3,v 1.2 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SaveResult 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SaveResult, Tcl_RestoreResult, Tcl_DiscardResult \- save and restore an interpreter's result
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_SaveResult(\fIinterp, statePtr\fB)\fR
-.sp
-\fBTcl_RestoreResult(\fIinterp, statePtr\fB)\fR
-.sp
-\fBTcl_DiscardResult(\fIstatePtr\fB)\fR
-.SH ARGUMENTS
-.AS Tcl_SavedResult statePtr
-.AP Tcl_Interp *interp in
-Interpreter for which state should be saved.
-.AP Tcl_SavedResult *statePtr in
-Pointer to location where interpreter result should be saved or restored.
-.BE
-
-.SH DESCRIPTION
-.PP
-These routines allows a C procedure to take a snapshot of the current
-interpreter result so that it can be restored after a call
-to \fBTcl_Eval\fR or some other routine that modifies the interpreter
-result.  These routines are passed a pointer to a structure that is
-used to store enough information to restore the interpreter result
-state.  This structure can be allocated on the stack of the calling
-procedure.  These routines do not save the state of any error
-information in the interpreter (e.g. the \fBerrorCode\fR or
-\fBerrorInfo\fR variables).
-.PP
-\fBTcl_SaveResult\fR moves the string and object results
-of \fIinterp\fR into the location specified by \fIstatePtr\fR.
-\fBTcl_SaveResult\fR clears the result for \fIinterp\fR and
-leaves the result in its normal empty initialized state.
-.PP
-\fBTcl_RestoreResult\fR moves the string and object results from
-\fIstatePtr\fR back into \fIinterp\fR.  Any result or error that was
-already in the interpreter will be cleared.  The \fIstatePtr\fR is left
-in an uninitialized state and cannot be used until another call to
-\fBTcl_SaveResult\fR.
-.PP
-\fBTcl_DiscardResult\fR releases the saved interpreter state
-stored at \fBstatePtr\fR.  The state structure is left in an
-uninitialized state and cannot be used until another call to
-\fBTcl_SaveResult\fR.
-.PP
-Once \fBTcl_SaveResult\fR is called to save the interpreter
-result, either \fBTcl_RestoreResult\fR or
-\fBTcl_DiscardResult\fR must be called to properly clean up the
-memory associated with the saved state.  
-
-.SH KEYWORDS
-result, state, interp
diff --git a/doc/SetErrno.3 b/doc/SetErrno.3
deleted file mode 100644
index d57263b..0000000
--- a/doc/SetErrno.3
+++ /dev/null
@@ -1,48 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SetErrno.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-.so man.macros
-.TH Tcl_SetErrno 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SetErrno, Tcl_GetErrno \- manipulate errno to store and retrieve error codes
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-void
-\fBTcl_SetErrno\fR(\fIerrorCode\fR)
-.sp
-int
-\fBTcl_GetErrno\fR()
-.sp
-.SH ARGUMENTS
-.AS Tcl_Interp *errorCode in
-.AP int errorCode in
-A POSIX error code such as \fBENOENT\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_SetErrno\fR and \fBTcl_GetErrno\fR provide portable access
-to the \fBerrno\fR variable, which is used to record a POSIX error
-code after system calls and other operations such as \fBTcl_Gets\fR.
-These procedures are necessary because global variable accesses cannot
-be made across module boundaries on some platforms.
-.PP
-\fBTcl_SetErrno\fR sets the \fBerrno\fR variable to the value of the
-\fIerrorCode\fR argument
-C procedures that wish to return error information to their callers
-via \fBerrno\fR should call \fBTcl_SetErrno\fR rather than setting
-\fBerrno\fR directly.
-.PP
-\fBTcl_GetErrno\fR returns the current value of \fBerrno\fR.
-Procedures wishing to access \fBerrno\fR should call this procedure
-instead of accessing \fBerrno\fR directly.
-
-.SH KEYWORDS
-errno, error code, global variables
diff --git a/doc/SetRecLmt.3 b/doc/SetRecLmt.3
deleted file mode 100644
index 599e46f..0000000
--- a/doc/SetRecLmt.3
+++ /dev/null
@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SetRecLmt.3,v 1.3 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SetRecursionLimit 3 7.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SetRecursionLimit \- set maximum allowable nesting depth in interpreter
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_SetRecursionLimit\fR(\fIinterp, depth\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *interp
-.AP Tcl_Interp *interp in
-Interpreter whose recursion limit is to be set.
-Must be greater than zero.
-.AP int depth in
-New limit for nested calls to \fBTcl_Eval\fR for \fIinterp\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-At any given time Tcl enforces a limit on the number of recursive
-calls that may be active for \fBTcl_Eval\fR and related procedures
-such as \fBTcl_GlobalEval\fR.
-Any call to \fBTcl_Eval\fR that exceeds this depth is aborted with
-an error.
-By default the recursion limit is 1000.
-.PP
-\fBTcl_SetRecursionLimit\fR may be used to change the maximum
-allowable nesting depth for an interpreter.
-The \fIdepth\fR argument specifies a new limit for \fIinterp\fR,
-and \fBTcl_SetRecursionLimit\fR returns the old limit.
-To read out the old limit without modifying it, invoke
-\fBTcl_SetRecursionLimit\fR with \fIdepth\fR equal to 0.
-.PP
-The \fBTcl_SetRecursionLimit\fR only sets the size of the Tcl
-call stack:  it cannot by itself prevent stack overflows on the
-C stack being used by the application.  If your machine has a
-limit on the size of the C stack, you may get stack overflows
-before reaching the limit set by \fBTcl_SetRecursionLimit\fR.
-If this happens, see if there is a mechanism in your system for
-increasing the maximum size of the C stack.
-
-.SH KEYWORDS
-nesting depth, recursion
diff --git a/doc/SetResult.3 b/doc/SetResult.3
deleted file mode 100644
index 1fed065..0000000
--- a/doc/SetResult.3
+++ /dev/null
@@ -1,225 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SetResult.3,v 1.3 1999/03/10 05:52:45 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SetResult 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SetObjResult, Tcl_GetObjResult, Tcl_SetResult, Tcl_GetStringResult, Tcl_AppendResult, Tcl_AppendResultVA, Tcl_AppendElement, Tcl_ResetResult \- manipulate Tcl result
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_SetObjResult\fR(\fIinterp, objPtr\fR)
-.sp
-Tcl_Obj *
-\fBTcl_GetObjResult\fR(\fIinterp\fR)
-.sp
-\fBTcl_SetResult\fR(\fIinterp, string, freeProc\fR)
-.sp
-char *
-\fBTcl_GetStringResult\fR(\fIinterp\fR)
-.sp
-\fBTcl_AppendResult\fR(\fIinterp, string, string, ... , \fB(char *) NULL\fR)
-.sp
-\fBTcl_AppendResultVA\fR(\fIinterp, argList\fR)
-.sp
-\fBTcl_AppendElement\fR(\fIinterp, string\fR)
-.sp
-\fBTcl_ResetResult\fR(\fIinterp\fR)
-.sp
-\fBTcl_FreeResult\fR(\fIinterp\fR)
-.SH ARGUMENTS
-.AS Tcl_FreeProc freeProc
-.AP Tcl_Interp *interp out
-Interpreter whose result is to be modified or read.
-.AP Tcl_Obj *objPtr in
-Object value to become result for \fIinterp\fR.
-.AP char *string in
-String value to become result for \fIinterp\fR or to be
-appended to the existing result.
-.AP Tcl_FreeProc *freeProc in
-Address of procedure to call to release storage at
-\fIstring\fR, or \fBTCL_STATIC\fR, \fBTCL_DYNAMIC\fR, or
-\fBTCL_VOLATILE\fR.
-.AP va_list argList in
-An argument list which must have been initialised using
-\fBTCL_VARARGS_START\fR, and cleared using \fBva_end\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-The procedures described here are utilities for manipulating the
-result value in a Tcl interpreter.
-The interpreter result may be either a Tcl object or a string.
-For example, \fBTcl_SetObjResult\fR and \fBTcl_SetResult\fR
-set the interpreter result to, respectively, an object and a string.
-Similarly, \fBTcl_GetObjResult\fR and \fBTcl_GetStringResult\fR
-return the interpreter result as an object and as a string.
-The procedures always keep the string and object forms
-of the interpreter result consistent.
-For example, if \fBTcl_SetObjResult\fR is called to set
-the result to an object,
-then \fBTcl_GetStringResult\fR is called,
-it will return the object's string value.
-.PP
-\fBTcl_SetObjResult\fR
-arranges for \fIobjPtr\fR to be the result for \fIinterp\fR,
-replacing any existing result.
-The result is left pointing to the object
-referenced by \fIobjPtr\fR.
-\fIobjPtr\fR's reference count is incremented
-since there is now a new reference to it from \fIinterp\fR.
-The reference count for any old result object
-is decremented and the old result object is freed if no
-references to it remain.
-.PP
-\fBTcl_GetObjResult\fR returns the result for \fIinterp\fR as an object.
-The object's reference count is not incremented;
-if the caller needs to retain a long-term pointer to the object
-they should use \fBTcl_IncrRefCount\fR to increment its reference count
-in order to keep it from being freed too early or accidently changed.
-.PP
-\fBTcl_SetResult\fR
-arranges for \fIstring\fR to be the result for the current Tcl
-command in \fIinterp\fR, replacing any existing result.
-The \fIfreeProc\fR argument specifies how to manage the storage
-for the \fIstring\fR argument;
-it is discussed in the section
-\fBTHE TCL_FREEPROC ARGUMENT TO TCL_SETRESULT\fR below.
-If \fIstring\fR is \fBNULL\fR, then \fIfreeProc\fR is ignored
-and \fBTcl_SetResult\fR
-re-initializes \fIinterp\fR's result to point to an empty string.
-.PP
-\fBTcl_GetStringResult\fR returns the result for \fIinterp\fR as an string.
-If the result was set to an object by a \fBTcl_SetObjResult\fR call,
-the object form will be converted to a string and returned.
-If the object's string representation contains null bytes,
-this conversion will lose information.
-For this reason, programmers are encouraged to
-write their code to use the new object API procedures
-and to call \fBTcl_GetObjResult\fR instead.
-.PP
-\fBTcl_ResetResult\fR clears the result for \fIinterp\fR
-and leaves the result in its normal empty initialized state.
-If the result is an object,
-its reference count is decremented and the result is left
-pointing to an unshared object representing an empty string.
-If the result is a dynamically allocated string, its memory is free*d
-and the result is left as a empty string.
-\fBTcl_ResetResult\fR also clears the error state managed by
-\fBTcl_AddErrorInfo\fR, \fBTcl_AddObjErrorInfo\fR,
-and \fBTcl_SetErrorCode\fR.
-
-.SH OLD STRING PROCEDURES
-.PP
-Use of the following procedures is deprecated
-since they manipulate the Tcl result as a string.
-Procedures such as \fBTcl_SetObjResult\fR
-that manipulate the result as an object
-can be significantly more efficient.
-.PP
-\fBTcl_AppendResult\fR makes it easy to build up Tcl results in pieces.
-It takes each of its \fIstring\fR arguments and appends them in order
-to the current result associated with \fIinterp\fR.
-If the result is in its initialized empty state (e.g. a command procedure
-was just invoked or \fBTcl_ResetResult\fR was just called),
-then \fBTcl_AppendResult\fR sets the result to the concatenation of
-its \fIstring\fR arguments.
-\fBTcl_AppendResult\fR may be called repeatedly as additional pieces
-of the result are produced.
-\fBTcl_AppendResult\fR takes care of all the
-storage management issues associated with managing \fIinterp\fR's
-result, such as allocating a larger result area if necessary.
-It also converts the current interpreter result from an object
-to a string, if necessary, before appending the argument strings.
-Any number of \fIstring\fR arguments may be passed in a single
-call; the last argument in the list must be a NULL pointer.
-.PP
-\fBTcl_AppendResultVA\fR is the same as \fBTcl_AppendResult\fR except that
-instead of taking a variable number of arguments it takes an argument list.
-.PP
-\fBTcl_AppendElement\fR is similar to \fBTcl_AppendResult\fR in
-that it allows results to be built up in pieces.
-However, \fBTcl_AppendElement\fR takes only a single \fIstring\fR
-argument and it appends that argument to the current result
-as a proper Tcl list element.
-\fBTcl_AppendElement\fR adds backslashes or braces if necessary
-to ensure that \fIinterp\fR's result can be parsed as a list and that
-\fIstring\fR will be extracted as a single element.
-Under normal conditions, \fBTcl_AppendElement\fR will add a space
-character to \fIinterp\fR's result just before adding the new
-list element, so that the list elements in the result are properly
-separated.
-However if the new list element is the first in a list or sub-list
-(i.e. \fIinterp\fR's current result is empty, or consists of the
-single character ``{'', or ends in the characters `` {'') then no
-space is added.
-.PP
-\fBTcl_FreeResult\fR performs part of the work
-of \fBTcl_ResetResult\fR.
-It frees up the memory associated with \fIinterp\fR's result.
-It also sets \fIinterp->freeProc\fR to zero, but doesn't
-change \fIinterp->result\fR or clear error state.
-\fBTcl_FreeResult\fR is most commonly used when a procedure
-is about to replace one result value with another.
-
-.SH DIRECT ACCESS TO INTERP->RESULT IS DEPRECATED
-.PP
-It used to be legal for programs to
-directly read and write \fIinterp->result\fR
-to manipulate the interpreter result.
-Direct access to \fIinterp->result\fR is now strongly deprecated
-because it can make the result's string and object forms inconsistent.
-Programs should always read the result
-using the procedures \fBTcl_GetObjResult\fR or \fBTcl_GetStringResult\fR,
-and write the result using \fBTcl_SetObjResult\fR or \fBTcl_SetResult\fR.
-
-.SH THE TCL_FREEPROC ARGUMENT TO TCL_SETRESULT
-.PP
-\fBTcl_SetResult\fR's \fIfreeProc\fR argument specifies how 
-the Tcl system is to manage the storage for the \fIstring\fR argument.
-If \fBTcl_SetResult\fR or \fBTcl_SetObjResult\fR are called
-at a time when \fIinterp\fR holds a string result,
-they do whatever is necessary to dispose of the old string result
-(see the \fBTcl_Interp\fR manual entry for details on this).
-.PP
-If \fIfreeProc\fR is \fBTCL_STATIC\fR it means that \fIstring\fR
-refers to an area of static storage that is guaranteed not to be
-modified until at least the next call to \fBTcl_Eval\fR.
-If \fIfreeProc\fR
-is \fBTCL_DYNAMIC\fR it means that \fIstring\fR was allocated with a call
-to \fBTcl_Alloc\fR and is now the property of the Tcl system.
-\fBTcl_SetResult\fR will arrange for the string's storage to be
-released by calling \fBTcl_Free\fR when it is no longer needed.
-If \fIfreeProc\fR is \fBTCL_VOLATILE\fR it means that \fIstring\fR
-points to an area of memory that is likely to be overwritten when
-\fBTcl_SetResult\fR returns (e.g. it points to something in a stack frame).
-In this case \fBTcl_SetResult\fR will make a copy of the string in
-dynamically allocated storage and arrange for the copy to be the
-result for the current Tcl command.
-.PP
-If \fIfreeProc\fR isn't one of the values \fBTCL_STATIC\fR,
-\fBTCL_DYNAMIC\fR, and \fBTCL_VOLATILE\fR, then it is the address
-of a procedure that Tcl should call to free the string.
-This allows applications to use non-standard storage allocators.
-When Tcl no longer needs the storage for the string, it will
-call \fIfreeProc\fR. \fIFreeProc\fR should have arguments and
-result that match the type \fBTcl_FreeProc\fR:
-.CS
-typedef void Tcl_FreeProc(char *\fIblockPtr\fR);
-.CE
-When \fIfreeProc\fR is called, its \fIblockPtr\fR will be set to
-the value of \fIstring\fR passed to \fBTcl_SetResult\fR.
-
-.SH "SEE ALSO"
-Tcl_AddErrorInfo, Tcl_CreateObjCommand, Tcl_SetErrorCode, Tcl_Interp
-
-.SH KEYWORDS
-append, command, element, list, object, result, return value, interpreter
diff --git a/doc/SetVar.3 b/doc/SetVar.3
deleted file mode 100644
index bb07005..0000000
--- a/doc/SetVar.3
+++ /dev/null
@@ -1,261 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SetVar.3,v 1.3 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SetVar 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SetVar2Ex, Tcl_SetVar, Tcl_SetVar2, Tcl_ObjSetVar2, Tcl_GetVar2Ex, Tcl_GetVar, Tcl_GetVar2, Tcl_ObjGetVar2, Tcl_UnsetVar, Tcl_UnsetVar2 \- manipulate Tcl variables
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-.VS 8.1
-Tcl_Obj *
-\fBTcl_SetVar2Ex\fR(\fIinterp, name1, name2, newValuePtr, flags\fR)
-.VE
-.sp
-char *
-\fBTcl_SetVar\fR(\fIinterp, varName, newValue, flags\fR)
-.sp
-char *
-\fBTcl_SetVar2\fR(\fIinterp, name1, name2, newValue, flags\fR)
-.sp
-Tcl_Obj *
-\fBTcl_ObjSetVar2\fR(\fIinterp, part1Ptr, part2Ptr, newValuePtr, flags\fR)
-.sp
-.VS 8.1
-Tcl_Obj *
-\fBTcl_GetVar2Ex\fR(\fIinterp, name1, name2, flags\fR)
-.VE
-.sp
-char *
-\fBTcl_GetVar\fR(\fIinterp, varName, flags\fR)
-.sp
-char *
-\fBTcl_GetVar2\fR(\fIinterp, name1, name2, flags\fR)
-.sp
-Tcl_Obj *
-\fBTcl_ObjGetVar2\fR(\fIinterp, part1Ptr, part2Ptr, flags\fR)
-.sp
-int
-\fBTcl_UnsetVar\fR(\fIinterp, varName, flags\fR)
-.sp
-int
-\fBTcl_UnsetVar2\fR(\fIinterp, name1, name2, flags\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *newValuePtr
-.AP Tcl_Interp *interp in
-Interpreter containing variable.
-.AP char *name1 in
-Contains the name of an array variable (if \fIname2\fR is non-NULL)
-or (if \fIname2\fR is NULL) either the name of a scalar variable
-or a complete name including both variable name and index.
-May include \fB::\fR namespace qualifiers
-to specify a variable in a particular namespace.
-.AP char *name2 in
-If non-NULL, gives name of element within array; in this
-case \fIname1\fR must refer to an array variable.
-.AP Tcl_Obj *newValuePtr in
-.VS 8.1
-Points to a Tcl object containing the new value for the variable.
-.VE
-.AP int flags in
-OR-ed combination of bits providing additional information. See below
-for valid values.
-.AP char *varName in
-Name of variable.
-May include \fB::\fR namespace qualifiers
-to specify a variable in a particular namespace.
-May refer to a scalar variable or an element of
-an array.
-If the name references an element of an array, then the name
-must be in writable memory:  Tcl will make temporary modifications 
-to it while looking up the name.
-.AP char *newValue in
-New value for variable, specified as a NULL-terminated string.
-A copy of this value is stored in the variable.
-.AP Tcl_Obj *part1Ptr in
-Points to a Tcl object containing the variable's name.
-The name may include a series of \fB::\fR namespace qualifiers
-to specify a variable in a particular namespace.
-May refer to a scalar variable or an element of an array variable.
-.AP Tcl_Obj *part2Ptr in
-If non-NULL, points to an object containing the name of an element
-within an array and \fIpart1Ptr\fR must refer to an array variable.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures are used to create, modify, read, and delete
-Tcl variables from C code.
-.PP
-.VS 8.1
-\fBTcl_SetVar2Ex\fR, \fBTcl_SetVar\fR, \fBTcl_SetVar2\fR, and
-\fBTcl_ObjSetVar2\fR 
-will create a new variable or modify an existing one.
-These procedures set the given variable to the value
-given by \fInewValuePtr\fR or \fInewValue\fR and return a
-pointer to the variable's new value, which is stored in Tcl's
-variable structure.
-\fBTcl_SetVar2Ex\fR and \fBTcl_ObjSetVar2\fR take the new value as a
-Tcl_Obj and return
-a pointer to a Tcl_Obj.  \fBTcl_SetVar\fR and \fBTcl_SetVar2\fR
-take the new value as a string and return a string; they are
-usually less efficient than \fBTcl_ObjSetVar2\fR.  Note that the
-return value may be different than the \fInewValuePtr\fR or
-.VE
-\fInewValue\fR argument, due to modifications made by write traces.
-If an error occurs in setting the variable (e.g. an array
-variable is referenced without giving an index into the array)
-NULL is returned and an error message is left in \fIinterp\fR's
-result if the \fBTCL_LEAVE_ERR_MSG\fR \fIflag\fR bit is set.
-.PP
-.VS 8.1
-\fBTcl_GetVar2Ex\fR, \fBTcl_GetVar\fR, \fBTcl_GetVar2\fR, and
-\fBTcl_ObjGetVar2\fR
-return the current value of a variable.
-The arguments to these procedures are treated in the same way
-as the arguments to the procedures described above.
-Under normal circumstances, the return value is a pointer
-to the variable's value.  For \fBTcl_GetVar2Ex\fR and
-\fBTcl_ObjGetVar2\fR the value is
-returned as a pointer to a Tcl_Obj.  For \fBTcl_GetVar\fR and
-\fBTcl_GetVar2\fR the value is returned as a string; this is
-usually less efficient, so \fBTcl_GetVar2Ex\fR or \fBTcl_ObjGetVar2\fR
-are preferred.
-.VE
-If an error occurs while reading the variable (e.g. the variable
-doesn't exist or an array element is specified for a scalar
-variable), then NULL is returned and an error message is left
-in \fIinterp\fR's result if the \fBTCL_LEAVE_ERR_MSG\fR \fIflag\fR
-bit is set.
-.PP
-\fBTcl_UnsetVar\fR and \fBTcl_UnsetVar2\fR may be used to remove
-a variable, so that future attempts to read the variable will return
-an error.
-The arguments to these procedures are treated in the same way
-as the arguments to the procedures above.
-If the variable is successfully removed then TCL_OK is returned.
-If the variable cannot be removed because it doesn't exist then
-TCL_ERROR is returned and an error message is left
-in \fIinterp\fR's result if the \fBTCL_LEAVE_ERR_MSG\fR \fIflag\fR
-bit is set.
-If an array element is specified, the given element is removed
-but the array remains.
-If an array name is specified without an index, then the entire
-array is removed.
-.PP
-The name of a variable may be specified to these procedures in
-four ways:
-.IP [1]
-If \fBTcl_SetVar\fR, \fBTcl_GetVar\fR, or \fBTcl_UnsetVar\fR
-is invoked, the variable name is given as
-a single string, \fIvarName\fR.
-If \fIvarName\fR contains an open parenthesis and ends with a
-close parenthesis, then the value between the parentheses is
-treated as an index (which can have any string value) and
-the characters before the first open
-parenthesis are treated as the name of an array variable.
-If \fIvarName\fR doesn't have parentheses as described above, then
-the entire string is treated as the name of a scalar variable.
-.IP [2]
-If the \fIname1\fR and \fIname2\fR arguments are provided and
-\fIname2\fR is non-NULL, then an array element is specified and
-the array name and index have
-already been separated by the caller: \fIname1\fR contains the
-name and \fIname2\fR contains the index.
-.VS 8.1
-An error is generated
-if \fIname1\fR  contains an open parenthesis and ends with a
-close parenthesis (array element) and \fIname2\fR is non-NULL.
-.IP [3]
-If \fIname2\fR is NULL, \fIname1\fR is treated just like
-\fIvarName\fR in case [1] above (it can be either a scalar or an array
-element variable name).
-.VE
-.PP
-The \fIflags\fR argument may be used to specify any of several
-options to the procedures.
-It consists of an OR-ed combination of the following bits.
-.TP
-\fBTCL_GLOBAL_ONLY\fR
-Under normal circumstances the procedures look up variables as follows.
-If a procedure call is active in \fIinterp\fR,
-the variable is looked up at the current level of procedure call.
-Otherwise, the variable is looked up first in the current namespace,
-then in the global namespace.
-However, if this bit is set in \fIflags\fR then the variable
-is looked up only in the global namespace
-even if there is a procedure call active.
-If both \fBTCL_GLOBAL_ONLY\fR and \fBTCL_NAMESPACE_ONLY\fR are given,
-\fBTCL_GLOBAL_ONLY\fR is ignored.
-.TP
-\fBTCL_NAMESPACE_ONLY\fR
-If this bit is set in \fIflags\fR then the variable
-is looked up only in the current namespace; if a procedure is active
-its variables are ignored, and the global namespace is also ignored unless
-it is the current namespace.
-.TP
-\fBTCL_LEAVE_ERR_MSG\fR
-If an error is returned and this bit is set in \fIflags\fR, then
-an error message will be left in the interpreter's result,
-where it can be retrieved with \fBTcl_GetObjResult\fR
-or \fBTcl_GetStringResult\fR.
-If this flag bit isn't set then no error message is left
-and the interpreter's result will not be modified.
-.TP
-\fBTCL_APPEND_VALUE\fR
-If this bit is set then \fInewValuePtr\fR or \fInewValue\fR is
-appended to the current value instead of replacing it.
-If the variable is currently undefined, then the bit is ignored.
-This bit is only used by the \fBTcl_Set*\fR procedures.
-.TP
-\fBTCL_LIST_ELEMENT\fR
-If this bit is set, then \fInewValue\fR is converted to a valid
-Tcl list element before setting (or appending to) the variable.
-A separator space is appended before the new list element unless
-the list element is going to be the first element in a list or
-sublist (i.e. the variable's current value is empty, or contains
-the single character ``{'', or ends in `` }'').
-.PP
-\fBTcl_GetVar\fR and \fBTcl_GetVar2\fR
-return the current value of a variable.
-The arguments to these procedures are treated in the same way
-as the arguments to \fBTcl_SetVar\fR and \fBTcl_SetVar2\fR.
-Under normal circumstances, the return value is a pointer
-to the variable's value (which is stored in Tcl's variable
-structure and will not change before the next call to \fBTcl_SetVar\fR
-or \fBTcl_SetVar2\fR).
-\fBTcl_GetVar\fR and \fBTcl_GetVar2\fR use the flag bits TCL_GLOBAL_ONLY
-and TCL_LEAVE_ERR_MSG, both of
-which have
-the same meaning as for \fBTcl_SetVar\fR.
-If an error occurs in reading the variable (e.g. the variable
-doesn't exist or an array element is specified for a scalar
-variable), then NULL is returned.
-.PP
-\fBTcl_UnsetVar\fR and \fBTcl_UnsetVar2\fR may be used to remove
-a variable, so that future calls to \fBTcl_GetVar\fR or \fBTcl_GetVar2\fR
-for the variable will return an error.
-The arguments to these procedures are treated in the same way
-as the arguments to \fBTcl_GetVar\fR and \fBTcl_GetVar2\fR.
-If the variable is successfully removed then TCL_OK is returned.
-If the variable cannot be removed because it doesn't exist then
-TCL_ERROR is returned.
-If an array element is specified, the given element is removed
-but the array remains.
-If an array name is specified without an index, then the entire
-array is removed.
-
-.SH "SEE ALSO"
-Tcl_GetObjResult, Tcl_GetStringResult, Tcl_TraceVar
-
-.SH KEYWORDS
-array, get variable, interpreter, object, scalar, set, unset, variable
diff --git a/doc/Sleep.3 b/doc/Sleep.3
deleted file mode 100644
index fcfed9b..0000000
--- a/doc/Sleep.3
+++ /dev/null
@@ -1,37 +0,0 @@
-'\"
-'\" Copyright (c) 1990 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Sleep.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Sleep 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Sleep \- delay execution for a given number of milliseconds
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_Sleep\fR(\fIms\fR)
-.SH ARGUMENTS
-.AP int ms in
-Number of milliseconds to sleep.
-.BE
-
-.SH DESCRIPTION
-.PP
-This procedure delays the calling process by the number of
-milliseconds given by the \fIms\fR parameter and returns
-after that time has elapsed.  It is typically used for things
-like flashing a button, where the delay is short and the
-application needn't do anything while it waits.  For longer
-delays where the application needs to respond to other events
-during the delay, the procedure \fBTcl_CreateTimerHandler\fR
-should be used instead of \fBTcl_Sleep\fR.
-
-.SH KEYWORDS
-sleep, time, wait
diff --git a/doc/SplitList.3 b/doc/SplitList.3
deleted file mode 100644
index e30771c..0000000
--- a/doc/SplitList.3
+++ /dev/null
@@ -1,191 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SplitList.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SplitList 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SplitList, Tcl_Merge, Tcl_ScanElement, Tcl_ConvertElement \- manipulate Tcl lists
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_SplitList\fR(\fIinterp, list, argcPtr, argvPtr\fR)
-.sp
-char *
-\fBTcl_Merge\fR(\fIargc, argv\fR)
-.sp
-int
-\fBTcl_ScanElement\fR(\fIsrc, flagsPtr\fR)
-.VS
-.sp
-int
-\fBTcl_ScanCountedElement\fR(\fIsrc, length, flagsPtr\fR)
-.VE
-.sp
-int
-\fBTcl_ConvertElement\fR(\fIsrc, dst, flags\fR)
-.VS
-.sp
-int
-\fBTcl_ConvertCountedElement\fR(\fIsrc, length, dst, flags\fR)
-.VE
-.SH ARGUMENTS
-.AS Tcl_Interp ***argvPtr
-.AP Tcl_Interp *interp out
-.VS
-Interpreter to use for error reporting.  If NULL, then no error message
-is left.
-.VE
-.AP char *list in
-Pointer to a string with proper list structure.
-.AP int *argcPtr out
-Filled in with number of elements in \fIlist\fR.
-.AP char ***argvPtr out
-\fI*argvPtr\fR will be filled in with the address of an array of
-pointers to the strings that are the extracted elements of \fIlist\fR.
-There will be \fI*argcPtr\fR valid entries in the array, followed by
-a NULL entry.
-.AP int argc in
-Number of elements in \fIargv\fR.
-.AP char **argv in
-Array of strings to merge together into a single list.
-Each string will become a separate element of the list.
-.AP char *src in
-String that is to become an element of a list.
-.AP int *flagsPtr in
-Pointer to word to fill in with information about \fIsrc\fR.
-The value of *\fIflagsPtr\fR must be passed to \fBTcl_ConvertElement\fR.
-.VS
-.AP int length in
-Number of bytes in string \fIsrc\fR.
-.VE
-.AP char *dst in
-Place to copy converted list element.  Must contain enough characters
-to hold converted string.
-.AP int flags in
-Information about \fIsrc\fR. Must be value returned by previous
-call to \fBTcl_ScanElement\fR, possibly OR-ed
-with \fBTCL_DONT_USE_BRACES\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures may be used to disassemble and reassemble Tcl lists.
-\fBTcl_SplitList\fR breaks a list up into its constituent elements,
-returning an array of pointers to the elements using
-\fIargcPtr\fR and \fIargvPtr\fR.
-While extracting the arguments, \fBTcl_SplitList\fR obeys the usual
-rules for backslash substitutions and braces.  The area of
-memory pointed to by \fI*argvPtr\fR is dynamically allocated;  in
-addition to the array of pointers, it
-also holds copies of all the list elements.  It is the caller's
-responsibility to free up all of this storage.
-For example, suppose that you have called \fBTcl_SplitList\fR with
-the following code:
-.CS
-int argc, code;
-char *string;
-char **argv;
-\&...
-code = Tcl_SplitList(interp, string, &argc, &argv);
-.CE
-Then you should eventually free the storage with a call like the
-following:
-.VS
-.CS
-Tcl_Free((char *) argv);
-.CE
-.VE
-.PP
-\fBTcl_SplitList\fR normally returns \fBTCL_OK\fR, which means the list was
-successfully parsed.
-If there was a syntax error in \fIlist\fR, then \fBTCL_ERROR\fR is returned
-and \fIinterp->result\fR will point to an error message describing the
-.VS
-problem (if \fIinterp\fR was not NULL).
-.VE
-If \fBTCL_ERROR\fR is returned then no memory is allocated and \fI*argvPtr\fR
-is not modified.
-.PP
-\fBTcl_Merge\fR is the inverse of \fBTcl_SplitList\fR:  it
-takes a collection of strings given by \fIargc\fR
-and \fIargv\fR and generates a result string
-that has proper list structure.
-This means that commands like \fBindex\fR may be used to
-extract the original elements again.
-In addition, if the result of \fBTcl_Merge\fR is passed to \fBTcl_Eval\fR,
-it will be parsed into \fIargc\fR words whose values will
-be the same as the \fIargv\fR strings passed to \fBTcl_Merge\fR.
-\fBTcl_Merge\fR will modify the list elements with braces and/or
-backslashes in order to produce proper Tcl list structure.
-.VS
-The result string is dynamically allocated
-using \fBTcl_Alloc\fR;  the caller must eventually release the space
-using \fBTcl_Free\fR.
-.VE
-.PP
-If the result of \fBTcl_Merge\fR is passed to \fBTcl_SplitList\fR,
-the elements returned by \fBTcl_SplitList\fR will be identical to
-those passed into \fBTcl_Merge\fR.
-However, the converse is not true:  if \fBTcl_SplitList\fR
-is passed a given string, and the resulting \fIargc\fR and
-\fIargv\fR are passed to \fBTcl_Merge\fR, the resulting string
-may not be the same as the original string passed to \fBTcl_SplitList\fR.
-This is because \fBTcl_Merge\fR may use backslashes and braces
-differently than the original string.
-.PP
-\fBTcl_ScanElement\fR and \fBTcl_ConvertElement\fR are the
-procedures that do all of the real work of \fBTcl_Merge\fR.
-\fBTcl_ScanElement\fR scans its \fIsrc\fR argument
-and determines how to use backslashes and braces
-when converting it to a list element.
-It returns an overestimate of the number of characters
-required to represent \fIsrc\fR as a list element, and
-it stores information in \fI*flagsPtr\fR that is needed
-by \fBTcl_ConvertElement\fR.
-.PP
-\fBTcl_ConvertElement\fR is a companion procedure to \fBTcl_ScanElement\fR.
-It does the actual work of converting a string to a list element.
-Its \fIflags\fR argument must be the same as the value returned
-by \fBTcl_ScanElement\fR.
-\fBTcl_ConvertElement\fR writes a proper list element to memory
-starting at *\fIdst\fR and returns a count of the total number
-of characters written, which will be no more than the result
-returned by \fBTcl_ScanElement\fR.
-\fBTcl_ConvertElement\fR writes out only the actual list element
-without any leading or trailing spaces: it is up to the caller to
-include spaces between adjacent list elements.
-.PP
-\fBTcl_ConvertElement\fR uses one of two different approaches to
-handle the special characters in \fIsrc\fR.  Wherever possible, it
-handles special characters by surrounding the string with braces.
-This produces clean-looking output, but can't be used in some situations,
-such as when \fIsrc\fR contains unmatched braces.
-In these situations, \fBTcl_ConvertElement\fR handles special
-characters by generating backslash sequences for them.
-The caller may insist on the second approach by OR-ing the
-flag value returned by \fBTcl_ScanElement\fR with
-\fBTCL_DONT_USE_BRACES\fR.
-Although this will produce an uglier result, it is useful in some
-special situations, such as when \fBTcl_ConvertElement\fR is being
-used to generate a portion of an argument for a Tcl command.
-In this case, surrounding \fIsrc\fR with curly braces would cause
-the command not to be parsed correctly.
-.PP
-.VS
-\fBTcl_ScanCountedElement\fR and \fBTcl_ConvertCountedElement\fR are
-the same as \fBTcl_ScanElement\fR and \fBTcl_ConvertElement\fR, except
-the length of string \fIsrc\fR is specified by the \fIlength\fR
-argument, and the string may contain embedded nulls.
-.VE
-
-.SH KEYWORDS
-backslash, convert, element, list, merge, split, strings
diff --git a/doc/SplitPath.3 b/doc/SplitPath.3
deleted file mode 100644
index b112b82..0000000
--- a/doc/SplitPath.3
+++ /dev/null
@@ -1,93 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: SplitPath.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_SplitPath 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_SplitPath, Tcl_JoinPath, Tcl_GetPathType \- manipulate platform-dependent file paths
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_SplitPath\fR(\fIpath, argcPtr, argvPtr\fR)
-.sp
-char *
-\fBTcl_JoinPath\fR(\fIargc, argv, resultPtr\fR)
-.sp
-Tcl_PathType
-\fBTcl_GetPathType\fR(\fIpath\fR)
-.SH ARGUMENTS
-.AS Tcl_DString ***argvPtr
-.AP char *path in
-File path in a form appropriate for the current platform (see the
-\fBfilename\fR manual entry for acceptable forms for path names).
-.AP int *argcPtr out
-Filled in with number of path elements in \fIpath\fR.
-.AP char ***argvPtr out
-\fI*argvPtr\fR will be filled in with the address of an array of
-pointers to the strings that are the extracted elements of \fIpath\fR.
-There will be \fI*argcPtr\fR valid entries in the array, followed by
-a NULL entry.
-.AP int argc in
-Number of elements in \fIargv\fR.
-.AP char **argv in
-Array of path elements to merge together into a single path.
-.AP Tcl_DString *resultPtr in/out
-A pointer to an initialized \fBTcl_DString\fR to which the result of
-\fBTcl_JoinPath\fR will be appended.
-.BE
-
-.SH DESCRIPTION
-.PP
-These procedures may be used to disassemble and reassemble file
-paths in a platform independent manner: they provide C-level access to
-the same functionality as the \fBfile split\fR, \fBfile join\fR, and
-\fBfile pathtype\fR commands.
-.PP
-\fBTcl_SplitPath\fR breaks a path into its constituent elements,
-returning an array of pointers to the elements using \fIargcPtr\fR and
-\fIargvPtr\fR.  The area of memory pointed to by \fI*argvPtr\fR is
-dynamically allocated; in addition to the array of pointers, it also
-holds copies of all the path elements.  It is the caller's
-responsibility to free all of this storage.
-For example, suppose that you have called \fBTcl_SplitPath\fR with the
-following code:
-.CS
-int argc;
-char *path;
-char **argv;
-\&...
-Tcl_SplitPath(string, &argc, &argv);
-.CE
-Then you should eventually free the storage with a call like the
-following:
-.CS
-Tcl_Free((char *) argv);
-.CE
-.PP
-\fBTcl_JoinPath\fR is the inverse of \fBTcl_SplitPath\fR: it takes a
-collection of path elements given by \fIargc\fR and \fIargv\fR and
-generates a result string that is a properly constructed path. The
-result string is appended to \fIresultPtr\fR.  \fIResultPtr\fR must
-refer to an initialized \fBTcl_DString\fR.
-.PP
-If the result of \fBTcl_SplitPath\fR is passed to \fBTcl_JoinPath\fR,
-the result will refer to the same location, but may not be in the same
-form.  This is because \fBTcl_SplitPath\fR and \fBTcl_JoinPath\fR
-eliminate duplicate path separators and return a normalized form for
-each platform.
-.PP
-\fBTcl_GetPathType\fR returns the type of the specified \fIpath\fR,
-where \fBTcl_PathType\fR is one of \fBTCL_PATH_ABSOLUTE\fR,
-\fBTCL_PATH_RELATIVE\fR, or \fBTCL_PATH_VOLUME_RELATIVE\fR.  See the
-\fBfilename\fR manual entry for a description of the path types for
-each platform.
-
-.SH KEYWORDS
-file, filename, join, path, split, type
diff --git a/doc/StaticPkg.3 b/doc/StaticPkg.3
deleted file mode 100644
index e268b5f..0000000
--- a/doc/StaticPkg.3
+++ /dev/null
@@ -1,70 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: StaticPkg.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_StaticPackage 3 7.5 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_StaticPackage \- make a statically linked package available via the \fBload\fR command
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_StaticPackage\fR(\fIinterp, pkgName, initProc, safeInitProc\fR)
-.SH ARGUMENTS
-.AS Tcl_PackageInitProc *safeInitProc
-.AP Tcl_Interp *interp in
-If not NULL, points to an interpreter into which the package has
-already been loaded (i.e., the caller has already invoked the
-appropriate initialization procedure).  NULL means the package
-hasn't yet been incorporated into any interpreter.
-.AP char *pkgName in
-Name of the package;  should be properly capitalized (first letter
-upper-case, all others lower-case).
-.AP Tcl_PackageInitProc *initProc in
-Procedure to invoke to incorporate this package into a trusted
-interpreter.
-.AP Tcl_PackageInitProc *safeInitProc in
-Procedure to call to incorporate this package into a safe interpreter
-(one that will execute untrusted scripts).   NULL means the package
-can't be used in safe interpreters.
-.BE
-
-.SH DESCRIPTION
-.PP
-This procedure may be invoked to announce that a package has been
-linked statically with a Tcl application and, optionally, that it
-has already been loaded into an interpreter.
-Once \fBTcl_StaticPackage\fR has been invoked for a package, it
-may be loaded into interpreters using the \fBload\fR command.
-\fBTcl_StaticPackage\fR is normally invoked only by the \fBTcl_AppInit\fR
-procedure for the application, not by packages for themselves
-(\fBTcl_StaticPackage\fR should only be invoked for statically
-loaded packages, and code in the package itself should not need
-to know whether the package is dynamically or statically loaded).
-.PP
-When the \fBload\fR command is used later to load the package into
-an interpreter, one of \fIinitProc\fR and \fIsafeInitProc\fR will
-be invoked, depending on whether the target interpreter is safe
-or not.
-\fIinitProc\fR and \fIsafeInitProc\fR must both match the
-following prototype:
-.CS
-typedef int Tcl_PackageInitProc(Tcl_Interp *\fIinterp\fR);
-.CE
-The \fIinterp\fR argument identifies the interpreter in which the
-package is to be loaded.  The initialization procedure must return
-\fBTCL_OK\fR or \fBTCL_ERROR\fR to indicate whether or not it completed
-successfully;  in the event of an error it should set \fIinterp->result\fR
-to point to an error message.
-The result or error from the initialization procedure will be returned
-as the result of the \fBload\fR command that caused the
-initialization procedure to be invoked.
-
-.SH KEYWORDS
-initialization procedure, package, static linking
diff --git a/doc/StrMatch.3 b/doc/StrMatch.3
deleted file mode 100644
index 09cd6df..0000000
--- a/doc/StrMatch.3
+++ /dev/null
@@ -1,39 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: StrMatch.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_StringMatch 3 "" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_StringMatch \- test whether a string matches a pattern
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_StringMatch\fR(\fIstring\fR, \fIpattern\fR)
-.SH ARGUMENTS
-.AP char *string in
-String to test.
-.AP char *pattern in
-Pattern to match against string.  May contain special
-characters from the set *?\e[].
-.BE
-
-.SH DESCRIPTION
-.PP
-This utility procedure determines whether a string matches
-a given pattern.  If it does, then \fBTcl_StringMatch\fR returns
-1.  Otherwise \fBTcl_StringMatch\fR returns 0.  The algorithm
-used for matching is the same algorithm used in the ``string match''
-Tcl command and is similar to the algorithm used by the C-shell
-for file name matching;  see the Tcl manual entry for details.
-
-.SH KEYWORDS
-match, pattern, string
diff --git a/doc/StringObj.3 b/doc/StringObj.3
deleted file mode 100644
index 46fe959..0000000
--- a/doc/StringObj.3
+++ /dev/null
@@ -1,161 +0,0 @@
-'\"
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: StringObj.3,v 1.4 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_StringObj 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_NewStringObj, Tcl_SetStringObj, Tcl_GetStringFromObj, Tcl_GetString, Tcl_AppendToObj, Tcl_AppendStringsToObj, Tcl_AppendStringsToObjVA, Tcl_AppendObjToObj, Tcl_SetObjLength, Tcl_ConcatObj \- manipulate Tcl objects as strings
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_Obj *
-\fBTcl_NewStringObj\fR(\fIbytes, length\fR)
-.sp
-\fBTcl_SetStringObj\fR(\fIobjPtr, bytes, length\fR)
-.sp
-char *
-\fBTcl_GetStringFromObj\fR(\fIobjPtr, lengthPtr\fR)
-.sp
-char *
-\fBTcl_GetString\fR(\fIobjPtr\fR)
-.sp
-\fBTcl_AppendToObj\fR(\fIobjPtr, bytes, length\fR)
-.VS
-.sp
-\fBTcl_AppendObjToObj\fR(\fIobjPtr, appendObjPtr\fR)
-.VE
-.sp
-\fBTcl_AppendStringsToObj\fR(\fIobjPtr, string, string, ... \fB(char *) NULL\fR)
-.sp
-\fBTcl_AppendStringsToObjVA\fR(\fIobjPtr, argList\fR)
-.sp
-\fBTcl_SetObjLength\fR(\fIobjPtr, newLength\fR)
-.sp
-Tcl_Obj *
-\fBTcl_ConcatObj\fR(\fIobjc, objv\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp *appendObjPtr in/out
-.AP char *bytes in
-Points to the first byte of an array of bytes
-used to set or append to a string object.
-This byte array may contain embedded null bytes
-unless \fIlength\fR is negative.
-.AP int length in
-The number of bytes to copy from \fIbytes\fR when
-initializing, setting, or appending to a string object.
-If negative, all bytes up to the first null are used.
-.AP Tcl_Obj *objPtr in/out
-Points to an object to manipulate.
-.VS
-.AP Tcl_Obj *appendObjPtr in
-The object to append to \fIobjPtr\fR in \fBTcl_AppendObjToObj\fR.
-.VE
-.AP int *lengthPtr out
-If non-NULL, the location where \fBTcl_GetStringFromObj\fR will store
-the the length of an object's string representation.
-.AP char *string in
-Null-terminated string value to append to \fIobjPtr\fR.
-.AP va_list argList in
-An argument list which must have been initialised using
-\fBTCL_VARARGS_START\fR, and cleared using \fBva_end\fR.
-.AP int newLength in
-New length for the string value of \fIobjPtr\fR, not including the
-final NULL character.
-.AP int objc in
-The number of elements to concatenate.
-.AP Tcl_Obj *objv[] in
-The array of objects to concatenate.
-.BE
-
-.SH DESCRIPTION
-.PP
-The procedures described in this manual entry allow Tcl objects to
-be manipulated as string values.  They use the internal representation
-of the object to store additional information to make the string
-manipulations more efficient.  In particular, they make a series of
-append operations efficient by allocating extra storage space for the
-string so that it doesn't have to be copied for each append.
-.PP
-\fBTcl_NewStringObj\fR and \fBTcl_SetStringObj\fR create a new object
-or modify an existing object to hold a copy of
-the string given by \fIbytes\fR and \fIlength\fR.
-\fBTcl_NewStringObj\fR returns a pointer to a newly created object
-with reference count zero.
-Both procedures set the object to hold a copy of the specified string.
-\fBTcl_SetStringObj\fR frees any old string representation
-as well as any old internal representation of the object.
-.PP
-\fBTcl_GetStringFromObj\fR and \fBTcl_GetString\fR
-return an object's string representation.
-This is given by the returned byte pointer
-and (for \fBTcl_GetStringFromObj\fR) length,
-which is stored in \fIlengthPtr\fR if it is non-NULL.
-If the object's string representation is invalid
-(its byte pointer is NULL),
-the string representation is regenerated from the
-object's internal representation.
-The storage referenced by the returned byte pointer
-is owned by the object manager and should not be modified by the caller.
-The procedure \fBTcl_GetString\fR is used in the common case
-where the caller does not need the length of the string representation.
-.PP
-\fBTcl_AppendToObj\fR appends the data given by \fIbytes\fR and
-\fIlength\fR to the object specified by \fIobjPtr\fR.  It does this
-in a way that handles repeated calls relatively efficiently (it
-overallocates the string space to avoid repeated reallocations
-and copies of object's string value).
-.VS
-.PP
-\fBTcl_AppendObjToObj\fR is similar to \fBTcl_AppendToObj\fR, but it
-appends the string value of \fIappendObjPtr\fR to \fIobjPtr\fR.
-.VE
-.PP
-\fBTcl_AppendStringsToObj\fR is similar to \fBTcl_AppendToObj\fR
-except that it can be passed more than one value to append and
-each value must be a null-terminated string (i.e. none of the
-values may contain internal null characters).  Any number of
-\fIstring\fR arguments may be provided, but the last argument
-must be a NULL pointer to indicate the end of the list.
-.PP
-\fBTcl_AppendStringsToObjVA\fR is the same as \fBTcl_AppendStringsToObj\fR
-except that instead of taking a variable number of arguments it takes an
-argument list.
-.PP
-The \fBTcl_SetObjLength\fR procedure changes the length of the
-string value of its \fIobjPtr\fR argument.  If the \fInewLength\fR
-argument is greater than the space allocated for the object's
-string, then the string space is reallocated and the old value
-is copied to the new space; the bytes between the old length of
-the string and the new length may have arbitrary values.
-If the \fInewLength\fR argument is less than the current length
-of the object's string, with \fIobjPtr->length\fR is reduced without
-reallocating the string space; the original allocated size for the
-string is recorded in the object, so that the string length can be
-enlarged in a subsequent call to \fBTcl_SetObjLength\fR without
-reallocating storage.  In all cases \fBTcl_SetObjLength\fR leaves
-a null character at \fIobjPtr->bytes[newLength]\fR.
-.PP
-The \fBTcl_ConcatObj\fR function returns a new string object whose
-value is the space-separated concatenation of the string
-representations of all of the objects in the \fIobjv\fR
-array. \fBTcl_ConcatObj\fR eliminates leading and trailing white space
-as it copies the string representations of the \fIobjv\fR array to the
-result. If an element of the \fIobjv\fR array consists of nothing but
-white space, then that object is ignored entirely. This white-space
-removal was added to make the output of the \fBconcat\fR command
-cleaner-looking. \fBTcl_ConcatObj\fR returns a pointer to a
-newly-created object whose ref count is zero.
-
-.SH "SEE ALSO"
-Tcl_NewObj, Tcl_IncrRefCount, Tcl_DecrRefCount
-
-.SH KEYWORDS
-append, internal representation, object, object type, string object,
-string type, string representation, concat, concatenate
diff --git a/doc/Tcl.n b/doc/Tcl.n
deleted file mode 100644
index 6bd8511..0000000
--- a/doc/Tcl.n
+++ /dev/null
@@ -1,195 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Tcl.n,v 1.3 1999/04/16 00:46:33 stanton Exp $
-'\"
-.so man.macros
-.TH Tcl n "8.1" Tcl "Tcl Built-In Commands"
-.BS
-.SH NAME
-Tcl \- Summary of Tcl language syntax.
-.BE
-
-.SH DESCRIPTION
-.PP
-The following rules define the syntax and semantics of the Tcl language:
-.IP [1]
-A Tcl script is a string containing one or more commands.
-Semi-colons and newlines are command separators unless quoted as
-described below.
-Close brackets are command terminators during command substitution
-(see below) unless quoted.
-.IP [2]
-A command is evaluated in two steps.
-First, the Tcl interpreter breaks the command into \fIwords\fR
-and performs substitutions as described below.
-These substitutions are performed in the same way for all
-commands.
-The first word is used to locate a command procedure to
-carry out the command, then all of the words of the command are
-passed to the command procedure.
-The command procedure is free to interpret each of its words
-in any way it likes, such as an integer, variable name, list,
-or Tcl script.
-Different commands interpret their words differently.
-.IP [3]
-Words of a command are separated by white space (except for
-newlines, which are command separators).
-.IP [4]
-If the first character of a word is double-quote (``"'') then
-the word is terminated by the next double-quote character.
-If semi-colons, close brackets, or white space characters
-(including newlines) appear between the quotes then they are treated
-as ordinary characters and included in the word.
-Command substitution, variable substitution, and backslash substitution
-are performed on the characters between the quotes as described below.
-The double-quotes are not retained as part of the word.
-.IP [5]
-If the first character of a word is an open brace (``{'') then
-the word is terminated by the matching close brace (``}'').
-Braces nest within the word: for each additional open
-brace there must be an additional close brace (however,
-if an open brace or close brace within the word is
-quoted with a backslash then it is not counted in locating the
-matching close brace).
-No substitutions are performed on the characters between the
-braces except for backslash-newline substitutions described
-below, nor do semi-colons, newlines, close brackets,
-or white space receive any special interpretation.
-The word will consist of exactly the characters between the
-outer braces, not including the braces themselves.
-.IP [6]
-If a word contains an open bracket (``['') then Tcl performs
-\fIcommand substitution\fR.
-To do this it invokes the Tcl interpreter recursively to process
-the characters following the open bracket as a Tcl script.
-The script may contain any number of commands and must be terminated
-by a close bracket (``]'').
-The result of the script (i.e. the result of its last command) is
-substituted into the word in place of the brackets and all of the
-characters between them.
-There may be any number of command substitutions in a single word.
-Command substitution is not performed on words enclosed in braces.
-.IP [7]
-If a word contains a dollar-sign (``$'') then Tcl performs \fIvariable
-substitution\fR:  the dollar-sign and the following characters are
-replaced in the word by the value of a variable.
-Variable substitution may take any of the following forms:
-.RS
-.TP 15
-\fB$\fIname\fR
-\fIName\fR is the name of a scalar variable;  the name is terminated
-by any character that isn't a letter, digit, or underscore.
-.TP 15
-\fB$\fIname\fB(\fIindex\fB)\fR
-\fIName\fR gives the name of an array variable and \fIindex\fR gives
-the name of an element within that array.
-\fIName\fR must contain only letters, digits, and underscores.
-Command substitutions, variable substitutions, and backslash
-substitutions are performed on the characters of \fIindex\fR.
-.TP 15
-\fB${\fIname\fB}\fR
-\fIName\fR is the name of a scalar variable.  It may contain any
-characters whatsoever except for close braces.
-.LP
-There may be any number of variable substitutions in a single word.
-Variable substitution is not performed on words enclosed in braces.
-.RE
-.IP [8]
-If a backslash (``\e'') appears within a word then
-\fIbackslash substitution\fR occurs.
-In all cases but those described below the backslash is dropped and
-the following character is treated as an ordinary
-character and included in the word.
-This allows characters such as double quotes, close brackets,
-and dollar signs to be included in words without triggering
-special processing.
-The following table lists the backslash sequences that are
-handled specially, along with the value that replaces each sequence.
-.RS
-.TP 7
-\e\fBa\fR
-Audible alert (bell) (0x7).
-.TP 7
-\e\fBb\fR
-Backspace (0x8).
-.TP 7
-\e\fBf\fR
-Form feed (0xc).
-.TP 7
-\e\fBn\fR
-Newline (0xa).
-.TP 7
-\e\fBr\fR
-Carriage-return (0xd).
-.TP 7
-\e\fBt\fR
-Tab (0x9).
-.TP 7
-\e\fBv\fR
-Vertical tab (0xb).
-.TP 7
-\e\fB<newline>\fIwhiteSpace\fR
-.
-A single space character replaces the backslash, newline, and all spaces
-and tabs after the newline.  This backslash sequence is unique in that it
-is replaced in a separate pre-pass before the command is actually parsed.
-This means that it will be replaced even when it occurs between braces,
-and the resulting space will be treated as a word separator if it isn't
-in braces or quotes.
-.TP 7
-\e\e
-Backslash (``\e'').
-.VS 8.1 br
-.TP 7
-\e\fIooo\fR 
-.
-The digits \fIooo\fR (one, two, or three of them) give an eight-bit octal 
-value for the Unicode character that will be inserted.  The upper bits of the
-Unicode character will be 0.
-.TP 7
-\e\fBx\fIhh\fR 
-.
-The hexadecimal digits \fIhh\fR give an eight-bit hexadecimal value for the
-Unicode character that will be inserted.  Any number of hexadecimal digits
-may be present; however, all but the last two are ignored (the result is
-always a one-byte quantity).  The upper bits of the Unicode character will
-be 0.
-.TP 7
-\e\fBu\fIhhhh\fR 
-.
-The hexadecimal digits \fIhhhh\fR (one, two, three, or four of them) give a
-sixteen-bit hexadecimal value for the Unicode character that will be
-inserted.
-.VE
-.LP
-Backslash substitution is not performed on words enclosed in braces,
-except for backslash-newline as described above.
-.RE
-.IP [9]
-If a hash character (``#'') appears at a point where Tcl is
-expecting the first character of the first word of a command,
-then the hash character and the characters that follow it, up
-through the next newline, are treated as a comment and ignored.
-The comment character only has significance when it appears
-at the beginning of a command.
-.IP [10]
-Each character is processed exactly once by the Tcl interpreter
-as part of creating the words of a command.
-For example, if variable substitution occurs then no further
-substitutions are performed on the value of the variable;  the
-value is inserted into the word verbatim.
-If command substitution occurs then the nested command is
-processed entirely by the recursive call to the Tcl interpreter;
-no substitutions are performed before making the recursive
-call and no additional substitutions are performed on the result
-of the nested script.
-.IP [11]
-Substitutions do not affect the word boundaries of a command.
-For example, during variable substitution the entire value of
-the variable becomes part of a single word, even if the variable's
-value contains spaces.
diff --git a/doc/Tcl_Main.3 b/doc/Tcl_Main.3
deleted file mode 100644
index 0979994..0000000
--- a/doc/Tcl_Main.3
+++ /dev/null
@@ -1,61 +0,0 @@
-'\"
-'\" Copyright (c) 1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Tcl_Main.3,v 1.2 1998/09/14 18:39:50 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_Main 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_Main \- main program for Tcl-based applications
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_Main\fR(\fIargc, argv, appInitProc\fR)
-.SH ARGUMENTS
-.AS Tcl_AppInitProc *appInitProc
-.AP int argc in
-Number of elements in \fIargv\fR.
-.AP char *argv[] in
-Array of strings containing command-line arguments.
-.AP Tcl_AppInitProc *appInitProc in
-Address of an application-specific initialization procedure.
-The value for this argument is usually \fBTcl_AppInit\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_Main\fR acts as the main program for most Tcl-based applications.
-Starting with Tcl 7.4 it is not called \fBmain\fR anymore because it 
-is part of the Tcl library and having a function \fBmain\fR
-in a library (particularly a shared library) causes problems on many
-systems.
-Having \fBmain\fR in the Tcl library would also make it hard to use
-Tcl in C++ programs, since C++ programs must have special C++
-\fBmain\fR functions.
-.PP
-Normally each application contains a small \fBmain\fR function that does
-nothing but invoke \fBTcl_Main\fR.
-\fBTcl_Main\fR then does all the work of creating and running a
-\fBtclsh\fR-like application.
-.PP
-When it is has finished its own initialization, but before
-it processes commands, \fBTcl_Main\fR calls the procedure given by
-the \fIappInitProc\fR argument.  This procedure provides a ``hook''
-for the application to perform its own initialization, such as defining
-application-specific commands.  The procedure must have an interface
-that matches the type \fBTcl_AppInitProc\fR:
-.CS
-typedef int Tcl_AppInitProc(Tcl_Interp *\fIinterp\fR);
-.CE
-\fIAppInitProc\fR is almost always a pointer to \fBTcl_AppInit\fR;
-for more details on this procedure, see the documentation
-for \fBTcl_AppInit\fR.
-
-.SH KEYWORDS
-application-specific initialization, command-line arguments, main program
diff --git a/doc/Thread.3 b/doc/Thread.3
deleted file mode 100644
index 595fac3..0000000
--- a/doc/Thread.3
+++ /dev/null
@@ -1,100 +0,0 @@
-'\"
-'\" Copyright (c) 1998 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Thread.3,v 1.2 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_ConditionNotify 3 "8.1" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_ConditionNotify, Tcl_ConditionWait, Tcl_GetThreadData, Tcl_MutexLock, Tcl_MutexUnlock \- thread synchronization support.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-void
-\fBTcl_ConditionNotify\fR(\fIcondPtr\fR)
-.sp
-void
-\fBTcl_ConditionWait\fR(\fIcondPtr, mutexPtr, timePtr\fR)
-.sp
-VOID *
-\fBTcl_GetThreadData\fR(\fIkeyPtr, size\fR)
-.sp
-void
-\fBTcl_MutexLock\fR(\fImutexPtr\fR)
-.sp
-void
-\fBTcl_MutexUnlock\fR(\fImutexPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_ThreadDataKey *keyPtr
-.AP Tcl_Condition *condPtr in
-A condition variable, which must be associated with a mutex lock.
-.AP Tcl_Condition *mutexPtr in
-A mutex lock.
-.AP Tcl_Time *timePtr in
-A time limit on the condition wait.  NULL to wait forever.
-Note that a polling value of 0 seconds doesn't make much sense.
-.AP Tcl_ThreadDataKey *keyPtr in
-This identifies a block of thread local storage.  The key should be
-static and process-wide, yet each thread will end up associating
-a different block of storage with this key.
-.AP int *size in
-The size of the thread local storage block.  This amount of data
-is allocated and initialized to zero the first time each thread
-calls \fBTcl_GetThreadData\fR.
-.BE
-
-.SH DESCRIPTION
-.PP
-A mutex is a lock that is used to serialize all threads through a piece
-of code by calling \fBTcl_MutexLock\fR and \fBTcl_MutexUnlock\fR.
-If one thread holds a mutex, any other thread calling \fBTcl_MutexLock\fR will
-block until \fBTcl_MutexUnlock\fR is called.
-.VS
-The result of locking a mutex twice from the same thread is undefined.
-On some platforms it will result in a deadlock.
-.VE
-\fBTcl_MutexLock\fR and \fBTcl_MutexUnlock\fR
-procedures are defined as empty macros if not compiling with threads enabled.
-.PP
-A condition variable is used as a signaling mechanism:
-a thread can lock a mutex and then wait on a condition variable
-with \fBTcl_ConditionWait\fR.  This atomically releases the mutex lock
-and blocks the waiting thread until another thread calls
-\fBTcl_ConditionNotify\fR.  The caller of \fBTcl_ConditionNotify\fR should
-have the associated mutex held by previously calling \fBTcl_MutexLock\fR,
-but this is not enforced.  Notifying the
-condition variable unblocks all threads waiting on the condition variable,
-but they do not proceed until the mutex is released with \fBTcl_MutexUnlock\fR.
-The implementation of \fBTcl_ConditionWait\fR automatically locks
-the mutex before returning.
-.PP
-The caller of \fBTcl_ConditionWait\fR should be prepared for spurious
-notifications by calling \fBTcl_ConditionWait\fR within a while loop
-that tests some invariant.
-.PP
-The \fBTcl_GetThreadData\fR call returns a pointer to a block of
-thread-private data.  Its argument is a key that is shared by all threads
-and a size for the block of storage.  The storage is automatically 
-allocated and initialized to all zeros the first time each thread asks for it.
-The storage is automatically deallocated by \fBTcl_FinalizeThread\fR
-.SH INITIALIZATION
-.PP
-.PP
-All of these synchronization objects are self initializing.
-They are implemented as opaque pointers that should be NULL
-upon first use.
-The mutexes and condition variables are
-cleaned up by process exit handlers.  Thread local storage is
-reclaimed during \fBTcl_FinalizeThread\fR.
-.SH CREATING THREADS
-The API to create threads is not finalized at this time.
-There are private facilities to create threads that contain a new
-Tcl interpreter, and to send scripts among threads.
-Dive into tclThreadTest.c and tclThread.c for examples.
-.SH KEYWORDS
-thread, mutex, condition variable, thread local storage
diff --git a/doc/ToUpper.3 b/doc/ToUpper.3
deleted file mode 100644
index 639dd61..0000000
--- a/doc/ToUpper.3
+++ /dev/null
@@ -1,90 +0,0 @@
-'\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: ToUpper.3,v 1.2 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_UtfToUpper 3 "8.1" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_UniCharToUpper, Tcl_UniCharToLower, Tcl_UniCharToTitle, Tcl_UtfToUpper, Tcl_UtfToLower, Tcl_UtfToTitle \- routines for manipulating the case of Unicode characters and UTF-8 strings.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-Tcl_UniChar
-\fBTcl_UniCharToUpper\fR(\fIch\fR)
-.sp
-Tcl_UniChar
-\fBTcl_UniCharToLower\fR(\fIch\fR)
-.sp
-Tcl_UniChar
-\fBTcl_UniCharToTitle\fR(\fIch\fR)
-.sp
-int
-\fBTcl_UtfToUpper\fR(\fIstr\fR)
-.sp
-int
-\fBTcl_UtfToLower\fR(\fIstr\fR)
-.sp
-int
-\fBTcl_UtfToTitle\fR(\fIstr\fR)
-.SH ARGUMENTS
-.AS char *str in/out
-.AP int ch in
-The Tcl_UniChar to be converted.
-.AP char *str in/out
-Pointer to UTF-8 string to be converted in place.
-.BE
-
-.SH DESCRIPTION
-.PP
-The first three routines convert the case of individual Unicode characters:
-.PP
-If \fIch\fR represents a lower-case character,
-\fBTcl_UniCharToUpper\fR returns the corresponding upper-case
-character.  If no upper-case character is defined, it returns the
-character unchanged.
-.PP
-If \fIch\fR represents an upper-case character,
-\fBTcl_UniCharToLower\fR returns the corresponding lower-case
-character.  If no lower-case character is defined, it returns the
-character unchanged.
-.PP
-If \fIch\fR represents a lower-case character,
-\fBTcl_UniCharToTitle\fR returns the corresponding title-case
-character.  If no title-case character is defined, it returns the
-corresponding upper-case character.  If no upper-case character is
-defined, it returns the character unchanged.  Title-case is defined
-for a small number of characters that have a different appearance when
-they are at the beginning of a capitalized word.
-.PP
-The next three routines convert the case of UTF-8 strings in place in
-memory:
-.PP
-\fBTcl_UtfToUpper\fR changes every UTF-8 character in \fIstr\fR to
-upper-case.  Because changing the case of a character may change its
-size, the byte offset of each character in the resulting string may
-differ from its original location.  \fBTcl_UtfToUpper\fR writes a null
-byte at the end of the converted string.  \fBTcl_UtfToUpper\fR returns
-the new length of the string in bytes.  This new length is guaranteed
-to be no longer than the original string length.
-.PP
-\fBTcl_UtfToLower\fR is the same as \fBTcl_UtfToUpper\fR except it
-turns each character in the string into its lower-case equivalent.
-.PP
-\fBTcl_UtfToTitle\fR is the same as \fBTcl_UtfToUpper\fR except it
-turns the first character in the string into its title-case equivalent
-and all following characters into their lower-case equivalents.
-
-.SH BUGS
-.PP
-At this time, the case conversions are only defined for the ISO8859-1
-characters.  Unicode characters above 0x00ff are not modified by these
-routines.
-
-.SH KEYWORDS
-utf, unicode, toupper, tolower, totitle, case
diff --git a/doc/TraceVar.3 b/doc/TraceVar.3
deleted file mode 100644
index 57a3350..0000000
--- a/doc/TraceVar.3
+++ /dev/null
@@ -1,366 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: TraceVar.3,v 1.3 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_TraceVar 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_TraceVar, Tcl_TraceVar2, Tcl_UntraceVar, Tcl_UntraceVar2, Tcl_VarTraceInfo, Tcl_VarTraceInfo2 \- monitor accesses to a variable
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_TraceVar(\fIinterp, varName, flags, proc, clientData\fB)\fR
-.sp
-int
-\fBTcl_TraceVar2(\fIinterp, name1, name2, flags, proc, clientData\fB)\fR
-.sp
-\fBTcl_UntraceVar(\fIinterp, varName, flags, proc, clientData\fB)\fR
-.sp
-\fBTcl_UntraceVar2(\fIinterp, name1, name2, flags, proc, clientData\fB)\fR
-.sp
-ClientData
-\fBTcl_VarTraceInfo(\fIinterp, varName, flags, proc, prevClientData\fB)\fR
-.sp
-ClientData
-\fBTcl_VarTraceInfo2(\fIinterp, name1, name2, flags, proc, prevClientData\fB)\fR
-.SH ARGUMENTS
-.AS Tcl_VarTraceProc prevClientData
-.AP Tcl_Interp *interp in
-Interpreter containing variable.
-.AP char *varName in
-Name of variable.  May refer to a scalar variable, to
-an array variable with no index, or to an array variable
-with a parenthesized index.
-If the name references an element of an array, then it
-must be in writable memory:  Tcl will make temporary modifications 
-to it while looking up the name.
-.AP int flags in
-OR-ed combination of the values TCL_TRACE_READS, TCL_TRACE_WRITES, and
-TCL_TRACE_UNSETS, TCL_TRACE_ARRAY, and TCL_GLOBAL_ONLY.  
-Not all flags are used by all
-procedures.  See below for more information.
-.AP Tcl_VarTraceProc *proc in
-Procedure to invoke whenever one of the traced operations occurs.
-.AP ClientData clientData in
-Arbitrary one-word value to pass to \fIproc\fR.
-.AP char *name1 in
-Name of scalar or array variable (without array index).
-.AP char *name2 in
-For a trace on an element of an array, gives the index of the
-element.  For traces on scalar variables or on whole arrays,
-is NULL.
-.AP ClientData prevClientData in
-If non-NULL, gives last value returned by \fBTcl_VarTraceInfo\fR or
-\fBTcl_VarTraceInfo2\fR, so this call will return information about
-next trace.  If NULL, this call will return information about first
-trace.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_TraceVar\fR allows a C procedure to monitor and control
-access to a Tcl variable, so that the C procedure is invoked
-whenever the variable is read or written or unset.
-If the trace is created successfully then \fBTcl_TraceVar\fR returns
-TCL_OK.  If an error occurred (e.g. \fIvarName\fR specifies an element
-of an array, but the actual variable isn't an array) then TCL_ERROR
-is returned and an error message is left in \fIinterp->result\fR.
-.PP
-The \fIflags\fR argument to \fBTcl_TraceVar\fR indicates when the
-trace procedure is to be invoked and provides information
-for setting up the trace.  It consists of an OR-ed combination
-of any of the following values:
-.TP
-\fBTCL_GLOBAL_ONLY\fR
-Normally, the variable will be looked up at the current level of
-procedure call;  if this bit is set then the variable will be looked
-up at global level, ignoring any active procedures.
-.TP
-\fBTCL_TRACE_READS\fR
-Invoke \fIproc\fR whenever an attempt is made to read the variable.
-.TP
-\fBTCL_TRACE_WRITES\fR
-Invoke \fIproc\fR whenever an attempt is made to modify the variable.
-.TP
-\fBTCL_TRACE_UNSETS\fR
-Invoke \fIproc\fR whenever the variable is unset.
-A variable may be unset either explicitly by an \fBunset\fR command,
-or implicitly when a procedure returns (its local variables are
-automatically unset) or when the interpreter is deleted (all
-variables are automatically unset).
-.TP
-\fBTCL_TRACE_ARRAY\fR
-Invoke \fIproc\fR whenever the array command is invoked.
-This gives the trace procedure a chance to update the array before
-array names or array get is called.  Note that this is called
-before an array set, but that will trigger write traces.
-.PP
-Whenever one of the specified operations occurs on the variable,
-\fIproc\fR will be invoked.
-It should have arguments and result that match the type
-\fBTcl_VarTraceProc\fR:
-.CS
-typedef char *Tcl_VarTraceProc(
-	ClientData \fIclientData\fR,
-	Tcl_Interp *\fIinterp\fR,
-	char *\fIname1\fR,
-	char *\fIname2\fR,
-	int \fIflags\fR);
-.CE
-The \fIclientData\fR and \fIinterp\fR parameters will
-have the same values as those passed to \fBTcl_TraceVar\fR when the
-trace was created.
-\fIClientData\fR typically points to an application-specific
-data structure that describes what to do when \fIproc\fR
-is invoked.
-\fIName1\fR and \fIname2\fR give the name of the traced variable
-in the normal two-part form (see the description of \fBTcl_TraceVar2\fR
-below for details).
-\fIFlags\fR is an OR-ed combination of bits providing several
-pieces of information.
-One of the bits TCL_TRACE_READS, TCL_TRACE_WRITES, TCL_TRACE_ARRAY,
-or TCL_TRACE_UNSETS
-will be set in \fIflags\fR to indicate which operation is being performed
-on the variable.
-The bit TCL_GLOBAL_ONLY will be set whenever the variable being
-accessed is a global one not accessible from the current level of
-procedure call:  the trace procedure will need to pass this flag
-back to variable-related procedures like \fBTcl_GetVar\fR if it
-attempts to access the variable.
-The bit TCL_TRACE_DESTROYED will be set in \fIflags\fR if the trace is
-about to be destroyed;  this information may be useful to \fIproc\fR
-so that it can clean up its own internal data structures (see
-the section TCL_TRACE_DESTROYED below for more details).
-Lastly, the bit TCL_INTERP_DESTROYED will be set if the entire
-interpreter is being destroyed.
-When this bit is set, \fIproc\fR must be especially careful in
-the things it does (see the section TCL_INTERP_DESTROYED below).
-The trace procedure's return value should normally be NULL;  see
-ERROR RETURNS below for information on other possibilities.
-.PP
-\fBTcl_UntraceVar\fR may be used to remove a trace.
-If the variable specified by \fIinterp\fR, \fIvarName\fR, and \fIflags\fR
-has a trace set with \fIflags\fR, \fIproc\fR, and
-\fIclientData\fR, then the corresponding trace is removed.
-If no such trace exists, then the call to \fBTcl_UntraceVar\fR
-has no effect.
-The same bits are valid for \fIflags\fR as for calls to \fBTcl_TraceVar\fR.
-.PP
-\fBTcl_VarTraceInfo\fR may be used to retrieve information about
-traces set on a given variable.
-The return value from \fBTcl_VarTraceInfo\fR is the \fIclientData\fR
-associated with a particular trace.
-The trace must be on the variable specified by the \fIinterp\fR,
-\fIvarName\fR, and \fIflags\fR arguments (only the TCL_GLOBAL_ONLY
-bit from \fIflags\fR is used;  other bits are ignored) and its trace procedure
-must the same as the \fIproc\fR argument.
-If the \fIprevClientData\fR argument is NULL then the return
-value corresponds to the first (most recently created) matching
-trace, or NULL if there are no matching traces.
-If the \fIprevClientData\fR argument isn't NULL, then it should
-be the return value from a previous call to \fBTcl_VarTraceInfo\fR.
-In this case, the new return value will correspond to the next
-matching trace after the one whose \fIclientData\fR matches
-\fIprevClientData\fR, or NULL if no trace matches \fIprevClientData\fR
-or if there are no more matching traces after it.
-This mechanism makes it possible to step through all of the
-traces for a given variable that have the same \fIproc\fR.
-
-.SH "TWO-PART NAMES"
-.PP
-The procedures \fBTcl_TraceVar2\fR, \fBTcl_UntraceVar2\fR, and
-\fBTcl_VarTraceInfo2\fR are identical to \fBTcl_TraceVar\fR,
-\fBTcl_UntraceVar\fR, and \fBTcl_VarTraceInfo\fR, respectively,
-except that the name of the variable consists of two parts.
-\fIName1\fR gives the name of a scalar variable or array,
-and \fIname2\fR gives the name of an element within an array.
-.VS 8.1
-When \fIname2\fR is NULL, 
-\fIname1\fR may contain both an array and an element name:
-if the name contains an open parenthesis and ends with a
-close parenthesis, then the value between the parentheses is
-treated as an element name (which can have any string value) and
-the characters before the first open
-parenthesis are treated as the name of an array variable.
-If \fIname2\fR is NULL and \fIname1\fR does not refer
-to an array element 
-.VE
-it means that either the variable is
-a scalar or the trace is to be set on the entire array rather
-than an individual element (see WHOLE-ARRAY TRACES below for
-more information). 
-
-
-.SH "ACCESSING VARIABLES DURING TRACES"
-.PP
-During read, write, and array traces, the
-trace procedure can read, write, or unset the traced
-variable using \fBTcl_GetVar2\fR, \fBTcl_SetVar2\fR, and
-other procedures.
-While \fIproc\fR is executing, traces are temporarily disabled
-for the variable, so that calls to \fBTcl_GetVar2\fR and
-\fBTcl_SetVar2\fR will not cause \fIproc\fR or other trace procedures
-to be invoked again.
-Disabling only occurs for the variable whose trace procedure
-is active;  accesses to other variables will still be traced.
-However, if a variable is unset during a read or write trace then unset
-traces will be invoked.
-.PP
-During unset traces the variable has already been completely
-expunged.
-It is possible for the trace procedure to read or write the
-variable, but this will be a new version of the variable.
-Traces are not disabled during unset traces as they are for
-read and write traces, but existing traces have been removed
-from the variable before any trace procedures are invoked.
-If new traces are set by unset trace procedures, these traces
-will be invoked on accesses to the variable by the trace
-procedures.
-
-.SH "CALLBACK TIMING"
-.PP
-When read tracing has been specified for a variable, the trace
-procedure will be invoked whenever the variable's value is
-read.  This includes \fBset\fR Tcl commands, \fB$\fR-notation
-in Tcl commands, and invocations of the \fBTcl_GetVar\fR
-and \fBTcl_GetVar2\fR procedures.
-\fIProc\fR is invoked just before the variable's value is
-returned.
-It may modify the value of the variable to affect what
-is returned by the traced access.
-If it unsets the variable then the access will return an error
-just as if the variable never existed.
-.PP
-When write tracing has been specified for a variable, the
-trace procedure will be invoked whenever the variable's value
-is modified.  This includes \fBset\fR commands,
-commands that modify variables as side effects (such as
-\fBcatch\fR and \fBscan\fR), and calls to the \fBTcl_SetVar\fR
-and \fBTcl_SetVar2\fR procedures).
-\fIProc\fR will be invoked after the variable's value has been
-modified, but before the new value of the variable has been
-returned.
-It may modify the value of the variable to override the change
-and to determine the value actually returned by the traced
-access.
-If it deletes the variable then the traced access will return
-an empty string.
-.PP
-When array tracing has been specified, the trace procedure
-will be invoked at the beginning of the array command implementation,
-before any of the operations like get, set, or names have been invoked.
-The trace procedure can modify the array elements with \fBTcl_SetVar\fR
-and \fBTcl_SetVar2\fR.
-.PP
-When unset tracing has been specified, the trace procedure
-will be invoked whenever the variable is destroyed.
-The traces will be called after the variable has been
-completely unset.
-
-.SH "WHOLE-ARRAY TRACES"
-.PP
-If a call to \fBTcl_TraceVar\fR or \fBTcl_TraceVar2\fR specifies
-the name of an array variable without an index into the array,
-then the trace will be set on the array as a whole.
-This means that \fIproc\fR will be invoked whenever any
-element of the array is accessed in the ways specified by
-\fIflags\fR.
-When an array is unset, a whole-array trace will be invoked
-just once, with \fIname1\fR equal to the name of the array
-and \fIname2\fR NULL;  it will not be invoked once for each
-element.
-
-.SH "MULTIPLE TRACES"
-.PP
-It is possible for multiple traces to exist on the same variable.
-When this happens, all of the trace procedures will be invoked on each
-access, in order from most-recently-created to least-recently-created.
-When there exist whole-array traces for an array as well as
-traces on individual elements, the whole-array traces are invoked
-before the individual-element traces.
-If a read or write trace unsets the variable then all of the unset
-traces will be invoked but the remainder of the read and write traces
-will be skipped.
-
-.SH "ERROR RETURNS"
-.PP
-Under normal conditions trace procedures should return NULL, indicating
-successful completion.
-If \fIproc\fR returns a non-NULL value it signifies that an
-error occurred.
-The return value must be a pointer to a static character string
-containing an error message.
-If a trace procedure returns an error, no further traces are
-invoked for the access and the traced access aborts with the
-given message.
-Trace procedures can use this facility to make variables
-read-only, for example (but note that the value of the variable
-will already have been modified before the trace procedure is
-called, so the trace procedure will have to restore the correct
-value).
-.PP
-The return value from \fIproc\fR is only used during read and
-write tracing.
-During unset traces, the return value is ignored and all relevant
-trace procedures will always be invoked.
-
-.SH "RESTRICTIONS"
-.PP
-A trace procedure can be called at any time, even when there
-is a partially-formed result in the interpreter's result area.  If
-the trace procedure does anything that could damage this result (such
-as calling \fBTcl_Eval\fR) then it must save the original values of
-the interpreter's \fBresult\fR and \fBfreeProc\fR fields and restore
-them before it returns.
-
-.SH "UNDEFINED VARIABLES"
-.PP
-It is legal to set a trace on an undefined variable.
-The variable will still appear to be undefined until the
-first time its value is set.
-If an undefined variable is traced and then unset, the unset will fail
-with an error (``no such variable''), but the trace
-procedure will still be invoked.
-
-.SH "TCL_TRACE_DESTROYED FLAG"
-.PP
-In an unset callback to \fIproc\fR, the TCL_TRACE_DESTROYED bit
-is set in \fIflags\fR if the trace is being removed as part
-of the deletion.
-Traces on a variable are always removed whenever the variable
-is deleted;  the only time TCL_TRACE_DESTROYED isn't set is for
-a whole-array trace invoked when only a single element of an
-array is unset.
-
-.SH "TCL_INTERP_DESTROYED"
-.PP
-When an interpreter is destroyed, unset traces are called for
-all of its variables.
-The TCL_INTERP_DESTROYED bit will be set in the \fIflags\fR
-argument passed to the trace procedures.
-Trace procedures must be extremely careful in what they do if
-the TCL_INTERP_DESTROYED bit is set.
-It is not safe for the procedures to invoke any Tcl procedures
-on the interpreter, since its state is partially deleted.
-All that trace procedures should do under these circumstances is
-to clean up and free their own internal data structures.
-
-.SH BUGS
-.PP
-Tcl doesn't do any error checking to prevent trace procedures
-from misusing the interpreter during traces with TCL_INTERP_DESTROYED
-set.
-.PP
-Array traces are not yet integrated with the Tcl "info exists" command,
-nor is there Tcl-level access to array traces.
-
-.SH KEYWORDS
-clientData, trace, variable
diff --git a/doc/Translate.3 b/doc/Translate.3
deleted file mode 100644
index 5d0d598..0000000
--- a/doc/Translate.3
+++ /dev/null
@@ -1,66 +0,0 @@
-'\"
-'\" Copyright (c) 1989-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Translate.3,v 1.3 1999/04/16 00:46:33 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_TranslateFileName 3 8.1 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_TranslateFileName \- convert file name to native form and replace tilde with home directory
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-char *
-\fBTcl_TranslateFileName\fR(\fIinterp\fR, \fIname\fR, \fIbufferPtr\fR)
-.SH ARGUMENTS
-.AS Tcl_DString *bufferPtr
-.AP Tcl_Interp *interp in
-Interpreter in which to report an error, if any.
-.AP char *name in
-File name, which may start with a ``~''.
-.AP Tcl_DString *bufferPtr in/out
-If needed, this dynamic string is used to store the new file name.
-At the time of the call it should be uninitialized or free.  The
-caller must eventually call \fBTcl_DStringFree\fR to free up
-anything stored here.
-.BE
-
-.SH DESCRIPTION
-.PP
-This utility procedure translates a file name to a form suitable for
-passing to the local operating system.  It converts network names into
-native form and does tilde substitution.
-.PP
-If
-\fBTcl_TranslateFileName\fR has to do tilde substitution or translate
-the name then it uses
-the dynamic string at \fI*bufferPtr\fR to hold the new string it
-generates.
-After \fBTcl_TranslateFileName\fR returns a non-NULL result, the caller must
-eventually invoke \fBTcl_DStringFree\fR to free any information
-placed in \fI*bufferPtr\fR.  The caller need not know whether or
-not \fBTcl_TranslateFileName\fR actually used the string;  \fBTcl_TranslateFileName\fR
-initializes \fI*bufferPtr\fR even if it doesn't use it, so the call to
-\fBTcl_DStringFree\fR will be safe in either case.
-.PP
-If an error occurs (e.g. because there was no user by the given
-name) then NULL is returned and an error message will be left
-at \fIinterp->result\fR.
-When an error occurs, \fBTcl_TranslateFileName\fR
-frees the dynamic string itself so that the caller need not call
-\fBTcl_DStringFree\fR.
-.PP
-The caller is responsible for making sure that \fIinterp->result\fR
-has its default empty value when \fBTcl_TranslateFileName\fR is invoked.
-
-.SH "SEE ALSO"
-filename
-
-.SH KEYWORDS
-file name, home directory, tilde, translate, user
diff --git a/doc/UpVar.3 b/doc/UpVar.3
deleted file mode 100644
index 8dcb06f..0000000
--- a/doc/UpVar.3
+++ /dev/null
@@ -1,76 +0,0 @@
-'\"
-'\" Copyright (c) 1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: UpVar.3,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_UpVar 3 7.4 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_UpVar, Tcl_UpVar2 \- link one variable to another
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-int
-\fBTcl_UpVar(\fIinterp, frameName, sourceName, destName, flags\fB)\fR
-.sp
-int
-\fBTcl_UpVar2(\fIinterp, frameName, name1, name2, destName, flags\fB)\fR
-.SH ARGUMENTS
-.AS Tcl_VarTraceProc prevClientData
-.AP Tcl_Interp *interp in
-Interpreter containing variables;  also used for error reporting.
-.AP char *frameName in
-Identifies the stack frame containing source variable.
-May have any of the forms accepted by
-the \fBupvar\fR command, such as \fB#0\fR or \fB1\fR.
-.AP char *sourceName in
-Name of source variable, in the frame given by \fIframeName\fR.
-May refer to a scalar variable or to an array variable with a
-parenthesized index.
-.AP char *destName in
-Name of destination variable, which is to be linked to source
-variable so that references to \fIdestName\fR
-refer to the other variable.  Must not currently exist except as
-an upvar-ed variable.
-.AP int flags in
-Either TCL_GLOBAL_ONLY or 0;  if non-zero, then \fIdestName\fR is
-a global variable;  otherwise it is a local to the current procedure
-(or global if no procedure is active).
-.AP char *name1 in
-First part of source variable's name (scalar name, or name of array
-without array index).
-.AP char *name2 in
-If source variable is an element of an array, gives the index of the element.
-For scalar source variables, is NULL.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_UpVar\fR and \fBTcl_UpVar2\fR provide the same functionality
-as the \fBupvar\fR command:  they make a link from a source variable
-to a destination variable, so that references to the destination are
-passed transparently through to the source.
-The name of the source variable may be specified either as a single
-string such as \fBxyx\fR or \fBa(24)\fR (by calling \fBTcl_UpVar\fR)
-or in two parts where the array name has been separated from the
-element name (by calling \fBTcl_UpVar2\fR).
-The destination variable name is specified in a single string;  it
-may not be an array element.
-.PP
-Both procedures return either TCL_OK or TCL_ERROR, and they
-leave an error message in \fIinterp->result\fR if an error
-occurs.
-.PP
-As with the \fBupvar\fR command, the source variable need not exist;
-if it does exist, unsetting it later does not destroy the link.  The
-destination variable may exist at the time of the call, but if so
-it must exist as a linked variable.
-
-.SH KEYWORDS
-linked variable, upvar, variable
diff --git a/doc/Utf.3 b/doc/Utf.3
deleted file mode 100644
index f68a6cb..0000000
--- a/doc/Utf.3
+++ /dev/null
@@ -1,160 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: Utf.3,v 1.2 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH Utf 3 "8.1" Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_UniChar, Tcl_UniCharToUtf, Tcl_UtfToUniChar, Tcl_UtfCharComplete, Tcl_NumUtfChars, Tcl_UtfFindFirst, Tcl_UtfFindLast, Tcl_UtfNext, Tcl_UtfPrev, Tcl_UniCharAtIndex, Tcl_UtfAtIndex, Tcl_UtfBackslash \- routines for manipulating UTF-8 strings.
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-typedef ... Tcl_UniChar;
-.sp
-int
-\fBTcl_UniCharToUtf\fR(\fIch, buf\fR)
-.sp
-int
-\fBTcl_UtfToUniChar\fR(\fIsrc, chPtr\fR)
-.sp
-int
-\fBTcl_UtfCharComplete\fR(\fIsrc, len\fR)
-.sp
-int 
-\fBTcl_NumUtfChars\fR(\fIsrc, len\fR)
-.sp
-char *
-\fBTcl_UtfFindFirst\fR(\fIsrc, ch\fR)
-.sp
-char *
-\fBTcl_UtfFindLast\fR(\fIsrc, ch\fR)
-.sp
-char *
-\fBTcl_UtfNext\fR(\fIsrc\fR)
-.sp
-char *
-\fBTcl_UtfPrev\fR(\fIsrc, start\fR)
-.sp
-Tcl_UniChar
-\fBTcl_UniCharAtIndex\fR(\fIsrc, index\fR)
-.sp
-char *
-\fBTcl_UtfAtIndex\fR(\fIsrc, index\fR)
-.sp
-int
-\fBTcl_UtfBackslash\fR(\fIsrc, readPtr, dst\fR)
-.SH ARGUMENTS
-.AS "CONST char" *chPtr out
-.AP char *buf out
-Buffer in which the UTF-8 representation of the Tcl_UniChar is stored.  At most
-TCL_UTF_MAX bytes are stored in the buffer.
-.AP int ch in
-The Tcl_UniChar to be converted or examined.
-.AP Tcl_UniChar *chPtr out
-Filled with the Tcl_UniChar represented by the head of the UTF-8 string.
-.AP "CONST char" *src in
-Pointer to a UTF-8 string.
-.AP int len in
-The length of the UTF-8 string in bytes (not UTF-8 characters).  If
-negative, all bytes up to the first null byte are used.
-.AP "CONST char" *start in
-Pointer to the beginning of a UTF-8 string.
-.AP int index in
-The index of a character (not byte) in the UTF-8 string.
-.AP int *readPtr out
-If non-NULL, filled with the number of bytes in the backslash sequence, 
-including the backslash character.
-.AP char *dst out
-Buffer in which the bytes represented by the backslash sequence are stored.
-At most TCL_UTF_MAX bytes are stored in the buffer.
-.BE
-
-.SH DESCRIPTION
-.PP
-These routines convert between UTF-8 strings and Tcl_UniChars.  A
-Tcl_UniChar is a Unicode character represented as an unsigned, fixed-size
-quantity.  A UTF-8 character is a Unicode character represented as
-a varying-length sequence of up to TCL_UTF_MAX bytes.  A multibyte UTF-8
-sequence consists of a lead byte followed by some number of trail bytes.
-.PP
-\fBTCL_UTF_MAX\fR is the maximum number of bytes that it takes to
-represent one Unicode character in the UTF-8 representation.
-.PP
-\fBTcl_UniCharToUtf\fR stores the Tcl_UniChar \fIch\fR as a UTF-8 string
-in starting at \fIbuf\fR.  The return value is the number of bytes stored
-in \fIbuf\fR.
-.PP
-\fBTcl_UtfToUniChar\fR reads one UTF-8 character starting at \fIsrc\fR
-and stores it as a Tcl_UniChar in \fI*chPtr\fR.  The return value is the
-number of bytes read from \fIsrc\fR..  The caller must ensure that the
-source buffer is long enough such that this routine does not run off the
-end and dereference non-existent or random memory; if the source buffer
-is known to be null terminated, this will not happen.  If the input is
-not in proper UTF-8 format, \fBTcl_UtfToUniChar\fR will store the first
-byte of \fIsrc\fR in \fI*chPtr\fR as a Tcl_UniChar between 0x0000 and
-0x00ff and return 1.  
-.PP
-\fBTcl_UtfCharComplete\fR returns 1 if the source UTF-8 string \fIsrc\fR
-of length \fIlen\fR bytes is long enough to be decoded by
-\fBTcl_UtfToUniChar\fR, or 0 otherwise.  This function does not guarantee
-that the UTF-8 string is properly formed.  This routine is used by
-procedures that are operating on a byte at a time and need to know if a
-full Tcl_UniChar has been seen.
-.PP
-\fBTcl_NumUtfChars\fR corresponds to \fBstrlen\fR for UTF-8 strings.  It
-returns the number of Tcl_UniChars that are represented by the UTF-8 string
-\fIsrc\fR.  The length of the source string is \fIlen\fR bytes.  If the
-length is negative, all bytes up to the first NULL byte are used.
-.PP
-\fBTcl_UtfFindFirst\fR corresponds to \fBstrchr\fR for UTF-8 strings.  It
-returns a pointer to the first occurance of the Tcl_UniChar \fIch\fR
-in the NULL-terminated UTF-8 string \fIsrc\fR.  The NULL terminator is
-considered part of the UTF-8 string.  
-.PP
-\fBTcl_UtfFindLast\fR corresponds to \fBstrrchr\fR for UTF-8 strings.  It
-returns a pointer to the last occurance of the Tcl_UniChar \fIch\fR
-in the NULL terminated UTF-8 string \fIsrc\fR.  The NULL terminator is
-considered part of the UTF-8 string.  
-.PP
-Given \fIsrc\fR, a pointer to some location in a UTF-8 string,
-\fBTcl_UtfNext\fR returns a pointer to the next UTF-8 character in the
-string.  The caller must not ask for the next character after the last
-character in the string.
-.PP
-Given \fIsrc\fR, a pointer to some location in a UTF-8 string,
-\fBTcl_UtfPrev\fR returns a pointer to the previous UTF-8 character in the
-string.  This function will not back up to a position before \fIstart\fR,
-the start of the UTF-8 string.  If \fIsrc\fR was already at \fIstart\fR, the
-return value will be \fIstart\fR.
-.PP
-\fBTcl_UniCharAtIndex\fR corresponds to a C string array dereference or the
-Pascal Ord() function.  It returns the Tcl_UniChar represented at the
-specified character (not byte) \fIindex\fR in the UTF-8 string
-\fIsrc\fR.  The source string must contain at least \fIindex\fR
-characters.
-.PP
-\fBTcl_UtfAtIndex\fR returns a pointer to the specified character (not
-byte) \fIindex\fR in the UTF-8 string \fIsrc\fR.  The source string must
-contain at least \fIindex\fR characters.  This is equivalent to calling 
-\fBTcl_UtfNext\fR \fIindex\fR times.
-.PP
-\fBTcl_UtfBackslash\fR is a utility procedure used by several of the Tcl
-commands.  It parses a backslash sequence and stores the properly formed
-UTF-8 character represented by the backslash sequence in the output
-buffer \fIdst\fR.  At most TCL_UTF_MAX bytes are stored in the buffer.
-\fBTcl_UtfBackslash\fR modifies \fI*readPtr\fR to contain the number
-of bytes in the backslash sequence, including the backslash character.
-The return value is the number of bytes stored in the output buffer.
-.PP
-See the \fBTcl\fR manual entry for information on the valid backslash
-sequences.  All of the sequences described in the Tcl manual entry are
-supported by \fBTcl_UtfBackslash\fR.
-
-.SH KEYWORDS
-utf, unicode, backslash
diff --git a/doc/WrongNumArgs.3 b/doc/WrongNumArgs.3
deleted file mode 100644
index 30157d9..0000000
--- a/doc/WrongNumArgs.3
+++ /dev/null
@@ -1,79 +0,0 @@
-'\"
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: WrongNumArgs.3,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH Tcl_WrongNumArgs 3 8.0 Tcl "Tcl Library Procedures"
-.BS
-.SH NAME
-Tcl_WrongNumArgs \- generate standard error message for wrong number of arguments
-.SH SYNOPSIS
-.nf
-\fB#include <tcl.h>\fR
-.sp
-\fBTcl_WrongNumArgs\fR(\fIinterp, objc, objv, message\fR)
-.SH ARGUMENTS
-.AS Tcl_Interp "*CONST objv[]"
-.AP Tcl_Interp interp in
-Interpreter in which error will be reported: error message gets stored
-in its result object.
-.AP int objc in
-Number of leading arguments from \fIobjv\fR to include in error
-message.
-.TP
-Tcl_Obj	*CONST \fIobjv\fR[]	(in)
-Arguments to command that had the wrong number of arguments.
-.AP char *message in
-Additional error information to print after leading arguments
-from \fIobjv\fR.  This typically gives the acceptable syntax
-of the command.  This argument may be NULL.
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTcl_WrongNumArgs\fR is a utility procedure that is invoked by
-command procedures when they discover that they have received the
-wrong number of arguments.  \fBTcl_WrongNumArgs\fR generates a
-standard error message and stores it in the result object of
-\fIinterp\fR.  The message includes the \fIobjc\fR initial
-elements of \fIobjv\fR plus \fImessage\fR.  For example, if
-\fIobjv\fR consists of the values \fBfoo\fR and \fBbar\fR,
-\fIobjc\fR is 1, and \fImessage\fR is ``\fBfileName count\fR''
-then \fIinterp\fR's result object will be set to the following
-string:
-.CS
-wrong # args: should be "foo fileName count"
-.CE
-If \fIobjc\fR is 2, the result will be set to the following string:
-.CS
-wrong # args: should be "foo bar fileName count"
-.CE
-\fIObjc\fR is usually 1, but may be 2 or more for commands like
-\fBstring\fR and the Tk widget commands, which use the first argument
-as a subcommand.  
-.PP
-Some of the objects in the \fIobjv\fR array may be abbreviations for
-a subcommand.  The command
-\fBTcl_GetIndexFromObj\fR will convert the abbreviated string object
-into an \fIindexObject\fR.  If an error occurs in the parsing of the
-subcommand we would like to use the full subcommand name rather than
-the abbreviation.  If the \fBTcl_WrongNumArgs\fR command finds any
-\fIindexObjects\fR in the \fIobjv\fR array it will use the full subcommand
-name in the error message instead of the abbreviated name that was
-origionally passed in.  Using the above example, lets assume that
-\fIbar\fR is actually an abbreviation for \fIbarfly\fR and the object
-is now an indexObject becasue it was passed to
-\fBTcl_GetIndexFromObj\fR.  In this case the error message would be:
-.CS
-wrong # args: should be "foo barfly fileName count"
-.CE
-
-.SH "SEE ALSO"
-Tcl_GetIndexFromObj
-
-.SH KEYWORDS
-command, error message, wrong number of arguments
diff --git a/doc/after.n b/doc/after.n
deleted file mode 100644
index 17fcf7f..0000000
--- a/doc/after.n
+++ /dev/null
@@ -1,109 +0,0 @@
-'\"
-'\" Copyright (c) 1990-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: after.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH after n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-after \- Execute a command after a time delay
-.SH SYNOPSIS
-\fBafter \fIms\fR
-.sp
-\fBafter \fIms \fR?\fIscript script script ...\fR?
-.sp
-\fBafter cancel \fIid\fR
-.sp
-\fBafter cancel \fIscript script script ...\fR
-.sp
-\fBafter idle \fR?\fIscript script script ...\fR?
-.sp
-\fBafter info \fR?\fIid\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is used to delay execution of the program or to execute
-a command in background sometime in the future.  It has several forms,
-depending on the first argument to the command:
-.TP
-\fBafter \fIms\fR
-\fIMs\fR must be an integer giving a time in milliseconds.
-The command sleeps for \fIms\fR milliseconds and then returns.
-While the command is sleeping the application does not respond to
-events.
-.TP
-\fBafter \fIms \fR?\fIscript script script ...\fR?
-In this form the command returns immediately, but it arranges
-for a Tcl command to be executed \fIms\fR milliseconds later as an
-event handler.
-The command will be executed exactly once, at the given time.
-The delayed command is formed by concatenating all the \fIscript\fR
-arguments in the same fashion as the \fBconcat\fR command.
-The command will be executed at global level (outside the context
-of any Tcl procedure).
-If an error occurs while executing the delayed command then the
-\fBbgerror\fR mechanism is used to report the error.
-The \fBafter\fR command returns an identifier that can be used
-to cancel the delayed command using \fBafter cancel\fR.
-.TP
-\fBafter cancel \fIid\fR
-Cancels the execution of a delayed command that
-was previously scheduled.
-\fIId\fR indicates which command should be canceled;  it must have
-been the return value from a previous \fBafter\fR command.
-If the command given by \fIid\fR has already been executed then
-the \fBafter cancel\fR command has no effect.
-.TP
-\fBafter cancel \fIscript script ...\fR
-This command also cancels the execution of a delayed command.
-The \fIscript\fR arguments are concatenated together with space
-separators (just as in the \fBconcat\fR command).
-If there is a pending command that matches the string, it is
-cancelled and will never be executed;  if no such command is
-currently pending then the \fBafter cancel\fR command has no effect.
-.TP
-\fBafter idle \fIscript \fR?\fIscript script ...\fR?
-Concatenates the \fIscript\fR arguments together with space
-separators (just as in the \fBconcat\fR command), and arranges
-for the resulting script to be evaluated later as an idle callback.
-The script will be run exactly once, the next time the event
-loop is entered and there are no events to process.
-The command returns an identifier that can be used
-to cancel the delayed command using \fBafter cancel\fR.
-If an error occurs while executing the script then the
-\fBbgerror\fR mechanism is used to report the error.
-.TP
-\fBafter info \fR?\fIid\fR?
-This command returns information about existing event handlers.
-If no \fIid\fR argument is supplied, the command returns
-a list of the identifiers for all existing
-event handlers created by the \fBafter\fR command for this
-interpreter.
-If \fIid\fR is supplied, it specifies an existing handler;
-\fIid\fR must have been the return value from some previous call
-to \fBafter\fR and it must not have triggered yet or been cancelled.
-In this case the command returns a list with two elements.
-The first element of the list is the script associated
-with \fIid\fR, and the second element is either
-\fBidle\fR or \fBtimer\fR to indicate what kind of event
-handler it is.
-.LP
-The \fBafter \fIms\fR and \fBafter idle\fR forms of the command
-assume that the application is event driven:  the delayed commands
-will not be executed unless the application enters the event loop.
-In applications that are not normally event-driven, such as
-\fBtclsh\fR, the event loop can be entered with the \fBvwait\fR
-and \fBupdate\fR commands.
-
-.SH "SEE ALSO"
-bgerror
-
-.SH KEYWORDS
-cancel, delay, idle callback, sleep, time
diff --git a/doc/append.n b/doc/append.n
deleted file mode 100644
index 1a28065..0000000
--- a/doc/append.n
+++ /dev/null
@@ -1,32 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: append.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH append n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-append \- Append to variable
-.SH SYNOPSIS
-\fBappend \fIvarName \fR?\fIvalue value value ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Append all of the \fIvalue\fR arguments to the current value
-of variable \fIvarName\fR.  If \fIvarName\fR doesn't exist,
-it is given a value equal to the concatenation of all the
-\fIvalue\fR arguments.
-This command provides an efficient way to build up long
-variables incrementally.
-For example, ``\fBappend a $b\fR'' is much more efficient than
-``\fBset a $a$b\fR'' if \fB$a\fR is long.
-
-.SH KEYWORDS
-append, variable
diff --git a/doc/array.n b/doc/array.n
deleted file mode 100644
index f18c91e..0000000
--- a/doc/array.n
+++ /dev/null
@@ -1,116 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: array.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH array n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-array \- Manipulate array variables
-.SH SYNOPSIS
-\fBarray \fIoption arrayName\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command performs one of several operations on the
-variable given by \fIarrayName\fR.
-Unless otherwise specified for individual commands below,
-\fIarrayName\fR must be the name of an existing array variable.
-The \fIoption\fR argument determines what action is carried
-out by the command.
-The legal \fIoptions\fR (which may be abbreviated) are:
-.TP
-\fBarray anymore \fIarrayName searchId\fR
-Returns 1 if there are any more elements left to be processed
-in an array search, 0 if all elements have already been
-returned.
-\fISearchId\fR indicates which search on \fIarrayName\fR to
-check, and must have been the return value from a previous
-invocation of \fBarray startsearch\fR.
-This option is particularly useful if an array has an element
-with an empty name, since the return value from
-\fBarray nextelement\fR won't indicate whether the search
-has been completed.
-.TP
-\fBarray donesearch \fIarrayName searchId\fR
-This command terminates an array search and destroys all the
-state associated with that search.  \fISearchId\fR indicates
-which search on \fIarrayName\fR to destroy, and must have
-been the return value from a previous invocation of
-\fBarray startsearch\fR.  Returns an empty string.
-.TP
-\fBarray exists \fIarrayName\fR
-Returns 1 if \fIarrayName\fR is an array variable, 0 if there
-is no variable by that name or if it is a scalar variable.
-.TP
-\fBarray get \fIarrayName\fR ?\fIpattern\fR?
-Returns a list containing pairs of elements.  The first
-element in each pair is the name of an element in \fIarrayName\fR
-and the second element of each pair is the value of the
-array element.  The order of the pairs is undefined.
-If \fIpattern\fR is not specified, then all of the elements of the
-array are included in the result.
-If \fIpattern\fR is specified, then only those elements whose names
-match \fIpattern\fR (using the glob-style matching rules of
-\fBstring match\fR) are included.
-If \fIarrayName\fR isn't the name of an array variable, or if
-the array contains no elements, then an empty list is returned.
-.TP
-\fBarray names \fIarrayName\fR ?\fIpattern\fR?
-Returns a list containing the names of all of the elements in
-the array that match \fIpattern\fR (using the glob-style matching
-rules of \fBstring match\fR).
-If \fIpattern\fR is omitted then the command returns all of
-the element names in the array.
-If there are no (matching) elements in the array, or if \fIarrayName\fR
-isn't the name of an array variable, then an empty string is
-returned.
-.TP
-\fBarray nextelement \fIarrayName searchId\fR
-Returns the name of the next element in \fIarrayName\fR, or
-an empty string if all elements of \fIarrayName\fR have
-already been returned in this search.  The \fIsearchId\fR
-argument identifies the search, and must have
-been the return value of an \fBarray startsearch\fR command.
-Warning:  if elements are added to or deleted from the array,
-then all searches are automatically terminated just as if
-\fBarray donesearch\fR had been invoked; this will cause
-\fBarray nextelement\fR operations to fail for those searches.
-.TP
-\fBarray set \fIarrayName list\fR
-Sets the values of one or more elements in \fIarrayName\fR.
-\fIlist\fR must have a form like that returned by \fBarray get\fR,
-consisting of an even number of elements.
-Each odd-numbered element in \fIlist\fR is treated as an element
-name within \fIarrayName\fR, and the following element in \fIlist\fR
-is used as a new value for that array element.
-If the variable \fIarrayName\fR does not already exist
-and \fIlist\fR is empty,
-\fIarrayName\fR is created with an empty array value.
-.TP
-\fBarray size \fIarrayName\fR
-Returns a decimal string giving the number of elements in the
-array.
-If \fIarrayName\fR isn't the name of an array then 0 is returned.
-.TP
-\fBarray startsearch \fIarrayName\fR
-This command initializes an element-by-element search through the
-array given by \fIarrayName\fR, such that invocations of the
-\fBarray nextelement\fR command will return the names of the
-individual elements in the array.
-When the search has been completed, the \fBarray donesearch\fR
-command should be invoked.
-The return value is a
-search identifier that must be used in \fBarray nextelement\fR
-and \fBarray donesearch\fR commands; it allows multiple
-searches to be underway simultaneously for the same array.
-
-.SH KEYWORDS
-array, element names, search
diff --git a/doc/bgerror.n b/doc/bgerror.n
deleted file mode 100644
index 3f946c3..0000000
--- a/doc/bgerror.n
+++ /dev/null
@@ -1,68 +0,0 @@
-'\"
-'\" Copyright (c) 1990-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: bgerror.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH bgerror n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-bgerror \- Command invoked to process background errors
-.SH SYNOPSIS
-\fBbgerror \fImessage\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBbgerror\fR command doesn't exist as built-in part of Tcl.  Instead,
-individual applications or users can define a \fBbgerror\fR
-command (e.g. as a Tcl procedure) if they wish to handle background
-errors.
-.PP
-A background error is one that occurs in an event handler or some
-other command that didn't originate with the application.
-For example, if an error occurs while executing a command specified
-with the \fBafter\fR command, then it is a background error.
-For a non-background error, the error can simply be returned up
-through nested Tcl command evaluations until it reaches the top-level
-code in the application; then the application can report the error
-in whatever way it wishes.
-When a background error occurs, the unwinding ends in
-the Tcl library and there is no obvious way for Tcl to report
-the error.
-.PP
-When Tcl detects a background error, it saves information about the
-error and invokes the \fBbgerror\fR command later as an idle event handler.
-Before invoking \fBbgerror\fR, Tcl restores the \fBerrorInfo\fR
-and \fBerrorCode\fR variables to their values at the time the
-error occurred, then it invokes \fBbgerror\fR with
-the error message as its only argument.
-Tcl assumes that the application has implemented the \fBbgerror\fR
-command, and that the command will report the error in a way that
-makes sense for the application.  Tcl will ignore any result returned
-by the \fBbgerror\fR command as long as no error is generated.
-.PP
-If another Tcl error occurs within the \fBbgerror\fR command
-(for example, because no \fBbgerror\fR command has been defined)
-then Tcl reports the error itself by writing a message to stderr.
-.PP
-If several background errors accumulate before \fBbgerror\fR
-is invoked to process them, \fBbgerror\fR will be invoked once
-for each error, in the order they occurred.
-However, if \fBbgerror\fR returns with a break exception, then
-any remaining errors are skipped without calling \fBbgerror\fR.
-.PP
-Tcl has no default implementation for \fBbgerror\fR.
-However, in applications using Tk there is a default
-\fBbgerror\fR procedure
-which posts a dialog box containing
-the error message and offers the user a chance to see a stack
-trace showing where the error occurred.
-
-.SH KEYWORDS
-background error, reporting
diff --git a/doc/binary.n b/doc/binary.n
deleted file mode 100644
index 8b20259..0000000
--- a/doc/binary.n
+++ /dev/null
@@ -1,532 +0,0 @@
-'\"
-'\" Copyright (c) 1997 by Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: binary.n,v 1.3 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH binary n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-binary \- Insert and extract fields from binary strings
-.SH SYNOPSIS
-\fBbinary format \fIformatString \fR?\fIarg arg ...\fR?
-.br
-\fBbinary scan \fIstring formatString \fR?\fIvarName varName ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command provides facilities for manipulating binary data.  The
-first form, \fBbinary format\fR, creates a binary string from normal
-Tcl values.  For example, given the values 16 and 22, it might produce
-an 8-byte binary string consisting of two 4-byte integers, one for
-each of the numbers.  The second form of the command, 
-\fBbinary scan\fR, does the opposite: it extracts data from a binary
-string and returns it as ordinary Tcl string values.
-
-.SH "BINARY FORMAT"
-.PP
-The \fBbinary format\fR command generates a binary string whose layout
-is specified by the \fIformatString\fR and whose contents come from
-the additional arguments.  The resulting binary value is returned.
-.PP
-The \fIformatString\fR consists of a sequence of zero or more field
-specifiers separated by zero or more spaces.  Each field specifier is
-a single type character followed by an optional numeric \fIcount\fR.
-Most field specifiers consume one argument to obtain the value to be
-formatted.  The type character specifies how the value is to be
-formatted.  The \fIcount\fR typically indicates how many items of the
-specified type are taken from the value.  If present, the \fIcount\fR
-is a non-negative decimal integer or \fB*\fR, which normally indicates
-that all of the items in the value are to be used.  If the number of
-arguments does not match the number of fields in the format string
-that consume arguments, then an error is generated.
-.PP
-Each type-count pair moves an imaginary cursor through the binary
-data, storing bytes at the current position and advancing the cursor
-to just after the last byte stored.  The cursor is initially at
-position 0 at the beginning of the data.  The type may be any one of
-the following characters:
-.IP \fBa\fR 5
-Stores a character string of length \fIcount\fR in the output string.
-If \fIarg\fR has fewer than \fIcount\fR bytes, then additional zero
-bytes are used to pad out the field.  If \fIarg\fR is longer than the
-specified length, the extra characters will be ignored.  If
-\fIcount\fR is \fB*\fR, then all of the bytes in \fIarg\fR will be
-formatted.  If \fIcount\fR is omitted, then one character will be
-formatted.  For example,
-.RS
-.CS
-\fBbinary format a7a*a alpha bravo charlie\fR
-.CE
-will return a string equivalent to \fBalpha\\000\\000bravoc\fR.
-.RE
-.IP \fBA\fR 5
-This form is the same as \fBa\fR except that spaces are used for
-padding instead of nulls.  For example,
-.RS
-.CS
-\fBbinary format A6A*A alpha bravo charlie\fR
-.CE
-will return \fBalpha bravoc\fR.
-.RE
-.IP \fBb\fR 5
-Stores a string of \fIcount\fR binary digits in low-to-high order
-within each byte in the output string.  \fIArg\fR must contain a
-sequence of \fB1\fR and \fB0\fR characters.  The resulting bytes are
-emitted in first to last order with the bits being formatted in
-low-to-high order within each byte.  If \fIarg\fR has fewer than
-\fIcount\fR digits, then zeros will be used for the remaining bits.
-If \fIarg\fR has more than the specified number of digits, the extra
-digits will be ignored.  If \fIcount\fR is \fB*\fR, then all of the
-digits in \fIarg\fR will be formatted.  If \fIcount\fR is omitted,
-then one digit will be formatted.  If the number of bits formatted
-does not end at a byte boundary, the remaining bits of the last byte
-will be zeros.  For example,
-.RS
-.CS
-\fBbinary format b5b* 11100 111000011010\fR
-.CE
-will return a string equivalent to \fB\\x07\\x87\\x05\fR.
-.RE
-.IP \fBB\fR 5
-This form is the same as \fBb\fR except that the bits are stored in
-high-to-low order within each byte.  For example,
-.RS
-.CS
-\fBbinary format B5B* 11100 111000011010\fR
-.CE
-will return a string equivalent to \fB\\xe0\\xe1\\xa0\fR.
-.RE
-.IP \fBh\fR 5
-Stores a string of \fIcount\fR hexadecimal digits in low-to-high
-within each byte in the output string.  \fIArg\fR must contain a
-sequence of characters in the set ``0123456789abcdefABCDEF''.  The
-resulting bytes are emitted in first to last order with the hex digits
-being formatted in low-to-high order within each byte.  If \fIarg\fR
-has fewer than \fIcount\fR digits, then zeros will be used for the
-remaining digits.  If \fIarg\fR has more than the specified number of
-digits, the extra digits will be ignored.  If \fIcount\fR is
-\fB*\fR, then all of the digits in \fIarg\fR will be formatted.  If
-\fIcount\fR is omitted, then one digit will be formatted.  If the
-number of digits formatted does not end at a byte boundary, the
-remaining bits of the last byte will be zeros.  For example,
-.RS
-.CS
-\fBbinary format h3h* AB def\fR
-.CE
-will return a string equivalent to \fB\\xba\\x00\\xed\\x0f\fR.
-.RE
-.IP \fBH\fR 5
-This form is the same as \fBh\fR except that the digits are stored in
-high-to-low order within each byte.  For example,
-.RS
-.CS
-\fBbinary format H3H* ab DEF\fR
-.CE
-will return a string equivalent to \fB\\xab\\x00\\xde\\xf0\fR.
-.RE
-.IP \fBc\fR 5
-Stores one or more 8-bit integer values in the output string.  If no
-\fIcount\fR is specified, then \fIarg\fR must consist of an integer
-value; otherwise \fIarg\fR must consist of a list containing at least
-\fIcount\fR integer elements.  The low-order 8 bits of each integer
-are stored as a one-byte value at the cursor position.  If \fIcount\fR
-is \fB*\fR, then all of the integers in the list are formatted.  If
-the number of elements in the list is fewer than \fIcount\fR, then an
-error is generated.  If the number of elements in the list is greater
-than \fIcount\fR, then the extra elements are ignored.  For example,
-.RS
-.CS
-\fBbinary format c3cc* {3 -3 128 1} 260 {2 5}\fR
-.CE
-will return a string equivalent to
-\fB\\x03\\xfd\\x80\\x04\\x02\\x05\fR, whereas
-.CS
-\fBbinary format c {2 5}\fR
-.CE
-will generate an error.
-.RE
-.IP \fBs\fR 5
-This form is the same as \fBc\fR except that it stores one or more
-16-bit integers in little-endian byte order in the output string.  The
-low-order 16-bits of each integer are stored as a two-byte value at
-the cursor position with the least significant byte stored first.  For
-example,
-.RS
-.CS
-\fBbinary format s3 {3 -3 258 1}\fR
-.CE
-will return a string equivalent to 
-\fB\\x03\\x00\\xfd\\xff\\x02\\x01\fR.
-.RE
-.IP \fBS\fR 5
-This form is the same as \fBs\fR except that it stores one or more
-16-bit integers in big-endian byte order in the output string.  For
-example,
-.RS
-.CS
-\fBbinary format S3 {3 -3 258 1}\fR
-.CE
-will return a string equivalent to 
-\fB\\x00\\x03\\xff\\xfd\\x01\\x02\fR.
-.RE
-.IP \fBi\fR 5
-This form is the same as \fBc\fR except that it stores one or more
-32-bit integers in little-endian byte order in the output string.  The
-low-order 32-bits of each integer are stored as a four-byte value at
-the cursor position with the least significant byte stored first.  For
-example,
-.RS
-.CS
-\fBbinary format i3 {3 -3 65536 1}\fR
-.CE
-will return a string equivalent to 
-\fB\\x03\\x00\\x00\\x00\\xfd\\xff\\xff\\xff\\x00\\x00\\x01\\x00\fR
-.RE
-.IP \fBI\fR 5
-This form is the same as \fBi\fR except that it stores one or more one
-or more 32-bit integers in big-endian byte order in the output string.
-For example,
-.RS
-.CS
-\fBbinary format I3 {3 -3 65536 1}\fR
-.CE
-will return a string equivalent to 
-\fB\\x00\\x00\\x00\\x03\\xff\\xff\\xff\\xfd\\x00\\x01\\x00\\x00\fR
-.RE
-.IP \fBf\fR 5
-This form is the same as \fBc\fR except that it stores one or more one
-or more single-precision floating in the machine's native
-representation in the output string.  This representation is not
-portable across architectures, so it should not be used to communicate
-floating point numbers across the network.  The size of a floating
-point number may vary across architectures, so the number of bytes
-that are generated may vary.  If the value overflows the
-machine's native representation, then the value of FLT_MAX
-as defined by the system will be used instead.  Because Tcl uses
-double-precision floating-point numbers internally, there may be some
-loss of precision in the conversion to single-precision.  For example,
-on a Windows system running on an Intel Pentium processor,
-.RS
-.CS
-\fBbinary format f2 {1.6 3.4}\fR
-.CE
-will return a string equivalent to 
-\fB\\xcd\\xcc\\xcc\\x3f\\x9a\\x99\\x59\\x40\fR.
-.RE
-.IP \fBd\fR 5
-This form is the same as \fBf\fR except that it stores one or more one
-or more double-precision floating in the machine's native
-representation in the output string.  For example, on a
-Windows system running on an Intel Pentium processor,
-.RS
-.CS
-\fBbinary format d1 {1.6}\fR
-.CE
-will return a string equivalent to 
-\fB\\x9a\\x99\\x99\\x99\\x99\\x99\\xf9\\x3f\fR.
-.RE
-.IP \fBx\fR 5
-Stores \fIcount\fR null bytes in the output string.  If \fIcount\fR is
-not specified, stores one null byte.  If \fIcount\fR is \fB*\fR,
-generates an error.  This type does not consume an argument.  For
-example,
-.RS
-.CS
-\fBbinary format a3xa3x2a3 abc def ghi\fR
-.CE
-will return a string equivalent to \fBabc\\000def\\000\\000ghi\fR.
-.RE
-.IP \fBX\fR 5
-Moves the cursor back \fIcount\fR bytes in the output string.  If
-\fIcount\fR is \fB*\fR or is larger than the current cursor position,
-then the cursor is positioned at location 0 so that the next byte
-stored will be the first byte in the result string.  If \fIcount\fR is
-omitted then the cursor is moved back one byte.  This type does not
-consume an argument.  For example,
-.RS
-.CS
-\fBbinary format a3X*a3X2a3 abc def ghi\fR
-.CE
-will return \fBdghi\fR.
-.RE
-.IP \fB@\fR 5
-Moves the cursor to the absolute location in the output string
-specified by \fIcount\fR.  Position 0 refers to the first byte in the
-output string.  If \fIcount\fR refers to a position beyond the last
-byte stored so far, then null bytes will be placed in the unitialized
-locations and the cursor will be placed at the specified location.  If
-\fIcount\fR is \fB*\fR, then the cursor is moved to the current end of
-the output string.  If \fIcount\fR is omitted, then an error will be
-generated.  This type does not consume an argument. For example,
-.RS
-.CS
-\fBbinary format a5@2a1@*a3@10a1 abcde f ghi j\fR
-.CE
-will return \fBabfdeghi\\000\\000j\fR.
-.RE
-
-.SH "BINARY SCAN"
-.PP
-The \fBbinary scan\fR command parses fields from a binary string,
-returning the number of conversions performed.  \fIString\fR gives the
-input to be parsed and \fIformatString\fR indicates how to parse it.
-Each \fIvarName\fR gives the name of a variable; when a field is
-scanned from \fIstring\fR the result is assigned to the corresponding
-variable.
-.PP
-As with \fBbinary format\fR, the \fIformatString\fR consists of a
-sequence of zero or more field specifiers separated by zero or more
-spaces.  Each field specifier is a single type character followed by
-an optional numeric \fIcount\fR.  Most field specifiers consume one
-argument to obtain the variable into which the scanned values should
-be placed.  The type character specifies how the binary data is to be
-interpreted.  The \fIcount\fR typically indicates how many items of
-the specified type are taken from the data.  If present, the
-\fIcount\fR is a non-negative decimal integer or \fB*\fR, which
-normally indicates that all of the remaining items in the data are to
-be used.  If there are not enough bytes left after the current cursor
-position to satisfy the current field specifier, then the
-corresponding variable is left untouched and \fBbinary scan\fR returns
-immediately with the number of variables that were set.  If there are
-not enough arguments for all of the fields in the format string that
-consume arguments, then an error is generated.
-.PP
-Each type-count pair moves an imaginary cursor through the binary data,
-reading bytes from the current position.  The cursor is initially
-at position 0 at the beginning of the data.  The type may be any one of
-the following characters:
-.IP \fBa\fR 5
-The data is a character string of length \fIcount\fR.  If \fIcount\fR
-is \fB*\fR, then all of the remaining bytes in \fIstring\fR will be
-scanned into the variable.  If \fIcount\fR is omitted, then one
-character will be scanned.  For example,
-.RS
-.CS
-\fBbinary scan abcde\\000fghi a6a10 var1 var2\fR
-.CE
-will return \fB1\fR with the string equivalent to \fBabcde\\000\fR
-stored in \fBvar1\fR and \fBvar2\fR left unmodified.
-.RE
-.IP \fBA\fR 5
-This form is the same as \fBa\fR, except trailing blanks and nulls are stripped from
-the scanned value before it is stored in the variable.  For example,
-.RS
-.CS
-\fBbinary scan "abc efghi  \\000" A* var1\fR
-.CE
-will return \fB1\fR with \fBabc efghi\fR stored in \fBvar1\fR.
-.RE
-.IP \fBb\fR 5
-The data is turned into a string of \fIcount\fR binary digits in
-low-to-high order represented as a sequence of ``1'' and ``0''
-characters.  The data bytes are scanned in first to last order with
-the bits being taken in low-to-high order within each byte.  Any extra
-bits in the last byte are ignored.  If \fIcount\fR is \fB*\fR, then
-all of the remaining bits in \fBstring\fR will be scanned.  If
-\fIcount\fR is omitted, then one bit will be scanned.  For example,
-.RS
-.CS
-\fBbinary scan \\x07\\x87\\x05 b5b* var1 var2\fR
-.CE
-will return \fB2\fR with \fB11100\fR stored in \fBvar1\fR and
-\fB1110000110100000\fR stored in \fBvar2\fR.
-.RE
-.IP \fBB\fR 5
-This form is the same as \fBb\fR, except the bits are taken in
-high-to-low order within each byte.  For example,
-.RS
-.CS
-\fBbinary scan \\x70\\x87\\x05 B5B* var1 var2\fR
-.CE
-will return \fB2\fR with \fB01110\fR stored in \fBvar1\fR and
-\fB1000011100000101\fR stored in \fBvar2\fR.
-.RE
-.IP \fBh\fR 5
-The data is turned into a string of \fIcount\fR hexadecimal digits in
-low-to-high order represented as a sequence of characters in the set
-``0123456789abcdef''.  The data bytes are scanned in first to last
-order with the hex digits being taken in low-to-high order within each
-byte.  Any extra bits in the last byte are ignored.  If \fIcount\fR
-is \fB*\fR, then all of the remaining hex digits in \fBstring\fR will be
-scanned.  If \fIcount\fR is omitted, then one hex digit will be
-scanned.  For example,
-.RS
-.CS
-\fBbinary scan \\x07\\x86\\x05 h3h* var1 var2\fR
-.CE
-will return \fB2\fR with \fB706\fR stored in \fBvar1\fR and
-\fB50\fR stored in \fBvar2\fR.
-.RE
-.IP \fBH\fR 5
-This form is the same as \fBh\fR, except the digits are taken in
-high-to-low order within each byte.  For example,
-.RS
-.CS
-\fBbinary scan \\x07\\x86\\x05 H3H* var1 var2\fR
-.CE
-will return \fB2\fR with \fB078\fR stored in \fBvar1\fR and
-\fB05\fR stored in \fBvar2\fR.
-.RE
-.IP \fBc\fR 5
-The data is turned into \fIcount\fR 8-bit signed integers and stored
-in the corresponding variable as a list. If \fIcount\fR is \fB*\fR,
-then all of the remaining bytes in \fBstring\fR will be scanned.  If
-\fIcount\fR is omitted, then one 8-bit integer will be scanned.  For
-example,
-.RS
-.CS
-\fBbinary scan \\x07\\x86\\x05 c2c* var1 var2\fR
-.CE
-will return \fB2\fR with \fB7 -122\fR stored in \fBvar1\fR and \fB5\fR
-stored in \fBvar2\fR.  Note that the integers returned are signed, but
-they can be converted to unsigned 8-bit quantities using an expression
-like:
-.CS
-\fBexpr ( $num + 0x100 ) % 0x100\fR
-.CE
-.RE
-.IP \fBs\fR 5
-The data is interpreted as \fIcount\fR 16-bit signed integers
-represented in little-endian byte order.  The integers are stored in
-the corresponding variable as a list.  If \fIcount\fR is \fB*\fR, then
-all of the remaining bytes in \fBstring\fR will be scanned.  If
-\fIcount\fR is omitted, then one 16-bit integer will be scanned.  For
-example,
-.RS
-.CS
-\fBbinary scan \\x05\\x00\\x07\\x00\\xf0\\xff s2s* var1 var2\fR
-.CE
-will return \fB2\fR with \fB5 7\fR stored in \fBvar1\fR and \fB-16\fR
-stored in \fBvar2\fR.  Note that the integers returned are signed, but
-they can be converted to unsigned 16-bit quantities using an expression
-like:
-.CS
-\fBexpr ( $num + 0x10000 ) % 0x10000\fR
-.CE
-.RE
-.IP \fBS\fR 5
-This form is the same as \fBs\fR except that the data is interpreted
-as \fIcount\fR 16-bit signed integers represented in big-endian byte
-order.  For example,
-.RS
-.CS
-\fBbinary scan \\x00\\x05\\x00\\x07\\xff\\xf0 S2S* var1 var2\fR
-.CE
-will return \fB2\fR with \fB5 7\fR stored in \fBvar1\fR and \fB-16\fR
-stored in \fBvar2\fR. 
-.RE
-.IP \fBi\fR 5
-The data is interpreted as \fIcount\fR 32-bit signed integers
-represented in little-endian byte order.  The integers are stored in
-the corresponding variable as a list.  If \fIcount\fR is \fB*\fR, then
-all of the remaining bytes in \fBstring\fR will be scanned.  If
-\fIcount\fR is omitted, then one 32-bit integer will be scanned.  For
-example,
-.RS
-.CS
-\fBbinary scan \\x05\\x00\\x00\\x00\\x07\\x00\\x00\\x00\\xf0\\xff\\xff\\xff i2i* var1 var2\fR
-.CE
-will return \fB2\fR with \fB5 7\fR stored in \fBvar1\fR and \fB-16\fR
-stored in \fBvar2\fR.  Note that the integers returned are signed and
-cannot be represented by Tcl as unsigned values.
-.RE
-.IP \fBI\fR 5
-This form is the same as \fBI\fR except that the data is interpreted
-as \fIcount\fR 32-bit signed integers represented in big-endian byte
-order.  For example,
-.RS
-.CS
-\fBbinary \\x00\\x00\\x00\\x05\\x00\\x00\\x00\\x07\\xff\\xff\\xff\\xf0 I2I* var1 var2\fR
-.CE
-will return \fB2\fR with \fB5 7\fR stored in \fBvar1\fR and \fB-16\fR
-stored in \fBvar2\fR.
-.RE
-.IP \fBf\fR 5
-The data is interpreted as \fIcount\fR single-precision floating point
-numbers in the machine's native representation.  The floating point
-numbers are stored in the corresponding variable as a list.  If
-\fIcount\fR is \fB*\fR, then all of the remaining bytes in
-\fBstring\fR will be scanned.  If \fIcount\fR is omitted, then one
-single-precision floating point number will be scanned.  The size of a
-floating point number may vary across architectures, so the number of
-bytes that are scanned may vary.  If the data does not represent a
-valid floating point number, the resulting value is undefined and
-compiler dependent.  For example, on a Windows system running on an
-Intel Pentium processor,
-.RS
-.CS
-\fBbinary scan \\x3f\\xcc\\xcc\\xcd f var1\fR
-.CE
-will return \fB1\fR with \fB1.6000000238418579\fR stored in
-\fBvar1\fR.
-.RE
-.IP \fBd\fR 5
-This form is the same as \fBf\fR except that the data is interpreted
-as \fIcount\fR double-precision floating point numbers in the
-machine's native representation. For example, on a Windows system
-running on an Intel Pentium processor,
-.RS
-.CS
-\fBbinary scan \\x9a\\x99\\x99\\x99\\x99\\x99\\xf9\\x3f d var1\fR
-.CE
-will return \fB1\fR with \fB1.6000000000000001\fR
-stored in \fBvar1\fR.
-.RE
-.IP \fBx\fR 5
-Moves the cursor forward \fIcount\fR bytes in \fIstring\fR.  If
-\fIcount\fR is \fB*\fR or is larger than the number of bytes after the
-current cursor cursor position, then the cursor is positioned after
-the last byte in \fIstring\fR.  If \fIcount\fR is omitted, then the
-cursor is moved forward one byte.  Note that this type does not
-consume an argument.  For example,
-.RS
-.CS
-\fBbinary scan \\x01\\x02\\x03\\x04 x2H* var1\fR
-.CE
-will return \fB1\fR with \fB0304\fR stored in \fBvar1\fR.
-.RE
-.IP \fBX\fR 5
-Moves the cursor back \fIcount\fR bytes in \fIstring\fR.  If
-\fIcount\fR is \fB*\fR or is larger than the current cursor position,
-then the cursor is positioned at location 0 so that the next byte
-scanned will be the first byte in \fIstring\fR.  If \fIcount\fR
-is omitted then the cursor is moved back one byte.  Note that this
-type does not consume an argument.  For example,
-.RS
-.CS
-\fBbinary scan \\x01\\x02\\x03\\x04 c2XH* var1 var2\fR
-.CE
-will return \fB2\fR with \fB1 2\fR stored in \fBvar1\fR and \fB020304\fR
-stored in \fBvar2\fR.
-.RE
-.IP \fB@\fR 5
-Moves the cursor to the absolute location in the data string specified
-by \fIcount\fR.  Note that position 0 refers to the first byte in
-\fIstring\fR.  If \fIcount\fR refers to a position beyond the end of
-\fIstring\fR, then the cursor is positioned after the last byte.  If
-\fIcount\fR is omitted, then an error will be generated.  For example,
-.RS
-.CS
-\fBbinary scan \\x01\\x02\\x03\\x04 c2@1H* var1 var2\fR
-.CE
-will return \fB2\fR with \fB1 2\fR stored in \fBvar1\fR and \fB020304\fR
-stored in \fBvar2\fR.
-.RE
-
-.SH "PLATFORM ISSUES"
-Sometimes it is desirable to format or scan integer values in the
-native byte order for the machine.  Refer to the \fBbyteOrder\fR
-element of the \fBtcl_platform\fR array to decide which type character
-to use when formatting or scanning integers.
-
-.SH "SEE ALSO"
-format, scan, tclvars
-
-.SH KEYWORDS
-binary, format, scan
diff --git a/doc/break.n b/doc/break.n
deleted file mode 100644
index 86d0d8b..0000000
--- a/doc/break.n
+++ /dev/null
@@ -1,34 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: break.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH break n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-break \- Abort looping command
-.SH SYNOPSIS
-\fBbreak\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is typically invoked inside the body of a looping command
-such as \fBfor\fR or \fBforeach\fR or \fBwhile\fR.
-It returns a TCL_BREAK code, which causes a break exception
-to occur.
-The exception causes the current script to be aborted
-out to the innermost containing loop command, which then
-aborts its execution and returns normally.
-Break exceptions are also handled in a few other situations, such
-as the \fBcatch\fR command, Tk event bindings, and the outermost
-scripts of procedure bodies.
-
-.SH KEYWORDS
-abort, break, loop
diff --git a/doc/case.n b/doc/case.n
deleted file mode 100644
index cf15a94..0000000
--- a/doc/case.n
+++ /dev/null
@@ -1,59 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: case.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH case n 7.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-case \- Evaluate one of several scripts, depending on a given value
-.SH SYNOPSIS
-\fBcase\fI string \fR?\fBin\fR? \fIpatList body \fR?\fIpatList body \fR...?
-.sp
-\fBcase\fI string \fR?\fBin\fR? {\fIpatList body \fR?\fIpatList body \fR...?}
-.BE
-
-.SH DESCRIPTION
-.PP
-\fINote: the \fBcase\fI command is obsolete and is supported only
-for backward compatibility.  At some point in the future it may be
-removed entirely.  You should use the \fBswitch\fI command instead.\fR
-.PP
-The \fBcase\fR command matches \fIstring\fR against each of
-the \fIpatList\fR arguments in order.
-Each \fIpatList\fR argument is a list of one or
-more patterns.  If any of these patterns matches \fIstring\fR then
-\fBcase\fR evaluates the following \fIbody\fR argument
-by passing it recursively to the Tcl interpreter and returns the result
-of that evaluation.
-Each \fIpatList\fR argument consists of a single
-pattern or list of patterns.  Each pattern may contain any of the wild-cards
-described under \fBstring match\fR.  If a \fIpatList\fR
-argument is \fBdefault\fR, the corresponding body will be evaluated
-if no \fIpatList\fR matches \fIstring\fR.  If no \fIpatList\fR argument
-matches \fIstring\fR and no default is given, then the \fBcase\fR
-command returns an empty string.
-.PP
-Two syntaxes are provided for the \fIpatList\fR and \fIbody\fR arguments.
-The first uses a separate argument for each of the patterns and commands;
-this form is convenient if substitutions are desired on some of the
-patterns or commands.
-The second form places all of the patterns and commands together into
-a single argument; the argument must have proper list structure, with
-the elements of the list being the patterns and commands.
-The second form makes it easy to construct multi-line case commands,
-since the braces around the whole list make it unnecessary to include a
-backslash at the end of each line.
-Since the \fIpatList\fR arguments are in braces in the second form,
-no command or variable substitutions are performed on them;  this makes
-the behavior of the second form different than the first form in some
-cases.
-
-.SH KEYWORDS
-case, match, regular expression
diff --git a/doc/catch.n b/doc/catch.n
deleted file mode 100644
index 23771f9..0000000
--- a/doc/catch.n
+++ /dev/null
@@ -1,70 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: catch.n,v 1.3 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH catch n "8.0" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-catch \- Evaluate script and trap exceptional returns
-.SH SYNOPSIS
-\fBcatch\fI script \fR?\fIvarName\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBcatch\fR command may be used to prevent errors from aborting command
-interpretation.  \fBCatch\fR calls the Tcl interpreter recursively to
-execute \fIscript\fR, and always returns without raising an error,
-regardless of any errors that might occur while executing \fIscript\fR.
-.PP
-If \fIscript\fR raises an error, \fBcatch\fR will return a non-zero integer
-value corresponding to one of the exceptional return codes (see tcl.h
-for the definitions of code values).  If the \fIvarName\fR argument is
-given, then the variable it names is set to the error message from
-interpreting \fIscript\fR.
-.PP
-If \fIscript\fR does not raise an error, \fBcatch\fR will return 0
-(TCL_OK) and set the variable to the value returned from \fIscript\fR.
-.PP
-Note that \fBcatch\fR catches all exceptions, including those
-generated by \fBbreak\fR and \fBcontinue\fR as well as errors.  The
-only errors that are not caught are syntax errors found when the
-script is compiled.  This is because the catch command only catches
-errors during runtime.  When the catch statement is compiled, the
-script is compiled as well and any syntax errors will generate a Tcl
-error. 
-
-.SH EXAMPLES
-
-The \fBcatch\fR command may be used in an \fBif\fR to branch based on
-the success of a script.
-
-.DS
-.CS
-if { [catch {open $someFile w} fid] } {
-    puts stderr "Could not open $someFile for writing\\n$fid"
-    exit 1
-}
-.CE
-.DE
-The \fBcatch\fR command will not catch compiled syntax errors.  The
-first time proc \fBfoo\fR is called, the body will be compiled and a
-Tcl error will be generated. 
-
-.DS
-.CS
-proc foo {} {
-    catch {expr {1 +- }}
-}
-.CE
-.DE
-
-.SH KEYWORDS
-catch, error
diff --git a/doc/cd.n b/doc/cd.n
deleted file mode 100644
index a570cdc..0000000
--- a/doc/cd.n
+++ /dev/null
@@ -1,28 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: cd.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH cd n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-cd \- Change working directory
-.SH SYNOPSIS
-\fBcd \fR?\fIdirName\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Change the current working directory to \fIdirName\fR, or to the
-home directory (as specified in the HOME environment variable) if
-\fIdirName\fR is not given.
-Returns an empty string.
-
-.SH KEYWORDS
-working directory
diff --git a/doc/clock.n b/doc/clock.n
deleted file mode 100644
index db8af8a..0000000
--- a/doc/clock.n
+++ /dev/null
@@ -1,188 +0,0 @@
-'\"
-'\" Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
-'\" Copyright (c) 1995-1997 Sun Microsystems, Inc.
-'\"
-'\" This documentation is derived from the time and date facilities of
-'\" TclX, by Mark Diekhans and Karl Lehenbauer.
-'\" 
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: clock.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH clock n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-clock \- Obtain and manipulate time
-.SH SYNOPSIS
-\fBclock \fIoption\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command performs one of several operations that may obtain
-or manipulate strings or values that represent some notion of
-time.  The \fIoption\fR argument determines what action is carried
-out by the command.  The legal \fIoptions\fR (which may be
-abbreviated) are:
-.TP
-\fBclock clicks\fR
-Return a high-resolution time value as a system-dependent integer
-value.  The unit of the value is system-dependent but should be the
-highest resolution clock available on the system such as a CPU cycle
-counter. This value should only be used for the relative measurement
-of elapsed time.
-.TP
-\fBclock format \fIclockValue\fR ?\fB\-format \fIstring\fR? ?\fB\-gmt \fIboolean\fR?
-Converts an integer time value, typically returned by
-\fBclock seconds\fR, \fBclock scan\fR, or the \fBatime\fR, \fBmtime\fR,
-or \fBctime\fR options of the \fBfile\fR command, to human-readable
-form.  If the \fB\-format\fR argument is present the next argument is a
-string that describes how the date and time are to be formatted.
-Field descriptors consist of a \fB%\fR followed by a field
-descriptor character.  All other characters are copied into the result.
-Valid field descriptors are:
-.RS
-.IP \fB%%\fR
-Insert a %.
-.IP \fB%a\fR
-Abbreviated weekday name (Mon, Tue, etc.).
-.IP \fB%A\fR
-Full weekday name (Monday, Tuesday, etc.).
-.IP \fB%b\fR
-Abbreviated month name (Jan, Feb, etc.).
-.IP \fB%B\fR
-Full month name.
-.IP \fB%c\fR
-Locale specific date and time.
-.IP \fB%d\fR
-Day of month (01 - 31).
-.IP \fB%H\fR
-Hour in 24-hour format (00 - 23).
-.IP \fB%I\fR
-Hour in 12-hour format (00 - 12).
-.IP \fB%j\fR
-Day of year (001 - 366).
-.IP \fB%m\fR
-Month number (01 - 12).
-.IP \fB%M\fR
-Minute (00 - 59).
-.IP \fB%p\fR
-AM/PM indicator.
-.IP \fB%S\fR
-Seconds (00 - 59).
-.IP \fB%U\fR
-Week of year (01 - 52), Sunday is the first day of the week.
-.IP \fB%w\fR
-Weekday number (Sunday = 0).
-.IP \fB%W\fR
-Week of year (01 - 52), Monday is the first day of the week.
-.IP \fB%x\fR
-Locale specific date format.
-.IP \fB%X\fR
-Locale specific time format.
-.IP \fB%y\fR
-Year without century (00 - 99).
-.IP \fB%Y\fR
-Year with century (e.g. 1990)
-.IP \fB%Z\fR
-Time zone name.
-.RE
-.sp
-.RS
-In addition, the following field descriptors may be supported on some
-systems (e.g. Unix but not Windows):
-.IP \fB%D\fR
-Date as %m/%d/%y.
-.IP \fB%e\fR
-Day of month (1 - 31), no leading zeros.
-.IP \fB%h\fR
-Abbreviated month name.
-.IP \fB%n\fR
-Insert a newline.
-.IP \fB%r\fR
-Time as %I:%M:%S %p.
-.IP \fB%R\fR
-Time as %H:%M.
-.IP \fB%t\fR
-Insert a tab.
-.IP \fB%T\fR
-Time as %H:%M:%S.
-.RE
-.sp
-.RS
-If the \fB\-format\fR argument is not specified, the format string 
-"\fB%a %b %d %H:%M:%S %Z %Y\fR" is used.  If the \fB\-gmt\fR argument
-is present the next argument must be a boolean which if true specifies
-that the time will be formatted as Greenwich Mean Time. If false
-then the local timezone will be used as defined by the operating
-environment.
-.RE
-.TP
-\fBclock scan \fIdateString\fR ?\fB\-base \fIclockVal\fR? ?\fB\-gmt \fIboolean\fR?
-Convert \fIdateString\fR to an integer clock value (see \fBclock seconds\fR).
-This command can parse and convert virtually any standard date and/or time
-string, which can include standard time zone mnemonics.  If only a time is
-specified, the current date is assumed.  If the string does not contain a
-time zone mnemonic, the local time zone is assumed, unless the \fB\-gmt\fR 
-argument is true, in which case the clock value is calculated assuming
-that the specified time is relative to Greenwich Mean Time.
-.sp
-If the \fB\-base\fR flag is specified, the next argument should contain
-an integer clock value.  Only the date in this value is used, not the
-time.  This is useful for determining the time on a specific day or
-doing other date-relative conversions.
-.sp
-The \fIdateString\fR consists of zero or more specifications of the
-following form:
-.RS
-.TP
-\fItime\fR
-A time of day, which is of the form: \fIhh\fR?\fI:mm\fR?\fI:ss\fR?? 
-?\fImeridian\fR? ?\fIzone\fR? or \fIhhmm \fR?\fImeridian\fR? 
-?\fIzone\fR?. If no meridian is specified, \fIhh\fR is interpreted on
-a 24-hour clock.
-.TP
-\fIdate\fR
-A specific month and day with optional year.  The
-acceptable formats are \fImm/dd\fR?\fI/yy\fR?, \fImonthname dd\fR
-?, \fIyy\fR?, \fIdd monthname \fR?\fIyy\fR? and \fIday, dd monthname
-yy\fR.  The default year is the current year.  If the year is less
-.VS
-than 100, we treat the years 00-68 as 2000-2068 and the years 69-99
-as 1969-1999.  Not all platforms can represent the years 38-70, so
-an error may result if these years are used.
-.VE
-.TP
-\fIrelative time\fR
-A specification relative to the current time.  The format is \fInumber
-unit\fR acceptable units are \fByear\fR, \fBfortnight\fR, \fBmonth\fR, \fBweek\fR, \fBday\fR,
-\fBhour\fR, \fBminute\fR (or \fBmin\fR), and \fBsecond\fR (or \fBsec\fR).  The
-unit can be specified as a singular or plural, as in \fB3 weeks\fR.
-These modifiers may also be specified:
-\fBtomorrow\fR, \fByesterday\fR, \fBtoday\fR, \fBnow\fR,
-\fBlast\fR, \fBthis\fR, \fBnext\fR, \fBago\fR.
-.RE
-.sp
-.RS
-The actual date is calculated according to the following steps.
-First, any absolute date and/or time is processed and converted.
-Using that time as the base, day-of-week specifications are added.
-Next, relative specifications are used.  If a date or day is
-specified, and no absolute or relative time is given, midnight is
-used.  Finally, a correction is applied so that the correct hour of
-the day is produced after allowing for daylight savings time
-differences and the correct date is given when going from the end
-of a long month to a short month.
-.RE
-.TP
-\fBclock seconds\fR
-Return the current date and time as a system-dependent integer value.  The
-unit of the value is seconds, allowing it to be used for relative time
-calculations.  The value is usually defined as total elapsed time from
-an ``epoch''.  You shouldn't assume the value of the epoch.
-
-.SH KEYWORDS
-clock, date, time
diff --git a/doc/close.n b/doc/close.n
deleted file mode 100644
index 2097e04..0000000
--- a/doc/close.n
+++ /dev/null
@@ -1,59 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: close.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH close n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-close \- Close an open channel.
-.SH SYNOPSIS
-\fBclose \fIchannelId\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Closes the channel given by \fIchannelId\fR.  \fIChannelId\fR must be a
-channel identifier such as the return value from a previous \fBopen\fR
-or \fBsocket\fR command.
-All buffered output is flushed to the channel's output device,
-any buffered input is discarded, the underlying file or device is closed,
-and \fIchannelId\fR becomes unavailable for use.
-.VS "" br
-.PP
-If the channel is blocking, the command does not return until all output
-is flushed.
-If the channel is nonblocking and there is unflushed output, the
-channel remains open and the command
-returns immediately; output will be flushed in the background and the
-channel will be closed when all the flushing is complete.
-.VE
-.PP
-If \fIchannelId\fR is a blocking channel for a command pipeline then
-\fBclose\fR waits for the child processes to complete.
-.VS "" br
-.PP
-If the channel is shared between interpreters, then \fBclose\fR
-makes \fIchannelId\fR unavailable in the invoking interpreter but has no
-other effect until all of the sharing interpreters have closed the
-channel.
-When the last interpreter in which the channel is registered invokes
-\fBclose\fR, the cleanup actions described above occur. See the
-\fBinterp\fR command for a description of channel sharing.
-.PP
-Channels are automatically closed when an interpreter is destroyed and
-when the process exits.  Channels are switched to blocking mode, to ensure
-that all output is correctly flushed before the process exits.
-.VE
-.PP
-The command returns an empty string, and may generate an error if
-an error occurs while flushing output.
-
-.SH KEYWORDS
-blocking, channel, close, nonblocking
diff --git a/doc/concat.n b/doc/concat.n
deleted file mode 100644
index a2f9c1e..0000000
--- a/doc/concat.n
+++ /dev/null
@@ -1,40 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: concat.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH concat n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-concat \- Join lists together
-.SH SYNOPSIS
-\fBconcat\fI \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command treats each argument as a list and concatenates them
-into a single list.
-It also eliminates leading and trailing spaces in the \fIarg\fR's
-and adds a single separator space between \fIarg\fR's.
-It permits any number of arguments.  For example,
-the command
-.CS
-\fBconcat a b {c d e} {f {g h}}\fR
-.CE
-will return
-.CS
-\fBa b c d e f {g h}\fR
-.CE
-as its result.
-.PP
-If no \fIarg\fRs are supplied, the result is an empty string.
-
-.SH KEYWORDS
-concatenate, join, lists
diff --git a/doc/continue.n b/doc/continue.n
deleted file mode 100644
index 2faddd1..0000000
--- a/doc/continue.n
+++ /dev/null
@@ -1,34 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: continue.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH continue n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-continue \- Skip to the next iteration of a loop
-.SH SYNOPSIS
-\fBcontinue\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is typically invoked inside the body of a looping command
-such as \fBfor\fR or \fBforeach\fR or \fBwhile\fR.
-It returns a TCL_CONTINUE code, which causes a continue exception
-to occur.
-The exception causes the current script to be aborted
-out to the innermost containing loop command, which then
-continues with the next iteration of the loop.
-Catch exceptions are also handled in a few other situations, such
-as the \fBcatch\fR command and the outermost scripts of procedure
-bodies.
-
-.SH KEYWORDS
-continue, iteration, loop
diff --git a/doc/dde.n b/doc/dde.n
deleted file mode 100644
index c9797a6..0000000
--- a/doc/dde.n
+++ /dev/null
@@ -1,124 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: dde.n,v 1.2 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH dde n 8.1 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-dde \- Execute a Dynamic Data Exchange command
-.SH SYNOPSIS
-.sp
-\fBpackage require dde 1.0\fR
-.sp
-\fBdde \fIservername \fR?\fItopic\fR?
-.sp
-\fBdde ?\-async?\fR \fIcommand service topic \fR?\fIdata\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command allows an application to send Dynamic Data Exchange (DDE)
-command when running under Microsoft Windows. Dynamic Data Exchange is
-a mechanism where applications can exchange raw data. Each DDE
-transaction needs a \fIservice name\fR and a \fItopic\fR. Both the
-\fIservice name\fR and \fItopic\fR are application defined; Tcl uses
-the service name \fBTclEval\fR, while the topic name is the name of the
-interpreter given by \fBdde servername\fR. Other applications have their
-own \fIservice names\fR and \fItopics\fR. For instance, Microsoft Excel
-has the service name \fBExcel\fR.
-.PP
-The only option to the \fBdde\fR command is:
-.TP
-\fB\-async\fR
-Requests asynchronous invocation.  This is valid only for the
-\fBexecute\fR subcommand. Normally, the \fBdde execute\fR subcommand
-waits until the command completes, returning appropriate error
-messages. When the \fB\-async\fR option is used, the command returns
-immediately, and no error information is available.
-.SH "DDE COMMANDS"
-.PP
-The following commands are a subset of the full Dynamic Data Exchange
-set of commands.
-.TP
-\fBdde servername \fR?\fItopic\fR?
-\fBdde servername\fR registers the interpreter as a DDE server with
-the service name TclEval and the topic name specified byt \fItopic\fR.
-If no \fItopic\fR is given, \fBdde servername\fR returns the name
-of the current topic or the empty string if it is not registered as a service.
-.TP
-\fBdde execute \fIservice topic data\fR
-\fBdde execute\fR takes the \fIdata\fR and sends it to the server
-indicated by \fIservice\fR with the topic indicated by
-\fItopic\fR. Typically, \fIservice\fR is the name of an application,
-and \fItopic\fR is a file to work on.  The \fIdata\fR field is given
-to the remote application. Typically, the application treats the
-\fIdata\fR field as a script, and the script is run in the
-application. The command returns an error if the script did not
-run. If the \fB\-async\fR flag was used, the command
-returns immediately with no error.
-.TP
-\fBdde request \fIservice topic item\fR
-\fBdde request\fR is typically used to get the value of something; the
-value of a cell in Microsoft Excel or the text of a selection in
-Microsoft Word. \fIservice\fR is typically the name of an application,
-\fItopic\fR is typically the name of the file, and \fIitem\fR is
-application-specific. The command returns the value of \fIitem\fR as
-defined in the application.
-.TP
-\fBdde services \fIservice topic\fR
-\fBdde services\fR returns a list of service-topic pairs that
-currently exist on the machine. If \fIservice\fR and \fItopic\fR are
-both null strings ({}), then all service-topic pairs currently
-available on the system are returned. If \fIservice\fR is null and
-\fItopic\fR is not, then all services with the specified topic are
-returned. If \fIservice\fR is not null and \fItopic\fR is, all topics
-for a given service are returned. If both are not null, if that
-service-topic pair currently exists, it is returned; otherwise, null
-is returned.
-.TP
-\fBdde eval \fItopic cmd \fR?\fIarg arg ...\fR?
-\fBdde eval\fR evaluates a command and its arguments using the
-interpreter specified by \fItopic\fR. The DDE service must be the
-"TclEval" service.  This command can be used to replace send on Windows.
-.SH "DDE AND TCL"
-A Tcl interpreter always has a service name of "TclEval". Each
-different interp of all running Tcl applications should a unique
-name specified by \fBdde servername\fR. Each interp is available as a
-DDE topic only if the \fBdde servername\fR command was used to set the
-name of the topic for each interp. So a \fBdde services TclEval {}\fR
-command will return a list of service-topic pairs, where each of the
-currently running interps will be a topic.
-.PP
-When Tcl processes a \fBdde execute\fR command, the data for the
-execute is run as a script in the interp named by the topic of the
-\fBdde execute\fR command.
-.PP
-When Tcl processes a \fBdde request\fR command, it returns the value of
-the variable given in the dde command in the context of the interp
-named by the dde topic. Tcl reserves the variable "$TCLEVAL$EXECUTE$RESULT"
-for internal use, and \fBdde request\fR commands for that variable
-will give unpredictable results.
-.PP
-An external application which wishes to run a script in Tcl should have
-that script store its result in a variable, run the \fBdde execute\fR
-command, and the run \fBdde request\fR to get the value of the
-variable.
-.PP
-When using DDE, be careful to ensure that the event queue is flushed
-using either \fBupdate\fR or \fBvwait\fR.  This happens by default
-when using \fBwish\fR unless a blocking command is called (such as \fBexec\fR
-without adding the \fB&\fR to place the process in the background).
-If for any reason the event queue is not flushed, DDE commands may
-hang until the event queue is flushed.  This can create a deadlock
-situation.
-.SH KEYWORDS
-application, dde, name, remote execution
-.SH "SEE ALSO"
-tk, winfo, send
-
diff --git a/doc/encoding.n b/doc/encoding.n
deleted file mode 100644
index fc6d4f7..0000000
--- a/doc/encoding.n
+++ /dev/null
@@ -1,79 +0,0 @@
-'\"
-'\" Copyright (c) 1998 by Scriptics Corporation.
-'\" 
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: encoding.n,v 1.2 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH encoding n "8.1" Tcl "Tcl Built-In Commands"
-.BS
-.SH NAME
-encoding \- Manipulate encodings
-.SH SYNOPSIS
-\fBencoding \fIoption\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH INTRODUCTION
-.PP
-Strings in Tcl are encoded using 16-bit Unicode characters.  Different
-operating system interfaces or applications may generate strings in
-other encodings such as Shift-JIS.  The \fBencoding\fR command helps
-to bridge the gap between Unicode and these other formats.
-
-.SH DESCRIPTION
-.PP
-Performs one of several encoding related operations, depending on
-\fIoption\fR.  The legal \fIoption\fRs are:
-.TP
-\fBencoding convertfrom ?\fIencoding\fR? \fIdata\fR
-Convert \fIdata\fR to Unicode from the specified \fIencoding\fR.  The
-characters in \fIdata\fR are treated as binary data where the lower
-8-bits of each character is taken as a single byte.  The resulting
-sequence of bytes is treated as a string in the specified
-\fIencoding\fR.  If \fIencoding\fR is not specified, the current
-system encoding is used.
-.TP
-\fBencoding convertto ?\fIencoding\fR? \fIstring\fR
-Convert \fIstring\fR from Unicode to the specified \fIencoding\fR.
-The result is a sequence of bytes that represents the converted
-string.  Each byte is stored in the lower 8-bits of a Unicode
-character.  If \fIencoding\fR is not specified, the current
-system encoding is used.
-.TP
-\fBencoding names\fR
-Returns a list containing the names of all of the encodings that are
-currently available. 
-.TP
-\fBencoding system\fR ?\fIencoding\fR?
-Set the system encoding to \fIencoding\fR. If \fIencoding\fR is
-omitted then the command returns the current system encoding.  The
-system encoding is used whenever Tcl passes strings to system calls.
-
-.SH EXAMPLE
-.PP
-It is common practice to write script files using a text editor that
-produces output in the euc-jp encoding, which represents the ASCII
-characters as singe bytes and Japanese characters as two bytes.  This
-makes it easy to embed literal strings that correspond to non-ASCII
-characters by simply typing the strings in place in the script.
-However, because the \fBsource\fR command always reads files using the
-ISO8859-1 encoding, Tcl will treat each byte in the file as a separate
-character that maps to the 00 page in Unicode.  The
-resulting Tcl strings will not contain the expected Japanese
-characters.  Instead, they will contain a sequence of Latin-1
-characters that correspond to the bytes of the original string.  The
-\fBencoding\fR command can be used to convert this string to the
-expected Japanese Unicode characters.  For example,
-.CS
-	set s [encoding convertfrom euc-jp "\\xA4\\xCF"]
-.CE
-would return the Unicode string "\\u306F", which is the Hiragana
-letter HA.
-
-.SH "SEE ALSO"
-Tcl_GetEncoding
-
-.SH KEYWORDS
-encoding
diff --git a/doc/eof.n b/doc/eof.n
deleted file mode 100644
index a9f97c9..0000000
--- a/doc/eof.n
+++ /dev/null
@@ -1,27 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: eof.n,v 1.2 1998/09/14 18:39:51 stanton Exp $
-'\" 
-.so man.macros
-.TH eof n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-eof \- Check for end of file condition on channel
-.SH SYNOPSIS
-\fBeof \fIchannelId\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns 1 if an end of file condition occurred during the most
-recent input operation on \fIchannelId\fR (such as \fBgets\fR),
-0 otherwise.
-
-.SH KEYWORDS
-channel, end of file
diff --git a/doc/error.n b/doc/error.n
deleted file mode 100644
index 347e26e..0000000
--- a/doc/error.n
+++ /dev/null
@@ -1,58 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: error.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH error n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-error \- Generate an error
-.SH SYNOPSIS
-\fBerror \fImessage\fR ?\fIinfo\fR? ?\fIcode\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns a TCL_ERROR code, which causes command interpretation to be
-unwound.  \fIMessage\fR is a string that is returned to the application
-to indicate what went wrong.
-.PP
-If the \fIinfo\fR argument is provided and is non-empty,
-it is used to initialize the global variable \fBerrorInfo\fR.
-\fBerrorInfo\fR is used to accumulate a stack trace of what
-was in progress when an error occurred; as nested commands unwind,
-the Tcl interpreter adds information to \fBerrorInfo\fR.  If the
-\fIinfo\fR argument is present, it is used to initialize
-\fBerrorInfo\fR and the first increment of unwind information
-will not be added by the Tcl interpreter.  In other
-words, the command containing the \fBerror\fR command will not appear
-in \fBerrorInfo\fR; in its place will be \fIinfo\fR.
-This feature is most useful in conjunction with the \fBcatch\fR command:
-if a caught error cannot be handled successfully, \fIinfo\fR can be used
-to return a stack trace reflecting the original point of occurrence
-of the error:
-.CS
-\fBcatch {...} errMsg
-set savedInfo $errorInfo
-\&...
-error $errMsg $savedInfo\fR
-.CE
-.PP
-If the \fIcode\fR argument is present, then its value is stored
-in the \fBerrorCode\fR global variable.  This variable is intended
-to hold a machine-readable description of the error in cases where
-such information is available; see the \fBtclvars\fR manual
-page for information on the proper format for the variable.
-If the \fIcode\fR argument is not
-present, then \fBerrorCode\fR is automatically reset to
-``NONE'' by the Tcl interpreter as part of processing the
-error generated by the command.
-
-.SH KEYWORDS
-error, errorCode, errorInfo
diff --git a/doc/eval.n b/doc/eval.n
deleted file mode 100644
index 698b28e..0000000
--- a/doc/eval.n
+++ /dev/null
@@ -1,30 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: eval.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH eval n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-eval \- Evaluate a Tcl script
-.SH SYNOPSIS
-\fBeval \fIarg \fR?\fIarg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBEval\fR takes one or more arguments, which together comprise a Tcl
-script containing one or more commands.
-\fBEval\fR concatenates all its arguments in the same
-fashion as the \fBconcat\fR command, passes the concatenated string to the
-Tcl interpreter recursively, and returns the result of that
-evaluation (or any error generated by it).
-
-.SH KEYWORDS
-concatenate, evaluate, script
diff --git a/doc/exec.n b/doc/exec.n
deleted file mode 100644
index f30f6b0..0000000
--- a/doc/exec.n
+++ /dev/null
@@ -1,358 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: exec.n,v 1.3 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH exec n 7.6 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-exec \- Invoke subprocess(es)
-.SH SYNOPSIS
-\fBexec \fR?\fIswitches\fR? \fIarg \fR?\fIarg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command treats its arguments as the specification
-of one or more subprocesses to execute.
-The arguments take the form of a standard shell pipeline
-where each \fIarg\fR becomes one word of a command, and
-each distinct command becomes a subprocess.
-.PP
-If the initial arguments to \fBexec\fR start with \fB\-\fR then
-they are treated as command-line switches and are not part
-of the pipeline specification.  The following switches are
-currently supported:
-.TP 13
-\fB\-keepnewline\fR
-Retains a trailing newline in the pipeline's output.
-Normally a trailing newline will be deleted.
-.TP 13
-\fB\-\|\-\fR
-Marks the end of switches.  The argument following this one will
-be treated as the first \fIarg\fR even if it starts with a \fB\-\fR.
-.PP
-If an \fIarg\fR (or pair of \fIarg\fR's) has one of the forms
-described below then it is used by \fBexec\fR to control the
-flow of input and output among the subprocess(es).
-Such arguments will not be passed to the subprocess(es).  In forms
-such as ``< \fIfileName\fR'' \fIfileName\fR may either be in a
-separate argument from ``<'' or in the same argument with no
-intervening space (i.e. ``<\fIfileName\fR'').
-.TP 15
-|
-Separates distinct commands in the pipeline.  The standard output
-of the preceding command will be piped into the standard input
-of the next command.
-.TP 15
-|&
-Separates distinct commands in the pipeline.  Both standard output
-and standard error of the preceding command will be piped into
-the standard input of the next command.
-This form of redirection overrides forms such as 2> and >&.
-.TP 15
-<\0\fIfileName\fR
-The file named by \fIfileName\fR is opened and used as the standard
-input for the first command in the pipeline.
-.TP 15
-<@\0\fIfileId\fR
-\fIFileId\fR must be the identifier for an open file, such as the return
-value from a previous call to \fBopen\fR.
-It is used as the standard input for the first command in the pipeline.
-\fIFileId\fR must have been opened for reading.
-.TP 15
-<<\0\fIvalue\fR
-\fIValue\fR is passed to the first command as its standard input.
-.TP 15
->\0\fIfileName\fR
-Standard output from the last command is redirected to the file named
-\fIfileName\fR, overwriting its previous contents.
-.TP 15
-2>\0\fIfileName\fR
-Standard error from all commands in the pipeline is redirected to the
-file named \fIfileName\fR, overwriting its previous contents.
-.TP 15
->&\0\fIfileName\fR
-Both standard output from the last command and standard error from all
-commands are redirected to the file named \fIfileName\fR, overwriting
-its previous contents.
-.TP 15
->>\0\fIfileName\fR
-Standard output from the last command is
-redirected to the file named \fIfileName\fR, appending to it rather
-than overwriting it.
-.TP 15
-2>>\0\fIfileName\fR
-Standard error from all commands in the pipeline is
-redirected to the file named \fIfileName\fR, appending to it rather
-than overwriting it.
-.TP 15
->>&\0\fIfileName\fR
-Both standard output from the last command and standard error from
-all commands are redirected to the file named \fIfileName\fR,
-appending to it rather than overwriting it.
-.TP 15
->@\0\fIfileId\fR
-\fIFileId\fR must be the identifier for an open file, such as the return
-value from a previous call to \fBopen\fR.
-Standard output from the last command is redirected to \fIfileId\fR's
-file, which must have been opened for writing.
-.TP 15
-2>@\0\fIfileId\fR
-\fIFileId\fR must be the identifier for an open file, such as the return
-value from a previous call to \fBopen\fR.
-Standard error from all commands in the pipeline is
-redirected to \fIfileId\fR's file.
-The file must have been opened for writing.
-.TP 15
->&@\0\fIfileId\fR
-\fIFileId\fR must be the identifier for an open file, such as the return
-value from a previous call to \fBopen\fR.
-Both standard output from the last command and standard error from
-all commands are redirected to \fIfileId\fR's file.
-The file must have been opened for writing.
-.PP
-If standard output has not been redirected then the \fBexec\fR
-command returns the standard output from the last command
-in the pipeline.
-If any of the commands in the pipeline exit abnormally or
-are killed or suspended, then \fBexec\fR will return an error
-and the error message will include the pipeline's output followed by
-error messages describing the abnormal terminations; the
-\fBerrorCode\fR variable will contain additional information
-about the last abnormal termination encountered.
-If any of the commands writes to its standard error file and that
-standard error isn't redirected,
-then \fBexec\fR will return an error;  the error message
-will include the pipeline's standard output, followed by messages
-about abnormal terminations (if any), followed by the standard error
-output.
-.PP
-If the last character of the result or error message
-is a newline then that character is normally deleted
-from the result or error message.
-This is consistent with other Tcl return values, which don't
-normally end with newlines.
-However, if \fB\-keepnewline\fR is specified then the trailing
-newline is retained.
-.PP
-If standard input isn't redirected with ``<'' or ``<<''
-or ``<@'' then the standard input for the first command in the
-pipeline is taken from the application's current standard input.
-.PP
-If the last \fIarg\fR is ``&'' then the pipeline will be
-executed in background.
-In this case the \fBexec\fR command will return a list whose
-elements are the process identifiers for all of the subprocesses
-in the pipeline.
-The standard output from the last command in the pipeline will
-go to the application's standard output if it hasn't been
-redirected, and error output from all of
-the commands in the pipeline will go to the application's
-standard error file unless redirected.
-.PP
-The first word in each command is taken as the command name;
-tilde-substitution is performed on it, and if the result contains
-no slashes then the directories
-in the PATH environment variable are searched for
-an executable by the given name.
-If the name contains a slash then it must refer to an executable
-reachable from the current directory.
-No ``glob'' expansion or other shell-like substitutions
-are performed on the arguments to commands.
-
-.VS
-.SH "PORTABILITY ISSUES"
-.TP
-\fBWindows\fR (all versions)
-.
-Reading from or writing to a socket, using the ``\fB@\0\fIfileId\fR''
-notation, does not work.  When reading from a socket, a 16-bit DOS
-application will hang and a 32-bit application will return immediately with
-end-of-file.  When either type of application writes to a socket, the
-information is instead sent to the console, if one is present, or is
-discarded.
-.sp
-The Tk console text widget does not provide real standard IO capabilities.
-Under Tk, when redirecting from standard input, all applications will see an
-immediate end-of-file; information redirected to standard output or standard
-error will be discarded.  
-.sp
-Either forward or backward slashes are accepted as path separators for
-arguments to Tcl commands.  When executing an application, the path name
-specified for the application may also contain forward or backward slashes
-as path separators.  Bear in mind, however, that most Windows applications
-accept arguments with forward slashes only as option delimiters and
-backslashes only in paths.  Any arguments to an application that specify a
-path name with forward slashes will not automatically be converted to use
-the backslash character.  If an argument contains forward slashes as the
-path separator, it may or may not be recognized as a path name, depending on
-the program.  
-.sp
-Additionally, when calling a 16-bit DOS or Windows 3.X application, all path
-names must use the short, cryptic, path format (e.g., using ``applba~1.def''
-instead of ``applbakery.default'').
-.sp
-Two or more forward or backward slashes in a row in a path refer to a
-network path.  For example, a simple concatenation of the root directory
-\fBc:/\fR with a subdirectory \fB/windows/system\fR will yield
-\fBc://windows/system\fR (two slashes together), which refers to the mount
-point called \fBsystem\fR on the machine called \fBwindows\fR (and the
-\fBc:/\fR is ignored), and is not equivalent to \fBc:/windows/system\fR,
-which describes a directory on the current computer.  The \fBfile join\fR
-command should be used to concatenate path components.
-.TP
-\fBWindows NT\fR
-.
-When attempting to execute an application, \fBexec\fR first searches for the
-name as it was specified.  Then, in order, \fB.com\fR, \fB.exe\fR, and \fB.bat\fR 
-are appended to the end of the specified name and it searches for
-the longer name.  If a directory name was not specified as part of the
-application name, the following directories are automatically searched in
-order when attempting to locate the application:
-.sp
-.RS
-.RS
-The directory from which the Tcl executable was loaded.
-.br
-The current directory.
-.br
-The Windows NT 32-bit system directory.
-.br
-The Windows NT 16-bit system directory.
-.br
-The Windows NT home directory.
-.br
-The directories listed in the path.
-.RE
-.sp
-In order to execute the shell builtin commands like \fBdir\fR and \fBcopy\fR,
-the caller must prepend ``\fBcmd.exe /c\0\fR'' to the desired command.  
-.sp
-.RE
-.TP
-\fBWindows 95\fR
-.
-When attempting to execute an application, \fBexec\fR first searches for the
-name as it was specified.  Then, in order, \fB.com\fR, \fB.exe\fR, and \fB.bat\fR
-are appended to the end of the specified name and it searches for
-the longer name.  If a directory name was not specified as part of the
-application name, the following directories are automatically searched in
-order when attempting to locate the application:
-.sp
-.RS
-.RS
-The directory from which the Tcl executable was loaded.
-.br
-The current directory.
-.br
-The Windows 95 system directory.
-.br
-The Windows 95 home directory.
-.br
-The directories listed in the path.
-.RE
-.sp
-In order to execute the shell builtin commands like \fBdir\fR and \fBcopy\fR,
-the caller must prepend ``\fBcommand.com /c\0\fR'' to the desired command.
-.sp
-Once a 16-bit DOS application has read standard input from a console and 
-then quit, all subsequently run 16-bit DOS applications will see the 
-standard input as already closed.  32-bit applications do not have this
-problem and will run correctly, even after a 16-bit DOS application thinks 
-that standard input is closed.  There is no known workaround for this bug
-at this time.
-.sp
-Redirection between the \fBNUL:\fR device and a 16-bit application does not
-always work.  When redirecting from \fBNUL:\fR, some applications may hang,
-others will get an infinite stream of ``0x01'' bytes, and some will actually
-correctly get an immediate end-of-file; the behavior seems to depend upon 
-something compiled into the application itself.  When redirecting greater than
-4K or so to \fBNUL:\fR, some applications will hang.  The above problems do not
-happen with 32-bit applications.  
-.sp
-All DOS 16-bit applications are run synchronously.  All standard input from
-a pipe to a 16-bit DOS application is collected into a temporary file; the
-other end of the pipe must be closed before the 16-bit DOS application
-begins executing.  All standard output or error from a 16-bit DOS
-application to a pipe is collected into temporary files; the application
-must terminate before the temporary files are redirected to the next stage
-of the pipeline.  This is due to a workaround for a Windows 95 bug in the
-implementation of pipes, and is how the standard Windows 95 DOS shell
-handles pipes itself.
-.sp
-Certain applications, such as \fBcommand.com\fR, should not be executed
-interactively.  Applications which directly access the console window,
-rather than reading from their standard input and writing to their standard
-output may fail, hang Tcl, or even hang the system if their own private
-console window is not available to them.
-.RE
-.TP
-\fBWindows 3.X\fR
-.
-When attempting to execute an application, \fBexec\fR first searches for the
-name as it was specified.  Then, in order, \fB.com\fR, \fB.exe\fR, and \fB.bat\fR
-are appended to the end of the specified name and it searches for
-the longer name.  If a directory name was not specified as part of the
-application name, the following directories are automatically searched in
-order when attempting to locate the application:
-.sp
-.RS
-.RS
-The directory from which the Tcl executable was loaded.
-.br
-The current directory.
-.br
-The Windows 3.X system directory.
-.br
-The Windows 3.X home directory.
-.br
-The directories listed in the path.
-.RE
-.sp
-In order to execute the shell builtin commands like \fBdir\fR and \fBcopy\fR,
-the caller must prepend ``\fBcommand.com /c\0\fR'' to the desired command.
-.sp
-16-bit and 32-bit DOS and Windows applications may be executed.  However,
-redirection and piping of standard IO only works with 16-bit DOS
-applications.  32-bit applications always see standard input as already
-closed, and any standard output or error is discarded, no matter where in the
-pipeline the application occurs or what redirection symbols are used by the
-caller.  Additionally, for 16-bit applications, standard error is always
-sent to the same place as standard output; it cannot be redirected to a
-separate location.  In order to achieve pseudo-redirection for 32-bit
-applications, the 32-bit application must instead be written to take command
-line arguments that specify the files that it should read from and write to
-and open those files itself.  
-.sp
-All applications, both 16-bit and 32-bit, run synchronously; each application
-runs to completion before the next one in the pipeline starts.  Temporary files
-are used to simulate piping between applications.  The \fBexec\fR
-command cannot be used to start an application in the background.
-.sp
-When standard input is redirected from an open file using the
-``\fB@\0\fIfileId\fR'' notation, the open file is completely read up to its
-end.  This is slightly different than under Windows 95 or NT, where the child
-application consumes from the open file only as much as it wants.
-Redirecting to an open file is supported as normal.
-.RE
-.TP
-\fBMacintosh\fR
-The \fBexec\fR command is not implemented and does not exist under Macintosh.
-.TP
-\fBUnix\fR\0\0\0\0\0\0\0
-The \fBexec\fR command is fully functional and works as described.
-
-.SH "SEE ALSO"
-open(n)
-.VE
-
-.SH KEYWORDS
-execute, pipeline, redirection, subprocess
-
diff --git a/doc/exit.n b/doc/exit.n
deleted file mode 100644
index d3960f0..0000000
--- a/doc/exit.n
+++ /dev/null
@@ -1,28 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: exit.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH exit n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-exit \- End the application
-.SH SYNOPSIS
-\fBexit \fR?\fIreturnCode\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Terminate the process, returning \fIreturnCode\fR to the
-system as the exit status.
-If \fIreturnCode\fR isn't specified then it defaults
-to 0.
-
-.SH KEYWORDS
-exit, process
diff --git a/doc/expr.n b/doc/expr.n
deleted file mode 100644
index 25f6ad6..0000000
--- a/doc/expr.n
+++ /dev/null
@@ -1,323 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: expr.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH expr n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-expr \- Evaluate an expression
-.SH SYNOPSIS
-\fBexpr \fIarg \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Concatenates \fIarg\fR's (adding separator spaces between them),
-evaluates the result as a Tcl expression, and returns the value.
-The operators permitted in Tcl expressions are a subset of
-the operators permitted in C expressions, and they have the
-same meaning and precedence as the corresponding C operators.
-Expressions almost always yield numeric results
-(integer or floating-point values).
-For example, the expression
-.CS
-\fBexpr 8.2 + 6\fR
-.CE
-evaluates to 14.2.
-Tcl expressions differ from C expressions in the way that
-operands are specified.  Also, Tcl expressions support
-non-numeric operands and string comparisons.
-.SH OPERANDS
-.PP
-A Tcl expression consists of a combination of operands, operators,
-and parentheses.
-White space may be used between the operands and operators and
-parentheses; it is ignored by the expression's instructions.
-Where possible, operands are interpreted as integer values.
-Integer values may be specified in decimal (the normal case), in octal (if the
-first character of the operand is \fB0\fR), or in hexadecimal (if the first
-two characters of the operand are \fB0x\fR).
-If an operand does not have one of the integer formats given
-above, then it is treated as a floating-point number if that is
-possible.  Floating-point numbers may be specified in any of the
-ways accepted by an ANSI-compliant C compiler (except that the
-\fBf\fR, \fBF\fR, \fBl\fR, and \fBL\fR suffixes will not be permitted in
-most installations).  For example, all of the
-following are valid floating-point numbers:  2.1, 3., 6e4, 7.91e+16.
-If no numeric interpretation is possible, then an operand is left
-as a string (and only a limited set of operators may be applied to
-it).
-.PP
-Operands may be specified in any of the following ways:
-.IP [1]
-As an numeric value, either integer or floating-point.
-.IP [2]
-As a Tcl variable, using standard \fB$\fR notation.
-The variable's value will be used as the operand.
-.IP [3]
-As a string enclosed in double-quotes.
-The expression parser will perform backslash, variable, and
-command substitutions on the information between the quotes,
-and use the resulting value as the operand
-.IP [4]
-As a string enclosed in braces.
-The characters between the open brace and matching close brace
-will be used as the operand without any substitutions.
-.IP [5]
-As a Tcl command enclosed in brackets.
-The command will be executed and its result will be used as
-the operand.
-.IP [6]
-As a mathematical function whose arguments have any of the above
-forms for operands, such as \fBsin($x)\fR.  See below for a list of defined
-functions.
-.LP
-Where substitutions occur above (e.g. inside quoted strings), they
-are performed by the expression's instructions.
-However, an additional layer of substitution may already have
-been performed by the command parser before the expression
-processor was called.
-As discussed below, it is usually best to enclose expressions
-in braces to prevent the command parser from performing substitutions
-on the contents.
-.PP
-For some examples of simple expressions, suppose the variable
-\fBa\fR has the value 3 and
-the variable \fBb\fR has the value 6.
-Then the command on the left side of each of the lines below
-will produce the value on the right side of the line:
-.CS
-.ta 6c
-\fBexpr 3.1 + $a	6.1
-expr 2 + "$a.$b"	5.6
-expr 4*[llength "6 2"]	8
-expr {{word one} < "word $a"}	0\fR
-.CE
-.SH OPERATORS
-.PP
-The valid operators are listed below, grouped in decreasing order
-of precedence:
-.TP 20
-\fB\-\0\0+\0\0~\0\0!\fR
-Unary minus, unary plus, bit-wise NOT, logical NOT.  None of these operands
-may be applied to string operands, and bit-wise NOT may be
-applied only to integers.
-.TP 20
-\fB*\0\0/\0\0%\fR
-Multiply, divide, remainder.  None of these operands may be
-applied to string operands, and remainder may be applied only
-to integers.
-The remainder will always have the same sign as the divisor and
-an absolute value smaller than the divisor.
-.TP 20
-\fB+\0\0\-\fR
-Add and subtract.  Valid for any numeric operands.
-.TP 20
-\fB<<\0\0>>\fR
-Left and right shift.  Valid for integer operands only.
-A right shift always propagates the sign bit.
-.TP 20
-\fB<\0\0>\0\0<=\0\0>=\fR
-Boolean less, greater, less than or equal, and greater than or equal.
-Each operator produces 1 if the condition is true, 0 otherwise.
-These operators may be applied to strings as well as numeric operands,
-in which case string comparison is used.
-.TP 20
-\fB==\0\0!=\fR
-Boolean equal and not equal.  Each operator produces a zero/one result.
-Valid for all operand types.
-.TP 20
-\fB&\fR
-Bit-wise AND.  Valid for integer operands only.
-.TP 20
-\fB^\fR
-Bit-wise exclusive OR.  Valid for integer operands only.
-.TP 20
-\fB|\fR
-Bit-wise OR.  Valid for integer operands only.
-.TP 20
-\fB&&\fR
-Logical AND.  Produces a 1 result if both operands are non-zero,
-0 otherwise.
-Valid for boolean and numeric (integers or floating-point) operands only.
-.TP 20
-\fB||\fR
-Logical OR.  Produces a 0 result if both operands are zero, 1 otherwise.
-Valid for boolean and numeric (integers or floating-point) operands only.
-.TP 20
-\fIx\fB?\fIy\fB:\fIz\fR
-If-then-else, as in C.  If \fIx\fR
-evaluates to non-zero, then the result is the value of \fIy\fR.
-Otherwise the result is the value of \fIz\fR.
-The \fIx\fR operand must have a numeric value.
-.LP
-See the C manual for more details on the results
-produced by each operator.
-All of the binary operators group left-to-right within the same
-precedence level.  For example, the command
-.CS
-\fBexpr 4*2 < 7\fR
-.CE
-returns 0.
-.PP
-The \fB&&\fR, \fB||\fR, and \fB?:\fR operators have ``lazy
-evaluation'', just as in C, 
-which means that operands are not evaluated if they are
-not needed to determine the outcome.  For example, in the command
-.CS
-\fBexpr {$v ? [a] : [b]}\fR
-.CE
-only one of \fB[a]\fR or \fB[b]\fR will actually be evaluated,
-depending on the value of \fB$v\fR.  Note, however, that this is
-only true if the entire expression is enclosed in braces;  otherwise
-the Tcl parser will evaluate both \fB[a]\fR and \fB[b]\fR before
-invoking the \fBexpr\fR command.
-.SH "MATH FUNCTIONS"
-.PP
-Tcl supports the following mathematical functions in expressions:
-.DS
-.ta 3c 6c 9c
-\fBacos\fR	\fBcos\fR	\fBhypot\fR	\fBsinh\fR
-\fBasin\fR	\fBcosh\fR	\fBlog\fR	\fBsqrt\fR
-\fBatan\fR	\fBexp\fR	\fBlog10\fR	\fBtan\fR
-\fBatan2\fR	\fBfloor\fR	\fBpow\fR	\fBtanh\fR
-\fBceil\fR	\fBfmod\fR	\fBsin\fR
-.DE
-Each of these functions invokes the math library function of the same
-name;  see the manual entries for the library functions for details
-on what they do.  Tcl also implements the following functions for
-conversion between integers and floating-point numbers and the
-generation of random numbers:
-.TP
-\fBabs(\fIarg\fB)\fR
-Returns the absolute value of \fIarg\fR.  \fIArg\fR may be either
-integer or floating-point, and the result is returned in the same form.
-.TP
-\fBdouble(\fIarg\fB)\fR
-If \fIarg\fR is a floating value, returns \fIarg\fR, otherwise converts
-\fIarg\fR to floating and returns the converted value.
-.TP
-\fBint(\fIarg\fB)\fR
-If \fIarg\fR is an integer value, returns \fIarg\fR, otherwise converts
-\fIarg\fR to integer by truncation and returns the converted value.
-.TP
-\fBrand()\fR
-Returns a floating point number from zero to just less than one or,
-in mathematical terms, the range [0,1).  The seed comes from the
-internal clock of the machine or may be set manual with the srand
-function.
-.TP
-\fBround(\fIarg\fB)\fR
-If \fIarg\fR is an integer value, returns \fIarg\fR, otherwise converts
-\fIarg\fR to integer by rounding and returns the converted value.
-.TP
-\fBsrand(\fIarg\fB)\fR
-The \fIarg\fR, which must be an integer, is used to reset the seed for
-the random number generator.  Returns the first random number from
-that seed.  Each interpreter has it's own seed.
-.PP
-In addition to these predefined functions, applications may
-define additional functions using \fBTcl_CreateMathFunc\fR().
-.SH "TYPES, OVERFLOW, AND PRECISION"
-.PP
-All internal computations involving integers are done with the C type
-\fIlong\fR, and all internal computations involving floating-point are
-done with the C type \fIdouble\fR.
-When converting a string to floating-point, exponent overflow is
-detected and results in a Tcl error.
-For conversion to integer from string, detection of overflow depends
-on the behavior of some routines in the local C library, so it should
-be regarded as unreliable.
-In any case, integer overflow and underflow are generally not detected
-reliably for intermediate results.  Floating-point overflow and underflow
-are detected to the degree supported by the hardware, which is generally
-pretty reliable.
-.PP
-Conversion among internal representations for integer, floating-point,
-and string operands is done automatically as needed.
-For arithmetic computations, integers are used until some
-floating-point number is introduced, after which floating-point is used.
-For example,
-.CS
-\fBexpr 5 / 4\fR
-.CE
-returns 1, while
-.CS
-\fBexpr 5 / 4.0\fR
-\fBexpr 5 / ( [string length "abcd"] + 0.0 )\fR
-.CE
-both return 1.25.
-Floating-point values are always returned with a ``\fB.\fR''
-or an \fBe\fR so that they will not look like integer values.  For
-example,
-.CS
-\fBexpr 20.0/5.0\fR
-.CE
-returns \fB4.0\fR, not \fB4\fR.
-
-.SH "STRING OPERATIONS"
-.PP
-String values may be used as operands of the comparison operators,
-although the expression evaluator tries to do comparisons as integer
-or floating-point when it can.
-If one of the operands of a comparison is a string and the other
-has a numeric value, the numeric operand is converted back to
-a string using the C \fIsprintf\fR format specifier
-\fB%d\fR for integers and \fB%g\fR for floating-point values.
-For example, the commands
-.CS
-\fBexpr {"0x03" > "2"}\fR
-\fBexpr {"0y" < "0x12"}\fR
-.CE
-both return 1.  The first comparison is done using integer
-comparison, and the second is done using string comparison after
-the second operand is converted to the string \fB18\fR.
-Because of Tcl's tendency to treat values as numbers whenever
-possible, it isn't generally a good idea to use operators like \fB==\fR
-when you really want string comparison and the values of the
-operands could be arbitrary;  it's better in these cases to use the
-\fBstring compare\fR command instead.
-
-.SH "PERFORMANCE CONSIDERATIONS"
-.VS
-.PP
-Enclose expressions in braces for the best speed and the smallest
-storage requirements.
-This allows the Tcl bytecode compiler to generate the best code.
-.PP
-As mentioned above, expressions are substituted twice:
-once by the Tcl parser and once by the \fBexpr\fR command.
-For example, the commands
-.CS
-\fBset a 3\fR
-\fBset b {$a + 2}\fR
-\fBexpr $b*4\fR
-.CE
-return 11, not a multiple of 4.
-This is because the Tcl parser will first substitute \fB$a + 2\fR for
-the variable \fBb\fR,
-then the \fBexpr\fR command will evaluate the expression \fB$a + 2*4\fR.
-.PP
-Most expressions do not require a second round of substitutions.
-Either they are enclosed in braces or, if not,
-their variable and command substitutions yield numbers or strings
-that don't themselves require substitutions.
-However, because a few unbraced expressions 
-need two rounds of substitutions,
-the bytecode compiler must emit
-additional instructions to handle this situation.
-The most expensive code is required for
-unbraced expressions that contain command substitutions.
-These expressions must be implemented by generating new code
-each time the expression is executed.
-.VE
-
-.SH KEYWORDS
-arithmetic, boolean, compare, expression, fuzzy comparison
diff --git a/doc/fblocked.n b/doc/fblocked.n
deleted file mode 100644
index 3481c7d..0000000
--- a/doc/fblocked.n
+++ /dev/null
@@ -1,32 +0,0 @@
-'\" 
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: fblocked.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-.so man.macros
-.TH fblocked n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-fblocked \- Test whether the last input operation exhausted all available input
-.SH SYNOPSIS
-\fBfblocked \fIchannelId\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBfblocked\fR command returns 1 if the most recent input operation
-on \fIchannelId\fR returned less information than requested because all
-available input was exhausted.
-For example, if \fBgets\fR is invoked when there are only three
-characters available for input and no end-of-line sequence, \fBgets\fR
-returns an empty string and a subsequent call to \fBfblocked\fR will
-return 1.
-.PP
-.SH "SEE ALSO"
-gets(n), read(n)
-
-.SH KEYWORDS
-blocking, nonblocking
diff --git a/doc/fconfigure.n b/doc/fconfigure.n
deleted file mode 100644
index e2479e8a..0000000
--- a/doc/fconfigure.n
+++ /dev/null
@@ -1,200 +0,0 @@
-'\" 
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: fconfigure.n,v 1.3 1999/04/16 00:46:34 stanton Exp $
-'\"
-.so man.macros
-.TH fconfigure n 8.1 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-fconfigure \- Set and get options on a channel
-.SH SYNOPSIS
-.nf
-\fBfconfigure \fIchannelId\fR
-\fBfconfigure \fIchannelId\fR \fIname\fR
-\fBfconfigure \fIchannelId\fR \fIname value \fR?\fIname value ...\fR?
-.fi
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBfconfigure\fR command sets and retrieves options for channels.
-\fIChannelId\fR identifies the channel for which to set or query an option.
-If no \fIname\fR or \fIvalue\fR arguments are supplied, the command
-returns a list containing alternating option names and values for the channel.
-If \fIname\fR is supplied but no \fIvalue\fR then the command returns
-the current value of the given option.
-If one or more pairs of \fIname\fR and \fIvalue\fR are supplied, the
-command sets each of the named options to the corresponding \fIvalue\fR;
-in this case the return value is an empty string.
-.PP
-The options described below are supported for all channels. In addition,
-each channel type may add options that only it supports. See the manual
-entry for the command that creates each type of channels for the options
-that that specific type of channel supports. For example, see the manual
-entry for the \fBsocket\fR command for its additional options.
-.TP
-\fB\-blocking\fR \fIboolean\fR
-The \fB\-blocking\fR option determines whether I/O operations on the
-channel can cause the process to block indefinitely.
-The value of the option must be a proper boolean value.
-Channels are normally in blocking mode;  if a channel is placed into
-nonblocking mode it will affect the operation of the \fBgets\fR,
-\fBread\fR, \fBputs\fR, \fBflush\fR, and \fBclose\fR commands;
-see the documentation for those commands for details.
-For nonblocking mode to work correctly, the application must be
-using the Tcl event loop (e.g. by calling \fBTcl_DoOneEvent\fR or
-invoking the \fBvwait\fR command).
-.TP
-\fB\-buffering\fR \fInewValue\fR
-.
-If \fInewValue\fR is \fBfull\fR then the I/O system will buffer output
-until its internal buffer is full or until the \fBflush\fR command is
-invoked. If \fInewValue\fR is \fBline\fR, then the I/O system will
-automatically flush output for the channel whenever a newline character
-is output. If \fInewValue\fR is \fBnone\fR, the I/O system will flush
-automatically after every output operation.  The default is for
-\fB\-buffering\fR to be set to \fBfull\fR except for channels that
-connect to terminal-like devices; for these channels the initial setting
-is \fBline\fR.
-.TP
-\fB\-buffersize\fR \fInewSize\fR
-.
-\fINewvalue\fR must be an integer; its value is used to set the size of
-buffers, in bytes, subsequently allocated for this channel to store input
-or output. \fINewvalue\fR must be between ten and one million, allowing
-buffers of ten to one million bytes in size.
-.VS 8.1 br
-.TP
-\fB\-encoding\fR \fIname\fR
-.
-This option is used to specify the encoding of the channel, so that the data
-can be converted to and from Unicode for use in Tcl.  For instance, in
-order for Tcl to read characters from a Japanese file in \fBshiftjis\fR
-and properly process and display the contents, the encoding would be set
-to \fBshiftjis\fR.  Thereafter, when reading from the channel, the bytes in
-the Japanese file would be converted to Unicode as they are read.
-Writing is also supported \- as Tcl strings are written to the channel they
-will automatically be converted to the specified encoding on output.
-.RS
-.PP
-If a file contains pure binary data (for instance, a JPEG image), the
-encoding for the channel should be configured to be \fBbinary\fR.  Tcl
-will then assign no interpretation to the data in the file and simply read or
-write raw bytes.  The Tcl \fBbinary\fR command can be used to manipulate this
-byte-oriented data.
-.PP
-The default encoding for newly opened channels is the same platform- and
-locale-dependent system encoding used for interfacing with the operating
-system.  
-.RE
-.VE
-.TP
-\fB\-eofchar\fR \fIchar\fR
-.TP
-\fB\-eofchar\fR \fB{\fIinChar outChar\fB}\fR
-.
-This option supports DOS file systems that use Control-z (\ex1a) as an
-end of file marker.  If \fIchar\fR is not an empty string, then this
-character signals end-of-file when it is encountered during input.  For
-output, the end-of-file character is output when the channel is closed.
-If \fIchar\fR is the empty string, then there is no special end of file
-character marker.  For read-write channels, a two-element list specifies
-the end of file marker for input and output, respectively.  As a
-convenience, when setting the end-of-file character for a read-write
-channel you can specify a single value that will apply to both reading
-and writing.  When querying the end-of-file character of a read-write
-channel, a two-element list will always be returned.  The default value
-for \fB\-eofchar\fR is the empty string in all cases except for files
-under Windows.  In that case the \fB\-eofchar\fR is Control-z (\ex1a) for
-reading and the empty string for writing.
-.TP
-\fB\-translation\fR \fImode\fR
-.TP
-\fB\-translation\fR \fB{\fIinMode outMode\fB}\fR 
-.
-In Tcl scripts the end of a line is always represented using a single
-newline character (\en).  However, in actual files and devices the end of
-a line may be represented differently on different platforms, or even for
-different devices on the same platform.  For example, under UNIX newlines
-are used in files, whereas carriage-return-linefeed sequences are
-normally used in network connections.  On input (i.e., with \fBgets\fP
-and \fBread\fP) the Tcl I/O system automatically translates the external
-end-of-line representation into newline characters.  Upon output (i.e.,
-with \fBputs\fP), the I/O system translates newlines to the external
-end-of-line representation.  The default translation mode, \fBauto\fP,
-handles all the common cases automatically, but the \fB\-translation\fR
-option provides explicit control over the end of line translations.
-.RS
-.PP
-The value associated with \fB\-translation\fR is a single item for
-read-only and write-only channels.  The value is a two-element list for
-read-write channels; the read translation mode is the first element of
-the list, and the write translation mode is the second element.  As a
-convenience, when setting the translation mode for a read-write channel
-you can specify a single value that will apply to both reading and
-writing.  When querying the translation mode of a read-write channel, a
-two-element list will always be returned.  The following values are
-currently supported:
-.TP
-\fBauto\fR
-.
-As the input translation mode, \fBauto\fR treats any of newline
-(\fBlf\fP), carriage return (\fBcr\fP), or carriage return followed by a
-newline (\fBcrlf\fP) as the end of line representation.  The end of line
-representation can even change from line-to-line, and all cases are
-translated to a newline.  As the output translation mode, \fBauto\fR
-chooses a platform specific representation; for sockets on all platforms
-Tcl chooses \fBcrlf\fR, for all Unix flavors, it chooses \fBlf\fR, for the
-Macintosh platform it chooses \fBcr\fR and for the various flavors of
-Windows it chooses \fBcrlf\fR.  The default setting for
-\fB\-translation\fR is \fBauto\fR for both input and output.
-.VS 8.1 br
-.TP
-\fBbinary\fR 
-.
-No end-of-line translations are performed.  This is nearly identical to
-\fBlf\fP mode, except that in addition \fBbinary\fP mode also sets the
-end-of-file character to the empty string (which disables it) and sets the
-encoding to \fBbinary\fR (which disables encoding filtering).  See the
-description of \fB\-eofchar\fR and \fB\-encoding\fR for more information.
-.VE
-.TP
-\fBcr\fR
-.
-The end of a line in the underlying file or device is represented by a
-single carriage return character.  As the input translation mode,
-\fBcr\fP mode converts carriage returns to newline characters.  As the
-output translation mode, \fBcr\fP mode translates newline characters to
-carriage returns.  This mode is typically used on Macintosh platforms.
-.TP
-\fBcrlf\fR
-.
-The end of a line in the underlying file or device is represented by a
-carriage return character followed by a linefeed character.  As the input
-translation mode, \fBcrlf\fP mode converts carriage-return-linefeed
-sequences to newline characters.  As the output translation mode,
-\fBcrlf\fP mode translates newline characters to carriage-return-linefeed
-sequences.  This mode is typically used on Windows platforms and for
-network connections.
-.TP
-\fBlf\fR
-.
-The end of a line in the underlying file or device is represented by a
-single newline (linefeed) character.  In this mode no translations occur
-during either input or output.  This mode is typically used on UNIX
-platforms.
-.RE
-.PP
-
-.SH "SEE ALSO"
-close(n), flush(n), gets(n), puts(n), read(n), socket(n)
-
-.SH KEYWORDS
-blocking, buffering, carriage return, end of line, flushing, linemode,
-newline, nonblocking, platform, translation, encoding, filter, byte array,
-binary
diff --git a/doc/fcopy.n b/doc/fcopy.n
deleted file mode 100644
index 5261f70..0000000
--- a/doc/fcopy.n
+++ /dev/null
@@ -1,127 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: fcopy.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH fcopy n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-fcopy \- Copy data from one channel to another.
-.SH SYNOPSIS
-\fBfcopy \fIinchan\fR \fIoutchan\fR ?\fB\-size \fIsize\fR? ?\fB\-command \fIcallback\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBfcopy\fP command copies data from one I/O channel, \fIinchan\fR to another I/O channel, \fIoutchan\fR.
-The \fBfcopy\fP command leverages the buffering in the Tcl I/O system to
-avoid extra copies and to avoid buffering too much data in
-main memory when copying large files to slow destinations like
-network sockets.
-.PP
-The \fBfcopy\fP 
-command transfers data from \fIinchan\fR until end of file
-or \fIsize\fP bytes have been 
-transferred. If no \fB\-size\fP argument is given,
-then the copy goes until end of file.
-All the data read from \fIinchan\fR is copied to \fIoutchan\fR.
-Without the \fB\-command\fP option, \fBfcopy\fP blocks until the copy is complete
-and returns the number of bytes written to \fIoutchan\fR.
-.PP
-The \fB\-command\fP argument makes \fBfcopy\fP work in the background.
-In this case it returns immediately and the \fIcallback\fP is invoked
-later when the copy completes.
-The \fIcallback\fP is called with
-one or two additional 
-arguments that indicates how many bytes were written to \fIoutchan\fR.
-If an error occurred during the background copy, the second argument is the
-error string associated with the error.
-With a background copy,
-it is not necessary to put \fIinchan\fR or \fIoutchan\fR into
-non-blocking mode; the \fBfcopy\fP command takes care of that automatically.
-However, it is necessary to enter the event loop by using
-the \fBvwait\fP command or by using Tk.
-.PP
-You are not allowed to do other I/O operations with
-\fIinchan\fR or \fIoutchan\fR during a background fcopy.
-If either \fIinchan\fR or \fIoutchan\fR get closed
-while the copy is in progress, the current copy is stopped
-and the command callback is \fInot\fP made.
-If \fIinchan\fR is closed,
-then all data already queued for \fIoutchan\fR is written out.
-.PP
-Note that \fIinchan\fR can become readable during a background copy.
-You should turn off any \fBfileevent\fP handlers during a background
-copy so those handlers do not interfere with the copy.
-Any I/O attempted by a \fBfileevent\fP handler will get a "channel busy" error.
-.PP
-\fBFcopy\fR translates end-of-line sequences in \fIinchan\fR and \fIoutchan\fR
-according to the \fB\-translation\fR option
-for these channels.
-See the manual entry for \fBfconfigure\fR for details on the
-\fB\-translation\fR option.
-The translations mean that the number of bytes read from \fIinchan\fR
-can be different than the number of bytes written to \fIoutchan\fR.
-Only the number of bytes written to \fIoutchan\fR is reported,
-either as the return value of a synchronous \fBfcopy\fP or
-as the argument to the callback for an asynchronous \fBfcopy\fP.
-
-.SH EXAMPLE
-.PP
-This first example shows how the callback gets
-passed the number of bytes transferred.
-It also uses vwait to put the application into the event loop.
-Of course, this simplified example could be done without the command 
-callback.
-.DS
-proc Cleanup {in out bytes {error {}}} {
-    global total
-    set total $bytes
-    close $in
-    close $out
-    if {[string length $error] != 0} {
-	# error occurred during the copy
-    }
-}
-set in [open $file1]
-set out [socket $server $port]
-fcopy $in $out -command [list Cleanup $in $out]
-vwait total
-
-.DE
-.PP
-The second example copies in chunks and tests for end of file
-in the command callback
-.DS
-proc CopyMore {in out chunk bytes {error {}}} {
-    global total done
-    incr total $bytes
-    if {([string length $error] != 0) || [eof $in] {
-	set done $total
-	close $in
-	close $out
-    } else {
-	fcopy $in $out -command [list CopyMore $in $out $chunk] \\
-	    -size $chunk
-    }
-}
-set in [open $file1]
-set out [socket $server $port]
-set chunk 1024
-set total 0
-fcopy $in $out -command [list CopyMore $in $out $chunk] -size $chunk
-vwait done
-
-.DE
-
-.SH "SEE ALSO"
-eof(n), fblocked(n), fconfigure(n)
-
-.SH KEYWORDS
-blocking, channel, end of line, end of file, nonblocking, read, translation
diff --git a/doc/file.n b/doc/file.n
deleted file mode 100644
index 79644e9..0000000
--- a/doc/file.n
+++ /dev/null
@@ -1,331 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: file.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH file n 7.6 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-file \- Manipulate file names and attributes
-.SH SYNOPSIS
-\fBfile \fIoption\fR \fIname\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command provides several operations on a file's name or attributes.
-\fIName\fR is the name of a file; if it starts with a tilde, then tilde
-substitution is done before executing the command (see the manual entry for
-\fBfilename\fR for details).  \fIOption\fR indicates what to do with the
-file name.  Any unique abbreviation for \fIoption\fR is acceptable.  The
-valid options are:
-.TP
-\fBfile atime \fIname\fR
-.
-Returns a decimal string giving the time at which file \fIname\fR
-was last accessed.  The time is measured in the standard POSIX
-fashion as seconds from a fixed starting time (often January 1, 1970).
-If the file doesn't exist or its access time cannot be queried then an
-error is generated.
-.VS
-.TP
-\fBfile attributes \fIname\fR
-.br
-\fBfile attributes \fIname\fR ?\fBoption\fR?
-.br
-\fBfile attributes \fIname\fR ?\fBoption value option value...\fR?
-.RS
-This subcommand returns or sets platform specific values associated
-with a file. The first form returns a list of the platform specific
-flags and their values. The second form returns the value for the
-specific option. The third form sets one or more of the values. The
-values are as follows:
-.PP
-On Unix, \fB-group\fR gets or sets the group name for the file. A group id can
-be given to the command, but it returns a group name. \fB-owner\fR
-gets or sets the user name of the owner of the file. The command
-returns the owner name, but the numerical id can be passed when
-setting the owner. \fB-permissions\fR sets or retrieves the octal code
-that chmod(1) uses. This command does not support the symbolic
-attributes for chmod(1) at this time.
-.PP
-On Windows, \fB-archive\fR gives the value or sets or clears the
-archive attribute of the file. \fB-hidden\fR gives the value or sets
-or clears the hidden attribute of the file. \fB-longname\fR will
-expand each path element to its long version. This attribute cannot be
-set. \fB-readonly\fR gives the value or sets or clears the readonly
-attribute of the file. \fB-shortname\fR gives a string where every
-path element is replaced with its short (8.3) version of the
-name. This attribute cannot be set. \fB-system\fR gives or sets or
-clears the value of the system attribute of the file.
-.PP
-On Macintosh, \fB-creator\fR gives or sets the Finder creator type of
-the file. \fB-hidden\fR gives or sets or clears the hidden attribute
-of the file. \fB-readonly\fR gives or sets or clears the readonly
-attribute of the file. Note that directories can only be locked if
-File Sharing is turned on. \fB-type\fR gives or sets the Finder file
-type for the file.
-.RE
-.VE
-.PP
-\fBfile copy \fR?\fB\-force\fR? ?\fB\-\|\-\fR? \fIsource\fR \fItarget\fR
-.br
-\fBfile copy \fR?\fB\-force\fR? ?\fB\-\|\-\fR? \fIsource\fR ?\fIsource\fR ...? \fItargetDir\fR
-.RS
-The first form makes a copy of the file or directory \fIsource\fR under
-the pathname \fItarget\fR.  If \fItarget\fR is an existing directory,
-then the second form is used.  The second form makes a copy inside
-\fItargetDir\fR of each \fIsource\fR file listed.  If a directory is
-specified as a \fIsource\fR, then the contents of the directory will be
-recursively copied into \fItargetDir\fR.  Existing files will not be
-overwritten unless the \fB\-force\fR option is specified.  Trying to
-overwrite a non-empty directory, overwrite a directory with a file, or a
-file with a directory will all result in errors even if \fI\-force\fR was
-specified.  Arguments are processed in the order specified, halting at the
-first error, if any.  A \fB\-\|\-\fR marks the end of switches; the argument
-following the \fB\-\|\-\fR will be treated as a \fIsource\fR even if it
-starts with a \fB\-\fR.
-.RE
-.TP
-\fBfile delete \fR?\fB\-force\fR? ?\fB\-\|\-\fR? \fIpathname\fR ?\fIpathname\fR ... ?
-.
-Removes the file or directory specified by each \fIpathname\fR argument.
-Non-empty directories will be removed only if the \fB\-force\fR option is
-specified.  Trying to delete a non-existant file is not considered an
-error.  Trying to delete a read-only file will cause the file to be deleted,
-even if the \fB\-force\fR flags is not specified.  Arguments are processed
-in the order specified, halting at the first error, if any.  A \fB\-\|\-\fR
-marks the end of switches; the argument following the \fB\-\|\-\fR will be
-treated as a \fIpathname\fR even if it starts with a \fB\-\fR.
-.TP
-\fBfile dirname \fIname\fR
-Returns a name comprised of all of the path components in \fIname\fR
-excluding the last element.  If \fIname\fR is a relative file name and
-only contains one path element, then returns ``\fB.\fR'' (or ``\fB:\fR''
-on the Macintosh).  If \fIname\fR refers to a root directory, then the
-root directory is returned.  For example,
-.RS
-.CS
-\fBfile dirname c:/\fR
-.CE
-returns \fBc:/\fR. 
-.PP
-Note that tilde substitution will only be
-performed if it is necessary to complete the command. For example,
-.CS
-\fBfile dirname ~/src/foo.c\fR
-.CE
-returns \fB~/src\fR, whereas
-.CS
-\fBfile dirname ~\fR
-.CE
-returns \fB/home\fR (or something similar).
-.RE
-.TP
-\fBfile executable \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR is executable by the current user,
-\fB0\fR otherwise.  
-.TP
-\fBfile exists \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR exists and the current user has
-search privileges for the directories leading to it, \fB0\fR otherwise.
-.TP
-\fBfile extension \fIname\fR
-.
-Returns all of the characters in \fIname\fR after and including the last
-dot in the last element of \fIname\fR.  If there is no dot in the last
-element of \fIname\fR then returns the empty string.
-.TP
-\fBfile isdirectory \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR is a directory, \fB0\fR otherwise.
-.TP
-\fBfile isfile \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR is a regular file, \fB0\fR otherwise.
-.TP
-\fBfile join \fIname\fR ?\fIname ...\fR?
-.
-Takes one or more file names and combines them, using the correct path
-separator for the current platform.  If a particular \fIname\fR is
-relative, then it will be joined to the previous file name argument.
-Otherwise, any earlier arguments will be discarded, and joining will
-proceed from the current argument.  For example,
-.RS
-.CS
-\fBfile join a b /foo bar\fR
-.CE
-returns \fB/foo/bar\fR.
-.PP
-Note that any of the names can contain separators, and that the result
-is always canonical for the current platform: \fB/\fR for Unix and
-Windows, and \fB:\fR for Macintosh.
-.RE
-.TP
-\fBfile lstat \fIname varName\fR
-.
-Same as \fBstat\fR option (see below) except uses the \fIlstat\fR
-kernel call instead of \fIstat\fR.  This means that if \fIname\fR
-refers to a symbolic link the information returned in \fIvarName\fR
-is for the link rather than the file it refers to.  On systems that
-don't support symbolic links this option behaves exactly the same
-as the \fBstat\fR option.
-.TP
-\fBfile mkdir \fIdir\fR ?\fIdir\fR ...?
-.
-Creates each directory specified.  For each pathname \fIdir\fR specified,
-this command will create all non-existing parent directories as
-well as \fIdir\fR itself.  If an existing directory is specified, then
-no action is taken and no error is returned.  Trying to overwrite an existing
-file with a directory will result in an error.  Arguments are processed in
-the order specified, halting at the first error, if any.
-.TP
-\fBfile mtime \fIname\fR
-.
-Returns a decimal string giving the time at which file \fIname\fR was
-last modified.  The time is measured in the standard POSIX fashion as
-seconds from a fixed starting time (often January 1, 1970).  If the file
-doesn't exist or its modified time cannot be queried then an error is
-generated.
-.VS
-.TP
-\fBfile nativename \fIname\fR
-.
-Returns the platform-specific name of the file. This is useful if the
-filename is needed to pass to a platform-specific call, such as exec
-under Windows or AppleScript on the Macintosh.
-.VE
-.TP
-\fBfile owned \fIname\fR 
-.
-Returns \fB1\fR if file \fIname\fR is owned by the current user, \fB0\fR
-otherwise.
-.TP
-\fBfile pathtype \fIname\fR
-.
-Returns one of \fBabsolute\fR, \fBrelative\fR, \fBvolumerelative\fR.  If
-\fIname\fR refers to a specific file on a specific volume, the path type
-will be \fBabsolute\fR.  If \fIname\fR refers to a file relative to the
-current working directory, then the path type will be \fBrelative\fR.  If
-\fIname\fR refers to a file relative to the current working directory on
-a specified volume, or to a specific file on the current working volume, then
-the file type is \fBvolumerelative\fR.
-.TP
-\fBfile readable \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR is readable by the current user,
-\fB0\fR otherwise. 
-.TP
-\fBfile readlink \fIname\fR
-.
-Returns the value of the symbolic link given by \fIname\fR (i.e. the name
-of the file it points to).  If \fIname\fR isn't a symbolic link or its
-value cannot be read, then an error is returned.  On systems that don't
-support symbolic links this option is undefined.
-.PP
-\fBfile rename \fR?\fB\-force\fR? ?\fB\-\|\-\fR? \fIsource\fR \fItarget\fR
-.br
-\fBfile rename \fR?\fB\-force\fR? ?\fB\-\|\-\fR? \fIsource\fR ?\fIsource\fR ...? \fItargetDir\fR
-.RS
-The first form takes the file or directory specified by pathname
-\fIsource\fR and renames it to \fItarget\fR, moving the file if the
-pathname \fItarget\fR specifies a name in a different directory.  If
-\fItarget\fR is an existing directory, then the second form is used.  The
-second form moves each \fIsource\fR file or directory into the directory
-\fItargetDir\fR.  Existing files will not be overwritten unless the
-\fB\-force\fR option is specified.  Trying to overwrite a non-empty
-directory, overwrite a directory with a file, or a file with a directory
-will all result in errors.  Arguments are processed in the order specified,
-halting at the first error, if any.  A \fB\-\|\-\fR marks the end of
-switches; the argument following the \fB\-\|\-\fR will be treated as a
-\fIsource\fR even if it starts with a \fB\-\fR.
-.RE
-.TP
-\fBfile rootname \fIname\fR
-.
-Returns all of the characters in \fIname\fR up to but not including the
-last ``.'' character in the last component of name.  If the last
-component of \fIname\fR doesn't contain a dot, then returns \fIname\fR.
-.TP
-\fBfile size \fIname\fR
-.
-Returns a decimal string giving the size of file \fIname\fR in bytes.  If
-the file doesn't exist or its size cannot be queried then an error is
-generated.
-.TP
-\fBfile split \fIname\fR
-.
-Returns a list whose elements are the path components in \fIname\fR.  The
-first element of the list will have the same path type as \fIname\fR.
-All other elements will be relative.  Path separators will be discarded
-unless they are needed ensure that an element is unambiguously relative.
-For example, under Unix
-.RS
-.CS
-\fBfile split /foo/~bar/baz\fR
-.CE
-returns \fB/\0\0foo\0\0./~bar\0\0baz\fR to ensure that later commands
-that use the third component do not attempt to perform tilde
-substitution.
-.RE
-.TP
-\fBfile stat  \fIname varName\fR
-.
-Invokes the \fBstat\fR kernel call on \fIname\fR, and uses the variable
-given by \fIvarName\fR to hold information returned from the kernel call.
-\fIVarName\fR is treated as an array variable, and the following elements
-of that variable are set: \fBatime\fR, \fBctime\fR, \fBdev\fR, \fBgid\fR,
-\fBino\fR, \fBmode\fR, \fBmtime\fR, \fBnlink\fR, \fBsize\fR, \fBtype\fR,
-\fBuid\fR.  Each element except \fBtype\fR is a decimal string with the
-value of the corresponding field from the \fBstat\fR return structure;
-see the manual entry for \fBstat\fR for details on the meanings of the
-values.  The \fBtype\fR element gives the type of the file in the same
-form returned by the command \fBfile type\fR.  This command returns an
-empty string.
-.TP
-\fBfile tail \fIname\fR
-.
-Returns all of the characters in \fIname\fR after the last directory
-separator.  If \fIname\fR contains no separators then returns
-\fIname\fR.
-.TP
-\fBfile type \fIname\fR
-.
-Returns a string giving the type of file \fIname\fR, which will be one of
-\fBfile\fR, \fBdirectory\fR, \fBcharacterSpecial\fR, \fBblockSpecial\fR,
-\fBfifo\fR, \fBlink\fR, or \fBsocket\fR.
-.TP
-\fBfile volume\fR
-. 
-Returns the absolute paths to the volumes mounted on the system, as a proper 
-Tcl list.  On the Macintosh, this will be a list of the mounted drives, 
-both local and network.  N.B. if two drives have the same name, they will 
-both appear on the volume list, but there is currently no way, from Tcl, to 
-access any but the first of these drives.  On UNIX, the command will always return 
-"/", since all filesystems are locally mounted.  On Windows, it will return 
-a list of the available local drives (e.g. {a:/ c:/}).
-.TP
-\fBfile writable \fIname\fR
-.
-Returns \fB1\fR if file \fIname\fR is writable by the current user,
-\fB0\fR otherwise.
-.SH "PORTABILITY ISSUES"
-.TP
-\fBUnix\fR\0\0\0\0\0\0\0
-.
-These commands always operate using the real user and group identifiers,
-not the effective ones. 
-
-.SH "SEE ALSO"
-filename
-
-.SH KEYWORDS
-attributes, copy files, delete files, directory, file, move files, name, rename files, stat
diff --git a/doc/fileevent.n b/doc/fileevent.n
deleted file mode 100644
index 99051ee..0000000
--- a/doc/fileevent.n
+++ /dev/null
@@ -1,109 +0,0 @@
-'\"
-'\" Copyright (c) 1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: fileevent.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH fileevent n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-fileevent \- Execute a script when a channel becomes readable or writable
-.SH SYNOPSIS
-\fBfileevent \fIchannelId \fBreadable \fR?\fIscript\fR?
-.sp
-\fBfileevent \fIchannelId \fBwritable \fR?\fIscript\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is used to create \fIfile event handlers\fR.  A file event
-handler is a binding between a channel and a script, such that the script
-is evaluated whenever the channel becomes readable or writable.  File event
-handlers are most commonly used to allow data to be received from another
-process on an event-driven basis, so that the receiver can continue to
-interact with the user while waiting for the data to arrive.  If an
-application invokes \fBgets\fR or \fBread\fR on a blocking channel when
-there is no input data available, the process will block; until the input
-data arrives, it will not be able to service other events, so it will
-appear to the user to ``freeze up''.  With \fBfileevent\fR, the process can
-tell when data is present and only invoke \fBgets\fR or \fBread\fR when
-they won't block.
-.PP
-The \fIchannelId\fR argument to \fBfileevent\fR refers to an open channel,
-such as the return value from a previous \fBopen\fR or \fBsocket\fR
-command.
-If the \fIscript\fR argument is specified, then \fBfileevent\fR
-creates a new event handler:  \fIscript\fR will be evaluated
-whenever the channel becomes readable or writable (depending on the
-second argument to \fBfileevent\fR).
-In this case \fBfileevent\fR returns an empty string.
-The \fBreadable\fR and \fBwritable\fR event handlers for a file
-are independent, and may be created and deleted separately.
-However, there may be at most one \fBreadable\fR and one \fBwritable\fR
-handler for a file at a given time in a given interpreter.
-If \fBfileevent\fR is called when the specified handler already
-exists in the invoking interpreter, the new script replaces the old one.
-.PP
-If the \fIscript\fR argument is not specified, \fBfileevent\fR
-returns the current script for \fIchannelId\fR, or an empty string
-if there is none.
-If the \fIscript\fR argument is specified as an empty string
-then the event handler is deleted, so that no script will be invoked.
-A file event handler is also deleted automatically whenever
-its channel is closed or its interpreter is deleted.
-.PP
-A channel is considered to be readable if there is unread data
-available on the underlying device.
-A channel is also considered to be readable if there is unread
-data in an input buffer, except in the special case where the
-most recent attempt to read from the channel was a \fBgets\fR
-call that could not find a complete line in the input buffer.
-This feature allows a file to be read a line at a time in nonblocking mode
-using events.
-A channel is also considered to be readable if an end of file or
-error condition is present on the underlying file or device.
-It is important for \fIscript\fR to check for these conditions
-and handle them appropriately;  for example, if there is no special
-check for end of file, an infinite loop may occur where \fIscript\fR
-reads no data, returns, and is immediately invoked again.
-.PP
-A channel is considered to be writable if at least one byte of data
-can be written to the underlying file or device without blocking,
-or if an error condition is present on the underlying file or device.
-.PP
-Event-driven I/O works best for channels that have been
-placed into nonblocking mode with the \fBfconfigure\fR command.
-In blocking mode, a \fBputs\fR command may block if you give it
-more data than the underlying file or device can accept, and a
-\fBgets\fR or \fBread\fR command will block if you attempt to read
-more data than is ready;  no events will be processed while the
-commands block.
-In nonblocking mode \fBputs\fR, \fBread\fR, and \fBgets\fR never block.
-See the documentation for the individual commands for information
-on how they handle blocking and nonblocking channels.
-.PP
-The script for a file event is executed at global level (outside the
-context of any Tcl procedure) in the interpreter in which the
-\fBfileevent\fR command was invoked.
-If an error occurs while executing the script then the
-\fBbgerror\fR mechanism is used to report the error.
-In addition, the file event handler is deleted if it ever returns
-an error;  this is done in order to prevent infinite loops due to
-buggy handlers.
-
-.SH CREDITS
-.PP
-\fBfileevent\fR is based on the \fBaddinput\fR command created
-by Mark Diekhans.
-
-.SH "SEE ALSO"
-bgerror, fconfigure, gets, puts, read
-
-.SH KEYWORDS
-asynchronous I/O, blocking, channel, event handler, nonblocking, readable,
-script, writable.
diff --git a/doc/filename.n b/doc/filename.n
deleted file mode 100644
index dd82a86..0000000
--- a/doc/filename.n
+++ /dev/null
@@ -1,197 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: filename.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH filename n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-filename \- File name conventions supported by Tcl commands
-.BE
-.SH INTRODUCTION
-.PP
-All Tcl commands and C procedures that take file names as arguments
-expect the file names to be in one of three forms, depending on the
-current platform.  On each platform, Tcl supports file names in the
-standard forms(s) for that platform.  In addition, on all platforms,
-Tcl supports a Unix-like syntax intended to provide a convenient way
-of constructing simple file names.  However, scripts that are intended
-to be portable should not assume a particular form for file names.
-Instead, portable scripts must use the \fBfile split\fR and \fBfile
-join\fR commands to manipulate file names (see the \fBfile\fR manual
-entry for more details).
-
-.SH PATH TYPES
-.PP
-File names are grouped into three general types based on the starting point
-for the path used to specify the file: absolute, relative, and
-volume-relative.  Absolute names are completely qualified, giving a path to
-the file relative to a particular volume and the root directory on that
-volume.  Relative names are unqualified, giving a path to the file relative 
-to the current working directory.  Volume-relative names are partially
-qualified, either giving the path relative to the root directory on the
-current volume, or relative to the current directory of the specified
-volume.  The \fBfile pathtype\fR command can be used to determine the
-type of a given path.
-
-.SH PATH SYNTAX
-.PP
-The rules for native names depend on the value reported in the Tcl
-array element \fBtcl_platform(platform)\fR:
-.TP 10
-\fBmac\fR
-On Apple Macintosh systems, Tcl supports two forms of path names.  The
-normal Mac style names use colons as path separators.  Paths may be
-relative or absolute, and file names may contain any character other
-than colon.  A leading colon causes the rest of the path to be
-interpreted relative to the current directory.  If a path contains a
-colon that is not at the beginning, then the path is interpreted as an
-absolute path.  Sequences of two or more colons anywhere in the path
-are used to construct relative paths where \fB::\fR refers to the
-parent of the current directory, \fB:::\fR refers to the parent of the
-parent, and so forth.
-.RS
-.PP
-In addition to Macintosh style names, Tcl also supports a subset of
-Unix-like names.  If a path contains no colons, then it is interpreted
-like a Unix path.  Slash is used as the path separator.  The file name
-\fB\&.\fR refers to the current directory, and \fB\&..\fR refers to the
-parent of the current directory.  However, some names like \fB/\fR or
-\fB/..\fR have no mapping, and are interpreted as Macintosh names.  In
-general, commands that generate file names will return Macintosh style
-names, but commands that accept file names will take both Macintosh
-and Unix-style names.
-.PP
-The following examples illustrate various forms of path names:
-.TP 15
-\fB:\fR
-Relative path to the current folder.
-.TP 15
-\fBMyFile\fR
-Relative path to a file named \fBMyFile\fR in the current folder.
-.TP 15
-\fBMyDisk:MyFile\fR
-Absolute path to a file named \fBMyFile\fR on the device named \fBMyDisk\fR.
-.TP 15
-\fB:MyDir:MyFile\fR
-Relative path to a file name \fBMyFile\fR in a folder named
-\fBMyDir\fR in the current folder.
-.TP 15
-\fB::MyFile\fR
-Relative path to a file named \fBMyFile\fR in the folder above the
-current folder.
-.TP 15
-\fB:::MyFile\fR
-Relative path to a file named \fBMyFile\fR in the folder two levels above the
-current folder. 
-.TP 15
-\fB/MyDisk/MyFile\fR
-Absolute path to a file named \fBMyFile\fR on the device named
-\fBMyDisk\fR.
-.TP 15
-\fB\&../MyFile\fR
-Relative path to a file named \fBMyFile\fR in the folder above the
-current folder.
-.RE
-.TP
-\fBunix\fR
-On Unix platforms, Tcl uses path names where the components are
-separated by slashes.  Path names may be relative or absolute, and
-file names may contain any character other than slash.  The file names
-\fB\&.\fR and \fB\&..\fR are special and refer to the current directory
-and the parent of the current directory respectively.  Multiple
-adjacent slash characters are interpreted as a single separator.
-The following examples illustrate various forms of path names:
-.RS
-.TP 15
-\fB/\fR
-Absolute path to the root directory.
-.TP 15
-\fB/etc/passwd\fR
-Absolute path to the file named \fBpasswd\fR in the directory
-\fBetc\fR in the root directory.
-.TP 15
-\fB\&.\fR
-Relative path to the current directory.
-.TP 15
-\fBfoo\fR
-Relative path to the file \fBfoo\fR in the current directory.
-.TP 15
-\fBfoo/bar\fR
-Relative path to the file \fBbar\fR in the directory \fBfoo\fR in the
-current directory.
-.TP 15
-\fB\&../foo\fR
-Relative path to the file \fBfoo\fR in the directory above the current
-directory. 
-.RE
-.TP
-\fBwindows\fR
-On Microsoft Windows platforms, Tcl supports both drive-relative and UNC
-style names.  Both \fB/\fR and \fB\e\fR may be used as directory separators
-in either type of name.  Drive-relative names consist of an optional drive
-specifier followed by an absolute or relative path.  UNC paths follow the
-general form \fB\e\eservername\esharename\epath\efile\fR.  In both forms,
-the file names \fB.\fR and \fB..\fR are special and refer to the current
-directory and the parent of the current directory respectively.  The
-following examples illustrate various forms of path names:
-.RS
-.TP 15
-\fB\&\e\eHost\eshare/file\fR
-Absolute UNC path to a file called \fBfile\fR in the root directory of
-the export point \fBshare\fR on the host \fBHost\fR.
-.TP 15
-\fBc:foo\fR
-Volume-relative path to a file \fBfoo\fR in the current directory on drive
-\fBc\fR.
-.TP 15
-\fBc:/foo\fR
-Absolute path to a file \fBfoo\fR in the root directory of drive
-\fBc\fR.
-.TP 15
-\fBfoo\ebar\fR
-Relative path to a file \fBbar\fR in the \fBfoo\fR directory in the current
-directory on the current volume.
-.TP 15
-\fB\&\efoo\fR
-Volume-relative path to a file \fBfoo\fR in the root directory of the current
-volume.
-.RE
-
-.SH TILDE SUBSTITUTION
-.PP
-In addition to the file name rules described above, Tcl also supports
-\fIcsh\fR-style tilde substitution.  If a file name starts with a
-tilde, then the file name will be interpreted as if the first element
-is replaced with the location of the home directory for the given
-user.  If the tilde is followed immediately by a separator, then the
-\fB$HOME\fR environment variable is substituted.  Otherwise the
-characters between the tilde and the next separator are taken as a
-user name, which is used to retrieve the user's home directory for
-substitution.
-.PP
-The Macintosh and Windows platforms do not support tilde substitution
-when a user name follows the tilde.  On these platforms, attempts to
-use a tilde followed by a user name will generate an error.  File
-names that have a tilde without a user name will be substituted using
-the \fB$HOME\fR environment variable, just like for Unix.
-
-.SH PORTABILITY ISSUES
-.PP
-Not all file systems are case sensitive, so scripts should avoid code
-that depends on the case of characters in a file name.  In addition,
-the character sets allowed on different devices may differ, so scripts
-should choose file names that do not contain special characters like:
-\fB<>:"/\e|\fR.  The safest approach is to use names consisting of
-alphanumeric characters only.  Also Windows 3.1 only supports file
-names with a root of no more than 8 characters and an extension of no
-more than 3 characters.
-
-.SH KEYWORDS
-current directory, absolute file name, relative file name,
-volume-relative file name, portability
diff --git a/doc/flush.n b/doc/flush.n
deleted file mode 100644
index d88ccec..0000000
--- a/doc/flush.n
+++ /dev/null
@@ -1,35 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: flush.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH flush n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-flush \- Flush buffered output for a channel
-.SH SYNOPSIS
-\fBflush \fIchannelId\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Flushes any output that has been buffered for \fIchannelId\fR.
-\fIChannelId\fR must be a channel identifier such as returned by a previous
-\fBopen\fR or \fBsocket\fR command, and it must have been opened for writing.
-If the channel is in blocking mode the command does not return until all the
-buffered output has been flushed to the channel. If the channel is in
-nonblocking mode, the command may return before all buffered output has been
-flushed; the remainder will be flushed in the background as fast as the
-underlying file or device is able to absorb it.
-
-.SH "SEE ALSO"
-open(n), socket(n)
-
-.SH KEYWORDS
-blocking, buffer, channel, flush, nonblocking, output
diff --git a/doc/for.n b/doc/for.n
deleted file mode 100644
index 73abb9f..0000000
--- a/doc/for.n
+++ /dev/null
@@ -1,60 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: for.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH for n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-for \- ``For'' loop
-.SH SYNOPSIS
-\fBfor \fIstart test next body\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBFor\fR is a looping command, similar in structure to the C
-\fBfor\fR statement.  The \fIstart\fR, \fInext\fR, and
-\fIbody\fR arguments must be Tcl command strings, and \fItest\fR
-is an expression string.
-The \fBfor\fR command first invokes the Tcl interpreter to
-execute \fIstart\fR.  Then it repeatedly evaluates \fItest\fR as
-an expression; if the result is non-zero it invokes the Tcl
-interpreter on \fIbody\fR, then invokes the Tcl interpreter on \fInext\fR,
-then repeats the loop.  The command terminates when \fItest\fR evaluates
-to 0.  If a \fBcontinue\fR command is invoked within \fIbody\fR then
-any remaining commands in the current execution of \fIbody\fR are skipped;
-processing continues by invoking the Tcl interpreter on \fInext\fR, then
-evaluating \fItest\fR, and so on.  If a \fBbreak\fR command is invoked
-within \fIbody\fR
-or \fInext\fR,
-then the \fBfor\fR command will
-return immediately.
-The operation of \fBbreak\fR and \fBcontinue\fR are similar to the
-corresponding statements in C.
-\fBFor\fR returns an empty string.
-.PP
-Note: \fItest\fR should almost always be enclosed in braces.  If not,
-variable substitutions will be made before the \fBfor\fR
-command starts executing, which means that variable changes
-made by the loop body will not be considered in the expression.
-This is likely to result in an infinite loop.  If \fItest\fR is
-enclosed in braces, variable substitutions are delayed until the
-expression is evaluated (before
-each loop iteration), so changes in the variables will be visible.
-For an example, try the following script with and without the braces
-around \fB$x<10\fR:
-.CS
-for {set x 0} {$x<10} {incr x} {
-	puts "x is $x"
-}
-.CE
-
-.SH KEYWORDS
-for, iteration, looping
diff --git a/doc/foreach.n b/doc/foreach.n
deleted file mode 100644
index 213a6fc..0000000
--- a/doc/foreach.n
+++ /dev/null
@@ -1,86 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: foreach.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH foreach n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-foreach \- Iterate over all elements in one or more lists
-.SH SYNOPSIS
-\fBforeach \fIvarname list body\fR
-.br
-\fBforeach \fIvarlist1 list1\fR ?\fIvarlist2 list2 ...\fR? \fIbody\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBforeach\fR command implements a loop where the loop
-variable(s) take on values from one or more lists.
-In the simplest case there is one loop variable, \fIvarname\fR,
-and one list, \fIlist\fR, that is a list of values to assign to \fIvarname\fR.
-The \fIbody\fR argument is a Tcl script.
-For each element of \fIlist\fR (in order
-from first to last), \fBforeach\fR assigns the contents of the
-element to \fIvarname\fR as if the \fBlindex\fR command had been used
-to extract the element, then calls the Tcl interpreter to execute
-\fIbody\fR.
-.PP
-In the general case there can be more than one value list
-(e.g., \fIlist1\fR and \fIlist2\fR),
-and each value list can be associated with a list of loop variables
-(e.g., \fIvarlist1\fR and \fIvarlist2\fR).
-During each iteration of the loop
-the variables of each \fIvarlist\fP are assigned
-consecutive values from the corresponding \fIlist\fP.
-Values in each \fIlist\fP are used in order from first to last,
-and each value is used exactly once.
-The total number of loop iterations is large enough to use
-up all the values from all the value lists.
-If a value list does not contain enough
-elements for each of its loop variables in each iteration,
-empty values are used for the missing elements.
-.PP
-The \fBbreak\fR and \fBcontinue\fR statements may be
-invoked inside \fIbody\fR, with the same effect as in the \fBfor\fR
-command.  \fBForeach\fR returns an empty string.
-.SH EXAMPLES
-.PP
-The following loop uses i and j as loop variables to iterate over
-pairs of elements of a single list.
-.DS
-set x {}
-foreach {i j} {a b c d e f} {
-    lappend x $j $i
-}
-# The value of x is "b a d c f e"
-# There are 3 iterations of the loop.
-.DE
-.PP
-The next loop uses i and j to iterate over two lists in parallel.
-.DS
-set x {}
-foreach i {a b c} j {d e f g} {
-    lappend x $i $j
-}
-# The value of x is "a d b e c f {} g"
-# There are 4 iterations of the loop.
-.DE
-.PP
-The two forms are combined in the following example.
-.DS
-set x {}
-foreach i {a b c} {j k} {d e f g} {
-    lappend x $i $j $k
-}
-# The value of x is "a d e b f g c {} {}"
-# There are 3 iterations of the loop.
-.DE
-.SH KEYWORDS
-foreach, iteration, list, looping
diff --git a/doc/format.n b/doc/format.n
deleted file mode 100644
index 9f737e0..0000000
--- a/doc/format.n
+++ /dev/null
@@ -1,214 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: format.n,v 1.3 1999/04/16 00:46:34 stanton Exp $
-'\" 
-.so man.macros
-.TH format n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-format \- Format a string in the style of sprintf
-.SH SYNOPSIS
-\fBformat \fIformatString \fR?\fIarg arg ...\fR?
-.BE
-
-.SH INTRODUCTION
-.PP
-This command generates a formatted string in the same way as the
-ANSI C \fBsprintf\fR procedure (it uses \fBsprintf\fR in its
-implementation).
-\fIFormatString\fR indicates how to format the result, using
-\fB%\fR conversion specifiers as in \fBsprintf\fR, and the additional
-arguments, if any, provide values to be substituted into the result.
-The return value from \fBformat\fR is the formatted string.
-
-.SH "DETAILS ON FORMATTING"
-.PP
-The command operates by scanning \fIformatString\fR from left to right. 
-Each character from the format string is appended to the result
-string unless it is a percent sign.
-If the character is a \fB%\fR then it is not copied to the result string.
-Instead, the characters following the \fB%\fR character are treated as
-a conversion specifier.
-The conversion specifier controls the conversion of the next successive
-\fIarg\fR to a particular format and the result is appended to 
-the result string in place of the conversion specifier.
-If there are multiple conversion specifiers in the format string,
-then each one controls the conversion of one additional \fIarg\fR.
-The \fBformat\fR command must be given enough \fIarg\fRs to meet the needs
-of all of the conversion specifiers in \fIformatString\fR.
-.PP
-Each conversion specifier may contain up to six different parts:
-an XPG3 position specifier,
-a set of flags, a minimum field width, a precision, a length modifier,
-and a conversion character.
-Any of these fields may be omitted except for the conversion character.
-The fields that are present must appear in the order given above.
-The paragraphs below discuss each of these fields in turn.
-.PP
-If the \fB%\fR is followed by a decimal number and a \fB$\fR, as in
-``\fB%2$d\fR'', then the value to convert is not taken from the
-next sequential argument.
-Instead, it is taken from the argument indicated by the number,
-where 1 corresponds to the first \fIarg\fR.
-If the conversion specifier requires multiple arguments because
-of \fB*\fR characters in the specifier then
-successive arguments are used, starting with the argument
-given by the number.
-This follows the XPG3 conventions for positional specifiers.
-If there are any positional specifiers in \fIformatString\fR
-then all of the specifiers must be positional.
-.PP
-The second portion of a conversion specifier may contain any of the
-following flag characters, in any order:
-.TP 10
-\fB\-\fR
-Specifies that the converted argument should be left-justified 
-in its field (numbers are normally right-justified with leading 
-spaces if needed).
-.TP 10
-\fB+\fR
-Specifies that a number should always be printed with a sign, 
-even if positive.
-.TP 10
-\fIspace\fR
-Specifies that a space should be added to the beginning of the 
-number if the first character isn't a sign.
-.TP 10
-\fB0\fR
-Specifies that the number should be padded on the left with 
-zeroes instead of spaces.
-.TP 10
-\fB#\fR
-Requests an alternate output form. For \fBo\fR and \fBO\fR
-conversions it guarantees that the first digit is always \fB0\fR.
-For \fBx\fR or \fBX\fR conversions, \fB0x\fR or \fB0X\fR (respectively)
-will be added to the beginning of the result unless it is zero.
-For all floating-point conversions (\fBe\fR, \fBE\fR, \fBf\fR,
-\fBg\fR, and \fBG\fR) it guarantees that the result always 
-has a decimal point.
-For \fBg\fR and \fBG\fR conversions it specifies that 
-trailing zeroes should not be removed.
-.PP
-The third portion of a conversion specifier is a number giving a
-minimum field width for this conversion.
-It is typically used to make columns line up in tabular printouts.
-If the converted argument contains fewer characters than the
-minimum field width then it will be padded so that it is as wide
-as the minimum field width.
-Padding normally occurs by adding extra spaces on the left of the
-converted argument, but the \fB0\fR and \fB\-\fR flags 
-may be used to specify padding with zeroes on the left or with
-spaces on the right, respectively.
-If the minimum field width is specified as \fB*\fR rather than
-a number, then the next argument to the \fBformat\fR command
-determines the minimum field width; it must be a numeric string.
-.PP
-The fourth portion of a conversion specifier is a precision,
-which consists of a period followed by a number.
-The number is used in different ways for different conversions.
-For \fBe\fR, \fBE\fR, and \fBf\fR conversions it specifies the number
-of digits to appear to the right of the decimal point.
-For \fBg\fR and \fBG\fR conversions it specifies the total number
-of digits to appear, including those on both sides of the decimal
-point (however, trailing zeroes after the decimal point will still
-be omitted unless the \fB#\fR flag has been specified).
-For integer conversions, it specifies a minimum number of digits
-to print (leading zeroes will be added if necessary).
-For \fBs\fR conversions it specifies the maximum number of characters to be 
-printed; if the string is longer than this then the trailing characters will be dropped.
-If the precision is specified with \fB*\fR rather than a number
-then the next argument to the \fBformat\fR command determines the precision;
-it must be a numeric string.
-.PP
-The fifth part of a conversion specifier is a length modifier,
-which must be \fBh\fR or \fBl\fR.
-If it is \fBh\fR it specifies that the numeric value should be
-truncated to a 16-bit value before converting.
-This option is rarely useful.
-The \fBl\fR modifier is ignored.
-.PP
-The last thing in a conversion specifier is an alphabetic character
-that determines what kind of conversion to perform.
-The following conversion characters are currently supported:
-.TP 10
-\fBd\fR
-Convert integer to signed decimal string.
-.TP 10
-\fBu\fR
-Convert integer to unsigned decimal string.
-.TP 10
-\fBi\fR
-Convert integer to signed decimal string;  the integer may either be
-in decimal, in octal (with a leading \fB0\fR) or in hexadecimal
-(with a leading \fB0x\fR).
-.TP 10
-\fBo\fR
-Convert integer to unsigned octal string.
-.TP 10
-\fBx\fR or \fBX\fR
-Convert integer to unsigned hexadecimal string, using digits
-``0123456789abcdef'' for \fBx\fR and ``0123456789ABCDEF'' for \fBX\fR).
-.VS
-.TP 10
-\fBc\fR
-Convert integer to the Unicode character it represents.
-.VE
-.TP 10
-\fBs\fR
-No conversion; just insert string.
-.TP 10
-\fBf\fR
-Convert floating-point number to signed decimal string of 
-the form \fIxx.yyy\fR, where the number of \fIy\fR's is determined by 
-the precision (default: 6).
-If the precision is 0 then no decimal point is output.
-.TP 10
-\fBe\fR or \fBe\fR
-Convert floating-point number to scientific notation in the 
-form \fIx.yyy\fBe\(+-\fIzz\fR, where the number of \fIy\fR's is determined 
-by the precision (default: 6).
-If the precision is 0 then no decimal point is output.
-If the \fBE\fR form is used then \fBE\fR is 
-printed instead of \fBe\fR.
-.TP 10
-\fBg\fR or \fBG\fR
-If the exponent is less than \-4 or greater than or equal to the 
-precision, then convert floating-point number as for \fB%e\fR or 
-\fB%E\fR.
-Otherwise convert as for \fB%f\fR.
-Trailing zeroes and a trailing decimal point are omitted.
-.TP 10
-\fB%\fR
-No conversion: just insert \fB%\fR.
-.LP
-For the numerical conversions the argument being converted must
-be an integer or floating-point string; format converts the argument
-to binary and then converts it back to a string according to 
-the conversion specifier.
-
-.SH "DIFFERENCES FROM ANSI SPRINTF"
-.PP
-The behavior of the format command is the same as the
-ANSI C \fBsprintf\fR procedure except for the following
-differences:
-.IP [1]
-\fB%p\fR and \fB%n\fR specifiers are not currently supported.
-.IP [2]
-For \fB%c\fR conversions the argument must be a decimal string,
-which will then be converted to the corresponding character value.
-.IP [3]
-The \fBl\fR modifier is ignored;  integer values are always converted
-as if there were no modifier present and real values are always
-converted as if the \fBl\fR modifier were present (i.e. type
-\fBdouble\fR is used for the internal representation).
-If the \fBh\fR modifier is specified then integer values are truncated
-to \fBshort\fR before conversion.
-
-.SH KEYWORDS
-conversion specifier, format, sprintf, string, substitution
diff --git a/doc/gets.n b/doc/gets.n
deleted file mode 100644
index 9a1c477..0000000
--- a/doc/gets.n
+++ /dev/null
@@ -1,50 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: gets.n,v 1.2 1998/09/14 18:39:52 stanton Exp $
-'\" 
-.so man.macros
-.TH gets n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-gets \- Read a line from a channel
-.SH SYNOPSIS
-\fBgets \fIchannelId\fR ?\fIvarName\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command reads the next line from \fIchannelId\fR, returns everything
-in the line up to (but not including) the end-of-line character(s), and
-discards the end-of-line character(s).
-If \fIvarName\fR is omitted the line is returned as the result of the
-command.
-If \fIvarName\fR is specified then the line is placed in the variable by
-that name and the return value is a count of the number of characters
-returned.
-.PP
-If end of file occurs while scanning for an end of
-line, the command returns whatever input is available up to the end of file.
-If \fIchannelId\fR is in nonblocking mode and there is not a full
-line of input available, the command returns an empty string and
-does not consume any input.
-If \fIvarName\fR is specified and an empty string is returned in
-\fIvarName\fR because of end-of-file or because of insufficient
-data in nonblocking mode, then the return count is -1.
-Note that if \fIvarName\fR is not specified then the end-of-file
-and no-full-line-available cases can
-produce the same results as if there were an input line consisting
-only of the end-of-line character(s).
-The \fBeof\fR and \fBfblocked\fR commands can be used to distinguish
-these three cases.
-
-.SH "SEE ALSO"
-eof(n), fblocked(n)
-
-.SH KEYWORDS
-blocking, channel, end of file, end of line, line, nonblocking, read
diff --git a/doc/glob.n b/doc/glob.n
deleted file mode 100644
index 47c4e50..0000000
--- a/doc/glob.n
+++ /dev/null
@@ -1,93 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: glob.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH glob n 8.1 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-glob \- Return names of files that match patterns
-.SH SYNOPSIS
-\fBglob \fR?\fIswitches\fR? \fIpattern \fR?\fIpattern ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command performs file name ``globbing'' in a fashion similar to
-the csh shell.  It returns a list of the files whose names match any
-of the \fIpattern\fR arguments.
-.LP
-If the initial arguments to \fBglob\fR start with \fB\-\fR then
-they are treated as switches.  The following switches are
-currently supported:
-.TP 15
-\fB\-nocomplain\fR
-Allows an empty list to be returned without error;  without this
-switch an error is returned if the result list would be empty.
-.TP 15
-\fB\-\|\-\fR
-Marks the end of switches.  The argument following this one will
-be treated as a \fIpattern\fR even if it starts with a \fB\-\fR.
-.PP
-The \fIpattern\fR arguments may contain any of the following
-special characters:
-.TP 10
-\fB?\fR
-Matches any single character.
-.TP 10
-\fB*\fR
-Matches any sequence of zero or more characters.
-.TP 10
-\fB[\fIchars\fB]\fR
-Matches any single character in \fIchars\fR.  If \fIchars\fR
-contains a sequence of the form \fIa\fB\-\fIb\fR then any
-character between \fIa\fR and \fIb\fR (inclusive) will match.
-.TP 10
-\fB\e\fIx\fR
-Matches the character \fIx\fR.
-.TP 10
-\fB{\fIa\fB,\fIb\fB,\fI...\fR}
-Matches any of the strings \fIa\fR, \fIb\fR, etc.
-.LP
-As with csh, a  ``.'' at the beginning of a file's name or just
-after a ``/'' must be matched explicitly or with a {} construct.
-In addition, all ``/'' characters must be matched explicitly.
-.LP
-If the first character in a \fIpattern\fR is ``~'' then it refers
-to the home directory for the user whose name follows the ``~''.
-If the ``~'' is followed immediately by ``/'' then the value of
-the HOME environment variable is used.
-.LP
-The \fBglob\fR command differs from csh globbing in two ways.
-First, it does not sort its result list (use the \fBlsort\fR
-command if you want the list sorted).
-Second, \fBglob\fR only returns the names of files that actually
-exist;  in csh no check for existence is made unless a pattern
-contains a ?, *, or [] construct.
-
-.SH PORTABILITY ISSUES
-.PP
-Unlike other Tcl commands that will accept both network and native
-style names (see the \fBfilename\fR manual entry for details on how
-native and network names are specified), the \fBglob\fR command only
-accepts native names.  
-.VS 8.1
-.TP
-\fBWindows\fR
-.
-For Windows UNC names, the servername and sharename components of the path
-may not contain ?, *, or [] constructs.  On Windows NT, if \fIpattern\fR is
-of the form ``\fB~\fIusername\fB@\fIdomain\fR'' it refers to the home
-directory of the user whose account information resides on the specified NT
-domain server.  Otherwise, user account information is obtained from
-the local computer.  
-.VE
-
-.SH KEYWORDS
-exist, file, glob, pattern
diff --git a/doc/global.n b/doc/global.n
deleted file mode 100644
index 252cbfb..0000000
--- a/doc/global.n
+++ /dev/null
@@ -1,35 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: global.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH global n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-global \- Access global variables
-.SH SYNOPSIS
-\fBglobal \fIvarname \fR?\fIvarname ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is ignored unless a Tcl procedure is being interpreted.
-If so then it declares the given \fIvarname\fR's to be global variables
-rather than local ones.
-Global variables are variables in the global namespace.
-For the duration of the current procedure
-(and only while executing in the current procedure),
-any reference to any of the \fIvarname\fRs
-will refer to the global variable by the same name.
-
-.SH "SEE ALSO"
-namespace(n), variable(n)
-
-.SH KEYWORDS
-global, namespace, procedure, variable
diff --git a/doc/history.n b/doc/history.n
deleted file mode 100644
index 4e0716a..0000000
--- a/doc/history.n
+++ /dev/null
@@ -1,104 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: history.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH history n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-history \- Manipulate the history list
-.SH SYNOPSIS
-\fBhistory \fR?\fIoption\fR? ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBhistory\fR command performs one of several operations related to
-recently-executed commands recorded in a history list.  Each of
-these recorded commands is referred to as an ``event''.  When
-specifying an event to the \fBhistory\fR command, the following
-forms may be used:
-.IP [1]
-A number:  if positive, it refers to the event with
-that number (all events are numbered starting at 1).  If the number
-is negative, it selects an event relative to the current event
-(\fB\-1\fR refers to the previous event, \fB\-2\fR to the one before that, and
-so on).  Event \fB0\fP refers to the current event.
-.IP [2]
-A string:  selects the most recent event that matches the string.
-An event is considered to match the string either if the string is
-the same as the first characters of the event, or if the string
-matches the event in the sense of the \fBstring match\fR command.
-.PP
-The \fBhistory\fR command can take any of the following forms:
-.TP
-\fBhistory\fR
-Same
-as \fBhistory info\fR, described below.
-.TP
-\fBhistory add\fI command \fR?\fBexec\fR?
-Adds the \fIcommand\fR argument to the history list as a new event.  If
-\fBexec\fR is specified (or abbreviated) then the command is also
-executed and its result is returned.  If \fBexec\fR isn't specified
-then an empty string is returned as result.
-.TP
-\fBhistory change\fI newValue\fR ?\fIevent\fR?
-Replaces the value recorded for an event with \fInewValue\fR.  \fIEvent\fR
-specifies the event to replace, and
-defaults to the \fIcurrent\fR event (not event \fB\-1\fR).  This command
-is intended for use in commands that implement new forms of history
-substitution and wish to replace the current event (which invokes the
-substitution) with the command created through substitution.  The return
-value is an empty string.
-.TP
-\fBhistory clear\fR
-Erase the history list.  The current keep limit is retained.
-The history event numbers are reset.
-.TP
-\fBhistory event\fR ?\fIevent\fR?
-Returns the value of the event given by \fIevent\fR.  \fIEvent\fR
-defaults to \fB\-1\fR.
-.TP
-\fBhistory info \fR?\fIcount\fR?
-Returns a formatted string (intended for humans to read) giving
-the event number and contents for each of the events in the history
-list except the current event.  If \fIcount\fR is specified
-then only the most recent \fIcount\fR events are returned.
-.TP
-\fBhistory keep \fR?\fIcount\fR?
-This command may be used to change the size of the history list to
-\fIcount\fR events.  Initially, 20 events are retained in the history
-list.  If \fIcount\fR is not specified, the current keep limit is returned.
-.TP
-\fBhistory nextid\fR
-Returns the number of the next event to be recorded
-in the history list.  It is useful for things like printing the
-event number in command-line prompts.
-.TP
-\fBhistory redo \fR?\fIevent\fR?
-Re-executes the command indicated by \fIevent\fR and return its result.
-\fIEvent\fR defaults to \fB\-1\fR.  This command results in history
-revision:  see below for details.
-.SH "HISTORY REVISION"
-.PP
-Pre-8.0 Tcl had a complex history revision mechanism.
-The current mechanism is more limited, and the old
-history operations \fBsubstitute\fP and \fBwords\fP have been removed.
-(As a consolation, the \fBclear\fP operation was added.)
-.PP
-The history option \fBredo\fR results in much simpler ``history revision''.
-When this option is invoked then the most recent event
-is modified to eliminate the history command and replace it with
-the result of the history command.
-If you want to redo an event without modifying history, then use
-the \fBevent\fP operation to retrieve some event,
-and the \fBadd\fP operation to add it to history and execute it.
-
-.SH KEYWORDS
-event, history, record
diff --git a/doc/http.n b/doc/http.n
deleted file mode 100644
index 7fd61ce..0000000
--- a/doc/http.n
+++ /dev/null
@@ -1,362 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: http.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH "Http" n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Http \- Client-side implementation of the HTTP/1.0 protocol.
-.SH SYNOPSIS
-\fBpackage require http ?2.0?\fP
-.sp
-\fB::http::config \fI?options?\fR
-.sp
-\fB::http::geturl \fIurl ?options?\fR
-.sp
-\fB::http::formatQuery \fIlist\fR
-.sp
-\fB::http::reset \fItoken\fR
-.sp
-\fB::http::wait \fItoken\fR
-.sp
-\fB::http::status \fItoken\fR
-.sp
-\fB::http::size \fItoken\fR
-.sp
-\fB::http::code \fItoken\fR
-.sp
-\fB::http::data \fItoken\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBhttp\fR package provides the client side of the HTTP/1.0
-protocol.  The package implements the GET, POST, and HEAD operations
-of HTTP/1.0.  It allows configuration of a proxy host to get through
-firewalls.  The package is compatible with the \fBSafesock\fR security
-policy, so it can be used by untrusted applets to do URL fetching from
-a restricted set of hosts.
-.PP
-The \fB::http::geturl\fR procedure does a HTTP transaction.
-Its \fIoptions \fR determine whether a GET, POST, or HEAD transaction
-is performed.  
-The return value of \fB::http::geturl\fR is a token for the transaction.
-The value is also the name of an array in the ::http namespace
- that contains state
-information about the transaction.  The elements of this array are
-described in the STATE ARRAY section.
-.PP
-If the \fB-command\fP option is specified, then
-the HTTP operation is done in the background.
-\fB::http::geturl\fR returns immediately after generating the
-HTTP request and the callback is invoked
-when the transaction completes.  For this to work, the Tcl event loop
-must be active.  In Tk applications this is always true.  For pure-Tcl
-applications, the caller can use \fB::http::wait\fR after calling
-\fB::http::geturl\fR to start the event loop.
-.SH COMMANDS
-.TP
-\fB::http::config\fP ?\fIoptions\fR?
-The \fB::http::config\fR command is used to set and query the name of the
-proxy server and port, and the User-Agent name used in the HTTP
-requests.  If no options are specified, then the current configuration
-is returned.  If a single argument is specified, then it should be one
-of the flags described below.  In this case the current value of
-that setting is returned.  Otherwise, the options should be a set of
-flags and values that define the configuration:
-.RS
-.TP
-\fB\-accept\fP \fImimetypes\fP
-The Accept header of the request.  The default is */*, which means that
-all types of documents are accepted.  Otherwise you can supply a 
-comma separated list of mime type patterns that you are
-willing to receive.  For example, "image/gif, image/jpeg, text/*".
-.TP
-\fB\-proxyhost\fP \fIhostname\fP
-The name of the proxy host, if any.  If this value is the
-empty string, the URL host is contacted directly.
-.TP
-\fB\-proxyport\fP \fInumber\fP
-The proxy port number.
-.TP
-\fB\-proxyfilter\fP \fIcommand\fP
-The command is a callback that is made during
-\fB::http::geturl\fR
-to determine if a proxy is required for a given host.  One argument, a
-host name, is added to \fIcommand\fR when it is invoked.  If a proxy
-is required, the callback should return a two element list containing
-the proxy server and proxy port.  Otherwise the filter should return
-an empty list.  The default filter returns the values of the
-\fB\-proxyhost\fR and \fB\-proxyport\fR settings if they are
-non-empty.
-.TP
-\fB\-useragent\fP \fIstring\fP
-The value of the User-Agent header in the HTTP request.  The default
-is \fB"Tcl http client package 2.0."\fR
-.RE
-.TP
-\fB::http::geturl\fP \fIurl\fP ?\fIoptions\fP? 
-The \fB::http::geturl \fR command is the main procedure in the package.
-The \fB\-query\fR option causes a POST operation and
-the \fB\-validate\fR option causes a HEAD operation;
-otherwise, a GET operation is performed.  The \fB::http::geturl\fR command
-returns a \fItoken\fR value that can be used to get
-information about the transaction.  See the STATE ARRAY section for
-details.  The \fB::http::geturl\fR command blocks until the operation
-completes, unless the \fB\-command\fR option specifies a callback
-that is invoked when the HTTP transaction completes.
-\fB::http::geturl\fR takes several options:
-.RS
-.TP
-\fB\-blocksize\fP \fIsize\fP
-The blocksize used when reading the URL.
-At most 
-\fIsize\fR
-bytes are read at once.  After each block, a call to the
-\fB\-progress\fR
-callback is made.
-.TP
-\fB\-channel\fP \fIname\fP
-Copy the URL contents to channel \fIname\fR instead of saving it in
-\fBstate(body)\fR.
-.TP
-\fB\-command\fP \fIcallback\fP
-Invoke \fIcallback\fP after the HTTP transaction completes.
-This option causes \fB::http::geturl\fP to return immediately.
-The \fIcallback\fP gets an additional argument that is the \fItoken\fR returned
-from \fB::http::geturl\fR. This token is the name of an array that is
-described in the STATE ARRAY section.  Here is a template for the
-callback:
-.RS
-.CS
-proc httpCallback {token} {
-    upvar #0 $token state
-    # Access state as a Tcl array
-}
-.CE
-.RE
-.TP
-\fB\-handler\fP \fIcallback\fP
-Invoke \fIcallback\fP whenever HTTP data is available; if present, nothing
-else will be done with the HTTP data.  This procedure gets two additional
-arguments: the socket for the HTTP data and the \fItoken\fR returned from
-\fB::http::geturl\fR.  The token is the name of a global array that is described
-in the STATE ARRAY section.  The procedure is expected to return the number
-of bytes read from the socket.  Here is a template for the callback:
-.RS
-.CS
-proc httpHandlerCallback {socket token} {
-    upvar #0 $token state
-    # Access socket, and state as a Tcl array
-    ...
-    (example: set data [read $socket 1000];set nbytes [string length $data])
-    ...
-    return nbytes
-}
-.CE
-.RE
-.TP
-\fB\-headers\fP \fIkeyvaluelist\fP
-This option is used to add extra headers to the HTTP request.  The
-\fIkeyvaluelist\fR argument must be a list with an even number of
-elements that alternate between keys and values.  The keys become
-header field names.  Newlines are stripped from the values so the
-header cannot be corrupted.  For example, if \fIkeyvaluelist\fR is
-\fBPragma no-cache\fR then the following header is included in the
-HTTP request:
-.CS
-Pragma: no-cache
-.CE
-.TP
-\fB\-progress\fP \fIcallback\fP
-The \fIcallback\fR is made after each transfer of data from the URL.
-The callback gets three additional arguments: the \fItoken\fR from
-\fB::http::geturl\fR, the expected total size of the contents from the
-\fBContent-Length\fR meta-data, and the current number of bytes
-transferred so far.  The expected total size may be unknown, in which
-case zero is passed to the callback.  Here is a template for the
-progress callback:
-.RS
-.CS
-proc httpProgress {token total current} {
-    upvar #0 $token state
-}
-.CE
-.RE
-.TP
-\fB\-query\fP \fIquery\fP
-This flag causes \fB::http::geturl\fR to do a POST request that passes the
-\fIquery\fR to the server. The \fIquery\fR must be a x-url-encoding
-formatted query.  The \fB::http::formatQuery\fR procedure can be used to
-do the formatting.
-.TP
-\fB\-timeout\fP \fImilliseconds\fP
-If \fImilliseconds\fR is non-zero, then \fB::http::geturl\fR sets up a timeout
-to occur after the specified number of milliseconds.
-A timeout results in a call to \fB::http::reset\fP and to
-the \fB-command\fP callback, if specified.
-The return value of \fB::http::status\fP is \fBtimeout\fP
-after a timeout has occurred.
-.TP
-\fB\-validate\fP \fIboolean\fP
-If \fIboolean\fR is non-zero, then \fB::http::geturl\fR does an HTTP HEAD
-request.  This request returns meta information about the URL, but the
-contents are not returned.  The meta information is available in the
-\fBstate(meta) \fR variable after the transaction.  See the STATE
-ARRAY section for details.
-.RE
-.TP
-\fB::http::formatQuery\fP \fIkey value\fP ?\fIkey value\fP ...?
-This procedure does x-url-encoding of query data.  It takes an even
-number of arguments that are the keys and values of the query.  It
-encodes the keys and values, and generates one string that has the
-proper & and = separators.  The result is suitable for the
-\fB\-query\fR value passed to \fB::http::geturl\fR.
-.TP
-\fB::http::reset\fP \fItoken\fP ?\fIwhy\fP?
-This command resets the HTTP transaction identified by \fItoken\fR, if
-any.  This sets the \fBstate(status)\fP value to \fIwhy\fP, which defaults to \fBreset\fR, and then calls the registered \fB\-command\fR callback.
-.TP
-\fB::http::wait\fP \fItoken\fP
-This is a convenience procedure that blocks and waits for the
-transaction to complete.  This only works in trusted code because it
-uses \fBvwait\fR.
-.TP
-\fB::http::data\fP \fItoken\fP
-This is a convenience procedure that returns the \fBbody\fP element
-(i.e., the URL data) of the state array.
-.TP
-\fB::http::status\fP \fItoken\fP
-This is a convenience procedure that returns the \fBstatus\fP element of
-the state array.
-.TP
-\fB::http::code\fP \fItoken\fP
-This is a convenience procedure that returns the \fBhttp\fP element of the
-state array.
-.TP
-\fB::http::size\fP \fItoken\fP
-This is a convenience procedure that returns the \fBcurrentsize\fP
-element of the state array.
-.SH "STATE ARRAY"
-The \fB::http::geturl\fR procedure returns a \fItoken\fR that can be used to
-get to the state of the HTTP transaction in the form of a Tcl array.
-Use this construct to create an easy-to-use array variable:
-.CS
-upvar #0 $token state
-.CE
-Once the data associated with the url is no longer needed, the state
-array should be unset to free up storage.  The following elements of
-the array are supported:
-.RS
-.TP
-\fBbody\fR
-The contents of the URL.  This will be empty if the \fB\-channel\fR
-option has been specified.  This value is returned by the \fB::http::data\fP command.
-.TP
-\fBcurrentsize\fR
-The current number of bytes fetched from the URL.
-This value is returned by the \fB::http::size\fP command.
-.TP
-\fBerror\fR
-If defined, this is the error string seen when the HTTP transaction
-was aborted.
-.TP
-\fBhttp\fR
-The HTTP status reply from the server.  This value
-is returned by the \fB::http::code\fP command.  The format of this value is:
-.RS
-.CS
-\fIcode string\fP
-.CE
-The \fIcode\fR is a three-digit number defined in the HTTP standard.
-A code of 200 is OK.  Codes beginning with 4 or 5 indicate errors.
-Codes beginning with 3 are redirection errors.  In this case the
-\fBLocation\fR meta-data specifies a new URL that contains the
-requested information.
-.RE
-.TP
-\fBmeta\fR
-The HTTP protocol returns meta-data that describes the URL contents.
-The \fBmeta\fR element of the state array is a list of the keys and
-values of the meta-data.  This is in a format useful for initializing
-an array that just contains the meta-data:
-.RS
-.CS
-array set meta $state(meta)
-.CE
-Some of the meta-data keys are listed below, but the HTTP standard defines
-more, and servers are free to add their own.
-.TP
-\fBContent-Type\fR
-The type of the URL contents.  Examples include \fBtext/html\fR,
-\fBimage/gif,\fR \fBapplication/postscript\fR and
-\fBapplication/x-tcl\fR.
-.TP
-\fBContent-Length\fR
-The advertised size of the contents.  The actual size obtained by
-\fB::http::geturl\fR is available as \fBstate(size)\fR.
-.TP
-\fBLocation\fR
-An alternate URL that contains the requested data.
-.RE
-.TP
-\fBstatus\fR
-Either \fBok\fR, for successful completion, \fBreset\fR for
-user-reset, or \fBerror\fR for an error condition.  During the
-transaction this value is the empty string.
-.TP
-\fBtotalsize\fR
-A copy of the \fBContent-Length\fR meta-data value.
-.TP
-\fBtype\fR
-A copy of the \fBContent-Type\fR meta-data value.
-.TP
-\fBurl\fR
-The requested URL.
-.RE
-.SH EXAMPLE
-.DS
-# Copy a URL to a file and print meta-data
-proc ::http::copy { url file {chunk 4096} } {
-    set out [open $file w]
-    set token [geturl $url -channel $out -progress ::http::Progress \\
-	-blocksize $chunk]
-    close $out
-    # This ends the line started by http::Progress
-    puts stderr ""
-    upvar #0 $token state
-    set max 0
-    foreach {name value} $state(meta) {
-	if {[string length $name] > $max} {
-	    set max [string length $name]
-	}
-	if {[regexp -nocase ^location$ $name]} {
-	    # Handle URL redirects
-	    puts stderr "Location:$value"
-	    return [copy [string trim $value] $file $chunk]
-	}
-    }
-    incr max
-    foreach {name value} $state(meta) {
-	puts [format "%-*s %s" $max $name: $value]
-    }
-
-    return $token
-}
-proc ::http::Progress {args} {
-    puts -nonewline stderr . ; flush stderr
-}
-
-.DE
-.SH "SEE ALSO"
-safe(n), socket(n), safesock(n)
-.SH KEYWORDS
-security policy, socket
-
-
diff --git a/doc/if.n b/doc/if.n
deleted file mode 100644
index cebca19..0000000
--- a/doc/if.n
+++ /dev/null
@@ -1,43 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: if.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH if n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-if \- Execute scripts conditionally
-.SH SYNOPSIS
-\fBif \fIexpr1 \fR?\fBthen\fR? \fIbody1 \fBelseif \fIexpr2 \fR?\fBthen\fR? \fIbody2\fR \fBelseif\fR ... ?\fBelse\fR? ?\fIbodyN\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fIif\fR command evaluates \fIexpr1\fR as an expression (in the
-same way that \fBexpr\fR evaluates its argument).  The value of the
-expression must be a boolean
-(a numeric value, where 0 is false and
-anything is true, or a string value such as \fBtrue\fR or \fByes\fR
-for true and \fBfalse\fR or \fBno\fR for false);
-if it is true then \fIbody1\fR is executed by passing it to the
-Tcl interpreter.
-Otherwise \fIexpr2\fR is evaluated as an expression and if it is true
-then \fBbody2\fR is executed, and so on.
-If none of the expressions evaluates to true then \fIbodyN\fR is
-executed.
-The \fBthen\fR and \fBelse\fR arguments are optional
-``noise words'' to make the command easier to read.
-There may be any number of \fBelseif\fR clauses, including zero.
-\fIBodyN\fR may also be omitted as long as \fBelse\fR is omitted too.
-The return value from the command is the result of the body script
-that was executed, or an empty string
-if none of the expressions was non-zero and there was no \fIbodyN\fR.
-
-.SH KEYWORDS
-boolean, conditional, else, false, if, true
diff --git a/doc/incr.n b/doc/incr.n
deleted file mode 100644
index 90c4740..0000000
--- a/doc/incr.n
+++ /dev/null
@@ -1,31 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: incr.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH incr n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-incr \- Increment the value of a variable
-.SH SYNOPSIS
-\fBincr \fIvarName \fR?\fIincrement\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Increments the value stored in the variable whose name is \fIvarName\fR.
-The value of the variable must be an integer.
-If \fIincrement\fR is supplied then its value (which must be an
-integer) is added to the value of variable \fIvarName\fR;  otherwise
-1 is added to \fIvarName\fR.
-The new value is stored as a decimal string in variable \fIvarName\fR
-and also returned as result.
-
-.SH KEYWORDS
-add, increment, variable, value
diff --git a/doc/info.n b/doc/info.n
deleted file mode 100644
index 79afb72..0000000
--- a/doc/info.n
+++ /dev/null
@@ -1,185 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\" Copyright (c) 1993-1997 Bell Labs Innovations for Lucent Technologies
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: info.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH info n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-info \- Return information about the state of the Tcl interpreter
-.SH SYNOPSIS
-\fBinfo \fIoption \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command provides information about various internals of the Tcl
-interpreter.
-The legal \fIoption\fR's (which may be abbreviated) are:
-.TP
-\fBinfo args \fIprocname\fR
-Returns a list containing the names of the arguments to procedure
-\fIprocname\fR, in order.  \fIProcname\fR must be the name of a
-Tcl command procedure.
-.TP
-\fBinfo body \fIprocname\fR
-Returns the body of procedure \fIprocname\fR.  \fIProcname\fR must be
-the name of a Tcl command procedure.
-.TP
-\fBinfo cmdcount\fR
-Returns a count of the total number of commands that have been invoked
-in this interpreter.
-.TP
-\fBinfo commands \fR?\fIpattern\fR?
-If \fIpattern\fR isn't specified,
-returns a list of names of all the Tcl commands in the current namespace,
-including both the built-in commands written in C and
-the command procedures defined using the \fBproc\fR command.
-If \fIpattern\fR is specified,
-only those names matching \fIpattern\fR are returned.
-Matching is determined using the same rules as for \fBstring match\fR.
-\fIpattern\fR can be a qualified name like \fBFoo::print*\fR.
-That is, it may specify a particular namespace
-using a sequence of namespace names separated by \fB::\fRs,
-and may have pattern matching special characters
-at the end to specify a set of commands in that namespace.
-If \fIpattern\fR is a qualified name,
-the resulting list of command names has each one qualified with the name
-of the specified namespace.
-.TP
-\fBinfo complete \fIcommand\fR
-Returns 1 if \fIcommand\fR is a complete Tcl command in the sense of
-having no unclosed quotes, braces, brackets or array element names,
-If the command doesn't appear to be complete then 0 is returned.
-This command is typically used in line-oriented input environments
-to allow users to type in commands that span multiple lines;  if the
-command isn't complete, the script can delay evaluating it until additional
-lines have been typed to complete the command.
-.TP
-\fBinfo default \fIprocname arg varname\fR
-\fIProcname\fR must be the name of a Tcl command procedure and \fIarg\fR
-must be the name of an argument to that procedure.  If \fIarg\fR
-doesn't have a default value then the command returns \fB0\fR.
-Otherwise it returns \fB1\fR and places the default value of \fIarg\fR
-into variable \fIvarname\fR.
-.TP
-\fBinfo exists \fIvarName\fR
-Returns \fB1\fR if the variable named \fIvarName\fR exists in the
-current context (either as a global or local variable), returns \fB0\fR
-otherwise.
-.TP
-\fBinfo globals \fR?\fIpattern\fR?
-If \fIpattern\fR isn't specified, returns a list of all the names
-of currently-defined global variables.
-Global variables are variables in the global namespace.
-If \fIpattern\fR is specified, only those names matching \fIpattern\fR
-are returned.  Matching is determined using the same rules as for
-\fBstring match\fR.
-.TP
-\fBinfo hostname\fR
-Returns the name of the computer on which this invocation is being
-executed.
-.TP
-\fBinfo level\fR ?\fInumber\fR?
-If \fInumber\fR is not specified, this command returns a number
-giving the stack level of the invoking procedure, or 0 if the
-command is invoked at top-level.  If \fInumber\fR is specified,
-then the result is a list consisting of the name and arguments for the
-procedure call at level \fInumber\fR on the stack.  If \fInumber\fR
-is positive then it selects a particular stack level (1 refers
-to the top-most active procedure, 2 to the procedure it called, and
-so on); otherwise it gives a level relative to the current level
-(0 refers to the current procedure, -1 to its caller, and so on).
-See the \fBuplevel\fR command for more information on what stack
-levels mean.
-.TP
-\fBinfo library\fR
-Returns the name of the library directory in which standard Tcl
-scripts are stored.
-This is actually the value of the \fBtcl_library\fR
-variable and may be changed by setting \fBtcl_library\fR.
-See the \fBtclvars\fR manual entry for more information.
-.TP
-\fBinfo loaded \fR?\fIinterp\fR?
-Returns a list describing all of the packages that have been loaded into
-\fIinterp\fR with the \fBload\fR command.
-Each list element is a sub-list with two elements consisting of the
-name of the file from which the package was loaded and the name of
-the package.
-For statically-loaded packages the file name will be an empty string.
-If \fIinterp\fR is omitted then information is returned for all packages
-loaded in any interpreter in the process.
-To get a list of just the packages in the current interpreter, specify
-an empty string for the \fIinterp\fR argument.
-.TP
-\fBinfo locals \fR?\fIpattern\fR?
-If \fIpattern\fR isn't specified, returns a list of all the names
-of currently-defined local variables, including arguments to the
-current procedure, if any.
-Variables defined with the \fBglobal\fR and \fBupvar\fR commands
-will not be returned.
-If \fIpattern\fR is specified, only those names matching \fIpattern\fR
-are returned.  Matching is determined using the same rules as for
-\fBstring match\fR.
-.TP
-\fBinfo nameofexecutable\fR
-Returns the full path name of the binary file from which the application
-was invoked.  If Tcl was unable to identify the file, then an empty
-string is returned.
-.TP
-\fBinfo patchlevel\fR
-Returns the value of the global variable \fBtcl_patchLevel\fR; see
-the \fBtclvars\fR manual entry for more information.
-.TP
-\fBinfo procs \fR?\fIpattern\fR?
-If \fIpattern\fR isn't specified, returns a list of all the
-names of Tcl command procedures in the current namespace.
-If \fIpattern\fR is specified,
-only those procedure names in the current namespace
-matching \fIpattern\fR are returned.
-Matching is determined using the same rules as for
-\fBstring match\fR.
-.TP
-\fBinfo script\fR
-If a Tcl script file is currently being evaluated (i.e. there is a
-call to \fBTcl_EvalFile\fR active or there is an active invocation
-of the \fBsource\fR command), then this command returns the name
-of the innermost file being processed.  Otherwise the command returns an
-empty string.
-.TP
-\fBinfo sharedlibextension\fR
-Returns the extension used on this platform for the names of files
-containing shared libraries (for example, \fB.so\fR under Solaris).
-If shared libraries aren't supported on this platform then an empty
-string is returned.
-.TP
-\fBinfo tclversion\fR
-Returns the value of the global variable \fBtcl_version\fR; see
-the \fBtclvars\fR manual entry for more information.
-.TP
-\fBinfo vars\fR ?\fIpattern\fR?
-If \fIpattern\fR isn't specified,
-returns a list of all the names of currently-visible variables.
-This includes locals and currently-visible globals.
-If \fIpattern\fR is specified, only those names matching \fIpattern\fR
-are returned.  Matching is determined using the same rules as for
-\fBstring match\fR.
-\fIpattern\fR can be a qualified name like \fBFoo::option*\fR.
-That is, it may specify a particular namespace
-using a sequence of namespace names separated by \fB::\fRs,
-and may have pattern matching special characters
-at the end to specify a set of variables in that namespace.
-If \fIpattern\fR is a qualified name,
-the resulting list of variable names
-has each matching namespace variable qualified with the name
-of its namespace.
-
-.SH KEYWORDS
-command, information, interpreter, level, namespace, procedure, variable
diff --git a/doc/interp.n b/doc/interp.n
deleted file mode 100644
index d714f4d..0000000
--- a/doc/interp.n
+++ /dev/null
@@ -1,540 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: interp.n,v 1.3 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH interp n 7.6 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-interp \- Create and manipulate Tcl interpreters
-.SH SYNOPSIS
-\fBinterp \fIoption \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command makes it possible to create one or more new Tcl 
-interpreters that co-exist with the creating interpreter in the
-same application.  The creating interpreter is called the \fImaster\fR
-and the new interpreter is called a \fIslave\fR. 
-A master can create any number of slaves, and each slave can
-itself create additional slaves for which it is master, resulting
-in a hierarchy of interpreters.
-.PP
-Each interpreter is independent from the others: it has its own name
-space for commands, procedures, and global variables.
-A master interpreter may create connections between its slaves and
-itself using a mechanism called an \fIalias\fR.  An \fIalias\fR is
-a command in a slave interpreter which, when invoked, causes a
-command to be invoked in its master interpreter or in another slave
-interpreter.  The only other connections between interpreters are
-through environment variables (the \fBenv\fR variable), which are
-normally shared among all interpreters in the application. Note that the
-name space for files (such as the names returned by the \fBopen\fR command)
-is no longer shared between interpreters. Explicit commands are provided to
-share files and to transfer references to open files from one interpreter
-to another.
-.PP
-The \fBinterp\fR command also provides support for \fIsafe\fR
-interpreters.  A safe interpreter is a slave whose functions have
-been greatly restricted, so that it is safe to execute untrusted
-scripts without fear of them damaging other interpreters or the
-application's environment. For example, all IO channel creation
-commands and subprocess creation commands are made inaccessible to safe
-interpreters.
-.VS
-See SAFE INTERPRETERS below for more information on
-what features are present in a safe interpreter.
-The dangerous functionality is not removed from the safe interpreter;
-instead, it is \fIhidden\fR, so that only trusted interpreters can obtain
-access to it. For a detailed explanation of hidden commands, see
-HIDDEN COMMANDS, below.
-The alias mechanism can be used for protected communication (analogous to a
-kernel call) between a slave interpreter and its master. See ALIAS
-INVOCATION, below, for more details on how the alias mechanism works.
-.VE
-.PP
-A qualified interpreter name is a proper Tcl lists containing a subset of its
-ancestors in the interpreter hierarchy, terminated by the string naming the
-interpreter in its immediate master. Interpreter names are relative to the
-interpreter in which they are used. For example, if \fBa\fR is a slave of
-the current interpreter and it has a slave \fBa1\fR, which in turn has a
-slave \fBa11\fR, the qualified name of \fBa11\fR in \fBa\fR is the list
-\fBa1 a11\fR.
-.PP
-The \fBinterp\fR command, described below, accepts qualified interpreter
-names as arguments; the interpreter in which the command is being evaluated
-can always be referred to as \fB{}\fR (the empty list or string). Note that
-it is impossible to refer to a master (ancestor) interpreter by name in a
-slave interpreter except through aliases. Also, there is no global name by
-which one can refer to the first interpreter created in an application.
-Both restrictions are motivated by safety concerns.
-
-.VS
-.SH "THE INTERP COMMAND"
-.PP
-.VE
-The \fBinterp\fR command is used to create, delete, and manipulate
-slave interpreters, and to share or transfer
-channels between interpreters.  It can have any of several forms, depending
-on the \fIoption\fR argument:
-.TP
-\fBinterp\fR \fBalias\fR \fIsrcPath\fR \fIsrcCmd\fR
-Returns a Tcl list whose elements are the \fItargetCmd\fR and
-\fIarg\fRs associated with the alias named \fIsrcCmd\fR
-(all of these are the values specified when the alias was
-created; it is possible that the actual source command in the
-slave is different from \fIsrcCmd\fR if it was renamed).
-.TP
-\fBinterp\fR \fBalias\fR \fIsrcPath\fR \fIsrcCmd\fR \fB{}\fR
-Deletes the alias for \fIsrcCmd\fR in the slave interpreter identified by
-\fIsrcPath\fR.
-\fIsrcCmd\fR refers to the name under which the alias
-was created;  if the source command has been renamed, the renamed
-command will be deleted.
-.TP
-\fBinterp\fR \fBalias\fR \fIsrcPath\fR \fIsrcCmd\fR \fItargetPath\fR \fItargetCmd \fR?\fIarg arg ...\fR?
-This command creates an alias between one slave and another (see the
-\fBalias\fR slave command below for creating aliases between a slave
-and its master).  In this command, either of the slave interpreters
-may be anywhere in the hierarchy of interpreters under the interpreter
-invoking the command.
-\fISrcPath\fR and \fIsrcCmd\fR identify the source of the alias.
-\fISrcPath\fR is a Tcl list whose elements select a particular
-interpreter.  For example, ``\fBa b\fR'' identifies an interpreter
-\fBb\fR, which is a slave of interpreter \fBa\fR, which is a slave
-of the invoking interpreter.  An empty list specifies the interpreter
-invoking the command.  \fIsrcCmd\fR gives the name of a new
-command, which will be created in the source interpreter.
-\fITargetPath\fR and \fItargetCmd\fR specify a target interpreter
-and command, and the \fIarg\fR arguments, if any, specify additional
-arguments to \fItargetCmd\fR which are prepended to any arguments specified
-in the invocation of \fIsrcCmd\fR.
-\fITargetCmd\fR may be undefined at the time of this call, or it may
-already exist; it is not created by this command.
-The alias arranges for the given target command to be invoked
-in the target interpreter whenever the given source command is
-invoked in the source interpreter.  See ALIAS INVOCATION below for
-more details.
-.TP
-\fBinterp\fR \fBaliases \fR?\fIpath\fR?
-This command returns a Tcl list of the names of all the source commands for
-aliases defined in the interpreter identified by \fIpath\fR.
-.TP
-\fBinterp\fR \fBcreate \fR?\fB\-safe\fR? ?\fB\-\|\-\fR? ?\fIpath\fR?
-Creates a slave interpreter identified by \fIpath\fR and a new command,
-called a \fIslave command\fR. The name of the slave command is the last
-component of \fIpath\fR. The new slave interpreter and the slave command
-are created in the interpreter identified by the path obtained by removing
-the last component from \fIpath\fR. For example, if \fIpath is \fBa b
-c\fR then a new slave interpreter and slave command named \fBc\fR are
-created in the interpreter identified by the path \fBa b\fR.
-The slave command may be used to manipulate the new interpreter as
-described below. If \fIpath\fR is omitted, Tcl creates a unique name of the
-form \fBinterp\fIx\fR, where \fIx\fR is an integer, and uses it for the
-interpreter and the slave command. If the \fB\-safe\fR switch is specified
-(or if the master interpreter is a safe interpreter), the new slave
-interpreter will be created as a safe interpreter with limited
-functionality; otherwise the slave will include the full set of Tcl
-built-in commands and variables. The \fB\-\|\-\fR switch can be used to
-mark the end of switches;  it may be needed if \fIpath\fR is an unusual
-value such as \fB\-safe\fR. The result of the command is the name of the
-new interpreter. The name of a slave interpreter must be unique among all
-the slaves for its master;  an error occurs if a slave interpreter by the
-given name already exists in this master.
-.TP
-\fBinterp\fR \fBdelete \fR?\fIpath ...?\fR
-Deletes zero or more interpreters given by the optional \fIpath\fR
-arguments, and for each interpreter, it also deletes its slaves. The
-command also deletes the slave command for each interpreter deleted.
-For each \fIpath\fR argument, if no interpreter by that name
-exists, the command raises an error.
-.TP
-\fBinterp\fR \fBeval\fR \fIpath arg \fR?\fIarg ...\fR?
-This command concatenates all of the \fIarg\fR arguments in the same
-fashion as the \fBconcat\fR command, then evaluates the resulting string as
-a Tcl script in the slave interpreter identified by \fIpath\fR. The result
-of this evaluation (including error information such as the \fBerrorInfo\fR
-and \fBerrorCode\fR variables, if an error occurs) is returned to the
-invoking interpreter.
-.TP
-\fBinterp exists \fIpath\fR
-Returns  \fB1\fR if a slave interpreter by the specified \fIpath\fR
-exists in this master, \fB0\fR otherwise. If \fIpath\fR is omitted, the
-invoking interpreter is used.
-.VS "" BR
-.TP
-\fBinterp expose \fIpath\fR \fIhiddenName\fR ?\fIexposedCmdName\fR?
-Makes the hidden command \fIhiddenName\fR exposed, eventually bringing
-it back under a new \fIexposedCmdName\fR name (this name is currently
-accepted only if it is a valid global name space name without any ::),
-in the interpreter
-denoted by \fIpath\fR.
-If an exposed command with the targetted name already exists, this command
-fails.
-Hidden commands are explained in more detail in HIDDEN COMMANDS, below.
-.TP
-\fBinterp\fR \fBhide\fR \fIpath\fR \fIexposedCmdName\fR ?\fIhiddenCmdName\fR?
-Makes the exposed command \fIexposedCmdName\fR hidden, renaming
-it to the hidden command \fIhiddenCmdName\fR, or keeping the same name if
-\fIhiddenCmdName\fR is not given, in the interpreter denoted 
-by \fIpath\fR.
-If a hidden command with the targetted name already exists, this command
-fails.
-Currently both \fIexposedCmdName\fR and \fIhiddenCmdName\fR can 
-not contain namespace qualifiers, or an error is raised.
-Commands to be hidden by \fBinterp hide\fR are looked up in the global
-namespace even if the current namespace is not the global one. This
-prevents slaves from fooling a master interpreter into hiding the wrong
-command, by making the current namespace be different from the global one.
-Hidden commands are explained in more detail in HIDDEN COMMANDS, below.
-.TP
-\fBinterp\fR \fBhidden\fR \fIpath\fR
-Returns a list of the names of all hidden commands in the interpreter
-identified by \fIpath\fR.
-.TP
-\fBinterp\fR \fBinvokehidden\fR \fIpath\fR ?\fB-global\fR? \fIhiddenCmdName\fR ?\fIarg ...\fR?
-Invokes the hidden command \fIhiddenCmdName\fR with the arguments supplied
-in the interpreter denoted by \fIpath\fR. No substitutions or evaluation
-are applied to the arguments.
-If the \fB-global\fR flag is present, the hidden command is invoked at the
-global level in the target interpreter; otherwise it is invoked at the
-current call frame and can access local variables in that and outer call
-frames.
-Hidden commands are explained in more detail in HIDDEN COMMANDS, below.
-.VE
-.TP
-\fBinterp issafe\fR ?\fIpath\fR?
-Returns \fB1\fR if the interpreter identified by the specified \fIpath\fR
-is safe, \fB0\fR otherwise.
-.VS "" BR
-.TP
-\fBinterp marktrusted\fR \fIpath\fR
-Marks the interpreter identified by \fIpath\fR as trusted. Does
-not expose the hidden commands. This command can only be invoked from a
-trusted interpreter.
-The command has no effect if the interpreter identified by \fIpath\fR is
-already trusted.
-.VE
-.TP
-\fBinterp\fR \fBshare\fR \fIsrcPath channelId destPath\fR
-Causes the IO channel identified by \fIchannelId\fR to become shared
-between the interpreter identified by \fIsrcPath\fR and the interpreter
-identified by \fIdestPath\fR. Both interpreters have the same permissions
-on the IO channel.
-Both interpreters must close it to close the underlying IO channel; IO
-channels accessible in an interpreter are automatically closed when an
-interpreter is destroyed.
-.TP
-\fBinterp\fR \fBslaves\fR ?\fIpath\fR?
-Returns a Tcl list of the names of all the slave interpreters associated
-with the interpreter identified by \fIpath\fR. If \fIpath\fR is omitted,
-the invoking interpreter is used.
-.TP
-\fBinterp\fR \fBtarget\fR \fIpath alias\fR
-Returns a Tcl list describing the target interpreter for an alias. The
-alias is specified with an interpreter path and source command name, just
-as in \fBinterp alias\fR above. The name of the target interpreter is
-returned as an interpreter path, relative to the invoking interpreter.
-If the target interpreter for the alias is the invoking interpreter then an
-empty list is returned. If the target interpreter for the alias is not the
-invoking interpreter or one of its descendants then an error is generated.
-The target command does not have to be defined at the time of this invocation.
-.TP
-\fBinterp\fR \fBtransfer\fR \fIsrcPath channelId destPath\fR
-Causes the IO channel identified by \fIchannelId\fR to become available in
-the interpreter identified by \fIdestPath\fR and unavailable in the
-interpreter identified by \fIsrcPath\fR.
-
-.SH "SLAVE COMMAND"
-.PP
-For each slave interpreter created with the \fBinterp\fR command, a
-new Tcl command is created in the master interpreter with the same
-name as the new interpreter. This command may be used to invoke
-various operations on the interpreter.  It has the following
-general form:
-.CS
-\fIslave command \fR?\fIarg arg ...\fR?
-.CE
-\fISlave\fR is the name of the interpreter, and \fIcommand\fR
-and the \fIarg\fRs determine the exact behavior of the command.
-The valid forms of this command are:
-.TP
-\fIslave \fBaliases\fR
-Returns a Tcl list whose elements are the names of all the
-aliases in \fIslave\fR.  The names returned are the \fIsrcCmd\fR
-values used when the aliases were created (which may not be the same
-as the current names of the commands, if they have been
-renamed).
-.TP
-\fIslave \fBalias \fIsrcCmd\fR
-Returns a Tcl list whose elements are the \fItargetCmd\fR and
-\fIarg\fRs associated with the alias named \fIsrcCmd\fR
-(all of these are the values specified when the alias was
-created; it is possible that the actual source command in the
-slave is different from \fIsrcCmd\fR if it was renamed).
-.TP
-\fIslave \fBalias \fIsrcCmd \fB{}\fR
-Deletes the alias for \fIsrcCmd\fR in the slave interpreter.
-\fIsrcCmd\fR refers to the name under which the alias
-was created;  if the source command has been renamed, the renamed
-command will be deleted.
-.TP
-\fIslave \fBalias \fIsrcCmd targetCmd \fR?\fIarg ..\fR?
-Creates an alias such that whenever \fIsrcCmd\fR is invoked
-in \fIslave\fR, \fItargetCmd\fR is invoked in the master.
-The \fIarg\fR arguments will be passed to \fItargetCmd\fR as additional
-arguments, prepended before any arguments passed in the invocation of
-\fIsrcCmd\fR.
-See ALIAS INVOCATION below for details.
-.TP
-\fIslave \fBeval \fIarg \fR?\fIarg ..\fR?
-This command concatenates all of the \fIarg\fR arguments in
-the same fashion as the \fBconcat\fR command, then evaluates
-the resulting string as a Tcl script in \fIslave\fR.
-The result of this evaluation (including error information
-such as the \fBerrorInfo\fR and \fBerrorCode\fR variables, if an
-error occurs) is returned to the invoking interpreter.
-.VS "" BR
-.TP
-\fIslave \fBexpose \fIhiddenName \fR?\fIexposedCmdName\fR?
-This command exposes the hidden command \fIhiddenName\fR, eventually bringing
-it back under a new \fIexposedCmdName\fR name (this name is currently
-accepted only if it is a valid global name space name without any ::),
-in \fIslave\fR.
-If an exposed command with the targetted name already exists, this command
-fails.
-For more details on hidden commands, see HIDDEN COMMANDS, below.
-.TP
-\fIslave \fBhide \fIexposedCmdName\fR ?\fIhiddenCmdName\fR?
-This command hides the exposed command \fIexposedCmdName\fR, renaming it to 
-the hidden command \fIhiddenCmdName\fR, or keeping the same name if the
-the argument is not given, in the \fIslave\fR interpreter.
-If a hidden command with the targetted name already exists, this command
-fails.
-Currently both \fIexposedCmdName\fR and \fIhiddenCmdName\fR can 
-not contain namespace qualifiers, or an error is raised.
-Commands to be hidden are looked up in the global
-namespace even if the current namespace is not the global one. This
-prevents slaves from fooling a master interpreter into hiding the wrong
-command, by making the current namespace be different from the global one.
-For more details on hidden commands, see HIDDEN COMMANDS, below.
-.TP
-\fIslave \fBhidden\fR
-Returns a list of the names of all hidden commands in \fIslave\fR.
-.TP
-\fIslave \fBinvokehidden\fR ?\fB-global\fR \fIhiddenName \fR?\fIarg ..\fR?
-This command invokes the hidden command \fIhiddenName\fR with the
-supplied arguments, in \fIslave\fR. No substitutions or evaluations are
-applied to the arguments.
-If the \fB-global\fR flag is given, the command is invoked at the global
-level in the slave; otherwise it is invoked at the current call frame and
-can access local variables in that or outer call frames.
-For more details on hidden commands, see HIDDEN
-COMMANDS, below.
-.VE
-.TP
-\fIslave \fBissafe\fR
-Returns  \fB1\fR if the slave interpreter is safe, \fB0\fR otherwise.
-.VS "" BR
-.TP
-\fIslave \fBmarktrusted\fR
-Marks the slave interpreter as trusted. Can only be invoked by a
-trusted interpreter. This command does not expose any hidden
-commands in the slave interpreter. The command has no effect if the slave
-is already trusted.
-.VE
-
-.SH "SAFE INTERPRETERS"
-.PP
-A safe interpreter is one with restricted functionality, so that
-is safe to execute an arbitrary script from your worst enemy without
-fear of that script damaging the enclosing application or the rest
-of your computing environment.  In order to make an interpreter
-safe, certain commands and variables are removed from the interpreter.
-For example, commands to create files on disk are removed, and the
-\fBexec\fR command is removed, since it could be used to cause damage
-through subprocesses.
-Limited access to these facilities can be provided, by creating
-aliases to the master interpreter which check their arguments carefully
-and provide restricted access to a safe subset of facilities.
-For example, file creation might be allowed in a particular subdirectory
-and subprocess invocation might be allowed for a carefully selected and
-fixed set of programs.
-.PP
-A safe interpreter is created by specifying the \fB\-safe\fR switch
-to the \fBinterp create\fR command.  Furthermore, any slave created
-by a safe interpreter will also be safe.
-.PP
-A safe interpreter is created with exactly the following set of
-built-in commands:
-.DS
-.ta 1.2i 2.4i 3.6i
-\fBafter	append	array	break
-case	catch	clock	close
-concat	continue	eof	error
-eval	expr	fblocked	fileevent
-flush	for	foreach	format
-gets	global	history	if
-incr	info	interp	join
-lappend	lindex	linsert	list
-llength	lower	lrange	lreplace
-lsearch	lsort	package	pid
-proc	puts	read	rename
-return	scan	seek	set
-split	string	subst	switch
-tell	trace	unset	update
-uplevel	upvar	vwait	while\fR
-.DE
-.VS ""  BR
-The following commands are hidden by \fBinterp create\fR when it
-creates a safe interpreter:
-.DS
-.ta 1.2i 2.4i 3.6i
-\fBcd	exec	exit	fconfigure
-file	glob	load	open
-pwd	socket	source	vwait\fR
-.DE
-These commands can be recreated later as Tcl procedures or aliases, or
-re-exposed by \fBinterp expose\fR.
-.VE
-.PP
-In addition, the \fBenv\fR variable is not present in a safe interpreter,
-so it cannot share environment variables with other interpreters. The
-\fBenv\fR variable poses a security risk, because users can store
-sensitive information in an environment variable. For example, the PGP
-manual recommends storing the PGP private key protection password in
-the environment variable \fIPGPPASS\fR. Making this variable available
-to untrusted code executing in a safe interpreter would incur a
-security risk.
-.PP
-If extensions are loaded into a safe interpreter, they may also restrict
-their own functionality to eliminate unsafe commands. For a discussion of
-management of extensions for safety see the manual entries for
-\fBSafe\-Tcl\fR and the \fBload\fR Tcl command.
-
-.SH "ALIAS INVOCATION"
-.PP
-The alias mechanism has been carefully designed so that it can
-be used safely when an untrusted script is executing
-in a safe slave and the target of the alias is a trusted
-master.  The most important thing in guaranteeing safety is to
-ensure that information passed from the slave to the master is
-never evaluated or substituted in the master;  if this were to
-occur, it would enable an evil script in the slave to invoke
-arbitrary functions in the master, which would compromise security.
-.PP
-When the source for an alias is invoked in the slave interpreter, the
-usual Tcl substitutions are performed when parsing that command.
-These substitutions are carried out in the source interpreter just
-as they would be for any other command invoked in that interpreter.
-The command procedure for the source command takes its arguments
-and merges them with the \fItargetCmd\fR and \fIarg\fRs for the
-alias to create a new array of arguments.  If the words
-of \fIsrcCmd\fR were ``\fIsrcCmd arg1 arg2 ... argN\fR'',
-the new set of words will be
-``\fItargetCmd arg arg ... arg arg1 arg2 ... argN\fR'',
-where \fItargetCmd\fR and \fIarg\fRs are the values supplied when the
-alias was created.  \fITargetCmd\fR is then used to locate a command
-procedure in the target interpreter, and that command procedure
-is invoked with the new set of arguments.  An error occurs if
-there is no command named \fItargetCmd\fR in the target interpreter.
-No additional substitutions are performed on the words:  the
-target command procedure is invoked directly, without
-going through the normal Tcl evaluation mechanism.
-Substitutions are thus performed on each word exactly once:
-\fItargetCmd\fR and \fIargs\fR were substituted when parsing the command
-that created the alias, and \fIarg1 - argN\fR are substituted when
-the alias's source command is parsed in the source interpreter.
-.PP
-When writing the \fItargetCmd\fRs for aliases in safe interpreters,
-it is very important that the arguments to that command never be
-evaluated or substituted, since this would provide an escape
-mechanism whereby the slave interpreter could execute arbitrary
-code in the master.  This in turn would compromise the security
-of the system.
-
-.VS
-.SH "HIDDEN COMMANDS"
-.PP
-Safe interpreters greatly restrict the functionality available to Tcl
-programs executing within them.
-Allowing the untrusted Tcl program to have direct access to this
-functionality is unsafe, because it can be used for a variety of
-attacks on the environment.
-However, there are times when there is a legitimate need to use the
-dangerous functionality in the context of the safe interpreter. For
-example, sometimes a program must be \fBsource\fRd into the interpreter.
-Another example is Tk, where windows are bound to the hierarchy of windows
-for a specific interpreter; some potentially dangerous functions, e.g.
-window management, must be performed on these windows within the
-interpreter context.
-.PP
-The \fBinterp\fR command provides a solution to this problem in the form of
-\fIhidden commands\fR. Instead of removing the dangerous commands entirely
-from a safe interpreter, these commands are hidden so they become
-unavailable to Tcl scripts executing in the interpreter. However, such
-hidden commands can be invoked by any trusted ancestor of the safe
-interpreter, in the context of the safe interpreter, using \fBinterp
-invoke\fR. Hidden commands and exposed commands reside in separate name
-spaces. It is possible to define a hidden command and an exposed command by
-the same name within one interpreter.
-.PP
-Hidden commands in a slave interpreter can be invoked in the body of
-procedures called in the master during alias invocation. For example, an
-alias for \fBsource\fR could be created in a slave interpreter. When it is
-invoked in the slave interpreter, a procedure is called in the master
-interpreter to check that the operation is allowable (e.g. it asks to
-source a file that the slave interpreter is allowed to access). The
-procedure then it invokes the hidden \fBsource\fR command in the slave
-interpreter to actually source in the contents of the file. Note that two
-commands named \fBsource\fR exist in the slave interpreter: the alias, and
-the hidden command.
-.PP
-Because a master interpreter may invoke a hidden command as part of
-handling an alias invocation, great care must be taken to avoid evaluating
-any arguments passed in through the alias invocation.
-Otherwise, malicious slave interpreters could cause a trusted master
-interpreter to execute dangerous commands on their behalf. See the section
-on ALIAS INVOCATION for a more complete discussion of this topic.
-To help avoid this problem, no substitutions or evaluations are
-applied to arguments of \fBinterp invokehidden\fR.
-.PP
-Safe interpreters are not allowed to invoke hidden commands in themselves
-or in their descendants. This prevents safe slaves from gaining access to
-hidden functionality in themselves or their descendants.
-.PP
-The set of hidden commands in an interpreter can be manipulated by a trusted
-interpreter using \fBinterp expose\fR and \fBinterp hide\fR. The \fBinterp
-expose\fR command moves a hidden command to the
-set of exposed commands in the interpreter identified by \fIpath\fR,
-potentially renaming the command in the process. If an exposed command by
-the targetted name already exists, the operation fails. Similarly,
-\fBinterp hide\fR moves an exposed command to the set of hidden commands in
-that interpreter. Safe interpreters are not allowed to move commands
-between the set of hidden and exposed commands, in either themselves or
-their descendants.
-.PP
-Currently, the names of hidden commands cannot contain namespace
-qualifiers, and you must first rename a command in a namespace to the
-global namespace before you can hide it.
-Commands to be hidden by \fBinterp hide\fR are looked up in the global
-namespace even if the current namespace is not the global one. This
-prevents slaves from fooling a master interpreter into hiding the wrong
-command, by making the current namespace be different from the global one.
-.VE
-.SH CREDITS
-.PP
-This mechanism is based on the Safe-Tcl prototype implemented
-by Nathaniel Borenstein and Marshall Rose.
-
-.SH "SEE ALSO"
-load(n), safe(n), Tcl_CreateSlave(3)
-
-.SH KEYWORDS
-alias, master interpreter, safe interpreter, slave interpreter
diff --git a/doc/join.n b/doc/join.n
deleted file mode 100644
index 76e41e3..0000000
--- a/doc/join.n
+++ /dev/null
@@ -1,29 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: join.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH join n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-join \- Create a string by joining together list elements
-.SH SYNOPSIS
-\fBjoin \fIlist \fR?\fIjoinString\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fIlist\fR argument must be a valid Tcl list.
-This command returns the string
-formed by joining all of the elements of \fIlist\fR together with
-\fIjoinString\fR separating each adjacent pair of elements.
-The \fIjoinString\fR argument defaults to a space character.
-
-.SH KEYWORDS
-element, join, list, separator
diff --git a/doc/lappend.n b/doc/lappend.n
deleted file mode 100644
index c4af6e3..0000000
--- a/doc/lappend.n
+++ /dev/null
@@ -1,35 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lappend.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH lappend n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lappend \- Append list elements onto a variable
-.SH SYNOPSIS
-\fBlappend \fIvarName \fR?\fIvalue value value ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command treats the variable given by \fIvarName\fR as a list
-and appends each of the \fIvalue\fR arguments to that list as a separate
-element, with spaces between elements.
-If \fIvarName\fR doesn't exist, it is created as a list with elements
-given by the \fIvalue\fR arguments.
-\fBLappend\fR is similar to \fBappend\fR except that the \fIvalue\fRs
-are appended as list elements rather than raw text.
-This command provides a relatively efficient way to build up
-large lists.  For example, ``\fBlappend a $b\fR'' is much
-more efficient than ``\fBset a [concat $a [list $b]]\fR'' when
-\fB$a\fR is long.
-
-.SH KEYWORDS
-append, element, list, variable
diff --git a/doc/library.n b/doc/library.n
deleted file mode 100644
index eb20351..0000000
--- a/doc/library.n
+++ /dev/null
@@ -1,288 +0,0 @@
-'\"
-'\" Copyright (c) 1991-1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: library.n,v 1.6 1999/04/16 00:46:35 stanton Exp $
-.so man.macros
-.TH library n "8.0" Tcl "Tcl Built-In Commands"
-.BS
-.SH NAME
-library \- standard library of Tcl procedures
-.SH SYNOPSIS
-.nf
-\fBauto_execok \fIcmd\fR
-\fBauto_load \fIcmd\fR
-\fBauto_mkindex \fIdir pattern pattern ...\fR
-\fBauto_mkindex_old \fIdir pattern pattern ...\fR
-\fBauto_reset\fR
-\fBtcl_findLibrary \fIbasename version patch initScript enVarName varName\fR
-\fBparray \fIarrayName\fR
-.VS
-\fBtcl_endOfWord \fIstr start\fR
-\fBtcl_startOfNextWord \fIstr start\fR
-\fBtcl_startOfPreviousWord \fIstr start\fR
-\fBtcl_wordBreakAfter \fIstr start\fR
-\fBtcl_wordBreakBefore \fIstr start\fR
-.VE
-.BE
-
-.SH INTRODUCTION
-.PP
-Tcl includes a library of Tcl procedures for commonly-needed functions.
-The procedures defined in the Tcl library are generic ones suitable
-for use by many different applications.
-The location of the Tcl library is returned by the \fBinfo library\fR
-command.
-In addition to the Tcl library, each application will normally have
-its own library of support procedures as well;  the location of this
-library is normally given by the value of the \fB$\fIapp\fB_library\fR
-global variable, where \fIapp\fR is the name of the application.
-For example, the location of the Tk library is kept in the variable
-\fB$tk_library\fR.
-.PP
-To access the procedures in the Tcl library, an application should
-source the file \fBinit.tcl\fR in the library, for example with
-the Tcl command
-.CS
-\fBsource [file join [info library] init.tcl]\fR
-.CE
-If the library procedure \fBTcl_Init\fR is invoked from an application's
-\fBTcl_AppInit\fR procedure, this happens automatically.
-The code in \fBinit.tcl\fR will define the \fBunknown\fR procedure
-and arrange for the other procedures to be loaded on-demand using
-the auto-load mechanism defined below.
-
-.SH "COMMAND PROCEDURES"
-.PP
-The following procedures are provided in the Tcl library:
-.TP
-\fBauto_execok \fIcmd\fR
-Determines whether there is an executable file or shell builtin
-by the name \fIcmd\fR.  If so, it returns a list of arguments to be
-passed to \fBexec\fR to execute the executable file or shell builtin
-named by \fIcmd\fR.  If not, it returns an empty string.  This command
-examines the directories in the current search path (given by the PATH
-environment variable) in its search for an executable file named
-\fIcmd\fR.  On Windows platforms, the search is expanded with the same
-directories and file extensions as used by \fBexec\fR. \fBAuto_exec\fR
-remembers information about previous searches in an array named
-\fBauto_execs\fR;  this avoids the path search in future calls for the
-same \fIcmd\fR.  The command \fBauto_reset\fR may be used to force
-\fBauto_execok\fR to forget its cached information.
-.TP
-\fBauto_load \fIcmd\fR
-This command attempts to load the definition for a Tcl command named
-\fIcmd\fR.
-To do this, it searches an \fIauto-load path\fR, which is a list of
-one or more directories.
-The auto-load path is given by the global variable \fB$auto_path\fR
-if it exists.
-If there is no \fB$auto_path\fR variable, then the TCLLIBPATH environment
-variable is used, if it exists.
-Otherwise the auto-load path consists of just the Tcl library directory.
-Within each directory in the auto-load path there must be a file
-\fBtclIndex\fR that describes one
-or more commands defined in that directory
-and a script to evaluate to load each of the commands.
-The \fBtclIndex\fR file should be generated with the
-\fBauto_mkindex\fR command.
-If \fIcmd\fR is found in an index file, then the appropriate
-script is evaluated to create the command.
-The \fBauto_load\fR command returns 1 if \fIcmd\fR was successfully
-created.
-The command returns 0 if there was no index entry for \fIcmd\fR
-or if the script didn't actually define \fIcmd\fR (e.g. because
-index information is out of date).
-If an error occurs while processing the script, then that error
-is returned.
-\fBAuto_load\fR only reads the index information once and saves it
-in the array \fBauto_index\fR;  future calls to \fBauto_load\fR
-check for \fIcmd\fR in the array rather than re-reading the index
-files.
-The cached index information may be deleted with the command
-\fBauto_reset\fR.
-This will force the next \fBauto_load\fR command to reload the
-index database from disk.
-.TP
-\fBauto_mkindex \fIdir pattern pattern ...\fR
-Generates an index suitable for use by \fBauto_load\fR.
-The command searches \fIdir\fR for all files whose names match
-any of the \fIpattern\fR arguments
-(matching is done with the \fBglob\fR command),
-generates an index of all the Tcl command
-procedures defined in all the matching files, and stores the
-index information in a file named \fBtclIndex\fR in \fIdir\fR.
-If no pattern is given a pattern of \fB*.tcl\fR will be assumed.  
-For example, the command
-.RS
-.CS
-\fBauto_mkindex foo *.tcl\fR
-.CE
-.LP
-will read all the \fB.tcl\fR files in subdirectory \fBfoo\fR
-and generate a new index file \fBfoo/tclIndex\fR.
-.PP
-\fBAuto_mkindex\fR parses the Tcl scripts by sourcing them
-into a slave interpreter and monitoring the proc and
-namespace commands that are executed.
-Extensions can use the (undocumented)
-auto_mkindex_parser package to register other commands that
-can contribute to the auto_load index.
-You will have to read through init.tcl to see how this works.
-.PP
-\fBAuto_mkindex_old\fR parses the Tcl scripts in a relatively
-unsophisticated way:  if any line contains the word \fBproc\fR
-as its first characters then it is assumed to be a procedure
-definition and the next word of the line is taken as the
-procedure's name.
-Procedure definitions that don't appear in this way (e.g. they
-have spaces before the \fBproc\fR) will not be indexed.
-.RE
-.TP
-\fBauto_reset\fR
-Destroys all the information cached by \fBauto_execok\fR and
-\fBauto_load\fR.
-This information will be re-read from disk the next time it is
-needed.
-\fBAuto_reset\fR also deletes any procedures listed in the auto-load
-index, so that fresh copies of them will be loaded the next time
-that they're used.
-.TP
-\fBtcl_findLibrary \fIbasename version patch initScript enVarName varName\fR
-This is a standard search procedure for use by extensions during
-their initialization.  They call this procedure to look for their
-script library in several standard directories.
-The last component of the name of the library directory is 
-normally \fIbasenameversion\fP
-(e.g., tk8.0), but it might be "library" when in the build hierarchies.
-The \fIinitScript\fR file will be sourced into the interpreter
-once it is found.  The directory in which this file is found is
-stored into the global variable \fIvarName\fP.
-If this variable is already defined (e.g., by C code during
-application initialization) then no searching is done.
-Otherwise the search looks in these directories:
-the directory named by the environment variable \fIenVarName\fP;
-relative to the Tcl library directory;
-relative to the executable file in the standard installation
-bin or bin/\fIarch\fP directory;
-relative to the executable file in the current build tree;
-relative to the executable file in a parallel build tree.
-.TP
-\fBparray \fIarrayName\fR
-Prints on standard output the names and values of all the elements
-in the array \fIarrayName\fR.
-\fBArrayName\fR must be an array accessible to the caller of \fBparray\fR.
-It may be either local or global.
-.TP
-\fBtcl_endOfWord \fIstr start\fR
-.VS
-Returns the index of the first end-of-word location that occurs after
-a starting index \fIstart\fR in the string \fIstr\fR.  An end-of-word
-location is defined to be the first non-word character following the
-first word character after the starting point.  Returns -1 if there
-are no more end-of-word locations after the starting point.  See the
-description of \fBtcl_wordchars\fR and \fBtcl_nonwordchars\fR below
-for more details on how Tcl determines which characters are word
-characters.
-.TP
-\fBtcl_startOfNextWord \fIstr start\fR
-Returns the index of the first start-of-word location that occurs
-after a starting index \fIstart\fR in the string \fIstr\fR.  A
-start-of-word location is defined to be the first word character
-following a non-word character.  Returns \-1 if there are no more
-start-of-word locations after the starting point.
-.TP
-\fBtcl_startOfPreviousWord \fIstr start\fR
-Returns the index of the first start-of-word location that occurs
-before a starting index \fIstart\fR in the string \fIstr\fR.  Returns
-\-1 if there are no more start-of-word locations before the starting
-point.
-.TP
-\fBtcl_wordBreakAfter \fIstr start\fR
-Returns the index of the first word boundary after the starting index
-\fIstart\fR in the string \fIstr\fR.  Returns \-1 if there are no more
-boundaries after the starting point in the given string.  The index
-returned refers to the second character of the pair that comprises a
-boundary.
-.TP
-\fBtcl_wordBreakBefore \fIstr start\fR
-Returns the index of the first word boundary before the starting index
-\fIstart\fR in the string \fIstr\fR.  Returns \-1 if there are no more
-boundaries before the starting point in the given string.  The index
-returned refers to the second character of the pair that comprises a
-boundary.
-.VE
-
-.SH "VARIABLES"
-.PP
-The following global variables are defined or used by the procedures in
-the Tcl library:
-.TP
-\fBauto_execs\fR
-Used by \fBauto_execok\fR to record information about whether
-particular commands exist as executable files.
-.TP
-\fBauto_index\fR
-Used by \fBauto_load\fR to save the index information read from
-disk.
-.TP
-\fBauto_noexec\fR
-If set to any value, then \fBunknown\fR will not attempt to auto-exec
-any commands.
-.TP
-\fBauto_noload\fR
-If set to any value, then \fBunknown\fR will not attempt to auto-load
-any commands.
-.TP
-\fBauto_path\fR
-If set, then it must contain a valid Tcl list giving directories to
-search during auto-load operations.
-This variable is initialized during startup to contain, in order:
-the directories listed in the TCLLIBPATH environment variable,
-the directory named by the $tcl_library variable,
-the parent directory of $tcl_library,
-the directories listed in the $tcl_pkgPath variable.
-.TP
-\fBenv(TCL_LIBRARY)\fR
-If set, then it specifies the location of the directory containing
-library scripts (the value of this variable will be
-assigned to the \fBtcl_library\fR variable and therefore returned by
-the command \fBinfo library\fR).  If this variable isn't set then
-a default value is used.
-.TP
-\fBenv(TCLLIBPATH)\fR
-If set, then it must contain a valid Tcl list giving directories to
-search during auto-load operations.
-This variable is only used when
-initializing the \fBauto_path\fR variable.
-.TP
-\fBtcl_nonwordchars\fR
-.VS
-This variable contains a regular expression that is used by routines
-like \fBtcl_endOfWord\fR to identify whether a character is part of a
-word or not.  If the pattern matches a character, the character is
-considered to be a non-word character.  On Windows platforms, spaces,
-tabs, and newlines are considered non-word characters.  Under Unix,
-everything but numbers, letters and underscores are considered
-non-word characters.
-.TP
-\fBtcl_wordchars\fR
-This variable contains a regular expression that is used by routines
-like \fBtcl_endOfWord\fR to identify whether a character is part of a
-word or not.  If the pattern matches a character, the character is
-considered to be a word character.  On Windows platforms, words are
-comprised of any character that is not a space, tab, or newline.  Under
-Unix, words are comprised of numbers, letters or underscores.
-.VE
-.TP
-\fBunknown_active\fR
-This variable is set by \fBunknown\fR to indicate that it is active.
-It is used to detect errors where \fBunknown\fR recurses on itself
-infinitely.
-The variable is unset before \fBunknown\fR returns.
-
-.SH KEYWORDS
-auto-exec, auto-load, library, unknown, word, whitespace 
diff --git a/doc/lindex.n b/doc/lindex.n
deleted file mode 100644
index 393ee78..0000000
--- a/doc/lindex.n
+++ /dev/null
@@ -1,35 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lindex.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH lindex n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lindex \- Retrieve an element from a list
-.SH SYNOPSIS
-\fBlindex \fIlist index\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command treats \fIlist\fR as a Tcl list and returns the
-\fIindex\fR'th element from it (0 refers to the first element of the list).
-In extracting the element, \fIlindex\fR observes the same rules
-concerning braces and quotes and backslashes as the Tcl command
-interpreter; however, variable
-substitution and command substitution do not occur.
-If \fIindex\fR is negative or greater than or equal to the number
-of elements in \fIvalue\fR, then an empty
-string is returned.
-If \fIindex\fR has the value \fBend\fR, it refers to the last element
-in the list.
-
-.SH KEYWORDS
-element, index, list
diff --git a/doc/linsert.n b/doc/linsert.n
deleted file mode 100644
index 4877e03..0000000
--- a/doc/linsert.n
+++ /dev/null
@@ -1,33 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: linsert.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH linsert n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-linsert \- Insert elements into a list
-.SH SYNOPSIS
-\fBlinsert \fIlist index element \fR?\fIelement element ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command produces a new list from \fIlist\fR by inserting all
-of the \fIelement\fR arguments just before the \fIindex\fRth
-element of \fIlist\fR.  Each \fIelement\fR argument will become
-a separate element of the new list.  If \fIindex\fR is less than
-or equal to zero, then the new elements are inserted at the
-beginning of the list.  If \fIindex\fR
-has the value \fBend\fR,
-or if it is greater than or equal to the number of elements in the list,
-then the new elements are appended to the list.
-
-.SH KEYWORDS
-element, insert, list
diff --git a/doc/list.n b/doc/list.n
deleted file mode 100644
index 9f25140..0000000
--- a/doc/list.n
+++ /dev/null
@@ -1,45 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: list.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH list n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-list \- Create a list
-.SH SYNOPSIS
-\fBlist \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command returns a list comprised of all the \fIarg\fRs,
-or an empty string if no \fIarg\fRs are specified.
-Braces and backslashes get added as necessary, so that the \fBindex\fR command
-may be used on the result to re-extract the original arguments, and also
-so that \fBeval\fR may be used to execute the resulting list, with
-\fIarg1\fR comprising the command's name and the other \fIarg\fRs comprising
-its arguments.  \fBList\fR produces slightly different results than
-\fBconcat\fR:  \fBconcat\fR removes one level of grouping before forming
-the list, while \fBlist\fR works directly from the original arguments.
-For example, the command
-.CS
-\fBlist a b {c d e} {f {g h}}\fR
-.CE
-will return
-.CS
-\fBa b {c d e} {f {g h}}\fR
-.CE
-while \fBconcat\fR with the same arguments will return
-.CS
-\fBa b c d e f {g h}\fR
-.CE
-
-.SH KEYWORDS
-element, list
diff --git a/doc/llength.n b/doc/llength.n
deleted file mode 100644
index 1a58fb7..0000000
--- a/doc/llength.n
+++ /dev/null
@@ -1,26 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: llength.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH llength n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-llength \- Count the number of elements in a list
-.SH SYNOPSIS
-\fBllength \fIlist\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Treats \fIlist\fR as a list and returns a decimal string giving
-the number of elements in it.
-
-.SH KEYWORDS
-element, list, length
diff --git a/doc/load.n b/doc/load.n
deleted file mode 100644
index 9d3e1eb..0000000
--- a/doc/load.n
+++ /dev/null
@@ -1,120 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: load.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH load n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-load \- Load machine code and initialize new commands.
-.SH SYNOPSIS
-\fBload \fIfileName\fR
-.br
-\fBload \fIfileName packageName\fR
-.br
-\fBload \fIfileName packageName interp\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command loads binary code from a file into the
-application's address space and calls an initialization procedure
-in the package to incorporate it into an interpreter.  \fIfileName\fR
-is the name of the file containing the code;  its exact form varies
-from system to system but on most systems it is a shared library,
-such as a \fB.so\fR file under Solaris or a DLL under Windows.
-\fIpackageName\fR is the name of the package, and is used to
-compute the name of an initialization procedure.
-\fIinterp\fR is the path name of the interpreter into which to load
-the package (see the \fBinterp\fR manual entry for details);
-if \fIinterp\fR is omitted, it defaults to the
-interpreter in which the \fBload\fR command was invoked.
-.PP
-Once the file has been loaded into the application's address space,
-one of two initialization procedures will be invoked in the new code.
-Typically the initialization procedure will add new commands to a
-Tcl interpreter.
-The name of the initialization procedure is determined by
-\fIpackageName\fR and whether or not the target interpreter
-is a safe one.  For normal interpreters the name of the initialization
-procedure will have the form \fIpkg\fB_Init\fR, where \fIpkg\fR
-is the same as \fIpackageName\fR except that the first letter is
-converted to upper case and all other letters
-are converted to lower case.  For example, if \fIpackageName\fR is
-\fBfoo\fR or \fBFOo\fR, the initialization procedure's name will
-be \fBFoo_Init\fR.
-.PP
-If the target interpreter is a safe interpreter, then the name
-of the initialization procedure will be \fIpkg\fB_SafeInit\fR
-instead of \fIpkg\fB_Init\fR.
-The \fIpkg\fB_SafeInit\fR function should be written carefully, so that it
-initializes the safe interpreter only with partial functionality provided
-by the package that is safe for use by untrusted code. For more information
-on Safe\-Tcl, see the \fBsafe\fR manual entry.
-.PP
-The initialization procedure must match the following prototype:
-.CS
-typedef int Tcl_PackageInitProc(Tcl_Interp *\fIinterp\fR);
-.CE
-The \fIinterp\fR argument identifies the interpreter in which the
-package is to be loaded.  The initialization procedure must return
-\fBTCL_OK\fR or \fBTCL_ERROR\fR to indicate whether or not it completed
-successfully;  in the event of an error it should set \fIinterp->result\fR
-to point to an error message.  The result of the \fBload\fR command
-will be the result returned by the initialization procedure.
-.PP
-The actual loading of a file will only be done once for each \fIfileName\fR
-in an application.  If a given \fIfileName\fR is loaded into multiple
-interpreters, then the first \fBload\fR will load the code and
-call the initialization procedure;  subsequent \fBload\fRs will
-call the initialization procedure without loading the code again.
-It is not possible to unload or reload a package.
-.PP
-The \fBload\fR command also supports packages that are statically
-linked with the application, if those packages have been registered
-by calling the \fBTcl_StaticPackage\fR procedure.
-If \fIfileName\fR is an empty string, then \fIpackageName\fR must
-be specified.
-.PP
-If \fIpackageName\fR is omitted or specified as an empty string,
-Tcl tries to guess the name of the package.
-This may be done differently on different platforms.
-The default guess, which is used on most UNIX platforms, is to
-take the last element of \fIfileName\fR, strip off the first
-three characters if they are \fBlib\fR, and use any following
-.VS
-alphabetic and underline characters as the module name.
-.VE
-For example, the command \fBload libxyz4.2.so\fR uses the module
-name \fBxyz\fR and the command \fBload bin/last.so {}\fR uses the
-module name \fBlast\fR.
-.VS "" br
-.PP
-If \fIfileName\fR is an empty string, then \fIpackageName\fR must
-be specified.
-The \fBload\fR command first searches for a statically loaded package
-(one that has been registered by calling the \fBTcl_StaticPackage\fR
-procedure) by that name; if one is found, it is used.
-Otherwise, the \fBload\fR command searches for a dynamically loaded
-package by that name, and uses it if it is found.  If several
-different files have been \fBload\fRed with different versions of
-the package, Tcl picks the file that was loaded first.
-.VE
-
-.SH BUGS
-.PP
-If the same file is \fBload\fRed by different \fIfileName\fRs, it will
-be loaded into the process's address space multiple times.  The
-behavior of this varies from system to system (some systems may
-detect the redundant loads, others may not).
-
-.SH "SEE ALSO"
-\fBinfo sharedlibextension\fR, Tcl_StaticPackage, safe(n)
-
-.SH KEYWORDS
-binary code, loading, safe interpreter, shared library
diff --git a/doc/lrange.n b/doc/lrange.n
deleted file mode 100644
index 45d671d..0000000
--- a/doc/lrange.n
+++ /dev/null
@@ -1,39 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lrange.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH lrange n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lrange \- Return one or more adjacent elements from a list
-.SH SYNOPSIS
-\fBlrange \fIlist first last\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-\fIList\fR must be a valid Tcl list.  This command will
-return a new list consisting of elements
-\fIfirst\fR through \fIlast\fR, inclusive.
-\fIFirst\fR or \fIlast\fR
-may be \fBend\fR (or any abbreviation of it) to refer to the last
-element of the list.
-If \fIfirst\fR is less than zero, it is treated as if it were zero.
-If \fIlast\fR is greater than or equal to the number of elements
-in the list, then it is treated as if it were \fBend\fR.
-If \fIfirst\fR is greater than \fIlast\fR then an empty string
-is returned.
-Note: ``\fBlrange \fIlist first first\fR'' does not always produce the
-same result as ``\fBlindex \fIlist first\fR'' (although it often does
-for simple fields that aren't enclosed in braces); it does, however,
-produce exactly the same results as ``\fBlist [lindex \fIlist first\fB]\fR''
-
-.SH KEYWORDS
-element, list, range, sublist
diff --git a/doc/lreplace.n b/doc/lreplace.n
deleted file mode 100644
index 9977a90..0000000
--- a/doc/lreplace.n
+++ /dev/null
@@ -1,43 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lreplace.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH lreplace n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lreplace \- Replace elements in a list with new elements
-.SH SYNOPSIS
-\fBlreplace \fIlist first last \fR?\fIelement element ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBLreplace\fR returns a new list formed by replacing one or more elements of
-\fIlist\fR with the \fIelement\fR arguments.
-\fIFirst\fR gives the index in \fIlist\fR of the first element
-to be replaced (0 refers to the first element).
-If \fIfirst\fR is less than zero then it refers to the first
-element of \fIlist\fR;  the element indicated by \fIfirst\fR
-must exist in the list.
-\fILast\fR gives the index in \fIlist\fR of the last element
-to be replaced.
-If \fIlast\fR is less than \fIfirst\fR then no elements are deleted;
-the new elements are simply inserted before \fIfirst\fR.
-\fIFirst\fR or \fIlast\fR may be \fBend\fR
-(or any abbreviation of it) to refer to the last element of the list.
-The \fIelement\fR arguments specify zero or more new arguments to
-be added to the list in place of those that were deleted.
-Each \fIelement\fR argument will become a separate element of
-the list.
-If no \fIelement\fR arguments are specified, then the elements
-between \fIfirst\fR and \fIlast\fR are simply deleted.
-
-.SH KEYWORDS
-element, list, replace
diff --git a/doc/lsearch.n b/doc/lsearch.n
deleted file mode 100644
index bcede70..0000000
--- a/doc/lsearch.n
+++ /dev/null
@@ -1,45 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lsearch.n,v 1.2 1998/09/14 18:39:53 stanton Exp $
-'\" 
-.so man.macros
-.TH lsearch n 7.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lsearch \- See if a list contains a particular element
-.SH SYNOPSIS
-\fBlsearch \fR?\fImode\fR? \fIlist pattern\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command searches the elements of \fIlist\fR to see if one
-of them matches \fIpattern\fR.
-If so, the command returns the index of the first matching
-element.
-If not, the command returns \fB\-1\fR.
-The \fImode\fR argument indicates how the elements of the list are to
-be matched against \fIpattern\fR and it must have one of the following
-values:
-.TP
-\fB\-exact\fR
-The list element must contain exactly the same string as \fIpattern\fR.
-.TP
-\fB\-glob\fR
-\fIPattern\fR is a glob-style pattern which is matched against each list
-element using the same rules as the \fBstring match\fR command.
-.TP
-\fB\-regexp\fR
-\fIPattern\fR is treated as a regular expression and matched against
-each list element using the same rules as the \fBregexp\fR command.
-.PP
-If \fImode\fR is omitted then it defaults to \fB\-glob\fR.
-
-.SH KEYWORDS
-list, match, pattern, regular expression, search, string
diff --git a/doc/lsort.n b/doc/lsort.n
deleted file mode 100644
index bc0b658..0000000
--- a/doc/lsort.n
+++ /dev/null
@@ -1,89 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\" Copyright (c) 1999 Scriptics Corporation
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: lsort.n,v 1.4 1999/02/05 01:49:03 stanton Exp $
-'\" 
-.so man.macros
-.TH lsort n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-lsort \- Sort the elements of a list
-.SH SYNOPSIS
-\fBlsort \fR?\fIoptions\fR? \fIlist\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command sorts the elements of \fIlist\fR, returning a new
-list in sorted order.  The implementation of the \fBlsort\fR command
-uses the merge\-sort algorithm which is a stable sort that has O(n log
-n) performance characteristics.
-.PP
-By default ASCII sorting is used with the result returned in
-increasing order.  However, any of the following options may be
-specified before \fIlist\fR to control the sorting process (unique
-abbreviations are accepted):
-.TP 20
-\fB\-ascii\fR
-Use string comparison with ASCII collation order.  This is
-the default.
-.VS 8.0 br
-.TP 20
-\fB\-dictionary\fR
-Use dictionary-style comparison.  This is the same as \fB\-ascii\fR
-except (a) case is ignored except as a tie-breaker and (b) if two
-strings contain embedded numbers, the numbers compare as integers,
-not characters.  For example, in \fB\-dictionary\fR mode, \fBbigBoy\fR
-sorts between \fBbigbang\fR and \fBbigboy\fR, and \fBx10y\fR
-sorts between \fBx9y\fR and \fBx11y\fR.
-.VE
-.TP 20
-\fB\-integer\fR
-Convert list elements to integers and use integer comparison.
-.TP 20
-\fB\-real\fR
-Convert list elements to floating-point values and use floating
-comparison.
-.TP 20
-\fB\-command\0\fIcommand\fR
-Use \fIcommand\fR as a comparison command.
-To compare two elements, evaluate a Tcl script consisting of
-\fIcommand\fR with the two elements appended as additional
-arguments.  The script should return an integer less than,
-equal to, or greater than zero if the first element is to
-be considered less than, equal to, or greater than the second,
-respectively.
-.TP 20
-\fB\-increasing\fR
-Sort the list in increasing order (``smallest'' items first).
-This is the default.
-.TP 20
-\fB\-decreasing\fR
-Sort the list in decreasing order (``largest'' items first).
-.VS 8.0 br
-.TP 20
-\fB\-index\0\fIindex\fR
-If this option is specified, each of the elements of \fIlist\fR must
-itself be a proper Tcl sublist.  Instead of sorting based on whole sublists,
-\fBlsort\fR will extract the \fIindex\fR'th element from each sublist
-and sort based on the given element.  The keyword \fBend\fP is allowed
-for the \fIindex\fP to sort on the last sublist element. For example,
-.RS
-.CS
-lsort -integer -index 1 {{First 24} {Second 18} {Third 30}}
-.CE
-returns \fB{Second 18} {First 24} {Third 30}\fR.
-This option is much more efficient than using \fB\-command\fR
-to achieve the same effect.
-.RE
-.VE
-
-
-.SH KEYWORDS
-element, list, order, sort
diff --git a/doc/man.macros b/doc/man.macros
deleted file mode 100644
index bdf69ff..0000000
--- a/doc/man.macros
+++ /dev/null
@@ -1,236 +0,0 @@
-'\" The definitions below are for supplemental macros used in Tcl/Tk
-'\" manual entries.
-'\"
-'\" .AP type name in/out ?indent?
-'\"	Start paragraph describing an argument to a library procedure.
-'\"	type is type of argument (int, etc.), in/out is either "in", "out",
-'\"	or "in/out" to describe whether procedure reads or modifies arg,
-'\"	and indent is equivalent to second arg of .IP (shouldn't ever be
-'\"	needed;  use .AS below instead)
-'\"
-'\" .AS ?type? ?name?
-'\"	Give maximum sizes of arguments for setting tab stops.  Type and
-'\"	name are examples of largest possible arguments that will be passed
-'\"	to .AP later.  If args are omitted, default tab stops are used.
-'\"
-'\" .BS
-'\"	Start box enclosure.  From here until next .BE, everything will be
-'\"	enclosed in one large box.
-'\"
-'\" .BE
-'\"	End of box enclosure.
-'\"
-'\" .CS
-'\"	Begin code excerpt.
-'\"
-'\" .CE
-'\"	End code excerpt.
-'\"
-'\" .VS ?version? ?br?
-'\"	Begin vertical sidebar, for use in marking newly-changed parts
-'\"	of man pages.  The first argument is ignored and used for recording
-'\"	the version when the .VS was added, so that the sidebars can be
-'\"	found and removed when they reach a certain age.  If another argument
-'\"	is present, then a line break is forced before starting the sidebar.
-'\"
-'\" .VE
-'\"	End of vertical sidebar.
-'\"
-'\" .DS
-'\"	Begin an indented unfilled display.
-'\"
-'\" .DE
-'\"	End of indented unfilled display.
-'\"
-'\" .SO
-'\"	Start of list of standard options for a Tk widget.  The
-'\"	options follow on successive lines, in four columns separated
-'\"	by tabs.
-'\"
-'\" .SE
-'\"	End of list of standard options for a Tk widget.
-'\"
-'\" .OP cmdName dbName dbClass
-'\"	Start of description of a specific option.  cmdName gives the
-'\"	option's name as specified in the class command, dbName gives
-'\"	the option's name in the option database, and dbClass gives
-'\"	the option's class in the option database.
-'\"
-'\" .UL arg1 arg2
-'\"	Print arg1 underlined, then print arg2 normally.
-'\"
-'\" RCS: @(#) $Id: man.macros,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\"
-'\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
-.if t .wh -1.3i ^B
-.nr ^l \n(.l
-.ad b
-'\"	# Start an argument description
-.de AP
-.ie !"\\$4"" .TP \\$4
-.el \{\
-.   ie !"\\$2"" .TP \\n()Cu
-.   el          .TP 15
-.\}
-.ta \\n()Au \\n()Bu
-.ie !"\\$3"" \{\
-\&\\$1	\\fI\\$2\\fP	(\\$3)
-.\".b
-.\}
-.el \{\
-.br
-.ie !"\\$2"" \{\
-\&\\$1	\\fI\\$2\\fP
-.\}
-.el \{\
-\&\\fI\\$1\\fP
-.\}
-.\}
-..
-'\"	# define tabbing values for .AP
-.de AS
-.nr )A 10n
-.if !"\\$1"" .nr )A \\w'\\$1'u+3n
-.nr )B \\n()Au+15n
-.\"
-.if !"\\$2"" .nr )B \\w'\\$2'u+\\n()Au+3n
-.nr )C \\n()Bu+\\w'(in/out)'u+2n
-..
-.AS Tcl_Interp Tcl_CreateInterp in/out
-'\"	# BS - start boxed text
-'\"	# ^y = starting y location
-'\"	# ^b = 1
-.de BS
-.br
-.mk ^y
-.nr ^b 1u
-.if n .nf
-.if n .ti 0
-.if n \l'\\n(.lu\(ul'
-.if n .fi
-..
-'\"	# BE - end boxed text (draw box now)
-.de BE
-.nf
-.ti 0
-.mk ^t
-.ie n \l'\\n(^lu\(ul'
-.el \{\
-.\"	Draw four-sided box normally, but don't draw top of
-.\"	box if the box started on an earlier page.
-.ie !\\n(^b-1 \{\
-\h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
-.\}
-.el \}\
-\h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\l'|0u-1.5n\(ul'
-.\}
-.\}
-.fi
-.br
-.nr ^b 0
-..
-'\"	# VS - start vertical sidebar
-'\"	# ^Y = starting y location
-'\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
-.de VS
-.if !"\\$2"" .br
-.mk ^Y
-.ie n 'mc \s12\(br\s0
-.el .nr ^v 1u
-..
-'\"	# VE - end of vertical sidebar
-.de VE
-.ie n 'mc
-.el \{\
-.ev 2
-.nf
-.ti 0
-.mk ^t
-\h'|\\n(^lu+3n'\L'|\\n(^Yu-1v\(bv'\v'\\n(^tu+1v-\\n(^Yu'\h'-|\\n(^lu+3n'
-.sp -1
-.fi
-.ev
-.\}
-.nr ^v 0
-..
-'\"	# Special macro to handle page bottom:  finish off current
-'\"	# box/sidebar if in box/sidebar mode, then invoked standard
-'\"	# page bottom macro.
-.de ^B
-.ev 2
-'ti 0
-'nf
-.mk ^t
-.if \\n(^b \{\
-.\"	Draw three-sided box if this is the box's first page,
-.\"	draw two sides but no top otherwise.
-.ie !\\n(^b-1 \h'-1.5n'\L'|\\n(^yu-1v'\l'\\n(^lu+3n\(ul'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
-.el \h'-1.5n'\L'|\\n(^yu-1v'\h'\\n(^lu+3n'\L'\\n(^tu+1v-\\n(^yu'\h'|0u'\c
-.\}
-.if \\n(^v \{\
-.nr ^x \\n(^tu+1v-\\n(^Yu
-\kx\h'-\\nxu'\h'|\\n(^lu+3n'\ky\L'-\\n(^xu'\v'\\n(^xu'\h'|0u'\c
-.\}
-.bp
-'fi
-.ev
-.if \\n(^b \{\
-.mk ^y
-.nr ^b 2
-.\}
-.if \\n(^v \{\
-.mk ^Y
-.\}
-..
-'\"	# DS - begin display
-.de DS
-.RS
-.nf
-.sp
-..
-'\"	# DE - end display
-.de DE
-.fi
-.RE
-.sp
-..
-'\"	# SO - start of list of standard options
-.de SO
-.SH "STANDARD OPTIONS"
-.LP
-.nf
-.ta 4c 8c 12c
-.ft B
-..
-'\"	# SE - end of list of standard options
-.de SE
-.fi
-.ft R
-.LP
-See the \\fBoptions\\fR manual entry for details on the standard options.
-..
-'\"	# OP - start of full description for a single option
-.de OP
-.LP
-.nf
-.ta 4c
-Command-Line Name:	\\fB\\$1\\fR
-Database Name:	\\fB\\$2\\fR
-Database Class:	\\fB\\$3\\fR
-.fi
-.IP
-..
-'\"	# CS - begin code excerpt
-.de CS
-.RS
-.nf
-.ta .25i .5i .75i 1i
-..
-'\"	# CE - end code excerpt
-.de CE
-.fi
-.RE
-..
-.de UL
-\\$1\l'|0\(ul'\\$2
-..
diff --git a/doc/msgcat.n b/doc/msgcat.n
deleted file mode 100644
index e04d2a6..0000000
--- a/doc/msgcat.n
+++ /dev/null
@@ -1,207 +0,0 @@
-'\"
-'\" Copyright (c) 1998 Mark Harrison.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" SCCS: @(#) msgcat.n
-'\" 
-.so man.macros
-.TH "msgcat" n 8.1 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-msgcat \- Tcl message catalog
-.SH SYNOPSIS
-\fB::msgcat::mc src-string\fR
-.sp
-\fB::msgcat::mclocale \fR?\fInewLocale\fR?
-.sp
-\fB::msgcat::mcpreferences\fR
-.sp
-\fB::msgcat::mcload \fIdirname\fR
-.sp
-\fB::msgcat::mcset \fIlocale src-string \fR?\fItranslate-string\fR?
-.sp
-\fB::msgcat::mcunknown \fIlocale src-string\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBmsgcat\fR package provides a set of functions
-that can be used to manage multi-lingual user interfaces.
-Text strings are defined in a ``message catalog'' which
-is independent from the application, and
-which can be edited or localized without modifying
-the application source code.  New languages
-or locales are provided by adding a new file to
-the message catalog.
-.PP
-Use of the message catalog is optional by any application
-or package, but is encouraged if the application or package
-wishes to be enabled for multi-lingual applications.
-
-.SH COMMANDS
-.TP
-\fB::msgcat::mc src-string\fR
-Returns a translation of \fIsrc-string\fR according to the
-user's current locale.  If no translation string
-exists, \fB::msgcat::mcunknown\fR is called and the string
-returned from \fB::msgcat::mcunknown\fR is returned.
-.PP
-\fB::msgcat::mc\fR is the main function used to localize an
-application.  Instead of using an English string directly, an
-applicaton can pass the English string through \fB::msgcat::mc\fR and
-use the result.  If an application is written for a single language in
-this fashion, then it is easy to add support for additional languages
-later simply by defining new message catalog entries.
-.TP
-\fB::msgcat::mclocale \fR?\fInewLocale\fR?  
-This function sets the locale to \fInewLocale\fR.  If \fInewLocale\fR
-is omitted, the current locale is returned, otherwise the new locale
-is returned.  The initial locale defaults to the locale specified in
-the user's environment.  See \fBLOCALE AND SUBLOCALE SPECIFICATION\fR
-below for a description of the locale string format.
-.TP
-\fB::msgcat::mcpreferences\fR
-Returns an ordered list of the locales preferred by
-the user, based on the user's language specification.
-The list is ordered from most specific to least
-preference.  If the user has specified LANG=en_US_funky,
-this procedure would return {en_US_funky en_US en}.
-.TP
-\fB::msgcat::mcload \fIdirname\fR
-Searches the specified directory for files that match
-the language specifications returned by \fB::msgcat::mcpreferences\fR.
-Each file located is sourced.  The file extension is ``.msg''.
-The number of message files which matched the specification
-and were loaded is returned.
-.TP
-\fB::msgcat::mcset \fIlocale src-string \fR?\fItranslate-string\fR?
-Sets the translation for \fIsrc-string\fR to \fItranslate-string\fR
-in the specified \fIlocale\fR.  If \fItranslate-string\fR is not
-specified, \fIsrc-string\fR is used for both.  The function
-return \fItranslate-string\fR.
-.TP
-\fB::msgcat::mcunknown \fIlocale src-string\fR
-This routine is called by \fB::msgcat::mc\fR in the case when
-a translation for \fIsrc-string\fR is not defined in the
-current locale.  The default action is to return
-\fIsrc-string\fR.  This procedure can be redefined by the
-application, for example to log error messages for each unknown
-string.  The \fB::msgcat::mcunknown\fB procedure is invoked at the
-same stack context as the call to \fB::msgcat::mc\fR.  The return vaue
-of \fB::msgcat::mcunknown\fB is used as the return vaue for the call
-to \fB::msgcat::mc\fR.  
-
-.SH "LOCALE AND SUBLOCALE SPECIFICATION"
-.PP
-The locale is specified by a locale string.
-The locale string consists of
-a language code, an optional country code, and an optional
-system-specific code, each separated by ``_''.  The country and language
-codes are specified in standards ISO-639 and ISO-3166.
-For example, the locale ``en'' specifies English and
- ``en_US'' specifes  U.S. English.
-.PP
-The locale defaults to the value in \fBenv(LANG)\fR at the time the
-\fBmsgcat\fR package is loaded.  If \fBenv(LANG)\fR is not defined, then the
-locale defaults to ``C''.
-.PP
-When a locale is specified by the user, a ``best match'' search is
-performed during string translation.  For example, if a user specifies
-en_UK_Funky, the locales ``en_UK_Funky'', ``en_UK'', and ``en'' are
-searched in order until a matching translation string is found.  If no
-translation string is available, then \fB::msgcat::unknown\fR is
-called.
-
-.SH "NAMESPACES AND MESSAGE CATALOGS"
-.PP
-Strings stored in the message catalog are stored relative
-to the namespace from which they were added.  This allows
-multiple packages to use the same strings without fear
-of collisions with other packages.  It also allows the
-source string to be shorter and less prone to typographical
-error.
-.PP
-For example, executing the code
-.CS
-mcset en hello "hello from ::"
-namespace eval foo {mcset en hello "hello from ::foo"}
-puts [mc hello]
-namespace eval foo {puts [mc hello]}
-.CE
-will print
-.CS
-hello from ::
-hello from ::foo
-.CE
-
-.SH "LOCATION AND FORMAT OF MESSAGE FILES"
-.PP
-Message files can be located in any directory, subject
-to the following conditions:
-.IP [1]
-All message files for a package are in the same directory.
-.IP [2]
-The message file name is a locale specifier followed
-by ``.msg''.  For example:
-.CS
-es.msg    -- spanish
-en_UK.msg -- UK English
-.CE
-.IP [3]
-The file contains a series of calls to mcset, setting the
-necessary translation strings for the language. For example:
-.CS
-::msgcat::mcset es "Free Beer!" "Cerveza Gracias!"
-.CE
-
-.SH "RECOMMENDED MESSAGE SETUP FOR PACKAGES"
-.PP
-If a package is installed into a subdirectory of the
-\fBtcl_pkgPath\fR and loaded via \fBpackage require\fR, the
-following procedure is recommended.
-.IP [1]
-During package installation, create a subdirectory
-\fBmsgs\fR under your package directory.
-.IP [2]
-Copy your *.msg files into that directory.
-.IP [3]
- Add the following command to your package
-initialization script:
-.CS
-# load language files, stored in msgs subdirectory
-::msgcat::mcload [file join [file dirname [info script]] msgs]
-.CE
-
-.SH "POSTITIONAL CODES FOR FORMAT AND SCAN COMMANDS"
-.PP
-It is possible that a message string used as an argument
-to \fBformat\fR might have positionally dependent parameters that
-might need to be repositioned.  For example, it might be
-syntactically desirable to rearrange the sentence structure
-while translating.
-.CS
-format "We produced %d units in location %s" $num $city
-format "In location %s we produced %d units" $city $num
-.CE
-.PP
-This can be handled by using the positional
-parameters:
-.CS
-format "We produced %1\\\\$d units in location %2\\\\$s" $num $city
-format "In location %2\\\\$s we produced %1\\\\$d units" $num $city
-.CE
-.PP
-Similarly, positional parameters can be used with \fBscan\fR to
-extract values from internationalized strings.
-
-.SH "SEE ALSO"
-format(n), scan(n), namespace(n), package(n)
-
-.SH CREDITS
-.PP
-The message catalog code was developed by Mark Harrison.
-.SH KEYWORDS
-internationalization, i18n, localization, l10n, message, text, translation
diff --git a/doc/namespace.n b/doc/namespace.n
deleted file mode 100644
index eeb45f5..0000000
--- a/doc/namespace.n
+++ /dev/null
@@ -1,563 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1997 Bell Labs Innovations for Lucent Technologies
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: namespace.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH namespace n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-namespace \- create and manipulate contexts for commands and variables
-.SH SYNOPSIS
-\fBnamespace \fR?\fIoption\fR? ?\fIarg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBnamespace\fR command lets you create, access, and destroy
-separate contexts for commands and variables.
-See the section \fBWHAT IS A NAMESPACE?\fR below
-for a brief overview of namespaces.
-The legal \fIoption\fR's are listed below.
-Note that you can abbreviate the \fIoption\fR's.
-.TP
-\fBnamespace children \fR?\fInamespace\fR? ?\fIpattern\fR?
-Returns a list of all child namespaces that belong to the
-namespace \fInamespace\fR.
-If \fInamespace\fR is not specified,
-then the children are returned for the current namespace.
-This command returns fully-qualified names,
-which start with \fB::\fR.
-If the optional \fIpattern\fR is given,
-then this command returns only the names that match the glob-style pattern.
-The actual pattern used is determined as follows:
-a pattern that starts with \fB::\fR is used directly,
-otherwise the namespace \fInamespace\fR
-(or the fully-qualified name of the current namespace)
-is prepended onto the the pattern.
-.TP
-\fBnamespace code \fIscript\fR
-Captures the current namespace context for later execution
-of the script \fIscript\fR.
-It returns a new script in which \fIscript\fR has been wrapped
-in a \fBnamespace code\fR command.
-The new script has two important properties.
-First, it can be evaluated in any namespace and will cause
-\fIscript\fR to be evaluated in the current namespace
-(the one where the \fBnamespace code\fR command was invoked).
-Second, additional arguments can be appended to the resulting script
-and they will be passed to \fIscript\fR as additional arguments.
-For example, suppose the command
-\fBset script [namespace code {foo bar}]\fR
-is invoked in namespace \fB::a::b\fR.
-Then \fBeval "$script x y"\fR
-can be executed in any namespace (assuming the value of
-\fBscript\fR has been passed in properly)
-and will have the same effect as the command
-\fBnamespace eval ::a::b {foo bar x y}\fR.
-This command is needed because
-extensions like Tk normally execute callback scripts
-in the global namespace.
-A scoped command captures a command together with its namespace context
-in a way that allows it to be executed properly later.
-See the section \fBSCOPED VALUES\fR for some examples
-of how this is used to create callback scripts.
-.TP
-\fBnamespace current\fR
-Returns the fully-qualified name for the current namespace.
-The actual name of the global namespace is ``''
-(i.e., an empty string),
-but this command returns \fB::\fR for the global namespace
-as a convenience to programmers.
-.TP
-\fBnamespace delete \fR?\fInamespace namespace ...\fR?
-Each namespace \fInamespace\fR is deleted
-and all variables, procedures, and child namespaces
-contained in the namespace are deleted.
-If a procedure is currently executing inside the namespace,
-the namespace will be kept alive until the procedure returns;
-however, the namespace is marked to prevent other code from
-looking it up by name.
-If a namespace doesn't exist, this command returns an error.
-If no namespace names are given, this command does nothing.
-.TP
-\fBnamespace eval\fR \fInamespace arg\fR ?\fIarg ...\fR?
-Activates a namespace called \fInamespace\fR and evaluates some code
-in that context.
-If the namespace does not already exist, it is created.
-If more than one \fIarg\fR argument is specified,
-the arguments are concatenated together with a space between each one
-in the same fashion as the \fBeval\fR command,
-and the result is evaluated.
-.br
-.sp
-If \fInamespace\fR has leading namespace qualifiers
-and any leading namespaces do not exist,
-they are automatically created.
-.TP
-\fBnamespace export \fR?\-\fBclear\fR? ?\fIpattern pattern ...\fR?
-Specifies which commands are exported from a namespace.
-The exported commands are those that can be later imported
-into another namespace using a \fBnamespace import\fR command.
-Both commands defined in a namespace and
-commands the namespace has previously imported
-can be exported by a namespace.
-The commands do not have to be defined
-at the time the \fBnamespace export\fR command is executed.
-Each \fIpattern\fR may contain glob-style special characters,
-but it may not include any namespace qualifiers.
-That is, the pattern can only specify commands
-in the current (exporting) namespace.
-Each \fIpattern\fR is appended onto the namespace's list of export patterns.
-If the \-\fBclear\fR flag is given,
-the namespace's export pattern list is reset to empty before any
-\fIpattern\fR arguments are appended.
-If no \fIpattern\fRs are given and the \-\fBclear\fR flag isn't given,
-this command returns the namespace's current export list.
-.TP
-\fBnamespace forget \fR?\fIpattern pattern ...\fR?
-Removes previously imported commands from a namespace.
-Each \fIpattern\fR is a qualified name such as
-\fBfoo::x\fR or \fBa::b::p*\fR.
-Qualified names contain \fB::\fRs and qualify a name
-with the name of one or more namespaces.
-Each \fIpattern\fR is qualified with the name of an exporting namespace
-and may have glob-style special characters in the command name
-at the end of the qualified name.
-Glob characters may not appear in a namespace name.
-This command first finds the matching exported commands.
-It then checks whether any of those those commands
-were previously imported by the current namespace.
-If so, this command deletes the corresponding imported commands. 
-In effect, this un-does the action of a \fBnamespace import\fR command.
-.TP
-\fBnamespace import \fR?\fB\-force\fR? ?\fIpattern\fR \fIpattern ...\fR?
-Imports commands into a namespace.
-Each \fIpattern\fR is a qualified name like
-\fBfoo::x\fR or \fBa::p*\fR.
-That is, it includes the name of an exporting namespace
-and may have glob-style special characters in the command name
-at the end of the qualified name.
-Glob characters may not appear in a namespace name.
-All the commands that match a \fIpattern\fR string
-and which are currently exported from their namespace
-are added to the current namespace.
-This is done by creating a new command in the current namespace
-that points to the exported command in its original namespace;
-when the new imported command is called, it invokes the exported command.
-This command normally returns an error
-if an imported command conflicts with an existing command.
-However, if the \-\fBforce\fR option is given,
-imported commands will silently replace existing commands.
-The \fBnamespace import\fR command has snapshot semantics:
-that is, only requested commands that are currently defined
-in the exporting namespace are imported.
-In other words, you can import only the commands that are in a namespace
-at the time when the \fBnamespace import\fR command is executed.
-If another command is defined and exported in this namespace later on,
-it will not be imported.
-.TP
-\fBnamespace inscope\fR \fInamespace arg\fR ?\fIarg ...\fR?
-Executes a script in the context of a particular namespace.
-This command is not expected to be used directly by programmers;
-calls to it are generated implicitly when applications
-use \fBnamespace code\fR commands to create callback scripts
-that the applications then register with, e.g., Tk widgets.
-The \fBnamespace inscope\fR command is much like the \fBnamespace eval\fR
-command except that it has \fBlappend\fR semantics
-and the namespace must already exist.
-It treats the first argument as a list,
-and appends any arguments after the first
-onto the end as proper list elements.
-\fBnamespace inscope ::foo a x y z\fR
-is equivalent to
-\fBnamespace eval ::foo [concat a [list x y z]]\fR
-This \fBlappend\fR semantics is important because many callback scripts
-are actually prefixes.
-.TP
-\fBnamespace origin \fIcommand\fR
-Returns the fully-qualified name of the original command
-to which the imported command \fIcommand\fR refers.
-When a command is imported into a namespace,
-a new command is created in that namespace
-that points to the actual command in the exporting namespace.
-If a command is imported into a sequence of namespaces
-\fIa, b,...,n\fR where each successive namespace
-just imports the command from the previous namespace,
-this command returns the fully-qualified name of the original command
-in the first namespace, \fIa\fR.
-If \fIcommand\fR does not refer to an imported command,
-the command's own fully-qualified name is returned.
-.TP
-\fBnamespace parent\fR ?\fInamespace\fR?
-Returns the fully-qualified name of the parent namespace
-for namespace \fInamespace\fR.
-If \fInamespace\fR is not specified,
-the fully-qualified name of the current namespace's parent is returned.
-.TP
-\fBnamespace qualifiers\fR \fIstring\fR
-Returns any leading namespace qualifiers for \fIstring\fR.
-Qualifiers are namespace names separated by \fB::\fRs.
-For the \fIstring\fR \fB::foo::bar::x\fR,
-this command returns \fB::foo::bar\fR,
-and for \fB::\fR it returns \fB``''\fR (an empty string).
-This command is the complement of the \fBnamespace tail\fR command.
-Note that it does not check whether the
-namespace names are, in fact,
-the names of currently defined namespaces.
-.TP
-\fBnamespace tail\fR \fIstring\fR
-Returns the simple name at the end of a qualified string.
-Qualifiers are namespace names separated by \fB::\fRs.
-For the \fIstring\fR \fB::foo::bar::x\fR,
-this command returns \fBx\fR,
-and for \fB::\fR it returns \fB``''\fR (an empty string).
-This command is the complement of the \fBnamespace qualifiers\fR command.
-It does not check whether the namespace names are, in fact,
-the names of currently defined namespaces.
-.TP
-\fBnamespace which\fR ?\-\fBcommand\fR? ?\-\fBvariable\fR? \fIname\fR
-Looks up \fIname\fR as either a command or variable
-and returns its fully-qualified name.
-For example, if \fIname\fR does not exist in the current namespace
-but does exist in the global namespace,
-this command returns a fully-qualified name in the global namespace.
-If the command or variable does not exist,
-this command returns an empty string.
-If no flag is given, \fIname\fR is treated as a command name.
-See the section \fBNAME RESOLUTION\fR below for an explanation of
-the rules regarding name resolution.
-
-.SH "WHAT IS A NAMESPACE?"
-.PP
-A namespace is a collection of commands and variables.
-It encapsulates the commands and variables to ensure that they
-won't interfere with the commands and variables of other namespaces.
-Tcl has always had one such collection,
-which we refer to as the \fIglobal namespace\fR.
-The global namespace holds all global variables and commands.
-The \fBnamespace eval\fR command lets you create new namespaces.
-For example,
-.CS
-\fBnamespace eval Counter {
-    namespace export bump
-    variable num 0
-
-    proc bump {} {
-        variable num
-        incr num
-    }
-}\fR
-.CE
-creates a new namespace containing the variable \fBnum\fR and
-the procedure \fBbump\fR.
-The commands and variables in this namespace are separate from
-other commands and variables in the same program.
-If there is a command named \fBbump\fR in the global namespace,
-for example, it will be different from the command \fBbump\fR
-in the \fBCounter\fR namespace.
-.PP
-Namespace variables resemble global variables in Tcl.
-They exist outside of the procedures in a namespace
-but can be accessed in a procedure via the \fBvariable\fR command,
-as shown in the example above.
-.PP
-Namespaces are dynamic.
-You can add and delete commands and variables at any time,
-so you can build up the contents of a
-namespace over time using a series of \fBnamespace eval\fR commands.
-For example, the following series of commands has the same effect
-as the namespace definition shown above:
-.CS
-\fBnamespace eval Counter {
-    variable num 0
-    proc bump {} {
-        variable num
-        return [incr num]
-    }
-}
-namespace eval Counter {
-    proc test {args} {
-        return $args
-    }
-}
-namespace eval Counter {
-    rename test ""
-}\fR
-.CE
-Note that the \fBtest\fR procedure is added to the \fBCounter\fR namespace,
-and later removed via the \fBrename\fR command.
-.PP
-Namespaces can have other namespaces within them,
-so they nest hierarchically.
-A nested namespace is encapsulated inside its parent namespace
-and can not interfere with other namespaces.
-
-.SH "QUALIFIED NAMES"
-.PP
-Each namespace has a textual name such as
-\fBhistory\fR or \fB::safe::interp\fR.
-Since namespaces may nest,
-qualified names are used to refer to
-commands, variables, and child namespaces contained inside namespaces.
-Qualified names are similar to the hierarchical path names for
-Unix files or Tk widgets,
-except that \fB::\fR is used as the separator
-instead of \fB/\fR or \fB.\fR.
-The topmost or global namespace has the name ``'' (i.e., an empty string),
-although \fB::\fR is a synonym.
-As an example, the name \fB::safe::interp::create\fR
-refers to the command \fBcreate\fR in the namespace \fBinterp\fR
-that is a child of of namespace \fB::safe\fR,
-which in turn is a child of the global namespace \fB::\fR.
-.PP
-If you want to access commands and variables from another namespace,
-you must use some extra syntax.
-Names must be qualified by the namespace that contains them.
-From the global namespace,
-we might access the \fBCounter\fR procedures like this:
-.CS
-\fBCounter::bump 5
-Counter::Reset\fR
-.CE
-We could access the current count like this:
-.CS
-\fBputs "count = $Counter::num"\fR
-.CE
-When one namespace contains another, you may need more than one
-qualifier to reach its elements.
-If we had a namespace \fBFoo\fR that contained the namespace \fBCounter\fR,
-you could invoke its \fBbump\fR procedure
-from the global namespace like this:
-.CS
-\fBFoo::Counter::bump 3\fR
-.CE
-.PP
-You can also use qualified names when you create and rename commands.
-For example, you could add a procedure to the \fBFoo\fR
-namespace like this:
-.CS
-\fBproc Foo::Test {args} {return $args}\fR
-.CE
-And you could move the same procedure to another namespace like this:
-.CS
-\fBrename Foo::Test Bar::Test\fR
-.CE
-.PP
-There are a few remaining points about qualified names
-that we should cover.
-Namespaces have nonempty names except for the global namespace.
-\fB::\fR is disallowed in simple command, variable, and namespace names
-except as a namespace separator.
-Extra \fB:\fRs in a qualified name are ignored;
-that is, two or more \fB:\fRs are treated as a namespace separator.
-A trailing \fB::\fR in a qualified variable or command name
-refers to the variable or command named {}.
-However, a trailing \fB::\fR in a qualified namespace name is ignored.
-
-.SH "NAME RESOLUTION"
-.PP
-In general, all Tcl commands that take variable and command names
-support qualified names.
-This means you can give qualified names to such commands as
-\fBset\fR, \fBproc\fR, \fBrename\fR, and \fBinterp alias\fR.
-If you provide a fully-qualified name that starts with a \fB::\fR,
-there is no question about what command, variable, or namespace
-you mean.
-However, if the name does not start with a \fB::\fR
-(i.e., is \fIrelative\fR), 
-Tcl follows a fixed rule for looking it up:
-Command and variable names are always resolved
-by looking first in the current namespace,
-and then in the global namespace.
-Namespace names, on the other hand, are always resolved
-by looking in only the current namespace.
-.PP
-In the following example,
-.CS
-\fBset traceLevel 0
-namespace eval Debug {
-    printTrace $traceLevel
-}\fR
-.CE
-Tcl looks for \fBtraceLevel\fR in the namespace \fBDebug\fR
-and then in the global namespace.
-It looks up the command \fBprintTrace\fR in the same way.
-If a variable or command name is not found in either context,
-the name is undefined.
-To make this point absolutely clear, consider the following example:
-.CS
-\fBset traceLevel 0
-namespace eval Foo {
-    variable traceLevel 3
-
-    namespace eval Debug {
-        printTrace $traceLevel
-    }
-}\fR
-.CE
-Here Tcl looks for \fBtraceLevel\fR first in the namespace \fBFoo::Debug\fR.
-Since it is not found there, Tcl then looks for it 
-in the global namespace.
-The variable \fBFoo::traceLevel\fR is completely ignored
-during the name resolution process.
-.PP
-You can use the \fBnamespace which\fR command to clear up any question
-about name resolution.
-For example, the command:
-.CS
-\fBnamespace eval Foo::Debug {namespace which \-variable traceLevel}\fR
-.CE
-returns \fB::traceLevel\fR.
-On the other hand, the command,
-.CS
-\fBnamespace eval Foo {namespace which \-variable traceLevel}\fR
-.CE
-returns \fB::Foo::traceLevel\fR.
-.PP
-As mentioned above,
-namespace names are looked up differently
-than the names of variables and commands.
-Namespace names are always resolved in the current namespace.
-This means, for example,
-that a \fBnamespace eval\fR command that creates a new namespace
-always creates a child of the current namespace
-unless the new namespace name begins with a \fB::\fR.
-.PP
-Tcl has no access control to limit what variables, commands,
-or namespaces you can reference.
-If you provide a qualified name that resolves to an element
-by the name resolution rule above,
-you can access the element.
-.PP
-You can access a namespace variable
-from a procedure in the same namespace
-by using the \fBvariable\fR command.
-Much like the \fBglobal\fR command,
-this creates a local link to the namespace variable.
-If necessary, it also creates the variable in the current namespace
-and initializes it.
-Note that the \fBglobal\fR command only creates links
-to variables in the global namespace.
-It is not necessary to use a \fBvariable\fR command
-if you always refer to the namespace variable using an
-appropriate qualified name.
-
-.SH "IMPORTING COMMANDS"
-.PP
-Namespaces are often used to represent libraries.
-Some library commands are used so frequently
-that it is a nuisance to type their qualified names.
-For example, suppose that all of the commands in a package
-like BLT are contained in a namespace called \fBBlt\fR.
-Then you might access these commands like this:
-.CS
-\fBBlt::graph .g \-background red
-Blt::table . .g 0,0\fR
-.CE
-If you use the \fBgraph\fR and \fBtable\fR commands frequently,
-you may want to access them without the \fBBlt::\fR prefix.
-You can do this by importing the commands into the current namespace,
-like this:
-.CS
-\fBnamespace import Blt::*\fR
-.CE
-This adds all exported commands from the \fBBlt\fR namespace
-into the current namespace context, so you can write code like this:
-.CS
-\fBgraph .g \-background red
-table . .g 0,0\fR
-.CE
-The \fBnamespace import\fR command only imports commands
-from a namespace that that namespace exported
-with a \fBnamespace export\fR command.
-.PP
-Importing \fIevery\fR command from a namespace is generally
-a bad idea since you don't know what you will get.
-It is better to import just the specific commands you need.
-For example, the command
-.CS
-\fBnamespace import Blt::graph Blt::table\fR
-.CE
-imports only the \fBgraph\fR and \fBtable\fR commands into the
-current context.
-.PP
-If you try to import a command that already exists, you will get an
-error.  This prevents you from importing the same command from two
-different packages.  But from time to time (perhaps when debugging),
-you may want to get around this restriction.  You may want to
-reissue the \fBnamespace import\fR command to pick up new commands
-that have appeared in a namespace.  In that case, you can use the
-\fB\-force\fR option, and existing commands will be silently overwritten:
-.CS
-\fBnamespace import \-force Blt::graph Blt::table\fR
-.CE
-If for some reason, you want to stop using the imported commands,
-you can remove them with an \fBnamespace forget\fR command, like this:
-.CS
-\fBnamespace forget Blt::*\fR
-.CE
-This searches the current namespace for any commands imported from \fBBlt\fR.
-If it finds any, it removes them.  Otherwise, it does nothing.
-After this, the \fBBlt\fR commands must be accessed with the \fBBlt::\fR
-prefix.
-.PP
-When you delete a command from the exporting namespace like this:
-.CS
-\fBrename Blt::graph ""\fR
-.CE
-the command is automatically removed from all namespaces that import it.
-
-.SH "EXPORTING COMMANDS"
-You can export commands from a namespace like this:
-.CS
-\fBnamespace eval Counter {
-    namespace export bump reset
-    variable Num 0
-    variable Max 100
-
-    proc bump {{by 1}} {
-        variable Num
-        incr Num $by
-        Check
-        return $Num
-    }
-    proc reset {} {
-        variable Num
-        set Num 0
-    }
-    proc Check {} {
-        variable Num
-        variable Max
-        if {$Num > $Max} {
-            error "too high!"
-        }
-    }
-}\fR
-.CE
-The procedures \fBbump\fR and \fBreset\fR are exported,
-so they are included when you import from the \fBCounter\fR namespace,
-like this:
-.CS
-\fBnamespace import Counter::*\fR
-.CE
-However, the \fBCheck\fR procedure is not exported,
-so it is ignored by the import operation.
-.PP
-The \fBnamespace import\fR command only imports commands
-that were declared as exported by their namespace.
-The \fBnamespace export\fR command specifies what commands
-may be imported by other namespaces.
-If a \fBnamespace import\fR command specifies a command
-that is not exported, the command is not imported.
-
-.SH "SEE ALSO"
-variable(n)
-
-.SH KEYWORDS
-exported, internal, variable
diff --git a/doc/open.n b/doc/open.n
deleted file mode 100644
index 03e4339..0000000
--- a/doc/open.n
+++ /dev/null
@@ -1,249 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: open.n,v 1.4 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH open n 7.6 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-open \- Open a file-based or command pipeline channel
-.SH SYNOPSIS
-.sp
-\fBopen \fIfileName\fR
-.br
-\fBopen \fIfileName access\fR
-.br
-\fBopen \fIfileName access permissions\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-.VS
-This command opens a file, serial port, or command pipeline and returns a
-.VE
-channel identifier that may be used in future invocations of commands like
-\fBread\fR, \fBputs\fR, and \fBclose\fR.
-If the first character of \fIfileName\fR is not \fB|\fR then
-the command opens a file:
-\fIfileName\fR gives the name of the file to open, and it must conform to the
-conventions described in the \fBfilename\fR manual entry.
-.PP
-The \fIaccess\fR argument, if present, indicates the way in which the file
-(or command pipeline) is to be accessed.
-In the first form \fIaccess\fR may have any of the following values:
-.TP 15
-\fBr\fR
-Open the file for reading only; the file must already exist. This is the
-default value if \fIaccess\fR is not specified.
-.TP 15
-\fBr+\fR
-Open the file for both reading and writing; the file must
-already exist.
-.TP 15
-\fBw\fR
-Open the file for writing only.  Truncate it if it exists.  If it doesn't
-exist, create a new file.
-.TP 15
-\fBw+\fR
-Open the file for reading and writing.  Truncate it if it exists.
-If it doesn't exist, create a new file.
-.TP 15
-\fBa\fR
-Open the file for writing only.  The file must already exist, and the file
-is positioned so that new data is appended to the file.
-.TP 15
-\fBa+\fR
-Open the file for reading and writing.  If the file doesn't exist,
-create a new empty file.
-Set the initial access position  to the end of the file.
-.PP
-In the second form, \fIaccess\fR consists of a list of any of the
-following flags, all of which have the standard POSIX meanings.
-One of the flags must be either \fBRDONLY\fR, \fBWRONLY\fR or \fBRDWR\fR.
-.TP 15
-\fBRDONLY\fR
-Open the file for reading only.
-.TP 15
-\fBWRONLY\fR
-Open the file for writing only.
-.TP 15
-\fBRDWR\fR
-Open the file for both reading and writing.
-.TP 15
-\fBAPPEND\fR
-Set the file pointer to the end of the file prior to each write.
-.TP 15
-\fBCREAT\fR
-Create the file if it doesn't already exist (without this flag it
-is an error for the file not to exist).
-.TP 15
-\fBEXCL\fR
-If \fBCREAT\fR is also specified, an error is returned if the
-file already exists.
-.TP 15
-\fBNOCTTY\fR
-If the file is a terminal device, this flag prevents the file from
-becoming the controlling terminal of the process.
-.TP 15
-\fBNONBLOCK\fR
-Prevents the process from blocking while opening the file, and
-possibly in subsequent I/O operations.  The exact behavior of
-this flag is system- and device-dependent;  its use is discouraged
-(it is better to use the \fBfconfigure\fR command to put a file
-in nonblocking mode).
-For details refer to your system documentation on the \fBopen\fR system
-call's \fBO_NONBLOCK\fR flag.
-.TP 15
-\fBTRUNC\fR
-If the file exists it is truncated to zero length.
-.PP
-If a new file is created as part of opening it, \fIpermissions\fR
-(an integer) is used to set the permissions for the new file in
-conjunction with the process's file mode creation mask.
-\fIPermissions\fR defaults to 0666.
-.SH "COMMAND PIPELINES"
-.PP
-If the first character of \fIfileName\fR is ``|'' then the
-remaining characters of \fIfileName\fR are treated as a list of arguments
-that describe a command pipeline to invoke, in the same style as the
-arguments for \fBexec\fR.
-In this case, the channel identifier returned by \fBopen\fR may be used
-to write to the command's input pipe or read from its output pipe,
-depending on the value of \fIaccess\fR.
-If write-only access is used (e.g. \fIaccess\fR is \fBw\fR), then
-standard output for the pipeline is directed to the current standard
-output unless overridden by the command.
-If read-only access is used (e.g. \fIaccess\fR is \fBr\fR),
-standard input for the pipeline is taken from the current standard
-input unless overridden by the command.
-.SH "SERIAL COMMUNICATIONS"
-.VS
-.PP
-If \fIfileName\fR refers to a serial port, then the specified serial port
-is opened and initialized in a platform-dependent manner.  Acceptable
-values for the \fIfileName\fR to use to open a serial port are described in
-the PORTABILITY ISSUES section.
-
-.SH "CONFIGURATION OPTIONS"
-The \fBfconfigure\fR command can be used to query and set the following
-configuration option for open serial ports:
-.TP
-\fB\-mode \fIbaud\fB,\fIparity\fB,\fIdata\fB,\fIstop\fR
-.
-This option is a set of 4 comma-separated values: the baud rate, parity,
-number of data bits, and number of stop bits for this serial port.  The
-\fIbaud\fR rate is a simple integer that specifies the connection speed.
-\fIParity\fR is one of the following letters: \fBn\fR, \fBo\fR, \fBe\fR,
-\fBm\fR, \fBs\fR; respectively signifying the parity options of ``none'',
-``odd'', ``even'', ``mark'', or ``space''.  \fIData\fR is the number of
-data bits and should be an integer from 5 to 8, while \fIstop\fR is the
-number of stop bits and should be the integer 1 or 2.
-.VE
-
-.VS
-.SH "PORTABILITY ISSUES"
-.sp
-.TP
-\fBWindows \fR(all versions)
-.
-Valid values for \fIfileName\fR to open a serial port are of the form
-\fBcom\fIX\fB:\fR, where \fIX\fR is a number, generally from 1 to 4.  An
-attempt to open a serial port that does not exist will fail.
-.TP
-\fBWindows NT\fR
-.
-When running Tcl interactively, there may be some strange interactions
-between the real console, if one is present, and a command pipeline that uses
-standard input or output.  If a command pipeline is opened for reading, some
-of the lines entered at the console will be sent to the command pipeline and
-some will be sent to the Tcl evaluator.  If a command pipeline is opened for
-writing, keystrokes entered into the console are not visible until the the
-pipe is closed.  This behavior occurs whether the command pipeline is
-executing 16-bit or 32-bit applications.  These problems only occur because
-both Tcl and the child application are competing for the console at
-the same time.  If the command pipeline is started from a script, so that Tcl
-is not accessing the console, or if the command pipeline does not use
-standard input or output, but is redirected from or to a file, then the
-above problems do not occur.  
-.TP
-\fBWindows 95\fR 
-.
-A command pipeline that executes a 16-bit DOS application cannot be opened
-for both reading and writing, since 16-bit DOS applications that receive
-standard input from a pipe and send standard output to a pipe run
-synchronously.  Command pipelines that do not execute 16-bit DOS
-applications run asynchronously and can be opened for both reading and
-writing.  
-.sp
-When running Tcl interactively, there may be some strange interactions
-between the real console, if one is present, and a command pipeline that uses
-standard input or output.  If a command pipeline is opened for reading from
-a 32-bit application, some of the keystrokes entered at the console will be
-sent to the command pipeline and some will be sent to the Tcl evaluator.  If
-a command pipeline is opened for writing to a 32-bit application, no output
-is visible on the console until the the pipe is closed.  These problems only
-occur because both Tcl and the child application are competing for the
-console at the same time.  If the command pipeline is started from a script,
-so that Tcl is not accessing the console, or if the command pipeline does
-not use standard input or output, but is redirected from or to a file, then
-the above problems do not occur.  
-.sp
-Whether or not Tcl is running interactively, if a command pipeline is opened
-for reading from a 16-bit DOS application, the call to \fBopen\fR will not
-return until end-of-file has been received from the command pipeline's
-standard output.  If a command pipeline is opened for writing to a 16-bit DOS
-application, no data will be sent to the command pipeline's standard output
-until the pipe is actually closed.  This problem occurs because 16-bit DOS
-applications are run synchronously, as described above.  
-.TP
-\fBWindows 3.X\fR 
-.
-A command pipeline can execute 16-bit or 32-bit DOS or Windows
-applications, but the call to \fBopen\fR will not return until the last
-program in the pipeline has finished executing; command pipelines run
-synchronously.  If the pipeline is opened with write access (either just
-writing or both reading and writing) the first application in the
-pipeline will instead see an immediate end-of-file; any data the caller
-writes to the open pipe will instead be discarded.
-.sp
-Since Tcl cannot be run with a real console under Windows 3.X, there are
-no interactions between command pipelines and the console.
-.TP
-\fBMacintosh\fR
-.
-Opening a serial port is not currently implemented under Macintosh.
-.sp
-Opening a command pipeline is not supported under Macintosh, since 
-applications do not support the concept of standard input or output.
-.TP
-\fBUnix\fR\0\0\0\0\0\0\0
-.
-Valid values for \fIfileName\fR to open a serial port are generally of the
-form \fB/dev/tty\fIX\fR, where \fIX\fR is \fBa\fR or \fBb\fR, but the name
-of any pseudo-file that maps to a serial port may be used.
-.sp
-When running Tcl interactively, there may be some strange interactions
-between the console, if one is present, and a command pipeline that uses
-standard input.  If a command pipeline is opened for reading, some
-of the lines entered at the console will be sent to the command pipeline and
-some will be sent to the Tcl evaluator.  This problem only occurs because
-both Tcl and the child application are competing for the console at the
-same time.  If the command pipeline is started from a script, so that Tcl is
-not accessing the console, or if the command pipeline does not use standard
-input, but is redirected from a file, then the above problem does not occur.  
-.LP
-See the PORTABILITY ISSUES section of the \fBexec\fR command for additional
-information not specific to command pipelines about executing
-applications on the various platforms
-.SH "SEE ALSO"
-close(n), filename(n), gets(n), read(n), puts(n), exec(n)
-.VE
-.SH KEYWORDS
-access mode, append, create, file, non-blocking, open, permissions,
-pipeline, process, serial
diff --git a/doc/package.n b/doc/package.n
deleted file mode 100644
index f4d9f84..0000000
--- a/doc/package.n
+++ /dev/null
@@ -1,193 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: package.n,v 1.3 1999/03/10 05:52:45 stanton Exp $
-'\" 
-.so man.macros
-.TH package n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-package \- Facilities for package loading and version control
-.SH SYNOPSIS
-.nf
-\fBpackage forget \fIpackage\fR
-\fBpackage ifneeded \fIpackage version\fR ?\fIscript\fR?
-\fBpackage names\fR
-\fBpackage present \fR?\fB\-exact\fR? \fIpackage \fR?\fIversion\fR?
-\fBpackage provide \fIpackage \fR?\fIversion\fR?
-\fBpackage require \fR?\fB\-exact\fR? \fIpackage \fR?\fIversion\fR?
-\fBpackage unknown \fR?\fIcommand\fR?
-\fBpackage vcompare \fIversion1 version2\fR
-\fBpackage versions \fIpackage\fR
-\fBpackage vsatisfies \fIversion1 version2\fR
-.fi
-.BE
-
-.SH DESCRIPTION
-.PP
-This command keeps a simple database of the packages available for
-use by the current interpreter and how to load them into the
-interpreter.
-It supports multiple versions of each package and arranges
-for the correct version of a package to be loaded based on what
-is needed by the application.
-This command also detects and reports version clashes.
-Typically, only the \fBpackage require\fR and \fBpackage provide\fR
-commands are invoked in normal Tcl scripts;  the other commands are used
-primarily by system scripts that maintain the package database.
-.PP
-The behavior of the \fBpackage\fR command is determined by its first argument.
-The following forms are permitted:
-.TP
-\fBpackage forget \fIpackage\fR
-Removes all information about \fIpackage\fR from this interpreter,
-including information provided by both \fBpackage ifneeded\fR and
-\fBpackage provide\fR.
-.TP
-\fBpackage ifneeded \fIpackage version\fR ?\fIscript\fR?
-This command typically appears only in system configuration
-scripts to set up the package database.
-It indicates that a particular version of
-a particular package is available if needed, and that the package
-can be added to the interpreter by executing \fIscript\fR.
-The script is saved in a database for use by subsequent
-\fBpackage require\fR commands;  typically, \fIscript\fR
-sets up auto-loading for the commands in the package (or calls
-\fBload\fR and/or \fBsource\fR directly), then invokes
-\fBpackage provide\fR to indicate that the package is present.
-There may be information in the database for several different
-versions of a single package.
-If the database already contains information for \fIpackage\fR
-and \fIversion\fR, the new \fIscript\fR replaces the existing
-one.
-If the \fIscript\fR argument is omitted, the current script for
-version \fIversion\fR of package \fIpackage\fR is returned,
-or an empty string if no \fBpackage ifneeded\fR command has
-been invoked for this \fIpackage\fR and \fIversion\fR.
-.TP
-\fBpackage names\fR
-Returns a list of the names of all packages in the
-interpreter for which a version has been provided (via
-\fBpackage provide\fR) or for which a \fBpackage ifneeded\fR
-script is available.
-The order of elements in the list is arbitrary.
-.TP
-\fBpackage present \fR?\fB\-exact\fR? \fIpackage \fR?\fIversion\fR?
-This command is equivalent to \fBpackage require\fR except that it
-does not try and load the package if it is not already loaded.
-.TP
-\fBpackage provide \fIpackage \fR?\fIversion\fR?
-This command is invoked to indicate that version \fIversion\fR
-of package \fIpackage\fR is now present in the interpreter.
-It is typically invoked once as part of an \fBifneeded\fR script,
-and again by the package itself when it is finally loaded.
-An error occurs if a different version of \fIpackage\fR has been
-provided by a previous \fBpackage provide\fR command.
-If the \fIversion\fR argument is omitted, then the command
-returns the version number that is currently provided, or an
-empty string if no \fBpackage provide\fR command has been
-invoked for \fIpackage\fR in this interpreter.
-.TP
-\fBpackage require \fR?\fB\-exact\fR? \fIpackage \fR?\fIversion\fR?
-This command is typically invoked by Tcl code that wishes to use
-a particular version of a particular package.  The arguments
-indicate which package is wanted, and the command ensures that
-a suitable version of the package is loaded into the interpreter.
-If the command succeeds, it returns the version number that is
-loaded;  otherwise it generates an error.
-If both the \fB\-exact\fR
-switch and the \fIversion\fR argument are specified then only the
-given version is acceptable.  If \fB\-exact\fR is omitted but
-\fIversion\fR is specified, then versions later than \fIversion\fR
-are also acceptable as long as they have the same major version
-number as \fIversion\fR.
-If both \fB\-exact\fR and \fIversion\fR are omitted then any
-version whatsoever is acceptable.
-If a version of \fIpackage\fR has already been provided (by invoking
-the \fBpackage provide\fR command), then its version number must
-satisfy the criteria given by \fB\-exact\fR and \fIversion\fR and
-the command returns immediately.
-Otherwise, the command searches the database of information provided by
-previous \fBpackage ifneeded\fR commands to see if an acceptable
-version of the package is available.
-If so, the script for the highest acceptable version number is invoked;
-it must do whatever is necessary to load the package,
-including calling \fBpackage provide\fR for the package.
-If the \fBpackage ifneeded\fR database does not contain an acceptable
-version of the package and a \fBpackage unknown\fR command has been
-specified for the interpreter then that command is invoked;  when
-it completes, Tcl checks again to see if the package is now provided
-or if there is a \fBpackage ifneeded\fR script for it.
-If all of these steps fail to provide an acceptable version of the
-package, then the command returns an error.
-.TP
-\fBpackage unknown \fR?\fIcommand\fR?
-This command supplies a ``last resort'' command to invoke during
-\fBpackage require\fR if no suitable version of a package can be found
-in the \fBpackage ifneeded\fR database.
-If the \fIcommand\fR argument is supplied, it contains the first part
-of a command;  when the command is invoked during a \fBpackage require\fR
-command, Tcl appends two additional arguments giving the desired package
-name and version.
-For example, if \fIcommand\fR is \fBfoo bar\fR and later the command
-\fBpackage require test 2.4\fR is invoked, then Tcl will execute
-the command \fBfoo bar test 2.4\fR to load the package.
-If no version number is supplied to the \fBpackage require\fR command,
-then the version argument for the invoked command will be an empty string.
-If the \fBpackage unknown\fR command is invoked without a \fIcommand\fR
-argument, then the current \fBpackage unknown\fR script is returned,
-or an empty string if there is none.
-If \fIcommand\fR is specified as an empty string, then the current
-\fBpackage unknown\fR script is removed, if there is one.
-.TP
-\fBpackage vcompare \fIversion1 version2\fR
-Compares the two version numbers given by \fIversion1\fR and \fIversion2\fR.
-Returns -1 if \fIversion1\fR is an earlier version than \fIversion2\fR,
-0 if they are equal, and 1 if \fIversion1\fR is later than \fBversion2\fR.
-.TP
-\fBpackage versions \fIpackage\fR
-Returns a list of all the version numbers of \fIpackage\fR
-for which information has been provided by \fBpackage ifneeded\fR
-commands.
-.TP
-\fBpackage vsatisfies \fIversion1 version2\fR
-Returns 1 if scripts written for \fIversion2\fR will work unchanged
-with \fIversion1\fR (i.e. \fIversion1\fR is equal to or greater
-than \fIversion2\fR and they both have the same major version
-number), 0 otherwise.
-
-.SH "VERSION NUMBERS"
-.PP
-Version numbers consist of one or more decimal numbers separated
-by dots, such as 2 or 1.162 or 3.1.13.1.
-The first number is called the major version number.
-Larger numbers correspond to later versions of a package, with
-leftmost numbers having greater significance.
-For example, version 2.1 is later than 1.3 and version
-3.4.6 is later than 3.3.5.
-Missing fields are equivalent to zeroes:  version 1.3 is the
-same as version 1.3.0 and 1.3.0.0, so it is earlier than 1.3.1 or 1.3.0.2.
-A later version number is assumed to be upwards compatible with
-an earlier version number as long as both versions have the same
-major version number.
-For example, Tcl scripts written for version 2.3 of a package should
-work unchanged under versions 2.3.2, 2.4, and 2.5.1.
-Changes in the major version number signify incompatible changes:
-if code is written to use version 2.1 of a package, it is not guaranteed
-to work unmodified with either version 1.7.3 or version 3.1.
-
-.SH "PACKAGE INDICES"
-.PP
-The recommended way to use packages in Tcl is to invoke \fBpackage require\fR
-and \fBpackage provide\fR commands in scripts, and use the procedure
-\fBpkg_mkIndex\fR to create package index files.
-Once you've done this, packages will be loaded automatically
-in response to \fBpackage require\fR commands.
-See the documentation for \fBpkg_mkIndex\fR for details.
-
-.SH KEYWORDS
-package, version
diff --git a/doc/pid.n b/doc/pid.n
deleted file mode 100644
index 41f47ce..0000000
--- a/doc/pid.n
+++ /dev/null
@@ -1,34 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: pid.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH pid n 7.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-pid \- Retrieve process id(s)
-.SH SYNOPSIS
-\fBpid \fR?\fIfileId\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-If the \fIfileId\fR argument is given then it should normally
-refer to a process pipeline created with the \fBopen\fR command.
-In this case the \fBpid\fR command will return a list whose elements
-are the process identifiers of all the processes in the pipeline,
-in order.
-The list will be empty if \fIfileId\fR refers to an open file
-that isn't a process pipeline.
-If no \fIfileId\fR argument is given then \fBpid\fR returns the process
-identifier of the current process.
-All process identifiers are returned as decimal strings.
-
-.SH KEYWORDS
-file, pipeline, process identifier
diff --git a/doc/pkgMkIndex.n b/doc/pkgMkIndex.n
deleted file mode 100644
index bf211e1..0000000
--- a/doc/pkgMkIndex.n
+++ /dev/null
@@ -1,240 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: pkgMkIndex.n,v 1.6 1998/12/02 01:42:18 welch Exp $
-'\" 
-.so man.macros
-.TH pkg_mkIndex n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-pkg_mkIndex \- Build an index for automatic loading of packages
-.SH SYNOPSIS
-.nf
-.VS 8.0.3
-\fBpkg_mkIndex ?\fI-direct\fR? ?\fI-load pkgPat\fR? ?\fI-verbose\fR? \fIdir\fR ?\fIpattern pattern ...\fR?
-.VE
-.fi
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBPkg_mkIndex\fR is a utility procedure that is part of the standard
-Tcl library.
-It is used to create index files that allow packages to be loaded
-automatically when \fBpackage require\fR commands are executed.
-To use \fBpkg_mkIndex\fR, follow these steps:
-.IP [1]
-Create the package(s).
-Each package may consist of one or more Tcl script files or binary files.
-Binary files must be suitable for loading with the \fBload\fR command
-with a single argument;  for example, if the file is \fBtest.so\fR it must
-be possible to load this file with the command \fBload test.so\fR.
-Each script file must contain a \fBpackage provide\fR command to declare
-the package and version number, and each binary file must contain
-a call to \fBTcl_PkgProvide\fR.
-.IP [2]
-Create the index by invoking \fBpkg_mkIndex\fR.
-The \fIdir\fR argument gives the name of a directory and each
-\fIpattern\fR argument is a \fBglob\fR-style pattern that selects
-script or binary files in \fIdir\fR.
-.VS 8.0.3
-The default pattern is \fB*.tcl\fR and \fB*.[info sharedlibextension]\fR.
-.VE
-.sp 1
-\fBPkg_mkIndex\fR will create a file \fBpkgIndex.tcl\fR in \fIdir\fR
-with package information about all the files given by the \fIpattern\fR
-arguments.
-It does this by loading each file into a slave
-interpreter and seeing what packages
-and new commands appear (this is why it is essential to have
-\fBpackage provide\fR commands or \fBTcl_PkgProvide\fR calls
-in the files, as described above).
-If you have a package split among scripts and binary files, 
-or if you have dependencies among files,
-you may have to use the \fB-load\fP option
-or adjust the order in which \fBpkg_mkIndex\fR processes
-the files.  See COMPLEX CASES below.
-
-.IP [3]
-Install the package as a subdirectory of one of the directories given by
-the \fBtcl_pkgPath\fR variable.  If \fB$tcl_pkgPath\fR contains more
-than one directory, machine-dependent packages (e.g., those that
-contain binary shared libraries) should normally be installed
-under the first directory and machine-independent packages (e.g.,
-those that contain only Tcl scripts) should be installed under the
-second directory.
-The subdirectory should include
-the package's script and/or binary files as well as the \fBpkgIndex.tcl\fR
-file.  As long as the package is installed as a subdirectory of a
-directory in \fB$tcl_pkgPath\fR it will automatically be found during
-\fBpackage require\fR commands.
-.sp 1
-If you install the package anywhere else, then you must ensure that
-the directory containing the package is in the \fBauto_path\fR global variable
-or an immediate subdirectory of one of the directories in \fBauto_path\fR.
-\fBAuto_path\fR contains a list of directories that are searched
-by both the auto-loader and the package loader; by default it
-includes \fB$tcl_pkgPath\fR.
-The package loader also checks all of the subdirectories of the
-directories in \fBauto_path\fR.
-You can add a directory to \fBauto_path\fR explicitly in your
-application, or you can add the directory to your \fBTCLLIBPATH\fR
-environment variable:  if this environment variable is present,
-Tcl initializes \fBauto_path\fR from it during application startup.
-.IP [4]
-Once the above steps have been taken, all you need to do to use a
-package is to invoke \fBpackage require\fR.
-For example, if versions 2.1, 2.3, and 3.1 of package \fBTest\fR
-have been indexed by \fBpkg_mkIndex\fR, the command
-\fBpackage require Test\fR will make version 3.1 available
-and the command \fBpackage require \-exact Test 2.1\fR will
-make version 2.1 available.
-There may be many versions of a package in the various index files
-in \fBauto_path\fR, but only one will actually be loaded in a given
-interpreter, based on the first call to \fBpackage require\fR.
-Different versions of a package may be loaded in different
-interpreters.
-
-.SH OPTIONS
-The optional switches are:
-.TP 15
-\fB\-direct\fR
-The generated index
-will manage to load the package immediately upon \fBpackage require\fR
-instead of delaying loading until actual use of one of the commands.
-.TP 15
-\fB\-load \fIpkgPat\fR
-The index process will pre-load any packages that exist in the
-current interpreter and match \fIpkgPat\fP into the slave interpreter used to
-generate the index.  The pattern match uses string match rules.
-See COMPLEX CASES below.
-.TP 15
-\fB\-verbose\fR
-Generate output during the indexing process.  Output is via
-the \fBtclLog\fP procedure, which by default prints to stderr.
-.TP 15
-\fB\-\-\fR
-End of the flags, in case \fIdir\fP begins with a dash.
-
-.SH "PACKAGES AND THE AUTO-LOADER"
-.PP
-The package management facilities overlap somewhat with the auto-loader,
-in that both arrange for files to be loaded on-demand.
-However, package management is a higher-level mechanism that uses
-the auto-loader for the last step in the loading process.
-It is generally better to index a package with \fBpkg_mkIndex\fR
-rather than \fBauto_mkindex\fR because the package mechanism provides
-version control:  several versions of a package can be made available
-in the index files, with different applications using different
-versions based on \fBpackage require\fR commands.
-In contrast, \fBauto_mkindex\fR does not understand versions so
-it can only handle a single version of each package. 
-It is probably not a good idea to index a given package with both
-\fBpkg_mkIndex\fR and \fBauto_mkindex\fR.
-If you use \fBpkg_mkIndex\fR to index a package, its commands cannot
-be invoked until \fBpackage require\fR has been used to select a
-version;  in contrast, packages indexed with \fBauto_mkindex\fR
-can be used immediately since there is no version control.
-
-.SH "HOW IT WORKS"
-.PP
-\fBPkg_mkIndex\fR depends on the \fBpackage unknown\fR command,
-the \fBpackage ifneeded\fR command, and the auto-loader.
-The first time a \fBpackage require\fR command is invoked,
-the \fBpackage unknown\fR script is invoked.
-This is set by Tcl initialization to a script that
-evaluates all of the \fBpkgIndex.tcl\fR files in the
-\fBauto_path\fR.
-The \fBpkgIndex.tcl\fR files contain \fBpackage ifneeded\fR
-commands for each version of each available package;  these commands
-invoke \fBpackage provide\fR commands to announce the
-availability of the package, and they setup auto-loader
-information to load the files of the package.
-.VS 8.0.3
-Unless the \fI-direct\fR flag was provided when the \fBpkgIndex.tcl\fR
-was generated,
-.VE
-a given file of a given version of a given package isn't
-actually loaded until the first time one of its commands
-is invoked.
-Thus, after invoking \fBpackage require\fR you
-.VS 8.0.3
-may
-.VE
-not see
-the package's commands in the interpreter, but you will be able
-to invoke the commands and they will be auto-loaded.
-
-.VS 8.0.3
-.SH "DIRECT LOADING"
-.PP
-Some packages, for instance packages which use namespaces and export
-commands or those which require special initialization, might select
-that their package files be loaded immediately upon \fBpackage require\fR
-instead of delaying the actual loading to the first use of one of the
-package's command. This mode is enabled when generating the package
-index by specifying the \fI-direct\fR argument.
-.VE
-
-.SH "COMPLEX CASES"
-Most complex cases of dependencies among scripts
-and binary files, and packages being split among scripts and
-binary files are handled OK.  However, you may have to adjust
-the order in which files are processed by \fBpkg_mkIndex\fR.
-These issues are described in detail below.
-.PP
-If each script or file contains one package, and packages
-are only contained in one file, then things are easy.
-You simply specify all files to be indexed in any order
-with some glob patterns.
-.PP
-In general, it is OK for scripts to have dependencies on other
-packages.
-If scripts contain \fBpackage require\fP commands, these are
-stubbed out in the interpreter used to process the scripts,
-so these do not cause problems.
-If scripts call into other packages in global code,
-these calls are handled by a stub \fBunknown\fP command.
-However, if scripts make variable references to other package's
-variables in global code, these will cause errors.  That is
-also bad coding style.
-.PP
-If binary files have dependencies on other packages, things
-can become tricky because it is not possible to stub out
-C-level API's such as \fBTcl_PkgRequire\fP API
-when loading a binary file.
-For example, suppose the BLT package requires Tk, and expresses
-this with a call to \fBTcl_PkgRequire\fP in its \fBBlt_Init\fP routine.
-To support this, you must run \fBpkg_mkIndex\fR in an interpreter that
-has Tk loaded.  You can achieve this with the
-\fB-load \fIpkgPat\fR option.  If you specify this option,
-\fBpkg_mkIndex\fR will load any packages listed by
-\fBinfo loaded\fP and that match \fIpkgPat\fP
-into the interpreter used to process files.
-In most cases this will satisfy the \fBTcl_PkgRequire\fP calls
-made by binary files.
-.PP
-If you are indexing two binary files and one depends on the other,
-you should specify the one that has dependencies last.
-This way the one without dependencies will get loaded and indexed,
-and then the package it provides
-will be available when the second file is processed.
-You may also need to load the first package into the
-temporary interpreter used to create the index by using
-the \fB-load\fP flag;
-it won't hurt to specify package patterns that are not yet loaded.
-.PP
-If you have a package that is split across scripts and a binary file,
-then you should avoid the \fB-load\fP flag. The problem is that
-if you load a package before computing the index it masks any
-other files that provide part of the same package.
-If you must use \fB-load\fP,
-then you must specify the scripts first; otherwise the package loaded from
-the binary file may mask the package defined by the scripts.
-
-.SH KEYWORDS
-auto-load, index, package, version
diff --git a/doc/proc.n b/doc/proc.n
deleted file mode 100644
index 90b7709..0000000
--- a/doc/proc.n
+++ /dev/null
@@ -1,74 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: proc.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH proc n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-proc \- Create a Tcl procedure
-.SH SYNOPSIS
-\fBproc \fIname args body\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBproc\fR command creates a new Tcl procedure named
-\fIname\fR, replacing
-any existing command or procedure there may have been by that name.
-Whenever the new command is invoked, the contents of \fIbody\fR will
-be executed by the Tcl interpreter.
-Normally, \fIname\fR is unqualified
-(does not include the names of any containing namespaces),
-and the new procedure is created in the current namespace.
-If \fIname\fR includes any namespace qualifiers,
-the procedure is created in the specified namespace.
-\fIArgs\fR specifies the formal arguments to the
-procedure.  It consists of a list, possibly empty, each of whose
-elements specifies
-one argument.  Each argument specifier is also a list with either
-one or two fields.  If there is only a single field in the specifier
-then it is the name of the argument; if there are two fields, then
-the first is the argument name and the second is its default value.
-.PP
-When \fIname\fR is invoked a local variable
-will be created for each of the formal arguments to the procedure; its
-value will be the value of corresponding argument in the invoking command
-or the argument's default value.
-Arguments with default values need not be
-specified in a procedure invocation.  However, there must be enough
-actual arguments for all the
-formal arguments that don't have defaults, and there must not be any extra
-actual arguments.  There is one special case to permit procedures with
-variable numbers of arguments.  If the last formal argument has the name
-\fBargs\fR, then a call to the procedure may contain more actual arguments
-than the procedure has formals.  In this case, all of the actual arguments
-starting at the one that would be assigned to \fBargs\fR are combined into
-a list (as if the \fBlist\fR command had been used); this combined value
-is assigned to the local variable \fBargs\fR.
-.PP
-When \fIbody\fR is being executed, variable names normally refer to
-local variables, which are created automatically when referenced and
-deleted when the procedure returns.  One local variable is automatically
-created for each of the procedure's arguments.
-Global variables can only be accessed by invoking
-the \fBglobal\fR command or the \fBupvar\fR command.
-Namespace variables can only be accessed by invoking
-the \fBvariable\fR command or the \fBupvar\fR command.
-.PP
-The \fBproc\fR command returns an empty string.  When a procedure is
-invoked, the procedure's return value is the value specified in a
-\fBreturn\fR command.  If the procedure doesn't execute an explicit
-\fBreturn\fR, then its return value is the value of the last command
-executed in the procedure's body.
-If an error occurs while executing the procedure
-body, then the procedure-as-a-whole will return that same error.
-
-.SH KEYWORDS
-argument, procedure
diff --git a/doc/puts.n b/doc/puts.n
deleted file mode 100644
index 99e61a4..0000000
--- a/doc/puts.n
+++ /dev/null
@@ -1,69 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: puts.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH puts n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-puts \- Write to a channel
-.SH SYNOPSIS
-\fBputs \fR?\fB\-nonewline\fR? ?\fIchannelId\fR? \fIstring\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Writes the characters given by \fIstring\fR to the channel given
-by \fIchannelId\fR.
-\fIChannelId\fR must be a channel identifier such as returned from a
-previous invocation of \fBopen\fR or \fBsocket\fR. It must have been opened
-for output. If no \fIchannelId\fR is specified then it defaults to
-\fBstdout\fR. \fBPuts\fR normally outputs a newline character after
-\fIstring\fR, but this feature may be suppressed by specifying the
-\fB\-nonewline\fR switch.
-.PP
-Newline characters in the output are translated by \fBputs\fR to
-platform-specific end-of-line sequences according to the current
-value of the \fB\-translation\fR option for the channel (for example,
-on PCs newlines are normally replaced with carriage-return-linefeed
-sequences;  on Macintoshes newlines are normally replaced with
-carriage-returns).
-See the \fBfconfigure\fR manual entry for a discussion on ways in
-which \fBfconfigure\fR will alter output.
-.PP
-Tcl buffers output internally, so characters written with \fBputs\fR
-may not appear immediately on the output file or device;  Tcl will
-normally delay output until the buffer is full or the channel is
-closed.
-You can force output to appear immediately with the \fBflush\fR
-command.
-.PP
-When the output buffer fills up, the \fBputs\fR command will normally
-block until all the buffered data has been accepted for output by the
-operating system.
-If \fIchannelId\fR is in nonblocking mode then the \fBputs\fR command
-will not block even if the operating system cannot accept the data.
-Instead, Tcl continues to buffer the data and writes it in the
-background as fast as the underlying file or device can accept it.
-The application must use the Tcl event loop for nonblocking output
-to work;  otherwise Tcl never finds out that the file or device is
-ready for more output data.
-It is possible for an arbitrarily large amount of data to be
-buffered for a channel in nonblocking mode, which could consume a
-large amount of memory.
-To avoid wasting memory, nonblocking I/O should normally
-be used in an event-driven fashion with the \fBfileevent\fR command
-(don't invoke \fBputs\fR unless you have recently been notified
-via a file event that the channel is ready for more output data).
-
-.SH "SEE ALSO"
-fileevent(n)
-
-.SH KEYWORDS
-channel, newline, output, write
diff --git a/doc/pwd.n b/doc/pwd.n
deleted file mode 100644
index 8aa6611..0000000
--- a/doc/pwd.n
+++ /dev/null
@@ -1,25 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: pwd.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH pwd n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-pwd \- Return the current working directory
-.SH SYNOPSIS
-\fBpwd\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns the path name of the current working directory.
-
-.SH KEYWORDS
-working directory
diff --git a/doc/read.n b/doc/read.n
deleted file mode 100644
index 21d9549..0000000
--- a/doc/read.n
+++ /dev/null
@@ -1,50 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: read.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH read n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-read \- Read from a channel
-.SH SYNOPSIS
-\fBread \fR?\fB\-nonewline\fR? \fIchannelId\fR
-.sp
-\fBread \fIchannelId numBytes\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-In the first form, the \fBread\fR command reads all of the data from
-\fIchannelId\fR up to the end of the file.
-If the \fB\-nonewline\fR switch is specified then the last character
-of the file is discarded if it is a newline.
-In the second form, the extra argument specifies how many bytes to
-read.  Exactly that many bytes will be read and returned, unless
-there are fewer than \fInumBytes\fR left in the file;  in this case
-all the remaining bytes are returned.
-.PP
-If \fIchannelId\fR is in nonblocking mode, the command may not read
-as many bytes as requested:  once all available input has been read,
-the command will return the data that is available rather than blocking
-for more input.
-The \fB\-nonewline\fR switch is ignored if the command returns
-before reaching the end of the file.
-.PP
-\fBRead\fR translates end-of-line sequences in the input into
-newline characters according to the \fB\-translation\fR option
-for the channel.
-See the \fBfconfigure\fR manual entry for a discussion on ways in
-which \fBfconfigure\fR will alter input.
-
-.SH "SEE ALSO"
-eof(n), fblocked(n), fconfigure(n)
-
-.SH KEYWORDS
-blocking, channel, end of line, end of file, nonblocking, read, translation
diff --git a/doc/regexp.n b/doc/regexp.n
deleted file mode 100644
index 0d08dcf..0000000
--- a/doc/regexp.n
+++ /dev/null
@@ -1,1048 +0,0 @@
-'\"
-'\" Copyright (c) 1998 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: regexp.n,v 1.3 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH regexp n 8.1 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-regexp \- Match a regular expression against a string
-
-.SH SYNOPSIS
-\fBregexp \fR?\fIswitches\fR? \fIexp string \fR?\fImatchVar\fR? ?\fIsubMatchVar subMatchVar ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Determines whether the regular expression \fIexp\fR matches part or
-all of \fIstring\fR and returns 1 if it does, 0 if it doesn't.
-.LP
-If additional arguments are specified after \fIstring\fR then they
-are treated as the names of variables in which to return
-information about which part(s) of \fIstring\fR matched \fIexp\fR.
-\fIMatchVar\fR will be set to the range of \fIstring\fR that
-matched all of \fIexp\fR.  The first \fIsubMatchVar\fR will contain
-the characters in \fIstring\fR that matched the leftmost parenthesized
-subexpression within \fIexp\fR, the next \fIsubMatchVar\fR will
-contain the characters that matched the next parenthesized
-subexpression to the right in \fIexp\fR, and so on.
-.PP
-If the initial arguments to \fBregexp\fR start with \fB\-\fR then
-they are treated as switches.  The following switches are
-currently supported:
-.TP 15
-\fB\-nocase\fR
-Causes upper-case characters in \fIstring\fR to be treated as
-lower case during the matching process.
-.TP 15
-\fB\-indices\fR
-Changes what is stored in the \fIsubMatchVar\fRs. 
-Instead of storing the matching characters from \fIstring\fR,
-each variable
-will contain a list of two decimal strings giving the indices
-in \fIstring\fR of the first and last characters in the matching
-range of characters.
-.VS 8.1
-.TP 15
-\fB\-expanded\fR
-Enables use of the expanded regular expression syntax where
-whitespace and comments are ignored.  This is the same as specifying
-the \fB(?x)\fR embedded option (see METASYNTAX, below).
-.TP 15
-\fB\-line\fR
-Enables newline-sensitive matching.  By default, newline is a
-completely ordinary character with no special meaning.  With this
-flag, `[^' bracket expressions and `.' never match newline, `^'
-matches an empty string after any newline in addition to its normal
-function, and `$' matches an empty string before any newline in
-addition to its normal function.  This flag is equivalent to
-specifying both \fB\-linestop\fR and \fB\-lineanchor\fR, or the
-\fB(?n)\fR embedded option (see METASYNTAX, below).
-.TP 15
-\fB\-linestop\fR
-Changes the behavior of `[^' bracket expressions and `.' so that they
-stop at newlines.  This is the same as specifying the \fB(?p)\fR
-embedded option (see METASYNTAX, below).
-.TP 15
-\fB\-lineanchor\fR
-Changes the behavior of `^' and `$' (the ``anchors'') so they match the
-beginning and end of a line respectively.  This is the same as
-specifying the \fB(?w)\fR embedded option (see METASYNTAX, below).
-.TP 15
-\fB\-about\fR
-Instead of attempting to match the regular expression, returns a list
-containing information about the regular expression.  The first
-element of the list is a subexpression count.  The second element is a
-list of property names that describe various attributes of the regular
-expression. This switch is primarily intended for debugging purposes.
-.VE 8.1
-.TP 15
-\fB\-\|\-\fR
-Marks the end of switches.  The argument following this one will
-be treated as \fIexp\fR even if it starts with a \fB\-\fR.
-.PP
-If there are more \fIsubMatchVar\fR's than parenthesized
-subexpressions within \fIexp\fR, or if a particular subexpression
-in \fIexp\fR doesn't match the string (e.g. because it was in a
-portion of the expression that wasn't matched), then the corresponding
-\fIsubMatchVar\fR will be set to ``\fB\-1 \-1\fR'' if \fB\-indices\fR
-has been specified or to an empty string otherwise.
-
-.SH "DIFFERENT FLAVORS OF REs"
-.VS 8.1
-Regular expressions (``RE''s), as defined by POSIX, come in two
-flavors: \fIextended\fR REs (``EREs'') and \fIbasic\fR REs (``BREs'').
-EREs are roughly those of the traditional \fIegrep\fR, while BREs are
-roughly those of the traditional \fIed\fR .  This implementation adds
-a third flavor, \fIadvanced\fR REs (``AREs''), basically EREs with
-some significant extensions.
-.PP
-This manual page primarily describes AREs.  BREs mostly exist for
-backward compatibility in some old programs; they will be discussed at
-the end.  POSIX EREs are almost an exact subset of AREs.  Features of
-AREs that are not present in EREs will be indicated.
-
-.SH "REGULAR EXPRESSION SYNTAX"
-.PP
-Tcl regular expressions are implemented using the package written by
-Henry Spencer, based on the 1003.2 spec and some (not quite all) of
-the Perl5 extensions (thanks, Henry!).  Much of the description of
-regular expressions below is copied verbatim from his manual entry.
-.PP
-An ARE is one or more \fIbranches\fR,
-separated by `\fB|\fR',
-matching anything that matches any of the branches.
-.PP
-A branch is zero or more \fIconstraints\fR or \fIquantified atoms\fR,
-concatenated.
-It matches a match for the first, followed by a match for the second, etc;
-an empty branch matches the empty string.
-.PP
-A quantified atom is an \fIatom\fR possibly followed
-by a single \fIquantifier\fR.
-Without a quantifier, it matches a match for the atom.
-The quantifiers,
-and what a so-quantified atom matches, are:
-.RS 2
-.TP 6
-\fB*\fR
-a sequence of 0 or more matches of the atom
-.TP
-\fB+\fR
-a sequence of 1 or more matches of the atom
-.TP
-\fB?\fR
-a sequence of 0 or 1 matches of the atom
-.TP
-\fB{\fIm\fB}\fR
-a sequence of exactly \fIm\fR matches of the atom
-.TP
-\fB{\fIm\fB,}\fR
-a sequence of \fIm\fR or more matches of the atom
-.TP
-\fB{\fIm\fB,\fIn\fB}\fR
-a sequence of \fIm\fR through \fIn\fR (inclusive) matches of the atom;
-\fIm\fR may not exceed \fIn\fR
-.TP
-\fB*?  +?  ??  {\fIm\fB}?  {\fIm\fB,}?  {\fIm\fB,\fIn\fB}?\fR
-\fInon-greedy\fR quantifiers,
-which match the same possibilities,
-but prefer the smallest number rather than the largest number
-of matches (see MATCHING)
-.RE
-.PP
-The forms using
-\fB{\fR and \fB}\fR
-are known as \fIbound\fRs.
-The numbers
-\fIm\fR and \fIn\fR are unsigned decimal integers
-with permissible values from 0 to 255 inclusive.
-.PP
-An atom is one of:
-.RS 2
-.TP 6
-\fB(\fIre\fB)\fR
-(where \fIre\fR is any regular expression)
-matches a match for
-\fIre\fR, with the match noted for possible reporting
-.TP
-\fB(?:\fIre\fB)\fR
-as previous,
-but does no reporting
-(a ``non-capturing'' set of parentheses)
-.TP
-\fB()\fR
-matches an empty string,
-noted for possible reporting
-.TP
-\fB(?:)\fR
-matches an empty string,
-without reporting
-.TP
-\fB[\fIchars\fB]\fR
-a \fIbracket expression\fR,
-matching any one of the \fIchars\fR (see BRACKET EXPRESSIONS for more detail)
-.TP
- \fB.\fR
-matches any single character
-.TP
-\fB\e\fIk\fR
-(where \fIk\fR is a non-alphanumeric character)
-matches that character taken as an ordinary character,
-e.g. \e\e matches a backslash character
-.TP
-\fB\e\fIc\fR
-where \fIc\fR is alphanumeric
-(possibly followed by other characters),
-an \fIescape\fR (AREs only),
-see ESCAPES below
-.TP
-\fB{\fR
-when followed by a character other than a digit,
-matches the character
-`\fB{\fR';
-when followed by a digit, it is the beginning of a
-\fIbound\fR (see above)
-.TP
-\fIx\fR
-where \fIx\fR is
-a single character with no other significance, matches that character.
-.RE
-.PP
-A \fIconstraint\fR matches an empty string when specific conditions
-are met.
-A constraint may not be followed by a quantifier.
-The simple constraints are as follows; some more constraints are
-described later, under ESCAPES.
-.RS 2
-.TP 8
-\fB^\fR
-matches at the beginning of a line
-.TP
-\fB$\fR
-matches at the end of a line
-.TP
-\fB(?=\fIre\fB)\fR
-\fIpositive lookahead\fR (AREs only), matches at any point
-where a substring matching \fIre\fR begins
-.TP
-\fB(?!\fIre\fB)\fR
-\fInegative lookahead\fR (AREs only), matches at any point
-where no substring matching \fIre\fR begins
-.RE
-.PP
-The lookahead constraints may not contain back references (see later),
-and all parentheses within them are considered non-capturing.
-.PP
-An RE may not end with
-`\fB\e\fR'.
-
-.SH "BRACKET EXPRESSIONS"
-A \fIbracket expression\fR is a list of characters enclosed in
-`\fB[\|]\fR'.
-It normally matches any single character from the list (but see below).
-If the list begins with
-`\fB^\fR',
-it matches any single character
-(but see below) \fInot\fR from the rest of the list.
-.PP
-If two characters in the list are separated by
-`\fB\-\fR',
-this is shorthand
-for the full \fIrange\fR of characters between those two (inclusive) in the
-collating sequence,
-e.g.
-\fB[0\-9]\fR
-in ASCII matches any decimal digit.
-Two ranges may not share an
-endpoint, so e.g.
-\fBa\-c\-e\fR
-is illegal.
-Ranges are very collating-sequence-dependent,
-and portable programs should avoid relying on them.
-.PP
-To include a literal
-\fB]\fR
-or
-\fB\-\fR
-in the list,
-the simplest method is to
-enclose it in
-\fB[.\fR
-and
-\fB.]\fR
-to make it a collating element (see below).
-Alternatively,
-make it the first character
-(following a possible
-`\fB^\fR'),
-or (AREs only) precede it with
-`\fB\e\fR'.
-Alternatively, for
-`\fB\-\fR',
-make it the last character,
-or the second endpoint of a range.
-To use a literal
-\fB\-\fR
-as the first endpoint of a range,
-make it a collating element
-or (AREs only) precede it with
-`\fB\e\fR'.
-With the exception of these, some combinations using
-\fB[\fR
-(see next
-paragraphs), and escapes,
-all other special characters lose their
-special significance within a bracket expression.
-.PP
-Within a bracket expression, a collating element (a character,
-a multi-character sequence that collates as if it were a single character,
-or a collating-sequence name for either)
-enclosed in
-\fB[.\fR
-and
-\fB.]\fR
-stands for the
-sequence of characters of that collating element.
-The sequence is a single element of the bracket expression's list.
-A bracket expression in a locale which has
-multi-character collating elements
-can thus match more than one character.
-Most insidiously, if
-\fB^\fR
-is used,
-this can happen even if no multi-character collating 
-elements appear in the bracket expression!
-If the collating sequence includes a
-\fBch\fR
-multi-character collating element,
-then the RE
-\fB[[.ch.]]*c\fR
-matches the first five characters
-of
-`\fBchchcc\fR',
-and the RE
-\fB[^c]b\fR
-matches all of
-`\fBchb\fR'.
-.PP
-Within a bracket expression, a collating element enclosed in
-\fB[=\fR
-and
-\fB=]\fR
-is an equivalence class, standing for the sequences of characters
-of all collating elements equivalent to that one, including itself.
-(If there are no other equivalent collating elements,
-the treatment is as if the enclosing delimiters were
-`\fB[.\fR'\&
-and
-`\fB.]\fR'.)
-For example, if
-\fBo\fR
-and
-\fB\o'o^'\fR
-are the members of an equivalence class,
-then 
-`\fB[[=o=]]\fR',
-`\fB[[=\o'o^'=]]\fR',
-and
-`\fB[o\o'o^']\fR'\&
-are all synonymous.
-An equivalence class may not be an endpoint
-of a range.
-.PP
-Within a bracket expression, the name of a \fIcharacter class\fR enclosed
-in
-\fB[:\fR
-and
-\fB:]\fR
-stands for the list of all characters
-(not all collating elements!)
-belonging to that
-class.
-Standard character class names are:
-.PP
-.RS
-.ne 5
-.nf
-.ta 3c 6c 9c
-\fBalnum	digit	punct
-alpha	graph	space
-blank	lower	upper
-cntrl	print	xdigit\fR
-.fi
-.RE
-.PP
-These stand for the character classes defined in
-\fIctype\fR(3).
-A locale may provide others.
-A character class may not be used as an endpoint of a range.
-.PP
-There are two special cases of bracket expressions:
-the bracket expressions
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-are constraints, matching empty strings at
-the beginning and end of a word respectively.
-'\" note, discussion of escapes below references this definition of word
-A word is defined as a sequence of
-word characters
-which is neither preceded nor followed by
-word characters.
-A word character is an
-\fIalnum\fR
-character (as defined by
-\fIctype\fR(3))
-or an underscore
-(\fB_\fR).
-These special bracket expressions are deprecated;
-users of AREs should use constraint escapes instead (see below).
-.SH ESCAPES
-Escapes (AREs only), which begin with a
-\fB\e\fR
-followed by an alphanumeric character,
-come in several varieties:
-character entry, class shorthands, constraint escapes, and back references.
-A
-\fB\e\fR
-followed by an alphanumeric character but not constituting
-a valid escape is illegal in AREs.
-In EREs, there are no escapes:
-outside a bracket expression,
-a
-\fB\e\fR
-followed by an alphanumeric character merely stands for that
-character as an ordinary character,
-and inside a bracket expression,
-\fB\e\fR
-is an ordinary character.
-(The latter is the one actual incompatibility between EREs and AREs.)
-.PP
-Character-entry escapes (AREs only) exist to make it easier to specify
-non-printing and otherwise inconvenient characters in REs:
-.RS 2
-.TP 5
-\fB\ea\fR
-alert, aka bell, character, as in C
-.TP
-\fB\eb\fR
-backspace, as in C
-.TP
-\fB\eB\fR
-synonym for
-\fB\e\fR
-to help reduce backslash doubling in some
-applications where there are multiple levels of backslash processing
-.TP
-\fB\ec\fIX\fR
-(where X is any character) the character whose
-low-order 5 bits are the same as those of
-\fIX\fR,
-and whose other bits are all zero
-.TP
-\fB\ee\fR
-the character whose collating-sequence name
-is
-`\fBESC\fR',
-or failing that, the character with octal value 033
-.TP
-\fB\ef\fR
-formfeed, as in C
-.TP
-\fB\en\fR
-newline, as in C
-.TP
-\fB\er\fR
-carriage return, as in C
-.TP
-\fB\et\fR
-horizontal tab, as in C
-.TP
-\fB\eu\fIwxyz\fR
-(where
-\fIwxyz\fR
-is exactly four hexadecimal digits)
-the Unicode character
-\fBU+\fIwxyz\fR
-in the local byte ordering
-.TP
-\fB\eU\fIstuvwxyz\fR
-(where
-\fIstuvwxyz\fR
-is exactly eight hexadecimal digits)
-reserved for a somewhat-hypothetical Unicode extension to 32 bits
-.TP
-\fB\ev\fR
-vertical tab, as in C
-are all available.
-.TP
-\fB\ex\fIhhh\fR
-(where
-\fIhhh\fR
-is any sequence of hexadecimal digits)
-the character whose hexadecimal value is
-\fB0x\fIhhh\fR
-(a single character no matter how many hexadecimal digits are used).
-.TP
-\fB\e0\fR
-the character whose value is
-\fB0\fR
-.TP
-\fB\e\fIxy\fR
-(where
-\fIxy\fR
-is exactly two octal digits,
-and is not a
-\fIback reference\fR (see below))
-the character whose octal value is
-\fB0\fIxy\fR
-.TP
-\fB\e\fIxyz\fR
-(where
-\fIxyz\fR
-is exactly three octal digits,
-and is not a
-back reference (see below))
-the character whose octal value is
-\fB0\fIxyz\fR
-.RE
-.PP
-Hexadecimal digits are
-`\fB0\fR'-`\fB9\fR',
-`\fBa\fR'-`\fBf\fR',
-and
-`\fBA\fR'-`\fBF\fR'.
-Octal digits are
-`\fB0\fR'-`\fB7\fR'.
-.PP
-The character-entry escapes are always taken as ordinary characters.
-For example,
-\fB\e135\fR
-is
-\fB]\fR
-in ASCII,
-but
-\fB\e135\fR
-does not terminate a bracket expression.
-Beware, however, that some applications (e.g., C compilers) interpret 
-such sequences themselves before the regular-expression package
-gets to see them, which may require doubling (quadrupling, etc.) the
-`\fB\e\fR'.
-.PP
-Class-shorthand escapes (AREs only) provide shorthands for certain commonly-used
-character classes:
-.RS 2
-.TP 10
-\fB\ed\fR
-\fB[[:digit:]]\fR
-.TP
-\fB\es\fR
-\fB[[:space:]]\fR
-.TP
-\fB\ew\fR
-\fB[[:alnum:]_]\fR
-(note underscore)
-.TP
-\fB\eD\fR
-\fB[^[:digit:]]\fR
-.TP
-\fB\eS\fR
-\fB[^[:space:]]\fR
-.TP
-\fB\eW\fR
-\fB[^[:alnum:]_]\fR
-(note underscore)
-.RE
-.PP
-Within bracket expressions,
-`\fB\ed\fR',
-`\fB\es\fR',
-and
-`\fB\ew\fR'\&
-lose their outer brackets,
-and
-`\fB\eD\fR',
-`\fB\eS\fR',
-and
-`\fB\eW\fR'\&
-are illegal.
-.PP
-A constraint escape (AREs only) is a constraint,
-matching the empty string if specific conditions are met,
-written as an escape:
-.RS 2
-.TP 6
-\fB\eA\fR
-matches only at the beginning of the string
-(see MATCHING, below, for how this differs from
-`\fB^\fR')
-.TP
-\fB\em\fR
-matches only at the beginning of a word
-.TP
-\fB\eM\fR
-matches only at the end of a word
-.TP
-\fB\ey\fR
-matches only at the beginning or end of a word
-.TP
-\fB\eY\fR
-matches only at a point which is not the beginning or end of a word
-.TP
-\fB\eZ\fR
-matches only at the end of the string
-(see MATCHING, below, for how this differs from
-`\fB$\fR')
-.TP
-\fB\e\fIm\fR
-(where
-\fIm\fR
-is a nonzero digit) a \fIback reference\fR, see below
-.TP
-\fB\e\fImnn\fR
-(where
-\fIm\fR
-is a nonzero digit, and
-\fInn\fR
-is some more digits,
-and the decimal value
-\fImnn\fR
-is not greater than the number of closing capturing parentheses seen so far)
-a \fIback reference\fR, see below
-.RE
-.PP
-A word is defined as in the specification of
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-above.
-Constraint escapes are illegal within bracket expressions.
-.PP
-A back reference (AREs only) matches the same string matched by the parenthesized
-subexpression specified by the number,
-so that (e.g.)
-\fB([bc])\e1\fR
-matches
-\fBbb\fR
-or
-\fBcc\fR
-but not
-`\fBbc\fR'.
-The subexpression must entirely precede the back reference in the RE.
-Subexpressions are numbered in the order of their leading parentheses.
-Non-capturing parentheses do not define subexpressions.
-.PP
-There is an inherent historical ambiguity between octal character-entry 
-escapes and back references, which is resolved by heuristics,
-as hinted at above.
-A leading zero always indicates an octal escape.
-A single non-zero digit, not followed by another digit,
-is always taken as a back reference.
-A multi-digit sequence not starting with a zero is taken as a back 
-reference if it comes after a suitable subexpression
-(i.e. the number is in the legal range for a back reference),
-and otherwise is taken as octal.
-.SH "METASYNTAX"
-In addition to the main syntax described above, there are some special
-forms and miscellaneous syntactic facilities available.
-.PP
-Normally the flavor of RE being used is specified by
-application-dependent means.
-However, this can be overridden by a \fIdirector\fR.
-If an RE of any flavor begins with
-`\fB***:\fR',
-the rest of the RE is an ARE.
-If an RE of any flavor begins with
-`\fB***=\fR',
-the rest of the RE is taken to be a literal string,
-with all characters considered ordinary characters.
-.PP
-An ARE may begin with \fIembedded options\fR:
-a sequence
-\fB(?\fIxyz\fB)\fR
-(where
-\fIxyz\fR
-is one or more alphabetic characters)
-specifies options affecting the rest of the RE.
-These supplement, and can override,
-any options specified by the application.
-The available option letters are:
-.RS 2
-.TP 3
-\fBb\fR
-rest of RE is a BRE
-.TP 3
-\fBc\fR
-case-sensitive matching (usual default)
-.TP 3
-\fBe\fR
-rest of RE is an ERE
-.TP 3
-\fBi\fR
-case-insensitive matching (see MATCHING, below)
-.TP 3
-\fBm\fR
-historical synonym for
-\fBn\fR
-.TP 3
-\fBn\fR
-newline-sensitive matching (see MATCHING, below)
-.TP 3
-\fBp\fR
-partial newline-sensitive matching (see MATCHING, below)
-.TP 3
-\fBq\fR
-rest of RE is a literal (``quoted'') string, all ordinary characters
-.TP 3
-\fBs\fR
-non-newline-sensitive matching (usual default)
-.TP 3
-\fBt\fR
-tight syntax (usual default; see below)
-.TP 3
-\fBw\fR
-inverse partial newline-sensitive (``weird'') matching (see MATCHING, below)
-.TP 3
-\fBx\fR
-expanded syntax (see below)
-.RE
-.PP
-Embedded options take effect at the
-\fB)\fR
-terminating the sequence.
-They are available only at the start of an ARE,
-and may not be used later within it.
-.PP
-In addition to the usual (\fItight\fR) RE syntax, in which all characters are
-significant, there is an \fIexpanded\fR syntax,
-available in all flavors of RE
-with the \fB-expanded\fR switch, or in AREs with the embedded x option.
-In the expanded syntax,
-white-space characters are ignored
-and all characters between a
-\fB#\fR
-and the following newline (or the end of the RE) are ignored,
-permitting paragraphing and commenting a complex RE.
-There are three exceptions to that basic rule:
-.RS 2
-.PP
-a white-space character or `\fB#\fR' preceded by `\fB\e\fR' is retained
-.PP
-white space or `\fB#\fR' within a bracket expression is retained
-.PP
-white space and comments are illegal within multi-character symbols
-like the ARE `\fB(?:\fR' or the BRE `\fB\e(\fR'
-.RE
-.PP
-Expanded-syntax
-white-space characters are blank, tab, newline, etc. (any character
-defined as \fIspace\fR by
-\fIctype\fR(3)).
-Exactly how a multi-line expanded-syntax RE
-can be entered interactively by a user,
-if at all, is application-specific;
-expanded syntax is primarily a scripting facility.
-.PP
-Finally, in an ARE,
-outside bracket expressions, the sequence 
-`\fB(?#\fIttt\fB)\fR'
-(where
-\fIttt\fR
-is any text not containing a 
-`\fB)\fR')
-is a comment,
-completely ignored.
-Again, this is not allowed between the characters of
-multi-character symbols like
-`\fB(?:\fR'.
-Such comments are more a historical artifact than a useful facility,
-and their use is deprecated;
-use the expanded syntax instead.
-.PP
-\fINone\fR of these metasyntax extensions is available if the application
-(or an initial
-\fB***=\fR
-director)
-has specified that the user's input be treated as a literal string
-rather than as an RE.
-.SH MATCHING
-In the event that an RE could match more than one substring of a given
-string,
-the RE matches the one starting earliest in the string.
-If the RE could match more than one substring starting at that point,
-its choice is determined by its \fIpreference\fR:
-either the longest substring, or the shortest.
-.PP
-Most atoms, and all constraints, have no preference.
-A parenthesized RE has the same preference (possibly none) as the RE.
-A quantified atom with quantifier
-\fB{\fIm\fB}\fR
-or
-\fB{\fIm\fB}?\fR
-has the same preference (possibly none) as the atom itself.
-A quantified atom with other normal quantifiers (including
-\fB{\fIm\fB,\fIn\fB}\fR
-with
-\fIm\fR
-equal to
-\fIn\fR)
-prefers longest match.
-A quantified atom with other non-greedy quantifiers (including
-\fB{\fIm\fB,\fIn\fB}?\fR
-with
-\fIm\fR
-equal to
-\fIn\fR)
-prefers shortest match.
-A branch has the same preference as the first quantified atom in it
-which has a preference.
-An RE consisting of two or more branches connected by the
-\fB|\fR
-operator prefers longest match.
-.PP
-Subject to the constraints imposed by the rules for matching the whole RE,
-subexpressions also match the longest or shortest possible substrings,
-based on their preferences,
-with subexpressions starting earlier in the RE taking priority over
-ones starting later.
-Note that outer subexpressions thus take priority over
-their component subexpressions.
-.PP
-Note that the quantifiers
-\fB{1,1}\fR
-and
-\fB{1,1}?\fR
-can be used to force longest and shortest preference, respectively,
-on a subexpression or a whole RE.
-.PP
-Match lengths are measured in characters, not collating elements.
-An empty string is considered longer than no match at all.
-For example,
-\fBbb*\fR
-matches the three middle characters of
-`\fBabbbc\fR',
-\fB(week|wee)(night|knights)\fR
-matches all ten characters of
-`\fBweeknights\fR',
-when
-\fB(.*).*\fR
-is matched against
-\fBabc\fR
-the parenthesized subexpression
-matches all three characters, and
-when
-\fB(a*)*\fR
-is matched against
-\fBbc\fR
-both the whole RE and the parenthesized
-subexpression match an empty string.
-.PP
-If case-independent matching is specified,
-the effect is much as if all case distinctions had vanished from the
-alphabet.
-When an alphabetic that exists in multiple cases appears as an
-ordinary character outside a bracket expression, it is effectively
-transformed into a bracket expression containing both cases,
-so that
-\fBx\fR
-becomes
-`\fB[xX]\fR'.
-When it appears inside a bracket expression, all case counterparts
-of it are added to the bracket expression, so that
-\fB[x]\fR
-becomes
-\fB[xX]\fR
-and
-\fB[^x]\fR
-becomes
-`\fB[^xX]\fR'.
-.PP
-If newline-sensitive matching is specified,
-\fB.\fR
-and bracket expressions using
-\fB^\fR
-will never match the newline character
-(so that matches will never cross newlines unless the RE
-explicitly arranges it)
-and
-\fB^\fR
-and
-\fB$\fR
-will match the empty string after and before a newline
-respectively, in addition to matching at beginning and end of string
-respectively.
-ARE
-\fB\eA\fR
-and
-\fB\eZ\fR
-continue to match beginning or end of string \fIonly\fR.
-.PP
-If partial newline-sensitive matching is specified,
-this affects
-\fB.\fR
-and bracket expressions
-as with newline-sensitive matching, but not
-\fB^\fR
-and
-`\fB$\fR'.
-.PP
-If inverse partial newline-sensitive matching is specified,
-this affects
-\fB^\fR
-and
-\fB$\fR
-as with
-newline-sensitive matching,
-but not
-\fB.\fR
-and bracket expressions.
-This isn't very useful but is provided for symmetry.
-.SH "LIMITS AND COMPATIBILITY"
-No particular limit is imposed on the length of REs.
-Programs intended to be highly portable should not employ REs longer
-than 256 bytes,
-as a POSIX-compliant implementation can refuse to accept such REs.
-.PP
-The only feature of AREs that is actually incompatible with
-POSIX EREs is that
-\fB\e\fR
-does not lose its special
-significance inside bracket expressions.
-All other ARE features use syntax which is illegal or has
-undefined or unspecified effects in POSIX EREs;
-the
-\fB***\fR
-syntax of directors likewise is outside the POSIX
-syntax for both BREs and EREs.
-.PP
-Many of the ARE extensions are borrowed from Perl, but some have
-been changed to clean them up, and a few Perl extensions are not present.
-Incompatibilities of note include
-`\fB\eb\fR',
-`\fB\eB\fR',
-the lack of special treatment for a trailing newline,
-the addition of complemented bracket expressions to the things
-affected by newline-sensitive matching,
-the restrictions on parentheses and back references in lookahead constraints,
-and the longest/shortest-match (rather than first-match) matching semantics.
-.PP
-The matching rules for REs containing both normal and non-greedy quantifiers
-have changed since early beta-test versions of this package.
-(The new rules are much simpler and cleaner,
-but don't work as hard at guessing the user's real intentions.)
-.PP
-Henry Spencer's original 1986 \fIregexp\fR package,
-still in widespread use (e.g., in pre-8.1 releases of Tcl),
-implemented an early version of today's EREs.
-There are four incompatibilities between \fIregexp\fR's near-EREs
-(`RREs' for short) and AREs.
-In roughly increasing order of significance:
-.PP
-.RS
-In AREs,
-\fB\e\fR
-followed by an alphanumeric character is either an
-escape or an error,
-while in RREs, it was just another way of writing the 
-alphanumeric.
-This should not be a problem because there was no reason to write
-such a sequence in RREs.
-.PP
-\fB{\fR
-followed by a digit in an ARE is the beginning of a bound,
-while in RREs,
-\fB{\fR
-was always an ordinary character.
-Such sequences should be rare,
-and will often result in an error because following characters
-will not look like a valid bound.
-.PP
-In AREs,
-\fB\e\fR
-remains a special character within
-`\fB[\|]\fR',
-so a literal
-\fB\e\fR
-within
-\fB[\|]\fR
-must be written
-`\fB\e\e\fR'.
-\fB\e\e\fR
-also gives a literal
-\fB\e\fR
-within
-\fB[\|]\fR
-in RREs,
-but only truly paranoid programmers routinely doubled the backslash.
-.PP
-AREs report the longest/shortest match for the RE,
-rather than the first found in a specified search order.
-This may affect some RREs which were written in the expectation that
-the first match would be reported.
-(The careful crafting of RREs to optimize the search order for fast
-matching is obsolete (AREs examine all possible matches
-in parallel, and their performance is largely insensitive to their
-complexity) but cases where the search order was exploited to deliberately 
-find a match which was \fInot\fR the longest/shortest will need rewriting.)
-.RE
-
-.SH "BASIC REGULAR EXPRESSIONS"
-BREs differ from EREs in several respects.
-`\fB|\fR',
-`\fB+\fR',
-and
-\fB?\fR
-are ordinary characters and there is no equivalent
-for their functionality.
-The delimiters for bounds are
-\fB\e{\fR
-and
-`\fB\e}\fR',
-with
-\fB{\fR
-and
-\fB}\fR
-by themselves ordinary characters.
-The parentheses for nested subexpressions are
-\fB\e(\fR
-and
-`\fB\e)\fR',
-with
-\fB(\fR
-and
-\fB)\fR
-by themselves ordinary characters.
-\fB^\fR
-is an ordinary character except at the beginning of the
-RE or the beginning of a parenthesized subexpression,
-\fB$\fR
-is an ordinary character except at the end of the
-RE or the end of a parenthesized subexpression,
-and
-\fB*\fR
-is an ordinary character if it appears at the beginning of the
-RE or the beginning of a parenthesized subexpression
-(after a possible leading
-`\fB^\fR').
-Finally,
-single-digit back references are available,
-and
-\fB\e<\fR
-and
-\fB\e>\fR
-are synonyms for
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-respectively;
-no other escapes are available.
-
-.VE 8.1
-.SH KEYWORDS
-match, regular expression, string
diff --git a/doc/registry.n b/doc/registry.n
deleted file mode 100644
index f0e199f..0000000
--- a/doc/registry.n
+++ /dev/null
@@ -1,168 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: registry.n,v 1.4 1999/04/16 00:46:35 stanton Exp $
-'\" 
-.so man.macros
-.TH registry n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-registry \- Manipulate the Windows registry
-.SH SYNOPSIS
-.sp
-\fBpackage require registry 1.0\fR
-.sp
-\fBregistry \fIoption\fR \fIkeyName\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBregistry\fR package provides a general set of operations for
-manipulating the Windows registry.  The package implements the
-\fBregistry\fR Tcl command.  This command is only supported on the
-Windows platform.  Warning: this command should be used with caution
-as a corrupted registry can leave your system in an unusable state.
-.PP
-\fIKeyName\fR is the name of a registry key.  Registry keys must be
-one of the following forms:
-.IP
-\fB\e\e\fIhostname\fB\e\fIrootname\fB\e\fIkeypath\fR
-.IP
-\fIrootname\fB\e\fIkeypath\fR
-.IP
-\fIrootname\fR
-.PP
-\fIHostname\fR specifies the name of any valid Windows
-host that exports its registry.  The \fIrootname\fR component must be
-one of \fBHKEY_LOCAL_MACHINE\fR, \fBHKEY_USERS\fR,
-.VS
-\fBHKEY_CLASSES_ROOT\fR, \fBHKEY_CURRENT_USER\fR,
-\fBHKEY_CURRENT_CONFIG\fR, \fBHKEY_PERFORMANCE_DATA\fR, or
-\fBHKEY_DYN_DATA\fR.  The \fIkeypath\fR can be one or more
-.VE
-registry key names separated by backslash (\fB\e\fR) characters.
-.PP
-\fIOption\fR indicates what to do with the registry key name.  Any
-unique abbreviation for \fIoption\fR is acceptable.  The valid options
-are:
-.TP
-\fBregistry delete \fIkeyName\fR ?\fIvalueName\fR?
-.
-If the optional \fIvalueName\fR argument is present, the specified
-value under \fIkeyName\fR will be deleted from the registry.  If the
-optional \fIvalueName\fR is omitted, the specified key and any subkeys
-or values beneath it in the registry heirarchy will be deleted.  If
-the key could not be deleted then an error is generated.  If the key
-did not exist, the command has no effect.
-.TP
-\fBregistry get \fIkeyName valueName\fR
-.
-Returns the data associated with the value \fIvalueName\fR under the key
-\fIkeyName\fR.  If either the key or the value does not exist, then an
-error is generated.  For more details on the format of the returned
-data, see SUPPORTED TYPES, below.
-.TP
-\fBregistry keys \fIkeyName\fR ?\fIpattern\fR?
-.
-If \fIpattern\fR isn't specified, returns a list of names of all the
-subkeys of \fIkeyName\fR.  If \fIpattern\fR is specified, only those
-names matching \fIpattern\fR are returned.  Matching is determined
-using the same rules as for \fBstring\fR \fBmatch\fR.  If the
-specified \fIkeyName\fR does not exist, then an error is generated.
-.TP
-\fBregistry set \fIkeyName\fR ?\fIvalueName data \fR?\fItype\fR??
-.
-If \fIvalueName\fR isn't specified, creates the key \fIkeyName\fR if
-it doesn't already exist.  If \fIvalueName\fR is specified, creates
-the key \fIkeyName\fR and value \fIvalueName\fR if necessary.  The
-contents of \fIvalueName\fR are set to \fIdata\fR with the type
-indicated by \fItype\fR.  If \fItype\fR isn't specified, the type
-\fBsz\fR is assumed.  For more details on the data and type arguments,
-see SUPPORTED TYPES below.
-.TP
-\fBregistry type \fIkeyName valueName\fR
-.
-Returns the type of the value \fIvalueName\fR in the key
-\fIkeyName\fR.  For more information on the possible types, see
-SUPPORTED TYPES, below.
-.TP
-\fBregistry values \fIkeyName\fR ?\fIpattern\fR?
-.
-If \fIpattern\fR isn't specified, returns a list of names of all the
-values of \fIkeyName\fR.  If \fIpattern\fR is specified, only those
-names matching \fIpattern\fR are returned.  Matching is determined
-using the same rules as for \fBstring\fR \fBmatch\fR.
-
-.SH "SUPPORTED TYPES"
-Each value under a key in the registry contains some data of a
-particular type in a type-specific representation.  The \fBregistry\fR
-command converts between this internal representation and one that can
-be manipulated by Tcl scripts.  In most cases, the data is simply
-returned as a Tcl string.  The type indicates the intended use for the
-data, but does not actually change the representation.  For some
-types, the \fBregistry\fR command returns the data in a different form to
-make it easier to manipulate.  The following types are recognized by the
-registry command:
-.TP 17
-\fBbinary\fR
-.
-The registry value contains arbitrary binary data.  The data is represented
-exactly in Tcl, including any embedded nulls.
-.TP
-\fBnone\fR
-.
-The registry value contains arbitrary binary data with no defined
-type.  The data is represented exactly in Tcl, including any embedded
-nulls.
-.TP
-\fBsz\fR
-.
-The registry value contains a null-terminated string.  The data is 
-represented in Tcl as a string.
-.TP
-\fBexpand_sz\fR
-.
-The registry value contains a null-terminated string that contains
-unexpanded references to environment variables in the normal Windows
-style (for example, "%PATH%").  The data is represented in Tcl as a
-string.
-.TP
-\fBdword\fR
-.
-The registry value contains a little-endian 32-bit number.  The data is
-represented in Tcl as a decimal string.
-.TP
-\fBdword_big_endian\fR
-.
-The registry value contains a big-endian 32-bit number.  The data is
-represented in Tcl as a decimal string.
-.TP
-\fBlink\fR
-.
-The registry value contains a symbolic link.  The data is represented
-exactly in Tcl, including any embedded nulls.
-.TP
-\fBmulti_sz\fR
-.
-The registry value contains an array of null-terminated strings.  The
-data is represented in Tcl as a list of strings.
-.TP
-\fBresource_list\fR
-.
-The registry value contains a device-driver resource list.  The data
-is represented exactly in Tcl, including any embedded nulls.
-.PP
-In addition to the symbolically named types listed above, unknown
-types are identified using a 32-bit integer that corresponds to the
-type code returned by the system interfaces.  In this case, the data
-is represented exactly in Tcl, including any embedded nulls.
-
-.SH "PORTABILITY ISSUES"
-The registry command is only available on Windows.
-
-.SH KEYWORDS
-registry
diff --git a/doc/regsub.n b/doc/regsub.n
deleted file mode 100644
index 516a417..0000000
--- a/doc/regsub.n
+++ /dev/null
@@ -1,72 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: regsub.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH regsub n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-regsub \- Perform substitutions based on regular expression pattern matching
-.SH SYNOPSIS
-\fBregsub \fR?\fIswitches\fR? \fIexp string subSpec varName\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command matches the regular expression \fIexp\fR against
-\fIstring\fR,
-and it copies \fIstring\fR to the variable whose name is
-given by \fIvarName\fR.
-If there is a match, then while copying \fIstring\fR to \fIvarName\fR
-the portion of \fIstring\fR that
-matched \fIexp\fR is replaced with \fIsubSpec\fR.
-If \fIsubSpec\fR contains a ``&'' or ``\e0'', then it is replaced
-in the substitution with the portion of \fIstring\fR that
-matched \fIexp\fR.
-If \fIsubSpec\fR contains a ``\e\fIn\fR'', where \fIn\fR is a digit
-between 1 and 9, then it is replaced in the substitution with
-the portion of \fIstring\fR that matched the \fIn\fR-th
-parenthesized subexpression of \fIexp\fR.
-Additional backslashes may be used in \fIsubSpec\fR to prevent special
-interpretation of ``&'' or ``\e0'' or ``\e\fIn\fR'' or
-backslash.
-The use of backslashes in \fIsubSpec\fR tends to interact badly
-with the Tcl parser's use of backslashes, so it's generally
-safest to enclose \fIsubSpec\fR in braces if it includes
-backslashes.
-.LP
-If the initial arguments to \fBregexp\fR start with \fB\-\fR then
-they are treated as switches.  The following switches are
-currently supported:
-.TP 10
-\fB\-all\fR
-All ranges in \fIstring\fR that match \fIexp\fR are found and
-substitution is performed for each of these ranges.
-Without this switch only the first
-matching range is found and substituted.
-If \fB\-all\fR is specified, then ``&'' and ``\e\fIn\fR''
-sequences are handled for each substitution using the information
-from the corresponding match.
-.TP 10
-\fB\-nocase\fR
-Upper-case characters in \fIstring\fR will be converted to lower-case
-before matching against \fIexp\fR;  however, substitutions specified
-by \fIsubSpec\fR use the original unconverted form of \fIstring\fR.
-.TP 10
-\fB\-\|\-\fR
-Marks the end of switches.  The argument following this one will
-be treated as \fIexp\fR even if it starts with a \fB\-\fR.
-.PP
-The command returns a count of the number of matching ranges that
-were found and replaced.
-See the manual entry for \fBregexp\fR for details on the interpretation
-of regular expressions.
-
-.SH KEYWORDS
-match, pattern, regular expression, substitute
diff --git a/doc/rename.n b/doc/rename.n
deleted file mode 100644
index d7617e3..0000000
--- a/doc/rename.n
+++ /dev/null
@@ -1,32 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: rename.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH rename n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-rename \- Rename or delete a command
-.SH SYNOPSIS
-\fBrename \fIoldName newName\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Rename the command that used to be called \fIoldName\fR so that it
-is now called \fInewName\fR.
-If \fInewName\fR is an empty string then \fIoldName\fR is deleted.
-\fIoldName\fR and \fInewName\fR may include namespace qualifiers
-(names of containing namespaces).
-If a command is renamed into a different namespace,
-future invocations of it will execute in the new namespace.
-The \fBrename\fR command returns an empty string as result.
-
-.SH KEYWORDS
-command, delete, namespace, rename
diff --git a/doc/resource.n b/doc/resource.n
deleted file mode 100644
index 428591b..0000000
--- a/doc/resource.n
+++ /dev/null
@@ -1,155 +0,0 @@
-'\"
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" RCS: @(#) $Id: resource.n,v 1.4 1999/04/16 00:46:36 stanton Exp $
-'\" 
-.so man.macros
-.TH resource n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-resource \- Manipulate Macintosh resources
-.SH SYNOPSIS
-\fBresource \fIoption\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBresource\fR command provides some generic operations for
-dealing with Macintosh resources.  This command is only supported on
-the Macintosh platform.  Each Macintosh file consists of two
-\fIforks\fR: a \fIdata\fR fork and a \fIresource\fR fork.  You use the
-normal open, puts, close, etc. commands to manipulate the data fork.
-You must use this command, however, to interact with the resource
-fork.  \fIOption\fR indicates what resource command to perform.  Any
-unique abbreviation for \fIoption\fR is acceptable.  The valid options
-are:
-.TP
-\fBresource close \fIrsrcRef\fR
-Closes the given resource reference (obtained from \fBresource
-open\fR).  Resources from that resource file will no longer be
-available.
-.TP
-\fBresource delete\fR ?\fIoptions\fR? \fIresourceType\fR
-This command will delete the resource specified by \fIoptions\fR and
-type \fIresourceType\fR (see RESOURCE TYPES below).  The options
-give you several ways to specify the resource to be deleted.
-.RS
-.TP
-\fB\-id\fR \fIresourceId\fR
-If the \fB-id\fR option is given the id \fIresourceId\fR (see RESOURCE
-IDS below) is used to specify the resource to be deleted.  The id must 
-be a number - to specify a name use the \fB\-name\fR option.
-.TP
-\fB\-name\fR \fIresourceName\fR
-If \fB-name\fR is specified, the resource named
-\fIresourceName\fR will be deleted.  If the \fB-id\fR is also
-provided, then there must be a resource with BOTH this name and
-this id.  If no name is provided, then the id will be used regardless
-of the name of the actual resource.
-.TP
-\fB\-file\fR \fIresourceRef\fR
-If the \fB-file\fR option is specified then the resource will be
-deleted from the file pointed to by \fIresourceRef\fR.  Otherwise the
-first resource with the given \fIresourceName\fR and or
-\fIresourceId\fR which is found on the resource file path will be 
-deleted.  To inspect the file path, use the \fIresource files\fR command.
-.RE
-.TP
-\fBresource files ?\fIresourceRef\fR?
-If \fIresourceRef\fRis not provided, this command returns a Tcl list
-of the resource references for all the currently open resource files.
-The list is in the normal Macintosh search order for resources.  If 
-\fIresourceRef\fR is specified, the command will
-return the path to the file whose resource fork is represented by that
-token.
-.TP
-\fBresource list \fIresourceType\fR ?\fIresourceRef\fR?
-List all of the resources ids of type \fIresourceType\fR (see RESOURCE
-TYPES below).  If \fIresourceRef\fR is specified then the command will
-limit the search to that particular resource file.  Otherwise, all
-resource files currently opened by the application will be searched.
-A Tcl list of either the resource name's or resource id's of the found
-resources will be returned.  See the RESOURCE IDS section below for
-more details about what a resource id is.
-.TP
-\fBresource open \fIfileName\fR ?\fIaccess\fR?
-Open the resource for the file \fIfileName\fR.  Standard file access
-permissions may also be specified (see the manual entry for \fBopen\fR
-for details).  A resource reference (\fIresourceRef\fR) is returned
-that can be used by the other resource commands.  An error can occur
-if the file doesn't exist or the file does not have a resource fork.
-However, if you open the file with write permissions the file and/or
-resource fork will be created instead of generating an error.
-.TP
-\fBresource read \fIresourceType\fR \fIresourceId\fR ?\fIresourceRef\fR?
-Read the entire resource of type \fIresourceType\fR (see RESOURCE
-TYPES below) and the name or id of \fIresourceId\fR (see RESOURCE IDS
-below) into memory and return the result.  If \fIresourceRef\fR is
-specified we limit our search to that resource file, otherwise we
-search all open resource forks in the application.  It is important to
-note that most Macintosh resource use a binary format and the data
-returned from this command may have embedded NULLs or other non-ASCII
-data.
-.TP
-\fBresource types ?\fIresourceRef\fR?
-This command returns a Tcl list of all resource types (see RESOURCE
-TYPES below) found in the resource file pointed to by
-\fIresourceRef\fR.  If \fIresourceRef\fR is not specified it will
-return all the resource types found in every resource file currently
-opened by the application.
-.TP
-\fBresource write\fR ?\fIoptions\fR? \fIresourceType\fR \fIdata\fR
-This command will write the passed in \fIdata\fR as a new resource of
-type \fIresourceType\fR (see RESOURCE TYPES below).  Several options
-are available that describe where and how the resource is stored.
-.RS
-.TP
-\fB\-id\fR \fIresourceId\fR
-If the \fB-id\fR option is given the id \fIresourceId\fR (see RESOURCE
-IDS below) is used for the new resource, otherwise a unique id will be
-generated that will not conflict with any existing resource.  However,
-the id must be a number - to specify a name use the \fB\-name\fR option.
-.TP
-\fB\-name\fR \fIresourceName\fR
-If \fB-name\fR is specified the resource will be named
-\fIresourceName\fR, otherwise it will have the empty string as the
-name.
-.TP
-\fB\-file\fR \fIresourceRef\fR
-If the \fB-file\fR option is specified then the resource will be
-written in the file pointed to by \fIresourceRef\fR, otherwise the
-most resently open resource will be used.
-.TP
-\fB\-force\fR
-If the target resource already exists, then by default Tcl will not
-overwrite it, but raise an error instead.  Use the -force flag to
-force overwriting the extant resource.
-.RE
-
-.SH "RESOURCE TYPES"
-Resource types are defined as a four character string that is then
-mapped to an underlying id.  For example, \fBTEXT\fR refers to the
-Macintosh resource type for text.  The type \fBSTR#\fR is a list of
-counted strings.  All Macintosh resources must be of some type.  See
-Macintosh documentation for a more complete list of resource types
-that are commonly used.
-
-.SH "RESOURCE IDS"
-For this command the notion of a resource id actually refers to two
-ideas in Macintosh resources.  Every place you can use a resource Id
-you can use either the resource name or a resource number.  Names are
-always searched or returned in preference to numbers.  For example,
-the \fBresource list\fR command will return names if they exist or
-numbers if the name is NULL.
-
-.SH "SEE ALSO"
-open
-
-.SH "PORTABILITY ISSUES"
-The resource command is only available on Macintosh.
-
-.SH KEYWORDS
-open, resource
diff --git a/doc/return.n b/doc/return.n
deleted file mode 100644
index d3a3635..0000000
--- a/doc/return.n
+++ /dev/null
@@ -1,89 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: return.n,v 1.2 1998/09/14 18:39:54 stanton Exp $
-'\" 
-.so man.macros
-.TH return n 7.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-return \- Return from a procedure
-.SH SYNOPSIS
-\fBreturn \fR?\fB\-code \fIcode\fR? ?\fB\-errorinfo \fIinfo\fR? ?\fB\-errorcode\fI code\fR? ?\fIstring\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Return immediately from the current procedure
-(or top-level command or \fBsource\fR command),
-with \fIstring\fR as the return value.  If \fIstring\fR is not specified then
-an empty string will be returned as result.
-
-.SH "EXCEPTIONAL RETURNS"
-.PP
-In the usual case where the \fB\-code\fR option isn't
-specified the procedure will return normally (its completion
-code will be TCL_OK).
-However, the \fB\-code\fR option may be used to generate an
-exceptional return from the procedure.
-\fICode\fR may have any of the following values:
-.TP 10
-\fBok\fR
-Normal return:  same as if the option is omitted.
-.TP 10
-\fBerror\fR
-Error return: same as if the \fBerror\fR command were used to
-terminate the procedure, except for handling of \fBerrorInfo\fR
-and \fBerrorCode\fR variables (see below).
-.TP 10
-\fBreturn\fR
-The current procedure will return with a completion code of
-TCL_RETURN, so that the procedure that invoked it will return
-also.
-.TP 10
-\fBbreak\fR
-The current procedure will return with a completion code of
-TCL_BREAK, which will terminate the innermost nested loop in
-the code that invoked the current procedure.
-.TP 10
-\fBcontinue\fR
-The current procedure will return with a completion code of
-TCL_CONTINUE, which will terminate the current iteration of
-the innermost nested loop in the code that invoked the current
-procedure.
-.TP 10
-\fIvalue\fR
-\fIValue\fR must be an integer;  it will be returned as the
-completion code for the current procedure.
-.LP
-The \fB\-code\fR option is rarely used.
-It is provided so that procedures that implement
-new control structures can reflect exceptional conditions back to
-their callers.
-.PP
-Two additional options, \fB\-errorinfo\fR and \fB\-errorcode\fR,
-may be used to provide additional information during error
-returns.
-These options are ignored unless \fIcode\fR is \fBerror\fR.
-.PP
-The \fB\-errorinfo\fR option specifies an initial stack
-trace for the \fBerrorInfo\fR variable;  if it is not specified then
-the stack trace left in \fBerrorInfo\fR will include the call to
-the procedure and higher levels on the stack but it will not include
-any information about the context of the error within the procedure.
-Typically the \fIinfo\fR value is supplied from the value left
-in \fBerrorInfo\fR after a \fBcatch\fR command trapped an error within
-the procedure.
-.PP
-If the \fB\-errorcode\fR option is specified then \fIcode\fR provides
-a value for the \fBerrorCode\fR variable.
-If the option is not specified then \fBerrorCode\fR will
-default to \fBNONE\fR.
-
-.SH KEYWORDS
-break, continue, error, procedure, return
diff --git a/doc/safe.n b/doc/safe.n
deleted file mode 100644
index 749a57b..0000000
--- a/doc/safe.n
+++ /dev/null
@@ -1,350 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: safe.n,v 1.3 1999/04/16 00:46:36 stanton Exp $
-'\" 
-.so man.macros
-.TH "Safe Tcl" n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-Safe\ Base \- A mechanism for creating and manipulating safe interpreters.
-.SH SYNOPSIS
-\fB::safe::interpCreate\fR ?\fIslave\fR? ?\fIoptions...\fR?
-.sp
-\fB::safe::interpInit\fR \fIslave\fR ?\fIoptions...\fR?
-.sp
-\fB::safe::interpConfigure\fR \fIslave\fR ?\fIoptions...\fR?
-.sp
-\fB::safe::interpDelete\fR \fIslave\fR
-.sp
-\fB::safe::interpAddToAccessPath\fR \fIslave\fR \fIdirectory\fR
-.sp
-\fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
-.sp
-\fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
-.SH OPTIONS
-.PP
-?\fB\-accessPath\fR \fIpathList\fR?
-?\fB\-statics\fR \fIboolean\fR? ?\fB\-noStatics\fR?
-?\fB\-nested\fR \fIboolean\fR? ?\fB\-nestedLoadOk\fR?
-?\fB\-deleteHook\fR \fIscript\fR?
-.BE
-
-.SH DESCRIPTION
-Safe Tcl is a mechanism for executing untrusted Tcl scripts
-safely and for providing mediated access by such scripts to
-potentially dangerous functionality.
-.PP
-The Safe Base ensures that untrusted Tcl scripts cannot harm the
-hosting application.
-The Safe Base prevents integrity and privacy attacks. Untrusted Tcl
-scripts are prevented from corrupting the state of the hosting
-application or computer. Untrusted scripts are also prevented from
-disclosing information stored on the hosting computer or in the
-hosting application to any party.
-.PP
-The Safe Base allows a master interpreter to create safe, restricted
-interpreters that contain a set of predefined aliases for the \fBsource\fR,
-\fBload\fR, \fBfile\fR, \fBencoding\fR, and \fBexit\fR commands and
-are able to use the auto-loading and package mechanisms.
-.PP
-No knowledge of the file system structure is leaked to the
-safe interpreter, because it has access only to a virtualized path
-containing tokens. When the safe interpreter requests to source a file, it
-uses the token in the virtual path as part of the file name to source; the
-master interpreter transparently 
-translates the token into a real directory name and executes the 
-requested operation (see the section \fBSECURITY\fR below for details).
-Different levels of security can be selected by using the optional flags
-of the commands described below.
-.PP
-All commands provided in the master interpreter by the Safe Base reside in
-the \fBsafe\fR namespace:
-
-.SH COMMANDS
-The following commands are provided in the master interpreter:
-.TP
-\fB::safe::interpCreate\fR ?\fIslave\fR? ?\fIoptions...\fR?
-Creates a safe interpreter, installs the aliases described in the section
-\fBALIASES\fR and initializes the auto-loading and package mechanism as
-specified by the supplied \fBoptions\fR.
-See the \fBOPTIONS\fR section below for a description of the
-optional arguments.
-If the \fIslave\fR argument is omitted, a name will be generated.
-\fB::safe::interpCreate\fR always returns the interpreter name.
-.TP
-\fB::safe::interpInit\fR \fIslave\fR ?\fIoptions...\fR?
-This command is similar to \fBinterpCreate\fR except it that does not
-create the safe interpreter. \fIslave\fR must have been created by some
-other means, like \fBinterp create \-safe\fR.
-.TP
-\fB::safe::interpConfigure\fR \fIslave\fR ?\fIoptions...\fR?
-If no \fIoptions\fR are given, returns the settings for all options for the
-named safe interpreter as a list of options and their current values
-for that \fIslave\fR. 
-If a single additional argument is provided,
-it will return a list of 2 elements \fIname\fR and \fIvalue\fR where
-\fIname\fR is the full name of that option and \fIvalue\fR the current value
-for that option and the \fIslave\fR.
-If more than two additional arguments are provided, it will reconfigure the
-safe interpreter and change each and only the provided options.
-See the section on \fBOPTIONS\fR below for options description.
-Example of use:
-.RS
-.CS
-# Create a new interp with the same configuration as "$i0" :
-set i1 [eval safe::interpCreate [safe::interpConfigure $i0]]
-# Get the current deleteHook
-set dh [safe::interpConfigure $i0  \-del]
-# Change (only) the statics loading ok attribute of an interp
-# and its deleteHook (leaving the rest unchanged) :
-safe::interpConfigure $i0  \-delete {foo bar} \-statics 0 ;
-.CE
-.RE
-.TP
-\fB::safe::interpDelete\fR \fIslave\fR
-Deletes the safe interpreter and cleans up the corresponding  
-master interpreter data structures.
-If a \fIdeleteHook\fR script was specified for this interpreter it is
-evaluated before the interpreter is deleted, with the name of the
-interpreter as an additional argument.
-.TP
-\fB::safe::interpFindInAccessPath\fR \fIslave\fR \fIdirectory\fR
-This command finds and returns the token for the real directory
-\fIdirectory\fR in the safe interpreter's current virtual access path.
-It generates an error if the directory is not found.
-Example of use:
-.RS
-.CS
-$slave eval [list set tk_library [::safe::interpFindInAccessPath $name $tk_library]]
-.CE
-.RE
-.TP
-\fB::safe::interpAddToAccessPath\fR \fIslave\fR \fIdirectory\fR
-This command adds \fIdirectory\fR to the virtual path maintained for the
-safe interpreter in the master, and returns the token that can be used in
-the safe interpreter to obtain access to files in that directory.
-If the directory is already in the virtual path, it only returns the token
-without adding the directory to the virtual path again.
-Example of use:
-.RS
-.CS
-$slave eval [list set tk_library [::safe::interpAddToAccessPath $name $tk_library]]
-.CE
-.RE
-.TP
-\fB::safe::setLogCmd\fR ?\fIcmd arg...\fR?
-This command installs a script that will be called when interesting
-life cycle events occur for a safe interpreter.
-When called with no arguments, it returns the currently installed script.
-When called with one argument, an empty string, the currently installed
-script is removed and logging is turned off.
-The script will be invoked with one additional argument, a string
-describing the event of interest.
-The main purpose is to help in debugging safe interpreters.
-Using this facility you can get complete error messages while the safe
-interpreter gets only generic error messages.
-This prevents a safe interpreter from seeing messages about failures
-and other events that might contain sensitive information such as real
-directory names.
-.RS
-Example of use:
-.CS
-::safe::setLogCmd puts stderr
-.CE
-Below is the output of a sample session in which a safe interpreter
-attempted to source a file not found in its virtual access path.
-Note that the safe interpreter only received an error message saying that
-the file was not found:
-.CS
-NOTICE for slave interp10 : Created
-NOTICE for slave interp10 : Setting accessPath=(/foo/bar) staticsok=1 nestedok=0 deletehook=()
-NOTICE for slave interp10 : auto_path in interp10 has been set to {$p(:0:)}
-ERROR for slave interp10 : /foo/bar/init.tcl: no such file or directory
-.CE
-.RE
-
-.SH OPTIONS
-The following options are common to 
-\fB::safe::interpCreate\fR, \fB::safe::interpInit\fR, 
-and \fB::safe::interpConfigure\fR.
-Any option name can be abbreviated to its minimal 
-non-ambiguous name.
-Option names are not case sensitive.
-.TP 
-\fB\-accessPath\fR \fIdirectoryList\fR
-This option sets the list of directories from which the safe interpreter
-can \fBsource\fR and \fBload\fR files.
-If this option is not specified, or if it is given as the
-empty list, the safe interpreter will use the same directories as its
-master for auto-loading.
-See the section \fBSECURITY\fR below for more detail about virtual paths, 
-tokens and access control.
-.TP
-\fB\-statics\fR \fIboolean\fR
-This option specifies if the safe interpreter will be allowed
-to load statically linked packages (like \fBload {} Tk\fR).
-The default value is \fBtrue\fR : 
-safe interpreters are allowed to load statically linked packages.
-.TP
-\fB\-noStatics\fR
-This option is a convenience shortcut for \fB-statics false\fR and
-thus specifies that the safe interpreter will not be allowed
-to load statically linked packages.
-.TP
-\fB\-nested\fR \fIboolean\fR
-This option specifies if the safe interpreter will be allowed
-to load packages into its own sub-interpreters.
-The default value is \fBfalse\fR : 
-safe interpreters are not allowed to load packages into
-their own sub-interpreters.
-.TP
-\fB\-nestedLoadOk\fR
-This option is a convenience shortcut for \fB-nested true\fR and
-thus specifies the safe interpreter will be allowed
-to load packages into its own sub-interpreters.
-.TP 
-\fB\-deleteHook\fR \fIscript\fR
-When this option is given an non empty \fIscript\fR, it will be
-evaluated in the master with the name of
-the safe interpreter as an additional argument
-just before actually deleting the safe interpreter.
-Giving an empty value removes any currently installed deletion hook
-script for that safe interpreter.
-The default value (\fB{}\fR) is not to have any deletion call back.
-.SH ALIASES
-The following aliases are provided in a safe interpreter:
-.TP
-\fBsource\fR \fIfileName\fR
-The requested file, a Tcl source file, is sourced into the safe interpreter
-if it is found.
-The \fBsource\fR alias can only source files from directories in
-the virtual path for the safe interpreter. The \fBsource\fR alias requires
-the safe interpreter to
-use one of the token names in its virtual path to denote the directory in
-which the file to be sourced can be found.
-See the section on \fBSECURITY\fR for more discussion of restrictions on
-valid filenames.
-.TP
-\fBload\fR \fIfileName\fR
-The requested file, a shared object file, is dynamically loaded into the
-safe interpreter if it is found.
-The filename must contain a token name mentioned in the virtual path for
-the safe interpreter for it to be found successfully.
-Additionally, the shared object file must contain a safe entry point; see
-the manual page for the \fBload\fR command for more details.
-.TP
-\fBfile\fR ?\fIsubCmd args...\fR?
-The \fBfile\fR alias provides access to a safe subset of the subcommands of
-the \fBfile\fR command; it allows only \fBdirname\fR, \fBjoin\fR,
-\fBextension\fR, \fBroot\fR, \fBtail\fR, \fBpathname\fR and \fBsplit\fR
-subcommands. For more details on what these subcommands do see the manual
-page for the \fBfile\fR command.
-.TP
-\fBencoding\fR ?\fIsubCmd args...\fR?
-The \fBenconding\fR alias provides access to a safe subset of the
-subcommands of the \fBencoding\fR command;  it disallows setting of
-the system encoding, but allows all other subcommands including
-\fBsystem\fR to check the current encoding.
-.TP
-\fBexit\fR
-The calling interpreter is deleted and its computation is stopped, but the
-Tcl process in which this interpreter exists is not terminated.
-
-.SH SECURITY
-The Safe Base does not attempt to completely prevent annoyance and
-denial of service attacks. These forms of attack prevent the
-application or user from temporarily using the computer to perform
-useful work, for example by consuming all available CPU time or
-all available screen real estate.
-These attacks, while aggravating, are deemed to be of lesser importance
-in general than integrity and privacy attacks that the Safe Base
-is to prevent.
-.PP
-The commands available in a safe interpreter, in addition to
-the safe set as defined in \fBinterp\fR manual page, are mediated aliases
-for \fBsource\fR, \fBload\fR, \fBexit\fR, and safe subsets of
-\fBfile\fR and \fBencoding\fR. The safe interpreter can also auto-load
-code and it can request that packages be loaded.
-.PP
-Because some of these commands access the local file system, there is a
-potential for information leakage about its directory structure.
-To prevent this, commands that take file names as arguments in a safe
-interpreter use tokens instead of the real directory names.
-These tokens are translated to the real directory name while a request to,
-e.g., source a file is mediated by the master interpreter.
-This virtual path system is maintained in the master interpreter for each safe
-interpreter created by \fB::safe::interpCreate\fR or initialized by
-\fB::safe::interpInit\fR and
-the path maps tokens accessible in the safe interpreter into real path
-names on the local file system thus preventing safe interpreters 
-from gaining knowledge about the
-structure of the file system of the host on which the interpreter is
-executing.
-The only valid file names arguments
-for the \fBsource\fR and \fBload\fR aliases provided to the slave
-are path in the form of 
-\fB[file join \fR\fItoken filename\fR\fB]\fR (ie, when using the
-native file path formats: \fItoken\fR\fB/\fR\fIfilename\fR
-on Unix, \fItoken\fR\fB\\\fIfilename\fR on Windows, 
-and \fItoken\fR\fB:\fR\fIfilename\fR on the Mac),
-where \fItoken\fR is representing one of the directories 
-of the \fIaccessPath\fR list and \fIfilename\fR is
-one file in that directory (no sub directories access are allowed).
-.PP
-When a token is used in a safe interpreter in a request to source or
-load a file, the token is checked and
-translated to a real path name and the file to be
-sourced or loaded is located on the file system.
-The safe interpreter never gains knowledge of the actual path name under
-which the file is stored on the file system.
-.PP
-To further prevent potential information leakage from sensitive files that
-are accidentally included in the set of files that can be sourced by a safe
-interpreter, the \fBsource\fR alias restricts access to files
-meeting the following constraints: the file name must
-fourteen characters or shorter, must not contain more than one dot ("\fB.\fR"),
-must end up with the extension \fB.tcl\fR or be called \fBtclIndex\fR.
-.PP
-Each element of the initial access path
-list will be assigned a token that will be set in
-the slave \fBauto_path\fR and the first element of that list will be set as
-the \fBtcl_library\fR for that slave.
-.PP
-If the access path argument is not given or is the empty list, 
-the default behavior is to let the slave access the same packages
-as the master has access to (Or to be more precise: 
-only packages written in Tcl (which by definition can't be dangerous
-as they run in the slave interpreter) and C extensions that
-provides a Safe_Init entry point). For that purpose, the master's 
-\fBauto_path\fR will be used to construct the slave access path. 
-In order that the slave successfully loads the Tcl library files
-(which includes the auto-loading mechanism itself) the \fBtcl_library\fR will be
-added or moved to the first position if necessary, in the 
-slave access path, so the slave
-\fBtcl_library\fR will be the same as the master's (its real
-path will still be invisible to the slave though). 
-In order that auto-loading works the same for the slave and
-the master in this by default case, the first-level
-sub directories of each directory in the master \fBauto_path\fR will
-also be added (if not already included) to the slave access path.
-You can always specify a more
-restrictive path for which sub directories will never be searched by 
-explicitly specifying your directory list with the \fB\-accessPath\fR flag
-instead of relying on this default mechanism.
-.PP
-When the \fIaccessPath\fR is changed after the first creation or
-initialization (ie through \fBinterpConfigure -accessPath \fR\fIlist\fR),
-an \fBauto_reset\fR is automatically evaluated in the safe interpreter
-to synchronize its \fBauto_index\fR with the new token list.
-
-.SH "SEE ALSO"
-interp(n), library(n), load(n), package(n), source(n), unknown(n)
- 
-.SH KEYWORDS
-alias, auto\-loading, auto_mkindex, load, master interpreter, safe
-interpreter, slave interpreter, source
diff --git a/doc/scan.n b/doc/scan.n
deleted file mode 100644
index 123ec5b..0000000
--- a/doc/scan.n
+++ /dev/null
@@ -1,182 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: scan.n,v 1.3 1999/04/16 00:46:36 stanton Exp $
-'\" 
-.so man.macros
-.TH scan n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-scan \- Parse string using conversion specifiers in the style of sscanf
-.SH SYNOPSIS
-\fBscan \fIstring format varName \fR?\fIvarName ...\fR?
-.BE
-
-.SH INTRODUCTION
-.PP
-This command parses fields from an input string in the same fashion
-as the ANSI C \fBsscanf\fR procedure and returns a count of the number
-of conversions performed, or -1 if the end of the input string is
-reached before any conversions have been performed.
-\fIString\fR gives the input to be parsed and \fIformat\fR indicates
-how to parse it, using \fB%\fR conversion specifiers as in \fBsscanf\fR.
-Each \fIvarName\fR gives the name of a variable; when a field is
-scanned from \fIstring\fR the result is converted back into a string
-and assigned to the corresponding variable.
-
-.SH "DETAILS ON SCANNING"
-.PP
-\fBScan\fR operates by scanning \fIstring\fR and \fIformat\fR together.
-If the next character in \fIformat\fR is a blank or tab then it
-matches any number of white space characters in \fIstring\fR (including
-zero).
-Otherwise, if it isn't a \fB%\fR character then it 
-must match the next character of \fIstring\fR.
-When a \fB%\fR is encountered in \fIformat\fR, it indicates
-the start of a conversion specifier.
-A conversion specifier contains up to four fields after the \fB%\fR:
-a \fB*\fR, which indicates that the converted value is to be discarded 
-.VS 8.1
-instead of assigned to a variable; a XPG3 position specifier; a number
-.VE 8.1
-indicating a maximum field width; and a conversion character.
-All of these fields are optional except for the conversion character.
-The fields that are present must appear in the order given above.
-.PP
-When \fBscan\fR finds a conversion specifier in \fIformat\fR, it
-first skips any white-space characters in \fIstring\fR (unless the
-specifier is \fB[\fR or \fBc\fR).
-Then it converts the next input characters according to the 
-conversion specifier and stores the result in the variable given
-by the next argument to \fBscan\fR.
-.VS 8.1
-.PP
-If the \fB%\fR is followed by a decimal number and a \fB$\fR, as in
-``\fB%2$d\fR'', then the variable to use is not taken from the next
-sequential argument.  Instead, it is taken from the argument indicated
-by the number, where 1 corresponds to the first \fIvarName\fR.  If
-there are any positional specifiers in \fIformat\fR then all of the
-specifiers must be positional.  Every \fIvarName\fR on the argument
-list must correspond to exactly one conversion specifier or an error
-is generated.
-.VE 8.1
-.PP
-The following conversion characters are supported:
-.TP 10
-\fBd\fR
-The input field must be a decimal integer.
-It is read in and the value is stored in the variable as a decimal string.
-.TP 10
-\fBo\fR
-The input field must be an octal integer. It is read in and the 
-value is stored in the variable as a decimal string.
-.TP 10
-\fBx\fR
-The input field must be a hexadecimal integer. It is read in 
-and the value is stored in the variable as a decimal string.
-.VS 8.1
-.TP 10
-\fBu\fR
-The input field must be a decimal integer.  The value is stored in the
-variable as an unsigned decimal integer string.
-.TP 10
-\fBi\fR 
-The input field must be an integer.  The base (i.e. decimal, octal, or
-hexadecimal) is determined in the same fashion as described in
-\fBexpr\fR.  The value is stored in the variable as a decimal string.
-.VE 8.1
-.TP 10
-\fBc\fR
-A single character is read in and its binary value is stored in 
-the variable as a decimal string.
-Initial white space is not skipped in this case, so the input
-field may be a white-space character.
-This conversion is different from the ANSI standard in that the
-input field always consists of a single character and no field
-width may be specified.
-.TP 10
-\fBs\fR
-The input field consists of all the characters up to the next 
-white-space character; the characters are copied to the variable.
-.TP 10
-\fBe\fR or \fBf\fR or \fBg\fR
-The input field must be a floating-point number consisting 
-of an optional sign, a string of decimal digits possibly
-containing a decimal point, and an optional exponent consisting 
-of an \fBe\fR or \fBE\fR followed by an optional sign and a string of 
-decimal digits.
-It is read in and stored in the variable as a floating-point string.
-.TP 10
-\fB[\fIchars\fB]\fR
-The input field consists of any number of characters in 
-\fIchars\fR.
-The matching string is stored in the variable.
-If the first character between the brackets is a \fB]\fR then
-it is treated as part of \fIchars\fR rather than the closing
-bracket for the set.
-.VS 8.1
-If \fIchars\fR
-contains a sequence of the form \fIa\fB\-\fIb\fR then any
-character between \fIa\fR and \fIb\fR (inclusive) will match.
-If the first or last character between the brackets is a \fB\-\fR, then
-it is treated as part of \fIchars\fR rather than indicating a range.
-.VE 8.1
-.TP 10
-\fB[^\fIchars\fB]\fR
-The input field consists of any number of characters not in 
-\fIchars\fR.
-The matching string is stored in the variable.
-If the character immediately following the \fB^\fR is a \fB]\fR then it is 
-treated as part of the set rather than the closing bracket for 
-the set.
-.VS 8.1
-If \fIchars\fR
-contains a sequence of the form \fIa\fB\-\fIb\fR then any
-character between \fIa\fR and \fIb\fR (inclusive) will be excluded
-from the set.
-If the first or last character between the brackets is a \fB\-\fR, then
-it is treated as part of \fIchars\fR rather than indicating a range.
-.TP 10
-\fBn\fR
-No input is consumed from the input string.  Instead, the total number
-of chacters scanned from the input string so far is stored in the variable.
-.VE 8.1
-.LP
-The number of characters read from the input for a conversion is the
-largest number that makes sense for that particular conversion (e.g.
-as many decimal digits as possible for \fB%d\fR, as 
-many octal digits as possible for \fB%o\fR, and so on).
-The input field for a given conversion terminates either when a
-white-space character is encountered or when the maximum field 
-width has been reached, whichever comes first.
-If a \fB*\fR is present in the conversion specifier 
-then no variable is assigned and the next scan argument is not consumed.
-
-.SH "DIFFERENCES FROM ANSI SSCANF"
-.PP
-The behavior of the \fBscan\fR command is the same as the behavior of
-the ANSI C \fBsscanf\fR procedure except for the following differences:
-.VS 8.1
-.IP [1]
-\fB%p\fR conversion specifier is not currently
-supported.
-.VE 8.1
-.IP [2]
-For \fB%c\fR conversions a single character value is
-converted to a decimal string, which is then assigned to the
-corresponding \fIvarName\fR;
-no field width may be specified for this conversion.
-.IP [3]
-The \fBl\fR, \fBh\fR, and \fBL\fR modifiers are ignored;  integer
-values are always converted as if there were no modifier present
-and real values are always converted as if the \fBl\fR modifier
-were present (i.e. type \fBdouble\fR is used for the internal
-representation).
-
-.SH KEYWORDS
-conversion specifier, parse, scan
diff --git a/doc/seek.n b/doc/seek.n
deleted file mode 100644
index 3620e83..0000000
--- a/doc/seek.n
+++ /dev/null
@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: seek.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH seek n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-seek \- Change the access position for an open channel
-.SH SYNOPSIS
-\fBseek \fIchannelId offset \fR?\fIorigin\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Changes the current access position for \fIchannelId\fR.
-\fIChannelId\fR must be a channel identifier such as returned from a
-previous invocation of \fBopen\fR or \fBsocket\fR.
-The \fIoffset\fR and \fIorigin\fR
-arguments specify the position at which the next read or write will occur
-for \fIchannelId\fR. \fIOffset\fR must be an integer (which may be
-negative) and \fIorigin\fR must be one of the following:
-.TP 10
-\fBstart\fR
-The new access position will be \fIoffset\fR bytes from the start
-of the underlying file or device.
-.TP 10
-\fBcurrent\fR
-The new access position will be \fIoffset\fR bytes from the current
-access position; a negative \fIoffset\fR moves the access position
-backwards in the underlying file or device.
-.TP 10
-\fBend\fR
-The new access position will be \fIoffset\fR bytes from the end of
-the file or device.  A negative \fIoffset\fR places the access position
-before the end of file, and a positive \fIoffset\fR places the access
-position after the end of file.
-.LP
-The \fIorigin\fR argument defaults to \fBstart\fR.
-.PP
-The command flushes all buffered output for the channel before the command
-returns, even if the channel is in nonblocking mode.
-It also discards any buffered and unread input.
-This command returns an empty string.
-An error occurs if this command is applied to channels whose underlying
-file or device does not support seeking.
-
-.SH KEYWORDS
-access position, file, seek
diff --git a/doc/set.n b/doc/set.n
deleted file mode 100644
index b9d1bb5..0000000
--- a/doc/set.n
+++ /dev/null
@@ -1,48 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: set.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH set n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-set \- Read and write variables
-.SH SYNOPSIS
-\fBset \fIvarName \fR?\fIvalue\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns the value of variable \fIvarName\fR.
-If \fIvalue\fR is specified, then set
-the value of \fIvarName\fR to \fIvalue\fR, creating a new variable
-if one doesn't already exist, and return its value.
-If \fIvarName\fR contains an open parenthesis and ends with a
-close parenthesis, then it refers to an array element:  the characters
-before the first open parenthesis are the name of the array,
-and the characters between the parentheses are the index within the array.
-Otherwise \fIvarName\fR refers to a scalar variable.
-Normally, \fIvarName\fR is unqualified
-(does not include the names of any containing namespaces),
-and the variable of that name in the current namespace is read or written.
-If \fIvarName\fR includes namespace qualifiers
-(in the array name if it refers to an array element),
-the variable in the specified namespace is read or written.
-.PP
-If no procedure is active,
-then \fIvarName\fR refers to a namespace variable
-(global variable if the current namespace is the global namespace).
-If a procedure is active, then \fIvarName\fR refers to a parameter
-or local variable of the procedure unless the \fBglobal\fR command
-was invoked to declare \fIvarName\fR to be global,
-or unless a \fBvariable\fR command
-was invoked to declare \fIvarName\fR to be a namespace variable.
-
-.SH KEYWORDS
-read, write, variable
diff --git a/doc/socket.n b/doc/socket.n
deleted file mode 100644
index d73883f..0000000
--- a/doc/socket.n
+++ /dev/null
@@ -1,134 +0,0 @@
-'\"
-'\" Copyright (c) 1996 Sun Microsystems, Inc.
-'\" Copyright (c) 1998-1999 by Scriptics Corporation.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\"
-'\" RCS: @(#) $Id: socket.n,v 1.4 1999/04/16 00:46:36 stanton Exp $
-.so man.macros
-.TH socket n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-socket \- Open a TCP network connection
-.SH SYNOPSIS
-.sp
-\fBsocket \fR?\fIoptions\fR? \fIhost port\fR
-.sp
-\fBsocket\fR \fB\-server \fIcommand\fR ?\fIoptions\fR? \fIport\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command opens a network socket and returns a channel
-identifier that may be used in future invocations of commands like
-\fBread\fR, \fBputs\fR and \fBflush\fR.
-At present only the TCP network protocol is supported;  future
-releases may include support for additional protocols.
-The \fBsocket\fR command may be used to open either the client or
-server side of a connection, depending on whether the \fB\-server\fR
-switch is specified.
-
-.SH "CLIENT SOCKETS"
-.PP
-If the \fB\-server\fR option is not specified, then the client side of a
-connection is opened and the command returns a channel identifier
-that can be used for both reading and writing.
-\fIPort\fR and \fIhost\fR specify a port
-to connect to;  there must be a server accepting connections on
-this port.  \fIPort\fR is an integer port number and \fIhost\fR
-is either a domain-style name such as \fBwww.sunlabs.com\fR or
-a numerical IP address such as \fB127.0.0.1\fR.
-Use \fIlocalhost\fR to refer to the host on which the command is invoked.
-.PP
-The following options may also be present before \fIhost\fR
-to specify additional information about the connection:
-.TP
-\fB\-myaddr\fI addr\fR
-\fIAddr\fR gives the domain-style name or numerical IP address of
-the client-side network interface to use for the connection.
-This option may be useful if the client machine has multiple network
-interfaces.  If the option is omitted then the client-side interface
-will be chosen by the system software.
-.TP
-\fB\-myport\fI port\fR
-\fIPort\fR specifies an integer port number to use for the client's
-side of the connection.  If this option is omitted, the client's
-port number will be chosen at random by the system software.
-.TP
-\fB\-async\fR
-The \fB\-async\fR option will cause the client socket to be connected
-asynchronously. This means that the socket will be created immediately but
-may not yet be connected to the server, when the call to \fBsocket\fR
-returns. When a \fBgets\fR or \fBflush\fR is done on the socket before the
-connection attempt succeeds or fails, if the socket is in blocking mode, the
-operation will wait until the connection is completed or fails. If the
-socket is in nonblocking mode and a \fBgets\fR or \fBflush\fR is done on
-the socket before the connection attempt succeeds or fails, the operation
-returns immediately and \fBfblocked\fR on the socket returns 1.
-
-.SH "SERVER SOCKETS"
-.PP
-If the \fB\-server\fR option is specified then the new socket
-will be a server for the port given by \fIport\fR.
-Tcl will automatically accept connections to the given port.
-For each connection Tcl will create a new channel that may be used to
-communicate with the client.  Tcl then invokes \fIcommand\fR
-with three additional arguments: the name of the new channel, the
-address, in network address notation, of the client's host, and
-the client's port number.
-.PP
-The following additional option may also be specified before \fIhost\fR:
-.TP
-\fB\-myaddr\fI addr\fR
-\fIAddr\fR gives the domain-style name or numerical IP address of
-the server-side network interface to use for the connection.
-This option may be useful if the server machine has multiple network
-interfaces.  If the option is omitted then the server socket is bound
-to the special address INADDR_ANY so that it can accept connections from
-any interface.
-.PP
-Server channels cannot be used for input or output; their sole use is to
-accept new client connections. The channels created for each incoming
-client connection are opened for input and output. Closing the server
-channel shuts down the server so that no new connections will be
-accepted;  however, existing connections will be unaffected.
-.PP
-Server sockets depend on the Tcl event mechanism to find out when
-new connections are opened.  If the application doesn't enter the
-event loop, for example by invoking the \fBvwait\fR command or
-calling the C procedure \fBTcl_DoOneEvent\fR, then no connections
-will be accepted.
-
-.SH CONFIGURATION OPTIONS
-The \fBfconfigure\fR command can be used to query several readonly
-configuration options for socket channels:
-.VS 8.0.5
-.TP
-\fB\-error\fR
-This option gets the current error status of the given socket.  This
-is useful when you need to determine if an asynchronous connect
-operation succeeded.  If there was an error, the error message is
-returned.  If there was no error, an empty string is returned.
-.VE 8.0.5
-.TP
-\fB\-sockname\fR
-This option returns a list of three elements, the address, the host name
-and the port number for the socket. If the host name cannot be computed,
-the second element is identical to the address, the first element of the
-list.
-.TP
-\fB\-peername\fR
-This option is not supported by server sockets. For client and accepted
-sockets, this option returns a list of three elements; these are the
-address, the host name and the port to which the peer socket is connected
-or bound. If the host name cannot be computed, the second element of the
-list is identical to the address, its first element.
-.PP
-
-.SH "SEE ALSO"
-flush(n), open(n), read(n)
-
-.SH KEYWORDS
-bind, channel, connection, domain name, host, network address, socket, tcp
diff --git a/doc/source.n b/doc/source.n
deleted file mode 100644
index 024ab7b..0000000
--- a/doc/source.n
+++ /dev/null
@@ -1,44 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: source.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH source n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-source \- Evaluate a file or resource as a Tcl script
-.SH SYNOPSIS
-\fBsource \fIfileName\fR
-.sp
-\fBsource\fR \fB\-rsrc \fIresourceName \fR?\fIfileName\fR?
-.sp
-\fBsource\fR \fB\-rsrcid \fIresourceId \fR?\fIfileName\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command takes the contents of the specified file or resource
-and passes it to the Tcl interpreter as a text script.  The return
-value from \fBsource\fR is the return value of the last command
-executed in the script.  If an error occurs in evaluating the contents
-of the script then the \fBsource\fR command will return that error.
-If a \fBreturn\fR command is invoked from within the script then the
-remainder of the file will be skipped and the \fBsource\fR command
-will return normally with the result from the \fBreturn\fR command.
-
-The \fI\-rsrc\fR and \fI\-rsrcid\fR forms of this command are only
-available on Macintosh computers.  These versions of the command
-allow you to source a script from a \fBTEXT\fR resource.  You may specify
-what \fBTEXT\fR resource to source by either name or id.  By default Tcl
-searches all open resource files, which include the current
-application and any loaded C extensions.  Alternatively, you may
-specify the \fIfileName\fR where the \fBTEXT\fR resource can be found.
-
-.SH KEYWORDS
-file, script
diff --git a/doc/split.n b/doc/split.n
deleted file mode 100644
index 04773b0..0000000
--- a/doc/split.n
+++ /dev/null
@@ -1,44 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: split.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH split n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-split \- Split a string into a proper Tcl list
-.SH SYNOPSIS
-\fBsplit \fIstring \fR?\fIsplitChars\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns a list created by splitting \fIstring\fR at each character
-that is in the \fIsplitChars\fR argument.
-Each element of the result list will consist of the
-characters from \fIstring\fR that lie between instances of the
-characters in \fIsplitChars\fR.
-Empty list elements will be generated if \fIstring\fR contains
-adjacent characters in \fIsplitChars\fR, or if the first or last
-character of \fIstring\fR is in \fIsplitChars\fR.
-If \fIsplitChars\fR is an empty string then each character of
-\fIstring\fR becomes a separate element of the result list.
-\fISplitChars\fR defaults to the standard white-space characters.
-For example,
-.CS
-\fBsplit "comp.unix.misc" .\fR
-.CE
-returns \fB"comp unix misc"\fR and
-.CS
-\fBsplit "Hello world" {}\fR
-.CE
-returns \fB"H e l l o { } w o r l d"\fR.
-
-.SH KEYWORDS
-list, split, string
diff --git a/doc/string.n b/doc/string.n
deleted file mode 100644
index 42d6e0b..0000000
--- a/doc/string.n
+++ /dev/null
@@ -1,143 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: string.n,v 1.3 1999/04/16 00:46:36 stanton Exp $
-'\" 
-.so man.macros
-.TH string n 7.6 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-string \- Manipulate strings
-.SH SYNOPSIS
-\fBstring \fIoption arg \fR?\fIarg ...?\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Performs one of several string operations, depending on \fIoption\fR.
-The legal \fIoption\fRs (which may be abbreviated) are:
-.TP
-\fBstring compare \fIstring1 string2\fR
-Perform a character-by-character comparison of strings \fIstring1\fR and
-\fIstring2\fR in the same way as the C \fBstrcmp\fR procedure.  Return
-\-1, 0, or 1, depending on whether \fIstring1\fR is lexicographically
-less than, equal to, or greater than \fIstring2\fR.
-.TP
-\fBstring first \fIstring1 string2\fR
-Search \fIstring2\fR for a sequence of characters that exactly match
-the characters in \fIstring1\fR.  If found, return the index of the
-first character in the first such match within \fIstring2\fR.  If not
-found, return \-1.
-.TP
-\fBstring index \fIstring charIndex\fR
-Returns the \fIcharIndex\fR'th character of the \fIstring\fR
-argument.  A \fIcharIndex\fR of 0 corresponds to the first
-character of the string.
-If \fIcharIndex\fR is less than 0 or greater than
-or equal to the length of the string then an empty string is
-returned.
-.TP
-\fBstring last \fIstring1 string2\fR
-Search \fIstring2\fR for a sequence of characters that exactly match
-the characters in \fIstring1\fR.  If found, return the index of the
-first character in the last such match within \fIstring2\fR.  If there
-is no match, then return \-1.
-.TP
-\fBstring length \fIstring\fR
-Returns a decimal string giving the number of characters in \fIstring\fR.
-.TP
-\fBstring match \fIpattern\fR \fIstring\fR
-See if \fIpattern\fR matches \fIstring\fR; return 1 if it does, 0
-if it doesn't.  Matching is done in a fashion similar to that
-used by the C-shell.  For the two strings to match, their contents
-must be identical except that the following special sequences
-may appear in \fIpattern\fR:
-.RS
-.IP \fB*\fR 10
-Matches any sequence of characters in \fIstring\fR,
-including a null string.
-.IP \fB?\fR 10
-Matches any single character in \fIstring\fR.
-.IP \fB[\fIchars\fB]\fR 10
-Matches any character in the set given by \fIchars\fR.  If a sequence
-of the form
-\fIx\fB\-\fIy\fR appears in \fIchars\fR, then any character
-between \fIx\fR and \fIy\fR, inclusive, will match.
-.IP \fB\e\fIx\fR 10
-Matches the single character \fIx\fR.  This provides a way of
-avoiding the special interpretation of the characters
-\fB*?[]\e\fR in \fIpattern\fR.
-.RE
-.TP
-\fBstring range \fIstring first last\fR
-Returns a range of consecutive characters from \fIstring\fR, starting
-with the character whose index is \fIfirst\fR and ending with the
-character whose index is \fIlast\fR. An index of 0 refers to the
-first character of the string.  
-An index of \fBend\fR (or any
-abbreviation of it) refers to the last character of the string.
-If \fIfirst\fR is less than zero then it is treated as if it were zero, and
-if \fIlast\fR is greater than or equal to the length of the string then
-it is treated as if it were \fBend\fR.  If \fIfirst\fR is greater than
-\fIlast\fR then an empty string is returned.
-.VS
-.TP
-\fBstring tolower \fIstring\fR
-Returns a value equal to \fIstring\fR except that all upper (or title)
-case letters have been converted to lower case.
-.TP
-\fBstring totitle \fIstring\fR
-Returns a value equal to \fIstring\fR except that the first character
-in \fIstring\fR is converted to its Unicode title case variant (or upper
-case if there is no title case variant) and the rest of the string is
-converted to lower case.
-.TP
-\fBstring toupper \fIstring\fR 
-Returns a value equal to \fIstring\fR except that all lower (or title)
-case letters have been converted to upper case.
-.VE
-.TP
-\fBstring trim \fIstring\fR ?\fIchars\fR?
-Returns a value equal to \fIstring\fR except that any leading
-or trailing characters from the set given by \fIchars\fR are
-removed.
-If \fIchars\fR is not specified then white space is removed
-(spaces, tabs, newlines, and carriage returns).
-.TP
-\fBstring trimleft \fIstring\fR ?\fIchars\fR?
-Returns a value equal to \fIstring\fR except that any
-leading characters from the set given by \fIchars\fR are
-removed.
-If \fIchars\fR is not specified then white space is removed
-(spaces, tabs, newlines, and carriage returns).
-.TP
-\fBstring trimright \fIstring\fR ?\fIchars\fR?
-Returns a value equal to \fIstring\fR except that any
-trailing characters from the set given by \fIchars\fR are
-removed.
-If \fIchars\fR is not specified then white space is removed
-(spaces, tabs, newlines, and carriage returns).
-.VS
-.TP
-\fBstring wordend \fIstring index\fR
-Returns the index of the character just after the last one in the word
-containing character \fIindex\fR of \fIstring\fR.  A word is
-considered to be any contiguous range of alphanumeric (Unicode letters
-or decimal digits) or underscore (Unicode connector punctuation)
-characters, or any single character other than these.
-.TP
-\fBstring wordstart \fIstring index\fR
-Returns the index of the first character in the word containing
-character \fIindex\fR of \fIstring\fR.  A word is considered to be any
-contiguous range of alphanumeric (Unicode letters or decimal digits)
-or underscore (Unicode connector punctuation) characters, or any
-single character other than these.
-.VE
-
-.SH KEYWORDS
-case conversion, compare, index, match, pattern, string, word
diff --git a/doc/subst.n b/doc/subst.n
deleted file mode 100644
index 8675c22..0000000
--- a/doc/subst.n
+++ /dev/null
@@ -1,48 +0,0 @@
-'\"
-'\" Copyright (c) 1994 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: subst.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH subst n 7.4 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-subst \- Perform backslash, command, and variable substitutions
-.SH SYNOPSIS
-\fBsubst \fR?\fB\-nobackslashes\fR? ?\fB\-nocommands\fR? ?\fB\-novariables\fR? \fIstring\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command performs variable substitutions, command substitutions,
-and backslash substitutions on its \fIstring\fR argument and
-returns the fully-substituted result.
-The substitutions are performed in exactly the same way as for
-Tcl commands.
-As a result, the \fIstring\fR argument is actually substituted twice,
-once by the Tcl parser in the usual fashion for Tcl commands, and
-again by the \fIsubst\fR command.
-.PP
-If any of the \fB\-nobackslashes\fR, \fB\-nocommands\fR, or
-\fB\-novariables\fR are specified, then the corresponding substitutions
-are not performed.
-For example, if \fB\-nocommands\fR is specified, no command substitution
-is performed:  open and close brackets are treated as ordinary characters
-with no special interpretation.
-.PP
-Note: when it performs its substitutions, \fIsubst\fR does not
-give any special treatment to double quotes or curly braces.  For
-example, the script
-.CS
-\fBset a 44
-subst {xyz {$a}}\fR
-.CE
-returns ``\fBxyz {44}\fR'', not ``\fBxyz {$a}\fR''.
-
-.SH KEYWORDS
-backslash substitution, command substitution, variable substitution
diff --git a/doc/switch.n b/doc/switch.n
deleted file mode 100644
index 503a5ba..0000000
--- a/doc/switch.n
+++ /dev/null
@@ -1,107 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: switch.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH switch n 7.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-switch \- Evaluate one of several scripts, depending on a given value
-.SH SYNOPSIS
-\fBswitch \fR?\fIoptions\fR?\fI string pattern body \fR?\fIpattern body \fR...?
-.sp
-\fBswitch \fR?\fIoptions\fR?\fI string \fR{\fIpattern body \fR?\fIpattern body \fR...?}
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBswitch\fR command matches its \fIstring\fR argument against each of
-the \fIpattern\fR arguments in order.
-As soon as it finds a \fIpattern\fR that matches \fIstring\fR it
-evaluates the following \fIbody\fR argument by passing it recursively
-to the Tcl interpreter and returns the result of that evaluation.
-If the last \fIpattern\fR argument is \fBdefault\fR then it matches
-anything.
-If no \fIpattern\fR argument
-matches \fIstring\fR and no default is given, then the \fBswitch\fR
-command returns an empty string.
-.PP
-If the initial arguments to \fBswitch\fR start with \fB\-\fR then
-they are treated as options.  The following options are
-currently supported:
-.TP 10
-\fB\-exact\fR
-Use exact matching when comparing \fIstring\fR to a pattern.  This
-is the default.
-.TP 10
-\fB\-glob\fR
-When matching \fIstring\fR to the patterns, use glob-style matching
-(i.e. the same as implemented by the \fBstring match\fR command).
-.TP 10
-\fB\-regexp\fR
-When matching \fIstring\fR to the patterns, use regular
-expression matching
-(i.e. the same as implemented by the \fBregexp\fR command).
-.TP 10
-\fB\-\|\-\fR
-Marks the end of options.  The argument following this one will
-be treated as \fIstring\fR even if it starts with a \fB\-\fR.
-.PP
-Two syntaxes are provided for the \fIpattern\fR and \fIbody\fR arguments.
-The first uses a separate argument for each of the patterns and commands;
-this form is convenient if substitutions are desired on some of the
-patterns or commands.
-The second form places all of the patterns and commands together into
-a single argument; the argument must have proper list structure, with
-the elements of the list being the patterns and commands.
-The second form makes it easy to construct multi-line switch commands,
-since the braces around the whole list make it unnecessary to include a
-backslash at the end of each line.
-Since the \fIpattern\fR arguments are in braces in the second form,
-no command or variable substitutions are performed on them;  this makes
-the behavior of the second form different than the first form in some
-cases.
-.PP
-If a \fIbody\fR is specified as ``\fB\-\fR'' it means that the \fIbody\fR
-for the next pattern should also be used as the body for this
-pattern (if the next pattern also has a body of ``\fB\-\fR''
-then the body after that is used, and so on).
-This feature makes it possible to share a single \fIbody\fR among
-several patterns.
-.PP
-Below are some examples of \fBswitch\fR commands:
-.CS
-\fBswitch\0abc\0a\0\-\0b\0{format 1}\0abc\0{format 2}\0default\0{format 3}\fR
-.CE
-will return \fB2\fR, 
-.CS
-\fBswitch\0\-regexp\0aaab {
-	^a.*b$\0\-
-	b\0{format 1}
-	a*\0{format 2}
-	default\0{format 3}
-}\fR
-.CE
-will return \fB1\fR, and
-.CS
-\fBswitch\0xyz {
-	a
-		\-
-	b
-		{format 1}
-	a*
-		{format 2}
-	default
-		{format 3}
-}\fR
-.CE
-will return \fB3\fR.
-
-.SH KEYWORDS
-switch, match, regular expression
diff --git a/doc/tclsh.1 b/doc/tclsh.1
deleted file mode 100644
index 8918a23..0000000
--- a/doc/tclsh.1
+++ /dev/null
@@ -1,118 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: tclsh.1,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH tclsh 1 "" Tcl "Tcl Applications"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-tclsh \- Simple shell containing Tcl interpreter
-.SH SYNOPSIS
-\fBtclsh\fR ?\fIfileName arg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-\fBTclsh\fR is a shell-like application that reads Tcl commands
-from its standard input or from a file and evaluates them.
-If invoked with no arguments then it runs interactively, reading
-Tcl commands from standard input and printing command results and
-error messages to standard output.
-It runs until the \fBexit\fR command is invoked or until it
-reaches end-of-file on its standard input.
-If there exists a file \fB.tclshrc\fR in the home directory of
-the user, \fBtclsh\fR evaluates the file as a Tcl script
-just before reading the first command from standard input.
-
-.SH "SCRIPT FILES"
-.PP
-If \fBtclsh\fR is invoked with arguments then the first argument
-is the name of a script file and any additional arguments
-are made available to the script as variables (see below).
-Instead of reading commands from standard input \fBtclsh\fR will
-read Tcl commands from the named file;  \fBtclsh\fR will exit
-when it reaches the end of the file.
-There is no automatic evaluation of \fB.tclshrc\fR in this
-case, but the script file can always \fBsource\fR it if desired.
-.PP
-If you create a Tcl script in a file whose first line is
-.CS
-\fB#!/usr/local/bin/tclsh\fR
-.CE
-then you can invoke the script file directly from your shell if
-you mark the file as executable.
-This assumes that \fBtclsh\fR has been installed in the default
-location in /usr/local/bin;  if it's installed somewhere else
-then you'll have to modify the above line to match.
-Many UNIX systems do not allow the \fB#!\fR line to exceed about
-30 characters in length, so be sure that the \fBtclsh\fR
-executable can be accessed with a short file name.
-.PP
-An even better approach is to start your script files with the
-following three lines:
-.CS
-\fB#!/bin/sh
-# the next line restarts using tclsh \e
-exec tclsh "$0" "$@"\fR
-.CE
-This approach has three advantages over the approach in the previous
-paragraph.  First, the location of the \fBtclsh\fR binary doesn't have
-to be hard-wired into the script:  it can be anywhere in your shell
-search path.  Second, it gets around the 30-character file name limit
-in the previous approach.
-Third, this approach will work even if \fBtclsh\fR is
-itself a shell script (this is done on some systems in order to
-handle multiple architectures or operating systems:  the \fBtclsh\fR
-script selects one of several binaries to run).  The three lines
-cause both \fBsh\fR and \fBtclsh\fR to process the script, but the
-\fBexec\fR is only executed by \fBsh\fR.
-\fBsh\fR processes the script first;  it treats the second
-line as a comment and executes the third line.
-The \fBexec\fR statement cause the shell to stop processing and
-instead to start up \fBtclsh\fR to reprocess the entire script.
-When \fBtclsh\fR starts up, it treats all three lines as comments,
-since the backslash at the end of the second line causes the third
-line to be treated as part of the comment on the second line.
-
-.SH "VARIABLES"
-.PP
-\fBTclsh\fR sets the following Tcl variables:
-.TP 15
-\fBargc\fR
-Contains a count of the number of \fIarg\fR arguments (0 if none),
-not including the name of the script file.
-.TP 15
-\fBargv\fR
-Contains a Tcl list whose elements are the \fIarg\fR arguments,
-in order, or an empty string if there are no \fIarg\fR arguments.
-.TP 15
-\fBargv0\fR
-Contains \fIfileName\fR if it was specified.
-Otherwise, contains the name by which \fBtclsh\fR was invoked.
-.TP 15
-\fBtcl_interactive\fR
-Contains 1 if \fBtclsh\fR is running interactively (no
-\fIfileName\fR was specified and standard input is a terminal-like
-device), 0 otherwise.
-
-.SH PROMPTS
-.PP
-When \fBtclsh\fR is invoked interactively it normally prompts for each
-command with ``\fB% \fR''.  You can change the prompt by setting the
-variables \fBtcl_prompt1\fR and \fBtcl_prompt2\fR.  If variable
-\fBtcl_prompt1\fR exists then it must consist of a Tcl script
-to output a prompt;  instead of outputting a prompt \fBtclsh\fR
-will evaluate the script in \fBtcl_prompt1\fR.
-The variable \fBtcl_prompt2\fR is used in a similar way when
-a newline is typed but the current command isn't yet complete;
-if \fBtcl_prompt2\fR isn't set then no prompt is output for
-incomplete commands.
-
-.SH KEYWORDS
-argument, interpreter, prompt, script file, shell
diff --git a/doc/tclvars.n b/doc/tclvars.n
deleted file mode 100644
index 2e68519..0000000
--- a/doc/tclvars.n
+++ /dev/null
@@ -1,367 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: tclvars.n,v 1.3 1999/04/16 00:46:36 stanton Exp $
-'\" 
-.so man.macros
-.TH tclvars n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-tclvars \- Variables used by Tcl
-.BE
-
-.SH DESCRIPTION
-.PP
-The following global variables are created and managed automatically
-by the Tcl library.  Except where noted below, these variables should
-normally be treated as read-only by application-specific code and by users.
-.TP
-\fBenv\fR
-This variable is maintained by Tcl as an array
-whose elements are the environment variables for the process.
-Reading an element will return the value of the corresponding
-environment variable.
-Setting an element of the array will modify the corresponding
-environment variable or create a new one if it doesn't already
-exist.
-Unsetting an element of \fBenv\fR will remove the corresponding
-environment variable.
-Changes to the \fBenv\fR array will affect the environment
-passed to children by commands like \fBexec\fR.
-If the entire \fBenv\fR array is unset then Tcl will stop
-monitoring \fBenv\fR accesses and will not update environment
-variables.
-.RS
-.VS 8.0 
-Under Windows, the environment variables PATH and COMSPEC in any
-capitalization are converted automatically to upper case.  For instance, the
-PATH variable could be exported by the operating system as ``path'',
-``Path'', ``PaTh'', etc., causing otherwise simple Tcl code to have to
-support many special cases.  All other environment variables inherited by
-Tcl are left unmodified.
-.VE
-.RE
-.RS
-On the Macintosh, the environment variable is constructed by Tcl as no
-global environment variable exists.  The environment variables that
-are created for Tcl include:
-.TP
-\fBLOGIN\fR
-This holds the Chooser name of the Macintosh.
-.TP
-\fBUSER\fR
-This also holds the Chooser name of the Macintosh.
-.TP
-\fBSYS_FOLDER\fR
-The path to the system directory.
-.TP
-\fBAPPLE_M_FOLDER\fR
-The path to the Apple Menu directory.
-.TP
-\fBCP_FOLDER\fR
-The path to the control panels directory.
-.TP
-\fBDESK_FOLDER\fR
-The path to the desk top directory.
-.TP
-\fBEXT_FOLDER\fR
-The path to the system extensions directory.
-.TP
-\fBPREF_FOLDER\fR
-The path to the preferences directory.
-.TP
-\fBPRINT_MON_FOLDER\fR
-The path to the print monitor directory.
-.TP
-\fBSHARED_TRASH_FOLDER\fR
-The path to the network trash directory.
-.TP
-\fBTRASH_FOLDER\fR
-The path to the trash directory.
-.TP
-\fBSTART_UP_FOLDER\fR
-The path to the start up directory.
-.TP
-\fBPWD\fR
-The path to the application's default directory.
-.PP
-You can also create your own environment variables for the Macintosh.
-A file named  \fITcl Environment Variables\fR may be placed in the
-preferences folder in the Mac system folder.  Each line of this file
-should be of the form \fIVAR_NAME=var_data\fR.
-.PP
-The last alternative is to place environment variables in a 'STR#' 
-resource named \fITcl Environment Variables\fR of the application.  This
-is considered a little more ``Mac like'' than a Unix style Environment
-Variable file.  Each entry in the 'STR#' resource has the same format
-as above.  The source code file \fItclMacEnv.c\fR contains the
-implementation of the env mechanisms.  This file contains many
-#define's that allow customization of the env mechanisms to fit your
-applications needs.
-.RE
-.TP
-\fBerrorCode\fR
-After an error has occurred, this variable will be set to hold
-additional information about the error in a form that is easy
-to process with programs.
-\fBerrorCode\fR consists of a Tcl list with one or more elements.
-The first element of the list identifies a general class of
-errors, and determines the format of the rest of the list.
-The following formats for \fBerrorCode\fR are used by the
-Tcl core; individual applications may define additional formats.
-.RS
-.TP
-\fBARITH\fI code msg\fR
-This format is used when an arithmetic error occurs (e.g. an attempt
-to divide by zero in the \fBexpr\fR command).
-\fICode\fR identifies the precise error and \fImsg\fR provides a
-human-readable description of the error.  \fICode\fR will be either
-DIVZERO (for an attempt to divide by zero),
-DOMAIN (if an argument is outside the domain of a function, such as acos(\-3)),
-IOVERFLOW (for integer overflow),
-OVERFLOW (for a floating-point overflow),
-or UNKNOWN (if the cause of the error cannot be determined).
-.TP
-\fBCHILDKILLED\fI pid sigName msg\fR
-This format is used when a child process has been killed because of
-a signal.  The second element of \fBerrorCode\fR will be the
-process's identifier (in decimal).
-The third element will be the symbolic name of the signal that caused
-the process to terminate; it will be one of the names from the
-include file signal.h, such as \fBSIGPIPE\fR.
-The fourth element will be a short human-readable message
-describing the signal, such as ``write on pipe with no readers''
-for \fBSIGPIPE\fR.
-.TP
-\fBCHILDSTATUS\fI pid code\fR
-This format is used when a child process has exited with a non-zero
-exit status.  The second element of \fBerrorCode\fR will be the
-process's identifier (in decimal) and the third element will be the exit
-code returned by the process (also in decimal).
-.TP
-\fBCHILDSUSP\fI pid sigName msg\fR
-This format is used when a child process has been suspended because
-of a signal.
-The second element of \fBerrorCode\fR will be the process's identifier,
-in decimal.
-The third element will be the symbolic name of the signal that caused
-the process to suspend; this will be one of the names from the
-include file signal.h, such as \fBSIGTTIN\fR.
-The fourth element will be a short human-readable message
-describing the signal, such as ``background tty read''
-for \fBSIGTTIN\fR.
-.TP
-\fBNONE\fR
-This format is used for errors where no additional information is
-available for an error besides the message returned with the
-error.  In these cases \fBerrorCode\fR will consist of a list
-containing a single element whose contents are \fBNONE\fR.
-.TP
-\fBPOSIX \fIerrName msg\fR
-If the first element of \fBerrorCode\fR is \fBPOSIX\fR, then
-the error occurred during a POSIX kernel call.
-The second element of the list will contain the symbolic name
-of the error that occurred, such as \fBENOENT\fR; this will
-be one of the values defined in the include file errno.h.
-The third element of the list will be a human-readable
-message corresponding to \fIerrName\fR, such as
-``no such file or directory'' for the \fBENOENT\fR case.
-.PP
-To set \fBerrorCode\fR, applications should use library
-procedures such as \fBTcl_SetErrorCode\fR and \fBTcl_PosixError\fR,
-or they may invoke the \fBerror\fR command.
-If one of these methods hasn't been used, then the Tcl
-interpreter will reset the variable to \fBNONE\fR after
-the next error.
-.RE
-.TP
-\fBerrorInfo\fR
-After an error has occurred, this string will contain one or more lines
-identifying the Tcl commands and procedures that were being executed
-when the most recent error occurred.
-Its contents take the form of a stack trace showing the various
-nested Tcl commands that had been invoked at the time of the error.
-.TP
-\fBtcl_library\fR
-This variable holds the name of a directory containing the
-system library of Tcl scripts, such as those used for auto-loading.
-The value of this variable is returned by the \fBinfo library\fR command.
-See the \fBlibrary\fR manual entry for details of the facilities 
-provided by the Tcl script library.
-Normally each application or package will have its own application-specific
-script library in addition to the Tcl script library;
-each application should set a global variable with a name like
-\fB$\fIapp\fB_library\fR (where \fIapp\fR is the application's name)
-to hold the network file name for that application's library directory.
-The initial value of \fBtcl_library\fR is set when an interpreter
-is created by searching several different directories until one is
-found that contains an appropriate Tcl startup script.
-If the \fBTCL_LIBRARY\fR environment variable exists, then
-the directory it names is checked first.
-If \fBTCL_LIBRARY\fR isn't set or doesn't refer to an appropriate
-directory, then Tcl checks several other directories based on a
-compiled-in default location, the location of the binary containing
-the application, and the current working directory.
-.TP
-\fBtcl_patchLevel\fR
-When an interpreter is created Tcl initializes this variable to
-hold a string giving the current patch level for Tcl, such as
-\fB7.3p2\fR for Tcl 7.3 with the first two official patches, or
-\fB7.4b4\fR for the fourth beta release of Tcl 7.4.
-The value of this variable is returned by the \fBinfo patchlevel\fR
-command.
-.VS 8.0 br
-.TP
-\fBtcl_pkgPath\fR
-This variable holds a list of directories indicating where packages are
-normally installed.  It typically contains either one or two entries; 
-if it contains two entries, the first is normally a directory for
-platform-dependent packages (e.g., shared library binaries) and the
-second is normally a directory for platform-independent packages (e.g.,
-script files). Typically a package is installed as a subdirectory of one
-of the entries in \fB$tcl_pkgPath\fR. The directories in
-\fB$tcl_pkgPath\fR are included by default in the \fBauto_path\fR
-variable, so they and their immediate subdirectories are automatically
-searched for packages during \fBpackage require\fR commands.  Note:
-\fBtcl_pkgPath\fR it not intended to be modified by the application.
-Its value is added to \fBauto_path\fR at startup; changes to
-\fBtcl_pkgPath\fR are not reflected in \fBauto_path\fR.  If you
-want Tcl to search additional directories for packages you should add
-the names of those directories to \fBauto_path\fR, not \fBtcl_pkgPath\fR.
-.VE
-.TP
-\fBtcl_platform\fR
-This is an associative array whose elements contain information about
-the platform on which the application is running, such as the name of
-the operating system, its current release number, and the machine's
-instruction set.  The elements listed below will always
-be defined, but they may have empty strings as values if Tcl couldn't
-retrieve any relevant information.  In addition, extensions
-and applications may add additional values to the array.  The
-predefined elements are:
-.RS
-.VS
-.TP
-\fBbyteOrder\fR
-The native byte order of this machine: either \fBlittleEndian\fR or
-\fBbigEndian\fR. 
-.VE
-.TP
-\fBmachine\fR
-The instruction set executed by this machine, such as
-\fBintel\fR, \fBPPC\fR, \fB68k\fR, or \fBsun4m\fR.  On UNIX machines, this
-is the value returned by \fBuname -m\fR.
-.TP
-\fBos\fR 
-The name of the operating system running on this machine,
-such as \fBWindows 95\fR, \fBWindows NT\fR, \fBMacOS\fR, or \fBSunOS\fR.
-On UNIX machines, this is the value returned by \fBuname -s\fR.
-On Windows 95 and Windows 98, the value returned will be \fBWindows
-95\fR to provide better backwards compatibility to Windows 95; to
-distinguish between the two, check the \fBosVersion\fR.
-.TP
-\fBosVersion\fR
-The version number for the operating system running on this machine.
-On UNIX machines, this is the value returned by \fBuname -r\fR.  On
-Windows 95, the version will be 4.0; on Windows 98, the version will
-be 4.10.
-.TP
-\fBplatform\fR
-Either \fBwindows\fR, \fBmacintosh\fR, or \fBunix\fR.  This identifies the
-general operating environment of the machine.
-.TP
-\fBuser\fR
-Either \fBwindows\fR, \fBmacintosh\fR, or \fBunix\fR.  This identifies the
-current user based on the login information available on the platform.
-This comes from the USER or LOGNAME environment variable on Unix,
-and the value from GetUserName on Windows and Macintosh.
-.RE
-.TP
-\fBtcl_precision\fR
-.VS
-This variable controls the number of digits to generate
-when converting floating-point values to strings.  It defaults
-to 12.
-17 digits is ``perfect'' for IEEE floating-point in that it allows
-double-precision values to be converted to strings and back to
-binary with no loss of information.  However, using 17 digits prevents
-any rounding, which produces longer, less intuitive results.  For example,
-\fBexpr 1.4\fR returns 1.3999999999999999 with \fBtcl_precision\fR
-set to 17, vs. 1.4 if \fBtcl_precision\fR is 12.
-.RS
-All interpreters in a process share a single \fBtcl_precision\fR value:
-changing it in one interpreter will affect all other interpreters as
-well.  However, safe interpreters are not allowed to modify the
-variable.
-.RE
-.VE
-.TP
-\fBtcl_rcFileName\fR
-This variable is used during initialization to indicate the name of a
-user-specific startup file.  If it is set by application-specific
-initialization, then the Tcl startup code will check for the existence
-of this file and \fBsource\fR it if it exists.  For example, for \fBwish\fR
-the variable is set to \fB~/.wishrc\fR for Unix and \fB~/wishrc.tcl\fR
-for Windows.
-.TP
-\fBtcl_rcRsrcName\fR
-This variable is only used on Macintosh systems.  The variable is used
-during initialization to indicate the name of a user-specific
-\fBTEXT\fR resource located in the application or extension resource
-forks.  If it is set by application-specific initialization, then the
-Tcl startup code will check for the existence of this resource and
-\fBsource\fR it if it exists.  For example, the Macintosh \fBwish\fR
-application has the variable is set to \fBtclshrc\fR.
-.TP
-\fBtcl_traceCompile\fR
-The value of this variable can be set to control
-how much tracing information
-is displayed during bytecode compilation.
-By default, tcl_traceCompile is zero and no information is displayed.
-Setting tcl_traceCompile to 1 generates a one line summary in stdout
-whenever a procedure or top level command is compiled.
-Setting it to 2 generates a detailed listing in stdout of the
-bytecode instructions emitted during every compilation.
-This variable is useful in
-tracking down suspected problems with the Tcl compiler.
-It is also occasionally useful when converting
-existing code to use Tcl8.0.
-.TP
-\fBtcl_traceExec\fR
-The value of this variable can be set to control
-how much tracing information
-is displayed during bytecode execution.
-By default, tcl_traceExec is zero and no information is displayed.
-Setting tcl_traceExec to 1 generates a one line trace in stdout
-on each call to a Tcl procedure.
-Setting it to 2 generates a line of output
-whenever any Tcl command is invoked
-that contains the name of the command and its arguments.
-Setting it to 3 produces a detailed trace showing the result of
-executing each bytecode instruction.
-Note that when tcl_traceExec is 2 or 3,
-commands such as set and incr
-that have been entirely replaced by a sequence
-of bytecode instructions are not shown.
-Setting this variable is useful in
-tracking down suspected problems with the bytecode compiler
-and interpreter.
-It is also occasionally useful when converting
-code to use Tcl8.0.
-.TP
-\fBtcl_version\fR
-When an interpreter is created Tcl initializes this variable to
-hold the version number for this version of Tcl in the form \fIx.y\fR.
-Changes to \fIx\fR represent major changes with probable
-incompatibilities and changes to \fIy\fR represent small enhancements and
-bug fixes that retain backward compatibility.
-The value of this variable is returned by the \fBinfo tclversion\fR
-command.
-
-.SH KEYWORDS
-arithmetic, bytecode, compiler, error, environment, POSIX, precision, subprocess, variables
diff --git a/doc/tell.n b/doc/tell.n
deleted file mode 100644
index fbbef62..0000000
--- a/doc/tell.n
+++ /dev/null
@@ -1,28 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: tell.n,v 1.2 1998/09/14 18:39:55 stanton Exp $
-'\" 
-.so man.macros
-.TH tell n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-tell \- Return current access position for an open channel
-.SH SYNOPSIS
-\fBtell \fIchannelId\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-Returns a decimal string giving the current access position in
-\fIchannelId\fR.
-The value returned is -1 for channels that do not support
-seeking.
-
-.SH KEYWORDS
-access position, channel, seeking
diff --git a/doc/time.n b/doc/time.n
deleted file mode 100644
index f08505a..0000000
--- a/doc/time.n
+++ /dev/null
@@ -1,33 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: time.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH time n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-time \- Time the execution of a script
-.SH SYNOPSIS
-\fBtime \fIscript\fR ?\fIcount\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command will call the Tcl interpreter \fIcount\fR
-times to evaluate \fIscript\fR (or once if \fIcount\fR isn't
-specified).  It will then return a string of the form
-.CS
-\fB503 microseconds per iteration\fR
-.CE
-which indicates the average amount of time required per iteration,
-in microseconds.
-Time is measured in elapsed time, not CPU time.
-
-.SH KEYWORDS
-script, time
diff --git a/doc/trace.n b/doc/trace.n
deleted file mode 100644
index 317205a..0000000
--- a/doc/trace.n
+++ /dev/null
@@ -1,158 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: trace.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH trace n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-trace \- Monitor variable accesses
-.SH SYNOPSIS
-\fBtrace \fIoption\fR ?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command causes Tcl commands to be executed whenever certain operations are
-invoked.  At present, only variable tracing is implemented. The
-legal \fIoption\fR's (which may be abbreviated) are:
-.TP
-\fBtrace variable \fIname ops command\fR
-Arrange for \fIcommand\fR to be executed whenever variable \fIname\fR
-is accessed in one of the ways given by \fIops\fR.  \fIName\fR may
-refer to a normal variable, an element of an array, or to an array
-as a whole (i.e. \fIname\fR may be just the name of an array, with no
-parenthesized index).  If \fIname\fR refers to a whole array, then
-\fIcommand\fR is invoked whenever any element of the array is
-manipulated.
-.RS
-.PP
-\fIOps\fR indicates which operations are of interest, and consists of
-one or more of the following letters:
-.TP
-\fBr\fR
-Invoke \fIcommand\fR whenever the variable is read.
-.TP
-\fBw\fR
-Invoke \fIcommand\fR whenever the variable is written.
-.TP
-\fBu\fR
-Invoke \fIcommand\fR whenever the variable is unset.  Variables
-can be unset explicitly with the \fBunset\fR command, or
-implicitly when procedures return (all of their local variables
-are unset).  Variables are also unset when interpreters are
-deleted, but traces will not be invoked because there is no
-interpreter in which to execute them.
-.PP
-When the trace triggers, three arguments are appended to
-\fIcommand\fR so that the actual command is as follows:
-.CS
-\fIcommand name1 name2 op\fR
-.CE
-\fIName1\fR and \fIname2\fR give the name(s) for the variable
-being accessed:  if the variable is a scalar then \fIname1\fR
-gives the variable's name and \fIname2\fR is an empty string;
-if the variable is an array element then \fIname1\fR gives the
-name of the array and name2 gives the index into the array;
-if an entire array is being deleted and the trace was registered
-on the overall array, rather than a single element, then \fIname1\fR
-gives the array name and \fIname2\fR is an empty string.
-\fIName1\fR and \fIname2\fR are not necessarily the same as the
-name used in the \fBtrace variable\fR command:  the \fBupvar\fR
-command allows a procedure to reference a variable under a
-different name.
-\fIOp\fR indicates what operation is being performed on the
-variable, and is one of \fBr\fR, \fBw\fR, or \fBu\fR as
-defined above.
-.PP
-\fICommand\fR executes in the same context as the code that invoked
-the traced operation:  if the variable was accessed as part of a
-Tcl procedure, then \fIcommand\fR will have access to the same
-local variables as code in the procedure.  This context may be
-different than the context in which the trace was created.
-If \fIcommand\fR invokes a procedure (which it normally does) then
-the procedure will have to use \fBupvar\fR or \fBuplevel\fR if it
-wishes to access the traced variable.
-Note also that \fIname1\fR may not necessarily be the same as the name
-used to set the trace on the variable;  differences can occur if
-the access is made through a variable defined with the \fBupvar\fR
-command.
-.PP
-For read and write traces, \fIcommand\fR can modify
-the variable to affect the result of the traced operation.
-If \fIcommand\fR modifies the value of a variable during a
-read or write trace, then the new value will be returned as the
-result of the traced operation.
-The return value from  \fIcommand\fR is ignored except that
-if it returns an error of any sort then the traced operation
-also returns an error with
-the same error message returned by the trace command
-(this mechanism can be used to implement read-only variables, for
-example).
-For write traces, \fIcommand\fR is invoked after the variable's
-value has been changed; it can write a new value into the variable
-to override the original value specified in the write operation.
-To implement read-only variables, \fIcommand\fR will have to restore
-the old value of the variable.
-.PP
-While \fIcommand\fR is executing during a read or write trace, traces
-on the variable are temporarily disabled.
-This means that reads and writes invoked by
-\fIcommand\fR will occur directly, without invoking \fIcommand\fR
-(or any other traces) again.
-However, if \fIcommand\fR unsets the variable then unset traces
-will be invoked.
-.PP
-When an unset trace is invoked, the variable has already been
-deleted:  it will appear to be undefined with no traces.
-If an unset occurs because of a procedure return, then the
-trace will be invoked in the variable context of the procedure
-being returned to:  the stack frame of the returning procedure
-will no longer exist.
-Traces are not disabled during unset traces, so if an unset trace
-command creates a new trace and accesses the variable, the
-trace will be invoked.
-Any errors in unset traces are ignored.
-.PP
-If there are multiple traces on a variable they are invoked
-in order of creation, most-recent first.
-If one trace returns an error, then no further traces are
-invoked for the variable.
-If an array element has a trace set, and there is also a trace
-set on the array as a whole, the trace on the overall array
-is invoked before the one on the element.
-.PP
-Once created, the trace remains in effect either until the
-trace is removed with the \fBtrace vdelete\fR command described
-below, until the variable is unset, or until the interpreter
-is deleted.
-Unsetting an element of array will remove any traces on that
-element, but will not remove traces on the overall array.
-.PP
-This command returns an empty string.
-.RE
-.TP
-\fBtrace vdelete \fIname ops command\fR
-If there is a trace set on variable \fIname\fR with the
-operations and command given by \fIops\fR and \fIcommand\fR,
-then the trace is removed, so that \fIcommand\fR will never
-again be invoked.
-Returns an empty string.
-.TP
-\fBtrace vinfo \fIname\fR
-Returns a list containing one element for each trace
-currently set on variable \fIname\fR.
-Each element of the list is itself a list containing two
-elements, which are the \fIops\fR and \fIcommand\fR associated
-with the trace.
-If \fIname\fR doesn't exist or doesn't have any traces set, then
-the result of the command will be an empty string.
-
-.SH KEYWORDS
-read, variable, write, trace, unset
diff --git a/doc/unknown.n b/doc/unknown.n
deleted file mode 100644
index 19f5ac1..0000000
--- a/doc/unknown.n
+++ /dev/null
@@ -1,75 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: unknown.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH unknown n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-unknown \- Handle attempts to use non-existent commands
-.SH SYNOPSIS
-\fBunknown \fIcmdName \fR?\fIarg arg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is invoked by the Tcl interpreter whenever a script
-tries to invoke a command that doesn't exist.  The implementation
-of \fBunknown\fR isn't part of the Tcl core;  instead, it is a
-library procedure defined by default when Tcl starts up.  You
-can override the default \fBunknown\fR to change its functionality.
-.PP
-If the Tcl interpreter encounters a command name for which there
-is not a defined command, then Tcl checks for the existence of
-a command named \fBunknown\fR.
-If there is no such command, then the interpreter returns an
-error.
-If the \fBunknown\fR command exists, then it is invoked with
-arguments consisting of the fully-substituted name and arguments
-for the original non-existent command.
-The \fBunknown\fR command typically does things like searching
-through library directories for a command procedure with the name
-\fIcmdName\fR, or expanding abbreviated command names to full-length,
-or automatically executing unknown commands as sub-processes.
-In some cases (such as expanding abbreviations) \fBunknown\fR will
-change the original command slightly and then (re-)execute it.
-The result of the \fBunknown\fR command is used as the result for
-the original non-existent command.
-.PP
-The default implementation of \fBunknown\fR behaves as follows.
-It first calls the \fBauto_load\fR library procedure to load the command.
-If this succeeds, then it executes the original command with its
-original arguments.
-If the auto-load fails then \fBunknown\fR calls \fBauto_execok\fR
-to see if there is an executable file by the name \fIcmd\fR.
-If so, it invokes the Tcl \fBexec\fR command
-with \fIcmd\fR and all the \fIargs\fR as arguments.
-If \fIcmd\fR can't be auto-executed, \fBunknown\fR checks to
-see if the command was invoked at top-level and outside of any
-script.  If so, then \fBunknown\fR takes two additional steps.
-First, it sees if \fIcmd\fR has one of the following three forms:
-\fB!!\fR, \fB!\fIevent\fR, or \fB^\fIold\fB^\fInew\fR?\fB^\fR?.
-If so, then \fBunknown\fR carries out history substitution
-in the same way that \fBcsh\fR would for these constructs.
-Finally, \fBunknown\fR checks to see if \fIcmd\fR is
-a unique abbreviation for an existing Tcl command.
-If so, it expands the command name and executes the command with
-the original arguments.
-If none of the above efforts has been able to execute
-the command, \fBunknown\fR generates an error return.
-If the global variable \fBauto_noload\fR is defined, then the auto-load
-step is skipped.
-If the global variable \fBauto_noexec\fR is defined then the
-auto-exec step is skipped.
-Under normal circumstances the return value from \fBunknown\fR
-is the return value from the command that was eventually
-executed.
-
-.SH KEYWORDS
-error, non-existent command
diff --git a/doc/unset.n b/doc/unset.n
deleted file mode 100644
index ef93132..0000000
--- a/doc/unset.n
+++ /dev/null
@@ -1,34 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: unset.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH unset n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-unset \- Delete variables
-.SH SYNOPSIS
-\fBunset \fIname \fR?\fIname name ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command removes one or more variables.
-Each \fIname\fR is a variable name, specified in any of the
-ways acceptable to the \fBset\fR command.
-If a \fIname\fR refers to an element of an array then that
-element is removed without affecting the rest of the array.
-If a \fIname\fR consists of an array name with no parenthesized
-index, then the entire array is deleted.
-The \fBunset\fR command returns an empty string as result.
-An error occurs if any of the variables doesn't exist, and any variables
-after the non-existent one are not deleted.
-
-.SH KEYWORDS
-remove, variable
diff --git a/doc/update.n b/doc/update.n
deleted file mode 100644
index 863e8c8..0000000
--- a/doc/update.n
+++ /dev/null
@@ -1,48 +0,0 @@
-'\"
-'\" Copyright (c) 1990-1992 The Regents of the University of California.
-'\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: update.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH update n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-update \- Process pending events and idle callbacks
-.SH SYNOPSIS
-\fBupdate\fR ?\fBidletasks\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is used to bring the application ``up to date''
-by entering the event loop repeated until all pending events
-(including idle callbacks) have been processed.
-.PP
-If the \fBidletasks\fR keyword is specified as an argument to the
-command, then no new events or errors are processed;  only idle
-callbacks are invoked.
-This causes operations that are normally deferred, such as display
-updates and window layout calculations, to be performed immediately.
-.PP
-The \fBupdate idletasks\fR command is useful in scripts where
-changes have been made to the application's state and you want those
-changes to appear on the display immediately, rather than waiting
-for the script to complete.  Most display updates are performed as
-idle callbacks, so \fBupdate idletasks\fR will cause them to run.
-However, there are some kinds of updates that only happen in
-response to events, such as those triggered by window size changes;
-these updates will not occur in \fBupdate idletasks\fR.
-.PP
-The \fBupdate\fR command with no options is useful in scripts where
-you are performing a long-running computation but you still want
-the application to respond to events such as user interactions;  if
-you occasionally call \fBupdate\fR then user input will be processed
-during the next call to \fBupdate\fR.
-
-.SH KEYWORDS
-event, flush, handler, idle, update
diff --git a/doc/uplevel.n b/doc/uplevel.n
deleted file mode 100644
index 83290d3..0000000
--- a/doc/uplevel.n
+++ /dev/null
@@ -1,80 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: uplevel.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH uplevel n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-uplevel \- Execute a script in a different stack frame
-.SH SYNOPSIS
-\fBuplevel \fR?\fIlevel\fR?\fI arg \fR?\fIarg ...\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-All of the \fIarg\fR arguments are concatenated as if they had
-been passed to \fBconcat\fR; the result is then evaluated in the
-variable context indicated by \fIlevel\fR.  \fBUplevel\fR returns
-the result of that evaluation.
-.PP
-If \fIlevel\fR is an integer then
-it gives a distance (up the procedure calling stack) to move before
-executing the command.  If \fIlevel\fR consists of \fB#\fR followed by
-a number then the number gives an absolute level number.  If \fIlevel\fR
-is omitted then it defaults to \fB1\fR.  \fILevel\fR cannot be
-defaulted if the first \fIcommand\fR argument starts with a digit or \fB#\fR.
-.PP
-For example, suppose that procedure \fBa\fR was invoked
-from top-level, and that it called \fBb\fR, and that \fBb\fR called \fBc\fR.
-Suppose that \fBc\fR invokes the \fBuplevel\fR command.  If \fIlevel\fR
-is \fB1\fR or \fB#2\fR  or omitted, then the command will be executed
-in the variable context of \fBb\fR.  If \fIlevel\fR is \fB2\fR or \fB#1\fR
-then the command will be executed in the variable context of \fBa\fR.
-If \fIlevel\fR is \fB3\fR or \fB#0\fR then the command will be executed
-at top-level (only global variables will be visible).
-.PP
-The \fBuplevel\fR command causes the invoking procedure to disappear
-from the procedure calling stack while the command is being executed.
-In the above example, suppose \fBc\fR invokes the command
-.CS
-\fBuplevel 1 {set x 43; d}\fR
-.CE
-where \fBd\fR is another Tcl procedure.  The \fBset\fR command will
-modify the variable \fBx\fR in \fBb\fR's context, and \fBd\fR will execute
-at level 3, as if called from \fBb\fR.  If it in turn executes
-the command
-.CS
-\fBuplevel {set x 42}\fR
-.CE
-then the \fBset\fR command will modify the same variable \fBx\fR in \fBb\fR's
-context:  the procedure \fBc\fR does not appear to be on the call stack
-when \fBd\fR is executing.  The command ``\fBinfo level\fR'' may
-be used to obtain the level of the current procedure.
-.PP
-\fBUplevel\fR makes it possible to implement new control
-constructs as Tcl procedures (for example, \fBuplevel\fR could
-be used to implement the \fBwhile\fR construct as a Tcl procedure).
-.PP
-\fBnamespace eval\fR is another way (besides procedure calls)
-that the Tcl naming context can change.
-It adds a call frame to the stack to represent the namespace context.
-This means each \fBnamespace eval\fR command
-counts as another call level for \fBuplevel\fR and \fBupvar\fR commands.
-For example, \fBinfo level 1\fR will return a list
-describing a command that is either
-the outermost procedure call or the outermost \fBnamespace eval\fR command.
-Also, \fBuplevel #0\fR evaluates a script
-at top-level in the outermost namespace (the global namespace).
-
-.SH "SEE ALSO"
-namespace(n)
-
-.SH KEYWORDS
-context, level, namespace, stack frame, variables
diff --git a/doc/upvar.n b/doc/upvar.n
deleted file mode 100644
index f62d646..0000000
--- a/doc/upvar.n
+++ /dev/null
@@ -1,92 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: upvar.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH upvar n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-upvar \- Create link to variable in a different stack frame
-.SH SYNOPSIS
-\fBupvar \fR?\fIlevel\fR? \fIotherVar myVar \fR?\fIotherVar myVar \fR...?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command arranges for one or more local variables in the current
-procedure to refer to variables in an enclosing procedure call or
-to global variables.
-\fILevel\fR may have any of the forms permitted for the \fBuplevel\fR
-command, and may be omitted if the first letter of the first \fIotherVar\fR
-isn't \fB#\fR or a digit (it defaults to \fB1\fR).
-For each \fIotherVar\fR argument, \fBupvar\fR makes the variable
-by that name in the procedure frame given by \fIlevel\fR (or at
-global level, if \fIlevel\fR is \fB#0\fR) accessible
-in the current procedure by the name given in the corresponding
-\fImyVar\fR argument.
-The variable named by \fIotherVar\fR need not exist at the time of the
-call;  it will be created the first time \fImyVar\fR is referenced, just like
-an ordinary variable.  There must not exist a variable by the
-name \fImyVar\fR at the time \fBupvar\fR is invoked.
-\fIMyVar\fR is always treated as the name of a variable, not an
-array element.  Even if the name looks like an array element,
-such as \fBa(b)\fR, a regular variable is created.
-\fIOtherVar\fR may refer to a scalar variable, an array,
-or an array element.
-\fBUpvar\fR returns an empty string.
-.PP
-The \fBupvar\fR command simplifies the implementation of call-by-name
-procedure calling and also makes it easier to build new control constructs
-as Tcl procedures.
-For example, consider the following procedure:
-.CS
-\fBproc add2 name {
-	upvar $name x
-	set x [expr $x+2]
-}\fR
-.CE
-\fBAdd2\fR is invoked with an argument giving the name of a variable,
-and it adds two to the value of that variable.
-Although \fBadd2\fR could have been implemented using \fBuplevel\fR
-instead of \fBupvar\fR, \fBupvar\fR makes it simpler for \fBadd2\fR
-to access the variable in the caller's procedure frame.
-.PP
-\fBnamespace eval\fR is another way (besides procedure calls)
-that the Tcl naming context can change.
-It adds a call frame to the stack to represent the namespace context.
-This means each \fBnamespace eval\fR command
-counts as another call level for \fBuplevel\fR and \fBupvar\fR commands.
-For example, \fBinfo level 1\fR will return a list
-describing a command that is either
-the outermost procedure call or the outermost \fBnamespace eval\fR command.
-Also, \fBuplevel #0\fR evaluates a script
-at top-level in the outermost namespace (the global namespace).
-.PP
-.VS
-If an upvar variable is unset (e.g. \fBx\fR in \fBadd2\fR above), the
-\fBunset\fR operation affects the variable it is linked to, not the
-upvar variable.  There is no way to unset an upvar variable except
-by exiting the procedure in which it is defined.  However, it is
-possible to retarget an upvar variable by executing another \fBupvar\fR
-command.
-
-.SH BUGS
-.PP
-If \fIotherVar\fR refers to an element of an array, then variable
-traces set for the entire array will not be invoked when \fImyVar\fR
-is accessed (but traces on the particular element will still be
-invoked).  In particular, if the array is \fBenv\fR, then changes
-made to \fImyVar\fR will not be passed to subprocesses correctly.
-.VE
-
-.SH "SEE ALSO"
-namespace(n)
-
-.SH KEYWORDS
-context, frame, global, level, namespace, procedure, variable
diff --git a/doc/variable.n b/doc/variable.n
deleted file mode 100644
index 3b742a9..0000000
--- a/doc/variable.n
+++ /dev/null
@@ -1,63 +0,0 @@
-'\"
-'\" Copyright (c) 1993-1997 Bell Labs Innovations for Lucent Technologies
-'\" Copyright (c) 1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: variable.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH variable n 8.0 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-variable \- create and initialize a namespace variable
-.SH SYNOPSIS
-\fBvariable \fR?\fIname value...\fR? \fIname \fR?\fIvalue\fR?
-.BE
-
-.SH DESCRIPTION
-.PP
-This command is normally used within a
-\fBnamespace eval\fR command to create one or more variables
-within a namespace.
-Each variable \fIname\fR is initialized with \fIvalue\fR.
-The \fIvalue\fR for the last variable is optional.
-.PP
-If a variable \fIname\fR does not exist, it is created.
-In this case, if \fIvalue\fR is specified,
-it is assigned to the newly created variable.
-If no \fIvalue\fR is specified, the new variable is left undefined.
-If the variable already exists,
-it is set to \fIvalue\fR if \fIvalue\fR is specified
-or left unchanged if no \fIvalue\fR is given.
-Normally, \fIname\fR is unqualified
-(does not include the names of any containing namespaces),
-and the variable is created in the current namespace.
-If \fIname\fR includes any namespace qualifiers,
-the variable is created in the specified namespace.
-.PP
-If the \fBvariable\fR command is executed inside a Tcl procedure,
-it creates local variables
-linked to the corresponding namespace variables.
-In this way the \fBvariable\fR command resembles the \fBglobal\fR command,
-although the \fBglobal\fR command
-only links to variables in the global namespace.
-If any \fIvalue\fRs are given,
-they are used to modify the values of the associated namespace variables.
-If a namespace variable does not exist,
-it is created and optionally initialized.
-.PP
-A \fIname\fR argument cannot reference an element within an array.
-Instead, \fIname\fR should reference the entire array,
-and the initialization \fIvalue\fR should be left off.
-After the variable has been declared,
-elements within the array can be set using ordinary
-\fBset\fR or \fBarray\fR commands.
-
-.SH "SEE ALSO"
-global(n), namespace(n)
-
-.SH KEYWORDS
-global, namespace, procedure, variable
diff --git a/doc/vwait.n b/doc/vwait.n
deleted file mode 100644
index a355b54..0000000
--- a/doc/vwait.n
+++ /dev/null
@@ -1,38 +0,0 @@
-'\"
-'\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: vwait.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH vwait n 7.5 Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-vwait \- Process events until a variable is written
-.SH SYNOPSIS
-\fBvwait\fR \fIvarName\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-This command enters the Tcl event loop to process events, blocking
-the application if no events are ready.  It continues processing
-events until some event handler sets the value of variable
-\fIvarName\fR.  Once \fIvarName\fR has been set, the \fBvwait\fR
-command will return as soon as the event handler that modified
-\fIvarName\fR completes.
-.PP
-In some cases the \fBvwait\fR command may not return immediately
-after \fIvarName\fR is set.  This can happen if the event handler
-that sets \fIvarName\fR does not complete immediately.  For example,
-if an event handler sets \fIvarName\fR and then itself calls
-\fBvwait\fR to wait for a different variable, then it may not return
-for a long time.  During this time the top-level \fBvwait\fR is
-blocked waiting for the event handler to complete, so it cannot
-return either.
-
-.SH KEYWORDS
-event, variable, wait
diff --git a/doc/while.n b/doc/while.n
deleted file mode 100644
index dabe116..0000000
--- a/doc/while.n
+++ /dev/null
@@ -1,55 +0,0 @@
-'\"
-'\" Copyright (c) 1993 The Regents of the University of California.
-'\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
-'\"
-'\" See the file "license.terms" for information on usage and redistribution
-'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
-'\" RCS: @(#) $Id: while.n,v 1.2 1998/09/14 18:39:56 stanton Exp $
-'\" 
-.so man.macros
-.TH while n "" Tcl "Tcl Built-In Commands"
-.BS
-'\" Note:  do not modify the .SH NAME line immediately below!
-.SH NAME
-while \- Execute script repeatedly as long as a condition is met
-.SH SYNOPSIS
-\fBwhile \fItest body\fR
-.BE
-
-.SH DESCRIPTION
-.PP
-The \fBwhile\fR command evaluates \fItest\fR as an expression
-(in the same way that \fBexpr\fR evaluates its argument).
-The value of the expression must a proper boolean
-value; if it is a true value
-then \fIbody\fR is executed by passing it to the Tcl interpreter.
-Once \fIbody\fR has been executed then \fItest\fR is evaluated
-again, and the process repeats until eventually \fItest\fR
-evaluates to a false boolean value.  \fBContinue\fR
-commands may be executed inside \fIbody\fR to terminate the current
-iteration of the loop, and \fBbreak\fR
-commands may be executed inside \fIbody\fR to cause immediate
-termination of the \fBwhile\fR command.  The \fBwhile\fR command
-always returns an empty string.
-.PP
-Note: \fItest\fR should almost always be enclosed in braces.  If not,
-variable substitutions will be made before the \fBwhile\fR
-command starts executing, which means that variable changes
-made by the loop body will not be considered in the expression.
-This is likely to result in an infinite loop.  If \fItest\fR is
-enclosed in braces, variable substitutions are delayed until the
-expression is evaluated (before
-each loop iteration), so changes in the variables will be visible.
-For an example, try the following script with and without the braces
-around \fB$x<10\fR:
-.CS
-set x 0
-while {$x<10} {
-	puts "x is $x"
-	incr x
-}
-.CE
-
-.SH KEYWORDS
-boolean value, loop, test, while
diff --git a/generic/README b/generic/README
deleted file mode 100644
index 209ba44..0000000
--- a/generic/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory contains Tcl source files that work on all the platforms
-where Tcl runs (e.g. UNIX, PCs, and Macintoshes).  Platform-specific
-sources are in the directories ../unix, ../win, and ../mac.
-
-RCS: @(#) $Id: README,v 1.2 1998/09/14 18:39:56 stanton Exp $
diff --git a/generic/regc_color.c b/generic/regc_color.c
deleted file mode 100644
index e86fea0..0000000
--- a/generic/regc_color.c
+++ /dev/null
@@ -1,742 +0,0 @@
-/*
- * colorings of characters
- * This file is #included by regcomp.c.
- *
- * Note that there are some incestuous relationships between this code and
- * NFA arc maintenance, which perhaps ought to be cleaned up sometime.
- */
-
-
-
-#define	CISERR()	VISERR(cm->v)
-#define	CERR(e)		VERR(cm->v, (e))
-
-
-
-/*
- - initcm - set up new colormap
- ^ static VOID initcm(struct vars *, struct colormap *);
- */
-static VOID
-initcm(v, cm)
-struct vars *v;
-struct colormap *cm;
-{
-	int i;
-	int j;
-	union tree *t;
-	union tree *nextt;
-	struct colordesc *cd;
-
-	cm->magic = CMMAGIC;
-	cm->v = v;
-
-	cm->ncds = NINLINECDS;
-	cm->cd = cm->cdspace;
-	cm->max = 0;
-	cm->free = 0;
-
-	cd = cm->cd;			/* cm->cd[WHITE] */
-	cd->sub = NOSUB;
-	cd->arcs = NULL;
-	cd->flags = 0;
-	cd->nchrs = CHR_MAX - CHR_MIN + 1;
-
-	/* upper levels of tree */
-	for (t = &cm->tree[0], j = NBYTS-1; j > 0; t = nextt, j--) {
-		nextt = t + 1;
-		for (i = BYTTAB-1; i >= 0; i--)
-			t->tptr[i] = nextt;
-	}
-	/* bottom level is solid white */
-	t = &cm->tree[NBYTS-1];
-	for (i = BYTTAB-1; i >= 0; i--)
-		t->tcolor[i] = WHITE;
-	cd->block = t;
-}
-
-/*
- - freecm - free dynamically-allocated things in a colormap
- ^ static VOID freecm(struct colormap *);
- */
-static VOID
-freecm(cm)
-struct colormap *cm;
-{
-	size_t i;
-	union tree *cb;
-
-	cm->magic = 0;
-	if (NBYTS > 1)
-		cmtreefree(cm, cm->tree, 0);
-	for (i = 1; i < cm->max; i++)		/* skip WHITE */
-		if (!UNUSEDCOLOR(&cm->cd[i])) {
-			cb = cm->cd[i].block;
-			if (cb != NULL)
-				FREE(cb);
-		}
-	if (cm->cd != cm->cdspace)
-		FREE(cm->cd);
-}
-
-/*
- - cmtreefree - free a non-terminal part of a colormap tree
- ^ static VOID cmtreefree(struct colormap *, union tree *, int);
- */
-static VOID
-cmtreefree(cm, tree, level)
-struct colormap *cm;
-union tree *tree;
-int level;			/* level number (top == 0) of this block */
-{
-	int i;
-	union tree *t;
-	union tree *fillt = &cm->tree[level+1];
-	union tree *cb;
-
-	assert(level < NBYTS-1);	/* this level has pointers */
-	for (i = BYTTAB-1; i >= 0; i--) {
-		t = tree->tptr[i];
-		assert(t != NULL);
-		if (t != fillt) {
-			if (level < NBYTS-2) {	/* more pointer blocks below */
-				cmtreefree(cm, t, level+1);
-				FREE(t);
-			} else {		/* color block below */
-				cb = cm->cd[t->tcolor[0]].block;
-				if (t != cb)	/* not a solid block */
-					FREE(t);
-			}
-		}
-	}
-}
-
-/*
- - setcolor - set the color of a character in a colormap
- ^ static color setcolor(struct colormap *, pchr, pcolor);
- */
-static color			/* previous color */
-setcolor(cm, c, co)
-struct colormap *cm;
-pchr c;
-pcolor co;
-{
-	uchr uc = c;
-	int shift;
-	int level;
-	int b;
-	int bottom;
-	union tree *t;
-	union tree *newt;
-	union tree *fillt;
-	union tree *lastt;
-	union tree *cb;
-	color prev;
-
-	assert(cm->magic == CMMAGIC);
-	if (CISERR() || co == COLORLESS)
-		return COLORLESS;
-
-	t = cm->tree;
-	for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
-						level++, shift -= BYTBITS) {
-		b = (uc >> shift) & BYTMASK;
-		lastt = t;
-		t = lastt->tptr[b];
-		assert(t != NULL);
-		fillt = &cm->tree[level+1];
-		bottom = (shift <= BYTBITS) ? 1 : 0;
-		cb = (bottom) ? cm->cd[t->tcolor[0]].block : fillt;
-		if (t == fillt || t == cb) {	/* must allocate a new block */
-			newt = (union tree *)MALLOC((bottom) ?
-				sizeof(struct colors) : sizeof(struct ptrs));
-			if (newt == NULL) {
-				CERR(REG_ESPACE);
-				return COLORLESS;
-			}
-			if (bottom)
-				memcpy(VS(newt->tcolor), VS(t->tcolor),
-							BYTTAB*sizeof(color));
-			else
-				memcpy(VS(newt->tptr), VS(t->tptr),
-						BYTTAB*sizeof(union tree *));
-			t = newt;
-			lastt->tptr[b] = t;
-		}
-	}
-
-	b = uc & BYTMASK;
-	prev = t->tcolor[b];
-	t->tcolor[b] = (color)co;
-	return prev;
-}
-
-/*
- - maxcolor - report largest color number in use
- ^ static color maxcolor(struct colormap *);
- */
-static color
-maxcolor(cm)
-struct colormap *cm;
-{
-	if (CISERR())
-		return COLORLESS;
-
-	return (color)cm->max;
-}
-
-/*
- - newcolor - find a new color (must be subject of setcolor at once)
- * Beware:  may relocate the colordescs.
- ^ static color newcolor(struct colormap *);
- */
-static color			/* COLORLESS for error */
-newcolor(cm)
-struct colormap *cm;
-{
-	struct colordesc *cd;
-	struct colordesc *new;
-	size_t n;
-
-	if (CISERR())
-		return COLORLESS;
-
-	if (cm->free != 0) {
-		assert(cm->free > 0);
-		assert((size_t)cm->free < cm->ncds);
-		cd = &cm->cd[cm->free];
-		assert(UNUSEDCOLOR(cd));
-		assert(cd->arcs == NULL);
-		cm->free = cd->sub;
-	} else if (cm->max < cm->ncds - 1) {
-		cm->max++;
-		cd = &cm->cd[cm->max];
-	} else {
-		/* oops, must allocate more */
-		n = cm->ncds * 2;
-		if (cm->cd == cm->cdspace) {
-			new = (struct colordesc *)MALLOC(n *
-						sizeof(struct colordesc));
-			if (new != NULL)
-				memcpy(VS(new), VS(cm->cdspace), cm->ncds *
-						sizeof(struct colordesc));
-		} else
-			new = (struct colordesc *)REALLOC(cm->cd,
-						n * sizeof(struct colordesc));
-		if (new == NULL) {
-			CERR(REG_ESPACE);
-			return COLORLESS;
-		}
-		cm->cd = new;
-		cm->ncds = n;
-		assert(cm->max < cm->ncds - 1);
-		cm->max++;
-		cd = &cm->cd[cm->max];
-	}
-
-	cd->nchrs = 0;
-	cd->sub = NOSUB;
-	cd->arcs = NULL;
-	cd->flags = 0;
-	cd->block = NULL;
-
-	return (color)(cd - cm->cd);
-}
-
-/*
- - freecolor - free a color (must have no arcs or subcolor)
- ^ static VOID freecolor(struct colormap *, pcolor);
- */
-static VOID
-freecolor(cm, co)
-struct colormap *cm;
-pcolor co;
-{
-	struct colordesc *cd = &cm->cd[co];
-	color pco, nco;			/* for freelist scan */
-
-	assert(co >= 0);
-	if (co == WHITE)
-		return;
-
-	assert(cd->arcs == NULL);
-	assert(cd->sub == NOSUB);
-	assert(cd->nchrs == 0);
-	cd->flags = FREECOL;
-	if (cd->block != NULL) {
-		FREE(cd->block);
-		cd->block = NULL;	/* just paranoia */
-	}
-
-	if ((size_t)co == cm->max) {
-		while (cm->max > WHITE && UNUSEDCOLOR(&cm->cd[cm->max]))
-			cm->max--;
-		assert(cm->max >= 0);
-		while ((size_t)cm->free > cm->max)
-			cm->free = cm->cd[cm->free].sub;
-		if (cm->free > 0) {
-			assert(cm->free < cm->max);
-			pco = cm->free;
-			nco = cm->cd[pco].sub;
-			while (nco > 0)
-				if ((size_t)nco > cm->max) {
-					/* take this one out of freelist */
-					nco = cm->cd[nco].sub;
-					cm->cd[pco].sub = nco;
-				} else {
-					assert(nco < cm->max);
-					pco = nco;
-					nco = cm->cd[pco].sub;
-				}
-		}
-	} else {
-		cd->sub = cm->free;
-		cm->free = (color)(cd - cm->cd);
-	}
-}
-
-/*
- - pseudocolor - allocate a false color, to be managed by other means
- ^ static color pseudocolor(struct colormap *);
- */
-static color
-pseudocolor(cm)
-struct colormap *cm;
-{
-	color co;
-
-	co = newcolor(cm);
-	if (CISERR())
-		return COLORLESS;
-	cm->cd[co].nchrs = 1;
-	cm->cd[co].flags = PSEUDO;
-	return co;
-}
-
-/*
- - subcolor - allocate a new subcolor (if necessary) to this chr
- ^ static color subcolor(struct colormap *, pchr c);
- */
-static color
-subcolor(cm, c)
-struct colormap *cm;
-pchr c;
-{
-	color co;			/* current color of c */
-	color sco;			/* new subcolor */
-
-	co = GETCOLOR(cm, c);
-	sco = newsub(cm, co);
-	if (sco == COLORLESS) {
-		return COLORLESS;
-	}
-	if (co == sco)		/* already in an open subcolor */
-		return co;	/* rest is redundant */
-	cm->cd[co].nchrs--;
-	cm->cd[sco].nchrs++;
-	setcolor(cm, c, sco);
-	return sco;
-}
-
-/*
- - newsub - allocate a new subcolor (if necessary) for a color
- ^ static color newsub(struct colormap *, pcolor);
- */
-static color
-newsub(cm, co)
-struct colormap *cm;
-pcolor co;
-{
-	color sco;			/* new subcolor */
-
-	sco = cm->cd[co].sub;
-	if (sco == NOSUB) {		/* color has no open subcolor */
-		if (cm->cd[co].nchrs == 1)	/* optimization */
-			return co;
-		sco = newcolor(cm);	/* must create subcolor */
-		if (sco == COLORLESS)
-			return COLORLESS;
-		cm->cd[co].sub = sco;
-		cm->cd[sco].sub = sco;	/* open subcolor points to self */
-	}
-	assert(sco != NOSUB);
-
-	return sco;
-}
-
-/*
- - subrange - allocate new subcolors to this range of chrs, fill in arcs
- ^ static VOID subrange(struct vars *, pchr, pchr, struct state *,
- ^ 	struct state *);
- */
-static VOID
-subrange(v, from, to, lp, rp)
-struct vars *v;
-pchr from;
-pchr to;
-struct state *lp;
-struct state *rp;
-{
-	uchr uf;
-	int i;
-
-	assert(from <= to);
-
-	/* first, align "from" on a tree-block boundary */
-	uf = (uchr)from;
-	i = (int)( ((uf + BYTTAB-1) & (uchr)~BYTMASK) - uf );
-	for (; from <= to && i > 0; i--, from++)
-		newarc(v->nfa, PLAIN, subcolor(v->cm, from), lp, rp);
-	if (from > to)			/* didn't reach a boundary */
-		return;
-
-	/* deal with whole blocks */
-	for (; to - from >= BYTTAB; from += BYTTAB)
-		subblock(v, from, lp, rp);
-
-	/* clean up any remaining partial table */
-	for (; from <= to; from++)
-		newarc(v->nfa, PLAIN, subcolor(v->cm, from), lp, rp);
-}
-
-/*
- - subblock - allocate new subcolors for one tree block of chrs, fill in arcs
- ^ static VOID subblock(struct vars *, pchr, struct state *, struct state *);
- */
-static VOID
-subblock(v, start, lp, rp)
-struct vars *v;
-pchr start;			/* first of BYTTAB chrs */
-struct state *lp;
-struct state *rp;
-{
-	uchr uc = start;
-	struct colormap *cm = v->cm;
-	int shift;
-	int level;
-	int i;
-	int b;
-	union tree *t;
-	union tree *cb;
-	union tree *fillt;
-	union tree *lastt;
-	int previ;
-	int ndone;
-	color co;
-	color sco;
-
-	assert((uc & BYTMASK) == 0);
-
-	/* find its color block, making new pointer blocks as needed */
-	t = cm->tree;
-	fillt = NULL;
-	for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
-						level++, shift -= BYTBITS) {
-		b = (uc >> shift) & BYTMASK;
-		lastt = t;
-		t = lastt->tptr[b];
-		assert(t != NULL);
-		fillt = &cm->tree[level+1];
-		if (t == fillt && shift > BYTBITS) {	/* need new ptr block */
-			t = (union tree *)MALLOC(sizeof(struct ptrs));
-			if (t == NULL) {
-				CERR(REG_ESPACE);
-				return;
-			}
-			memcpy(VS(t->tptr), VS(fillt->tptr),
-						BYTTAB*sizeof(union tree *));
-			lastt->tptr[b] = t;
-		}
-	}
-
-	/* special cases:  fill block or solid block */
-	co = t->tcolor[0];
-	cb = cm->cd[co].block;
-	if (t == fillt || t == cb) {
-		/* either way, we want a subcolor solid block */
-		sco = newsub(cm, co);
-		t = cm->cd[sco].block;
-		if (t == NULL) {	/* must set it up */
-			t = (union tree *)MALLOC(sizeof(struct colors));
-			if (t == NULL) {
-				CERR(REG_ESPACE);
-				return;
-			}
-			for (i = 0; i < BYTTAB; i++)
-				t->tcolor[i] = sco;
-			cm->cd[sco].block = t;
-		}
-		/* find loop must have run at least once */
-		lastt->tptr[b] = t;
-		newarc(v->nfa, PLAIN, sco, lp, rp);
-		cm->cd[co].nchrs -= BYTTAB;
-		cm->cd[sco].nchrs += BYTTAB;
-		return;
-	}
-
-	/* general case, a mixed block to be altered */
-	i = 0;
-	while (i < BYTTAB) {
-		co = t->tcolor[i];
-		sco = newsub(cm, co);
-		newarc(v->nfa, PLAIN, sco, lp, rp);
-		previ = i;
-		do {
-			t->tcolor[i++] = sco;
-		} while (i < BYTTAB && t->tcolor[i] == co);
-		ndone = i - previ;
-		cm->cd[co].nchrs -= ndone;
-		cm->cd[sco].nchrs += ndone;
-	}
-}
-
-/*
- - okcolors - promote subcolors to full colors
- ^ static VOID okcolors(struct nfa *, struct colormap *);
- */
-static VOID
-okcolors(nfa, cm)
-struct nfa *nfa;
-struct colormap *cm;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	struct colordesc *scd;
-	struct arc *a;
-	color co;
-	color sco;
-
-	for (cd = cm->cd, co = 0; cd < end; cd++, co++) {
-		sco = cd->sub;
-		if (UNUSEDCOLOR(cd) || sco == NOSUB) {
-			/* has no subcolor, no further action */
-		} else if (sco == co) {
-			/* is subcolor, let parent deal with it */
-		} else if (cd->nchrs == 0) {
-			/* parent empty, its arcs change color to subcolor */
-			cd->sub = NOSUB;
-			scd = &cm->cd[sco];
-			assert(scd->nchrs > 0);
-			assert(scd->sub == sco);
-			scd->sub = NOSUB;
-			while ((a = cd->arcs) != NULL) {
-				assert(a->co == co);
-				/* uncolorchain(cm, a); */
-				cd->arcs = a->colorchain;
-				a->co = sco;
-				/* colorchain(cm, a); */
-				a->colorchain = scd->arcs;
-				scd->arcs = a;
-			}
-			freecolor(cm, co);
-		} else {
-			/* parent's arcs must gain parallel subcolor arcs */
-			cd->sub = NOSUB;
-			scd = &cm->cd[sco];
-			assert(scd->nchrs > 0);
-			assert(scd->sub == sco);
-			scd->sub = NOSUB;
-			for (a = cd->arcs; a != NULL; a = a->colorchain) {
-				assert(a->co == co);
-				newarc(nfa, a->type, sco, a->from, a->to);
-			}
-		}
-	}
-}
-
-/*
- - colorchain - add this arc to the color chain of its color
- ^ static VOID colorchain(struct colormap *, struct arc *);
- */
-static VOID
-colorchain(cm, a)
-struct colormap *cm;
-struct arc *a;
-{
-	struct colordesc *cd = &cm->cd[a->co];
-
-	a->colorchain = cd->arcs;
-	cd->arcs = a;
-}
-
-/*
- - uncolorchain - delete this arc from the color chain of its color
- ^ static VOID uncolorchain(struct colormap *, struct arc *);
- */
-static VOID
-uncolorchain(cm, a)
-struct colormap *cm;
-struct arc *a;
-{
-	struct colordesc *cd = &cm->cd[a->co];
-	struct arc *aa;
-
-	aa = cd->arcs;
-	if (aa == a)		/* easy case */
-		cd->arcs = a->colorchain;
-	else {
-		for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain)
-			continue;
-		assert(aa != NULL);
-		aa->colorchain = a->colorchain;
-	}
-	a->colorchain = NULL;	/* paranoia */
-}
-
-/*
- - singleton - is this character in its own color?
- ^ static int singleton(struct colormap *, pchr c);
- */
-#if 0
-static int			/* predicate */
-singleton(cm, c)
-struct colormap *cm;
-pchr c;
-{
-	color co;			/* color of c */
-
-	co = GETCOLOR(cm, c);
-	if (cm->cd[co].nchrs == 1 && cm->cd[co].sub == NOSUB)
-		return 1;
-	return 0;
-}
-#endif
-/*
- - rainbow - add arcs of all full colors (but one) between specified states
- ^ static VOID rainbow(struct nfa *, struct colormap *, int, pcolor,
- ^ 	struct state *, struct state *);
- */
-static VOID
-rainbow(nfa, cm, type, but, from, to)
-struct nfa *nfa;
-struct colormap *cm;
-int type;
-pcolor but;			/* COLORLESS if no exceptions */
-struct state *from;
-struct state *to;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	color co;
-
-	for (cd = cm->cd, co = 0; cd < end && !CISERR(); cd++, co++)
-		if (!UNUSEDCOLOR(cd) && cd->sub != co && co != but &&
-							!(cd->flags&PSEUDO))
-			newarc(nfa, type, co, from, to);
-}
-
-/*
- - colorcomplement - add arcs of complementary colors
- * The calling sequence ought to be reconciled with cloneouts().
- ^ static VOID colorcomplement(struct nfa *, struct colormap *, int,
- ^ 	struct state *, struct state *, struct state *);
- */
-static VOID
-colorcomplement(nfa, cm, type, of, from, to)
-struct nfa *nfa;
-struct colormap *cm;
-int type;
-struct state *of;		/* complements of this guy's PLAIN outarcs */
-struct state *from;
-struct state *to;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	color co;
-
-	assert(of != from);
-	for (cd = cm->cd, co = 0; cd < end && !CISERR(); cd++, co++)
-		if (!UNUSEDCOLOR(cd) && !(cd->flags&PSEUDO))
-			if (findarc(of, PLAIN, co) == NULL)
-				newarc(nfa, type, co, from, to);
-}
-
-
-
-#ifdef REG_DEBUG
-
-/*
- - dumpcolors - debugging output
- ^ static VOID dumpcolors(struct colormap *, FILE *);
- */
-static VOID
-dumpcolors(cm, f)
-struct colormap *cm;
-FILE *f;
-{
-	struct colordesc *cd;
-	struct colordesc *end;
-	color co;
-	chr c;
-	char *has;
-
-	fprintf(f, "max %ld\n", (long)cm->max);
-	if (NBYTS > 1)
-		fillcheck(cm, cm->tree, 0, f);
-	end = CDEND(cm);
-	for (cd = cm->cd + 1, co = 1; cd < end; cd++, co++)	/* skip 0 */
-		if (!UNUSEDCOLOR(cd)) {
-			assert(cd->nchrs > 0);
-			has = (cd->block != NULL) ? "#" : "";
-			if (cd->flags&PSEUDO)
-				fprintf(f, "#%2ld%s(ps): ", (long)co, has);
-			else
-				fprintf(f, "#%2ld%s(%2d): ", (long)co,
-							has, cd->nchrs);
-			/* it's hard to do this more efficiently */
-			for (c = CHR_MIN; c < CHR_MAX; c++)
-				if (GETCOLOR(cm, c) == co)
-					dumpchr(c, f);
-			assert(c == CHR_MAX);
-			if (GETCOLOR(cm, c) == co)
-				dumpchr(c, f);
-			fprintf(f, "\n");
-		}
-}
-
-/*
- - fillcheck - check proper filling of a tree
- ^ static VOID fillcheck(struct colormap *, union tree *, int, FILE *);
- */
-static VOID
-fillcheck(cm, tree, level, f)
-struct colormap *cm;
-union tree *tree;
-int level;			/* level number (top == 0) of this block */
-FILE *f;
-{
-	int i;
-	union tree *t;
-	union tree *fillt = &cm->tree[level+1];
-
-	assert(level < NBYTS-1);	/* this level has pointers */
-	for (i = BYTTAB-1; i >= 0; i--) {
-		t = tree->tptr[i];
-		if (t == NULL)
-			fprintf(f, "NULL found in filled tree!\n");
-		else if (t == fillt)
-			{}
-		else if (level < NBYTS-2)	/* more pointer blocks below */
-			fillcheck(cm, t, level+1, f);
-	}
-}
-
-/*
- - dumpchr - print a chr
- * Kind of char-centric but works well enough for debug use.
- ^ static VOID dumpchr(pchr, FILE *);
- */
-static VOID
-dumpchr(c, f)
-pchr c;
-FILE *f;
-{
-	if (c == '\\')
-		fprintf(f, "\\\\");
-	else if (c > ' ' && c <= '~')
-		putc((char)c, f);
-	else
-		fprintf(f, "\\u%04lx", (long)c);
-}
-
-#endif				/* ifdef REG_DEBUG */
diff --git a/generic/regc_cvec.c b/generic/regc_cvec.c
deleted file mode 100644
index c79e741..0000000
--- a/generic/regc_cvec.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Utility functions for handling cvecs
- * This file is #included by regcomp.c.
- */
-
-/*
- - newcvec - allocate a new cvec
- ^ static struct cvec *newcvec(int, int, int);
- */
-static struct cvec *
-newcvec(nchrs, nranges, nmcces)
-int nchrs;			/* to hold this many chrs... */
-int nranges;			/* ... and this many ranges... */
-int nmcces;			/* ... and this many MCCEs */
-{
-	size_t n;
-	size_t nc;
-	struct cvec *cv;
-
-	nc = (size_t)nchrs + (size_t)nmcces*(MAXMCCE+1) + (size_t)nranges*2;
-	n = sizeof(struct cvec) + (size_t)(nmcces-1)*sizeof(chr *) +
-								nc*sizeof(chr);
-	cv = (struct cvec *)MALLOC(n);
-	if (cv == NULL)
-		return NULL;
-	cv->chrspace = nc;
-	cv->chrs = (chr *)&cv->mcces[nmcces];	/* chrs just after MCCE ptrs */
-	cv->mccespace = nmcces;
-	cv->ranges = cv->chrs + nchrs + nmcces*(MAXMCCE+1);
-	cv->rangespace = nranges;
-	return clearcvec(cv);
-}
-
-/*
- - clearcvec - clear a possibly-new cvec
- * Returns pointer as convenience.
- ^ static struct cvec *clearcvec(struct cvec *);
- */
-static struct cvec *
-clearcvec(cv)
-struct cvec *cv;
-{
-	int i;
-
-	assert(cv != NULL);
-	cv->nchrs = 0;
-	assert(cv->chrs == (chr *)&cv->mcces[cv->mccespace]);
-	cv->nmcces = 0;
-	cv->nmccechrs = 0;
-	cv->nranges = 0;
-	for (i = 0; i < cv->mccespace; i++)
-		cv->mcces[i] = NULL;
-
-	return cv;
-}
-
-/*
- - addchr - add a chr to a cvec
- ^ static VOID addchr(struct cvec *, pchr);
- */
-static VOID
-addchr(cv, c)
-struct cvec *cv;
-pchr c;
-{
-	assert(cv->nchrs < cv->chrspace - cv->nmccechrs);
-	cv->chrs[cv->nchrs++] = (chr)c;
-}
-
-/*
- - addrange - add a range to a cvec
- ^ static VOID addrange(struct cvec *, pchr, pchr);
- */
-static VOID
-addrange(cv, from, to)
-struct cvec *cv;
-pchr from;
-pchr to;
-{
-	assert(cv->nranges < cv->rangespace);
-	cv->ranges[cv->nranges*2] = (chr)from;
-	cv->ranges[cv->nranges*2 + 1] = (chr)to;
-	cv->nranges++;
-}
-
-#ifdef USE_MCCE
-/*
- - addmcce - add an MCCE to a cvec
- ^ static VOID addmcce(struct cvec *, chr *, chr *);
- */
-static VOID
-addmcce(cv, startp, endp)
-struct cvec *cv;
-chr *startp;			/* beginning of text */
-chr *endp;			/* just past end of text */
-{
-	int n = endp - startp;
-	int i;
-	chr *s;
-	chr *d;
-
-	assert(n > 0);
-	assert(cv->nchrs + n < cv->chrspace - cv->nmccechrs);
-	assert(cv->nmcces < cv->mccespace);
-	d = &cv->chrs[cv->chrspace - cv->nmccechrs - n - 1];
-	cv->mcces[cv->nmcces++] = d;
-	for (s = startp, i = n; i > 0; s++, i--)
-		*d++ = *s;
-	*d++ = 0;		/* endmarker */
-	assert(d == &cv->chrs[cv->chrspace - cv->nmccechrs]);
-	cv->nmccechrs += n + 1;
-}
-#endif
-
-/*
- - haschr - does a cvec contain this chr?
- ^ static int haschr(struct cvec *, pchr);
- */
-static int			/* predicate */
-haschr(cv, c)
-struct cvec *cv;
-pchr c;
-{
-	int i;
-	chr *p;
-
-	for (p = cv->chrs, i = cv->nchrs; i > 0; p++, i--)
-		if (*p == c)
-			return 1;
-	for (p = cv->ranges, i = cv->nranges; i > 0; p += 2, i--)
-		if (*p <= c && c <= *(p+1))
-			return 1;
-	return 0;
-}
-
-/*
- - getcvec - get a cvec, remembering it as v->cv
- ^ static struct cvec *getcvec(struct vars *, int, int, int);
- */
-static struct cvec *
-getcvec(v, nchrs, nranges, nmcces)
-struct vars *v;
-int nchrs;			/* to hold this many chrs... */
-int nranges;			/* ... and this many ranges... */
-int nmcces;			/* ... and this many MCCEs */
-{
-	if (v->cv != NULL && nchrs <= v->cv->chrspace &&
-					nranges <= v->cv->rangespace &&
-					nmcces <= v->cv->mccespace)
-		return clearcvec(v->cv);
-
-	if (v->cv != NULL)
-		freecvec(v->cv);
-	v->cv = newcvec(nchrs, nranges, nmcces);
-	if (v->cv == NULL)
-		ERR(REG_ESPACE);
-
-	return v->cv;
-}
-
-/*
- - freecvec - free a cvec
- ^ static VOID freecvec(struct cvec *);
- */
-static VOID
-freecvec(cv)
-struct cvec *cv;
-{
-	FREE(cv);
-}
diff --git a/generic/regc_lex.c b/generic/regc_lex.c
deleted file mode 100644
index 5b93e0b..0000000
--- a/generic/regc_lex.c
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*
- * lexical analyzer
- * This file is #included by regcomp.c.
- */
-
-/* scanning macros (know about v) */
-#define	ATEOS()		(v->now >= v->stop)
-#define	HAVE(n)		(v->stop - v->now >= (n))
-#define	NEXT1(c)	(!ATEOS() && *v->now == CHR(c))
-#define	NEXT2(a,b)	(HAVE(2) && *v->now == CHR(a) && *(v->now+1) == CHR(b))
-#define	NEXT3(a,b,c)	(HAVE(3) && *v->now == CHR(a) && \
-						*(v->now+1) == CHR(b) && \
-						*(v->now+2) == CHR(c))
-#define	SET(c)		(v->nexttype = (c))
-#define	SETV(c, n)	(v->nexttype = (c), v->nextvalue = (n))
-#define	RET(c)		return (SET(c), 1)
-#define	RETV(c, n)	return (SETV(c, n), 1)
-#define	FAILW(e)	return (ERR(e), 0)	/* ERR does SET(EOS) */
-#define	LASTTYPE(t)	(v->lasttype == (t))
-
-/* lexical contexts */
-#define	L_ERE	1	/* mainline ERE/ARE */
-#define	L_BRE	2	/* mainline BRE */
-#define	L_Q	3	/* REG_QUOTE */
-#define	L_EBND	4	/* ERE/ARE bound */
-#define	L_BBND	5	/* BRE bound */
-#define	L_BRACK	6	/* brackets */
-#define	L_CEL	7	/* collating element */
-#define	L_ECL	8	/* equivalence class */
-#define	L_CCL	9	/* character class */
-#define	INTOCON(c)	(v->lexcon = (c))
-#define	INCON(con)	(v->lexcon == (con))
-
-/* construct pointer past end of chr array */
-#define	ENDOF(array)	((array) + sizeof(array)/sizeof(chr))
-
-/*
- - lexstart - set up lexical stuff, scan leading options
- ^ static VOID lexstart(struct vars *);
- */
-static VOID
-lexstart(v)
-struct vars *v;
-{
-	prefixes(v);			/* may turn on new type bits etc. */
-	NOERR();
-
-	if (v->cflags&REG_QUOTE) {
-		assert(!(v->cflags&(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE)));
-		INTOCON(L_Q);
-	} else if (v->cflags&REG_EXTENDED) {
-		assert(!(v->cflags&REG_QUOTE));
-		INTOCON(L_ERE);
-	} else {
-		assert(!(v->cflags&(REG_QUOTE|REG_ADVF)));
-		INTOCON(L_BRE);
-	}
-
-	v->nexttype = EMPTY;		/* remember we were at the start */
-	next(v);			/* set up the first token */
-}
-
-/*
- - prefixes - implement various special prefixes
- ^ static VOID prefixes(struct vars *);
- */
-static VOID
-prefixes(v)
-struct vars *v;
-{
-	/* literal string doesn't get any of this stuff */
-	if (v->cflags&REG_QUOTE)
-		return;
-
-	/* initial "***" gets special things */	
-	if (HAVE(4) && NEXT3('*', '*', '*'))
-		switch (*(v->now + 3)) {
-		case CHR('?'):		/* "***?" error, msg shows version */
-			ERR(REG_BADPAT);
-			return;		/* proceed no further */
-			break;
-		case CHR('='):		/* "***=" shifts to literal string */
-			NOTE(REG_UNONPOSIX);
-			v->cflags |= REG_QUOTE;
-			v->cflags &= ~(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE);
-			v->now += 4;
-			return;		/* and there can be no more prefixes */
-			break;
-		case CHR(':'):		/* "***:" shifts to AREs */
-			NOTE(REG_UNONPOSIX);
-			v->cflags |= REG_ADVANCED;
-			v->now += 4;
-			break;
-		default:		/* otherwise *** is just an error */
-			ERR(REG_BADRPT);
-			return;
-			break;
-		}
-
-	/* BREs and EREs don't get embedded options */
-	if ((v->cflags&REG_ADVANCED) != REG_ADVANCED)
-		return;
-
-	/* embedded options (AREs only) */
-	if (HAVE(3) && NEXT2('(', '?') && iscalpha(*(v->now + 2))) {
-		NOTE(REG_UNONPOSIX);
-		v->now += 2;
-		for (; !ATEOS() && iscalpha(*v->now); v->now++)
-			switch (*v->now) {
-			case CHR('b'):		/* BREs (but why???) */
-				v->cflags &= ~(REG_ADVANCED|REG_QUOTE);
-				break;
-			case CHR('c'):		/* case sensitive */
-				v->cflags &= ~REG_ICASE;
-				break;
-			case CHR('e'):		/* plain EREs */
-				v->cflags |= REG_EXTENDED;
-				v->cflags &= ~(REG_ADVF|REG_QUOTE);
-				break;
-			case CHR('i'):		/* case insensitive */
-				v->cflags |= REG_ICASE;
-				break;
-			case CHR('m'):		/* Perloid synonym for n */
-			case CHR('n'):		/* \n affects ^ $ . [^ */
-				v->cflags |= REG_NEWLINE;
-				break;
-			case CHR('p'):		/* ~Perl, \n affects . [^ */
-				v->cflags |= REG_NLSTOP;
-				v->cflags &= ~REG_NLANCH;
-				break;
-			case CHR('q'):		/* literal string */
-				v->cflags |= REG_QUOTE;
-				v->cflags &= ~REG_ADVANCED;
-				break;
-			case CHR('s'):		/* single line, \n ordinary */
-				v->cflags &= ~REG_NEWLINE;
-				break;
-			case CHR('t'):		/* tight syntax */
-				v->cflags &= ~REG_EXPANDED;
-				break;
-			case CHR('w'):		/* weird, \n affects ^ $ only */
-				v->cflags &= ~REG_NLSTOP;
-				v->cflags |= REG_NLANCH;
-				break;
-			case CHR('x'):		/* expanded syntax */
-				v->cflags |= REG_EXPANDED;
-				break;
-			default:
-				ERR(REG_BADOPT);
-				return;
-			}
-		if (!NEXT1(')')) {
-			ERR(REG_BADOPT);
-			return;
-		}
-		v->now++;
-		if (v->cflags&REG_QUOTE)
-			v->cflags &= ~(REG_EXPANDED|REG_NEWLINE);
-	}
-}
-
-/*
- - lexnest - "call a subroutine", interpolating string at the lexical level
- * Note, this is not a very general facility.  There are a number of
- * implicit assumptions about what sorts of strings can be subroutines.
- ^ static VOID lexnest(struct vars *, chr *, chr *);
- */
-static VOID
-lexnest(v, beginp, endp)
-struct vars *v;
-chr *beginp;				/* start of interpolation */
-chr *endp;				/* one past end of interpolation */
-{
-	assert(v->savenow == NULL);	/* only one level of nesting */
-	v->savenow = v->now;
-	v->savestop = v->stop;
-	v->now = beginp;
-	v->stop = endp;
-}
-
-/*
- * string constants to interpolate as expansions of things like \d
- */
-static chr backd[] = {		/* \d */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr backD[] = {		/* \D */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr brbackd[] = {	/* \d within brackets */
-	CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']')
-};
-static chr backs[] = {		/* \s */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr backS[] = {		/* \S */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr brbacks[] = {	/* \s within brackets */
-	CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']')
-};
-static chr backw[] = {		/* \w */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_'), CHR(']')
-};
-static chr backW[] = {		/* \W */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_'), CHR(']')
-};
-static chr brbackw[] = {	/* \w within brackets */
-	CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_')
-};
-
-/*
- - lexword - interpolate a bracket expression for word characters
- * Possibly ought to inquire whether there is a "word" character class.
- ^ static VOID lexword(struct vars *);
- */
-static VOID
-lexword(v)
-struct vars *v;
-{
-	lexnest(v, backw, ENDOF(backw));
-}
-
-/*
- - next - get next token
- ^ static int next(struct vars *);
- */
-static int			/* 1 normal, 0 failure */
-next(v)
-struct vars *v;
-{
-	chr c;
-
-	/* errors yield an infinite sequence of failures */
-	if (ISERR())
-		return 0;	/* the error has set nexttype to EOS */
-
-	/* remember flavor of last token */
-	v->lasttype = v->nexttype;
-
-	/* if we're nested and we've hit end, return to outer level */
-	if (v->savenow != NULL && ATEOS()) {
-		v->now = v->savenow;
-		v->stop = v->savestop;
-		v->savenow = v->savestop = NULL;
-	}
-
-	/* skip white space etc. if appropriate (not in literal or []) */
-	if (v->cflags&REG_EXPANDED)
-		switch (v->lexcon) {
-		case L_ERE:
-		case L_BRE:
-		case L_EBND:
-		case L_BBND:
-			skip(v);
-			break;
-		}
-
-	/* handle EOS, depending on context */
-	if (ATEOS()) {
-		switch (v->lexcon) {
-		case L_ERE:
-		case L_BRE:
-		case L_Q:
-			RET(EOS);
-			break;
-		case L_EBND:
-		case L_BBND:
-			FAILW(REG_EBRACE);
-			break;
-		case L_BRACK:
-		case L_CEL:
-		case L_ECL:
-		case L_CCL:
-			FAILW(REG_EBRACK);
-			break;
-		}
-		assert(NOTREACHED);
-	}
-
-	/* okay, time to actually get a character */
-	c = *v->now++;
-
-	/* deal with the easy contexts, punt EREs to code below */
-	switch (v->lexcon) {
-	case L_BRE:			/* punt BREs to separate function */
-		return brenext(v, c);
-		break;
-	case L_ERE:			/* see below */
-		break;
-	case L_Q:			/* literal strings are easy */
-		RETV(PLAIN, c);
-		break;
-	case L_BBND:			/* bounds are fairly simple */
-	case L_EBND:
-		switch (c) {
-		case CHR('0'): case CHR('1'): case CHR('2'): case CHR('3'):
-		case CHR('4'): case CHR('5'): case CHR('6'): case CHR('7'):
-		case CHR('8'): case CHR('9'):
-			RETV(DIGIT, (chr)DIGITVAL(c));
-			break;
-		case CHR(','):
-			RET(',');
-			break;
-		case CHR('}'):		/* ERE bound ends with } */
-			if (INCON(L_EBND)) {
-				INTOCON(L_ERE);
-				if ((v->cflags&REG_ADVF) && NEXT1('?')) {
-					v->now++;
-					NOTE(REG_UNONPOSIX);
-					RETV('}', 0);
-				}
-				RETV('}', 1);
-			} else
-				FAILW(REG_BADBR);
-			break;
-		case CHR('\\'):		/* BRE bound ends with \} */
-			if (INCON(L_BBND) && NEXT1('}')) {
-				v->now++;
-				INTOCON(L_BRE);
-				RET('}');
-			} else
-				FAILW(REG_BADBR);
-			break;
-		default:
-			FAILW(REG_BADBR);
-			break;
-		}
-		assert(NOTREACHED);
-		break;
-	case L_BRACK:			/* brackets are not too hard */
-		switch (c) {
-		case CHR(']'):
-			if (LASTTYPE('['))
-				RETV(PLAIN, c);
-			else {
-				INTOCON((v->cflags&REG_EXTENDED) ?
-							L_ERE : L_BRE);
-				RET(']');
-			}
-			break;
-		case CHR('\\'):
-			NOTE(REG_UBBS);
-			if (!(v->cflags&REG_ADVF))
-				RETV(PLAIN, c);
-			NOTE(REG_UNONPOSIX);
-			if (ATEOS())
-				FAILW(REG_EESCAPE);
-			(DISCARD)lexescape(v);
-			switch (v->nexttype) {	/* not all escapes okay here */
-			case PLAIN:
-				return 1;
-				break;
-			case CCLASS:
-				switch (v->nextvalue) {
-				case 'd':
-					lexnest(v, brbackd, ENDOF(brbackd));
-					break;
-				case 's':
-					lexnest(v, brbacks, ENDOF(brbacks));
-					break;
-				case 'w':
-					lexnest(v, brbackw, ENDOF(brbackw));
-					break;
-				default:
-					FAILW(REG_EESCAPE);
-					break;
-				}
-				/* lexnest done, back up and try again */
-				v->nexttype = v->lasttype;
-				return next(v);
-				break;
-			}
-			/* not one of the acceptable escapes */
-			FAILW(REG_EESCAPE);
-			break;
-		case CHR('-'):
-			if (LASTTYPE('[') || NEXT1(']'))
-				RETV(PLAIN, c);
-			else
-				RETV(RANGE, c);
-			break;
-		case CHR('['):
-			if (ATEOS())
-				FAILW(REG_EBRACK);
-			switch (*v->now++) {
-			case CHR('.'):
-				INTOCON(L_CEL);
-				/* might or might not be locale-specific */
-				RET(COLLEL);
-				break;
-			case CHR('='):
-				INTOCON(L_ECL);
-				NOTE(REG_ULOCALE);
-				RET(ECLASS);
-				break;
-			case CHR(':'):
-				INTOCON(L_CCL);
-				NOTE(REG_ULOCALE);
-				RET(CCLASS);
-				break;
-			default:			/* oops */
-				v->now--;
-				RETV(PLAIN, c);
-				break;
-			}
-			assert(NOTREACHED);
-			break;
-		default:
-			RETV(PLAIN, c);
-			break;
-		}
-		assert(NOTREACHED);
-		break;
-	case L_CEL:			/* collating elements are easy */
-		if (c == CHR('.') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, '.');
-		} else
-			RETV(PLAIN, c);
-		break;
-	case L_ECL:			/* ditto equivalence classes */
-		if (c == CHR('=') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, '=');
-		} else
-			RETV(PLAIN, c);
-		break;
-	case L_CCL:			/* ditto character classes */
-		if (c == CHR(':') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, ':');
-		} else
-			RETV(PLAIN, c);
-		break;
-	default:
-		assert(NOTREACHED);
-		break;
-	}
-
-	/* that got rid of everything except EREs and AREs */
-	assert(INCON(L_ERE));
-
-	/* deal with EREs and AREs, except for backslashes */
-	switch (c) {
-	case CHR('|'):
-		RET('|');
-		break;
-	case CHR('*'):
-		if ((v->cflags&REG_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('*', 0);
-		}
-		RETV('*', 1);
-		break;
-	case CHR('+'):
-		if ((v->cflags&REG_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('+', 0);
-		}
-		RETV('+', 1);
-		break;
-	case CHR('?'):
-		if ((v->cflags&REG_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('?', 0);
-		}
-		RETV('?', 1);
-		break;
-	case CHR('{'):		/* bounds start or plain character */
-		if (v->cflags&REG_EXPANDED)
-			skip(v);
-		if (ATEOS() || !iscdigit(*v->now)) {
-			NOTE(REG_UBRACES);
-			NOTE(REG_UUNSPEC);
-			RETV(PLAIN, c);
-		} else {
-			NOTE(REG_UBOUNDS);
-			INTOCON(L_EBND);
-			RET('{');
-		}
-		assert(NOTREACHED);
-		break;
-	case CHR('('):		/* parenthesis, or advanced extension */
-		if ((v->cflags&REG_ADVF) && NEXT1('?')) {
-			NOTE(REG_UNONPOSIX);
-			v->now++;
-			switch (*v->now++) {
-			case CHR(':'):		/* non-capturing paren */
-				RETV('(', 0);
-				break;
-			case CHR('#'):		/* comment */
-				while (!ATEOS() && *v->now != CHR(')'))
-					v->now++;
-				if (!ATEOS())
-					v->now++;
-				assert(v->nexttype == v->lasttype);
-				return next(v);
-				break;
-			case CHR('='):		/* positive lookahead */
-				NOTE(REG_ULOOKAHEAD);
-				RETV(LACON, 1);
-				break;
-			case CHR('!'):		/* negative lookahead */
-				NOTE(REG_ULOOKAHEAD);
-				RETV(LACON, 0);
-				break;
-			default:
-				FAILW(REG_BADRPT);
-				break;
-			}
-			assert(NOTREACHED);
-		}
-		if (v->cflags&REG_NOSUB)
-			RETV('(', 0);		/* all parens non-capturing */
-		else
-			RETV('(', 1);
-		break;
-	case CHR(')'):
-		if (LASTTYPE('(')) {
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(')', c);
-		break;
-	case CHR('['):		/* easy except for [[:<:]] and [[:>:]] */
-		if (HAVE(6) &&	*(v->now+0) == CHR('[') &&
-				*(v->now+1) == CHR(':') &&
-				(*(v->now+2) == CHR('<') ||
-						*(v->now+2) == CHR('>')) &&
-				*(v->now+3) == CHR(':') &&
-				*(v->now+4) == CHR(']') &&
-				*(v->now+5) == CHR(']')) {
-			c = *(v->now+2);
-			v->now += 6;
-			NOTE(REG_UNONPOSIX);
-			RET((c == CHR('<')) ? '<' : '>');
-		}
-		INTOCON(L_BRACK);
-		if (NEXT1('^')) {
-			v->now++;
-			RETV('[', 0);
-		}
-		RETV('[', 1);
-		break;
-	case CHR('.'):
-		RET('.');
-		break;
-	case CHR('^'):
-		RET('^');
-		break;
-	case CHR('$'):
-		RET('$');
-		break;
-	case CHR('\\'):		/* mostly punt backslashes to code below */
-		if (ATEOS())
-			FAILW(REG_EESCAPE);
-		break;
-	default:		/* ordinary character */
-		RETV(PLAIN, c);
-		break;
-	}
-
-	/* ERE/ARE backslash handling; backslash already eaten */
-	assert(!ATEOS());
-	if (!(v->cflags&REG_ADVF)) {	/* only AREs have non-trivial escapes */
-		if (iscalnum(*v->now)) {
-			NOTE(REG_UBSALNUM);
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(PLAIN, *v->now++);
-	}
-	(DISCARD)lexescape(v);
-	if (ISERR())
-		FAILW(REG_EESCAPE);
-	if (v->nexttype == CCLASS) {	/* fudge at lexical level */
-		switch (v->nextvalue) {
-		case 'd':	lexnest(v, backd, ENDOF(backd)); break;
-		case 'D':	lexnest(v, backD, ENDOF(backD)); break;
-		case 's':	lexnest(v, backs, ENDOF(backs)); break;
-		case 'S':	lexnest(v, backS, ENDOF(backS)); break;
-		case 'w':	lexnest(v, backw, ENDOF(backw)); break;
-		case 'W':	lexnest(v, backW, ENDOF(backW)); break;
-		default:
-			assert(NOTREACHED);
-			FAILW(REG_ASSERT);
-			break;
-		}
-		/* lexnest done, back up and try again */
-		v->nexttype = v->lasttype;
-		return next(v);
-	}
-	/* otherwise, lexescape has already done the work */
-	return !ISERR();
-}
-
-/*
- - lexescape - parse an ARE backslash escape (backslash already eaten)
- * Note slightly nonstandard use of the CCLASS type code.
- ^ static int lexescape(struct vars *);
- */
-static int			/* not actually used, but convenient for RETV */
-lexescape(v)
-struct vars *v;
-{
-	chr c;
-	static chr alert[] = {
-		CHR('a'), CHR('l'), CHR('e'), CHR('r'), CHR('t')
-	};
-	static chr esc[] = {
-		CHR('E'), CHR('S'), CHR('C')
-	};
-	chr *save;
-
-	assert(v->cflags&REG_ADVF);
-
-	assert(!ATEOS());
-	c = *v->now++;
-	if (!iscalnum(c))
-		RETV(PLAIN, c);
-
-	NOTE(REG_UNONPOSIX);
-	switch (c) {
-	case CHR('a'):
-		RETV(PLAIN, chrnamed(v, alert, ENDOF(alert), CHR('\007')));
-		break;
-	case CHR('A'):
-		RETV(SBEGIN, 0);
-		break;
-	case CHR('b'):
-		RETV(PLAIN, CHR('\b'));
-		break;
-	case CHR('B'):
-		RETV(PLAIN, CHR('\\'));
-		break;
-	case CHR('c'):
-		NOTE(REG_UUNPORT);
-		if (ATEOS())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, (chr)(*v->now++ & 037));
-		break;
-	case CHR('d'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'd');
-		break;
-	case CHR('D'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'D');
-		break;
-	case CHR('e'):
-		NOTE(REG_UUNPORT);
-		RETV(PLAIN, chrnamed(v, esc, ENDOF(esc), CHR('\033')));
-		break;
-	case CHR('f'):
-		RETV(PLAIN, CHR('\f'));
-		break;
-	case CHR('m'):
-		RET('<');
-		break;
-	case CHR('M'):
-		RET('>');
-		break;
-	case CHR('n'):
-		RETV(PLAIN, CHR('\n'));
-		break;
-	case CHR('r'):
-		RETV(PLAIN, CHR('\r'));
-		break;
-	case CHR('s'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 's');
-		break;
-	case CHR('S'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'S');
-		break;
-	case CHR('t'):
-		RETV(PLAIN, CHR('\t'));
-		break;
-	case CHR('u'):
-		c = lexdigits(v, 16, 4, 4);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('U'):
-		c = lexdigits(v, 16, 8, 8);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('v'):
-		RETV(PLAIN, CHR('\v'));
-		break;
-	case CHR('w'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'w');
-		break;
-	case CHR('W'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'W');
-		break;
-	case CHR('x'):
-		NOTE(REG_UUNPORT);
-		c = lexdigits(v, 16, 1, 255);	/* REs >255 long outside spec */
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('y'):
-		NOTE(REG_ULOCALE);
-		RETV(WBDRY, 0);
-		break;
-	case CHR('Y'):
-		NOTE(REG_ULOCALE);
-		RETV(NWBDRY, 0);
-		break;
-	case CHR('Z'):
-		RETV(SEND, 0);
-		break;
-	case CHR('1'): case CHR('2'): case CHR('3'): case CHR('4'):
-	case CHR('5'): case CHR('6'): case CHR('7'): case CHR('8'):
-	case CHR('9'):
-		save = v->now;
-		v->now--;	/* put first digit back */
-		c = lexdigits(v, 10, 1, 255);	/* REs >255 long outside spec */
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		/* ugly heuristic (first test is "exactly 1 digit?") */
-		if (v->now - save == 0 || (int)c <= v->nsubexp) {
-			NOTE(REG_UBACKREF);
-			RETV(BACKREF, (chr)c);
-		}
-		/* oops, doesn't look like it's a backref after all... */
-		v->now = save;
-		/* and fall through into octal number */
-	case CHR('0'):
-		NOTE(REG_UUNPORT);
-		v->now--;	/* put first digit back */
-		c = lexdigits(v, 8, 1, 3);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	default:
-		assert(iscalpha(c));
-		FAILW(REG_EESCAPE);	/* unknown alphabetic escape */
-		break;
-	}
-	assert(NOTREACHED);
-}
-
-/*
- - lexdigits - slurp up digits and return chr value
- ^ static chr lexdigits(struct vars *, int, int, int);
- */
-static chr			/* chr value; errors signalled via ERR */
-lexdigits(v, base, minlen, maxlen)
-struct vars *v;
-int base;
-int minlen;
-int maxlen;
-{
-	uchr n;			/* unsigned to avoid overflow misbehavior */
-	int len;
-	chr c;
-	int d;
-	CONST uchr ub = (uchr) base;
-
-	n = 0;
-	for (len = 0; len < maxlen && !ATEOS(); len++) {
-		c = *v->now++;
-		switch (c) {
-		case CHR('0'): case CHR('1'): case CHR('2'): case CHR('3'):
-		case CHR('4'): case CHR('5'): case CHR('6'): case CHR('7'):
-		case CHR('8'): case CHR('9'):
-			d = DIGITVAL(c);
-			break;
-		case CHR('a'): case CHR('A'): d = 10; break;
-		case CHR('b'): case CHR('B'): d = 11; break;
-		case CHR('c'): case CHR('C'): d = 12; break;
-		case CHR('d'): case CHR('D'): d = 13; break;
-		case CHR('e'): case CHR('E'): d = 14; break;
-		case CHR('f'): case CHR('F'): d = 15; break;
-		default:
-			v->now--;	/* oops, not a digit at all */
-			d = -1;
-			break;
-		}
-
-		if (d >= base) {	/* not a plausible digit */
-			v->now--;
-			d = -1;
-		}
-		if (d < 0)
-			break;		/* NOTE BREAK OUT */
-		n = n*ub + (uchr)d;
-	}
-	if (len < minlen)
-		ERR(REG_EESCAPE);
-
-	return (chr)n;
-}
-
-/*
- - brenext - get next BRE token
- * This is much like EREs except for all the stupid backslashes and the
- * context-dependency of some things.
- ^ static int brenext(struct vars *, pchr);
- */
-static int			/* 1 normal, 0 failure */
-brenext(v, pc)
-struct vars *v;
-pchr pc;
-{
-	chr c = (chr)pc;
-
-	switch (c) {
-	case CHR('*'):
-		if (LASTTYPE(EMPTY) || LASTTYPE('(') || LASTTYPE('^'))
-			RETV(PLAIN, c);
-		RET('*');
-		break;
-	case CHR('['):
-		if (HAVE(6) &&	*(v->now+0) == CHR('[') &&
-				*(v->now+1) == CHR(':') &&
-				(*(v->now+2) == CHR('<') ||
-						*(v->now+2) == CHR('>')) &&
-				*(v->now+3) == CHR(':') &&
-				*(v->now+4) == CHR(']') &&
-				*(v->now+5) == CHR(']')) {
-			c = *(v->now+2);
-			v->now += 6;
-			NOTE(REG_UNONPOSIX);
-			RET((c == CHR('<')) ? '<' : '>');
-		}
-		INTOCON(L_BRACK);
-		if (NEXT1('^')) {
-			v->now++;
-			RETV('[', 0);
-		}
-		RETV('[', 1);
-		break;
-	case CHR('.'):
-		RET('.');
-		break;
-	case CHR('^'):
-		if (LASTTYPE(EMPTY))
-			RET('^');
-		if (LASTTYPE('(')) {
-			NOTE(REG_UUNSPEC);
-			RET('^');
-		}
-		RETV(PLAIN, c);
-		break;
-	case CHR('$'):
-		if (v->cflags&REG_EXPANDED)
-			skip(v);
-		if (ATEOS())
-			RET('$');
-		if (NEXT2('\\', ')')) {
-			NOTE(REG_UUNSPEC);
-			RET('$');
-		}
-		RETV(PLAIN, c);
-		break;
-	case CHR('\\'):
-		break;		/* see below */
-	default:
-		RETV(PLAIN, c);
-		break;
-	}
-
-	assert(c == CHR('\\'));
-
-	if (ATEOS())
-		FAILW(REG_EESCAPE);
-
-	c = *v->now++;
-	switch (c) {
-	case CHR('{'):
-		INTOCON(L_BBND);
-		NOTE(REG_UBOUNDS);
-		RET('{');
-		break;
-	case CHR('('):
-		RETV('(', 1);
-		break;
-	case CHR(')'):
-		RETV(')', c);
-		break;
-	case CHR('<'):
-		NOTE(REG_UNONPOSIX);
-		RET('<');
-		break;
-	case CHR('>'):
-		NOTE(REG_UNONPOSIX);
-		RET('>');
-		break;
-	case CHR('1'): case CHR('2'): case CHR('3'): case CHR('4'):
-	case CHR('5'): case CHR('6'): case CHR('7'): case CHR('8'):
-	case CHR('9'):
-		NOTE(REG_UBACKREF);
-		RETV(BACKREF, (chr)DIGITVAL(c));
-		break;
-	default:
-		if (iscalnum(c)) {
-			NOTE(REG_UBSALNUM);
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(PLAIN, c);
-		break;
-	}
-
-	assert(NOTREACHED);
-}
-
-/*
- - skip - skip white space and comments in expanded form
- ^ static VOID skip(struct vars *);
- */
-static VOID
-skip(v)
-struct vars *v;
-{
-	chr *start = v->now;
-
-	assert(v->cflags&REG_EXPANDED);
-
-	for (;;) {
-		while (!ATEOS() && iscspace(*v->now))
-			v->now++;
-		if (ATEOS() || *v->now != CHR('#'))
-			break;				/* NOTE BREAK OUT */
-		assert(NEXT1('#'));
-		while (!ATEOS() && *v->now != CHR('\n'))
-			v->now++;
-		/* leave the newline to be picked up by the iscspace loop */
-	}
-
-	if (v->now != start)
-		NOTE(REG_UNONPOSIX);
-}
-
-/*
- - newline - return the chr for a newline
- * This helps confine use of CHR to this source file.
- ^ static chr newline(NOPARMS);
- */
-static chr
-newline()
-{
-	return CHR('\n');
-}
-
-/*
- - chrnamed - return the chr known by a given (chr string) name
- * The code is a bit clumsy, but this routine gets only such specialized
- * use that it hardly matters.
- ^ static chr chrnamed(struct vars *, chr *, chr *, pchr);
- */
-static chr
-chrnamed(v, startp, endp, lastresort)
-struct vars *v;
-chr *startp;			/* start of name */
-chr *endp;			/* just past end of name */
-pchr lastresort;		/* what to return if name lookup fails */
-{
-	celt c;
-	int errsave;
-	int e;
-	struct cvec *cv;
-
-	errsave = v->err;
-	v->err = 0;
-	c = element(v, startp, endp);
-	e = v->err;
-	v->err = errsave;
-
-	if (e != 0)
-		return (chr)lastresort;
-
-	cv = range(v, c, c, 0);
-	if (cv->nchrs == 0)
-		return (chr)lastresort;
-	return cv->chrs[0];
-}
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
deleted file mode 100644
index 82e83e2..0000000
--- a/generic/regc_locale.c
+++ /dev/null
@@ -1,781 +0,0 @@
-/* 
- * regc_locale.c --
- *
- *	This file contains the Unicode locale specific regexp routines.
- *	This file is #included by regcomp.c.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: regc_locale.c,v 1.2 1999/04/16 00:46:37 stanton Exp $
- */
-
-/* ASCII character-name table */
-
-static struct cname {
-	char *name;
-	char code;
-} cnames[] = {
-	{"NUL",	'\0'},
-	{"SOH",	'\001'},
-	{"STX",	'\002'},
-	{"ETX",	'\003'},
-	{"EOT",	'\004'},
-	{"ENQ",	'\005'},
-	{"ACK",	'\006'},
-	{"BEL",	'\007'},
-	{"alert",	'\007'},
-	{"BS",		'\010'},
-	{"backspace",	'\b'},
-	{"HT",		'\011'},
-	{"tab",		'\t'},
-	{"LF",		'\012'},
-	{"newline",	'\n'},
-	{"VT",		'\013'},
-	{"vertical-tab",	'\v'},
-	{"FF",		'\014'},
-	{"form-feed",	'\f'},
-	{"CR",		'\015'},
-	{"carriage-return",	'\r'},
-	{"SO",	'\016'},
-	{"SI",	'\017'},
-	{"DLE",	'\020'},
-	{"DC1",	'\021'},
-	{"DC2",	'\022'},
-	{"DC3",	'\023'},
-	{"DC4",	'\024'},
-	{"NAK",	'\025'},
-	{"SYN",	'\026'},
-	{"ETB",	'\027'},
-	{"CAN",	'\030'},
-	{"EM",	'\031'},
-	{"SUB",	'\032'},
-	{"ESC",	'\033'},
-	{"IS4",	'\034'},
-	{"FS",	'\034'},
-	{"IS3",	'\035'},
-	{"GS",	'\035'},
-	{"IS2",	'\036'},
-	{"RS",	'\036'},
-	{"IS1",	'\037'},
-	{"US",	'\037'},
-	{"space",		' '},
-	{"exclamation-mark",	'!'},
-	{"quotation-mark",	'"'},
-	{"number-sign",		'#'},
-	{"dollar-sign",		'$'},
-	{"percent-sign",		'%'},
-	{"ampersand",		'&'},
-	{"apostrophe",		'\''},
-	{"left-parenthesis",	'('},
-	{"right-parenthesis",	')'},
-	{"asterisk",	'*'},
-	{"plus-sign",	'+'},
-	{"comma",	','},
-	{"hyphen",	'-'},
-	{"hyphen-minus",	'-'},
-	{"period",	'.'},
-	{"full-stop",	'.'},
-	{"slash",	'/'},
-	{"solidus",	'/'},
-	{"zero",		'0'},
-	{"one",		'1'},
-	{"two",		'2'},
-	{"three",	'3'},
-	{"four",		'4'},
-	{"five",		'5'},
-	{"six",		'6'},
-	{"seven",	'7'},
-	{"eight",	'8'},
-	{"nine",		'9'},
-	{"colon",	':'},
-	{"semicolon",	';'},
-	{"less-than-sign",	'<'},
-	{"equals-sign",		'='},
-	{"greater-than-sign",	'>'},
-	{"question-mark",	'?'},
-	{"commercial-at",	'@'},
-	{"left-square-bracket",	'['},
-	{"backslash",		'\\'},
-	{"reverse-solidus",	'\\'},
-	{"right-square-bracket",	']'},
-	{"circumflex",		'^'},
-	{"circumflex-accent",	'^'},
-	{"underscore",		'_'},
-	{"low-line",		'_'},
-	{"grave-accent",		'`'},
-	{"left-brace",		'{'},
-	{"left-curly-bracket",	'{'},
-	{"vertical-line",	'|'},
-	{"right-brace",		'}'},
-	{"right-curly-bracket",	'}'},
-	{"tilde",		'~'},
-	{"DEL",	'\177'},
-	{NULL,	0}
-};
-
-/* Unicode character-class tables */
-
-typedef struct crange {
-    chr start;
-    chr end;
-} crange;
-
-static crange alphaTable[] = {
-    {0X0041, 0X005A}, {0X0061, 0X007A}, {0X00AA, 0X00AA}, {0X00B5, 0X00B5}, 
-    {0X00BA, 0X00BA}, {0X00C0, 0X00D6}, {0X00D8, 0X00F6}, {0X00F8, 0X01F5},
-    {0X01FA, 0X0217}, {0X0250, 0X02A8}, {0X02B0, 0X02B8}, {0X02BB, 0X02C1},
-    {0X02E0, 0X02E4}, {0X037A, 0X037A}, {0x0386, 0x0386}, {0X0388, 0X038A},
-    {0X038C, 0X038C}, {0X038E, 0X03A1}, {0X03A3, 0X03CE}, {0X03D0, 0X03D6},
-    {0X03DA, 0X03DA}, {0X03DC, 0X03DC}, {0X03DE, 0X03DE}, {0X03E0, 0X03E0}, 
-    {0X03E2, 0X03F3}, {0X0401, 0X040C}, {0X040E, 0X044F}, {0X0451, 0X045C},
-    {0X045E, 0X0481}, {0X0490, 0X04C4}, {0X04C7, 0X04C8}, {0X04CB, 0X04CC},
-    {0X04D0, 0X04EB}, {0X04EE, 0X04F5}, {0X04F8, 0X04F9}, {0x0531, 0x0556},
-    {0x0559, 0x0559}, {0x0561, 0x0587}, {0X05D0, 0X05EA}, {0X05F0, 0X05F2},
-    {0X0621, 0X063A}, {0x0641, 0x0652}, {0X0670, 0X06B7}, {0X06BA, 0X06BE},
-    {0X06C0, 0X06CE}, {0X06D0, 0X06D3}, {0X06D5, 0X06DC}, {0X06E1, 0X06E8},
-    {0X06ED, 0X06ED}, {0x0901, 0x0903}, {0x0905, 0x0939}, {0X093D, 0X094C},
-    {0x0958, 0x0963}, {0x0981, 0x0983}, {0X0985, 0X098C}, {0X098F, 0X0990},
-    {0X0993, 0X09A8}, {0X09AA, 0X09B0}, {0X09B2, 0X09B2}, {0X09B6, 0X09B9},
-    {0X09BE, 0X09C4}, {0X09C7, 0X09C8}, {0X09CB, 0X09CC}, {0X09D7, 0X09D7}, 
-    {0X09DC, 0X09DD}, {0X09DF, 0X09E3}, {0X09F0, 0X09F1}, {0X0A02, 0X0A02}, 
-    {0X0A05, 0X0A0A}, {0X0A0F, 0X0A10}, {0X0A13, 0X0A28}, {0X0A2A, 0X0A30},
-    {0X0A32, 0X0A33}, {0X0A35, 0X0A36}, {0X0A38, 0X0A39}, {0X0A3E, 0X0A42},
-    {0X0A47, 0X0A48}, {0X0A4B, 0X0A4C}, {0X0A59, 0X0A5C}, {0X0A5E, 0X0A5E}, 
-    {0X0A70, 0X0A74}, {0X0A81, 0X0A83}, {0X0A85, 0X0A8B}, {0X0A8D, 0X0A8D}, 
-    {0X0A8F, 0X0A91}, {0X0A93, 0X0AA8}, {0X0AAA, 0X0AB0}, {0X0AB2, 0X0AB3},
-    {0X0AB5, 0X0AB9}, {0X0ABD, 0X0AC5}, {0X0AC7, 0X0AC9}, {0X0ACB, 0X0ACC},
-    {0X0AE0, 0X0AE0}, {0X0B01, 0X0B03}, {0X0B05, 0X0B0C}, {0X0B0F, 0X0B10},
-    {0X0B13, 0X0B28}, {0X0B2A, 0X0B30}, {0X0B32, 0X0B33}, {0X0B36, 0X0B39},
-    {0X0B3D, 0X0B43}, {0X0B47, 0X0B48}, {0X0B4B, 0X0B4C}, {0X0B56, 0X0B57},
-    {0X0B5C, 0X0B5D}, {0X0B5F, 0X0B61}, {0X0B82, 0X0B83}, {0X0B85, 0X0B8A},
-    {0X0B8E, 0X0B90}, {0X0B92, 0X0B95}, {0X0B99, 0X0B9A}, {0X0B9C, 0X0B9C}, 
-    {0X0B9E, 0X0B9F}, {0X0BA3, 0X0BA4}, {0X0BA8, 0X0BAA}, {0X0BAE, 0X0BB5},
-    {0X0BB7, 0X0BB9}, {0X0BBE, 0X0BC2}, {0X0BC6, 0X0BC8}, {0X0BCA, 0X0BCC},
-    {0X0BD7, 0X0BD7}, {0X0C01, 0X0C03}, {0X0C05, 0X0C0C}, {0X0C0E, 0X0C10},
-    {0X0C12, 0X0C28}, {0X0C2A, 0X0C33}, {0X0C35, 0X0C39}, {0X0C3E, 0X0C44},
-    {0X0C46, 0X0C48}, {0X0C4A, 0X0C4C}, {0X0C55, 0X0C56}, {0X0C60, 0X0C61},
-    {0X0C82, 0X0C83}, {0X0C85, 0X0C8C}, {0X0C8E, 0X0C90}, {0X0C92, 0X0CA8},
-    {0X0CAA, 0X0CB3}, {0X0CB5, 0X0CB9}, {0X0CBE, 0X0CC4}, {0X0CC6, 0X0CC8},
-    {0X0CCA, 0X0CCC}, {0X0CD5, 0X0CD6}, {0X0CDE, 0X0CDE}, {0X0CE0, 0X0CE1},
-    {0X0D02, 0X0D03}, {0X0D05, 0X0D0C}, {0X0D0E, 0X0D10}, {0X0D12, 0X0D28},
-    {0X0D2A, 0X0D39}, {0X0D3E, 0X0D43}, {0X0D46, 0X0D48}, {0X0D4A, 0X0D4C},
-    {0X0D57, 0X0D57}, {0X0D60, 0X0D61}, {0X0E01, 0X0E2E}, {0X0E30, 0X0E3A},
-    {0X0E40, 0X0E45}, {0X0E47, 0X0E47}, {0X0E4D, 0X0E4D}, {0X0E81, 0X0E82},
-    {0X0E84, 0X0E84}, {0X0E87, 0X0E88}, {0X0E8A, 0X0E8A}, {0X0E8D, 0X0E8D}, 
-    {0X0E94, 0X0E97}, {0X0E99, 0X0E9F}, {0X0EA1, 0X0EA3}, {0X0EA5, 0X0EA5}, 
-    {0X0EA7, 0X0EA7}, {0X0EAA, 0X0EAB}, {0X0EAD, 0X0EAE}, {0X0EB0, 0X0EB9},
-    {0X0EBB, 0X0EBD}, {0X0EC0, 0X0EC4}, {0X0ECD, 0X0ECD}, {0X0EDC, 0X0EDD},
-    {0X0F40, 0X0F47}, {0X0F49, 0X0F69}, {0X0F71, 0X0F81}, {0X0F90, 0X0F95},
-    {0X0F97, 0X0F97}, {0X0F99, 0X0FAD}, {0X0FB1, 0X0FB7}, {0X0FB9, 0X0FB9}, 
-    {0X10A0, 0X10C5}, {0X10D0, 0X10F6}, {0x1100, 0x1159}, {0X115F, 0X11A2},
-    {0X11A8, 0X11F9}, {0X1E00, 0X1E9B}, {0X1EA0, 0X1EF9}, {0X1F00, 0X1F15},
-    {0X1F18, 0X1F1D}, {0X1F20, 0X1F45}, {0X1F48, 0X1F4D}, {0X1F50, 0X1F57},
-    {0X1F59, 0X1F59}, {0X1F5B, 0X1F5B}, {0X1F5D, 0X1F5D}, {0X1F5F, 0X1F7D},
-    {0X1F80, 0X1FB4}, {0X1FB6, 0X1FBC}, {0X1FBE, 0X1FBE}, {0X1FC2, 0X1FC4},
-    {0X1FC6, 0X1FCC}, {0X1FD0, 0X1FD3}, {0X1FD6, 0X1FDB}, {0X1FE0, 0X1FEC},
-    {0X1FF2, 0X1FF4}, {0X1FF6, 0X1FFC}, {0X207F, 0X207F}, {0x2102, 0x2102}, 
-    {0x2107, 0x2107}, {0X210A, 0X2113}, {0x2115, 0x2115}, {0X2118, 0X211D},
-    {0x2124, 0x2124}, {0x2126, 0x2126}, {0x2128, 0x2128}, {0X212A, 0X2131},
-    {0x2133, 0x2138}, {0x2160, 0x2182}, {0x3041, 0x3094}, {0X30A1, 0X30FA},
-    {0X3105, 0X312C}, {0X3131, 0X318E}, {0XAC00, 0XD7A3}, {0XFB00, 0XFB06},
-    {0XFB13, 0XFB17}, {0XFB1F, 0XFB28}, {0XFB2A, 0XFB36}, {0XFB38, 0XFB3C},
-    {0XFB3E, 0XFB3E}, {0XFB40, 0XFB41}, {0XFB43, 0XFB44}, {0XFB46, 0XFBB1},
-    {0XFBD3, 0XFD3D}, {0XFD50, 0XFD8F}, {0XFD92, 0XFDC7}, {0XFDF0, 0XFDFB},
-    {0XFE70, 0XFE72}, {0XFE74, 0XFE74}, {0XFE76, 0XFEFC}, {0XFF21, 0XFF3A},
-    {0XFF41, 0XFF5A}, {0XFF66, 0XFF6F}, {0XFF71, 0XFF9D}, {0XFFA0, 0XFFBE},
-    {0XFFC2, 0XFFC7}, {0XFFCA, 0XFFCF}, {0XFFD2, 0XFFD7}, {0XFFDA, 0XFFDC}
-};
-
-#define NUM_ALPHA (sizeof(alphaTable)/sizeof(crange))
-
-static crange digitTable[] = {
-    {0x0030, 0x0039}
-};
-
-#define NUM_DIGIT (sizeof(digitTable)/sizeof(crange))
-
-static crange punctTable[] = {
-    {0x0021, 0x0023}, {0X0025, 0X002A}, {0X002C, 0X002F}, {0X003A, 0X003B},
-    {0X003F, 0X0040}, {0X005B, 0X005D}, {0X005F, 0X005F}, {0X007B, 0X007B},
-    {0X007D, 0X007D}, {0X00A1, 0X00A1}, {0X00AB, 0X00AB}, {0X00AD, 0X00AD},
-    {0X00BB, 0X00BB}, {0X00BF, 0X00BF}, {0X02BC, 0X02BC}, {0x0374, 0x0375},
-    {0X037E, 0X037E}, {0x0387, 0x0387}, {0X055A, 0X055F}, {0x0589, 0x0589},
-    {0X05BE, 0X05BE}, {0X05C0, 0X05C0}, {0X05C3, 0X05C3}, {0X05F3, 0X05F4},
-    {0X060C, 0X060C}, {0X061B, 0X061B}, {0X061F, 0X061F}, {0X066A, 0X066D},
-    {0X06D4, 0X06D4}, {0x0964, 0x0965}, {0x0970, 0x0970}, {0X0E2F, 0X0E2F},
-    {0X0E5A, 0X0E5B}, {0X0EAF, 0X0EAF}, {0X0F04, 0X0F12}, {0X0F3A, 0X0F3F},
-    {0X0F85, 0X0F85}, {0X10FB, 0X10FB}, {0x2010, 0x2027}, {0x2030, 0x2043},
-    {0x2045, 0x2046}, {0X207D, 0X207E}, {0X208D, 0X208E}, {0X2329, 0X232A},
-    {0x3001, 0x3003}, {0x3006, 0x3006}, {0x3008, 0x3011}, {0X3014, 0X301F},
-    {0x3030, 0x3030}, {0X30FB, 0X30FB}, {0XFD3E, 0XFD3F}, {0XFE30, 0XFE44},
-    {0XFE49, 0XFE52}, {0XFE54, 0XFE61}, {0XFE63, 0XFE63}, {0XFE68, 0XFE68},
-    {0XFE6A, 0XFE6B}, {0XFF01, 0XFF03}, {0XFF05, 0XFF0A}, {0XFF0C, 0XFF0F},
-    {0XFF1A, 0XFF1B}, {0XFF1F, 0XFF20}, {0XFF3B, 0XFF3D}, {0XFF3F, 0XFF3F},
-    {0XFF5B, 0XFF5B}, {0XFF5D, 0XFF5D}, {0XFF61, 0XFF65}
-};
-
-#define NUM_PUNCT (sizeof(punctTable)/sizeof(crange))
-
-static crange spaceTable[] = {
-    {0x0000, 0x0000}, {0x0009, 0x000D}, {0x0020, 0x0020}, {0x00A0, 0x00A0},
-    {0x2000, 0x200F}, {0x2028, 0x202E}, {0X206A, 0X206F}, {0x3000, 0x3000},
-    {0xFEFF, 0xFEFF}
-};  
-
-#define NUM_SPACE (sizeof(spaceTable)/sizeof(crange))
-
-static crange upperRangeTable[] = {
-    {0x0041, 0x005a}, {0x00c0, 0x00d6}, {0x00d8, 0x00de}, {0x0189, 0x018b},
-    {0x018e, 0x0191}, {0x0388, 0x038a}, {0x0391, 0x03a1}, {0x03a3, 0x03ab},
-    {0x03d2, 0x03d4}, {0x0401, 0x040c}, {0x040e, 0x042f}, {0x0531, 0x0556},
-    {0x10a0, 0x10c5}, {0x1f08, 0x1f0f}, {0x1f18, 0x1f1d}, {0x1f28, 0x1f2f},
-    {0x1f38, 0x1f3f}, {0x1f48, 0x1f4d}, {0x1f68, 0x1f6f}, {0x1f88, 0x1f8f},
-    {0x1f98, 0x1f9f}, {0x1fa8, 0x1faf}, {0x1fb8, 0x1fbc}, {0x1fc8, 0x1fcc},
-    {0x1fd8, 0x1fdb}, {0x1fe8, 0x1fec}, {0x1ff8, 0x1ffc}, {0x210b, 0x210d},
-    {0x2110, 0x2112}, {0x2118, 0x211d}, {0x212a, 0x212d}, {0x2130, 0x2131},
-    {0xff21, 0xff3a}
-};
-
-#define NUM_UPPER_RANGE (sizeof(upperRangeTable)/sizeof(crange))
-
-static chr upperCharTable[] = {
-    0x0100, 0x0102, 0x0104, 0x0106, 0x0108, 0x010a, 0x010c, 0x010e, 0x0110,
-    0x0112, 0x0114, 0x0116, 0x0118, 0x011a, 0x011c, 0x011e, 0x0120, 0x0122,
-    0x0124, 0x0126, 0x0128, 0x012a, 0x012c, 0x012e, 0x0130, 0x0132, 0x0134,
-    0x0136, 0x0139, 0x013b, 0x013d, 0x013f, 0x0141, 0x0143, 0x0145, 0x0147,
-    0x014a, 0x014c, 0x014e, 0x0150, 0x0152, 0x0154, 0x0156, 0x0158, 0x015a,
-    0x015c, 0x015e, 0x0160, 0x0162, 0x0164, 0x0166, 0x0168, 0x016a, 0x016c,
-    0x016e, 0x0170, 0x0172, 0x0174, 0x0176, 0x0178, 0x0179, 0x017b, 0x017d,
-    0x0181, 0x0182, 0x0184, 0x0186, 0x0187, 0x0193, 0x0194, 0x0196, 0x0197,
-    0x0198, 0x019c, 0x019d, 0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a7,
-    0x01a9, 0x01ac, 0x01ae, 0x01af, 0x01b1, 0x01b2, 0x01b3, 0x01b5, 0x01b7,
-    0x01b8, 0x01bc, 0x01c4, 0x01c7, 0x01ca, 0x01cd, 0x01cf, 0x01d1, 0x01d3,
-    0x01d5, 0x01d7, 0x01d9, 0x01db, 0x01de, 0x01e0, 0x01e2, 0x01e4, 0x01e6,
-    0x01e8, 0x01ea, 0x01ec, 0x01ee, 0x01f1, 0x01f4, 0x01fa, 0x01fc, 0x01fe,
-    0x0200, 0x0202, 0x0204, 0x0206, 0x0208, 0x020a, 0x020c, 0x020e, 0x0210,
-    0x0212, 0x0214, 0x0216, 0x0386, 0x038c, 0x038e, 0x038f, 0x03da, 0x03dc,
-    0x03de, 0x03e0, 0x03e2, 0x03e4, 0x03e6, 0x03e8, 0x03ea, 0x03ec, 0x03ee,
-    0x0460, 0x0462, 0x0464, 0x0466, 0x0468, 0x046a, 0x046c, 0x046e, 0x0470,
-    0x0472, 0x0474, 0x0476, 0x0478, 0x047a, 0x047c, 0x047e, 0x0480, 0x0490,
-    0x0492, 0x0494, 0x0496, 0x0498, 0x049a, 0x049c, 0x049e, 0x04a0, 0x04a2,
-    0x04a4, 0x04a6, 0x04a8, 0x04aa, 0x04ac, 0x04ae, 0x04b0, 0x04b2, 0x04b4,
-    0x04b6, 0x04b8, 0x04ba, 0x04bc, 0x04be, 0x04c1, 0x04c3, 0x04c7, 0x04cb,
-    0x04d0, 0x04d2, 0x04d4, 0x04d6, 0x04d8, 0x04da, 0x04dc, 0x04de, 0x04e0,
-    0x04e2, 0x04e4, 0x04e6, 0x04e8, 0x04ea, 0x04ee, 0x04f0, 0x04f2, 0x04f4,
-    0x04f8, 0x1e00, 0x1e02, 0x1e04, 0x1e06, 0x1e08, 0x1e0a, 0x1e0c, 0x1e0e,
-    0x1e10, 0x1e12, 0x1e14, 0x1e16, 0x1e18, 0x1e1a, 0x1e1c, 0x1e1e, 0x1e20,
-    0x1e22, 0x1e24, 0x1e26, 0x1e28, 0x1e2a, 0x1e2c, 0x1e2e, 0x1e30, 0x1e32,
-    0x1e34, 0x1e36, 0x1e38, 0x1e3a, 0x1e3c, 0x1e3e, 0x1e40, 0x1e42, 0x1e44,
-    0x1e46, 0x1e48, 0x1e4a, 0x1e4c, 0x1e4e, 0x1e50, 0x1e52, 0x1e54, 0x1e56,
-    0x1e58, 0x1e5a, 0x1e5c, 0x1e5e, 0x1e60, 0x1e62, 0x1e64, 0x1e66, 0x1e68,
-    0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, 0x1e72, 0x1e74, 0x1e76, 0x1e78, 0x1e7a,
-    0x1e7c, 0x1e7e, 0x1e80, 0x1e82, 0x1e84, 0x1e86, 0x1e88, 0x1e8a, 0x1e8c,
-    0x1e8e, 0x1e90, 0x1e92, 0x1e94, 0x1ea0, 0x1ea2, 0x1ea4, 0x1ea6, 0x1ea8,
-    0x1eaa, 0x1eac, 0x1eae, 0x1eb0, 0x1eb2, 0x1eb4, 0x1eb6, 0x1eb8, 0x1eba,
-    0x1ebc, 0x1ebe, 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6, 0x1ec8, 0x1eca, 0x1ecc,
-    0x1ece, 0x1ed0, 0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8, 0x1eda, 0x1edc, 0x1ede,
-    0x1ee0, 0x1ee2, 0x1ee4, 0x1ee6, 0x1ee8, 0x1eea, 0x1eec, 0x1eee, 0x1ef0,
-    0x1ef2, 0x1ef4, 0x1ef6, 0x1ef8, 0x1f59, 0x1f5b, 0x1f5d, 0x1f5f, 0x1fbe,
-    0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x2133
-};
-
-#define NUM_UPPER_CHAR (sizeof(upperCharTable)/sizeof(chr))
-
-static crange lowerRangeTable[] = {
-    {0x0061, 0x007a}, {0x00df, 0x00f6}, {0x00f8, 0x00ff}, {0x0199, 0x019b},
-    {0x0250, 0x02a8}, {0x03ac, 0x03ce}, {0x03ef, 0x03f2}, {0x0430, 0x044f},
-    {0x0451, 0x045c}, {0x0561, 0x0587}, {0x10d0, 0x10f6}, {0x1e95, 0x1e9b},
-    {0x1f00, 0x1f07}, {0x1f10, 0x1f15}, {0x1f20, 0x1f27}, {0x1f30, 0x1f37},
-    {0x1f40, 0x1f45}, {0x1f50, 0x1f57}, {0x1f60, 0x1f67}, {0x1f70, 0x1f7d},
-    {0x1f80, 0x1f87}, {0x1f90, 0x1f97}, {0x1fa0, 0x1fa7}, {0x1fb0, 0x1fb4},
-    {0x1fd0, 0x1fd3}, {0x1fe0, 0x1fe7}, {0x1ff2, 0x1ff4}, {0xfb00, 0xfb06},
-    {0xfb13, 0xfb17}, {0xff41, 0xff5a}
-};
-
-#define NUM_LOWER_RANGE (sizeof(lowerRangeTable)/sizeof(crange))
-
-static chr lowerCharTable[] = {
-    0x00aa, 0x00b5, 0x00ba, 0x0101, 0x0103, 0x0105, 0x0107, 0x0109, 0x010b,
-    0x010d, 0x010f, 0x0111, 0x0113, 0x0115, 0x0117, 0x0119, 0x011b, 0x011d,
-    0x011f, 0x0121, 0x0123, 0x0125, 0x0127, 0x0129, 0x012b, 0x012d, 0x012f,
-    0x0131, 0x0133, 0x0135, 0x0138, 0x013a, 0x013c, 0x013e, 0x0140, 0x0142,
-    0x0144, 0x0146, 0x0149, 0x014b, 0x014d, 0x014f, 0x0151, 0x0153, 0x0155,
-    0x0157, 0x0159, 0x015b, 0x015d, 0x015f, 0x0161, 0x0163, 0x0165, 0x0167,
-    0x0169, 0x016b, 0x016d, 0x016f, 0x0171, 0x0173, 0x0175, 0x0177, 0x017a,
-    0x017c, 0x017e, 0x017f, 0x0180, 0x0183, 0x0185, 0x0188, 0x018c, 0x018d,
-    0x0192, 0x0195, 0x019e, 0x01a1, 0x01a3, 0x01a5, 0x01a8, 0x01ab, 0x01ad,
-    0x01b0, 0x01b4, 0x01b6, 0x01b9, 0x01ba, 0x01bd, 0x01c6, 0x01c9, 0x01cc,
-    0x01ce, 0x01d0, 0x01d2, 0x01d4, 0x01d6, 0x01d8, 0x01da, 0x01dd, 0x01df,
-    0x01e1, 0x01e3, 0x01e5, 0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01f0, 0x01f3,
-    0x01f5, 0x01fb, 0x01fd, 0x01ff, 0x0201, 0x0203, 0x0205, 0x0207, 0x0209,
-    0x020b, 0x020d, 0x020f, 0x0211, 0x0213, 0x0215, 0x0217, 0x0390, 0x03d0,
-    0x03d1, 0x03d5, 0x03d6, 0x03e3, 0x03e5, 0x03e7, 0x03e9, 0x03eb, 0x03ed,
-    0x045e, 0x045f, 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d,
-    0x046f, 0x0471, 0x0473, 0x0475, 0x0477, 0x0479, 0x047b, 0x047d, 0x047f,
-    0x0481, 0x0491, 0x0493, 0x0495, 0x0497, 0x0499, 0x049b, 0x049d, 0x049f,
-    0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x04af, 0x04b1,
-    0x04b3, 0x04b5, 0x04b7, 0x04b9, 0x04bb, 0x04bd, 0x04bf, 0x04c2, 0x04c4,
-    0x04c8, 0x04cc, 0x04d1, 0x04d3, 0x04d5, 0x04d7, 0x04d9, 0x04db, 0x04dd,
-    0x04df, 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ef, 0x04f1,
-    0x04f3, 0x04f5, 0x04f9, 0x1e01, 0x1e03, 0x1e05, 0x1e07, 0x1e09, 0x1e0b,
-    0x1e0d, 0x1e0f, 0x1e11, 0x1e13, 0x1e15, 0x1e17, 0x1e19, 0x1e1b, 0x1e1d,
-    0x1e1f, 0x1e21, 0x1e23, 0x1e25, 0x1e27, 0x1e29, 0x1e2b, 0x1e2d, 0x1e2f,
-    0x1e31, 0x1e33, 0x1e35, 0x1e37, 0x1e39, 0x1e3b, 0x1e3d, 0x1e3f, 0x1e41,
-    0x1e43, 0x1e45, 0x1e47, 0x1e49, 0x1e4b, 0x1e4d, 0x1e4f, 0x1e51, 0x1e53,
-    0x1e55, 0x1e57, 0x1e59, 0x1e5b, 0x1e5d, 0x1e5f, 0x1e61, 0x1e63, 0x1e65,
-    0x1e67, 0x1e69, 0x1e6b, 0x1e6d, 0x1e6f, 0x1e71, 0x1e73, 0x1e75, 0x1e77,
-    0x1e79, 0x1e7b, 0x1e7d, 0x1e7f, 0x1e81, 0x1e83, 0x1e85, 0x1e87, 0x1e89,
-    0x1e8b, 0x1e8d, 0x1e8f, 0x1e91, 0x1e93, 0x1ea1, 0x1ea3, 0x1ea5, 0x1ea7,
-    0x1ea9, 0x1eab, 0x1ead, 0x1eaf, 0x1eb1, 0x1eb3, 0x1eb5, 0x1eb7, 0x1eb9,
-    0x1ebb, 0x1ebd, 0x1ebf, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ec7, 0x1ec9, 0x1ecb,
-    0x1ecd, 0x1ecf, 0x1ed1, 0x1ed3, 0x1ed5, 0x1ed7, 0x1ed9, 0x1edb, 0x1edd,
-    0x1edf, 0x1ee1, 0x1ee3, 0x1ee5, 0x1ee7, 0x1ee9, 0x1eeb, 0x1eed, 0x1eef,
-    0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9, 0x1fb6, 0x1fb7, 0x1fc2, 0x1fc3,
-    0x1fc4, 0x1fc6, 0x1fc7, 0x1fd6, 0x1fd7, 0x1ff6, 0x1ff7, 0x207f, 0x210a,
-    0x210e, 0x210f, 0x2113, 0x212e, 0x212f, 0x2134
-};
-
-#define NUM_LOWER_CHAR (sizeof(lowerCharTable)/sizeof(chr))
-
-/*
- * The graph table includes the set of characters that are neither ISO control
- * characters nor in the space table.
- */
-
-static crange graphTable[] = {
-    {0x0021, 0x007e}, {0x00a1, 0x1fff}, {0x2010, 0x2027}, {0x202f, 0x2069},
-    {0x2070, 0x2fff}, {0x3001, 0xfefe}, {0xff00, 0xffff}
-};
-
-#define NUM_GRAPH (sizeof(graphTable)/sizeof(crange))
-#define	CH	NOCELT
-
-/*
- - nmcces - how many distinct MCCEs are there?
- ^ static int nmcces(struct vars *);
- */
-static int
-nmcces(v)
-struct vars *v;
-{
-	return 0;
-}
-
-/*
- - nleaders - how many chrs can be first chrs of MCCEs?
- ^ static int nleaders(struct vars *);
- */
-static int
-nleaders(v)
-struct vars *v;
-{
-	return 0;
-}
-
-/*
- - allmcces - return a cvec with all the MCCEs of the locale
- ^ static struct cvec *allmcces(struct vars *, struct cvec *);
- */
-static struct cvec *
-allmcces(v, cv)
-struct vars *v;
-struct cvec *cv;		/* this is supposed to have enough room */
-{
-	return clearcvec(cv);
-}
-
-/*
- - element - map collating-element name to celt
- ^ static celt element(struct vars *, chr *, chr *);
- */
-static celt
-element(v, startp, endp)
-struct vars *v;
-chr *startp;			/* points to start of name */
-chr *endp;			/* points just past end of name */
-{
-	struct cname *cn;
-	size_t len;
-	Tcl_DString ds;
-	char *np;
-
-	/* generic:  one-chr names stand for themselves */
-	assert(startp < endp);
-	len = endp - startp;
-	if (len == 1)
-		return *startp;
-
-	NOTE(REG_ULOCALE);
-
-	/* search table */
-	Tcl_DStringInit(&ds);
-	np = Tcl_UniCharToUtfDString(startp, (int)len, &ds);
-	for (cn = cnames; cn->name != NULL; cn++)
-		if (strlen(cn->name) == len && strncmp(cn->name, np, len) == 0)
-			break;		/* NOTE BREAK OUT */
-	Tcl_DStringFree(&ds);
-	if (cn->name != NULL)
-		return CHR(cn->code);
-
-	/* couldn't find it */
-	ERR(REG_ECOLLATE);
-	return 0;
-}
-
-/*
- - range - supply cvec for a range, including legality check
- ^ static struct cvec *range(struct vars *, celt, celt, int);
- */
-static struct cvec *
-range(v, a, b, cases)
-struct vars *v;
-celt a;
-celt b;				/* might equal a */
-int cases;			/* case-independent? */
-{
-	int nchrs;
-	struct cvec *cv;
-	celt c, lc, uc, tc;
-
-	if (a != b && !before(a, b)) {
-		ERR(REG_ERANGE);
-		return NULL;
-	}
-
-	if (!cases) {		/* easy version */
-		cv = getcvec(v, 0, 1, 0);
-		NOERRN();
-		addrange(cv, a, b);
-		return cv;
-	}
-
-	/*
-	 * When case-independent, it's hard to decide when cvec ranges are
-	 * usable, so for now at least, we won't try.  We allocate enough
-	 * space for two case variants plus a little extra for the two
-	 * title case variants.
-	 */
-
-	nchrs = (b - a + 1)*2 + 4;
-
-	cv = getcvec(v, nchrs, 0, 0);
-	NOERRN();
-
-	for (c = a; c <= b; c++) {
-		addchr(cv, c);
-		lc = Tcl_UniCharToLower((chr)c);
-		uc = Tcl_UniCharToUpper((chr)c);
-		tc = Tcl_UniCharToTitle((chr)c);
-		if (c != lc) {
-			addchr(cv, lc);
-		}
-		if (c != uc) {
-			addchr(cv, uc);
-		}
-		if (c != tc && tc != uc) {
-			addchr(cv, tc);
-		}
-	}
-
-	return cv;
-}
-
-/*
- - before - is celt x before celt y, for purposes of range legality?
- ^ static int before(celt, celt);
- */
-static int			/* predicate */
-before(x, y)
-celt x;
-celt y;
-{
-	/* trivial because no MCCEs */
-	if (x < y)
-		return 1;
-	return 0;
-}
-
-/*
- - eclass - supply cvec for an equivalence class
- * Must include case counterparts on request.
- ^ static struct cvec *eclass(struct vars *, celt, int);
- */
-static struct cvec *
-eclass(v, c, cases)
-struct vars *v;
-celt c;
-int cases;			/* all cases? */
-{
-	struct cvec *cv;
-
-	/* crude fake equivalence class for testing */
-	if ((v->cflags&REG_FAKEEC) && c == 'x') {
-		cv = getcvec(v, 4, 0, 0);
-		addchr(cv, (chr)'x');
-		addchr(cv, (chr)'y');
-		if (cases) {
-			addchr(cv, (chr)'X');
-			addchr(cv, (chr)'Y');
-		}
-		return cv;
-	}
-
-	/* otherwise, none */
-	if (cases)
-		return allcases(v, c);
-	cv = getcvec(v, 1, 0, 0);
-	assert(cv != NULL);
-	addchr(cv, (chr)c);
-	return cv;
-}
-
-/*
- - cclass - supply cvec for a character class
- * Must include case counterparts on request.
- ^ static struct cvec *cclass(struct vars *, chr *, chr *, int);
- */
-static struct cvec *
-cclass(v, startp, endp, cases)
-struct vars *v;
-chr *startp;			/* where the name starts */
-chr *endp;			/* just past the end of the name */
-int cases;			/* case-independent? */
-{
-    size_t len;
-    struct cvec *cv = NULL;
-    Tcl_DString ds;
-    char *np, **namePtr;
-    int i, index;
-
-    /*
-     * The following arrays define the valid character class names.
-     */
-
-    static char *classNames[] = {
-	"alnum", "alpha", "blank", "cntrl", "digit", "graph", "lower",
-	"print", "punct", "space", "upper", "xdigit", NULL
-    };
-
-    enum classes {
-	CC_ALNUM, CC_ALPHA, CC_BLANK, CC_CNTRL, CC_DIGIT, CC_GRAPH, CC_LOWER,
-	CC_PRINT, CC_PUNCT, CC_SPACE, CC_UPPER, CC_XDIGIT
-    };
-    
-
-    /*
-     * Extract the class name
-     */
-
-    len = endp - startp;
-    Tcl_DStringInit(&ds);
-    np = Tcl_UniCharToUtfDString(startp, (int)len, &ds);
-
-    /*
-     * Remap lower and upper to alpha if the match is case insensitive.
-     */
-
-    if (cases && len == 5 && (strncmp("lower", np, 5) == 0
-	    || strncmp("upper", np, 5) == 0)) {
-	np = "alpha";
-    }
-
-    /*
-     * Map the name to the corresponding enumerated value.
-     */
-
-    index = -1;
-    for (namePtr = classNames, i = 0; *namePtr != NULL; namePtr++, i++) {
-	if ((strlen(*namePtr) == len) && (strncmp(*namePtr, np, len) == 0)) {
-	    index = i;
-	    break;
-	}
-    }
-    Tcl_DStringInit(&ds);
-    if (index == -1) {
-	ERR(REG_ECTYPE);
-	return NULL;
-    }
-    
-    /*
-     * Now compute the character class contents.
-     */
-
-    switch((enum classes) index) {
-	case CC_PRINT:
-	case CC_ALNUM:
-	    cv = getcvec(v, 0, NUM_DIGIT + NUM_ALPHA, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_ALPHA; i++) {
-		    addrange(cv, alphaTable[i].start, alphaTable[i].end);
-		}
-		for (i = 0; i < NUM_DIGIT; i++) {
-		    addrange(cv, digitTable[i].start, digitTable[i].end);
-		}
-	    }
-	    break;
-	case CC_ALPHA:
-	    cv = getcvec(v, 0, NUM_ALPHA, 0);
-	    if (cv) {
-		for (i = 0; i < NUM_ALPHA; i++) {
-		    addrange(cv, alphaTable[i].start, alphaTable[i].end);
-		}
-	    }
-	    break;
-	case CC_BLANK:
-	    cv = getcvec(v, 2, 0, 0);
-	    addchr(cv, '\t');
-	    addchr(cv, ' ');
-	    break;
-	case CC_CNTRL:
-	    cv = getcvec(v, 0, 2, 0);
-	    addrange(cv, 0x0, 0x1f);
-	    addrange(cv, 0x7f, 0x9f);
-	    break;
-	case CC_DIGIT:
-	    cv = getcvec(v, 0, NUM_DIGIT, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_DIGIT; i++) {
-		    addrange(cv, digitTable[i].start, digitTable[i].end);
-		}
-	    }
-	    break;
-	case CC_PUNCT:
-	    cv = getcvec(v, 0, NUM_PUNCT, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_PUNCT; i++) {
-		    addrange(cv, punctTable[i].start, punctTable[i].end);
-		}
-	    }
-	    break;
-	case CC_XDIGIT:
-	    cv = getcvec(v, 0, NUM_DIGIT+2, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_DIGIT; i++) {
-		    addrange(cv, digitTable[i].start, digitTable[i].end);
-		}
-		addrange(cv, 'a', 'f');
-		addrange(cv, 'A', 'F');
-	    }
-	    break;
-	case CC_SPACE:
-	    cv = getcvec(v, 0, NUM_SPACE, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_SPACE; i++) {
-		    addrange(cv, spaceTable[i].start, spaceTable[i].end);
-		}
-	    }
-	    break;
-	case CC_LOWER:
-	    cv  = getcvec(v, NUM_LOWER_CHAR, NUM_LOWER_RANGE, 0);
-	    if (cv) {
-		for (i = 0; i < NUM_LOWER_RANGE; i++) {
-		    addrange(cv, lowerRangeTable[i].start,
-			     lowerRangeTable[i].end);
-		}
-		for (i = 0; i < NUM_LOWER_CHAR; i++) {
-		    addchr(cv, lowerCharTable[i]);
-		}
-	    }
-	    break;
-	case CC_UPPER:
-	    cv  = getcvec(v, NUM_UPPER_CHAR, NUM_UPPER_RANGE, 0);
-	    if (cv) {
-		for (i = 0; i < NUM_UPPER_RANGE; i++) {
-		    addrange(cv, upperRangeTable[i].start,
-			     upperRangeTable[i].end);
-		}
-		for (i = 0; i < NUM_UPPER_CHAR; i++) {
-		    addchr(cv, upperCharTable[i]);
-		}
-	    }
-	    break;
-	case CC_GRAPH:
-	    cv = getcvec(v, 0, NUM_GRAPH, 0);
-	    if (cv) {	
-		for (i = 0; i < NUM_GRAPH; i++) {
-		    addrange(cv, graphTable[i].start, graphTable[i].end);
-		}
-	    }
-	    break;
-    }
-    if (cv == NULL) {
-	ERR(REG_ESPACE);
-    }
-    return cv;
-}
-
-/*
- - allcases - supply cvec for all case counterparts of a chr (including itself)
- * This is a shortcut, preferably an efficient one, for simple characters;
- * messy cases are done via range().
- ^ static struct cvec *allcases(struct vars *, pchr);
- */
-static struct cvec *
-allcases(v, pc)
-struct vars *v;
-pchr pc;
-{
-	struct cvec *cv;
-	chr c = (chr)pc;
-	chr lc, uc, tc;
-
-	lc = Tcl_UniCharToLower((chr)c);
-	uc = Tcl_UniCharToUpper((chr)c);
-	tc = Tcl_UniCharToTitle((chr)c);
-
-	if (tc != uc) {
-	    cv = getcvec(v, 3, 0, 0);
-	    addchr(cv, tc);
-	} else {
-	    cv = getcvec(v, 2, 0, 0);
-	}
-	addchr(cv, lc);
-	if (lc != uc) {
-	    addchr(cv, uc);
-	}
-	return cv;
-}
-
-/*
- - cmp - chr-substring compare
- * Backrefs need this.  It should preferably be efficient.
- * Note that it does not need to report anything except equal/unequal.
- * Note also that the length is exact, and the comparison should not
- * stop at embedded NULs!
- ^ static int cmp(CONST chr *, CONST chr *, size_t);
- */
-static int			/* 0 for equal, nonzero for unequal */
-cmp(x, y, len)
-CONST chr *x;
-CONST chr *y;
-size_t len;			/* exact length of comparison */
-{
-	return memcmp(VS(x), VS(y), len*sizeof(chr));
-}
-
-/*
- - casecmp - case-independent chr-substring compare
- * REG_ICASE backrefs need this.  It should preferably be efficient.
- * Note that it does not need to report anything except equal/unequal.
- * Note also that the length is exact, and the comparison should not
- * stop at embedded NULs!
- ^ static int casecmp(CONST chr *, CONST chr *, size_t);
- */
-static int			/* 0 for equal, nonzero for unequal */
-casecmp(x, y, len)
-CONST chr *x;
-CONST chr *y;
-size_t len;			/* exact length of comparison */
-{
-	size_t i;
-	CONST chr *xp;
-	CONST chr *yp;
-
-	for (xp = x, yp = y, i = len; i > 0; i--)
-		if (Tcl_UniCharToLower(*xp++) != Tcl_UniCharToLower(*yp++))
-			return 1;
-	return 0;
-}
diff --git a/generic/regc_nfa.c b/generic/regc_nfa.c
deleted file mode 100644
index 80e9ac7..0000000
--- a/generic/regc_nfa.c
+++ /dev/null
@@ -1,1528 +0,0 @@
-/*
- * NFA utilities.
- * This file is #included by regcomp.c.
- *
- * One or two things that technically ought to be in here
- * are actually in color.c, thanks to some incestuous relationships in
- * the color chains.
- */
-
-#define	NISERR()	VISERR(nfa->v)
-#define	NERR(e)		VERR(nfa->v, (e))
-
-
-/*
- - newnfa - set up an NFA
- ^ static struct nfa *newnfa(struct vars *, struct colormap *, struct nfa *);
- */
-static struct nfa *		/* the NFA, or NULL */
-newnfa(v, cm, parent)
-struct vars *v;
-struct colormap *cm;
-struct nfa *parent;		/* NULL if primary NFA */
-{
-	struct nfa *nfa;
-
-	nfa = (struct nfa *)MALLOC(sizeof(struct nfa));
-	if (nfa == NULL)
-		return NULL;
-
-	nfa->states = NULL;
-	nfa->slast = NULL;
-	nfa->free = NULL;
-	nfa->nstates = 0;
-	nfa->cm = cm;
-	nfa->v = v;
-	nfa->bos[0] = nfa->bos[1] = COLORLESS;
-	nfa->eos[0] = nfa->eos[1] = COLORLESS;
-	nfa->post = newfstate(nfa, '@');	/* number 0 */
-	nfa->pre = newfstate(nfa, '>');		/* number 1 */
-	nfa->parent = parent;
-
-	nfa->init = newstate(nfa);		/* may become invalid later */
-	nfa->final = newstate(nfa);
-	if (ISERR()) {
-		freenfa(nfa);
-		return NULL;
-	}
-	rainbow(nfa, nfa->cm, PLAIN, COLORLESS, nfa->pre, nfa->init);
-	newarc(nfa, '^', 1, nfa->pre, nfa->init);
-	newarc(nfa, '^', 0, nfa->pre, nfa->init);
-	rainbow(nfa, nfa->cm, PLAIN, COLORLESS, nfa->final, nfa->post);
-	newarc(nfa, '$', 1, nfa->final, nfa->post);
-	newarc(nfa, '$', 0, nfa->final, nfa->post);
-
-	if (ISERR()) {
-		freenfa(nfa);
-		return NULL;
-	}
-	return nfa;
-}
-
-/*
- - freenfa - free an entire NFA
- ^ static VOID freenfa(struct nfa *);
- */
-static VOID
-freenfa(nfa)
-struct nfa *nfa;
-{
-	struct state *s;
-
-	while ((s = nfa->states) != NULL) {
-		s->nins = s->nouts = 0;		/* don't worry about arcs */
-		freestate(nfa, s);
-	}
-	while ((s = nfa->free) != NULL) {
-		nfa->free = s->next;
-		destroystate(nfa, s);
-	}
-
-	nfa->slast = NULL;
-	nfa->nstates = -1;
-	nfa->pre = NULL;
-	nfa->post = NULL;
-	FREE(nfa);
-}
-
-/*
- - newfstate - allocate an NFA state, with specified flag value
- ^ static struct state *newfstate(struct nfa *, int flag);
- */
-static struct state *		/* NULL on error */
-newfstate(nfa, flag)
-struct nfa *nfa;
-int flag;
-{
-	struct state *s;
-	int i;
-
-	if (nfa->free != NULL) {
-		s = nfa->free;
-		nfa->free = s->next;
-	} else {
-		s = (struct state *)MALLOC(sizeof(struct state));
-		if (s == NULL) {
-			NERR(REG_ESPACE);
-			return NULL;
-		}
-		s->oas.next = NULL;
-		s->free = &s->oas.a[0];
-		for (i = 0; i < ABSIZE; i++) {
-			s->oas.a[i].type = 0;
-			s->oas.a[i].freechain = &s->oas.a[i+1];
-		}
-		s->oas.a[ABSIZE-1].freechain = NULL;
-	}
-
-	assert(nfa->nstates >= 0);
-	s->no = nfa->nstates++;
-	s->flag = (char)flag;
-	if (nfa->states == NULL)
-		nfa->states = s;
-	s->nins = 0;
-	s->ins = NULL;
-	s->nouts = 0;
-	s->outs = NULL;
-	s->tmp = NULL;
-	s->next = NULL;
-	if (nfa->slast != NULL) {
-		assert(nfa->slast->next == NULL);
-		nfa->slast->next = s;
-	}
-	s->prev = nfa->slast;
-	nfa->slast = s;
-	return s;
-}
-
-/*
- - newstate - allocate an ordinary NFA state
- ^ static struct state *newstate(struct nfa *);
- */
-static struct state *		/* NULL on error */
-newstate(nfa)
-struct nfa *nfa;
-{
-	return newfstate(nfa, 0);
-}
-
-/*
- - dropstate - delete a state's inarcs and outarcs and free it
- ^ static VOID dropstate(struct nfa *, struct state *);
- */
-static VOID
-dropstate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-
-	while ((a = s->ins) != NULL)
-		freearc(nfa, a);
-	while ((a = s->outs) != NULL)
-		freearc(nfa, a);
-	freestate(nfa, s);
-}
-
-/*
- - freestate - free a state, which has no in-arcs or out-arcs
- ^ static VOID freestate(struct nfa *, struct state *);
- */
-static VOID
-freestate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	assert(s != NULL);
-	assert(s->nins == 0 && s->nouts == 0);
-
-	s->no = FREESTATE;
-	s->flag = 0;
-	if (s->next != NULL)
-		s->next->prev = s->prev;
-	else {
-		assert(s == nfa->slast);
-		nfa->slast = s->prev;
-	}
-	if (s->prev != NULL)
-		s->prev->next = s->next;
-	else {
-		assert(s == nfa->states);
-		nfa->states = s->next;
-	}
-	s->prev = NULL;
-	s->next = nfa->free;	/* don't delete it, put it on the free list */
-	nfa->free = s;
-}
-
-/*
- - destroystate - really get rid of an already-freed state
- ^ static VOID destroystate(struct nfa *, struct state *);
- */
-static VOID
-destroystate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arcbatch *ab;
-	struct arcbatch *abnext;
-
-	assert(s->no == FREESTATE);
-	for (ab = s->oas.next; ab != NULL; ab = abnext) {
-		abnext = ab->next;
-		FREE(ab);
-	}
-	s->ins = NULL;
-	s->outs = NULL;
-	s->next = NULL;
-	FREE(s);
-}
-
-/*
- - newarc - set up a new arc within an NFA
- ^ static VOID newarc(struct nfa *, int, pcolor, struct state *, 
- ^	struct state *);
- */
-static VOID
-newarc(nfa, t, co, from, to)
-struct nfa *nfa;
-int t;
-pcolor co;
-struct state *from;
-struct state *to;
-{
-	struct arc *a;
-
-	assert(from != NULL && to != NULL);
-
-	/* check for duplicates */
-	for (a = from->outs; a != NULL; a = a->outchain)
-		if (a->type == t && a->co == co && a->to == to)
-			return;
-
-	a = allocarc(nfa, from);
-	if (NISERR())
-		return;
-	assert(a != NULL);
-
-	a->type = t;
-	a->co = (color)co;
-	a->to = to;
-	a->from = from;
-
-	/*
-	 * Put the new arc on the beginning, not the end, of the chains.
-	 * Not only is this easier, it has the very useful side effect that 
-	 * deleting the most-recently-added arc is the cheapest case rather
-	 * than the most expensive one.
-	 */
-	a->inchain = to->ins;
-	to->ins = a;
-	a->outchain = from->outs;
-	from->outs = a;
-
-	from->nouts++;
-	to->nins++;
-
-	if (COLORED(a) && nfa->parent == NULL)
-		colorchain(nfa->cm, a);
-
-	return;
-}
-
-/*
- - allocarc - allocate a new out-arc within a state
- ^ static struct arc *allocarc(struct nfa *, struct state *);
- */
-static struct arc *		/* NULL for failure */
-allocarc(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-	struct arcbatch *new;
-	int i;
-
-	/* if none at hand, get more */
-	if (s->free == NULL) {
-		new = (struct arcbatch *)MALLOC(sizeof(struct arcbatch));
-		if (new == NULL) {
-			NERR(REG_ESPACE);
-			return NULL;
-		}
-		new->next = s->oas.next;
-		s->oas.next = new;
-
-		for (i = 0; i < ABSIZE; i++) {
-			new->a[i].type = 0;
-			new->a[i].freechain = &new->a[i+1];
-		}
-		new->a[ABSIZE-1].freechain = NULL;
-		s->free = &new->a[0];
-	}
-	assert(s->free != NULL);
-
-	a = s->free;
-	s->free = a->freechain;
-	return a;
-}
-
-/*
- - freearc - free an arc
- ^ static VOID freearc(struct nfa *, struct arc *);
- */
-static VOID
-freearc(nfa, victim)
-struct nfa *nfa;
-struct arc *victim;
-{
-	struct state *from = victim->from;
-	struct state *to = victim->to;
-	struct arc *a;
-
-	assert(victim->type != 0);
-
-	/* take it off color chain if necessary */
-	if (COLORED(victim) && nfa->parent == NULL)
-		uncolorchain(nfa->cm, victim);
-
-	/* take it off source's out-chain */
-	assert(from != NULL);
-	assert(from->outs != NULL);
-	a = from->outs;
-	if (a == victim)		/* simple case:  first in chain */
-		from->outs = victim->outchain;
-	else {
-		for (; a != NULL && a->outchain != victim; a = a->outchain)
-			continue;
-		assert(a != NULL);
-		a->outchain = victim->outchain;
-	}
-	from->nouts--;
-
-	/* take it off target's in-chain */
-	assert(to != NULL);
-	assert(to->ins != NULL);
-	a = to->ins;
-	if (a == victim)		/* simple case:  first in chain */
-		to->ins = victim->inchain;
-	else {
-		for (; a != NULL && a->inchain != victim; a = a->inchain)
-			continue;
-		assert(a != NULL);
-		a->inchain = victim->inchain;
-	}
-	to->nins--;
-
-	/* clean up and place on free list */
-	victim->type = 0;
-	victim->from = NULL;		/* precautions... */
-	victim->to = NULL;
-	victim->inchain = NULL;
-	victim->outchain = NULL;
-	victim->freechain = from->free;
-	from->free = victim;
-}
-
-/*
- - findarc - find arc, if any, from given source with given type and color
- * If there is more than one such arc, the result is random.
- ^ static struct arc *findarc(struct state *, int, pcolor);
- */
-static struct arc *
-findarc(s, type, co)
-struct state *s;
-int type;
-pcolor co;
-{
-	struct arc *a;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		if (a->type == type && a->co == co)
-			return a;
-	return NULL;
-}
-
-/*
- - cparc - allocate a new arc within an NFA, copying details from old one
- ^ static VOID cparc(struct nfa *, struct arc *, struct state *, 
- ^ 	struct state *);
- */
-static VOID
-cparc(nfa, oa, from, to)
-struct nfa *nfa;
-struct arc *oa;
-struct state *from;
-struct state *to;
-{
-	newarc(nfa, oa->type, oa->co, from, to);
-}
-
-/*
- - moveins - move all in arcs of a state to another state
- * You might think this could be done better by just updating the
- * existing arcs, and you would be right if it weren't for the desire
- * for duplicate suppression, which makes it easier to just make new
- * ones to exploit the suppression built into newarc.
- ^ static VOID moveins(struct nfa *, struct state *, struct state *);
- */
-static VOID
-moveins(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	while ((a = old->ins) != NULL) {
-		cparc(nfa, a, a->from, new);
-		freearc(nfa, a);
-	}
-	assert(old->nins == 0);
-	assert(old->ins == NULL);
-}
-
-/*
- - copyins - copy all in arcs of a state to another state
- ^ static VOID copyins(struct nfa *, struct state *, struct state *);
- */
-static VOID
-copyins(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	for (a = old->ins; a != NULL; a = a->inchain)
-		cparc(nfa, a, a->from, new);
-}
-
-/*
- - moveouts - move all out arcs of a state to another state
- ^ static VOID moveouts(struct nfa *, struct state *, struct state *);
- */
-static VOID
-moveouts(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	while ((a = old->outs) != NULL) {
-		cparc(nfa, a, new, a->to);
-		freearc(nfa, a);
-	}
-}
-
-/*
- - copyouts - copy all out arcs of a state to another state
- ^ static VOID copyouts(struct nfa *, struct state *, struct state *);
- */
-static VOID
-copyouts(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	for (a = old->outs; a != NULL; a = a->outchain)
-		cparc(nfa, a, new, a->to);
-}
-
-/*
- - cloneouts - copy out arcs of a state to another state pair, modifying type
- ^ static VOID cloneouts(struct nfa *, struct state *, struct state *,
- ^ 	struct state *, int);
- */
-static VOID
-cloneouts(nfa, old, from, to, type)
-struct nfa *nfa;
-struct state *old;
-struct state *from;
-struct state *to;
-int type;
-{
-	struct arc *a;
-
-	assert(old != from);
-
-	for (a = old->outs; a != NULL; a = a->outchain)
-		newarc(nfa, type, a->co, from, to);
-}
-
-/*
- - delsub - delete a sub-NFA, updating subre pointers if necessary
- * This uses a recursive traversal of the sub-NFA, marking already-seen
- * states using their tmp pointer.
- ^ static VOID delsub(struct nfa *, struct state *, struct state *);
- */
-static VOID
-delsub(nfa, lp, rp)
-struct nfa *nfa;
-struct state *lp;	/* the sub-NFA goes from here... */
-struct state *rp;	/* ...to here, *not* inclusive */
-{
-	assert(lp != rp);
-
-	rp->tmp = rp;			/* mark end */
-
-	deltraverse(nfa, lp, lp);
-	assert(lp->nouts == 0 && rp->nins == 0);	/* did the job */
-	assert(lp->no != FREESTATE && rp->no != FREESTATE);	/* no more */
-
-	rp->tmp = NULL;			/* unmark end */
-	lp->tmp = NULL;			/* and begin, marked by deltraverse */
-}
-
-/*
- - deltraverse - the recursive heart of delsub
- * This routine's basic job is to destroy all out-arcs of the state.
- ^ static VOID deltraverse(struct nfa *, struct state *, struct state *);
- */
-static VOID
-deltraverse(nfa, leftend, s)
-struct nfa *nfa;
-struct state *leftend;
-struct state *s;
-{
-	struct arc *a;
-	struct state *to;
-
-	if (s->nouts == 0)
-		return;			/* nothing to do */
-	if (s->tmp != NULL)
-		return;			/* already in progress */
-
-	s->tmp = s;			/* mark as in progress */
-
-	while ((a = s->outs) != NULL) {
-		to = a->to;
-		deltraverse(nfa, leftend, to);
-		assert(to->nouts == 0 || to->tmp != NULL);
-		freearc(nfa, a);
-		if (to->nins == 0 && to->tmp == NULL) {
-			assert(to->nouts == 0);
-			freestate(nfa, to);
-		}
-	}
-
-	assert(s->no != FREESTATE);	/* we're still here */
-	assert(s == leftend || s->nins != 0);	/* and still reachable */
-	assert(s->nouts == 0);		/* but have no outarcs */
-
-	s->tmp = NULL;			/* we're done here */
-}
-
-/*
- - dupnfa - duplicate sub-NFA
- * Another recursive traversal, this time using tmp to point to duplicates
- * as well as mark already-seen states.  (You knew there was a reason why
- * it's a state pointer, didn't you? :-))
- ^ static VOID dupnfa(struct nfa *, struct state *, struct state *, 
- ^ 	struct state *, struct state *);
- */
-static VOID
-dupnfa(nfa, start, stop, from, to)
-struct nfa *nfa;
-struct state *start;		/* duplicate of subNFA starting here */
-struct state *stop;		/* and stopping here */
-struct state *from;		/* stringing duplicate from here */
-struct state *to;		/* to here */
-{
-	if (start == stop) {
-		newarc(nfa, EMPTY, 0, from, to);
-		return;
-	}
-
-	stop->tmp = to;
-	duptraverse(nfa, start, from);
-	/* done, except for clearing out the tmp pointers */
-
-	stop->tmp = NULL;
-	cleartraverse(nfa, start);
-}
-
-/*
- - duptraverse - recursive heart of dupnfa
- ^ static VOID duptraverse(struct nfa *, struct state *, struct state *);
- */
-static VOID
-duptraverse(nfa, s, stmp)
-struct nfa *nfa;
-struct state *s;
-struct state *stmp;		/* s's duplicate, or NULL */
-{
-	struct arc *a;
-
-	if (s->tmp != NULL)
-		return;		/* already done */
-
-	s->tmp = (stmp == NULL) ? newstate(nfa) : stmp;
-	if (s->tmp == NULL) {
-		assert(NISERR());
-		return;
-	}
-
-	for (a = s->outs; a != NULL && !NISERR(); a = a->outchain) {
-		duptraverse(nfa, a->to, (struct state *)NULL);
-		assert(a->to->tmp != NULL);
-		cparc(nfa, a, s->tmp, a->to->tmp);
-	}
-}
-
-/*
- - cleartraverse - recursive cleanup for algorithms that leave tmp ptrs set
- ^ static VOID cleartraverse(struct nfa *, struct state *);
- */
-static VOID
-cleartraverse(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-
-	if (s->tmp == NULL)
-		return;
-	s->tmp = NULL;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		cleartraverse(nfa, a->to);
-}
-
-/*
- - specialcolors - fill in special colors for an NFA
- ^ static VOID specialcolors(struct nfa *);
- */
-static VOID
-specialcolors(nfa)
-struct nfa *nfa;
-{
-	/* false colors for BOS, BOL, EOS, EOL */
-	if (nfa->parent == NULL) {
-		nfa->bos[0] = pseudocolor(nfa->cm);
-		nfa->bos[1] = pseudocolor(nfa->cm);
-		nfa->eos[0] = pseudocolor(nfa->cm);
-		nfa->eos[1] = pseudocolor(nfa->cm);
-	} else {
-		assert(nfa->parent->bos[0] != COLORLESS);
-		nfa->bos[0] = nfa->parent->bos[0];
-		assert(nfa->parent->bos[1] != COLORLESS);
-		nfa->bos[1] = nfa->parent->bos[1];
-		assert(nfa->parent->eos[0] != COLORLESS);
-		nfa->eos[0] = nfa->parent->eos[0];
-		assert(nfa->parent->eos[1] != COLORLESS);
-		nfa->eos[1] = nfa->parent->eos[1];
-	}
-}
-
-/*
- - optimize - optimize an NFA
- ^ static int optimize(struct nfa *, FILE *);
- */
-static int			/* re_info bits */
-optimize(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	int verbose = (f != NULL) ? 1 : 0;
-
-	if (verbose)
-		fprintf(f, "\ninitial cleanup:\n");
-	cleanup(nfa);		/* may simplify situation */
-	if (verbose)
-		dumpnfa(nfa, f);
-	if (verbose)
-		fprintf(f, "\nempties:\n");
-	fixempties(nfa, f);	/* get rid of EMPTY arcs */
-	if (verbose)
-		fprintf(f, "\nconstraints:\n");
-	pullback(nfa, f);	/* pull back constraints backward */
-	pushfwd(nfa, f);	/* push fwd constraints forward */
-	if (verbose)
-		fprintf(f, "\nfinal cleanup:\n");
-	cleanup(nfa);		/* final tidying */
-	return analyze(nfa);	/* and analysis */
-}
-
-/*
- - pullback - pull back constraints backward to (with luck) eliminate them
- ^ static VOID pullback(struct nfa *, FILE *);
- */
-static VOID
-pullback(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and pull until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->outs; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->outchain;
-				if (a->type == '^' || a->type == BEHIND)
-					if (pull(nfa, a))
-						progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-	if (NISERR())
-		return;
-
-	for (a = nfa->pre->outs; a != NULL; a = nexta) {
-		nexta = a->outchain;
-		if (a->type == '^') {
-			assert(a->co == 0 || a->co == 1);
-			newarc(nfa, PLAIN, nfa->bos[a->co], a->from, a->to);
-			freearc(nfa, a);
-		}
-	}
-}
-
-/*
- - pull - pull a back constraint backward past its source state
- * A significant property of this function is that it deletes at most
- * one state -- the constraint's from state -- and only if the constraint
- * was that state's last outarc.
- ^ static int pull(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-pull(nfa, con)
-struct nfa *nfa;
-struct arc *con;
-{
-	struct state *from = con->from;
-	struct state *to = con->to;
-	struct arc *a;
-	struct arc *nexta;
-	struct state *s;
-
-	if (from == to) {	/* circular constraint is pointless */
-		freearc(nfa, con);
-		return 1;
-	}
-	if (from->flag)		/* can't pull back beyond start */
-		return 0;
-	if (from->nins == 0) {	/* unreachable */
-		freearc(nfa, con);
-		return 1;
-	}
-
-	/* first, clone from state if necessary to avoid other outarcs */
-	if (from->nouts > 1) {
-		s = newstate(nfa);
-		if (NISERR())
-			return 0;
-		assert(to != from);		/* con is not an inarc */
-		copyins(nfa, from, s);		/* duplicate inarcs */
-		cparc(nfa, con, s, to);		/* move constraint arc */
-		freearc(nfa, con);
-		from = s;
-		con = from->outs;
-	}
-	assert(from->nouts == 1);
-
-	/* propagate the constraint into the from state's inarcs */
-	for (a = from->ins; a != NULL; a = nexta) {
-		nexta = a->inchain;
-		switch (combine(con, a)) {
-		case INCOMPATIBLE:	/* destroy the arc */
-			freearc(nfa, a);
-			break;
-		case SATISFIED:		/* no action needed */
-			break;
-		case COMPATIBLE:	/* swap the two arcs, more or less */
-			s = newstate(nfa);
-			if (NISERR())
-				return 0;
-			cparc(nfa, a, s, to);		/* anticipate move */
-			cparc(nfa, con, a->from, s);
-			if (NISERR())
-				return 0;
-			freearc(nfa, a);
-			break;
-		default:
-			assert(NOTREACHED);
-			break;
-		}
-	}
-
-	/* remaining inarcs, if any, incorporate the constraint */
-	moveins(nfa, from, to);
-	dropstate(nfa, from);		/* will free the constraint */
-	return 1;
-}
-
-/*
- - pushfwd - push forward constraints forward to (with luck) eliminate them
- ^ static VOID pushfwd(struct nfa *, FILE *);
- */
-static VOID
-pushfwd(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and push until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->ins; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->inchain;
-				if (a->type == '$' || a->type == AHEAD)
-					if (push(nfa, a))
-						progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-	if (NISERR())
-		return;
-
-	for (a = nfa->post->ins; a != NULL; a = nexta) {
-		nexta = a->inchain;
-		if (a->type == '$') {
-			assert(a->co == 0 || a->co == 1);
-			newarc(nfa, PLAIN, nfa->eos[a->co], a->from, a->to);
-			freearc(nfa, a);
-		}
-	}
-}
-
-/*
- - push - push a forward constraint forward past its destination state
- * A significant property of this function is that it deletes at most
- * one state -- the constraint's to state -- and only if the constraint
- * was that state's last inarc.
- ^ static int push(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-push(nfa, con)
-struct nfa *nfa;
-struct arc *con;
-{
-	struct state *from = con->from;
-	struct state *to = con->to;
-	struct arc *a;
-	struct arc *nexta;
-	struct state *s;
-
-	if (to == from) {	/* circular constraint is pointless */
-		freearc(nfa, con);
-		return 1;
-	}
-	if (to->flag)		/* can't push forward beyond end */
-		return 0;
-	if (to->nouts == 0) {	/* dead end */
-		freearc(nfa, con);
-		return 1;
-	}
-
-	/* first, clone to state if necessary to avoid other inarcs */
-	if (to->nins > 1) {
-		s = newstate(nfa);
-		if (NISERR())
-			return 0;
-		copyouts(nfa, to, s);		/* duplicate outarcs */
-		cparc(nfa, con, from, s);	/* move constraint */
-		freearc(nfa, con);
-		to = s;
-		con = to->ins;
-	}
-	assert(to->nins == 1);
-
-	/* propagate the constraint into the to state's outarcs */
-	for (a = to->outs; a != NULL; a = nexta) {
-		nexta = a->outchain;
-		switch (combine(con, a)) {
-		case INCOMPATIBLE:	/* destroy the arc */
-			freearc(nfa, a);
-			break;
-		case SATISFIED:		/* no action needed */
-			break;
-		case COMPATIBLE:	/* swap the two arcs, more or less */
-			s = newstate(nfa);
-			if (NISERR())
-				return 0;
-			cparc(nfa, con, s, a->to);	/* anticipate move */
-			cparc(nfa, a, from, s);
-			if (NISERR())
-				return 0;
-			freearc(nfa, a);
-			break;
-		default:
-			assert(NOTREACHED);
-			break;
-		}
-	}
-
-	/* remaining outarcs, if any, incorporate the constraint */
-	moveouts(nfa, to, from);
-	dropstate(nfa, to);		/* will free the constraint */
-	return 1;
-}
-
-/*
- - combine - constraint lands on an arc, what happens?
- ^ #def	INCOMPATIBLE	1	// destroys arc
- ^ #def	SATISFIED	2	// constraint satisfied
- ^ #def	COMPATIBLE	3	// compatible but not satisfied yet
- ^ static int combine(struct arc *, struct arc *);
- */
-static int
-combine(con, a)
-struct arc *con;
-struct arc *a;
-{
-#	define	CA(ct,at)	(((ct)<<CHAR_BIT) | (at))
-
-	switch (CA(con->type, a->type)) {
-	case CA('^', PLAIN):		/* newlines are handled separately */
-	case CA('$', PLAIN):
-		return INCOMPATIBLE;
-		break;
-	case CA(AHEAD, PLAIN):		/* color constraints meet colors */
-	case CA(BEHIND, PLAIN):
-		if (con->co == a->co)
-			return SATISFIED;
-		return INCOMPATIBLE;
-		break;
-	case CA('^', '^'):		/* collision, similar constraints */
-	case CA('$', '$'):
-	case CA(AHEAD, AHEAD):
-	case CA(BEHIND, BEHIND):
-		if (con->co == a->co)		/* true duplication */
-			return SATISFIED;
-		return INCOMPATIBLE;
-		break;
-	case CA('^', BEHIND):		/* collision, dissimilar constraints */
-	case CA(BEHIND, '^'):
-	case CA('$', AHEAD):
-	case CA(AHEAD, '$'):
-		return INCOMPATIBLE;
-		break;
-	case CA('^', '$'):		/* constraints passing each other */
-	case CA('^', AHEAD):
-	case CA(BEHIND, '$'):
-	case CA(BEHIND, AHEAD):
-	case CA('$', '^'):
-	case CA('$', BEHIND):
-	case CA(AHEAD, '^'):
-	case CA(AHEAD, BEHIND):
-	case CA('^', LACON):
-	case CA(BEHIND, LACON):
-	case CA('$', LACON):
-	case CA(AHEAD, LACON):
-		return COMPATIBLE;
-		break;
-	}
-	assert(NOTREACHED);
-	return INCOMPATIBLE;		/* for benefit of blind compilers */
-}
-
-/*
- - fixempties - get rid of EMPTY arcs
- ^ static VOID fixempties(struct nfa *, FILE *);
- */
-static VOID
-fixempties(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and eliminate empties until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->outs; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->outchain;
-				if (a->type == EMPTY && unempty(nfa, a))
-					progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-}
-
-/*
- - unempty - optimize out an EMPTY arc, if possible
- * Actually, as it stands this function always succeeds, but the return
- * value is kept with an eye on possible future changes.
- ^ static int unempty(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-unempty(nfa, a)
-struct nfa *nfa;
-struct arc *a;
-{
-	struct state *from = a->from;
-	struct state *to = a->to;
-	int usefrom;		/* work on from, as opposed to to? */
-
-	assert(a->type == EMPTY);
-	assert(from != nfa->pre && to != nfa->post);
-
-	if (from == to) {		/* vacuous loop */
-		freearc(nfa, a);
-		return 1;
-	}
-
-	/* decide which end to work on */
-	usefrom = 1;			/* default:  attack from */
-	if (from->nouts > to->nins)
-		usefrom = 0;
-	else if (from->nouts == to->nins) {
-		/* decide on secondary issue:  move/copy fewest arcs */
-		if (from->nins > to->nouts)
-			usefrom = 0;
-	}
-		
-	freearc(nfa, a);
-	if (usefrom) {
-		if (from->nouts == 0) {
-			/* was the state's only outarc */
-			moveins(nfa, from, to);
-			freestate(nfa, from);
-		} else
-			copyins(nfa, from, to);
-	} else {
-		if (to->nins == 0) {
-			/* was the state's only inarc */
-			moveouts(nfa, to, from);
-			freestate(nfa, to);
-		} else
-			copyouts(nfa, to, from);
-	}
-
-	return 1;
-}
-
-/*
- - cleanup - clean up NFA after optimizations
- ^ static VOID cleanup(struct nfa *);
- */
-static VOID
-cleanup(nfa)
-struct nfa *nfa;
-{
-	struct state *s;
-	struct state *nexts;
-	int n;
-
-	/* clear out unreachable or dead-end states */
-	/* use pre to mark reachable, then post to mark can-reach-post */
-	markreachable(nfa, nfa->pre, (struct state *)NULL, nfa->pre);
-	markcanreach(nfa, nfa->post, nfa->pre, nfa->post);
-	for (s = nfa->states; s != NULL; s = nexts) {
-		nexts = s->next;
-		if (s->tmp != nfa->post && !s->flag)
-			dropstate(nfa, s);
-	}
-	assert(nfa->post->nins == 0 || nfa->post->tmp == nfa->post);
-	cleartraverse(nfa, nfa->pre);
-	assert(nfa->post->nins == 0 || nfa->post->tmp == NULL);
-	/* the nins==0 (final unreachable) case will be caught later */
-
-	/* renumber surviving states */
-	n = 0;
-	for (s = nfa->states; s != NULL; s = s->next)
-		s->no = n++;
-	nfa->nstates = n;
-}
-
-/*
- - markreachable - recursive marking of reachable states
- ^ static VOID markreachable(struct nfa *, struct state *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-markreachable(nfa, s, okay, mark)
-struct nfa *nfa;
-struct state *s;
-struct state *okay;		/* consider only states with this mark */
-struct state *mark;		/* the value to mark with */
-{
-	struct arc *a;
-
-	if (s->tmp != okay)
-		return;
-	s->tmp = mark;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		markreachable(nfa, a->to, okay, mark);
-}
-
-/*
- - markcanreach - recursive marking of states which can reach here
- ^ static VOID markcanreach(struct nfa *, struct state *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-markcanreach(nfa, s, okay, mark)
-struct nfa *nfa;
-struct state *s;
-struct state *okay;		/* consider only states with this mark */
-struct state *mark;		/* the value to mark with */
-{
-	struct arc *a;
-
-	if (s->tmp != okay)
-		return;
-	s->tmp = mark;
-
-	for (a = s->ins; a != NULL; a = a->inchain)
-		markcanreach(nfa, a->from, okay, mark);
-}
-
-/*
- - analyze - ascertain potentially-useful facts about an optimized NFA
- ^ static int analyze(struct nfa *);
- */
-static int			/* re_info bits to be ORed in */
-analyze(nfa)
-struct nfa *nfa;
-{
-	struct arc *a;
-	struct arc *aa;
-
-	if (nfa->pre->outs == NULL)
-		return REG_UIMPOSSIBLE;
-	for (a = nfa->pre->outs; a != NULL; a = a->outchain)
-		for (aa = a->to->outs; aa != NULL; aa = aa->outchain)
-			if (aa->to == nfa->post)
-				return REG_UEMPTYMATCH;
-	return 0;
-}
-
-/*
- - compact - compact an NFA
- ^ static VOID compact(struct nfa *, struct cnfa *);
- */
-static VOID
-compact(nfa, cnfa)
-struct nfa *nfa;
-struct cnfa *cnfa;
-{
-	struct state *s;
-	struct arc *a;
-	size_t nstates;
-	size_t narcs;
-	struct carc *ca;
-	struct carc *first;
-
-	assert (!NISERR());
-
-	nstates = 0;
-	narcs = 0;
-	for (s = nfa->states; s != NULL; s = s->next) {
-		nstates++;
-		narcs += 1 + s->nouts + 1;
-		/* 1 as a fake for flags, nouts for arcs, 1 as endmarker */
-	}
-
-	cnfa->states = (struct carc **)MALLOC(nstates * sizeof(struct carc *));
-	cnfa->arcs = (struct carc *)MALLOC(narcs * sizeof(struct carc));
-	if (cnfa->states == NULL || cnfa->arcs == NULL) {
-		if (cnfa->states != NULL)
-			FREE(cnfa->states);
-		if (cnfa->arcs != NULL)
-			FREE(cnfa->arcs);
-		NERR(REG_ESPACE);
-		return;
-	}
-	cnfa->nstates = nstates;
-	cnfa->pre = nfa->pre->no;
-	cnfa->post = nfa->post->no;
-	cnfa->bos[0] = nfa->bos[0];
-	cnfa->bos[1] = nfa->bos[1];
-	cnfa->eos[0] = nfa->eos[0];
-	cnfa->eos[1] = nfa->eos[1];
-	cnfa->ncolors = maxcolor(nfa->cm) + 1;
-	cnfa->flags = 0;
-
-	ca = cnfa->arcs;
-	for (s = nfa->states; s != NULL; s = s->next) {
-		assert((size_t)s->no < nstates);
-		cnfa->states[s->no] = ca;
-		ca->co = 0;		/* clear and skip flags "arc" */
-		ca++;
-		first = ca;
-		for (a = s->outs; a != NULL; a = a->outchain)
-			switch (a->type) {
-			case PLAIN:
-				ca->co = a->co;
-				ca->to = a->to->no;
-				ca++;
-				break;
-			case LACON:
-				assert(s->no != cnfa->pre);
-				ca->co = (color)(cnfa->ncolors + a->co);
-				ca->to = a->to->no;
-				ca++;
-				cnfa->flags |= HASLACONS;
-				break;
-			default:
-				assert(NOTREACHED);
-				break;
-			}
-		carcsort(first, ca-1);
-		ca->co = COLORLESS;
-		ca->to = 0;
-		ca++;
-	}
-	assert(ca == &cnfa->arcs[narcs]);
-	assert(cnfa->nstates != 0);
-
-	/* mark no-progress states */
-	for (a = nfa->pre->outs; a != NULL; a = a->outchain)
-		cnfa->states[a->to->no]->co = 1;
-	cnfa->states[nfa->pre->no]->co = 1;
-}
-
-/*
- - carcsort - sort compacted-NFA arcs by color
- * Really dumb algorithm, but if the list is long enough for that to matter,
- * you're in real trouble anyway.
- ^ static VOID carcsort(struct carc *, struct carc *);
- */
-static VOID
-carcsort(first, last)
-struct carc *first;
-struct carc *last;
-{
-	struct carc *p;
-	struct carc *q;
-	struct carc tmp;
-
-	if (last - first <= 1)
-		return;
-
-	for (p = first; p <= last; p++)
-		for (q = p; q <= last; q++)
-			if (p->co > q->co ||
-					(p->co == q->co && p->to > q->to)) {
-				assert(p != q);
-				tmp = *p;
-				*p = *q;
-				*q = tmp;
-			}
-}
-
-/*
- - freecnfa - free a compacted NFA
- ^ static VOID freecnfa(struct cnfa *);
- */
-static VOID
-freecnfa(cnfa)
-struct cnfa *cnfa;
-{
-	assert(cnfa->nstates != 0);	/* not empty already */
-	cnfa->nstates = 0;
-	FREE(cnfa->states);
-	FREE(cnfa->arcs);
-}
-
-/*
- - dumpnfa - dump an NFA in human-readable form
- ^ static VOID dumpnfa(struct nfa *, FILE *);
- */
-static VOID
-dumpnfa(nfa, f)
-struct nfa *nfa;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	struct state *s;
-
-	fprintf(f, "pre %d, post %d", nfa->pre->no, nfa->post->no);
-	if (nfa->bos[0] != COLORLESS)
-		fprintf(f, ", bos [%ld]", (long)nfa->bos[0]);
-	if (nfa->bos[1] != COLORLESS)
-		fprintf(f, ", bol [%ld]", (long)nfa->bos[1]);
-	if (nfa->eos[0] != COLORLESS)
-		fprintf(f, ", eos [%ld]", (long)nfa->eos[0]);
-	if (nfa->eos[1] != COLORLESS)
-		fprintf(f, ", eol [%ld]", (long)nfa->eos[1]);
-	fprintf(f, "\n");
-	for (s = nfa->states; s != NULL; s = s->next)
-		dumpstate(s, f);
-	if (nfa->parent == NULL)
-		dumpcolors(nfa->cm, f);
-	fflush(f);
-#endif
-}
-
-#ifdef REG_DEBUG		/* subordinates of dumpnfa */
-
-/*
- - dumpstate - dump an NFA state in human-readable form
- ^ static VOID dumpstate(struct state *, FILE *);
- */
-static VOID
-dumpstate(s, f)
-struct state *s;
-FILE *f;
-{
-	struct arc *a;
-
-	fprintf(f, "%d%s%c", s->no, (s->tmp != NULL) ? "T" : "",
-					(s->flag) ? s->flag : '.');
-	if (s->prev != NULL && s->prev->next != s)
-		fprintf(f, "\tstate chain bad\n");
-	if (s->nouts == 0)
-		fprintf(f, "\tno out arcs\n");
-	else
-		dumparcs(s, f);
-	fflush(f);
-	for (a = s->ins; a != NULL; a = a->inchain) {
-		if (a->to != s)
-			fprintf(f, "\tlink from %d to %d on %d's in-chain\n",
-					a->from->no, a->to->no, s->no);
-	}
-}
-
-/*
- - dumparcs - dump out-arcs in human-readable form
- ^ static VOID dumparcs(struct state *, FILE *);
- */
-static VOID
-dumparcs(s, f)
-struct state *s;
-FILE *f;
-{
-	int pos;
-
-	assert(s->nouts > 0);
-	/* printing arcs in reverse order is usually clearer */
-	pos = dumprarcs(s->outs, s, f, 1);
-	if (pos != 1)
-		fprintf(f, "\n");
-}
-
-/*
- - dumprarcs - dump remaining outarcs, recursively, in reverse order
- ^ static int dumprarcs(struct arc *, struct state *, FILE *, int);
- */
-static int			/* resulting print position */
-dumprarcs(a, s, f, pos)
-struct arc *a;
-struct state *s;
-FILE *f;
-int pos;			/* initial print position */
-{
-	if (a->outchain != NULL)
-		pos = dumprarcs(a->outchain, s, f, pos);
-	dumparc(a, s, f);
-	if (pos == 5) {
-		fprintf(f, "\n");
-		pos = 1;
-	} else
-		pos++;
-	return pos;
-}
-
-/*
- - dumparc - dump one outarc in readable form, including prefixing tab
- ^ static VOID dumparc(struct arc *, struct state *, FILE *);
- */
-static VOID
-dumparc(a, s, f)
-struct arc *a;
-struct state *s;
-FILE *f;
-{
-	struct arc *aa;
-	struct arcbatch *ab;
-
-	fprintf(f, "\t");
-	switch (a->type) {
-	case PLAIN:
-		fprintf(f, "[%ld]", (long)a->co);
-		break;
-	case AHEAD:
-		fprintf(f, ">%ld>", (long)a->co);
-		break;
-	case BEHIND:
-		fprintf(f, "<%ld<", (long)a->co);
-		break;
-	case LACON:
-		fprintf(f, ":%ld:", (long)a->co);
-		break;
-	case '^':
-	case '$':
-		fprintf(f, "%c%d", a->type, (int)a->co);
-		break;
-	case EMPTY:
-		break;
-	default:
-		fprintf(f, "0x%x/0%lo", a->type, (long)a->co);
-		break;
-	}
-	if (a->from != s)
-		fprintf(f, "?%d?", a->from->no);
-	for (ab = &a->from->oas; ab != NULL; ab = ab->next) {
-		for (aa = &ab->a[0]; aa < &ab->a[ABSIZE]; aa++)
-			if (aa == a)
-				break;		/* NOTE BREAK OUT */
-		if (aa < &ab->a[ABSIZE])	/* propagate break */
-				break;		/* NOTE BREAK OUT */
-	}
-	if (ab == NULL)
-		fprintf(f, "?!?");	/* not in allocated space */
-	fprintf(f, "->");
-	if (a->to == NULL) {
-		fprintf(f, "NULL");
-		return;
-	}
-	fprintf(f, "%d", a->to->no);
-	for (aa = a->to->ins; aa != NULL; aa = aa->inchain)
-		if (aa == a)
-			break;		/* NOTE BREAK OUT */
-	if (aa == NULL)
-		fprintf(f, "?!?");	/* missing from in-chain */
-}
-
-#endif				/* ifdef REG_DEBUG */
-
-/*
- - dumpcnfa - dump a compacted NFA in human-readable form
- ^ static VOID dumpcnfa(struct cnfa *, FILE *);
- */
-static VOID
-dumpcnfa(cnfa, f)
-struct cnfa *cnfa;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	int st;
-
-	fprintf(f, "pre %d, post %d", cnfa->pre, cnfa->post);
-	if (cnfa->bos[0] != COLORLESS)
-		fprintf(f, ", bos [%ld]", (long)cnfa->bos[0]);
-	if (cnfa->bos[1] != COLORLESS)
-		fprintf(f, ", bol [%ld]", (long)cnfa->bos[1]);
-	if (cnfa->eos[0] != COLORLESS)
-		fprintf(f, ", eos [%ld]", (long)cnfa->eos[0]);
-	if (cnfa->eos[1] != COLORLESS)
-		fprintf(f, ", eol [%ld]", (long)cnfa->eos[1]);
-	if (cnfa->flags&HASLACONS)
-		fprintf(f, ", haslacons");
-	fprintf(f, "\n");
-	for (st = 0; st < cnfa->nstates; st++)
-		dumpcstate(st, cnfa->states[st], cnfa, f);
-	fflush(f);
-#endif
-}
-
-#ifdef REG_DEBUG		/* subordinates of dumpcnfa */
-
-/*
- - dumpcstate - dump a compacted-NFA state in human-readable form
- ^ static VOID dumpcstate(int, struct carc *, struct cnfa *, FILE *);
- */
-static VOID
-dumpcstate(st, ca, cnfa, f)
-int st;
-struct carc *ca;
-struct cnfa *cnfa;
-FILE *f;
-{
-	int i;
-	int pos;
-
-	fprintf(f, "%d%s", st, (ca[0].co) ? ":" : ".");
-	pos = 1;
-	for (i = 1; ca[i].co != COLORLESS; i++) {
-		if (ca[i].co < cnfa->ncolors)
-			fprintf(f, "\t[%ld]->%d", (long)ca[i].co, ca[i].to);
-		else
-			fprintf(f, "\t:%ld:->%d", (long)ca[i].co-cnfa->ncolors,
-								ca[i].to);
-		if (pos == 5) {
-			fprintf(f, "\n");
-			pos = 1;
-		} else
-			pos++;
-	}
-	if (i == 1 || pos != 1)
-		fprintf(f, "\n");
-	fflush(f);
-}
-
-#endif				/* ifdef REG_DEBUG */
diff --git a/generic/regcomp.c b/generic/regcomp.c
deleted file mode 100644
index 8e1b61c..0000000
--- a/generic/regcomp.c
+++ /dev/null
@@ -1,2124 +0,0 @@
-/*
- * re_*comp and friends - compile REs
- * This file #includes several others (see the bottom).
- */
-
-#include "regguts.h"
-
-/*
- * forward declarations, up here so forward datatypes etc. are defined early
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regcomp.c === */
-int compile _ANSI_ARGS_((regex_t *, CONST chr *, size_t, int));
-static VOID moresubs _ANSI_ARGS_((struct vars *, int));
-static int freev _ANSI_ARGS_((struct vars *, int));
-static VOID makescan _ANSI_ARGS_((struct vars *, struct nfa *));
-static struct subre *parse _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *));
-static struct subre *parsebranch _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *, int));
-static VOID parseqatom _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *, struct subre *));
-static VOID nonword _ANSI_ARGS_((struct vars *, int, struct state *, struct state *));
-static VOID word _ANSI_ARGS_((struct vars *, int, struct state *, struct state *));
-static int scannum _ANSI_ARGS_((struct vars *));
-static VOID repeat _ANSI_ARGS_((struct vars *, struct state *, struct state *, int, int));
-static VOID bracket _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static VOID cbracket _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static VOID brackpart _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static chr *scanplain _ANSI_ARGS_((struct vars *));
-static VOID leaders _ANSI_ARGS_((struct vars *, struct cvec *));
-static VOID onechr _ANSI_ARGS_((struct vars *, pchr, struct state *, struct state *));
-static VOID dovec _ANSI_ARGS_((struct vars *, struct cvec *, struct state *, struct state *));
-static celt nextleader _ANSI_ARGS_((struct vars *, pchr, pchr));
-static VOID wordchrs _ANSI_ARGS_((struct vars *));
-static struct subre *subre _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *));
-static VOID freesubre _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID freesrnode _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID optst _ANSI_ARGS_((struct vars *, struct subre *));
-static int numst _ANSI_ARGS_((struct subre *, int));
-static VOID markst _ANSI_ARGS_((struct subre *));
-static VOID cleanst _ANSI_ARGS_((struct vars *));
-static int nfatree _ANSI_ARGS_((struct vars *, struct subre *, FILE *));
-static int nfanode _ANSI_ARGS_((struct vars *, struct subre *, FILE *));
-static int newlacon _ANSI_ARGS_((struct vars *, struct state *, struct state *, int));
-static VOID freelacons _ANSI_ARGS_((struct subre *, int));
-static VOID rfree _ANSI_ARGS_((regex_t *));
-static VOID dump _ANSI_ARGS_((regex_t *, FILE *));
-static VOID dumpst _ANSI_ARGS_((struct subre *, FILE *, int));
-static VOID stdump _ANSI_ARGS_((struct subre *, FILE *, int, int));
-/* === regc_lex.c === */
-static VOID lexstart _ANSI_ARGS_((struct vars *));
-static VOID prefixes _ANSI_ARGS_((struct vars *));
-static VOID lexnest _ANSI_ARGS_((struct vars *, chr *, chr *));
-static VOID lexword _ANSI_ARGS_((struct vars *));
-static int next _ANSI_ARGS_((struct vars *));
-static int lexescape _ANSI_ARGS_((struct vars *));
-static chr lexdigits _ANSI_ARGS_((struct vars *, int, int, int));
-static int brenext _ANSI_ARGS_((struct vars *, pchr));
-static VOID skip _ANSI_ARGS_((struct vars *));
-static chr newline _ANSI_ARGS_((NOPARMS));
-static chr chrnamed _ANSI_ARGS_((struct vars *, chr *, chr *, pchr));
-/* === regc_color.c === */
-static VOID initcm _ANSI_ARGS_((struct vars *, struct colormap *));
-static VOID freecm _ANSI_ARGS_((struct colormap *));
-static VOID cmtreefree _ANSI_ARGS_((struct colormap *, union tree *, int));
-static color setcolor _ANSI_ARGS_((struct colormap *, pchr, pcolor));
-static color maxcolor _ANSI_ARGS_((struct colormap *));
-static color newcolor _ANSI_ARGS_((struct colormap *));
-static VOID freecolor _ANSI_ARGS_((struct colormap *, pcolor));
-static color pseudocolor _ANSI_ARGS_((struct colormap *));
-static color subcolor _ANSI_ARGS_((struct colormap *, pchr c));
-static color newsub _ANSI_ARGS_((struct colormap *, pcolor));
-static VOID subrange _ANSI_ARGS_((struct vars *, pchr, pchr, struct state *, struct state *));
-static VOID subblock _ANSI_ARGS_((struct vars *, pchr, struct state *, struct state *));
-static VOID okcolors _ANSI_ARGS_((struct nfa *, struct colormap *));
-static VOID colorchain _ANSI_ARGS_((struct colormap *, struct arc *));
-static VOID uncolorchain _ANSI_ARGS_((struct colormap *, struct arc *));
-#if 0
-static int singleton _ANSI_ARGS_((struct colormap *, pchr c));
-#endif
-static VOID rainbow _ANSI_ARGS_((struct nfa *, struct colormap *, int, pcolor, struct state *, struct state *));
-static VOID colorcomplement _ANSI_ARGS_((struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *));
-#ifdef REG_DEBUG
-static VOID dumpcolors _ANSI_ARGS_((struct colormap *, FILE *));
-static VOID fillcheck _ANSI_ARGS_((struct colormap *, union tree *, int, FILE *));
-static VOID dumpchr _ANSI_ARGS_((pchr, FILE *));
-#endif
-/* === regc_nfa.c === */
-static struct nfa *newnfa _ANSI_ARGS_((struct vars *, struct colormap *, struct nfa *));
-static VOID freenfa _ANSI_ARGS_((struct nfa *));
-static struct state *newfstate _ANSI_ARGS_((struct nfa *, int flag));
-static struct state *newstate _ANSI_ARGS_((struct nfa *));
-static VOID dropstate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID freestate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID destroystate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID newarc _ANSI_ARGS_((struct nfa *, int, pcolor, struct state *, struct state *));
-static struct arc *allocarc _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID freearc _ANSI_ARGS_((struct nfa *, struct arc *));
-static struct arc *findarc _ANSI_ARGS_((struct state *, int, pcolor));
-static VOID cparc _ANSI_ARGS_((struct nfa *, struct arc *, struct state *, struct state *));
-static VOID moveins _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID copyins _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID moveouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID copyouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID cloneouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *, int));
-static VOID delsub _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID deltraverse _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID dupnfa _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *, struct state *));
-static VOID duptraverse _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID cleartraverse _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID specialcolors _ANSI_ARGS_((struct nfa *));
-static int optimize _ANSI_ARGS_((struct nfa *, FILE *));
-static VOID pullback _ANSI_ARGS_((struct nfa *, FILE *));
-static int pull _ANSI_ARGS_((struct nfa *, struct arc *));
-static VOID pushfwd _ANSI_ARGS_((struct nfa *, FILE *));
-static int push _ANSI_ARGS_((struct nfa *, struct arc *));
-#define	INCOMPATIBLE	1	/* destroys arc */
-#define	SATISFIED	2	/* constraint satisfied */
-#define	COMPATIBLE	3	/* compatible but not satisfied yet */
-static int combine _ANSI_ARGS_((struct arc *, struct arc *));
-static VOID fixempties _ANSI_ARGS_((struct nfa *, FILE *));
-static int unempty _ANSI_ARGS_((struct nfa *, struct arc *));
-static VOID cleanup _ANSI_ARGS_((struct nfa *));
-static VOID markreachable _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *));
-static VOID markcanreach _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *));
-static int analyze _ANSI_ARGS_((struct nfa *));
-static VOID compact _ANSI_ARGS_((struct nfa *, struct cnfa *));
-static VOID carcsort _ANSI_ARGS_((struct carc *, struct carc *));
-static VOID freecnfa _ANSI_ARGS_((struct cnfa *));
-static VOID dumpnfa _ANSI_ARGS_((struct nfa *, FILE *));
-#ifdef REG_DEBUG
-static VOID dumpstate _ANSI_ARGS_((struct state *, FILE *));
-static VOID dumparcs _ANSI_ARGS_((struct state *, FILE *));
-static int dumprarcs _ANSI_ARGS_((struct arc *, struct state *, FILE *, int));
-static VOID dumparc _ANSI_ARGS_((struct arc *, struct state *, FILE *));
-#endif
-static VOID dumpcnfa _ANSI_ARGS_((struct cnfa *, FILE *));
-#ifdef REG_DEBUG
-static VOID dumpcstate _ANSI_ARGS_((int, struct carc *, struct cnfa *, FILE *));
-#endif
-/* === regc_cvec.c === */
-static struct cvec *newcvec _ANSI_ARGS_((int, int, int));
-static struct cvec *clearcvec _ANSI_ARGS_((struct cvec *));
-static VOID addchr _ANSI_ARGS_((struct cvec *, pchr));
-static VOID addrange _ANSI_ARGS_((struct cvec *, pchr, pchr));
-#ifdef USE_MCCE
-static VOID addmcce _ANSI_ARGS_((struct cvec *, chr *, chr *));
-#endif
-static int haschr _ANSI_ARGS_((struct cvec *, pchr));
-static struct cvec *getcvec _ANSI_ARGS_((struct vars *, int, int, int));
-static VOID freecvec _ANSI_ARGS_((struct cvec *));
-/* === regc_locale.c === */
-static int nmcces _ANSI_ARGS_((struct vars *));
-static int nleaders _ANSI_ARGS_((struct vars *));
-static struct cvec *allmcces _ANSI_ARGS_((struct vars *, struct cvec *));
-static celt element _ANSI_ARGS_((struct vars *, chr *, chr *));
-static struct cvec *range _ANSI_ARGS_((struct vars *, celt, celt, int));
-static int before _ANSI_ARGS_((celt, celt));
-static struct cvec *eclass _ANSI_ARGS_((struct vars *, celt, int));
-static struct cvec *cclass _ANSI_ARGS_((struct vars *, chr *, chr *, int));
-static struct cvec *allcases _ANSI_ARGS_((struct vars *, pchr));
-static int cmp _ANSI_ARGS_((CONST chr *, CONST chr *, size_t));
-static int casecmp _ANSI_ARGS_((CONST chr *, CONST chr *, size_t));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/* internal variables, bundled for easy passing around */
-struct vars {
-	regex_t *re;
-	chr *now;		/* scan pointer into string */
-	chr *stop;		/* end of string */
-	chr *savenow;		/* saved now and stop for "subroutine call" */
-	chr *savestop;
-	int err;		/* error code (0 if none) */
-	int cflags;		/* copy of compile flags */
-	int lasttype;		/* type of previous token */
-	int nexttype;		/* type of next token */
-	chr nextvalue;		/* value (if any) of next token */
-	int lexcon;		/* lexical context type (see lex.c) */
-	int nsubexp;		/* subexpression count */
-	struct subre **subs;	/* subRE pointer vector */
-	size_t nsubs;		/* length of vector */
-	struct subre *sub10[10];	/* initial vector, enough for most */
-	struct nfa *nfa;	/* the NFA */
-	struct colormap *cm;	/* character color map */
-	color nlcolor;		/* color of newline */
-	struct state *wordchrs;	/* state in nfa holding word-char outarcs */
-	struct subre *tree;	/* subexpression tree */
-	struct subre *treechain;	/* all tree nodes allocated */
-	struct subre *treefree;		/* any free tree nodes */
-	int ntree;		/* number of tree nodes */
-	struct cvec *cv;	/* interface cvec */
-	struct cvec *cv2;	/* utility cvec */
-	struct cvec *mcces;	/* collating-element information */
-#		define	ISCELEADER(v,c)	(v->mcces != NULL && haschr(v->mcces, (c)))
-	struct state *mccepbegin;	/* in nfa, start of MCCE prototypes */
-	struct state *mccepend;	/* in nfa, end of MCCE prototypes */
-	struct subre *lacons;	/* lookahead-constraint vector */
-	int nlacons;		/* size of lacons */
-	int usedshorter;	/* used short-preferring quantifiers */
-	int unmatchable;	/* can never match */
-};
-
-/* parsing macros; most know that `v' is the struct vars pointer */
-#define	NEXT()	(next(v))		/* advance by one token */
-#define	SEE(t)	(v->nexttype == (t))	/* is next token this? */
-#define	EAT(t)	(SEE(t) && next(v))	/* if next is this, swallow it */
-#define	VISERR(vv)	((vv)->err != 0)	/* have we seen an error yet? */
-#define	ISERR()	VISERR(v)
-#define	VERR(vv,e)	((vv)->nexttype = EOS, ((vv)->err) ? (vv)->err :\
-							((vv)->err = (e)))
-#define	ERR(e)	VERR(v, e)		/* record an error */
-#define	NOERR()	{if (ISERR()) return;}	/* if error seen, return */
-#define	NOERRN()	{if (ISERR()) return NULL;}	/* NOERR with retval */
-#define	NOERRZ()	{if (ISERR()) return 0;}	/* NOERR with retval */
-#define	INSIST(c, e)	((c) ? 0 : ERR(e))	/* if condition false, error */
-#define	NOTE(b)	(v->re->re_info |= (b))		/* note visible condition */
-#define	EMPTYARC(x, y)	newarc(v->nfa, EMPTY, 0, x, y)
-
-/* token type codes, some also used as NFA arc types */
-#define	EMPTY	'n'		/* no token present */
-#define	EOS	'e'		/* end of string */
-#define	PLAIN	'p'		/* ordinary character */
-#define	DIGIT	'd'		/* digit (in bound) */
-#define	BACKREF	'b'		/* back reference */
-#define	COLLEL	'I'		/* start of [. */
-#define	ECLASS	'E'		/* start of [= */
-#define	CCLASS	'C'		/* start of [: */
-#define	END	'X'		/* end of [. [= [: */
-#define	RANGE	'R'		/* - within [] which might be range delim. */
-#define	LACON	'L'		/* lookahead constraint subRE */
-#define	AHEAD	'a'		/* color-lookahead arc */
-#define	BEHIND	'r'		/* color-lookbehind arc */
-#define	WBDRY	'w'		/* word boundary constraint */
-#define	NWBDRY	'W'		/* non-word-boundary constraint */
-#define	SBEGIN	'A'		/* beginning of string (even if not BOL) */
-#define	SEND	'Z'		/* end of string (even if not EOL) */
-#define	PREFER	'P'		/* length preference */
-
-/* is an arc colored, and hence on a color chain? */
-#define	COLORED(a)	((a)->type == PLAIN || (a)->type == AHEAD || \
-							(a)->type == BEHIND)
-
-
-
-/* static function list */
-static struct fns functions = {
-	rfree,			/* regfree insides */
-};
-
-
-
-/*
- - compile - compile regular expression
- ^ int compile(regex_t *, CONST chr *, size_t, int);
- */
-int
-compile(re, string, len, flags)
-regex_t *re;
-CONST chr *string;
-size_t len;
-int flags;
-{
-	struct vars var;
-	struct vars *v = &var;
-	struct guts *g;
-	int i;
-	size_t j;
-	FILE *debug = (flags&REG_PROGRESS) ? stdout : (FILE *)NULL;
-#	define	CNOERR()	{ if (ISERR()) return freev(v, v->err); }
-
-	/* sanity checks */
-
-	if (re == NULL || string == NULL)
-		return REG_INVARG;
-	if ((flags&REG_QUOTE) &&
-			(flags&(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE)))
-		return REG_INVARG;
-	if (!(flags&REG_EXTENDED) && (flags&REG_ADVF))
-		return REG_INVARG;
-
-	/* initial setup (after which freev() is callable) */
-	v->re = re;
-	v->now = (chr *)string;
-	v->stop = v->now + len;
-	v->savenow = v->savestop = NULL;
-	v->err = 0;
-	v->cflags = flags;
-	v->nsubexp = 0;
-	v->subs = v->sub10;
-	v->nsubs = 10;
-	for (j = 0; j < v->nsubs; j++)
-		v->subs[j] = NULL;
-	v->nfa = NULL;
-	v->cm = NULL;
-	v->nlcolor = COLORLESS;
-	v->wordchrs = NULL;
-	v->tree = NULL;
-	v->treechain = NULL;
-	v->treefree = NULL;
-	v->cv = NULL;
-	v->cv2 = NULL;
-	v->mcces = NULL;
-	v->lacons = NULL;
-	v->nlacons = 0;
-	re->re_magic = REMAGIC;
-	re->re_info = 0;		/* bits get set during parse */
-	re->re_csize = sizeof(chr);
-	re->re_guts = NULL;
-	re->re_fns = VS(&functions);
-
-	/* more complex setup, malloced things */
-	re->re_guts = VS(MALLOC(sizeof(struct guts)));
-	if (re->re_guts == NULL)
-		return freev(v, REG_ESPACE);
-	g = (struct guts *)re->re_guts;
-	g->tree = NULL;
-	initcm(v, &g->cmap);
-	v->cm = &g->cmap;
-	g->lacons = NULL;
-	g->nlacons = 0;
-	ZAPCNFA(g->search);
-	v->nfa = newnfa(v, v->cm, (struct nfa *)NULL);
-	CNOERR();
-	v->cv = newcvec(100, 20, 10);
-	if (v->cv == NULL)
-		return freev(v, REG_ESPACE);
-	i = nmcces(v);
-	if (i > 0) {
-		v->mcces = newcvec(nleaders(v), 0, i);
-		CNOERR();
-		v->mcces = allmcces(v, v->mcces);
-		leaders(v, v->mcces);
-	}
-	CNOERR();
-
-	/* parsing */
-	lexstart(v);			/* also handles prefixes */
-	if ((v->cflags&REG_NLSTOP) || (v->cflags&REG_NLANCH)) {
-		/* assign newline a unique color */
-		v->nlcolor = subcolor(v->cm, newline());
-		okcolors(v->nfa, v->cm);
-	}
-	CNOERR();
-	v->tree = parse(v, EOS, PLAIN, v->nfa->init, v->nfa->final);
-	assert(SEE(EOS));		/* even if error; ISERR() => SEE(EOS) */
-	CNOERR();
-	assert(v->tree != NULL);
-
-	/* finish setup of nfa and its subre tree */
-	specialcolors(v->nfa);
-	CNOERR();
-	if (debug != NULL) {
-		dumpnfa(v->nfa, debug);
-		dumpst(v->tree, debug, 1);
-	}
-	v->usedshorter = 0;
-	v->unmatchable = 0;
-	optst(v, v->tree);
-	v->ntree = numst(v->tree, 1);
-	markst(v->tree);
-	cleanst(v);
-	if (debug != NULL) {
-		fprintf(debug, "-->\n");
-		dumpst(v->tree, debug, 1);
-	}
-
-	/* build compacted NFAs for tree, lacons, fast search */
-	re->re_info |= nfatree(v, v->tree, debug);
-	if (debug != NULL) {
-		fprintf(debug, "---->\n");
-		dumpst(v->tree, debug, 1);
-	}
-	CNOERR();
-	if (re->re_info&REG_UIMPOSSIBLE)
-		v->unmatchable = 1;
-	assert(v->nlacons == 0 || v->lacons != NULL);
-	for (i = 1; i < v->nlacons; i++)
-		nfanode(v, &v->lacons[i], debug);
-	CNOERR();
-	(DISCARD)optimize(v->nfa, debug);
-	CNOERR();
-	makescan(v, v->nfa);
-	CNOERR();
-	compact(v->nfa, &g->search);
-	CNOERR();
-
-	/* looks okay, package it up */
-	re->re_nsub = v->nsubexp;
-	v->re = NULL;			/* freev no longer frees re */
-	g->magic = GUTSMAGIC;
-	g->cflags = v->cflags;
-	g->info = re->re_info;
-	g->nsub = re->re_nsub;
-	g->tree = v->tree;
-	v->tree = NULL;
-	g->ntree = v->ntree;
-	g->compare = (v->cflags&REG_ICASE) ? casecmp : cmp;
-	g->lacons = v->lacons;
-	v->lacons = NULL;
-	g->nlacons = v->nlacons;
-	g->usedshorter = v->usedshorter;
-	g->unmatchable = v->unmatchable;
-
-	if (flags&REG_DUMP)
-		dump(re, stdout);
-
-	assert(v->err == 0);
-	return freev(v, 0);
-}
-
-/*
- - moresubs - enlarge subRE vector
- ^ static VOID moresubs(struct vars *, int);
- */
-static VOID
-moresubs(v, wanted)
-struct vars *v;
-int wanted;			/* want enough room for this one */
-{
-	struct subre **p;
-	size_t n;
-
-	assert(wanted > 0 && (size_t)wanted >= v->nsubs);
-	n = (size_t)wanted * 3 / 2 + 1;
-	if (v->subs == v->sub10) {
-		p = (struct subre **)MALLOC(n * sizeof(struct subre *));
-		if (p != NULL)
-			memcpy(VS(p), VS(v->subs),
-					v->nsubs * sizeof(struct subre *));
-	} else
-		p = (struct subre**)REALLOC(v->subs, n*sizeof(struct subre *));
-	if (p == NULL) {
-		ERR(REG_ESPACE);
-		return;
-	}
-	v->subs = p;
-	for (p = &v->subs[v->nsubs]; v->nsubs < n; p++, v->nsubs++)
-		*p = NULL;
-	assert(v->nsubs == n);
-	assert((size_t)wanted < v->nsubs);
-}
-
-/*
- - freev - free vars struct's substructures where necessary
- * Optionally does error-number setting, and always returns error code
- * (if any), to make error-handling code terser.
- ^ static int freev(struct vars *, int);
- */
-static int
-freev(v, err)
-struct vars *v;
-int err;
-{
-	if (v->re != NULL)
-		rfree(v->re);
-	if (v->subs != v->sub10)
-		FREE(v->subs);
-	if (v->nfa != NULL)
-		freenfa(v->nfa);
-	if (v->tree != NULL)
-		freesubre(v, v->tree);
-	if (v->treechain != NULL)
-		cleanst(v);
-	if (v->cv != NULL)
-		freecvec(v->cv);
-	if (v->cv2 != NULL)
-		freecvec(v->cv2);
-	if (v->mcces != NULL)
-		freecvec(v->mcces);
-	if (v->lacons != NULL)
-		freelacons(v->lacons, v->nlacons);
-	ERR(err);			/* nop if err==0 */
-
-	return v->err;
-}
-
-/*
- - makescan - turn an NFA into a fast-scan NFA (implicit prepend of .*?)
- * NFA must have been optimize()d already.
- ^ static VOID makescan(struct vars *, struct nfa *);
- */
-static VOID
-makescan(v, nfa)
-struct vars *v;
-struct nfa *nfa;
-{
-	struct arc *a;
-	struct arc *b;
-	struct state *pre = nfa->pre;
-	struct state *s;
-  	struct state *s2;
-  	struct state *slist;
-  
- 	/* no loops are needed if it's anchored */
- 	for (a = pre->outs; a != NULL; a = a->outchain) {
-		assert(a->type == PLAIN);
-		if (a->co != nfa->bos[0] && a->co != nfa->bos[1])
-			break;
- 	}
- 	if (a != NULL) {
-		/* add implicit .* in front */
-		rainbow(nfa, v->cm, PLAIN, COLORLESS, pre, pre);
-
-		/* and ^* and \Z* too -- not always necessary, but harmless */
-		newarc(nfa, PLAIN, nfa->bos[0], pre, pre);
-		newarc(nfa, PLAIN, nfa->bos[1], pre, pre);
- 	}
- 
- 	/*
-  	 * Now here's the subtle part.  Because many REs have no lookback
-	 * constraints, often knowing when you were in the pre state tells
-	 * you little; it's the next state(s) that are informative.  But
-	 * some of them may have other inarcs, i.e. it may be possible to
-	 * make actual progress and then return to one of them.  We must
-	 * de-optimize such cases, splitting each such state into progress
-	 * and no-progress states.
-	 */
-
-	/* first, make a list of the states */
-	slist = NULL;
-	for (a = pre->outs; a != NULL; a = a->outchain) {
-		s = a->to;
-		for (b = s->ins; b != NULL; b = b->inchain)
-			if (b->from != pre)
-				break;
-		if (b != NULL) {		/* must be split */
-			s->tmp = slist;
-			slist = s;
-		}
-	}
-
-	/* do the splits */
-	for (s = slist; s != NULL; s = s2) {
-		s2 = newstate(nfa);
-		copyouts(nfa, s, s2);
-		for (a = s->ins; a != NULL; a = b) {
-			b = a->inchain;
-			if (a->from != pre) {
-				cparc(nfa, a, a->from, s2);
-				freearc(nfa, a);
-			}
-		}
-		s2 = s->tmp;
-		s->tmp = NULL;		/* clean up while we're at it */
-	}
-}
-
-/*
- - parse - parse an RE
- * This is actually just the top level, which parses a bunch of branches
- * tied together with '|'.  They appear in the tree as the left children
- * of a chain of '|' subres.
- ^ static struct subre *parse(struct vars *, int, int, struct state *,
- ^ 	struct state *);
- */
-static struct subre *
-parse(v, stopper, type, init, final)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *init;		/* initial state */
-struct state *final;		/* final state */
-{
-	struct state *left;	/* scaffolding for branch */
-	struct state *right;
-	struct subre *branches;	/* top level */
-	struct subre *branch;	/* current branch */
-	struct subre *t;	/* temporary */
-	int firstbranch;	/* is this the first branch? */
-
-	assert(stopper == ')' || stopper == EOS);
-
-	branches = subre(v, '|', LONGER, init, final);
-	NOERRN();
-	branch = branches;
-	firstbranch = 1;
-	do {	/* a branch */
-		if (!firstbranch) {
-			/* need a place to hang it */
-			branch->right = subre(v, '|', LONGER, init, final);
-			NOERRN();
-			branch = branch->right;
-		}
-		firstbranch = 0;
-		left = newstate(v->nfa);
-		right = newstate(v->nfa);
-		NOERRN();
-		EMPTYARC(init, left);
-		EMPTYARC(right, final);
-		NOERRN();
-		branch->left = parsebranch(v, stopper, type, left, right, 0);
-		NOERRN();
-		branch->flags |= UP(branch->flags | branch->left->flags);
-		if ((branch->flags &~ branches->flags) != 0)	/* new flags */
-			for (t = branches; t != branch; t = t->right)
-				t->flags |= branch->flags;
-	} while (EAT('|'));
-	assert(SEE(stopper) || SEE(EOS));
-
-	if (!SEE(stopper)) {
-		assert(stopper == ')' && SEE(EOS));
-		ERR(REG_EPAREN);
-	}
-
-	/* optimize out simple cases */
-	if (branch == branches) {	/* only one branch */
-		assert(branch->right == NULL);
-		t = branch->left;
-		branch->left = NULL;
-		freesubre(v, branches);
-		branches = t;
-	} else if (!MESSY(branches->flags)) {	/* no interesting innards */
-		freesubre(v, branches->left);
-		branches->left = NULL;
-		freesubre(v, branches->right);
-		branches->right = NULL;
-		branches->op = '=';
-	}
-
-	return branches;
-}
-
-/*
- - parsebranch - parse one branch of an RE
- * This mostly manages concatenation, working closely with parseqatom().
- * Concatenated things are bundled up as much as possible, with separate
- * ',' nodes introduced only when necessary due to substructure.
- ^ static struct subre *parsebranch(struct vars *, int, int, struct state *,
- ^ 	struct state *, int);
- */
-static struct subre *
-parsebranch(v, stopper, type, left, right, partial)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *left;		/* leftmost state */
-struct state *right;		/* rightmost state */
-int partial;			/* is this only part of a branch? */
-{
-	struct state *lp;	/* left end of current construct */
-	int seencontent;	/* is there anything in this branch yet? */
-	struct subre *t;
-
-	lp = left;
-	seencontent = 0;
-	t = subre(v, '=', 0, left, right);	/* op '=' is tentative */
-	NOERRN();
-	while (!SEE('|') && !SEE(stopper) && !SEE(EOS)) {
-		if (seencontent) {	/* implicit concat operator */
-			lp = newstate(v->nfa);
-			NOERRN();
-			moveins(v->nfa, right, lp);
-		}
-		seencontent = 1;
-
-		/* NB, recursion in parseqatom() may swallow rest of branch */
-		parseqatom(v, stopper, type, lp, right, t);
-	}
-
-	if (!seencontent) {		/* empty branch */
-		if (!partial)
-			NOTE(REG_UUNSPEC);
-		assert(lp == left);
-		EMPTYARC(left, right);
-	}
-
-	return t;
-}
-
-/*
- - parseqatom - parse one quantified atom or constraint of an RE
- * The bookkeeping near the end cooperates very closely with parsebranch();
- * in particular, it contains a recursion that can involve parsing the rest
- * of the branch, making this function's name somewhat inaccurate.
- ^ static VOID parseqatom(struct vars *, int, int, struct state *,
- ^ 	struct state *, struct subre *);
- */
-static VOID
-parseqatom(v, stopper, type, lp, rp, top)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *lp;		/* left state to hang it on */
-struct state *rp;		/* right state to hang it on */
-struct subre *top;		/* subtree top */
-{
-	struct state *s;	/* temporaries for new states */
-	struct state *s2;
-#	define	ARCV(t, val)	newarc(v->nfa, t, val, lp, rp)
-	int m, n;
-	struct subre *atom;	/* atom's subtree */
-	struct subre *t;
-	int cap;		/* capturing parens? */
-	int pos;		/* positive lookahead? */
-	int subno;		/* capturing-parens or backref number */
-	int atomtype;
-	int qprefer;		/* quantifier short/long preference */
-	int f;
-	struct subre **atomp;	/* where the pointer to atom is */
-
-	/* initial bookkeeping */
-	atom = NULL;
-	assert(lp->nouts == 0);	/* must string new code */
-	assert(rp->nins == 0);	/*  between lp and rp */
-	subno = 0;		/* just to shut lint up */
-
-	/* an atom or constraint... */
-	atomtype = v->nexttype;
-	switch (atomtype) {
-	/* first, constraints, which end by returning */
-	case '^':
-		ARCV('^', 1);
-		if (v->cflags&REG_NLANCH)
-			ARCV(BEHIND, v->nlcolor);
-		NEXT();
-		return;
-		break;
-	case '$':
-		ARCV('$', 1);
-		if (v->cflags&REG_NLANCH)
-			ARCV(AHEAD, v->nlcolor);
-		NEXT();
-		return;
-		break;
-	case SBEGIN:
-		ARCV('^', 1);	/* BOL */
-		ARCV('^', 0);	/* or BOS */
-		NEXT();
-		return;
-		break;
-	case SEND:
-		ARCV('$', 1);	/* EOL */
-		ARCV('$', 0);	/* or EOS */
-		NEXT();
-		return;
-		break;
-	case '<':
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		return;
-		break;
-	case '>':
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case WBDRY:
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case NWBDRY:
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case LACON:	/* lookahead constraint */
-		pos = v->nextvalue;
-		NEXT();
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		t = parse(v, ')', LACON, s, s2);
-		freesubre(v, t);	/* internal structure irrelevant */
-		assert(SEE(')') || ISERR());
-		NEXT();
-		n = newlacon(v, s, s2, pos);
-		NOERR();
-		ARCV(LACON, n);
-		return;
-		break;
-	/* then errors, to get them out of the way */
-	case '*':
-	case '+':
-	case '?':
-	case '{':
-		ERR(REG_BADRPT);
-		return;
-		break;
-	default:
-		ERR(REG_ASSERT);
-		return;
-		break;
-	/* then plain characters, and minor variants on that theme */
-	case ')':		/* unbalanced paren */
-		if ((v->cflags&REG_ADVANCED) != REG_EXTENDED) {
-			ERR(REG_EPAREN);
-			return;
-		}
-		/* legal in EREs due to specification botch */
-		NOTE(REG_UPBOTCH);
-		/* fallthrough into case PLAIN */
-	case PLAIN:
-		onechr(v, v->nextvalue, lp, rp);
-		okcolors(v->nfa, v->cm);
-		NOERR();
-		NEXT();
-		break;
-	case '[':
-		if (v->nextvalue == 1)
-			bracket(v, lp, rp);
-		else
-			cbracket(v, lp, rp);
-		assert(SEE(']') || ISERR());
-		NEXT();
-		break;
-	case '.':
-		rainbow(v->nfa, v->cm, PLAIN,
-				(v->cflags&REG_NLSTOP) ? v->nlcolor : COLORLESS,
-				lp, rp);
-		NEXT();
-		break;
-	/* and finally the ugly stuff */
-	case '(':	/* value flags as capturing or non */
-		cap = (type == LACON) ? 0 : v->nextvalue;
-		if (cap) {
-			v->nsubexp++;
-			subno = v->nsubexp;
-			if ((size_t)subno >= v->nsubs)
-				moresubs(v, subno);
-			assert((size_t)subno < v->nsubs);
-		} else
-			atomtype = PLAIN;	/* something that's not '(' */
-		NEXT();
-		/* need new endpoints because tree will contain pointers */
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		EMPTYARC(lp, s);
-		EMPTYARC(s2, rp);
-		NOERR();
-		atom = parse(v, ')', PLAIN, s, s2);
-		assert(SEE(')') || ISERR());
-		NEXT();
-		NOERR();
-		if (cap) {
-			v->subs[subno] = atom;
-			t = subre(v, '(', atom->flags|CAP, lp, rp);
-			NOERR();
-			t->subno = subno;
-			t->left = atom;
-			atom = t;
-		}
-		/* postpone everything else pending possible {0} */
-		break;
-	case BACKREF:	/* the Feature From The Black Lagoon */
-		INSIST(type != LACON, REG_ESUBREG);
-		INSIST(v->nextvalue < v->nsubs, REG_ESUBREG);
-		INSIST(v->subs[v->nextvalue] != NULL, REG_ESUBREG);
-		NOERR();
-		assert(v->nextvalue > 0);
-		atom = subre(v, 'b', BACKR, lp, rp);
-		subno = v->nextvalue;
-		atom->subno = subno;
-		EMPTYARC(lp, rp);	/* temporarily, so there's something */
-		NEXT();
-		break;
-	}
-
-	/* ...and an atom may be followed by a quantifier */
-	switch (v->nexttype) {
-	case '*':
-		m = 0;
-		n = INFINITY;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '+':
-		m = 1;
-		n = INFINITY;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '?':
-		m = 0;
-		n = 1;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '{':
-		NEXT();
-		m = scannum(v);
-		if (EAT(',')) {
-			if (SEE(DIGIT))
-				n = scannum(v);
-			else
-				n = INFINITY;
-			if (m > n) {
-				ERR(REG_BADBR);
-				return;
-			}
-			/* {m,n} exercises preference, even if it's {m,m} */
-			qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		} else {
-			n = m;
-			/* {m} passes operand's preference through */
-			qprefer = 0;
-		}
-		if (!SEE('}')) {	/* catches errors too */
-			ERR(REG_BADBR);
-			return;
-		}
-		NEXT();
-		break;
-	default:		/* no quantifier */
-		m = n = 1;
-		qprefer = 0;
-		break;
-	}
-
-	/* annoying special case:  {0} or {0,0} cancels everything */
-	if (m == 0 && n == 0) {
-		if (atom != NULL)
-			freesubre(v, atom);
-		if (atomtype == '(')
-			v->subs[subno] = NULL;
-		delsub(v->nfa, lp, rp);
-		EMPTYARC(lp, rp);
-		return;
-	}
-
-	/* if not a messy case, avoid hard part */
-	assert(!MESSY(top->flags));
-	f = top->flags | qprefer | ((atom != NULL) ? atom->flags : 0);
-	if (atomtype != '(' && atomtype != BACKREF && !MESSY(UP(f))) {
-		if (!(m == 1 && n == 1))
-			repeat(v, lp, rp, m, n);
-		if (atom != NULL)
-			freesubre(v, atom);
-		top->flags = f;
-		return;
-	}
-
-	/*
-	 * hard part:  something messy
-	 * That is, capturing parens, back reference, short/long clash, or
-	 * an atom with substructure containing one of those.
-	 */
-
-	/* now we'll need a subre for the contents even if they're boring */
-	if (atom == NULL) {
-		atom = subre(v, '=', 0, lp, rp);
-		NOERR();
-	}
-
-	/*
-	 * prepare a general-purpose state skeleton
-	 *
-	 *    ---> [s] ---prefix---> [begin] ---atom---> [end] ----rest---> [rp]
-	 *   /                                            /
-	 * [lp] ----> [s2] ----bypass---------------------
-	 *
-	 * where bypass is an empty, and prefix is some repetitions of atom
-	 */
-	s = newstate(v->nfa);		/* first, new endpoints for the atom */
-	s2 = newstate(v->nfa);
-	NOERR();
-	moveouts(v->nfa, lp, s);
-	moveins(v->nfa, rp, s2);
-	NOERR();
-	atom->begin = s;
-	atom->end = s2;
-	s = newstate(v->nfa);		/* and spots for prefix and bypass */
-	s2 = newstate(v->nfa);
-	NOERR();
-	EMPTYARC(lp, s);
-	EMPTYARC(lp, s2);
-	NOERR();
-
-	/* break remaining subRE into x{...} and what follows */
-	t = subre(v, '.', COMBINE(qprefer, atom->flags), lp, rp);
-	t->left = atom;
-	atomp = &t->left;
-	/* here we should recurse... but we must postpone that to the end */
-
-	/* split top into prefix and remaining */
-	assert(top->op == '=' && top->left == NULL && top->right == NULL);
-	top->left = subre(v, '=', top->flags, top->begin, lp);
-	top->op = '.';
-	top->right = t;
-
-	/* if it's a backref, now is the time to replicate the subNFA */
-	if (atomtype == BACKREF) {
-		assert(atom->begin->nouts == 1);	/* just the EMPTY */
-		delsub(v->nfa, atom->begin, atom->end);
-		assert(v->subs[subno] != NULL);
-		/* and here's why the recursion got postponed:  it must */
-		/* wait until the skeleton is filled in, because it may */
-		/* hit a backref that wants to copy the filled-in skeleton */
-		dupnfa(v->nfa, v->subs[subno]->begin, v->subs[subno]->end,
-						atom->begin, atom->end);
-		NOERR();
-	}
-
-	/* it's quantifier time; first, turn x{0,...} into x{1,...}|empty */
-	if (m == 0) {
-		EMPTYARC(s2, atom->end);		/* the bypass */
-		assert(PREF(qprefer) != 0);
-		f = COMBINE(qprefer, atom->flags);
-		t = subre(v, '|', f, lp, atom->end);
-		NOERR();
-		t->left = atom;
-		t->right = subre(v, '|', PREF(f), s2, atom->end);
-		NOERR();
-		t->right->left = subre(v, '=', 0, s2, atom->end);
-		NOERR();
-		*atomp = t;
-		atomp = &t->left;
-		m = 1;
-	}
-
-	/* deal with the rest of the quantifier */
-	if (atomtype == BACKREF) {
-		/* special case:  backrefs have internal quantifiers */
-		EMPTYARC(s, atom->begin);	/* empty prefix */
-		/* just stuff everything into atom */
-		repeat(v, atom->begin, atom->end, m, n);
-		atom->min = (short)m;
-		atom->max = (short)n;
-		atom->flags |= COMBINE(qprefer, atom->flags);
-	} else if (m == 1 && n == 1) {
-		/* no/vacuous quantifier:  done */
-		EMPTYARC(s, atom->begin);	/* empty prefix */
-	} else {
-		/* turn x{m,n} into x{m-1,n-1}x, with capturing */
-		/*  parens in only second x */
-		dupnfa(v->nfa, atom->begin, atom->end, s, atom->begin);
-		assert(m >= 1 && m != INFINITY && n >= 1);
-		repeat(v, s, atom->begin, m-1, (n == INFINITY) ? n : n-1);
-		f = COMBINE(qprefer, atom->flags);
-		t = subre(v, '.', f, s, atom->end);	/* prefix and atom */
-		NOERR();
-		t->left = subre(v, '=', PREF(f), s, atom->begin);
-		NOERR();
-		t->right = atom;
-		*atomp = t;
-	}
-
-	/* and finally, look after that postponed recursion */
-	t = top->right;
-	if (!(SEE('|') || SEE(stopper) || SEE(EOS)))
-		t->right = parsebranch(v, stopper, type, atom->end, rp, 1);
-	else {
-		EMPTYARC(atom->end, rp);
-		t->right = subre(v, '=', 0, atom->end, rp);
-	}
-	assert(SEE('|') || SEE(stopper) || SEE(EOS));
-	t->flags |= COMBINE(t->flags, t->right->flags);
-	top->flags |= COMBINE(top->flags, t->flags);
-}
-
-/*
- - nonword - generate arcs for non-word-character ahead or behind
- ^ static VOID nonword(struct vars *, int, struct state *, struct state *);
- */
-static VOID
-nonword(v, dir, lp, rp)
-struct vars *v;
-int dir;			/* AHEAD or BEHIND */
-struct state *lp;
-struct state *rp;
-{
-	int anchor = (dir == AHEAD) ? '$' : '^';
-
-	assert(dir == AHEAD || dir == BEHIND);
-	newarc(v->nfa, anchor, 1, lp, rp);
-	newarc(v->nfa, anchor, 0, lp, rp);
-	colorcomplement(v->nfa, v->cm, dir, v->wordchrs, lp, rp);
-	/* (no need for special attention to \n) */
-}
-
-/*
- - word - generate arcs for word character ahead or behind
- ^ static VOID word(struct vars *, int, struct state *, struct state *);
- */
-static VOID
-word(v, dir, lp, rp)
-struct vars *v;
-int dir;			/* AHEAD or BEHIND */
-struct state *lp;
-struct state *rp;
-{
-	assert(dir == AHEAD || dir == BEHIND);
-	cloneouts(v->nfa, v->wordchrs, lp, rp, dir);
-	/* (no need for special attention to \n) */
-}
-
-/*
- - scannum - scan a number
- ^ static int scannum(struct vars *);
- */
-static int			/* value, <= DUPMAX */
-scannum(v)
-struct vars *v;
-{
-	int n = 0;
-
-	while (SEE(DIGIT) && n < DUPMAX) {
-		n = n*10 + v->nextvalue;
-		NEXT();
-	}
-	if (SEE(DIGIT) || n > DUPMAX) {
-		ERR(REG_BADBR);
-		return 0;
-	}
-	return n;
-}
-
-/*
- - repeat - replicate subNFA for quantifiers
- * The duplication sequences used here are chosen carefully so that any
- * pointers starting out pointing into the subexpression end up pointing into
- * the last occurrence.  (Note that it may not be strung between the same
- * left and right end states, however!)  This used to be important for the
- * subRE tree, although the important bits are now handled by the in-line
- * code in parse(), and when this is called, it doesn't matter any more.
- ^ static VOID repeat(struct vars *, struct state *, struct state *, int, int);
- */
-static VOID
-repeat(v, lp, rp, m, n)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-int m;
-int n;
-{
-#	define	SOME	2
-#	define	INF	3
-#	define	PAIR(x, y)	((x)*4 + (y))
-#	define	REDUCE(x)	( ((x) == INFINITY) ? INF : (((x) > 1) ? SOME : (x)) )
-	CONST int rm = REDUCE(m);
-	CONST int rn = REDUCE(n);
-	struct state *s;
-	struct state *s2;
-
-	switch (PAIR(rm, rn)) {
-	case PAIR(0, 0):		/* empty string */
-		delsub(v->nfa, lp, rp);
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, 1):		/* do as x| */
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, SOME):		/* do as x{1,n}| */
-		repeat(v, lp, rp, 1, n);
-		NOERR();
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, INF):		/* loop x around */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		moveins(v->nfa, rp, s);
-		EMPTYARC(lp, s);
-		EMPTYARC(s, rp);
-		break;
-	case PAIR(1, 1):		/* no action required */
-		break;
-	case PAIR(1, SOME):		/* do as x{0,n-1}x = (x{1,n-1}|)x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, 1, n-1);
-		NOERR();
-		EMPTYARC(lp, s);
-		break;
-	case PAIR(1, INF):		/* add loopback arc */
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		moveins(v->nfa, rp, s2);
-		EMPTYARC(lp, s);
-		EMPTYARC(s2, rp);
-		EMPTYARC(s2, s);
-		break;
-	case PAIR(SOME, SOME):		/* do as x{m-1,n-1}x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, m-1, n-1);
-		break;
-	case PAIR(SOME, INF):		/* do as x{m-1,}x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, m-1, n);
-		break;
-	default:
-		ERR(REG_ASSERT);
-		break;
-	}
-}
-
-/*
- - bracket - handle non-complemented bracket expression
- * Also called from cbracket for complemented bracket expressions.
- ^ static VOID bracket(struct vars *, struct state *, struct state *);
- */
-static VOID
-bracket(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	assert(SEE('['));
-	NEXT();
-	while (!SEE(']') && !SEE(EOS))
-		brackpart(v, lp, rp);
-	assert(SEE(']') || ISERR());
-	okcolors(v->nfa, v->cm);
-}
-
-/*
- - cbracket - handle complemented bracket expression
- * We do it by calling bracket() with dummy endpoints, and then complementing
- * the result.  The alternative would be to invoke rainbow(), and then delete
- * arcs as the b.e. is seen... but that gets messy.
- ^ static VOID cbracket(struct vars *, struct state *, struct state *);
- */
-static VOID
-cbracket(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	struct state *left = newstate(v->nfa);
-	struct state *right = newstate(v->nfa);
-	struct state *s;
-	struct arc *a;			/* arc from lp */
-	struct arc *ba;			/* arc from left, from bracket() */
-	struct arc *pa;			/* MCCE-prototype arc */
-	color co;
-	chr *p;
-	int i;
-
-	NOERR();
-	bracket(v, left, right);
-	if (v->cflags&REG_NLSTOP)
-		newarc(v->nfa, PLAIN, v->nlcolor, left, right);
-	NOERR();
-
-	assert(lp->nouts == 0);		/* all outarcs will be ours */
-
-	/* easy part of complementing */
-	colorcomplement(v->nfa, v->cm, PLAIN, left, lp, rp);
-	NOERR();
-	if (v->mcces == NULL) {		/* no MCCEs -- we're done */
-		dropstate(v->nfa, left);
-		assert(right->nins == 0);
-		freestate(v->nfa, right);
-		return;
-	}
-
-	/* but complementing gets messy in the presence of MCCEs... */
-	NOTE(REG_ULOCALE);
-	for (p = v->mcces->chrs, i = v->mcces->nchrs; i > 0; p++, i--) {
-		co = GETCOLOR(v->cm, *p);
-		a = findarc(lp, PLAIN, co);
-		ba = findarc(left, PLAIN, co);
-		if (ba == NULL) {
-			assert(a != NULL);
-			freearc(v->nfa, a);
-		} else {
-			assert(a == NULL);
-		}
-		s = newstate(v->nfa);
-		NOERR();
-		newarc(v->nfa, PLAIN, co, lp, s);
-		NOERR();
-		pa = findarc(v->mccepbegin, PLAIN, co);
-		assert(pa != NULL);
-		if (ba == NULL) {	/* easy case, need all of them */
-			cloneouts(v->nfa, pa->to, s, rp, PLAIN);
-			newarc(v->nfa, '$', 1, s, rp);
-			newarc(v->nfa, '$', 0, s, rp);
-			colorcomplement(v->nfa, v->cm, AHEAD, pa->to, s, rp);
-		} else {		/* must be selective */
-			if (findarc(ba->to, '$', 1) == NULL) {
-				newarc(v->nfa, '$', 1, s, rp);
-				newarc(v->nfa, '$', 0, s, rp);
-				colorcomplement(v->nfa, v->cm, AHEAD, pa->to,
-									 s, rp);
-			}
-			for (pa = pa->to->outs; pa != NULL; pa = pa->outchain)
-				if (findarc(ba->to, PLAIN, pa->co) == NULL)
-					newarc(v->nfa, PLAIN, pa->co, s, rp);
-			if (s->nouts == 0)	/* limit of selectivity: none */
-				dropstate(v->nfa, s);	/* frees arc too */
-		}
-		NOERR();
-	}
-
-	delsub(v->nfa, left, right);
-	assert(left->nouts == 0);
-	freestate(v->nfa, left);
-	assert(right->nins == 0);
-	freestate(v->nfa, right);
-}
-			
-/*
- - brackpart - handle one item (or range) within a bracket expression
- ^ static VOID brackpart(struct vars *, struct state *, struct state *);
- */
-static VOID
-brackpart(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	celt startc;
-	celt endc;
-	struct cvec *cv;
-	chr *startp;
-	chr *endp;
-	chr c[1];
-
-	/* parse something, get rid of special cases, take shortcuts */
-	switch (v->nexttype) {
-	case RANGE:			/* a-b-c or other botch */
-		ERR(REG_ERANGE);
-		return;
-		break;
-	case PLAIN:
-		c[0] = v->nextvalue;
-		NEXT();
-		/* shortcut for ordinary chr (not range, not MCCE leader) */
-		if (!SEE(RANGE) && !ISCELEADER(v, c[0])) {
-			onechr(v, c[0], lp, rp);
-			return;
-		}
-		startc = element(v, c, c+1);
-		NOERR();
-		break;
-	case COLLEL:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECOLLATE);
-		NOERR();
-		startc = element(v, startp, endp);
-		NOERR();
-		break;
-	case ECLASS:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECOLLATE);
-		NOERR();
-		startc = element(v, startp, endp);
-		NOERR();
-		cv = eclass(v, startc, (v->cflags&REG_ICASE));
-		NOERR();
-		dovec(v, cv, lp, rp);
-		return;
-		break;
-	case CCLASS:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECTYPE);
-		NOERR();
-		cv = cclass(v, startp, endp, (v->cflags&REG_ICASE));
-		NOERR();
-		dovec(v, cv, lp, rp);
-		return;
-		break;
-	default:
-		ERR(REG_ASSERT);
-		return;
-		break;
-	}
-
-	if (SEE(RANGE)) {
-		NEXT();
-		switch (v->nexttype) {
-		case PLAIN:
-		case RANGE:
-			c[0] = v->nextvalue;
-			NEXT();
-			endc = element(v, c, c+1);
-			NOERR();
-			break;
-		case COLLEL:
-			startp = v->now;
-			endp = scanplain(v);
-			INSIST(startp < endp, REG_ECOLLATE);
-			NOERR();
-			endc = element(v, startp, endp);
-			NOERR();
-			break;
-		default:
-			ERR(REG_ERANGE);
-			return;
-			break;
-		}
-	} else
-		endc = startc;
-
-	/*
-	 * Ranges are unportable.  Actually, standard C does
-	 * guarantee that digits are contiguous, but making
-	 * that an exception is just too complicated.
-	 */
-	if (startc != endc)
-		NOTE(REG_UUNPORT);
-	cv = range(v, startc, endc, (v->cflags&REG_ICASE));
-	NOERR();
-	dovec(v, cv, lp, rp);
-}
-
-/*
- - scanplain - scan PLAIN contents of [. etc.
- * Certain bits of trickery in lex.c know that this code does not try
- * to look past the final bracket of the [. etc.
- ^ static chr *scanplain(struct vars *);
- */
-static chr *			/* just after end of sequence */
-scanplain(v)
-struct vars *v;
-{
-	chr *endp;
-
-	assert(SEE(COLLEL) || SEE(ECLASS) || SEE(CCLASS));
-	NEXT();
-
-	endp = v->now;
-	while (SEE(PLAIN)) {
-		endp = v->now;
-		NEXT();
-	}
-
-	assert(SEE(END) || ISERR());
-	NEXT();
-
-	return endp;
-}
-
-/*
- - leaders - process a cvec of collating elements to also include leaders
- * Also gives all characters involved their own colors, which is almost
- * certainly necessary, and sets up little disconnected subNFA.
- ^ static VOID leaders(struct vars *, struct cvec *);
- */
-static VOID
-leaders(v, cv)
-struct vars *v;
-struct cvec *cv;
-{
-	int mcce;
-	chr *p;
-	chr leader;
-	struct state *s;
-	struct arc *a;
-
-	v->mccepbegin = newstate(v->nfa);
-	v->mccepend = newstate(v->nfa);
-	NOERR();
-
-	for (mcce = 0; mcce < cv->nmcces; mcce++) {
-		p = cv->mcces[mcce];
-		leader = *p;
-		if (!haschr(cv, leader)) {
-			addchr(cv, leader);
-			s = newstate(v->nfa);
-			newarc(v->nfa, PLAIN, subcolor(v->cm, leader),
-							v->mccepbegin, s);
-			okcolors(v->nfa, v->cm);
-		} else {
-			a = findarc(v->mccepbegin, PLAIN,
-						GETCOLOR(v->cm, leader));
-			assert(a != NULL);
-			s = a->to;
-			assert(s != v->mccepend);
-		}
-		p++;
-		assert(*p != 0 && *(p+1) == 0);	/* only 2-char MCCEs for now */
-		newarc(v->nfa, PLAIN, subcolor(v->cm, *p), s, v->mccepend);
-		okcolors(v->nfa, v->cm);
-	}
-}
-
-/*
- - onechr - fill in arcs for a plain character, and possible case complements
- * This is mostly a shortcut for efficient handling of the common case.
- ^ static VOID onechr(struct vars *, pchr, struct state *, struct state *);
- */
-static VOID
-onechr(v, c, lp, rp)
-struct vars *v;
-pchr c;
-struct state *lp;
-struct state *rp;
-{
-	if (!(v->cflags&REG_ICASE)) {
-		newarc(v->nfa, PLAIN, subcolor(v->cm, c), lp, rp);
-		return;
-	}
-
-	/* rats, need general case anyway... */
-	dovec(v, allcases(v, c), lp, rp);
-}
-
-/*
- - dovec - fill in arcs for each element of a cvec
- * This one has to handle the messy cases, like MCCEs and MCCE leaders.
- ^ static VOID dovec(struct vars *, struct cvec *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-dovec(v, cv, lp, rp)
-struct vars *v;
-struct cvec *cv;
-struct state *lp;
-struct state *rp;
-{
-	chr ch, from, to;
-	celt ce;
-	chr *p;
-	int i;
-	color co;
-	struct cvec *leads;
-	struct arc *a;
-	struct arc *pa;		/* arc in prototype */
-	struct state *s;
-	struct state *ps;	/* state in prototype */
-
-	/* need a place to store leaders, if any */
-	if (nmcces(v) > 0) {
-		assert(v->mcces != NULL);
-		if (v->cv2 == NULL || v->cv2->nchrs < v->mcces->nchrs) {
-			if (v->cv2 != NULL)
-				free(v->cv2);
-			v->cv2 = newcvec(v->mcces->nchrs, 0, v->mcces->nmcces);
-			NOERR();
-			leads = v->cv2;
-		} else
-			leads = clearcvec(v->cv2);
-	} else
-		leads = NULL;
-
-	/* first, get the ordinary characters out of the way */
-	for (p = cv->chrs, i = cv->nchrs; i > 0; p++, i--) {
-		ch = *p;
-		if (!ISCELEADER(v, ch))
-			newarc(v->nfa, PLAIN, subcolor(v->cm, ch), lp, rp);
-		else {
-			assert(singleton(v->cm, ch));
-			assert(leads != NULL);
-			if (!haschr(leads, ch))
-				addchr(leads, ch);
-		}
-	}
-
-	/* and the ranges */
-	for (p = cv->ranges, i = cv->nranges; i > 0; p += 2, i--) {
-		from = *p;
-		to = *(p+1);
-		while (from <= to && (ce = nextleader(v, from, to)) != NOCELT) {
-			if (from < ce)
-				subrange(v, from, ce - 1, lp, rp);
-			assert(singleton(v->cm, ce));
-			assert(leads != NULL);
-			if (!haschr(leads, ce))
-				addchr(leads, ce);
-			from = ce + 1;
-		}
-		if (from <= to)
-			subrange(v, from, to, lp, rp);
-	}
-
-	if ((leads == NULL || leads->nchrs == 0) && cv->nmcces == 0)
-		return;
-
-	/* deal with the MCCE leaders */
-	NOTE(REG_ULOCALE);
-	for (p = leads->chrs, i = leads->nchrs; i > 0; p++, i--) {
-		co = GETCOLOR(v->cm, *p);
-		a = findarc(lp, PLAIN, co);
-		if (a != NULL)
-			s = a->to;
-		else {
-			s = newstate(v->nfa);
-			NOERR();
-			newarc(v->nfa, PLAIN, co, lp, s);
-			NOERR();
-		}
-		pa = findarc(v->mccepbegin, PLAIN, co);
-		assert(pa != NULL);
-		ps = pa->to;
-		newarc(v->nfa, '$', 1, s, rp);
-		newarc(v->nfa, '$', 0, s, rp);
-		colorcomplement(v->nfa, v->cm, AHEAD, ps, s, rp);
-		NOERR();
-	}
-
-	/* and the MCCEs */
-	for (i = 0; i < cv->nmcces; i++) {
-		p = cv->mcces[i];
-		assert(singleton(v->cm, *p));
-		ch = *p++;
-		co = GETCOLOR(v->cm, ch);
-		a = findarc(lp, PLAIN, co);
-		if (a != NULL)
-			s = a->to;
-		else {
-			s = newstate(v->nfa);
-			NOERR();
-			newarc(v->nfa, PLAIN, co, lp, s);
-			NOERR();
-		}
-		assert(*p != 0);	/* at least two chars */
-		assert(singleton(v->cm, *p));
-		ch = *p++;
-		co = GETCOLOR(v->cm, ch);
-		assert(*p == 0);	/* and only two, for now */
-		newarc(v->nfa, PLAIN, co, s, rp);
-		NOERR();
-	}
-}
-
-/*
- - nextleader - find next MCCE leader within range
- ^ static celt nextleader(struct vars *, pchr, pchr);
- */
-static celt			/* NOCELT means none */
-nextleader(v, from, to)
-struct vars *v;
-pchr from;
-pchr to;
-{
-	int i;
-	chr *p;
-	chr ch;
-	celt it = NOCELT;
-
-	if (v->mcces == NULL)
-		return it;
-
-	for (i = v->mcces->nchrs, p = v->mcces->chrs; i > 0; i--, p++) {
-		ch = *p;
-		if (from <= ch && ch <= to)
-			if (it == NOCELT || ch < it)
-				it = ch;
-	}
-	return it;
-}
-
-/*
- - wordchrs - set up word-chr list for word-boundary stuff, if needed
- * The list is kept as a bunch of arcs between two dummy states; it's
- * disposed of by the unreachable-states sweep in NFA optimization.
- * Does NEXT().  Must not be called from any unusual lexical context.
- * This should be reconciled with the \w etc. handling in lex.c, and
- * should be cleaned up to reduce dependencies on input scanning.
- ^ static VOID wordchrs(struct vars *);
- */
-static VOID
-wordchrs(v)
-struct vars *v;
-{
-	struct state *left;
-	struct state *right;
-
-	if (v->wordchrs != NULL) {
-		NEXT();		/* for consistency */
-		return;
-	}
-
-	left = newstate(v->nfa);
-	right = newstate(v->nfa);
-	NOERR();
-	/* fine point:  implemented with [::], and lexer will set REG_ULOCALE */
-	lexword(v);
-	NEXT();
-	assert(v->savenow != NULL && SEE('['));
-	bracket(v, left, right);
-	assert((v->savenow != NULL && SEE(']')) || ISERR());
-	NEXT();
-	NOERR();
-	v->wordchrs = left;
-}
-
-/*
- - subre - allocate a subre
- ^ static struct subre *subre(struct vars *, int, int, struct state *,
- ^	struct state *);
- */
-static struct subre *
-subre(v, op, flags, begin, end)
-struct vars *v;
-int op;
-int flags;
-struct state *begin;
-struct state *end;
-{
-	struct subre *ret;
-
-	ret = v->treefree;
-	if (ret != NULL)
-		v->treefree = ret->left;
-	else {
-		ret = (struct subre *)MALLOC(sizeof(struct subre));
-		if (ret == NULL) {
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-		ret->chain = v->treechain;
-		v->treechain = ret;
-	}
-
-	assert(strchr("|.b(=", op) != NULL);
-
-	ret->op = op;
-	ret->flags = flags;
-	ret->retry = 0;
-	ret->subno = 0;
-	ret->min = ret->max = 1;
-	ret->left = NULL;
-	ret->right = NULL;
-	ret->begin = begin;
-	ret->end = end;
-	ZAPCNFA(ret->cnfa);
-
-	return ret;
-}
-
-/*
- - freesubre - free a subRE subtree
- ^ static VOID freesubre(struct vars *, struct subre *);
- */
-static VOID
-freesubre(v, sr)
-struct vars *v;			/* might be NULL */
-struct subre *sr;
-{
-	if (sr == NULL)
-		return;
-
-	if (sr->left != NULL)
-		freesubre(v, sr->left);
-	if (sr->right != NULL)
-		freesubre(v, sr->right);
-
-	freesrnode(v, sr);
-}
-
-/*
- - freesrnode - free one node in a subRE subtree
- ^ static VOID freesrnode(struct vars *, struct subre *);
- */
-static VOID
-freesrnode(v, sr)
-struct vars *v;			/* might be NULL */
-struct subre *sr;
-{
-	if (sr == NULL)
-		return;
-
-	if (!NULLCNFA(sr->cnfa))
-		freecnfa(&sr->cnfa);
-	sr->flags = 0;
-
-	if (v != NULL) {
-		sr->left = v->treefree;
-		v->treefree = sr;
-	} else
-		FREE(sr);
-}
-
-/*
- - optst - optimize a subRE subtree
- ^ static VOID optst(struct vars *, struct subre *);
- */
-static VOID
-optst(v, t)
-struct vars *v;
-struct subre *t;
-{
-	if (t == NULL)
-		return;
-
-	/* preference cleanup and analysis */
-	if (t->flags&SHORTER)
-		v->usedshorter = 1;
-
-	/* recurse through children */
-	if (t->left != NULL)
-		optst(v, t->left);
-	if (t->right != NULL)
-		optst(v, t->right);
-}
-
-/*
- - numst - number tree nodes (assigning retry indexes)
- ^ static int numst(struct subre *, int);
- */
-static int			/* next number */
-numst(t, start)
-struct subre *t;
-int start;			/* starting point for subtree numbers */
-{
-	int i;
-
-	assert(t != NULL);
-
-	i = start;
-	t->retry = (short)i++;
-	if (t->left != NULL)
-		i = numst(t->left, i);
-	if (t->right != NULL)
-		i = numst(t->right, i);
-	return i;
-}
-
-/*
- - markst - mark tree nodes as INUSE
- ^ static VOID markst(struct subre *);
- */
-static VOID
-markst(t)
-struct subre *t;
-{
-	assert(t != NULL);
-
-	t->flags |= INUSE;
-	if (t->left != NULL)
-		markst(t->left);
-	if (t->right != NULL)
-		markst(t->right);
-}
-
-/*
- - cleanst - free any tree nodes not marked INUSE
- ^ static VOID cleanst(struct vars *);
- */
-static VOID
-cleanst(v)
-struct vars *v;
-{
-	struct subre *t;
-	struct subre *next;
-
-	for (t = v->treechain; t != NULL; t = next) {
-		next = t->chain;
-		if (!(t->flags&INUSE))
-			FREE(t);
-	}
-	v->treechain = NULL;
-	v->treefree = NULL;		/* just on general principles */
-}
-
-/*
- - nfatree - turn a subRE subtree into a tree of compacted NFAs
- ^ static int nfatree(struct vars *, struct subre *, FILE *);
- */
-static int			/* optimize results from top node */
-nfatree(v, t, f)
-struct vars *v;
-struct subre *t;
-FILE *f;			/* for debug output */
-{
-	assert(t != NULL && t->begin != NULL);
-
-	if (t->left != NULL)
-		(DISCARD)nfatree(v, t->left, f);
-	if (t->right != NULL)
-		(DISCARD)nfatree(v, t->right, f);
-
-	return nfanode(v, t, f);
-}
-
-/*
- - nfanode - do one NFA for nfatree
- ^ static int nfanode(struct vars *, struct subre *, FILE *);
- */
-static int			/* optimize results */
-nfanode(v, t, f)
-struct vars *v;
-struct subre *t;
-FILE *f;			/* for debug output */
-{
-	struct nfa *nfa;
-	int ret = 0;
-
-	assert(t->begin != NULL);
-
-	nfa = newnfa(v, v->cm, v->nfa);
-	NOERRZ();
-	dupnfa(nfa, t->begin, t->end, nfa->init, nfa->final);
-	if (!ISERR()) {
-		specialcolors(nfa);
-		ret = optimize(nfa, f);
-	}
-	if (!ISERR())
-		compact(nfa, &t->cnfa);
-
-	freenfa(nfa);
-	return ret;
-}
-
-/*
- - newlacon - allocate a lookahead-constraint subRE
- ^ static int newlacon(struct vars *, struct state *, struct state *, int);
- */
-static int			/* lacon number */
-newlacon(v, begin, end, pos)
-struct vars *v;
-struct state *begin;
-struct state *end;
-int pos;
-{
-	int n;
-	struct subre *sub;
-
-	if (v->nlacons == 0) {
-		v->lacons = (struct subre *)MALLOC(2 * sizeof(struct subre));
-		n = 1;		/* skip 0th */
-		v->nlacons = 2;
-	} else {
-		v->lacons = (struct subre *)REALLOC(v->lacons,
-					(v->nlacons+1)*sizeof(struct subre));
-		n = v->nlacons++;
-	}
-	if (v->lacons == NULL) {
-		ERR(REG_ESPACE);
-		return 0;
-	}
-	sub = &v->lacons[n];
-	sub->begin = begin;
-	sub->end = end;
-	sub->subno = pos;
-	ZAPCNFA(sub->cnfa);
-	return n;
-}
-
-/*
- - freelacons - free lookahead-constraint subRE vector
- ^ static VOID freelacons(struct subre *, int);
- */
-static VOID
-freelacons(subs, n)
-struct subre *subs;
-int n;
-{
-	struct subre *sub;
-	int i;
-
-	assert(n > 0);
-	for (sub = subs + 1, i = n - 1; i > 0; sub++, i--)	/* no 0th */
-		if (!NULLCNFA(sub->cnfa))
-			freecnfa(&sub->cnfa);
-	FREE(subs);
-}
-
-/*
- - rfree - free a whole RE (insides of regfree)
- ^ static VOID rfree(regex_t *);
- */
-static VOID
-rfree(re)
-regex_t *re;
-{
-	struct guts *g;
-
-	if (re == NULL || re->re_magic != REMAGIC)
-		return;
-
-	re->re_magic = 0;	/* invalidate RE */
-	g = (struct guts *)re->re_guts;
-	re->re_guts = NULL;
-	re->re_fns = NULL;
-	g->magic = 0;
-	freecm(&g->cmap);
-	if (g->tree != NULL)
-		freesubre((struct vars *)NULL, g->tree);
-	if (g->lacons != NULL)
-		freelacons(g->lacons, g->nlacons);
-	if (!NULLCNFA(g->search))
-		freecnfa(&g->search);
-	FREE(g);
-}
-
-/*
- - dump - dump an RE in human-readable form
- ^ static VOID dump(regex_t *, FILE *);
- */
-static VOID
-dump(re, f)
-regex_t *re;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	struct guts *g;
-	int i;
-
-	if (re->re_magic != REMAGIC)
-		fprintf(f, "bad magic number (0x%x not 0x%x)\n", re->re_magic,
-								REMAGIC);
-	if (re->re_guts == NULL) {
-		fprintf(f, "NULL guts!!!\n");
-		return;
-	}
-	g = (struct guts *)re->re_guts;
-	if (g->magic != GUTSMAGIC)
-		fprintf(f, "bad guts magic number (0x%x not 0x%x)\n", g->magic,
-								GUTSMAGIC);
-
-	fprintf(f, "nsub %d, info 0%o, csize %d, ntree %d, usedshort %d\n", 
-		re->re_nsub, re->re_info, re->re_csize, g->ntree,
-		g->usedshorter);
-
-	dumpcolors(&g->cmap, f);
-	if (!NULLCNFA(g->search)) {
-		printf("search:\n");
-		dumpcnfa(&g->search, f);
-	}
-	for (i = 1; i < g->nlacons; i++) {
-		fprintf(f, "la%d (%s):\n", i,
-				(g->lacons[i].subno) ? "positive" : "negative");
-		dumpcnfa(&g->lacons[i].cnfa, f);
-	}
-	dumpst(g->tree, f, 0);
-#endif
-}
-
-/*
- - dumpst - dump a subRE tree
- ^ static VOID dumpst(struct subre *, FILE *, int);
- */
-static VOID
-dumpst(t, f, nfapresent)
-struct subre *t;
-FILE *f;
-int nfapresent;			/* is the original NFA still around? */
-{
-	if (t == NULL)
-		fprintf(f, "null tree\n");
-	else
-		stdump(t, f, nfapresent, 0);
-	fflush(f);
-}
-
-/*
- - stdump - recursive guts of dumpst
- ^ static VOID stdump(struct subre *, FILE *, int, int);
- */
-static VOID
-stdump(t, f, nfapresent, level)
-struct subre *t;
-FILE *f;
-int nfapresent;			/* is the original NFA still around? */
-int level;
-{
-	int i;
-#	define	RTSEP	"  "
-
-	for (i = 0; i < level; i++)
-		fprintf(f, RTSEP);
-	fprintf(f, "%c (", t->op);
-	if (t->flags&LONGER)
-		fprintf(f, "L");
-	if (t->flags&SHORTER)
-		fprintf(f, "S");
-	if (t->flags&MIXED)
-		fprintf(f, "M");
-	if (t->flags&CAP)
-		fprintf(f, "c");
-	if (t->flags&BACKR)
-		fprintf(f, "b");
-	if (!(t->flags&INUSE))
-		fprintf(f, "!u");
-	fprintf(f, ") r%d", t->retry);
-	if (t->subno != 0)
-		fprintf(f, " #%d", t->subno);
-	if (t->min != 1 || t->max != 1) {
-		fprintf(f, "{%d,", t->min);
-		if (t->max != INFINITY)
-			fprintf(f, "%d", t->max);
-		fprintf(f, "}");
-	}
-	if (nfapresent)
-		fprintf(f, " %ld-%ld", (long)t->begin->no, (long)t->end->no);
-	if (!NULLCNFA(t->cnfa))
-		fprintf(f, ":");
-	fprintf(f, "\n");
-	if (t->left != NULL)
-		stdump(t->left, f, nfapresent, level+1);
-	if (!NULLCNFA(t->cnfa))
-		dumpcnfa(&t->cnfa, f);
-	if (t->right != NULL)
-		stdump(t->right, f, nfapresent, level+1);
-}
-
-#include "regc_lex.c"
-#include "regc_color.c"
-#include "regc_nfa.c"
-#include "regc_cvec.c"
-#include "regc_locale.c"
diff --git a/generic/regcustom.h b/generic/regcustom.h
deleted file mode 100644
index b1d53a9..0000000
--- a/generic/regcustom.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* headers (which also pick up the standard ones, or equivalents) */
-#include "tclInt.h"
-
-/* overrides for regguts.h definitions */
-/* function-pointer declarations */
-#define	FUNCPTR(name, args)	(*name) _ANSI_ARGS_(args)
-#define	MALLOC(n)		ckalloc(n)
-#define	FREE(p)			ckfree(VS(p))
-#define	REALLOC(p,n)		ckrealloc(VS(p),n)
-
-
-
-/*
- * Do not insert extras between the "begin" and "end" lines -- this
- * chunk is automatically extracted to be fitted into regex.h.
- */
-/* --- begin --- */
-/* ensure certain things don't sneak in from system headers */
-#ifdef __REG_WIDE_T
-#undef __REG_WIDE_T
-#endif
-#ifdef __REG_WIDE_COMPILE
-#undef __REG_WIDE_COMPILE
-#endif
-#ifdef __REG_WIDE_EXEC
-#undef __REG_WIDE_EXEC
-#endif
-#ifdef __REG_REGOFF_T
-#undef __REG_REGOFF_T
-#endif
-#ifdef __REG_VOID_T
-#undef __REG_VOID_T
-#endif
-#ifdef __REG_CONST
-#undef __REG_CONST
-#endif
-/* interface types */
-#define	__REG_WIDE_T	Tcl_UniChar
-#define	__REG_REGOFF_T	long	/* not really right, but good enough... */
-#define	__REG_VOID_T	VOID
-#define	__REG_CONST	CONST
-/* names and declarations */
-#define	__REG_WIDE_COMPILE	TclReComp
-#define	__REG_WIDE_EXEC		TclReExec
-#ifndef __REG_NOFRONT
-#define	__REG_NOFRONT		/* don't want regcomp() and regexec() */
-#endif
-#ifndef __REG_NOCHAR
-#define	__REG_NOCHAR		/* or the char versions */
-#endif
-#define	regfree		TclReFree
-#define	regerror	TclReError
-/* --- end --- */
-
-
-
-/* internal character type and related */
-typedef Tcl_UniChar chr;	/* the type itself */
-typedef int pchr;		/* what it promotes to */
-typedef unsigned uchr;		/* unsigned type that will hold a chr */
-typedef int celt;		/* type to hold chr, MCCE number, or NOCELT */
-#define	NOCELT	(-1)		/* celt value which is not valid chr or MCCE */
-#define	CHR(c)	(UCHAR(c))	/* turn char literal into chr literal */
-#define	DIGITVAL(c)	((c)-'0')	/* turn chr digit into its value */
-#define	CHRBITS	16		/* bits in a chr; must not use sizeof */
-#define	CHR_MIN	0x0000		/* smallest and largest chr; the value */
-#define	CHR_MAX	0xffff		/*  CHR_MAX-CHR_MIN+1 should fit in uchr */
-
-/* functions operating on chr */
-#define	iscalnum(x)	Tcl_UniCharIsAlnum(x)
-#define	iscalpha(x)	Tcl_UniCharIsAlpha(x)
-#define	iscdigit(x)	Tcl_UniCharIsDigit(x)
-#define	iscspace(x)	Tcl_UniCharIsSpace(x)
-
-/* name the external functions */
-#define	compile		TclReComp
-#define	exec		TclReExec
-
-/* enable/disable debugging code (by whether REG_DEBUG is defined or not) */
-#ifdef notdef
-#define	REG_DEBUG	/* */
-#endif
-
-/* and pick up the standard header */
-#include "regex.h"
diff --git a/generic/rege_dfa.c b/generic/rege_dfa.c
deleted file mode 100644
index eb31ffc6..0000000
--- a/generic/rege_dfa.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * DFA routines
- * This file is #included by regexec.c.
- */
-
-/*
- - longest - longest-preferred matching engine
- ^ static chr *longest(struct vars *, struct dfa *, chr *, chr *);
- */
-static chr *			/* endpoint, or NULL */
-longest(v, d, start, stop)
-struct vars *v;			/* used only for debug and exec flags */
-struct dfa *d;
-chr *start;			/* where the match should start */
-chr *stop;			/* match must end at or before here */
-{
-	chr *cp;
-	chr *realstop = (stop == v->stop) ? stop : stop + 1;
-	color co;
-	struct sset *css;
-	struct sset *ss;
-	chr *post;
-	int i;
-	struct colormap *cm = d->cm;
-
-	/* initialize */
-	css = initialize(v, d, start);
-	cp = start;
-
-	/* startup */
-	FDEBUG(("+++ startup +++\n"));
-	if (cp == v->start) {
-		co = d->cnfa->bos[(v->eflags&REG_NOTBOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-	} else {
-		co = GETCOLOR(cm, *(cp - 1));
-		FDEBUG(("char %c, color %ld\n", (char)*(cp-1), (long)co));
-	}
-	css = miss(v, d, css, co, cp, start);
-	if (css == NULL)
-		return NULL;
-	css->lastseen = cp;
-
-	/* main loop */
-	if (v->eflags&REG_FTRACE)
-		while (cp < realstop) {
-			FDEBUG(("+++ at c%d +++\n", css - d->ssets));
-			co = GETCOLOR(cm, *cp);
-			FDEBUG(("char %c, color %ld\n", (char)*cp, (long)co));
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-		}
-	else
-		while (cp < realstop) {
-			co = GETCOLOR(cm, *cp);
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-		}
-
-	/* shutdown */
-	FDEBUG(("+++ shutdown at c%d +++\n", css - d->ssets));
-	if (cp == v->stop && stop == v->stop) {
-		co = d->cnfa->eos[(v->eflags&REG_NOTEOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-		ss = miss(v, d, css, co, cp, start);
-		/* special case:  match ended at eol? */
-		if (ss != NULL && (ss->flags&POSTSTATE))
-			return cp;
-		else if (ss != NULL)
-			ss->lastseen = cp;	/* to be tidy */
-	}
-
-	/* find last match, if any */
-	post = d->lastpost;
-	for (ss = d->ssets, i = 0; i < d->nssused; ss++, i++)
-		if ((ss->flags&POSTSTATE) && post != ss->lastseen &&
-					(post == NULL || post < ss->lastseen))
-			post = ss->lastseen;
-	if (post != NULL)		/* found one */
-		return post - 1;
-
-	return NULL;
-}
-
-/*
- - shortest - shortest-preferred matching engine
- ^ static chr *shortest(struct vars *, struct dfa *, chr *, chr *, chr *,
- ^ 	chr **);
- */
-static chr *			/* endpoint, or NULL */
-shortest(v, d, start, min, max, coldp)
-struct vars *v;			/* used only for debug and exec flags */
-struct dfa *d;
-chr *start;			/* where the match should start */
-chr *min;			/* match must end at or after here */
-chr *max;			/* match must end at or before here */
-chr **coldp;			/* store coldstart pointer here, if nonNULL */
-{
-	chr *cp;
-	chr *realmin = (min == v->stop) ? min : min + 1;
-	chr *realmax = (max == v->stop) ? max : max + 1;
-	color co;
-	struct sset *css;
-	struct sset *ss;
-	struct colormap *cm = d->cm;
-	chr *nopr;
-	int i;
-
-	/* initialize */
-	css = initialize(v, d, start);
-	cp = start;
-
-	/* startup */
-	FDEBUG(("--- startup ---\n"));
-	if (cp == v->start) {
-		co = d->cnfa->bos[(v->eflags&REG_NOTBOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-	} else {
-		co = GETCOLOR(cm, *(cp - 1));
-		FDEBUG(("char %c, color %ld\n", (char)*(cp-1), (long)co));
-	}
-	css = miss(v, d, css, co, cp, start);
-	if (css == NULL)
-		return NULL;
-	css->lastseen = cp;
-	ss = css;
-
-	/* main loop */
-	if (v->eflags&REG_FTRACE)
-		while (cp < realmax) {
-			FDEBUG(("--- at c%d ---\n", css - d->ssets));
-			co = GETCOLOR(cm, *cp);
-			FDEBUG(("char %c, color %ld\n", (char)*cp, (long)co));
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-			if ((ss->flags&POSTSTATE) && cp >= realmin)
-				break;		/* NOTE BREAK OUT */
-		}
-	else
-		while (cp < realmax) {
-			co = GETCOLOR(cm, *cp);
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-			if ((ss->flags&POSTSTATE) && cp >= realmin)
-				break;		/* NOTE BREAK OUT */
-		}
-
-	if (ss == NULL)
-		return NULL;
-	else if (ss->flags&POSTSTATE) {
-		assert(cp >= realmin);
-		cp--;
-	} else if (cp == v->stop && max == v->stop) {
-		co = d->cnfa->eos[(v->eflags&REG_NOTEOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-		ss = miss(v, d, css, co, cp, start);
-		/* match might have ended at eol */
-	}
-
-	if (ss == NULL || !(ss->flags&POSTSTATE))
-		return NULL;
-
-	/* find last no-progress state set, if any */
-	nopr = d->lastnopr;
-	for (ss = d->ssets, i = 0; i < d->nssused; ss++, i++)
-		if ((ss->flags&NOPROGRESS) && nopr != ss->lastseen &&
-					(nopr == NULL || nopr < ss->lastseen))
-			nopr = ss->lastseen;
-	assert(nopr != NULL);
-	if (coldp != NULL)
-		*coldp = (nopr == v->start) ? nopr : nopr-1;
-	return cp;
-}
-
-/*
- - newdfa - set up a fresh DFA
- ^ static struct dfa *newdfa(struct vars *, struct cnfa *,
- ^ 	struct colormap *, struct smalldfa *);
- */
-static struct dfa *
-newdfa(v, cnfa, cm, small)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-struct smalldfa *small;		/* preallocated space, may be NULL */
-{
-	struct dfa *d;
-	size_t nss = cnfa->nstates * 2;
-	int wordsper = (cnfa->nstates + UBITS - 1) / UBITS;
-	struct smalldfa *smallwas = small;
-
-	assert(cnfa != NULL && cnfa->nstates != 0);
-
-	if (nss <= FEWSTATES && cnfa->ncolors <= FEWCOLORS) {
-		assert(wordsper == 1);
-		if (small == NULL) {
-			small = (struct smalldfa *)MALLOC(
-						sizeof(struct smalldfa));
-			if (small == NULL) {
-				ERR(REG_ESPACE);
-				return NULL;
-			}
-		}
-		d = &small->dfa;
-		d->ssets = small->ssets;
-		d->statesarea = small->statesarea;
-		d->work = &d->statesarea[nss];
-		d->outsarea = small->outsarea;
-		d->incarea = small->incarea;
-		d->cptsmalloced = 0;
-		d->mallocarea = (smallwas == NULL) ? (char *)small : NULL;
-	} else {
-		d = (struct dfa *)MALLOC(sizeof(struct dfa));
-		if (d == NULL) {
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-		d->ssets = (struct sset *)MALLOC(nss * sizeof(struct sset));
-		d->statesarea = (unsigned *)MALLOC((nss+WORK) * wordsper *
-							sizeof(unsigned));
-		d->work = &d->statesarea[nss * wordsper];
-		d->outsarea = (struct sset **)MALLOC(nss * cnfa->ncolors *
-							sizeof(struct sset *));
-		d->incarea = (struct arcp *)MALLOC(nss * cnfa->ncolors *
-							sizeof(struct arcp));
-		d->cptsmalloced = 1;
-		d->mallocarea = (char *)d;
-		if (d->ssets == NULL || d->statesarea == NULL ||
-				d->outsarea == NULL || d->incarea == NULL) {
-			freedfa(d);
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-	}
-
-	d->nssets = (v->eflags&REG_SMALL) ? 7 : nss;
-	d->nssused = 0;
-	d->nstates = cnfa->nstates;
-	d->ncolors = cnfa->ncolors;
-	d->wordsper = wordsper;
-	d->cnfa = cnfa;
-	d->cm = cm;
-	d->lastpost = NULL;
-	d->lastnopr = NULL;
-	d->search = d->ssets;
-
-	/* initialization of sset fields is done as needed */
-
-	return d;
-}
-
-/*
- - freedfa - free a DFA
- ^ static VOID freedfa(struct dfa *);
- */
-static VOID
-freedfa(d)
-struct dfa *d;
-{
-	if (d->cptsmalloced) {
-		if (d->ssets != NULL)
-			FREE(d->ssets);
-		if (d->statesarea != NULL)
-			FREE(d->statesarea);
-		if (d->outsarea != NULL)
-			FREE(d->outsarea);
-		if (d->incarea != NULL)
-			FREE(d->incarea);
-	}
-
-	if (d->mallocarea != NULL)
-		FREE(d->mallocarea);
-}
-
-/*
- - hash - construct a hash code for a bitvector
- * There are probably better ways, but they're more expensive.
- ^ static unsigned hash(unsigned *, int);
- */
-static unsigned
-hash(uv, n)
-unsigned *uv;
-int n;
-{
-	int i;
-	unsigned h;
-
-	h = 0;
-	for (i = 0; i < n; i++)
-		h ^= uv[i];
-	return h;
-}
-
-/*
- - initialize - hand-craft a cache entry for startup, otherwise get ready
- ^ static struct sset *initialize(struct vars *, struct dfa *, chr *);
- */
-static struct sset *
-initialize(v, d, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *start;
-{
-	struct sset *ss;
-	int i;
-
-	/* is previous one still there? */
-	if (d->nssused > 0 && (d->ssets[0].flags&STARTER))
-		ss = &d->ssets[0];
-	else {				/* no, must (re)build it */
-		ss = getvacant(v, d, start, start);
-		for (i = 0; i < d->wordsper; i++)
-			ss->states[i] = 0;
-		BSET(ss->states, d->cnfa->pre);
-		ss->hash = HASH(ss->states, d->wordsper);
-		assert(d->cnfa->pre != d->cnfa->post);
-		ss->flags = STARTER|LOCKED|NOPROGRESS;
-		/* lastseen dealt with below */
-	}
-
-	for (i = 0; i < d->nssused; i++)
-		d->ssets[i].lastseen = NULL;
-	ss->lastseen = start;		/* maybe untrue, but harmless */
-	d->lastpost = NULL;
-	d->lastnopr = NULL;
-	return ss;
-}
-
-/*
- - miss - handle a cache miss
- ^ static struct sset *miss(struct vars *, struct dfa *, struct sset *,
- ^ 	pcolor, chr *, chr *);
- */
-static struct sset *		/* NULL if goes to empty set */
-miss(v, d, css, co, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-struct sset *css;
-pcolor co;
-chr *cp;			/* next chr */
-chr *start;			/* where the attempt got started */
-{
-	struct cnfa *cnfa = d->cnfa;
-	int i;
-	unsigned h;
-	struct carc *ca;
-	struct sset *p;
-	int ispost;
-	int noprogress;
-	int gotstate;
-	int dolacons;
-	int didlacons;
-
-	/* for convenience, we can be called even if it might not be a miss */
-	if (css->outs[co] != NULL) {
-		FDEBUG(("hit\n"));
-		return css->outs[co];
-	}
-	FDEBUG(("miss\n"));
-
-	/* first, what set of states would we end up in? */
-	for (i = 0; i < d->wordsper; i++)
-		d->work[i] = 0;
-	ispost = 0;
-	noprogress = 1;
-	gotstate = 0;
-	for (i = 0; i < d->nstates; i++)
-		if (ISBSET(css->states, i))
-			for (ca = cnfa->states[i]+1; ca->co != COLORLESS; ca++)
-				if (ca->co == co) {
-					BSET(d->work, ca->to);
-					gotstate = 1;
-					if (ca->to == cnfa->post)
-						ispost = 1;
-					if (!cnfa->states[ca->to]->co)
-						noprogress = 0;
-					FDEBUG(("%d -> %d\n", i, ca->to));
-				}
-	dolacons = (gotstate) ? (cnfa->flags&HASLACONS) : 0;
-	didlacons = 0;
-	while (dolacons) {		/* transitive closure */
-		dolacons = 0;
-		for (i = 0; i < d->nstates; i++)
-			if (ISBSET(d->work, i))
-				for (ca = cnfa->states[i]+1; ca->co != COLORLESS;
-									ca++)
-					if (ca->co > cnfa->ncolors &&
-						!ISBSET(d->work, ca->to) &&
-							lacon(v, cnfa, cp,
-								ca->co)) {
-						BSET(d->work, ca->to);
-						dolacons = 1;
-						didlacons = 1;
-						if (ca->to == cnfa->post)
-							ispost = 1;
-						if (!cnfa->states[ca->to]->co)
-							noprogress = 0;
-						FDEBUG(("%d :> %d\n",i,ca->to));
-					}
-	}
-	if (!gotstate)
-		return NULL;
-	h = HASH(d->work, d->wordsper);
-
-	/* next, is that in the cache? */
-	for (p = d->ssets, i = d->nssused; i > 0; p++, i--)
-		if (HIT(h, d->work, p, d->wordsper)) {
-#ifndef xxx
-p->hash == h && 
-memcmp(VS(d->work), VS(p->states),
-					d->wordsper*sizeof(unsigned)) == 0) {
-#endif
-			FDEBUG(("cached c%d\n", p - d->ssets));
-			break;			/* NOTE BREAK OUT */
-		}
-	if (i == 0) {		/* nope, need a new cache entry */
-		p = getvacant(v, d, cp, start);
-		assert(p != css);
-		for (i = 0; i < d->wordsper; i++)
-			p->states[i] = d->work[i];
-		p->hash = h;
-		p->flags = (ispost) ? POSTSTATE : 0;
-		if (noprogress)
-			p->flags |= NOPROGRESS;
-		/* lastseen to be dealt with by caller */
-	}
-
-	if (!didlacons) {		/* lookahead conds. always cache miss */
-		css->outs[co] = p;
-		css->inchain[co] = p->ins;
-		p->ins.ss = css;
-		p->ins.co = (color)co;
-	}
-	return p;
-}
-
-/*
- - lacon - lookahead-constraint checker for miss()
- ^ static int lacon(struct vars *, struct cnfa *, chr *, pcolor);
- */
-static int			/* predicate:  constraint satisfied? */
-lacon(v, pcnfa, cp, co)
-struct vars *v;
-struct cnfa *pcnfa;		/* parent cnfa */
-chr *cp;
-pcolor co;			/* "color" of the lookahead constraint */
-{
-	int n;
-	struct subre *sub;
-	struct dfa *d;
-	struct smalldfa sd;
-	chr *end;
-
-	n = co - pcnfa->ncolors;
-	assert(n < v->g->nlacons && v->g->lacons != NULL);
-	FDEBUG(("=== testing lacon %d\n", n));
-	sub = &v->g->lacons[n];
-	d = newdfa(v, &sub->cnfa, &v->g->cmap, &sd);
-	if (d == NULL) {
-		ERR(REG_ESPACE);
-		return 0;
-	}
-	end = longest(v, d, cp, v->stop);
-	freedfa(d);
-	FDEBUG(("=== lacon %d match %d\n", n, (end != NULL)));
-	return (sub->subno) ? (end != NULL) : (end == NULL);
-}
-
-/*
- - getvacant - get a vacant state set
- * This routine clears out the inarcs and outarcs, but does not otherwise
- * clear the innards of the state set -- that's up to the caller.
- ^ static struct sset *getvacant(struct vars *, struct dfa *, chr *, chr *);
- */
-static struct sset *
-getvacant(v, d, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *cp;
-chr *start;
-{
-	int i;
-	struct sset *ss;
-	struct sset *p;
-	struct arcp ap;
-	struct arcp lastap;
-	color co;
-
-	ss = pickss(v, d, cp, start);
-	assert(!(ss->flags&LOCKED));
-
-	/* clear out its inarcs, including self-referential ones */
-	ap = ss->ins;
-	while ((p = ap.ss) != NULL) {
-		co = ap.co;
-		FDEBUG(("zapping c%d's %ld outarc\n", p - d->ssets, (long)co));
-		p->outs[co] = NULL;
-		ap = p->inchain[co];
-		p->inchain[co].ss = NULL;	/* paranoia */
-	}
-	ss->ins.ss = NULL;
-
-	/* take it off the inarc chains of the ssets reached by its outarcs */
-	for (i = 0; i < d->ncolors; i++) {
-		p = ss->outs[i];
-		assert(p != ss);		/* not self-referential */
-		if (p == NULL)
-			continue;		/* NOTE CONTINUE */
-		FDEBUG(("del outarc %d from c%d's in chn\n", i, p - d->ssets));
-		if (p->ins.ss == ss && p->ins.co == i)
-			p->ins = ss->inchain[i];
-		else {
-			assert(p->ins.ss != NULL);
-			for (ap = p->ins; ap.ss != NULL &&
-						!(ap.ss == ss && ap.co == i);
-						ap = ap.ss->inchain[ap.co])
-				lastap = ap;
-			assert(ap.ss != NULL);
-			lastap.ss->inchain[lastap.co] = ss->inchain[i];
-		}
-		ss->outs[i] = NULL;
-		ss->inchain[i].ss = NULL;
-	}
-
-	/* if ss was a success state, may need to remember location */
-	if ((ss->flags&POSTSTATE) && ss->lastseen != d->lastpost &&
-			(d->lastpost == NULL || d->lastpost < ss->lastseen))
-		d->lastpost = ss->lastseen;
-
-	/* likewise for a no-progress state */
-	if ((ss->flags&NOPROGRESS) && ss->lastseen != d->lastnopr &&
-			(d->lastnopr == NULL || d->lastnopr < ss->lastseen))
-		d->lastnopr = ss->lastseen;
-
-	return ss;
-}
-
-/*
- - pickss - pick the next stateset to be used
- ^ static struct sset *pickss(struct vars *, struct dfa *, chr *, chr *);
- */
-static struct sset *
-pickss(v, d, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *cp;
-chr *start;
-{
-	int i;
-	struct sset *ss;
-	struct sset *end;
-	chr *ancient;
-
-	/* shortcut for cases where cache isn't full */
-	if (d->nssused < d->nssets) {
-		i = d->nssused;
-		d->nssused++;
-		ss = &d->ssets[i];
-		FDEBUG(("new c%d\n", i));
-		/* set up innards */
-		ss->states = &d->statesarea[i * d->wordsper];
-		ss->flags = 0;
-		ss->ins.ss = NULL;
-		ss->ins.co = WHITE;		/* give it some value */
-		ss->outs = &d->outsarea[i * d->ncolors];
-		ss->inchain = &d->incarea[i * d->ncolors];
-		for (i = 0; i < d->ncolors; i++) {
-			ss->outs[i] = NULL;
-			ss->inchain[i].ss = NULL;
-		}
-		return ss;
-	}
-
-	/* look for oldest, or old enough anyway */
-	if (cp - start > d->nssets*2/3)		/* oldest 33% are expendable */
-		ancient = cp - d->nssets*2/3;
-	else
-		ancient = start;
-	for (ss = d->search, end = &d->ssets[d->nssets]; ss < end; ss++)
-		if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
-							!(ss->flags&LOCKED)) {
-			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
-			return ss;
-		}
-	for (ss = d->ssets, end = d->search; ss < end; ss++)
-		if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
-							!(ss->flags&LOCKED)) {
-			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
-			return ss;
-		}
-
-	/* nobody's old enough?!? -- something's really wrong */
-	FDEBUG(("can't find victim to replace!\n"));
-	assert(NOTREACHED);
-	ERR(REG_ASSERT);
-	return d->ssets;
-}
diff --git a/generic/regerror.c b/generic/regerror.c
deleted file mode 100644
index 6779e51..0000000
--- a/generic/regerror.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * regerror - error-code expansion
- */
-
-#include "regguts.h"
-
-/* unknown-error explanation */
-static char unk[] = "*** unknown regex error code 0x%x ***";
-
-/* struct to map among codes, code names, and explanations */
-static struct rerr {
-	int code;
-	char *name;
-	char *explain;
-} rerrs[] = {
-	/* the actual table is built from regex.h */
-#	include "regerrs.h"
-	{ -1,	"",	"oops" },	/* explanation special-cased in code */
-};
-
-/*
- - regerror - the interface to error numbers
- */
-/* ARGSUSED */
-size_t				/* actual space needed (including NUL) */
-regerror(errcode, preg, errbuf, errbuf_size)
-int errcode;			/* error code, or REG_ATOI or REG_ITOA */
-CONST regex_t *preg;		/* associated regex_t (unused at present) */
-char *errbuf;			/* result buffer (unless errbuf_size==0) */
-size_t errbuf_size;		/* available space in errbuf, can be 0 */
-{
-	struct rerr *r;
-	char *msg;
-	char convbuf[sizeof(unk)+50];	/* 50 = plenty for int */
-	size_t len;
-	int icode;
-
-	switch (errcode) {
-	case REG_ATOI:		/* convert name to number */
-		for (r = rerrs; r->code >= 0; r++)
-			if (strcmp(r->name, errbuf) == 0)
-				break;
-		sprintf(convbuf, "%d", r->code);	/* -1 for unknown */
-		msg = convbuf;
-		break;
-	case REG_ITOA:		/* convert number to name */
-		icode = atoi(errbuf);	/* not our problem if this fails */
-		for (r = rerrs; r->code >= 0; r++)
-			if (r->code == icode)
-				break;
-		if (r->code >= 0)
-			msg = r->name;
-		else {			/* unknown; tell him the number */
-			sprintf(convbuf, "REG_%u", (unsigned)icode);
-			msg = convbuf;
-		}
-		break;
-	default:		/* a real, normal error code */
-		for (r = rerrs; r->code >= 0; r++)
-			if (r->code == errcode)
-				break;
-		if (r->code >= 0)
-			msg = r->explain;
-		else {			/* unknown; say so */
-			sprintf(convbuf, unk, errcode);
-			msg = convbuf;
-		}
-		break;
-	}
-
-	len = strlen(msg) + 1;		/* space needed, including NUL */
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			strcpy(errbuf, msg);
-		else {			/* truncate to fit */
-			strncpy(errbuf, msg, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return len;
-}
diff --git a/generic/regerrs.h b/generic/regerrs.h
deleted file mode 100644
index 1b6552c..0000000
--- a/generic/regerrs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-{ REG_OKAY,	"REG_OKAY",	"no errors detected" },
-{ REG_NOMATCH,	"REG_NOMATCH",	"failed to match" },
-{ REG_BADPAT,	"REG_BADPAT",	"invalid regexp (reg version 0.2)" },
-{ REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element" },
-{ REG_ECTYPE,	"REG_ECTYPE",	"invalid character class" },
-{ REG_EESCAPE,	"REG_EESCAPE",	"invalid escape \\ sequence" },
-{ REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number" },
-{ REG_EBRACK,	"REG_EBRACK",	"brackets [] not balanced" },
-{ REG_EPAREN,	"REG_EPAREN",	"parentheses () not balanced" },
-{ REG_EBRACE,	"REG_EBRACE",	"braces {} not balanced" },
-{ REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)" },
-{ REG_ERANGE,	"REG_ERANGE",	"invalid character range" },
-{ REG_ESPACE,	"REG_ESPACE",	"out of memory" },
-{ REG_BADRPT,	"REG_BADRPT",	"quantifier operand invalid" },
-{ REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug" },
-{ REG_INVARG,	"REG_INVARG",	"invalid argument to regex function" },
-{ REG_MIXED,	"REG_MIXED",	"character widths of regex and string differ" },
-{ REG_BADOPT,	"REG_BADOPT",	"invalid embedded option" },
diff --git a/generic/regex.h b/generic/regex.h
deleted file mode 100644
index 2f3ebfa..0000000
--- a/generic/regex.h
+++ /dev/null
@@ -1,308 +0,0 @@
-#ifndef _REGEX_H_
-#define	_REGEX_H_	/* never again */
-/*
- * regular expressions
- *
- * Prototypes etc. marked with "^" within comments get gathered up (and
- * possibly edited) by the regfwd program and inserted near the bottom of
- * this file.
- *
- * We offer the option of declaring one wide-character version of the
- * RE functions as well as the char versions.  To do that, define
- * __REG_WIDE_T to the type of wide characters (unfortunately, there
- * is no consensus that wchar_t is suitable) and __REG_WIDE_COMPILE and
- * __REG_WIDE_EXEC to the names to be used for the compile and execute
- * functions (suggestion:  re_Xcomp and re_Xexec, where X is a letter
- * suggestive of the wide type, e.g. re_ucomp and re_uexec for Unicode).
- * For cranky old compilers, it may be necessary to do something like:
- * #define	__REG_WIDE_COMPILE(a,b,c,d)	re_Xcomp(a,b,c,d)
- * #define	__REG_WIDE_EXEC(a,b,c,d,e,f,g)	re_Xexec(a,b,c,d,e,f,g)
- * rather than just #defining the names as parameterless macros.
- *
- * For some specialized purposes, it may be desirable to suppress the
- * declarations of the "front end" functions, regcomp() and regexec(),
- * or of the char versions of the compile and execute functions.  To
- * suppress the front-end functions, define __REG_NOFRONT.  To suppress
- * the char versions, define __REG_NOCHAR.
- *
- * The right place to do those defines (and some others you may want, see
- * below) would be <sys/types.h>.  If you don't have control of that file,
- * the right place to add your own defines to this file is marked below.
- * This is normally done automatically, by the makefile and regmkhdr, based
- * on the contents of regcustom.h.
- */
-
-
-
-/*
- * voodoo for C++
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/*
- * Add your own defines, if needed, here.
- */
-
-
-
-/*
- * Location where a chunk of regcustom.h is automatically spliced into
- * this file (working from its prototype, regproto.h).
- */
-/* --- begin --- */
-/* ensure certain things don't sneak in from system headers */
-#ifdef __REG_WIDE_T
-#undef __REG_WIDE_T
-#endif
-#ifdef __REG_WIDE_COMPILE
-#undef __REG_WIDE_COMPILE
-#endif
-#ifdef __REG_WIDE_EXEC
-#undef __REG_WIDE_EXEC
-#endif
-#ifdef __REG_REGOFF_T
-#undef __REG_REGOFF_T
-#endif
-#ifdef __REG_VOID_T
-#undef __REG_VOID_T
-#endif
-#ifdef __REG_CONST
-#undef __REG_CONST
-#endif
-/* interface types */
-#define	__REG_WIDE_T	Tcl_UniChar
-#define	__REG_REGOFF_T	long	/* not really right, but good enough... */
-#define	__REG_VOID_T	VOID
-#define	__REG_CONST	CONST
-/* names and declarations */
-#define	__REG_WIDE_COMPILE	TclReComp
-#define	__REG_WIDE_EXEC		TclReExec
-#ifndef __REG_NOFRONT
-#define	__REG_NOFRONT		/* don't want regcomp() and regexec() */
-#endif
-#ifndef __REG_NOCHAR
-#define	__REG_NOCHAR		/* or the char versions */
-#endif
-#define	regfree		TclReFree
-#define	regerror	TclReError
-/* --- end --- */
-
-
-/*
- * interface types etc.
- */
-
-/*
- * regoff_t has to be large enough to hold either off_t or ssize_t,
- * and must be signed; it's only a guess that long is suitable, so we
- * offer <sys/types.h> an override.
- */
-#ifdef __REG_REGOFF_T
-typedef __REG_REGOFF_T regoff_t;
-#else
-typedef long regoff_t;
-#endif
-
-/*
- * For benefit of old compilers, we offer <sys/types.h> the option of
- * overriding the `void' type used to declare nonexistent return types.
- */
-#ifdef __REG_VOID_T
-typedef __REG_VOID_T re_void;
-#else
-typedef void re_void;
-#endif
-
-/*
- * Also for benefit of old compilers, <sys/types.h> can supply a macro
- * which expands to a substitute for `const'.
- */
-#ifndef __REG_CONST
-#define	__REG_CONST	const
-#endif
-
-
-
-/*
- * other interface types
- */
-
-/* the biggie, a compiled RE (or rather, a front end to same) */
-typedef struct {
-	int re_magic;		/* magic number */
-	size_t re_nsub;		/* number of subexpressions */
-	int re_info;		/* information about RE */
-#		define	REG_UBACKREF		000001
-#		define	REG_ULOOKAHEAD		000002
-#		define	REG_UBOUNDS		000004
-#		define	REG_UBRACES		000010
-#		define	REG_UBSALNUM		000020
-#		define	REG_UPBOTCH		000040
-#		define	REG_UBBS		000100
-#		define	REG_UNONPOSIX		000200
-#		define	REG_UUNSPEC		000400
-#		define	REG_UUNPORT		001000
-#		define	REG_ULOCALE		002000
-#		define	REG_UEMPTYMATCH		004000
-#		define	REG_UIMPOSSIBLE		010000
-	int re_csize;		/* sizeof(character) */
-	char *re_endp;		/* backward compatibility kludge */
-	/* the rest is opaque pointers to hidden innards */
-	char *re_guts;		/* `char *' is more portable than `void *' */
-	char *re_fns;
-} regex_t;
-
-/* result reporting (may acquire more fields later) */
-typedef struct {
-	regoff_t rm_so;		/* start of substring */
-	regoff_t rm_eo;		/* end of substring */
-} regmatch_t;
-
-/* supplementary control and reporting (placeholder for later work) */
-typedef struct {
-	int rm_dummy;
-} rm_detail_t;
-
-
-
-/*
- * compilation
- ^ #ifndef __REG_NOCHAR
- ^ int re_comp(regex_t *, __REG_CONST char *, size_t, int);
- ^ #endif
- ^ #ifndef __REG_NOFRONT
- ^ int regcomp(regex_t *, __REG_CONST char *, int);
- ^ #endif
- ^ #ifdef __REG_WIDE_T
- ^ int __REG_WIDE_COMPILE(regex_t *, __REG_CONST __REG_WIDE_T *, size_t, int);
- ^ #endif
- */
-#define	REG_BASIC	000000	/* BREs (convenience) */
-#define	REG_EXTENDED	000001	/* EREs */
-#define	REG_ADVF	000002	/* advanced features in EREs */
-#define	REG_ADVANCED	000003	/* AREs (which are also EREs) */
-#define	REG_QUOTE	000004	/* no special characters, none */
-#define	REG_NOSPEC	REG_QUOTE	/* historical synonym */
-#define	REG_ICASE	000010	/* ignore case */
-#define	REG_NOSUB	000020	/* don't care about subexpressions */
-#define	REG_EXPANDED	000040	/* expanded format, white space & comments */
-#define	REG_NLSTOP	000100	/* \n doesn't match . or [^ ] */
-#define	REG_NLANCH	000200	/* ^ matches after \n, $ before */
-#define	REG_NEWLINE	000300	/* newlines are line terminators */
-#define	REG_PEND	000400	/* ugh -- backward-compatibility hack */
-#define	REG_DUMP	004000	/* none of your business :-) */
-#define	REG_FAKEEC	010000	/* none of your business :-) */
-#define	REG_PROGRESS	020000	/* none of your business :-) */
-
-
-
-/*
- * execution
- ^ #ifndef __REG_NOCHAR
- ^ int re_exec(regex_t *, __REG_CONST char *, size_t,
- ^				rm_detail_t *, size_t, regmatch_t [], int);
- ^ #endif
- ^ #ifndef __REG_NOFRONT
- ^ int regexec(regex_t *, __REG_CONST char *, size_t, regmatch_t [], int);
- ^ #endif
- ^ #ifdef __REG_WIDE_T
- ^ int __REG_WIDE_EXEC(regex_t *, __REG_CONST __REG_WIDE_T *, size_t,
- ^				rm_detail_t *, size_t, regmatch_t [], int);
- ^ #endif
- */
-#define	REG_NOTBOL	0001	/* BOS is not BOL */
-#define	REG_NOTEOL	0002	/* EOS is not EOL */
-#define	REG_STARTEND	0004	/* backward compatibility kludge */
-#define	REG_FTRACE	0010	/* none of your business */
-#define	REG_MTRACE	0020	/* none of your business */
-#define	REG_SMALL	0040	/* none of your business */
-
-
-
-/*
- * misc generics (may be more functions here eventually)
- ^ re_void regfree(regex_t *);
- */
-
-
-
-/*
- * error reporting
- * Be careful if modifying the list of error codes -- the table used by
- * regerror() is generated automatically from this file!
- *
- * Note that there is no wide-char variant of regerror at this time; what
- * kind of character is used for error reports is independent of what kind
- * is used in matching.
- *
- ^ extern size_t regerror(int, __REG_CONST regex_t *, char *, size_t);
- */
-#define	REG_OKAY	 0	/* no errors detected */
-#define	REG_NOMATCH	 1	/* failed to match */
-#define	REG_BADPAT	 2	/* invalid regexp */
-#define	REG_ECOLLATE	 3	/* invalid collating element */
-#define	REG_ECTYPE	 4	/* invalid character class */
-#define	REG_EESCAPE	 5	/* invalid escape \ sequence */
-#define	REG_ESUBREG	 6	/* invalid backreference number */
-#define	REG_EBRACK	 7	/* brackets [] not balanced */
-#define	REG_EPAREN	 8	/* parentheses () not balanced */
-#define	REG_EBRACE	 9	/* braces {} not balanced */
-#define	REG_BADBR	10	/* invalid repetition count(s) */
-#define	REG_ERANGE	11	/* invalid character range */
-#define	REG_ESPACE	12	/* out of memory */
-#define	REG_BADRPT	13	/* quantifier operand invalid */
-#define	REG_ASSERT	15	/* "can't happen" -- you found a bug */
-#define	REG_INVARG	16	/* invalid argument to regex function */
-#define	REG_MIXED	17	/* character widths of regex and string differ */
-#define	REG_BADOPT	18	/* invalid embedded option */
-/* two specials for debugging and testing */
-#define	REG_ATOI	101	/* convert error-code name to number */
-#define	REG_ITOA	102	/* convert error-code number to name */
-
-
-
-/*
- * the prototypes, as possibly munched by regfwd
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regproto.h === */
-#ifndef __REG_NOCHAR
-int re_comp _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, int));
-#endif
-#ifndef __REG_NOFRONT
-int regcomp _ANSI_ARGS_((regex_t *, __REG_CONST char *, int));
-#endif
-#ifdef __REG_WIDE_T
-int __REG_WIDE_COMPILE _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, int));
-#endif
-#ifndef __REG_NOCHAR
-int re_exec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-#endif
-#ifndef __REG_NOFRONT
-int regexec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, regmatch_t [], int));
-#endif
-#ifdef __REG_WIDE_T
-int __REG_WIDE_EXEC _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-#endif
-re_void regfree _ANSI_ARGS_((regex_t *));
-extern size_t regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/*
- * more C++ voodoo
- */
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif
diff --git a/generic/regexec.c b/generic/regexec.c
deleted file mode 100644
index 088d12b..0000000
--- a/generic/regexec.c
+++ /dev/null
@@ -1,952 +0,0 @@
-/*
- * re_*exec and friends - match REs
- */
-
-#include "regguts.h"
-
-
-
-/* internal variables, bundled for easy passing around */
-struct vars {
-	regex_t *re;
-	struct guts *g;
-	int eflags;		/* copies of arguments */
-	size_t nmatch;
-	regmatch_t *pmatch;
-	chr *start;		/* start of string */
-	chr *stop;		/* just past end of string */
-	int err;		/* error code if any (0 none) */
-	regoff_t *mem;		/* memory vector for backtracking */
-};
-#define	VISERR(vv)	((vv)->err != 0)	/* have we seen an error yet? */
-#define	ISERR()	VISERR(v)
-#define	VERR(vv,e)	(((vv)->err) ? (vv)->err : ((vv)->err = (e)))
-#define	ERR(e)	VERR(v, e)		/* record an error */
-#define	NOERR()	{if (ISERR()) return;}	/* if error seen, return */
-#define	OFF(p)	((p) - v->start)
-#define	LOFF(p)	((long)OFF(p))
-
-
-
-/* lazy-DFA representation */
-struct arcp {			/* "pointer" to an outarc */
-	struct sset *ss;
-	color co;
-};
-
-struct sset {			/* state set */
-	unsigned *states;	/* pointer to bitvector */
-	unsigned hash;		/* hash of bitvector */
-#		define	HASH(bv, nw)	(((nw) == 1) ? *(bv) : hash(bv, nw))
-#	define	HIT(h,bv,ss,nw)	((ss)->hash == (h) && ((nw) == 1 || \
-		memcmp(VS(bv), VS((ss)->states), (nw)*sizeof(unsigned)) == 0))
-	int flags;
-#		define	STARTER		01	/* the initial state set */
-#		define	POSTSTATE	02	/* includes the goal state */
-#		define	LOCKED		04	/* locked in cache */
-#		define	NOPROGRESS	010	/* zero-progress state set */
-	struct arcp ins;	/* chain of inarcs pointing here */
-	chr *lastseen;		/* last entered on arrival here */
-	struct sset **outs;	/* outarc vector indexed by color */
-	struct arcp *inchain;	/* chain-pointer vector for outarcs */
-};
-
-struct dfa {
-	int nssets;		/* size of cache */
-	int nssused;		/* how many entries occupied yet */
-	int nstates;		/* number of states */
-	int ncolors;		/* length of outarc and inchain vectors */
-	int wordsper;		/* length of state-set bitvectors */
-	struct sset *ssets;	/* state-set cache */
-	unsigned *statesarea;	/* bitvector storage */
-	unsigned *work;		/* pointer to work area within statesarea */
-	struct sset **outsarea;	/* outarc-vector storage */
-	struct arcp *incarea;	/* inchain storage */
-	struct cnfa *cnfa;
-	struct colormap *cm;
-	chr *lastpost;		/* location of last cache-flushed success */
-	chr *lastnopr;		/* location of last cache-flushed NOPROGRESS */
-	struct sset *search;	/* replacement-search-pointer memory */
-	int cptsmalloced;	/* were the areas individually malloced? */
-	char *mallocarea;	/* self, or master malloced area, or NULL */
-};
-
-#define	WORK	1		/* number of work bitvectors needed */
-
-/* setup for non-malloc allocation for small cases */
-#define	FEWSTATES	20	/* must be less than UBITS */
-#define	FEWCOLORS	15
-struct smalldfa {
-	struct dfa dfa;
-	struct sset ssets[FEWSTATES*2];
-	unsigned statesarea[FEWSTATES*2 + WORK];
-	struct sset *outsarea[FEWSTATES*2 * FEWCOLORS];
-	struct arcp incarea[FEWSTATES*2 * FEWCOLORS];
-};
-
-
-
-
-/*
- * forward declarations
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regexec.c === */
-int exec _ANSI_ARGS_((regex_t *, CONST chr *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-static int find _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *));
-static int cfind _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *));
-static VOID zapsubs _ANSI_ARGS_((regmatch_t *, size_t));
-static VOID zapmem _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID subset _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int dissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int condissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int altdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int cdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int ccondissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int crevdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int cbrdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int caltdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-/* === rege_dfa.c === */
-static chr *longest _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *));
-static chr *shortest _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *, chr *, chr **));
-static struct dfa *newdfa _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *, struct smalldfa *));
-static VOID freedfa _ANSI_ARGS_((struct dfa *));
-static unsigned hash _ANSI_ARGS_((unsigned *, int));
-static struct sset *initialize _ANSI_ARGS_((struct vars *, struct dfa *, chr *));
-static struct sset *miss _ANSI_ARGS_((struct vars *, struct dfa *, struct sset *, pcolor, chr *, chr *));
-static int lacon _ANSI_ARGS_((struct vars *, struct cnfa *, chr *, pcolor));
-static struct sset *getvacant _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *));
-static struct sset *pickss _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/*
- - exec - match regular expression
- ^ int exec(regex_t *, CONST chr *, size_t, rm_detail_t *,
- ^					size_t, regmatch_t [], int);
- */
-int
-exec(re, string, len, details, nmatch, pmatch, flags)
-regex_t *re;
-CONST chr *string;
-size_t len;
-rm_detail_t *details;		/* hook for future elaboration */
-size_t nmatch;
-regmatch_t pmatch[];
-int flags;
-{
-	struct vars var;
-	register struct vars *v = &var;
-	int st;
-	size_t n;
-	int complications;
-#	define	LOCALMAT	20
-	regmatch_t mat[LOCALMAT];
-#	define	LOCALMEM	40
-	regoff_t mem[LOCALMEM];
-
-	/* sanity checks */
-	if (re == NULL || string == NULL || re->re_magic != REMAGIC)
-		return REG_INVARG;
-	if (re->re_csize != sizeof(chr))
-		return REG_MIXED;
-
-	/* setup */
-	v->re = re;
-	v->g = (struct guts *)re->re_guts;
-	if (v->g->unmatchable)
-		return REG_NOMATCH;
-	complications = (v->g->info&REG_UBACKREF) ? 1 : 0;
-	if (v->g->usedshorter)
-		complications = 1;
-	v->eflags = flags;
-	if (v->g->cflags&REG_NOSUB)
-		nmatch = 0;		/* override client */
-	v->nmatch = nmatch;
-	if (complications && v->nmatch < v->g->nsub + 1) {
-		/* need work area bigger than what user gave us */
-		if (v->g->nsub + 1 <= LOCALMAT)
-			v->pmatch = mat;
-		else
-			v->pmatch = (regmatch_t *)MALLOC((v->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (v->pmatch == NULL)
-			return REG_ESPACE;
-		v->nmatch = v->g->nsub + 1;
-	} else
-		v->pmatch = pmatch;
-	v->start = (chr *)string;
-	v->stop = (chr *)string + len;
-	v->err = 0;
-	if (complications) {
-		assert(v->g->ntree >= 0);
-		n = (size_t)v->g->ntree;
-		if (n <= LOCALMEM)
-			v->mem = mem;
-		else
-			v->mem = (regoff_t *)MALLOC(n*sizeof(regoff_t));
-		if (v->mem == NULL) {
-			if (v->pmatch != pmatch && v->pmatch != mat)
-				FREE(v->pmatch);
-			return REG_ESPACE;
-		}
-	} else
-		v->mem = NULL;
-
-	/* do it */
-	assert(v->g->tree != NULL);
-	if (complications)
-		st = cfind(v, &v->g->tree->cnfa, &v->g->cmap);
-	else
-		st = find(v, &v->g->tree->cnfa, &v->g->cmap);
-
-	/* copy (portion of) match vector over if necessary */
-	if (st == REG_OKAY && v->pmatch != pmatch && nmatch > 0) {
-		zapsubs(pmatch, nmatch);
-		n = (nmatch < v->nmatch) ? nmatch : v->nmatch;
-		memcpy(VS(pmatch), VS(v->pmatch), n*sizeof(regmatch_t));
-	}
-
-	/* clean up */
-	if (v->pmatch != pmatch && v->pmatch != mat)
-		FREE(v->pmatch);
-	if (v->mem != NULL && v->mem != mem)
-		FREE(v->mem);
-	return st;
-}
-
-/*
- - find - find a match for the main NFA (no-complications case)
- ^ static int find(struct vars *, struct cnfa *, struct colormap *);
- */
-static int
-find(v, cnfa, cm)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-{
-	struct smalldfa da;
-	struct dfa *d = newdfa(v, cnfa, cm, &da);
-	struct smalldfa sa;
-	struct dfa *s = newdfa(v, &v->g->search, cm, &sa);
-	chr *begin;
-	chr *end;
-	chr *open;		/* open and close of range of possible starts */
-	chr *close;
-
-	if (d == NULL)
-		return v->err;
-	if (s == NULL) {
-		freedfa(d);
-		return v->err;
-	}
-
-	close = v->start;
-	do {
-		MDEBUG(("\nsearch at %ld\n", LOFF(close)));
-		close = shortest(v, s, close, close, v->stop, &open);
-		if (close == NULL)
-			break;				/* NOTE BREAK */
-		if (v->nmatch == 0) {
-			/* don't need exact location */
-			freedfa(d);
-			freedfa(s);
-			return REG_OKAY;
-		}
-		MDEBUG(("between %ld and %ld\n", LOFF(open), LOFF(close)));
-		for (begin = open; begin <= close; begin++) {
-			MDEBUG(("\nfind trying at %ld\n", LOFF(begin)));
-			end = longest(v, d, begin, v->stop);
-			if (end != NULL) {
-				assert(v->nmatch > 0);
- 				v->pmatch[0].rm_so = OFF(begin);
- 				v->pmatch[0].rm_eo = OFF(end);
-				freedfa(d);
-				freedfa(s);
-				if (v->nmatch > 1) {
-					zapsubs(v->pmatch, v->nmatch);
-					return dissect(v, v->g->tree, begin,
-									end);
-				}
-				if (ISERR())
-					return v->err;
-				return REG_OKAY;
-			}
-		}
-	} while (close < v->stop);
-
-	freedfa(d);
-	freedfa(s);
-	if (ISERR())
-		return v->err;
-	return REG_NOMATCH;
-}
-
-/*
- - cfind - find a match for the main NFA (with complications)
- ^ static int cfind(struct vars *, struct cnfa *, struct colormap *);
- */
-static int
-cfind(v, cnfa, cm)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-{
-	struct smalldfa da;
-	struct dfa *d = newdfa(v, cnfa, cm, &da);
-	struct smalldfa sa;
-	struct dfa *s = newdfa(v, &v->g->search, cm, &sa);
-	chr *begin;
-	chr *end;
-	chr *open;		/* open and close of range of possible starts */
-	chr *close;
-	chr *estart;
-	chr *estop;
-	int er;
-	int shorter = v->g->tree->flags&SHORTER;
-
-	if (d == NULL)
-		return v->err;
-	if (s == NULL) {
-		freedfa(d);
-		return v->err;
-	}
-
-	close = v->start;
-	do {
-		MDEBUG(("\ncsearch at %ld\n", LOFF(close)));
-		close = shortest(v, s, close, close, v->stop, &open);
-		if (close == NULL)
-			break;				/* NOTE BREAK */
-		MDEBUG(("cbetween %ld and %ld\n", LOFF(open), LOFF(close)));
-		for (begin = open; begin <= close; begin++) {
-			MDEBUG(("\ncfind trying at %ld\n", LOFF(begin)));
-			estart = begin;
-			estop = v->stop;
-			for (;;) {
-				if (shorter)
-					end = shortest(v, d, begin, estart,
-							estop, (chr **)NULL);
-				else
-					end = longest(v, d, begin, estop);
-				if (end == NULL)
-					break;		/* NOTE BREAK OUT */
-				MDEBUG(("tentative end %ld\n", LOFF(end)));
-				zapsubs(v->pmatch, v->nmatch);
-				zapmem(v, v->g->tree);
-				er = cdissect(v, v->g->tree, begin, end);
-				switch (er) {
-				case REG_OKAY:
-					if (v->nmatch > 0) {
-						v->pmatch[0].rm_so = OFF(begin);
-						v->pmatch[0].rm_eo = OFF(end);
-					}
-					freedfa(d);
-					freedfa(s);
-					if (ISERR())
-						return v->err;
-					return REG_OKAY;
-					break;
-				case REG_NOMATCH:
-					/* go around and try again */
-					if ((shorter) ? end == estop :
-								end == begin) {
-						/* no point in trying again */
-						freedfa(s);
-						freedfa(d);
-						return REG_NOMATCH;
-					}
-					if (shorter)
-						estart = end + 1;
-					else
-						estop = end - 1;
-					break;
-				default:
-					freedfa(d);
-					freedfa(s);
-					return er;
-					break;
-				}
-			}
-		}
-	} while (close < v->stop);
-
-	freedfa(d);
-	freedfa(s);
-	if (ISERR())
-		return v->err;
-	return REG_NOMATCH;
-}
-
-/*
- - zapsubs - initialize the subexpression matches to "no match"
- ^ static VOID zapsubs(regmatch_t *, size_t);
- */
-static VOID
-zapsubs(p, n)
-regmatch_t *p;
-size_t n;
-{
-	size_t i;
-
-	for (i = n-1; i > 0; i--) {
-		p[i].rm_so = -1;
-		p[i].rm_eo = -1;
-	}
-}
-
-/*
- - zapmem - initialize the retry memory of a subtree to zeros
- ^ static VOID zapmem(struct vars *, struct subre *);
- */
-static VOID
-zapmem(v, t)
-struct vars *v;
-struct subre *t;
-{
-	if (t == NULL)
-		return;
-
-	assert(v->mem != NULL);
-	v->mem[t->retry] = 0;
-	if (t->op == '(') {
-		assert(t->subno > 0);
-		v->pmatch[t->subno].rm_so = -1;
-		v->pmatch[t->subno].rm_eo = -1;
-	}
-
-	if (t->left != NULL)
-		zapmem(v, t->left);
-	if (t->right != NULL)
-		zapmem(v, t->right);
-}
-
-/*
- - subset - set any subexpression relevant to a successful subre
- ^ static VOID subset(struct vars *, struct subre *, chr *, chr *);
- */
-static VOID
-subset(v, sub, begin, end)
-struct vars *v;
-struct subre *sub;
-chr *begin;
-chr *end;
-{
-	int n = sub->subno;
-
-	assert(n > 0);
-	if ((size_t)n >= v->nmatch)
-		return;
-
-	MDEBUG(("setting %d\n", n));
-	v->pmatch[n].rm_so = OFF(begin);
-	v->pmatch[n].rm_eo = OFF(end);
-}
-
-/*
- - dissect - determine subexpression matches (uncomplicated case)
- ^ static int dissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-dissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	assert(t != NULL);
-	MDEBUG(("dissect %ld-%ld\n", LOFF(begin), LOFF(end)));
-
-	switch (t->op) {
-	case '=':		/* terminal node */
-		assert(t->left == NULL && t->right == NULL);
-		return REG_OKAY;	/* no action, parent did the work */
-		break;
-	case '|':		/* alternation */
-		assert(t->left != NULL);
-		return altdissect(v, t, begin, end);
-		break;
-	case 'b':		/* back ref -- shouldn't be calling us! */
-		return REG_ASSERT;
-		break;
-	case '.':		/* concatenation */
-		assert(t->left != NULL && t->right != NULL);
-		return condissect(v, t, begin, end);
-		break;
-	case '(':		/* capturing */
-		assert(t->left != NULL && t->right == NULL);
-		assert(t->subno > 0);
-		subset(v, t, begin, end);
-		return dissect(v, t->left, begin, end);
-		break;
-	default:
-		return REG_ASSERT;
-		break;
-	}
-}
-
-/*
- - condissect - determine concatenation subexpression matches (uncomplicated)
- ^ static int condissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-condissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct smalldfa da;
-	struct dfa *d;
-	struct smalldfa d2a;
-	struct dfa *d2;
-	chr *mid;
-	int i;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, &da);
-	if (ISERR())
-		return v->err;
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, &d2a);
-	if (ISERR()) {
-		freedfa(d);
-		return v->err;
-	}
-
-	/* pick a tentative midpoint */
-	mid = longest(v, d, begin, end);
-	if (mid == NULL) {
-		freedfa(d);
-		freedfa(d2);
-		return REG_ASSERT;
-	}
-	MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-
-	/* iterate until satisfaction or failure */
-	while (longest(v, d2, mid, end) != end) {
-		/* that midpoint didn't work, find a new one */
-		if (mid == begin) {
-			/* all possibilities exhausted! */
-			MDEBUG(("no midpoint!\n"));
-			freedfa(d);
-			freedfa(d2);
-			return REG_ASSERT;
-		}
-		mid = longest(v, d, begin, mid-1);
-		if (mid == NULL) {
-			/* failed to find a new one! */
-			MDEBUG(("failed midpoint!\n"));
-			freedfa(d);
-			freedfa(d2);
-			return REG_ASSERT;
-		}
-		MDEBUG(("new midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	i = dissect(v, t->left, begin, mid);
-	if (i != REG_OKAY)
-		return i;
-	return dissect(v, t->right, mid, end);
-}
-
-/*
- - altdissect - determine alternative subexpression matches (uncomplicated)
- ^ static int altdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-altdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct smalldfa da;
-	struct dfa *d;
-	int i;
-
-	assert(t != NULL);
-	assert(t->op == '|');
-
-	for (i = 0; t != NULL; t = t->right, i++) {
-		MDEBUG(("trying %dth\n", i));
-		assert(t->left != NULL && t->left->cnfa.nstates > 0);
-		d = newdfa(v, &t->left->cnfa, &v->g->cmap, &da);
-		if (ISERR())
-			return v->err;
-		if (longest(v, d, begin, end) == end) {
-			MDEBUG(("success\n"));
-			freedfa(d);
-			return dissect(v, t->left, begin, end);
-		}
-		freedfa(d);
-	}
-	return REG_ASSERT;	/* none of them matched?!? */
-}
-
-/*
- - cdissect - determine subexpression matches (with complications)
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int cdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-cdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	int er;
-
-	assert(t != NULL);
-	MDEBUG(("cdissect %ld-%ld\n", LOFF(begin), LOFF(end)));
-
-	switch (t->op) {
-	case '=':		/* terminal node */
-		assert(t->left == NULL && t->right == NULL);
-		return REG_OKAY;	/* no action, parent did the work */
-		break;
-	case '|':		/* alternation */
-		assert(t->left != NULL);
-		return caltdissect(v, t, begin, end);
-		break;
-	case 'b':		/* back ref -- shouldn't be calling us! */
-		assert(t->left == NULL && t->right == NULL);
-		return cbrdissect(v, t, begin, end);
-		break;
-	case '.':		/* concatenation */
-		assert(t->left != NULL && t->right != NULL);
-		return ccondissect(v, t, begin, end);
-		break;
-	case '(':		/* capturing */
-		assert(t->left != NULL && t->right == NULL);
-		assert(t->subno > 0);
-		er = cdissect(v, t->left, begin, end);
-		if (er == REG_OKAY)
-			subset(v, t, begin, end);
-		return er;
-		break;
-	default:
-		return REG_ASSERT;
-		break;
-	}
-}
-
-/*
- - ccondissect - concatenation subexpression matches (with complications)
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int ccondissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-ccondissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct smalldfa da;
-	struct dfa *d;
-	struct smalldfa d2a;
-	struct dfa *d2;
-	chr *mid;
-	int er;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-
-	if (t->left->flags&SHORTER)		/* reverse scan */
-		return crevdissect(v, t, begin, end);
-
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, &da);
-	if (ISERR())
-		return v->err;
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, &d2a);
-	if (ISERR()) {
-		freedfa(d);
-		return v->err;
-	}
-	MDEBUG(("cconcat %d\n", t->retry));
-
-	/* pick a tentative midpoint */
-	if (v->mem[t->retry] == 0) {
-		mid = longest(v, d, begin, end);
-		if (mid == NULL) {
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-	} else {
-		mid = begin + (v->mem[t->retry] - 1);
-		MDEBUG(("working midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* iterate until satisfaction or failure */
-	for (;;) {
-		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY && longest(v, d2, mid, end) == end &&
-				(er = cdissect(v, t->right, mid, end)) == 
-								REG_OKAY)
-			break;			/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH) {
-			freedfa(d);
-			freedfa(d2);
-			return er;
-		}
-
-		/* that midpoint didn't work, find a new one */
-		if (mid == begin) {
-			/* all possibilities exhausted */
-			MDEBUG(("%d no midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		mid = longest(v, d, begin, mid-1);
-		if (mid == NULL) {
-			/* failed to find a new one */
-			MDEBUG(("%d failed midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("%d: new midpoint %ld\n", t->retry, LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-		zapmem(v, t->left);
-		zapmem(v, t->right);
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
-}
-
-/*
- - crevdissect - determine shortest-first subexpression matches
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int crevdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-crevdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct smalldfa da;
-	struct dfa *d;
-	struct smalldfa d2a;
-	struct dfa *d2;
-	chr *mid;
-	int er;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-	assert(t->left->flags&SHORTER);
-
-	/* concatenation -- need to split the substring between parts */
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, &da);
-	if (ISERR())
-		return v->err;
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, &d2a);
-	if (ISERR()) {
-		freedfa(d);
-		return v->err;
-	}
-	MDEBUG(("crev %d\n", t->retry));
-
-	/* pick a tentative midpoint */
-	if (v->mem[t->retry] == 0) {
-		mid = shortest(v, d, begin, begin, end, (chr **)NULL);
-		if (mid == NULL) {
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-	} else {
-		mid = begin + (v->mem[t->retry] - 1);
-		MDEBUG(("working midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* iterate until satisfaction or failure */
-	for (;;) {
-		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY && longest(v, d2, mid, end) == end &&
-				(er = cdissect(v, t->right, mid, end)) == 
-								REG_OKAY)
-			break;			/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH) {
-			freedfa(d);
-			freedfa(d2);
-			return er;
-		}
-
-		/* that midpoint didn't work, find a new one */
-		if (mid == end) {
-			/* all possibilities exhausted */
-			MDEBUG(("%d no midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		mid = shortest(v, d, begin, mid+1, end, (chr **)NULL);
-		if (mid == NULL) {
-			/* failed to find a new one */
-			MDEBUG(("%d failed midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("%d: new midpoint %ld\n", t->retry, LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-		zapmem(v, t->left);
-		zapmem(v, t->right);
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
-}
-
-/*
- - cbrdissect - determine backref subexpression matches
- ^ static int cbrdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-cbrdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	int i;
-	int n = t->subno;
-	size_t len;
-	chr *paren;
-	chr *p;
-	chr *stop;
-	int min = t->min;
-	int max = t->max;
-
-	assert(t != NULL);
-	assert(t->op == 'b');
-	assert(n >= 0);
-	assert((size_t)n < v->nmatch);
-
-	MDEBUG(("cbackref n%d %d{%d-%d}\n", t->retry, n, min, max));
-
-	if (v->pmatch[n].rm_so == -1)
-		return REG_NOMATCH;
-	paren = v->start + v->pmatch[n].rm_so;
-	len = v->pmatch[n].rm_eo - v->pmatch[n].rm_so;
-
-	/* no room to maneuver -- retries are pointless */
-	if (v->mem[t->retry])
-		return REG_NOMATCH;
-	v->mem[t->retry] = 1;
-
-	/* special-case zero-length string */
-	if (len == 0) {
-		if (begin == end)
-			return REG_OKAY;
-		return REG_NOMATCH;
-	}
-
-	/* and too-short string */
-	assert(end >= begin);
-	if ((size_t)(end - begin) < len)
-		return REG_NOMATCH;
-	stop = end - len;
-
-	/* count occurrences */
-	i = 0;
-	for (p = begin; p <= stop && (i < max || max == INFINITY); p += len) {
-		if ((*v->g->compare)(paren, p, len) != 0)
-				break;
-		i++;
-	}
-	MDEBUG(("cbackref found %d\n", i));
-
-	/* and sort it out */
-	if (p != end)			/* didn't consume all of it */
-		return REG_NOMATCH;
-	if (min <= i && (i <= max || max == INFINITY))
-		return REG_OKAY;
-	return REG_NOMATCH;		/* out of range */
-}
-
-/*
- - caltdissect - determine alternative subexpression matches (w. complications)
- ^ static int caltdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-caltdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct smalldfa da;
-	struct dfa *d;
-	int er;
-#	define	UNTRIED	0	/* not yet tried at all */
-#	define	TRYING	1	/* top matched, trying submatches */
-#	define	TRIED	2	/* top didn't match or submatches exhausted */
-
-	if (t == NULL)
-		return REG_NOMATCH;
-	assert(t->op == '|');
-	if (v->mem[t->retry] == TRIED)
-		return caltdissect(v, t->right, begin, end);
-
-	MDEBUG(("calt n%d\n", t->retry));
-	assert(t->left != NULL);
-
-	if (v->mem[t->retry] == UNTRIED) {
-		d = newdfa(v, &t->left->cnfa, &v->g->cmap, &da);
-		if (ISERR())
-			return v->err;
-		if (longest(v, d, begin, end) != end) {
-			freedfa(d);
-			v->mem[t->retry] = TRIED;
-			return caltdissect(v, t->right, begin, end);
-		}
-		freedfa(d);
-		MDEBUG(("calt matched\n"));
-		v->mem[t->retry] = TRYING;
-	}
-
-	er = cdissect(v, t->left, begin, end);
-	if (er != REG_NOMATCH)
-		return er;
-
-	v->mem[t->retry] = TRIED;
-	return caltdissect(v, t->right, begin, end);
-}
-
-
-
-#include "rege_dfa.c"
diff --git a/generic/regfree.c b/generic/regfree.c
deleted file mode 100644
index a5c3f0b..0000000
--- a/generic/regfree.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * regfree - free an RE
- *
- * You might think that this could be incorporated into regcomp.c, and
- * that would be a reasonable idea... except that this is a generic
- * function (with a generic name), applicable to all compiled REs
- * regardless of the size of their characters, whereas the stuff in
- * regcomp.c gets compiled once per character size.
- */
-
-#include "regguts.h"
-
-/*
- - regfree - free an RE (generic function, punts to RE-specific function)
- *
- * Ignoring invocation with NULL is a convenience.
- */
-VOID
-regfree(re)
-regex_t *re;
-{
-	if (re == NULL)
-		return;
-	(*((struct fns *)re->re_fns)->free)(re);
-}
diff --git a/generic/regfronts.c b/generic/regfronts.c
deleted file mode 100644
index a9bd556..0000000
--- a/generic/regfronts.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * regcomp and regexec - front ends to re_ routines
- *
- * Mostly for implementation of backward-compatibility kludges.  Note
- * that these routines exist ONLY in char versions.
- */
-
-#include "regguts.h"
-
-/*
- - regcomp - compile regular expression
- */
-int
-regcomp(re, str, flags)
-regex_t *re;
-CONST char *str;
-int flags;
-{
-	size_t len;
-	int f = flags;
-
-	if (f&REG_PEND) {
-		len = re->re_endp - str;
-		f &= ~REG_PEND;
-	} else
-		len = strlen(str);
-
-	return re_comp(re, str, len, f);
-}
-
-/*
- - regexec - execute regular expression
- */
-int
-regexec(re, str, nmatch, pmatch, flags)
-regex_t *re;
-CONST char *str;
-size_t nmatch;
-regmatch_t pmatch[];
-int flags;
-{
-	CONST char *start;
-	size_t len;
-	int f = flags;
-
-	if (f&REG_STARTEND) {
-		start = str + pmatch[0].rm_so;
-		len = pmatch[0].rm_eo - pmatch[0].rm_so;
-		f &= ~REG_STARTEND;
-	} else {
-		start = str;
-		len = strlen(str);
-	}
-
-	return re_exec(re, start, len, nmatch, pmatch, f);
-}
diff --git a/generic/regguts.h b/generic/regguts.h
deleted file mode 100644
index badd8d4..0000000
--- a/generic/regguts.h
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Internal interface definitions, etc., for the regex package
- */
-
-
-
-/*
- * Environmental customization.  It should not (I hope) be necessary to
- * alter the file you are now reading -- regcustom.h should handle it all,
- * given care here and elsewhere.
- */
-#include "regcustom.h"
-
-
-
-/*
- * Things that regcustom.h might override.
- */
-
-/* standard header files (NULL is a reasonable indicator for them) */
-#ifndef NULL
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>
-#include <string.h>
-#endif
-
-/* assertions */
-#ifndef assert
-#ifndef REG_DEBUG
-#define NDEBUG
-#include <assert.h>
-#endif
-#endif
-
-/* voids */
-#ifndef VOID
-#define	VOID	void			/* for function return values */
-#endif
-#ifndef DISCARD
-#define	DISCARD	VOID			/* for throwing values away */
-#endif
-#ifndef PVOID
-#define	PVOID	VOID *			/* generic pointer */
-#endif
-#ifndef VS
-#define	VS(x)	((PVOID)(x))		/* cast something to generic ptr */
-#endif
-#ifndef NOPARMS
-#define	NOPARMS	VOID			/* for empty parm lists */
-#endif
-
-/* function-pointer declarator */
-#ifndef FUNCPTR
-#if __STDC__ >= 1
-#define	FUNCPTR(name, args)	(*name)args
-#else
-#define	FUNCPTR(name, args)	(*name)()
-#endif
-#endif
-
-/* memory allocation */
-#ifndef MALLOC
-#define	MALLOC(n)	malloc(n)
-#endif
-#ifndef REALLOC
-#define	REALLOC(p, n)	realloc(VS(p), n)
-#endif
-#ifndef FREE
-#define	FREE(p)		free(VS(p))
-#endif
-
-/* want size of a char in bits, and max value in bounded quantifiers */
-#ifndef CHAR_BIT
-#include <limits.h>
-#endif
-#ifndef _POSIX2_RE_DUP_MAX
-#define	_POSIX2_RE_DUP_MAX	255	/* normally from <limits.h> */
-#endif
-
-
-
-/*
- * misc
- */
-
-#define	NOTREACHED	0
-#define	xxx		1
-
-#define	DUPMAX	_POSIX2_RE_DUP_MAX
-#define	INFINITY	(DUPMAX+1)
-
-#define	REMAGIC	0xfed7		/* magic number for main struct */
-
-
-
-/*
- * debugging facilities
- */
-#ifdef REG_DEBUG
-/* FDEBUG does finite-state tracing */
-#define	FDEBUG(arglist)	{ if (v->eflags&REG_FTRACE) printf arglist; }
-/* MDEBUG does higher-level tracing */
-#define	MDEBUG(arglist)	{ if (v->eflags&REG_MTRACE) printf arglist; }
-#else
-#define	FDEBUG(arglist)	{}
-#define	MDEBUG(arglist)	{}
-#endif
-
-
-
-/*
- * bitmap manipulation
- */
-#define	UBITS	(CHAR_BIT * sizeof(unsigned))
-#define	BSET(uv, sn)	((uv)[(sn)/UBITS] |= (unsigned)1 << ((sn)%UBITS))
-#define	ISBSET(uv, sn)	((uv)[(sn)/UBITS] & ((unsigned)1 << ((sn)%UBITS)))
-
-
-
-/*
- * We dissect a chr into byts for colormap table indexing.  Here we define
- * a byt, which will be the same as a byte on most machines...  The exact
- * size of a byt is not critical, but about 8 bits is good, and extraction
- * of 8-bit chunks is sometimes especially fast.
- */
-#ifndef BYTBITS
-#define	BYTBITS	8		/* bits in a byt */
-#endif
-#define	BYTTAB	(1<<BYTBITS)	/* size of table with one entry per byt value */
-#define	BYTMASK	(BYTTAB-1)	/* bit mask for byt */
-#define	NBYTS	((CHRBITS+BYTBITS-1)/BYTBITS)
-/* the definition of GETCOLOR(), below, assumes NBYTS <= 4 */
-
-
-
-/*
- * As soon as possible, we map chrs into equivalence classes -- "colors" --
- * which are of much more manageable number.
- */
-typedef short color;		/* colors of characters */
-typedef int pcolor;		/* what color promotes to */
-#define	COLORLESS	(-1)	/* impossible color */
-#define	WHITE		0	/* default color, parent of all others */
-
-
-
-/*
- * A colormap is a tree -- more precisely, a DAG -- indexed at each level
- * by a byt of the chr, to map the chr to a color efficiently.  Because
- * lower sections of the tree can be shared, it can exploit the usual
- * sparseness of such a mapping table.  The tree is always NBYTS levels
- * deep (in the past it was shallower during construction but was "filled"
- * to full depth at the end of that); areas that are unaltered as yet point
- * to "fill blocks" which are entirely WHITE in color.
- */
-
-/* the tree itself */
-struct colors {
-	color ccolor[BYTTAB];
-};
-struct ptrs {
-	union tree *pptr[BYTTAB];
-};
-union tree {
-	struct colors colors;
-	struct ptrs ptrs;
-};
-#define	tcolor	colors.ccolor
-#define	tptr	ptrs.pptr
-
-/* internal per-color structure for the color machinery */
-struct colordesc {
-	uchr nchrs;		/* number of chars of this color */
-	color sub;		/* open subcolor (if any); free chain ptr */
-#		define	NOSUB	COLORLESS
-	struct arc *arcs;	/* color chain */
-	int flags;
-#		define	FREECOL	01	/* currently free */
-#		define	PSEUDO	02	/* pseudocolor, no real chars */
-#	define	UNUSEDCOLOR(cd)	((cd)->flags&FREECOL)
-	union tree *block;	/* block of solid color, if any */
-};
-
-/* the color map itself */
-struct colormap {
-	int magic;
-#		define	CMMAGIC	0x876
-	struct vars *v;			/* for compile error reporting */
-	size_t ncds;			/* number of colordescs */
-	size_t max;			/* highest in use */
-	color free;			/* beginning of free chain (if non-0) */
-	struct colordesc *cd;
-#	define	CDEND(cm)	(&(cm)->cd[(cm)->max + 1])
-#		define	NINLINECDS	((size_t)10)
-	struct colordesc cdspace[NINLINECDS];
-	union tree tree[NBYTS];		/* tree top, plus fill blocks */
-};
-
-/* optimization magic to do fast chr->color mapping */
-#define	B0(c)	((c) & BYTMASK)
-#define	B1(c)	(((c)>>BYTBITS) & BYTMASK)
-#define	B2(c)	(((c)>>(2*BYTBITS)) & BYTMASK)
-#define	B3(c)	(((c)>>(3*BYTBITS)) & BYTMASK)
-#if NBYTS == 1
-#define	GETCOLOR(cm, c)	((cm)->tree->tcolor[B0(c)])
-#endif
-/* beware, for NBYTS>1, GETCOLOR() is unsafe -- 2nd arg used repeatedly */
-#if NBYTS == 2
-#define	GETCOLOR(cm, c)	((cm)->tree->tptr[B1(c)]->tcolor[B0(c)])
-#endif
-#if NBYTS == 4
-#define	GETCOLOR(cm, c)	((cm)->tree->tptr[B3(c)]->tptr[B2(c)]->tptr[B1(c)]->tcolor[B0(c)])
-#endif
-
-
-
-/*
- * Interface definitions for locale-interface functions in locale.c.
- * Multi-character collating elements (MCCEs) cause most of the trouble.
- */
-struct cvec {
-	int nchrs;		/* number of chrs */
-	int chrspace;		/* number of chrs possible */
-	chr *chrs;		/* pointer to vector of chrs */
-	int nranges;		/* number of ranges (chr pairs) */
-	int rangespace;		/* number of chrs possible */
-	chr *ranges;		/* pointer to vector of chr pairs */
-	int nmcces;		/* number of MCCEs */
-	int mccespace;		/* number of MCCEs possible */
-	int nmccechrs;		/* number of chrs used for MCCEs */
-	chr *mcces[1];		/* pointers to 0-terminated MCCEs */
-				/* and both batches of chrs are on the end */
-};
-
-/* caution:  this value cannot be changed easily */
-#define	MAXMCCE	2		/* length of longest MCCE */
-
-
-
-/*
- * definitions for NFA internal representation
- *
- * Having a "from" pointer within each arc may seem redundant, but it
- * saves a lot of hassle.
- */
-struct state;
-
-struct arc {
-	int type;
-#		define	ARCFREE	'\0'
-	color co;
-	struct state *from;	/* where it's from (and contained within) */
-	struct state *to;	/* where it's to */
-	struct arc *outchain;	/* *from's outs chain or free chain */
-#	define	freechain	outchain
-	struct arc *inchain;	/* *to's ins chain */
-	struct arc *colorchain;	/* color's arc chain */
-};
-
-struct arcbatch {		/* for bulk allocation of arcs */
-	struct arcbatch *next;
-#	define	ABSIZE	10
-	struct arc a[ABSIZE];
-};
-
-struct state {
-	int no;
-#		define	FREESTATE	(-1)
-	char flag;		/* marks special states */
-	int nins;		/* number of inarcs */
-	struct arc *ins;	/* chain of inarcs */
-	int nouts;		/* number of outarcs */
-	struct arc *outs;	/* chain of outarcs */
-	struct arc *free;	/* chain of free arcs */
-	struct state *tmp;	/* temporary for traversal algorithms */
-	struct state *next;	/* chain for traversing all */
-	struct state *prev;	/* back chain */
-	struct arcbatch oas;	/* first arcbatch, avoid malloc in easy case */
-};
-
-struct nfa {
-	struct state *pre;	/* pre-initial state */
-	struct state *init;	/* initial state */
-	struct state *final;	/* final state */
-	struct state *post;	/* post-final state */
-	int nstates;		/* for numbering states */
-	struct state *states;	/* state-chain header */
-	struct state *slast;	/* tail of the chain */
-	struct state *free;	/* free list */
-	struct colormap *cm;	/* the color map */
-	color bos[2];		/* colors, if any, assigned to BOS and BOL */
-	color eos[2];		/* colors, if any, assigned to EOS and EOL */
-	struct vars *v;		/* simplifies compile error reporting */
-	struct nfa *parent;	/* parent NFA, if any */
-};
-
-
-
-/*
- * definitions for compacted NFA
- */
-struct carc {
-	color co;		/* COLORLESS is list terminator */
-	int to;			/* state number */
-};
-
-struct cnfa {
-	int nstates;		/* number of states */
-	int ncolors;		/* number of colors */
-	int flags;
-#		define	HASLACONS	01	/* uses lookahead constraints */
-	int pre;		/* setup state number */
-	int post;		/* teardown state number */
-	color bos[2];		/* colors, if any, assigned to BOS and BOL */
-	color eos[2];		/* colors, if any, assigned to EOS and EOL */
-	struct carc **states;	/* vector of pointers to outarc lists */
-	struct carc *arcs;	/* the area for the lists */
-};
-#define	ZAPCNFA(cnfa)	((cnfa).nstates = 0)
-#define	NULLCNFA(cnfa)	((cnfa).nstates == 0)
-
-
-
-/*
- * subexpression tree
- */
-struct subre {
-	char op;		/* '|', '.' (concat), 'b' (backref), '(', '=' */
-	char flags;
-#		define	LONGER	01	/* prefers longer match */
-#		define	SHORTER	02	/* prefers shorter match */
-#		define	MIXED	04	/* mixed preference below */
-#		define	CAP	010	/* capturing parens below */
-#		define	BACKR	020	/* back reference below */
-#		define	INUSE	0100	/* in use in final tree */
-#		define	LOCAL	03	/* bits which may not propagate up */
-#		define	LMIX(f)	((f)<<2)	/* LONGER -> MIXED */
-#		define	SMIX(f)	((f)<<1)	/* SHORTER -> MIXED */
-#		define	UP(f)	(((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED))
-#		define	MESSY(f)	((f)&(MIXED|CAP|BACKR))
-#		define	PREF(f)	((f)&LOCAL)
-#		define	PREF2(f1, f2)	((PREF(f1) != 0) ? PREF(f1) : PREF(f2))
-#		define	COMBINE(f1, f2)	(UP((f1)|(f2)) | PREF2(f1, f2))
-	short retry;		/* index into retry memory */
-	int subno;		/* subexpression number (for 'b' and '(') */
-	short min;		/* min repetitions, for backref only */
-	short max;		/* max repetitions, for backref only */
-	struct subre *left;	/* left child, if any (also freelist chain) */
-	struct subre *right;	/* right child, if any */
-	struct state *begin;	/* outarcs from here... */
-	struct state *end;	/* ...ending in inarcs here */
-	struct cnfa cnfa;	/* compacted NFA, if any */
-	struct subre *chain;	/* for bookkeeping and error cleanup */
-};
-
-
-
-/*
- * table of function pointers for generic manipulation functions
- * A regex_t's re_fns points to one of these.
- */
-struct fns {
-	VOID FUNCPTR(free, (regex_t *));
-};
-
-
-
-/*
- * the insides of a regex_t, hidden behind a void *
- */
-struct guts {
-	int magic;
-#		define	GUTSMAGIC	0xfed9
-	int cflags;		/* copy of compile flags */
-	int info;		/* copy of re_info */
-	size_t nsub;		/* copy of re_nsub */
-	struct subre *tree;
-	struct cnfa search;	/* for fast preliminary search */
-	int ntree;
-	struct colormap cmap;
-	int FUNCPTR(compare, (CONST chr *, CONST chr *, size_t));
-	struct subre *lacons;	/* lookahead-constraint vector */
-	int nlacons;		/* size of lacons */
-	int usedshorter;	/* used non-greedy quantifiers? */
-	int unmatchable;	/* cannot match anything? */
-};
diff --git a/generic/tcl.decls b/generic/tcl.decls
deleted file mode 100644
index 671f5ff..0000000
--- a/generic/tcl.decls
+++ /dev/null
@@ -1,1321 +0,0 @@
-# tcl.decls --
-#
-#	This file contains the declarations for all supported public
-#	functions that are exported by the Tcl library via the stubs table.
-#	This file is used to generate the tclDecls.h, tclPlatDecls.h,
-#	tclStub.c, and tclPlatStub.c files.
-#	
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: tcl.decls,v 1.8 1999/04/16 00:46:41 stanton Exp $
-
-library tcl
-
-# Define the tcl interface with several sub interfaces:
-#     tclPlat	 - platform specific public
-#     tclInt	 - generic private
-#     tclPlatInt - platform specific private
-
-interface tcl
-hooks {tclPlat tclInt tclIntPlat}
-
-# Declare each of the functions in the public Tcl interface.  Note that
-# the an index should never be reused for a different function in order
-# to preserve backwards compatibility.
-
-declare 0 generic {
-    int Tcl_PkgProvideEx(Tcl_Interp *interp, char *name, char *version, \
-	    ClientData clientData)
-}
-declare 1 generic {
-    char * Tcl_PkgRequireEx(Tcl_Interp *interp, char *name, char *version, \
-	    int exact, ClientData *clientDataPtr)
-}
-declare 2 generic {
-    void Tcl_Panic(char *format, ...)
-}
-declare 3 generic {
-    char * Tcl_Alloc(unsigned int size)
-}
-declare 4 generic {
-    void Tcl_Free(char *ptr)
-}
-declare 5 generic {
-    char * Tcl_Realloc(char *ptr, unsigned int size)
-}
-declare 6 generic {
-    char * Tcl_DbCkalloc(unsigned int size, char *file, int line)
-}
-declare 7 generic {
-    int Tcl_DbCkfree(char *ptr, char *file, int line)
-}
-declare 8 generic {
-    char * Tcl_DbCkrealloc(char *ptr, unsigned int size, char *file, int line)
-}
-
-# Tcl_CreateFileHandler and Tcl_DeleteFileHandler are only available on unix,
-# but they are part of the old generic interface, so we include them here for
-# compatibility reasons.
-
-declare 9 unix {
-    void Tcl_CreateFileHandler(int fd, int mask, Tcl_FileProc *proc, \
-	    ClientData clientData)
-}
-declare 10 unix {
-    void Tcl_DeleteFileHandler(int fd)
-}
-
-declare 11 generic {
-    void Tcl_SetTimer(Tcl_Time *timePtr)
-}
-declare 12 generic {
-    void Tcl_Sleep(int ms)
-}
-declare 13 generic {
-    int Tcl_WaitForEvent(Tcl_Time *timePtr)
-}
-declare 14 generic {
-    int Tcl_AppendAllObjTypes(Tcl_Interp *interp, Tcl_Obj *objPtr)
-}
-declare 15 generic {
-    void Tcl_AppendStringsToObj(Tcl_Obj *objPtr, ...)
-}
-declare 16 generic {
-    void Tcl_AppendToObj(Tcl_Obj *objPtr, char *bytes, int length)
-}
-declare 17 generic {
-    Tcl_Obj * Tcl_ConcatObj(int objc, Tcl_Obj *CONST objv[])
-}
-declare 18 generic {
-    int Tcl_ConvertToType(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    Tcl_ObjType *typePtr)
-}
-declare 19 generic {
-    void Tcl_DbDecrRefCount(Tcl_Obj *objPtr, char *file, int line)
-}
-declare 20 generic {
-    void Tcl_DbIncrRefCount(Tcl_Obj *objPtr, char *file, int line)
-}
-declare 21 generic {
-    int Tcl_DbIsShared(Tcl_Obj *objPtr, char *file, int line)
-}
-declare 22 generic {
-    Tcl_Obj * Tcl_DbNewBooleanObj(int boolValue, char *file, int line)
-}
-declare 23 generic {
-    Tcl_Obj * Tcl_DbNewByteArrayObj(unsigned char *bytes, int length, \
-	    char *file, int line)
-}
-declare 24 generic {
-    Tcl_Obj * Tcl_DbNewDoubleObj(double doubleValue, char *file, int line)
-}
-declare 25 generic {
-    Tcl_Obj * Tcl_DbNewListObj(int objc, Tcl_Obj *CONST objv[], char *file, \
-	    int line)
-}
-declare 26 generic {
-    Tcl_Obj * Tcl_DbNewLongObj(long longValue, char *file, int line)
-}
-declare 27 generic {
-    Tcl_Obj * Tcl_DbNewObj(char *file, int line)
-}
-declare 28 generic {
-    Tcl_Obj * Tcl_DbNewStringObj(CONST char *bytes, int length, \
-	    char *file, int line)
-}
-declare 29 generic {
-    Tcl_Obj * Tcl_DuplicateObj(Tcl_Obj *objPtr)
-}
-declare 30 generic {
-    void TclFreeObj(Tcl_Obj *objPtr)
-}
-declare 31 generic {
-    int Tcl_GetBoolean(Tcl_Interp *interp, char *str, int *boolPtr)
-}
-declare 32 generic {
-    int Tcl_GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    int *boolPtr)
-}
-declare 33 generic {
-    unsigned char * Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, int *lengthPtr)
-}
-declare 34 generic {
-    int Tcl_GetDouble(Tcl_Interp *interp, char *str, double *doublePtr)
-}
-declare 35 generic {
-    int Tcl_GetDoubleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    double *doublePtr)
-}
-declare 36 generic {
-    int Tcl_GetIndexFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    char **tablePtr, char *msg, int flags, int *indexPtr)
-}
-declare 37 generic {
-    int Tcl_GetInt(Tcl_Interp *interp, char *str, int *intPtr)
-}
-declare 38 generic {
-    int Tcl_GetIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *intPtr)
-}
-declare 39 generic {
-    int Tcl_GetLongFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, long *longPtr)
-}
-declare 40 generic {
-    Tcl_ObjType * Tcl_GetObjType(char *typeName)
-}
-declare 41 generic {
-    char * Tcl_GetStringFromObj(Tcl_Obj *objPtr, int *lengthPtr)
-}
-declare 42 generic {
-    void Tcl_InvalidateStringRep(Tcl_Obj *objPtr)
-}
-declare 43 generic {
-    int Tcl_ListObjAppendList(Tcl_Interp *interp, Tcl_Obj *listPtr, \
-	    Tcl_Obj *elemListPtr)
-}
-declare 44 generic {
-    int Tcl_ListObjAppendElement(Tcl_Interp *interp, Tcl_Obj *listPtr, \
-	    Tcl_Obj *objPtr)
-}
-declare 45 generic {
-    int Tcl_ListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr, \
-	    int *objcPtr, Tcl_Obj ***objvPtr)
-}
-declare 46 generic {
-    int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, int index, \
-	    Tcl_Obj **objPtrPtr)
-}
-declare 47 generic {
-    int Tcl_ListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr, int *intPtr)
-}
-declare 48 generic {
-    int Tcl_ListObjReplace(Tcl_Interp *interp, Tcl_Obj *listPtr, int first, \
-	    int count, int objc, Tcl_Obj *CONST objv[])
-}
-declare 49 generic {
-    Tcl_Obj * Tcl_NewBooleanObj(int boolValue)
-}
-declare 50 generic {
-    Tcl_Obj * Tcl_NewByteArrayObj(unsigned char *bytes, int length)
-}
-declare 51 generic {
-    Tcl_Obj * Tcl_NewDoubleObj(double doubleValue)
-}
-declare 52 generic {
-    Tcl_Obj * Tcl_NewIntObj(int intValue)
-}
-declare 53 generic {
-    Tcl_Obj * Tcl_NewListObj(int objc, Tcl_Obj *CONST objv[])
-}
-declare 54 generic {
-    Tcl_Obj * Tcl_NewLongObj(long longValue)
-}
-declare 55 generic {
-    Tcl_Obj * Tcl_NewObj(void)
-}
-declare 56 generic {
-    Tcl_Obj *Tcl_NewStringObj(CONST char *bytes, int length)
-}
-declare 57 generic {
-    void Tcl_SetBooleanObj(Tcl_Obj *objPtr, int boolValue)
-}
-declare 58 generic {
-    unsigned char * Tcl_SetByteArrayLength(Tcl_Obj *objPtr, int length)
-}
-declare 59 generic {
-    void Tcl_SetByteArrayObj(Tcl_Obj *objPtr, unsigned char *bytes, int length)
-}
-declare 60 generic {
-    void Tcl_SetDoubleObj(Tcl_Obj *objPtr, double doubleValue)
-}
-declare 61 generic {
-    void Tcl_SetIntObj(Tcl_Obj *objPtr, int intValue)
-}
-declare 62 generic {
-    void Tcl_SetListObj(Tcl_Obj *objPtr, int objc, Tcl_Obj *CONST objv[])
-}
-declare 63 generic {
-    void Tcl_SetLongObj(Tcl_Obj *objPtr, long longValue)
-}
-declare 64 generic {
-    void Tcl_SetObjLength(Tcl_Obj *objPtr, int length)
-}
-declare 65 generic {
-    void Tcl_SetStringObj(Tcl_Obj *objPtr, char *bytes, int length)
-}
-declare 66 generic {
-    void Tcl_AddErrorInfo(Tcl_Interp *interp, CONST char *message)
-}
-declare 67 generic {
-    void Tcl_AddObjErrorInfo(Tcl_Interp *interp, CONST char *message, \
-	    int length)
-}
-declare 68 generic {
-    void Tcl_AllowExceptions(Tcl_Interp *interp)
-}
-declare 69 generic {
-    void Tcl_AppendElement(Tcl_Interp *interp, CONST char *string)
-}
-declare 70 generic {
-    void Tcl_AppendResult(Tcl_Interp *interp, ...)
-}
-declare 71 generic {
-    Tcl_AsyncHandler Tcl_AsyncCreate(Tcl_AsyncProc *proc, \
-	    ClientData clientData)
-}
-declare 72 generic {
-    void Tcl_AsyncDelete(Tcl_AsyncHandler async)
-}
-declare 73 generic {
-    int Tcl_AsyncInvoke(Tcl_Interp *interp, int code)
-}
-declare 74 generic {
-    void Tcl_AsyncMark(Tcl_AsyncHandler async)
-}
-declare 75 generic {
-    int Tcl_AsyncReady(void)
-}
-declare 76 generic {
-    void Tcl_BackgroundError(Tcl_Interp *interp)
-}
-declare 77 generic {
-    char Tcl_Backslash(CONST char *src, int *readPtr)
-}
-declare 78 generic {
-    int Tcl_BadChannelOption(Tcl_Interp *interp, char *optionName, \
-	    char *optionList)
-}
-declare 79 generic {
-    void Tcl_CallWhenDeleted(Tcl_Interp *interp, Tcl_InterpDeleteProc *proc, \
-	    ClientData clientData)
-}
-declare 80 generic {
-    void Tcl_CancelIdleCall(Tcl_IdleProc *idleProc, ClientData clientData)
-}
-declare 81 generic {
-    int Tcl_Close(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 82 generic {
-    int Tcl_CommandComplete(char *cmd)
-}
-declare 83 generic {
-    char * Tcl_Concat(int argc, char **argv)
-}
-declare 84 generic {
-    int Tcl_ConvertElement(CONST char *src, char *dst, int flags)
-}
-declare 85 generic {
-    int Tcl_ConvertCountedElement(CONST char *src, int length, char *dst, \
-	    int flags)
-}
-declare 86 generic {
-    int Tcl_CreateAlias(Tcl_Interp *slave, char *slaveCmd, \
-	    Tcl_Interp *target, char *targetCmd, int argc, char **argv)
-}
-declare 87 generic {
-    int Tcl_CreateAliasObj(Tcl_Interp *slave, char *slaveCmd, \
-	    Tcl_Interp *target, char *targetCmd, int objc, \
-	    Tcl_Obj *CONST objv[])
-}
-declare 88 generic {
-    Tcl_Channel Tcl_CreateChannel(Tcl_ChannelType *typePtr, char *chanName, \
-	    ClientData instanceData, int mask)
-}
-declare 89 generic {
-    void Tcl_CreateChannelHandler(Tcl_Channel chan, int mask, \
-	    Tcl_ChannelProc *proc, ClientData clientData)
-}
-declare 90 generic {
-    void Tcl_CreateCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc, \
-	    ClientData clientData)
-}
-declare 91 generic {
-    Tcl_Command Tcl_CreateCommand(Tcl_Interp *interp, char *cmdName, \
-	    Tcl_CmdProc *proc, ClientData clientData, \
-	    Tcl_CmdDeleteProc *deleteProc)
-}
-declare 92 generic {
-    void Tcl_CreateEventSource(Tcl_EventSetupProc *setupProc, \
-	    Tcl_EventCheckProc *checkProc, ClientData clientData)
-}
-declare 93 generic {
-    void Tcl_CreateExitHandler(Tcl_ExitProc *proc, ClientData clientData)
-}
-declare 94 generic {
-    Tcl_Interp * Tcl_CreateInterp(void)
-}
-declare 95 generic {
-    void Tcl_CreateMathFunc(Tcl_Interp *interp, char *name, int numArgs, \
-	    Tcl_ValueType *argTypes, Tcl_MathProc *proc, ClientData clientData)
-}
-declare 96 generic {
-    Tcl_Command Tcl_CreateObjCommand(Tcl_Interp *interp, char *cmdName, \
-	    Tcl_ObjCmdProc *proc, ClientData clientData, \
-	    Tcl_CmdDeleteProc *deleteProc)
-}
-declare 97 generic {
-    Tcl_Interp * Tcl_CreateSlave(Tcl_Interp *interp, char *slaveName, \
-	    int isSafe)
-}
-declare 98 generic {
-    Tcl_TimerToken Tcl_CreateTimerHandler(int milliseconds, \
-	    Tcl_TimerProc *proc, ClientData clientData)
-}
-declare 99 generic {
-    Tcl_Trace Tcl_CreateTrace(Tcl_Interp *interp, int level, \
-	    Tcl_CmdTraceProc *proc, ClientData clientData)
-}
-declare 100 generic {
-    void Tcl_DeleteAssocData(Tcl_Interp *interp, char *name)
-}
-declare 101 generic {
-    void Tcl_DeleteChannelHandler(Tcl_Channel chan, Tcl_ChannelProc *proc, \
-	    ClientData clientData)
-}
-declare 102 generic {
-    void Tcl_DeleteCloseHandler(Tcl_Channel chan, Tcl_CloseProc *proc, \
-	    ClientData clientData)
-}
-declare 103 generic {
-    int Tcl_DeleteCommand(Tcl_Interp *interp, char *cmdName)
-}
-declare 104 generic {
-    int Tcl_DeleteCommandFromToken(Tcl_Interp *interp, Tcl_Command command)
-}
-declare 105 generic {
-    void Tcl_DeleteEvents(Tcl_EventDeleteProc *proc, ClientData clientData)
-}
-declare 106 generic {
-    void Tcl_DeleteEventSource(Tcl_EventSetupProc *setupProc, \
-	    Tcl_EventCheckProc *checkProc, ClientData clientData)
-}
-declare 107 generic {
-    void Tcl_DeleteExitHandler(Tcl_ExitProc *proc, ClientData clientData)
-}
-declare 108 generic {
-    void Tcl_DeleteHashEntry(Tcl_HashEntry *entryPtr)
-}
-declare 109 generic {
-    void Tcl_DeleteHashTable(Tcl_HashTable *tablePtr)
-}
-declare 110 generic {
-    void Tcl_DeleteInterp(Tcl_Interp *interp)
-}
-declare 111 generic {
-    void Tcl_DetachPids(int numPids, Tcl_Pid *pidPtr)
-}
-declare 112 generic {
-    void Tcl_DeleteTimerHandler(Tcl_TimerToken token)
-}
-declare 113 generic {
-    void Tcl_DeleteTrace(Tcl_Interp *interp, Tcl_Trace trace)
-}
-declare 114 generic {
-    void Tcl_DontCallWhenDeleted(Tcl_Interp *interp, \
-	    Tcl_InterpDeleteProc *proc, ClientData clientData)
-}
-declare 115 generic {
-    int Tcl_DoOneEvent(int flags)
-}
-declare 116 generic {
-    void Tcl_DoWhenIdle(Tcl_IdleProc *proc, ClientData clientData)
-}
-declare 117 generic {
-    char * Tcl_DStringAppend(Tcl_DString *dsPtr, CONST char *str, int length)
-}
-declare 118 generic {
-    char * Tcl_DStringAppendElement(Tcl_DString *dsPtr, CONST char *string)
-}
-declare 119 generic {
-    void Tcl_DStringEndSublist(Tcl_DString *dsPtr)
-}
-declare 120 generic {
-    void Tcl_DStringFree(Tcl_DString *dsPtr)
-}
-declare 121 generic {
-    void Tcl_DStringGetResult(Tcl_Interp *interp, Tcl_DString *dsPtr)
-}
-declare 122 generic {
-    void Tcl_DStringInit(Tcl_DString *dsPtr)
-}
-declare 123 generic {
-    void Tcl_DStringResult(Tcl_Interp *interp, Tcl_DString *dsPtr)
-}
-declare 124 generic {
-    void Tcl_DStringSetLength(Tcl_DString *dsPtr, int length)
-}
-declare 125 generic {
-    void Tcl_DStringStartSublist(Tcl_DString *dsPtr)
-}
-declare 126 generic {
-    int Tcl_Eof(Tcl_Channel chan)
-}
-declare 127 generic {
-    char * Tcl_ErrnoId(void)
-}
-declare 128 generic {
-    char * Tcl_ErrnoMsg(int err)
-}
-declare 129 generic {
-    int Tcl_Eval(Tcl_Interp *interp, char *string)
-}
-declare 130 generic {
-    int Tcl_EvalFile(Tcl_Interp *interp, char *fileName)
-}
-declare 131 generic {
-    int Tcl_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
-}
-declare 132 generic {
-    void Tcl_EventuallyFree(ClientData clientData, Tcl_FreeProc *freeProc)
-}
-declare 133 generic {
-    void Tcl_Exit(int status)
-}
-declare 134 generic {
-    int Tcl_ExposeCommand(Tcl_Interp *interp, char *hiddenCmdToken, \
-	    char *cmdName)
-}
-declare 135 generic {
-    int Tcl_ExprBoolean(Tcl_Interp *interp, char *str, int *ptr)
-}
-declare 136 generic {
-    int Tcl_ExprBooleanObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *ptr)
-}
-declare 137 generic {
-    int Tcl_ExprDouble(Tcl_Interp *interp, char *str, double *ptr)
-}
-declare 138 generic {
-    int Tcl_ExprDoubleObj(Tcl_Interp *interp, Tcl_Obj *objPtr, double *ptr)
-}
-declare 139 generic {
-    int Tcl_ExprLong(Tcl_Interp *interp, char *str, long *ptr)
-}
-declare 140 generic {
-    int Tcl_ExprLongObj(Tcl_Interp *interp, Tcl_Obj *objPtr, long *ptr)
-}
-declare 141 generic {
-    int Tcl_ExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    Tcl_Obj **resultPtrPtr)
-}
-declare 142 generic {
-    int Tcl_ExprString(Tcl_Interp *interp, char *string)
-}
-declare 143 generic {
-    void Tcl_Finalize(void)
-}
-declare 144 generic {
-    void Tcl_FindExecutable(CONST char *argv0)
-}
-declare 145 generic {
-    Tcl_HashEntry * Tcl_FirstHashEntry(Tcl_HashTable *tablePtr, \
-	    Tcl_HashSearch *searchPtr)
-}
-declare 146 generic {
-    int Tcl_Flush(Tcl_Channel chan)
-}
-declare 147 generic {
-    void Tcl_FreeResult(Tcl_Interp *interp)
-}
-declare 148 generic {
-    int Tcl_GetAlias(Tcl_Interp *interp, char *slaveCmd, \
-	    Tcl_Interp **targetInterpPtr, char **targetCmdPtr, int *argcPtr, \
-	    char ***argvPtr)
-}
-declare 149 generic {
-    int Tcl_GetAliasObj(Tcl_Interp *interp, char *slaveCmd, \
-	    Tcl_Interp **targetInterpPtr, char **targetCmdPtr, int *objcPtr, \
-	    Tcl_Obj ***objv)
-}
-declare 150 generic {
-    ClientData Tcl_GetAssocData(Tcl_Interp *interp, char *name, \
-	    Tcl_InterpDeleteProc **procPtr)
-}
-declare 151 generic {
-    Tcl_Channel Tcl_GetChannel(Tcl_Interp *interp, char *chanName, \
-	    int *modePtr)
-}
-declare 152 generic {
-    int Tcl_GetChannelBufferSize(Tcl_Channel chan)
-}
-declare 153 generic {
-    int Tcl_GetChannelHandle(Tcl_Channel chan, int direction, \
-	    ClientData *handlePtr)
-}
-declare 154 generic {
-    ClientData Tcl_GetChannelInstanceData(Tcl_Channel chan)
-}
-declare 155 generic {
-    int Tcl_GetChannelMode(Tcl_Channel chan)
-}
-declare 156 generic {
-    char * Tcl_GetChannelName(Tcl_Channel chan)
-}
-declare 157 generic {
-    int Tcl_GetChannelOption(Tcl_Interp *interp, Tcl_Channel chan, \
-	    char *optionName, Tcl_DString *dsPtr)
-}
-declare 158 generic {
-    Tcl_ChannelType * Tcl_GetChannelType(Tcl_Channel chan)
-}
-declare 159 generic {
-    int Tcl_GetCommandInfo(Tcl_Interp *interp, char *cmdName, \
-	    Tcl_CmdInfo *infoPtr)
-}
-declare 160 generic {
-    char * Tcl_GetCommandName(Tcl_Interp *interp, Tcl_Command command)
-}
-declare 161 generic {
-    int Tcl_GetErrno(void)
-}
-declare 162 generic {
-    char * Tcl_GetHostName(void)
-}
-declare 163 generic {
-    int Tcl_GetInterpPath(Tcl_Interp *askInterp, Tcl_Interp *slaveInterp)
-}
-declare 164 generic {
-    Tcl_Interp * Tcl_GetMaster(Tcl_Interp *interp)
-}
-declare 165 generic {
-    CONST char * Tcl_GetNameOfExecutable(void)
-}
-declare 166 generic {
-    Tcl_Obj * Tcl_GetObjResult(Tcl_Interp *interp)
-}
-
-# Tcl_GetOpenFile is only available on unix, but it is a part of the old
-# generic interface, so we inlcude it here for compatibility reasons.
-
-declare 167 unix {
-    int Tcl_GetOpenFile(Tcl_Interp *interp, char *str, int write, \
-	    int checkUsage, ClientData *filePtr)
-}
-
-declare 168 generic {
-    Tcl_PathType Tcl_GetPathType(char *path)
-}
-declare 169 generic {
-    int Tcl_Gets(Tcl_Channel chan, Tcl_DString *dsPtr)
-}
-declare 170 generic {
-    int Tcl_GetsObj(Tcl_Channel chan, Tcl_Obj *objPtr)
-}
-declare 171 generic {
-    int Tcl_GetServiceMode(void)
-}
-declare 172 generic {
-    Tcl_Interp * Tcl_GetSlave(Tcl_Interp *interp, char *slaveName)
-}
-declare 173 generic {
-    Tcl_Channel Tcl_GetStdChannel(int type)
-}
-declare 174 generic {
-    char * Tcl_GetStringResult(Tcl_Interp *interp)
-}
-declare 175 generic {
-    char * Tcl_GetVar(Tcl_Interp *interp, char *varName, int flags)
-}
-declare 176 generic {
-    char * Tcl_GetVar2(Tcl_Interp *interp, char *part1, char *part2, int flags)
-}
-declare 177 generic {
-    int Tcl_GlobalEval(Tcl_Interp *interp, char *command)
-}
-declare 178 generic {
-    int Tcl_GlobalEvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
-}
-declare 179 generic {
-    int Tcl_HideCommand(Tcl_Interp *interp, char *cmdName, \
-	    char *hiddenCmdToken)
-}
-declare 180 generic {
-    int Tcl_Init(Tcl_Interp *interp)
-}
-declare 181 generic {
-    void Tcl_InitHashTable(Tcl_HashTable *tablePtr, int keyType)
-}
-declare 182 generic {
-    int Tcl_InputBlocked(Tcl_Channel chan)
-}
-declare 183 generic {
-    int Tcl_InputBuffered(Tcl_Channel chan)
-}
-declare 184 generic {
-    int Tcl_InterpDeleted(Tcl_Interp *interp)
-}
-declare 185 generic {
-    int Tcl_IsSafe(Tcl_Interp *interp)
-}
-declare 186 generic {
-    char * Tcl_JoinPath(int argc, char **argv, Tcl_DString *resultPtr)
-}
-declare 187 generic {
-    int Tcl_LinkVar(Tcl_Interp *interp, char *varName, char *addr, int type)
-}
-
-# This slot is reserved for use by the plus patch:
-#  declare 188 generic {
-#      Tcl_MainLoop
-#  }
-
-declare 189 generic {
-    Tcl_Channel Tcl_MakeFileChannel(ClientData handle, int mode)
-}
-declare 190 generic {
-    int Tcl_MakeSafe(Tcl_Interp *interp)
-}
-declare 191 generic {
-    Tcl_Channel Tcl_MakeTcpClientChannel(ClientData tcpSocket)
-}
-declare 192 generic {
-    char * Tcl_Merge(int argc, char **argv)
-}
-declare 193 generic {
-    Tcl_HashEntry * Tcl_NextHashEntry(Tcl_HashSearch *searchPtr)
-}
-declare 194 generic {
-    void Tcl_NotifyChannel(Tcl_Channel channel, int mask)
-}
-declare 195 generic {
-    Tcl_Obj * Tcl_ObjGetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
-	    Tcl_Obj *part2Ptr, int flags)
-}
-declare 196 generic {
-    Tcl_Obj * Tcl_ObjSetVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
-	    Tcl_Obj *part2Ptr, Tcl_Obj *newValuePtr, int flags)
-}
-declare 197 generic {
-    Tcl_Channel Tcl_OpenCommandChannel(Tcl_Interp *interp, int argc, \
-	    char **argv, int flags)
-}
-declare 198 generic {
-    Tcl_Channel Tcl_OpenFileChannel(Tcl_Interp *interp, char *fileName, \
-	    char *modeString, int permissions)
-}
-declare 199 generic {
-    Tcl_Channel Tcl_OpenTcpClient(Tcl_Interp *interp, int port, \
-	    char *address, char *myaddr, int myport, int async)
-}
-declare 200 generic {
-    Tcl_Channel Tcl_OpenTcpServer(Tcl_Interp *interp, int port, char *host, \
-	    Tcl_TcpAcceptProc *acceptProc, ClientData callbackData)
-}
-declare 201 generic {
-    void Tcl_Preserve(ClientData data)
-}
-declare 202 generic {
-    void Tcl_PrintDouble(Tcl_Interp *interp, double value, char *dst)
-}
-declare 203 generic {
-    int Tcl_PutEnv(CONST char *string)
-}
-declare 204 generic {
-    char * Tcl_PosixError(Tcl_Interp *interp)
-}
-declare 205 generic {
-    void Tcl_QueueEvent(Tcl_Event *evPtr, Tcl_QueuePosition position)
-}
-declare 206 generic {
-    int Tcl_Read(Tcl_Channel chan, char *bufPtr, int toRead)
-}
-declare 207 generic {
-    void Tcl_ReapDetachedProcs(void)
-}
-declare 208 generic {
-    int Tcl_RecordAndEval(Tcl_Interp *interp, char *cmd, int flags)
-}
-declare 209 generic {
-    int Tcl_RecordAndEvalObj(Tcl_Interp *interp, Tcl_Obj *cmdPtr, int flags)
-}
-declare 210 generic {
-    void Tcl_RegisterChannel(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 211 generic {
-    void Tcl_RegisterObjType(Tcl_ObjType *typePtr)
-}
-declare 212 generic {
-    Tcl_RegExp Tcl_RegExpCompile(Tcl_Interp *interp, char *string)
-}
-declare 213 generic {
-    int Tcl_RegExpExec(Tcl_Interp *interp, Tcl_RegExp regexp, \
-	    CONST char *str, CONST char *start)
-}
-declare 214 generic {
-    int Tcl_RegExpMatch(Tcl_Interp *interp, char *str, char *pattern)
-}
-declare 215 generic {
-    void Tcl_RegExpRange(Tcl_RegExp regexp, int index, char **startPtr, \
-	    char **endPtr)
-}
-declare 216 generic {
-    void Tcl_Release(ClientData clientData)
-}
-declare 217 generic {
-    void Tcl_ResetResult(Tcl_Interp *interp)
-}
-declare 218 generic {
-    int Tcl_ScanElement(CONST char *str, int *flagPtr)
-}
-declare 219 generic {
-    int Tcl_ScanCountedElement(CONST char *str, int length, int *flagPtr)
-}
-declare 220 generic {
-    int Tcl_Seek(Tcl_Channel chan, int offset, int mode)
-}
-declare 221 generic {
-    int Tcl_ServiceAll(void)
-}
-declare 222 generic {
-    int Tcl_ServiceEvent(int flags)
-}
-declare 223 generic {
-    void Tcl_SetAssocData(Tcl_Interp *interp, char *name, \
-	    Tcl_InterpDeleteProc *proc, ClientData clientData)
-}
-declare 224 generic {
-    void Tcl_SetChannelBufferSize(Tcl_Channel chan, int sz)
-}
-declare 225 generic {
-    int Tcl_SetChannelOption(Tcl_Interp *interp, Tcl_Channel chan, \
-	    char *optionName, char *newValue)
-}
-declare 226 generic {
-    int Tcl_SetCommandInfo(Tcl_Interp *interp, char *cmdName, \
-	    Tcl_CmdInfo *infoPtr)
-}
-declare 227 generic {
-    void Tcl_SetErrno(int err)
-}
-declare 228 generic {
-    void Tcl_SetErrorCode(Tcl_Interp *interp, ...)
-}
-declare 229 generic {
-    void Tcl_SetMaxBlockTime(Tcl_Time *timePtr)
-}
-declare 230 generic {
-    void Tcl_SetPanicProc(Tcl_PanicProc *panicProc)
-}
-declare 231 generic {
-    int Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth)
-}
-declare 232 generic {
-    void Tcl_SetResult(Tcl_Interp *interp, char *str, \
-	    Tcl_FreeProc *freeProc)
-}
-declare 233 generic {
-    int Tcl_SetServiceMode(int mode)
-}
-declare 234 generic {
-    void Tcl_SetObjErrorCode(Tcl_Interp *interp, Tcl_Obj *errorObjPtr)
-}
-declare 235 generic {
-    void Tcl_SetObjResult(Tcl_Interp *interp, Tcl_Obj *resultObjPtr)
-}
-declare 236 generic {
-    void Tcl_SetStdChannel(Tcl_Channel channel, int type)
-}
-declare 237 generic {
-    char * Tcl_SetVar(Tcl_Interp *interp, char *varName, char *newValue, \
-	    int flags)
-}
-declare 238 generic {
-    char * Tcl_SetVar2(Tcl_Interp *interp, char *part1, char *part2, \
-	    char *newValue, int flags)
-}
-declare 239 generic {
-    char * Tcl_SignalId(int sig)
-}
-declare 240 generic {
-    char * Tcl_SignalMsg(int sig)
-}
-declare 241 generic {
-    void Tcl_SourceRCFile(Tcl_Interp *interp)
-}
-declare 242 generic {
-    int Tcl_SplitList(Tcl_Interp *interp, CONST char *listStr, int *argcPtr, \
-	    char ***argvPtr)
-}
-declare 243 generic {
-    void Tcl_SplitPath(CONST char *path, int *argcPtr, char ***argvPtr)
-}
-declare 244 generic {
-    void Tcl_StaticPackage(Tcl_Interp *interp, char *pkgName, \
-	    Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc)
-}
-declare 245 generic {
-    int Tcl_StringMatch(CONST char *str, CONST char *pattern)
-}
-declare 246 generic {
-    int Tcl_Tell(Tcl_Channel chan)
-}
-declare 247 generic {
-    int Tcl_TraceVar(Tcl_Interp *interp, char *varName, int flags, \
-	    Tcl_VarTraceProc *proc, ClientData clientData)
-}
-declare 248 generic {
-    int Tcl_TraceVar2(Tcl_Interp *interp, char *part1, char *part2, \
-	    int flags, Tcl_VarTraceProc *proc, ClientData clientData)
-}
-declare 249 generic {
-    char * Tcl_TranslateFileName(Tcl_Interp *interp, char *name, \
-	    Tcl_DString *bufferPtr)
-}
-declare 250 generic {
-    int Tcl_Ungets(Tcl_Channel chan, char *str, int len, int atHead)
-}
-declare 251 generic {
-    void Tcl_UnlinkVar(Tcl_Interp *interp, char *varName)
-}
-declare 252 generic {
-    int Tcl_UnregisterChannel(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 253 generic {
-    int Tcl_UnsetVar(Tcl_Interp *interp, char *varName, int flags)
-}
-declare 254 generic {
-    int Tcl_UnsetVar2(Tcl_Interp *interp, char *part1, char *part2, int flags)
-}
-declare 255 generic {
-    void Tcl_UntraceVar(Tcl_Interp *interp, char *varName, int flags, \
-	    Tcl_VarTraceProc *proc, ClientData clientData)
-}
-declare 256 generic {
-    void Tcl_UntraceVar2(Tcl_Interp *interp, char *part1, char *part2, \
-	    int flags, Tcl_VarTraceProc *proc, ClientData clientData)
-}
-declare 257 generic {
-    void Tcl_UpdateLinkedVar(Tcl_Interp *interp, char *varName)
-}
-declare 258 generic {
-    int Tcl_UpVar(Tcl_Interp *interp, char *frameName, char *varName, \
-	    char *localName, int flags)
-}
-declare 259 generic {
-    int Tcl_UpVar2(Tcl_Interp *interp, char *frameName, char *part1, \
-	    char *part2, char *localName, int flags)
-}
-declare 260 generic {
-    int Tcl_VarEval(Tcl_Interp *interp, ...)
-}
-declare 261 generic {
-    ClientData Tcl_VarTraceInfo(Tcl_Interp *interp, char *varName, \
-	    int flags, Tcl_VarTraceProc *procPtr, ClientData prevClientData)
-}
-declare 262 generic {
-    ClientData Tcl_VarTraceInfo2(Tcl_Interp *interp, char *part1, \
-	    char *part2, int flags, Tcl_VarTraceProc *procPtr, \
-	    ClientData prevClientData)
-}
-declare 263 generic {
-    int Tcl_Write(Tcl_Channel chan, char *s, int slen)
-}
-declare 264 generic {
-    void Tcl_WrongNumArgs(Tcl_Interp *interp, int objc, \
-	    Tcl_Obj *CONST objv[], char *message)
-}
-declare 265 generic {
-    int Tcl_DumpActiveMemory(char *fileName)
-}
-declare 266 generic {
-    void Tcl_ValidateAllMemory(char *file, int line)
-}
-declare 267 generic {
-    void Tcl_AppendResultVA(Tcl_Interp *interp, va_list argList)
-}
-declare 268 generic {
-    void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
-}
-declare 269 generic {
-    char * Tcl_HashStats(Tcl_HashTable *tablePtr)
-}
-declare 270 generic {
-    char * Tcl_ParseVar(Tcl_Interp *interp, char *str, char **termPtr)
-}
-declare 271 generic {
-    char * Tcl_PkgPresent(Tcl_Interp *interp, char *name, char *version, \
-	    int exact)
-}
-declare 272 generic {
-    char * Tcl_PkgPresentEx(Tcl_Interp *interp, char *name, char *version, \
-	    int exact, ClientData *clientDataPtr)
-}
-declare 273 generic {
-    int Tcl_PkgProvide(Tcl_Interp *interp, char *name, char *version)
-}
-declare 274 generic {
-    char * Tcl_PkgRequire(Tcl_Interp *interp, char *name, char *version, \
-	    int exact)
-}
-declare 275 generic {
-    void Tcl_SetErrorCodeVA(Tcl_Interp *interp, va_list argList)
-}
-declare 276 generic {
-    int  Tcl_VarEvalVA(Tcl_Interp *interp, va_list argList)
-}
-declare 277 generic {
-    Tcl_Pid Tcl_WaitPid(Tcl_Pid pid, int *statPtr, int options)
-}
-declare 278 generic {
-    void Tcl_PanicVA(char *format, va_list argList)
-}
-declare 279 generic {
-    void Tcl_GetVersion(int *major, int *minor, int *patchLevel, int *type)
-}
-declare 280 generic {
-    void Tcl_InitMemory(Tcl_Interp *interp)
-}
-
-# Reserved for future use (8.0.x vs. 8.1)
-#  declare 281 generic {
-#  }
-#  declare 282 generic {
-#  }
-#  declare 283 generic {
-#  }
-#  declare 284 generic {
-#  }
-#  declare 285 generic {
-#  }
-
-
-# Added in 8.1:
-
-declare 286 generic {
-    void Tcl_AppendObjToObj(Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr)
-}
-declare 287 generic {
-    Tcl_Encoding Tcl_CreateEncoding(Tcl_EncodingType *typePtr)
-}
-declare 288 generic {
-    void Tcl_CreateThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData)
-}
-declare 289 generic {
-    void Tcl_DeleteThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData)
-}
-declare 290 generic {
-    void Tcl_DiscardResult(Tcl_SavedResult *statePtr)
-}
-declare 291 generic {
-    int Tcl_EvalEx(Tcl_Interp *interp, char *script, int numBytes, int flags)
-}
-declare 292 generic {
-    int Tcl_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \
-	    int flags)
-}
-declare 293 generic {
-    int Tcl_EvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
-}
-declare 294 generic {
-    void Tcl_ExitThread(int status)
-}
-declare 295 generic {
-    int Tcl_ExternalToUtf(Tcl_Interp *interp, Tcl_Encoding encoding, \
-	    CONST char *src, int srcLen, int flags, \
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen, \
-	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
-}
-declare 296 generic {
-    char * Tcl_ExternalToUtfDString(Tcl_Encoding encoding, CONST char *src, \
-	    int srcLen, Tcl_DString *dsPtr)
-}
-declare 297 generic {
-    void Tcl_FinalizeThread(void)
-}
-declare 298 generic {
-    void Tcl_FinalizeNotifier(ClientData clientData)
-}
-declare 299 generic {
-    void Tcl_FreeEncoding(Tcl_Encoding encoding)
-}
-declare 300 generic {
-    Tcl_ThreadId Tcl_GetCurrentThread(void)
-}
-declare 301 generic {
-    Tcl_Encoding Tcl_GetEncoding(Tcl_Interp *interp, CONST char *name)
-}
-declare 302 generic {
-    char * Tcl_GetEncodingName(Tcl_Encoding encoding)
-}
-declare 303 generic {
-    void Tcl_GetEncodingNames(Tcl_Interp *interp)
-}
-declare 304 generic {
-    int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    char **tablePtr, int offset, char *msg, int flags, int *indexPtr)
-}
-declare 305 generic {
-    VOID * Tcl_GetThreadData(Tcl_ThreadDataKey *keyPtr, int size)
-}
-declare 306 generic {
-    Tcl_Obj * Tcl_GetVar2Ex(Tcl_Interp *interp, char *part1, char *part2, \
-	    int flags)
-}
-declare 307 generic {
-    ClientData Tcl_InitNotifier(void)
-}
-declare 308 generic {
-    void Tcl_MutexLock(Tcl_Mutex *mutexPtr)
-}
-declare 309 generic {
-    void Tcl_MutexUnlock(Tcl_Mutex *mutexPtr)
-}
-declare 310 generic {
-    void Tcl_ConditionNotify(Tcl_Condition *condPtr)
-}
-declare 311 generic {
-    void Tcl_ConditionWait(Tcl_Condition *condPtr, Tcl_Mutex *mutexPtr, \
-	    Tcl_Time *timePtr)
-}
-declare 312 generic {
-    int Tcl_NumUtfChars(CONST char *src, int len)
-}
-declare 313 generic {
-    int Tcl_ReadChars(Tcl_Channel channel, Tcl_Obj *objPtr, int charsToRead, \
-	    int appendFlag)
-}
-declare 314 generic {
-    void Tcl_RestoreResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
-}
-declare 315 generic {
-    void Tcl_SaveResult(Tcl_Interp *interp, Tcl_SavedResult *statePtr)
-}
-declare 316 generic {
-    int Tcl_SetSystemEncoding(Tcl_Interp *interp, CONST char *name)
-}
-declare 317 generic {
-    Tcl_Obj * Tcl_SetVar2Ex(Tcl_Interp *interp, char *part1, char *part2, \
-	    Tcl_Obj *newValuePtr, int flags)
-}
-declare 318 generic {
-    void Tcl_ThreadAlert(Tcl_ThreadId threadId)
-}
-declare 319 generic {
-    void Tcl_ThreadQueueEvent(Tcl_ThreadId threadId, Tcl_Event* evPtr, \
-	    Tcl_QueuePosition position)
-}
-declare 320 generic {
-    Tcl_UniChar Tcl_UniCharAtIndex(CONST char *src, int index)
-}
-declare 321 generic {
-    Tcl_UniChar Tcl_UniCharToLower(int ch)
-}
-declare 322 generic {
-    Tcl_UniChar Tcl_UniCharToTitle(int ch)
-}
-declare 323 generic {
-    Tcl_UniChar Tcl_UniCharToUpper(int ch)
-}
-declare 324 generic {
-    int Tcl_UniCharToUtf(int ch, char *buf)
-}
-declare 325 generic {
-    char * Tcl_UtfAtIndex(CONST char *src, int index)
-}
-declare 326 generic {
-    int Tcl_UtfCharComplete(CONST char *src, int len)
-}
-declare 327 generic {
-    int Tcl_UtfBackslash(CONST char *src, int *readPtr, char *dst)
-}
-declare 328 generic {
-    char * Tcl_UtfFindFirst(CONST char *src, int ch)
-}
-declare 329 generic {
-    char * Tcl_UtfFindLast(CONST char *src, int ch)
-}
-declare 330 generic {
-    char * Tcl_UtfNext(CONST char *src)
-}
-declare 331 generic {
-    char * Tcl_UtfPrev(CONST char *src, CONST char *start)
-}
-declare 332 generic {
-    int Tcl_UtfToExternal(Tcl_Interp *interp, Tcl_Encoding encoding, \
-	    CONST char *src, int srcLen, int flags, \
-	    Tcl_EncodingState *statePtr, char *dst, int dstLen, \
-	    int *srcReadPtr, int *dstWrotePtr, int *dstCharsPtr)
-}
-declare 333 generic {
-    char * Tcl_UtfToExternalDString(Tcl_Encoding encoding, CONST char *src, \
-	    int srcLen, Tcl_DString *dsPtr)
-}
-declare 334 generic {
-    int Tcl_UtfToLower(char *src)
-}
-declare 335 generic {
-    int Tcl_UtfToTitle(char *src)
-}
-declare 336 generic {
-    int Tcl_UtfToUniChar(CONST char *src, Tcl_UniChar *chPtr)
-}
-declare 337 generic {
-    int Tcl_UtfToUpper(char *src)
-}
-declare 338 generic {
-    int Tcl_WriteChars(Tcl_Channel chan, CONST char *src, int srcLen)
-}
-declare 339 generic {
-    int Tcl_WriteObj(Tcl_Channel chan, Tcl_Obj *objPtr)
-}
-declare 340 generic {
-    char * Tcl_GetString(Tcl_Obj *objPtr)
-}
-declare 341 generic {
-    char * Tcl_GetDefaultEncodingDir(void)
-}
-declare 342 generic {
-    void Tcl_SetDefaultEncodingDir(char *path)
-}
-declare 343 generic {
-    void Tcl_AlertNotifier(ClientData clientData)
-}
-declare 344 generic {
-    void Tcl_ServiceModeHook(int mode)
-}
-declare 345 generic {
-    int Tcl_UniCharIsAlnum(int ch)
-}
-declare 346 generic {
-    int Tcl_UniCharIsAlpha(int ch)
-}
-declare 347 generic {
-    int Tcl_UniCharIsDigit(int ch)
-}
-declare 348 generic {
-    int Tcl_UniCharIsLower(int ch)
-}
-declare 349 generic {
-    int Tcl_UniCharIsSpace(int ch)
-}
-declare 350 generic {
-    int Tcl_UniCharIsUpper(int ch)
-}
-declare 351 generic {
-    int Tcl_UniCharIsWordChar(int ch)
-}
-declare 352 generic {
-    int Tcl_UniCharLen(Tcl_UniChar *str)
-}
-declare 353 generic {
-    int Tcl_UniCharNcmp(const Tcl_UniChar *cs, const Tcl_UniChar *ct, size_t n)
-}
-declare 354 generic {
-    char * Tcl_UniCharToUtfDString(CONST Tcl_UniChar *string, int numChars, \
- 	    Tcl_DString *dsPtr)
-}
-declare 355 generic {
-    Tcl_UniChar * Tcl_UtfToUniCharDString(CONST char *string, int length, \
-	    Tcl_DString *dsPtr)
-}
-declare 356 generic {
-    Tcl_RegExp	Tcl_GetRegExpFromObj(Tcl_Interp *interp, Tcl_Obj *patObj, int flags)
-}
-
-declare 357 generic {
-    Tcl_Obj *Tcl_EvalTokens (Tcl_Interp *interp, Tcl_Token *tokenPtr, \
-	    int count)
-}
-declare 358 generic {
-    void Tcl_FreeParse (Tcl_Parse *parsePtr)
-}
-declare 359 generic {
-    void Tcl_LogCommandInfo (Tcl_Interp *interp, char *script, \
-	    char *command, int length)
-}
-declare 360 generic {
-    int Tcl_ParseBraces (Tcl_Interp *interp, char *string, \
-	    int numBytes, Tcl_Parse *parsePtr,int append, char **termPtr)
-}
-declare 361 generic {
-    int Tcl_ParseCommand (Tcl_Interp *interp, char *string, int numBytes, \
-	    int nested, Tcl_Parse *parsePtr)
-}
-declare 362 generic {
-    int Tcl_ParseExpr(Tcl_Interp *interp, char *string, int numBytes, \
-	    Tcl_Parse *parsePtr)	 
-}
-declare 363 generic {
-    int Tcl_ParseQuotedString(Tcl_Interp *interp, char *string, int numBytes, \
-	    Tcl_Parse *parsePtr, int append, char **termPtr)
-}
-declare 364 generic {
-    int Tcl_ParseVarName (Tcl_Interp *interp, char *string, \
-	    int numBytes, Tcl_Parse *parsePtr, int append)
-}
-declare 365 generic {
-    char *Tcl_GetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
-}
-declare 366 generic {
-   int Tcl_Chdir(CONST char *dirName)
-}
-
-##############################################################################
-
-# Define the platform specific public Tcl interface.  These functions are
-# only available on the designated platform.
-
-interface tclPlat
-
-######################
-# Windows declarations
-
-# Added in Tcl 8.1
-
-declare 0 win {
-    TCHAR * Tcl_WinUtfToTChar(CONST char *str, int len, Tcl_DString *dsPtr)
-}
-declare 1 win {
-    char * Tcl_WinTCharToUtf(CONST TCHAR *str, int len, Tcl_DString *dsPtr)
-}
-
-##################
-# Mac declarations
-
-# This is needed by the shells to handle Macintosh events.
- 
-declare 0 mac {
-    void Tcl_MacSetEventProc(Tcl_MacConvertEventPtr procPtr)
-}
-
-# These routines are useful for handling using scripts from resources 
-# in the application shell
-
-declare 1 mac {
-    char * Tcl_MacConvertTextResource(Handle resource)
-}
-declare 2 mac {
-    int Tcl_MacEvalResource(Tcl_Interp *interp, char *resourceName, \
-	    int resourceNumber, char *fileName)
-}
-declare 3 mac {
-    Handle Tcl_MacFindResource(Tcl_Interp *interp, long resourceType, \
-	    char *resourceName, int resourceNumber, char *resFileRef, \
-	    int * releaseIt)
-}
-
-# These routines support the new OSType object type (i.e. the packed 4
-# character type and creator codes).
-
-declare 4 mac {
-    int Tcl_GetOSTypeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    OSType *osTypePtr)
-}
-declare 5 mac {
-    void Tcl_SetOSTypeObj(Tcl_Obj *objPtr, OSType osType)
-}
-declare 6 mac {
-    Tcl_Obj * Tcl_NewOSTypeObj(OSType osType)
-}
-
-# These are not in MSL 2.1.2, so we need to export them from the
-# Tcl shared library.  They are found in the compat directory
-# except the panic routine which is found in tclMacPanic.h.
- 
-declare 7 mac {
-    int strncasecmp(CONST char *s1, CONST char *s2, size_t n)
-}
-declare 8 mac {
-    int strcasecmp(CONST char *s1, CONST char *s2)
-}
diff --git a/generic/tcl.h b/generic/tcl.h
deleted file mode 100644
index 2a8be54..0000000
--- a/generic/tcl.h
+++ /dev/null
@@ -1,1520 +0,0 @@
-/*
- * tcl.h --
- *
- *	This header file describes the externally-visible facilities
- *	of the Tcl interpreter.
- *
- * Copyright (c) 1987-1994 The Regents of the University of California.
- * Copyright (c) 1993-1996 Lucent Technologies.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tcl.h,v 1.39 1999/04/16 00:46:42 stanton Exp $
- */
-
-#ifndef _TCL
-#define _TCL
-
-/*
- * The following defines are used to indicate the various release levels.
- */
-
-#define TCL_ALPHA_RELEASE	0
-#define TCL_BETA_RELEASE	1
-#define TCL_FINAL_RELEASE	2
-
-/*
- * When version numbers change here, must also go into the following files
- * and update the version numbers:
- *
- * library/init.tcl	(only if major.minor changes, not patchlevel)
- * unix/configure.in
- * win/makefile.bc	(only if major.minor changes, not patchlevel)
- * win/makefile.vc	(only if major.minor changes, not patchlevel)
- * win/pkgIndex.tcl	(for tclregNN.dll, not patchlevel)
- * README
- * mac/README
- * win/README.binary
- * win/README		(only if major.minor changes, not patchlevel)
- * unix/README		(only if major.minor changes, not patchlevel)
- */
-
-#define TCL_MAJOR_VERSION   8
-#define TCL_MINOR_VERSION   1
-#define TCL_RELEASE_LEVEL   TCL_BETA_RELEASE
-#define TCL_RELEASE_SERIAL  3
-
-#define TCL_VERSION	    "8.1"
-#define TCL_PATCH_LEVEL	    "8.1b3"
-
-/*
- * The following definitions set up the proper options for Windows
- * compilers.  We use this method because there is no autoconf equivalent.
- */
-
-#ifndef __WIN32__
-#   if defined(_WIN32) || defined(WIN32)
-#	define __WIN32__
-#   endif
-#endif
-
-#ifdef __WIN32__
-#   ifndef STRICT
-#	define STRICT
-#   endif
-#   ifndef USE_PROTOTYPE
-#	define USE_PROTOTYPE 1
-#   endif
-#   ifndef HAS_STDARG
-#	define HAS_STDARG 1
-#   endif
-#   ifndef USE_PROTOTYPE
-#	define USE_PROTOTYPE 1
-#   endif
-
-/*
- * Under Windows we need to call Tcl_Alloc in all cases to avoid competing
- * C run-time library issues.
- */
-
-#   ifndef USE_TCLALLOC
-#	define USE_TCLALLOC 1
-#   endif
-#endif /* __WIN32__ */
-
-/*
- * The following definitions set up the proper options for Macintosh
- * compilers.  We use this method because there is no autoconf equivalent.
- */
-
-#ifdef MAC_TCL
-#   ifndef HAS_STDARG
-#	define HAS_STDARG 1
-#   endif
-#   ifndef USE_TCLALLOC
-#	define USE_TCLALLOC 1
-#   endif
-#   ifndef NO_STRERROR
-#	define NO_STRERROR 1
-#   endif
-#   define INLINE 
-#endif
-
-/*
- * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
- * quotation marks), JOIN joins two arguments.
- */
-
-#define VERBATIM(x) x
-#ifdef _MSC_VER
-# define STRINGIFY(x) STRINGIFY1(x)
-# define STRINGIFY1(x) #x
-# define JOIN(a,b) JOIN1(a,b)
-# define JOIN1(a,b) a##b
-#else
-# ifdef RESOURCE_INCLUDED
-#  define STRINGIFY(x) STRINGIFY1(x)
-#  define STRINGIFY1(x) #x
-#  define JOIN(a,b) JOIN1(a,b)
-#  define JOIN1(a,b) a##b
-# else
-#  ifdef __STDC__
-#   define STRINGIFY(x) #x
-#   define JOIN(a,b) a##b
-#  else
-#   define STRINGIFY(x) "x"
-#   define JOIN(a,b) VERBATIM(a)VERBATIM(b)
-#  endif
-# endif
-#endif
-
-/*
- * Special macro to define mutexes, that doesn't do anything
- * if we are not using threads.
- */
-
-#ifdef TCL_THREADS
-#define TCL_DECLARE_MUTEX(name) static Tcl_Mutex name;
-#else
-#define TCL_DECLARE_MUTEX(name)
-#endif
-
-/*
- * Macros that eliminate the overhead of the thread synchronization
- * functions when compiling without thread support.
- */
-
-#ifndef TCL_THREADS
-#define Tcl_MutexLock(mutexPtr)
-#define Tcl_MutexUnlock(mutexPtr)
-#define Tcl_ConditionNotify(condPtr)
-#define Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-#endif /* TCL_THREADS */
-
-/* 
- * A special definition used to allow this header file to be included 
- * in resource files so that they can get obtain version information from
- * this file.  Resource compilers don't like all the C stuff, like typedefs
- * and procedure declarations, that occur below.
- */
-
-#ifndef RESOURCE_INCLUDED
-
-#ifndef BUFSIZ
-#include <stdio.h>
-#endif
-
-/*
- * Definitions that allow Tcl functions with variable numbers of
- * arguments to be used with either varargs.h or stdarg.h.  TCL_VARARGS
- * is used in procedure prototypes.  TCL_VARARGS_DEF is used to declare
- * the arguments in a function definiton: it takes the type and name of
- * the first argument and supplies the appropriate argument declaration
- * string for use in the function definition.  TCL_VARARGS_START
- * initializes the va_list data structure and returns the first argument.
- */
-
-#if defined(__STDC__) || defined(HAS_STDARG)
-#   include <stdarg.h>
-
-#   define TCL_VARARGS(type, name) (type name, ...)
-#   define TCL_VARARGS_DEF(type, name) (type name, ...)
-#   define TCL_VARARGS_START(type, name, list) (va_start(list, name), name)
-#else
-#   include <varargs.h>
-
-#   ifdef __cplusplus
-#	define TCL_VARARGS(type, name) (type name, ...)
-#	define TCL_VARARGS_DEF(type, name) (type va_alist, ...)
-#   else
-#	define TCL_VARARGS(type, name) ()
-#	define TCL_VARARGS_DEF(type, name) (va_alist)
-#   endif
-#   define TCL_VARARGS_START(type, name, list) \
-	(va_start(list), va_arg(list, type))
-#endif
-
-/*
- * Macros used to declare a function to be exported by a DLL.
- * Used by Windows, maps to no-op declarations on non-Windows systems.
- * The default build on windows is for a DLL, which causes the DLLIMPORT
- * and DLLEXPORT macros to be nonempty. To build a static library, the
- * macro STATIC_BUILD should be defined.
- */
-
-#ifdef STATIC_BUILD
-# define DLLIMPORT
-# define DLLEXPORT
-#else
-# if defined(__WIN32__) && (defined(_MSC_VER) || (defined(__GNUC__) && defined(__declspec)))
-#   define DLLIMPORT __declspec(dllimport)
-#   define DLLEXPORT __declspec(dllexport)
-# else
-#  define DLLIMPORT
-#  define DLLEXPORT
-# endif
-#endif
-
-/*
- * These macros are used to control whether functions are being declared for
- * import or export.  If a function is being declared while it is being built
- * to be included in a shared library, then it should have the DLLEXPORT
- * storage class.  If is being declared for use by a module that is going to
- * link against the shared library, then it should have the DLLIMPORT storage
- * class.  If the symbol is beind declared for a static build or for use from a
- * stub library, then the storage class should be empty.
- *
- * The convention is that a macro called BUILD_xxxx, where xxxx is the
- * name of a library we are building, is set on the compile line for sources
- * that are to be placed in the library.  When this macro is set, the
- * storage class will be set to DLLEXPORT.  At the end of the header file, the
- * storage class will be reset to DLLIMPORt.
- */
-
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-# define TCL_STORAGE_CLASS DLLEXPORT
-#else
-# ifdef USE_TCL_STUBS
-#  define TCL_STORAGE_CLASS
-# else
-#  define TCL_STORAGE_CLASS DLLIMPORT
-# endif
-#endif
-
-/*
- * Definitions that allow this header file to be used either with or
- * without ANSI C features like function prototypes.
- */
-
-#undef _ANSI_ARGS_
-#undef CONST
-#ifndef INLINE
-#   define INLINE
-#endif
-
-#if ((defined(__STDC__) || defined(SABER)) && !defined(NO_PROTOTYPE)) || defined(__cplusplus) || defined(USE_PROTOTYPE)
-#   define _USING_PROTOTYPES_ 1
-#   define _ANSI_ARGS_(x)	x
-#   define CONST const
-#else
-#   define _ANSI_ARGS_(x)	()
-#   define CONST
-#endif
-
-#ifdef __cplusplus
-#   define EXTERN extern "C" TCL_STORAGE_CLASS
-#else
-#   define EXTERN extern TCL_STORAGE_CLASS
-#endif
-
-/*
- * Macro to use instead of "void" for arguments that must have
- * type "void *" in ANSI C;  maps them to type "char *" in
- * non-ANSI systems.
- */
-#ifndef __WIN32__
-#ifndef VOID
-#   ifdef __STDC__
-#       define VOID void
-#   else
-#       define VOID char
-#   endif
-#endif
-#else /* __WIN32__ */
-/*
- * The following code is copied from winnt.h
- */
-#ifndef VOID
-#define VOID void
-typedef char CHAR;
-typedef short SHORT;
-typedef long LONG;
-#endif
-#endif /* __WIN32__ */
-
-/*
- * Miscellaneous declarations.
- */
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef _CLIENTDATA
-#   if defined(__STDC__) || defined(__cplusplus)
-    typedef void *ClientData;
-#   else
-    typedef int *ClientData;
-#   endif /* __STDC__ */
-#define _CLIENTDATA
-#endif
-
-/*
- * Data structures defined opaquely in this module. The definitions below
- * just provide dummy types. A few fields are made visible in Tcl_Interp
- * structures, namely those used for returning a string result from
- * commands. Direct access to the result field is discouraged in Tcl 8.0.
- * The interpreter result is either an object or a string, and the two
- * values are kept consistent unless some C code sets interp->result
- * directly. Programmers should use either the procedure Tcl_GetObjResult()
- * or Tcl_GetStringResult() to read the interpreter's result. See the
- * SetResult man page for details.
- * 
- * Note: any change to the Tcl_Interp definition below must be mirrored
- * in the "real" definition in tclInt.h.
- *
- * Note: Tcl_ObjCmdProc procedures do not directly set result and freeProc.
- * Instead, they set a Tcl_Obj member in the "real" structure that can be
- * accessed with Tcl_GetObjResult() and Tcl_SetObjResult().
- */
-
-typedef struct Tcl_Interp {
-    char *result;		/* If the last command returned a string
-				 * result, this points to it. */
-    void (*freeProc) _ANSI_ARGS_((char *blockPtr));
-				/* Zero means the string result is
-				 * statically allocated. TCL_DYNAMIC means
-				 * it was allocated with ckalloc and should
-				 * be freed with ckfree. Other values give
-				 * the address of procedure to invoke to
-				 * free the result. Tcl_Eval must free it
-				 * before executing next command. */
-    int errorLine;              /* When TCL_ERROR is returned, this gives
-                                 * the line number within the command where
-                                 * the error occurred (1 if first line). */
-} Tcl_Interp;
-
-typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
-typedef struct Tcl_Channel_ *Tcl_Channel;
-typedef struct Tcl_Command_ *Tcl_Command;
-typedef struct Tcl_Condition_ *Tcl_Condition;
-typedef struct Tcl_EncodingState_ *Tcl_EncodingState;
-typedef struct Tcl_Encoding_ *Tcl_Encoding;
-typedef struct Tcl_Event Tcl_Event;
-typedef struct Tcl_Mutex_ *Tcl_Mutex;
-typedef struct Tcl_Pid_ *Tcl_Pid;
-typedef struct Tcl_RegExp_ *Tcl_RegExp;
-typedef struct Tcl_ThreadDataKey_ *Tcl_ThreadDataKey;
-typedef struct Tcl_ThreadId_ *Tcl_ThreadId;
-typedef struct Tcl_TimerToken_ *Tcl_TimerToken;
-typedef struct Tcl_Trace_ *Tcl_Trace;
-typedef struct Tcl_Var_ *Tcl_Var;
-
-/*
- * When a TCL command returns, the interpreter contains a result from the
- * command. Programmers are strongly encouraged to use one of the
- * procedures Tcl_GetObjResult() or Tcl_GetStringResult() to read the
- * interpreter's result. See the SetResult man page for details. Besides
- * this result, the command procedure returns an integer code, which is 
- * one of the following:
- *
- * TCL_OK		Command completed normally; the interpreter's
- *			result contains	the command's result.
- * TCL_ERROR		The command couldn't be completed successfully;
- *			the interpreter's result describes what went wrong.
- * TCL_RETURN		The command requests that the current procedure
- *			return; the interpreter's result contains the
- *			procedure's return value.
- * TCL_BREAK		The command requests that the innermost loop
- *			be exited; the interpreter's result is meaningless.
- * TCL_CONTINUE		Go on to the next iteration of the current loop;
- *			the interpreter's result is meaningless.
- */
-
-#define TCL_OK		0
-#define TCL_ERROR	1
-#define TCL_RETURN	2
-#define TCL_BREAK	3
-#define TCL_CONTINUE	4
-
-#define TCL_RESULT_SIZE 200
-
-/*
- * Argument descriptors for math function callbacks in expressions:
- */
-
-typedef enum {TCL_INT, TCL_DOUBLE, TCL_EITHER} Tcl_ValueType;
-typedef struct Tcl_Value {
-    Tcl_ValueType type;		/* Indicates intValue or doubleValue is
-				 * valid, or both. */
-    long intValue;		/* Integer value. */
-    double doubleValue;		/* Double-precision floating value. */
-} Tcl_Value;
-
-/*
- * Forward declaration of Tcl_Obj to prevent an error when the forward
- * reference to Tcl_Obj is encountered in the procedure types declared 
- * below.
- */
-
-struct Tcl_Obj;
-
-/*
- * Procedure types defined by Tcl:
- */
-
-typedef int (Tcl_AppInitProc) _ANSI_ARGS_((Tcl_Interp *interp));
-typedef int (Tcl_AsyncProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int code));
-typedef void (Tcl_ChannelProc) _ANSI_ARGS_((ClientData clientData, int mask));
-typedef void (Tcl_CloseProc) _ANSI_ARGS_((ClientData data));
-typedef void (Tcl_CmdDeleteProc) _ANSI_ARGS_((ClientData clientData));
-typedef int (Tcl_CmdProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int argc, char *argv[]));
-typedef void (Tcl_CmdTraceProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int level, char *command, Tcl_CmdProc *proc,
-	ClientData cmdClientData, int argc, char *argv[]));
-typedef void (Tcl_DupInternalRepProc) _ANSI_ARGS_((struct Tcl_Obj *srcPtr, 
-        struct Tcl_Obj *dupPtr));
-typedef int (Tcl_EncodingConvertProc)_ANSI_ARGS_((ClientData clientData,
-	CONST char *src, int srcLen, int flags, Tcl_EncodingState *statePtr,
-	char *dst, int dstLen, int *srcReadPtr, int *dstWrotePtr,
-	int *dstCharsPtr));
-typedef void (Tcl_EncodingFreeProc)_ANSI_ARGS_((ClientData clientData));
-typedef int (Tcl_EventProc) _ANSI_ARGS_((Tcl_Event *evPtr, int flags));
-typedef void (Tcl_EventCheckProc) _ANSI_ARGS_((ClientData clientData,
-	int flags));
-typedef int (Tcl_EventDeleteProc) _ANSI_ARGS_((Tcl_Event *evPtr,
-        ClientData clientData));
-typedef void (Tcl_EventSetupProc) _ANSI_ARGS_((ClientData clientData,
-	int flags));
-typedef void (Tcl_ExitProc) _ANSI_ARGS_((ClientData clientData));
-typedef void (Tcl_FileProc) _ANSI_ARGS_((ClientData clientData, int mask));
-typedef void (Tcl_FileFreeProc) _ANSI_ARGS_((ClientData clientData));
-typedef void (Tcl_FreeInternalRepProc) _ANSI_ARGS_((struct Tcl_Obj *objPtr));
-typedef void (Tcl_FreeProc) _ANSI_ARGS_((char *blockPtr));
-typedef void (Tcl_IdleProc) _ANSI_ARGS_((ClientData clientData));
-typedef void (Tcl_InterpDeleteProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp));
-typedef int (Tcl_MathProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, Tcl_Value *args, Tcl_Value *resultPtr));
-typedef void (Tcl_NamespaceDeleteProc) _ANSI_ARGS_((ClientData clientData));
-typedef int (Tcl_ObjCmdProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int objc, struct Tcl_Obj *CONST objv[]));
-typedef int (Tcl_PackageInitProc) _ANSI_ARGS_((Tcl_Interp *interp));
-typedef void (Tcl_PanicProc) _ANSI_ARGS_(TCL_VARARGS(char *, format));
-typedef void (Tcl_TcpAcceptProc) _ANSI_ARGS_((ClientData callbackData,
-        Tcl_Channel chan, char *address, int port));
-typedef void (Tcl_TimerProc) _ANSI_ARGS_((ClientData clientData));
-typedef int (Tcl_SetFromAnyProc) _ANSI_ARGS_((Tcl_Interp *interp,
-	struct Tcl_Obj *objPtr));
-typedef void (Tcl_UpdateStringProc) _ANSI_ARGS_((struct Tcl_Obj *objPtr));
-typedef char *(Tcl_VarTraceProc) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, char *part1, char *part2, int flags));
-
-/*
- * The following structure represents a type of object, which is a
- * particular internal representation for an object plus a set of
- * procedures that provide standard operations on objects of that type.
- */
-
-typedef struct Tcl_ObjType {
-    char *name;			/* Name of the type, e.g. "int". */
-    Tcl_FreeInternalRepProc *freeIntRepProc;
-				/* Called to free any storage for the type's
-				 * internal rep. NULL if the internal rep
-				 * does not need freeing. */
-    Tcl_DupInternalRepProc *dupIntRepProc;
-    				/* Called to create a new object as a copy
-				 * of an existing object. */
-    Tcl_UpdateStringProc *updateStringProc;
-    				/* Called to update the string rep from the
-				 * type's internal representation. */
-    Tcl_SetFromAnyProc *setFromAnyProc;
-    				/* Called to convert the object's internal
-				 * rep to this type. Frees the internal rep
-				 * of the old type. Returns TCL_ERROR on
-				 * failure. */
-} Tcl_ObjType;
-
-/*
- * One of the following structures exists for each object in the Tcl
- * system. An object stores a value as either a string, some internal
- * representation, or both.
- */
-
-typedef struct Tcl_Obj {
-    int refCount;		/* When 0 the object will be freed. */
-    char *bytes;		/* This points to the first byte of the
-				 * object's string representation. The array
-				 * must be followed by a null byte (i.e., at
-				 * offset length) but may also contain
-				 * embedded null characters. The array's
-				 * storage is allocated by ckalloc. NULL
-				 * means the string rep is invalid and must
-				 * be regenerated from the internal rep.
-				 * Clients should use Tcl_GetStringFromObj
-				 * or Tcl_GetString to get a pointer to the
-				 * byte array as a readonly value. */
-    int length;			/* The number of bytes at *bytes, not
-				 * including the terminating null. */
-    Tcl_ObjType *typePtr;	/* Denotes the object's type. Always
-				 * corresponds to the type of the object's
-				 * internal rep. NULL indicates the object
-				 * has no internal rep (has no type). */
-    union {			/* The internal representation: */
-	long longValue;		/*   - an long integer value */
-	double doubleValue;	/*   - a double-precision floating value */
-	VOID *otherValuePtr;	/*   - another, type-specific value */
-	struct {		/*   - internal rep as two pointers */
-	    VOID *ptr1;
-	    VOID *ptr2;
-	} twoPtrValue;
-    } internalRep;
-} Tcl_Obj;
-
-/*
- * Macros to increment and decrement a Tcl_Obj's reference count, and to
- * test whether an object is shared (i.e. has reference count > 1).
- * Note: clients should use Tcl_DecrRefCount() when they are finished using
- * an object, and should never call TclFreeObj() directly. TclFreeObj() is
- * only defined and made public in tcl.h to support Tcl_DecrRefCount's macro
- * definition. Note also that Tcl_DecrRefCount() refers to the parameter
- * "obj" twice. This means that you should avoid calling it with an
- * expression that is expensive to compute or has side effects.
- */
-
-EXTERN void		Tcl_IncrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
-EXTERN void		Tcl_DecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
-EXTERN int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
-
-#ifdef TCL_MEM_DEBUG
-#   define Tcl_IncrRefCount(objPtr) \
-	Tcl_DbIncrRefCount(objPtr, __FILE__, __LINE__)
-#   define Tcl_DecrRefCount(objPtr) \
-	Tcl_DbDecrRefCount(objPtr, __FILE__, __LINE__)
-#   define Tcl_IsShared(objPtr) \
-	Tcl_DbIsShared(objPtr, __FILE__, __LINE__)
-#else
-#   define Tcl_IncrRefCount(objPtr) \
-	++(objPtr)->refCount
-#   define Tcl_DecrRefCount(objPtr) \
-	if (--(objPtr)->refCount <= 0) TclFreeObj(objPtr)
-#   define Tcl_IsShared(objPtr) \
-	((objPtr)->refCount > 1)
-#endif
-
-/*
- * Macros and definitions that help to debug the use of Tcl objects.
- * When TCL_MEM_DEBUG is defined, the Tcl_New declarations are 
- * overridden to call debugging versions of the object creation procedures.
- */
-
-#ifdef TCL_MEM_DEBUG
-#  define Tcl_NewBooleanObj(val) \
-     Tcl_DbNewBooleanObj(val, __FILE__, __LINE__)
-#  define Tcl_NewByteArrayObj(bytes, len) \
-     Tcl_DbNewByteArrayObj(bytes, len, __FILE__, __LINE__)
-#  define Tcl_NewDoubleObj(val) \
-     Tcl_DbNewDoubleObj(val, __FILE__, __LINE__)
-#  define Tcl_NewIntObj(val) \
-     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
-#  define Tcl_NewListObj(objc, objv) \
-     Tcl_DbNewListObj(objc, objv, __FILE__, __LINE__)
-#  define Tcl_NewLongObj(val) \
-     Tcl_DbNewLongObj(val, __FILE__, __LINE__)
-#  define Tcl_NewObj() \
-     Tcl_DbNewObj(__FILE__, __LINE__)
-#  define Tcl_NewStringObj(bytes, len) \
-     Tcl_DbNewStringObj(bytes, len, __FILE__, __LINE__)
-#endif /* TCL_MEM_DEBUG */
-
-/*
- * The following structure contains the state needed by
- * Tcl_SaveResult.  No-one outside of Tcl should access any of these
- * fields.  This structure is typically allocated on the stack.
- */
-
-typedef struct Tcl_SavedResult {
-    char *result;
-    Tcl_FreeProc *freeProc;
-    Tcl_Obj *objResultPtr;
-    char *appendResult;
-    int appendAvl;
-    int appendUsed;
-    char resultSpace[TCL_RESULT_SIZE+1];
-} Tcl_SavedResult;
-
-
-/*
- * The following definitions support Tcl's namespace facility.
- * Note: the first five fields must match exactly the fields in a
- * Namespace structure (see tcl.h). 
- */
-
-typedef struct Tcl_Namespace {
-    char *name;                 /* The namespace's name within its parent
-				 * namespace. This contains no ::'s. The
-				 * name of the global namespace is ""
-				 * although "::" is an synonym. */
-    char *fullName;             /* The namespace's fully qualified name.
-				 * This starts with ::. */
-    ClientData clientData;      /* Arbitrary value associated with this
-				 * namespace. */
-    Tcl_NamespaceDeleteProc* deleteProc;
-                                /* Procedure invoked when deleting the
-				 * namespace to, e.g., free clientData. */
-    struct Tcl_Namespace* parentPtr;
-                                /* Points to the namespace that contains
-				 * this one. NULL if this is the global
-				 * namespace. */
-} Tcl_Namespace;
-
-/*
- * The following structure represents a call frame, or activation record.
- * A call frame defines a naming context for a procedure call: its local
- * scope (for local variables) and its namespace scope (used for non-local
- * variables; often the global :: namespace). A call frame can also define
- * the naming context for a namespace eval or namespace inscope command:
- * the namespace in which the command's code should execute. The
- * Tcl_CallFrame structures exist only while procedures or namespace
- * eval/inscope's are being executed, and provide a Tcl call stack.
- * 
- * A call frame is initialized and pushed using Tcl_PushCallFrame and
- * popped using Tcl_PopCallFrame. Storage for a Tcl_CallFrame must be
- * provided by the Tcl_PushCallFrame caller, and callers typically allocate
- * them on the C call stack for efficiency. For this reason, Tcl_CallFrame
- * is defined as a structure and not as an opaque token. However, most
- * Tcl_CallFrame fields are hidden since applications should not access
- * them directly; others are declared as "dummyX".
- *
- * WARNING!! The structure definition must be kept consistent with the
- * CallFrame structure in tclInt.h. If you change one, change the other.
- */
-
-typedef struct Tcl_CallFrame {
-    Tcl_Namespace *nsPtr;
-    int dummy1;
-    int dummy2;
-    char *dummy3;
-    char *dummy4;
-    char *dummy5;
-    int dummy6;
-    char *dummy7;
-    char *dummy8;
-    int dummy9;
-    char* dummy10;
-} Tcl_CallFrame;
-
-/*
- * Information about commands that is returned by Tcl_GetCommandInfo and
- * passed to Tcl_SetCommandInfo. objProc is an objc/objv object-based
- * command procedure while proc is a traditional Tcl argc/argv
- * string-based procedure. Tcl_CreateObjCommand and Tcl_CreateCommand
- * ensure that both objProc and proc are non-NULL and can be called to
- * execute the command. However, it may be faster to call one instead of
- * the other. The member isNativeObjectProc is set to 1 if an
- * object-based procedure was registered by Tcl_CreateObjCommand, and to
- * 0 if a string-based procedure was registered by Tcl_CreateCommand.
- * The other procedure is typically set to a compatibility wrapper that
- * does string-to-object or object-to-string argument conversions then
- * calls the other procedure.
- */
-     
-typedef struct Tcl_CmdInfo {
-    int isNativeObjectProc;	 /* 1 if objProc was registered by a call to
-				  * Tcl_CreateObjCommand; 0 otherwise.
-				  * Tcl_SetCmdInfo does not modify this
-				  * field. */
-    Tcl_ObjCmdProc *objProc;	 /* Command's object-based procedure. */
-    ClientData objClientData;	 /* ClientData for object proc. */
-    Tcl_CmdProc *proc;		 /* Command's string-based procedure. */
-    ClientData clientData;	 /* ClientData for string proc. */
-    Tcl_CmdDeleteProc *deleteProc;
-                                 /* Procedure to call when command is
-                                  * deleted. */
-    ClientData deleteData;	 /* Value to pass to deleteProc (usually
-				  * the same as clientData). */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace that contains
-				  * this command. Note that Tcl_SetCmdInfo
-				  * will not change a command's namespace;
-				  * use Tcl_RenameCommand to do that. */
-
-} Tcl_CmdInfo;
-
-/*
- * The structure defined below is used to hold dynamic strings.  The only
- * field that clients should use is the string field, and they should
- * never modify it.
- */
-
-#define TCL_DSTRING_STATIC_SIZE 200
-typedef struct Tcl_DString {
-    char *string;		/* Points to beginning of string:  either
-				 * staticSpace below or a malloced array. */
-    int length;			/* Number of non-NULL characters in the
-				 * string. */
-    int spaceAvl;		/* Total number of bytes available for the
-				 * string and its terminating NULL char. */
-    char staticSpace[TCL_DSTRING_STATIC_SIZE];
-				/* Space to use in common case where string
-				 * is small. */
-} Tcl_DString;
-
-#define Tcl_DStringLength(dsPtr) ((dsPtr)->length)
-#define Tcl_DStringValue(dsPtr) ((dsPtr)->string)
-#define Tcl_DStringTrunc Tcl_DStringSetLength
-
-/*
- * Definitions for the maximum number of digits of precision that may
- * be specified in the "tcl_precision" variable, and the number of
- * bytes of buffer space required by Tcl_PrintDouble.
- */
- 
-#define TCL_MAX_PREC 17
-#define TCL_DOUBLE_SPACE (TCL_MAX_PREC+10)
-
-/*
- * Definition for a number of bytes of buffer space sufficient to hold the
- * string representation of an integer in base 10 (assuming the existence
- * of 64-bit integers).
- */
-
-#define TCL_INTEGER_SPACE	24
-
-/*
- * Flag that may be passed to Tcl_ConvertElement to force it not to
- * output braces (careful!  if you change this flag be sure to change
- * the definitions at the front of tclUtil.c).
- */
-
-#define TCL_DONT_USE_BRACES	1
-
-/*
- * Flag that may be passed to Tcl_GetIndexFromObj to force it to disallow
- * abbreviated strings.
- */
-
-#define TCL_EXACT	1
-
-/*
- * Flag values passed to Tcl_RecordAndEval and/or Tcl_EvalObj.
- * WARNING: these bit choices must not conflict with the bit choices
- * for evalFlag bits in tclInt.h!!
- */
-
-#define TCL_NO_EVAL		0x10000
-#define TCL_EVAL_GLOBAL		0x20000
-#define TCL_EVAL_DIRECT		0x40000
-
-/*
- * Special freeProc values that may be passed to Tcl_SetResult (see
- * the man page for details):
- */
-
-#define TCL_VOLATILE	((Tcl_FreeProc *) 1)
-#define TCL_STATIC	((Tcl_FreeProc *) 0)
-#define TCL_DYNAMIC	((Tcl_FreeProc *) 3)
-
-/*
- * Flag values passed to variable-related procedures.
- */
-
-#define TCL_GLOBAL_ONLY		 1
-#define TCL_NAMESPACE_ONLY	 2
-#define TCL_APPEND_VALUE	 4
-#define TCL_LIST_ELEMENT	 8
-#define TCL_TRACE_READS		 0x10
-#define TCL_TRACE_WRITES	 0x20
-#define TCL_TRACE_UNSETS	 0x40
-#define TCL_TRACE_DESTROYED	 0x80
-#define TCL_INTERP_DESTROYED	 0x100
-#define TCL_LEAVE_ERR_MSG	 0x200
-#define TCL_TRACE_ARRAY		 0x800
-
-/*
- * The TCL_PARSE_PART1 flag is deprecated and has no effect. 
- * The part1 is now always parsed whenever the part2 is NULL.
- * (This is to avoid a common error when converting code to
- *  use the new object based APIs and forgetting to give the
- *  flag)
- */
-#ifndef TCL_NO_DEPRECATED
-#define TCL_PARSE_PART1          0x400
-#endif
-
-
-/*
- * Types for linked variables:
- */
-
-#define TCL_LINK_INT		1
-#define TCL_LINK_DOUBLE		2
-#define TCL_LINK_BOOLEAN	3
-#define TCL_LINK_STRING		4
-#define TCL_LINK_READ_ONLY	0x80
-
-/*
- * Forward declaration of Tcl_HashTable.  Needed by some C++ compilers
- * to prevent errors when the forward reference to Tcl_HashTable is
- * encountered in the Tcl_HashEntry structure.
- */
-
-#ifdef __cplusplus
-struct Tcl_HashTable;
-#endif
-
-/*
- * Structure definition for an entry in a hash table.  No-one outside
- * Tcl should access any of these fields directly;  use the macros
- * defined below.
- */
-
-typedef struct Tcl_HashEntry {
-    struct Tcl_HashEntry *nextPtr;	/* Pointer to next entry in this
-					 * hash bucket, or NULL for end of
-					 * chain. */
-    struct Tcl_HashTable *tablePtr;	/* Pointer to table containing entry. */
-    struct Tcl_HashEntry **bucketPtr;	/* Pointer to bucket that points to
-					 * first entry in this entry's chain:
-					 * used for deleting the entry. */
-    ClientData clientData;		/* Application stores something here
-					 * with Tcl_SetHashValue. */
-    union {				/* Key has one of these forms: */
-	char *oneWordValue;		/* One-word value for key. */
-	int words[1];			/* Multiple integer words for key.
-					 * The actual size will be as large
-					 * as necessary for this table's
-					 * keys. */
-	char string[4];			/* String for key.  The actual size
-					 * will be as large as needed to hold
-					 * the key. */
-    } key;				/* MUST BE LAST FIELD IN RECORD!! */
-} Tcl_HashEntry;
-
-/*
- * Structure definition for a hash table.  Must be in tcl.h so clients
- * can allocate space for these structures, but clients should never
- * access any fields in this structure.
- */
-
-#define TCL_SMALL_HASH_TABLE 4
-typedef struct Tcl_HashTable {
-    Tcl_HashEntry **buckets;		/* Pointer to bucket array.  Each
-					 * element points to first entry in
-					 * bucket's hash chain, or NULL. */
-    Tcl_HashEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
-					/* Bucket array used for small tables
-					 * (to avoid mallocs and frees). */
-    int numBuckets;			/* Total number of buckets allocated
-					 * at **bucketPtr. */
-    int numEntries;			/* Total number of entries present
-					 * in table. */
-    int rebuildSize;			/* Enlarge table when numEntries gets
-					 * to be this large. */
-    int downShift;			/* Shift count used in hashing
-					 * function.  Designed to use high-
-					 * order bits of randomized keys. */
-    int mask;				/* Mask value used in hashing
-					 * function. */
-    int keyType;			/* Type of keys used in this table. 
-					 * It's either TCL_STRING_KEYS,
-					 * TCL_ONE_WORD_KEYS, or an integer
-					 * giving the number of ints that
-                                         * is the size of the key.
-					 */
-    Tcl_HashEntry *(*findProc) _ANSI_ARGS_((struct Tcl_HashTable *tablePtr,
-	    CONST char *key));
-    Tcl_HashEntry *(*createProc) _ANSI_ARGS_((struct Tcl_HashTable *tablePtr,
-	    CONST char *key, int *newPtr));
-} Tcl_HashTable;
-
-/*
- * Structure definition for information used to keep track of searches
- * through hash tables:
- */
-
-typedef struct Tcl_HashSearch {
-    Tcl_HashTable *tablePtr;		/* Table being searched. */
-    int nextIndex;			/* Index of next bucket to be
-					 * enumerated after present one. */
-    Tcl_HashEntry *nextEntryPtr;	/* Next entry to be enumerated in the
-					 * the current bucket. */
-} Tcl_HashSearch;
-
-/*
- * Acceptable key types for hash tables:
- */
-
-#define TCL_STRING_KEYS		0
-#define TCL_ONE_WORD_KEYS	1
-
-/*
- * Macros for clients to use to access fields of hash entries:
- */
-
-#define Tcl_GetHashValue(h) ((h)->clientData)
-#define Tcl_SetHashValue(h, value) ((h)->clientData = (ClientData) (value))
-#define Tcl_GetHashKey(tablePtr, h) \
-    ((char *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS) ? (h)->key.oneWordValue \
-						: (h)->key.string))
-
-/*
- * Macros to use for clients to use to invoke find and create procedures
- * for hash tables:
- */
-
-#define Tcl_FindHashEntry(tablePtr, key) \
-	(*((tablePtr)->findProc))(tablePtr, key)
-#define Tcl_CreateHashEntry(tablePtr, key, newPtr) \
-	(*((tablePtr)->createProc))(tablePtr, key, newPtr)
-
-/*
- * Flag values to pass to Tcl_DoOneEvent to disable searches
- * for some kinds of events:
- */
-
-#define TCL_DONT_WAIT		(1<<1)
-#define TCL_WINDOW_EVENTS	(1<<2)
-#define TCL_FILE_EVENTS		(1<<3)
-#define TCL_TIMER_EVENTS	(1<<4)
-#define TCL_IDLE_EVENTS		(1<<5)	/* WAS 0x10 ???? */
-#define TCL_ALL_EVENTS		(~TCL_DONT_WAIT)
-
-/*
- * The following structure defines a generic event for the Tcl event
- * system.  These are the things that are queued in calls to Tcl_QueueEvent
- * and serviced later by Tcl_DoOneEvent.  There can be many different
- * kinds of events with different fields, corresponding to window events,
- * timer events, etc.  The structure for a particular event consists of
- * a Tcl_Event header followed by additional information specific to that
- * event.
- */
-
-struct Tcl_Event {
-    Tcl_EventProc *proc;	/* Procedure to call to service this event. */
-    struct Tcl_Event *nextPtr;	/* Next in list of pending events, or NULL. */
-};
-
-/*
- * Positions to pass to Tcl_QueueEvent:
- */
-
-typedef enum {
-    TCL_QUEUE_TAIL, TCL_QUEUE_HEAD, TCL_QUEUE_MARK
-} Tcl_QueuePosition;
-
-/*
- * Values to pass to Tcl_SetServiceMode to specify the behavior of notifier
- * event routines.
- */
-
-#define TCL_SERVICE_NONE 0
-#define TCL_SERVICE_ALL 1
-
-/*
- * The following structure keeps is used to hold a time value, either as
- * an absolute time (the number of seconds from the epoch) or as an
- * elapsed time. On Unix systems the epoch is Midnight Jan 1, 1970 GMT.
- * On Macintosh systems the epoch is Midnight Jan 1, 1904 GMT.
- */
-
-typedef struct Tcl_Time {
-    long sec;			/* Seconds. */
-    long usec;			/* Microseconds. */
-} Tcl_Time;
-
-/*
- * Bits to pass to Tcl_CreateFileHandler and Tcl_CreateChannelHandler
- * to indicate what sorts of events are of interest:
- */
-
-#define TCL_READABLE	(1<<1)
-#define TCL_WRITABLE	(1<<2)
-#define TCL_EXCEPTION	(1<<3)
-
-/*
- * Flag values to pass to Tcl_OpenCommandChannel to indicate the
- * disposition of the stdio handles.  TCL_STDIN, TCL_STDOUT, TCL_STDERR,
- * are also used in Tcl_GetStdChannel.
- */
-
-#define TCL_STDIN		(1<<1)	
-#define TCL_STDOUT		(1<<2)
-#define TCL_STDERR		(1<<3)
-#define TCL_ENFORCE_MODE	(1<<4)
-
-/*
- * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
- * should be closed.
- */
-
-#define TCL_CLOSE_READ		(1<<1)
-#define TCL_CLOSE_WRITE	(1<<2)
-
-/*
- * Value to use as the closeProc for a channel that supports the
- * close2Proc interface.
- */
-
-#define TCL_CLOSE2PROC	((Tcl_DriverCloseProc *)1)
-
-/*
- * Typedefs for the various operations in a channel type:
- */
-
-typedef int	(Tcl_DriverBlockModeProc) _ANSI_ARGS_((
-		    ClientData instanceData, int mode));
-typedef int	(Tcl_DriverCloseProc) _ANSI_ARGS_((ClientData instanceData,
-		    Tcl_Interp *interp));
-typedef int	(Tcl_DriverClose2Proc) _ANSI_ARGS_((ClientData instanceData,
-		    Tcl_Interp *interp, int flags));
-typedef int	(Tcl_DriverInputProc) _ANSI_ARGS_((ClientData instanceData,
-		    char *buf, int toRead, int *errorCodePtr));
-typedef int	(Tcl_DriverOutputProc) _ANSI_ARGS_((ClientData instanceData,
-		    char *buf, int toWrite, int *errorCodePtr));
-typedef int	(Tcl_DriverSeekProc) _ANSI_ARGS_((ClientData instanceData,
-		    long offset, int mode, int *errorCodePtr));
-typedef int	(Tcl_DriverSetOptionProc) _ANSI_ARGS_((
-		    ClientData instanceData, Tcl_Interp *interp,
-	            char *optionName, char *value));
-typedef int	(Tcl_DriverGetOptionProc) _ANSI_ARGS_((
-		    ClientData instanceData, Tcl_Interp *interp,
-		    char *optionName, Tcl_DString *dsPtr));
-typedef void	(Tcl_DriverWatchProc) _ANSI_ARGS_((
-		    ClientData instanceData, int mask));
-typedef int	(Tcl_DriverGetHandleProc) _ANSI_ARGS_((
-		    ClientData instanceData, int direction,
-		    ClientData *handlePtr));
-
-/*
- * The following declarations either map ckalloc and ckfree to
- * malloc and free, or they map them to procedures with all sorts
- * of debugging hooks defined in tclCkalloc.c.
- */
-
-#ifdef TCL_MEM_DEBUG
-
-#   define ckalloc(x) Tcl_DbCkalloc(x, __FILE__, __LINE__)
-#   define ckfree(x)  Tcl_DbCkfree(x, __FILE__, __LINE__)
-#   define ckrealloc(x,y) Tcl_DbCkrealloc((x), (y),__FILE__, __LINE__)
-
-#else /* !TCL_MEM_DEBUG */
-
-/*
- * If USE_TCLALLOC is true, then we need to call Tcl_Alloc instead of
- * the native malloc/free.  The only time USE_TCLALLOC should not be
- * true is when compiling the Tcl/Tk libraries on Unix systems.  In this
- * case we can safely call the native malloc/free directly as a performance
- * optimization.
- */
-
-#   if USE_TCLALLOC
-#	define ckalloc(x) Tcl_Alloc(x)
-#	define ckfree(x) Tcl_Free(x)
-#	define ckrealloc(x,y) Tcl_Realloc(x,y)
-#   else
-#	define ckalloc(x) malloc(x)
-#	define ckfree(x)  free(x)
-#	define ckrealloc(x,y) realloc(x,y)
-#   endif
-#   define Tcl_InitMemory(x)
-#   define Tcl_DumpActiveMemory(x)
-#   define Tcl_ValidateAllMemory(x,y)
-
-#endif /* !TCL_MEM_DEBUG */
-
-/*
- * Enum for different end of line translation and recognition modes.
- */
-
-typedef enum Tcl_EolTranslation {
-    TCL_TRANSLATE_AUTO,			/* Eol == \r, \n and \r\n. */
-    TCL_TRANSLATE_CR,			/* Eol == \r. */
-    TCL_TRANSLATE_LF,			/* Eol == \n. */
-    TCL_TRANSLATE_CRLF			/* Eol == \r\n. */
-} Tcl_EolTranslation;
-
-/*
- * struct Tcl_ChannelType:
- *
- * One such structure exists for each type (kind) of channel.
- * It collects together in one place all the functions that are
- * part of the specific channel type.
- */
-
-typedef struct Tcl_ChannelType {
-    char *typeName;			/* The name of the channel type in Tcl
-                                         * commands. This storage is owned by
-                                         * channel type. */
-    Tcl_DriverBlockModeProc *blockModeProc;
-    					/* Set blocking mode for the
-                                         * raw channel. May be NULL. */
-    Tcl_DriverCloseProc *closeProc;	/* Procedure to call to close the
-                                         * channel, or TCL_CLOSE2PROC if the
-                                         * close2Proc should be used
-                                         * instead. */
-    Tcl_DriverInputProc *inputProc;	/* Procedure to call for input
-                                         * on channel. */
-    Tcl_DriverOutputProc *outputProc;	/* Procedure to call for output
-                                         * on channel. */
-    Tcl_DriverSeekProc *seekProc;	/* Procedure to call to seek
-                                         * on the channel. May be NULL. */
-    Tcl_DriverSetOptionProc *setOptionProc;
-    					/* Set an option on a channel. */
-    Tcl_DriverGetOptionProc *getOptionProc;
-    					/* Get an option from a channel. */
-    Tcl_DriverWatchProc *watchProc;	/* Set up the notifier to watch
-                                         * for events on this channel. */
-    Tcl_DriverGetHandleProc *getHandleProc;
-					/* Get an OS handle from the channel
-                                         * or NULL if not supported. */
-    Tcl_DriverClose2Proc *close2Proc;   /* Procedure to call to close the
-					 * channel if the device supports
-					 * closing the read & write sides
-					 * independently. */
-} Tcl_ChannelType;
-
-/*
- * The following flags determine whether the blockModeProc above should
- * set the channel into blocking or nonblocking mode. They are passed
- * as arguments to the blockModeProc procedure in the above structure.
- */
-
-#define TCL_MODE_BLOCKING 0		/* Put channel into blocking mode. */
-#define TCL_MODE_NONBLOCKING 1		/* Put channel into nonblocking
-					 * mode. */
-
-/*
- * Enum for different types of file paths.
- */
-
-typedef enum Tcl_PathType {
-    TCL_PATH_ABSOLUTE,
-    TCL_PATH_RELATIVE,
-    TCL_PATH_VOLUME_RELATIVE
-} Tcl_PathType;
-
-/*
- * The following structure represents a user-defined encoding.  It collects
- * together all the functions that are used by the specific encoding.
- */
-
-typedef struct Tcl_EncodingType {
-    CONST char *encodingName;	/* The name of the encoding, e.g.  "euc-jp".
-				 * This name is the unique key for this
-				 * encoding type. */
-    Tcl_EncodingConvertProc *toUtfProc;
-				/* Procedure to convert from external
-				 * encoding into UTF-8. */
-    Tcl_EncodingConvertProc *fromUtfProc;
-				/* Procedure to convert from UTF-8 into
-				 * external encoding. */
-    Tcl_EncodingFreeProc *freeProc;
-				/* If non-NULL, procedure to call when this
-				 * encoding is deleted. */
-    ClientData clientData;	/* Arbitrary value associated with encoding
-				 * type.  Passed to conversion procedures. */
-    int nullSize;		/* Number of zero bytes that signify
-				 * end-of-string in this encoding.  This
-				 * number is used to determine the source
-				 * string length when the srcLen argument is
-				 * negative.  Must be 1 or 2. */
-} Tcl_EncodingType;    
-
-/*
- * The following definitions are used as values for the conversion control
- * flags argument when converting text from one character set to another:
- *
- * TCL_ENCODING_START:	     	Signifies that the source buffer is the first
- *				block in a (potentially multi-block) input
- *				stream.  Tells the conversion procedure to
- *				reset to an initial state and perform any
- *				initialization that needs to occur before the
- *				first byte is converted.  If the source
- *				buffer contains the entire input stream to be
- *				converted, this flag should be set.
- *
- * TCL_ENCODING_END:		Signifies that the source buffer is the last
- *				block in a (potentially multi-block) input
- *				stream.  Tells the conversion routine to
- *				perform any finalization that needs to occur
- *				after the last byte is converted and then to
- *				reset to an initial state.  If the source
- *				buffer contains the entire input stream to be
- *				converted, this flag should be set.
- *				
- * TCL_ENCODING_STOPONERROR:	If set, then the converter will return
- *				immediately upon encountering an invalid
- *				byte sequence or a source character that has
- *				no mapping in the target encoding.  If clear,
- *				then the converter will skip the problem,
- *				substituting one or more "close" characters
- *				in the destination buffer and then continue
- *				to sonvert the source.
- */
-
-#define TCL_ENCODING_START		0x01
-#define TCL_ENCODING_END		0x02
-#define TCL_ENCODING_STOPONERROR	0x04
-
-/*
- *----------------------------------------------------------------
- * The following data structures and declarations are for the new
- * Tcl parser.	This stuff should all move to tcl.h eventually.
- *----------------------------------------------------------------
- */
-
-/*
- * For each word of a command, and for each piece of a word such as a
- * variable reference, one of the following structures is created to
- * describe the token.
- */
-
-typedef struct Tcl_Token {
-    int type;			/* Type of token, such as TCL_TOKEN_WORD;
-				 * see below for valid types. */
-    char *start;		/* First character in token. */
-    int size;			/* Number of bytes in token. */
-    int numComponents;		/* If this token is composed of other
-				 * tokens, this field tells how many of
-				 * them there are (including components of
-				 * components, etc.).  The component tokens
-				 * immediately follow this one. */
-} Tcl_Token;
-
-/*
- * Type values defined for Tcl_Token structures.  These values are
- * defined as mask bits so that it's easy to check for collections of
- * types.
- *
- * TCL_TOKEN_WORD -		The token describes one word of a command,
- *				from the first non-blank character of
- *				the word (which may be " or {) up to but
- *				not including the space, semicolon, or
- *				bracket that terminates the word. 
- *				NumComponents counts the total number of
- *				sub-tokens that make up the word.  This
- *				includes, for example, sub-tokens of
- *				TCL_TOKEN_VARIABLE tokens.
- * TCL_TOKEN_SIMPLE_WORD -	This token is just like TCL_TOKEN_WORD
- *				except that the word is guaranteed to
- *				consist of a single TCL_TOKEN_TEXT
- *				sub-token.
- * TCL_TOKEN_TEXT -		The token describes a range of literal
- *				text that is part of a word. 
- *				NumComponents is always 0.
- * TCL_TOKEN_BS -		The token describes a backslash sequence
- *				that must be collapsed.	 NumComponents
- *				is always 0.
- * TCL_TOKEN_COMMAND -		The token describes a command whose result
- *				must be substituted into the word.  The
- *				token includes the enclosing brackets. 
- *				NumComponents is always 0.
- * TCL_TOKEN_VARIABLE -		The token describes a variable
- *				substitution, including the dollar sign,
- *				variable name, and array index (if there
- *				is one) up through the right
- *				parentheses.  NumComponents tells how
- *				many additional tokens follow to
- *				represent the variable name.  The first
- *				token will be a TCL_TOKEN_TEXT token
- *				that describes the variable name.  If
- *				the variable is an array reference then
- *				there will be one or more additional
- *				tokens, of type TCL_TOKEN_TEXT,
- *				TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
- *				TCL_TOKEN_VARIABLE, that describe the
- *				array index; numComponents counts the
- *				total number of nested tokens that make
- *				up the variable reference, including
- *				sub-tokens of TCL_TOKEN_VARIABLE tokens.
- * TCL_TOKEN_SUB_EXPR -		The token describes one subexpression of a
- *				expression, from the first non-blank
- *				character of the subexpression up to but not
- *				including the space, brace, or bracket
- *				that terminates the subexpression. 
- *				NumComponents counts the total number of
- *				following subtokens that make up the
- *				subexpression; this includes all subtokens
- *				for any nested TCL_TOKEN_SUB_EXPR tokens.
- *				For example, a numeric value used as a
- *				primitive operand is described by a
- *				TCL_TOKEN_SUB_EXPR token followed by a
- *				TCL_TOKEN_TEXT token. A binary subexpression
- *				is described by a TCL_TOKEN_SUB_EXPR token
- *				followed by the	TCL_TOKEN_OPERATOR token
- *				for the operator, then TCL_TOKEN_SUB_EXPR
- *				tokens for the left then the right operands.
- * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
- *				An operator might be the name of a math
- *				function such as "abs". A TCL_TOKEN_OPERATOR
- *				token is always preceeded by one
- *				TCL_TOKEN_SUB_EXPR token for the operator's
- *				subexpression, and is followed by zero or
- *				more TCL_TOKEN_SUB_EXPR tokens for the
- *				operator's operands. NumComponents is
- *				always 0.
- */
-
-#define TCL_TOKEN_WORD		1
-#define TCL_TOKEN_SIMPLE_WORD	2
-#define TCL_TOKEN_TEXT		4
-#define TCL_TOKEN_BS		8
-#define TCL_TOKEN_COMMAND	16
-#define TCL_TOKEN_VARIABLE	32
-#define TCL_TOKEN_SUB_EXPR	64
-#define TCL_TOKEN_OPERATOR	128
-
-/*
- * A structure of the following type is filled in by Tcl_ParseCommand.
- * It describes a single command parsed from an input string.
- */
-
-#define NUM_STATIC_TOKENS 20
-
-typedef struct Tcl_Parse {
-    char *commentStart;		/* Pointer to # that begins the first of
-				 * one or more comments preceding the
-				 * command. */
-    int commentSize;		/* Number of bytes in comments (up through
-				 * newline character that terminates the
-				 * last comment).  If there were no
-				 * comments, this field is 0. */
-    char *commandStart;		/* First character in first word of command. */
-    int commandSize;		/* Number of bytes in command, including
-				 * first character of first word, up
-				 * through the terminating newline,
-				 * close bracket, or semicolon. */
-    int numWords;		/* Total number of words in command.  May
-				 * be 0. */
-    Tcl_Token *tokenPtr;	/* Pointer to first token representing
-				 * the words of the command.  Initially
-				 * points to staticTokens, but may change
-				 * to point to malloc-ed space if command
-				 * exceeds space in staticTokens. */
-    int numTokens;		/* Total number of tokens in command. */
-    int tokensAvailable;	/* Total number of tokens available at
-				 * *tokenPtr. */
-
-    /*
-     * The fields below are intended only for the private use of the
-     * parser.	They should not be used by procedures that invoke
-     * Tcl_ParseCommand.
-     */
-
-    char *string;		/* The original command string passed to
-				 * Tcl_ParseCommand. */
-    char *end;			/* Points to the character just after the
-				 * last one in the command string. */
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting,
-				 * or NULL. */
-    char *term;			/* Points to character in string that
-				 * terminated most recent token.  Filled in
-				 * by ParseTokens.  If an error occurs,
-				 * points to beginning of region where the
-				 * error occurred (e.g. the open brace if
-				 * the close brace is missing). */
-    int incomplete;		/* This field is set to 1 by Tcl_ParseCommand
-				 * if the command appears to be incomplete.
-				 * This information is used by
-				 * Tcl_CommandComplete. */
-    Tcl_Token staticTokens[NUM_STATIC_TOKENS];
-				/* Initial space for tokens for command.
-				 * This space should be large enough to
-				 * accommodate most commands; dynamic
-				 * space is allocated for very large
-				 * commands that don't fit here. */
-} Tcl_Parse;
-
-/*
- * The following definitions are the error codes returned by the conversion
- * routines:
- *
- * TCL_OK:			All characters were converted.
- *
- * TCL_CONVERT_NOSPACE:		The output buffer would not have been large
- *				enough for all of the converted data; as many
- *				characters as could fit were converted though.
- *
- * TCL_CONVERT_MULTIBYTE:	The last few bytes in the source string were
- *				the beginning of a multibyte sequence, but
- *				more bytes were needed to complete this
- *				sequence.  A subsequent call to the conversion
- *				routine should pass the beginning of this
- *				unconverted sequence plus additional bytes
- *				from the source stream to properly convert
- *				the formerly split-up multibyte sequence.
- *
- * TCL_CONVERT_SYNTAX:		The source stream contained an invalid
- *				character sequence.  This may occur if the
- *				input stream has been damaged or if the input
- *				encoding method was misidentified.  This error
- *				is reported only if TCL_ENCODING_STOPONERROR
- *				was specified.
- * 
- * TCL_CONVERT_UNKNOWN:		The source string contained a character
- *				that could not be represented in the target
- *				encoding.  This error is reported only if
- *				TCL_ENCODING_STOPONERROR was specified.
- */
-
-#define TCL_CONVERT_MULTIBYTE		-1
-#define TCL_CONVERT_SYNTAX		-2
-#define TCL_CONVERT_UNKNOWN		-3
-#define TCL_CONVERT_NOSPACE		-4
-
-/*
- * The maximum number of bytes that are necessary to represent a single
- * Unicode character in UTF-8.
- */
-
-#define TCL_UTF_MAX		3
-
-/*
- * This represents a Unicode character.  
- */
-
-typedef unsigned short Tcl_UniChar;
-
-/*
- * Deprecated Tcl procedures:
- */
-
-#ifndef TCL_NO_DEPRECATED
-#define Tcl_EvalObj(interp,objPtr) Tcl_EvalObjEx((interp),(objPtr),0)
-#define Tcl_GlobalEvalObj(interp,objPtr) \
-	Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
-#endif
-
-/*
- * These function have been renamed. The old names are deprecated, but we
- * define these macros for backwards compatibilty.
- */
-
-#define Tcl_Ckalloc Tcl_Alloc
-#define Tcl_Ckfree Tcl_Free
-#define Tcl_Ckrealloc Tcl_Realloc
-#define Tcl_Return Tcl_SetResult
-#define Tcl_TildeSubst Tcl_TranslateFileName
-#define panic Tcl_Panic
-#define panicVA Tcl_PanicVA
-
-/*
- * The following constant is used to test for older versions of Tcl
- * in the stubs tables.
- *
- * Jan Nijtman's plus patch uses 0xFCA1BACF, so we need to pick a different
- * value since the stubs tables don't match.
- */
-
-#define TCL_STUB_MAGIC 0xFCA3BACF
-
-/*
- * The following function is required to be defined in all stubs aware
- * extensions.  The function is actually implemented in the stub
- * library, not the main Tcl library, although there is a trivial
- * implementation in the main library in case an extension is statically
- * linked into an application.
- */
-
-EXTERN char *		Tcl_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *version, int exact));
-
-#ifndef USE_TCL_STUBS
-
-/*
- * When not using stubs, make it a macro.
- */
-
-#define Tcl_InitStubs(interp, version, exact) \
-    Tcl_PkgRequire(interp, "Tcl", version, exact)
-
-#endif
-
-
-/*
- * Include the public function declarations that are accessible via
- * the stubs table.
- */
-
-#include "tclDecls.h"
-
-/*
- * Public functions that are not accessible via the stubs table.
- */
-
-EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv,
-	Tcl_AppInitProc *appInitProc));
-
-/*
- * Convenience declaration of Tcl_AppInit for backwards compatibility.
- * This function is not *implemented* by the tcl library, so the storage
- * class is neither DLLEXPORT nor DLLIMPORT
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS
-
-EXTERN int		Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp));
-
-#endif /* RESOURCE_INCLUDED */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _TCL */
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
deleted file mode 100644
index c44cf9f..0000000
--- a/generic/tclAlloc.c
+++ /dev/null
@@ -1,717 +0,0 @@
-/* 
- * tclAlloc.c --
- *
- *	This is a very fast storage allocator.  It allocates blocks of a
- *	small number of different sizes, and keeps free lists of each size.
- *	Blocks that don't exactly fit are passed up to the next larger size.
- *	Blocks over a certain size are directly allocated from the system.
- *
- * Copyright (c) 1983 Regents of the University of California.
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * Portions contributed by Chris Kingsley, Jack Jansen and Ray Johnson.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclAlloc.c,v 1.6 1999/04/16 00:46:42 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-#if USE_TCLALLOC
-
-#ifdef TCL_DEBUG
-#   define DEBUG
-/* #define MSTATS */
-#   define RCHECK
-#endif
-
-typedef unsigned long caddr_t;
-
-/*
- * The overhead on a block is at least 8 bytes.  When free, this space
- * contains a pointer to the next free block, and the bottom two bits must
- * be zero.  When in use, the first byte is set to MAGIC, and the second
- * byte is the size index.  The remaining bytes are for alignment.
- * If range checking is enabled then a second word holds the size of the
- * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC).
- * The order of elements is critical: ov_magic must overlay the low order
- * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern.
- */
-
-union overhead {
-    union overhead *ov_next;	/* when free */
-    unsigned char ov_padding[8]; /* Ensure the structure is 8-byte aligned. */
-    struct {
-	unsigned char	ovu_magic0;	/* magic number */
-	unsigned char	ovu_index;	/* bucket # */
-	unsigned char	ovu_unused;	/* unused */
-	unsigned char	ovu_magic1;	/* other magic number */
-#ifdef RCHECK
-	unsigned short	ovu_rmagic;	/* range magic number */
-	unsigned long	ovu_size;	/* actual block size */
-	unsigned short  ovu_unused2;    /* padding to 8-byte align */
-#endif
-    } ovu;
-#define ov_magic0	ovu.ovu_magic0
-#define ov_magic1	ovu.ovu_magic1
-#define ov_index	ovu.ovu_index
-#define ov_rmagic	ovu.ovu_rmagic
-#define ov_size		ovu.ovu_size
-};
-
-
-#define MAGIC		0xef		/* magic # on accounting info */
-#define RMAGIC		0x5555		/* magic # on range info */
-
-#ifdef RCHECK
-#define	RSLOP		sizeof (unsigned short)
-#else
-#define	RSLOP		0
-#endif
-
-#define OVERHEAD (sizeof(union overhead) + RSLOP)
-
-/*
- * nextf[i] is the pointer to the next free block of size 2^(i+3).  The
- * smallest allocatable block is 8 bytes.  The overhead information
- * precedes the data area returned to the user.
- */
-
-#define NBUCKETS	13
-#define MAXMALLOC	(1<<(NBUCKETS+2))
-static	union overhead *nextf[NBUCKETS];
-
-/* 
- * The following structure is used to keep track of all system memory 
- * currently owned by Tcl.  When finalizing, all this memory will
- * be returned to the system.
- */
-
-struct block {
-    struct block *nextPtr;	/* Linked list. */
-    struct block *prevPtr;	/* Linked list for big blocks, ensures 8-byte 
-				 * alignment for suballocated blocks. */
-};
-
-static struct block *blockList;		/* Tracks the suballocated blocks. */
-static struct block bigBlocks = {	/* Big blocks aren't suballocated. */
-    &bigBlocks, &bigBlocks
-};
-
-/*
- * The allocator is protected by a special mutex that must be
- * explicitly initialized.  Futhermore, because Tcl_Alloc may be
- * used before anything else in Tcl, we make this module self-initializing
- * after all with the allocInit variable.
- */
-
-#ifdef TCL_THREADS
-static TclpMutex allocMutex;
-#endif
-static int allocInit = 0;
-
-
-#ifdef MSTATS
-
-/*
- * nmalloc[i] is the difference between the number of mallocs and frees
- * for a given block size.
- */
-
-static	unsigned int nmalloc[NBUCKETS+1];
-#include <stdio.h>
-#endif
-
-#if defined(DEBUG) || defined(RCHECK)
-#define	ASSERT(p)   if (!(p)) panic(# p)
-#define RANGE_ASSERT(p) if (!(p)) panic(# p)
-#else
-#define	ASSERT(p)
-#define RANGE_ASSERT(p)
-#endif
-
-/*
- * Prototypes for functions used only in this file.
- */
-
-static void 		MoreCore _ANSI_ARGS_((int bucket));
-
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclInitAlloc --
- *
- *	Initialize the memory system.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Initialize the mutex used to serialize allocations.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclInitAlloc()
-{
-    if (!allocInit) {
-	allocInit = 1;
-	TclpMutexInit(&allocMutex);
-    }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclFinalizeAllocSubsystem --
- *
- *	Release all resources being used by this subsystem, including 
- *	aggressively freeing all memory allocated by TclpAlloc() that 
- *	has not yet been released with TclpFree().
- *	
- *	After this function is called, all memory allocated with 
- *	TclpAlloc() should be considered unusable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This subsystem is self-initializing, since memory can be 
- *	allocated before Tcl is formally initialized.  After this call,
- *	this subsystem has been reset to its initial state and is 
- *	usable again.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclFinalizeAllocSubsystem()
-{
-    int i;
-    struct block *blockPtr, *nextPtr;
-
-    TclpMutexLock(&allocMutex);
-    for (blockPtr = blockList; blockPtr != NULL; blockPtr = nextPtr) {
-	nextPtr = blockPtr->nextPtr;
-	TclpSysFree(blockPtr);
-    }
-    blockList = NULL;
-
-    for (blockPtr = bigBlocks.nextPtr; blockPtr != &bigBlocks; ) {
-	nextPtr = blockPtr->nextPtr;
-	TclpSysFree(blockPtr);
-	blockPtr = nextPtr;
-    }
-    bigBlocks.nextPtr = &bigBlocks;
-    bigBlocks.prevPtr = &bigBlocks;
-
-    for (i = 0; i < NBUCKETS; i++) {
-	nextf[i] = NULL;
-#ifdef MSTATS
-	nmalloc[i] = 0;
-#endif
-    }
-#ifdef MSTATS
-    nmalloc[i] = 0;
-#endif
-    TclpMutexUnlock(&allocMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpAlloc --
- *
- *	Allocate more memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpAlloc(nbytes)
-    unsigned int nbytes;	/* Number of bytes to allocate. */
-{
-    register union overhead *op;
-    register long bucket;
-    register unsigned amt;
-    struct block *bigBlockPtr;
-
-    if (!allocInit) {
-	/*
-	 * We have to make the "self initializing" because Tcl_Alloc
-	 * may be used before any other part of Tcl.  E.g., see
-	 * main() for tclsh!
-	 */
-
-	allocInit = 1;
-	TclpMutexInit(&allocMutex);
-    }
-    TclpMutexLock(&allocMutex);
-    /*
-     * First the simple case: we simple allocate big blocks directly
-     */
-    if (nbytes + OVERHEAD >= MAXMALLOC) {
-	bigBlockPtr = (struct block *) TclpSysAlloc((unsigned) 
-		(sizeof(struct block) + OVERHEAD + nbytes), 0);
-	if (bigBlockPtr == NULL) {
-	    TclpMutexUnlock(&allocMutex);
-	    return NULL;
-	}
-	bigBlockPtr->nextPtr = bigBlocks.nextPtr;
-	bigBlocks.nextPtr = bigBlockPtr;
-	bigBlockPtr->prevPtr = &bigBlocks;
-	bigBlockPtr->nextPtr->prevPtr = bigBlockPtr;
-
-	op = (union overhead *) (bigBlockPtr + 1);
-	op->ov_magic0 = op->ov_magic1 = MAGIC;
-	op->ov_index = 0xff;
-#ifdef MSTATS
-	nmalloc[NBUCKETS]++;
-#endif
-#ifdef RCHECK
-	/*
-	 * Record allocated size of block and
-	 * bound space with magic numbers.
-	 */
-	op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-	op->ov_rmagic = RMAGIC;
-	*(unsigned short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-	TclpMutexUnlock(&allocMutex);
-	return (void *)(op+1);
-    }
-    /*
-     * Convert amount of memory requested into closest block size
-     * stored in hash buckets which satisfies request.
-     * Account for space used per block for accounting.
-     */
-#ifndef RCHECK
-    amt = 8;	/* size of first bucket */
-    bucket = 0;
-#else
-    amt = 16;	/* size of first bucket */
-    bucket = 1;
-#endif
-    while (nbytes + OVERHEAD > amt) {
-	amt <<= 1;
-	if (amt == 0) {
-	    TclpMutexUnlock(&allocMutex);
-	    return (NULL);
-	}
-	bucket++;
-    }
-    ASSERT( bucket < NBUCKETS );
-
-    /*
-     * If nothing in hash bucket right now,
-     * request more memory from the system.
-     */
-    if ((op = nextf[bucket]) == NULL) {
-	MoreCore(bucket);
-	if ((op = nextf[bucket]) == NULL) {
-	    TclpMutexUnlock(&allocMutex);
-	    return (NULL);
-	}
-    }
-    /*
-     * Remove from linked list
-     */
-    nextf[bucket] = op->ov_next;
-    op->ov_magic0 = op->ov_magic1 = MAGIC;
-    op->ov_index = (unsigned char) bucket;
-#ifdef MSTATS
-    nmalloc[bucket]++;
-#endif
-#ifdef RCHECK
-    /*
-     * Record allocated size of block and
-     * bound space with magic numbers.
-     */
-    op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-    op->ov_rmagic = RMAGIC;
-    *(unsigned short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-    TclpMutexUnlock(&allocMutex);
-    return ((char *)(op + 1));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MoreCore --
- *
- *	Allocate more memory to the indicated bucket.
- *
- *	Assumes Mutex is already held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Attempts to get more memory from the system.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-MoreCore(bucket)
-    int bucket;		/* What bucket to allocat to. */
-{
-    register union overhead *op;
-    register long sz;		/* size of desired block */
-    long amt;			/* amount to allocate */
-    int nblks;			/* how many blocks we get */
-    struct block *blockPtr;
-
-    /*
-     * sbrk_size <= 0 only for big, FLUFFY, requests (about
-     * 2^30 bytes on a VAX, I think) or for a negative arg.
-     */
-    sz = 1 << (bucket + 3);
-    ASSERT(sz > 0);
-
-    amt = MAXMALLOC;
-    nblks = amt / sz;
-    ASSERT(nblks*sz == amt);
-
-    blockPtr = (struct block *) TclpSysAlloc((unsigned) 
-	    (sizeof(struct block) + amt), 1);
-    /* no more room! */
-    if (blockPtr == NULL) {
-	return;
-    }
-    blockPtr->nextPtr = blockList;
-    blockList = blockPtr;
-
-    op = (union overhead *) (blockPtr + 1);
-    
-    /*
-     * Add new memory allocated to that on
-     * free list for this hash bucket.
-     */
-    nextf[bucket] = op;
-    while (--nblks > 0) {
-	op->ov_next = (union overhead *)((caddr_t)op + sz);
-	op = (union overhead *)((caddr_t)op + sz);
-    }
-    op->ov_next = (union overhead *)NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFree --
- *
- *	Free memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFree(cp)
-    char *cp;		/* Pointer to memory to free. */
-{   
-    register long size;
-    register union overhead *op;
-    struct block *bigBlockPtr;
-
-    if (cp == NULL) {
-	return;
-    }
-
-    TclpMutexLock(&allocMutex);
-    op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
-
-    ASSERT(op->ov_magic0 == MAGIC);		/* make sure it was in use */
-    ASSERT(op->ov_magic1 == MAGIC);
-    if (op->ov_magic0 != MAGIC || op->ov_magic1 != MAGIC) {
-	TclpMutexUnlock(&allocMutex);
-	return;
-    }
-
-    RANGE_ASSERT(op->ov_rmagic == RMAGIC);
-    RANGE_ASSERT(*(unsigned short *)((caddr_t)(op + 1) + op->ov_size) == RMAGIC);
-    size = op->ov_index;
-    if ( size == 0xff ) {
-#ifdef MSTATS
-	nmalloc[NBUCKETS]--;
-#endif
-	bigBlockPtr = (struct block *) op - 1;
-	bigBlockPtr->prevPtr->nextPtr = bigBlockPtr->nextPtr;
-	bigBlockPtr->nextPtr->prevPtr = bigBlockPtr->prevPtr;
-	TclpSysFree(bigBlockPtr);
-	TclpMutexUnlock(&allocMutex);
-	return;
-    }
-    ASSERT(size < NBUCKETS);
-    op->ov_next = nextf[size];	/* also clobbers ov_magic */
-    nextf[size] = op;
-#ifdef MSTATS
-    nmalloc[size]--;
-#endif
-    TclpMutexUnlock(&allocMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpRealloc --
- *
- *	Reallocate memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpRealloc(cp, nbytes)
-    char *cp;			/* Pointer to alloced block. */
-    unsigned int nbytes;	/* New size of memory. */
-{   
-    int i;
-    union overhead *op;
-    struct block *bigBlockPtr;
-    int expensive;
-    unsigned long maxsize;
-
-    if (cp == NULL) {
-	return (TclpAlloc(nbytes));
-    }
-
-    TclpMutexLock(&allocMutex);
-
-    op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
-
-    ASSERT(op->ov_magic0 == MAGIC);		/* make sure it was in use */
-    ASSERT(op->ov_magic1 == MAGIC);
-    if (op->ov_magic0 != MAGIC || op->ov_magic1 != MAGIC) {
-	TclpMutexUnlock(&allocMutex);
-	return NULL;
-    }
-
-    RANGE_ASSERT(op->ov_rmagic == RMAGIC);
-    RANGE_ASSERT(*(unsigned short *)((caddr_t)(op + 1) + op->ov_size) == RMAGIC);
-    i = op->ov_index;
-
-    /*
-     * If the block isn't in a bin, just realloc it.
-     */
-
-    if (i == 0xff) {
-	struct block *prevPtr, *nextPtr;
-	bigBlockPtr = (struct block *) op - 1;
-	prevPtr = bigBlockPtr->prevPtr;
-	nextPtr = bigBlockPtr->nextPtr;
-	bigBlockPtr = (struct block *) TclpSysRealloc(bigBlockPtr, 
-		sizeof(struct block) + OVERHEAD + nbytes);
-	if (bigBlockPtr == NULL) {
-	    TclpMutexUnlock(&allocMutex);
-	    return NULL;
-	}
-
-	if (prevPtr->nextPtr != bigBlockPtr) {
-	    /*
-	     * If the block has moved, splice the new block into the list where
-	     * the old block used to be. 
-	     */
-
-	    prevPtr->nextPtr = bigBlockPtr;
-	    nextPtr->prevPtr = bigBlockPtr;
-	}
-
-	op = (union overhead *) (bigBlockPtr + 1);
-#ifdef MSTATS
-	nmalloc[NBUCKETS]++;
-#endif
-#ifdef RCHECK
-	/*
-	 * Record allocated size of block and update magic number bounds.
-	 */
-
-	op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-	*(unsigned short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-	TclpMutexUnlock(&allocMutex);
-	return (char *)(op+1);
-    }
-    maxsize = 1 << (i+3);
-    expensive = 0;
-    if ( nbytes + OVERHEAD > maxsize ) {
-	expensive = 1;
-    } else if ( i > 0 && nbytes + OVERHEAD < (maxsize/2) ) {
-	expensive = 1;
-    }
-
-    if (expensive) {
-	void *newp;
-
-	TclpMutexUnlock(&allocMutex);
-
-	newp = TclpAlloc(nbytes);
-	if ( newp == NULL ) {
-	    return NULL;
-	}
-	maxsize -= OVERHEAD;
-	if ( maxsize < nbytes )
-	    nbytes = maxsize;
-	memcpy((VOID *) newp, (VOID *) cp, (size_t) nbytes);
-	TclpFree(cp);
-	return newp;
-    }
-    
-    /*
-     * Ok, we don't have to copy, it fits as-is
-     */
-#ifdef RCHECK
-    op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-    *(unsigned short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-    TclpMutexUnlock(&allocMutex);
-    return(cp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * mstats --
- *
- *	Prints two lines of numbers, one showing the length of the 
- *	free list for each size category, the second showing the 
- *	number of mallocs - frees for each size category.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef MSTATS
-void
-mstats(s)
-    char *s;	/* Where to write info. */
-{
-    register int i, j;
-    register union overhead *p;
-    int totfree = 0,
-	totused = 0;
-
-    TclpMutexLock(&allocMutex);
-    fprintf(stderr, "Memory allocation statistics %s\nTclpFree:\t", s);
-    for (i = 0; i < NBUCKETS; i++) {
-	for (j = 0, p = nextf[i]; p; p = p->ov_next, j++)
-	    fprintf(stderr, " %d", j);
-	totfree += j * (1 << (i + 3));
-    }
-    fprintf(stderr, "\nused:\t");
-    for (i = 0; i < NBUCKETS; i++) {
-	fprintf(stderr, " %d", nmalloc[i]);
-	totused += nmalloc[i] * (1 << (i + 3));
-    }
-    fprintf(stderr, "\n\tTotal small in use: %d, total free: %d\n",
-	    totused, totfree);
-    fprintf(stderr, "\n\tNumber of big (>%d) blocks in use: %d\n", 
-	    MAXMALLOC, nmalloc[NBUCKETS]);
-    TclpMutexUnlock(&allocMutex);
-}
-#endif
-
-#else  /* !USE_TCLALLOC */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpAlloc --
- *
- *	Allocate more memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpAlloc(nbytes)
-    unsigned int nbytes;	/* Number of bytes to allocate. */
-{
-    return (char*) malloc(nbytes);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFree --
- *
- *	Free memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFree(cp)
-    char *cp;		/* Pointer to memory to free. */
-{   
-    free(cp);
-    return;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpRealloc --
- *
- *	Reallocate memory.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpRealloc(cp, nbytes)
-    char *cp;			/* Pointer to alloced block. */
-    unsigned int nbytes;	/* New size of memory. */
-{   
-    return (char*) realloc(cp, nbytes);
-}
-
-#endif /* !USE_TCLALLOC */
diff --git a/generic/tclAsync.c b/generic/tclAsync.c
deleted file mode 100644
index fc80385..0000000
--- a/generic/tclAsync.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* 
- * tclAsync.c --
- *
- *	This file provides low-level support needed to invoke signal
- *	handlers in a safe way.  The code here doesn't actually handle
- *	signals, though.  This code is based on proposals made by
- *	Mark Diekhans and Don Libes.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclAsync.c,v 1.4 1999/04/16 00:46:42 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * One of the following structures exists for each asynchronous
- * handler:
- */
-
-typedef struct AsyncHandler {
-    int ready;				/* Non-zero means this handler should
-					 * be invoked in the next call to
-					 * Tcl_AsyncInvoke. */
-    struct AsyncHandler *nextPtr;	/* Next in list of all handlers for
-					 * the process. */
-    Tcl_AsyncProc *proc;		/* Procedure to call when handler
-					 * is invoked. */
-    ClientData clientData;		/* Value to pass to handler when it
-					 * is invoked. */
-} AsyncHandler;
-
-/*
- * The variables below maintain a list of all existing handlers.
- */
-
-static AsyncHandler *firstHandler;	/* First handler defined for process,
-					 * or NULL if none. */
-static AsyncHandler *lastHandler;	/* Last handler or NULL. */
-
-TCL_DECLARE_MUTEX(asyncMutex)           /* Process-wide async handler lock */
-
-/*
- * The variable below is set to 1 whenever a handler becomes ready and
- * it is cleared to zero whenever Tcl_AsyncInvoke is called.  It can be
- * checked elsewhere in the application by calling Tcl_AsyncReady to see
- * if Tcl_AsyncInvoke should be invoked.
- */
-
-static int asyncReady = 0;
-
-/*
- * The variable below indicates whether Tcl_AsyncInvoke is currently
- * working.  If so then we won't set asyncReady again until
- * Tcl_AsyncInvoke returns.
- */
-
-static int asyncActive = 0;
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AsyncCreate --
- *
- *	This procedure creates the data structures for an asynchronous
- *	handler, so that no memory has to be allocated when the handler
- *	is activated.
- *
- * Results:
- *	The return value is a token for the handler, which can be used
- *	to activate it later on.
- *
- * Side effects:
- *	Information about the handler is recorded.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_AsyncHandler
-Tcl_AsyncCreate(proc, clientData)
-    Tcl_AsyncProc *proc;		/* Procedure to call when handler
-					 * is invoked. */
-    ClientData clientData;		/* Argument to pass to handler. */
-{
-    AsyncHandler *asyncPtr;
-
-    asyncPtr = (AsyncHandler *) ckalloc(sizeof(AsyncHandler));
-    asyncPtr->ready = 0;
-    asyncPtr->nextPtr = NULL;
-    asyncPtr->proc = proc;
-    asyncPtr->clientData = clientData;
-    Tcl_MutexLock(&asyncMutex);
-    if (firstHandler == NULL) {
-	firstHandler = asyncPtr;
-    } else {
-	lastHandler->nextPtr = asyncPtr;
-    }
-    lastHandler = asyncPtr;
-    Tcl_MutexUnlock(&asyncMutex);
-    return (Tcl_AsyncHandler) asyncPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AsyncMark --
- *
- *	This procedure is called to request that an asynchronous handler
- *	be invoked as soon as possible.  It's typically called from
- *	an interrupt handler, where it isn't safe to do anything that
- *	depends on or modifies application state.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The handler gets marked for invocation later.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AsyncMark(async)
-    Tcl_AsyncHandler async;		/* Token for handler. */
-{
-    Tcl_MutexLock(&asyncMutex);
-    ((AsyncHandler *) async)->ready = 1;
-    if (!asyncActive) {
-	asyncReady = 1;
-	TclpAsyncMark(async);
-    }
-    Tcl_MutexUnlock(&asyncMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AsyncInvoke --
- *
- *	This procedure is called at a "safe" time at background level
- *	to invoke any active asynchronous handlers.
- *
- * Results:
- *	The return value is a normal Tcl result, which is intended to
- *	replace the code argument as the current completion code for
- *	interp.
- *
- * Side effects:
- *	Depends on the handlers that are active.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AsyncInvoke(interp, code)
-    Tcl_Interp *interp;			/* If invoked from Tcl_Eval just after
-					 * completing a command, points to
-					 * interpreter.  Otherwise it is
-					 * NULL. */
-    int code; 				/* If interp is non-NULL, this gives
-					 * completion code from command that
-					 * just completed. */
-{
-    AsyncHandler *asyncPtr;
-    Tcl_MutexLock(&asyncMutex);
-
-    if (asyncReady == 0) {
-	Tcl_MutexUnlock(&asyncMutex);
-	return code;
-    }
-    asyncReady = 0;
-    asyncActive = 1;
-    if (interp == NULL) {
-	code = 0;
-    }
-
-    /*
-     * Make one or more passes over the list of handlers, invoking
-     * at most one handler in each pass.  After invoking a handler,
-     * go back to the start of the list again so that (a) if a new
-     * higher-priority handler gets marked while executing a lower
-     * priority handler, we execute the higher-priority handler
-     * next, and (b) if a handler gets deleted during the execution
-     * of a handler, then the list structure may change so it isn't
-     * safe to continue down the list anyway.
-     */
-
-    while (1) {
-	for (asyncPtr = firstHandler; asyncPtr != NULL;
-		asyncPtr = asyncPtr->nextPtr) {
-	    if (asyncPtr->ready) {
-		break;
-	    }
-	}
-	if (asyncPtr == NULL) {
-	    break;
-	}
-	asyncPtr->ready = 0;
-	Tcl_MutexUnlock(&asyncMutex);
-	code = (*asyncPtr->proc)(asyncPtr->clientData, interp, code);
-	Tcl_MutexLock(&asyncMutex);
-    }
-    asyncActive = 0;
-    Tcl_MutexUnlock(&asyncMutex);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AsyncDelete --
- *
- *	Frees up all the state for an asynchronous handler.  The handler
- *	should never be used again.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The state associated with the handler is deleted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AsyncDelete(async)
-    Tcl_AsyncHandler async;		/* Token for handler to delete. */
-{
-    AsyncHandler *asyncPtr = (AsyncHandler *) async;
-    AsyncHandler *prevPtr;
-
-    Tcl_MutexLock(&asyncMutex);
-    if (firstHandler == asyncPtr) {
-	firstHandler = asyncPtr->nextPtr;
-	if (firstHandler == NULL) {
-	    lastHandler = NULL;
-	}
-    } else {
-	prevPtr = firstHandler;
-	while (prevPtr->nextPtr != asyncPtr) {
-	    prevPtr = prevPtr->nextPtr;
-	}
-	prevPtr->nextPtr = asyncPtr->nextPtr;
-	if (lastHandler == asyncPtr) {
-	    lastHandler = prevPtr;
-	}
-    }
-    Tcl_MutexUnlock(&asyncMutex);
-    ckfree((char *) asyncPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AsyncReady --
- *
- *	This procedure can be used to tell whether Tcl_AsyncInvoke
- *	needs to be called.  This procedure is the external interface
- *	for checking the internal asyncReady variable.
- *
- * Results:
- * 	The return value is 1 whenever a handler is ready and is 0
- *	when no handlers are ready.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AsyncReady()
-{
-    return asyncReady;
-}
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
deleted file mode 100644
index e673a3c..0000000
--- a/generic/tclBasic.c
+++ /dev/null
@@ -1,4220 +0,0 @@
-/* 
- * tclBasic.c --
- *
- *	Contains the basic facilities for TCL command interpretation,
- *	including interpreter creation and deletion, command creation
- *	and deletion, and command parsing and execution.
- *
- * Copyright (c) 1987-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclBasic.c,v 1.19 1999/04/16 00:46:42 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-#ifndef TCL_GENERIC_ONLY
-#   include "tclPort.h"
-#endif
-
-/*
- * Static procedures in this file:
- */
-
-static void		DeleteInterpProc _ANSI_ARGS_((Tcl_Interp *interp));
-static void		ProcessUnexpectedResult _ANSI_ARGS_((
-			    Tcl_Interp *interp, int returnCode));
-static void		RecordTracebackInfo _ANSI_ARGS_((
-			    Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    int numSrcBytes));
-
-extern TclStubs tclStubs;
-
-/*
- * The following structure defines the commands in the Tcl core.
- */
-
-typedef struct {
-    char *name;			/* Name of object-based command. */
-    Tcl_CmdProc *proc;		/* String-based procedure for command. */
-    Tcl_ObjCmdProc *objProc;	/* Object-based procedure for command. */
-    CompileProc *compileProc;	/* Procedure called to compile command. */
-    int isSafe;			/* If non-zero, command will be present
-                                 * in safe interpreter. Otherwise it will
-                                 * be hidden. */
-} CmdInfo;
-
-/*
- * The built-in commands, and the procedures that implement them:
- */
-
-static CmdInfo builtInCmds[] = {
-    /*
-     * Commands in the generic core. Note that at least one of the proc or
-     * objProc members should be non-NULL. This avoids infinitely recursive
-     * calls between TclInvokeObjectCommand and TclInvokeStringCommand if a
-     * command name is computed at runtime and results in the name of a
-     * compiled command.
-     */
-
-    {"append",		(Tcl_CmdProc *) NULL,	Tcl_AppendObjCmd,
-        (CompileProc *) NULL,		1},
-    {"array",		(Tcl_CmdProc *) NULL,	Tcl_ArrayObjCmd,
-        (CompileProc *) NULL,		1},
-    {"binary",		(Tcl_CmdProc *) NULL,	Tcl_BinaryObjCmd,
-        (CompileProc *) NULL,		1},
-    {"break",		(Tcl_CmdProc *) NULL,	Tcl_BreakObjCmd,
-        TclCompileBreakCmd,		1},
-    {"case",		(Tcl_CmdProc *) NULL,	Tcl_CaseObjCmd,
-        (CompileProc *) NULL,		1},
-    {"catch",		(Tcl_CmdProc *) NULL,	Tcl_CatchObjCmd,	
-        TclCompileCatchCmd,		1},
-    {"clock",		(Tcl_CmdProc *) NULL,	Tcl_ClockObjCmd,
-        (CompileProc *) NULL,		1},
-    {"concat",		(Tcl_CmdProc *) NULL,	Tcl_ConcatObjCmd,
-        (CompileProc *) NULL,		1},
-    {"continue",	(Tcl_CmdProc *) NULL,	Tcl_ContinueObjCmd,
-        TclCompileContinueCmd,		1},
-    {"encoding",	(Tcl_CmdProc *) NULL,	Tcl_EncodingObjCmd,
-        (CompileProc *) NULL,		0},
-    {"error",		(Tcl_CmdProc *) NULL,	Tcl_ErrorObjCmd,
-        (CompileProc *) NULL,		1},
-    {"eval",		(Tcl_CmdProc *) NULL,	Tcl_EvalObjCmd,
-        (CompileProc *) NULL,		1},
-    {"exit",		(Tcl_CmdProc *) NULL,	Tcl_ExitObjCmd,
-        (CompileProc *) NULL,		0},
-    {"expr",		(Tcl_CmdProc *) NULL,	Tcl_ExprObjCmd,
-        TclCompileExprCmd,		1},
-    {"fcopy",		(Tcl_CmdProc *) NULL,	Tcl_FcopyObjCmd,
-        (CompileProc *) NULL,		1},
-    {"fileevent",	(Tcl_CmdProc *) NULL,	Tcl_FileEventObjCmd,
-        (CompileProc *) NULL,		1},
-    {"for",		(Tcl_CmdProc *) NULL,	Tcl_ForObjCmd,
-        TclCompileForCmd,		1},
-    {"foreach",		(Tcl_CmdProc *) NULL,	Tcl_ForeachObjCmd,
-        TclCompileForeachCmd,		1},
-    {"format",		(Tcl_CmdProc *) NULL,	Tcl_FormatObjCmd,
-        (CompileProc *) NULL,		1},
-    {"global",		(Tcl_CmdProc *) NULL,	Tcl_GlobalObjCmd,
-        (CompileProc *) NULL,		1},
-    {"if",		(Tcl_CmdProc *) NULL,	Tcl_IfObjCmd,
-        TclCompileIfCmd,		1},
-    {"incr",		(Tcl_CmdProc *) NULL,	Tcl_IncrObjCmd,
-        TclCompileIncrCmd,		1},
-    {"info",		(Tcl_CmdProc *) NULL,	Tcl_InfoObjCmd,
-        (CompileProc *) NULL,		1},
-    {"join",		(Tcl_CmdProc *) NULL,	Tcl_JoinObjCmd,
-        (CompileProc *) NULL,		1},
-    {"lappend",		(Tcl_CmdProc *) NULL,	Tcl_LappendObjCmd,
-        (CompileProc *) NULL,		1},
-    {"lindex",		(Tcl_CmdProc *) NULL,	Tcl_LindexObjCmd,
-        (CompileProc *) NULL,		1},
-    {"linsert",		(Tcl_CmdProc *) NULL,	Tcl_LinsertObjCmd,
-        (CompileProc *) NULL,		1},
-    {"list",		(Tcl_CmdProc *) NULL,	Tcl_ListObjCmd,
-        (CompileProc *) NULL,		1},
-    {"llength",		(Tcl_CmdProc *) NULL,	Tcl_LlengthObjCmd,
-        (CompileProc *) NULL,		1},
-    {"load",		(Tcl_CmdProc *) NULL,	Tcl_LoadObjCmd,
-        (CompileProc *) NULL,		0},
-    {"lrange",		(Tcl_CmdProc *) NULL,	Tcl_LrangeObjCmd,
-        (CompileProc *) NULL,		1},
-    {"lreplace",	(Tcl_CmdProc *) NULL,	Tcl_LreplaceObjCmd,
-        (CompileProc *) NULL,		1},
-    {"lsearch",		(Tcl_CmdProc *) NULL,	Tcl_LsearchObjCmd,
-        (CompileProc *) NULL,		1},
-    {"lsort",		(Tcl_CmdProc *) NULL,	Tcl_LsortObjCmd,
-        (CompileProc *) NULL,		1},
-    {"namespace",	(Tcl_CmdProc *) NULL,	Tcl_NamespaceObjCmd,
-        (CompileProc *) NULL,		1},
-    {"package",		(Tcl_CmdProc *) NULL,	Tcl_PackageObjCmd,
-        (CompileProc *) NULL,		1},
-    {"proc",		(Tcl_CmdProc *) NULL,	Tcl_ProcObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"regexp",		(Tcl_CmdProc *) NULL,	Tcl_RegexpObjCmd,
-        (CompileProc *) NULL,		1},
-    {"regsub",		(Tcl_CmdProc *) NULL,	Tcl_RegsubObjCmd,
-        (CompileProc *) NULL,		1},
-    {"rename",		(Tcl_CmdProc *) NULL,	Tcl_RenameObjCmd,
-        (CompileProc *) NULL,		1},
-    {"return",		(Tcl_CmdProc *) NULL,	Tcl_ReturnObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"scan",		(Tcl_CmdProc *) NULL,	Tcl_ScanObjCmd,
-        (CompileProc *) NULL,		1},
-    {"set",		(Tcl_CmdProc *) NULL,	Tcl_SetObjCmd,
-        TclCompileSetCmd,		1},
-    {"split",		(Tcl_CmdProc *) NULL,	Tcl_SplitObjCmd,
-        (CompileProc *) NULL,		1},
-    {"string",		(Tcl_CmdProc *) NULL,	Tcl_StringObjCmd,
-        (CompileProc *) NULL,		1},
-    {"subst",		(Tcl_CmdProc *) NULL,	Tcl_SubstObjCmd,
-        (CompileProc *) NULL,		1},
-    {"switch",		(Tcl_CmdProc *) NULL,	Tcl_SwitchObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"trace",		(Tcl_CmdProc *) NULL,	Tcl_TraceObjCmd,
-        (CompileProc *) NULL,		1},
-    {"unset",		(Tcl_CmdProc *) NULL,	Tcl_UnsetObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"uplevel",		(Tcl_CmdProc *) NULL,	Tcl_UplevelObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"upvar",		(Tcl_CmdProc *) NULL,	Tcl_UpvarObjCmd,	
-        (CompileProc *) NULL,		1},
-    {"variable",	(Tcl_CmdProc *) NULL,	Tcl_VariableObjCmd,
-        (CompileProc *) NULL,		1},
-    {"while",		(Tcl_CmdProc *) NULL,	Tcl_WhileObjCmd,
-        TclCompileWhileCmd,		1},
-
-    /*
-     * Commands in the UNIX core:
-     */
-
-#ifndef TCL_GENERIC_ONLY
-    {"after",		(Tcl_CmdProc *) NULL,	Tcl_AfterObjCmd,
-        (CompileProc *) NULL,		1},
-    {"cd",		(Tcl_CmdProc *) NULL,	Tcl_CdObjCmd,
-        (CompileProc *) NULL,		0},
-    {"close",		(Tcl_CmdProc *) NULL,	Tcl_CloseObjCmd,
-        (CompileProc *) NULL,		1},
-    {"eof",		(Tcl_CmdProc *) NULL,	Tcl_EofObjCmd,
-        (CompileProc *) NULL,		1},
-    {"fblocked",	(Tcl_CmdProc *) NULL,	Tcl_FblockedObjCmd,
-        (CompileProc *) NULL,		1},
-    {"fconfigure",	(Tcl_CmdProc *) NULL,	Tcl_FconfigureObjCmd,
-        (CompileProc *) NULL,		0},
-    {"file",		(Tcl_CmdProc *) NULL,	Tcl_FileObjCmd,
-        (CompileProc *) NULL,		0},
-    {"flush",		(Tcl_CmdProc *) NULL,	Tcl_FlushObjCmd,
-        (CompileProc *) NULL,		1},
-    {"gets",		(Tcl_CmdProc *) NULL,	Tcl_GetsObjCmd,
-        (CompileProc *) NULL,		1},
-    {"glob",		(Tcl_CmdProc *) NULL,	Tcl_GlobObjCmd,
-        (CompileProc *) NULL,		0},
-    {"open",		(Tcl_CmdProc *) NULL,	Tcl_OpenObjCmd,
-        (CompileProc *) NULL,		0},
-    {"pid",		(Tcl_CmdProc *) NULL,	Tcl_PidObjCmd,
-        (CompileProc *) NULL,		1},
-    {"puts",		(Tcl_CmdProc *) NULL,	Tcl_PutsObjCmd,
-        (CompileProc *) NULL,		1},
-    {"pwd",		(Tcl_CmdProc *) NULL,	Tcl_PwdObjCmd,
-        (CompileProc *) NULL,		0},
-    {"read",		(Tcl_CmdProc *) NULL,	Tcl_ReadObjCmd,
-        (CompileProc *) NULL,		1},
-    {"seek",		(Tcl_CmdProc *) NULL,	Tcl_SeekObjCmd,
-        (CompileProc *) NULL,		1},
-    {"socket",		(Tcl_CmdProc *) NULL,	Tcl_SocketObjCmd,
-        (CompileProc *) NULL,		0},
-    {"tell",		(Tcl_CmdProc *) NULL,	Tcl_TellObjCmd,
-        (CompileProc *) NULL,		1},
-    {"time",		(Tcl_CmdProc *) NULL,	Tcl_TimeObjCmd,
-        (CompileProc *) NULL,		1},
-    {"update",		(Tcl_CmdProc *) NULL,	Tcl_UpdateObjCmd,
-        (CompileProc *) NULL,		1},
-    {"vwait",		(Tcl_CmdProc *) NULL,	Tcl_VwaitObjCmd,
-        (CompileProc *) NULL,		1},
-    
-#ifdef MAC_TCL
-    {"beep",		(Tcl_CmdProc *) NULL,	Tcl_BeepObjCmd,
-        (CompileProc *) NULL,		0},
-    {"echo",		Tcl_EchoCmd,		(Tcl_ObjCmdProc *) NULL,
-        (CompileProc *) NULL,		0},
-    {"ls",		(Tcl_CmdProc *) NULL, 	Tcl_LsObjCmd,
-        (CompileProc *) NULL,		0},
-    {"resource",	(Tcl_CmdProc *) NULL,	Tcl_ResourceObjCmd,
-        (CompileProc *) NULL,		1},
-    {"source",		(Tcl_CmdProc *) NULL,	Tcl_MacSourceObjCmd,
-        (CompileProc *) NULL,		0},
-#else
-    {"exec",		(Tcl_CmdProc *) NULL,	Tcl_ExecObjCmd,
-        (CompileProc *) NULL,		0},
-    {"source",		(Tcl_CmdProc *) NULL,	Tcl_SourceObjCmd,
-        (CompileProc *) NULL,		0},
-#endif /* MAC_TCL */
-    
-#endif /* TCL_GENERIC_ONLY */
-    {NULL,		(Tcl_CmdProc *) NULL,	(Tcl_ObjCmdProc *) NULL,
-        (CompileProc *) NULL,		0}
-};
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateInterp --
- *
- *	Create a new TCL command interpreter.
- *
- * Results:
- *	The return value is a token for the interpreter, which may be
- *	used in calls to procedures like Tcl_CreateCmd, Tcl_Eval, or
- *	Tcl_DeleteInterp.
- *
- * Side effects:
- *	The command interpreter is initialized with an empty variable
- *	table and the built-in commands.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Interp *
-Tcl_CreateInterp()
-{
-    Interp *iPtr;
-    Tcl_Interp *interp;
-    Command *cmdPtr;
-    BuiltinFunc *builtinFuncPtr;
-    MathFunc *mathFuncPtr;
-    Tcl_HashEntry *hPtr;
-    CmdInfo *cmdInfoPtr;
-    int i;
-    union {
-	char c[sizeof(short)];
-	short s;
-    } order;
-#ifdef TCL_COMPILE_STATS
-    ByteCodeStats *statsPtr;
-#endif /* TCL_COMPILE_STATS */
-
-    TclInitSubsystems(NULL);
-
-    /*
-     * Panic if someone updated the CallFrame structure without
-     * also updating the Tcl_CallFrame structure (or vice versa).
-     */  
-
-    if (sizeof(Tcl_CallFrame) != sizeof(CallFrame)) {
-	/*NOTREACHED*/
-        panic("Tcl_CallFrame and CallFrame are not the same size");
-    }
-
-    /*
-     * Initialize support for namespaces and create the global namespace
-     * (whose name is ""; an alias is "::"). This also initializes the
-     * Tcl object type table and other object management code.
-     */
-
-    iPtr = (Interp *) ckalloc(sizeof(Interp));
-    interp = (Tcl_Interp *) iPtr;
-
-    iPtr->result		= iPtr->resultSpace;
-    iPtr->freeProc		= NULL;
-    iPtr->errorLine		= 0;
-    iPtr->objResultPtr		= Tcl_NewObj();
-    Tcl_IncrRefCount(iPtr->objResultPtr);
-    iPtr->handle		= TclHandleCreate(iPtr);
-    iPtr->globalNsPtr		= NULL;
-    iPtr->hiddenCmdTablePtr	= NULL;
-    iPtr->interpInfo		= NULL;
-    Tcl_InitHashTable(&iPtr->mathFuncTable, TCL_STRING_KEYS);
-
-    iPtr->numLevels = 0;
-    iPtr->maxNestingDepth = 1000;
-    iPtr->framePtr = NULL;
-    iPtr->varFramePtr = NULL;
-    iPtr->activeTracePtr = NULL;
-    iPtr->returnCode = TCL_OK;
-    iPtr->errorInfo = NULL;
-    iPtr->errorCode = NULL;
-
-    iPtr->appendResult = NULL;
-    iPtr->appendAvl = 0;
-    iPtr->appendUsed = 0;
-
-    for (i = 0; i < NUM_REGEXPS; i++) {
-	iPtr->patterns[i] = NULL;
-	iPtr->patLengths[i] = -1;
-	iPtr->regexps[i] = NULL;
-    }
-    Tcl_InitHashTable(&iPtr->packageTable, TCL_STRING_KEYS);
-    iPtr->packageUnknown = NULL;
-    iPtr->cmdCount = 0;
-    iPtr->termOffset = 0;
-    TclInitLiteralTable(&(iPtr->literalTable));
-    iPtr->compileEpoch = 0;
-    iPtr->compiledProcPtr = NULL;
-    iPtr->resolverPtr = NULL;
-    iPtr->evalFlags = 0;
-    iPtr->scriptFile = NULL;
-    iPtr->flags = 0;
-    iPtr->tracePtr = NULL;
-    iPtr->assocData = (Tcl_HashTable *) NULL;
-    iPtr->execEnvPtr = NULL;	      /* set after namespaces initialized */
-    iPtr->emptyObjPtr = Tcl_NewObj(); /* another empty object */
-    Tcl_IncrRefCount(iPtr->emptyObjPtr);
-    iPtr->resultSpace[0] = 0;
-
-    iPtr->globalNsPtr = NULL;	/* force creation of global ns below */
-    iPtr->globalNsPtr = (Namespace *) Tcl_CreateNamespace(interp, "",
-	    (ClientData) NULL, (Tcl_NamespaceDeleteProc *) NULL);
-    if (iPtr->globalNsPtr == NULL) {
-        panic("Tcl_CreateInterp: can't create global namespace");
-    }
-
-    /*
-     * Initialize support for code compilation and execution. We call
-     * TclCreateExecEnv after initializing namespaces since it tries to
-     * reference a Tcl variable (it links to the Tcl "tcl_traceExec"
-     * variable).
-     */
-
-    iPtr->execEnvPtr = TclCreateExecEnv(interp);
-
-    /*
-     * Initialize the compilation and execution statistics kept for this
-     * interpreter.
-     */
-
-#ifdef TCL_COMPILE_STATS
-    statsPtr = &(iPtr->stats);
-    statsPtr->numExecutions = 0;
-    statsPtr->numCompilations = 0;
-    statsPtr->numByteCodesFreed = 0;
-    (VOID *) memset(statsPtr->instructionCount, 0,
-	    sizeof(statsPtr->instructionCount));
-
-    statsPtr->totalSrcBytes = 0.0;
-    statsPtr->totalByteCodeBytes = 0.0;
-    statsPtr->currentSrcBytes = 0.0;
-    statsPtr->currentByteCodeBytes = 0.0;
-    (VOID *) memset(statsPtr->srcCount, 0, sizeof(statsPtr->srcCount));
-    (VOID *) memset(statsPtr->byteCodeCount, 0,
-	    sizeof(statsPtr->byteCodeCount));
-    (VOID *) memset(statsPtr->lifetimeCount, 0,
-	    sizeof(statsPtr->lifetimeCount));
-    
-    statsPtr->currentInstBytes   = 0.0;
-    statsPtr->currentLitBytes    = 0.0;
-    statsPtr->currentExceptBytes = 0.0;
-    statsPtr->currentAuxBytes    = 0.0;
-    statsPtr->currentCmdMapBytes = 0.0;
-    
-    statsPtr->numLiteralsCreated    = 0;
-    statsPtr->totalLitStringBytes   = 0.0;
-    statsPtr->currentLitStringBytes = 0.0;
-    (VOID *) memset(statsPtr->literalCount, 0,
-            sizeof(statsPtr->literalCount));
-#endif /* TCL_COMPILE_STATS */    
-
-    /*
-     * Initialise the stub table pointer.
-     */
-
-    iPtr->stubTable = &tclStubs;
-
-    
-    /*
-     * Create the core commands. Do it here, rather than calling
-     * Tcl_CreateCommand, because it's faster (there's no need to check for
-     * a pre-existing command by the same name). If a command has a
-     * Tcl_CmdProc but no Tcl_ObjCmdProc, set the Tcl_ObjCmdProc to
-     * TclInvokeStringCommand. This is an object-based wrapper procedure
-     * that extracts strings, calls the string procedure, and creates an
-     * object for the result. Similarly, if a command has a Tcl_ObjCmdProc
-     * but no Tcl_CmdProc, set the Tcl_CmdProc to TclInvokeObjectCommand.
-     */
-
-    for (cmdInfoPtr = builtInCmds;  cmdInfoPtr->name != NULL;
-	    cmdInfoPtr++) {
-	int new;
-	Tcl_HashEntry *hPtr;
-
-	if ((cmdInfoPtr->proc == (Tcl_CmdProc *) NULL)
-	        && (cmdInfoPtr->objProc == (Tcl_ObjCmdProc *) NULL)
-	        && (cmdInfoPtr->compileProc == (CompileProc *) NULL)) {
-	    panic("Tcl_CreateInterp: builtin command with NULL string and object command procs and a NULL compile proc\n");
-	}
-	
-	hPtr = Tcl_CreateHashEntry(&iPtr->globalNsPtr->cmdTable,
-	        cmdInfoPtr->name, &new);
-	if (new) {
-	    cmdPtr = (Command *) ckalloc(sizeof(Command));
-	    cmdPtr->hPtr = hPtr;
-	    cmdPtr->nsPtr = iPtr->globalNsPtr;
-	    cmdPtr->refCount = 1;
-	    cmdPtr->cmdEpoch = 0;
-	    cmdPtr->compileProc = cmdInfoPtr->compileProc;
-	    if (cmdInfoPtr->proc == (Tcl_CmdProc *) NULL) {
-		cmdPtr->proc = TclInvokeObjectCommand;
-		cmdPtr->clientData = (ClientData) cmdPtr;
-	    } else {
-		cmdPtr->proc = cmdInfoPtr->proc;
-		cmdPtr->clientData = (ClientData) NULL;
-	    }
-	    if (cmdInfoPtr->objProc == (Tcl_ObjCmdProc *) NULL) {
-		cmdPtr->objProc = TclInvokeStringCommand;
-		cmdPtr->objClientData = (ClientData) cmdPtr;
-	    } else {
-		cmdPtr->objProc = cmdInfoPtr->objProc;
-		cmdPtr->objClientData = (ClientData) NULL;
-	    }
-	    cmdPtr->deleteProc = NULL;
-	    cmdPtr->deleteData = (ClientData) NULL;
-	    cmdPtr->deleted = 0;
-	    cmdPtr->importRefPtr = NULL;
-	    Tcl_SetHashValue(hPtr, cmdPtr);
-	}
-    }
-
-    /*
-     * Register the builtin math functions.
-     */
-
-    i = 0;
-    for (builtinFuncPtr = builtinFuncTable;  builtinFuncPtr->name != NULL;
-	    builtinFuncPtr++) {
-	Tcl_CreateMathFunc((Tcl_Interp *) iPtr, builtinFuncPtr->name,
-		builtinFuncPtr->numArgs, builtinFuncPtr->argTypes,
-		(Tcl_MathProc *) NULL, (ClientData) 0);
-	hPtr = Tcl_FindHashEntry(&iPtr->mathFuncTable,
-		builtinFuncPtr->name);
-	if (hPtr == NULL) {
-	    panic("Tcl_CreateInterp: Tcl_CreateMathFunc incorrectly registered '%s'", builtinFuncPtr->name);
-	    return NULL;
-	}
-	mathFuncPtr = (MathFunc *) Tcl_GetHashValue(hPtr);
-	mathFuncPtr->builtinFuncIndex = i;
-	i++;
-    }
-    iPtr->flags |= EXPR_INITIALIZED;
-
-    /*
-     * Do Multiple/Safe Interps Tcl init stuff
-     */
-
-    TclInterpInit(interp);
-
-    /*
-     * We used to create the "errorInfo" and "errorCode" global vars at this
-     * point because so much of the Tcl implementation assumes they already
-     * exist. This is not quite enough, however, since they can be unset
-     * at any time.
-     *
-     * There are 2 choices:
-     *    + Check every place where a GetVar of those is used 
-     *      and the NULL result is not checked (like in tclLoad.c)
-     *    + Make SetVar,... NULL friendly
-     * We choose the second option because :
-     *    + It is easy and low cost to check for NULL pointer before
-     *      calling strlen()
-     *    + It can be helpfull to other people using those API
-     *    + Passing a NULL value to those closest 'meaning' is empty string
-     *      (specially with the new objects where 0 bytes strings are ok)
-     * So the following init is commented out:              -- dl
-     *
-     * (void) Tcl_SetVar2((Tcl_Interp *)iPtr, "errorInfo", (char *) NULL,
-     *       "", TCL_GLOBAL_ONLY);
-     * (void) Tcl_SetVar2((Tcl_Interp *)iPtr, "errorCode", (char *) NULL,
-     *       "NONE", TCL_GLOBAL_ONLY);
-     */
-
-#ifndef TCL_GENERIC_ONLY
-    TclSetupEnv(interp);
-#endif
-
-    /*
-     * Compute the byte order of this machine.
-     */
-
-    order.s = 1;
-    Tcl_SetVar2(interp, "tcl_platform", "byteOrder",
-	    ((order.c[0] == 1) ? "littleEndian" : "bigEndian"),
-	    TCL_GLOBAL_ONLY);
-
-    /*
-     * Set up other variables such as tcl_version and tcl_library
-     */
-
-    Tcl_SetVar(interp, "tcl_patchLevel", TCL_PATCH_LEVEL, TCL_GLOBAL_ONLY);
-    Tcl_SetVar(interp, "tcl_version", TCL_VERSION, TCL_GLOBAL_ONLY);
-    Tcl_TraceVar2(interp, "tcl_precision", (char *) NULL,
-	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    TclPrecTraceProc, (ClientData) NULL);
-    TclpSetVariables(interp);
-
-    /*
-     * Register Tcl's version number.
-     */
-
-    Tcl_PkgProvideEx(interp, "Tcl", TCL_VERSION, (ClientData) &tclStubs);
-    
-#ifdef Tcl_InitStubs
-#undef Tcl_InitStubs
-#endif
-    Tcl_InitStubs(interp, TCL_VERSION, 1);
-
-    return interp;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclHideUnsafeCommands --
- *
- *	Hides base commands that are not marked as safe from this
- *	interpreter.
- *
- * Results:
- *	TCL_OK if it succeeds, TCL_ERROR else.
- *
- * Side effects:
- *	Hides functionality in an interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclHideUnsafeCommands(interp)
-    Tcl_Interp *interp;		/* Hide commands in this interpreter. */
-{
-    register CmdInfo *cmdInfoPtr;
-
-    if (interp == (Tcl_Interp *) NULL) {
-        return TCL_ERROR;
-    }
-    for (cmdInfoPtr = builtInCmds; cmdInfoPtr->name != NULL; cmdInfoPtr++) {
-        if (!cmdInfoPtr->isSafe) {
-            Tcl_HideCommand(interp, cmdInfoPtr->name, cmdInfoPtr->name);
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_CallWhenDeleted --
- *
- *	Arrange for a procedure to be called before a given
- *	interpreter is deleted. The procedure is called as soon
- *	as Tcl_DeleteInterp is called; if Tcl_CallWhenDeleted is
- *	called on an interpreter that has already been deleted,
- *	the procedure will be called when the last Tcl_Release is
- *	done on the interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	When Tcl_DeleteInterp is invoked to delete interp,
- *	proc will be invoked.  See the manual entry for
- *	details.
- *
- *--------------------------------------------------------------
- */
-
-void
-Tcl_CallWhenDeleted(interp, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter to watch. */
-    Tcl_InterpDeleteProc *proc;	/* Procedure to call when interpreter
-				 * is about to be deleted. */
-    ClientData clientData;	/* One-word value to pass to proc. */
-{
-    Interp *iPtr = (Interp *) interp;
-    static int assocDataCounter = 0;
-#ifdef TCL_THREADS
-    static Tcl_Mutex assocMutex;
-#endif
-    int new;
-    char buffer[32 + TCL_INTEGER_SPACE];
-    AssocData *dPtr = (AssocData *) ckalloc(sizeof(AssocData));
-    Tcl_HashEntry *hPtr;
-
-    Tcl_MutexLock(&assocMutex);
-    sprintf(buffer, "Assoc Data Key #%d", assocDataCounter);
-    assocDataCounter++;
-    Tcl_MutexUnlock(&assocMutex);
-
-    if (iPtr->assocData == (Tcl_HashTable *) NULL) {
-        iPtr->assocData = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(iPtr->assocData, TCL_STRING_KEYS);
-    }
-    hPtr = Tcl_CreateHashEntry(iPtr->assocData, buffer, &new);
-    dPtr->proc = proc;
-    dPtr->clientData = clientData;
-    Tcl_SetHashValue(hPtr, dPtr);
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_DontCallWhenDeleted --
- *
- *	Cancel the arrangement for a procedure to be called when
- *	a given interpreter is deleted.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If proc and clientData were previously registered as a
- *	callback via Tcl_CallWhenDeleted, they are unregistered.
- *	If they weren't previously registered then nothing
- *	happens.
- *
- *--------------------------------------------------------------
- */
-
-void
-Tcl_DontCallWhenDeleted(interp, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter to watch. */
-    Tcl_InterpDeleteProc *proc;	/* Procedure to call when interpreter
-				 * is about to be deleted. */
-    ClientData clientData;	/* One-word value to pass to proc. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashTable *hTablePtr;
-    Tcl_HashSearch hSearch;
-    Tcl_HashEntry *hPtr;
-    AssocData *dPtr;
-
-    hTablePtr = iPtr->assocData;
-    if (hTablePtr == (Tcl_HashTable *) NULL) {
-        return;
-    }
-    for (hPtr = Tcl_FirstHashEntry(hTablePtr, &hSearch); hPtr != NULL;
-	    hPtr = Tcl_NextHashEntry(&hSearch)) {
-        dPtr = (AssocData *) Tcl_GetHashValue(hPtr);
-        if ((dPtr->proc == proc) && (dPtr->clientData == clientData)) {
-            ckfree((char *) dPtr);
-            Tcl_DeleteHashEntry(hPtr);
-            return;
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetAssocData --
- *
- *	Creates a named association between user-specified data, a delete
- *	function and this interpreter. If the association already exists
- *	the data is overwritten with the new data. The delete function will
- *	be invoked when the interpreter is deleted.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the associated data, creates the association if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetAssocData(interp, name, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter to associate with. */
-    char *name;			/* Name for association. */
-    Tcl_InterpDeleteProc *proc;	/* Proc to call when interpreter is
-                                 * about to be deleted. */
-    ClientData clientData;	/* One-word value to pass to proc. */
-{
-    Interp *iPtr = (Interp *) interp;
-    AssocData *dPtr;
-    Tcl_HashEntry *hPtr;
-    int new;
-
-    if (iPtr->assocData == (Tcl_HashTable *) NULL) {
-        iPtr->assocData = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(iPtr->assocData, TCL_STRING_KEYS);
-    }
-    hPtr = Tcl_CreateHashEntry(iPtr->assocData, name, &new);
-    if (new == 0) {
-        dPtr = (AssocData *) Tcl_GetHashValue(hPtr);
-    } else {
-        dPtr = (AssocData *) ckalloc(sizeof(AssocData));
-    }
-    dPtr->proc = proc;
-    dPtr->clientData = clientData;
-
-    Tcl_SetHashValue(hPtr, dPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteAssocData --
- *
- *	Deletes a named association of user-specified data with
- *	the specified interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deletes the association.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteAssocData(interp, name)
-    Tcl_Interp *interp;			/* Interpreter to associate with. */
-    char *name;				/* Name of association. */
-{
-    Interp *iPtr = (Interp *) interp;
-    AssocData *dPtr;
-    Tcl_HashEntry *hPtr;
-
-    if (iPtr->assocData == (Tcl_HashTable *) NULL) {
-        return;
-    }
-    hPtr = Tcl_FindHashEntry(iPtr->assocData, name);
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        return;
-    }
-    dPtr = (AssocData *) Tcl_GetHashValue(hPtr);
-    if (dPtr->proc != NULL) {
-        (dPtr->proc) (dPtr->clientData, interp);
-    }
-    ckfree((char *) dPtr);
-    Tcl_DeleteHashEntry(hPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetAssocData --
- *
- *	Returns the client data associated with this name in the
- *	specified interpreter.
- *
- * Results:
- *	The client data in the AssocData record denoted by the named
- *	association, or NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_GetAssocData(interp, name, procPtr)
-    Tcl_Interp *interp;			/* Interpreter associated with. */
-    char *name;				/* Name of association. */
-    Tcl_InterpDeleteProc **procPtr;	/* Pointer to place to store address
-					 * of current deletion callback. */
-{
-    Interp *iPtr = (Interp *) interp;
-    AssocData *dPtr;
-    Tcl_HashEntry *hPtr;
-
-    if (iPtr->assocData == (Tcl_HashTable *) NULL) {
-        return (ClientData) NULL;
-    }
-    hPtr = Tcl_FindHashEntry(iPtr->assocData, name);
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        return (ClientData) NULL;
-    }
-    dPtr = (AssocData *) Tcl_GetHashValue(hPtr);
-    if (procPtr != (Tcl_InterpDeleteProc **) NULL) {
-        *procPtr = dPtr->proc;
-    }
-    return dPtr->clientData;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InterpDeleted --
- *
- *	Returns nonzero if the interpreter has been deleted with a call
- *	to Tcl_DeleteInterp.
- *
- * Results:
- *	Nonzero if the interpreter is deleted, zero otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_InterpDeleted(interp)
-    Tcl_Interp *interp;
-{
-    return (((Interp *) interp)->flags & DELETED) ? 1 : 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteInterp --
- *
- *	Ensures that the interpreter will be deleted eventually. If there
- *	are no Tcl_Preserve calls in effect for this interpreter, it is
- *	deleted immediately, otherwise the interpreter is deleted when
- *	the last Tcl_Preserve is matched by a call to Tcl_Release. In either
- *	case, the procedure runs the currently registered deletion callbacks. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The interpreter is marked as deleted. The caller may still use it
- *	safely if there are calls to Tcl_Preserve in effect for the
- *	interpreter, but further calls to Tcl_Eval etc in this interpreter
- *	will fail.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteInterp(interp)
-    Tcl_Interp *interp;		/* Token for command interpreter (returned
-				 * by a previous call to Tcl_CreateInterp). */
-{
-    Interp *iPtr = (Interp *) interp;
-
-    /*
-     * If the interpreter has already been marked deleted, just punt.
-     */
-
-    if (iPtr->flags & DELETED) {
-        return;
-    }
-    
-    /*
-     * Mark the interpreter as deleted. No further evals will be allowed.
-     */
-
-    iPtr->flags |= DELETED;
-
-    /*
-     * Ensure that the interpreter is eventually deleted.
-     */
-
-    Tcl_EventuallyFree((ClientData) interp,
-            (Tcl_FreeProc *) DeleteInterpProc);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteInterpProc --
- *
- *	Helper procedure to delete an interpreter. This procedure is
- *	called when the last call to Tcl_Preserve on this interpreter
- *	is matched by a call to Tcl_Release. The procedure cleans up
- *	all resources used in the interpreter and calls all currently
- *	registered interpreter deletion callbacks.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Whatever the interpreter deletion callbacks do. Frees resources
- *	used by the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteInterpProc(interp)
-    Tcl_Interp *interp;			/* Interpreter to delete. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    Tcl_HashTable *hTablePtr;
-    ResolverScheme *resPtr, *nextResPtr;
-    int i;
-
-    /*
-     * Punt if there is an error in the Tcl_Release/Tcl_Preserve matchup.
-     */
-    
-    if (iPtr->numLevels > 0) {
-        panic("DeleteInterpProc called with active evals");
-    }
-
-    /*
-     * The interpreter should already be marked deleted; otherwise how
-     * did we get here?
-     */
-
-    if (!(iPtr->flags & DELETED)) {
-        panic("DeleteInterpProc called on interpreter not marked deleted");
-    }
-
-    TclHandleFree(iPtr->handle);
-
-    /*
-     * Dismantle everything in the global namespace except for the
-     * "errorInfo" and "errorCode" variables. These remain until the
-     * namespace is actually destroyed, in case any errors occur.
-     *   
-     * Dismantle the namespace here, before we clear the assocData. If any
-     * background errors occur here, they will be deleted below.
-     */
-    
-    TclTeardownNamespace(iPtr->globalNsPtr);
-
-    /*
-     * Delete all the hidden commands.
-     */
-     
-    hTablePtr = iPtr->hiddenCmdTablePtr;
-    if (hTablePtr != NULL) {
-	/*
-	 * Non-pernicious deletion.  The deletion callbacks will not be
-	 * allowed to create any new hidden or non-hidden commands.
-	 * Tcl_DeleteCommandFromToken() will remove the entry from the
-	 * hiddenCmdTablePtr.
-	 */
-	 
-	hPtr = Tcl_FirstHashEntry(hTablePtr, &search);
-	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	    Tcl_DeleteCommandFromToken(interp,
-		    (Tcl_Command) Tcl_GetHashValue(hPtr));
-	}
-	Tcl_DeleteHashTable(hTablePtr);
-	ckfree((char *) hTablePtr);
-    }
-    /*
-     * Tear down the math function table.
-     */
-
-    for (hPtr = Tcl_FirstHashEntry(&iPtr->mathFuncTable, &search);
-	     hPtr != NULL;
-             hPtr = Tcl_NextHashEntry(&search)) {
-	ckfree((char *) Tcl_GetHashValue(hPtr));
-    }
-    Tcl_DeleteHashTable(&iPtr->mathFuncTable);
-
-    /*
-     * Invoke deletion callbacks; note that a callback can create new
-     * callbacks, so we iterate.
-     */
-
-    while (iPtr->assocData != (Tcl_HashTable *) NULL) {
-	AssocData *dPtr;
-	
-        hTablePtr = iPtr->assocData;
-        iPtr->assocData = (Tcl_HashTable *) NULL;
-        for (hPtr = Tcl_FirstHashEntry(hTablePtr, &search);
-                 hPtr != NULL;
-                 hPtr = Tcl_FirstHashEntry(hTablePtr, &search)) {
-            dPtr = (AssocData *) Tcl_GetHashValue(hPtr);
-            Tcl_DeleteHashEntry(hPtr);
-            if (dPtr->proc != NULL) {
-                (*dPtr->proc)(dPtr->clientData, interp);
-            }
-            ckfree((char *) dPtr);
-        }
-        Tcl_DeleteHashTable(hTablePtr);
-        ckfree((char *) hTablePtr);
-    }
-
-    /*
-     * Finish deleting the global namespace.
-     */
-    
-    Tcl_DeleteNamespace((Tcl_Namespace *) iPtr->globalNsPtr);
-
-    /*
-     * Free up the result *after* deleting variables, since variable
-     * deletion could have transferred ownership of the result string
-     * to Tcl.
-     */
-
-    Tcl_FreeResult(interp);
-    interp->result = NULL;
-    Tcl_DecrRefCount(iPtr->objResultPtr);
-    iPtr->objResultPtr = NULL;
-    if (iPtr->errorInfo != NULL) {
-	ckfree(iPtr->errorInfo);
-        iPtr->errorInfo = NULL;
-    }
-    if (iPtr->errorCode != NULL) {
-	ckfree(iPtr->errorCode);
-        iPtr->errorCode = NULL;
-    }
-    if (iPtr->appendResult != NULL) {
-	ckfree(iPtr->appendResult);
-        iPtr->appendResult = NULL;
-    }
-    for (i = 0; i < NUM_REGEXPS; i++) {
-	if (iPtr->patterns[i] == NULL) {
-	    break;
-	}
-	ckfree(iPtr->patterns[i]);
-	ckfree((char *) iPtr->regexps[i]);
-        iPtr->regexps[i] = NULL;
-    }
-    TclFreePackageInfo(iPtr);
-    while (iPtr->tracePtr != NULL) {
-	Trace *nextPtr = iPtr->tracePtr->nextPtr;
-
-	ckfree((char *) iPtr->tracePtr);
-	iPtr->tracePtr = nextPtr;
-    }
-    if (iPtr->execEnvPtr != NULL) {
-	TclDeleteExecEnv(iPtr->execEnvPtr);
-    }
-    Tcl_DecrRefCount(iPtr->emptyObjPtr);
-    iPtr->emptyObjPtr = NULL;
-
-    resPtr = iPtr->resolverPtr;
-    while (resPtr) {
-	nextResPtr = resPtr->nextPtr;
-	ckfree(resPtr->name);
-	ckfree((char *) resPtr);
-        resPtr = nextResPtr;
-    }
-    
-    /*
-     * Free up literal objects created for scripts compiled by the
-     * interpreter.
-     */
-
-    TclDeleteLiteralTable(interp, &(iPtr->literalTable));
-    ckfree((char *) iPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_HideCommand --
- *
- *	Makes a command hidden so that it cannot be invoked from within
- *	an interpreter, only from within an ancestor.
- *
- * Results:
- *	A standard Tcl result; also leaves a message in the interp's result
- *	if an error occurs.
- *
- * Side effects:
- *	Removes a command from the command table and create an entry
- *      into the hidden command table under the specified token name.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_HideCommand(interp, cmdName, hiddenCmdToken)
-    Tcl_Interp *interp;		/* Interpreter in which to hide command. */
-    char *cmdName;		/* Name of command to hide. */
-    char *hiddenCmdToken;	/* Token name of the to-be-hidden command. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_Command cmd;
-    Command *cmdPtr;
-    Tcl_HashTable *hiddenCmdTablePtr;
-    Tcl_HashEntry *hPtr;
-    int new;
-
-    if (iPtr->flags & DELETED) {
-
-        /*
-         * The interpreter is being deleted. Do not create any new
-         * structures, because it is not safe to modify the interpreter.
-         */
-        
-        return TCL_ERROR;
-    }
-
-    /*
-     * Disallow hiding of commands that are currently in a namespace or
-     * renaming (as part of hiding) into a namespace.
-     *
-     * (because the current implementation with a single global table
-     *  and the needed uniqueness of names cause problems with namespaces)
-     *
-     * we don't need to check for "::" in cmdName because the real check is
-     * on the nsPtr below.
-     *
-     * hiddenCmdToken is just a string which is not interpreted in any way.
-     * It may contain :: but the string is not interpreted as a namespace
-     * qualifier command name. Thus, hiding foo::bar to foo::bar and then
-     * trying to expose or invoke ::foo::bar will NOT work; but if the
-     * application always uses the same strings it will get consistent
-     * behaviour.
-     *
-     * But as we currently limit ourselves to the global namespace only
-     * for the source, in order to avoid potential confusion,
-     * lets prevent "::" in the token too.  --dl
-     */
-
-    if (strstr(hiddenCmdToken, "::") != NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "cannot use namespace qualifiers as hidden command",
-		"token (rename)", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Find the command to hide. An error is returned if cmdName can't
-     * be found. Look up the command only from the global namespace.
-     * Full path of the command must be given if using namespaces.
-     */
-
-    cmd = Tcl_FindCommand(interp, cmdName, (Tcl_Namespace *) NULL,
-	    /*flags*/ TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
-    if (cmd == (Tcl_Command) NULL) {
-	return TCL_ERROR;
-    }
-    cmdPtr = (Command *) cmd;
-
-    /*
-     * Check that the command is really in global namespace
-     */
-
-    if ( cmdPtr->nsPtr != iPtr->globalNsPtr ) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "can only hide global namespace commands",
-		" (use rename then hide)", (char *) NULL);
-        return TCL_ERROR;
-    }
-    
-    /*
-     * Initialize the hidden command table if necessary.
-     */
-
-    hiddenCmdTablePtr = iPtr->hiddenCmdTablePtr;
-    if (hiddenCmdTablePtr == NULL) {
-        hiddenCmdTablePtr = (Tcl_HashTable *)
-	        ckalloc((unsigned) sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(hiddenCmdTablePtr, TCL_STRING_KEYS);
-	iPtr->hiddenCmdTablePtr = hiddenCmdTablePtr;
-    }
-
-    /*
-     * It is an error to move an exposed command to a hidden command with
-     * hiddenCmdToken if a hidden command with the name hiddenCmdToken already
-     * exists.
-     */
-    
-    hPtr = Tcl_CreateHashEntry(hiddenCmdTablePtr, hiddenCmdToken, &new);
-    if (!new) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "hidden command named \"", hiddenCmdToken, "\" already exists",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Nb : This code is currently 'like' a rename to a specialy set apart
-     * name table. Changes here and in TclRenameCommand must
-     * be kept in synch untill the common parts are actually
-     * factorized out.
-     */
-
-    /*
-     * Remove the hash entry for the command from the interpreter command
-     * table. This is like deleting the command, so bump its command epoch;
-     * this invalidates any cached references that point to the command.
-     */
-
-    if (cmdPtr->hPtr != NULL) {
-        Tcl_DeleteHashEntry(cmdPtr->hPtr);
-        cmdPtr->hPtr = (Tcl_HashEntry *) NULL;
-	cmdPtr->cmdEpoch++;
-    }
-
-    /*
-     * Now link the hash table entry with the command structure.
-     * We ensured above that the nsPtr was right.
-     */
-    
-    cmdPtr->hPtr = hPtr;
-    Tcl_SetHashValue(hPtr, (ClientData) cmdPtr);
-
-    /*
-     * If the command being hidden has a compile procedure, increment the
-     * interpreter's compileEpoch to invalidate its compiled code. This
-     * makes sure that we don't later try to execute old code compiled with
-     * command-specific (i.e., inline) bytecodes for the now-hidden
-     * command. This field is checked in Tcl_EvalObj and ObjInterpProc,
-     * and code whose compilation epoch doesn't match is recompiled.
-     */
-
-    if (cmdPtr->compileProc != NULL) {
-	iPtr->compileEpoch++;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ExposeCommand --
- *
- *	Makes a previously hidden command callable from inside the
- *	interpreter instead of only by its ancestors.
- *
- * Results:
- *	A standard Tcl result. If an error occurs, a message is left
- *	in the interp's result.
- *
- * Side effects:
- *	Moves commands from one hash table to another.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ExposeCommand(interp, hiddenCmdToken, cmdName)
-    Tcl_Interp *interp;		/* Interpreter in which to make command
-                                 * callable. */
-    char *hiddenCmdToken;	/* Name of hidden command. */
-    char *cmdName;		/* Name of to-be-exposed command. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Command *cmdPtr;
-    Namespace *nsPtr;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashTable *hiddenCmdTablePtr;
-    int new;
-
-    if (iPtr->flags & DELETED) {
-        /*
-         * The interpreter is being deleted. Do not create any new
-         * structures, because it is not safe to modify the interpreter.
-         */
-        
-        return TCL_ERROR;
-    }
-
-    /*
-     * Check that we have a regular name for the command
-     * (that the user is not trying to do an expose and a rename
-     *  (to another namespace) at the same time)
-     */
-
-    if (strstr(cmdName, "::") != NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "can not expose to a namespace ",
-		"(use expose to toplevel, then rename)",
-                 (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Get the command from the hidden command table:
-     */
-
-    hPtr = NULL;
-    hiddenCmdTablePtr = iPtr->hiddenCmdTablePtr;
-    if (hiddenCmdTablePtr != NULL) {
-	hPtr = Tcl_FindHashEntry(hiddenCmdTablePtr, hiddenCmdToken);
-    }
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "unknown hidden command \"", hiddenCmdToken,
-                "\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-    
-
-    /*
-     * Check that we have a true global namespace
-     * command (enforced by Tcl_HideCommand() but let's double
-     * check. (If it was not, we would not really know how to
-     * handle it).
-     */
-    if ( cmdPtr->nsPtr != iPtr->globalNsPtr ) {
-	/* 
-	 * This case is theoritically impossible,
-	 * we might rather panic() than 'nicely' erroring out ?
-	 */
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "trying to expose a non global command name space command",
-		(char *) NULL);
-        return TCL_ERROR;
-    }
-    
-    /* This is the global table */
-    nsPtr = cmdPtr->nsPtr;
-
-    /*
-     * It is an error to overwrite an existing exposed command as a result
-     * of exposing a previously hidden command.
-     */
-
-    hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, cmdName, &new);
-    if (!new) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "exposed command \"", cmdName,
-                "\" already exists", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Remove the hash entry for the command from the interpreter hidden
-     * command table.
-     */
-
-    if (cmdPtr->hPtr != NULL) {
-        Tcl_DeleteHashEntry(cmdPtr->hPtr);
-        cmdPtr->hPtr = NULL;
-    }
-
-    /*
-     * Now link the hash table entry with the command structure.
-     * This is like creating a new command, so deal with any shadowing
-     * of commands in the global namespace.
-     */
-    
-    cmdPtr->hPtr = hPtr;
-
-    Tcl_SetHashValue(hPtr, (ClientData) cmdPtr);
-
-    /*
-     * Not needed as we are only in the global namespace
-     * (but would be needed again if we supported namespace command hiding)
-     *
-     * TclResetShadowedCmdRefs(interp, cmdPtr);
-     */
-
-
-    /*
-     * If the command being exposed has a compile procedure, increment
-     * interpreter's compileEpoch to invalidate its compiled code. This
-     * makes sure that we don't later try to execute old code compiled
-     * assuming the command is hidden. This field is checked in Tcl_EvalObj
-     * and ObjInterpProc, and code whose compilation epoch doesn't match is
-     * recompiled.
-     */
-
-    if (cmdPtr->compileProc != NULL) {
-	iPtr->compileEpoch++;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateCommand --
- *
- *	Define a new command in a command table.
- *
- * Results:
- *	The return value is a token for the command, which can
- *	be used in future calls to Tcl_GetCommandName.
- *
- * Side effects:
- *	If a command named cmdName already exists for interp, it is deleted.
- *	In the future, when cmdName is seen as the name of a command by
- *	Tcl_Eval, proc will be called. To support the bytecode interpreter,
- *	the command is created with a wrapper Tcl_ObjCmdProc
- *	(TclInvokeStringCommand) that eventially calls proc. When the
- *	command is deleted from the table, deleteProc will be called.
- *	See the manual entry for details on the calling sequence.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-Tcl_CreateCommand(interp, cmdName, proc, clientData, deleteProc)
-    Tcl_Interp *interp;		/* Token for command interpreter returned by
-				 * a previous call to Tcl_CreateInterp. */
-    char *cmdName;		/* Name of command. If it contains namespace
-				 * qualifiers, the new command is put in the
-				 * specified namespace; otherwise it is put
-				 * in the global namespace. */
-    Tcl_CmdProc *proc;		/* Procedure to associate with cmdName. */
-    ClientData clientData;	/* Arbitrary value passed to string proc. */
-    Tcl_CmdDeleteProc *deleteProc;
-				/* If not NULL, gives a procedure to call
-				 * when this command is deleted. */
-{
-    Interp *iPtr = (Interp *) interp;
-    ImportRef *oldRefPtr = NULL;
-    Namespace *nsPtr, *dummy1, *dummy2;
-    Command *cmdPtr, *refCmdPtr;
-    Tcl_HashEntry *hPtr;
-    char *tail;
-    int new;
-    ImportedCmdData *dataPtr;
-
-    if (iPtr->flags & DELETED) {
-	/*
-	 * The interpreter is being deleted.  Don't create any new
-	 * commands; it's not safe to muck with the interpreter anymore.
-	 */
-
-	return (Tcl_Command) NULL;
-    }
-
-    /*
-     * Determine where the command should reside. If its name contains 
-     * namespace qualifiers, we put it in the specified namespace; 
-     * otherwise, we always put it in the global namespace.
-     */
-
-    if (strstr(cmdName, "::") != NULL) {
-       TclGetNamespaceForQualName(interp, cmdName, (Namespace *) NULL,
-           CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
-       if ((nsPtr == NULL) || (tail == NULL)) {
-	    return (Tcl_Command) NULL;
-	}
-    } else {
-	nsPtr = iPtr->globalNsPtr;
-	tail = cmdName;
-    }
-    
-    hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &new);
-    if (!new) {
-	/*
-	 * Command already exists. Delete the old one.
-	 * Be careful to preserve any existing import links so we can
-	 * restore them down below.  That way, you can redefine a
-	 * command and its import status will remain intact.
-	 */
-
-	cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-	oldRefPtr = cmdPtr->importRefPtr;
-	cmdPtr->importRefPtr = NULL;
-
-	Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
-	hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &new);
-	if (!new) {
-	    /*
-	     * If the deletion callback recreated the command, just throw
-             * away the new command (if we try to delete it again, we
-             * could get stuck in an infinite loop).
-	     */
-
-	     ckfree((char*) Tcl_GetHashValue(hPtr));
-	}
-    }
-    cmdPtr = (Command *) ckalloc(sizeof(Command));
-    Tcl_SetHashValue(hPtr, cmdPtr);
-    cmdPtr->hPtr = hPtr;
-    cmdPtr->nsPtr = nsPtr;
-    cmdPtr->refCount = 1;
-    cmdPtr->cmdEpoch = 0;
-    cmdPtr->compileProc = (CompileProc *) NULL;
-    cmdPtr->objProc = TclInvokeStringCommand;
-    cmdPtr->objClientData = (ClientData) cmdPtr;
-    cmdPtr->proc = proc;
-    cmdPtr->clientData = clientData;
-    cmdPtr->deleteProc = deleteProc;
-    cmdPtr->deleteData = clientData;
-    cmdPtr->deleted = 0;
-    cmdPtr->importRefPtr = NULL;
-
-    /*
-     * Plug in any existing import references found above.  Be sure
-     * to update all of these references to point to the new command.
-     */
-
-    if (oldRefPtr != NULL) {
-	cmdPtr->importRefPtr = oldRefPtr;
-	while (oldRefPtr != NULL) {
-	    refCmdPtr = oldRefPtr->importedCmdPtr;
-	    dataPtr = (ImportedCmdData*)refCmdPtr->objClientData;
-	    dataPtr->realCmdPtr = cmdPtr;
-	    oldRefPtr = oldRefPtr->nextPtr;
-	}
-    }
-
-    /*
-     * We just created a command, so in its namespace and all of its parent
-     * namespaces, it may shadow global commands with the same name. If any
-     * shadowed commands are found, invalidate all cached command references
-     * in the affected namespaces.
-     */
-    
-    TclResetShadowedCmdRefs(interp, cmdPtr);
-    return (Tcl_Command) cmdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateObjCommand --
- *
- *	Define a new object-based command in a command table.
- *
- * Results:
- *	The return value is a token for the command, which can
- *	be used in future calls to Tcl_GetCommandName.
- *
- * Side effects:
- *	If no command named "cmdName" already exists for interp, one is
- *	created. Otherwise, if a command does exist, then if the
- *	object-based Tcl_ObjCmdProc is TclInvokeStringCommand, we assume
- *	Tcl_CreateCommand was called previously for the same command and
- *	just set its Tcl_ObjCmdProc to the argument "proc"; otherwise, we
- *	delete the old command.
- *
- *	In the future, during bytecode evaluation when "cmdName" is seen as
- *	the name of a command by Tcl_EvalObj or Tcl_Eval, the object-based
- *	Tcl_ObjCmdProc proc will be called. When the command is deleted from
- *	the table, deleteProc will be called. See the manual entry for
- *	details on the calling sequence.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-Tcl_CreateObjCommand(interp, cmdName, proc, clientData, deleteProc)
-    Tcl_Interp *interp;		/* Token for command interpreter (returned
-				 * by previous call to Tcl_CreateInterp). */
-    char *cmdName;		/* Name of command. If it contains namespace
-				 * qualifiers, the new command is put in the
-				 * specified namespace; otherwise it is put
-				 * in the global namespace. */
-    Tcl_ObjCmdProc *proc;	/* Object-based procedure to associate with
-				 * name. */
-    ClientData clientData;	/* Arbitrary value to pass to object
-    				 * procedure. */
-    Tcl_CmdDeleteProc *deleteProc;
-				/* If not NULL, gives a procedure to call
-				 * when this command is deleted. */
-{
-    Interp *iPtr = (Interp *) interp;
-    ImportRef *oldRefPtr = NULL;
-    Namespace *nsPtr, *dummy1, *dummy2;
-    Command *cmdPtr, *refCmdPtr;
-    Tcl_HashEntry *hPtr;
-    char *tail;
-    int new;
-    ImportedCmdData *dataPtr;
-
-    if (iPtr->flags & DELETED) {
-	/*
-	 * The interpreter is being deleted.  Don't create any new
-	 * commands;  it's not safe to muck with the interpreter anymore.
-	 */
-
-	return (Tcl_Command) NULL;
-    }
-
-    /*
-     * Determine where the command should reside. If its name contains 
-     * namespace qualifiers, we put it in the specified namespace; 
-     * otherwise, we always put it in the global namespace.
-     */
-
-    if (strstr(cmdName, "::") != NULL) {
-       TclGetNamespaceForQualName(interp, cmdName, (Namespace *) NULL,
-           CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
-       if ((nsPtr == NULL) || (tail == NULL)) {
-	    return (Tcl_Command) NULL;
-	}
-    } else {
-	nsPtr = iPtr->globalNsPtr;
-	tail = cmdName;
-    }
-
-    hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &new);
-    if (!new) {
-	cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-
-	/*
-	 * Command already exists. If its object-based Tcl_ObjCmdProc is
-	 * TclInvokeStringCommand, we just set its Tcl_ObjCmdProc to the
-	 * argument "proc". Otherwise, we delete the old command. 
-	 */
-
-	if (cmdPtr->objProc == TclInvokeStringCommand) {
-	    cmdPtr->objProc = proc;
-	    cmdPtr->objClientData = clientData;
-            cmdPtr->deleteProc = deleteProc;
-            cmdPtr->deleteData = clientData;
-	    return (Tcl_Command) cmdPtr;
-	}
-
-	/*
-	 * Otherwise, we delete the old command.  Be careful to preserve
-	 * any existing import links so we can restore them down below.
-	 * That way, you can redefine a command and its import status
-	 * will remain intact.
-	 */
-
-	oldRefPtr = cmdPtr->importRefPtr;
-	cmdPtr->importRefPtr = NULL;
-
-	Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
-	hPtr = Tcl_CreateHashEntry(&nsPtr->cmdTable, tail, &new);
-	if (!new) {
-	    /*
-	     * If the deletion callback recreated the command, just throw
-	     * away the new command (if we try to delete it again, we
-	     * could get stuck in an infinite loop).
-	     */
-
-	     ckfree((char *) Tcl_GetHashValue(hPtr));
-	}
-    }
-    cmdPtr = (Command *) ckalloc(sizeof(Command));
-    Tcl_SetHashValue(hPtr, cmdPtr);
-    cmdPtr->hPtr = hPtr;
-    cmdPtr->nsPtr = nsPtr;
-    cmdPtr->refCount = 1;
-    cmdPtr->cmdEpoch = 0;
-    cmdPtr->compileProc = (CompileProc *) NULL;
-    cmdPtr->objProc = proc;
-    cmdPtr->objClientData = clientData;
-    cmdPtr->proc = TclInvokeObjectCommand;
-    cmdPtr->clientData = (ClientData) cmdPtr;
-    cmdPtr->deleteProc = deleteProc;
-    cmdPtr->deleteData = clientData;
-    cmdPtr->deleted = 0;
-    cmdPtr->importRefPtr = NULL;
-
-    /*
-     * Plug in any existing import references found above.  Be sure
-     * to update all of these references to point to the new command.
-     */
-
-    if (oldRefPtr != NULL) {
-	cmdPtr->importRefPtr = oldRefPtr;
-	while (oldRefPtr != NULL) {
-	    refCmdPtr = oldRefPtr->importedCmdPtr;
-	    dataPtr = (ImportedCmdData*)refCmdPtr->objClientData;
-	    dataPtr->realCmdPtr = cmdPtr;
-	    oldRefPtr = oldRefPtr->nextPtr;
-	}
-    }
-    
-    /*
-     * We just created a command, so in its namespace and all of its parent
-     * namespaces, it may shadow global commands with the same name. If any
-     * shadowed commands are found, invalidate all cached command references
-     * in the affected namespaces.
-     */
-    
-    TclResetShadowedCmdRefs(interp, cmdPtr);
-    return (Tcl_Command) cmdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInvokeStringCommand --
- *
- *	"Wrapper" Tcl_ObjCmdProc used to call an existing string-based
- *	Tcl_CmdProc if no object-based procedure exists for a command. A
- *	pointer to this procedure is stored as the Tcl_ObjCmdProc in a
- *	Command structure. It simply turns around and calls the string
- *	Tcl_CmdProc in the Command structure.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	Besides those side effects of the called Tcl_CmdProc,
- *	TclInvokeStringCommand allocates and frees storage.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclInvokeStringCommand(clientData, interp, objc, objv)
-    ClientData clientData;	/* Points to command's Command structure. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    register int objc;		/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Command *cmdPtr = (Command *) clientData;
-    register int i;
-    int result;
-
-    /*
-     * This procedure generates an argv array for the string arguments. It
-     * starts out with stack-allocated space but uses dynamically-allocated
-     * storage if needed.
-     */
-
-#define NUM_ARGS 20
-    char *(argStorage[NUM_ARGS]);
-    char **argv = argStorage;
-
-    /*
-     * Create the string argument array "argv". Make sure argv is large
-     * enough to hold the objc arguments plus 1 extra for the zero
-     * end-of-argv word.
-     */
-
-    if ((objc + 1) > NUM_ARGS) {
-	argv = (char **) ckalloc((unsigned)(objc + 1) * sizeof(char *));
-    }
-
-    for (i = 0;  i < objc;  i++) {
-	argv[i] = Tcl_GetString(objv[i]);
-    }
-    argv[objc] = 0;
-
-    /*
-     * Invoke the command's string-based Tcl_CmdProc.
-     */
-
-    result = (*cmdPtr->proc)(cmdPtr->clientData, interp, objc, argv);
-
-    /*
-     * Free the argv array if malloc'ed storage was used.
-     */
-
-    if (argv != argStorage) {
-	ckfree((char *) argv);
-    }
-    return result;
-#undef NUM_ARGS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInvokeObjectCommand --
- *
- *	"Wrapper" Tcl_CmdProc used to call an existing object-based
- *	Tcl_ObjCmdProc if no string-based procedure exists for a command.
- *	A pointer to this procedure is stored as the Tcl_CmdProc in a
- *	Command structure. It simply turns around and calls the object
- *	Tcl_ObjCmdProc in the Command structure.
- *
- * Results:
- *	A standard Tcl string result value.
- *
- * Side effects:
- *	Besides those side effects of the called Tcl_CmdProc,
- *	TclInvokeStringCommand allocates and frees storage.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclInvokeObjectCommand(clientData, interp, argc, argv)
-    ClientData clientData;	/* Points to command's Command structure. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int argc;			/* Number of arguments. */
-    register char **argv;	/* Argument strings. */
-{
-    Command *cmdPtr = (Command *) clientData;
-    register Tcl_Obj *objPtr;
-    register int i;
-    int length, result;
-
-    /*
-     * This procedure generates an objv array for object arguments that hold
-     * the argv strings. It starts out with stack-allocated space but uses
-     * dynamically-allocated storage if needed.
-     */
-
-#define NUM_ARGS 20
-    Tcl_Obj *(argStorage[NUM_ARGS]);
-    register Tcl_Obj **objv = argStorage;
-
-    /*
-     * Create the object argument array "objv". Make sure objv is large
-     * enough to hold the objc arguments plus 1 extra for the zero
-     * end-of-objv word.
-     */
-
-    if ((argc + 1) > NUM_ARGS) {
-	objv = (Tcl_Obj **)
-	    ckalloc((unsigned)(argc + 1) * sizeof(Tcl_Obj *));
-    }
-
-    for (i = 0;  i < argc;  i++) {
-	length = strlen(argv[i]);
-	TclNewObj(objPtr);
-	TclInitStringRep(objPtr, argv[i], length);
-	Tcl_IncrRefCount(objPtr);
-	objv[i] = objPtr;
-    }
-    objv[argc] = 0;
-
-    /*
-     * Invoke the command's object-based Tcl_ObjCmdProc.
-     */
-
-    result = (*cmdPtr->objProc)(cmdPtr->objClientData, interp, argc, objv);
-
-    /*
-     * Move the interpreter's object result to the string result, 
-     * then reset the object result.
-     */
-
-    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	    TCL_VOLATILE);
-    
-    /*
-     * Decrement the ref counts for the argument objects created above,
-     * then free the objv array if malloc'ed storage was used.
-     */
-
-    for (i = 0;  i < argc;  i++) {
-	objPtr = objv[i];
-	Tcl_DecrRefCount(objPtr);
-    }
-    if (objv != argStorage) {
-	ckfree((char *) objv);
-    }
-    return result;
-#undef NUM_ARGS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRenameCommand --
- *
- *      Called to give an existing Tcl command a different name. Both the
- *      old command name and the new command name can have "::" namespace
- *      qualifiers. If the new command has a different namespace context,
- *      the command will be moved to that namespace and will execute in
- *	the context of that new namespace.
- *
- *      If the new command name is NULL or the null string, the command is
- *      deleted.
- *
- * Results:
- *      Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *      If anything goes wrong, an error message is returned in the
- *      interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclRenameCommand(interp, oldName, newName)
-    Tcl_Interp *interp;                 /* Current interpreter. */
-    char *oldName;                      /* Existing command name. */
-    char *newName;                      /* New command name. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *newTail;
-    Namespace *cmdNsPtr, *newNsPtr, *dummy1, *dummy2;
-    Tcl_Command cmd;
-    Command *cmdPtr;
-    Tcl_HashEntry *hPtr, *oldHPtr;
-    int new, result;
-
-    /*
-     * Find the existing command. An error is returned if cmdName can't
-     * be found.
-     */
-
-    cmd = Tcl_FindCommand(interp, oldName, (Tcl_Namespace *) NULL,
-	/*flags*/ 0);
-    cmdPtr = (Command *) cmd;
-    if (cmdPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't ",
-                ((newName == NULL)||(*newName == '\0'))? "delete":"rename",
-                " \"", oldName, "\": command doesn't exist", (char *) NULL);
-	return TCL_ERROR;
-    }
-    cmdNsPtr = cmdPtr->nsPtr;
-
-    /*
-     * If the new command name is NULL or empty, delete the command. Do this
-     * with Tcl_DeleteCommandFromToken, since we already have the command.
-     */
-    
-    if ((newName == NULL) || (*newName == '\0')) {
-	Tcl_DeleteCommandFromToken(interp, cmd);
-	return TCL_OK;
-    }
-
-    /*
-     * Make sure that the destination command does not already exist.
-     * The rename operation is like creating a command, so we should
-     * automatically create the containing namespaces just like
-     * Tcl_CreateCommand would.
-     */
-
-    TclGetNamespaceForQualName(interp, newName, (Namespace *) NULL,
-       CREATE_NS_IF_UNKNOWN, &newNsPtr, &dummy1, &dummy2, &newTail);
-
-    if ((newNsPtr == NULL) || (newTail == NULL)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		 "can't rename to \"", newName, "\": bad command name",
-    	    	 (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (Tcl_FindHashEntry(&newNsPtr->cmdTable, newTail) != NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		 "can't rename to \"", newName,
-		 "\": command already exists", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-
-    /*
-     * Warning: any changes done in the code here are likely
-     * to be needed in Tcl_HideCommand() code too.
-     * (until the common parts are extracted out)     --dl
-     */
-
-    /*
-     * Put the command in the new namespace so we can check for an alias
-     * loop. Since we are adding a new command to a namespace, we must
-     * handle any shadowing of the global commands that this might create.
-     */
-    
-    oldHPtr = cmdPtr->hPtr;
-    hPtr = Tcl_CreateHashEntry(&newNsPtr->cmdTable, newTail, &new);
-    Tcl_SetHashValue(hPtr, (ClientData) cmdPtr);
-    cmdPtr->hPtr = hPtr;
-    cmdPtr->nsPtr = newNsPtr;
-    TclResetShadowedCmdRefs(interp, cmdPtr);
-
-    /*
-     * Now check for an alias loop. If we detect one, put everything back
-     * the way it was and report the error.
-     */
-
-    result = TclPreventAliasLoop(interp, interp, (Tcl_Command) cmdPtr);
-    if (result != TCL_OK) {
-        Tcl_DeleteHashEntry(cmdPtr->hPtr);
-        cmdPtr->hPtr = oldHPtr;
-        cmdPtr->nsPtr = cmdNsPtr;
-        return result;
-    }
-
-    /*
-     * The new command name is okay, so remove the command from its
-     * current namespace. This is like deleting the command, so bump
-     * the cmdEpoch to invalidate any cached references to the command.
-     */
-    
-    Tcl_DeleteHashEntry(oldHPtr);
-    cmdPtr->cmdEpoch++;
-
-    /*
-     * If the command being renamed has a compile procedure, increment the
-     * interpreter's compileEpoch to invalidate its compiled code. This
-     * makes sure that we don't later try to execute old code compiled for
-     * the now-renamed command.
-     */
-
-    if (cmdPtr->compileProc != NULL) {
-	iPtr->compileEpoch++;
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetCommandInfo --
- *
- *	Modifies various information about a Tcl command. Note that
- *	this procedure will not change a command's namespace; use
- *	Tcl_RenameCommand to do that. Also, the isNativeObjectProc
- *	member of *infoPtr is ignored.
- *
- * Results:
- *	If cmdName exists in interp, then the information at *infoPtr
- *	is stored with the command in place of the current information
- *	and 1 is returned. If the command doesn't exist then 0 is
- *	returned. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_SetCommandInfo(interp, cmdName, infoPtr)
-    Tcl_Interp *interp;			/* Interpreter in which to look
-					 * for command. */
-    char *cmdName;			/* Name of desired command. */
-    Tcl_CmdInfo *infoPtr;		/* Where to store information about
-					 * command. */
-{
-    Tcl_Command cmd;
-    Command *cmdPtr;
-
-    cmd = Tcl_FindCommand(interp, cmdName, (Tcl_Namespace *) NULL,
-            /*flags*/ 0);
-    if (cmd == (Tcl_Command) NULL) {
-	return 0;
-    }
-
-    /*
-     * The isNativeObjectProc and nsPtr members of *infoPtr are ignored.
-     */
-    
-    cmdPtr = (Command *) cmd;
-    cmdPtr->proc = infoPtr->proc;
-    cmdPtr->clientData = infoPtr->clientData;
-    if (infoPtr->objProc == (Tcl_ObjCmdProc *) NULL) {
-	cmdPtr->objProc = TclInvokeStringCommand;
-	cmdPtr->objClientData = (ClientData) cmdPtr;
-    } else {
-	cmdPtr->objProc = infoPtr->objProc;
-	cmdPtr->objClientData = infoPtr->objClientData;
-    }
-    cmdPtr->deleteProc = infoPtr->deleteProc;
-    cmdPtr->deleteData = infoPtr->deleteData;
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCommandInfo --
- *
- *	Returns various information about a Tcl command.
- *
- * Results:
- *	If cmdName exists in interp, then *infoPtr is modified to
- *	hold information about cmdName and 1 is returned.  If the
- *	command doesn't exist then 0 is returned and *infoPtr isn't
- *	modified.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetCommandInfo(interp, cmdName, infoPtr)
-    Tcl_Interp *interp;			/* Interpreter in which to look
-					 * for command. */
-    char *cmdName;			/* Name of desired command. */
-    Tcl_CmdInfo *infoPtr;		/* Where to store information about
-					 * command. */
-{
-    Tcl_Command cmd;
-    Command *cmdPtr;
-
-    cmd = Tcl_FindCommand(interp, cmdName, (Tcl_Namespace *) NULL,
-            /*flags*/ 0);
-    if (cmd == (Tcl_Command) NULL) {
-	return 0;
-    }
-
-    /*
-     * Set isNativeObjectProc 1 if objProc was registered by a call to
-     * Tcl_CreateObjCommand. Otherwise set it to 0.
-     */
-
-    cmdPtr = (Command *) cmd;
-    infoPtr->isNativeObjectProc =
-	    (cmdPtr->objProc != TclInvokeStringCommand);
-    infoPtr->objProc = cmdPtr->objProc;
-    infoPtr->objClientData = cmdPtr->objClientData;
-    infoPtr->proc = cmdPtr->proc;
-    infoPtr->clientData = cmdPtr->clientData;
-    infoPtr->deleteProc = cmdPtr->deleteProc;
-    infoPtr->deleteData = cmdPtr->deleteData;
-    infoPtr->namespacePtr = (Tcl_Namespace *) cmdPtr->nsPtr;
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCommandName --
- *
- *	Given a token returned by Tcl_CreateCommand, this procedure
- *	returns the current name of the command (which may have changed
- *	due to renaming).
- *
- * Results:
- *	The return value is the name of the given command.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetCommandName(interp, command)
-    Tcl_Interp *interp;		/* Interpreter containing the command. */
-    Tcl_Command command;	/* Token for command returned by a previous
-				 * call to Tcl_CreateCommand. The command
-				 * must not have been deleted. */
-{
-    Command *cmdPtr = (Command *) command;
-
-    if ((cmdPtr == NULL) || (cmdPtr->hPtr == NULL)) {
-
-	/*
-	 * This should only happen if command was "created" after the
-	 * interpreter began to be deleted, so there isn't really any
-	 * command. Just return an empty string.
-	 */
-
-	return "";
-    }
-    return Tcl_GetHashKey(cmdPtr->hPtr->tablePtr, cmdPtr->hPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCommandFullName --
- *
- *	Given a token returned by, e.g., Tcl_CreateCommand or
- *	Tcl_FindCommand, this procedure appends to an object the command's
- *	full name, qualified by a sequence of parent namespace names. The
- *	command's fully-qualified name may have changed due to renaming.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The command's fully-qualified name is appended to the string
- *	representation of objPtr. 
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_GetCommandFullName(interp, command, objPtr)
-    Tcl_Interp *interp;		/* Interpreter containing the command. */
-    Tcl_Command command;	/* Token for command returned by a previous
-				 * call to Tcl_CreateCommand. The command
-				 * must not have been deleted. */
-    Tcl_Obj *objPtr;		/* Points to the object onto which the
-				 * command's full name is appended. */
-
-{
-    Interp *iPtr = (Interp *) interp;
-    register Command *cmdPtr = (Command *) command;
-    char *name;
-
-    /*
-     * Add the full name of the containing namespace, followed by the "::"
-     * separator, and the command name.
-     */
-
-    if (cmdPtr != NULL) {
-	if (cmdPtr->nsPtr != NULL) {
-	    Tcl_AppendToObj(objPtr, cmdPtr->nsPtr->fullName, -1);
-	    if (cmdPtr->nsPtr != iPtr->globalNsPtr) {
-		Tcl_AppendToObj(objPtr, "::", 2);
-	    }
-	}
-	if (cmdPtr->hPtr != NULL) {
-	    name = Tcl_GetHashKey(cmdPtr->hPtr->tablePtr, cmdPtr->hPtr);
-	    Tcl_AppendToObj(objPtr, name, -1);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteCommand --
- *
- *	Remove the given command from the given interpreter.
- *
- * Results:
- *	0 is returned if the command was deleted successfully.
- *	-1 is returned if there didn't exist a command by that name.
- *
- * Side effects:
- *	cmdName will no longer be recognized as a valid command for
- *	interp.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_DeleteCommand(interp, cmdName)
-    Tcl_Interp *interp;		/* Token for command interpreter (returned
-				 * by a previous Tcl_CreateInterp call). */
-    char *cmdName;		/* Name of command to remove. */
-{
-    Tcl_Command cmd;
-
-    /*
-     *  Find the desired command and delete it.
-     */
-
-    cmd = Tcl_FindCommand(interp, cmdName, (Tcl_Namespace *) NULL,
-            /*flags*/ 0);
-    if (cmd == (Tcl_Command) NULL) {
-	return -1;
-    }
-    return Tcl_DeleteCommandFromToken(interp, cmd);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteCommandFromToken --
- *
- *	Removes the given command from the given interpreter. This procedure
- *	resembles Tcl_DeleteCommand, but takes a Tcl_Command token instead
- *	of a command name for efficiency.
- *
- * Results:
- *	0 is returned if the command was deleted successfully.
- *	-1 is returned if there didn't exist a command by that name.
- *
- * Side effects:
- *	The command specified by "cmd" will no longer be recognized as a
- *	valid command for "interp".
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_DeleteCommandFromToken(interp, cmd)
-    Tcl_Interp *interp;		/* Token for command interpreter returned by
-				 * a previous call to Tcl_CreateInterp. */
-    Tcl_Command cmd;            /* Token for command to delete. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Command *cmdPtr = (Command *) cmd;
-    ImportRef *refPtr, *nextRefPtr;
-    Tcl_Command importCmd;
-
-    /*
-     * The code here is tricky.  We can't delete the hash table entry
-     * before invoking the deletion callback because there are cases
-     * where the deletion callback needs to invoke the command (e.g.
-     * object systems such as OTcl). However, this means that the
-     * callback could try to delete or rename the command. The deleted
-     * flag allows us to detect these cases and skip nested deletes.
-     */
-
-    if (cmdPtr->deleted) {
-	/*
-	 * Another deletion is already in progress.  Remove the hash
-	 * table entry now, but don't invoke a callback or free the
-	 * command structure.
-	 */
-
-        Tcl_DeleteHashEntry(cmdPtr->hPtr);
-	cmdPtr->hPtr = NULL;
-	return 0;
-    }
-
-    /*
-     * If the command being deleted has a compile procedure, increment the
-     * interpreter's compileEpoch to invalidate its compiled code. This
-     * makes sure that we don't later try to execute old code compiled with
-     * command-specific (i.e., inline) bytecodes for the now-deleted
-     * command. This field is checked in Tcl_EvalObj and ObjInterpProc, and
-     * code whose compilation epoch doesn't match is recompiled.
-     */
-
-    if (cmdPtr->compileProc != NULL) {
-        iPtr->compileEpoch++;
-    }
-
-    cmdPtr->deleted = 1;
-    if (cmdPtr->deleteProc != NULL) {
-	/*
-	 * Delete the command's client data. If this was an imported command
-	 * created when a command was imported into a namespace, this client
-	 * data will be a pointer to a ImportedCmdData structure describing
-	 * the "real" command that this imported command refers to.
-	 */
-	
-	(*cmdPtr->deleteProc)(cmdPtr->deleteData);
-    }
-
-    /*
-     * Bump the command epoch counter. This will invalidate all cached
-     * references that point to this command.
-     */
-    
-    cmdPtr->cmdEpoch++;
-
-    /*
-     * If this command was imported into other namespaces, then imported
-     * commands were created that refer back to this command. Delete these
-     * imported commands now.
-     */
-
-    for (refPtr = cmdPtr->importRefPtr;  refPtr != NULL;
-            refPtr = nextRefPtr) {
-	nextRefPtr = refPtr->nextPtr;
-	importCmd = (Tcl_Command) refPtr->importedCmdPtr;
-        Tcl_DeleteCommandFromToken(interp, importCmd);
-    }
-
-    /*
-     * Don't use hPtr to delete the hash entry here, because it's
-     * possible that the deletion callback renamed the command.
-     * Instead, use cmdPtr->hptr, and make sure that no-one else
-     * has already deleted the hash entry.
-     */
-
-    if (cmdPtr->hPtr != NULL) {
-	Tcl_DeleteHashEntry(cmdPtr->hPtr);
-    }
-
-    /*
-     * Mark the Command structure as no longer valid. This allows
-     * TclExecuteByteCode to recognize when a Command has logically been
-     * deleted and a pointer to this Command structure cached in a CmdName
-     * object is invalid. TclExecuteByteCode will look up the command again
-     * in the interpreter's command hashtable.
-     */
-
-    cmdPtr->objProc = NULL;
-
-    /*
-     * Now free the Command structure, unless there is another reference to
-     * it from a CmdName Tcl object in some ByteCode code sequence. In that
-     * case, delay the cleanup until all references are either discarded
-     * (when a ByteCode is freed) or replaced by a new reference (when a
-     * cached CmdName Command reference is found to be invalid and
-     * TclExecuteByteCode looks up the command in the command hashtable).
-     */
-    
-    TclCleanupCommand(cmdPtr);
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCleanupCommand --
- *
- *	This procedure frees up a Command structure unless it is still
- *	referenced from an interpreter's command hashtable or from a CmdName
- *	Tcl object representing the name of a command in a ByteCode
- *	instruction sequence. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory gets freed unless a reference to the Command structure still
- *	exists. In that case the cleanup is delayed until the command is
- *	deleted or when the last ByteCode referring to it is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclCleanupCommand(cmdPtr)
-    register Command *cmdPtr;	/* Points to the Command structure to
-				 * be freed. */
-{
-    cmdPtr->refCount--;
-    if (cmdPtr->refCount <= 0) {
-	ckfree((char *) cmdPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateMathFunc --
- *
- *	Creates a new math function for expressions in a given
- *	interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The function defined by "name" is created or redefined. If the
- *	function already exists then its definition is replaced; this
- *	includes the builtin functions. Redefining a builtin function forces
- *	all existing code to be invalidated since that code may be compiled
- *	using an instruction specific to the replaced function. In addition,
- *	redefioning a non-builtin function will force existing code to be
- *	invalidated if the number of arguments has changed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateMathFunc(interp, name, numArgs, argTypes, proc, clientData)
-    Tcl_Interp *interp;			/* Interpreter in which function is
-					 * to be available. */
-    char *name;				/* Name of function (e.g. "sin"). */
-    int numArgs;			/* Nnumber of arguments required by
-					 * function. */
-    Tcl_ValueType *argTypes;		/* Array of types acceptable for
-					 * each argument. */
-    Tcl_MathProc *proc;			/* Procedure that implements the
-					 * math function. */
-    ClientData clientData;		/* Additional value to pass to the
-					 * function. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashEntry *hPtr;
-    MathFunc *mathFuncPtr;
-    int new, i;
-
-    hPtr = Tcl_CreateHashEntry(&iPtr->mathFuncTable, name, &new);
-    if (new) {
-	Tcl_SetHashValue(hPtr, ckalloc(sizeof(MathFunc)));
-    }
-    mathFuncPtr = (MathFunc *) Tcl_GetHashValue(hPtr);
-
-    if (!new) {	
-	if (mathFuncPtr->builtinFuncIndex >= 0) {
-	    /*
-	     * We are redefining a builtin math function. Invalidate the
-             * interpreter's existing code by incrementing its
-             * compileEpoch member. This field is checked in Tcl_EvalObj
-             * and ObjInterpProc, and code whose compilation epoch doesn't
-             * match is recompiled. Newly compiled code will no longer
-             * treat the function as builtin.
-	     */
-
-	    iPtr->compileEpoch++;
-	} else {
-	    /*
-	     * A non-builtin function is being redefined. We must invalidate
-             * existing code if the number of arguments has changed. This
-	     * is because existing code was compiled assuming that number.
-	     */
-
-	    if (numArgs != mathFuncPtr->numArgs) {
-		iPtr->compileEpoch++;
-	    }
-	}
-    }
-    
-    mathFuncPtr->builtinFuncIndex = -1;	/* can't be a builtin function */
-    if (numArgs > MAX_MATH_ARGS) {
-	numArgs = MAX_MATH_ARGS;
-    }
-    mathFuncPtr->numArgs = numArgs;
-    for (i = 0;  i < numArgs;  i++) {
-	mathFuncPtr->argTypes[i] = argTypes[i];
-    }
-    mathFuncPtr->proc = proc;
-    mathFuncPtr->clientData = clientData;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalObjEx --
- *
- *	Execute Tcl commands stored in a Tcl object. These commands are
- *	compiled into bytecodes if necessary.
- *
- * Results:
- *	The return value is one of the return codes defined in tcl.h
- *	(such as TCL_OK), and the interpreter's result contains a value
- *	to supplement the return code.
- *
- * Side effects:
- *	The object is converted, if necessary, to a ByteCode object that
- *	holds the bytecode instructions for the commands. Executing the
- *	commands will almost certainly have side effects that depend
- *	on those commands.
- *
- *	Just as in Tcl_Eval, interp->termOffset is set to the offset of the
- *	last character executed in the objPtr's string.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EvalObjEx(interp, objPtr, flags)
-    Tcl_Interp *interp;			/* Token for command interpreter
-					 * (returned by a previous call to
-					 * Tcl_CreateInterp). */
-    register Tcl_Obj *objPtr;		/* Pointer to object containing
-					 * commands to execute. */
-    int flags;				/* Collection of OR-ed bits that
-					 * control the evaluation of the
-					 * script.  Supported values are
-					 * TCL_EVAL_GLOBAL and
-					 * TCL_EVAL_DIRECT. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    int evalFlags;			/* Interp->evalFlags value when the
-					 * procedure was called. */
-    register ByteCode* codePtr;		/* Tcl Internal type of bytecode. */
-    int oldCount = iPtr->cmdCount;	/* Used to tell whether any commands
-					 * at all were executed. */
-    int numSrcBytes;
-    int result;
-    CallFrame *savedVarFramePtr;	/* Saves old copy of iPtr->varFramePtr
-					 * in case TCL_EVAL_GLOBAL was set. */
-    Namespace *namespacePtr;
-
-    /*
-     * Prevent the object from being deleted as a side effect of evaling it.
-     */
-
-    Tcl_IncrRefCount(objPtr);
-
-    if ((iPtr->flags & USE_EVAL_DIRECT) || (flags & TCL_EVAL_DIRECT)) {
-	/*
-	 * We're not supposed to use the compiler or byte-code interpreter.
-	 * Let Tcl_EvalEx evaluate the command directly (and probably
-	 * more slowly).
-	 */
-
-	char *p;
-	int length;
-
-	p = Tcl_GetStringFromObj(objPtr, &length);
-	result = Tcl_EvalEx(interp, p, length, flags);
-	Tcl_DecrRefCount(objPtr);
-	return result;
-    }
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    if (flags & TCL_EVAL_GLOBAL) {
-	iPtr->varFramePtr = NULL;
-    }
-
-    /*
-     * Reset both the interpreter's string and object results and clear out
-     * any error information. This makes sure that we return an empty
-     * result if there are no commands in the command string.
-     */
-
-    Tcl_ResetResult(interp);
-
-    /*
-     * Check depth of nested calls to Tcl_Eval:  if this gets too large,
-     * it's probably because of an infinite loop somewhere.
-     */
-
-    iPtr->numLevels++;
-    if (iPtr->numLevels > iPtr->maxNestingDepth) {
-	iPtr->numLevels--;
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"too many nested calls to Tcl_EvalObj (infinite loop?)", -1); 
-	result = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * On the Mac, we will never reach the default recursion limit before
-     * blowing the stack. So we need to do a check here.
-     */
-    
-    if (TclpCheckStackSpace() == 0) {
-	/*NOTREACHED*/
-    	iPtr->numLevels--;
-    	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"too many nested calls to Tcl_EvalObj (infinite loop?)", -1);
-	result = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * If the interpreter has been deleted, return an error.
-     */
-    
-    if (iPtr->flags & DELETED) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "attempt to call eval in deleted interpreter", -1);
-	Tcl_SetErrorCode(interp, "CORE", "IDELETE",
-	        "attempt to call eval in deleted interpreter",
-		(char *) NULL);
-	result = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * Get the ByteCode from the object. If it exists, make sure it hasn't
-     * been invalidated by, e.g., someone redefining a command with a
-     * compile procedure (this might make the compiled code wrong). If
-     * necessary, convert the object to be a ByteCode object and compile it.
-     * Also, if the code was compiled in/for a different interpreter,
-     * or for a different namespace, or for the same namespace but
-     * with different name resolution rules, we recompile it.
-     *
-     * Precompiled objects, however, are immutable and therefore
-     * they are not recompiled, even if the epoch has changed.
-     */
-
-    if (iPtr->varFramePtr != NULL) {
-        namespacePtr = iPtr->varFramePtr->nsPtr;
-    } else {
-        namespacePtr = iPtr->globalNsPtr;
-    }
-
-    if (objPtr->typePtr == &tclByteCodeType) {
-	codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-	
-	if (((Interp *) *codePtr->interpHandle != iPtr)
-	        || (codePtr->compileEpoch != iPtr->compileEpoch)
-	        || (codePtr->nsPtr != namespacePtr)
-	        || (codePtr->nsEpoch != namespacePtr->resolverEpoch)) {
-            if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
-                if ((Interp *) *codePtr->interpHandle != iPtr) {
-                    panic("Tcl_EvalObj: compiled script jumped interps");
-                }
-	        codePtr->compileEpoch = iPtr->compileEpoch;
-            } else {
-                tclByteCodeType.freeIntRepProc(objPtr);
-            }
-	}
-    }
-    if (objPtr->typePtr != &tclByteCodeType) {
-	iPtr->errorLine = 1; 
-	result = tclByteCodeType.setFromAnyProc(interp, objPtr);
-	if (result != TCL_OK) {
-	    goto done;
-	}
-    } else {
-	codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-	if (((Interp *) *codePtr->interpHandle != iPtr)
-	        || (codePtr->compileEpoch != iPtr->compileEpoch)) {
-	    (*tclByteCodeType.freeIntRepProc)(objPtr);
-	    iPtr->errorLine = 1; 
-	    result = (*tclByteCodeType.setFromAnyProc)(interp, objPtr);
-	    if (result != TCL_OK) {
-		iPtr->numLevels--;
-		return result;
-	    }
-	}
-    }
-    codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-
-    /*
-     * Extract then reset the compilation flags in the interpreter.
-     * Resetting the flags must be done after any compilation.
-     */
-
-    evalFlags = iPtr->evalFlags;
-    iPtr->evalFlags = 0;
-
-    /*
-     * Execute the commands. If the code was compiled from an empty string,
-     * don't bother executing the code.
-     */
-
-    numSrcBytes = codePtr->numSrcBytes;
-    if ((numSrcBytes > 0) || (codePtr->flags & TCL_BYTECODE_PRECOMPILED)) {
-	/*
-	 * Increment the code's ref count while it is being executed. If
-	 * afterwards no references to it remain, free the code.
-	 */
-	
-	codePtr->refCount++;
-	result = TclExecuteByteCode(interp, codePtr);
-	codePtr->refCount--;
-	if (codePtr->refCount <= 0) {
-	    TclCleanupByteCode(codePtr);
-	}
-    } else {
-	result = TCL_OK;
-    }
-
-    /*
-     * If no commands at all were executed, check for asynchronous
-     * handlers so that they at least get one change to execute.
-     * This is needed to handle event loops written in Tcl with
-     * empty bodies.
-     */
-
-    if ((oldCount == iPtr->cmdCount) && Tcl_AsyncReady()) {
-	result = Tcl_AsyncInvoke(interp, result);
-    }
-
-    /*
-     * Update the interpreter's evaluation level count. If we are again at
-     * the top level, process any unusual return code returned by the
-     * evaluated code.
-     */
-
-    if (iPtr->numLevels == 1) {
-	if (result == TCL_RETURN) {
-	    result = TclUpdateReturnInfo(iPtr);
-	}
-	if ((result != TCL_OK) && (result != TCL_ERROR)
-		&& ((evalFlags & TCL_ALLOW_EXCEPTIONS) == 0)) {
-	    ProcessUnexpectedResult(interp, result);
-	    result = TCL_ERROR;
-	}
-    }
-
-    /*
-     * If an error occurred, record information about what was being
-     * executed when the error occurred.
-     */
-
-    if ((result == TCL_ERROR) && !(iPtr->flags & ERR_ALREADY_LOGGED)) {
-	RecordTracebackInfo(interp, objPtr, numSrcBytes);
-    }
-
-    /*
-     * Set the interpreter's termOffset member to the offset of the
-     * character just after the last one executed. We approximate the offset
-     * of the last character executed by using the number of characters
-     * compiled.
-     */
-
-    iPtr->termOffset = numSrcBytes;
-    iPtr->flags &= ~ERR_ALREADY_LOGGED;
-
-    done:
-    TclDecrRefCount(objPtr);
-    iPtr->varFramePtr = savedVarFramePtr; 
-    iPtr->numLevels--;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcessUnexpectedResult --
- *
- *	Procedure called by Tcl_EvalObj to set the interpreter's result
- *	value to an appropriate error message when the code it evaluates
- *	returns an unexpected result code (not TCL_OK and not TCL_ERROR) to
- *	the topmost evaluation level.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The interpreter result is set to an error message appropriate to
- *	the result code.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcessUnexpectedResult(interp, returnCode)
-    Tcl_Interp *interp;		/* The interpreter in which the unexpected
-				 * result code was returned. */
-    int returnCode;		/* The unexpected result code. */
-{
-    Tcl_ResetResult(interp);
-    if (returnCode == TCL_BREAK) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "invoked \"break\" outside of a loop", -1);
-    } else if (returnCode == TCL_CONTINUE) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"invoked \"continue\" outside of a loop", -1);
-    } else {
-        char buf[30 + TCL_INTEGER_SPACE];
-
-	sprintf(buf, "command returned bad code: %d", returnCode);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RecordTracebackInfo --
- *
- *	Procedure called by Tcl_EvalObj to record information about what was
- *	being executed when the error occurred.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Appends information about the script being evaluated to the
- *	interpreter's "errorInfo" variable.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RecordTracebackInfo(interp, objPtr, numSrcBytes)
-    Tcl_Interp *interp;		/* The interpreter in which the error
-				 * occurred. */
-    Tcl_Obj *objPtr;		/* Points to object containing script whose
-				 * evaluation resulted in an error. */
-    int numSrcBytes;		/* Number of bytes compiled in script. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char buf[200];
-    char *ellipsis, *bytes;
-    int length;
-
-    /*
-     * Decide how much of the command to print in the error message
-     * (up to a certain number of bytes).
-     */
-    
-    bytes = Tcl_GetStringFromObj(objPtr, &length);
-    length = TclMin(numSrcBytes, length);
-    
-    ellipsis = "";
-    if (length > 150) {
-	length = 150;
-	ellipsis = " ...";
-    }
-    
-    if (!(iPtr->flags & ERR_IN_PROGRESS)) {
-	sprintf(buf, "\n    while executing\n\"%.*s%s\"",
-		length, bytes, ellipsis);
-    } else {
-	sprintf(buf, "\n    invoked from within\n\"%.*s%s\"",
-		length, bytes, ellipsis);
-    }
-    Tcl_AddObjErrorInfo(interp, buf, -1);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_ExprLong, Tcl_ExprDouble, Tcl_ExprBoolean --
- *
- *	Procedures to evaluate an expression and return its value in a
- *	particular form.
- *
- * Results:
- *	Each of the procedures below returns a standard Tcl result. If an
- *	error occurs then an error message is left in the interp's result.
- *	Otherwise the value of the expression, in the appropriate form,
- *	is stored at *ptr. If the expression had a result that was
- *	incompatible with the desired form then an error is returned.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_ExprLong(interp, string, ptr)
-    Tcl_Interp *interp;		/* Context in which to evaluate the
-				 * expression. */
-    char *string;		/* Expression to evaluate. */
-    long *ptr;			/* Where to store result. */
-{
-    register Tcl_Obj *exprPtr;
-    Tcl_Obj *resultPtr;
-    int length = strlen(string);
-    int result = TCL_OK;
-
-    if (length > 0) {
-	exprPtr = Tcl_NewStringObj(string, length);
-	Tcl_IncrRefCount(exprPtr);
-	result = Tcl_ExprObj(interp, exprPtr, &resultPtr);
-	if (result == TCL_OK) {
-	    /*
-	     * Store an integer based on the expression result.
-	     */
-	    
-	    if (resultPtr->typePtr == &tclIntType) {
-		*ptr = resultPtr->internalRep.longValue;
-	    } else if (resultPtr->typePtr == &tclDoubleType) {
-		*ptr = (long) resultPtr->internalRep.doubleValue;
-	    } else {
-		Tcl_SetResult(interp,
-		        "expression didn't have numeric value", TCL_STATIC);
-		result = TCL_ERROR;
-	    }
-	    Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-	} else {
-	    /*
-	     * Move the interpreter's object result to the string result, 
-	     * then reset the object result.
-	     */
-
-	    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	            TCL_VOLATILE);
-	}
-	Tcl_DecrRefCount(exprPtr);  /* discard the expression object */	
-    } else {
-	/*
-	 * An empty string. Just set the result integer to 0.
-	 */
-	
-	*ptr = 0;
-    }
-    return result;
-}
-
-int
-Tcl_ExprDouble(interp, string, ptr)
-    Tcl_Interp *interp;		/* Context in which to evaluate the
-				 * expression. */
-    char *string;		/* Expression to evaluate. */
-    double *ptr;		/* Where to store result. */
-{
-    register Tcl_Obj *exprPtr;
-    Tcl_Obj *resultPtr;
-    int length = strlen(string);
-    int result = TCL_OK;
-
-    if (length > 0) {
-	exprPtr = Tcl_NewStringObj(string, length);
-	Tcl_IncrRefCount(exprPtr);
-	result = Tcl_ExprObj(interp, exprPtr, &resultPtr);
-	if (result == TCL_OK) {
-	    /*
-	     * Store a double  based on the expression result.
-	     */
-	    
-	    if (resultPtr->typePtr == &tclIntType) {
-		*ptr = (double) resultPtr->internalRep.longValue;
-	    } else if (resultPtr->typePtr == &tclDoubleType) {
-		*ptr = resultPtr->internalRep.doubleValue;
-	    } else {
-		Tcl_SetResult(interp,
-		        "expression didn't have numeric value", TCL_STATIC);
-		result = TCL_ERROR;
-	    }
-	    Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-	} else {
-	    /*
-	     * Move the interpreter's object result to the string result, 
-	     * then reset the object result.
-	     */
-
-	    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	            TCL_VOLATILE);
-	}
-	Tcl_DecrRefCount(exprPtr);  /* discard the expression object */
-    } else {
-	/*
-	 * An empty string. Just set the result double to 0.0.
-	 */
-	
-	*ptr = 0.0;
-    }
-    return result;
-}
-
-int
-Tcl_ExprBoolean(interp, string, ptr)
-    Tcl_Interp *interp;		/* Context in which to evaluate the
-			         * expression. */
-    char *string;		/* Expression to evaluate. */
-    int *ptr;			/* Where to store 0/1 result. */
-{
-    register Tcl_Obj *exprPtr;
-    Tcl_Obj *resultPtr;
-    int length = strlen(string);
-    int result = TCL_OK;
-
-    if (length > 0) {
-	exprPtr = Tcl_NewStringObj(string, length);
-	Tcl_IncrRefCount(exprPtr);
-	result = Tcl_ExprObj(interp, exprPtr, &resultPtr);
-	if (result == TCL_OK) {
-	    /*
-	     * Store a boolean based on the expression result.
-	     */
-	    
-	    if (resultPtr->typePtr == &tclIntType) {
-		*ptr = (resultPtr->internalRep.longValue != 0);
-	    } else if (resultPtr->typePtr == &tclDoubleType) {
-		*ptr = (resultPtr->internalRep.doubleValue != 0.0);
-	    } else {
-		result = Tcl_GetBooleanFromObj(interp, resultPtr, ptr);
-	    }
-	    Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-	}
-	if (result != TCL_OK) {
-	    /*
-	     * Move the interpreter's object result to the string result, 
-	     * then reset the object result.
-	     */
-
-	    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	            TCL_VOLATILE);
-	}
-	Tcl_DecrRefCount(exprPtr); /* discard the expression object */
-    } else {
-	/*
-	 * An empty string. Just set the result boolean to 0 (false).
-	 */
-	
-	*ptr = 0;
-    }
-    return result;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_ExprLongObj, Tcl_ExprDoubleObj, Tcl_ExprBooleanObj --
- *
- *	Procedures to evaluate an expression in an object and return its
- *	value in a particular form.
- *
- * Results:
- *	Each of the procedures below returns a standard Tcl result
- *	object. If an error occurs then an error message is left in the
- *	interpreter's result. Otherwise the value of the expression, in the
- *	appropriate form, is stored at *ptr. If the expression had a result
- *	that was incompatible with the desired form then an error is
- *	returned.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------
- */
-
-int
-Tcl_ExprLongObj(interp, objPtr, ptr)
-    Tcl_Interp *interp;			/* Context in which to evaluate the
-					 * expression. */
-    register Tcl_Obj *objPtr;		/* Expression to evaluate. */
-    long *ptr;				/* Where to store long result. */
-{
-    Tcl_Obj *resultPtr;
-    int result;
-
-    result = Tcl_ExprObj(interp, objPtr, &resultPtr);
-    if (result == TCL_OK) {
-	if (resultPtr->typePtr == &tclIntType) {
-	    *ptr = resultPtr->internalRep.longValue;
-	} else if (resultPtr->typePtr == &tclDoubleType) {
-	    *ptr = (long) resultPtr->internalRep.doubleValue;
-	} else {
-	    result = Tcl_GetLongFromObj(interp, resultPtr, ptr);
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	}
-	Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-    }
-    return result;
-}
-
-int
-Tcl_ExprDoubleObj(interp, objPtr, ptr)
-    Tcl_Interp *interp;			/* Context in which to evaluate the
-					 * expression. */
-    register Tcl_Obj *objPtr;		/* Expression to evaluate. */
-    double *ptr;			/* Where to store double result. */
-{
-    Tcl_Obj *resultPtr;
-    int result;
-
-    result = Tcl_ExprObj(interp, objPtr, &resultPtr);
-    if (result == TCL_OK) {
-	if (resultPtr->typePtr == &tclIntType) {
-	    *ptr = (double) resultPtr->internalRep.longValue;
-	} else if (resultPtr->typePtr == &tclDoubleType) {
-	    *ptr = resultPtr->internalRep.doubleValue;
-	} else {
-	    result = Tcl_GetDoubleFromObj(interp, resultPtr, ptr);
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	}
-	Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-    }
-    return result;
-}
-
-int
-Tcl_ExprBooleanObj(interp, objPtr, ptr)
-    Tcl_Interp *interp;			/* Context in which to evaluate the
-					 * expression. */
-    register Tcl_Obj *objPtr;		/* Expression to evaluate. */
-    int *ptr;				/* Where to store 0/1 result. */
-{
-    Tcl_Obj *resultPtr;
-    int result;
-
-    result = Tcl_ExprObj(interp, objPtr, &resultPtr);
-    if (result == TCL_OK) {
-	if (resultPtr->typePtr == &tclIntType) {
-	    *ptr = (resultPtr->internalRep.longValue != 0);
-	} else if (resultPtr->typePtr == &tclDoubleType) {
-	    *ptr = (resultPtr->internalRep.doubleValue != 0.0);
-	} else {
-	    result = Tcl_GetBooleanFromObj(interp, resultPtr, ptr);
-	}
-	Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInvoke --
- *
- *	Invokes a Tcl command, given an argv/argc, from either the
- *	exposed or the hidden sets of commands in the given interpreter.
- *	NOTE: The command is invoked in the current stack frame of
- *	the interpreter, thus it can modify local variables.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclInvoke(interp, argc, argv, flags)
-    Tcl_Interp *interp;		/* Where to invoke the command. */
-    int argc;			/* Count of args. */
-    register char **argv;	/* The arg strings; argv[0] is the name of
-                                 * the command to invoke. */
-    int flags;			/* Combination of flags controlling the
-				 * call: TCL_INVOKE_HIDDEN and
-				 * TCL_INVOKE_NO_UNKNOWN. */
-{
-    register Tcl_Obj *objPtr;
-    register int i;
-    int length, result;
-
-    /*
-     * This procedure generates an objv array for object arguments that hold
-     * the argv strings. It starts out with stack-allocated space but uses
-     * dynamically-allocated storage if needed.
-     */
-
-#define NUM_ARGS 20
-    Tcl_Obj *(objStorage[NUM_ARGS]);
-    register Tcl_Obj **objv = objStorage;
-
-    /*
-     * Create the object argument array "objv". Make sure objv is large
-     * enough to hold the objc arguments plus 1 extra for the zero
-     * end-of-objv word.
-     */
-
-    if ((argc + 1) > NUM_ARGS) {
-	objv = (Tcl_Obj **)
-	    ckalloc((unsigned)(argc + 1) * sizeof(Tcl_Obj *));
-    }
-
-    for (i = 0;  i < argc;  i++) {
-	length = strlen(argv[i]);
-	objv[i] = Tcl_NewStringObj(argv[i], length);
-	Tcl_IncrRefCount(objv[i]);
-    }
-    objv[argc] = 0;
-
-    /*
-     * Use TclObjInterpProc to actually invoke the command.
-     */
-
-    result = TclObjInvoke(interp, argc, objv, flags);
-
-    /*
-     * Move the interpreter's object result to the string result, 
-     * then reset the object result.
-     */
-    
-    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	    TCL_VOLATILE);
-
-    /*
-     * Decrement the ref counts on the objv elements since we are done
-     * with them.
-     */
-
-    for (i = 0;  i < argc;  i++) {
-	objPtr = objv[i];
-	Tcl_DecrRefCount(objPtr);
-    }
-    
-    /*
-     * Free the objv array if malloc'ed storage was used.
-     */
-
-    if (objv != objStorage) {
-	ckfree((char *) objv);
-    }
-    return result;
-#undef NUM_ARGS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGlobalInvoke --
- *
- *	Invokes a Tcl command, given an argv/argc, from either the
- *	exposed or hidden sets of commands in the given interpreter.
- *	NOTE: The command is invoked in the global stack frame of
- *	the interpreter, thus it cannot see any current state on
- *	the stack for that interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGlobalInvoke(interp, argc, argv, flags)
-    Tcl_Interp *interp;		/* Where to invoke the command. */
-    int argc;			/* Count of args. */
-    register char **argv;	/* The arg strings; argv[0] is the name of
-                                 * the command to invoke. */
-    int flags;			/* Combination of flags controlling the
-				 * call: TCL_INVOKE_HIDDEN and
-				 * TCL_INVOKE_NO_UNKNOWN. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    int result;
-    CallFrame *savedVarFramePtr;
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    iPtr->varFramePtr = NULL;
-    result = TclInvoke(interp, argc, argv, flags);
-    iPtr->varFramePtr = savedVarFramePtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclObjInvokeGlobal --
- *
- *	Object version: Invokes a Tcl command, given an objv/objc, from
- *	either the exposed or hidden set of commands in the given
- *	interpreter.
- *	NOTE: The command is invoked in the global stack frame of the
- *	interpreter, thus it cannot see any current state on the
- *	stack of that interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjInvokeGlobal(interp, objc, objv, flags)
-    Tcl_Interp *interp;		/* Interpreter in which command is to be
-				 * invoked. */
-    int objc;			/* Count of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects; objv[0] points to the
-				 * name of the command to invoke. */
-    int flags;			/* Combination of flags controlling the
-				 * call: TCL_INVOKE_HIDDEN,
-				 * TCL_INVOKE_NO_UNKNOWN, or
-				 * TCL_INVOKE_NO_TRACEBACK. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    int result;
-    CallFrame *savedVarFramePtr;
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    iPtr->varFramePtr = NULL;
-    result = TclObjInvoke(interp, objc, objv, flags);
-    iPtr->varFramePtr = savedVarFramePtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclObjInvoke --
- *
- *	Invokes a Tcl command, given an objv/objc, from either the
- *	exposed or the hidden sets of commands in the given interpreter.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjInvoke(interp, objc, objv, flags)
-    Tcl_Interp *interp;		/* Interpreter in which command is to be
-				 * invoked. */
-    int objc;			/* Count of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects; objv[0] points to the
-				 * name of the command to invoke. */
-    int flags;			/* Combination of flags controlling the
-				 * call: TCL_INVOKE_HIDDEN,
-				 * TCL_INVOKE_NO_UNKNOWN, or
-				 * TCL_INVOKE_NO_TRACEBACK. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    Tcl_HashTable *hTblPtr;	/* Table of hidden commands. */
-    char *cmdName;		/* Name of the command from objv[0]. */
-    register Tcl_HashEntry *hPtr;
-    Tcl_Command cmd;
-    Command *cmdPtr;
-    int localObjc;		/* Used to invoke "unknown" if the */
-    Tcl_Obj **localObjv = NULL;	/* command is not found. */
-    register int i;
-    int length, result;
-    char *bytes;
-
-    if (interp == (Tcl_Interp *) NULL) {
-        return TCL_ERROR;
-    }
-
-    if ((objc < 1) || (objv == (Tcl_Obj **) NULL)) {
-        Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "illegal argument vector", -1);
-        return TCL_ERROR;
-    }
-
-    cmdName = Tcl_GetString(objv[0]);
-    if (flags & TCL_INVOKE_HIDDEN) {
-        /*
-         * We never invoke "unknown" for hidden commands.
-         */
-        
-	hPtr = NULL;
-        hTblPtr = ((Interp *) interp)->hiddenCmdTablePtr;
-        if (hTblPtr != NULL) {
-	    hPtr = Tcl_FindHashEntry(hTblPtr, cmdName);
-	}
-	if (hPtr == NULL) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		     "invalid hidden command name \"", cmdName, "\"",
-		     (char *) NULL);
-            return TCL_ERROR;
-        }
-	cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-    } else {
-	cmdPtr = NULL;
-	cmd = Tcl_FindCommand(interp, cmdName,
-	        (Tcl_Namespace *) NULL, /*flags*/ TCL_GLOBAL_ONLY);
-        if (cmd != (Tcl_Command) NULL) {
-	    cmdPtr = (Command *) cmd;
-        }
-	if (cmdPtr == NULL) {
-            if (!(flags & TCL_INVOKE_NO_UNKNOWN)) {
-		cmd = Tcl_FindCommand(interp, "unknown",
-                        (Tcl_Namespace *) NULL, /*flags*/ TCL_GLOBAL_ONLY);
-		if (cmd != (Tcl_Command) NULL) {
-	            cmdPtr = (Command *) cmd;
-                }
-                if (cmdPtr != NULL) {
-                    localObjc = (objc + 1);
-                    localObjv = (Tcl_Obj **)
-			ckalloc((unsigned) (sizeof(Tcl_Obj *) * localObjc));
-		    localObjv[0] = Tcl_NewStringObj("unknown", -1);
-		    Tcl_IncrRefCount(localObjv[0]);
-                    for (i = 0;  i < objc;  i++) {
-                        localObjv[i+1] = objv[i];
-                    }
-                    objc = localObjc;
-                    objv = localObjv;
-                }
-            }
-
-            /*
-             * Check again if we found the command. If not, "unknown" is
-             * not present and we cannot help, or the caller said not to
-             * call "unknown" (they specified TCL_INVOKE_NO_UNKNOWN).
-             */
-
-            if (cmdPtr == NULL) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"invalid command name \"",  cmdName, "\"", 
-			 (char *) NULL);
-                return TCL_ERROR;
-            }
-        }
-    }
-
-    /*
-     * Invoke the command procedure. First reset the interpreter's string
-     * and object results to their default empty values since they could
-     * have gotten changed by earlier invocations.
-     */
-
-    Tcl_ResetResult(interp);
-    iPtr->cmdCount++;
-    result = (*cmdPtr->objProc)(cmdPtr->objClientData, interp, objc, objv);
-
-    /*
-     * If an error occurred, record information about what was being
-     * executed when the error occurred.
-     */
-
-    if ((result == TCL_ERROR)
-	    && ((flags & TCL_INVOKE_NO_TRACEBACK) == 0)
-	    && ((iPtr->flags & ERR_ALREADY_LOGGED) == 0)) {
-        Tcl_DString ds;
-        
-        Tcl_DStringInit(&ds);
-        if (!(iPtr->flags & ERR_IN_PROGRESS)) {
-            Tcl_DStringAppend(&ds, "\n    while invoking\n\"", -1);
-        } else {
-            Tcl_DStringAppend(&ds, "\n    invoked from within\n\"", -1);
-        }
-        for (i = 0;  i < objc;  i++) {
-	    bytes = Tcl_GetStringFromObj(objv[i], &length);
-            Tcl_DStringAppend(&ds, bytes, length);
-            if (i < (objc - 1)) {
-                Tcl_DStringAppend(&ds, " ", -1);
-            } else if (Tcl_DStringLength(&ds) > 100) {
-                Tcl_DStringSetLength(&ds, 100);
-                Tcl_DStringAppend(&ds, "...", -1);
-                break;
-            }
-        }
-        
-        Tcl_DStringAppend(&ds, "\"", -1);
-        Tcl_AddObjErrorInfo(interp, Tcl_DStringValue(&ds), -1);
-        Tcl_DStringFree(&ds);
-	iPtr->flags &= ~ERR_ALREADY_LOGGED;
-    }
-
-    /*
-     * Free any locally allocated storage used to call "unknown".
-     */
-
-    if (localObjv != (Tcl_Obj **) NULL) {
-	Tcl_DecrRefCount(localObjv[0]);
-        ckfree((char *) localObjv);
-    }
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_ExprString --
- *
- *	Evaluate an expression in a string and return its value in string
- *	form.
- *
- * Results:
- *	A standard Tcl result. If the result is TCL_OK, then the interp's
- *	result is set to the string value of the expression. If the result
- *	is TCL_ERROR, then the interp's result contains an error message.
- *
- * Side effects:
- *	A Tcl object is allocated to hold a copy of the expression string.
- *	This expression object is passed to Tcl_ExprObj and then
- *	deallocated.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_ExprString(interp, string)
-    Tcl_Interp *interp;		/* Context in which to evaluate the
-				 * expression. */
-    char *string;		/* Expression to evaluate. */
-{
-    register Tcl_Obj *exprPtr;
-    Tcl_Obj *resultPtr;
-    int length = strlen(string);
-    char buf[TCL_DOUBLE_SPACE];
-    int result = TCL_OK;
-
-    if (length > 0) {
-	TclNewObj(exprPtr);
-	TclInitStringRep(exprPtr, string, length);
-	Tcl_IncrRefCount(exprPtr);
-
-	result = Tcl_ExprObj(interp, exprPtr, &resultPtr);
-	if (result == TCL_OK) {
-	    /*
-	     * Set the interpreter's string result from the result object.
-	     */
-	    
-	    if (resultPtr->typePtr == &tclIntType) {
-		sprintf(buf, "%ld", resultPtr->internalRep.longValue);
-		Tcl_SetResult(interp, buf, TCL_VOLATILE);
-	    } else if (resultPtr->typePtr == &tclDoubleType) {
-		Tcl_PrintDouble((Tcl_Interp *) NULL,
-		        resultPtr->internalRep.doubleValue, buf);
-		Tcl_SetResult(interp, buf, TCL_VOLATILE);
-	    } else {
-		/*
-		 * Set interpreter's string result from the result object.
-		 */
-	    
-		Tcl_SetResult(interp, TclGetString(resultPtr),
-		        TCL_VOLATILE);
-	    }
-	    Tcl_DecrRefCount(resultPtr);  /* discard the result object */
-	} else {
-	    /*
-	     * Move the interpreter's object result to the string result, 
-	     * then reset the object result.
-	     */
-	    
-	    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	            TCL_VOLATILE);
-	}
-	Tcl_DecrRefCount(exprPtr); /* discard the expression object */
-    } else {
-	/*
-	 * An empty string. Just set the interpreter's result to 0.
-	 */
-	
-	Tcl_SetResult(interp, "0", TCL_VOLATILE);
-    }
-    return result;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_ExprObj --
- *
- *	Evaluate an expression in a Tcl_Obj.
- *
- * Results:
- *	A standard Tcl object result. If the result is other than TCL_OK,
- *	then the interpreter's result contains an error message. If the
- *	result is TCL_OK, then a pointer to the expression's result value
- *	object is stored in resultPtrPtr. In that case, the object's ref
- *	count is incremented to reflect the reference returned to the
- *	caller; the caller is then responsible for the resulting object
- *	and must, for example, decrement the ref count when it is finished
- *	with the object.
- *
- * Side effects:
- *	Any side effects caused by subcommands in the expression, if any.
- *	The interpreter result is not modified unless there is an error.
- *
- *--------------------------------------------------------------
- */
-
-int
-Tcl_ExprObj(interp, objPtr, resultPtrPtr)
-    Tcl_Interp *interp;		/* Context in which to evaluate the
-				 * expression. */
-    register Tcl_Obj *objPtr;	/* Points to Tcl object containing
-				 * expression to evaluate. */
-    Tcl_Obj **resultPtrPtr;	/* Where the Tcl_Obj* that is the expression
-				 * result is stored if no errors occur. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CompileEnv compEnv;		/* Compilation environment structure
-				 * allocated in frame. */
-    LiteralTable *localTablePtr = &(compEnv.localLitTable);
-    register ByteCode *codePtr = NULL;
-    				/* Tcl Internal type of bytecode.
-				 * Initialized to avoid compiler warning. */
-    AuxData *auxDataPtr;
-    LiteralEntry *entryPtr;
-    Tcl_Obj *saveObjPtr;
-    char *string;
-    int length, i, result;
-
-    /*
-     * First handle some common expressions specially.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-    if (length == 1) {
-	if (*string == '0') {
-	    *resultPtrPtr = Tcl_NewLongObj(0);
-	    Tcl_IncrRefCount(*resultPtrPtr);
-	    return TCL_OK;
-	} else if (*string == '1') {
-	    *resultPtrPtr = Tcl_NewLongObj(1);
-	    Tcl_IncrRefCount(*resultPtrPtr);
-	    return TCL_OK;
-	}
-    } else if ((length == 2) && (*string == '!')) {
-	if (*(string+1) == '0') {
-	    *resultPtrPtr = Tcl_NewLongObj(1);
-	    Tcl_IncrRefCount(*resultPtrPtr);
-	    return TCL_OK;
-	} else if (*(string+1) == '1') {
-	    *resultPtrPtr = Tcl_NewLongObj(0);
-	    Tcl_IncrRefCount(*resultPtrPtr);
-	    return TCL_OK;
-	}
-    }
-
-    /*
-     * Get the ByteCode from the object. If it exists, make sure it hasn't
-     * been invalidated by, e.g., someone redefining a command with a
-     * compile procedure (this might make the compiled code wrong). If
-     * necessary, convert the object to be a ByteCode object and compile it.
-     * Also, if the code was compiled in/for a different interpreter, we
-     * recompile it.
-     *
-     * Precompiled expressions, however, are immutable and therefore
-     * they are not recompiled, even if the epoch has changed.
-     *
-     */
-
-    if (objPtr->typePtr == &tclByteCodeType) {
-	codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-	if (((Interp *) *codePtr->interpHandle != iPtr)
-	        || (codePtr->compileEpoch != iPtr->compileEpoch)) {
-            if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
-                if ((Interp *) *codePtr->interpHandle != iPtr) {
-                    panic("Tcl_ExprObj: compiled expression jumped interps");
-                }
-	        codePtr->compileEpoch = iPtr->compileEpoch;
-            } else {
-                (*tclByteCodeType.freeIntRepProc)(objPtr);
-                objPtr->typePtr = (Tcl_ObjType *) NULL;
-            }
-	}
-    }
-    if (objPtr->typePtr != &tclByteCodeType) {
-	TclInitCompileEnv(interp, &compEnv, string, length);
-	result = TclCompileExpr(interp, string, length, &compEnv);
-
-	/*
-	 * Free the compilation environment's literal table bucket array if
-	 * it was dynamically allocated. 
-	 */
-
-	if (localTablePtr->buckets != localTablePtr->staticBuckets) {
-	    ckfree((char *) localTablePtr->buckets);
-	}
-    
-	if (result != TCL_OK) {
-	    /*
-	     * Compilation errors. Free storage allocated for compilation.
-	     */
-
-#ifdef TCL_COMPILE_DEBUG
-	    TclVerifyLocalLiteralTable(&compEnv);
-#endif /*TCL_COMPILE_DEBUG*/
-	    entryPtr = compEnv.literalArrayPtr;
-	    for (i = 0;  i < compEnv.literalArrayNext;  i++) {
-		TclReleaseLiteral(interp, entryPtr->objPtr);
-		entryPtr++;
-	    }
-#ifdef TCL_COMPILE_DEBUG
-	    TclVerifyGlobalLiteralTable(iPtr);
-#endif /*TCL_COMPILE_DEBUG*/
-    
-	    auxDataPtr = compEnv.auxDataArrayPtr;
-	    for (i = 0;  i < compEnv.auxDataArrayNext;  i++) {
-		if (auxDataPtr->type->freeProc != NULL) {
-		    auxDataPtr->type->freeProc(auxDataPtr->clientData);
-		}
-		auxDataPtr++;
-	    }
-	    TclFreeCompileEnv(&compEnv);
-	    return result;
-	}
-
-	/*
-	 * Successful compilation. If the expression yielded no
-	 * instructions, push an zero object as the expression's result.
-	 */
-	    
-	if (compEnv.codeNext == compEnv.codeStart) {
-	    TclEmitPush(TclRegisterLiteral(&compEnv, "0", 1, /*onHeap*/ 0),
-	            &compEnv);
-	}
-	    
-	/*
-	 * Add a "done" instruction as the last instruction and change the
-	 * object into a ByteCode object. Ownership of the literal objects
-	 * and aux data items is given to the ByteCode object.
-	 */
-
-	compEnv.numSrcBytes = iPtr->termOffset;
-	TclEmitOpcode(INST_DONE, &compEnv);
-	TclInitByteCodeObj(objPtr, &compEnv);
-	TclFreeCompileEnv(&compEnv);
-	codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-#ifdef TCL_COMPILE_DEBUG
-	if (tclTraceCompile == 2) {
-	    TclPrintByteCodeObj(interp, objPtr);
-	}
-#endif /* TCL_COMPILE_DEBUG */
-    }
-
-    /*
-     * Execute the expression after first saving the interpreter's result.
-     */
-    
-    saveObjPtr = Tcl_GetObjResult(interp);
-    Tcl_IncrRefCount(saveObjPtr);
-    Tcl_ResetResult(interp);
-
-    /*
-     * Increment the code's ref count while it is being executed. If
-     * afterwards no references to it remain, free the code.
-     */
-    
-    codePtr->refCount++;
-    result = TclExecuteByteCode(interp, codePtr);
-    codePtr->refCount--;
-    if (codePtr->refCount <= 0) {
-	TclCleanupByteCode(codePtr);
-	objPtr->typePtr = NULL;
-	objPtr->internalRep.otherValuePtr = NULL;
-    }
-    
-    /*
-     * If the expression evaluated successfully, store a pointer to its
-     * value object in resultPtrPtr then restore the old interpreter result.
-     * We increment the object's ref count to reflect the reference that we
-     * are returning to the caller. We also decrement the ref count of the
-     * interpreter's result object after calling Tcl_SetResult since we
-     * next store into that field directly.
-     */
-    
-    if (result == TCL_OK) {
-	*resultPtrPtr = iPtr->objResultPtr;
-	Tcl_IncrRefCount(iPtr->objResultPtr);
-	
-	Tcl_SetObjResult(interp, saveObjPtr);
-    }
-    Tcl_DecrRefCount(saveObjPtr);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateTrace --
- *
- *	Arrange for a procedure to be called to trace command execution.
- *
- * Results:
- *	The return value is a token for the trace, which may be passed
- *	to Tcl_DeleteTrace to eliminate the trace.
- *
- * Side effects:
- *	From now on, proc will be called just before a command procedure
- *	is called to execute a Tcl command.  Calls to proc will have the
- *	following form:
- *
- *	void
- *	proc(clientData, interp, level, command, cmdProc, cmdClientData,
- *		argc, argv)
- *	    ClientData clientData;
- *	    Tcl_Interp *interp;
- *	    int level;
- *	    char *command;
- *	    int (*cmdProc)();
- *	    ClientData cmdClientData;
- *	    int argc;
- *	    char **argv;
- *	{
- *	}
- *
- *	The clientData and interp arguments to proc will be the same
- *	as the corresponding arguments to this procedure.  Level gives
- *	the nesting level of command interpretation for this interpreter
- *	(0 corresponds to top level).  Command gives the ASCII text of
- *	the raw command, cmdProc and cmdClientData give the procedure that
- *	will be called to process the command and the ClientData value it
- *	will receive, and argc and argv give the arguments to the
- *	command, after any argument parsing and substitution.  Proc
- *	does not return a value.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Trace
-Tcl_CreateTrace(interp, level, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter in which to create trace. */
-    int level;			/* Only call proc for commands at nesting
-				 * level<=argument level (1=>top level). */
-    Tcl_CmdTraceProc *proc;	/* Procedure to call before executing each
-				 * command. */
-    ClientData clientData;	/* Arbitrary value word to pass to proc. */
-{
-    register Trace *tracePtr;
-    register Interp *iPtr = (Interp *) interp;
-
-    /*
-     * Invalidate existing compiled code for this interpreter and arrange
-     * (by setting the DONT_COMPILE_CMDS_INLINE flag) that when compiling
-     * new code, no commands will be compiled inline (i.e., into an inline
-     * sequence of instructions). We do this because commands that were
-     * compiled inline will never result in a command trace being called.
-     */
-
-    iPtr->compileEpoch++;
-    iPtr->flags |= DONT_COMPILE_CMDS_INLINE;
-
-    tracePtr = (Trace *) ckalloc(sizeof(Trace));
-    tracePtr->level = level;
-    tracePtr->proc = proc;
-    tracePtr->clientData = clientData;
-    tracePtr->nextPtr = iPtr->tracePtr;
-    iPtr->tracePtr = tracePtr;
-
-    return (Tcl_Trace) tracePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteTrace --
- *
- *	Remove a trace.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	From now on there will be no more calls to the procedure given
- *	in trace.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteTrace(interp, trace)
-    Tcl_Interp *interp;		/* Interpreter that contains trace. */
-    Tcl_Trace trace;		/* Token for trace (returned previously by
-				 * Tcl_CreateTrace). */
-{
-    register Interp *iPtr = (Interp *) interp;
-    register Trace *tracePtr = (Trace *) trace;
-    register Trace *tracePtr2;
-
-    if (iPtr->tracePtr == tracePtr) {
-	iPtr->tracePtr = tracePtr->nextPtr;
-	ckfree((char *) tracePtr);
-    } else {
-	for (tracePtr2 = iPtr->tracePtr; tracePtr2 != NULL;
-		tracePtr2 = tracePtr2->nextPtr) {
-	    if (tracePtr2->nextPtr == tracePtr) {
-		tracePtr2->nextPtr = tracePtr->nextPtr;
-		ckfree((char *) tracePtr);
-		break;
-	    }
-	}
-    }
-
-    if (iPtr->tracePtr == NULL) {
-	/*
-	 * When compiling new code, allow commands to be compiled inline.
-	 */
-
-	iPtr->flags &= ~DONT_COMPILE_CMDS_INLINE;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AddErrorInfo --
- *
- *	Add information to the "errorInfo" variable that describes the
- *	current error.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The contents of message are added to the "errorInfo" variable.
- *	If Tcl_Eval has been called since the current value of errorInfo
- *	was set, errorInfo is cleared before adding the new message.
- *	If we are just starting to log an error, errorInfo is initialized
- *	from the error message in the interpreter's result.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AddErrorInfo(interp, message)
-    Tcl_Interp *interp;		/* Interpreter to which error information
-				 * pertains. */
-    CONST char *message;	/* Message to record. */
-{
-    Tcl_AddObjErrorInfo(interp, message, -1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AddObjErrorInfo --
- *
- *	Add information to the "errorInfo" variable that describes the
- *	current error. This routine differs from Tcl_AddErrorInfo by
- *	taking a byte pointer and length.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	"length" bytes from "message" are added to the "errorInfo" variable.
- *	If "length" is negative, use bytes up to the first NULL byte.
- *	If Tcl_EvalObj has been called since the current value of errorInfo
- *	was set, errorInfo is cleared before adding the new message.
- *	If we are just starting to log an error, errorInfo is initialized
- *	from the error message in the interpreter's result.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AddObjErrorInfo(interp, message, length)
-    Tcl_Interp *interp;		/* Interpreter to which error information
-				 * pertains. */
-    CONST char *message;	/* Points to the first byte of an array of
-				 * bytes of the message. */
-    int length;			/* The number of bytes in the message.
-				 * If < 0, then append all bytes up to a
-				 * NULL byte. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *messagePtr;
-    
-    /*
-     * If we are just starting to log an error, errorInfo is initialized
-     * from the error message in the interpreter's result.
-     */
-
-    if (!(iPtr->flags & ERR_IN_PROGRESS)) { /* just starting to log error */
-	iPtr->flags |= ERR_IN_PROGRESS;
-
-	if (iPtr->result[0] == 0) {
-	    (void) Tcl_SetVar2Ex(interp, "errorInfo", NULL, iPtr->objResultPtr,
-		    TCL_GLOBAL_ONLY);
-	} else {		/* use the string result */
-	    Tcl_SetVar2(interp, "errorInfo", (char *) NULL, interp->result,
-		    TCL_GLOBAL_ONLY);
-	}
-
-	/*
-	 * If the errorCode variable wasn't set by the code that generated
-	 * the error, set it to "NONE".
-	 */
-
-	if (!(iPtr->flags & ERROR_CODE_SET)) {
-	    (void) Tcl_SetVar2(interp, "errorCode", (char *) NULL, "NONE",
-		    TCL_GLOBAL_ONLY);
-	}
-    }
-
-    /*
-     * Now append "message" to the end of errorInfo.
-     */
-
-    if (length != 0) {
-	messagePtr = Tcl_NewStringObj(message, length);
-	Tcl_IncrRefCount(messagePtr);
-	Tcl_SetVar2Ex(interp, "errorInfo", NULL, messagePtr,
-		(TCL_GLOBAL_ONLY | TCL_APPEND_VALUE));
-	Tcl_DecrRefCount(messagePtr); /* free msg object appended above */
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_VarEvalVA --
- *
- *	Given a variable number of string arguments, concatenate them
- *	all together and execute the result as a Tcl command.
- *
- * Results:
- *	A standard Tcl return result.  An error message or other result may
- *	be left in the interp's result.
- *
- * Side effects:
- *	Depends on what was done by the command.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_VarEvalVA (interp, argList)
-    Tcl_Interp *interp;		/* Interpreter in which to evaluate command. */
-    va_list argList;		/* Variable argument list. */
-{
-    Tcl_DString buf;
-    char *string;
-    int result;
-
-    /*
-     * Copy the strings one after the other into a single larger
-     * string.  Use stack-allocated space for small commands, but if
-     * the command gets too large than call ckalloc to create the
-     * space.
-     */
-
-    Tcl_DStringInit(&buf);
-    while (1) {
-	string = va_arg(argList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	Tcl_DStringAppend(&buf, string, -1);
-    }
-
-    result = Tcl_Eval(interp, Tcl_DStringValue(&buf));
-    Tcl_DStringFree(&buf);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VarEval --
- *
- *	Given a variable number of string arguments, concatenate them
- *	all together and execute the result as a Tcl command.
- *
- * Results:
- *	A standard Tcl return result.  An error message or other
- *	result may be left in interp->result.
- *
- * Side effects:
- *	Depends on what was done by the command.
- *
- *----------------------------------------------------------------------
- */
-	/* VARARGS2 */ /* ARGSUSED */
-int
-Tcl_VarEval TCL_VARARGS_DEF(Tcl_Interp *,arg1)
-{
-    Tcl_Interp *interp;
-    va_list argList;
-    int result;
-
-    interp = TCL_VARARGS_START(Tcl_Interp *,arg1,argList);
-    result = Tcl_VarEvalVA(interp, argList);
-    va_end(argList);
-
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_GlobalEval --
- *
- *	Evaluate a command at global level in an interpreter.
- *
- * Results:
- *	A standard Tcl result is returned, and the interp's result is
- *	modified accordingly.
- *
- * Side effects:
- *	The command string is executed in interp, and the execution
- *	is carried out in the variable context of global level (no
- *	procedures active), just as if an "uplevel #0" command were
- *	being executed.
- *
- ---------------------------------------------------------------------------
- */
-
-int
-Tcl_GlobalEval(interp, command)
-    Tcl_Interp *interp;		/* Interpreter in which to evaluate command. */
-    char *command;		/* Command to evaluate. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    int result;
-    CallFrame *savedVarFramePtr;
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    iPtr->varFramePtr = NULL;
-    result = Tcl_Eval(interp, command);
-    iPtr->varFramePtr = savedVarFramePtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetRecursionLimit --
- *
- *	Set the maximum number of recursive calls that may be active
- *	for an interpreter at once.
- *
- * Results:
- *	The return value is the old limit on nesting for interp.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_SetRecursionLimit(interp, depth)
-    Tcl_Interp *interp;			/* Interpreter whose nesting limit
-					 * is to be set. */
-    int depth;				/* New value for maximimum depth. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int old;
-
-    old = iPtr->maxNestingDepth;
-    if (depth > 0) {
-	iPtr->maxNestingDepth = depth;
-    }
-    return old;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AllowExceptions --
- *
- *	Sets a flag in an interpreter so that exceptions can occur
- *	in the next call to Tcl_Eval without them being turned into
- *	errors.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The TCL_ALLOW_EXCEPTIONS flag gets set in the interpreter's
- *	evalFlags structure.  See the reference documentation for
- *	more details.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AllowExceptions(interp)
-    Tcl_Interp *interp;		/* Interpreter in which to set flag. */
-{
-    Interp *iPtr = (Interp *) interp;
-
-    iPtr->evalFlags |= TCL_ALLOW_EXCEPTIONS;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetVersion
- *
- *	Get the Tcl major, minor, and patchlevel version numbers and
- *      the release type.  A patch is a release type TCL_FINAL_RELEASE
- *      with a patchLevel > 0.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void Tcl_GetVersion(major, minor, patchLevel, type)
-    int *major;
-    int *minor;
-    int *patchLevel;
-    int *type;
-{
-    if (major != NULL) {
-        *major = TCL_MAJOR_VERSION;
-    }
-    if (minor != NULL) {
-        *minor = TCL_MINOR_VERSION;
-    }
-    if (patchLevel != NULL) {
-        *patchLevel = TCL_RELEASE_SERIAL;
-    }
-    if (type != NULL) {
-        *type = TCL_RELEASE_LEVEL;
-    }
-}
- 
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
deleted file mode 100644
index 5156465..0000000
--- a/generic/tclBinary.c
+++ /dev/null
@@ -1,1549 +0,0 @@
-/* 
- * tclBinary.c --
- *
- *	This file contains the implementation of the "binary" Tcl built-in
- *	command and the Tcl binary data object.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclBinary.c,v 1.5 1999/04/16 00:46:42 stanton Exp $
- */
-
-#include <math.h>
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The following constants are used by GetFormatSpec to indicate various
- * special conditions in the parsing of a format specifier.
- */
-
-#define BINARY_ALL -1		/* Use all elements in the argument. */
-#define BINARY_NOCOUNT -2	/* No count was specified in format. */
-
-/*
- * Prototypes for local procedures defined in this file:
- */
-
-static void		DupByteArrayInternalRep _ANSI_ARGS_((Tcl_Obj *srcPtr,
-			    Tcl_Obj *copyPtr));
-static int		FormatNumber _ANSI_ARGS_((Tcl_Interp *interp, int type,
-			    Tcl_Obj *src, unsigned char **cursorPtr));
-static void		FreeByteArrayInternalRep _ANSI_ARGS_((Tcl_Obj *objPtr));
-static int		GetFormatSpec _ANSI_ARGS_((char **formatPtr,
-			    char *cmdPtr, int *countPtr));
-static Tcl_Obj *	ScanNumber _ANSI_ARGS_((unsigned char *buffer, int type));
-static int		SetByteArrayFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static void		UpdateStringOfByteArray _ANSI_ARGS_((Tcl_Obj *listPtr));
-
-
-/*
- * The following object type represents an array of bytes.  An array of
- * bytes is not equivalent to an internationalized string.  Conceptually, a
- * string is an array of 16-bit quantities organized as a sequence of properly
- * formed UTF-8 characters, while a ByteArray is an array of 8-bit quantities.
- * Accessor functions are provided to convert a ByteArray to a String or a
- * String to a ByteArray.  Two or more consecutive bytes in an array of bytes
- * may look like a single UTF-8 character if the array is casually treated as
- * a string.  But obtaining the String from a ByteArray is guaranteed to
- * produced properly formed UTF-8 sequences so that there is a one-to-one
- * map between bytes and characters.
- *
- * Converting a ByteArray to a String proceeds by casting each byte in the
- * array to a 16-bit quantity, treating that number as a Unicode character,
- * and storing the UTF-8 version of that Unicode character in the String.
- * For ByteArrays consisting entirely of values 1..127, the corresponding
- * String representation is the same as the ByteArray representation.
- *
- * Converting a String to a ByteArray proceeds by getting the Unicode
- * representation of each character in the String, casting it to a
- * byte by truncating the upper 8 bits, and then storing the byte in the
- * ByteArray.  Converting from ByteArray to String and back to ByteArray
- * is not lossy, but converting an arbitrary String to a ByteArray may be.
- */
-
-Tcl_ObjType tclByteArrayType = {
-    "bytearray",
-    FreeByteArrayInternalRep,
-    DupByteArrayInternalRep,
-    UpdateStringOfByteArray,
-    SetByteArrayFromAny
-};
-
-/*
- * The following structure is the internal rep for a ByteArray object.
- * Keeps track of how much memory has been used and how much has been
- * allocated for the byte array to enable growing and shrinking of the
- * ByteArray object with fewer mallocs.  
- */
-
-typedef struct ByteArray {
-    int used;			/* The number of bytes used in the byte
-				 * array. */
-    int allocated;		/* The amount of space actually allocated
-				 * minus 1 byte. */
-    unsigned char bytes[4];	/* The array of bytes.  The actual size of
-				 * this field depends on the 'allocated' field
-				 * above. */
-} ByteArray;
-
-#define BYTEARRAY_SIZE(len)	\
-		((unsigned) (sizeof(ByteArray) - 4 + (len)))
-#define GET_BYTEARRAY(objPtr) \
-		((ByteArray *) (objPtr)->internalRep.otherValuePtr)
-#define SET_BYTEARRAY(objPtr, baPtr) \
-		(objPtr)->internalRep.otherValuePtr = (VOID *) (baPtr)
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_NewByteArrayObj --
- *
- *	This procedure is creates a new ByteArray object and initializes
- *	it from the given array of bytes.
- *
- * Results:
- *	The newly create object is returned.  This object will have no
- *	initial string representation.  The returned object has a ref count
- *	of 0.
- *
- * Side effects:
- *	Memory allocated for new object and copy of byte array argument.
- *
- *---------------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewByteArrayObj
-
-
-Tcl_Obj *
-Tcl_NewByteArrayObj(bytes, length)
-    unsigned char *bytes;	/* The array of bytes used to initialize
-				 * the new object. */
-    int length;			/* Length of the array of bytes, which must
-				 * be >= 0. */
-{
-    return Tcl_DbNewByteArrayObj(bytes, length, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewByteArrayObj(bytes, length)
-    unsigned char *bytes;	/* The array of bytes used to initialize
-				 * the new object. */
-    int length;			/* Length of the array of bytes, which must
-				 * be >= 0. */
-{
-    Tcl_Obj *objPtr;
-
-    TclNewObj(objPtr);
-    Tcl_SetByteArrayObj(objPtr, bytes, length);
-    return objPtr;
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_DbNewByteArrayObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It is the same as the Tcl_NewByteArrayObj
- *	above except that it calls Tcl_DbCkalloc directly with the file name
- *	and line number from its caller. This simplifies debugging since then
- *	the checkmem command will report the correct file name and line number
- *	when reporting objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewByteArrayObj.
- *
- * Results:
- *	The newly create object is returned.  This object will have no
- *	initial string representation.  The returned object has a ref count
- *	of 0.
- *
- * Side effects:
- *	Memory allocated for new object and copy of byte array argument.
- *
- *---------------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewByteArrayObj(bytes, length, file, line)
-    unsigned char *bytes;	/* The array of bytes used to initialize
-				 * the new object. */
-    int length;			/* Length of the array of bytes, which must
-				 * be >= 0. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    Tcl_Obj *objPtr;
-
-    TclDbNewObj(objPtr, file, line);
-    Tcl_SetByteArrayObj(objPtr, bytes, length);
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewByteArrayObj(bytes, length, file, line)
-    unsigned char *bytes;	/* The array of bytes used to initialize
-				 * the new object. */
-    int length;			/* Length of the array of bytes, which must
-				 * be >= 0. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewByteArrayObj(bytes, length);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_SetByteArrayObj --
- *
- *	Modify an object to be a ByteArray object and to have the specified
- *	array of bytes as its value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep and internal rep is freed.
- *	Memory allocated for copy of byte array argument.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetByteArrayObj(objPtr, bytes, length)
-    Tcl_Obj *objPtr;		/* Object to initialize as a ByteArray. */
-    unsigned char *bytes;	/* The array of bytes to use as the new
-				 * value. */
-    int length;			/* Length of the array of bytes, which must
-				 * be >= 0. */
-{
-    Tcl_ObjType *typePtr;
-    ByteArray *byteArrayPtr;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetByteArrayObj called with shared object");
-    }
-    typePtr = objPtr->typePtr;
-    if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
-	(*typePtr->freeIntRepProc)(objPtr);
-    }
-    Tcl_InvalidateStringRep(objPtr);
-
-    byteArrayPtr = (ByteArray *) ckalloc(BYTEARRAY_SIZE(length));
-    byteArrayPtr->used = length;
-    byteArrayPtr->allocated = length;
-    memcpy((VOID *) byteArrayPtr->bytes, (VOID *) bytes, (size_t) length);
-
-    objPtr->typePtr = &tclByteArrayType;
-    SET_BYTEARRAY(objPtr, byteArrayPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetByteArrayFromObj --
- *
- *	Attempt to get the array of bytes from the Tcl object.  If the
- *	object is not already a ByteArray object, an attempt will be
- *	made to convert it to one.
- *
- * Results:
- *	Pointer to array of bytes representing the ByteArray object.
- *
- * Side effects:
- *	Frees old internal rep.  Allocates memory for new internal rep.
- *
- *----------------------------------------------------------------------
- */
-
-unsigned char *
-Tcl_GetByteArrayFromObj(objPtr, lengthPtr)
-    Tcl_Obj *objPtr;		/* The ByteArray object. */
-    int *lengthPtr;		/* If non-NULL, filled with length of the
-				 * array of bytes in the ByteArray object. */
-{
-    ByteArray *baPtr;
-    
-    SetByteArrayFromAny(NULL, objPtr);
-    baPtr = GET_BYTEARRAY(objPtr);
-
-    if (lengthPtr != NULL) {
-	*lengthPtr = baPtr->used;
-    }
-    return (unsigned char *) baPtr->bytes;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetByteArrayLength --
- *
- *	This procedure changes the length of the byte array for this
- *	object.  Once the caller has set the length of the array, it
- *	is acceptable to directly modify the bytes in the array up until
- *	Tcl_GetStringFromObj() has been called on this object.
- *
- * Results:
- *	The new byte array of the specified length.
- *
- * Side effects:
- *	Allocates enough memory for an array of bytes of the requested
- *	size.  When growing the array, the old array is copied to the
- *	new array; new bytes are undefined.  When shrinking, the
- *	old array is truncated to the specified length.
- *
- *---------------------------------------------------------------------------
- */
-
-unsigned char *
-Tcl_SetByteArrayLength(objPtr, length)
-    Tcl_Obj *objPtr;		/* The ByteArray object. */
-    int length;			/* New length for internal byte array. */
-{
-    ByteArray *byteArrayPtr, *newByteArrayPtr;
-    
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetObjLength called with shared object");
-    }
-    if (objPtr->typePtr != &tclByteArrayType) {
-	SetByteArrayFromAny(NULL, objPtr);
-    }
-
-    byteArrayPtr = GET_BYTEARRAY(objPtr);
-    if (length > byteArrayPtr->allocated) {
-	newByteArrayPtr = (ByteArray *) ckalloc(BYTEARRAY_SIZE(length));
-	newByteArrayPtr->used = length;
-	newByteArrayPtr->allocated = length;
-	memcpy((VOID *) newByteArrayPtr->bytes,
-		(VOID *) byteArrayPtr->bytes, (size_t) byteArrayPtr->used);
-	ckfree((char *) byteArrayPtr);
-	byteArrayPtr = newByteArrayPtr;
-	SET_BYTEARRAY(objPtr, byteArrayPtr);
-    }
-    Tcl_InvalidateStringRep(objPtr);
-    byteArrayPtr->used = length;
-    return byteArrayPtr->bytes;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * SetByteArrayFromAny --
- *
- *	Generate the ByteArray internal rep from the string rep.
- *
- * Results:
- *	The return value is always TCL_OK.
- *
- * Side effects:
- *	A ByteArray object is stored as the internal rep of objPtr.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-SetByteArrayFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Not used. */
-    Tcl_Obj *objPtr;		/* The object to convert to type ByteArray. */
-{
-    Tcl_ObjType *typePtr;
-    int length;
-    char *src, *srcEnd;
-    unsigned char *dst;
-    ByteArray *byteArrayPtr;
-    Tcl_UniChar ch;
-    
-    typePtr = objPtr->typePtr;
-    if (typePtr != &tclByteArrayType) {
-	src = Tcl_GetStringFromObj(objPtr, &length);
-	srcEnd = src + length;
-
-	byteArrayPtr = (ByteArray *) ckalloc(BYTEARRAY_SIZE(length));
-	for (dst = byteArrayPtr->bytes; src < srcEnd; ) {
-	    src += Tcl_UtfToUniChar(src, &ch);
-	    *dst++ = (unsigned char) ch;
-	}
-
-	byteArrayPtr->used = dst - byteArrayPtr->bytes;
-	byteArrayPtr->allocated = length;
-
-	if ((typePtr != NULL) && (typePtr->freeIntRepProc) != NULL) {
-	    (*typePtr->freeIntRepProc)(objPtr);
-	}
-	objPtr->typePtr = &tclByteArrayType;
-	SET_BYTEARRAY(objPtr, byteArrayPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeByteArrayInternalRep --
- *
- *	Deallocate the storage associated with a ByteArray data object's
- *	internal representation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees memory. 
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeByteArrayInternalRep(objPtr)
-    Tcl_Obj *objPtr;		/* Object with internal rep to free. */
-{
-    ckfree((char *) GET_BYTEARRAY(objPtr));
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * DupByteArrayInternalRep --
- *
- *	Initialize the internal representation of a ByteArray Tcl_Obj
- *	to a copy of the internal representation of an existing ByteArray
- *	object. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Allocates memory.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-DupByteArrayInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;		/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr;		/* Object with internal rep to set. */
-{
-    int length;
-    ByteArray *srcArrayPtr, *copyArrayPtr;    
-
-    srcArrayPtr = GET_BYTEARRAY(srcPtr);
-    length = srcArrayPtr->used;
-
-    copyArrayPtr = (ByteArray *) ckalloc(BYTEARRAY_SIZE(length));
-    copyArrayPtr->used = length;
-    copyArrayPtr->allocated = length;
-    memcpy((VOID *) copyArrayPtr->bytes, (VOID *) srcArrayPtr->bytes,
-	    (size_t) length);
-    SET_BYTEARRAY(copyPtr, copyArrayPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * UpdateStringOfByteArray --
- *
- *	Update the string representation for a ByteArray data object.
- *	Note: This procedure does not invalidate an existing old string rep
- *	so storage will be lost if this has not already been done. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the ByteArray-to-string conversion.
- *
- *	The object becomes a string object -- the internal rep is
- *	discarded and the typePtr becomes NULL.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfByteArray(objPtr)
-    Tcl_Obj *objPtr;		/* ByteArray object whose string rep to
-				 * update. */
-{
-    int i, length, size;
-    unsigned char *src;
-    char *dst;
-    ByteArray *byteArrayPtr;
-
-    byteArrayPtr = GET_BYTEARRAY(objPtr);
-    src = byteArrayPtr->bytes;
-    length = byteArrayPtr->used;
-
-    /*
-     * How much space will string rep need?
-     */
-     
-    size = length;
-    for (i = 0; i < length; i++) {
-	if ((src[i] == 0) || (src[i] > 127)) {
-	    size++;
-	}
-    }
-
-    dst = (char *) ckalloc((unsigned) (size + 1));
-    objPtr->bytes = dst;
-    objPtr->length = size;
-
-    if (size == length) {
-	memcpy((VOID *) dst, (VOID *) src, (size_t) size);
-	dst[size] = '\0';
-    } else {
-	for (i = 0; i < length; i++) {
-	    dst += Tcl_UniCharToUtf(src[i], dst);
-	}
-	*dst = '\0';
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_BinaryObjCmd --
- *
- *	This procedure implements the "binary" Tcl command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_BinaryObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int arg;			/* Index of next argument to consume. */
-    int value = 0;		/* Current integer value to be packed.
-				 * Initialized to avoid compiler warning. */
-    char cmd;			/* Current format character. */
-    int count;			/* Count associated with current format
-				 * character. */
-    char *format;		/* Pointer to current position in format
-				 * string. */
-    Tcl_Obj *resultPtr;		/* Object holding result buffer. */
-    unsigned char *buffer;	/* Start of result buffer. */
-    unsigned char *cursor;	/* Current position within result buffer. */
-    unsigned char *maxPos;	/* Greatest position within result buffer that
-				 * cursor has visited.*/
-    char *errorString, *errorValue, *str;
-    int offset, size, length, index;
-    static char *options[] = { 
-	"format",	"scan",		NULL 
-    };
-    enum options { 
-	BINARY_FORMAT,	BINARY_SCAN
-    };
-
-    if (objc < 2) {
-    	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0,
-	    &index) != TCL_OK) {
-    	return TCL_ERROR;
-    }
-
-    switch ((enum options) index) {
-	case BINARY_FORMAT: {
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "formatString ?arg arg ...?");
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * To avoid copying the data, we format the string in two passes.
-	     * The first pass computes the size of the output buffer.  The
-	     * second pass places the formatted data into the buffer.
-	     */
-
-	    format = Tcl_GetString(objv[2]);
-	    arg = 3;
-	    offset = 0;
-	    length = 0;
-	    while (*format != '\0') {
-		str = format;
-		if (!GetFormatSpec(&format, &cmd, &count)) {
-		    break;
-		}
-		switch (cmd) {
-		    case 'a':
-		    case 'A':
-		    case 'b':
-		    case 'B':
-		    case 'h':
-		    case 'H': {
-			/*
-			 * For string-type specifiers, the count corresponds
-			 * to the number of bytes in a single argument.
-			 */
-
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-			if (count == BINARY_ALL) {
-			    Tcl_GetByteArrayFromObj(objv[arg], &count);
-			} else if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			arg++;
-			if (cmd == 'a' || cmd == 'A') {
-			    offset += count;
-			} else if (cmd == 'b' || cmd == 'B') {
-			    offset += (count + 7) / 8;
-			} else {
-			    offset += (count + 1) / 2;
-			}
-			break;
-		    }
-		    case 'c': {
-			size = 1;
-			goto doNumbers;
-		    }
-		    case 's':
-		    case 'S': {
-			size = 2;
-			goto doNumbers;
-		    }
-		    case 'i':
-		    case 'I': {
-			size = 4;
-			goto doNumbers;
-		    }
-		    case 'f': {
-			size = sizeof(float);
-			goto doNumbers;
-		    }
-		    case 'd': {
-			size = sizeof(double);
-			
-			doNumbers:
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-
-			/*
-			 * For number-type specifiers, the count corresponds
-			 * to the number of elements in the list stored in
-			 * a single argument.  If no count is specified, then
-			 * the argument is taken as a single non-list value.
-			 */
-
-			if (count == BINARY_NOCOUNT) {
-			    arg++;
-			    count = 1;
-			} else {
-			    int listc;
-			    Tcl_Obj **listv;
-			    if (Tcl_ListObjGetElements(interp, objv[arg++],
-				    &listc, &listv) != TCL_OK) {
-				return TCL_ERROR;
-			    }
-			    if (count == BINARY_ALL) {
-				count = listc;
-			    } else if (count > listc) {
-			        Tcl_AppendResult(interp, 
-					"number of elements in list does not match count",
-					(char *) NULL);
-				return TCL_ERROR;
-			    }
-			}
-			offset += count*size;
-			break;
-		    }
-		    case 'x': {
-			if (count == BINARY_ALL) {
-			    Tcl_AppendResult(interp, 
-				    "cannot use \"*\" in format string with \"x\"",
-				    (char *) NULL);
-			    return TCL_ERROR;
-			} else if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			offset += count;
-			break;
-		    }
-		    case 'X': {
-			if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			if ((count > offset) || (count == BINARY_ALL)) {
-			    count = offset;
-			}
-			if (offset > length) {
-			    length = offset;
-			}
-			offset -= count;
-			break;
-		    }
-		    case '@': {
-			if (offset > length) {
-			    length = offset;
-			}
-			if (count == BINARY_ALL) {
-			    offset = length;
-			} else if (count == BINARY_NOCOUNT) {
-			    goto badCount;
-			} else {
-			    offset = count;
-			}
-			break;
-		    }
-		    default: {
-			errorString = str;
-			goto badfield;
-		    }
-		}
-	    }
-	    if (offset > length) {
-		length = offset;
-	    }
-	    if (length == 0) {
-		return TCL_OK;
-	    }
-
-	    /*
-	     * Prepare the result object by preallocating the caclulated
-	     * number of bytes and filling with nulls.
-	     */
-
-	    resultPtr = Tcl_GetObjResult(interp);
-	    buffer = Tcl_SetByteArrayLength(resultPtr, length);
-	    memset((VOID *) buffer, 0, (size_t) length);
-
-	    /*
-	     * Pack the data into the result object.  Note that we can skip
-	     * the error checking during this pass, since we have already
-	     * parsed the string once.
-	     */
-
-	    arg = 3;
-	    format = Tcl_GetString(objv[2]);
-	    cursor = buffer;
-	    maxPos = cursor;
-	    while (*format != 0) {
-		if (!GetFormatSpec(&format, &cmd, &count)) {
-		    break;
-		}
-		if ((count == 0) && (cmd != '@')) {
-		    arg++;
-		    continue;
-		}
-		switch (cmd) {
-		    case 'a':
-		    case 'A': {
-			char pad = (char) (cmd == 'a' ? '\0' : ' ');
-			unsigned char *bytes;
-
-			bytes = Tcl_GetByteArrayFromObj(objv[arg++], &length);
-
-			if (count == BINARY_ALL) {
-			    count = length;
-			} else if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			if (length >= count) {
-			    memcpy((VOID *) cursor, (VOID *) bytes,
-				    (size_t) count);
-			} else {
-			    memcpy((VOID *) cursor, (VOID *) bytes,
-				    (size_t) length);
-			    memset((VOID *) (cursor + length), pad,
-			            (size_t) (count - length));
-			}
-			cursor += count;
-			break;
-		    }
-		    case 'b':
-		    case 'B': {
-			unsigned char *last;
-			
-			str = Tcl_GetStringFromObj(objv[arg++], &length);
-			if (count == BINARY_ALL) {
-			    count = length;
-			} else if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			last = cursor + ((count + 7) / 8);
-			if (count > length) {
-			    count = length;
-			}
-			value = 0;
-			errorString = "binary";
-			if (cmd == 'B') {
-			    for (offset = 0; offset < count; offset++) {
-				value <<= 1;
-				if (str[offset] == '1') {
-				    value |= 1;
-				} else if (str[offset] != '0') {
-				    errorValue = str;
-				    goto badValue;
-				}
-				if (((offset + 1) % 8) == 0) {
-				    *cursor++ = (unsigned char) value;
-				    value = 0;
-				}
-			    }
-			} else {
-			    for (offset = 0; offset < count; offset++) {
-				value >>= 1;
-				if (str[offset] == '1') {
-				    value |= 128;
-				} else if (str[offset] != '0') {
-				    errorValue = str;
-				    goto badValue;
-				}
-				if (!((offset + 1) % 8)) {
-				    *cursor++ = (unsigned char) value;
-				    value = 0;
-				}
-			    }
-			}
-			if ((offset % 8) != 0) {
-			    if (cmd == 'B') {
-				value <<= 8 - (offset % 8);
-			    } else {
-				value >>= 8 - (offset % 8);
-			    }
-			    *cursor++ = (unsigned char) value;
-			}
-			while (cursor < last) {
-			    *cursor++ = '\0';
-			}
-			break;
-		    }
-		    case 'h':
-		    case 'H': {
-			unsigned char *last;
-			int c;
-			
-			str = Tcl_GetStringFromObj(objv[arg++], &length);
-			if (count == BINARY_ALL) {
-			    count = length;
-			} else if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			last = cursor + ((count + 1) / 2);
-			if (count > length) {
-			    count = length;
-			}
-			value = 0;
-			errorString = "hexadecimal";
-			if (cmd == 'H') {
-			    for (offset = 0; offset < count; offset++) {
-				value <<= 4;
-				if (!isxdigit(UCHAR(str[offset]))) { /* INTL: digit */
-				    errorValue = str;
-				    goto badValue;
-				}
-				c = str[offset] - '0';
-				if (c > 9) {
-				    c += ('0' - 'A') + 10;
-				}
-				if (c > 16) {
-				    c += ('A' - 'a');
-				}
-				value |= (c & 0xf);
-				if (offset % 2) {
-				    *cursor++ = (char) value;
-				    value = 0;
-				}
-			    }
-			} else {
-			    for (offset = 0; offset < count; offset++) {
-				value >>= 4;
-
-				if (!isxdigit(UCHAR(str[offset]))) { /* INTL: digit */
-				    errorValue = str;
-				    goto badValue;
-				}
-				c = str[offset] - '0';
-				if (c > 9) {
-				    c += ('0' - 'A') + 10;
-				}
-				if (c > 16) {
-				    c += ('A' - 'a');
-				}
-				value |= ((c << 4) & 0xf0);
-				if (offset % 2) {
-				    *cursor++ = (unsigned char)(value & 0xff);
-				    value = 0;
-				}
-			    }
-			}
-			if (offset % 2) {
-			    if (cmd == 'H') {
-				value <<= 4;
-			    } else {
-				value >>= 4;
-			    }
-			    *cursor++ = (unsigned char) value;
-			}
-
-			while (cursor < last) {
-			    *cursor++ = '\0';
-			}
-			break;
-		    }
-		    case 'c':
-		    case 's':
-		    case 'S':
-		    case 'i':
-		    case 'I':
-		    case 'd':
-		    case 'f': {
-			int listc, i;
-			Tcl_Obj **listv;
-
-			if (count == BINARY_NOCOUNT) {
-			    /*
-			     * Note that we are casting away the const-ness of
-			     * objv, but this is safe since we aren't going to
-			     * modify the array.
-			     */
-
-			    listv = (Tcl_Obj**)(objv + arg);
-			    listc = 1;
-			    count = 1;
-			} else {
-			    Tcl_ListObjGetElements(interp, objv[arg],
-				    &listc, &listv);
-			    if (count == BINARY_ALL) {
-				count = listc;
-			    }
-			}
-			arg++;
-			for (i = 0; i < count; i++) {
-			    if (FormatNumber(interp, cmd, listv[i], &cursor)
-				    != TCL_OK) {
-				return TCL_ERROR;
-			    }
-			}
-			break;
-		    }
-		    case 'x': {
-			if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			memset(cursor, 0, (size_t) count);
-			cursor += count;
-			break;
-		    }
-		    case 'X': {
-			if (cursor > maxPos) {
-			    maxPos = cursor;
-			}
-			if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			if ((count == BINARY_ALL)
-				|| (count > (cursor - buffer))) {
-			    cursor = buffer;
-			} else {
-			    cursor -= count;
-			}
-			break;
-		    }
-		    case '@': {
-			if (cursor > maxPos) {
-			    maxPos = cursor;
-			}
-			if (count == BINARY_ALL) {
-			    cursor = maxPos;
-			} else {
-			    cursor = buffer + count;
-			}
-			break;
-		    }
-		}
-	    }
-	    break;
-	}
-	case BINARY_SCAN: {
-	    int i;
-	    Tcl_Obj *valuePtr, *elementPtr;
-
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"value formatString ?varName varName ...?");
-		return TCL_ERROR;
-	    }
-	    buffer = Tcl_GetByteArrayFromObj(objv[2], &length);
-	    format = Tcl_GetString(objv[3]);
-	    cursor = buffer;
-	    arg = 4;
-	    offset = 0;
-	    while (*format != '\0') {
-		str = format;
-		if (!GetFormatSpec(&format, &cmd, &count)) {
-		    goto done;
-		}
-		switch (cmd) {
-		    case 'a':
-		    case 'A': {
-			unsigned char *src;
-
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-			if (count == BINARY_ALL) {
-			    count = length - offset;
-			} else {
-			    if (count == BINARY_NOCOUNT) {
-				count = 1;
-			    }
-			    if (count > (length - offset)) {
-				goto done;
-			    }
-			}
-
-			src = buffer + offset;
-			size = count;
-
-			/*
-			 * Trim trailing nulls and spaces, if necessary.
-			 */
-
-			if (cmd == 'A') {
-			    while (size > 0) {
-				if (src[size-1] != '\0' && src[size-1] != ' ') {
-				    break;
-				}
-				size--;
-			    }
-			}
-			valuePtr = Tcl_NewByteArrayObj(src, size);
-			resultPtr = Tcl_ObjSetVar2(interp, objv[arg],
-				NULL, valuePtr, TCL_LEAVE_ERR_MSG);
-			arg++;
-			if (resultPtr == NULL) {
-			    Tcl_DecrRefCount(valuePtr);	/* unneeded */
-			    return TCL_ERROR;
-			}
-			offset += count;
-			break;
-		    }
-		    case 'b':
-		    case 'B': {
-			unsigned char *src;
-			char *dest;
-
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-			if (count == BINARY_ALL) {
-			    count = (length - offset) * 8;
-			} else {
-			    if (count == BINARY_NOCOUNT) {
-				count = 1;
-			    }
-			    if (count > (length - offset) * 8) {
-				goto done;
-			    }
-			}
-			src = buffer + offset;
-			valuePtr = Tcl_NewObj();
-			Tcl_SetObjLength(valuePtr, count);
-			dest = Tcl_GetString(valuePtr);
-
-			if (cmd == 'b') {
-			    for (i = 0; i < count; i++) {
-				if (i % 8) {
-				    value >>= 1;
-				} else {
-				    value = *src++;
-				}
-				*dest++ = (char) ((value & 1) ? '1' : '0');
-			    }
-			} else {
-			    for (i = 0; i < count; i++) {
-				if (i % 8) {
-				    value <<= 1;
-				} else {
-				    value = *src++;
-				}
-				*dest++ = (char) ((value & 0x80) ? '1' : '0');
-			    }
-			}
-			
-			resultPtr = Tcl_ObjSetVar2(interp, objv[arg],
-				NULL, valuePtr, TCL_LEAVE_ERR_MSG);
-			arg++;
-			if (resultPtr == NULL) {
-			    Tcl_DecrRefCount(valuePtr);	/* unneeded */
-			    return TCL_ERROR;
-			}
-			offset += (count + 7 ) / 8;
-			break;
-		    }
-		    case 'h':
-		    case 'H': {
-			char *dest;
-			unsigned char *src;
-			int i;
-			static char hexdigit[] = "0123456789abcdef";
-
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-			if (count == BINARY_ALL) {
-			    count = (length - offset)*2;
-			} else {
-			    if (count == BINARY_NOCOUNT) {
-				count = 1;
-			    }
-			    if (count > (length - offset)*2) {
-				goto done;
-			    }
-			}
-			src = buffer + offset;
-			valuePtr = Tcl_NewObj();
-			Tcl_SetObjLength(valuePtr, count);
-			dest = Tcl_GetString(valuePtr);
-
-			if (cmd == 'h') {
-			    for (i = 0; i < count; i++) {
-				if (i % 2) {
-				    value >>= 4;
-				} else {
-				    value = *src++;
-				}
-				*dest++ = hexdigit[value & 0xf];
-			    }
-			} else {
-			    for (i = 0; i < count; i++) {
-				if (i % 2) {
-				    value <<= 4;
-				} else {
-				    value = *src++;
-				}
-				*dest++ = hexdigit[(value >> 4) & 0xf];
-			    }
-			}
-			
-			resultPtr = Tcl_ObjSetVar2(interp, objv[arg],
-				NULL, valuePtr, TCL_LEAVE_ERR_MSG);
-			arg++;
-			if (resultPtr == NULL) {
-			    Tcl_DecrRefCount(valuePtr);	/* unneeded */
-			    return TCL_ERROR;
-			}
-			offset += (count + 1) / 2;
-			break;
-		    }
-		    case 'c': {
-			size = 1;
-			goto scanNumber;
-		    }
-		    case 's':
-		    case 'S': {
-			size = 2;
-			goto scanNumber;
-		    }
-		    case 'i':
-		    case 'I': {
-			size = 4;
-			goto scanNumber;
-		    }
-		    case 'f': {
-			size = sizeof(float);
-			goto scanNumber;
-		    }
-		    case 'd': {
-			unsigned char *src;
-
-			size = sizeof(double);
-			/* fall through */
-			
-			scanNumber:
-			if (arg >= objc) {
-			    goto badIndex;
-			}
-			if (count == BINARY_NOCOUNT) {
-			    if ((length - offset) < size) {
-				goto done;
-			    }
-			    valuePtr = ScanNumber(buffer+offset, cmd);
-			    offset += size;
-			} else {
-			    if (count == BINARY_ALL) {
-				count = (length - offset) / size;
-			    }
-			    if ((length - offset) < (count * size)) {
-				goto done;
-			    }
-			    valuePtr = Tcl_NewObj();
-			    src = buffer+offset;
-			    for (i = 0; i < count; i++) {
-				elementPtr = ScanNumber(src, cmd);
-				src += size;
-				Tcl_ListObjAppendElement(NULL, valuePtr,
-					elementPtr);
-			    }
-			    offset += count*size;
-			}
-
-			resultPtr = Tcl_ObjSetVar2(interp, objv[arg],
-				NULL, valuePtr, TCL_LEAVE_ERR_MSG);
-			arg++;
-			if (resultPtr == NULL) {
-			    Tcl_DecrRefCount(valuePtr);	/* unneeded */
-			    return TCL_ERROR;
-			}
-			break;
-		    }
-		    case 'x': {
-			if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			if ((count == BINARY_ALL)
-				|| (count > (length - offset))) {
-			    offset = length;
-			} else {
-			    offset += count;
-			}
-			break;
-		    }
-		    case 'X': {
-			if (count == BINARY_NOCOUNT) {
-			    count = 1;
-			}
-			if ((count == BINARY_ALL) || (count > offset)) {
-			    offset = 0;
-			} else {
-			    offset -= count;
-			}
-			break;
-		    }
-		    case '@': {
-			if (count == BINARY_NOCOUNT) {
-			    goto badCount;
-			}
-			if ((count == BINARY_ALL) || (count > length)) {
-			    offset = length;
-			} else {
-			    offset = count;
-			}
-			break;
-		    }
-		    default: {
-			errorString = str;
-			goto badfield;
-		    }
-		}
-	    }
-
-	    /*
-	     * Set the result to the last position of the cursor.
-	     */
-
-	    done:
-	    Tcl_ResetResult(interp);
-	    Tcl_SetLongObj(Tcl_GetObjResult(interp), arg - 4);
-	    break;
-	}
-    }
-    return TCL_OK;
-
-    badValue:
-    Tcl_ResetResult(interp);
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "expected ", errorString,
-	    " string but got \"", errorValue, "\" instead", NULL);
-    return TCL_ERROR;
-
-    badCount:
-    errorString = "missing count for \"@\" field specifier";
-    goto error;
-
-    badIndex:
-    errorString = "not enough arguments for all format specifiers";
-    goto error;
-
-    badfield: {
-	Tcl_UniChar ch;
-	char buf[TCL_UTF_MAX + 1];
-
-	Tcl_UtfToUniChar(errorString, &ch);
-	buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
-	Tcl_AppendResult(interp, "bad field specifier \"", buf, "\"", NULL);
-	return TCL_ERROR;
-    }
-
-    error:
-    Tcl_AppendResult(interp, errorString, NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetFormatSpec --
- *
- *	This function parses the format strings used in the binary
- *	format and scan commands.
- *
- * Results:
- *	Moves the formatPtr to the start of the next command. Returns
- *	the current command character and count in cmdPtr and countPtr.
- *	The count is set to BINARY_ALL if the count character was '*'
- *	or BINARY_NOCOUNT if no count was specified.  Returns 1 on
- *	success, or 0 if the string did not have a format specifier.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetFormatSpec(formatPtr, cmdPtr, countPtr)
-    char **formatPtr;		/* Pointer to format string. */
-    char *cmdPtr;		/* Pointer to location of command char. */
-    int *countPtr;		/* Pointer to repeat count value. */
-{
-    /*
-     * Skip any leading blanks.
-     */
-
-    while (**formatPtr == ' ') {
-	(*formatPtr)++;
-    }
-
-    /*
-     * The string was empty, except for whitespace, so fail.
-     */
-
-    if (!(**formatPtr)) {
-	return 0;
-    }
-
-    /*
-     * Extract the command character and any trailing digits or '*'.
-     */
-
-    *cmdPtr = **formatPtr;
-    (*formatPtr)++;
-    if (**formatPtr == '*') {
-	(*formatPtr)++;
-	(*countPtr) = BINARY_ALL;
-    } else if (isdigit(UCHAR(**formatPtr))) { /* INTL: digit */
-	(*countPtr) = strtoul(*formatPtr, formatPtr, 10);
-    } else {
-	(*countPtr) = BINARY_NOCOUNT;
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FormatNumber --
- *
- *	This routine is called by Tcl_BinaryObjCmd to format a number
- *	into a location pointed at by cursor.
- *
- * Results:
- *	 A standard Tcl result.
- *
- * Side effects:
- *	Moves the cursor to the next location to be written into.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FormatNumber(interp, type, src, cursorPtr)
-    Tcl_Interp *interp;		/* Current interpreter, used to report
-				 * errors. */
-    int type;			/* Type of number to format. */
-    Tcl_Obj *src;		/* Number to format. */
-    unsigned char **cursorPtr;	/* Pointer to index into destination buffer. */
-{
-    int value;
-    double dvalue;
-
-    if ((type == 'd') || (type == 'f')) {
-	/*
-	 * For floating point types, we need to copy the data using
-	 * memcpy to avoid alignment issues.
-	 */
-
-	if (Tcl_GetDoubleFromObj(interp, src, &dvalue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (type == 'd') {
-	    memcpy((VOID *) *cursorPtr, (VOID *) &dvalue, sizeof(double));
-	    *cursorPtr += sizeof(double);
-	} else {
-	    float fvalue;
-
-	    /*
-	     * Because some compilers will generate floating point exceptions
-	     * on an overflow cast (e.g. Borland), we restrict the values
-	     * to the valid range for float.
-	     */
-
-	    if (fabs(dvalue) > (double)FLT_MAX) {
-		fvalue = (dvalue >= 0.0) ? FLT_MAX : -FLT_MAX;
-	    } else {
-		fvalue = (float) dvalue;
-	    }
-	    memcpy((VOID *) *cursorPtr, (VOID *) &fvalue, sizeof(float));
-	    *cursorPtr += sizeof(float);
-	}
-    } else {
-	if (Tcl_GetIntFromObj(interp, src, &value) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (type == 'c') {
-	    *(*cursorPtr)++ = (unsigned char) value;
-	} else if (type == 's') {
-	    *(*cursorPtr)++ = (unsigned char) value;
-	    *(*cursorPtr)++ = (unsigned char) (value >> 8);
-	} else if (type == 'S') {
-	    *(*cursorPtr)++ = (unsigned char) (value >> 8);
-	    *(*cursorPtr)++ = (unsigned char) value;
-	} else if (type == 'i') {
-	    *(*cursorPtr)++ = (unsigned char) value;
-	    *(*cursorPtr)++ = (unsigned char) (value >> 8);
-	    *(*cursorPtr)++ = (unsigned char) (value >> 16);
-	    *(*cursorPtr)++ = (unsigned char) (value >> 24);
-	} else if (type == 'I') {
-	    *(*cursorPtr)++ = (unsigned char) (value >> 24);
-	    *(*cursorPtr)++ = (unsigned char) (value >> 16);
-	    *(*cursorPtr)++ = (unsigned char) (value >> 8);
-	    *(*cursorPtr)++ = (unsigned char) value;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ScanNumber --
- *
- *	This routine is called by Tcl_BinaryObjCmd to scan a number
- *	out of a buffer.
- *
- * Results:
- *	Returns a newly created object containing the scanned number.
- *	This object has a ref count of zero.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_Obj *
-ScanNumber(buffer, type)
-    unsigned char *buffer;	/* Buffer to scan number from. */
-    int type;			/* Format character from "binary scan" */
-{
-    long value;
-
-    /*
-     * We cannot rely on the compiler to properly sign extend integer values
-     * when we cast from smaller values to larger values because we don't know
-     * the exact size of the integer types.  So, we have to handle sign
-     * extension explicitly by checking the high bit and padding with 1's as
-     * needed.
-     */
-
-    switch (type) {
-	case 'c': {
-	    /*
-	     * Characters need special handling.  We want to produce a
-	     * signed result, but on some platforms (such as AIX) chars
-	     * are unsigned.  To deal with this, check for a value that
-	     * should be negative but isn't.
-	     */
-
-	    value = buffer[0];
-	    if (value & 0x80) {
-		value |= -0x100;
-	    }
-	    return Tcl_NewLongObj((long)value);
-	}
-	case 's': {
-	    value = (long) (buffer[0] + (buffer[1] << 8));
-	    goto shortValue;
-	}
-	case 'S': {
-	    value = (long) (buffer[1] + (buffer[0] << 8));
-	    shortValue:
-	    if (value & 0x8000) {
-		value |= -0x10000;
-	    }
-	    return Tcl_NewLongObj(value);
-	}
-	case 'i': {
-	    value = (long) (buffer[0] 
-		    + (buffer[1] << 8)
-		    + (buffer[2] << 16)
-		    + (buffer[3] << 24));
-	    goto intValue;
-	}
-	case 'I': {
-	    value = (long) (buffer[3]
-		    + (buffer[2] << 8)
-		    + (buffer[1] << 16)
-		    + (buffer[0] << 24));
-	    intValue:
-	    /*
-	     * Check to see if the value was sign extended properly on
-	     * systems where an int is more than 32-bits.
-	     */
-
-	    if ((value & (((unsigned int)1)<<31)) && (value > 0)) {
-		value -= (((unsigned int)1)<<31);
-		value -= (((unsigned int)1)<<31);
-	    }
-	    return Tcl_NewLongObj(value);
-	}
-	case 'f': {
-	    float fvalue;
-	    memcpy((VOID *) &fvalue, (VOID *) buffer, sizeof(float));
-	    return Tcl_NewDoubleObj(fvalue);
-	}
-	case 'd': {
-	    double dvalue;
-	    memcpy((VOID *) &dvalue, (VOID *) buffer, sizeof(double));
-	    return Tcl_NewDoubleObj(dvalue);
-	}
-    }
-    return NULL;
-}
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
deleted file mode 100644
index f19d597..0000000
--- a/generic/tclCkalloc.c
+++ /dev/null
@@ -1,974 +0,0 @@
-/* 
- * tclCkalloc.c --
- *
- *    Interface to malloc and free that provides support for debugging problems
- *    involving overwritten, double freeing memory and loss of memory.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * This code contributed by Karl Lehenbauer and Mark Diekhans
- *
- * RCS: @(#) $Id: tclCkalloc.c,v 1.4 1999/04/16 00:46:42 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-#define FALSE	0
-#define TRUE	1
-
-#ifdef TCL_MEM_DEBUG
-
-/*
- * One of the following structures is allocated each time the
- * "memory tag" command is invoked, to hold the current tag.
- */
-
-typedef struct MemTag {
-    int refCount;		/* Number of mem_headers referencing
-				 * this tag. */
-    char string[4];		/* Actual size of string will be as
-				 * large as needed for actual tag.  This
-				 * must be the last field in the structure. */
-} MemTag;
-
-#define TAG_SIZE(bytesInString) ((unsigned) sizeof(MemTag) + bytesInString - 3)
-
-static MemTag *curTagPtr = NULL;/* Tag to use in all future mem_headers
-				 * (set by "memory tag" command). */
-
-/*
- * One of the following structures is allocated just before each
- * dynamically allocated chunk of memory, both to record information
- * about the chunk and to help detect chunk under-runs.
- */
-
-#define LOW_GUARD_SIZE (8 + (32 - (sizeof(long) + sizeof(int)))%8)
-struct mem_header {
-    struct mem_header *flink;
-    struct mem_header *blink;
-    MemTag *tagPtr;		/* Tag from "memory tag" command;  may be
-				 * NULL. */
-    char *file;
-    long length;
-    int line;
-    unsigned char low_guard[LOW_GUARD_SIZE];
-				/* Aligns body on 8-byte boundary, plus
-				 * provides at least 8 additional guard bytes
-				 * to detect underruns. */
-    char body[1];		/* First byte of client's space.  Actual
-				 * size of this field will be larger than
-				 * one. */
-};
-
-static struct mem_header *allocHead = NULL;  /* List of allocated structures */
-
-#define GUARD_VALUE  0141
-
-/*
- * The following macro determines the amount of guard space *above* each
- * chunk of memory.
- */
-
-#define HIGH_GUARD_SIZE 8
-
-/*
- * The following macro computes the offset of the "body" field within
- * mem_header.  It is used to get back to the header pointer from the
- * body pointer that's used by clients.
- */
-
-#define BODY_OFFSET \
-	((unsigned long) (&((struct mem_header *) 0)->body))
-
-static int total_mallocs = 0;
-static int total_frees = 0;
-static int current_bytes_malloced = 0;
-static int maximum_bytes_malloced = 0;
-static int current_malloc_packets = 0;
-static int maximum_malloc_packets = 0;
-static int break_on_malloc = 0;
-static int trace_on_at_malloc = 0;
-static int  alloc_tracing = FALSE;
-static int  init_malloced_bodies = TRUE;
-#ifdef MEM_VALIDATE
-    static int  validate_memory = TRUE;
-#else
-    static int  validate_memory = FALSE;
-#endif
-
-/*
- * The following variable indicates to TclFinalizeMemorySubsystem() 
- * that it should dump out the state of memory before exiting.  If the
- * value is non-NULL, it gives the name of the file in which to
- * dump memory usage information.
- */
-
-char *tclMemDumpFileName = NULL;
-
-static char dumpFile[100];	/* Records where to dump memory allocation
-				 * information. */
-
-/*
- * Mutex to serialize allocations.  This is a low-level mutex that must
- * be explicitly initialized.  This is necessary because the self
- * initializing mutexes use ckalloc...
- */
-static TclpMutex ckallocMutex;
-static int ckallocInit = 0;
-
-/*
- * Prototypes for procedures defined in this file:
- */
-
-static int		CheckmemCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char *argv[]));
-static int		MemoryCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-static void		ValidateMemory _ANSI_ARGS_((
-			    struct mem_header *memHeaderP, char *file,
-			    int line, int nukeGuards));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitDbCkalloc --
- *     Initialize the locks used by the allocator.
- *	This is only appropriate to call in a single threaded environtment,
- *	such as during TclInitSubsystems.
- *
- *----------------------------------------------------------------------
- */
-void
-TclInitDbCkalloc() 
-{
-    if (!ckallocInit) {
-	ckallocInit = 1;
-	TclpMutexInit(&ckallocMutex);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDumpMemoryInfo --
- *     Display the global memory management statistics.
- *
- *----------------------------------------------------------------------
- */
-void
-TclDumpMemoryInfo(outFile) 
-    FILE *outFile;
-{
-        fprintf(outFile,"total mallocs             %10d\n", 
-                total_mallocs);
-        fprintf(outFile,"total frees               %10d\n", 
-                total_frees);
-        fprintf(outFile,"current packets allocated %10d\n", 
-                current_malloc_packets);
-        fprintf(outFile,"current bytes allocated   %10d\n", 
-                current_bytes_malloced);
-        fprintf(outFile,"maximum packets allocated %10d\n", 
-                maximum_malloc_packets);
-        fprintf(outFile,"maximum bytes allocated   %10d\n", 
-                maximum_bytes_malloced);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ValidateMemory --
- *     Procedure to validate allocted memory guard zones.
- *
- *----------------------------------------------------------------------
- */
-static void
-ValidateMemory(memHeaderP, file, line, nukeGuards)
-    struct mem_header *memHeaderP;
-    char              *file;
-    int                line;
-    int                nukeGuards;
-{
-    unsigned char *hiPtr;
-    int   idx;
-    int   guard_failed = FALSE;
-    int byte;
-    
-    for (idx = 0; idx < LOW_GUARD_SIZE; idx++) {
-        byte = *(memHeaderP->low_guard + idx);
-        if (byte != GUARD_VALUE) {
-            guard_failed = TRUE;
-            fflush(stdout);
-	    byte &= 0xff;
-            fprintf(stderr, "low guard byte %d is 0x%x  \t%c\n", idx, byte,
-		    (isprint(UCHAR(byte)) ? byte : ' ')); /* INTL: bytes */
-        }
-    }
-    if (guard_failed) {
-        TclDumpMemoryInfo (stderr);
-        fprintf(stderr, "low guard failed at %lx, %s %d\n",
-                 (long unsigned int) memHeaderP->body, file, line);
-        fflush(stderr);  /* In case name pointer is bad. */
-        fprintf(stderr, "%ld bytes allocated at (%s %d)\n", memHeaderP->length,
-		memHeaderP->file, memHeaderP->line);
-        panic ("Memory validation failure");
-    }
-
-    hiPtr = (unsigned char *)memHeaderP->body + memHeaderP->length;
-    for (idx = 0; idx < HIGH_GUARD_SIZE; idx++) {
-        byte = *(hiPtr + idx);
-        if (byte != GUARD_VALUE) {
-            guard_failed = TRUE;
-            fflush (stdout);
-	    byte &= 0xff;
-            fprintf(stderr, "hi guard byte %d is 0x%x  \t%c\n", idx, byte,
-		    (isprint(UCHAR(byte)) ? byte : ' ')); /* INTL: bytes */
-        }
-    }
-
-    if (guard_failed) {
-        TclDumpMemoryInfo (stderr);
-        fprintf(stderr, "high guard failed at %lx, %s %d\n",
-                 (long unsigned int) memHeaderP->body, file, line);
-        fflush(stderr);  /* In case name pointer is bad. */
-        fprintf(stderr, "%ld bytes allocated at (%s %d)\n",
-		memHeaderP->length, memHeaderP->file,
-		memHeaderP->line);
-        panic("Memory validation failure");
-    }
-
-    if (nukeGuards) {
-        memset ((char *) memHeaderP->low_guard, 0, LOW_GUARD_SIZE); 
-        memset ((char *) hiPtr, 0, HIGH_GUARD_SIZE); 
-    }
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ValidateAllMemory --
- *     Validates guard regions for all allocated memory.
- *
- *----------------------------------------------------------------------
- */
-void
-Tcl_ValidateAllMemory (file, line)
-    char  *file;
-    int    line;
-{
-    struct mem_header *memScanP;
-
-    if (!ckallocInit) {
-	ckallocInit = 1;
-	TclpMutexInit(&ckallocMutex);
-    }
-    TclpMutexLock(&ckallocMutex);
-    for (memScanP = allocHead; memScanP != NULL; memScanP = memScanP->flink) {
-        ValidateMemory(memScanP, file, line, FALSE);
-    }
-    TclpMutexUnlock(&ckallocMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DumpActiveMemory --
- *     Displays all allocated memory to stderr.
- *
- * Results:
- *     Return TCL_ERROR if an error accessing the file occures, `errno' 
- *     will have the file error number left in it.
- *----------------------------------------------------------------------
- */
-int
-Tcl_DumpActiveMemory (fileName)
-    char *fileName;
-{
-    FILE              *fileP;
-    struct mem_header *memScanP;
-    char              *address;
-
-    if (fileName == NULL) {
-	fileP = stdout;
-    } else {
-	fileP = fopen(fileName, "w");
-	if (fileP == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-
-    TclpMutexLock(&ckallocMutex);
-    for (memScanP = allocHead; memScanP != NULL; memScanP = memScanP->flink) {
-        address = &memScanP->body [0];
-        fprintf(fileP, "%8lx - %8lx  %7ld @ %s %d %s",
-		(long unsigned int) address,
-                 (long unsigned int) address + memScanP->length - 1,
-		 memScanP->length, memScanP->file, memScanP->line,
-		 (memScanP->tagPtr == NULL) ? "" : memScanP->tagPtr->string);
-	(void) fputc('\n', fileP);
-    }
-    TclpMutexUnlock(&ckallocMutex);
-
-    if (fileP != stderr) {
-	fclose (fileP);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbCkalloc - debugging ckalloc
- *
- *        Allocate the requested amount of space plus some extra for
- *        guard bands at both ends of the request, plus a size, panicing 
- *        if there isn't enough space, then write in the guard bands
- *        and return the address of the space in the middle that the
- *        user asked for.
- *
- *        The second and third arguments are file and line, these contain
- *        the filename and line number corresponding to the caller.
- *        These are sent by the ckalloc macro; it uses the preprocessor
- *        autodefines __FILE__ and __LINE__.
- *
- *----------------------------------------------------------------------
- */
-char *
-Tcl_DbCkalloc(size, file, line)
-    unsigned int size;
-    char        *file;
-    int          line;
-{
-    struct mem_header *result;
-
-    if (validate_memory)
-        Tcl_ValidateAllMemory (file, line);
-
-    result = (struct mem_header *) TclpAlloc((unsigned)size + 
-                              sizeof(struct mem_header) + HIGH_GUARD_SIZE);
-    if (result == NULL) {
-        fflush(stdout);
-        TclDumpMemoryInfo(stderr);
-        panic("unable to alloc %d bytes, %s line %d", size, file, 
-              line);
-    }
-
-    /*
-     * Fill in guard zones and size.  Also initialize the contents of
-     * the block with bogus bytes to detect uses of initialized data.
-     * Link into allocated list.
-     */
-    if (init_malloced_bodies) {
-        memset ((VOID *) result, GUARD_VALUE,
-		size + sizeof(struct mem_header) + HIGH_GUARD_SIZE);
-    } else {
-	memset ((char *) result->low_guard, GUARD_VALUE, LOW_GUARD_SIZE);
-	memset (result->body + size, GUARD_VALUE, HIGH_GUARD_SIZE);
-    }
-    if (!ckallocInit) {
-	ckallocInit = 1;
-	TclpMutexInit(&ckallocMutex);
-    }
-    TclpMutexLock(&ckallocMutex);
-    result->length = size;
-    result->tagPtr = curTagPtr;
-    if (curTagPtr != NULL) {
-	curTagPtr->refCount++;
-    }
-    result->file = file;
-    result->line = line;
-    result->flink = allocHead;
-    result->blink = NULL;
-
-    if (allocHead != NULL)
-        allocHead->blink = result;
-    allocHead = result;
-
-    total_mallocs++;
-    if (trace_on_at_malloc && (total_mallocs >= trace_on_at_malloc)) {
-        (void) fflush(stdout);
-        fprintf(stderr, "reached malloc trace enable point (%d)\n",
-                total_mallocs);
-        fflush(stderr);
-        alloc_tracing = TRUE;
-        trace_on_at_malloc = 0;
-    }
-
-    if (alloc_tracing)
-        fprintf(stderr,"ckalloc %lx %d %s %d\n",
-		(long unsigned int) result->body, size, file, line);
-
-    if (break_on_malloc && (total_mallocs >= break_on_malloc)) {
-        break_on_malloc = 0;
-        (void) fflush(stdout);
-        fprintf(stderr,"reached malloc break limit (%d)\n", 
-                total_mallocs);
-        fprintf(stderr, "program will now enter C debugger\n");
-        (void) fflush(stderr);
-	abort();
-    }
-
-    current_malloc_packets++;
-    if (current_malloc_packets > maximum_malloc_packets)
-        maximum_malloc_packets = current_malloc_packets;
-    current_bytes_malloced += size;
-    if (current_bytes_malloced > maximum_bytes_malloced)
-        maximum_bytes_malloced = current_bytes_malloced;
-
-    TclpMutexUnlock(&ckallocMutex);
-
-    return result->body;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbCkfree - debugging ckfree
- *
- *        Verify that the low and high guards are intact, and if so
- *        then free the buffer else panic.
- *
- *        The guards are erased after being checked to catch duplicate
- *        frees.
- *
- *        The second and third arguments are file and line, these contain
- *        the filename and line number corresponding to the caller.
- *        These are sent by the ckfree macro; it uses the preprocessor
- *        autodefines __FILE__ and __LINE__.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_DbCkfree(ptr, file, line)
-    char *  ptr;
-    char     *file;
-    int       line;
-{
-    /*
-     * The following cast is *very* tricky.  Must convert the pointer
-     * to an integer before doing arithmetic on it, because otherwise
-     * the arithmetic will be done differently (and incorrectly) on
-     * word-addressed machines such as Crays (will subtract only bytes,
-     * even though BODY_OFFSET is in words on these machines).
-     */
-
-    struct mem_header *memp = (struct mem_header *)
-	    (((unsigned long) ptr) - BODY_OFFSET);
-
-    if (alloc_tracing)
-        fprintf(stderr, "ckfree %lx %ld %s %d\n",
-		(long unsigned int) memp->body, memp->length, file, line);
-
-    if (validate_memory)
-        Tcl_ValidateAllMemory(file, line);
-
-    TclpMutexLock(&ckallocMutex);
-    ValidateMemory(memp, file, line, TRUE);
-    if (init_malloced_bodies) {
-	memset((VOID *) ptr, GUARD_VALUE, (size_t) memp->length);
-    }
-
-    total_frees++;
-    current_malloc_packets--;
-    current_bytes_malloced -= memp->length;
-
-    if (memp->tagPtr != NULL) {
-	memp->tagPtr->refCount--;
-	if ((memp->tagPtr->refCount == 0) && (curTagPtr != memp->tagPtr)) {
-	    TclpFree((char *) memp->tagPtr);
-	}
-    }
-
-    /*
-     * Delink from allocated list
-     */
-    if (memp->flink != NULL)
-        memp->flink->blink = memp->blink;
-    if (memp->blink != NULL)
-        memp->blink->flink = memp->flink;
-    if (allocHead == memp)
-        allocHead = memp->flink;
-    TclpFree((char *) memp);
-    TclpMutexUnlock(&ckallocMutex);
-
-    return 0;
-}
-
-/*
- *--------------------------------------------------------------------
- *
- * Tcl_DbCkrealloc - debugging ckrealloc
- *
- *	Reallocate a chunk of memory by allocating a new one of the
- *	right size, copying the old data to the new location, and then
- *	freeing the old memory space, using all the memory checking
- *	features of this package.
- *
- *--------------------------------------------------------------------
- */
-char *
-Tcl_DbCkrealloc(ptr, size, file, line)
-    char *ptr;
-    unsigned int size;
-    char *file;
-    int line;
-{
-    char *new;
-    unsigned int copySize;
-
-    /*
-     * See comment from Tcl_DbCkfree before you change the following
-     * line.
-     */
-
-    struct mem_header *memp = (struct mem_header *)
-	    (((unsigned long) ptr) - BODY_OFFSET);
-
-    copySize = size;
-    if (copySize > (unsigned int) memp->length) {
-	copySize = memp->length;
-    }
-    new = Tcl_DbCkalloc(size, file, line);
-    memcpy((VOID *) new, (VOID *) ptr, (size_t) copySize);
-    Tcl_DbCkfree(ptr, file, line);
-    return(new);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Alloc, et al. --
- *
- *	These functions are defined in terms of the debugging versions
- *	when TCL_MEM_DEBUG is set.
- *
- * Results:
- *	Same as the debug versions.
- *
- * Side effects:
- *	Same as the debug versions.
- *
- *----------------------------------------------------------------------
- */
-
-#undef Tcl_Alloc
-#undef Tcl_Free
-#undef Tcl_Realloc
-
-char *
-Tcl_Alloc(size)
-    unsigned int size;
-{
-    return Tcl_DbCkalloc(size, "unknown", 0);
-}
-
-void
-Tcl_Free(ptr)
-    char *ptr;
-{
-    Tcl_DbCkfree(ptr, "unknown", 0);
-}
-
-char *
-Tcl_Realloc(ptr, size)
-    char *ptr;
-    unsigned int size;
-{
-    return Tcl_DbCkrealloc(ptr, size, "unknown", 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MemoryCmd --
- *     Implements the TCL memory command:
- *       memory info
- *       memory display
- *       break_on_malloc count
- *       trace_on_at_malloc count
- *       trace on|off
- *       validate on|off
- *
- * Results:
- *     Standard TCL results.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-static int
-MemoryCmd (clientData, interp, argc, argv)
-    ClientData  clientData;
-    Tcl_Interp *interp;
-    int         argc;
-    char      **argv;
-{
-    char *fileName;
-    Tcl_DString buffer;
-    int result;
-
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option [args..]\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1],"active") == 0) {
-        if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		    argv[0], " active file\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	fileName = Tcl_TranslateFileName(interp, argv[2], &buffer);
-	if (fileName == NULL) {
-	    return TCL_ERROR;
-	}
-	result = Tcl_DumpActiveMemory (fileName);
-	Tcl_DStringFree(&buffer);
-	if (result != TCL_OK) {
-	    Tcl_AppendResult(interp, "error accessing ", argv[2], 
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	return TCL_OK;
-    }
-    if (strcmp(argv[1],"break_on_malloc") == 0) {
-        if (argc != 3) {
-            goto argError;
-	}
-        if (Tcl_GetInt(interp, argv[2], &break_on_malloc) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-        return TCL_OK;
-    }
-    if (strcmp(argv[1],"info") == 0) {
-	char buffer[400];
-	sprintf(buffer, "%-25s %10d\n%-25s %10d\n%-25s %10d\n%-25s %10d\n%-25s %10d\n%-25s %10d\n",
-	    "total mallocs", total_mallocs, "total frees", total_frees,
-	    "current packets allocated", current_malloc_packets,
-	    "current bytes allocated", current_bytes_malloced,
-	    "maximum packets allocated", maximum_malloc_packets,
-	    "maximum bytes allocated", maximum_bytes_malloced);
-	Tcl_SetResult(interp, buffer, TCL_VOLATILE);
-        return TCL_OK;
-    }
-    if (strcmp(argv[1],"init") == 0) {
-        if (argc != 3) {
-            goto bad_suboption;
-	}
-        init_malloced_bodies = (strcmp(argv[2],"on") == 0);
-        return TCL_OK;
-    }
-    if (strcmp(argv[1],"tag") == 0) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " tag string\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if ((curTagPtr != NULL) && (curTagPtr->refCount == 0)) {
-	    TclpFree((char *) curTagPtr);
-	}
-	curTagPtr = (MemTag *) TclpAlloc(TAG_SIZE(strlen(argv[2])));
-	curTagPtr->refCount = 0;
-	strcpy(curTagPtr->string, argv[2]);
-	return TCL_OK;
-    }
-    if (strcmp(argv[1],"trace") == 0) {
-        if (argc != 3) {
-            goto bad_suboption;
-	}
-        alloc_tracing = (strcmp(argv[2],"on") == 0);
-        return TCL_OK;
-    }
-
-    if (strcmp(argv[1],"trace_on_at_malloc") == 0) {
-        if (argc != 3) {
-            goto argError;
-	}
-        if (Tcl_GetInt(interp, argv[2], &trace_on_at_malloc) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	return TCL_OK;
-    }
-    if (strcmp(argv[1],"validate") == 0) {
-        if (argc != 3) {
-	    goto bad_suboption;
-	}
-        validate_memory = (strcmp(argv[2],"on") == 0);
-        return TCL_OK;
-    }
-
-    Tcl_AppendResult(interp, "bad option \"", argv[1],
-	    "\": should be active, break_on_malloc, info, init, ",
-	    "tag, trace, trace_on_at_malloc, or validate", (char *) NULL);
-    return TCL_ERROR;
-
-argError:
-    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-	    " ", argv[1], " count\"", (char *) NULL);
-    return TCL_ERROR;
-
-bad_suboption:
-    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-	    " ", argv[1], " on|off\"", (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckmemCmd --
- *
- *	This is the command procedure for the "checkmem" command, which
- *	causes the application to exit after printing information about
- *	memory usage to the file passed to this command as its first
- *	argument.
- *
- * Results:
- *	Returns a standard Tcl completion code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CheckmemCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Interpreter for evaluation. */
-    int argc;				/* Number of arguments. */
-    char *argv[];			/* String values of arguments. */
-{
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" fileName\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    tclMemDumpFileName = dumpFile;
-    strcpy(tclMemDumpFileName, argv[1]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitMemory --
- *     Initialize the memory command.
- *
- *----------------------------------------------------------------------
- */
-void
-Tcl_InitMemory(interp)
-    Tcl_Interp *interp;
-{
-    TclInitDbCkalloc();
-    Tcl_CreateCommand (interp, "memory", MemoryCmd, (ClientData) NULL, 
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "checkmem", CheckmemCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-}
-
-
-#else	/* TCL_MEM_DEBUG */
-
-#undef Tcl_InitMemory
-#undef Tcl_DumpActiveMemory
-#undef Tcl_ValidateAllMemory
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Alloc --
- *     Interface to TclpAlloc when TCL_MEM_DEBUG is disabled.  It does check
- *     that memory was actually allocated.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_Alloc (size)
-    unsigned int size;
-{
-        char *result;
-
-        result = TclpAlloc(size);
-        if (result == NULL) 
-                panic("unable to alloc %d bytes", size);
-        return result;
-}
-
-char *
-Tcl_DbCkalloc(size, file, line)
-    unsigned int size;
-    char        *file;
-    int          line;
-{
-    char *result;
-
-    result = (char *) TclpAlloc(size);
-
-    if (result == NULL) {
-        fflush(stdout);
-        panic("unable to alloc %d bytes, %s line %d", size, file, 
-              line);
-    }
-    return result;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Realloc --
- *     Interface to TclpRealloc when TCL_MEM_DEBUG is disabled.  It does 
- *     check that memory was actually allocated.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_Realloc(ptr, size)
-    char *ptr;
-    unsigned int size;
-{
-    char *result;
-
-    result = TclpRealloc(ptr, size);
-    if (result == NULL) 
-	panic("unable to realloc %d bytes", size);
-    return result;
-}
-
-char *
-Tcl_DbCkrealloc(ptr, size, file, line)
-    char *ptr;
-    unsigned int size;
-    char *file;
-    int line;
-{
-    char *result;
-
-    result = (char *) TclpRealloc(ptr, size);
-
-    if (result == NULL) {
-        fflush(stdout);
-        panic("unable to realloc %d bytes, %s line %d", size, file, 
-              line);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Free --
- *     Interface to TclpFree when TCL_MEM_DEBUG is disabled.  Done here
- *     rather in the macro to keep some modules from being compiled with 
- *     TCL_MEM_DEBUG enabled and some with it disabled.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Free (ptr)
-    char *ptr;
-{
-        TclpFree(ptr);
-}
-
-int
-Tcl_DbCkfree(ptr, file, line)
-    char *  ptr;
-    char     *file;
-    int       line;
-{
-    TclpFree(ptr);
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitMemory --
- *     Dummy initialization for memory command, which is only available 
- *     if TCL_MEM_DEBUG is on.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-void
-Tcl_InitMemory(interp)
-    Tcl_Interp *interp;
-{
-}
-
-int
-Tcl_DumpActiveMemory(fileName)
-    char *fileName;
-{
-    return TCL_OK;
-}
-
-void
-Tcl_ValidateAllMemory(file, line)
-    char  *file;
-    int    line;
-{
-}
-
-void
-TclDumpMemoryInfo(outFile) 
-    FILE *outFile;
-{
-}
-
-#endif	/* TCL_MEM_DEBUG */
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclFinalizeMemorySubsystem --
- *
- *	This procedure is called to finalize all the structures that 
- *	are used by the memory allocator on a per-process basis.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This subsystem is self-initializing, since memory can be 
- *	allocated before Tcl is formally initialized.  After this call,
- *	this subsystem has been reset to its initial state and is 
- *	usable again.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclFinalizeMemorySubsystem()
-{
-#ifdef TCL_MEM_DEBUG
-    TclpMutexLock(&ckallocMutex);
-    if (tclMemDumpFileName != NULL) {
-	Tcl_DumpActiveMemory(tclMemDumpFileName);
-    }
-    if (curTagPtr != NULL) {
-	TclpFree((char *) curTagPtr);
-    }
-    allocHead = NULL;
-    TclpMutexUnlock(&ckallocMutex);
-#endif
-
-#if USE_TCLALLOC
-    TclFinalizeAllocSubsystem(); 
-#endif
-}
diff --git a/generic/tclClock.c b/generic/tclClock.c
deleted file mode 100644
index 2015f53..0000000
--- a/generic/tclClock.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* 
- * tclClock.c --
- *
- *	Contains the time and date related commands.  This code
- *	is derived from the time and date facilities of TclX,
- *	by Mark Diekhans and Karl Lehenbauer.
- *
- * Copyright 1991-1995 Karl Lehenbauer and Mark Diekhans.
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclClock.c,v 1.4 1999/04/16 00:46:43 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The date parsing stuff uses lexx and has tons o statics.
- */
-
-TCL_DECLARE_MUTEX(clockMutex)
-
-/*
- * Function prototypes for local procedures in this file:
- */
-
-static int		FormatClock _ANSI_ARGS_((Tcl_Interp *interp,
-			    unsigned long clockVal, int useGMT,
-			    char *format));
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_ClockObjCmd --
- *
- *	This procedure is invoked to process the "clock" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *-------------------------------------------------------------------------
- */
-
-int
-Tcl_ClockObjCmd (client, interp, objc, objv)
-    ClientData client;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument values. */
-{
-    Tcl_Obj *resultPtr;
-    int index;
-    Tcl_Obj *CONST *objPtr;
-    int useGMT = 0;
-    char *format = "%a %b %d %X %Z %Y";
-    int dummy;
-    unsigned long baseClock, clockVal;
-    long zone;
-    Tcl_Obj *baseObjPtr = NULL;
-    char *scanStr;
-    
-    static char *switches[] =
-	    {"clicks", "format", "scan", "seconds", (char *) NULL};
-    static char *formatSwitches[] = {"-format", "-gmt", (char *) NULL};
-    static char *scanSwitches[] = {"-base", "-gmt", (char *) NULL};
-
-    resultPtr = Tcl_GetObjResult(interp);
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], switches, "option", 0, &index)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-    switch (index) {
-	case 0:			/* clicks */
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_SetLongObj(resultPtr, (long) TclpGetClicks());
-	    return TCL_OK;
-	case 1:			/* format */
-	    if ((objc < 3) || (objc > 7)) {
-		wrongFmtArgs:
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"clockval ?-format string? ?-gmt boolean?");
-		return TCL_ERROR;
-	    }
-
-	    if (Tcl_GetLongFromObj(interp, objv[2], (long*) &clockVal)
-		    != TCL_OK) {
-		return TCL_ERROR;
-	    }
-    
-	    objPtr = objv+3;
-	    objc -= 3;
-	    while (objc > 1) {
-		if (Tcl_GetIndexFromObj(interp, objPtr[0], formatSwitches,
-			"switch", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		switch (index) {
-		    case 0:		/* -format */
-			format = Tcl_GetStringFromObj(objPtr[1], &dummy);
-			break;
-		    case 1:		/* -gmt */
-			if (Tcl_GetBooleanFromObj(interp, objPtr[1],
-				&useGMT) != TCL_OK) {
-			    return TCL_ERROR;
-			}
-			break;
-		}
-		objPtr += 2;
-		objc -= 2;
-	    }
-	    if (objc != 0) {
-		goto wrongFmtArgs;
-	    }
-	    return FormatClock(interp, (unsigned long) clockVal, useGMT,
-		    format);
-	case 2:			/* scan */
-	    if ((objc < 3) || (objc > 7)) {
-		wrongScanArgs:
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"dateString ?-base clockValue? ?-gmt boolean?");
-		return TCL_ERROR;
-	    }
-
-	    objPtr = objv+3;
-	    objc -= 3;
-	    while (objc > 1) {
-		if (Tcl_GetIndexFromObj(interp, objPtr[0], scanSwitches,
-			"switch", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		switch (index) {
-		    case 0:		/* -base */
-			baseObjPtr = objPtr[1];
-			break;
-		    case 1:		/* -gmt */
-			if (Tcl_GetBooleanFromObj(interp, objPtr[1],
-				&useGMT) != TCL_OK) {
-			    return TCL_ERROR;
-			}
-			break;
-		}
-		objPtr += 2;
-		objc -= 2;
-	    }
-	    if (objc != 0) {
-		goto wrongScanArgs;
-	    }
-
-	    if (baseObjPtr != NULL) {
-		if (Tcl_GetLongFromObj(interp, baseObjPtr,
-			(long*) &baseClock) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-	    } else {
-		baseClock = TclpGetSeconds();
-	    }
-
-	    if (useGMT) {
-		zone = -50000; /* Force GMT */
-	    } else {
-		zone = TclpGetTimeZone((unsigned long) baseClock);
-	    }
-
-	    scanStr = Tcl_GetStringFromObj(objv[2], &dummy);
-	    Tcl_MutexLock(&clockMutex);
-	    if (TclGetDate(scanStr, (unsigned long) baseClock, zone,
-		    (unsigned long *) &clockVal) < 0) {
-		Tcl_MutexUnlock(&clockMutex);
-		Tcl_AppendStringsToObj(resultPtr,
-			"unable to convert date-time string \"",
-			scanStr, "\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_MutexUnlock(&clockMutex);
-
-	    Tcl_SetLongObj(resultPtr, (long) clockVal);
-	    return TCL_OK;
-	case 3:			/* seconds */
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_SetLongObj(resultPtr, (long) TclpGetSeconds());
-	    return TCL_OK;
-	default:
-	    return TCL_ERROR;	/* Should never be reached. */
-    }
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * FormatClock --
- *
- *      Formats a time value based on seconds into a human readable
- *	string.
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      None.
- *
- *-----------------------------------------------------------------------------
- */
-
-static int
-FormatClock(interp, clockVal, useGMT, format)
-    Tcl_Interp *interp;			/* Current interpreter. */
-    unsigned long clockVal;	       	/* Time in seconds. */
-    int useGMT;				/* Boolean */
-    char *format;			/* Format string */
-{
-    struct tm *timeDataPtr;
-    Tcl_DString buffer;
-    int bufSize;
-    char *p;
-    Tcl_Obj *resultPtr;
-    int result;
-#ifndef HAVE_TM_ZONE
-    int savedTimeZone = 0;	/* lint. */
-    char *savedTZEnv = NULL;	/* lint. */
-#endif
-
-    resultPtr = Tcl_GetObjResult(interp);
-#ifdef HAVE_TZSET
-    /*
-     * Some systems forgot to call tzset in localtime, make sure its done.
-     */
-    static int  calledTzset = 0;
-
-    Tcl_MutexLock(&clockMutex);
-    if (!calledTzset) {
-        tzset();
-        calledTzset = 1;
-    }
-    Tcl_MutexUnlock(&clockMutex);
-#endif
-
-#ifndef HAVE_TM_ZONE
-    /*
-     * This is a kludge for systems not having the timezone string in
-     * struct tm.  No matter what was specified, they use the local
-     * timezone string.
-     */
-
-    if (useGMT) {
-        char *varValue;
-
-        varValue = Tcl_GetVar2(interp, "env", "TZ", TCL_GLOBAL_ONLY);
-        if (varValue != NULL) {
-	    savedTZEnv = strcpy(ckalloc(strlen(varValue) + 1), varValue);
-        } else {
-            savedTZEnv = NULL;
-	}
-        Tcl_SetVar2(interp, "env", "TZ", "GMT", TCL_GLOBAL_ONLY);
-        savedTimeZone = timezone;
-        timezone = 0;
-        tzset();
-    }
-#endif
-
-    timeDataPtr = TclpGetDate((TclpTime_t) &clockVal, useGMT);
-    
-    /*
-     * Make a guess at the upper limit on the substituted string size
-     * based on the number of percents in the string.
-     */
-
-    for (bufSize = 1, p = format; *p != '\0'; p++) {
-	if (*p == '%') {
-	    bufSize += 40;
-	} else {
-	    bufSize++;
-	}
-    }
-    Tcl_DStringInit(&buffer);
-    Tcl_DStringSetLength(&buffer, bufSize);
-
-    Tcl_MutexLock(&clockMutex);
-    result = TclpStrftime(buffer.string, (unsigned int) bufSize, format,
-	    timeDataPtr);
-    Tcl_MutexUnlock(&clockMutex);
-
-#ifndef HAVE_TM_ZONE
-    if (useGMT) {
-        if (savedTZEnv != NULL) {
-            Tcl_SetVar2(interp, "env", "TZ", savedTZEnv, TCL_GLOBAL_ONLY);
-            ckfree(savedTZEnv);
-        } else {
-            Tcl_UnsetVar2(interp, "env", "TZ", TCL_GLOBAL_ONLY);
-        }
-        timezone = savedTimeZone;
-        tzset();
-    }
-#endif
-    if ((result == 0) && (*format != '\0')) {
-	Tcl_AppendStringsToObj(resultPtr, "bad format string \"", format, 
-		"\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    Tcl_SetStringObj(resultPtr, buffer.string, -1);
-    Tcl_DStringFree(&buffer);
-    return TCL_OK;
-}
-
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
deleted file mode 100644
index 8aa6880..0000000
--- a/generic/tclCmdAH.c
+++ /dev/null
@@ -1,2305 +0,0 @@
-/* 
- * tclCmdAH.c --
- *
- *	This file contains the top-level command routines for most of
- *	the Tcl built-in commands whose names begin with the letters
- *	A to H.
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCmdAH.c,v 1.5 1999/04/16 00:46:43 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include <locale.h>
-
-typedef int (StatProc)_ANSI_ARGS_((CONST char *path, struct stat *buf));
-
-/*
- * Prototypes for local procedures defined in this file:
- */
-
-static int		CheckAccess _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, int mode));
-static int		GetStatBuf _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, StatProc *statProc,
-			    struct stat *statPtr));
-static char *		GetTypeFromMode _ANSI_ARGS_((int mode));
-static int		SplitPath _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, int *argcPtr, char ***argvPtr));
-static int		StoreStatData _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *varName, struct stat *statPtr));
-static char **		StringifyObjects _ANSI_ARGS_((int objc,
-			    Tcl_Obj *CONST objv[]));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_BreakObjCmd --
- *
- *	This procedure is invoked to process the "break" Tcl command.
- *	See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "break" or the name
- *	to which "break" was renamed: e.g., "set z break; $z"
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_BreakObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    if (objc != 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, NULL);
-	return TCL_ERROR;
-    }
-    return TCL_BREAK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CaseObjCmd --
- *
- *	This procedure is invoked to process the "case" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_CaseObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register int i;
-    int body, result;
-    char *string, *arg;
-    int caseObjc;
-    Tcl_Obj *CONST *caseObjv;
-    Tcl_Obj *armPtr;
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"string ?in? patList body ... ?default body?");
-	return TCL_ERROR;
-    }
-
-    string = Tcl_GetString(objv[1]);
-    body = -1;
-
-    arg = Tcl_GetString(objv[2]);
-    if (strcmp(arg, "in") == 0) {
-	i = 3;
-    } else {
-	i = 2;
-    }
-    caseObjc = objc - i;
-    caseObjv = objv + i;
-
-    /*
-     * If all of the pattern/command pairs are lumped into a single
-     * argument, split them out again.
-     */
-
-    if (caseObjc == 1) {
-	Tcl_Obj **newObjv;
-	
-	Tcl_ListObjGetElements(interp, caseObjv[0], &caseObjc, &newObjv);
-	caseObjv = newObjv;
-    }
-
-    for (i = 0;  i < caseObjc;  i += 2) {
-	int patObjc, j;
-	char **patObjv;
-	char *pat;
-	unsigned char *p;
-
-	if (i == (caseObjc - 1)) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "extra case pattern with no body", -1);
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * Check for special case of single pattern (no list) with
-	 * no backslash sequences.
-	 */
-
-	pat = Tcl_GetString(caseObjv[i]);
-	for (p = (unsigned char *) pat; *p != '\0'; p++) {
-	    if (isspace(*p) || (*p == '\\')) {	/* INTL: ISO space, UCHAR */
-		break;
-	    }
-	}
-	if (*p == '\0') {
-	    if ((*pat == 'd') && (strcmp(pat, "default") == 0)) {
-		body = i + 1;
-	    }
-	    if (Tcl_StringMatch(string, pat)) {
-		body = i + 1;
-		goto match;
-	    }
-	    continue;
-	}
-
-
-	/*
-	 * Break up pattern lists, then check each of the patterns
-	 * in the list.
-	 */
-
-	result = Tcl_SplitList(interp, pat, &patObjc, &patObjv);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	for (j = 0; j < patObjc; j++) {
-	    if (Tcl_StringMatch(string, patObjv[j])) {
-		body = i + 1;
-		break;
-	    }
-	}
-	ckfree((char *) patObjv);
-	if (j < patObjc) {
-	    break;
-	}
-    }
-
-    match:
-    if (body != -1) {
-	armPtr = caseObjv[body - 1];
-	result = Tcl_EvalObjEx(interp, caseObjv[body], 0);
-	if (result == TCL_ERROR) {
-	    char msg[100 + TCL_INTEGER_SPACE];
-	    
-	    arg = Tcl_GetString(armPtr);
-	    sprintf(msg,
-		    "\n    (\"%.50s\" arm line %d)", arg,
-	            interp->errorLine);
-	    Tcl_AddObjErrorInfo(interp, msg, -1);
-	}
-	return result;
-    }
-
-    /*
-     * Nothing matched: return nothing.
-     */
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CatchObjCmd --
- *
- *	This object-based procedure is invoked to process the "catch" Tcl 
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_CatchObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *varNamePtr = NULL;
-    int result;
-
-    if ((objc != 2) && (objc != 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "command ?varName?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Save a pointer to the variable name object, if any, in case the
-     * Tcl_EvalObj reallocates the bytecode interpreter's evaluation
-     * stack rendering objv invalid.
-     */
-    
-    if (objc == 3) {
-	varNamePtr = objv[2];
-    }
-    
-    result = Tcl_EvalObjEx(interp, objv[1], 0);
-    
-    if (objc == 3) {
-	if (Tcl_ObjSetVar2(interp, varNamePtr, NULL,
-		Tcl_GetObjResult(interp), 0) == NULL) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),  
-	            "couldn't save command result in variable", -1);
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Set the interpreter's object result to an integer object holding the
-     * integer Tcl_EvalObj result. Note that we don't bother generating a
-     * string representation. We reset the interpreter's object result
-     * to an unshared empty object and then set it to be an integer object.
-     */
-
-    Tcl_ResetResult(interp);
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), result);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CdObjCmd --
- *
- *	This procedure is invoked to process the "cd" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_CdObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *dirName;
-    Tcl_DString ds;
-    int result;
-
-    if (objc > 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?dirName?");
-	return TCL_ERROR;
-    }
-
-    if (objc == 2) {
-	dirName = Tcl_GetString(objv[1]);
-    } else {
-	dirName = "~";
-    }
-    if (Tcl_TranslateFileName(interp, dirName, &ds) == NULL) {
-	return TCL_ERROR;
-    }
-
-    result = Tcl_Chdir(Tcl_DStringValue(&ds));
-    Tcl_DStringFree(&ds);
-
-    if (result != 0) {
-	Tcl_AppendResult(interp, "couldn't change working directory to \"",
-		dirName, "\": ", Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConcatObjCmd --
- *
- *	This object-based procedure is invoked to process the "concat" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ConcatObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    if (objc >= 2) {
-	Tcl_SetObjResult(interp, Tcl_ConcatObj(objc-1, objv+1));
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ContinueObjCmd -
- *
- *	This procedure is invoked to process the "continue" Tcl command.
- *	See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "continue" or the name
- *	to which "continue" was renamed: e.g., "set z continue; $z"
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ContinueObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    if (objc != 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, NULL);
-	return TCL_ERROR;
-    }
-    return TCL_CONTINUE;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EncodingObjCmd --
- *
- *	This command manipulates encodings.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EncodingObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int index, length;
-    Tcl_Encoding encoding;
-    char *string;
-    Tcl_DString ds;
-    Tcl_Obj *resultPtr;
-
-    static char *optionStrings[] = {
-	"convertfrom", "convertto", "names", "system",
-	NULL
-    };
-    enum options {
-	ENC_CONVERTFROM, ENC_CONVERTTO, ENC_NAMES, ENC_SYSTEM
-    };
-
-    if (objc < 2) {
-    	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch ((enum options) index) {
-	case ENC_CONVERTTO:
-	case ENC_CONVERTFROM: {
-	    char *name;
-	    Tcl_Obj *data;
-	    if (objc == 3) {
-		name = NULL;
-		data = objv[2];
-	    } else if (objc == 4) {
-		name = Tcl_GetString(objv[2]);
-		data = objv[3];
-	    } else {
-		Tcl_WrongNumArgs(interp, 2, objv, "?encoding? data");
-		return TCL_ERROR;
-	    }
-	    
-	    encoding = Tcl_GetEncoding(interp, name);
-	    if (!encoding) {
-		return TCL_ERROR;
-	    }
-
-	    if ((enum options) index == ENC_CONVERTFROM) {
-		/*
-		 * Treat the string as binary data.
-		 */
-
-		string = (char *) Tcl_GetByteArrayFromObj(data, &length);
-		Tcl_ExternalToUtfDString(encoding, string, length, &ds);
-
-		/*
-		 * Note that we cannot use Tcl_DStringResult here because
-		 * it will truncate the string at the first null byte.
-		 */
-
-		Tcl_SetStringObj(Tcl_GetObjResult(interp),
-			Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
-		Tcl_DStringFree(&ds);
-	    } else {
-		/*
-		 * Store the result as binary data.
-		 */
-
-		string = Tcl_GetStringFromObj(data, &length);
-		Tcl_UtfToExternalDString(encoding, string, length, &ds);
-		resultPtr = Tcl_GetObjResult(interp);
-		Tcl_SetByteArrayObj(resultPtr, 
-			(unsigned char *) Tcl_DStringValue(&ds),
-			Tcl_DStringLength(&ds));
-		Tcl_DStringFree(&ds);
-	    }
-
-	    Tcl_FreeEncoding(encoding);
-	    break;
-	}
-	case ENC_NAMES: {
-	    if (objc > 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_GetEncodingNames(interp);
-	    break;
-	}
-	case ENC_SYSTEM: {
-	    if (objc > 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "?encoding?");
-		return TCL_ERROR;
-	    }
-	    if (objc == 2) {
-	        Tcl_SetResult(interp, Tcl_GetEncodingName(NULL), TCL_STATIC);
-	    } else {
-	        return Tcl_SetSystemEncoding(interp,
-			Tcl_GetStringFromObj(objv[2], NULL));
-	    }
-	    break;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ErrorObjCmd --
- *
- *	This procedure is invoked to process the "error" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ErrorObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *info;
-    int infoLen;
-
-    if ((objc < 2) || (objc > 4)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "message ?errorInfo? ?errorCode?");
-	return TCL_ERROR;
-    }
-    
-    if (objc >= 3) {		/* process the optional info argument */
-	info = Tcl_GetStringFromObj(objv[2], &infoLen);
-	if (*info != 0) {
-	    Tcl_AddObjErrorInfo(interp, info, infoLen);
-	    iPtr->flags |= ERR_ALREADY_LOGGED;
-	}
-    }
-    
-    if (objc == 4) {
-	Tcl_SetVar2Ex(interp, "errorCode", NULL, objv[3], TCL_GLOBAL_ONLY);
-	iPtr->flags |= ERROR_CODE_SET;
-    }
-    
-    Tcl_SetObjResult(interp, objv[1]);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalObjCmd --
- *
- *	This object-based procedure is invoked to process the "eval" Tcl 
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_EvalObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int result;
-    register Tcl_Obj *objPtr;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "arg ?arg ...?");
-	return TCL_ERROR;
-    }
-    
-    if (objc == 2) {
-	result = Tcl_EvalObjEx(interp, objv[1], 0);
-    } else {
-	/*
-	 * More than one argument: concatenate them together with spaces
-	 * between, then evaluate the result.
-	 */
-    
-	objPtr = Tcl_ConcatObj(objc-1, objv+1);
-	Tcl_IncrRefCount(objPtr);
-	result = Tcl_EvalObjEx(interp, objPtr, 0);
-	Tcl_DecrRefCount(objPtr);
-    }
-    if (result == TCL_ERROR) {
-	char msg[32 + TCL_INTEGER_SPACE];
-
-	sprintf(msg, "\n    (\"eval\" body line %d)", interp->errorLine);
-	Tcl_AddObjErrorInfo(interp, msg, -1);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ExitObjCmd --
- *
- *	This procedure is invoked to process the "exit" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ExitObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int value;
-
-    if ((objc != 1) && (objc != 2)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?returnCode?");
-	return TCL_ERROR;
-    }
-    
-    if (objc == 1) {
-	value = 0;
-    } else if (Tcl_GetIntFromObj(interp, objv[1], &value) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    Tcl_Exit(value);
-    /*NOTREACHED*/
-    return TCL_OK;			/* Better not ever reach this! */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ExprObjCmd --
- *
- *	This object-based procedure is invoked to process the "expr" Tcl
- *	command. See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is called in two
- *	circumstances: 1) to execute expr commands that are too complicated
- *	or too unsafe to try compiling directly into an inline sequence of
- *	instructions, and 2) to execute commands where the command name is
- *	computed at runtime and is "expr" or the name to which "expr" was
- *	renamed (e.g., "set z expr; $z 2+3")
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ExprObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{	 
-    register Tcl_Obj *objPtr;
-    Tcl_Obj *resultPtr;
-    register char *bytes;
-    int length, i, result;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (objc == 2) {
-	result = Tcl_ExprObj(interp, objv[1], &resultPtr);
-	if (result == TCL_OK) {
-	    Tcl_SetObjResult(interp, resultPtr);
-	    Tcl_DecrRefCount(resultPtr);  /* done with the result object */
-	}
-	return result;
-    }
-
-    /*
-     * Create a new object holding the concatenated argument strings.
-     */
-
-    bytes = Tcl_GetStringFromObj(objv[1], &length);
-    objPtr = Tcl_NewStringObj(bytes, length);
-    Tcl_IncrRefCount(objPtr);
-    for (i = 2;  i < objc;  i++) {
-	Tcl_AppendToObj(objPtr, " ", 1);
-	bytes = Tcl_GetStringFromObj(objv[i], &length);
-	Tcl_AppendToObj(objPtr, bytes, length);
-    }
-
-    /*
-     * Evaluate the concatenated string object.
-     */
-
-    result = Tcl_ExprObj(interp, objPtr, &resultPtr);
-    if (result == TCL_OK) {
-	Tcl_SetObjResult(interp, resultPtr);
-	Tcl_DecrRefCount(resultPtr);  /* done with the result object */
-    }
-
-    /*
-     * Free allocated resources.
-     */
-    
-    Tcl_DecrRefCount(objPtr);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FileObjCmd --
- *
- *	This procedure is invoked to process the "file" Tcl command.
- *	See the user documentation for details on what it does.
- *	PLEASE NOTE THAT THIS FAILS WITH FILENAMES AND PATHS WITH
- *	EMBEDDED NULLS, WHICH COULD THEORETICALLY HAPPEN ON A MAC.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FileObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *resultPtr;
-    int index;
-
-/*
- * This list of constants should match the fileOption string array below.
- */
-
-    static char *fileOptions[] = {
-	"atime",	"attributes",	"copy",		"delete",
-	"dirname",	"executable",	"exists",	"extension",
-	"isdirectory",	"isfile",	"join",		"lstat",
-	"mtime",	"mkdir",	"nativename",	"owned",
-	"pathtype",	"readable",	"readlink",	"rename",
-	"rootname",	"size",		"split",	"stat",
-	"tail",		"type",		"volumes",	"writable",
-	(char *) NULL
-    };
-    enum options {
-	FILE_ATIME,	FILE_ATTRIBUTES, FILE_COPY,	FILE_DELETE,
-	FILE_DIRNAME,	FILE_EXECUTABLE, FILE_EXISTS,	FILE_EXTENSION,
-	FILE_ISDIRECTORY, FILE_ISFILE,	FILE_JOIN,	FILE_LSTAT,
-	FILE_MTIME,	FILE_MKDIR,	FILE_NATIVENAME, FILE_OWNED,
-	FILE_PATHTYPE,	FILE_READABLE,	FILE_READLINK,	FILE_RENAME,
-	FILE_ROOTNAME,	FILE_SIZE,	FILE_SPLIT,	FILE_STAT,
-	FILE_TAIL,	FILE_TYPE,	FILE_VOLUMES,	FILE_WRITABLE
-    };
-
-    if (objc < 2) {
-    	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], fileOptions, "option", 0,
-	    &index) != TCL_OK) {
-    	return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    switch ((enum options) index) {
-    	case FILE_ATIME: {
-	    struct stat buf;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    if (GetStatBuf(interp, objv[2], TclpStat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetLongObj(resultPtr, (long) buf.st_atime);
-	    return TCL_OK;
-	}
-	case FILE_ATTRIBUTES: {
-            return TclFileAttrsCmd(interp, objc, objv);
-	}
-	case FILE_COPY: {
-	    int result;
-	    char **argv;
-
-	    argv = StringifyObjects(objc, objv);
-	    result = TclFileCopyCmd(interp, objc, argv);
-	    ckfree((char *) argv);
-	    return result;
-	}	    
-	case FILE_DELETE: {
-	    int result;
-	    char **argv;
-
-	    argv = StringifyObjects(objc, objv);
-	    result = TclFileDeleteCmd(interp, objc, argv);
-	    ckfree((char *) argv);
-	    return result;
-	}
-    	case FILE_DIRNAME: {
-    	    int argc;
-	    char **argv;
-
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    if (SplitPath(interp, objv[2], &argc, &argv) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * Return all but the last component.  If there is only one
-	     * component, return it if the path was non-relative, otherwise
-	     * return the current directory.
-	     */
-
-	    if (argc > 1) {
-		Tcl_DString ds;
-
-		Tcl_DStringInit(&ds);
-	    	Tcl_JoinPath(argc - 1, argv, &ds);
-	    	Tcl_SetStringObj(resultPtr, Tcl_DStringValue(&ds),
-			Tcl_DStringLength(&ds));
-		Tcl_DStringFree(&ds);
-	    } else if ((argc == 0)
-		    || (Tcl_GetPathType(argv[0]) == TCL_PATH_RELATIVE)) {
-		Tcl_SetStringObj(resultPtr,
-			((tclPlatform == TCL_PLATFORM_MAC) ? ":" : "."), 1);
-	    } else {
-	    	Tcl_SetStringObj(resultPtr, argv[0], -1);
-	    }
-	    ckfree((char *) argv);
-	    return TCL_OK;
-	}
-	case FILE_EXECUTABLE: {
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    return CheckAccess(interp, objv[2], X_OK);
-	}
-	case FILE_EXISTS: {
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    return CheckAccess(interp, objv[2], F_OK);
-	}
-	case FILE_EXTENSION: {
-	    char *fileName, *extension;
-	    if (objc != 3) {
-	    	goto only3Args;
-	    }
-	    fileName = Tcl_GetString(objv[2]);
-	    extension = TclGetExtension(fileName);
-	    if (extension != NULL) {
-	    	Tcl_SetStringObj(resultPtr, extension, -1);
-	    }
-	    return TCL_OK;
-	}
-    	case FILE_ISDIRECTORY: {
-	    int value;
-	    struct stat buf;
-
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    value = 0;
-	    if (GetStatBuf(NULL, objv[2], TclpStat, &buf) == TCL_OK) {
-		value = S_ISDIR(buf.st_mode);
-	    }
-	    Tcl_SetBooleanObj(resultPtr, value);
-	    return TCL_OK;
-	}
-    	case FILE_ISFILE: {
-	    int value;
-	    struct stat buf;
-	    
-    	    if (objc != 3) {
-    	    	goto only3Args;
-    	    }
-	    value = 0;
-	    if (GetStatBuf(NULL, objv[2], TclpStat, &buf) == TCL_OK) {
-		value = S_ISREG(buf.st_mode);
-	    }
-	    Tcl_SetBooleanObj(resultPtr, value);
-	    return TCL_OK;
-	}
-	case FILE_JOIN: {
-	    char **argv;
-	    Tcl_DString ds;
-
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "name ?name ...?");
-		return TCL_ERROR;
-	    }
-	    argv = StringifyObjects(objc - 2, objv + 2);
-	    Tcl_DStringInit(&ds);
-	    Tcl_JoinPath(objc - 2, argv, &ds);
-	    Tcl_SetStringObj(resultPtr, Tcl_DStringValue(&ds),
-		    Tcl_DStringLength(&ds));
-	    Tcl_DStringFree(&ds);
-	    ckfree((char *) argv);
-	    return TCL_OK;
-	}
-    	case FILE_LSTAT: {
-	    char *varName;
-	    struct stat buf;
-
-    	    if (objc != 4) {
-    	    	Tcl_WrongNumArgs(interp, 2, objv, "name varName");
-    	    	return TCL_ERROR;
-    	    }
-	    if (GetStatBuf(interp, objv[2], TclpLstat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    varName = Tcl_GetString(objv[3]);
-	    return StoreStatData(interp, varName, &buf);
-	}
-	case FILE_MTIME: {
-	    struct stat buf;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    if (GetStatBuf(interp, objv[2], TclpStat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetLongObj(resultPtr, (long) buf.st_mtime);
-	    return TCL_OK;
-	}
-	case FILE_MKDIR: {
-	    char **argv;
-	    int result;
-
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "name ?name ...?");
-		return TCL_ERROR;
-	    }
-	    argv = StringifyObjects(objc, objv);
-	    result = TclFileMakeDirsCmd(interp, objc, argv);
-	    ckfree((char *) argv);
-	    return result;
-	}
-	case FILE_NATIVENAME: {
-	    char *fileName;
-	    Tcl_DString ds;
-
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    fileName = Tcl_GetString(objv[2]);
-	    fileName = Tcl_TranslateFileName(interp, fileName, &ds);
-	    if (fileName == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetStringObj(resultPtr, fileName, Tcl_DStringLength(&ds));
-	    Tcl_DStringFree(&ds);
-	    return TCL_OK;
-	}
-	case FILE_OWNED: {
-	    int value;
-	    struct stat buf;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    value = 0;
-	    if (GetStatBuf(NULL, objv[2], TclpStat, &buf) == TCL_OK) {
-		/*
-		 * For Windows and Macintosh, there are no user ids 
-		 * associated with a file, so we always return 1.
-		 */
-
-#if (defined(__WIN32__) || defined(MAC_TCL))
-		value = 1;
-#else
-		value = (geteuid() == buf.st_uid);
-#endif
-	    }	    
-	    Tcl_SetBooleanObj(resultPtr, value);
-	    return TCL_OK;
-	}
-	case FILE_PATHTYPE: {
-	    char *fileName;
-
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    fileName = Tcl_GetString(objv[2]);
-	    switch (Tcl_GetPathType(fileName)) {
-	    	case TCL_PATH_ABSOLUTE:
-	    	    Tcl_SetStringObj(resultPtr, "absolute", -1);
-		    break;
-	    	case TCL_PATH_RELATIVE:
-	    	    Tcl_SetStringObj(resultPtr, "relative", -1);
-	    	    break;
-	    	case TCL_PATH_VOLUME_RELATIVE:
-		    Tcl_SetStringObj(resultPtr, "volumerelative", -1);
-		    break;
-	    }
-	    return TCL_OK;
-	}
-    	case FILE_READABLE: {
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    return CheckAccess(interp, objv[2], R_OK);
-	}
-	case FILE_READLINK: {
-	    char *fileName, *contents;
-	    Tcl_DString name, link;
-		
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    
-	    fileName = Tcl_GetString(objv[2]);
-	    fileName = Tcl_TranslateFileName(interp, fileName, &name);
-	    if (fileName == NULL) {
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * If S_IFLNK isn't defined it means that the machine doesn't
-	     * support symbolic links, so the file can't possibly be a
-	     * symbolic link.  Generate an EINVAL error, which is what
-	     * happens on machines that do support symbolic links when
-	     * you invoke readlink on a file that isn't a symbolic link.
-	     */
-
-#ifndef S_IFLNK
-	    contents = NULL;
-	    errno = EINVAL;
-#else
-	    contents = TclpReadlink(fileName, &link);
-#endif /* S_IFLNK */
-
-	    Tcl_DStringFree(&name);
-	    if (contents == NULL) {
-	    	Tcl_AppendResult(interp, "could not readlink \"", 
-	    		Tcl_GetString(objv[2]), "\": ", 
-	    		Tcl_PosixError(interp), (char *) NULL);
-	    	return TCL_ERROR;
-	    }
-	    Tcl_DStringResult(interp, &link);
-	    return TCL_OK;
-	}
-	case FILE_RENAME: {
-	    int result;
-	    char **argv;
-
-	    argv = StringifyObjects(objc, objv);
-	    result = TclFileRenameCmd(interp, objc, argv);
-	    ckfree((char *) argv);
-	    return result;
-	}
-	case FILE_ROOTNAME: {
-	    int length;
-	    char *fileName, *extension;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    fileName = Tcl_GetStringFromObj(objv[2], &length);
-	    extension = TclGetExtension(fileName);
-	    if (extension == NULL) {
-	    	Tcl_SetObjResult(interp, objv[2]);
-	    } else {
-	        Tcl_SetStringObj(resultPtr, fileName,
-			(int) (length - strlen(extension)));
-	    }
-	    return TCL_OK;
-	}
-	case FILE_SIZE: {
-	    struct stat buf;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    if (GetStatBuf(interp, objv[2], TclpStat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetLongObj(resultPtr, (long) buf.st_size);
-	    return TCL_OK;
-	}
-	case FILE_SPLIT: {
-	    int i, argc;
-	    char **argv;
-	    char *fileName;
-	    Tcl_Obj *objPtr;
-	    
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    fileName = Tcl_GetString(objv[2]);
-	    Tcl_SplitPath(fileName, &argc, &argv);
-	    for (i = 0; i < argc; i++) {
-		objPtr = Tcl_NewStringObj(argv[i], -1);
-		Tcl_ListObjAppendElement(NULL, resultPtr, objPtr);
-	    }
-	    ckfree((char *) argv);
-	    return TCL_OK;
-	}
-	case FILE_STAT: {
-	    char *varName;
-	    struct stat buf;
-	    
-	    if (objc != 4) {
-	    	Tcl_WrongNumArgs(interp, 1, objv, "stat name varName");
-		return TCL_ERROR;
-	    }
-	    if (GetStatBuf(interp, objv[2], TclpStat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    varName = Tcl_GetString(objv[3]);
-	    return StoreStatData(interp, varName, &buf);
-	}
-    	case FILE_TAIL: {
-	    int argc;
-	    char **argv;
-
-	    if (objc != 3) {
-		goto only3Args;
-	    }
-	    if (SplitPath(interp, objv[2], &argc, &argv) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * Return the last component, unless it is the only component,
-	     * and it is the root of an absolute path.
-	     */
-
-	    if (argc > 0) {
-	    	if ((argc > 1)
-		    	|| (Tcl_GetPathType(argv[0]) == TCL_PATH_RELATIVE)) {
-		    Tcl_SetStringObj(resultPtr, argv[argc - 1], -1);
-	    	}
-	    }
-	    ckfree((char *) argv);
-	    return TCL_OK;
-	}
-	case FILE_TYPE: {
-	    struct stat buf;
-
-	    if (objc != 3) {
-	    	goto only3Args;
-	    }
-	    if (GetStatBuf(interp, objv[2], TclpLstat, &buf) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetStringObj(resultPtr, 
-		    GetTypeFromMode((unsigned short) buf.st_mode), -1);
-	    return TCL_OK;
-	}
-	case FILE_VOLUMES: {
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    return TclpListVolumes(interp);
-	}
-	case FILE_WRITABLE: {
-	    if (objc != 3) {
-	    	goto only3Args;
-	    }
-	    return CheckAccess(interp, objv[2], W_OK);
-	}
-    }
-
-    only3Args:
-    Tcl_WrongNumArgs(interp, 2, objv, "name");
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * SplitPath --
- *
- *	Utility procedure used by Tcl_FileObjCmd() to split a path.
- *	Differs from standard Tcl_SplitPath in its handling of home
- *	directories; Tcl_SplitPath preserves the "~" while this
- *	procedure computes the actual full path name.
- *
- * Results:
- *	The return value is TCL_OK if the path could be split, TCL_ERROR
- *	otherwise.  If TCL_ERROR was returned, an error message is left
- *	in interp.  If TCL_OK was returned, *argvPtr is set to a newly
- *	allocated array of strings that represent the individual
- *	directories in the specified path, and *argcPtr is filled with
- *	the length of that array.
- *
- * Side effects:
- *	Memory allocated.  The caller must eventually free this memory
- *	by calling ckfree() on *argvPtr.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-SplitPath(interp, objPtr, argcPtr, argvPtr)
-    Tcl_Interp *interp;		/* Interp for error return.  May be NULL. */
-    Tcl_Obj *objPtr;		/* Path to be split. */
-    int *argcPtr;		/* Filled with length of following array. */
-    char ***argvPtr;		/* Filled with array of strings representing
-				 * the elements of the specified path. */
-{
-    char *fileName;
-
-    fileName = Tcl_GetString(objPtr);
-
-    /*
-     * If there is only one element, and it starts with a tilde,
-     * perform tilde substitution and resplit the path.
-     */
-
-    Tcl_SplitPath(fileName, argcPtr, argvPtr);
-    if ((*argcPtr == 1) && (fileName[0] == '~')) {
-	Tcl_DString ds;
-	
-	ckfree((char *) *argvPtr);
-	fileName = Tcl_TranslateFileName(interp, fileName, &ds);
-	if (fileName == NULL) {
-	    return TCL_ERROR;
-	}
-	Tcl_SplitPath(fileName, argcPtr, argvPtr);
-	Tcl_DStringFree(&ds);
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CheckAccess --
- *
- *	Utility procedure used by Tcl_FileObjCmd() to query file
- *	attributes available through the access() system call.
- *
- * Results:
- *	Always returns TCL_OK.  Sets interp's result to boolean true or
- *	false depending on whether the file has the specified attribute.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-  
-static int
-CheckAccess(interp, objPtr, mode)
-    Tcl_Interp *interp;		/* Interp for status return.  Must not be
-				 * NULL. */
-    Tcl_Obj *objPtr;		/* Name of file to check. */
-    int mode;			/* Attribute to check; passed as argument to
-				 * access(). */
-{
-    int value;
-    char *fileName;
-    Tcl_DString ds;
-    
-    fileName = Tcl_GetString(objPtr);
-    fileName = Tcl_TranslateFileName(interp, fileName, &ds);
-    if (fileName == NULL) {
-	value = 0;
-    } else {
-	value = (TclAccess(fileName, mode) == 0);
-        Tcl_DStringFree(&ds);
-    }
-    Tcl_SetBooleanObj(Tcl_GetObjResult(interp), value);
-
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * GetStatBuf --
- *
- *	Utility procedure used by Tcl_FileObjCmd() to query file
- *	attributes available through the stat() or lstat() system call.
- *
- * Results:
- *	The return value is TCL_OK if the specified file exists and can
- *	be stat'ed, TCL_ERROR otherwise.  If TCL_ERROR is returned, an
- *	error message is left in interp's result.  If TCL_OK is returned,
- *	*statPtr is filled with information about the specified file.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-GetStatBuf(interp, objPtr, statProc, statPtr)
-    Tcl_Interp *interp;		/* Interp for error return.  May be NULL. */
-    Tcl_Obj *objPtr;		/* Path name to examine. */
-    StatProc *statProc;		/* Either stat() or lstat() depending on
-				 * desired behavior. */
-    struct stat *statPtr;	/* Filled with info about file obtained by
-				 * calling (*statProc)(). */
-{
-    char *fileName;
-    Tcl_DString ds;
-    int status;
-    
-    fileName = Tcl_GetString(objPtr);
-    fileName = Tcl_TranslateFileName(interp, fileName, &ds);
-    if (fileName == NULL) {
-	return TCL_ERROR;
-    }
-
-    status = (*statProc)(Tcl_DStringValue(&ds), statPtr);
-    Tcl_DStringFree(&ds);
-    
-    if (status < 0) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, "could not read \"",
-		    Tcl_GetString(objPtr), "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	}
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StoreStatData --
- *
- *	This is a utility procedure that breaks out the fields of a
- *	"stat" structure and stores them in textual form into the
- *	elements of an associative array.
- *
- * Results:
- *	Returns a standard Tcl return value.  If an error occurs then
- *	a message is left in interp's result.
- *
- * Side effects:
- *	Elements of the associative array given by "varName" are modified.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StoreStatData(interp, varName, statPtr)
-    Tcl_Interp *interp;			/* Interpreter for error reports. */
-    char *varName;			/* Name of associative array variable
-					 * in which to store stat results. */
-    struct stat *statPtr;		/* Pointer to buffer containing
-					 * stat data to store in varName. */
-{
-    char string[TCL_INTEGER_SPACE];
-
-    TclFormatInt(string, (long) statPtr->st_dev);
-    if (Tcl_SetVar2(interp, varName, "dev", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_ino);
-    if (Tcl_SetVar2(interp, varName, "ino", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (unsigned short) statPtr->st_mode);
-    if (Tcl_SetVar2(interp, varName, "mode", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_nlink);
-    if (Tcl_SetVar2(interp, varName, "nlink", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_uid);
-    if (Tcl_SetVar2(interp, varName, "uid", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_gid);
-    if (Tcl_SetVar2(interp, varName, "gid", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    sprintf(string, "%lu", (unsigned long) statPtr->st_size);
-    if (Tcl_SetVar2(interp, varName, "size", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_atime);
-    if (Tcl_SetVar2(interp, varName, "atime", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_mtime);
-    if (Tcl_SetVar2(interp, varName, "mtime", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    TclFormatInt(string, (long) statPtr->st_ctime);
-    if (Tcl_SetVar2(interp, varName, "ctime", string, TCL_LEAVE_ERR_MSG)
-	    == NULL) {
-	return TCL_ERROR;
-    }
-    if (Tcl_SetVar2(interp, varName, "type",
-	    GetTypeFromMode((unsigned short) statPtr->st_mode), 
-	    TCL_LEAVE_ERR_MSG) == NULL) {
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetTypeFromMode --
- *
- *	Given a mode word, returns a string identifying the type of a
- *	file.
- *
- * Results:
- *	A static text string giving the file type from mode.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-GetTypeFromMode(mode)
-    int mode;
-{
-    if (S_ISREG(mode)) {
-	return "file";
-    } else if (S_ISDIR(mode)) {
-	return "directory";
-    } else if (S_ISCHR(mode)) {
-	return "characterSpecial";
-    } else if (S_ISBLK(mode)) {
-	return "blockSpecial";
-    } else if (S_ISFIFO(mode)) {
-	return "fifo";
-#ifdef S_ISLNK
-    } else if (S_ISLNK(mode)) {
-	return "link";
-#endif
-#ifdef S_ISSOCK
-    } else if (S_ISSOCK(mode)) {
-	return "socket";
-#endif
-    }
-    return "unknown";
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FoObjCmd --
- *
- *      This procedure is invoked to process the "for" Tcl command.
- *      See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "for" or the name
- *	to which "for" was renamed: e.g.,
- *	"set z for; $z {set i 0} {$i<100} {incr i} {puts $i}"
- *
- * Results:
- *      A standard Tcl result.
- *
- * Side effects:
- *      See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-        /* ARGSUSED */
-int
-Tcl_ForObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;                   /* Not used. */
-    Tcl_Interp *interp;                 /* Current interpreter. */
-    int objc;                           /* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int result, value;
-
-    if (objc != 5) {
-        Tcl_WrongNumArgs(interp, 1, objv, "start test next command");
-        return TCL_ERROR;
-    }
-
-    result = Tcl_EvalObjEx(interp, objv[1], 0);
-    if (result != TCL_OK) {
-        if (result == TCL_ERROR) {
-            Tcl_AddErrorInfo(interp, "\n    (\"for\" initial command)");
-        }
-        return result;
-    }
-    while (1) {
-        result = Tcl_ExprBooleanObj(interp, objv[2], &value);
-        if (result != TCL_OK) {
-            return result;
-        }
-        if (!value) {
-            break;
-        }
-        result = Tcl_EvalObjEx(interp, objv[4], 0);
-        if ((result != TCL_OK) && (result != TCL_CONTINUE)) {
-            if (result == TCL_ERROR) {
-                char msg[32 + TCL_INTEGER_SPACE];
-
-                sprintf(msg, "\n    (\"for\" body line %d)",interp->errorLine);
-                Tcl_AddErrorInfo(interp, msg);
-            }
-            break;
-        }
-        result = Tcl_EvalObjEx(interp, objv[3], 0);
-	if (result == TCL_BREAK) {
-            break;
-        } else if (result != TCL_OK) {
-            if (result == TCL_ERROR) {
-                Tcl_AddErrorInfo(interp, "\n    (\"for\" loop-end command)");
-            }
-            return result;
-        }
-    }
-    if (result == TCL_BREAK) {
-        result = TCL_OK;
-    }
-    if (result == TCL_OK) {
-        Tcl_ResetResult(interp);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ForeachObjCmd --
- *
- *	This object-based procedure is invoked to process the "foreach" Tcl
- *	command.  See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ForeachObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int result = TCL_OK;
-    int i;			/* i selects a value list */
-    int j, maxj;		/* Number of loop iterations */
-    int v;			/* v selects a loop variable */
-    int numLists;		/* Count of value lists */
-    Tcl_Obj *bodyPtr;
-
-    /*
-     * We copy the argument object pointers into a local array to avoid
-     * the problem that "objv" might become invalid. It is a pointer into
-     * the evaluation stack and that stack might be grown and reallocated
-     * if the loop body requires a large amount of stack space.
-     */
-    
-#define NUM_ARGS 9
-    Tcl_Obj *(argObjStorage[NUM_ARGS]);
-    Tcl_Obj **argObjv = argObjStorage;
-    
-#define STATIC_LIST_SIZE 4
-    int indexArray[STATIC_LIST_SIZE];	  /* Array of value list indices */
-    int varcListArray[STATIC_LIST_SIZE];  /* # loop variables per list */
-    Tcl_Obj **varvListArray[STATIC_LIST_SIZE]; /* Array of var name lists */
-    int argcListArray[STATIC_LIST_SIZE];  /* Array of value list sizes */
-    Tcl_Obj **argvListArray[STATIC_LIST_SIZE]; /* Array of value lists */
-
-    int *index = indexArray;
-    int *varcList = varcListArray;
-    Tcl_Obj ***varvList = varvListArray;
-    int *argcList = argcListArray;
-    Tcl_Obj ***argvList = argvListArray;
-
-    if (objc < 4 || (objc%2 != 0)) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"varList list ?varList list ...? command");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Create the object argument array "argObjv". Make sure argObjv is
-     * large enough to hold the objc arguments.
-     */
-
-    if (objc > NUM_ARGS) {
-	argObjv = (Tcl_Obj **) ckalloc(objc * sizeof(Tcl_Obj *));
-    }
-    for (i = 0;  i < objc;  i++) {
-	argObjv[i] = objv[i];
-    }
-
-    /*
-     * Manage numList parallel value lists.
-     * argvList[i] is a value list counted by argcList[i]
-     * varvList[i] is the list of variables associated with the value list
-     * varcList[i] is the number of variables associated with the value list
-     * index[i] is the current pointer into the value list argvList[i]
-     */
-
-    numLists = (objc-2)/2;
-    if (numLists > STATIC_LIST_SIZE) {
-	index = (int *) ckalloc(numLists * sizeof(int));
-	varcList = (int *) ckalloc(numLists * sizeof(int));
-	varvList = (Tcl_Obj ***) ckalloc(numLists * sizeof(Tcl_Obj **));
-	argcList = (int *) ckalloc(numLists * sizeof(int));
-	argvList = (Tcl_Obj ***) ckalloc(numLists * sizeof(Tcl_Obj **));
-    }
-    for (i = 0;  i < numLists;  i++) {
-	index[i] = 0;
-	varcList[i] = 0;
-	varvList[i] = (Tcl_Obj **) NULL;
-	argcList[i] = 0;
-	argvList[i] = (Tcl_Obj **) NULL;
-    }
-
-    /*
-     * Break up the value lists and variable lists into elements
-     */
-
-    maxj = 0;
-    for (i = 0;  i < numLists;  i++) {
-	result = Tcl_ListObjGetElements(interp, argObjv[1+i*2],
-	        &varcList[i], &varvList[i]);
-	if (result != TCL_OK) {
-	    goto done;
-	}
-	if (varcList[i] < 1) {
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "foreach varlist is empty", -1);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	
-	result = Tcl_ListObjGetElements(interp, argObjv[2+i*2],
-	        &argcList[i], &argvList[i]);
-	if (result != TCL_OK) {
-	    goto done;
-	}
-	
-	j = argcList[i] / varcList[i];
-	if ((argcList[i] % varcList[i]) != 0) {
-	    j++;
-	}
-	if (j > maxj) {
-	    maxj = j;
-	}
-    }
-
-    /*
-     * Iterate maxj times through the lists in parallel
-     * If some value lists run out of values, set loop vars to ""
-     */
-    
-    bodyPtr = argObjv[objc-1];
-    for (j = 0;  j < maxj;  j++) {
-	for (i = 0;  i < numLists;  i++) {
-	    /*
-	     * If a variable or value list object has been converted to
-	     * another kind of Tcl object, convert it back to a list object
-	     * and refetch the pointer to its element array.
-	     */
-
-	    if (argObjv[1+i*2]->typePtr != &tclListType) {
-		result = Tcl_ListObjGetElements(interp, argObjv[1+i*2],
-		        &varcList[i], &varvList[i]);
-		if (result != TCL_OK) {
-		    panic("Tcl_ForeachObjCmd: could not reconvert variable list %d to a list object\n", i);
-		}
-	    }
-	    if (argObjv[2+i*2]->typePtr != &tclListType) {
-		result = Tcl_ListObjGetElements(interp, argObjv[2+i*2],
-	                &argcList[i], &argvList[i]);
-		if (result != TCL_OK) {
-		    panic("Tcl_ForeachObjCmd: could not reconvert value list %d to a list object\n", i);
-		}
-	    }
-	    
-	    for (v = 0;  v < varcList[i];  v++) {
-		int k = index[i]++;
-		Tcl_Obj *valuePtr, *varValuePtr;
-		int isEmptyObj = 0;
-		
-		if (k < argcList[i]) {
-		    valuePtr = argvList[i][k];
-		} else {
-		    valuePtr = Tcl_NewObj(); /* empty string */
-		    isEmptyObj = 1;
-		}
-		varValuePtr = Tcl_ObjSetVar2(interp, varvList[i][v],
-			NULL, valuePtr, 0);
-		if (varValuePtr == NULL) {
-		    if (isEmptyObj) {
-			Tcl_DecrRefCount(valuePtr);
-		    }
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"couldn't set loop variable: \"",
-			Tcl_GetString(varvList[i][v]), "\"", (char *) NULL);
-		    result = TCL_ERROR;
-		    goto done;
-		}
-
-	    }
-	}
-
-	result = Tcl_EvalObjEx(interp, bodyPtr, 0);
-	if (result != TCL_OK) {
-	    if (result == TCL_CONTINUE) {
-		result = TCL_OK;
-	    } else if (result == TCL_BREAK) {
-		result = TCL_OK;
-		break;
-	    } else if (result == TCL_ERROR) {
-                char msg[32 + TCL_INTEGER_SPACE];
-
-		sprintf(msg, "\n    (\"foreach\" body line %d)",
-			interp->errorLine);
-		Tcl_AddObjErrorInfo(interp, msg, -1);
-		break;
-	    } else {
-		break;
-	    }
-	}
-    }
-    if (result == TCL_OK) {
-	Tcl_ResetResult(interp);
-    }
-
-    done:
-    if (numLists > STATIC_LIST_SIZE) {
-	ckfree((char *) index);
-	ckfree((char *) varcList);
-	ckfree((char *) argcList);
-	ckfree((char *) varvList);
-	ckfree((char *) argvList);
-    }
-    if (argObjv != argObjStorage) {
-	ckfree((char *) argObjv);
-    }
-    return result;
-#undef STATIC_LIST_SIZE
-#undef NUM_ARGS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FormatObjCmd --
- *
- *	This procedure is invoked to process the "format" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FormatObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;    	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *format;		/* Used to read characters from the format
-				 * string. */
-    int formatLen;              /* The length of the format string */
-    char *endPtr;		/* Points to the last char in format array */
-    char newFormat[40];		/* A new format specifier is generated here. */
-    int width;			/* Field width from field specifier, or 0 if
-				 * no width given. */
-    int precision;		/* Field precision from field specifier, or 0
-				 * if no precision given. */
-    int size;			/* Number of bytes needed for result of
-				 * conversion, based on type of conversion
-				 * ("e", "s", etc.), width, and precision. */
-    int intValue;		/* Used to hold value to pass to sprintf, if
-				 * it's a one-word integer or char value */
-    char *ptrValue = NULL;	/* Used to hold value to pass to sprintf, if
-				 * it's a one-word value. */
-    double doubleValue;		/* Used to hold value to pass to sprintf if
-				 * it's a double value. */
-    int whichValue;		/* Indicates which of intValue, ptrValue,
-				 * or doubleValue has the value to pass to
-				 * sprintf, according to the following
-				 * definitions: */
-#   define INT_VALUE 0
-#   define CHAR_VALUE 1
-#   define PTR_VALUE 2
-#   define DOUBLE_VALUE 3
-#   define STRING_VALUE 4
-#   define MAX_FLOAT_SIZE 320
-    
-    Tcl_Obj *resultPtr;  	/* Where result is stored finally. */
-    char staticBuf[MAX_FLOAT_SIZE + 1];
-                                /* A static buffer to copy the format results 
-				 * into */
-    char *dst = staticBuf;      /* The buffer that sprintf writes into each
-				 * time the format processes a specifier */
-    int dstSize = MAX_FLOAT_SIZE;
-                                /* The size of the dst buffer */
-    int noPercent;		/* Special case for speed:  indicates there's
-				 * no field specifier, just a string to copy.*/
-    int objIndex;		/* Index of argument to substitute next. */
-    int gotXpg = 0;		/* Non-zero means that an XPG3 %n$-style
-				 * specifier has been seen. */
-    int gotSequential = 0;	/* Non-zero means that a regular sequential
-				 * (non-XPG3) conversion specifier has been
-				 * seen. */
-    int useShort;		/* Value to be printed is short (half word). */
-    char *end;			/* Used to locate end of numerical fields. */
-    int stringLen = 0;		/* Length of string in characters rather
-				 * than bytes.  Used for %s substitution. */
-    int gotMinus;		/* Non-zero indicates that a minus flag has
-				 * been seen in the current field. */
-    int gotPrecision;		/* Non-zero indicates that a precision has
-				 * been set for the current field. */
-
-    /*
-     * This procedure is a bit nasty.  The goal is to use sprintf to
-     * do most of the dirty work.  There are several problems:
-     * 1. this procedure can't trust its arguments.
-     * 2. we must be able to provide a large enough result area to hold
-     *    whatever's generated.  This is hard to estimate.
-     * 3. there's no way to move the arguments from objv to the call
-     *    to sprintf in a reasonable way.  This is particularly nasty
-     *    because some of the arguments may be two-word values (doubles).
-     * So, what happens here is to scan the format string one % group
-     * at a time, making many individual calls to sprintf.
-     */
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "formatString ?arg arg ...?");
-	return TCL_ERROR;
-    }
-
-    format = (char *) Tcl_GetStringFromObj(objv[1], &formatLen);
-    endPtr = format + formatLen;
-    resultPtr = Tcl_NewObj();
-    objIndex = 2;
-
-    while (format < endPtr) {
-	register char *newPtr = newFormat;
-
-	width = precision = noPercent = useShort = 0;
-	gotMinus = gotPrecision = 0;
-	whichValue = PTR_VALUE;
-
-	/*
-	 * Get rid of any characters before the next field specifier.
-	 */
-	if (*format != '%') {
-	    ptrValue = format;
-	    while ((*format != '%') && (format < endPtr)) {
-		format++;
-	    }
-	    size = format - ptrValue;
-	    noPercent = 1;
-	    goto doField;
-	}
-
-	if (format[1] == '%') {
-	    ptrValue = format;
-	    size = 1;
-	    noPercent = 1;
-	    format += 2;
-	    goto doField;
-	}
-
-	/*
-	 * Parse off a field specifier, compute how many characters
-	 * will be needed to store the result, and substitute for
-	 * "*" size specifiers.
-	 */
-	*newPtr = '%';
-	newPtr++;
-	format++;
-	if (isdigit(UCHAR(*format))) { /* INTL: Tcl source. */
-	    int tmp;
-
-	    /*
-	     * Check for an XPG3-style %n$ specification.  Note: there
-	     * must not be a mixture of XPG3 specs and non-XPG3 specs
-	     * in the same format string.
-	     */
-
-	    tmp = strtoul(format, &end, 10);	/* INTL: "C" locale. */
-	    if (*end != '$') {
-		goto notXpg;
-	    }
-	    format = end+1;
-	    gotXpg = 1;
-	    if (gotSequential) {
-		goto mixedXPG;
-	    }
-	    objIndex = tmp+1;
-	    if ((objIndex < 2) || (objIndex >= objc)) {
-		goto badIndex;
-	    }
-	    goto xpgCheckDone;
-	}
-
-	notXpg:
-	gotSequential = 1;
-	if (gotXpg) {
-	    goto mixedXPG;
-	}
-
-	xpgCheckDone:
-	while ((*format == '-') || (*format == '#') || (*format == '0')
-		|| (*format == ' ') || (*format == '+')) {
-	    if (*format == '-') {
-		gotMinus = 1;
-	    }
-	    *newPtr = *format;
-	    newPtr++;
-	    format++;
-	}
-	if (isdigit(UCHAR(*format))) { /* INTL: Tcl source. */
-	    width = strtoul(format, &end, 10);	/* INTL: Tcl source. */
-	    format = end;
-	} else if (*format == '*') {
-	    if (objIndex >= objc) {
-		goto badIndex;
-	    }
-	    if (Tcl_GetIntFromObj(interp,	/* INTL: Tcl source. */
-		    objv[objIndex], &width) != TCL_OK) {
-		goto fmtError;
-	    }
-	    if (width < 0) {
-		width = -width;
-		*newPtr = '-';
-		gotMinus = 1;
-		newPtr++;
-	    }
-	    objIndex++;
-	    format++;
-	}
-	if (width > 100000) {
-	    /*
-	     * Don't allow arbitrarily large widths:  could cause core
-	     * dump when we try to allocate a zillion bytes of memory
-	     * below.
-	     */
-
-	    width = 100000;
-	} else if (width < 0) {
-	    width = 0;
-	}
-	if (width != 0) {
-	    TclFormatInt(newPtr, width);	/* INTL: printf format. */
-	    while (*newPtr != 0) {
-		newPtr++;
-	    }
-	}
-	if (*format == '.') {
-	    *newPtr = '.';
-	    newPtr++;
-	    format++;
-	    gotPrecision = 1;
-	}
-	if (isdigit(UCHAR(*format))) { /* INTL: Tcl source. */
-	    precision = strtoul(format, &end, 10);  /* INTL: "C" locale. */
-	    format = end;
-	} else if (*format == '*') {
-	    if (objIndex >= objc) {
-		goto badIndex;
-	    }
-	    if (Tcl_GetIntFromObj(interp,	/* INTL: Tcl source. */
-		    objv[objIndex], &precision) != TCL_OK) {
-		goto fmtError;
-	    }
-	    objIndex++;
-	    format++;
-	}
-	if (gotPrecision) {
-	    TclFormatInt(newPtr, precision);	/* INTL: printf format. */
-	    while (*newPtr != 0) {
-		newPtr++;
-	    }
-	}
-	if (*format == 'l') {
-	    format++;
-	} else if (*format == 'h') {
-	    useShort = 1;
-	    *newPtr = 'h';
-	    newPtr++;
-	    format++;
-	}
-	*newPtr = *format;
-	newPtr++;
-	*newPtr = 0;
-	if (objIndex >= objc) {
-	    goto badIndex;
-	}
-	switch (*format) {
-	    case 'i':
-		newPtr[-1] = 'd';
-	    case 'd':
-	    case 'o':
-	    case 'u':
-	    case 'x':
-	    case 'X':
-		if (Tcl_GetIntFromObj(interp,	/* INTL: Tcl source. */
-			objv[objIndex], &intValue) != TCL_OK) {
-		    goto fmtError;
-		}
-		whichValue = INT_VALUE;
-		size = 40 + precision;
-		break;
-	    case 's':
-		/*
-		 * Compute the length of the string in characters and add
-		 * any additional space required by the field width.  All of
-		 * the extra characters will be spaces, so one byte per
-		 * character is adequate.
-		 */
-
-		whichValue = STRING_VALUE;
-		ptrValue = Tcl_GetStringFromObj(objv[objIndex], &size);
-		stringLen = Tcl_NumUtfChars(ptrValue, size);
-		if (gotPrecision && (precision < stringLen)) {
-		    stringLen = precision;
-		}
-		size = Tcl_UtfAtIndex(ptrValue, stringLen) - ptrValue;
-		if (width > stringLen) {
-		    size += (width - stringLen);
-		}
-		break;
-	    case 'c':
-		if (Tcl_GetIntFromObj(interp,	/* INTL: Tcl source. */
-			objv[objIndex], &intValue) != TCL_OK) {
-		    goto fmtError;
-		}
-		whichValue = CHAR_VALUE;
-		size = width + TCL_UTF_MAX;
-		break;
-	    case 'e':
-	    case 'E':
-	    case 'f':
-	    case 'g':
-	    case 'G':
-		if (Tcl_GetDoubleFromObj(interp, /* INTL: Tcl source. */
-			objv[objIndex], &doubleValue) != TCL_OK) {
-		    goto fmtError;
-		}
-		whichValue = DOUBLE_VALUE;
-		size = MAX_FLOAT_SIZE;
-		if (precision > 10) {
-		    size += precision;
-		}
-		break;
-	    case 0:
-		Tcl_SetResult(interp,
-		        "format string ended in middle of field specifier",
-			TCL_STATIC);
-		goto fmtError;
-	    default: {
-		char buf[40];
-		sprintf(buf, "bad field specifier \"%c\"", *format);
-		Tcl_SetResult(interp, buf, TCL_VOLATILE);
-		goto fmtError;
-	    }
-	}
-	objIndex++;
-	format++;
-
-	/*
-	 * Make sure that there's enough space to hold the formatted
-	 * result, then format it.
-	 */
-
-	doField:
-	if (width > size) {
-	    size = width;
-	}
-	if (noPercent) {
-	    Tcl_AppendToObj(resultPtr, ptrValue, size);
-	} else {
-	    if (size > dstSize) {
-	        if (dst != staticBuf) {
-		    ckfree(dst);
-		}
-		dst = (char *) ckalloc((unsigned) (size + 1));
-		dstSize = size;
-	    }
-	    switch (whichValue) {
-		case DOUBLE_VALUE: {
-		    sprintf(dst, newFormat, doubleValue); /* INTL: user locale. */
-		    break;
-		}
-		case INT_VALUE: {
-		    if (useShort) {
-			sprintf(dst, newFormat, (short) intValue);
-		    } else {
-			sprintf(dst, newFormat, intValue);
-		    }
-		    break;
-		}
-		case CHAR_VALUE: {
-		    char *ptr;
-		    ptr = dst;
-		    if (!gotMinus) {
-			for ( ; --width > 0; ptr++) {
-			    *ptr = ' ';
-			}
-		    }
-		    ptr += Tcl_UniCharToUtf(intValue, ptr);
-		    for ( ; --width > 0; ptr++) {
-			*ptr = ' ';
-		    }
-		    *ptr = '\0';
-		    break;
-		}
-		case STRING_VALUE: {
-		    char *ptr;
-		    int pad;
-
-		    ptr = dst;
-		    if (width > stringLen) {
-			pad = width - stringLen;
-		    } else {
-			pad = 0;
-		    }
-
-		    if (!gotMinus) {
-			while (pad > 0) {
-			    *ptr++ = ' ';
-			    pad--;
-			}
-		    }
-
-		    size = Tcl_UtfAtIndex(ptrValue, stringLen) - ptrValue; 
-		    if (size) {
-			memcpy(ptr, ptrValue, (size_t) size);
-			ptr += size;
-		    }
-		    while (pad > 0) {
-			*ptr++ = ' ';
-			pad--;
-		    }
-		    *ptr = '\0';
-		    break;
-		}
-		default: {
-		    sprintf(dst, newFormat, ptrValue);
-		    break;
-		}
-	    }
-	    Tcl_AppendToObj(resultPtr, dst, -1);
-	}
-    }
-
-    Tcl_SetObjResult(interp, resultPtr);
-    if(dst != staticBuf) {
-        ckfree(dst);
-    }
-    return TCL_OK;
-
-    mixedXPG:
-    Tcl_SetResult(interp, 
-            "cannot mix \"%\" and \"%n$\" conversion specifiers", TCL_STATIC);
-    goto fmtError;
-
-    badIndex:
-    if (gotXpg) {
-        Tcl_SetResult(interp, 
-                "\"%n$\" argument index out of range", TCL_STATIC);
-    } else {
-        Tcl_SetResult(interp, 
-                "not enough arguments for all format specifiers", TCL_STATIC);
-    }
-
-    fmtError:
-    if(dst != staticBuf) {
-        ckfree(dst);
-    }
-    Tcl_DecrRefCount(resultPtr);
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * StringifyObjects --
- *
- *	Helper function to bridge the gap between an object-based procedure
- *	and an older string-based procedure.
- * 
- *	Given an array of objects, allocate an array that consists of the
- *	string representations of those objects.
- *
- * Results:
- *	The return value is a pointer to the newly allocated array of
- *	strings.  Elements 0 to (objc-1) of the string array point to the
- *	string representation of the corresponding element in the source
- *	object array; element objc of the string array is NULL.
- *
- * Side effects:
- *	Memory allocated.  The caller must eventually free this memory
- *	by calling ckfree() on the return value.
- *
- *---------------------------------------------------------------------------
- */
-
-static char **
-StringifyObjects(objc, objv)
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int i;
-    char **argv;
-    
-    argv = (char **) ckalloc((objc + 1) * sizeof(char *));
-    for (i = 0; i < objc; i++) {
-    	argv[i] = Tcl_GetString(objv[i]);
-    }
-    argv[i] = NULL;
-    return argv;
-}
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
deleted file mode 100644
index 6db0c53..0000000
--- a/generic/tclCmdIL.c
+++ /dev/null
@@ -1,2991 +0,0 @@
-/* 
- * tclCmdIL.c --
- *
- *	This file contains the top-level command routines for most of
- *	the Tcl built-in commands whose names begin with the letters
- *	I through L.  It contains only commands in the generic core
- *	(i.e. those that don't depend much upon UNIX facilities).
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1993-1997 Lucent Technologies.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCmdIL.c,v 1.12 1999/04/16 00:46:43 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclCompile.h"
-#include "tclRegexp.h"
-
-/*
- * During execution of the "lsort" command, structures of the following
- * type are used to arrange the objects being sorted into a collection
- * of linked lists.
- */
-
-typedef struct SortElement {
-    Tcl_Obj *objPtr;			/* Object being sorted. */
-    struct SortElement *nextPtr;        /* Next element in the list, or
-					 * NULL for end of list. */
-} SortElement;
-
-/*
- * The "lsort" command needs to pass certain information down to the
- * function that compares two list elements, and the comparison function
- * needs to pass success or failure information back up to the top-level
- * "lsort" command.  The following structure is used to pass this
- * information.
- */
-
-typedef struct SortInfo {
-    int isIncreasing;		/* Nonzero means sort in increasing order. */
-    int sortMode;		/* The sort mode.  One of SORTMODE_*
-				 * values defined below */
-    Tcl_Obj *compareCmdPtr;     /* The Tcl comparison command when sortMode
-				 * is SORTMODE_COMMAND.  Pre-initialized to
-				 * hold base of command.*/
-    int index;			/* If the -index option was specified, this
-				 * holds the index of the list element
-				 * to extract for comparison.  If -index
-				 * wasn't specified, this is -1. */
-    Tcl_Interp *interp;		/* The interpreter in which the sortis
-				 * being done. */
-    int resultCode;		/* Completion code for the lsort command.
-				 * If an error occurs during the sort this
-				 * is changed from TCL_OK to  TCL_ERROR. */
-} SortInfo;
-
-/*
- * The "sortMode" field of the SortInfo structure can take on any of the
- * following values.
- */
-
-#define SORTMODE_ASCII      0
-#define SORTMODE_INTEGER    1
-#define SORTMODE_REAL       2
-#define SORTMODE_COMMAND    3
-#define SORTMODE_DICTIONARY 4
-
-/*
- * Forward declarations for procedures defined in this file:
- */
-
-static void		AppendLocals _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *listPtr, char *pattern,
-			    int includeLinks));
-static int		DictionaryCompare _ANSI_ARGS_((char *left,
-			    char *right));
-static int		InfoArgsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoBodyCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoCmdCountCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoCommandsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoCompleteCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoDefaultCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoExistsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoGlobalsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoHostnameCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoLevelCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoLibraryCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoLoadedCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoLocalsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoNameOfExecutableCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoPatchLevelCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoProcsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoScriptCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoSharedlibCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoTclVersionCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		InfoVarsCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static SortElement *    MergeSort _ANSI_ARGS_((SortElement *headPt,
-			    SortInfo *infoPtr));
-static SortElement *    MergeLists _ANSI_ARGS_((SortElement *leftPtr,
-			    SortElement *rightPtr, SortInfo *infoPtr));
-static int		SortCompare _ANSI_ARGS_((Tcl_Obj *firstPtr,
-			    Tcl_Obj *second, SortInfo *infoPtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_IfObjCmd --
- *
- *	This procedure is invoked to process the "if" Tcl command.
- *	See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "if" or the name
- *	to which "if" was renamed: e.g., "set z if; $z 1 {puts foo}"
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_IfObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int thenScriptIndex = 0;	/* then script to be evaled after syntax check */
-    int i, result, value;
-    char *clause;
-    i = 1;
-    while (1) {
-	/*
-	 * At this point in the loop, objv and objc refer to an expression
-	 * to test, either for the main expression or an expression
-	 * following an "elseif".  The arguments after the expression must
-	 * be "then" (optional) and a script to execute if the expression is
-	 * true.
-	 */
-
-	if (i >= objc) {
-	    clause = Tcl_GetString(objv[i-1]);
-	    Tcl_AppendResult(interp, "wrong # args: no expression after \"",
-		    clause, "\" argument", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (!thenScriptIndex) {
-	    result = Tcl_ExprBooleanObj(interp, objv[i], &value);
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	}
-	i++;
-	if (i >= objc) {
-	    missingScript:
-	    clause = Tcl_GetString(objv[i-1]);
-	    Tcl_AppendResult(interp, "wrong # args: no script following \"",
-		    clause, "\" argument", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	clause = Tcl_GetString(objv[i]);
-	if ((i < objc) && (strcmp(clause, "then") == 0)) {
-	    i++;
-	}
-	if (i >= objc) {
-	    goto missingScript;
-	}
-	if (value) {
-	    thenScriptIndex = i;
-	    value = 0;
-	}
-	
-	/*
-	 * The expression evaluated to false.  Skip the command, then
-	 * see if there is an "else" or "elseif" clause.
-	 */
-
-	i++;
-	if (i >= objc) {
-	    if (thenScriptIndex) {
-		return Tcl_EvalObjEx(interp, objv[thenScriptIndex], 0);
-	    }
-	    return TCL_OK;
-	}
-	clause = Tcl_GetString(objv[i]);
-	if ((clause[0] == 'e') && (strcmp(clause, "elseif") == 0)) {
-	    i++;
-	    continue;
-	}
-	break;
-    }
-
-    /*
-     * Couldn't find a "then" or "elseif" clause to execute.  Check now
-     * for an "else" clause.  We know that there's at least one more
-     * argument when we get here.
-     */
-
-    if (strcmp(clause, "else") == 0) {
-	i++;
-	if (i >= objc) {
-	    Tcl_AppendResult(interp,
-		    "wrong # args: no script following \"else\" argument",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-    if (i < objc - 1) {
-	Tcl_AppendResult(interp,
-		"wrong # args: extra words after \"else\" clause in \"if\" command",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    if (thenScriptIndex) {
-	return Tcl_EvalObjEx(interp, objv[thenScriptIndex], 0);
-    }
-    return Tcl_EvalObjEx(interp, objv[i], 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_IncrObjCmd --
- *
- *	This procedure is invoked to process the "incr" Tcl command.
- *	See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "incr" or the name
- *	to which "incr" was renamed: e.g., "set z incr; $z i -1"
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-int
-Tcl_IncrObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    long incrAmount;
-    Tcl_Obj *newValuePtr;
-    
-    if ((objc != 2) && (objc != 3)) {
-        Tcl_WrongNumArgs(interp, 1, objv, "varName ?increment?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Calculate the amount to increment by.
-     */
-    
-    if (objc == 2) {
-	incrAmount = 1;
-    } else {
-	if (Tcl_GetLongFromObj(interp, objv[2], &incrAmount) != TCL_OK) {
-	    Tcl_AddErrorInfo(interp, "\n    (reading increment)");
-	    return TCL_ERROR;
-	}
-    }
-    
-    /*
-     * Increment the variable's value.
-     */
-
-    newValuePtr = TclIncrVar2(interp, objv[1], (Tcl_Obj *) NULL, incrAmount,
-	    TCL_LEAVE_ERR_MSG);
-    if (newValuePtr == NULL) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Set the interpreter's object result to refer to the variable's new
-     * value object.
-     */
-
-    Tcl_SetObjResult(interp, newValuePtr);
-    return TCL_OK; 
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InfoObjCmd --
- *
- *	This procedure is invoked to process the "info" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_InfoObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Arbitrary value passed to the command. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    static char *subCmds[] = {
-            "args", "body", "cmdcount", "commands",
-	     "complete", "default", "exists", "globals",
-	     "hostname", "level", "library", "loaded",
-	     "locals", "nameofexecutable", "patchlevel", "procs",
-	     "script", "sharedlibextension", "tclversion", "vars",
-	     (char *) NULL};
-    enum ISubCmdIdx {
-	    IArgsIdx, IBodyIdx, ICmdCountIdx, ICommandsIdx,
-	    ICompleteIdx, IDefaultIdx, IExistsIdx, IGlobalsIdx,
-	    IHostnameIdx, ILevelIdx, ILibraryIdx, ILoadedIdx,
-	    ILocalsIdx, INameOfExecutableIdx, IPatchLevelIdx, IProcsIdx,
-	    IScriptIdx, ISharedLibExtensionIdx, ITclVersionIdx, IVarsIdx
-    };
-    int index, result;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
-        return TCL_ERROR;
-    }
-    
-    result = Tcl_GetIndexFromObj(interp, objv[1], subCmds, "option", 0,
-	    (int *) &index);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    switch (index) {
-        case IArgsIdx:
-	    result = InfoArgsCmd(clientData, interp, objc, objv);
-            break;
-	case IBodyIdx:
-	    result = InfoBodyCmd(clientData, interp, objc, objv);
-	    break;
-	case ICmdCountIdx:
-	    result = InfoCmdCountCmd(clientData, interp, objc, objv);
-	    break;
-        case ICommandsIdx:
-	    result = InfoCommandsCmd(clientData, interp, objc, objv);
-	    break;
-        case ICompleteIdx:
-	    result = InfoCompleteCmd(clientData, interp, objc, objv);
-	    break;
-	case IDefaultIdx:
-	    result = InfoDefaultCmd(clientData, interp, objc, objv);
-	    break;
-	case IExistsIdx:
-	    result = InfoExistsCmd(clientData, interp, objc, objv);
-	    break;
-        case IGlobalsIdx:
-	    result = InfoGlobalsCmd(clientData, interp, objc, objv);
-	    break;
-        case IHostnameIdx:
-	    result = InfoHostnameCmd(clientData, interp, objc, objv);
-	    break;
-	case ILevelIdx:
-	    result = InfoLevelCmd(clientData, interp, objc, objv);
-	    break;
-	case ILibraryIdx:
-	    result = InfoLibraryCmd(clientData, interp, objc, objv);
-	    break;
-        case ILoadedIdx:
-	    result = InfoLoadedCmd(clientData, interp, objc, objv);
-	    break;
-        case ILocalsIdx:
-	    result = InfoLocalsCmd(clientData, interp, objc, objv);
-	    break;
-	case INameOfExecutableIdx:
-	    result = InfoNameOfExecutableCmd(clientData, interp, objc, objv);
-	    break;
-	case IPatchLevelIdx:
-	    result = InfoPatchLevelCmd(clientData, interp, objc, objv);
-	    break;
-        case IProcsIdx:
-	    result = InfoProcsCmd(clientData, interp, objc, objv);
-	    break;
-        case IScriptIdx:
-	    result = InfoScriptCmd(clientData, interp, objc, objv);
-	    break;
-	case ISharedLibExtensionIdx:
-	    result = InfoSharedlibCmd(clientData, interp, objc, objv);
-	    break;
-	case ITclVersionIdx:
-	    result = InfoTclVersionCmd(clientData, interp, objc, objv);
-	    break;
-	case IVarsIdx:
-	    result = InfoVarsCmd(clientData, interp, objc, objv);
-	    break;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoArgsCmd --
- *
- *      Called to implement the "info args" command that returns the
- *      argument list for a procedure. Handles the following syntax:
- *
- *          info args procName
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoArgsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    char *name;
-    Proc *procPtr;
-    CompiledLocal *localPtr;
-    Tcl_Obj *listObjPtr;
-
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 2, objv, "procname");
-        return TCL_ERROR;
-    }
-
-    name = Tcl_GetString(objv[2]);
-    procPtr = TclFindProc(iPtr, name);
-    if (procPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "\"", name, "\" isn't a procedure", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Build a return list containing the arguments.
-     */
-    
-    listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    for (localPtr = procPtr->firstLocalPtr;  localPtr != NULL;
-            localPtr = localPtr->nextPtr) {
-        if (TclIsVarArgument(localPtr)) {
-            Tcl_ListObjAppendElement(interp, listObjPtr,
-		    Tcl_NewStringObj(localPtr->name, -1));
-        }
-    }
-    Tcl_SetObjResult(interp, listObjPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoBodyCmd --
- *
- *      Called to implement the "info body" command that returns the body
- *      for a procedure. Handles the following syntax:
- *
- *          info body procName
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoBodyCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    char *name;
-    Proc *procPtr;
-    Tcl_Obj *bodyPtr, *resultPtr;
-    
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 2, objv, "procname");
-        return TCL_ERROR;
-    }
-
-    name = Tcl_GetString(objv[2]);
-    procPtr = TclFindProc(iPtr, name);
-    if (procPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"\"", name, "\" isn't a procedure", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * we need to check if the body from this procedure had been generated
-     * from a precompiled body. If that is the case, then the bodyPtr's
-     * string representation is bogus, since sources are not available.
-     * In order to make sure that later manipulations of the object do not
-     * invalidate the internal representation, we make a copy of the string
-     * representation and return that one, instead.
-     */
-
-    bodyPtr = procPtr->bodyPtr;
-    resultPtr = bodyPtr;
-    if (bodyPtr->typePtr == &tclByteCodeType) {
-        ByteCode *codePtr = (ByteCode *) bodyPtr->internalRep.otherValuePtr;
-
-        if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
-            resultPtr = Tcl_NewStringObj(bodyPtr->bytes, bodyPtr->length);
-        }
-    }
-    
-    Tcl_SetObjResult(interp, resultPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoCmdCountCmd --
- *
- *      Called to implement the "info cmdcount" command that returns the
- *      number of commands that have been executed. Handles the following
- *      syntax:
- *
- *          info cmdcount
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoCmdCountCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), iPtr->cmdCount);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoCommandsCmd --
- *
- *	Called to implement the "info commands" command that returns the
- *	list of commands in the interpreter that match an optional pattern.
- *	The pattern, if any, consists of an optional sequence of namespace
- *	names separated by "::" qualifiers, which is followed by a
- *	glob-style pattern that restricts which commands are returned.
- *	Handles the following syntax:
- *
- *          info commands ?pattern?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoCommandsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *cmdName, *pattern, *simplePattern;
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Namespace *nsPtr;
-    Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    Namespace *currNsPtr   = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    Tcl_Obj *listPtr, *elemObjPtr;
-    int specificNsInPattern = 0;  /* Init. to avoid compiler warning. */
-    Tcl_Command cmd;
-
-    /*
-     * Get the pattern and find the "effective namespace" in which to
-     * list commands.
-     */
-
-    if (objc == 2) {
-        simplePattern = NULL;
-	nsPtr = currNsPtr;
-	specificNsInPattern = 0;
-    } else if (objc == 3) {
-	/*
-	 * From the pattern, get the effective namespace and the simple
-	 * pattern (no namespace qualifiers or ::'s) at the end. If an
-	 * error was found while parsing the pattern, return it. Otherwise,
-	 * if the namespace wasn't found, just leave nsPtr NULL: we will
-	 * return an empty list since no commands there can be found.
-	 */
-
-	Namespace *dummy1NsPtr, *dummy2NsPtr;
-	
-
-	pattern = Tcl_GetString(objv[2]);
-	TclGetNamespaceForQualName(interp, pattern, (Namespace *) NULL,
-           /*flags*/ 0, &nsPtr, &dummy1NsPtr, &dummy2NsPtr, &simplePattern);
-
-	if (nsPtr != NULL) {	/* we successfully found the pattern's ns */
-	    specificNsInPattern = (strcmp(simplePattern, pattern) != 0);
-	}
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the effective namespace's command table and create a
-     * list with all commands that match the pattern. If a specific
-     * namespace was requested in the pattern, qualify the command names
-     * with the namespace name.
-     */
-
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-
-    if (nsPtr != NULL) {
-	entryPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
-	while (entryPtr != NULL) {
-	    cmdName = Tcl_GetHashKey(&nsPtr->cmdTable, entryPtr);
-	    if ((simplePattern == NULL)
-	            || Tcl_StringMatch(cmdName, simplePattern)) {
-		if (specificNsInPattern) {
-		    cmd = (Tcl_Command) Tcl_GetHashValue(entryPtr);
-		    elemObjPtr = Tcl_NewObj();
-		    Tcl_GetCommandFullName(interp, cmd, elemObjPtr);
-		} else {
-		    elemObjPtr = Tcl_NewStringObj(cmdName, -1);
-		}
-		Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
-	    }
-	    entryPtr = Tcl_NextHashEntry(&search);
-	}
-
-	/*
-	 * If the effective namespace isn't the global :: namespace, and a
-	 * specific namespace wasn't requested in the pattern, then add in
-	 * all global :: commands that match the simple pattern. Of course,
-	 * we add in only those commands that aren't hidden by a command in
-	 * the effective namespace.
-	 */
-	
-	if ((nsPtr != globalNsPtr) && !specificNsInPattern) {
-	    entryPtr = Tcl_FirstHashEntry(&globalNsPtr->cmdTable, &search);
-	    while (entryPtr != NULL) {
-		cmdName = Tcl_GetHashKey(&globalNsPtr->cmdTable, entryPtr);
-		if ((simplePattern == NULL)
-	                || Tcl_StringMatch(cmdName, simplePattern)) {
-		    if (Tcl_FindHashEntry(&nsPtr->cmdTable, cmdName) == NULL) {
-			Tcl_ListObjAppendElement(interp, listPtr,
-				Tcl_NewStringObj(cmdName, -1));
-		    }
-		}
-		entryPtr = Tcl_NextHashEntry(&search);
-	    }
-	}
-    }
-    
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoCompleteCmd --
- *
- *      Called to implement the "info complete" command that determines
- *      whether a string is a complete Tcl command. Handles the following
- *      syntax:
- *
- *          info complete command
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoCompleteCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 2, objv, "command");
-        return TCL_ERROR;
-    }
-
-    if (TclObjCommandComplete(objv[2])) {
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), 1);
-    } else {
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoDefaultCmd --
- *
- *      Called to implement the "info default" command that returns the
- *      default value for a procedure argument. Handles the following
- *      syntax:
- *
- *          info default procName arg varName
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoDefaultCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *procName, *argName, *varName;
-    Proc *procPtr;
-    CompiledLocal *localPtr;
-    Tcl_Obj *valueObjPtr;
-
-    if (objc != 5) {
-        Tcl_WrongNumArgs(interp, 2, objv, "procname arg varname");
-        return TCL_ERROR;
-    }
-
-    procName = Tcl_GetString(objv[2]);
-    argName = Tcl_GetString(objv[3]);
-
-    procPtr = TclFindProc(iPtr, procName);
-    if (procPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"\"", procName, "\" isn't a procedure", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    for (localPtr = procPtr->firstLocalPtr;  localPtr != NULL;
-            localPtr = localPtr->nextPtr) {
-        if (TclIsVarArgument(localPtr)
-		&& (strcmp(argName, localPtr->name) == 0)) {
-            if (localPtr->defValuePtr != NULL) {
-		valueObjPtr = Tcl_ObjSetVar2(interp, objv[4], NULL,
-			localPtr->defValuePtr, 0);
-                if (valueObjPtr == NULL) {
-                    defStoreError:
-		    varName = Tcl_GetString(objv[4]);
-		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-	                    "couldn't store default value in variable \"",
-			    varName, "\"", (char *) NULL);
-                    return TCL_ERROR;
-                }
-		Tcl_SetIntObj(Tcl_GetObjResult(interp), 1);
-            } else {
-                Tcl_Obj *nullObjPtr = Tcl_NewObj();
-                valueObjPtr = Tcl_ObjSetVar2(interp, objv[4], NULL,
-			nullObjPtr, 0);
-                if (valueObjPtr == NULL) {
-                    Tcl_DecrRefCount(nullObjPtr); /* free unneeded obj */
-                    goto defStoreError;
-                }
-		Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-            }
-            return TCL_OK;
-        }
-    }
-
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-	    "procedure \"", procName, "\" doesn't have an argument \"",
-	    argName, "\"", (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoExistsCmd --
- *
- *      Called to implement the "info exists" command that determines
- *      whether a variable exists. Handles the following syntax:
- *
- *          info exists varName
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoExistsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *varName;
-    Var *varPtr, *arrayPtr;
-
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 2, objv, "varName");
-        return TCL_ERROR;
-    }
-
-    varName = Tcl_GetString(objv[2]);
-    varPtr = TclLookupVar(interp, varName, (char *) NULL,
-            0, "access",
-            /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-    if ((varPtr != NULL) && !TclIsVarUndefined(varPtr)) {
-        Tcl_SetIntObj(Tcl_GetObjResult(interp), 1);
-    } else {
-        Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoGlobalsCmd --
- *
- *      Called to implement the "info globals" command that returns the list
- *      of global variables matching an optional pattern. Handles the
- *      following syntax:
- *
- *          info globals ?pattern?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoGlobalsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *varName, *pattern;
-    Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Var *varPtr;
-    Tcl_Obj *listPtr;
-
-    if (objc == 2) {
-        pattern = NULL;
-    } else if (objc == 3) {
-        pattern = Tcl_GetString(objv[2]);
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the global :: namespace's variable table and create a
-     * list of all global variables that match the pattern.
-     */
-    
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    for (entryPtr = Tcl_FirstHashEntry(&globalNsPtr->varTable, &search);
-            entryPtr != NULL;
-            entryPtr = Tcl_NextHashEntry(&search)) {
-        varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-        if (TclIsVarUndefined(varPtr)) {
-            continue;
-        }
-        varName = Tcl_GetHashKey(&globalNsPtr->varTable, entryPtr);
-        if ((pattern == NULL) || Tcl_StringMatch(varName, pattern)) {
-            Tcl_ListObjAppendElement(interp, listPtr,
-		    Tcl_NewStringObj(varName, -1));
-        }
-    }
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoHostnameCmd --
- *
- *      Called to implement the "info hostname" command that returns the
- *      host name. Handles the following syntax:
- *
- *          info hostname
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoHostnameCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *name;
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    name = Tcl_GetHostName();
-    if (name) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp), name, -1);
-	return TCL_OK;
-    } else {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp),
-		"unable to determine name of host", -1);
-	return TCL_ERROR;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoLevelCmd --
- *
- *      Called to implement the "info level" command that returns
- *      information about the call stack. Handles the following syntax:
- *
- *          info level ?number?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoLevelCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int level;
-    CallFrame *framePtr;
-    Tcl_Obj *listPtr;
-
-    if (objc == 2) {		/* just "info level" */
-        if (iPtr->varFramePtr == NULL) {
-            Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-        } else {
-            Tcl_SetIntObj(Tcl_GetObjResult(interp), iPtr->varFramePtr->level);
-        }
-        return TCL_OK;
-    } else if (objc == 3) {
-        if (Tcl_GetIntFromObj(interp, objv[2], &level) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (level <= 0) {
-            if (iPtr->varFramePtr == NULL) {
-                levelError:
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"bad level \"",
-			Tcl_GetString(objv[2]),
-			"\"", (char *) NULL);
-                return TCL_ERROR;
-            }
-            level += iPtr->varFramePtr->level;
-        }
-        for (framePtr = iPtr->varFramePtr;  framePtr != NULL;
-                framePtr = framePtr->callerVarPtr) {
-            if (framePtr->level == level) {
-                break;
-            }
-        }
-        if (framePtr == NULL) {
-            goto levelError;
-        }
-
-        listPtr = Tcl_NewListObj(framePtr->objc, framePtr->objv);
-        Tcl_SetObjResult(interp, listPtr);
-        return TCL_OK;
-    }
-
-    Tcl_WrongNumArgs(interp, 2, objv, "?number?");
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoLibraryCmd --
- *
- *      Called to implement the "info library" command that returns the
- *      library directory for the Tcl installation. Handles the following
- *      syntax:
- *
- *          info library
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoLibraryCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *libDirName;
-
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    libDirName = Tcl_GetVar(interp, "tcl_library", TCL_GLOBAL_ONLY);
-    if (libDirName != NULL) {
-        Tcl_SetStringObj(Tcl_GetObjResult(interp), libDirName, -1);
-        return TCL_OK;
-    }
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), 
-            "no library has been specified for Tcl", -1);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoLoadedCmd --
- *
- *      Called to implement the "info loaded" command that returns the
- *      packages that have been loaded into an interpreter. Handles the
- *      following syntax:
- *
- *          info loaded ?interp?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoLoadedCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *interpName;
-    int result;
-
-    if ((objc != 2) && (objc != 3)) {
-        Tcl_WrongNumArgs(interp, 2, objv, "?interp?");
-        return TCL_ERROR;
-    }
-
-    if (objc == 2) {		/* get loaded pkgs in all interpreters */
-	interpName = NULL;
-    } else {			/* get pkgs just in specified interp */
-	interpName = Tcl_GetString(objv[2]);
-    }
-    result = TclGetLoadedPackages(interp, interpName);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoLocalsCmd --
- *
- *      Called to implement the "info locals" command to return a list of
- *      local variables that match an optional pattern. Handles the
- *      following syntax:
- *
- *          info locals ?pattern?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoLocalsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *pattern;
-    Tcl_Obj *listPtr;
-
-    if (objc == 2) {
-        pattern = NULL;
-    } else if (objc == 3) {
-        pattern = Tcl_GetString(objv[2]);
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
-        return TCL_ERROR;
-    }
-    
-    if (iPtr->varFramePtr == NULL || !iPtr->varFramePtr->isProcCallFrame) {
-        return TCL_OK;
-    }
-
-    /*
-     * Return a list containing names of first the compiled locals (i.e. the
-     * ones stored in the call frame), then the variables in the local hash
-     * table (if one exists).
-     */
-    
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    AppendLocals(interp, listPtr, pattern, 0);
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AppendLocals --
- *
- *	Append the local variables for the current frame to the
- *	specified list object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AppendLocals(interp, listPtr, pattern, includeLinks)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    Tcl_Obj *listPtr;		/* List object to append names to. */
-    char *pattern;		/* Pattern to match against. */
-    int includeLinks;		/* 1 if upvars should be included, else 0. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CompiledLocal *localPtr;
-    Var *varPtr;
-    int i, localVarCt;
-    char *varName;
-    Tcl_HashTable *localVarTablePtr;
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-
-    localPtr = iPtr->varFramePtr->procPtr->firstLocalPtr;
-    localVarCt = iPtr->varFramePtr->numCompiledLocals;
-    varPtr = iPtr->varFramePtr->compiledLocals;
-    localVarTablePtr = iPtr->varFramePtr->varTablePtr;
-
-    for (i = 0; i < localVarCt; i++) {
-	/*
-	 * Skip nameless (temporary) variables and undefined variables
-	 */
-
-	if (!TclIsVarTemporary(localPtr) && !TclIsVarUndefined(varPtr)) {
-	    varName = varPtr->name;
-	    if ((pattern == NULL) || Tcl_StringMatch(varName, pattern)) {
-		Tcl_ListObjAppendElement(interp, listPtr,
-		        Tcl_NewStringObj(varName, -1));
-	    }
-        }
-	varPtr++;
-	localPtr = localPtr->nextPtr;
-    }
-    
-    if (localVarTablePtr != NULL) {
-	for (entryPtr = Tcl_FirstHashEntry(localVarTablePtr, &search);
-	        entryPtr != NULL;
-                entryPtr = Tcl_NextHashEntry(&search)) {
-	    varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-	    if (!TclIsVarUndefined(varPtr)
-		    && (includeLinks || !TclIsVarLink(varPtr))) {
-		varName = Tcl_GetHashKey(localVarTablePtr, entryPtr);
-		if ((pattern == NULL)
-		        || Tcl_StringMatch(varName, pattern)) {
-		    Tcl_ListObjAppendElement(interp, listPtr,
-			    Tcl_NewStringObj(varName, -1));
-		}
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoNameOfExecutableCmd --
- *
- *      Called to implement the "info nameofexecutable" command that returns
- *      the name of the binary file running this application. Handles the
- *      following syntax:
- *
- *          info nameofexecutable
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoNameOfExecutableCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    CONST char *nameOfExecutable;
-
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    nameOfExecutable = Tcl_GetNameOfExecutable();
-    
-    if (nameOfExecutable != NULL) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp), (char *)nameOfExecutable, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoPatchLevelCmd --
- *
- *      Called to implement the "info patchlevel" command that returns the
- *      default value for an argument to a procedure. Handles the following
- *      syntax:
- *
- *          info patchlevel
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoPatchLevelCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *patchlevel;
-
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    patchlevel = Tcl_GetVar(interp, "tcl_patchLevel",
-            (TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-    if (patchlevel != NULL) {
-        Tcl_SetStringObj(Tcl_GetObjResult(interp), patchlevel, -1);
-        return TCL_OK;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoProcsCmd --
- *
- *      Called to implement the "info procs" command that returns the
- *      procedures in the current namespace that match an optional pattern.
- *      Handles the following syntax:
- *
- *          info procs ?pattern?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoProcsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *cmdName, *pattern;
-    Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Command *cmdPtr, *realCmdPtr;
-    Tcl_Obj *listPtr;
-
-    if (objc == 2) {
-        pattern = NULL;
-    } else if (objc == 3) {
-        pattern = Tcl_GetString(objv[2]);
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the current namespace's command table and return a list
-     * of all procs that match the pattern.
-     */
-    
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    for (entryPtr = Tcl_FirstHashEntry(&currNsPtr->cmdTable, &search);
-            entryPtr != NULL;
-            entryPtr = Tcl_NextHashEntry(&search)) {
-        cmdName = Tcl_GetHashKey(&currNsPtr->cmdTable, entryPtr);
-        cmdPtr = (Command *) Tcl_GetHashValue(entryPtr);
-
-	/*
-	 * If the command isn't itself a proc, it still might be an
-	 * imported command that points to a "real" proc in a different
-	 * namespace.
-	 */
-
-	realCmdPtr = (Command *) TclGetOriginalCommand(
-	        (Tcl_Command) cmdPtr);
-        if (TclIsProc(cmdPtr)
-	        || ((realCmdPtr != NULL) && TclIsProc(realCmdPtr))) {
-            if ((pattern == NULL) || Tcl_StringMatch(cmdName, pattern)) {
-                Tcl_ListObjAppendElement(interp, listPtr,
-		        Tcl_NewStringObj(cmdName, -1));
-            }
-        }
-    }
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoScriptCmd --
- *
- *      Called to implement the "info script" command that returns the
- *      script file that is currently being evaluated. Handles the
- *      following syntax:
- *
- *          info script
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoScriptCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    if (iPtr->scriptFile != NULL) {
-        Tcl_SetStringObj(Tcl_GetObjResult(interp), iPtr->scriptFile, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoSharedlibCmd --
- *
- *      Called to implement the "info sharedlibextension" command that
- *      returns the file extension used for shared libraries. Handles the
- *      following syntax:
- *
- *          info sharedlibextension
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoSharedlibCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-    
-#ifdef TCL_SHLIB_EXT
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), TCL_SHLIB_EXT, -1);
-#endif
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoTclVersionCmd --
- *
- *      Called to implement the "info tclversion" command that returns the
- *      version number for this Tcl library. Handles the following syntax:
- *
- *          info tclversion
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoTclVersionCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *version;
-
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    version = Tcl_GetVar(interp, "tcl_version",
-        (TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));
-    if (version != NULL) {
-        Tcl_SetStringObj(Tcl_GetObjResult(interp), version, -1);
-        return TCL_OK;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InfoVarsCmd --
- *
- *	Called to implement the "info vars" command that returns the
- *	list of variables in the interpreter that match an optional pattern.
- *	The pattern, if any, consists of an optional sequence of namespace
- *	names separated by "::" qualifiers, which is followed by a
- *	glob-style pattern that restricts which variables are returned.
- *	Handles the following syntax:
- *
- *          info vars ?pattern?
- *
- * Results:
- *      Returns TCL_OK is successful and TCL_ERROR is there is an error.
- *
- * Side effects:
- *      Returns a result in the interpreter's result object. If there is
- *	an error, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InfoVarsCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *varName, *pattern, *simplePattern;
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Var *varPtr;
-    Namespace *nsPtr;
-    Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    Namespace *currNsPtr   = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    Tcl_Obj *listPtr, *elemObjPtr;
-    int specificNsInPattern = 0;  /* Init. to avoid compiler warning. */
-
-    /*
-     * Get the pattern and find the "effective namespace" in which to
-     * list variables. We only use this effective namespace if there's
-     * no active Tcl procedure frame.
-     */
-
-    if (objc == 2) {
-        simplePattern = NULL;
-	nsPtr = currNsPtr;
-	specificNsInPattern = 0;
-    } else if (objc == 3) {
-	/*
-	 * From the pattern, get the effective namespace and the simple
-	 * pattern (no namespace qualifiers or ::'s) at the end. If an
-	 * error was found while parsing the pattern, return it. Otherwise,
-	 * if the namespace wasn't found, just leave nsPtr NULL: we will
-	 * return an empty list since no variables there can be found.
-	 */
-
-	Namespace *dummy1NsPtr, *dummy2NsPtr;
-
-        pattern = Tcl_GetString(objv[2]);
-	TclGetNamespaceForQualName(interp, pattern, (Namespace *) NULL,
-		/*flags*/ 0, &nsPtr, &dummy1NsPtr, &dummy2NsPtr,
-		&simplePattern);
-
-	if (nsPtr != NULL) {	/* we successfully found the pattern's ns */
-	    specificNsInPattern = (strcmp(simplePattern, pattern) != 0);
-	}
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * If the namespace specified in the pattern wasn't found, just return.
-     */
-
-    if (nsPtr == NULL) {
-	return TCL_OK;
-    }
-    
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    
-    if ((iPtr->varFramePtr == NULL)
-	    || !iPtr->varFramePtr->isProcCallFrame
-	    || specificNsInPattern) {
-	/*
-	 * There is no frame pointer, the frame pointer was pushed only
-	 * to activate a namespace, or we are in a procedure call frame
-	 * but a specific namespace was specified. Create a list containing
-	 * only the variables in the effective namespace's variable table.
-	 */
-	
-	entryPtr = Tcl_FirstHashEntry(&nsPtr->varTable, &search);
-	while (entryPtr != NULL) {
-	    varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-	    if (!TclIsVarUndefined(varPtr)
-		    || (varPtr->flags & VAR_NAMESPACE_VAR)) {
-		varName = Tcl_GetHashKey(&nsPtr->varTable, entryPtr);
-		if ((simplePattern == NULL)
-	                || Tcl_StringMatch(varName, simplePattern)) {
-		    if (specificNsInPattern) {
-			elemObjPtr = Tcl_NewObj();
-			Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr,
-			        elemObjPtr);
-		    } else {
-			elemObjPtr = Tcl_NewStringObj(varName, -1);
-		    }
-		    Tcl_ListObjAppendElement(interp, listPtr, elemObjPtr);
-		}
-	    }
-	    entryPtr = Tcl_NextHashEntry(&search);
-	}
-
-	/*
-	 * If the effective namespace isn't the global :: namespace, and a
-	 * specific namespace wasn't requested in the pattern (i.e., the
-	 * pattern only specifies variable names), then add in all global ::
-	 * variables that match the simple pattern. Of course, add in only
-	 * those variables that aren't hidden by a variable in the effective
-	 * namespace.
-	 */
-
-	if ((nsPtr != globalNsPtr) && !specificNsInPattern) {
-	    entryPtr = Tcl_FirstHashEntry(&globalNsPtr->varTable, &search);
-	    while (entryPtr != NULL) {
-		varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-		if (!TclIsVarUndefined(varPtr)
-		        || (varPtr->flags & VAR_NAMESPACE_VAR)) {
-		    varName = Tcl_GetHashKey(&globalNsPtr->varTable,
-			    entryPtr);
-		    if ((simplePattern == NULL)
-	                    || Tcl_StringMatch(varName, simplePattern)) {
-			if (Tcl_FindHashEntry(&nsPtr->varTable, varName) == NULL) {
-			    Tcl_ListObjAppendElement(interp, listPtr,
-			            Tcl_NewStringObj(varName, -1));
-			}
-		    }
-		}
-		entryPtr = Tcl_NextHashEntry(&search);
-	    }
-	}
-    } else {
-	AppendLocals(interp, listPtr, simplePattern, 1);
-    }
-    
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_JoinObjCmd --
- *
- *	This procedure is invoked to process the "join" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_JoinObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *joinString, *bytes;
-    int joinLength, listLen, length, i, result;
-    Tcl_Obj **elemPtrs;
-    Tcl_Obj *resObjPtr;
-
-    if (objc == 2) {
-	joinString = " ";
-	joinLength = 1;
-    } else if (objc == 3) {
-	joinString = Tcl_GetStringFromObj(objv[2], &joinLength);
-    } else {
-	Tcl_WrongNumArgs(interp, 1, objv, "list ?joinString?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure the list argument is a list object and get its length and
-     * a pointer to its array of element pointers.
-     */
-
-    result = Tcl_ListObjGetElements(interp, objv[1], &listLen, &elemPtrs);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * Now concatenate strings to form the "joined" result. We append
-     * directly into the interpreter's result object.
-     */
-
-    resObjPtr = Tcl_GetObjResult(interp);
-
-    for (i = 0;  i < listLen;  i++) {
-	bytes = Tcl_GetStringFromObj(elemPtrs[i], &length);
-	if (i > 0) {
-	    Tcl_AppendToObj(resObjPtr, joinString, joinLength);
-	}
-	Tcl_AppendToObj(resObjPtr, bytes, length);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LindexObjCmd --
- *
- *	This object-based procedure is invoked to process the "lindex" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-int
-Tcl_LindexObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *listPtr;
-    Tcl_Obj **elemPtrs;
-    int listLen, index, result;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "list index");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Convert the first argument to a list if necessary.
-     */
-
-    listPtr = objv[1];
-    result = Tcl_ListObjGetElements(interp, listPtr, &listLen, &elemPtrs);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * Get the index from objv[2].
-     */
-
-    result = TclGetIntForIndex(interp, objv[2], /*endValue*/ (listLen - 1),
-	    &index);
-    if (result != TCL_OK) {
-	return result;
-    }
-    if ((index < 0) || (index >= listLen)) {
-	/*
-	 * The index is out of range: the result is an empty string object.
-	 */
-	
-	return TCL_OK;
-    }
-
-    /*
-     * Make sure listPtr still refers to a list object. It might have been
-     * converted to an int above if the argument objects were shared.
-     */
-
-    if (listPtr->typePtr != &tclListType) {
-	result = Tcl_ListObjGetElements(interp, listPtr, &listLen,
-	        &elemPtrs);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-
-    /*
-     * Set the interpreter's object result to the index-th list element.
-     */
-
-    Tcl_SetObjResult(interp, elemPtrs[index]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LinsertObjCmd --
- *
- *	This object-based procedure is invoked to process the "linsert" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A new Tcl list object formed by inserting zero or more elements 
- *	into a list.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_LinsertObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    register int objc;		/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *listPtr, *resultPtr;
-    Tcl_ObjType *typePtr;
-    int index, isDuplicate, len, result;
-   
-    if (objc < 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "list index element ?element ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Get the index first since, if a conversion to int is needed, it
-     * will invalidate the list's internal representation.
-     */
-
-    result = TclGetIntForIndex(interp, objv[2], /*endValue*/ INT_MAX,
-	    &index);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * If the list object is unshared we can modify it directly. Otherwise
-     * we create a copy to modify: this is "copy on write". We create the
-     * duplicate directly in the interpreter's object result.
-     */
-    
-    listPtr = objv[1];
-    isDuplicate = 0;
-    if (Tcl_IsShared(listPtr)) {
-	/*
-	 * The following code must reflect the logic in Tcl_DuplicateObj()
-	 * except that it must duplicate the list object directly into the
-	 * interpreter's result.
-	 */
-	
-	Tcl_ResetResult(interp);
-	resultPtr = Tcl_GetObjResult(interp);
-	typePtr = listPtr->typePtr;
-	if (listPtr->bytes == NULL) {
-	    resultPtr->bytes = NULL;
-	} else if (listPtr->bytes != tclEmptyStringRep) {
-	    len = listPtr->length;
-	    TclInitStringRep(resultPtr, listPtr->bytes, len);
-	}
-	if (typePtr != NULL) {
-	    if (typePtr->dupIntRepProc == NULL) {
-		resultPtr->internalRep = listPtr->internalRep;
-		resultPtr->typePtr = typePtr;
-	    } else {
-		(*typePtr->dupIntRepProc)(listPtr, resultPtr);
-	    }
-	}
-	listPtr = resultPtr;
-	isDuplicate = 1;
-    }
-    
-    if ((objc == 4) && (index == INT_MAX)) {
-	/*
-	 * Special case: insert one element at the end of the list.
-	 */
-
-	result = Tcl_ListObjAppendElement(interp, listPtr, objv[3]);
-    } else if (objc > 3) {
-	result = Tcl_ListObjReplace(interp, listPtr, index, 0,
-				    (objc-3), &(objv[3]));
-    }
-    if (result != TCL_OK) {
-	return result;
-    }
-    
-    /*
-     * Set the interpreter's object result.
-     */
-
-    if (!isDuplicate) {
-	Tcl_SetObjResult(interp, listPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjCmd --
- *
- *	This procedure is invoked to process the "list" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ListObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    register int objc;			/* Number of arguments. */
-    register Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    /*
-     * If there are no list elements, the result is an empty object.
-     * Otherwise modify the interpreter's result object to be a list object.
-     */
-    
-    if (objc > 1) {
-	Tcl_SetListObj(Tcl_GetObjResult(interp), (objc-1), &(objv[1]));
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LlengthObjCmd --
- *
- *	This object-based procedure is invoked to process the "llength" Tcl
- *	command.  See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_LlengthObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    register Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int listLen, result;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "list");
-	return TCL_ERROR;
-    }
-
-    result = Tcl_ListObjLength(interp, objv[1], &listLen);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * Set the interpreter's object result to an integer object holding the
-     * length. 
-     */
-
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), listLen);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LrangeObjCmd --
- *
- *	This procedure is invoked to process the "lrange" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_LrangeObjCmd(notUsed, interp, objc, objv)
-    ClientData notUsed;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    register Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *listPtr;
-    Tcl_Obj **elemPtrs;
-    int listLen, first, last, numElems, result;
-
-    if (objc != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "list first last");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure the list argument is a list object and get its length and
-     * a pointer to its array of element pointers.
-     */
-
-    listPtr = objv[1];
-    result = Tcl_ListObjGetElements(interp, listPtr, &listLen, &elemPtrs);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * Get the first and last indexes.
-     */
-
-    result = TclGetIntForIndex(interp, objv[2], /*endValue*/ (listLen - 1),
-	    &first);
-    if (result != TCL_OK) {
-	return result;
-    }
-    if (first < 0) {
-	first = 0;
-    }
-
-    result = TclGetIntForIndex(interp, objv[3], /*endValue*/ (listLen - 1),
-	    &last);
-    if (result != TCL_OK) {
-	return result;
-    }
-    if (last >= listLen) {
-	last = (listLen - 1);
-    }
-    
-    if (first > last) {
-	return TCL_OK;		/* the result is an empty object */
-    }
-
-    /*
-     * Make sure listPtr still refers to a list object. It might have been
-     * converted to an int above if the argument objects were shared.
-     */  
-
-    if (listPtr->typePtr != &tclListType) {
-        result = Tcl_ListObjGetElements(interp, listPtr, &listLen,
-                &elemPtrs);
-        if (result != TCL_OK) {
-            return result;
-        }
-    }
-
-    /*
-     * Extract a range of fields. We modify the interpreter's result object
-     * to be a list object containing the specified elements.
-     */
-
-    numElems = (last - first + 1);
-    Tcl_SetListObj(Tcl_GetObjResult(interp), numElems, &(elemPtrs[first]));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LreplaceObjCmd --
- *
- *	This object-based procedure is invoked to process the "lreplace" 
- *	Tcl command. See the user documentation for details on what it does.
- *
- * Results:
- *	A new Tcl list object formed by replacing zero or more elements of
- *	a list.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_LreplaceObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Tcl_Obj *listPtr;
-    int createdNewObj, first, last, listLen, numToDelete;
-    int firstArgLen, result;
-    char *firstArg;
-
-    if (objc < 4) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"list first last ?element element ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * If the list object is unshared we can modify it directly, otherwise
-     * we create a copy to modify: this is "copy on write".
-     */
-    
-    listPtr = objv[1];
-    createdNewObj = 0;
-    if (Tcl_IsShared(listPtr)) {
-	listPtr = Tcl_DuplicateObj(listPtr);
-	createdNewObj = 1;
-    }
-    result = Tcl_ListObjLength(interp, listPtr, &listLen);
-    if (result != TCL_OK) {
-        errorReturn:
-	if (createdNewObj) {
-	    Tcl_DecrRefCount(listPtr); /* free unneeded obj */
-	}
-	return result;
-    }
-
-    /*
-     * Get the first and last indexes.
-     */
-
-    result = TclGetIntForIndex(interp, objv[2], /*endValue*/ (listLen - 1),
-	    &first);
-    if (result != TCL_OK) {
-	goto errorReturn;
-    }
-    firstArg = Tcl_GetStringFromObj(objv[2], &firstArgLen);
-
-    result = TclGetIntForIndex(interp, objv[3], /*endValue*/ (listLen - 1),
-	    &last);
-    if (result != TCL_OK) {
-	goto errorReturn;
-    }
-
-    if (first < 0)  {
-    	first = 0;
-    }
-    if ((first >= listLen) && (listLen > 0)
-	    && (strncmp(firstArg, "end", (unsigned) firstArgLen) != 0)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"list doesn't contain element ",
-		Tcl_GetString(objv[2]), (int *) NULL);
-	result = TCL_ERROR;
-	goto errorReturn;
-    }
-    if (last >= listLen) {
-    	last = (listLen - 1);
-    }
-    if (first <= last) {
-	numToDelete = (last - first + 1);
-    } else {
-	numToDelete = 0;
-    }
-
-    if (objc > 4) {
-	result = Tcl_ListObjReplace(interp, listPtr, first, numToDelete,
-	        (objc-4), &(objv[4]));
-    } else {
-	result = Tcl_ListObjReplace(interp, listPtr, first, numToDelete,
-		0, NULL);
-    }
-    if (result != TCL_OK) {
-	goto errorReturn;
-    }
-
-    /*
-     * Set the interpreter's object result. 
-     */
-
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LsearchObjCmd --
- *
- *	This procedure is invoked to process the "lsearch" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_LsearchObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument values. */
-{
-    char *bytes, *patternBytes;
-    int i, match, mode, index, result, listc, length, elemLen;
-    Tcl_Obj *patObj, **listv;
-    static char *options[] = {
-	"-exact",	"-glob",	"-regexp",	NULL
-    };
-    enum options {
-	LSEARCH_EXACT,	LSEARCH_GLOB,	LSEARCH_REGEXP
-    };
-
-    mode = LSEARCH_GLOB;
-    if (objc == 4) {
-	if (Tcl_GetIndexFromObj(interp, objv[1], options, "search mode", 0,
-		&mode) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?mode? list pattern");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure the list argument is a list object and get its length and
-     * a pointer to its array of element pointers.
-     */
-
-    result = Tcl_ListObjGetElements(interp, objv[objc - 2], &listc, &listv);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    patObj = objv[objc - 1];
-    patternBytes = Tcl_GetStringFromObj(patObj, &length);
-
-    index = -1;
-    for (i = 0; i < listc; i++) {
-	match = 0;
-	bytes = Tcl_GetStringFromObj(listv[i], &elemLen);
-	switch ((enum options) mode) {
-	    case LSEARCH_EXACT: {
-		if (length == elemLen) {
-		    match = (memcmp(bytes, patternBytes,
-			    (size_t) length) == 0);
-		}
-		break;
-	    }
-	    case LSEARCH_GLOB: {
-		match = Tcl_StringMatch(bytes, patternBytes);
-		break;
-	    }
-	    case LSEARCH_REGEXP: {
-		match = TclRegExpMatchObj(interp, bytes, patObj);
-		if (match < 0) {
-		    return TCL_ERROR;
-		}
-		break;
-	    }
-	}
-	if (match != 0) {
-	    index = i;
-	    break;
-	}
-    }
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), index);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LsortObjCmd --
- *
- *	This procedure is invoked to process the "lsort" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_LsortObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument values. */
-{
-    int i, index;
-    Tcl_Obj *resultPtr;
-    int length;
-    Tcl_Obj *cmdPtr, **listObjPtrs;
-    SortElement *elementArray;
-    SortElement *elementPtr;        
-    SortInfo sortInfo;                  /* Information about this sort that
-                                         * needs to be passed to the 
-                                         * comparison function */
-    static char *switches[] =
-	    {"-ascii", "-command", "-decreasing", "-dictionary",
-	    "-increasing", "-index", "-integer", "-real", (char *) NULL};
-
-    resultPtr = Tcl_GetObjResult(interp);
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?options? list");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Parse arguments to set up the mode for the sort.
-     */
-
-    sortInfo.isIncreasing = 1;
-    sortInfo.sortMode = SORTMODE_ASCII;
-    sortInfo.index = -1;
-    sortInfo.interp = interp;
-    sortInfo.resultCode = TCL_OK;
-    cmdPtr = NULL;
-    for (i = 1; i < objc-1; i++) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], switches, "option", 0, &index)
-		!= TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch (index) {
-	    case 0:			/* -ascii */
-		sortInfo.sortMode = SORTMODE_ASCII;
-		break;
-	    case 1:			/* -command */
-		if (i == (objc-2)) {
-		    Tcl_AppendToObj(resultPtr,
-			    "\"-command\" option must be followed by comparison command",
-			    -1);
-		    return TCL_ERROR;
-		}
-		sortInfo.sortMode = SORTMODE_COMMAND;
-		cmdPtr = objv[i+1];
-		i++;
-		break;
-	    case 2:			/* -decreasing */
-		sortInfo.isIncreasing = 0;
-		break;
-	    case 3:			/* -dictionary */
-		sortInfo.sortMode = SORTMODE_DICTIONARY;
-		break;
-	    case 4:			/* -increasing */
-		sortInfo.isIncreasing = 1;
-		break;
-	    case 5:			/* -index */
-		if (i == (objc-2)) {
-		    Tcl_AppendToObj(resultPtr,
-			    "\"-index\" option must be followed by list index",
-			    -1);
-		    return TCL_ERROR;
-		}
-		if (TclGetIntForIndex(interp, objv[i+1], -2, &sortInfo.index)
-			!= TCL_OK) {
-		    return TCL_ERROR;
-		}
-		cmdPtr = objv[i+1];
-		i++;
-		break;
-	    case 6:			/* -integer */
-		sortInfo.sortMode = SORTMODE_INTEGER;
-		break;
-	    case 7:			/* -real */
-		sortInfo.sortMode = SORTMODE_REAL;
-		break;
-	}
-    }
-    if (sortInfo.sortMode == SORTMODE_COMMAND) {
-	/*
-	 * The existing command is a list. We want to flatten it, append
-	 * two dummy arguments on the end, and replace these arguments
-	 * later.
-	 */
-
-        Tcl_Obj *newCommandPtr = Tcl_DuplicateObj(cmdPtr);
-
-	if (Tcl_ListObjAppendElement(interp, newCommandPtr, Tcl_NewObj()) 
-	        != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_ListObjAppendElement(interp, newCommandPtr, Tcl_NewObj());
-	sortInfo.compareCmdPtr = newCommandPtr;
-	Tcl_IncrRefCount(newCommandPtr);
-    }
-
-    sortInfo.resultCode = Tcl_ListObjGetElements(interp, objv[objc-1],
-	    &length, &listObjPtrs);
-    if (sortInfo.resultCode != TCL_OK) {
-	goto done;
-    }
-    if (length <= 0) {
-        return TCL_OK;
-    }
-    elementArray = (SortElement *) ckalloc(length * sizeof(SortElement));
-    for (i=0; i < length; i++){
-	elementArray[i].objPtr = listObjPtrs[i];
-	elementArray[i].nextPtr = &elementArray[i+1];
-    }
-    elementArray[length-1].nextPtr = NULL;
-    elementPtr = MergeSort(elementArray, &sortInfo);
-    if (sortInfo.resultCode == TCL_OK) {
-	/*
-	 * Note: must clear the interpreter's result object: it could
-	 * have been set by the -command script.
-	 */
-
-	Tcl_ResetResult(interp);
-	resultPtr = Tcl_GetObjResult(interp);
-	for (; elementPtr != NULL; elementPtr = elementPtr->nextPtr){
-	    Tcl_ListObjAppendElement(interp, resultPtr, elementPtr->objPtr);
-	}
-    }
-    ckfree((char*) elementArray);
-
-    done:
-    if (sortInfo.sortMode == SORTMODE_COMMAND) {
-	Tcl_DecrRefCount(sortInfo.compareCmdPtr);
-	sortInfo.compareCmdPtr = NULL;
-    }
-    return sortInfo.resultCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MergeSort -
- *
- *	This procedure sorts a linked list of SortElement structures
- *	use the merge-sort algorithm.
- *
- * Results:
- *      A pointer to the head of the list after sorting is returned.
- *
- * Side effects:
- *	None, unless a user-defined comparison command does something
- *	weird.
- *
- *----------------------------------------------------------------------
- */
-
-static SortElement *
-MergeSort(headPtr, infoPtr)
-    SortElement *headPtr;               /* First element on the list */
-    SortInfo *infoPtr;                  /* Information needed by the
-                                         * comparison operator */
-{
-    /*
-     * The subList array below holds pointers to temporary lists built
-     * during the merge sort.  Element i of the array holds a list of
-     * length 2**i.
-     */
-
-#   define NUM_LISTS 30
-    SortElement *subList[NUM_LISTS];
-    SortElement *elementPtr;
-    int i;
-
-    for(i = 0; i < NUM_LISTS; i++){
-        subList[i] = NULL;
-    }
-    while (headPtr != NULL) {
-	elementPtr = headPtr;
-	headPtr = headPtr->nextPtr;
-	elementPtr->nextPtr = 0;
-	for (i = 0; (i < NUM_LISTS) && (subList[i] != NULL); i++){
-	    elementPtr = MergeLists(subList[i], elementPtr, infoPtr);
-	    subList[i] = NULL;
-	}
-	if (i >= NUM_LISTS) {
-	    i = NUM_LISTS-1;
-	}
-	subList[i] = elementPtr;
-    }
-    elementPtr = NULL;
-    for (i = 0; i < NUM_LISTS; i++){
-        elementPtr = MergeLists(subList[i], elementPtr, infoPtr);
-    }
-    return elementPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MergeLists -
- *
- *	This procedure combines two sorted lists of SortElement structures
- *	into a single sorted list.
- *
- * Results:
- *      The unified list of SortElement structures.
- *
- * Side effects:
- *	None, unless a user-defined comparison command does something
- *	weird.
- *
- *----------------------------------------------------------------------
- */
-
-static SortElement *
-MergeLists(leftPtr, rightPtr, infoPtr)
-    SortElement *leftPtr;               /* First list to be merged; may be
-					 * NULL. */
-    SortElement *rightPtr;              /* Second list to be merged; may be
-					 * NULL. */
-    SortInfo *infoPtr;                  /* Information needed by the
-                                         * comparison operator. */
-{
-    SortElement *headPtr;
-    SortElement *tailPtr;
-
-    if (leftPtr == NULL) {
-        return rightPtr;
-    }
-    if (rightPtr == NULL) {
-        return leftPtr;
-    }
-    if (SortCompare(leftPtr->objPtr, rightPtr->objPtr, infoPtr) > 0) {
-	tailPtr = rightPtr;
-	rightPtr = rightPtr->nextPtr;
-    } else {
-	tailPtr = leftPtr;
-	leftPtr = leftPtr->nextPtr;
-    }
-    headPtr = tailPtr;
-    while ((leftPtr != NULL) && (rightPtr != NULL)) {
-	if (SortCompare(leftPtr->objPtr, rightPtr->objPtr, infoPtr) > 0) {
-	    tailPtr->nextPtr = rightPtr;
-	    tailPtr = rightPtr;
-	    rightPtr = rightPtr->nextPtr;
-	} else {
-	    tailPtr->nextPtr = leftPtr;
-	    tailPtr = leftPtr;
-	    leftPtr = leftPtr->nextPtr;
-	}
-    }
-    if (leftPtr != NULL) {
-       tailPtr->nextPtr = leftPtr;
-    } else {
-       tailPtr->nextPtr = rightPtr;
-    }
-    return headPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SortCompare --
- *
- *	This procedure is invoked by MergeLists to determine the proper
- *	ordering between two elements.
- *
- * Results:
- *      A negative results means the the first element comes before the
- *      second, and a positive results means that the second element
- *      should come first.  A result of zero means the two elements
- *      are equal and it doesn't matter which comes first.
- *
- * Side effects:
- *	None, unless a user-defined comparison command does something
- *	weird.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SortCompare(objPtr1, objPtr2, infoPtr)
-    Tcl_Obj *objPtr1, *objPtr2;		/* Values to be compared. */
-    SortInfo *infoPtr;                  /* Information passed from the
-                                         * top-level "lsort" command */
-{
-    int order, listLen, index;
-    Tcl_Obj *objPtr;
-    char buffer[TCL_INTEGER_SPACE];
-
-    order = 0;
-    if (infoPtr->resultCode != TCL_OK) {
-	/*
-	 * Once an error has occurred, skip any future comparisons
-	 * so as to preserve the error message in sortInterp->result.
-	 */
-
-	return order;
-    }
-    if (infoPtr->index != -1) {
-	/*
-	 * The "-index" option was specified.  Treat each object as a
-	 * list, extract the requested element from each list, and
-	 * compare the elements, not the lists.  The special index "end"
-	 * is signaled here with a large negative index.
-	 */
-
-	if (Tcl_ListObjLength(infoPtr->interp, objPtr1, &listLen) != TCL_OK) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (infoPtr->index < -1) {
-	    index = listLen - 1;
-	} else {
-	    index = infoPtr->index;
-	}
-
-	if (Tcl_ListObjIndex(infoPtr->interp, objPtr1, index, &objPtr)
-		!= TCL_OK) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (objPtr == NULL) {
-	    objPtr = objPtr1;
-	    missingElement:
-	    TclFormatInt(buffer, infoPtr->index);
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(infoPtr->interp),
-			"element ", buffer, " missing from sublist \"",
-			Tcl_GetString(objPtr), "\"", (char *) NULL);
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	objPtr1 = objPtr;
-
-	if (Tcl_ListObjLength(infoPtr->interp, objPtr2, &listLen) != TCL_OK) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (infoPtr->index < -1) {
-	    index = listLen - 1;
-	} else {
-	    index = infoPtr->index;
-	}
-
-	if (Tcl_ListObjIndex(infoPtr->interp, objPtr2, index, &objPtr)
-		!= TCL_OK) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (objPtr == NULL) {
-	    objPtr = objPtr2;
-	    goto missingElement;
-	}
-	objPtr2 = objPtr;
-    }
-    if (infoPtr->sortMode == SORTMODE_ASCII) {
-	order = strcmp(Tcl_GetString(objPtr1), Tcl_GetString(objPtr2));
-    } else if (infoPtr->sortMode == SORTMODE_DICTIONARY) {
-	order = DictionaryCompare(
-		Tcl_GetString(objPtr1),	Tcl_GetString(objPtr2));
-    } else if (infoPtr->sortMode == SORTMODE_INTEGER) {
-	int a, b;
-
-	if ((Tcl_GetIntFromObj(infoPtr->interp, objPtr1, &a) != TCL_OK)
-		|| (Tcl_GetIntFromObj(infoPtr->interp, objPtr2, &b)
-		!= TCL_OK)) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (a > b) {
-	    order = 1;
-	} else if (b > a) {
-	    order = -1;
-	}
-    } else if (infoPtr->sortMode == SORTMODE_REAL) {
-	double a, b;
-
-	if ((Tcl_GetDoubleFromObj(infoPtr->interp, objPtr1, &a) != TCL_OK)
-	      || (Tcl_GetDoubleFromObj(infoPtr->interp, objPtr2, &b)
-		      != TCL_OK)) {
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-	if (a > b) {
-	    order = 1;
-	} else if (b > a) {
-	    order = -1;
-	}
-    } else {
-	Tcl_Obj **objv, *paramObjv[2];
-	int objc;
-
-	paramObjv[0] = objPtr1;
-	paramObjv[1] = objPtr2;
-
-  	/*
- 	 * We made space in the command list for the two things to
-	 * compare. Replace them and evaluate the result.
-	 */
-
-	Tcl_ListObjLength(infoPtr->interp, infoPtr->compareCmdPtr, &objc);
-	Tcl_ListObjReplace(infoPtr->interp, infoPtr->compareCmdPtr, objc - 2,
-		2, 2, paramObjv);
-   	Tcl_ListObjGetElements(infoPtr->interp, infoPtr->compareCmdPtr,
-		&objc, &objv);
-
-	infoPtr->resultCode = Tcl_EvalObjv(infoPtr->interp, objc, objv, 0);
-  
-  	if (infoPtr->resultCode != TCL_OK) {
-	    Tcl_AddErrorInfo(infoPtr->interp,
-		    "\n    (-compare command)");
-	    return order;
-	}
-
-	/*
-	 * Parse the result of the command.
-	 */
-
-	if (Tcl_GetIntFromObj(infoPtr->interp,
-		Tcl_GetObjResult(infoPtr->interp), &order) != TCL_OK) {
-	    Tcl_ResetResult(infoPtr->interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(infoPtr->interp),
-		    "-compare command returned non-numeric result", -1);
-	    infoPtr->resultCode = TCL_ERROR;
-	    return order;
-	}
-    }
-    if (!infoPtr->isIncreasing) {
-	order = -order;
-    }
-    return order;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DictionaryCompare
- *
- *	This function compares two strings as if they were being used in
- *	an index or card catalog.  The case of alphabetic characters is
- *	ignored, except to break ties.  Thus "B" comes before "b" but
- *	after "a".  Also, integers embedded in the strings compare in
- *	numerical order.  In other words, "x10y" comes after "x9y", not
- *      before it as it would when using strcmp().
- *
- * Results:
- *      A negative result means that the first element comes before the
- *      second, and a positive result means that the second element
- *      should come first.  A result of zero means the two elements
- *      are equal and it doesn't matter which comes first.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DictionaryCompare(left, right)
-    char *left, *right;          /* The strings to compare */
-{
-    Tcl_UniChar uniLeft, uniRight;
-    int diff, zeros;
-    int secondaryDiff = 0;
-
-    while (1) {
-	if (isdigit(UCHAR(*right)) /* INTL: digit */
-		&& isdigit(UCHAR(*left))) { /* INTL: digit */
-	    /*
-	     * There are decimal numbers embedded in the two
-	     * strings.  Compare them as numbers, rather than
-	     * strings.  If one number has more leading zeros than
-	     * the other, the number with more leading zeros sorts
-	     * later, but only as a secondary choice.
-	     */
-
-	    zeros = 0;
-	    while ((*right == '0') && (isdigit(UCHAR(right[1])))) {
-		right++;
-		zeros--;
-	    }
-	    while ((*left == '0') && (isdigit(UCHAR(left[1])))) {
-		left++;
-		zeros++;
-	    }
-	    if (secondaryDiff == 0) {
-		secondaryDiff = zeros;
-	    }
-
-	    /*
-	     * The code below compares the numbers in the two
-	     * strings without ever converting them to integers.  It
-	     * does this by first comparing the lengths of the
-	     * numbers and then comparing the digit values.
-	     */
-
-	    diff = 0;
-	    while (1) {
-		if (diff == 0) {
-		    diff = UCHAR(*left) - UCHAR(*right);
-		}
-		right++;
-		left++;
-		if (!isdigit(UCHAR(*right))) { /* INTL: digit */
-		    if (isdigit(UCHAR(*left))) { /* INTL: digit */
-			return 1;
-		    } else {
-			/*
-			 * The two numbers have the same length. See
-			 * if their values are different.
-			 */
-
-			if (diff != 0) {
-			    return diff;
-			}
-			break;
-		    }
-		} else if (!isdigit(UCHAR(*left))) { /* INTL: digit */
-		    return -1;
-		}
-	    }
-	    continue;
-	}
-
-	/*
-	 * Convert character to Unicode for comparison purposes.  If either
-	 * string is at the terminating null, do a byte-wise comparison and
-	 * bail out immediately.
-	 */
-
-	if ((*left != '\0') && (*right != '\0')) {
-	    left += Tcl_UtfToUniChar(left, &uniLeft);
-	    right += Tcl_UtfToUniChar(right, &uniRight);
-	} else {
-	    diff = UCHAR(*left) - UCHAR(*right);
-	    break;
-	}
-
-        diff = uniLeft - uniRight;
-        if (diff) {
-	    if (Tcl_UniCharIsUpper(uniLeft) &&
-		    Tcl_UniCharIsLower(uniRight)) {
-		diff = Tcl_UniCharToLower(uniLeft) - uniRight;
-		if (diff) {
-		    return diff;
-                } else if (secondaryDiff == 0) {
-		    secondaryDiff = -1;
-                }
-	    } else if (Tcl_UniCharIsUpper(uniRight)
-		    && Tcl_UniCharIsLower(uniLeft)) {
-                diff = uniLeft - Tcl_UniCharToLower(uniRight);
-                if (diff) {
-		    return diff;
-                } else if (secondaryDiff == 0) {
-		    secondaryDiff = 1;
-                }
-            } else {
-                return diff;
-            }
-        }
-    }
-    if (diff == 0) {
-	diff = secondaryDiff;
-    }
-    return diff;
-}
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
deleted file mode 100644
index 38a3f8d..0000000
--- a/generic/tclCmdMZ.c
+++ /dev/null
@@ -1,1935 +0,0 @@
-/* 
- * tclCmdMZ.c --
- *
- *	This file contains the top-level command routines for most of
- *	the Tcl built-in commands whose names begin with the letters
- *	M to Z.  It contains only commands in the generic core (i.e.
- *	those that don't depend much upon UNIX facilities).
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCmdMZ.c,v 1.3 1999/04/16 00:46:43 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclCompile.h"
-#include "tclRegexp.h"
-
-/*
- * Flag values used by Tcl_ScanObjCmd.
- */
-
-#define SCAN_NOSKIP	0x1		  /* Don't skip blanks. */
-#define SCAN_SUPPRESS	0x2		  /* Suppress assignment. */
-#define SCAN_UNSIGNED	0x4		  /* Read an unsigned value. */
-#define SCAN_WIDTH	0x8		  /* A width value was supplied. */
-
-#define SCAN_SIGNOK	0x10		  /* A +/- character is allowed. */
-#define SCAN_NODIGITS	0x20		  /* No digits have been scanned. */
-#define SCAN_NOZERO	0x40		  /* No zero digits have been scanned. */
-#define SCAN_XOK	0x80		  /* An 'x' is allowed. */
-#define SCAN_PTOK	0x100		  /* Decimal point is allowed. */
-#define SCAN_EXPOK	0x200		  /* An exponent is allowed. */
-
-/*
- * Structure used to hold information about variable traces:
- */
-
-typedef struct {
-    int flags;			/* Operations for which Tcl command is
-				 * to be invoked. */
-    char *errMsg;		/* Error message returned from Tcl command,
-				 * or NULL.  Malloc'ed. */
-    size_t length;		/* Number of non-NULL chars. in command. */
-    char command[4];		/* Space for Tcl command to invoke.  Actual
-				 * size will be as large as necessary to
-				 * hold command.  This field must be the
-				 * last in the structure, so that it can
-				 * be larger than 4 bytes. */
-} TraceVarInfo;
-
-/*
- * Forward declarations for procedures defined in this file:
- */
-
-static char *		TraceVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, char *name2,
-			    int flags));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PwdObjCmd --
- *
- *	This procedure is invoked to process the "pwd" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_PwdObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Tcl_DString ds;
-
-    if (objc != 1) {
-	Tcl_WrongNumArgs(interp, 1, objv, NULL);
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetCwd(interp, &ds) == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_DStringResult(interp, &ds);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegexpObjCmd --
- *
- *	This procedure is invoked to process the "regexp" Tcl command.
- *	See the user documentation for details on what it does.  The
- *	REGEXP_TEST stuff is to minimize code differences between this
- *	and the "testregexp" command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_RegexpObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int i, result, indices, stringLength, wLen, match, about;
-    int cflags, eflags;
-    Tcl_RegExp regExpr;
-    char *string;
-    Tcl_DString stringBuffer, valueBuffer;
-    Tcl_UniChar *wStart;
-    static char *options[] = {
-	"-indices",	"-nocase",	"-about",	"-expanded",
-	"-line",	"-linestop",	"-lineanchor",
-	"--",		(char *) NULL
-    };
-    enum options {
-	REGEXP_INDICES, REGEXP_NOCASE,	REGEXP_ABOUT,	REGEXP_EXPANDED,
-	REGEXP_LINE,	REGEXP_LINESTOP, REGEXP_LINEANCHOR,
-	REGEXP_LAST
-    };
-
-    indices = 0;
-    about = 0;
-    cflags = REG_ADVANCED;
-    eflags = 0;
-    
-    for (i = 1; i < objc; i++) {
-	char *name;
-	int index;
-
-	name = Tcl_GetString(objv[i]);
-	if (name[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", TCL_EXACT,
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch ((enum options) index) {
-	    case REGEXP_INDICES: {
-		indices = 1;
-		break;
-	    }
-	    case REGEXP_NOCASE: {
-		cflags |= REG_ICASE;
-		break;
-	    }
-	    case REGEXP_ABOUT: {
-		about = 1;
-		break;
-	    }
-	    case REGEXP_EXPANDED: {
-		cflags |= REG_EXPANDED;
-		break;
-	    }
-	    case REGEXP_LINE: {
-		cflags |= REG_NEWLINE;
-		break;
-	    }
-	    case REGEXP_LINESTOP: {
-		cflags |= REG_NLSTOP;
-		break;
-	    }
-	    case REGEXP_LINEANCHOR: {
-		cflags |= REG_NLANCH;
-		break;
-	    }
-	    case REGEXP_LAST: {
-		i++;
-		goto endOfForLoop;
-	    }
-	}
-    }
-
-    endOfForLoop:
-    if (objc - i < 2 - about) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?");
-	return TCL_ERROR;
-    }
-    objc -= i;
-    objv += i;
-
-    regExpr = Tcl_GetRegExpFromObj(interp, objv[0], cflags);
-    if (regExpr == NULL) {
-	return TCL_ERROR;
-    }
-
-    if (about) {
-	if (TclRegAbout(interp, regExpr) < 0) {
-	    return TCL_ERROR;
-	}
-	return TCL_OK;
-    }
-
-    result = TCL_OK;
-    string = Tcl_GetStringFromObj(objv[1], &stringLength);
-
-    Tcl_DStringInit(&valueBuffer);
-    
-    Tcl_DStringInit(&stringBuffer);
-    wStart = Tcl_UtfToUniCharDString(string, stringLength, &stringBuffer);
-    wLen = Tcl_DStringLength(&stringBuffer) / sizeof(Tcl_UniChar);
-
-    match = TclRegExpExecUniChar(interp, regExpr, wStart, wLen, objc-2, eflags);
-    if (match < 0) {
-	result = TCL_ERROR;
-	goto done;
-    }
-    if (match == 0) {
-	/*
-	 * Set the interpreter's object result to an integer object w/ value 0. 
-	 */
-	
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-	goto done;
-    }
-
-    /*
-     * If additional variable names have been specified, return
-     * index information in those variables.
-     */
-
-    objc -= 2;
-    objv += 2;
-
-    for (i = 0; i < objc; i++) {
-	char *varName, *value;
-	int start, end;
-	
-	varName = Tcl_GetString(objv[i]);
-
-	TclRegExpRangeUniChar(regExpr, i, &start, &end);
-	if (start < 0) {
-	    if (indices) {
-		value = Tcl_SetVar(interp, varName, "-1 -1", 0);
-	    } else {
-		value = Tcl_SetVar(interp, varName, "", 0);
-	    }
-	} else {
-	    if (indices) {
-		char info[TCL_INTEGER_SPACE * 2];
-		
-		sprintf(info, "%d %d", start, end - 1);
-		value = Tcl_SetVar(interp, varName, info, 0);
-	    } else {
-		value = Tcl_UniCharToUtfDString(wStart + start, end - start,
-			&valueBuffer);
-		value = Tcl_SetVar(interp, varName, value, 0);
-		Tcl_DStringSetLength(&valueBuffer, 0);
-	    }
-	}
-	if (value == NULL) {
-	    Tcl_AppendResult(interp, "couldn't set variable \"",
-		    varName, "\"", (char *) NULL);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-    }
-
-    /*
-     * Set the interpreter's object result to an integer object w/ value 1. 
-     */
-	
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), 1);
-
-    done:
-    Tcl_DStringFree(&stringBuffer);
-    Tcl_DStringFree(&valueBuffer);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegsubObjCmd --
- *
- *	This procedure is invoked to process the "regsub" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_RegsubObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int i, result, flags, all, stringLength, numMatches;
-    Tcl_RegExp regExpr;
-    Tcl_DString resultBuffer, stringBuffer;
-    CONST Tcl_UniChar *w, *wStart, *wEnd;
-    char *string, *subspec, *varname;
-    static char *options[] = {
-	"-all",		"-nocase",	"--",		NULL
-    };
-    enum options {
-	REGSUB_ALL,	REGSUB_NOCASE,	REGSUB_LAST
-    };
-
-    flags = 0;
-    all = 0;
-
-    for (i = 1; i < objc; i++) {
-	char *name;
-	int index;
-	
-	name = Tcl_GetString(objv[i]);
-	if (name[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", TCL_EXACT,
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch ((enum options) index) {
-	    case REGSUB_ALL: {
-		all = 1;
-		break;
-	    }
-	    case REGSUB_NOCASE: {
-		flags |= REG_ICASE;
-		break;
-	    }
-	    case REGSUB_LAST: {
-		i++;
-		goto endOfForLoop;
-	    }
-	}
-    }
-    endOfForLoop:
-    if (objc - i != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? exp string subSpec varName");
-	return TCL_ERROR;
-    }
-
-    objv += i;
-    regExpr = Tcl_GetRegExpFromObj(interp, objv[0], flags | REG_ADVANCED);
-    if (regExpr == NULL) {
-	return TCL_ERROR;
-    }
-
-    result = TCL_OK;
-    string = Tcl_GetStringFromObj(objv[1], &stringLength);
-    subspec = Tcl_GetString(objv[2]);
-    varname = Tcl_GetString(objv[3]);
-
-    Tcl_DStringInit(&resultBuffer);
-
-    /*
-     * The following loop is to handle multiple matches within the
-     * same source string;  each iteration handles one match and its
-     * corresponding substitution.  If "-all" hasn't been specified
-     * then the loop body only gets executed once.
-     */
-
-    Tcl_DStringInit(&stringBuffer);
-    wStart = Tcl_UtfToUniCharDString(string, stringLength, &stringBuffer);
-    wEnd = wStart + Tcl_DStringLength(&stringBuffer) / sizeof(Tcl_UniChar);
-
-    numMatches = 0;
-    for (w = wStart; w < wEnd; ) {
-	int start, end, subStart, subEnd, match;
-	char *src, *firstChar;
-	char c;
-
-	/*
-	 * The flags argument is set if string is part of a larger string,
-	 * so that "^" won't match.
-	 */
-
-	match = TclRegExpExecUniChar(interp, regExpr, w, wEnd - w, 10,
-		((w > wStart) ? REG_NOTBOL : 0));
-	if (match < 0) {
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	if (match == 0) {
-	    break;
-	}
-	numMatches++;
-
-	/*
-	 * Copy the portion of the source string before the match to the
-	 * result variable.
-	 */
-
-	TclRegExpRangeUniChar(regExpr, 0, &start, &end);
-	Tcl_UniCharToUtfDString(w, start, &resultBuffer);
-    
-	/*
-	 * Append the subSpec argument to the variable, making appropriate
-	 * substitutions.  This code is a bit hairy because of the backslash
-	 * conventions and because the code saves up ranges of characters in
-	 * subSpec to reduce the number of calls to Tcl_SetVar.
-	 */
-
-	src = subspec;
-	firstChar = subspec;
-	for (c = *src; c != '\0'; src++, c = *src) {
-	    int index;
-    
-	    if (c == '&') {
-		index = 0;
-	    } else if (c == '\\') {
-		c = src[1];
-		if ((c >= '0') && (c <= '9')) {
-		    index = c - '0';
-		} else if ((c == '\\') || (c == '&')) {
-		    Tcl_DStringAppend(&resultBuffer, firstChar,
-			    src - firstChar);
-		    Tcl_DStringAppend(&resultBuffer, &c, 1);
-		    firstChar = src + 2;
-		    src++;
-		    continue;
-		} else {
-		    continue;
-		}
-	    } else {
-		continue;
-	    }
-	    if (firstChar != src) {
-		Tcl_DStringAppend(&resultBuffer, firstChar, src - firstChar);
-	    }
-	    TclRegExpRangeUniChar(regExpr, index, &subStart, &subEnd);
-	    if ((subStart >= 0) && (subEnd >= 0)) {
-		Tcl_UniCharToUtfDString(w + subStart, subEnd - subStart,
-			&resultBuffer);
-	    }
-	    if (*src == '\\') {
-		src++;
-	    }
-	    firstChar = src + 1;
-	}
-	if (firstChar != src) {
-	    Tcl_DStringAppend(&resultBuffer, firstChar, src - firstChar);
-	}
-	if (end == 0) {
-	    /*
-	     * Always consume at least one character of the input string
-	     * in order to prevent infinite loops.
-	     */
-
-	    Tcl_UniCharToUtfDString(w, 1, &resultBuffer);
-	    w++;
-	}
-	w += end;
-	if (!all) {
-	    break;
-	}
-    }
-
-    /*
-     * Copy the portion of the source string after the last match to the
-     * result variable.
-     */
-
-    if ((w < wEnd) || (numMatches == 0)) {
-	Tcl_UniCharToUtfDString(w, wEnd - w, &resultBuffer);
-    }
-    if (Tcl_SetVar(interp, varname, Tcl_DStringValue(&resultBuffer),
-	    0) == NULL) {
-	Tcl_AppendResult(interp, "couldn't set variable \"", varname, "\"",
-		(char *) NULL);
-	result = TCL_ERROR;
-    } else {
-	/*
-	 * Set the interpreter's object result to an integer object holding the
-	 * number of matches. 
-	 */
-	
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), numMatches);
-    }
-
-    done:
-    Tcl_DStringFree(&stringBuffer);
-    Tcl_DStringFree(&resultBuffer);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RenameObjCmd --
- *
- *	This procedure is invoked to process the "rename" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_RenameObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Arbitrary value passed to the command. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *oldName, *newName;
-    
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "oldName newName");
-	return TCL_ERROR;
-    }
-
-    oldName = Tcl_GetString(objv[1]);
-    newName = Tcl_GetString(objv[2]);
-    return TclRenameCommand(interp, oldName, newName);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ReturnObjCmd --
- *
- *	This object-based procedure is invoked to process the "return" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ReturnObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int optionLen, argLen, code, result;
-
-    if (iPtr->errorInfo != NULL) {
-	ckfree(iPtr->errorInfo);
-	iPtr->errorInfo = NULL;
-    }
-    if (iPtr->errorCode != NULL) {
-	ckfree(iPtr->errorCode);
-	iPtr->errorCode = NULL;
-    }
-    code = TCL_OK;
-    
-    for (objv++, objc--;  objc > 1;  objv += 2, objc -= 2) {
-	char *option = Tcl_GetStringFromObj(objv[0], &optionLen);
-	char *arg = Tcl_GetStringFromObj(objv[1], &argLen);
-    	
-	if (strcmp(option, "-code") == 0) {
-	    register int c = arg[0];
-	    if ((c == 'o') && (strcmp(arg, "ok") == 0)) {
-		code = TCL_OK;
-	    } else if ((c == 'e') && (strcmp(arg, "error") == 0)) {
-		code = TCL_ERROR;
-	    } else if ((c == 'r') && (strcmp(arg, "return") == 0)) {
-		code = TCL_RETURN;
-	    } else if ((c == 'b') && (strcmp(arg, "break") == 0)) {
-		code = TCL_BREAK;
-	    } else if ((c == 'c') && (strcmp(arg, "continue") == 0)) {
-		code = TCL_CONTINUE;
-	    } else {
-		result = Tcl_GetIntFromObj((Tcl_Interp *) NULL, objv[1],
-		        &code);
-		if (result != TCL_OK) {
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			    "bad completion code \"",
-			    Tcl_GetString(objv[1]),
-			    "\": must be ok, error, return, break, ",
-			    "continue, or an integer", (char *) NULL);
-		    return result;
-		}
-	    }
-	} else if (strcmp(option, "-errorinfo") == 0) {
-	    iPtr->errorInfo =
-		(char *) ckalloc((unsigned) (strlen(arg) + 1));
-	    strcpy(iPtr->errorInfo, arg);
-	} else if (strcmp(option, "-errorcode") == 0) {
-	    iPtr->errorCode =
-		(char *) ckalloc((unsigned) (strlen(arg) + 1));
-	    strcpy(iPtr->errorCode, arg);
-	} else {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "bad option \"", option,
-		    "\": must be -code, -errorcode, or -errorinfo",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-    
-    if (objc == 1) {
-	/*
-	 * Set the interpreter's object result. An inline version of
-	 * Tcl_SetObjResult.
-	 */
-
-	Tcl_SetObjResult(interp, objv[0]);
-    }
-    iPtr->returnCode = code;
-    return TCL_RETURN;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SourceObjCmd --
- *
- *	This procedure is invoked to process the "source" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SourceObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *bytes;
-    int result;
-    
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "fileName");
-	return TCL_ERROR;
-    }
-
-    bytes = Tcl_GetString(objv[1]);
-    result = Tcl_EvalFile(interp, bytes);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SplitObjCmd --
- *
- *	This procedure is invoked to process the "split" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SplitObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_UniChar ch;
-    int len;
-    char *splitChars, *string, *end;
-    int splitCharLen, stringLen;
-    Tcl_Obj *listPtr, *objPtr;
-
-    if (objc == 2) {
-	splitChars = " \n\t\r";
-	splitCharLen = 4;
-    } else if (objc == 3) {
-	splitChars = Tcl_GetStringFromObj(objv[2], &splitCharLen);
-    } else {
-	Tcl_WrongNumArgs(interp, 1, objv, "string ?splitChars?");
-	return TCL_ERROR;
-    }
-
-    string = Tcl_GetStringFromObj(objv[1], &stringLen);
-    end = string + stringLen;
-    listPtr = Tcl_GetObjResult(interp);
-    
-    if (stringLen == 0) {
-	/*
-	 * Do nothing.
-	 */
-    } else if (splitCharLen == 0) {
-	/*
-	 * Handle the special case of splitting on every character.
-	 */
-
-	for ( ; string < end; string += len) {
-	    len = Tcl_UtfToUniChar(string, &ch);
-	    objPtr = Tcl_NewStringObj(string, len);
-	    Tcl_ListObjAppendElement(NULL, listPtr, objPtr);
-	}
-    } else {
-	char *element, *p, *splitEnd;
-	int splitLen;
-	Tcl_UniChar splitChar;
-	
-	/*
-	 * Normal case: split on any of a given set of characters.
-	 * Discard instances of the split characters.
-	 */
-
-	splitEnd = splitChars + splitCharLen;
-
-	for (element = string; string < end; string += len) {
-	    len = Tcl_UtfToUniChar(string, &ch);
-	    for (p = splitChars; p < splitEnd; p += splitLen) {
-		splitLen = Tcl_UtfToUniChar(p, &splitChar);
-		if (ch == splitChar) {
-		    objPtr = Tcl_NewStringObj(element, string - element);
-		    Tcl_ListObjAppendElement(NULL, listPtr, objPtr);
-		    element = string + len;
-		    break;
-		}
-	    }
-	}
-	objPtr = Tcl_NewStringObj(element, string - element);
-	Tcl_ListObjAppendElement(NULL, listPtr, objPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_StringObjCmd --
- *
- *	This procedure is invoked to process the "string" Tcl command.
- *	See the user documentation for details on what it does.  Note
- *	that this command only functions correctly on properly formed
- *	Tcl UTF strings.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_StringObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int index, left, right;
-    Tcl_Obj *resultPtr;
-    char *string1, *string2;
-    int length1, length2;
-    static char *options[] = {
-	"compare",	"first",	"index",	"last",
-	"length",	"match",	"range",	"tolower",
-	"toupper",	"totitle",	"trim",		"trimleft",
-	"trimright",	"wordend",	"wordstart",	(char *) NULL
-    };
-    enum options {
-	STR_COMPARE,	STR_FIRST,	STR_INDEX,	STR_LAST,
-	STR_LENGTH,	STR_MATCH,	STR_RANGE,	STR_TOLOWER,
-	STR_TOUPPER,	STR_TOTITLE,	STR_TRIM,	STR_TRIMLEFT,
-	STR_TRIMRIGHT,	STR_WORDEND,	STR_WORDSTART
-    };	  
-	    
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-    
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    switch ((enum options) index) {
-	case STR_COMPARE: {
-	    int match, length;
-
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string1 string2");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    string2 = Tcl_GetStringFromObj(objv[3], &length2);
-
-	    length = (length1 < length2) ? length1 : length2;
-	    match = memcmp(string1, string2, (unsigned) length);
-	    if (match == 0) {
-	        match = length1 - length2;
-	    }
-	    Tcl_SetIntObj(resultPtr, (match > 0) ? 1 : (match < 0) ? -1 : 0);
-	    break;
-	}
-	case STR_FIRST: {
-	    register char *p, *end;
-	    int match;
-
-	    if (objc != 4) {
-	        badFirstLastArgs:
-	        Tcl_WrongNumArgs(interp, 2, objv, "string1 string2");
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * This algorithm fails on improperly formed UTF strings.
-	     */
-
-	    match = -1;
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    string2 = Tcl_GetStringFromObj(objv[3], &length2);
-	    if (length1 > 0) {
-		end = string2 + length2 - length1 + 1;
-		for (p = string2;  p < end;  p++) {
-		    /*
-		     * Scan forward to find the first character.
-		     */
-
-		    p = memchr(p, *string1, (unsigned) (end - p));
-		    if (p == NULL) {
-			break;
-		    }
-		    if (memcmp(string1, p, (unsigned) length1) == 0) {
-			match = p - string2;
-			break;
-		    }
-		}
-	    }
-
-	    /*
-	     * Compute the character index of the matching string by counting
-	     * the number of characters before the match.
-	     */
-
-	    if (match != -1) {
-		match = Tcl_NumUtfChars(string2, match);
-	    }
-	    Tcl_SetIntObj(resultPtr, match);
-	    break;
-	}
-	case STR_INDEX: {
-	    int index;
-	    Tcl_UniChar ch;
-	    char buf[TCL_UTF_MAX];
-	    char *start, *end;
-
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string charIndex");
-		return TCL_ERROR;
-	    }
-
-	    if (Tcl_GetIntFromObj(interp, objv[3], &index) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (index >= 0) {
-		start = Tcl_GetStringFromObj(objv[2], &length1);
-		end = start + length1;
-		for ( ; start < end; index--) {
-		    start += Tcl_UtfToUniChar(start, &ch);
-		    if (index == 0) {
-			Tcl_SetStringObj(resultPtr, buf,
-				Tcl_UniCharToUtf(ch, buf));
-			break;
-		    }
-		}
-	    }
-	    break;
-	}
-	case STR_LAST: {
-	    register char *p;
-	    int match;
-
-	    if (objc != 4) {
-	        goto badFirstLastArgs;
-	    }
-
-	    /*
-	     * This algorithm fails on improperly formed UTF strings.
-	     */
-
-	    match = -1;
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    string2 = Tcl_GetStringFromObj(objv[3], &length2);
-	    if (length1 > 0) {
-		for (p = string2 + length2 - length1;  p >= string2;  p--) {
-		    /*
-		     * Scan backwards to find the first character.
-		     */
-		    
-		    while ((p != string2) && (*p != *string1)) {
-			p--;
-		    }
-		    if (memcmp(string1, p, (unsigned) length1) == 0) {
-			match = p - string2;
-			break;
-		    }
-		}
-	    }
-
-	    /*
-	     * Compute the character index of the matching string by counting
-	     * the number of characters before the match.
-	     */
-
-	    if (match != -1) {
-		match = Tcl_NumUtfChars(string2, match);
-	    }
-	    Tcl_SetIntObj(resultPtr, match);
-	    break;
-	}
-	case STR_LENGTH: {
-	    if (objc != 3) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    Tcl_SetIntObj(resultPtr, Tcl_NumUtfChars(string1, length1));
-	    break;
-	}
-	case STR_MATCH: {
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "pattern string");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    string2 = Tcl_GetStringFromObj(objv[3], &length2);
-	    Tcl_SetBooleanObj(resultPtr, Tcl_StringMatch(string2, string1));
-	    break;
-	}
-	case STR_RANGE: {
-	    int first, last;
-
-	    if (objc != 5) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string first last");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    length1 = Tcl_NumUtfChars(string1, length1);
-	    if (TclGetIntForIndex(interp, objv[3], length1 - 1,
-		    &first) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (TclGetIntForIndex(interp, objv[4], length1 - 1,
-		    &last) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (first < 0) {
-		first = 0;
-	    }
-	    if (last >= length1 - 1) {
-		last = length1 - 1;
-	    }
-	    if (last >= first) {
-		char *start, *end;
-
-		start = Tcl_UtfAtIndex(string1, first);
-		end = Tcl_UtfAtIndex(start, last - first + 1);
-	        Tcl_SetStringObj(resultPtr, start, end - start);
-	    }
-	    break;
-	}
-	case STR_TOLOWER:
-	case STR_TOUPPER:
-	case STR_TOTITLE:
-	    if (objc != 3) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-
-	    /*
-	     * Since the result object is not a shared object, it is
-	     * safe to copy the string into the result and do the
-	     * conversion in place.  The conversion may change the length
-	     * of the string, so reset the length after conversion.
-	     */
-
-	    Tcl_SetStringObj(resultPtr, string1, length1);
-	    if ((enum options) index == STR_TOLOWER) {
-		length1 = Tcl_UtfToLower(Tcl_GetStringFromObj(resultPtr, NULL));
-	    } else if ((enum options) index == STR_TOUPPER) {
-		length1 = Tcl_UtfToUpper(Tcl_GetStringFromObj(resultPtr, NULL));
-	    } else {
-		length1 = Tcl_UtfToTitle(Tcl_GetStringFromObj(resultPtr, NULL));
-	    }
-	    Tcl_SetObjLength(resultPtr, length1);
-	    break;
-
-	case STR_TRIM: {
-	    Tcl_UniChar ch, trim;
-	    register char *p, *end;
-	    char *check, *checkEnd;
-	    int offset;
-
-	    left = 1;
-	    right = 1;
-
-	    dotrim:
-	    if (objc == 4) {
-		string2 = Tcl_GetStringFromObj(objv[3], &length2);
-	    } else if (objc == 3) {
-		string2 = " \t\n\r";
-		length2 = strlen(string2);
-	    } else {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string ?chars?");
-		return TCL_ERROR;
-	    }
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    checkEnd = string2 + length2;
-
-	    if (left) {
-		end = string1 + length1;
-		/*
-		 * The outer loop iterates over the string.  The inner
-		 * loop iterates over the trim characters.  The loops
-		 * terminate as soon as a non-trim character is discovered
-		 * and string1 is left pointing at the first non-trim
-		 * character.
-		 */
-
-		for (p = string1; p < end; p += offset) {
-		    offset = Tcl_UtfToUniChar(p, &ch);
-		    
-		    for (check = string2; ; ) {
-			if (check >= checkEnd) {
-			    p = end;
-			    break;
-			}
-			check += Tcl_UtfToUniChar(check, &trim);
-			if (ch == trim) {
-			    length1 -= offset;
-			    string1 += offset;
-			    break;
-			}
-		    }
-		}
-	    }
-	    if (right) {
-	        end = string1;
-
-		/*
-		 * The outer loop iterates over the string.  The inner
-		 * loop iterates over the trim characters.  The loops
-		 * terminate as soon as a non-trim character is discovered
-		 * and length1 marks the last non-trim character.
-		 */
-
-		for (p = string1 + length1; p > end; ) {
-		    p = Tcl_UtfPrev(p, string1);
-		    offset = Tcl_UtfToUniChar(p, &ch);
-		    for (check = string2; ; ) {
-		        if (check >= checkEnd) {
-			    p = end;
-			    break;
-			}
-			check += Tcl_UtfToUniChar(check, &trim);
-			if (ch == trim) {
-			    length1 -= offset;
-			    break;
-			}
-		    }
-		}
-	    }
-	    Tcl_SetStringObj(resultPtr, string1, length1);
-	    break;
-	}
-	case STR_TRIMLEFT: {
-	    left = 1;
-	    right = 0;
-	    goto dotrim;
-	}
-	case STR_TRIMRIGHT: {
-	    left = 0;
-	    right = 1;
-	    goto dotrim;
-	}
-	case STR_WORDEND: {
-	    int cur;
-	    Tcl_UniChar ch;
-	    char *p, *end;
-	    int numChars;
-	    
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string index");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    if (Tcl_GetIntFromObj(interp, objv[3], &index) != TCL_OK) {
-	        return TCL_ERROR;
-	    }
-	    if (index < 0) {
-		index = 0;
-	    }
-	    numChars = Tcl_NumUtfChars(string1, length1);
-	    if (index < numChars) {
-		p = Tcl_UtfAtIndex(string1, index);
-		end = string1+length1;
-		for (cur = index; p < end; cur++) {
-		    p += Tcl_UtfToUniChar(p, &ch);
-		    if (!Tcl_UniCharIsWordChar(ch)) {
-			break;
-		    }
-		}
-		if (cur == index) {
-		    cur++;
-		}
-	    } else {
-		cur = numChars;
-	    }
-	    Tcl_SetIntObj(resultPtr, cur);
-	    break;
-	}
-	case STR_WORDSTART: {
-	    int cur;
-	    Tcl_UniChar ch;
-	    char *p;
-	    int numChars;
-	    
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "string index");
-		return TCL_ERROR;
-	    }
-
-	    string1 = Tcl_GetStringFromObj(objv[2], &length1);
-	    if (Tcl_GetIntFromObj(interp, objv[3], &index) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    numChars = Tcl_NumUtfChars(string1, length1);
-	    if (index >= numChars) {
-		index = numChars - 1;
-	    }
-	    cur = 0;
-	    if (index > 0) {
-		p = Tcl_UtfAtIndex(string1, index);
-	        for (cur = index; cur >= 0; cur--) {
-		    Tcl_UtfToUniChar(p, &ch);
-		    if (!Tcl_UniCharIsWordChar(ch)) {
-			break;
-		    }
-		    p = Tcl_UtfPrev(p, string1);
-		}
-		if (cur != index) {
-		    cur += 1;
-		}
-	    }
-	    Tcl_SetIntObj(resultPtr, cur);
-	    break;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SubstObjCmd --
- *
- *	This procedure is invoked to process the "subst" Tcl command.
- *	See the user documentation for details on what it does.  This
- *	command is an almost direct copy of an implementation by
- *	Andrew Payne.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SubstObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];       	/* Argument objects. */
-{
-    static char *substOptions[] = {
-	"-nobackslashes", "-nocommands", "-novariables", (char *) NULL
-    };
-    enum substOptions {
-	SUBST_NOBACKSLASHES,      SUBST_NOCOMMANDS,       SUBST_NOVARS
-    };
-    Interp *iPtr = (Interp *) interp;
-    Tcl_DString result;
-    char *p, *old, *value;
-    int optionIndex, code, count, doVars, doCmds, doBackslashes, i;
-
-    /*
-     * Parse command-line options.
-     */
-
-    doVars = doCmds = doBackslashes = 1;
-    for (i = 1; i < (objc-1); i++) {
-	p = Tcl_GetString(objv[i]);
-	if (*p != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], substOptions,
-		"switch", 0, &optionIndex) != TCL_OK) {
-
-	    return TCL_ERROR;
-	}
-	switch (optionIndex) {
-	    case SUBST_NOBACKSLASHES: {
-		doBackslashes = 0;
-		break;
-	    }
-	    case SUBST_NOCOMMANDS: {
-		doCmds = 0;
-		break;
-	    }
-	    case SUBST_NOVARS: {
-		doVars = 0;
-		break;
-	    }
-	    default: {
-		panic("Tcl_SubstObjCmd: bad option index to SubstOptions");
-	    }
-	}
-    }
-    if (i != (objc-1)) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?-nobackslashes? ?-nocommands? ?-novariables? string");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the string one character at a time, performing
-     * command, variable, and backslash substitutions.
-     */
-
-    Tcl_DStringInit(&result);
-    old = p = Tcl_GetString(objv[i]);
-    while (*p != 0) {
-	switch (*p) {
-	    case '\\':
-		if (doBackslashes) {
-		    char buf[TCL_UTF_MAX];
-
-		    if (p != old) {
-			Tcl_DStringAppend(&result, old, p-old);
-		    }
-		    Tcl_DStringAppend(&result, buf,
-			    Tcl_UtfBackslash(p, &count, buf));
-		    p += count;
-		    old = p;
-		} else {
-		    p++;
-		}
-		break;
-
-	    case '$':
-		if (doVars) {
-		    if (p != old) {
-			Tcl_DStringAppend(&result, old, p-old);
-		    }
-		    value = Tcl_ParseVar(interp, p, &p);
-		    if (value == NULL) {
-			Tcl_DStringFree(&result);
-			return TCL_ERROR;
-		    }
-		    Tcl_DStringAppend(&result, value, -1);
-		    old = p;
-		} else {
-		    p++;
-		}
-		break;
-
-	    case '[':
-		if (doCmds) {
-		    if (p != old) {
-			Tcl_DStringAppend(&result, old, p-old);
-		    }
-		    iPtr->evalFlags = TCL_BRACKET_TERM;
-		    code = Tcl_Eval(interp, p+1);
-		    if (code == TCL_ERROR) {
-			Tcl_DStringFree(&result);
-			return code;
-		    }
-		    old = p = (p+1 + iPtr->termOffset+1);
-		    Tcl_DStringAppend(&result, iPtr->result, -1);
-		    Tcl_ResetResult(interp);
-		} else {
-		    p++;
-		}
-		break;
-
-	    default:
-		p++;
-		break;
-	}
-    }
-    if (p != old) {
-	Tcl_DStringAppend(&result, old, p-old);
-    }
-    Tcl_DStringResult(interp, &result);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SwitchObjCmd --
- *
- *	This object-based procedure is invoked to process the "switch" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SwitchObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int i, j, index, mode, matched, result;
-    char *string, *pattern;
-    static char *options[] = {
-	"-exact",	"-glob",	"-regexp",	"--", 
-	NULL
-    };
-    enum options {
-	OPT_EXACT,	OPT_GLOB,	OPT_REGEXP,	OPT_LAST
-    };
-
-    mode = OPT_EXACT;
-    for (i = 1; i < objc; i++) {
-	string = Tcl_GetString(objv[i]);
-	if (string[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0, 
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (index == OPT_LAST) {
-	    i++;
-	    break;
-	}
-	mode = index;
-    }
-
-    if (objc - i < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? string pattern body ... ?default body?");
-	return TCL_ERROR;
-    }
-
-    string = Tcl_GetString(objv[i]);
-    objc -= i + 1;
-    objv += i + 1;
-
-    /*
-     * If all of the pattern/command pairs are lumped into a single
-     * argument, split them out again.
-     */
-
-    if (objc == 1) {
-	Tcl_Obj **listv;
-
-	if (Tcl_ListObjGetElements(interp, objv[0], &objc, &listv) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	objv = listv;
-    }
-
-    for (i = 0; i < objc; i += 2) {
-	if (i == objc - 1) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "extra switch pattern with no body", -1);
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * See if the pattern matches the string.
-	 */
-
-	pattern = Tcl_GetString(objv[i]);
-	matched = 0;
-	if ((i == objc - 2) 
-		&& (*pattern == 'd') 
-		&& (strcmp(pattern, "default") == 0)) {
-	    matched = 1;
-	} else {
-	    switch (mode) {
-		case OPT_EXACT:
-		    matched = (strcmp(string, pattern) == 0);
-		    break;
-		case OPT_GLOB:
-		    matched = Tcl_StringMatch(string, pattern);
-		    break;
-		case OPT_REGEXP:
-		    matched = TclRegExpMatchObj(interp, string, objv[i]);
-		    if (matched < 0) {
-			return TCL_ERROR;
-		    }
-		    break;
-	    }
-	}
-	if (matched == 0) {
-	    continue;
-	}
-
-	/*
-	 * We've got a match. Find a body to execute, skipping bodies
-	 * that are "-".
-	 */
-
-	for (j = i + 1; ; j += 2) {
-	    if (j >= objc) {
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"no body specified for pattern \"", pattern,
-			"\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    if (strcmp(Tcl_GetString(objv[j]), "-") != 0) {
-		break;
-	    }
-	}
-	result = Tcl_EvalObjEx(interp, objv[j], 0);
-	if (result == TCL_ERROR) {
-	    char msg[100 + TCL_INTEGER_SPACE];
-
-	    sprintf(msg, "\n    (\"%.50s\" arm line %d)", pattern,
-		    interp->errorLine);
-	    Tcl_AddObjErrorInfo(interp, msg, -1);
-	}
-	return result;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_TimeObjCmd --
- *
- *	This object-based procedure is invoked to process the "time" Tcl
- *	command.  See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_TimeObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Tcl_Obj *objPtr;
-    register int i, result;
-    int count;
-    double totalMicroSec;
-    Tcl_Time start, stop;
-    char buf[100];
-
-    if (objc == 2) {
-	count = 1;
-    } else if (objc == 3) {
-	result = Tcl_GetIntFromObj(interp, objv[2], &count);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    } else {
-	Tcl_WrongNumArgs(interp, 1, objv, "command ?count?");
-	return TCL_ERROR;
-    }
-    
-    objPtr = objv[1];
-    i = count;
-    TclpGetTime(&start);
-    while (i-- > 0) {
-	result = Tcl_EvalObjEx(interp, objPtr, 0);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    TclpGetTime(&stop);
-    
-    totalMicroSec =
-	(stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    sprintf(buf, "%.0f microseconds per iteration",
-	((count <= 0) ? 0 : totalMicroSec/count));
-    Tcl_ResetResult(interp);
-    Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_TraceObjCmd --
- *
- *	This procedure is invoked to process the "trace" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_TraceObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int optionIndex, commandLength;
-    char *name, *rwuOps, *command, *p;
-    size_t length;
-    static char *traceOptions[] = {
-	"variable", "vdelete", "vinfo", (char *) NULL
-    };
-    enum traceOptions {
-	TRACE_VARIABLE,       TRACE_VDELETE,      TRACE_VINFO
-    };
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option [arg arg ...]");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], traceOptions,
-		"option", 0, &optionIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    switch ((enum traceOptions) optionIndex) {
-	    case TRACE_VARIABLE: {
-		int flags;
-		TraceVarInfo *tvarPtr;
-		if (objc != 5) {
-		    Tcl_WrongNumArgs(interp, 2, objv, "name ops command");
-		    return TCL_ERROR;
-		}
-
-		flags = 0;
-		rwuOps = Tcl_GetString(objv[3]);
-		for (p = rwuOps; *p != 0; p++) {
-		    if (*p == 'r') {
-			flags |= TCL_TRACE_READS;
-		    } else if (*p == 'w') {
-			flags |= TCL_TRACE_WRITES;
-		    } else if (*p == 'u') {
-			flags |= TCL_TRACE_UNSETS;
-		    } else {
-			goto badOps;
-		    }
-		}
-		if (flags == 0) {
-		    goto badOps;
-		}
-
-		command = Tcl_GetStringFromObj(objv[4], &commandLength);
-		length = (size_t) commandLength;
-		tvarPtr = (TraceVarInfo *) ckalloc((unsigned)
-			(sizeof(TraceVarInfo) - sizeof(tvarPtr->command)
-				+ length + 1));
-		tvarPtr->flags = flags;
-		tvarPtr->errMsg = NULL;
-		tvarPtr->length = length;
-		flags |= TCL_TRACE_UNSETS;
-		strcpy(tvarPtr->command, command);
-		name = Tcl_GetString(objv[2]);
-		if (Tcl_TraceVar(interp, name, flags, TraceVarProc,
-			(ClientData) tvarPtr) != TCL_OK) {
-		    ckfree((char *) tvarPtr);
-		    return TCL_ERROR;
-		}
-		break;
-	    }
-	    case TRACE_VDELETE: {
-		int flags;
-		TraceVarInfo *tvarPtr;
-		ClientData clientData;
-
-		if (objc != 5) {
-		    Tcl_WrongNumArgs(interp, 2, objv, "name ops command");
-		    return TCL_ERROR;
-		}
-
-		flags = 0;
-		rwuOps = Tcl_GetString(objv[3]);
-		for (p = rwuOps; *p != 0; p++) {
-		    if (*p == 'r') {
-			flags |= TCL_TRACE_READS;
-		    } else if (*p == 'w') {
-			flags |= TCL_TRACE_WRITES;
-		    } else if (*p == 'u') {
-			flags |= TCL_TRACE_UNSETS;
-		    } else {
-			goto badOps;
-		    }
-		}
-		if (flags == 0) {
-		    goto badOps;
-		}
-
-		/*
-		 * Search through all of our traces on this variable to
-		 * see if there's one with the given command.  If so, then
-		 * delete the first one that matches.
-		 */
-		
-		command = Tcl_GetStringFromObj(objv[4], &commandLength);
-		length = (size_t) commandLength;
-		clientData = 0;
-		name = Tcl_GetString(objv[2]);
-		while ((clientData = Tcl_VarTraceInfo(interp, name, 0,
-			TraceVarProc, clientData)) != 0) {
-		    tvarPtr = (TraceVarInfo *) clientData;
-		    if ((tvarPtr->length == length) && (tvarPtr->flags == flags)
-			    && (strncmp(command, tvarPtr->command,
-				    (size_t) length) == 0)) {
-			Tcl_UntraceVar(interp, name, flags | TCL_TRACE_UNSETS,
-				TraceVarProc, clientData);
-			if (tvarPtr->errMsg != NULL) {
-			    ckfree(tvarPtr->errMsg);
-			}
-			ckfree((char *) tvarPtr);
-			break;
-		    }
-		}
-		break;
-	    }
-	    case TRACE_VINFO: {
-		ClientData clientData;
-		char ops[4];
-		Tcl_Obj *resultListPtr, *pairObjPtr, *elemObjPtr;
-
-		if (objc != 3) {
-		    Tcl_WrongNumArgs(interp, 2, objv, "name");
-		    return TCL_ERROR;
-		}
-		resultListPtr = Tcl_GetObjResult(interp);
-		clientData = 0;
-		name = Tcl_GetString(objv[2]);
-		while ((clientData = Tcl_VarTraceInfo(interp, name, 0,
-			TraceVarProc, clientData)) != 0) {
-
-		    TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData;
-
-		    pairObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-		    p = ops;
-		    if (tvarPtr->flags & TCL_TRACE_READS) {
-			*p = 'r';
-			p++;
-		    }
-		    if (tvarPtr->flags & TCL_TRACE_WRITES) {
-			*p = 'w';
-			p++;
-		    }
-		    if (tvarPtr->flags & TCL_TRACE_UNSETS) {
-			*p = 'u';
-			p++;
-		    }
-		    *p = '\0';
-
-		    /*
-		     * Build a pair (2-item list) with the ops string as
-		     * the first obj element and the tvarPtr->command string
-		     * as the second obj element.  Append the pair (as an
-		     * element) to the end of the result object list.
-		     */
-
-		    elemObjPtr = Tcl_NewStringObj(ops, -1);
-		    Tcl_ListObjAppendElement(NULL, pairObjPtr, elemObjPtr);
-		    elemObjPtr = Tcl_NewStringObj(tvarPtr->command, -1);
-		    Tcl_ListObjAppendElement(NULL, pairObjPtr, elemObjPtr);
-		    Tcl_ListObjAppendElement(interp, resultListPtr, pairObjPtr);
-		}
-		Tcl_SetObjResult(interp, resultListPtr);
-		break;
-	    }
-	default: {
-		panic("Tcl_TraceObjCmd: bad option index to TraceOptions");
-	    }
-    }
-    return TCL_OK;
-
-    badOps:
-    Tcl_AppendResult(interp, "bad operations \"", rwuOps,
-	    "\": should be one or more of rwu", (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TraceVarProc --
- *
- *	This procedure is called to handle variable accesses that have
- *	been traced using the "trace" command.
- *
- * Results:
- *	Normally returns NULL.  If the trace command returns an error,
- *	then this procedure returns an error string.
- *
- * Side effects:
- *	Depends on the command associated with the trace.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static char *
-TraceVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Information about the variable trace. */
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable or array. */
-    char *name2;		/* Name of element within array;  NULL means
-				 * scalar variable is being referenced. */
-    int flags;			/* OR-ed bits giving operation and other
-				 * information. */
-{
-    Tcl_SavedResult state;
-    TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData;
-    char *result;
-    int code;
-    Tcl_DString cmd;
-
-    result = NULL;
-    if (tvarPtr->errMsg != NULL) {
-	ckfree(tvarPtr->errMsg);
-	tvarPtr->errMsg = NULL;
-    }
-    if ((tvarPtr->flags & flags) && !(flags & TCL_INTERP_DESTROYED)) {
-
-	/*
-	 * Generate a command to execute by appending list elements
-	 * for the two variable names and the operation.  The five
-	 * extra characters are for three space, the opcode character,
-	 * and the terminating null.
-	 */
-
-	if (name2 == NULL) {
-	    name2 = "";
-	}
-	Tcl_DStringInit(&cmd);
-	Tcl_DStringAppend(&cmd, tvarPtr->command, (int) tvarPtr->length);
-	Tcl_DStringAppendElement(&cmd, name1);
-	Tcl_DStringAppendElement(&cmd, name2);
-	if (flags & TCL_TRACE_READS) {
-	    Tcl_DStringAppend(&cmd, " r", 2);
-	} else if (flags & TCL_TRACE_WRITES) {
-	    Tcl_DStringAppend(&cmd, " w", 2);
-	} else if (flags & TCL_TRACE_UNSETS) {
-	    Tcl_DStringAppend(&cmd, " u", 2);
-	}
-
-	/*
-	 * Execute the command.  Save the interp's result used for
-	 * the command. We discard any object result the command returns.
-	 */
-
-	Tcl_SaveResult(interp, &state);
-
-	code = Tcl_Eval(interp, Tcl_DStringValue(&cmd));
-	if (code != TCL_OK) {	     /* copy error msg to result */
-	    char *string;
-	    int length;
-	    
-	    string = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &length);
-	    tvarPtr->errMsg = (char *) ckalloc((unsigned) (length + 1));
-	    memcpy(tvarPtr->errMsg, string, (size_t) (length + 1));
-	    result = tvarPtr->errMsg;
-	}
-
-	Tcl_RestoreResult(interp, &state);
-
-	Tcl_DStringFree(&cmd);
-    }
-    if (flags & TCL_TRACE_DESTROYED) {
-	result = NULL;
-	if (tvarPtr->errMsg != NULL) {
-	    ckfree(tvarPtr->errMsg);
-	}
-	ckfree((char *) tvarPtr);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WhileObjCmd --
- *
- *      This procedure is invoked to process the "while" Tcl command.
- *      See the user documentation for details on what it does.
- *
- *	With the bytecode compiler, this procedure is only called when
- *	a command name is computed at runtime, and is "while" or the name
- *	to which "while" was renamed: e.g., "set z while; $z {$i<100} {}"
- *
- * Results:
- *      A standard Tcl result.
- *
- * Side effects:
- *      See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-        /* ARGSUSED */
-int
-Tcl_WhileObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;                   /* Not used. */
-    Tcl_Interp *interp;                 /* Current interpreter. */
-    int objc;                           /* Number of arguments. */
-    Tcl_Obj *CONST objv[];       	/* Argument objects. */
-{
-    int result, value;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "test command");
-        return TCL_ERROR;
-    }
-
-    while (1) {
-        result = Tcl_ExprBooleanObj(interp, objv[1], &value);
-        if (result != TCL_OK) {
-            return result;
-        }
-        if (!value) {
-            break;
-        }
-        result = Tcl_EvalObjEx(interp, objv[2], 0);
-        if ((result != TCL_OK) && (result != TCL_CONTINUE)) {
-            if (result == TCL_ERROR) {
-                char msg[32 + TCL_INTEGER_SPACE];
-
-                sprintf(msg, "\n    (\"while\" body line %d)",
-                        interp->errorLine);
-                Tcl_AddErrorInfo(interp, msg);
-            }
-            break;
-        }
-    }
-    if (result == TCL_BREAK) {
-        result = TCL_OK;
-    }
-    if (result == TCL_OK) {
-        Tcl_ResetResult(interp);
-    }
-    return result;
-}
-
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
deleted file mode 100644
index 09c3dd0..0000000
--- a/generic/tclCompCmds.c
+++ /dev/null
@@ -1,1980 +0,0 @@
-/* 
- * tclCompCmds.c --
- *
- *	This file contains compilation procedures that compile various
- *	Tcl commands into a sequence of instructions ("bytecodes"). 
- *
- * Copyright (c) 1997-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCompCmds.c,v 1.2 1999/04/16 00:46:43 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static ClientData	DupForeachInfo _ANSI_ARGS_((ClientData clientData));
-static void		FreeForeachInfo _ANSI_ARGS_((
-			    ClientData clientData));
-
-/*
- * The structures below define the AuxData types defined in this file.
- */
-
-AuxDataType tclForeachInfoType = {
-    "ForeachInfo",				/* name */
-    DupForeachInfo,				/* dupProc */
-    FreeForeachInfo				/* freeProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileBreakCmd --
- *
- *	Procedure called to compile the "break" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK unless
- *	there was an error during compilation. If an error occurs then
- *	the interpreter's result contains a standard error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "break" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileBreakCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    if (parsePtr->numWords != 1) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"break\"", -1);
-	envPtr->maxStackDepth = 0;
-	return TCL_ERROR;
-    }
-
-    /*
-     * Emit a break instruction.
-     */
-
-    TclEmitOpcode(INST_BREAK, envPtr);
-    envPtr->maxStackDepth = 0;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileCatchCmd --
- *
- *	Procedure called to compile the "catch" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK if
- *	compilation was successful. If an error occurs then the
- *	interpreter's result contains a standard error message and TCL_ERROR
- *	is returned. If the command is too complex for TclCompileCatchCmd,
- *	TCL_OUT_LINE_COMPILE is returned indicating that the catch command
- *	should be compiled "out of line" by emitting code to invoke its
- *	command procedure at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "catch" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileCatchCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    JumpFixup jumpFixup;
-    Tcl_Token *cmdTokenPtr, *nameTokenPtr;
-    char *name;
-    int localIndex, nameChars, range, maxDepth, startOffset, jumpDist;
-    int code;
-    char buffer[32 + TCL_INTEGER_SPACE];
-
-    envPtr->maxStackDepth = 0;
-    if ((parsePtr->numWords != 2) && (parsePtr->numWords != 3)) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"catch command ?varName?\"", -1);
-	return TCL_ERROR;
-    }
-
-    /*
-     * If a variable was specified and the catch command is at global level
-     * (not in a procedure), don't compile it inline: the payoff is
-     * too small.
-     */
-
-    if ((parsePtr->numWords == 3) && (envPtr->procPtr == NULL)) {
-	return TCL_OUT_LINE_COMPILE;
-    }
-
-    /*
-     * Make sure the variable name, if any, has no substitutions and just
-     * refers to a local scaler.
-     */
-
-    localIndex = -1;
-    cmdTokenPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    if (parsePtr->numWords == 3) {
-	nameTokenPtr = cmdTokenPtr + (cmdTokenPtr->numComponents + 1);
-	if (nameTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	    name = nameTokenPtr[1].start;
-	    nameChars = nameTokenPtr[1].size;
-	    if (!TclIsLocalScalar(name, nameChars)) {
-		return TCL_OUT_LINE_COMPILE;
-	    }
-	    localIndex = TclFindCompiledLocal(nameTokenPtr[1].start,
-		    nameTokenPtr[1].size, /*create*/ 1, 
-		    /*flags*/ VAR_SCALAR, envPtr->procPtr);
-	} else {
-	   return TCL_OUT_LINE_COMPILE;
-	}
-    }
-
-    /*
-     * We will compile the catch command. Emit a beginCatch instruction at
-     * the start of the catch body: the subcommand it controls.
-     */
-
-    maxDepth = 0;
-    
-    envPtr->exceptDepth++;
-    envPtr->maxExceptDepth =
-	TclMax(envPtr->exceptDepth, envPtr->maxExceptDepth);
-    range = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
-    TclEmitInstInt4(INST_BEGIN_CATCH4, range, envPtr);
-
-    startOffset = (envPtr->codeNext - envPtr->codeStart);
-    envPtr->exceptArrayPtr[range].codeOffset = startOffset;
-    code = TclCompileCmdWord(interp, cmdTokenPtr+1,
-	    cmdTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-	    sprintf(buffer, "\n    (\"catch\" body line %d)",
-		    interp->errorLine);
-            Tcl_AddObjErrorInfo(interp, buffer, -1);
-        }
-	goto done;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    envPtr->exceptArrayPtr[range].numCodeBytes =
-	    (envPtr->codeNext - envPtr->codeStart) - startOffset;
-		    
-    /*
-     * The "no errors" epilogue code: store the body's result into the
-     * variable (if any), push "0" (TCL_OK) as the catch's "no error"
-     * result, and jump around the "error case" code.
-     */
-
-    if (localIndex != -1) {
-	if (localIndex <= 255) {
-	    TclEmitInstInt1(INST_STORE_SCALAR1, localIndex, envPtr);
-	} else {
-	    TclEmitInstInt4(INST_STORE_SCALAR4, localIndex, envPtr);
-	}
-    }
-    TclEmitOpcode(INST_POP, envPtr);
-    TclEmitPush(TclRegisterLiteral(envPtr, "0", 1, /*onHeap*/ 0),
-	    envPtr);
-    if (maxDepth == 0) {
-	maxDepth = 1;
-    }
-    TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, &jumpFixup);
-
-    /*
-     * The "error case" code: store the body's result into the variable (if
-     * any), then push the error result code. The initial PC offset here is
-     * the catch's error target.
-     */
-
-    envPtr->exceptArrayPtr[range].catchOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    if (localIndex != -1) {
-	TclEmitOpcode(INST_PUSH_RESULT, envPtr);
-	if (localIndex <= 255) {
-	    TclEmitInstInt1(INST_STORE_SCALAR1, localIndex, envPtr);
-	} else {
-	    TclEmitInstInt4(INST_STORE_SCALAR4, localIndex, envPtr);
-	}
-	TclEmitOpcode(INST_POP, envPtr);
-    }
-    TclEmitOpcode(INST_PUSH_RETURN_CODE, envPtr);
-
-    /*
-     * Update the target of the jump after the "no errors" code, then emit
-     * an endCatch instruction at the end of the catch command.
-     */
-
-    jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	    - jumpFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &jumpFixup, jumpDist, 127)) {
-	panic("TclCompileCatchCmd: bad jump distance %d\n", jumpDist);
-    }
-    TclEmitOpcode(INST_END_CATCH, envPtr);
-
-    done:
-    envPtr->exceptDepth--;
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileContinueCmd --
- *
- *	Procedure called to compile the "continue" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK unless
- *	there was an error while parsing string. If an error occurs then
- *	the interpreter's result contains a standard error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "continue" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileContinueCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    /*
-     * There should be no argument after the "continue".
-     */
-
-    if (parsePtr->numWords != 1) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"continue\"", -1);
-	envPtr->maxStackDepth = 0;
-	return TCL_ERROR;
-    }
-
-    /*
-     * Emit a continue instruction.
-     */
-
-    TclEmitOpcode(INST_CONTINUE, envPtr);
-    envPtr->maxStackDepth = 0;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileExprCmd --
- *
- *	Procedure called to compile the "expr" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK
- *	unless there was an error while parsing string. If an error occurs
- *	then the interpreter's result contains a standard error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the "expr" command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "expr" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileExprCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Token *firstWordPtr;
-
-    envPtr->maxStackDepth = 0;
-    if (parsePtr->numWords == 1) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"expr arg ?arg ...?\"", -1);
-        return TCL_ERROR;
-    }
-
-    firstWordPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    return TclCompileExprWords(interp, firstWordPtr, (parsePtr->numWords-1),
-	    envPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileForCmd --
- *
- *	Procedure called to compile the "for" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK unless
- *	there was an error while parsing string. If an error occurs then
- *	the interpreter's result contains a standard error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "for" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileForCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Token *startTokenPtr, *testTokenPtr, *nextTokenPtr, *bodyTokenPtr;
-    JumpFixup jumpFalseFixup;
-    int maxDepth, jumpBackDist, jumpBackOffset, testCodeOffset, jumpDist;
-    int bodyRange, nextRange, code;
-    unsigned char *jumpPc;
-    char buffer[32 + TCL_INTEGER_SPACE];
-
-    envPtr->maxStackDepth = 0;
-    if (parsePtr->numWords != 5) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"for start test next command\"", -1);
-	return TCL_ERROR;
-    }
-
-    /*
-     * If the test expression requires substitutions, don't compile the for
-     * command inline. E.g., the expression might cause the loop to never
-     * execute or execute forever, as in "for {} "$x > 5" {incr x} {}".
-     */
-
-    startTokenPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    testTokenPtr = startTokenPtr + (startTokenPtr->numComponents + 1);
-    if (testTokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	return TCL_OUT_LINE_COMPILE;
-    }
-
-    /*
-     * Create ExceptionRange records for the body and the "next" command.
-     * The "next" command's ExceptionRange supports break but not continue
-     * (and has a -1 continueOffset).
-     */
-
-    envPtr->exceptDepth++;
-    envPtr->maxExceptDepth =
-	    TclMax(envPtr->exceptDepth, envPtr->maxExceptDepth);
-    bodyRange = TclCreateExceptRange(LOOP_EXCEPTION_RANGE, envPtr);
-    nextRange = TclCreateExceptRange(LOOP_EXCEPTION_RANGE, envPtr);
-
-    /*
-     * Inline compile the initial command.
-     */
-
-    maxDepth = 0;
-    code = TclCompileCmdWord(interp, startTokenPtr+1,
-	    startTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-            Tcl_AddObjErrorInfo(interp,
-	            "\n    (\"for\" initial command)", -1);
-        }
-	goto done;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    TclEmitOpcode(INST_POP, envPtr);
-    
-    /*
-     * Compile the test then emit the conditional jump that exits the for.
-     */
-
-    testCodeOffset = (envPtr->codeNext - envPtr->codeStart);
-    code = TclCompileExprWords(interp, testTokenPtr, 1, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-            Tcl_AddObjErrorInfo(interp,
-		    "\n    (\"for\" test expression)", -1);
-        }
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpFalseFixup);
-
-    /*
-     * Compile the loop body.
-     */
-
-    nextTokenPtr = testTokenPtr + (testTokenPtr->numComponents + 1);
-    bodyTokenPtr = nextTokenPtr + (nextTokenPtr->numComponents + 1);
-    envPtr->exceptArrayPtr[bodyRange].codeOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    code = TclCompileCmdWord(interp, bodyTokenPtr+1,
-	    bodyTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-	    sprintf(buffer, "\n    (\"for\" body line %d)",
-		    interp->errorLine);
-            Tcl_AddObjErrorInfo(interp, buffer, -1);
-        }
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    envPtr->exceptArrayPtr[bodyRange].numCodeBytes =
-	    (envPtr->codeNext - envPtr->codeStart)
-	    - envPtr->exceptArrayPtr[bodyRange].codeOffset;
-    TclEmitOpcode(INST_POP, envPtr);
-
-    /*
-     * Compile the "next" subcommand.
-     */
-
-    envPtr->exceptArrayPtr[bodyRange].continueOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    envPtr->exceptArrayPtr[nextRange].codeOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    code = TclCompileCmdWord(interp, nextTokenPtr+1,
-	    nextTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-	    Tcl_AddObjErrorInfo(interp,
-	            "\n    (\"for\" loop-end command)", -1);
-	}
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    envPtr->exceptArrayPtr[nextRange].numCodeBytes =
-	    (envPtr->codeNext - envPtr->codeStart)
-	    - envPtr->exceptArrayPtr[nextRange].codeOffset;
-    TclEmitOpcode(INST_POP, envPtr);
-	
-    /*
-     * Jump back to the test at the top of the loop. Generate a 4 byte jump
-     * if the distance to the test is > 120 bytes. This is conservative and
-     * ensures that we won't have to replace this jump if we later need to
-     * replace the ifFalse jump with a 4 byte jump.
-     */
-
-    jumpBackOffset = (envPtr->codeNext - envPtr->codeStart);
-    jumpBackDist = (jumpBackOffset - testCodeOffset);
-    if (jumpBackDist > 120) {
-	TclEmitInstInt4(INST_JUMP4, -jumpBackDist, envPtr);
-    } else {
-	TclEmitInstInt1(INST_JUMP1, -jumpBackDist, envPtr);
-    }
-
-    /*
-     * Fix the target of the jumpFalse after the test.
-     */
-
-    jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	    - jumpFalseFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &jumpFalseFixup, jumpDist, 127)) {
-	/*
-	 * Update the loop body and "next" command ExceptionRanges since
-	 * they moved down.
-	 */
-
-	envPtr->exceptArrayPtr[bodyRange].codeOffset += 3;
-	envPtr->exceptArrayPtr[bodyRange].continueOffset += 3;
-	envPtr->exceptArrayPtr[nextRange].codeOffset += 3;
-
-	/*
-	 * Update the jump back to the test at the top of the loop since it
-	 * also moved down 3 bytes.
-	 */
-
-	jumpBackOffset += 3;
-	jumpPc = (envPtr->codeStart + jumpBackOffset);
-	jumpBackDist += 3;
-	if (jumpBackDist > 120) {
-	    TclUpdateInstInt4AtPc(INST_JUMP4, -jumpBackDist, jumpPc);
-	} else {
-	    TclUpdateInstInt1AtPc(INST_JUMP1, -jumpBackDist, jumpPc);
-	}
-    }
-    
-    /*
-     * Set the loop's break target.
-     */
-
-    envPtr->exceptArrayPtr[bodyRange].breakOffset =
-            envPtr->exceptArrayPtr[nextRange].breakOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    
-    /*
-     * The for command's result is an empty string.
-     */
-
-    TclEmitPush(TclRegisterLiteral(envPtr, "", 0, /*onHeap*/ 0), envPtr);
-    if (maxDepth == 0) {
-	maxDepth = 1;
-    }
-    code = TCL_OK;
-
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    envPtr->exceptDepth--;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileForeachCmd --
- *
- *	Procedure called to compile the "foreach" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK if
- *	compilation was successful. If an error occurs then the
- *	interpreter's result contains a standard error message and TCL_ERROR
- *	is returned. If the command is too complex for TclCompileForeachCmd,
- *	TCL_OUT_LINE_COMPILE is returned indicating that the foreach command
- *	should be compiled "out of line" by emitting code to invoke its
- *	command procedure at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the "while" command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "foreach" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileForeachCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Proc *procPtr = envPtr->procPtr;
-    ForeachInfo *infoPtr;	/* Points to the structure describing this
-				 * foreach command. Stored in a AuxData
-				 * record in the ByteCode. */
-    int firstValueTemp;		/* Index of the first temp var in the frame
-				 * used to point to a value list. */
-    int loopCtTemp;		/* Index of temp var holding the loop's
-				 * iteration count. */
-    Tcl_Token *tokenPtr, *bodyTokenPtr;
-    char *varList;
-    unsigned char *jumpPc;
-    JumpFixup jumpFalseFixup;
-    int jumpDist, jumpBackDist, jumpBackOffset, maxDepth, infoIndex, range;
-    int numWords, numLists, numVars, loopIndex, tempVar, i, j, code;
-    char savedChar;
-    char buffer[32 + TCL_INTEGER_SPACE];
-
-    /*
-     * We parse the variable list argument words and create two arrays:
-     *    varcList[i] is number of variables in i-th var list
-     *    varvList[i] points to array of var names in i-th var list
-     */
-
-#define STATIC_VAR_LIST_SIZE 5
-    int varcListStaticSpace[STATIC_VAR_LIST_SIZE];
-    char **varvListStaticSpace[STATIC_VAR_LIST_SIZE];
-    int *varcList = varcListStaticSpace;
-    char ***varvList = varvListStaticSpace;
-
-    /*
-     * If the foreach command isn't in a procedure, don't compile it inline:
-     * the payoff is too small.
-     */
-
-    envPtr->maxStackDepth = 0;
-    if (procPtr == NULL) {
-	return TCL_OUT_LINE_COMPILE;
-    }
-
-    maxDepth = 0;
-    
-    numWords = parsePtr->numWords;
-    if ((numWords < 4) || (numWords%2 != 0)) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"foreach varList list ?varList list ...? command\"", -1);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Allocate storage for the varcList and varvList arrays if necessary.
-     */
-
-    numLists = (numWords - 2)/2;
-    if (numLists > STATIC_VAR_LIST_SIZE) {
-        varcList = (int *) ckalloc(numLists * sizeof(int));
-        varvList = (char ***) ckalloc(numLists * sizeof(char **));
-    }
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-        varcList[loopIndex] = 0;
-        varvList[loopIndex] = (char **) NULL;
-    }
-    
-    /*
-     * Set the exception stack depth.
-     */ 
-
-    envPtr->exceptDepth++;
-    envPtr->maxExceptDepth =
-	TclMax(envPtr->exceptDepth, envPtr->maxExceptDepth);
-
-    /*
-     * Break up each var list and set the varcList and varvList arrays.
-     * Don't compile the foreach inline if any var name needs substitutions
-     * or isn't a scalar, or if any var list needs substitutions.
-     */
-
-    loopIndex = 0;
-    for (i = 0, tokenPtr = parsePtr->tokenPtr;
-	    i < numWords-1;
-	    i++, tokenPtr += (tokenPtr->numComponents + 1)) {
-	if (i%2 == 1) {
-	    if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-		code = TCL_OUT_LINE_COMPILE;
-		goto done;
-	    }
-	    varList = tokenPtr[1].start;
-	    savedChar = varList[tokenPtr[1].size];
-
-	    /*
-	     * Note there is a danger that modifying the string could have
-	     * undesirable side effects.  In this case, Tcl_SplitList does
-	     * not have any dependencies on shared strings so we should be
-	     * safe.
-	     */
-
-	    varList[tokenPtr[1].size] = '\0';
-	    code = Tcl_SplitList(interp, varList,
-		    &varcList[loopIndex], &varvList[loopIndex]);
-	    varList[tokenPtr[1].size] = savedChar;
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-
-	    numVars = varcList[loopIndex];
-	    for (j = 0;  j < numVars;  j++) {
-		char *varName = varvList[loopIndex][j];
-		if (!TclIsLocalScalar(varName, (int) strlen(varName))) {
-		    code = TCL_OUT_LINE_COMPILE;
-		    goto done;
-		}
-	    }
-	    loopIndex++;
-	}
-    }
-
-    /*
-     * We will compile the foreach command.
-     * Reserve (numLists + 1) temporary variables:
-     *    - numLists temps to hold each value list
-     *    - 1 temp for the loop counter (index of next element in each list)
-     * At this time we don't try to reuse temporaries; if there are two
-     * nonoverlapping foreach loops, they don't share any temps.
-     */
-
-    firstValueTemp = -1;
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-	tempVar = TclFindCompiledLocal(NULL, /*nameChars*/ 0,
-		/*create*/ 1, /*flags*/ VAR_SCALAR, procPtr);
-	if (loopIndex == 0) {
-	    firstValueTemp = tempVar;
-	}
-    }
-    loopCtTemp = TclFindCompiledLocal(NULL, /*nameChars*/ 0,
-	    /*create*/ 1, /*flags*/ VAR_SCALAR, procPtr);
-    
-    /*
-     * Create and initialize the ForeachInfo and ForeachVarList data
-     * structures describing this command. Then create a AuxData record
-     * pointing to the ForeachInfo structure.
-     */
-
-    infoPtr = (ForeachInfo *) ckalloc((unsigned)
-	    (sizeof(ForeachInfo) + (numLists * sizeof(ForeachVarList *))));
-    infoPtr->numLists = numLists;
-    infoPtr->firstValueTemp = firstValueTemp;
-    infoPtr->loopCtTemp = loopCtTemp;
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-	ForeachVarList *varListPtr;
-	numVars = varcList[loopIndex];
-	varListPtr = (ForeachVarList *) ckalloc((unsigned)
-	        sizeof(ForeachVarList) + (numVars * sizeof(int)));
-	varListPtr->numVars = numVars;
-	for (j = 0;  j < numVars;  j++) {
-	    char *varName = varvList[loopIndex][j];
-	    int nameChars = strlen(varName);
-	    varListPtr->varIndexes[j] = TclFindCompiledLocal(varName,
-		    nameChars, /*create*/ 1, /*flags*/ VAR_SCALAR, procPtr);
-	}
-	infoPtr->varLists[loopIndex] = varListPtr;
-    }
-    infoIndex = TclCreateAuxData((ClientData) infoPtr, &tclForeachInfoType, envPtr);
-
-    /*
-     * Evaluate then store each value list in the associated temporary.
-     */
-
-    range = TclCreateExceptRange(LOOP_EXCEPTION_RANGE, envPtr);
-    
-    loopIndex = 0;
-    for (i = 0, tokenPtr = parsePtr->tokenPtr;
-	    i < numWords-1;
-	    i++, tokenPtr += (tokenPtr->numComponents + 1)) {
-	if ((i%2 == 0) && (i > 0)) {
-	    code = TclCompileTokens(interp, tokenPtr+1,
-		    tokenPtr->numComponents, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-
-	    tempVar = (firstValueTemp + loopIndex);
-	    if (tempVar <= 255) {
-		TclEmitInstInt1(INST_STORE_SCALAR1, tempVar, envPtr);
-	    } else {
-		TclEmitInstInt4(INST_STORE_SCALAR4, tempVar, envPtr);
-	    }
-	    TclEmitOpcode(INST_POP, envPtr);
-	    loopIndex++;
-	}
-    }
-    bodyTokenPtr = tokenPtr;
-
-    /*
-     * Initialize the temporary var that holds the count of loop iterations.
-     */
-
-    TclEmitInstInt4(INST_FOREACH_START4, infoIndex, envPtr);
-    
-    /*
-     * Top of loop code: assign each loop variable and check whether
-     * to terminate the loop.
-     */
-
-    envPtr->exceptArrayPtr[range].continueOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    TclEmitInstInt4(INST_FOREACH_STEP4, infoIndex, envPtr);
-    TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpFalseFixup);
-    
-    /*
-     * Inline compile the loop body.
-     */
-
-    envPtr->exceptArrayPtr[range].codeOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    code = TclCompileCmdWord(interp, bodyTokenPtr+1,
-	    bodyTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-	    sprintf(buffer, "\n    (\"foreach\" body line %d)",
-		    interp->errorLine);
-            Tcl_AddObjErrorInfo(interp, buffer, -1);
-        }
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    envPtr->exceptArrayPtr[range].numCodeBytes =
-	    (envPtr->codeNext - envPtr->codeStart)
-	    - envPtr->exceptArrayPtr[range].codeOffset;
-    TclEmitOpcode(INST_POP, envPtr);
-	
-    /*
-     * Jump back to the test at the top of the loop. Generate a 4 byte jump
-     * if the distance to the test is > 120 bytes. This is conservative and
-     * ensures that we won't have to replace this jump if we later need to
-     * replace the ifFalse jump with a 4 byte jump.
-     */
-
-    jumpBackOffset = (envPtr->codeNext - envPtr->codeStart);
-    jumpBackDist =
-	(jumpBackOffset - envPtr->exceptArrayPtr[range].continueOffset);
-    if (jumpBackDist > 120) {
-	TclEmitInstInt4(INST_JUMP4, -jumpBackDist, envPtr);
-    } else {
-	TclEmitInstInt1(INST_JUMP1, -jumpBackDist, envPtr);
-    }
-
-    /*
-     * Fix the target of the jump after the foreach_step test.
-     */
-
-    jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	    - jumpFalseFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &jumpFalseFixup, jumpDist, 127)) {
-	/*
-	 * Update the loop body's starting PC offset since it moved down.
-	 */
-
-	envPtr->exceptArrayPtr[range].codeOffset += 3;
-
-	/*
-	 * Update the jump back to the test at the top of the loop since it
-	 * also moved down 3 bytes.
-	 */
-
-	jumpBackOffset += 3;
-	jumpPc = (envPtr->codeStart + jumpBackOffset);
-	jumpBackDist += 3;
-	if (jumpBackDist > 120) {
-	    TclUpdateInstInt4AtPc(INST_JUMP4, -jumpBackDist, jumpPc);
-	} else {
-	    TclUpdateInstInt1AtPc(INST_JUMP1, -jumpBackDist, jumpPc);
-	}
-    }
-
-    /*
-     * Set the loop's break target.
-     */
-
-    envPtr->exceptArrayPtr[range].breakOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    
-    /*
-     * The foreach command's result is an empty string.
-     */
-
-    TclEmitPush(TclRegisterLiteral(envPtr, "", 0, /*onHeap*/ 0), envPtr);
-    if (maxDepth == 0) {
-	maxDepth = 1;
-    }
-
-    done:
-    for (loopIndex = 0;  loopIndex < numLists;  loopIndex++) {
-        if (varvList[loopIndex] != (char **) NULL) {
-            ckfree((char *) varvList[loopIndex]);
-        }
-    }
-    if (varcList != varcListStaticSpace) {
-	ckfree((char *) varcList);
-        ckfree((char *) varvList);
-    }
-    envPtr->maxStackDepth = maxDepth;
-    envPtr->exceptDepth--;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupForeachInfo --
- *
- *	This procedure duplicates a ForeachInfo structure created as
- *	auxiliary data during the compilation of a foreach command.
- *
- * Results:
- *	A pointer to a newly allocated copy of the existing ForeachInfo
- *	structure is returned.
- *
- * Side effects:
- *	Storage for the copied ForeachInfo record is allocated. If the
- *	original ForeachInfo structure pointed to any ForeachVarList
- *	records, these structures are also copied and pointers to them
- *	are stored in the new ForeachInfo record.
- *
- *----------------------------------------------------------------------
- */
-
-static ClientData
-DupForeachInfo(clientData)
-    ClientData clientData;	/* The foreach command's compilation
-				 * auxiliary data to duplicate. */
-{
-    register ForeachInfo *srcPtr = (ForeachInfo *) clientData;
-    ForeachInfo *dupPtr;
-    register ForeachVarList *srcListPtr, *dupListPtr;
-    int numLists = srcPtr->numLists;
-    int numVars, i, j;
-    
-    dupPtr = (ForeachInfo *) ckalloc((unsigned)
-	    (sizeof(ForeachInfo) + (numLists * sizeof(ForeachVarList *))));
-    dupPtr->numLists = numLists;
-    dupPtr->firstValueTemp = srcPtr->firstValueTemp;
-    dupPtr->loopCtTemp = srcPtr->loopCtTemp;
-    
-    for (i = 0;  i < numLists;  i++) {
-	srcListPtr = srcPtr->varLists[i];
-	numVars = srcListPtr->numVars;
-	dupListPtr = (ForeachVarList *) ckalloc((unsigned)
-	        sizeof(ForeachVarList) + numVars*sizeof(int));
-	dupListPtr->numVars = numVars;
-	for (j = 0;  j < numVars;  j++) {
-	    dupListPtr->varIndexes[j] =	srcListPtr->varIndexes[j];
-	}
-	dupPtr->varLists[i] = dupListPtr;
-    }
-    return (ClientData) dupPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeForeachInfo --
- *
- *	Procedure to free a ForeachInfo structure created as auxiliary data
- *	during the compilation of a foreach command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Storage for the ForeachInfo structure pointed to by the ClientData
- *	argument is freed as is any ForeachVarList record pointed to by the
- *	ForeachInfo structure.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeForeachInfo(clientData)
-    ClientData clientData;	/* The foreach command's compilation
-				 * auxiliary data to free. */
-{
-    register ForeachInfo *infoPtr = (ForeachInfo *) clientData;
-    register ForeachVarList *listPtr;
-    int numLists = infoPtr->numLists;
-    register int i;
-
-    for (i = 0;  i < numLists;  i++) {
-	listPtr = infoPtr->varLists[i];
-	ckfree((char *) listPtr);
-    }
-    ckfree((char *) infoPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileIfCmd --
- *
- *	Procedure called to compile the "if" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK if
- *	compilation was successful. If an error occurs then the
- *	interpreter's result contains a standard error message and TCL_ERROR
- *	is returned. If the command is too complex for TclCompileIfCmd,
- *	TCL_OUT_LINE_COMPILE is returned indicating that the if command
- *	should be compiled "out of line" by emitting code to invoke its
- *	command procedure at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "if" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileIfCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    JumpFixupArray jumpFalseFixupArray;
-    				/* Used to fix the ifFalse jump after each
-				 * test when its target PC is determined. */
-    JumpFixupArray jumpEndFixupArray;
-				/* Used to fix the jump after each "then"
-				 * body to the end of the "if" when that PC
-				 * is determined. */
-    Tcl_Token *tokenPtr, *testTokenPtr;
-    int jumpDist, jumpFalseDist, jumpIndex;
-    int numWords, wordIdx, numBytes, maxDepth, j, code;
-    char *word;
-    char buffer[100];
-
-    TclInitJumpFixupArray(&jumpFalseFixupArray);
-    TclInitJumpFixupArray(&jumpEndFixupArray);
-    maxDepth = 0;
-    code = TCL_OK;
-
-    /*
-     * Each iteration of this loop compiles one "if expr ?then? body"
-     * or "elseif expr ?then? body" clause. 
-     */
-
-    tokenPtr = parsePtr->tokenPtr;
-    wordIdx = 0;
-    numWords = parsePtr->numWords;
-    while (wordIdx < numWords) {
-	/*
-	 * Stop looping if the token isn't "if" or "elseif".
-	 */
-
-	if (tokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	    break;
-	}
-	word = tokenPtr[1].start;
-	numBytes = tokenPtr[1].size;
-	if ((tokenPtr == parsePtr->tokenPtr)
-	        || ((numBytes == 6) && (strncmp(word, "elseif", 6) == 0))) {
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    wordIdx++;
-	} else {
-	    break;
-	}
-	if (wordIdx >= numWords) {
-	    sprintf(buffer,
-	            "wrong # args: no expression after \"%.30s\" argument",
-		    word);
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buffer, -1);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-
-	/*
-	 * Compile the test expression then emit the conditional jump
-	 * around the "then" part. If the expression word isn't simple,
-	 * we back off and compile the if command out-of-line.
-	 */
-	
-	testTokenPtr = tokenPtr;
-	code = TclCompileExprWords(interp, testTokenPtr, 1, envPtr);
-	if (code != TCL_OK) {
-	    if (code == TCL_ERROR) {
-		Tcl_AddObjErrorInfo(interp,
-		        "\n    (\"if\" test expression)", -1);
-	    }
-	    goto done;
-	}
-	maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-	if (jumpFalseFixupArray.next >= jumpFalseFixupArray.end) {
-	    TclExpandJumpFixupArray(&jumpFalseFixupArray);
-	}
-	jumpIndex = jumpFalseFixupArray.next;
-	jumpFalseFixupArray.next++;
-	TclEmitForwardJump(envPtr, TCL_FALSE_JUMP,
-		&(jumpFalseFixupArray.fixup[jumpIndex]));
-	
-	/*
-	 * Skip over the optional "then" before the then clause.
-	 */
-
-	tokenPtr = testTokenPtr + (testTokenPtr->numComponents + 1);
-	wordIdx++;
-	if (wordIdx >= numWords) {
-	    sprintf(buffer, "wrong # args: no script following \"%.20s\" argument", testTokenPtr->start);
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buffer, -1);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-	if (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	    word = tokenPtr[1].start;
-	    numBytes = tokenPtr[1].size;
-	    if ((numBytes == 4) && (strncmp(word, "then", 4) == 0)) {
-		tokenPtr += (tokenPtr->numComponents + 1);
-		wordIdx++;
-		if (wordIdx >= numWords) {
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		            "wrong # args: no script following \"then\" argument", -1);
-		    code = TCL_ERROR;
-		    goto done;
-		}
-	    }
-	}
-
-	/*
-	 * Compile the "then" command body.
-	 */
-
-	code = TclCompileCmdWord(interp, tokenPtr+1,
-		tokenPtr->numComponents, envPtr);
-	if (code != TCL_OK) {
-	    if (code == TCL_ERROR) {
-		sprintf(buffer, "\n    (\"if\" then script line %d)",
-		        interp->errorLine);
-		Tcl_AddObjErrorInfo(interp, buffer, -1);
-	    }
-	    goto done;
-	}
-	maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-
-	/*
-	 * Jump to the end of the "if" command. Both jumpFalseFixupArray and
-	 * jumpEndFixupArray are indexed by "jumpIndex".
-	 */
-
-	if (jumpEndFixupArray.next >= jumpEndFixupArray.end) {
-	    TclExpandJumpFixupArray(&jumpEndFixupArray);
-	}
-	jumpEndFixupArray.next++;
-	TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP,
-		&(jumpEndFixupArray.fixup[jumpIndex]));
-
- 	/*
-	 * Fix the target of the jumpFalse after the test. Generate a 4 byte
-	 * jump if the distance is > 120 bytes. This is conservative, and
-	 * ensures that we won't have to replace this jump if we later also
-	 * need to replace the proceeding jump to the end of the "if" with a
-	 * 4 byte jump.
-	 */
-
-	jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	        - jumpFalseFixupArray.fixup[jumpIndex].codeOffset;
-	if (TclFixupForwardJump(envPtr,
-	        &(jumpFalseFixupArray.fixup[jumpIndex]), jumpDist, 120)) {
-	    /*
-	     * Adjust the code offset for the proceeding jump to the end
-	     * of the "if" command.
-	     */
-
-	    jumpEndFixupArray.fixup[jumpIndex].codeOffset += 3;
-	}
-
-	tokenPtr += (tokenPtr->numComponents + 1);
-	wordIdx++;
-    }
-
-    /*
-     * Check for the optional else clause.
-     */
-
-    if ((wordIdx < numWords)
-	    && (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD)) {
-	/*
-	 * There is an else clause. Skip over the optional "else" word.
-	 */
-	
-	word = tokenPtr[1].start;
-	numBytes = tokenPtr[1].size;
-	if ((numBytes == 4) && (strncmp(word, "else", 4) == 0)) {
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    wordIdx++;
-	    if (wordIdx >= numWords) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		        "wrong # args: no script following \"else\" argument", -1);
-		code = TCL_ERROR;
-		goto done;
-	    }
-	}
-
-	/*
-	 * Compile the else command body.
-	 */
-	
-	code = TclCompileCmdWord(interp, tokenPtr+1,
-		tokenPtr->numComponents, envPtr);
-	if (code != TCL_OK) {
-	    if (code == TCL_ERROR) {
-		sprintf(buffer, "\n    (\"if\" else script line %d)",
-			interp->errorLine);
-		Tcl_AddObjErrorInfo(interp, buffer, -1);
-	    }
-	    goto done;
-	}
-	maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-
-	/*
-	 * Make sure there are no words after the else clause.
-	 */
-	
-	wordIdx++;
-	if (wordIdx < numWords) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "wrong # args: extra words after \"else\" clause in \"if\" command", -1);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-    } else {
-	/*
-	 * No else clause: the "if" command's result is an empty string.
-	 */
-
-	TclEmitPush(TclRegisterLiteral(envPtr, "", 0,/*onHeap*/ 0), envPtr);
-	maxDepth = TclMax(1, maxDepth);
-    }
-
-    /*
-     * Fix the unconditional jumps to the end of the "if" command.
-     */
-    
-    for (j = jumpEndFixupArray.next;  j > 0;  j--) {
-	jumpIndex = (j - 1);	/* i.e. process the closest jump first */
-	jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	        - jumpEndFixupArray.fixup[jumpIndex].codeOffset;
-	if (TclFixupForwardJump(envPtr,
-	        &(jumpEndFixupArray.fixup[jumpIndex]), jumpDist, 127)) {
-	    /*
-	     * Adjust the immediately preceeding "ifFalse" jump. We moved
-	     * it's target (just after this jump) down three bytes.
-	     */
-
-	    unsigned char *ifFalsePc = envPtr->codeStart
-	            + jumpFalseFixupArray.fixup[jumpIndex].codeOffset;
-	    unsigned char opCode = *ifFalsePc;
-	    if (opCode == INST_JUMP_FALSE1) {
-		jumpFalseDist = TclGetInt1AtPtr(ifFalsePc + 1);
-		jumpFalseDist += 3;
-		TclStoreInt1AtPtr(jumpFalseDist, (ifFalsePc + 1));
-	    } else if (opCode == INST_JUMP_FALSE4) {
-		jumpFalseDist = TclGetInt4AtPtr(ifFalsePc + 1);
-		jumpFalseDist += 3;
-		TclStoreInt4AtPtr(jumpFalseDist, (ifFalsePc + 1));
-	    } else {
-		panic("TclCompileIfCmd: unexpected opcode updating ifFalse jump");
-	    }
-	}
-    }
-	
-    /*
-     * Free the jumpFixupArray array if malloc'ed storage was used.
-     */
-
-    done:
-    TclFreeJumpFixupArray(&jumpFalseFixupArray);
-    TclFreeJumpFixupArray(&jumpEndFixupArray);
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileIncrCmd --
- *
- *	Procedure called to compile the "incr" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK if
- *	compilation was successful. If an error occurs then the
- *	interpreter's result contains a standard error message and TCL_ERROR
- *	is returned. If the command is too complex for TclCompileIncrCmd,
- *	TCL_OUT_LINE_COMPILE is returned indicating that the incr command
- *	should be compiled "out of line" by emitting code to invoke its
- *	command procedure at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the "incr" command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "incr" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileIncrCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Token *varTokenPtr, *incrTokenPtr;
-    Tcl_Parse elemParse;
-    int gotElemParse = 0;
-    char *name, *elName, *p;
-    int nameChars, elNameChars, haveImmValue, immValue, localIndex, i, code;
-    int maxDepth = 0;
-    char buffer[160];
-
-    envPtr->maxStackDepth = 0;
-    if ((parsePtr->numWords != 2) && (parsePtr->numWords != 3)) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"incr varName ?increment?\"", -1);
-	return TCL_ERROR;
-    }
-    
-    name = NULL;
-    elName = NULL;
-    elNameChars = 0;
-    localIndex = -1;
-    code = TCL_OK;
-
-    varTokenPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	/*
-	 * A simple variable name. Divide it up into "name" and "elName"
-	 * strings. If it is not a local variable, look it up at runtime.
-	 */
-	
-	name = varTokenPtr[1].start;
-	nameChars = varTokenPtr[1].size;
-	for (i = 0, p = name;  i < nameChars;  i++, p++) {
-	    if (*p == '(') {
-		char *openParen = p;
-		p = (name + nameChars-1);	
-		if (*p == ')') { /* last char is ')' => array reference */
-		    nameChars = (openParen - name);
-		    elName = openParen+1;
-		    elNameChars = (p - elName);
-		}
-		break;
-	    }
-	}
-	if (envPtr->procPtr != NULL) {
-	    localIndex = TclFindCompiledLocal(name, nameChars,
-	            /*create*/ 0, /*flags*/ 0, envPtr->procPtr);
-	    if (localIndex > 255) {	      /* we'll push the name */
-		localIndex = -1;
-	    }
-	}
-	if (localIndex < 0) {
-	    TclEmitPush(TclRegisterLiteral(envPtr, name, nameChars,
-			/*onHeap*/ 0), envPtr);
-	    maxDepth = 1;
-	}
-
-	/*
-	 * Compile the element script, if any.
-	 */
-	
-	if (elName != NULL) {
-	    /*
-	     * Temporarily replace the '(' and ')' by '"'s.
-	     */
-	    
-	    *(elName-1) = '"';
-	    *(elName+elNameChars) = '"';
-	    code = Tcl_ParseCommand(interp, elName-1, elNameChars+2,
-                    /*nested*/ 0, &elemParse);
-	    *(elName-1) = '(';
-	    *(elName+elNameChars) = ')';
-	    gotElemParse = 1;
-	    if ((code != TCL_OK) || (elemParse.numWords > 1)) {
-		sprintf(buffer, "\n    (parsing index for array \"%.*s\")",
-			TclMin(nameChars, 100), name);
-		Tcl_AddObjErrorInfo(interp, buffer, -1);
-		code = TCL_ERROR;
-		goto done;
-	    } else if (elemParse.numWords == 1) {
-		code = TclCompileTokens(interp, elemParse.tokenPtr+1,
-                        elemParse.tokenPtr->numComponents, envPtr);
-		if (code != TCL_OK) {
-		    goto done;
-		}
-		maxDepth += envPtr->maxStackDepth;
-	    } else {
-		TclEmitPush(TclRegisterLiteral(envPtr, "", 0,
-                        /*alreadyAlloced*/ 0), envPtr);
-		maxDepth += 1;
-	    }
-	}
-    } else {
-	/*
-	 * Not a simple variable name. Look it up at runtime.
-	 */
-	
-	code = TclCompileTokens(interp, varTokenPtr+1,
-	        varTokenPtr->numComponents, envPtr);
-	if (code != TCL_OK) {
-	    goto done;
-	}
-	maxDepth = envPtr->maxStackDepth;
-    }
-    
-    /*
-     * If an increment is given, push it, but see first if it's a small
-     * integer.
-     */
-
-    haveImmValue = 0;
-    immValue = 0;
-    if (parsePtr->numWords == 3) {
-	incrTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1);
-	if (incrTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	    char *word = incrTokenPtr[1].start;
-	    int numBytes = incrTokenPtr[1].size;
-	    char savedChar = word[numBytes];
-	    long n;
-	
-	    /*
-	     * Note there is a danger that modifying the string could have
-	     * undesirable side effects.  In this case, TclLooksLikeInt and
-	     * TclGetLong do not have any dependencies on shared strings so we
-	     * should be safe.
-	     */
-
-	    word[numBytes] = '\0';
-	    if (TclLooksLikeInt(word, numBytes)
-		     && (TclGetLong((Tcl_Interp *) NULL, word, &n) == TCL_OK)) {
-		if ((-127 <= n) && (n <= 127)) {
-		    haveImmValue = 1;
-		    immValue = n;
-		}
-	    }
-	    word[numBytes] = savedChar;
-	    if (!haveImmValue) {
-		TclEmitPush(TclRegisterLiteral(envPtr, word, numBytes,
-	               /*onHeap*/ 0), envPtr);
-		maxDepth += 1;
-	    }
-	} else {
-	    code = TclCompileTokens(interp, incrTokenPtr+1, 
-	            incrTokenPtr->numComponents, envPtr);
-	    if (code != TCL_OK) {
-		if (code == TCL_ERROR) {
-		    Tcl_AddObjErrorInfo(interp,
-	                    "\n    (increment expression)", -1);
-		}
-		goto done;
-	    }
-	    maxDepth += envPtr->maxStackDepth;
-	}
-    } else {			/* no incr amount given so use 1 */
-	haveImmValue = 1;
-	immValue = 1;
-    }
-    
-    /*
-     * Emit the instruction to increment the variable.
-     */
-
-    if (name != NULL) {
-	if (elName == NULL) {
-	    if (localIndex >= 0) {
-		if (haveImmValue) {
-		    TclEmitInstInt1(INST_INCR_SCALAR1_IMM, localIndex,
-				    envPtr);
-		    TclEmitInt1(immValue, envPtr);
-		} else {
-		    TclEmitInstInt1(INST_INCR_SCALAR1, localIndex, envPtr);
-		}
-	    } else {
-		if (haveImmValue) {
-		    TclEmitInstInt1(INST_INCR_SCALAR_STK_IMM, immValue,
-				   envPtr);
-		} else {
-		    TclEmitOpcode(INST_INCR_SCALAR_STK, envPtr);
-		}
-	    }
-	} else {
-	    if (localIndex >= 0) {
-		if (haveImmValue) {
-		    TclEmitInstInt1(INST_INCR_ARRAY1_IMM, localIndex,
-				    envPtr);
-		    TclEmitInt1(immValue, envPtr);
-		} else {
-		    TclEmitInstInt1(INST_INCR_ARRAY1, localIndex, envPtr);
-		}
-	    } else {
-		if (haveImmValue) {
-		    TclEmitInstInt1(INST_INCR_ARRAY_STK_IMM, immValue,
-				   envPtr);
-		} else {
-		    TclEmitOpcode(INST_INCR_ARRAY_STK, envPtr);
-		}
-	    }
-	}
-    } else {			/* non-simple variable name */
-	if (haveImmValue) {
-	    TclEmitInstInt1(INST_INCR_STK_IMM, immValue, envPtr);
-	} else {
-	    TclEmitOpcode(INST_INCR_STK, envPtr);
-	}
-    }
-	
-    done:
-    if (gotElemParse) {
-        Tcl_FreeParse(&elemParse);
-    }
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileSetCmd --
- *
- *	Procedure called to compile the "set" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is normally TCL_OK
- *	unless there was an error while parsing string. If an error occurs
- *	then the interpreter's result contains a standard error message. If
- *	complation fails because the set command requires a second level of
- *	substitutions, TCL_OUT_LINE_COMPILE is returned indicating that the
- *	set command should be compiled "out of line" by emitting code to
- *	invoke its command procedure (Tcl_SetCmd) at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the incr command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "set" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileSetCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Token *varTokenPtr, *valueTokenPtr;
-    Tcl_Parse elemParse;
-    int gotElemParse = 0;
-    register char *p;
-    char *name, *elName;
-    int nameChars, elNameChars;
-    register int i;
-    int isAssignment, simpleVarName, localIndex, numWords;
-    int maxDepth = 0;
-    int code = TCL_OK;
-
-    envPtr->maxStackDepth = 0;
-    numWords = parsePtr->numWords;
-    if ((numWords != 2) && (numWords != 3)) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"set varName ?newValue?\"", -1);
-        return TCL_ERROR;
-    }
-    isAssignment = (numWords == 3);
-
-    /*
-     * Decide if we can use a frame slot for the var/array name or if we
-     * need to emit code to compute and push the name at runtime. We use a
-     * frame slot (entry in the array of local vars) if we are compiling a
-     * procedure body and if the name is simple text that does not include
-     * namespace qualifiers. 
-     */
-
-    simpleVarName = 0;
-    name = elName = NULL;
-    nameChars = elNameChars = 0;
-    localIndex = -1;
-
-    varTokenPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	simpleVarName = 1;
-	name = varTokenPtr[1].start;
-	nameChars = varTokenPtr[1].size;
-	/* last char is ')' => potential array reference */
-	if ( *(name + nameChars - 1) == ')') {
-	    for (i = 0, p = name;  i < nameChars;  i++, p++) {
-		if (*p == '(') {
-		    elName = p + 1;
-		    elNameChars = nameChars - i - 2;
-		    nameChars = i ;
-		    break;
-		}
-	    }
-	}
-
-	/*
-	 * If elName contains any double quotes ("), we can't inline
-	 * compile the element script using the replace '()' by '"'
-	 * technique below.
-	 */
-
-	for (i = 0, p = elName;  i < elNameChars;  i++, p++) {
-	    if (*p == '"') {
-		simpleVarName = 0;
-		break;
-	    }
-	}
-    } else if ((varTokenPtr->numComponents == 4)
-	    && (varTokenPtr[1].type == TCL_TOKEN_TEXT)
-	    && (varTokenPtr[1].start[varTokenPtr[1].size-1] == '(')
-	    && (varTokenPtr[4].type == TCL_TOKEN_TEXT)
-	    && (varTokenPtr[4].size == 1)
-	    && (varTokenPtr[4].start[0] == ')')) {
-	simpleVarName = 1;
-	name = varTokenPtr[1].start;
-	nameChars = varTokenPtr[1].size - 1;
-	elName = varTokenPtr[2].start;
-	elNameChars = varTokenPtr[2].size;
-    }
-
-    if (simpleVarName) {
-	/*
-	 * See whether name has any namespace separators (::'s).
-	 */
-
-	int hasNsQualifiers = 0;
-	for (i = 0, p = name;  i < nameChars;  i++, p++) {
-	    if ((*p == ':') && ((i+1) < nameChars) && (*(p+1) == ':')) {
-		hasNsQualifiers = 1;
-		break;
-	    }
-	}
-	
-	/*
-	 * Look up the var name's index in the array of local vars in the
-	 * proc frame. If retrieving the var's value and it doesn't already
-	 * exist, push its name and look it up at runtime.
-	 */
-
-	if ((envPtr->procPtr != NULL) && !hasNsQualifiers) {
-	    localIndex = TclFindCompiledLocal(name, nameChars,
-		    /*create*/ isAssignment,
-                    /*flags*/ ((elName==NULL)? VAR_SCALAR : VAR_ARRAY),
-		    envPtr->procPtr);
-	}
-	if (localIndex >= 0) {
-	    maxDepth = 0;
-	} else {
-	    TclEmitPush(TclRegisterLiteral(envPtr, name, nameChars,
-		    /*onHeap*/ 0), envPtr);
-	    maxDepth = 1;
-	}
-
-	/*
-	 * Compile the element script, if any.
-	 */
-	
-	if (elName != NULL) {
-	    /*
-	     * Temporarily replace the '(' and ')' by '"'s.
-	     */
-
-	    *(elName-1) = '"';
-	    *(elName+elNameChars) = '"';
-	    code = Tcl_ParseCommand(interp, elName-1, elNameChars+2,
-                    /*nested*/ 0, &elemParse);
-	    *(elName-1) = '(';
-	    *(elName+elNameChars) = ')';
-	    gotElemParse = 1;
-	    if ((code != TCL_OK) || (elemParse.numWords > 1)) {
-		char buffer[160];
-		sprintf(buffer, "\n    (parsing index for array \"%.*s\")",
-		        TclMin(nameChars, 100), name);
-		Tcl_AddObjErrorInfo(interp, buffer, -1);
-		code = TCL_ERROR;
-		goto done;
-	    } else if (elemParse.numWords == 1) {
-		code = TclCompileTokens(interp, elemParse.tokenPtr+1,
-                        elemParse.tokenPtr->numComponents, envPtr);
-		if (code != TCL_OK) {
-		    goto done;
-		}
-		maxDepth += envPtr->maxStackDepth;
-	    } else {
-		TclEmitPush(TclRegisterLiteral(envPtr, "", 0,
-                        /*alreadyAlloced*/ 0), envPtr);
-		maxDepth += 1;
-	    }
-	}
-    } else {
-	/*
-	 * The var name isn't simple: compile and push it.
-	 */
-
-	code = TclCompileTokens(interp, varTokenPtr+1,
-		varTokenPtr->numComponents, envPtr);
-	if (code != TCL_OK) {
-	    goto done;
-	}
-	maxDepth += envPtr->maxStackDepth;
-    }
-	
-    /*
-     * If we are doing an assignment, push the new value.
-     */
-    
-    if (isAssignment) {
-	valueTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1);
-	if (valueTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-	    TclEmitPush(TclRegisterLiteral(envPtr, valueTokenPtr[1].start,
-		    valueTokenPtr[1].size, /*onHeap*/ 0), envPtr);
-	    maxDepth += 1;
-	} else {
-	    code = TclCompileTokens(interp, valueTokenPtr+1,
-	            valueTokenPtr->numComponents, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth += envPtr->maxStackDepth;
-	}
-    }
-	
-    /*
-     * Emit instructions to set/get the variable.
-     */
-
-    if (simpleVarName) {
-	if (elName == NULL) {
-	    if (localIndex >= 0) {
-		if (localIndex <= 255) {
-		    TclEmitInstInt1((isAssignment?
-		            INST_STORE_SCALAR1 : INST_LOAD_SCALAR1),
-			    localIndex, envPtr);
-		} else {
-		    TclEmitInstInt4((isAssignment?
-			    INST_STORE_SCALAR4 : INST_LOAD_SCALAR4),
-			    localIndex, envPtr);
-		}
-	    } else {
-		TclEmitOpcode((isAssignment?
-		        INST_STORE_SCALAR_STK : INST_LOAD_SCALAR_STK),
-			envPtr);
-	    }
-	} else {
-	    if (localIndex >= 0) {
-		if (localIndex <= 255) {
-		    TclEmitInstInt1((isAssignment?
-		            INST_STORE_ARRAY1 : INST_LOAD_ARRAY1),
-			    localIndex, envPtr);
-		} else {
-		    TclEmitInstInt4((isAssignment?
-			    INST_STORE_ARRAY4 : INST_LOAD_ARRAY4),
-			    localIndex, envPtr);
-		}
-	    } else {
-		TclEmitOpcode((isAssignment?
-		        INST_STORE_ARRAY_STK : INST_LOAD_ARRAY_STK),
-			envPtr);
-	    }
-	}
-    } else {
-	TclEmitOpcode((isAssignment? INST_STORE_STK : INST_LOAD_STK),
-	        envPtr);
-    }
-	
-    done:
-    if (gotElemParse) {
-        Tcl_FreeParse(&elemParse);
-    }
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileWhileCmd --
- *
- *	Procedure called to compile the "while" command.
- *
- * Results:
- *	The return value is a standard Tcl result, which is TCL_OK if
- *	compilation was successful. If an error occurs then the
- *	interpreter's result contains a standard error message and TCL_ERROR
- *	is returned. If compilation failed because the command is too
- *	complex for TclCompileWhileCmd, TCL_OUT_LINE_COMPILE is returned
- *	indicating that the while command should be compiled "out of line"
- *	by emitting code to invoke its command procedure at runtime.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the "while" command.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the "while" command
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileWhileCmd(interp, parsePtr, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Points to a parse structure for the
-				 * command created by Tcl_ParseCommand. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Token *testTokenPtr, *bodyTokenPtr;
-    JumpFixup jumpFalseFixup;
-    unsigned char *jumpPc;
-    int testCodeOffset, jumpDist, jumpBackDist, jumpBackOffset;
-    int range, maxDepth, code;
-    char buffer[32 + TCL_INTEGER_SPACE];
-
-    envPtr->maxStackDepth = 0;
-    maxDepth = 0;
-    if (parsePtr->numWords != 3) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "wrong # args: should be \"while test command\"", -1);
-	return TCL_ERROR;
-    }
-
-    /*
-     * If the test expression requires substitutions, don't compile the
-     * while command inline. E.g., the expression might cause the loop to
-     * never execute or execute forever, as in "while "$x < 5" {}".
-     */
-
-    testTokenPtr = parsePtr->tokenPtr
-	    + (parsePtr->tokenPtr->numComponents + 1);
-    if (testTokenPtr->type != TCL_TOKEN_SIMPLE_WORD) {
-	return TCL_OUT_LINE_COMPILE;
-    }
-
-    /*
-     * Create a ExceptionRange record for the loop body. This is used to
-     * implement break and continue.
-     */
-
-    envPtr->exceptDepth++;
-    envPtr->maxExceptDepth =
-	TclMax(envPtr->exceptDepth, envPtr->maxExceptDepth);
-    range = TclCreateExceptRange(LOOP_EXCEPTION_RANGE, envPtr);
-    envPtr->exceptArrayPtr[range].continueOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-
-    /*
-     * Compile the test expression then emit the conditional jump that
-     * terminates the while. We already know it's a simple word.
-     */
-
-    testCodeOffset = (envPtr->codeNext - envPtr->codeStart);
-    envPtr->exceptArrayPtr[range].continueOffset = testCodeOffset;
-    code = TclCompileExprWords(interp, testTokenPtr, 1, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-            Tcl_AddObjErrorInfo(interp,
-		    "\n    (\"while\" test expression)", -1);
-        }
-	goto error;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpFalseFixup);
-    
-    /*
-     * Compile the loop body.
-     */
-
-    bodyTokenPtr = testTokenPtr + (testTokenPtr->numComponents + 1);
-    envPtr->exceptArrayPtr[range].codeOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    code = TclCompileCmdWord(interp, bodyTokenPtr+1,
-	    bodyTokenPtr->numComponents, envPtr);
-    if (code != TCL_OK) {
-	if (code == TCL_ERROR) {
-	    sprintf(buffer, "\n    (\"while\" body line %d)",
-		    interp->errorLine);
-            Tcl_AddObjErrorInfo(interp, buffer, -1);
-        }
-	goto error;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    envPtr->exceptArrayPtr[range].numCodeBytes =
-	    (envPtr->codeNext - envPtr->codeStart)
-	    - envPtr->exceptArrayPtr[range].codeOffset;
-    TclEmitOpcode(INST_POP, envPtr);
-	
-    /*
-     * Jump back to the test at the top of the loop. Generate a 4 byte jump
-     * if the distance to the test is > 120 bytes. This is conservative and
-     * ensures that we won't have to replace this jump if we later need to
-     * replace the ifFalse jump with a 4 byte jump.
-     */
-
-    jumpBackOffset = (envPtr->codeNext - envPtr->codeStart);
-    jumpBackDist = (jumpBackOffset - testCodeOffset);
-    if (jumpBackDist > 120) {
-	TclEmitInstInt4(INST_JUMP4, -jumpBackDist, envPtr);
-    } else {
-	TclEmitInstInt1(INST_JUMP1, -jumpBackDist, envPtr);
-    }
-
-    /*
-     * Fix the target of the jumpFalse after the test. 
-     */
-
-    jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	    - jumpFalseFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &jumpFalseFixup, jumpDist, 127)) {
-	/*
-	 * Update the loop body's starting PC offset since it moved down.
-	 */
-
-	envPtr->exceptArrayPtr[range].codeOffset += 3;
-
-	/*
-	 * Update the jump back to the test at the top of the loop since it
-	 * also moved down 3 bytes.
-	 */
-
-	jumpBackOffset += 3;
-	jumpPc = (envPtr->codeStart + jumpBackOffset);
-	jumpBackDist += 3;
-	if (jumpBackDist > 120) {
-	    TclUpdateInstInt4AtPc(INST_JUMP4, -jumpBackDist, jumpPc);
-	} else {
-	    TclUpdateInstInt1AtPc(INST_JUMP1, -jumpBackDist, jumpPc);
-	}
-    }
-
-    /*
-     * Set the loop's break target.
-     */
-
-    envPtr->exceptArrayPtr[range].breakOffset =
-	    (envPtr->codeNext - envPtr->codeStart);
-    
-    /*
-     * The while command's result is an empty string.
-     */
-
-    TclEmitPush(TclRegisterLiteral(envPtr, "", 0, /*onHeap*/ 0), envPtr);
-    if (maxDepth == 0) {
-	maxDepth = 1;
-    }
-    envPtr->maxStackDepth = maxDepth;
-    envPtr->exceptDepth--;
-    return TCL_OK;
-
-    error:
-    envPtr->maxStackDepth = maxDepth;
-    envPtr->exceptDepth--;
-    return code;
-}
-
-
-
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
deleted file mode 100644
index 42342b1..0000000
--- a/generic/tclCompExpr.c
+++ /dev/null
@@ -1,1048 +0,0 @@
-/* 
- * tclCompExpr.c --
- *
- *	This file contains the code to compile Tcl expressions.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCompExpr.c,v 1.3 1999/04/16 00:46:44 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * The stuff below is a bit of a hack so that this file can be used in
- * environments that include no UNIX, i.e. no errno: just arrange to use
- * the errno from tclExecute.c here.
- */
-
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
-#define NO_ERRNO_H
-#endif
-
-#ifdef NO_ERRNO_H
-extern int errno;			/* Use errno from tclExecute.c. */
-#define ERANGE 34
-#endif
-
-/*
- * Boolean variable that controls whether expression compilation tracing
- * is enabled.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static int traceExprComp = 0;
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- * The ExprInfo structure describes the state of compiling an expression.
- * A pointer to an ExprInfo record is passed among the routines in
- * this module.
- */
-
-typedef struct ExprInfo {
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    Tcl_Parse *parsePtr;	/* Structure filled with information about
-				 * the parsed expression. */
-    char *expr;			/* The expression that was originally passed
-				 * to TclCompileExpr. */
-    char *lastChar;		/* Points just after last byte of expr. */
-    int hasOperators;		/* Set 1 if the expr has operators; 0 if
-				 * expr is only a primary. If 1 after
-				 * compiling an expr, a tryCvtToNumeric
-				 * instruction is emitted to convert the
-				 * primary to a number if possible. */
-    int exprIsJustVarRef;	/* Set 1 if the expr consists of just a
-				 * variable reference as in the expression
-				 * of "if $b then...". Otherwise 0. If 1 the
-				 * expr is compiled out-of-line in order to
-				 * implement expr's 2 level substitution
-				 * semantics properly. */
-    int exprIsComparison;	/* Set 1 if the top-level operator in the
-				 * expr is a comparison. Otherwise 0. If 1,
-				 * because the operands might be strings,
-				 * the expr is compiled out-of-line in order
-				 * to implement expr's 2 level substitution
-				 * semantics properly. */
-} ExprInfo;
-
-/*
- * Definitions of numeric codes representing each expression operator.
- * The order of these must match the entries in the operatorTable below.
- * Also the codes for the relational operators (OP_LESS, OP_GREATER, 
- * OP_LE, OP_GE, OP_EQ, and OP_NE) must be consecutive and in that order.
- * Note that OP_PLUS and OP_MINUS represent both unary and binary operators.
- */
-
-#define OP_MULT		0
-#define OP_DIVIDE	1
-#define OP_MOD		2
-#define OP_PLUS		3
-#define OP_MINUS	4
-#define OP_LSHIFT	5
-#define OP_RSHIFT	6
-#define OP_LESS		7
-#define OP_GREATER	8
-#define OP_LE		9
-#define OP_GE		10
-#define OP_EQ		11
-#define OP_NEQ		12
-#define OP_BITAND	13
-#define OP_BITXOR	14
-#define OP_BITOR	15
-#define OP_LAND		16
-#define OP_LOR		17
-#define OP_QUESTY	18
-#define OP_LNOT		19
-#define OP_BITNOT	20
-
-/*
- * Table describing the expression operators. Entries in this table must
- * correspond to the definitions of numeric codes for operators just above.
- */
-
-static int opTableInitialized = 0; /* 0 means not yet initialized. */
-
-TCL_DECLARE_MUTEX(opMutex)
-
-typedef struct OperatorDesc {
-    char *name;			/* Name of the operator. */
-    int numOperands;		/* Number of operands. 0 if the operator
-				 * requires special handling. */
-    int instruction;		/* Instruction opcode for the operator.
-				 * Ignored if numOperands is 0. */
-} OperatorDesc;
-
-OperatorDesc operatorTable[] = {
-    {"*",   2,  INST_MULT},
-    {"/",   2,  INST_DIV},
-    {"%",   2,  INST_MOD},
-    {"+",   0}, 
-    {"-",   0},
-    {"<<",  2,  INST_LSHIFT},
-    {">>",  2,  INST_RSHIFT},
-    {"<",   2,  INST_LT},
-    {">",   2,  INST_GT},
-    {"<=",  2,  INST_LE},
-    {">=",  2,  INST_GE},
-    {"==",  2,  INST_EQ},
-    {"!=",  2,  INST_NEQ},
-    {"&",   2,  INST_BITAND},
-    {"^",   2,  INST_BITXOR},
-    {"|",   2,  INST_BITOR},
-    {"&&",  0},
-    {"||",  0},
-    {"?",   0},
-    {"!",   1,  INST_LNOT},
-    {"~",   1,  INST_BITNOT},
-    {NULL}
-};
-
-/*
- * Hashtable used to map the names of expression operators to the index
- * of their OperatorDesc description.
- */
-
-static Tcl_HashTable opHashTable;
-
-/*
- * Declarations for local procedures to this file:
- */
-
-static int		CompileCondExpr _ANSI_ARGS_((
-			    Tcl_Token *exprTokenPtr, ExprInfo *infoPtr,
-			    CompileEnv *envPtr, Tcl_Token **endPtrPtr));
-static int		CompileLandOrLorExpr _ANSI_ARGS_((
-			    Tcl_Token *exprTokenPtr, int opIndex,
-			    ExprInfo *infoPtr, CompileEnv *envPtr,
-			    Tcl_Token **endPtrPtr));
-static int		CompileMathFuncCall _ANSI_ARGS_((
-			    Tcl_Token *exprTokenPtr, char *funcName,
-			    ExprInfo *infoPtr, CompileEnv *envPtr,
-			    Tcl_Token **endPtrPtr));
-static int		CompileSubExpr _ANSI_ARGS_((
-			    Tcl_Token *exprTokenPtr, ExprInfo *infoPtr,
-			    CompileEnv *envPtr));
-static void		LogSyntaxError _ANSI_ARGS_((ExprInfo *infoPtr));
-
-/*
- * Macro used to debug the execution of the expression compiler.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-#define TRACE(exprBytes, exprLength, tokenBytes, tokenLength) \
-    if (traceExprComp) { \
-	fprintf(stderr, "CompileSubExpr: \"%.*s\", token \"%.*s\"\n", \
-	        (exprLength), (exprBytes), (tokenLength), (tokenBytes)); \
-    }
-#else
-#define TRACE(exprBytes, exprLength, tokenBytes, tokenLength)
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileExpr --
- *
- *	This procedure compiles a string containing a Tcl expression into
- *	Tcl bytecodes. This procedure is the top-level interface to the
- *	the expression compilation module, and is used by such public
- *	procedures as Tcl_ExprString, Tcl_ExprStringObj, Tcl_ExprLong,
- *	Tcl_ExprDouble, Tcl_ExprBoolean, and Tcl_ExprBooleanObj.
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the expression.
- *
- *	envPtr->exprIsJustVarRef is set 1 if the expression consisted of
- *	a single variable reference as in the expression of "if $b then...".
- *	Otherwise it is set 0. This is used to implement Tcl's two level
- *	expression substitution semantics properly.
- *
- *	envPtr->exprIsComparison is set 1 if the top-level operator in the
- *	expr is a comparison. Otherwise it is set 0. If 1, because the
- *	operands might be strings, the expr is compiled out-of-line in order
- *	to implement expr's 2 level substitution semantics properly.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the expression at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileExpr(interp, script, numBytes, envPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *script;		/* The source script to compile. */
-    int numBytes;		/* Number of bytes in script. If < 0, the
-				 * string consists of all bytes up to the
-				 * first null character. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    ExprInfo info;
-    Tcl_Parse parse;
-    Tcl_HashEntry *hPtr;
-    int maxDepth, new, i, code;
-
-    /*
-     * If this is the first time we've been called, initialize the table
-     * of expression operators.
-     */
-
-    if (numBytes < 0) {
-	numBytes = (script? strlen(script) : 0);
-    }
-    if (!opTableInitialized) {
-	Tcl_MutexLock(&opMutex);
-	if (!opTableInitialized) {
-	    Tcl_InitHashTable(&opHashTable, TCL_STRING_KEYS);
-	    for (i = 0;  operatorTable[i].name != NULL;  i++) {
-		hPtr = Tcl_CreateHashEntry(&opHashTable,
-			operatorTable[i].name, &new);
-		if (new) {
-		    Tcl_SetHashValue(hPtr, (ClientData) i);
-		}
-	    }
-	    opTableInitialized = 1;
-	}
-	Tcl_MutexUnlock(&opMutex);
-    }
-
-    /*
-     * Initialize the structure containing information abvout this
-     * expression compilation.
-     */
-
-    info.interp = interp;
-    info.parsePtr = &parse;
-    info.expr = script;
-    info.lastChar = (script + numBytes); 
-    info.hasOperators = 0;
-    info.exprIsJustVarRef = 1;	/* will be set 0 if anything else is seen */
-    info.exprIsComparison = 0;
-
-    /*
-     * Parse the expression then compile it.
-     */
-
-    maxDepth = 0;
-    code = Tcl_ParseExpr(interp, script, numBytes, &parse);
-    if (code != TCL_OK) {
-	goto done;
-    }
-
-    code = CompileSubExpr(parse.tokenPtr, &info, envPtr);
-    if (code != TCL_OK) {
-	Tcl_FreeParse(&parse);
-	goto done;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    
-    if (!info.hasOperators) {
-	/*
-	 * Attempt to convert the primary's object to an int or double.
-	 * This is done in order to support Tcl's policy of interpreting
-	 * operands if at all possible as first integers, else
-	 * floating-point numbers.
-	 */
-	
-	TclEmitOpcode(INST_TRY_CVT_TO_NUMERIC, envPtr);
-    }
-    Tcl_FreeParse(&parse);
-
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    envPtr->exprIsJustVarRef = info.exprIsJustVarRef;
-    envPtr->exprIsComparison = info.exprIsComparison;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeCompilation --
- *
- *	Clean up the compilation environment so it can later be
- *	properly reinitialized. This procedure is called by
- *	TclFinalizeCompExecEnv() in tclObj.c, which in turn is called
- *	by Tcl_Finalize().
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Cleans up the compilation environment. At the moment, just the
- *	table of expression operators is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeCompilation()
-{
-    Tcl_MutexLock(&opMutex);
-    if (opTableInitialized) {
-        Tcl_DeleteHashTable(&opHashTable);
-        opTableInitialized = 0;
-    }
-    Tcl_MutexUnlock(&opMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CompileSubExpr --
- *
- *	Given a pointer to a TCL_TOKEN_SUB_EXPR token describing a
- *	subexpression, this procedure emits instructions to evaluate the
- *	subexpression at runtime.
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the subexpression.
- *
- *	envPtr->exprIsJustVarRef is set 1 if the subexpression consisted of
- *	a single variable reference as in the expression of "if $b then...".
- *	Otherwise it is set 0. This is used to implement Tcl's two level
- *	expression substitution semantics properly.
- *
- *	envPtr->exprIsComparison is set 1 if the top-level operator in the
- *	subexpression is a comparison. Otherwise it is set 0. If 1, because
- *	the operands might be strings, the expr is compiled out-of-line in
- *	order to implement expr's 2 level substitution semantics properly.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the subexpression.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CompileSubExpr(exprTokenPtr, infoPtr, envPtr)
-    Tcl_Token *exprTokenPtr;	/* Points to TCL_TOKEN_SUB_EXPR token
-				 * to compile. */
-    ExprInfo *infoPtr;		/* Describes the compilation state for the
-				 * expression being compiled. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Tcl_Interp *interp = infoPtr->interp;
-    Tcl_Token *tokenPtr, *endPtr, *afterSubexprPtr;
-    OperatorDesc *opDescPtr;
-    Tcl_HashEntry *hPtr;
-    char *operator;
-    char savedChar;
-    int maxDepth, objIndex, opIndex, length, code;
-    char buffer[TCL_UTF_MAX];
-
-    if (exprTokenPtr->type != TCL_TOKEN_SUB_EXPR) {
-	panic("CompileSubExpr: token type %d not TCL_TOKEN_SUB_EXPR\n",
-	        exprTokenPtr->type);
-    }
-    maxDepth = 0;
-    code = TCL_OK;
-
-    /*
-     * Switch on the type of the first token after the subexpression token.
-     * After processing it, advance tokenPtr to point just after the
-     * subexpression's last token.
-     */
-    
-    tokenPtr = exprTokenPtr+1;
-    TRACE(exprTokenPtr->start, exprTokenPtr->size,
-	    tokenPtr->start, tokenPtr->size);
-    switch (tokenPtr->type) {
-        case TCL_TOKEN_WORD:
-	    code = TclCompileTokens(interp, tokenPtr+1,
-	            tokenPtr->numComponents, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth = envPtr->maxStackDepth;
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    infoPtr->exprIsJustVarRef = 0;
-	    break;
-	    
-        case TCL_TOKEN_TEXT:
-	    if (tokenPtr->size > 0) {
-		objIndex = TclRegisterLiteral(envPtr, tokenPtr->start,
-	                tokenPtr->size, /*onHeap*/ 0);
-	    } else {
-		objIndex = TclRegisterLiteral(envPtr, "", 0, /*onHeap*/ 0);
-	    }
-	    TclEmitPush(objIndex, envPtr);
-	    maxDepth = 1;
-	    tokenPtr += 1;
-	    infoPtr->exprIsJustVarRef = 0;
-	    break;
-	    
-        case TCL_TOKEN_BS:
-	    length = Tcl_UtfBackslash(tokenPtr->start, (int *) NULL,
-		    buffer);
-	    if (length > 0) {
-		objIndex = TclRegisterLiteral(envPtr, buffer, length,
-	                /*onHeap*/ 0);
-	    } else {
-		objIndex = TclRegisterLiteral(envPtr, "", 0, /*onHeap*/ 0);
-	    }
-	    TclEmitPush(objIndex, envPtr);
-	    maxDepth = 1;
-	    tokenPtr += 1;
-	    infoPtr->exprIsJustVarRef = 0;
-	    break;
-	    
-        case TCL_TOKEN_COMMAND:
-	    code = TclCompileScript(interp, tokenPtr->start+1,
-		    tokenPtr->size-2, /*nested*/ 1, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth = envPtr->maxStackDepth;
-	    tokenPtr += 1;
-	    infoPtr->exprIsJustVarRef = 0;
-	    break;
-	    
-        case TCL_TOKEN_VARIABLE:
-	    code = TclCompileTokens(interp, tokenPtr, 1, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth = envPtr->maxStackDepth;
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    break;
-	    
-        case TCL_TOKEN_SUB_EXPR:
-	    infoPtr->exprIsComparison = 0;
-	    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    maxDepth = envPtr->maxStackDepth;
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    break;
-	    
-        case TCL_TOKEN_OPERATOR:
-	    /*
-	     * Look up the operator. Temporarily overwrite the character
-	     * just after the end of the operator with a 0 byte. If the
-	     * operator isn't found, treat it as a math function.
-	     */
-
-	    /*
-	     * TODO: Note that the string is modified in place.  This is unsafe
-	     * and will break if any of the routines called while the string is
-	     * modified have side effects that depend on the original string
-	     * being unmodified (e.g. adding an entry to the literal table).
-	     */
-
-	    operator = tokenPtr->start;
-	    savedChar = operator[tokenPtr->size];
-	    operator[tokenPtr->size] = 0;
-	    hPtr = Tcl_FindHashEntry(&opHashTable, operator);
-	    if (hPtr == NULL) {
-		code = CompileMathFuncCall(exprTokenPtr, operator, infoPtr,
-		        envPtr, &endPtr);
-		operator[tokenPtr->size] = (char) savedChar;
-		if (code != TCL_OK) {
-		    goto done;
-		}
-		maxDepth = envPtr->maxStackDepth;
-		tokenPtr = endPtr;
-		infoPtr->exprIsJustVarRef = 0;
-		infoPtr->exprIsComparison = 0;
-		break;
-	    }
-	    operator[tokenPtr->size] = (char) savedChar;
-	    opIndex = (int) Tcl_GetHashValue(hPtr);
-	    opDescPtr = &(operatorTable[opIndex]);
-
-	    /*
-	     * If the operator is "normal", compile it using information
-	     * from the operator table.
-	     */
-
-	    if (opDescPtr->numOperands > 0) {
-		tokenPtr++;
-		code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-		if (code != TCL_OK) {
-		    goto done;
-		}
-		maxDepth = envPtr->maxStackDepth;
-		tokenPtr += (tokenPtr->numComponents + 1);
-
-		if (opDescPtr->numOperands == 2) {
-		    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-		    if (code != TCL_OK) {
-			goto done;
-		    }
-		    maxDepth = TclMax((envPtr->maxStackDepth + 1),
-		            maxDepth);
-		    tokenPtr += (tokenPtr->numComponents + 1);
-		}
-		TclEmitOpcode(opDescPtr->instruction, envPtr);
-		infoPtr->hasOperators = 1;
-		infoPtr->exprIsJustVarRef = 0;
-		infoPtr->exprIsComparison =
-		        ((opIndex >= OP_LESS) && (opIndex <= OP_NEQ));
-		break;
-	    }
-	    
-	    /*
-	     * The operator requires special treatment, and is either
-	     * "+" or "-", or one of "&&", "||" or "?".
-	     */
-	    
-	    switch (opIndex) {
-	        case OP_PLUS:
-	        case OP_MINUS:
-		    tokenPtr++;
-		    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-		    if (code != TCL_OK) {
-			goto done;
-		    }
-		    maxDepth = envPtr->maxStackDepth;
-		    tokenPtr += (tokenPtr->numComponents + 1);
-		    
-		    /*
-		     * Check whether the "+" or "-" is unary.
-		     */
-		    
-		    afterSubexprPtr = exprTokenPtr
-			    + exprTokenPtr->numComponents+1;
-		    if (tokenPtr == afterSubexprPtr) {
-			TclEmitOpcode(((opIndex==OP_PLUS)?
-			        INST_UPLUS : INST_UMINUS),
-			        envPtr);
-			break;
-		    }
-		    
-		    /*
-		     * The "+" or "-" is binary.
-		     */
-		    
-		    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-		    if (code != TCL_OK) {
-			goto done;
-		    }
-		    maxDepth = TclMax((envPtr->maxStackDepth + 1),
-			    maxDepth);
-		    tokenPtr += (tokenPtr->numComponents + 1);
-		    TclEmitOpcode(((opIndex==OP_PLUS)? INST_ADD : INST_SUB),
-			    envPtr);
-		    break;
-
-	        case OP_LAND:
-	        case OP_LOR:
-		    code = CompileLandOrLorExpr(exprTokenPtr, opIndex,
-			    infoPtr, envPtr, &endPtr);
-		    if (code != TCL_OK) {
-			goto done;
-		    }
-		    maxDepth = envPtr->maxStackDepth;
-		    tokenPtr = endPtr;
-		    break;
-			
-	        case OP_QUESTY:
-		    code = CompileCondExpr(exprTokenPtr, infoPtr,
-			    envPtr, &endPtr);
-		    if (code != TCL_OK) {
-			goto done;
-		    }
-		    maxDepth = envPtr->maxStackDepth;
-		    tokenPtr = endPtr;
-		    break;
-		    
-		default:
-		    panic("CompileSubExpr: unexpected operator %d requiring special treatment\n",
-		        opIndex);
-	    } /* end switch on operator requiring special treatment */
-	    infoPtr->hasOperators = 1;
-	    infoPtr->exprIsJustVarRef = 0;
-	    infoPtr->exprIsComparison = 0;
-	    break;
-
-        default:
-	    panic("CompileSubExpr: unexpected token type %d\n",
-	            tokenPtr->type);
-    }
-
-    /*
-     * Verify that the subexpression token had the required number of
-     * subtokens: that we've advanced tokenPtr just beyond the
-     * subexpression's last token. For example, a "*" subexpression must
-     * contain the tokens for exactly two operands.
-     */
-    
-    if (tokenPtr != (exprTokenPtr + exprTokenPtr->numComponents+1)) {
-	LogSyntaxError(infoPtr);
-	code = TCL_ERROR;
-    }
-    
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CompileLandOrLorExpr --
- *
- *	This procedure compiles a Tcl logical and ("&&") or logical or
- *	("||") subexpression.
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_OK is returned, a pointer to the token just after
- *	the last one in the subexpression is stored at the address in
- *	endPtrPtr. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the expression.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the expression at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CompileLandOrLorExpr(exprTokenPtr, opIndex, infoPtr, envPtr, endPtrPtr)
-    Tcl_Token *exprTokenPtr;	 /* Points to TCL_TOKEN_SUB_EXPR token
-				  * containing the "&&" or "||" operator. */
-    int opIndex;		 /* A code describing the expression
-				  * operator: either OP_LAND or OP_LOR. */
-    ExprInfo *infoPtr;		 /* Describes the compilation state for the
-				  * expression being compiled. */
-    CompileEnv *envPtr;		 /* Holds resulting instructions. */
-    Tcl_Token **endPtrPtr;	 /* If successful, a pointer to the token
-				  * just after the last token in the
-				  * subexpression is stored here. */
-{
-    JumpFixup shortCircuitFixup; /* Used to fix up the short circuit jump
-				  * after the first subexpression. */
-    JumpFixup lhsTrueFixup, lhsEndFixup;
-    				 /* Used to fix up jumps used to convert the
-				  * first operand to 0 or 1. */
-    Tcl_Token *tokenPtr;
-    int dist, maxDepth, code;
-
-    /*
-     * Emit code for the first operand.
-     */
-
-    maxDepth = 0;
-    tokenPtr = exprTokenPtr+2;
-    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    tokenPtr += (tokenPtr->numComponents + 1);
-
-    /*
-     * Convert the first operand to the result that Tcl requires:
-     * "0" or "1". Eventually we'll use a new instruction for this.
-     */
-    
-    TclEmitForwardJump(envPtr, TCL_TRUE_JUMP, &lhsTrueFixup);
-    TclEmitPush(TclRegisterLiteral(envPtr, "0", 1, /*onHeap*/ 0), envPtr);
-    TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, &lhsEndFixup);
-    dist = (envPtr->codeNext - envPtr->codeStart) - lhsTrueFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &lhsTrueFixup, dist, 127)) {
-        badDist:
-	panic("CompileLandOrLorExpr: bad jump distance %d\n", dist);
-    }
-    TclEmitPush(TclRegisterLiteral(envPtr, "1", 1, /*onHeap*/ 0), envPtr);
-    dist = (envPtr->codeNext - envPtr->codeStart) - lhsEndFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &lhsEndFixup, dist, 127)) {
-	goto badDist;
-    }
-
-    /*
-     * Emit the "short circuit" jump around the rest of the expression.
-     * Duplicate the "0" or "1" on top of the stack first to keep the
-     * jump from consuming it.
-     */
-
-    TclEmitOpcode(INST_DUP, envPtr);
-    TclEmitForwardJump(envPtr,
-	    ((opIndex==OP_LAND)? TCL_FALSE_JUMP : TCL_TRUE_JUMP),
-	    &shortCircuitFixup);
-
-    /*
-     * Emit code for the second operand.
-     */
-
-    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    maxDepth = TclMax((envPtr->maxStackDepth + 1), maxDepth);
-    tokenPtr += (tokenPtr->numComponents + 1);
-
-    /*
-     * Emit a "logical and" or "logical or" instruction. This does not try
-     * to "short- circuit" the evaluation of both operands, but instead
-     * ensures that we either have a "1" or a "0" result.
-     */
-
-    TclEmitOpcode(((opIndex==OP_LAND)? INST_LAND : INST_LOR), envPtr);
-
-    /*
-     * Now that we know the target of the forward jump, update it with the
-     * correct distance.
-     */
-
-    dist = (envPtr->codeNext - envPtr->codeStart)
-	    - shortCircuitFixup.codeOffset;
-    TclFixupForwardJump(envPtr, &shortCircuitFixup, dist, 127);
-    *endPtrPtr = tokenPtr;
-
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CompileCondExpr --
- *
- *	This procedure compiles a Tcl conditional expression:
- *	condExpr ::= lorExpr ['?' condExpr ':' condExpr]
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_OK is returned, a pointer to the token just after
- *	the last one in the subexpression is stored at the address in
- *	endPtrPtr. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the expression.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the expression at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CompileCondExpr(exprTokenPtr, infoPtr, envPtr, endPtrPtr)
-    Tcl_Token *exprTokenPtr;	/* Points to TCL_TOKEN_SUB_EXPR token
-				 * containing the "?" operator. */
-    ExprInfo *infoPtr;		/* Describes the compilation state for the
-				 * expression being compiled. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-    Tcl_Token **endPtrPtr;	/* If successful, a pointer to the token
-				 * just after the last token in the
-				 * subexpression is stored here. */
-{
-    JumpFixup jumpAroundThenFixup, jumpAroundElseFixup;
-				/* Used to update or replace one-byte jumps
-				 * around the then and else expressions when
-				 * their target PCs are determined. */
-    Tcl_Token *tokenPtr;
-    int elseCodeOffset, dist, maxDepth, code;
-
-    /*
-     * Emit code for the test.
-     */
-
-    maxDepth = 0;
-    tokenPtr = exprTokenPtr+2;
-    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    maxDepth = envPtr->maxStackDepth;
-    tokenPtr += (tokenPtr->numComponents + 1);
-    
-    /*
-     * Emit the jump to the "else" expression if the test was false.
-     */
-    
-    TclEmitForwardJump(envPtr, TCL_FALSE_JUMP, &jumpAroundThenFixup);
-
-    /*
-     * Compile the "then" expression. Note that if a subexpression is only
-     * a primary, we need to try to convert it to numeric. We do this to
-     * support Tcl's policy of interpreting operands if at all possible as
-     * first integers, else floating-point numbers.
-     */
-
-    infoPtr->hasOperators = 0;
-    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    tokenPtr += (tokenPtr->numComponents + 1);
-    if (!infoPtr->hasOperators) {
-	TclEmitOpcode(INST_TRY_CVT_TO_NUMERIC, envPtr);
-    }
-
-    /*
-     * Emit an unconditional jump around the "else" condExpr.
-     */
-    
-    TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP,
-	    &jumpAroundElseFixup);
-
-    /*
-     * Compile the "else" expression.
-     */
-
-    elseCodeOffset = (envPtr->codeNext - envPtr->codeStart);
-    infoPtr->hasOperators = 0;
-    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-    if (code != TCL_OK) {
-	goto done;
-    }
-    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-    tokenPtr += (tokenPtr->numComponents + 1);
-    if (!infoPtr->hasOperators) {
-	TclEmitOpcode(INST_TRY_CVT_TO_NUMERIC, envPtr);
-    }
-
-    /*
-     * Fix up the second jump around the "else" expression.
-     */
-
-    dist = (envPtr->codeNext - envPtr->codeStart)
-	    - jumpAroundElseFixup.codeOffset;
-    if (TclFixupForwardJump(envPtr, &jumpAroundElseFixup, dist, 127)) {
-	/*
-	 * Update the else expression's starting code offset since it
-	 * moved down 3 bytes too.
-	 */
-	
-	elseCodeOffset += 3;
-    }
-	
-    /*
-     * Fix up the first jump to the "else" expression if the test was false.
-     */
-    
-    dist = (elseCodeOffset - jumpAroundThenFixup.codeOffset);
-    TclFixupForwardJump(envPtr, &jumpAroundThenFixup, dist, 127);
-    *endPtrPtr = tokenPtr;
-
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CompileMathFuncCall --
- *
- *	This procedure compiles a call on a math function in an expression:
- *	mathFuncCall ::= funcName '(' [condExpr {',' condExpr}] ')'
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_OK is returned, a pointer to the token just after
- *	the last one in the subexpression is stored at the address in
- *	endPtrPtr. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the function.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the math function at
- *	runtime.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CompileMathFuncCall(exprTokenPtr, funcName, infoPtr, envPtr, endPtrPtr)
-    Tcl_Token *exprTokenPtr;	/* Points to TCL_TOKEN_SUB_EXPR token
-				 * containing the math function call. */
-    char *funcName;		/* Name of the math function. */
-    ExprInfo *infoPtr;		/* Describes the compilation state for the
-				 * expression being compiled. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-    Tcl_Token **endPtrPtr;	/* If successful, a pointer to the token
-				 * just after the last token in the
-				 * subexpression is stored here. */
-{
-    Tcl_Interp *interp = infoPtr->interp;
-    Interp *iPtr = (Interp *) interp;
-    MathFunc *mathFuncPtr;
-    Tcl_HashEntry *hPtr;
-    Tcl_Token *tokenPtr, *afterSubexprPtr;
-    int maxDepth, code, i;
-
-    /*
-     * Look up the MathFunc record for the function.
-     */
-
-    code = TCL_OK;
-    maxDepth = 0;
-    hPtr = Tcl_FindHashEntry(&iPtr->mathFuncTable, funcName);
-    if (hPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"unknown math function \"", funcName, "\"", (char *) NULL);
-	code = TCL_ERROR;
-	goto done;
-    }
-    mathFuncPtr = (MathFunc *) Tcl_GetHashValue(hPtr);
-
-    /*
-     * If not a builtin function, push an object with the function's name.
-     */
-
-    if (mathFuncPtr->builtinFuncIndex < 0) {
-	TclEmitPush(TclRegisterLiteral(envPtr, funcName, -1, /*onHeap*/ 0),
-	        envPtr);
-	maxDepth = 1;
-    }
-
-    /*
-     * Compile any arguments for the function.
-     */
-
-    tokenPtr = exprTokenPtr+2;
-    afterSubexprPtr = exprTokenPtr + (exprTokenPtr->numComponents + 1);
-    if (mathFuncPtr->numArgs > 0) {
-	for (i = 0;  i < mathFuncPtr->numArgs;  i++) {
-	    if (tokenPtr == afterSubexprPtr) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		        "too few arguments for math function", -1);
-		code = TCL_ERROR;
-		goto done;
-	    }
-	    infoPtr->exprIsComparison = 0;
-	    code = CompileSubExpr(tokenPtr, infoPtr, envPtr);
-	    if (code != TCL_OK) {
-		goto done;
-	    }
-	    tokenPtr += (tokenPtr->numComponents + 1);
-	    maxDepth++;
-	}
-	if (tokenPtr != afterSubexprPtr) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "too many arguments for math function", -1);
-	    code = TCL_ERROR;
-	    goto done;
-	} 
-    } else if (tokenPtr != afterSubexprPtr) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"too many arguments for math function", -1);
-	code = TCL_ERROR;
-	goto done;
-    }
-    
-    /*
-     * Compile the call on the math function. Note that the "objc" argument
-     * count for non-builtin functions is incremented by 1 to include the
-     * function name itself.
-     */
-
-    if (mathFuncPtr->builtinFuncIndex >= 0) { /* a builtin function */
-	TclEmitInstInt1(INST_CALL_BUILTIN_FUNC1, 
-	        mathFuncPtr->builtinFuncIndex, envPtr);
-    } else {
-	TclEmitInstInt1(INST_CALL_FUNC1, (mathFuncPtr->numArgs+1), envPtr);
-    }
-    *endPtrPtr = afterSubexprPtr;
-
-    done:
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * LogSyntaxError --
- *
- *	This procedure is invoked after an error occurs when compiling an
- *	expression. It sets the interpreter result to an error message
- *	describing the error.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the interpreter result to an error message describing the
- *	expression that was being compiled when the error occurred.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-LogSyntaxError(infoPtr)
-    ExprInfo *infoPtr;		/* Describes the compilation state for the
-				 * expression being compiled. */
-{
-    int numBytes = (infoPtr->lastChar - infoPtr->expr);
-    char buffer[100];
-
-    sprintf(buffer, "syntax error in expression \"%.*s\"",
-	    ((numBytes > 60)? 60 : numBytes), infoPtr->expr);
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(infoPtr->interp),
-	    buffer, (char *) NULL);
-}
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
deleted file mode 100644
index 12b6cd4..0000000
--- a/generic/tclCompile.c
+++ /dev/null
@@ -1,3452 +0,0 @@
-/* 
- * tclCompile.c --
- *
- *	This file contains procedures that compile Tcl commands or parts
- *	of commands (like quoted strings or nested sub-commands) into a
- *	sequence of instructions ("bytecodes"). 
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCompile.c,v 1.14 1999/04/16 00:46:44 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * Table of all AuxData types.
- */
- 
-static Tcl_HashTable auxDataTypeTable;
-static int auxDataTypeTableInitialized; /* 0 means not yet initialized. */
-
-TCL_DECLARE_MUTEX(tableMutex)
-
-/*
- * Variable that controls whether compilation tracing is enabled and, if so,
- * what level of tracing is desired:
- *    0: no compilation tracing
- *    1: summarize compilation of top level cmds and proc bodies
- *    2: display all instructions of each ByteCode compiled
- * This variable is linked to the Tcl variable "tcl_traceCompile".
- */
-
-int tclTraceCompile = 0;
-static int traceInitialized = 0;
-
-/*
- * A table describing the Tcl bytecode instructions. Entries in this table
- * must correspond to the instruction opcode definitions in tclCompile.h.
- * The names "op1" and "op4" refer to an instruction's one or four byte
- * first operand. Similarly, "stktop" and "stknext" refer to the topmost
- * and next to topmost stack elements.
- *
- * Note that the load, store, and incr instructions do not distinguish local
- * from global variables; the bytecode interpreter at runtime uses the
- * existence of a procedure call frame to distinguish these.
- */
-
-InstructionDesc instructionTable[] = {
-   /* Name	      Bytes #Opnds Operand types        Stack top, next   */
-    {"done",	          1,   0,   {OPERAND_NONE}},
-        /* Finish ByteCode execution and return stktop (top stack item) */
-    {"push1",	          2,   1,   {OPERAND_UINT1}},
-        /* Push object at ByteCode objArray[op1] */
-    {"push4",	          5,   1,   {OPERAND_UINT4}},
-        /* Push object at ByteCode objArray[op4] */
-    {"pop",	          1,   0,   {OPERAND_NONE}},
-        /* Pop the topmost stack object */
-    {"dup",	          1,   0,   {OPERAND_NONE}},
-        /* Duplicate the topmost stack object and push the result */
-    {"concat1",	          2,   1,   {OPERAND_UINT1}},
-        /* Concatenate the top op1 items and push result */
-    {"invokeStk1",        2,   1,   {OPERAND_UINT1}},
-        /* Invoke command named objv[0]; <objc,objv> = <op1,top op1> */
-    {"invokeStk4",        5,   1,   {OPERAND_UINT4}},
-        /* Invoke command named objv[0]; <objc,objv> = <op4,top op4> */
-    {"evalStk",           1,   0,   {OPERAND_NONE}},
-        /* Evaluate command in stktop using Tcl_EvalObj. */
-    {"exprStk",           1,   0,   {OPERAND_NONE}},
-        /* Execute expression in stktop using Tcl_ExprStringObj. */
-    
-    {"loadScalar1",       2,   1,   {OPERAND_UINT1}},
-        /* Load scalar variable at index op1 <= 255 in call frame */
-    {"loadScalar4",       5,   1,   {OPERAND_UINT4}},
-        /* Load scalar variable at index op1 >= 256 in call frame */
-    {"loadScalarStk",     1,   0,   {OPERAND_NONE}},
-        /* Load scalar variable; scalar's name is stktop */
-    {"loadArray1",        2,   1,   {OPERAND_UINT1}},
-        /* Load array element; array at slot op1<=255, element is stktop */
-    {"loadArray4",        5,   1,   {OPERAND_UINT4}},
-        /* Load array element; array at slot op1 > 255, element is stktop */
-    {"loadArrayStk",      1,   0,   {OPERAND_NONE}},
-        /* Load array element; element is stktop, array name is stknext */
-    {"loadStk",           1,   0,   {OPERAND_NONE}},
-        /* Load general variable; unparsed variable name is stktop */
-    {"storeScalar1",      2,   1,   {OPERAND_UINT1}},
-        /* Store scalar variable at op1<=255 in frame; value is stktop */
-    {"storeScalar4",      5,   1,   {OPERAND_UINT4}},
-        /* Store scalar variable at op1 > 255 in frame; value is stktop */
-    {"storeScalarStk",    1,   0,   {OPERAND_NONE}},
-        /* Store scalar; value is stktop, scalar name is stknext */
-    {"storeArray1",       2,   1,   {OPERAND_UINT1}},
-        /* Store array element; array at op1<=255, value is top then elem */
-    {"storeArray4",       5,   1,   {OPERAND_UINT4}},
-        /* Store array element; array at op1>=256, value is top then elem */
-    {"storeArrayStk",     1,   0,   {OPERAND_NONE}},
-        /* Store array element; value is stktop, then elem, array names */
-    {"storeStk",          1,   0,   {OPERAND_NONE}},
-        /* Store general variable; value is stktop, then unparsed name */
-    
-    {"incrScalar1",       2,   1,   {OPERAND_UINT1}},
-        /* Incr scalar at index op1<=255 in frame; incr amount is stktop */
-    {"incrScalarStk",     1,   0,   {OPERAND_NONE}},
-        /* Incr scalar; incr amount is stktop, scalar's name is stknext */
-    {"incrArray1",        2,   1,   {OPERAND_UINT1}},
-        /* Incr array elem; arr at slot op1<=255, amount is top then elem */
-    {"incrArrayStk",      1,   0,   {OPERAND_NONE}},
-        /* Incr array element; amount is top then elem then array names */
-    {"incrStk",           1,   0,   {OPERAND_NONE}},
-        /* Incr general variable; amount is stktop then unparsed var name */
-    {"incrScalar1Imm",    3,   2,   {OPERAND_UINT1, OPERAND_INT1}},
-        /* Incr scalar at slot op1 <= 255; amount is 2nd operand byte */
-    {"incrScalarStkImm",  2,   1,   {OPERAND_INT1}},
-        /* Incr scalar; scalar name is stktop; incr amount is op1 */
-    {"incrArray1Imm",     3,   2,   {OPERAND_UINT1, OPERAND_INT1}},
-        /* Incr array elem; array at slot op1 <= 255, elem is stktop,
-	 * amount is 2nd operand byte */
-    {"incrArrayStkImm",   2,   1,   {OPERAND_INT1}},
-        /* Incr array element; elem is top then array name, amount is op1 */
-    {"incrStkImm",        2,   1,   {OPERAND_INT1}},
-        /* Incr general variable; unparsed name is top, amount is op1 */
-    
-    {"jump1",             2,   1,   {OPERAND_INT1}},
-        /* Jump relative to (pc + op1) */
-    {"jump4",             5,   1,   {OPERAND_INT4}},
-        /* Jump relative to (pc + op4) */
-    {"jumpTrue1",         2,   1,   {OPERAND_INT1}},
-        /* Jump relative to (pc + op1) if stktop expr object is true */
-    {"jumpTrue4",         5,   1,   {OPERAND_INT4}},
-        /* Jump relative to (pc + op4) if stktop expr object is true */
-    {"jumpFalse1",        2,   1,   {OPERAND_INT1}},
-        /* Jump relative to (pc + op1) if stktop expr object is false */
-    {"jumpFalse4",        5,   1,   {OPERAND_INT4}},
-        /* Jump relative to (pc + op4) if stktop expr object is false */
-
-    {"lor",               1,   0,   {OPERAND_NONE}},
-        /* Logical or:	push (stknext || stktop) */
-    {"land",              1,   0,   {OPERAND_NONE}},
-        /* Logical and:	push (stknext && stktop) */
-    {"bitor",             1,   0,   {OPERAND_NONE}},
-        /* Bitwise or:	push (stknext | stktop) */
-    {"bitxor",            1,   0,   {OPERAND_NONE}},
-        /* Bitwise xor	push (stknext ^ stktop) */
-    {"bitand",            1,   0,   {OPERAND_NONE}},
-        /* Bitwise and:	push (stknext & stktop) */
-    {"eq",                1,   0,   {OPERAND_NONE}},
-        /* Equal:	push (stknext == stktop) */
-    {"neq",               1,   0,   {OPERAND_NONE}},
-        /* Not equal:	push (stknext != stktop) */
-    {"lt",                1,   0,   {OPERAND_NONE}},
-        /* Less:	push (stknext < stktop) */
-    {"gt",                1,   0,   {OPERAND_NONE}},
-        /* Greater:	push (stknext || stktop) */
-    {"le",                1,   0,   {OPERAND_NONE}},
-        /* Logical or:	push (stknext || stktop) */
-    {"ge",                1,   0,   {OPERAND_NONE}},
-        /* Logical or:	push (stknext || stktop) */
-    {"lshift",            1,   0,   {OPERAND_NONE}},
-        /* Left shift:	push (stknext << stktop) */
-    {"rshift",            1,   0,   {OPERAND_NONE}},
-        /* Right shift:	push (stknext >> stktop) */
-    {"add",               1,   0,   {OPERAND_NONE}},
-        /* Add:		push (stknext + stktop) */
-    {"sub",               1,   0,   {OPERAND_NONE}},
-        /* Sub:		push (stkext - stktop) */
-    {"mult",              1,   0,   {OPERAND_NONE}},
-        /* Multiply:	push (stknext * stktop) */
-    {"div",               1,   0,   {OPERAND_NONE}},
-        /* Divide:	push (stknext / stktop) */
-    {"mod",               1,   0,   {OPERAND_NONE}},
-        /* Mod:		push (stknext % stktop) */
-    {"uplus",             1,   0,   {OPERAND_NONE}},
-        /* Unary plus:	push +stktop */
-    {"uminus",            1,   0,   {OPERAND_NONE}},
-        /* Unary minus:	push -stktop */
-    {"bitnot",            1,   0,   {OPERAND_NONE}},
-        /* Bitwise not:	push ~stktop */
-    {"not",               1,   0,   {OPERAND_NONE}},
-        /* Logical not:	push !stktop */
-    {"callBuiltinFunc1",  2,   1,   {OPERAND_UINT1}},
-        /* Call builtin math function with index op1; any args are on stk */
-    {"callFunc1",         2,   1,   {OPERAND_UINT1}},
-        /* Call non-builtin func objv[0]; <objc,objv>=<op1,top op1>  */
-    {"tryCvtToNumeric",   1,   0,   {OPERAND_NONE}},
-        /* Try converting stktop to first int then double if possible. */
-
-    {"break",             1,   0,   {OPERAND_NONE}},
-        /* Abort closest enclosing loop; if none, return TCL_BREAK code. */
-    {"continue",          1,   0,   {OPERAND_NONE}},
-        /* Skip to next iteration of closest enclosing loop; if none,
-	 * return TCL_CONTINUE code. */
-
-    {"foreach_start4",    5,   1,   {OPERAND_UINT4}},
-        /* Initialize execution of a foreach loop. Operand is aux data index
-	 * of the ForeachInfo structure for the foreach command. */
-    {"foreach_step4",     5,   1,   {OPERAND_UINT4}},
-        /* "Step" or begin next iteration of foreach loop. Push 0 if to
-	 *  terminate loop, else push 1. */
-
-    {"beginCatch4",	  5,   1,   {OPERAND_UINT4}},
-        /* Record start of catch with the operand's exception index.
-	 * Push the current stack depth onto a special catch stack. */
-    {"endCatch",	  1,   0,   {OPERAND_NONE}},
-        /* End of last catch. Pop the bytecode interpreter's catch stack. */
-    {"pushResult",	  1,   0,   {OPERAND_NONE}},
-        /* Push the interpreter's object result onto the stack. */
-    {"pushReturnCode",	  1,   0,   {OPERAND_NONE}},
-        /* Push interpreter's return code (e.g. TCL_OK or TCL_ERROR) as
-	 * a new object onto the stack. */
-    {0}
-};
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static void		DupByteCodeInternalRep _ANSI_ARGS_((Tcl_Obj *srcPtr,
-			    Tcl_Obj *copyPtr));
-static unsigned char *	EncodeCmdLocMap _ANSI_ARGS_((
-			    CompileEnv *envPtr, ByteCode *codePtr,
-			    unsigned char *startPtr));
-static void		EnterCmdExtentData _ANSI_ARGS_((
-    			    CompileEnv *envPtr, int cmdNumber,
-			    int numSrcBytes, int numCodeBytes));
-static void		EnterCmdStartData _ANSI_ARGS_((
-    			    CompileEnv *envPtr, int cmdNumber,
-			    int srcOffset, int codeOffset));
-static void		FreeByteCodeInternalRep _ANSI_ARGS_((
-    			    Tcl_Obj *objPtr));
-static int		GetCmdLocEncodingSize _ANSI_ARGS_((
-			    CompileEnv *envPtr));
-static void		LogCompilationInfo _ANSI_ARGS_((Tcl_Interp *interp,
-        		    char *script, char *command, int length));
-#ifdef TCL_COMPILE_STATS
-static void		RecordByteCodeStats _ANSI_ARGS_((
-			    ByteCode *codePtr));
-#endif /* TCL_COMPILE_STATS */
-static int		SetByteCodeFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-
-/*
- * The structure below defines the bytecode Tcl object type by
- * means of procedures that can be invoked by generic object code.
- */
-
-Tcl_ObjType tclByteCodeType = {
-    "bytecode",				/* name */
-    FreeByteCodeInternalRep,		/* freeIntRepProc */
-    DupByteCodeInternalRep,		/* dupIntRepProc */
-    (Tcl_UpdateStringProc *) NULL,	/* updateStringProc */
-    SetByteCodeFromAny			/* setFromAnyProc */
-};
-
-/*
- *-----------------------------------------------------------------------
- *
- * SetByteCodeFromAny --
- *
- *	Part of the bytecode Tcl object type implementation. Attempts to
- *	generate an byte code internal form for the Tcl object "objPtr" by
- *	compiling its string representation.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during compilation, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	Frees the old internal representation. If no error occurs, then the
- *	compiled code is stored as "objPtr"s bytecode representation.
- *	Also, if debugging, initializes the "tcl_traceCompile" Tcl variable
- *	used to trace compilations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetByteCodeFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* The interpreter for which the code is
-				 * being compiled.  Must not be NULL. */
-    Tcl_Obj *objPtr;		/* The object to make a ByteCode object. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CompileEnv compEnv;		/* Compilation environment structure
-				 * allocated in frame. */
-    LiteralTable *localTablePtr = &(compEnv.localLitTable);
-    register AuxData *auxDataPtr;
-    LiteralEntry *entryPtr;
-    register int i;
-    int length, nested, result;
-    char *string;
-
-    if (!traceInitialized) {
-        if (Tcl_LinkVar(interp, "tcl_traceCompile",
-	            (char *) &tclTraceCompile,  TCL_LINK_INT) != TCL_OK) {
-            panic("SetByteCodeFromAny: unable to create link for tcl_traceCompile variable");
-        }
-        traceInitialized = 1;
-    }
-
-    if (iPtr->evalFlags & TCL_BRACKET_TERM) {
-	nested = 1;
-    } else {
-	nested = 0;
-    }
-    string = Tcl_GetStringFromObj(objPtr, &length);
-    TclInitCompileEnv(interp, &compEnv, string, length);
-    result = TclCompileScript(interp, string, length, nested, &compEnv);
-    if (result != TCL_OK) {
-	/*
-	 * Compilation errors. 
-	 */
-
-	entryPtr = compEnv.literalArrayPtr;
-	for (i = 0;  i < compEnv.literalArrayNext;  i++) {
-	    TclReleaseLiteral(interp, entryPtr->objPtr);
-	    entryPtr++;
-	}
-#ifdef TCL_COMPILE_DEBUG
-	TclVerifyGlobalLiteralTable(iPtr);
-#endif /*TCL_COMPILE_DEBUG*/
-
-	auxDataPtr = compEnv.auxDataArrayPtr;
-	for (i = 0;  i < compEnv.auxDataArrayNext;  i++) {
-	    if (auxDataPtr->type->freeProc != NULL) {
-		auxDataPtr->type->freeProc(auxDataPtr->clientData);
-	    }
-	    auxDataPtr++;
-	}
-	goto done;
-    }
-
-    /*
-     * Successful compilation. Add a "done" instruction at the end.
-     */
-
-    compEnv.numSrcBytes = iPtr->termOffset;
-    TclEmitOpcode(INST_DONE, &compEnv);
-
-    /*
-     * Change the object into a ByteCode object. Ownership of the literal
-     * objects and aux data items is given to the ByteCode object.
-     */
-    
-#ifdef TCL_COMPILE_DEBUG
-    TclVerifyLocalLiteralTable(&compEnv);
-#endif /*TCL_COMPILE_DEBUG*/    
-    TclInitByteCodeObj(objPtr, &compEnv);
-#ifdef TCL_COMPILE_DEBUG
-    if (tclTraceCompile == 2) {
-	TclPrintByteCodeObj(interp, objPtr);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-
-    /*
-     * Free storage allocated during compilation.
-     */
-    
-    done:
-    if (localTablePtr->buckets != localTablePtr->staticBuckets) {
-	ckfree((char *) localTablePtr->buckets);
-    }
-    TclFreeCompileEnv(&compEnv);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupByteCodeInternalRep --
- *
- *	Part of the bytecode Tcl object type implementation. However, it
- *	does not copy the internal representation of a bytecode Tcl_Obj, but
- *	instead leaves the new object untyped (with a NULL type pointer).
- *	Code will be compiled for the new object only if necessary.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupByteCodeInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;		/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr;		/* Object with internal rep to set. */
-{
-    return;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeByteCodeInternalRep --
- *
- *	Part of the bytecode Tcl object type implementation. Frees the
- *	storage associated with a bytecode object's internal representation
- *	unless its code is actively being executed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The bytecode object's internal rep is marked invalid and its
- *	code gets freed unless the code is actively being executed.
- *	In that case the cleanup is delayed until the last execution
- *	of the code completes.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeByteCodeInternalRep(objPtr)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to free. */
-{
-    register ByteCode *codePtr =
-	    (ByteCode *) objPtr->internalRep.otherValuePtr;
-
-    codePtr->refCount--;
-    if (codePtr->refCount <= 0) {
-	TclCleanupByteCode(codePtr);
-    }
-    objPtr->typePtr = NULL;
-    objPtr->internalRep.otherValuePtr = NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCleanupByteCode --
- *
- *	This procedure does all the real work of freeing up a bytecode
- *	object's ByteCode structure. It's called only when the structure's
- *	reference count becomes zero.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees objPtr's bytecode internal representation and sets its type
- *	and objPtr->internalRep.otherValuePtr NULL. Also releases its
- *	literals and frees its auxiliary data items.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclCleanupByteCode(codePtr)
-    register ByteCode *codePtr;	/* Points to the ByteCode to free. */
-{
-    Tcl_Interp *interp = (Tcl_Interp *) *codePtr->interpHandle;
-    int numLitObjects = codePtr->numLitObjects;
-    int numAuxDataItems = codePtr->numAuxDataItems;
-    register Tcl_Obj **objArrayPtr;
-    register AuxData *auxDataPtr;
-    int i;
-#ifdef TCL_COMPILE_STATS
-
-    if (interp != NULL) {
-	ByteCodeStats *statsPtr;
-	Tcl_Time destroyTime;
-	int lifetimeSec, lifetimeMicroSec, log2;
-
-	statsPtr = &((Interp *) interp)->stats;
-
-	statsPtr->numByteCodesFreed++;
-	statsPtr->currentSrcBytes -= (double) codePtr->numSrcBytes;
-	statsPtr->currentByteCodeBytes -= (double) codePtr->structureSize;
-
-	statsPtr->currentInstBytes   -= (double) codePtr->numCodeBytes;
-	statsPtr->currentLitBytes    -=
-		(double) (codePtr->numLitObjects * sizeof(Tcl_Obj *)); 
-	statsPtr->currentExceptBytes -=
-		(double) (codePtr->numExceptRanges * sizeof(ExceptionRange));
-	statsPtr->currentAuxBytes    -=
-		(double) (codePtr->numAuxDataItems * sizeof(AuxData));
-	statsPtr->currentCmdMapBytes -= (double) codePtr->numCmdLocBytes;
-
-	TclpGetTime(&destroyTime);
-	lifetimeSec = destroyTime.sec - codePtr->createTime.sec;
-	if (lifetimeSec > 2000) {	/* avoid overflow */
-	    lifetimeSec = 2000;
-	}
-	lifetimeMicroSec =
-	    1000000*lifetimeSec + (destroyTime.usec - codePtr->createTime.usec);
-	
-	log2 = TclLog2(lifetimeMicroSec);
-	if (log2 > 31) {
-	    log2 = 31;
-	}
-	statsPtr->lifetimeCount[log2]++;
-    }
-#endif /* TCL_COMPILE_STATS */
-
-    /*
-     * A single heap object holds the ByteCode structure and its code,
-     * object, command location, and auxiliary data arrays. This means we
-     * only need to 1) decrement the ref counts of the LiteralEntry's in
-     * its literal array, 2) call the free procs for the auxiliary data
-     * items, and 3) free the ByteCode structure's heap object.
-     */
-
-    if (interp != NULL) {
-	/*
-	 * If the interp has already been freed, then Tcl will have already 
-	 * forcefully released all the literals used by ByteCodes compiled
-	 * with respect to that interp.
-	 */
-	 
-	objArrayPtr = codePtr->objArrayPtr;
-	for (i = 0;  i < numLitObjects;  i++) {
-	    /*
-	     * TclReleaseLiteral sets a ByteCode's object array entry NULL to
-	     * indicate that it has already freed the literal.
-	     */
-	    
-	    if (*objArrayPtr != NULL) {
-		TclReleaseLiteral(interp, *objArrayPtr);
-	    }
-	    objArrayPtr++;
-	}
-    }
-    
-    auxDataPtr = codePtr->auxDataArrayPtr;
-    for (i = 0;  i < numAuxDataItems;  i++) {
-	if (auxDataPtr->type->freeProc != NULL) {
-	    (*auxDataPtr->type->freeProc)(auxDataPtr->clientData);
-	}
-	auxDataPtr++;
-    }
-
-    TclHandleRelease(codePtr->interpHandle);
-    ckfree((char *) codePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitCompileEnv --
- *
- *	Initializes a CompileEnv compilation environment structure for the
- *	compilation of a string in an interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The CompileEnv structure is initialized.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitCompileEnv(interp, envPtr, string, numBytes)
-    Tcl_Interp *interp;		 /* The interpreter for which a CompileEnv
-				  * structure is initialized. */
-    register CompileEnv *envPtr; /* Points to the CompileEnv structure to
-				  * initialize. */
-    char *string;		 /* The source string to be compiled. */
-    int numBytes;		 /* Number of bytes in source string. */
-{
-    Interp *iPtr = (Interp *) interp;
-    
-    envPtr->iPtr = iPtr;
-    envPtr->source = string;
-    envPtr->numSrcBytes = numBytes;
-    envPtr->procPtr = iPtr->compiledProcPtr;
-    envPtr->numCommands = 0;
-    envPtr->exceptDepth = 0;
-    envPtr->maxExceptDepth = 0;
-    envPtr->maxStackDepth = 0;
-    TclInitLiteralTable(&(envPtr->localLitTable));
-    envPtr->exprIsJustVarRef = 0;
-    envPtr->exprIsComparison = 0;
-
-    envPtr->codeStart = envPtr->staticCodeSpace;
-    envPtr->codeNext = envPtr->codeStart;
-    envPtr->codeEnd = (envPtr->codeStart + COMPILEENV_INIT_CODE_BYTES);
-    envPtr->mallocedCodeArray = 0;
-
-    envPtr->literalArrayPtr = envPtr->staticLiteralSpace;
-    envPtr->literalArrayNext = 0;
-    envPtr->literalArrayEnd = COMPILEENV_INIT_NUM_OBJECTS;
-    envPtr->mallocedLiteralArray = 0;
-    
-    envPtr->exceptArrayPtr = envPtr->staticExceptArraySpace;
-    envPtr->exceptArrayNext = 0;
-    envPtr->exceptArrayEnd = COMPILEENV_INIT_EXCEPT_RANGES;
-    envPtr->mallocedExceptArray = 0;
-    
-    envPtr->cmdMapPtr = envPtr->staticCmdMapSpace;
-    envPtr->cmdMapEnd = COMPILEENV_INIT_CMD_MAP_SIZE;
-    envPtr->mallocedCmdMap = 0;
-    
-    envPtr->auxDataArrayPtr = envPtr->staticAuxDataArraySpace;
-    envPtr->auxDataArrayNext = 0;
-    envPtr->auxDataArrayEnd = COMPILEENV_INIT_AUX_DATA_SIZE;
-    envPtr->mallocedAuxDataArray = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFreeCompileEnv --
- *
- *	Free the storage allocated in a CompileEnv compilation environment
- *	structure.
- *
- * Results:
- *	None.
- * 
- * Side effects:
- *	Allocated storage in the CompileEnv structure is freed. Note that
- *	its local literal table is not deleted and its literal objects are
- *	not released. In addition, storage referenced by its auxiliary data
- *	items is not freed. This is done so that, when compilation is
- *	successful, "ownership" of these objects and aux data items is
- *	handed over to the corresponding ByteCode structure.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFreeCompileEnv(envPtr)
-    register CompileEnv *envPtr; /* Points to the CompileEnv structure. */
-{
-    if (envPtr->mallocedCodeArray) {
-	ckfree((char *) envPtr->codeStart);
-    }
-    if (envPtr->mallocedLiteralArray) {
-	ckfree((char *) envPtr->literalArrayPtr);
-    }
-    if (envPtr->mallocedExceptArray) {
-	ckfree((char *) envPtr->exceptArrayPtr);
-    }
-    if (envPtr->mallocedCmdMap) {
-	ckfree((char *) envPtr->cmdMapPtr);
-    }
-    if (envPtr->mallocedAuxDataArray) {
-	ckfree((char *) envPtr->auxDataArrayPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileScript --
- *
- *	Compile a Tcl script in a string.
- *
- * Results:
- *	The return value is TCL_OK on a successful compilation and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- *	interp->termOffset is set to the offset of the character in the
- *	script just after the last one successfully processed; this will be
- *	the offset of the ']' if (flags & TCL_BRACKET_TERM).
- *	envPtr->maxStackDepth is set to the maximum number of stack elements
- *	needed to execute the script's commands.
- *
- * Side effects:
- *	Adds instructions to envPtr to evaluate the script at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileScript(interp, script, numBytes, nested, envPtr)
-    Tcl_Interp *interp;		/* Used for error and status reporting. */
-    char *script;		/* The source script to compile. */
-    int numBytes;		/* Number of bytes in script. If < 0, the
-				 * script consists of all bytes up to the
-				 * first null character. */
-    int nested;			/* Non-zero means this is a nested command:
-				 * close bracket ']' should be considered a
-				 * command terminator. If zero, close
-				 * bracket has no special meaning. */
-    CompileEnv *envPtr;		/* Holds resulting instructions. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_Parse parse;
-    int maxDepth = 0;		/* Maximum number of stack elements needed
-				 * to execute all cmds. */
-    int lastTopLevelCmdIndex = -1;
-    				/* Index of most recent toplevel command in
- 				 * the command location table. Initialized
-				 * to avoid compiler warning. */
-    int startCodeOffset = -1;	/* Offset of first byte of current command's
-                                 * code. Init. to avoid compiler warning. */
-    unsigned char *entryCodeNext = envPtr->codeNext;
-    char *p, *next;
-    Namespace *cmdNsPtr;
-    Command *cmdPtr;
-    Tcl_Token *tokenPtr;
-    int bytesLeft, isFirstCmd, gotParse, wordIdx, currCmdIndex;
-    int commandLength, objIndex, code;
-    char prev;
-    Tcl_DString ds;
-
-    Tcl_DStringInit(&ds);
-
-    if (numBytes < 0) {
-	numBytes = strlen(script);
-    }
-    Tcl_ResetResult(interp);
-    isFirstCmd = 1;
-
-    /*
-     * Each iteration through the following loop compiles the next
-     * command from the script.
-     */
-
-    p = script;
-    bytesLeft = numBytes;
-    gotParse = 0;
-    while (bytesLeft > 0) {
-	if (Tcl_ParseCommand(interp, p, bytesLeft, nested, &parse) != TCL_OK) {
-	    code = TCL_ERROR;
-	    goto error;
-	}
-	gotParse = 1;
-	if (parse.numWords > 0) {
-	    /*
-	     * If not the first command, pop the previous command's result
-	     * and, if we're compiling a top level command, update the last
-	     * command's code size to account for the pop instruction.
-	     */
-
-	    if (!isFirstCmd) {
-		TclEmitOpcode(INST_POP, envPtr);
-		if (!nested) {
-		    envPtr->cmdMapPtr[lastTopLevelCmdIndex].numCodeBytes =
-			   (envPtr->codeNext - envPtr->codeStart)
-			   - startCodeOffset;
-		}
-	    }
-
-	    /*
-	     * Determine the actual length of the command.
-	     */
-
-	    commandLength = parse.commandSize;
-	    prev = '\0';
-	    if (commandLength > 0) {
-		prev = parse.commandStart[commandLength-1];
-	    }
-	    if (((parse.commandStart+commandLength) != (script+numBytes))
-	            || ((prev=='\n') || (nested && (prev==']')))) {
-		/*
-		 * The command didn't end at the end of the script (i.e.  it
-		 * ended at a terminator character such as ";".  Reduce the
-		 * length by one so that the trace message doesn't include
-		 * the terminator character.
-		 */
-		
-		commandLength -= 1;
-	    }
-
-	    /*
-             * If tracing, print a line for each top level command compiled.
-             */
-
-	    if ((tclTraceCompile >= 1)
-		    && !nested && (envPtr->procPtr == NULL)) {
-		fprintf(stdout, "  Compiling: ");
-		TclPrintSource(stdout, parse.commandStart,
-			TclMin(commandLength, 55));
-		fprintf(stdout, "\n");
-	    }
-
-	    /*
-	     * Each iteration of the following loop compiles one word
-	     * from the command.
-	     */
-	    
-	    envPtr->numCommands++;
-	    currCmdIndex = (envPtr->numCommands - 1);
-	    if (!nested) {
-		lastTopLevelCmdIndex = currCmdIndex;
-	    }
-	    startCodeOffset = (envPtr->codeNext - envPtr->codeStart);
-	    EnterCmdStartData(envPtr, currCmdIndex,
-	            (parse.commandStart - envPtr->source), startCodeOffset);
-	    
-	    for (wordIdx = 0, tokenPtr = parse.tokenPtr;
-		    wordIdx < parse.numWords;
-		    wordIdx++, tokenPtr += (tokenPtr->numComponents + 1)) {
-		if (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
-		    /*
-		     * If this is the first word and the command has a
-		     * compile procedure, let it compile the command.
-		     */
-
-		    if (wordIdx == 0) {
-			if (envPtr->procPtr != NULL) {
-			    cmdNsPtr = envPtr->procPtr->cmdPtr->nsPtr;
-			} else {
-			    cmdNsPtr = NULL; /* use current NS */
-			}
-
-			/*
-			 * We copy the string before trying to find the command
-			 * by name.  We used to modify the string in place, but
-			 * this is not safe because the name resolution
-			 * handlers could have side effects that rely on the
-			 * unmodified string.
-			 */
-
-			Tcl_DStringSetLength(&ds, 0);
-			Tcl_DStringAppend(&ds, tokenPtr[1].start,
-				tokenPtr[1].size);
-
-			cmdPtr = (Command *) Tcl_FindCommand(interp,
-				Tcl_DStringValue(&ds),
-			        (Tcl_Namespace *) cmdNsPtr, /*flags*/ 0);
-
-			if ((cmdPtr != NULL)
-			        && (cmdPtr->compileProc != NULL)
-			        && !(iPtr->flags & DONT_COMPILE_CMDS_INLINE)) {
-			    code = (*(cmdPtr->compileProc))(interp, &parse,
-			            envPtr);
-			    if (code == TCL_OK) {
-				maxDepth = TclMax(envPtr->maxStackDepth,
-			                maxDepth);
-				goto finishCommand;
-			    } else if (code == TCL_OUT_LINE_COMPILE) {
-				/* do nothing */
-			    } else { /* an error */
-				goto error;
-			    }
-			}
-
-			/*
-			 * No compile procedure so push the word. If the
-			 * command was found, push a CmdName object to
-			 * reduce runtime lookups.
-			 */
-
-			objIndex = TclRegisterLiteral(envPtr,
-				tokenPtr[1].start, tokenPtr[1].size,
-				/*onHeap*/ 0);
-			if (cmdPtr != NULL) {
-			    TclSetCmdNameObj(interp,
-			           envPtr->literalArrayPtr[objIndex].objPtr,
-				   cmdPtr);
-			}
-		    } else {
-			objIndex = TclRegisterLiteral(envPtr,
-				tokenPtr[1].start, tokenPtr[1].size,
-				/*onHeap*/ 0);
-		    }
-		    TclEmitPush(objIndex, envPtr);
-		    maxDepth = TclMax((wordIdx + 1), maxDepth);
-		} else {
-		    /*
-		     * The word is not a simple string of characters.
-		     */
-		    
-		    code = TclCompileTokens(interp, tokenPtr+1,
-			    tokenPtr->numComponents, envPtr);
-		    if (code != TCL_OK) {
-			goto error;
-		    }
-		    maxDepth = TclMax((wordIdx + envPtr->maxStackDepth),
-			   maxDepth);
-		}
-	    }
-
-	    /*
-	     * Emit an invoke instruction for the command. We skip this
-	     * if a compile procedure was found for the command.
-	     */
-	    
-	    if (wordIdx > 0) {
-		if (wordIdx <= 255) {
-		    TclEmitInstInt1(INST_INVOKE_STK1, wordIdx, envPtr);
-		} else {
-		    TclEmitInstInt4(INST_INVOKE_STK4, wordIdx, envPtr);
-		}
-	    }
-
-	    /*
-	     * Update the compilation environment structure and record the
-	     * offsets of the source and code for the command.
-	     */
-
-	    finishCommand:
-	    EnterCmdExtentData(envPtr, currCmdIndex, commandLength,
-		    (envPtr->codeNext-envPtr->codeStart) - startCodeOffset);
-	    isFirstCmd = 0;
-	} /* end if parse.numWords > 0 */
-
-	/*
-	 * Advance to the next command in the script.
-	 */
-	
-	next = parse.commandStart + parse.commandSize;
-	bytesLeft -= (next - p);
-	p = next;
-	Tcl_FreeParse(&parse);
-	gotParse = 0;
-	if (nested && (p[-1] == ']')) {
-	    /*
-	     * We get here in the special case where TCL_BRACKET_TERM was
-	     * set in the interpreter and we reached a close bracket in the
-	     * script. Stop compilation.
-	     */
-	    
-	    break;
-	}
-    }
-
-    /*
-     * If the source script yielded no instructions (e.g., if it was empty),
-     * push an empty string as the command's result.
-     */
-    
-    if (envPtr->codeNext == entryCodeNext) {
-	TclEmitPush(TclRegisterLiteral(envPtr, "", 0, /*alreadyAlloced*/ 0),
-	        envPtr);
-	maxDepth = 1;
-    }
-    
-    if ((nested != 0) && (p > script) && (p[-1] == ']')) {
-	iPtr->termOffset = (p - 1) - script;
-    } else {
-	iPtr->termOffset = (p - script);
-    }
-    envPtr->maxStackDepth = maxDepth;
-    Tcl_DStringFree(&ds);
-    return TCL_OK;
-	
-    error:
-    /*
-     * Generate various pieces of error information, such as the line
-     * number where the error occurred and information to add to the
-     * errorInfo variable. Then free resources that had been allocated
-     * to the command.
-     */
-
-    commandLength = parse.commandSize;
-    prev = '\0';
-    if (commandLength > 0) {
-	prev = parse.commandStart[commandLength-1];
-    }
-    if (((parse.commandStart+commandLength) != (script+numBytes))
-	    || ((prev == '\n') || (nested && (prev == ']')))) {
-	/*
-	 * The command where the error occurred didn't end at the end
-	 * of the script (i.e. it ended at a terminator character such
-	 * as ";".  Reduce the length by one so that the error message
-	 * doesn't include the terminator character.
-	 */
-
-	commandLength -= 1;
-    }
-    LogCompilationInfo(interp, script, parse.commandStart, commandLength);
-    if (gotParse) {
-	Tcl_FreeParse(&parse);
-    }
-    iPtr->termOffset = (p - script);
-    envPtr->maxStackDepth = maxDepth;
-    Tcl_DStringFree(&ds);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileTokens --
- *
- *	Given an array of tokens parsed from a Tcl command (e.g., the tokens
- *	that make up a word) this procedure emits instructions to evaluate
- *	the tokens and concatenate their values to form a single result
- *	value on the interpreter's runtime evaluation stack.
- *
- * Results:
- *	The return value is a standard Tcl result. If an error occurs, an
- *	error message is left in the interpreter's result.
- *	
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to evaluate the tokens.
- *
- * Side effects:
- *	Instructions are added to envPtr to push and evaluate the tokens
- *	at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileTokens(interp, tokenPtr, count, envPtr)
-    Tcl_Interp *interp;		/* Used for error and status reporting. */
-    Tcl_Token *tokenPtr;	/* Pointer to first in an array of tokens
-				 * to compile. */
-    int count;			/* Number of tokens to consider at tokenPtr.
-				 * Must be at least 1. */
-    CompileEnv *envPtr;		/* Holds the resulting instructions. */
-{
-    Tcl_DString textBuffer;	/* Holds concatenated chars from adjacent
-				 * TCL_TOKEN_TEXT, TCL_TOKEN_BS tokens. */
-    char buffer[TCL_UTF_MAX];
-    char *name, *p;
-    int numObjsToConcat, nameBytes, hasNsQualifiers, localVar;
-    int length, maxDepth, depthForVar, i, code;
-    unsigned char *entryCodeNext = envPtr->codeNext;
-
-    Tcl_DStringInit(&textBuffer);
-    maxDepth = 0;
-    numObjsToConcat = 0;
-    for ( ;  count > 0;  count--, tokenPtr++) {
-	switch (tokenPtr->type) {
-	    case TCL_TOKEN_TEXT:
-		Tcl_DStringAppend(&textBuffer, tokenPtr->start,
-			tokenPtr->size);
-		break;
-
-	    case TCL_TOKEN_BS:
-		length = Tcl_UtfBackslash(tokenPtr->start, (int *) NULL,
-			buffer);
-		Tcl_DStringAppend(&textBuffer, buffer, length);
-		break;
-
-	    case TCL_TOKEN_COMMAND:
-		/*
-		 * Push any accumulated chars appearing before the command.
-		 */
-		
-		if (Tcl_DStringLength(&textBuffer) > 0) {
-		    int literal;
-		    
-		    literal = TclRegisterLiteral(envPtr,
-			    Tcl_DStringValue(&textBuffer),
-			    Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
-		    TclEmitPush(literal, envPtr);
-		    numObjsToConcat++;
-		    maxDepth = TclMax(numObjsToConcat, maxDepth);
-		    Tcl_DStringFree(&textBuffer);
-		}
-		
-		code = TclCompileScript(interp, tokenPtr->start+1,
-			tokenPtr->size-2, /*nested*/ 1,	envPtr);
-		if (code != TCL_OK) {
-		    goto error;
-		}
-		maxDepth = TclMax((numObjsToConcat + envPtr->maxStackDepth),
-		        maxDepth);
-		numObjsToConcat++;
-		break;
-
-	    case TCL_TOKEN_VARIABLE:
-		/*
-		 * Push any accumulated chars appearing before the $<var>.
-		 */
-		
-		if (Tcl_DStringLength(&textBuffer) > 0) {
-		    int literal;
-		    
-		    literal = TclRegisterLiteral(envPtr,
-			    Tcl_DStringValue(&textBuffer),
-			    Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
-		    TclEmitPush(literal, envPtr);
-		    numObjsToConcat++;
-		    maxDepth = TclMax(numObjsToConcat, maxDepth);
-		    Tcl_DStringFree(&textBuffer);
-		}
-		
-		/*
-		 * Check if the name contains any namespace qualifiers.
-		 */
-		
-		name = tokenPtr[1].start;
-		nameBytes = tokenPtr[1].size;
-		hasNsQualifiers = 0;
-		for (i = 0, p = name;  i < nameBytes;  i++, p++) {
-		    if ((*p == ':') && (i < (nameBytes-1))
-			    && (*(p+1) == ':')) {
-			hasNsQualifiers = 1;
-			break;
-		    }
-		}
-
-		/*
-		 * Either push the variable's name, or find its index in
-		 * the array of local variables in a procedure frame.
-		 */
-
-		depthForVar = 0;
-		if ((envPtr->procPtr == NULL) || hasNsQualifiers) {
-		    localVar = -1;
-		    TclEmitPush(TclRegisterLiteral(envPtr, name, nameBytes,
-		            /*onHeap*/ 0), envPtr);
-		    depthForVar = 1;
-		} else {
-		    localVar = TclFindCompiledLocal(name, nameBytes, 
-			    /*create*/ 0, /*flags*/ 0, envPtr->procPtr);
-		    if (localVar < 0) {
-			TclEmitPush(TclRegisterLiteral(envPtr, name,
-			        nameBytes, /*onHeap*/ 0), envPtr); 
-			depthForVar = 1;
-		    }
-		}
-
-		/*
-		 * Emit instructions to load the variable.
-		 */
-		
-		if (tokenPtr->numComponents == 1) {
-		    if (localVar < 0) {
-			TclEmitOpcode(INST_LOAD_SCALAR_STK, envPtr);
-		    } else if (localVar <= 255) {
-			TclEmitInstInt1(INST_LOAD_SCALAR1, localVar,
-			        envPtr);
-		    } else {
-			TclEmitInstInt4(INST_LOAD_SCALAR4, localVar,
-				envPtr);
-		    }
-		} else {
-		    code = TclCompileTokens(interp, tokenPtr+2,
-			    tokenPtr->numComponents-1, envPtr);
-		    if (code != TCL_OK) {
-			sprintf(buffer,
-			        "\n    (parsing index for array \"%.*s\")",
-				((nameBytes > 100)? 100 : nameBytes), name);
-			Tcl_AddObjErrorInfo(interp, buffer, -1);
-			goto error;
-		    }
-		    depthForVar += envPtr->maxStackDepth;
-		    if (localVar < 0) {
-			TclEmitOpcode(INST_LOAD_ARRAY_STK, envPtr);
-		    } else if (localVar <= 255) {
-			TclEmitInstInt1(INST_LOAD_ARRAY1, localVar,
-			        envPtr);
-		    } else {
-			TclEmitInstInt4(INST_LOAD_ARRAY4, localVar,
-			        envPtr);
-		    }
-		}
-		maxDepth = TclMax(numObjsToConcat + depthForVar, maxDepth);
-		numObjsToConcat++;
-		count -= tokenPtr->numComponents;
-		tokenPtr += tokenPtr->numComponents;
-		break;
-
-	    default:
-		panic("Unexpected token type in TclCompileTokens");
-	}
-    }
-
-    /*
-     * Push any accumulated characters appearing at the end.
-     */
-
-    if (Tcl_DStringLength(&textBuffer) > 0) {
-	int literal;
-
-	literal = TclRegisterLiteral(envPtr, Tcl_DStringValue(&textBuffer),
-	        Tcl_DStringLength(&textBuffer), /*onHeap*/ 0);
-	TclEmitPush(literal, envPtr);
-	numObjsToConcat++;
-	maxDepth = TclMax(numObjsToConcat, maxDepth);
-    }
-
-    /*
-     * If necessary, concatenate the parts of the word.
-     */
-
-    while (numObjsToConcat > 255) {
-	TclEmitInstInt1(INST_CONCAT1, 255, envPtr);
-	numObjsToConcat -= 254;	/* concat pushes 1 obj, the result */
-    }
-    if (numObjsToConcat > 1) {
-	TclEmitInstInt1(INST_CONCAT1, numObjsToConcat, envPtr);
-    }
-
-    /*
-     * If the tokens yielded no instructions, push an empty string.
-     */
-    
-    if (envPtr->codeNext == entryCodeNext) {
-	TclEmitPush(TclRegisterLiteral(envPtr, "", 0, /*alreadyAlloced*/ 0),
-	        envPtr);
-	maxDepth = 1;
-    }
-    Tcl_DStringFree(&textBuffer);
-    envPtr->maxStackDepth = maxDepth;
-    return TCL_OK;
-
-    error:
-    Tcl_DStringFree(&textBuffer);
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileCmdWord --
- *
- *	Given an array of parse tokens for a word containing one or more Tcl
- *	commands, emit inline instructions to execute them. This procedure
- *	differs from TclCompileTokens in that a simple word such as a loop
- *	body enclosed in braces is not just pushed as a string, but is
- *	itself parsed into tokens and compiled.
- *
- * Results:
- *	The return value is a standard Tcl result. If an error occurs, an
- *	error message is left in the interpreter's result.
- *	
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the tokens.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the tokens at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileCmdWord(interp, tokenPtr, count, envPtr)
-    Tcl_Interp *interp;		/* Used for error and status reporting. */
-    Tcl_Token *tokenPtr;	/* Pointer to first in an array of tokens
-				 * for a command word to compile inline. */
-    int count;			/* Number of tokens to consider at tokenPtr.
-				 * Must be at least 1. */
-    CompileEnv *envPtr;		/* Holds the resulting instructions. */
-{
-    int code;
-
-    /*
-     * Handle the common case: if there is a single text token, compile it
-     * into an inline sequence of instructions.
-     */
-    
-    envPtr->maxStackDepth = 0;
-    if ((count == 1) && (tokenPtr->type == TCL_TOKEN_TEXT)) {
-	code = TclCompileScript(interp, tokenPtr->start, tokenPtr->size,
-	        /*nested*/ 0, envPtr);
-	return code;
-    }
-
-    /*
-     * Multiple tokens or the single token involves substitutions. Emit
-     * instructions to invoke the eval command procedure at runtime on the
-     * result of evaluating the tokens.
-     */
-
-    code = TclCompileTokens(interp, tokenPtr, count, envPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    TclEmitOpcode(INST_EVAL_STK, envPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCompileExprWords --
- *
- *	Given an array of parse tokens representing one or more words that
- *	contain a Tcl expression, emit inline instructions to execute the
- *	expression. This procedure differs from TclCompileExpr in that it
- *	supports Tcl's two-level substitution semantics for expressions that
- *	appear as command words.
- *
- * Results:
- *	The return value is a standard Tcl result. If an error occurs, an
- *	error message is left in the interpreter's result.
- *	
- *	envPtr->maxStackDepth is updated with the maximum number of stack
- *	elements needed to execute the expression.
- *
- * Side effects:
- *	Instructions are added to envPtr to execute the expression.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCompileExprWords(interp, tokenPtr, numWords, envPtr)
-    Tcl_Interp *interp;		/* Used for error and status reporting. */
-    Tcl_Token *tokenPtr;	/* Points to first in an array of word
-				 * tokens tokens for the expression to
-				 * compile inline. */
-    int numWords;		/* Number of word tokens starting at
-				 * tokenPtr. Must be at least 1. Each word
-				 * token contains one or more subtokens. */
-    CompileEnv *envPtr;		/* Holds the resulting instructions. */
-{
-    Tcl_Token *wordPtr, *partPtr;
-    JumpFixup jumpFixup;
-    int maxDepth, doExprInline, range, numBytes, i, j, code;
-    char *script;
-    char saveChar;
-    int saveExprIsJustVarRef = envPtr->exprIsJustVarRef;
-    int saveExprIsComparison = envPtr->exprIsComparison;
-
-    envPtr->maxStackDepth = 0;
-    maxDepth = 0;
-    range = -1;
-    code = TCL_OK;
-
-    /*
-     * If the expression is a single word that doesn't require
-     * substitutions, just compile it's string into inline instructions.
-     */
-
-    if ((numWords == 1) && (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD)) {
-	/*
-	 * Temporarily overwrite the character just after the end of the
-	 * string with a 0 byte.
-	 */
-
-	script = tokenPtr[1].start;
-	numBytes = tokenPtr[1].size;
-	saveChar = script[numBytes];
-	script[numBytes] = 0;
-	code = TclCompileExpr(interp, script, numBytes, envPtr);
-	script[numBytes] = saveChar;
-	return code;
-    }
-	
-    /*
-     * Multiple words or the single word requires substitutions. We may
-     * need to call expr's command proc at runtime. This often recompiles
-     * the expression each time and is slow. However, there are some
-     * circumstances where we can still compile inline code "optimistically"
-     * and check for type errors during execution that signal when double
-     * substitutions must be done.
-     */
-
-    doExprInline = 1;
-    wordPtr = tokenPtr;
-    for (i = 0;  ((i < numWords) && doExprInline);  i++) {
-	if (wordPtr->type == TCL_TOKEN_WORD) {
-	    for (j = 0, partPtr = wordPtr+1;  j < wordPtr->numComponents;
-		    j++, partPtr++) {
-		if ((partPtr->type == TCL_TOKEN_BS)
-		        || (partPtr->type == TCL_TOKEN_COMMAND)) {
-		    doExprInline = 0;
-		    break;
-		}
-	    }
-	}
-	wordPtr += (wordPtr->numComponents + 1);
-    }
-
-    /*
-     * If only variable substitutions appear (no backslash or command
-     * substitutions), inline compile the expr inside a "catch" so that if
-     * there is any error, we call expr's command proc at runtime.
-     */
-    
-    if (doExprInline) {
-	Tcl_DString exprBuffer;
-	int startCodeOffset = (envPtr->codeNext - envPtr->codeStart);
-	int startExceptNext = envPtr->exceptArrayNext;
-	
-	envPtr->exceptDepth++;
-	envPtr->maxExceptDepth =
-	        TclMax(envPtr->exceptDepth, envPtr->maxExceptDepth);
- 	range = TclCreateExceptRange(CATCH_EXCEPTION_RANGE, envPtr);
-	TclEmitInstInt4(INST_BEGIN_CATCH4, range, envPtr);
-
-	Tcl_DStringInit(&exprBuffer);
-	wordPtr = tokenPtr;
-	for (i = 0;  i < numWords;  i++) {
-	    if (i > 0) {
-		Tcl_DStringAppend(&exprBuffer, " ", 1);
-	    }
-	    for (j = 0, partPtr = wordPtr+1;  j < wordPtr->numComponents;
-		    j++, partPtr++) {
-		switch (partPtr->type) {
-		    case TCL_TOKEN_TEXT:
-			Tcl_DStringAppend(&exprBuffer, partPtr->start,
-		                partPtr->size);
-			break;
-
-		    case TCL_TOKEN_VARIABLE:
-			Tcl_DStringAppend(&exprBuffer, partPtr->start,
-		                partPtr->size);
-			j += partPtr->numComponents;
-			partPtr += partPtr->numComponents;
-			break;
-
-		    default:
-			panic("unexpected token type in TclCompileExprWords");
-		}
-	    }
-	    wordPtr += (wordPtr->numComponents + 1);
-	}
-	envPtr->exceptArrayPtr[range].codeOffset =
-	        (envPtr->codeNext - envPtr->codeStart);
-	code = TclCompileExpr(interp, Tcl_DStringValue(&exprBuffer),
-		Tcl_DStringLength(&exprBuffer), envPtr);
-	envPtr->exceptArrayPtr[range].numCodeBytes =
-	        (envPtr->codeNext - envPtr->codeStart)
-	        - envPtr->exceptArrayPtr[range].codeOffset;
-	maxDepth = envPtr->maxStackDepth;
-	Tcl_DStringFree(&exprBuffer);
-	
-	if ((code != TCL_OK) || (envPtr->exprIsJustVarRef)
-	        || (envPtr->exprIsComparison)) {
-	    /*
-	     * Delete the inline code and call the expr command proc at
-	     * runtime. There was a compilation error or the inline code
-	     * might not have the right 2 level substitution semantics:
-	     * e.g., if the expr consisted of a single variable ref or the
-	     * top-level operator is a comparison (which might operate on
-	     * strings). The code might appear to execute successfully but
-	     * produce the wrong result. We depend on execution failing if a
-	     * second level of substitutions is required.
-	     */
-	    
-	    envPtr->codeNext = (envPtr->codeStart + startCodeOffset);
-	    envPtr->exceptArrayNext = startExceptNext;
-	    doExprInline = 0;
-	} else {
-	    TclEmitOpcode(INST_END_CATCH, envPtr); /* for ok case */
-	    TclEmitForwardJump(envPtr, TCL_UNCONDITIONAL_JUMP, &jumpFixup);
-	    envPtr->exceptArrayPtr[range].catchOffset =
-		    (envPtr->codeNext - envPtr->codeStart);
-	    TclEmitOpcode(INST_END_CATCH, envPtr); /* for error case */
-	}
-    }
-	    
-    /*
-     * Emit code to call the expr command proc at runtime. Concatenate the
-     * (already substituted once) expr tokens with a space between each.
-     */
-
-    wordPtr = tokenPtr;
-    for (i = 0;  i < numWords;  i++) {
-	code = TclCompileTokens(interp, wordPtr+1, wordPtr->numComponents,
-                envPtr);
-	if (code != TCL_OK) {
-	    break;
-	}
-	if (i < (numWords - 1)) {
-	    TclEmitPush(TclRegisterLiteral(envPtr, " ", 1, /*onHeap*/ 0),
-	            envPtr);
-	    maxDepth = TclMax((envPtr->maxStackDepth + 1), maxDepth);
-	} else {
-	    maxDepth = TclMax(envPtr->maxStackDepth, maxDepth);
-	}
-	wordPtr += (wordPtr->numComponents + 1);
-    }
-    if (code == TCL_OK) {
-	int concatItems = 2*numWords - 1;
-	while (concatItems > 255) {
-	    TclEmitInstInt1(INST_CONCAT1, 255, envPtr);
-	    concatItems -= 254;
-	}
-	if (concatItems > 1) {
-	    TclEmitInstInt1(INST_CONCAT1, concatItems, envPtr);
-	}
-	TclEmitOpcode(INST_EXPR_STK, envPtr);
-    }
-    
-    /*
-     * If generating inline code, update the target of the jump at the end.
-     */
-    
-    if (doExprInline) {
-	int jumpDist = (envPtr->codeNext - envPtr->codeStart)
-	        - jumpFixup.codeOffset;
-	if (TclFixupForwardJump(envPtr, &jumpFixup, jumpDist, 127)) {
-	    /*
-	     * Update the inline expression code's catch ExceptionRange
-	     * target since it, being after the jump, also moved down.
-	     */
-	    
-	    envPtr->exceptArrayPtr[range].catchOffset += 3;
-	}
-	envPtr->exceptDepth--;
-    }
-    
-    envPtr->exprIsJustVarRef = saveExprIsJustVarRef;
-    envPtr->exprIsComparison = saveExprIsComparison;
-    envPtr->maxStackDepth = maxDepth;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitByteCodeObj --
- *
- *	Create a ByteCode structure and initialize it from a CompileEnv
- *	compilation environment structure. The ByteCode structure is
- *	smaller and contains just that information needed to execute
- *	the bytecode instructions resulting from compiling a Tcl script.
- *	The resulting structure is placed in the specified object.
- *
- * Results:
- *	A newly constructed ByteCode object is stored in the internal
- *	representation of the objPtr.
- *
- * Side effects:
- *	A single heap object is allocated to hold the new ByteCode structure
- *	and its code, object, command location, and aux data arrays. Note
- *	that "ownership" (i.e., the pointers to) the Tcl objects and aux
- *	data items will be handed over to the new ByteCode structure from
- *	the CompileEnv structure.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitByteCodeObj(objPtr, envPtr)
-    Tcl_Obj *objPtr;		 /* Points object that should be
-				  * initialized, and whose string rep
-				  * contains the source code. */
-    register CompileEnv *envPtr; /* Points to the CompileEnv structure from
-				  * which to create a ByteCode structure. */
-{
-    register ByteCode *codePtr;
-    size_t codeBytes, objArrayBytes, exceptArrayBytes, cmdLocBytes;
-    size_t auxDataArrayBytes, structureSize;
-    register unsigned char *p;
-    unsigned char *nextPtr;
-    int numLitObjects = envPtr->literalArrayNext;
-    Namespace *namespacePtr;
-    int i;
-    Interp *iPtr;
-
-    iPtr = envPtr->iPtr;
-
-    codeBytes = (envPtr->codeNext - envPtr->codeStart);
-    objArrayBytes = (envPtr->literalArrayNext * sizeof(Tcl_Obj *));
-    exceptArrayBytes = (envPtr->exceptArrayNext * sizeof(ExceptionRange));
-    auxDataArrayBytes = (envPtr->auxDataArrayNext * sizeof(AuxData));
-    cmdLocBytes = GetCmdLocEncodingSize(envPtr);
-    
-    /*
-     * Compute the total number of bytes needed for this bytecode.
-     */
-
-    structureSize = sizeof(ByteCode);
-    structureSize += TCL_ALIGN(codeBytes);        /* align object array */
-    structureSize += TCL_ALIGN(objArrayBytes);    /* align exc range arr */
-    structureSize += TCL_ALIGN(exceptArrayBytes); /* align AuxData array */
-    structureSize += auxDataArrayBytes;
-    structureSize += cmdLocBytes;
-
-    if (envPtr->iPtr->varFramePtr != NULL) {
-        namespacePtr = envPtr->iPtr->varFramePtr->nsPtr;
-    } else {
-        namespacePtr = envPtr->iPtr->globalNsPtr;
-    }
-    
-    p = (unsigned char *) ckalloc((size_t) structureSize);
-    codePtr = (ByteCode *) p;
-    codePtr->interpHandle = TclHandlePreserve(iPtr->handle);
-    codePtr->compileEpoch = iPtr->compileEpoch;
-    codePtr->nsPtr = namespacePtr;
-    codePtr->nsEpoch = namespacePtr->resolverEpoch;
-    codePtr->refCount = 1;
-    codePtr->flags = 0;
-    codePtr->source = envPtr->source;
-    codePtr->procPtr = envPtr->procPtr;
-
-    codePtr->numCommands = envPtr->numCommands;
-    codePtr->numSrcBytes = envPtr->numSrcBytes;
-    codePtr->numCodeBytes = codeBytes;
-    codePtr->numLitObjects = numLitObjects;
-    codePtr->numExceptRanges = envPtr->exceptArrayNext;
-    codePtr->numAuxDataItems = envPtr->auxDataArrayNext;
-    codePtr->numCmdLocBytes = cmdLocBytes;
-    codePtr->maxExceptDepth = envPtr->maxExceptDepth;
-    codePtr->maxStackDepth = envPtr->maxStackDepth;
-    
-    p += sizeof(ByteCode);
-    codePtr->codeStart = p;
-    memcpy((VOID *) p, (VOID *) envPtr->codeStart, (size_t) codeBytes);
-    
-    p += TCL_ALIGN(codeBytes);	      /* align object array */
-    codePtr->objArrayPtr = (Tcl_Obj **) p;
-    for (i = 0;  i < numLitObjects;  i++) {
-	codePtr->objArrayPtr[i] = envPtr->literalArrayPtr[i].objPtr;
-    }
-
-    p += TCL_ALIGN(objArrayBytes);    /* align exception range array */
-    if (exceptArrayBytes > 0) {
-	codePtr->exceptArrayPtr = (ExceptionRange *) p;
-	memcpy((VOID *) p, (VOID *) envPtr->exceptArrayPtr,
-	        (size_t) exceptArrayBytes);
-    } else {
-	codePtr->exceptArrayPtr = NULL;
-    }
-    
-    p += TCL_ALIGN(exceptArrayBytes); /* align AuxData array */
-    if (auxDataArrayBytes > 0) {
-	codePtr->auxDataArrayPtr = (AuxData *) p;
-	memcpy((VOID *) p, (VOID *) envPtr->auxDataArrayPtr,
-	        (size_t) auxDataArrayBytes);
-    } else {
-	codePtr->auxDataArrayPtr = NULL;
-    }
-
-    p += auxDataArrayBytes;
-    nextPtr = EncodeCmdLocMap(envPtr, codePtr, (unsigned char *) p);
-#ifdef TCL_COMPILE_DEBUG
-    if (((size_t)(nextPtr - p)) != cmdLocBytes) {	
-	panic("TclInitByteCodeObj: encoded cmd location bytes %d != expected size %d\n", (nextPtr - p), cmdLocBytes);
-    }
-#endif
-    
-    /*
-     * Record various compilation-related statistics about the new ByteCode
-     * structure. Don't include overhead for statistics-related fields.
-     */
-
-#ifdef TCL_COMPILE_STATS
-    codePtr->structureSize = structureSize
-	    - (sizeof(size_t) + sizeof(Tcl_Time));
-    TclpGetTime(&(codePtr->createTime));
-    
-    RecordByteCodeStats(codePtr);
-#endif /* TCL_COMPILE_STATS */
-    
-    /*
-     * Free the old internal rep then convert the object to a
-     * bytecode object by making its internal rep point to the just
-     * compiled ByteCode.
-     */
-	    
-    if ((objPtr->typePtr != NULL) &&
-	    (objPtr->typePtr->freeIntRepProc != NULL)) {
-	(*objPtr->typePtr->freeIntRepProc)(objPtr);
-    }
-    objPtr->internalRep.otherValuePtr = (VOID *) codePtr;
-    objPtr->typePtr = &tclByteCodeType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * LogCompilationInfo --
- *
- *	This procedure is invoked after an error occurs during compilation.
- *	It adds information to the "errorInfo" variable to describe the
- *	command that was being compiled when the error occurred.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Information about the command is added to errorInfo and the
- *	line number stored internally in the interpreter is set.  If this
- *	is the first call to this procedure or Tcl_AddObjErrorInfo since
- *	an error occurred, then old information in errorInfo is
- *	deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-LogCompilationInfo(interp, script, command, length)
-    Tcl_Interp *interp;		/* Interpreter in which to log the
-				 * information. */
-    char *script;		/* First character in script containing
-				 * command (must be <= command). */
-    char *command;		/* First character in command that
-				 * generated the error. */
-    int length;			/* Number of bytes in command (-1 means
-				 * use all bytes up to first null byte). */
-{
-    char buffer[200];
-    register char *p;
-    char *ellipsis = "";
-    Interp *iPtr = (Interp *) interp;
-
-    if (iPtr->flags & ERR_ALREADY_LOGGED) {
-	/*
-	 * Someone else has already logged error information for this
-	 * command; we shouldn't add anything more.
-	 */
-
-	return;
-    }
-
-    /*
-     * Compute the line number where the error occurred.
-     */
-
-    iPtr->errorLine = 1;
-    for (p = script; p != command; p++) {
-	if (*p == '\n') {
-	    iPtr->errorLine++;
-	}
-    }
-
-    /*
-     * Create an error message to add to errorInfo, including up to a
-     * maximum number of characters of the command.
-     */
-
-    if (length < 0) {
-	length = strlen(command);
-    }
-    if (length > 150) {
-	length = 150;
-	ellipsis = "...";
-    }
-    sprintf(buffer, "\n    while compiling\n\"%.*s%s\"",
-	    length, command, ellipsis);
-    Tcl_AddObjErrorInfo(interp, buffer, -1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFindCompiledLocal --
- *
- *	This procedure is called at compile time to look up and optionally
- *	allocate an entry ("slot") for a variable in a procedure's array of
- *	local variables. If the variable's name is NULL, a new temporary
- *	variable is always created. (Such temporary variables can only be
- *	referenced using their slot index.)
- *
- * Results:
- *	If create is 0 and the name is non-NULL, then if the variable is
- *	found, the index of its entry in the procedure's array of local
- *	variables is returned; otherwise -1 is returned. If name is NULL,
- *	the index of a new temporary variable is returned. Finally, if
- *	create is 1 and name is non-NULL, the index of a new entry is
- *	returned.
- *
- * Side effects:
- *	Creates and registers a new local variable if create is 1 and
- *	the variable is unknown, or if the name is NULL.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclFindCompiledLocal(name, nameBytes, create, flags, procPtr)
-    register char *name;	/* Points to first character of the name of
-				 * a scalar or array variable. If NULL, a
-				 * temporary var should be created. */
-    int nameBytes;		/* Number of bytes in the name. */
-    int create;			/* If 1, allocate a local frame entry for
-				 * the variable if it is new. */
-    int flags;			/* Flag bits for the compiled local if
-				 * created. Only VAR_SCALAR, VAR_ARRAY, and
-				 * VAR_LINK make sense. */
-    register Proc *procPtr;	/* Points to structure describing procedure
-				 * containing the variable reference. */
-{
-    register CompiledLocal *localPtr;
-    int localVar = -1;
-    register int i;
-
-    /*
-     * If not creating a temporary, does a local variable of the specified
-     * name already exist?
-     */
-
-    if (name != NULL) {	
-	int localCt = procPtr->numCompiledLocals;
-	localPtr = procPtr->firstLocalPtr;
-	for (i = 0;  i < localCt;  i++) {
-	    if (!TclIsVarTemporary(localPtr)) {
-		char *localName = localPtr->name;
-		if ((name[0] == localName[0])
-	                && (nameBytes == localPtr->nameLength)
-	                && (strncmp(name, localName, (unsigned) nameBytes) == 0)) {
-		    return i;
-		}
-	    }
-	    localPtr = localPtr->nextPtr;
-	}
-    }
-
-    /*
-     * Create a new variable if appropriate.
-     */
-    
-    if (create || (name == NULL)) {
-	localVar = procPtr->numCompiledLocals;
-	localPtr = (CompiledLocal *) ckalloc((unsigned) 
-	        (sizeof(CompiledLocal) - sizeof(localPtr->name)
-		+ nameBytes+1));
-	if (procPtr->firstLocalPtr == NULL) {
-	    procPtr->firstLocalPtr = procPtr->lastLocalPtr = localPtr;
-	} else {
-	    procPtr->lastLocalPtr->nextPtr = localPtr;
-	    procPtr->lastLocalPtr = localPtr;
-	}
-	localPtr->nextPtr = NULL;
-	localPtr->nameLength = nameBytes;
-	localPtr->frameIndex = localVar;
-	localPtr->flags = flags;
-	if (name == NULL) {
-	    localPtr->flags |= VAR_TEMPORARY;
-	}
-	localPtr->defValuePtr = NULL;
-	localPtr->resolveInfo = NULL;
-
-	if (name != NULL) {
-	    memcpy((VOID *) localPtr->name, (VOID *) name,
-	            (size_t) nameBytes);
-	}
-	localPtr->name[nameBytes] = '\0';
-	procPtr->numCompiledLocals++;
-    }
-    return localVar;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitCompiledLocals --
- *
- *	This routine is invoked in order to initialize the compiled
- *	locals table for a new call frame.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May invoke various name resolvers in order to determine which
- *	variables are being referenced at runtime.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitCompiledLocals(interp, framePtr, nsPtr)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    CallFrame *framePtr;	/* Call frame to initialize. */
-    Namespace *nsPtr;		/* Pointer to current namespace. */
-{
-    register CompiledLocal *localPtr;
-    Interp *iPtr = (Interp*) interp;
-    Tcl_ResolvedVarInfo *vinfo, *resVarInfo;
-    Var *varPtr = framePtr->compiledLocals;
-    Var *resolvedVarPtr;
-    ResolverScheme *resPtr;
-    int result;
-
-    /*
-     * Initialize the array of local variables stored in the call frame.
-     * Some variables may have special resolution rules.  In that case,
-     * we call their "resolver" procs to get our hands on the variable,
-     * and we make the compiled local a link to the real variable.
-     */
-
-    for (localPtr = framePtr->procPtr->firstLocalPtr;
-	 localPtr != NULL;
-	 localPtr = localPtr->nextPtr) {
-
-	/*
-	 * Check to see if this local is affected by namespace or
-	 * interp resolvers.  The resolver to use is cached for the
-	 * next invocation of the procedure.
-	 */
-
-	if (!(localPtr->flags & (VAR_ARGUMENT|VAR_TEMPORARY|VAR_RESOLVED))
-		&& (nsPtr->compiledVarResProc || iPtr->resolverPtr)) {
-	    resPtr = iPtr->resolverPtr;
-
-	    if (nsPtr->compiledVarResProc) {
-		result = (*nsPtr->compiledVarResProc)(nsPtr->interp,
-			localPtr->name, localPtr->nameLength,
-			(Tcl_Namespace *) nsPtr, &vinfo);
-	    } else {
-		result = TCL_CONTINUE;
-	    }
-
-	    while ((result == TCL_CONTINUE) && resPtr) {
-		if (resPtr->compiledVarResProc) {
-		    result = (*resPtr->compiledVarResProc)(nsPtr->interp,
-			    localPtr->name, localPtr->nameLength,
-			    (Tcl_Namespace *) nsPtr, &vinfo);
-		}
-		resPtr = resPtr->nextPtr;
-	    }
-	    if (result == TCL_OK) {
-		localPtr->resolveInfo = vinfo;
-		localPtr->flags |= VAR_RESOLVED;
-	    }
-	}
-
-	/*
-	 * Now invoke the resolvers to determine the exact variables that
-	 * should be used.
-	 */
-
-        resVarInfo = localPtr->resolveInfo;
-        resolvedVarPtr = NULL;
-
-        if (resVarInfo && resVarInfo->fetchProc) {
-            resolvedVarPtr = (Var*) (*resVarInfo->fetchProc)(interp,
-		    resVarInfo);
-        }
-
-        if (resolvedVarPtr) {
-	    varPtr->name = localPtr->name; /* will be just '\0' if temp var */
-	    varPtr->nsPtr = NULL;
-	    varPtr->hPtr = NULL;
-	    varPtr->refCount = 0;
-	    varPtr->tracePtr = NULL;
-	    varPtr->searchPtr = NULL;
-	    varPtr->flags = 0;
-            TclSetVarLink(varPtr);
-            varPtr->value.linkPtr = resolvedVarPtr;
-            resolvedVarPtr->refCount++;
-        } else {
-	    varPtr->value.objPtr = NULL;
-	    varPtr->name = localPtr->name; /* will be just '\0' if temp var */
-	    varPtr->nsPtr = NULL;
-	    varPtr->hPtr = NULL;
-	    varPtr->refCount = 0;
-	    varPtr->tracePtr = NULL;
-	    varPtr->searchPtr = NULL;
-	    varPtr->flags = (localPtr->flags | VAR_UNDEFINED);
-        }
-	varPtr++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclExpandCodeArray --
- *
- *	Procedure that uses malloc to allocate more storage for a
- *	CompileEnv's code array.
- *
- * Results:
- *	None. 
- *
- * Side effects:
- *	The byte code array in *envPtr is reallocated to a new array of
- *	double the size, and if envPtr->mallocedCodeArray is non-zero the
- *	old array is freed. Byte codes are copied from the old array to the
- *	new one.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclExpandCodeArray(envPtr)
-    CompileEnv *envPtr;		/* Points to the CompileEnv whose code array
-				 * must be enlarged. */
-{
-    /*
-     * envPtr->codeNext is equal to envPtr->codeEnd. The currently defined
-     * code bytes are stored between envPtr->codeStart and
-     * (envPtr->codeNext - 1) [inclusive].
-     */
-    
-    size_t currBytes = (envPtr->codeNext - envPtr->codeStart);
-    size_t newBytes  = 2*(envPtr->codeEnd  - envPtr->codeStart);
-    unsigned char *newPtr = (unsigned char *) ckalloc((unsigned) newBytes);
-
-    /*
-     * Copy from old code array to new, free old code array if needed, and
-     * mark new code array as malloced.
-     */
- 
-    memcpy((VOID *) newPtr, (VOID *) envPtr->codeStart, currBytes);
-    if (envPtr->mallocedCodeArray) {
-        ckfree((char *) envPtr->codeStart);
-    }
-    envPtr->codeStart = newPtr;
-    envPtr->codeNext = (newPtr + currBytes);
-    envPtr->codeEnd  = (newPtr + newBytes);
-    envPtr->mallocedCodeArray = 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EnterCmdStartData --
- *
- *	Registers the starting source and bytecode location of a
- *	command. This information is used at runtime to map between
- *	instruction pc and source locations.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Inserts source and code location information into the compilation
- *	environment envPtr for the command at index cmdIndex. The
- *	compilation environment's CmdLocation array is grown if necessary.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-EnterCmdStartData(envPtr, cmdIndex, srcOffset, codeOffset)
-    CompileEnv *envPtr;		/* Points to the compilation environment
-				 * structure in which to enter command
-				 * location information. */
-    int cmdIndex;		/* Index of the command whose start data
-				 * is being set. */
-    int srcOffset;		/* Offset of first char of the command. */
-    int codeOffset;		/* Offset of first byte of command code. */
-{
-    CmdLocation *cmdLocPtr;
-    
-    if ((cmdIndex < 0) || (cmdIndex >= envPtr->numCommands)) {
-	panic("EnterCmdStartData: bad command index %d\n", cmdIndex);
-    }
-    
-    if (cmdIndex >= envPtr->cmdMapEnd) {
-	/*
-	 * Expand the command location array by allocating more storage from
-	 * the heap. The currently allocated CmdLocation entries are stored
-	 * from cmdMapPtr[0] up to cmdMapPtr[envPtr->cmdMapEnd] (inclusive).
-	 */
-
-	size_t currElems = envPtr->cmdMapEnd;
-	size_t newElems  = 2*currElems;
-	size_t currBytes = currElems * sizeof(CmdLocation);
-	size_t newBytes  = newElems  * sizeof(CmdLocation);
-	CmdLocation *newPtr = (CmdLocation *) ckalloc((unsigned) newBytes);
-	
-	/*
-	 * Copy from old command location array to new, free old command
-	 * location array if needed, and mark new array as malloced.
-	 */
-	
-	memcpy((VOID *) newPtr, (VOID *) envPtr->cmdMapPtr, currBytes);
-	if (envPtr->mallocedCmdMap) {
-	    ckfree((char *) envPtr->cmdMapPtr);
-	}
-	envPtr->cmdMapPtr = (CmdLocation *) newPtr;
-	envPtr->cmdMapEnd = newElems;
-	envPtr->mallocedCmdMap = 1;
-    }
-
-    if (cmdIndex > 0) {
-	if (codeOffset < envPtr->cmdMapPtr[cmdIndex-1].codeOffset) {
-	    panic("EnterCmdStartData: cmd map not sorted by code offset");
-	}
-    }
-
-    cmdLocPtr = &(envPtr->cmdMapPtr[cmdIndex]);
-    cmdLocPtr->codeOffset = codeOffset;
-    cmdLocPtr->srcOffset = srcOffset;
-    cmdLocPtr->numSrcBytes = -1;
-    cmdLocPtr->numCodeBytes = -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EnterCmdExtentData --
- *
- *	Registers the source and bytecode length for a command. This
- *	information is used at runtime to map between instruction pc and
- *	source locations.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Inserts source and code length information into the compilation
- *	environment envPtr for the command at index cmdIndex. Starting
- *	source and bytecode information for the command must already
- *	have been registered.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-EnterCmdExtentData(envPtr, cmdIndex, numSrcBytes, numCodeBytes)
-    CompileEnv *envPtr;		/* Points to the compilation environment
-				 * structure in which to enter command
-				 * location information. */
-    int cmdIndex;		/* Index of the command whose source and
-				 * code length data is being set. */
-    int numSrcBytes;		/* Number of command source chars. */
-    int numCodeBytes;		/* Offset of last byte of command code. */
-{
-    CmdLocation *cmdLocPtr;
-
-    if ((cmdIndex < 0) || (cmdIndex >= envPtr->numCommands)) {
-	panic("EnterCmdExtentData: bad command index %d\n", cmdIndex);
-    }
-    
-    if (cmdIndex > envPtr->cmdMapEnd) {
-	panic("EnterCmdExtentData: missing start data for command %d\n",
-	        cmdIndex);
-    }
-
-    cmdLocPtr = &(envPtr->cmdMapPtr[cmdIndex]);
-    cmdLocPtr->numSrcBytes = numSrcBytes;
-    cmdLocPtr->numCodeBytes = numCodeBytes;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreateExceptRange --
- *
- *	Procedure that allocates and initializes a new ExceptionRange
- *	structure of the specified kind in a CompileEnv.
- *
- * Results:
- *	Returns the index for the newly created ExceptionRange.
- *
- * Side effects:
- *	If there is not enough room in the CompileEnv's ExceptionRange
- *	array, the array in expanded: a new array of double the size is
- *	allocated, if envPtr->mallocedExceptArray is non-zero the old
- *	array is freed, and ExceptionRange entries are copied from the old
- *	array to the new one.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCreateExceptRange(type, envPtr)
-    ExceptionRangeType type;	/* The kind of ExceptionRange desired. */
-    register CompileEnv *envPtr;/* Points to CompileEnv for which to
-				 * create a new ExceptionRange structure. */
-{
-    register ExceptionRange *rangePtr;
-    int index = envPtr->exceptArrayNext;
-    
-    if (index >= envPtr->exceptArrayEnd) {
-        /*
-	 * Expand the ExceptionRange array. The currently allocated entries
-	 * are stored between elements 0 and (envPtr->exceptArrayNext - 1)
-	 * [inclusive].
-	 */
-	
-	size_t currBytes =
-	        envPtr->exceptArrayNext * sizeof(ExceptionRange);
-	int newElems = 2*envPtr->exceptArrayEnd;
-	size_t newBytes = newElems * sizeof(ExceptionRange);
-	ExceptionRange *newPtr = (ExceptionRange *)
-	        ckalloc((unsigned) newBytes);
-	
-	/*
-	 * Copy from old ExceptionRange array to new, free old
-	 * ExceptionRange array if needed, and mark the new ExceptionRange
-	 * array as malloced.
-	 */
-	
-	memcpy((VOID *) newPtr, (VOID *) envPtr->exceptArrayPtr,
-	        currBytes);
-	if (envPtr->mallocedExceptArray) {
-	    ckfree((char *) envPtr->exceptArrayPtr);
-	}
-	envPtr->exceptArrayPtr = (ExceptionRange *) newPtr;
-	envPtr->exceptArrayEnd = newElems;
-	envPtr->mallocedExceptArray = 1;
-    }
-    envPtr->exceptArrayNext++;
-    
-    rangePtr = &(envPtr->exceptArrayPtr[index]);
-    rangePtr->type = type;
-    rangePtr->nestingLevel = envPtr->exceptDepth;
-    rangePtr->codeOffset = -1;
-    rangePtr->numCodeBytes = -1;
-    rangePtr->breakOffset = -1;
-    rangePtr->continueOffset = -1;
-    rangePtr->catchOffset = -1;
-    return index;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreateAuxData --
- *
- *	Procedure that allocates and initializes a new AuxData structure in
- *	a CompileEnv's array of compilation auxiliary data records. These
- *	AuxData records hold information created during compilation by
- *	CompileProcs and used by instructions during execution.
- *
- * Results:
- *	Returns the index for the newly created AuxData structure.
- *
- * Side effects:
- *	If there is not enough room in the CompileEnv's AuxData array,
- *	the AuxData array in expanded: a new array of double the size
- *	is allocated, if envPtr->mallocedAuxDataArray is non-zero
- *	the old array is freed, and AuxData entries are copied from
- *	the old array to the new one.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCreateAuxData(clientData, typePtr, envPtr)
-    ClientData clientData;	/* The compilation auxiliary data to store
-				 * in the new aux data record. */
-    AuxDataType *typePtr;	/* Pointer to the type to attach to this AuxData */
-    register CompileEnv *envPtr;/* Points to the CompileEnv for which a new
-				 * aux data structure is to be allocated. */
-{
-    int index;			/* Index for the new AuxData structure. */
-    register AuxData *auxDataPtr;
-    				/* Points to the new AuxData structure */
-    
-    index = envPtr->auxDataArrayNext;
-    if (index >= envPtr->auxDataArrayEnd) {
-        /*
-	 * Expand the AuxData array. The currently allocated entries are
-	 * stored between elements 0 and (envPtr->auxDataArrayNext - 1)
-	 * [inclusive].
-	 */
-	
-	size_t currBytes = envPtr->auxDataArrayNext * sizeof(AuxData);
-	int newElems = 2*envPtr->auxDataArrayEnd;
-	size_t newBytes = newElems * sizeof(AuxData);
-	AuxData *newPtr = (AuxData *) ckalloc((unsigned) newBytes);
-	
-	/*
-	 * Copy from old AuxData array to new, free old AuxData array if
-	 * needed, and mark the new AuxData array as malloced.
-	 */
-	
-	memcpy((VOID *) newPtr, (VOID *) envPtr->auxDataArrayPtr,
-	        currBytes);
-	if (envPtr->mallocedAuxDataArray) {
-	    ckfree((char *) envPtr->auxDataArrayPtr);
-	}
-	envPtr->auxDataArrayPtr = newPtr;
-	envPtr->auxDataArrayEnd = newElems;
-	envPtr->mallocedAuxDataArray = 1;
-    }
-    envPtr->auxDataArrayNext++;
-    
-    auxDataPtr = &(envPtr->auxDataArrayPtr[index]);
-    auxDataPtr->clientData = clientData;
-    auxDataPtr->type = typePtr;
-    return index;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitJumpFixupArray --
- *
- *	Initializes a JumpFixupArray structure to hold some number of
- *	jump fixup entries.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The JumpFixupArray structure is initialized.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitJumpFixupArray(fixupArrayPtr)
-    register JumpFixupArray *fixupArrayPtr;
-				 /* Points to the JumpFixupArray structure
-				  * to initialize. */
-{
-    fixupArrayPtr->fixup = fixupArrayPtr->staticFixupSpace;
-    fixupArrayPtr->next = 0;
-    fixupArrayPtr->end = (JUMPFIXUP_INIT_ENTRIES - 1);
-    fixupArrayPtr->mallocedArray = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclExpandJumpFixupArray --
- *
- *	Procedure that uses malloc to allocate more storage for a
- *      jump fixup array.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The jump fixup array in *fixupArrayPtr is reallocated to a new array
- *	of double the size, and if fixupArrayPtr->mallocedArray is non-zero
- *	the old array is freed. Jump fixup structures are copied from the
- *	old array to the new one.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclExpandJumpFixupArray(fixupArrayPtr)
-    register JumpFixupArray *fixupArrayPtr;
-				 /* Points to the JumpFixupArray structure
-				  * to enlarge. */
-{
-    /*
-     * The currently allocated jump fixup entries are stored from fixup[0]
-     * up to fixup[fixupArrayPtr->fixupNext] (*not* inclusive). We assume
-     * fixupArrayPtr->fixupNext is equal to fixupArrayPtr->fixupEnd.
-     */
-
-    size_t currBytes = fixupArrayPtr->next * sizeof(JumpFixup);
-    int newElems = 2*(fixupArrayPtr->end + 1);
-    size_t newBytes = newElems * sizeof(JumpFixup);
-    JumpFixup *newPtr = (JumpFixup *) ckalloc((unsigned) newBytes);
-
-    /*
-     * Copy from the old array to new, free the old array if needed,
-     * and mark the new array as malloced.
-     */
- 
-    memcpy((VOID *) newPtr, (VOID *) fixupArrayPtr->fixup, currBytes);
-    if (fixupArrayPtr->mallocedArray) {
-	ckfree((char *) fixupArrayPtr->fixup);
-    }
-    fixupArrayPtr->fixup = (JumpFixup *) newPtr;
-    fixupArrayPtr->end = newElems;
-    fixupArrayPtr->mallocedArray = 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFreeJumpFixupArray --
- *
- *	Free any storage allocated in a jump fixup array structure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Allocated storage in the JumpFixupArray structure is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFreeJumpFixupArray(fixupArrayPtr)
-    register JumpFixupArray *fixupArrayPtr;
-				 /* Points to the JumpFixupArray structure
-				  * to free. */
-{
-    if (fixupArrayPtr->mallocedArray) {
-	ckfree((char *) fixupArrayPtr->fixup);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclEmitForwardJump --
- *
- *	Procedure to emit a two-byte forward jump of kind "jumpType". Since
- *	the jump may later have to be grown to five bytes if the jump target
- *	is more than, say, 127 bytes away, this procedure also initializes a
- *	JumpFixup record with information about the jump. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The JumpFixup record pointed to by "jumpFixupPtr" is initialized
- *	with information needed later if the jump is to be grown. Also,
- *	a two byte jump of the designated type is emitted at the current
- *	point in the bytecode stream.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclEmitForwardJump(envPtr, jumpType, jumpFixupPtr)
-    CompileEnv *envPtr;		/* Points to the CompileEnv structure that
-				 * holds the resulting instruction. */
-    TclJumpType jumpType;	/* Indicates the kind of jump: if true or
-				 * false or unconditional. */
-    JumpFixup *jumpFixupPtr;	/* Points to the JumpFixup structure to
-				 * initialize with information about this
-				 * forward jump. */
-{
-    /*
-     * Initialize the JumpFixup structure:
-     *    - codeOffset is offset of first byte of jump below
-     *    - cmdIndex is index of the command after the current one
-     *    - exceptIndex is the index of the first ExceptionRange after
-     *      the current one.
-     */
-    
-    jumpFixupPtr->jumpType = jumpType;
-    jumpFixupPtr->codeOffset = (envPtr->codeNext - envPtr->codeStart);
-    jumpFixupPtr->cmdIndex = envPtr->numCommands;
-    jumpFixupPtr->exceptIndex = envPtr->exceptArrayNext;
-    
-    switch (jumpType) {
-    case TCL_UNCONDITIONAL_JUMP:
-	TclEmitInstInt1(INST_JUMP1, 0, envPtr);
-	break;
-    case TCL_TRUE_JUMP:
-	TclEmitInstInt1(INST_JUMP_TRUE1, 0, envPtr);
-	break;
-    default:
-	TclEmitInstInt1(INST_JUMP_FALSE1, 0, envPtr);
-	break;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFixupForwardJump --
- *
- *	Procedure that updates a previously-emitted forward jump to jump
- *	a specified number of bytes, "jumpDist". If necessary, the jump is
- *      grown from two to five bytes; this is done if the jump distance is
- *	greater than "distThreshold" (normally 127 bytes). The jump is
- *	described by a JumpFixup record previously initialized by
- *	TclEmitForwardJump.
- *
- * Results:
- *	1 if the jump was grown and subsequent instructions had to be moved;
- *	otherwise 0. This result is returned to allow callers to update
- *	any additional code offsets they may hold.
- *
- * Side effects:
- *	The jump may be grown and subsequent instructions moved. If this
- *	happens, the code offsets for any commands and any ExceptionRange
- *	records	between the jump and the current code address will be
- *	updated to reflect the moved code. Also, the bytecode instruction
- *	array in the CompileEnv structure may be grown and reallocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclFixupForwardJump(envPtr, jumpFixupPtr, jumpDist, distThreshold)
-    CompileEnv *envPtr;		/* Points to the CompileEnv structure that
-				 * holds the resulting instruction. */
-    JumpFixup *jumpFixupPtr;    /* Points to the JumpFixup structure that
-				 * describes the forward jump. */
-    int jumpDist;		/* Jump distance to set in jump
-				 * instruction. */
-    int distThreshold;		/* Maximum distance before the two byte
-				 * jump is grown to five bytes. */
-{
-    unsigned char *jumpPc, *p;
-    int firstCmd, lastCmd, firstRange, lastRange, k;
-    unsigned int numBytes;
-    
-    if (jumpDist <= distThreshold) {
-	jumpPc = (envPtr->codeStart + jumpFixupPtr->codeOffset);
-	switch (jumpFixupPtr->jumpType) {
-	case TCL_UNCONDITIONAL_JUMP:
-	    TclUpdateInstInt1AtPc(INST_JUMP1, jumpDist, jumpPc);
-	    break;
-	case TCL_TRUE_JUMP:
-	    TclUpdateInstInt1AtPc(INST_JUMP_TRUE1, jumpDist, jumpPc);
-	    break;
-	default:
-	    TclUpdateInstInt1AtPc(INST_JUMP_FALSE1, jumpDist, jumpPc);
-	    break;
-	}
-	return 0;
-    }
-
-    /*
-     * We must grow the jump then move subsequent instructions down.
-     * Note that if we expand the space for generated instructions,
-     * code addresses might change; be careful about updating any of
-     * these addresses held in variables.
-     */
-    
-    if ((envPtr->codeNext + 3) > envPtr->codeEnd) {
-        TclExpandCodeArray(envPtr);
-    }
-    jumpPc = (envPtr->codeStart + jumpFixupPtr->codeOffset);
-    for (numBytes = envPtr->codeNext-jumpPc-2, p = jumpPc+2+numBytes-1;
-	    numBytes > 0;  numBytes--, p--) {
-	p[3] = p[0];
-    }
-    envPtr->codeNext += 3;
-    jumpDist += 3;
-    switch (jumpFixupPtr->jumpType) {
-    case TCL_UNCONDITIONAL_JUMP:
-	TclUpdateInstInt4AtPc(INST_JUMP4, jumpDist, jumpPc);
-	break;
-    case TCL_TRUE_JUMP:
-	TclUpdateInstInt4AtPc(INST_JUMP_TRUE4, jumpDist, jumpPc);
-	break;
-    default:
-	TclUpdateInstInt4AtPc(INST_JUMP_FALSE4, jumpDist, jumpPc);
-	break;
-    }
-    
-    /*
-     * Adjust the code offsets for any commands and any ExceptionRange
-     * records between the jump and the current code address.
-     */
-    
-    firstCmd = jumpFixupPtr->cmdIndex;
-    lastCmd  = (envPtr->numCommands - 1);
-    if (firstCmd < lastCmd) {
-	for (k = firstCmd;  k <= lastCmd;  k++) {
-	    (envPtr->cmdMapPtr[k]).codeOffset += 3;
-	}
-    }
-    
-    firstRange = jumpFixupPtr->exceptIndex;
-    lastRange  = (envPtr->exceptArrayNext - 1);
-    for (k = firstRange;  k <= lastRange;  k++) {
-	ExceptionRange *rangePtr = &(envPtr->exceptArrayPtr[k]);
-	rangePtr->codeOffset += 3;
-	
-	switch (rangePtr->type) {
-	case LOOP_EXCEPTION_RANGE:
-	    rangePtr->breakOffset += 3;
-	    if (rangePtr->continueOffset != -1) {
-		rangePtr->continueOffset += 3;
-	    }
-	    break;
-	case CATCH_EXCEPTION_RANGE:
-	    rangePtr->catchOffset += 3;
-	    break;
-	default:
-	    panic("TclFixupForwardJump: bad ExceptionRange type %d\n",
-	            rangePtr->type);
-	}
-    }
-    return 1;			/* the jump was grown */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetInstructionTable --
- *
- *  Returns a pointer to the table describing Tcl bytecode instructions.
- *  This procedure is defined so that clients can access the pointer from
- *  outside the TCL DLLs.
- *
- * Results:
- *	Returns a pointer to the global instruction table, same as the
- *	expression (&instructionTable[0]).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-InstructionDesc *
-TclGetInstructionTable()
-{
-    return &instructionTable[0];
-}
-
-/*
- *--------------------------------------------------------------
- *
- * TclRegisterAuxDataType --
- *
- *	This procedure is called to register a new AuxData type
- *	in the table of all AuxData types supported by Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The type is registered in the AuxData type table. If there was already
- *	a type with the same name as in typePtr, it is replaced with the
- *	new type.
- *
- *--------------------------------------------------------------
- */
-
-void
-TclRegisterAuxDataType(typePtr)
-    AuxDataType *typePtr;	/* Information about object type;
-                             * storage must be statically
-                             * allocated (must live forever). */
-{
-    register Tcl_HashEntry *hPtr;
-    int new;
-
-    Tcl_MutexLock(&tableMutex);
-    if (!auxDataTypeTableInitialized) {
-        TclInitAuxDataTypeTable();
-    }
-
-    /*
-     * If there's already a type with the given name, remove it.
-     */
-
-    hPtr = Tcl_FindHashEntry(&auxDataTypeTable, typePtr->name);
-    if (hPtr != (Tcl_HashEntry *) NULL) {
-        Tcl_DeleteHashEntry(hPtr);
-    }
-
-    /*
-     * Now insert the new object type.
-     */
-
-    hPtr = Tcl_CreateHashEntry(&auxDataTypeTable, typePtr->name, &new);
-    if (new) {
-        Tcl_SetHashValue(hPtr, typePtr);
-    }
-    Tcl_MutexUnlock(&tableMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetAuxDataType --
- *
- *	This procedure looks up an Auxdata type by name.
- *
- * Results:
- *	If an AuxData type with name matching "typeName" is found, a pointer
- *	to its AuxDataType structure is returned; otherwise, NULL is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-AuxDataType *
-TclGetAuxDataType(typeName)
-    char *typeName;		/* Name of AuxData type to look up. */
-{
-    register Tcl_HashEntry *hPtr;
-    AuxDataType *typePtr = NULL;
-
-    Tcl_MutexLock(&tableMutex);
-    if (!auxDataTypeTableInitialized) {
-        TclInitAuxDataTypeTable();
-    }
-
-    hPtr = Tcl_FindHashEntry(&auxDataTypeTable, typeName);
-    if (hPtr != (Tcl_HashEntry *) NULL) {
-        typePtr = (AuxDataType *) Tcl_GetHashValue(hPtr);
-    }
-    Tcl_MutexUnlock(&tableMutex);
-
-    return typePtr;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * TclInitAuxDataTypeTable --
- *
- *	This procedure is invoked to perform once-only initialization of
- *	the AuxData type table. It also registers the AuxData types defined in 
- *	this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Initializes the table of defined AuxData types "auxDataTypeTable" with
- *	builtin AuxData types defined in this file.
- *
- *--------------------------------------------------------------
- */
-
-void
-TclInitAuxDataTypeTable()
-{
-    /*
-     * The table mutex must already be held before this routine is invoked.
-     */
-
-    auxDataTypeTableInitialized = 1;
-    Tcl_InitHashTable(&auxDataTypeTable, TCL_STRING_KEYS);
-
-    /*
-     * There is only one AuxData type at this time, so register it here.
-     */
-
-    TclRegisterAuxDataType(&tclForeachInfoType);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeAuxDataTypeTable --
- *
- *	This procedure is called by Tcl_Finalize after all exit handlers
- *	have been run to free up storage associated with the table of AuxData
- *	types.  This procedure is called by TclFinalizeExecution() which
- *	is called by Tcl_Finalize().
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deletes all entries in the hash table of AuxData types.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeAuxDataTypeTable()
-{
-    Tcl_MutexLock(&tableMutex);
-    if (auxDataTypeTableInitialized) {
-        Tcl_DeleteHashTable(&auxDataTypeTable);
-        auxDataTypeTableInitialized = 0;
-    }
-    Tcl_MutexUnlock(&tableMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetCmdLocEncodingSize --
- *
- *	Computes the total number of bytes needed to encode the command
- *	location information for some compiled code.
- *
- * Results:
- *	The byte count needed to encode the compiled location information.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetCmdLocEncodingSize(envPtr)
-     CompileEnv *envPtr;	/* Points to compilation environment
-				 * structure containing the CmdLocation
-				 * structure to encode. */
-{
-    register CmdLocation *mapPtr = envPtr->cmdMapPtr;
-    int numCmds = envPtr->numCommands;
-    int codeDelta, codeLen, srcDelta, srcLen;
-    int codeDeltaNext, codeLengthNext, srcDeltaNext, srcLengthNext;
-				/* The offsets in their respective byte
-				 * sequences where the next encoded offset
-				 * or length should go. */
-    int prevCodeOffset, prevSrcOffset, i;
-
-    codeDeltaNext = codeLengthNext = srcDeltaNext = srcLengthNext = 0;
-    prevCodeOffset = prevSrcOffset = 0;
-    for (i = 0;  i < numCmds;  i++) {
-	codeDelta = (mapPtr[i].codeOffset - prevCodeOffset);
-	if (codeDelta < 0) {
-	    panic("GetCmdLocEncodingSize: bad code offset");
-	} else if (codeDelta <= 127) {
-	    codeDeltaNext++;
-	} else {
-	    codeDeltaNext += 5;	 /* 1 byte for 0xFF, 4 for positive delta */
-	}
-	prevCodeOffset = mapPtr[i].codeOffset;
-
-	codeLen = mapPtr[i].numCodeBytes;
-	if (codeLen < 0) {
-	    panic("GetCmdLocEncodingSize: bad code length");
-	} else if (codeLen <= 127) {
-	    codeLengthNext++;
-	} else {
-	    codeLengthNext += 5; /* 1 byte for 0xFF, 4 for length */
-	}
-
-	srcDelta = (mapPtr[i].srcOffset - prevSrcOffset);
-	if ((-127 <= srcDelta) && (srcDelta <= 127)) {
-	    srcDeltaNext++;
-	} else {
-	    srcDeltaNext += 5;	 /* 1 byte for 0xFF, 4 for delta */
-	}
-	prevSrcOffset = mapPtr[i].srcOffset;
-
-	srcLen = mapPtr[i].numSrcBytes;
-	if (srcLen < 0) {
-	    panic("GetCmdLocEncodingSize: bad source length");
-	} else if (srcLen <= 127) {
-	    srcLengthNext++;
-	} else {
-	    srcLengthNext += 5;	 /* 1 byte for 0xFF, 4 for length */
-	}
-    }
-
-    return (codeDeltaNext + codeLengthNext + srcDeltaNext + srcLengthNext);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EncodeCmdLocMap --
- *
- *	Encode the command location information for some compiled code into
- *	a ByteCode structure. The encoded command location map is stored as
- *	three adjacent byte sequences.
- *
- * Results:
- *	Pointer to the first byte after the encoded command location
- *	information.
- *
- * Side effects:
- *	The encoded information is stored into the block of memory headed
- *	by codePtr. Also records pointers to the start of the four byte
- *	sequences in fields in codePtr's ByteCode header structure.
- *
- *----------------------------------------------------------------------
- */
-
-static unsigned char *
-EncodeCmdLocMap(envPtr, codePtr, startPtr)
-     CompileEnv *envPtr;	/* Points to compilation environment
-				 * structure containing the CmdLocation
-				 * structure to encode. */
-     ByteCode *codePtr;		/* ByteCode in which to encode envPtr's
-				 * command location information. */
-     unsigned char *startPtr;	/* Points to the first byte in codePtr's
-				 * memory block where the location
-				 * information is to be stored. */
-{
-    register CmdLocation *mapPtr = envPtr->cmdMapPtr;
-    int numCmds = envPtr->numCommands;
-    register unsigned char *p = startPtr;
-    int codeDelta, codeLen, srcDelta, srcLen, prevOffset;
-    register int i;
-    
-    /*
-     * Encode the code offset for each command as a sequence of deltas.
-     */
-
-    codePtr->codeDeltaStart = p;
-    prevOffset = 0;
-    for (i = 0;  i < numCmds;  i++) {
-	codeDelta = (mapPtr[i].codeOffset - prevOffset);
-	if (codeDelta < 0) {
-	    panic("EncodeCmdLocMap: bad code offset");
-	} else if (codeDelta <= 127) {
-	    TclStoreInt1AtPtr(codeDelta, p);
-	    p++;
-	} else {
-	    TclStoreInt1AtPtr(0xFF, p);
-	    p++;
-	    TclStoreInt4AtPtr(codeDelta, p);
-	    p += 4;
-	}
-	prevOffset = mapPtr[i].codeOffset;
-    }
-
-    /*
-     * Encode the code length for each command.
-     */
-
-    codePtr->codeLengthStart = p;
-    for (i = 0;  i < numCmds;  i++) {
-	codeLen = mapPtr[i].numCodeBytes;
-	if (codeLen < 0) {
-	    panic("EncodeCmdLocMap: bad code length");
-	} else if (codeLen <= 127) {
-	    TclStoreInt1AtPtr(codeLen, p);
-	    p++;
-	} else {
-	    TclStoreInt1AtPtr(0xFF, p);
-	    p++;
-	    TclStoreInt4AtPtr(codeLen, p);
-	    p += 4;
-	}
-    }
-
-    /*
-     * Encode the source offset for each command as a sequence of deltas.
-     */
-
-    codePtr->srcDeltaStart = p;
-    prevOffset = 0;
-    for (i = 0;  i < numCmds;  i++) {
-	srcDelta = (mapPtr[i].srcOffset - prevOffset);
-	if ((-127 <= srcDelta) && (srcDelta <= 127)) {
-	    TclStoreInt1AtPtr(srcDelta, p);
-	    p++;
-	} else {
-	    TclStoreInt1AtPtr(0xFF, p);
-	    p++;
-	    TclStoreInt4AtPtr(srcDelta, p);
-	    p += 4;
-	}
-	prevOffset = mapPtr[i].srcOffset;
-    }
-
-    /*
-     * Encode the source length for each command.
-     */
-
-    codePtr->srcLengthStart = p;
-    for (i = 0;  i < numCmds;  i++) {
-	srcLen = mapPtr[i].numSrcBytes;
-	if (srcLen < 0) {
-	    panic("EncodeCmdLocMap: bad source length");
-	} else if (srcLen <= 127) {
-	    TclStoreInt1AtPtr(srcLen, p);
-	    p++;
-	} else {
-	    TclStoreInt1AtPtr(0xFF, p);
-	    p++;
-	    TclStoreInt4AtPtr(srcLen, p);
-	    p += 4;
-	}
-    }
-    
-    return p;
-}
-
-#ifdef TCL_COMPILE_DEBUG
-/*
- *----------------------------------------------------------------------
- *
- * TclPrintByteCodeObj --
- *
- *	This procedure prints ("disassembles") the instructions of a
- *	bytecode object to stdout.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclPrintByteCodeObj(interp, objPtr)
-    Tcl_Interp *interp;		/* Used only for Tcl_GetStringFromObj. */
-    Tcl_Obj *objPtr;		/* The bytecode object to disassemble. */
-{
-    ByteCode* codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-    unsigned char *codeStart, *codeLimit, *pc;
-    unsigned char *codeDeltaNext, *codeLengthNext;
-    unsigned char *srcDeltaNext, *srcLengthNext;
-    int codeOffset, codeLen, srcOffset, srcLen, numCmds, delta, i;
-    Interp *iPtr = (Interp *) *codePtr->interpHandle;
-
-    if (codePtr->refCount <= 0) {
-	return;			/* already freed */
-    }
-
-    codeStart = codePtr->codeStart;
-    codeLimit = (codeStart + codePtr->numCodeBytes);
-    numCmds = codePtr->numCommands;
-
-    /*
-     * Print header lines describing the ByteCode.
-     */
-
-    fprintf(stdout, "\nByteCode 0x%x, refCt %u, epoch %u, interp 0x%x (epoch %u)\n",
-	    (unsigned int) codePtr, codePtr->refCount,
-	    codePtr->compileEpoch, (unsigned int) iPtr,
-	    iPtr->compileEpoch);
-    fprintf(stdout, "  Source ");
-    TclPrintSource(stdout, codePtr->source,
-	    TclMin(codePtr->numSrcBytes, 55));
-    fprintf(stdout, "\n  Cmds %d, src %d, inst %d, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
-	    numCmds, codePtr->numSrcBytes, codePtr->numCodeBytes,
-	    codePtr->numLitObjects, codePtr->numAuxDataItems,
-	    codePtr->maxStackDepth,
-#ifdef TCL_COMPILE_STATS
-	    (codePtr->numSrcBytes?
-	            ((float)codePtr->structureSize)/((float)codePtr->numSrcBytes) : 0.0));
-#else
-	    0.0);
-#endif
-#ifdef TCL_COMPILE_STATS
-    fprintf(stdout,
-	    "  Code %d = header %d+inst %d+litObj %d+exc %d+aux %d+cmdMap %d\n",
-	    codePtr->structureSize,
-	    (sizeof(ByteCode) - (sizeof(size_t) + sizeof(Tcl_Time))),
-	    codePtr->numCodeBytes,
-	    (codePtr->numLitObjects * sizeof(Tcl_Obj *)),
-	    (codePtr->numExceptRanges * sizeof(ExceptionRange)),
-	    (codePtr->numAuxDataItems * sizeof(AuxData)),
-	    codePtr->numCmdLocBytes);
-#endif /* TCL_COMPILE_STATS */
-    
-    /*
-     * If the ByteCode is the compiled body of a Tcl procedure, print
-     * information about that procedure. Note that we don't know the
-     * procedure's name since ByteCode's can be shared among procedures.
-     */
-    
-    if (codePtr->procPtr != NULL) {
-	Proc *procPtr = codePtr->procPtr;
-	int numCompiledLocals = procPtr->numCompiledLocals;
-	fprintf(stdout,
-	        "  Proc 0x%x, refCt %d, args %d, compiled locals %d\n",
-		(unsigned int) procPtr, procPtr->refCount, procPtr->numArgs,
-		numCompiledLocals);
-	if (numCompiledLocals > 0) {
-	    CompiledLocal *localPtr = procPtr->firstLocalPtr;
-	    for (i = 0;  i < numCompiledLocals;  i++) {
-		fprintf(stdout, "      slot %d%s%s%s%s%s%s", i, 
-			((localPtr->flags & VAR_SCALAR)?  ", scalar"  : ""),
-			((localPtr->flags & VAR_ARRAY)?  ", array"  : ""),
-			((localPtr->flags & VAR_LINK)?  ", link"  : ""),
-			((localPtr->flags & VAR_ARGUMENT)?  ", arg"  : ""),
-			((localPtr->flags & VAR_TEMPORARY)? ", temp" : ""),
-			((localPtr->flags & VAR_RESOLVED)? ", resolved" : ""));
-		if (TclIsVarTemporary(localPtr)) {
-		    fprintf(stdout,	"\n");
-		} else {
-		    fprintf(stdout,	", \"%s\"\n", localPtr->name);
-		}
-		localPtr = localPtr->nextPtr;
-	    }
-	}
-    }
-
-    /*
-     * Print the ExceptionRange array.
-     */
-
-    if (codePtr->numExceptRanges > 0) {
-	fprintf(stdout, "  Exception ranges %d, depth %d:\n",
-	        codePtr->numExceptRanges, codePtr->maxExceptDepth);
-	for (i = 0;  i < codePtr->numExceptRanges;  i++) {
-	    ExceptionRange *rangePtr = &(codePtr->exceptArrayPtr[i]);
-	    fprintf(stdout, "      %d: level %d, %s, pc %d-%d, ",
-		    i, rangePtr->nestingLevel,
-		    ((rangePtr->type == LOOP_EXCEPTION_RANGE)
-			    ? "loop" : "catch"),
-		    rangePtr->codeOffset,
-		    (rangePtr->codeOffset + rangePtr->numCodeBytes - 1));
-	    switch (rangePtr->type) {
-	    case LOOP_EXCEPTION_RANGE:
-		fprintf(stdout,	"continue %d, break %d\n",
-		        rangePtr->continueOffset, rangePtr->breakOffset);
-		break;
-	    case CATCH_EXCEPTION_RANGE:
-		fprintf(stdout,	"catch %d\n", rangePtr->catchOffset);
-		break;
-	    default:
-		panic("TclPrintByteCodeObj: bad ExceptionRange type %d\n",
-		        rangePtr->type);
-	    }
-	}
-    }
-    
-    /*
-     * If there were no commands (e.g., an expression or an empty string
-     * was compiled), just print all instructions and return.
-     */
-
-    if (numCmds == 0) {
-	pc = codeStart;
-	while (pc < codeLimit) {
-	    fprintf(stdout, "    ");
-	    pc += TclPrintInstruction(codePtr, pc);
-	}
-	return;
-    }
-    
-    /*
-     * Print table showing the code offset, source offset, and source
-     * length for each command. These are encoded as a sequence of bytes.
-     */
-
-    fprintf(stdout, "  Commands %d:", numCmds);
-    codeDeltaNext = codePtr->codeDeltaStart;
-    codeLengthNext = codePtr->codeLengthStart;
-    srcDeltaNext  = codePtr->srcDeltaStart;
-    srcLengthNext = codePtr->srcLengthStart;
-    codeOffset = srcOffset = 0;
-    for (i = 0;  i < numCmds;  i++) {
-	if ((unsigned int) (*codeDeltaNext) == (unsigned int) 0xFF) {
-	    codeDeltaNext++;
-	    delta = TclGetInt4AtPtr(codeDeltaNext);
-	    codeDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(codeDeltaNext);
-	    codeDeltaNext++;
-	}
-	codeOffset += delta;
-
-	if ((unsigned int) (*codeLengthNext) == (unsigned int) 0xFF) {
-	    codeLengthNext++;
-	    codeLen = TclGetInt4AtPtr(codeLengthNext);
-	    codeLengthNext += 4;
-	} else {
-	    codeLen = TclGetInt1AtPtr(codeLengthNext);
-	    codeLengthNext++;
-	}
-	
-	if ((unsigned int) (*srcDeltaNext) == (unsigned int) 0xFF) {
-	    srcDeltaNext++;
-	    delta = TclGetInt4AtPtr(srcDeltaNext);
-	    srcDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(srcDeltaNext);
-	    srcDeltaNext++;
-	}
-	srcOffset += delta;
-
-	if ((unsigned int) (*srcLengthNext) == (unsigned int) 0xFF) {
-	    srcLengthNext++;
-	    srcLen = TclGetInt4AtPtr(srcLengthNext);
-	    srcLengthNext += 4;
-	} else {
-	    srcLen = TclGetInt1AtPtr(srcLengthNext);
-	    srcLengthNext++;
-	}
-	
-	fprintf(stdout,	"%s%4d: pc %d-%d, src %d-%d",
-		((i % 2)? "   	" : "\n   "),
-		(i+1), codeOffset, (codeOffset + codeLen - 1),
-		srcOffset, (srcOffset + srcLen - 1));
-    }
-    if (numCmds > 0) {
-	fprintf(stdout,	"\n");
-    }
-    
-    /*
-     * Print each instruction. If the instruction corresponds to the start
-     * of a command, print the command's source. Note that we don't need
-     * the code length here.
-     */
-
-    codeDeltaNext = codePtr->codeDeltaStart;
-    srcDeltaNext  = codePtr->srcDeltaStart;
-    srcLengthNext = codePtr->srcLengthStart;
-    codeOffset = srcOffset = 0;
-    pc = codeStart;
-    for (i = 0;  i < numCmds;  i++) {
-	if ((unsigned int) (*codeDeltaNext) == (unsigned int) 0xFF) {
-	    codeDeltaNext++;
-	    delta = TclGetInt4AtPtr(codeDeltaNext);
-	    codeDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(codeDeltaNext);
-	    codeDeltaNext++;
-	}
-	codeOffset += delta;
-
-	if ((unsigned int) (*srcDeltaNext) == (unsigned int) 0xFF) {
-	    srcDeltaNext++;
-	    delta = TclGetInt4AtPtr(srcDeltaNext);
-	    srcDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(srcDeltaNext);
-	    srcDeltaNext++;
-	}
-	srcOffset += delta;
-
-	if ((unsigned int) (*srcLengthNext) == (unsigned int) 0xFF) {
-	    srcLengthNext++;
-	    srcLen = TclGetInt4AtPtr(srcLengthNext);
-	    srcLengthNext += 4;
-	} else {
-	    srcLen = TclGetInt1AtPtr(srcLengthNext);
-	    srcLengthNext++;
-	}
-
-	/*
-	 * Print instructions before command i.
-	 */
-	
-	while ((pc-codeStart) < codeOffset) {
-	    fprintf(stdout, "    ");
-	    pc += TclPrintInstruction(codePtr, pc);
-	}
-
-	fprintf(stdout, "  Command %d: ", (i+1));
-	TclPrintSource(stdout, (codePtr->source + srcOffset),
-	        TclMin(srcLen, 55));
-	fprintf(stdout, "\n");
-    }
-    if (pc < codeLimit) {
-	/*
-	 * Print instructions after the last command.
-	 */
-
-	while (pc < codeLimit) {
-	    fprintf(stdout, "    ");
-	    pc += TclPrintInstruction(codePtr, pc);
-	}
-    }
-}
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPrintInstruction --
- *
- *	This procedure prints ("disassembles") one instruction from a
- *	bytecode object to stdout.
- *
- * Results:
- *	Returns the length in bytes of the current instruiction.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclPrintInstruction(codePtr, pc)
-    ByteCode* codePtr;		/* Bytecode containing the instruction. */
-    unsigned char *pc;		/* Points to first byte of instruction. */
-{
-    Proc *procPtr = codePtr->procPtr;
-    unsigned char opCode = *pc;
-    register InstructionDesc *instDesc = &instructionTable[opCode];
-    unsigned char *codeStart = codePtr->codeStart;
-    unsigned int pcOffset = (pc - codeStart);
-    int opnd, i, j;
-    
-    fprintf(stdout, "(%u) %s ", pcOffset, instDesc->name);
-    for (i = 0;  i < instDesc->numOperands;  i++) {
-	switch (instDesc->opTypes[i]) {
-	case OPERAND_INT1:
-	    opnd = TclGetInt1AtPtr(pc+1+i);
-	    if ((i == 0) && ((opCode == INST_JUMP1)
-			     || (opCode == INST_JUMP_TRUE1)
-		             || (opCode == INST_JUMP_FALSE1))) {
-		fprintf(stdout, "%d  	# pc %u", opnd, (pcOffset + opnd));
-	    } else {
-		fprintf(stdout, "%d", opnd);
-	    }
-	    break;
-	case OPERAND_INT4:
-	    opnd = TclGetInt4AtPtr(pc+1+i);
-	    if ((i == 0) && ((opCode == INST_JUMP4)
-			     || (opCode == INST_JUMP_TRUE4)
-		             || (opCode == INST_JUMP_FALSE4))) {
-		fprintf(stdout, "%d  	# pc %u", opnd, (pcOffset + opnd));
-	    } else {
-		fprintf(stdout, "%d", opnd);
-	    }
-	    break;
-	case OPERAND_UINT1:
-	    opnd = TclGetUInt1AtPtr(pc+1+i);
-	    if ((i == 0) && (opCode == INST_PUSH1)) {
-		fprintf(stdout, "%u  	# ", (unsigned int) opnd);
-		TclPrintObject(stdout, codePtr->objArrayPtr[opnd], 40);
-	    } else if ((i == 0) && ((opCode == INST_LOAD_SCALAR1)
-				    || (opCode == INST_LOAD_ARRAY1)
-				    || (opCode == INST_STORE_SCALAR1)
-				    || (opCode == INST_STORE_ARRAY1))) {
-		int localCt = procPtr->numCompiledLocals;
-		CompiledLocal *localPtr = procPtr->firstLocalPtr;
-		if (opnd >= localCt) {
-		    panic("TclPrintInstruction: bad local var index %u (%u locals)\n",
-			     (unsigned int) opnd, localCt);
-		    return instDesc->numBytes;
-		}
-		for (j = 0;  j < opnd;  j++) {
-		    localPtr = localPtr->nextPtr;
-		}
-		if (TclIsVarTemporary(localPtr)) {
-		    fprintf(stdout, "%u	# temp var %u",
-			    (unsigned int) opnd, (unsigned int) opnd);
-		} else {
-		    fprintf(stdout, "%u	# var ", (unsigned int) opnd);
-		    TclPrintSource(stdout, localPtr->name, 40);
-		}
-	    } else {
-		fprintf(stdout, "%u ", (unsigned int) opnd);
-	    }
-	    break;
-	case OPERAND_UINT4:
-	    opnd = TclGetUInt4AtPtr(pc+1+i);
-	    if (opCode == INST_PUSH4) {
-		fprintf(stdout, "%u  	# ", opnd);
-		TclPrintObject(stdout, codePtr->objArrayPtr[opnd], 40);
-	    } else if ((i == 0) && ((opCode == INST_LOAD_SCALAR4)
-				    || (opCode == INST_LOAD_ARRAY4)
-				    || (opCode == INST_STORE_SCALAR4)
-				    || (opCode == INST_STORE_ARRAY4))) {
-		int localCt = procPtr->numCompiledLocals;
-		CompiledLocal *localPtr = procPtr->firstLocalPtr;
-		if (opnd >= localCt) {
-		    panic("TclPrintInstruction: bad local var index %u (%u locals)\n",
-			     (unsigned int) opnd, localCt);
-		    return instDesc->numBytes;
-		}
-		for (j = 0;  j < opnd;  j++) {
-		    localPtr = localPtr->nextPtr;
-		}
-		if (TclIsVarTemporary(localPtr)) {
-		    fprintf(stdout, "%u	# temp var %u",
-			    (unsigned int) opnd, (unsigned int) opnd);
-		} else {
-		    fprintf(stdout, "%u	# var ", (unsigned int) opnd);
-		    TclPrintSource(stdout, localPtr->name, 40);
-		}
-	    } else {
-		fprintf(stdout, "%u ", (unsigned int) opnd);
-	    }
-	    break;
-	case OPERAND_NONE:
-	default:
-	    break;
-	}
-    }
-    fprintf(stdout, "\n");
-    return instDesc->numBytes;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPrintObject --
- *
- *	This procedure prints up to a specified number of characters from
- *	the argument Tcl object's string representation to a specified file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Outputs characters to the specified file.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclPrintObject(outFile, objPtr, maxChars)
-    FILE *outFile;		/* The file to print the source to. */
-    Tcl_Obj *objPtr;		/* Points to the Tcl object whose string
-				 * representation should be printed. */
-    int maxChars;		/* Maximum number of chars to print. */
-{
-    char *bytes;
-    int length;
-    
-    bytes = Tcl_GetStringFromObj(objPtr, &length);
-    TclPrintSource(outFile, bytes, TclMin(length, maxChars));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPrintSource --
- *
- *	This procedure prints up to a specified number of characters from
- *	the argument string to a specified file. It tries to produce legible
- *	output by adding backslashes as necessary.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Outputs characters to the specified file.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclPrintSource(outFile, string, maxChars)
-    FILE *outFile;		/* The file to print the source to. */
-    char *string;		/* The string to print. */
-    int maxChars;		/* Maximum number of chars to print. */
-{
-    register char *p;
-    register int i = 0;
-
-    if (string == NULL) {
-	fprintf(outFile, "\"\"");
-	return;
-    }
-
-    fprintf(outFile, "\"");
-    p = string;
-    for (;  (*p != '\0') && (i < maxChars);  p++, i++) {
-	switch (*p) {
-	    case '"':
-		fprintf(outFile, "\\\"");
-		continue;
-	    case '\f':
-		fprintf(outFile, "\\f");
-		continue;
-	    case '\n':
-		fprintf(outFile, "\\n");
-		continue;
-            case '\r':
-		fprintf(outFile, "\\r");
-		continue;
-	    case '\t':
-		fprintf(outFile, "\\t");
-		continue;
-            case '\v':
-		fprintf(outFile, "\\v");
-		continue;
-	    default:
-		fprintf(outFile, "%c", *p);
-		continue;
-	}
-    }
-    fprintf(outFile, "\"");
-}
-
-#ifdef TCL_COMPILE_STATS
-/*
- *----------------------------------------------------------------------
- *
- * RecordByteCodeStats --
- *
- *	Accumulates various compilation-related statistics for each newly
- *	compiled ByteCode. Called by the TclInitByteCodeObj when Tcl is
- *	compiled with the -DTCL_COMPILE_STATS flag
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Accumulates aggregate code-related statistics in the interpreter's
- *	ByteCodeStats structure. Records statistics specific to a ByteCode
- *	in its ByteCode structure.
- *
- *----------------------------------------------------------------------
- */
-
-void
-RecordByteCodeStats(codePtr)
-    ByteCode *codePtr;		/* Points to ByteCode structure with info
-				 * to add to accumulated statistics. */
-{
-    Interp *iPtr = (Interp *) *codePtr->interpHandle;
-    register ByteCodeStats *statsPtr = &(iPtr->stats);
-
-    statsPtr->numCompilations++;
-    statsPtr->totalSrcBytes        += (double) codePtr->numSrcBytes;
-    statsPtr->totalByteCodeBytes   += (double) codePtr->structureSize;
-    statsPtr->currentSrcBytes      += (double) codePtr->numSrcBytes;
-    statsPtr->currentByteCodeBytes += (double) codePtr->structureSize;
-    
-    statsPtr->srcCount[TclLog2(codePtr->numSrcBytes)]++;
-    statsPtr->byteCodeCount[TclLog2(codePtr->structureSize)]++;
-
-    statsPtr->currentInstBytes   += (double) codePtr->numCodeBytes;
-    statsPtr->currentLitBytes    +=
-	    (double) (codePtr->numLitObjects * sizeof(Tcl_Obj *)); 
-    statsPtr->currentExceptBytes +=
-	    (double) (codePtr->numExceptRanges * sizeof(ExceptionRange));
-    statsPtr->currentAuxBytes    +=
-            (double) (codePtr->numAuxDataItems * sizeof(AuxData));
-    statsPtr->currentCmdMapBytes += (double) codePtr->numCmdLocBytes;
-}
-#endif /* TCL_COMPILE_STATS */
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
deleted file mode 100644
index 4a718fd..0000000
--- a/generic/tclCompile.h
+++ /dev/null
@@ -1,981 +0,0 @@
-/*
- * tclCompile.h --
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclCompile.h,v 1.10 1999/04/16 00:46:45 stanton Exp $
- */
-
-#ifndef _TCLCOMPILATION
-#define _TCLCOMPILATION 1
-
-#ifndef _TCLINT
-#include "tclInt.h"
-#endif /* _TCLINT */
-
-#ifdef BUILD_tcl
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- *------------------------------------------------------------------------
- * Variables related to compilation. These are used in tclCompile.c,
- * tclExecute.c, tclBasic.c, and their clients.
- *------------------------------------------------------------------------
- */
-
-/*
- * Variable that denotes the command name Tcl object type. Objects of this
- * type cache the Command pointer that results from looking up command names
- * in the command hashtable.
- */
-
-extern Tcl_ObjType	tclCmdNameType;
-
-/*
- * Variable that controls whether compilation tracing is enabled and, if so,
- * what level of tracing is desired:
- *    0: no compilation tracing
- *    1: summarize compilation of top level cmds and proc bodies
- *    2: display all instructions of each ByteCode compiled
- * This variable is linked to the Tcl variable "tcl_traceCompile".
- */
-
-extern int 		tclTraceCompile;
-
-/*
- * Variable that controls whether execution tracing is enabled and, if so,
- * what level of tracing is desired:
- *    0: no execution tracing
- *    1: trace invocations of Tcl procs only
- *    2: trace invocations of all (not compiled away) commands
- *    3: display each instruction executed
- * This variable is linked to the Tcl variable "tcl_traceExec".
- */
-
-extern int 		tclTraceExec;
-
-/*
- *------------------------------------------------------------------------
- * Data structures related to compilation.
- *------------------------------------------------------------------------
- */
-
-/*
- * The structure used to implement Tcl "exceptions" (exceptional returns):
- * for example, those generated in loops by the break and continue commands,
- * and those generated by scripts and caught by the catch command. This
- * ExceptionRange structure describes a range of code (e.g., a loop body),
- * the kind of exceptions (e.g., a break or continue) that might occur, and
- * the PC offsets to jump to if a matching exception does occur. Exception
- * ranges can nest so this structure includes a nesting level that is used
- * at runtime to find the closest exception range surrounding a PC. For
- * example, when a break command is executed, the ExceptionRange structure
- * for the most deeply nested loop, if any, is found and used. These
- * structures are also generated for the "next" subcommands of for loops
- * since a break there terminates the for command. This means a for command
- * actually generates two LoopInfo structures.
- */
-
-typedef enum {
-    LOOP_EXCEPTION_RANGE,	/* Exception's range is part of a loop.
-				 * Break and continue "exceptions" cause
-				 * jumps to appropriate PC offsets. */
-    CATCH_EXCEPTION_RANGE	/* Exception's range is controlled by a
-				 * catch command. Errors in the range cause
-				 * a jump to a catch PC offset. */
-} ExceptionRangeType;
-
-typedef struct ExceptionRange {
-    ExceptionRangeType type;	/* The kind of ExceptionRange. */
-    int nestingLevel;		/* Static depth of the exception range.
-				 * Used to find the most deeply-nested
-				 * range surrounding a PC at runtime. */
-    int codeOffset;		/* Offset of the first instruction byte of
-				 * the code range. */
-    int numCodeBytes;		/* Number of bytes in the code range. */
-    int breakOffset;		/* If LOOP_EXCEPTION_RANGE, the target PC
-				 * offset for a break command in the range. */
-    int continueOffset;		/* If LOOP_EXCEPTION_RANGE and not -1, the
-				 * target PC offset for a continue command in
-				 * the code range. Otherwise, ignore this range
-				 * when processing a continue command. */
-    int catchOffset;		/* If a CATCH_EXCEPTION_RANGE, the target PC
-				 * offset for any "exception" in range. */
-} ExceptionRange;
-
-/*
- * Structure used to map between instruction pc and source locations. It
- * defines for each compiled Tcl command its code's starting offset and 
- * its source's starting offset and length. Note that the code offset
- * increases monotonically: that is, the table is sorted in code offset
- * order. The source offset is not monotonic.
- */
-
-typedef struct CmdLocation {
-    int codeOffset;		/* Offset of first byte of command code. */
-    int numCodeBytes;		/* Number of bytes for command's code. */
-    int srcOffset;		/* Offset of first char of the command. */
-    int numSrcBytes;		/* Number of command source chars. */
-} CmdLocation;
-
-/*
- * CompileProcs need the ability to record information during compilation
- * that can be used by bytecode instructions during execution. The AuxData
- * structure provides this "auxiliary data" mechanism. An arbitrary number
- * of these structures can be stored in the ByteCode record (during
- * compilation they are stored in a CompileEnv structure). Each AuxData
- * record holds one word of client-specified data (often a pointer) and is
- * given an index that instructions can later use to look up the structure
- * and its data.
- *
- * The following definitions declare the types of procedures that are called
- * to duplicate or free this auxiliary data when the containing ByteCode
- * objects are duplicated and freed. Pointers to these procedures are kept
- * in the AuxData structure.
- */
-
-typedef ClientData (AuxDataDupProc)  _ANSI_ARGS_((ClientData clientData));
-typedef void       (AuxDataFreeProc) _ANSI_ARGS_((ClientData clientData));
-
-/*
- * We define a separate AuxDataType struct to hold type-related information
- * for the AuxData structure. This separation makes it possible for clients
- * outside of the TCL core to manipulate (in a limited fashion!) AuxData;
- * for example, it makes it possible to pickle and unpickle AuxData structs.
- */
-
-typedef struct AuxDataType {
-    char *name;					/* the name of the type. Types can be
-                                 * registered and found by name */
-    AuxDataDupProc *dupProc;	/* Callback procedure to invoke when the
-                                 * aux data is duplicated (e.g., when the
-                                 * ByteCode structure containing the aux
-                                 * data is duplicated). NULL means just
-                                 * copy the source clientData bits; no
-                                 * proc need be called. */
-    AuxDataFreeProc *freeProc;	/* Callback procedure to invoke when the
-                                 * aux data is freed. NULL means no
-                                 * proc need be called. */
-} AuxDataType;
-
-/*
- * The definition of the AuxData structure that holds information created
- * during compilation by CompileProcs and used by instructions during
- * execution.
- */
-
-typedef struct AuxData {
-    AuxDataType *type;		/* pointer to the AuxData type associated with
-                             * this ClientData. */
-    ClientData clientData;	/* The compilation data itself. */
-} AuxData;
-
-/*
- * Structure defining the compilation environment. After compilation, fields
- * describing bytecode instructions are copied out into the more compact
- * ByteCode structure defined below.
- */
-
-#define COMPILEENV_INIT_CODE_BYTES    250
-#define COMPILEENV_INIT_NUM_OBJECTS    60
-#define COMPILEENV_INIT_EXCEPT_RANGES   5
-#define COMPILEENV_INIT_CMD_MAP_SIZE   40
-#define COMPILEENV_INIT_AUX_DATA_SIZE   5
-
-typedef struct CompileEnv {
-    Interp *iPtr;		/* Interpreter containing the code being
-				 * compiled. Commands and their compile
-				 * procs are specific to an interpreter so
-				 * the code emitted will depend on the
-				 * interpreter. */
-    char *source;		/* The source string being compiled by
-				 * SetByteCodeFromAny. This pointer is not
-				 * owned by the CompileEnv and must not be
-				 * freed or changed by it. */
-    int numSrcBytes;		/* Number of bytes in source. */
-    Proc *procPtr;		/* If a procedure is being compiled, a
-				 * pointer to its Proc structure; otherwise
-				 * NULL. Used to compile local variables.
-				 * Set from information provided by
-				 * ObjInterpProc in tclProc.c. */
-    int numCommands;		/* Number of commands compiled. */
-    int exceptDepth;		/* Current exception range nesting level;
-				 * -1 if not in any range currently. */
-    int maxExceptDepth;		/* Max nesting level of exception ranges;
-				 * -1 if no ranges have been compiled. */
-    int maxStackDepth;		/* Maximum number of stack elements needed
-				 * to execute the code. Set by compilation
-				 * procedures before returning. */
-    LiteralTable localLitTable;	/* Contains LiteralEntry's describing
-				 * all Tcl objects referenced by this
-				 * compiled code. Indexed by the string
-				 * representations of the literals. Used to
-				 * avoid creating duplicate objects. */
-    int exprIsJustVarRef;	/* Set 1 if the expression last compiled by
-				 * TclCompileExpr consisted of just a
-				 * variable reference as in the expression
-				 * of "if $b then...". Otherwise 0. Used
-				 * to implement expr's 2 level substitution
-				 * semantics properly. */
-    int exprIsComparison;	/* Set 1 if the top-level operator in the
-				 * expression last compiled is a comparison.
-				 * Otherwise 0. If 1, since the operands
-				 * might be strings, the expr is compiled
-				 * out-of-line to implement expr's 2 level
-				 * substitution semantics properly. */
-    unsigned char *codeStart;	/* Points to the first byte of the code. */
-    unsigned char *codeNext;	/* Points to next code array byte to use. */
-    unsigned char *codeEnd;	/* Points just after the last allocated
-				 * code array byte. */
-    int mallocedCodeArray;      /* Set 1 if code array was expanded 
-				 * and codeStart points into the heap.*/
-    LiteralEntry *literalArrayPtr;
-    				/* Points to start of LiteralEntry array. */
-    int literalArrayNext;	/* Index of next free object array entry. */
-    int literalArrayEnd;	/* Index just after last obj array entry. */
-    int mallocedLiteralArray;   /* 1 if object array was expanded and
-                                 * objArray points into the heap, else 0. */
-    ExceptionRange *exceptArrayPtr;
-    				/* Points to start of the ExceptionRange
-				 * array. */
-    int exceptArrayNext;	/* Next free ExceptionRange array index.
-				 * exceptArrayNext is the number of ranges
-				 * and (exceptArrayNext-1) is the index of
-				 * the current range's array entry. */
-    int exceptArrayEnd;		/* Index after the last ExceptionRange
-				 * array entry. */
-    int mallocedExceptArray;	/* 1 if ExceptionRange array was expanded
-				 * and exceptArrayPtr points in heap,
-				 * else 0. */
-    CmdLocation *cmdMapPtr;	/* Points to start of CmdLocation array.
-				 * numCommands is the index of the next
-				 * entry to use; (numCommands-1) is the
-				 * entry index for the last command. */
-    int cmdMapEnd;		/* Index after last CmdLocation entry. */
-    int mallocedCmdMap;		/* 1 if command map array was expanded and
-				 * cmdMapPtr points in the heap, else 0. */
-    AuxData *auxDataArrayPtr;   /* Points to auxiliary data array start. */
-    int auxDataArrayNext;	/* Next free compile aux data array index.
-				 * auxDataArrayNext is the number of aux
-				 * data items and (auxDataArrayNext-1) is
-				 * index of current aux data array entry. */
-    int auxDataArrayEnd;	/* Index after last aux data array entry. */
-    int mallocedAuxDataArray;	/* 1 if aux data array was expanded and
-				 * auxDataArrayPtr points in heap else 0. */
-    unsigned char staticCodeSpace[COMPILEENV_INIT_CODE_BYTES];
-                                /* Initial storage for code. */
-    LiteralEntry staticLiteralSpace[COMPILEENV_INIT_NUM_OBJECTS];
-                                /* Initial storage of LiteralEntry array. */
-    ExceptionRange staticExceptArraySpace[COMPILEENV_INIT_EXCEPT_RANGES];
-                                /* Initial ExceptionRange array storage. */
-    CmdLocation staticCmdMapSpace[COMPILEENV_INIT_CMD_MAP_SIZE];
-                                /* Initial storage for cmd location map. */
-    AuxData staticAuxDataArraySpace[COMPILEENV_INIT_AUX_DATA_SIZE];
-                                /* Initial storage for aux data array. */
-} CompileEnv;
-
-/*
- * The structure defining the bytecode instructions resulting from compiling
- * a Tcl script. Note that this structure is variable length: a single heap
- * object is allocated to hold the ByteCode structure immediately followed
- * by the code bytes, the literal object array, the ExceptionRange array,
- * the CmdLocation map, and the compilation AuxData array.
- */
-
-/*
- * A PRECOMPILED bytecode struct is one that was generated from a compiled
- * image rather than implicitly compiled from source
- */
-#define TCL_BYTECODE_PRECOMPILED		0x0001
-
-typedef struct ByteCode {
-    TclHandle interpHandle;	/* Handle for interpreter containing the
-				 * compiled code.  Commands and their compile
-				 * procs are specific to an interpreter so the
-				 * code emitted will depend on the
-				 * interpreter. */
-    int compileEpoch;		/* Value of iPtr->compileEpoch when this
-				 * ByteCode was compiled. Used to invalidate
-				 * code when, e.g., commands with compile
-				 * procs are redefined. */
-    Namespace *nsPtr;		/* Namespace context in which this code
-				 * was compiled. If the code is executed
-				 * if a different namespace, it must be
-				 * recompiled. */
-    int nsEpoch;		/* Value of nsPtr->resolverEpoch when this
-				 * ByteCode was compiled. Used to invalidate
-				 * code when new namespace resolution rules
-				 * are put into effect. */
-    int refCount;		/* Reference count: set 1 when created
-				 * plus 1 for each execution of the code
-				 * currently active. This structure can be
-				 * freed when refCount becomes zero. */
-    unsigned int flags;		/* flags describing state for the codebyte.
-                                 * this variable holds ORed values from the
-                                 * TCL_BYTECODE_ masks defined above */
-    char *source;		/* The source string from which this
-				 * ByteCode was compiled. Note that this
-				 * pointer is not owned by the ByteCode and
-				 * must not be freed or modified by it. */
-    Proc *procPtr;		/* If the ByteCode was compiled from a
-				 * procedure body, this is a pointer to its
-				 * Proc structure; otherwise NULL. This
-				 * pointer is also not owned by the ByteCode
-				 * and must not be freed by it. */
-    size_t structureSize;	/* Number of bytes in the ByteCode structure
-				 * itself. Does not include heap space for
-				 * literal Tcl objects or storage referenced
-				 * by AuxData entries. */
-    int numCommands;		/* Number of commands compiled. */
-    int numSrcBytes;		/* Number of source bytes compiled. */
-    int numCodeBytes;		/* Number of code bytes. */
-    int numLitObjects;		/* Number of objects in literal array. */
-    int numExceptRanges;	/* Number of ExceptionRange array elems. */
-    int numAuxDataItems;	/* Number of AuxData items. */
-    int numCmdLocBytes;		/* Number of bytes needed for encoded
-				 * command location information. */
-    int maxExceptDepth;		/* Maximum nesting level of ExceptionRanges;
-				 * -1 if no ranges were compiled. */
-    int maxStackDepth;		/* Maximum number of stack elements needed
-				 * to execute the code. */
-    unsigned char *codeStart;	/* Points to the first byte of the code.
-				 * This is just after the final ByteCode
-				 * member cmdMapPtr. */
-    Tcl_Obj **objArrayPtr;	/* Points to the start of the literal
-				 * object array. This is just after the
-				 * last code byte. */
-    ExceptionRange *exceptArrayPtr;
-    				/* Points to the start of the ExceptionRange
-				 * array. This is just after the last
-				 * object in the object array. */
-    AuxData *auxDataArrayPtr;   /* Points to the start of the auxiliary data
-				 * array. This is just after the last entry
-				 * in the ExceptionRange array. */
-    unsigned char *codeDeltaStart;
-				/* Points to the first of a sequence of
-				 * bytes that encode the change in the
-				 * starting offset of each command's code.
-				 * If -127<=delta<=127, it is encoded as 1
-				 * byte, otherwise 0xFF (128) appears and
-				 * the delta is encoded by the next 4 bytes.
-				 * Code deltas are always positive. This
-				 * sequence is just after the last entry in
-				 * the AuxData array. */
-    unsigned char *codeLengthStart;
-				/* Points to the first of a sequence of
-				 * bytes that encode the length of each
-				 * command's code. The encoding is the same
-				 * as for code deltas. Code lengths are
-				 * always positive. This sequence is just
-				 * after the last entry in the code delta
-				 * sequence. */
-    unsigned char *srcDeltaStart;
-				/* Points to the first of a sequence of
-				 * bytes that encode the change in the
-				 * starting offset of each command's source.
-				 * The encoding is the same as for code
-				 * deltas. Source deltas can be negative.
-				 * This sequence is just after the last byte
-				 * in the code length sequence. */
-    unsigned char *srcLengthStart;
-				/* Points to the first of a sequence of
-				 * bytes that encode the length of each
-				 * command's source. The encoding is the
-				 * same as for code deltas. Source lengths
-				 * are always positive. This sequence is
-				 * just after the last byte in the source
-				 * delta sequence. */
-#ifdef TCL_COMPILE_STATS
-    Tcl_Time createTime;	/* Absolute time when the ByteCode was
-				 * created. */
-#endif /* TCL_COMPILE_STATS */
-} ByteCode;
-
-/*
- * Opcodes for the Tcl bytecode instructions. These must correspond to the
- * entries in the table of instruction descriptions, instructionTable, in
- * tclCompile.c. Also, the order and number of the expression opcodes
- * (e.g., INST_LOR) must match the entries in the array operatorStrings in
- * tclExecute.c.
- */
-
-/* Opcodes 0 to 9 */
-#define INST_DONE			0
-#define INST_PUSH1			1
-#define INST_PUSH4			2
-#define INST_POP			3
-#define INST_DUP			4
-#define INST_CONCAT1			5
-#define INST_INVOKE_STK1		6
-#define INST_INVOKE_STK4		7
-#define INST_EVAL_STK			8
-#define INST_EXPR_STK			9
-
-/* Opcodes 10 to 23 */
-#define INST_LOAD_SCALAR1		10
-#define INST_LOAD_SCALAR4		11
-#define INST_LOAD_SCALAR_STK		12
-#define INST_LOAD_ARRAY1		13
-#define INST_LOAD_ARRAY4		14
-#define INST_LOAD_ARRAY_STK		15
-#define INST_LOAD_STK			16
-#define INST_STORE_SCALAR1		17
-#define INST_STORE_SCALAR4		18
-#define INST_STORE_SCALAR_STK		19
-#define INST_STORE_ARRAY1		20
-#define INST_STORE_ARRAY4		21
-#define INST_STORE_ARRAY_STK		22
-#define INST_STORE_STK			23
-
-/* Opcodes 24 to 33 */
-#define INST_INCR_SCALAR1		24
-#define INST_INCR_SCALAR_STK		25
-#define INST_INCR_ARRAY1		26
-#define INST_INCR_ARRAY_STK		27
-#define INST_INCR_STK			28
-#define INST_INCR_SCALAR1_IMM		29
-#define INST_INCR_SCALAR_STK_IMM	30
-#define INST_INCR_ARRAY1_IMM		31
-#define INST_INCR_ARRAY_STK_IMM		32
-#define INST_INCR_STK_IMM		33
-
-/* Opcodes 34 to 39 */
-#define INST_JUMP1			34
-#define INST_JUMP4			35
-#define INST_JUMP_TRUE1			36
-#define INST_JUMP_TRUE4			37
-#define INST_JUMP_FALSE1		38
-#define INST_JUMP_FALSE4	        39
-
-/* Opcodes 40 to 64 */
-#define INST_LOR			40
-#define INST_LAND			41
-#define INST_BITOR			42
-#define INST_BITXOR			43
-#define INST_BITAND			44
-#define INST_EQ				45
-#define INST_NEQ			46
-#define INST_LT				47
-#define INST_GT				48
-#define INST_LE				49
-#define INST_GE				50
-#define INST_LSHIFT			51
-#define INST_RSHIFT			52
-#define INST_ADD			53
-#define INST_SUB			54
-#define INST_MULT			55
-#define INST_DIV			56
-#define INST_MOD			57
-#define INST_UPLUS			58
-#define INST_UMINUS			59
-#define INST_BITNOT			60
-#define INST_LNOT			61
-#define INST_CALL_BUILTIN_FUNC1		62
-#define INST_CALL_FUNC1			63
-#define INST_TRY_CVT_TO_NUMERIC		64
-
-/* Opcodes 65 to 66 */
-#define INST_BREAK			65
-#define INST_CONTINUE			66
-
-/* Opcodes 67 to 68 */
-#define INST_FOREACH_START4		67
-#define INST_FOREACH_STEP4		68
-
-/* Opcodes 69 to 72 */
-#define INST_BEGIN_CATCH4		69
-#define INST_END_CATCH			70
-#define INST_PUSH_RESULT		71
-#define INST_PUSH_RETURN_CODE		72
-
-/* The last opcode */
-#define LAST_INST_OPCODE        	72
-
-/*
- * Table describing the Tcl bytecode instructions: their name (for
- * displaying code), total number of code bytes required (including
- * operand bytes), and a description of the type of each operand.
- * These operand types include signed and unsigned integers of length
- * one and four bytes. The unsigned integers are used for indexes or
- * for, e.g., the count of objects to push in a "push" instruction.
- */
-
-#define MAX_INSTRUCTION_OPERANDS 2
-
-typedef enum InstOperandType {
-    OPERAND_NONE,
-    OPERAND_INT1,		/* One byte signed integer. */
-    OPERAND_INT4,		/* Four byte signed integer. */
-    OPERAND_UINT1,		/* One byte unsigned integer. */
-    OPERAND_UINT4		/* Four byte unsigned integer. */
-} InstOperandType;
-
-typedef struct InstructionDesc {
-    char *name;			/* Name of instruction. */
-    int numBytes;		/* Total number of bytes for instruction. */
-    int numOperands;		/* Number of operands. */
-    InstOperandType opTypes[MAX_INSTRUCTION_OPERANDS];
-				/* The type of each operand. */
-} InstructionDesc;
-
-extern InstructionDesc instructionTable[];
-
-/*
- * Definitions of the values of the INST_CALL_BUILTIN_FUNC instruction's
- * operand byte. Each value denotes a builtin Tcl math function. These
- * values must correspond to the entries in the builtinFuncTable array
- * below and to the values stored in the tclInt.h MathFunc structure's
- * builtinFuncIndex field.
- */
-
-#define BUILTIN_FUNC_ACOS		0
-#define BUILTIN_FUNC_ASIN		1
-#define BUILTIN_FUNC_ATAN		2
-#define BUILTIN_FUNC_ATAN2		3
-#define BUILTIN_FUNC_CEIL		4
-#define BUILTIN_FUNC_COS		5
-#define BUILTIN_FUNC_COSH		6
-#define BUILTIN_FUNC_EXP		7
-#define BUILTIN_FUNC_FLOOR		8
-#define BUILTIN_FUNC_FMOD		9
-#define BUILTIN_FUNC_HYPOT		10
-#define BUILTIN_FUNC_LOG		11
-#define BUILTIN_FUNC_LOG10		12
-#define BUILTIN_FUNC_POW		13
-#define BUILTIN_FUNC_SIN		14
-#define BUILTIN_FUNC_SINH		15
-#define BUILTIN_FUNC_SQRT		16
-#define BUILTIN_FUNC_TAN		17
-#define BUILTIN_FUNC_TANH		18
-#define BUILTIN_FUNC_ABS		19
-#define BUILTIN_FUNC_DOUBLE		20
-#define BUILTIN_FUNC_INT		21
-#define BUILTIN_FUNC_RAND		22
-#define BUILTIN_FUNC_ROUND		23
-#define BUILTIN_FUNC_SRAND		24
-
-#define LAST_BUILTIN_FUNC        	24
-
-/*
- * Table describing the built-in math functions. Entries in this table are
- * indexed by the values of the INST_CALL_BUILTIN_FUNC instruction's
- * operand byte.
- */
-
-typedef int (CallBuiltinFuncProc) _ANSI_ARGS_((Tcl_Interp *interp,
-        ExecEnv *eePtr, ClientData clientData));
-
-typedef struct {
-    char *name;			/* Name of function. */
-    int numArgs;		/* Number of arguments for function. */
-    Tcl_ValueType argTypes[MAX_MATH_ARGS];
-				/* Acceptable types for each argument. */
-    CallBuiltinFuncProc *proc;	/* Procedure implementing this function. */
-    ClientData clientData;	/* Additional argument to pass to the
-				 * function when invoking it. */
-} BuiltinFunc;
-
-extern BuiltinFunc builtinFuncTable[];
-
-/*
- * Compilation of some Tcl constructs such as if commands and the logical or
- * (||) and logical and (&&) operators in expressions requires the
- * generation of forward jumps. Since the PC target of these jumps isn't
- * known when the jumps are emitted, we record the offset of each jump in an
- * array of JumpFixup structures. There is one array for each sequence of
- * jumps to one target PC. When we learn the target PC, we update the jumps
- * with the correct distance. Also, if the distance is too great (> 127
- * bytes), we replace the single-byte jump with a four byte jump
- * instruction, move the instructions after the jump down, and update the
- * code offsets for any commands between the jump and the target.
- */
-
-typedef enum {
-    TCL_UNCONDITIONAL_JUMP,
-    TCL_TRUE_JUMP,
-    TCL_FALSE_JUMP
-} TclJumpType;
-
-typedef struct JumpFixup {
-    TclJumpType jumpType;	/* Indicates the kind of jump. */
-    int codeOffset;		/* Offset of the first byte of the one-byte
-				 * forward jump's code. */
-    int cmdIndex;		/* Index of the first command after the one
-				 * for which the jump was emitted. Used to
-				 * update the code offsets for subsequent
-				 * commands if the two-byte jump at jumpPc
-				 * must be replaced with a five-byte one. */
-    int exceptIndex;		/* Index of the first range entry in the
-				 * ExceptionRange array after the current
-				 * one. This field is used to adjust the
-				 * code offsets in subsequent ExceptionRange
-				 * records when a jump is grown from 2 bytes
-				 * to 5 bytes. */
-} JumpFixup;
-
-#define JUMPFIXUP_INIT_ENTRIES    10
-
-typedef struct JumpFixupArray {
-    JumpFixup *fixup;		/* Points to start of jump fixup array. */
-    int next;			/* Index of next free array entry. */
-    int end;			/* Index of last usable entry in array. */
-    int mallocedArray;		/* 1 if array was expanded and fixups points
-				 * into the heap, else 0. */
-    JumpFixup staticFixupSpace[JUMPFIXUP_INIT_ENTRIES];
-				/* Initial storage for jump fixup array. */
-} JumpFixupArray;
-
-/*
- * The structure describing one variable list of a foreach command. Note
- * that only foreach commands inside procedure bodies are compiled inline so
- * a ForeachVarList structure always describes local variables. Furthermore,
- * only scalar variables are supported for inline-compiled foreach loops.
- */
-
-typedef struct ForeachVarList {
-    int numVars;		/* The number of variables in the list. */
-    int varIndexes[1];		/* An array of the indexes ("slot numbers")
-				 * for each variable in the procedure's
-				 * array of local variables. Only scalar
-				 * variables are supported. The actual
-				 * size of this field will be large enough
-				 * to numVars indexes. THIS MUST BE THE
-				 * LAST FIELD IN THE STRUCTURE! */
-} ForeachVarList;
-
-/*
- * Structure used to hold information about a foreach command that is needed
- * during program execution. These structures are stored in CompileEnv and
- * ByteCode structures as auxiliary data.
- */
-
-typedef struct ForeachInfo {
-    int numLists;		/* The number of both the variable and value
-				 * lists of the foreach command. */
-    int firstValueTemp;		/* Index of the first temp var in a proc
-				 * frame used to point to a value list. */
-    int loopCtTemp;		/* Index of temp var in a proc frame
-				 * holding the loop's iteration count. Used
-				 * to determine next value list element to
-				 * assign each loop var. */
-    ForeachVarList *varLists[1];/* An array of pointers to ForeachVarList
-				 * structures describing each var list. The
-				 * actual size of this field will be large
-				 * enough to numVars indexes. THIS MUST BE
-				 * THE LAST FIELD IN THE STRUCTURE! */
-} ForeachInfo;
-
-extern AuxDataType		tclForeachInfoType;
-
-/*
- * Structure containing a cached pointer to a command that is the result
- * of resolving the command's name in some namespace. It is the internal
- * representation for a cmdName object. It contains the pointer along
- * with some information that is used to check the pointer's validity.
- */
-
-typedef struct ResolvedCmdName {
-    Command *cmdPtr;		/* A cached Command pointer. */
-    Namespace *refNsPtr;	/* Points to the namespace containing the
-				 * reference (not the namespace that
-				 * contains the referenced command). */
-    long refNsId;		/* refNsPtr's unique namespace id. Used to
-				 * verify that refNsPtr is still valid
-				 * (e.g., it's possible that the cmd's
-				 * containing namespace was deleted and a
-				 * new one created at the same address). */
-    int refNsCmdEpoch;		/* Value of the referencing namespace's
-				 * cmdRefEpoch when the pointer was cached.
-				 * Before using the cached pointer, we check
-				 * if the namespace's epoch was incremented;
-				 * if so, this cached pointer is invalid. */
-    int cmdEpoch;		/* Value of the command's cmdEpoch when this
-				 * pointer was cached. Before using the
-				 * cached pointer, we check if the cmd's
-				 * epoch was incremented; if so, the cmd was
-				 * renamed, deleted, hidden, or exposed, and
-				 * so the pointer is invalid. */
-    int refCount;		/* Reference count: 1 for each cmdName
-				 * object that has a pointer to this
-				 * ResolvedCmdName structure as its internal
-				 * rep. This structure can be freed when
-				 * refCount becomes zero. */
-} ResolvedCmdName;
-
-/*
- *----------------------------------------------------------------
- * Procedures shared among Tcl bytecode compilation and execution
- * modules but not used outside:
- *----------------------------------------------------------------
- */
-
-EXTERN void		TclCleanupByteCode _ANSI_ARGS_((ByteCode *codePtr));
-EXTERN int		TclCompileCmdWord _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int count,
-			    CompileEnv *envPtr));
-EXTERN int		TclCompileExpr _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *script, int numBytes,
-			    CompileEnv *envPtr));
-EXTERN int		TclCompileExprWords _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int numWords,
-			    CompileEnv *envPtr));
-EXTERN int		TclCompileScript _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *script, int numBytes, int nested,
-			    CompileEnv *envPtr));
-EXTERN int		TclCompileTokens _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Token *tokenPtr, int count,
-			    CompileEnv *envPtr));
-EXTERN int		TclCreateAuxData _ANSI_ARGS_((ClientData clientData,
-			    AuxDataType *typePtr, CompileEnv *envPtr));
-EXTERN int		TclCreateExceptRange _ANSI_ARGS_((
-			    ExceptionRangeType type, CompileEnv *envPtr));
-EXTERN ExecEnv *	TclCreateExecEnv _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void		TclDeleteExecEnv _ANSI_ARGS_((ExecEnv *eePtr));
-EXTERN void		TclDeleteLiteralTable _ANSI_ARGS_((
-			    Tcl_Interp *interp, LiteralTable *tablePtr));
-EXTERN void		TclEmitForwardJump _ANSI_ARGS_((CompileEnv *envPtr,
-			    TclJumpType jumpType, JumpFixup *jumpFixupPtr));
-EXTERN AuxDataType *TclGetAuxDataType _ANSI_ARGS_((char *typeName));
-EXTERN ExceptionRange *	TclGetExceptionRangeForPc _ANSI_ARGS_((
-			    unsigned char *pc, int catchOnly,
-			    ByteCode* codePtr));
-EXTERN InstructionDesc * TclGetInstructionTable _ANSI_ARGS_(());
-EXTERN int		TclExecuteByteCode _ANSI_ARGS_((Tcl_Interp *interp,
-			    ByteCode *codePtr));
-EXTERN void		TclExpandCodeArray _ANSI_ARGS_((
-			    CompileEnv *envPtr));
-EXTERN void		TclExpandJumpFixupArray _ANSI_ARGS_((
-                            JumpFixupArray *fixupArrayPtr));
-EXTERN void		TclFinalizeAuxDataTypeTable _ANSI_ARGS_((void));
-EXTERN int		TclFindCompiledLocal _ANSI_ARGS_((char *name, 
-        		    int nameChars, int create, int flags,
-			    Proc *procPtr));
-EXTERN LiteralEntry *	TclLookupLiteralEntry _ANSI_ARGS_((
-			    Tcl_Interp *interp, Tcl_Obj *objPtr));
-EXTERN int		TclFixupForwardJump _ANSI_ARGS_((
-			    CompileEnv *envPtr, JumpFixup *jumpFixupPtr,
-			    int jumpDist, int distThreshold));
-EXTERN void		TclFreeCompileEnv _ANSI_ARGS_((CompileEnv *envPtr));
-EXTERN void		TclFreeJumpFixupArray _ANSI_ARGS_((
-  			    JumpFixupArray *fixupArrayPtr));
-EXTERN void		TclInitAuxDataTypeTable _ANSI_ARGS_((void));
-EXTERN void		TclInitByteCodeObj _ANSI_ARGS_((Tcl_Obj *objPtr,
-			    CompileEnv *envPtr));
-EXTERN void		TclInitCompilation _ANSI_ARGS_((void));
-EXTERN void		TclInitCompileEnv _ANSI_ARGS_((Tcl_Interp *interp,
-			    CompileEnv *envPtr, char *string,
-			    int numBytes));
-EXTERN void		TclInitJumpFixupArray _ANSI_ARGS_((
-			    JumpFixupArray *fixupArrayPtr));
-EXTERN void		TclInitLiteralTable _ANSI_ARGS_((
-			    LiteralTable *tablePtr));
-#ifdef TCL_COMPILE_STATS
-EXTERN char *		TclLiteralStats _ANSI_ARGS_((
-			    LiteralTable *tablePtr));
-EXTERN int		TclLog2 _ANSI_ARGS_((int value));
-#endif
-#ifdef TCL_COMPILE_DEBUG
-EXTERN void		TclPrintByteCodeObj _ANSI_ARGS_((Tcl_Interp *interp,
-		            Tcl_Obj *objPtr));
-#endif
-EXTERN int		TclPrintInstruction _ANSI_ARGS_((ByteCode* codePtr,
-			    unsigned char *pc));
-EXTERN void		TclPrintObject _ANSI_ARGS_((FILE *outFile,
-			    Tcl_Obj *objPtr, int maxChars));
-EXTERN void		TclPrintSource _ANSI_ARGS_((FILE *outFile,
-			    char *string, int maxChars));
-EXTERN void		TclRegisterAuxDataType _ANSI_ARGS_((AuxDataType *typePtr));
-EXTERN int		TclRegisterLiteral _ANSI_ARGS_((CompileEnv *envPtr,
-			    char *bytes, int length, int onHeap));
-EXTERN void		TclReleaseLiteral _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-EXTERN void		TclSetCmdNameObj _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, Command *cmdPtr));
-#ifdef TCL_COMPILE_DEBUG
-EXTERN void		TclVerifyGlobalLiteralTable _ANSI_ARGS_((
-			    Interp *iPtr));
-EXTERN void		TclVerifyLocalLiteralTable _ANSI_ARGS_((
-			    CompileEnv *envPtr));
-#endif
-
-/*
- *----------------------------------------------------------------
- * Macros used by Tcl bytecode compilation and execution modules
- * inside the Tcl core but not used outside.
- *----------------------------------------------------------------
- */
-
-/*
- * Macro to emit an opcode byte into a CompileEnv's code array.
- * The ANSI C "prototype" for this macro is:
- *
- * EXTERN void	TclEmitOpcode _ANSI_ARGS_((unsigned char op,
- *		    CompileEnv *envPtr));
- */
-
-#define TclEmitOpcode(op, envPtr) \
-    if ((envPtr)->codeNext == (envPtr)->codeEnd) \
-        TclExpandCodeArray(envPtr); \
-    *(envPtr)->codeNext++ = (unsigned char) (op)
-
-/*
- * Macro to emit an integer operand.
- * The ANSI C "prototype" for this macro is:
- *
- * EXTERN void	TclEmitInt1 _ANSI_ARGS_((int i, CompileEnv *envPtr));
- */
-
-#define TclEmitInt1(i, envPtr) \
-    if ((envPtr)->codeNext == (envPtr)->codeEnd) \
-        TclExpandCodeArray(envPtr); \
-    *(envPtr)->codeNext++ = (unsigned char) ((unsigned int) (i))
-
-/*
- * Macros to emit an instruction with signed or unsigned integer operands.
- * Four byte integers are stored in "big-endian" order with the high order
- * byte stored at the lowest address.
- * The ANSI C "prototypes" for these macros are:
- *
- * EXTERN void	TclEmitInstInt1 _ANSI_ARGS_((unsigned char op, int i, 
- *		    CompileEnv *envPtr));
- * EXTERN void	TclEmitInstInt4 _ANSI_ARGS_((unsigned char op, int i, 
- *		    CompileEnv *envPtr));
- */
-
-#define TclEmitInstInt1(op, i, envPtr) \
-    if (((envPtr)->codeNext + 2) > (envPtr)->codeEnd) { \
-        TclExpandCodeArray(envPtr); \
-    } \
-    *(envPtr)->codeNext++ = (unsigned char) (op); \
-    *(envPtr)->codeNext++ = (unsigned char) ((unsigned int) (i))
-
-#define TclEmitInstInt4(op, i, envPtr) \
-    if (((envPtr)->codeNext + 5) > (envPtr)->codeEnd) { \
-        TclExpandCodeArray(envPtr); \
-    } \
-    *(envPtr)->codeNext++ = (unsigned char) (op); \
-    *(envPtr)->codeNext++ = \
-        (unsigned char) ((unsigned int) (i) >> 24); \
-    *(envPtr)->codeNext++ = \
-        (unsigned char) ((unsigned int) (i) >> 16); \
-    *(envPtr)->codeNext++ = \
-        (unsigned char) ((unsigned int) (i) >>  8); \
-    *(envPtr)->codeNext++ = \
-        (unsigned char) ((unsigned int) (i)      )
-    
-/*
- * Macro to push a Tcl object onto the Tcl evaluation stack. It emits the
- * object's one or four byte array index into the CompileEnv's code
- * array. These support, respectively, a maximum of 256 (2**8) and 2**32
- * objects in a CompileEnv. The ANSI C "prototype" for this macro is:
- *
- * EXTERN void	TclEmitPush _ANSI_ARGS_((int objIndex, CompileEnv *envPtr));
- */
-
-#define TclEmitPush(objIndex, envPtr) \
-    if ((objIndex) <= 255) { \
-	TclEmitInstInt1(INST_PUSH1, (objIndex), (envPtr)); \
-    } else { \
-	TclEmitInstInt4(INST_PUSH4, (objIndex), (envPtr)); \
-    }
-
-/*
- * Macros to update a (signed or unsigned) integer starting at a pointer.
- * The two variants depend on the number of bytes. The ANSI C "prototypes"
- * for these macros are:
- *
- * EXTERN void	TclStoreInt1AtPtr _ANSI_ARGS_((int i, unsigned char *p));
- * EXTERN void	TclStoreInt4AtPtr _ANSI_ARGS_((int i, unsigned char *p));
- */
-    
-#define TclStoreInt1AtPtr(i, p) \
-    *(p)   = (unsigned char) ((unsigned int) (i))
-    
-#define TclStoreInt4AtPtr(i, p) \
-    *(p)   = (unsigned char) ((unsigned int) (i) >> 24); \
-    *(p+1) = (unsigned char) ((unsigned int) (i) >> 16); \
-    *(p+2) = (unsigned char) ((unsigned int) (i) >>  8); \
-    *(p+3) = (unsigned char) ((unsigned int) (i)      )
-
-/*
- * Macros to update instructions at a particular pc with a new op code
- * and a (signed or unsigned) int operand. The ANSI C "prototypes" for
- * these macros are:
- *
- * EXTERN void	TclUpdateInstInt1AtPc _ANSI_ARGS_((unsigned char op, int i,
- *		    unsigned char *pc));
- * EXTERN void	TclUpdateInstInt4AtPc _ANSI_ARGS_((unsigned char op, int i,
- *		    unsigned char *pc));
- */
-
-#define TclUpdateInstInt1AtPc(op, i, pc) \
-    *(pc) = (unsigned char) (op); \
-    TclStoreInt1AtPtr((i), ((pc)+1))
-
-#define TclUpdateInstInt4AtPc(op, i, pc) \
-    *(pc) = (unsigned char) (op); \
-    TclStoreInt4AtPtr((i), ((pc)+1))
-    
-/*
- * Macros to get a signed integer (GET_INT{1,2}) or an unsigned int
- * (GET_UINT{1,2}) from a pointer. There are two variants for each
- * return type that depend on the number of bytes fetched.
- * The ANSI C "prototypes" for these macros are:
- *
- * EXTERN int	        TclGetInt1AtPtr  _ANSI_ARGS_((unsigned char *p));
- * EXTERN int	        TclGetInt4AtPtr  _ANSI_ARGS_((unsigned char *p));
- * EXTERN unsigned int	TclGetUInt1AtPtr _ANSI_ARGS_((unsigned char *p));
- * EXTERN unsigned int	TclGetUInt4AtPtr _ANSI_ARGS_((unsigned char *p));
- */
-
-/*
- * The TclGetInt1AtPtr macro is tricky because we want to do sign
- * extension on the 1-byte value. Unfortunately the "char" type isn't
- * signed on all platforms so sign-extension doesn't always happen
- * automatically. Sometimes we can explicitly declare the pointer to be
- * signed, but other times we have to explicitly sign-extend the value
- * in software.
- */
-
-#ifndef __CHAR_UNSIGNED__
-#   define TclGetInt1AtPtr(p) ((int) *((char *) p))
-#else
-#   ifdef HAVE_SIGNED_CHAR
-#	define TclGetInt1AtPtr(p) ((int) *((signed char *) p))
-#    else
-#	define TclGetInt1AtPtr(p) (((int) *((char *) p)) \
-		| ((*(p) & 0200) ? (-256) : 0))
-#    endif
-#endif
-
-#define TclGetInt4AtPtr(p) (((int) TclGetInt1AtPtr(p) << 24) | \
-		                  	    (*((p)+1) << 16) | \
-				  	    (*((p)+2) <<  8) | \
-				  	    (*((p)+3)))
-
-#define TclGetUInt1AtPtr(p) ((unsigned int) *(p))
-#define TclGetUInt4AtPtr(p) ((unsigned int) (*(p)     << 24) | \
-		                            (*((p)+1) << 16) | \
-				            (*((p)+2) <<  8) | \
-				            (*((p)+3)))
-
-/*
- * Macros used to compute the minimum and maximum of two integers.
- * The ANSI C "prototypes" for these macros are:
- *
- * EXTERN int  TclMin _ANSI_ARGS_((int i, int j));
- * EXTERN int  TclMax _ANSI_ARGS_((int i, int j));
- */
-
-#define TclMin(i, j)   ((((int) i) < ((int) j))? (i) : (j))
-#define TclMax(i, j)   ((((int) i) > ((int) j))? (i) : (j))
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _TCLCOMPILATION */
diff --git a/generic/tclDate.c b/generic/tclDate.c
deleted file mode 100644
index cdbcfe8..0000000
--- a/generic/tclDate.c
+++ /dev/null
@@ -1,1638 +0,0 @@
-/* 
- * tclDate.c --
- *
- *	This file is generated from a yacc grammar defined in
- *	the file tclGetDate.y.  It should not be edited directly.
- *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclDate.c,v 1.4 1999/04/16 00:46:45 stanton Exp $ 
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-#ifdef MAC_TCL
-#   define EPOCH           1904
-#   define START_OF_TIME   1904
-#   define END_OF_TIME     2039
-#else
-#   define EPOCH           1970
-#   define START_OF_TIME   1902
-#   define END_OF_TIME     2037
-#endif
-
-/*
- * The offset of tm_year of struct tm returned by localtime, gmtime, etc.
- * I don't know how universal this is; K&R II, the NetBSD manpages, and
- * ../compat/strftime.c all agree that tm_year is the year-1900.  However,
- * some systems may have a different value.  This #define should be the
- * same as in ../compat/strftime.c.
- */
-#define TM_YEAR_BASE 1900
-
-#define HOUR(x)         ((int) (60 * x))
-#define SECSPERDAY      (24L * 60L * 60L)
-
-
-/*
- *  An entry in the lexical lookup table.
- */
-typedef struct _TABLE {
-    char        *name;
-    int         type;
-    time_t      value;
-} TABLE;
-
-
-/*
- *  Daylight-savings mode:  on, off, or not yet known.
- */
-typedef enum _DSTMODE {
-    DSTon, DSToff, DSTmaybe
-} DSTMODE;
-
-/*
- *  Meridian:  am, pm, or 24-hour style.
- */
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-
-/*
- *  Global variables.  We could get rid of most of these by using a good
- *  union as the yacc stack.  (This routine was originally written before
- *  yacc had the %union construct.)  Maybe someday; right now we only use
- *  the %union very rarely.
- */
-static char     *TclDateInput;
-static DSTMODE  TclDateDSTmode;
-static time_t   TclDateDayOrdinal;
-static time_t   TclDateDayNumber;
-static int      TclDateHaveDate;
-static int      TclDateHaveDay;
-static int      TclDateHaveRel;
-static int      TclDateHaveTime;
-static int      TclDateHaveZone;
-static time_t   TclDateTimezone;
-static time_t   TclDateDay;
-static time_t   TclDateHour;
-static time_t   TclDateMinutes;
-static time_t   TclDateMonth;
-static time_t   TclDateSeconds;
-static time_t   TclDateYear;
-static MERIDIAN TclDateMeridian;
-static time_t   TclDateRelMonth;
-static time_t   TclDateRelSeconds;
-
-
-/*
- * Prototypes of internal functions.
- */
-static void	TclDateerror _ANSI_ARGS_((char *s));
-static time_t	ToSeconds _ANSI_ARGS_((time_t Hours, time_t Minutes,
-		    time_t Seconds, MERIDIAN Meridian));
-static int	Convert _ANSI_ARGS_((time_t Month, time_t Day, time_t Year,
-		    time_t Hours, time_t Minutes, time_t Seconds,
-		    MERIDIAN Meridia, DSTMODE DSTmode, time_t *TimePtr));
-static time_t	DSTcorrect _ANSI_ARGS_((time_t Start, time_t Future));
-static time_t	RelativeDate _ANSI_ARGS_((time_t Start, time_t DayOrdinal,
-		    time_t DayNumber));
-static int	RelativeMonth _ANSI_ARGS_((time_t Start, time_t RelMonth,
-		    time_t *TimePtr));
-static int	LookupWord _ANSI_ARGS_((char *buff));
-static int	TclDatelex _ANSI_ARGS_((void));
-
-int
-TclDateparse _ANSI_ARGS_((void));
-typedef union
-#ifdef __cplusplus
-	YYSTYPE
-#endif
- {
-    time_t              Number;
-    enum _MERIDIAN      Meridian;
-} YYSTYPE;
-# define tAGO 257
-# define tDAY 258
-# define tDAYZONE 259
-# define tID 260
-# define tMERIDIAN 261
-# define tMINUTE_UNIT 262
-# define tMONTH 263
-# define tMONTH_UNIT 264
-# define tSEC_UNIT 265
-# define tSNUMBER 266
-# define tUNUMBER 267
-# define tZONE 268
-# define tEPOCH 269
-# define tDST 270
-
-
-
-#ifdef __cplusplus
-
-#ifndef TclDateerror
-	void TclDateerror(const char *);
-#endif
-
-#ifndef TclDatelex
-#ifdef __EXTERN_C__
-	extern "C" { int TclDatelex(void); }
-#else
-	int TclDatelex(void);
-#endif
-#endif
-	int TclDateparse(void);
-
-#endif
-#define TclDateclearin TclDatechar = -1
-#define TclDateerrok TclDateerrflag = 0
-extern int TclDatechar;
-extern int TclDateerrflag;
-YYSTYPE TclDatelval;
-YYSTYPE TclDateval;
-typedef int TclDatetabelem;
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 150
-#endif
-#if YYMAXDEPTH > 0
-int TclDate_TclDates[YYMAXDEPTH], *TclDates = TclDate_TclDates;
-YYSTYPE TclDate_TclDatev[YYMAXDEPTH], *TclDatev = TclDate_TclDatev;
-#else	/* user does initial allocation */
-int *TclDates;
-YYSTYPE *TclDatev;
-#endif
-static int TclDatemaxdepth = YYMAXDEPTH;
-# define YYERRCODE 256
-
-
-/*
- * Month and day table.
- */
-static TABLE    MonthDayTable[] = {
-    { "january",        tMONTH,  1 },
-    { "february",       tMONTH,  2 },
-    { "march",          tMONTH,  3 },
-    { "april",          tMONTH,  4 },
-    { "may",            tMONTH,  5 },
-    { "june",           tMONTH,  6 },
-    { "july",           tMONTH,  7 },
-    { "august",         tMONTH,  8 },
-    { "september",      tMONTH,  9 },
-    { "sept",           tMONTH,  9 },
-    { "october",        tMONTH, 10 },
-    { "november",       tMONTH, 11 },
-    { "december",       tMONTH, 12 },
-    { "sunday",         tDAY, 0 },
-    { "monday",         tDAY, 1 },
-    { "tuesday",        tDAY, 2 },
-    { "tues",           tDAY, 2 },
-    { "wednesday",      tDAY, 3 },
-    { "wednes",         tDAY, 3 },
-    { "thursday",       tDAY, 4 },
-    { "thur",           tDAY, 4 },
-    { "thurs",          tDAY, 4 },
-    { "friday",         tDAY, 5 },
-    { "saturday",       tDAY, 6 },
-    { NULL }
-};
-
-/*
- * Time units table.
- */
-static TABLE    UnitsTable[] = {
-    { "year",           tMONTH_UNIT,    12 },
-    { "month",          tMONTH_UNIT,    1 },
-    { "fortnight",      tMINUTE_UNIT,   14 * 24 * 60 },
-    { "week",           tMINUTE_UNIT,   7 * 24 * 60 },
-    { "day",            tMINUTE_UNIT,   1 * 24 * 60 },
-    { "hour",           tMINUTE_UNIT,   60 },
-    { "minute",         tMINUTE_UNIT,   1 },
-    { "min",            tMINUTE_UNIT,   1 },
-    { "second",         tSEC_UNIT,      1 },
-    { "sec",            tSEC_UNIT,      1 },
-    { NULL }
-};
-
-/*
- * Assorted relative-time words.
- */
-static TABLE    OtherTable[] = {
-    { "tomorrow",       tMINUTE_UNIT,   1 * 24 * 60 },
-    { "yesterday",      tMINUTE_UNIT,   -1 * 24 * 60 },
-    { "today",          tMINUTE_UNIT,   0 },
-    { "now",            tMINUTE_UNIT,   0 },
-    { "last",           tUNUMBER,       -1 },
-    { "this",           tMINUTE_UNIT,   0 },
-    { "next",           tUNUMBER,       2 },
-#if 0
-    { "first",          tUNUMBER,       1 },
-/*  { "second",         tUNUMBER,       2 }, */
-    { "third",          tUNUMBER,       3 },
-    { "fourth",         tUNUMBER,       4 },
-    { "fifth",          tUNUMBER,       5 },
-    { "sixth",          tUNUMBER,       6 },
-    { "seventh",        tUNUMBER,       7 },
-    { "eighth",         tUNUMBER,       8 },
-    { "ninth",          tUNUMBER,       9 },
-    { "tenth",          tUNUMBER,       10 },
-    { "eleventh",       tUNUMBER,       11 },
-    { "twelfth",        tUNUMBER,       12 },
-#endif
-    { "ago",            tAGO,   1 },
-    { "epoch",          tEPOCH,   0 },
-    { NULL }
-};
-
-/*
- * The timezone table.  (Note: This table was modified to not use any floating
- * point constants to work around an SGI compiler bug).
- */
-static TABLE    TimezoneTable[] = {
-    { "gmt",    tZONE,     HOUR( 0) },      /* Greenwich Mean */
-    { "ut",     tZONE,     HOUR( 0) },      /* Universal (Coordinated) */
-    { "utc",    tZONE,     HOUR( 0) },
-    { "wet",    tZONE,     HOUR( 0) } ,     /* Western European */
-    { "bst",    tDAYZONE,  HOUR( 0) },      /* British Summer */
-    { "wat",    tZONE,     HOUR( 1) },      /* West Africa */
-    { "at",     tZONE,     HOUR( 2) },      /* Azores */
-#if     0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",    tZONE,     HOUR( 3) },      /* Brazil Standard */
-    { "gst",    tZONE,     HOUR( 3) },      /* Greenland Standard */
-#endif
-    { "nft",    tZONE,     HOUR( 7/2) },    /* Newfoundland */
-    { "nst",    tZONE,     HOUR( 7/2) },    /* Newfoundland Standard */
-    { "ndt",    tDAYZONE,  HOUR( 7/2) },    /* Newfoundland Daylight */
-    { "ast",    tZONE,     HOUR( 4) },      /* Atlantic Standard */
-    { "adt",    tDAYZONE,  HOUR( 4) },      /* Atlantic Daylight */
-    { "est",    tZONE,     HOUR( 5) },      /* Eastern Standard */
-    { "edt",    tDAYZONE,  HOUR( 5) },      /* Eastern Daylight */
-    { "cst",    tZONE,     HOUR( 6) },      /* Central Standard */
-    { "cdt",    tDAYZONE,  HOUR( 6) },      /* Central Daylight */
-    { "mst",    tZONE,     HOUR( 7) },      /* Mountain Standard */
-    { "mdt",    tDAYZONE,  HOUR( 7) },      /* Mountain Daylight */
-    { "pst",    tZONE,     HOUR( 8) },      /* Pacific Standard */
-    { "pdt",    tDAYZONE,  HOUR( 8) },      /* Pacific Daylight */
-    { "yst",    tZONE,     HOUR( 9) },      /* Yukon Standard */
-    { "ydt",    tDAYZONE,  HOUR( 9) },      /* Yukon Daylight */
-    { "hst",    tZONE,     HOUR(10) },      /* Hawaii Standard */
-    { "hdt",    tDAYZONE,  HOUR(10) },      /* Hawaii Daylight */
-    { "cat",    tZONE,     HOUR(10) },      /* Central Alaska */
-    { "ahst",   tZONE,     HOUR(10) },      /* Alaska-Hawaii Standard */
-    { "nt",     tZONE,     HOUR(11) },      /* Nome */
-    { "idlw",   tZONE,     HOUR(12) },      /* International Date Line West */
-    { "cet",    tZONE,    -HOUR( 1) },      /* Central European */
-    { "met",    tZONE,    -HOUR( 1) },      /* Middle European */
-    { "mewt",   tZONE,    -HOUR( 1) },      /* Middle European Winter */
-    { "mest",   tDAYZONE, -HOUR( 1) },      /* Middle European Summer */
-    { "swt",    tZONE,    -HOUR( 1) },      /* Swedish Winter */
-    { "sst",    tDAYZONE, -HOUR( 1) },      /* Swedish Summer */
-    { "fwt",    tZONE,    -HOUR( 1) },      /* French Winter */
-    { "fst",    tDAYZONE, -HOUR( 1) },      /* French Summer */
-    { "eet",    tZONE,    -HOUR( 2) },      /* Eastern Europe, USSR Zone 1 */
-    { "bt",     tZONE,    -HOUR( 3) },      /* Baghdad, USSR Zone 2 */
-    { "it",     tZONE,    -HOUR( 7/2) },    /* Iran */
-    { "zp4",    tZONE,    -HOUR( 4) },      /* USSR Zone 3 */
-    { "zp5",    tZONE,    -HOUR( 5) },      /* USSR Zone 4 */
-    { "ist",    tZONE,    -HOUR(11/2) },    /* Indian Standard */
-    { "zp6",    tZONE,    -HOUR( 6) },      /* USSR Zone 5 */
-#if     0
-    /* For completeness.  NST is also Newfoundland Stanard, nad SST is
-     * also Swedish Summer. */
-    { "nst",    tZONE,    -HOUR(13/2) },    /* North Sumatra */
-    { "sst",    tZONE,    -HOUR( 7) },      /* South Sumatra, USSR Zone 6 */
-#endif  /* 0 */
-    { "wast",   tZONE,    -HOUR( 7) },      /* West Australian Standard */
-    { "wadt",   tDAYZONE, -HOUR( 7) },      /* West Australian Daylight */
-    { "jt",     tZONE,    -HOUR(15/2) },    /* Java (3pm in Cronusland!) */
-    { "cct",    tZONE,    -HOUR( 8) },      /* China Coast, USSR Zone 7 */
-    { "jst",    tZONE,    -HOUR( 9) },      /* Japan Standard, USSR Zone 8 */
-    { "cast",   tZONE,    -HOUR(19/2) },    /* Central Australian Standard */
-    { "cadt",   tDAYZONE, -HOUR(19/2) },    /* Central Australian Daylight */
-    { "east",   tZONE,    -HOUR(10) },      /* Eastern Australian Standard */
-    { "eadt",   tDAYZONE, -HOUR(10) },      /* Eastern Australian Daylight */
-    { "gst",    tZONE,    -HOUR(10) },      /* Guam Standard, USSR Zone 9 */
-    { "nzt",    tZONE,    -HOUR(12) },      /* New Zealand */
-    { "nzst",   tZONE,    -HOUR(12) },      /* New Zealand Standard */
-    { "nzdt",   tDAYZONE, -HOUR(12) },      /* New Zealand Daylight */
-    { "idle",   tZONE,    -HOUR(12) },      /* International Date Line East */
-    /* ADDED BY Marco Nijdam */
-    { "dst",    tDST,     HOUR( 0) },       /* DST on (hour is ignored) */
-    /* End ADDED */
-    {  NULL  }
-};
-
-/*
- * Military timezone table.
- */
-static TABLE    MilitaryTable[] = {
-    { "a",      tZONE,  HOUR(  1) },
-    { "b",      tZONE,  HOUR(  2) },
-    { "c",      tZONE,  HOUR(  3) },
-    { "d",      tZONE,  HOUR(  4) },
-    { "e",      tZONE,  HOUR(  5) },
-    { "f",      tZONE,  HOUR(  6) },
-    { "g",      tZONE,  HOUR(  7) },
-    { "h",      tZONE,  HOUR(  8) },
-    { "i",      tZONE,  HOUR(  9) },
-    { "k",      tZONE,  HOUR( 10) },
-    { "l",      tZONE,  HOUR( 11) },
-    { "m",      tZONE,  HOUR( 12) },
-    { "n",      tZONE,  HOUR(- 1) },
-    { "o",      tZONE,  HOUR(- 2) },
-    { "p",      tZONE,  HOUR(- 3) },
-    { "q",      tZONE,  HOUR(- 4) },
-    { "r",      tZONE,  HOUR(- 5) },
-    { "s",      tZONE,  HOUR(- 6) },
-    { "t",      tZONE,  HOUR(- 7) },
-    { "u",      tZONE,  HOUR(- 8) },
-    { "v",      tZONE,  HOUR(- 9) },
-    { "w",      tZONE,  HOUR(-10) },
-    { "x",      tZONE,  HOUR(-11) },
-    { "y",      tZONE,  HOUR(-12) },
-    { "z",      tZONE,  HOUR(  0) },
-    { NULL }
-};
-
-
-/*
- * Dump error messages in the bit bucket.
- */
-static void
-TclDateerror(s)
-    char  *s;
-{
-}
-
-
-static time_t
-ToSeconds(Hours, Minutes, Seconds, Meridian)
-    time_t      Hours;
-    time_t      Minutes;
-    time_t      Seconds;
-    MERIDIAN    Meridian;
-{
-    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
-        return -1;
-    switch (Meridian) {
-    case MER24:
-        if (Hours < 0 || Hours > 23)
-            return -1;
-        return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERam:
-        if (Hours < 1 || Hours > 12)
-            return -1;
-        return ((Hours % 12) * 60L + Minutes) * 60L + Seconds;
-    case MERpm:
-        if (Hours < 1 || Hours > 12)
-            return -1;
-        return (((Hours % 12) + 12) * 60L + Minutes) * 60L + Seconds;
-    }
-    return -1;  /* Should never be reached */
-}
-
-
-static int
-Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode, TimePtr)
-    time_t      Month;
-    time_t      Day;
-    time_t      Year;
-    time_t      Hours;
-    time_t      Minutes;
-    time_t      Seconds;
-    MERIDIAN    Meridian;
-    DSTMODE     DSTmode;
-    time_t     *TimePtr;
-{
-    static int  DaysInMonth[12] = {
-        31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-    };
-    time_t tod;
-    time_t Julian;
-    int i;
-
-    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
-                    ? 29 : 28;
-    if (Month < 1 || Month > 12
-     || Year < START_OF_TIME || Year > END_OF_TIME
-     || Day < 1 || Day > DaysInMonth[(int)--Month])
-        return -1;
-
-    for (Julian = Day - 1, i = 0; i < Month; i++)
-        Julian += DaysInMonth[i];
-    if (Year >= EPOCH) {
-        for (i = EPOCH; i < Year; i++)
-            Julian += 365 + (i % 4 == 0);
-    } else {
-        for (i = Year; i < EPOCH; i++)
-            Julian -= 365 + (i % 4 == 0);
-    }
-    Julian *= SECSPERDAY;
-    Julian += TclDateTimezone * 60L;
-    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
-        return -1;
-    Julian += tod;
-    if (DSTmode == DSTon
-     || (DSTmode == DSTmaybe && TclpGetDate((TclpTime_t)&Julian, 0)->tm_isdst))
-        Julian -= 60 * 60;
-    *TimePtr = Julian;
-    return 0;
-}
-
-
-static time_t
-DSTcorrect(Start, Future)
-    time_t      Start;
-    time_t      Future;
-{
-    time_t      StartDay;
-    time_t      FutureDay;
-
-    StartDay = (TclpGetDate((TclpTime_t)&Start, 0)->tm_hour + 1) % 24;
-    FutureDay = (TclpGetDate((TclpTime_t)&Future, 0)->tm_hour + 1) % 24;
-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-}
-
-
-static time_t
-RelativeDate(Start, DayOrdinal, DayNumber)
-    time_t      Start;
-    time_t      DayOrdinal;
-    time_t      DayNumber;
-{
-    struct tm   *tm;
-    time_t      now;
-
-    now = Start;
-    tm = TclpGetDate((TclpTime_t)&now, 0);
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-    return DSTcorrect(Start, now);
-}
-
-
-static int
-RelativeMonth(Start, RelMonth, TimePtr)
-    time_t Start;
-    time_t RelMonth;
-    time_t *TimePtr;
-{
-    struct tm *tm;
-    time_t Month;
-    time_t Year;
-    time_t Julian;
-    int result;
-
-    if (RelMonth == 0) {
-        *TimePtr = 0;
-        return 0;
-    }
-    tm = TclpGetDate((TclpTime_t)&Start, 0);
-    Month = 12 * (tm->tm_year + TM_YEAR_BASE) + tm->tm_mon + RelMonth;
-    Year = Month / 12;
-    Month = Month % 12 + 1;
-    result = Convert(Month, (time_t) tm->tm_mday, Year,
-	    (time_t) tm->tm_hour, (time_t) tm->tm_min, (time_t) tm->tm_sec,
-	    MER24, DSTmaybe, &Julian);
-    /*
-     * The following iteration takes into account the case were we jump
-     * into a "short month".  Far example, "one month from Jan 31" will
-     * fail because there is no Feb 31.  The code below will reduce the
-     * day and try converting the date until we succed or the date equals
-     * 28 (which always works unless the date is bad in another way).
-     */
-
-    while ((result != 0) && (tm->tm_mday > 28)) {
-	tm->tm_mday--;
-	result = Convert(Month, (time_t) tm->tm_mday, Year,
-		(time_t) tm->tm_hour, (time_t) tm->tm_min, (time_t) tm->tm_sec,
-		MER24, DSTmaybe, &Julian);
-    }
-    if (result != 0) {
-	return -1;
-    }
-    *TimePtr = DSTcorrect(Start, Julian);
-    return 0;
-}
-
-
-static int
-LookupWord(buff)
-    char                *buff;
-{
-    register char *p;
-    register char *q;
-    register TABLE *tp;
-    int i;
-    int abbrev;
-
-    /*
-     * Make it lowercase.
-     */
-
-    Tcl_UtfToLower(buff);
-
-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-        TclDatelval.Meridian = MERam;
-        return tMERIDIAN;
-    }
-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-        TclDatelval.Meridian = MERpm;
-        return tMERIDIAN;
-    }
-
-    /*
-     * See if we have an abbreviation for a month.
-     */
-    if (strlen(buff) == 3) {
-        abbrev = 1;
-    } else if (strlen(buff) == 4 && buff[3] == '.') {
-        abbrev = 1;
-        buff[3] = '\0';
-    } else {
-        abbrev = 0;
-    }
-
-    for (tp = MonthDayTable; tp->name; tp++) {
-        if (abbrev) {
-            if (strncmp(buff, tp->name, 3) == 0) {
-                TclDatelval.Number = tp->value;
-                return tp->type;
-            }
-        } else if (strcmp(buff, tp->name) == 0) {
-            TclDatelval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    for (tp = TimezoneTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            TclDatelval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    for (tp = UnitsTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            TclDatelval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    /*
-     * Strip off any plural and try the units table again.
-     */
-    i = strlen(buff) - 1;
-    if (buff[i] == 's') {
-        buff[i] = '\0';
-        for (tp = UnitsTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                TclDatelval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-
-    for (tp = OtherTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            TclDatelval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    /*
-     * Military timezones.
-     */
-    if (buff[1] == '\0' && !(*buff & 0x80)
-	    && isalpha(UCHAR(*buff))) {	/* INTL: ISO only */
-        for (tp = MilitaryTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                TclDatelval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-
-    /*
-     * Drop out any periods and try the timezone table again.
-     */
-    for (i = 0, p = q = buff; *q; q++)
-        if (*q != '.') {
-            *p++ = *q;
-        } else {
-            i++;
-	}
-    *p = '\0';
-    if (i) {
-        for (tp = TimezoneTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                TclDatelval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-    
-    return tID;
-}
-
-
-static int
-TclDatelex()
-{
-    register char       c;
-    register char       *p;
-    char                buff[20];
-    int                 Count;
-    int                 sign;
-
-    for ( ; ; ) {
-        while (isspace((unsigned char) (*TclDateInput))) {
-            TclDateInput++;
-	}
-
-        if (isdigit(c = *TclDateInput) || c == '-' || c == '+') { /* INTL: digit */
-            if (c == '-' || c == '+') {
-                sign = c == '-' ? -1 : 1;
-                if (!isdigit(*++TclDateInput)) { /* INTL: digit */
-                    /*
-		     * skip the '-' sign
-		     */
-                    continue;
-		}
-            } else {
-                sign = 0;
-	    }
-            for (TclDatelval.Number = 0;
-		    isdigit(c = *TclDateInput++); ) { /* INTL: digit */
-                TclDatelval.Number = 10 * TclDatelval.Number + c - '0';
-	    }
-            TclDateInput--;
-            if (sign < 0) {
-                TclDatelval.Number = -TclDatelval.Number;
-	    }
-            return sign ? tSNUMBER : tUNUMBER;
-        }
-        if (!(c & 0x80) && isalpha(UCHAR(c))) {	/* INTL: ISO only. */
-            for (p = buff; isalpha(c = *TclDateInput++) /* INTL: ISO only. */
-		     || c == '.'; ) {
-                if (p < &buff[sizeof buff - 1]) {
-                    *p++ = c;
-		}
-	    }
-            *p = '\0';
-            TclDateInput--;
-            return LookupWord(buff);
-        }
-        if (c != '(') {
-            return *TclDateInput++;
-	}
-        Count = 0;
-        do {
-            c = *TclDateInput++;
-            if (c == '\0') {
-                return c;
-	    } else if (c == '(') {
-                Count++;
-	    } else if (c == ')') {
-                Count--;
-	    }
-        } while (Count > 0);
-    }
-}
-
-/*
- * Specify zone is of -50000 to force GMT.  (This allows BST to work).
- */
-
-int
-TclGetDate(p, now, zone, timePtr)
-    char *p;
-    unsigned long now;
-    long zone;
-    unsigned long *timePtr;
-{
-    struct tm *tm;
-    time_t Start;
-    time_t Time;
-    time_t tod;
-    int thisyear;
-
-    TclDateInput = p;
-    tm = TclpGetDate((TclpTime_t) &now, 0);
-    thisyear = tm->tm_year + TM_YEAR_BASE;
-    TclDateYear = thisyear;
-    TclDateMonth = tm->tm_mon + 1;
-    TclDateDay = tm->tm_mday;
-    TclDateTimezone = zone;
-    if (zone == -50000) {
-        TclDateDSTmode = DSToff;  /* assume GMT */
-        TclDateTimezone = 0;
-    } else {
-        TclDateDSTmode = DSTmaybe;
-    }
-    TclDateHour = 0;
-    TclDateMinutes = 0;
-    TclDateSeconds = 0;
-    TclDateMeridian = MER24;
-    TclDateRelSeconds = 0;
-    TclDateRelMonth = 0;
-    TclDateHaveDate = 0;
-    TclDateHaveDay = 0;
-    TclDateHaveRel = 0;
-    TclDateHaveTime = 0;
-    TclDateHaveZone = 0;
-
-    if (TclDateparse() || TclDateHaveTime > 1 || TclDateHaveZone > 1 || TclDateHaveDate > 1 ||
-	    TclDateHaveDay > 1) {
-        return -1;
-    }
-    
-    if (TclDateHaveDate || TclDateHaveTime || TclDateHaveDay) {
-	if (TclDateYear < 0) {
-	    TclDateYear = -TclDateYear;
-	}
-	/*
-	 * The following line handles years that are specified using
-	 * only two digits.  The line of code below implements a policy
-	 * defined by the X/Open workgroup on the millinium rollover.
-	 * Note: some of those dates may not actually be valid on some
-	 * platforms.  The POSIX standard startes that the dates 70-99
-	 * shall refer to 1970-1999 and 00-38 shall refer to 2000-2038.
-	 * This later definition should work on all platforms.
-	 */
-
-	if (TclDateYear < 100) {
-	    if (TclDateYear >= 69) {
-		TclDateYear += 1900;
-	    } else {
-		TclDateYear += 2000;
-	    }
-	}
-	if (Convert(TclDateMonth, TclDateDay, TclDateYear, TclDateHour, TclDateMinutes, TclDateSeconds,
-		TclDateMeridian, TclDateDSTmode, &Start) < 0) {
-            return -1;
-	}
-    } else {
-        Start = now;
-        if (!TclDateHaveRel) {
-            Start -= ((tm->tm_hour * 60L) + tm->tm_min * 60L) + tm->tm_sec;
-	}
-    }
-
-    Start += TclDateRelSeconds;
-    if (RelativeMonth(Start, TclDateRelMonth, &Time) < 0) {
-        return -1;
-    }
-    Start += Time;
-
-    if (TclDateHaveDay && !TclDateHaveDate) {
-        tod = RelativeDate(Start, TclDateDayOrdinal, TclDateDayNumber);
-        Start += tod;
-    }
-
-    *timePtr = Start;
-    return 0;
-}
-TclDatetabelem TclDateexca[] ={
--1, 1,
-	0, -1,
-	-2, 0,
-	};
-# define YYNPROD 41
-# define YYLAST 227
-TclDatetabelem TclDateact[]={
-
-    14,    11,    23,    28,    17,    12,    19,    18,    16,     9,
-    10,    13,    42,    21,    46,    45,    44,    48,    41,    37,
-    36,    35,    32,    29,    34,    33,    31,    43,    39,    38,
-    30,    15,     8,     7,     6,     5,     4,     3,     2,     1,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    47,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    22,     0,     0,    20,    25,    24,    27,
-    26,    42,     0,     0,     0,     0,    40 };
-TclDatetabelem TclDatepact[]={
-
--10000000,  -258,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,   -45,
-  -267,-10000000,  -244,-10000000,   -14,  -231,  -240,-10000000,-10000000,-10000000,
--10000000,  -246,-10000000,  -247,  -248,-10000000,-10000000,-10000000,-10000000,   -15,
--10000000,-10000000,-10000000,-10000000,-10000000,   -40,   -20,-10000000,  -251,-10000000,
--10000000,  -252,-10000000,  -253,-10000000,  -249,-10000000,-10000000,-10000000 };
-TclDatetabelem TclDatepgo[]={
-
-     0,    28,    39,    38,    37,    36,    35,    34,    33,    32,
-    31 };
-TclDatetabelem TclDater1[]={
-
-     0,     2,     2,     3,     3,     3,     3,     3,     3,     4,
-     4,     4,     4,     4,     5,     5,     5,     7,     7,     7,
-     6,     6,     6,     6,     6,     6,     6,     8,     8,    10,
-    10,    10,    10,    10,    10,    10,    10,    10,     9,     1,
-     1 };
-TclDatetabelem TclDater2[]={
-
-     0,     0,     4,     3,     3,     3,     3,     3,     2,     5,
-     9,     9,    13,    13,     5,     3,     3,     3,     5,     5,
-     7,    11,     5,     9,     5,     3,     7,     5,     2,     5,
-     5,     3,     5,     5,     3,     5,     5,     3,     3,     1,
-     3 };
-TclDatetabelem TclDatechk[]={
-
--10000000,    -2,    -3,    -4,    -5,    -6,    -7,    -8,    -9,   267,
-   268,   259,   263,   269,   258,   -10,   266,   262,   265,   264,
-   261,    58,   258,    47,   263,   262,   265,   264,   270,   267,
-    44,   257,   262,   265,   264,   267,   267,   267,    44,    -1,
-   266,    58,   261,    47,   267,   267,   267,    -1,   266 };
-TclDatetabelem TclDatedef[]={
-
-     1,    -2,     2,     3,     4,     5,     6,     7,     8,    38,
-    15,    16,     0,    25,    17,    28,     0,    31,    34,    37,
-     9,     0,    19,     0,    24,    29,    33,    36,    14,    22,
-    18,    27,    30,    32,    35,    39,    20,    26,     0,    10,
-    11,     0,    40,     0,    23,    39,    21,    12,    13 };
-typedef struct
-#ifdef __cplusplus
-	TclDatetoktype
-#endif
-{ char *t_name; int t_val; } TclDatetoktype;
-#ifndef YYDEBUG
-#	define YYDEBUG	0	/* don't allow debugging */
-#endif
-
-#if YYDEBUG
-
-TclDatetoktype TclDatetoks[] =
-{
-	"tAGO",	257,
-	"tDAY",	258,
-	"tDAYZONE",	259,
-	"tID",	260,
-	"tMERIDIAN",	261,
-	"tMINUTE_UNIT",	262,
-	"tMONTH",	263,
-	"tMONTH_UNIT",	264,
-	"tSEC_UNIT",	265,
-	"tSNUMBER",	266,
-	"tUNUMBER",	267,
-	"tZONE",	268,
-	"tEPOCH",	269,
-	"tDST",	270,
-	"-unknown-",	-1	/* ends search */
-};
-
-char * TclDatereds[] =
-{
-	"-no such reduction-",
-	"spec : /* empty */",
-	"spec : spec item",
-	"item : time",
-	"item : zone",
-	"item : date",
-	"item : day",
-	"item : rel",
-	"item : number",
-	"time : tUNUMBER tMERIDIAN",
-	"time : tUNUMBER ':' tUNUMBER o_merid",
-	"time : tUNUMBER ':' tUNUMBER tSNUMBER",
-	"time : tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid",
-	"time : tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER",
-	"zone : tZONE tDST",
-	"zone : tZONE",
-	"zone : tDAYZONE",
-	"day : tDAY",
-	"day : tDAY ','",
-	"day : tUNUMBER tDAY",
-	"date : tUNUMBER '/' tUNUMBER",
-	"date : tUNUMBER '/' tUNUMBER '/' tUNUMBER",
-	"date : tMONTH tUNUMBER",
-	"date : tMONTH tUNUMBER ',' tUNUMBER",
-	"date : tUNUMBER tMONTH",
-	"date : tEPOCH",
-	"date : tUNUMBER tMONTH tUNUMBER",
-	"rel : relunit tAGO",
-	"rel : relunit",
-	"relunit : tUNUMBER tMINUTE_UNIT",
-	"relunit : tSNUMBER tMINUTE_UNIT",
-	"relunit : tMINUTE_UNIT",
-	"relunit : tSNUMBER tSEC_UNIT",
-	"relunit : tUNUMBER tSEC_UNIT",
-	"relunit : tSEC_UNIT",
-	"relunit : tSNUMBER tMONTH_UNIT",
-	"relunit : tUNUMBER tMONTH_UNIT",
-	"relunit : tMONTH_UNIT",
-	"number : tUNUMBER",
-	"o_merid : /* empty */",
-	"o_merid : tMERIDIAN",
-};
-#endif /* YYDEBUG */
-/*
- * Copyright (c) 1993 by Sun Microsystems, Inc.
- */
-
-
-/*
-** Skeleton parser driver for yacc output
-*/
-
-/*
-** yacc user known macros and defines
-*/
-#define YYERROR		goto TclDateerrlab
-#define YYACCEPT	return(0)
-#define YYABORT		return(1)
-#define YYBACKUP( newtoken, newvalue )\
-{\
-	if ( TclDatechar >= 0 || ( TclDater2[ TclDatetmp ] >> 1 ) != 1 )\
-	{\
-		TclDateerror( "syntax error - cannot backup" );\
-		goto TclDateerrlab;\
-	}\
-	TclDatechar = newtoken;\
-	TclDatestate = *TclDateps;\
-	TclDatelval = newvalue;\
-	goto TclDatenewstate;\
-}
-#define YYRECOVERING()	(!!TclDateerrflag)
-#define YYNEW(type)	malloc(sizeof(type) * TclDatenewmax)
-#define YYCOPY(to, from, type) \
-	(type *) memcpy(to, (char *) from, TclDatenewmax * sizeof(type))
-#define YYENLARGE( from, type) \
-	(type *) realloc((char *) from, TclDatenewmax * sizeof(type))
-#ifndef YYDEBUG
-#	define YYDEBUG	1	/* make debugging available */
-#endif
-
-/*
-** user known globals
-*/
-int TclDatedebug;			/* set to 1 to get debugging */
-
-/*
-** driver internal defines
-*/
-#define YYFLAG		(-10000000)
-
-/*
-** global variables used by the parser
-*/
-YYSTYPE *TclDatepv;			/* top of value stack */
-int *TclDateps;			/* top of state stack */
-
-int TclDatestate;			/* current state */
-int TclDatetmp;			/* extra var (lasts between blocks) */
-
-int TclDatenerrs;			/* number of errors */
-int TclDateerrflag;			/* error recovery flag */
-int TclDatechar;			/* current input token number */
-
-
-
-#ifdef YYNMBCHARS
-#define YYLEX()		TclDatecvtok(TclDatelex())
-/*
-** TclDatecvtok - return a token if i is a wchar_t value that exceeds 255.
-**	If i<255, i itself is the token.  If i>255 but the neither 
-**	of the 30th or 31st bit is on, i is already a token.
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int TclDatecvtok(int i)
-#else
-int TclDatecvtok(i) int i;
-#endif
-{
-	int first = 0;
-	int last = YYNMBCHARS - 1;
-	int mid;
-	wchar_t j;
-
-	if(i&0x60000000){/*Must convert to a token. */
-		if( TclDatembchars[last].character < i ){
-			return i;/*Giving up*/
-		}
-		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
-			mid = (first+last)/2;
-			j = TclDatembchars[mid].character;
-			if( j==i ){/*Found*/ 
-				return TclDatembchars[mid].tvalue;
-			}else if( j<i ){
-				first = mid + 1;
-			}else{
-				last = mid -1;
-			}
-		}
-		/*No entry in the table.*/
-		return i;/* Giving up.*/
-	}else{/* i is already a token. */
-		return i;
-	}
-}
-#else/*!YYNMBCHARS*/
-#define YYLEX()		TclDatelex()
-#endif/*!YYNMBCHARS*/
-
-/*
-** TclDateparse - return 0 if worked, 1 if syntax error not recovered from
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int TclDateparse(void)
-#else
-int TclDateparse()
-#endif
-{
-	register YYSTYPE *TclDatepvt;	/* top of value stack for $vars */
-
-#if defined(__cplusplus) || defined(lint)
-/*
-	hacks to please C++ and lint - goto's inside switch should never be
-	executed; TclDatepvt is set to 0 to avoid "used before set" warning.
-*/
-	static int __yaccpar_lint_hack__ = 0;
-	switch (__yaccpar_lint_hack__)
-	{
-		case 1: goto TclDateerrlab;
-		case 2: goto TclDatenewstate;
-	}
-	TclDatepvt = 0;
-#endif
-
-	/*
-	** Initialize externals - TclDateparse may be called more than once
-	*/
-	TclDatepv = &TclDatev[-1];
-	TclDateps = &TclDates[-1];
-	TclDatestate = 0;
-	TclDatetmp = 0;
-	TclDatenerrs = 0;
-	TclDateerrflag = 0;
-	TclDatechar = -1;
-
-#if YYMAXDEPTH <= 0
-	if (TclDatemaxdepth <= 0)
-	{
-		if ((TclDatemaxdepth = YYEXPAND(0)) <= 0)
-		{
-			TclDateerror("yacc initialization error");
-			YYABORT;
-		}
-	}
-#endif
-
-	{
-		register YYSTYPE *TclDate_pv;	/* top of value stack */
-		register int *TclDate_ps;		/* top of state stack */
-		register int TclDate_state;		/* current state */
-		register int  TclDate_n;		/* internal state number info */
-	goto TclDatestack;	/* moved from 6 lines above to here to please C++ */
-
-		/*
-		** get globals into registers.
-		** branch to here only if YYBACKUP was called.
-		*/
-		TclDate_pv = TclDatepv;
-		TclDate_ps = TclDateps;
-		TclDate_state = TclDatestate;
-		goto TclDate_newstate;
-
-		/*
-		** get globals into registers.
-		** either we just started, or we just finished a reduction
-		*/
-	TclDatestack:
-		TclDate_pv = TclDatepv;
-		TclDate_ps = TclDateps;
-		TclDate_state = TclDatestate;
-
-		/*
-		** top of for (;;) loop while no reductions done
-		*/
-	TclDate_stack:
-		/*
-		** put a state and value onto the stacks
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, look up token value in list of value vs.
-		** name pairs.  0 and negative (-1) are special values.
-		** Note: linear search is used since time is not a real
-		** consideration while debugging.
-		*/
-		if ( TclDatedebug )
-		{
-			register int TclDate_i;
-
-			printf( "State %d, token ", TclDate_state );
-			if ( TclDatechar == 0 )
-				printf( "end-of-file\n" );
-			else if ( TclDatechar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( TclDate_i = 0; TclDatetoks[TclDate_i].t_val >= 0;
-					TclDate_i++ )
-				{
-					if ( TclDatetoks[TclDate_i].t_val == TclDatechar )
-						break;
-				}
-				printf( "%s\n", TclDatetoks[TclDate_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ++TclDate_ps >= &TclDates[ TclDatemaxdepth ] )	/* room on stack? */
-		{
-			/*
-			** reallocate and recover.  Note that pointers
-			** have to be reset, or bad things will happen
-			*/
-			int TclDateps_index = (TclDate_ps - TclDates);
-			int TclDatepv_index = (TclDate_pv - TclDatev);
-			int TclDatepvt_index = (TclDatepvt - TclDatev);
-			int TclDatenewmax;
-#ifdef YYEXPAND
-			TclDatenewmax = YYEXPAND(TclDatemaxdepth);
-#else
-			TclDatenewmax = 2 * TclDatemaxdepth;	/* double table size */
-			if (TclDatemaxdepth == YYMAXDEPTH)	/* first time growth */
-			{
-				char *newTclDates = (char *)YYNEW(int);
-				char *newTclDatev = (char *)YYNEW(YYSTYPE);
-				if (newTclDates != 0 && newTclDatev != 0)
-				{
-					TclDates = YYCOPY(newTclDates, TclDates, int);
-					TclDatev = YYCOPY(newTclDatev, TclDatev, YYSTYPE);
-				}
-				else
-					TclDatenewmax = 0;	/* failed */
-			}
-			else				/* not first time */
-			{
-				TclDates = YYENLARGE(TclDates, int);
-				TclDatev = YYENLARGE(TclDatev, YYSTYPE);
-				if (TclDates == 0 || TclDatev == 0)
-					TclDatenewmax = 0;	/* failed */
-			}
-#endif
-			if (TclDatenewmax <= TclDatemaxdepth)	/* tables not expanded */
-			{
-				TclDateerror( "yacc stack overflow" );
-				YYABORT;
-			}
-			TclDatemaxdepth = TclDatenewmax;
-
-			TclDate_ps = TclDates + TclDateps_index;
-			TclDate_pv = TclDatev + TclDatepv_index;
-			TclDatepvt = TclDatev + TclDatepvt_index;
-		}
-		*TclDate_ps = TclDate_state;
-		*++TclDate_pv = TclDateval;
-
-		/*
-		** we have a new state - find out what to do
-		*/
-	TclDate_newstate:
-		if ( ( TclDate_n = TclDatepact[ TclDate_state ] ) <= YYFLAG )
-			goto TclDatedefault;		/* simple state */
-#if YYDEBUG
-		/*
-		** if debugging, need to mark whether new token grabbed
-		*/
-		TclDatetmp = TclDatechar < 0;
-#endif
-		if ( ( TclDatechar < 0 ) && ( ( TclDatechar = YYLEX() ) < 0 ) )
-			TclDatechar = 0;		/* reached EOF */
-#if YYDEBUG
-		if ( TclDatedebug && TclDatetmp )
-		{
-			register int TclDate_i;
-
-			printf( "Received token " );
-			if ( TclDatechar == 0 )
-				printf( "end-of-file\n" );
-			else if ( TclDatechar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( TclDate_i = 0; TclDatetoks[TclDate_i].t_val >= 0;
-					TclDate_i++ )
-				{
-					if ( TclDatetoks[TclDate_i].t_val == TclDatechar )
-						break;
-				}
-				printf( "%s\n", TclDatetoks[TclDate_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ( ( TclDate_n += TclDatechar ) < 0 ) || ( TclDate_n >= YYLAST ) )
-			goto TclDatedefault;
-		if ( TclDatechk[ TclDate_n = TclDateact[ TclDate_n ] ] == TclDatechar )	/*valid shift*/
-		{
-			TclDatechar = -1;
-			TclDateval = TclDatelval;
-			TclDate_state = TclDate_n;
-			if ( TclDateerrflag > 0 )
-				TclDateerrflag--;
-			goto TclDate_stack;
-		}
-
-	TclDatedefault:
-		if ( ( TclDate_n = TclDatedef[ TclDate_state ] ) == -2 )
-		{
-#if YYDEBUG
-			TclDatetmp = TclDatechar < 0;
-#endif
-			if ( ( TclDatechar < 0 ) && ( ( TclDatechar = YYLEX() ) < 0 ) )
-				TclDatechar = 0;		/* reached EOF */
-#if YYDEBUG
-			if ( TclDatedebug && TclDatetmp )
-			{
-				register int TclDate_i;
-
-				printf( "Received token " );
-				if ( TclDatechar == 0 )
-					printf( "end-of-file\n" );
-				else if ( TclDatechar < 0 )
-					printf( "-none-\n" );
-				else
-				{
-					for ( TclDate_i = 0;
-						TclDatetoks[TclDate_i].t_val >= 0;
-						TclDate_i++ )
-					{
-						if ( TclDatetoks[TclDate_i].t_val
-							== TclDatechar )
-						{
-							break;
-						}
-					}
-					printf( "%s\n", TclDatetoks[TclDate_i].t_name );
-				}
-			}
-#endif /* YYDEBUG */
-			/*
-			** look through exception table
-			*/
-			{
-				register int *TclDatexi = TclDateexca;
-
-				while ( ( *TclDatexi != -1 ) ||
-					( TclDatexi[1] != TclDate_state ) )
-				{
-					TclDatexi += 2;
-				}
-				while ( ( *(TclDatexi += 2) >= 0 ) &&
-					( *TclDatexi != TclDatechar ) )
-					;
-				if ( ( TclDate_n = TclDatexi[1] ) < 0 )
-					YYACCEPT;
-			}
-		}
-
-		/*
-		** check for syntax error
-		*/
-		if ( TclDate_n == 0 )	/* have an error */
-		{
-			/* no worry about speed here! */
-			switch ( TclDateerrflag )
-			{
-			case 0:		/* new error */
-				TclDateerror( "syntax error" );
-				goto skip_init;
-				/*
-				** get globals into registers.
-				** we have a user generated syntax type error
-				*/
-				TclDate_pv = TclDatepv;
-				TclDate_ps = TclDateps;
-				TclDate_state = TclDatestate;
-			skip_init:
-				TclDatenerrs++;
-				/* FALLTHRU */
-			case 1:
-			case 2:		/* incompletely recovered error */
-					/* try again... */
-				TclDateerrflag = 3;
-				/*
-				** find state where "error" is a legal
-				** shift action
-				*/
-				while ( TclDate_ps >= TclDates )
-				{
-					TclDate_n = TclDatepact[ *TclDate_ps ] + YYERRCODE;
-					if ( TclDate_n >= 0 && TclDate_n < YYLAST &&
-						TclDatechk[TclDateact[TclDate_n]] == YYERRCODE)					{
-						/*
-						** simulate shift of "error"
-						*/
-						TclDate_state = TclDateact[ TclDate_n ];
-						goto TclDate_stack;
-					}
-					/*
-					** current state has no shift on
-					** "error", pop stack
-					*/
-#if YYDEBUG
-#	define _POP_ "Error recovery pops state %d, uncovers state %d\n"
-					if ( TclDatedebug )
-						printf( _POP_, *TclDate_ps,
-							TclDate_ps[-1] );
-#	undef _POP_
-#endif
-					TclDate_ps--;
-					TclDate_pv--;
-				}
-				/*
-				** there is no state on stack with "error" as
-				** a valid shift.  give up.
-				*/
-				YYABORT;
-			case 3:		/* no shift yet; eat a token */
-#if YYDEBUG
-				/*
-				** if debugging, look up token in list of
-				** pairs.  0 and negative shouldn't occur,
-				** but since timing doesn't matter when
-				** debugging, it doesn't hurt to leave the
-				** tests here.
-				*/
-				if ( TclDatedebug )
-				{
-					register int TclDate_i;
-
-					printf( "Error recovery discards " );
-					if ( TclDatechar == 0 )
-						printf( "token end-of-file\n" );
-					else if ( TclDatechar < 0 )
-						printf( "token -none-\n" );
-					else
-					{
-						for ( TclDate_i = 0;
-							TclDatetoks[TclDate_i].t_val >= 0;
-							TclDate_i++ )
-						{
-							if ( TclDatetoks[TclDate_i].t_val
-								== TclDatechar )
-							{
-								break;
-							}
-						}
-						printf( "token %s\n",
-							TclDatetoks[TclDate_i].t_name );
-					}
-				}
-#endif /* YYDEBUG */
-				if ( TclDatechar == 0 )	/* reached EOF. quit */
-					YYABORT;
-				TclDatechar = -1;
-				goto TclDate_newstate;
-			}
-		}/* end if ( TclDate_n == 0 ) */
-		/*
-		** reduction by production TclDate_n
-		** put stack tops, etc. so things right after switch
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, print the string that is the user's
-		** specification of the reduction which is just about
-		** to be done.
-		*/
-		if ( TclDatedebug )
-			printf( "Reduce by (%d) \"%s\"\n",
-				TclDate_n, TclDatereds[ TclDate_n ] );
-#endif
-		TclDatetmp = TclDate_n;			/* value to switch over */
-		TclDatepvt = TclDate_pv;			/* $vars top of value stack */
-		/*
-		** Look in goto table for next state
-		** Sorry about using TclDate_state here as temporary
-		** register variable, but why not, if it works...
-		** If TclDater2[ TclDate_n ] doesn't have the low order bit
-		** set, then there is no action to be done for
-		** this reduction.  So, no saving & unsaving of
-		** registers done.  The only difference between the
-		** code just after the if and the body of the if is
-		** the goto TclDate_stack in the body.  This way the test
-		** can be made before the choice of what to do is needed.
-		*/
-		{
-			/* length of production doubled with extra bit */
-			register int TclDate_len = TclDater2[ TclDate_n ];
-
-			if ( !( TclDate_len & 01 ) )
-			{
-				TclDate_len >>= 1;
-				TclDateval = ( TclDate_pv -= TclDate_len )[1];	/* $$ = $1 */
-				TclDate_state = TclDatepgo[ TclDate_n = TclDater1[ TclDate_n ] ] +
-					*( TclDate_ps -= TclDate_len ) + 1;
-				if ( TclDate_state >= YYLAST ||
-					TclDatechk[ TclDate_state =
-					TclDateact[ TclDate_state ] ] != -TclDate_n )
-				{
-					TclDate_state = TclDateact[ TclDatepgo[ TclDate_n ] ];
-				}
-				goto TclDate_stack;
-			}
-			TclDate_len >>= 1;
-			TclDateval = ( TclDate_pv -= TclDate_len )[1];	/* $$ = $1 */
-			TclDate_state = TclDatepgo[ TclDate_n = TclDater1[ TclDate_n ] ] +
-				*( TclDate_ps -= TclDate_len ) + 1;
-			if ( TclDate_state >= YYLAST ||
-				TclDatechk[ TclDate_state = TclDateact[ TclDate_state ] ] != -TclDate_n )
-			{
-				TclDate_state = TclDateact[ TclDatepgo[ TclDate_n ] ];
-			}
-		}
-					/* save until reenter driver code */
-		TclDatestate = TclDate_state;
-		TclDateps = TclDate_ps;
-		TclDatepv = TclDate_pv;
-	}
-	/*
-	** code supplied by user is placed in this switch
-	*/
-	switch( TclDatetmp )
-	{
-		
-case 3:{
-            TclDateHaveTime++;
-        } break;
-case 4:{
-            TclDateHaveZone++;
-        } break;
-case 5:{
-            TclDateHaveDate++;
-        } break;
-case 6:{
-            TclDateHaveDay++;
-        } break;
-case 7:{
-            TclDateHaveRel++;
-        } break;
-case 9:{
-            TclDateHour = TclDatepvt[-1].Number;
-            TclDateMinutes = 0;
-            TclDateSeconds = 0;
-            TclDateMeridian = TclDatepvt[-0].Meridian;
-        } break;
-case 10:{
-            TclDateHour = TclDatepvt[-3].Number;
-            TclDateMinutes = TclDatepvt[-1].Number;
-            TclDateSeconds = 0;
-            TclDateMeridian = TclDatepvt[-0].Meridian;
-        } break;
-case 11:{
-            TclDateHour = TclDatepvt[-3].Number;
-            TclDateMinutes = TclDatepvt[-1].Number;
-            TclDateMeridian = MER24;
-            TclDateDSTmode = DSToff;
-            TclDateTimezone = - (TclDatepvt[-0].Number % 100 + (TclDatepvt[-0].Number / 100) * 60);
-        } break;
-case 12:{
-            TclDateHour = TclDatepvt[-5].Number;
-            TclDateMinutes = TclDatepvt[-3].Number;
-            TclDateSeconds = TclDatepvt[-1].Number;
-            TclDateMeridian = TclDatepvt[-0].Meridian;
-        } break;
-case 13:{
-            TclDateHour = TclDatepvt[-5].Number;
-            TclDateMinutes = TclDatepvt[-3].Number;
-            TclDateSeconds = TclDatepvt[-1].Number;
-            TclDateMeridian = MER24;
-            TclDateDSTmode = DSToff;
-            TclDateTimezone = - (TclDatepvt[-0].Number % 100 + (TclDatepvt[-0].Number / 100) * 60);
-        } break;
-case 14:{
-            TclDateTimezone = TclDatepvt[-1].Number;
-            TclDateDSTmode = DSTon;
-        } break;
-case 15:{
-            TclDateTimezone = TclDatepvt[-0].Number;
-            TclDateDSTmode = DSToff;
-        } break;
-case 16:{
-            TclDateTimezone = TclDatepvt[-0].Number;
-            TclDateDSTmode = DSTon;
-        } break;
-case 17:{
-            TclDateDayOrdinal = 1;
-            TclDateDayNumber = TclDatepvt[-0].Number;
-        } break;
-case 18:{
-            TclDateDayOrdinal = 1;
-            TclDateDayNumber = TclDatepvt[-1].Number;
-        } break;
-case 19:{
-            TclDateDayOrdinal = TclDatepvt[-1].Number;
-            TclDateDayNumber = TclDatepvt[-0].Number;
-        } break;
-case 20:{
-            TclDateMonth = TclDatepvt[-2].Number;
-            TclDateDay = TclDatepvt[-0].Number;
-        } break;
-case 21:{
-            TclDateMonth = TclDatepvt[-4].Number;
-            TclDateDay = TclDatepvt[-2].Number;
-            TclDateYear = TclDatepvt[-0].Number;
-        } break;
-case 22:{
-            TclDateMonth = TclDatepvt[-1].Number;
-            TclDateDay = TclDatepvt[-0].Number;
-        } break;
-case 23:{
-            TclDateMonth = TclDatepvt[-3].Number;
-            TclDateDay = TclDatepvt[-2].Number;
-            TclDateYear = TclDatepvt[-0].Number;
-        } break;
-case 24:{
-            TclDateMonth = TclDatepvt[-0].Number;
-            TclDateDay = TclDatepvt[-1].Number;
-        } break;
-case 25:{
-				TclDateMonth = 1;
-				TclDateDay = 1;
-				TclDateYear = EPOCH;
-		  } break;
-case 26:{
-            TclDateMonth = TclDatepvt[-1].Number;
-            TclDateDay = TclDatepvt[-2].Number;
-            TclDateYear = TclDatepvt[-0].Number;
-        } break;
-case 27:{
-            TclDateRelSeconds = -TclDateRelSeconds;
-            TclDateRelMonth = -TclDateRelMonth;
-        } break;
-case 29:{
-            TclDateRelSeconds += TclDatepvt[-1].Number * TclDatepvt[-0].Number * 60L;
-        } break;
-case 30:{
-            TclDateRelSeconds += TclDatepvt[-1].Number * TclDatepvt[-0].Number * 60L;
-        } break;
-case 31:{
-            TclDateRelSeconds += TclDatepvt[-0].Number * 60L;
-        } break;
-case 32:{
-            TclDateRelSeconds += TclDatepvt[-1].Number;
-        } break;
-case 33:{
-            TclDateRelSeconds += TclDatepvt[-1].Number;
-        } break;
-case 34:{
-            TclDateRelSeconds++;
-        } break;
-case 35:{
-            TclDateRelMonth += TclDatepvt[-1].Number * TclDatepvt[-0].Number;
-        } break;
-case 36:{
-            TclDateRelMonth += TclDatepvt[-1].Number * TclDatepvt[-0].Number;
-        } break;
-case 37:{
-            TclDateRelMonth += TclDatepvt[-0].Number;
-        } break;
-case 38:{
-	if (TclDateHaveTime && TclDateHaveDate && !TclDateHaveRel) {
-	    TclDateYear = TclDatepvt[-0].Number;
-	} else {
-	    TclDateHaveTime++;
-	    if (TclDatepvt[-0].Number < 100) {
-		TclDateHour = 0;
-		TclDateMinutes = TclDatepvt[-0].Number;
-	    } else {
-		TclDateHour = TclDatepvt[-0].Number / 100;
-		TclDateMinutes = TclDatepvt[-0].Number % 100;
-	    }
-	    TclDateSeconds = 0;
-	    TclDateMeridian = MER24;
-	}
-    } break;
-case 39:{
-            TclDateval.Meridian = MER24;
-        } break;
-case 40:{
-            TclDateval.Meridian = TclDatepvt[-0].Meridian;
-        } break;
-	}
-	goto TclDatestack;		/* reset registers in driver code */
-}
-
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
deleted file mode 100644
index f07ff56..0000000
--- a/generic/tclDecls.h
+++ /dev/null
@@ -1,2995 +0,0 @@
-/*
- * tclDecls.h --
- *
- *	Declarations of functions in the platform independent public Tcl API.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclDecls.h,v 1.7 1999/04/16 00:46:45 stanton Exp $
- */
-
-#ifndef _TCLDECLS
-#define _TCLDECLS
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tcl.decls script.
- */
-
-/* !BEGIN!: Do not edit below this line. */
-
-/*
- * Exported function declarations:
- */
-
-/* 0 */
-EXTERN int		Tcl_PkgProvideEx _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version, 
-				ClientData clientData));
-/* 1 */
-EXTERN char *		Tcl_PkgRequireEx _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version, int exact, 
-				ClientData * clientDataPtr));
-/* 2 */
-EXTERN void		Tcl_Panic _ANSI_ARGS_(TCL_VARARGS(char *,format));
-/* 3 */
-EXTERN char *		Tcl_Alloc _ANSI_ARGS_((unsigned int size));
-/* 4 */
-EXTERN void		Tcl_Free _ANSI_ARGS_((char * ptr));
-/* 5 */
-EXTERN char *		Tcl_Realloc _ANSI_ARGS_((char * ptr, 
-				unsigned int size));
-/* 6 */
-EXTERN char *		Tcl_DbCkalloc _ANSI_ARGS_((unsigned int size, 
-				char * file, int line));
-/* 7 */
-EXTERN int		Tcl_DbCkfree _ANSI_ARGS_((char * ptr, char * file, 
-				int line));
-/* 8 */
-EXTERN char *		Tcl_DbCkrealloc _ANSI_ARGS_((char * ptr, 
-				unsigned int size, char * file, int line));
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* 9 */
-EXTERN void		Tcl_CreateFileHandler _ANSI_ARGS_((int fd, int mask, 
-				Tcl_FileProc * proc, ClientData clientData));
-#endif /* UNIX */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* 10 */
-EXTERN void		Tcl_DeleteFileHandler _ANSI_ARGS_((int fd));
-#endif /* UNIX */
-/* 11 */
-EXTERN void		Tcl_SetTimer _ANSI_ARGS_((Tcl_Time * timePtr));
-/* 12 */
-EXTERN void		Tcl_Sleep _ANSI_ARGS_((int ms));
-/* 13 */
-EXTERN int		Tcl_WaitForEvent _ANSI_ARGS_((Tcl_Time * timePtr));
-/* 14 */
-EXTERN int		Tcl_AppendAllObjTypes _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr));
-/* 15 */
-EXTERN void		Tcl_AppendStringsToObj _ANSI_ARGS_(TCL_VARARGS(Tcl_Obj *,objPtr));
-/* 16 */
-EXTERN void		Tcl_AppendToObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				char * bytes, int length));
-/* 17 */
-EXTERN Tcl_Obj *	Tcl_ConcatObj _ANSI_ARGS_((int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 18 */
-EXTERN int		Tcl_ConvertToType _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, Tcl_ObjType * typePtr));
-/* 19 */
-EXTERN void		Tcl_DbDecrRefCount _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				char * file, int line));
-/* 20 */
-EXTERN void		Tcl_DbIncrRefCount _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				char * file, int line));
-/* 21 */
-EXTERN int		Tcl_DbIsShared _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				char * file, int line));
-/* 22 */
-EXTERN Tcl_Obj *	Tcl_DbNewBooleanObj _ANSI_ARGS_((int boolValue, 
-				char * file, int line));
-/* 23 */
-EXTERN Tcl_Obj *	Tcl_DbNewByteArrayObj _ANSI_ARGS_((
-				unsigned char * bytes, int length, 
-				char * file, int line));
-/* 24 */
-EXTERN Tcl_Obj *	Tcl_DbNewDoubleObj _ANSI_ARGS_((double doubleValue, 
-				char * file, int line));
-/* 25 */
-EXTERN Tcl_Obj *	Tcl_DbNewListObj _ANSI_ARGS_((int objc, 
-				Tcl_Obj *CONST objv[], char * file, int line));
-/* 26 */
-EXTERN Tcl_Obj *	Tcl_DbNewLongObj _ANSI_ARGS_((long longValue, 
-				char * file, int line));
-/* 27 */
-EXTERN Tcl_Obj *	Tcl_DbNewObj _ANSI_ARGS_((char * file, int line));
-/* 28 */
-EXTERN Tcl_Obj *	Tcl_DbNewStringObj _ANSI_ARGS_((CONST char * bytes, 
-				int length, char * file, int line));
-/* 29 */
-EXTERN Tcl_Obj *	Tcl_DuplicateObj _ANSI_ARGS_((Tcl_Obj * objPtr));
-/* 30 */
-EXTERN void		TclFreeObj _ANSI_ARGS_((Tcl_Obj * objPtr));
-/* 31 */
-EXTERN int		Tcl_GetBoolean _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * boolPtr));
-/* 32 */
-EXTERN int		Tcl_GetBooleanFromObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				int * boolPtr));
-/* 33 */
-EXTERN unsigned char *	Tcl_GetByteArrayFromObj _ANSI_ARGS_((
-				Tcl_Obj * objPtr, int * lengthPtr));
-/* 34 */
-EXTERN int		Tcl_GetDouble _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, double * doublePtr));
-/* 35 */
-EXTERN int		Tcl_GetDoubleFromObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				double * doublePtr));
-/* 36 */
-EXTERN int		Tcl_GetIndexFromObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, char ** tablePtr, 
-				char * msg, int flags, int * indexPtr));
-/* 37 */
-EXTERN int		Tcl_GetInt _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * intPtr));
-/* 38 */
-EXTERN int		Tcl_GetIntFromObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int * intPtr));
-/* 39 */
-EXTERN int		Tcl_GetLongFromObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, long * longPtr));
-/* 40 */
-EXTERN Tcl_ObjType *	Tcl_GetObjType _ANSI_ARGS_((char * typeName));
-/* 41 */
-EXTERN char *		Tcl_GetStringFromObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int * lengthPtr));
-/* 42 */
-EXTERN void		Tcl_InvalidateStringRep _ANSI_ARGS_((
-				Tcl_Obj * objPtr));
-/* 43 */
-EXTERN int		Tcl_ListObjAppendList _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * listPtr, 
-				Tcl_Obj * elemListPtr));
-/* 44 */
-EXTERN int		Tcl_ListObjAppendElement _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * listPtr, 
-				Tcl_Obj * objPtr));
-/* 45 */
-EXTERN int		Tcl_ListObjGetElements _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * listPtr, 
-				int * objcPtr, Tcl_Obj *** objvPtr));
-/* 46 */
-EXTERN int		Tcl_ListObjIndex _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int index, 
-				Tcl_Obj ** objPtrPtr));
-/* 47 */
-EXTERN int		Tcl_ListObjLength _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int * intPtr));
-/* 48 */
-EXTERN int		Tcl_ListObjReplace _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * listPtr, int first, int count, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 49 */
-EXTERN Tcl_Obj *	Tcl_NewBooleanObj _ANSI_ARGS_((int boolValue));
-/* 50 */
-EXTERN Tcl_Obj *	Tcl_NewByteArrayObj _ANSI_ARGS_((
-				unsigned char * bytes, int length));
-/* 51 */
-EXTERN Tcl_Obj *	Tcl_NewDoubleObj _ANSI_ARGS_((double doubleValue));
-/* 52 */
-EXTERN Tcl_Obj *	Tcl_NewIntObj _ANSI_ARGS_((int intValue));
-/* 53 */
-EXTERN Tcl_Obj *	Tcl_NewListObj _ANSI_ARGS_((int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 54 */
-EXTERN Tcl_Obj *	Tcl_NewLongObj _ANSI_ARGS_((long longValue));
-/* 55 */
-EXTERN Tcl_Obj *	Tcl_NewObj _ANSI_ARGS_((void));
-/* 56 */
-EXTERN Tcl_Obj *	Tcl_NewStringObj _ANSI_ARGS_((CONST char * bytes, 
-				int length));
-/* 57 */
-EXTERN void		Tcl_SetBooleanObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int boolValue));
-/* 58 */
-EXTERN unsigned char *	Tcl_SetByteArrayLength _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int length));
-/* 59 */
-EXTERN void		Tcl_SetByteArrayObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				unsigned char * bytes, int length));
-/* 60 */
-EXTERN void		Tcl_SetDoubleObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				double doubleValue));
-/* 61 */
-EXTERN void		Tcl_SetIntObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int intValue));
-/* 62 */
-EXTERN void		Tcl_SetListObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 63 */
-EXTERN void		Tcl_SetLongObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				long longValue));
-/* 64 */
-EXTERN void		Tcl_SetObjLength _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				int length));
-/* 65 */
-EXTERN void		Tcl_SetStringObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				char * bytes, int length));
-/* 66 */
-EXTERN void		Tcl_AddErrorInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * message));
-/* 67 */
-EXTERN void		Tcl_AddObjErrorInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * message, int length));
-/* 68 */
-EXTERN void		Tcl_AllowExceptions _ANSI_ARGS_((Tcl_Interp * interp));
-/* 69 */
-EXTERN void		Tcl_AppendElement _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * string));
-/* 70 */
-EXTERN void		Tcl_AppendResult _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp));
-/* 71 */
-EXTERN Tcl_AsyncHandler	 Tcl_AsyncCreate _ANSI_ARGS_((Tcl_AsyncProc * proc, 
-				ClientData clientData));
-/* 72 */
-EXTERN void		Tcl_AsyncDelete _ANSI_ARGS_((Tcl_AsyncHandler async));
-/* 73 */
-EXTERN int		Tcl_AsyncInvoke _ANSI_ARGS_((Tcl_Interp * interp, 
-				int code));
-/* 74 */
-EXTERN void		Tcl_AsyncMark _ANSI_ARGS_((Tcl_AsyncHandler async));
-/* 75 */
-EXTERN int		Tcl_AsyncReady _ANSI_ARGS_((void));
-/* 76 */
-EXTERN void		Tcl_BackgroundError _ANSI_ARGS_((Tcl_Interp * interp));
-/* 77 */
-EXTERN char		Tcl_Backslash _ANSI_ARGS_((CONST char * src, 
-				int * readPtr));
-/* 78 */
-EXTERN int		Tcl_BadChannelOption _ANSI_ARGS_((
-				Tcl_Interp * interp, char * optionName, 
-				char * optionList));
-/* 79 */
-EXTERN void		Tcl_CallWhenDeleted _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_InterpDeleteProc * proc, 
-				ClientData clientData));
-/* 80 */
-EXTERN void		Tcl_CancelIdleCall _ANSI_ARGS_((
-				Tcl_IdleProc * idleProc, 
-				ClientData clientData));
-/* 81 */
-EXTERN int		Tcl_Close _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
-/* 82 */
-EXTERN int		Tcl_CommandComplete _ANSI_ARGS_((char * cmd));
-/* 83 */
-EXTERN char *		Tcl_Concat _ANSI_ARGS_((int argc, char ** argv));
-/* 84 */
-EXTERN int		Tcl_ConvertElement _ANSI_ARGS_((CONST char * src, 
-				char * dst, int flags));
-/* 85 */
-EXTERN int		Tcl_ConvertCountedElement _ANSI_ARGS_((
-				CONST char * src, int length, char * dst, 
-				int flags));
-/* 86 */
-EXTERN int		Tcl_CreateAlias _ANSI_ARGS_((Tcl_Interp * slave, 
-				char * slaveCmd, Tcl_Interp * target, 
-				char * targetCmd, int argc, char ** argv));
-/* 87 */
-EXTERN int		Tcl_CreateAliasObj _ANSI_ARGS_((Tcl_Interp * slave, 
-				char * slaveCmd, Tcl_Interp * target, 
-				char * targetCmd, int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 88 */
-EXTERN Tcl_Channel	Tcl_CreateChannel _ANSI_ARGS_((
-				Tcl_ChannelType * typePtr, char * chanName, 
-				ClientData instanceData, int mask));
-/* 89 */
-EXTERN void		Tcl_CreateChannelHandler _ANSI_ARGS_((
-				Tcl_Channel chan, int mask, 
-				Tcl_ChannelProc * proc, 
-				ClientData clientData));
-/* 90 */
-EXTERN void		Tcl_CreateCloseHandler _ANSI_ARGS_((Tcl_Channel chan, 
-				Tcl_CloseProc * proc, ClientData clientData));
-/* 91 */
-EXTERN Tcl_Command	Tcl_CreateCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmdName, Tcl_CmdProc * proc, 
-				ClientData clientData, 
-				Tcl_CmdDeleteProc * deleteProc));
-/* 92 */
-EXTERN void		Tcl_CreateEventSource _ANSI_ARGS_((
-				Tcl_EventSetupProc * setupProc, 
-				Tcl_EventCheckProc * checkProc, 
-				ClientData clientData));
-/* 93 */
-EXTERN void		Tcl_CreateExitHandler _ANSI_ARGS_((
-				Tcl_ExitProc * proc, ClientData clientData));
-/* 94 */
-EXTERN Tcl_Interp *	Tcl_CreateInterp _ANSI_ARGS_((void));
-/* 95 */
-EXTERN void		Tcl_CreateMathFunc _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, int numArgs, 
-				Tcl_ValueType * argTypes, 
-				Tcl_MathProc * proc, ClientData clientData));
-/* 96 */
-EXTERN Tcl_Command	Tcl_CreateObjCommand _ANSI_ARGS_((
-				Tcl_Interp * interp, char * cmdName, 
-				Tcl_ObjCmdProc * proc, ClientData clientData, 
-				Tcl_CmdDeleteProc * deleteProc));
-/* 97 */
-EXTERN Tcl_Interp *	Tcl_CreateSlave _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * slaveName, int isSafe));
-/* 98 */
-EXTERN Tcl_TimerToken	Tcl_CreateTimerHandler _ANSI_ARGS_((int milliseconds, 
-				Tcl_TimerProc * proc, ClientData clientData));
-/* 99 */
-EXTERN Tcl_Trace	Tcl_CreateTrace _ANSI_ARGS_((Tcl_Interp * interp, 
-				int level, Tcl_CmdTraceProc * proc, 
-				ClientData clientData));
-/* 100 */
-EXTERN void		Tcl_DeleteAssocData _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name));
-/* 101 */
-EXTERN void		Tcl_DeleteChannelHandler _ANSI_ARGS_((
-				Tcl_Channel chan, Tcl_ChannelProc * proc, 
-				ClientData clientData));
-/* 102 */
-EXTERN void		Tcl_DeleteCloseHandler _ANSI_ARGS_((Tcl_Channel chan, 
-				Tcl_CloseProc * proc, ClientData clientData));
-/* 103 */
-EXTERN int		Tcl_DeleteCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmdName));
-/* 104 */
-EXTERN int		Tcl_DeleteCommandFromToken _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Command command));
-/* 105 */
-EXTERN void		Tcl_DeleteEvents _ANSI_ARGS_((
-				Tcl_EventDeleteProc * proc, 
-				ClientData clientData));
-/* 106 */
-EXTERN void		Tcl_DeleteEventSource _ANSI_ARGS_((
-				Tcl_EventSetupProc * setupProc, 
-				Tcl_EventCheckProc * checkProc, 
-				ClientData clientData));
-/* 107 */
-EXTERN void		Tcl_DeleteExitHandler _ANSI_ARGS_((
-				Tcl_ExitProc * proc, ClientData clientData));
-/* 108 */
-EXTERN void		Tcl_DeleteHashEntry _ANSI_ARGS_((
-				Tcl_HashEntry * entryPtr));
-/* 109 */
-EXTERN void		Tcl_DeleteHashTable _ANSI_ARGS_((
-				Tcl_HashTable * tablePtr));
-/* 110 */
-EXTERN void		Tcl_DeleteInterp _ANSI_ARGS_((Tcl_Interp * interp));
-/* 111 */
-EXTERN void		Tcl_DetachPids _ANSI_ARGS_((int numPids, 
-				Tcl_Pid * pidPtr));
-/* 112 */
-EXTERN void		Tcl_DeleteTimerHandler _ANSI_ARGS_((
-				Tcl_TimerToken token));
-/* 113 */
-EXTERN void		Tcl_DeleteTrace _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Trace trace));
-/* 114 */
-EXTERN void		Tcl_DontCallWhenDeleted _ANSI_ARGS_((
-				Tcl_Interp * interp, 
-				Tcl_InterpDeleteProc * proc, 
-				ClientData clientData));
-/* 115 */
-EXTERN int		Tcl_DoOneEvent _ANSI_ARGS_((int flags));
-/* 116 */
-EXTERN void		Tcl_DoWhenIdle _ANSI_ARGS_((Tcl_IdleProc * proc, 
-				ClientData clientData));
-/* 117 */
-EXTERN char *		Tcl_DStringAppend _ANSI_ARGS_((Tcl_DString * dsPtr, 
-				CONST char * str, int length));
-/* 118 */
-EXTERN char *		Tcl_DStringAppendElement _ANSI_ARGS_((
-				Tcl_DString * dsPtr, CONST char * string));
-/* 119 */
-EXTERN void		Tcl_DStringEndSublist _ANSI_ARGS_((
-				Tcl_DString * dsPtr));
-/* 120 */
-EXTERN void		Tcl_DStringFree _ANSI_ARGS_((Tcl_DString * dsPtr));
-/* 121 */
-EXTERN void		Tcl_DStringGetResult _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_DString * dsPtr));
-/* 122 */
-EXTERN void		Tcl_DStringInit _ANSI_ARGS_((Tcl_DString * dsPtr));
-/* 123 */
-EXTERN void		Tcl_DStringResult _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_DString * dsPtr));
-/* 124 */
-EXTERN void		Tcl_DStringSetLength _ANSI_ARGS_((
-				Tcl_DString * dsPtr, int length));
-/* 125 */
-EXTERN void		Tcl_DStringStartSublist _ANSI_ARGS_((
-				Tcl_DString * dsPtr));
-/* 126 */
-EXTERN int		Tcl_Eof _ANSI_ARGS_((Tcl_Channel chan));
-/* 127 */
-EXTERN char *		Tcl_ErrnoId _ANSI_ARGS_((void));
-/* 128 */
-EXTERN char *		Tcl_ErrnoMsg _ANSI_ARGS_((int err));
-/* 129 */
-EXTERN int		Tcl_Eval _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string));
-/* 130 */
-EXTERN int		Tcl_EvalFile _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * fileName));
-/* 131 */
-EXTERN int		Tcl_EvalObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr));
-/* 132 */
-EXTERN void		Tcl_EventuallyFree _ANSI_ARGS_((
-				ClientData clientData, 
-				Tcl_FreeProc * freeProc));
-/* 133 */
-EXTERN void		Tcl_Exit _ANSI_ARGS_((int status));
-/* 134 */
-EXTERN int		Tcl_ExposeCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * hiddenCmdToken, char * cmdName));
-/* 135 */
-EXTERN int		Tcl_ExprBoolean _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * ptr));
-/* 136 */
-EXTERN int		Tcl_ExprBooleanObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int * ptr));
-/* 137 */
-EXTERN int		Tcl_ExprDouble _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, double * ptr));
-/* 138 */
-EXTERN int		Tcl_ExprDoubleObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, double * ptr));
-/* 139 */
-EXTERN int		Tcl_ExprLong _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, long * ptr));
-/* 140 */
-EXTERN int		Tcl_ExprLongObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, long * ptr));
-/* 141 */
-EXTERN int		Tcl_ExprObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, Tcl_Obj ** resultPtrPtr));
-/* 142 */
-EXTERN int		Tcl_ExprString _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string));
-/* 143 */
-EXTERN void		Tcl_Finalize _ANSI_ARGS_((void));
-/* 144 */
-EXTERN void		Tcl_FindExecutable _ANSI_ARGS_((CONST char * argv0));
-/* 145 */
-EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry _ANSI_ARGS_((
-				Tcl_HashTable * tablePtr, 
-				Tcl_HashSearch * searchPtr));
-/* 146 */
-EXTERN int		Tcl_Flush _ANSI_ARGS_((Tcl_Channel chan));
-/* 147 */
-EXTERN void		Tcl_FreeResult _ANSI_ARGS_((Tcl_Interp * interp));
-/* 148 */
-EXTERN int		Tcl_GetAlias _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * slaveCmd, 
-				Tcl_Interp ** targetInterpPtr, 
-				char ** targetCmdPtr, int * argcPtr, 
-				char *** argvPtr));
-/* 149 */
-EXTERN int		Tcl_GetAliasObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * slaveCmd, 
-				Tcl_Interp ** targetInterpPtr, 
-				char ** targetCmdPtr, int * objcPtr, 
-				Tcl_Obj *** objv));
-/* 150 */
-EXTERN ClientData	Tcl_GetAssocData _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, Tcl_InterpDeleteProc ** procPtr));
-/* 151 */
-EXTERN Tcl_Channel	Tcl_GetChannel _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * chanName, int * modePtr));
-/* 152 */
-EXTERN int		Tcl_GetChannelBufferSize _ANSI_ARGS_((
-				Tcl_Channel chan));
-/* 153 */
-EXTERN int		Tcl_GetChannelHandle _ANSI_ARGS_((Tcl_Channel chan, 
-				int direction, ClientData * handlePtr));
-/* 154 */
-EXTERN ClientData	Tcl_GetChannelInstanceData _ANSI_ARGS_((
-				Tcl_Channel chan));
-/* 155 */
-EXTERN int		Tcl_GetChannelMode _ANSI_ARGS_((Tcl_Channel chan));
-/* 156 */
-EXTERN char *		Tcl_GetChannelName _ANSI_ARGS_((Tcl_Channel chan));
-/* 157 */
-EXTERN int		Tcl_GetChannelOption _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Channel chan, 
-				char * optionName, Tcl_DString * dsPtr));
-/* 158 */
-EXTERN Tcl_ChannelType * Tcl_GetChannelType _ANSI_ARGS_((Tcl_Channel chan));
-/* 159 */
-EXTERN int		Tcl_GetCommandInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmdName, Tcl_CmdInfo * infoPtr));
-/* 160 */
-EXTERN char *		Tcl_GetCommandName _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Command command));
-/* 161 */
-EXTERN int		Tcl_GetErrno _ANSI_ARGS_((void));
-/* 162 */
-EXTERN char *		Tcl_GetHostName _ANSI_ARGS_((void));
-/* 163 */
-EXTERN int		Tcl_GetInterpPath _ANSI_ARGS_((
-				Tcl_Interp * askInterp, 
-				Tcl_Interp * slaveInterp));
-/* 164 */
-EXTERN Tcl_Interp *	Tcl_GetMaster _ANSI_ARGS_((Tcl_Interp * interp));
-/* 165 */
-EXTERN CONST char *	Tcl_GetNameOfExecutable _ANSI_ARGS_((void));
-/* 166 */
-EXTERN Tcl_Obj *	Tcl_GetObjResult _ANSI_ARGS_((Tcl_Interp * interp));
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* 167 */
-EXTERN int		Tcl_GetOpenFile _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int write, int checkUsage, 
-				ClientData * filePtr));
-#endif /* UNIX */
-/* 168 */
-EXTERN Tcl_PathType	Tcl_GetPathType _ANSI_ARGS_((char * path));
-/* 169 */
-EXTERN int		Tcl_Gets _ANSI_ARGS_((Tcl_Channel chan, 
-				Tcl_DString * dsPtr));
-/* 170 */
-EXTERN int		Tcl_GetsObj _ANSI_ARGS_((Tcl_Channel chan, 
-				Tcl_Obj * objPtr));
-/* 171 */
-EXTERN int		Tcl_GetServiceMode _ANSI_ARGS_((void));
-/* 172 */
-EXTERN Tcl_Interp *	Tcl_GetSlave _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * slaveName));
-/* 173 */
-EXTERN Tcl_Channel	Tcl_GetStdChannel _ANSI_ARGS_((int type));
-/* 174 */
-EXTERN char *		Tcl_GetStringResult _ANSI_ARGS_((Tcl_Interp * interp));
-/* 175 */
-EXTERN char *		Tcl_GetVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, int flags));
-/* 176 */
-EXTERN char *		Tcl_GetVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags));
-/* 177 */
-EXTERN int		Tcl_GlobalEval _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * command));
-/* 178 */
-EXTERN int		Tcl_GlobalEvalObj _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr));
-/* 179 */
-EXTERN int		Tcl_HideCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmdName, char * hiddenCmdToken));
-/* 180 */
-EXTERN int		Tcl_Init _ANSI_ARGS_((Tcl_Interp * interp));
-/* 181 */
-EXTERN void		Tcl_InitHashTable _ANSI_ARGS_((
-				Tcl_HashTable * tablePtr, int keyType));
-/* 182 */
-EXTERN int		Tcl_InputBlocked _ANSI_ARGS_((Tcl_Channel chan));
-/* 183 */
-EXTERN int		Tcl_InputBuffered _ANSI_ARGS_((Tcl_Channel chan));
-/* 184 */
-EXTERN int		Tcl_InterpDeleted _ANSI_ARGS_((Tcl_Interp * interp));
-/* 185 */
-EXTERN int		Tcl_IsSafe _ANSI_ARGS_((Tcl_Interp * interp));
-/* 186 */
-EXTERN char *		Tcl_JoinPath _ANSI_ARGS_((int argc, char ** argv, 
-				Tcl_DString * resultPtr));
-/* 187 */
-EXTERN int		Tcl_LinkVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, char * addr, int type));
-/* Slot 188 is reserved */
-/* 189 */
-EXTERN Tcl_Channel	Tcl_MakeFileChannel _ANSI_ARGS_((ClientData handle, 
-				int mode));
-/* 190 */
-EXTERN int		Tcl_MakeSafe _ANSI_ARGS_((Tcl_Interp * interp));
-/* 191 */
-EXTERN Tcl_Channel	Tcl_MakeTcpClientChannel _ANSI_ARGS_((
-				ClientData tcpSocket));
-/* 192 */
-EXTERN char *		Tcl_Merge _ANSI_ARGS_((int argc, char ** argv));
-/* 193 */
-EXTERN Tcl_HashEntry *	Tcl_NextHashEntry _ANSI_ARGS_((
-				Tcl_HashSearch * searchPtr));
-/* 194 */
-EXTERN void		Tcl_NotifyChannel _ANSI_ARGS_((Tcl_Channel channel, 
-				int mask));
-/* 195 */
-EXTERN Tcl_Obj *	Tcl_ObjGetVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, 
-				int flags));
-/* 196 */
-EXTERN Tcl_Obj *	Tcl_ObjSetVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, 
-				Tcl_Obj * newValuePtr, int flags));
-/* 197 */
-EXTERN Tcl_Channel	Tcl_OpenCommandChannel _ANSI_ARGS_((
-				Tcl_Interp * interp, int argc, char ** argv, 
-				int flags));
-/* 198 */
-EXTERN Tcl_Channel	Tcl_OpenFileChannel _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * fileName, char * modeString, 
-				int permissions));
-/* 199 */
-EXTERN Tcl_Channel	Tcl_OpenTcpClient _ANSI_ARGS_((Tcl_Interp * interp, 
-				int port, char * address, char * myaddr, 
-				int myport, int async));
-/* 200 */
-EXTERN Tcl_Channel	Tcl_OpenTcpServer _ANSI_ARGS_((Tcl_Interp * interp, 
-				int port, char * host, 
-				Tcl_TcpAcceptProc * acceptProc, 
-				ClientData callbackData));
-/* 201 */
-EXTERN void		Tcl_Preserve _ANSI_ARGS_((ClientData data));
-/* 202 */
-EXTERN void		Tcl_PrintDouble _ANSI_ARGS_((Tcl_Interp * interp, 
-				double value, char * dst));
-/* 203 */
-EXTERN int		Tcl_PutEnv _ANSI_ARGS_((CONST char * string));
-/* 204 */
-EXTERN char *		Tcl_PosixError _ANSI_ARGS_((Tcl_Interp * interp));
-/* 205 */
-EXTERN void		Tcl_QueueEvent _ANSI_ARGS_((Tcl_Event * evPtr, 
-				Tcl_QueuePosition position));
-/* 206 */
-EXTERN int		Tcl_Read _ANSI_ARGS_((Tcl_Channel chan, 
-				char * bufPtr, int toRead));
-/* 207 */
-EXTERN void		Tcl_ReapDetachedProcs _ANSI_ARGS_((void));
-/* 208 */
-EXTERN int		Tcl_RecordAndEval _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmd, int flags));
-/* 209 */
-EXTERN int		Tcl_RecordAndEvalObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * cmdPtr, 
-				int flags));
-/* 210 */
-EXTERN void		Tcl_RegisterChannel _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
-/* 211 */
-EXTERN void		Tcl_RegisterObjType _ANSI_ARGS_((
-				Tcl_ObjType * typePtr));
-/* 212 */
-EXTERN Tcl_RegExp	Tcl_RegExpCompile _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string));
-/* 213 */
-EXTERN int		Tcl_RegExpExec _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_RegExp regexp, CONST char * str, 
-				CONST char * start));
-/* 214 */
-EXTERN int		Tcl_RegExpMatch _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, char * pattern));
-/* 215 */
-EXTERN void		Tcl_RegExpRange _ANSI_ARGS_((Tcl_RegExp regexp, 
-				int index, char ** startPtr, char ** endPtr));
-/* 216 */
-EXTERN void		Tcl_Release _ANSI_ARGS_((ClientData clientData));
-/* 217 */
-EXTERN void		Tcl_ResetResult _ANSI_ARGS_((Tcl_Interp * interp));
-/* 218 */
-EXTERN int		Tcl_ScanElement _ANSI_ARGS_((CONST char * str, 
-				int * flagPtr));
-/* 219 */
-EXTERN int		Tcl_ScanCountedElement _ANSI_ARGS_((CONST char * str, 
-				int length, int * flagPtr));
-/* 220 */
-EXTERN int		Tcl_Seek _ANSI_ARGS_((Tcl_Channel chan, int offset, 
-				int mode));
-/* 221 */
-EXTERN int		Tcl_ServiceAll _ANSI_ARGS_((void));
-/* 222 */
-EXTERN int		Tcl_ServiceEvent _ANSI_ARGS_((int flags));
-/* 223 */
-EXTERN void		Tcl_SetAssocData _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, Tcl_InterpDeleteProc * proc, 
-				ClientData clientData));
-/* 224 */
-EXTERN void		Tcl_SetChannelBufferSize _ANSI_ARGS_((
-				Tcl_Channel chan, int sz));
-/* 225 */
-EXTERN int		Tcl_SetChannelOption _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Channel chan, 
-				char * optionName, char * newValue));
-/* 226 */
-EXTERN int		Tcl_SetCommandInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * cmdName, Tcl_CmdInfo * infoPtr));
-/* 227 */
-EXTERN void		Tcl_SetErrno _ANSI_ARGS_((int err));
-/* 228 */
-EXTERN void		Tcl_SetErrorCode _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp));
-/* 229 */
-EXTERN void		Tcl_SetMaxBlockTime _ANSI_ARGS_((Tcl_Time * timePtr));
-/* 230 */
-EXTERN void		Tcl_SetPanicProc _ANSI_ARGS_((
-				Tcl_PanicProc * panicProc));
-/* 231 */
-EXTERN int		Tcl_SetRecursionLimit _ANSI_ARGS_((
-				Tcl_Interp * interp, int depth));
-/* 232 */
-EXTERN void		Tcl_SetResult _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, Tcl_FreeProc * freeProc));
-/* 233 */
-EXTERN int		Tcl_SetServiceMode _ANSI_ARGS_((int mode));
-/* 234 */
-EXTERN void		Tcl_SetObjErrorCode _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * errorObjPtr));
-/* 235 */
-EXTERN void		Tcl_SetObjResult _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * resultObjPtr));
-/* 236 */
-EXTERN void		Tcl_SetStdChannel _ANSI_ARGS_((Tcl_Channel channel, 
-				int type));
-/* 237 */
-EXTERN char *		Tcl_SetVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, char * newValue, int flags));
-/* 238 */
-EXTERN char *		Tcl_SetVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, char * newValue, 
-				int flags));
-/* 239 */
-EXTERN char *		Tcl_SignalId _ANSI_ARGS_((int sig));
-/* 240 */
-EXTERN char *		Tcl_SignalMsg _ANSI_ARGS_((int sig));
-/* 241 */
-EXTERN void		Tcl_SourceRCFile _ANSI_ARGS_((Tcl_Interp * interp));
-/* 242 */
-EXTERN int		Tcl_SplitList _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * listStr, int * argcPtr, 
-				char *** argvPtr));
-/* 243 */
-EXTERN void		Tcl_SplitPath _ANSI_ARGS_((CONST char * path, 
-				int * argcPtr, char *** argvPtr));
-/* 244 */
-EXTERN void		Tcl_StaticPackage _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * pkgName, 
-				Tcl_PackageInitProc * initProc, 
-				Tcl_PackageInitProc * safeInitProc));
-/* 245 */
-EXTERN int		Tcl_StringMatch _ANSI_ARGS_((CONST char * str, 
-				CONST char * pattern));
-/* 246 */
-EXTERN int		Tcl_Tell _ANSI_ARGS_((Tcl_Channel chan));
-/* 247 */
-EXTERN int		Tcl_TraceVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, int flags, 
-				Tcl_VarTraceProc * proc, 
-				ClientData clientData));
-/* 248 */
-EXTERN int		Tcl_TraceVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags, 
-				Tcl_VarTraceProc * proc, 
-				ClientData clientData));
-/* 249 */
-EXTERN char *		Tcl_TranslateFileName _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name, 
-				Tcl_DString * bufferPtr));
-/* 250 */
-EXTERN int		Tcl_Ungets _ANSI_ARGS_((Tcl_Channel chan, char * str, 
-				int len, int atHead));
-/* 251 */
-EXTERN void		Tcl_UnlinkVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName));
-/* 252 */
-EXTERN int		Tcl_UnregisterChannel _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Channel chan));
-/* 253 */
-EXTERN int		Tcl_UnsetVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, int flags));
-/* 254 */
-EXTERN int		Tcl_UnsetVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags));
-/* 255 */
-EXTERN void		Tcl_UntraceVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, int flags, 
-				Tcl_VarTraceProc * proc, 
-				ClientData clientData));
-/* 256 */
-EXTERN void		Tcl_UntraceVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags, 
-				Tcl_VarTraceProc * proc, 
-				ClientData clientData));
-/* 257 */
-EXTERN void		Tcl_UpdateLinkedVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName));
-/* 258 */
-EXTERN int		Tcl_UpVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * frameName, char * varName, 
-				char * localName, int flags));
-/* 259 */
-EXTERN int		Tcl_UpVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * frameName, char * part1, char * part2, 
-				char * localName, int flags));
-/* 260 */
-EXTERN int		Tcl_VarEval _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp));
-/* 261 */
-EXTERN ClientData	Tcl_VarTraceInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * varName, int flags, 
-				Tcl_VarTraceProc * procPtr, 
-				ClientData prevClientData));
-/* 262 */
-EXTERN ClientData	Tcl_VarTraceInfo2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags, 
-				Tcl_VarTraceProc * procPtr, 
-				ClientData prevClientData));
-/* 263 */
-EXTERN int		Tcl_Write _ANSI_ARGS_((Tcl_Channel chan, char * s, 
-				int slen));
-/* 264 */
-EXTERN void		Tcl_WrongNumArgs _ANSI_ARGS_((Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[], 
-				char * message));
-/* 265 */
-EXTERN int		Tcl_DumpActiveMemory _ANSI_ARGS_((char * fileName));
-/* 266 */
-EXTERN void		Tcl_ValidateAllMemory _ANSI_ARGS_((char * file, 
-				int line));
-/* 267 */
-EXTERN void		Tcl_AppendResultVA _ANSI_ARGS_((Tcl_Interp * interp, 
-				va_list argList));
-/* 268 */
-EXTERN void		Tcl_AppendStringsToObjVA _ANSI_ARGS_((
-				Tcl_Obj * objPtr, va_list argList));
-/* 269 */
-EXTERN char *		Tcl_HashStats _ANSI_ARGS_((Tcl_HashTable * tablePtr));
-/* 270 */
-EXTERN char *		Tcl_ParseVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, char ** termPtr));
-/* 271 */
-EXTERN char *		Tcl_PkgPresent _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version, int exact));
-/* 272 */
-EXTERN char *		Tcl_PkgPresentEx _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version, int exact, 
-				ClientData * clientDataPtr));
-/* 273 */
-EXTERN int		Tcl_PkgProvide _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version));
-/* 274 */
-EXTERN char *		Tcl_PkgRequire _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, char * version, int exact));
-/* 275 */
-EXTERN void		Tcl_SetErrorCodeVA _ANSI_ARGS_((Tcl_Interp * interp, 
-				va_list argList));
-/* 276 */
-EXTERN int		Tcl_VarEvalVA _ANSI_ARGS_((Tcl_Interp * interp, 
-				va_list argList));
-/* 277 */
-EXTERN Tcl_Pid		Tcl_WaitPid _ANSI_ARGS_((Tcl_Pid pid, int * statPtr, 
-				int options));
-/* 278 */
-EXTERN void		Tcl_PanicVA _ANSI_ARGS_((char * format, 
-				va_list argList));
-/* 279 */
-EXTERN void		Tcl_GetVersion _ANSI_ARGS_((int * major, int * minor, 
-				int * patchLevel, int * type));
-/* 280 */
-EXTERN void		Tcl_InitMemory _ANSI_ARGS_((Tcl_Interp * interp));
-/* Slot 281 is reserved */
-/* Slot 282 is reserved */
-/* Slot 283 is reserved */
-/* Slot 284 is reserved */
-/* Slot 285 is reserved */
-/* 286 */
-EXTERN void		Tcl_AppendObjToObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				Tcl_Obj * appendObjPtr));
-/* 287 */
-EXTERN Tcl_Encoding	Tcl_CreateEncoding _ANSI_ARGS_((
-				Tcl_EncodingType * typePtr));
-/* 288 */
-EXTERN void		Tcl_CreateThreadExitHandler _ANSI_ARGS_((
-				Tcl_ExitProc * proc, ClientData clientData));
-/* 289 */
-EXTERN void		Tcl_DeleteThreadExitHandler _ANSI_ARGS_((
-				Tcl_ExitProc * proc, ClientData clientData));
-/* 290 */
-EXTERN void		Tcl_DiscardResult _ANSI_ARGS_((
-				Tcl_SavedResult * statePtr));
-/* 291 */
-EXTERN int		Tcl_EvalEx _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * script, int numBytes, int flags));
-/* 292 */
-EXTERN int		Tcl_EvalObjv _ANSI_ARGS_((Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[], int flags));
-/* 293 */
-EXTERN int		Tcl_EvalObjEx _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int flags));
-/* 294 */
-EXTERN void		Tcl_ExitThread _ANSI_ARGS_((int status));
-/* 295 */
-EXTERN int		Tcl_ExternalToUtf _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, int flags, 
-				Tcl_EncodingState * statePtr, char * dst, 
-				int dstLen, int * srcReadPtr, 
-				int * dstWrotePtr, int * dstCharsPtr));
-/* 296 */
-EXTERN char *		Tcl_ExternalToUtfDString _ANSI_ARGS_((
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, Tcl_DString * dsPtr));
-/* 297 */
-EXTERN void		Tcl_FinalizeThread _ANSI_ARGS_((void));
-/* 298 */
-EXTERN void		Tcl_FinalizeNotifier _ANSI_ARGS_((
-				ClientData clientData));
-/* 299 */
-EXTERN void		Tcl_FreeEncoding _ANSI_ARGS_((Tcl_Encoding encoding));
-/* 300 */
-EXTERN Tcl_ThreadId	Tcl_GetCurrentThread _ANSI_ARGS_((void));
-/* 301 */
-EXTERN Tcl_Encoding	Tcl_GetEncoding _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * name));
-/* 302 */
-EXTERN char *		Tcl_GetEncodingName _ANSI_ARGS_((
-				Tcl_Encoding encoding));
-/* 303 */
-EXTERN void		Tcl_GetEncodingNames _ANSI_ARGS_((
-				Tcl_Interp * interp));
-/* 304 */
-EXTERN int		Tcl_GetIndexFromObjStruct _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				char ** tablePtr, int offset, char * msg, 
-				int flags, int * indexPtr));
-/* 305 */
-EXTERN VOID *		Tcl_GetThreadData _ANSI_ARGS_((
-				Tcl_ThreadDataKey * keyPtr, int size));
-/* 306 */
-EXTERN Tcl_Obj *	Tcl_GetVar2Ex _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags));
-/* 307 */
-EXTERN ClientData	Tcl_InitNotifier _ANSI_ARGS_((void));
-/* 308 */
-EXTERN void		Tcl_MutexLock _ANSI_ARGS_((Tcl_Mutex * mutexPtr));
-/* 309 */
-EXTERN void		Tcl_MutexUnlock _ANSI_ARGS_((Tcl_Mutex * mutexPtr));
-/* 310 */
-EXTERN void		Tcl_ConditionNotify _ANSI_ARGS_((
-				Tcl_Condition * condPtr));
-/* 311 */
-EXTERN void		Tcl_ConditionWait _ANSI_ARGS_((
-				Tcl_Condition * condPtr, 
-				Tcl_Mutex * mutexPtr, Tcl_Time * timePtr));
-/* 312 */
-EXTERN int		Tcl_NumUtfChars _ANSI_ARGS_((CONST char * src, 
-				int len));
-/* 313 */
-EXTERN int		Tcl_ReadChars _ANSI_ARGS_((Tcl_Channel channel, 
-				Tcl_Obj * objPtr, int charsToRead, 
-				int appendFlag));
-/* 314 */
-EXTERN void		Tcl_RestoreResult _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_SavedResult * statePtr));
-/* 315 */
-EXTERN void		Tcl_SaveResult _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_SavedResult * statePtr));
-/* 316 */
-EXTERN int		Tcl_SetSystemEncoding _ANSI_ARGS_((
-				Tcl_Interp * interp, CONST char * name));
-/* 317 */
-EXTERN Tcl_Obj *	Tcl_SetVar2Ex _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, 
-				Tcl_Obj * newValuePtr, int flags));
-/* 318 */
-EXTERN void		Tcl_ThreadAlert _ANSI_ARGS_((Tcl_ThreadId threadId));
-/* 319 */
-EXTERN void		Tcl_ThreadQueueEvent _ANSI_ARGS_((
-				Tcl_ThreadId threadId, Tcl_Event* evPtr, 
-				Tcl_QueuePosition position));
-/* 320 */
-EXTERN Tcl_UniChar	Tcl_UniCharAtIndex _ANSI_ARGS_((CONST char * src, 
-				int index));
-/* 321 */
-EXTERN Tcl_UniChar	Tcl_UniCharToLower _ANSI_ARGS_((int ch));
-/* 322 */
-EXTERN Tcl_UniChar	Tcl_UniCharToTitle _ANSI_ARGS_((int ch));
-/* 323 */
-EXTERN Tcl_UniChar	Tcl_UniCharToUpper _ANSI_ARGS_((int ch));
-/* 324 */
-EXTERN int		Tcl_UniCharToUtf _ANSI_ARGS_((int ch, char * buf));
-/* 325 */
-EXTERN char *		Tcl_UtfAtIndex _ANSI_ARGS_((CONST char * src, 
-				int index));
-/* 326 */
-EXTERN int		Tcl_UtfCharComplete _ANSI_ARGS_((CONST char * src, 
-				int len));
-/* 327 */
-EXTERN int		Tcl_UtfBackslash _ANSI_ARGS_((CONST char * src, 
-				int * readPtr, char * dst));
-/* 328 */
-EXTERN char *		Tcl_UtfFindFirst _ANSI_ARGS_((CONST char * src, 
-				int ch));
-/* 329 */
-EXTERN char *		Tcl_UtfFindLast _ANSI_ARGS_((CONST char * src, 
-				int ch));
-/* 330 */
-EXTERN char *		Tcl_UtfNext _ANSI_ARGS_((CONST char * src));
-/* 331 */
-EXTERN char *		Tcl_UtfPrev _ANSI_ARGS_((CONST char * src, 
-				CONST char * start));
-/* 332 */
-EXTERN int		Tcl_UtfToExternal _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, int flags, 
-				Tcl_EncodingState * statePtr, char * dst, 
-				int dstLen, int * srcReadPtr, 
-				int * dstWrotePtr, int * dstCharsPtr));
-/* 333 */
-EXTERN char *		Tcl_UtfToExternalDString _ANSI_ARGS_((
-				Tcl_Encoding encoding, CONST char * src, 
-				int srcLen, Tcl_DString * dsPtr));
-/* 334 */
-EXTERN int		Tcl_UtfToLower _ANSI_ARGS_((char * src));
-/* 335 */
-EXTERN int		Tcl_UtfToTitle _ANSI_ARGS_((char * src));
-/* 336 */
-EXTERN int		Tcl_UtfToUniChar _ANSI_ARGS_((CONST char * src, 
-				Tcl_UniChar * chPtr));
-/* 337 */
-EXTERN int		Tcl_UtfToUpper _ANSI_ARGS_((char * src));
-/* 338 */
-EXTERN int		Tcl_WriteChars _ANSI_ARGS_((Tcl_Channel chan, 
-				CONST char * src, int srcLen));
-/* 339 */
-EXTERN int		Tcl_WriteObj _ANSI_ARGS_((Tcl_Channel chan, 
-				Tcl_Obj * objPtr));
-/* 340 */
-EXTERN char *		Tcl_GetString _ANSI_ARGS_((Tcl_Obj * objPtr));
-/* 341 */
-EXTERN char *		Tcl_GetDefaultEncodingDir _ANSI_ARGS_((void));
-/* 342 */
-EXTERN void		Tcl_SetDefaultEncodingDir _ANSI_ARGS_((char * path));
-/* 343 */
-EXTERN void		Tcl_AlertNotifier _ANSI_ARGS_((ClientData clientData));
-/* 344 */
-EXTERN void		Tcl_ServiceModeHook _ANSI_ARGS_((int mode));
-/* 345 */
-EXTERN int		Tcl_UniCharIsAlnum _ANSI_ARGS_((int ch));
-/* 346 */
-EXTERN int		Tcl_UniCharIsAlpha _ANSI_ARGS_((int ch));
-/* 347 */
-EXTERN int		Tcl_UniCharIsDigit _ANSI_ARGS_((int ch));
-/* 348 */
-EXTERN int		Tcl_UniCharIsLower _ANSI_ARGS_((int ch));
-/* 349 */
-EXTERN int		Tcl_UniCharIsSpace _ANSI_ARGS_((int ch));
-/* 350 */
-EXTERN int		Tcl_UniCharIsUpper _ANSI_ARGS_((int ch));
-/* 351 */
-EXTERN int		Tcl_UniCharIsWordChar _ANSI_ARGS_((int ch));
-/* 352 */
-EXTERN int		Tcl_UniCharLen _ANSI_ARGS_((Tcl_UniChar * str));
-/* 353 */
-EXTERN int		Tcl_UniCharNcmp _ANSI_ARGS_((const Tcl_UniChar * cs, 
-				const Tcl_UniChar * ct, size_t n));
-/* 354 */
-EXTERN char *		Tcl_UniCharToUtfDString _ANSI_ARGS_((
-				CONST Tcl_UniChar * string, int numChars, 
-				Tcl_DString * dsPtr));
-/* 355 */
-EXTERN Tcl_UniChar *	Tcl_UtfToUniCharDString _ANSI_ARGS_((
-				CONST char * string, int length, 
-				Tcl_DString * dsPtr));
-/* 356 */
-EXTERN Tcl_RegExp	Tcl_GetRegExpFromObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * patObj, 
-				int flags));
-/* 357 */
-EXTERN Tcl_Obj *	Tcl_EvalTokens _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Token * tokenPtr, int count));
-/* 358 */
-EXTERN void		Tcl_FreeParse _ANSI_ARGS_((Tcl_Parse * parsePtr));
-/* 359 */
-EXTERN void		Tcl_LogCommandInfo _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * script, char * command, int length));
-/* 360 */
-EXTERN int		Tcl_ParseBraces _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string, int numBytes, 
-				Tcl_Parse * parsePtr, int append, 
-				char ** termPtr));
-/* 361 */
-EXTERN int		Tcl_ParseCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string, int numBytes, int nested, 
-				Tcl_Parse * parsePtr));
-/* 362 */
-EXTERN int		Tcl_ParseExpr _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string, int numBytes, 
-				Tcl_Parse * parsePtr));
-/* 363 */
-EXTERN int		Tcl_ParseQuotedString _ANSI_ARGS_((
-				Tcl_Interp * interp, char * string, 
-				int numBytes, Tcl_Parse * parsePtr, 
-				int append, char ** termPtr));
-/* 364 */
-EXTERN int		Tcl_ParseVarName _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * string, int numBytes, 
-				Tcl_Parse * parsePtr, int append));
-/* 365 */
-EXTERN char *		Tcl_GetCwd _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_DString * cwdPtr));
-/* 366 */
-EXTERN int		Tcl_Chdir _ANSI_ARGS_((CONST char * dirName));
-
-typedef struct TclStubHooks {
-    struct TclPlatStubs *tclPlatStubs;
-    struct TclIntStubs *tclIntStubs;
-    struct TclIntPlatStubs *tclIntPlatStubs;
-} TclStubHooks;
-
-typedef struct TclStubs {
-    int magic;
-    struct TclStubHooks *hooks;
-
-    int (*tcl_PkgProvideEx) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version, ClientData clientData)); /* 0 */
-    char * (*tcl_PkgRequireEx) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version, int exact, ClientData * clientDataPtr)); /* 1 */
-    void (*tcl_Panic) _ANSI_ARGS_(TCL_VARARGS(char *,format)); /* 2 */
-    char * (*tcl_Alloc) _ANSI_ARGS_((unsigned int size)); /* 3 */
-    void (*tcl_Free) _ANSI_ARGS_((char * ptr)); /* 4 */
-    char * (*tcl_Realloc) _ANSI_ARGS_((char * ptr, unsigned int size)); /* 5 */
-    char * (*tcl_DbCkalloc) _ANSI_ARGS_((unsigned int size, char * file, int line)); /* 6 */
-    int (*tcl_DbCkfree) _ANSI_ARGS_((char * ptr, char * file, int line)); /* 7 */
-    char * (*tcl_DbCkrealloc) _ANSI_ARGS_((char * ptr, unsigned int size, char * file, int line)); /* 8 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void (*tcl_CreateFileHandler) _ANSI_ARGS_((int fd, int mask, Tcl_FileProc * proc, ClientData clientData)); /* 9 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved9;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void *reserved9;
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void (*tcl_DeleteFileHandler) _ANSI_ARGS_((int fd)); /* 10 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved10;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void *reserved10;
-#endif /* MAC_TCL */
-    void (*tcl_SetTimer) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 11 */
-    void (*tcl_Sleep) _ANSI_ARGS_((int ms)); /* 12 */
-    int (*tcl_WaitForEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 13 */
-    int (*tcl_AppendAllObjTypes) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 14 */
-    void (*tcl_AppendStringsToObj) _ANSI_ARGS_(TCL_VARARGS(Tcl_Obj *,objPtr)); /* 15 */
-    void (*tcl_AppendToObj) _ANSI_ARGS_((Tcl_Obj * objPtr, char * bytes, int length)); /* 16 */
-    Tcl_Obj * (*tcl_ConcatObj) _ANSI_ARGS_((int objc, Tcl_Obj *CONST objv[])); /* 17 */
-    int (*tcl_ConvertToType) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_ObjType * typePtr)); /* 18 */
-    void (*tcl_DbDecrRefCount) _ANSI_ARGS_((Tcl_Obj * objPtr, char * file, int line)); /* 19 */
-    void (*tcl_DbIncrRefCount) _ANSI_ARGS_((Tcl_Obj * objPtr, char * file, int line)); /* 20 */
-    int (*tcl_DbIsShared) _ANSI_ARGS_((Tcl_Obj * objPtr, char * file, int line)); /* 21 */
-    Tcl_Obj * (*tcl_DbNewBooleanObj) _ANSI_ARGS_((int boolValue, char * file, int line)); /* 22 */
-    Tcl_Obj * (*tcl_DbNewByteArrayObj) _ANSI_ARGS_((unsigned char * bytes, int length, char * file, int line)); /* 23 */
-    Tcl_Obj * (*tcl_DbNewDoubleObj) _ANSI_ARGS_((double doubleValue, char * file, int line)); /* 24 */
-    Tcl_Obj * (*tcl_DbNewListObj) _ANSI_ARGS_((int objc, Tcl_Obj *CONST objv[], char * file, int line)); /* 25 */
-    Tcl_Obj * (*tcl_DbNewLongObj) _ANSI_ARGS_((long longValue, char * file, int line)); /* 26 */
-    Tcl_Obj * (*tcl_DbNewObj) _ANSI_ARGS_((char * file, int line)); /* 27 */
-    Tcl_Obj * (*tcl_DbNewStringObj) _ANSI_ARGS_((CONST char * bytes, int length, char * file, int line)); /* 28 */
-    Tcl_Obj * (*tcl_DuplicateObj) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 29 */
-    void (*tclFreeObj) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 30 */
-    int (*tcl_GetBoolean) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * boolPtr)); /* 31 */
-    int (*tcl_GetBooleanFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int * boolPtr)); /* 32 */
-    unsigned char * (*tcl_GetByteArrayFromObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int * lengthPtr)); /* 33 */
-    int (*tcl_GetDouble) _ANSI_ARGS_((Tcl_Interp * interp, char * str, double * doublePtr)); /* 34 */
-    int (*tcl_GetDoubleFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, double * doublePtr)); /* 35 */
-    int (*tcl_GetIndexFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, char ** tablePtr, char * msg, int flags, int * indexPtr)); /* 36 */
-    int (*tcl_GetInt) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * intPtr)); /* 37 */
-    int (*tcl_GetIntFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int * intPtr)); /* 38 */
-    int (*tcl_GetLongFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, long * longPtr)); /* 39 */
-    Tcl_ObjType * (*tcl_GetObjType) _ANSI_ARGS_((char * typeName)); /* 40 */
-    char * (*tcl_GetStringFromObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int * lengthPtr)); /* 41 */
-    void (*tcl_InvalidateStringRep) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 42 */
-    int (*tcl_ListObjAppendList) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * elemListPtr)); /* 43 */
-    int (*tcl_ListObjAppendElement) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * objPtr)); /* 44 */
-    int (*tcl_ListObjGetElements) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int * objcPtr, Tcl_Obj *** objvPtr)); /* 45 */
-    int (*tcl_ListObjIndex) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj ** objPtrPtr)); /* 46 */
-    int (*tcl_ListObjLength) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int * intPtr)); /* 47 */
-    int (*tcl_ListObjReplace) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[])); /* 48 */
-    Tcl_Obj * (*tcl_NewBooleanObj) _ANSI_ARGS_((int boolValue)); /* 49 */
-    Tcl_Obj * (*tcl_NewByteArrayObj) _ANSI_ARGS_((unsigned char * bytes, int length)); /* 50 */
-    Tcl_Obj * (*tcl_NewDoubleObj) _ANSI_ARGS_((double doubleValue)); /* 51 */
-    Tcl_Obj * (*tcl_NewIntObj) _ANSI_ARGS_((int intValue)); /* 52 */
-    Tcl_Obj * (*tcl_NewListObj) _ANSI_ARGS_((int objc, Tcl_Obj *CONST objv[])); /* 53 */
-    Tcl_Obj * (*tcl_NewLongObj) _ANSI_ARGS_((long longValue)); /* 54 */
-    Tcl_Obj * (*tcl_NewObj) _ANSI_ARGS_((void)); /* 55 */
-    Tcl_Obj * (*tcl_NewStringObj) _ANSI_ARGS_((CONST char * bytes, int length)); /* 56 */
-    void (*tcl_SetBooleanObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int boolValue)); /* 57 */
-    unsigned char * (*tcl_SetByteArrayLength) _ANSI_ARGS_((Tcl_Obj * objPtr, int length)); /* 58 */
-    void (*tcl_SetByteArrayObj) _ANSI_ARGS_((Tcl_Obj * objPtr, unsigned char * bytes, int length)); /* 59 */
-    void (*tcl_SetDoubleObj) _ANSI_ARGS_((Tcl_Obj * objPtr, double doubleValue)); /* 60 */
-    void (*tcl_SetIntObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int intValue)); /* 61 */
-    void (*tcl_SetListObj) _ANSI_ARGS_((Tcl_Obj * objPtr, int objc, Tcl_Obj *CONST objv[])); /* 62 */
-    void (*tcl_SetLongObj) _ANSI_ARGS_((Tcl_Obj * objPtr, long longValue)); /* 63 */
-    void (*tcl_SetObjLength) _ANSI_ARGS_((Tcl_Obj * objPtr, int length)); /* 64 */
-    void (*tcl_SetStringObj) _ANSI_ARGS_((Tcl_Obj * objPtr, char * bytes, int length)); /* 65 */
-    void (*tcl_AddErrorInfo) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * message)); /* 66 */
-    void (*tcl_AddObjErrorInfo) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * message, int length)); /* 67 */
-    void (*tcl_AllowExceptions) _ANSI_ARGS_((Tcl_Interp * interp)); /* 68 */
-    void (*tcl_AppendElement) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string)); /* 69 */
-    void (*tcl_AppendResult) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp)); /* 70 */
-    Tcl_AsyncHandler (*tcl_AsyncCreate) _ANSI_ARGS_((Tcl_AsyncProc * proc, ClientData clientData)); /* 71 */
-    void (*tcl_AsyncDelete) _ANSI_ARGS_((Tcl_AsyncHandler async)); /* 72 */
-    int (*tcl_AsyncInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int code)); /* 73 */
-    void (*tcl_AsyncMark) _ANSI_ARGS_((Tcl_AsyncHandler async)); /* 74 */
-    int (*tcl_AsyncReady) _ANSI_ARGS_((void)); /* 75 */
-    void (*tcl_BackgroundError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 76 */
-    char (*tcl_Backslash) _ANSI_ARGS_((CONST char * src, int * readPtr)); /* 77 */
-    int (*tcl_BadChannelOption) _ANSI_ARGS_((Tcl_Interp * interp, char * optionName, char * optionList)); /* 78 */
-    void (*tcl_CallWhenDeleted) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 79 */
-    void (*tcl_CancelIdleCall) _ANSI_ARGS_((Tcl_IdleProc * idleProc, ClientData clientData)); /* 80 */
-    int (*tcl_Close) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 81 */
-    int (*tcl_CommandComplete) _ANSI_ARGS_((char * cmd)); /* 82 */
-    char * (*tcl_Concat) _ANSI_ARGS_((int argc, char ** argv)); /* 83 */
-    int (*tcl_ConvertElement) _ANSI_ARGS_((CONST char * src, char * dst, int flags)); /* 84 */
-    int (*tcl_ConvertCountedElement) _ANSI_ARGS_((CONST char * src, int length, char * dst, int flags)); /* 85 */
-    int (*tcl_CreateAlias) _ANSI_ARGS_((Tcl_Interp * slave, char * slaveCmd, Tcl_Interp * target, char * targetCmd, int argc, char ** argv)); /* 86 */
-    int (*tcl_CreateAliasObj) _ANSI_ARGS_((Tcl_Interp * slave, char * slaveCmd, Tcl_Interp * target, char * targetCmd, int objc, Tcl_Obj *CONST objv[])); /* 87 */
-    Tcl_Channel (*tcl_CreateChannel) _ANSI_ARGS_((Tcl_ChannelType * typePtr, char * chanName, ClientData instanceData, int mask)); /* 88 */
-    void (*tcl_CreateChannelHandler) _ANSI_ARGS_((Tcl_Channel chan, int mask, Tcl_ChannelProc * proc, ClientData clientData)); /* 89 */
-    void (*tcl_CreateCloseHandler) _ANSI_ARGS_((Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData)); /* 90 */
-    Tcl_Command (*tcl_CreateCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName, Tcl_CmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc)); /* 91 */
-    void (*tcl_CreateEventSource) _ANSI_ARGS_((Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData)); /* 92 */
-    void (*tcl_CreateExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 93 */
-    Tcl_Interp * (*tcl_CreateInterp) _ANSI_ARGS_((void)); /* 94 */
-    void (*tcl_CreateMathFunc) _ANSI_ARGS_((Tcl_Interp * interp, char * name, int numArgs, Tcl_ValueType * argTypes, Tcl_MathProc * proc, ClientData clientData)); /* 95 */
-    Tcl_Command (*tcl_CreateObjCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName, Tcl_ObjCmdProc * proc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc)); /* 96 */
-    Tcl_Interp * (*tcl_CreateSlave) _ANSI_ARGS_((Tcl_Interp * interp, char * slaveName, int isSafe)); /* 97 */
-    Tcl_TimerToken (*tcl_CreateTimerHandler) _ANSI_ARGS_((int milliseconds, Tcl_TimerProc * proc, ClientData clientData)); /* 98 */
-    Tcl_Trace (*tcl_CreateTrace) _ANSI_ARGS_((Tcl_Interp * interp, int level, Tcl_CmdTraceProc * proc, ClientData clientData)); /* 99 */
-    void (*tcl_DeleteAssocData) _ANSI_ARGS_((Tcl_Interp * interp, char * name)); /* 100 */
-    void (*tcl_DeleteChannelHandler) _ANSI_ARGS_((Tcl_Channel chan, Tcl_ChannelProc * proc, ClientData clientData)); /* 101 */
-    void (*tcl_DeleteCloseHandler) _ANSI_ARGS_((Tcl_Channel chan, Tcl_CloseProc * proc, ClientData clientData)); /* 102 */
-    int (*tcl_DeleteCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName)); /* 103 */
-    int (*tcl_DeleteCommandFromToken) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Command command)); /* 104 */
-    void (*tcl_DeleteEvents) _ANSI_ARGS_((Tcl_EventDeleteProc * proc, ClientData clientData)); /* 105 */
-    void (*tcl_DeleteEventSource) _ANSI_ARGS_((Tcl_EventSetupProc * setupProc, Tcl_EventCheckProc * checkProc, ClientData clientData)); /* 106 */
-    void (*tcl_DeleteExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 107 */
-    void (*tcl_DeleteHashEntry) _ANSI_ARGS_((Tcl_HashEntry * entryPtr)); /* 108 */
-    void (*tcl_DeleteHashTable) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 109 */
-    void (*tcl_DeleteInterp) _ANSI_ARGS_((Tcl_Interp * interp)); /* 110 */
-    void (*tcl_DetachPids) _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); /* 111 */
-    void (*tcl_DeleteTimerHandler) _ANSI_ARGS_((Tcl_TimerToken token)); /* 112 */
-    void (*tcl_DeleteTrace) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Trace trace)); /* 113 */
-    void (*tcl_DontCallWhenDeleted) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 114 */
-    int (*tcl_DoOneEvent) _ANSI_ARGS_((int flags)); /* 115 */
-    void (*tcl_DoWhenIdle) _ANSI_ARGS_((Tcl_IdleProc * proc, ClientData clientData)); /* 116 */
-    char * (*tcl_DStringAppend) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * str, int length)); /* 117 */
-    char * (*tcl_DStringAppendElement) _ANSI_ARGS_((Tcl_DString * dsPtr, CONST char * string)); /* 118 */
-    void (*tcl_DStringEndSublist) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 119 */
-    void (*tcl_DStringFree) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 120 */
-    void (*tcl_DStringGetResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * dsPtr)); /* 121 */
-    void (*tcl_DStringInit) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 122 */
-    void (*tcl_DStringResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * dsPtr)); /* 123 */
-    void (*tcl_DStringSetLength) _ANSI_ARGS_((Tcl_DString * dsPtr, int length)); /* 124 */
-    void (*tcl_DStringStartSublist) _ANSI_ARGS_((Tcl_DString * dsPtr)); /* 125 */
-    int (*tcl_Eof) _ANSI_ARGS_((Tcl_Channel chan)); /* 126 */
-    char * (*tcl_ErrnoId) _ANSI_ARGS_((void)); /* 127 */
-    char * (*tcl_ErrnoMsg) _ANSI_ARGS_((int err)); /* 128 */
-    int (*tcl_Eval) _ANSI_ARGS_((Tcl_Interp * interp, char * string)); /* 129 */
-    int (*tcl_EvalFile) _ANSI_ARGS_((Tcl_Interp * interp, char * fileName)); /* 130 */
-    int (*tcl_EvalObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 131 */
-    void (*tcl_EventuallyFree) _ANSI_ARGS_((ClientData clientData, Tcl_FreeProc * freeProc)); /* 132 */
-    void (*tcl_Exit) _ANSI_ARGS_((int status)); /* 133 */
-    int (*tcl_ExposeCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * hiddenCmdToken, char * cmdName)); /* 134 */
-    int (*tcl_ExprBoolean) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * ptr)); /* 135 */
-    int (*tcl_ExprBooleanObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int * ptr)); /* 136 */
-    int (*tcl_ExprDouble) _ANSI_ARGS_((Tcl_Interp * interp, char * str, double * ptr)); /* 137 */
-    int (*tcl_ExprDoubleObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, double * ptr)); /* 138 */
-    int (*tcl_ExprLong) _ANSI_ARGS_((Tcl_Interp * interp, char * str, long * ptr)); /* 139 */
-    int (*tcl_ExprLongObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, long * ptr)); /* 140 */
-    int (*tcl_ExprObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, Tcl_Obj ** resultPtrPtr)); /* 141 */
-    int (*tcl_ExprString) _ANSI_ARGS_((Tcl_Interp * interp, char * string)); /* 142 */
-    void (*tcl_Finalize) _ANSI_ARGS_((void)); /* 143 */
-    void (*tcl_FindExecutable) _ANSI_ARGS_((CONST char * argv0)); /* 144 */
-    Tcl_HashEntry * (*tcl_FirstHashEntry) _ANSI_ARGS_((Tcl_HashTable * tablePtr, Tcl_HashSearch * searchPtr)); /* 145 */
-    int (*tcl_Flush) _ANSI_ARGS_((Tcl_Channel chan)); /* 146 */
-    void (*tcl_FreeResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 147 */
-    int (*tcl_GetAlias) _ANSI_ARGS_((Tcl_Interp * interp, char * slaveCmd, Tcl_Interp ** targetInterpPtr, char ** targetCmdPtr, int * argcPtr, char *** argvPtr)); /* 148 */
-    int (*tcl_GetAliasObj) _ANSI_ARGS_((Tcl_Interp * interp, char * slaveCmd, Tcl_Interp ** targetInterpPtr, char ** targetCmdPtr, int * objcPtr, Tcl_Obj *** objv)); /* 149 */
-    ClientData (*tcl_GetAssocData) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_InterpDeleteProc ** procPtr)); /* 150 */
-    Tcl_Channel (*tcl_GetChannel) _ANSI_ARGS_((Tcl_Interp * interp, char * chanName, int * modePtr)); /* 151 */
-    int (*tcl_GetChannelBufferSize) _ANSI_ARGS_((Tcl_Channel chan)); /* 152 */
-    int (*tcl_GetChannelHandle) _ANSI_ARGS_((Tcl_Channel chan, int direction, ClientData * handlePtr)); /* 153 */
-    ClientData (*tcl_GetChannelInstanceData) _ANSI_ARGS_((Tcl_Channel chan)); /* 154 */
-    int (*tcl_GetChannelMode) _ANSI_ARGS_((Tcl_Channel chan)); /* 155 */
-    char * (*tcl_GetChannelName) _ANSI_ARGS_((Tcl_Channel chan)); /* 156 */
-    int (*tcl_GetChannelOption) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan, char * optionName, Tcl_DString * dsPtr)); /* 157 */
-    Tcl_ChannelType * (*tcl_GetChannelType) _ANSI_ARGS_((Tcl_Channel chan)); /* 158 */
-    int (*tcl_GetCommandInfo) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName, Tcl_CmdInfo * infoPtr)); /* 159 */
-    char * (*tcl_GetCommandName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Command command)); /* 160 */
-    int (*tcl_GetErrno) _ANSI_ARGS_((void)); /* 161 */
-    char * (*tcl_GetHostName) _ANSI_ARGS_((void)); /* 162 */
-    int (*tcl_GetInterpPath) _ANSI_ARGS_((Tcl_Interp * askInterp, Tcl_Interp * slaveInterp)); /* 163 */
-    Tcl_Interp * (*tcl_GetMaster) _ANSI_ARGS_((Tcl_Interp * interp)); /* 164 */
-    CONST char * (*tcl_GetNameOfExecutable) _ANSI_ARGS_((void)); /* 165 */
-    Tcl_Obj * (*tcl_GetObjResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 166 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    int (*tcl_GetOpenFile) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int write, int checkUsage, ClientData * filePtr)); /* 167 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    void *reserved167;
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void *reserved167;
-#endif /* MAC_TCL */
-    Tcl_PathType (*tcl_GetPathType) _ANSI_ARGS_((char * path)); /* 168 */
-    int (*tcl_Gets) _ANSI_ARGS_((Tcl_Channel chan, Tcl_DString * dsPtr)); /* 169 */
-    int (*tcl_GetsObj) _ANSI_ARGS_((Tcl_Channel chan, Tcl_Obj * objPtr)); /* 170 */
-    int (*tcl_GetServiceMode) _ANSI_ARGS_((void)); /* 171 */
-    Tcl_Interp * (*tcl_GetSlave) _ANSI_ARGS_((Tcl_Interp * interp, char * slaveName)); /* 172 */
-    Tcl_Channel (*tcl_GetStdChannel) _ANSI_ARGS_((int type)); /* 173 */
-    char * (*tcl_GetStringResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 174 */
-    char * (*tcl_GetVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags)); /* 175 */
-    char * (*tcl_GetVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags)); /* 176 */
-    int (*tcl_GlobalEval) _ANSI_ARGS_((Tcl_Interp * interp, char * command)); /* 177 */
-    int (*tcl_GlobalEvalObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 178 */
-    int (*tcl_HideCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName, char * hiddenCmdToken)); /* 179 */
-    int (*tcl_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 180 */
-    void (*tcl_InitHashTable) _ANSI_ARGS_((Tcl_HashTable * tablePtr, int keyType)); /* 181 */
-    int (*tcl_InputBlocked) _ANSI_ARGS_((Tcl_Channel chan)); /* 182 */
-    int (*tcl_InputBuffered) _ANSI_ARGS_((Tcl_Channel chan)); /* 183 */
-    int (*tcl_InterpDeleted) _ANSI_ARGS_((Tcl_Interp * interp)); /* 184 */
-    int (*tcl_IsSafe) _ANSI_ARGS_((Tcl_Interp * interp)); /* 185 */
-    char * (*tcl_JoinPath) _ANSI_ARGS_((int argc, char ** argv, Tcl_DString * resultPtr)); /* 186 */
-    int (*tcl_LinkVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, char * addr, int type)); /* 187 */
-    void *reserved188;
-    Tcl_Channel (*tcl_MakeFileChannel) _ANSI_ARGS_((ClientData handle, int mode)); /* 189 */
-    int (*tcl_MakeSafe) _ANSI_ARGS_((Tcl_Interp * interp)); /* 190 */
-    Tcl_Channel (*tcl_MakeTcpClientChannel) _ANSI_ARGS_((ClientData tcpSocket)); /* 191 */
-    char * (*tcl_Merge) _ANSI_ARGS_((int argc, char ** argv)); /* 192 */
-    Tcl_HashEntry * (*tcl_NextHashEntry) _ANSI_ARGS_((Tcl_HashSearch * searchPtr)); /* 193 */
-    void (*tcl_NotifyChannel) _ANSI_ARGS_((Tcl_Channel channel, int mask)); /* 194 */
-    Tcl_Obj * (*tcl_ObjGetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, int flags)); /* 195 */
-    Tcl_Obj * (*tcl_ObjSetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags)); /* 196 */
-    Tcl_Channel (*tcl_OpenCommandChannel) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, int flags)); /* 197 */
-    Tcl_Channel (*tcl_OpenFileChannel) _ANSI_ARGS_((Tcl_Interp * interp, char * fileName, char * modeString, int permissions)); /* 198 */
-    Tcl_Channel (*tcl_OpenTcpClient) _ANSI_ARGS_((Tcl_Interp * interp, int port, char * address, char * myaddr, int myport, int async)); /* 199 */
-    Tcl_Channel (*tcl_OpenTcpServer) _ANSI_ARGS_((Tcl_Interp * interp, int port, char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData)); /* 200 */
-    void (*tcl_Preserve) _ANSI_ARGS_((ClientData data)); /* 201 */
-    void (*tcl_PrintDouble) _ANSI_ARGS_((Tcl_Interp * interp, double value, char * dst)); /* 202 */
-    int (*tcl_PutEnv) _ANSI_ARGS_((CONST char * string)); /* 203 */
-    char * (*tcl_PosixError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 204 */
-    void (*tcl_QueueEvent) _ANSI_ARGS_((Tcl_Event * evPtr, Tcl_QueuePosition position)); /* 205 */
-    int (*tcl_Read) _ANSI_ARGS_((Tcl_Channel chan, char * bufPtr, int toRead)); /* 206 */
-    void (*tcl_ReapDetachedProcs) _ANSI_ARGS_((void)); /* 207 */
-    int (*tcl_RecordAndEval) _ANSI_ARGS_((Tcl_Interp * interp, char * cmd, int flags)); /* 208 */
-    int (*tcl_RecordAndEvalObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * cmdPtr, int flags)); /* 209 */
-    void (*tcl_RegisterChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 210 */
-    void (*tcl_RegisterObjType) _ANSI_ARGS_((Tcl_ObjType * typePtr)); /* 211 */
-    Tcl_RegExp (*tcl_RegExpCompile) _ANSI_ARGS_((Tcl_Interp * interp, char * string)); /* 212 */
-    int (*tcl_RegExpExec) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_RegExp regexp, CONST char * str, CONST char * start)); /* 213 */
-    int (*tcl_RegExpMatch) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * pattern)); /* 214 */
-    void (*tcl_RegExpRange) _ANSI_ARGS_((Tcl_RegExp regexp, int index, char ** startPtr, char ** endPtr)); /* 215 */
-    void (*tcl_Release) _ANSI_ARGS_((ClientData clientData)); /* 216 */
-    void (*tcl_ResetResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 217 */
-    int (*tcl_ScanElement) _ANSI_ARGS_((CONST char * str, int * flagPtr)); /* 218 */
-    int (*tcl_ScanCountedElement) _ANSI_ARGS_((CONST char * str, int length, int * flagPtr)); /* 219 */
-    int (*tcl_Seek) _ANSI_ARGS_((Tcl_Channel chan, int offset, int mode)); /* 220 */
-    int (*tcl_ServiceAll) _ANSI_ARGS_((void)); /* 221 */
-    int (*tcl_ServiceEvent) _ANSI_ARGS_((int flags)); /* 222 */
-    void (*tcl_SetAssocData) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 223 */
-    void (*tcl_SetChannelBufferSize) _ANSI_ARGS_((Tcl_Channel chan, int sz)); /* 224 */
-    int (*tcl_SetChannelOption) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan, char * optionName, char * newValue)); /* 225 */
-    int (*tcl_SetCommandInfo) _ANSI_ARGS_((Tcl_Interp * interp, char * cmdName, Tcl_CmdInfo * infoPtr)); /* 226 */
-    void (*tcl_SetErrno) _ANSI_ARGS_((int err)); /* 227 */
-    void (*tcl_SetErrorCode) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp)); /* 228 */
-    void (*tcl_SetMaxBlockTime) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 229 */
-    void (*tcl_SetPanicProc) _ANSI_ARGS_((Tcl_PanicProc * panicProc)); /* 230 */
-    int (*tcl_SetRecursionLimit) _ANSI_ARGS_((Tcl_Interp * interp, int depth)); /* 231 */
-    void (*tcl_SetResult) _ANSI_ARGS_((Tcl_Interp * interp, char * str, Tcl_FreeProc * freeProc)); /* 232 */
-    int (*tcl_SetServiceMode) _ANSI_ARGS_((int mode)); /* 233 */
-    void (*tcl_SetObjErrorCode) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * errorObjPtr)); /* 234 */
-    void (*tcl_SetObjResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * resultObjPtr)); /* 235 */
-    void (*tcl_SetStdChannel) _ANSI_ARGS_((Tcl_Channel channel, int type)); /* 236 */
-    char * (*tcl_SetVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, char * newValue, int flags)); /* 237 */
-    char * (*tcl_SetVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, char * newValue, int flags)); /* 238 */
-    char * (*tcl_SignalId) _ANSI_ARGS_((int sig)); /* 239 */
-    char * (*tcl_SignalMsg) _ANSI_ARGS_((int sig)); /* 240 */
-    void (*tcl_SourceRCFile) _ANSI_ARGS_((Tcl_Interp * interp)); /* 241 */
-    int (*tcl_SplitList) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * listStr, int * argcPtr, char *** argvPtr)); /* 242 */
-    void (*tcl_SplitPath) _ANSI_ARGS_((CONST char * path, int * argcPtr, char *** argvPtr)); /* 243 */
-    void (*tcl_StaticPackage) _ANSI_ARGS_((Tcl_Interp * interp, char * pkgName, Tcl_PackageInitProc * initProc, Tcl_PackageInitProc * safeInitProc)); /* 244 */
-    int (*tcl_StringMatch) _ANSI_ARGS_((CONST char * str, CONST char * pattern)); /* 245 */
-    int (*tcl_Tell) _ANSI_ARGS_((Tcl_Channel chan)); /* 246 */
-    int (*tcl_TraceVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 247 */
-    int (*tcl_TraceVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 248 */
-    char * (*tcl_TranslateFileName) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_DString * bufferPtr)); /* 249 */
-    int (*tcl_Ungets) _ANSI_ARGS_((Tcl_Channel chan, char * str, int len, int atHead)); /* 250 */
-    void (*tcl_UnlinkVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName)); /* 251 */
-    int (*tcl_UnregisterChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 252 */
-    int (*tcl_UnsetVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags)); /* 253 */
-    int (*tcl_UnsetVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags)); /* 254 */
-    void (*tcl_UntraceVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 255 */
-    void (*tcl_UntraceVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags, Tcl_VarTraceProc * proc, ClientData clientData)); /* 256 */
-    void (*tcl_UpdateLinkedVar) _ANSI_ARGS_((Tcl_Interp * interp, char * varName)); /* 257 */
-    int (*tcl_UpVar) _ANSI_ARGS_((Tcl_Interp * interp, char * frameName, char * varName, char * localName, int flags)); /* 258 */
-    int (*tcl_UpVar2) _ANSI_ARGS_((Tcl_Interp * interp, char * frameName, char * part1, char * part2, char * localName, int flags)); /* 259 */
-    int (*tcl_VarEval) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp)); /* 260 */
-    ClientData (*tcl_VarTraceInfo) _ANSI_ARGS_((Tcl_Interp * interp, char * varName, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData)); /* 261 */
-    ClientData (*tcl_VarTraceInfo2) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags, Tcl_VarTraceProc * procPtr, ClientData prevClientData)); /* 262 */
-    int (*tcl_Write) _ANSI_ARGS_((Tcl_Channel chan, char * s, int slen)); /* 263 */
-    void (*tcl_WrongNumArgs) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], char * message)); /* 264 */
-    int (*tcl_DumpActiveMemory) _ANSI_ARGS_((char * fileName)); /* 265 */
-    void (*tcl_ValidateAllMemory) _ANSI_ARGS_((char * file, int line)); /* 266 */
-    void (*tcl_AppendResultVA) _ANSI_ARGS_((Tcl_Interp * interp, va_list argList)); /* 267 */
-    void (*tcl_AppendStringsToObjVA) _ANSI_ARGS_((Tcl_Obj * objPtr, va_list argList)); /* 268 */
-    char * (*tcl_HashStats) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 269 */
-    char * (*tcl_ParseVar) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char ** termPtr)); /* 270 */
-    char * (*tcl_PkgPresent) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version, int exact)); /* 271 */
-    char * (*tcl_PkgPresentEx) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version, int exact, ClientData * clientDataPtr)); /* 272 */
-    int (*tcl_PkgProvide) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version)); /* 273 */
-    char * (*tcl_PkgRequire) _ANSI_ARGS_((Tcl_Interp * interp, char * name, char * version, int exact)); /* 274 */
-    void (*tcl_SetErrorCodeVA) _ANSI_ARGS_((Tcl_Interp * interp, va_list argList)); /* 275 */
-    int (*tcl_VarEvalVA) _ANSI_ARGS_((Tcl_Interp * interp, va_list argList)); /* 276 */
-    Tcl_Pid (*tcl_WaitPid) _ANSI_ARGS_((Tcl_Pid pid, int * statPtr, int options)); /* 277 */
-    void (*tcl_PanicVA) _ANSI_ARGS_((char * format, va_list argList)); /* 278 */
-    void (*tcl_GetVersion) _ANSI_ARGS_((int * major, int * minor, int * patchLevel, int * type)); /* 279 */
-    void (*tcl_InitMemory) _ANSI_ARGS_((Tcl_Interp * interp)); /* 280 */
-    void *reserved281;
-    void *reserved282;
-    void *reserved283;
-    void *reserved284;
-    void *reserved285;
-    void (*tcl_AppendObjToObj) _ANSI_ARGS_((Tcl_Obj * objPtr, Tcl_Obj * appendObjPtr)); /* 286 */
-    Tcl_Encoding (*tcl_CreateEncoding) _ANSI_ARGS_((Tcl_EncodingType * typePtr)); /* 287 */
-    void (*tcl_CreateThreadExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 288 */
-    void (*tcl_DeleteThreadExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 289 */
-    void (*tcl_DiscardResult) _ANSI_ARGS_((Tcl_SavedResult * statePtr)); /* 290 */
-    int (*tcl_EvalEx) _ANSI_ARGS_((Tcl_Interp * interp, char * script, int numBytes, int flags)); /* 291 */
-    int (*tcl_EvalObjv) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 292 */
-    int (*tcl_EvalObjEx) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int flags)); /* 293 */
-    void (*tcl_ExitThread) _ANSI_ARGS_((int status)); /* 294 */
-    int (*tcl_ExternalToUtf) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr)); /* 295 */
-    char * (*tcl_ExternalToUtfDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 296 */
-    void (*tcl_FinalizeThread) _ANSI_ARGS_((void)); /* 297 */
-    void (*tcl_FinalizeNotifier) _ANSI_ARGS_((ClientData clientData)); /* 298 */
-    void (*tcl_FreeEncoding) _ANSI_ARGS_((Tcl_Encoding encoding)); /* 299 */
-    Tcl_ThreadId (*tcl_GetCurrentThread) _ANSI_ARGS_((void)); /* 300 */
-    Tcl_Encoding (*tcl_GetEncoding) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 301 */
-    char * (*tcl_GetEncodingName) _ANSI_ARGS_((Tcl_Encoding encoding)); /* 302 */
-    void (*tcl_GetEncodingNames) _ANSI_ARGS_((Tcl_Interp * interp)); /* 303 */
-    int (*tcl_GetIndexFromObjStruct) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, char ** tablePtr, int offset, char * msg, int flags, int * indexPtr)); /* 304 */
-    VOID * (*tcl_GetThreadData) _ANSI_ARGS_((Tcl_ThreadDataKey * keyPtr, int size)); /* 305 */
-    Tcl_Obj * (*tcl_GetVar2Ex) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags)); /* 306 */
-    ClientData (*tcl_InitNotifier) _ANSI_ARGS_((void)); /* 307 */
-    void (*tcl_MutexLock) _ANSI_ARGS_((Tcl_Mutex * mutexPtr)); /* 308 */
-    void (*tcl_MutexUnlock) _ANSI_ARGS_((Tcl_Mutex * mutexPtr)); /* 309 */
-    void (*tcl_ConditionNotify) _ANSI_ARGS_((Tcl_Condition * condPtr)); /* 310 */
-    void (*tcl_ConditionWait) _ANSI_ARGS_((Tcl_Condition * condPtr, Tcl_Mutex * mutexPtr, Tcl_Time * timePtr)); /* 311 */
-    int (*tcl_NumUtfChars) _ANSI_ARGS_((CONST char * src, int len)); /* 312 */
-    int (*tcl_ReadChars) _ANSI_ARGS_((Tcl_Channel channel, Tcl_Obj * objPtr, int charsToRead, int appendFlag)); /* 313 */
-    void (*tcl_RestoreResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_SavedResult * statePtr)); /* 314 */
-    void (*tcl_SaveResult) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_SavedResult * statePtr)); /* 315 */
-    int (*tcl_SetSystemEncoding) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 316 */
-    Tcl_Obj * (*tcl_SetVar2Ex) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, Tcl_Obj * newValuePtr, int flags)); /* 317 */
-    void (*tcl_ThreadAlert) _ANSI_ARGS_((Tcl_ThreadId threadId)); /* 318 */
-    void (*tcl_ThreadQueueEvent) _ANSI_ARGS_((Tcl_ThreadId threadId, Tcl_Event* evPtr, Tcl_QueuePosition position)); /* 319 */
-    Tcl_UniChar (*tcl_UniCharAtIndex) _ANSI_ARGS_((CONST char * src, int index)); /* 320 */
-    Tcl_UniChar (*tcl_UniCharToLower) _ANSI_ARGS_((int ch)); /* 321 */
-    Tcl_UniChar (*tcl_UniCharToTitle) _ANSI_ARGS_((int ch)); /* 322 */
-    Tcl_UniChar (*tcl_UniCharToUpper) _ANSI_ARGS_((int ch)); /* 323 */
-    int (*tcl_UniCharToUtf) _ANSI_ARGS_((int ch, char * buf)); /* 324 */
-    char * (*tcl_UtfAtIndex) _ANSI_ARGS_((CONST char * src, int index)); /* 325 */
-    int (*tcl_UtfCharComplete) _ANSI_ARGS_((CONST char * src, int len)); /* 326 */
-    int (*tcl_UtfBackslash) _ANSI_ARGS_((CONST char * src, int * readPtr, char * dst)); /* 327 */
-    char * (*tcl_UtfFindFirst) _ANSI_ARGS_((CONST char * src, int ch)); /* 328 */
-    char * (*tcl_UtfFindLast) _ANSI_ARGS_((CONST char * src, int ch)); /* 329 */
-    char * (*tcl_UtfNext) _ANSI_ARGS_((CONST char * src)); /* 330 */
-    char * (*tcl_UtfPrev) _ANSI_ARGS_((CONST char * src, CONST char * start)); /* 331 */
-    int (*tcl_UtfToExternal) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Encoding encoding, CONST char * src, int srcLen, int flags, Tcl_EncodingState * statePtr, char * dst, int dstLen, int * srcReadPtr, int * dstWrotePtr, int * dstCharsPtr)); /* 332 */
-    char * (*tcl_UtfToExternalDString) _ANSI_ARGS_((Tcl_Encoding encoding, CONST char * src, int srcLen, Tcl_DString * dsPtr)); /* 333 */
-    int (*tcl_UtfToLower) _ANSI_ARGS_((char * src)); /* 334 */
-    int (*tcl_UtfToTitle) _ANSI_ARGS_((char * src)); /* 335 */
-    int (*tcl_UtfToUniChar) _ANSI_ARGS_((CONST char * src, Tcl_UniChar * chPtr)); /* 336 */
-    int (*tcl_UtfToUpper) _ANSI_ARGS_((char * src)); /* 337 */
-    int (*tcl_WriteChars) _ANSI_ARGS_((Tcl_Channel chan, CONST char * src, int srcLen)); /* 338 */
-    int (*tcl_WriteObj) _ANSI_ARGS_((Tcl_Channel chan, Tcl_Obj * objPtr)); /* 339 */
-    char * (*tcl_GetString) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 340 */
-    char * (*tcl_GetDefaultEncodingDir) _ANSI_ARGS_((void)); /* 341 */
-    void (*tcl_SetDefaultEncodingDir) _ANSI_ARGS_((char * path)); /* 342 */
-    void (*tcl_AlertNotifier) _ANSI_ARGS_((ClientData clientData)); /* 343 */
-    void (*tcl_ServiceModeHook) _ANSI_ARGS_((int mode)); /* 344 */
-    int (*tcl_UniCharIsAlnum) _ANSI_ARGS_((int ch)); /* 345 */
-    int (*tcl_UniCharIsAlpha) _ANSI_ARGS_((int ch)); /* 346 */
-    int (*tcl_UniCharIsDigit) _ANSI_ARGS_((int ch)); /* 347 */
-    int (*tcl_UniCharIsLower) _ANSI_ARGS_((int ch)); /* 348 */
-    int (*tcl_UniCharIsSpace) _ANSI_ARGS_((int ch)); /* 349 */
-    int (*tcl_UniCharIsUpper) _ANSI_ARGS_((int ch)); /* 350 */
-    int (*tcl_UniCharIsWordChar) _ANSI_ARGS_((int ch)); /* 351 */
-    int (*tcl_UniCharLen) _ANSI_ARGS_((Tcl_UniChar * str)); /* 352 */
-    int (*tcl_UniCharNcmp) _ANSI_ARGS_((const Tcl_UniChar * cs, const Tcl_UniChar * ct, size_t n)); /* 353 */
-    char * (*tcl_UniCharToUtfDString) _ANSI_ARGS_((CONST Tcl_UniChar * string, int numChars, Tcl_DString * dsPtr)); /* 354 */
-    Tcl_UniChar * (*tcl_UtfToUniCharDString) _ANSI_ARGS_((CONST char * string, int length, Tcl_DString * dsPtr)); /* 355 */
-    Tcl_RegExp (*tcl_GetRegExpFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * patObj, int flags)); /* 356 */
-    Tcl_Obj * (*tcl_EvalTokens) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Token * tokenPtr, int count)); /* 357 */
-    void (*tcl_FreeParse) _ANSI_ARGS_((Tcl_Parse * parsePtr)); /* 358 */
-    void (*tcl_LogCommandInfo) _ANSI_ARGS_((Tcl_Interp * interp, char * script, char * command, int length)); /* 359 */
-    int (*tcl_ParseBraces) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr, int append, char ** termPtr)); /* 360 */
-    int (*tcl_ParseCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, int nested, Tcl_Parse * parsePtr)); /* 361 */
-    int (*tcl_ParseExpr) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr)); /* 362 */
-    int (*tcl_ParseQuotedString) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr, int append, char ** termPtr)); /* 363 */
-    int (*tcl_ParseVarName) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int numBytes, Tcl_Parse * parsePtr, int append)); /* 364 */
-    char * (*tcl_GetCwd) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * cwdPtr)); /* 365 */
-    int (*tcl_Chdir) _ANSI_ARGS_((CONST char * dirName)); /* 366 */
-} TclStubs;
-
-extern TclStubs *tclStubsPtr;
-
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-
-/*
- * Inline function declarations:
- */
-
-#ifndef Tcl_PkgProvideEx
-#define Tcl_PkgProvideEx \
-	(tclStubsPtr->tcl_PkgProvideEx) /* 0 */
-#endif
-#ifndef Tcl_PkgRequireEx
-#define Tcl_PkgRequireEx \
-	(tclStubsPtr->tcl_PkgRequireEx) /* 1 */
-#endif
-#ifndef Tcl_Panic
-#define Tcl_Panic \
-	(tclStubsPtr->tcl_Panic) /* 2 */
-#endif
-#ifndef Tcl_Alloc
-#define Tcl_Alloc \
-	(tclStubsPtr->tcl_Alloc) /* 3 */
-#endif
-#ifndef Tcl_Free
-#define Tcl_Free \
-	(tclStubsPtr->tcl_Free) /* 4 */
-#endif
-#ifndef Tcl_Realloc
-#define Tcl_Realloc \
-	(tclStubsPtr->tcl_Realloc) /* 5 */
-#endif
-#ifndef Tcl_DbCkalloc
-#define Tcl_DbCkalloc \
-	(tclStubsPtr->tcl_DbCkalloc) /* 6 */
-#endif
-#ifndef Tcl_DbCkfree
-#define Tcl_DbCkfree \
-	(tclStubsPtr->tcl_DbCkfree) /* 7 */
-#endif
-#ifndef Tcl_DbCkrealloc
-#define Tcl_DbCkrealloc \
-	(tclStubsPtr->tcl_DbCkrealloc) /* 8 */
-#endif
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-#ifndef Tcl_CreateFileHandler
-#define Tcl_CreateFileHandler \
-	(tclStubsPtr->tcl_CreateFileHandler) /* 9 */
-#endif
-#endif /* UNIX */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-#ifndef Tcl_DeleteFileHandler
-#define Tcl_DeleteFileHandler \
-	(tclStubsPtr->tcl_DeleteFileHandler) /* 10 */
-#endif
-#endif /* UNIX */
-#ifndef Tcl_SetTimer
-#define Tcl_SetTimer \
-	(tclStubsPtr->tcl_SetTimer) /* 11 */
-#endif
-#ifndef Tcl_Sleep
-#define Tcl_Sleep \
-	(tclStubsPtr->tcl_Sleep) /* 12 */
-#endif
-#ifndef Tcl_WaitForEvent
-#define Tcl_WaitForEvent \
-	(tclStubsPtr->tcl_WaitForEvent) /* 13 */
-#endif
-#ifndef Tcl_AppendAllObjTypes
-#define Tcl_AppendAllObjTypes \
-	(tclStubsPtr->tcl_AppendAllObjTypes) /* 14 */
-#endif
-#ifndef Tcl_AppendStringsToObj
-#define Tcl_AppendStringsToObj \
-	(tclStubsPtr->tcl_AppendStringsToObj) /* 15 */
-#endif
-#ifndef Tcl_AppendToObj
-#define Tcl_AppendToObj \
-	(tclStubsPtr->tcl_AppendToObj) /* 16 */
-#endif
-#ifndef Tcl_ConcatObj
-#define Tcl_ConcatObj \
-	(tclStubsPtr->tcl_ConcatObj) /* 17 */
-#endif
-#ifndef Tcl_ConvertToType
-#define Tcl_ConvertToType \
-	(tclStubsPtr->tcl_ConvertToType) /* 18 */
-#endif
-#ifndef Tcl_DbDecrRefCount
-#define Tcl_DbDecrRefCount \
-	(tclStubsPtr->tcl_DbDecrRefCount) /* 19 */
-#endif
-#ifndef Tcl_DbIncrRefCount
-#define Tcl_DbIncrRefCount \
-	(tclStubsPtr->tcl_DbIncrRefCount) /* 20 */
-#endif
-#ifndef Tcl_DbIsShared
-#define Tcl_DbIsShared \
-	(tclStubsPtr->tcl_DbIsShared) /* 21 */
-#endif
-#ifndef Tcl_DbNewBooleanObj
-#define Tcl_DbNewBooleanObj \
-	(tclStubsPtr->tcl_DbNewBooleanObj) /* 22 */
-#endif
-#ifndef Tcl_DbNewByteArrayObj
-#define Tcl_DbNewByteArrayObj \
-	(tclStubsPtr->tcl_DbNewByteArrayObj) /* 23 */
-#endif
-#ifndef Tcl_DbNewDoubleObj
-#define Tcl_DbNewDoubleObj \
-	(tclStubsPtr->tcl_DbNewDoubleObj) /* 24 */
-#endif
-#ifndef Tcl_DbNewListObj
-#define Tcl_DbNewListObj \
-	(tclStubsPtr->tcl_DbNewListObj) /* 25 */
-#endif
-#ifndef Tcl_DbNewLongObj
-#define Tcl_DbNewLongObj \
-	(tclStubsPtr->tcl_DbNewLongObj) /* 26 */
-#endif
-#ifndef Tcl_DbNewObj
-#define Tcl_DbNewObj \
-	(tclStubsPtr->tcl_DbNewObj) /* 27 */
-#endif
-#ifndef Tcl_DbNewStringObj
-#define Tcl_DbNewStringObj \
-	(tclStubsPtr->tcl_DbNewStringObj) /* 28 */
-#endif
-#ifndef Tcl_DuplicateObj
-#define Tcl_DuplicateObj \
-	(tclStubsPtr->tcl_DuplicateObj) /* 29 */
-#endif
-#ifndef TclFreeObj
-#define TclFreeObj \
-	(tclStubsPtr->tclFreeObj) /* 30 */
-#endif
-#ifndef Tcl_GetBoolean
-#define Tcl_GetBoolean \
-	(tclStubsPtr->tcl_GetBoolean) /* 31 */
-#endif
-#ifndef Tcl_GetBooleanFromObj
-#define Tcl_GetBooleanFromObj \
-	(tclStubsPtr->tcl_GetBooleanFromObj) /* 32 */
-#endif
-#ifndef Tcl_GetByteArrayFromObj
-#define Tcl_GetByteArrayFromObj \
-	(tclStubsPtr->tcl_GetByteArrayFromObj) /* 33 */
-#endif
-#ifndef Tcl_GetDouble
-#define Tcl_GetDouble \
-	(tclStubsPtr->tcl_GetDouble) /* 34 */
-#endif
-#ifndef Tcl_GetDoubleFromObj
-#define Tcl_GetDoubleFromObj \
-	(tclStubsPtr->tcl_GetDoubleFromObj) /* 35 */
-#endif
-#ifndef Tcl_GetIndexFromObj
-#define Tcl_GetIndexFromObj \
-	(tclStubsPtr->tcl_GetIndexFromObj) /* 36 */
-#endif
-#ifndef Tcl_GetInt
-#define Tcl_GetInt \
-	(tclStubsPtr->tcl_GetInt) /* 37 */
-#endif
-#ifndef Tcl_GetIntFromObj
-#define Tcl_GetIntFromObj \
-	(tclStubsPtr->tcl_GetIntFromObj) /* 38 */
-#endif
-#ifndef Tcl_GetLongFromObj
-#define Tcl_GetLongFromObj \
-	(tclStubsPtr->tcl_GetLongFromObj) /* 39 */
-#endif
-#ifndef Tcl_GetObjType
-#define Tcl_GetObjType \
-	(tclStubsPtr->tcl_GetObjType) /* 40 */
-#endif
-#ifndef Tcl_GetStringFromObj
-#define Tcl_GetStringFromObj \
-	(tclStubsPtr->tcl_GetStringFromObj) /* 41 */
-#endif
-#ifndef Tcl_InvalidateStringRep
-#define Tcl_InvalidateStringRep \
-	(tclStubsPtr->tcl_InvalidateStringRep) /* 42 */
-#endif
-#ifndef Tcl_ListObjAppendList
-#define Tcl_ListObjAppendList \
-	(tclStubsPtr->tcl_ListObjAppendList) /* 43 */
-#endif
-#ifndef Tcl_ListObjAppendElement
-#define Tcl_ListObjAppendElement \
-	(tclStubsPtr->tcl_ListObjAppendElement) /* 44 */
-#endif
-#ifndef Tcl_ListObjGetElements
-#define Tcl_ListObjGetElements \
-	(tclStubsPtr->tcl_ListObjGetElements) /* 45 */
-#endif
-#ifndef Tcl_ListObjIndex
-#define Tcl_ListObjIndex \
-	(tclStubsPtr->tcl_ListObjIndex) /* 46 */
-#endif
-#ifndef Tcl_ListObjLength
-#define Tcl_ListObjLength \
-	(tclStubsPtr->tcl_ListObjLength) /* 47 */
-#endif
-#ifndef Tcl_ListObjReplace
-#define Tcl_ListObjReplace \
-	(tclStubsPtr->tcl_ListObjReplace) /* 48 */
-#endif
-#ifndef Tcl_NewBooleanObj
-#define Tcl_NewBooleanObj \
-	(tclStubsPtr->tcl_NewBooleanObj) /* 49 */
-#endif
-#ifndef Tcl_NewByteArrayObj
-#define Tcl_NewByteArrayObj \
-	(tclStubsPtr->tcl_NewByteArrayObj) /* 50 */
-#endif
-#ifndef Tcl_NewDoubleObj
-#define Tcl_NewDoubleObj \
-	(tclStubsPtr->tcl_NewDoubleObj) /* 51 */
-#endif
-#ifndef Tcl_NewIntObj
-#define Tcl_NewIntObj \
-	(tclStubsPtr->tcl_NewIntObj) /* 52 */
-#endif
-#ifndef Tcl_NewListObj
-#define Tcl_NewListObj \
-	(tclStubsPtr->tcl_NewListObj) /* 53 */
-#endif
-#ifndef Tcl_NewLongObj
-#define Tcl_NewLongObj \
-	(tclStubsPtr->tcl_NewLongObj) /* 54 */
-#endif
-#ifndef Tcl_NewObj
-#define Tcl_NewObj \
-	(tclStubsPtr->tcl_NewObj) /* 55 */
-#endif
-#ifndef Tcl_NewStringObj
-#define Tcl_NewStringObj \
-	(tclStubsPtr->tcl_NewStringObj) /* 56 */
-#endif
-#ifndef Tcl_SetBooleanObj
-#define Tcl_SetBooleanObj \
-	(tclStubsPtr->tcl_SetBooleanObj) /* 57 */
-#endif
-#ifndef Tcl_SetByteArrayLength
-#define Tcl_SetByteArrayLength \
-	(tclStubsPtr->tcl_SetByteArrayLength) /* 58 */
-#endif
-#ifndef Tcl_SetByteArrayObj
-#define Tcl_SetByteArrayObj \
-	(tclStubsPtr->tcl_SetByteArrayObj) /* 59 */
-#endif
-#ifndef Tcl_SetDoubleObj
-#define Tcl_SetDoubleObj \
-	(tclStubsPtr->tcl_SetDoubleObj) /* 60 */
-#endif
-#ifndef Tcl_SetIntObj
-#define Tcl_SetIntObj \
-	(tclStubsPtr->tcl_SetIntObj) /* 61 */
-#endif
-#ifndef Tcl_SetListObj
-#define Tcl_SetListObj \
-	(tclStubsPtr->tcl_SetListObj) /* 62 */
-#endif
-#ifndef Tcl_SetLongObj
-#define Tcl_SetLongObj \
-	(tclStubsPtr->tcl_SetLongObj) /* 63 */
-#endif
-#ifndef Tcl_SetObjLength
-#define Tcl_SetObjLength \
-	(tclStubsPtr->tcl_SetObjLength) /* 64 */
-#endif
-#ifndef Tcl_SetStringObj
-#define Tcl_SetStringObj \
-	(tclStubsPtr->tcl_SetStringObj) /* 65 */
-#endif
-#ifndef Tcl_AddErrorInfo
-#define Tcl_AddErrorInfo \
-	(tclStubsPtr->tcl_AddErrorInfo) /* 66 */
-#endif
-#ifndef Tcl_AddObjErrorInfo
-#define Tcl_AddObjErrorInfo \
-	(tclStubsPtr->tcl_AddObjErrorInfo) /* 67 */
-#endif
-#ifndef Tcl_AllowExceptions
-#define Tcl_AllowExceptions \
-	(tclStubsPtr->tcl_AllowExceptions) /* 68 */
-#endif
-#ifndef Tcl_AppendElement
-#define Tcl_AppendElement \
-	(tclStubsPtr->tcl_AppendElement) /* 69 */
-#endif
-#ifndef Tcl_AppendResult
-#define Tcl_AppendResult \
-	(tclStubsPtr->tcl_AppendResult) /* 70 */
-#endif
-#ifndef Tcl_AsyncCreate
-#define Tcl_AsyncCreate \
-	(tclStubsPtr->tcl_AsyncCreate) /* 71 */
-#endif
-#ifndef Tcl_AsyncDelete
-#define Tcl_AsyncDelete \
-	(tclStubsPtr->tcl_AsyncDelete) /* 72 */
-#endif
-#ifndef Tcl_AsyncInvoke
-#define Tcl_AsyncInvoke \
-	(tclStubsPtr->tcl_AsyncInvoke) /* 73 */
-#endif
-#ifndef Tcl_AsyncMark
-#define Tcl_AsyncMark \
-	(tclStubsPtr->tcl_AsyncMark) /* 74 */
-#endif
-#ifndef Tcl_AsyncReady
-#define Tcl_AsyncReady \
-	(tclStubsPtr->tcl_AsyncReady) /* 75 */
-#endif
-#ifndef Tcl_BackgroundError
-#define Tcl_BackgroundError \
-	(tclStubsPtr->tcl_BackgroundError) /* 76 */
-#endif
-#ifndef Tcl_Backslash
-#define Tcl_Backslash \
-	(tclStubsPtr->tcl_Backslash) /* 77 */
-#endif
-#ifndef Tcl_BadChannelOption
-#define Tcl_BadChannelOption \
-	(tclStubsPtr->tcl_BadChannelOption) /* 78 */
-#endif
-#ifndef Tcl_CallWhenDeleted
-#define Tcl_CallWhenDeleted \
-	(tclStubsPtr->tcl_CallWhenDeleted) /* 79 */
-#endif
-#ifndef Tcl_CancelIdleCall
-#define Tcl_CancelIdleCall \
-	(tclStubsPtr->tcl_CancelIdleCall) /* 80 */
-#endif
-#ifndef Tcl_Close
-#define Tcl_Close \
-	(tclStubsPtr->tcl_Close) /* 81 */
-#endif
-#ifndef Tcl_CommandComplete
-#define Tcl_CommandComplete \
-	(tclStubsPtr->tcl_CommandComplete) /* 82 */
-#endif
-#ifndef Tcl_Concat
-#define Tcl_Concat \
-	(tclStubsPtr->tcl_Concat) /* 83 */
-#endif
-#ifndef Tcl_ConvertElement
-#define Tcl_ConvertElement \
-	(tclStubsPtr->tcl_ConvertElement) /* 84 */
-#endif
-#ifndef Tcl_ConvertCountedElement
-#define Tcl_ConvertCountedElement \
-	(tclStubsPtr->tcl_ConvertCountedElement) /* 85 */
-#endif
-#ifndef Tcl_CreateAlias
-#define Tcl_CreateAlias \
-	(tclStubsPtr->tcl_CreateAlias) /* 86 */
-#endif
-#ifndef Tcl_CreateAliasObj
-#define Tcl_CreateAliasObj \
-	(tclStubsPtr->tcl_CreateAliasObj) /* 87 */
-#endif
-#ifndef Tcl_CreateChannel
-#define Tcl_CreateChannel \
-	(tclStubsPtr->tcl_CreateChannel) /* 88 */
-#endif
-#ifndef Tcl_CreateChannelHandler
-#define Tcl_CreateChannelHandler \
-	(tclStubsPtr->tcl_CreateChannelHandler) /* 89 */
-#endif
-#ifndef Tcl_CreateCloseHandler
-#define Tcl_CreateCloseHandler \
-	(tclStubsPtr->tcl_CreateCloseHandler) /* 90 */
-#endif
-#ifndef Tcl_CreateCommand
-#define Tcl_CreateCommand \
-	(tclStubsPtr->tcl_CreateCommand) /* 91 */
-#endif
-#ifndef Tcl_CreateEventSource
-#define Tcl_CreateEventSource \
-	(tclStubsPtr->tcl_CreateEventSource) /* 92 */
-#endif
-#ifndef Tcl_CreateExitHandler
-#define Tcl_CreateExitHandler \
-	(tclStubsPtr->tcl_CreateExitHandler) /* 93 */
-#endif
-#ifndef Tcl_CreateInterp
-#define Tcl_CreateInterp \
-	(tclStubsPtr->tcl_CreateInterp) /* 94 */
-#endif
-#ifndef Tcl_CreateMathFunc
-#define Tcl_CreateMathFunc \
-	(tclStubsPtr->tcl_CreateMathFunc) /* 95 */
-#endif
-#ifndef Tcl_CreateObjCommand
-#define Tcl_CreateObjCommand \
-	(tclStubsPtr->tcl_CreateObjCommand) /* 96 */
-#endif
-#ifndef Tcl_CreateSlave
-#define Tcl_CreateSlave \
-	(tclStubsPtr->tcl_CreateSlave) /* 97 */
-#endif
-#ifndef Tcl_CreateTimerHandler
-#define Tcl_CreateTimerHandler \
-	(tclStubsPtr->tcl_CreateTimerHandler) /* 98 */
-#endif
-#ifndef Tcl_CreateTrace
-#define Tcl_CreateTrace \
-	(tclStubsPtr->tcl_CreateTrace) /* 99 */
-#endif
-#ifndef Tcl_DeleteAssocData
-#define Tcl_DeleteAssocData \
-	(tclStubsPtr->tcl_DeleteAssocData) /* 100 */
-#endif
-#ifndef Tcl_DeleteChannelHandler
-#define Tcl_DeleteChannelHandler \
-	(tclStubsPtr->tcl_DeleteChannelHandler) /* 101 */
-#endif
-#ifndef Tcl_DeleteCloseHandler
-#define Tcl_DeleteCloseHandler \
-	(tclStubsPtr->tcl_DeleteCloseHandler) /* 102 */
-#endif
-#ifndef Tcl_DeleteCommand
-#define Tcl_DeleteCommand \
-	(tclStubsPtr->tcl_DeleteCommand) /* 103 */
-#endif
-#ifndef Tcl_DeleteCommandFromToken
-#define Tcl_DeleteCommandFromToken \
-	(tclStubsPtr->tcl_DeleteCommandFromToken) /* 104 */
-#endif
-#ifndef Tcl_DeleteEvents
-#define Tcl_DeleteEvents \
-	(tclStubsPtr->tcl_DeleteEvents) /* 105 */
-#endif
-#ifndef Tcl_DeleteEventSource
-#define Tcl_DeleteEventSource \
-	(tclStubsPtr->tcl_DeleteEventSource) /* 106 */
-#endif
-#ifndef Tcl_DeleteExitHandler
-#define Tcl_DeleteExitHandler \
-	(tclStubsPtr->tcl_DeleteExitHandler) /* 107 */
-#endif
-#ifndef Tcl_DeleteHashEntry
-#define Tcl_DeleteHashEntry \
-	(tclStubsPtr->tcl_DeleteHashEntry) /* 108 */
-#endif
-#ifndef Tcl_DeleteHashTable
-#define Tcl_DeleteHashTable \
-	(tclStubsPtr->tcl_DeleteHashTable) /* 109 */
-#endif
-#ifndef Tcl_DeleteInterp
-#define Tcl_DeleteInterp \
-	(tclStubsPtr->tcl_DeleteInterp) /* 110 */
-#endif
-#ifndef Tcl_DetachPids
-#define Tcl_DetachPids \
-	(tclStubsPtr->tcl_DetachPids) /* 111 */
-#endif
-#ifndef Tcl_DeleteTimerHandler
-#define Tcl_DeleteTimerHandler \
-	(tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */
-#endif
-#ifndef Tcl_DeleteTrace
-#define Tcl_DeleteTrace \
-	(tclStubsPtr->tcl_DeleteTrace) /* 113 */
-#endif
-#ifndef Tcl_DontCallWhenDeleted
-#define Tcl_DontCallWhenDeleted \
-	(tclStubsPtr->tcl_DontCallWhenDeleted) /* 114 */
-#endif
-#ifndef Tcl_DoOneEvent
-#define Tcl_DoOneEvent \
-	(tclStubsPtr->tcl_DoOneEvent) /* 115 */
-#endif
-#ifndef Tcl_DoWhenIdle
-#define Tcl_DoWhenIdle \
-	(tclStubsPtr->tcl_DoWhenIdle) /* 116 */
-#endif
-#ifndef Tcl_DStringAppend
-#define Tcl_DStringAppend \
-	(tclStubsPtr->tcl_DStringAppend) /* 117 */
-#endif
-#ifndef Tcl_DStringAppendElement
-#define Tcl_DStringAppendElement \
-	(tclStubsPtr->tcl_DStringAppendElement) /* 118 */
-#endif
-#ifndef Tcl_DStringEndSublist
-#define Tcl_DStringEndSublist \
-	(tclStubsPtr->tcl_DStringEndSublist) /* 119 */
-#endif
-#ifndef Tcl_DStringFree
-#define Tcl_DStringFree \
-	(tclStubsPtr->tcl_DStringFree) /* 120 */
-#endif
-#ifndef Tcl_DStringGetResult
-#define Tcl_DStringGetResult \
-	(tclStubsPtr->tcl_DStringGetResult) /* 121 */
-#endif
-#ifndef Tcl_DStringInit
-#define Tcl_DStringInit \
-	(tclStubsPtr->tcl_DStringInit) /* 122 */
-#endif
-#ifndef Tcl_DStringResult
-#define Tcl_DStringResult \
-	(tclStubsPtr->tcl_DStringResult) /* 123 */
-#endif
-#ifndef Tcl_DStringSetLength
-#define Tcl_DStringSetLength \
-	(tclStubsPtr->tcl_DStringSetLength) /* 124 */
-#endif
-#ifndef Tcl_DStringStartSublist
-#define Tcl_DStringStartSublist \
-	(tclStubsPtr->tcl_DStringStartSublist) /* 125 */
-#endif
-#ifndef Tcl_Eof
-#define Tcl_Eof \
-	(tclStubsPtr->tcl_Eof) /* 126 */
-#endif
-#ifndef Tcl_ErrnoId
-#define Tcl_ErrnoId \
-	(tclStubsPtr->tcl_ErrnoId) /* 127 */
-#endif
-#ifndef Tcl_ErrnoMsg
-#define Tcl_ErrnoMsg \
-	(tclStubsPtr->tcl_ErrnoMsg) /* 128 */
-#endif
-#ifndef Tcl_Eval
-#define Tcl_Eval \
-	(tclStubsPtr->tcl_Eval) /* 129 */
-#endif
-#ifndef Tcl_EvalFile
-#define Tcl_EvalFile \
-	(tclStubsPtr->tcl_EvalFile) /* 130 */
-#endif
-#ifndef Tcl_EvalObj
-#define Tcl_EvalObj \
-	(tclStubsPtr->tcl_EvalObj) /* 131 */
-#endif
-#ifndef Tcl_EventuallyFree
-#define Tcl_EventuallyFree \
-	(tclStubsPtr->tcl_EventuallyFree) /* 132 */
-#endif
-#ifndef Tcl_Exit
-#define Tcl_Exit \
-	(tclStubsPtr->tcl_Exit) /* 133 */
-#endif
-#ifndef Tcl_ExposeCommand
-#define Tcl_ExposeCommand \
-	(tclStubsPtr->tcl_ExposeCommand) /* 134 */
-#endif
-#ifndef Tcl_ExprBoolean
-#define Tcl_ExprBoolean \
-	(tclStubsPtr->tcl_ExprBoolean) /* 135 */
-#endif
-#ifndef Tcl_ExprBooleanObj
-#define Tcl_ExprBooleanObj \
-	(tclStubsPtr->tcl_ExprBooleanObj) /* 136 */
-#endif
-#ifndef Tcl_ExprDouble
-#define Tcl_ExprDouble \
-	(tclStubsPtr->tcl_ExprDouble) /* 137 */
-#endif
-#ifndef Tcl_ExprDoubleObj
-#define Tcl_ExprDoubleObj \
-	(tclStubsPtr->tcl_ExprDoubleObj) /* 138 */
-#endif
-#ifndef Tcl_ExprLong
-#define Tcl_ExprLong \
-	(tclStubsPtr->tcl_ExprLong) /* 139 */
-#endif
-#ifndef Tcl_ExprLongObj
-#define Tcl_ExprLongObj \
-	(tclStubsPtr->tcl_ExprLongObj) /* 140 */
-#endif
-#ifndef Tcl_ExprObj
-#define Tcl_ExprObj \
-	(tclStubsPtr->tcl_ExprObj) /* 141 */
-#endif
-#ifndef Tcl_ExprString
-#define Tcl_ExprString \
-	(tclStubsPtr->tcl_ExprString) /* 142 */
-#endif
-#ifndef Tcl_Finalize
-#define Tcl_Finalize \
-	(tclStubsPtr->tcl_Finalize) /* 143 */
-#endif
-#ifndef Tcl_FindExecutable
-#define Tcl_FindExecutable \
-	(tclStubsPtr->tcl_FindExecutable) /* 144 */
-#endif
-#ifndef Tcl_FirstHashEntry
-#define Tcl_FirstHashEntry \
-	(tclStubsPtr->tcl_FirstHashEntry) /* 145 */
-#endif
-#ifndef Tcl_Flush
-#define Tcl_Flush \
-	(tclStubsPtr->tcl_Flush) /* 146 */
-#endif
-#ifndef Tcl_FreeResult
-#define Tcl_FreeResult \
-	(tclStubsPtr->tcl_FreeResult) /* 147 */
-#endif
-#ifndef Tcl_GetAlias
-#define Tcl_GetAlias \
-	(tclStubsPtr->tcl_GetAlias) /* 148 */
-#endif
-#ifndef Tcl_GetAliasObj
-#define Tcl_GetAliasObj \
-	(tclStubsPtr->tcl_GetAliasObj) /* 149 */
-#endif
-#ifndef Tcl_GetAssocData
-#define Tcl_GetAssocData \
-	(tclStubsPtr->tcl_GetAssocData) /* 150 */
-#endif
-#ifndef Tcl_GetChannel
-#define Tcl_GetChannel \
-	(tclStubsPtr->tcl_GetChannel) /* 151 */
-#endif
-#ifndef Tcl_GetChannelBufferSize
-#define Tcl_GetChannelBufferSize \
-	(tclStubsPtr->tcl_GetChannelBufferSize) /* 152 */
-#endif
-#ifndef Tcl_GetChannelHandle
-#define Tcl_GetChannelHandle \
-	(tclStubsPtr->tcl_GetChannelHandle) /* 153 */
-#endif
-#ifndef Tcl_GetChannelInstanceData
-#define Tcl_GetChannelInstanceData \
-	(tclStubsPtr->tcl_GetChannelInstanceData) /* 154 */
-#endif
-#ifndef Tcl_GetChannelMode
-#define Tcl_GetChannelMode \
-	(tclStubsPtr->tcl_GetChannelMode) /* 155 */
-#endif
-#ifndef Tcl_GetChannelName
-#define Tcl_GetChannelName \
-	(tclStubsPtr->tcl_GetChannelName) /* 156 */
-#endif
-#ifndef Tcl_GetChannelOption
-#define Tcl_GetChannelOption \
-	(tclStubsPtr->tcl_GetChannelOption) /* 157 */
-#endif
-#ifndef Tcl_GetChannelType
-#define Tcl_GetChannelType \
-	(tclStubsPtr->tcl_GetChannelType) /* 158 */
-#endif
-#ifndef Tcl_GetCommandInfo
-#define Tcl_GetCommandInfo \
-	(tclStubsPtr->tcl_GetCommandInfo) /* 159 */
-#endif
-#ifndef Tcl_GetCommandName
-#define Tcl_GetCommandName \
-	(tclStubsPtr->tcl_GetCommandName) /* 160 */
-#endif
-#ifndef Tcl_GetErrno
-#define Tcl_GetErrno \
-	(tclStubsPtr->tcl_GetErrno) /* 161 */
-#endif
-#ifndef Tcl_GetHostName
-#define Tcl_GetHostName \
-	(tclStubsPtr->tcl_GetHostName) /* 162 */
-#endif
-#ifndef Tcl_GetInterpPath
-#define Tcl_GetInterpPath \
-	(tclStubsPtr->tcl_GetInterpPath) /* 163 */
-#endif
-#ifndef Tcl_GetMaster
-#define Tcl_GetMaster \
-	(tclStubsPtr->tcl_GetMaster) /* 164 */
-#endif
-#ifndef Tcl_GetNameOfExecutable
-#define Tcl_GetNameOfExecutable \
-	(tclStubsPtr->tcl_GetNameOfExecutable) /* 165 */
-#endif
-#ifndef Tcl_GetObjResult
-#define Tcl_GetObjResult \
-	(tclStubsPtr->tcl_GetObjResult) /* 166 */
-#endif
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-#ifndef Tcl_GetOpenFile
-#define Tcl_GetOpenFile \
-	(tclStubsPtr->tcl_GetOpenFile) /* 167 */
-#endif
-#endif /* UNIX */
-#ifndef Tcl_GetPathType
-#define Tcl_GetPathType \
-	(tclStubsPtr->tcl_GetPathType) /* 168 */
-#endif
-#ifndef Tcl_Gets
-#define Tcl_Gets \
-	(tclStubsPtr->tcl_Gets) /* 169 */
-#endif
-#ifndef Tcl_GetsObj
-#define Tcl_GetsObj \
-	(tclStubsPtr->tcl_GetsObj) /* 170 */
-#endif
-#ifndef Tcl_GetServiceMode
-#define Tcl_GetServiceMode \
-	(tclStubsPtr->tcl_GetServiceMode) /* 171 */
-#endif
-#ifndef Tcl_GetSlave
-#define Tcl_GetSlave \
-	(tclStubsPtr->tcl_GetSlave) /* 172 */
-#endif
-#ifndef Tcl_GetStdChannel
-#define Tcl_GetStdChannel \
-	(tclStubsPtr->tcl_GetStdChannel) /* 173 */
-#endif
-#ifndef Tcl_GetStringResult
-#define Tcl_GetStringResult \
-	(tclStubsPtr->tcl_GetStringResult) /* 174 */
-#endif
-#ifndef Tcl_GetVar
-#define Tcl_GetVar \
-	(tclStubsPtr->tcl_GetVar) /* 175 */
-#endif
-#ifndef Tcl_GetVar2
-#define Tcl_GetVar2 \
-	(tclStubsPtr->tcl_GetVar2) /* 176 */
-#endif
-#ifndef Tcl_GlobalEval
-#define Tcl_GlobalEval \
-	(tclStubsPtr->tcl_GlobalEval) /* 177 */
-#endif
-#ifndef Tcl_GlobalEvalObj
-#define Tcl_GlobalEvalObj \
-	(tclStubsPtr->tcl_GlobalEvalObj) /* 178 */
-#endif
-#ifndef Tcl_HideCommand
-#define Tcl_HideCommand \
-	(tclStubsPtr->tcl_HideCommand) /* 179 */
-#endif
-#ifndef Tcl_Init
-#define Tcl_Init \
-	(tclStubsPtr->tcl_Init) /* 180 */
-#endif
-#ifndef Tcl_InitHashTable
-#define Tcl_InitHashTable \
-	(tclStubsPtr->tcl_InitHashTable) /* 181 */
-#endif
-#ifndef Tcl_InputBlocked
-#define Tcl_InputBlocked \
-	(tclStubsPtr->tcl_InputBlocked) /* 182 */
-#endif
-#ifndef Tcl_InputBuffered
-#define Tcl_InputBuffered \
-	(tclStubsPtr->tcl_InputBuffered) /* 183 */
-#endif
-#ifndef Tcl_InterpDeleted
-#define Tcl_InterpDeleted \
-	(tclStubsPtr->tcl_InterpDeleted) /* 184 */
-#endif
-#ifndef Tcl_IsSafe
-#define Tcl_IsSafe \
-	(tclStubsPtr->tcl_IsSafe) /* 185 */
-#endif
-#ifndef Tcl_JoinPath
-#define Tcl_JoinPath \
-	(tclStubsPtr->tcl_JoinPath) /* 186 */
-#endif
-#ifndef Tcl_LinkVar
-#define Tcl_LinkVar \
-	(tclStubsPtr->tcl_LinkVar) /* 187 */
-#endif
-/* Slot 188 is reserved */
-#ifndef Tcl_MakeFileChannel
-#define Tcl_MakeFileChannel \
-	(tclStubsPtr->tcl_MakeFileChannel) /* 189 */
-#endif
-#ifndef Tcl_MakeSafe
-#define Tcl_MakeSafe \
-	(tclStubsPtr->tcl_MakeSafe) /* 190 */
-#endif
-#ifndef Tcl_MakeTcpClientChannel
-#define Tcl_MakeTcpClientChannel \
-	(tclStubsPtr->tcl_MakeTcpClientChannel) /* 191 */
-#endif
-#ifndef Tcl_Merge
-#define Tcl_Merge \
-	(tclStubsPtr->tcl_Merge) /* 192 */
-#endif
-#ifndef Tcl_NextHashEntry
-#define Tcl_NextHashEntry \
-	(tclStubsPtr->tcl_NextHashEntry) /* 193 */
-#endif
-#ifndef Tcl_NotifyChannel
-#define Tcl_NotifyChannel \
-	(tclStubsPtr->tcl_NotifyChannel) /* 194 */
-#endif
-#ifndef Tcl_ObjGetVar2
-#define Tcl_ObjGetVar2 \
-	(tclStubsPtr->tcl_ObjGetVar2) /* 195 */
-#endif
-#ifndef Tcl_ObjSetVar2
-#define Tcl_ObjSetVar2 \
-	(tclStubsPtr->tcl_ObjSetVar2) /* 196 */
-#endif
-#ifndef Tcl_OpenCommandChannel
-#define Tcl_OpenCommandChannel \
-	(tclStubsPtr->tcl_OpenCommandChannel) /* 197 */
-#endif
-#ifndef Tcl_OpenFileChannel
-#define Tcl_OpenFileChannel \
-	(tclStubsPtr->tcl_OpenFileChannel) /* 198 */
-#endif
-#ifndef Tcl_OpenTcpClient
-#define Tcl_OpenTcpClient \
-	(tclStubsPtr->tcl_OpenTcpClient) /* 199 */
-#endif
-#ifndef Tcl_OpenTcpServer
-#define Tcl_OpenTcpServer \
-	(tclStubsPtr->tcl_OpenTcpServer) /* 200 */
-#endif
-#ifndef Tcl_Preserve
-#define Tcl_Preserve \
-	(tclStubsPtr->tcl_Preserve) /* 201 */
-#endif
-#ifndef Tcl_PrintDouble
-#define Tcl_PrintDouble \
-	(tclStubsPtr->tcl_PrintDouble) /* 202 */
-#endif
-#ifndef Tcl_PutEnv
-#define Tcl_PutEnv \
-	(tclStubsPtr->tcl_PutEnv) /* 203 */
-#endif
-#ifndef Tcl_PosixError
-#define Tcl_PosixError \
-	(tclStubsPtr->tcl_PosixError) /* 204 */
-#endif
-#ifndef Tcl_QueueEvent
-#define Tcl_QueueEvent \
-	(tclStubsPtr->tcl_QueueEvent) /* 205 */
-#endif
-#ifndef Tcl_Read
-#define Tcl_Read \
-	(tclStubsPtr->tcl_Read) /* 206 */
-#endif
-#ifndef Tcl_ReapDetachedProcs
-#define Tcl_ReapDetachedProcs \
-	(tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */
-#endif
-#ifndef Tcl_RecordAndEval
-#define Tcl_RecordAndEval \
-	(tclStubsPtr->tcl_RecordAndEval) /* 208 */
-#endif
-#ifndef Tcl_RecordAndEvalObj
-#define Tcl_RecordAndEvalObj \
-	(tclStubsPtr->tcl_RecordAndEvalObj) /* 209 */
-#endif
-#ifndef Tcl_RegisterChannel
-#define Tcl_RegisterChannel \
-	(tclStubsPtr->tcl_RegisterChannel) /* 210 */
-#endif
-#ifndef Tcl_RegisterObjType
-#define Tcl_RegisterObjType \
-	(tclStubsPtr->tcl_RegisterObjType) /* 211 */
-#endif
-#ifndef Tcl_RegExpCompile
-#define Tcl_RegExpCompile \
-	(tclStubsPtr->tcl_RegExpCompile) /* 212 */
-#endif
-#ifndef Tcl_RegExpExec
-#define Tcl_RegExpExec \
-	(tclStubsPtr->tcl_RegExpExec) /* 213 */
-#endif
-#ifndef Tcl_RegExpMatch
-#define Tcl_RegExpMatch \
-	(tclStubsPtr->tcl_RegExpMatch) /* 214 */
-#endif
-#ifndef Tcl_RegExpRange
-#define Tcl_RegExpRange \
-	(tclStubsPtr->tcl_RegExpRange) /* 215 */
-#endif
-#ifndef Tcl_Release
-#define Tcl_Release \
-	(tclStubsPtr->tcl_Release) /* 216 */
-#endif
-#ifndef Tcl_ResetResult
-#define Tcl_ResetResult \
-	(tclStubsPtr->tcl_ResetResult) /* 217 */
-#endif
-#ifndef Tcl_ScanElement
-#define Tcl_ScanElement \
-	(tclStubsPtr->tcl_ScanElement) /* 218 */
-#endif
-#ifndef Tcl_ScanCountedElement
-#define Tcl_ScanCountedElement \
-	(tclStubsPtr->tcl_ScanCountedElement) /* 219 */
-#endif
-#ifndef Tcl_Seek
-#define Tcl_Seek \
-	(tclStubsPtr->tcl_Seek) /* 220 */
-#endif
-#ifndef Tcl_ServiceAll
-#define Tcl_ServiceAll \
-	(tclStubsPtr->tcl_ServiceAll) /* 221 */
-#endif
-#ifndef Tcl_ServiceEvent
-#define Tcl_ServiceEvent \
-	(tclStubsPtr->tcl_ServiceEvent) /* 222 */
-#endif
-#ifndef Tcl_SetAssocData
-#define Tcl_SetAssocData \
-	(tclStubsPtr->tcl_SetAssocData) /* 223 */
-#endif
-#ifndef Tcl_SetChannelBufferSize
-#define Tcl_SetChannelBufferSize \
-	(tclStubsPtr->tcl_SetChannelBufferSize) /* 224 */
-#endif
-#ifndef Tcl_SetChannelOption
-#define Tcl_SetChannelOption \
-	(tclStubsPtr->tcl_SetChannelOption) /* 225 */
-#endif
-#ifndef Tcl_SetCommandInfo
-#define Tcl_SetCommandInfo \
-	(tclStubsPtr->tcl_SetCommandInfo) /* 226 */
-#endif
-#ifndef Tcl_SetErrno
-#define Tcl_SetErrno \
-	(tclStubsPtr->tcl_SetErrno) /* 227 */
-#endif
-#ifndef Tcl_SetErrorCode
-#define Tcl_SetErrorCode \
-	(tclStubsPtr->tcl_SetErrorCode) /* 228 */
-#endif
-#ifndef Tcl_SetMaxBlockTime
-#define Tcl_SetMaxBlockTime \
-	(tclStubsPtr->tcl_SetMaxBlockTime) /* 229 */
-#endif
-#ifndef Tcl_SetPanicProc
-#define Tcl_SetPanicProc \
-	(tclStubsPtr->tcl_SetPanicProc) /* 230 */
-#endif
-#ifndef Tcl_SetRecursionLimit
-#define Tcl_SetRecursionLimit \
-	(tclStubsPtr->tcl_SetRecursionLimit) /* 231 */
-#endif
-#ifndef Tcl_SetResult
-#define Tcl_SetResult \
-	(tclStubsPtr->tcl_SetResult) /* 232 */
-#endif
-#ifndef Tcl_SetServiceMode
-#define Tcl_SetServiceMode \
-	(tclStubsPtr->tcl_SetServiceMode) /* 233 */
-#endif
-#ifndef Tcl_SetObjErrorCode
-#define Tcl_SetObjErrorCode \
-	(tclStubsPtr->tcl_SetObjErrorCode) /* 234 */
-#endif
-#ifndef Tcl_SetObjResult
-#define Tcl_SetObjResult \
-	(tclStubsPtr->tcl_SetObjResult) /* 235 */
-#endif
-#ifndef Tcl_SetStdChannel
-#define Tcl_SetStdChannel \
-	(tclStubsPtr->tcl_SetStdChannel) /* 236 */
-#endif
-#ifndef Tcl_SetVar
-#define Tcl_SetVar \
-	(tclStubsPtr->tcl_SetVar) /* 237 */
-#endif
-#ifndef Tcl_SetVar2
-#define Tcl_SetVar2 \
-	(tclStubsPtr->tcl_SetVar2) /* 238 */
-#endif
-#ifndef Tcl_SignalId
-#define Tcl_SignalId \
-	(tclStubsPtr->tcl_SignalId) /* 239 */
-#endif
-#ifndef Tcl_SignalMsg
-#define Tcl_SignalMsg \
-	(tclStubsPtr->tcl_SignalMsg) /* 240 */
-#endif
-#ifndef Tcl_SourceRCFile
-#define Tcl_SourceRCFile \
-	(tclStubsPtr->tcl_SourceRCFile) /* 241 */
-#endif
-#ifndef Tcl_SplitList
-#define Tcl_SplitList \
-	(tclStubsPtr->tcl_SplitList) /* 242 */
-#endif
-#ifndef Tcl_SplitPath
-#define Tcl_SplitPath \
-	(tclStubsPtr->tcl_SplitPath) /* 243 */
-#endif
-#ifndef Tcl_StaticPackage
-#define Tcl_StaticPackage \
-	(tclStubsPtr->tcl_StaticPackage) /* 244 */
-#endif
-#ifndef Tcl_StringMatch
-#define Tcl_StringMatch \
-	(tclStubsPtr->tcl_StringMatch) /* 245 */
-#endif
-#ifndef Tcl_Tell
-#define Tcl_Tell \
-	(tclStubsPtr->tcl_Tell) /* 246 */
-#endif
-#ifndef Tcl_TraceVar
-#define Tcl_TraceVar \
-	(tclStubsPtr->tcl_TraceVar) /* 247 */
-#endif
-#ifndef Tcl_TraceVar2
-#define Tcl_TraceVar2 \
-	(tclStubsPtr->tcl_TraceVar2) /* 248 */
-#endif
-#ifndef Tcl_TranslateFileName
-#define Tcl_TranslateFileName \
-	(tclStubsPtr->tcl_TranslateFileName) /* 249 */
-#endif
-#ifndef Tcl_Ungets
-#define Tcl_Ungets \
-	(tclStubsPtr->tcl_Ungets) /* 250 */
-#endif
-#ifndef Tcl_UnlinkVar
-#define Tcl_UnlinkVar \
-	(tclStubsPtr->tcl_UnlinkVar) /* 251 */
-#endif
-#ifndef Tcl_UnregisterChannel
-#define Tcl_UnregisterChannel \
-	(tclStubsPtr->tcl_UnregisterChannel) /* 252 */
-#endif
-#ifndef Tcl_UnsetVar
-#define Tcl_UnsetVar \
-	(tclStubsPtr->tcl_UnsetVar) /* 253 */
-#endif
-#ifndef Tcl_UnsetVar2
-#define Tcl_UnsetVar2 \
-	(tclStubsPtr->tcl_UnsetVar2) /* 254 */
-#endif
-#ifndef Tcl_UntraceVar
-#define Tcl_UntraceVar \
-	(tclStubsPtr->tcl_UntraceVar) /* 255 */
-#endif
-#ifndef Tcl_UntraceVar2
-#define Tcl_UntraceVar2 \
-	(tclStubsPtr->tcl_UntraceVar2) /* 256 */
-#endif
-#ifndef Tcl_UpdateLinkedVar
-#define Tcl_UpdateLinkedVar \
-	(tclStubsPtr->tcl_UpdateLinkedVar) /* 257 */
-#endif
-#ifndef Tcl_UpVar
-#define Tcl_UpVar \
-	(tclStubsPtr->tcl_UpVar) /* 258 */
-#endif
-#ifndef Tcl_UpVar2
-#define Tcl_UpVar2 \
-	(tclStubsPtr->tcl_UpVar2) /* 259 */
-#endif
-#ifndef Tcl_VarEval
-#define Tcl_VarEval \
-	(tclStubsPtr->tcl_VarEval) /* 260 */
-#endif
-#ifndef Tcl_VarTraceInfo
-#define Tcl_VarTraceInfo \
-	(tclStubsPtr->tcl_VarTraceInfo) /* 261 */
-#endif
-#ifndef Tcl_VarTraceInfo2
-#define Tcl_VarTraceInfo2 \
-	(tclStubsPtr->tcl_VarTraceInfo2) /* 262 */
-#endif
-#ifndef Tcl_Write
-#define Tcl_Write \
-	(tclStubsPtr->tcl_Write) /* 263 */
-#endif
-#ifndef Tcl_WrongNumArgs
-#define Tcl_WrongNumArgs \
-	(tclStubsPtr->tcl_WrongNumArgs) /* 264 */
-#endif
-#ifndef Tcl_DumpActiveMemory
-#define Tcl_DumpActiveMemory \
-	(tclStubsPtr->tcl_DumpActiveMemory) /* 265 */
-#endif
-#ifndef Tcl_ValidateAllMemory
-#define Tcl_ValidateAllMemory \
-	(tclStubsPtr->tcl_ValidateAllMemory) /* 266 */
-#endif
-#ifndef Tcl_AppendResultVA
-#define Tcl_AppendResultVA \
-	(tclStubsPtr->tcl_AppendResultVA) /* 267 */
-#endif
-#ifndef Tcl_AppendStringsToObjVA
-#define Tcl_AppendStringsToObjVA \
-	(tclStubsPtr->tcl_AppendStringsToObjVA) /* 268 */
-#endif
-#ifndef Tcl_HashStats
-#define Tcl_HashStats \
-	(tclStubsPtr->tcl_HashStats) /* 269 */
-#endif
-#ifndef Tcl_ParseVar
-#define Tcl_ParseVar \
-	(tclStubsPtr->tcl_ParseVar) /* 270 */
-#endif
-#ifndef Tcl_PkgPresent
-#define Tcl_PkgPresent \
-	(tclStubsPtr->tcl_PkgPresent) /* 271 */
-#endif
-#ifndef Tcl_PkgPresentEx
-#define Tcl_PkgPresentEx \
-	(tclStubsPtr->tcl_PkgPresentEx) /* 272 */
-#endif
-#ifndef Tcl_PkgProvide
-#define Tcl_PkgProvide \
-	(tclStubsPtr->tcl_PkgProvide) /* 273 */
-#endif
-#ifndef Tcl_PkgRequire
-#define Tcl_PkgRequire \
-	(tclStubsPtr->tcl_PkgRequire) /* 274 */
-#endif
-#ifndef Tcl_SetErrorCodeVA
-#define Tcl_SetErrorCodeVA \
-	(tclStubsPtr->tcl_SetErrorCodeVA) /* 275 */
-#endif
-#ifndef Tcl_VarEvalVA
-#define Tcl_VarEvalVA \
-	(tclStubsPtr->tcl_VarEvalVA) /* 276 */
-#endif
-#ifndef Tcl_WaitPid
-#define Tcl_WaitPid \
-	(tclStubsPtr->tcl_WaitPid) /* 277 */
-#endif
-#ifndef Tcl_PanicVA
-#define Tcl_PanicVA \
-	(tclStubsPtr->tcl_PanicVA) /* 278 */
-#endif
-#ifndef Tcl_GetVersion
-#define Tcl_GetVersion \
-	(tclStubsPtr->tcl_GetVersion) /* 279 */
-#endif
-#ifndef Tcl_InitMemory
-#define Tcl_InitMemory \
-	(tclStubsPtr->tcl_InitMemory) /* 280 */
-#endif
-/* Slot 281 is reserved */
-/* Slot 282 is reserved */
-/* Slot 283 is reserved */
-/* Slot 284 is reserved */
-/* Slot 285 is reserved */
-#ifndef Tcl_AppendObjToObj
-#define Tcl_AppendObjToObj \
-	(tclStubsPtr->tcl_AppendObjToObj) /* 286 */
-#endif
-#ifndef Tcl_CreateEncoding
-#define Tcl_CreateEncoding \
-	(tclStubsPtr->tcl_CreateEncoding) /* 287 */
-#endif
-#ifndef Tcl_CreateThreadExitHandler
-#define Tcl_CreateThreadExitHandler \
-	(tclStubsPtr->tcl_CreateThreadExitHandler) /* 288 */
-#endif
-#ifndef Tcl_DeleteThreadExitHandler
-#define Tcl_DeleteThreadExitHandler \
-	(tclStubsPtr->tcl_DeleteThreadExitHandler) /* 289 */
-#endif
-#ifndef Tcl_DiscardResult
-#define Tcl_DiscardResult \
-	(tclStubsPtr->tcl_DiscardResult) /* 290 */
-#endif
-#ifndef Tcl_EvalEx
-#define Tcl_EvalEx \
-	(tclStubsPtr->tcl_EvalEx) /* 291 */
-#endif
-#ifndef Tcl_EvalObjv
-#define Tcl_EvalObjv \
-	(tclStubsPtr->tcl_EvalObjv) /* 292 */
-#endif
-#ifndef Tcl_EvalObjEx
-#define Tcl_EvalObjEx \
-	(tclStubsPtr->tcl_EvalObjEx) /* 293 */
-#endif
-#ifndef Tcl_ExitThread
-#define Tcl_ExitThread \
-	(tclStubsPtr->tcl_ExitThread) /* 294 */
-#endif
-#ifndef Tcl_ExternalToUtf
-#define Tcl_ExternalToUtf \
-	(tclStubsPtr->tcl_ExternalToUtf) /* 295 */
-#endif
-#ifndef Tcl_ExternalToUtfDString
-#define Tcl_ExternalToUtfDString \
-	(tclStubsPtr->tcl_ExternalToUtfDString) /* 296 */
-#endif
-#ifndef Tcl_FinalizeThread
-#define Tcl_FinalizeThread \
-	(tclStubsPtr->tcl_FinalizeThread) /* 297 */
-#endif
-#ifndef Tcl_FinalizeNotifier
-#define Tcl_FinalizeNotifier \
-	(tclStubsPtr->tcl_FinalizeNotifier) /* 298 */
-#endif
-#ifndef Tcl_FreeEncoding
-#define Tcl_FreeEncoding \
-	(tclStubsPtr->tcl_FreeEncoding) /* 299 */
-#endif
-#ifndef Tcl_GetCurrentThread
-#define Tcl_GetCurrentThread \
-	(tclStubsPtr->tcl_GetCurrentThread) /* 300 */
-#endif
-#ifndef Tcl_GetEncoding
-#define Tcl_GetEncoding \
-	(tclStubsPtr->tcl_GetEncoding) /* 301 */
-#endif
-#ifndef Tcl_GetEncodingName
-#define Tcl_GetEncodingName \
-	(tclStubsPtr->tcl_GetEncodingName) /* 302 */
-#endif
-#ifndef Tcl_GetEncodingNames
-#define Tcl_GetEncodingNames \
-	(tclStubsPtr->tcl_GetEncodingNames) /* 303 */
-#endif
-#ifndef Tcl_GetIndexFromObjStruct
-#define Tcl_GetIndexFromObjStruct \
-	(tclStubsPtr->tcl_GetIndexFromObjStruct) /* 304 */
-#endif
-#ifndef Tcl_GetThreadData
-#define Tcl_GetThreadData \
-	(tclStubsPtr->tcl_GetThreadData) /* 305 */
-#endif
-#ifndef Tcl_GetVar2Ex
-#define Tcl_GetVar2Ex \
-	(tclStubsPtr->tcl_GetVar2Ex) /* 306 */
-#endif
-#ifndef Tcl_InitNotifier
-#define Tcl_InitNotifier \
-	(tclStubsPtr->tcl_InitNotifier) /* 307 */
-#endif
-#ifndef Tcl_MutexLock
-#define Tcl_MutexLock \
-	(tclStubsPtr->tcl_MutexLock) /* 308 */
-#endif
-#ifndef Tcl_MutexUnlock
-#define Tcl_MutexUnlock \
-	(tclStubsPtr->tcl_MutexUnlock) /* 309 */
-#endif
-#ifndef Tcl_ConditionNotify
-#define Tcl_ConditionNotify \
-	(tclStubsPtr->tcl_ConditionNotify) /* 310 */
-#endif
-#ifndef Tcl_ConditionWait
-#define Tcl_ConditionWait \
-	(tclStubsPtr->tcl_ConditionWait) /* 311 */
-#endif
-#ifndef Tcl_NumUtfChars
-#define Tcl_NumUtfChars \
-	(tclStubsPtr->tcl_NumUtfChars) /* 312 */
-#endif
-#ifndef Tcl_ReadChars
-#define Tcl_ReadChars \
-	(tclStubsPtr->tcl_ReadChars) /* 313 */
-#endif
-#ifndef Tcl_RestoreResult
-#define Tcl_RestoreResult \
-	(tclStubsPtr->tcl_RestoreResult) /* 314 */
-#endif
-#ifndef Tcl_SaveResult
-#define Tcl_SaveResult \
-	(tclStubsPtr->tcl_SaveResult) /* 315 */
-#endif
-#ifndef Tcl_SetSystemEncoding
-#define Tcl_SetSystemEncoding \
-	(tclStubsPtr->tcl_SetSystemEncoding) /* 316 */
-#endif
-#ifndef Tcl_SetVar2Ex
-#define Tcl_SetVar2Ex \
-	(tclStubsPtr->tcl_SetVar2Ex) /* 317 */
-#endif
-#ifndef Tcl_ThreadAlert
-#define Tcl_ThreadAlert \
-	(tclStubsPtr->tcl_ThreadAlert) /* 318 */
-#endif
-#ifndef Tcl_ThreadQueueEvent
-#define Tcl_ThreadQueueEvent \
-	(tclStubsPtr->tcl_ThreadQueueEvent) /* 319 */
-#endif
-#ifndef Tcl_UniCharAtIndex
-#define Tcl_UniCharAtIndex \
-	(tclStubsPtr->tcl_UniCharAtIndex) /* 320 */
-#endif
-#ifndef Tcl_UniCharToLower
-#define Tcl_UniCharToLower \
-	(tclStubsPtr->tcl_UniCharToLower) /* 321 */
-#endif
-#ifndef Tcl_UniCharToTitle
-#define Tcl_UniCharToTitle \
-	(tclStubsPtr->tcl_UniCharToTitle) /* 322 */
-#endif
-#ifndef Tcl_UniCharToUpper
-#define Tcl_UniCharToUpper \
-	(tclStubsPtr->tcl_UniCharToUpper) /* 323 */
-#endif
-#ifndef Tcl_UniCharToUtf
-#define Tcl_UniCharToUtf \
-	(tclStubsPtr->tcl_UniCharToUtf) /* 324 */
-#endif
-#ifndef Tcl_UtfAtIndex
-#define Tcl_UtfAtIndex \
-	(tclStubsPtr->tcl_UtfAtIndex) /* 325 */
-#endif
-#ifndef Tcl_UtfCharComplete
-#define Tcl_UtfCharComplete \
-	(tclStubsPtr->tcl_UtfCharComplete) /* 326 */
-#endif
-#ifndef Tcl_UtfBackslash
-#define Tcl_UtfBackslash \
-	(tclStubsPtr->tcl_UtfBackslash) /* 327 */
-#endif
-#ifndef Tcl_UtfFindFirst
-#define Tcl_UtfFindFirst \
-	(tclStubsPtr->tcl_UtfFindFirst) /* 328 */
-#endif
-#ifndef Tcl_UtfFindLast
-#define Tcl_UtfFindLast \
-	(tclStubsPtr->tcl_UtfFindLast) /* 329 */
-#endif
-#ifndef Tcl_UtfNext
-#define Tcl_UtfNext \
-	(tclStubsPtr->tcl_UtfNext) /* 330 */
-#endif
-#ifndef Tcl_UtfPrev
-#define Tcl_UtfPrev \
-	(tclStubsPtr->tcl_UtfPrev) /* 331 */
-#endif
-#ifndef Tcl_UtfToExternal
-#define Tcl_UtfToExternal \
-	(tclStubsPtr->tcl_UtfToExternal) /* 332 */
-#endif
-#ifndef Tcl_UtfToExternalDString
-#define Tcl_UtfToExternalDString \
-	(tclStubsPtr->tcl_UtfToExternalDString) /* 333 */
-#endif
-#ifndef Tcl_UtfToLower
-#define Tcl_UtfToLower \
-	(tclStubsPtr->tcl_UtfToLower) /* 334 */
-#endif
-#ifndef Tcl_UtfToTitle
-#define Tcl_UtfToTitle \
-	(tclStubsPtr->tcl_UtfToTitle) /* 335 */
-#endif
-#ifndef Tcl_UtfToUniChar
-#define Tcl_UtfToUniChar \
-	(tclStubsPtr->tcl_UtfToUniChar) /* 336 */
-#endif
-#ifndef Tcl_UtfToUpper
-#define Tcl_UtfToUpper \
-	(tclStubsPtr->tcl_UtfToUpper) /* 337 */
-#endif
-#ifndef Tcl_WriteChars
-#define Tcl_WriteChars \
-	(tclStubsPtr->tcl_WriteChars) /* 338 */
-#endif
-#ifndef Tcl_WriteObj
-#define Tcl_WriteObj \
-	(tclStubsPtr->tcl_WriteObj) /* 339 */
-#endif
-#ifndef Tcl_GetString
-#define Tcl_GetString \
-	(tclStubsPtr->tcl_GetString) /* 340 */
-#endif
-#ifndef Tcl_GetDefaultEncodingDir
-#define Tcl_GetDefaultEncodingDir \
-	(tclStubsPtr->tcl_GetDefaultEncodingDir) /* 341 */
-#endif
-#ifndef Tcl_SetDefaultEncodingDir
-#define Tcl_SetDefaultEncodingDir \
-	(tclStubsPtr->tcl_SetDefaultEncodingDir) /* 342 */
-#endif
-#ifndef Tcl_AlertNotifier
-#define Tcl_AlertNotifier \
-	(tclStubsPtr->tcl_AlertNotifier) /* 343 */
-#endif
-#ifndef Tcl_ServiceModeHook
-#define Tcl_ServiceModeHook \
-	(tclStubsPtr->tcl_ServiceModeHook) /* 344 */
-#endif
-#ifndef Tcl_UniCharIsAlnum
-#define Tcl_UniCharIsAlnum \
-	(tclStubsPtr->tcl_UniCharIsAlnum) /* 345 */
-#endif
-#ifndef Tcl_UniCharIsAlpha
-#define Tcl_UniCharIsAlpha \
-	(tclStubsPtr->tcl_UniCharIsAlpha) /* 346 */
-#endif
-#ifndef Tcl_UniCharIsDigit
-#define Tcl_UniCharIsDigit \
-	(tclStubsPtr->tcl_UniCharIsDigit) /* 347 */
-#endif
-#ifndef Tcl_UniCharIsLower
-#define Tcl_UniCharIsLower \
-	(tclStubsPtr->tcl_UniCharIsLower) /* 348 */
-#endif
-#ifndef Tcl_UniCharIsSpace
-#define Tcl_UniCharIsSpace \
-	(tclStubsPtr->tcl_UniCharIsSpace) /* 349 */
-#endif
-#ifndef Tcl_UniCharIsUpper
-#define Tcl_UniCharIsUpper \
-	(tclStubsPtr->tcl_UniCharIsUpper) /* 350 */
-#endif
-#ifndef Tcl_UniCharIsWordChar
-#define Tcl_UniCharIsWordChar \
-	(tclStubsPtr->tcl_UniCharIsWordChar) /* 351 */
-#endif
-#ifndef Tcl_UniCharLen
-#define Tcl_UniCharLen \
-	(tclStubsPtr->tcl_UniCharLen) /* 352 */
-#endif
-#ifndef Tcl_UniCharNcmp
-#define Tcl_UniCharNcmp \
-	(tclStubsPtr->tcl_UniCharNcmp) /* 353 */
-#endif
-#ifndef Tcl_UniCharToUtfDString
-#define Tcl_UniCharToUtfDString \
-	(tclStubsPtr->tcl_UniCharToUtfDString) /* 354 */
-#endif
-#ifndef Tcl_UtfToUniCharDString
-#define Tcl_UtfToUniCharDString \
-	(tclStubsPtr->tcl_UtfToUniCharDString) /* 355 */
-#endif
-#ifndef Tcl_GetRegExpFromObj
-#define Tcl_GetRegExpFromObj \
-	(tclStubsPtr->tcl_GetRegExpFromObj) /* 356 */
-#endif
-#ifndef Tcl_EvalTokens
-#define Tcl_EvalTokens \
-	(tclStubsPtr->tcl_EvalTokens) /* 357 */
-#endif
-#ifndef Tcl_FreeParse
-#define Tcl_FreeParse \
-	(tclStubsPtr->tcl_FreeParse) /* 358 */
-#endif
-#ifndef Tcl_LogCommandInfo
-#define Tcl_LogCommandInfo \
-	(tclStubsPtr->tcl_LogCommandInfo) /* 359 */
-#endif
-#ifndef Tcl_ParseBraces
-#define Tcl_ParseBraces \
-	(tclStubsPtr->tcl_ParseBraces) /* 360 */
-#endif
-#ifndef Tcl_ParseCommand
-#define Tcl_ParseCommand \
-	(tclStubsPtr->tcl_ParseCommand) /* 361 */
-#endif
-#ifndef Tcl_ParseExpr
-#define Tcl_ParseExpr \
-	(tclStubsPtr->tcl_ParseExpr) /* 362 */
-#endif
-#ifndef Tcl_ParseQuotedString
-#define Tcl_ParseQuotedString \
-	(tclStubsPtr->tcl_ParseQuotedString) /* 363 */
-#endif
-#ifndef Tcl_ParseVarName
-#define Tcl_ParseVarName \
-	(tclStubsPtr->tcl_ParseVarName) /* 364 */
-#endif
-#ifndef Tcl_GetCwd
-#define Tcl_GetCwd \
-	(tclStubsPtr->tcl_GetCwd) /* 365 */
-#endif
-#ifndef Tcl_Chdir
-#define Tcl_Chdir \
-	(tclStubsPtr->tcl_Chdir) /* 366 */
-#endif
-
-#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
-
-/* !END!: Do not edit above this line. */
-
-#endif /* _TCLDECLS */
-
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
deleted file mode 100644
index 40ded74..0000000
--- a/generic/tclEncoding.c
+++ /dev/null
@@ -1,2685 +0,0 @@
-/*
- * tclEncoding.c --
- *
- *	Contains the implementation of the encoding conversion package.
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclEncoding.c,v 1.2 1999/04/16 00:46:45 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-typedef size_t (LengthProc)_ANSI_ARGS_((CONST char *src));
-
-/*
- * The following data structure represents an encoding, which describes how
- * to convert between various character sets and UTF-8.
- */
-
-typedef struct Encoding {
-    char *name;			/* Name of encoding.  Malloced because (1)
-				 * hash table entry that owns this encoding
-				 * may be freed prior to this encoding being
-				 * freed, (2) string passed in the
-				 * Tcl_EncodingType structure may not be
-				 * persistent. */
-    Tcl_EncodingConvertProc *toUtfProc;
-				/* Procedure to convert from external
-				 * encoding into UTF-8. */
-    Tcl_EncodingConvertProc *fromUtfProc;
-				/* Procedure to convert from UTF-8 into
-				 * external encoding. */
-    Tcl_EncodingFreeProc *freeProc;
-				/* If non-NULL, procedure to call when this
-				 * encoding is deleted. */
-    int nullSize;		/* Number of 0x00 bytes that signify
-				 * end-of-string in this encoding.  This
-				 * number is used to determine the source
-				 * string length when the srcLen argument is
-				 * negative.  This number can be 1 or 2. */
-    ClientData clientData;	/* Arbitrary value associated with encoding
-				 * type.  Passed to conversion procedures. */
-    LengthProc *lengthProc;	/* Function to compute length of
-				 * null-terminated strings in this encoding.
-				 * If nullSize is 1, this is strlen; if
-				 * nullSize is 2, this is a function that
-				 * returns the number of bytes in a 0x0000
-				 * terminated string. */
-    int refCount;		/* Number of uses of this structure. */
-    Tcl_HashEntry *hPtr;	/* Hash table entry that owns this encoding. */
-} Encoding;
-
-/*
- * The following structure is the clientData for a dynamically-loaded,
- * table-driven encoding created by LoadTableEncoding().  It maps between
- * Unicode and a single-byte, double-byte, or multibyte (1 or 2 bytes only)
- * encoding.
- */
-
-typedef struct TableEncodingData {
-    int fallback;		/* Character (in this encoding) to
-				 * substitute when this encoding cannot
-				 * represent a UTF-8 character. */
-    char prefixBytes[256];	/* If a byte in the input stream is a lead
-				 * byte for a 2-byte sequence, the
-				 * corresponding entry in this array is 1,
-				 * otherwise it is 0. */
-    unsigned short **toUnicode;	/* Two dimensional sparse matrix to map
-				 * characters from the encoding to Unicode.
-				 * Each element of the toUnicode array points
-				 * to an array of 256 shorts.  If there is no
-				 * corresponding character in Unicode, the
-				 * value in the matrix is 0x0000.  malloc'd. */
-    unsigned short **fromUnicode;
-				/* Two dimensional sparse matrix to map
-				 * characters from Unicode to the encoding.
-				 * Each element of the fromUnicode array
-				 * points to an array of 256 shorts.  If there
-				 * is no corresponding character the encoding,
-				 * the value in the matrix is 0x0000.
-				 * malloc'd. */
-} TableEncodingData;
-
-/*
- * The following structures is the clientData for a dynamically-loaded,
- * escape-driven encoding that is itself comprised of other simpler
- * encodings.  An example is "iso-2022-jp", which uses escape sequences to
- * switch between ascii, jis0208, jis0212, gb2312, and ksc5601.  Note that
- * "escape-driven" does not necessarily mean that the ESCAPE character is
- * the character used for switching character sets.
- */
-
-typedef struct EscapeSubTable {
-    unsigned int sequenceLen;	/* Length of following string. */
-    char sequence[16];		/* Escape code that marks this encoding. */
-    char name[32];		/* Name for encoding. */
-    Encoding *encodingPtr;	/* Encoding loaded using above name, or NULL
-				 * if this sub-encoding has not been needed
-				 * yet. */
-} EscapeSubTable;
-
-typedef struct EscapeEncodingData {
-    int fallback;		/* Character (in this encoding) to
-				 * substitute when this encoding cannot
-				 * represent a UTF-8 character. */
-    unsigned int initLen;	/* Length of following string. */
-    char init[16];		/* String to emit or expect before first char
-				 * in conversion. */
-    unsigned int finalLen;	/* Length of following string. */
-    char final[16];		/* String to emit or expect after last char
-				 * in conversion. */
-    char prefixBytes[256];	/* If a byte in the input stream is the 
-				 * first character of one of the escape 
-				 * sequences in the following array, the 
-				 * corresponding entry in this array is 1,
-				 * otherwise it is 0. */
-    int numSubTables;		/* Length of following array. */
-    EscapeSubTable subTables[1];/* Information about each EscapeSubTable
-				 * used by this encoding type.  The actual 
-				 * size will be as large as necessary to 
-				 * hold all EscapeSubTables. */
-} EscapeEncodingData;
-
-/*
- * Constants used when loading an encoding file to identify the type of the
- * file.
- */
-
-#define ENCODING_SINGLEBYTE	0
-#define ENCODING_DOUBLEBYTE	1
-#define ENCODING_MULTIBYTE	2
-#define ENCODING_ESCAPE		3
-
-/*
- * Initialize the default encoding directory.  If this variable contains
- * a non NULL value, it will be the first path used to locate the
- * system encoding files.
- */
-
-char *tclDefaultEncodingDir = NULL;
-
-/*
- * Hash table that keeps track of all loaded Encodings.  Keys are
- * the string names that represent the encoding, values are (Encoding *).
- */
- 
-static Tcl_HashTable encodingTable;
-TCL_DECLARE_MUTEX(encodingMutex)
-
-/*
- * The following are used to hold the default and current system encodings.  
- * If NULL is passed to one of the conversion routines, the current setting 
- * of the system encoding will be used to perform the conversion.
- */
-
-static Tcl_Encoding defaultEncoding;
-static Tcl_Encoding systemEncoding;
-
-/*
- * The following variable is used in the sparse matrix code for a
- * TableEncoding to represent a page in the table that has no entries.
- */
-
-static unsigned short emptyPage[256];
-
-/*
- * Procedures used only in this module.
- */
-
-static int		BinaryProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static void		EscapeFreeProc _ANSI_ARGS_((ClientData clientData));
-static int		EscapeFromUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static int		EscapeToUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static void		FreeEncoding _ANSI_ARGS_((Tcl_Encoding encoding));
-static Encoding *	GetTableEncoding _ANSI_ARGS_((
-			    EscapeEncodingData *dataPtr, int state));
-static Tcl_Encoding	LoadEncodingFile _ANSI_ARGS_((Tcl_Interp *interp,
-			    CONST char *name));
-static Tcl_Encoding	LoadTableEncoding _ANSI_ARGS_((Tcl_Interp *interp,
-			    CONST char *name, int type, Tcl_Channel chan));
-static Tcl_Encoding	LoadEscapeEncoding _ANSI_ARGS_((CONST char *name, 
-			    Tcl_Channel chan));
-static Tcl_Channel	OpenEncodingFile _ANSI_ARGS_((CONST char *dir,
-			    CONST char *name));
-static void		TableFreeProc _ANSI_ARGS_((ClientData clientData));
-static int		TableFromUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static int		TableToUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static size_t		unilen _ANSI_ARGS_((CONST char *src));
-static int		UnicodeToUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static int		UtfToUnicodeProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static int		UtfToUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst, int dstLen,
-			    int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclInitEncodingSubsystem --
- *
- *	Initialize all resources used by this subsystem on a per-process
- *	basis.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on the memory, object, and IO subsystems.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclInitEncodingSubsystem()
-{
-    Tcl_EncodingType type;
-
-    Tcl_MutexLock(&encodingMutex);
-    Tcl_InitHashTable(&encodingTable, TCL_STRING_KEYS);
-    Tcl_MutexUnlock(&encodingMutex);
-    
-    /*
-     * Create a few initial encodings.  Note that the UTF-8 to UTF-8 
-     * translation is not a no-op, because it will turn a stream of
-     * improperly formed UTF-8 into a properly formed stream.
-     */
-
-    type.encodingName	= "identity";
-    type.toUtfProc	= BinaryProc;
-    type.fromUtfProc	= BinaryProc;
-    type.freeProc	= NULL;
-    type.nullSize	= 1;
-    type.clientData	= NULL;
-
-    defaultEncoding	= Tcl_CreateEncoding(&type);
-    systemEncoding	= Tcl_GetEncoding(NULL, type.encodingName);
-
-    type.encodingName	= "utf-8";
-    type.toUtfProc	= UtfToUtfProc;
-    type.fromUtfProc    = UtfToUtfProc;
-    type.freeProc	= NULL;
-    type.nullSize	= 1;
-    type.clientData	= NULL;
-    Tcl_CreateEncoding(&type);
-
-    type.encodingName   = "unicode";
-    type.toUtfProc	= UnicodeToUtfProc;
-    type.fromUtfProc    = UtfToUnicodeProc;
-    type.freeProc	= NULL;
-    type.nullSize	= 2;
-    type.clientData	= NULL;
-    Tcl_CreateEncoding(&type);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeEncodingSubsystem --
- *
- *	Release the state associated with the encoding subsystem.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees all of the encodings.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeEncodingSubsystem()
-{
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hPtr;
-    Encoding *encodingPtr;
-
-    Tcl_MutexLock(&encodingMutex);
-    hPtr = Tcl_FirstHashEntry(&encodingTable, &search);
-    while (hPtr != NULL) {
-	encodingPtr = (Encoding *) Tcl_GetHashValue(hPtr);
-	if (encodingPtr->freeProc != NULL) {
-	    (*encodingPtr->freeProc)(encodingPtr->clientData);
-	}
-	ckfree((char *) encodingPtr->name);
-	ckfree((char *) encodingPtr);
-	hPtr = Tcl_NextHashEntry(&search);
-    }
-    Tcl_DeleteHashTable(&encodingTable);
-    Tcl_MutexUnlock(&encodingMutex);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_GetDefaultEncodingDir --
- *
- *
- * Results:
- *
- * Side effects:
- *
- *-------------------------------------------------------------------------
- */
-
-char *
-Tcl_GetDefaultEncodingDir()
-{
-    return tclDefaultEncodingDir;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_SetDefaultEncodingDir --
- *
- *
- * Results:
- *
- * Side effects:
- *
- *-------------------------------------------------------------------------
- */
-
-void
-Tcl_SetDefaultEncodingDir(path)
-    char *path;
-{
-    tclDefaultEncodingDir = (char *)ckalloc((unsigned) strlen(path) + 1);
-    strcpy(tclDefaultEncodingDir, path);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_GetEncoding --
- *
- *	Given the name of a encoding, find the corresponding Tcl_Encoding
- *	token.  If the encoding did not already exist, Tcl attempts to
- *	dynamically load an encoding by that name.
- *
- * Results:
- *	Returns a token that represents the encoding.  If the name didn't
- *	refer to any known or loadable encoding, NULL is returned.  If
- *	NULL was returned, an error message is left in interp's result
- *	object, unless interp was NULL.
- *
- * Side effects:
- *	The new encoding type is entered into a table visible to all
- *	interpreters, keyed off the encoding's name.  For each call to
- *	this procedure, there should eventually be a call to
- *	Tcl_FreeEncoding, so that the database can be cleaned up when
- *	encodings aren't needed anymore.
- *
- *-------------------------------------------------------------------------
- */
-
-Tcl_Encoding
-Tcl_GetEncoding(interp, name)
-    Tcl_Interp *interp;		/* Interp for error reporting, if not NULL. */
-    CONST char *name;		/* The name of the desired encoding. */
-{
-    Tcl_HashEntry *hPtr;
-    Encoding *encodingPtr;
-
-    Tcl_MutexLock(&encodingMutex);
-    if (name == NULL) {
-	encodingPtr = (Encoding *) systemEncoding;
-	encodingPtr->refCount++;
-	Tcl_MutexUnlock(&encodingMutex);
-	return systemEncoding;
-    }
-
-    hPtr = Tcl_FindHashEntry(&encodingTable, name);
-    if (hPtr != NULL) {
-	encodingPtr = (Encoding *) Tcl_GetHashValue(hPtr);
-	encodingPtr->refCount++;
-	Tcl_MutexUnlock(&encodingMutex);
-	return (Tcl_Encoding) encodingPtr;
-    }
-    Tcl_MutexUnlock(&encodingMutex);
-    return LoadEncodingFile(interp, name);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_FreeEncoding --
- *
- *	This procedure is called to release an encoding allocated by
- *	Tcl_CreateEncoding() or Tcl_GetEncoding().
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The reference count associated with the encoding is decremented
- *	and the encoding may be deleted if nothing is using it anymore.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-Tcl_FreeEncoding(encoding)
-    Tcl_Encoding encoding;
-{
-    Tcl_MutexLock(&encodingMutex);
-    FreeEncoding(encoding);
-    Tcl_MutexUnlock(&encodingMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeEncoding --
- *
- *	This procedure is called to release an encoding by procedures
- *	that already have the encodingMutex.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The reference count associated with the encoding is decremented
- *	and the encoding may be deleted if nothing is using it anymore.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeEncoding(encoding)
-    Tcl_Encoding encoding;
-{
-    Encoding *encodingPtr;
-    
-    encodingPtr = (Encoding *) encoding;
-    if (encodingPtr == NULL) {
-	return;
-    }
-    encodingPtr->refCount--;
-    if (encodingPtr->refCount == 0) {
-	if (encodingPtr->freeProc != NULL) {
-	    (*encodingPtr->freeProc)(encodingPtr->clientData);
-	}
-	if (encodingPtr->hPtr != NULL) {
-	    Tcl_DeleteHashEntry(encodingPtr->hPtr);
-	}
-	ckfree((char *) encodingPtr->name);
-	ckfree((char *) encodingPtr);
-    }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_GetEncodingName --
- *
- *	Given an encoding, return the name that was used to constuct
- *	the encoding.
- *
- * Results:
- *	The name of the encoding.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-Tcl_GetEncodingName(encoding)
-    Tcl_Encoding encoding;	/* The encoding whose name to fetch. */
-{
-    Encoding *encodingPtr;
-
-    if (encoding == NULL) {
-	encoding = systemEncoding;
-    }
-    encodingPtr = (Encoding *) encoding;
-    return encodingPtr->name;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_GetEncodingNames --
- *
- *	Get the list of all known encodings, including the ones stored
- *	as files on disk in the encoding path.
- *
- * Results:
- *	Modifies interp's result object to hold a list of all the available
- *	encodings.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-Tcl_GetEncodingNames(interp)
-    Tcl_Interp *interp;		/* Interp to hold result. */
-{
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hPtr;
-    Tcl_Obj *pathPtr, *resultPtr;
-    int dummy;
-
-    Tcl_HashTable table;
-
-    Tcl_MutexLock(&encodingMutex);
-    Tcl_InitHashTable(&table, TCL_STRING_KEYS);
-    hPtr = Tcl_FirstHashEntry(&encodingTable, &search);
-    while (hPtr != NULL) {
-	Encoding *encodingPtr;
-	
-	encodingPtr = (Encoding *) Tcl_GetHashValue(hPtr);
-	Tcl_CreateHashEntry(&table, encodingPtr->name, &dummy);
-	hPtr = Tcl_NextHashEntry(&search);
-    }
-    Tcl_MutexUnlock(&encodingMutex);
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr != NULL) {
-	int i, objc;
-	Tcl_Obj **objv;
-	Tcl_DString pwdString;
-	char globArgString[10];
-
-	objc = 0;
-	Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-
-	Tcl_GetCwd(interp, &pwdString);
-
-	for (i = 0; i < objc; i++) {
-	    char *string;
-	    int j, objc2, length;
-	    Tcl_Obj **objv2;
-
-	    string = Tcl_GetStringFromObj(objv[i], NULL);
-	    Tcl_ResetResult(interp);
-
-	    /*
-	     * TclGlob() changes the contents of globArgString, which causes
-	     * a segfault if we pass in a pointer to non-writeable memory.
-	     * TclGlob() puts its results directly into interp.
-	     */
-
-	    strcpy(globArgString, "*.enc");
-	    if ((Tcl_Chdir(string) == 0)
-		    && (Tcl_Chdir("encoding") == 0)
-		    && (TclGlob(interp, globArgString, 0) == TCL_OK)) {
-		objc2 = 0;
-
-		Tcl_ListObjGetElements(NULL, Tcl_GetObjResult(interp), &objc2,
-			&objv2);
-
-		for (j = 0; j < objc2; j++) {
-		    string = Tcl_GetStringFromObj(objv2[j], &length);
-		    length -= 4;
-		    if (length > 0) {
-			string[length] = '\0';
-			Tcl_CreateHashEntry(&table, string, &dummy);
-			string[length] = '.';
-		    }
-		}
-	    }
-	    Tcl_Chdir(Tcl_DStringValue(&pwdString));
-	}
-	Tcl_DStringFree(&pwdString);
-    }
-
-    /*
-     * Clear any values placed in the result by globbing.
-     */
-
-    Tcl_ResetResult(interp);
-    resultPtr = Tcl_GetObjResult(interp);
-
-    hPtr = Tcl_FirstHashEntry(&table, &search);
-    while (hPtr != NULL) {
-	Tcl_Obj *strPtr;
-
-	strPtr = Tcl_NewStringObj(Tcl_GetHashKey(&table, hPtr), -1);
-	Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
-	hPtr = Tcl_NextHashEntry(&search);
-    }
-    Tcl_DeleteHashTable(&table);
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * Tcl_SetSystemEncoding --
- *
- *	Sets the default encoding that should be used whenever the user
- *	passes a NULL value in to one of the conversion routines.
- *	If the supplied name is NULL, the system encoding is reset to the
- *	default system encoding.
- *
- * Results:
- *	The return value is TCL_OK if the system encoding was successfully
- *	set to the encoding specified by name, TCL_ERROR otherwise.  If
- *	TCL_ERROR is returned, an error message is left in interp's result
- *	object, unless interp was NULL.
- *
- * Side effects:
- *	The reference count of the new system encoding is incremented.
- *	The reference count of the old system encoding is decremented and 
- *	it may be freed.  
- *
- *------------------------------------------------------------------------
- */
-
-int
-Tcl_SetSystemEncoding(interp, name)
-    Tcl_Interp *interp;		/* Interp for error reporting, if not NULL. */
-    CONST char *name;		/* The name of the desired encoding, or NULL
-				 * to reset to default encoding. */
-{
-    Tcl_Encoding encoding;
-    Encoding *encodingPtr;
-
-    if (name == NULL) {
-	Tcl_MutexLock(&encodingMutex);
-	encoding = defaultEncoding;
-	encodingPtr = (Encoding *) encoding;
-	encodingPtr->refCount++;
-	Tcl_MutexUnlock(&encodingMutex);
-    } else {
-	encoding = Tcl_GetEncoding(interp, name);
-	if (encoding == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-
-    Tcl_MutexLock(&encodingMutex);
-    FreeEncoding(systemEncoding);
-    systemEncoding = encoding;
-    Tcl_MutexUnlock(&encodingMutex);
-
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_CreateEncoding --
- *
- *	This procedure is called to define a new encoding and the procedures
- *	that are used to convert between the specified encoding and Unicode.  
- *
- * Results:
- *	Returns a token that represents the encoding.  If an encoding with
- *	the same name already existed, the old encoding token remains
- *	valid and continues to behave as it used to, and will eventually
- *	be garbage collected when the last reference to it goes away.  Any
- *	subsequent calls to Tcl_GetEncoding with the specified name will
- *	retrieve the most recent encoding token.
- *
- * Side effects:
- *	The new encoding type is entered into a table visible to all
- *	interpreters, keyed off the encoding's name.  For each call to
- *	this procedure, there should eventually be a call to
- *	Tcl_FreeEncoding, so that the database can be cleaned up when
- *	encodings aren't needed anymore.
- *
- *---------------------------------------------------------------------------
- */ 
-
-Tcl_Encoding
-Tcl_CreateEncoding(typePtr)
-    Tcl_EncodingType *typePtr;	/* The encoding type. */
-{
-    Tcl_HashEntry *hPtr;
-    int new;
-    Encoding *encodingPtr;
-    char *name;
-
-    Tcl_MutexLock(&encodingMutex);
-    hPtr = Tcl_CreateHashEntry(&encodingTable, typePtr->encodingName, &new);
-    if (new == 0) {
-	/*
-	 * Remove old encoding from hash table, but don't delete it until
-	 * last reference goes away.
-	 */
-	 
-	encodingPtr = (Encoding *) Tcl_GetHashValue(hPtr);
-	encodingPtr->hPtr = NULL;
-    }
-
-    name = ckalloc((unsigned) strlen(typePtr->encodingName) + 1);
-    
-    encodingPtr = (Encoding *) ckalloc(sizeof(Encoding));
-    encodingPtr->name		= strcpy(name, typePtr->encodingName);
-    encodingPtr->toUtfProc	= typePtr->toUtfProc;
-    encodingPtr->fromUtfProc	= typePtr->fromUtfProc;
-    encodingPtr->freeProc	= typePtr->freeProc;
-    encodingPtr->nullSize	= typePtr->nullSize;
-    encodingPtr->clientData	= typePtr->clientData;
-    if (typePtr->nullSize == 1) {
-	encodingPtr->lengthProc = strlen;
-    } else {
-	encodingPtr->lengthProc = unilen;
-    }
-    encodingPtr->refCount	= 1;
-    encodingPtr->hPtr		= hPtr;
-    Tcl_SetHashValue(hPtr, encodingPtr);
-
-    Tcl_MutexUnlock(&encodingMutex);
-
-    return (Tcl_Encoding) encodingPtr;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_ExternalToUtfDString --
- *
- *	Convert a source buffer from the specified encoding into UTF-8.
- *	If any of the bytes in the source buffer are invalid or cannot
- *	be represented in the target encoding, a default fallback
- *	character will be substituted.
- *
- * Results:
- *	The converted bytes are stored in the DString, which is then NULL
- *	terminated.  The return value is a pointer to the value stored 
- *	in the DString.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-char * 
-Tcl_ExternalToUtfDString(encoding, src, srcLen, dstPtr)
-    Tcl_Encoding encoding;	/* The encoding for the source string, or
-				 * NULL for the default system encoding. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes, or < 0 for
-				 * encoding-specific string length. */
-    Tcl_DString *dstPtr;	/* Uninitialized or free DString in which 
-				 * the converted string is stored. */
-{
-    char *dst;
-    Tcl_EncodingState state;
-    Encoding *encodingPtr;
-    int flags, dstLen, result, soFar, srcRead, dstWrote, dstChars;
-
-    Tcl_DStringInit(dstPtr);
-    dst = Tcl_DStringValue(dstPtr);
-    dstLen = dstPtr->spaceAvl - 1;
-    
-    if (encoding == NULL) {
-	encoding = systemEncoding;
-    }
-    encodingPtr = (Encoding *) encoding;
-
-    if (src == NULL) {
-	srcLen = 0;
-    } else if (srcLen < 0) {
-	srcLen = (*encodingPtr->lengthProc)(src);
-    }
-    flags = TCL_ENCODING_START | TCL_ENCODING_END;
-    while (1) {
-	result = (*encodingPtr->toUtfProc)(encodingPtr->clientData, src,
-		srcLen, flags, &state, dst, dstLen, &srcRead, &dstWrote,
-		&dstChars);
-	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
-	if (result != TCL_CONVERT_NOSPACE) {
-	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return Tcl_DStringValue(dstPtr);
-	}
-	flags &= ~TCL_ENCODING_START;
-	src += srcRead;
-	srcLen -= srcRead;
-	if (Tcl_DStringLength(dstPtr) == 0) {
-	    Tcl_DStringSetLength(dstPtr, dstLen);
-	}
-	Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
-	dst = Tcl_DStringValue(dstPtr) + soFar;
-	dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
-    }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_ExternalToUtf --
- *
- *	Convert a source buffer from the specified encoding into UTF-8,
- *
- * Results:
- *	The return value is one of TCL_OK, TCL_CONVERT_MULTIBYTE,
- *	TCL_CONVERT_SYNTAX, TCL_CONVERT_UNKNOWN, or TCL_CONVERT_NOSPACE,
- *	as documented in tcl.h.
- *
- * Side effects:
- *	The converted bytes are stored in the output buffer.  
- *
- *-------------------------------------------------------------------------
- */
-
-int
-Tcl_ExternalToUtf(interp, encoding, src, srcLen, flags, statePtr, dst,
-	dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr)
-    Tcl_Interp *interp;		/* Interp for error return, if not NULL. */
-    Tcl_Encoding encoding;	/* The encoding for the source string, or
-				 * NULL for the default system encoding. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes, or < 0 for
-				 * encoding-specific string length. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    Encoding *encodingPtr;
-    int result, srcRead, dstWrote, dstChars;
-    Tcl_EncodingState state;
-    
-    if (encoding == NULL) {
-	encoding = systemEncoding;
-    }
-    encodingPtr = (Encoding *) encoding;
-
-    if (src == NULL) {
-	srcLen = 0;
-    } else if (srcLen < 0) {
-	srcLen = (*encodingPtr->lengthProc)(src);
-    }
-    if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
-	statePtr = &state;
-    }
-    if (srcReadPtr == NULL) {
-	srcReadPtr = &srcRead;
-    }
-    if (dstWrotePtr == NULL) {
-	dstWrotePtr = &dstWrote;
-    }
-    if (dstCharsPtr == NULL) {
-	dstCharsPtr = &dstChars;
-    }
-
-    /*
-     * If there are any null characters in the middle of the buffer, they will
-     * converted to the UTF-8 null character (\xC080).  To get the actual 
-     * \0 at the end of the destination buffer, we need to append it manually.
-     */
-
-    dstLen--;
-    result = (*encodingPtr->toUtfProc)(encodingPtr->clientData, src, srcLen,
-	    flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr,
-	    dstCharsPtr);
-    dst[*dstWrotePtr] = '\0';
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_UtfToExternalDString --
- *
- *	Convert a source buffer from UTF-8 into the specified encoding.
- *	If any of the bytes in the source buffer are invalid or cannot
- *	be represented in the target encoding, a default fallback
- *	character will be substituted.
- *
- * Results:
- *	The converted bytes are stored in the DString, which is then
- *	NULL terminated in an encoding-specific manner.  The return value 
- *	is a pointer to the value stored in the DString.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-char *
-Tcl_UtfToExternalDString(encoding, src, srcLen, dstPtr)
-    Tcl_Encoding encoding;	/* The encoding for the converted string,
-				 * or NULL for the default system encoding. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes, or < 0 for
-				 * strlen(). */
-    Tcl_DString *dstPtr;	/* Uninitialized or free DString in which 
-				 * the converted string is stored. */
-{
-    char *dst;
-    Tcl_EncodingState state;
-    Encoding *encodingPtr;
-    int flags, dstLen, result, soFar, srcRead, dstWrote, dstChars;
-    
-    Tcl_DStringInit(dstPtr);
-    dst = Tcl_DStringValue(dstPtr);
-    dstLen = dstPtr->spaceAvl - 1;
-
-    if (encoding == NULL) {
-	encoding = systemEncoding;
-    }
-    encodingPtr = (Encoding *) encoding;
-
-    if (src == NULL) {
-	srcLen = 0;
-    } else if (srcLen < 0) {
-	srcLen = strlen(src);
-    }
-    flags = TCL_ENCODING_START | TCL_ENCODING_END;
-    while (1) {
-	result = (*encodingPtr->fromUtfProc)(encodingPtr->clientData, src,
-		srcLen, flags, &state, dst, dstLen, &srcRead, &dstWrote,
-		&dstChars);
-	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);
-	if (result != TCL_CONVERT_NOSPACE) {
-	    if (encodingPtr->nullSize == 2) {
-	        Tcl_DStringSetLength(dstPtr, soFar + 1);
-	    }
-	    Tcl_DStringSetLength(dstPtr, soFar);
-	    return Tcl_DStringValue(dstPtr);
-	}
-	flags &= ~TCL_ENCODING_START;
-	src += srcRead;
-	srcLen -= srcRead;
-	if (Tcl_DStringLength(dstPtr) == 0) {
-	    Tcl_DStringSetLength(dstPtr, dstLen);
-	}
-	Tcl_DStringSetLength(dstPtr, 2 * Tcl_DStringLength(dstPtr) + 1);
-	dst = Tcl_DStringValue(dstPtr) + soFar;
-	dstLen = Tcl_DStringLength(dstPtr) - soFar - 1;
-    }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * Tcl_UtfToExternal --
- *
- *	Convert a buffer from UTF-8 into the specified encoding.
- *
- * Results:
- *	The return value is one of TCL_OK, TCL_CONVERT_MULTIBYTE,
- *	TCL_CONVERT_SYNTAX, TCL_CONVERT_UNKNOWN, or TCL_CONVERT_NOSPACE,
- *	as documented in tcl.h.
- *
- * Side effects:
- *	The converted bytes are stored in the output buffer.  
- *
- *-------------------------------------------------------------------------
- */
-
-int
-Tcl_UtfToExternal(interp, encoding, src, srcLen, flags, statePtr, dst,
-	dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr)
-    Tcl_Interp *interp;		/* Interp for error return, if not NULL. */
-    Tcl_Encoding encoding;	/* The encoding for the converted string,
-				 * or NULL for the default system encoding. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes, or < 0 for
-				 * strlen(). */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    Encoding *encodingPtr;
-    int result, srcRead, dstWrote, dstChars;
-    Tcl_EncodingState state;
-    
-    if (encoding == NULL) {
-	encoding = systemEncoding;
-    }
-    encodingPtr = (Encoding *) encoding;
-
-    if (src == NULL) {
-	srcLen = 0;
-    } else if (srcLen < 0) {
-	srcLen = strlen(src);
-    }
-    if (statePtr == NULL) {
-	flags |= TCL_ENCODING_START | TCL_ENCODING_END;
-	statePtr = &state;
-    }
-    if (srcReadPtr == NULL) {
-	srcReadPtr = &srcRead;
-    }
-    if (dstWrotePtr == NULL) {
-	dstWrotePtr = &dstWrote;
-    }
-    if (dstCharsPtr == NULL) {
-	dstCharsPtr = &dstChars;
-    }
-
-    dstLen -= encodingPtr->nullSize;
-    result = (*encodingPtr->fromUtfProc)(encodingPtr->clientData, src, srcLen,
-	    flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr,
-	    dstCharsPtr);
-    if (encodingPtr->nullSize == 2) {
-	dst[*dstWrotePtr + 1] = '\0';
-    }
-    dst[*dstWrotePtr] = '\0';
-    
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_FindExecutable --
- *
- *	This procedure computes the absolute path name of the current
- *	application, given its argv[0] value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The variable tclExecutableName gets filled in with the file
- *	name for the application, if we figured it out.  If we couldn't
- *	figure it out, tclExecutableName is set to NULL.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-Tcl_FindExecutable(argv0)
-    CONST char *argv0;		/* The value of the application's argv[0]
-				 * (native). */
-{
-    CONST char *name;
-    Tcl_DString buffer, nameString;
-
-    TclInitSubsystems(argv0);
-
-    if (argv0 == NULL) {
-	goto done;
-    }
-    if (tclExecutableName != NULL) {
-	ckfree(tclExecutableName);
-	tclExecutableName = NULL;
-    }
-    if ((name = TclpFindExecutable(argv0)) == NULL) {
-	goto done;
-    }
-
-    /*
-     * The value returned from TclpNameOfExecutable is a UTF string that
-     * is possibly dirty depending on when it was initialized.  To assure
-     * that the UTF string is a properly encoded native string for this
-     * system, convert the UTF string to the default native encoding
-     * before the default encoding is initialized.  Then, convert it back
-     * to UTF after the system encoding is loaded.
-     */
-    
-    Tcl_UtfToExternalDString(NULL, name, -1, &buffer);
-    TclFindEncodings(argv0);
-
-    /*
-     * Now it is OK to convert the native string back to UTF and set
-     * the value of the tclExecutableName.
-     */
-    
-    Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&buffer), -1, &nameString);
-    tclExecutableName = (char *)
-	ckalloc((unsigned) (Tcl_DStringLength(&nameString) + 1));
-    strcpy(tclExecutableName, Tcl_DStringValue(&nameString));
-
-    Tcl_DStringFree(&buffer);
-    Tcl_DStringFree(&nameString);
-    return;
-	
-    done:
-    TclFindEncodings(argv0);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * LoadEncodingFile --
- *
- *	Read a file that describes an encoding and create a new Encoding
- *	from the data.  
- *
- * Results:
- *	The return value is the newly loaded Encoding, or NULL if
- *	the file didn't exist of was in the incorrect format.  If NULL was
- *	returned, an error message is left in interp's result object,
- *	unless interp was NULL.
- *
- * Side effects:
- *	File read from disk.  
- *
- *---------------------------------------------------------------------------
- */
-
-static Tcl_Encoding
-LoadEncodingFile(interp, name)
-    Tcl_Interp *interp;		/* Interp for error reporting, if not NULL. */
-    CONST char *name;		/* The name of the encoding file on disk
-				 * and also the name for new encoding. */
-{
-    int objc, i, ch;
-    Tcl_Obj **objv;
-    Tcl_Obj *pathPtr;
-    Tcl_Channel chan;
-    Tcl_Encoding encoding;
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr == NULL) {
-	goto unknown;
-    }
-    objc = 0;
-    Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-
-    chan = NULL;
-    for (i = 0; i < objc; i++) {
-	chan = OpenEncodingFile(Tcl_GetString(objv[i]), name);
-	if (chan != NULL) {
-	    break;
-	}
-    }
-
-    if (chan == NULL) {
-	goto unknown;
-    }
-
-    Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
-
-    while (1) {
-	Tcl_DString ds;
-
-	Tcl_DStringInit(&ds);
-	Tcl_Gets(chan, &ds);
-	ch = Tcl_DStringValue(&ds)[0];
-	Tcl_DStringFree(&ds);
-	if (ch != '#') {
-	    break;
-	}
-    }
-
-    encoding = NULL;
-    switch (ch) {
-	case 'S': {
-	    encoding = LoadTableEncoding(interp, name, ENCODING_SINGLEBYTE,
-		    chan);
-	    break;
-	}
-	case 'D': {
-	    encoding = LoadTableEncoding(interp, name, ENCODING_DOUBLEBYTE,
-		    chan);
-	    break;
-	}
-	case 'M': {
-	    encoding = LoadTableEncoding(interp, name, ENCODING_MULTIBYTE,
-		    chan);
-	    break;
-	}
-	case 'E': {
-	    encoding = LoadEscapeEncoding(name, chan);
-	    break;
-	}
-    }
-    if ((encoding == NULL) && (interp != NULL)) {
-	Tcl_AppendResult(interp, "invalid encoding file \"", name, "\"", NULL);
-    }
-    Tcl_Close(NULL, chan);
-    return encoding;
-
-    unknown:
-    if (interp != NULL) {
-	Tcl_AppendResult(interp, "unknown encoding \"", name, "\"", NULL);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OpenEncodingFile --
- *
- *	Look for the file encoding/<name>.enc in the specified
- *	directory.
- *
- * Results:
- *	Returns an open file channel if the file exists.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_Channel
-OpenEncodingFile(dir, name)
-    CONST char *dir;
-    CONST char *name;
-
-{
-    char *argv[3];
-    Tcl_DString pathString;
-    char *path;
-    Tcl_Channel chan;
-    
-    argv[0] = (char *) dir;
-    argv[1] = "encoding";
-    argv[2] = (char *) name;
-
-    Tcl_DStringInit(&pathString);
-    Tcl_JoinPath(3, argv, &pathString);
-    path = Tcl_DStringAppend(&pathString, ".enc", -1);
-    chan = Tcl_OpenFileChannel(NULL, path, "r", 0);
-    Tcl_DStringFree(&pathString);
-
-    return chan;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * LoadTableEncoding --
- *
- *	Helper function for LoadEncodingTable().  Loads a table to that 
- *	converts between Unicode and some other encoding and creates an 
- *	encoding (using a TableEncoding structure) from that information.
- *
- *	File contains binary data, but begins with a marker to indicate 
- *	byte-ordering, so that same binary file can be read on either
- *	endian platforms.
- *
- * Results:
- *	The return value is the new encoding, or NULL if the encoding 
- *	could not be created (because the file contained invalid data).
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static Tcl_Encoding
-LoadTableEncoding(interp, name, type, chan)
-    Tcl_Interp *interp;		/* Interp for temporary obj while reading. */
-    CONST char *name;		/* Name for new encoding. */
-    int type;			/* Type of encoding (ENCODING_?????). */
-    Tcl_Channel chan;		/* File containing new encoding. */
-{
-    Tcl_DString lineString;
-    Tcl_Obj *objPtr;
-    char *line;
-    int i, hi, lo, numPages, symbol, fallback;
-    unsigned char used[256];
-    unsigned int size;
-    TableEncodingData *dataPtr;
-    unsigned short *pageMemPtr;
-    Tcl_EncodingType encType;
-    char *hex;
-    static char staticHex[] = {
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0,
-	10, 11, 12, 13, 14, 15
-    };
-
-    hex = staticHex - '0';
-
-    Tcl_DStringInit(&lineString);
-    Tcl_Gets(chan, &lineString);
-    line = Tcl_DStringValue(&lineString);
-
-    fallback = (int) strtol(line, &line, 16);
-    symbol = (int) strtol(line, &line, 10);
-    numPages = (int) strtol(line, &line, 10);
-    Tcl_DStringFree(&lineString);
-
-    if (numPages < 0) {
-	numPages = 0;
-    } else if (numPages > 256) {
-	numPages = 256;
-    }
-
-    memset(used, 0, sizeof(used));
-
-#undef PAGESIZE
-#define PAGESIZE    (256 * sizeof(unsigned short))
-
-    dataPtr = (TableEncodingData *) ckalloc(sizeof(TableEncodingData));
-    memset(dataPtr, 0, sizeof(TableEncodingData));
-
-    dataPtr->fallback = fallback;
-
-    /*
-     * Read the table that maps characters to Unicode.  Performs a single
-     * malloc to get the memory for the array and all the pages needed by
-     * the array.
-     */
-
-    size = 256 * sizeof(unsigned short *) + numPages * PAGESIZE;
-    dataPtr->toUnicode = (unsigned short **) ckalloc(size);
-    memset(dataPtr->toUnicode, 0, size);
-    pageMemPtr = (unsigned short *) (dataPtr->toUnicode + 256);
-
-    if (interp == NULL) {
-	objPtr = Tcl_NewObj();
-    } else {
-	objPtr = Tcl_GetObjResult(interp);
-    }
-    for (i = 0; i < numPages; i++) {
-	int ch;
-	char *p;
-
-	Tcl_ReadChars(chan, objPtr, 3 + 16 * (16 * 4 + 1), 0);
-	p = Tcl_GetString(objPtr);
-	hi = (hex[(int)p[0]] << 4) + hex[(int)p[1]];
-	dataPtr->toUnicode[hi] = pageMemPtr;
-	p += 2;
-	for (lo = 0; lo < 256; lo++) {
-	    if ((lo & 0x0f) == 0) {
-		p++;
-	    }
-	    ch = (hex[(int)p[0]] << 12) + (hex[(int)p[1]] << 8)
-		+ (hex[(int)p[2]] << 4) + hex[(int)p[3]];
-	    if (ch != 0) {
-		used[ch >> 8] = 1;
-	    }
-	    *pageMemPtr = (unsigned short) ch;
-	    pageMemPtr++;
-	    p += 4;
-	}
-    }
-    if (interp == NULL) {
-	Tcl_DecrRefCount(objPtr);
-    } else {
-	Tcl_ResetResult(interp);
-    }
-	
-    if (type == ENCODING_DOUBLEBYTE) {
-	memset(dataPtr->prefixBytes, 1, sizeof(dataPtr->prefixBytes));
-    } else {
-	for (hi = 1; hi < 256; hi++) {
-	    if (dataPtr->toUnicode[hi] != NULL) {
-		dataPtr->prefixBytes[hi] = 1;
-	    }
-	}
-    }
-
-    /*
-     * Invert toUnicode array to produce the fromUnicode array.  Performs a
-     * single malloc to get the memory for the array and all the pages
-     * needed by the array.  While reading in the toUnicode array, we
-     * remembered what pages that would be needed for the fromUnicode array.
-     */
-
-    if (symbol) {
-	used[0] = 1;
-    }
-    numPages = 0;
-    for (hi = 0; hi < 256; hi++) {
-	if (used[hi]) {
-	    numPages++;
-	}
-    }
-    size = 256 * sizeof(unsigned short *) + numPages * PAGESIZE;
-    dataPtr->fromUnicode = (unsigned short **) ckalloc(size);
-    memset(dataPtr->fromUnicode, 0, size);
-    pageMemPtr = (unsigned short *) (dataPtr->fromUnicode + 256);
-
-    for (hi = 0; hi < 256; hi++) {
-	if (dataPtr->toUnicode[hi] == NULL) {
-	    dataPtr->toUnicode[hi] = emptyPage;
-	} else {
-	    for (lo = 0; lo < 256; lo++) {
-		int ch;
-
-		ch = dataPtr->toUnicode[hi][lo];
-		if (ch != 0) {
-		    unsigned short *page;
-		    
-		    page = dataPtr->fromUnicode[ch >> 8];
-		    if (page == NULL) {
-			page = pageMemPtr;
-			pageMemPtr += 256;
-			dataPtr->fromUnicode[ch >> 8] = page;
-		    }
-		    page[ch & 0xff] = (unsigned short) ((hi << 8) + lo);
-		}
-	    }
-	}
-    }
-    if (type == ENCODING_MULTIBYTE) {
-	/*
-	 * If multibyte encodings don't have a backslash character, define
-	 * one.  Otherwise, on Windows, native file names won't work because
-	 * the backslash in the file name will map to the unknown character
-	 * (question mark) when converting from UTF-8 to external encoding.
-	 */
-
-	if (dataPtr->fromUnicode[0] != NULL) {
-	    if (dataPtr->fromUnicode[0]['\\'] == '\0') {
-		dataPtr->fromUnicode[0]['\\'] = '\\';
-	    }
-	}
-    }
-    if (symbol) {
-	unsigned short *page;
-	
-	/*
-	 * Make a special symbol encoding that not only maps the symbol
-	 * characters from their Unicode code points down into page 0, but
-	 * also ensure that the characters on page 0 map to themselves.
-	 * This is so that a symbol font can be used to display a simple
-	 * string like "abcd" and have alpha, beta, chi, delta show up,
-	 * rather than have "unknown" chars show up because strictly
-	 * speaking the symbol font doesn't have glyphs for those low ascii
-	 * chars.
-	 */
-
-	page = dataPtr->fromUnicode[0];
-	if (page == NULL) {
-	    page = pageMemPtr;
-	    dataPtr->fromUnicode[0] = page;
-	}
-	for (lo = 0; lo < 256; lo++) {
-	    if (dataPtr->toUnicode[0][lo] != 0) {
-		page[lo] = (unsigned short) lo;
-	    }
-	}
-    }
-    for (hi = 0; hi < 256; hi++) {
-	if (dataPtr->fromUnicode[hi] == NULL) {
-	    dataPtr->fromUnicode[hi] = emptyPage;
-	}
-    }
-    encType.encodingName    = name;
-    encType.toUtfProc	    = TableToUtfProc;
-    encType.fromUtfProc	    = TableFromUtfProc;
-    encType.freeProc	    = TableFreeProc;
-    encType.nullSize	    = (type == ENCODING_DOUBLEBYTE) ? 2 : 1;
-    encType.clientData	    = (ClientData) dataPtr;
-    return Tcl_CreateEncoding(&encType);
-
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * LoadEscapeEncoding --
- *
- *	Helper function for LoadEncodingTable().  Loads a state machine
- *	that converts between Unicode and some other encoding.  
- *
- *	File contains text data that describes the escape sequences that
- *	are used to choose an encoding and the associated names for the 
- *	sub-encodings.
- *
- * Results:
- *	The return value is the new encoding, or NULL if the encoding 
- *	could not be created (because the file contained invalid data).
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static Tcl_Encoding
-LoadEscapeEncoding(name, chan)
-    CONST char *name;		/* Name for new encoding. */
-    Tcl_Channel chan;		/* File containing new encoding. */
-{
-    int i;
-    unsigned int size;
-    Tcl_DString escapeData;
-    char init[16], final[16];
-    EscapeEncodingData *dataPtr;
-    Tcl_EncodingType type;
-
-    init[0] = '\0';
-    final[0] = '\0';
-    Tcl_DStringInit(&escapeData);
-
-    while (1) {
-	int argc;
-	char **argv;
-	char *line;
-	Tcl_DString lineString;
-	
-	Tcl_DStringInit(&lineString);
-	if (Tcl_Gets(chan, &lineString) < 0) {
-	    break;
-	}
-	line = Tcl_DStringValue(&lineString);
-        if (Tcl_SplitList(NULL, line, &argc, &argv) != TCL_OK) {
-	    continue;
-	}
-	if (argc >= 2) {
-	    if (strcmp(argv[0], "name") == 0) {
-		;
-	    } else if (strcmp(argv[0], "init") == 0) {
-		strncpy(init, argv[1], sizeof(init));
-		init[sizeof(init) - 1] = '\0';
-	    } else if (strcmp(argv[0], "final") == 0) {
-		strncpy(final, argv[1], sizeof(final));
-		final[sizeof(final) - 1] = '\0';
-	    } else {
-		EscapeSubTable est;
-
-		strncpy(est.sequence, argv[1], sizeof(est.sequence));
-		est.sequence[sizeof(est.sequence) - 1] = '\0';
-		est.sequenceLen = strlen(est.sequence);
-
-		strncpy(est.name, argv[0], sizeof(est.name));
-		est.name[sizeof(est.name) - 1] = '\0';
-
-		est.encodingPtr = NULL;
-		Tcl_DStringAppend(&escapeData, (char *) &est, sizeof(est));
-	    }
-	}
-	ckfree((char *) argv);
-	Tcl_DStringFree(&lineString);
-    }
-
-    size = sizeof(EscapeEncodingData)
-	    - sizeof(EscapeSubTable) + Tcl_DStringLength(&escapeData);
-    dataPtr = (EscapeEncodingData *) ckalloc(size);
-    dataPtr->initLen = strlen(init);
-    strcpy(dataPtr->init, init);
-    dataPtr->finalLen = strlen(final);
-    strcpy(dataPtr->final, final);
-    dataPtr->numSubTables = Tcl_DStringLength(&escapeData) / sizeof(EscapeSubTable);
-    memcpy((VOID *) dataPtr->subTables, (VOID *) Tcl_DStringValue(&escapeData),
-	    (size_t) Tcl_DStringLength(&escapeData));
-    Tcl_DStringFree(&escapeData);
-
-    memset(dataPtr->prefixBytes, 0, sizeof(dataPtr->prefixBytes));
-    for (i = 0; i < dataPtr->numSubTables; i++) {
-	dataPtr->prefixBytes[UCHAR(dataPtr->subTables[i].sequence[0])] = 1;
-    }
-    if (dataPtr->init[0] != '\0') {
-	dataPtr->prefixBytes[UCHAR(dataPtr->init[0])] = 1;
-    }
-    if (dataPtr->final[0] != '\0') {
-	dataPtr->prefixBytes[UCHAR(dataPtr->final[0])] = 1;
-    }
-
-    type.encodingName	= name;
-    type.toUtfProc	= EscapeToUtfProc;
-    type.fromUtfProc    = EscapeFromUtfProc;
-    type.freeProc	= EscapeFreeProc;
-    type.nullSize	= 1;
-    type.clientData	= (ClientData) dataPtr;
-
-    return Tcl_CreateEncoding(&type);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * BinaryProc --
- *
- *	The default conversion when no other conversion is specified.
- *	No translation is done; source bytes are copied directly to 
- *	destination bytes.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int
-BinaryProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* Not used. */
-    CONST char *src;		/* Source string (unknown encoding). */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    int result;
-
-    result = TCL_OK;
-    dstLen -= TCL_UTF_MAX - 1;
-    if (dstLen < 0) {
-	dstLen = 0;
-    }
-    if (srcLen > dstLen) {
-	srcLen = dstLen;
-	result = TCL_CONVERT_NOSPACE;
-    }
-
-    *srcReadPtr = srcLen;
-    *dstWrotePtr = srcLen;
-    *dstCharsPtr = srcLen;
-    for ( ; --srcLen >= 0; ) {
-	*dst++ = *src++;
-    }
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * UtfToUtfProc --
- *
- *	Convert from UTF-8 to UTF-8.  Note that the UTF-8 to UTF-8 
- *	translation is not a no-op, because it will turn a stream of
- *	improperly formed UTF-8 into a properly formed stream.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-UtfToUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* Not used. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    CONST char *srcStart, *srcEnd, *srcClose;
-    char *dstStart, *dstEnd;
-    int result, numChars;
-    Tcl_UniChar ch;
-
-    result = TCL_OK;
-    
-    srcStart = src;
-    srcEnd = src + srcLen;
-    srcClose = srcEnd;
-    if ((flags & TCL_ENCODING_END) == 0) {
-	srcClose -= TCL_UTF_MAX;
-    }
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - TCL_UTF_MAX;
-
-    for (numChars = 0; src < srcEnd; numChars++) {
-	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
-	    /*
-	     * If there is more string to follow, this will ensure that the
-	     * last UTF-8 character in the source buffer hasn't been cut off.
-	     */
-
-	    result = TCL_CONVERT_MULTIBYTE;
-	    break;
-	}
-	if (dst > dstEnd) {
-	    result = TCL_CONVERT_NOSPACE;
-	    break;
-	}
-	src += Tcl_UtfToUniChar(src, &ch);
-	dst += Tcl_UniCharToUtf(ch, dst);
-    }
-
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * UnicodeToUtfProc --
- *
- *	Convert from Unicode to UTF-8.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-UnicodeToUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* Not used. */
-    CONST char *src;		/* Source string in Unicode. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    CONST Tcl_UniChar *wSrc, *wSrcStart, *wSrcEnd;
-    char *dstEnd, *dstStart;
-    int result, numChars;
-    
-    result = TCL_OK;
-    if ((srcLen % sizeof(Tcl_UniChar)) != 0) {
-	result = TCL_CONVERT_MULTIBYTE;
-	srcLen /= sizeof(Tcl_UniChar);
-	srcLen *= sizeof(Tcl_UniChar);
-    }
-
-    wSrc = (Tcl_UniChar *) src;
-
-    wSrcStart = (Tcl_UniChar *) src;
-    wSrcEnd = (Tcl_UniChar *) (src + srcLen);
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - TCL_UTF_MAX;
-
-    for (numChars = 0; wSrc < wSrcEnd; numChars++) {
-	if (dst > dstEnd) {
-	    result = TCL_CONVERT_NOSPACE;
-	    break;
-	}
-	dst += Tcl_UniCharToUtf(*wSrc, dst);
-	wSrc++;
-    }
-
-    *srcReadPtr = (char *) wSrc - (char *) wSrcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * UtfToUnicodeProc --
- *
- *	Convert from UTF-8 to Unicode.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-UtfToUnicodeProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* TableEncodingData that specifies encoding. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    CONST char *srcStart, *srcEnd, *srcClose;
-    Tcl_UniChar *wDst, *wDstStart, *wDstEnd;
-    int result, numChars;
-    
-    srcStart = src;
-    srcEnd = src + srcLen;
-    srcClose = srcEnd;
-    if ((flags & TCL_ENCODING_END) == 0) {
-	srcClose -= TCL_UTF_MAX;
-    }
-
-    wDst = (Tcl_UniChar *) dst;
-    wDstStart = (Tcl_UniChar *) dst;
-    wDstEnd = (Tcl_UniChar *) (dst + dstLen - sizeof(Tcl_UniChar));
-
-    result = TCL_OK;
-    for (numChars = 0; src < srcEnd; numChars++) {
-	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
-	    /*
-	     * If there is more string to follow, this will ensure that the
-	     * last UTF-8 character in the source buffer hasn't been cut off.
-	     */
-
-	    result = TCL_CONVERT_MULTIBYTE;
-	    break;
-	}
-	if (wDst > wDstEnd) {
-	    result = TCL_CONVERT_NOSPACE;
-	    break;
-        }
-	src += Tcl_UtfToUniChar(src, wDst);
-	wDst++;
-    }
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = (char *) wDst - (char *) wDstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TableToUtfProc --
- *
- *	Convert from the encoding specified by the TableEncodingData into
- *	UTF-8.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-TableToUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* TableEncodingData that specifies
-				 * encoding. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    CONST char *srcStart, *srcEnd;
-    char *dstEnd, *dstStart, *prefixBytes;
-    int result, byte, numChars;
-    Tcl_UniChar ch;
-    unsigned short **toUnicode;
-    unsigned short *pageZero;
-    TableEncodingData *dataPtr;
-    
-    srcStart = src;
-    srcEnd = src + srcLen;
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - TCL_UTF_MAX;
-
-    dataPtr = (TableEncodingData *) clientData;
-    toUnicode = dataPtr->toUnicode;
-    prefixBytes = dataPtr->prefixBytes;
-    pageZero = toUnicode[0];
-
-    result = TCL_OK;
-    for (numChars = 0; src < srcEnd; numChars++) {
-        if (dst > dstEnd) {
-            result = TCL_CONVERT_NOSPACE;
-            break;
-        }
-	byte = *((unsigned char *) src);
-	if (prefixBytes[byte]) {
-	    src++;
-	    if (src >= srcEnd) {
-		src--;
-		result = TCL_CONVERT_MULTIBYTE;
-		break;
-	    }
-	    ch = toUnicode[byte][*((unsigned char *) src)];
-	} else {
-	    ch = pageZero[byte];
-	}
-	if ((ch == 0) && (byte != 0)) {
-	    if (flags & TCL_ENCODING_STOPONERROR) {
-		result = TCL_CONVERT_SYNTAX;
-		break;
-	    }
-	    if (prefixBytes[byte]) {
-		src--;
-	    }
-	    ch = (Tcl_UniChar) byte;
-	}
-	dst += Tcl_UniCharToUtf(ch, dst);
-        src++;
-    }
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TableFromUtfProc --
- *
- *	Convert from UTF-8 into the encoding specified by the
- *	TableEncodingData.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-TableFromUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* TableEncodingData that specifies
-				 * encoding. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    CONST char *srcStart, *srcEnd, *srcClose;
-    char *dstStart, *dstEnd, *prefixBytes;
-    Tcl_UniChar ch;
-    int result, len, word, numChars;
-    TableEncodingData *dataPtr;
-    unsigned short **fromUnicode;
-    
-    result = TCL_OK;    
-
-    dataPtr = (TableEncodingData *) clientData;
-    prefixBytes = dataPtr->prefixBytes;
-    fromUnicode = dataPtr->fromUnicode;
-    
-    srcStart = src;
-    srcEnd = src + srcLen;
-    srcClose = srcEnd;
-    if ((flags & TCL_ENCODING_END) == 0) {
-	srcClose -= TCL_UTF_MAX;
-    }
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - 1;
-
-    for (numChars = 0; src < srcEnd; numChars++) {
-	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
-	    /*
-	     * If there is more string to follow, this will ensure that the
-	     * last UTF-8 character in the source buffer hasn't been cut off.
-	     */
-
-	    result = TCL_CONVERT_MULTIBYTE;
-	    break;
-	}
-        len = Tcl_UtfToUniChar(src, &ch);
-	word = fromUnicode[(ch >> 8)][ch & 0xff];
-	if ((word == 0) && (ch != 0)) {
-	    if (flags & TCL_ENCODING_STOPONERROR) {
-		result = TCL_CONVERT_UNKNOWN;
-		break;
-	    }
-	    word = dataPtr->fallback; 
-	}
-	if (prefixBytes[(word >> 8)] != 0) {
-	    if (dst + 1 > dstEnd) {
-		result = TCL_CONVERT_NOSPACE;
-		break;
-	    }
-	    dst[0] = (char) (word >> 8);
-	    dst[1] = (char) word;
-	    dst += 2;
-	} else {
-	    if (dst > dstEnd) {
-		result = TCL_CONVERT_NOSPACE;
-		break;
-	    }
-	    dst[0] = (char) word;
-	    dst++;
-	} 
-	src += len;
-    }
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TableFreeProc --
- *
- *	This procedure is invoked when an encoding is deleted.  It deletes
- *	the memory used by the TableEncodingData.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory freed.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-TableFreeProc(clientData)
-    ClientData clientData;	/* TableEncodingData that specifies
-				 * encoding. */
-{
-    TableEncodingData *dataPtr;
-
-    dataPtr = (TableEncodingData *) clientData;
-    ckfree((char *) dataPtr->toUnicode);
-    ckfree((char *) dataPtr->fromUnicode);
-    ckfree((char *) dataPtr);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * EscapeToUtfProc --
- *
- *	Convert from the encoding specified by the EscapeEncodingData into
- *	UTF-8.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-EscapeToUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* EscapeEncodingData that specifies
-				 * encoding. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    EscapeEncodingData *dataPtr;
-    char *prefixBytes, *tablePrefixBytes;
-    unsigned short **tableToUnicode;
-    Encoding *encodingPtr;
-    int state, result, numChars;
-    CONST char *srcStart, *srcEnd;
-    char *dstStart, *dstEnd;
-
-    result = TCL_OK;
-
-    tablePrefixBytes = NULL;	/* lint. */
-    tableToUnicode = NULL;	/* lint. */
-
-    dataPtr = (EscapeEncodingData *) clientData;
-    prefixBytes = dataPtr->prefixBytes;
-    encodingPtr = NULL;
-
-    srcStart = src;
-    srcEnd = src + srcLen;
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - TCL_UTF_MAX;
-
-    state = (int) *statePtr;
-    if (flags & TCL_ENCODING_START) {
-	state = 0;
-    }
-
-    for (numChars = 0; src < srcEnd; ) {
-	int byte, hi, lo, ch;
-
-        if (dst > dstEnd) {
-            result = TCL_CONVERT_NOSPACE;
-            break;
-        }
-	byte = *((unsigned char *) src);
-	if (prefixBytes[byte]) {
-	    unsigned int left, len, longest;
-	    int checked, i;
-	    EscapeSubTable *subTablePtr;
-	    
-	    /*
-	     * Saw the beginning of an escape sequence. 
-	     */
-	     
-	    left = srcEnd - src;
-	    len = dataPtr->initLen;
-	    longest = len;
-	    checked = 0;
-	    if (len <= left) {
-		checked++;
-		if ((len > 0) && 
-			(memcmp(src, dataPtr->init, len) == 0)) {
-		    /*
-		     * If we see initialization string, skip it, even if we're
-		     * not at the beginning of the buffer. 
-		     */
-		     
-		    src += len;
-		    continue;
-		}
-	    }
-	    len = dataPtr->finalLen;
-	    if (len > longest) {
-		longest = len;
-	    }
-	    if (len <= left) {
-		checked++;
-		if ((len > 0) && 
-			(memcmp(src, dataPtr->final, len) == 0)) {
-		    /*
-		     * If we see finalization string, skip it, even if we're
-		     * not at the end of the buffer. 
-		     */
-		     
-		    src += len;
-		    continue;
-		}
-	    }
-	    subTablePtr = dataPtr->subTables;
-	    for (i = 0; i < dataPtr->numSubTables; i++) {
-		len = subTablePtr->sequenceLen;
-		if (len > longest) {
-		    longest = len;
-		}
-		if (len <= left) {
-		    checked++;
-		    if ((len > 0) && 
-			    (memcmp(src, subTablePtr->sequence, len) == 0)) {
-			state = i;
-			encodingPtr = NULL;
-			subTablePtr = NULL;
-			src += len;
-			break;
-		    }
-		}
-		subTablePtr++;
-	    }
-	    if (subTablePtr == NULL) {
-		/*
-		 * A match was found, the escape sequence was consumed, and
-		 * the state was updated.
-		 */
-
-		continue;
-	    }
-
-	    /*
-	     * We have a split-up or unrecognized escape sequence.  If we
-	     * checked all the sequences, then it's a syntax error,
-	     * otherwise we need more bytes to determine a match.
-	     */
-
-	    if ((checked == dataPtr->numSubTables + 2)
-		    || (flags & TCL_ENCODING_END)) {
-		if ((flags & TCL_ENCODING_STOPONERROR) == 0) {
-		    /*
-		     * Skip the unknown escape sequence.
-		     */
-
-		    src += longest;
-		    continue;
-		}
-		result = TCL_CONVERT_SYNTAX;
-	    } else {
-		result = TCL_CONVERT_MULTIBYTE;
-	    }
-	    break;
-	}
-
-	if (encodingPtr == NULL) {
-	    TableEncodingData *tableDataPtr;
-
-	    encodingPtr = GetTableEncoding(dataPtr, state);
-	    tableDataPtr = (TableEncodingData *) encodingPtr->clientData;
-	    tablePrefixBytes = tableDataPtr->prefixBytes;
-	    tableToUnicode = tableDataPtr->toUnicode;
-	}
-	if (tablePrefixBytes[byte]) {
-	    src++;
-	    if (src >= srcEnd) {
-		src--;
-		result = TCL_CONVERT_MULTIBYTE;
-		break;
-	    }
-	    hi = byte;
-	    lo = *((unsigned char *) src);
-	} else {
-	    hi = 0;
-	    lo = byte;
-	}
-	ch = tableToUnicode[hi][lo];
-	dst += Tcl_UniCharToUtf(ch, dst);
-	src++;
-	numChars++;
-    }
-
-    *statePtr = (Tcl_EncodingState) state;
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * EscapeFromUtfProc --
- *
- *	Convert from UTF-8 into the encoding specified by the
- *	EscapeEncodingData.
- *
- * Results:
- *	Returns TCL_OK if conversion was successful.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-static int 
-EscapeFromUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* EscapeEncodingData that specifies
-				 * encoding. */
-    CONST char *src;		/* Source string in UTF-8. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Place for conversion routine to store
-				 * state information used during a piecewise
-				 * conversion.  Contents of statePtr are
-				 * initialized and/or reset by conversion
-				 * routine under control of flags argument. */
-    char *dst;			/* Output buffer in which converted string
-				 * is stored. */
-    int dstLen;			/* The maximum length of output buffer in
-				 * bytes. */
-    int *srcReadPtr;		/* Filled with the number of bytes from the
-				 * source string that were converted.  This
-				 * may be less than the original source length
-				 * if there was a problem converting some
-				 * source characters. */
-    int *dstWrotePtr;		/* Filled with the number of bytes that were
-				 * stored in the output buffer as a result of
-				 * the conversion. */
-    int *dstCharsPtr;		/* Filled with the number of characters that
-				 * correspond to the bytes stored in the
-				 * output buffer. */
-{
-    EscapeEncodingData *dataPtr;
-    Encoding *encodingPtr;
-    CONST char *srcStart, *srcEnd, *srcClose;
-    char *dstStart, *dstEnd;
-    int state, result, numChars;
-    TableEncodingData *tableDataPtr;
-    char *tablePrefixBytes;
-    unsigned short **tableFromUnicode;
-    
-    result = TCL_OK;    
-
-    dataPtr = (EscapeEncodingData *) clientData;
-
-    srcStart = src;
-    srcEnd = src + srcLen;
-    srcClose = srcEnd;
-    if ((flags & TCL_ENCODING_END) == 0) {
-	srcClose -= TCL_UTF_MAX;
-    }
-
-    dstStart = dst;
-    dstEnd = dst + dstLen - 1;
-
-    if (flags & TCL_ENCODING_START) {
-	unsigned int len;
-	
-	state = 0;
-	len = dataPtr->subTables[0].sequenceLen;
-	if (dst + dataPtr->initLen + len > dstEnd) {
-	    *srcReadPtr = 0;
-	    *dstWrotePtr = 0;
-	    return TCL_CONVERT_NOSPACE;
-	}
-	memcpy((VOID *) dst, (VOID *) dataPtr->init,
-		(size_t) dataPtr->initLen);
-	dst += dataPtr->initLen;
-	memcpy((VOID *) dst, (VOID *) dataPtr->subTables[0].sequence,
-		(size_t) len);
-	dst += len;
-    } else {
-        state = (int) *statePtr;
-    }
-
-    encodingPtr = GetTableEncoding(dataPtr, state);
-    tableDataPtr = (TableEncodingData *) encodingPtr->clientData;
-    tablePrefixBytes = tableDataPtr->prefixBytes;
-    tableFromUnicode = tableDataPtr->fromUnicode;
-
-    for (numChars = 0; src < srcEnd; numChars++) {
-	unsigned int len;
-	int word;
-	Tcl_UniChar ch;
-	
-	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
-	    /*
-	     * If there is more string to follow, this will ensure that the
-	     * last UTF-8 character in the source buffer hasn't been cut off.
-	     */
-
-	    result = TCL_CONVERT_MULTIBYTE;
-	    break;
-	}
-        len = Tcl_UtfToUniChar(src, &ch);
-	word = tableFromUnicode[(ch >> 8)][ch & 0xff];
-
-	if ((word == 0) && (ch != 0)) {
-	    int oldState;
-	    EscapeSubTable *subTablePtr;
-	    
-	    oldState = state;
-	    for (state = 0; state < dataPtr->numSubTables; state++) {
-		encodingPtr = GetTableEncoding(dataPtr, state);
-		tableDataPtr = (TableEncodingData *) encodingPtr->clientData;
-	    	word = tableDataPtr->fromUnicode[(ch >> 8)][ch & 0xff];
-		if (word != 0) {
-		    break;
-		}
-	    }
-
-	    if (word == 0) {
-		state = oldState;
-		if (flags & TCL_ENCODING_STOPONERROR) {
-		    result = TCL_CONVERT_UNKNOWN;
-		    break;
-		}
-		encodingPtr = GetTableEncoding(dataPtr, state);
-		tableDataPtr = (TableEncodingData *) encodingPtr->clientData;
-		word = tableDataPtr->fallback;
-	    } 
-	    
-	    tablePrefixBytes = tableDataPtr->prefixBytes;
-	    tableFromUnicode = tableDataPtr->fromUnicode;
-
-	    subTablePtr = &dataPtr->subTables[state];
-	    if (dst + subTablePtr->sequenceLen > dstEnd) {
-		result = TCL_CONVERT_NOSPACE;
-		break;
-	    }
-	    memcpy((VOID *) dst, (VOID *) subTablePtr->sequence,
-		    (size_t) subTablePtr->sequenceLen);
-	    dst += subTablePtr->sequenceLen;
-	}
-
-	if (tablePrefixBytes[(word >> 8)] != 0) {
-	    if (dst + 1 > dstEnd) {
-		result = TCL_CONVERT_NOSPACE;
-		break;
-	    }
-	    dst[0] = (char) (word >> 8);
-	    dst[1] = (char) word;
-	    dst += 2;
-	} else {
-	    if (dst > dstEnd) {
-		result = TCL_CONVERT_NOSPACE;
-		break;
-	    }
-	    dst[0] = (char) word;
-	    dst++;
-	} 
-	src += len;
-    }
-
-    if ((result == TCL_OK) && (flags & TCL_ENCODING_END)) {
-	if (dst + dataPtr->finalLen > dstEnd) {
-	    result = TCL_CONVERT_NOSPACE;
-	} else {
-	    memcpy((VOID *) dst, (VOID *) dataPtr->final,
-		    (size_t) dataPtr->finalLen);
-	    dst += dataPtr->finalLen;
-	}
-    }
-
-    *statePtr = (Tcl_EncodingState) state;
-    *srcReadPtr = src - srcStart;
-    *dstWrotePtr = dst - dstStart;
-    *dstCharsPtr = numChars;
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * EscapeFreeProc --
- *
- *	This procedure is invoked when an EscapeEncodingData encoding is 
- *	deleted.  It deletes the memory used by the encoding.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory freed.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-EscapeFreeProc(clientData)
-    ClientData clientData;	/* EscapeEncodingData that specifies encoding. */
-{
-    EscapeEncodingData *dataPtr;
-    EscapeSubTable *subTablePtr;
-    int i;
-
-    dataPtr = (EscapeEncodingData *) clientData;
-    if (dataPtr == NULL) {
-	return;
-    }
-    subTablePtr = dataPtr->subTables;
-    for (i = 0; i < dataPtr->numSubTables; i++) {
-	FreeEncoding((Tcl_Encoding) subTablePtr->encodingPtr);
-	subTablePtr++;
-    }
-    ckfree((char *) dataPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * GetTableEncoding --
- *
- *	Helper function for the EscapeEncodingData conversions.  Gets the
- *	encoding (of type TextEncodingData) that represents the specified
- *	state.
- *
- * Results:
- *	The return value is the encoding.
- *
- * Side effects:
- *	If the encoding that represents the specified state has not
- *	already been used by this EscapeEncoding, it will be loaded
- *	and cached in the dataPtr.
- *
- *---------------------------------------------------------------------------
- */
-
-static Encoding *
-GetTableEncoding(dataPtr, state)
-    EscapeEncodingData *dataPtr;/* Contains names of encodings. */
-    int state;			/* Index in dataPtr of desired Encoding. */
-{
-    EscapeSubTable *subTablePtr;
-    Encoding *encodingPtr;
-    
-    subTablePtr = &dataPtr->subTables[state];
-    encodingPtr = subTablePtr->encodingPtr;
-    if (encodingPtr == NULL) {
-	encodingPtr = (Encoding *) Tcl_GetEncoding(NULL, subTablePtr->name);
-	if ((encodingPtr == NULL) 
-		|| (encodingPtr->toUtfProc != TableToUtfProc)) {
-	    panic("EscapeToUtfProc: invalid sub table");
-	}
-	subTablePtr->encodingPtr = encodingPtr;
-    }
-    return encodingPtr;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * unilen --
- *
- *	A helper function for the Tcl_ExternalToUtf functions.  This
- *	function is similar to strlen for double-byte characters: it
- *	returns the number of bytes in a 0x0000 terminated string.
- *
- * Results:
- *	As above.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static size_t
-unilen(src)
-    CONST char *src;
-{
-    unsigned short *p;
-
-    p = (unsigned short *) src;
-    while (*p != 0x0000) {
-	p++;
-    }
-    return (char *) p - src;
-}
-
-	
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
deleted file mode 100644
index 4e5854e..0000000
--- a/generic/tclEnv.c
+++ /dev/null
@@ -1,669 +0,0 @@
-/* 
- * tclEnv.c --
- *
- *	Tcl support for environment variables, including a setenv
- *	procedure.  This file contains the generic portion of the
- *	environment module.  It is primarily responsible for keeping
- *	the "env" arrays in sync with the system environment variables.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclEnv.c,v 1.4 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-TCL_DECLARE_MUTEX(envMutex)	/* To serialize access to environ */
-
-static int cacheSize = 0;	/* Number of env strings in environCache. */
-static char **environCache = NULL;
-				/* Array containing all of the environment
-				 * strings that Tcl has allocated. */
-
-#ifndef USE_PUTENV
-static int environSize = 0;	/* Non-zero means that the environ array was
-				 * malloced and has this many total entries
-				 * allocated to it (not all may be in use at
-				 * once).  Zero means that the environment
-				 * array is in its original static state. */
-#endif
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static char *		EnvTraceProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, char *name2,
-			    int flags));
-static void		ReplaceString _ANSI_ARGS_((CONST char *oldStr,
-			    char *newStr));
-void			TclSetEnv _ANSI_ARGS_((CONST char *name,
-			    CONST char *value));
-void			TclUnsetEnv _ANSI_ARGS_((CONST char *name));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetupEnv --
- *
- *	This procedure is invoked for an interpreter to make environment
- *	variables accessible from that interpreter via the "env"
- *	associative array.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The interpreter is added to a list of interpreters managed
- *	by us, so that its view of envariables can be kept consistent
- *	with the view in other interpreters.  If this is the first
- *	call to TclSetupEnv, then additional initialization happens,
- *	such as copying the environment to dynamically-allocated space
- *	for ease of management.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclSetupEnv(interp)
-    Tcl_Interp *interp;		/* Interpreter whose "env" array is to be
-				 * managed. */
-{
-    Tcl_DString envString;
-    char *p1, *p2;
-    int i;
-
-    /*
-     * Synchronize the values in the environ array with the contents
-     * of the Tcl "env" variable.  To do this:
-     *    1) Remove the trace that fires when the "env" var is unset.
-     *    2) Unset the "env" variable.
-     *    3) If there are no environ variables, create an empty "env"
-     *       array.  Otherwise populate the array with current values.
-     *    4) Add a trace that synchronizes the "env" array.
-     */
-    
-    Tcl_UntraceVar2(interp, "env", (char *) NULL,
-	    TCL_GLOBAL_ONLY | TCL_TRACE_WRITES | TCL_TRACE_UNSETS |
-	    TCL_TRACE_READS | TCL_TRACE_ARRAY,  EnvTraceProc,
-	    (ClientData) NULL);
-    
-    Tcl_UnsetVar2(interp, "env", (char *) NULL, TCL_GLOBAL_ONLY); 
-    
-    if (environ[0] == NULL) {
-	Tcl_Obj *varNamePtr;
-	
-	varNamePtr = Tcl_NewStringObj("env", -1);
-	Tcl_IncrRefCount(varNamePtr);
-	TclArraySet(interp, varNamePtr, NULL);	
-	Tcl_DecrRefCount(varNamePtr);
-    } else {
-	Tcl_MutexLock(&envMutex);
-	for (i = 0; environ[i] != NULL; i++) {
-	    p1 = Tcl_ExternalToUtfDString(NULL, environ[i], -1, &envString);
-	    p2 = strchr(p1, '=');
-	    if (p2 == NULL) {
-		/*
-		 * This condition seem to happen occasionally under some
-		 * versions of Solaris; ignore the entry.
-		 */
-		
-		continue;
-	    }
-	    p2++;
-	    p2[-1] = '\0';
-	    Tcl_SetVar2(interp, "env", p1, p2, TCL_GLOBAL_ONLY);	
-	    Tcl_DStringFree(&envString);
-	}
-	Tcl_MutexUnlock(&envMutex);
-    }
-
-    Tcl_TraceVar2(interp, "env", (char *) NULL,
-	    TCL_GLOBAL_ONLY | TCL_TRACE_WRITES | TCL_TRACE_UNSETS |
-	    TCL_TRACE_READS | TCL_TRACE_ARRAY,  EnvTraceProc,
-	    (ClientData) NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetEnv --
- *
- *	Set an environment variable, replacing an existing value
- *	or creating a new variable if there doesn't exist a variable
- *	by the given name.  This procedure is intended to be a
- *	stand-in for the  UNIX "setenv" procedure so that applications
- *	using that procedure will interface properly to Tcl.  To make
- *	it a stand-in, the Makefile must define "TclSetEnv" to "setenv".
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The environ array gets updated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclSetEnv(name, value)
-    CONST char *name;		/* Name of variable whose value is to be
-				 * set (UTF-8). */
-    CONST char *value;		/* New value for variable (UTF-8). */
-{
-    Tcl_DString envString;
-    int index, length, nameLength;
-    char *p, *p2, *oldValue;
-
-    /*
-     * Figure out where the entry is going to go.  If the name doesn't
-     * already exist, enlarge the array if necessary to make room.  If the
-     * name exists, free its old entry.
-     */
-
-    Tcl_MutexLock(&envMutex);
-    index = TclpFindVariable(name, &length);
-
-    if (index == -1) {
-#ifndef USE_PUTENV
-	if ((length + 2) > environSize) {
-	    char **newEnviron;
-
-	    newEnviron = (char **) ckalloc((unsigned)
-		    ((length + 5) * sizeof(char *)));
-	    memcpy((VOID *) newEnviron, (VOID *) environ,
-		    length*sizeof(char *));
-	    if (environSize != 0) {
-		ckfree((char *) environ);
-	    }
-	    environ = newEnviron;
-	    environSize = length + 5;
-	}
-	index = length;
-	environ[index + 1] = NULL;
-#endif
-	oldValue = NULL;
-	nameLength = strlen(name);
-    } else {
-	char *env;
-
-	/*
-	 * Compare the new value to the existing value.  If they're
-	 * the same then quit immediately (e.g. don't rewrite the
-	 * value or propagate it to other interpreters).  Otherwise,
-	 * when there are N interpreters there will be N! propagations
-	 * of the same value among the interpreters.
-	 */
-
-	env = Tcl_ExternalToUtfDString(NULL, environ[index], -1, &envString);
-	if (strcmp(value, (env + length + 1)) == 0) {
-	    Tcl_DStringFree(&envString);
-	    Tcl_MutexUnlock(&envMutex);
-	    return;
-	}
-	Tcl_DStringFree(&envString);
-
-	oldValue = environ[index];
-	nameLength = length;
-    }
-	
-
-    /*
-     * Create a new entry.  Build a complete UTF string that contains
-     * a "name=value" pattern.  Then convert the string to the native
-     * encoding, and set the environ array value.
-     */
-
-    p = (char *) ckalloc((unsigned) (nameLength + strlen(value) + 2));
-    strcpy(p, name);
-    p[nameLength] = '=';
-    strcpy(p+nameLength+1, value);
-    p2 = Tcl_UtfToExternalDString(NULL, p, -1, &envString);
-    ckfree(p);
-    
-
-#ifdef USE_PUTENV
-    /*
-     * Update the system environment.
-     */
-
-    putenv(p2);
-    index = TclpFindVariable(name, &length);
-#else
-    /*
-     * Copy the native string to heap memory.
-     */
-    
-    p = (char *) ckalloc((unsigned) (strlen(p2) + 1));
-    strcpy(p, p2);
-    environ[index] = p;
-#endif
-
-    /*
-     * Watch out for versions of putenv that copy the string (e.g. VC++).
-     * In this case we need to free the string immediately.  Otherwise
-     * update the string in the cache.
-     */
-
-    if (environ[index] != p) {
-	Tcl_DStringFree(&envString);
-    } else {
-	ReplaceString(oldValue, p);
-    }
-
-    Tcl_MutexUnlock(&envMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PutEnv --
- *
- *	Set an environment variable.  Similar to setenv except that
- *	the information is passed in a single string of the form
- *	NAME=value, rather than as separate name strings.  This procedure
- *	is intended to be a stand-in for the  UNIX "putenv" procedure
- *	so that applications using that procedure will interface
- *	properly to Tcl.  To make it a stand-in, the Makefile will
- *	define "Tcl_PutEnv" to "putenv".
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The environ array gets updated, as do all of the interpreters
- *	that we manage.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_PutEnv(string)
-    CONST char *string;		/* Info about environment variable in the
-				 * form NAME=value. (native) */
-{
-    Tcl_DString nameString;   
-    int nameLength;
-    char *name, *value;
-
-    if (string == NULL) {
-	return 0;
-    }
-
-    /*
-     * First convert the native string to UTF.  Then separate the
-     * string into name and value parts, and call TclSetEnv to do
-     * all of the real work.
-     */
-
-    name = Tcl_ExternalToUtfDString(NULL, string, -1, &nameString);
-    value = strchr(name, '=');
-    if (value == NULL) {
-	return 0;
-    }
-    nameLength = value - name;
-    if (nameLength == 0) {
-	return 0;
-    }
-
-    value[0] = '\0';
-    TclSetEnv(name, value+1);
-    Tcl_DStringFree(&nameString);
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclUnsetEnv --
- *
- *	Remove an environment variable, updating the "env" arrays
- *	in all interpreters managed by us.  This function is intended
- *	to replace the UNIX "unsetenv" function (but to do this the
- *	Makefile must be modified to redefine "TclUnsetEnv" to
- *	"unsetenv".
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Interpreters are updated, as is environ.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclUnsetEnv(name)
-    CONST char *name;		/* Name of variable to remove (UTF-8). */
-{
-    char *oldValue;
-    int length, index;
-#ifdef USE_PUTENV
-    Tcl_DString envString;
-    char *string;
-#else
-    char **envPtr;
-#endif
-
-    Tcl_MutexLock(&envMutex);
-    index = TclpFindVariable(name, &length);
-
-    /*
-     * First make sure that the environment variable exists to avoid
-     * doing needless work and to avoid recursion on the unset.
-     */
-    
-    if (index == -1) {
-	Tcl_MutexUnlock(&envMutex);
-	return;
-    }
-    /*
-     * Remember the old value so we can free it if Tcl created the string.
-     */
-
-    oldValue = environ[index];
-
-    /*
-     * Update the system environment.  This must be done before we 
-     * update the interpreters or we will recurse.
-     */
-
-#ifdef USE_PUTENV
-    string = ckalloc(length+2);
-    memcpy((VOID *) string, (VOID *) name, (size_t) length);
-    string[length] = '=';
-    string[length+1] = '\0';
-    
-    Tcl_UtfToExternalDString(NULL, string, -1, &envString);
-    ckfree(string);
-    string = Tcl_DStringValue(&envString);
-    putenv(string);
-
-    /*
-     * Watch out for versions of putenv that copy the string (e.g. VC++).
-     * In this case we need to free the string immediately.  Otherwise
-     * update the string in the cache.
-     */
-
-    if (environ[index] != string) {
-	Tcl_DStringFree(&envString);
-    } else {
-	ReplaceString(oldValue, string);
-    }
-#else
-    for (envPtr = environ+index+1; ; envPtr++) {
-	envPtr[-1] = *envPtr;
-	if (*envPtr == NULL) {
-	    break;
-	}
-    }
-    ReplaceString(oldValue, NULL);
-#endif
-
-    Tcl_MutexUnlock(&envMutex);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclGetEnv --
- *
- *	Retrieve the value of an environment variable.
- *
- * Results:
- *	The result is a pointer to a string specifying the value of the
- *	environment variable, or NULL if that environment variable does
- *	not exist.  Storage for the result string is allocated in valuePtr;
- *	the caller must call Tcl_DStringFree() when the result is no
- *	longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclGetEnv(name, valuePtr)
-    CONST char *name;		/* Name of environment variable to find
-				 * (UTF-8). */
-    Tcl_DString *valuePtr;	/* Uninitialized or free DString in which
-				 * the value of the environment variable is
-				 * stored. */
-{
-    int length, index;
-    char *result;
-
-    Tcl_MutexLock(&envMutex);
-    index = TclpFindVariable(name, &length);
-    result = NULL;
-    if (index != -1) {
-	Tcl_DString envStr;
-	
-	result = Tcl_ExternalToUtfDString(NULL, environ[index], -1, &envStr);
-	result += length;
-	if (*result == '=') {
-	    result++;
-	    Tcl_DStringInit(valuePtr);
-	    Tcl_DStringAppend(valuePtr, result, -1);
-	    result = Tcl_DStringValue(valuePtr);
-	} else {
-	    result = NULL;
-	}
-	Tcl_DStringFree(&envStr);
-    }
-    Tcl_MutexUnlock(&envMutex);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EnvTraceProc --
- *
- *	This procedure is invoked whenever an environment variable
- *	is read, modified or deleted.  It propagates the change to the global
- *	"environ" array.
- *
- * Results:
- *	Always returns NULL to indicate success.
- *
- * Side effects:
- *	Environment variable changes get propagated.  If the whole
- *	"env" array is deleted, then we stop managing things for
- *	this interpreter (usually this happens because the whole
- *	interpreter is being deleted).
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static char *
-EnvTraceProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Interpreter whose "env" variable is
-				 * being modified. */
-    char *name1;		/* Better be "env". */
-    char *name2;		/* Name of variable being modified, or NULL
-				 * if whole array is being deleted (UTF-8). */
-    int flags;			/* Indicates what's happening. */
-{
-    /*
-     * For array traces, let TclSetupEnv do all the work.
-     */
-
-    if (flags & TCL_TRACE_ARRAY) {
-	TclSetupEnv(interp);
-	return NULL;
-    }
-
-    /*
-     * If name2 is NULL, then return and do nothing.
-     */
-     
-    if (name2 == NULL) {
-	return NULL;
-    }
-
-    /*
-     * If a value is being set, call TclSetEnv to do all of the work.
-     */
-
-    if (flags & TCL_TRACE_WRITES) {
-	char *value;
-	
-	value = Tcl_GetVar2(interp, "env", name2, TCL_GLOBAL_ONLY);
-	TclSetEnv(name2, value);
-    }
-
-    /*
-     * If a value is being read, call TclGetEnv to do all of the work.
-     */
-
-    if (flags & TCL_TRACE_READS) {
-	Tcl_DString valueString;
-	char *value;
-
-	value = TclGetEnv(name2, &valueString);
-	if (value == NULL) {
-	    return "no such variable";
-	}
-	Tcl_SetVar2(interp, name1, name2, value, 0);
-	Tcl_DStringFree(&valueString);
-    }
-
-    /*
-     * For unset traces, let TclUnsetEnv do all the work.
-     */
-
-    if (flags & TCL_TRACE_UNSETS) {
-	TclUnsetEnv(name2);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ReplaceString --
- *
- *	Replace one string with another in the environment variable
- *	cache.  The cache keeps track of all of the environment
- *	variables that Tcl has modified so they can be freed later.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May free the old string.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ReplaceString(oldStr, newStr)
-    CONST char *oldStr;		/* Old environment string. */
-    char *newStr;		/* New environment string. */
-{
-    int i;
-    char **newCache;
-
-    /*
-     * Check to see if the old value was allocated by Tcl.  If so,
-     * it needs to be deallocated to avoid memory leaks.  Note that this
-     * algorithm is O(n), not O(1).  This will result in n-squared behavior
-     * if lots of environment changes are being made.
-     */
-
-    for (i = 0; i < cacheSize; i++) {
-	if ((environCache[i] == oldStr) || (environCache[i] == NULL)) {
-	    break;
-	}
-    }
-    if (i < cacheSize) {
-	/*
-	 * Replace or delete the old value.
-	 */
-
-	if (environCache[i]) {
-	    ckfree(environCache[i]);
-	}
-	    
-	if (newStr) {
-	    environCache[i] = newStr;
-	} else {
-	    for (; i < cacheSize-1; i++) {
-		environCache[i] = environCache[i+1];
-	    }
-	    environCache[cacheSize-1] = NULL;
-	}
-    } else {	
-        int allocatedSize = (cacheSize + 5) * sizeof(char *);
-
-	/*
-	 * We need to grow the cache in order to hold the new string.
-	 */
-
-	newCache = (char **) ckalloc((unsigned) allocatedSize);
-        (VOID *) memset(newCache, (int) 0, (size_t) allocatedSize);
-        
-	if (environCache) {
-	    memcpy((VOID *) newCache, (VOID *) environCache,
-		    (size_t) (cacheSize * sizeof(char*)));
-	    ckfree((char *) environCache);
-	}
-	environCache = newCache;
-	environCache[cacheSize] = (char *) newStr;
-	environCache[cacheSize+1] = NULL;
-	cacheSize += 5;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeEnvironment --
- *
- *	This function releases any storage allocated by this module
- *	that isn't still in use by the global environment.  Any
- *	strings that are still in the environment will be leaked.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May deallocate storage.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeEnvironment()
-{
-    /*
-     * For now we just deallocate the cache array and none of the environment
-     * strings.  This may leak more memory that strictly necessary, since some
-     * of the strings may no longer be in the environment.  However,
-     * determining which ones are ok to delete is n-squared, and is pretty
-     * unlikely, so we don't bother.
-     */
-
-    if (environCache) {
-	ckfree((char *) environCache);
-	environCache = NULL;
-	cacheSize    = 0;
-#ifndef USE_PUTENV
-	environSize  = 0;
-#endif
-    }
-}
-
-	
-    
-    
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
deleted file mode 100644
index 7499577..0000000
--- a/generic/tclEvent.c
+++ /dev/null
@@ -1,1129 +0,0 @@
-/* 
- * tclEvent.c --
- *
- *	This file implements some general event related interfaces including
- *	background errors, exit handlers, and the "vwait" and "update"
- *	command procedures. 
- *
- * Copyright (c) 1990-1994 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclEvent.c,v 1.4 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The data structure below is used to report background errors.  One
- * such structure is allocated for each error;  it holds information
- * about the interpreter and the error until bgerror can be invoked
- * later as an idle handler.
- */
-
-typedef struct BgError {
-    Tcl_Interp *interp;		/* Interpreter in which error occurred.  NULL
-				 * means this error report has been cancelled
-				 * (a previous report generated a break). */
-    char *errorMsg;		/* Copy of the error message (the interp's
-				 * result when the error occurred).
-				 * Malloc-ed. */
-    char *errorInfo;		/* Value of the errorInfo variable
-				 * (malloc-ed). */
-    char *errorCode;		/* Value of the errorCode variable
-				 * (malloc-ed). */
-    struct BgError *nextPtr;	/* Next in list of all pending error
-				 * reports for this interpreter, or NULL
-				 * for end of list. */
-} BgError;
-
-/*
- * One of the structures below is associated with the "tclBgError"
- * assoc data for each interpreter.  It keeps track of the head and
- * tail of the list of pending background errors for the interpreter.
- */
-
-typedef struct ErrAssocData {
-    BgError *firstBgPtr;	/* First in list of all background errors
-				 * waiting to be processed for this
-				 * interpreter (NULL if none). */
-    BgError *lastBgPtr;		/* Last in list of all background errors
-				 * waiting to be processed for this
-				 * interpreter (NULL if none). */
-} ErrAssocData;
-
-/*
- * For each exit handler created with a call to Tcl_CreateExitHandler
- * there is a structure of the following type:
- */
-
-typedef struct ExitHandler {
-    Tcl_ExitProc *proc;		/* Procedure to call when process exits. */
-    ClientData clientData;	/* One word of information to pass to proc. */
-    struct ExitHandler *nextPtr;/* Next in list of all exit handlers for
-				 * this application, or NULL for end of list. */
-} ExitHandler;
-
-/*
- * There is both per-process and per-thread exit handlers.
- * The first list is controlled by a mutex.  The other is in
- * thread local storage.
- */
-
-static ExitHandler *firstExitPtr = NULL;
-				/* First in list of all exit handlers for
-				 * application. */
-TCL_DECLARE_MUTEX(exitMutex)
-
-/*
- * This variable is set to 1 when Tcl_Finalize is called, and at the end of
- * its work, it is reset to 0. The variable is checked by TclInExit() to
- * allow different behavior for exit-time processing, e.g. in closing of
- * files and pipes.
- */
-
-static int inFinalize = 0;
-static int subsystemsInitialized = 0;
-static int encodingsInitialized  = 0;
-
-static Tcl_Obj *tclLibraryPath = NULL;
-
-typedef struct ThreadSpecificData {
-    ExitHandler *firstExitPtr;  /* First in list of all exit handlers for
-				 * this thread. */
-    int inExit;			/* True when this thread is exiting. This
-				 * is used as a hack to decide to close
-				 * the standard channels. */
-} ThreadSpecificData;
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Prototypes for procedures referenced only in this file:
- */
-
-static void		BgErrorDeleteProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp));
-static void		HandleBgErrors _ANSI_ARGS_((ClientData clientData));
-static char *		VwaitVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, char *name2,
-			    int flags));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_BackgroundError --
- *
- *	This procedure is invoked to handle errors that occur in Tcl
- *	commands that are invoked in "background" (e.g. from event or
- *	timer bindings).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The command "bgerror" is invoked later as an idle handler to
- *	process the error, passing it the error message.  If that fails,
- *	then an error message is output on stderr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_BackgroundError(interp)
-    Tcl_Interp *interp;		/* Interpreter in which an error has
-				 * occurred. */
-{
-    BgError *errPtr;
-    char *errResult, *varValue;
-    ErrAssocData *assocPtr;
-    int length;
-
-    /*
-     * The Tcl_AddErrorInfo call below (with an empty string) ensures that
-     * errorInfo gets properly set.  It's needed in cases where the error
-     * came from a utility procedure like Tcl_GetVar instead of Tcl_Eval;
-     * in these cases errorInfo still won't have been set when this
-     * procedure is called.
-     */
-
-    Tcl_AddErrorInfo(interp, "");
-
-    errResult = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &length);
-	
-    errPtr = (BgError *) ckalloc(sizeof(BgError));
-    errPtr->interp = interp;
-    errPtr->errorMsg = (char *) ckalloc((unsigned) (length + 1));
-    memcpy(errPtr->errorMsg, errResult, (size_t) (length + 1));
-    varValue = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-    if (varValue == NULL) {
-	varValue = errPtr->errorMsg;
-    }
-    errPtr->errorInfo = (char *) ckalloc((unsigned) (strlen(varValue) + 1));
-    strcpy(errPtr->errorInfo, varValue);
-    varValue = Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY);
-    if (varValue == NULL) {
-	varValue = "";
-    }
-    errPtr->errorCode = (char *) ckalloc((unsigned) (strlen(varValue) + 1));
-    strcpy(errPtr->errorCode, varValue);
-    errPtr->nextPtr = NULL;
-
-    assocPtr = (ErrAssocData *) Tcl_GetAssocData(interp, "tclBgError",
-	    (Tcl_InterpDeleteProc **) NULL);
-    if (assocPtr == NULL) {
-
-	/*
-	 * This is the first time a background error has occurred in
-	 * this interpreter.  Create associated data to keep track of
-	 * pending error reports.
-	 */
-
-	assocPtr = (ErrAssocData *) ckalloc(sizeof(ErrAssocData));
-	assocPtr->firstBgPtr = NULL;
-	assocPtr->lastBgPtr = NULL;
-	Tcl_SetAssocData(interp, "tclBgError", BgErrorDeleteProc,
-		(ClientData) assocPtr);
-    }
-    if (assocPtr->firstBgPtr == NULL) {
-	assocPtr->firstBgPtr = errPtr;
-	Tcl_DoWhenIdle(HandleBgErrors, (ClientData) assocPtr);
-    } else {
-	assocPtr->lastBgPtr->nextPtr = errPtr;
-    }
-    assocPtr->lastBgPtr = errPtr;
-    Tcl_ResetResult(interp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * HandleBgErrors --
- *
- *	This procedure is invoked as an idle handler to process all of
- *	the accumulated background errors.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on what actions "bgerror" takes for the errors.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-HandleBgErrors(clientData)
-    ClientData clientData;	/* Pointer to ErrAssocData structure. */
-{
-    Tcl_Interp *interp;
-    char *argv[2];
-    int code;
-    BgError *errPtr;
-    ErrAssocData *assocPtr = (ErrAssocData *) clientData;
-    Tcl_Channel errChannel;
-
-    Tcl_Preserve((ClientData) assocPtr);
-    
-    while (assocPtr->firstBgPtr != NULL) {
-	interp = assocPtr->firstBgPtr->interp;
-	if (interp == NULL) {
-	    goto doneWithInterp;
-	}
-
-	/*
-	 * Restore important state variables to what they were at
-	 * the time the error occurred.
-	 */
-
-	Tcl_SetVar(interp, "errorInfo", assocPtr->firstBgPtr->errorInfo,
-		TCL_GLOBAL_ONLY);
-	Tcl_SetVar(interp, "errorCode", assocPtr->firstBgPtr->errorCode,
-		TCL_GLOBAL_ONLY);
-
-	/*
-	 * Create and invoke the bgerror command.
-	 */
-
-	argv[0] = "bgerror";
-	argv[1] = assocPtr->firstBgPtr->errorMsg;
-	
-	Tcl_AllowExceptions(interp);
-        Tcl_Preserve((ClientData) interp);
-	code = TclGlobalInvoke(interp, 2, argv, 0);
-	if (code == TCL_ERROR) {
-
-            /*
-             * If the interpreter is safe, we look for a hidden command
-             * named "bgerror" and call that with the error information.
-             * Otherwise, simply ignore the error. The rationale is that
-             * this could be an error caused by a malicious applet trying
-             * to cause an infinite barrage of error messages. The hidden
-             * "bgerror" command can be used by a security policy to
-             * interpose on such attacks and e.g. kill the applet after a
-             * few attempts.
-             */
-
-            if (Tcl_IsSafe(interp)) {
-		Tcl_SavedResult save;
-		
-		Tcl_SaveResult(interp, &save);
-                TclGlobalInvoke(interp, 2, argv, TCL_INVOKE_HIDDEN);
-		Tcl_RestoreResult(interp, &save);
-
-                goto doneWithInterp;
-            } 
-
-            /*
-             * We have to get the error output channel at the latest possible
-             * time, because the eval (above) might have changed the channel.
-             */
-            
-            errChannel = Tcl_GetStdChannel(TCL_STDERR);
-            if (errChannel != (Tcl_Channel) NULL) {
-		char *string;
-		int len;
-
-		string = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &len);
-                if (strcmp(string, "\"bgerror\" is an invalid command name or ambiguous abbreviation") == 0) {
-                    Tcl_WriteChars(errChannel, assocPtr->firstBgPtr->errorInfo, -1);
-                    Tcl_WriteChars(errChannel, "\n", -1);
-                } else {
-                    Tcl_WriteChars(errChannel,
-                            "bgerror failed to handle background error.\n",
-                            -1);
-                    Tcl_WriteChars(errChannel, "    Original error: ", -1);
-                    Tcl_WriteChars(errChannel, assocPtr->firstBgPtr->errorMsg,
-                            -1);
-                    Tcl_WriteChars(errChannel, "\n", -1);
-                    Tcl_WriteChars(errChannel, "    Error in bgerror: ", -1);
-                    Tcl_WriteChars(errChannel, string, len);
-                    Tcl_WriteChars(errChannel, "\n", -1);
-                }
-                Tcl_Flush(errChannel);
-            }
-	} else if (code == TCL_BREAK) {
-
-	    /*
-	     * Break means cancel any remaining error reports for this
-	     * interpreter.
-	     */
-
-	    for (errPtr = assocPtr->firstBgPtr; errPtr != NULL;
-		    errPtr = errPtr->nextPtr) {
-		if (errPtr->interp == interp) {
-		    errPtr->interp = NULL;
-		}
-	    }
-	}
-
-	/*
-	 * Discard the command and the information about the error report.
-	 */
-
-doneWithInterp:
-
-	if (assocPtr->firstBgPtr) {
-	    ckfree(assocPtr->firstBgPtr->errorMsg);
-	    ckfree(assocPtr->firstBgPtr->errorInfo);
-	    ckfree(assocPtr->firstBgPtr->errorCode);
-	    errPtr = assocPtr->firstBgPtr->nextPtr;
-	    ckfree((char *) assocPtr->firstBgPtr);
-	    assocPtr->firstBgPtr = errPtr;
-	}
-        
-        if (interp != NULL) {
-            Tcl_Release((ClientData) interp);
-        }
-    }
-    assocPtr->lastBgPtr = NULL;
-
-    Tcl_Release((ClientData) assocPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * BgErrorDeleteProc --
- *
- *	This procedure is associated with the "tclBgError" assoc data
- *	for an interpreter;  it is invoked when the interpreter is
- *	deleted in order to free the information assoicated with any
- *	pending error reports.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Background error information is freed: if there were any
- *	pending error reports, they are cancelled.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-BgErrorDeleteProc(clientData, interp)
-    ClientData clientData;	/* Pointer to ErrAssocData structure. */
-    Tcl_Interp *interp;		/* Interpreter being deleted. */
-{
-    ErrAssocData *assocPtr = (ErrAssocData *) clientData;
-    BgError *errPtr;
-
-    while (assocPtr->firstBgPtr != NULL) {
-	errPtr = assocPtr->firstBgPtr;
-	assocPtr->firstBgPtr = errPtr->nextPtr;
-	ckfree(errPtr->errorMsg);
-	ckfree(errPtr->errorInfo);
-	ckfree(errPtr->errorCode);
-	ckfree((char *) errPtr);
-    }
-    Tcl_CancelIdleCall(HandleBgErrors, (ClientData) assocPtr);
-    Tcl_EventuallyFree((ClientData) assocPtr, TCL_DYNAMIC);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateExitHandler --
- *
- *	Arrange for a given procedure to be invoked just before the
- *	application exits.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Proc will be invoked with clientData as argument when the
- *	application exits.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateExitHandler(proc, clientData)
-    Tcl_ExitProc *proc;		/* Procedure to invoke. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    ExitHandler *exitPtr;
-
-    exitPtr = (ExitHandler *) ckalloc(sizeof(ExitHandler));
-    exitPtr->proc = proc;
-    exitPtr->clientData = clientData;
-    Tcl_MutexLock(&exitMutex);
-    exitPtr->nextPtr = firstExitPtr;
-    firstExitPtr = exitPtr;
-    Tcl_MutexUnlock(&exitMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteExitHandler --
- *
- *	This procedure cancels an existing exit handler matching proc
- *	and clientData, if such a handler exits.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there is an exit handler corresponding to proc and clientData
- *	then it is cancelled;  if no such handler exists then nothing
- *	happens.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteExitHandler(proc, clientData)
-    Tcl_ExitProc *proc;		/* Procedure that was previously registered. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    ExitHandler *exitPtr, *prevPtr;
-
-    Tcl_MutexLock(&exitMutex);
-    for (prevPtr = NULL, exitPtr = firstExitPtr; exitPtr != NULL;
-	    prevPtr = exitPtr, exitPtr = exitPtr->nextPtr) {
-	if ((exitPtr->proc == proc)
-		&& (exitPtr->clientData == clientData)) {
-	    if (prevPtr == NULL) {
-		firstExitPtr = exitPtr->nextPtr;
-	    } else {
-		prevPtr->nextPtr = exitPtr->nextPtr;
-	    }
-	    Tcl_MutexUnlock(&exitMutex);
-	    ckfree((char *) exitPtr);
-	    return;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateThreadExitHandler --
- *
- *	Arrange for a given procedure to be invoked just before the
- *	current thread exits.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Proc will be invoked with clientData as argument when the
- *	application exits.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateThreadExitHandler(proc, clientData)
-    Tcl_ExitProc *proc;		/* Procedure to invoke. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    ExitHandler *exitPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    exitPtr = (ExitHandler *) ckalloc(sizeof(ExitHandler));
-    exitPtr->proc = proc;
-    exitPtr->clientData = clientData;
-    exitPtr->nextPtr = tsdPtr->firstExitPtr;
-    tsdPtr->firstExitPtr = exitPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteThreadExitHandler --
- *
- *	This procedure cancels an existing exit handler matching proc
- *	and clientData, if such a handler exits.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there is an exit handler corresponding to proc and clientData
- *	then it is cancelled;  if no such handler exists then nothing
- *	happens.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteThreadExitHandler(proc, clientData)
-    Tcl_ExitProc *proc;		/* Procedure that was previously registered. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    ExitHandler *exitPtr, *prevPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    for (prevPtr = NULL, exitPtr = tsdPtr->firstExitPtr; exitPtr != NULL;
-	    prevPtr = exitPtr, exitPtr = exitPtr->nextPtr) {
-	if ((exitPtr->proc == proc)
-		&& (exitPtr->clientData == clientData)) {
-	    if (prevPtr == NULL) {
-		tsdPtr->firstExitPtr = exitPtr->nextPtr;
-	    } else {
-		prevPtr->nextPtr = exitPtr->nextPtr;
-	    }
-	    ckfree((char *) exitPtr);
-	    return;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Exit --
- *
- *	This procedure is called to terminate the application.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	All existing exit handlers are invoked, then the application
- *	ends.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Exit(status)
-    int status;			/* Exit status for application;  typically
-				 * 0 for normal return, 1 for error return. */
-{
-    Tcl_Finalize();
-    TclpExit(status);
-}
-
-/*
- *-------------------------------------------------------------------------
- * 
- * TclSetLibraryPath --
- *
- *	Set the path that will be used for searching for init.tcl and 
- *	encodings when an interp is being created.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Changing the library path will affect what directories are
- *	examined when looking for encodings for all interps from that
- *	point forward.
- *
- *	The refcount of the new library path is incremented and the 
- *	refcount of the old path is decremented.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclSetLibraryPath(pathPtr)
-    Tcl_Obj *pathPtr;		/* A Tcl list object whose elements are
-				 * the new library path. */
-{
-    Tcl_MutexLock(&exitMutex);
-    if (pathPtr != NULL) {
-	Tcl_IncrRefCount(pathPtr);
-    }
-    if (tclLibraryPath != NULL) {
-	Tcl_DecrRefCount(tclLibraryPath);
-    }
-    tclLibraryPath = pathPtr;
-    Tcl_MutexUnlock(&exitMutex);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclGetLibraryPath --
- *
- *	Return a Tcl list object whose elements are the library path.
- *	The caller should not modify the contents of the returned object.
- *
- * Results:
- *	As above.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclGetLibraryPath()
-{
-    return tclLibraryPath;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclInitSubsystems --
- *
- *	Initialize various subsytems in Tcl.  This should be called the
- *	first time an interp is created, or before any of the subsystems
- *	are used.  This function ensures an order for the initialization 
- *	of subsystems:
- *
- *	1. that cannot be initialized in lazy order because they are 
- *	mutually dependent.
- *
- *	2. so that they can be finalized in a known order w/o causing
- *	the subsequent re-initialization of a subsystem in the act of
- *	shutting down another.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Varied, see the respective initialization routines.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclInitSubsystems(argv0)
-    CONST char *argv0;		/* Name of executable from argv[0] to main()
-				 * in native multi-byte encoding. */
-{
-    ThreadSpecificData *tsdPtr;
-
-    if (inFinalize != 0) {
-	panic("TclInitSubsystems called while finalizing");
-    }
-
-    /*
-     * Grab the thread local storage pointer before doing anything because
-     * the initialization routines will be registering exit handlers.
-     * We use this pointer to detect if this is the first time this
-     * thread has created an interpreter.
-     */
-
-    tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (subsystemsInitialized == 0) {
-	/* 
-	 * Double check inside the mutex.  There are definitly calls
-	 * back into this routine from some of the procedures below.
-	 */
-
-	TclpInitLock();
-	if (subsystemsInitialized == 0) {
-	    /*
-	     * Have to set this bit here to avoid deadlock with the
-	     * routines below us that call into TclInitSubsystems.
-	     */
-
-	    subsystemsInitialized = 1;
-
-	    tclExecutableName = NULL;
-
-	    /*
-	     * Initialize locks used by the memory allocators before anything
-	     * interesting happens so we can use the allocators in the
-	     * implementation of self-initializing locks.
-	     */
-#if USE_TCLALLOC
-	    TclInitAlloc();
-#endif
-#ifdef TCL_MEM_DEBUG
-	    TclInitDbCkalloc();
-#endif
-
-	    TclpInitPlatform();
-    	    TclInitObjSubsystem();
-	    TclInitIOSubsystem();
-	    TclInitEncodingSubsystem();
-    	    TclInitNamespaceSubsystem();
-	}
-	TclpInitUnlock();
-    }
-
-    if (tsdPtr == NULL) {
-	/*
-	 * First time this thread has created an interpreter.
-	 * We fetch the key again just in case no exit handlers were
-	 * registered by this point.
-	 */
-
-	(void) TCL_TSD_INIT(&dataKey);
-	TclInitNotifier();
-     }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclFindEncodings --
- *
- *	Find and load the encoding file for this operating system.
- *	Before this is called, Tcl makes assumptions about the
- *	native string representation, but the true encoding is not
- *	assured.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Varied, see the respective initialization routines.
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclFindEncodings(argv0)
-    CONST char *argv0;		/* Name of executable from argv[0] to main()
-				 * in native multi-byte encoding. */
-{
-    char *native;
-    Tcl_Obj *pathPtr;
-    Tcl_DString libPath, buffer;
-
-    if (encodingsInitialized == 0) {
-	/* 
-	 * Double check inside the mutex.  There may be calls
-	 * back into this routine from some of the procedures below.
-	 */
-
-	TclpInitLock();
-	if (encodingsInitialized == 0) {
-	    /*
-	     * Have to set this bit here to avoid deadlock with the
-	     * routines below us that call into TclInitSubsystems.
-	     */
-
-	    encodingsInitialized = 1;
-
-	    native = TclpFindExecutable(argv0);
-	    TclpInitLibraryPath(native);
-
-	    /*
-	     * The library path was set in the TclpInitLibraryPath routine.
-	     * The string set is a dirty UTF string.  To preserve the value
-	     * convert the UTF string back to native before setting the new
-	     * default encoding.
-	     */
-	    
-	    pathPtr = TclGetLibraryPath();
-	    if (pathPtr != NULL) {
-		Tcl_UtfToExternalDString(NULL, Tcl_GetString(pathPtr), -1,
-			&libPath);
-	    }
-
-	    TclpSetInitialEncodings();
-
-	    /*
-	     * Now convert the native sting back to native string back to UTF.
-	     */
-	     
-	    if (pathPtr != NULL) {
-		Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(&libPath), -1,
-			&buffer);
-		pathPtr = Tcl_NewStringObj(Tcl_DStringValue(&buffer), -1);
-		TclSetLibraryPath(pathPtr);
-
-		Tcl_DStringFree(&libPath);
-		Tcl_DStringFree(&buffer);
-	    }
-	}
-	TclpInitUnlock();
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Finalize --
- *
- *	Shut down Tcl.  First calls registered exit handlers, then
- *	carefully shuts down various subsystems.
- *	Called by Tcl_Exit or when the Tcl shared library is being 
- *	unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Varied, see the respective finalization routines.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Finalize()
-{
-    ExitHandler *exitPtr;
-
-    TclpInitLock();
-    if (subsystemsInitialized != 0) {
-	subsystemsInitialized = 0;
-	encodingsInitialized  = 0;
-
-	/*
-	 * Invoke exit handlers first.
-	 */
-
-	Tcl_MutexLock(&exitMutex);
-	inFinalize = 1;
-	for (exitPtr = firstExitPtr; exitPtr != NULL; exitPtr = firstExitPtr) {
-	    /*
-	     * Be careful to remove the handler from the list before
-	     * invoking its callback.  This protects us against
-	     * double-freeing if the callback should call
-	     * Tcl_DeleteExitHandler on itself.
-	     */
-
-	    firstExitPtr = exitPtr->nextPtr;
-	    Tcl_MutexUnlock(&exitMutex);
-	    (*exitPtr->proc)(exitPtr->clientData);
-	    ckfree((char *) exitPtr);
-	    Tcl_MutexLock(&exitMutex);
-	}    
-	firstExitPtr = NULL;
-	Tcl_MutexUnlock(&exitMutex);
-
-	/*
-	 * Clean up after the current thread now, after exit handlers.
-	 * In particular, the testexithandler command sets up something
-	 * that writes to standard output, which gets closed.
-	 * Note that there is no thread-local storage after this call.
-	 */
-    
-	Tcl_FinalizeThread();
-
-	/*
-	 * Now finalize the Tcl execution environment.  Note that this
-	 * must be done after the exit handlers, because there are
-	 * order dependencies.
-	 */
-
-	TclFinalizeCompExecEnv();
-	TclFinalizeEnvironment();
-
-	TclFinalizeEncodingSubsystem();
-
-	if (tclLibraryPath != NULL) {
-	    Tcl_DecrRefCount(tclLibraryPath);
-	    tclLibraryPath = NULL;
-	}
-	if (tclExecutableName != NULL) {
-	    ckfree(tclExecutableName);
-	    tclExecutableName = NULL;
-	}
-	if (tclNativeExecutableName != NULL) {
-	    ckfree(tclNativeExecutableName);
-	    tclNativeExecutableName = NULL;
-	}
-	if (tclDefaultEncodingDir != NULL) {
-	    ckfree(tclDefaultEncodingDir);
-	    tclDefaultEncodingDir = NULL;
-	}
-	
-	Tcl_SetPanicProc(NULL);
-
-	/*
-	 * Free synchronization objects.  There really should only be one
-	 * thread alive at this moment.
-	 */
-
-	TclFinalizeSynchronization();
-
-	/*
-	 * We defer unloading of packages until very late 
-	 * to avoid memory access issues.  Both exit callbacks and
-	 * synchronization variables may be stored in packages.
-	 */
-
-	TclFinalizeLoad();
-
-	/*
-	 * There shouldn't be any malloc'ed memory after this.
-	 */
-
-	TclFinalizeMemorySubsystem();
-	inFinalize = 0;
-    }
-    TclpInitUnlock();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FinalizeThread --
- *
- *	Runs the exit handlers to allow Tcl to clean up its state
- *	about a particular thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Varied, see the respective finalization routines.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FinalizeThread()
-{
-    ExitHandler *exitPtr;
-    ThreadSpecificData *tsdPtr =
-	    (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    if (tsdPtr != NULL) {
-	/*
-	 * Invoke thread exit handlers first.
-	 */
-
-	tsdPtr->inExit = 1;
-	for (exitPtr = tsdPtr->firstExitPtr; exitPtr != NULL;
-		exitPtr = tsdPtr->firstExitPtr) {
-	    /*
-	     * Be careful to remove the handler from the list before invoking
-	     * its callback.  This protects us against double-freeing if the
-	     * callback should call Tcl_DeleteThreadExitHandler on itself.
-	     */
-
-	    tsdPtr->firstExitPtr = exitPtr->nextPtr;
-	    (*exitPtr->proc)(exitPtr->clientData);
-	    ckfree((char *) exitPtr);
-	}
-	TclFinalizeIOSubsystem();
-	TclFinalizeNotifier();
-
-	/*
-	 * Blow away all thread local storage blocks.
-	 */
-
-	TclFinalizeThreadData();
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInExit --
- *
- *	Determines if we are in the middle of exit-time cleanup.
- *
- * Results:
- *	If we are in the middle of exiting, 1, otherwise 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclInExit()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    return tsdPtr->inExit;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VwaitObjCmd --
- *
- *	This procedure is invoked to process the "vwait" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_VwaitObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int done, foundEvent;
-    char *nameString;
-
-    if (objc != 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "name");
-	return TCL_ERROR;
-    }
-    nameString = Tcl_GetString(objv[1]);
-    if (Tcl_TraceVar(interp, nameString,
-	    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    VwaitVarProc, (ClientData) &done) != TCL_OK) {
-	return TCL_ERROR;
-    };
-    done = 0;
-    foundEvent = 1;
-    while (!done && foundEvent) {
-	foundEvent = Tcl_DoOneEvent(TCL_ALL_EVENTS);
-    }
-    Tcl_UntraceVar(interp, nameString,
-	    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    VwaitVarProc, (ClientData) &done);
-
-    /*
-     * Clear out the interpreter's result, since it may have been set
-     * by event handlers.
-     */
-
-    Tcl_ResetResult(interp);
-    if (!foundEvent) {
-	Tcl_AppendResult(interp, "can't wait for variable \"", nameString,
-		"\":  would wait forever", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-	/* ARGSUSED */
-static char *
-VwaitVarProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Pointer to integer to set to 1. */
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
-    char *name2;		/* Second part of variable name. */
-    int flags;			/* Information about what happened. */
-{
-    int *donePtr = (int *) clientData;
-
-    *donePtr = 1;
-    return (char *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UpdateObjCmd --
- *
- *	This procedure is invoked to process the "update" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_UpdateObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int optionIndex;
-    int flags = 0;		/* Initialized to avoid compiler warning. */
-    static char *updateOptions[] = {"idletasks", (char *) NULL};
-    enum updateOptions {REGEXP_IDLETASKS};
-
-    if (objc == 1) {
-	flags = TCL_ALL_EVENTS|TCL_DONT_WAIT;
-    } else if (objc == 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[1], updateOptions,
-		"option", 0, &optionIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch ((enum updateOptions) optionIndex) {
-	    case REGEXP_IDLETASKS: {
-		flags = TCL_WINDOW_EVENTS|TCL_IDLE_EVENTS|TCL_DONT_WAIT;
-		break;
-	    }
-	    default: {
-		panic("Tcl_UpdateObjCmd: bad option index to UpdateOptions");
-	    }
-	}
-    } else {
-        Tcl_WrongNumArgs(interp, 1, objv, "?idletasks?");
-	return TCL_ERROR;
-    }
-    
-    while (Tcl_DoOneEvent(flags) != 0) {
-	/* Empty loop body */
-    }
-
-    /*
-     * Must clear the interpreter's result because event handlers could
-     * have executed commands.
-     */
-
-    Tcl_ResetResult(interp);
-    return TCL_OK;
-}
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
deleted file mode 100644
index 4378d34..0000000
--- a/generic/tclExecute.c
+++ /dev/null
@@ -1,5136 +0,0 @@
-/* 
- * tclExecute.c --
- *
- *	This file contains procedures that execute byte-compiled Tcl
- *	commands.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclExecute.c,v 1.6 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-#ifdef NO_FLOAT_H
-#   include "../compat/float.h"
-#else
-#   include <float.h>
-#endif
-#ifndef TCL_NO_MATH
-#include "tclMath.h"
-#endif
-
-/*
- * The stuff below is a bit of a hack so that this file can be used
- * in environments that include no UNIX, i.e. no errno.  Just define
- * errno here.
- */
-
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
-#define NO_ERRNO_H
-#endif
-
-#ifdef NO_ERRNO_H
-int errno;
-#define EDOM 33
-#define ERANGE 34
-#endif
-
-/*
- * Boolean flag indicating whether the Tcl bytecode interpreter has been
- * initialized.
- */
-
-static int execInitialized = 0;
-TCL_DECLARE_MUTEX(execMutex)
-
-/*
- * Variable that controls whether execution tracing is enabled and, if so,
- * what level of tracing is desired:
- *    0: no execution tracing
- *    1: trace invocations of Tcl procs only
- *    2: trace invocations of all (not compiled away) commands
- *    3: display each instruction executed
- * This variable is linked to the Tcl variable "tcl_traceExec".
- */
-
-int tclTraceExec = 0;
-
-typedef struct ThreadSpecificData {
-    /*
-     * The following global variable is use to signal matherr that Tcl
-     * is responsible for the arithmetic, so errors can be handled in a
-     * fashion appropriate for Tcl.  Zero means no Tcl math is in
-     * progress;  non-zero means Tcl is doing math.
-     */
-    
-    int mathInProgress;
-
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The variable below serves no useful purpose except to generate
- * a reference to matherr, so that the Tcl version of matherr is
- * linked in rather than the system version. Without this reference
- * the need for matherr won't be discovered during linking until after
- * libtcl.a has been processed, so Tcl's version won't be used.
- */
-
-#ifdef NEED_MATHERR
-extern int matherr();
-int (*tclMatherrPtr)() = matherr;
-#endif
-
-/*
- * Mapping from expression instruction opcodes to strings; used for error
- * messages. Note that these entries must match the order and number of the
- * expression opcodes (e.g., INST_LOR) in tclCompile.h.
- */
-
-static char *operatorStrings[] = {
-    "||", "&&", "|", "^", "&", "==", "!=", "<", ">", "<=", ">=", "<<", ">>",
-    "+", "-", "*", "/", "%", "+", "-", "~", "!",
-    "BUILTIN FUNCTION", "FUNCTION"
-};
-    
-/*
- * Mapping from Tcl result codes to strings; used for error and debugging
- * messages. 
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static char *resultStrings[] = {
-    "TCL_OK", "TCL_ERROR", "TCL_RETURN", "TCL_BREAK", "TCL_CONTINUE"
-};
-#endif
-
-/*
- * Macros for testing floating-point values for certain special cases. Test
- * for not-a-number by comparing a value against itself; test for infinity
- * by comparing against the largest floating-point value.
- */
-
-#define IS_NAN(v) ((v) != (v))
-#ifdef DBL_MAX
-#   define IS_INF(v) (((v) > DBL_MAX) || ((v) < -DBL_MAX))
-#else
-#   define IS_INF(v) 0
-#endif
-
-/*
- * Macro to adjust the program counter and restart the instruction execution
- * loop after each instruction is executed.
- */
-
-#define ADJUST_PC(instBytes) \
-    pc += (instBytes); \
-    continue
-
-/*
- * Macros used to cache often-referenced Tcl evaluation stack information
- * in local variables. Note that a DECACHE_STACK_INFO()-CACHE_STACK_INFO()
- * pair must surround any call inside TclExecuteByteCode (and a few other
- * procedures that use this scheme) that could result in a recursive call
- * to TclExecuteByteCode.
- */
-
-#define CACHE_STACK_INFO() \
-    stackPtr = eePtr->stackPtr; \
-    stackTop = eePtr->stackTop
-
-#define DECACHE_STACK_INFO() \
-    eePtr->stackTop = stackTop
-
-/*
- * Macros used to access items on the Tcl evaluation stack. PUSH_OBJECT
- * increments the object's ref count since it makes the stack have another
- * reference pointing to the object. However, POP_OBJECT does not decrement
- * the ref count. This is because the stack may hold the only reference to
- * the object, so the object would be destroyed if its ref count were
- * decremented before the caller had a chance to, e.g., store it in a
- * variable. It is the caller's responsibility to decrement the ref count
- * when it is finished with an object.
- *
- * WARNING! It is essential that objPtr only appear once in the PUSH_OBJECT
- * macro. The actual parameter might be an expression with side effects,
- * and this ensures that it will be executed only once. 
- */
-    
-#define PUSH_OBJECT(objPtr) \
-    Tcl_IncrRefCount(stackPtr[++stackTop] = (objPtr))
-    
-#define POP_OBJECT() \
-    (stackPtr[stackTop--])
-
-/*
- * Macros used to trace instruction execution. The macros TRACE,
- * TRACE_WITH_OBJ, and O2S are only used inside TclExecuteByteCode.
- * O2S is only used in TRACE* calls to get a string from an object.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-#define TRACE(a) \
-    if (traceInstructions) { \
-        fprintf(stdout, "%2d: %2d (%u) %s ", iPtr->numLevels, stackTop, \
-	       (unsigned int)(pc - codePtr->codeStart), \
-	       GetOpcodeName(pc)); \
-	printf a; \
-    }
-#define TRACE_WITH_OBJ(a, objPtr) \
-    if (traceInstructions) { \
-        fprintf(stdout, "%2d: %2d (%u) %s ", iPtr->numLevels, stackTop, \
-	       (unsigned int)(pc - codePtr->codeStart), \
-	       GetOpcodeName(pc)); \
-	printf a; \
-        TclPrintObject(stdout, (objPtr), 30); \
-        fprintf(stdout, "\n"); \
-    }
-#define O2S(objPtr) \
-    Tcl_GetString(objPtr)
-#else
-#define TRACE(a)
-#define TRACE_WITH_OBJ(a, objPtr)
-#define O2S(objPtr)
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- * Declarations for local procedures to this file:
- */
-
-static void		CallTraceProcedure _ANSI_ARGS_((Tcl_Interp *interp,
-			    Trace *tracePtr, Command *cmdPtr,
-			    char *command, int numChars,
-			    int objc, Tcl_Obj *objv[]));
-static void		DupCmdNameInternalRep _ANSI_ARGS_((Tcl_Obj *objPtr,
-			    Tcl_Obj *copyPtr));
-static int		ExprAbsFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprBinaryFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprCallMathFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, int objc, Tcl_Obj **objv));
-static int		ExprDoubleFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprIntFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprRandFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprRoundFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprSrandFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-static int		ExprUnaryFunc _ANSI_ARGS_((Tcl_Interp *interp,
-			    ExecEnv *eePtr, ClientData clientData));
-#ifdef TCL_COMPILE_STATS
-static int              EvalStatsCmd _ANSI_ARGS_((ClientData clientData,
-                            Tcl_Interp *interp, int argc, char **argv));
-#endif
-static void		FreeCmdNameInternalRep _ANSI_ARGS_((
-    			    Tcl_Obj *objPtr));
-#ifdef TCL_COMPILE_DEBUG
-static char *		GetOpcodeName _ANSI_ARGS_((unsigned char *pc));
-#endif
-static ExceptionRange *	GetExceptRangeForPc _ANSI_ARGS_((unsigned char *pc,
-			    int catchOnly, ByteCode* codePtr));
-static char *		GetSrcInfoForPc _ANSI_ARGS_((unsigned char *pc,
-        		    ByteCode* codePtr, int *lengthPtr));
-static void		GrowEvaluationStack _ANSI_ARGS_((ExecEnv *eePtr));
-static void		IllegalExprOperandType _ANSI_ARGS_((
-			    Tcl_Interp *interp, unsigned char *pc,
-			    Tcl_Obj *opndPtr));
-static void		InitByteCodeExecution _ANSI_ARGS_((
-			    Tcl_Interp *interp));
-#ifdef TCL_COMPILE_DEBUG
-static void		PrintByteCodeInfo _ANSI_ARGS_((ByteCode *codePtr));
-#endif
-static int		SetCmdNameFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-#ifdef TCL_COMPILE_DEBUG
-static char *		StringForResultCode _ANSI_ARGS_((int result));
-static void		ValidatePcAndStackTop _ANSI_ARGS_((
-			    ByteCode *codePtr, unsigned char *pc,
-			    int stackTop, int stackLowerBound,
-			    int stackUpperBound));
-#endif
-
-/*
- * Table describing the built-in math functions. Entries in this table are
- * indexed by the values of the INST_CALL_BUILTIN_FUNC instruction's
- * operand byte.
- */
-
-BuiltinFunc builtinFuncTable[] = {
-#ifndef TCL_NO_MATH
-    {"acos", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) acos},
-    {"asin", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) asin},
-    {"atan", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) atan},
-    {"atan2", 2, {TCL_DOUBLE, TCL_DOUBLE}, ExprBinaryFunc, (ClientData) atan2},
-    {"ceil", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) ceil},
-    {"cos", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) cos},
-    {"cosh", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) cosh},
-    {"exp", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) exp},
-    {"floor", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) floor},
-    {"fmod", 2, {TCL_DOUBLE, TCL_DOUBLE}, ExprBinaryFunc, (ClientData) fmod},
-    {"hypot", 2, {TCL_DOUBLE, TCL_DOUBLE}, ExprBinaryFunc, (ClientData) hypot},
-    {"log", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) log},
-    {"log10", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) log10},
-    {"pow", 2, {TCL_DOUBLE, TCL_DOUBLE}, ExprBinaryFunc, (ClientData) pow},
-    {"sin", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) sin},
-    {"sinh", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) sinh},
-    {"sqrt", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) sqrt},
-    {"tan", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) tan},
-    {"tanh", 1, {TCL_DOUBLE}, ExprUnaryFunc, (ClientData) tanh},
-#endif
-    {"abs", 1, {TCL_EITHER}, ExprAbsFunc, 0},
-    {"double", 1, {TCL_EITHER}, ExprDoubleFunc, 0},
-    {"int", 1, {TCL_EITHER}, ExprIntFunc, 0},
-    {"rand", 0, {TCL_EITHER}, ExprRandFunc, 0},	/* NOTE: rand takes no args. */
-    {"round", 1, {TCL_EITHER}, ExprRoundFunc, 0},
-    {"srand", 1, {TCL_INT}, ExprSrandFunc, 0},
-    {0},
-};
-
-/*
- * The structure below defines the command name Tcl object type by means of
- * procedures that can be invoked by generic object code. Objects of this
- * type cache the Command pointer that results from looking up command names
- * in the command hashtable. Such objects appear as the zeroth ("command
- * name") argument in a Tcl command.
- */
-
-Tcl_ObjType tclCmdNameType = {
-    "cmdName",				/* name */
-    FreeCmdNameInternalRep,		/* freeIntRepProc */
-    DupCmdNameInternalRep,		/* dupIntRepProc */
-    (Tcl_UpdateStringProc *) NULL,	/* updateStringProc */
-    SetCmdNameFromAny			/* setFromAnyProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * InitByteCodeExecution --
- *
- *	This procedure is called once to initialize the Tcl bytecode
- *	interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This procedure initializes the array of instruction names. If
- *	compiling with the TCL_COMPILE_STATS flag, it initializes the
- *	array that counts the executions of each instruction and it
- *	creates the "evalstats" command. It also registers the command name
- *	Tcl_ObjType. It also establishes the link between the Tcl
- *	"tcl_traceExec" and C "tclTraceExec" variables.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-InitByteCodeExecution(interp)
-    Tcl_Interp *interp;		/* Interpreter for which the Tcl variable
-				 * "tcl_traceExec" is linked to control
-				 * instruction tracing. */
-{
-    Tcl_RegisterObjType(&tclCmdNameType);
-    if (Tcl_LinkVar(interp, "tcl_traceExec", (char *) &tclTraceExec,
-		    TCL_LINK_INT) != TCL_OK) {
-	panic("InitByteCodeExecution: can't create link for tcl_traceExec variable");
-    }
-
-#ifdef TCL_COMPILE_STATS    
-    Tcl_CreateCommand(interp, "evalstats", EvalStatsCmd,
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
-#endif /* TCL_COMPILE_STATS */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreateExecEnv --
- *
- *	This procedure creates a new execution environment for Tcl bytecode
- *	execution. An ExecEnv points to a Tcl evaluation stack. An ExecEnv
- *	is typically created once for each Tcl interpreter (Interp
- *	structure) and recursively passed to TclExecuteByteCode to execute
- *	ByteCode sequences for nested commands.
- *
- * Results:
- *	A newly allocated ExecEnv is returned. This points to an empty
- *	evaluation stack of the standard initial size.
- *
- * Side effects:
- *	The bytecode interpreter is also initialized here, as this
- *	procedure will be called before any call to TclExecuteByteCode.
- *
- *----------------------------------------------------------------------
- */
-
-#define TCL_STACK_INITIAL_SIZE 2000
-
-ExecEnv *
-TclCreateExecEnv(interp)
-    Tcl_Interp *interp;		/* Interpreter for which the execution
-				 * environment is being created. */
-{
-    ExecEnv *eePtr = (ExecEnv *) ckalloc(sizeof(ExecEnv));
-
-    eePtr->stackPtr = (Tcl_Obj **)
-	ckalloc((unsigned) (TCL_STACK_INITIAL_SIZE * sizeof(Tcl_Obj *)));
-    eePtr->stackTop = -1;
-    eePtr->stackEnd = (TCL_STACK_INITIAL_SIZE - 1);
-
-    Tcl_MutexLock(&execMutex);
-    if (!execInitialized) {
-	TclInitAuxDataTypeTable();
-	InitByteCodeExecution(interp);
-	execInitialized = 1;
-    }
-    Tcl_MutexUnlock(&execMutex);
-
-    return eePtr;
-}
-#undef TCL_STACK_INITIAL_SIZE
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDeleteExecEnv --
- *
- *	Frees the storage for an ExecEnv.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Storage for an ExecEnv and its contained storage (e.g. the
- *	evaluation stack) is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclDeleteExecEnv(eePtr)
-    ExecEnv *eePtr;		/* Execution environment to free. */
-{
-    ckfree((char *) eePtr->stackPtr);
-    ckfree((char *) eePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeExecution --
- *
- *	Finalizes the execution environment setup so that it can be
- *	later reinitialized.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	After this call, the next time TclCreateExecEnv will be called
- *	it will call InitByteCodeExecution.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeExecution()
-{
-    Tcl_MutexLock(&execMutex);
-    execInitialized = 0;
-    Tcl_MutexUnlock(&execMutex);
-    TclFinalizeAuxDataTypeTable();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GrowEvaluationStack --
- *
- *	This procedure grows a Tcl evaluation stack stored in an ExecEnv.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The size of the evaluation stack is doubled.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-GrowEvaluationStack(eePtr)
-    register ExecEnv *eePtr; /* Points to the ExecEnv with an evaluation
-			      * stack to enlarge. */
-{
-    /*
-     * The current Tcl stack elements are stored from eePtr->stackPtr[0]
-     * to eePtr->stackPtr[eePtr->stackEnd] (inclusive).
-     */
-
-    int currElems = (eePtr->stackEnd + 1);
-    int newElems  = 2*currElems;
-    int currBytes = currElems * sizeof(Tcl_Obj *);
-    int newBytes  = 2*currBytes;
-    Tcl_Obj **newStackPtr = (Tcl_Obj **) ckalloc((unsigned) newBytes);
-
-    /*
-     * Copy the existing stack items to the new stack space, free the old
-     * storage if appropriate, and mark new space as malloc'ed.
-     */
- 
-    memcpy((VOID *) newStackPtr, (VOID *) eePtr->stackPtr,
-	   (size_t) currBytes);
-    ckfree((char *) eePtr->stackPtr);
-    eePtr->stackPtr = newStackPtr;
-    eePtr->stackEnd = (newElems - 1); /* i.e. index of last usable item */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclExecuteByteCode --
- *
- *	This procedure executes the instructions of a ByteCode structure.
- *	It returns when a "done" instruction is executed or an error occurs.
- *
- * Results:
- *	The return value is one of the return codes defined in tcl.h
- *	(such as TCL_OK), and interp->objResultPtr refers to a Tcl object
- *	that either contains the result of executing the code or an
- *	error message.
- *
- * Side effects:
- *	Almost certainly, depending on the ByteCode's instructions.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclExecuteByteCode(interp, codePtr)
-    Tcl_Interp *interp;		/* Token for command interpreter. */
-    ByteCode *codePtr;		/* The bytecode sequence to interpret. */
-{
-    Interp *iPtr = (Interp *) interp;
-    ExecEnv *eePtr = iPtr->execEnvPtr;
-    				/* Points to the execution environment. */
-    register Tcl_Obj **stackPtr = eePtr->stackPtr;
-    				/* Cached evaluation stack base pointer. */
-    register int stackTop = eePtr->stackTop;
-    				/* Cached top index of evaluation stack. */
-    register unsigned char *pc = codePtr->codeStart;
-				/* The current program counter. */
-    int opnd;			/* Current instruction's operand byte. */
-    int pcAdjustment;		/* Hold pc adjustment after instruction. */
-    int initStackTop = stackTop;/* Stack top at start of execution. */
-    ExceptionRange *rangePtr;	/* Points to closest loop or catch exception
-				 * range enclosing the pc. Used by various
-				 * instructions and processCatch to
-				 * process break, continue, and errors. */
-    int result = TCL_OK;	/* Return code returned after execution. */
-    int traceInstructions = (tclTraceExec == 3);
-    Tcl_Obj *valuePtr, *value2Ptr, *objPtr;
-    char *bytes;
-    int length;
-    long i;
-
-    /*
-     * This procedure uses a stack to hold information about catch commands.
-     * This information is the current operand stack top when starting to
-     * execute the code for each catch command. It starts out with stack-
-     * allocated space but uses dynamically-allocated storage if needed.
-     */
-
-#define STATIC_CATCH_STACK_SIZE 4
-    int (catchStackStorage[STATIC_CATCH_STACK_SIZE]);
-    int *catchStackPtr = catchStackStorage;
-    int catchTop = -1;
-
-#ifdef TCL_COMPILE_DEBUG
-    if (tclTraceExec >= 2) {
-	PrintByteCodeInfo(codePtr);
-	fprintf(stdout, "  Starting stack top=%d\n", eePtr->stackTop);
-	fflush(stdout);
-    }
-#endif
-    
-#ifdef TCL_COMPILE_STATS
-    iPtr->stats.numExecutions++;
-#endif
-
-    /*
-     * Make sure the catch stack is large enough to hold the maximum number
-     * of catch commands that could ever be executing at the same time. This
-     * will be no more than the exception range array's depth.
-     */
-
-    if (codePtr->maxExceptDepth > STATIC_CATCH_STACK_SIZE) {
-	catchStackPtr = (int *)
-	        ckalloc(codePtr->maxExceptDepth * sizeof(int));
-    }
-
-    /*
-     * Make sure the stack has enough room to execute this ByteCode.
-     */
-
-    while ((stackTop + codePtr->maxStackDepth) > eePtr->stackEnd) {
-        GrowEvaluationStack(eePtr); 
-        stackPtr = eePtr->stackPtr;
-    }
-
-    /*
-     * Loop executing instructions until a "done" instruction, a TCL_RETURN,
-     * or some error.
-     */
-
-    for (;;) {
-#ifdef TCL_COMPILE_DEBUG
-	ValidatePcAndStackTop(codePtr, pc, stackTop, initStackTop,
-		eePtr->stackEnd);
-#else /* not TCL_COMPILE_DEBUG */
-        if (traceInstructions) {
-            fprintf(stdout, "%2d: %2d ", iPtr->numLevels, stackTop);
-            TclPrintInstruction(codePtr, pc);
-            fflush(stdout);
-        }
-#endif /* TCL_COMPILE_DEBUG */
-	
-#ifdef TCL_COMPILE_STATS    
-	iPtr->stats.instructionCount[*pc]++;
-#endif
-        switch (*pc) {
-	case INST_DONE:
-	    /*
-	     * Pop the topmost object from the stack, set the interpreter's
-	     * object result to point to it, and return.
-	     */
-	    valuePtr = POP_OBJECT();
-	    Tcl_SetObjResult(interp, valuePtr);
-	    TclDecrRefCount(valuePtr);
-	    if (stackTop != initStackTop) {
-		fprintf(stderr, "\nTclExecuteByteCode: done instruction at pc %u: stack top %d != entry stack top %d\n",
-			(unsigned int)(pc - codePtr->codeStart),
-			(unsigned int) stackTop,
-			(unsigned int) initStackTop);
-		panic("TclExecuteByteCode execution failure: end stack top != start stack top");
-	    }
-	    TRACE_WITH_OBJ(("=> return code=%d, result=", result),
-		    iPtr->objResultPtr);
-#ifdef TCL_COMPILE_DEBUG	    
-	    if (traceInstructions) {
-		fprintf(stdout, "\n");
-	    }
-#endif
-	    goto done;
-	    
-	case INST_PUSH1:
-#ifdef TCL_COMPILE_DEBUG
-	    valuePtr = codePtr->objArrayPtr[TclGetUInt1AtPtr(pc+1)];
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("%u => ", TclGetInt1AtPtr(pc+1)), valuePtr);
-#else
-	    PUSH_OBJECT(codePtr->objArrayPtr[TclGetUInt1AtPtr(pc+1)]);
-#endif /* TCL_COMPILE_DEBUG */
-	    ADJUST_PC(2);
-	    
-	case INST_PUSH4:
-	    valuePtr = codePtr->objArrayPtr[TclGetUInt4AtPtr(pc+1)];
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("%u => ", TclGetUInt4AtPtr(pc+1)), valuePtr);
-	    ADJUST_PC(5);
-	    
-	case INST_POP:
-	    valuePtr = POP_OBJECT();
-	    TRACE_WITH_OBJ(("=> discarding "), valuePtr);
-	    TclDecrRefCount(valuePtr); /* finished with pop'ed object. */
-	    ADJUST_PC(1);
-
-	case INST_DUP:
-	    valuePtr = stackPtr[stackTop];
-	    PUSH_OBJECT(Tcl_DuplicateObj(valuePtr));
-	    TRACE_WITH_OBJ(("=> "), valuePtr);
-	    ADJUST_PC(1);
-
-	case INST_CONCAT1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    {
-		Tcl_Obj *concatObjPtr;
-		int totalLen = 0;
-
-		/*
-		 * Concatenate strings (with no separators) from the top
-		 * opnd items on the stack starting with the deepest item.
-		 * First, determine how many characters are needed.
-		 */
-
-		for (i = (stackTop - (opnd-1));  i <= stackTop;  i++) {
-		    bytes = Tcl_GetStringFromObj(stackPtr[i], &length);
-		    if (bytes != NULL) {
-			totalLen += length;
-		    }
-                }
-
-		/*
-		 * Initialize the new append string object by appending the
-		 * strings of the opnd stack objects. Also pop the objects. 
-		 */
-
-		TclNewObj(concatObjPtr);
-		if (totalLen > 0) {
-		    char *p = (char *) ckalloc((unsigned) (totalLen + 1));
-		    concatObjPtr->bytes = p;
-		    concatObjPtr->length = totalLen;
-		    for (i = (stackTop - (opnd-1));  i <= stackTop;  i++) {
-			valuePtr = stackPtr[i];
-			bytes = Tcl_GetStringFromObj(valuePtr, &length);
-			if (bytes != NULL) {
-			    memcpy((VOID *) p, (VOID *) bytes,
-			            (size_t) length);
-			    p += length;
-			}
-			TclDecrRefCount(valuePtr);
-		    }
-		    *p = '\0';
-		} else {
-		    for (i = (stackTop - (opnd-1));  i <= stackTop;  i++) {
-			Tcl_DecrRefCount(stackPtr[i]);
-		    }
-		}
-		stackTop -= opnd;
-		
-		PUSH_OBJECT(concatObjPtr);
-		TRACE_WITH_OBJ(("%u => ", opnd), concatObjPtr);
-		ADJUST_PC(2);
-            }
-	    
-	case INST_INVOKE_STK4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doInvocation;
-
-	case INST_INVOKE_STK1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	    doInvocation:
-	    {
-		int objc = opnd; /* The number of arguments. */
-		Tcl_Obj **objv;	 /* The array of argument objects. */
-		Command *cmdPtr; /* Points to command's Command struct. */
-		int newPcOffset; /* New inst offset for break, continue. */
-#ifdef TCL_COMPILE_DEBUG
-		int isUnknownCmd = 0;
-		char cmdNameBuf[21];
-#endif /* TCL_COMPILE_DEBUG */
-		
-		/*
-		 * If the interpreter was deleted, return an error.
-		 */
-		
-		if (iPtr->flags & DELETED) {
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		            "attempt to call eval in deleted interpreter", -1);
-		    Tcl_SetErrorCode(interp, "CORE", "IDELETE",
-			    "attempt to call eval in deleted interpreter",
-			    (char *) NULL);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-    
-		/*
-		 * Find the procedure to execute this command. If the
-		 * command is not found, handle it with the "unknown" proc.
-		 */
-
-		objv = &(stackPtr[stackTop - (objc-1)]);
-		cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, objv[0]);
-		if (cmdPtr == NULL) {
-		    cmdPtr = (Command *) Tcl_FindCommand(interp, "unknown",
-                            (Tcl_Namespace *) NULL, TCL_GLOBAL_ONLY);
-                    if (cmdPtr == NULL) {
-			Tcl_ResetResult(interp);
-			Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			        "invalid command name \"",
-				Tcl_GetString(objv[0]), "\"",
-				(char *) NULL);
-			TRACE(("%u => unknown proc not found: ", objc));
-			result = TCL_ERROR;
-			goto checkForCatch;
-		    }
-#ifdef TCL_COMPILE_DEBUG
-		    isUnknownCmd = 1;
-#endif /*TCL_COMPILE_DEBUG*/			
-		    stackTop++; /* need room for new inserted objv[0] */
-		    for (i = objc-1;  i >= 0;  i--) {
-			objv[i+1] = objv[i];
-		    }
-		    objc++;
-		    objv[0] = Tcl_NewStringObj("unknown", -1);
-		    Tcl_IncrRefCount(objv[0]);
-		}
-		
-		/*
-		 * Call any trace procedures.
-		 */
-
-		if (iPtr->tracePtr != NULL) {
-		    Trace *tracePtr, *nextTracePtr;
-
-		    for (tracePtr = iPtr->tracePtr;  tracePtr != NULL;
-		            tracePtr = nextTracePtr) {
-			nextTracePtr = tracePtr->nextPtr;
-			if (iPtr->numLevels <= tracePtr->level) {
-			    int numChars;
-			    char *cmd = GetSrcInfoForPc(pc, codePtr,
-				    &numChars);
-			    if (cmd != NULL) {
-				DECACHE_STACK_INFO();
-				CallTraceProcedure(interp, tracePtr, cmdPtr,
-				        cmd, numChars, objc, objv);
-				CACHE_STACK_INFO();
-			    }
-			}
-		    }
-		}
-		
-		/*
-		 * Finally, invoke the command's Tcl_ObjCmdProc. First reset
-		 * the interpreter's string and object results to their
-		 * default empty values since they could have gotten changed
-		 * by earlier invocations.
-		 */
-		
-		Tcl_ResetResult(interp);
-		if (tclTraceExec >= 2) {
-#ifdef TCL_COMPILE_DEBUG
-		    if (traceInstructions) {
-			strncpy(cmdNameBuf, Tcl_GetString(objv[0]), 20);
-			TRACE(("%u => call ", (isUnknownCmd? objc-1:objc)));
-		    } else {
-			fprintf(stdout, "%d: (%u) invoking ",
-			        iPtr->numLevels,
-				(unsigned int)(pc - codePtr->codeStart));
-		    }
-		    for (i = 0;  i < objc;  i++) {
-			TclPrintObject(stdout, objv[i], 15);
-			fprintf(stdout, " ");
-		    }
-		    fprintf(stdout, "\n");
-		    fflush(stdout);
-#else /* TCL_COMPILE_DEBUG */
-		    fprintf(stdout, "%d: (%u) invoking %s\n",
-			    iPtr->numLevels,
-		            (unsigned int)(pc - codePtr->codeStart),
-			    Tcl_GetString(objv[0]));
-#endif /*TCL_COMPILE_DEBUG*/
-		}
-
-		iPtr->cmdCount++;
-		DECACHE_STACK_INFO();
-		result = (*cmdPtr->objProc)(cmdPtr->objClientData, interp,
-					    objc, objv);
-		if (Tcl_AsyncReady()) {
-		    result = Tcl_AsyncInvoke(interp, result);
-		}
-		CACHE_STACK_INFO();
-
-		/*
-		 * If the interpreter has a non-empty string result, the
-		 * result object is either empty or stale because some
-		 * procedure set interp->result directly. If so, move the
-		 * string result to the result object, then reset the
-		 * string result.
-		 */
-
-		if (*(iPtr->result) != 0) {
-		    (void) Tcl_GetObjResult(interp);
-		}
-		
-		/*
-		 * Pop the objc top stack elements and decrement their ref
-		 * counts. 
-		 */
-
-		for (i = 0;  i < objc;  i++) {
-		    valuePtr = stackPtr[stackTop];
-		    TclDecrRefCount(valuePtr);
-		    stackTop--;
-		}
-
-		/*
-		 * Process the result of the Tcl_ObjCmdProc call.
-		 */
-		
-		switch (result) {
-		case TCL_OK:
-		    /*
-		     * Push the call's object result and continue execution
-		     * with the next instruction.
-		     */
-		    PUSH_OBJECT(Tcl_GetObjResult(interp));
-		    TRACE_WITH_OBJ(("%u => ...after \"%.20s\", result=",
-		            objc, cmdNameBuf), Tcl_GetObjResult(interp));
-		    ADJUST_PC(pcAdjustment);
-		    
-		case TCL_BREAK:
-		case TCL_CONTINUE:
-		    /*
-		     * The invoked command requested a break or continue.
-		     * Find the closest enclosing loop or catch exception
-		     * range, if any. If a loop is found, terminate its
-		     * execution or skip to its next iteration. If the
-		     * closest is a catch exception range, jump to its
-		     * catchOffset. If no enclosing range is found, stop
-		     * execution and return the TCL_BREAK or TCL_CONTINUE.
-		     */
-		    rangePtr = GetExceptRangeForPc(pc, /*catchOnly*/ 0,
-			    codePtr);
-		    if (rangePtr == NULL) {
-		        TRACE(("%u => ... after \"%.20s\", no encl. loop or catch, returning %s\n",
-		                objc, cmdNameBuf,
-			        StringForResultCode(result)));
-			goto abnormalReturn; /* no catch exists to check */
-		    }
-		    newPcOffset = 0;
-		    switch (rangePtr->type) {
-		    case LOOP_EXCEPTION_RANGE:
-			if (result == TCL_BREAK) {
-			    newPcOffset = rangePtr->breakOffset;
-			} else if (rangePtr->continueOffset == -1) {
-			    TRACE(("%u => ... after \"%.20s\", %s, loop w/o continue, checking for catch\n",
-				   objc, cmdNameBuf,
-				   StringForResultCode(result)));
-			    goto checkForCatch;
-			} else {
-			    newPcOffset = rangePtr->continueOffset;
-			}
-			TRACE(("%u => ... after \"%.20s\", %s, range at %d, new pc %d\n",
-			       objc, cmdNameBuf,
-			       StringForResultCode(result),
-			       rangePtr->codeOffset, newPcOffset));
-			break;
-		    case CATCH_EXCEPTION_RANGE:
-			TRACE(("%u => ... after \"%.20s\", %s...\n",
-			       objc, cmdNameBuf,
-			       StringForResultCode(result)));
-			goto processCatch; /* it will use rangePtr */
-		    default:
-			panic("TclExecuteByteCode: bad ExceptionRange type\n");
-		    }
-		    result = TCL_OK;
-		    pc = (codePtr->codeStart + newPcOffset);
-		    continue;	/* restart outer instruction loop at pc */
-		    
-		case TCL_ERROR:
-		    /*
-		     * The invoked command returned an error. Look for an
-		     * enclosing catch exception range, if any.
-		     */
-		    TRACE_WITH_OBJ(("%u => ... after \"%.20s\", TCL_ERROR ",
-		            objc, cmdNameBuf), Tcl_GetObjResult(interp));
-		    goto checkForCatch;
-
-		case TCL_RETURN:
-		    /*
-		     * The invoked command requested that the current
-		     * procedure stop execution and return. First check
-		     * for an enclosing catch exception range, if any.
-		     */
-		    TRACE(("%u => ... after \"%.20s\", TCL_RETURN\n",
-		            objc, cmdNameBuf));
-		    goto checkForCatch;
-
-		default:
-		    TRACE_WITH_OBJ(("%u => ... after \"%.20s\", OTHER RETURN CODE %d ",
-		            objc, cmdNameBuf, result),
-			    Tcl_GetObjResult(interp));
-		    goto checkForCatch;
-		}
-	    }
-	    
-	case INST_EVAL_STK:
-	    objPtr = POP_OBJECT();
-	    DECACHE_STACK_INFO();
-	    result = Tcl_EvalObjEx(interp, objPtr, 0);
-	    CACHE_STACK_INFO();
-	    if (result == TCL_OK) {
-		/*
-		 * Normal return; push the eval's object result.
-		 */
-		PUSH_OBJECT(Tcl_GetObjResult(interp));
-		TRACE_WITH_OBJ(("\"%.30s\" => ", O2S(objPtr)),
-			Tcl_GetObjResult(interp));
-		TclDecrRefCount(objPtr);
-		ADJUST_PC(1);
-	    } else if ((result == TCL_BREAK) || (result == TCL_CONTINUE)) {
-		/*
-		 * Find the closest enclosing loop or catch exception range,
-		 * if any. If a loop is found, terminate its execution or
-		 * skip to its next iteration. If the closest is a catch
-		 * exception range, jump to its catchOffset. If no enclosing
-		 * range is found, stop execution and return that same
-		 * TCL_BREAK or TCL_CONTINUE.
-		 */
-
-		int newPcOffset = 0; /* Pc offset computed during break,
-				      * continue, error processing. Init.
-				      * to avoid compiler warning. */
-
-		rangePtr = GetExceptRangeForPc(pc, /*catchOnly*/ 0,
-			codePtr);
-		if (rangePtr == NULL) {
-		    TRACE(("\"%.30s\" => no encl. loop or catch, returning %s\n",
-			    O2S(objPtr), StringForResultCode(result)));
-		    Tcl_DecrRefCount(objPtr);
-		    goto abnormalReturn;    /* no catch exists to check */
-		}
-		switch (rangePtr->type) {
-		case LOOP_EXCEPTION_RANGE:
-		    if (result == TCL_BREAK) {
-			newPcOffset = rangePtr->breakOffset;
-		    } else if (rangePtr->continueOffset == -1) {
-			TRACE(("\"%.30s\" => %s, loop w/o continue, checking for catch\n",
-			       O2S(objPtr), StringForResultCode(result)));
-			Tcl_DecrRefCount(objPtr);
-			goto checkForCatch;
-		    } else {
-			newPcOffset = rangePtr->continueOffset;
-		    }
-		    result = TCL_OK;
-		    TRACE_WITH_OBJ(("\"%.30s\" => %s, range at %d, new pc %d ",
-			    O2S(objPtr), StringForResultCode(result),
-			    rangePtr->codeOffset, newPcOffset), valuePtr);
-		    break;
-		case CATCH_EXCEPTION_RANGE:
-		    TRACE_WITH_OBJ(("\"%.30s\" => %s ",
-			    O2S(objPtr), StringForResultCode(result)),
-			    valuePtr);
-		    Tcl_DecrRefCount(objPtr);
-		    goto processCatch;  /* it will use rangePtr */
-		default:
-		    panic("TclExecuteByteCode: unrecognized ExceptionRange type %d\n", rangePtr->type);
-		}
-		Tcl_DecrRefCount(objPtr);
-		pc = (codePtr->codeStart + newPcOffset);
-		continue;	/* restart outer instruction loop at pc */
-	    } else { /* eval returned TCL_ERROR, TCL_RETURN, unknown code */
-		TRACE_WITH_OBJ(("\"%.30s\" => ERROR: ", O2S(objPtr)),
-		        Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		goto checkForCatch;
-	    }
-
-	case INST_EXPR_STK:
-	    objPtr = POP_OBJECT();
-	    Tcl_ResetResult(interp);
-	    DECACHE_STACK_INFO();
-	    result = Tcl_ExprObj(interp, objPtr, &valuePtr);
-	    CACHE_STACK_INFO();
-	    if (result != TCL_OK) {
-		TRACE_WITH_OBJ(("\"%.30s\" => ERROR: ", 
-		        O2S(objPtr)), Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		goto checkForCatch;
-	    }
-	    stackPtr[++stackTop] = valuePtr; /* already has right refct */
-	    TRACE_WITH_OBJ(("\"%.30s\" => ", O2S(objPtr)), valuePtr);
-	    TclDecrRefCount(objPtr);
-	    ADJUST_PC(1);
-
-	case INST_LOAD_SCALAR1:
-#ifdef TCL_COMPILE_DEBUG
-	    opnd = TclGetInt1AtPtr(pc+1);
-	    DECACHE_STACK_INFO();
-	    valuePtr = TclGetIndexedScalar(interp, opnd,
-		    /*leaveErrorMsg*/ 1);
-	    CACHE_STACK_INFO();
-	    if (valuePtr == NULL) {
-		TRACE_WITH_OBJ(("%u => ERROR: ", opnd),
-		        Tcl_GetObjResult(interp));
-		result = TCL_ERROR;
-		goto checkForCatch;
-            }
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("%u => ", opnd), valuePtr);
-#else /* TCL_COMPILE_DEBUG */
-	    DECACHE_STACK_INFO();
-	    valuePtr = TclGetIndexedScalar(interp, TclGetInt1AtPtr(pc+1),
-	            /*leaveErrorMsg*/ 1);
-	    CACHE_STACK_INFO();
-	    if (valuePtr == NULL) {
-		result = TCL_ERROR;
-		goto checkForCatch;
-            }
-	    PUSH_OBJECT(valuePtr);
-#endif /* TCL_COMPILE_DEBUG */
-	    ADJUST_PC(2);
-
-	case INST_LOAD_SCALAR4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    DECACHE_STACK_INFO();
-	    valuePtr = TclGetIndexedScalar(interp, opnd,
-					   /*leaveErrorMsg*/ 1);
-	    CACHE_STACK_INFO();
-	    if (valuePtr == NULL) {
-		TRACE_WITH_OBJ(("%u => ERROR: ", opnd),
-		        Tcl_GetObjResult(interp));
-		result = TCL_ERROR;
-		goto checkForCatch;
-            }
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("%u => ", opnd), valuePtr);
-	    ADJUST_PC(5);
-
-	case INST_LOAD_SCALAR_STK:
-	    objPtr = POP_OBJECT(); /* scalar name */
-	    DECACHE_STACK_INFO();
-	    valuePtr = Tcl_ObjGetVar2(interp, objPtr, NULL, TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (valuePtr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" => ERROR: ", O2S(objPtr)),
-		        Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-            }
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("\"%.30s\" => ", O2S(objPtr)), valuePtr);
-	    TclDecrRefCount(objPtr);
-	    ADJUST_PC(1);
-
-	case INST_LOAD_ARRAY4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doLoadArray;
-
-	case INST_LOAD_ARRAY1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	    doLoadArray:
-	    {
-		Tcl_Obj *elemPtr = POP_OBJECT();
-		
-		DECACHE_STACK_INFO();
-		valuePtr = TclGetElementOfIndexedArray(interp, opnd,
-	                elemPtr, /*leaveErrorMsg*/ 1);
-		CACHE_STACK_INFO();
-		if (valuePtr == NULL) {
-		    TRACE_WITH_OBJ(("%u \"%.30s\" => ERROR: ",
-			    opnd, O2S(elemPtr)), Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(elemPtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(valuePtr);
-		TRACE_WITH_OBJ(("%u \"%.30s\" => ",
-		        opnd, O2S(elemPtr)),valuePtr);
-		TclDecrRefCount(elemPtr);
-	    }
-	    ADJUST_PC(pcAdjustment);
-
-	case INST_LOAD_ARRAY_STK:
-	    {
-		Tcl_Obj *elemPtr = POP_OBJECT();
-		
-		objPtr = POP_OBJECT();	/* array name */
-		DECACHE_STACK_INFO();
-		valuePtr = Tcl_ObjGetVar2(interp, objPtr, elemPtr,
-		        TCL_LEAVE_ERR_MSG);
-		CACHE_STACK_INFO();
-		if (valuePtr == NULL) {
-		    TRACE_WITH_OBJ(("\"%.30s(%.30s)\" => ERROR: ",
-		            O2S(objPtr), O2S(elemPtr)),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(objPtr);
-		    Tcl_DecrRefCount(elemPtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(valuePtr);
-		TRACE_WITH_OBJ(("\"%.30s(%.30s)\" => ",
-		        O2S(objPtr), O2S(elemPtr)), valuePtr);
-		TclDecrRefCount(objPtr);
-		TclDecrRefCount(elemPtr);
-	    }
-	    ADJUST_PC(1);
-
-	case INST_LOAD_STK:
-	    objPtr = POP_OBJECT(); /* variable name */
-	    DECACHE_STACK_INFO();
-	    valuePtr = Tcl_ObjGetVar2(interp, objPtr, NULL, TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (valuePtr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" => ERROR: ",
-		        O2S(objPtr)), Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(valuePtr);
-	    TRACE_WITH_OBJ(("\"%.30s\" => ", O2S(objPtr)), valuePtr);
-	    TclDecrRefCount(objPtr);
-	    ADJUST_PC(1);
-	    
-	case INST_STORE_SCALAR4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doStoreScalar;
-
-	case INST_STORE_SCALAR1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	  doStoreScalar:
-	    valuePtr = POP_OBJECT();
-	    DECACHE_STACK_INFO();
-	    value2Ptr = TclSetIndexedScalar(interp, opnd, valuePtr,
-	            /*leaveErrorMsg*/ 1);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("%u <- \"%.30s\" => ERROR: ",
-			opnd, O2S(valuePtr)), Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(valuePtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("%u <- \"%.30s\" => ",
-		    opnd, O2S(valuePtr)), value2Ptr);
-	    TclDecrRefCount(valuePtr);
-	    ADJUST_PC(pcAdjustment);
-
-	case INST_STORE_SCALAR_STK:
-	    valuePtr = POP_OBJECT();
-	    objPtr = POP_OBJECT(); /* scalar name */
-	    DECACHE_STACK_INFO();
-	    value2Ptr = Tcl_ObjSetVar2(interp, objPtr, NULL, valuePtr,
-		    TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" <- \"%.30s\" => ERROR: ",
-		        O2S(objPtr), O2S(valuePtr)),
-			Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		Tcl_DecrRefCount(valuePtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("\"%.30s\" <- \"%.30s\" => ",
-		    O2S(objPtr), O2S(valuePtr)), value2Ptr);
-	    TclDecrRefCount(objPtr);
-	    TclDecrRefCount(valuePtr);
-	    ADJUST_PC(1);
-
-	case INST_STORE_ARRAY4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doStoreArray;
-
-	case INST_STORE_ARRAY1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	    doStoreArray:
-	    {
-		Tcl_Obj *elemPtr;
-
-		valuePtr = POP_OBJECT();
-		elemPtr = POP_OBJECT();
-		DECACHE_STACK_INFO();
-		value2Ptr = TclSetElementOfIndexedArray(interp, opnd,
-		        elemPtr, valuePtr, TCL_LEAVE_ERR_MSG);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("%u \"%.30s\" <- \"%.30s\" => ERROR: ",
-			    opnd, O2S(elemPtr), O2S(valuePtr)),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(elemPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("%u \"%.30s\" <- \"%.30s\" => ",
-		        opnd, O2S(elemPtr), O2S(valuePtr)), value2Ptr);
-		TclDecrRefCount(elemPtr);
-		TclDecrRefCount(valuePtr);
-	    }
-	    ADJUST_PC(pcAdjustment);
-
-	case INST_STORE_ARRAY_STK:
-	    {
-		Tcl_Obj *elemPtr;
-
-		valuePtr = POP_OBJECT();
-		elemPtr = POP_OBJECT();
-		objPtr = POP_OBJECT();	/* array name */
-		DECACHE_STACK_INFO();
-		value2Ptr = Tcl_ObjSetVar2(interp, objPtr, elemPtr, valuePtr,
-			TCL_LEAVE_ERR_MSG);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("\"%.30s(%.30s)\" <- \"%.30s\" => ERROR: ",
-		            O2S(objPtr), O2S(elemPtr), O2S(valuePtr)),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(objPtr);
-		    Tcl_DecrRefCount(elemPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("\"%.30s(%.30s)\" <- \"%.30s\" => ",
-		        O2S(objPtr), O2S(elemPtr), O2S(valuePtr)),
-			value2Ptr);
-		TclDecrRefCount(objPtr);
-		TclDecrRefCount(elemPtr);
-		TclDecrRefCount(valuePtr);
-	    }
-	    ADJUST_PC(1);
-
-	case INST_STORE_STK:
-	    valuePtr = POP_OBJECT();
-	    objPtr = POP_OBJECT(); /* variable name */
-	    DECACHE_STACK_INFO();
-	    value2Ptr = Tcl_ObjSetVar2(interp, objPtr, NULL, valuePtr,
-		    TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" <- \"%.30s\" => ERROR: ",
-		        O2S(objPtr), O2S(valuePtr)),
-			Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		Tcl_DecrRefCount(valuePtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("\"%.30s\" <- \"%.30s\" => ",
-		    O2S(objPtr), O2S(valuePtr)), value2Ptr);
-	    TclDecrRefCount(objPtr);
-	    TclDecrRefCount(valuePtr);
-	    ADJUST_PC(1);
-
-	case INST_INCR_SCALAR1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    valuePtr = POP_OBJECT(); 
-	    if (valuePtr->typePtr != &tclIntType) {
-		result = tclIntType.setFromAnyProc(interp, valuePtr);
-		if (result != TCL_OK) {
-		    TRACE_WITH_OBJ(("%u (by %s) => ERROR converting increment amount to int: ",
-		            opnd, O2S(valuePtr)), Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(valuePtr);
-		    goto checkForCatch;
-		}
-	    }
-	    i = valuePtr->internalRep.longValue;
-	    DECACHE_STACK_INFO();
-	    value2Ptr = TclIncrIndexedScalar(interp, opnd, i);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("%u (by %ld) => ERROR: ", opnd, i),
-			Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(valuePtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("%u (by %ld) => ", opnd, i), value2Ptr);
-	    TclDecrRefCount(valuePtr);
-	    ADJUST_PC(2);
-
-	case INST_INCR_SCALAR_STK:
-	case INST_INCR_STK:
-	    valuePtr = POP_OBJECT();
-	    objPtr = POP_OBJECT(); /* scalar name */
-	    if (valuePtr->typePtr != &tclIntType) {
-		result = tclIntType.setFromAnyProc(interp, valuePtr);
-		if (result != TCL_OK) {
-		    TRACE_WITH_OBJ(("\"%.30s\" (by %s) => ERROR converting increment amount to int: ",
-		            O2S(objPtr), O2S(valuePtr)),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(objPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    goto checkForCatch;
-		}
-	    }
-	    i = valuePtr->internalRep.longValue;
-	    DECACHE_STACK_INFO();
-	    value2Ptr = TclIncrVar2(interp, objPtr, (Tcl_Obj *) NULL, i,
-		    TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" (by %ld) => ERROR: ",
-		        O2S(objPtr), i), Tcl_GetObjResult(interp));
-		Tcl_DecrRefCount(objPtr);
-		Tcl_DecrRefCount(valuePtr);
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("\"%.30s\" (by %ld) => ", O2S(objPtr), i),
-		    value2Ptr);
-	    Tcl_DecrRefCount(objPtr);
-	    Tcl_DecrRefCount(valuePtr);
-	    ADJUST_PC(1);
-
-	case INST_INCR_ARRAY1:
-	    {
-		Tcl_Obj *elemPtr;
-
-		opnd = TclGetUInt1AtPtr(pc+1);
-		valuePtr = POP_OBJECT();
-		elemPtr = POP_OBJECT();
-		if (valuePtr->typePtr != &tclIntType) {
-		    result = tclIntType.setFromAnyProc(interp, valuePtr);
-		    if (result != TCL_OK) {
-			TRACE_WITH_OBJ(("%u \"%.30s\" (by %s) => ERROR converting increment amount to int: ",
-		                opnd, O2S(elemPtr), O2S(valuePtr)),
-			        Tcl_GetObjResult(interp));
-			Tcl_DecrRefCount(elemPtr);
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		}
-		i = valuePtr->internalRep.longValue;
-		DECACHE_STACK_INFO();
-		value2Ptr = TclIncrElementOfIndexedArray(interp, opnd,
-		        elemPtr, i);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("%u \"%.30s\" (by %ld) => ERROR: ",
-		            opnd, O2S(elemPtr), i),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(elemPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("%u \"%.30s\" (by %ld) => ",
-	                opnd, O2S(elemPtr), i), value2Ptr);
-		Tcl_DecrRefCount(elemPtr);
-		Tcl_DecrRefCount(valuePtr);
-	    }
-	    ADJUST_PC(2);
-	    
-	case INST_INCR_ARRAY_STK:
-	    {
-		Tcl_Obj *elemPtr;
-
-		valuePtr = POP_OBJECT();
-		elemPtr = POP_OBJECT();
-		objPtr = POP_OBJECT();	/* array name */
-		if (valuePtr->typePtr != &tclIntType) {
-		    result = tclIntType.setFromAnyProc(interp, valuePtr);
-		    if (result != TCL_OK) {
-		        TRACE_WITH_OBJ(("\"%.30s(%.30s)\" (by %s) => ERROR converting increment amount to int: ",
-		                O2S(objPtr), O2S(elemPtr), O2S(valuePtr)),
-			        Tcl_GetObjResult(interp));
-			Tcl_DecrRefCount(objPtr);
-			Tcl_DecrRefCount(elemPtr);
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		}
-		i = valuePtr->internalRep.longValue;
-		DECACHE_STACK_INFO();
-		value2Ptr = TclIncrVar2(interp, objPtr, elemPtr, i,
-			TCL_LEAVE_ERR_MSG);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("\"%.30s(%.30s)\" (by %ld) => ERROR: ",
-		            O2S(objPtr), O2S(elemPtr), i),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(objPtr);
-		    Tcl_DecrRefCount(elemPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("\"%.30s(%.30s)\" (by %ld) => ",
-	                O2S(objPtr), O2S(elemPtr), i), value2Ptr);
-		Tcl_DecrRefCount(objPtr);
-		Tcl_DecrRefCount(elemPtr);
-		Tcl_DecrRefCount(valuePtr);
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_INCR_SCALAR1_IMM:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    i = TclGetInt1AtPtr(pc+2);
-	    DECACHE_STACK_INFO();
-	    value2Ptr = TclIncrIndexedScalar(interp, opnd, i);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("%u %ld => ERROR: ", opnd, i),
-			Tcl_GetObjResult(interp));
-		result = TCL_ERROR;
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("%u %ld => ", opnd, i), value2Ptr);
-	    ADJUST_PC(3);
-
-	case INST_INCR_SCALAR_STK_IMM:
-	case INST_INCR_STK_IMM:
-	    objPtr = POP_OBJECT(); /* variable name */
-	    i = TclGetInt1AtPtr(pc+1);
-	    DECACHE_STACK_INFO();
-	    value2Ptr = TclIncrVar2(interp, objPtr, (Tcl_Obj *) NULL, i,
-		    TCL_LEAVE_ERR_MSG);
-	    CACHE_STACK_INFO();
-	    if (value2Ptr == NULL) {
-		TRACE_WITH_OBJ(("\"%.30s\" %ld => ERROR: ",
-		        O2S(objPtr), i), Tcl_GetObjResult(interp));
-		result = TCL_ERROR;
-		Tcl_DecrRefCount(objPtr);
-		goto checkForCatch;
-	    }
-	    PUSH_OBJECT(value2Ptr);
-	    TRACE_WITH_OBJ(("\"%.30s\" %ld => ", O2S(objPtr), i),
-		    value2Ptr);
-	    TclDecrRefCount(objPtr);
-	    ADJUST_PC(2);
-
-	case INST_INCR_ARRAY1_IMM:
-	    {
-		Tcl_Obj *elemPtr;
-
-		opnd = TclGetUInt1AtPtr(pc+1);
-		i = TclGetInt1AtPtr(pc+2);
-		elemPtr = POP_OBJECT();
-		DECACHE_STACK_INFO();
-		value2Ptr = TclIncrElementOfIndexedArray(interp, opnd,
-		        elemPtr, i);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("%u \"%.30s\" (by %ld) => ERROR: ",
-		            opnd, O2S(elemPtr), i),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(elemPtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("%u \"%.30s\" (by %ld) => ",
-	                opnd, O2S(elemPtr), i), value2Ptr);
-		Tcl_DecrRefCount(elemPtr);
-	    }
-	    ADJUST_PC(3);
-	    
-	case INST_INCR_ARRAY_STK_IMM:
-	    {
-		Tcl_Obj *elemPtr;
-
-		i = TclGetInt1AtPtr(pc+1);
-		elemPtr = POP_OBJECT();
-		objPtr = POP_OBJECT();	/* array name */
-		DECACHE_STACK_INFO();
-		value2Ptr = TclIncrVar2(interp, objPtr, elemPtr, i,
-			TCL_LEAVE_ERR_MSG);
-		CACHE_STACK_INFO();
-		if (value2Ptr == NULL) {
-		    TRACE_WITH_OBJ(("\"%.30s(%.30s)\" (by %ld) => ERROR: ",
-		            O2S(objPtr), O2S(elemPtr), i),
-			    Tcl_GetObjResult(interp));
-		    Tcl_DecrRefCount(objPtr);
-		    Tcl_DecrRefCount(elemPtr);
-		    result = TCL_ERROR;
-		    goto checkForCatch;
-		}
-		PUSH_OBJECT(value2Ptr);
-		TRACE_WITH_OBJ(("\"%.30s(%.30s)\" (by %ld) => ",
-	                O2S(objPtr), O2S(elemPtr), i), value2Ptr);
-		Tcl_DecrRefCount(objPtr);
-		Tcl_DecrRefCount(elemPtr);
-	    }
-	    ADJUST_PC(2);
-
-	case INST_JUMP1:
-#ifdef TCL_COMPILE_DEBUG
-	    opnd = TclGetInt1AtPtr(pc+1);
-	    TRACE(("%d => new pc %u\n", opnd,
-		   (unsigned int)(pc + opnd - codePtr->codeStart)));
-	    pc += opnd;
-#else
-	    pc += TclGetInt1AtPtr(pc+1);
-#endif /* TCL_COMPILE_DEBUG */
-	    continue;
-
-	case INST_JUMP4:
-	    opnd = TclGetInt4AtPtr(pc+1);
-	    TRACE(("%d => new pc %u\n", opnd,
-		   (unsigned int)(pc + opnd - codePtr->codeStart)));
-	    ADJUST_PC(opnd);
-
-	case INST_JUMP_TRUE4:
-	    opnd = TclGetInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doJumpTrue;
-
-	case INST_JUMP_TRUE1:
-	    opnd = TclGetInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	    doJumpTrue:
-	    {
-		int b;
-		
-		valuePtr = POP_OBJECT();
-		if (valuePtr->typePtr == &tclIntType) {
-		    b = (valuePtr->internalRep.longValue != 0);
-		} else if (valuePtr->typePtr == &tclDoubleType) {
-		    b = (valuePtr->internalRep.doubleValue != 0.0);
-		} else {
-		    result = Tcl_GetBooleanFromObj(interp, valuePtr, &b);
-		    if (result != TCL_OK) {
-			TRACE_WITH_OBJ(("%d => ERROR: ", opnd),
-				Tcl_GetObjResult(interp));
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		}
-		if (b) {
-		    TRACE(("%d => %.20s true, new pc %u\n",
-			    opnd, O2S(valuePtr),
-		            (unsigned int)(pc+opnd - codePtr->codeStart)));
-		    TclDecrRefCount(valuePtr);
-		    ADJUST_PC(opnd);
-		} else {
-		    TRACE(("%d => %.20s false\n", opnd, O2S(valuePtr)));
-		    TclDecrRefCount(valuePtr);
-		    ADJUST_PC(pcAdjustment);
-		}
-	    }
-	    
-	case INST_JUMP_FALSE4:
-	    opnd = TclGetInt4AtPtr(pc+1);
-	    pcAdjustment = 5;
-	    goto doJumpFalse;
-
-	case INST_JUMP_FALSE1:
-	    opnd = TclGetInt1AtPtr(pc+1);
-	    pcAdjustment = 2;
-	    
-	    doJumpFalse:
-	    {
-		int b;
-		
-		valuePtr = POP_OBJECT();
-		if (valuePtr->typePtr == &tclIntType) {
-		    b = (valuePtr->internalRep.longValue != 0);
-		} else if (valuePtr->typePtr == &tclDoubleType) {
-		    b = (valuePtr->internalRep.doubleValue != 0.0);
-		} else {
-		    result = Tcl_GetBooleanFromObj(interp, valuePtr, &b);
-		    if (result != TCL_OK) {
-			TRACE_WITH_OBJ(("%d => ERROR: ", opnd),
-				Tcl_GetObjResult(interp));
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		}
-		if (b) {
-		    TRACE(("%d => %.20s true\n", opnd, O2S(valuePtr)));
-		    TclDecrRefCount(valuePtr);
-		    ADJUST_PC(pcAdjustment);
-		} else {
-		    TRACE(("%d => %.20s false, new pc %u\n",
-			   opnd, O2S(valuePtr),
-			   (unsigned int)(pc + opnd - codePtr->codeStart)));
-		    TclDecrRefCount(valuePtr);
-		    ADJUST_PC(opnd);
-		}
-	    }
-	    
-	case INST_LOR:
-	case INST_LAND:
-	    {
-		/*
-		 * Operands must be boolean or numeric. No int->double
-		 * conversions are performed.
-		 */
-		
-		int i1, i2;
-		int iResult;
-		char *s;
-		Tcl_ObjType *t1Ptr, *t2Ptr;
-		
-		value2Ptr = POP_OBJECT();
-		valuePtr  = POP_OBJECT();
-		t1Ptr = valuePtr->typePtr;
-		t2Ptr = value2Ptr->typePtr;
-		
-		if ((t1Ptr == &tclIntType) || (t1Ptr == &tclBooleanType)) {
-		    i1 = (valuePtr->internalRep.longValue != 0);
-		} else if (t1Ptr == &tclDoubleType) {
-		    i1 = (valuePtr->internalRep.doubleValue != 0.0);
-		} else {
-		    s = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-			i1 = (i != 0);
-		    } else {
-			result = Tcl_GetBooleanFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i1);
-			i1 = (i1 != 0);
-		    }
-		    if (result != TCL_OK) {
-			TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n",
-			        O2S(valuePtr),
-			        (t1Ptr? t1Ptr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		}
-		
-		if ((t2Ptr == &tclIntType) || (t2Ptr == &tclBooleanType)) {
-		    i2 = (value2Ptr->internalRep.longValue != 0);
-		} else if (t2Ptr == &tclDoubleType) {
-		    i2 = (value2Ptr->internalRep.doubleValue != 0.0);
-		} else {
-		    s = Tcl_GetStringFromObj(value2Ptr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &i);
-			i2 = (i != 0);
-		    } else {
-			result = Tcl_GetBooleanFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &i2);
-		    }
-		    if (result != TCL_OK) {
-			TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n",
-			        O2S(value2Ptr),
-			        (t2Ptr? t2Ptr->name : "null")));
-			IllegalExprOperandType(interp, pc, value2Ptr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		}
-		
-		/*
-		 * Reuse the valuePtr object already on stack if possible.
-		 */
-
-		if (*pc == INST_LOR) {
-		    iResult = (i1 || i2);
-		} else {
-		    iResult = (i1 && i2);
-		}
-		if (Tcl_IsShared(valuePtr)) {
-		    PUSH_OBJECT(Tcl_NewLongObj(iResult));
-		    TRACE(("%.20s %.20s => %d\n",
-			   O2S(valuePtr), O2S(value2Ptr), iResult));
-		    TclDecrRefCount(valuePtr);
-		} else {	/* reuse the valuePtr object */
-		    TRACE(("%.20s %.20s => %d\n", 
-			   O2S(valuePtr), O2S(value2Ptr), iResult));
-		    Tcl_SetLongObj(valuePtr, iResult);
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		}
-		TclDecrRefCount(value2Ptr);
-	    }
-	    ADJUST_PC(1);
-
-	case INST_EQ:
-	case INST_NEQ:
-	case INST_LT:
-	case INST_GT:
-	case INST_LE:
-	case INST_GE:
-	    {
-		/*
-		 * Any type is allowed but the two operands must have the
-	         * same type. We will compute value op value2.
-		 */
-
-		Tcl_ObjType *t1Ptr, *t2Ptr;
-		char *s1 = NULL;   /* Init. avoids compiler warning. */
-		char *s2 = NULL;   /* Init. avoids compiler warning. */
-		long i2 = 0;	   /* Init. avoids compiler warning. */
-		double d1 = 0.0;   /* Init. avoids compiler warning. */
-		double d2 = 0.0;   /* Init. avoids compiler warning. */
-		long iResult = 0;  /* Init. avoids compiler warning. */
-
-		value2Ptr = POP_OBJECT();
-		valuePtr  = POP_OBJECT();
-		t1Ptr = valuePtr->typePtr;
-		t2Ptr = value2Ptr->typePtr;
-		
-		if ((t1Ptr != &tclIntType) && (t1Ptr != &tclDoubleType)) {
-		    s1 = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s1, length)) {
-			(void) Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-		    } else {
-			(void) Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				valuePtr, &d1);
-		    }
-		    t1Ptr = valuePtr->typePtr;
-		}
-		if ((t2Ptr != &tclIntType) && (t2Ptr != &tclDoubleType)) {
-		    s2 = Tcl_GetStringFromObj(value2Ptr, &length);
-		    if (TclLooksLikeInt(s2, length)) {
-			(void) Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &i2);
-		    } else {
-			(void) Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &d2);
-		    }
-		    t2Ptr = value2Ptr->typePtr;
-		}
-
-		if (((t1Ptr != &tclIntType) && (t1Ptr != &tclDoubleType))
-		        || ((t2Ptr != &tclIntType) && (t2Ptr != &tclDoubleType))) {
-		    /*
-		     * One operand is not numeric. Compare as strings.
-		     */
-		    int cmpValue;
-		    s1 = Tcl_GetString(valuePtr);
-		    s2 = Tcl_GetString(value2Ptr);
-		    cmpValue = strcmp(s1, s2);
-		    switch (*pc) {
-		    case INST_EQ:
-			iResult = (cmpValue == 0);
-			break;
-		    case INST_NEQ:
-			iResult = (cmpValue != 0);
-			break;
-		    case INST_LT:
-			iResult = (cmpValue < 0);
-			break;
-		    case INST_GT:
-			iResult = (cmpValue > 0);
-			break;
-		    case INST_LE:
-			iResult = (cmpValue <= 0);
-			break;
-		    case INST_GE:
-			iResult = (cmpValue >= 0);
-			break;
-		    }
-		} else if ((t1Ptr == &tclDoubleType)
-		        || (t2Ptr == &tclDoubleType)) {
-		    /*
-		     * Compare as doubles.
-		     */
-		    if (t1Ptr == &tclDoubleType) {
-			d1 = valuePtr->internalRep.doubleValue;
-			if (t2Ptr == &tclIntType) {
-			    d2 = value2Ptr->internalRep.longValue;
-			} else {
-			    d2 = value2Ptr->internalRep.doubleValue;
-			}
-		    } else {	/* t1Ptr is int, t2Ptr is double */
-			d1 = valuePtr->internalRep.longValue;
-			d2 = value2Ptr->internalRep.doubleValue;
-		    }
-		    switch (*pc) {
-		    case INST_EQ:
-			iResult = d1 == d2;
-			break;
-		    case INST_NEQ:
-			iResult = d1 != d2;
-			break;
-		    case INST_LT:
-			iResult = d1 < d2;
-			break;
-		    case INST_GT:
-			iResult = d1 > d2;
-			break;
-		    case INST_LE:
-			iResult = d1 <= d2;
-			break;
-		    case INST_GE:
-			iResult = d1 >= d2;
-			break;
-		    }
-		} else {
-		    /*
-		     * Compare as ints.
-		     */
-		    i  = valuePtr->internalRep.longValue;
-		    i2 = value2Ptr->internalRep.longValue;
-		    switch (*pc) {
-		    case INST_EQ:
-			iResult = i == i2;
-			break;
-		    case INST_NEQ:
-			iResult = i != i2;
-			break;
-		    case INST_LT:
-			iResult = i < i2;
-			break;
-		    case INST_GT:
-			iResult = i > i2;
-			break;
-		    case INST_LE:
-			iResult = i <= i2;
-			break;
-		    case INST_GE:
-			iResult = i >= i2;
-			break;
-		    }
-		}
-
-		/*
-		 * Reuse the valuePtr object already on stack if possible.
-		 */
-		
-		if (Tcl_IsShared(valuePtr)) {
-		    PUSH_OBJECT(Tcl_NewLongObj(iResult));
-		    TRACE(("%.20s %.20s => %ld\n",
-			   O2S(valuePtr), O2S(value2Ptr), iResult));
-		    TclDecrRefCount(valuePtr);
-		} else {	/* reuse the valuePtr object */
-		    TRACE(("%.20s %.20s => %ld\n",
-			    O2S(valuePtr), O2S(value2Ptr), iResult));
-		    Tcl_SetLongObj(valuePtr, iResult);
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		}
-		TclDecrRefCount(value2Ptr);
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_MOD:
-	case INST_LSHIFT:
-	case INST_RSHIFT:
-	case INST_BITOR:
-	case INST_BITXOR:
-	case INST_BITAND:
-	    {
-		/*
-		 * Only integers are allowed. We compute value op value2.
-		 */
-
-		long i2, rem, negative;
-		long iResult = 0; /* Init. avoids compiler warning. */
-		
-		value2Ptr = POP_OBJECT();
-		valuePtr  = POP_OBJECT(); 
-		if (valuePtr->typePtr == &tclIntType) {
-		    i = valuePtr->internalRep.longValue;
-		} else {	/* try to convert to int */
-		    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-			    valuePtr, &i);
-		    if (result != TCL_OK) {
-			TRACE(("%.20s %.20s => ILLEGAL 1st TYPE %s\n",
-			      O2S(valuePtr), O2S(value2Ptr),
-			      (valuePtr->typePtr?
-				   valuePtr->typePtr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		}
-		if (value2Ptr->typePtr == &tclIntType) {
-		    i2 = value2Ptr->internalRep.longValue;
-		} else {
-		    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-			    value2Ptr, &i2);
-		    if (result != TCL_OK) {
-			TRACE(("%.20s %.20s => ILLEGAL 2nd TYPE %s\n",
-			      O2S(valuePtr), O2S(value2Ptr),
-			      (value2Ptr->typePtr?
-				   value2Ptr->typePtr->name : "null")));
-			IllegalExprOperandType(interp, pc, value2Ptr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		}
-
-		switch (*pc) {
-		case INST_MOD:
-		    /*
-		     * This code is tricky: C doesn't guarantee much about
-		     * the quotient or remainder, but Tcl does. The
-		     * remainder always has the same sign as the divisor and
-		     * a smaller absolute value.
-		     */
-		    if (i2 == 0) {
-			TRACE(("%ld %ld => DIVIDE BY ZERO\n", i, i2));
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto divideByZero;
-		    }
-		    negative = 0;
-		    if (i2 < 0) {
-			i2 = -i2;
-			i = -i;
-			negative = 1;
-		    }
-		    rem  = i % i2;
-		    if (rem < 0) {
-			rem += i2;
-		    }
-		    if (negative) {
-			rem = -rem;
-		    }
-		    iResult = rem;
-		    break;
-		case INST_LSHIFT:
-		    iResult = i << i2;
-		    break;
-		case INST_RSHIFT:
-		    /*
-		     * The following code is a bit tricky: it ensures that
-		     * right shifts propagate the sign bit even on machines
-		     * where ">>" won't do it by default.
-		     */
-		    if (i < 0) {
-			iResult = ~((~i) >> i2);
-		    } else {
-			iResult = i >> i2;
-		    }
-		    break;
-		case INST_BITOR:
-		    iResult = i | i2;
-		    break;
-		case INST_BITXOR:
-		    iResult = i ^ i2;
-		    break;
-		case INST_BITAND:
-		    iResult = i & i2;
-		    break;
-		}
-
-		/*
-		 * Reuse the valuePtr object already on stack if possible.
-		 */
-		
-		if (Tcl_IsShared(valuePtr)) {
-		    PUSH_OBJECT(Tcl_NewLongObj(iResult));
-		    TRACE(("%ld %ld => %ld\n", i, i2, iResult));
-		    TclDecrRefCount(valuePtr);
-		} else {	/* reuse the valuePtr object */
-		    TRACE(("%ld %ld => %ld\n", i, i2, iResult));
-		    Tcl_SetLongObj(valuePtr, iResult);
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		}
-		TclDecrRefCount(value2Ptr);
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_ADD:
-	case INST_SUB:
-	case INST_MULT:
-	case INST_DIV:
-	    {
-		/*
-		 * Operands must be numeric and ints get converted to floats
-		 * if necessary. We compute value op value2.
-		 */
-
-		Tcl_ObjType *t1Ptr, *t2Ptr;
-		long i2, quot, rem;
-		double d1, d2;
-		long iResult = 0;     /* Init. avoids compiler warning. */
-		double dResult = 0.0; /* Init. avoids compiler warning. */
-		int doDouble = 0;     /* 1 if doing floating arithmetic */
-		
-		value2Ptr = POP_OBJECT();
-		valuePtr  = POP_OBJECT();
-		t1Ptr = valuePtr->typePtr;
-		t2Ptr = value2Ptr->typePtr;
-		
-		if (t1Ptr == &tclIntType) {
-		    i  = valuePtr->internalRep.longValue;
-		} else if ((t1Ptr == &tclDoubleType)
-			&& (valuePtr->bytes == NULL)) {
-		    /*
-		     * We can only use the internal rep directly if there is
-		     * no string rep.  Otherwise the string rep might actually
-		     * look like an integer, which is preferred.
-		     */
-
-		    d1 = valuePtr->internalRep.doubleValue;
-		} else {
-		    char *s = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-		    } else {
-			result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				valuePtr, &d1);
-		    }
-		    if (result != TCL_OK) {
-			TRACE(("%.20s %.20s => ILLEGAL 1st TYPE %s\n",
-			       s, O2S(valuePtr),
-			       (valuePtr->typePtr?
-				    valuePtr->typePtr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		    t1Ptr = valuePtr->typePtr;
-		}
-		
-		if (t2Ptr == &tclIntType) {
-		    i2 = value2Ptr->internalRep.longValue;
-		} else if ((t2Ptr == &tclDoubleType)
-			&& (value2Ptr->bytes == NULL)) {
-		    /*
-		     * We can only use the internal rep directly if there is
-		     * no string rep.  Otherwise the string rep might actually
-		     * look like an integer, which is preferred.
-		     */
-
-		    d2 = value2Ptr->internalRep.doubleValue;
-		} else {
-		    char *s = Tcl_GetStringFromObj(value2Ptr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &i2);
-		    } else {
-			result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				value2Ptr, &d2);
-		    }
-		    if (result != TCL_OK) {
-			TRACE(("%.20s %.20s => ILLEGAL 2nd TYPE %s\n",
-			       O2S(value2Ptr), s,
-			       (value2Ptr->typePtr?
-				    value2Ptr->typePtr->name : "null")));
-			IllegalExprOperandType(interp, pc, value2Ptr);
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		    t2Ptr = value2Ptr->typePtr;
-		}
-
-		if ((t1Ptr == &tclDoubleType) || (t2Ptr == &tclDoubleType)) {
-		    /*
-		     * Do double arithmetic.
-		     */
-		    doDouble = 1;
-		    if (t1Ptr == &tclIntType) {
-			d1 = i;       /* promote value 1 to double */
-		    } else if (t2Ptr == &tclIntType) {
-			d2 = i2;      /* promote value 2 to double */
-		    }
-		    switch (*pc) {
-		    case INST_ADD:
-			dResult = d1 + d2;
-			break;
-		    case INST_SUB:
-			dResult = d1 - d2;
-			break;
-		    case INST_MULT:
-			dResult = d1 * d2;
-			break;
-		    case INST_DIV:
-			if (d2 == 0.0) {
-			    TRACE(("%.6g %.6g => DIVIDE BY ZERO\n", d1, d2));
-			    Tcl_DecrRefCount(valuePtr);
-			    Tcl_DecrRefCount(value2Ptr);
-			    goto divideByZero;
-			}
-			dResult = d1 / d2;
-			break;
-		    }
-		    
-		    /*
-		     * Check now for IEEE floating-point error.
-		     */
-		    
-		    if (IS_NAN(dResult) || IS_INF(dResult)) {
-			TRACE(("%.20s %.20s => IEEE FLOATING PT ERROR\n",
-			       O2S(valuePtr), O2S(value2Ptr)));
-			TclExprFloatError(interp, dResult);
-			result = TCL_ERROR;
-			Tcl_DecrRefCount(valuePtr);
-			Tcl_DecrRefCount(value2Ptr);
-			goto checkForCatch;
-		    }
-		} else {
-		    /*
-		     * Do integer arithmetic.
-		     */
-		    switch (*pc) {
-		    case INST_ADD:
-			iResult = i + i2;
-			break;
-		    case INST_SUB:
-			iResult = i - i2;
-			break;
-		    case INST_MULT:
-			iResult = i * i2;
-			break;
-		    case INST_DIV:
-			/*
-			 * This code is tricky: C doesn't guarantee much
-			 * about the quotient or remainder, but Tcl does.
-			 * The remainder always has the same sign as the
-			 * divisor and a smaller absolute value.
-			 */
-			if (i2 == 0) {
-			    TRACE(("%ld %ld => DIVIDE BY ZERO\n", i, i2));
-			    Tcl_DecrRefCount(valuePtr);
-			    Tcl_DecrRefCount(value2Ptr);
-			    goto divideByZero;
-			}
-			if (i2 < 0) {
-			    i2 = -i2;
-			    i = -i;
-			}
-			quot = i / i2;
-			rem  = i % i2;
-			if (rem < 0) {
-			    quot -= 1;
-			}
-			iResult = quot;
-			break;
-		    }
-		}
-
-		/*
-		 * Reuse the valuePtr object already on stack if possible.
-		 */
-		
-		if (Tcl_IsShared(valuePtr)) {
-		    if (doDouble) {
-			PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-			TRACE(("%.6g %.6g => %.6g\n", d1, d2, dResult));
-		    } else {
-			PUSH_OBJECT(Tcl_NewLongObj(iResult));
-			TRACE(("%ld %ld => %ld\n", i, i2, iResult));
-		    } 
-		    TclDecrRefCount(valuePtr);
-		} else {	    /* reuse the valuePtr object */
-		    if (doDouble) { /* NB: stack top is off by 1 */
-			TRACE(("%.6g %.6g => %.6g\n", d1, d2, dResult));
-			Tcl_SetDoubleObj(valuePtr, dResult);
-		    } else {
-			TRACE(("%ld %ld => %ld\n", i, i2, iResult));
-			Tcl_SetLongObj(valuePtr, iResult);
-		    }
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		}
-		TclDecrRefCount(value2Ptr);
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_UPLUS:
-	    {
-	        /*
-	         * Operand must be numeric.
-	         */
-
-		double d;
-		Tcl_ObjType *tPtr;
-		
-		valuePtr = stackPtr[stackTop];
-		tPtr = valuePtr->typePtr;
-		if ((tPtr != &tclIntType) && ((tPtr != &tclDoubleType)
-			|| (valuePtr->bytes != NULL))) {
-		    char *s = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-		    } else {
-			result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				valuePtr, &d);
-		    }
-		    if (result != TCL_OK) { 
-			TRACE(("\"%.20s\" => ILLEGAL TYPE %s \n",
-			        s, (tPtr? tPtr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			goto checkForCatch;
-		    }
-		    tPtr = valuePtr->typePtr;
-		}
-
-		/*
-		 * Ensure that the operand's string rep is the same as the
-		 * formatted version of its internal rep. This makes sure
-		 * that "expr +000123" yields "83", not "000123". We
-		 * implement this by _discarding_ the string rep since we
-		 * know it will be regenerated, if needed later, by
-		 * formatting the internal rep's value.
-		 */
-
-		if (Tcl_IsShared(valuePtr)) {
-		    if (tPtr == &tclIntType) {
-			i = valuePtr->internalRep.longValue;
-			objPtr = Tcl_NewLongObj(i);
-		    } else {
-			d = valuePtr->internalRep.doubleValue;
-			objPtr = Tcl_NewDoubleObj(d);
-		    }
-		    Tcl_IncrRefCount(objPtr);
-		    Tcl_DecrRefCount(valuePtr);
-		    valuePtr = objPtr;
-		    stackPtr[stackTop] = valuePtr;
-		} else {
-		    Tcl_InvalidateStringRep(valuePtr);
-		}
-		TRACE_WITH_OBJ(("%s => ", O2S(valuePtr)), valuePtr);
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_UMINUS:
-	case INST_LNOT:
-	    {
-		/*
-		 * The operand must be numeric. If the operand object is
-		 * unshared modify it directly, otherwise create a copy to
-		 * modify: this is "copy on write". free any old string
-		 * representation since it is now invalid.
-		 */
-		
-		double d;
-		Tcl_ObjType *tPtr;
-		
-		valuePtr = POP_OBJECT();
-		tPtr = valuePtr->typePtr;
-		if ((tPtr != &tclIntType) && ((tPtr != &tclDoubleType)
-			|| (valuePtr->bytes != NULL))) {
-		    char *s = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-		    } else {
-			result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				valuePtr, &d);
-		    }
-		    if (result != TCL_OK) {
-			TRACE(("\"%.20s\" => ILLEGAL TYPE %s\n",
-			        s, (tPtr? tPtr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		    tPtr = valuePtr->typePtr;
-		}
-		
-		if (Tcl_IsShared(valuePtr)) {
-		    /*
-		     * Create a new object.
-		     */
-		    if (tPtr == &tclIntType) {
-			i = valuePtr->internalRep.longValue;
-			objPtr = Tcl_NewLongObj(
-			        (*pc == INST_UMINUS)? -i : !i);
-			TRACE_WITH_OBJ(("%ld => ", i), objPtr);
-		    } else {
-			d = valuePtr->internalRep.doubleValue;
-			if (*pc == INST_UMINUS) {
-			    objPtr = Tcl_NewDoubleObj(-d);
-			} else {
-			    /*
-			     * Should be able to use "!d", but apparently
-			     * some compilers can't handle it.
-			     */
-			    objPtr = Tcl_NewLongObj((d==0.0)? 1 : 0);
-			}
-			TRACE_WITH_OBJ(("%.6g => ", d), objPtr);
-		    }
-		    PUSH_OBJECT(objPtr);
-		    TclDecrRefCount(valuePtr);
-		} else {
-		    /*
-		     * valuePtr is unshared. Modify it directly.
-		     */
-		    if (tPtr == &tclIntType) {
-			i = valuePtr->internalRep.longValue;
-			Tcl_SetLongObj(valuePtr,
-			        (*pc == INST_UMINUS)? -i : !i);
-			TRACE_WITH_OBJ(("%ld => ", i), valuePtr);
-		    } else {
-			d = valuePtr->internalRep.doubleValue;
-			if (*pc == INST_UMINUS) {
-			    Tcl_SetDoubleObj(valuePtr, -d);
-			} else {
-			    /*
-			     * Should be able to use "!d", but apparently
-			     * some compilers can't handle it.
-			     */
-			    Tcl_SetLongObj(valuePtr, (d==0.0)? 1 : 0);
-			}
-			TRACE_WITH_OBJ(("%.6g => ", d), valuePtr);
-		    }
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		}
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_BITNOT:
-	    {
-		/*
-		 * The operand must be an integer. If the operand object is
-		 * unshared modify it directly, otherwise modify a copy. 
-		 * Free any old string representation since it is now
-		 * invalid.
-		 */
-		
-		Tcl_ObjType *tPtr;
-		
-		valuePtr = POP_OBJECT();
-		tPtr = valuePtr->typePtr;
-		if (tPtr != &tclIntType) {
-		    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-			    valuePtr, &i);
-		    if (result != TCL_OK) {   /* try to convert to double */
-			TRACE(("\"%.20s\" => ILLEGAL TYPE %s\n",
-			       O2S(valuePtr), (tPtr? tPtr->name : "null")));
-			IllegalExprOperandType(interp, pc, valuePtr);
-			Tcl_DecrRefCount(valuePtr);
-			goto checkForCatch;
-		    }
-		}
-		
-		i = valuePtr->internalRep.longValue;
-		if (Tcl_IsShared(valuePtr)) {
-		    PUSH_OBJECT(Tcl_NewLongObj(~i));
-		    TRACE(("0x%lx => (%lu)\n", i, ~i));
-		    TclDecrRefCount(valuePtr);
-		} else {
-		    /*
-		     * valuePtr is unshared. Modify it directly.
-		     */
-		    Tcl_SetLongObj(valuePtr, ~i);
-		    ++stackTop; /* valuePtr now on stk top has right r.c. */
-		    TRACE(("0x%lx => (%lu)\n", i, ~i));
-		}
-	    }
-	    ADJUST_PC(1);
-	    
-	case INST_CALL_BUILTIN_FUNC1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    {
-		/*
-		 * Call one of the built-in Tcl math functions.
-		 */
-
-		BuiltinFunc *mathFuncPtr;
-		ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-		if ((opnd < 0) || (opnd > LAST_BUILTIN_FUNC)) {
-		    TRACE(("UNRECOGNIZED BUILTIN FUNC CODE %d\n", opnd));
-		    panic("TclExecuteByteCode: unrecognized builtin function code %d", opnd);
-		}
-		mathFuncPtr = &(builtinFuncTable[opnd]);
-		DECACHE_STACK_INFO();
-		tsdPtr->mathInProgress++;
-		result = (*mathFuncPtr->proc)(interp, eePtr,
-		        mathFuncPtr->clientData);
-		tsdPtr->mathInProgress--;
-		CACHE_STACK_INFO();
-		if (result != TCL_OK) {
-		    goto checkForCatch;
-		}
-		TRACE_WITH_OBJ(("%d => ", opnd), stackPtr[stackTop]);
-	    }
-	    ADJUST_PC(2);
-		    
-	case INST_CALL_FUNC1:
-	    opnd = TclGetUInt1AtPtr(pc+1);
-	    {
-		/*
-		 * Call a non-builtin Tcl math function previously
-		 * registered by a call to Tcl_CreateMathFunc.
-		 */
-		
-		int objc = opnd;   /* Number of arguments. The function name
-				    * is the 0-th argument. */
-		Tcl_Obj **objv;	   /* The array of arguments. The function
-				    * name is objv[0]. */
-		ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-		objv = &(stackPtr[stackTop - (objc-1)]); /* "objv[0]" */
-		DECACHE_STACK_INFO();
-		tsdPtr->mathInProgress++;
-		result = ExprCallMathFunc(interp, eePtr, objc, objv);
-		tsdPtr->mathInProgress--;
-		CACHE_STACK_INFO();
-		if (result != TCL_OK) {
-		    goto checkForCatch;
-		}
-		TRACE_WITH_OBJ(("%d => ", objc), stackPtr[stackTop]);
-		ADJUST_PC(2);
-	    }
-
-	case INST_TRY_CVT_TO_NUMERIC:
-	    {
-		/*
-		 * Try to convert the topmost stack object to an int or
-		 * double object. This is done in order to support Tcl's
-		 * policy of interpreting operands if at all possible as
-		 * first integers, else floating-point numbers.
-		 */
-		
-		double d;
-		char *s;
-		Tcl_ObjType *tPtr;
-		int converted, shared;
-
-		valuePtr = stackPtr[stackTop];
-		tPtr = valuePtr->typePtr;
-		converted = 0;
-		if ((tPtr != &tclIntType) && ((tPtr != &tclDoubleType)
-			|| (valuePtr->bytes != NULL))) {
-		    s = Tcl_GetStringFromObj(valuePtr, &length);
-		    if (TclLooksLikeInt(s, length)) {
-			result = Tcl_GetLongFromObj((Tcl_Interp *) NULL,
-				valuePtr, &i);
-		    } else {
-			result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-				valuePtr, &d);
-		    }
-		    if (result == TCL_OK) {
-			converted = 1;
-		    }
-		    result = TCL_OK; /* reset the result variable */
-		    tPtr = valuePtr->typePtr;
-		}
-
-		/*
-		 * Ensure that the topmost stack object, if numeric, has a
-		 * string rep the same as the formatted version of its
-		 * internal rep. This is used, e.g., to make sure that "expr
-		 * {0001}" yields "1", not "0001". We implement this by
-		 * _discarding_ the string rep since we know it will be
-		 * regenerated, if needed later, by formatting the internal
-		 * rep's value. Also check if there has been an IEEE
-		 * floating point error.
-		 */
-
-		if ((tPtr == &tclIntType) || (tPtr == &tclDoubleType)) {
-		    shared = 0;
-		    if (Tcl_IsShared(valuePtr)) {
-			shared = 1;
-			if (tPtr == &tclIntType) {
-			    i = valuePtr->internalRep.longValue;
-			    objPtr = Tcl_NewLongObj(i);
-			} else {
-			    d = valuePtr->internalRep.doubleValue;
-			    objPtr = Tcl_NewDoubleObj(d);
-			}
-			Tcl_IncrRefCount(objPtr);
-			TclDecrRefCount(valuePtr);
-			valuePtr = objPtr;
-			stackPtr[stackTop] = valuePtr;
-			tPtr = valuePtr->typePtr;
-		    } else {
-			Tcl_InvalidateStringRep(valuePtr);
-		    }
-		
-		    if (tPtr == &tclDoubleType) {
-			d = valuePtr->internalRep.doubleValue;
-			if (IS_NAN(d) || IS_INF(d)) {
-			    TRACE(("\"%.20s\" => IEEE FLOATING PT ERROR\n",
-			           O2S(valuePtr)));
-			    TclExprFloatError(interp, d);
-			    result = TCL_ERROR;
-			    goto checkForCatch;
-			}
-		    }
-		    shared = shared;        /* lint, shared not used. */
-		    converted = converted;  /* lint, converted not used. */
-		    TRACE(("\"%.20s\" => numeric, %s, %s\n", O2S(valuePtr),
-			   (converted? "converted" : "not converted"),
-			   (shared? "shared" : "not shared")));
-		} else {
-		    TRACE(("\"%.20s\" => not numeric\n", O2S(valuePtr)));
-		}
-	    }
-	    ADJUST_PC(1);
-
-	case INST_BREAK:
-	    /*
-	     * First reset the interpreter's result. Then find the closest
-	     * enclosing loop or catch exception range, if any. If a loop is
-	     * found, terminate its execution. If the closest is a catch
-	     * exception range, jump to its catchOffset. If no enclosing
-	     * range is found, stop execution and return TCL_BREAK.
-	     */
-
-	    Tcl_ResetResult(interp);
-	    rangePtr = GetExceptRangeForPc(pc, /*catchOnly*/ 0, codePtr);
-	    if (rangePtr == NULL) {
-		TRACE(("=> no encl. loop or catch, returning TCL_BREAK\n"));
-		result = TCL_BREAK;
-		goto abnormalReturn; /* no catch exists to check */
-	    }
-	    switch (rangePtr->type) {
-	    case LOOP_EXCEPTION_RANGE:
-		result = TCL_OK;
-		TRACE(("=> range at %d, new pc %d\n",
-		       rangePtr->codeOffset, rangePtr->breakOffset));
-		break;
-	    case CATCH_EXCEPTION_RANGE:
-		result = TCL_BREAK;
-		TRACE(("=> ...\n"));
-		goto processCatch; /* it will use rangePtr */
-	    default:
-		panic("TclExecuteByteCode: unrecognized ExceptionRange type %d\n", rangePtr->type);
-	    }
-	    pc = (codePtr->codeStart + rangePtr->breakOffset);
-	    continue;	/* restart outer instruction loop at pc */
-
-	case INST_CONTINUE:
-            /*
-	     * Find the closest enclosing loop or catch exception range,
-	     * if any. If a loop is found, skip to its next iteration.
-	     * If the closest is a catch exception range, jump to its
-	     * catchOffset. If no enclosing range is found, stop
-	     * execution and return TCL_CONTINUE.
-	     */
-
-	    Tcl_ResetResult(interp);
-	    rangePtr = GetExceptRangeForPc(pc, /*catchOnly*/ 0, codePtr);
-	    if (rangePtr == NULL) {
-		TRACE(("=> no encl. loop or catch, returning TCL_CONTINUE\n"));
-		result = TCL_CONTINUE;
-		goto abnormalReturn;
-	    }
-	    switch (rangePtr->type) {
-	    case LOOP_EXCEPTION_RANGE:
-		if (rangePtr->continueOffset == -1) {
-		    TRACE(("=> loop w/o continue, checking for catch\n"));
-		    goto checkForCatch;
-		} else {
-		    result = TCL_OK;
-		    TRACE(("=> range at %d, new pc %d\n",
-			   rangePtr->codeOffset, rangePtr->continueOffset));
-		}
-		break;
-	    case CATCH_EXCEPTION_RANGE:
-		result = TCL_CONTINUE;
-		TRACE(("=> ...\n"));
-		goto processCatch; /* it will use rangePtr */
-	    default:
-		panic("TclExecuteByteCode: unrecognized ExceptionRange type %d\n", rangePtr->type);
-	    }
-	    pc = (codePtr->codeStart + rangePtr->continueOffset);
-	    continue;	/* restart outer instruction loop at pc */
-
-	case INST_FOREACH_START4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    {
-	        /*
-		 * Initialize the temporary local var that holds the count
-		 * of the number of iterations of the loop body to -1.
-		 */
-
-		ForeachInfo *infoPtr = (ForeachInfo *)
-		    codePtr->auxDataArrayPtr[opnd].clientData;
-		int iterTmpIndex = infoPtr->loopCtTemp;
-		Var *compiledLocals = iPtr->varFramePtr->compiledLocals;
-		Var *iterVarPtr = &(compiledLocals[iterTmpIndex]);
-		Tcl_Obj *oldValuePtr = iterVarPtr->value.objPtr;
-
-		if (oldValuePtr == NULL) {
-		    iterVarPtr->value.objPtr = Tcl_NewLongObj(-1);
-		    Tcl_IncrRefCount(iterVarPtr->value.objPtr);
-		} else {
-		    Tcl_SetLongObj(oldValuePtr, -1);
-		}
-		TclSetVarScalar(iterVarPtr);
-		TclClearVarUndefined(iterVarPtr);
-		TRACE(("%u => loop iter count temp %d\n", 
-		        opnd, iterTmpIndex));
-	    }
-	    ADJUST_PC(5);
-	
-	case INST_FOREACH_STEP4:
-	    opnd = TclGetUInt4AtPtr(pc+1);
-	    {
-	        /*
-		 * "Step" a foreach loop (i.e., begin its next iteration) by
-		 * assigning the next value list element to each loop var.
-		 */
-
-		ForeachInfo *infoPtr = (ForeachInfo *)
-		        codePtr->auxDataArrayPtr[opnd].clientData;
-		ForeachVarList *varListPtr;
-		int numLists = infoPtr->numLists;
-		Var *compiledLocals = iPtr->varFramePtr->compiledLocals;
-		Tcl_Obj *listPtr;
-		List *listRepPtr;
-		Var *iterVarPtr, *listVarPtr;
-		int iterNum, listTmpIndex, listLen, numVars;
-		int varIndex, valIndex, continueLoop, j;
-
-		/*
-		 * Increment the temp holding the loop iteration number.
-		 */
-
-		iterVarPtr = &(compiledLocals[infoPtr->loopCtTemp]);
-		valuePtr = iterVarPtr->value.objPtr;
-		iterNum = (valuePtr->internalRep.longValue + 1);
-		Tcl_SetLongObj(valuePtr, iterNum);
-		
-		/*
-		 * Check whether all value lists are exhausted and we should
-		 * stop the loop.
-		 */
-
-		continueLoop = 0;
-		listTmpIndex = infoPtr->firstValueTemp;
-		for (i = 0;  i < numLists;  i++) {
-		    varListPtr = infoPtr->varLists[i];
-		    numVars = varListPtr->numVars;
-		    
-		    listVarPtr = &(compiledLocals[listTmpIndex]);
-		    listPtr = listVarPtr->value.objPtr;
-		    result = Tcl_ListObjLength(interp, listPtr, &listLen);
-		    if (result != TCL_OK) {
-			TRACE_WITH_OBJ(("%u => ERROR converting list %ld, \"%s\": ",
-			        opnd, i, O2S(listPtr)),
-				Tcl_GetObjResult(interp));
-			goto checkForCatch;
-		    }
-		    if (listLen > (iterNum * numVars)) {
-			continueLoop = 1;
-		    }
-		    listTmpIndex++;
-		}
-
-		/*
-		 * If some var in some var list still has a remaining list
-		 * element iterate one more time. Assign to var the next
-		 * element from its value list. We already checked above
-		 * that each list temp holds a valid list object.
-		 */
-		
-		if (continueLoop) {
-		    listTmpIndex = infoPtr->firstValueTemp;
-		    for (i = 0;  i < numLists;  i++) {
-			varListPtr = infoPtr->varLists[i];
-			numVars = varListPtr->numVars;
-
-			listVarPtr = &(compiledLocals[listTmpIndex]);
-			listPtr = listVarPtr->value.objPtr;
-			listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-			listLen = listRepPtr->elemCount;
-			
-			valIndex = (iterNum * numVars);
-			for (j = 0;  j < numVars;  j++) {
-			    int setEmptyStr = 0;
-			    if (valIndex >= listLen) {
-				setEmptyStr = 1;
-				valuePtr = Tcl_NewObj();
-			    } else {
-				valuePtr = listRepPtr->elements[valIndex];
-			    }
-			    
-			    varIndex = varListPtr->varIndexes[j];
-			    DECACHE_STACK_INFO();
-			    value2Ptr = TclSetIndexedScalar(interp,
-			           varIndex, valuePtr, /*leaveErrorMsg*/ 1);
-			    CACHE_STACK_INFO();
-			    if (value2Ptr == NULL) {
-				TRACE_WITH_OBJ(("%u => ERROR init. index temp %d: ",
-				       opnd, varIndex),
-				       Tcl_GetObjResult(interp));
-				if (setEmptyStr) {
-				    Tcl_DecrRefCount(valuePtr);
-				}
-				result = TCL_ERROR;
-				goto checkForCatch;
-			    }
-			    valIndex++;
-			}
-			listTmpIndex++;
-		    }
-		}
-		
-		/*
-		 * Push 1 if at least one value list had a remaining element
-		 * and the loop should continue. Otherwise push 0.
-		 */
-
-		PUSH_OBJECT(Tcl_NewLongObj(continueLoop));
-		TRACE(("%u => %d lists, iter %d, %s loop\n", 
-		        opnd, numLists, iterNum,
-		        (continueLoop? "continue" : "exit")));
-	    }
-	    ADJUST_PC(5);
-
-	case INST_BEGIN_CATCH4:
-	    /*
-	     * Record start of the catch command with exception range index
-	     * equal to the operand. Push the current stack depth onto the
-	     * special catch stack.
-	     */
-	    catchStackPtr[++catchTop] = stackTop;
-	    TRACE(("%u => catchTop=%d, stackTop=%d\n",
-		    TclGetUInt4AtPtr(pc+1), catchTop, stackTop));
-	    ADJUST_PC(5);
-
-	case INST_END_CATCH:
-	    catchTop--;
-	    result = TCL_OK;
-	    TRACE(("=> catchTop=%d\n", catchTop));
-	    ADJUST_PC(1);
-
-	case INST_PUSH_RESULT:
-	    PUSH_OBJECT(Tcl_GetObjResult(interp));
-	    TRACE_WITH_OBJ(("=> "), Tcl_GetObjResult(interp));
-	    ADJUST_PC(1);
-
-	case INST_PUSH_RETURN_CODE:
-	    PUSH_OBJECT(Tcl_NewLongObj(result));
-	    TRACE(("=> %u\n", result));
-	    ADJUST_PC(1);
-
-	default:
-	    panic("TclExecuteByteCode: unrecognized opCode %u", *pc);
-	} /* end of switch on opCode */
-
-	/*
-	 * Division by zero in an expression. Control only reaches this
-	 * point by "goto divideByZero".
-	 */
-	
-        divideByZero:
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "divide by zero", -1);
-	Tcl_SetErrorCode(interp, "ARITH", "DIVZERO", "divide by zero",
-			 (char *) NULL);
-	result = TCL_ERROR;
-	
-	/*
-	 * Execution has generated an "exception" such as TCL_ERROR. If the
-	 * exception is an error, record information about what was being
-	 * executed when the error occurred. Find the closest enclosing
-	 * catch range, if any. If no enclosing catch range is found, stop
-	 * execution and return the "exception" code.
-	 */
-	
-        checkForCatch:
-	if ((result == TCL_ERROR) && !(iPtr->flags & ERR_ALREADY_LOGGED)) {
-	    bytes = GetSrcInfoForPc(pc, codePtr, &length);
-	    if (bytes != NULL) {
-		Tcl_LogCommandInfo(interp, codePtr->source, bytes, length);
-		iPtr->flags |= ERR_ALREADY_LOGGED;
-	    }
-        }
-	rangePtr = GetExceptRangeForPc(pc, /*catchOnly*/ 1, codePtr);
-	if (rangePtr == NULL) {
-#ifdef TCL_COMPILE_DEBUG
-	    if (traceInstructions) {
-		fprintf(stdout, "   ... no enclosing catch, returning %s\n",
-		        StringForResultCode(result));
-	    }
-#endif
-	    goto abnormalReturn;
-	}
-
-	/*
-	 * A catch exception range (rangePtr) was found to handle an
-	 * "exception". It was found either by checkForCatch just above or
-	 * by an instruction during break, continue, or error processing.
-	 * Jump to its catchOffset after unwinding the operand stack to
-	 * the depth it had when starting to execute the range's catch
-	 * command.
-	 */
-
-        processCatch:
-	while (stackTop > catchStackPtr[catchTop]) {
-	    valuePtr = POP_OBJECT();
-	    TclDecrRefCount(valuePtr);
-	}
-#ifdef TCL_COMPILE_DEBUG
-	if (traceInstructions) {
-	    fprintf(stdout, "  ... found catch at %d, catchTop=%d, unwound to %d, new pc %u\n",
-	        rangePtr->codeOffset, catchTop, catchStackPtr[catchTop],
-	        (unsigned int)(rangePtr->catchOffset));
-	}
-#endif	
-	pc = (codePtr->codeStart + rangePtr->catchOffset);
-	continue;		/* restart the execution loop at pc */
-    } /* end of infinite loop dispatching on instructions */
-
-    /*
-     * Abnormal return code. Restore the stack to state it had when starting
-     * to execute the ByteCode.
-     */
-
-    abnormalReturn:
-    while (stackTop > initStackTop) {
-	valuePtr = POP_OBJECT();
-	Tcl_DecrRefCount(valuePtr);
-    }
-
-    /*
-     * Free the catch stack array if malloc'ed storage was used.
-     */
-
-    done:
-    if (catchStackPtr != catchStackStorage) {
-	ckfree((char *) catchStackPtr);
-    }
-    eePtr->stackTop = initStackTop;
-    return result;
-#undef STATIC_CATCH_STACK_SIZE
-}
-
-#ifdef TCL_COMPILE_DEBUG
-/*
- *----------------------------------------------------------------------
- *
- * PrintByteCodeInfo --
- *
- *	This procedure prints a summary about a bytecode object to stdout.
- *	It is called by TclExecuteByteCode when starting to execute the
- *	bytecode object if tclTraceExec has the value 2 or more.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PrintByteCodeInfo(codePtr)
-    register ByteCode *codePtr;	/* The bytecode whose summary is printed
-				 * to stdout. */
-{
-    Proc *procPtr = codePtr->procPtr;
-    Interp *iPtr = (Interp *) *codePtr->interpHandle;
-
-    fprintf(stdout, "\nExecuting ByteCode 0x%x, refCt %u, epoch %u, interp 0x%x (epoch %u)\n",
-	    (unsigned int) codePtr, codePtr->refCount,
-	    codePtr->compileEpoch, (unsigned int) iPtr,
-	    iPtr->compileEpoch);
-    
-    fprintf(stdout, "  Source: ");
-    TclPrintSource(stdout, codePtr->source, 60);
-
-    fprintf(stdout, "\n  Cmds %d, src %d, inst %u, litObjs %u, aux %d, stkDepth %u, code/src %.2f\n",
-            codePtr->numCommands, codePtr->numSrcBytes,
-	    codePtr->numCodeBytes, codePtr->numLitObjects,
-	    codePtr->numAuxDataItems, codePtr->maxStackDepth,
-#ifdef TCL_COMPILE_STATS
-	    (codePtr->numSrcBytes?
-	            ((float)codePtr->structureSize)/((float)codePtr->numSrcBytes) : 0.0));
-#else
-	    0.0);
-#endif
-#ifdef TCL_COMPILE_STATS
-    fprintf(stdout, "  Code %d = header %d+inst %d+litObj %d+exc %d+aux %d+cmdMap %d\n",
-	    codePtr->structureSize,
-	    (sizeof(ByteCode) - (sizeof(size_t) + sizeof(Tcl_Time))),
-	    codePtr->numCodeBytes,
-	    (codePtr->numLitObjects * sizeof(Tcl_Obj *)),
-	    (codePtr->numExceptRanges * sizeof(ExceptionRange)),
-	    (codePtr->numAuxDataItems * sizeof(AuxData)),
-	    codePtr->numCmdLocBytes);
-#endif /* TCL_COMPILE_STATS */
-    if (procPtr != NULL) {
-	fprintf(stdout,
-		"  Proc 0x%x, refCt %d, args %d, compiled locals %d\n",
-		(unsigned int) procPtr, procPtr->refCount,
-		procPtr->numArgs, procPtr->numCompiledLocals);
-    }
-}
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * ValidatePcAndStackTop --
- *
- *	This procedure is called by TclExecuteByteCode when debugging to
- *	verify that the program counter and stack top are valid during
- *	execution.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Prints a message to stderr and panics if either the pc or stack
- *	top are invalid.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static void
-ValidatePcAndStackTop(codePtr, pc, stackTop, stackLowerBound,
-        stackUpperBound)
-    register ByteCode *codePtr; /* The bytecode whose summary is printed
-				 * to stdout. */
-    unsigned char *pc;		/* Points to first byte of a bytecode
-				 * instruction. The program counter. */
-    int stackTop;		/* Current stack top. Must be between
-				 * stackLowerBound and stackUpperBound
-				 * (inclusive). */
-    int stackLowerBound;	/* Smallest legal value for stackTop. */
-    int stackUpperBound;	/* Greatest legal value for stackTop. */
-{
-    unsigned int relativePc = (unsigned int) (pc - codePtr->codeStart);
-    unsigned int codeStart = (unsigned int) codePtr->codeStart;
-    unsigned int codeEnd = (unsigned int)
-	    (codePtr->codeStart + codePtr->numCodeBytes);
-    unsigned char opCode = *pc;
-
-    if (((unsigned int) pc < codeStart) || ((unsigned int) pc > codeEnd)) {
-	fprintf(stderr, "\nBad instruction pc 0x%x in TclExecuteByteCode\n",
-		(unsigned int) pc);
-	panic("TclExecuteByteCode execution failure: bad pc");
-    }
-    if ((unsigned int) opCode > LAST_INST_OPCODE) {
-	fprintf(stderr, "\nBad opcode %d at pc %u in TclExecuteByteCode\n",
-		(unsigned int) opCode, relativePc);
-	panic("TclExecuteByteCode execution failure: bad opcode");
-    }
-    if ((stackTop < stackLowerBound) || (stackTop > stackUpperBound)) {
-	int numChars;
-	char *cmd = GetSrcInfoForPc(pc, codePtr, &numChars);
-	char *ellipsis = "";
-	
-	fprintf(stderr, "\nBad stack top %d at pc %u in TclExecuteByteCode",
-		stackTop, relativePc);
-	if (cmd != NULL) {
-	    if (numChars > 100) {
-		numChars = 100;
-		ellipsis = "...";
-	    }
-	    fprintf(stderr, "\n executing %.*s%s\n", numChars, cmd,
-		    ellipsis);
-	} else {
-	    fprintf(stderr, "\n");
-	}
-	panic("TclExecuteByteCode execution failure: bad stack top");
-    }
-}
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * IllegalExprOperandType --
- *
- *	Used by TclExecuteByteCode to add an error message to errorInfo
- *	when an illegal operand type is detected by an expression
- *	instruction. The argument opndPtr holds the operand object in error.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	An error message is appended to errorInfo.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-IllegalExprOperandType(interp, pc, opndPtr)
-    Tcl_Interp *interp;		/* Interpreter to which error information
-				 * pertains. */
-    unsigned char *pc;		/* Points to the instruction being executed
-				 * when the illegal type was found. */
-    Tcl_Obj *opndPtr;		/* Points to the operand holding the value
-				 * with the illegal type. */
-{
-    unsigned char opCode = *pc;
-    int isDouble;
-    
-    Tcl_ResetResult(interp);
-    if ((opndPtr->bytes == NULL) || (opndPtr->length == 0)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"can't use empty string as operand of \"",
-		operatorStrings[opCode - INST_LOR], "\"", (char *) NULL);
-    } else {
-	isDouble = 1;
-	if (opndPtr->typePtr != &tclDoubleType) {
-	    /*
-	     * See if the operand can be interpreted as a double in order to
-	     * improve the error message.
-	     */
-
-	    char *s = Tcl_GetString(opndPtr);
-	    double d;
-
-	    if (Tcl_GetDouble((Tcl_Interp *) NULL, s, &d) != TCL_OK) {
-		isDouble = 0;
-	    }
-	}
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't use ",
-		(isDouble? "floating-point value" : "non-numeric string"),
-		" as operand of \"", operatorStrings[opCode - INST_LOR],
-		"\"", (char *) NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CallTraceProcedure --
- *
- *	Invokes a trace procedure registered with an interpreter. These
- *	procedures trace command execution. Currently this trace procedure
- *	is called with the address of the string-based Tcl_CmdProc for the
- *	command, not the Tcl_ObjCmdProc.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Those side effects made by the trace procedure.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CallTraceProcedure(interp, tracePtr, cmdPtr, command, numChars, objc, objv)
-    Tcl_Interp *interp;		/* The current interpreter. */
-    register Trace *tracePtr;	/* Describes the trace procedure to call. */
-    Command *cmdPtr;		/* Points to command's Command struct. */
-    char *command;		/* Points to the first character of the
-				 * command's source before substitutions. */
-    int numChars;		/* The number of characters in the
-				 * command's source. */
-    register int objc;		/* Number of arguments for the command. */
-    Tcl_Obj *objv[];		/* Pointers to Tcl_Obj of each argument. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register char **argv;
-    register int i;
-    int length;
-    char *p;
-
-    /*
-     * Get the string rep from the objv argument objects and place their
-     * pointers in argv. First make sure argv is large enough to hold the
-     * objc args plus 1 extra word for the zero end-of-argv word.
-     */
-    
-    argv = (char **) ckalloc((unsigned)(objc + 1) * sizeof(char *));
-    for (i = 0;  i < objc;  i++) {
-	argv[i] = Tcl_GetStringFromObj(objv[i], &length);
-    }
-    argv[objc] = 0;
-
-    /*
-     * Copy the command characters into a new string.
-     */
-
-    p = (char *) ckalloc((unsigned) (numChars + 1));
-    memcpy((VOID *) p, (VOID *) command, (size_t) numChars);
-    p[numChars] = '\0';
-    
-    /*
-     * Call the trace procedure then free allocated storage.
-     */
-    
-    (*tracePtr->proc)(tracePtr->clientData, interp, iPtr->numLevels,
-                      p, cmdPtr->proc, cmdPtr->clientData, objc, argv);
-
-    ckfree((char *) argv);
-    ckfree((char *) p);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetSrcInfoForPc --
- *
- *	Given a program counter value, finds the closest command in the
- *	bytecode code unit's CmdLocation array and returns information about
- *	that command's source: a pointer to its first byte and the number of
- *	characters.
- *
- * Results:
- *	If a command is found that encloses the program counter value, a
- *	pointer to the command's source is returned and the length of the
- *	source is stored at *lengthPtr. If multiple commands resulted in
- *	code at pc, information about the closest enclosing command is
- *	returned. If no matching command is found, NULL is returned and
- *	*lengthPtr is unchanged.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-GetSrcInfoForPc(pc, codePtr, lengthPtr)
-    unsigned char *pc;		/* The program counter value for which to
-				 * return the closest command's source info.
-				 * This points to a bytecode instruction
-				 * in codePtr's code. */
-    ByteCode *codePtr;		/* The bytecode sequence in which to look
-				 * up the command source for the pc. */
-    int *lengthPtr;		/* If non-NULL, the location where the
-				 * length of the command's source should be
-				 * stored. If NULL, no length is stored. */
-{
-    register int pcOffset = (pc - codePtr->codeStart);
-    int numCmds = codePtr->numCommands;
-    unsigned char *codeDeltaNext, *codeLengthNext;
-    unsigned char *srcDeltaNext, *srcLengthNext;
-    int codeOffset, codeLen, codeEnd, srcOffset, srcLen, delta, i;
-    int bestDist = INT_MAX;	/* Distance of pc to best cmd's start pc. */
-    int bestSrcOffset = -1;	/* Initialized to avoid compiler warning. */
-    int bestSrcLength = -1;	/* Initialized to avoid compiler warning. */
-
-    if ((pcOffset < 0) || (pcOffset >= codePtr->numCodeBytes)) {
-	return NULL;
-    }
-
-    /*
-     * Decode the code and source offset and length for each command. The
-     * closest enclosing command is the last one whose code started before
-     * pcOffset.
-     */
-
-    codeDeltaNext = codePtr->codeDeltaStart;
-    codeLengthNext = codePtr->codeLengthStart;
-    srcDeltaNext  = codePtr->srcDeltaStart;
-    srcLengthNext = codePtr->srcLengthStart;
-    codeOffset = srcOffset = 0;
-    for (i = 0;  i < numCmds;  i++) {
-	if ((unsigned int) (*codeDeltaNext) == (unsigned int) 0xFF) {
-	    codeDeltaNext++;
-	    delta = TclGetInt4AtPtr(codeDeltaNext);
-	    codeDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(codeDeltaNext);
-	    codeDeltaNext++;
-	}
-	codeOffset += delta;
-
-	if ((unsigned int) (*codeLengthNext) == (unsigned int) 0xFF) {
-	    codeLengthNext++;
-	    codeLen = TclGetInt4AtPtr(codeLengthNext);
-	    codeLengthNext += 4;
-	} else {
-	    codeLen = TclGetInt1AtPtr(codeLengthNext);
-	    codeLengthNext++;
-	}
-	codeEnd = (codeOffset + codeLen - 1);
-
-	if ((unsigned int) (*srcDeltaNext) == (unsigned int) 0xFF) {
-	    srcDeltaNext++;
-	    delta = TclGetInt4AtPtr(srcDeltaNext);
-	    srcDeltaNext += 4;
-	} else {
-	    delta = TclGetInt1AtPtr(srcDeltaNext);
-	    srcDeltaNext++;
-	}
-	srcOffset += delta;
-
-	if ((unsigned int) (*srcLengthNext) == (unsigned int) 0xFF) {
-	    srcLengthNext++;
-	    srcLen = TclGetInt4AtPtr(srcLengthNext);
-	    srcLengthNext += 4;
-	} else {
-	    srcLen = TclGetInt1AtPtr(srcLengthNext);
-	    srcLengthNext++;
-	}
-	
-	if (codeOffset > pcOffset) {      /* best cmd already found */
-	    break;
-	} else if (pcOffset <= codeEnd) { /* this cmd's code encloses pc */
-	    int dist = (pcOffset - codeOffset);
-	    if (dist <= bestDist) {
-		bestDist = dist;
-		bestSrcOffset = srcOffset;
-		bestSrcLength = srcLen;
-	    }
-	}
-    }
-
-    if (bestDist == INT_MAX) {
-	return NULL;
-    }
-    
-    if (lengthPtr != NULL) {
-	*lengthPtr = bestSrcLength;
-    }
-    return (codePtr->source + bestSrcOffset);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetExceptRangeForPc --
- *
- *	Given a program counter value, return the closest enclosing
- *	ExceptionRange.
- *
- * Results:
- *	In the normal case, catchOnly is 0 (false) and this procedure
- *	returns a pointer to the most closely enclosing ExceptionRange
- *	structure regardless of whether it is a loop or catch exception
- *	range. This is appropriate when processing a TCL_BREAK or
- *	TCL_CONTINUE, which will be "handled" either by a loop exception
- *	range or a closer catch range. If catchOnly is nonzero, this
- *	procedure ignores loop exception ranges and returns a pointer to the
- *	closest catch range. If no matching ExceptionRange is found that
- *	encloses pc, a NULL is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static ExceptionRange *
-GetExceptRangeForPc(pc, catchOnly, codePtr)
-    unsigned char *pc;		/* The program counter value for which to
-				 * search for a closest enclosing exception
-				 * range. This points to a bytecode
-				 * instruction in codePtr's code. */
-    int catchOnly;		/* If 0, consider either loop or catch
-				 * ExceptionRanges in search. If nonzero
-				 * consider only catch ranges (and ignore
-				 * any closer loop ranges). */
-    ByteCode* codePtr;		/* Points to the ByteCode in which to search
-				 * for the enclosing ExceptionRange. */
-{
-    ExceptionRange *rangeArrayPtr;
-    int numRanges = codePtr->numExceptRanges;
-    register ExceptionRange *rangePtr;
-    int pcOffset = (pc - codePtr->codeStart);
-    register int i, level;
-
-    if (numRanges == 0) {
-	return NULL;
-    }
-    rangeArrayPtr = codePtr->exceptArrayPtr;
-
-    for (level = codePtr->maxExceptDepth;  level >= 0;  level--) {
-	for (i = 0;  i < numRanges;  i++) {
-	    rangePtr = &(rangeArrayPtr[i]);
-	    if (rangePtr->nestingLevel == level) {
-		int start = rangePtr->codeOffset;
-		int end   = (start + rangePtr->numCodeBytes);
-		if ((start <= pcOffset) && (pcOffset < end)) {
-		    if ((!catchOnly)
-			    || (rangePtr->type == CATCH_EXCEPTION_RANGE)) {
-			return rangePtr;
-		    }
-		}
-	    }
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetOpcodeName --
- *
- *	This procedure is called by the TRACE and TRACE_WITH_OBJ macros
- *	used in TclExecuteByteCode when debugging. It returns the name of
- *	the bytecode instruction at a specified instruction pc.
- *
- * Results:
- *	A character string for the instruction.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static char *
-GetOpcodeName(pc)
-    unsigned char *pc;		/* Points to the instruction whose name
-				 * should be returned. */
-{
-    unsigned char opCode = *pc;
-    
-    return instructionTable[opCode].name;
-}
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Math Functions --
- *
- *	This page contains the procedures that implement all of the
- *	built-in math functions for expressions.
- *
- * Results:
- *	Each procedure returns TCL_OK if it succeeds and pushes an
- *	Tcl object holding the result. If it fails it returns TCL_ERROR
- *	and leaves an error message in the interpreter's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ExprUnaryFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Contains the address of a procedure that
-				 * takes one double argument and returns a
-				 * double result. */
-{
-    Tcl_Obj **stackPtr;		/* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    register Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    double d, dResult;
-    long i;
-    int length, result;
-    
-    double (*func) _ANSI_ARGS_((double)) =
-	(double (*)_ANSI_ARGS_((double))) clientData;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the function's argument from the evaluation stack. Convert it
-     * to a double if necessary.
-     */
-
-    valuePtr = POP_OBJECT();
-    tPtr = valuePtr->typePtr;
-    
-    if (tPtr == &tclIntType) {
-	d = (double) valuePtr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d = valuePtr->internalRep.doubleValue;
-    } else {
-	char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	    d = (double) valuePtr->internalRep.longValue;
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr, &d);
-	}
-	if (result != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-    }
-
-    errno = 0;
-    dResult = (*func)(d);
-    if ((errno != 0) || IS_NAN(dResult) || IS_INF(dResult)) {
-	TclExprFloatError(interp, dResult);
-	result = TCL_ERROR;
-	goto done;
-    }
-    
-    /*
-     * Push a Tcl object holding the result.
-     */
-
-    PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-    
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprBinaryFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Contains the address of a procedure that
-				 * takes two double arguments and
-				 * returns a double result. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    register Tcl_Obj *valuePtr, *value2Ptr;
-    Tcl_ObjType *tPtr;
-    double d1, d2, dResult;
-    long i;
-    char *s;
-    int length, result;
-    
-    double (*func) _ANSI_ARGS_((double, double))
-	= (double (*)_ANSI_ARGS_((double, double))) clientData;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the function's two arguments from the evaluation stack. Convert
-     * them to doubles if necessary.
-     */
-
-    value2Ptr = POP_OBJECT();
-    valuePtr  = POP_OBJECT();
-
-    tPtr = valuePtr->typePtr;
-    if (tPtr == &tclIntType) {
-	d1 = (double) valuePtr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d1 = valuePtr->internalRep.doubleValue;
-    } else {
-	s = Tcl_GetStringFromObj(valuePtr, &length);
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	    d1 = (double) valuePtr->internalRep.longValue;
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr, &d1);
-	}
-	if (result != TCL_OK) {
-            badArg:
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-    }
-
-    tPtr = value2Ptr->typePtr;
-    if (tPtr == &tclIntType) {
-	d2 = value2Ptr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d2 = value2Ptr->internalRep.doubleValue;
-    } else {
-	s = Tcl_GetStringFromObj(value2Ptr, &length);
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, value2Ptr, &i);
-	    d2 = (double) value2Ptr->internalRep.longValue;
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, value2Ptr, &d2);
-	}
-	if (result != TCL_OK) {
-	    goto badArg;
-	}
-    }
-
-    errno = 0;
-    dResult = (*func)(d1, d2);
-    if ((errno != 0) || IS_NAN(dResult) || IS_INF(dResult)) {
-	TclExprFloatError(interp, dResult);
-	result = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * Push a Tcl object holding the result.
-     */
-
-    PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-    
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    Tcl_DecrRefCount(value2Ptr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprAbsFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    register Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    long i, iResult;
-    double d, dResult;
-    int length, result;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the argument from the evaluation stack.
-     */
-
-    valuePtr = POP_OBJECT();
-    tPtr = valuePtr->typePtr;
-    
-    if (tPtr == &tclIntType) {
-	i = valuePtr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d = valuePtr->internalRep.doubleValue;
-    } else {
-	char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr, &d);
-	}
-	if (result != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	            "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-	tPtr = valuePtr->typePtr;
-    }
-
-    /*
-     * Push a Tcl object with the result.
-     */
-    
-    if (tPtr == &tclIntType) {
-	if (i < 0) {
-	    iResult = -i;
-	    if (iResult < 0) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		        "integer value too large to represent", -1);
-		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
-			"integer value too large to represent", (char *) NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	} else {
-	    iResult = i;
-	}	    
-	PUSH_OBJECT(Tcl_NewLongObj(iResult));
-    } else {
-	if (d < 0.0) {
-	    dResult = -d;
-	} else {
-	    dResult = d;
-	}
-	if (IS_NAN(dResult) || IS_INF(dResult)) {
-	    TclExprFloatError(interp, dResult);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-    }
-    
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprDoubleFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    register Tcl_Obj *valuePtr;
-    double dResult;
-    long i;
-    int length, result;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the argument from the evaluation stack.
-     */
-
-    valuePtr = POP_OBJECT();
-    if (valuePtr->typePtr == &tclIntType) {
-	dResult = (double) valuePtr->internalRep.longValue;
-    } else if (valuePtr->typePtr == &tclDoubleType) {
-	dResult = valuePtr->internalRep.doubleValue;
-    } else {
-	char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	    dResult = (double) valuePtr->internalRep.longValue;
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr,
-		    &dResult);
-	}
-	if (result != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-    }
-
-    /*
-     * Push a Tcl object with the result.
-     */
-
-    PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprIntFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    register Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    long i = 0;			/* Initialized to avoid compiler warning. */
-    long iResult;
-    double d;
-    int length, result;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the argument from the evaluation stack.
-     */
-
-    valuePtr = POP_OBJECT();
-    tPtr = valuePtr->typePtr;
-    
-    if (tPtr == &tclIntType) {
-	i = valuePtr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d = valuePtr->internalRep.doubleValue;
-    } else {
-	char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr, &d);
-	}
-	if (result != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-	tPtr = valuePtr->typePtr;
-    }
-
-    /*
-     * Push a Tcl object with the result.
-     */
-    
-    if (tPtr == &tclIntType) {
-	iResult = i;
-    } else {
-	if (d < 0.0) {
-	    if (d < (double) (long) LONG_MIN) {
-		tooLarge:
-		Tcl_ResetResult(interp);
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		        "integer value too large to represent", -1);
-		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
-			"integer value too large to represent", (char *) NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	} else {
-	    if (d > (double) LONG_MAX) {
-		goto tooLarge;
-	    }
-	}
-	if (IS_NAN(d) || IS_INF(d)) {
-	    TclExprFloatError(interp, d);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	iResult = (long) d;
-    }
-    PUSH_OBJECT(Tcl_NewLongObj(iResult));
-
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprRandFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    Interp *iPtr = (Interp *) interp;
-    double dResult;
-    int tmp;
-
-    if (!(iPtr->flags & RAND_SEED_INITIALIZED)) {
-	iPtr->flags |= RAND_SEED_INITIALIZED;
-	iPtr->randSeed = TclpGetClicks();
-    }
-    
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-    
-    CACHE_STACK_INFO();
-
-    /*
-     * Generate the random number using the linear congruential
-     * generator defined by the following recurrence:
-     *		seed = ( IA * seed ) mod IM
-     * where IA is 16807 and IM is (2^31) - 1.  In order to avoid
-     * potential problems with integer overflow, the  code uses
-     * additional constants IQ and IR such that
-     *		IM = IA*IQ + IR
-     * For details on how this algorithm works, refer to the following
-     * papers: 
-     *
-     *	S.K. Park & K.W. Miller, "Random number generators: good ones
-     *	are hard to find," Comm ACM 31(10):1192-1201, Oct 1988
-     *
-     *	W.H. Press & S.A. Teukolsky, "Portable random number
-     *	generators," Computers in Physics 6(5):522-524, Sep/Oct 1992.
-     */
-
-#define RAND_IA		16807
-#define RAND_IM		2147483647
-#define RAND_IQ		127773
-#define RAND_IR		2836
-#define RAND_MASK	123459876
-
-    if (iPtr->randSeed == 0) {
-	/*
-	 * Don't allow a 0 seed, since it breaks the generator.  Shift
-	 * it to some other value.
-	 */
-
-	iPtr->randSeed = 123459876;
-    }
-    tmp = iPtr->randSeed/RAND_IQ;
-    iPtr->randSeed = RAND_IA*(iPtr->randSeed - tmp*RAND_IQ) - RAND_IR*tmp;
-    if (iPtr->randSeed < 0) {
-	iPtr->randSeed += RAND_IM;
-    }
-
-    /*
-     * On 64-bit architectures we need to mask off the upper bits to
-     * ensure we only have a 32-bit range.  The constant has the
-     * bizarre form below in order to make sure that it doesn't
-     * get sign-extended (the rules for sign extension are very
-     * concat, particularly on 64-bit machines).
-     */
-
-    iPtr->randSeed &= ((((unsigned long) 0xfffffff) << 4) | 0xf);
-    dResult = iPtr->randSeed * (1.0/RAND_IM);
-
-    /*
-     * Push a Tcl object with the result.
-     */
-
-    PUSH_OBJECT(Tcl_NewDoubleObj(dResult));
-    
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    DECACHE_STACK_INFO();
-    return TCL_OK;
-}
-
-static int
-ExprRoundFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    long i = 0;			/* Initialized to avoid compiler warning. */
-    long iResult;
-    double d, temp;
-    int length, result;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-
-    result = TCL_OK;
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the argument from the evaluation stack.
-     */
-
-    valuePtr = POP_OBJECT();
-    tPtr = valuePtr->typePtr;
-    
-    if (tPtr == &tclIntType) {
-	i = valuePtr->internalRep.longValue;
-    } else if (tPtr == &tclDoubleType) {
-	d = valuePtr->internalRep.doubleValue;
-    } else {
-	char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	
-	if (TclLooksLikeInt(s, length)) {
-	    result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	} else {
-	    result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, valuePtr, &d);
-	}
-	if (result != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "argument to math function didn't have numeric value", -1);
-	    goto done;
-	}
-	tPtr = valuePtr->typePtr;
-    }
-
-    /*
-     * Push a Tcl object with the result.
-     */
-    
-    if (tPtr == &tclIntType) {
-	iResult = i;
-    } else {
-	if (d < 0.0) {
-	    if (d <= (((double) (long) LONG_MIN) - 0.5)) {
-		tooLarge:
-		Tcl_ResetResult(interp);
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		        "integer value too large to represent", -1);
-		Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
-			"integer value too large to represent",
-			(char *) NULL);
-		result = TCL_ERROR;
-		goto done;
-	    }
-	    temp = (long) (d - 0.5);
-	} else {
-	    if (d >= (((double) LONG_MAX + 0.5))) {
-		goto tooLarge;
-	    }
-	    temp = (long) (d + 0.5);
-	}
-	if (IS_NAN(temp) || IS_INF(temp)) {
-	    TclExprFloatError(interp, temp);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	iResult = (long) temp;
-    }
-    PUSH_OBJECT(Tcl_NewLongObj(iResult));
-
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-static int
-ExprSrandFunc(interp, eePtr, clientData)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    ClientData clientData;	/* Ignored. */
-{
-    Tcl_Obj **stackPtr;        /* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    long i = 0;			/* Initialized to avoid compiler warning. */
-    int isDouble, result;
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-    
-    CACHE_STACK_INFO();
-
-    /*
-     * Pop the argument from the evaluation stack.  Use the value
-     * to reset the random number seed.
-     */
-
-    valuePtr = POP_OBJECT();
-    tPtr = valuePtr->typePtr;
-    
-    if (tPtr == &tclIntType) {
-	i = valuePtr->internalRep.longValue;
-    } else {
-	result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	if (result != TCL_OK) {
-	    /*
-	     * See if the operand can be interpreted as a double in order to
-	     * improve the error message.
-	     */
-
-	    isDouble = 1;
-	    if (valuePtr->typePtr != &tclDoubleType) {
-		char *s = Tcl_GetString(valuePtr);
-		double d;
-
-		if (Tcl_GetDouble((Tcl_Interp *) NULL, s, &d) != TCL_OK) {
-		    isDouble = 0;
-		}
-	    }
-
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "can't use ",
-		    (isDouble? "floating-point value":"non-numeric string"),
-		    " as argument to srand", (char *) NULL);
-	    Tcl_DecrRefCount(valuePtr);
-	    DECACHE_STACK_INFO();
-	    return result;
-	}
-    }
-    
-    /*
-     * Reset the seed.
-     */
-
-    iPtr->flags |= RAND_SEED_INITIALIZED;
-    iPtr->randSeed = i;
-
-    /*
-     * To avoid duplicating the random number generation code we simply
-     * clean up our state and call the real random number function. That
-     * function will always succeed.
-     */
-    
-    Tcl_DecrRefCount(valuePtr);
-    DECACHE_STACK_INFO();
-
-    ExprRandFunc(interp, eePtr, clientData);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ExprCallMathFunc --
- *
- *	This procedure is invoked to call a non-builtin math function
- *	during the execution of an expression. 
- *
- * Results:
- *	TCL_OK is returned if all went well and the function's value
- *	was computed successfully. If an error occurred, TCL_ERROR
- *	is returned and an error message is left in the interpreter's
- *	result.	After a successful return this procedure pushes a Tcl object
- *	holding the result. 
- *
- * Side effects:
- *	None, unless the called math function has side effects.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ExprCallMathFunc(interp, eePtr, objc, objv)
-    Tcl_Interp *interp;		/* The interpreter in which to execute the
-				 * function. */
-    ExecEnv *eePtr;		/* Points to the environment for executing
-				 * the function. */
-    int objc;			/* Number of arguments. The function name is
-				 * the 0-th argument. */
-    Tcl_Obj **objv;		/* The array of arguments. The function name
-				 * is objv[0]. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_Obj **stackPtr;		/* Cached evaluation stack base pointer. */
-    register int stackTop;	/* Cached top index of evaluation stack. */
-    char *funcName;
-    Tcl_HashEntry *hPtr;
-    MathFunc *mathFuncPtr;	/* Information about math function. */
-    Tcl_Value args[MAX_MATH_ARGS]; /* Arguments for function call. */
-    Tcl_Value funcResult;	/* Result of function call as Tcl_Value. */
-    register Tcl_Obj *valuePtr;
-    Tcl_ObjType *tPtr;
-    long i;
-    double d;
-    int j, k, length, result;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    Tcl_ResetResult(interp);
-
-    /*
-     * Set stackPtr and stackTop from eePtr.
-     */
-    
-    CACHE_STACK_INFO();
-
-    /*
-     * Look up the MathFunc record for the function.
-     */
-
-    funcName = Tcl_GetString(objv[0]);
-    hPtr = Tcl_FindHashEntry(&iPtr->mathFuncTable, funcName);
-    if (hPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"unknown math function \"", funcName, "\"", (char *) NULL);
-	result = TCL_ERROR;
-	goto done;
-    }
-    mathFuncPtr = (MathFunc *) Tcl_GetHashValue(hPtr);
-    if (mathFuncPtr->numArgs != (objc-1)) {
-	panic("ExprCallMathFunc: expected number of args %d != actual number %d",
-	        mathFuncPtr->numArgs, objc);
-	result = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * Collect the arguments for the function, if there are any, into the
-     * array "args". Note that args[0] will have the Tcl_Value that
-     * corresponds to objv[1].
-     */
-
-    for (j = 1, k = 0;  j < objc;  j++, k++) {
-	valuePtr = objv[j];
-	tPtr = valuePtr->typePtr;
-	
-	if (tPtr == &tclIntType) {
-	    i = valuePtr->internalRep.longValue;
-	} else if (tPtr == &tclDoubleType) {
-	    d = valuePtr->internalRep.doubleValue;
-	} else {
-	    /*
-	     * Try to convert to int first then double.
-	     */
-	    
-	    char *s = Tcl_GetStringFromObj(valuePtr, &length);
-	    
-	    if (TclLooksLikeInt(s, length)) {
-		result = Tcl_GetLongFromObj((Tcl_Interp *) NULL, valuePtr, &i);
-	    } else {
-		result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL,
-			valuePtr, &d);
-	    }
-	    if (result != TCL_OK) {
-		Tcl_AppendToObj(Tcl_GetObjResult(interp),
-			"argument to math function didn't have numeric value", -1);
-		goto done;
-	    }
-	    tPtr = valuePtr->typePtr;
-	}
-
-	/*
-	 * Copy the object's numeric value to the argument record,
-	 * converting it if necessary. 
-	 */
-	
-	if (tPtr == &tclIntType) {
-	    if (mathFuncPtr->argTypes[k] == TCL_DOUBLE) {
-		args[k].type = TCL_DOUBLE;
-		args[k].doubleValue = i;
-	    } else {
-		args[k].type = TCL_INT;
-		args[k].intValue = i;
-	    }
-	} else {
-	    if (mathFuncPtr->argTypes[k] == TCL_INT) {
-		args[k].type = TCL_INT;
-		args[k].intValue = (long) d;
-	    } else {
-		args[k].type = TCL_DOUBLE;
-		args[k].doubleValue = d;
-	    }
-	}
-    }
-
-    /*
-     * Invoke the function and copy its result back into valuePtr.
-     */
-
-    tsdPtr->mathInProgress++;
-    result = (*mathFuncPtr->proc)(mathFuncPtr->clientData, interp, args,
-	    &funcResult);
-    tsdPtr->mathInProgress--;
-    if (result != TCL_OK) {
-	goto done;
-    }
-
-    /*
-     * Pop the objc top stack elements and decrement their ref counts.
-     */
-		
-    i = (stackTop - (objc-1));
-    while (i <= stackTop) {
-	valuePtr = stackPtr[i];
-	Tcl_DecrRefCount(valuePtr);
-	i++;
-    }
-    stackTop -= objc;
-    
-    /*
-     * Push the call's object result.
-     */
-    
-    if (funcResult.type == TCL_INT) {
-	PUSH_OBJECT(Tcl_NewLongObj(funcResult.intValue));
-    } else {
-	d = funcResult.doubleValue;
-	if (IS_NAN(d) || IS_INF(d)) {
-	    TclExprFloatError(interp, d);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-	PUSH_OBJECT(Tcl_NewDoubleObj(d));
-    }
-
-    /*
-     * Reflect the change to stackTop back in eePtr.
-     */
-
-    done:
-    DECACHE_STACK_INFO();
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclExprFloatError --
- *
- *	This procedure is called when an error occurs during a
- *	floating-point operation. It reads errno and sets
- *	interp->objResultPtr accordingly.
- *
- * Results:
- *	interp->objResultPtr is set to hold an error message.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclExprFloatError(interp, value)
-    Tcl_Interp *interp;		/* Where to store error message. */
-    double value;		/* Value returned after error;  used to
-				 * distinguish underflows from overflows. */
-{
-    char *s;
-
-    Tcl_ResetResult(interp);
-    if ((errno == EDOM) || (value != value)) {
-	s = "domain error: argument not in valid range";
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), s, -1);
-	Tcl_SetErrorCode(interp, "ARITH", "DOMAIN", s, (char *) NULL);
-    } else if ((errno == ERANGE) || IS_INF(value)) {
-	if (value == 0.0) {
-	    s = "floating-point value too small to represent";
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), s, -1);
-	    Tcl_SetErrorCode(interp, "ARITH", "UNDERFLOW", s, (char *) NULL);
-	} else {
-	    s = "floating-point value too large to represent";
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), s, -1);
-	    Tcl_SetErrorCode(interp, "ARITH", "OVERFLOW", s, (char *) NULL);
-	}
-    } else {
-	char msg[64 + TCL_INTEGER_SPACE];
-	
-	sprintf(msg, "unknown floating-point error, errno = %d", errno);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), msg, -1);
-	Tcl_SetErrorCode(interp, "ARITH", "UNKNOWN", msg, (char *) NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMathInProgress --
- *
- *	This procedure is called to find out if Tcl is doing math
- *	in this thread.
- *
- * Results:
- *	0 or 1.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMathInProgress()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    return tsdPtr->mathInProgress;
-}
-
-#ifdef TCL_COMPILE_STATS
-/*
- *----------------------------------------------------------------------
- *
- * TclLog2 --
- *
- *	Procedure used while collecting compilation statistics to determine
- *	the log base 2 of an integer.
- *
- * Results:
- *	Returns the log base 2 of the operand. If the argument is less
- *	than or equal to zero, a zero is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclLog2(value)
-    register int value;		/* The integer for which to compute the
-				 * log base 2. */
-{
-    register int n = value;
-    register int result = 0;
-
-    while (n > 1) {
-	n = n >> 1;
-	result++;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EvalStatsCmd --
- *
- *	Implements the "evalstats" command that prints instruction execution
- *	counts to stdout.
- *
- * Results:
- *	Standard Tcl results.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-EvalStatsCmd(unused, interp, argc, argv)
-    ClientData unused;		/* Unused. */
-    Tcl_Interp *interp;		/* The current interpreter. */
-    int argc;			/* The number of arguments. */
-    char **argv;		/* The argument strings. */
-{
-    Interp *iPtr = (Interp *) interp;
-    LiteralTable *globalTablePtr = &(iPtr->literalTable);
-    ByteCodeStats *statsPtr = &(iPtr->stats);
-    double totalCodeBytes, currentCodeBytes;
-    double totalLiteralBytes, currentLiteralBytes;
-    double objBytesIfUnshared, strBytesIfUnshared, sharingBytesSaved;
-    double strBytesSharedMultX, strBytesSharedOnce;
-    double numInstructions, currentHeaderBytes;
-    long numCurrentByteCodes, numByteCodeLits;
-    long refCountSum, literalMgmtBytes, sum;
-    int numSharedMultX, numSharedOnce;
-    int decadeHigh, minSizeDecade, maxSizeDecade, length, i;
-    char *litTableStats;
-    LiteralEntry *entryPtr;
-
-    numInstructions = 0.0;
-    for (i = 0;  i < 256;  i++) {
-        if (statsPtr->instructionCount[i] != 0) {
-            numInstructions += statsPtr->instructionCount[i];
-        }
-    }
-
-    totalLiteralBytes = sizeof(LiteralTable)
-	    + iPtr->literalTable.numBuckets * sizeof(LiteralEntry *)
-	    + (statsPtr->numLiteralsCreated * sizeof(LiteralEntry))
-	    + (statsPtr->numLiteralsCreated * sizeof(Tcl_Obj))
-	    + statsPtr->totalLitStringBytes;
-    totalCodeBytes = statsPtr->totalByteCodeBytes + totalLiteralBytes;
-
-    numCurrentByteCodes =
-	    statsPtr->numCompilations - statsPtr->numByteCodesFreed;
-    currentHeaderBytes = numCurrentByteCodes
-	    * (sizeof(ByteCode) - (sizeof(size_t) + sizeof(Tcl_Time)));
-    literalMgmtBytes = sizeof(LiteralTable)
-	    + (iPtr->literalTable.numBuckets * sizeof(LiteralEntry *))
-	    + (iPtr->literalTable.numEntries * sizeof(LiteralEntry));
-    currentLiteralBytes = literalMgmtBytes
-	    + iPtr->literalTable.numEntries * sizeof(Tcl_Obj)
-	    + statsPtr->currentLitStringBytes;
-    currentCodeBytes = statsPtr->currentByteCodeBytes + currentLiteralBytes;
-    
-    /*
-     * Summary statistics, total and current source and ByteCode sizes.
-     */
-
-    fprintf(stdout, "\n----------------------------------------------------------------\n");
-    fprintf(stdout,
-	    "Compilation and execution statistics for interpreter 0x%x\n",
-	    (unsigned int) iPtr);
-
-    fprintf(stdout, "\nNumber ByteCodes executed	%ld\n",
-	    statsPtr->numExecutions);
-    fprintf(stdout, "Number ByteCodes compiled	%ld\n",
-	    statsPtr->numCompilations);
-    fprintf(stdout, "  Mean executions/compile	%.1f\n",
-	    ((float)statsPtr->numExecutions) / ((float)statsPtr->numCompilations));
-    
-    fprintf(stdout, "\nInstructions executed		%.0f\n",
-	    numInstructions);
-    fprintf(stdout, "  Mean inst/compile		%.0f\n",
-	    numInstructions / statsPtr->numCompilations);
-    fprintf(stdout, "  Mean inst/execution		%.0f\n",
-	    numInstructions / statsPtr->numExecutions);
-
-    fprintf(stdout, "\nTotal ByteCodes			%ld\n",
-	    statsPtr->numCompilations);
-    fprintf(stdout, "  Source bytes			%.6g\n",
-	    statsPtr->totalSrcBytes);
-    fprintf(stdout, "  Code bytes			%.6g\n",
-	    totalCodeBytes);
-    fprintf(stdout, "    ByteCode bytes		%.6g\n",
-	    statsPtr->totalByteCodeBytes);
-    fprintf(stdout, "    Literal bytes		%.6g\n",
-	    totalLiteralBytes);
-    fprintf(stdout, "      table %d + bkts %d + entries %ld + objects %ld + strings %.6g\n",
-	    sizeof(LiteralTable),
-	    iPtr->literalTable.numBuckets * sizeof(LiteralEntry *),
-	    statsPtr->numLiteralsCreated * sizeof(LiteralEntry),
-	    statsPtr->numLiteralsCreated * sizeof(Tcl_Obj),
-	    statsPtr->totalLitStringBytes);
-    fprintf(stdout, "  Mean code/compile		%.1f\n",
-	    totalCodeBytes / statsPtr->numCompilations);
-    fprintf(stdout, "  Mean code/source		%.1f\n",
-	    totalCodeBytes / statsPtr->totalSrcBytes);
-
-    fprintf(stdout, "\nCurrent ByteCodes		%ld\n",
-	    numCurrentByteCodes);
-    fprintf(stdout, "  Source bytes			%.6g\n",
-	    statsPtr->currentSrcBytes);
-    fprintf(stdout, "  Code bytes			%.6g\n",
-	    currentCodeBytes);
-    fprintf(stdout, "    ByteCode bytes		%.6g\n",
-	    statsPtr->currentByteCodeBytes);
-    fprintf(stdout, "    Literal bytes		%.6g\n",
-	    currentLiteralBytes);
-    fprintf(stdout, "      table %d + bkts %d + entries %d + objects %d + strings %.6g\n",
-	    sizeof(LiteralTable),
-	    iPtr->literalTable.numBuckets * sizeof(LiteralEntry *),
-	    iPtr->literalTable.numEntries * sizeof(LiteralEntry),
-	    iPtr->literalTable.numEntries * sizeof(Tcl_Obj),
-	    statsPtr->currentLitStringBytes);
-    fprintf(stdout, "  Mean code/source		%.1f\n",
-	    currentCodeBytes / statsPtr->currentSrcBytes);
-    fprintf(stdout, "  Code + source bytes		%.6g (%0.1f mean code/src)\n",
-	    (currentCodeBytes + statsPtr->currentSrcBytes),
-	    (currentCodeBytes / statsPtr->currentSrcBytes) + 1.0);
-
-    /*
-     * Literal table statistics.
-     */
-
-    numByteCodeLits = 0;
-    refCountSum = 0;
-    numSharedMultX = 0;
-    numSharedOnce  = 0;
-    objBytesIfUnshared  = 0.0;
-    strBytesIfUnshared  = 0.0;
-    strBytesSharedMultX = 0.0;
-    strBytesSharedOnce  = 0.0;
-    for (i = 0;  i < globalTablePtr->numBuckets;  i++) {
-	for (entryPtr = globalTablePtr->buckets[i];  entryPtr != NULL;
-	        entryPtr = entryPtr->nextPtr) {
-	    if (entryPtr->objPtr->typePtr == &tclByteCodeType) {
-		numByteCodeLits++;
-	    }
-	    (void) Tcl_GetStringFromObj(entryPtr->objPtr, &length);
-	    refCountSum += entryPtr->refCount;
-	    objBytesIfUnshared += (entryPtr->refCount * sizeof(Tcl_Obj));
-	    strBytesIfUnshared += (entryPtr->refCount * (length+1));
-	    if (entryPtr->refCount > 1) {
-		numSharedMultX++;
-		strBytesSharedMultX += (length+1);
-	    } else {
-		numSharedOnce++;
-		strBytesSharedOnce += (length+1);
-	    }
-	}
-    }
-    sharingBytesSaved = (objBytesIfUnshared + strBytesIfUnshared)
-	    - currentLiteralBytes;
-
-    fprintf(stdout, "\nTotal objects (all interps)	%ld\n",
-	    tclObjsAlloced);
-    fprintf(stdout, "Current objects			%ld\n",
-	    (tclObjsAlloced - tclObjsFreed));
-    fprintf(stdout, "Total literal objects		%ld\n",
-	    statsPtr->numLiteralsCreated);
-    
-    fprintf(stdout, "\nCurrent literal objects		%d (%0.1f%% of current objects)\n",
-	    globalTablePtr->numEntries,
-	    (globalTablePtr->numEntries * 100.0) / (tclObjsAlloced-tclObjsFreed));
-    fprintf(stdout, "  ByteCode literals	 	%ld (%0.1f%% of current literals)\n",
-	    numByteCodeLits,
-	    (numByteCodeLits * 100.0) / globalTablePtr->numEntries);
-    fprintf(stdout, "  Literals reused > 1x	 	%d\n",
-	    numSharedMultX);
-    fprintf(stdout, "  Mean reference count	 	%.2f\n",
-	    ((double) refCountSum) / globalTablePtr->numEntries);
-    fprintf(stdout, "  Mean len, str reused >1x 	%.2f\n",
-	    (numSharedMultX? (strBytesSharedMultX/numSharedMultX) : 0.0));
-    fprintf(stdout, "  Mean len, str used 1x	 	%.2f\n",
-	    (numSharedOnce? (strBytesSharedOnce/numSharedOnce) : 0.0));
-    fprintf(stdout, "  Total sharing savings	 	%.6g (%0.1f%% of bytes if no sharing)\n",
-	    sharingBytesSaved,
-	    (sharingBytesSaved * 100.0) / (objBytesIfUnshared + strBytesIfUnshared));
-    fprintf(stdout, "    Bytes with sharing		%.6g\n",
-	    currentLiteralBytes);
-    fprintf(stdout, "      table %d + bkts %d + entries %d + objects %d + strings %.6g\n",
-	    sizeof(LiteralTable),
-	    iPtr->literalTable.numBuckets * sizeof(LiteralEntry *),
-	    iPtr->literalTable.numEntries * sizeof(LiteralEntry),
-	    iPtr->literalTable.numEntries * sizeof(Tcl_Obj),
-	    statsPtr->currentLitStringBytes);
-    fprintf(stdout, "    Bytes if no sharing		%.6g = objects %.6g + strings %.6g\n",
-	    (objBytesIfUnshared + strBytesIfUnshared),
-	    objBytesIfUnshared, strBytesIfUnshared);
-    fprintf(stdout, "  String sharing savings 	%.6g = unshared %.6g - shared %.6g\n",
-	    (strBytesIfUnshared - statsPtr->currentLitStringBytes),
-	    strBytesIfUnshared, statsPtr->currentLitStringBytes);
-    fprintf(stdout, "  Literal mgmt overhead	 	%ld (%0.1f%% of bytes with sharing)\n",
-	    literalMgmtBytes,
-	    (literalMgmtBytes * 100.0) / currentLiteralBytes);
-    fprintf(stdout, "    table %d + buckets %d + entries %d\n",
-	    sizeof(LiteralTable),
-	    iPtr->literalTable.numBuckets * sizeof(LiteralEntry *),
-	    iPtr->literalTable.numEntries * sizeof(LiteralEntry));
-
-    /*
-     * Breakdown of current ByteCode space requirements.
-     */
-    
-    fprintf(stdout, "\nBreakdown of current ByteCode requirements:\n");
-    fprintf(stdout, "                         Bytes      Pct of    Avg per\n");
-    fprintf(stdout, "                                     total    ByteCode\n");
-    fprintf(stdout, "Total             %12.6g     100.00%%   %8.1f\n",
-	    statsPtr->currentByteCodeBytes,
-	    statsPtr->currentByteCodeBytes / numCurrentByteCodes);
-    fprintf(stdout, "Header            %12.6g   %8.1f%%   %8.1f\n",
-	    currentHeaderBytes,
-	    ((currentHeaderBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    currentHeaderBytes / numCurrentByteCodes);
-    fprintf(stdout, "Instructions      %12.6g   %8.1f%%   %8.1f\n",
-	    statsPtr->currentInstBytes,
-	    ((statsPtr->currentInstBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    statsPtr->currentInstBytes / numCurrentByteCodes);
-    fprintf(stdout, "Literal ptr array %12.6g   %8.1f%%   %8.1f\n",
-	    statsPtr->currentLitBytes,
-	    ((statsPtr->currentLitBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    statsPtr->currentLitBytes / numCurrentByteCodes);
-    fprintf(stdout, "Exception table   %12.6g   %8.1f%%   %8.1f\n",
-	    statsPtr->currentExceptBytes,
-	    ((statsPtr->currentExceptBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    statsPtr->currentExceptBytes / numCurrentByteCodes);
-    fprintf(stdout, "Auxiliary data    %12.6g   %8.1f%%   %8.1f\n",
-	    statsPtr->currentAuxBytes,
-	    ((statsPtr->currentAuxBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    statsPtr->currentAuxBytes / numCurrentByteCodes);
-    fprintf(stdout, "Command map       %12.6g   %8.1f%%   %8.1f\n",
-	    statsPtr->currentCmdMapBytes,
-	    ((statsPtr->currentCmdMapBytes * 100.0) / statsPtr->currentByteCodeBytes),
-	    statsPtr->currentCmdMapBytes / numCurrentByteCodes);
-
-    /*
-     * Detailed literal statistics.
-     */
-    
-    fprintf(stdout, "\nLiteral string sizes:\n");
-    fprintf(stdout, "	 Up to length		Percentage\n");
-    maxSizeDecade = 0;
-    for (i = 31;  i >= 0;  i--) {
-        if (statsPtr->literalCount[i] > 0) {
-            maxSizeDecade = i;
-	    break;
-        }
-    }
-    sum = 0;
-    for (i = 0;  i <= maxSizeDecade;  i++) {
-	decadeHigh = (1 << (i+1)) - 1;
-	sum += statsPtr->literalCount[i];
-        fprintf(stdout,	"	%10d		%8.0f%%\n",
-		decadeHigh, (sum * 100.0) / statsPtr->numLiteralsCreated);
-    }
-
-    litTableStats = TclLiteralStats(globalTablePtr);
-    fprintf(stdout, "\nCurrent literal table statistics:\n%s\n",
-            litTableStats);
-    ckfree((char *) litTableStats);
-
-    /*
-     * Source and ByteCode size distributions.
-     */
-
-    fprintf(stdout, "\nSource sizes:\n");
-    fprintf(stdout, "	 Up to size		Percentage\n");
-    minSizeDecade = maxSizeDecade = 0;
-    for (i = 0;  i < 31;  i++) {
-        if (statsPtr->srcCount[i] > 0) {
-	    minSizeDecade = i;
-	    break;
-        }
-    }
-    for (i = 31;  i >= 0;  i--) {
-        if (statsPtr->srcCount[i] > 0) {
-            maxSizeDecade = i;
-	    break;
-        }
-    }
-    sum = 0;
-    for (i = minSizeDecade;  i <= maxSizeDecade;  i++) {
-	decadeHigh = (1 << (i+1)) - 1;
-	sum += statsPtr->srcCount[i];
-        fprintf(stdout,	"	%10d		%8.0f%%\n",
-		decadeHigh, (sum * 100.0) / statsPtr->numCompilations);
-    }
-
-    fprintf(stdout, "\nByteCode sizes:\n");
-    fprintf(stdout, "	 Up to size		Percentage\n");
-    minSizeDecade = maxSizeDecade = 0;
-    for (i = 0;  i < 31;  i++) {
-        if (statsPtr->byteCodeCount[i] > 0) {
-	    minSizeDecade = i;
-	    break;
-        }
-    }
-    for (i = 31;  i >= 0;  i--) {
-        if (statsPtr->byteCodeCount[i] > 0) {
-            maxSizeDecade = i;
-	    break;
-        }
-    }
-    sum = 0;
-    for (i = minSizeDecade;  i <= maxSizeDecade;  i++) {
-	decadeHigh = (1 << (i+1)) - 1;
-	sum += statsPtr->byteCodeCount[i];
-        fprintf(stdout,	"	%10d		%8.0f%%\n",
-		decadeHigh, (sum * 100.0) / statsPtr->numCompilations);
-    }
-
-    fprintf(stdout, "\nByteCode longevity (excludes current ByteCodes):\n");
-    fprintf(stdout, "	       Up to ms		Percentage\n");
-    minSizeDecade = maxSizeDecade = 0;
-    for (i = 0;  i < 31;  i++) {
-        if (statsPtr->lifetimeCount[i] > 0) {
-	    minSizeDecade = i;
-	    break;
-        }
-    }
-    for (i = 31;  i >= 0;  i--) {
-        if (statsPtr->lifetimeCount[i] > 0) {
-            maxSizeDecade = i;
-	    break;
-        }
-    }
-    sum = 0;
-    for (i = minSizeDecade;  i <= maxSizeDecade;  i++) {
-	decadeHigh = (1 << (i+1)) - 1;
-	sum += statsPtr->lifetimeCount[i];
-        fprintf(stdout,	"	%12.3f		%8.0f%%\n",
-		decadeHigh / 1000.0,
-		(sum * 100.0) / statsPtr->numByteCodesFreed);
-    }
-
-    /*
-     * Instruction counts.
-     */
-
-    fprintf(stdout, "\nInstruction counts:\n");
-    for (i = 0;  i <= LAST_INST_OPCODE;  i++) {
-        if (statsPtr->instructionCount[i]) {
-            fprintf(stdout, "%20s %8ld %6.1f%%\n",
-		    instructionTable[i].name,
-		    statsPtr->instructionCount[i],
-		    (statsPtr->instructionCount[i]*100.0) / numInstructions);
-        }
-    }
-
-    fprintf(stdout, "\nInstructions NEVER executed:\n");
-    for (i = 0;  i <= LAST_INST_OPCODE;  i++) {
-        if (statsPtr->instructionCount[i] == 0) {
-            fprintf(stdout, "%20s\n",
-		    instructionTable[i].name);
-        }
-    }
-
-#ifdef TCL_MEM_DEBUG
-    fprintf(stdout, "\nHeap Statistics:\n");
-    TclDumpMemoryInfo(stdout);
-#endif
-    fprintf(stdout, "\n----------------------------------------------------------------\n");
-    return TCL_OK;
-}
-#endif /* TCL_COMPILE_STATS */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCommandFromObj --
- *
- *      Returns the command specified by the name in a Tcl_Obj.
- *
- * Results:
- *	Returns a token for the command if it is found. Otherwise, if it
- *	can't be found or there is an error, returns NULL.
- *
- * Side effects:
- *      May update the internal representation for the object, caching
- *      the command reference so that the next time this procedure is
- *	called with the same object, the command can be found quickly.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-Tcl_GetCommandFromObj(interp, objPtr)
-    Tcl_Interp *interp;		/* The interpreter in which to resolve the
-				 * command and to report errors. */
-    register Tcl_Obj *objPtr;	/* The object containing the command's
-				 * name. If the name starts with "::", will
-				 * be looked up in global namespace. Else,
-				 * looked up first in the current namespace
-				 * if contextNsPtr is NULL, then in global
-				 * namespace. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register ResolvedCmdName *resPtr;
-    register Command *cmdPtr;
-    Namespace *currNsPtr;
-    int result;
-
-    /*
-     * Get the internal representation, converting to a command type if
-     * needed. The internal representation is a ResolvedCmdName that points
-     * to the actual command.
-     */
-    
-    if (objPtr->typePtr != &tclCmdNameType) {
-        result = tclCmdNameType.setFromAnyProc(interp, objPtr);
-        if (result != TCL_OK) {
-            return (Tcl_Command) NULL;
-        }
-    }
-    resPtr = (ResolvedCmdName *) objPtr->internalRep.otherValuePtr;
-
-    /*
-     * Get the current namespace.
-     */
-    
-    if (iPtr->varFramePtr != NULL) {
-	currNsPtr = iPtr->varFramePtr->nsPtr;
-    } else {
-	currNsPtr = iPtr->globalNsPtr;
-    }
-
-    /*
-     * Check the context namespace and the namespace epoch of the resolved
-     * symbol to make sure that it is fresh. If not, then force another
-     * conversion to the command type, to discard the old rep and create a
-     * new one. Note that we verify that the namespace id of the context
-     * namespace is the same as the one we cached; this insures that the
-     * namespace wasn't deleted and a new one created at the same address
-     * with the same command epoch.
-     */
-    
-    cmdPtr = NULL;
-    if ((resPtr != NULL)
-	    && (resPtr->refNsPtr == currNsPtr)
-	    && (resPtr->refNsId == currNsPtr->nsId)
-	    && (resPtr->refNsCmdEpoch == currNsPtr->cmdRefEpoch)) {
-        cmdPtr = resPtr->cmdPtr;
-        if (cmdPtr->cmdEpoch != resPtr->cmdEpoch) {
-            cmdPtr = NULL;
-        }
-    }
-
-    if (cmdPtr == NULL) {
-        result = tclCmdNameType.setFromAnyProc(interp, objPtr);
-        if (result != TCL_OK) {
-            return (Tcl_Command) NULL;
-        }
-        resPtr = (ResolvedCmdName *) objPtr->internalRep.otherValuePtr;
-        if (resPtr != NULL) {
-            cmdPtr = resPtr->cmdPtr;
-        }
-    }
-    return (Tcl_Command) cmdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetCmdNameObj --
- *
- *	Modify an object to be an CmdName object that refers to the argument
- *	Command structure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old internal rep is freed. It's string rep is not
- *	changed. The refcount in the Command structure is incremented to
- *	keep it from being freed if the command is later deleted until
- *	TclExecuteByteCode has a chance to recognize that it was deleted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclSetCmdNameObj(interp, objPtr, cmdPtr)
-    Tcl_Interp *interp;		/* Points to interpreter containing command
-				 * that should be cached in objPtr. */
-    register Tcl_Obj *objPtr;	/* Points to Tcl object to be changed to
-				 * a CmdName object. */
-    Command *cmdPtr;		/* Points to Command structure that the
-				 * CmdName object should refer to. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register ResolvedCmdName *resPtr;
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    register Namespace *currNsPtr;
-
-    if (oldTypePtr == &tclCmdNameType) {
-	return;
-    }
-    
-    /*
-     * Get the current namespace.
-     */
-    
-    if (iPtr->varFramePtr != NULL) {
-	currNsPtr = iPtr->varFramePtr->nsPtr;
-    } else {
-	currNsPtr = iPtr->globalNsPtr;
-    }
-    
-    cmdPtr->refCount++;
-    resPtr = (ResolvedCmdName *) ckalloc(sizeof(ResolvedCmdName));
-    resPtr->cmdPtr = cmdPtr;
-    resPtr->refNsPtr = currNsPtr;
-    resPtr->refNsId  = currNsPtr->nsId;
-    resPtr->refNsCmdEpoch = currNsPtr->cmdRefEpoch;
-    resPtr->cmdEpoch = cmdPtr->cmdEpoch;
-    resPtr->refCount = 1;
-    
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
-    objPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    objPtr->typePtr = &tclCmdNameType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeCmdNameInternalRep --
- *
- *	Frees the resources associated with a cmdName object's internal
- *	representation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Decrements the ref count of any cached ResolvedCmdName structure
- *	pointed to by the cmdName's internal representation. If this is 
- *	the last use of the ResolvedCmdName, it is freed. This in turn
- *	decrements the ref count of the Command structure pointed to by 
- *	the ResolvedSymbol, which may free the Command structure.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeCmdNameInternalRep(objPtr)
-    register Tcl_Obj *objPtr;	/* CmdName object with internal
-				 * representation to free. */
-{
-    register ResolvedCmdName *resPtr =
-	(ResolvedCmdName *) objPtr->internalRep.otherValuePtr;
-
-    if (resPtr != NULL) {
-	/*
-	 * Decrement the reference count of the ResolvedCmdName structure.
-	 * If there are no more uses, free the ResolvedCmdName structure.
-	 */
-    
-        resPtr->refCount--;
-        if (resPtr->refCount == 0) {
-            /*
-	     * Now free the cached command, unless it is still in its
-             * hash table or if there are other references to it
-             * from other cmdName objects.
-	     */
-	    
-            Command *cmdPtr = resPtr->cmdPtr;
-            TclCleanupCommand(cmdPtr);
-            ckfree((char *) resPtr);
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupCmdNameInternalRep --
- *
- *	Initialize the internal representation of an cmdName Tcl_Obj to a
- *	copy of the internal representation of an existing cmdName object. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	"copyPtr"s internal rep is set to point to the ResolvedCmdName
- *	structure corresponding to "srcPtr"s internal rep. Increments the
- *	ref count of the ResolvedCmdName structure pointed to by the
- *	cmdName's internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupCmdNameInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;		/* Object with internal rep to copy. */
-    register Tcl_Obj *copyPtr;	/* Object with internal rep to set. */
-{
-    register ResolvedCmdName *resPtr =
-        (ResolvedCmdName *) srcPtr->internalRep.otherValuePtr;
-
-    copyPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
-    copyPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    if (resPtr != NULL) {
-        resPtr->refCount++;
-    }
-    copyPtr->typePtr = &tclCmdNameType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetCmdNameFromAny --
- *
- *	Generate an cmdName internal form for the Tcl object "objPtr".
- *
- * Results:
- *	The return value is a standard Tcl result. The conversion always
- *	succeeds and TCL_OK is returned.
- *
- * Side effects:
- *	A pointer to a ResolvedCmdName structure that holds a cached pointer
- *	to the command with a name that matches objPtr's string rep is
- *	stored as objPtr's internal representation. This ResolvedCmdName
- *	pointer will be NULL if no matching command was found. The ref count
- *	of the cached Command's structure (if any) is also incremented.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetCmdNameFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *name;
-    Tcl_Command cmd;
-    register Command *cmdPtr;
-    Namespace *currNsPtr;
-    register ResolvedCmdName *resPtr;
-
-    /*
-     * Get "objPtr"s string representation. Make it up-to-date if necessary.
-     */
-
-    name = objPtr->bytes;
-    if (name == NULL) {
-	name = Tcl_GetString(objPtr);
-    }
-
-    /*
-     * Find the Command structure, if any, that describes the command called
-     * "name". Build a ResolvedCmdName that holds a cached pointer to this
-     * Command, and bump the reference count in the referenced Command
-     * structure. A Command structure will not be deleted as long as it is
-     * referenced from a CmdName object.
-     */
-
-    cmd = Tcl_FindCommand(interp, name, (Tcl_Namespace *) NULL,
-	    /*flags*/ 0);
-    cmdPtr = (Command *) cmd;
-    if (cmdPtr != NULL) {
-	/*
-	 * Get the current namespace.
-	 */
-	
-	if (iPtr->varFramePtr != NULL) {
-	    currNsPtr = iPtr->varFramePtr->nsPtr;
-	} else {
-	    currNsPtr = iPtr->globalNsPtr;
-	}
-	
-	cmdPtr->refCount++;
-        resPtr = (ResolvedCmdName *) ckalloc(sizeof(ResolvedCmdName));
-        resPtr->cmdPtr        = cmdPtr;
-        resPtr->refNsPtr      = currNsPtr;
-        resPtr->refNsId       = currNsPtr->nsId;
-        resPtr->refNsCmdEpoch = currNsPtr->cmdRefEpoch;
-        resPtr->cmdEpoch      = cmdPtr->cmdEpoch;
-        resPtr->refCount      = 1;
-    } else {
-	resPtr = NULL;	/* no command named "name" was found */
-    }
-
-    /*
-     * Free the old internalRep before setting the new one. We do this as
-     * late as possible to allow the conversion code, in particular
-     * GetStringFromObj, to use that old internalRep. If no Command
-     * structure was found, leave NULL as the cached value.
-     */
-
-    if ((objPtr->typePtr != NULL)
-	    && (objPtr->typePtr->freeIntRepProc != NULL)) {
-	objPtr->typePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
-    objPtr->internalRep.twoPtrValue.ptr2 = NULL;
-    objPtr->typePtr = &tclCmdNameType;
-    return TCL_OK;
-}
-
-#ifdef TCL_COMPILE_DEBUG
-/*
- *----------------------------------------------------------------------
- *
- * StringForResultCode --
- *
- *	Procedure that returns a human-readable string representing a
- *	Tcl result code such as TCL_ERROR. 
- *
- * Results:
- *	If the result code is one of the standard Tcl return codes, the
- *	result is a string representing that code such as "TCL_ERROR".
- *	Otherwise, the result string is that code formatted as a
- *	sequence of decimal digit characters. Note that the resulting
- *	string must not be modified by the caller.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-StringForResultCode(result)
-    int result;			/* The Tcl result code for which to
-				 * generate a string. */
-{
-    static char buf[TCL_INTEGER_SPACE];
-    
-    if ((result >= TCL_OK) && (result <= TCL_CONTINUE)) {
-	return resultStrings[result];
-    }
-    TclFormatInt(buf, result);
-    return buf;
-}
-#endif /* TCL_COMPILE_DEBUG */
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
deleted file mode 100644
index b69358b..0000000
--- a/generic/tclFCmd.c
+++ /dev/null
@@ -1,841 +0,0 @@
-/*
- * tclFCmd.c
- *
- *      This file implements the generic portion of file manipulation 
- *      subcommands of the "file" command. 
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclFCmd.c,v 1.4 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static int		CopyRenameOneFile _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *source, char *dest, int copyFlag,
-			    int force));
-static char *		FileBasename _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *path, Tcl_DString *bufferPtr));
-static int		FileCopyRename _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv, int copyFlag));
-static int		FileForceOption _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv, int *forcePtr));
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclFileRenameCmd
- *
- *	This procedure implements the "rename" subcommand of the "file"
- *      command.  Filename arguments need to be translated to native
- *	format before being passed to platform-specific code that
- *	implements rename functionality.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclFileRenameCmd(interp, argc, argv)
-    Tcl_Interp *interp;		/* Interp for error reporting. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings passed to Tcl_FileCmd. */
-{
-    return FileCopyRename(interp, argc, argv, 0);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclFileCopyCmd
- *
- *	This procedure implements the "copy" subcommand of the "file"
- *	command.  Filename arguments need to be translated to native
- *	format before being passed to platform-specific code that
- *	implements copy functionality.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclFileCopyCmd(interp, argc, argv)
-    Tcl_Interp *interp;		/* Used for error reporting */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings passed to Tcl_FileCmd. */
-{
-    return FileCopyRename(interp, argc, argv, 1);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * FileCopyRename --
- *
- *	Performs the work of TclFileRenameCmd and TclFileCopyCmd.
- *	See comments for those procedures.
- *
- * Results:
- *	See above.
- *
- * Side effects:
- *	See above.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-FileCopyRename(interp, argc, argv, copyFlag)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings passed to Tcl_FileCmd. */
-    int copyFlag;		/* If non-zero, copy source(s).  Otherwise,
-				 * rename them. */
-{
-    int i, result, force;
-    struct stat statBuf; 
-    Tcl_DString targetBuffer;
-    char *target;
-
-    i = FileForceOption(interp, argc - 2, argv + 2, &force);
-    if (i < 0) {
-	return TCL_ERROR;
-    }
-    i += 2;
-    if ((argc - i) < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" ", argv[1], " ?options? source ?source ...? target\"", 
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * If target doesn't exist or isn't a directory, try the copy/rename.
-     * More than 2 arguments is only valid if the target is an existing
-     * directory.
-     */
-
-    target = Tcl_TranslateFileName(interp, argv[argc - 1], &targetBuffer);
-    if (target == NULL) {
-	return TCL_ERROR;
-    }
-
-    result = TCL_OK;
-
-    /*
-     * Call TclpStat() so that if target is a symlink that points to a
-     * directory we will put the sources in that directory instead of
-     * overwriting the symlink.
-     */
-
-    if ((TclpStat(target, &statBuf) != 0) || !S_ISDIR(statBuf.st_mode)) {
-	if ((argc - i) > 2) {
-	    errno = ENOTDIR;
-	    Tcl_PosixError(interp);
-	    Tcl_AppendResult(interp, "error ",
-		    ((copyFlag) ? "copying" : "renaming"), ": target \"",
-		    argv[argc - 1], "\" is not a directory", (char *) NULL);
-	    result = TCL_ERROR;
-	} else {
-	    /*
-	     * Even though already have target == translated(argv[i+1]),
-	     * pass the original argument down, so if there's an error, the
-	     * error message will reflect the original arguments.
-	     */
-
-	    result = CopyRenameOneFile(interp, argv[i], argv[i + 1], copyFlag,
-		    force);
-	}
-	Tcl_DStringFree(&targetBuffer);
-	return result;
-    }
-    
-    /*
-     * Move each source file into target directory.  Extract the basename
-     * from each source, and append it to the end of the target path.
-     */
-    
-    for ( ; i < argc - 1; i++) {
-	char *jargv[2];
-	char *source, *newFileName;
-	Tcl_DString sourceBuffer, newFileNameBuffer;
-
-	source = FileBasename(interp, argv[i], &sourceBuffer);
-	if (source == NULL) {
-	    result = TCL_ERROR;
-	    break;
-	}
-	jargv[0] = argv[argc - 1];
-	jargv[1] = source;
-	Tcl_DStringInit(&newFileNameBuffer);
-	newFileName = Tcl_JoinPath(2, jargv, &newFileNameBuffer);
-	result = CopyRenameOneFile(interp, argv[i], newFileName, copyFlag,
-		force);
-	Tcl_DStringFree(&sourceBuffer);
-	Tcl_DStringFree(&newFileNameBuffer);
-
-	if (result == TCL_ERROR) {
-	    break;
-	}
-    }
-    Tcl_DStringFree(&targetBuffer);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclFileMakeDirsCmd
- *
- *	This procedure implements the "mkdir" subcommand of the "file"
- *      command.  Filename arguments need to be translated to native
- *	format before being passed to platform-specific code that
- *	implements mkdir functionality.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-int
-TclFileMakeDirsCmd(interp, argc, argv)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    int argc;			/* Number of arguments */
-    char **argv;		/* Argument strings passed to Tcl_FileCmd. */
-{
-    Tcl_DString nameBuffer, targetBuffer;
-    char *errfile;
-    int result, i, j, pargc;
-    char **pargv;
-    struct stat statBuf;
-
-    pargv = NULL;
-    errfile = NULL;
-    Tcl_DStringInit(&nameBuffer);
-    Tcl_DStringInit(&targetBuffer);
-
-    result = TCL_OK;
-    for (i = 2; i < argc; i++) {
-	char *name = Tcl_TranslateFileName(interp, argv[i], &nameBuffer);
-	if (name == NULL) {
-	    result = TCL_ERROR;
-	    break;
-	}
-
-	Tcl_SplitPath(name, &pargc, &pargv);
-	if (pargc == 0) {
-	    errno = ENOENT;
-	    errfile = argv[i];
-	    break;
-	}
-	for (j = 0; j < pargc; j++) {
-	    char *target = Tcl_JoinPath(j + 1, pargv, &targetBuffer);
-
-	    /*
-	     * Call TclpStat() so that if target is a symlink that points
-	     * to a directory we will create subdirectories in that
-	     * directory.
-	     */
-
-	    if (TclpStat(target, &statBuf) == 0) {
-		if (!S_ISDIR(statBuf.st_mode)) {
-		    errno = EEXIST;
-		    errfile = target;
-		    goto done;
-		}
-	    } else if ((errno != ENOENT)
-		    || (TclpCreateDirectory(target) != TCL_OK)) {
-		errfile = target;
-		goto done;
-	    }
-	    Tcl_DStringFree(&targetBuffer);
-	}
-	ckfree((char *) pargv);
-	pargv = NULL;
-	Tcl_DStringFree(&nameBuffer);
-    }
-	
-    done:
-    if (errfile != NULL) {
-	Tcl_AppendResult(interp, "can't create directory \"",
-		errfile, "\": ", Tcl_PosixError(interp), (char *) NULL);
-	result = TCL_ERROR;
-    }
-
-    Tcl_DStringFree(&nameBuffer);
-    Tcl_DStringFree(&targetBuffer);
-    if (pargv != NULL) {
-	ckfree((char *) pargv);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFileDeleteCmd
- *
- *	This procedure implements the "delete" subcommand of the "file"
- *      command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclFileDeleteCmd(interp, argc, argv)
-    Tcl_Interp *interp;		/* Used for error reporting */
-    int argc;			/* Number of arguments */
-    char **argv;		/* Argument strings passed to Tcl_FileCmd. */
-{
-    Tcl_DString nameBuffer, errorBuffer;
-    int i, force, result;
-    char *errfile;
-    
-    i = FileForceOption(interp, argc - 2, argv + 2, &force);
-    if (i < 0) {
-	return TCL_ERROR;
-    }
-    i += 2;
-    if ((argc - i) < 1) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" ", argv[1], " ?options? file ?file ...?\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    errfile = NULL;
-    result = TCL_OK;
-    Tcl_DStringInit(&errorBuffer);
-    Tcl_DStringInit(&nameBuffer);
-
-    for ( ; i < argc; i++) {
-	struct stat statBuf;
-	char *name;
-
-	errfile = argv[i];
-	Tcl_DStringSetLength(&nameBuffer, 0);
-	name = Tcl_TranslateFileName(interp, argv[i], &nameBuffer);
-	if (name == NULL) {
-	    result = TCL_ERROR;
-	    goto done;
-	}
-
-	/*
-	 * Call lstat() to get info so can delete symbolic link itself.
-	 */
-
-	if (TclpLstat(name, &statBuf) != 0) {
-	    /*
-	     * Trying to delete a file that does not exist is not
-	     * considered an error, just a no-op
-	     */
-
-	    if (errno != ENOENT) {
-		result = TCL_ERROR;
-	    }
-	} else if (S_ISDIR(statBuf.st_mode)) {
-	    result = TclpRemoveDirectory(name, force, &errorBuffer);
-	    if (result != TCL_OK) {
-		if ((force == 0) && (errno == EEXIST)) {
-		    Tcl_AppendResult(interp, "error deleting \"", argv[i],
-			    "\": directory not empty", (char *) NULL);
-		    Tcl_PosixError(interp);
-		    goto done;
-		}
-
-		/* 
-		 * If possible, use the untranslated name for the file.
-		 */
-		 
-		errfile = Tcl_DStringValue(&errorBuffer);
-		if (strcmp(name, errfile) == 0) {
-		    errfile = argv[i];
-		}
-	    }
-	} else {
-	    result = TclpDeleteFile(name);
-	}
-	
-	if (result == TCL_ERROR) {
-	    break;
-	}
-    }
-    if (result != TCL_OK) {
-	Tcl_AppendResult(interp, "error deleting \"", errfile,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-    } 
-    done:
-    Tcl_DStringFree(&errorBuffer);
-    Tcl_DStringFree(&nameBuffer);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CopyRenameOneFile
- *
- *	Copies or renames specified source file or directory hierarchy
- *	to the specified target.  
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Target is overwritten if the force flag is set.  Attempting to
- *	copy/rename a file onto a directory or a directory onto a file
- *	will always result in an error.  
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CopyRenameOneFile(interp, source, target, copyFlag, force) 
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *source;		/* Pathname of file to copy.  May need to
-				 * be translated. */
-    char *target;		/* Pathname of file to create/overwrite.
-				 * May need to be translated. */
-    int copyFlag;		/* If non-zero, copy files.  Otherwise,
-				 * rename them. */
-    int force;			/* If non-zero, overwrite target file if it
-				 * exists.  Otherwise, error if target already
-				 * exists. */
-{
-    int result;
-    Tcl_DString sourcePath, targetPath, errorBuffer;
-    char *targetName, *sourceName, *errfile;
-    struct stat sourceStatBuf, targetStatBuf;
-	
-    sourceName = Tcl_TranslateFileName(interp, source, &sourcePath);
-    if (sourceName == NULL) {
-	return TCL_ERROR;
-    }
-    targetName = Tcl_TranslateFileName(interp, target, &targetPath);
-    if (targetName == NULL) {
-	Tcl_DStringFree(&sourcePath);
-	return TCL_ERROR;
-    }
-    
-    errfile = NULL;
-    result = TCL_ERROR;
-    Tcl_DStringInit(&errorBuffer);
-    
-    /*
-     * We want to copy/rename links and not the files they point to, so we
-     * use lstat(). If target is a link, we also want to replace the 
-     * link and not the file it points to, so we also use lstat() on the
-     * target.
-     */
-
-    if (TclpLstat(sourceName, &sourceStatBuf) != 0) {
-	errfile = source;
-	goto done;
-    }
-    if (TclpLstat(targetName, &targetStatBuf) != 0) {
-	if (errno != ENOENT) {
-	    errfile = target;
-	    goto done;
-	}
-    } else {
-	if (force == 0) {
-	    errno = EEXIST;
-	    errfile = target;
-	    goto done;
-	}
-
-        /* 
-         * Prevent copying or renaming a file onto itself.  Under Windows, 
-         * stat always returns 0 for st_ino.  However, the Windows-specific 
-         * code knows how to deal with copying or renaming a file on top of
-         * itself.  It might be a good idea to write a stat that worked.
-         */
-     
-        if ((sourceStatBuf.st_ino != 0) && (targetStatBuf.st_ino != 0)) {
-            if ((sourceStatBuf.st_ino == targetStatBuf.st_ino) &&
-            	    (sourceStatBuf.st_dev == targetStatBuf.st_dev)) {
-            	result = TCL_OK;
-            	goto done;
-            }
-        }
-
-	/*
-	 * Prevent copying/renaming a file onto a directory and
-	 * vice-versa.  This is a policy decision based on the fact that
-	 * existing implementations of copy and rename on all platforms
-	 * also prevent this.
-	 */
-
-	if (S_ISDIR(sourceStatBuf.st_mode)
-                && !S_ISDIR(targetStatBuf.st_mode)) {
-	    errno = EISDIR;
-	    Tcl_AppendResult(interp, "can't overwrite file \"", target,
-		    "\" with directory \"", source, "\"", (char *) NULL);
-	    goto done;
-	}
-	if (!S_ISDIR(sourceStatBuf.st_mode)
-	        && S_ISDIR(targetStatBuf.st_mode)) {
-	    errno = EISDIR;
-	    Tcl_AppendResult(interp, "can't overwrite directory \"", target, 
-	            "\" with file \"", source, "\"", (char *) NULL);
-	    goto done;
-	}
-    }
-
-    if (copyFlag == 0) {
-	result = TclpRenameFile(sourceName, targetName);
-	if (result == TCL_OK) {
-	    goto done;
-	}
-	    
-	if (errno == EINVAL) {
-	    Tcl_AppendResult(interp, "error renaming \"", source, "\" to \"",
-		    target, "\": trying to rename a volume or ",
-		    "move a directory into itself", (char *) NULL);
-	    goto done;
-	} else if (errno != EXDEV) {
-	    errfile = target;
-	    goto done;
-	}
-	
-	/*
-	 * The rename failed because the move was across file systems.
-	 * Fall through to copy file and then remove original.  Note that
-	 * the low-level TclpRenameFile is allowed to implement
-	 * cross-filesystem moves itself.
-	 */
-    }
-
-    if (S_ISDIR(sourceStatBuf.st_mode)) {
-	result = TclpCopyDirectory(sourceName, targetName, &errorBuffer);
-	if (result != TCL_OK) {
-	    errfile = Tcl_DStringValue(&errorBuffer);
-	    if (strcmp(errfile, sourceName) == 0) {
-		errfile = source;
-	    } else if (strcmp(errfile, targetName) == 0) {
-		errfile = target;
-	    }
-	}
-    } else {
-	result = TclpCopyFile(sourceName, targetName);
-	if (result != TCL_OK) {
-	    /*
-	     * Well, there really shouldn't be a problem with source,
-	     * because up there we checked to see if it was ok to copy it.
-	     */
-
-	    errfile = target;
-	}
-    }
-    if ((copyFlag == 0) && (result == TCL_OK)) {
-	if (S_ISDIR(sourceStatBuf.st_mode)) {
-	    result = TclpRemoveDirectory(sourceName, 1, &errorBuffer);
-	    if (result != TCL_OK) {
-		errfile = Tcl_DStringValue(&errorBuffer);
-		if (strcmp(errfile, sourceName) == 0) {
-		    errfile = source;
-		}
-	    }
-	} else {
-	    result = TclpDeleteFile(sourceName);
-	    if (result != TCL_OK) {
-		errfile = source;
-	    }
-	}
-	if (result != TCL_OK) {
-	    Tcl_AppendResult(interp, "can't unlink \"", errfile, "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	    errfile = NULL;
-	}
-    }
-    
-    done:
-    if (errfile != NULL) {
-	Tcl_AppendResult(interp, 
-		((copyFlag) ? "error copying \"" : "error renaming \""),
-		source, (char *) NULL);
-	if (errfile != source) {
-	    Tcl_AppendResult(interp, "\" to \"", target, (char *) NULL);
-	    if (errfile != target) {
-		Tcl_AppendResult(interp, "\": \"", errfile, (char *) NULL);
-	    }
-	}
-	Tcl_AppendResult(interp, "\": ", Tcl_PosixError(interp),
-		(char *) NULL);
-    }
-    Tcl_DStringFree(&errorBuffer);
-    Tcl_DStringFree(&sourcePath);
-    Tcl_DStringFree(&targetPath);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * FileForceOption --
- *
- *	Helps parse command line options for file commands that take
- *	the "-force" and "--" options.
- *
- * Results:
- *	The return value is how many arguments from argv were consumed
- *	by this function, or -1 if there was an error parsing the
- *	options.  If an error occurred, an error message is left in the
- *	interp's result.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-FileForceOption(interp, argc, argv, forcePtr)
-    Tcl_Interp *interp;		/* Interp, for error return. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings.  First command line
-				 * option, if it exists, begins at 0. */
-    int *forcePtr;		/* If the "-force" was specified, *forcePtr
-				 * is filled with 1, otherwise with 0. */
-{
-    int force, i;
-    
-    force = 0;
-    for (i = 0; i < argc; i++) {
-	if (argv[i][0] != '-') {
-	    break;
-	}
-	if (strcmp(argv[i], "-force") == 0) {
-	    force = 1;
-	} else if (strcmp(argv[i], "--") == 0) {
-	    i++;
-	    break;
-	} else {
-	    Tcl_AppendResult(interp, "bad option \"", argv[i], 
-		    "\": should be -force or --", (char *)NULL);
-	    return -1;
-	}
-    }
-    *forcePtr = force;
-    return i;
-}
-/*
- *---------------------------------------------------------------------------
- *
- * FileBasename --
- *
- *	Given a path in either tcl format (with / separators), or in the
- *	platform-specific format for the current platform, return all the
- *	characters in the path after the last directory separator.  But,
- *	if path is the root directory, returns no characters.
- *
- * Results:
- *	Appends the string that represents the basename to the end of
- *	the specified initialized DString, returning a pointer to the
- *	resulting string.  If there is an error, an error message is left
- *	in interp, NULL is returned, and the Tcl_DString is unmodified.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static char *
-FileBasename(interp, path, bufferPtr)
-    Tcl_Interp *interp;		/* Interp, for error return. */
-    char *path;			/* Path whose basename to extract. */
-    Tcl_DString *bufferPtr;	/* Initialized DString that receives
-				 * basename. */
-{
-    int argc;
-    char **argv;
-    
-    Tcl_SplitPath(path, &argc, &argv);
-    if (argc == 0) {
-	Tcl_DStringInit(bufferPtr);
-    } else {
-	if ((argc == 1) && (*path == '~')) {
-	    Tcl_DString buffer;
-	    
-	    ckfree((char *) argv);
-	    path = Tcl_TranslateFileName(interp, path, &buffer);
-	    if (path == NULL) {
-		return NULL;
-	    }
-	    Tcl_SplitPath(path, &argc, &argv);
-	    Tcl_DStringFree(&buffer);
-	}
-	Tcl_DStringInit(bufferPtr);
-
-	/*
-	 * Return the last component, unless it is the only component, and it
-	 * is the root of an absolute path.
-	 */
-
-	if (argc > 0) {
-	    if ((argc > 1)
-		    || (Tcl_GetPathType(argv[0]) == TCL_PATH_RELATIVE)) {
-		Tcl_DStringAppend(bufferPtr, argv[argc - 1], -1);
-	    }
-	}
-    }
-    ckfree((char *) argv);
-    return Tcl_DStringValue(bufferPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFileAttrsCmd --
- *
- *      Sets or gets the platform-specific attributes of a file. The objc-objv
- *	points to the file name with the rest of the command line following.
- *	This routine uses platform-specific tables of option strings
- *	and callbacks. The callback to get the attributes take three
- *	parameters:
- *	    Tcl_Interp *interp;	    The interp to report errors with.
- *				    Since this is an object-based API,
- *				    the object form of the result should be
- *				    used.
- *	    CONST char *fileName;   This is extracted using
- *				    Tcl_TranslateFileName.
- *	    TclObj **attrObjPtrPtr; A new object to hold the attribute
- *				    is allocated and put here.
- *	The first two parameters of the callback used to write out the
- *	attributes are the same. The third parameter is:
- *	    CONST *attrObjPtr;	    A pointer to the object that has
- *				    the new attribute.
- *	They both return standard TCL errors; if the routine to get
- *	an attribute fails, no object is allocated and *attrObjPtrPtr
- *	is unchanged.
- *
- * Results:
- *      Standard TCL error.
- *
- * Side effects:
- *      May set file attributes for the file name.
- *      
- *----------------------------------------------------------------------
- */
-
-int
-TclFileAttrsCmd(interp, objc, objv)
-    Tcl_Interp *interp;		/* The interpreter for error reporting. */
-    int objc;			/* Number of command line arguments. */
-    Tcl_Obj *CONST objv[];	/* The command line objects. */
-{
-    char *fileName;
-    int result;
-    Tcl_DString buffer;
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 2, objv,
-		"name ?option? ?value? ?option value ...?");
-	return TCL_ERROR;
-    }
-
-    fileName = Tcl_GetString(objv[2]);
-    fileName = Tcl_TranslateFileName(interp, fileName, &buffer);
-    if (fileName == NULL) {
-    	return TCL_ERROR;
-    }
-    
-    objc -= 3;
-    objv += 3;
-    result = TCL_ERROR;
-
-    if (objc == 0) {
-	/*
-	 * Get all attributes.
-	 */
-
-	int index;
-	Tcl_Obj *listPtr, *objPtr;
-	 
-	listPtr = Tcl_NewListObj(0, NULL);
-    	for (index = 0; tclpFileAttrStrings[index] != NULL; index++) {
-    	    objPtr = Tcl_NewStringObj(tclpFileAttrStrings[index], -1);
-	    Tcl_ListObjAppendElement(interp, listPtr, objPtr);
-
-	    if ((*tclpFileAttrProcs[index].getProc)(interp, index, fileName,
-	    	    &objPtr) != TCL_OK) {
-		Tcl_DecrRefCount(listPtr);
-		goto end;
-	    }
-	    Tcl_ListObjAppendElement(interp, listPtr, objPtr);
-    	}
-    	Tcl_SetObjResult(interp, listPtr);
-    } else if (objc == 1) {
-	/*
-	 * Get one attribute.
-	 */
-
-	int index;
-	Tcl_Obj *objPtr;
-	 
-    	if (Tcl_GetIndexFromObj(interp, objv[0], tclpFileAttrStrings,
-		"option", 0, &index) != TCL_OK) {
-	    goto end;
-    	}
-	if ((*tclpFileAttrProcs[index].getProc)(interp, index, fileName,
-		&objPtr) != TCL_OK) {
-	    goto end;
-	}
-	Tcl_SetObjResult(interp, objPtr);
-    } else {
-	/*
-	 * Set option/value pairs.
-	 */
-
-	int i, index;
-        
-    	for (i = 0; i < objc ; i += 2) {
-    	    if (Tcl_GetIndexFromObj(interp, objv[i], tclpFileAttrStrings,
-		    "option", 0, &index) != TCL_OK) {
-		goto end;
-    	    }
-	    if (i + 1 == objc) {
-		Tcl_AppendResult(interp, "value for \"",
-			Tcl_GetString(objv[i]), "\" missing",
-			(char *) NULL);
-		goto end;
-	    }
-    	    if ((*tclpFileAttrProcs[index].setProc)(interp, index, fileName,
-    	    	    objv[i + 1]) != TCL_OK) {
-		goto end;
-    	    }
-    	}
-    }
-    result = TCL_OK;
-
-    end:
-    Tcl_DStringFree(&buffer);
-    return result;
-}
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
deleted file mode 100644
index 06e83a3..0000000
--- a/generic/tclFileName.c
+++ /dev/null
@@ -1,1720 +0,0 @@
-/* 
- * tclFileName.c --
- *
- *	This file contains routines for converting file names betwen
- *	native and network form.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclFileName.c,v 1.6 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclRegexp.h"
-
-/*
- * The following regular expression matches the root portion of a Windows
- * absolute or volume relative path.  It will match both UNC and drive relative
- * paths.
- */
-
-#define WIN_ROOT_PATTERN "^(([a-zA-Z]:)|[/\\\\][/\\\\]+([^/\\\\]+)[/\\\\]+([^/\\\\]+)|([/\\\\]))([/\\\\])*"
-
-/*
- * The following regular expression matches the root portion of a Macintosh
- * absolute path.  It will match degenerate Unix-style paths, tilde paths,
- * Unix-style paths, and Mac paths.
- */
-
-#define MAC_ROOT_PATTERN "^((/+([.][.]?/+)*([.][.]?)?)|(~[^:/]*)(/[^:]*)?|(~[^:]*)(:.*)?|/+([.][.]?/+)*([^:/]+)(/[^:]*)?|([^:]+):.*)$"
-
-/*
- * The following variables are used to hold precompiled regular expressions
- * for use in filename matching.
- */
-
-typedef struct ThreadSpecificData {
-    int initialized;
-    Tcl_Obj *winRootPatternPtr;
-    Tcl_Obj *macRootPatternPtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following variable is set in the TclPlatformInit call to one
- * of: TCL_PLATFORM_UNIX, TCL_PLATFORM_MAC, or TCL_PLATFORM_WINDOWS.
- */
-
-TclPlatformType tclPlatform = TCL_PLATFORM_UNIX;
-
-/*
- * Prototypes for local procedures defined in this file:
- */
-
-static char *		DoTildeSubst _ANSI_ARGS_((Tcl_Interp *interp,
-			    CONST char *user, Tcl_DString *resultPtr));
-static CONST char *	ExtractWinRoot _ANSI_ARGS_((CONST char *path,
-			    Tcl_DString *resultPtr, int offset));
-static void		FileNameCleanup _ANSI_ARGS_((ClientData clientData));
-static void		FileNameInit _ANSI_ARGS_((void));
-static int		SkipToChar _ANSI_ARGS_((char **stringPtr,
-			    char *match));
-static char *		SplitMacPath _ANSI_ARGS_((CONST char *path,
-			    Tcl_DString *bufPtr));
-static char *		SplitWinPath _ANSI_ARGS_((CONST char *path,
-			    Tcl_DString *bufPtr));
-static char *		SplitUnixPath _ANSI_ARGS_((CONST char *path,
-			    Tcl_DString *bufPtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * FileNameInit --
- *
- *	This procedure initializes the patterns used by this module.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Compiles the regular expressions.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileNameInit()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    if (!tsdPtr->initialized) {
-	tsdPtr->initialized = 1;
-	tsdPtr->winRootPatternPtr = Tcl_NewStringObj(WIN_ROOT_PATTERN, -1);
-	tsdPtr->macRootPatternPtr = Tcl_NewStringObj(MAC_ROOT_PATTERN, -1);
-	Tcl_CreateThreadExitHandler(FileNameCleanup, NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileNameCleanup --
- *
- *	This procedure is a Tcl_ExitProc used to clean up the static
- *	data structures used in this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deallocates storage used by the procedures in this file.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileNameCleanup(clientData)
-    ClientData clientData;	/* Not used. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    Tcl_DecrRefCount(tsdPtr->winRootPatternPtr);
-    Tcl_DecrRefCount(tsdPtr->macRootPatternPtr);
-    tsdPtr->initialized = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ExtractWinRoot --
- *
- *	Matches the root portion of a Windows path and appends it
- *	to the specified Tcl_DString.
- *	
- * Results:
- *	Returns the position in the path immediately after the root
- *	including any trailing slashes.
- *	Appends a cleaned up version of the root to the Tcl_DString
- *	at the specified offest.
- *
- * Side effects:
- *	Modifies the specified Tcl_DString.
- *
- *----------------------------------------------------------------------
- */
-
-static CONST char *
-ExtractWinRoot(path, resultPtr, offset)
-    CONST char *path;		/* Path to parse. */
-    Tcl_DString *resultPtr;	/* Buffer to hold result. */
-    int offset;			/* Offset in buffer where result should be
-				 * stored. */
-{
-    int length;
-    Tcl_RegExp re;
-    char *dummy, *tail, *drive, *hostStart, *hostEnd, *shareStart,
-	*shareEnd, *lastSlash;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Initialize the path name parser for Windows path names.
-     */
-
-    FileNameInit();
-
-    re = Tcl_GetRegExpFromObj(NULL, tsdPtr->winRootPatternPtr, REG_ADVANCED);
-
-    /*
-     * Match the root portion of a Windows path name.
-     */
-
-    if (!Tcl_RegExpExec(NULL, re, path, path)) {
-	return path;
-    }
-
-    Tcl_DStringSetLength(resultPtr, offset);
-
-    Tcl_RegExpRange(re, 0, &dummy, &tail);
-    Tcl_RegExpRange(re, 2, &drive, &dummy);
-    Tcl_RegExpRange(re, 3, &hostStart, &hostEnd);
-    Tcl_RegExpRange(re, 4, &shareStart, &shareEnd);
-    Tcl_RegExpRange(re, 6, &lastSlash, &dummy);
-
-    if (drive != NULL) {
-	Tcl_DStringAppend(resultPtr, drive, 2);
-	if (lastSlash != NULL) {
-	    Tcl_DStringAppend(resultPtr, "/", 1);
-	}
-    } else if (shareStart != NULL) {
-	Tcl_DStringAppend(resultPtr, "//", 2);
-	length = hostEnd - hostStart;
-	Tcl_DStringAppend(resultPtr, hostStart, length);
-	Tcl_DStringAppend(resultPtr, "/", 1);
-	length = shareEnd - shareStart;
-	Tcl_DStringAppend(resultPtr, shareStart, length);
-    } else {
-	Tcl_DStringAppend(resultPtr, "/", 1);
-    }
-    return tail;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetPathType --
- *
- *	Determines whether a given path is relative to the current
- *	directory, relative to the current volume, or absolute.
- *
- * Results:
- *	Returns one of TCL_PATH_ABSOLUTE, TCL_PATH_RELATIVE, or
- *	TCL_PATH_VOLUME_RELATIVE.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_PathType
-Tcl_GetPathType(path)
-    char *path;
-{
-    ThreadSpecificData *tsdPtr;
-    Tcl_PathType type = TCL_PATH_ABSOLUTE;
-    Tcl_RegExp re;
-
-    switch (tclPlatform) {
-   	case TCL_PLATFORM_UNIX:
-	    /*
-	     * Paths that begin with / or ~ are absolute.
-	     */
-
-	    if ((path[0] != '/') && (path[0] != '~')) {
-		type = TCL_PATH_RELATIVE;
-	    }
-	    break;
-
-	case TCL_PLATFORM_MAC:
-	    if (path[0] == ':') {
-		type = TCL_PATH_RELATIVE;
-	    } else if (path[0] != '~') {
-		tsdPtr = TCL_TSD_INIT(&dataKey);
-
-		/*
-		 * Since we have eliminated the easy cases, use the
-		 * root pattern to look for the other types.
-		 */
-
-		FileNameInit();
-		re = Tcl_GetRegExpFromObj(NULL, tsdPtr->macRootPatternPtr,
-			REG_ADVANCED);
-
-		if (!Tcl_RegExpExec(NULL, re, path, path)) {
-		    type = TCL_PATH_RELATIVE;
-		} else {
-		    char *unixRoot, *dummy;
-
-		    Tcl_RegExpRange(re, 2, &unixRoot, &dummy);
-		    if (unixRoot) {
-			type = TCL_PATH_RELATIVE;
-		    }
-		}
-	    }
-	    break;
-	
-	case TCL_PLATFORM_WINDOWS:
-	    if (path[0] != '~') {
-		tsdPtr = TCL_TSD_INIT(&dataKey);
-
-		/*
-		 * Since we have eliminated the easy cases, check for
-		 * drive relative paths using the regular expression.
-		 */
-
-		FileNameInit();
-		re = Tcl_GetRegExpFromObj(NULL, tsdPtr->winRootPatternPtr,
-			REG_ADVANCED);
-
-		if (Tcl_RegExpExec(NULL, re, path, path)) {
-		    char *drive, *dummy, *unixRoot, *lastSlash;
-
-		    Tcl_RegExpRange(re, 2, &drive, &dummy);
-		    Tcl_RegExpRange(re, 5, &unixRoot, &dummy);
-		    Tcl_RegExpRange(re, 6, &lastSlash, &dummy);
-		    
-		    if (unixRoot || (drive && !lastSlash)) {
-			type = TCL_PATH_VOLUME_RELATIVE;
-		    }
-		} else {
-		    type = TCL_PATH_RELATIVE;
-		}
-	    }
-	    break;
-    }
-    return type;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SplitPath --
- *
- *	Split a path into a list of path components.  The first element
- *	of the list will have the same path type as the original path.
- *
- * Results:
- *	Returns a standard Tcl result.  The interpreter result contains
- *	a list of path components.
- *	*argvPtr will be filled in with the address of an array
- *	whose elements point to the elements of path, in order.
- *	*argcPtr will get filled in with the number of valid elements
- *	in the array.  A single block of memory is dynamically allocated
- *	to hold both the argv array and a copy of the path elements.
- *	The caller must eventually free this memory by calling ckfree()
- *	on *argvPtr.  Note:  *argvPtr and *argcPtr are only modified
- *	if the procedure returns normally.
- *
- * Side effects:
- *	Allocates memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SplitPath(path, argcPtr, argvPtr)
-    CONST char *path;		/* Pointer to string containing a path. */
-    int *argcPtr;		/* Pointer to location to fill in with
-				 * the number of elements in the path. */
-    char ***argvPtr;		/* Pointer to place to store pointer to array
-				 * of pointers to path elements. */
-{
-    int i, size;
-    char *p;
-    Tcl_DString buffer;
-
-    Tcl_DStringInit(&buffer);
-
-    /*
-     * Perform platform specific splitting.  These routines will leave the
-     * result in the specified buffer.  Individual elements are terminated
-     * with a null character.
-     */
-
-    p = NULL;			/* Needed only to prevent gcc warnings. */
-    switch (tclPlatform) {
-   	case TCL_PLATFORM_UNIX:
-	    p = SplitUnixPath(path, &buffer);
-	    break;
-
-	case TCL_PLATFORM_WINDOWS:
-	    p = SplitWinPath(path, &buffer);
-	    break;
-	    
-	case TCL_PLATFORM_MAC:
-	    p = SplitMacPath(path, &buffer);
-	    break;
-    }
-
-    /*
-     * Compute the number of elements in the result.
-     */
-
-    size = Tcl_DStringLength(&buffer);
-    *argcPtr = 0;
-    for (i = 0; i < size; i++) {
-	if (p[i] == '\0') {
-	    (*argcPtr)++;
-	}
-    }
-    
-    /*
-     * Allocate a buffer large enough to hold the contents of the
-     * DString plus the argv pointers and the terminating NULL pointer.
-     */
-
-    *argvPtr = (char **) ckalloc((unsigned)
-	    ((((*argcPtr) + 1) * sizeof(char *)) + size));
-
-    /*
-     * Position p after the last argv pointer and copy the contents of
-     * the DString.
-     */
-
-    p = (char *) &(*argvPtr)[(*argcPtr) + 1];
-    memcpy((VOID *) p, (VOID *) Tcl_DStringValue(&buffer), (size_t) size);
-
-    /*
-     * Now set up the argv pointers.
-     */
-
-    for (i = 0; i < *argcPtr; i++) {
-	(*argvPtr)[i] = p;
-	while ((*p++) != '\0') {}
-    }
-    (*argvPtr)[i] = NULL;
-
-    Tcl_DStringFree(&buffer);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SplitUnixPath --
- *
- *	This routine is used by Tcl_SplitPath to handle splitting
- *	Unix paths.
- *
- * Results:
- *	Stores a null separated array of strings in the specified
- *	Tcl_DString.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-SplitUnixPath(path, bufPtr)
-    CONST char *path;		/* Pointer to string containing a path. */
-    Tcl_DString *bufPtr;	/* Pointer to DString to use for the result. */
-{
-    int length;
-    CONST char *p, *elementStart;
-
-    /*
-     * Deal with the root directory as a special case.
-     */
-
-    if (path[0] == '/') {
-	Tcl_DStringAppend(bufPtr, "/", 2);
-	p = path+1;
-    } else {
-	p = path;
-    }
-
-    /*
-     * Split on slashes.  Embedded elements that start with tilde will be
-     * prefixed with "./" so they are not affected by tilde substitution.
-     */
-
-    for (;;) {
-	elementStart = p;
-	while ((*p != '\0') && (*p != '/')) {
-	    p++;
-	}
-	length = p - elementStart;
-	if (length > 0) {
-	    if ((elementStart[0] == '~') && (elementStart != path)) {
-		Tcl_DStringAppend(bufPtr, "./", 2);
-	    }
-	    Tcl_DStringAppend(bufPtr, elementStart, length);
-	    Tcl_DStringAppend(bufPtr, "", 1);
-	}
-	if (*p++ == '\0') {
-	    break;
-	}
-    }
-    return Tcl_DStringValue(bufPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SplitWinPath --
- *
- *	This routine is used by Tcl_SplitPath to handle splitting
- *	Windows paths.
- *
- * Results:
- *	Stores a null separated array of strings in the specified
- *	Tcl_DString.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-SplitWinPath(path, bufPtr)
-    CONST char *path;		/* Pointer to string containing a path. */
-    Tcl_DString *bufPtr;	/* Pointer to DString to use for the result. */
-{
-    int length;
-    CONST char *p, *elementStart;
-
-    p = ExtractWinRoot(path, bufPtr, 0);
-
-    /*
-     * Terminate the root portion, if we matched something.
-     */
-
-    if (p != path) {
-	Tcl_DStringAppend(bufPtr, "", 1);
-    }
-
-    /*
-     * Split on slashes.  Embedded elements that start with tilde will be
-     * prefixed with "./" so they are not affected by tilde substitution.
-     */
-
-    do {
-	elementStart = p;
-	while ((*p != '\0') && (*p != '/') && (*p != '\\')) {
-	    p++;
-	}
-	length = p - elementStart;
-	if (length > 0) {
-	    if ((elementStart[0] == '~') && (elementStart != path)) {
-		Tcl_DStringAppend(bufPtr, "./", 2);
-	    }
-	    Tcl_DStringAppend(bufPtr, elementStart, length);
-	    Tcl_DStringAppend(bufPtr, "", 1);
-	}
-    } while (*p++ != '\0');
-
-    return Tcl_DStringValue(bufPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SplitMacPath --
- *
- *	This routine is used by Tcl_SplitPath to handle splitting
- *	Macintosh paths.
- *
- * Results:
- *	Returns a newly allocated argv array.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-SplitMacPath(path, bufPtr)
-    CONST char *path;		/* Pointer to string containing a path. */
-    Tcl_DString *bufPtr;	/* Pointer to DString to use for the result. */
-{
-    int isMac = 0;		/* 1 if is Mac-style, 0 if Unix-style path. */
-    int i, length;
-    CONST char *p, *elementStart;
-    Tcl_RegExp re;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Initialize the path name parser for Macintosh path names.
-     */
-
-    FileNameInit();
-
-    /*
-     * Match the root portion of a Mac path name.
-     */
-
-    i = 0;			/* Needed only to prevent gcc warnings. */
-
-    re = Tcl_GetRegExpFromObj(NULL, tsdPtr->macRootPatternPtr, REG_ADVANCED);
-
-    if (Tcl_RegExpExec(NULL, re, path, path) == 1) {
-	char *start, *end;
-
-	/*
-	 * Treat degenerate absolute paths like / and /../.. as
-	 * Mac relative file names for lack of anything else to do.
-	 */
-
-	Tcl_RegExpRange(re, 2, &start, &end);
-	if (start) {
-	    Tcl_DStringAppend(bufPtr, ":", 1);
-	    Tcl_RegExpRange(re, 0, &start, &end);
-	    Tcl_DStringAppend(bufPtr, path, end - start + 1);
-	    return Tcl_DStringValue(bufPtr);
-	}
-
-	Tcl_RegExpRange(re, 5, &start, &end);
-	if (start) {
-	    /*
-	     * Unix-style tilde prefixed paths.
-	     */
-
-	    isMac = 0;
-	    i = 5;
-	} else {
-	    Tcl_RegExpRange(re, 7, &start, &end);
-	    if (start) {
-		/*
-		 * Mac-style tilde prefixed paths.
-		 */
-
-		isMac = 1;
-		i = 7;
-	    } else {
-		Tcl_RegExpRange(re, 10, &start, &end);
-		if (start) {
-
-		    /*
-		     * Normal Unix style paths.
-		     */
-
-		    isMac = 0;
-		    i = 10;
-		} else {
-		    Tcl_RegExpRange(re, 12, &start, &end);
-		    if (start) {
-
-			/*
-			 * Normal Mac style paths.
-			 */
-
-			isMac = 1;
-			i = 12;
-		    }
-		}
-	    }
-	}
-
-	Tcl_RegExpRange(re, i, &start, &end);
-	length = end - start;
-
-	/*
-	 * Append the element and terminate it with a : and a null.  Note that
-	 * we are forcing the DString to contain an extra null at the end.
-	 */
-
-	Tcl_DStringAppend(bufPtr, start, length);
-	Tcl_DStringAppend(bufPtr, ":", 2);
-	p = end;
-    } else {
-	isMac = (strchr(path, ':') != NULL);
-	p = path;
-    }
-    
-    if (isMac) {
-
-	/*
-	 * p is pointing at the first colon in the path.  There
-	 * will always be one, since this is a Mac-style path.
-	 */
-
-	elementStart = p++;
-	while ((p = strchr(p, ':')) != NULL) {
-	    length = p - elementStart;
-	    if (length == 1) {
-		while (*p == ':') {
-		    Tcl_DStringAppend(bufPtr, "::", 3);
-		    elementStart = p++;
-		}
-	    } else {
-		/*
-		 * If this is a simple component, drop the leading colon.
-		 */
-
-		if ((elementStart[1] != '~')
-			&& (strchr(elementStart+1, '/') == NULL)) {
-		    elementStart++;
-		    length--;
-		}
-		Tcl_DStringAppend(bufPtr, elementStart, length);
-		Tcl_DStringAppend(bufPtr, "", 1);
-		elementStart = p++;
-	    }
-	}
-	if (elementStart[1] != '\0' || elementStart == path) {
-	    if ((elementStart[1] != '~') && (elementStart[1] != '\0')
-			&& (strchr(elementStart+1, '/') == NULL)) {
-		    elementStart++;
-	    }
-	    Tcl_DStringAppend(bufPtr, elementStart, -1);
-	    Tcl_DStringAppend(bufPtr, "", 1);
-	}
-    } else {
-
-	/*
-	 * Split on slashes, suppress extra /'s, and convert .. to ::. 
-	 */
-
-	for (;;) {
-	    elementStart = p;
-	    while ((*p != '\0') && (*p != '/')) {
-		p++;
-	    }
-	    length = p - elementStart;
-	    if (length > 0) {
-		if ((length == 1) && (elementStart[0] == '.')) {
-		    Tcl_DStringAppend(bufPtr, ":", 2);
-		} else if ((length == 2) && (elementStart[0] == '.')
-			&& (elementStart[1] == '.')) {
-		    Tcl_DStringAppend(bufPtr, "::", 3);
-		} else {
-		    if (*elementStart == '~') {
-			Tcl_DStringAppend(bufPtr, ":", 1);
-		    }
-		    Tcl_DStringAppend(bufPtr, elementStart, length);
-		    Tcl_DStringAppend(bufPtr, "", 1);
-		}
-	    }
-	    if (*p++ == '\0') {
-		break;
-	    }
-	}
-    }
-    return Tcl_DStringValue(bufPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_JoinPath --
- *
- *	Combine a list of paths in a platform specific manner.
- *
- * Results:
- *	Appends the joined path to the end of the specified
- *	returning a pointer to the resulting string.  Note that
- *	the Tcl_DString must already be initialized.
- *
- * Side effects:
- *	Modifies the Tcl_DString.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_JoinPath(argc, argv, resultPtr)
-    int argc;
-    char **argv;
-    Tcl_DString *resultPtr;	/* Pointer to previously initialized DString. */
-{
-    int oldLength, length, i, needsSep;
-    Tcl_DString buffer;
-    char c, *dest;
-    CONST char *p;
-
-    Tcl_DStringInit(&buffer);
-    oldLength = Tcl_DStringLength(resultPtr);
-
-    switch (tclPlatform) {
-   	case TCL_PLATFORM_UNIX:
-	    for (i = 0; i < argc; i++) {
-		p = argv[i];
-		/*
-		 * If the path is absolute, reset the result buffer.
-		 * Consume any duplicate leading slashes or a ./ in
-		 * front of a tilde prefixed path that isn't at the
-		 * beginning of the path.
-		 */
-
-		if (*p == '/') {
-		    Tcl_DStringSetLength(resultPtr, oldLength);
-		    Tcl_DStringAppend(resultPtr, "/", 1);
-		    while (*p == '/') {
-			p++;
-		    }
-		} else if (*p == '~') {
-		    Tcl_DStringSetLength(resultPtr, oldLength);
-		} else if ((Tcl_DStringLength(resultPtr) != oldLength)
-			&& (p[0] == '.') && (p[1] == '/')
-			&& (p[2] == '~')) {
-		    p += 2;
-		}
-
-		if (*p == '\0') {
-		    continue;
-		}
-
-		/*
-		 * Append a separator if needed.
-		 */
-
-		length = Tcl_DStringLength(resultPtr);
-		if ((length != oldLength)
-			&& (Tcl_DStringValue(resultPtr)[length-1] != '/')) {
-		    Tcl_DStringAppend(resultPtr, "/", 1);
-		    length++;
-		}
-
-		/*
-		 * Append the element, eliminating duplicate and trailing
-		 * slashes.
-		 */
-
-		Tcl_DStringSetLength(resultPtr, (int) (length + strlen(p)));
-		dest = Tcl_DStringValue(resultPtr) + length;
-		for (; *p != '\0'; p++) {
-		    if (*p == '/') {
-			while (p[1] == '/') {
-			    p++;
-			}
-			if (p[1] != '\0') {
-			    *dest++ = '/';
-			}
-		    } else {
-			*dest++ = *p;
-		    }
-		}
-		length = dest - Tcl_DStringValue(resultPtr);
-		Tcl_DStringSetLength(resultPtr, length);
-	    }
-	    break;
-
-	case TCL_PLATFORM_WINDOWS:
-	    /*
-	     * Iterate over all of the components.  If a component is
-	     * absolute, then reset the result and start building the
-	     * path from the current component on.
-	     */
-
-	    for (i = 0; i < argc; i++) {
-		p = ExtractWinRoot(argv[i], resultPtr, oldLength);
-		length = Tcl_DStringLength(resultPtr);
-		
-		/*
-		 * If the pointer didn't move, then this is a relative path
-		 * or a tilde prefixed path.
-		 */
-
-		if (p == argv[i]) {
-		    /*
-		     * Remove the ./ from tilde prefixed elements unless
-		     * it is the first component.
-		     */
-
-		    if ((length != oldLength)
-			    && (p[0] == '.')
-			    && ((p[1] == '/') || (p[1] == '\\'))
-			    && (p[2] == '~')) {
-			p += 2;
-		    } else if (*p == '~') {
-			Tcl_DStringSetLength(resultPtr, oldLength);
-			length = oldLength;
-		    }
-		}
-
-		if (*p != '\0') {
-		    /*
-		     * Check to see if we need to append a separator.
-		     */
-
-		    
-		    if (length != oldLength) {
-			c = Tcl_DStringValue(resultPtr)[length-1];
-			if ((c != '/') && (c != ':')) {
-			    Tcl_DStringAppend(resultPtr, "/", 1);
-			}
-		    }
-
-		    /*
-		     * Append the element, eliminating duplicate and
-		     * trailing slashes.
-		     */
-
-		    length = Tcl_DStringLength(resultPtr);
-		    Tcl_DStringSetLength(resultPtr, (int) (length + strlen(p)));
-		    dest = Tcl_DStringValue(resultPtr) + length;
-		    for (; *p != '\0'; p++) {
-			if ((*p == '/') || (*p == '\\')) {
-			    while ((p[1] == '/') || (p[1] == '\\')) {
-				p++;
-			    }
-			    if (p[1] != '\0') {
-				*dest++ = '/';
-			    }
-			} else {
-			    *dest++ = *p;
-			}
-		    }
-		    length = dest - Tcl_DStringValue(resultPtr);
-		    Tcl_DStringSetLength(resultPtr, length);
-		}
-	    }
-	    break;
-
-	case TCL_PLATFORM_MAC:
-	    needsSep = 1;
-	    for (i = 0; i < argc; i++) {
-		Tcl_DStringSetLength(&buffer, 0);
-		p = SplitMacPath(argv[i], &buffer);
-		if ((*p != ':') && (*p != '\0')
-			&& (strchr(p, ':') != NULL)) {
-		    Tcl_DStringSetLength(resultPtr, oldLength);
-		    length = strlen(p);
-		    Tcl_DStringAppend(resultPtr, p, length);
-		    needsSep = 0;
-		    p += length+1;
-		}
-
-		/*
-		 * Now append the rest of the path elements, skipping
-		 * : unless it is the first element of the path, and
-		 * watching out for :: et al. so we don't end up with
-		 * too many colons in the result.
-		 */
-
-		for (; *p != '\0'; p += length+1) {
-		    if (p[0] == ':' && p[1] == '\0') {
-			if (Tcl_DStringLength(resultPtr) != oldLength) {
-			    p++;
-			} else {
-			    needsSep = 0;
-			}
-		    } else {
-			c = p[1];
-			if (*p == ':') {
-			    if (!needsSep) {
-				p++;
-			    }
-			} else {
-			    if (needsSep) {
-				Tcl_DStringAppend(resultPtr, ":", 1);
-			    }
-			}
-			needsSep = (c == ':') ? 0 : 1;
-		    }
-		    length = strlen(p);
-		    Tcl_DStringAppend(resultPtr, p, length);
-		}
-	    }
-	    break;
-			       
-    }
-    Tcl_DStringFree(&buffer);
-    return Tcl_DStringValue(resultPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_TranslateFileName --
- *
- *	Converts a file name into a form usable by the native system
- *	interfaces.  If the name starts with a tilde, it will produce a
- *	name where the tilde and following characters have been replaced
- *	by the home directory location for the named user.
- *
- * Results:
- *	The return value is a pointer to a string containing the name
- *	after tilde substitution.  If there was no tilde substitution,
- *	the return value is a pointer to a copy of the original string.
- *	If there was an error in processing the name, then an error
- *	message is left in the interp's result (if interp was not NULL)
- *	and the return value is NULL.  Space for the return value is
- *	allocated in bufferPtr; the caller must call Tcl_DStringFree()
- *	to free the space if the return value was not NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_TranslateFileName(interp, name, bufferPtr)
-    Tcl_Interp *interp;		/* Interpreter in which to store error
-				 * message (if necessary). */
-    char *name;			/* File name, which may begin with "~" (to
-				 * indicate current user's home directory) or
-				 * "~<user>" (to indicate any user's home
-				 * directory). */
-    Tcl_DString *bufferPtr;	/* Uninitialized or free DString filled
-				 * with name after tilde substitution. */
-{
-    register char *p;
-
-    /*
-     * Handle tilde substitutions, if needed.
-     */
-
-    if (name[0] == '~') {
-	int argc, length;
-	char **argv;
-	Tcl_DString temp;
-
-	Tcl_SplitPath(name, &argc, &argv);
-	
-	/*
-	 * Strip the trailing ':' off of a Mac path before passing the user
-	 * name to DoTildeSubst.
-	 */
-
-	if (tclPlatform == TCL_PLATFORM_MAC) {
-	    length = strlen(argv[0]);
-	    argv[0][length-1] = '\0';
-	}
-	
-	Tcl_DStringInit(&temp);
-	argv[0] = DoTildeSubst(interp, argv[0]+1, &temp);
-	if (argv[0] == NULL) {
-	    Tcl_DStringFree(&temp);
-	    ckfree((char *)argv);
-	    return NULL;
-	}
-	Tcl_DStringInit(bufferPtr);
-	Tcl_JoinPath(argc, argv, bufferPtr);
-	Tcl_DStringFree(&temp);
-	ckfree((char*)argv);
-    } else {
-	Tcl_DStringInit(bufferPtr);
-	Tcl_JoinPath(1, &name, bufferPtr);
-    }
-
-    /*
-     * Convert forward slashes to backslashes in Windows paths because
-     * some system interfaces don't accept forward slashes.
-     */
-
-    if (tclPlatform == TCL_PLATFORM_WINDOWS) {
-	for (p = Tcl_DStringValue(bufferPtr); *p != '\0'; p++) {
-	    if (*p == '/') {
-		*p = '\\';
-	    }
-	}
-    }
-    return Tcl_DStringValue(bufferPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetExtension --
- *
- *	This function returns a pointer to the beginning of the
- *	extension part of a file name.
- *
- * Results:
- *	Returns a pointer into name which indicates where the extension
- *	starts.  If there is no extension, returns NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclGetExtension(name)
-    char *name;			/* File name to parse. */
-{
-    char *p, *lastSep;
-
-    /*
-     * First find the last directory separator.
-     */
-
-    lastSep = NULL;		/* Needed only to prevent gcc warnings. */
-    switch (tclPlatform) {
-	case TCL_PLATFORM_UNIX:
-	    lastSep = strrchr(name, '/');
-	    break;
-
-	case TCL_PLATFORM_MAC:
-	    if (strchr(name, ':') == NULL) {
-		lastSep = strrchr(name, '/');
-	    } else {
-		lastSep = strrchr(name, ':');
-	    }
-	    break;
-
-	case TCL_PLATFORM_WINDOWS:
-	    lastSep = NULL;
-	    for (p = name; *p != '\0'; p++) {
-		if (strchr("/\\:", *p) != NULL) {
-		    lastSep = p;
-		}
-	    }
-	    break;
-    }
-    p = strrchr(name, '.');
-    if ((p != NULL) && (lastSep != NULL)
-	    && (lastSep > p)) {
-	p = NULL;
-    }
-
-    /*
-     * In earlier versions, we used to back up to the first period in a series
-     * so that "foo..o" would be split into "foo" and "..o".  This is a
-     * confusing and usually incorrect behavior, so now we split at the last
-     * period in the name.
-     */
-
-    return p;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DoTildeSubst --
- *
- *	Given a string following a tilde, this routine returns the
- *	corresponding home directory.
- *
- * Results:
- *	The result is a pointer to a static string containing the home
- *	directory in native format.  If there was an error in processing
- *	the substitution, then an error message is left in the interp's
- *	result and the return value is NULL.  On success, the results
- *	are appended to resultPtr, and the contents of resultPtr are
- *	returned.
- *
- * Side effects:
- *	Information may be left in resultPtr.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-DoTildeSubst(interp, user, resultPtr)
-    Tcl_Interp *interp;		/* Interpreter in which to store error
-				 * message (if necessary). */
-    CONST char *user;		/* Name of user whose home directory should be
-				 * substituted, or "" for current user. */
-    Tcl_DString *resultPtr;	/* Initialized DString filled with name
-				 * after tilde substitution. */
-{
-    char *dir;
-
-    if (*user == '\0') {
-	Tcl_DString dirString;
-	
-	dir = TclGetEnv("HOME", &dirString);
-	if (dir == NULL) {
-	    if (interp) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendResult(interp, "couldn't find HOME environment ",
-			"variable to expand path", (char *) NULL);
-	    }
-	    return NULL;
-	}
-	Tcl_JoinPath(1, &dir, resultPtr);
-	Tcl_DStringFree(&dirString);
-    } else {
-	if (TclpGetUserHome(user, resultPtr) == NULL) {	
-	    if (interp) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendResult(interp, "user \"", user, "\" doesn't exist",
-			(char *) NULL);
-	    }
-	    return NULL;
-	}
-    }
-    return resultPtr->string;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GlobObjCmd --
- *
- *	This procedure is invoked to process the "glob" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_GlobObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int index, i, noComplain, skip, length;
-    char *string;
-    static char *options[] = {"-nocomplain", "--", NULL};
-    enum options {GLOB_NOCOMPLAIN, GLOB_LAST};
-
-    noComplain = 0;
-    for (skip = 1; skip < objc; skip++) {
-	string = Tcl_GetString(objv[skip]);
-	if (string[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[skip], options, "switch",
-		TCL_EXACT, &index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (index == GLOB_NOCOMPLAIN) {
-	    noComplain = 1;
-	} else {
-	    skip++;
-	    break;
-	}
-    }
-    if (skip >= objc) {
-        Tcl_WrongNumArgs(interp, 1, objv, "?switches? name ?name ...?");
-	return TCL_ERROR;
-    }
-
-    for (i = skip; i < objc; i++) {
-	string = Tcl_GetString(objv[i]);
-	if (TclGlob(interp, string, noComplain) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-    if (noComplain == 0) {
-	Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &length);
-	if (length == 0) {
-	    char *sep = "";
-
-	    Tcl_AppendResult(interp, "no files matched glob pattern",
-		    (objc == 2) ? " \"" : "s \"", (char *) NULL);
-	    for (i = skip; i < objc; i++) {
-		string = Tcl_GetString(objv[i]);
-		Tcl_AppendResult(interp, sep, string, (char *) NULL);
-		sep = " ";
-	    }
-	    Tcl_AppendResult(interp, "\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGlob --
- *
- *	This procedure prepares arguments for the TclDoGlob call.
- *	It sets the separator string based on the platform, performs
- *      tilde substitution, and calls TclDoGlob.
- *
- * Results:
- *	The return value is a standard Tcl result indicating whether
- *	an error occurred in globbing.  After a normal return the
- *	result in interp (set by TclDoGlob) holds all of the file names
- *	given by the dir and rem arguments.  After an error the
- *	result in interp will hold an error message.
- *
- * Side effects:
- *	The currentArgString is written to.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-TclGlob(interp, pattern, noComplain)
-    Tcl_Interp *interp;		/* Interpreter for returning error message
-				 * or appending list of matching file names. */
-    char *pattern;		/* Glob pattern to match. Must not refer
-				 * to a static string. */
-    int noComplain;		/* Flag to turn off storing error messages
-				 * in interp. */
-{
-    char *separators;
-    char *head, *tail;
-    char c;
-    int result;
-    Tcl_DString buffer;
-
-    separators = NULL;		/* lint. */
-    switch (tclPlatform) {
-	case TCL_PLATFORM_UNIX:
-	    separators = "/";
-	    break;
-	case TCL_PLATFORM_WINDOWS:
-	    separators = "/\\:";
-	    break;
-	case TCL_PLATFORM_MAC:
-	    separators = (strchr(pattern, ':') == NULL)
-		? "/" : ":";
-	    break;
-    }
-
-    Tcl_DStringInit(&buffer);
-
-    /*
-     * Perform tilde substitution, if needed.
-     */
-
-    if (pattern[0] == '~') {
-	char *p;
-
-	/*
-	 * Find the first path separator after the tilde.
-	 */
-
-	for (tail = pattern; *tail != '\0'; tail++) {
-	    if (*tail == '\\') {
-		if (strchr(separators, tail[1]) != NULL) {
-		    break;
-		}
-	    } else if (strchr(separators, *tail) != NULL) {
-		break;
-	    }
-	}
-
-	/*
-	 * Determine the home directory for the specified user.  Note that
-	 * we don't allow special characters in the user name.
-	 */
-	
-	c = *tail;
-	*tail = '\0';
-	p = strpbrk(pattern+1, "\\[]*?{}");
-	if (p == NULL) {
-	    head = DoTildeSubst(interp, pattern+1, &buffer);
-	} else {
-	    if (!noComplain) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendResult(interp, "globbing characters not ",
-			"supported in user names", (char *) NULL);
-	    }
-	    head = NULL;
-	}
-	*tail = c;
-	if (head == NULL) {
-	    if (noComplain) {
-		/*
-		 * We should in fact pass down the nocomplain flag 
-		 * or save the interp result or use another mechanism
-		 * so the interp result is not mangled on errors in that case.
-		 * but that would a bigger change than reasonable for a patch
-		 * release.
-		 * (see fileName.test 15.2-15.4 for expected behaviour)
-		 */
-		Tcl_ResetResult(interp);
-		return TCL_OK;
-	    } else {
-		return TCL_ERROR;
-	    }
-	}
-	if (head != Tcl_DStringValue(&buffer)) {
-	    Tcl_DStringAppend(&buffer, head, -1);
-	}
-    } else {
-	tail = pattern;
-    }
-
-    result = TclDoGlob(interp, separators, &buffer, tail);
-    Tcl_DStringFree(&buffer);
-    if (result != TCL_OK) {
-	if (noComplain) {
-	    Tcl_ResetResult(interp);
-	    return TCL_OK;
-	}
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SkipToChar --
- *
- *	This function traverses a glob pattern looking for the next
- *	unquoted occurance of the specified character at the same braces
- *	nesting level.
- *
- * Results:
- *	Updates stringPtr to point to the matching character, or to
- *	the end of the string if nothing matched.  The return value
- *	is 1 if a match was found at the top level, otherwise it is 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SkipToChar(stringPtr, match)
-    char **stringPtr;			/* Pointer string to check. */
-    char *match;			/* Pointer to character to find. */
-{
-    int quoted, level;
-    register char *p;
-
-    quoted = 0;
-    level = 0;
-
-    for (p = *stringPtr; *p != '\0'; p++) {
-	if (quoted) {
-	    quoted = 0;
-	    continue;
-	}
-	if ((level == 0) && (*p == *match)) {
-	    *stringPtr = p;
-	    return 1;
-	}
-	if (*p == '{') {
-	    level++;
-	} else if (*p == '}') {
-	    level--;
-	} else if (*p == '\\') {
-	    quoted = 1;
-	}
-    }
-    *stringPtr = p;
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDoGlob --
- *
- *	This recursive procedure forms the heart of the globbing
- *	code.  It performs a depth-first traversal of the tree
- *	given by the path name to be globbed.  The directory and
- *	remainder are assumed to be native format paths.
- *
- * Results:
- *	The return value is a standard Tcl result indicating whether
- *	an error occurred in globbing.  After a normal return the
- *	result in interp will be set to hold all of the file names
- *	given by the dir and rem arguments.  After an error the
- *	result in interp will hold an error message.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclDoGlob(interp, separators, headPtr, tail)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting
-				 * (e.g. unmatched brace). */
-    char *separators;		/* String containing separator characters
-				 * that should be used to identify globbing
-				 * boundaries. */
-    Tcl_DString *headPtr;	/* Completely expanded prefix. */
-    char *tail;			/* The unexpanded remainder of the path.
-				 * Must not be a pointer to a static string. */
-{
-    int baseLength, quoted, count;
-    int result = TCL_OK;
-    char *name, *p, *openBrace, *closeBrace, *firstSpecialChar, savedChar;
-    char lastChar = 0;
-    int length = Tcl_DStringLength(headPtr);
-
-    if (length > 0) {
-	lastChar = Tcl_DStringValue(headPtr)[length-1];
-    }
-
-    /*
-     * Consume any leading directory separators, leaving tail pointing
-     * just past the last initial separator.
-     */
-
-    count = 0;
-    name = tail;
-    for (; *tail != '\0'; tail++) {
-	if ((*tail == '\\') && (strchr(separators, tail[1]) != NULL)) {
-	    tail++;
-	} else if (strchr(separators, *tail) == NULL) {
-	    break;
-	}
-	count++;
-    }
-
-    /*
-     * Deal with path separators.  On the Mac, we have to watch out
-     * for multiple separators, since they are special in Mac-style
-     * paths.
-     */
-
-    switch (tclPlatform) {
-	case TCL_PLATFORM_MAC:
-	    if (*separators == '/') {
-		if (((length == 0) && (count == 0))
-			|| ((length > 0) && (lastChar != ':'))) {
-		    Tcl_DStringAppend(headPtr, ":", 1);
-		}
-	    } else {
-		if (count == 0) {
-		    if ((length > 0) && (lastChar != ':')) {
-			Tcl_DStringAppend(headPtr, ":", 1);
-		    }
-		} else {
-		    if (lastChar == ':') {
-			count--;
-		    }
-		    while (count-- > 0) {
-			Tcl_DStringAppend(headPtr, ":", 1);
-		    }
-		}
-	    }
-	    break;
-	case TCL_PLATFORM_WINDOWS:
-	    /*
-	     * If this is a drive relative path, add the colon and the
-	     * trailing slash if needed.  Otherwise add the slash if
-	     * this is the first absolute element, or a later relative
-	     * element.  Add an extra slash if this is a UNC path.
-	     */
-
-	    if (*name == ':') {
-		Tcl_DStringAppend(headPtr, ":", 1);
-		if (count > 1) {
-		    Tcl_DStringAppend(headPtr, "/", 1);
-		}
-	    } else if ((*tail != '\0')
-		    && (((length > 0)
-			    && (strchr(separators, lastChar) == NULL))
-			    || ((length == 0) && (count > 0)))) {
-		Tcl_DStringAppend(headPtr, "/", 1);
-		if ((length == 0) && (count > 1)) {
-		    Tcl_DStringAppend(headPtr, "/", 1);
-		}
-	    }
-	    
-	    break;
-	case TCL_PLATFORM_UNIX:
-	    /*
-	     * Add a separator if this is the first absolute element, or
-	     * a later relative element.
-	     */
-
-	    if ((*tail != '\0')
-		    && (((length > 0)
-			    && (strchr(separators, lastChar) == NULL))
-			    || ((length == 0) && (count > 0)))) {
-		Tcl_DStringAppend(headPtr, "/", 1);
-	    }
-	    break;
-    }
-
-    /*
-     * Look for the first matching pair of braces or the first
-     * directory separator that is not inside a pair of braces.
-     */
-
-    openBrace = closeBrace = NULL;
-    quoted = 0;
-    for (p = tail; *p != '\0'; p++) {
-	if (quoted) {
-	    quoted = 0;
-	} else if (*p == '\\') {
-	    quoted = 1;
-	    if (strchr(separators, p[1]) != NULL) {
-		break;			/* Quoted directory separator. */
-	    }
-	} else if (strchr(separators, *p) != NULL) {
-	    break;			/* Unquoted directory separator. */
-	} else if (*p == '{') {
-	    openBrace = p;
-	    p++;
-	    if (SkipToChar(&p, "}")) {
-		closeBrace = p;		/* Balanced braces. */
-		break;
-	    }
-	    Tcl_SetResult(interp, "unmatched open-brace in file name",
-		    TCL_STATIC);
-	    return TCL_ERROR;
-	} else if (*p == '}') {
-	    Tcl_SetResult(interp, "unmatched close-brace in file name",
-		    TCL_STATIC);
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Substitute the alternate patterns from the braces and recurse.
-     */
-
-    if (openBrace != NULL) {
-	char *element;
-	Tcl_DString newName;
-	Tcl_DStringInit(&newName);
-
-	/*
-	 * For each element within in the outermost pair of braces,
-	 * append the element and the remainder to the fixed portion
-	 * before the first brace and recursively call TclDoGlob.
-	 */
-
-	Tcl_DStringAppend(&newName, tail, openBrace-tail);
-	baseLength = Tcl_DStringLength(&newName);
-	length = Tcl_DStringLength(headPtr);
-	*closeBrace = '\0';
-	for (p = openBrace; p != closeBrace; ) {
-	    p++;
-	    element = p;
-	    SkipToChar(&p, ",");
-	    Tcl_DStringSetLength(headPtr, length);
-	    Tcl_DStringSetLength(&newName, baseLength);
-	    Tcl_DStringAppend(&newName, element, p-element);
-	    Tcl_DStringAppend(&newName, closeBrace+1, -1);
-	    result = TclDoGlob(interp, separators,
-		    headPtr, Tcl_DStringValue(&newName));
-	    if (result != TCL_OK) {
-		break;
-	    }
-	}
-	*closeBrace = '}';
-	Tcl_DStringFree(&newName);
-	return result;
-    }
-
-    /*
-     * At this point, there are no more brace substitutions to perform on
-     * this path component.  The variable p is pointing at a quoted or
-     * unquoted directory separator or the end of the string.  So we need
-     * to check for special globbing characters in the current pattern.
-     * We avoid modifying tail if p is pointing at the end of the string.
-     */
-
-    if (*p != '\0') {
-
-	/*
-	 * Note that we are modifying the string in place.  This won't work
-	 * if the string is a static.
-	 */
-
-	 savedChar = *p;
-	 *p = '\0';
-	 firstSpecialChar = strpbrk(tail, "*[]?\\");
-	 *p = savedChar;
-    } else {
-	firstSpecialChar = strpbrk(tail, "*[]?\\");
-    }
-
-    if (firstSpecialChar != NULL) {
-	/*
-	 * Look for matching files in the current directory.  The
-	 * implementation of this function is platform specific, but may
-	 * recursively call TclDoGlob.  For each file that matches, it will
-	 * add the match onto the interp's result, or call TclDoGlob if there
-	 * are more characters to be processed.
-	 */
-
-	return TclpMatchFiles(interp, separators, headPtr, tail, p);
-    }
-    Tcl_DStringAppend(headPtr, tail, p-tail);
-    if (*p != '\0') {
-	return TclDoGlob(interp, separators, headPtr, p);
-    }
-
-    /*
-     * There are no more wildcards in the pattern and no more unprocessed
-     * characters in the tail, so now we can construct the path and verify
-     * the existence of the file.
-     */
-
-    switch (tclPlatform) {
-	case TCL_PLATFORM_MAC: {
-	    if (strchr(Tcl_DStringValue(headPtr), ':') == NULL) {
-		Tcl_DStringAppend(headPtr, ":", 1);
-	    }
-	    name = Tcl_DStringValue(headPtr);
-	    if (TclpAccess(name, F_OK) == 0) {
-		if ((name[1] != '\0') && (strchr(name+1, ':') == NULL)) {
-		    Tcl_AppendElement(interp, name + 1);
-		} else {
-		    Tcl_AppendElement(interp, name);
-		}
-	    }
-	    break;
-	}
-	case TCL_PLATFORM_WINDOWS: {
-	    int exists;
-	    
-	    /*
-	     * We need to convert slashes to backslashes before checking
-	     * for the existence of the file.  Once we are done, we need
-	     * to convert the slashes back.
-	     */
-
-	    if (Tcl_DStringLength(headPtr) == 0) {
-		if (((*name == '\\') && (name[1] == '/' || name[1] == '\\'))
-			|| (*name == '/')) {
-		    Tcl_DStringAppend(headPtr, "\\", 1);
-		} else {
-		    Tcl_DStringAppend(headPtr, ".", 1);
-		}
-	    } else {
-		for (p = Tcl_DStringValue(headPtr); *p != '\0'; p++) {
-		    if (*p == '/') {
-			*p = '\\';
-		    }
-		}
-	    }
-	    name = Tcl_DStringValue(headPtr);
-	    exists = (TclpAccess(name, F_OK) == 0);
-
-	    for (p = name; *p != '\0'; p++) {
-		if (*p == '\\') {
-		    *p = '/';
-		}
-	    }
-	    if (exists) {
-		Tcl_AppendElement(interp, name);
-	    }
-	    break;
-	}
-	case TCL_PLATFORM_UNIX: {
-	    if (Tcl_DStringLength(headPtr) == 0) {
-		if ((*name == '\\' && name[1] == '/') || (*name == '/')) {
-		    Tcl_DStringAppend(headPtr, "/", 1);
-		} else {
-		    Tcl_DStringAppend(headPtr, ".", 1);
-		}
-	    }
-	    name = Tcl_DStringValue(headPtr);
-	    if (TclpAccess(name, F_OK) == 0) {
-		Tcl_AppendElement(interp, name);
-	    }
-	    break;
-	}
-    }
-
-    return TCL_OK;
-}
diff --git a/generic/tclGet.c b/generic/tclGet.c
deleted file mode 100644
index 27e49cc..0000000
--- a/generic/tclGet.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* 
- * tclGet.c --
- *
- *	This file contains procedures to convert strings into
- *	other forms, like integers or floating-point numbers or
- *	booleans, doing syntax checking along the way.
- *
- * Copyright (c) 1990-1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclGet.c,v 1.3 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetInt --
- *
- *	Given a string, produce the corresponding integer value.
- *
- * Results:
- *	The return value is normally TCL_OK;  in this case *intPtr
- *	will be set to the integer value equivalent to string.  If
- *	string is improperly formed then TCL_ERROR is returned and
- *	an error message will be left in the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetInt(interp, string, intPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
-    char *string;		/* String containing a (possibly signed)
-				 * integer in a form acceptable to strtol. */
-    int *intPtr;		/* Place to store converted result. */
-{
-    char *end, *p;
-    long i;
-
-    /*
-     * Note: use strtoul instead of strtol for integer conversions
-     * to allow full-size unsigned numbers, but don't depend on strtoul
-     * to handle sign characters;  it won't in some implementations.
-     */
-
-    errno = 0;
-    for (p = string; isspace(UCHAR(*p)); p++) {	/* INTL: ISO space. */
-	/* Empty loop body. */
-    }
-    if (*p == '-') {
-	p++;
-	i = -((long)strtoul(p, &end, 0)); /* INTL: Tcl source. */
-    } else if (*p == '+') {
-	p++;
-	i = strtoul(p, &end, 0); /* INTL: Tcl source. */
-    } else {
-	i = strtoul(p, &end, 0); /* INTL: Tcl source. */
-    }
-    if (end == p) {
-	badInteger:
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "expected integer but got \"", string,
-                    "\"", (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-
-    /*
-     * The second test below is needed on platforms where "long" is
-     * larger than "int" to detect values that fit in a long but not in
-     * an int.
-     */
-
-    if ((errno == ERANGE) || (((long)(int) i) != i)) {
-        if (interp != (Tcl_Interp *) NULL) {
-	    Tcl_SetResult(interp, "integer value too large to represent",
-		    TCL_STATIC);
-            Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
-		    Tcl_GetStringResult(interp), (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-    while ((*end != '\0') && isspace(UCHAR(*end))) { /* INTL: ISO space. */
-	end++;
-    }
-    if (*end != 0) {
-	goto badInteger;
-    }
-    *intPtr = (int) i;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetLong --
- *
- *	Given a string, produce the corresponding long integer value.
- *	This routine is a version of Tcl_GetInt but returns a "long"
- *	instead of an "int".
- *
- * Results:
- *	The return value is normally TCL_OK; in this case *longPtr
- *	will be set to the long integer value equivalent to string. If
- *	string is improperly formed then TCL_ERROR is returned and
- *	an error message will be left in the interp's result if interp
- *	is non-NULL. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGetLong(interp, string, longPtr)
-    Tcl_Interp *interp;		/* Interpreter used for error reporting
-				 * if not NULL. */
-    char *string;		/* String containing a (possibly signed)
-				 * long integer in a form acceptable to
-				 * strtoul. */
-    long *longPtr;		/* Place to store converted long result. */
-{
-    char *end, *p;
-    long i;
-
-    /*
-     * Note: don't depend on strtoul to handle sign characters; it won't
-     * in some implementations.
-     */
-
-    errno = 0;
-    for (p = string; isspace(UCHAR(*p)); p++) {	/* INTL: ISO space. */
-	/* Empty loop body. */
-    }
-    if (*p == '-') {
-	p++;
-	i = -(int)strtoul(p, &end, 0); /* INTL: Tcl source. */
-    } else if (*p == '+') {
-	p++;
-	i = strtoul(p, &end, 0); /* INTL: Tcl source. */
-    } else {
-	i = strtoul(p, &end, 0); /* INTL: Tcl source. */
-    }
-    if (end == p) {
-	badInteger:
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "expected integer but got \"", string,
-                    "\"", (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-    if (errno == ERANGE) {
-        if (interp != (Tcl_Interp *) NULL) {
-	    Tcl_SetResult(interp, "integer value too large to represent",
-		    TCL_STATIC);
-            Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW",
-                    Tcl_GetStringResult(interp), (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-    while ((*end != '\0') && isspace(UCHAR(*end))) { /* INTL: ISO space. */
-	end++;
-    }
-    if (*end != 0) {
-	goto badInteger;
-    }
-    *longPtr = i;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetDouble --
- *
- *	Given a string, produce the corresponding double-precision
- *	floating-point value.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case *doublePtr
- *	will be set to the double-precision value equivalent to string.
- *	If string is improperly formed then TCL_ERROR is returned and
- *	an error message will be left in the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetDouble(interp, string, doublePtr)
-    Tcl_Interp *interp;		/* Interpreter used for error reporting. */
-    char *string;		/* String containing a floating-point number
-				 * in a form acceptable to strtod. */
-    double *doublePtr;		/* Place to store converted result. */
-{
-    char *end;
-    double d;
-
-    errno = 0;
-    d = strtod(string, &end); /* INTL: Tcl source. */
-    if (end == string) {
-	badDouble:
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp,
-                    "expected floating-point number but got \"",
-                    string, "\"", (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-    if (errno != 0) {
-        if (interp != (Tcl_Interp *) NULL) {
-            TclExprFloatError(interp, d); 
-        }
-	return TCL_ERROR;
-    }
-    while ((*end != 0) && isspace(UCHAR(*end))) { /* INTL: ISO space. */
-	end++;
-    }
-    if (*end != 0) {
-	goto badDouble;
-    }
-    *doublePtr = d;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetBoolean --
- *
- *	Given a string, return a 0/1 boolean value corresponding
- *	to the string.
- *
- * Results:
- *	The return value is normally TCL_OK;  in this case *boolPtr
- *	will be set to the 0/1 value equivalent to string.  If
- *	string is improperly formed then TCL_ERROR is returned and
- *	an error message will be left in the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetBoolean(interp, string, boolPtr)
-    Tcl_Interp *interp;		/* Interpreter used for error reporting. */
-    char *string;		/* String containing a boolean number
-				 * specified either as 1/0 or true/false or
-				 * yes/no. */
-    int *boolPtr;		/* Place to store converted result, which
-				 * will be 0 or 1. */
-{
-    int i;
-    char lowerCase[10], c;
-    size_t length;
-
-    /*
-     * Convert the input string to all lower-case. 
-     * INTL: This code will work on UTF strings.
-     */
-
-    for (i = 0; i < 9; i++) {
-	c = string[i];
-	if (c == 0) {
-	    break;
-	}
-	if ((c >= 'A') && (c <= 'Z')) {
-	    c += (char) ('a' - 'A');
-	}
-	lowerCase[i] = c;
-    }
-    lowerCase[i] = 0;
-
-    length = strlen(lowerCase);
-    c = lowerCase[0];
-    if ((c == '0') && (lowerCase[1] == '\0')) {
-	*boolPtr = 0;
-    } else if ((c == '1') && (lowerCase[1] == '\0')) {
-	*boolPtr = 1;
-    } else if ((c == 'y') && (strncmp(lowerCase, "yes", length) == 0)) {
-	*boolPtr = 1;
-    } else if ((c == 'n') && (strncmp(lowerCase, "no", length) == 0)) {
-	*boolPtr = 0;
-    } else if ((c == 't') && (strncmp(lowerCase, "true", length) == 0)) {
-	*boolPtr = 1;
-    } else if ((c == 'f') && (strncmp(lowerCase, "false", length) == 0)) {
-	*boolPtr = 0;
-    } else if ((c == 'o') && (length >= 2)) {
-	if (strncmp(lowerCase, "on", length) == 0) {
-	    *boolPtr = 1;
-	} else if (strncmp(lowerCase, "off", length) == 0) {
-	    *boolPtr = 0;
-	} else {
-	    goto badBoolean;
-	}
-    } else {
-	badBoolean:
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "expected boolean value but got \"",
-                    string, "\"", (char *) NULL);
-        }
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y
deleted file mode 100644
index 2f519dce..0000000
--- a/generic/tclGetDate.y
+++ /dev/null
@@ -1,958 +0,0 @@
-/* 
- * tclGetDate.y --
- *
- *	Contains yacc grammar for parsing date and time strings.
- *	The output of this file should be the file tclDate.c which
- *	is used directly in the Tcl sources.
- *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclGetDate.y,v 1.4 1999/04/16 00:46:46 stanton Exp $
- */
-
-%{
-/* 
- * tclDate.c --
- *
- *	This file is generated from a yacc grammar defined in
- *	the file tclGetDate.y.  It should not be edited directly.
- *
- * Copyright (c) 1992-1995 Karl Lehenbauer and Mark Diekhans.
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCSID
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-#ifdef MAC_TCL
-#   define EPOCH           1904
-#   define START_OF_TIME   1904
-#   define END_OF_TIME     2039
-#else
-#   define EPOCH           1970
-#   define START_OF_TIME   1902
-#   define END_OF_TIME     2037
-#endif
-
-/*
- * The offset of tm_year of struct tm returned by localtime, gmtime, etc.
- * I don't know how universal this is; K&R II, the NetBSD manpages, and
- * ../compat/strftime.c all agree that tm_year is the year-1900.  However,
- * some systems may have a different value.  This #define should be the
- * same as in ../compat/strftime.c.
- */
-#define TM_YEAR_BASE 1900
-
-#define HOUR(x)         ((int) (60 * x))
-#define SECSPERDAY      (24L * 60L * 60L)
-
-
-/*
- *  An entry in the lexical lookup table.
- */
-typedef struct _TABLE {
-    char        *name;
-    int         type;
-    time_t      value;
-} TABLE;
-
-
-/*
- *  Daylight-savings mode:  on, off, or not yet known.
- */
-typedef enum _DSTMODE {
-    DSTon, DSToff, DSTmaybe
-} DSTMODE;
-
-/*
- *  Meridian:  am, pm, or 24-hour style.
- */
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-
-/*
- *  Global variables.  We could get rid of most of these by using a good
- *  union as the yacc stack.  (This routine was originally written before
- *  yacc had the %union construct.)  Maybe someday; right now we only use
- *  the %union very rarely.
- */
-static char     *yyInput;
-static DSTMODE  yyDSTmode;
-static time_t   yyDayOrdinal;
-static time_t   yyDayNumber;
-static int      yyHaveDate;
-static int      yyHaveDay;
-static int      yyHaveRel;
-static int      yyHaveTime;
-static int      yyHaveZone;
-static time_t   yyTimezone;
-static time_t   yyDay;
-static time_t   yyHour;
-static time_t   yyMinutes;
-static time_t   yyMonth;
-static time_t   yySeconds;
-static time_t   yyYear;
-static MERIDIAN yyMeridian;
-static time_t   yyRelMonth;
-static time_t   yyRelSeconds;
-
-
-/*
- * Prototypes of internal functions.
- */
-static void	yyerror _ANSI_ARGS_((char *s));
-static time_t	ToSeconds _ANSI_ARGS_((time_t Hours, time_t Minutes,
-		    time_t Seconds, MERIDIAN Meridian));
-static int	Convert _ANSI_ARGS_((time_t Month, time_t Day, time_t Year,
-		    time_t Hours, time_t Minutes, time_t Seconds,
-		    MERIDIAN Meridia, DSTMODE DSTmode, time_t *TimePtr));
-static time_t	DSTcorrect _ANSI_ARGS_((time_t Start, time_t Future));
-static time_t	RelativeDate _ANSI_ARGS_((time_t Start, time_t DayOrdinal,
-		    time_t DayNumber));
-static int	RelativeMonth _ANSI_ARGS_((time_t Start, time_t RelMonth,
-		    time_t *TimePtr));
-static int	LookupWord _ANSI_ARGS_((char *buff));
-static int	yylex _ANSI_ARGS_((void));
-
-int
-yyparse _ANSI_ARGS_((void));
-%}
-
-%union {
-    time_t              Number;
-    enum _MERIDIAN      Meridian;
-}
-
-%token  tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token  tSEC_UNIT tSNUMBER tUNUMBER tZONE tEPOCH tDST
-
-%type   <Number>        tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT tDST
-%type   <Number>        tSEC_UNIT tSNUMBER tUNUMBER tZONE
-%type   <Meridian>      tMERIDIAN o_merid
-
-%%
-
-spec    : /* NULL */
-        | spec item
-        ;
-
-item    : time {
-            yyHaveTime++;
-        }
-        | zone {
-            yyHaveZone++;
-        }
-        | date {
-            yyHaveDate++;
-        }
-        | day {
-            yyHaveDay++;
-        }
-        | rel {
-            yyHaveRel++;
-        }
-        | number
-        ;
-
-time    : tUNUMBER tMERIDIAN {
-            yyHour = $1;
-            yyMinutes = 0;
-            yySeconds = 0;
-            yyMeridian = $2;
-        }
-        | tUNUMBER ':' tUNUMBER o_merid {
-            yyHour = $1;
-            yyMinutes = $3;
-            yySeconds = 0;
-            yyMeridian = $4;
-        }
-        | tUNUMBER ':' tUNUMBER tSNUMBER {
-            yyHour = $1;
-            yyMinutes = $3;
-            yyMeridian = MER24;
-            yyDSTmode = DSToff;
-            yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
-        }
-        | tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
-            yyHour = $1;
-            yyMinutes = $3;
-            yySeconds = $5;
-            yyMeridian = $6;
-        }
-        | tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
-            yyHour = $1;
-            yyMinutes = $3;
-            yySeconds = $5;
-            yyMeridian = MER24;
-            yyDSTmode = DSToff;
-            yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
-        }
-        ;
-
-zone    : tZONE tDST {
-            yyTimezone = $1;
-            yyDSTmode = DSTon;
-        }
-        | tZONE {
-            yyTimezone = $1;
-            yyDSTmode = DSToff;
-        }
-        | tDAYZONE {
-            yyTimezone = $1;
-            yyDSTmode = DSTon;
-        }
-        ;
-
-day     : tDAY {
-            yyDayOrdinal = 1;
-            yyDayNumber = $1;
-        }
-        | tDAY ',' {
-            yyDayOrdinal = 1;
-            yyDayNumber = $1;
-        }
-        | tUNUMBER tDAY {
-            yyDayOrdinal = $1;
-            yyDayNumber = $2;
-        }
-        ;
-
-date    : tUNUMBER '/' tUNUMBER {
-            yyMonth = $1;
-            yyDay = $3;
-        }
-        | tUNUMBER '/' tUNUMBER '/' tUNUMBER {
-            yyMonth = $1;
-            yyDay = $3;
-            yyYear = $5;
-        }
-        | tMONTH tUNUMBER {
-            yyMonth = $1;
-            yyDay = $2;
-        }
-        | tMONTH tUNUMBER ',' tUNUMBER {
-            yyMonth = $1;
-            yyDay = $2;
-            yyYear = $4;
-        }
-        | tUNUMBER tMONTH {
-            yyMonth = $2;
-            yyDay = $1;
-        }
-		  | tEPOCH {
-				yyMonth = 1;
-				yyDay = 1;
-				yyYear = EPOCH;
-		  }
-        | tUNUMBER tMONTH tUNUMBER {
-            yyMonth = $2;
-            yyDay = $1;
-            yyYear = $3;
-        }
-        ;
-
-rel     : relunit tAGO {
-            yyRelSeconds = -yyRelSeconds;
-            yyRelMonth = -yyRelMonth;
-        }
-        | relunit
-        ;
-
-relunit : tUNUMBER tMINUTE_UNIT {
-            yyRelSeconds += $1 * $2 * 60L;
-        }
-        | tSNUMBER tMINUTE_UNIT {
-            yyRelSeconds += $1 * $2 * 60L;
-        }
-        | tMINUTE_UNIT {
-            yyRelSeconds += $1 * 60L;
-        }
-        | tSNUMBER tSEC_UNIT {
-            yyRelSeconds += $1;
-        }
-        | tUNUMBER tSEC_UNIT {
-            yyRelSeconds += $1;
-        }
-        | tSEC_UNIT {
-            yyRelSeconds++;
-        }
-        | tSNUMBER tMONTH_UNIT {
-            yyRelMonth += $1 * $2;
-        }
-        | tUNUMBER tMONTH_UNIT {
-            yyRelMonth += $1 * $2;
-        }
-        | tMONTH_UNIT {
-            yyRelMonth += $1;
-        }
-        ;
-
-number  : tUNUMBER
-    {
-	if (yyHaveTime && yyHaveDate && !yyHaveRel) {
-	    yyYear = $1;
-	} else {
-	    yyHaveTime++;
-	    if ($1 < 100) {
-		yyHour = 0;
-		yyMinutes = $1;
-	    } else {
-		yyHour = $1 / 100;
-		yyMinutes = $1 % 100;
-	    }
-	    yySeconds = 0;
-	    yyMeridian = MER24;
-	}
-    }
-;
-
-o_merid : /* NULL */ {
-            $$ = MER24;
-        }
-        | tMERIDIAN {
-            $$ = $1;
-        }
-        ;
-
-%%
-
-/*
- * Month and day table.
- */
-static TABLE    MonthDayTable[] = {
-    { "january",        tMONTH,  1 },
-    { "february",       tMONTH,  2 },
-    { "march",          tMONTH,  3 },
-    { "april",          tMONTH,  4 },
-    { "may",            tMONTH,  5 },
-    { "june",           tMONTH,  6 },
-    { "july",           tMONTH,  7 },
-    { "august",         tMONTH,  8 },
-    { "september",      tMONTH,  9 },
-    { "sept",           tMONTH,  9 },
-    { "october",        tMONTH, 10 },
-    { "november",       tMONTH, 11 },
-    { "december",       tMONTH, 12 },
-    { "sunday",         tDAY, 0 },
-    { "monday",         tDAY, 1 },
-    { "tuesday",        tDAY, 2 },
-    { "tues",           tDAY, 2 },
-    { "wednesday",      tDAY, 3 },
-    { "wednes",         tDAY, 3 },
-    { "thursday",       tDAY, 4 },
-    { "thur",           tDAY, 4 },
-    { "thurs",          tDAY, 4 },
-    { "friday",         tDAY, 5 },
-    { "saturday",       tDAY, 6 },
-    { NULL }
-};
-
-/*
- * Time units table.
- */
-static TABLE    UnitsTable[] = {
-    { "year",           tMONTH_UNIT,    12 },
-    { "month",          tMONTH_UNIT,    1 },
-    { "fortnight",      tMINUTE_UNIT,   14 * 24 * 60 },
-    { "week",           tMINUTE_UNIT,   7 * 24 * 60 },
-    { "day",            tMINUTE_UNIT,   1 * 24 * 60 },
-    { "hour",           tMINUTE_UNIT,   60 },
-    { "minute",         tMINUTE_UNIT,   1 },
-    { "min",            tMINUTE_UNIT,   1 },
-    { "second",         tSEC_UNIT,      1 },
-    { "sec",            tSEC_UNIT,      1 },
-    { NULL }
-};
-
-/*
- * Assorted relative-time words.
- */
-static TABLE    OtherTable[] = {
-    { "tomorrow",       tMINUTE_UNIT,   1 * 24 * 60 },
-    { "yesterday",      tMINUTE_UNIT,   -1 * 24 * 60 },
-    { "today",          tMINUTE_UNIT,   0 },
-    { "now",            tMINUTE_UNIT,   0 },
-    { "last",           tUNUMBER,       -1 },
-    { "this",           tMINUTE_UNIT,   0 },
-    { "next",           tUNUMBER,       2 },
-#if 0
-    { "first",          tUNUMBER,       1 },
-/*  { "second",         tUNUMBER,       2 }, */
-    { "third",          tUNUMBER,       3 },
-    { "fourth",         tUNUMBER,       4 },
-    { "fifth",          tUNUMBER,       5 },
-    { "sixth",          tUNUMBER,       6 },
-    { "seventh",        tUNUMBER,       7 },
-    { "eighth",         tUNUMBER,       8 },
-    { "ninth",          tUNUMBER,       9 },
-    { "tenth",          tUNUMBER,       10 },
-    { "eleventh",       tUNUMBER,       11 },
-    { "twelfth",        tUNUMBER,       12 },
-#endif
-    { "ago",            tAGO,   1 },
-    { "epoch",          tEPOCH,   0 },
-    { NULL }
-};
-
-/*
- * The timezone table.  (Note: This table was modified to not use any floating
- * point constants to work around an SGI compiler bug).
- */
-static TABLE    TimezoneTable[] = {
-    { "gmt",    tZONE,     HOUR( 0) },      /* Greenwich Mean */
-    { "ut",     tZONE,     HOUR( 0) },      /* Universal (Coordinated) */
-    { "utc",    tZONE,     HOUR( 0) },
-    { "wet",    tZONE,     HOUR( 0) } ,     /* Western European */
-    { "bst",    tDAYZONE,  HOUR( 0) },      /* British Summer */
-    { "wat",    tZONE,     HOUR( 1) },      /* West Africa */
-    { "at",     tZONE,     HOUR( 2) },      /* Azores */
-#if     0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",    tZONE,     HOUR( 3) },      /* Brazil Standard */
-    { "gst",    tZONE,     HOUR( 3) },      /* Greenland Standard */
-#endif
-    { "nft",    tZONE,     HOUR( 7/2) },    /* Newfoundland */
-    { "nst",    tZONE,     HOUR( 7/2) },    /* Newfoundland Standard */
-    { "ndt",    tDAYZONE,  HOUR( 7/2) },    /* Newfoundland Daylight */
-    { "ast",    tZONE,     HOUR( 4) },      /* Atlantic Standard */
-    { "adt",    tDAYZONE,  HOUR( 4) },      /* Atlantic Daylight */
-    { "est",    tZONE,     HOUR( 5) },      /* Eastern Standard */
-    { "edt",    tDAYZONE,  HOUR( 5) },      /* Eastern Daylight */
-    { "cst",    tZONE,     HOUR( 6) },      /* Central Standard */
-    { "cdt",    tDAYZONE,  HOUR( 6) },      /* Central Daylight */
-    { "mst",    tZONE,     HOUR( 7) },      /* Mountain Standard */
-    { "mdt",    tDAYZONE,  HOUR( 7) },      /* Mountain Daylight */
-    { "pst",    tZONE,     HOUR( 8) },      /* Pacific Standard */
-    { "pdt",    tDAYZONE,  HOUR( 8) },      /* Pacific Daylight */
-    { "yst",    tZONE,     HOUR( 9) },      /* Yukon Standard */
-    { "ydt",    tDAYZONE,  HOUR( 9) },      /* Yukon Daylight */
-    { "hst",    tZONE,     HOUR(10) },      /* Hawaii Standard */
-    { "hdt",    tDAYZONE,  HOUR(10) },      /* Hawaii Daylight */
-    { "cat",    tZONE,     HOUR(10) },      /* Central Alaska */
-    { "ahst",   tZONE,     HOUR(10) },      /* Alaska-Hawaii Standard */
-    { "nt",     tZONE,     HOUR(11) },      /* Nome */
-    { "idlw",   tZONE,     HOUR(12) },      /* International Date Line West */
-    { "cet",    tZONE,    -HOUR( 1) },      /* Central European */
-    { "met",    tZONE,    -HOUR( 1) },      /* Middle European */
-    { "mewt",   tZONE,    -HOUR( 1) },      /* Middle European Winter */
-    { "mest",   tDAYZONE, -HOUR( 1) },      /* Middle European Summer */
-    { "swt",    tZONE,    -HOUR( 1) },      /* Swedish Winter */
-    { "sst",    tDAYZONE, -HOUR( 1) },      /* Swedish Summer */
-    { "fwt",    tZONE,    -HOUR( 1) },      /* French Winter */
-    { "fst",    tDAYZONE, -HOUR( 1) },      /* French Summer */
-    { "eet",    tZONE,    -HOUR( 2) },      /* Eastern Europe, USSR Zone 1 */
-    { "bt",     tZONE,    -HOUR( 3) },      /* Baghdad, USSR Zone 2 */
-    { "it",     tZONE,    -HOUR( 7/2) },    /* Iran */
-    { "zp4",    tZONE,    -HOUR( 4) },      /* USSR Zone 3 */
-    { "zp5",    tZONE,    -HOUR( 5) },      /* USSR Zone 4 */
-    { "ist",    tZONE,    -HOUR(11/2) },    /* Indian Standard */
-    { "zp6",    tZONE,    -HOUR( 6) },      /* USSR Zone 5 */
-#if     0
-    /* For completeness.  NST is also Newfoundland Stanard, nad SST is
-     * also Swedish Summer. */
-    { "nst",    tZONE,    -HOUR(13/2) },    /* North Sumatra */
-    { "sst",    tZONE,    -HOUR( 7) },      /* South Sumatra, USSR Zone 6 */
-#endif  /* 0 */
-    { "wast",   tZONE,    -HOUR( 7) },      /* West Australian Standard */
-    { "wadt",   tDAYZONE, -HOUR( 7) },      /* West Australian Daylight */
-    { "jt",     tZONE,    -HOUR(15/2) },    /* Java (3pm in Cronusland!) */
-    { "cct",    tZONE,    -HOUR( 8) },      /* China Coast, USSR Zone 7 */
-    { "jst",    tZONE,    -HOUR( 9) },      /* Japan Standard, USSR Zone 8 */
-    { "cast",   tZONE,    -HOUR(19/2) },    /* Central Australian Standard */
-    { "cadt",   tDAYZONE, -HOUR(19/2) },    /* Central Australian Daylight */
-    { "east",   tZONE,    -HOUR(10) },      /* Eastern Australian Standard */
-    { "eadt",   tDAYZONE, -HOUR(10) },      /* Eastern Australian Daylight */
-    { "gst",    tZONE,    -HOUR(10) },      /* Guam Standard, USSR Zone 9 */
-    { "nzt",    tZONE,    -HOUR(12) },      /* New Zealand */
-    { "nzst",   tZONE,    -HOUR(12) },      /* New Zealand Standard */
-    { "nzdt",   tDAYZONE, -HOUR(12) },      /* New Zealand Daylight */
-    { "idle",   tZONE,    -HOUR(12) },      /* International Date Line East */
-    /* ADDED BY Marco Nijdam */
-    { "dst",    tDST,     HOUR( 0) },       /* DST on (hour is ignored) */
-    /* End ADDED */
-    {  NULL  }
-};
-
-/*
- * Military timezone table.
- */
-static TABLE    MilitaryTable[] = {
-    { "a",      tZONE,  HOUR(  1) },
-    { "b",      tZONE,  HOUR(  2) },
-    { "c",      tZONE,  HOUR(  3) },
-    { "d",      tZONE,  HOUR(  4) },
-    { "e",      tZONE,  HOUR(  5) },
-    { "f",      tZONE,  HOUR(  6) },
-    { "g",      tZONE,  HOUR(  7) },
-    { "h",      tZONE,  HOUR(  8) },
-    { "i",      tZONE,  HOUR(  9) },
-    { "k",      tZONE,  HOUR( 10) },
-    { "l",      tZONE,  HOUR( 11) },
-    { "m",      tZONE,  HOUR( 12) },
-    { "n",      tZONE,  HOUR(- 1) },
-    { "o",      tZONE,  HOUR(- 2) },
-    { "p",      tZONE,  HOUR(- 3) },
-    { "q",      tZONE,  HOUR(- 4) },
-    { "r",      tZONE,  HOUR(- 5) },
-    { "s",      tZONE,  HOUR(- 6) },
-    { "t",      tZONE,  HOUR(- 7) },
-    { "u",      tZONE,  HOUR(- 8) },
-    { "v",      tZONE,  HOUR(- 9) },
-    { "w",      tZONE,  HOUR(-10) },
-    { "x",      tZONE,  HOUR(-11) },
-    { "y",      tZONE,  HOUR(-12) },
-    { "z",      tZONE,  HOUR(  0) },
-    { NULL }
-};
-
-
-/*
- * Dump error messages in the bit bucket.
- */
-static void
-yyerror(s)
-    char  *s;
-{
-}
-
-
-static time_t
-ToSeconds(Hours, Minutes, Seconds, Meridian)
-    time_t      Hours;
-    time_t      Minutes;
-    time_t      Seconds;
-    MERIDIAN    Meridian;
-{
-    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
-        return -1;
-    switch (Meridian) {
-    case MER24:
-        if (Hours < 0 || Hours > 23)
-            return -1;
-        return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERam:
-        if (Hours < 1 || Hours > 12)
-            return -1;
-        return ((Hours % 12) * 60L + Minutes) * 60L + Seconds;
-    case MERpm:
-        if (Hours < 1 || Hours > 12)
-            return -1;
-        return (((Hours % 12) + 12) * 60L + Minutes) * 60L + Seconds;
-    }
-    return -1;  /* Should never be reached */
-}
-
-
-static int
-Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode, TimePtr)
-    time_t      Month;
-    time_t      Day;
-    time_t      Year;
-    time_t      Hours;
-    time_t      Minutes;
-    time_t      Seconds;
-    MERIDIAN    Meridian;
-    DSTMODE     DSTmode;
-    time_t     *TimePtr;
-{
-    static int  DaysInMonth[12] = {
-        31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-    };
-    time_t tod;
-    time_t Julian;
-    int i;
-
-    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
-                    ? 29 : 28;
-    if (Month < 1 || Month > 12
-     || Year < START_OF_TIME || Year > END_OF_TIME
-     || Day < 1 || Day > DaysInMonth[(int)--Month])
-        return -1;
-
-    for (Julian = Day - 1, i = 0; i < Month; i++)
-        Julian += DaysInMonth[i];
-    if (Year >= EPOCH) {
-        for (i = EPOCH; i < Year; i++)
-            Julian += 365 + (i % 4 == 0);
-    } else {
-        for (i = Year; i < EPOCH; i++)
-            Julian -= 365 + (i % 4 == 0);
-    }
-    Julian *= SECSPERDAY;
-    Julian += yyTimezone * 60L;
-    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
-        return -1;
-    Julian += tod;
-    if (DSTmode == DSTon
-     || (DSTmode == DSTmaybe && TclpGetDate((TclpTime_t)&Julian, 0)->tm_isdst))
-        Julian -= 60 * 60;
-    *TimePtr = Julian;
-    return 0;
-}
-
-
-static time_t
-DSTcorrect(Start, Future)
-    time_t      Start;
-    time_t      Future;
-{
-    time_t      StartDay;
-    time_t      FutureDay;
-
-    StartDay = (TclpGetDate((TclpTime_t)&Start, 0)->tm_hour + 1) % 24;
-    FutureDay = (TclpGetDate((TclpTime_t)&Future, 0)->tm_hour + 1) % 24;
-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-}
-
-
-static time_t
-RelativeDate(Start, DayOrdinal, DayNumber)
-    time_t      Start;
-    time_t      DayOrdinal;
-    time_t      DayNumber;
-{
-    struct tm   *tm;
-    time_t      now;
-
-    now = Start;
-    tm = TclpGetDate((TclpTime_t)&now, 0);
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-    return DSTcorrect(Start, now);
-}
-
-
-static int
-RelativeMonth(Start, RelMonth, TimePtr)
-    time_t Start;
-    time_t RelMonth;
-    time_t *TimePtr;
-{
-    struct tm *tm;
-    time_t Month;
-    time_t Year;
-    time_t Julian;
-    int result;
-
-    if (RelMonth == 0) {
-        *TimePtr = 0;
-        return 0;
-    }
-    tm = TclpGetDate((TclpTime_t)&Start, 0);
-    Month = 12 * (tm->tm_year + TM_YEAR_BASE) + tm->tm_mon + RelMonth;
-    Year = Month / 12;
-    Month = Month % 12 + 1;
-    result = Convert(Month, (time_t) tm->tm_mday, Year,
-	    (time_t) tm->tm_hour, (time_t) tm->tm_min, (time_t) tm->tm_sec,
-	    MER24, DSTmaybe, &Julian);
-    /*
-     * The following iteration takes into account the case were we jump
-     * into a "short month".  Far example, "one month from Jan 31" will
-     * fail because there is no Feb 31.  The code below will reduce the
-     * day and try converting the date until we succed or the date equals
-     * 28 (which always works unless the date is bad in another way).
-     */
-
-    while ((result != 0) && (tm->tm_mday > 28)) {
-	tm->tm_mday--;
-	result = Convert(Month, (time_t) tm->tm_mday, Year,
-		(time_t) tm->tm_hour, (time_t) tm->tm_min, (time_t) tm->tm_sec,
-		MER24, DSTmaybe, &Julian);
-    }
-    if (result != 0) {
-	return -1;
-    }
-    *TimePtr = DSTcorrect(Start, Julian);
-    return 0;
-}
-
-
-static int
-LookupWord(buff)
-    char                *buff;
-{
-    register char *p;
-    register char *q;
-    register TABLE *tp;
-    int i;
-    int abbrev;
-
-    /*
-     * Make it lowercase.
-     */
-
-    Tcl_UtfToLower(buff);
-
-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-        yylval.Meridian = MERam;
-        return tMERIDIAN;
-    }
-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-        yylval.Meridian = MERpm;
-        return tMERIDIAN;
-    }
-
-    /*
-     * See if we have an abbreviation for a month.
-     */
-    if (strlen(buff) == 3) {
-        abbrev = 1;
-    } else if (strlen(buff) == 4 && buff[3] == '.') {
-        abbrev = 1;
-        buff[3] = '\0';
-    } else {
-        abbrev = 0;
-    }
-
-    for (tp = MonthDayTable; tp->name; tp++) {
-        if (abbrev) {
-            if (strncmp(buff, tp->name, 3) == 0) {
-                yylval.Number = tp->value;
-                return tp->type;
-            }
-        } else if (strcmp(buff, tp->name) == 0) {
-            yylval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    for (tp = TimezoneTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            yylval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    for (tp = UnitsTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            yylval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    /*
-     * Strip off any plural and try the units table again.
-     */
-    i = strlen(buff) - 1;
-    if (buff[i] == 's') {
-        buff[i] = '\0';
-        for (tp = UnitsTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                yylval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-
-    for (tp = OtherTable; tp->name; tp++) {
-        if (strcmp(buff, tp->name) == 0) {
-            yylval.Number = tp->value;
-            return tp->type;
-        }
-    }
-
-    /*
-     * Military timezones.
-     */
-    if (buff[1] == '\0' && !(*buff & 0x80)
-	    && isalpha(UCHAR(*buff))) {	/* INTL: ISO only */
-        for (tp = MilitaryTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                yylval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-
-    /*
-     * Drop out any periods and try the timezone table again.
-     */
-    for (i = 0, p = q = buff; *q; q++)
-        if (*q != '.') {
-            *p++ = *q;
-        } else {
-            i++;
-	}
-    *p = '\0';
-    if (i) {
-        for (tp = TimezoneTable; tp->name; tp++) {
-            if (strcmp(buff, tp->name) == 0) {
-                yylval.Number = tp->value;
-                return tp->type;
-            }
-	}
-    }
-    
-    return tID;
-}
-
-
-static int
-yylex()
-{
-    register char       c;
-    register char       *p;
-    char                buff[20];
-    int                 Count;
-    int                 sign;
-
-    for ( ; ; ) {
-        while (isspace((unsigned char) (*yyInput))) {
-            yyInput++;
-	}
-
-        if (isdigit(c = *yyInput) || c == '-' || c == '+') { /* INTL: digit */
-            if (c == '-' || c == '+') {
-                sign = c == '-' ? -1 : 1;
-                if (!isdigit(*++yyInput)) { /* INTL: digit */
-                    /*
-		     * skip the '-' sign
-		     */
-                    continue;
-		}
-            } else {
-                sign = 0;
-	    }
-            for (yylval.Number = 0;
-		    isdigit(c = *yyInput++); ) { /* INTL: digit */
-                yylval.Number = 10 * yylval.Number + c - '0';
-	    }
-            yyInput--;
-            if (sign < 0) {
-                yylval.Number = -yylval.Number;
-	    }
-            return sign ? tSNUMBER : tUNUMBER;
-        }
-        if (!(c & 0x80) && isalpha(UCHAR(c))) {	/* INTL: ISO only. */
-            for (p = buff; isalpha(c = *yyInput++) /* INTL: ISO only. */
-		     || c == '.'; ) {
-                if (p < &buff[sizeof buff - 1]) {
-                    *p++ = c;
-		}
-	    }
-            *p = '\0';
-            yyInput--;
-            return LookupWord(buff);
-        }
-        if (c != '(') {
-            return *yyInput++;
-	}
-        Count = 0;
-        do {
-            c = *yyInput++;
-            if (c == '\0') {
-                return c;
-	    } else if (c == '(') {
-                Count++;
-	    } else if (c == ')') {
-                Count--;
-	    }
-        } while (Count > 0);
-    }
-}
-
-/*
- * Specify zone is of -50000 to force GMT.  (This allows BST to work).
- */
-
-int
-TclGetDate(p, now, zone, timePtr)
-    char *p;
-    unsigned long now;
-    long zone;
-    unsigned long *timePtr;
-{
-    struct tm *tm;
-    time_t Start;
-    time_t Time;
-    time_t tod;
-    int thisyear;
-
-    yyInput = p;
-    tm = TclpGetDate((TclpTime_t) &now, 0);
-    thisyear = tm->tm_year + TM_YEAR_BASE;
-    yyYear = thisyear;
-    yyMonth = tm->tm_mon + 1;
-    yyDay = tm->tm_mday;
-    yyTimezone = zone;
-    if (zone == -50000) {
-        yyDSTmode = DSToff;  /* assume GMT */
-        yyTimezone = 0;
-    } else {
-        yyDSTmode = DSTmaybe;
-    }
-    yyHour = 0;
-    yyMinutes = 0;
-    yySeconds = 0;
-    yyMeridian = MER24;
-    yyRelSeconds = 0;
-    yyRelMonth = 0;
-    yyHaveDate = 0;
-    yyHaveDay = 0;
-    yyHaveRel = 0;
-    yyHaveTime = 0;
-    yyHaveZone = 0;
-
-    if (yyparse() || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 ||
-	    yyHaveDay > 1) {
-        return -1;
-    }
-    
-    if (yyHaveDate || yyHaveTime || yyHaveDay) {
-	if (TclDateYear < 0) {
-	    TclDateYear = -TclDateYear;
-	}
-	/*
-	 * The following line handles years that are specified using
-	 * only two digits.  The line of code below implements a policy
-	 * defined by the X/Open workgroup on the millinium rollover.
-	 * Note: some of those dates may not actually be valid on some
-	 * platforms.  The POSIX standard startes that the dates 70-99
-	 * shall refer to 1970-1999 and 00-38 shall refer to 2000-2038.
-	 * This later definition should work on all platforms.
-	 */
-
-	if (TclDateYear < 100) {
-	    if (TclDateYear >= 69) {
-		TclDateYear += 1900;
-	    } else {
-		TclDateYear += 2000;
-	    }
-	}
-	if (Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds,
-		yyMeridian, yyDSTmode, &Start) < 0) {
-            return -1;
-	}
-    } else {
-        Start = now;
-        if (!yyHaveRel) {
-            Start -= ((tm->tm_hour * 60L) + tm->tm_min * 60L) + tm->tm_sec;
-	}
-    }
-
-    Start += yyRelSeconds;
-    if (RelativeMonth(Start, yyRelMonth, &Time) < 0) {
-        return -1;
-    }
-    Start += Time;
-
-    if (yyHaveDay && !yyHaveDate) {
-        tod = RelativeDate(Start, yyDayOrdinal, yyDayNumber);
-        Start += tod;
-    }
-
-    *timePtr = Start;
-    return 0;
-}
diff --git a/generic/tclHash.c b/generic/tclHash.c
deleted file mode 100644
index 973c003..0000000
--- a/generic/tclHash.c
+++ /dev/null
@@ -1,926 +0,0 @@
-/* 
- * tclHash.c --
- *
- *	Implementation of in-memory hash tables for Tcl and Tcl-based
- *	applications.
- *
- * Copyright (c) 1991-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclHash.c,v 1.3 1999/04/16 00:46:46 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * When there are this many entries per bucket, on average, rebuild
- * the hash table to make it larger.
- */
-
-#define REBUILD_MULTIPLIER	3
-
-
-/*
- * The following macro takes a preliminary integer hash value and
- * produces an index into a hash tables bucket list.  The idea is
- * to make it so that preliminary values that are arbitrarily similar
- * will end up in different buckets.  The hash function was taken
- * from a random-number generator.
- */
-
-#define RANDOM_INDEX(tablePtr, i) \
-    (((((long) (i))*1103515245) >> (tablePtr)->downShift) & (tablePtr)->mask)
-
-/*
- * Procedure prototypes for static procedures in this file:
- */
-
-static Tcl_HashEntry *	ArrayFind _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key));
-static Tcl_HashEntry *	ArrayCreate _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key, int *newPtr));
-static Tcl_HashEntry *	BogusFind _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key));
-static Tcl_HashEntry *	BogusCreate _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key, int *newPtr));
-static unsigned int	HashString _ANSI_ARGS_((CONST char *string));
-static void		RebuildTable _ANSI_ARGS_((Tcl_HashTable *tablePtr));
-static Tcl_HashEntry *	StringFind _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key));
-static Tcl_HashEntry *	StringCreate _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key, int *newPtr));
-static Tcl_HashEntry *	OneWordFind _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key));
-static Tcl_HashEntry *	OneWordCreate _ANSI_ARGS_((Tcl_HashTable *tablePtr,
-			    CONST char *key, int *newPtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitHashTable --
- *
- *	Given storage for a hash table, set up the fields to prepare
- *	the hash table for use.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	TablePtr is now ready to be passed to Tcl_FindHashEntry and
- *	Tcl_CreateHashEntry.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_InitHashTable(tablePtr, keyType)
-    register Tcl_HashTable *tablePtr;	/* Pointer to table record, which
-					 * is supplied by the caller. */
-    int keyType;			/* Type of keys to use in table:
-					 * TCL_STRING_KEYS, TCL_ONE_WORD_KEYS,
-					 * or an integer >= 2. */
-{
-#if (TCL_SMALL_HASH_TABLE != 4) 
-    panic("Tcl_InitHashTable: TCL_SMALL_HASH_TABLE is %d, not 4\n",
-	    TCL_SMALL_HASH_TABLE);
-#endif
-    
-    tablePtr->buckets = tablePtr->staticBuckets;
-    tablePtr->staticBuckets[0] = tablePtr->staticBuckets[1] = 0;
-    tablePtr->staticBuckets[2] = tablePtr->staticBuckets[3] = 0;
-    tablePtr->numBuckets = TCL_SMALL_HASH_TABLE;
-    tablePtr->numEntries = 0;
-    tablePtr->rebuildSize = TCL_SMALL_HASH_TABLE*REBUILD_MULTIPLIER;
-    tablePtr->downShift = 28;
-    tablePtr->mask = 3;
-    tablePtr->keyType = keyType;
-    if (keyType == TCL_STRING_KEYS) {
-	tablePtr->findProc = StringFind;
-	tablePtr->createProc = StringCreate;
-    } else if (keyType == TCL_ONE_WORD_KEYS) {
-	tablePtr->findProc = OneWordFind;
-	tablePtr->createProc = OneWordCreate;
-    } else {
-	tablePtr->findProc = ArrayFind;
-	tablePtr->createProc = ArrayCreate;
-    };
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteHashEntry --
- *
- *	Remove a single entry from a hash table.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The entry given by entryPtr is deleted from its table and
- *	should never again be used by the caller.  It is up to the
- *	caller to free the clientData field of the entry, if that
- *	is relevant.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteHashEntry(entryPtr)
-    Tcl_HashEntry *entryPtr;
-{
-    register Tcl_HashEntry *prevPtr;
-
-    if (*entryPtr->bucketPtr == entryPtr) {
-	*entryPtr->bucketPtr = entryPtr->nextPtr;
-    } else {
-	for (prevPtr = *entryPtr->bucketPtr; ; prevPtr = prevPtr->nextPtr) {
-	    if (prevPtr == NULL) {
-		panic("malformed bucket chain in Tcl_DeleteHashEntry");
-	    }
-	    if (prevPtr->nextPtr == entryPtr) {
-		prevPtr->nextPtr = entryPtr->nextPtr;
-		break;
-	    }
-	}
-    }
-    entryPtr->tablePtr->numEntries--;
-    ckfree((char *) entryPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteHashTable --
- *
- *	Free up everything associated with a hash table except for
- *	the record for the table itself.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The hash table is no longer useable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteHashTable(tablePtr)
-    register Tcl_HashTable *tablePtr;		/* Table to delete. */
-{
-    register Tcl_HashEntry *hPtr, *nextPtr;
-    int i;
-
-    /*
-     * Free up all the entries in the table.
-     */
-
-    for (i = 0; i < tablePtr->numBuckets; i++) {
-	hPtr = tablePtr->buckets[i];
-	while (hPtr != NULL) {
-	    nextPtr = hPtr->nextPtr;
-	    ckfree((char *) hPtr);
-	    hPtr = nextPtr;
-	}
-    }
-
-    /*
-     * Free up the bucket array, if it was dynamically allocated.
-     */
-
-    if (tablePtr->buckets != tablePtr->staticBuckets) {
-	ckfree((char *) tablePtr->buckets);
-    }
-
-    /*
-     * Arrange for panics if the table is used again without
-     * re-initialization.
-     */
-
-    tablePtr->findProc = BogusFind;
-    tablePtr->createProc = BogusCreate;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FirstHashEntry --
- *
- *	Locate the first entry in a hash table and set up a record
- *	that can be used to step through all the remaining entries
- *	of the table.
- *
- * Results:
- *	The return value is a pointer to the first entry in tablePtr,
- *	or NULL if tablePtr has no entries in it.  The memory at
- *	*searchPtr is initialized so that subsequent calls to
- *	Tcl_NextHashEntry will return all of the entries in the table,
- *	one at a time.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_HashEntry *
-Tcl_FirstHashEntry(tablePtr, searchPtr)
-    Tcl_HashTable *tablePtr;		/* Table to search. */
-    Tcl_HashSearch *searchPtr;		/* Place to store information about
-					 * progress through the table. */
-{
-    searchPtr->tablePtr = tablePtr;
-    searchPtr->nextIndex = 0;
-    searchPtr->nextEntryPtr = NULL;
-    return Tcl_NextHashEntry(searchPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NextHashEntry --
- *
- *	Once a hash table enumeration has been initiated by calling
- *	Tcl_FirstHashEntry, this procedure may be called to return
- *	successive elements of the table.
- *
- * Results:
- *	The return value is the next entry in the hash table being
- *	enumerated, or NULL if the end of the table is reached.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_HashEntry *
-Tcl_NextHashEntry(searchPtr)
-    register Tcl_HashSearch *searchPtr;	/* Place to store information about
-					 * progress through the table.  Must
-					 * have been initialized by calling
-					 * Tcl_FirstHashEntry. */
-{
-    Tcl_HashEntry *hPtr;
-
-    while (searchPtr->nextEntryPtr == NULL) {
-	if (searchPtr->nextIndex >= searchPtr->tablePtr->numBuckets) {
-	    return NULL;
-	}
-	searchPtr->nextEntryPtr =
-		searchPtr->tablePtr->buckets[searchPtr->nextIndex];
-	searchPtr->nextIndex++;
-    }
-    hPtr = searchPtr->nextEntryPtr;
-    searchPtr->nextEntryPtr = hPtr->nextPtr;
-    return hPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_HashStats --
- *
- *	Return statistics describing the layout of the hash table
- *	in its hash buckets.
- *
- * Results:
- *	The return value is a malloc-ed string containing information
- *	about tablePtr.  It is the caller's responsibility to free
- *	this string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_HashStats(tablePtr)
-    Tcl_HashTable *tablePtr;		/* Table for which to produce stats. */
-{
-#define NUM_COUNTERS 10
-    int count[NUM_COUNTERS], overflow, i, j;
-    double average, tmp;
-    register Tcl_HashEntry *hPtr;
-    char *result, *p;
-
-    /*
-     * Compute a histogram of bucket usage.
-     */
-
-    for (i = 0; i < NUM_COUNTERS; i++) {
-	count[i] = 0;
-    }
-    overflow = 0;
-    average = 0.0;
-    for (i = 0; i < tablePtr->numBuckets; i++) {
-	j = 0;
-	for (hPtr = tablePtr->buckets[i]; hPtr != NULL; hPtr = hPtr->nextPtr) {
-	    j++;
-	}
-	if (j < NUM_COUNTERS) {
-	    count[j]++;
-	} else {
-	    overflow++;
-	}
-	tmp = j;
-	average += (tmp+1.0)*(tmp/tablePtr->numEntries)/2.0;
-    }
-
-    /*
-     * Print out the histogram and a few other pieces of information.
-     */
-
-    result = (char *) ckalloc((unsigned) ((NUM_COUNTERS*60) + 300));
-    sprintf(result, "%d entries in table, %d buckets\n",
-	    tablePtr->numEntries, tablePtr->numBuckets);
-    p = result + strlen(result);
-    for (i = 0; i < NUM_COUNTERS; i++) {
-	sprintf(p, "number of buckets with %d entries: %d\n",
-		i, count[i]);
-	p += strlen(p);
-    }
-    sprintf(p, "number of buckets with %d or more entries: %d\n",
-	    NUM_COUNTERS, overflow);
-    p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * HashString --
- *
- *	Compute a one-word summary of a text string, which can be
- *	used to generate a hash index.
- *
- * Results:
- *	The return value is a one-word summary of the information in
- *	string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static unsigned int
-HashString(string)
-    register CONST char *string;/* String from which to compute hash value. */
-{
-    register unsigned int result;
-    register int c;
-
-    /*
-     * I tried a zillion different hash functions and asked many other
-     * people for advice.  Many people had their own favorite functions,
-     * all different, but no-one had much idea why they were good ones.
-     * I chose the one below (multiply by 9 and add new character)
-     * because of the following reasons:
-     *
-     * 1. Multiplying by 10 is perfect for keys that are decimal strings,
-     *    and multiplying by 9 is just about as good.
-     * 2. Times-9 is (shift-left-3) plus (old).  This means that each
-     *    character's bits hang around in the low-order bits of the
-     *    hash value for ever, plus they spread fairly rapidly up to
-     *    the high-order bits to fill out the hash value.  This seems
-     *    works well both for decimal and non-decimal strings.
-     */
-
-    result = 0;
-    while (1) {
-	c = *string;
-	string++;
-	if (c == 0) {
-	    break;
-	}
-	result += (result<<3) + c;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StringFind --
- *
- *	Given a hash table with string keys, and a string key, find
- *	the entry with a matching key.
- *
- * Results:
- *	The return value is a token for the matching entry in the
- *	hash table, or NULL if there was no matching entry.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-StringFind(tablePtr, key)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    CONST char *key;		/* Key to use to find matching entry. */
-{
-    register Tcl_HashEntry *hPtr;
-    register CONST char *p1, *p2;
-    int index;
-
-    index = HashString(key) & tablePtr->mask;
-
-    /*
-     * Search all of the entries in the appropriate bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	for (p1 = key, p2 = hPtr->key.string; ; p1++, p2++) {
-	    if (*p1 != *p2) {
-		break;
-	    }
-	    if (*p1 == '\0') {
-		return hPtr;
-	    }
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StringCreate --
- *
- *	Given a hash table with string keys, and a string key, find
- *	the entry with a matching key.  If there is no matching entry,
- *	then create a new entry that does match.
- *
- * Results:
- *	The return value is a pointer to the matching entry.  If this
- *	is a newly-created entry, then *newPtr will be set to a non-zero
- *	value;  otherwise *newPtr will be set to 0.  If this is a new
- *	entry the value stored in the entry will initially be 0.
- *
- * Side effects:
- *	A new entry may be added to the hash table.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-StringCreate(tablePtr, key, newPtr)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    CONST char *key;		/* Key to use to find or create matching
-				 * entry. */
-    int *newPtr;		/* Store info here telling whether a new
-				 * entry was created. */
-{
-    register Tcl_HashEntry *hPtr;
-    register CONST char *p1, *p2;
-    int index;
-
-    index = HashString(key) & tablePtr->mask;
-
-    /*
-     * Search all of the entries in this bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	for (p1 = key, p2 = hPtr->key.string; ; p1++, p2++) {
-	    if (*p1 != *p2) {
-		break;
-	    }
-	    if (*p1 == '\0') {
-		*newPtr = 0;
-		return hPtr;
-	    }
-	}
-    }
-
-    /*
-     * Entry not found.  Add a new one to the bucket.
-     */
-
-    *newPtr = 1;
-    hPtr = (Tcl_HashEntry *) ckalloc((unsigned)
-	    (sizeof(Tcl_HashEntry) + strlen(key) - (sizeof(hPtr->key) -1)));
-    hPtr->tablePtr = tablePtr;
-    hPtr->bucketPtr = &(tablePtr->buckets[index]);
-    hPtr->nextPtr = *hPtr->bucketPtr;
-    hPtr->clientData = 0;
-    strcpy(hPtr->key.string, key);
-    *hPtr->bucketPtr = hPtr;
-    tablePtr->numEntries++;
-
-    /*
-     * If the table has exceeded a decent size, rebuild it with many
-     * more buckets.
-     */
-
-    if (tablePtr->numEntries >= tablePtr->rebuildSize) {
-	RebuildTable(tablePtr);
-    }
-    return hPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OneWordFind --
- *
- *	Given a hash table with one-word keys, and a one-word key, find
- *	the entry with a matching key.
- *
- * Results:
- *	The return value is a token for the matching entry in the
- *	hash table, or NULL if there was no matching entry.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-OneWordFind(tablePtr, key)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    register CONST char *key;	/* Key to use to find matching entry. */
-{
-    register Tcl_HashEntry *hPtr;
-    int index;
-
-    index = RANDOM_INDEX(tablePtr, key);
-
-    /*
-     * Search all of the entries in the appropriate bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	if (hPtr->key.oneWordValue == key) {
-	    return hPtr;
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OneWordCreate --
- *
- *	Given a hash table with one-word keys, and a one-word key, find
- *	the entry with a matching key.  If there is no matching entry,
- *	then create a new entry that does match.
- *
- * Results:
- *	The return value is a pointer to the matching entry.  If this
- *	is a newly-created entry, then *newPtr will be set to a non-zero
- *	value;  otherwise *newPtr will be set to 0.  If this is a new
- *	entry the value stored in the entry will initially be 0.
- *
- * Side effects:
- *	A new entry may be added to the hash table.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-OneWordCreate(tablePtr, key, newPtr)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    register CONST char *key;	/* Key to use to find or create matching
-				 * entry. */
-    int *newPtr;		/* Store info here telling whether a new
-				 * entry was created. */
-{
-    register Tcl_HashEntry *hPtr;
-    int index;
-
-    index = RANDOM_INDEX(tablePtr, key);
-
-    /*
-     * Search all of the entries in this bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	if (hPtr->key.oneWordValue == key) {
-	    *newPtr = 0;
-	    return hPtr;
-	}
-    }
-
-    /*
-     * Entry not found.  Add a new one to the bucket.
-     */
-
-    *newPtr = 1;
-    hPtr = (Tcl_HashEntry *) ckalloc(sizeof(Tcl_HashEntry));
-    hPtr->tablePtr = tablePtr;
-    hPtr->bucketPtr = &(tablePtr->buckets[index]);
-    hPtr->nextPtr = *hPtr->bucketPtr;
-    hPtr->clientData = 0;
-    hPtr->key.oneWordValue = (char *) key;	/* CONST XXXX */
-    *hPtr->bucketPtr = hPtr;
-    tablePtr->numEntries++;
-
-    /*
-     * If the table has exceeded a decent size, rebuild it with many
-     * more buckets.
-     */
-
-    if (tablePtr->numEntries >= tablePtr->rebuildSize) {
-	RebuildTable(tablePtr);
-    }
-    return hPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ArrayFind --
- *
- *	Given a hash table with array-of-int keys, and a key, find
- *	the entry with a matching key.
- *
- * Results:
- *	The return value is a token for the matching entry in the
- *	hash table, or NULL if there was no matching entry.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-ArrayFind(tablePtr, key)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    CONST char *key;		/* Key to use to find matching entry. */
-{
-    register Tcl_HashEntry *hPtr;
-    int *arrayPtr = (int *) key;
-    register int *iPtr1, *iPtr2;
-    int index, count;
-
-    for (index = 0, count = tablePtr->keyType, iPtr1 = arrayPtr;
-	    count > 0; count--, iPtr1++) {
-	index += *iPtr1;
-    }
-    index = RANDOM_INDEX(tablePtr, index);
-
-    /*
-     * Search all of the entries in the appropriate bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	for (iPtr1 = arrayPtr, iPtr2 = hPtr->key.words,
-		count = tablePtr->keyType; ; count--, iPtr1++, iPtr2++) {
-	    if (count == 0) {
-		return hPtr;
-	    }
-	    if (*iPtr1 != *iPtr2) {
-		break;
-	    }
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ArrayCreate --
- *
- *	Given a hash table with one-word keys, and a one-word key, find
- *	the entry with a matching key.  If there is no matching entry,
- *	then create a new entry that does match.
- *
- * Results:
- *	The return value is a pointer to the matching entry.  If this
- *	is a newly-created entry, then *newPtr will be set to a non-zero
- *	value;  otherwise *newPtr will be set to 0.  If this is a new
- *	entry the value stored in the entry will initially be 0.
- *
- * Side effects:
- *	A new entry may be added to the hash table.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashEntry *
-ArrayCreate(tablePtr, key, newPtr)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    register CONST char *key;	/* Key to use to find or create matching
-				 * entry. */
-    int *newPtr;		/* Store info here telling whether a new
-				 * entry was created. */
-{
-    register Tcl_HashEntry *hPtr;
-    int *arrayPtr = (int *) key;
-    register int *iPtr1, *iPtr2;
-    int index, count;
-
-    for (index = 0, count = tablePtr->keyType, iPtr1 = arrayPtr;
-	    count > 0; count--, iPtr1++) {
-	index += *iPtr1;
-    }
-    index = RANDOM_INDEX(tablePtr, index);
-
-    /*
-     * Search all of the entries in the appropriate bucket.
-     */
-
-    for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
-	    hPtr = hPtr->nextPtr) {
-	for (iPtr1 = arrayPtr, iPtr2 = hPtr->key.words,
-		count = tablePtr->keyType; ; count--, iPtr1++, iPtr2++) {
-	    if (count == 0) {
-		*newPtr = 0;
-		return hPtr;
-	    }
-	    if (*iPtr1 != *iPtr2) {
-		break;
-	    }
-	}
-    }
-
-    /*
-     * Entry not found.  Add a new one to the bucket.
-     */
-
-    *newPtr = 1;
-    hPtr = (Tcl_HashEntry *) ckalloc((unsigned) (sizeof(Tcl_HashEntry)
-	    + (tablePtr->keyType*sizeof(int)) - 4));
-    hPtr->tablePtr = tablePtr;
-    hPtr->bucketPtr = &(tablePtr->buckets[index]);
-    hPtr->nextPtr = *hPtr->bucketPtr;
-    hPtr->clientData = 0;
-    for (iPtr1 = arrayPtr, iPtr2 = hPtr->key.words, count = tablePtr->keyType;
-	    count > 0; count--, iPtr1++, iPtr2++) {
-	*iPtr2 = *iPtr1;
-    }
-    *hPtr->bucketPtr = hPtr;
-    tablePtr->numEntries++;
-
-    /*
-     * If the table has exceeded a decent size, rebuild it with many
-     * more buckets.
-     */
-
-    if (tablePtr->numEntries >= tablePtr->rebuildSize) {
-	RebuildTable(tablePtr);
-    }
-    return hPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * BogusFind --
- *
- *	This procedure is invoked when an Tcl_FindHashEntry is called
- *	on a table that has been deleted.
- *
- * Results:
- *	If panic returns (which it shouldn't) this procedure returns
- *	NULL.
- *
- * Side effects:
- *	Generates a panic.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static Tcl_HashEntry *
-BogusFind(tablePtr, key)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    CONST char *key;		/* Key to use to find matching entry. */
-{
-    panic("called Tcl_FindHashEntry on deleted table");
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * BogusCreate --
- *
- *	This procedure is invoked when an Tcl_CreateHashEntry is called
- *	on a table that has been deleted.
- *
- * Results:
- *	If panic returns (which it shouldn't) this procedure returns
- *	NULL.
- *
- * Side effects:
- *	Generates a panic.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static Tcl_HashEntry *
-BogusCreate(tablePtr, key, newPtr)
-    Tcl_HashTable *tablePtr;	/* Table in which to lookup entry. */
-    CONST char *key;		/* Key to use to find or create matching
-				 * entry. */
-    int *newPtr;		/* Store info here telling whether a new
-				 * entry was created. */
-{
-    panic("called Tcl_CreateHashEntry on deleted table");
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RebuildTable --
- *
- *	This procedure is invoked when the ratio of entries to hash
- *	buckets becomes too large.  It creates a new table with a
- *	larger bucket array and moves all of the entries into the
- *	new table.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory gets reallocated and entries get re-hashed to new
- *	buckets.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RebuildTable(tablePtr)
-    register Tcl_HashTable *tablePtr;	/* Table to enlarge. */
-{
-    int oldSize, count, index;
-    Tcl_HashEntry **oldBuckets;
-    register Tcl_HashEntry **oldChainPtr, **newChainPtr;
-    register Tcl_HashEntry *hPtr;
-
-    oldSize = tablePtr->numBuckets;
-    oldBuckets = tablePtr->buckets;
-
-    /*
-     * Allocate and initialize the new bucket array, and set up
-     * hashing constants for new array size.
-     */
-
-    tablePtr->numBuckets *= 4;
-    tablePtr->buckets = (Tcl_HashEntry **) ckalloc((unsigned)
-	    (tablePtr->numBuckets * sizeof(Tcl_HashEntry *)));
-    for (count = tablePtr->numBuckets, newChainPtr = tablePtr->buckets;
-	    count > 0; count--, newChainPtr++) {
-	*newChainPtr = NULL;
-    }
-    tablePtr->rebuildSize *= 4;
-    tablePtr->downShift -= 2;
-    tablePtr->mask = (tablePtr->mask << 2) + 3;
-
-    /*
-     * Rehash all of the existing entries into the new bucket array.
-     */
-
-    for (oldChainPtr = oldBuckets; oldSize > 0; oldSize--, oldChainPtr++) {
-	for (hPtr = *oldChainPtr; hPtr != NULL; hPtr = *oldChainPtr) {
-	    *oldChainPtr = hPtr->nextPtr;
-	    if (tablePtr->keyType == TCL_STRING_KEYS) {
-		index = HashString(hPtr->key.string) & tablePtr->mask;
-	    } else if (tablePtr->keyType == TCL_ONE_WORD_KEYS) {
-		index = RANDOM_INDEX(tablePtr, hPtr->key.oneWordValue);
-	    } else {
-		register int *iPtr;
-		int count;
-
-		for (index = 0, count = tablePtr->keyType,
-			iPtr = hPtr->key.words; count > 0; count--, iPtr++) {
-		    index += *iPtr;
-		}
-		index = RANDOM_INDEX(tablePtr, index);
-	    }
-	    hPtr->bucketPtr = &(tablePtr->buckets[index]);
-	    hPtr->nextPtr = *hPtr->bucketPtr;
-	    *hPtr->bucketPtr = hPtr;
-	}
-    }
-
-    /*
-     * Free up the old bucket array, if it was dynamically allocated.
-     */
-
-    if (oldBuckets != tablePtr->staticBuckets) {
-	ckfree((char *) oldBuckets);
-    }
-}
diff --git a/generic/tclHistory.c b/generic/tclHistory.c
deleted file mode 100644
index 5f2a9f2..0000000
--- a/generic/tclHistory.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* 
- * tclHistory.c --
- *
- *	This module and the Tcl library file history.tcl together implement
- *	Tcl command history. Tcl_RecordAndEval(Obj) can be called to record
- *	commands ("events") before they are executed. Commands defined in
- *	history.tcl may be used to perform history substitutions.
- *
- * Copyright (c) 1990-1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclHistory.c,v 1.3 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RecordAndEval --
- *
- *	This procedure adds its command argument to the current list of
- *	recorded events and then executes the command by calling
- *	Tcl_Eval.
- *
- * Results:
- *	The return value is a standard Tcl return value, the result of
- *	executing cmd.
- *
- * Side effects:
- *	The command is recorded and executed.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_RecordAndEval(interp, cmd, flags)
-    Tcl_Interp *interp;		/* Token for interpreter in which command
-				 * will be executed. */
-    char *cmd;			/* Command to record. */
-    int flags;			/* Additional flags.  TCL_NO_EVAL means
-				 * only record: don't execute command.
-				 * TCL_EVAL_GLOBAL means use Tcl_GlobalEval
-				 * instead of Tcl_Eval. */
-{
-    register Tcl_Obj *cmdPtr;
-    int length = strlen(cmd);
-    int result;
-
-    if (length > 0) {
-	/*
-	 * Call Tcl_RecordAndEvalObj to do the actual work.
-	 */
-
-	cmdPtr = Tcl_NewStringObj(cmd, length);
-	Tcl_IncrRefCount(cmdPtr);
-	result = Tcl_RecordAndEvalObj(interp, cmdPtr, flags);
-
-	/*
-	 * Move the interpreter's object result to the string result, 
-	 * then reset the object result.
-	 */
-
-	Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	        TCL_VOLATILE);
-
-	/*
-	 * Discard the Tcl object created to hold the command.
-	 */
-	
-	Tcl_DecrRefCount(cmdPtr);	
-    } else {
-	/*
-	 * An empty string. Just reset the interpreter's result.
-	 */
-
-	Tcl_ResetResult(interp);
-	result = TCL_OK;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RecordAndEvalObj --
- *
- *	This procedure adds the command held in its argument object to the
- *	current list of recorded events and then executes the command by
- *	calling Tcl_EvalObj.
- *
- * Results:
- *	The return value is a standard Tcl return value, the result of
- *	executing the command.
- *
- * Side effects:
- *	The command is recorded and executed.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_RecordAndEvalObj(interp, cmdPtr, flags)
-    Tcl_Interp *interp;		/* Token for interpreter in which command
-				 * will be executed. */
-    Tcl_Obj *cmdPtr;		/* Points to object holding the command to
-				 * record and execute. */
-    int flags;			/* Additional flags. TCL_NO_EVAL means
-				 * record only: don't execute the command.
-				 * TCL_EVAL_GLOBAL means evaluate the
-				 * script in global variable context instead
-				 * of the current procedure. */
-{
-    int result;
-    Tcl_Obj *list[3];
-    register Tcl_Obj *objPtr;
-
-    /*
-     * Do recording by eval'ing a tcl history command: history add $cmd.
-     */
-
-    list[0] = Tcl_NewStringObj("history", -1);
-    list[1] = Tcl_NewStringObj("add", -1);
-    list[2] = cmdPtr;
-    
-    objPtr = Tcl_NewListObj(3, list);
-    Tcl_IncrRefCount(objPtr);
-    (void) Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL);
-    Tcl_DecrRefCount(objPtr);
-
-    /*
-     * Execute the command.
-     */
-
-    result = TCL_OK;
-    if (!(flags & TCL_NO_EVAL)) {
-	result = Tcl_EvalObjEx(interp, cmdPtr, flags & TCL_EVAL_GLOBAL);
-    }
-    return result;
-}
diff --git a/generic/tclIO.c b/generic/tclIO.c
deleted file mode 100644
index 32c844e..0000000
--- a/generic/tclIO.c
+++ /dev/null
@@ -1,7603 +0,0 @@
-/* 
- * tclIO.c --
- *
- *	This file provides the generic portions (those that are the same on
- *	all platforms and for all channel types) of Tcl's IO facilities.
- *
- * Copyright (c) 1998 Scriptics Corporation
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIO.c,v 1.6 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Make sure that both EAGAIN and EWOULDBLOCK are defined. This does not
- * compile on systems where neither is defined. We want both defined so
- * that we can test safely for both. In the code we still have to test for
- * both because there may be systems on which both are defined and have
- * different values.
- */
-
-#if ((!defined(EWOULDBLOCK)) && (defined(EAGAIN)))
-#   define EWOULDBLOCK EAGAIN
-#endif
-#if ((!defined(EAGAIN)) && (defined(EWOULDBLOCK)))
-#   define EAGAIN EWOULDBLOCK
-#endif
-#if ((!defined(EAGAIN)) && (!defined(EWOULDBLOCK)))
-    error one of EWOULDBLOCK or EAGAIN must be defined
-#endif
-
-/*
- * The following structure encapsulates the state for a background channel
- * copy.  Note that the data buffer for the copy will be appended to this
- * structure.
- */
-
-typedef struct CopyState {
-    struct Channel *readPtr;	/* Pointer to input channel. */
-    struct Channel *writePtr;	/* Pointer to output channel. */
-    int readFlags;		/* Original read channel flags. */
-    int writeFlags;		/* Original write channel flags. */
-    int toRead;			/* Number of bytes to copy, or -1. */
-    int total;			/* Total bytes transferred (written). */
-    Tcl_Interp *interp;		/* Interp that started the copy. */
-    Tcl_Obj *cmdPtr;		/* Command to be invoked at completion. */
-    int bufSize;		/* Size of appended buffer. */
-    char buffer[1];		/* Copy buffer, this must be the last
-				 * field. */
-} CopyState;
-
-/*
- * struct ChannelBuffer:
- *
- * Buffers data being sent to or from a channel.
- */
-
-typedef struct ChannelBuffer {
-    int nextAdded;		/* The next position into which a character
-                                 * will be put in the buffer. */
-    int nextRemoved;		/* Position of next byte to be removed
-                                 * from the buffer. */
-    int bufLength;		/* How big is the buffer? */
-    struct ChannelBuffer *nextPtr;
-    				/* Next buffer in chain. */
-    char buf[4];		/* Placeholder for real buffer. The real
-                                 * buffer occuppies this space + bufSize-4
-                                 * bytes. This must be the last field in
-                                 * the structure. */
-} ChannelBuffer;
-
-#define CHANNELBUFFER_HEADER_SIZE	(sizeof(ChannelBuffer) - 4)
-
-/*
- * How much extra space to allocate in buffer to hold bytes from previous
- * buffer (when converting to UTF-8) or to hold bytes that will go to
- * next buffer (when converting from UTF-8).
- */
- 
-#define BUFFER_PADDING	    16
- 
-/*
- * The following defines the *default* buffer size for channels.
- */
-
-#define CHANNELBUFFER_DEFAULT_SIZE	(1024 * 4)
-
-/*
- * Structure to record a close callback. One such record exists for
- * each close callback registered for a channel.
- */
-
-typedef struct CloseCallback {
-    Tcl_CloseProc *proc;		/* The procedure to call. */
-    ClientData clientData;		/* Arbitrary one-word data to pass
-                                         * to the callback. */
-    struct CloseCallback *nextPtr;	/* For chaining close callbacks. */
-} CloseCallback;
-
-/*
- * The following structure describes the information saved from a call to
- * "fileevent". This is used later when the event being waited for to
- * invoke the saved script in the interpreter designed in this record.
- */
-
-typedef struct EventScriptRecord {
-    struct Channel *chanPtr;	/* The channel for which this script is
-                                 * registered. This is used only when an
-                                 * error occurs during evaluation of the
-                                 * script, to delete the handler. */
-    Tcl_Obj *scriptPtr;		/* Script to invoke. */
-    Tcl_Interp *interp;		/* In what interpreter to invoke script? */
-    int mask;			/* Events must overlap current mask for the
-                                 * stored script to be invoked. */
-    struct EventScriptRecord *nextPtr;
-    				/* Next in chain of records. */
-} EventScriptRecord;
-
-/*
- * struct Channel:
- *
- * One of these structures is allocated for each open channel. It contains data
- * specific to the channel but which belongs to the generic part of the Tcl
- * channel mechanism, and it points at an instance specific (and type
- * specific) * instance data, and at a channel type structure.
- */
-
-typedef struct Channel {
-    char *channelName;		/* The name of the channel instance in Tcl
-                                 * commands. Storage is owned by the generic IO
-                                 * code,  is dynamically allocated. */
-    int	flags;			/* ORed combination of the flags defined
-                                 * below. */
-    Tcl_Encoding encoding;	/* Encoding to apply when reading or writing
-				 * data on this channel.  NULL means no
-				 * encoding is applied to data. */
-    Tcl_EncodingState inputEncodingState;
-				/* Current encoding state, used when converting
-				 * input data bytes to UTF-8. */
-    int inputEncodingFlags;	/* Encoding flags to pass to conversion
-				 * routine when converting input data bytes to
-				 * UTF-8.  May be TCL_ENCODING_START before
-				 * converting first byte and TCL_ENCODING_END
-				 * when EOF is seen. */
-    Tcl_EncodingState outputEncodingState;
-				/* Current encoding state, used when converting
-				 * UTF-8 to output data bytes. */
-    int outputEncodingFlags;	/* Encoding flags to pass to conversion
-				 * routine when converting UTF-8 to output
-				 * data bytes.  May be TCL_ENCODING_START
-				 * before converting first byte and
-				 * TCL_ENCODING_END when EOF is seen. */
-    Tcl_EolTranslation inputTranslation;
-				/* What translation to apply for end of line
-                                 * sequences on input? */    
-    Tcl_EolTranslation outputTranslation;
-    				/* What translation to use for generating
-                                 * end of line sequences in output? */
-    int inEofChar;		/* If nonzero, use this as a signal of EOF
-                                 * on input. */
-    int outEofChar;             /* If nonzero, append this to the channel
-                                 * when it is closed if it is open for
-                                 * writing. */
-    int unreportedError;	/* Non-zero if an error report was deferred
-                                 * because it happened in the background. The
-                                 * value is the POSIX error code. */
-    ClientData instanceData;	/* Instance-specific data provided by
-				 * creator of channel. */
-
-    Tcl_ChannelType *typePtr;	/* Pointer to channel type structure. */
-    int refCount;		/* How many interpreters hold references to
-                                 * this IO channel? */
-    CloseCallback *closeCbPtr;	/* Callbacks registered to be called when the
-                                 * channel is closed. */
-    char *outputStage;		/* Temporary staging buffer used when
-				 * translating EOL before converting from
-				 * UTF-8 to external form. */
-    ChannelBuffer *curOutPtr;	/* Current output buffer being filled. */
-    ChannelBuffer *outQueueHead;/* Points at first buffer in output queue. */
-    ChannelBuffer *outQueueTail;/* Points at last buffer in output queue. */
-
-    ChannelBuffer *saveInBufPtr;/* Buffer saved for input queue - eliminates
-                                 * need to allocate a new buffer for "gets"
-                                 * that crosses buffer boundaries. */
-    ChannelBuffer *inQueueHead;	/* Points at first buffer in input queue. */
-    ChannelBuffer *inQueueTail;	/* Points at last buffer in input queue. */
-
-    struct ChannelHandler *chPtr;/* List of channel handlers registered
-                                  * for this channel. */
-    int interestMask;		/* Mask of all events this channel has
-                                 * handlers for. */
-    struct Channel *nextChanPtr;/* Next in list of channels currently open. */
-    EventScriptRecord *scriptRecordPtr;
-    				/* Chain of all scripts registered for
-                                 * event handlers ("fileevent") on this
-                                 * channel. */
-    int bufSize;		/* What size buffers to allocate? */
-    Tcl_TimerToken timer;	/* Handle to wakeup timer for this channel. */
-    CopyState *csPtr;		/* State of background copy, or NULL. */
-} Channel;
-    
-/*
- * Values for the flags field in Channel. Any ORed combination of the
- * following flags can be stored in the field. These flags record various
- * options and state bits about the channel. In addition to the flags below,
- * the channel can also have TCL_READABLE (1<<1) and TCL_WRITABLE (1<<2) set.
- */
-
-#define CHANNEL_NONBLOCKING	(1<<3)	/* Channel is currently in
-					 * nonblocking mode. */
-#define CHANNEL_LINEBUFFERED	(1<<4)	/* Output to the channel must be
-					 * flushed after every newline. */
-#define CHANNEL_UNBUFFERED	(1<<5)	/* Output to the channel must always
-					 * be flushed immediately. */
-#define BUFFER_READY		(1<<6)	/* Current output buffer (the
-					 * curOutPtr field in the
-                                         * channel structure) should be
-                                         * output as soon as possible even
-                                         * though it may not be full. */
-#define BG_FLUSH_SCHEDULED	(1<<7)	/* A background flush of the
-					 * queued output buffers has been
-                                         * scheduled. */
-#define CHANNEL_CLOSED		(1<<8)	/* Channel has been closed. No
-					 * further Tcl-level IO on the
-                                         * channel is allowed. */
-#define CHANNEL_EOF		(1<<9)	/* EOF occurred on this channel.
-					 * This bit is cleared before every
-                                         * input operation. */
-#define CHANNEL_STICKY_EOF	(1<<10)	/* EOF occurred on this channel because
-					 * we saw the input eofChar. This bit
-                                         * prevents clearing of the EOF bit
-                                         * before every input operation. */
-#define CHANNEL_BLOCKED	(1<<11)	/* EWOULDBLOCK or EAGAIN occurred
-					 * on this channel. This bit is
-                                         * cleared before every input or
-                                         * output operation. */
-#define INPUT_SAW_CR		(1<<12)	/* Channel is in CRLF eol input
-					 * translation mode and the last
-                                         * byte seen was a "\r". */
-#define INPUT_NEED_NL		(1<<15)	/* Saw a '\r' at end of last buffer,
-					 * and there should be a '\n' at
-					 * beginning of next buffer. */
-#define CHANNEL_DEAD		(1<<13)	/* The channel has been closed by
-					 * the exit handler (on exit) but
-                                         * not deallocated. When any IO
-                                         * operation sees this flag on a
-                                         * channel, it does not call driver
-                                         * level functions to avoid referring
-                                         * to deallocated data. */
-#define CHANNEL_NEED_MORE_DATA	(1<<14)	/* The last input operation failed
-					 * because there was not enough data
-					 * to complete the operation.  This
-					 * flag is set when gets fails to
-					 * get a complete line or when read
-					 * fails to get a complete character.
-					 * When set, file events will not be
-					 * delivered for buffered data until
-					 * the state of the channel changes. */
-
-/*
- * For each channel handler registered in a call to Tcl_CreateChannelHandler,
- * there is one record of the following type. All of records for a specific
- * channel are chained together in a singly linked list which is stored in
- * the channel structure.
- */
-
-typedef struct ChannelHandler {
-    Channel *chanPtr;		/* The channel structure for this channel. */
-    int mask;			/* Mask of desired events. */
-    Tcl_ChannelProc *proc;	/* Procedure to call in the type of
-                                 * Tcl_CreateChannelHandler. */
-    ClientData clientData;	/* Argument to pass to procedure. */
-    struct ChannelHandler *nextPtr;
-    				/* Next one in list of registered handlers. */
-} ChannelHandler;
-
-/*
- * This structure keeps track of the current ChannelHandler being invoked in
- * the current invocation of ChannelHandlerEventProc. There is a potential
- * problem if a ChannelHandler is deleted while it is the current one, since
- * ChannelHandlerEventProc needs to look at the nextPtr field. To handle this
- * problem, structures of the type below indicate the next handler to be
- * processed for any (recursively nested) dispatches in progress. The
- * nextHandlerPtr field is updated if the handler being pointed to is deleted.
- * The nextPtr field is used to chain together all recursive invocations, so
- * that Tcl_DeleteChannelHandler can find all the recursively nested
- * invocations of ChannelHandlerEventProc and compare the handler being
- * deleted against the NEXT handler to be invoked in that invocation; when it
- * finds such a situation, Tcl_DeleteChannelHandler updates the nextHandlerPtr
- * field of the structure to the next handler.
- */
-
-typedef struct NextChannelHandler {
-    ChannelHandler *nextHandlerPtr;	/* The next handler to be invoked in
-                                         * this invocation. */
-    struct NextChannelHandler *nestedHandlerPtr;
-					/* Next nested invocation of
-                                         * ChannelHandlerEventProc. */
-} NextChannelHandler;
-
-
-/*
- * The following structure describes the event that is added to the Tcl
- * event queue by the channel handler check procedure.
- */
-
-typedef struct ChannelHandlerEvent {
-    Tcl_Event header;		/* Standard header for all events. */
-    Channel *chanPtr;		/* The channel that is ready. */
-    int readyMask;		/* Events that have occurred. */
-} ChannelHandlerEvent;
-
-/*
- * The following structure is used by Tcl_GetsObj() to encapsulates the
- * state for a "gets" operation.
- */
- 
-typedef struct GetsState {
-    Tcl_Obj *objPtr;		/* The object to which UTF-8 characters
-				 * will be appended. */
-    char **dstPtr;		/* Pointer into objPtr's string rep where
-				 * next character should be stored. */
-    Tcl_Encoding encoding;	/* The encoding to use to convert raw bytes
-				 * to UTF-8.  */
-    ChannelBuffer *bufPtr;	/* The current buffer of raw bytes being
-				 * emptied. */
-    Tcl_EncodingState state;	/* The encoding state just before the last
-				 * external to UTF-8 conversion in
-				 * FilterInputBytes(). */
-    int rawRead;		/* The number of bytes removed from bufPtr
-				 * in the last call to FilterInputBytes(). */
-    int bytesWrote;		/* The number of bytes of UTF-8 data
-				 * appended to objPtr during the last call to
-				 * FilterInputBytes(). */
-    int charsWrote;		/* The corresponding number of UTF-8
-				 * characters appended to objPtr during the
-				 * last call to FilterInputBytes(). */
-    int totalChars;		/* The total number of UTF-8 characters
-				 * appended to objPtr so far, just before the
-				 * last call to FilterInputBytes(). */
-} GetsState;
-
-/*
- * All static variables used in this file are collected into a single
- * instance of the following structure.  For multi-threaded implementations,
- * there is one instance of this structure for each thread.
- *
- * Notice that different structures with the same name appear in other
- * files.  The structure defined below is used in this file only.
- */
-
-typedef struct ThreadSpecificData {
-
-    /*
-     * This variable holds the list of nested ChannelHandlerEventProc 
-     * invocations.
-     */
-    NextChannelHandler *nestedHandlerPtr;
-
-    /*
-     * List of all channels currently open.
-     */
-    Channel *firstChanPtr;
-#ifdef oldcode
-    /*
-     * Has a channel exit handler been created yet?
-     */
-    int channelExitHandlerCreated;
-
-    /*
-     * Has the channel event source been created and registered with the
-     * notifier?
-     */
-    int channelEventSourceCreated;
-#endif
-    /*
-     * Static variables to hold channels for stdin, stdout and stderr.
-     */
-    Tcl_Channel stdinChannel;
-    int stdinInitialized;
-    Tcl_Channel stdoutChannel;
-    int stdoutInitialized;
-    Tcl_Channel stderrChannel;
-    int stderrInitialized;
-
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-
-/*
- * Static functions in this file:
- */
-
-static ChannelBuffer *	AllocChannelBuffer _ANSI_ARGS_((int length));
-static void		ChannelEventScriptInvoker _ANSI_ARGS_((
-			    ClientData clientData, int flags));
-static void		ChannelTimerProc _ANSI_ARGS_((
-			    ClientData clientData));
-static int		CheckChannelErrors _ANSI_ARGS_((Channel *chanPtr,
-			    int direction));
-static int		CheckFlush _ANSI_ARGS_((Channel *chanPtr,
-			    ChannelBuffer *bufPtr, int newlineFlag));
-static int		CheckForDeadChannel _ANSI_ARGS_((Tcl_Interp *interp,
-			    Channel *chan));
-static void		CheckForStdChannelsBeingClosed _ANSI_ARGS_((
-			    Tcl_Channel chan));
-static void		CleanupChannelHandlers _ANSI_ARGS_((
-			    Tcl_Interp *interp, Channel *chanPtr));
-static int		CloseChannel _ANSI_ARGS_((Tcl_Interp *interp,
-                            Channel *chanPtr, int errorCode));
-static void		CommonGetsCleanup _ANSI_ARGS_((Channel *chanPtr,
-			    Tcl_Encoding encoding));
-static int		CopyAndTranslateBuffer _ANSI_ARGS_((
-			    Channel *chanPtr, char *result, int space));
-static int		CopyData _ANSI_ARGS_((CopyState *csPtr, int mask));
-static void		CopyEventProc _ANSI_ARGS_((ClientData clientData,
-			    int mask));
-static void		CreateScriptRecord _ANSI_ARGS_((
-			    Tcl_Interp *interp, Channel *chanPtr,
-                            int mask, Tcl_Obj *scriptPtr));
-static void		DeleteChannelTable _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp));
-static void		DeleteScriptRecord _ANSI_ARGS_((Tcl_Interp *interp,
-        		    Channel *chanPtr, int mask));
-static void		DiscardInputQueued _ANSI_ARGS_((
-			    Channel *chanPtr, int discardSavedBuffers));
-static void		DiscardOutputQueued _ANSI_ARGS_((
-    			    Channel *chanPtr));
-static int		DoRead _ANSI_ARGS_((Channel *chanPtr, char *srcPtr,
-			    int slen));
-static int		DoWrite _ANSI_ARGS_((Channel *chanPtr, char *src,
-			    int srcLen));
-static int		FilterInputBytes _ANSI_ARGS_((Channel *chanPtr,
-			    GetsState *statePtr));
-static int		FlushChannel _ANSI_ARGS_((Tcl_Interp *interp,
-                            Channel *chanPtr, int calledFromAsyncFlush));
-static Tcl_HashTable *	GetChannelTable _ANSI_ARGS_((Tcl_Interp *interp));
-static int		GetInput _ANSI_ARGS_((Channel *chanPtr));
-static void		PeekAhead _ANSI_ARGS_((Channel *chanPtr,
-			    char **dstEndPtr, GetsState *gsPtr));
-static int		ReadBytes _ANSI_ARGS_((Channel *chanPtr,
-			    Tcl_Obj *objPtr, int charsLeft, int *offsetPtr));
-static int		ReadChars _ANSI_ARGS_((Channel *chanPtr,
-			    Tcl_Obj *objPtr, int charsLeft, int *offsetPtr,
-			    int *factorPtr));
-static void		RecycleBuffer _ANSI_ARGS_((Channel *chanPtr,
-		            ChannelBuffer *bufPtr, int mustDiscard));
-static int		SetBlockMode _ANSI_ARGS_((Tcl_Interp *interp,
-		            Channel *chanPtr, int mode));
-static void		StopCopy _ANSI_ARGS_((CopyState *csPtr));
-static int		TranslateInputEOL _ANSI_ARGS_((Channel *chanPtr,
-			    char *dst, CONST char *src, int *dstLenPtr,
-			    int *srcLenPtr));
-static int		TranslateOutputEOL _ANSI_ARGS_((Channel *chanPtr,
-			    char *dst, CONST char *src, int *dstLenPtr,
-			    int *srcLenPtr));
-static void		UpdateInterest _ANSI_ARGS_((Channel *chanPtr));
-static int		WriteBytes _ANSI_ARGS_((Channel *chanPtr,
-			    CONST char *src, int srcLen));
-static int		WriteChars _ANSI_ARGS_((Channel *chanPtr,
-			    CONST char *src, int srcLen));
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclInitIOSubsystem --
- *
- *	Initialize all resources used by this subsystem on a per-process
- *	basis.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on the memory subsystems.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclInitIOSubsystem()
-{
-    /*
-     * By fetching thread local storage we take care of
-     * allocating it for each thread.
-     */
-    (void) TCL_TSD_INIT(&dataKey);
-}   
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclFinalizeIOSubsystem --
- *
- *	Releases all resources used by this subsystem on a per-process 
- *	basis.  Closes all extant channels that have not already been 
- *	closed because they were not owned by any interp.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on encoding and memory subsystems.
- *
- *-------------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-void
-TclFinalizeIOSubsystem()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    Channel *chanPtr;			/* Iterates over open channels. */
-    Channel *nextChanPtr;		/* Iterates over open channels. */
-
-
-    for (chanPtr = tsdPtr->firstChanPtr; chanPtr != (Channel *) NULL;
-             chanPtr = nextChanPtr) {
-        nextChanPtr = chanPtr->nextChanPtr;
-
-        /*
-         * Set the channel back into blocking mode to ensure that we wait
-         * for all data to flush out.
-         */
-        
-        (void) Tcl_SetChannelOption(NULL, (Tcl_Channel) chanPtr,
-                "-blocking", "on");
-
-        if ((chanPtr == (Channel *) tsdPtr->stdinChannel) ||
-                (chanPtr == (Channel *) tsdPtr->stdoutChannel) ||
-                (chanPtr == (Channel *) tsdPtr->stderrChannel)) {
-
-            /*
-             * Decrement the refcount which was earlier artificially bumped
-             * up to keep the channel from being closed.
-             */
-
-            chanPtr->refCount--;
-        }
-
-        if (chanPtr->refCount <= 0) {
-
-	    /*
-             * Close it only if the refcount indicates that the channel is not
-             * referenced from any interpreter. If it is, that interpreter will
-             * close the channel when it gets destroyed.
-             */
-
-            (void) Tcl_Close((Tcl_Interp *) NULL, (Tcl_Channel) chanPtr);
-
-        } else {
-
-            /*
-             * The refcount is greater than zero, so flush the channel.
-             */
-
-            Tcl_Flush((Tcl_Channel) chanPtr);
-
-            /*
-             * Call the device driver to actually close the underlying
-             * device for this channel.
-             */
-            
-	    if (chanPtr->typePtr->closeProc != TCL_CLOSE2PROC) {
-		(chanPtr->typePtr->closeProc)(chanPtr->instanceData,
-			(Tcl_Interp *) NULL);
-	    } else {
-		(chanPtr->typePtr->close2Proc)(chanPtr->instanceData,
-			(Tcl_Interp *) NULL, 0);
-	    }
-
-            /*
-             * Finally, we clean up the fields in the channel data structure
-             * since all of them have been deleted already. We mark the
-             * channel with CHANNEL_DEAD to prevent any further IO operations
-             * on it.
-             */
-
-            chanPtr->instanceData = (ClientData) NULL;
-            chanPtr->flags |= CHANNEL_DEAD;
-        }
-    }
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetStdChannel --
- *
- *	This function is used to change the channels that are used
- *	for stdin/stdout/stderr in new interpreters.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetStdChannel(channel, type)
-    Tcl_Channel channel;
-    int type;			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    switch (type) {
-	case TCL_STDIN:
-	    tsdPtr->stdinInitialized = 1;
-	    tsdPtr->stdinChannel = channel;
-	    break;
-	case TCL_STDOUT:
-	    tsdPtr->stdoutInitialized = 1;
-	    tsdPtr->stdoutChannel = channel;
-	    break;
-	case TCL_STDERR:
-	    tsdPtr->stderrInitialized = 1;
-	    tsdPtr->stderrChannel = channel;
-	    break;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetStdChannel --
- *
- *	Returns the specified standard channel.
- *
- * Results:
- *	Returns the specified standard channel, or NULL.
- *
- * Side effects:
- *	May cause the creation of a standard channel and the underlying
- *	file.
- *
- *----------------------------------------------------------------------
- */
-Tcl_Channel
-Tcl_GetStdChannel(type)
-    int type;			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR. */
-{
-    Tcl_Channel channel = NULL;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * If the channels were not created yet, create them now and
-     * store them in the static variables. 
-     */
-
-    switch (type) {
-	case TCL_STDIN:
-	    if (!tsdPtr->stdinInitialized) {
-		tsdPtr->stdinChannel = TclpGetDefaultStdChannel(TCL_STDIN);
-		tsdPtr->stdinInitialized = 1;
-
-		/*
-                 * Artificially bump the refcount to ensure that the channel
-                 * is only closed on exit.
-                 *
-                 * NOTE: Must only do this if stdinChannel is not NULL. It
-                 * can be NULL in situations where Tcl is unable to connect
-                 * to the standard input.
-                 */
-
-                if (tsdPtr->stdinChannel != (Tcl_Channel) NULL) {
-                    (void) Tcl_RegisterChannel((Tcl_Interp *) NULL,
-                            tsdPtr->stdinChannel);
-                }
-	    }
-	    channel = tsdPtr->stdinChannel;
-	    break;
-	case TCL_STDOUT:
-	    if (!tsdPtr->stdoutInitialized) {
-		tsdPtr->stdoutChannel = TclpGetDefaultStdChannel(TCL_STDOUT);
-		tsdPtr->stdoutInitialized = 1;
-                if (tsdPtr->stdoutChannel != (Tcl_Channel) NULL) {
-                    (void) Tcl_RegisterChannel((Tcl_Interp *) NULL,
-                            tsdPtr->stdoutChannel);
-                }
-	    }
-	    channel = tsdPtr->stdoutChannel;
-	    break;
-	case TCL_STDERR:
-	    if (!tsdPtr->stderrInitialized) {
-		tsdPtr->stderrChannel = TclpGetDefaultStdChannel(TCL_STDERR);
-		tsdPtr->stderrInitialized = 1;
-                if (tsdPtr->stderrChannel != (Tcl_Channel) NULL) {
-                    (void) Tcl_RegisterChannel((Tcl_Interp *) NULL,
-                            tsdPtr->stderrChannel);
-                }
-	    }
-	    channel = tsdPtr->stderrChannel;
-	    break;
-    }
-    return channel;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateCloseHandler
- *
- *	Creates a close callback which will be called when the channel is
- *	closed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Causes the callback to be called in the future when the channel
- *	will be closed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateCloseHandler(chan, proc, clientData)
-    Tcl_Channel chan;		/* The channel for which to create the
-                                 * close callback. */
-    Tcl_CloseProc *proc;	/* The callback routine to call when the
-                                 * channel will be closed. */
-    ClientData clientData;	/* Arbitrary data to pass to the
-                                 * close callback. */
-{
-    Channel *chanPtr;
-    CloseCallback *cbPtr;
-
-    chanPtr = (Channel *) chan;
-
-    cbPtr = (CloseCallback *) ckalloc((unsigned) sizeof(CloseCallback));
-    cbPtr->proc = proc;
-    cbPtr->clientData = clientData;
-
-    cbPtr->nextPtr = chanPtr->closeCbPtr;
-    chanPtr->closeCbPtr = cbPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteCloseHandler --
- *
- *	Removes a callback that would have been called on closing
- *	the channel. If there is no matching callback then this
- *	function has no effect.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The callback will not be called in the future when the channel
- *	is eventually closed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteCloseHandler(chan, proc, clientData)
-    Tcl_Channel chan;		/* The channel for which to cancel the
-                                 * close callback. */
-    Tcl_CloseProc *proc;	/* The procedure for the callback to
-                                 * remove. */
-    ClientData clientData;	/* The callback data for the callback
-                                 * to remove. */
-{
-    Channel *chanPtr;
-    CloseCallback *cbPtr, *cbPrevPtr;
-
-    chanPtr = (Channel *) chan;
-    for (cbPtr = chanPtr->closeCbPtr, cbPrevPtr = (CloseCallback *) NULL;
-             cbPtr != (CloseCallback *) NULL;
-             cbPtr = cbPtr->nextPtr) {
-        if ((cbPtr->proc == proc) && (cbPtr->clientData == clientData)) {
-            if (cbPrevPtr == (CloseCallback *) NULL) {
-                chanPtr->closeCbPtr = cbPtr->nextPtr;
-            }
-            ckfree((char *) cbPtr);
-            break;
-        } else {
-            cbPrevPtr = cbPtr;
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetChannelTable --
- *
- *	Gets and potentially initializes the channel table for an
- *	interpreter. If it is initializing the table it also inserts
- *	channels for stdin, stdout and stderr if the interpreter is
- *	trusted.
- *
- * Results:
- *	A pointer to the hash table created, for use by the caller.
- *
- * Side effects:
- *	Initializes the channel table for an interpreter. May create
- *	channels for stdin, stdout and stderr.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_HashTable *
-GetChannelTable(interp)
-    Tcl_Interp *interp;
-{
-    Tcl_HashTable *hTblPtr;	/* Hash table of channels. */
-    Tcl_Channel stdinChan, stdoutChan, stderrChan;
-
-    hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, "tclIO", NULL);
-    if (hTblPtr == (Tcl_HashTable *) NULL) {
-        hTblPtr = (Tcl_HashTable *) ckalloc((unsigned) sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(hTblPtr, TCL_STRING_KEYS);
-
-        (void) Tcl_SetAssocData(interp, "tclIO",
-                (Tcl_InterpDeleteProc *) DeleteChannelTable,
-                (ClientData) hTblPtr);
-
-        /*
-         * If the interpreter is trusted (not "safe"), insert channels
-         * for stdin, stdout and stderr (possibly creating them in the
-         * process).
-         */
-
-        if (Tcl_IsSafe(interp) == 0) {
-            stdinChan = Tcl_GetStdChannel(TCL_STDIN);
-            if (stdinChan != NULL) {
-                Tcl_RegisterChannel(interp, stdinChan);
-            }
-            stdoutChan = Tcl_GetStdChannel(TCL_STDOUT);
-            if (stdoutChan != NULL) {
-                Tcl_RegisterChannel(interp, stdoutChan);
-            }
-            stderrChan = Tcl_GetStdChannel(TCL_STDERR);
-            if (stderrChan != NULL) {
-                Tcl_RegisterChannel(interp, stderrChan);
-            }
-        }
-
-    }
-    return hTblPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteChannelTable --
- *
- *	Deletes the channel table for an interpreter, closing any open
- *	channels whose refcount reaches zero. This procedure is invoked
- *	when an interpreter is deleted, via the AssocData cleanup
- *	mechanism.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deletes the hash table of channels. May close channels. May flush
- *	output on closed channels. Removes any channeEvent handlers that were
- *	registered in this interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteChannelTable(clientData, interp)
-    ClientData clientData;	/* The per-interpreter data structure. */
-    Tcl_Interp *interp;		/* The interpreter being deleted. */
-{
-    Tcl_HashTable *hTblPtr;	/* The hash table. */
-    Tcl_HashSearch hSearch;	/* Search variable. */
-    Tcl_HashEntry *hPtr;	/* Search variable. */
-    Channel *chanPtr;	/* Channel being deleted. */
-    EventScriptRecord *sPtr, *prevPtr, *nextPtr;
-    				/* Variables to loop over all channel events
-                                 * registered, to delete the ones that refer
-                                 * to the interpreter being deleted. */
-    
-    /*
-     * Delete all the registered channels - this will close channels whose
-     * refcount reaches zero.
-     */
-    
-    hTblPtr = (Tcl_HashTable *) clientData;
-    for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-             hPtr != (Tcl_HashEntry *) NULL;
-             hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch)) {
-
-        chanPtr = (Channel *) Tcl_GetHashValue(hPtr);
-
-        /*
-         * Remove any fileevents registered in this interpreter.
-         */
-        
-        for (sPtr = chanPtr->scriptRecordPtr,
-                 prevPtr = (EventScriptRecord *) NULL;
-                 sPtr != (EventScriptRecord *) NULL;
-                 sPtr = nextPtr) {
-            nextPtr = sPtr->nextPtr;
-            if (sPtr->interp == interp) {
-                if (prevPtr == (EventScriptRecord *) NULL) {
-                    chanPtr->scriptRecordPtr = nextPtr;
-                } else {
-                    prevPtr->nextPtr = nextPtr;
-                }
-
-                Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-                        ChannelEventScriptInvoker, (ClientData) sPtr);
-
-		Tcl_DecrRefCount(sPtr->scriptPtr);
-                ckfree((char *) sPtr);
-            } else {
-                prevPtr = sPtr;
-            }
-        }
-
-        /*
-         * Cannot call Tcl_UnregisterChannel because that procedure calls
-         * Tcl_GetAssocData to get the channel table, which might already
-         * be inaccessible from the interpreter structure. Instead, we
-         * emulate the behavior of Tcl_UnregisterChannel directly here.
-         */
-
-        Tcl_DeleteHashEntry(hPtr);
-        chanPtr->refCount--;
-        if (chanPtr->refCount <= 0) {
-            if (!(chanPtr->flags & BG_FLUSH_SCHEDULED)) {
-                (void) Tcl_Close(interp, (Tcl_Channel) chanPtr);
-            }
-        }
-    }
-    Tcl_DeleteHashTable(hTblPtr);
-    ckfree((char *) hTblPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckForStdChannelsBeingClosed --
- *
- *	Perform special handling for standard channels being closed. When
- *	given a standard channel, if the refcount is now 1, it means that
- *	the last reference to the standard channel is being explicitly
- *	closed. Now bump the refcount artificially down to 0, to ensure the
- *	normal handling of channels being closed will occur. Also reset the
- *	static pointer to the channel to NULL, to avoid dangling references.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Manipulates the refcount on standard channels. May smash the global
- *	static pointer to a standard channel.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CheckForStdChannelsBeingClosed(chan)
-    Tcl_Channel chan;
-{
-    Channel *chanPtr = (Channel *) chan;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if ((chan == tsdPtr->stdinChannel) && (tsdPtr->stdinInitialized)) {
-        if (chanPtr->refCount < 2) {
-            chanPtr->refCount = 0;
-            tsdPtr->stdinChannel = NULL;
-            return;
-        }
-    } else if ((chan == tsdPtr->stdoutChannel) && (tsdPtr->stdoutInitialized)) {
-        if (chanPtr->refCount < 2) {
-            chanPtr->refCount = 0;
-            tsdPtr->stdoutChannel = NULL;
-            return;
-        }
-    } else if ((chan == tsdPtr->stderrChannel) && (tsdPtr->stderrInitialized)) {
-        if (chanPtr->refCount < 2) {
-            chanPtr->refCount = 0;
-            tsdPtr->stderrChannel = NULL;
-            return;
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegisterChannel --
- *
- *	Adds an already-open channel to the channel table of an interpreter.
- *	If the interpreter passed as argument is NULL, it only increments
- *	the channel refCount.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May increment the reference count of a channel.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_RegisterChannel(interp, chan)
-    Tcl_Interp *interp;		/* Interpreter in which to add the channel. */
-    Tcl_Channel chan;		/* The channel to add to this interpreter
-                                 * channel table. */
-{
-    Tcl_HashTable *hTblPtr;	/* Hash table of channels. */
-    Tcl_HashEntry *hPtr;	/* Search variable. */
-    int new;			/* Is the hash entry new or does it exist? */
-    Channel *chanPtr;		/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-
-    if (chanPtr->channelName == (char *) NULL) {
-        panic("Tcl_RegisterChannel: channel without name");
-    }
-    if (interp != (Tcl_Interp *) NULL) {
-        hTblPtr = GetChannelTable(interp);
-        hPtr = Tcl_CreateHashEntry(hTblPtr, chanPtr->channelName, &new);
-        if (new == 0) {
-            if (chan == (Tcl_Channel) Tcl_GetHashValue(hPtr)) {
-                return;
-            }
-            panic("Tcl_RegisterChannel: duplicate channel names");
-        }
-        Tcl_SetHashValue(hPtr, (ClientData) chanPtr);
-    }
-    chanPtr->refCount++;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UnregisterChannel --
- *
- *	Deletes the hash entry for a channel associated with an interpreter.
- *	If the interpreter given as argument is NULL, it only decrements the
- *	reference count.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Deletes the hash entry for a channel associated with an interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UnregisterChannel(interp, chan)
-    Tcl_Interp *interp;		/* Interpreter in which channel is defined. */
-    Tcl_Channel chan;		/* Channel to delete. */
-{
-    Tcl_HashTable *hTblPtr;	/* Hash table of channels. */
-    Tcl_HashEntry *hPtr;	/* Search variable. */
-    Channel *chanPtr;		/* The real IO channel. */
-
-    chanPtr = (Channel *) chan;
-    
-    if (interp != (Tcl_Interp *) NULL) {
-        hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, "tclIO", NULL);
-        if (hTblPtr == (Tcl_HashTable *) NULL) {
-            return TCL_OK;
-        }
-        hPtr = Tcl_FindHashEntry(hTblPtr, chanPtr->channelName);
-        if (hPtr == (Tcl_HashEntry *) NULL) {
-            return TCL_OK;
-        }
-        if ((Channel *) Tcl_GetHashValue(hPtr) != chanPtr) {
-            return TCL_OK;
-        }
-        Tcl_DeleteHashEntry(hPtr);
-
-        /*
-         * Remove channel handlers that refer to this interpreter, so that they
-         * will not be present if the actual close is delayed and more events
-         * happen on the channel. This may occur if the channel is shared
-         * between several interpreters, or if the channel has async
-         * flushing active.
-         */
-    
-        CleanupChannelHandlers(interp, chanPtr);
-    }
-
-    chanPtr->refCount--;
-    
-    /*
-     * Perform special handling for standard channels being closed. If the
-     * refCount is now 1 it means that the last reference to the standard
-     * channel is being explicitly closed, so bump the refCount down
-     * artificially to 0. This will ensure that the channel is actually
-     * closed, below. Also set the static pointer to NULL for the channel.
-     */
-
-    CheckForStdChannelsBeingClosed(chan);
-
-    /*
-     * If the refCount reached zero, close the actual channel.
-     */
-
-    if (chanPtr->refCount <= 0) {
-
-        /*
-         * Ensure that if there is another buffer, it gets flushed
-         * whether or not we are doing a background flush.
-         */
-
-        if ((chanPtr->curOutPtr != NULL) &&
-                (chanPtr->curOutPtr->nextAdded >
-                        chanPtr->curOutPtr->nextRemoved)) {
-            chanPtr->flags |= BUFFER_READY;
-        }
-        chanPtr->flags |= CHANNEL_CLOSED;
-        if (!(chanPtr->flags & BG_FLUSH_SCHEDULED)) {
-            if (Tcl_Close(interp, chan) != TCL_OK) {
-                return TCL_ERROR;
-            }
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_GetChannel --
- *
- *	Finds an existing Tcl_Channel structure by name in a given
- *	interpreter. This function is public because it is used by
- *	channel-type-specific functions.
- *
- * Results:
- *	A Tcl_Channel or NULL on failure. If failed, interp's result
- *	object contains an error message.  *modePtr is filled with the
- *	modes in which the channel was opened.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_GetChannel(interp, chanName, modePtr)
-    Tcl_Interp *interp;		/* Interpreter in which to find or create
-                                 * the channel. */
-    char *chanName;		/* The name of the channel. */
-    int *modePtr;		/* Where to store the mode in which the
-                                 * channel was opened? Will contain an ORed
-                                 * combination of TCL_READABLE and
-                                 * TCL_WRITABLE, if non-NULL. */
-{
-    Channel *chanPtr;		/* The actual channel. */
-    Tcl_HashTable *hTblPtr;	/* Hash table of channels. */
-    Tcl_HashEntry *hPtr;	/* Search variable. */
-    char *name;			/* Translated name. */
-
-    /*
-     * Substitute "stdin", etc.  Note that even though we immediately
-     * find the channel using Tcl_GetStdChannel, we still need to look
-     * it up in the specified interpreter to ensure that it is present
-     * in the channel table.  Otherwise, safe interpreters would always
-     * have access to the standard channels.
-     */
-
-    name = chanName;
-    if ((chanName[0] == 's') && (chanName[1] == 't')) {
-	chanPtr = NULL;
-	if (strcmp(chanName, "stdin") == 0) {
-	    chanPtr = (Channel *)Tcl_GetStdChannel(TCL_STDIN);
-	} else if (strcmp(chanName, "stdout") == 0) {
-	    chanPtr = (Channel *)Tcl_GetStdChannel(TCL_STDOUT);
-	} else if (strcmp(chanName, "stderr") == 0) {
-	    chanPtr = (Channel *)Tcl_GetStdChannel(TCL_STDERR);
-	}
-	if (chanPtr != NULL) {
-	    name = chanPtr->channelName;
-	}
-    }
-    
-    hTblPtr = GetChannelTable(interp);
-    hPtr = Tcl_FindHashEntry(hTblPtr, name);
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        Tcl_AppendResult(interp, "can not find channel named \"",
-                chanName, "\"", (char *) NULL);
-        return NULL;
-    }
-
-    chanPtr = (Channel *) Tcl_GetHashValue(hPtr);
-    if (modePtr != NULL) {
-        *modePtr = (chanPtr->flags & (TCL_READABLE|TCL_WRITABLE));
-    }
-    
-    return (Tcl_Channel) chanPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateChannel --
- *
- *	Creates a new entry in the hash table for a Tcl_Channel
- *	record.
- *
- * Results:
- *	Returns the new Tcl_Channel.
- *
- * Side effects:
- *	Creates a new Tcl_Channel instance and inserts it into the
- *	hash table.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_CreateChannel(typePtr, chanName, instanceData, mask)
-    Tcl_ChannelType *typePtr;	/* The channel type record. */
-    char *chanName;		/* Name of channel to record. */
-    ClientData instanceData;	/* Instance specific data. */
-    int mask;			/* TCL_READABLE & TCL_WRITABLE to indicate
-                                 * if the channel is readable, writable. */
-{
-    Channel *chanPtr;		/* The channel structure newly created. */
-    CONST char *name;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    chanPtr = (Channel *) ckalloc((unsigned) sizeof(Channel));
-    
-    if (chanName != (char *) NULL) {
-        chanPtr->channelName = ckalloc((unsigned) (strlen(chanName) + 1));
-        strcpy(chanPtr->channelName, chanName);
-    } else {
-        panic("Tcl_CreateChannel: NULL channel name");
-    }
-
-    chanPtr->flags = mask;
-
-    /*
-     * Set the channel to system default encoding.
-     */
-
-    chanPtr->encoding = NULL;
-    name = Tcl_GetEncodingName(NULL);
-    if (strcmp(name, "binary") != 0) {
-    	chanPtr->encoding = Tcl_GetEncoding(NULL, name);
-    }
-    chanPtr->inputEncodingState = NULL;
-    chanPtr->inputEncodingFlags = TCL_ENCODING_START;
-    chanPtr->outputEncodingState = NULL;
-    chanPtr->outputEncodingFlags = TCL_ENCODING_START;
-
-    /*
-     * Set the channel up initially in AUTO input translation mode to
-     * accept "\n", "\r" and "\r\n". Output translation mode is set to
-     * a platform specific default value. The eofChar is set to 0 for both
-     * input and output, so that Tcl does not look for an in-file EOF
-     * indicator (e.g. ^Z) and does not append an EOF indicator to files.
-     */
-
-    chanPtr->inputTranslation = TCL_TRANSLATE_AUTO;
-    chanPtr->outputTranslation = TCL_PLATFORM_TRANSLATION;
-    chanPtr->inEofChar = 0;
-    chanPtr->outEofChar = 0;
-
-    chanPtr->unreportedError = 0;
-    chanPtr->instanceData = instanceData;
-    chanPtr->typePtr = typePtr;
-    chanPtr->refCount = 0;
-    chanPtr->closeCbPtr = (CloseCallback *) NULL;
-    chanPtr->curOutPtr = (ChannelBuffer *) NULL;
-    chanPtr->outQueueHead = (ChannelBuffer *) NULL;
-    chanPtr->outQueueTail = (ChannelBuffer *) NULL;
-    chanPtr->saveInBufPtr = (ChannelBuffer *) NULL;
-    chanPtr->inQueueHead = (ChannelBuffer *) NULL;
-    chanPtr->inQueueTail = (ChannelBuffer *) NULL;
-    chanPtr->chPtr = (ChannelHandler *) NULL;
-    chanPtr->interestMask = 0;
-    chanPtr->scriptRecordPtr = (EventScriptRecord *) NULL;
-    chanPtr->bufSize = CHANNELBUFFER_DEFAULT_SIZE;
-    chanPtr->timer = NULL;
-    chanPtr->csPtr = NULL;
-
-    chanPtr->outputStage = NULL;
-    if ((chanPtr->encoding != NULL) && (chanPtr->flags & TCL_WRITABLE)) {
-	chanPtr->outputStage = (char *)
-		ckalloc((unsigned) (chanPtr->bufSize + 2));
-    }
-
-    /*
-     * Link the channel into the list of all channels; create an on-exit
-     * handler if there is not one already, to close off all the channels
-     * in the list on exit.
-     */
-
-    chanPtr->nextChanPtr = tsdPtr->firstChanPtr;
-    tsdPtr->firstChanPtr = chanPtr;
-
-    /*
-     * Install this channel in the first empty standard channel slot, if
-     * the channel was previously closed explicitly.
-     */
-
-    if ((tsdPtr->stdinChannel == NULL) && (tsdPtr->stdinInitialized == 1)) {
-	Tcl_SetStdChannel((Tcl_Channel)chanPtr, TCL_STDIN);
-        Tcl_RegisterChannel((Tcl_Interp *) NULL, (Tcl_Channel) chanPtr);
-    } else if ((tsdPtr->stdoutChannel == NULL) && (tsdPtr->stdoutInitialized == 1)) {
-	Tcl_SetStdChannel((Tcl_Channel)chanPtr, TCL_STDOUT);
-        Tcl_RegisterChannel((Tcl_Interp *) NULL, (Tcl_Channel) chanPtr);
-    } else if ((tsdPtr->stderrChannel == NULL) && (tsdPtr->stderrInitialized == 1)) {
-	Tcl_SetStdChannel((Tcl_Channel)chanPtr, TCL_STDERR);
-        Tcl_RegisterChannel((Tcl_Interp *) NULL, (Tcl_Channel) chanPtr);
-    } 
-    return (Tcl_Channel) chanPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelMode --
- *
- *	Computes a mask indicating whether the channel is open for
- *	reading and writing.
- *
- * Results:
- *	An OR-ed combination of TCL_READABLE and TCL_WRITABLE.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetChannelMode(chan)
-    Tcl_Channel chan;		/* The channel for which the mode is
-                                 * being computed. */
-{
-    Channel *chanPtr;		/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-    return (chanPtr->flags & (TCL_READABLE | TCL_WRITABLE));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelName --
- *
- *	Returns the string identifying the channel name.
- *
- * Results:
- *	The string containing the channel name. This memory is
- *	owned by the generic layer and should not be modified by
- *	the caller.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetChannelName(chan)
-    Tcl_Channel chan;		/* The channel for which to return the name. */
-{
-    Channel *chanPtr;		/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-    return chanPtr->channelName;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelType --
- *
- *	Given a channel structure, returns the channel type structure.
- *
- * Results:
- *	Returns a pointer to the channel type structure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_ChannelType *
-Tcl_GetChannelType(chan)
-    Tcl_Channel chan;		/* The channel to return type for. */
-{
-    Channel *chanPtr;		/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-    return chanPtr->typePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelHandle --
- *
- *	Returns an OS handle associated with a channel.
- *
- * Results:
- *	Returns TCL_OK and places the handle in handlePtr, or returns
- *	TCL_ERROR on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetChannelHandle(chan, direction, handlePtr)
-    Tcl_Channel chan;		/* The channel to get file from. */
-    int direction;		/* TCL_WRITABLE or TCL_READABLE. */
-    ClientData *handlePtr;	/* Where to store handle */
-{
-    Channel *chanPtr;		/* The actual channel. */
-    ClientData handle;
-    int result;
-
-    chanPtr = (Channel *) chan;
-    result = (chanPtr->typePtr->getHandleProc)(chanPtr->instanceData,
-	    direction, &handle);
-    if (handlePtr) {
-	*handlePtr = handle;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelInstanceData --
- *
- *	Returns the client data associated with a channel.
- *
- * Results:
- *	The client data.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_GetChannelInstanceData(chan)
-    Tcl_Channel chan;		/* Channel for which to return client data. */
-{
-    Channel *chanPtr;		/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-    return chanPtr->instanceData;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * AllocChannelBuffer --
- *
- *	A channel buffer has BUFFER_PADDING bytes extra at beginning to
- *	hold any bytes of a native-encoding character that got split by
- *	the end of the previous buffer and need to be moved to the
- *	beginning of the next buffer to make a contiguous string so it
- *	can be converted to UTF-8.
- *
- *	A channel buffer has BUFFER_PADDING bytes extra at the end to
- *	hold any bytes of a native-encoding character (generated from a
- *	UTF-8 character) that overflow past the end of the buffer and
- *	need to be moved to the next buffer.
- *
- * Results:
- *	A newly allocated channel buffer.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static ChannelBuffer *
-AllocChannelBuffer(length)
-    int length;			/* Desired length of channel buffer. */
-{
-    ChannelBuffer *bufPtr;
-    int n;
-
-    n = length + CHANNELBUFFER_HEADER_SIZE + BUFFER_PADDING + BUFFER_PADDING;
-    bufPtr = (ChannelBuffer *) ckalloc((unsigned) n);
-    bufPtr->nextAdded	= BUFFER_PADDING;
-    bufPtr->nextRemoved	= BUFFER_PADDING;
-    bufPtr->bufLength	= length + BUFFER_PADDING;
-    bufPtr->nextPtr	= (ChannelBuffer *) NULL;
-    return bufPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RecycleBuffer --
- *
- *	Helper function to recycle input and output buffers. Ensures
- *	that two input buffers are saved (one in the input queue and
- *	another in the saveInBufPtr field) and that curOutPtr is set
- *	to a buffer. Only if these conditions are met is the buffer
- *	freed to the OS.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May free a buffer to the OS.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RecycleBuffer(chanPtr, bufPtr, mustDiscard)
-    Channel *chanPtr;		/* Channel for which to recycle buffers. */
-    ChannelBuffer *bufPtr;	/* The buffer to recycle. */
-    int mustDiscard;		/* If nonzero, free the buffer to the
-                                 * OS, always. */
-{
-    /*
-     * Do we have to free the buffer to the OS?
-     */
-
-    if (mustDiscard) {
-        ckfree((char *) bufPtr);
-        return;
-    }
-    
-    /*
-     * Only save buffers for the input queue if the channel is readable.
-     */
-    
-    if (chanPtr->flags & TCL_READABLE) {
-        if (chanPtr->inQueueHead == (ChannelBuffer *) NULL) {
-            chanPtr->inQueueHead = bufPtr;
-            chanPtr->inQueueTail = bufPtr;
-            goto keepit;
-        }
-        if (chanPtr->saveInBufPtr == (ChannelBuffer *) NULL) {
-            chanPtr->saveInBufPtr = bufPtr;
-            goto keepit;
-        }
-    }
-
-    /*
-     * Only save buffers for the output queue if the channel is writable.
-     */
-
-    if (chanPtr->flags & TCL_WRITABLE) {
-        if (chanPtr->curOutPtr == (ChannelBuffer *) NULL) {
-            chanPtr->curOutPtr = bufPtr;
-            goto keepit;
-        }
-    }
-
-    /*
-     * If we reached this code we return the buffer to the OS.
-     */
-
-    ckfree((char *) bufPtr);
-    return;
-
-keepit:
-    bufPtr->nextRemoved = BUFFER_PADDING;
-    bufPtr->nextAdded = BUFFER_PADDING;
-    bufPtr->nextPtr = (ChannelBuffer *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DiscardOutputQueued --
- *
- *	Discards all output queued in the output queue of a channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Recycles buffers.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DiscardOutputQueued(chanPtr)
-    Channel *chanPtr;		/* The channel for which to discard output. */
-{
-    ChannelBuffer *bufPtr;
-    
-    while (chanPtr->outQueueHead != (ChannelBuffer *) NULL) {
-        bufPtr = chanPtr->outQueueHead;
-        chanPtr->outQueueHead = bufPtr->nextPtr;
-        RecycleBuffer(chanPtr, bufPtr, 0);
-    }
-    chanPtr->outQueueHead = (ChannelBuffer *) NULL;
-    chanPtr->outQueueTail = (ChannelBuffer *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckForDeadChannel --
- *
- *	This function checks is a given channel is Dead.
- *      (A channel that has been closed but not yet deallocated.)
- *
- * Results:
- *	True (1) if channel is Dead, False (0) if channel is Ok
- *
- * Side effects:
- *      None
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CheckForDeadChannel(interp, chanPtr)
-    Tcl_Interp *interp;		/* For error reporting (can be NULL) */
-    Channel    *chanPtr;	/* The channel to check. */
-{
-    if (chanPtr->flags & CHANNEL_DEAD) {
-        Tcl_SetErrno(EINVAL);
-	if (interp) {
-	    Tcl_AppendResult(interp,
-			     "unable to access channel: invalid channel",
-			     (char *) NULL);   
-	}
-	return 1;
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FlushChannel --
- *
- *	This function flushes as much of the queued output as is possible
- *	now. If calledFromAsyncFlush is nonzero, it is being called in an
- *	event handler to flush channel output asynchronously.
- *
- * Results:
- *	0 if successful, else the error code that was returned by the
- *	channel type operation.
- *
- * Side effects:
- *	May produce output on a channel. May block indefinitely if the
- *	channel is synchronous. May schedule an async flush on the channel.
- *	May recycle memory for buffers in the output queue.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FlushChannel(interp, chanPtr, calledFromAsyncFlush)
-    Tcl_Interp *interp;			/* For error reporting during close. */
-    Channel *chanPtr;			/* The channel to flush on. */
-    int calledFromAsyncFlush;		/* If nonzero then we are being
-                                         * called from an asynchronous
-                                         * flush callback. */
-{
-    ChannelBuffer *bufPtr;		/* Iterates over buffered output
-                                         * queue. */
-    int toWrite;			/* Amount of output data in current
-                                         * buffer available to be written. */
-    int written;			/* Amount of output data actually
-                                         * written in current round. */
-    int errorCode = 0;			/* Stores POSIX error codes from
-                                         * channel driver operations. */
-    int wroteSome = 0;			/* Set to one if any data was
-					 * written to the driver. */
-
-    /*
-     * Prevent writing on a dead channel -- a channel that has been closed
-     * but not yet deallocated. This can occur if the exit handler for the
-     * channel deallocation runs before all channels are deregistered in
-     * all interpreters.
-     */
-    
-    if (CheckForDeadChannel(interp,chanPtr)) return -1;
-    
-    /*
-     * Loop over the queued buffers and attempt to flush as
-     * much as possible of the queued output to the channel.
-     */
-
-    while (1) {
-
-        /*
-         * If the queue is empty and there is a ready current buffer, OR if
-         * the current buffer is full, then move the current buffer to the
-         * queue.
-         */
-        
-        if (((chanPtr->curOutPtr != (ChannelBuffer *) NULL) &&
-                (chanPtr->curOutPtr->nextAdded == chanPtr->curOutPtr->bufLength))
-                || ((chanPtr->flags & BUFFER_READY) &&
-                        (chanPtr->outQueueHead == (ChannelBuffer *) NULL))) {
-            chanPtr->flags &= (~(BUFFER_READY));
-            chanPtr->curOutPtr->nextPtr = (ChannelBuffer *) NULL;
-            if (chanPtr->outQueueHead == (ChannelBuffer *) NULL) {
-                chanPtr->outQueueHead = chanPtr->curOutPtr;
-            } else {
-                chanPtr->outQueueTail->nextPtr = chanPtr->curOutPtr;
-            }
-            chanPtr->outQueueTail = chanPtr->curOutPtr;
-            chanPtr->curOutPtr = (ChannelBuffer *) NULL;
-        }
-        bufPtr = chanPtr->outQueueHead;
-
-        /*
-         * If we are not being called from an async flush and an async
-         * flush is active, we just return without producing any output.
-         */
-
-        if ((!calledFromAsyncFlush) &&
-                (chanPtr->flags & BG_FLUSH_SCHEDULED)) {
-            return 0;
-        }
-
-        /*
-         * If the output queue is still empty, break out of the while loop.
-         */
-
-        if (bufPtr == (ChannelBuffer *) NULL) {
-            break;	/* Out of the "while (1)". */
-        }
-
-        /*
-         * Produce the output on the channel.
-         */
-        
-        toWrite = bufPtr->nextAdded - bufPtr->nextRemoved;
-        written = (chanPtr->typePtr->outputProc) (chanPtr->instanceData,
-                (char *) bufPtr->buf + bufPtr->nextRemoved, toWrite,
-		&errorCode);
-            
-	/*
-         * If the write failed completely attempt to start the asynchronous
-         * flush mechanism and break out of this loop - do not attempt to
-         * write any more output at this time.
-         */
-
-        if (written < 0) {
-            
-            /*
-             * If the last attempt to write was interrupted, simply retry.
-             */
-            
-            if (errorCode == EINTR) {
-                errorCode = 0;
-                continue;
-            }
-
-            /*
-             * If the channel is non-blocking and we would have blocked,
-             * start a background flushing handler and break out of the loop.
-             */
-
-            if ((errorCode == EWOULDBLOCK) || (errorCode == EAGAIN)) {
-		if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-		    if (!(chanPtr->flags & BG_FLUSH_SCHEDULED)) {
-			chanPtr->flags |= BG_FLUSH_SCHEDULED;
-			UpdateInterest(chanPtr);
-                    }
-                    errorCode = 0;
-                    break;
-		} else {
-		    panic("Blocking channel driver did not block on output");
-                }
-            }
-
-            /*
-             * Decide whether to report the error upwards or defer it.
-             */
-
-            if (calledFromAsyncFlush) {
-                if (chanPtr->unreportedError == 0) {
-                    chanPtr->unreportedError = errorCode;
-                }
-            } else {
-                Tcl_SetErrno(errorCode);
-		if (interp != NULL) {
-		    Tcl_SetResult(interp,
-			    Tcl_PosixError(interp), TCL_VOLATILE);
-		}
-            }
-
-            /*
-             * When we get an error we throw away all the output
-             * currently queued.
-             */
-
-            DiscardOutputQueued(chanPtr);
-            continue;
-        } else {
-	    wroteSome = 1;
-	}
-
-        bufPtr->nextRemoved += written;
-
-        /*
-         * If this buffer is now empty, recycle it.
-         */
-
-        if (bufPtr->nextRemoved == bufPtr->nextAdded) {
-            chanPtr->outQueueHead = bufPtr->nextPtr;
-            if (chanPtr->outQueueHead == (ChannelBuffer *) NULL) {
-                chanPtr->outQueueTail = (ChannelBuffer *) NULL;
-            }
-            RecycleBuffer(chanPtr, bufPtr, 0);
-        }
-    }	/* Closes "while (1)". */
-
-    /*
-     * If we wrote some data while flushing in the background, we are done.
-     * We can't finish the background flush until we run out of data and
-     * the channel becomes writable again.  This ensures that all of the
-     * pending data has been flushed at the system level.
-     */
-
-    if (chanPtr->flags & BG_FLUSH_SCHEDULED) {
-	if (wroteSome) {
-	    return errorCode;
-	} else if (chanPtr->outQueueHead == (ChannelBuffer *) NULL) {
-	    chanPtr->flags &= (~(BG_FLUSH_SCHEDULED));
-	    (chanPtr->typePtr->watchProc)(chanPtr->instanceData,
-		    chanPtr->interestMask);
-	}
-    }
-
-    /*
-     * If the channel is flagged as closed, delete it when the refCount
-     * drops to zero, the output queue is empty and there is no output
-     * in the current output buffer.
-     */
-
-    if ((chanPtr->flags & CHANNEL_CLOSED) && (chanPtr->refCount <= 0) &&
-            (chanPtr->outQueueHead == (ChannelBuffer *) NULL) &&
-            ((chanPtr->curOutPtr == (ChannelBuffer *) NULL) ||
-                    (chanPtr->curOutPtr->nextAdded ==
-                            chanPtr->curOutPtr->nextRemoved))) {
-        return CloseChannel(interp, chanPtr, errorCode);
-    }
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CloseChannel --
- *
- *	Utility procedure to close a channel and free its associated
- *	resources.
- *
- * Results:
- *	0 on success or a POSIX error code if the operation failed.
- *
- * Side effects:
- *	May close the actual channel; may free memory.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CloseChannel(interp, chanPtr, errorCode)
-    Tcl_Interp *interp;			/* For error reporting. */
-    Channel *chanPtr;			/* The channel to close. */
-    int errorCode;			/* Status of operation so far. */
-{
-    int result = 0;			/* Of calling driver close
-                                         * operation. */
-    Channel *prevChanPtr;		/* Preceding channel in list of
-                                         * all channels - used to splice a
-                                         * channel out of the list on close. */
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (chanPtr == NULL) {
-        return result;
-    }
-    
-    /*
-     * No more input can be consumed so discard any leftover input.
-     */
-
-    DiscardInputQueued(chanPtr, 1);
-
-    /*
-     * Discard a leftover buffer in the current output buffer field.
-     */
-
-    if (chanPtr->curOutPtr != (ChannelBuffer *) NULL) {
-        ckfree((char *) chanPtr->curOutPtr);
-        chanPtr->curOutPtr = (ChannelBuffer *) NULL;
-    }
-    
-    /*
-     * The caller guarantees that there are no more buffers
-     * queued for output.
-     */
-
-    if (chanPtr->outQueueHead != (ChannelBuffer *) NULL) {
-        panic("TclFlush, closed channel: queued output left");
-    }
-
-    /*
-     * If the EOF character is set in the channel, append that to the
-     * output device.
-     */
-
-    if ((chanPtr->outEofChar != 0) && (chanPtr->flags & TCL_WRITABLE)) {
-        int dummy;
-        char c;
-
-        c = (char) chanPtr->outEofChar;
-        (chanPtr->typePtr->outputProc) (chanPtr->instanceData, &c, 1, &dummy);
-    }
-
-    /*
-     * Remove TCL_READABLE and TCL_WRITABLE from chanPtr->flags, so
-     * that close callbacks can not do input or output (assuming they
-     * squirreled the channel away in their clientData). This also
-     * prevents infinite loops if the callback calls any C API that
-     * could call FlushChannel.
-     */
-
-    chanPtr->flags &= (~(TCL_READABLE|TCL_WRITABLE));
-        
-    /*
-     * Splice this channel out of the list of all channels.
-     */
-
-    if (chanPtr == tsdPtr->firstChanPtr) {
-        tsdPtr->firstChanPtr = chanPtr->nextChanPtr;
-    } else {
-        for (prevChanPtr = tsdPtr->firstChanPtr;
-                 (prevChanPtr != (Channel *) NULL) &&
-                     (prevChanPtr->nextChanPtr != chanPtr);
-                 prevChanPtr = prevChanPtr->nextChanPtr) {
-            /* Empty loop body. */
-        }
-        if (prevChanPtr == (Channel *) NULL) {
-            panic("FlushChannel: damaged channel list");
-        }
-        prevChanPtr->nextChanPtr = chanPtr->nextChanPtr;
-    }
-
-    /*
-     * Close and free the channel driver state.
-     */
-            
-    if (chanPtr->typePtr->closeProc != TCL_CLOSE2PROC) {
-	result = (chanPtr->typePtr->closeProc)(chanPtr->instanceData, interp);
-    } else {
-	result = (chanPtr->typePtr->close2Proc)(chanPtr->instanceData, interp,
-		0);
-    }
-    
-    if (chanPtr->channelName != (char *) NULL) {
-        ckfree(chanPtr->channelName);
-    }
-    Tcl_FreeEncoding(chanPtr->encoding);
-    if (chanPtr->outputStage != NULL) {
-	ckfree((char *) chanPtr->outputStage);
-    }
-    
-    /*
-     * If we are being called synchronously, report either
-     * any latent error on the channel or the current error.
-     */
-        
-    if (chanPtr->unreportedError != 0) {
-        errorCode = chanPtr->unreportedError;
-    }
-    if (errorCode == 0) {
-        errorCode = result;
-        if (errorCode != 0) {
-            Tcl_SetErrno(errorCode);
-        }
-    }
-
-    /*
-     * Cancel any outstanding timer.
-     */
-
-    Tcl_DeleteTimerHandler(chanPtr->timer);
-
-    /*
-     * Mark the channel as deleted by clearing the type structure.
-     */
-
-    chanPtr->typePtr = NULL;
-
-    Tcl_EventuallyFree((ClientData) chanPtr, TCL_DYNAMIC);
-
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Close --
- *
- *	Closes a channel.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Closes the channel if this is the last reference.
- *
- * NOTE:
- *	Tcl_Close removes the channel as far as the user is concerned.
- *	However, it may continue to exist for a while longer if it has
- *	a background flush scheduled. The device itself is eventually
- *	closed and the channel record removed, in CloseChannel, above.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_Close(interp, chan)
-    Tcl_Interp *interp;			/* Interpreter for errors. */
-    Tcl_Channel chan;			/* The channel being closed. Must
-                                         * not be referenced in any
-                                         * interpreter. */
-{
-    ChannelHandler *chPtr, *chNext;	/* Iterate over channel handlers. */
-    CloseCallback *cbPtr;		/* Iterate over close callbacks
-                                         * for this channel. */
-    EventScriptRecord *ePtr, *eNextPtr;	/* Iterate over eventscript records. */
-    Channel *chanPtr;			/* The real IO channel. */
-    int result;				/* Of calling FlushChannel. */
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    NextChannelHandler *nhPtr;
-
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_OK;
-    }
-    
-    /*
-     * Perform special handling for standard channels being closed. If the
-     * refCount is now 1 it means that the last reference to the standard
-     * channel is being explicitly closed, so bump the refCount down
-     * artificially to 0. This will ensure that the channel is actually
-     * closed, below. Also set the static pointer to NULL for the channel.
-     */
-
-    CheckForStdChannelsBeingClosed(chan);
-
-    chanPtr = (Channel *) chan;
-    if (chanPtr->refCount > 0) {
-        panic("called Tcl_Close on channel with refCount > 0");
-    }
-
-    /*
-     * Remove any references to channel handlers for this channel that
-     * may be about to be invoked.
-     */
-
-    for (nhPtr = tsdPtr->nestedHandlerPtr;
-             nhPtr != (NextChannelHandler *) NULL;
-             nhPtr = nhPtr->nestedHandlerPtr) {
-        if (nhPtr->nextHandlerPtr &&
-		(nhPtr->nextHandlerPtr->chanPtr == chanPtr)) {
-	    nhPtr->nextHandlerPtr = NULL;
-        }
-    }
-
-    /*
-     * Remove all the channel handler records attached to the channel
-     * itself.
-     */
-        
-    for (chPtr = chanPtr->chPtr;
-             chPtr != (ChannelHandler *) NULL;
-             chPtr = chNext) {
-        chNext = chPtr->nextPtr;
-        ckfree((char *) chPtr);
-    }
-    chanPtr->chPtr = (ChannelHandler *) NULL;
-    
-    
-    /*
-     * Cancel any pending copy operation.
-     */
-
-    StopCopy(chanPtr->csPtr);
-
-    /*
-     * Must set the interest mask now to 0, otherwise infinite loops
-     * will occur if Tcl_DoOneEvent is called before the channel is
-     * finally deleted in FlushChannel. This can happen if the channel
-     * has a background flush active.
-     */
-        
-    chanPtr->interestMask = 0;
-    
-    /*
-     * Remove any EventScript records for this channel.
-     */
-
-    for (ePtr = chanPtr->scriptRecordPtr;
-             ePtr != (EventScriptRecord *) NULL;
-             ePtr = eNextPtr) {
-        eNextPtr = ePtr->nextPtr;
-	Tcl_DecrRefCount(ePtr->scriptPtr);
-        ckfree((char *) ePtr);
-    }
-    chanPtr->scriptRecordPtr = (EventScriptRecord *) NULL;
-        
-    /*
-     * Invoke the registered close callbacks and delete their records.
-     */
-
-    while (chanPtr->closeCbPtr != (CloseCallback *) NULL) {
-        cbPtr = chanPtr->closeCbPtr;
-        chanPtr->closeCbPtr = cbPtr->nextPtr;
-        (cbPtr->proc) (cbPtr->clientData);
-        ckfree((char *) cbPtr);
-    }
-
-    /*
-     * Ensure that the last output buffer will be flushed.
-     */
-    
-    if ((chanPtr->curOutPtr != (ChannelBuffer *) NULL) &&
-           (chanPtr->curOutPtr->nextAdded > chanPtr->curOutPtr->nextRemoved)) {
-        chanPtr->flags |= BUFFER_READY;
-    }
-
-    /*
-     * If this channel supports it, close the read side, since we don't need it
-     * anymore and this will help avoid deadlocks on some channel types.
-     */
-
-    if (chanPtr->typePtr->closeProc == TCL_CLOSE2PROC) {
-	result = (chanPtr->typePtr->close2Proc)(chanPtr->instanceData, interp,
-		TCL_CLOSE_READ);
-    } else {
-	result = 0;
-    }
-
-    /*
-     * The call to FlushChannel will flush any queued output and invoke
-     * the close function of the channel driver, or it will set up the
-     * channel to be flushed and closed asynchronously.
-     */
-
-    chanPtr->flags |= CHANNEL_CLOSED;
-    if ((FlushChannel(interp, chanPtr, 0) != 0) || (result != 0)) {
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Write --
- *
- *	Puts a sequence of bytes into an output buffer, may queue the
- *	buffer for output if it gets full, and also remembers whether the
- *	current buffer is ready e.g. if it contains a newline and we are in
- *	line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Write(chan, src, srcLen)
-    Tcl_Channel chan;			/* The channel to buffer output for. */
-    char *src;				/* Data to queue in output buffer. */
-    int srcLen;				/* Length of data in bytes, or < 0 for
-					 * strlen(). */
-{
-    Channel *chanPtr;
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE) != 0) {
-	return -1;
-    }
-    if (srcLen < 0) {
-        srcLen = strlen(src);
-    }
-    return DoWrite(chanPtr, src, srcLen);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_WriteChars --
- *
- *	Takes a sequence of UTF-8 characters and converts them for output
- *	using the channel's current encoding, may queue the buffer for
- *	output if it gets full, and also remembers whether the current
- *	buffer is ready e.g. if it contains a newline and we are in
- *	line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WriteChars(chan, src, len)
-    Tcl_Channel chan;		/* The channel to buffer output for. */
-    CONST char *src;		/* UTF-8 characters to queue in output buffer. */
-    int len;			/* Length of string in bytes, or < 0 for 
-				 * strlen(). */
-{
-    Channel *chanPtr;
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE) != 0) {
-	return -1;
-    }
-    if (len < 0) {
-        len = strlen(src);
-    }
-    if (chanPtr->encoding == NULL) {
-	/*
-	 * Inefficient way to convert UTF-8 to byte-array, but the  
-	 * code parallels the way it is done for objects.
-	 */
-
-	Tcl_Obj *objPtr;
-	int result;
-
-	objPtr = Tcl_NewStringObj(src, len);
-	src = (char *) Tcl_GetByteArrayFromObj(objPtr, &len);
-	result = WriteBytes(chanPtr, src, len);
-	Tcl_DecrRefCount(objPtr);
-	return result;
-    }
-    return WriteChars(chanPtr, src, len);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_WriteObj --
- *
- *	Takes the Tcl object and queues its contents for output.  If the 
- *	encoding of the channel is NULL, takes the byte-array representation 
- *	of the object and queues those bytes for output.  Otherwise, takes 
- *	the characters in the UTF-8 (string) representation of the object 
- *	and converts them for output using the channel's current encoding.  
- *	May flush internal buffers to output if one becomes full or is ready 
- *	for some other reason, e.g. if it contains a newline and the channel 
- *	is in line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1, 
- *	Tcl_GetErrno() will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WriteObj(chan, objPtr)
-    Tcl_Channel chan;		/* The channel to buffer output for. */
-    Tcl_Obj *objPtr;		/* The object to write. */
-{
-    Channel *chanPtr;
-    char *src;
-    int srcLen;
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE) != 0) {
-	return -1;
-    }
-    if (chanPtr->encoding == NULL) {
-	src = (char *) Tcl_GetByteArrayFromObj(objPtr, &srcLen);
-	return WriteBytes(chanPtr, src, srcLen);
-    } else {
-	src = Tcl_GetStringFromObj(objPtr, &srcLen);
-	return WriteChars(chanPtr, src, srcLen);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WriteBytes --
- *
- *	Write a sequence of bytes into an output buffer, may queue the
- *	buffer for output if it gets full, and also remembers whether the
- *	current buffer is ready e.g. if it contains a newline and we are in
- *	line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WriteBytes(chanPtr, src, srcLen)
-    Channel *chanPtr;		/* The channel to buffer output for. */
-    CONST char *src;		/* Bytes to write. */
-    int srcLen;			/* Number of bytes to write. */
-{
-    ChannelBuffer *bufPtr;
-    char *dst;
-    int dstLen, dstMax, sawLF, savedLF, total, toWrite;
-    
-    total = 0;
-    sawLF = 0;
-    savedLF = 0;
-
-    /*
-     * Loop over all bytes in src, storing them in output buffer with
-     * proper EOL translation.
-     */
-
-    while (srcLen + savedLF > 0) {
-	bufPtr = chanPtr->curOutPtr;
-	if (bufPtr == NULL) {
-	    bufPtr = AllocChannelBuffer(chanPtr->bufSize);
-	    chanPtr->curOutPtr	= bufPtr;
-	}
-	dst = bufPtr->buf + bufPtr->nextAdded;
-	dstMax = bufPtr->bufLength - bufPtr->nextAdded;
-	dstLen = dstMax;
-
-	toWrite = dstLen;
-	if (toWrite > srcLen) {
-	    toWrite = srcLen;
-	}
-
-	if (savedLF) {
-	    /*
-	     * A '\n' was left over from last call to TranslateOutputEOL()
-	     * and we need to store it in this buffer.  If the channel is
-	     * line-based, we will need to flush it.
-	     */
-
-	    *dst++ = '\n';
-	    dstLen--;
-	    sawLF++;
-	}
-	sawLF += TranslateOutputEOL(chanPtr, dst, src, &dstLen, &toWrite);
-	dstLen += savedLF;
-	savedLF = 0;
-
-	if (dstLen > dstMax) {
-	    savedLF = 1;
-	    dstLen = dstMax;
-	}
-	bufPtr->nextAdded += dstLen;
-	if (CheckFlush(chanPtr, bufPtr, sawLF) != 0) {
-	    return -1;
-	}
-	total += dstLen;
-	src += toWrite;
-	srcLen -= toWrite;
-	sawLF = 0;
-    }
-    return total;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WriteChars --
- *
- *	Convert UTF-8 bytes to the channel's external encoding and
- *	write the produced bytes into an output buffer, may queue the 
- *	buffer for output if it gets full, and also remembers whether the
- *	current buffer is ready e.g. if it contains a newline and we are in
- *	line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WriteChars(chanPtr, src, srcLen)
-    Channel *chanPtr;		/* The channel to buffer output for. */
-    CONST char *src;		/* UTF-8 string to write. */
-    int srcLen;			/* Length of UTF-8 string in bytes. */
-{
-    ChannelBuffer *bufPtr;
-    char *dst, *stage;
-    int saved, savedLF, sawLF, total, toWrite, flags;
-    int dstWrote, dstLen, stageLen, stageMax, stageRead;
-    Tcl_Encoding encoding;
-    char safe[BUFFER_PADDING];
-    
-    total = 0;
-    sawLF = 0;
-    savedLF = 0;
-    saved = 0;
-    encoding = chanPtr->encoding;
-
-    /*
-     * Loop over all UTF-8 characters in src, storing them in staging buffer
-     * with proper EOL translation.
-     */
-
-    while (srcLen + savedLF > 0) {
-	stage = chanPtr->outputStage;
-	stageMax = chanPtr->bufSize;
-	stageLen = stageMax;
-
-	toWrite = stageLen;
-	if (toWrite > srcLen) {
-	    toWrite = srcLen;
-	}
-
-	if (savedLF) {
-	    /*
-	     * A '\n' was left over from last call to TranslateOutputEOL()
-	     * and we need to store it in the staging buffer.  If the
-	     * channel is line-based, we will need to flush the output
-	     * buffer (after translating the staging buffer).
-	     */
-	    
-	    *stage++ = '\n';
-	    stageLen--;
-	    sawLF++;
-	}
-	sawLF += TranslateOutputEOL(chanPtr, stage, src, &stageLen, &toWrite);
-
-	stage -= savedLF;
-	stageLen += savedLF;
-	savedLF = 0;
-
-	if (stageLen > stageMax) {
-	    savedLF = 1;
-	    stageLen = stageMax;
-	}
-	src += toWrite;
-	srcLen -= toWrite;
-
-	flags = chanPtr->outputEncodingFlags;
-	if (srcLen == 0) {
-	    flags |= TCL_ENCODING_END;
-	}
-
-	/*
-	 * Loop over all UTF-8 characters in staging buffer, converting them
-	 * to external encoding, storing them in output buffer.
-	 */
-
-	while (stageLen + saved > 0) {
-	    bufPtr = chanPtr->curOutPtr;
-	    if (bufPtr == NULL) {
-		bufPtr = AllocChannelBuffer(chanPtr->bufSize);
-		chanPtr->curOutPtr = bufPtr;
-	    }
-	    dst = bufPtr->buf + bufPtr->nextAdded;
-	    dstLen = bufPtr->bufLength - bufPtr->nextAdded;
-
-	    if (saved != 0) {
-		/*
-		 * Here's some translated bytes left over from the last
-		 * buffer that we need to stick at the beginning of this
-		 * buffer.
-		 */
-		 
-		memcpy((VOID *) dst, (VOID *) safe, (size_t) saved);
-		bufPtr->nextAdded += saved;
-		dst += saved;
-		dstLen -= saved;
-		saved = 0;
-	    }
-
-	    Tcl_UtfToExternal(NULL, encoding, stage, stageLen, flags,
-		    &chanPtr->outputEncodingState, dst,
-		    dstLen + BUFFER_PADDING, &stageRead, &dstWrote, NULL);
-	    if (stageRead + dstWrote == 0) {
-		/*
-		 * We have an incomplete UTF-8 character at the end of the
-		 * staging buffer.  It will get moved to the beginning of the
-		 * staging buffer followed by more bytes from src.
-		 */
-
-		src -= stageLen;
-		srcLen += stageLen;
-		stageLen = 0;
-		savedLF = 0;
-		break;
-	    }
-	    bufPtr->nextAdded += dstWrote;
-	    if (bufPtr->nextAdded > bufPtr->bufLength) {
-		/*
-		 * When translating from UTF-8 to external encoding, we
-		 * allowed the translation to produce a character that
-		 * crossed the end of the output buffer, so that we would
-		 * get a completely full buffer before flushing it.  The
-		 * extra bytes will be moved to the beginning of the next
-		 * buffer.
-		 */
-
-		saved = bufPtr->nextAdded - bufPtr->bufLength;
-		memcpy((VOID *) safe, (VOID *) (dst + dstLen), (size_t) saved);
-		bufPtr->nextAdded = bufPtr->bufLength;
-	    }
-	    if (CheckFlush(chanPtr, bufPtr, sawLF) != 0) {
-		return -1;
-	    }
-
-	    total += dstWrote;
-	    stage += stageRead;
-	    stageLen -= stageRead;
-	    sawLF = 0;
-	}
-    }
-    return total;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TranslateOutputEOL --
- *
- *	Helper function for WriteBytes() and WriteChars().  Converts the
- *	'\n' characters in the source buffer into the appropriate EOL
- *	form specified by the output translation mode.
- *
- *	EOL translation stops either when the source buffer is empty
- *	or the output buffer is full.
- *
- *	When converting to CRLF mode and there is only 1 byte left in
- *	the output buffer, this routine stores the '\r' in the last
- *	byte and then stores the '\n' in the byte just past the end of the 
- *	buffer.  The caller is responsible for passing in a buffer that
- *	is large enough to hold the extra byte.
- *
- * Results:
- *	The return value is 1 if a '\n' was translated from the source
- *	buffer, or 0 otherwise -- this can be used by the caller to
- *	decide to flush a line-based channel even though the channel
- *	buffer is not full.
- *
- *	*dstLenPtr is filled with how many bytes of the output buffer
- *	were used.  As mentioned above, this can be one more that
- *	the output buffer's specified length if a CRLF was stored.
- *
- *	*srcLenPtr is filled with how many bytes of the source buffer
- *	were consumed.  
- *
- * Side effects:
- *	It may be obvious, but bears mentioning that when converting
- *	in CRLF mode (which requires two bytes of storage in the output
- *	buffer), the number of bytes consumed from the source buffer
- *	will be less than the number of bytes stored in the output buffer.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-TranslateOutputEOL(chanPtr, dst, src, dstLenPtr, srcLenPtr)
-    Channel *chanPtr;		/* Channel being read, for translation and
-				 * buffering modes. */
-    char *dst;			/* Output buffer filled with UTF-8 chars by
-				 * applying appropriate EOL translation to
-				 * source characters. */
-    CONST char *src;		/* Source UTF-8 characters. */
-    int *dstLenPtr;		/* On entry, the maximum length of output
-				 * buffer in bytes.  On exit, the number of
-				 * bytes actually used in output buffer. */
-    int *srcLenPtr;		/* On entry, the length of source buffer.
-				 * On exit, the number of bytes read from
-				 * the source buffer. */
-{
-    char *dstEnd;
-    int srcLen, newlineFound;
-    
-    newlineFound = 0;
-    srcLen = *srcLenPtr;
-
-    switch (chanPtr->outputTranslation) {
-	case TCL_TRANSLATE_LF: {
-	    for (dstEnd = dst + srcLen; dst < dstEnd; ) {
-		if (*src == '\n') {
-		    newlineFound = 1;
-		}
-		*dst++ = *src++;
-	    }
-	    *dstLenPtr = srcLen;
-	    break;
-	}
-	case TCL_TRANSLATE_CR: {
-	    for (dstEnd = dst + srcLen; dst < dstEnd;) {
-		if (*src == '\n') {
-		    *dst++ = '\r';
-		    newlineFound = 1;
-		    src++;
-		} else {
-		    *dst++ = *src++;
-		}
-	    }
-	    *dstLenPtr = srcLen;
-	    break;
-	}
-	case TCL_TRANSLATE_CRLF: {
-	    /*
-	     * Since this causes the number of bytes to grow, we
-	     * start off trying to put 'srcLen' bytes into the
-	     * output buffer, but allow it to store more bytes, as
-	     * long as there's still source bytes and room in the
-	     * output buffer.
-	     */
-
-	    char *dstStart, *dstMax;
-	    CONST char *srcStart;
-	    
-	    dstStart = dst;
-	    dstMax = dst + *dstLenPtr;
-
-	    srcStart = src;
-	    
-	    if (srcLen < *dstLenPtr) {
-		dstEnd = dst + srcLen;
-	    } else {
-		dstEnd = dst + *dstLenPtr;
-	    }
-	    while (dst < dstEnd) {
-		if (*src == '\n') {
-		    if (dstEnd < dstMax) {
-			dstEnd++;
-		    }
-		    *dst++ = '\r';
-		    newlineFound = 1;
-		}
-		*dst++ = *src++;
-	    }
-	    *srcLenPtr = src - srcStart;
-	    *dstLenPtr = dst - dstStart;
-	    break;
-	}
-	default: {
-	    break;
-	}
-    }
-    return newlineFound;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CheckFlush --
- *
- *	Helper function for WriteBytes() and WriteChars().  If the
- *	channel buffer is ready to be flushed, flush it.
- *
- * Results:
- *	The return value is -1 if there was a problem flushing the
- *	channel buffer, or 0 otherwise.
- *
- * Side effects:
- *	The buffer will be recycled if it is flushed.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-CheckFlush(chanPtr, bufPtr, newlineFlag)
-    Channel *chanPtr;		/* Channel being read, for buffering mode. */
-    ChannelBuffer *bufPtr;	/* Channel buffer to possibly flush. */
-    int newlineFlag;		/* Non-zero if a the channel buffer
-				 * contains a newline. */
-{
-    /*
-     * The current buffer is ready for output:
-     * 1. if it is full.
-     * 2. if it contains a newline and this channel is line-buffered.
-     * 3. if it contains any output and this channel is unbuffered.
-     */
-
-    if ((chanPtr->flags & BUFFER_READY) == 0) {
-	if (bufPtr->nextAdded == bufPtr->bufLength) {
-	    chanPtr->flags |= BUFFER_READY;
-	} else if (chanPtr->flags & CHANNEL_LINEBUFFERED) {
-	    if (newlineFlag != 0) {
-		chanPtr->flags |= BUFFER_READY;
-	    }
-	} else if (chanPtr->flags & CHANNEL_UNBUFFERED) {
-	    chanPtr->flags |= BUFFER_READY;
-	}
-    }
-    if (chanPtr->flags & BUFFER_READY) {
-	if (FlushChannel(NULL, chanPtr, 0) != 0) {
-	    return -1;
-	}
-    }
-    return 0;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_Gets --
- *
- *	Reads a complete line of input from the channel into a Tcl_DString.
- *
- * Results:
- *	Length of line read (in characters) or -1 if error, EOF, or blocked.
- *	If -1, use Tcl_GetErrno() to retrieve the POSIX error code for the
- *	error or condition that occurred.
- *
- * Side effects:
- *	May flush output on the channel.  May cause input to be consumed
- *	from the channel.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_Gets(chan, lineRead)
-    Tcl_Channel chan;		/* Channel from which to read. */
-    Tcl_DString *lineRead;	/* The line read will be appended to this
-				 * DString as UTF-8 characters.  The caller
-				 * must have initialized it and is responsible
-				 * for managing the storage. */
-{
-    Tcl_Obj *objPtr;
-    int charsStored, length;
-    char *string;
-
-    objPtr = Tcl_NewObj();
-    charsStored = Tcl_GetsObj(chan, objPtr);
-    if (charsStored > 0) {
-	string = Tcl_GetStringFromObj(objPtr, &length);
-	Tcl_DStringAppend(lineRead, string, length);
-    }
-    Tcl_DecrRefCount(objPtr);
-    return charsStored;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_GetsObj --
- *
- *	Accumulate input from the input channel until end-of-line or
- *	end-of-file has been seen.  Bytes read from the input channel
- *	are converted to UTF-8 using the encoding specified by the
- *	channel.
- *
- * Results:
- *	Number of characters accumulated in the object or -1 if error,
- *	blocked, or EOF.  If -1, use Tcl_GetErrno() to retrieve the
- *	POSIX error code for the error or condition that occurred.
- *
- * Side effects:
- *	Consumes input from the channel.
- *
- *	On reading EOF, leave channel pointing at EOF char.
- *	On reading EOL, leave channel pointing after EOL, but don't
- *	return EOL in dst buffer.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_GetsObj(chan, objPtr)
-    Tcl_Channel chan;		/* Channel from which to read. */
-    Tcl_Obj *objPtr;		/* The line read will be appended to this
-				 * object as UTF-8 characters. */
-{
-    GetsState gs;
-    Channel *chanPtr;
-    int inEofChar, skip, copiedTotal;
-    ChannelBuffer *bufPtr;
-    Tcl_Encoding encoding;
-    char *dst, *dstEnd, *eol, *eof;
-    Tcl_EncodingState oldState;
-    int oldLength, oldFlags, oldRemoved;
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_READABLE) != 0) {
-	copiedTotal = -1;
-	goto done;
-    }
-
-    bufPtr = chanPtr->inQueueHead;
-    encoding = chanPtr->encoding;
-
-    /*
-     * Preserved so we can restore the channel's state in case we don't
-     * find a newline in the available input.
-     */
-
-    Tcl_GetStringFromObj(objPtr, &oldLength);
-    oldFlags = chanPtr->inputEncodingFlags;
-    oldState = chanPtr->inputEncodingState;
-    oldRemoved = BUFFER_PADDING;
-    if (bufPtr != NULL) {
-	oldRemoved = bufPtr->nextRemoved;
-    }
-
-    /*
-     * If there is no encoding, use "iso8859-1" -- Tcl_GetsObj() doesn't
-     * produce ByteArray objects.  To avoid circularity problems,
-     * "iso8859-1" is builtin to Tcl.
-     */
-
-    if (encoding == NULL) {
-	encoding = Tcl_GetEncoding(NULL, "iso8859-1");
-    }
-
-    /*
-     * Object used by FilterInputBytes to keep track of how much data has
-     * been consumed from the channel buffers.
-     */
-
-    gs.objPtr		= objPtr;
-    gs.dstPtr		= &dst;
-    gs.encoding		= encoding;
-    gs.bufPtr		= bufPtr;
-    gs.state		= oldState;
-    gs.rawRead		= 0;
-    gs.bytesWrote	= 0;
-    gs.charsWrote	= 0;
-    gs.totalChars	= 0;
-
-    dst = objPtr->bytes + oldLength;
-    dstEnd = dst;
-
-    skip = 0;
-    eof = NULL;
-    inEofChar = chanPtr->inEofChar;
-
-    while (1) {
-	if (dst >= dstEnd) {
-	    if (FilterInputBytes(chanPtr, &gs) != 0) {
-		goto restore;
-	    }
-	    dstEnd = dst + gs.bytesWrote;
-	}
-	
-	/*
-	 * Remember if EOF char is seen, then look for EOL anyhow, because
-	 * the EOL might be before the EOF char.
-	 */
-
-	if (inEofChar != '\0') {
-	    for (eol = dst; eol < dstEnd; eol++) {
-		if (*eol == inEofChar) {
-		    dstEnd = eol;
-		    eof = eol;
-		    break;
-		}
-	    }
-	}
-
-	/*
-	 * On EOL, leave current file position pointing after the EOL, but
-	 * don't store the EOL in the output string.
-	 */
-
-	eol = dst;
-	switch (chanPtr->inputTranslation) {
-	    case TCL_TRANSLATE_LF: {
-		for (eol = dst; eol < dstEnd; eol++) {
-		    if (*eol == '\n') {
-			skip = 1;
-			goto goteol;
-		    }
-		}
-		break;
-	    }
-	    case TCL_TRANSLATE_CR: {
-		for (eol = dst; eol < dstEnd; eol++) {
-		    if (*eol == '\r') {
-			skip = 1;
-			goto goteol;
-		    }
-		}
-		break;
-	    }
-	    case TCL_TRANSLATE_CRLF: {
-		for (eol = dst; eol < dstEnd; eol++) {
-		    if (*eol == '\r') {
-			eol++;
-			if (eol >= dstEnd) {
-			    int offset;
-			    
-			    offset = eol - objPtr->bytes;
-			    dst = dstEnd;
-			    if (FilterInputBytes(chanPtr, &gs) != 0) {
-				goto restore;
-			    }
-			    dstEnd = dst + gs.bytesWrote;
-			    eol = objPtr->bytes + offset;
-			    if (eol >= dstEnd) {
-				skip = 0;
-				goto goteol;
-			    }
-			}
-			if (*eol == '\n') {
-			    eol--;
-			    skip = 2;
-			    goto goteol;
-			}
-		    }
-		}
-		break;
-	    }
-	    case TCL_TRANSLATE_AUTO: {
-		skip = 1;
-		if (chanPtr->flags & INPUT_SAW_CR) {
-		    chanPtr->flags &= ~INPUT_SAW_CR;
-		    if (*eol == '\n') {
-			/*
-			 * Skip the raw bytes that make up the '\n'.
-			 */
-
-			char tmp[1 + TCL_UTF_MAX];
-			int rawRead;
-
-			bufPtr = gs.bufPtr;
-			Tcl_ExternalToUtf(NULL, gs.encoding,
-				bufPtr->buf + bufPtr->nextRemoved,
-				gs.rawRead, chanPtr->inputEncodingFlags,
-				&gs.state, tmp, 1 + TCL_UTF_MAX, &rawRead,
-				NULL, NULL);
-			bufPtr->nextRemoved += rawRead;
-			gs.rawRead -= rawRead;
-			gs.bytesWrote--;
-			gs.charsWrote--;
-			memmove(dst, dst + 1, (size_t) (dstEnd - dst));
-			dstEnd--;
-		    }
-		}
-		for (eol = dst; eol < dstEnd; eol++) {
-		    if (*eol == '\r') {
-			eol++;
-			if (eol == dstEnd) {
-			    /*
-			     * If buffer ended on \r, peek ahead to see if a
-			     * \n is available.
-			     */
-
-			    int offset;
-			    
-			    offset = eol - objPtr->bytes;
-			    dst = dstEnd;
-			    PeekAhead(chanPtr, &dstEnd, &gs);
-			    eol = objPtr->bytes + offset;
-			    if (eol >= dstEnd) {
-				eol--;
-				chanPtr->flags |= INPUT_SAW_CR;
-				goto goteol;
-			    }
-			}
-			if (*eol == '\n') {
-			    skip++;
-			}
-			eol--;
-			goto goteol;
-		    } else if (*eol == '\n') {
-			goto goteol;
-		    }
-		}
-	    }
-	}
-	if (eof != NULL) {
-	    /*
-	     * EOF character was seen.  On EOF, leave current file position
-	     * pointing at the EOF character, but don't store the EOF
-	     * character in the output string.
-	     */
-
-	    dstEnd = eof;
-	    chanPtr->flags |= (CHANNEL_EOF | CHANNEL_STICKY_EOF);
-	    chanPtr->inputEncodingFlags |= TCL_ENCODING_END;
-	}
-	if (chanPtr->flags & CHANNEL_EOF) {
-	    skip = 0;
-	    eol = dstEnd;
-	    if (eol == objPtr->bytes) {
-		/*
-		 * If we didn't produce any bytes before encountering EOF,
-		 * caller needs to see -1.
-		 */
-
-		Tcl_SetObjLength(objPtr, 0);
-		CommonGetsCleanup(chanPtr, encoding);
-		copiedTotal = -1;
-		goto done;
-	    }
-	    goto goteol;
-	}
-	dst = dstEnd;
-    }
-
-    /*
-     * Found EOL or EOF, but the output buffer may now contain too many
-     * UTF-8 characters.  We need to know how many raw bytes correspond to
-     * the number of UTF-8 characters we want, plus how many raw bytes
-     * correspond to the character(s) making up EOL (if any), so we can
-     * remove the correct number of bytes from the channel buffer.
-     */
-     
-    goteol:
-    bufPtr = gs.bufPtr;
-    chanPtr->inputEncodingState = gs.state;
-    Tcl_ExternalToUtf(NULL, gs.encoding, bufPtr->buf + bufPtr->nextRemoved,
-	    gs.rawRead, chanPtr->inputEncodingFlags,
-	    &chanPtr->inputEncodingState, dst, eol - dst + skip + TCL_UTF_MAX,
-	    &gs.rawRead, NULL, &gs.charsWrote);
-    bufPtr->nextRemoved += gs.rawRead;
-
-    /*
-     * Recycle all the emptied buffers.
-     */
-
-    Tcl_SetObjLength(objPtr, eol - objPtr->bytes);
-    CommonGetsCleanup(chanPtr, encoding);
-    chanPtr->flags &= ~CHANNEL_BLOCKED;
-    copiedTotal = gs.totalChars + gs.charsWrote - skip;
-    goto done;
-
-    /*
-     * Couldn't get a complete line.  This only happens if we get a error
-     * reading from the channel or we are non-blocking and there wasn't
-     * an EOL or EOF in the data available.
-     */
-
-    restore:
-    bufPtr = chanPtr->inQueueHead;
-    bufPtr->nextRemoved = oldRemoved;
-
-    for (bufPtr = bufPtr->nextPtr; bufPtr != NULL; bufPtr = bufPtr->nextPtr) {
-	bufPtr->nextRemoved = BUFFER_PADDING;
-    }
-    CommonGetsCleanup(chanPtr, encoding);
-
-    chanPtr->inputEncodingState = oldState;
-    chanPtr->inputEncodingFlags = oldFlags;
-    Tcl_SetObjLength(objPtr, oldLength);
-
-    /*
-     * We didn't get a complete line so we need to indicate to UpdateInterest
-     * that the gets blocked.  It will wait for more data instead of firing
-     * a timer, avoiding a busy wait.  This is where we are assuming that the
-     * next operation is a gets.  No more file events will be delivered on 
-     * this channel until new data arrives or some operation is performed
-     * on the channel (e.g. gets, read, fconfigure) that changes the blocking
-     * state.  Note that this means a file event will not be delivered even
-     * though a read would be able to consume the buffered data.
-     */
-
-    chanPtr->flags |= CHANNEL_NEED_MORE_DATA;
-    copiedTotal = -1;
-
-    done:
-    /*
-     * Update the notifier state so we don't block while there is still
-     * data in the buffers.
-     */
-
-    UpdateInterest(chanPtr);
-    return copiedTotal;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * FilterInputBytes --
- *
- *	Helper function for Tcl_GetsObj.  Produces UTF-8 characters from
- *	raw bytes read from the channel.  
- *
- *	Consumes available bytes from channel buffers.  When channel
- *	buffers are exhausted, reads more bytes from channel device into
- *	a new channel buffer.  It is the caller's responsibility to
- *	free the channel buffers that have been exhausted.
- *
- * Results:
- *	The return value is -1 if there was an error reading from the
- *	channel, 0 otherwise.
- *
- * Side effects:
- *	Status object keeps track of how much data from channel buffers
- *	has been consumed and where UTF-8 bytes should be stored.
- *
- *---------------------------------------------------------------------------
- */
- 
-static int
-FilterInputBytes(chanPtr, gsPtr)
-    Channel *chanPtr;		/* Channel to read. */
-    GetsState *gsPtr;		/* Current state of gets operation. */
-{
-    ChannelBuffer *bufPtr;
-    char *raw, *rawStart, *rawEnd;
-    char *dst;
-    int offset, toRead, dstNeeded, spaceLeft, result, rawLen, length;
-    Tcl_Obj *objPtr;
-#define ENCODING_LINESIZE   30	/* Lower bound on how many bytes to convert
-				 * at a time.  Since we don't know a priori
-				 * how many bytes of storage this many source
-				 * bytes will use, we actually need at least
-				 * ENCODING_LINESIZE * TCL_MAX_UTF bytes of
-				 * room. */
-
-    objPtr = gsPtr->objPtr;
-
-    /*
-     * Subtract the number of bytes that were removed from channel buffer
-     * during last call.
-     */
-
-    bufPtr = gsPtr->bufPtr;
-    if (bufPtr != NULL) {
-	bufPtr->nextRemoved += gsPtr->rawRead;
-	if (bufPtr->nextRemoved >= bufPtr->nextAdded) {
-	    bufPtr = bufPtr->nextPtr;
-	}
-    }
-    gsPtr->totalChars += gsPtr->charsWrote;
-
-    if ((bufPtr == NULL) || (bufPtr->nextAdded == BUFFER_PADDING)) {
-	/*
-	 * All channel buffers were exhausted and the caller still hasn't
-	 * seen EOL.  Need to read more bytes from the channel device.
-	 * Side effect is to allocate another channel buffer.
-	 */
-	 
-	read:
-        if (chanPtr->flags & CHANNEL_BLOCKED) {
-            if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-		gsPtr->charsWrote = 0;
-		gsPtr->rawRead = 0;
-		return -1;
-	    }
-            chanPtr->flags &= ~CHANNEL_BLOCKED;
-        }
-	if (GetInput(chanPtr) != 0) {
-	    gsPtr->charsWrote = 0;
-	    gsPtr->rawRead = 0;
-	    return -1;
-	}
-	bufPtr = chanPtr->inQueueTail;
-	gsPtr->bufPtr = bufPtr;
-    }
-
-    /*
-     * Convert some of the bytes from the channel buffer to UTF-8.  Space in
-     * objPtr's string rep is used to hold the UTF-8 characters.  Grow the
-     * string rep if we need more space.
-     */
-
-    rawStart = bufPtr->buf + bufPtr->nextRemoved;
-    raw = rawStart;
-    rawEnd = bufPtr->buf + bufPtr->nextAdded;
-    rawLen = rawEnd - rawStart;
-
-    dst = *gsPtr->dstPtr;
-    offset = dst - objPtr->bytes;
-    toRead = ENCODING_LINESIZE;
-    if (toRead > rawLen) {
-	toRead = rawLen;
-    }
-    dstNeeded = toRead * TCL_UTF_MAX + 1;
-    spaceLeft = objPtr->length - offset - TCL_UTF_MAX - 1;
-    if (dstNeeded > spaceLeft) {
-	length = offset * 2;
-	if (offset < dstNeeded) {
-	    length = offset + dstNeeded;
-	}
-	length += TCL_UTF_MAX + 1;
-	Tcl_SetObjLength(objPtr, length);
-	spaceLeft = length - offset;
-	dst = objPtr->bytes + offset;
-	*gsPtr->dstPtr = dst;
-    }
-    gsPtr->state = chanPtr->inputEncodingState;
-    result = Tcl_ExternalToUtf(NULL, gsPtr->encoding, raw, rawLen,
-	    chanPtr->inputEncodingFlags, &chanPtr->inputEncodingState,
-	    dst, spaceLeft, &gsPtr->rawRead, &gsPtr->bytesWrote,
-	    &gsPtr->charsWrote); 
-    if (result == TCL_CONVERT_MULTIBYTE) {
-	/*
-	 * The last few bytes in this channel buffer were the start of a
-	 * multibyte sequence.  If this buffer was full, then move them to
-	 * the next buffer so the bytes will be contiguous.  
-	 */
-
-	ChannelBuffer *nextPtr;
-	int extra;
-	
-	nextPtr = bufPtr->nextPtr;
-	if (bufPtr->nextAdded < bufPtr->bufLength) {
-	    if (gsPtr->rawRead > 0) {
-		/*
-		 * Some raw bytes were converted to UTF-8.  Fall through,
-		 * returning those UTF-8 characters because a EOL might be
-		 * present in them.
-		 */
-	    } else if (chanPtr->flags & CHANNEL_EOF) {
-		/*
-		 * There was a partial character followed by EOF on the
-		 * device.  Fall through, returning that nothing was found.
-		 */
-
-		 bufPtr->nextRemoved = bufPtr->nextAdded;
-	    } else {
-		/*
-		 * There are no more cached raw bytes left.  See if we can
-		 * get some more.
-		 */
-
-		goto read;
-	    }
-	} else {
-	    if (nextPtr == NULL) {
-		nextPtr = AllocChannelBuffer(chanPtr->bufSize);
-		bufPtr->nextPtr = nextPtr;
-		chanPtr->inQueueTail = nextPtr;
-	    }
-	    extra = rawLen - gsPtr->rawRead;
-	    memcpy((VOID *) (nextPtr->buf + BUFFER_PADDING - extra),
-		    (VOID *) (raw + gsPtr->rawRead), (size_t) extra);
-	    nextPtr->nextRemoved -= extra;
-	    bufPtr->nextAdded -= extra;
-	}
-    }
-
-    gsPtr->bufPtr = bufPtr;
-    return 0;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * PeekAhead --
- *
- *	Helper function used by Tcl_GetsObj().  Called when we've seen a
- *	\r at the end of the UTF-8 string and want to look ahead one
- *	character to see if it is a \n.
- *
- * Results:
- *	*gsPtr->dstPtr is filled with a pointer to the start of the range of
- *	UTF-8 characters that were found by peeking and *dstEndPtr is filled
- *	with a pointer to the bytes just after the end of the range.
- *
- * Side effects:
- *	If no more raw bytes were available in one of the channel buffers,
- *	tries to perform a non-blocking read to get more bytes from the
- *	channel device.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-PeekAhead(chanPtr, dstEndPtr, gsPtr)
-    Channel *chanPtr;		/* The channel to read. */
-    char **dstEndPtr;		/* Filled with pointer to end of new range
-				 * of UTF-8 characters. */
-    GetsState *gsPtr;		/* Current state of gets operation. */
-{
-    ChannelBuffer *bufPtr;
-    Tcl_DriverBlockModeProc *blockModeProc;
-    int bytesLeft;
-
-    bufPtr = gsPtr->bufPtr;
-
-    /*
-     * If there's any more raw input that's still buffered, we'll peek into
-     * that.  Otherwise, only get more data from the channel driver if it
-     * looks like there might actually be more data.  The assumption is that
-     * if the channel buffer is filled right up to the end, then there
-     * might be more data to read.
-     */
-
-    blockModeProc = NULL;
-    if (bufPtr->nextPtr == NULL) {
-	bytesLeft = bufPtr->nextAdded - (bufPtr->nextRemoved + gsPtr->rawRead);
-	if (bytesLeft == 0) {
-	    if (bufPtr->nextAdded < bufPtr->bufLength) {
-		/*
-		 * Don't peek ahead if last read was short read.
-		 */
-		 
-		goto cleanup;
-	    }
-	    if ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) {
-		blockModeProc = chanPtr->typePtr->blockModeProc;
-		if (blockModeProc == NULL) {
-		    /*
-		     * Don't peek ahead if cannot set non-blocking mode.
-		     */
-
-		    goto cleanup;
-		}
-		(*blockModeProc)(chanPtr->instanceData, TCL_MODE_NONBLOCKING);
-	    }
-	}
-    }
-    if (FilterInputBytes(chanPtr, gsPtr) == 0) {
-	*dstEndPtr = *gsPtr->dstPtr + gsPtr->bytesWrote;
-    }
-    if (blockModeProc != NULL) {
-	(*blockModeProc)(chanPtr->instanceData, TCL_MODE_BLOCKING);
-    }
-    return;
-
-    cleanup:
-    bufPtr->nextRemoved += gsPtr->rawRead;
-    gsPtr->rawRead = 0;
-    gsPtr->totalChars += gsPtr->charsWrote;
-    gsPtr->bytesWrote = 0;
-    gsPtr->charsWrote = 0;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CommonGetsCleanup --
- *
- *	Helper function for Tcl_GetsObj() to restore the channel after
- *	a "gets" operation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Encoding may be freed.
- *
- *---------------------------------------------------------------------------
- */
- 
-static void
-CommonGetsCleanup(chanPtr, encoding)
-    Channel *chanPtr;
-    Tcl_Encoding encoding;
-{
-    ChannelBuffer *bufPtr, *nextPtr;
-    
-    bufPtr = chanPtr->inQueueHead;
-    for ( ; bufPtr != NULL; bufPtr = nextPtr) {
-	nextPtr = bufPtr->nextPtr;
-	if (bufPtr->nextRemoved < bufPtr->nextAdded) {
-	    break;
-	}
-	RecycleBuffer(chanPtr, bufPtr, 0);
-    }
-    chanPtr->inQueueHead = bufPtr;
-    if (bufPtr == NULL) {
-	chanPtr->inQueueTail = NULL;
-    } else {
-	/*
-	 * If any multi-byte characters were split across channel buffer
-	 * boundaries, the split-up bytes were moved to the next channel
-	 * buffer by FilterInputBytes().  Move the bytes back to their
-	 * original buffer because the caller could change the channel's
-	 * encoding which could change the interpretation of whether those
-	 * bytes really made up multi-byte characters after all.
-	 */
-	 
-	nextPtr = bufPtr->nextPtr;
-	for ( ; nextPtr != NULL; nextPtr = bufPtr->nextPtr) {
-	    int extra;
-
-	    extra = bufPtr->bufLength - bufPtr->nextAdded;
-	    if (extra > 0) {
-		memcpy((VOID *) (bufPtr->buf + bufPtr->nextAdded),
-			(VOID *) (nextPtr->buf + BUFFER_PADDING - extra),
-			(size_t) extra);
-		bufPtr->nextAdded += extra;
-		nextPtr->nextRemoved = BUFFER_PADDING;
-	    }
-	    bufPtr = nextPtr;
-	}
-    }
-    if (chanPtr->encoding == NULL) {
-	Tcl_FreeEncoding(encoding);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Read --
- *
- *	Reads a given number of bytes from a channel.  EOL and EOF
- *	translation is done on the bytes being read, so the the number
- *	of bytes consumed from the channel may not be equal to the
- *	number of bytes stored in the destination buffer.
- *
- *	No encoding conversions are applied to the bytes being read.
- *
- * Results:
- *	The number of bytes read, or -1 on error. Use Tcl_GetErrno()
- *	to retrieve the error code for the error that occurred.
- *
- * Side effects:
- *	May cause input to be buffered.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Read(chan, dst, bytesToRead)
-    Tcl_Channel chan;		/* The channel from which to read. */
-    char *dst;			/* Where to store input read. */
-    int bytesToRead;		/* Maximum number of bytes to read. */
-{
-    Channel *chanPtr;		
-    
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_READABLE) != 0) {
-	return -1;
-    }
-
-    return DoRead(chanPtr, dst, bytesToRead);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_ReadChars --
- *
- *	Reads from the channel until the requested number of characters
- *	have been seen, EOF is seen, or the channel would block.  EOL
- *	and EOF translation is done.  If reading binary data, the raw
- *	bytes are wrapped in a Tcl byte array object.  Otherwise, the raw
- *	bytes are converted to UTF-8 using the channel's current encoding
- *	and stored in a Tcl string object.
- *
- * Results:
- *	The number of characters read, or -1 on error. Use Tcl_GetErrno()
- *	to retrieve the error code for the error that occurred.
- *
- * Side effects:
- *	May cause input to be buffered.
- *
- *---------------------------------------------------------------------------
- */
- 
-int
-Tcl_ReadChars(chan, objPtr, toRead, appendFlag)
-    Tcl_Channel chan;		/* The channel to read. */
-    Tcl_Obj *objPtr;		/* Input data is stored in this object. */
-    int toRead;			/* Maximum number of characters to store,
-				 * or -1 to read all available data (up to EOF
-				 * or when channel blocks). */
-    int appendFlag;		/* If non-zero, data read from the channel
-				 * will be appended to the object.  Otherwise,
-				 * the data will replace the existing contents
-				 * of the object. */
-
-{
-    Channel *chanPtr;
-    int offset, factor, copied, copiedNow, result;
-    ChannelBuffer *bufPtr;
-    Tcl_Encoding encoding;
-#define UTF_EXPANSION_FACTOR	1024
-    
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_READABLE) != 0) {
-	copied = -1;
-	goto done;
-    }
-
-    encoding = chanPtr->encoding;
-    factor = UTF_EXPANSION_FACTOR;
-
-    if (appendFlag == 0) {
-	if (encoding == NULL) {
-	    Tcl_SetByteArrayLength(objPtr, 0);
-	} else {
-	    Tcl_SetObjLength(objPtr, 0);
-	}
-	offset = 0;
-    } else {
-	if (encoding == NULL) {
-	    Tcl_GetByteArrayFromObj(objPtr, &offset);
-	} else {
-	    Tcl_GetStringFromObj(objPtr, &offset);
-	}
-    }
-
-    for (copied = 0; (unsigned) toRead > 0; ) {
-	copiedNow = -1;
-	if (chanPtr->inQueueHead != NULL) {
-	    if (encoding == NULL) {
-		copiedNow = ReadBytes(chanPtr, objPtr, toRead, &offset);
-	    } else {
-		copiedNow = ReadChars(chanPtr, objPtr, toRead, &offset,
-			&factor);
-	    }
-
-	    /*
-	     * If the current buffer is empty recycle it.
-	     */
-
-	    bufPtr = chanPtr->inQueueHead;
-	    if (bufPtr->nextRemoved == bufPtr->nextAdded) {
-		ChannelBuffer *nextPtr;
-
-		nextPtr = bufPtr->nextPtr;
-		RecycleBuffer(chanPtr, bufPtr, 0);
-		chanPtr->inQueueHead = nextPtr;
-		if (nextPtr == NULL) {
-		    chanPtr->inQueueTail = nextPtr;
-		}
-	    }
-	}
-	if (copiedNow < 0) {
-	    if (chanPtr->flags & CHANNEL_EOF) {
-		break;
-	    }
-	    if (chanPtr->flags & CHANNEL_BLOCKED) {
-		if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-		    break;
-		}
-		chanPtr->flags &= ~CHANNEL_BLOCKED;
-	    }
-	    result = GetInput(chanPtr);
-	    if (result != 0) {
-		if (result == EAGAIN) {
-		    break;
-		}
-		copied = -1;
-		goto done;
-	    }
-	} else {
-	    copied += copiedNow;
-	    toRead -= copiedNow;
-	}
-    }
-    chanPtr->flags &= ~CHANNEL_BLOCKED;
-    if (encoding == NULL) {
-	Tcl_SetByteArrayLength(objPtr, offset);
-    } else {
-	Tcl_SetObjLength(objPtr, offset);
-    }
-
-    done:
-    /*
-     * Update the notifier state so we don't block while there is still
-     * data in the buffers.
-     */
-
-    UpdateInterest(chanPtr);
-    return copied;
-}
-/*
- *---------------------------------------------------------------------------
- *
- * ReadBytes --
- *
- *	Reads from the channel until the requested number of bytes have
- *	been seen, EOF is seen, or the channel would block.  Bytes from
- *	the channel are stored in objPtr as a ByteArray object.  EOL
- *	and EOF translation are done.
- *
- *	'bytesToRead' can safely be a very large number because
- *	space is only allocated to hold data read from the channel
- *	as needed.
- *
- * Results:
- *	The return value is the number of bytes appended to the object
- *	and *offsetPtr is filled with the total number of bytes in the
- *	object (greater than the return value if there were already bytes
- *	in the object).
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-ReadBytes(chanPtr, objPtr, bytesToRead, offsetPtr)
-    Channel *chanPtr;		/* The channel to read. */
-    int bytesToRead;		/* Maximum number of characters to store,
-				 * or < 0 to get all available characters.
-				 * Characters are obtained from the first
-				 * buffer in the queue -- even if this number
-				 * is larger than the number of characters
-				 * available in the first buffer, only the
-				 * characters from the first buffer are
-				 * returned. */
-    Tcl_Obj *objPtr;		/* Input data is appended to this ByteArray
-				 * object.  Its length is how much space
-				 * has been allocated to hold data, not how
-				 * many bytes of data have been stored in the
-				 * object. */
-    int *offsetPtr;		/* On input, contains how many bytes of
-				 * objPtr have been used to hold data.  On
-				 * output, filled with how many bytes are now
-				 * being used. */
-{
-    int toRead, srcLen, srcRead, dstWrote, offset, length;
-    ChannelBuffer *bufPtr;
-    char *src, *dst;
-
-    offset = *offsetPtr;
-
-    bufPtr = chanPtr->inQueueHead; 
-    src = bufPtr->buf + bufPtr->nextRemoved;
-    srcLen = bufPtr->nextAdded - bufPtr->nextRemoved;
-
-    toRead = bytesToRead;
-    if ((unsigned) toRead > (unsigned) srcLen) {
-	toRead = srcLen;
-    }
-
-    dst = (char *) Tcl_GetByteArrayFromObj(objPtr, &length);
-    if (toRead > length - offset - 1) {
-	/*
-	 * Double the existing size of the object or make enough room to
-	 * hold all the characters we may get from the source buffer,
-	 * whichever is larger.
-	 */
-
-	length = offset * 2;
-	if (offset < toRead) {
-	    length = offset + toRead + 1;
-	}
-	dst = (char *) Tcl_SetByteArrayLength(objPtr, length);
-    }
-    dst += offset;
-
-    if (chanPtr->flags & INPUT_NEED_NL) {
-	chanPtr->flags &= ~INPUT_NEED_NL;
-	if ((srcLen == 0) || (*src != '\n')) {
-	    *dst = '\r';
-	    *offsetPtr += 1;
-	    return 1;
-	}
-	*dst++ = '\n';
-	src++;
-	srcLen--;
-	toRead--;
-    }
-
-    srcRead = srcLen;
-    dstWrote = toRead;
-    if (TranslateInputEOL(chanPtr, dst, src, &dstWrote, &srcRead) != 0) {
-	if (dstWrote == 0) {
-	    return -1;
-	}
-    }
-    bufPtr->nextRemoved += srcRead;
-    *offsetPtr += dstWrote;
-    return dstWrote;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * ReadChars --
- *
- *	Reads from the channel until the requested number of UTF-8
- *	characters have been seen, EOF is seen, or the channel would
- *	block.  Raw bytes from the channel are converted to UTF-8
- *	and stored in objPtr.  EOL and EOF translation is done.
- *
- *	'charsToRead' can safely be a very large number because
- *	space is only allocated to hold data read from the channel
- *	as needed.
- *
- * Results:
- *	The return value is the number of characters appended to
- *	the object, *offsetPtr is filled with the number of bytes that
- *	were appended, and *factorPtr is filled with the expansion
- *	factor used to guess how many bytes of UTF-8 to allocate to
- *	hold N source bytes.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-ReadChars(chanPtr, objPtr, charsToRead, offsetPtr, factorPtr)
-    Channel *chanPtr;		/* The channel to read. */
-    int charsToRead;		/* Maximum number of characters to store,
-				 * or -1 to get all available characters.
-				 * Characters are obtained from the first
-				 * buffer in the queue -- even if this number
-				 * is larger than the number of characters
-				 * available in the first buffer, only the
-				 * characters from the first buffer are
-				 * returned. */
-    Tcl_Obj *objPtr;		/* Input data is appended to this object.
-				 * objPtr->length is how much space has been
-				 * allocated to hold data, not how many bytes
-				 * of data have been stored in the object. */
-    int *offsetPtr;		/* On input, contains how many bytes of
-				 * objPtr have been used to hold data.  On
-				 * output, filled with how many bytes are now
-				 * being used. */
-    int *factorPtr;		/* On input, contains a guess of how many
-				 * bytes need to be allocated to hold the
-				 * result of converting N source bytes to
-				 * UTF-8.  On output, contains another guess
-				 * based on the data seen so far. */
-{
-    int toRead, factor, offset, spaceLeft, length;
-    int srcLen, srcRead, dstNeeded, dstRead, dstWrote, numChars;
-    ChannelBuffer *bufPtr;
-    char *src, *dst;
-    Tcl_EncodingState oldState;
-
-    factor = *factorPtr;
-    offset = *offsetPtr;
-
-    bufPtr = chanPtr->inQueueHead; 
-    src = bufPtr->buf + bufPtr->nextRemoved;
-    srcLen = bufPtr->nextAdded - bufPtr->nextRemoved;
-
-    toRead = charsToRead;
-    if ((unsigned) toRead > (unsigned) srcLen) {
-	toRead = srcLen;
-    }
-
-    /*
-     * 'factor' is how much we guess that the bytes in the source buffer
-     * will expand when converted to UTF-8 chars.  This guess comes from
-     * analyzing how many characters were produced by the previous
-     * pass.
-     */
-
-    dstNeeded = toRead * factor / UTF_EXPANSION_FACTOR;
-    spaceLeft = objPtr->length - offset - TCL_UTF_MAX - 1;
-
-    if (dstNeeded > spaceLeft) {
-	/*
-	 * Double the existing size of the object or make enough room to
-	 * hold all the characters we want from the source buffer,
-	 * whichever is larger.
-	 */
-
-	length = offset * 2;
-	if (offset < dstNeeded) {
-	    length = offset + dstNeeded;
-	}
-	spaceLeft = length - offset;
-	length += TCL_UTF_MAX + 1;
-	Tcl_SetObjLength(objPtr, length);
-    }
-    if (toRead == srcLen) {
-	/*
-	 * Want to convert the whole buffer in one pass.  If we have
-	 * enough space, convert it using all available space in object
-	 * rather than using the factor.
-	 */
-
-	dstNeeded = spaceLeft;
-    }
-    dst = objPtr->bytes + offset;
-
-    oldState = chanPtr->inputEncodingState;
-    if (chanPtr->flags & INPUT_NEED_NL) {
-	/*
-	 * We want a '\n' because the last character we saw was '\r'.
-	 */
-	 
-	chanPtr->flags &= ~INPUT_NEED_NL;
-	Tcl_ExternalToUtf(NULL, chanPtr->encoding, src, srcLen,
-		chanPtr->inputEncodingFlags, &chanPtr->inputEncodingState,
-		dst, TCL_UTF_MAX + 1, &srcRead, &dstWrote, &numChars);
-	if ((dstWrote > 0) && (*dst == '\n')) {
-	    /*
-	     * The next char was a '\n'.  Consume it and produce a '\n'.
-	     */
-	     
-	    bufPtr->nextRemoved += srcRead;
-	} else {
-	    /*
-	     * The next char was not a '\n'.  Produce a '\r'.
-	     */
-
-	    *dst = '\r';
-	}
-	chanPtr->inputEncodingFlags &= ~TCL_ENCODING_START;
-	*offsetPtr += 1;
-        return 1;
-    }
-
-    Tcl_ExternalToUtf(NULL, chanPtr->encoding, src, srcLen,
-	    chanPtr->inputEncodingFlags, &chanPtr->inputEncodingState, dst,
-	    dstNeeded + TCL_UTF_MAX, &srcRead, &dstWrote, &numChars);
-    if (srcRead == 0) {
-	/*
-	 * Not enough bytes in src buffer to make a complete char.  Copy
-	 * the bytes to the next buffer to make a new contiguous string,
-	 * then tell the caller to fill the buffer with more bytes.
-	 */
-
-	ChannelBuffer *nextPtr;
-	
-	nextPtr = bufPtr->nextPtr;
-	if (nextPtr == NULL) {
-	    /*
-	     * There isn't enough data in the buffers to complete the next
-	     * character, so we need to wait for more data before the next
-	     * file event can be delivered.
-	     */
-
-	    chanPtr->flags |= CHANNEL_NEED_MORE_DATA;
-	    return -1;
-	}
-	nextPtr->nextRemoved -= srcLen;
-	memcpy((VOID *) (nextPtr->buf + nextPtr->nextRemoved), (VOID *) src,
-		(size_t) srcLen);
-	RecycleBuffer(chanPtr, bufPtr, 0);
-	chanPtr->inQueueHead = nextPtr;
-	return ReadChars(chanPtr, objPtr, charsToRead, offsetPtr, factorPtr);
-    }
-
-    dstRead = dstWrote;
-    if (TranslateInputEOL(chanPtr, dst, dst, &dstWrote, &dstRead) != 0) {
-	/*
-	 * Hit EOF char.  How many bytes of src correspond to where the
-	 * EOF was located in dst?
-	 */
-	 
-	if (dstWrote == 0) {
-	    return -1;
-	}
-	chanPtr->inputEncodingState = oldState;
-	Tcl_ExternalToUtf(NULL, chanPtr->encoding, src, srcLen,
-		chanPtr->inputEncodingFlags, &chanPtr->inputEncodingState,
-		dst, dstRead + TCL_UTF_MAX, &srcRead, &dstWrote, &numChars);
-	TranslateInputEOL(chanPtr, dst, dst, &dstWrote, &dstRead);
-    } 
-
-    /*
-     * The number of characters that we got may be less than the number
-     * that we started with because "\r\n" sequences may have been
-     * turned into just '\n' in dst.
-     */
-
-    numChars -= (dstRead - dstWrote);
-
-    if ((unsigned) numChars > (unsigned) toRead) {
-	/*
-	 * Got too many chars.
-	 */
-
-	char *eof;
-
-	eof = Tcl_UtfAtIndex(dst, toRead);
-	chanPtr->inputEncodingState = oldState;
-	Tcl_ExternalToUtf(NULL, chanPtr->encoding, src, srcLen,
-		chanPtr->inputEncodingFlags, &chanPtr->inputEncodingState,
-		dst, eof - dst + TCL_UTF_MAX, &srcRead, &dstWrote, &numChars);
-	dstRead = dstWrote;
-	TranslateInputEOL(chanPtr, dst, dst, &dstWrote, &dstRead);
-	numChars -= (dstRead - dstWrote);
-    }
-    chanPtr->inputEncodingFlags &= ~TCL_ENCODING_START;
-
-    bufPtr->nextRemoved += srcRead;
-    if (dstWrote > srcRead + 1) {
-	*factorPtr = dstWrote * UTF_EXPANSION_FACTOR / srcRead;
-    }
-    *offsetPtr += dstWrote;
-    return numChars;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TranslateInputEOL --
- *
- *	Perform input EOL and EOF translation on the source buffer,
- *	leaving the translated result in the destination buffer.  
- *
- * Results:
- *	The return value is 1 if the EOF character was found when copying
- *	bytes to the destination buffer, 0 otherwise.  
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-TranslateInputEOL(chanPtr, dstStart, srcStart, dstLenPtr, srcLenPtr)
-    Channel *chanPtr;		/* Channel being read, for EOL translation
-				 * and EOF character. */
-    char *dstStart;		/* Output buffer filled with chars by
-				 * applying appropriate EOL translation to
-				 * source characters. */
-    CONST char *srcStart;	/* Source characters. */
-    int *dstLenPtr;		/* On entry, the maximum length of output
-				 * buffer in bytes; must be <= *srcLenPtr.  On
-				 * exit, the number of bytes actually used in
-				 * output buffer. */
-    int *srcLenPtr;		/* On entry, the length of source buffer.
-				 * On exit, the number of bytes read from
-				 * the source buffer. */
-{
-    int dstLen, srcLen, inEofChar;
-    CONST char *eof;
-
-    dstLen = *dstLenPtr;
-
-    eof = NULL;
-    inEofChar = chanPtr->inEofChar;
-    if (inEofChar != '\0') {
-	/*
-	 * Find EOF in translated buffer then compress out the EOL.  The
-	 * source buffer may be much longer than the destination buffer --
-	 * we only want to return EOF if the EOF has been copied to the
-	 * destination buffer.
-	 */
-
-	CONST char *src, *srcMax;
-
-	srcMax = srcStart + *srcLenPtr;
-	for (src = srcStart; src < srcMax; src++) {
-	    if (*src == inEofChar) {
-		eof = src;
-		srcLen = src - srcStart;
-		if (srcLen < dstLen) {
-		    dstLen = srcLen;
-		}
-		*srcLenPtr = srcLen;
-		break;
-	    }
-	}
-    }
-    switch (chanPtr->inputTranslation) {
-	case TCL_TRANSLATE_LF: {
-	    if (dstStart != srcStart) {
-		memcpy((VOID *) dstStart, (VOID *) srcStart, (size_t) dstLen);
-	    }
-	    srcLen = dstLen;
-	    break;
-	}
-	case TCL_TRANSLATE_CR: {
-	    char *dst, *dstEnd;
-	    
-	    if (dstStart != srcStart) {
-		memcpy((VOID *) dstStart, (VOID *) srcStart, (size_t) dstLen);
-	    }
-	    dstEnd = dstStart + dstLen;
-	    for (dst = dstStart; dst < dstEnd; dst++) {
-		if (*dst == '\r') {
-		    *dst = '\n';
-		}
-	    }
-	    srcLen = dstLen;
-	    break;
-	}
-	case TCL_TRANSLATE_CRLF: {
-	    char *dst;
-	    CONST char *src, *srcEnd, *srcMax;
-	    
-	    dst = dstStart;
-	    src = srcStart;
-	    srcEnd = srcStart + dstLen;
-	    srcMax = srcStart + *srcLenPtr;
-
-	    for ( ; src < srcEnd; ) {
-		if (*src == '\r') {
-		    src++;
-		    if (src >= srcMax) {
-			chanPtr->flags |= INPUT_NEED_NL;
-		    } else if (*src == '\n') {
-			*dst++ = *src++;
-		    } else {
-			*dst++ = '\r';
-		    }
-		} else {
-		    *dst++ = *src++;
-		}
-	    }
-	    srcLen = src - srcStart;
-	    dstLen = dst - dstStart;
-	    break;
-	}
-	case TCL_TRANSLATE_AUTO: {
-	    char *dst;
-	    CONST char *src, *srcEnd, *srcMax;
-
-	    dst = dstStart;
-	    src = srcStart;
-	    srcEnd = srcStart + dstLen;
-	    srcMax = srcStart + *srcLenPtr;
-
-	    if ((chanPtr->flags & INPUT_SAW_CR) && (src < srcMax)) {
-		if (*src == '\n') {
-		    src++;
-		}
-		chanPtr->flags &= ~INPUT_SAW_CR;
-	    }
-	    for ( ; src < srcEnd; ) {
-		if (*src == '\r') {
-		    src++;
-		    if (src >= srcMax) {
-			chanPtr->flags |= INPUT_SAW_CR;
-		    } else if (*src == '\n') {
-			if (srcEnd < srcMax) {
-			    srcEnd++;
-			}
-			src++;
-		    }
-		    *dst++ = '\n';
-		} else {
-		    *dst++ = *src++;
-		}
-	    }
-	    srcLen = src - srcStart;
-	    dstLen = dst - dstStart;
-	    break;
-	}
-	default: {		/* lint. */
-	    return 0;
-	}
-    }
-    *dstLenPtr = dstLen;
-
-    if ((eof != NULL) && (srcStart + srcLen >= eof)) {
-	/*
-	 * EOF character was seen in EOL translated range.  Leave current
-	 * file position pointing at the EOF character, but don't store the
-	 * EOF character in the output string.
-	 */
-
-	chanPtr->flags |= (CHANNEL_EOF | CHANNEL_STICKY_EOF);
-	chanPtr->inputEncodingFlags |= TCL_ENCODING_END;
-	chanPtr->flags &= ~(INPUT_SAW_CR | INPUT_NEED_NL);
-	return 1;
-    }
-
-    *srcLenPtr = srcLen;
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Ungets --
- *
- *	Causes the supplied string to be added to the input queue of
- *	the channel, at either the head or tail of the queue.
- *
- * Results:
- *	The number of bytes stored in the channel, or -1 on error.
- *
- * Side effects:
- *	Adds input to the input queue of a channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Ungets(chan, str, len, atEnd)
-    Tcl_Channel chan;		/* The channel for which to add the input. */
-    char *str;			/* The input itself. */
-    int len;			/* The length of the input. */
-    int atEnd;			/* If non-zero, add at end of queue; otherwise
-                                 * add at head of queue. */    
-{
-    Channel *chanPtr;		/* The real IO channel. */
-    ChannelBuffer *bufPtr;	/* Buffer to contain the data. */
-    int i, flags;
-
-    chanPtr = (Channel *) chan;
-    
-    /*
-     * CheckChannelErrors clears too many flag bits in this one case.
-     */
-     
-    flags = chanPtr->flags;
-    if (CheckChannelErrors(chanPtr, TCL_READABLE) != 0) {
-	len = -1;
-	goto done;
-    }
-    chanPtr->flags = flags;
-
-    /*
-     * If we have encountered a sticky EOF, just punt without storing.
-     * (sticky EOF is set if we have seen the input eofChar, to prevent
-     * reading beyond the eofChar). Otherwise, clear the EOF flags, and
-     * clear the BLOCKED bit. We want to discover these conditions anew
-     * in each operation.
-     */
-
-    if (chanPtr->flags & CHANNEL_STICKY_EOF) {
-	goto done;
-    }
-    chanPtr->flags &= (~(CHANNEL_BLOCKED | CHANNEL_EOF));
-
-    bufPtr = AllocChannelBuffer(len);
-    for (i = 0; i < len; i++) {
-        bufPtr->buf[i] = str[i];
-    }
-    bufPtr->nextAdded += len;
-
-    if (chanPtr->inQueueHead == (ChannelBuffer *) NULL) {
-        bufPtr->nextPtr = (ChannelBuffer *) NULL;
-        chanPtr->inQueueHead = bufPtr;
-        chanPtr->inQueueTail = bufPtr;
-    } else if (atEnd) {
-        bufPtr->nextPtr = (ChannelBuffer *) NULL;
-        chanPtr->inQueueTail->nextPtr = bufPtr;
-        chanPtr->inQueueTail = bufPtr;
-    } else {
-        bufPtr->nextPtr = chanPtr->inQueueHead;
-        chanPtr->inQueueHead = bufPtr;
-    }
-
-    done:
-    /*
-     * Update the notifier state so we don't block while there is still
-     * data in the buffers.
-     */
-
-    UpdateInterest(chanPtr);
-    return len;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Flush --
- *
- *	Flushes output data on a channel.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May flush output queued on this channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Flush(chan)
-    Tcl_Channel chan;			/* The Channel to flush. */
-{
-    int result;				/* Of calling FlushChannel. */
-    Channel *chanPtr;			/* The actual channel. */
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE) != 0) {
-	return -1;
-    }
-
-    /*
-     * Force current output buffer to be output also.
-     */
-    
-    if ((chanPtr->curOutPtr != NULL)
-	    && (chanPtr->curOutPtr->nextAdded > 0)) {
-        chanPtr->flags |= BUFFER_READY;
-    }
-    
-    result = FlushChannel(NULL, chanPtr, 0);
-    if (result != 0) {
-        return TCL_ERROR;
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DiscardInputQueued --
- *
- *	Discards any input read from the channel but not yet consumed
- *	by Tcl reading commands.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May discard input from the channel. If discardLastBuffer is zero,
- *	leaves one buffer in place for back-filling.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DiscardInputQueued(chanPtr, discardSavedBuffers)
-    Channel *chanPtr;		/* Channel on which to discard
-                                 * the queued input. */
-    int discardSavedBuffers;	/* If non-zero, discard all buffers including
-                                 * last one. */
-{
-    ChannelBuffer *bufPtr, *nxtPtr;	/* Loop variables. */
-
-    bufPtr = chanPtr->inQueueHead;
-    chanPtr->inQueueHead = (ChannelBuffer *) NULL;
-    chanPtr->inQueueTail = (ChannelBuffer *) NULL;
-    for (; bufPtr != (ChannelBuffer *) NULL; bufPtr = nxtPtr) {
-        nxtPtr = bufPtr->nextPtr;
-        RecycleBuffer(chanPtr, bufPtr, discardSavedBuffers);
-    }
-
-    /*
-     * If discardSavedBuffers is nonzero, must also discard any previously
-     * saved buffer in the saveInBufPtr field.
-     */
-    
-    if (discardSavedBuffers) {
-        if (chanPtr->saveInBufPtr != (ChannelBuffer *) NULL) {
-            ckfree((char *) chanPtr->saveInBufPtr);
-            chanPtr->saveInBufPtr = (ChannelBuffer *) NULL;
-        }
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * GetInput --
- *
- *	Reads input data from a device into a channel buffer.  
- *
- * Results:
- *	The return value is the Posix error code if an error occurred while
- *	reading from the file, or 0 otherwise.  
- *
- * Side effects:
- *	Reads from the underlying device.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-GetInput(chanPtr)
-    Channel *chanPtr;		/* Channel to read input from. */
-{
-    int toRead;			/* How much to read? */
-    int result;			/* Of calling driver. */
-    int nread;			/* How much was read from channel? */
-    ChannelBuffer *bufPtr;	/* New buffer to add to input queue. */
-
-    /*
-     * Prevent reading from a dead channel -- a channel that has been closed
-     * but not yet deallocated, which can happen if the exit handler for
-     * channel cleanup has run but the channel is still registered in some
-     * interpreter.
-     */
-    
-    if (CheckForDeadChannel(NULL, chanPtr)) {
-	return EINVAL;
-    }
-
-    /*
-     * See if we can fill an existing buffer. If we can, read only
-     * as much as will fit in it. Otherwise allocate a new buffer,
-     * add it to the input queue and attempt to fill it to the max.
-     */
-
-    bufPtr = chanPtr->inQueueTail;
-    if ((bufPtr != NULL) && (bufPtr->nextAdded < bufPtr->bufLength)) {
-        toRead = bufPtr->bufLength - bufPtr->nextAdded;
-    } else {
-	bufPtr = chanPtr->saveInBufPtr;
-	chanPtr->saveInBufPtr = NULL;
-	if (bufPtr == NULL) {
-	    bufPtr = AllocChannelBuffer(chanPtr->bufSize);
-	}
-        bufPtr->nextPtr = (ChannelBuffer *) NULL;
-
-        toRead = chanPtr->bufSize;
-        if (chanPtr->inQueueTail == NULL) {
-            chanPtr->inQueueHead = bufPtr;
-        } else {
-            chanPtr->inQueueTail->nextPtr = bufPtr;
-        }
-        chanPtr->inQueueTail = bufPtr;
-    }
-      
-    /*
-     * If EOF is set, we should avoid calling the driver because on some
-     * platforms it is impossible to read from a device after EOF.
-     */
-
-    if (chanPtr->flags & CHANNEL_EOF) {
-	return 0;
-    }
-
-    nread = (*chanPtr->typePtr->inputProc)(chanPtr->instanceData,
-	    bufPtr->buf + bufPtr->nextAdded, toRead, &result);
-
-    if (nread > 0) {
-	bufPtr->nextAdded += nread;
-
-	/*
-	 * If we get a short read, signal up that we may be BLOCKED. We
-	 * should avoid calling the driver because on some platforms we
-	 * will block in the low level reading code even though the
-	 * channel is set into nonblocking mode.
-	 */
-            
-	if (nread < toRead) {
-	    chanPtr->flags |= CHANNEL_BLOCKED;
-	}
-    } else if (nread == 0) {
-	chanPtr->flags |= CHANNEL_EOF;
-	chanPtr->inputEncodingFlags |= TCL_ENCODING_END;
-    } else if (nread < 0) {
-	if ((result == EWOULDBLOCK) || (result == EAGAIN)) {
-	    chanPtr->flags |= CHANNEL_BLOCKED;
-	    result = EAGAIN;
-	}
-	Tcl_SetErrno(result);
-	return result;
-    } 
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Seek --
- *
- *	Implements seeking on Tcl Channels. This is a public function
- *	so that other C facilities may be implemented on top of it.
- *
- * Results:
- *	The new access point or -1 on error. If error, use Tcl_GetErrno()
- *	to retrieve the POSIX error code for the error that occurred.
- *
- * Side effects:
- *	May flush output on the channel. May discard queued input.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Seek(chan, offset, mode)
-    Tcl_Channel chan;		/* The channel on which to seek. */
-    int offset;			/* Offset to seek to. */
-    int mode;			/* Relative to which location to seek? */
-{
-    Channel *chanPtr;		/* The real IO channel. */
-    ChannelBuffer *bufPtr;
-    int inputBuffered, outputBuffered;
-    int result;			/* Of device driver operations. */
-    int curPos;			/* Position on the device. */
-    int wasAsync;		/* Was the channel nonblocking before the
-                                 * seek operation? If so, must restore to
-                                 * nonblocking mode after the seek. */
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE | TCL_READABLE) != 0) {
-	return -1;
-    }
-
-    /*
-     * Disallow seek on dead channels -- channels that have been closed but
-     * not yet been deallocated. Such channels can be found if the exit
-     * handler for channel cleanup has run but the channel is still
-     * registered in an interpreter.
-     */
-
-    if (CheckForDeadChannel(NULL,chanPtr)) return -1;
-
-    /*
-     * Disallow seek on channels whose type does not have a seek procedure
-     * defined. This means that the channel does not support seeking.
-     */
-
-    if (chanPtr->typePtr->seekProc == (Tcl_DriverSeekProc *) NULL) {
-        Tcl_SetErrno(EINVAL);
-        return -1;
-    }
-
-    /*
-     * Compute how much input and output is buffered. If both input and
-     * output is buffered, cannot compute the current position.
-     */
-
-    for (bufPtr = chanPtr->inQueueHead, inputBuffered = 0;
-             bufPtr != (ChannelBuffer *) NULL;
-             bufPtr = bufPtr->nextPtr) {
-        inputBuffered += (bufPtr->nextAdded - bufPtr->nextRemoved);
-    }
-    for (bufPtr = chanPtr->outQueueHead, outputBuffered = 0;
-             bufPtr != (ChannelBuffer *) NULL;
-             bufPtr = bufPtr->nextPtr) {
-        outputBuffered += (bufPtr->nextAdded - bufPtr->nextRemoved);
-    }
-    if ((chanPtr->curOutPtr != (ChannelBuffer *) NULL) &&
-           (chanPtr->curOutPtr->nextAdded > chanPtr->curOutPtr->nextRemoved)) {
-        chanPtr->flags |= BUFFER_READY;
-        outputBuffered +=
-            (chanPtr->curOutPtr->nextAdded - chanPtr->curOutPtr->nextRemoved);
-    }
-
-    if ((inputBuffered != 0) && (outputBuffered != 0)) {
-        Tcl_SetErrno(EFAULT);
-        return -1;
-    }
-
-    /*
-     * If we are seeking relative to the current position, compute the
-     * corrected offset taking into account the amount of unread input.
-     */
-
-    if (mode == SEEK_CUR) {
-        offset -= inputBuffered;
-    }
-
-    /*
-     * Discard any queued input - this input should not be read after
-     * the seek.
-     */
-
-    DiscardInputQueued(chanPtr, 0);
-
-    /*
-     * Reset EOF and BLOCKED flags. We invalidate them by moving the
-     * access point. Also clear CR related flags.
-     */
-
-    chanPtr->flags &=
-        (~(CHANNEL_EOF | CHANNEL_STICKY_EOF | CHANNEL_BLOCKED | INPUT_SAW_CR));
-    
-    /*
-     * If the channel is in asynchronous output mode, switch it back
-     * to synchronous mode and cancel any async flush that may be
-     * scheduled. After the flush, the channel will be put back into
-     * asynchronous output mode.
-     */
-
-    wasAsync = 0;
-    if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-        wasAsync = 1;
-        result = 0;
-        if (chanPtr->typePtr->blockModeProc != NULL) {
-            result = (chanPtr->typePtr->blockModeProc) (chanPtr->instanceData,
-                    TCL_MODE_BLOCKING);
-        }
-        if (result != 0) {
-            Tcl_SetErrno(result);
-            return -1;
-        }
-        chanPtr->flags &= (~(CHANNEL_NONBLOCKING));
-        if (chanPtr->flags & BG_FLUSH_SCHEDULED) {
-            chanPtr->flags &= (~(BG_FLUSH_SCHEDULED));
-        }
-    }
-    
-    /*
-     * If the flush fails we cannot recover the original position. In
-     * that case the seek is not attempted because we do not know where
-     * the access position is - instead we return the error. FlushChannel
-     * has already called Tcl_SetErrno() to report the error upwards.
-     * If the flush succeeds we do the seek also.
-     */
-    
-    if (FlushChannel(NULL, chanPtr, 0) != 0) {
-        curPos = -1;
-    } else {
-
-        /*
-         * Now seek to the new position in the channel as requested by the
-         * caller.
-         */
-
-        curPos = (chanPtr->typePtr->seekProc) (chanPtr->instanceData,
-                (long) offset, mode, &result);
-        if (curPos == -1) {
-            Tcl_SetErrno(result);
-        }
-    }
-    
-    /*
-     * Restore to nonblocking mode if that was the previous behavior.
-     *
-     * NOTE: Even if there was an async flush active we do not restore
-     * it now because we already flushed all the queued output, above.
-     */
-    
-    if (wasAsync) {
-        chanPtr->flags |= CHANNEL_NONBLOCKING;
-        result = 0;
-        if (chanPtr->typePtr->blockModeProc != NULL) {
-            result = (chanPtr->typePtr->blockModeProc) (chanPtr->instanceData,
-                    TCL_MODE_NONBLOCKING);
-        }
-        if (result != 0) {
-            Tcl_SetErrno(result);
-            return -1;
-        }
-    }
-
-    return curPos;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Tell --
- *
- *	Returns the position of the next character to be read/written on
- *	this channel.
- *
- * Results:
- *	A nonnegative integer on success, -1 on failure. If failed,
- *	use Tcl_GetErrno() to retrieve the POSIX error code for the
- *	error that occurred.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Tell(chan)
-    Tcl_Channel chan;			/* The channel to return pos for. */
-{
-    Channel *chanPtr;			/* The actual channel to tell on. */
-    ChannelBuffer *bufPtr;
-    int inputBuffered, outputBuffered;
-    int result;				/* Of calling device driver. */
-    int curPos;				/* Position on device. */
-
-    chanPtr = (Channel *) chan;
-    if (CheckChannelErrors(chanPtr, TCL_WRITABLE | TCL_READABLE) != 0) {
-	return -1;
-    }
-
-    /*
-     * Disallow tell on dead channels -- channels that have been closed but
-     * not yet been deallocated. Such channels can be found if the exit
-     * handler for channel cleanup has run but the channel is still
-     * registered in an interpreter.
-     */
-
-    if (CheckForDeadChannel(NULL,chanPtr)) {
-	return -1;
-    }
-
-    /*
-     * Disallow tell on channels whose type does not have a seek procedure
-     * defined. This means that the channel does not support seeking.
-     */
-
-    if (chanPtr->typePtr->seekProc == (Tcl_DriverSeekProc *) NULL) {
-        Tcl_SetErrno(EINVAL);
-        return -1;
-    }
-
-    /*
-     * Compute how much input and output is buffered. If both input and
-     * output is buffered, cannot compute the current position.
-     */
-
-    for (bufPtr = chanPtr->inQueueHead, inputBuffered = 0;
-             bufPtr != (ChannelBuffer *) NULL;
-             bufPtr = bufPtr->nextPtr) {
-        inputBuffered += (bufPtr->nextAdded - bufPtr->nextRemoved);
-    }
-    for (bufPtr = chanPtr->outQueueHead, outputBuffered = 0;
-             bufPtr != (ChannelBuffer *) NULL;
-             bufPtr = bufPtr->nextPtr) {
-        outputBuffered += (bufPtr->nextAdded - bufPtr->nextRemoved);
-    }
-    if ((chanPtr->curOutPtr != (ChannelBuffer *) NULL) &&
-           (chanPtr->curOutPtr->nextAdded > chanPtr->curOutPtr->nextRemoved)) {
-        chanPtr->flags |= BUFFER_READY;
-        outputBuffered +=
-            (chanPtr->curOutPtr->nextAdded - chanPtr->curOutPtr->nextRemoved);
-    }
-
-    if ((inputBuffered != 0) && (outputBuffered != 0)) {
-        Tcl_SetErrno(EFAULT);
-        return -1;
-    }
-
-    /*
-     * Get the current position in the device and compute the position
-     * where the next character will be read or written.
-     */
-
-    curPos = (chanPtr->typePtr->seekProc) (chanPtr->instanceData,
-            (long) 0, SEEK_CUR, &result);
-    if (curPos == -1) {
-        Tcl_SetErrno(result);
-        return -1;
-    }
-    if (inputBuffered != 0) {
-        return (curPos - inputBuffered);
-    }
-    return (curPos + outputBuffered);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CheckChannelErrors --
- *
- *	See if the channel is in an ready state and can perform the
- *	desired operation.
- *
- * Results:
- *	The return value is 0 if the channel is OK, otherwise the
- *	return value is -1 and errno is set to indicate the error.
- *
- * Side effects:
- *	May clear the EOF and/or BLOCKED bits if reading from channel.
- *
- *---------------------------------------------------------------------------
- */
- 
-static int
-CheckChannelErrors(chanPtr, direction)
-    Channel *chanPtr;	    /* Channel to check. */
-    int direction;	    /* Test if channel supports desired operation:
-			     * TCL_READABLE, TCL_WRITABLE. */
-{
-    /*
-     * Check for unreported error.
-     */
-
-    if (chanPtr->unreportedError != 0) {
-        Tcl_SetErrno(chanPtr->unreportedError);
-        chanPtr->unreportedError = 0;
-        return -1;
-    }
-
-    /*
-     * Fail if the channel is not opened for desired operation.
-     */
-
-    if ((chanPtr->flags & direction) == 0) {
-        Tcl_SetErrno(EACCES);
-        return -1;
-    }
-
-    /*
-     * Fail if the channel is in the middle of a background copy.
-     */
-
-    if (chanPtr->csPtr != NULL) {
-	Tcl_SetErrno(EBUSY);
-	return -1;
-    }
-
-    if (direction == TCL_READABLE) {
-	/*
-	 * If we have not encountered a sticky EOF, clear the EOF bit
-	 * (sticky EOF is set if we have seen the input eofChar, to prevent
-	 * reading beyond the eofChar). Also, always clear the BLOCKED bit.
-	 * We want to discover these conditions anew in each operation.
-	 */
-	
-	if ((chanPtr->flags & CHANNEL_STICKY_EOF) == 0) {
-	    chanPtr->flags &= ~CHANNEL_EOF;
-	}
-	chanPtr->flags &= ~(CHANNEL_BLOCKED | CHANNEL_NEED_MORE_DATA);
-    }
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Eof --
- *
- *	Returns 1 if the channel is at EOF, 0 otherwise.
- *
- * Results:
- *	1 or 0, always.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Eof(chan)
-    Tcl_Channel chan;			/* Does this channel have EOF? */
-{
-    Channel *chanPtr;		/* The real channel structure. */
-
-    chanPtr = (Channel *) chan;
-    return ((chanPtr->flags & CHANNEL_STICKY_EOF) ||
-            ((chanPtr->flags & CHANNEL_EOF) && (Tcl_InputBuffered(chan) == 0)))
-        ? 1 : 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InputBlocked --
- *
- *	Returns 1 if input is blocked on this channel, 0 otherwise.
- *
- * Results:
- *	0 or 1, always.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_InputBlocked(chan)
-    Tcl_Channel chan;			/* Is this channel blocked? */
-{
-    Channel *chanPtr;		/* The real channel structure. */
-
-    chanPtr = (Channel *) chan;
-    return (chanPtr->flags & CHANNEL_BLOCKED) ? 1 : 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InputBuffered --
- *
- *	Returns the number of bytes of input currently buffered in the
- *	internal buffer of a channel.
- *
- * Results:
- *	The number of input bytes buffered, or zero if the channel is not
- *	open for reading.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_InputBuffered(chan)
-    Tcl_Channel chan;			/* The channel to query. */
-{
-    Channel *chanPtr;
-    int bytesBuffered;
-    ChannelBuffer *bufPtr;
-
-    chanPtr = (Channel *) chan;
-    for (bytesBuffered = 0, bufPtr = chanPtr->inQueueHead;
-             bufPtr != (ChannelBuffer *) NULL;
-             bufPtr = bufPtr->nextPtr) {
-        bytesBuffered += (bufPtr->nextAdded - bufPtr->nextRemoved);
-    }
-    return bytesBuffered;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetChannelBufferSize --
- *
- *	Sets the size of buffers to allocate to store input or output
- *	in the channel. The size must be between 10 bytes and 1 MByte.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the size of buffers subsequently allocated for this channel.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetChannelBufferSize(chan, sz)
-    Tcl_Channel chan;			/* The channel whose buffer size
-                                         * to set. */
-    int sz;				/* The size to set. */
-{
-    Channel *chanPtr;
-    
-    /*
-     * If the buffer size is smaller than 10 bytes or larger than one MByte,
-     * do not accept the requested size and leave the current buffer size.
-     */
-    
-    if (sz < 10) {
-        return;
-    }
-    if (sz > (1024 * 1024)) {
-        return;
-    }
-
-    chanPtr = (Channel *) chan;
-    chanPtr->bufSize = sz;
-
-    if (chanPtr->outputStage != NULL) {
-	ckfree((char *) chanPtr->outputStage);
-	chanPtr->outputStage = NULL;
-    }
-    if ((chanPtr->encoding != NULL) && (chanPtr->flags & TCL_WRITABLE)) {
-	chanPtr->outputStage = (char *)
-		ckalloc((unsigned) (chanPtr->bufSize + 2));
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelBufferSize --
- *
- *	Retrieves the size of buffers to allocate for this channel.
- *
- * Results:
- *	The size.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetChannelBufferSize(chan)
-    Tcl_Channel chan;		/* The channel for which to find the
-                                 * buffer size. */
-{
-    Channel *chanPtr;
-
-    chanPtr = (Channel *) chan;
-    return chanPtr->bufSize;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_BadChannelOption --
- *
- *	This procedure generates a "bad option" error message in an
- *	(optional) interpreter.  It is used by channel drivers when 
- *      a invalid Set/Get option is requested. Its purpose is to concatenate
- *      the generic options list to the specific ones and factorize
- *      the generic options error message string.
- *
- * Results:
- *	TCL_ERROR.
- *
- * Side effects:
- *	An error message is generated in interp's result object to
- *	indicate that a command was invoked with the a bad option
- *	The message has the form
- *		bad option "blah": should be one of 
- *              <...generic options...>+<...specific options...>
- *	"blah" is the optionName argument and "<specific options>"
- *	is a space separated list of specific option words.
- *      The function takes good care of inserting minus signs before
- *      each option, commas after, and an "or" before the last option.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_BadChannelOption(interp, optionName, optionList)
-    Tcl_Interp *interp;			/* Current interpreter. (can be NULL)*/
-    char *optionName;			/* 'bad option' name */
-    char *optionList;			/* Specific options list to append 
-					 * to the standard generic options.
-					 * can be NULL for generic options 
-					 * only.
-					 */
-{
-    if (interp) {
-	CONST char *genericopt = 
-	    	"blocking buffering buffersize eofchar translation";
-	char **argv;
-	int  argc, i;
-	Tcl_DString ds;
-
-	Tcl_DStringInit(&ds);
-	Tcl_DStringAppend(&ds, (char *) genericopt, -1);
-	if (optionList && (*optionList)) {
-	    Tcl_DStringAppend(&ds, " ", 1);
-	    Tcl_DStringAppend(&ds, optionList, -1);
-	}
-	if (Tcl_SplitList(interp, Tcl_DStringValue(&ds), 
-	      	  &argc, &argv) != TCL_OK) {
-	    panic("malformed option list in channel driver");
-	}
-	Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, "bad option \"", optionName, 
-		 "\": should be one of ", (char *) NULL);
-	argc--;
-	for (i = 0; i < argc; i++) {
-	    Tcl_AppendResult(interp, "-", argv[i], ", ", (char *) NULL);
-	}
-	Tcl_AppendResult(interp, "or -", argv[i], (char *) NULL);
-	Tcl_DStringFree(&ds);
-	ckfree((char *) argv);
-    }
-    Tcl_SetErrno(EINVAL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetChannelOption --
- *
- *	Gets a mode associated with an IO channel. If the optionName arg
- *	is non NULL, retrieves the value of that option. If the optionName
- *	arg is NULL, retrieves a list of alternating option names and
- *	values for the given channel.
- *
- * Results:
- *	A standard Tcl result. Also sets the supplied DString to the
- *	string value of the option(s) returned.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetChannelOption(interp, chan, optionName, dsPtr)
-    Tcl_Interp *interp;		/* For error reporting - can be NULL. */
-    Tcl_Channel chan;		/* Channel on which to get option. */
-    char *optionName;		/* Option to get. */
-    Tcl_DString *dsPtr;		/* Where to store value(s). */
-{
-    size_t len;			/* Length of optionName string. */
-    char optionVal[128];	/* Buffer for sprintf. */
-    Channel *chanPtr = (Channel *) chan;
-    int flags;
-
-    /*
-     * If we are in the middle of a background copy, use the saved flags.
-     */
-
-    if (chanPtr->csPtr) {
-	if (chanPtr == chanPtr->csPtr->readPtr) {
-	    flags = chanPtr->csPtr->readFlags;
-	} else {
-	    flags = chanPtr->csPtr->writeFlags;
-	}
-    } else {
-	flags = chanPtr->flags;
-    }
-
-    /*
-     * Disallow options on dead channels -- channels that have been closed but
-     * not yet been deallocated. Such channels can be found if the exit
-     * handler for channel cleanup has run but the channel is still
-     * registered in an interpreter.
-     */
-
-    if (CheckForDeadChannel(interp,chanPtr)) return TCL_ERROR;
-
-    /*
-     * If the optionName is NULL it means that we want a list of all
-     * options and values.
-     */
-    
-    if (optionName == (char *) NULL) {
-        len = 0;
-    } else {
-        len = strlen(optionName);
-    }
-    
-    if ((len == 0) || ((len > 2) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-blocking", len) == 0))) {
-        if (len == 0) {
-            Tcl_DStringAppendElement(dsPtr, "-blocking");
-        }
-        Tcl_DStringAppendElement(dsPtr,
-		(flags & CHANNEL_NONBLOCKING) ? "0" : "1");
-        if (len > 0) {
-            return TCL_OK;
-        }
-    }
-    if ((len == 0) || ((len > 7) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-buffering", len) == 0))) {
-        if (len == 0) {
-            Tcl_DStringAppendElement(dsPtr, "-buffering");
-        }
-        if (flags & CHANNEL_LINEBUFFERED) {
-            Tcl_DStringAppendElement(dsPtr, "line");
-        } else if (flags & CHANNEL_UNBUFFERED) {
-            Tcl_DStringAppendElement(dsPtr, "none");
-        } else {
-            Tcl_DStringAppendElement(dsPtr, "full");
-        }
-        if (len > 0) {
-            return TCL_OK;
-        }
-    }
-    if ((len == 0) || ((len > 7) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-buffersize", len) == 0))) {
-        if (len == 0) {
-            Tcl_DStringAppendElement(dsPtr, "-buffersize");
-        }
-        TclFormatInt(optionVal, chanPtr->bufSize);
-        Tcl_DStringAppendElement(dsPtr, optionVal);
-        if (len > 0) {
-            return TCL_OK;
-        }
-    }
-    if ((len == 0) ||
-	    ((len > 2) && (optionName[1] == 'e') &&
-		    (strncmp(optionName, "-encoding", len) == 0))) {
-	if (len == 0) {
-	    Tcl_DStringAppendElement(dsPtr, "-encoding");
-	}
-	if (chanPtr->encoding == NULL) {
-	    Tcl_DStringAppendElement(dsPtr, "binary");
-	} else {
-	    Tcl_DStringAppendElement(dsPtr,
-		    Tcl_GetEncodingName(chanPtr->encoding));
-	}
-	if (len > 0) {
-	    return TCL_OK;
-	}
-    }
-    if ((len == 0) ||
-            ((len > 2) && (optionName[1] == 'e') &&
-                    (strncmp(optionName, "-eofchar", len) == 0))) {
-        if (len == 0) {
-            Tcl_DStringAppendElement(dsPtr, "-eofchar");
-        }
-        if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-                (TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-            Tcl_DStringStartSublist(dsPtr);
-        }
-        if (flags & TCL_READABLE) {
-            if (chanPtr->inEofChar == 0) {
-                Tcl_DStringAppendElement(dsPtr, "");
-            } else {
-                char buf[4];
-
-                sprintf(buf, "%c", chanPtr->inEofChar);
-                Tcl_DStringAppendElement(dsPtr, buf);
-            }
-        }
-        if (flags & TCL_WRITABLE) {
-            if (chanPtr->outEofChar == 0) {
-                Tcl_DStringAppendElement(dsPtr, "");
-            } else {
-                char buf[4];
-
-                sprintf(buf, "%c", chanPtr->outEofChar);
-                Tcl_DStringAppendElement(dsPtr, buf);
-            }
-        }
-        if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-                (TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-            Tcl_DStringEndSublist(dsPtr);
-        }
-        if (len > 0) {
-            return TCL_OK;
-        }
-    }
-    if ((len == 0) ||
-            ((len > 1) && (optionName[1] == 't') &&
-                    (strncmp(optionName, "-translation", len) == 0))) {
-        if (len == 0) {
-            Tcl_DStringAppendElement(dsPtr, "-translation");
-        }
-        if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-                (TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-            Tcl_DStringStartSublist(dsPtr);
-        }
-        if (flags & TCL_READABLE) {
-            if (chanPtr->inputTranslation == TCL_TRANSLATE_AUTO) {
-                Tcl_DStringAppendElement(dsPtr, "auto");
-            } else if (chanPtr->inputTranslation == TCL_TRANSLATE_CR) {
-                Tcl_DStringAppendElement(dsPtr, "cr");
-            } else if (chanPtr->inputTranslation == TCL_TRANSLATE_CRLF) {
-                Tcl_DStringAppendElement(dsPtr, "crlf");
-            } else {
-                Tcl_DStringAppendElement(dsPtr, "lf");
-            }
-        }
-        if (flags & TCL_WRITABLE) {
-            if (chanPtr->outputTranslation == TCL_TRANSLATE_AUTO) {
-                Tcl_DStringAppendElement(dsPtr, "auto");
-            } else if (chanPtr->outputTranslation == TCL_TRANSLATE_CR) {
-                Tcl_DStringAppendElement(dsPtr, "cr");
-            } else if (chanPtr->outputTranslation == TCL_TRANSLATE_CRLF) {
-                Tcl_DStringAppendElement(dsPtr, "crlf");
-            } else {
-                Tcl_DStringAppendElement(dsPtr, "lf");
-            }
-        }
-        if (((flags & (TCL_READABLE|TCL_WRITABLE)) ==
-                (TCL_READABLE|TCL_WRITABLE)) && (len == 0)) {
-            Tcl_DStringEndSublist(dsPtr);
-        }
-        if (len > 0) {
-            return TCL_OK;
-        }
-    }
-    if (chanPtr->typePtr->getOptionProc != (Tcl_DriverGetOptionProc *) NULL) {
-	/*
-	 * let the driver specific handle additional options
-	 * and result code and message.
-	 */
-
-        return (chanPtr->typePtr->getOptionProc) (chanPtr->instanceData,
-		  interp, optionName, dsPtr);
-    } else {
-	/*
-	 * no driver specific options case.
-	 */
-
-        if (len == 0) {
-            return TCL_OK;
-        }
-	return Tcl_BadChannelOption(interp, optionName, NULL);
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_SetChannelOption --
- *
- *	Sets an option on a channel.
- *
- * Results:
- *	A standard Tcl result.  On error, sets interp's result object
- *	if interp is not NULL.
- *
- * Side effects:
- *	May modify an option on a device.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_SetChannelOption(interp, chan, optionName, newValue)
-    Tcl_Interp *interp;		/* For error reporting - can be NULL. */
-    Tcl_Channel chan;		/* Channel on which to set mode. */
-    char *optionName;		/* Which option to set? */
-    char *newValue;		/* New value for option. */
-{
-    int newMode;		/* New (numeric) mode to sert. */
-    Channel *chanPtr;		/* The real IO channel. */
-    size_t len;			/* Length of optionName string. */
-    int argc;
-    char **argv;
-    
-    chanPtr = (Channel *) chan;
-
-    /*
-     * If the channel is in the middle of a background copy, fail.
-     */
-
-    if (chanPtr->csPtr) {
-	if (interp) {
-	    Tcl_AppendResult(interp,
-	         "unable to set channel options: background copy in progress",
-		 (char *) NULL);
-	}
-        return TCL_ERROR;
-    }
-
-
-    /*
-     * Disallow options on dead channels -- channels that have been closed but
-     * not yet been deallocated. Such channels can be found if the exit
-     * handler for channel cleanup has run but the channel is still
-     * registered in an interpreter.
-     */
-
-    if (CheckForDeadChannel(NULL,chanPtr)) return TCL_ERROR;
-    
-    len = strlen(optionName);
-
-    if ((len > 2) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-blocking", len) == 0)) {
-        if (Tcl_GetBoolean(interp, newValue, &newMode) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-        if (newMode) {
-            newMode = TCL_MODE_BLOCKING;
-        } else {
-            newMode = TCL_MODE_NONBLOCKING;
-        }
-	return SetBlockMode(interp, chanPtr, newMode);
-    } else if ((len > 7) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-buffering", len) == 0)) {
-        len = strlen(newValue);
-        if ((newValue[0] == 'f') && (strncmp(newValue, "full", len) == 0)) {
-            chanPtr->flags &=
-                (~(CHANNEL_UNBUFFERED|CHANNEL_LINEBUFFERED));
-        } else if ((newValue[0] == 'l') &&
-                (strncmp(newValue, "line", len) == 0)) {
-            chanPtr->flags &= (~(CHANNEL_UNBUFFERED));
-            chanPtr->flags |= CHANNEL_LINEBUFFERED;
-        } else if ((newValue[0] == 'n') &&
-                (strncmp(newValue, "none", len) == 0)) {
-            chanPtr->flags &= (~(CHANNEL_LINEBUFFERED));
-            chanPtr->flags |= CHANNEL_UNBUFFERED;
-        } else {
-            if (interp) {
-                Tcl_AppendResult(interp, "bad value for -buffering: ",
-                        "must be one of full, line, or none",
-                        (char *) NULL);
-                return TCL_ERROR;
-            }
-        }
-	return TCL_OK;
-    } else if ((len > 7) && (optionName[1] == 'b') &&
-            (strncmp(optionName, "-buffersize", len) == 0)) {
-        chanPtr->bufSize = atoi(newValue);	/* INTL: "C", UTF safe. */
-        if ((chanPtr->bufSize < 10) || (chanPtr->bufSize > (1024 * 1024))) {
-            chanPtr->bufSize = CHANNELBUFFER_DEFAULT_SIZE;
-        }
-    } else if ((len > 2) && (optionName[1] == 'e') &&
-	    (strncmp(optionName, "-encoding", len) == 0)) {
-	Tcl_Encoding encoding;
-
-	if ((newValue[0] == '\0') || (strcmp(newValue, "binary") == 0)) {
-	    encoding = NULL;
-	} else {
-	    encoding = Tcl_GetEncoding(interp, newValue);
-	    if (encoding == NULL) {
-		return TCL_ERROR;
-	    }
-	}
-	Tcl_FreeEncoding(chanPtr->encoding);
-	chanPtr->encoding = encoding;
-	chanPtr->inputEncodingState = NULL;
-	chanPtr->inputEncodingFlags = TCL_ENCODING_START;
-	chanPtr->outputEncodingState = NULL;
-	chanPtr->outputEncodingFlags = TCL_ENCODING_START;
-	chanPtr->flags &= ~CHANNEL_NEED_MORE_DATA;
-	UpdateInterest(chanPtr);
-    } else if ((len > 2) && (optionName[1] == 'e') &&
-            (strncmp(optionName, "-eofchar", len) == 0)) {
-        if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-        if (argc == 0) {
-            chanPtr->inEofChar = 0;
-            chanPtr->outEofChar = 0;
-        } else if (argc == 1) {
-            if (chanPtr->flags & TCL_WRITABLE) {
-                chanPtr->outEofChar = (int) argv[0][0];
-            }
-            if (chanPtr->flags & TCL_READABLE) {
-                chanPtr->inEofChar = (int) argv[0][0];
-            }
-        } else if (argc != 2) {
-            if (interp) {
-                Tcl_AppendResult(interp,
-                        "bad value for -eofchar: should be a list of one or",
-                        " two elements", (char *) NULL);
-            }
-            ckfree((char *) argv);
-            return TCL_ERROR;
-        } else {
-            if (chanPtr->flags & TCL_READABLE) {
-                chanPtr->inEofChar = (int) argv[0][0];
-            }
-            if (chanPtr->flags & TCL_WRITABLE) {
-                chanPtr->outEofChar = (int) argv[1][0];
-            }
-        }
-        if (argv != (char **) NULL) {
-            ckfree((char *) argv);
-        }
-	return TCL_OK;
-    } else if ((len > 1) && (optionName[1] == 't') &&
-            (strncmp(optionName, "-translation", len) == 0)) {
-	char *readMode, *writeMode;
-
-        if (Tcl_SplitList(interp, newValue, &argc, &argv) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-
-        if (argc == 1) {
-	    readMode = (chanPtr->flags & TCL_READABLE) ? argv[0] : NULL;
-	    writeMode = (chanPtr->flags & TCL_WRITABLE) ? argv[0] : NULL;
-	} else if (argc == 2) {
-	    readMode = (chanPtr->flags & TCL_READABLE) ? argv[0] : NULL;
-	    writeMode = (chanPtr->flags & TCL_WRITABLE) ? argv[1] : NULL;
-	} else {
-            if (interp) {
-                Tcl_AppendResult(interp,
-                        "bad value for -translation: must be a one or two",
-                        " element list", (char *) NULL);
-            }
-            ckfree((char *) argv);
-            return TCL_ERROR;
-	}
-
-	if (readMode) {
-	    if (*readMode == '\0') {
-		newMode = chanPtr->inputTranslation;
-	    } else if (strcmp(readMode, "auto") == 0) {
-		newMode = TCL_TRANSLATE_AUTO;
-	    } else if (strcmp(readMode, "binary") == 0) {
-		newMode = TCL_TRANSLATE_LF;
-		chanPtr->inEofChar = 0;
-		Tcl_FreeEncoding(chanPtr->encoding);		    
-		chanPtr->encoding = NULL;
-	    } else if (strcmp(readMode, "lf") == 0) {
-		newMode = TCL_TRANSLATE_LF;
-	    } else if (strcmp(readMode, "cr") == 0) {
-		newMode = TCL_TRANSLATE_CR;
-	    } else if (strcmp(readMode, "crlf") == 0) {
-		newMode = TCL_TRANSLATE_CRLF;
-	    } else if (strcmp(readMode, "platform") == 0) {
-		newMode = TCL_PLATFORM_TRANSLATION;
-	    } else {
-		if (interp) {
-		    Tcl_AppendResult(interp,
-			    "bad value for -translation: ",
-			    "must be one of auto, binary, cr, lf, crlf,",
-			    " or platform", (char *) NULL);
-		}
-		ckfree((char *) argv);
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * Reset the EOL flags since we need to look at any buffered
-	     * data to see if the new translation mode allows us to
-	     * complete the line.
-	     */
-
-	    if (newMode != chanPtr->inputTranslation) {
-		chanPtr->inputTranslation = (Tcl_EolTranslation) newMode;
-		chanPtr->flags &= ~(INPUT_SAW_CR);
-		chanPtr->flags &= ~(CHANNEL_NEED_MORE_DATA);
-		UpdateInterest(chanPtr);
-	    }
-	}
-	if (writeMode) {
-	    if (*writeMode == '\0') {
-		/* Do nothing. */
-	    } else if (strcmp(writeMode, "auto") == 0) {
-		/*
-		 * This is a hack to get TCP sockets to produce output
-		 * in CRLF mode if they are being set into AUTO mode.
-		 * A better solution for achieving this effect will be
-		 * coded later.
-		 */
-
-		if (strcmp(chanPtr->typePtr->typeName, "tcp") == 0) {
-		    chanPtr->outputTranslation = TCL_TRANSLATE_CRLF;
-		} else {
-		    chanPtr->outputTranslation = TCL_PLATFORM_TRANSLATION;
-		}
-	    } else if (strcmp(writeMode, "binary") == 0) {
-		chanPtr->outEofChar = 0;
-		chanPtr->outputTranslation = TCL_TRANSLATE_LF;
-		Tcl_FreeEncoding(chanPtr->encoding);		    
-		chanPtr->encoding = NULL;
-	    } else if (strcmp(writeMode, "lf") == 0) {
-		chanPtr->outputTranslation = TCL_TRANSLATE_LF;
-	    } else if (strcmp(writeMode, "cr") == 0) {
-		chanPtr->outputTranslation = TCL_TRANSLATE_CR;
-	    } else if (strcmp(writeMode, "crlf") == 0) {
-		chanPtr->outputTranslation = TCL_TRANSLATE_CRLF;
-	    } else if (strcmp(writeMode, "platform") == 0) {
-		chanPtr->outputTranslation = TCL_PLATFORM_TRANSLATION;
-	    } else {
-		if (interp) {
-		    Tcl_AppendResult(interp,
-			    "bad value for -translation: ",
-			    "must be one of auto, binary, cr, lf, crlf,",
-			    " or platform", (char *) NULL);
-		}
-		ckfree((char *) argv);
-		return TCL_ERROR;
-	    }
-	}
-        ckfree((char *) argv);            
-        return TCL_OK;
-    } else if (chanPtr->typePtr->setOptionProc != NULL) {
-        return (*chanPtr->typePtr->setOptionProc)(chanPtr->instanceData,
-                interp, optionName, newValue);
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, (char *) NULL);
-    }
-
-    /*
-     * If bufsize changes, need to get rid of old utility buffer.
-     */
-
-    if (chanPtr->saveInBufPtr != NULL) {
-	RecycleBuffer(chanPtr, chanPtr->saveInBufPtr, 1);
-	chanPtr->saveInBufPtr = NULL;
-    }
-    if (chanPtr->inQueueHead != NULL) {
-	if ((chanPtr->inQueueHead->nextPtr == NULL)
-		&& (chanPtr->inQueueHead->nextAdded ==
-			chanPtr->inQueueHead->nextRemoved)) {
-	    RecycleBuffer(chanPtr, chanPtr->inQueueHead, 1);
-	    chanPtr->inQueueHead = NULL;
-	    chanPtr->inQueueTail = NULL;
-	}
-    }
-
-    /*
-     * If encoding or bufsize changes, need to update output staging buffer.
-     */
-
-    if (chanPtr->outputStage != NULL) {
-	ckfree((char *) chanPtr->outputStage);
-	chanPtr->outputStage = NULL;
-    }
-    if ((chanPtr->encoding != NULL) && (chanPtr->flags & TCL_WRITABLE)) {
-	chanPtr->outputStage = (char *) 
-		ckalloc((unsigned) (chanPtr->bufSize + 2));
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanupChannelHandlers --
- *
- *	Removes channel handlers that refer to the supplied interpreter,
- *	so that if the actual channel is not closed now, these handlers
- *	will not run on subsequent events on the channel. This would be
- *	erroneous, because the interpreter no longer has a reference to
- *	this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes channel handlers.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CleanupChannelHandlers(interp, chanPtr)
-    Tcl_Interp *interp;
-    Channel *chanPtr;
-{
-    EventScriptRecord *sPtr, *prevPtr, *nextPtr;
-
-    /*
-     * Remove fileevent records on this channel that refer to the
-     * given interpreter.
-     */
-    
-    for (sPtr = chanPtr->scriptRecordPtr,
-             prevPtr = (EventScriptRecord *) NULL;
-             sPtr != (EventScriptRecord *) NULL;
-             sPtr = nextPtr) {
-        nextPtr = sPtr->nextPtr;
-        if (sPtr->interp == interp) {
-            if (prevPtr == (EventScriptRecord *) NULL) {
-                chanPtr->scriptRecordPtr = nextPtr;
-            } else {
-                prevPtr->nextPtr = nextPtr;
-            }
-
-            Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-                    ChannelEventScriptInvoker, (ClientData) sPtr);
-
-	    Tcl_DecrRefCount(sPtr->scriptPtr);
-            ckfree((char *) sPtr);
-        } else {
-            prevPtr = sPtr;
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NotifyChannel --
- *
- *	This procedure is called by a channel driver when a driver
- *	detects an event on a channel.  This procedure is responsible
- *	for actually handling the event by invoking any channel
- *	handler callbacks.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Whatever the channel handler callback procedure does.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_NotifyChannel(channel, mask)
-    Tcl_Channel channel;	/* Channel that detected an event. */
-    int mask;			/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which events were detected. */
-{
-    Channel *chanPtr = (Channel *) channel;
-    ChannelHandler *chPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    NextChannelHandler nh;
-
-    /*
-     * Preserve the channel struct in case the script closes it.
-     */
-     
-    Tcl_Preserve((ClientData) channel);
-
-    /*
-     * If we are flushing in the background, be sure to call FlushChannel
-     * for writable events.  Note that we have to discard the writable
-     * event so we don't call any write handlers before the flush is
-     * complete.
-     */
-
-    if ((chanPtr->flags & BG_FLUSH_SCHEDULED) && (mask & TCL_WRITABLE)) {
-	FlushChannel(NULL, chanPtr, 1);
-	mask &= ~TCL_WRITABLE;
-    }
-
-    /*
-     * Add this invocation to the list of recursive invocations of
-     * ChannelHandlerEventProc.
-     */
-    
-    nh.nextHandlerPtr = (ChannelHandler *) NULL;
-    nh.nestedHandlerPtr = tsdPtr->nestedHandlerPtr;
-    tsdPtr->nestedHandlerPtr = &nh;
-    
-    for (chPtr = chanPtr->chPtr; chPtr != (ChannelHandler *) NULL; ) {
-
-        /*
-         * If this channel handler is interested in any of the events that
-         * have occurred on the channel, invoke its procedure.
-         */
-        
-        if ((chPtr->mask & mask) != 0) {
-            nh.nextHandlerPtr = chPtr->nextPtr;
-	    (*(chPtr->proc))(chPtr->clientData, mask);
-            chPtr = nh.nextHandlerPtr;
-        } else {
-            chPtr = chPtr->nextPtr;
-	}
-    }
-
-    /*
-     * Update the notifier interest, since it may have changed after
-     * invoking event handlers.
-     */
-
-    if (chanPtr->typePtr != NULL) {
-	UpdateInterest(chanPtr);
-    }
-
-    Tcl_Release((ClientData) channel);
-
-    tsdPtr->nestedHandlerPtr = nh.nestedHandlerPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateInterest --
- *
- *	Arrange for the notifier to call us back at appropriate times
- *	based on the current state of the channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May schedule a timer or driver handler.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateInterest(chanPtr)
-    Channel *chanPtr;		/* Channel to update. */
-{
-    int mask = chanPtr->interestMask;
-
-    /*
-     * If there are flushed buffers waiting to be written, then
-     * we need to watch for the channel to become writable.
-     */
-
-    if (chanPtr->flags & BG_FLUSH_SCHEDULED) {
-	mask |= TCL_WRITABLE;
-    }
-
-    /*
-     * If there is data in the input queue, and we aren't waiting for more
-     * data, then we need to schedule a timer so we don't block in the
-     * notifier.  Also, cancel the read interest so we don't get duplicate
-     * events.
-     */
-
-    if (mask & TCL_READABLE) {
-	if (!(chanPtr->flags & CHANNEL_NEED_MORE_DATA)
-		&& (chanPtr->inQueueHead != (ChannelBuffer *) NULL)
-		&& (chanPtr->inQueueHead->nextRemoved <
-			chanPtr->inQueueHead->nextAdded)) {
-	    mask &= ~TCL_READABLE;
-	    if (!chanPtr->timer) {
-		chanPtr->timer = Tcl_CreateTimerHandler(0, ChannelTimerProc,
-			(ClientData) chanPtr);
-	    }
-	}
-    }
-    (chanPtr->typePtr->watchProc)(chanPtr->instanceData, mask);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ChannelTimerProc --
- *
- *	Timer handler scheduled by UpdateInterest to monitor the
- *	channel buffers until they are empty.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May invoke channel handlers.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ChannelTimerProc(clientData)
-    ClientData clientData;
-{
-    Channel *chanPtr = (Channel *) clientData;
-
-    if (!(chanPtr->flags & CHANNEL_NEED_MORE_DATA)
-	    && (chanPtr->interestMask & TCL_READABLE)
-	    && (chanPtr->inQueueHead != (ChannelBuffer *) NULL)
-	    && (chanPtr->inQueueHead->nextRemoved <
-		    chanPtr->inQueueHead->nextAdded)) {
-	/*
-	 * Restart the timer in case a channel handler reenters the
-	 * event loop before UpdateInterest gets called by Tcl_NotifyChannel.
-	 */
-
-	chanPtr->timer = Tcl_CreateTimerHandler(0, ChannelTimerProc,
-			(ClientData) chanPtr);
-	Tcl_NotifyChannel((Tcl_Channel)chanPtr, TCL_READABLE);
- 
-   } else {
-	chanPtr->timer = NULL;
-	UpdateInterest(chanPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateChannelHandler --
- *
- *	Arrange for a given procedure to be invoked whenever the
- *	channel indicated by the chanPtr arg becomes readable or
- *	writable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	From now on, whenever the I/O channel given by chanPtr becomes
- *	ready in the way indicated by mask, proc will be invoked.
- *	See the manual entry for details on the calling sequence
- *	to proc.  If there is already an event handler for chan, proc
- *	and clientData, then the mask will be updated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateChannelHandler(chan, mask, proc, clientData)
-    Tcl_Channel chan;		/* The channel to create the handler for. */
-    int mask;			/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, and TCL_EXCEPTION:
-				 * indicates conditions under which
-				 * proc should be called. Use 0 to
-                                 * disable a registered handler. */
-    Tcl_ChannelProc *proc;	/* Procedure to call for each
-				 * selected event. */
-    ClientData clientData;	/* Arbitrary data to pass to proc. */
-{
-    ChannelHandler *chPtr;
-    Channel *chanPtr;
-
-    chanPtr = (Channel *) chan;
-    
-    /*
-     * Check whether this channel handler is not already registered. If
-     * it is not, create a new record, else reuse existing record (smash
-     * current values).
-     */
-
-    for (chPtr = chanPtr->chPtr;
-             chPtr != (ChannelHandler *) NULL;
-             chPtr = chPtr->nextPtr) {
-        if ((chPtr->chanPtr == chanPtr) && (chPtr->proc == proc) &&
-                (chPtr->clientData == clientData)) {
-            break;
-        }
-    }
-    if (chPtr == (ChannelHandler *) NULL) {
-        chPtr = (ChannelHandler *) ckalloc((unsigned) sizeof(ChannelHandler));
-        chPtr->mask = 0;
-        chPtr->proc = proc;
-        chPtr->clientData = clientData;
-        chPtr->chanPtr = chanPtr;
-        chPtr->nextPtr = chanPtr->chPtr;
-        chanPtr->chPtr = chPtr;
-    }
-
-    /*
-     * The remainder of the initialization below is done regardless of
-     * whether or not this is a new record or a modification of an old
-     * one.
-     */
-
-    chPtr->mask = mask;
-
-    /*
-     * Recompute the interest mask for the channel - this call may actually
-     * be disabling an existing handler.
-     */
-    
-    chanPtr->interestMask = 0;
-    for (chPtr = chanPtr->chPtr;
-	 chPtr != (ChannelHandler *) NULL;
-	 chPtr = chPtr->nextPtr) {
-	chanPtr->interestMask |= chPtr->mask;
-    }
-
-    UpdateInterest(chanPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteChannelHandler --
- *
- *	Cancel a previously arranged callback arrangement for an IO
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If a callback was previously registered for this chan, proc and
- *	 clientData , it is removed and the callback will no longer be called
- *	when the channel becomes ready for IO.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteChannelHandler(chan, proc, clientData)
-    Tcl_Channel chan;		/* The channel for which to remove the
-                                 * callback. */
-    Tcl_ChannelProc *proc;	/* The procedure in the callback to delete. */
-    ClientData clientData;	/* The client data in the callback
-                                 * to delete. */
-    
-{
-    ChannelHandler *chPtr, *prevChPtr;
-    Channel *chanPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    NextChannelHandler *nhPtr;
-
-    chanPtr = (Channel *) chan;
-
-    /*
-     * Find the entry and the previous one in the list.
-     */
-
-    for (prevChPtr = (ChannelHandler *) NULL, chPtr = chanPtr->chPtr;
-             chPtr != (ChannelHandler *) NULL;
-             chPtr = chPtr->nextPtr) {
-        if ((chPtr->chanPtr == chanPtr) && (chPtr->clientData == clientData)
-                && (chPtr->proc == proc)) {
-            break;
-        }
-        prevChPtr = chPtr;
-    }
-    
-    /*
-     * If not found, return without doing anything.
-     */
-
-    if (chPtr == (ChannelHandler *) NULL) {
-        return;
-    }
-
-    /*
-     * If ChannelHandlerEventProc is about to process this handler, tell it to
-     * process the next one instead - we are going to delete *this* one.
-     */
-
-    for (nhPtr = tsdPtr->nestedHandlerPtr;
-             nhPtr != (NextChannelHandler *) NULL;
-             nhPtr = nhPtr->nestedHandlerPtr) {
-        if (nhPtr->nextHandlerPtr == chPtr) {
-            nhPtr->nextHandlerPtr = chPtr->nextPtr;
-        }
-    }
-
-    /*
-     * Splice it out of the list of channel handlers.
-     */
-    
-    if (prevChPtr == (ChannelHandler *) NULL) {
-        chanPtr->chPtr = chPtr->nextPtr;
-    } else {
-        prevChPtr->nextPtr = chPtr->nextPtr;
-    }
-    ckfree((char *) chPtr);
-
-    /*
-     * Recompute the interest list for the channel, so that infinite loops
-     * will not result if Tcl_DeleteChannelHandler is called inside an
-     * event.
-     */
-
-    chanPtr->interestMask = 0;
-    for (chPtr = chanPtr->chPtr;
-             chPtr != (ChannelHandler *) NULL;
-             chPtr = chPtr->nextPtr) {
-        chanPtr->interestMask |= chPtr->mask;
-    }
-
-    UpdateInterest(chanPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteScriptRecord --
- *
- *	Delete a script record for this combination of channel, interp
- *	and mask.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deletes a script record and cancels a channel event handler.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteScriptRecord(interp, chanPtr, mask)
-    Tcl_Interp *interp;		/* Interpreter in which script was to be
-                                 * executed. */
-    Channel *chanPtr;		/* The channel for which to delete the
-                                 * script record (if any). */
-    int mask;			/* Events in mask must exactly match mask
-                                 * of script to delete. */
-{
-    EventScriptRecord *esPtr, *prevEsPtr;
-
-    for (esPtr = chanPtr->scriptRecordPtr,
-             prevEsPtr = (EventScriptRecord *) NULL;
-             esPtr != (EventScriptRecord *) NULL;
-             prevEsPtr = esPtr, esPtr = esPtr->nextPtr) {
-        if ((esPtr->interp == interp) && (esPtr->mask == mask)) {
-            if (esPtr == chanPtr->scriptRecordPtr) {
-                chanPtr->scriptRecordPtr = esPtr->nextPtr;
-            } else {
-                prevEsPtr->nextPtr = esPtr->nextPtr;
-            }
-
-            Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-                    ChannelEventScriptInvoker, (ClientData) esPtr);
-            
-	    Tcl_DecrRefCount(esPtr->scriptPtr);
-            ckfree((char *) esPtr);
-
-            break;
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateScriptRecord --
- *
- *	Creates a record to store a script to be executed when a specific
- *	event fires on a specific channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Causes the script to be stored for later execution.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CreateScriptRecord(interp, chanPtr, mask, scriptPtr)
-    Tcl_Interp *interp;			/* Interpreter in which to execute
-                                         * the stored script. */
-    Channel *chanPtr;			/* Channel for which script is to
-                                         * be stored. */
-    int mask;				/* Set of events for which script
-                                         * will be invoked. */
-    Tcl_Obj *scriptPtr;			/* Pointer to script object. */
-{
-    EventScriptRecord *esPtr;
-
-    for (esPtr = chanPtr->scriptRecordPtr;
-             esPtr != (EventScriptRecord *) NULL;
-             esPtr = esPtr->nextPtr) {
-        if ((esPtr->interp == interp) && (esPtr->mask == mask)) {
-	    Tcl_DecrRefCount(esPtr->scriptPtr);
-	    esPtr->scriptPtr = (Tcl_Obj *) NULL;
-            break;
-        }
-    }
-    if (esPtr == (EventScriptRecord *) NULL) {
-        esPtr = (EventScriptRecord *) ckalloc((unsigned)
-                sizeof(EventScriptRecord));
-        Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
-                ChannelEventScriptInvoker, (ClientData) esPtr);
-        esPtr->nextPtr = chanPtr->scriptRecordPtr;
-        chanPtr->scriptRecordPtr = esPtr;
-    }
-    esPtr->chanPtr = chanPtr;
-    esPtr->interp = interp;
-    esPtr->mask = mask;
-    Tcl_IncrRefCount(scriptPtr);
-    esPtr->scriptPtr = scriptPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ChannelEventScriptInvoker --
- *
- *	Invokes a script scheduled by "fileevent" for when the channel
- *	becomes ready for IO. This function is invoked by the channel
- *	handler which was created by the Tcl "fileevent" command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Whatever the script does.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ChannelEventScriptInvoker(clientData, mask)
-    ClientData clientData;	/* The script+interp record. */
-    int mask;			/* Not used. */
-{
-    Tcl_Interp *interp;		/* Interpreter in which to eval the script. */
-    Channel *chanPtr;		/* The channel for which this handler is
-                                 * registered. */
-    EventScriptRecord *esPtr;	/* The event script + interpreter to eval it
-                                 * in. */
-    int result;			/* Result of call to eval script. */
-
-    esPtr = (EventScriptRecord *) clientData;
-
-    chanPtr = esPtr->chanPtr;
-    mask = esPtr->mask;
-    interp = esPtr->interp;
-    
-    /*
-     * We must preserve the interpreter so we can report errors on it
-     * later.  Note that we do not need to preserve the channel because
-     * that is done by Tcl_NotifyChannel before calling channel handlers.
-     */
-    
-    Tcl_Preserve((ClientData) interp);
-    result = Tcl_EvalObjEx(interp, esPtr->scriptPtr, TCL_EVAL_GLOBAL);
-
-    /*
-     * On error, cause a background error and remove the channel handler
-     * and the script record.
-     *
-     * NOTE: Must delete channel handler before causing the background error
-     * because the background error may want to reinstall the handler.
-     */
-    
-    if (result != TCL_OK) {
-	if (chanPtr->typePtr != NULL) {
-	    DeleteScriptRecord(interp, chanPtr, mask);
-	}
-        Tcl_BackgroundError(interp);
-    }
-    Tcl_Release((ClientData) interp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FileEventObjCmd --
- *
- *	This procedure implements the "fileevent" Tcl command. See the
- *	user documentation for details on what it does. This command is
- *	based on the Tk command "fileevent" which in turn is based on work
- *	contributed by Mark Diekhans.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May create a channel handler for the specified channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FileEventObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Interpreter in which the channel
-                                         * for which to create the handler
-                                         * is found. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Channel *chanPtr;			/* The channel to create
-                                         * the handler for. */
-    Tcl_Channel chan;			/* The opaque type for the channel. */
-    char *chanName;
-    int modeIndex;			/* Index of mode argument. */
-    int mask;
-    static char *modeOptions[] = {"readable", "writable", NULL};
-    static int maskArray[] = {TCL_READABLE, TCL_WRITABLE};
-
-    if ((objc != 3) && (objc != 4)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId event ?script?");
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[2], modeOptions, "event name", 0,
-	    &modeIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    mask = maskArray[modeIndex];
-
-    chanName = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, chanName, NULL);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    chanPtr = (Channel *) chan;
-    if ((chanPtr->flags & mask) == 0) {
-        Tcl_AppendResult(interp, "channel is not ",
-                (mask == TCL_READABLE) ? "readable" : "writable",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-    
-    /*
-     * If we are supposed to return the script, do so.
-     */
-
-    if (objc == 3) {
-	EventScriptRecord *esPtr;
-	for (esPtr = chanPtr->scriptRecordPtr;
-             esPtr != (EventScriptRecord *) NULL;
-             esPtr = esPtr->nextPtr) {
-	    if ((esPtr->interp == interp) && (esPtr->mask == mask)) {
-		Tcl_SetObjResult(interp, esPtr->scriptPtr);
-		break;
-	    }
-	}
-        return TCL_OK;
-    }
-
-    /*
-     * If we are supposed to delete a stored script, do so.
-     */
-
-    if (*(Tcl_GetString(objv[3])) == '\0') {
-        DeleteScriptRecord(interp, chanPtr, mask);
-        return TCL_OK;
-    }
-
-    /*
-     * Make the script record that will link between the event and the
-     * script to invoke. This also creates a channel event handler which
-     * will evaluate the script in the supplied interpreter.
-     */
-
-    CreateScriptRecord(interp, chanPtr, mask, objv[3]);
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclTestChannelCmd --
- *
- *	Implements the Tcl "testchannel" debugging command and its
- *	subcommands. This is part of the testing environment but must be
- *	in this file instead of tclTest.c because it needs access to the
- *	fields of struct Channel.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-TclTestChannelCmd(clientData, interp, argc, argv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Interpreter for result. */
-    int argc;			/* Count of additional args. */
-    char **argv;		/* Additional arg strings. */
-{
-    char *cmdName;		/* Sub command. */
-    Tcl_HashTable *hTblPtr;	/* Hash table of channels. */
-    Tcl_HashSearch hSearch;	/* Search variable. */
-    Tcl_HashEntry *hPtr;	/* Search variable. */
-    Channel *chanPtr;		/* The actual channel. */
-    Tcl_Channel chan;		/* The opaque type. */
-    size_t len;			/* Length of subcommand string. */
-    int IOQueued;		/* How much IO is queued inside channel? */
-    ChannelBuffer *bufPtr;	/* For iterating over queued IO. */
-    char buf[TCL_INTEGER_SPACE];/* For sprintf. */
-    
-    if (argc < 2) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                " subcommand ?additional args..?\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    cmdName = argv[1];
-    len = strlen(cmdName);
-
-    chanPtr = (Channel *) NULL;
-
-    if (argc > 2) {
-        chan = Tcl_GetChannel(interp, argv[2], NULL);
-        if (chan == (Tcl_Channel) NULL) {
-            return TCL_ERROR;
-        }
-        chanPtr = (Channel *) chan;
-    }
-
-
-    if ((cmdName[0] == 'i') && (strncmp(cmdName, "info", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " info channelName\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-        Tcl_AppendElement(interp, argv[2]);
-        Tcl_AppendElement(interp, chanPtr->typePtr->typeName);
-        if (chanPtr->flags & TCL_READABLE) {
-            Tcl_AppendElement(interp, "read");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        if (chanPtr->flags & TCL_WRITABLE) {
-            Tcl_AppendElement(interp, "write");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-            Tcl_AppendElement(interp, "nonblocking");
-        } else {
-            Tcl_AppendElement(interp, "blocking");
-        }
-        if (chanPtr->flags & CHANNEL_LINEBUFFERED) {
-            Tcl_AppendElement(interp, "line");
-        } else if (chanPtr->flags & CHANNEL_UNBUFFERED) {
-            Tcl_AppendElement(interp, "none");
-        } else {
-            Tcl_AppendElement(interp, "full");
-        }
-        if (chanPtr->flags & BG_FLUSH_SCHEDULED) {
-            Tcl_AppendElement(interp, "async_flush");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        if (chanPtr->flags & CHANNEL_EOF) {
-            Tcl_AppendElement(interp, "eof");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        if (chanPtr->flags & CHANNEL_BLOCKED) {
-            Tcl_AppendElement(interp, "blocked");
-        } else {
-            Tcl_AppendElement(interp, "unblocked");
-        }
-        if (chanPtr->inputTranslation == TCL_TRANSLATE_AUTO) {
-            Tcl_AppendElement(interp, "auto");
-            if (chanPtr->flags & INPUT_SAW_CR) {
-                Tcl_AppendElement(interp, "saw_cr");
-            } else {
-                Tcl_AppendElement(interp, "");
-            }
-        } else if (chanPtr->inputTranslation == TCL_TRANSLATE_LF) {
-            Tcl_AppendElement(interp, "lf");
-            Tcl_AppendElement(interp, "");
-        } else if (chanPtr->inputTranslation == TCL_TRANSLATE_CR) {
-            Tcl_AppendElement(interp, "cr");
-            Tcl_AppendElement(interp, "");
-        } else if (chanPtr->inputTranslation == TCL_TRANSLATE_CRLF) {
-            Tcl_AppendElement(interp, "crlf");
-            if (chanPtr->flags & INPUT_SAW_CR) {
-                Tcl_AppendElement(interp, "queued_cr");
-            } else {
-                Tcl_AppendElement(interp, "");
-            }
-        }
-        if (chanPtr->outputTranslation == TCL_TRANSLATE_AUTO) {
-            Tcl_AppendElement(interp, "auto");
-        } else if (chanPtr->outputTranslation == TCL_TRANSLATE_LF) {
-            Tcl_AppendElement(interp, "lf");
-        } else if (chanPtr->outputTranslation == TCL_TRANSLATE_CR) {
-            Tcl_AppendElement(interp, "cr");
-        } else if (chanPtr->outputTranslation == TCL_TRANSLATE_CRLF) {
-            Tcl_AppendElement(interp, "crlf");
-        }
-        for (IOQueued = 0, bufPtr = chanPtr->inQueueHead;
-                 bufPtr != (ChannelBuffer *) NULL;
-                 bufPtr = bufPtr->nextPtr) {
-            IOQueued += bufPtr->nextAdded - bufPtr->nextRemoved;
-        }
-        TclFormatInt(buf, IOQueued);
-        Tcl_AppendElement(interp, buf);
-        
-        IOQueued = 0;
-        if (chanPtr->curOutPtr != (ChannelBuffer *) NULL) {
-            IOQueued = chanPtr->curOutPtr->nextAdded -
-                chanPtr->curOutPtr->nextRemoved;
-        }
-        for (bufPtr = chanPtr->outQueueHead;
-                 bufPtr != (ChannelBuffer *) NULL;
-                 bufPtr = bufPtr->nextPtr) {
-            IOQueued += (bufPtr->nextAdded - bufPtr->nextRemoved);
-        }
-        TclFormatInt(buf, IOQueued);
-        Tcl_AppendElement(interp, buf);
-        
-        TclFormatInt(buf, Tcl_Tell((Tcl_Channel) chanPtr));
-        Tcl_AppendElement(interp, buf);
-
-        TclFormatInt(buf, chanPtr->refCount);
-        Tcl_AppendElement(interp, buf);
-
-        return TCL_OK;
-    }
-
-    if ((cmdName[0] == 'i') &&
-            (strncmp(cmdName, "inputbuffered", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        
-        for (IOQueued = 0, bufPtr = chanPtr->inQueueHead;
-                 bufPtr != (ChannelBuffer *) NULL;
-                 bufPtr = bufPtr->nextPtr) {
-            IOQueued += bufPtr->nextAdded - bufPtr->nextRemoved;
-        }
-        TclFormatInt(buf, IOQueued);
-        Tcl_AppendResult(interp, buf, (char *) NULL);
-        return TCL_OK;
-    }
-        
-    if ((cmdName[0] == 'm') && (strncmp(cmdName, "mode", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        
-        if (chanPtr->flags & TCL_READABLE) {
-            Tcl_AppendElement(interp, "read");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        if (chanPtr->flags & TCL_WRITABLE) {
-            Tcl_AppendElement(interp, "write");
-        } else {
-            Tcl_AppendElement(interp, "");
-        }
-        return TCL_OK;
-    }
-    
-    if ((cmdName[0] == 'n') && (strncmp(cmdName, "name", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        Tcl_AppendResult(interp, chanPtr->channelName, (char *) NULL);
-        return TCL_OK;
-    }
-    
-    if ((cmdName[0] == 'o') && (strncmp(cmdName, "open", len) == 0)) {
-        hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, "tclIO", NULL);
-        if (hTblPtr == (Tcl_HashTable *) NULL) {
-            return TCL_OK;
-        }
-        for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-                 hPtr != (Tcl_HashEntry *) NULL;
-                 hPtr = Tcl_NextHashEntry(&hSearch)) {
-            Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr));
-        }
-        return TCL_OK;
-    }
-
-    if ((cmdName[0] == 'o') &&
-            (strncmp(cmdName, "outputbuffered", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        
-        IOQueued = 0;
-        if (chanPtr->curOutPtr != (ChannelBuffer *) NULL) {
-            IOQueued = chanPtr->curOutPtr->nextAdded -
-                chanPtr->curOutPtr->nextRemoved;
-        }
-        for (bufPtr = chanPtr->outQueueHead;
-                 bufPtr != (ChannelBuffer *) NULL;
-                 bufPtr = bufPtr->nextPtr) {
-            IOQueued += (bufPtr->nextAdded - bufPtr->nextRemoved);
-        }
-        TclFormatInt(buf, IOQueued);
-        Tcl_AppendResult(interp, buf, (char *) NULL);
-        return TCL_OK;
-    }
-        
-    if ((cmdName[0] == 'q') &&
-            (strncmp(cmdName, "queuedcr", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        
-        Tcl_AppendResult(interp,
-                (chanPtr->flags & INPUT_SAW_CR) ? "1" : "0",
-                (char *) NULL);
-        return TCL_OK;
-    }
-    
-    if ((cmdName[0] == 'r') && (strncmp(cmdName, "readable", len) == 0)) {
-        hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, "tclIO", NULL);
-        if (hTblPtr == (Tcl_HashTable *) NULL) {
-            return TCL_OK;
-        }
-        for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-                 hPtr != (Tcl_HashEntry *) NULL;
-                 hPtr = Tcl_NextHashEntry(&hSearch)) {
-            chanPtr = (Channel *) Tcl_GetHashValue(hPtr);
-            if (chanPtr->flags & TCL_READABLE) {
-                Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr));
-            }
-        }
-        return TCL_OK;
-    }
-
-    if ((cmdName[0] == 'r') && (strncmp(cmdName, "refcount", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        
-        TclFormatInt(buf, chanPtr->refCount);
-        Tcl_AppendResult(interp, buf, (char *) NULL);
-        return TCL_OK;
-    }
-    
-    if ((cmdName[0] == 't') && (strncmp(cmdName, "type", len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "channel name required",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-        Tcl_AppendResult(interp, chanPtr->typePtr->typeName, (char *) NULL);
-        return TCL_OK;
-    }
-    
-    if ((cmdName[0] == 'w') && (strncmp(cmdName, "writable", len) == 0)) {
-        hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp, "tclIO", NULL);
-        if (hTblPtr == (Tcl_HashTable *) NULL) {
-            return TCL_OK;
-        }
-        for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-                 hPtr != (Tcl_HashEntry *) NULL;
-                 hPtr = Tcl_NextHashEntry(&hSearch)) {
-            chanPtr = (Channel *) Tcl_GetHashValue(hPtr);
-            if (chanPtr->flags & TCL_WRITABLE) {
-                Tcl_AppendElement(interp, Tcl_GetHashKey(hTblPtr, hPtr));
-            }
-        }
-        return TCL_OK;
-    }
-
-    Tcl_AppendResult(interp, "bad option \"", cmdName, "\": should be ",
-            "info, open, readable, or writable",
-            (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclTestChannelEventCmd --
- *
- *	This procedure implements the "testchannelevent" command. It is
- *	used to test the Tcl channel event mechanism. It is present in
- *	this file instead of tclTest.c because it needs access to the
- *	internal structure of the channel.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates, deletes and returns channel event handlers.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-TclTestChannelEventCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_Obj *resultListPtr;
-    Channel *chanPtr;
-    EventScriptRecord *esPtr, *prevEsPtr, *nextEsPtr;
-    char *cmd;
-    int index, i, mask, len;
-
-    if ((argc < 3) || (argc > 5)) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                " channelName cmd ?arg1? ?arg2?\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    chanPtr = (Channel *) Tcl_GetChannel(interp, argv[1], NULL);
-    if (chanPtr == (Channel *) NULL) {
-        return TCL_ERROR;
-    }
-    cmd = argv[2];
-    len = strlen(cmd);
-    if ((cmd[0] == 'a') && (strncmp(cmd, "add", (unsigned) len) == 0)) {
-        if (argc != 5) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " channelName add eventSpec script\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (strcmp(argv[3], "readable") == 0) {
-            mask = TCL_READABLE;
-        } else if (strcmp(argv[3], "writable") == 0) {
-            mask = TCL_WRITABLE;
-        } else if (strcmp(argv[3], "none") == 0) {
-            mask = 0;
-	} else {
-            Tcl_AppendResult(interp, "bad event name \"", argv[3],
-                    "\": must be readable, writable, or none", (char *) NULL);
-            return TCL_ERROR;
-        }
-
-        esPtr = (EventScriptRecord *) ckalloc((unsigned)
-                sizeof(EventScriptRecord));
-        esPtr->nextPtr = chanPtr->scriptRecordPtr;
-        chanPtr->scriptRecordPtr = esPtr;
-        
-        esPtr->chanPtr = chanPtr;
-        esPtr->interp = interp;
-        esPtr->mask = mask;
-	esPtr->scriptPtr = Tcl_NewStringObj(argv[4], -1);
-	Tcl_IncrRefCount(esPtr->scriptPtr);
-
-        Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
-                ChannelEventScriptInvoker, (ClientData) esPtr);
-        
-        return TCL_OK;
-    }
-
-    if ((cmd[0] == 'd') && (strncmp(cmd, "delete", (unsigned) len) == 0)) {
-        if (argc != 4) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " channelName delete index\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (Tcl_GetInt(interp, argv[3], &index) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-        if (index < 0) {
-            Tcl_AppendResult(interp, "bad event index: ", argv[3],
-                    ": must be nonnegative", (char *) NULL);
-            return TCL_ERROR;
-        }
-        for (i = 0, esPtr = chanPtr->scriptRecordPtr;
-                 (i < index) && (esPtr != (EventScriptRecord *) NULL);
-                 i++, esPtr = esPtr->nextPtr) {
-	    /* Empty loop body. */
-        }
-        if (esPtr == (EventScriptRecord *) NULL) {
-            Tcl_AppendResult(interp, "bad event index ", argv[3],
-                    ": out of range", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (esPtr == chanPtr->scriptRecordPtr) {
-            chanPtr->scriptRecordPtr = esPtr->nextPtr;
-        } else {
-            for (prevEsPtr = chanPtr->scriptRecordPtr;
-                     (prevEsPtr != (EventScriptRecord *) NULL) &&
-                         (prevEsPtr->nextPtr != esPtr);
-                     prevEsPtr = prevEsPtr->nextPtr) {
-                /* Empty loop body. */
-            }
-            if (prevEsPtr == (EventScriptRecord *) NULL) {
-                panic("TclTestChannelEventCmd: damaged event script list");
-            }
-            prevEsPtr->nextPtr = esPtr->nextPtr;
-        }
-        Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-                ChannelEventScriptInvoker, (ClientData) esPtr);
-	Tcl_DecrRefCount(esPtr->scriptPtr);
-        ckfree((char *) esPtr);
-
-        return TCL_OK;
-    }
-
-    if ((cmd[0] == 'l') && (strncmp(cmd, "list", (unsigned) len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " channelName list\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-	resultListPtr = Tcl_GetObjResult(interp);
-        for (esPtr = chanPtr->scriptRecordPtr;
-                 esPtr != (EventScriptRecord *) NULL;
-                 esPtr = esPtr->nextPtr) {
-	    if (esPtr->mask) {
- 	        Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
-		    (esPtr->mask == TCL_READABLE) ? "readable" : "writable", -1));
- 	    } else {
- 	        Tcl_ListObjAppendElement(interp, resultListPtr, 
-                    Tcl_NewStringObj("none", -1));
-	    }
-  	    Tcl_ListObjAppendElement(interp, resultListPtr, esPtr->scriptPtr);
-        }
-	Tcl_SetObjResult(interp, resultListPtr);
-        return TCL_OK;
-    }
-
-    if ((cmd[0] == 'r') && (strncmp(cmd, "removeall", (unsigned) len) == 0)) {
-        if (argc != 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " channelName removeall\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-        for (esPtr = chanPtr->scriptRecordPtr;
-                 esPtr != (EventScriptRecord *) NULL;
-                 esPtr = nextEsPtr) {
-            nextEsPtr = esPtr->nextPtr;
-            Tcl_DeleteChannelHandler((Tcl_Channel) chanPtr,
-                    ChannelEventScriptInvoker, (ClientData) esPtr);
-	    Tcl_DecrRefCount(esPtr->scriptPtr);
-            ckfree((char *) esPtr);
-        }
-        chanPtr->scriptRecordPtr = (EventScriptRecord *) NULL;
-        return TCL_OK;
-    }
-
-    if  ((cmd[0] == 's') && (strncmp(cmd, "set", (unsigned) len) == 0)) {
-        if (argc != 5) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                    " channelName delete index event\"", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (Tcl_GetInt(interp, argv[3], &index) == TCL_ERROR) {
-            return TCL_ERROR;
-        }
-        if (index < 0) {
-            Tcl_AppendResult(interp, "bad event index: ", argv[3],
-                    ": must be nonnegative", (char *) NULL);
-            return TCL_ERROR;
-        }
-        for (i = 0, esPtr = chanPtr->scriptRecordPtr;
-                 (i < index) && (esPtr != (EventScriptRecord *) NULL);
-                 i++, esPtr = esPtr->nextPtr) {
-	    /* Empty loop body. */
-        }
-        if (esPtr == (EventScriptRecord *) NULL) {
-            Tcl_AppendResult(interp, "bad event index ", argv[3],
-                    ": out of range", (char *) NULL);
-            return TCL_ERROR;
-        }
-
-        if (strcmp(argv[4], "readable") == 0) {
-            mask = TCL_READABLE;
-        } else if (strcmp(argv[4], "writable") == 0) {
-            mask = TCL_WRITABLE;
-        } else if (strcmp(argv[4], "none") == 0) {
-            mask = 0;
-	} else {
-            Tcl_AppendResult(interp, "bad event name \"", argv[4],
-                    "\": must be readable, writable, or none", (char *) NULL);
-            return TCL_ERROR;
-        }
-	esPtr->mask = mask;
-        Tcl_CreateChannelHandler((Tcl_Channel) chanPtr, mask,
-                ChannelEventScriptInvoker, (ClientData) esPtr);
-	return TCL_OK;
-    }    
-    Tcl_AppendResult(interp, "bad command ", cmd, ", must be one of ",
-            "add, delete, list, set, or removeall", (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCopyChannel --
- *
- *	This routine copies data from one channel to another, either
- *	synchronously or asynchronously.  If a command script is
- *	supplied, the operation runs in the background.  The script
- *	is invoked when the copy completes.  Otherwise the function
- *	waits until the copy is completed before returning.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May schedule a background copy operation that causes both
- *	channels to be marked busy.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCopyChannel(interp, inChan, outChan, toRead, cmdPtr)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    Tcl_Channel inChan;		/* Channel to read from. */
-    Tcl_Channel outChan;	/* Channel to write to. */
-    int toRead;			/* Amount of data to copy, or -1 for all. */
-    Tcl_Obj *cmdPtr;		/* Pointer to script to execute or NULL. */
-{
-    Channel *inPtr = (Channel *) inChan;
-    Channel *outPtr = (Channel *) outChan;
-    int readFlags, writeFlags;
-    CopyState *csPtr;
-    int nonBlocking = (cmdPtr) ? CHANNEL_NONBLOCKING : 0;
-
-    if (inPtr->csPtr) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
-		Tcl_GetChannelName(inChan), "\" is busy", NULL);
-	return TCL_ERROR;
-    }
-    if (outPtr->csPtr) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
-		Tcl_GetChannelName(outChan), "\" is busy", NULL);
-	return TCL_ERROR;
-    }
-
-    readFlags = inPtr->flags;
-    writeFlags = outPtr->flags;
-
-    /*
-     * Set up the blocking mode appropriately.  Background copies need
-     * non-blocking channels.  Foreground copies need blocking channels.
-     * If there is an error, restore the old blocking mode.
-     */
-
-    if (nonBlocking != (readFlags & CHANNEL_NONBLOCKING)) {
-	if (SetBlockMode(interp, inPtr,
-		nonBlocking ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING)
-		!= TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }	    
-    if (inPtr != outPtr) {
-	if (nonBlocking != (writeFlags & CHANNEL_NONBLOCKING)) {
-	    if (SetBlockMode(NULL, outPtr,
-		    nonBlocking ? TCL_MODE_BLOCKING : TCL_MODE_NONBLOCKING)
-		    != TCL_OK) {
-		if (nonBlocking != (readFlags & CHANNEL_NONBLOCKING)) {
-		    SetBlockMode(NULL, inPtr,
-			    (readFlags & CHANNEL_NONBLOCKING)
-			    ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING);
-		    return TCL_ERROR;
-		}
-	    }
-	}
-    }
-
-    /*
-     * Make sure the output side is unbuffered.
-     */
-
-    outPtr->flags = (outPtr->flags & ~(CHANNEL_LINEBUFFERED))
-	| CHANNEL_UNBUFFERED;
-
-    /*
-     * Allocate a new CopyState to maintain info about the current copy in
-     * progress.  This structure will be deallocated when the copy is
-     * completed.
-     */
-
-    csPtr = (CopyState*) ckalloc(sizeof(CopyState) + inPtr->bufSize);
-    csPtr->bufSize = inPtr->bufSize;
-    csPtr->readPtr = inPtr;
-    csPtr->writePtr = outPtr;
-    csPtr->readFlags = readFlags;
-    csPtr->writeFlags = writeFlags;
-    csPtr->toRead = toRead;
-    csPtr->total = 0;
-    csPtr->interp = interp;
-    if (cmdPtr) {
-	Tcl_IncrRefCount(cmdPtr);
-    }
-    csPtr->cmdPtr = cmdPtr;
-    inPtr->csPtr = csPtr;
-    outPtr->csPtr = csPtr;
-
-    /*
-     * Start copying data between the channels.
-     */
-
-    return CopyData(csPtr, 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyData --
- *
- *	This function implements the lowest level of the copying
- *	mechanism for TclCopyChannel.
- *
- * Results:
- *	Returns TCL_OK on success, else TCL_ERROR.
- *
- * Side effects:
- *	Moves data between channels, may create channel handlers.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CopyData(csPtr, mask)
-    CopyState *csPtr;		/* State of copy operation. */
-    int mask;			/* Current channel event flags. */
-{
-    Tcl_Interp *interp;
-    Tcl_Obj *cmdPtr, *errObj = NULL;
-    Tcl_Channel inChan, outChan;
-    int result = TCL_OK;
-    int size;
-    int total;
-
-    inChan = (Tcl_Channel)csPtr->readPtr;
-    outChan = (Tcl_Channel)csPtr->writePtr;
-    interp = csPtr->interp;
-    cmdPtr = csPtr->cmdPtr;
-
-    /*
-     * Copy the data the slow way, using the translation mechanism.
-     */
-
-    while (csPtr->toRead != 0) {
-
-	/*
-	 * Check for unreported background errors.
-	 */
-
-	if (csPtr->readPtr->unreportedError != 0) {
-	    Tcl_SetErrno(csPtr->readPtr->unreportedError);
-	    csPtr->readPtr->unreportedError = 0;
-	    goto readError;
-	}
-	if (csPtr->writePtr->unreportedError != 0) {
-	    Tcl_SetErrno(csPtr->writePtr->unreportedError);
-	    csPtr->writePtr->unreportedError = 0;
-	    goto writeError;
-	}
-	
-	/*
-	 * Read up to bufSize bytes.
-	 */
-
-	if ((csPtr->toRead == -1)
-		|| (csPtr->toRead > csPtr->bufSize)) {
-	    size = csPtr->bufSize;
-	} else {
-	    size = csPtr->toRead;
-	}
-	size = DoRead(csPtr->readPtr, csPtr->buffer, size);
-
-	if (size < 0) {
-	    readError:
-	    errObj = Tcl_NewObj();
-	    Tcl_AppendStringsToObj(errObj, "error reading \"",
-		    Tcl_GetChannelName(inChan), "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	    break;
-	} else if (size == 0) {
-	    /*
-	     * We had an underflow on the read side.  If we are at EOF,
-	     * then the copying is done, otherwise set up a channel
-	     * handler to detect when the channel becomes readable again.
-	     */
-	    
-	    if (Tcl_Eof(inChan)) {
-		break;
-	    } else if (!(mask & TCL_READABLE)) {
-		if (mask & TCL_WRITABLE) {
-		    Tcl_DeleteChannelHandler(outChan, CopyEventProc,
-			    (ClientData) csPtr);
-		}
-		Tcl_CreateChannelHandler(inChan, TCL_READABLE,
-			CopyEventProc, (ClientData) csPtr);
-	    }
-	    return TCL_OK;
-	}
-
-	/*
-	 * Now write the buffer out.
-	 */
-
-	size = DoWrite(csPtr->writePtr, csPtr->buffer, size);
-	if (size < 0) {
-	    writeError:
-	    errObj = Tcl_NewObj();
-	    Tcl_AppendStringsToObj(errObj, "error writing \"",
-		    Tcl_GetChannelName(outChan), "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	    break;
-	}
-
-	/*
-	 * Check to see if the write is happening in the background.  If so,
-	 * stop copying and wait for the channel to become writable again.
-	 */
-
-	if (csPtr->writePtr->flags & BG_FLUSH_SCHEDULED) {
-	    if (!(mask & TCL_WRITABLE)) {
-		if (mask & TCL_READABLE) {
-		    Tcl_DeleteChannelHandler(outChan, CopyEventProc,
-			    (ClientData) csPtr);
-		}
-		Tcl_CreateChannelHandler(outChan, TCL_WRITABLE,
-			CopyEventProc, (ClientData) csPtr);
-	    }
-	    return TCL_OK;
-	}
-
-	/*
-	 * Update the current byte count if we care.
-	 */
-
-	if (csPtr->toRead != -1) {
-	    csPtr->toRead -= size;
-	}
-	csPtr->total += size;
-
-	/*
-	 * For background copies, we only do one buffer per invocation so
-	 * we don't starve the rest of the system.
-	 */
-
-	if (cmdPtr) {
-	    /*
-	     * The first time we enter this code, there won't be a
-	     * channel handler established yet, so do it here.
-	     */
-
-	    if (mask == 0) {
-		Tcl_CreateChannelHandler(outChan, TCL_WRITABLE,
-			CopyEventProc, (ClientData) csPtr);
-	    }
-	    return TCL_OK;
-	}
-    }
-
-    /*
-     * Make the callback or return the number of bytes transferred.
-     * The local total is used because StopCopy frees csPtr.
-     */
-
-    total = csPtr->total;
-    if (cmdPtr) {
-	/*
-	 * Get a private copy of the command so we can mutate it
-	 * by adding arguments.  Note that StopCopy frees our saved
-	 * reference to the original command obj.
-	 */
-
-	cmdPtr = Tcl_DuplicateObj(cmdPtr);
-	Tcl_IncrRefCount(cmdPtr);
-	StopCopy(csPtr);
-	Tcl_Preserve((ClientData) interp);
-
-	Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewIntObj(total));
-	if (errObj) {
-	    Tcl_ListObjAppendElement(interp, cmdPtr, errObj);
-	}
-	if (Tcl_EvalObjEx(interp, cmdPtr, TCL_EVAL_GLOBAL) != TCL_OK) {
-	    Tcl_BackgroundError(interp);
-	    result = TCL_ERROR;
-	}
-	Tcl_DecrRefCount(cmdPtr);
-	Tcl_Release((ClientData) interp);
-    } else {
-	StopCopy(csPtr);
-	if (errObj) {
-	    Tcl_SetObjResult(interp, errObj);
-	    result = TCL_ERROR;
-	} else {
-	    Tcl_ResetResult(interp);
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), total);
-	}
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DoRead --
- *
- *	Reads a given number of bytes from a channel.
- *
- * Results:
- *	The number of characters read, or -1 on error. Use Tcl_GetErrno()
- *	to retrieve the error code for the error that occurred.
- *
- * Side effects:
- *	May cause input to be buffered.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DoRead(chanPtr, bufPtr, toRead)
-    Channel *chanPtr;		/* The channel from which to read. */
-    char *bufPtr;		/* Where to store input read. */
-    int toRead;			/* Maximum number of bytes to read. */
-{
-    int copied;			/* How many characters were copied into
-                                 * the result string? */
-    int copiedNow;		/* How many characters were copied from
-                                 * the current input buffer? */
-    int result;			/* Of calling GetInput. */
-    
-    /*
-     * If we have not encountered a sticky EOF, clear the EOF bit. Either
-     * way clear the BLOCKED bit. We want to discover these anew during
-     * each operation.
-     */
-
-    if (!(chanPtr->flags & CHANNEL_STICKY_EOF)) {
-        chanPtr->flags &= ~CHANNEL_EOF;
-    }
-    chanPtr->flags &= ~(CHANNEL_BLOCKED | CHANNEL_NEED_MORE_DATA);
-    
-    for (copied = 0; copied < toRead; copied += copiedNow) {
-        copiedNow = CopyAndTranslateBuffer(chanPtr, bufPtr + copied,
-                toRead - copied);
-        if (copiedNow == 0) {
-            if (chanPtr->flags & CHANNEL_EOF) {
-		goto done;
-            }
-            if (chanPtr->flags & CHANNEL_BLOCKED) {
-                if (chanPtr->flags & CHANNEL_NONBLOCKING) {
-		    goto done;
-                }
-                chanPtr->flags &= (~(CHANNEL_BLOCKED));
-            }
-            result = GetInput(chanPtr);
-            if (result != 0) {
-                if (result != EAGAIN) {
-                    copied = -1;
-                }
-		goto done;
-            }
-        }
-    }
-
-    chanPtr->flags &= (~(CHANNEL_BLOCKED));
-
-    done:
-    /*
-     * Update the notifier state so we don't block while there is still
-     * data in the buffers.
-     */
-
-    UpdateInterest(chanPtr);
-    return copied;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyAndTranslateBuffer --
- *
- *	Copy at most one buffer of input to the result space, doing
- *	eol translations according to mode in effect currently.
- *
- * Results:
- *	Number of bytes stored in the result buffer (as opposed to the
- *	number of bytes read from the channel).  May return
- *	zero if no input is available to be translated.
- *
- * Side effects:
- *	Consumes buffered input. May deallocate one buffer.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CopyAndTranslateBuffer(chanPtr, result, space)
-    Channel *chanPtr;		/* The channel from which to read input. */
-    char *result;		/* Where to store the copied input. */
-    int space;			/* How many bytes are available in result
-                                 * to store the copied input? */
-{
-    int bytesInBuffer;		/* How many bytes are available to be
-                                 * copied in the current input buffer? */
-    int copied;			/* How many characters were already copied
-                                 * into the destination space? */
-    ChannelBuffer *bufPtr;	/* The buffer from which to copy bytes. */
-    int i;			/* Iterates over the copied input looking
-                                 * for the input eofChar. */
-    
-    /*
-     * If there is no input at all, return zero. The invariant is that either
-     * there is no buffer in the queue, or if the first buffer is empty, it
-     * is also the last buffer (and thus there is no input in the queue).
-     * Note also that if the buffer is empty, we leave it in the queue.
-     */
-    
-    if (chanPtr->inQueueHead == (ChannelBuffer *) NULL) {
-        return 0;
-    }
-    bufPtr = chanPtr->inQueueHead;
-    bytesInBuffer = bufPtr->nextAdded - bufPtr->nextRemoved;
-
-    copied = 0;
-    switch (chanPtr->inputTranslation) {
-        case TCL_TRANSLATE_LF: {
-            if (bytesInBuffer == 0) {
-                return 0;
-            }
-
-	    /*
-             * Copy the current chunk into the result buffer.
-             */
-
-	    if (bytesInBuffer < space) {
-		space = bytesInBuffer;
-	    }
-	    memcpy((VOID *) result,
-		    (VOID *) (bufPtr->buf + bufPtr->nextRemoved),
-		    (size_t) space);
-	    bufPtr->nextRemoved += space;
-	    copied = space;
-            break;
-	}
-        case TCL_TRANSLATE_CR: {
-	    char *end;
-	    
-            if (bytesInBuffer == 0) {
-                return 0;
-            }
-
-	    /*
-             * Copy the current chunk into the result buffer, then
-             * replace all \r with \n.
-             */
-
-	    if (bytesInBuffer < space) {
-		space = bytesInBuffer;
-	    }
-	    memcpy((VOID *) result,
-		    (VOID *) (bufPtr->buf + bufPtr->nextRemoved),
-		    (size_t) space);
-	    bufPtr->nextRemoved += space;
-	    copied = space;
-
-	    for (end = result + copied; result < end; result++) {
-		if (*result == '\r') {
-		    *result = '\n';
-		}
-            }
-            break;
-	}
-        case TCL_TRANSLATE_CRLF: {
-	    char *src, *end, *dst;
-	    int curByte;
-	    
-            /*
-             * If there is a held-back "\r" at EOF, produce it now.
-             */
-            
-	    if (bytesInBuffer == 0) {
-                if ((chanPtr->flags & (INPUT_SAW_CR | CHANNEL_EOF)) ==
-                        (INPUT_SAW_CR | CHANNEL_EOF)) {
-                    result[0] = '\r';
-                    chanPtr->flags &= ~INPUT_SAW_CR;
-                    return 1;
-                }
-                return 0;
-            }
-
-            /*
-             * Copy the current chunk and replace "\r\n" with "\n"
-             * (but not standalone "\r"!).
-             */
-
-	    if (bytesInBuffer < space) {
-		space = bytesInBuffer;
-	    }
-	    memcpy((VOID *) result,
-		    (VOID *) (bufPtr->buf + bufPtr->nextRemoved),
-		    (size_t) space);
-	    bufPtr->nextRemoved += space;
-	    copied = space;
-
-	    end = result + copied;
-	    dst = result;
-	    for (src = result; src < end; src++) {
-		curByte = *src;
-		if (curByte == '\n') {
-                    chanPtr->flags &= ~INPUT_SAW_CR;
-		} else if (chanPtr->flags & INPUT_SAW_CR) {
-		    chanPtr->flags &= ~INPUT_SAW_CR;
-		    *dst = '\r';
-		    dst++;
-		}
-		if (curByte == '\r') {
-		    chanPtr->flags |= INPUT_SAW_CR;
-		} else {
-		    *dst = (char) curByte;
-		    dst++;
-		}
-	    }
-	    copied = dst - result;
-	    break;
-	}
-        case TCL_TRANSLATE_AUTO: {
-	    char *src, *end, *dst;
-	    int curByte;
-	
-            if (bytesInBuffer == 0) {
-                return 0;
-            }
-
-            /*
-             * Loop over the current buffer, converting "\r" and "\r\n"
-             * to "\n".
-             */
-
-	    if (bytesInBuffer < space) {
-		space = bytesInBuffer;
-	    }
-	    memcpy((VOID *) result,
-		    (VOID *) (bufPtr->buf + bufPtr->nextRemoved),
-		    (size_t) space);
-	    bufPtr->nextRemoved += space;
-	    copied = space;
-
-	    end = result + copied;
-	    dst = result;
-	    for (src = result; src < end; src++) {
-		curByte = *src;
-		if (curByte == '\r') {
-		    chanPtr->flags |= INPUT_SAW_CR;
-		    *dst = '\n';
-		    dst++;
-		} else {
-		    if ((curByte != '\n') || 
-			    !(chanPtr->flags & INPUT_SAW_CR)) {
-			*dst = (char) curByte;
-			dst++;
-		    }
-		    chanPtr->flags &= ~INPUT_SAW_CR;
-		}
-	    }
-	    copied = dst - result;
-            break;
-	}
-        default: {
-            panic("unknown eol translation mode");
-	}
-    }
-
-    /*
-     * If an in-stream EOF character is set for this channel, check that
-     * the input we copied so far does not contain the EOF char.  If it does,
-     * copy only up to and excluding that character.
-     */
-    
-    if (chanPtr->inEofChar != 0) {
-        for (i = 0; i < copied; i++) {
-            if (result[i] == (char) chanPtr->inEofChar) {
-		/*
-		 * Set sticky EOF so that no further input is presented
-		 * to the caller.
-		 */
-		
-		chanPtr->flags |= (CHANNEL_EOF | CHANNEL_STICKY_EOF);
-		chanPtr->inputEncodingFlags |= TCL_ENCODING_END;
-		copied = i;
-                break;
-            }
-        }
-    }
-
-    /*
-     * If the current buffer is empty recycle it.
-     */
-
-    if (bufPtr->nextRemoved == bufPtr->nextAdded) {
-        chanPtr->inQueueHead = bufPtr->nextPtr;
-        if (chanPtr->inQueueHead == (ChannelBuffer *) NULL) {
-            chanPtr->inQueueTail = (ChannelBuffer *) NULL;
-        }
-        RecycleBuffer(chanPtr, bufPtr, 0);
-    }
-
-    /*
-     * Return the number of characters copied into the result buffer.
-     * This may be different from the number of bytes consumed, because
-     * of EOL translations.
-     */
-
-    return copied;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DoWrite --
- *
- *	Puts a sequence of characters into an output buffer, may queue the
- *	buffer for output if it gets full, and also remembers whether the
- *	current buffer is ready e.g. if it contains a newline and we are in
- *	line buffering mode.
- *
- * Results:
- *	The number of bytes written or -1 in case of error. If -1,
- *	Tcl_GetErrno will return the error code.
- *
- * Side effects:
- *	May buffer up output and may cause output to be produced on the
- *	channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DoWrite(chanPtr, src, srcLen)
-    Channel *chanPtr;			/* The channel to buffer output for. */
-    char *src;				/* Data to write. */
-    int srcLen;				/* Number of bytes to write. */
-{
-    ChannelBuffer *outBufPtr;		/* Current output buffer. */
-    int foundNewline;			/* Did we find a newline in output? */
-    char *dPtr;
-    char *sPtr;				/* Search variables for newline. */
-    int crsent;				/* In CRLF eol translation mode,
-                                         * remember the fact that a CR was
-                                         * output to the channel without
-                                         * its following NL. */
-    int i;				/* Loop index for newline search. */
-    int destCopied;			/* How many bytes were used in this
-                                         * destination buffer to hold the
-                                         * output? */
-    int totalDestCopied;		/* How many bytes total were
-                                         * copied to the channel buffer? */
-    int srcCopied;			/* How many bytes were copied from
-                                         * the source string? */
-    char *destPtr;			/* Where in line to copy to? */
-
-    /*
-     * If we are in network (or windows) translation mode, record the fact
-     * that we have not yet sent a CR to the channel.
-     */
-
-    crsent = 0;
-    
-    /*
-     * Loop filling buffers and flushing them until all output has been
-     * consumed.
-     */
-
-    srcCopied = 0;
-    totalDestCopied = 0;
-
-    while (srcLen > 0) {
-        
-        /*
-         * Make sure there is a current output buffer to accept output.
-         */
-
-        if (chanPtr->curOutPtr == (ChannelBuffer *) NULL) {
-            chanPtr->curOutPtr = AllocChannelBuffer(chanPtr->bufSize);
-        }
-
-        outBufPtr = chanPtr->curOutPtr;
-
-        destCopied = outBufPtr->bufLength - outBufPtr->nextAdded;
-        if (destCopied > srcLen) {
-            destCopied = srcLen;
-        }
-        
-        destPtr = outBufPtr->buf + outBufPtr->nextAdded;
-        switch (chanPtr->outputTranslation) {
-            case TCL_TRANSLATE_LF:
-                srcCopied = destCopied;
-                memcpy((VOID *) destPtr, (VOID *) src, (size_t) destCopied);
-                break;
-            case TCL_TRANSLATE_CR:
-                srcCopied = destCopied;
-                memcpy((VOID *) destPtr, (VOID *) src, (size_t) destCopied);
-                for (dPtr = destPtr; dPtr < destPtr + destCopied; dPtr++) {
-                    if (*dPtr == '\n') {
-                        *dPtr = '\r';
-                    }
-                }
-                break;
-            case TCL_TRANSLATE_CRLF:
-                for (srcCopied = 0, dPtr = destPtr, sPtr = src;
-                     dPtr < destPtr + destCopied;
-                     dPtr++, sPtr++, srcCopied++) {
-                    if (*sPtr == '\n') {
-                        if (crsent) {
-                            *dPtr = '\n';
-                            crsent = 0;
-                        } else {
-                            *dPtr = '\r';
-                            crsent = 1;
-                            sPtr--, srcCopied--;
-                        }
-                    } else {
-                        *dPtr = *sPtr;
-                    }
-                }
-                break;
-            case TCL_TRANSLATE_AUTO:
-                panic("Tcl_Write: AUTO output translation mode not supported");
-            default:
-                panic("Tcl_Write: unknown output translation mode");
-        }
-
-        /*
-         * The current buffer is ready for output if it is full, or if it
-         * contains a newline and this channel is line-buffered, or if it
-         * contains any output and this channel is unbuffered.
-         */
-
-        outBufPtr->nextAdded += destCopied;
-        if (!(chanPtr->flags & BUFFER_READY)) {
-            if (outBufPtr->nextAdded == outBufPtr->bufLength) {
-                chanPtr->flags |= BUFFER_READY;
-            } else if (chanPtr->flags & CHANNEL_LINEBUFFERED) {
-                for (sPtr = src, i = 0, foundNewline = 0;
-                         (i < srcCopied) && (!foundNewline);
-                         i++, sPtr++) {
-                    if (*sPtr == '\n') {
-                        foundNewline = 1;
-                        break;
-                    }
-                }
-                if (foundNewline) {
-                    chanPtr->flags |= BUFFER_READY;
-                }
-            } else if (chanPtr->flags & CHANNEL_UNBUFFERED) {
-                chanPtr->flags |= BUFFER_READY;
-            }
-        }
-        
-        totalDestCopied += srcCopied;
-        src += srcCopied;
-        srcLen -= srcCopied;
-
-        if (chanPtr->flags & BUFFER_READY) {
-            if (FlushChannel(NULL, chanPtr, 0) != 0) {
-                return -1;
-            }
-        }
-    } /* Closes "while" */
-
-    return totalDestCopied;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyEventProc --
- *
- *	This routine is invoked as a channel event handler for
- *	the background copy operation.  It is just a trivial wrapper
- *	around the CopyData routine.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CopyEventProc(clientData, mask)
-    ClientData clientData;
-    int mask;
-{
-    (void) CopyData((CopyState *)clientData, mask);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StopCopy --
- *
- *	This routine halts a copy that is in progress.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes any pending channel handlers and restores the blocking
- *	and buffering modes of the channels.  The CopyState is freed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-StopCopy(csPtr)
-    CopyState *csPtr;		/* State for bg copy to stop . */
-{
-    int nonBlocking;
-
-    if (!csPtr) {
-	return;
-    }
-
-    /*
-     * Restore the old blocking mode and output buffering mode.
-     */
-
-    nonBlocking = (csPtr->readFlags & CHANNEL_NONBLOCKING);
-    if (nonBlocking != (csPtr->readPtr->flags & CHANNEL_NONBLOCKING)) {
-	SetBlockMode(NULL, csPtr->readPtr,
-		nonBlocking ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING);
-    }
-    if (csPtr->writePtr != csPtr->writePtr) {
-	if (nonBlocking != (csPtr->writePtr->flags & CHANNEL_NONBLOCKING)) {
-	    SetBlockMode(NULL, csPtr->writePtr,
-		    nonBlocking ? TCL_MODE_NONBLOCKING : TCL_MODE_BLOCKING);
-	}
-    }
-    csPtr->writePtr->flags &= ~(CHANNEL_LINEBUFFERED | CHANNEL_UNBUFFERED);
-    csPtr->writePtr->flags |=
-	csPtr->writeFlags & (CHANNEL_LINEBUFFERED | CHANNEL_UNBUFFERED);
-	    
-
-    if (csPtr->cmdPtr) {
-	Tcl_DeleteChannelHandler((Tcl_Channel)csPtr->readPtr, CopyEventProc,
-	    (ClientData)csPtr);
-	if (csPtr->readPtr != csPtr->writePtr) {
-	    Tcl_DeleteChannelHandler((Tcl_Channel)csPtr->writePtr,
-		    CopyEventProc, (ClientData)csPtr);
-	}
-        Tcl_DecrRefCount(csPtr->cmdPtr);
-    }
-    csPtr->readPtr->csPtr = NULL;
-    csPtr->writePtr->csPtr = NULL;
-    ckfree((char*) csPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetBlockMode --
- *
- *	This function sets the blocking mode for a channel and updates
- *	the state flags.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Modifies the blocking mode of the channel and possibly generates
- *	an error.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetBlockMode(interp, chanPtr, mode)
-    Tcl_Interp *interp;		/* Interp for error reporting. */
-    Channel *chanPtr;		/* Channel to modify. */
-    int mode;			/* One of TCL_MODE_BLOCKING or
-				 * TCL_MODE_NONBLOCKING. */
-{
-    int result = 0;
-    if (chanPtr->typePtr->blockModeProc != NULL) {
-	result = (chanPtr->typePtr->blockModeProc) (chanPtr->instanceData,
-		mode);
-    }
-    if (result != 0) {
-	Tcl_SetErrno(result);
-	if (interp != (Tcl_Interp *) NULL) {
-	    Tcl_AppendResult(interp, "error setting blocking mode: ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	}
-	return TCL_ERROR;
-    }
-    if (mode == TCL_MODE_BLOCKING) {
-	chanPtr->flags &= (~(CHANNEL_NONBLOCKING | BG_FLUSH_SCHEDULED));
-    } else {
-	chanPtr->flags |= CHANNEL_NONBLOCKING;
-    }
-    return TCL_OK;
-}
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
deleted file mode 100644
index f88840b..0000000
--- a/generic/tclIOCmd.c
+++ /dev/null
@@ -1,1537 +0,0 @@
-/* 
- * tclIOCmd.c --
- *
- *	Contains the definitions of most of the Tcl commands relating to IO.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIOCmd.c,v 1.5 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Callback structure for accept callback in a TCP server.
- */
-
-typedef struct AcceptCallback {
-    char *script;			/* Script to invoke. */
-    Tcl_Interp *interp;			/* Interpreter in which to run it. */
-} AcceptCallback;
-
-/*
- * Static functions for this file:
- */
-
-static void	AcceptCallbackProc _ANSI_ARGS_((ClientData callbackData,
-	            Tcl_Channel chan, char *address, int port));
-static void	RegisterTcpServerInterpCleanup _ANSI_ARGS_((Tcl_Interp *interp,
-	            AcceptCallback *acceptCallbackPtr));
-static void	TcpAcceptCallbacksDeleteProc _ANSI_ARGS_((
-		    ClientData clientData, Tcl_Interp *interp));
-static void	TcpServerCloseProc _ANSI_ARGS_((ClientData callbackData));
-static void	UnregisterTcpServerInterpCleanupProc _ANSI_ARGS_((
-		    Tcl_Interp *interp, AcceptCallback *acceptCallbackPtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PutsObjCmd --
- *
- *	This procedure is invoked to process the "puts" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Produces output on a channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_PutsObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to puts on. */
-    int i;				/* Counter. */
-    int newline;			/* Add a newline at end? */
-    char *channelId;			/* Name of channel for puts. */
-    int result;				/* Result of puts operation. */
-    int mode;				/* Mode in which channel is opened. */
-    char *arg;
-    int length;
-
-    i = 1;
-    newline = 1;
-    if ((objc >= 2) && (strcmp(Tcl_GetString(objv[1]), "-nonewline") == 0)) {
-	newline = 0;
-	i++;
-    }
-    if ((i < (objc-3)) || (i >= objc)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?-nonewline? ?channelId? string");
-	return TCL_ERROR;
-    }
-
-    /*
-     * The code below provides backwards compatibility with an old
-     * form of the command that is no longer recommended or documented.
-     */
-
-    if (i == (objc-3)) {
-	arg = Tcl_GetStringFromObj(objv[i + 2], &length);
-	if (strncmp(arg, "nonewline", (size_t) length) != 0) {
-	    Tcl_AppendResult(interp, "bad argument \"", arg,
-		    "\": should be \"nonewline\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	newline = 0;
-    }
-    if (i == (objc - 1)) {
-	channelId = "stdout";
-    } else {
-	channelId = Tcl_GetString(objv[i]);
-	i++;
-    }
-    chan = Tcl_GetChannel(interp, channelId, &mode);
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_ERROR;
-    }
-    if ((mode & TCL_WRITABLE) == 0) {
-	Tcl_AppendResult(interp, "channel \"", channelId,
-                "\" wasn't opened for writing", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    result = Tcl_WriteObj(chan, objv[i]);
-    if (result < 0) {
-        goto error;
-    }
-    if (newline != 0) {
-        result = Tcl_WriteChars(chan, "\n", 1);
-        if (result < 0) {
-            goto error;
-        }
-    }
-    return TCL_OK;
-
-    error:
-    Tcl_AppendResult(interp, "error writing \"", channelId, "\": ",
-	    Tcl_PosixError(interp), (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FlushObjCmd --
- *
- *	This procedure is called to process the Tcl "flush" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May cause output to appear on the specified channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FlushObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to flush on. */
-    char *channelId;
-    int mode;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
-	return TCL_ERROR;
-    }
-    channelId = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, channelId, &mode);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if ((mode & TCL_WRITABLE) == 0) {
-	Tcl_AppendResult(interp, "channel \"", channelId,
-		"\" wasn't opened for writing", (char *) NULL);
-        return TCL_ERROR;
-    }
-    
-    if (Tcl_Flush(chan) != TCL_OK) {
-	Tcl_AppendResult(interp, "error flushing \"", channelId, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetsObjCmd --
- *
- *	This procedure is called to process the Tcl "gets" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May consume input from channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_GetsObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to read from. */
-    int lineLen;			/* Length of line just read. */
-    int mode;				/* Mode in which channel is opened. */
-    char *name;
-    Tcl_Obj *resultPtr, *linePtr;
-
-    if ((objc != 2) && (objc != 3)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?varName?");
-	return TCL_ERROR;
-    }
-    name = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, name, &mode);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if ((mode & TCL_READABLE) == 0) {
-	Tcl_AppendResult(interp, "channel \"", name,
-		"\" wasn't opened for reading", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    linePtr = resultPtr;
-    if (objc == 3) {
-	/*
-	 * Variable gets line, interp get bytecount.
-	 */
-
-	linePtr = Tcl_NewObj();
-    }
-
-    lineLen = Tcl_GetsObj(chan, linePtr);
-    if (lineLen < 0) {
-        if (!Tcl_Eof(chan) && !Tcl_InputBlocked(chan)) {
-	    if (linePtr != resultPtr) {
-		Tcl_DecrRefCount(linePtr);
-	    }
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "error reading \"", name, "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-            return TCL_ERROR;
-        }
-        lineLen = -1;
-    }
-    if (objc == 3) {
-	if (Tcl_ObjSetVar2(interp, objv[2], NULL, linePtr,
-		TCL_LEAVE_ERR_MSG) == NULL) {
-	    Tcl_DecrRefCount(linePtr);
-            return TCL_ERROR;
-        }
-	Tcl_SetIntObj(resultPtr, lineLen);
-        return TCL_OK;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ReadObjCmd --
- *
- *	This procedure is invoked to process the Tcl "read" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May consume input from channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ReadObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;		/* The channel to read from. */
-    int newline, i;		/* Discard newline at end? */
-    int toRead;			/* How many bytes to read? */
-    int charactersRead;		/* How many characters were read? */
-    int mode;			/* Mode in which channel is opened. */
-    char *name;
-    Tcl_Obj *resultPtr;
-
-    if ((objc != 2) && (objc != 3)) {
-	argerror:
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId ?numBytes?");
-	Tcl_AppendResult(interp, " or \"", Tcl_GetString(objv[0]),
-		" ?-nonewline? channelId\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    i = 1;
-    newline = 0;
-    if (strcmp(Tcl_GetString(objv[1]), "-nonewline") == 0) {
-	newline = 1;
-	i++;
-    }
-
-    if (i == objc) {
-        goto argerror;
-    }
-
-    name = Tcl_GetString(objv[i]);
-    chan = Tcl_GetChannel(interp, name, &mode);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if ((mode & TCL_READABLE) == 0) {
-	Tcl_AppendResult(interp, "channel \"", name, 
-                "\" wasn't opened for reading", (char *) NULL);
-        return TCL_ERROR;
-    }
-    i++;	/* Consumed channel name. */
-
-    /*
-     * Compute how many bytes to read, and see whether the final
-     * newline should be dropped.
-     */
-
-    toRead = -1;
-    if (i < objc) {
-	char *arg;
-	
-	arg = Tcl_GetString(objv[i]);
-	if (isdigit(UCHAR(arg[0]))) { /* INTL: digit */
-	    if (Tcl_GetIntFromObj(interp, objv[i], &toRead) != TCL_OK) {
-                return TCL_ERROR;
-	    }
-	} else if (strcmp(arg, "nonewline") == 0) {
-	    newline = 1;
-	} else {
-	    Tcl_AppendResult(interp, "bad argument \"", arg,
-		    "\": should be \"nonewline\"", (char *) NULL);
-	    return TCL_ERROR;
-        }
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    charactersRead = Tcl_ReadChars(chan, resultPtr, toRead, 0);
-    if (charactersRead < 0) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, "error reading \"", name, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-    
-    /*
-     * If requested, remove the last newline in the channel if at EOF.
-     */
-    
-    if ((charactersRead > 0) && (newline != 0)) {
-	char *result;
-	int length;
-
-	result = Tcl_GetStringFromObj(resultPtr, &length);
-	if (result[length - 1] == '\n') {
-	    Tcl_SetObjLength(resultPtr, length - 1);
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SeekObjCmd --
- *
- *	This procedure is invoked to process the Tcl "seek" command. See
- *	the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Moves the position of the access point on the specified channel.
- *	May flush queued output.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SeekObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to tell on. */
-    int offset, mode;			/* Where to seek? */
-    int result;				/* Of calling Tcl_Seek. */
-    char *chanName;
-    int optionIndex;
-    static char *originOptions[] = {"start", "current", "end", (char *) NULL};
-    static int modeArray[] = {SEEK_SET, SEEK_CUR, SEEK_END};
-
-    if ((objc != 3) && (objc != 4)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId offset ?origin?");
-	return TCL_ERROR;
-    }
-    chanName = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, chanName, NULL);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[2], &offset) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    mode = SEEK_SET;
-    if (objc == 4) {
-	if (Tcl_GetIndexFromObj(interp, objv[3], originOptions, "origin", 0,
-		&optionIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	mode = modeArray[optionIndex];
-    }
-
-    result = Tcl_Seek(chan, offset, mode);
-    if (result == -1) {
-        Tcl_AppendResult(interp, "error during seek on \"", 
-		chanName, "\": ", Tcl_PosixError(interp), (char *) NULL);
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_TellObjCmd --
- *
- *	This procedure is invoked to process the Tcl "tell" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_TellObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to tell on. */
-    char *chanName;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
-	return TCL_ERROR;
-    }
-    /*
-     * Try to find a channel with the right name and permissions in
-     * the IO channel table of this interpreter.
-     */
-    
-    chanName = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, chanName, NULL);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), Tcl_Tell(chan));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CloseObjCmd --
- *
- *	This procedure is invoked to process the Tcl "close" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May discard queued input; may flush queued output.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_CloseObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;			/* The channel to close. */
-    char *arg;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
-	return TCL_ERROR;
-    }
-
-    arg = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, arg, NULL);
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-
-    if (Tcl_UnregisterChannel(interp, chan) != TCL_OK) {
-        /*
-         * If there is an error message and it ends with a newline, remove
-         * the newline. This is done for command pipeline channels where the
-         * error output from the subprocesses is stored in interp's result.
-         *
-         * NOTE: This is likely to not have any effect on regular error
-         * messages produced by drivers during the closing of a channel,
-         * because the Tcl convention is that such error messages do not
-         * have a terminating newline.
-         */
-
-	Tcl_Obj *resultPtr;
-	char *string;
-	int len;
-	
-	resultPtr = Tcl_GetObjResult(interp);
-	string = Tcl_GetStringFromObj(resultPtr, &len);
-        if ((len > 0) && (string[len - 1] == '\n')) {
-	    Tcl_SetObjLength(resultPtr, len - 1);
-        }
-        return TCL_ERROR;
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FconfigureObjCmd --
- *
- *	This procedure is invoked to process the Tcl "fconfigure" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May modify the behavior of an IO channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FconfigureObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    char *chanName, *optionName, *valueName;
-    Tcl_Channel chan;			/* The channel to set a mode on. */
-    int i;				/* Iterate over arg-value pairs. */
-    Tcl_DString ds;			/* DString to hold result of
-                                         * calling Tcl_GetChannelOption. */
-
-    if ((objc < 2) || (((objc % 2) == 1) && (objc != 3))) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"channelId ?optionName? ?value? ?optionName value?...");
-        return TCL_ERROR;
-    }
-    chanName = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, chanName, NULL);
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_ERROR;
-    }
-    if (objc == 2) {
-        Tcl_DStringInit(&ds);
-        if (Tcl_GetChannelOption(interp, chan, (char *) NULL, &ds) != TCL_OK) {
-	    Tcl_DStringFree(&ds);
-	    return TCL_ERROR;
-        }
-        Tcl_DStringResult(interp, &ds);
-        return TCL_OK;
-    }
-    if (objc == 3) {
-        Tcl_DStringInit(&ds);
-	optionName = Tcl_GetString(objv[2]);
-        if (Tcl_GetChannelOption(interp, chan, optionName, &ds) != TCL_OK) {
-            Tcl_DStringFree(&ds);
-            return TCL_ERROR;
-        }
-        Tcl_DStringResult(interp, &ds);
-        return TCL_OK;
-    }
-    for (i = 3; i < objc; i += 2) {
-	optionName = Tcl_GetString(objv[i-1]);
-	valueName = Tcl_GetString(objv[i]);
-        if (Tcl_SetChannelOption(interp, chan, optionName, valueName)
-		!= TCL_OK) {
-            return TCL_ERROR;
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_EofObjCmd --
- *
- *	This procedure is invoked to process the Tcl "eof" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Sets interp's result to boolean true or false depending on whether
- *	the specified channel has an EOF condition.
- *
- *---------------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_EofObjCmd(unused, interp, objc, objv)
-    ClientData unused;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;
-    int dummy;
-    char *arg;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
-        return TCL_ERROR;
-    }
-
-    arg = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, arg, &dummy);
-    if (chan == NULL) {
-	return TCL_ERROR;
-    }
-
-    Tcl_SetBooleanObj(Tcl_GetObjResult(interp), Tcl_Eof(chan));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ExecObjCmd --
- *
- *	This procedure is invoked to process the "exec" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ExecObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-#ifdef MAC_TCL
-
-    Tcl_AppendResult(interp, "exec not implemented under Mac OS",
-		(char *)NULL);
-    return TCL_ERROR;
-
-#else /* !MAC_TCL */
-
-    /*
-     * This procedure generates an argv array for the string arguments. It
-     * starts out with stack-allocated space but uses dynamically-allocated
-     * storage if needed.
-     */
-
-#define NUM_ARGS 20
-    Tcl_Obj *resultPtr;
-    char **argv;
-    char *string;
-    Tcl_Channel chan;
-    char *argStorage[NUM_ARGS];
-    int argc, background, i, index, keepNewline, result, skip, length;
-    static char *options[] = {
-	"-keepnewline",	"--",		NULL
-    };
-    enum options {
-	EXEC_KEEPNEWLINE, EXEC_LAST
-    };
-
-    /*
-     * Check for a leading "-keepnewline" argument.
-     */
-
-    keepNewline = 0;
-    for (skip = 1; skip < objc; skip++) {
-	string = Tcl_GetString(objv[skip]);
-	if (string[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[skip], options, "switch",
-		TCL_EXACT, &index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (index == EXEC_KEEPNEWLINE) {
-	    keepNewline = 1;
-	} else {
-	    skip++;
-	    break;
-	}
-    }
-    if (objc <= skip) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?switches? arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * See if the command is to be run in background.
-     */
-
-    background = 0;
-    string = Tcl_GetString(objv[objc - 1]);
-    if ((string[0] == '&') && (string[1] == '\0')) {
-	objc--;
-        background = 1;
-    }
-
-    /*
-     * Create the string argument array "argv". Make sure argv is large
-     * enough to hold the argc arguments plus 1 extra for the zero
-     * end-of-argv word.
-     */
-
-    argv = argStorage;
-    argc = objc - skip;
-    if ((argc + 1) > sizeof(argv) / sizeof(argv[0])) {
-	argv = (char **) ckalloc((unsigned)(argc + 1) * sizeof(char *));
-    }
-
-    /*
-     * Copy the string conversions of each (post option) object into the
-     * argument vector.
-     */
-
-    for (i = 0; i < argc; i++) {
-	argv[i] = Tcl_GetString(objv[i + skip]);
-    }
-    argv[argc] = NULL;
-    chan = Tcl_OpenCommandChannel(interp, argc, argv,
-            (background ? 0 : TCL_STDOUT | TCL_STDERR));
-
-    /*
-     * Free the argv array if malloc'ed storage was used.
-     */
-
-    if (argv != argStorage) {
-	ckfree((char *)argv);
-    }
-
-    if (chan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-
-    if (background) {
-        /*
-	 * Store the list of PIDs from the pipeline in interp's result and
-	 * detach the PIDs (instead of waiting for them).
-	 */
-
-        TclGetAndDetachPids(interp, chan);
-        if (Tcl_Close(interp, chan) != TCL_OK) {
-	    return TCL_ERROR;
-        }
-	return TCL_OK;
-    }
-
-    resultPtr = Tcl_NewObj();
-    if (Tcl_GetChannelHandle(chan, TCL_READABLE, NULL) == TCL_OK) {
-	if (Tcl_ReadChars(chan, resultPtr, -1, 0) < 0) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, "error reading output from command: ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	    Tcl_DecrRefCount(resultPtr);
-	    return TCL_ERROR;
-	}
-    }
-    /*
-     * If the process produced anything on stderr, it will have been
-     * returned in the interpreter result.  It needs to be appended to
-     * the result string.
-     */
-
-    result = Tcl_Close(interp, chan);
-    string = Tcl_GetStringFromObj(Tcl_GetObjResult(interp), &length);
-    Tcl_AppendToObj(resultPtr, string, length);
-
-    /*
-     * If the last character of the result is a newline, then remove
-     * the newline character.
-     */
-    
-    if (keepNewline == 0) {
-	string = Tcl_GetStringFromObj(resultPtr, &length);
-	if ((length > 0) && (string[length - 1] == '\n')) {
-	    Tcl_SetObjLength(resultPtr, length - 1);
-	}
-    }
-    Tcl_SetObjResult(interp, resultPtr);
-
-    return result;
-#endif /* !MAC_TCL */
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_FblockedObjCmd --
- *
- *	This procedure is invoked to process the Tcl "fblocked" command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Sets interp's result to boolean true or false depending on whether
- *	the preceeding input operation on the channel would have blocked.
- *
- *---------------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_FblockedObjCmd(unused, interp, objc, objv)
-    ClientData unused;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel chan;
-    int mode;
-    char *arg;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "channelId");
-        return TCL_ERROR;
-    }
-
-    arg = Tcl_GetString(objv[1]);
-    chan = Tcl_GetChannel(interp, arg, &mode);
-    if (chan == NULL) {
-        return TCL_ERROR;
-    }
-    if ((mode & TCL_READABLE) == 0) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
-		arg, "\" wasn't opened for reading", (char *) NULL);
-        return TCL_ERROR;
-    }
-        
-    Tcl_SetBooleanObj(Tcl_GetObjResult(interp), Tcl_InputBlocked(chan));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenObjCmd --
- *
- *	This procedure is invoked to process the "open" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_OpenObjCmd(notUsed, interp, objc, objv)
-    ClientData notUsed;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int pipeline, prot;
-    char *modeString, *what;
-    Tcl_Channel chan;
-
-    if ((objc < 2) || (objc > 4)) {
-	Tcl_WrongNumArgs(interp, 1, objv, "fileName ?access? ?permissions?");
-	return TCL_ERROR;
-    }
-    prot = 0666;
-    if (objc == 2) {
-	modeString = "r";
-    } else {
-	modeString = Tcl_GetString(objv[2]);
-	if (objc == 4) {
-	    if (Tcl_GetIntFromObj(interp, objv[3], &prot) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	}
-    }
-
-    pipeline = 0;
-    what = Tcl_GetString(objv[1]);
-    if (what[0] == '|') {
-	pipeline = 1;
-    }
-
-    /*
-     * Open the file or create a process pipeline.
-     */
-
-    if (!pipeline) {
-        chan = Tcl_OpenFileChannel(interp, what, modeString, prot);
-    } else {
-#ifdef MAC_TCL
-	Tcl_AppendResult(interp,
-		"command pipelines not supported on Macintosh OS",
-		(char *)NULL);
-	return TCL_ERROR;
-#else
-	int mode, seekFlag, cmdObjc;
-	char **cmdArgv;
-
-        if (Tcl_SplitList(interp, what+1, &cmdObjc, &cmdArgv) != TCL_OK) {
-            return TCL_ERROR;
-        }
-
-        mode = TclGetOpenMode(interp, modeString, &seekFlag);
-        if (mode == -1) {
-	    chan = NULL;
-        } else {
-	    int flags = TCL_STDERR | TCL_ENFORCE_MODE;
-	    switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
-		case O_RDONLY:
-		    flags |= TCL_STDOUT;
-		    break;
-		case O_WRONLY:
-		    flags |= TCL_STDIN;
-		    break;
-		case O_RDWR:
-		    flags |= (TCL_STDIN | TCL_STDOUT);
-		    break;
-		default:
-		    panic("Tcl_OpenCmd: invalid mode value");
-		    break;
-	    }
-	    chan = Tcl_OpenCommandChannel(interp, cmdObjc, cmdArgv, flags);
-	}
-        ckfree((char *) cmdArgv);
-#endif
-    }
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_ERROR;
-    }
-    Tcl_RegisterChannel(interp, chan);
-    Tcl_AppendResult(interp, Tcl_GetChannelName(chan), (char *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpAcceptCallbacksDeleteProc --
- *
- *	Assocdata cleanup routine called when an interpreter is being
- *	deleted to set the interp field of all the accept callback records
- *	registered with	the interpreter to NULL. This will prevent the
- *	interpreter from being used in the future to eval accept scripts.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deallocates memory and sets the interp field of all the accept
- *	callback records to NULL to prevent this interpreter from being
- *	used subsequently to eval accept scripts.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static void
-TcpAcceptCallbacksDeleteProc(clientData, interp)
-    ClientData clientData;	/* Data which was passed when the assocdata
-                                 * was registered. */
-    Tcl_Interp *interp;		/* Interpreter being deleted - not used. */
-{
-    Tcl_HashTable *hTblPtr;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch hSearch;
-    AcceptCallback *acceptCallbackPtr;
-
-    hTblPtr = (Tcl_HashTable *) clientData;
-    for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-             hPtr != (Tcl_HashEntry *) NULL;
-             hPtr = Tcl_NextHashEntry(&hSearch)) {
-        acceptCallbackPtr = (AcceptCallback *) Tcl_GetHashValue(hPtr);
-        acceptCallbackPtr->interp = (Tcl_Interp *) NULL;
-    }
-    Tcl_DeleteHashTable(hTblPtr);
-    ckfree((char *) hTblPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RegisterTcpServerInterpCleanup --
- *
- *	Registers an accept callback record to have its interp
- *	field set to NULL when the interpreter is deleted.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	When, in the future, the interpreter is deleted, the interp
- *	field of the accept callback data structure will be set to
- *	NULL. This will prevent attempts to eval the accept script
- *	in a deleted interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RegisterTcpServerInterpCleanup(interp, acceptCallbackPtr)
-    Tcl_Interp *interp;		/* Interpreter for which we want to be
-                                 * informed of deletion. */
-    AcceptCallback *acceptCallbackPtr;
-    				/* The accept callback record whose
-                                 * interp field we want set to NULL when
-                                 * the interpreter is deleted. */
-{
-    Tcl_HashTable *hTblPtr;	/* Hash table for accept callback
-                                 * records to smash when the interpreter
-                                 * will be deleted. */
-    Tcl_HashEntry *hPtr;	/* Entry for this record. */
-    int new;			/* Is the entry new? */
-
-    hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp,
-            "tclTCPAcceptCallbacks",
-            NULL);
-    if (hTblPtr == (Tcl_HashTable *) NULL) {
-        hTblPtr = (Tcl_HashTable *) ckalloc((unsigned) sizeof(Tcl_HashTable));
-        Tcl_InitHashTable(hTblPtr, TCL_ONE_WORD_KEYS);
-        (void) Tcl_SetAssocData(interp, "tclTCPAcceptCallbacks",
-                TcpAcceptCallbacksDeleteProc, (ClientData) hTblPtr);
-    }
-    hPtr = Tcl_CreateHashEntry(hTblPtr, (char *) acceptCallbackPtr, &new);
-    if (!new) {
-        panic("RegisterTcpServerCleanup: damaged accept record table");
-    }
-    Tcl_SetHashValue(hPtr, (ClientData) acceptCallbackPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UnregisterTcpServerInterpCleanupProc --
- *
- *	Unregister a previously registered accept callback record. The
- *	interp field of this record will no longer be set to NULL in
- *	the future when the interpreter is deleted.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Prevents the interp field of the accept callback record from
- *	being set to NULL in the future when the interpreter is deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UnregisterTcpServerInterpCleanupProc(interp, acceptCallbackPtr)
-    Tcl_Interp *interp;		/* Interpreter in which the accept callback
-                                 * record was registered. */
-    AcceptCallback *acceptCallbackPtr;
-    				/* The record for which to delete the
-                                 * registration. */
-{
-    Tcl_HashTable *hTblPtr;
-    Tcl_HashEntry *hPtr;
-
-    hTblPtr = (Tcl_HashTable *) Tcl_GetAssocData(interp,
-            "tclTCPAcceptCallbacks", NULL);
-    if (hTblPtr == (Tcl_HashTable *) NULL) {
-        return;
-    }
-    hPtr = Tcl_FindHashEntry(hTblPtr, (char *) acceptCallbackPtr);
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        return;
-    }
-    Tcl_DeleteHashEntry(hPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AcceptCallbackProc --
- *
- *	This callback is invoked by the TCP channel driver when it
- *	accepts a new connection from a client on a server socket.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Whatever the script does.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AcceptCallbackProc(callbackData, chan, address, port)
-    ClientData callbackData;		/* The data stored when the callback
-                                         * was created in the call to
-                                         * Tcl_OpenTcpServer. */
-    Tcl_Channel chan;			/* Channel for the newly accepted
-                                         * connection. */
-    char *address;			/* Address of client that was
-                                         * accepted. */
-    int port;				/* Port of client that was accepted. */
-{
-    AcceptCallback *acceptCallbackPtr;
-    Tcl_Interp *interp;
-    char *script;
-    char portBuf[TCL_INTEGER_SPACE];
-    int result;
-
-    acceptCallbackPtr = (AcceptCallback *) callbackData;
-
-    /*
-     * Check if the callback is still valid; the interpreter may have gone
-     * away, this is signalled by setting the interp field of the callback
-     * data to NULL.
-     */
-    
-    if (acceptCallbackPtr->interp != (Tcl_Interp *) NULL) {
-
-        script = acceptCallbackPtr->script;
-        interp = acceptCallbackPtr->interp;
-        
-        Tcl_Preserve((ClientData) script);
-        Tcl_Preserve((ClientData) interp);
-
-	TclFormatInt(portBuf, port);
-        Tcl_RegisterChannel(interp, chan);
-
-        /*
-         * Artificially bump the refcount to protect the channel from
-         * being deleted while the script is being evaluated.
-         */
-
-        Tcl_RegisterChannel((Tcl_Interp *) NULL,  chan);
-        
-        result = Tcl_VarEval(interp, script, " ", Tcl_GetChannelName(chan),
-                " ", address, " ", portBuf, (char *) NULL);
-        if (result != TCL_OK) {
-            Tcl_BackgroundError(interp);
-	    Tcl_UnregisterChannel(interp, chan);
-        }
-
-        /*
-         * Decrement the artificially bumped refcount. After this it is
-         * not safe anymore to use "chan", because it may now be deleted.
-         */
-
-        Tcl_UnregisterChannel((Tcl_Interp *) NULL, chan);
-        
-        Tcl_Release((ClientData) interp);
-        Tcl_Release((ClientData) script);
-    } else {
-
-        /*
-         * The interpreter has been deleted, so there is no useful
-         * way to utilize the client socket - just close it.
-         */
-
-        Tcl_Close((Tcl_Interp *) NULL, chan);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpServerCloseProc --
- *
- *	This callback is called when the TCP server channel for which it
- *	was registered is being closed. It informs the interpreter in
- *	which the accept script is evaluated (if that interpreter still
- *	exists) that this channel no longer needs to be informed if the
- *	interpreter is deleted.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	In the future, if the interpreter is deleted this channel will
- *	no longer be informed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpServerCloseProc(callbackData)
-    ClientData callbackData;	/* The data passed in the call to
-                                 * Tcl_CreateCloseHandler. */
-{
-    AcceptCallback *acceptCallbackPtr;
-    				/* The actual data. */
-
-    acceptCallbackPtr = (AcceptCallback *) callbackData;
-    if (acceptCallbackPtr->interp != (Tcl_Interp *) NULL) {
-        UnregisterTcpServerInterpCleanupProc(acceptCallbackPtr->interp,
-                acceptCallbackPtr);
-    }
-    Tcl_EventuallyFree((ClientData) acceptCallbackPtr->script, TCL_DYNAMIC);
-    ckfree((char *) acceptCallbackPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SocketObjCmd --
- *
- *	This procedure is invoked to process the "socket" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates a socket based channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_SocketObjCmd(notUsed, interp, objc, objv)
-    ClientData notUsed;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    static char *socketOptions[] = {
-	"-async", "-myaddr", "-myport","-server", (char *) NULL
-    };
-    enum socketOptions {
-	SKT_ASYNC,      SKT_MYADDR,      SKT_MYPORT,      SKT_SERVER  
-    };
-    int optionIndex, a, server, port;
-    char *arg, *copyScript, *host, *script;
-    char *myaddr = NULL;
-    int myport = 0;
-    int async = 0;
-    Tcl_Channel chan;
-    AcceptCallback *acceptCallbackPtr;
-    
-    server = 0;
-    script = NULL;
-
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    for (a = 1; a < objc; a++) {
-	arg = Tcl_GetString(objv[a]);
-	if (arg[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[a], socketOptions,
-		"option", TCL_EXACT, &optionIndex) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch ((enum socketOptions) optionIndex) {
-	    case SKT_ASYNC: {
-                if (server == 1) {
-                    Tcl_AppendResult(interp,
-                            "cannot set -async option for server sockets",
-                            (char *) NULL);
-                    return TCL_ERROR;
-                }
-                async = 1;		
-		break;
-	    }
-	    case SKT_MYADDR: {
-		a++;
-                if (a >= objc) {
-		    Tcl_AppendResult(interp,
-			    "no argument given for -myaddr option",
-                            (char *) NULL);
-		    return TCL_ERROR;
-		}
-                myaddr = Tcl_GetString(objv[a]);
-		break;
-	    }
-	    case SKT_MYPORT: {
-		char *myPortName;
-		a++;
-                if (a >= objc) {
-		    Tcl_AppendResult(interp,
-			    "no argument given for -myport option",
-                            (char *) NULL);
-		    return TCL_ERROR;
-		}
-		myPortName = Tcl_GetString(objv[a]);
-		if (TclSockGetPort(interp, myPortName, "tcp", &myport)
-			!= TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
-	    }
-	    case SKT_SERVER: {
-                if (async == 1) {
-                    Tcl_AppendResult(interp,
-                            "cannot set -async option for server sockets",
-                            (char *) NULL);
-                    return TCL_ERROR;
-                }
-		server = 1;
-		a++;
-		if (a >= objc) {
-		    Tcl_AppendResult(interp,
-			    "no argument given for -server option",
-                            (char *) NULL);
-		    return TCL_ERROR;
-		}
-                script = Tcl_GetString(objv[a]);
-		break;
-	    }
-	    default: {
-		panic("Tcl_SocketObjCmd: bad option index to SocketOptions");
-	    }
-	}
-    }
-    if (server) {
-        host = myaddr;		/* NULL implies INADDR_ANY */
-	if (myport != 0) {
-	    Tcl_AppendResult(interp, "Option -myport is not valid for servers",
-		    NULL);
-	    return TCL_ERROR;
-	}
-    } else if (a < objc) {
-	host = Tcl_GetString(objv[a]);
-	a++;
-    } else {
-wrongNumArgs:
-	Tcl_AppendResult(interp, "wrong # args: should be either:\n",
-		Tcl_GetString(objv[0]),
-                " ?-myaddr addr? ?-myport myport? ?-async? host port\n",
-		Tcl_GetString(objv[0]),
-                " -server command ?-myaddr addr? port",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    if (a == objc-1) {
-	if (TclSockGetPort(interp, Tcl_GetString(objv[a]),
-		"tcp", &port) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else {
-	goto wrongNumArgs;
-    }
-
-    if (server) {
-        acceptCallbackPtr = (AcceptCallback *) ckalloc((unsigned)
-                sizeof(AcceptCallback));
-        copyScript = ckalloc((unsigned) strlen(script) + 1);
-        strcpy(copyScript, script);
-        acceptCallbackPtr->script = copyScript;
-        acceptCallbackPtr->interp = interp;
-        chan = Tcl_OpenTcpServer(interp, port, host, AcceptCallbackProc,
-                (ClientData) acceptCallbackPtr);
-        if (chan == (Tcl_Channel) NULL) {
-            ckfree(copyScript);
-            ckfree((char *) acceptCallbackPtr);
-            return TCL_ERROR;
-        }
-
-        /*
-         * Register with the interpreter to let us know when the
-         * interpreter is deleted (by having the callback set the
-         * acceptCallbackPtr->interp field to NULL). This is to
-         * avoid trying to eval the script in a deleted interpreter.
-         */
-
-        RegisterTcpServerInterpCleanup(interp, acceptCallbackPtr);
-        
-        /*
-         * Register a close callback. This callback will inform the
-         * interpreter (if it still exists) that this channel does not
-         * need to be informed when the interpreter is deleted.
-         */
-        
-        Tcl_CreateCloseHandler(chan, TcpServerCloseProc,
-                (ClientData) acceptCallbackPtr);
-    } else {
-        chan = Tcl_OpenTcpClient(interp, port, host, myaddr, myport, async);
-        if (chan == (Tcl_Channel) NULL) {
-            return TCL_ERROR;
-        }
-    }
-    Tcl_RegisterChannel(interp, chan);            
-    Tcl_AppendResult(interp, Tcl_GetChannelName(chan), (char *) NULL);
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FcopyObjCmd --
- *
- *	This procedure is invoked to process the "fcopy" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Moves data between two channels and possibly sets up a
- *	background copy handler.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_FcopyObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Channel inChan, outChan;
-    char *arg;
-    int mode, i;
-    int toRead, index;
-    Tcl_Obj *cmdPtr;
-    static char* switches[] = { "-size", "-command", NULL };
-    enum { FcopySize, FcopyCommand };
-
-    if ((objc < 3) || (objc > 7) || (objc == 4) || (objc == 6)) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"input output ?-size size? ?-command callback?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Parse the channel arguments and verify that they are readable
-     * or writable, as appropriate.
-     */
-
-    arg = Tcl_GetString(objv[1]);
-    inChan = Tcl_GetChannel(interp, arg, &mode);
-    if (inChan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if ((mode & TCL_READABLE) == 0) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
-		Tcl_GetString(objv[1]), 
-                "\" wasn't opened for reading", (char *) NULL);
-        return TCL_ERROR;
-    }
-    arg = Tcl_GetString(objv[2]);
-    outChan = Tcl_GetChannel(interp, arg, &mode);
-    if (outChan == (Tcl_Channel) NULL) {
-	return TCL_ERROR;
-    }
-    if ((mode & TCL_WRITABLE) == 0) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "channel \"",
-		Tcl_GetString(objv[1]), 
-                "\" wasn't opened for writing", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    toRead = -1;
-    cmdPtr = NULL;
-    for (i = 3; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], switches, "switch", 0,
-		(int *) &index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch (index) {
-	    case FcopySize:
-		if (Tcl_GetIntFromObj(interp, objv[i+1], &toRead) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		break;
-	    case FcopyCommand:
-		cmdPtr = objv[i+1];
-		break;
-	}
-    }
-
-    return TclCopyChannel(interp, inChan, outChan, toRead, cmdPtr);
-}
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
deleted file mode 100644
index 3fb9e8d..0000000
--- a/generic/tclIOSock.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* 
- * tclIOSock.c --
- *
- *	Common routines used by all socket based channel types.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIOSock.c,v 1.3 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclSockGetPort --
- *
- *	Maps from a string, which could be a service name, to a port.
- *	Used by socket creation code to get port numbers and resolve
- *	registered service names to port numbers.
- *
- * Results:
- *	A standard Tcl result.  On success, the port number is returned
- *	in portPtr. On failure, an error message is left in the interp's
- *	result.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclSockGetPort(interp, string, proto, portPtr)
-    Tcl_Interp *interp;
-    char *string;		/* Integer or service name */
-    char *proto;		/* "tcp" or "udp", typically */
-    int *portPtr;		/* Return port number */
-{
-    struct servent *sp;		/* Protocol info for named services */
-    Tcl_DString ds;
-    char *native;
-
-    if (Tcl_GetInt(NULL, string, portPtr) != TCL_OK) {
-	/*
-	 * Don't bother translating 'proto' to native.
-	 */
-	 
-	native = Tcl_UtfToExternalDString(NULL, string, -1, &ds);
-	sp = getservbyname(native, proto);		/* INTL: Native. */
-	Tcl_DStringFree(&ds);
-	if (sp != NULL) {
-	    *portPtr = ntohs((unsigned short) sp->s_port);
-	    return TCL_OK;
-	}
-    }
-    if (Tcl_GetInt(interp, string, portPtr) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (*portPtr > 0xFFFF) {
-        Tcl_AppendResult(interp, "couldn't open socket: port number too high",
-                (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSockMinimumBuffers --
- *
- *	Ensure minimum buffer sizes (non zero).
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Sets SO_SNDBUF and SO_RCVBUF sizes.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclSockMinimumBuffers(sock, size)
-    int sock;			/* Socket file descriptor */
-    int size;			/* Minimum buffer size */
-{
-    int current;
-    int len;
-    
-    len = sizeof(int);
-    getsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&current, &len);
-    if (current < size) {
-	len = sizeof(int);
-	setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char *)&size, len);
-    }
-    len = sizeof(int);
-    getsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char *)&current, &len);
-    if (current < size) {
-	len = sizeof(int);
-	setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char *)&size, len);
-    }
-    return TCL_OK;
-}
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
deleted file mode 100644
index 6a00e54..0000000
--- a/generic/tclIOUtil.c
+++ /dev/null
@@ -1,876 +0,0 @@
-/* 
- * tclIOUtil.c --
- *
- *	This file contains a collection of utility procedures that
- *	are shared by the platform specific IO drivers.
- *
- *	Parts of this file are based on code contributed by Karl
- *	Lehenbauer, Mark Diekhans and Peter da Silva.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIOUtil.c,v 1.6 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The following typedef declarations allow for hooking into the chain
- * of functions maintained for 'Tcl_Stat(...)', 'Tcl_Access(...)' &
- * 'Tcl_OpenFileChannel(...)'.  Basically for each hookable function
- * a linked list is defined.
- */
-
-typedef struct StatProc {
-    TclStatProc_ *proc;		 /* Function to process a 'stat()' call */
-    struct StatProc *nextPtr;    /* The next 'stat()' function to call */
-} StatProc;
-
-typedef struct AccessProc {
-    TclAccessProc_ *proc;	 /* Function to process a 'access()' call */
-    struct AccessProc *nextPtr;  /* The next 'access()' function to call */
-} AccessProc;
-
-typedef struct OpenFileChannelProc {
-    TclOpenFileChannelProc_ *proc;  /* Function to process a
-				     * 'Tcl_OpenFileChannel()' call */
-    struct OpenFileChannelProc *nextPtr;
-				    /* The next 'Tcl_OpenFileChannel()'
-				     * function to call */
-} OpenFileChannelProc;
-
-/*
- * For each type of hookable function, a static node is declared to
- * hold the function pointer for the "built-in" routine (e.g.
- * 'TclpStat(...)') and the respective list is initialized as a pointer
- * to that node.
- * 
- * The "delete" functions (e.g. 'TclStatDeleteProc(...)') ensure that
- * these statically declared list entry cannot be inadvertently removed.
- *
- * This method avoids the need to call any sort of "initialization"
- * function.
- *
- * All three lists are protected by a global hookMutex.
- */
-
-static StatProc defaultStatProc = {
-    &TclpStat, NULL
-};
-static StatProc *statProcList = &defaultStatProc;
-
-static AccessProc defaultAccessProc = {
-    &TclpAccess, NULL
-};
-static AccessProc *accessProcList = &defaultAccessProc;
-
-static OpenFileChannelProc defaultOpenFileChannelProc = {
-    &TclpOpenFileChannel, NULL
-};
-static OpenFileChannelProc *openFileChannelProcList =
-	&defaultOpenFileChannelProc;
-
-TCL_DECLARE_MUTEX(hookMutex)
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclGetOpenMode --
- *
- * Description:
- *	Computes a POSIX mode mask for opening a file, from a given string,
- *	and also sets a flag to indicate whether the caller should seek to
- *	EOF after opening the file.
- *
- * Results:
- *	On success, returns mode to pass to "open". If an error occurs, the
- *	return value is -1 and if interp is not NULL, sets interp's result
- *	object to an error message.
- *
- * Side effects:
- *	Sets the integer referenced by seekFlagPtr to 1 to tell the caller
- *	to seek to EOF after opening the file.
- *
- * Special note:
- *	This code is based on a prototype implementation contributed
- *	by Mark Diekhans.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclGetOpenMode(interp, string, seekFlagPtr)
-    Tcl_Interp *interp;			/* Interpreter to use for error
-					 * reporting - may be NULL. */
-    char *string;			/* Mode string, e.g. "r+" or
-					 * "RDONLY CREAT". */
-    int *seekFlagPtr;			/* Set this to 1 if the caller
-                                         * should seek to EOF during the
-                                         * opening of the file. */
-{
-    int mode, modeArgc, c, i, gotRW;
-    char **modeArgv, *flag;
-#define RW_MODES (O_RDONLY|O_WRONLY|O_RDWR)
-
-    /*
-     * Check for the simpler fopen-like access modes (e.g. "r").  They
-     * are distinguished from the POSIX access modes by the presence
-     * of a lower-case first letter.
-     */
-
-    *seekFlagPtr = 0;
-    mode = 0;
-
-    /*
-     * Guard against international characters before using byte oriented
-     * routines.
-     */
-
-    if (!(string[0] & 0x80)
-	    && islower(UCHAR(string[0]))) { /* INTL: ISO only. */
-	switch (string[0]) {
-	    case 'r':
-		mode = O_RDONLY;
-		break;
-	    case 'w':
-		mode = O_WRONLY|O_CREAT|O_TRUNC;
-		break;
-	    case 'a':
-		mode = O_WRONLY|O_CREAT;
-                *seekFlagPtr = 1;
-		break;
-	    default:
-		error:
-                if (interp != (Tcl_Interp *) NULL) {
-                    Tcl_AppendResult(interp,
-                            "illegal access mode \"", string, "\"",
-                            (char *) NULL);
-                }
-		return -1;
-	}
-	if (string[1] == '+') {
-	    mode &= ~(O_RDONLY|O_WRONLY);
-	    mode |= O_RDWR;
-	    if (string[2] != 0) {
-		goto error;
-	    }
-	} else if (string[1] != 0) {
-	    goto error;
-	}
-        return mode;
-    }
-
-    /*
-     * The access modes are specified using a list of POSIX modes
-     * such as O_CREAT.
-     *
-     * IMPORTANT NOTE: We rely on Tcl_SplitList working correctly when
-     * a NULL interpreter is passed in.
-     */
-
-    if (Tcl_SplitList(interp, string, &modeArgc, &modeArgv) != TCL_OK) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AddErrorInfo(interp,
-                    "\n    while processing open access modes \"");
-            Tcl_AddErrorInfo(interp, string);
-            Tcl_AddErrorInfo(interp, "\"");
-        }
-        return -1;
-    }
-    
-    gotRW = 0;
-    for (i = 0; i < modeArgc; i++) {
-	flag = modeArgv[i];
-	c = flag[0];
-	if ((c == 'R') && (strcmp(flag, "RDONLY") == 0)) {
-	    mode = (mode & ~RW_MODES) | O_RDONLY;
-	    gotRW = 1;
-	} else if ((c == 'W') && (strcmp(flag, "WRONLY") == 0)) {
-	    mode = (mode & ~RW_MODES) | O_WRONLY;
-	    gotRW = 1;
-	} else if ((c == 'R') && (strcmp(flag, "RDWR") == 0)) {
-	    mode = (mode & ~RW_MODES) | O_RDWR;
-	    gotRW = 1;
-	} else if ((c == 'A') && (strcmp(flag, "APPEND") == 0)) {
-	    mode |= O_APPEND;
-            *seekFlagPtr = 1;
-	} else if ((c == 'C') && (strcmp(flag, "CREAT") == 0)) {
-	    mode |= O_CREAT;
-	} else if ((c == 'E') && (strcmp(flag, "EXCL") == 0)) {
-	    mode |= O_EXCL;
-	} else if ((c == 'N') && (strcmp(flag, "NOCTTY") == 0)) {
-#ifdef O_NOCTTY
-	    mode |= O_NOCTTY;
-#else
-	    if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "access mode \"", flag,
-                        "\" not supported by this system", (char *) NULL);
-            }
-            ckfree((char *) modeArgv);
-	    return -1;
-#endif
-	} else if ((c == 'N') && (strcmp(flag, "NONBLOCK") == 0)) {
-#if defined(O_NDELAY) || defined(O_NONBLOCK)
-#   ifdef O_NONBLOCK
-	    mode |= O_NONBLOCK;
-#   else
-	    mode |= O_NDELAY;
-#   endif
-#else
-            if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "access mode \"", flag,
-                        "\" not supported by this system", (char *) NULL);
-            }
-            ckfree((char *) modeArgv);
-	    return -1;
-#endif
-	} else if ((c == 'T') && (strcmp(flag, "TRUNC") == 0)) {
-	    mode |= O_TRUNC;
-	} else {
-            if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "invalid access mode \"", flag,
-                        "\": must be RDONLY, WRONLY, RDWR, APPEND, CREAT",
-                        " EXCL, NOCTTY, NONBLOCK, or TRUNC", (char *) NULL);
-            }
-	    ckfree((char *) modeArgv);
-	    return -1;
-	}
-    }
-    ckfree((char *) modeArgv);
-    if (!gotRW) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "access mode must include either",
-                    " RDONLY, WRONLY, or RDWR", (char *) NULL);
-        }
-	return -1;
-    }
-    return mode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalFile --
- *
- *	Read in a file and process the entire file as one gigantic
- *	Tcl command.
- *
- * Results:
- *	A standard Tcl result, which is either the result of executing
- *	the file or an error indicating why the file couldn't be read.
- *
- * Side effects:
- *	Depends on the commands in the file.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EvalFile(interp, fileName)
-    Tcl_Interp *interp;		/* Interpreter in which to process file. */
-    char *fileName;		/* Name of file to process.  Tilde-substitution
-				 * will be performed on this name. */
-{
-    int result, length;
-    struct stat statBuf;
-    char *oldScriptFile;
-    Interp *iPtr;
-    Tcl_DString nameString;
-    char *name, *string;
-    Tcl_Channel chan;
-    Tcl_Obj *objPtr;
-
-    name = Tcl_TranslateFileName(interp, fileName, &nameString);
-    if (name == NULL) {
-	return TCL_ERROR;
-    }
-
-    result = TCL_ERROR;
-    objPtr = Tcl_NewObj();
-
-    if (TclStat(name, &statBuf) == -1) {
-        Tcl_SetErrno(errno);
-	Tcl_AppendResult(interp, "couldn't read file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-    chan = Tcl_OpenFileChannel(interp, name, "r", 0644);
-    if (chan == (Tcl_Channel) NULL) {
-        Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, "couldn't read file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-    if (Tcl_ReadChars(chan, objPtr, -1, 0) < 0) {
-        Tcl_Close(interp, chan);
-	Tcl_AppendResult(interp, "couldn't read file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-    if (Tcl_Close(interp, chan) != TCL_OK) {
-        goto end;
-    }
-
-    iPtr = (Interp *) interp;
-    oldScriptFile = iPtr->scriptFile;
-    iPtr->scriptFile = fileName;
-    string = Tcl_GetStringFromObj(objPtr, &length);
-    result = Tcl_EvalEx(interp, string, length, 0);
-    iPtr->scriptFile = oldScriptFile;
-
-    if (result == TCL_RETURN) {
-	result = TclUpdateReturnInfo(iPtr);
-    } else if (result == TCL_ERROR) {
-	char msg[200 + TCL_INTEGER_SPACE];
-
-	/*
-	 * Record information telling where the error occurred.
-	 */
-
-	sprintf(msg, "\n    (file \"%.150s\" line %d)", fileName,
-		interp->errorLine);
-	Tcl_AddErrorInfo(interp, msg);
-    }
-
-    end:
-    Tcl_DecrRefCount(objPtr);
-    Tcl_DStringFree(&nameString);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetErrno --
- *
- *	Gets the current value of the Tcl error code variable. This is
- *	currently the global variable "errno" but could in the future
- *	change to something else.
- *
- * Results:
- *	The value of the Tcl error code variable.
- *
- * Side effects:
- *	None. Note that the value of the Tcl error code variable is
- *	UNDEFINED if a call to Tcl_SetErrno did not precede this call.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetErrno()
-{
-    return errno;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetErrno --
- *
- *	Sets the Tcl error code variable to the supplied value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Modifies the value of the Tcl error code variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetErrno(err)
-    int err;			/* The new value. */
-{
-    errno = err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PosixError --
- *
- *	This procedure is typically called after UNIX kernel calls
- *	return errors.  It stores machine-readable information about
- *	the error in $errorCode returns an information string for
- *	the caller's use.
- *
- * Results:
- *	The return value is a human-readable string describing the
- *	error.
- *
- * Side effects:
- *	The global variable $errorCode is reset.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_PosixError(interp)
-    Tcl_Interp *interp;		/* Interpreter whose $errorCode variable
-				 * is to be changed. */
-{
-    char *id, *msg;
-
-    msg = Tcl_ErrnoMsg(errno);
-    id = Tcl_ErrnoId();
-    Tcl_SetErrorCode(interp, "POSIX", id, msg, (char *) NULL);
-    return msg;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclStat --
- *
- *	This procedure replaces the library version of stat and lsat.
- *	The chain of functions that have been "inserted" into the
- *	'statProcList' will be called in succession until either
- *	a value of zero is returned, or the entire list is visited.
- *
- * Results:
- *      See stat documentation.
- *
- * Side effects:
- *      See stat documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclStat(path, buf)
-    CONST char *path;		/* Path of file to stat (in current CP). */
-    TclStat_ *buf;		/* Filled with results of stat call. */
-{
-    StatProc *statProcPtr;
-    int retVal = -1;
-
-    /*
-     * Call each of the "stat" function in succession.  A non-return
-     * value of -1 indicates the particular function has succeeded.
-     */
-
-    Tcl_MutexLock(&hookMutex);
-    statProcPtr = statProcList;
-    while ((retVal == -1) && (statProcPtr != NULL)) {
-	retVal = (*statProcPtr->proc)(path, buf);
-	statProcPtr = statProcPtr->nextPtr;
-    }
-    Tcl_MutexUnlock(&hookMutex);
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclAccess --
- *
- *	This procedure replaces the library version of access.
- *	The chain of functions that have been "inserted" into the
- *	'accessProcList' will be called in succession until either
- *	a value of zero is returned, or the entire list is visited.
- *
- * Results:
- *      See access documentation.
- *
- * Side effects:
- *      See access documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclAccess(path, mode)
-    CONST char *path;		/* Path of file to access (in current CP). */
-    int mode;                   /* Permission setting. */
-{
-    AccessProc *accessProcPtr;
-    int retVal = -1;
-
-    /*
-     * Call each of the "access" function in succession.  A non-return
-     * value of -1 indicates the particular function has succeeded.
-     */
-
-    Tcl_MutexLock(&hookMutex);
-    accessProcPtr = accessProcList;
-    while ((retVal == -1) && (accessProcPtr != NULL)) {
-	retVal = (*accessProcPtr->proc)(path, mode);
-	accessProcPtr = accessProcPtr->nextPtr;
-    }
-    Tcl_MutexUnlock(&hookMutex);
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenFileChannel --
- *
- *	The chain of functions that have been "inserted" into the
- *	'openFileChannelProcList' will be called in succession until
- *	either a valid file channel is returned, or the entire list is
- *	visited.
- *
- * Results:
- *	The new channel or NULL, if the named file could not be opened.
- *
- * Side effects:
- *	May open the channel and may cause creation of a file on the
- *	file system.
- *
- *----------------------------------------------------------------------
- */
- 
-Tcl_Channel
-Tcl_OpenFileChannel(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;                 /* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;                     /* Name of file to open. */
-    char *modeString;                   /* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;                    /* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    OpenFileChannelProc *openFileChannelProcPtr;
-    Tcl_Channel retVal = NULL;
-
-    /*
-     * Call each of the "Tcl_OpenFileChannel" function in succession.
-     * A non-NULL return value indicates the particular function has
-     * succeeded.
-     */
-
-    Tcl_MutexLock(&hookMutex);
-    openFileChannelProcPtr = openFileChannelProcList;
-    while ((retVal == NULL) && (openFileChannelProcPtr != NULL)) {
-	retVal = (*openFileChannelProcPtr->proc)(interp, fileName,
-		modeString, permissions);
-	openFileChannelProcPtr = openFileChannelProcPtr->nextPtr;
-    }
-    Tcl_MutexUnlock(&hookMutex);
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclStatInsertProc --
- *
- *	Insert the passed procedure pointer at the head of the list of
- *	functions which are used during a call to 'TclStat(...)'. The
- *	passed function should be have exactly like 'TclStat' when called
- *	during that time (see 'TclStat(...)' for more informatin).
- *	The function will be added even if it already in the list.
- *
- * Results:
- *      Normally TCL_OK; TCL_ERROR if memory for a new node in the list
- *	could not be allocated.
- *
- * Side effects:
- *      Memory allocataed and modifies the link list for 'TclStat'
- *	functions.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclStatInsertProc (proc)
-    TclStatProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-
-    if (proc != NULL) {
-	StatProc *newStatProcPtr;
-
-	newStatProcPtr = (StatProc *)Tcl_Alloc(sizeof(StatProc));;
-
-	if (newStatProcPtr != NULL) {
-	    newStatProcPtr->proc = proc;
-	    Tcl_MutexLock(&hookMutex);
-	    newStatProcPtr->nextPtr = statProcList;
-	    statProcList = newStatProcPtr;
-	    Tcl_MutexUnlock(&hookMutex);
-
-	    retVal = TCL_OK;
-	}
-    }
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclStatDeleteProc --
- *
- *	Removed the passed function pointer from the list of 'TclStat'
- *	functions.  Ensures that the built-in stat function is not
- *	removvable.
- *
- * Results:
- *      TCL_OK if the procedure pointer was successfully removed,
- *	TCL_ERROR otherwise.
- *
- * Side effects:
- *      Memory is deallocated and the respective list updated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclStatDeleteProc (proc)
-    TclStatProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-    StatProc *tmpStatProcPtr;
-    StatProc *prevStatProcPtr = NULL;
-
-    Tcl_MutexLock(&hookMutex);
-    tmpStatProcPtr = statProcList;
-    /*
-     * Traverse the 'statProcList' looking for the particular node
-     * whose 'proc' member matches 'proc' and remove that one from
-     * the list.  Ensure that the "default" node cannot be removed.
-     */
-
-    while ((retVal == TCL_ERROR) && (tmpStatProcPtr != &defaultStatProc)) {
-	if (tmpStatProcPtr->proc == proc) {
-	    if (prevStatProcPtr == NULL) {
-		statProcList = tmpStatProcPtr->nextPtr;
-	    } else {
-		prevStatProcPtr->nextPtr = tmpStatProcPtr->nextPtr;
-	    }
-
-	    Tcl_Free((char *)tmpStatProcPtr);
-
-	    retVal = TCL_OK;
-	} else {
-	    prevStatProcPtr = tmpStatProcPtr;
-	    tmpStatProcPtr = tmpStatProcPtr->nextPtr;
-	}
-    }
-
-    Tcl_MutexUnlock(&hookMutex);
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclAccessInsertProc --
- *
- *	Insert the passed procedure pointer at the head of the list of
- *	functions which are used during a call to 'TclAccess(...)'. The
- *	passed function should be have exactly like 'TclAccess' when
- *	called during that time (see 'TclAccess(...)' for more informatin).
- *	The function will be added even if it already in the list.
- *
- * Results:
- *      Normally TCL_OK; TCL_ERROR if memory for a new node in the list
- *	could not be allocated.
- *
- * Side effects:
- *      Memory allocataed and modifies the link list for 'TclAccess'
- *	functions.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclAccessInsertProc(proc)
-    TclAccessProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-
-    if (proc != NULL) {
-	AccessProc *newAccessProcPtr;
-
-	newAccessProcPtr = (AccessProc *)Tcl_Alloc(sizeof(AccessProc));;
-
-	if (newAccessProcPtr != NULL) {
-	    newAccessProcPtr->proc = proc;
-	    Tcl_MutexLock(&hookMutex);
-	    newAccessProcPtr->nextPtr = accessProcList;
-	    accessProcList = newAccessProcPtr;
-	    Tcl_MutexUnlock(&hookMutex);
-
-	    retVal = TCL_OK;
-	}
-    }
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclAccessDeleteProc --
- *
- *	Removed the passed function pointer from the list of 'TclAccess'
- *	functions.  Ensures that the built-in access function is not
- *	removvable.
- *
- * Results:
- *      TCL_OK if the procedure pointer was successfully removed,
- *	TCL_ERROR otherwise.
- *
- * Side effects:
- *      Memory is deallocated and the respective list updated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclAccessDeleteProc(proc)
-    TclAccessProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-    AccessProc *tmpAccessProcPtr;
-    AccessProc *prevAccessProcPtr = NULL;
-
-    /*
-     * Traverse the 'accessProcList' looking for the particular node
-     * whose 'proc' member matches 'proc' and remove that one from
-     * the list.  Ensure that the "default" node cannot be removed.
-     */
-
-    Tcl_MutexLock(&hookMutex);
-    tmpAccessProcPtr = accessProcList;
-    while ((retVal == TCL_ERROR) && (tmpAccessProcPtr != &defaultAccessProc)) {
-	if (tmpAccessProcPtr->proc == proc) {
-	    if (prevAccessProcPtr == NULL) {
-		accessProcList = tmpAccessProcPtr->nextPtr;
-	    } else {
-		prevAccessProcPtr->nextPtr = tmpAccessProcPtr->nextPtr;
-	    }
-
-	    Tcl_Free((char *)tmpAccessProcPtr);
-
-	    retVal = TCL_OK;
-	} else {
-	    prevAccessProcPtr = tmpAccessProcPtr;
-	    tmpAccessProcPtr = tmpAccessProcPtr->nextPtr;
-	}
-    }
-    Tcl_MutexUnlock(&hookMutex);
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclOpenFileChannelInsertProc --
- *
- *	Insert the passed procedure pointer at the head of the list of
- *	functions which are used during a call to
- *	'Tcl_OpenFileChannel(...)'. The passed function should be have
- *	exactly like 'Tcl_OpenFileChannel' when called during that time
- *	(see 'Tcl_OpenFileChannel(...)' for more informatin). The
- *	function will be added even if it already in the list.
- *
- * Results:
- *      Normally TCL_OK; TCL_ERROR if memory for a new node in the list
- *	could not be allocated.
- *
- * Side effects:
- *      Memory allocataed and modifies the link list for
- *	'Tcl_OpenFileChannel' functions.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclOpenFileChannelInsertProc(proc)
-    TclOpenFileChannelProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-
-    if (proc != NULL) {
-	OpenFileChannelProc *newOpenFileChannelProcPtr;
-
-	newOpenFileChannelProcPtr =
-		(OpenFileChannelProc *)Tcl_Alloc(sizeof(OpenFileChannelProc));;
-
-	if (newOpenFileChannelProcPtr != NULL) {
-	    newOpenFileChannelProcPtr->proc = proc;
-	    Tcl_MutexLock(&hookMutex);
-	    newOpenFileChannelProcPtr->nextPtr = openFileChannelProcList;
-	    openFileChannelProcList = newOpenFileChannelProcPtr;
-	    Tcl_MutexUnlock(&hookMutex);
-
-	    retVal = TCL_OK;
-	}
-    }
-
-    return (retVal);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclOpenFileChannelDeleteProc --
- *
- *	Removed the passed function pointer from the list of
- *	'Tcl_OpenFileChannel' functions.  Ensures that the built-in
- *	open file channel function is not removvable.
- *
- * Results:
- *      TCL_OK if the procedure pointer was successfully removed,
- *	TCL_ERROR otherwise.
- *
- * Side effects:
- *      Memory is deallocated and the respective list updated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclOpenFileChannelDeleteProc(proc)
-    TclOpenFileChannelProc_ *proc;
-{
-    int retVal = TCL_ERROR;
-    OpenFileChannelProc *tmpOpenFileChannelProcPtr = openFileChannelProcList;
-    OpenFileChannelProc *prevOpenFileChannelProcPtr = NULL;
-
-    /*
-     * Traverse the 'openFileChannelProcList' looking for the particular
-     * node whose 'proc' member matches 'proc' and remove that one from
-     * the list.  Ensure that the "default" node cannot be removed.
-     */
-
-    Tcl_MutexLock(&hookMutex);
-    tmpOpenFileChannelProcPtr = openFileChannelProcList;
-    while ((retVal == TCL_ERROR) &&
-	    (tmpOpenFileChannelProcPtr != &defaultOpenFileChannelProc)) {
-	if (tmpOpenFileChannelProcPtr->proc == proc) {
-	    if (prevOpenFileChannelProcPtr == NULL) {
-		openFileChannelProcList = tmpOpenFileChannelProcPtr->nextPtr;
-	    } else {
-		prevOpenFileChannelProcPtr->nextPtr =
-			tmpOpenFileChannelProcPtr->nextPtr;
-	    }
-
-	    Tcl_Free((char *)tmpOpenFileChannelProcPtr);
-
-	    retVal = TCL_OK;
-	} else {
-	    prevOpenFileChannelProcPtr = tmpOpenFileChannelProcPtr;
-	    tmpOpenFileChannelProcPtr = tmpOpenFileChannelProcPtr->nextPtr;
-	}
-    }
-    Tcl_MutexUnlock(&hookMutex);
-
-    return (retVal);
-}
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
deleted file mode 100644
index 5acb6c5..0000000
--- a/generic/tclIndexObj.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* 
- * tclIndexObj.c --
- *
- *	This file implements objects of type "index".  This object type
- *	is used to lookup a keyword in a table of valid values and cache
- *	the index of the matching entry.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIndexObj.c,v 1.3 1999/04/16 00:46:47 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int		SetIndexFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-
-/*
- * The structure below defines the index Tcl object type by means of
- * procedures that can be invoked by generic object code.
- */
-
-Tcl_ObjType tclIndexType = {
-    "index",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,	/* freeIntRepProc */
-    (Tcl_DupInternalRepProc *) NULL,	/* dupIntRepProc */
-    (Tcl_UpdateStringProc *) NULL,	/* updateStringProc */
-    SetIndexFromAny			/* setFromAnyProc */
-};
-
-/*
- * Boolean flag indicating whether or not the tclIndexType object
- * type has been registered with the Tcl compiler.
- */
-
-static int indexTypeInitialized = 0;
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetIndexFromObj --
- *
- *	This procedure looks up an object's value in a table of strings
- *	and returns the index of the matching string, if any.
- *
- * Results:
- *
- *	If the value of objPtr is identical to or a unique abbreviation
- *	for one of the entries in objPtr, then the return value is
- *	TCL_OK and the index of the matching entry is stored at
- *	*indexPtr.  If there isn't a proper match, then TCL_ERROR is
- *	returned and an error message is left in interp's result (unless
- *	interp is NULL).  The msg argument is used in the error
- *	message; for example, if msg has the value "option" then the
- *	error message will say something flag 'bad option "foo": must be
- *	...'
- *
- * Side effects:
- *	The result of the lookup is cached as the internal rep of
- *	objPtr, so that repeated lookups can be done quickly.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* Object containing the string to lookup. */
-    char **tablePtr;		/* Array of strings to compare against the
-				 * value of objPtr; last entry must be NULL
-				 * and there must not be duplicate entries. */
-    char *msg;			/* Identifying word to use in error messages. */
-    int flags;			/* 0 or TCL_EXACT */
-    int *indexPtr;		/* Place to store resulting integer index. */
-{
-
-    /*
-     * See if there is a valid cached result from a previous lookup
-     * (doing the check here saves the overhead of calling
-     * Tcl_GetIndexFromObjStruct in the common case where the result
-     * is cached).
-     */
-
-    if ((objPtr->typePtr == &tclIndexType)
-	    && (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr)) {
-	*indexPtr = (int) objPtr->internalRep.twoPtrValue.ptr2;
-	return TCL_OK;
-    }
-    return Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, sizeof(char *),
-	    msg, flags, indexPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetIndexFromObjStruct --
- *
- *	This procedure looks up an object's value given a starting
- *	string and an offset for the amount of space between strings.
- *	This is useful when the strings are embedded in some other
- *	kind of array.
- *
- * Results:
- *
- *	If the value of objPtr is identical to or a unique abbreviation
- *	for one of the entries in objPtr, then the return value is
- *	TCL_OK and the index of the matching entry is stored at
- *	*indexPtr.  If there isn't a proper match, then TCL_ERROR is
- *	returned and an error message is left in interp's result (unless
- *	interp is NULL).  The msg argument is used in the error
- *	message; for example, if msg has the value "option" then the
- *	error message will say something flag 'bad option "foo": must be
- *	...'
- *
- * Side effects:
- *	The result of the lookup is cached as the internal rep of
- *	objPtr, so that repeated lookups can be done quickly.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, 
-	indexPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* Object containing the string to lookup. */
-    char **tablePtr;		/* The first string in the table. The second
-				 * string will be at this address plus the
-				 * offset, the third plus the offset again,
-				 * etc. The last entry must be NULL
-				 * and there must not be duplicate entries. */
-    int offset;			/* The number of bytes between entries */
-    char *msg;			/* Identifying word to use in error messages. */
-    int flags;			/* 0 or TCL_EXACT */
-    int *indexPtr;		/* Place to store resulting integer index. */
-{
-    int index, length, i, numAbbrev;
-    char *key, *p1, *p2, **entryPtr;
-    Tcl_Obj *resultPtr;
-
-    /*
-     * See if there is a valid cached result from a previous lookup.
-     */
-
-    if ((objPtr->typePtr == &tclIndexType)
-	    && (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr)) {
-	*indexPtr = (int) objPtr->internalRep.twoPtrValue.ptr2;
-	return TCL_OK;
-    }
-
-    /*
-     * Lookup the value of the object in the table.  Accept unique
-     * abbreviations unless TCL_EXACT is set in flags.
-     */
-
-    if (!indexTypeInitialized) {
-	/*
-	 * This is the first time we've done a lookup.  Register the
-	 * tclIndexType.
-	 */
-
-        Tcl_RegisterObjType(&tclIndexType);
-        indexTypeInitialized = 1;
-    }
-
-    key = Tcl_GetStringFromObj(objPtr, &length);
-    index = -1;
-    numAbbrev = 0;
-    for (entryPtr = tablePtr, i = 0; *entryPtr != NULL; 
-	    entryPtr = (char **) ((long) entryPtr + offset), i++) {
-	for (p1 = key, p2 = *entryPtr; *p1 == *p2; p1++, p2++) {
-	    if (*p1 == 0) {
-		index = i;
-		goto done;
-	    }
-	}
-	if (*p1 == 0) {
-	    /*
-	     * The value is an abbreviation for this entry.  Continue
-	     * checking other entries to make sure it's unique.  If we
-	     * get more than one unique abbreviation, keep searching to
-	     * see if there is an exact match, but remember the number
-	     * of unique abbreviations and don't allow either.
-	     */
-
-	    numAbbrev++;
-	    index = i;
-	}
-    }
-    if ((flags & TCL_EXACT) || (numAbbrev != 1)) {
-	goto error;
-    }
-
-    done:
-    if ((objPtr->typePtr != NULL)
-	    && (objPtr->typePtr->freeIntRepProc != NULL)) {
-	objPtr->typePtr->freeIntRepProc(objPtr);
-    }
-    objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) tablePtr;
-    objPtr->internalRep.twoPtrValue.ptr2 = (VOID *) index;
-    objPtr->typePtr = &tclIndexType;
-    *indexPtr = index;
-    return TCL_OK;
-
-    error:
-    if (interp != NULL) {
-	int count;
-	resultPtr = Tcl_GetObjResult(interp);
-	Tcl_AppendStringsToObj(resultPtr,
-		(numAbbrev > 1) ? "ambiguous " : "bad ", msg, " \"",
-		key, "\": must be ", *tablePtr, (char *) NULL);
-	for (entryPtr = (char **) ((long) tablePtr + offset), count = 0;
-		*entryPtr != NULL;
-		entryPtr = (char **) ((long) entryPtr + offset), count++) {
-	    if ((*((char **) ((long) entryPtr + offset))) == NULL) {
-		Tcl_AppendStringsToObj(resultPtr,
-			(count > 0) ? ", or " : " or ", *entryPtr,
-			(char *) NULL);
-	    } else {
-		Tcl_AppendStringsToObj(resultPtr, ", ", *entryPtr,
-			(char *) NULL);
-	    }
-	}
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetIndexFromAny --
- *
- *	This procedure is called to convert a Tcl object to index
- *	internal form. However, this doesn't make sense (need to have a
- *	table of keywords in order to do the conversion) so the
- *	procedure always generates an error.
- *
- * Results:
- *	The return value is always TCL_ERROR, and an error message is
- *	left in interp's result if interp isn't NULL. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetIndexFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	    "can't convert value to index except via Tcl_GetIndexFromObj API",
-	    -1);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WrongNumArgs --
- *
- *	This procedure generates a "wrong # args" error message in an
- *	interpreter.  It is used as a utility function by many command
- *	procedures.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	An error message is generated in interp's result object to
- *	indicate that a command was invoked with the wrong number of
- *	arguments.  The message has the form
- *		wrong # args: should be "foo bar additional stuff"
- *	where "foo" and "bar" are the initial objects in objv (objc
- *	determines how many of these are printed) and "additional stuff"
- *	is the contents of the message argument.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_WrongNumArgs(interp, objc, objv, message)
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments to print
-					 * from objv. */
-    Tcl_Obj *CONST objv[];		/* Initial argument objects, which
-					 * should be included in the error
-					 * message. */
-    char *message;			/* Error message to print after the
-					 * leading objects in objv. The
-					 * message may be NULL. */
-{
-    Tcl_Obj *objPtr;
-    char **tablePtr;
-    int i;
-
-    objPtr = Tcl_GetObjResult(interp);
-    Tcl_AppendToObj(objPtr, "wrong # args: should be \"", -1);
-    for (i = 0; i < objc; i++) {
-	/*
-	 * If the object is an index type use the index table which allows
-	 * for the correct error message even if the subcommand was
-	 * abbreviated.  Otherwise, just use the string rep.
-	 */
-	
-	if (objv[i]->typePtr == &tclIndexType) {
-	    tablePtr = ((char **) objv[i]->internalRep.twoPtrValue.ptr1);
-	    Tcl_AppendStringsToObj(objPtr,
-		    tablePtr[(int) objv[i]->internalRep.twoPtrValue.ptr2],
-		    (char *) NULL);
-	} else {
-	    Tcl_AppendStringsToObj(objPtr, Tcl_GetString(objv[i]),
-		    (char *) NULL);
-	}
-	if (i < (objc - 1)) {
-	    Tcl_AppendStringsToObj(objPtr, " ", (char *) NULL);
-	}
-    }
-    if (message) {
-      Tcl_AppendStringsToObj(objPtr, " ", message, (char *) NULL);
-    }
-    Tcl_AppendStringsToObj(objPtr, "\"", (char *) NULL);
-}
diff --git a/generic/tclInitScript.h b/generic/tclInitScript.h
deleted file mode 100644
index a1da091..0000000
--- a/generic/tclInitScript.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * tclInitScript.h --
- *
- *	This file contains Unix & Windows common init script
- *      It is not used on the Mac. (the mac init script is in tclMacInit.c)
- *
- * Copyright (c) 1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclInitScript.h,v 1.9 1999/04/16 00:46:47 stanton Exp $
- */
-
-/*
- * The following string is the startup script executed in new
- * interpreters.  It looks on disk in several different directories
- * for a script "init.tcl" that is compatible with this version
- * of Tcl.  The init.tcl script does all of the real work of
- * initialization.
- */
-
-static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
-  proc tclInit {} {\n\
-    global tcl_libPath tcl_library errorInfo\n\
-    rename tclInit {}\n\
-    set errors {}\n\
-    foreach i $tcl_libPath {\n\
-	set tcl_library $i\n\
-	set tclfile [file join $i init.tcl]\n\
-	if {[file exists $tclfile]} {\n\
-	    if {[catch {uplevel #0 [list source $tclfile]} msg] != 1} {\n\
-		return\n\
-	    } else {\n\
-		append errors \"$tclfile: $msg\n$errorInfo\n\"\n\
-	    }\n\
-	}\n\
-    }\n\
-    set msg \"Can't find a usable init.tcl in the following directories: \n\"\n\
-    append msg \"    $tcl_libPath\n\n\"\n\
-    append msg \"$errors\n\n\"\n\
-    append msg \"This probably means that Tcl wasn't installed properly.\n\"\n\
-    error $msg\n\
-  }\n\
-}\n\
-tclInit";
-
-
-/*
- * A pointer to a string that holds an initialization script that if non-NULL
- * is evaluated in Tcl_Init() prior to the the built-in initialization script
- * above.  This variable can be modified by the procedure below.
- */
- 
-static char *          tclPreInitScript = NULL;
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetPreInitScript --
- *
- *	This routine is used to change the value of the internal
- *	variable, tclPreInitScript.
- *
- * Results:
- *	Returns the current value of tclPreInitScript.
- *
- * Side effects:
- *	Changes the way Tcl_Init() routine behaves.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclSetPreInitScript (string)
-    char *string;		/* Pointer to a script. */
-{
-    char *prevString = tclPreInitScript;
-    tclPreInitScript = string;
-    return(prevString);
-}
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
deleted file mode 100644
index b2d1b44..0000000
--- a/generic/tclInt.decls
+++ /dev/null
@@ -1,778 +0,0 @@
-# tclInt.decls --
-#
-#	This file contains the declarations for all unsupported
-#	functions that are exported by the Tcl library.  This file
-#	is used to generate the tclIntDecls.h, tclIntPlatDecls.h,
-#	tclIntStub.c, tclPlatStub.c, tclCompileDecls.h and tclCompileStub.c
-#	files
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: tclInt.decls,v 1.5 1999/04/16 00:46:47 stanton Exp $
-
-library tcl
-
-# Define the unsupported generic interfaces.
-
-interface tclInt
-
-# Declare each of the functions in the unsupported internal Tcl
-# interface.  These interfaces are allowed to changed between versions.
-# Use at your own risk.  Note that the position of functions should not
-# be changed between versions to avoid gratuitous incompatibilities.
-
-declare 0 generic {
-    int TclAccess(CONST char *path, int mode)
-}
-declare 1 generic {
-    int TclAccessDeleteProc(TclAccessProc_ *proc)
-}
-declare 2 generic {
-    int TclAccessInsertProc(TclAccessProc_ *proc)
-}
-declare 3 generic {
-    void TclAllocateFreeObjects(void)
-}
-# Replaced by TclpChdir in 8.1:
-#  declare 4 generic {   
-#      int TclChdir(Tcl_Interp *interp, char *dirName)
-#  }
-declare 5 generic {
-    int TclCleanupChildren(Tcl_Interp *interp, int numPids, Tcl_Pid *pidPtr, \
-	    Tcl_Channel errorChan)
-}
-declare 6 generic {
-    void TclCleanupCommand(Command *cmdPtr)
-}
-declare 7 generic {
-    int TclCopyAndCollapse(int count, CONST char *src, char *dst)
-}
-declare 8 generic {
-    int TclCopyChannel(Tcl_Interp *interp, Tcl_Channel inChan, \
-	    Tcl_Channel outChan, int toRead, Tcl_Obj *cmdPtr)
-}
-
-# TclCreatePipeline unofficially exported for use by BLT.
-
-declare 9 generic {
-    int TclCreatePipeline(Tcl_Interp *interp, int argc, char **argv, \
-	    Tcl_Pid **pidArrayPtr, TclFile *inPipePtr, TclFile *outPipePtr, \
-	    TclFile *errFilePtr)
-}
-declare 10 generic {
-    int TclCreateProc(Tcl_Interp *interp, Namespace *nsPtr, char *procName, \
-	    Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr, Proc **procPtrPtr)
-}
-declare 11 generic {
-    void TclDeleteCompiledLocalVars(Interp *iPtr, CallFrame *framePtr)
-}
-declare 12 generic {
-    void TclDeleteVars(Interp *iPtr, Tcl_HashTable *tablePtr)
-}
-declare 13 generic {
-    int TclDoGlob(Tcl_Interp *interp, char *separators, \
-	    Tcl_DString *headPtr, char *tail)
-}
-declare 14 generic {
-    void TclDumpMemoryInfo(FILE *outFile)
-}
-# Removed in 8.1:
-#  declare 15 generic {
-#      void TclExpandParseValue(ParseValue *pvPtr, int needed)
-#  }
-declare 16 generic {
-    void TclExprFloatError(Tcl_Interp *interp, double value)
-}
-declare 17 generic {
-    int TclFileAttrsCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-}
-declare 18 generic {
-    int TclFileCopyCmd(Tcl_Interp *interp, int argc, char **argv)
-}
-declare 19 generic {
-    int TclFileDeleteCmd(Tcl_Interp *interp, int argc, char **argv)
-}
-declare 20 generic {
-    int TclFileMakeDirsCmd(Tcl_Interp *interp, int argc, char **argv)
-}
-declare 21 generic {
-    int TclFileRenameCmd(Tcl_Interp *interp, int argc, char **argv)
-}
-declare 22 generic {
-    int TclFindElement(Tcl_Interp *interp, CONST char *listStr, \
-	    int listLength, CONST char **elementPtr, CONST char **nextPtr, \
-	    int *sizePtr, int *bracePtr)
-}
-declare 23 generic {
-    Proc * TclFindProc(Interp *iPtr, char *procName)
-}
-declare 24 generic {
-    int TclFormatInt(char *buffer, long n)
-}
-declare 25 generic {
-    void TclFreePackageInfo(Interp *iPtr)
-}
-# Removed in 8.1:
-#  declare 26 generic {	
-#      char * TclGetCwd(Tcl_Interp *interp)
-#  }
-declare 27 generic {
-    int TclGetDate(char *p, unsigned long now, long zone, \
-	    unsigned long *timePtr)
-}
-declare 28 generic {
-    Tcl_Channel TclpGetDefaultStdChannel(int type)
-}
-declare 29 generic {
-    Tcl_Obj * TclGetElementOfIndexedArray(Tcl_Interp *interp, \
-	    int localIndex, Tcl_Obj *elemPtr, int leaveErrorMsg)
-}
-# Replaced by char * TclGetEnv(CONST char *name, Tcl_DString *valuePtr) in 8.1:
-#  declare 30 generic {
-#      char * TclGetEnv(CONST char *name)
-#  }
-declare 31 generic {
-    char * TclGetExtension(char *name)
-}
-declare 32 generic {
-    int TclGetFrame(Tcl_Interp *interp, char *str, CallFrame **framePtrPtr)
-}
-declare 33 generic {
-    TclCmdProcType TclGetInterpProc(void)
-}
-declare 34 generic {
-    int TclGetIntForIndex(Tcl_Interp *interp, Tcl_Obj *objPtr, \
-	    int endValue, int *indexPtr)
-}
-declare 35 generic {
-    Tcl_Obj * TclGetIndexedScalar(Tcl_Interp *interp, int localIndex, \
-	    int leaveErrorMsg)
-}
-declare 36 generic {
-    int TclGetLong(Tcl_Interp *interp, char *str, long *longPtr)
-}
-declare 37 generic {
-    int TclGetLoadedPackages(Tcl_Interp *interp, char *targetName)
-}
-declare 38 generic {
-    int TclGetNamespaceForQualName(Tcl_Interp *interp, char *qualName, \
-	    Namespace *cxtNsPtr, int flags, Namespace **nsPtrPtr, \
-	    Namespace **altNsPtrPtr, Namespace **actualCxtPtrPtr, \
-	    char **simpleNamePtr)
-}
-declare 39 generic {
-    TclObjCmdProcType TclGetObjInterpProc(void)
-}
-declare 40 generic {
-    int TclGetOpenMode(Tcl_Interp *interp, char *str, int *seekFlagPtr)
-}
-declare 41 generic {
-    Tcl_Command TclGetOriginalCommand(Tcl_Command command)
-}
-declare 42 generic {
-    char * TclpGetUserHome(CONST char *name, Tcl_DString *bufferPtr)
-}
-declare 43 generic {
-    int TclGlobalInvoke(Tcl_Interp *interp, int argc, char **argv, int flags)
-}
-declare 44 generic {
-    int TclGuessPackageName(char *fileName, Tcl_DString *bufPtr)
-}
-declare 45 generic {
-    int TclHideUnsafeCommands(Tcl_Interp *interp)
-}
-declare 46 generic {
-    int TclInExit(void)
-}
-declare 47 generic {
-    Tcl_Obj * TclIncrElementOfIndexedArray(Tcl_Interp *interp, \
-	    int localIndex, Tcl_Obj *elemPtr, long incrAmount)
-}
-declare 48 generic {
-    Tcl_Obj * TclIncrIndexedScalar(Tcl_Interp *interp, int localIndex, \
-	    long incrAmount)
-}
-declare 49 generic {
-    Tcl_Obj * TclIncrVar2(Tcl_Interp *interp, Tcl_Obj *part1Ptr, \
-	    Tcl_Obj *part2Ptr, long incrAmount, int part1NotParsed)
-}
-declare 50 generic {
-    void TclInitCompiledLocals(Tcl_Interp *interp, CallFrame *framePtr, \
-	    Namespace *nsPtr)
-}
-declare 51 generic {
-    int TclInterpInit(Tcl_Interp *interp)
-}
-declare 52 generic {
-    int TclInvoke(Tcl_Interp *interp, int argc, char **argv, int flags)
-}
-declare 53 generic {
-    int TclInvokeObjectCommand(ClientData clientData, Tcl_Interp *interp, \
-	    int argc, char **argv)
-}
-declare 54 generic {
-    int TclInvokeStringCommand(ClientData clientData, Tcl_Interp *interp, \
-	    int objc, Tcl_Obj *CONST objv[])
-}
-declare 55 generic {
-    Proc * TclIsProc(Command *cmdPtr)
-}
-# Replaced with TclpLoadFile in 8.1:
-#  declare 56 generic {
-#      int TclLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, \
-#  	    char *sym2, Tcl_PackageInitProc **proc1Ptr, \
-#  	    Tcl_PackageInitProc **proc2Ptr)
-#  }
-# Signature changed to take a length in 8.1:
-#  declare 57 generic {
-#      int TclLooksLikeInt(char *p)
-#  }
-declare 58 generic {
-    Var * TclLookupVar(Tcl_Interp *interp, char *part1, char *part2, \
-	    int flags, char *msg, int createPart1, int createPart2, \
-	    Var **arrayPtrPtr)
-}
-declare 59 generic {
-    int TclpMatchFiles(Tcl_Interp *interp, char *separators, \
-	    Tcl_DString *dirPtr, char *pattern, char *tail)
-}
-declare 60 generic {
-    int TclNeedSpace(char *start, char *end)
-}
-declare 61 generic {
-    Tcl_Obj * TclNewProcBodyObj(Proc *procPtr)
-}
-declare 62 generic {
-    int TclObjCommandComplete(Tcl_Obj *cmdPtr)
-}
-declare 63 generic {
-    int TclObjInterpProc(ClientData clientData, Tcl_Interp *interp, \
-	    int objc, Tcl_Obj *CONST objv[])
-}
-declare 64 generic {
-    int TclObjInvoke(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], \
-	    int flags)
-}
-declare 65 generic {
-    int TclObjInvokeGlobal(Tcl_Interp *interp, int objc, \
-	    Tcl_Obj *CONST objv[], int flags)
-}
-declare 66 generic {
-    int TclOpenFileChannelDeleteProc(TclOpenFileChannelProc_ *proc)
-}
-declare 67 generic {
-    int TclOpenFileChannelInsertProc(TclOpenFileChannelProc_ *proc)
-}
-declare 68 generic {
-    int TclpAccess(CONST char *path, int mode)
-}
-declare 69 generic {
-    char * TclpAlloc(unsigned int size)
-}
-declare 70 generic {
-    int TclpCopyFile(CONST char *source, CONST char *dest)
-}
-declare 71 generic {
-    int TclpCopyDirectory(CONST char *source, CONST char *dest, \
-	    Tcl_DString *errorPtr)
-}
-declare 72 generic {
-    int TclpCreateDirectory(CONST char *path)
-}
-declare 73 generic {
-    int TclpDeleteFile(CONST char *path)
-}
-declare 74 generic {
-    void TclpFree(char *ptr)
-}
-declare 75 generic {
-    unsigned long TclpGetClicks(void)
-}
-declare 76 generic {
-    unsigned long TclpGetSeconds(void)
-}
-declare 77 generic {
-    void TclpGetTime(Tcl_Time *time)
-}
-declare 78 generic {
-    int TclpGetTimeZone(unsigned long time)
-}
-declare 79 generic {
-    int TclpListVolumes(Tcl_Interp *interp)
-}
-declare 80 generic {
-    Tcl_Channel TclpOpenFileChannel(Tcl_Interp *interp, char *fileName, \
-	    char *modeString, int permissions)
-}
-declare 81 generic {
-    char * TclpRealloc(char *ptr, unsigned int size)
-}
-declare 82 generic {
-    int TclpRemoveDirectory(CONST char *path, int recursive, \
-	    Tcl_DString *errorPtr)
-}
-declare 83 generic {
-    int TclpRenameFile(CONST char *source, CONST char *dest)
-}
-# Removed in 8.1:
-#  declare 84 generic {
-#      int TclParseBraces(Tcl_Interp *interp, char *str, char **termPtr, \
-#  	    ParseValue *pvPtr)
-#  }
-#  declare 85 generic {
-#      int TclParseNestedCmd(Tcl_Interp *interp, char *str, int flags, \
-#  	    char **termPtr, ParseValue *pvPtr)
-#  }
-#  declare 86 generic {
-#      int TclParseQuotes(Tcl_Interp *interp, char *str, int termChar, \
-#  	    int flags, char **termPtr, ParseValue *pvPtr)
-#  }
-#  declare 87 generic {
-#      void TclPlatformInit(Tcl_Interp *interp)
-#  }
-declare 88 generic {
-    char * TclPrecTraceProc(ClientData clientData, Tcl_Interp *interp, \
-	    char *name1, char *name2, int flags)
-}
-declare 89 generic {
-    int TclPreventAliasLoop(Tcl_Interp *interp, Tcl_Interp *cmdInterp, \
-	    Tcl_Command cmd)
-}
-# Removed in 8.1 (only available if compiled with TCL_COMPILE_DEBUG):
-#  declare 90 generic {
-#      void TclPrintByteCodeObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
-#  }
-declare 91 generic {
-    void TclProcCleanupProc(Proc *procPtr)
-}
-declare 92 generic {
-    int TclProcCompileProc(Tcl_Interp *interp, Proc *procPtr, \
-	    Tcl_Obj *bodyPtr, Namespace *nsPtr, CONST char *description, \
-	    CONST char *procName)
-}
-declare 93 generic {
-    void TclProcDeleteProc(ClientData clientData)
-}
-declare 94 generic {
-    int TclProcInterpProc(ClientData clientData, Tcl_Interp *interp, \
-	    int argc, char **argv)
-}
-declare 95 generic {
-    int TclpStat(CONST char *path, struct stat *buf)
-}
-declare 96 generic {
-    int TclRenameCommand(Tcl_Interp *interp, char *oldName, char *newName)
-}
-declare 97 generic {
-    void TclResetShadowedCmdRefs(Tcl_Interp *interp, Command *newCmdPtr)
-}
-declare 98 generic {
-    int TclServiceIdle(void)
-}
-declare 99 generic {
-    Tcl_Obj * TclSetElementOfIndexedArray(Tcl_Interp *interp, \
-	    int localIndex, Tcl_Obj *elemPtr, Tcl_Obj *objPtr, int leaveErrorMsg)
-}
-declare 100 generic {
-    Tcl_Obj * TclSetIndexedScalar(Tcl_Interp *interp, int localIndex, \
-	    Tcl_Obj *objPtr, int leaveErrorMsg)
-}
-# TODO: needs to be implemented
-#  declare 101 generic {
-#      char * TclSetPreInitScript(char *string)
-#  }
-declare 102 generic {
-    void TclSetupEnv(Tcl_Interp *interp)
-}
-declare 103 generic {
-    int TclSockGetPort(Tcl_Interp *interp, char *str, char *proto, \
-	    int *portPtr)
-}
-declare 104 generic {
-    int TclSockMinimumBuffers(int sock, int size)
-}
-declare 105 generic {
-    int TclStat(CONST char *path, TclStat_ *buf)
-}
-declare 106 generic {
-    int TclStatDeleteProc(TclStatProc_ *proc)
-}
-declare 107 generic {
-    int TclStatInsertProc(TclStatProc_ *proc)
-}
-declare 108 generic {
-    void TclTeardownNamespace(Namespace *nsPtr)
-}
-declare 109 generic {
-    int TclUpdateReturnInfo(Interp *iPtr)
-}
-# Removed in 8.1:
-#  declare 110 generic {
-#      char * TclWordEnd(char *start, char *lastChar, int nested, int *semiPtr)
-#  }
-
-# Procedures used in conjunction with Tcl namespaces. They are
-# defined here instead of in tcl.decls since they are not stable yet.
-
-declare 111 generic {
-    void Tcl_AddInterpResolvers(Tcl_Interp *interp, char *name, \
-	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, \
-	    Tcl_ResolveCompiledVarProc *compiledVarProc)
-}
-declare 112 generic {
-    int Tcl_AppendExportList(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
-	    Tcl_Obj *objPtr)
-}
-declare 113 generic {
-    Tcl_Namespace * Tcl_CreateNamespace(Tcl_Interp *interp, char *name, \
-	    ClientData clientData, Tcl_NamespaceDeleteProc *deleteProc)
-}
-declare 114 generic {
-    void Tcl_DeleteNamespace(Tcl_Namespace *nsPtr)
-}
-declare 115 generic {
-    int Tcl_Export(Tcl_Interp *interp, Tcl_Namespace *nsPtr, char *pattern, \
-	    int resetListFirst)
-}
-declare 116 generic {
-    Tcl_Command Tcl_FindCommand(Tcl_Interp *interp, char *name, \
-	    Tcl_Namespace *contextNsPtr, int flags)
-}
-declare 117 generic {
-    Tcl_Namespace * Tcl_FindNamespace(Tcl_Interp *interp, char *name, \
-	    Tcl_Namespace *contextNsPtr, int flags)
-}
-declare 118 generic {
-    int Tcl_GetInterpResolvers(Tcl_Interp *interp, char *name, \
-	    Tcl_ResolverInfo *resInfo)
-}
-declare 119 generic {
-    int Tcl_GetNamespaceResolvers(Tcl_Namespace *namespacePtr, \
-	    Tcl_ResolverInfo *resInfo)
-}
-declare 120 generic {
-    Tcl_Var Tcl_FindNamespaceVar(Tcl_Interp *interp, char *name, \
-	    Tcl_Namespace *contextNsPtr, int flags)
-}
-declare 121 generic {
-    int Tcl_ForgetImport(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
-	    char *pattern)
-}
-declare 122 generic {
-    Tcl_Command Tcl_GetCommandFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr)
-}
-declare 123 generic {
-    void Tcl_GetCommandFullName(Tcl_Interp *interp, Tcl_Command command, \
-	    Tcl_Obj *objPtr)
-}
-declare 124 generic {
-    Tcl_Namespace * Tcl_GetCurrentNamespace(Tcl_Interp *interp)
-}
-declare 125 generic {
-    Tcl_Namespace * Tcl_GetGlobalNamespace(Tcl_Interp *interp)
-}
-declare 126 generic {
-    void Tcl_GetVariableFullName(Tcl_Interp *interp, Tcl_Var variable, \
-	    Tcl_Obj *objPtr)
-}
-declare 127 generic {
-    int Tcl_Import(Tcl_Interp *interp, Tcl_Namespace *nsPtr, \
-	    char *pattern, int allowOverwrite)
-}
-declare 128 generic {
-    void Tcl_PopCallFrame(Tcl_Interp* interp)
-}
-declare 129 generic {
-    int Tcl_PushCallFrame(Tcl_Interp* interp, Tcl_CallFrame *framePtr, \
-	    Tcl_Namespace *nsPtr, int isProcCallFrame)
-} 
-declare 130 generic {
-    int Tcl_RemoveInterpResolvers(Tcl_Interp *interp, char *name)
-}
-declare 131 generic {
-    void Tcl_SetNamespaceResolvers(Tcl_Namespace *namespacePtr, \
-	    Tcl_ResolveCmdProc *cmdProc, Tcl_ResolveVarProc *varProc, \
-	    Tcl_ResolveCompiledVarProc *compiledVarProc)
-}
-declare 132 generic {
-    int TclpHasSockets(Tcl_Interp *interp)
-}
-declare 133 generic {
-    struct tm *	TclpGetDate(TclpTime_t time, int useGMT)
-}
-declare 134 generic {
-    size_t TclpStrftime(char *s, size_t maxsize, CONST char *format, \
-	    CONST struct tm *t)
-}
-declare 135 generic {
-    int TclpCheckStackSpace(void)
-}
-
-# Added in 8.1:
-
-declare 137 generic {
-   int TclpChdir(CONST char *dirName)
-}
-declare 138 generic {
-    char * TclGetEnv(CONST char *name, Tcl_DString *valuePtr)
-}
-declare 139 generic {
-    int TclpLoadFile(Tcl_Interp *interp, char *fileName, char *sym1, \
-	    char *sym2, Tcl_PackageInitProc **proc1Ptr, \
-	    Tcl_PackageInitProc **proc2Ptr, ClientData *clientDataPtr)
-}
-declare 140 generic {
-    int TclLooksLikeInt(char *bytes, int length)
-}
-
-declare 141 generic {
-    char *TclpGetCwd(Tcl_Interp *interp, Tcl_DString *cwdPtr)
-}
-##############################################################################
-
-# Define the platform specific internal Tcl interface. These functions are
-# only available on the designated platform.
-
-interface tclIntPlat
-
-########################
-# Mac specific internals
-
-declare 0 mac {
-    VOID * TclpSysAlloc(long size, int isBin)
-}
-declare 1 mac {
-    void TclpSysFree(VOID *ptr)
-}
-declare 2 mac {
-    VOID * TclpSysRealloc(VOID *cp, unsigned int size)
-}
-declare 3 mac {
-    void TclpExit(int status)
-}
-
-# Prototypes for functions found in the tclMacUtil.c compatability library.
-
-declare 4 mac {
-    int FSpGetDefaultDir(FSSpecPtr theSpec)
-}
-declare 5 mac {
-    int FSpSetDefaultDir(FSSpecPtr theSpec)
-}
-declare 6 mac {
-    OSErr FSpFindFolder(short vRefNum, OSType folderType, \
-	    Boolean createFolder, FSSpec *spec)
-}
-declare 7 mac {
-    void GetGlobalMouse(Point *mouse)
-}
-
-# The following routines are utility functions in Tcl.  They are exported
-# here because they are needed in Tk.  They are not officially supported,
-# however.  The first set are from the MoreFiles package.
-
-declare 8 mac {
-    pascal OSErr FSpGetDirectoryID(CONST FSSpec *spec, long *theDirID, \
-	    Boolean *isDirectory)
-}
-declare 9 mac {
-    pascal short FSpOpenResFileCompat(CONST FSSpec *spec, \
-	    SignedByte permission)
-}
-declare 10 mac {
-    pascal void FSpCreateResFileCompat(CONST FSSpec *spec, OSType creator, \
-	    OSType fileType, ScriptCode scriptTag)
-}
-
-# Like the MoreFiles routines these fix problems in the standard
-# Mac calls.  These routines are from tclMacUtils.h.
-
-declare 11 mac {
-    int FSpLocationFromPath(int length, CONST char *path, FSSpecPtr theSpec)
-}
-declare 12 mac {
-    OSErr FSpPathFromLocation(FSSpecPtr theSpec, int *length, \
-	    Handle *fullPath)
-}
-
-# Prototypes of Mac only internal functions.
-
-declare 13 mac {
-    void TclMacExitHandler(void)
-}
-declare 14 mac {
-    void TclMacInitExitToShell(int usePatch)
-}
-declare 15 mac {
-    OSErr TclMacInstallExitToShellPatch(ExitToShellProcPtr newProc)
-}
-declare 16 mac {
-    int TclMacOSErrorToPosixError(int error)
-}
-declare 17 mac {
-    void TclMacRemoveTimer(void *timerToken)
-}
-declare 18 mac {
-    void * TclMacStartTimer(long ms)
-}
-declare 19 mac {
-    int TclMacTimerExpired(void *timerToken)
-}
-declare 20 mac {
-    int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr, \
-	    int insert)
-}	
-declare 21 mac {
-    short TclMacUnRegisterResourceFork(char *tokenPtr, Tcl_Obj *resultPtr)
-}	
-declare 22 mac {
-    int TclMacCreateEnv(void)
-}
-declare 23 mac {
-    FILE * TclMacFOpenHack(CONST char *path, CONST char *mode)
-}
-# Replaced in 8.1 by TclpReadLink:
-#  declare 24 mac {
-#      int TclMacReadlink(char *path, char *buf, int size)
-#  }
-declare 25 mac {
-    int TclMacChmod(char *path, int mode)
-}
-
-############################
-# Windows specific internals
-
-declare 0 win {
-    void TclWinConvertError(DWORD errCode)
-}
-declare 1 win {
-    void TclWinConvertWSAError(DWORD errCode)
-}
-declare 2 win {
-    struct servent * TclWinGetServByName(CONST char *nm, \
-	    CONST char *proto)
-}
-declare 3 win {
-    int TclWinGetSockOpt(SOCKET s, int level, int optname, \
-	    char FAR * optval, int FAR *optlen)
-}
-declare 4 win {
-    HINSTANCE TclWinGetTclInstance(void)
-}
-# Removed in 8.1:
-#  declare 5 win {
-#      HINSTANCE TclWinLoadLibrary(char *name)
-#  }
-declare 6 win {
-    u_short TclWinNToHS(u_short ns)
-}
-declare 7 win {
-    int TclWinSetSockOpt(SOCKET s, int level, int optname, \
-	    CONST char FAR * optval, int optlen)
-}
-declare 8 win {
-    unsigned long TclpGetPid(Tcl_Pid pid)
-}
-declare 9 win {
-    int TclWinGetPlatformId(void)
-}
-declare 10 win {
-    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
-}
-
-# Pipe channel functions
-
-declare 11 win {
-    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 12 win {
-    int TclpCloseFile(TclFile file)
-}
-declare 13 win {
-    Tcl_Channel TclpCreateCommandChannel(TclFile readFile, \
-	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
-}
-declare 14 win {
-    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
-}
-declare 15 win {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, char **argv, \
-	    TclFile inputFile, TclFile outputFile, TclFile errorFile, \
-	    Tcl_Pid *pidPtr)
-}
-# Signature changed in 8.1:
-#  declare 16 win {
-#      TclFile TclpCreateTempFile(char *contents, Tcl_DString *namePtr)
-#  }
-#  declare 17 win {
-#      char * TclpGetTZName(void)
-#  }
-declare 18 win {
-    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
-}
-declare 19 win {
-    TclFile TclpOpenFile(CONST char *fname, int mode)
-}
-declare 20 win {
-    void TclWinAddProcess(HANDLE hProcess, DWORD id)
-}
-declare 21 win {
-    void TclpAsyncMark(Tcl_AsyncHandler async)
-}
-
-# Added in 8.1:
-declare 22 win {
-    TclFile TclpCreateTempFile(CONST char *contents)
-}
-declare 23 win {
-    char * TclpGetTZName(int isdst)
-}
-declare 24 win {
-    char * TclWinNoBackslash(char *path)
-}
-
-#########################
-# Unix specific internals
-
-# Pipe channel functions
-
-declare 0 unix {
-    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 1 unix {
-    int TclpCloseFile(TclFile file)
-}
-declare 2 unix {
-    Tcl_Channel TclpCreateCommandChannel(TclFile readFile, \
-	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
-}
-declare 3 unix {
-    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
-}
-declare 4 unix {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, char **argv, \
-	    TclFile inputFile, TclFile outputFile, TclFile errorFile, \
-	    Tcl_Pid *pidPtr)
-}
-# Signature changed in 8.1:
-#  declare 5 unix {
-#      TclFile TclpCreateTempFile(char *contents, 
-#      Tcl_DString *namePtr)
-#  }
-declare 6 unix {
-    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
-}
-declare 7 unix {
-    TclFile TclpOpenFile(CONST char *fname, int mode)
-}
-declare 8 unix {
-    int TclUnixWaitForFile(int fd, int mask, int timeout)
-}
-
-# Added in 8.1:
-
-declare 9 unix {
-    TclFile TclpCreateTempFile(CONST char *contents)
-}
diff --git a/generic/tclInt.h b/generic/tclInt.h
deleted file mode 100644
index 0590bc5..0000000
--- a/generic/tclInt.h
+++ /dev/null
@@ -1,2184 +0,0 @@
-/*
- * tclInt.h --
- *
- *	Declarations of things used internally by the Tcl interpreter.
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1993-1997 Lucent Technologies.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclInt.h,v 1.25 1999/04/16 00:46:48 stanton Exp $
- */
-
-#ifndef _TCLINT
-#define _TCLINT
-
-/*
- * Common include files needed by most of the Tcl source files are
- * included here, so that system-dependent personalizations for the
- * include files only have to be made in once place.  This results
- * in a few extra includes, but greater modularity.  The order of
- * the three groups of #includes is important.	For example, stdio.h
- * is needed by tcl.h, and the _ANSI_ARGS_ declaration in tcl.h is
- * needed by stdlib.h in some configurations.
- */
-
-#include <stdio.h>
-
-#ifndef _TCL
-#include "tcl.h"
-#endif
-
-#include <ctype.h>
-#ifdef NO_LIMITS_H
-#   include "../compat/limits.h"
-#else
-#   include <limits.h>
-#endif
-#ifdef NO_STDLIB_H
-#   include "../compat/stdlib.h"
-#else
-#   include <stdlib.h>
-#endif
-#ifdef NO_STRING_H
-#include "../compat/string.h"
-#else
-#include <string.h>
-#endif
-
-#undef TCL_STORAGE_CLASS
-#ifdef BUILD_tcl
-# define TCL_STORAGE_CLASS DLLEXPORT
-#else
-# ifdef USE_TCL_STUBS
-#  define TCL_STORAGE_CLASS
-# else
-#  define TCL_STORAGE_CLASS DLLIMPORT
-# endif
-#endif
-
-/*
- * The following procedures allow namespaces to be customized to
- * support special name resolution rules for commands/variables.
- * 
- */
-
-struct Tcl_ResolvedVarInfo;
-
-typedef Tcl_Var (Tcl_ResolveRuntimeVarProc) _ANSI_ARGS_((
-    Tcl_Interp* interp, struct Tcl_ResolvedVarInfo *vinfoPtr));
-
-typedef void (Tcl_ResolveVarDeleteProc) _ANSI_ARGS_((
-    struct Tcl_ResolvedVarInfo *vinfoPtr));
-
-/*
- * The following structure encapsulates the routines needed to resolve a
- * variable reference at runtime.  Any variable specific state will typically
- * be appended to this structure.
- */
-
-
-typedef struct Tcl_ResolvedVarInfo {
-    Tcl_ResolveRuntimeVarProc *fetchProc;
-    Tcl_ResolveVarDeleteProc *deleteProc;
-} Tcl_ResolvedVarInfo;
-
-
-
-typedef int (Tcl_ResolveCompiledVarProc) _ANSI_ARGS_((
-    Tcl_Interp* interp, char* name, int length,
-    Tcl_Namespace *context, Tcl_ResolvedVarInfo **rPtr));
-
-typedef int (Tcl_ResolveVarProc) _ANSI_ARGS_((
-    Tcl_Interp* interp, char* name, Tcl_Namespace *context,
-    int flags, Tcl_Var *rPtr));
-
-typedef int (Tcl_ResolveCmdProc) _ANSI_ARGS_((Tcl_Interp* interp,
-    char* name, Tcl_Namespace *context, int flags,
-    Tcl_Command *rPtr));
- 
-typedef struct Tcl_ResolverInfo {
-    Tcl_ResolveCmdProc *cmdResProc;	/* Procedure handling command name
-					 * resolution. */
-    Tcl_ResolveVarProc *varResProc;	/* Procedure handling variable name
-					 * resolution for variables that
-					 * can only be handled at runtime. */
-    Tcl_ResolveCompiledVarProc *compiledVarResProc;
-					/* Procedure handling variable name
-					 * resolution at compile time. */
-} Tcl_ResolverInfo;
-
-/*
- *----------------------------------------------------------------
- * Data structures related to namespaces.
- *----------------------------------------------------------------
- */
-
-/*
- * The structure below defines a namespace.
- * Note: the first five fields must match exactly the fields in a
- * Tcl_Namespace structure (see tcl.h). If you change one, be sure to
- * change the other.
- */
-
-typedef struct Namespace {
-    char *name;			 /* The namespace's simple (unqualified)
-				  * name. This contains no ::'s. The name of
-				  * the global namespace is "" although "::"
-				  * is an synonym. */
-    char *fullName;		 /* The namespace's fully qualified name.
-				  * This starts with ::. */
-    ClientData clientData;	 /* An arbitrary value associated with this
-				  * namespace. */
-    Tcl_NamespaceDeleteProc *deleteProc;
-				 /* Procedure invoked when deleting the
-				  * namespace to, e.g., free clientData. */
-    struct Namespace *parentPtr; /* Points to the namespace that contains
-				  * this one. NULL if this is the global
-				  * namespace. */
-    Tcl_HashTable childTable;	 /* Contains any child namespaces. Indexed
-				  * by strings; values have type
-				  * (Namespace *). */
-    long nsId;			 /* Unique id for the namespace. */
-    Tcl_Interp *interp;		 /* The interpreter containing this
-				  * namespace. */
-    int flags;			 /* OR-ed combination of the namespace
-				  * status flags NS_DYING and NS_DEAD
-				  * listed below. */
-    int activationCount;	 /* Number of "activations" or active call
-				  * frames for this namespace that are on
-				  * the Tcl call stack. The namespace won't
-				  * be freed until activationCount becomes
-				  * zero. */
-    int refCount;		 /* Count of references by namespaceName *
-				  * objects. The namespace can't be freed
-				  * until refCount becomes zero. */
-    Tcl_HashTable cmdTable;	 /* Contains all the commands currently
-				  * registered in the namespace. Indexed by
-				  * strings; values have type (Command *).
-				  * Commands imported by Tcl_Import have
-				  * Command structures that point (via an
-				  * ImportedCmdRef structure) to the
-				  * Command structure in the source
-				  * namespace's command table. */
-    Tcl_HashTable varTable;	 /* Contains all the (global) variables
-				  * currently in this namespace. Indexed
-				  * by strings; values have type (Var *). */
-    char **exportArrayPtr;	 /* Points to an array of string patterns
-				  * specifying which commands are exported.
-				  * A pattern may include "string match"
-				  * style wildcard characters to specify
-				  * multiple commands; however, no namespace
-				  * qualifiers are allowed. NULL if no
-				  * export patterns are registered. */
-    int numExportPatterns;	 /* Number of export patterns currently
-				  * registered using "namespace export". */
-    int maxExportPatterns;	 /* Mumber of export patterns for which
-				  * space is currently allocated. */
-    int cmdRefEpoch;		 /* Incremented if a newly added command
-				  * shadows a command for which this
-				  * namespace has already cached a Command *
-				  * pointer; this causes all its cached
-				  * Command* pointers to be invalidated. */
-    int resolverEpoch;		 /* Incremented whenever the name resolution
-				  * rules change for this namespace; this
-				  * invalidates all byte codes compiled in
-				  * the namespace, causing the code to be
-				  * recompiled under the new rules. */
-    Tcl_ResolveCmdProc *cmdResProc;
-				 /* If non-null, this procedure overrides
-				  * the usual command resolution mechanism
-				  * in Tcl.  This procedure is invoked
-				  * within Tcl_FindCommand to resolve all
-				  * command references within the namespace. */
-    Tcl_ResolveVarProc *varResProc;
-				 /* If non-null, this procedure overrides
-				  * the usual variable resolution mechanism
-				  * in Tcl.  This procedure is invoked
-				  * within Tcl_FindNamespaceVar to resolve all
-				  * variable references within the namespace
-				  * at runtime. */
-    Tcl_ResolveCompiledVarProc *compiledVarResProc;
-				 /* If non-null, this procedure overrides
-				  * the usual variable resolution mechanism
-				  * in Tcl.  This procedure is invoked
-				  * within LookupCompiledLocal to resolve
-				  * variable references within the namespace
-				  * at compile time. */
-} Namespace;
-
-/*
- * Flags used to represent the status of a namespace:
- *
- * NS_DYING -	1 means Tcl_DeleteNamespace has been called to delete the
- *		namespace but there are still active call frames on the Tcl
- *		stack that refer to the namespace. When the last call frame
- *		referring to it has been popped, it's variables and command
- *		will be destroyed and it will be marked "dead" (NS_DEAD).
- *		The namespace can no longer be looked up by name.
- * NS_DEAD -	1 means Tcl_DeleteNamespace has been called to delete the
- *		namespace and no call frames still refer to it. Its
- *		variables and command have already been destroyed. This bit
- *		allows the namespace resolution code to recognize that the
- *		namespace is "deleted". When the last namespaceName object
- *		in any byte code code unit that refers to the namespace has
- *		been freed (i.e., when the namespace's refCount is 0), the
- *		namespace's storage will be freed.
- */
-
-#define NS_DYING	0x01
-#define NS_DEAD		0x02
-
-/*
- * Flag passed to TclGetNamespaceForQualName to have it create all namespace
- * components of a namespace-qualified name that cannot be found. The new
- * namespaces are created within their specified parent. Note that this
- * flag's value must not conflict with the values of the flags
- * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY, and FIND_ONLY_NS (defined in
- * tclNamesp.c).
- */
-
-#define CREATE_NS_IF_UNKNOWN 0x800
-
-/*
- *----------------------------------------------------------------
- * Data structures related to variables.   These are used primarily
- * in tclVar.c
- *----------------------------------------------------------------
- */
-
-/*
- * The following structure defines a variable trace, which is used to
- * invoke a specific C procedure whenever certain operations are performed
- * on a variable.
- */
-
-typedef struct VarTrace {
-    Tcl_VarTraceProc *traceProc;/* Procedure to call when operations given
-				 * by flags are performed on variable. */
-    ClientData clientData;	/* Argument to pass to proc. */
-    int flags;			/* What events the trace procedure is
-				 * interested in:  OR-ed combination of
-				 * TCL_TRACE_READS, TCL_TRACE_WRITES,
-				 * TCL_TRACE_UNSETS and TCL_TRACE_ARRAY. */
-    struct VarTrace *nextPtr;	/* Next in list of traces associated with
-				 * a particular variable. */
-} VarTrace;
-
-/*
- * When a variable trace is active (i.e. its associated procedure is
- * executing), one of the following structures is linked into a list
- * associated with the variable's interpreter.	The information in
- * the structure is needed in order for Tcl to behave reasonably
- * if traces are deleted while traces are active.
- */
-
-typedef struct ActiveVarTrace {
-    struct Var *varPtr;		/* Variable that's being traced. */
-    struct ActiveVarTrace *nextPtr;
-				/* Next in list of all active variable
-				 * traces for the interpreter, or NULL
-				 * if no more. */
-    VarTrace *nextTracePtr;	/* Next trace to check after current
-				 * trace procedure returns;  if this
-				 * trace gets deleted, must update pointer
-				 * to avoid using free'd memory. */
-} ActiveVarTrace;
-
-/*
- * The following structure describes an enumerative search in progress on
- * an array variable;  this are invoked with options to the "array"
- * command.
- */
-
-typedef struct ArraySearch {
-    int id;			/* Integer id used to distinguish among
-				 * multiple concurrent searches for the
-				 * same array. */
-    struct Var *varPtr;		/* Pointer to array variable that's being
-				 * searched. */
-    Tcl_HashSearch search;	/* Info kept by the hash module about
-				 * progress through the array. */
-    Tcl_HashEntry *nextEntry;	/* Non-null means this is the next element
-				 * to be enumerated (it's leftover from
-				 * the Tcl_FirstHashEntry call or from
-				 * an "array anymore" command).	 NULL
-				 * means must call Tcl_NextHashEntry
-				 * to get value to return. */
-    struct ArraySearch *nextPtr;/* Next in list of all active searches
-				 * for this variable, or NULL if this is
-				 * the last one. */
-} ArraySearch;
-
-/*
- * The structure below defines a variable, which associates a string name
- * with a Tcl_Obj value. These structures are kept in procedure call frames
- * (for local variables recognized by the compiler) or in the heap (for
- * global variables and any variable not known to the compiler). For each
- * Var structure in the heap, a hash table entry holds the variable name and
- * a pointer to the Var structure.
- */
-
-typedef struct Var {
-    union {
-	Tcl_Obj *objPtr;	/* The variable's object value. Used for 
-				 * scalar variables and array elements. */
-	Tcl_HashTable *tablePtr;/* For array variables, this points to
-				 * information about the hash table used
-				 * to implement the associative array. 
-				 * Points to malloc-ed data. */
-	struct Var *linkPtr;	/* If this is a global variable being
-				 * referred to in a procedure, or a variable
-				 * created by "upvar", this field points to
-				 * the referenced variable's Var struct. */
-    } value;
-    char *name;			/* NULL if the variable is in a hashtable,
-				 * otherwise points to the variable's
-				 * name. It is used, e.g., by TclLookupVar
-				 * and "info locals". The storage for the
-				 * characters of the name is not owned by
-				 * the Var and must not be freed when
-				 * freeing the Var. */
-    Namespace *nsPtr;		/* Points to the namespace that contains
-				 * this variable or NULL if the variable is
-				 * a local variable in a Tcl procedure. */
-    Tcl_HashEntry *hPtr;	/* If variable is in a hashtable, either the
-				 * hash table entry that refers to this
-				 * variable or NULL if the variable has been
-				 * detached from its hash table (e.g. an
-				 * array is deleted, but some of its
-				 * elements are still referred to in
-				 * upvars). NULL if the variable is not in a
-				 * hashtable. This is used to delete an
-				 * variable from its hashtable if it is no
-				 * longer needed. */
-    int refCount;		/* Counts number of active uses of this
-				 * variable, not including its entry in the
-				 * call frame or the hash table: 1 for each
-				 * additional variable whose linkPtr points
-				 * here, 1 for each nested trace active on
-				 * variable, and 1 if the variable is a 
-				 * namespace variable. This record can't be
-				 * deleted until refCount becomes 0. */
-    VarTrace *tracePtr;		/* First in list of all traces set for this
-				 * variable. */
-    ArraySearch *searchPtr;	/* First in list of all searches active
-				 * for this variable, or NULL if none. */
-    int flags;			/* Miscellaneous bits of information about
-				 * variable. See below for definitions. */
-} Var;
-
-/*
- * Flag bits for variables. The first three (VAR_SCALAR, VAR_ARRAY, and
- * VAR_LINK) are mutually exclusive and give the "type" of the variable.
- * VAR_UNDEFINED is independent of the variable's type. 
- *
- * VAR_SCALAR -			1 means this is a scalar variable and not
- *				an array or link. The "objPtr" field points
- *				to the variable's value, a Tcl object.
- * VAR_ARRAY -			1 means this is an array variable rather
- *				than a scalar variable or link. The
- *				"tablePtr" field points to the array's
- *				hashtable for its elements.
- * VAR_LINK -			1 means this Var structure contains a
- *				pointer to another Var structure that
- *				either has the real value or is itself
- *				another VAR_LINK pointer. Variables like
- *				this come about through "upvar" and "global"
- *				commands, or through references to variables
- *				in enclosing namespaces.
- * VAR_UNDEFINED -		1 means that the variable is in the process
- *				of being deleted. An undefined variable
- *				logically does not exist and survives only
- *				while it has a trace, or if it is a global
- *				variable currently being used by some
- *				procedure.
- * VAR_IN_HASHTABLE -		1 means this variable is in a hashtable and
- *				the Var structure is malloced. 0 if it is
- *				a local variable that was assigned a slot
- *				in a procedure frame by	the compiler so the
- *				Var storage is part of the call frame.
- * VAR_TRACE_ACTIVE -		1 means that trace processing is currently
- *				underway for a read or write access, so
- *				new read or write accesses should not cause
- *				trace procedures to be called and the
- *				variable can't be deleted.
- * VAR_ARRAY_ELEMENT -		1 means that this variable is an array
- *				element, so it is not legal for it to be
- *				an array itself (the VAR_ARRAY flag had
- *				better not be set).
- * VAR_NAMESPACE_VAR -		1 means that this variable was declared
- *				as a namespace variable. This flag ensures
- *				it persists until its namespace is
- *				destroyed or until the variable is unset;
- *				it will persist even if it has not been
- *				initialized and is marked undefined.
- *				The variable's refCount is incremented to
- *				reflect the "reference" from its namespace.
- *
- * The following additional flags are used with the CompiledLocal type
- * defined below:
- *
- * VAR_ARGUMENT -		1 means that this variable holds a procedure
- *				argument. 
- * VAR_TEMPORARY -		1 if the local variable is an anonymous
- *				temporary variable. Temporaries have a NULL
- *				name.
- * VAR_RESOLVED -		1 if name resolution has been done for this
- *				variable.
- */
-
-#define VAR_SCALAR		0x1
-#define VAR_ARRAY		0x2
-#define VAR_LINK		0x4
-#define VAR_UNDEFINED		0x8
-#define VAR_IN_HASHTABLE	0x10
-#define VAR_TRACE_ACTIVE	0x20
-#define VAR_ARRAY_ELEMENT	0x40
-#define VAR_NAMESPACE_VAR	0x80
-
-#define VAR_ARGUMENT		0x100
-#define VAR_TEMPORARY		0x200
-#define VAR_RESOLVED		0x400	
-
-/*
- * Macros to ensure that various flag bits are set properly for variables.
- * The ANSI C "prototypes" for these macros are:
- *
- * EXTERN void	TclSetVarScalar _ANSI_ARGS_((Var *varPtr));
- * EXTERN void	TclSetVarArray _ANSI_ARGS_((Var *varPtr));
- * EXTERN void	TclSetVarLink _ANSI_ARGS_((Var *varPtr));
- * EXTERN void	TclSetVarArrayElement _ANSI_ARGS_((Var *varPtr));
- * EXTERN void	TclSetVarUndefined _ANSI_ARGS_((Var *varPtr));
- * EXTERN void	TclClearVarUndefined _ANSI_ARGS_((Var *varPtr));
- */
-
-#define TclSetVarScalar(varPtr) \
-    (varPtr)->flags = ((varPtr)->flags & ~(VAR_ARRAY|VAR_LINK)) | VAR_SCALAR
-
-#define TclSetVarArray(varPtr) \
-    (varPtr)->flags = ((varPtr)->flags & ~(VAR_SCALAR|VAR_LINK)) | VAR_ARRAY
-
-#define TclSetVarLink(varPtr) \
-    (varPtr)->flags = ((varPtr)->flags & ~(VAR_SCALAR|VAR_ARRAY)) | VAR_LINK
-
-#define TclSetVarArrayElement(varPtr) \
-    (varPtr)->flags = ((varPtr)->flags & ~VAR_ARRAY) | VAR_ARRAY_ELEMENT
-
-#define TclSetVarUndefined(varPtr) \
-    (varPtr)->flags |= VAR_UNDEFINED
-
-#define TclClearVarUndefined(varPtr) \
-    (varPtr)->flags &= ~VAR_UNDEFINED
-
-/*
- * Macros to read various flag bits of variables.
- * The ANSI C "prototypes" for these macros are:
- *
- * EXTERN int	TclIsVarScalar _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarLink _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarArray _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarUndefined _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarArrayElement _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarTemporary _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarArgument _ANSI_ARGS_((Var *varPtr));
- * EXTERN int	TclIsVarResolved _ANSI_ARGS_((Var *varPtr));
- */
-    
-#define TclIsVarScalar(varPtr) \
-    ((varPtr)->flags & VAR_SCALAR)
-
-#define TclIsVarLink(varPtr) \
-    ((varPtr)->flags & VAR_LINK)
-
-#define TclIsVarArray(varPtr) \
-    ((varPtr)->flags & VAR_ARRAY)
-
-#define TclIsVarUndefined(varPtr) \
-    ((varPtr)->flags & VAR_UNDEFINED)
-
-#define TclIsVarArrayElement(varPtr) \
-    ((varPtr)->flags & VAR_ARRAY_ELEMENT)
-
-#define TclIsVarTemporary(varPtr) \
-    ((varPtr)->flags & VAR_TEMPORARY)
-    
-#define TclIsVarArgument(varPtr) \
-    ((varPtr)->flags & VAR_ARGUMENT)
-    
-#define TclIsVarResolved(varPtr) \
-    ((varPtr)->flags & VAR_RESOLVED)
-
-/*
- *----------------------------------------------------------------
- * Data structures related to procedures.  These are used primarily
- * in tclProc.c, tclCompile.c, and tclExecute.c.
- *----------------------------------------------------------------
- */
-
-/*
- * Forward declaration to prevent an error when the forward reference to
- * Command is encountered in the Proc and ImportRef types declared below.
- */
-
-struct Command;
-
-/*
- * The variable-length structure below describes a local variable of a
- * procedure that was recognized by the compiler. These variables have a
- * name, an element in the array of compiler-assigned local variables in the
- * procedure's call frame, and various other items of information. If the
- * local variable is a formal argument, it may also have a default value.
- * The compiler can't recognize local variables whose names are
- * expressions (these names are only known at runtime when the expressions
- * are evaluated) or local variables that are created as a result of an
- * "upvar" or "uplevel" command. These other local variables are kept
- * separately in a hash table in the call frame.
- */
-
-typedef struct CompiledLocal {
-    struct CompiledLocal *nextPtr;
-				/* Next compiler-recognized local variable
-				 * for this procedure, or NULL if this is
-				 * the last local. */
-    int nameLength;		/* The number of characters in local
-				 * variable's name. Used to speed up
-				 * variable lookups. */
-    int frameIndex;		/* Index in the array of compiler-assigned
-				 * variables in the procedure call frame. */
-    int flags;			/* Flag bits for the local variable. Same as
-				 * the flags for the Var structure above,
-				 * although only VAR_SCALAR, VAR_ARRAY, 
-				 * VAR_LINK, VAR_ARGUMENT, VAR_TEMPORARY, and
-				 * VAR_RESOLVED make sense. */
-    Tcl_Obj *defValuePtr;	/* Pointer to the default value of an
-				 * argument, if any. NULL if not an argument
-				 * or, if an argument, no default value. */
-    Tcl_ResolvedVarInfo *resolveInfo;
-				/* Customized variable resolution info
-				 * supplied by the Tcl_ResolveCompiledVarProc
-				 * associated with a namespace. Each variable
-				 * is marked by a unique ClientData tag
-				 * during compilation, and that same tag
-				 * is used to find the variable at runtime. */
-    char name[4];		/* Name of the local variable starts here.
-				 * If the name is NULL, this will just be
-				 * '\0'. The actual size of this field will
-				 * be large enough to hold the name. MUST
-				 * BE THE LAST FIELD IN THE STRUCTURE! */
-} CompiledLocal;
-
-/*
- * The structure below defines a command procedure, which consists of a
- * collection of Tcl commands plus information about arguments and other
- * local variables recognized at compile time.
- */
-
-typedef struct Proc {
-    struct Interp *iPtr;	  /* Interpreter for which this command
-				   * is defined. */
-    int refCount;		  /* Reference count: 1 if still present
-				   * in command table plus 1 for each call
-				   * to the procedure that is currently
-				   * active. This structure can be freed
-				   * when refCount becomes zero. */
-    struct Command *cmdPtr;	  /* Points to the Command structure for
-				   * this procedure. This is used to get
-				   * the namespace in which to execute
-				   * the procedure. */
-    Tcl_Obj *bodyPtr;		  /* Points to the ByteCode object for
-				   * procedure's body command. */
-    int numArgs;		  /* Number of formal parameters. */
-    int numCompiledLocals;	  /* Count of local variables recognized by
-				   * the compiler including arguments and
-				   * temporaries. */
-    CompiledLocal *firstLocalPtr; /* Pointer to first of the procedure's
-				   * compiler-allocated local variables, or
-				   * NULL if none. The first numArgs entries
-				   * in this list describe the procedure's
-				   * formal arguments. */
-    CompiledLocal *lastLocalPtr;  /* Pointer to the last allocated local
-				   * variable or NULL if none. This has
-				   * frame index (numCompiledLocals-1). */
-} Proc;
-
-/*
- * The structure below defines a command trace.	 This is used to allow Tcl
- * clients to find out whenever a command is about to be executed.
- */
-
-typedef struct Trace {
-    int level;			/* Only trace commands at nesting level
-				 * less than or equal to this. */
-    Tcl_CmdTraceProc *proc;	/* Procedure to call to trace command. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-    struct Trace *nextPtr;	/* Next in list of traces for this interp. */
-} Trace;
-
-/*
- * The structure below defines an entry in the assocData hash table which
- * is associated with an interpreter. The entry contains a pointer to a
- * function to call when the interpreter is deleted, and a pointer to
- * a user-defined piece of data.
- */
-
-typedef struct AssocData {
-    Tcl_InterpDeleteProc *proc;	/* Proc to call when deleting. */
-    ClientData clientData;	/* Value to pass to proc. */
-} AssocData;	
-
-/*
- * The structure below defines a call frame. A call frame defines a naming
- * context for a procedure call: its local naming scope (for local
- * variables) and its global naming scope (a namespace, perhaps the global
- * :: namespace). A call frame can also define the naming context for a
- * namespace eval or namespace inscope command: the namespace in which the
- * command's code should execute. The Tcl_CallFrame structures exist only
- * while procedures or namespace eval/inscope's are being executed, and
- * provide a kind of Tcl call stack.
- * 
- * WARNING!! The structure definition must be kept consistent with the
- * Tcl_CallFrame structure in tcl.h. If you change one, change the other.
- */
-
-typedef struct CallFrame {
-    Namespace *nsPtr;		/* Points to the namespace used to resolve
-				 * commands and global variables. */
-    int isProcCallFrame;	/* If nonzero, the frame was pushed to
-				 * execute a Tcl procedure and may have
-				 * local vars. If 0, the frame was pushed
-				 * to execute a namespace command and var
-				 * references are treated as references to
-				 * namespace vars; varTablePtr and
-				 * compiledLocals are ignored. */
-    int objc;			/* This and objv below describe the
-				 * arguments for this procedure call. */
-    Tcl_Obj *CONST *objv;	/* Array of argument objects. */
-    struct CallFrame *callerPtr;
-				/* Value of interp->framePtr when this
-				 * procedure was invoked (i.e. next higher
-				 * in stack of all active procedures). */
-    struct CallFrame *callerVarPtr;
-				/* Value of interp->varFramePtr when this
-				 * procedure was invoked (i.e. determines
-				 * variable scoping within caller). Same
-				 * as callerPtr unless an "uplevel" command
-				 * or something equivalent was active in
-				 * the caller). */
-    int level;			/* Level of this procedure, for "uplevel"
-				 * purposes (i.e. corresponds to nesting of
-				 * callerVarPtr's, not callerPtr's). 1 for
-				 * outermost procedure, 0 for top-level. */
-    Proc *procPtr;		/* Points to the structure defining the
-				 * called procedure. Used to get information
-				 * such as the number of compiled local
-				 * variables (local variables assigned
-				 * entries ["slots"] in the compiledLocals
-				 * array below). */
-    Tcl_HashTable *varTablePtr;	/* Hash table containing local variables not
-				 * recognized by the compiler, or created at
-				 * execution time through, e.g., upvar.
-				 * Initially NULL and created if needed. */
-    int numCompiledLocals;	/* Count of local variables recognized by
-				 * the compiler including arguments. */
-    Var* compiledLocals;	/* Points to the array of local variables
-				 * recognized by the compiler. The compiler
-				 * emits code that refers to these variables
-				 * using an index into this array. */
-} CallFrame;
-
-/*
- *----------------------------------------------------------------
- * Data structures and procedures related to TclHandles, which
- * are a very lightweight method of preserving enough information
- * to determine if an arbitrary malloc'd block has been deleted.
- *----------------------------------------------------------------
- */
-
-typedef VOID **TclHandle;
-
-TclHandle		TclHandleCreate _ANSI_ARGS_((VOID *ptr));
-void			TclHandleFree _ANSI_ARGS_((TclHandle handle));
-TclHandle		TclHandlePreserve _ANSI_ARGS_((TclHandle handle));
-void			TclHandleRelease _ANSI_ARGS_((TclHandle handle)); 
-
-/*
- *----------------------------------------------------------------
- * Data structures related to history.	 These are used primarily
- * in tclHistory.c
- *----------------------------------------------------------------
- */
-
-/*
- * The structure below defines one history event (a previously-executed
- * command that can be re-executed in whole or in part).
- */
-
-typedef struct {
-    char *command;		/* String containing previously-executed
-				 * command. */
-    int bytesAvl;		/* Total # of bytes available at *event (not
-				 * all are necessarily in use now). */
-} HistoryEvent;
-
-/*
- * The structure below defines a pending revision to the most recent
- * history event.  Changes are linked together into a list and applied
- * during the next call to Tcl_RecordHistory.  See the comments at the
- * beginning of tclHistory.c for information on revisions.
- */
-
-typedef struct HistoryRev {
-    int firstIndex;		/* Index of the first byte to replace in
-				 * current history event. */
-    int lastIndex;		/* Index of last byte to replace in
-				 * current history event. */
-    int newSize;		/* Number of bytes in newBytes. */
-    char *newBytes;		/* Replacement for the range given by
-				 * firstIndex and lastIndex (malloced). */
-    struct HistoryRev *nextPtr;	/* Next in chain of revisions to apply, or
-				 * NULL for end of list. */
-} HistoryRev;
-
-/*
- *----------------------------------------------------------------
- * Data structures related to expressions.  These are used only in
- * tclExpr.c.
- *----------------------------------------------------------------
- */
-
-/*
- * The data structure below defines a math function (e.g. sin or hypot)
- * for use in Tcl expressions.
- */
-
-#define MAX_MATH_ARGS 5
-typedef struct MathFunc {
-    int builtinFuncIndex;	/* If this is a builtin math function, its
-				 * index in the array of builtin functions.
-				 * (tclCompilation.h lists these indices.)
-				 * The value is -1 if this is a new function
-				 * defined by Tcl_CreateMathFunc. The value
-				 * is also -1 if a builtin function is
-				 * replaced by a Tcl_CreateMathFunc call. */
-    int numArgs;		/* Number of arguments for function. */
-    Tcl_ValueType argTypes[MAX_MATH_ARGS];
-				/* Acceptable types for each argument. */
-    Tcl_MathProc *proc;		/* Procedure that implements this function.
-				 * NULL if isBuiltinFunc is 1. */
-    ClientData clientData;	/* Additional argument to pass to the
-				 * function when invoking it. NULL if
-				 * isBuiltinFunc is 1. */
-} MathFunc;
-
-/*
- * These are a thin layer over TclpThreadKeyDataGet and TclpThreadKeyDataSet
- * when threads are used, or an emulation if there are no threads.  These
- * are really internal and Tcl clients should use Tcl_GetThreadData.
- */
-
-EXTERN VOID *TclThreadDataKeyGet _ANSI_ARGS_((Tcl_ThreadDataKey *keyPtr));
-EXTERN void TclThreadDataKeySet _ANSI_ARGS_((Tcl_ThreadDataKey *keyPtr, VOID *data));
-
-/*
- * This is a convenience macro used to initialize a thread local storage ptr.
- */
-#define TCL_TSD_INIT(keyPtr)	(ThreadSpecificData *)Tcl_GetThreadData((keyPtr), sizeof(ThreadSpecificData))
-
-
-#ifdef MAC_TCL
-typedef pascal void *(Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
-#else
-typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData));
-#endif
-
-/*
- *----------------------------------------------------------------
- * Data structures related to bytecode compilation and execution.
- * These are used primarily in tclCompile.c, tclExecute.c, and
- * tclBasic.c.
- *----------------------------------------------------------------
- */
-
-/*
- * Forward declaration to prevent errors when the forward references to
- * Tcl_Parse and CompileEnv are encountered in the procedure type
- * CompileProc declared below.
- */
-
-struct Tcl_Parse;
-struct CompileEnv;
-
-/*
- * The type of procedures called by the Tcl bytecode compiler to compile
- * commands. Pointers to these procedures are kept in the Command structure
- * describing each command. When a CompileProc returns, the interpreter's
- * result is set to error information, if any. In addition, the CompileProc
- * returns an integer value, which is one of the following:
- *
- * TCL_OK		Compilation completed normally.
- * TCL_ERROR		Compilation failed because of an error;
- *			the interpreter's result describes what went wrong.
- * TCL_OUT_LINE_COMPILE	Compilation failed because, e.g., the command is
- *			too complex for effective inline compilation. The
- *			CompileProc believes the command is legal but 
- *			should be compiled "out of line" by emitting code
- *			to invoke its command procedure at runtime.
- */
-
-#define TCL_OUT_LINE_COMPILE	(TCL_CONTINUE + 1)
-
-typedef int (CompileProc) _ANSI_ARGS_((Tcl_Interp *interp,
-	struct Tcl_Parse *parsePtr, struct CompileEnv *compEnvPtr));
-
-/*
- * The data structure defining the execution environment for ByteCode's.
- * There is one ExecEnv structure per Tcl interpreter. It holds the
- * evaluation stack that holds command operands and results. The stack grows
- * towards increasing addresses. The "stackTop" member is cached by
- * TclExecuteByteCode in a local variable: it must be set before calling
- * TclExecuteByteCode and will be restored by TclExecuteByteCode before it
- * returns.
- */
-
-typedef struct ExecEnv {
-    Tcl_Obj **stackPtr;		/* Points to the first item in the
-				 * evaluation stack on the heap. */
-    int stackTop;		/* Index of current top of stack; -1 when
-				 * the stack is empty. */
-    int stackEnd;		/* Index of last usable item in stack. */
-} ExecEnv;
-
-/*
- * The definitions for the LiteralTable and LiteralEntry structures. Each
- * interpreter contains a LiteralTable. It is used to reduce the storage
- * needed for all the Tcl objects that hold the literals of scripts compiled
- * by the interpreter. A literal's object is shared by all the ByteCodes
- * that refer to the literal. Each distinct literal has one LiteralEntry
- * entry in the LiteralTable. A literal table is a specialized hash table
- * that is indexed by the literal's string representation, which may contain
- * null characters.
- *
- * Note that we reduce the space needed for literals by sharing literal
- * objects both within a ByteCode (each ByteCode contains a local
- * LiteralTable) and across all an interpreter's ByteCodes (with the
- * interpreter's global LiteralTable).
- */
-
-typedef struct LiteralEntry {
-    struct LiteralEntry *nextPtr;	/* Points to next entry in this
-					 * hash bucket or NULL if end of
-					 * chain. */
-    Tcl_Obj *objPtr;			/* Points to Tcl object that
-					 * holds the literal's bytes and
-					 * length. */
-    int refCount;			/* If in an interpreter's global
-					 * literal table, the number of
-					 * ByteCode structures that share
-					 * the literal object; the literal
-					 * entry can be freed when refCount
-					 * drops to 0. If in a local literal
-					 * table, -1. */
-} LiteralEntry;
-
-typedef struct LiteralTable {
-    LiteralEntry **buckets;		/* Pointer to bucket array. Each
-					 * element points to first entry in
-					 * bucket's hash chain, or NULL. */
-    LiteralEntry *staticBuckets[TCL_SMALL_HASH_TABLE];
-					/* Bucket array used for small
-					 * tables to avoid mallocs and
-					 * frees. */
-    int numBuckets;			/* Total number of buckets allocated
-					 * at **buckets. */
-    int numEntries;			/* Total number of entries present
-					 * in table. */
-    int rebuildSize;			/* Enlarge table when numEntries
-					 * gets to be this large. */
-    int mask;				/* Mask value used in hashing
-					 * function. */
-} LiteralTable;
-
-/*
- * The following structure defines for each Tcl interpreter various
- * statistics-related information about the bytecode compiler and
- * interpreter's operation in that interpreter.
- */
-
-#ifdef TCL_COMPILE_STATS
-typedef struct ByteCodeStats {
-    long numExecutions;		  /* Number of ByteCodes executed. */
-    long numCompilations;	  /* Number of ByteCodes created. */
-    long numByteCodesFreed;	  /* Number of ByteCodes destroyed. */
-    long instructionCount[256];	  /* Number of times each instruction was
-				   * executed. */
-
-    double totalSrcBytes;	  /* Total source bytes ever compiled. */
-    double totalByteCodeBytes;	  /* Total bytes for all ByteCodes. */
-    double currentSrcBytes;	  /* Src bytes for all current ByteCodes. */
-    double currentByteCodeBytes;  /* Code bytes in all current ByteCodes. */
-
-    long srcCount[32];		  /* Source size distribution: # of srcs of
-				   * size [2**(n-1)..2**n), n in [0..32). */
-    long byteCodeCount[32];	  /* ByteCode size distribution. */
-    long lifetimeCount[32];	  /* ByteCode lifetime distribution (ms). */
-    
-    double currentInstBytes;	  /* Instruction bytes-current ByteCodes. */
-    double currentLitBytes;	  /* Current literal bytes. */
-    double currentExceptBytes;	  /* Current exception table bytes. */
-    double currentAuxBytes;	  /* Current auxiliary information bytes. */
-    double currentCmdMapBytes;	  /* Current src<->code map bytes. */
-    
-    long numLiteralsCreated;	  /* Total literal objects ever compiled. */
-    double totalLitStringBytes;	  /* Total string bytes in all literals. */
-    double currentLitStringBytes; /* String bytes in current literals. */
-    long literalCount[32];	  /* Distribution of literal string sizes. */
-} ByteCodeStats;
-#endif /* TCL_COMPILE_STATS */
-
-/*
- *----------------------------------------------------------------
- * Data structures related to commands.
- *----------------------------------------------------------------
- */
-
-/*
- * An imported command is created in an namespace when it imports a "real"
- * command from another namespace. An imported command has a Command
- * structure that points (via its ClientData value) to the "real" Command
- * structure in the source namespace's command table. The real command
- * records all the imported commands that refer to it in a list of ImportRef
- * structures so that they can be deleted when the real command is deleted.  */
-
-typedef struct ImportRef {
-    struct Command *importedCmdPtr;
-				/* Points to the imported command created in
-				 * an importing namespace; this command
-				 * redirects its invocations to the "real"
-				 * command. */
-    struct ImportRef *nextPtr;	/* Next element on the linked list of
-				 * imported commands that refer to the
-				 * "real" command. The real command deletes
-				 * these imported commands on this list when
-				 * it is deleted. */
-} ImportRef;
-
-/*
- * Data structure used as the ClientData of imported commands: commands
- * created in an namespace when it imports a "real" command from another
- * namespace.
- */
-
-typedef struct ImportedCmdData {
-    struct Command *realCmdPtr;	/* "Real" command that this imported command
-				 * refers to. */
-    struct Command *selfPtr;	/* Pointer to this imported command. Needed
-				 * only when deleting it in order to remove
-				 * it from the real command's linked list of
-				 * imported commands that refer to it. */
-} ImportedCmdData;
-
-/*
- * A Command structure exists for each command in a namespace. The
- * Tcl_Command opaque type actually refers to these structures.
- */
-
-typedef struct Command {
-    Tcl_HashEntry *hPtr;	/* Pointer to the hash table entry that
-				 * refers to this command. The hash table is
-				 * either a namespace's command table or an
-				 * interpreter's hidden command table. This
-				 * pointer is used to get a command's name
-				 * from its Tcl_Command handle. NULL means
-				 * that the hash table entry has been
-				 * removed already (this can happen if
-				 * deleteProc causes the command to be
-				 * deleted or recreated). */
-    Namespace *nsPtr;		/* Points to the namespace containing this
-				 * command. */
-    int refCount;		/* 1 if in command hashtable plus 1 for each
-				 * reference from a CmdName Tcl object
-				 * representing a command's name in a
-				 * ByteCode instruction sequence. This
-				 * structure can be freed when refCount
-				 * becomes zero. */
-    int cmdEpoch;		/* Incremented to invalidate any references
-				 * that point to this command when it is
-				 * renamed, deleted, hidden, or exposed. */
-    CompileProc *compileProc;	/* Procedure called to compile command. NULL
-				 * if no compile proc exists for command. */
-    Tcl_ObjCmdProc *objProc;	/* Object-based command procedure. */
-    ClientData objClientData;	/* Arbitrary value passed to object proc. */
-    Tcl_CmdProc *proc;		/* String-based command procedure. */
-    ClientData clientData;	/* Arbitrary value passed to string proc. */
-    Tcl_CmdDeleteProc *deleteProc;
-				/* Procedure invoked when deleting command
-				 * to, e.g., free all client data. */
-    ClientData deleteData;	/* Arbitrary value passed to deleteProc. */
-    int deleted;		/* Means that the command is in the process
-				 * of being deleted (its deleteProc is
-				 * currently executing). Other attempts to
-				 * delete the command should be ignored. */
-    ImportRef *importRefPtr;	/* List of each imported Command created in
-				 * another namespace when this command is
-				 * imported. These imported commands
-				 * redirect invocations back to this
-				 * command. The list is used to remove all
-				 * those imported commands when deleting
-				 * this "real" command. */
-} Command;
-
-/*
- *----------------------------------------------------------------
- * Data structures related to name resolution procedures.
- *----------------------------------------------------------------
- */
-
-/*
- * The interpreter keeps a linked list of name resolution schemes.
- * The scheme for a namespace is consulted first, followed by the
- * list of schemes in an interpreter, followed by the default
- * name resolution in Tcl.  Schemes are added/removed from the
- * interpreter's list by calling Tcl_AddInterpResolver and
- * Tcl_RemoveInterpResolver.
- */
-
-typedef struct ResolverScheme {
-    char *name;			/* Name identifying this scheme. */
-    Tcl_ResolveCmdProc *cmdResProc;
-				/* Procedure handling command name
-				 * resolution. */
-    Tcl_ResolveVarProc *varResProc;
-				/* Procedure handling variable name
-				 * resolution for variables that
-				 * can only be handled at runtime. */
-    Tcl_ResolveCompiledVarProc *compiledVarResProc;
-				/* Procedure handling variable name
-				 * resolution at compile time. */
-
-    struct ResolverScheme *nextPtr;
-				/* Pointer to next record in linked list. */
-} ResolverScheme;
-
-/*
- *----------------------------------------------------------------
- * This structure defines an interpreter, which is a collection of
- * commands plus other state information related to interpreting
- * commands, such as variable storage. Primary responsibility for
- * this data structure is in tclBasic.c, but almost every Tcl
- * source file uses something in here.
- *----------------------------------------------------------------
- */
-
-typedef struct Interp {
-
-    /*
-     * Note:  the first three fields must match exactly the fields in
-     * a Tcl_Interp struct (see tcl.h).	 If you change one, be sure to
-     * change the other.
-     *
-     * The interpreter's result is held in both the string and the
-     * objResultPtr fields. These fields hold, respectively, the result's
-     * string or object value. The interpreter's result is always in the
-     * result field if that is non-empty, otherwise it is in objResultPtr.
-     * The two fields are kept consistent unless some C code sets
-     * interp->result directly. Programs should not access result and
-     * objResultPtr directly; instead, they should always get and set the
-     * result using procedures such as Tcl_SetObjResult, Tcl_GetObjResult,
-     * and Tcl_GetStringResult. See the SetResult man page for details.
-     */
-
-    char *result;		/* If the last command returned a string
-				 * result, this points to it. Should not be
-				 * accessed directly; see comment above. */
-    Tcl_FreeProc *freeProc;	/* Zero means a string result is statically
-				 * allocated. TCL_DYNAMIC means string
-				 * result was allocated with ckalloc and
-				 * should be freed with ckfree. Other values
-				 * give address of procedure to invoke to
-				 * free the string result. Tcl_Eval must
-				 * free it before executing next command. */
-    int errorLine;		/* When TCL_ERROR is returned, this gives
-				 * the line number in the command where the
-				 * error occurred (1 means first line). */
-    struct TclStubs *stubTable;
-				/* Pointer to the exported Tcl stub table.
-				 * On previous versions of Tcl this is a
-				 * pointer to the objResultPtr or a pointer
-				 * to a buckets array in a hash table. We
-				 * therefore have to do some careful checking
-				 * before we can use this. */
-
-    TclHandle handle;		/* Handle used to keep track of when this
-				 * interp is deleted. */
-
-    Namespace *globalNsPtr;	/* The interpreter's global namespace. */
-    Tcl_HashTable *hiddenCmdTablePtr;
-				/* Hash table used by tclBasic.c to keep
-				 * track of hidden commands on a per-interp
-				 * basis. */
-    ClientData interpInfo;	/* Information used by tclInterp.c to keep
-				 * track of master/slave interps on
-				 * a per-interp basis. */
-    Tcl_HashTable mathFuncTable;/* Contains all the math functions currently
-				 * defined for the interpreter.	 Indexed by
-				 * strings (function names); values have
-				 * type (MathFunc *). */
-
-
-
-    /*
-     * Information related to procedures and variables. See tclProc.c
-     * and tclvar.c for usage.
-     */
-
-    int numLevels;		/* Keeps track of how many nested calls to
-				 * Tcl_Eval are in progress for this
-				 * interpreter.	 It's used to delay deletion
-				 * of the table until all Tcl_Eval
-				 * invocations are completed. */
-    int maxNestingDepth;	/* If numLevels exceeds this value then Tcl
-				 * assumes that infinite recursion has
-				 * occurred and it generates an error. */
-    CallFrame *framePtr;	/* Points to top-most in stack of all nested
-				 * procedure invocations.  NULL means there
-				 * are no active procedures. */
-    CallFrame *varFramePtr;	/* Points to the call frame whose variables
-				 * are currently in use (same as framePtr
-				 * unless an "uplevel" command is
-				 * executing). NULL means no procedure is
-				 * active or "uplevel 0" is executing. */
-    ActiveVarTrace *activeTracePtr;
-				/* First in list of active traces for
-				 * interp, or NULL if no active traces. */
-    int returnCode;		/* Completion code to return if current
-				 * procedure exits with TCL_RETURN code. */
-    char *errorInfo;		/* Value to store in errorInfo if returnCode
-				 * is TCL_ERROR.  Malloc'ed, may be NULL */
-    char *errorCode;		/* Value to store in errorCode if returnCode
-				 * is TCL_ERROR.  Malloc'ed, may be NULL */
-
-    /*
-     * Information used by Tcl_AppendResult to keep track of partial
-     * results.	 See Tcl_AppendResult code for details.
-     */
-
-    char *appendResult;		/* Storage space for results generated
-				 * by Tcl_AppendResult.	 Malloc-ed.  NULL
-				 * means not yet allocated. */
-    int appendAvl;		/* Total amount of space available at
-				 * partialResult. */
-    int appendUsed;		/* Number of non-null bytes currently
-				 * stored at partialResult. */
-
-    /*
-     * A cache of compiled regular expressions.	 See Tcl_RegExpCompile
-     * in tclUtil.c for details.  THIS CACHE IS OBSOLETE and is only
-     * retained for backward compatibility with Tcl_RegExpCompile.
-     * New code should use the object interface so the Tcl_Obj caches
-     * the compiled expression.
-     */
-
-#define NUM_REGEXPS 5
-    char *patterns[NUM_REGEXPS];/* Strings corresponding to compiled
-				 * regular expression patterns.	 NULL
-				 * means that this slot isn't used.
-				 * Malloc-ed. */
-    int patLengths[NUM_REGEXPS];/* Number of non-null characters in
-				 * corresponding entry in patterns.
-				 * -1 means entry isn't used. */
-    struct TclRegexp *regexps[NUM_REGEXPS];
-				/* Compiled forms of above strings.  Also
-				 * malloc-ed, or NULL if not in use yet. */
-
-    /*
-     * Information about packages.  Used only in tclPkg.c.
-     */
-
-    Tcl_HashTable packageTable;	/* Describes all of the packages loaded
-				 * in or available to this interpreter.
-				 * Keys are package names, values are
-				 * (Package *) pointers. */
-    char *packageUnknown;	/* Command to invoke during "package
-				 * require" commands for packages that
-				 * aren't described in packageTable. 
-				 * Malloc'ed, may be NULL. */
-
-    /*
-     * Miscellaneous information:
-     */
-
-    int cmdCount;		/* Total number of times a command procedure
-				 * has been called for this interpreter. */
-    int evalFlags;		/* Flags to control next call to Tcl_Eval.
-				 * Normally zero, but may be set before
-				 * calling Tcl_Eval.  See below for valid
-				 * values. */
-    int termOffset;		/* Offset of character just after last one
-				 * compiled or executed by Tcl_EvalObj. */
-    LiteralTable literalTable;	/* Contains LiteralEntry's describing all
-				 * Tcl objects holding literals of scripts
-				 * compiled by the interpreter. Indexed by
-				 * the string representations of literals.
-				 * Used to avoid creating duplicate
-				 * objects. */
-    int compileEpoch;		/* Holds the current "compilation epoch"
-				 * for this interpreter. This is
-				 * incremented to invalidate existing
-				 * ByteCodes when, e.g., a command with a
-				 * compile procedure is redefined. */
-    Proc *compiledProcPtr;	/* If a procedure is being compiled, a
-				 * pointer to its Proc structure; otherwise,
-				 * this is NULL. Set by ObjInterpProc in
-				 * tclProc.c and used by tclCompile.c to
-				 * process local variables appropriately. */
-    ResolverScheme *resolverPtr;
-				/* Linked list of name resolution schemes
-				 * added to this interpreter.  Schemes
-				 * are added/removed by calling
-				 * Tcl_AddInterpResolvers and
-				 * Tcl_RemoveInterpResolver. */
-    char *scriptFile;		/* NULL means there is no nested source
-				 * command active;  otherwise this points to
-				 * the name of the file being sourced (it's
-				 * not malloc-ed:  it points to an argument
-				 * to Tcl_EvalFile. */
-    int flags;			/* Various flag bits.  See below. */
-    long randSeed;		/* Seed used for rand() function. */
-    Trace *tracePtr;		/* List of traces for this interpreter. */
-    Tcl_HashTable *assocData;	/* Hash table for associating data with
-				 * this interpreter. Cleaned up when
-				 * this interpreter is deleted. */
-    struct ExecEnv *execEnvPtr;	/* Execution environment for Tcl bytecode
-				 * execution. Contains a pointer to the
-				 * Tcl evaluation stack. */
-    Tcl_Obj *emptyObjPtr;	/* Points to an object holding an empty
-				 * string. Returned by Tcl_ObjSetVar2 when
-				 * variable traces change a variable in a
-				 * gross way. */
-    char resultSpace[TCL_RESULT_SIZE+1];
-				/* Static space holding small results. */
-    Tcl_Obj *objResultPtr;	/* If the last command returned an object
-				 * result, this points to it. Should not be
-				 * accessed directly; see comment above. */
-    Tcl_ThreadId threadId;	/* ID of thread that owns the interpreter */
-
-    /*
-     * Statistical information about the bytecode compiler and interpreter's
-     * operation.
-     */
-
-#ifdef TCL_COMPILE_STATS
-    ByteCodeStats stats;	/* Holds compilation and execution
-				 * statistics for this interpreter. */
-#endif /* TCL_COMPILE_STATS */	  
-} Interp;
-
-/*
- * EvalFlag bits for Interp structures:
- *
- * TCL_BRACKET_TERM	1 means that the current script is terminated by
- *			a close bracket rather than the end of the string.
- * TCL_ALLOW_EXCEPTIONS	1 means it's OK for the script to terminate with
- *			a code other than TCL_OK or TCL_ERROR;	0 means
- *			codes other than these should be turned into errors.
- */
-
-#define TCL_BRACKET_TERM	  1
-#define TCL_ALLOW_EXCEPTIONS	  4
-
-/*
- * Flag bits for Interp structures:
- *
- * DELETED:		Non-zero means the interpreter has been deleted:
- *			don't process any more commands for it, and destroy
- *			the structure as soon as all nested invocations of
- *			Tcl_Eval are done.
- * ERR_IN_PROGRESS:	Non-zero means an error unwind is already in
- *			progress. Zero means a command proc has been
- *			invoked since last error occured.
- * ERR_ALREADY_LOGGED:	Non-zero means information has already been logged
- *			in $errorInfo for the current Tcl_Eval instance,
- *			so Tcl_Eval needn't log it (used to implement the
- *			"error message log" command).
- * ERROR_CODE_SET:	Non-zero means that Tcl_SetErrorCode has been
- *			called to record information for the current
- *			error.	Zero means Tcl_Eval must clear the
- *			errorCode variable if an error is returned.
- * EXPR_INITIALIZED:	Non-zero means initialization specific to
- *			expressions has	been carried out.
- * DONT_COMPILE_CMDS_INLINE: Non-zero means that the bytecode compiler
- *			should not compile any commands into an inline
- *			sequence of instructions. This is set 1, for
- *			example, when command traces are requested.
- * RAND_SEED_INITIALIZED: Non-zero means that the randSeed value of the
- *			interp has not be initialized.	This is set 1
- *			when we first use the rand() or srand() functions.
- * SAFE_INTERP:		Non zero means that the current interp is a
- *			safe interp (ie it has only the safe commands
- *			installed, less priviledge than a regular interp).
- * USE_EVAL_DIRECT:	Non-zero means don't use the compiler or byte-code
- *			interpreter; instead, have Tcl_EvalObj call
- *			Tcl_EvalEx. Used primarily for testing the
- *			new parser.
- */
-
-#define DELETED				    1
-#define ERR_IN_PROGRESS			    2
-#define ERR_ALREADY_LOGGED		    4
-#define ERROR_CODE_SET			    8
-#define EXPR_INITIALIZED		 0x10
-#define DONT_COMPILE_CMDS_INLINE	 0x20
-#define RAND_SEED_INITIALIZED		 0x40
-#define SAFE_INTERP			 0x80
-#define USE_EVAL_DIRECT			0x100
-
-/*
- *----------------------------------------------------------------
- * Data structures related to command parsing. These are used in
- * tclParse.c and its clients.
- *----------------------------------------------------------------
- */
-
-/*
- * The following data structure is used by various parsing procedures
- * to hold information about where to store the results of parsing
- * (e.g. the substituted contents of a quoted argument, or the result
- * of a nested command).  At any given time, the space available
- * for output is fixed, but a procedure may be called to expand the
- * space available if the current space runs out.
- */
-
-typedef struct ParseValue {
-    char *buffer;		/* Address of first character in
-				 * output buffer. */
-    char *next;			/* Place to store next character in
-				 * output buffer. */
-    char *end;			/* Address of the last usable character
-				 * in the buffer. */
-    void (*expandProc) _ANSI_ARGS_((struct ParseValue *pvPtr, int needed));
-				/* Procedure to call when space runs out;
-				 * it will make more space. */
-    ClientData clientData;	/* Arbitrary information for use of
-				 * expandProc. */
-} ParseValue;
-
-
-/*
- * Maximum number of levels of nesting permitted in Tcl commands (used
- * to catch infinite recursion).
- */
-
-#define MAX_NESTING_DEPTH	1000
-
-/*
- * The macro below is used to modify a "char" value (e.g. by casting
- * it to an unsigned character) so that it can be used safely with
- * macros such as isspace.
- */
-
-#define UCHAR(c) ((unsigned char) (c))
-
-/*
- * This macro is used to determine the offset needed to safely allocate any
- * data structure in memory. Given a starting offset or size, it "rounds up"
- * or "aligns" the offset to the next 8-byte boundary so that any data
- * structure can be placed at the resulting offset without fear of an
- * alignment error.
- *
- * WARNING!! DO NOT USE THIS MACRO TO ALIGN POINTERS: it will produce
- * the wrong result on platforms that allocate addresses that are divisible
- * by 4 or 2. Only use it for offsets or sizes.
- */
-
-#define TCL_ALIGN(x) (((int)(x) + 7) & ~7)
-
-/*
- * The following macros are used to specify the runtime platform
- * setting of the tclPlatform variable.
- */
-
-typedef enum {
-    TCL_PLATFORM_UNIX,		/* Any Unix-like OS. */
-    TCL_PLATFORM_MAC,		/* MacOS. */
-    TCL_PLATFORM_WINDOWS	/* Any Microsoft Windows OS. */
-} TclPlatformType;
-
-/*
- * Flags for TclInvoke:
- *
- * TCL_INVOKE_HIDDEN		Invoke a hidden command; if not set,
- *				invokes an exposed command.
- * TCL_INVOKE_NO_UNKNOWN	If set, "unknown" is not invoked if
- *				the command to be invoked is not found.
- *				Only has an effect if invoking an exposed
- *				command, i.e. if TCL_INVOKE_HIDDEN is not
- *				also set.
- * TCL_INVOKE_NO_TRACEBACK	Does not record traceback information if
- *				the invoked command returns an error.  Used
- *				if the caller plans on recording its own
- *				traceback information.
- */
-
-#define	TCL_INVOKE_HIDDEN	(1<<0)
-#define TCL_INVOKE_NO_UNKNOWN	(1<<1)
-#define TCL_INVOKE_NO_TRACEBACK	(1<<2)
-
-/*
- * The structure used as the internal representation of Tcl list
- * objects. This is an array of pointers to the element objects. This array
- * is grown (reallocated and copied) as necessary to hold all the list's
- * element pointers. The array might contain more slots than currently used
- * to hold all element pointers. This is done to make append operations
- * faster.
- */
-
-typedef struct List {
-    int maxElemCount;		/* Total number of element array slots. */
-    int elemCount;		/* Current number of list elements. */
-    Tcl_Obj **elements;		/* Array of pointers to element objects. */
-} List;
-
-
-/*
- * The following types are used for getting and storing platform-specific
- * file attributes in tclFCmd.c and the various platform-versions of
- * that file. This is done to have as much common code as possible
- * in the file attributes code. For more information about the callbacks,
- * see TclFileAttrsCmd in tclFCmd.c.
- */
-
-typedef int (TclGetFileAttrProc) _ANSI_ARGS_((Tcl_Interp *interp,
-	int objIndex, CONST char *fileName, Tcl_Obj **attrObjPtrPtr));
-typedef int (TclSetFileAttrProc) _ANSI_ARGS_((Tcl_Interp *interp,
-	int objIndex, CONST char *fileName, Tcl_Obj *attrObjPtr));
-
-typedef struct TclFileAttrProcs {
-    TclGetFileAttrProc *getProc;	/* The procedure for getting attrs. */
-    TclSetFileAttrProc *setProc;	/* The procedure for setting attrs. */
-} TclFileAttrProcs;
-
-/*
- * Opaque handle used in pipeline routines to encapsulate platform-dependent
- * state. 
- */
-
-typedef struct TclFile_ *TclFile;
-    
-/*
- *----------------------------------------------------------------
- * Data structures related to hooking 'TclStat(...)' and
- * 'TclAccess(...)'.
- *----------------------------------------------------------------
- */
-
-typedef struct stat TclStat_;
-typedef int (TclStatProc_) _ANSI_ARGS_((CONST char *path, TclStat_ *buf));
-typedef int (TclAccessProc_) _ANSI_ARGS_((CONST char *path, int mode));
-typedef Tcl_Channel (TclOpenFileChannelProc_) _ANSI_ARGS_((Tcl_Interp *interp,
-	char *fileName, char *modeString,
-	int permissions));
-
-typedef int (*TclCmdProcType) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int argc, char *argv[]));
-typedef int (*TclObjCmdProcType) _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int objc, struct Tcl_Obj * CONST objv[]));
-
-/*
- * Opaque names for platform specific types.
- */
-
-typedef struct TclpTime_t_ *TclpTime_t;
-
-/*
- *----------------------------------------------------------------
- * Variables shared among Tcl modules but not used by the outside world.
- *----------------------------------------------------------------
- */
-
-extern Tcl_Time			tclBlockTime;
-extern int			tclBlockTimeSet;
-extern char *			tclExecutableName;
-extern char *			tclNativeExecutableName;
-extern char *			tclDefaultEncodingDir;
-extern Tcl_ChannelType		tclFileChannelType;
-extern char *			tclMemDumpFileName;
-extern TclPlatformType		tclPlatform;
-extern char *			tclpFileAttrStrings[];
-extern CONST TclFileAttrProcs	tclpFileAttrProcs[];
-
-/*
- * Variables denoting the Tcl object types defined in the core.
- */
-
-extern Tcl_ObjType	tclBooleanType;
-extern Tcl_ObjType	tclByteArrayType;
-extern Tcl_ObjType	tclByteCodeType;
-extern Tcl_ObjType	tclDoubleType;
-extern Tcl_ObjType	tclIntType;
-extern Tcl_ObjType	tclListType;
-extern Tcl_ObjType	tclProcBodyType;
-extern Tcl_ObjType	tclStringType;
-
-/*
- * The head of the list of free Tcl objects, and the total number of Tcl
- * objects ever allocated and freed.
- */
-
-extern Tcl_Obj *	tclFreeObjList;
-
-#ifdef TCL_COMPILE_STATS
-extern long		tclObjsAlloced;
-extern long		tclObjsFreed;
-#endif /* TCL_COMPILE_STATS */
-
-/*
- * Pointer to a heap-allocated string of length zero that the Tcl core uses
- * as the value of an empty string representation for an object. This value
- * is shared by all new objects allocated by Tcl_NewObj.
- */
-
-extern char *		tclEmptyStringRep;
-
-/*
- *----------------------------------------------------------------
- * Procedures shared among Tcl modules but not used by the outside
- * world:
- *----------------------------------------------------------------
- */
-
-EXTERN int		TclAccess _ANSI_ARGS_((CONST char *path,
-			    int mode));
-EXTERN int		TclAccessDeleteProc _ANSI_ARGS_((TclAccessProc_ *proc));
-EXTERN int		TclAccessInsertProc _ANSI_ARGS_((TclAccessProc_ *proc));
-EXTERN void		TclAllocateFreeObjects _ANSI_ARGS_((void));
-EXTERN int		TclArraySet _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *arrayNameObj, Tcl_Obj *arrayElemObj));
-EXTERN int		TclCleanupChildren _ANSI_ARGS_((Tcl_Interp *interp,
-			    int numPids, Tcl_Pid *pidPtr,
-			    Tcl_Channel errorChan));
-EXTERN void		TclCleanupCommand _ANSI_ARGS_((Command *cmdPtr));
-EXTERN int		TclCopyChannel _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Channel inChan, Tcl_Channel outChan,
-			    int toRead, Tcl_Obj *cmdPtr));
-/*
- * TclCreatePipeline unofficially exported for use by BLT.
- */
-EXTERN int		TclCreatePipeline _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv, Tcl_Pid **pidArrayPtr,
-			    TclFile *inPipePtr, TclFile *outPipePtr,
-			    TclFile *errFilePtr));
-EXTERN int		TclCreateProc _ANSI_ARGS_((Tcl_Interp *interp,
-			    Namespace *nsPtr, char *procName,
-			    Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr,
-			    Proc **procPtrPtr));
-EXTERN void		TclDeleteCompiledLocalVars _ANSI_ARGS_((
-			    Interp *iPtr, CallFrame *framePtr));
-EXTERN void		TclDeleteVars _ANSI_ARGS_((Interp *iPtr,
-			    Tcl_HashTable *tablePtr));
-EXTERN int		TclDoGlob _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *separators, Tcl_DString *headPtr,
-			    char *tail));
-EXTERN void		TclDumpMemoryInfo _ANSI_ARGS_((FILE *outFile));
-EXTERN void		TclExpandTokenArray _ANSI_ARGS_((
-			    Tcl_Parse *parsePtr));
-EXTERN void		TclExprFloatError _ANSI_ARGS_((Tcl_Interp *interp,
-			    double value));
-EXTERN int		TclFileAttrsCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-EXTERN int		TclFileCopyCmd _ANSI_ARGS_((Tcl_Interp *interp, 
-			    int argc, char **argv)) ;
-EXTERN int		TclFileDeleteCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv));
-EXTERN int		TclFileMakeDirsCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv)) ;
-EXTERN int		TclFileRenameCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv)) ;
-EXTERN void		TclFinalizeAllocSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeCompExecEnv _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeCondition _ANSI_ARGS_((
-			    Tcl_Condition *condPtr));
-EXTERN void		TclFinalizeCompilation _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeEncodingSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeEnvironment _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeExecution _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeIOSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeLoad _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeMemorySubsystem _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeMutex _ANSI_ARGS_((Tcl_Mutex *mutex));
-EXTERN void		TclFinalizeNotifier _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeSynchronization _ANSI_ARGS_((void));
-EXTERN void		TclFinalizeThreadData _ANSI_ARGS_((void));
-EXTERN void		TclFindEncodings _ANSI_ARGS_((CONST char *argv0));
-EXTERN Proc *		TclFindProc _ANSI_ARGS_((Interp *iPtr,
-			    char *procName));
-EXTERN int		TclFormatInt _ANSI_ARGS_((char *buffer, long n));
-EXTERN void		TclFreePackageInfo _ANSI_ARGS_((Interp *iPtr));
-EXTERN int		TclGetDate _ANSI_ARGS_((char *p,
-			    unsigned long now, long zone,
-			    unsigned long *timePtr));
-EXTERN Tcl_Obj *	TclGetElementOfIndexedArray _ANSI_ARGS_((
-			    Tcl_Interp *interp, int localIndex,
-			    Tcl_Obj *elemPtr, int leaveErrorMsg));
-EXTERN char *		TclGetExtension _ANSI_ARGS_((char *name));
-EXTERN int		TclGetFrame _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, CallFrame **framePtrPtr));
-EXTERN TclCmdProcType	TclGetInterpProc _ANSI_ARGS_((void));
-EXTERN int		TclGetIntForIndex _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr, int endValue, int *indexPtr));
-EXTERN Tcl_Obj *	TclGetIndexedScalar _ANSI_ARGS_((Tcl_Interp *interp,
-			    int localIndex, int leaveErrorMsg));
-EXTERN Tcl_Obj *	TclGetLibraryPath _ANSI_ARGS_((void));
-EXTERN int		TclGetLong _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, long *longPtr));
-EXTERN int		TclGetLoadedPackages _ANSI_ARGS_((
-			    Tcl_Interp *interp, char *targetName));
-EXTERN int		TclGetNamespaceForQualName _ANSI_ARGS_((
-			    Tcl_Interp *interp, char *qualName,
-			    Namespace *cxtNsPtr, int flags,
-			    Namespace **nsPtrPtr, Namespace **altNsPtrPtr,
-			    Namespace **actualCxtPtrPtr,
-			    char **simpleNamePtr));
-EXTERN TclObjCmdProcType TclGetObjInterpProc _ANSI_ARGS_((void));
-EXTERN int		TclGetOpenMode _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, int *seekFlagPtr));
-EXTERN Tcl_Command	TclGetOriginalCommand _ANSI_ARGS_((
-			    Tcl_Command command));
-EXTERN int		TclGlob _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *pattern, int noComplain));
-EXTERN int		TclGlobalInvoke _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv, int flags));
-EXTERN int		TclGuessPackageName _ANSI_ARGS_((char *fileName,
-			    Tcl_DString *bufPtr));
-EXTERN int		TclHideUnsafeCommands _ANSI_ARGS_((
-			    Tcl_Interp *interp));
-EXTERN int		TclInExit _ANSI_ARGS_((void));
-EXTERN Tcl_Obj *	TclIncrElementOfIndexedArray _ANSI_ARGS_((
-			    Tcl_Interp *interp, int localIndex,
-			    Tcl_Obj *elemPtr, long incrAmount));
-EXTERN Tcl_Obj *	TclIncrIndexedScalar _ANSI_ARGS_((
-			    Tcl_Interp *interp, int localIndex,
-			    long incrAmount));
-EXTERN Tcl_Obj *	TclIncrVar2 _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr,
-			    long incrAmount, int flags));
-EXTERN void		TclInitAlloc _ANSI_ARGS_((void));
-EXTERN void		TclInitCompiledLocals _ANSI_ARGS_((
-			    Tcl_Interp *interp, CallFrame *framePtr,
-			    Namespace *nsPtr));
-EXTERN void		TclInitDbCkalloc _ANSI_ARGS_((void));
-EXTERN void		TclInitEncodingSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclInitIOSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclInitNamespaceSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclInitNotifier _ANSI_ARGS_((void));
-EXTERN void		TclInitObjSubsystem _ANSI_ARGS_((void));
-EXTERN void		TclInitSubsystems _ANSI_ARGS_((CONST char *argv0));
-EXTERN int		TclInvoke _ANSI_ARGS_((Tcl_Interp *interp,
-			    int argc, char **argv, int flags));
-EXTERN int		TclInvokeObjectCommand _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int argc, char **argv));
-EXTERN int		TclInvokeStringCommand _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-EXTERN int		TclIsLocalScalar _ANSI_ARGS_((CONST char *src,
-			    int len));
-EXTERN Proc *		TclIsProc _ANSI_ARGS_((Command *cmdPtr));
-EXTERN Var *		TclLookupVar _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *part1, char *part2, int flags, char *msg,
-			    int createPart1, int createPart2,
-			    Var **arrayPtrPtr));
-EXTERN int		TclMathInProgress _ANSI_ARGS_((void));
-EXTERN int		TclNeedSpace _ANSI_ARGS_((char *start, char *end));
-EXTERN Tcl_Obj *	TclNewProcBodyObj _ANSI_ARGS_((Proc *procPtr));
-EXTERN int		TclObjCommandComplete _ANSI_ARGS_((Tcl_Obj *cmdPtr));
-EXTERN int		TclObjInterpProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-EXTERN int		TclObjInvoke _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[], int flags));
-EXTERN int		TclObjInvokeGlobal _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[], int flags));
-EXTERN int		TclOpenFileChannelDeleteProc _ANSI_ARGS_((
-			    TclOpenFileChannelProc_ *proc));
-EXTERN int		TclOpenFileChannelInsertProc _ANSI_ARGS_((
-			    TclOpenFileChannelProc_ *proc));
-EXTERN int		TclpAccess _ANSI_ARGS_((CONST char *filename,
-			    int mode));
-EXTERN char *		TclpAlloc _ANSI_ARGS_((unsigned int size));
-EXTERN int		TclpCheckStackSpace _ANSI_ARGS_((void));
-EXTERN int		TclpCopyFile _ANSI_ARGS_((CONST char *source,
-			    CONST char *dest));
-EXTERN int		TclpCopyDirectory _ANSI_ARGS_((CONST char *source,
-			    CONST char *dest, Tcl_DString *errorPtr));
-EXTERN int		TclpCreateDirectory _ANSI_ARGS_((CONST char *path));
-EXTERN int		TclpDeleteFile _ANSI_ARGS_((CONST char *path));
-EXTERN void		TclpExit _ANSI_ARGS_((int status));
-EXTERN void		TclpFinalizeCondition _ANSI_ARGS_((
-			    Tcl_Condition *condPtr));
-EXTERN void		TclpFinalizeMutex _ANSI_ARGS_((Tcl_Mutex *mutexPtr));
-EXTERN void		TclpFinalizeThreadData _ANSI_ARGS_((
-			    Tcl_ThreadDataKey *keyPtr));
-EXTERN void		TclpFinalizeThreadDataKey _ANSI_ARGS_((
-			    Tcl_ThreadDataKey *keyPtr));
-EXTERN char *		TclpFindExecutable _ANSI_ARGS_((
-			    CONST char *argv0));
-EXTERN int		TclpFindVariable _ANSI_ARGS_((CONST char *name,
-			    int *lengthPtr));
-EXTERN void		TclpFree _ANSI_ARGS_((char *ptr));
-EXTERN unsigned long	TclpGetClicks _ANSI_ARGS_((void));
-EXTERN Tcl_Channel	TclpGetDefaultStdChannel _ANSI_ARGS_((int type));
-EXTERN unsigned long	TclpGetSeconds _ANSI_ARGS_((void));
-EXTERN void		TclpGetTime _ANSI_ARGS_((Tcl_Time *time));
-EXTERN int		TclpGetTimeZone _ANSI_ARGS_((unsigned long time));
-EXTERN char *		TclpGetUserHome _ANSI_ARGS_((CONST char *name,
-			    Tcl_DString *bufferPtr));
-EXTERN int		TclpHasSockets _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void		TclpInitLibraryPath _ANSI_ARGS_((CONST char *argv0));
-EXTERN void		TclpInitLock _ANSI_ARGS_((void));
-EXTERN void		TclpInitPlatform _ANSI_ARGS_((void));
-EXTERN void		TclpInitUnlock _ANSI_ARGS_((void));
-EXTERN int		TclpListVolumes _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN void		TclpMasterLock _ANSI_ARGS_((void));
-EXTERN void		TclpMasterUnlock _ANSI_ARGS_((void));
-EXTERN int		TclpMatchFiles _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *separators, Tcl_DString *dirPtr,
-			    char *pattern, char *tail));
-EXTERN Tcl_Channel	TclpOpenFileChannel _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *fileName, char *modeString,
-			    int permissions));
-EXTERN char *		TclpReadlink _ANSI_ARGS_((CONST char *fileName,
-			    Tcl_DString *linkPtr));
-EXTERN char *		TclpRealloc _ANSI_ARGS_((char *ptr,
-			    unsigned int size));
-EXTERN void		TclpReleaseFile _ANSI_ARGS_((TclFile file));
-EXTERN int		TclpRemoveDirectory _ANSI_ARGS_((CONST char *path,
-			    int recursive, Tcl_DString *errorPtr));
-EXTERN int		TclpRenameFile _ANSI_ARGS_((CONST char *source,
-			    CONST char *dest));
-EXTERN void		TclpSetInitialEncodings _ANSI_ARGS_((void));
-EXTERN void		TclpSetVariables _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN VOID *		TclpSysAlloc _ANSI_ARGS_((long size, int isBin));
-EXTERN void		TclpSysFree _ANSI_ARGS_((VOID *ptr));
-EXTERN VOID *		TclpSysRealloc _ANSI_ARGS_((VOID *cp,
-			    unsigned int size));
-EXTERN void		TclpUnloadFile _ANSI_ARGS_((ClientData clientData));
-EXTERN char *		TclPrecTraceProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, char *name2,
-			    int flags));
-EXTERN int		TclPreventAliasLoop _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *cmdInterp, Tcl_Command cmd));
-EXTERN void		TclProcCleanupProc _ANSI_ARGS_((Proc *procPtr));
-EXTERN int		TclProcCompileProc _ANSI_ARGS_((Tcl_Interp *interp,
-			    Proc *procPtr, Tcl_Obj *bodyPtr, Namespace *nsPtr,
-			    CONST char *description, CONST char *procName));
-EXTERN void		TclProcDeleteProc _ANSI_ARGS_((ClientData clientData));
-EXTERN int		TclProcInterpProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-EXTERN int		TclpThreadCreate _ANSI_ARGS_((Tcl_ThreadId *idPtr,
-			    Tcl_ThreadCreateProc proc, ClientData clientData));
-EXTERN VOID *		TclpThreadDataKeyGet _ANSI_ARGS_((
-			    Tcl_ThreadDataKey *keyPtr));
-EXTERN void		TclpThreadDataKeyInit _ANSI_ARGS_((
-			    Tcl_ThreadDataKey *keyPtr));
-EXTERN void		TclpThreadDataKeySet _ANSI_ARGS_((
-			    Tcl_ThreadDataKey *keyPtr, VOID *data));
-EXTERN void		TclpThreadExit _ANSI_ARGS_((int status));
-EXTERN void		TclRememberCondition _ANSI_ARGS_((Tcl_Condition *mutex));
-EXTERN void		TclRememberDataKey _ANSI_ARGS_((Tcl_ThreadDataKey *mutex));
-EXTERN void		TclRememberMutex _ANSI_ARGS_((Tcl_Mutex *mutex));
-EXTERN int		TclRenameCommand _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *oldName, char *newName)) ;
-EXTERN void		TclResetShadowedCmdRefs _ANSI_ARGS_((
-			    Tcl_Interp *interp, Command *newCmdPtr));
-EXTERN int		TclServiceIdle _ANSI_ARGS_((void));
-EXTERN Tcl_Obj *	TclSetElementOfIndexedArray _ANSI_ARGS_((
-			    Tcl_Interp *interp, int localIndex,
-			    Tcl_Obj *elemPtr, Tcl_Obj *objPtr,
-			    int leaveErrorMsg));
-EXTERN void		TclSetLibraryPath _ANSI_ARGS_((Tcl_Obj *pathPtr));
-EXTERN Tcl_Obj *	TclSetIndexedScalar _ANSI_ARGS_((Tcl_Interp *interp,
-			    int localIndex, Tcl_Obj *objPtr,
-			    int leaveErrorMsg));
-EXTERN char *		TclSetPreInitScript _ANSI_ARGS_((char *string));
-EXTERN void		TclSetupEnv _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int		TclSockGetPort _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, char *proto, int *portPtr));
-EXTERN int		TclSockMinimumBuffers _ANSI_ARGS_((int sock,
-			    int size));
-EXTERN int		TclStat _ANSI_ARGS_((CONST char *path,
-			    TclStat_ *buf));
-EXTERN int		TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ *proc));
-EXTERN int		TclStatInsertProc _ANSI_ARGS_((TclStatProc_ *proc));
-EXTERN void		TclTeardownNamespace _ANSI_ARGS_((Namespace *nsPtr));
-EXTERN int		TclTestChannelCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-EXTERN int		TclTestChannelEventCmd _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int argc, char **argv));
-EXTERN void		TclTransferResult _ANSI_ARGS_((Tcl_Interp *sourceInterp,
-			    int result, Tcl_Interp *targetInterp));
-EXTERN int		TclUpdateReturnInfo _ANSI_ARGS_((Interp *iPtr));
-
-/*
- *----------------------------------------------------------------
- * Command procedures in the generic core:
- *----------------------------------------------------------------
- */
-
-EXTERN int	Tcl_AfterObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_AppendObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ArrayObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_BinaryObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_BreakObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_CaseObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_CatchObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_CdObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ClockObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_CloseObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ConcatObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ContinueObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_EncodingObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_EofObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ErrorObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_EvalObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ExecObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ExitObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ExprObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FblockedObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FconfigureObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FcopyObjCmd _ANSI_ARGS_((ClientData dummy,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FileObjCmd _ANSI_ARGS_((ClientData dummy,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FileEventObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FlushObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ForObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ForeachObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_FormatObjCmd _ANSI_ARGS_((ClientData dummy,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_GetsObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_GlobalObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_GlobObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_IfObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_IncrObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_InfoObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_InterpObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_JoinObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LappendObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LindexObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LinsertObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LlengthObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ListObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LoadObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LrangeObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LreplaceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LsearchObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_LsortObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_NamespaceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_OpenObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_PackageObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_PidObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ProcObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_PutsObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_PwdObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ReadObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_RegexpObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_RegsubObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_RenameObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ReturnObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ScanObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SeekObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SetObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SplitObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SocketObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SourceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_StringObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SubstObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_SwitchObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_TellObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_TimeObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_TraceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_UnsetObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_UpdateObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_UplevelObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_UpvarObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_VariableObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_VwaitObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_WhileObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-
-/*
- *----------------------------------------------------------------
- * Command procedures found only in the Mac version of the core:
- *----------------------------------------------------------------
- */
-
-#ifdef MAC_TCL
-EXTERN int	Tcl_EchoCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-EXTERN int	Tcl_LsObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_BeepObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_MacSourceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	Tcl_ResourceObjCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-#endif
-
-/*
- *----------------------------------------------------------------
- * Compilation procedures for commands in the generic core:
- *----------------------------------------------------------------
- */
-
-EXTERN int	TclCompileBreakCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileCatchCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileContinueCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileExprCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileForCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileForeachCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileIfCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileIncrCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileSetCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-EXTERN int	TclCompileWhileCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		    Tcl_Parse *parsePtr, struct CompileEnv *envPtr));
-
-/*
- *----------------------------------------------------------------
- * Macros used by the Tcl core to create and release Tcl objects.
- * TclNewObj(objPtr) creates a new object denoting an empty string.
- * TclDecrRefCount(objPtr) decrements the object's reference count,
- * and frees the object if its reference count is zero.
- * These macros are inline versions of Tcl_NewObj() and
- * Tcl_DecrRefCount(). Notice that the names differ in not having
- * a "_" after the "Tcl". Notice also that these macros reference
- * their argument more than once, so you should avoid calling them
- * with an expression that is expensive to compute or has
- * side effects. The ANSI C "prototypes" for these macros are:
- *
- * EXTERN void	TclNewObj _ANSI_ARGS_((Tcl_Obj *objPtr));
- * EXTERN void	TclDecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
- *----------------------------------------------------------------
- */
-
-#ifdef TCL_COMPILE_STATS
-#  define TclIncrObjsAllocated() \
-    tclObjsAlloced++
-#  define TclIncrObjsFreed() \
-    tclObjsFreed++
-#else
-#  define TclIncrObjsAllocated()
-#  define TclIncrObjsFreed()
-#endif /* TCL_COMPILE_STATS */
-
-#ifdef TCL_MEM_DEBUG
-#  define TclNewObj(objPtr) \
-    (objPtr) = (Tcl_Obj *) \
-	 Tcl_DbCkalloc(sizeof(Tcl_Obj), __FILE__, __LINE__); \
-    (objPtr)->refCount = 0; \
-    (objPtr)->bytes    = tclEmptyStringRep; \
-    (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated()
-     
-#  define TclDbNewObj(objPtr, file, line) \
-    (objPtr) = (Tcl_Obj *) Tcl_DbCkalloc(sizeof(Tcl_Obj), (file), (line)); \
-    (objPtr)->refCount = 0; \
-    (objPtr)->bytes    = tclEmptyStringRep; \
-    (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated()
-     
-#  define TclDecrRefCount(objPtr) \
-    if (--(objPtr)->refCount <= 0) { \
-	if ((objPtr)->refCount < -1) \
-	    panic("Reference count for %lx was negative: %s line %d", \
-		  (objPtr), __FILE__, __LINE__); \
-	if (((objPtr)->bytes != NULL) \
-		&& ((objPtr)->bytes != tclEmptyStringRep)) { \
-	    ckfree((char *) (objPtr)->bytes); \
-	} \
-	if (((objPtr)->typePtr != NULL) \
-		&& ((objPtr)->typePtr->freeIntRepProc != NULL)) { \
-	    (objPtr)->typePtr->freeIntRepProc(objPtr); \
-	} \
-	ckfree((char *) (objPtr)); \
-	TclIncrObjsFreed(); \
-    }
-
-#else /* not TCL_MEM_DEBUG */
-
-#ifdef TCL_THREADS
-extern Tcl_Mutex tclObjMutex;
-#endif
-
-#  define TclNewObj(objPtr) \
-    Tcl_MutexLock(&tclObjMutex); \
-    if (tclFreeObjList == NULL) { \
-	TclAllocateFreeObjects(); \
-    } \
-    (objPtr) = tclFreeObjList; \
-    tclFreeObjList = (Tcl_Obj *) \
-	tclFreeObjList->internalRep.otherValuePtr; \
-    (objPtr)->refCount = 0; \
-    (objPtr)->bytes    = tclEmptyStringRep; \
-    (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated(); \
-    Tcl_MutexUnlock(&tclObjMutex)
-
-#  define TclDecrRefCount(objPtr) \
-    if (--(objPtr)->refCount <= 0) { \
-	if (((objPtr)->bytes != NULL) \
-		&& ((objPtr)->bytes != tclEmptyStringRep)) { \
-	    ckfree((char *) (objPtr)->bytes); \
-	} \
-	if (((objPtr)->typePtr != NULL) \
-		&& ((objPtr)->typePtr->freeIntRepProc != NULL)) { \
-	    (objPtr)->typePtr->freeIntRepProc(objPtr); \
-	} \
-	Tcl_MutexLock(&tclObjMutex); \
-	(objPtr)->internalRep.otherValuePtr = (VOID *) tclFreeObjList; \
-	tclFreeObjList = (objPtr); \
-	TclIncrObjsFreed(); \
-	Tcl_MutexUnlock(&tclObjMutex); \
-    }
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------
- * Macro used by the Tcl core to set a Tcl_Obj's string representation
- * to a copy of the "len" bytes starting at "bytePtr". This code
- * works even if the byte array contains NULLs as long as the length
- * is correct. Because "len" is referenced multiple times, it should
- * be as simple an expression as possible. The ANSI C "prototype" for
- * this macro is:
- *
- * EXTERN void	TclInitStringRep _ANSI_ARGS_((Tcl_Obj *objPtr,
- *		    char *bytePtr, int len));
- *----------------------------------------------------------------
- */
-
-#define TclInitStringRep(objPtr, bytePtr, len) \
-    if ((len) == 0) { \
-	(objPtr)->bytes	 = tclEmptyStringRep; \
-	(objPtr)->length = 0; \
-    } else { \
-	(objPtr)->bytes = (char *) ckalloc((unsigned) ((len) + 1)); \
-	memcpy((VOID *) (objPtr)->bytes, (VOID *) (bytePtr), \
-		(unsigned) (len)); \
-	(objPtr)->bytes[len] = '\0'; \
-	(objPtr)->length = (len); \
-    }
-
-/*
- *----------------------------------------------------------------
- * Macro used by the Tcl core to get the string representation's
- * byte array pointer from a Tcl_Obj. This is an inline version
- * of Tcl_GetString(). The macro's expression result is the string
- * rep's byte pointer which might be NULL. The bytes referenced by 
- * this pointer must not be modified by the caller.
- * The ANSI C "prototype" for this macro is:
- *
- * EXTERN char *  TclGetString _ANSI_ARGS_((Tcl_Obj *objPtr));
- *----------------------------------------------------------------
- */
-
-#define TclGetString(objPtr) \
-    ((objPtr)->bytes? (objPtr)->bytes : Tcl_GetString((objPtr)))
-
-#include "tclIntDecls.h"
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _TCLINT */
-
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
deleted file mode 100644
index a2b2ac2..0000000
--- a/generic/tclIntDecls.h
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * tclIntDecls.h --
- *
- *	This file contains the declarations for all unsupported
- *	functions that are exported by the Tcl library.  These
- *	interfaces are not guaranteed to remain the same between
- *	versions.  Use at your own risk.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.4 1999/04/16 00:46:48 stanton Exp $
- */
-
-#ifndef _TCLINTDECLS
-#define _TCLINTDECLS
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tclInt.decls script.
- */
-
-/* !BEGIN!: Do not edit below this line. */
-
-/*
- * Exported function declarations:
- */
-
-/* 0 */
-EXTERN int		TclAccess _ANSI_ARGS_((CONST char * path, int mode));
-/* 1 */
-EXTERN int		TclAccessDeleteProc _ANSI_ARGS_((
-				TclAccessProc_ * proc));
-/* 2 */
-EXTERN int		TclAccessInsertProc _ANSI_ARGS_((
-				TclAccessProc_ * proc));
-/* 3 */
-EXTERN void		TclAllocateFreeObjects _ANSI_ARGS_((void));
-/* Slot 4 is reserved */
-/* 5 */
-EXTERN int		TclCleanupChildren _ANSI_ARGS_((Tcl_Interp * interp, 
-				int numPids, Tcl_Pid * pidPtr, 
-				Tcl_Channel errorChan));
-/* 6 */
-EXTERN void		TclCleanupCommand _ANSI_ARGS_((Command * cmdPtr));
-/* 7 */
-EXTERN int		TclCopyAndCollapse _ANSI_ARGS_((int count, 
-				CONST char * src, char * dst));
-/* 8 */
-EXTERN int		TclCopyChannel _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel inChan, Tcl_Channel outChan, 
-				int toRead, Tcl_Obj * cmdPtr));
-/* 9 */
-EXTERN int		TclCreatePipeline _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv, 
-				Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, 
-				TclFile * outPipePtr, TclFile * errFilePtr));
-/* 10 */
-EXTERN int		TclCreateProc _ANSI_ARGS_((Tcl_Interp * interp, 
-				Namespace * nsPtr, char * procName, 
-				Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, 
-				Proc ** procPtrPtr));
-/* 11 */
-EXTERN void		TclDeleteCompiledLocalVars _ANSI_ARGS_((
-				Interp * iPtr, CallFrame * framePtr));
-/* 12 */
-EXTERN void		TclDeleteVars _ANSI_ARGS_((Interp * iPtr, 
-				Tcl_HashTable * tablePtr));
-/* 13 */
-EXTERN int		TclDoGlob _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * separators, Tcl_DString * headPtr, 
-				char * tail));
-/* 14 */
-EXTERN void		TclDumpMemoryInfo _ANSI_ARGS_((FILE * outFile));
-/* Slot 15 is reserved */
-/* 16 */
-EXTERN void		TclExprFloatError _ANSI_ARGS_((Tcl_Interp * interp, 
-				double value));
-/* 17 */
-EXTERN int		TclFileAttrsCmd _ANSI_ARGS_((Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 18 */
-EXTERN int		TclFileCopyCmd _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv));
-/* 19 */
-EXTERN int		TclFileDeleteCmd _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv));
-/* 20 */
-EXTERN int		TclFileMakeDirsCmd _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv));
-/* 21 */
-EXTERN int		TclFileRenameCmd _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv));
-/* 22 */
-EXTERN int		TclFindElement _ANSI_ARGS_((Tcl_Interp * interp, 
-				CONST char * listStr, int listLength, 
-				CONST char ** elementPtr, 
-				CONST char ** nextPtr, int * sizePtr, 
-				int * bracePtr));
-/* 23 */
-EXTERN Proc *		TclFindProc _ANSI_ARGS_((Interp * iPtr, 
-				char * procName));
-/* 24 */
-EXTERN int		TclFormatInt _ANSI_ARGS_((char * buffer, long n));
-/* 25 */
-EXTERN void		TclFreePackageInfo _ANSI_ARGS_((Interp * iPtr));
-/* Slot 26 is reserved */
-/* 27 */
-EXTERN int		TclGetDate _ANSI_ARGS_((char * p, unsigned long now, 
-				long zone, unsigned long * timePtr));
-/* 28 */
-EXTERN Tcl_Channel	TclpGetDefaultStdChannel _ANSI_ARGS_((int type));
-/* 29 */
-EXTERN Tcl_Obj *	TclGetElementOfIndexedArray _ANSI_ARGS_((
-				Tcl_Interp * interp, int localIndex, 
-				Tcl_Obj * elemPtr, int leaveErrorMsg));
-/* Slot 30 is reserved */
-/* 31 */
-EXTERN char *		TclGetExtension _ANSI_ARGS_((char * name));
-/* 32 */
-EXTERN int		TclGetFrame _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, CallFrame ** framePtrPtr));
-/* 33 */
-EXTERN TclCmdProcType	TclGetInterpProc _ANSI_ARGS_((void));
-/* 34 */
-EXTERN int		TclGetIntForIndex _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * objPtr, int endValue, 
-				int * indexPtr));
-/* 35 */
-EXTERN Tcl_Obj *	TclGetIndexedScalar _ANSI_ARGS_((Tcl_Interp * interp, 
-				int localIndex, int leaveErrorMsg));
-/* 36 */
-EXTERN int		TclGetLong _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, long * longPtr));
-/* 37 */
-EXTERN int		TclGetLoadedPackages _ANSI_ARGS_((
-				Tcl_Interp * interp, char * targetName));
-/* 38 */
-EXTERN int		TclGetNamespaceForQualName _ANSI_ARGS_((
-				Tcl_Interp * interp, char * qualName, 
-				Namespace * cxtNsPtr, int flags, 
-				Namespace ** nsPtrPtr, 
-				Namespace ** altNsPtrPtr, 
-				Namespace ** actualCxtPtrPtr, 
-				char ** simpleNamePtr));
-/* 39 */
-EXTERN TclObjCmdProcType TclGetObjInterpProc _ANSI_ARGS_((void));
-/* 40 */
-EXTERN int		TclGetOpenMode _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, int * seekFlagPtr));
-/* 41 */
-EXTERN Tcl_Command	TclGetOriginalCommand _ANSI_ARGS_((
-				Tcl_Command command));
-/* 42 */
-EXTERN char *		TclpGetUserHome _ANSI_ARGS_((CONST char * name, 
-				Tcl_DString * bufferPtr));
-/* 43 */
-EXTERN int		TclGlobalInvoke _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv, int flags));
-/* 44 */
-EXTERN int		TclGuessPackageName _ANSI_ARGS_((char * fileName, 
-				Tcl_DString * bufPtr));
-/* 45 */
-EXTERN int		TclHideUnsafeCommands _ANSI_ARGS_((
-				Tcl_Interp * interp));
-/* 46 */
-EXTERN int		TclInExit _ANSI_ARGS_((void));
-/* 47 */
-EXTERN Tcl_Obj *	TclIncrElementOfIndexedArray _ANSI_ARGS_((
-				Tcl_Interp * interp, int localIndex, 
-				Tcl_Obj * elemPtr, long incrAmount));
-/* 48 */
-EXTERN Tcl_Obj *	TclIncrIndexedScalar _ANSI_ARGS_((
-				Tcl_Interp * interp, int localIndex, 
-				long incrAmount));
-/* 49 */
-EXTERN Tcl_Obj *	TclIncrVar2 _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, 
-				long incrAmount, int part1NotParsed));
-/* 50 */
-EXTERN void		TclInitCompiledLocals _ANSI_ARGS_((
-				Tcl_Interp * interp, CallFrame * framePtr, 
-				Namespace * nsPtr));
-/* 51 */
-EXTERN int		TclInterpInit _ANSI_ARGS_((Tcl_Interp * interp));
-/* 52 */
-EXTERN int		TclInvoke _ANSI_ARGS_((Tcl_Interp * interp, int argc, 
-				char ** argv, int flags));
-/* 53 */
-EXTERN int		TclInvokeObjectCommand _ANSI_ARGS_((
-				ClientData clientData, Tcl_Interp * interp, 
-				int argc, char ** argv));
-/* 54 */
-EXTERN int		TclInvokeStringCommand _ANSI_ARGS_((
-				ClientData clientData, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-/* 55 */
-EXTERN Proc *		TclIsProc _ANSI_ARGS_((Command * cmdPtr));
-/* Slot 56 is reserved */
-/* Slot 57 is reserved */
-/* 58 */
-EXTERN Var *		TclLookupVar _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * part1, char * part2, int flags, 
-				char * msg, int createPart1, int createPart2, 
-				Var ** arrayPtrPtr));
-/* 59 */
-EXTERN int		TclpMatchFiles _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * separators, Tcl_DString * dirPtr, 
-				char * pattern, char * tail));
-/* 60 */
-EXTERN int		TclNeedSpace _ANSI_ARGS_((char * start, char * end));
-/* 61 */
-EXTERN Tcl_Obj *	TclNewProcBodyObj _ANSI_ARGS_((Proc * procPtr));
-/* 62 */
-EXTERN int		TclObjCommandComplete _ANSI_ARGS_((Tcl_Obj * cmdPtr));
-/* 63 */
-EXTERN int		TclObjInterpProc _ANSI_ARGS_((ClientData clientData, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]));
-/* 64 */
-EXTERN int		TclObjInvoke _ANSI_ARGS_((Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[], int flags));
-/* 65 */
-EXTERN int		TclObjInvokeGlobal _ANSI_ARGS_((Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[], int flags));
-/* 66 */
-EXTERN int		TclOpenFileChannelDeleteProc _ANSI_ARGS_((
-				TclOpenFileChannelProc_ * proc));
-/* 67 */
-EXTERN int		TclOpenFileChannelInsertProc _ANSI_ARGS_((
-				TclOpenFileChannelProc_ * proc));
-/* 68 */
-EXTERN int		TclpAccess _ANSI_ARGS_((CONST char * path, int mode));
-/* 69 */
-EXTERN char *		TclpAlloc _ANSI_ARGS_((unsigned int size));
-/* 70 */
-EXTERN int		TclpCopyFile _ANSI_ARGS_((CONST char * source, 
-				CONST char * dest));
-/* 71 */
-EXTERN int		TclpCopyDirectory _ANSI_ARGS_((CONST char * source, 
-				CONST char * dest, Tcl_DString * errorPtr));
-/* 72 */
-EXTERN int		TclpCreateDirectory _ANSI_ARGS_((CONST char * path));
-/* 73 */
-EXTERN int		TclpDeleteFile _ANSI_ARGS_((CONST char * path));
-/* 74 */
-EXTERN void		TclpFree _ANSI_ARGS_((char * ptr));
-/* 75 */
-EXTERN unsigned long	TclpGetClicks _ANSI_ARGS_((void));
-/* 76 */
-EXTERN unsigned long	TclpGetSeconds _ANSI_ARGS_((void));
-/* 77 */
-EXTERN void		TclpGetTime _ANSI_ARGS_((Tcl_Time * time));
-/* 78 */
-EXTERN int		TclpGetTimeZone _ANSI_ARGS_((unsigned long time));
-/* 79 */
-EXTERN int		TclpListVolumes _ANSI_ARGS_((Tcl_Interp * interp));
-/* 80 */
-EXTERN Tcl_Channel	TclpOpenFileChannel _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * fileName, char * modeString, 
-				int permissions));
-/* 81 */
-EXTERN char *		TclpRealloc _ANSI_ARGS_((char * ptr, 
-				unsigned int size));
-/* 82 */
-EXTERN int		TclpRemoveDirectory _ANSI_ARGS_((CONST char * path, 
-				int recursive, Tcl_DString * errorPtr));
-/* 83 */
-EXTERN int		TclpRenameFile _ANSI_ARGS_((CONST char * source, 
-				CONST char * dest));
-/* Slot 84 is reserved */
-/* Slot 85 is reserved */
-/* Slot 86 is reserved */
-/* Slot 87 is reserved */
-/* 88 */
-EXTERN char *		TclPrecTraceProc _ANSI_ARGS_((ClientData clientData, 
-				Tcl_Interp * interp, char * name1, 
-				char * name2, int flags));
-/* 89 */
-EXTERN int		TclPreventAliasLoop _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Interp * cmdInterp, Tcl_Command cmd));
-/* Slot 90 is reserved */
-/* 91 */
-EXTERN void		TclProcCleanupProc _ANSI_ARGS_((Proc * procPtr));
-/* 92 */
-EXTERN int		TclProcCompileProc _ANSI_ARGS_((Tcl_Interp * interp, 
-				Proc * procPtr, Tcl_Obj * bodyPtr, 
-				Namespace * nsPtr, CONST char * description, 
-				CONST char * procName));
-/* 93 */
-EXTERN void		TclProcDeleteProc _ANSI_ARGS_((ClientData clientData));
-/* 94 */
-EXTERN int		TclProcInterpProc _ANSI_ARGS_((ClientData clientData, 
-				Tcl_Interp * interp, int argc, char ** argv));
-/* 95 */
-EXTERN int		TclpStat _ANSI_ARGS_((CONST char * path, 
-				struct stat * buf));
-/* 96 */
-EXTERN int		TclRenameCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * oldName, char * newName));
-/* 97 */
-EXTERN void		TclResetShadowedCmdRefs _ANSI_ARGS_((
-				Tcl_Interp * interp, Command * newCmdPtr));
-/* 98 */
-EXTERN int		TclServiceIdle _ANSI_ARGS_((void));
-/* 99 */
-EXTERN Tcl_Obj *	TclSetElementOfIndexedArray _ANSI_ARGS_((
-				Tcl_Interp * interp, int localIndex, 
-				Tcl_Obj * elemPtr, Tcl_Obj * objPtr, 
-				int leaveErrorMsg));
-/* 100 */
-EXTERN Tcl_Obj *	TclSetIndexedScalar _ANSI_ARGS_((Tcl_Interp * interp, 
-				int localIndex, Tcl_Obj * objPtr, 
-				int leaveErrorMsg));
-/* Slot 101 is reserved */
-/* 102 */
-EXTERN void		TclSetupEnv _ANSI_ARGS_((Tcl_Interp * interp));
-/* 103 */
-EXTERN int		TclSockGetPort _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * str, char * proto, int * portPtr));
-/* 104 */
-EXTERN int		TclSockMinimumBuffers _ANSI_ARGS_((int sock, 
-				int size));
-/* 105 */
-EXTERN int		TclStat _ANSI_ARGS_((CONST char * path, 
-				TclStat_ * buf));
-/* 106 */
-EXTERN int		TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ * proc));
-/* 107 */
-EXTERN int		TclStatInsertProc _ANSI_ARGS_((TclStatProc_ * proc));
-/* 108 */
-EXTERN void		TclTeardownNamespace _ANSI_ARGS_((Namespace * nsPtr));
-/* 109 */
-EXTERN int		TclUpdateReturnInfo _ANSI_ARGS_((Interp * iPtr));
-/* Slot 110 is reserved */
-/* 111 */
-EXTERN void		Tcl_AddInterpResolvers _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name, 
-				Tcl_ResolveCmdProc * cmdProc, 
-				Tcl_ResolveVarProc * varProc, 
-				Tcl_ResolveCompiledVarProc * compiledVarProc));
-/* 112 */
-EXTERN int		Tcl_AppendExportList _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Namespace * nsPtr, 
-				Tcl_Obj * objPtr));
-/* 113 */
-EXTERN Tcl_Namespace *	Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, ClientData clientData, 
-				Tcl_NamespaceDeleteProc * deleteProc));
-/* 114 */
-EXTERN void		Tcl_DeleteNamespace _ANSI_ARGS_((
-				Tcl_Namespace * nsPtr));
-/* 115 */
-EXTERN int		Tcl_Export _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, char * pattern, 
-				int resetListFirst));
-/* 116 */
-EXTERN Tcl_Command	Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, Tcl_Namespace * contextNsPtr, 
-				int flags));
-/* 117 */
-EXTERN Tcl_Namespace *	Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * name, Tcl_Namespace * contextNsPtr, 
-				int flags));
-/* 118 */
-EXTERN int		Tcl_GetInterpResolvers _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name, 
-				Tcl_ResolverInfo * resInfo));
-/* 119 */
-EXTERN int		Tcl_GetNamespaceResolvers _ANSI_ARGS_((
-				Tcl_Namespace * namespacePtr, 
-				Tcl_ResolverInfo * resInfo));
-/* 120 */
-EXTERN Tcl_Var		Tcl_FindNamespaceVar _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name, 
-				Tcl_Namespace * contextNsPtr, int flags));
-/* 121 */
-EXTERN int		Tcl_ForgetImport _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, char * pattern));
-/* 122 */
-EXTERN Tcl_Command	Tcl_GetCommandFromObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr));
-/* 123 */
-EXTERN void		Tcl_GetCommandFullName _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Command command, 
-				Tcl_Obj * objPtr));
-/* 124 */
-EXTERN Tcl_Namespace *	Tcl_GetCurrentNamespace _ANSI_ARGS_((
-				Tcl_Interp * interp));
-/* 125 */
-EXTERN Tcl_Namespace *	Tcl_GetGlobalNamespace _ANSI_ARGS_((
-				Tcl_Interp * interp));
-/* 126 */
-EXTERN void		Tcl_GetVariableFullName _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Var variable, 
-				Tcl_Obj * objPtr));
-/* 127 */
-EXTERN int		Tcl_Import _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Namespace * nsPtr, char * pattern, 
-				int allowOverwrite));
-/* 128 */
-EXTERN void		Tcl_PopCallFrame _ANSI_ARGS_((Tcl_Interp* interp));
-/* 129 */
-EXTERN int		Tcl_PushCallFrame _ANSI_ARGS_((Tcl_Interp* interp, 
-				Tcl_CallFrame * framePtr, 
-				Tcl_Namespace * nsPtr, int isProcCallFrame));
-/* 130 */
-EXTERN int		Tcl_RemoveInterpResolvers _ANSI_ARGS_((
-				Tcl_Interp * interp, char * name));
-/* 131 */
-EXTERN void		Tcl_SetNamespaceResolvers _ANSI_ARGS_((
-				Tcl_Namespace * namespacePtr, 
-				Tcl_ResolveCmdProc * cmdProc, 
-				Tcl_ResolveVarProc * varProc, 
-				Tcl_ResolveCompiledVarProc * compiledVarProc));
-/* 132 */
-EXTERN int		TclpHasSockets _ANSI_ARGS_((Tcl_Interp * interp));
-/* 133 */
-EXTERN struct tm *	TclpGetDate _ANSI_ARGS_((TclpTime_t time, int useGMT));
-/* 134 */
-EXTERN size_t		TclpStrftime _ANSI_ARGS_((char * s, size_t maxsize, 
-				CONST char * format, CONST struct tm * t));
-/* 135 */
-EXTERN int		TclpCheckStackSpace _ANSI_ARGS_((void));
-/* Slot 136 is reserved */
-/* 137 */
-EXTERN int		TclpChdir _ANSI_ARGS_((CONST char * dirName));
-/* 138 */
-EXTERN char *		TclGetEnv _ANSI_ARGS_((CONST char * name, 
-				Tcl_DString * valuePtr));
-/* 139 */
-EXTERN int		TclpLoadFile _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * fileName, char * sym1, char * sym2, 
-				Tcl_PackageInitProc ** proc1Ptr, 
-				Tcl_PackageInitProc ** proc2Ptr, 
-				ClientData * clientDataPtr));
-/* 140 */
-EXTERN int		TclLooksLikeInt _ANSI_ARGS_((char * bytes, 
-				int length));
-/* 141 */
-EXTERN char *		TclpGetCwd _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_DString * cwdPtr));
-
-typedef struct TclIntStubs {
-    int magic;
-    struct TclIntStubHooks *hooks;
-
-    int (*tclAccess) _ANSI_ARGS_((CONST char * path, int mode)); /* 0 */
-    int (*tclAccessDeleteProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 1 */
-    int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 2 */
-    void (*tclAllocateFreeObjects) _ANSI_ARGS_((void)); /* 3 */
-    void *reserved4;
-    int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */
-    void (*tclCleanupCommand) _ANSI_ARGS_((Command * cmdPtr)); /* 6 */
-    int (*tclCopyAndCollapse) _ANSI_ARGS_((int count, CONST char * src, char * dst)); /* 7 */
-    int (*tclCopyChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); /* 8 */
-    int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */
-    int (*tclCreateProc) _ANSI_ARGS_((Tcl_Interp * interp, Namespace * nsPtr, char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr)); /* 10 */
-    void (*tclDeleteCompiledLocalVars) _ANSI_ARGS_((Interp * iPtr, CallFrame * framePtr)); /* 11 */
-    void (*tclDeleteVars) _ANSI_ARGS_((Interp * iPtr, Tcl_HashTable * tablePtr)); /* 12 */
-    int (*tclDoGlob) _ANSI_ARGS_((Tcl_Interp * interp, char * separators, Tcl_DString * headPtr, char * tail)); /* 13 */
-    void (*tclDumpMemoryInfo) _ANSI_ARGS_((FILE * outFile)); /* 14 */
-    void *reserved15;
-    void (*tclExprFloatError) _ANSI_ARGS_((Tcl_Interp * interp, double value)); /* 16 */
-    int (*tclFileAttrsCmd) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 17 */
-    int (*tclFileCopyCmd) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv)); /* 18 */
-    int (*tclFileDeleteCmd) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv)); /* 19 */
-    int (*tclFileMakeDirsCmd) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv)); /* 20 */
-    int (*tclFileRenameCmd) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv)); /* 21 */
-    int (*tclFindElement) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * listStr, int listLength, CONST char ** elementPtr, CONST char ** nextPtr, int * sizePtr, int * bracePtr)); /* 22 */
-    Proc * (*tclFindProc) _ANSI_ARGS_((Interp * iPtr, char * procName)); /* 23 */
-    int (*tclFormatInt) _ANSI_ARGS_((char * buffer, long n)); /* 24 */
-    void (*tclFreePackageInfo) _ANSI_ARGS_((Interp * iPtr)); /* 25 */
-    void *reserved26;
-    int (*tclGetDate) _ANSI_ARGS_((char * p, unsigned long now, long zone, unsigned long * timePtr)); /* 27 */
-    Tcl_Channel (*tclpGetDefaultStdChannel) _ANSI_ARGS_((int type)); /* 28 */
-    Tcl_Obj * (*tclGetElementOfIndexedArray) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, Tcl_Obj * elemPtr, int leaveErrorMsg)); /* 29 */
-    void *reserved30;
-    char * (*tclGetExtension) _ANSI_ARGS_((char * name)); /* 31 */
-    int (*tclGetFrame) _ANSI_ARGS_((Tcl_Interp * interp, char * str, CallFrame ** framePtrPtr)); /* 32 */
-    TclCmdProcType (*tclGetInterpProc) _ANSI_ARGS_((void)); /* 33 */
-    int (*tclGetIntForIndex) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, int endValue, int * indexPtr)); /* 34 */
-    Tcl_Obj * (*tclGetIndexedScalar) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, int leaveErrorMsg)); /* 35 */
-    int (*tclGetLong) _ANSI_ARGS_((Tcl_Interp * interp, char * str, long * longPtr)); /* 36 */
-    int (*tclGetLoadedPackages) _ANSI_ARGS_((Tcl_Interp * interp, char * targetName)); /* 37 */
-    int (*tclGetNamespaceForQualName) _ANSI_ARGS_((Tcl_Interp * interp, char * qualName, Namespace * cxtNsPtr, int flags, Namespace ** nsPtrPtr, Namespace ** altNsPtrPtr, Namespace ** actualCxtPtrPtr, char ** simpleNamePtr)); /* 38 */
-    TclObjCmdProcType (*tclGetObjInterpProc) _ANSI_ARGS_((void)); /* 39 */
-    int (*tclGetOpenMode) _ANSI_ARGS_((Tcl_Interp * interp, char * str, int * seekFlagPtr)); /* 40 */
-    Tcl_Command (*tclGetOriginalCommand) _ANSI_ARGS_((Tcl_Command command)); /* 41 */
-    char * (*tclpGetUserHome) _ANSI_ARGS_((CONST char * name, Tcl_DString * bufferPtr)); /* 42 */
-    int (*tclGlobalInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, int flags)); /* 43 */
-    int (*tclGuessPackageName) _ANSI_ARGS_((char * fileName, Tcl_DString * bufPtr)); /* 44 */
-    int (*tclHideUnsafeCommands) _ANSI_ARGS_((Tcl_Interp * interp)); /* 45 */
-    int (*tclInExit) _ANSI_ARGS_((void)); /* 46 */
-    Tcl_Obj * (*tclIncrElementOfIndexedArray) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, Tcl_Obj * elemPtr, long incrAmount)); /* 47 */
-    Tcl_Obj * (*tclIncrIndexedScalar) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, long incrAmount)); /* 48 */
-    Tcl_Obj * (*tclIncrVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, long incrAmount, int part1NotParsed)); /* 49 */
-    void (*tclInitCompiledLocals) _ANSI_ARGS_((Tcl_Interp * interp, CallFrame * framePtr, Namespace * nsPtr)); /* 50 */
-    int (*tclInterpInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 51 */
-    int (*tclInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, int flags)); /* 52 */
-    int (*tclInvokeObjectCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, char ** argv)); /* 53 */
-    int (*tclInvokeStringCommand) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 54 */
-    Proc * (*tclIsProc) _ANSI_ARGS_((Command * cmdPtr)); /* 55 */
-    void *reserved56;
-    void *reserved57;
-    Var * (*tclLookupVar) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags, char * msg, int createPart1, int createPart2, Var ** arrayPtrPtr)); /* 58 */
-    int (*tclpMatchFiles) _ANSI_ARGS_((Tcl_Interp * interp, char * separators, Tcl_DString * dirPtr, char * pattern, char * tail)); /* 59 */
-    int (*tclNeedSpace) _ANSI_ARGS_((char * start, char * end)); /* 60 */
-    Tcl_Obj * (*tclNewProcBodyObj) _ANSI_ARGS_((Proc * procPtr)); /* 61 */
-    int (*tclObjCommandComplete) _ANSI_ARGS_((Tcl_Obj * cmdPtr)); /* 62 */
-    int (*tclObjInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 63 */
-    int (*tclObjInvoke) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 64 */
-    int (*tclObjInvokeGlobal) _ANSI_ARGS_((Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags)); /* 65 */
-    int (*tclOpenFileChannelDeleteProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 66 */
-    int (*tclOpenFileChannelInsertProc) _ANSI_ARGS_((TclOpenFileChannelProc_ * proc)); /* 67 */
-    int (*tclpAccess) _ANSI_ARGS_((CONST char * path, int mode)); /* 68 */
-    char * (*tclpAlloc) _ANSI_ARGS_((unsigned int size)); /* 69 */
-    int (*tclpCopyFile) _ANSI_ARGS_((CONST char * source, CONST char * dest)); /* 70 */
-    int (*tclpCopyDirectory) _ANSI_ARGS_((CONST char * source, CONST char * dest, Tcl_DString * errorPtr)); /* 71 */
-    int (*tclpCreateDirectory) _ANSI_ARGS_((CONST char * path)); /* 72 */
-    int (*tclpDeleteFile) _ANSI_ARGS_((CONST char * path)); /* 73 */
-    void (*tclpFree) _ANSI_ARGS_((char * ptr)); /* 74 */
-    unsigned long (*tclpGetClicks) _ANSI_ARGS_((void)); /* 75 */
-    unsigned long (*tclpGetSeconds) _ANSI_ARGS_((void)); /* 76 */
-    void (*tclpGetTime) _ANSI_ARGS_((Tcl_Time * time)); /* 77 */
-    int (*tclpGetTimeZone) _ANSI_ARGS_((unsigned long time)); /* 78 */
-    int (*tclpListVolumes) _ANSI_ARGS_((Tcl_Interp * interp)); /* 79 */
-    Tcl_Channel (*tclpOpenFileChannel) _ANSI_ARGS_((Tcl_Interp * interp, char * fileName, char * modeString, int permissions)); /* 80 */
-    char * (*tclpRealloc) _ANSI_ARGS_((char * ptr, unsigned int size)); /* 81 */
-    int (*tclpRemoveDirectory) _ANSI_ARGS_((CONST char * path, int recursive, Tcl_DString * errorPtr)); /* 82 */
-    int (*tclpRenameFile) _ANSI_ARGS_((CONST char * source, CONST char * dest)); /* 83 */
-    void *reserved84;
-    void *reserved85;
-    void *reserved86;
-    void *reserved87;
-    char * (*tclPrecTraceProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, char * name1, char * name2, int flags)); /* 88 */
-    int (*tclPreventAliasLoop) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Interp * cmdInterp, Tcl_Command cmd)); /* 89 */
-    void *reserved90;
-    void (*tclProcCleanupProc) _ANSI_ARGS_((Proc * procPtr)); /* 91 */
-    int (*tclProcCompileProc) _ANSI_ARGS_((Tcl_Interp * interp, Proc * procPtr, Tcl_Obj * bodyPtr, Namespace * nsPtr, CONST char * description, CONST char * procName)); /* 92 */
-    void (*tclProcDeleteProc) _ANSI_ARGS_((ClientData clientData)); /* 93 */
-    int (*tclProcInterpProc) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, char ** argv)); /* 94 */
-    int (*tclpStat) _ANSI_ARGS_((CONST char * path, struct stat * buf)); /* 95 */
-    int (*tclRenameCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * oldName, char * newName)); /* 96 */
-    void (*tclResetShadowedCmdRefs) _ANSI_ARGS_((Tcl_Interp * interp, Command * newCmdPtr)); /* 97 */
-    int (*tclServiceIdle) _ANSI_ARGS_((void)); /* 98 */
-    Tcl_Obj * (*tclSetElementOfIndexedArray) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, Tcl_Obj * elemPtr, Tcl_Obj * objPtr, int leaveErrorMsg)); /* 99 */
-    Tcl_Obj * (*tclSetIndexedScalar) _ANSI_ARGS_((Tcl_Interp * interp, int localIndex, Tcl_Obj * objPtr, int leaveErrorMsg)); /* 100 */
-    void *reserved101;
-    void (*tclSetupEnv) _ANSI_ARGS_((Tcl_Interp * interp)); /* 102 */
-    int (*tclSockGetPort) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); /* 103 */
-    int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */
-    int (*tclStat) _ANSI_ARGS_((CONST char * path, TclStat_ * buf)); /* 105 */
-    int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 106 */
-    int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 107 */
-    void (*tclTeardownNamespace) _ANSI_ARGS_((Namespace * nsPtr)); /* 108 */
-    int (*tclUpdateReturnInfo) _ANSI_ARGS_((Interp * iPtr)); /* 109 */
-    void *reserved110;
-    void (*tcl_AddInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc)); /* 111 */
-    int (*tcl_AppendExportList) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, Tcl_Obj * objPtr)); /* 112 */
-    Tcl_Namespace * (*tcl_CreateNamespace) _ANSI_ARGS_((Tcl_Interp * interp, char * name, ClientData clientData, Tcl_NamespaceDeleteProc * deleteProc)); /* 113 */
-    void (*tcl_DeleteNamespace) _ANSI_ARGS_((Tcl_Namespace * nsPtr)); /* 114 */
-    int (*tcl_Export) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, char * pattern, int resetListFirst)); /* 115 */
-    Tcl_Command (*tcl_FindCommand) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 116 */
-    Tcl_Namespace * (*tcl_FindNamespace) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 117 */
-    int (*tcl_GetInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_ResolverInfo * resInfo)); /* 118 */
-    int (*tcl_GetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace * namespacePtr, Tcl_ResolverInfo * resInfo)); /* 119 */
-    Tcl_Var (*tcl_FindNamespaceVar) _ANSI_ARGS_((Tcl_Interp * interp, char * name, Tcl_Namespace * contextNsPtr, int flags)); /* 120 */
-    int (*tcl_ForgetImport) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, char * pattern)); /* 121 */
-    Tcl_Command (*tcl_GetCommandFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr)); /* 122 */
-    void (*tcl_GetCommandFullName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Command command, Tcl_Obj * objPtr)); /* 123 */
-    Tcl_Namespace * (*tcl_GetCurrentNamespace) _ANSI_ARGS_((Tcl_Interp * interp)); /* 124 */
-    Tcl_Namespace * (*tcl_GetGlobalNamespace) _ANSI_ARGS_((Tcl_Interp * interp)); /* 125 */
-    void (*tcl_GetVariableFullName) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Var variable, Tcl_Obj * objPtr)); /* 126 */
-    int (*tcl_Import) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Namespace * nsPtr, char * pattern, int allowOverwrite)); /* 127 */
-    void (*tcl_PopCallFrame) _ANSI_ARGS_((Tcl_Interp* interp)); /* 128 */
-    int (*tcl_PushCallFrame) _ANSI_ARGS_((Tcl_Interp* interp, Tcl_CallFrame * framePtr, Tcl_Namespace * nsPtr, int isProcCallFrame)); /* 129 */
-    int (*tcl_RemoveInterpResolvers) _ANSI_ARGS_((Tcl_Interp * interp, char * name)); /* 130 */
-    void (*tcl_SetNamespaceResolvers) _ANSI_ARGS_((Tcl_Namespace * namespacePtr, Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc, Tcl_ResolveCompiledVarProc * compiledVarProc)); /* 131 */
-    int (*tclpHasSockets) _ANSI_ARGS_((Tcl_Interp * interp)); /* 132 */
-    struct tm * (*tclpGetDate) _ANSI_ARGS_((TclpTime_t time, int useGMT)); /* 133 */
-    size_t (*tclpStrftime) _ANSI_ARGS_((char * s, size_t maxsize, CONST char * format, CONST struct tm * t)); /* 134 */
-    int (*tclpCheckStackSpace) _ANSI_ARGS_((void)); /* 135 */
-    void *reserved136;
-    int (*tclpChdir) _ANSI_ARGS_((CONST char * dirName)); /* 137 */
-    char * (*tclGetEnv) _ANSI_ARGS_((CONST char * name, Tcl_DString * valuePtr)); /* 138 */
-    int (*tclpLoadFile) _ANSI_ARGS_((Tcl_Interp * interp, char * fileName, char * sym1, char * sym2, Tcl_PackageInitProc ** proc1Ptr, Tcl_PackageInitProc ** proc2Ptr, ClientData * clientDataPtr)); /* 139 */
-    int (*tclLooksLikeInt) _ANSI_ARGS_((char * bytes, int length)); /* 140 */
-    char * (*tclpGetCwd) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_DString * cwdPtr)); /* 141 */
-} TclIntStubs;
-
-extern TclIntStubs *tclIntStubsPtr;
-
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-
-/*
- * Inline function declarations:
- */
-
-#ifndef TclAccess
-#define TclAccess \
-	(tclIntStubsPtr->tclAccess) /* 0 */
-#endif
-#ifndef TclAccessDeleteProc
-#define TclAccessDeleteProc \
-	(tclIntStubsPtr->tclAccessDeleteProc) /* 1 */
-#endif
-#ifndef TclAccessInsertProc
-#define TclAccessInsertProc \
-	(tclIntStubsPtr->tclAccessInsertProc) /* 2 */
-#endif
-#ifndef TclAllocateFreeObjects
-#define TclAllocateFreeObjects \
-	(tclIntStubsPtr->tclAllocateFreeObjects) /* 3 */
-#endif
-/* Slot 4 is reserved */
-#ifndef TclCleanupChildren
-#define TclCleanupChildren \
-	(tclIntStubsPtr->tclCleanupChildren) /* 5 */
-#endif
-#ifndef TclCleanupCommand
-#define TclCleanupCommand \
-	(tclIntStubsPtr->tclCleanupCommand) /* 6 */
-#endif
-#ifndef TclCopyAndCollapse
-#define TclCopyAndCollapse \
-	(tclIntStubsPtr->tclCopyAndCollapse) /* 7 */
-#endif
-#ifndef TclCopyChannel
-#define TclCopyChannel \
-	(tclIntStubsPtr->tclCopyChannel) /* 8 */
-#endif
-#ifndef TclCreatePipeline
-#define TclCreatePipeline \
-	(tclIntStubsPtr->tclCreatePipeline) /* 9 */
-#endif
-#ifndef TclCreateProc
-#define TclCreateProc \
-	(tclIntStubsPtr->tclCreateProc) /* 10 */
-#endif
-#ifndef TclDeleteCompiledLocalVars
-#define TclDeleteCompiledLocalVars \
-	(tclIntStubsPtr->tclDeleteCompiledLocalVars) /* 11 */
-#endif
-#ifndef TclDeleteVars
-#define TclDeleteVars \
-	(tclIntStubsPtr->tclDeleteVars) /* 12 */
-#endif
-#ifndef TclDoGlob
-#define TclDoGlob \
-	(tclIntStubsPtr->tclDoGlob) /* 13 */
-#endif
-#ifndef TclDumpMemoryInfo
-#define TclDumpMemoryInfo \
-	(tclIntStubsPtr->tclDumpMemoryInfo) /* 14 */
-#endif
-/* Slot 15 is reserved */
-#ifndef TclExprFloatError
-#define TclExprFloatError \
-	(tclIntStubsPtr->tclExprFloatError) /* 16 */
-#endif
-#ifndef TclFileAttrsCmd
-#define TclFileAttrsCmd \
-	(tclIntStubsPtr->tclFileAttrsCmd) /* 17 */
-#endif
-#ifndef TclFileCopyCmd
-#define TclFileCopyCmd \
-	(tclIntStubsPtr->tclFileCopyCmd) /* 18 */
-#endif
-#ifndef TclFileDeleteCmd
-#define TclFileDeleteCmd \
-	(tclIntStubsPtr->tclFileDeleteCmd) /* 19 */
-#endif
-#ifndef TclFileMakeDirsCmd
-#define TclFileMakeDirsCmd \
-	(tclIntStubsPtr->tclFileMakeDirsCmd) /* 20 */
-#endif
-#ifndef TclFileRenameCmd
-#define TclFileRenameCmd \
-	(tclIntStubsPtr->tclFileRenameCmd) /* 21 */
-#endif
-#ifndef TclFindElement
-#define TclFindElement \
-	(tclIntStubsPtr->tclFindElement) /* 22 */
-#endif
-#ifndef TclFindProc
-#define TclFindProc \
-	(tclIntStubsPtr->tclFindProc) /* 23 */
-#endif
-#ifndef TclFormatInt
-#define TclFormatInt \
-	(tclIntStubsPtr->tclFormatInt) /* 24 */
-#endif
-#ifndef TclFreePackageInfo
-#define TclFreePackageInfo \
-	(tclIntStubsPtr->tclFreePackageInfo) /* 25 */
-#endif
-/* Slot 26 is reserved */
-#ifndef TclGetDate
-#define TclGetDate \
-	(tclIntStubsPtr->tclGetDate) /* 27 */
-#endif
-#ifndef TclpGetDefaultStdChannel
-#define TclpGetDefaultStdChannel \
-	(tclIntStubsPtr->tclpGetDefaultStdChannel) /* 28 */
-#endif
-#ifndef TclGetElementOfIndexedArray
-#define TclGetElementOfIndexedArray \
-	(tclIntStubsPtr->tclGetElementOfIndexedArray) /* 29 */
-#endif
-/* Slot 30 is reserved */
-#ifndef TclGetExtension
-#define TclGetExtension \
-	(tclIntStubsPtr->tclGetExtension) /* 31 */
-#endif
-#ifndef TclGetFrame
-#define TclGetFrame \
-	(tclIntStubsPtr->tclGetFrame) /* 32 */
-#endif
-#ifndef TclGetInterpProc
-#define TclGetInterpProc \
-	(tclIntStubsPtr->tclGetInterpProc) /* 33 */
-#endif
-#ifndef TclGetIntForIndex
-#define TclGetIntForIndex \
-	(tclIntStubsPtr->tclGetIntForIndex) /* 34 */
-#endif
-#ifndef TclGetIndexedScalar
-#define TclGetIndexedScalar \
-	(tclIntStubsPtr->tclGetIndexedScalar) /* 35 */
-#endif
-#ifndef TclGetLong
-#define TclGetLong \
-	(tclIntStubsPtr->tclGetLong) /* 36 */
-#endif
-#ifndef TclGetLoadedPackages
-#define TclGetLoadedPackages \
-	(tclIntStubsPtr->tclGetLoadedPackages) /* 37 */
-#endif
-#ifndef TclGetNamespaceForQualName
-#define TclGetNamespaceForQualName \
-	(tclIntStubsPtr->tclGetNamespaceForQualName) /* 38 */
-#endif
-#ifndef TclGetObjInterpProc
-#define TclGetObjInterpProc \
-	(tclIntStubsPtr->tclGetObjInterpProc) /* 39 */
-#endif
-#ifndef TclGetOpenMode
-#define TclGetOpenMode \
-	(tclIntStubsPtr->tclGetOpenMode) /* 40 */
-#endif
-#ifndef TclGetOriginalCommand
-#define TclGetOriginalCommand \
-	(tclIntStubsPtr->tclGetOriginalCommand) /* 41 */
-#endif
-#ifndef TclpGetUserHome
-#define TclpGetUserHome \
-	(tclIntStubsPtr->tclpGetUserHome) /* 42 */
-#endif
-#ifndef TclGlobalInvoke
-#define TclGlobalInvoke \
-	(tclIntStubsPtr->tclGlobalInvoke) /* 43 */
-#endif
-#ifndef TclGuessPackageName
-#define TclGuessPackageName \
-	(tclIntStubsPtr->tclGuessPackageName) /* 44 */
-#endif
-#ifndef TclHideUnsafeCommands
-#define TclHideUnsafeCommands \
-	(tclIntStubsPtr->tclHideUnsafeCommands) /* 45 */
-#endif
-#ifndef TclInExit
-#define TclInExit \
-	(tclIntStubsPtr->tclInExit) /* 46 */
-#endif
-#ifndef TclIncrElementOfIndexedArray
-#define TclIncrElementOfIndexedArray \
-	(tclIntStubsPtr->tclIncrElementOfIndexedArray) /* 47 */
-#endif
-#ifndef TclIncrIndexedScalar
-#define TclIncrIndexedScalar \
-	(tclIntStubsPtr->tclIncrIndexedScalar) /* 48 */
-#endif
-#ifndef TclIncrVar2
-#define TclIncrVar2 \
-	(tclIntStubsPtr->tclIncrVar2) /* 49 */
-#endif
-#ifndef TclInitCompiledLocals
-#define TclInitCompiledLocals \
-	(tclIntStubsPtr->tclInitCompiledLocals) /* 50 */
-#endif
-#ifndef TclInterpInit
-#define TclInterpInit \
-	(tclIntStubsPtr->tclInterpInit) /* 51 */
-#endif
-#ifndef TclInvoke
-#define TclInvoke \
-	(tclIntStubsPtr->tclInvoke) /* 52 */
-#endif
-#ifndef TclInvokeObjectCommand
-#define TclInvokeObjectCommand \
-	(tclIntStubsPtr->tclInvokeObjectCommand) /* 53 */
-#endif
-#ifndef TclInvokeStringCommand
-#define TclInvokeStringCommand \
-	(tclIntStubsPtr->tclInvokeStringCommand) /* 54 */
-#endif
-#ifndef TclIsProc
-#define TclIsProc \
-	(tclIntStubsPtr->tclIsProc) /* 55 */
-#endif
-/* Slot 56 is reserved */
-/* Slot 57 is reserved */
-#ifndef TclLookupVar
-#define TclLookupVar \
-	(tclIntStubsPtr->tclLookupVar) /* 58 */
-#endif
-#ifndef TclpMatchFiles
-#define TclpMatchFiles \
-	(tclIntStubsPtr->tclpMatchFiles) /* 59 */
-#endif
-#ifndef TclNeedSpace
-#define TclNeedSpace \
-	(tclIntStubsPtr->tclNeedSpace) /* 60 */
-#endif
-#ifndef TclNewProcBodyObj
-#define TclNewProcBodyObj \
-	(tclIntStubsPtr->tclNewProcBodyObj) /* 61 */
-#endif
-#ifndef TclObjCommandComplete
-#define TclObjCommandComplete \
-	(tclIntStubsPtr->tclObjCommandComplete) /* 62 */
-#endif
-#ifndef TclObjInterpProc
-#define TclObjInterpProc \
-	(tclIntStubsPtr->tclObjInterpProc) /* 63 */
-#endif
-#ifndef TclObjInvoke
-#define TclObjInvoke \
-	(tclIntStubsPtr->tclObjInvoke) /* 64 */
-#endif
-#ifndef TclObjInvokeGlobal
-#define TclObjInvokeGlobal \
-	(tclIntStubsPtr->tclObjInvokeGlobal) /* 65 */
-#endif
-#ifndef TclOpenFileChannelDeleteProc
-#define TclOpenFileChannelDeleteProc \
-	(tclIntStubsPtr->tclOpenFileChannelDeleteProc) /* 66 */
-#endif
-#ifndef TclOpenFileChannelInsertProc
-#define TclOpenFileChannelInsertProc \
-	(tclIntStubsPtr->tclOpenFileChannelInsertProc) /* 67 */
-#endif
-#ifndef TclpAccess
-#define TclpAccess \
-	(tclIntStubsPtr->tclpAccess) /* 68 */
-#endif
-#ifndef TclpAlloc
-#define TclpAlloc \
-	(tclIntStubsPtr->tclpAlloc) /* 69 */
-#endif
-#ifndef TclpCopyFile
-#define TclpCopyFile \
-	(tclIntStubsPtr->tclpCopyFile) /* 70 */
-#endif
-#ifndef TclpCopyDirectory
-#define TclpCopyDirectory \
-	(tclIntStubsPtr->tclpCopyDirectory) /* 71 */
-#endif
-#ifndef TclpCreateDirectory
-#define TclpCreateDirectory \
-	(tclIntStubsPtr->tclpCreateDirectory) /* 72 */
-#endif
-#ifndef TclpDeleteFile
-#define TclpDeleteFile \
-	(tclIntStubsPtr->tclpDeleteFile) /* 73 */
-#endif
-#ifndef TclpFree
-#define TclpFree \
-	(tclIntStubsPtr->tclpFree) /* 74 */
-#endif
-#ifndef TclpGetClicks
-#define TclpGetClicks \
-	(tclIntStubsPtr->tclpGetClicks) /* 75 */
-#endif
-#ifndef TclpGetSeconds
-#define TclpGetSeconds \
-	(tclIntStubsPtr->tclpGetSeconds) /* 76 */
-#endif
-#ifndef TclpGetTime
-#define TclpGetTime \
-	(tclIntStubsPtr->tclpGetTime) /* 77 */
-#endif
-#ifndef TclpGetTimeZone
-#define TclpGetTimeZone \
-	(tclIntStubsPtr->tclpGetTimeZone) /* 78 */
-#endif
-#ifndef TclpListVolumes
-#define TclpListVolumes \
-	(tclIntStubsPtr->tclpListVolumes) /* 79 */
-#endif
-#ifndef TclpOpenFileChannel
-#define TclpOpenFileChannel \
-	(tclIntStubsPtr->tclpOpenFileChannel) /* 80 */
-#endif
-#ifndef TclpRealloc
-#define TclpRealloc \
-	(tclIntStubsPtr->tclpRealloc) /* 81 */
-#endif
-#ifndef TclpRemoveDirectory
-#define TclpRemoveDirectory \
-	(tclIntStubsPtr->tclpRemoveDirectory) /* 82 */
-#endif
-#ifndef TclpRenameFile
-#define TclpRenameFile \
-	(tclIntStubsPtr->tclpRenameFile) /* 83 */
-#endif
-/* Slot 84 is reserved */
-/* Slot 85 is reserved */
-/* Slot 86 is reserved */
-/* Slot 87 is reserved */
-#ifndef TclPrecTraceProc
-#define TclPrecTraceProc \
-	(tclIntStubsPtr->tclPrecTraceProc) /* 88 */
-#endif
-#ifndef TclPreventAliasLoop
-#define TclPreventAliasLoop \
-	(tclIntStubsPtr->tclPreventAliasLoop) /* 89 */
-#endif
-/* Slot 90 is reserved */
-#ifndef TclProcCleanupProc
-#define TclProcCleanupProc \
-	(tclIntStubsPtr->tclProcCleanupProc) /* 91 */
-#endif
-#ifndef TclProcCompileProc
-#define TclProcCompileProc \
-	(tclIntStubsPtr->tclProcCompileProc) /* 92 */
-#endif
-#ifndef TclProcDeleteProc
-#define TclProcDeleteProc \
-	(tclIntStubsPtr->tclProcDeleteProc) /* 93 */
-#endif
-#ifndef TclProcInterpProc
-#define TclProcInterpProc \
-	(tclIntStubsPtr->tclProcInterpProc) /* 94 */
-#endif
-#ifndef TclpStat
-#define TclpStat \
-	(tclIntStubsPtr->tclpStat) /* 95 */
-#endif
-#ifndef TclRenameCommand
-#define TclRenameCommand \
-	(tclIntStubsPtr->tclRenameCommand) /* 96 */
-#endif
-#ifndef TclResetShadowedCmdRefs
-#define TclResetShadowedCmdRefs \
-	(tclIntStubsPtr->tclResetShadowedCmdRefs) /* 97 */
-#endif
-#ifndef TclServiceIdle
-#define TclServiceIdle \
-	(tclIntStubsPtr->tclServiceIdle) /* 98 */
-#endif
-#ifndef TclSetElementOfIndexedArray
-#define TclSetElementOfIndexedArray \
-	(tclIntStubsPtr->tclSetElementOfIndexedArray) /* 99 */
-#endif
-#ifndef TclSetIndexedScalar
-#define TclSetIndexedScalar \
-	(tclIntStubsPtr->tclSetIndexedScalar) /* 100 */
-#endif
-/* Slot 101 is reserved */
-#ifndef TclSetupEnv
-#define TclSetupEnv \
-	(tclIntStubsPtr->tclSetupEnv) /* 102 */
-#endif
-#ifndef TclSockGetPort
-#define TclSockGetPort \
-	(tclIntStubsPtr->tclSockGetPort) /* 103 */
-#endif
-#ifndef TclSockMinimumBuffers
-#define TclSockMinimumBuffers \
-	(tclIntStubsPtr->tclSockMinimumBuffers) /* 104 */
-#endif
-#ifndef TclStat
-#define TclStat \
-	(tclIntStubsPtr->tclStat) /* 105 */
-#endif
-#ifndef TclStatDeleteProc
-#define TclStatDeleteProc \
-	(tclIntStubsPtr->tclStatDeleteProc) /* 106 */
-#endif
-#ifndef TclStatInsertProc
-#define TclStatInsertProc \
-	(tclIntStubsPtr->tclStatInsertProc) /* 107 */
-#endif
-#ifndef TclTeardownNamespace
-#define TclTeardownNamespace \
-	(tclIntStubsPtr->tclTeardownNamespace) /* 108 */
-#endif
-#ifndef TclUpdateReturnInfo
-#define TclUpdateReturnInfo \
-	(tclIntStubsPtr->tclUpdateReturnInfo) /* 109 */
-#endif
-/* Slot 110 is reserved */
-#ifndef Tcl_AddInterpResolvers
-#define Tcl_AddInterpResolvers \
-	(tclIntStubsPtr->tcl_AddInterpResolvers) /* 111 */
-#endif
-#ifndef Tcl_AppendExportList
-#define Tcl_AppendExportList \
-	(tclIntStubsPtr->tcl_AppendExportList) /* 112 */
-#endif
-#ifndef Tcl_CreateNamespace
-#define Tcl_CreateNamespace \
-	(tclIntStubsPtr->tcl_CreateNamespace) /* 113 */
-#endif
-#ifndef Tcl_DeleteNamespace
-#define Tcl_DeleteNamespace \
-	(tclIntStubsPtr->tcl_DeleteNamespace) /* 114 */
-#endif
-#ifndef Tcl_Export
-#define Tcl_Export \
-	(tclIntStubsPtr->tcl_Export) /* 115 */
-#endif
-#ifndef Tcl_FindCommand
-#define Tcl_FindCommand \
-	(tclIntStubsPtr->tcl_FindCommand) /* 116 */
-#endif
-#ifndef Tcl_FindNamespace
-#define Tcl_FindNamespace \
-	(tclIntStubsPtr->tcl_FindNamespace) /* 117 */
-#endif
-#ifndef Tcl_GetInterpResolvers
-#define Tcl_GetInterpResolvers \
-	(tclIntStubsPtr->tcl_GetInterpResolvers) /* 118 */
-#endif
-#ifndef Tcl_GetNamespaceResolvers
-#define Tcl_GetNamespaceResolvers \
-	(tclIntStubsPtr->tcl_GetNamespaceResolvers) /* 119 */
-#endif
-#ifndef Tcl_FindNamespaceVar
-#define Tcl_FindNamespaceVar \
-	(tclIntStubsPtr->tcl_FindNamespaceVar) /* 120 */
-#endif
-#ifndef Tcl_ForgetImport
-#define Tcl_ForgetImport \
-	(tclIntStubsPtr->tcl_ForgetImport) /* 121 */
-#endif
-#ifndef Tcl_GetCommandFromObj
-#define Tcl_GetCommandFromObj \
-	(tclIntStubsPtr->tcl_GetCommandFromObj) /* 122 */
-#endif
-#ifndef Tcl_GetCommandFullName
-#define Tcl_GetCommandFullName \
-	(tclIntStubsPtr->tcl_GetCommandFullName) /* 123 */
-#endif
-#ifndef Tcl_GetCurrentNamespace
-#define Tcl_GetCurrentNamespace \
-	(tclIntStubsPtr->tcl_GetCurrentNamespace) /* 124 */
-#endif
-#ifndef Tcl_GetGlobalNamespace
-#define Tcl_GetGlobalNamespace \
-	(tclIntStubsPtr->tcl_GetGlobalNamespace) /* 125 */
-#endif
-#ifndef Tcl_GetVariableFullName
-#define Tcl_GetVariableFullName \
-	(tclIntStubsPtr->tcl_GetVariableFullName) /* 126 */
-#endif
-#ifndef Tcl_Import
-#define Tcl_Import \
-	(tclIntStubsPtr->tcl_Import) /* 127 */
-#endif
-#ifndef Tcl_PopCallFrame
-#define Tcl_PopCallFrame \
-	(tclIntStubsPtr->tcl_PopCallFrame) /* 128 */
-#endif
-#ifndef Tcl_PushCallFrame
-#define Tcl_PushCallFrame \
-	(tclIntStubsPtr->tcl_PushCallFrame) /* 129 */
-#endif
-#ifndef Tcl_RemoveInterpResolvers
-#define Tcl_RemoveInterpResolvers \
-	(tclIntStubsPtr->tcl_RemoveInterpResolvers) /* 130 */
-#endif
-#ifndef Tcl_SetNamespaceResolvers
-#define Tcl_SetNamespaceResolvers \
-	(tclIntStubsPtr->tcl_SetNamespaceResolvers) /* 131 */
-#endif
-#ifndef TclpHasSockets
-#define TclpHasSockets \
-	(tclIntStubsPtr->tclpHasSockets) /* 132 */
-#endif
-#ifndef TclpGetDate
-#define TclpGetDate \
-	(tclIntStubsPtr->tclpGetDate) /* 133 */
-#endif
-#ifndef TclpStrftime
-#define TclpStrftime \
-	(tclIntStubsPtr->tclpStrftime) /* 134 */
-#endif
-#ifndef TclpCheckStackSpace
-#define TclpCheckStackSpace \
-	(tclIntStubsPtr->tclpCheckStackSpace) /* 135 */
-#endif
-/* Slot 136 is reserved */
-#ifndef TclpChdir
-#define TclpChdir \
-	(tclIntStubsPtr->tclpChdir) /* 137 */
-#endif
-#ifndef TclGetEnv
-#define TclGetEnv \
-	(tclIntStubsPtr->tclGetEnv) /* 138 */
-#endif
-#ifndef TclpLoadFile
-#define TclpLoadFile \
-	(tclIntStubsPtr->tclpLoadFile) /* 139 */
-#endif
-#ifndef TclLooksLikeInt
-#define TclLooksLikeInt \
-	(tclIntStubsPtr->tclLooksLikeInt) /* 140 */
-#endif
-#ifndef TclpGetCwd
-#define TclpGetCwd \
-	(tclIntStubsPtr->tclpGetCwd) /* 141 */
-#endif
-
-#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
-
-/* !END!: Do not edit above this line. */
-
-#endif /* _TCLINTDECLS */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
deleted file mode 100644
index 628a03b..0000000
--- a/generic/tclIntPlatDecls.h
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * tclIntPlatDecls.h --
- *
- *	This file contains the declarations for all platform dependent
- *	unsupported functions that are exported by the Tcl library.  These
- *	interfaces are not guaranteed to remain the same between
- *	versions.  Use at your own risk.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- * All rights reserved.
- *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.5 1999/04/16 00:46:48 stanton Exp $
- */
-
-#ifndef _TCLINTPLATDECLS
-#define _TCLINTPLATDECLS
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tclInt.decls script.
- */
-
-/* !BEGIN!: Do not edit below this line. */
-
-/*
- * Exported function declarations:
- */
-
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* 0 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
-/* 1 */
-EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
-/* 2 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
-/* 3 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
-/* 4 */
-EXTERN int		TclpCreateProcess _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv, TclFile inputFile, 
-				TclFile outputFile, TclFile errorFile, 
-				Tcl_Pid * pidPtr));
-/* Slot 5 is reserved */
-/* 6 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel, 
-				int direction));
-/* 7 */
-EXTERN TclFile		TclpOpenFile _ANSI_ARGS_((CONST char * fname, 
-				int mode));
-/* 8 */
-EXTERN int		TclUnixWaitForFile _ANSI_ARGS_((int fd, int mask, 
-				int timeout));
-/* 9 */
-EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
-				CONST char * contents));
-#endif /* UNIX */
-#ifdef __WIN32__
-/* 0 */
-EXTERN void		TclWinConvertError _ANSI_ARGS_((DWORD errCode));
-/* 1 */
-EXTERN void		TclWinConvertWSAError _ANSI_ARGS_((DWORD errCode));
-/* 2 */
-EXTERN struct servent *	 TclWinGetServByName _ANSI_ARGS_((CONST char * nm, 
-				CONST char * proto));
-/* 3 */
-EXTERN int		TclWinGetSockOpt _ANSI_ARGS_((SOCKET s, int level, 
-				int optname, char FAR * optval, 
-				int FAR * optlen));
-/* 4 */
-EXTERN HINSTANCE	TclWinGetTclInstance _ANSI_ARGS_((void));
-/* Slot 5 is reserved */
-/* 6 */
-EXTERN u_short		TclWinNToHS _ANSI_ARGS_((u_short ns));
-/* 7 */
-EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((SOCKET s, int level, 
-				int optname, CONST char FAR * optval, 
-				int optlen));
-/* 8 */
-EXTERN unsigned long	TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
-/* 9 */
-EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
-/* 10 */
-EXTERN int		TclWinSynchSpawn _ANSI_ARGS_((void * args, int type, 
-				void ** trans, Tcl_Pid * pidPtr));
-/* 11 */
-EXTERN void		TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp * interp, 
-				Tcl_Channel chan));
-/* 12 */
-EXTERN int		TclpCloseFile _ANSI_ARGS_((TclFile file));
-/* 13 */
-EXTERN Tcl_Channel	TclpCreateCommandChannel _ANSI_ARGS_((
-				TclFile readFile, TclFile writeFile, 
-				TclFile errorFile, int numPids, 
-				Tcl_Pid * pidPtr));
-/* 14 */
-EXTERN int		TclpCreatePipe _ANSI_ARGS_((TclFile * readPipe, 
-				TclFile * writePipe));
-/* 15 */
-EXTERN int		TclpCreateProcess _ANSI_ARGS_((Tcl_Interp * interp, 
-				int argc, char ** argv, TclFile inputFile, 
-				TclFile outputFile, TclFile errorFile, 
-				Tcl_Pid * pidPtr));
-/* Slot 16 is reserved */
-/* Slot 17 is reserved */
-/* 18 */
-EXTERN TclFile		TclpMakeFile _ANSI_ARGS_((Tcl_Channel channel, 
-				int direction));
-/* 19 */
-EXTERN TclFile		TclpOpenFile _ANSI_ARGS_((CONST char * fname, 
-				int mode));
-/* 20 */
-EXTERN void		TclWinAddProcess _ANSI_ARGS_((HANDLE hProcess, 
-				DWORD id));
-/* 21 */
-EXTERN void		TclpAsyncMark _ANSI_ARGS_((Tcl_AsyncHandler async));
-/* 22 */
-EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
-				CONST char * contents));
-/* 23 */
-EXTERN char *		TclpGetTZName _ANSI_ARGS_((int isdst));
-/* 24 */
-EXTERN char *		TclWinNoBackslash _ANSI_ARGS_((char * path));
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-/* 0 */
-EXTERN VOID *		TclpSysAlloc _ANSI_ARGS_((long size, int isBin));
-/* 1 */
-EXTERN void		TclpSysFree _ANSI_ARGS_((VOID * ptr));
-/* 2 */
-EXTERN VOID *		TclpSysRealloc _ANSI_ARGS_((VOID * cp, 
-				unsigned int size));
-/* 3 */
-EXTERN void		TclpExit _ANSI_ARGS_((int status));
-/* 4 */
-EXTERN int		FSpGetDefaultDir _ANSI_ARGS_((FSSpecPtr theSpec));
-/* 5 */
-EXTERN int		FSpSetDefaultDir _ANSI_ARGS_((FSSpecPtr theSpec));
-/* 6 */
-EXTERN OSErr		FSpFindFolder _ANSI_ARGS_((short vRefNum, 
-				OSType folderType, Boolean createFolder, 
-				FSSpec * spec));
-/* 7 */
-EXTERN void		GetGlobalMouse _ANSI_ARGS_((Point * mouse));
-/* 8 */
-EXTERN pascal OSErr	FSpGetDirectoryID _ANSI_ARGS_((CONST FSSpec * spec, 
-				long * theDirID, Boolean * isDirectory));
-/* 9 */
-EXTERN pascal short	FSpOpenResFileCompat _ANSI_ARGS_((
-				CONST FSSpec * spec, SignedByte permission));
-/* 10 */
-EXTERN pascal void	FSpCreateResFileCompat _ANSI_ARGS_((
-				CONST FSSpec * spec, OSType creator, 
-				OSType fileType, ScriptCode scriptTag));
-/* 11 */
-EXTERN int		FSpLocationFromPath _ANSI_ARGS_((int length, 
-				CONST char * path, FSSpecPtr theSpec));
-/* 12 */
-EXTERN OSErr		FSpPathFromLocation _ANSI_ARGS_((FSSpecPtr theSpec, 
-				int * length, Handle * fullPath));
-/* 13 */
-EXTERN void		TclMacExitHandler _ANSI_ARGS_((void));
-/* 14 */
-EXTERN void		TclMacInitExitToShell _ANSI_ARGS_((int usePatch));
-/* 15 */
-EXTERN OSErr		TclMacInstallExitToShellPatch _ANSI_ARGS_((
-				ExitToShellProcPtr newProc));
-/* 16 */
-EXTERN int		TclMacOSErrorToPosixError _ANSI_ARGS_((int error));
-/* 17 */
-EXTERN void		TclMacRemoveTimer _ANSI_ARGS_((void * timerToken));
-/* 18 */
-EXTERN void *		TclMacStartTimer _ANSI_ARGS_((long ms));
-/* 19 */
-EXTERN int		TclMacTimerExpired _ANSI_ARGS_((void * timerToken));
-/* 20 */
-EXTERN int		TclMacRegisterResourceFork _ANSI_ARGS_((
-				short fileRef, Tcl_Obj * tokenPtr, 
-				int insert));
-/* 21 */
-EXTERN short		TclMacUnRegisterResourceFork _ANSI_ARGS_((
-				char * tokenPtr, Tcl_Obj * resultPtr));
-/* 22 */
-EXTERN int		TclMacCreateEnv _ANSI_ARGS_((void));
-/* 23 */
-EXTERN FILE *		TclMacFOpenHack _ANSI_ARGS_((CONST char * path, 
-				CONST char * mode));
-/* Slot 24 is reserved */
-/* 25 */
-EXTERN int		TclMacChmod _ANSI_ARGS_((char * path, int mode));
-#endif /* MAC_TCL */
-
-typedef struct TclIntPlatStubs {
-    int magic;
-    struct TclIntPlatStubHooks *hooks;
-
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 0 */
-    int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 1 */
-    Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 2 */
-    int (*tclpCreatePipe) _ANSI_ARGS_((TclFile * readPipe, TclFile * writePipe)); /* 3 */
-    int (*tclpCreateProcess) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr)); /* 4 */
-    void *reserved5;
-    TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 6 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 7 */
-    int (*tclUnixWaitForFile) _ANSI_ARGS_((int fd, int mask, int timeout)); /* 8 */
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 9 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    void (*tclWinConvertError) _ANSI_ARGS_((DWORD errCode)); /* 0 */
-    void (*tclWinConvertWSAError) _ANSI_ARGS_((DWORD errCode)); /* 1 */
-    struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char * nm, CONST char * proto)); /* 2 */
-    int (*tclWinGetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, char FAR * optval, int FAR * optlen)); /* 3 */
-    HINSTANCE (*tclWinGetTclInstance) _ANSI_ARGS_((void)); /* 4 */
-    void *reserved5;
-    u_short (*tclWinNToHS) _ANSI_ARGS_((u_short ns)); /* 6 */
-    int (*tclWinSetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, CONST char FAR * optval, int optlen)); /* 7 */
-    unsigned long (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
-    int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */
-    int (*tclWinSynchSpawn) _ANSI_ARGS_((void * args, int type, void ** trans, Tcl_Pid * pidPtr)); /* 10 */
-    void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 11 */
-    int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 12 */
-    Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 13 */
-    int (*tclpCreatePipe) _ANSI_ARGS_((TclFile * readPipe, TclFile * writePipe)); /* 14 */
-    int (*tclpCreateProcess) _ANSI_ARGS_((Tcl_Interp * interp, int argc, char ** argv, TclFile inputFile, TclFile outputFile, TclFile errorFile, Tcl_Pid * pidPtr)); /* 15 */
-    void *reserved16;
-    void *reserved17;
-    TclFile (*tclpMakeFile) _ANSI_ARGS_((Tcl_Channel channel, int direction)); /* 18 */
-    TclFile (*tclpOpenFile) _ANSI_ARGS_((CONST char * fname, int mode)); /* 19 */
-    void (*tclWinAddProcess) _ANSI_ARGS_((HANDLE hProcess, DWORD id)); /* 20 */
-    void (*tclpAsyncMark) _ANSI_ARGS_((Tcl_AsyncHandler async)); /* 21 */
-    TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 22 */
-    char * (*tclpGetTZName) _ANSI_ARGS_((int isdst)); /* 23 */
-    char * (*tclWinNoBackslash) _ANSI_ARGS_((char * path)); /* 24 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    VOID * (*tclpSysAlloc) _ANSI_ARGS_((long size, int isBin)); /* 0 */
-    void (*tclpSysFree) _ANSI_ARGS_((VOID * ptr)); /* 1 */
-    VOID * (*tclpSysRealloc) _ANSI_ARGS_((VOID * cp, unsigned int size)); /* 2 */
-    void (*tclpExit) _ANSI_ARGS_((int status)); /* 3 */
-    int (*fSpGetDefaultDir) _ANSI_ARGS_((FSSpecPtr theSpec)); /* 4 */
-    int (*fSpSetDefaultDir) _ANSI_ARGS_((FSSpecPtr theSpec)); /* 5 */
-    OSErr (*fSpFindFolder) _ANSI_ARGS_((short vRefNum, OSType folderType, Boolean createFolder, FSSpec * spec)); /* 6 */
-    void (*getGlobalMouse) _ANSI_ARGS_((Point * mouse)); /* 7 */
-    pascal OSErr (*fSpGetDirectoryID) _ANSI_ARGS_((CONST FSSpec * spec, long * theDirID, Boolean * isDirectory)); /* 8 */
-    pascal short (*fSpOpenResFileCompat) _ANSI_ARGS_((CONST FSSpec * spec, SignedByte permission)); /* 9 */
-    pascal void (*fSpCreateResFileCompat) _ANSI_ARGS_((CONST FSSpec * spec, OSType creator, OSType fileType, ScriptCode scriptTag)); /* 10 */
-    int (*fSpLocationFromPath) _ANSI_ARGS_((int length, CONST char * path, FSSpecPtr theSpec)); /* 11 */
-    OSErr (*fSpPathFromLocation) _ANSI_ARGS_((FSSpecPtr theSpec, int * length, Handle * fullPath)); /* 12 */
-    void (*tclMacExitHandler) _ANSI_ARGS_((void)); /* 13 */
-    void (*tclMacInitExitToShell) _ANSI_ARGS_((int usePatch)); /* 14 */
-    OSErr (*tclMacInstallExitToShellPatch) _ANSI_ARGS_((ExitToShellProcPtr newProc)); /* 15 */
-    int (*tclMacOSErrorToPosixError) _ANSI_ARGS_((int error)); /* 16 */
-    void (*tclMacRemoveTimer) _ANSI_ARGS_((void * timerToken)); /* 17 */
-    void * (*tclMacStartTimer) _ANSI_ARGS_((long ms)); /* 18 */
-    int (*tclMacTimerExpired) _ANSI_ARGS_((void * timerToken)); /* 19 */
-    int (*tclMacRegisterResourceFork) _ANSI_ARGS_((short fileRef, Tcl_Obj * tokenPtr, int insert)); /* 20 */
-    short (*tclMacUnRegisterResourceFork) _ANSI_ARGS_((char * tokenPtr, Tcl_Obj * resultPtr)); /* 21 */
-    int (*tclMacCreateEnv) _ANSI_ARGS_((void)); /* 22 */
-    FILE * (*tclMacFOpenHack) _ANSI_ARGS_((CONST char * path, CONST char * mode)); /* 23 */
-    void *reserved24;
-    int (*tclMacChmod) _ANSI_ARGS_((char * path, int mode)); /* 25 */
-#endif /* MAC_TCL */
-} TclIntPlatStubs;
-
-extern TclIntPlatStubs *tclIntPlatStubsPtr;
-
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-
-/*
- * Inline function declarations:
- */
-
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-#ifndef TclGetAndDetachPids
-#define TclGetAndDetachPids \
-	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */
-#endif
-#ifndef TclpCloseFile
-#define TclpCloseFile \
-	(tclIntPlatStubsPtr->tclpCloseFile) /* 1 */
-#endif
-#ifndef TclpCreateCommandChannel
-#define TclpCreateCommandChannel \
-	(tclIntPlatStubsPtr->tclpCreateCommandChannel) /* 2 */
-#endif
-#ifndef TclpCreatePipe
-#define TclpCreatePipe \
-	(tclIntPlatStubsPtr->tclpCreatePipe) /* 3 */
-#endif
-#ifndef TclpCreateProcess
-#define TclpCreateProcess \
-	(tclIntPlatStubsPtr->tclpCreateProcess) /* 4 */
-#endif
-/* Slot 5 is reserved */
-#ifndef TclpMakeFile
-#define TclpMakeFile \
-	(tclIntPlatStubsPtr->tclpMakeFile) /* 6 */
-#endif
-#ifndef TclpOpenFile
-#define TclpOpenFile \
-	(tclIntPlatStubsPtr->tclpOpenFile) /* 7 */
-#endif
-#ifndef TclUnixWaitForFile
-#define TclUnixWaitForFile \
-	(tclIntPlatStubsPtr->tclUnixWaitForFile) /* 8 */
-#endif
-#ifndef TclpCreateTempFile
-#define TclpCreateTempFile \
-	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 9 */
-#endif
-#endif /* UNIX */
-#ifdef __WIN32__
-#ifndef TclWinConvertError
-#define TclWinConvertError \
-	(tclIntPlatStubsPtr->tclWinConvertError) /* 0 */
-#endif
-#ifndef TclWinConvertWSAError
-#define TclWinConvertWSAError \
-	(tclIntPlatStubsPtr->tclWinConvertWSAError) /* 1 */
-#endif
-#ifndef TclWinGetServByName
-#define TclWinGetServByName \
-	(tclIntPlatStubsPtr->tclWinGetServByName) /* 2 */
-#endif
-#ifndef TclWinGetSockOpt
-#define TclWinGetSockOpt \
-	(tclIntPlatStubsPtr->tclWinGetSockOpt) /* 3 */
-#endif
-#ifndef TclWinGetTclInstance
-#define TclWinGetTclInstance \
-	(tclIntPlatStubsPtr->tclWinGetTclInstance) /* 4 */
-#endif
-/* Slot 5 is reserved */
-#ifndef TclWinNToHS
-#define TclWinNToHS \
-	(tclIntPlatStubsPtr->tclWinNToHS) /* 6 */
-#endif
-#ifndef TclWinSetSockOpt
-#define TclWinSetSockOpt \
-	(tclIntPlatStubsPtr->tclWinSetSockOpt) /* 7 */
-#endif
-#ifndef TclpGetPid
-#define TclpGetPid \
-	(tclIntPlatStubsPtr->tclpGetPid) /* 8 */
-#endif
-#ifndef TclWinGetPlatformId
-#define TclWinGetPlatformId \
-	(tclIntPlatStubsPtr->tclWinGetPlatformId) /* 9 */
-#endif
-#ifndef TclWinSynchSpawn
-#define TclWinSynchSpawn \
-	(tclIntPlatStubsPtr->tclWinSynchSpawn) /* 10 */
-#endif
-#ifndef TclGetAndDetachPids
-#define TclGetAndDetachPids \
-	(tclIntPlatStubsPtr->tclGetAndDetachPids) /* 11 */
-#endif
-#ifndef TclpCloseFile
-#define TclpCloseFile \
-	(tclIntPlatStubsPtr->tclpCloseFile) /* 12 */
-#endif
-#ifndef TclpCreateCommandChannel
-#define TclpCreateCommandChannel \
-	(tclIntPlatStubsPtr->tclpCreateCommandChannel) /* 13 */
-#endif
-#ifndef TclpCreatePipe
-#define TclpCreatePipe \
-	(tclIntPlatStubsPtr->tclpCreatePipe) /* 14 */
-#endif
-#ifndef TclpCreateProcess
-#define TclpCreateProcess \
-	(tclIntPlatStubsPtr->tclpCreateProcess) /* 15 */
-#endif
-/* Slot 16 is reserved */
-/* Slot 17 is reserved */
-#ifndef TclpMakeFile
-#define TclpMakeFile \
-	(tclIntPlatStubsPtr->tclpMakeFile) /* 18 */
-#endif
-#ifndef TclpOpenFile
-#define TclpOpenFile \
-	(tclIntPlatStubsPtr->tclpOpenFile) /* 19 */
-#endif
-#ifndef TclWinAddProcess
-#define TclWinAddProcess \
-	(tclIntPlatStubsPtr->tclWinAddProcess) /* 20 */
-#endif
-#ifndef TclpAsyncMark
-#define TclpAsyncMark \
-	(tclIntPlatStubsPtr->tclpAsyncMark) /* 21 */
-#endif
-#ifndef TclpCreateTempFile
-#define TclpCreateTempFile \
-	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */
-#endif
-#ifndef TclpGetTZName
-#define TclpGetTZName \
-	(tclIntPlatStubsPtr->tclpGetTZName) /* 23 */
-#endif
-#ifndef TclWinNoBackslash
-#define TclWinNoBackslash \
-	(tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */
-#endif
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TclpSysAlloc
-#define TclpSysAlloc \
-	(tclIntPlatStubsPtr->tclpSysAlloc) /* 0 */
-#endif
-#ifndef TclpSysFree
-#define TclpSysFree \
-	(tclIntPlatStubsPtr->tclpSysFree) /* 1 */
-#endif
-#ifndef TclpSysRealloc
-#define TclpSysRealloc \
-	(tclIntPlatStubsPtr->tclpSysRealloc) /* 2 */
-#endif
-#ifndef TclpExit
-#define TclpExit \
-	(tclIntPlatStubsPtr->tclpExit) /* 3 */
-#endif
-#ifndef FSpGetDefaultDir
-#define FSpGetDefaultDir \
-	(tclIntPlatStubsPtr->fSpGetDefaultDir) /* 4 */
-#endif
-#ifndef FSpSetDefaultDir
-#define FSpSetDefaultDir \
-	(tclIntPlatStubsPtr->fSpSetDefaultDir) /* 5 */
-#endif
-#ifndef FSpFindFolder
-#define FSpFindFolder \
-	(tclIntPlatStubsPtr->fSpFindFolder) /* 6 */
-#endif
-#ifndef GetGlobalMouse
-#define GetGlobalMouse \
-	(tclIntPlatStubsPtr->getGlobalMouse) /* 7 */
-#endif
-#ifndef FSpGetDirectoryID
-#define FSpGetDirectoryID \
-	(tclIntPlatStubsPtr->fSpGetDirectoryID) /* 8 */
-#endif
-#ifndef FSpOpenResFileCompat
-#define FSpOpenResFileCompat \
-	(tclIntPlatStubsPtr->fSpOpenResFileCompat) /* 9 */
-#endif
-#ifndef FSpCreateResFileCompat
-#define FSpCreateResFileCompat \
-	(tclIntPlatStubsPtr->fSpCreateResFileCompat) /* 10 */
-#endif
-#ifndef FSpLocationFromPath
-#define FSpLocationFromPath \
-	(tclIntPlatStubsPtr->fSpLocationFromPath) /* 11 */
-#endif
-#ifndef FSpPathFromLocation
-#define FSpPathFromLocation \
-	(tclIntPlatStubsPtr->fSpPathFromLocation) /* 12 */
-#endif
-#ifndef TclMacExitHandler
-#define TclMacExitHandler \
-	(tclIntPlatStubsPtr->tclMacExitHandler) /* 13 */
-#endif
-#ifndef TclMacInitExitToShell
-#define TclMacInitExitToShell \
-	(tclIntPlatStubsPtr->tclMacInitExitToShell) /* 14 */
-#endif
-#ifndef TclMacInstallExitToShellPatch
-#define TclMacInstallExitToShellPatch \
-	(tclIntPlatStubsPtr->tclMacInstallExitToShellPatch) /* 15 */
-#endif
-#ifndef TclMacOSErrorToPosixError
-#define TclMacOSErrorToPosixError \
-	(tclIntPlatStubsPtr->tclMacOSErrorToPosixError) /* 16 */
-#endif
-#ifndef TclMacRemoveTimer
-#define TclMacRemoveTimer \
-	(tclIntPlatStubsPtr->tclMacRemoveTimer) /* 17 */
-#endif
-#ifndef TclMacStartTimer
-#define TclMacStartTimer \
-	(tclIntPlatStubsPtr->tclMacStartTimer) /* 18 */
-#endif
-#ifndef TclMacTimerExpired
-#define TclMacTimerExpired \
-	(tclIntPlatStubsPtr->tclMacTimerExpired) /* 19 */
-#endif
-#ifndef TclMacRegisterResourceFork
-#define TclMacRegisterResourceFork \
-	(tclIntPlatStubsPtr->tclMacRegisterResourceFork) /* 20 */
-#endif
-#ifndef TclMacUnRegisterResourceFork
-#define TclMacUnRegisterResourceFork \
-	(tclIntPlatStubsPtr->tclMacUnRegisterResourceFork) /* 21 */
-#endif
-#ifndef TclMacCreateEnv
-#define TclMacCreateEnv \
-	(tclIntPlatStubsPtr->tclMacCreateEnv) /* 22 */
-#endif
-#ifndef TclMacFOpenHack
-#define TclMacFOpenHack \
-	(tclIntPlatStubsPtr->tclMacFOpenHack) /* 23 */
-#endif
-/* Slot 24 is reserved */
-#ifndef TclMacChmod
-#define TclMacChmod \
-	(tclIntPlatStubsPtr->tclMacChmod) /* 25 */
-#endif
-#endif /* MAC_TCL */
-
-#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
-
-/* !END!: Do not edit above this line. */
-
-#endif /* _TCLINTPLATDECLS */
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
deleted file mode 100644
index a5e7563..0000000
--- a/generic/tclInterp.c
+++ /dev/null
@@ -1,2355 +0,0 @@
-/* 
- * tclInterp.c --
- *
- *	This file implements the "interp" command which allows creation
- *	and manipulation of Tcl interpreters from within Tcl scripts.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclInterp.c,v 1.5 1999/04/16 00:46:49 stanton Exp $
- */
-
-#include <stdio.h>
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Counter for how many aliases were created (global)
- */
-
-static int aliasCounter = 0;
-TCL_DECLARE_MUTEX(cntMutex)
-
-/*
- * struct Alias:
- *
- * Stores information about an alias. Is stored in the slave interpreter
- * and used by the source command to find the target command in the master
- * when the source command is invoked.
- */
-
-typedef struct Alias {
-    Tcl_Obj *namePtr;		/* Name of alias command in slave interp. */
-    Tcl_Interp *targetInterp;	/* Interp in which target command will be
-				 * invoked. */
-    Tcl_Obj *prefixPtr;		/* Tcl list making up the prefix of the
-				 * target command to be invoked in the target
-				 * interpreter.  Additional arguments
-				 * specified when calling the alias in the
-				 * slave interp will be appended to the prefix
-				 * before the command is invoked. */
-    Tcl_Command slaveCmd;	/* Source command in slave interpreter,
-				 * bound to command that invokes the target
-				 * command in the target interpreter. */
-    Tcl_HashEntry *aliasEntryPtr;
-				/* Entry for the alias hash table in slave.
-                                 * This is used by alias deletion to remove
-                                 * the alias from the slave interpreter
-                                 * alias table. */
-    Tcl_HashEntry *targetEntryPtr;
-				/* Entry for target command in master.
-                                 * This is used in the master interpreter to
-                                 * map back from the target command to aliases
-                                 * redirecting to it. Random access to this
-                                 * hash table is never required - we are using
-                                 * a hash table only for convenience. */
-} Alias;
-
-/*
- *
- * struct Slave:
- *
- * Used by the "interp" command to record and find information about slave
- * interpreters. Maps from a command name in the master to information about
- * a slave interpreter, e.g. what aliases are defined in it.
- */
-
-typedef struct Slave {
-    Tcl_Interp *masterInterp;	/* Master interpreter for this slave. */
-    Tcl_HashEntry *slaveEntryPtr;
-				/* Hash entry in masters slave table for
-                                 * this slave interpreter.  Used to find
-                                 * this record, and used when deleting the
-                                 * slave interpreter to delete it from the
-                                 * master's table. */
-    Tcl_Interp	*slaveInterp;	/* The slave interpreter. */
-    Tcl_Command interpCmd;	/* Interpreter object command. */
-    Tcl_HashTable aliasTable;	/* Table which maps from names of commands
-                                 * in slave interpreter to struct Alias
-                                 * defined below. */
-} Slave;
-
-/*
- * struct Target:
- *
- * Maps from master interpreter commands back to the source commands in slave
- * interpreters. This is needed because aliases can be created between sibling
- * interpreters and must be deleted when the target interpreter is deleted. In
- * case they would not be deleted the source interpreter would be left with a
- * "dangling pointer". One such record is stored in the Master record of the
- * master interpreter (in the targetTable hashtable, see below) with the
- * master for each alias which directs to a command in the master. These
- * records are used to remove the source command for an from a slave if/when
- * the master is deleted.
- */
-
-typedef struct Target {
-    Tcl_Command	slaveCmd;	/* Command for alias in slave interp. */
-    Tcl_Interp *slaveInterp;	/* Slave Interpreter. */
-} Target;
-
-/*
- * struct Master:
- *
- * This record is used for two purposes: First, slaveTable (a hashtable)
- * maps from names of commands to slave interpreters. This hashtable is
- * used to store information about slave interpreters of this interpreter,
- * to map over all slaves, etc. The second purpose is to store information
- * about all aliases in slaves (or siblings) which direct to target commands
- * in this interpreter (using the targetTable hashtable).
- * 
- * NB: the flags field in the interp structure, used with SAFE_INTERP
- * mask denotes whether the interpreter is safe or not. Safe
- * interpreters have restricted functionality, can only create safe slave
- * interpreters and can only load safe extensions.
- */
-
-typedef struct Master {
-    Tcl_HashTable slaveTable;	/* Hash table for slave interpreters.
-                                 * Maps from command names to Slave records. */
-    Tcl_HashTable targetTable;	/* Hash table for Target Records. Contains
-                                 * all Target records which denote aliases
-                                 * from slaves or sibling interpreters that
-                                 * direct to commands in this interpreter. This
-                                 * table is used to remove dangling pointers
-                                 * from the slave (or sibling) interpreters
-                                 * when this interpreter is deleted. */
-} Master;
-
-/*
- * The following structure keeps track of all the Master and Slave information
- * on a per-interp basis.
- */
-
-typedef struct InterpInfo {
-    Master master;		/* Keeps track of all interps for which this
-				 * interp is the Master. */
-    Slave slave;		/* Information necessary for this interp to
-				 * function as a slave. */
-} InterpInfo;
-
-/*
- * Prototypes for local static procedures:
- */
-
-static int		AliasCreate _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, Tcl_Interp *masterInterp,
-			    Tcl_Obj *namePtr, Tcl_Obj *targetPtr, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		AliasDelete _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, Tcl_Obj *namePtr));
-static int		AliasDescribe _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, Tcl_Obj *objPtr));
-static int		AliasList _ANSI_ARGS_((Tcl_Interp *interp,
-		            Tcl_Interp *slaveInterp));
-static int		AliasObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *currentInterp, int objc,
-		            Tcl_Obj *CONST objv[]));
-static void		AliasObjCmdDeleteProc _ANSI_ARGS_((
-			    ClientData clientData));
-
-static Tcl_Interp *	GetInterp _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *pathPtr));
-static Tcl_Interp *	GetInterp2 _ANSI_ARGS_((Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static void		InterpInfoDeleteProc _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp));
-static Tcl_Interp *	SlaveCreate _ANSI_ARGS_((Tcl_Interp *interp,
-		            Tcl_Obj *pathPtr, int safe));
-static int		SlaveEval _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		SlaveExpose _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		SlaveHide _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		SlaveHidden _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp));
-static int		SlaveInvokeHidden _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp, int global, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		SlaveMarkTrusted _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Interp *slaveInterp));
-static int		SlaveObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static void		SlaveObjCmdDeleteProc _ANSI_ARGS_((
-			    ClientData clientData));
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclInterpInit --
- *
- *	Initializes the invoking interpreter for using the master, slave
- *	and safe interp facilities.  This is called from inside
- *	Tcl_CreateInterp().
- *
- * Results:
- *	Always returns TCL_OK for backwards compatibility.
- *
- * Side effects:
- *	Adds the "interp" command to an interpreter and initializes the
- *	interpInfoPtr field of the invoking interpreter.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclInterpInit(interp)
-    Tcl_Interp *interp;			/* Interpreter to initialize. */
-{
-    InterpInfo *interpInfoPtr;
-    Master *masterPtr;
-    Slave *slavePtr;	
-
-    interpInfoPtr = (InterpInfo *) ckalloc(sizeof(InterpInfo));
-    ((Interp *) interp)->interpInfo = (ClientData) interpInfoPtr;
-
-    masterPtr = &interpInfoPtr->master;
-    Tcl_InitHashTable(&masterPtr->slaveTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&masterPtr->targetTable, TCL_ONE_WORD_KEYS);
-
-    slavePtr = &interpInfoPtr->slave;
-    slavePtr->masterInterp	= NULL;
-    slavePtr->slaveEntryPtr	= NULL;
-    slavePtr->slaveInterp	= interp;
-    slavePtr->interpCmd		= NULL;
-    Tcl_InitHashTable(&slavePtr->aliasTable, TCL_STRING_KEYS);
-
-    Tcl_CreateObjCommand(interp, "interp", Tcl_InterpObjCmd, NULL, NULL);
-
-    Tcl_CallWhenDeleted(interp, InterpInfoDeleteProc, NULL);
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * InterpInfoDeleteProc --
- *
- *	Invoked when an interpreter is being deleted.  It releases all
- *	storage used by the master/slave/safe interpreter facilities.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Cleans up storage.  Sets the interpInfoPtr field of the interp
- *	to NULL.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-InterpInfoDeleteProc(clientData, interp)
-    ClientData clientData;	/* Ignored. */
-    Tcl_Interp *interp;		/* Interp being deleted.  All commands for
-				 * slave interps should already be deleted. */
-{
-    InterpInfo *interpInfoPtr;
-    Slave *slavePtr;
-    Master *masterPtr;
-    Tcl_HashSearch hSearch;
-    Tcl_HashEntry *hPtr;
-    Target *targetPtr;
-
-    interpInfoPtr = (InterpInfo *) ((Interp *) interp)->interpInfo;
-
-    /*
-     * There shouldn't be any commands left.
-     */
-
-    masterPtr = &interpInfoPtr->master;
-    if (masterPtr->slaveTable.numEntries != 0) {
-	panic("InterpInfoDeleteProc: still exist commands");
-    }
-    Tcl_DeleteHashTable(&masterPtr->slaveTable);
-
-    /*
-     * Tell any interps that have aliases to this interp that they should
-     * delete those aliases.  If the other interp was already dead, it
-     * would have removed the target record already. 
-     */
-
-    hPtr = Tcl_FirstHashEntry(&masterPtr->targetTable, &hSearch);
-    while (hPtr != NULL) {
-	targetPtr = (Target *) Tcl_GetHashValue(hPtr);
-	Tcl_DeleteCommandFromToken(targetPtr->slaveInterp,
-		targetPtr->slaveCmd);
-	hPtr = Tcl_NextHashEntry(&hSearch);
-    }
-    Tcl_DeleteHashTable(&masterPtr->targetTable);
-
-    slavePtr = &interpInfoPtr->slave;
-    if (slavePtr->interpCmd != NULL) {
-	/*
-	 * Tcl_DeleteInterp() was called on this interpreter, rather
-	 * "interp delete" or the equivalent deletion of the command in the
-	 * master.  First ensure that the cleanup callback doesn't try to
-	 * delete the interp again.
-	 */
-
-	slavePtr->slaveInterp = NULL;
-        Tcl_DeleteCommandFromToken(slavePtr->masterInterp,
-		slavePtr->interpCmd);
-    }
-
-    /*
-     * There shouldn't be any aliases left.
-     */
-
-    if (slavePtr->aliasTable.numEntries != 0) {
-	panic("InterpInfoDeleteProc: still exist aliases");
-    }
-    Tcl_DeleteHashTable(&slavePtr->aliasTable);
-
-    ckfree((char *) interpInfoPtr);    
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InterpObjCmd --
- *
- *	This procedure is invoked to process the "interp" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-int
-Tcl_InterpObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Unused. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int index;
-    static char *options[] = {
-        "alias",	"aliases",	"create",	"delete", 
-	"eval",		"exists",	"expose",	"hide", 
-	"hidden",	"issafe",	"invokehidden",	"marktrusted", 
-	"slaves",	"share",	"target",	"transfer",
-        NULL
-    };
-    enum option {
-	OPT_ALIAS,	OPT_ALIASES,	OPT_CREATE,	OPT_DELETE,
-	OPT_EVAL,	OPT_EXISTS,	OPT_EXPOSE,	OPT_HIDE,
-	OPT_HIDDEN,	OPT_ISSAFE,	OPT_INVOKEHID,	OPT_MARKTRUSTED,
-	OPT_SLAVES,	OPT_SHARE,	OPT_TARGET,	OPT_TRANSFER
-    };
-
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, 
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    switch ((enum option) index) {
-	case OPT_ALIAS: {
-	    Tcl_Interp *slaveInterp, *masterInterp;
-
-	    if (objc < 4) {
-		aliasArgs:
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"slavePath slaveCmd ?masterPath masterCmd? ?args ..?");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == (Tcl_Interp *) NULL) {
-		return TCL_ERROR;
-	    }
-	    if (objc == 4) {
-		return AliasDescribe(interp, slaveInterp, objv[3]);
-	    }
-	    if ((objc == 5) && (Tcl_GetString(objv[4])[0] == '\0')) {
-		return AliasDelete(interp, slaveInterp, objv[3]);
-	    }
-	    if (objc > 5) {
-		masterInterp = GetInterp(interp, objv[4]);
-		if (masterInterp == (Tcl_Interp *) NULL) {
-		    return TCL_ERROR;
-		}
-		if (Tcl_GetString(objv[5])[0] == '\0') {
-		    if (objc == 6) {
-			return AliasDelete(interp, slaveInterp, objv[3]);
-		    }
-		} else {
-		    return AliasCreate(interp, slaveInterp, masterInterp,
-			    objv[3], objv[5], objc - 6, objv + 6);
-		}
-	    }
-	    goto aliasArgs;
-	}
-	case OPT_ALIASES: {
-	    Tcl_Interp *slaveInterp;
-
-	    slaveInterp = GetInterp2(interp, objc, objv);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    return AliasList(interp, slaveInterp);
-	}
-	case OPT_CREATE: {
-	    int i, last, safe;
-	    Tcl_Obj *slavePtr;
-	    char buf[16 + TCL_INTEGER_SPACE];
-	    static char *options[] = {
-		"-safe",	"--",		NULL
-	    };
-	    enum option {
-		OPT_SAFE,	OPT_LAST
-	    };
-
-	    safe = Tcl_IsSafe(interp);
-	    
-	    /*
-	     * Weird historical rules: "-safe" is accepted at the end, too.
-	     */
-
-	    slavePtr = NULL;
-	    last = 0;
-	    for (i = 2; i < objc; i++) {
-		if ((last == 0) && (Tcl_GetString(objv[i])[0] == '-')) {
-		    if (Tcl_GetIndexFromObj(interp, objv[i], options, "option",
-			    0, &index) != TCL_OK) {
-			return TCL_ERROR;
-		    }
-		    if (index == OPT_SAFE) {
-			safe = 1;
-			continue;
-		    }
-		    i++;
-		    last = 1;
-		}
-		if (slavePtr != NULL) {
-		    Tcl_WrongNumArgs(interp, 2, objv, "?-safe? ?--? ?path?");
-		    return TCL_ERROR;
-		}
-		slavePtr = objv[i];
-	    }
-	    buf[0] = '\0';
-	    if (slavePtr == NULL) {
-		/*
-		 * Create an anonymous interpreter -- we choose its name and
-		 * the name of the command. We check that the command name
-		 * that we use for the interpreter does not collide with an
-		 * existing command in the master interpreter.
-		 */
-		
-		for (i = 0; ; i++) {
-		    Tcl_CmdInfo cmdInfo;
-		    
-		    sprintf(buf, "interp%d", i);
-		    if (Tcl_GetCommandInfo(interp, buf, &cmdInfo) == 0) {
-			break;
-		    }
-		}
-		slavePtr = Tcl_NewStringObj(buf, -1);
-	    }
-	    if (SlaveCreate(interp, slavePtr, safe) == NULL) {
-		if (buf[0] != '\0') {
-		    Tcl_DecrRefCount(slavePtr);
-		}
-		return TCL_ERROR;
-	    }
-	    Tcl_SetObjResult(interp, slavePtr);
-	    return TCL_OK;
-	}
-	case OPT_DELETE: {
-	    int i;
-	    InterpInfo *iiPtr;
-	    Tcl_Interp *slaveInterp;
-	    
-	    for (i = 2; i < objc; i++) {
-		slaveInterp = GetInterp(interp, objv[i]);
-		if (slaveInterp == NULL) {
-		    return TCL_ERROR;
-		} else if (slaveInterp == interp) {
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			    "cannot delete the current interpreter",
-			    (char *) NULL);
-		    return TCL_ERROR;
-		}
-		iiPtr = (InterpInfo *) ((Interp *) slaveInterp)->interpInfo;
-		Tcl_DeleteCommandFromToken(iiPtr->slave.masterInterp,
-			iiPtr->slave.interpCmd);
-	    }
-	    return TCL_OK;
-	}
-	case OPT_EVAL: {
-	    Tcl_Interp *slaveInterp;
-
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 2, objv, "path arg ?arg ...?");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveEval(interp, slaveInterp, objc - 3, objv + 3);
-	}
-	case OPT_EXISTS: {
-	    int exists;
-	    Tcl_Interp *slaveInterp;
-
-	    exists = 1;
-	    slaveInterp = GetInterp2(interp, objc, objv);
-	    if (slaveInterp == NULL) {
-		if (objc > 3) {
-		    return TCL_ERROR;
-		}
-		Tcl_ResetResult(interp);
-		exists = 0;
-	    }
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), exists);
-	    return TCL_OK;
-	}
-	case OPT_EXPOSE: {
-	    Tcl_Interp *slaveInterp;
-
-	    if ((objc < 4) || (objc > 5)) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"path hiddenCmdName ?cmdName?");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveExpose(interp, slaveInterp, objc - 3, objv + 3);
-	}
-	case OPT_HIDE: {
-	    Tcl_Interp *slaveInterp;		/* A slave. */
-
-	    if ((objc < 4) || (objc > 5)) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"path cmdName ?hiddenCmdName?");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == (Tcl_Interp *) NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveHide(interp, slaveInterp, objc - 3, objv + 3);
-	}
-	case OPT_HIDDEN: {
-	    Tcl_Interp *slaveInterp;		/* A slave. */
-
-	    slaveInterp = GetInterp2(interp, objc, objv);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveHidden(interp, slaveInterp);
-	}
-	case OPT_ISSAFE: {
-	    Tcl_Interp *slaveInterp;
-
-	    slaveInterp = GetInterp2(interp, objc, objv);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), Tcl_IsSafe(slaveInterp));
-	    return TCL_OK;
-	}
-	case OPT_INVOKEHID: {
-	    int i, index, global;
-	    Tcl_Interp *slaveInterp;
-	    static char *hiddenOptions[] = {
-		"-global",	"--",		NULL
-	    };
-	    enum hiddenOption {
-		OPT_GLOBAL,	OPT_LAST
-	    };
-
-	    global = 0;
-	    for (i = 3; i < objc; i++) {
-		if (Tcl_GetString(objv[i])[0] != '-') {
-		    break;
-		}
-		if (Tcl_GetIndexFromObj(interp, objv[i], hiddenOptions,
-			"option", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		if (index == OPT_GLOBAL) {
-		    global = 1;
-		} else {
-		    i++;
-		    break;
-		}
-	    }
-	    if (objc - i < 1) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"path ?-global? ?--? cmd ?arg ..?");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == (Tcl_Interp *) NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveInvokeHidden(interp, slaveInterp, global, objc - i,
-		    objv + i);
-	}
-	case OPT_MARKTRUSTED: {
-	    Tcl_Interp *slaveInterp;
-
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "path");
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    return SlaveMarkTrusted(interp, slaveInterp);
-	}
-	case OPT_SLAVES: {
-	    Tcl_Interp *slaveInterp;
-	    InterpInfo *iiPtr;
-	    Tcl_Obj *resultPtr;
-	    Tcl_HashEntry *hPtr;
-	    Tcl_HashSearch hashSearch;
-	    char *string;
-	    
-	    slaveInterp = GetInterp2(interp, objc, objv);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    iiPtr = (InterpInfo *) ((Interp *) slaveInterp)->interpInfo;
-	    resultPtr = Tcl_GetObjResult(interp);
-	    hPtr = Tcl_FirstHashEntry(&iiPtr->master.slaveTable, &hashSearch);
-	    for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&hashSearch)) {
-		string = Tcl_GetHashKey(&iiPtr->master.slaveTable, hPtr);
-		Tcl_ListObjAppendElement(NULL, resultPtr,
-			Tcl_NewStringObj(string, -1));
-	    }
-	    return TCL_OK;
-	}
-	case OPT_SHARE: {
-	    Tcl_Interp *slaveInterp;		/* A slave. */
-	    Tcl_Interp *masterInterp;		/* Its master. */
-	    Tcl_Channel chan;
-
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 2, objv, "srcPath channelId destPath");
-		return TCL_ERROR;
-	    }
-	    masterInterp = GetInterp(interp, objv[2]);
-	    if (masterInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    chan = Tcl_GetChannel(masterInterp, Tcl_GetString(objv[3]),
-		    NULL);
-	    if (chan == NULL) {
-		TclTransferResult(masterInterp, TCL_OK, interp);
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[4]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_RegisterChannel(slaveInterp, chan);
-	    return TCL_OK;
-	}
-	case OPT_TARGET: {
-	    Tcl_Interp *slaveInterp;
-	    InterpInfo *iiPtr;
-	    Tcl_HashEntry *hPtr;	
-	    Alias *aliasPtr;		
-	    char *aliasName;
-
-	    if (objc != 4) {
-		Tcl_WrongNumArgs(interp, 2, objv, "path alias");
-		return TCL_ERROR;
-	    }
-
-	    slaveInterp = GetInterp(interp, objv[2]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-
-	    aliasName = Tcl_GetString(objv[3]);
-
-	    iiPtr = (InterpInfo *) ((Interp *) slaveInterp)->interpInfo;
-	    hPtr = Tcl_FindHashEntry(&iiPtr->slave.aliasTable, aliasName);
-	    if (hPtr == NULL) {
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"alias \"", aliasName, "\" in path \"",
-			Tcl_GetString(objv[2]), "\" not found",
-			(char *) NULL);
-		return TCL_ERROR;
-	    }
-	    aliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-	    if (Tcl_GetInterpPath(interp, aliasPtr->targetInterp) != TCL_OK) {
-		Tcl_ResetResult(interp);
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"target interpreter for alias \"", aliasName,
-			"\" in path \"", Tcl_GetString(objv[2]),
-			"\" is not my descendant", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    return TCL_OK;
-	}
-	case OPT_TRANSFER: {
-	    Tcl_Interp *slaveInterp;		/* A slave. */
-	    Tcl_Interp *masterInterp;		/* Its master. */
-	    Tcl_Channel chan;
-		    
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"srcPath channelId destPath");
-		return TCL_ERROR;
-	    }
-	    masterInterp = GetInterp(interp, objv[2]);
-	    if (masterInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    chan = Tcl_GetChannel(masterInterp, Tcl_GetString(objv[3]), NULL);
-	    if (chan == NULL) {
-		TclTransferResult(masterInterp, TCL_OK, interp);
-		return TCL_ERROR;
-	    }
-	    slaveInterp = GetInterp(interp, objv[4]);
-	    if (slaveInterp == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_RegisterChannel(slaveInterp, chan);
-	    if (Tcl_UnregisterChannel(masterInterp, chan) != TCL_OK) {
-		TclTransferResult(masterInterp, TCL_OK, interp);
-		return TCL_ERROR;
-	    }
-	    return TCL_OK;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * GetInterp2 --
- *
- *	Helper function for Tcl_InterpObjCmd() to convert the interp name
- *	potentially specified on the command line to an Tcl_Interp.
- *
- * Results:
- *	The return value is the interp specified on the command line,
- *	or the interp argument itself if no interp was specified on the
- *	command line.  If the interp could not be found or the wrong
- *	number of arguments was specified on the command line, the return
- *	value is NULL and an error message is left in the interp's result.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-static Tcl_Interp *
-GetInterp2(interp, objc, objv)
-    Tcl_Interp *interp;		/* Default interp if no interp was specified
-				 * on the command line. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    if (objc == 2) {
-	return interp;
-    } else if (objc == 3) {
-	return GetInterp(interp, objv[2]);
-    } else {
-	Tcl_WrongNumArgs(interp, 2, objv, "?path?");
-	return NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateAlias --
- *
- *	Creates an alias between two interpreters.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates a new alias, manipulates the result field of slaveInterp.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_CreateAlias(slaveInterp, slaveCmd, targetInterp, targetCmd, argc, argv)
-    Tcl_Interp *slaveInterp;	/* Interpreter for source command. */
-    char *slaveCmd;		/* Command to install in slave. */
-    Tcl_Interp *targetInterp;	/* Interpreter for target command. */
-    char *targetCmd;		/* Name of target command. */
-    int argc;			/* How many additional arguments? */
-    char **argv;		/* These are the additional args. */
-{
-    Tcl_Obj *slaveObjPtr, *targetObjPtr;
-    Tcl_Obj **objv;
-    int i;
-    int result;
-    
-    objv = (Tcl_Obj **) ckalloc((unsigned) sizeof(Tcl_Obj *) * argc);
-    for (i = 0; i < argc; i++) {
-        objv[i] = Tcl_NewStringObj(argv[i], -1);
-        Tcl_IncrRefCount(objv[i]);
-    }
-    
-    slaveObjPtr = Tcl_NewStringObj(slaveCmd, -1);
-    Tcl_IncrRefCount(slaveObjPtr);
-
-    targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
-    Tcl_IncrRefCount(targetObjPtr);
-
-    result = AliasCreate(slaveInterp, slaveInterp, targetInterp, slaveObjPtr,
-	    targetObjPtr, argc, objv);
-
-    for (i = 0; i < argc; i++) {
-	Tcl_DecrRefCount(objv[i]);
-    }
-    ckfree((char *) objv);
-    Tcl_DecrRefCount(targetObjPtr);
-    Tcl_DecrRefCount(slaveObjPtr);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateAliasObj --
- *
- *	Object version: Creates an alias between two interpreters.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates a new alias.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_CreateAliasObj(slaveInterp, slaveCmd, targetInterp, targetCmd, objc, objv)
-    Tcl_Interp *slaveInterp;	/* Interpreter for source command. */
-    char *slaveCmd;		/* Command to install in slave. */
-    Tcl_Interp *targetInterp;	/* Interpreter for target command. */
-    char *targetCmd;		/* Name of target command. */
-    int objc;			/* How many additional arguments? */
-    Tcl_Obj *CONST objv[];	/* Argument vector. */
-{
-    Tcl_Obj *slaveObjPtr, *targetObjPtr;
-    int result;
-
-    slaveObjPtr = Tcl_NewStringObj(slaveCmd, -1);
-    Tcl_IncrRefCount(slaveObjPtr);
-
-    targetObjPtr = Tcl_NewStringObj(targetCmd, -1);
-    Tcl_IncrRefCount(targetObjPtr);
-
-    result = AliasCreate(slaveInterp, slaveInterp, targetInterp, slaveObjPtr,
-	    targetObjPtr, objc, objv);
-
-    Tcl_DecrRefCount(slaveObjPtr);
-    Tcl_DecrRefCount(targetObjPtr);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetAlias --
- *
- *	Gets information about an alias.
- *
- * Results:
- *	A standard Tcl result. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetAlias(interp, aliasName, targetInterpPtr, targetNamePtr, argcPtr,
-        argvPtr)
-    Tcl_Interp *interp;			/* Interp to start search from. */
-    char *aliasName;			/* Name of alias to find. */
-    Tcl_Interp **targetInterpPtr;	/* (Return) target interpreter. */
-    char **targetNamePtr;		/* (Return) name of target command. */
-    int *argcPtr;			/* (Return) count of addnl args. */
-    char ***argvPtr;			/* (Return) additional arguments. */
-{
-    InterpInfo *iiPtr;
-    Tcl_HashEntry *hPtr;
-    Alias *aliasPtr;
-    int i, objc;
-    Tcl_Obj **objv;
-    
-    iiPtr = (InterpInfo *) ((Interp *) interp)->interpInfo;
-    hPtr = Tcl_FindHashEntry(&iiPtr->slave.aliasTable, aliasName);
-    if (hPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "alias \"", aliasName, "\" not found", (char *) NULL);
-	return TCL_ERROR;
-    }
-    aliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-    Tcl_ListObjGetElements(NULL, aliasPtr->prefixPtr, &objc, &objv);
-
-    if (targetInterpPtr != NULL) {
-	*targetInterpPtr = aliasPtr->targetInterp;
-    }
-    if (targetNamePtr != NULL) {
-	*targetNamePtr = Tcl_GetString(objv[0]);
-    }
-    if (argcPtr != NULL) {
-	*argcPtr = objc - 1;
-    }
-    if (argvPtr != NULL) {
-        *argvPtr = (char **) ckalloc((unsigned) sizeof(char *) * (objc - 1));
-        for (i = 1; i < objc; i++) {
-            *argvPtr[i - 1] = Tcl_GetString(objv[i]);
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ObjGetAlias --
- *
- *	Object version: Gets information about an alias.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetAliasObj(interp, aliasName, targetInterpPtr, targetNamePtr, objcPtr,
-        objvPtr)
-    Tcl_Interp *interp;			/* Interp to start search from. */
-    char *aliasName;			/* Name of alias to find. */
-    Tcl_Interp **targetInterpPtr;	/* (Return) target interpreter. */
-    char **targetNamePtr;		/* (Return) name of target command. */
-    int *objcPtr;			/* (Return) count of addnl args. */
-    Tcl_Obj ***objvPtr;			/* (Return) additional args. */
-{
-    InterpInfo *iiPtr;
-    Tcl_HashEntry *hPtr;
-    Alias *aliasPtr;	
-    int objc;
-    Tcl_Obj **objv;
-
-    iiPtr = (InterpInfo *) ((Interp *) interp)->interpInfo;
-    hPtr = Tcl_FindHashEntry(&iiPtr->slave.aliasTable, aliasName);
-    if (hPtr == (Tcl_HashEntry *) NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "alias \"", aliasName, "\" not found", (char *) NULL);
-        return TCL_ERROR;
-    }
-    aliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-    Tcl_ListObjGetElements(NULL, aliasPtr->prefixPtr, &objc, &objv);
-
-    if (targetInterpPtr != (Tcl_Interp **) NULL) {
-        *targetInterpPtr = aliasPtr->targetInterp;
-    }
-    if (targetNamePtr != (char **) NULL) {
-        *targetNamePtr = Tcl_GetString(objv[0]);
-    }
-    if (objcPtr != (int *) NULL) {
-        *objcPtr = objc - 1;
-    }
-    if (objvPtr != (Tcl_Obj ***) NULL) {
-        *objvPtr = objv + 1;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPreventAliasLoop --
- *
- *	When defining an alias or renaming a command, prevent an alias
- *	loop from being formed.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	If TCL_ERROR is returned, the function also stores an error message
- *	in the interpreter's result object.
- *
- * NOTE:
- *	This function is public internal (instead of being static to
- *	this file) because it is also used from TclRenameCommand.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclPreventAliasLoop(interp, cmdInterp, cmd)
-    Tcl_Interp *interp;			/* Interp in which to report errors. */
-    Tcl_Interp *cmdInterp;		/* Interp in which the command is
-                                         * being defined. */
-    Tcl_Command cmd;                    /* Tcl command we are attempting
-                                         * to define. */
-{
-    Command *cmdPtr = (Command *) cmd;
-    Alias *aliasPtr, *nextAliasPtr;
-    Tcl_Command aliasCmd;
-    Command *aliasCmdPtr;
-    
-    /*
-     * If we are not creating or renaming an alias, then it is
-     * always OK to create or rename the command.
-     */
-    
-    if (cmdPtr->objProc != AliasObjCmd) {
-        return TCL_OK;
-    }
-
-    /*
-     * OK, we are dealing with an alias, so traverse the chain of aliases.
-     * If we encounter the alias we are defining (or renaming to) any in
-     * the chain then we have a loop.
-     */
-
-    aliasPtr = (Alias *) cmdPtr->objClientData;
-    nextAliasPtr = aliasPtr;
-    while (1) {
-	int objc;
-	Tcl_Obj **objv;
-
-        /*
-         * If the target of the next alias in the chain is the same as
-         * the source alias, we have a loop.
-	 */
-
-	Tcl_ListObjGetElements(NULL, nextAliasPtr->prefixPtr, &objc, &objv);
-	aliasCmd = Tcl_FindCommand(nextAliasPtr->targetInterp,
-                Tcl_GetString(objv[0]),
-		Tcl_GetGlobalNamespace(nextAliasPtr->targetInterp),
-		/*flags*/ 0);
-        if (aliasCmd == (Tcl_Command) NULL) {
-            return TCL_OK;
-        }
-	aliasCmdPtr = (Command *) aliasCmd;
-        if (aliasCmdPtr == cmdPtr) {
-            Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "cannot define or rename alias \"",
-		    Tcl_GetString(aliasPtr->namePtr),
-		    "\": would create a loop", (char *) NULL);
-            return TCL_ERROR;
-        }
-
-        /*
-	 * Otherwise, follow the chain one step further. See if the target
-         * command is an alias - if so, follow the loop to its target
-         * command. Otherwise we do not have a loop.
-	 */
-
-        if (aliasCmdPtr->objProc != AliasObjCmd) {
-            return TCL_OK;
-        }
-        nextAliasPtr = (Alias *) aliasCmdPtr->objClientData;
-    }
-
-    /* NOTREACHED */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasCreate --
- *
- *	Helper function to do the work to actually create an alias.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	An alias command is created and entered into the alias table
- *	for the slave interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AliasCreate(interp, slaveInterp, masterInterp, namePtr, targetNamePtr,
-	objc, objv)
-    Tcl_Interp *interp;		/* Interp for error reporting. */
-    Tcl_Interp *slaveInterp;	/* Interp where alias cmd will live or from
-				 * which alias will be deleted. */
-    Tcl_Interp *masterInterp;	/* Interp in which target command will be
-				 * invoked. */
-    Tcl_Obj *namePtr;		/* Name of alias cmd. */
-    Tcl_Obj *targetNamePtr;	/* Name of target cmd. */
-    int objc;			/* Additional arguments to store */
-    Tcl_Obj *CONST objv[];	/* with alias. */
-{
-    Alias *aliasPtr;
-    Tcl_HashEntry *hPtr;
-    int new;
-    Target *targetPtr;
-    Slave *slavePtr;
-    Master *masterPtr;
-
-    aliasPtr = (Alias *) ckalloc((unsigned) sizeof(Alias));
-    aliasPtr->namePtr		= namePtr;
-    Tcl_IncrRefCount(aliasPtr->namePtr);
-    aliasPtr->targetInterp	= masterInterp;
-    aliasPtr->prefixPtr		= Tcl_NewListObj(1, &targetNamePtr);
-    Tcl_ListObjReplace(NULL, aliasPtr->prefixPtr, 1, 0, objc, objv);
-    Tcl_IncrRefCount(aliasPtr->prefixPtr);
-
-    aliasPtr->slaveCmd = Tcl_CreateObjCommand(slaveInterp,
-	    Tcl_GetString(namePtr), AliasObjCmd, (ClientData) aliasPtr,
-	    AliasObjCmdDeleteProc);
-
-    if (TclPreventAliasLoop(interp, slaveInterp, aliasPtr->slaveCmd) != TCL_OK) {
-	/*
-	 * Found an alias loop!  The last call to Tcl_CreateObjCommand made
-	 * the alias point to itself.  Delete the command and its alias
-	 * record.  Be careful to wipe out its client data first, so the
-	 * command doesn't try to delete itself.
-	 */
-
-	Command *cmdPtr;
-	
-	Tcl_DecrRefCount(aliasPtr->namePtr);
-	Tcl_DecrRefCount(aliasPtr->prefixPtr);
-	
-        cmdPtr = (Command *) aliasPtr->slaveCmd;
-        cmdPtr->clientData = NULL;
-        cmdPtr->deleteProc = NULL;
-        cmdPtr->deleteData = NULL;
-        Tcl_DeleteCommandFromToken(slaveInterp, aliasPtr->slaveCmd);
-
-        ckfree((char *) aliasPtr);
-
-        /*
-         * The result was already set by TclPreventAliasLoop.
-         */
-
-        return TCL_ERROR;
-    }
-    
-    /*
-     * Make an entry in the alias table. If it already exists delete
-     * the alias command. Then retry.
-     */
-
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-    while (1) {
-	Alias *oldAliasPtr;
-	char *string;
-	
-	string = Tcl_GetString(namePtr);
-	hPtr = Tcl_CreateHashEntry(&slavePtr->aliasTable, string, &new);
-	if (new != 0) {
-	    break;
-	}
-
-	oldAliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-	Tcl_DeleteCommandFromToken(slaveInterp, oldAliasPtr->slaveCmd);
-    }
-
-    aliasPtr->aliasEntryPtr = hPtr;
-    Tcl_SetHashValue(hPtr, (ClientData) aliasPtr);
-    
-    /*
-     * Create the new command. We must do it after deleting any old command,
-     * because the alias may be pointing at a renamed alias, as in:
-     *
-     * interp alias {} foo {} bar		# Create an alias "foo"
-     * rename foo zop				# Now rename the alias
-     * interp alias {} foo {} zop		# Now recreate "foo"...
-     */
-
-    targetPtr = (Target *) ckalloc((unsigned) sizeof(Target));
-    targetPtr->slaveCmd = aliasPtr->slaveCmd;
-    targetPtr->slaveInterp = slaveInterp;
-
-    Tcl_MutexLock(&cntMutex);
-    masterPtr = &((InterpInfo *) ((Interp *) masterInterp)->interpInfo)->master;
-    do {
-        hPtr = Tcl_CreateHashEntry(&masterPtr->targetTable,
-                (char *) aliasCounter, &new);
-	aliasCounter++;
-    } while (new == 0);
-    Tcl_MutexUnlock(&cntMutex);
-
-    Tcl_SetHashValue(hPtr, (ClientData) targetPtr);
-    aliasPtr->targetEntryPtr = hPtr;
-
-    Tcl_SetObjResult(interp, namePtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasDelete --
- *
- *	Deletes the given alias from the slave interpreter given.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Deletes the alias from the slave interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AliasDelete(interp, slaveInterp, namePtr)
-    Tcl_Interp *interp;		/* Interpreter for result & errors. */
-    Tcl_Interp *slaveInterp;	/* Interpreter containing alias. */
-    Tcl_Obj *namePtr;		/* Name of alias to describe. */
-{
-    Slave *slavePtr;
-    Alias *aliasPtr;
-    Tcl_HashEntry *hPtr;
-
-    /*
-     * If the alias has been renamed in the slave, the master can still use
-     * the original name (with which it was created) to find the alias to
-     * delete it.
-     */
-
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-    hPtr = Tcl_FindHashEntry(&slavePtr->aliasTable, Tcl_GetString(namePtr));
-    if (hPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), "alias \"",
-		Tcl_GetString(namePtr), "\" not found", NULL);
-        return TCL_ERROR;
-    }
-    aliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-    Tcl_DeleteCommandFromToken(slaveInterp, aliasPtr->slaveCmd);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasDescribe --
- *
- *	Sets the interpreter's result object to a Tcl list describing
- *	the given alias in the given interpreter: its target command
- *	and the additional arguments to prepend to any invocation
- *	of the alias.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AliasDescribe(interp, slaveInterp, namePtr)
-    Tcl_Interp *interp;		/* Interpreter for result & errors. */
-    Tcl_Interp *slaveInterp;	/* Interpreter containing alias. */
-    Tcl_Obj *namePtr;		/* Name of alias to describe. */
-{
-    Slave *slavePtr;
-    Tcl_HashEntry *hPtr;
-    Alias *aliasPtr;	
-
-    /*
-     * If the alias has been renamed in the slave, the master can still use
-     * the original name (with which it was created) to find the alias to
-     * describe it.
-     */
-
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-    hPtr = Tcl_FindHashEntry(&slavePtr->aliasTable, Tcl_GetString(namePtr));
-    if (hPtr == NULL) {
-        return TCL_OK;
-    }
-    aliasPtr = (Alias *) Tcl_GetHashValue(hPtr);
-    Tcl_SetObjResult(interp, aliasPtr->prefixPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasList --
- *
- *	Computes a list of aliases defined in a slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AliasList(interp, slaveInterp)
-    Tcl_Interp *interp;		/* Interp for data return. */
-    Tcl_Interp *slaveInterp;	/* Interp whose aliases to compute. */
-{
-    Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch hashSearch;
-    Tcl_Obj *resultPtr;	
-    Alias *aliasPtr;
-    Slave *slavePtr;
-
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-    resultPtr = Tcl_GetObjResult(interp);
-
-    entryPtr = Tcl_FirstHashEntry(&slavePtr->aliasTable, &hashSearch);
-    for ( ; entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&hashSearch)) {
-        aliasPtr = (Alias *) Tcl_GetHashValue(entryPtr);
-        Tcl_ListObjAppendElement(NULL, resultPtr, aliasPtr->namePtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasObjCmd --
- *
- *	This is the procedure that services invocations of aliases in a
- *	slave interpreter. One such command exists for each alias. When
- *	invoked, this procedure redirects the invocation to the target
- *	command in the master interpreter as designated by the Alias
- *	record associated with this command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Causes forwarding of the invocation; all possible side effects
- *	may occur as a result of invoking the command to which the
- *	invocation is forwarded.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AliasObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Alias record. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument vector. */	
-{
-    Tcl_Interp *targetInterp;	
-    Alias *aliasPtr;		
-    int result, prefc, cmdc;
-    Tcl_Obj *cmdPtr;
-    Tcl_Obj **prefv, **cmdv;
-    
-    aliasPtr = (Alias *) clientData;
-    targetInterp = aliasPtr->targetInterp;
-
-    Tcl_Preserve((ClientData) targetInterp);
-
-    ((Interp *) targetInterp)->numLevels++;
-
-    Tcl_ResetResult(targetInterp);
-    Tcl_AllowExceptions(targetInterp);
-
-    /*
-     * Append the arguments to the command prefix and invoke the command
-     * in the target interp's global namespace.
-     */
-     
-    Tcl_ListObjGetElements(NULL, aliasPtr->prefixPtr, &prefc, &prefv);
-    cmdPtr = Tcl_NewListObj(prefc, prefv);
-    Tcl_ListObjReplace(NULL, cmdPtr, prefc, 0, objc - 1, objv + 1);
-    Tcl_ListObjGetElements(NULL, cmdPtr, &cmdc, &cmdv);
-    result = TclObjInvoke(targetInterp, cmdc, cmdv,
-	    TCL_INVOKE_NO_TRACEBACK);
-    Tcl_DecrRefCount(cmdPtr);
-
-    ((Interp *) targetInterp)->numLevels--;
-    
-    /*
-     * Check if we are at the bottom of the stack for the target interpreter.
-     * If so, check for special return codes.
-     */
-    
-    if (((Interp *) targetInterp)->numLevels == 0) {
-	if (result == TCL_RETURN) {
-	    result = TclUpdateReturnInfo((Interp *) targetInterp);
-	}
-	if ((result != TCL_OK) && (result != TCL_ERROR)) {
-	    Tcl_ResetResult(targetInterp);
-	    if (result == TCL_BREAK) {
-                Tcl_SetObjResult(targetInterp,
-                        Tcl_NewStringObj("invoked \"break\" outside of a loop",
-                                -1));
-	    } else if (result == TCL_CONTINUE) {
-                Tcl_SetObjResult(targetInterp,
-                        Tcl_NewStringObj(
-                            "invoked \"continue\" outside of a loop",
-                            -1));
-	    } else {
-                char buf[32 + TCL_INTEGER_SPACE];
-
-                sprintf(buf, "command returned bad code: %d", result);
-                Tcl_SetObjResult(targetInterp, Tcl_NewStringObj(buf, -1));
-	    }
-	    result = TCL_ERROR;
-	}
-    }
-
-    TclTransferResult(targetInterp, result, interp);
-
-    Tcl_Release((ClientData) targetInterp);
-    return result;        
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AliasObjCmdDeleteProc --
- *
- *	Is invoked when an alias command is deleted in a slave. Cleans up
- *	all storage associated with this alias.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deletes the alias record and its entry in the alias table for
- *	the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AliasObjCmdDeleteProc(clientData)
-    ClientData clientData;	/* The alias record for this alias. */
-{
-    Alias *aliasPtr;		
-    Target *targetPtr;		
-
-    aliasPtr = (Alias *) clientData;
-    
-    Tcl_DecrRefCount(aliasPtr->namePtr);
-    Tcl_DecrRefCount(aliasPtr->prefixPtr);
-    Tcl_DeleteHashEntry(aliasPtr->aliasEntryPtr);
-
-    targetPtr = (Target *) Tcl_GetHashValue(aliasPtr->targetEntryPtr);
-    ckfree((char *) targetPtr);
-    Tcl_DeleteHashEntry(aliasPtr->targetEntryPtr);
-
-    ckfree((char *) aliasPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateSlave --
- *
- *	Creates a slave interpreter. The slavePath argument denotes the
- *	name of the new slave relative to the current interpreter; the
- *	slave is a direct descendant of the one-before-last component of
- *	the path, e.g. it is a descendant of the current interpreter if
- *	the slavePath argument contains only one component. Optionally makes
- *	the slave interpreter safe.
- *
- * Results:
- *	Returns the interpreter structure created, or NULL if an error
- *	occurred.
- *
- * Side effects:
- *	Creates a new interpreter and a new interpreter object command in
- *	the interpreter indicated by the slavePath argument.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Interp *
-Tcl_CreateSlave(interp, slavePath, isSafe)
-    Tcl_Interp *interp;		/* Interpreter to start search at. */
-    char *slavePath;		/* Name of slave to create. */
-    int isSafe;			/* Should new slave be "safe" ? */
-{
-    Tcl_Obj *pathPtr;
-    Tcl_Interp *slaveInterp;
-
-    pathPtr = Tcl_NewStringObj(slavePath, -1);
-    slaveInterp = SlaveCreate(interp, pathPtr, isSafe);
-    Tcl_DecrRefCount(pathPtr);
-
-    return slaveInterp;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetSlave --
- *
- *	Finds a slave interpreter by its path name.
- *
- * Results:
- *	Returns a Tcl_Interp * for the named interpreter or NULL if not
- *	found.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Interp *
-Tcl_GetSlave(interp, slavePath)
-    Tcl_Interp *interp;		/* Interpreter to start search from. */
-    char *slavePath;		/* Path of slave to find. */
-{
-    Tcl_Obj *pathPtr;
-    Tcl_Interp *slaveInterp;
-
-    pathPtr = Tcl_NewStringObj(slavePath, -1);
-    slaveInterp = GetInterp(interp, pathPtr);
-    Tcl_DecrRefCount(pathPtr);
-
-    return slaveInterp;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetMaster --
- *
- *	Finds the master interpreter of a slave interpreter.
- *
- * Results:
- *	Returns a Tcl_Interp * for the master interpreter or NULL if none.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Interp *
-Tcl_GetMaster(interp)
-    Tcl_Interp *interp;		/* Get the master of this interpreter. */
-{
-    Slave *slavePtr;		/* Slave record of this interpreter. */
-
-    if (interp == (Tcl_Interp *) NULL) {
-        return NULL;
-    }
-    slavePtr = &((InterpInfo *) ((Interp *) interp)->interpInfo)->slave;
-    return slavePtr->masterInterp;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetInterpPath --
- *
- *	Sets the result of the asking interpreter to a proper Tcl list
- *	containing the names of interpreters between the asking and
- *	target interpreters. The target interpreter must be either the
- *	same as the asking interpreter or one of its slaves (including
- *	recursively).
- *
- * Results:
- *	TCL_OK if the target interpreter is the same as, or a descendant
- *	of, the asking interpreter; TCL_ERROR else. This way one can
- *	distinguish between the case where the asking and target interps
- *	are the same (an empty list is the result, and TCL_OK is returned)
- *	and when the target is not a descendant of the asking interpreter
- *	(in which case the Tcl result is an error message and the function
- *	returns TCL_ERROR).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetInterpPath(askingInterp, targetInterp)
-    Tcl_Interp *askingInterp;	/* Interpreter to start search from. */
-    Tcl_Interp *targetInterp;	/* Interpreter to find. */
-{
-    InterpInfo *iiPtr;
-    
-    if (targetInterp == askingInterp) {
-        return TCL_OK;
-    }
-    if (targetInterp == NULL) {
-	return TCL_ERROR;
-    }
-    iiPtr = (InterpInfo *) ((Interp *) targetInterp)->interpInfo;
-    if (Tcl_GetInterpPath(askingInterp, iiPtr->slave.masterInterp) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    Tcl_AppendElement(askingInterp,
-	    Tcl_GetHashKey(&iiPtr->master.slaveTable,
-		    iiPtr->slave.slaveEntryPtr));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetInterp --
- *
- *	Helper function to find a slave interpreter given a pathname.
- *
- * Results:
- *	Returns the slave interpreter known by that name in the calling
- *	interpreter, or NULL if no interpreter known by that name exists. 
- *
- * Side effects:
- *	Assigns to the pointer variable passed in, if not NULL.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_Interp *
-GetInterp(interp, pathPtr)
-    Tcl_Interp *interp;		/* Interp. to start search from. */
-    Tcl_Obj *pathPtr;		/* List object containing name of interp. to 
-				 * be found. */
-{
-    Tcl_HashEntry *hPtr;	/* Search element. */
-    Slave *slavePtr;		/* Interim slave record. */
-    Tcl_Obj **objv;
-    int objc, i;	
-    Tcl_Interp *searchInterp;	/* Interim storage for interp. to find. */
-    InterpInfo *masterInfoPtr;
-
-    if (Tcl_ListObjGetElements(interp, pathPtr, &objc, &objv) != TCL_OK) {
-	return NULL;
-    }
-
-    searchInterp = interp;
-    for (i = 0; i < objc; i++) {
-	masterInfoPtr = (InterpInfo *) ((Interp *) searchInterp)->interpInfo;
-        hPtr = Tcl_FindHashEntry(&masterInfoPtr->master.slaveTable,
-		Tcl_GetString(objv[i]));
-        if (hPtr == NULL) {
-	    searchInterp = NULL;
-	    break;
-	}
-        slavePtr = (Slave *) Tcl_GetHashValue(hPtr);
-        searchInterp = slavePtr->slaveInterp;
-        if (searchInterp == NULL) {
-	    break;
-	}
-    }
-    if (searchInterp == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"could not find interpreter \"",
-                Tcl_GetString(pathPtr), "\"", (char *) NULL);
-    }
-    return searchInterp;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveCreate --
- *
- *	Helper function to do the actual work of creating a slave interp
- *	and new object command. Also optionally makes the new slave
- *	interpreter "safe".
- *
- * Results:
- *	Returns the new Tcl_Interp * if successful or NULL if not. If failed,
- *	the result of the invoking interpreter contains an error message.
- *
- * Side effects:
- *	Creates a new slave interpreter and a new object command.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_Interp *
-SlaveCreate(interp, pathPtr, safe)
-    Tcl_Interp *interp;		/* Interp. to start search from. */
-    Tcl_Obj *pathPtr;		/* Path (name) of slave to create. */
-    int safe;			/* Should we make it "safe"? */
-{
-    Tcl_Interp *masterInterp, *slaveInterp;
-    Slave *slavePtr;
-    InterpInfo *masterInfoPtr;
-    Tcl_HashEntry *hPtr;
-    char *path;
-    int new, objc;
-    Tcl_Obj **objv;
-
-    if (Tcl_ListObjGetElements(interp, pathPtr, &objc, &objv) != TCL_OK) {
-	return NULL;
-    }
-    if (objc < 2) {
-	masterInterp = interp;
-	path = Tcl_GetString(pathPtr);
-    } else {
-	Tcl_Obj *objPtr;
-	
-	objPtr = Tcl_NewListObj(objc - 1, objv);
-	masterInterp = GetInterp(interp, objPtr);
-	Tcl_DecrRefCount(objPtr);
-	if (masterInterp == NULL) {
-	    return NULL;
-	}
-	path = Tcl_GetString(objv[objc - 1]);
-    }
-    if (safe == 0) {
-	safe = Tcl_IsSafe(masterInterp);
-    }
-
-    masterInfoPtr = (InterpInfo *) ((Interp *) masterInterp)->interpInfo;
-    hPtr = Tcl_CreateHashEntry(&masterInfoPtr->master.slaveTable, path, &new);
-    if (new == 0) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "interpreter named \"", path,
-		"\" already exists, cannot create", (char *) NULL);
-        return NULL;
-    }
-
-    slaveInterp = Tcl_CreateInterp();
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-    slavePtr->masterInterp = masterInterp;
-    slavePtr->slaveEntryPtr = hPtr;
-    slavePtr->slaveInterp = slaveInterp;
-    slavePtr->interpCmd = Tcl_CreateObjCommand(masterInterp, path,
-            SlaveObjCmd, (ClientData) slaveInterp, SlaveObjCmdDeleteProc);
-    Tcl_InitHashTable(&slavePtr->aliasTable, TCL_STRING_KEYS);
-    Tcl_SetHashValue(hPtr, (ClientData) slavePtr);
-    Tcl_SetVar(slaveInterp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
-    
-    /*
-     * Inherit the recursion limit.
-     */
-    ((Interp *) slaveInterp)->maxNestingDepth =
-	((Interp *) masterInterp)->maxNestingDepth ;
-
-    if (safe) {
-        if (Tcl_MakeSafe(slaveInterp) == TCL_ERROR) {
-            goto error;
-        }
-    } else {
-        if (Tcl_Init(slaveInterp) == TCL_ERROR) {
-            goto error;
-        }
-    }
-    return slaveInterp;
-
-    error:
-    TclTransferResult(slaveInterp, TCL_ERROR, interp);
-    Tcl_DeleteInterp(slaveInterp);
-
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveObjCmd --
- *
- *	Command to manipulate an interpreter, e.g. to send commands to it
- *	to be evaluated. One such command exists for each slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See user documentation for details.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Slave interpreter. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Interp *slaveInterp;
-    int index;
-    static char *options[] = {
-        "alias",	"aliases",	"eval",		"expose",
-        "hide",		"hidden",	"issafe",	"invokehidden",
-        "marktrusted",	NULL
-    };
-    enum options {
-	OPT_ALIAS,	OPT_ALIASES,	OPT_EVAL,	OPT_EXPOSE,
-	OPT_HIDE,	OPT_HIDDEN,	OPT_ISSAFE,	OPT_INVOKEHIDDEN,
-	OPT_MARKTRUSTED
-    };
-    
-    slaveInterp = (Tcl_Interp *) clientData;
-    if (slaveInterp == NULL) {
-	panic("SlaveObjCmd: interpreter has been deleted");
-    }
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch ((enum options) index) {
-	case OPT_ALIAS: {
-	    if (objc == 3) {
-		return AliasDescribe(interp, slaveInterp, objv[2]);
-	    }
-	    if (Tcl_GetString(objv[3])[0] == '\0') {
-		if (objc == 4) {
-		    return AliasDelete(interp, slaveInterp, objv[2]);
-		}
-	    } else {
-		return AliasCreate(interp, slaveInterp, interp, objv[2],
-			objv[3], objc - 4, objv + 4);
-	    }
-	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "aliasName ?targetName? ?args..?");
-            return TCL_ERROR;
-	}
-	case OPT_ALIASES: {
-	    return AliasList(interp, slaveInterp);
-	}
-	case OPT_EVAL: {
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "arg ?arg ...?");
-		return TCL_ERROR;
-	    }
-	    return SlaveEval(interp, slaveInterp, objc - 2, objv + 2);
-	}
-        case OPT_EXPOSE: {
-	    if ((objc < 3) || (objc > 4)) {
-		Tcl_WrongNumArgs(interp, 2, objv, "hiddenCmdName ?cmdName?");
-		return TCL_ERROR;
-	    }
-            return SlaveExpose(interp, slaveInterp, objc - 2, objv + 2);
-	}
-	case OPT_HIDE: {
-	    if ((objc < 3) || (objc > 4)) {
-		Tcl_WrongNumArgs(interp, 2, objv, "cmdName ?hiddenCmdName?");
-		return TCL_ERROR;
-	    }
-            return SlaveHide(interp, slaveInterp, objc - 2, objv + 2);
-	}
-        case OPT_HIDDEN: {
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-            return SlaveHidden(interp, slaveInterp);
-	}
-        case OPT_ISSAFE: {
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), Tcl_IsSafe(slaveInterp));
-	    return TCL_OK;
-	}
-        case OPT_INVOKEHIDDEN: {
-	    int global, i, index;
-	    static char *hiddenOptions[] = {
-		"-global",	"--",		NULL
-	    };
-	    enum hiddenOption {
-		OPT_GLOBAL,	OPT_LAST
-	    };
-	    global = 0;
-	    for (i = 2; i < objc; i++) {
-		if (Tcl_GetString(objv[i])[0] != '-') {
-		    break;
-		}
-		if (Tcl_GetIndexFromObj(interp, objv[i], hiddenOptions,
-			"option", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		if (index == OPT_GLOBAL) {
-		    global = 1;
-		} else {
-		    i++;
-		    break;
-		}
-	    }
-	    if (objc - i < 1) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"?-global? ?--? cmd ?arg ..?");
-		return TCL_ERROR;
-	    }
-	    return SlaveInvokeHidden(interp, slaveInterp, global, objc - i,
-		    objv + i);
-	}
-	case OPT_MARKTRUSTED: {
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-            return SlaveMarkTrusted(interp, slaveInterp);
-	}
-    }
-
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveObjCmdDeleteProc --
- *
- *	Invoked when an object command for a slave interpreter is deleted;
- *	cleans up all state associated with the slave interpreter and destroys
- *	the slave interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Cleans up all state associated with the slave interpreter and
- *	destroys the slave interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SlaveObjCmdDeleteProc(clientData)
-    ClientData clientData;		/* The SlaveRecord for the command. */
-{
-    Slave *slavePtr;			/* Interim storage for Slave record. */
-    Tcl_Interp *slaveInterp;		/* And for a slave interp. */
-
-    slaveInterp = (Tcl_Interp *) clientData;
-    slavePtr = &((InterpInfo *) ((Interp *) slaveInterp)->interpInfo)->slave;
-
-    /*
-     * Unlink the slave from its master interpreter.
-     */
-
-    Tcl_DeleteHashEntry(slavePtr->slaveEntryPtr);
-
-    /*
-     * Set to NULL so that when the InterpInfo is cleaned up in the slave
-     * it does not try to delete the command causing all sorts of grief.
-     * See SlaveRecordDeleteProc().
-     */
-
-    slavePtr->interpCmd = NULL;
-
-    if (slavePtr->slaveInterp != NULL) {
-	Tcl_DeleteInterp(slavePtr->slaveInterp);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveEval --
- *
- *	Helper function to evaluate a command in a slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveEval(interp, slaveInterp, objc, objv)
-    Tcl_Interp *interp;		/* Interp for error return. */
-    Tcl_Interp *slaveInterp;	/* The slave interpreter in which command
-				 * will be evaluated. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int result;
-    Tcl_Obj *objPtr;
-    
-    Tcl_Preserve((ClientData) slaveInterp);
-    Tcl_AllowExceptions(slaveInterp);
-
-    if (objc == 1) {
-	result = Tcl_EvalObjEx(slaveInterp, objv[0], 0);
-    } else {
-	objPtr = Tcl_ConcatObj(objc, objv);
-	Tcl_IncrRefCount(objPtr);
-	result = Tcl_EvalObjEx(slaveInterp, objPtr, 0);
-	Tcl_DecrRefCount(objPtr);
-    }
-    TclTransferResult(slaveInterp, result, interp);
-
-    Tcl_Release((ClientData) slaveInterp);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveExpose --
- *
- *	Helper function to expose a command in a slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	After this call scripts in the slave will be able to invoke
- *	the newly exposed command.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveExpose(interp, slaveInterp, objc, objv)
-    Tcl_Interp *interp;		/* Interp for error return. */
-    Tcl_Interp	*slaveInterp;	/* Interp in which command will be exposed. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument strings. */
-{
-    char *name;
-    
-    if (Tcl_IsSafe(interp)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"permission denied: safe interpreter cannot expose commands",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    name = Tcl_GetString(objv[(objc == 1) ? 0 : 1]);
-    if (Tcl_ExposeCommand(slaveInterp, Tcl_GetString(objv[0]),
-	    name) != TCL_OK) {
-	TclTransferResult(slaveInterp, TCL_ERROR, interp);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveHide --
- *
- *	Helper function to hide a command in a slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	After this call scripts in the slave will no longer be able
- *	to invoke the named command.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveHide(interp, slaveInterp, objc, objv)
-    Tcl_Interp *interp;		/* Interp for error return. */
-    Tcl_Interp	*slaveInterp;	/* Interp in which command will be exposed. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument strings. */
-{
-    char *name;
-    
-    if (Tcl_IsSafe(interp)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"permission denied: safe interpreter cannot hide commands",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    name = Tcl_GetString(objv[(objc == 1) ? 0 : 1]);
-    if (Tcl_HideCommand(slaveInterp, Tcl_GetString(objv[0]),
-	    name) != TCL_OK) {
-	TclTransferResult(slaveInterp, TCL_ERROR, interp);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveHidden --
- *
- *	Helper function to compute list of hidden commands in a slave
- *	interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveHidden(interp, slaveInterp)
-    Tcl_Interp *interp;		/* Interp for data return. */
-    Tcl_Interp *slaveInterp;	/* Interp whose hidden commands to query. */
-{
-    Tcl_Obj *listObjPtr;		/* Local object pointer. */
-    Tcl_HashTable *hTblPtr;		/* For local searches. */
-    Tcl_HashEntry *hPtr;		/* For local searches. */
-    Tcl_HashSearch hSearch;		/* For local searches. */
-    
-    listObjPtr = Tcl_GetObjResult(interp);
-    hTblPtr = ((Interp *) slaveInterp)->hiddenCmdTablePtr;
-    if (hTblPtr != (Tcl_HashTable *) NULL) {
-	for (hPtr = Tcl_FirstHashEntry(hTblPtr, &hSearch);
-	     hPtr != (Tcl_HashEntry *) NULL;
-	     hPtr = Tcl_NextHashEntry(&hSearch)) {
-
-	    Tcl_ListObjAppendElement(NULL, listObjPtr,
-		    Tcl_NewStringObj(Tcl_GetHashKey(hTblPtr, hPtr), -1));
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveInvokeHidden --
- *
- *	Helper function to invoke a hidden command in a slave interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the hidden command does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveInvokeHidden(interp, slaveInterp, global, objc, objv)
-    Tcl_Interp *interp;		/* Interp for error return. */
-    Tcl_Interp *slaveInterp;	/* The slave interpreter in which command
-				 * will be invoked. */
-    int global;			/* Non-zero to invoke in global namespace. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int result;
-    
-    if (Tcl_IsSafe(interp)) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp),
-		"not allowed to invoke hidden commands from safe interpreter",
-		-1);
-	return TCL_ERROR;
-    }
-
-    Tcl_Preserve((ClientData) slaveInterp);
-    Tcl_AllowExceptions(slaveInterp);
-    
-    if (global) {
-        result = TclObjInvokeGlobal(slaveInterp, objc, objv,
-                TCL_INVOKE_HIDDEN);
-    } else {
-        result = TclObjInvoke(slaveInterp, objc, objv, TCL_INVOKE_HIDDEN);
-    }
-
-    TclTransferResult(slaveInterp, result, interp);
-
-    Tcl_Release((ClientData) slaveInterp);
-    return result;        
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SlaveMarkTrusted --
- *
- *	Helper function to mark a slave interpreter as trusted (unsafe).
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	After this call the hard-wired security checks in the core no
- *	longer prevent the slave from performing certain operations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SlaveMarkTrusted(interp, slaveInterp)
-    Tcl_Interp *interp;		/* Interp for error return. */
-    Tcl_Interp *slaveInterp;	/* The slave interpreter which will be
-				 * marked trusted. */
-{
-    if (Tcl_IsSafe(interp)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"permission denied: safe interpreter cannot mark trusted",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    ((Interp *) slaveInterp)->flags &= ~SAFE_INTERP;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_IsSafe --
- *
- *	Determines whether an interpreter is safe
- *
- * Results:
- *	1 if it is safe, 0 if it is not.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_IsSafe(interp)
-    Tcl_Interp *interp;		/* Is this interpreter "safe" ? */
-{
-    Interp *iPtr;
-
-    if (interp == (Tcl_Interp *) NULL) {
-        return 0;
-    }
-    iPtr = (Interp *) interp;
-
-    return ( (iPtr->flags) & SAFE_INTERP ) ? 1 : 0 ;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeSafe --
- *
- *	Makes its argument interpreter contain only functionality that is
- *	defined to be part of Safe Tcl. Unsafe commands are hidden, the
- *	env array is unset, and the standard channels are removed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Hides commands in its argument interpreter, and removes settings
- *	and channels.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_MakeSafe(interp)
-    Tcl_Interp *interp;		/* Interpreter to be made safe. */
-{
-    Tcl_Channel chan;				/* Channel to remove from
-                                                 * safe interpreter. */
-    Interp *iPtr = (Interp *) interp;
-
-    TclHideUnsafeCommands(interp);
-    
-    iPtr->flags |= SAFE_INTERP;
-
-    /*
-     *  Unsetting variables : (which should not have been set 
-     *  in the first place, but...)
-     */
-
-    /*
-     * No env array in a safe slave.
-     */
-
-    Tcl_UnsetVar(interp, "env", TCL_GLOBAL_ONLY);
-
-    /* 
-     * Remove unsafe parts of tcl_platform
-     */
-
-    Tcl_UnsetVar2(interp, "tcl_platform", "os", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar2(interp, "tcl_platform", "osVersion", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar2(interp, "tcl_platform", "machine", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar2(interp, "tcl_platform", "user", TCL_GLOBAL_ONLY);
-
-    /*
-     * Unset path informations variables
-     * (the only one remaining is [info nameofexecutable])
-     */
-
-    Tcl_UnsetVar(interp, "tclDefaultLibrary", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar(interp, "tcl_library", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar(interp, "tcl_pkgPath", TCL_GLOBAL_ONLY);
-    
-    /*
-     * Remove the standard channels from the interpreter; safe interpreters
-     * do not ordinarily have access to stdin, stdout and stderr.
-     *
-     * NOTE: These channels are not added to the interpreter by the
-     * Tcl_CreateInterp call, but may be added later, by another I/O
-     * operation. We want to ensure that the interpreter does not have
-     * these channels even if it is being made safe after being used for
-     * some time..
-     */
-
-    chan = Tcl_GetStdChannel(TCL_STDIN);
-    if (chan != (Tcl_Channel) NULL) {
-        Tcl_UnregisterChannel(interp, chan);
-    }
-    chan = Tcl_GetStdChannel(TCL_STDOUT);
-    if (chan != (Tcl_Channel) NULL) {
-        Tcl_UnregisterChannel(interp, chan);
-    }
-    chan = Tcl_GetStdChannel(TCL_STDERR);
-    if (chan != (Tcl_Channel) NULL) {
-        Tcl_UnregisterChannel(interp, chan);
-    }
-
-    return TCL_OK;
-}
diff --git a/generic/tclLink.c b/generic/tclLink.c
deleted file mode 100644
index 20f9191..0000000
--- a/generic/tclLink.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* 
- * tclLink.c --
- *
- *	This file implements linked variables (a C variable that is
- *	tied to a Tcl variable).  The idea of linked variables was
- *	first suggested by Andreas Stolcke and this implementation is
- *	based heavily on a prototype implementation provided by
- *	him.
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLink.c,v 1.3 1999/04/16 00:46:49 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * For each linked variable there is a data structure of the following
- * type, which describes the link and is the clientData for the trace
- * set on the Tcl variable.
- */
-
-typedef struct Link {
-    Tcl_Interp *interp;		/* Interpreter containing Tcl variable. */
-    char *varName;		/* Name of variable (must be global).  This
-				 * is needed during trace callbacks, since
-				 * the actual variable may be aliased at
-				 * that time via upvar. */
-    char *addr;			/* Location of C variable. */
-    int type;			/* Type of link (TCL_LINK_INT, etc.). */
-    union {
-	int i;
-	double d;
-    } lastValue;		/* Last known value of C variable;  used to
-				 * avoid string conversions. */
-    int flags;			/* Miscellaneous one-bit values;  see below
-				 * for definitions. */
-} Link;
-
-/*
- * Definitions for flag bits:
- * LINK_READ_ONLY -		1 means errors should be generated if Tcl
- *				script attempts to write variable.
- * LINK_BEING_UPDATED -		1 means that a call to Tcl_UpdateLinkedVar
- *				is in progress for this variable, so
- *				trace callbacks on the variable should
- *				be ignored.
- */
-
-#define LINK_READ_ONLY		1
-#define LINK_BEING_UPDATED	2
-
-/*
- * Forward references to procedures defined later in this file:
- */
-
-static char *		LinkTraceProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, char *name2,
-			    int flags));
-static char *		StringValue _ANSI_ARGS_((Link *linkPtr,
-			    char *buffer));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LinkVar --
- *
- *	Link a C variable to a Tcl variable so that changes to either
- *	one causes the other to change.
- *
- * Results:
- *	The return value is TCL_OK if everything went well or TCL_ERROR
- *	if an error occurred (the interp's result is also set after
- *	errors).
- *
- * Side effects:
- *	The value at *addr is linked to the Tcl variable "varName",
- *	using "type" to convert between string values for Tcl and
- *	binary values for *addr.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_LinkVar(interp, varName, addr, type)
-    Tcl_Interp *interp;		/* Interpreter in which varName exists. */
-    char *varName;		/* Name of a global variable in interp. */
-    char *addr;			/* Address of a C variable to be linked
-				 * to varName. */
-    int type;			/* Type of C variable: TCL_LINK_INT, etc. 
-				 * Also may have TCL_LINK_READ_ONLY
-				 * OR'ed in. */
-{
-    Link *linkPtr;
-    char buffer[TCL_DOUBLE_SPACE];
-    int code;
-
-    linkPtr = (Link *) ckalloc(sizeof(Link));
-    linkPtr->interp = interp;
-    linkPtr->varName = (char *) ckalloc((unsigned) (strlen(varName) + 1));
-    strcpy(linkPtr->varName, varName);
-    linkPtr->addr = addr;
-    linkPtr->type = type & ~TCL_LINK_READ_ONLY;
-    if (type & TCL_LINK_READ_ONLY) {
-	linkPtr->flags = LINK_READ_ONLY;
-    } else {
-	linkPtr->flags = 0;
-    }
-    if (Tcl_SetVar(interp, varName, StringValue(linkPtr, buffer),
-	    TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG) == NULL) {
-	ckfree(linkPtr->varName);
-	ckfree((char *) linkPtr);
-	return TCL_ERROR;
-    }
-    code = Tcl_TraceVar(interp, varName, TCL_GLOBAL_ONLY|TCL_TRACE_READS
-	    |TCL_TRACE_WRITES|TCL_TRACE_UNSETS, LinkTraceProc,
-	    (ClientData) linkPtr);
-    if (code != TCL_OK) {
-	ckfree(linkPtr->varName);
-	ckfree((char *) linkPtr);
-    }
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UnlinkVar --
- *
- *	Destroy the link between a Tcl variable and a C variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If "varName" was previously linked to a C variable, the link
- *	is broken to make the variable independent.  If there was no
- *	previous link for "varName" then nothing happens.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_UnlinkVar(interp, varName)
-    Tcl_Interp *interp;		/* Interpreter containing variable to unlink. */
-    char *varName;		/* Global variable in interp to unlink. */
-{
-    Link *linkPtr;
-
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
-    if (linkPtr == NULL) {
-	return;
-    }
-    Tcl_UntraceVar(interp, varName,
-	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    LinkTraceProc, (ClientData) linkPtr);
-    ckfree(linkPtr->varName);
-    ckfree((char *) linkPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UpdateLinkedVar --
- *
- *	This procedure is invoked after a linked variable has been
- *	changed by C code.  It updates the Tcl variable so that
- *	traces on the variable will trigger.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The Tcl variable "varName" is updated from its C value,
- *	causing traces on the variable to trigger.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_UpdateLinkedVar(interp, varName)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *varName;		/* Name of global variable that is linked. */
-{
-    Link *linkPtr;
-    char buffer[TCL_DOUBLE_SPACE];
-    int savedFlag;
-
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
-    if (linkPtr == NULL) {
-	return;
-    }
-    savedFlag = linkPtr->flags & LINK_BEING_UPDATED;
-    linkPtr->flags |= LINK_BEING_UPDATED;
-    Tcl_SetVar(interp, linkPtr->varName, StringValue(linkPtr, buffer),
-	    TCL_GLOBAL_ONLY);
-    linkPtr->flags = (linkPtr->flags & ~LINK_BEING_UPDATED) | savedFlag;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * LinkTraceProc --
- *
- *	This procedure is invoked when a linked Tcl variable is read,
- *	written, or unset from Tcl.  It's responsible for keeping the
- *	C variable in sync with the Tcl variable.
- *
- * Results:
- *	If all goes well, NULL is returned; otherwise an error message
- *	is returned.
- *
- * Side effects:
- *	The C variable may be updated to make it consistent with the
- *	Tcl variable, or the Tcl variable may be overwritten to reject
- *	a modification.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-LinkTraceProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Contains information about the link. */
-    Tcl_Interp *interp;		/* Interpreter containing Tcl variable. */
-    char *name1;		/* First part of variable name. */
-    char *name2;		/* Second part of variable name. */
-    int flags;			/* Miscellaneous additional information. */
-{
-    Link *linkPtr = (Link *) clientData;
-    int changed;
-    char buffer[TCL_DOUBLE_SPACE];
-    char *value, **pp, *result;
-    Tcl_Obj *objPtr;
-
-    /*
-     * If the variable is being unset, then just re-create it (with a
-     * trace) unless the whole interpreter is going away.
-     */
-
-    if (flags & TCL_TRACE_UNSETS) {
-	if (flags & TCL_INTERP_DESTROYED) {
-	    ckfree(linkPtr->varName);
-	    ckfree((char *) linkPtr);
-	} else if (flags & TCL_TRACE_DESTROYED) {
-	    Tcl_SetVar(interp, linkPtr->varName, StringValue(linkPtr, buffer),
-		    TCL_GLOBAL_ONLY);
-	    Tcl_TraceVar(interp, linkPtr->varName, TCL_GLOBAL_ONLY
-		    |TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		    LinkTraceProc, (ClientData) linkPtr);
-	}
-	return NULL;
-    }
-
-    /*
-     * If we were invoked because of a call to Tcl_UpdateLinkedVar, then
-     * don't do anything at all.  In particular, we don't want to get
-     * upset that the variable is being modified, even if it is
-     * supposed to be read-only.
-     */
-
-    if (linkPtr->flags & LINK_BEING_UPDATED) {
-	return NULL;
-    }
-
-    /*
-     * For read accesses, update the Tcl variable if the C variable
-     * has changed since the last time we updated the Tcl variable.
-     */
-
-    if (flags & TCL_TRACE_READS) {
-	switch (linkPtr->type) {
-	    case TCL_LINK_INT:
-	    case TCL_LINK_BOOLEAN:
-		changed = *(int *)(linkPtr->addr) != linkPtr->lastValue.i;
-		break;
-	    case TCL_LINK_DOUBLE:
-		changed = *(double *)(linkPtr->addr) != linkPtr->lastValue.d;
-		break;
-	    case TCL_LINK_STRING:
-		changed = 1;
-		break;
-	    default:
-		return "internal error: bad linked variable type";
-	}
-	if (changed) {
-	    Tcl_SetVar(interp, linkPtr->varName, StringValue(linkPtr, buffer),
-		    TCL_GLOBAL_ONLY);
-	}
-	return NULL;
-    }
-
-    /*
-     * For writes, first make sure that the variable is writable.  Then
-     * convert the Tcl value to C if possible.  If the variable isn't
-     * writable or can't be converted, then restore the varaible's old
-     * value and return an error.  Another tricky thing: we have to save
-     * and restore the interpreter's result, since the variable access
-     * could occur when the result has been partially set.
-     */
-
-    if (linkPtr->flags & LINK_READ_ONLY) {
-	Tcl_SetVar(interp, linkPtr->varName, StringValue(linkPtr, buffer),
-		TCL_GLOBAL_ONLY);
-	return "linked variable is read-only";
-    }
-    value = Tcl_GetVar(interp, linkPtr->varName, TCL_GLOBAL_ONLY);
-    if (value == NULL) {
-	/*
-	 * This shouldn't ever happen.
-	 */
-	return "internal error: linked variable couldn't be read";
-    }
-
-    objPtr = Tcl_GetObjResult(interp);
-    Tcl_IncrRefCount(objPtr);
-    Tcl_ResetResult(interp);
-    result = NULL;
-
-    switch (linkPtr->type) {
-	case TCL_LINK_INT:
-	    if (Tcl_GetInt(interp, value, &linkPtr->lastValue.i) != TCL_OK) {
-		Tcl_SetObjResult(interp, objPtr);
-		Tcl_SetVar(interp, linkPtr->varName,
-			StringValue(linkPtr, buffer), TCL_GLOBAL_ONLY);
-		result = "variable must have integer value";
-		goto end;
-	    }
-	    *(int *)(linkPtr->addr) = linkPtr->lastValue.i;
-	    break;
-	case TCL_LINK_DOUBLE:
-	    if (Tcl_GetDouble(interp, value, &linkPtr->lastValue.d)
-		    != TCL_OK) {
-		Tcl_SetObjResult(interp, objPtr);
-		Tcl_SetVar(interp, linkPtr->varName,
-			StringValue(linkPtr, buffer), TCL_GLOBAL_ONLY);
-		result = "variable must have real value";
-		goto end;
-	    }
-	    *(double *)(linkPtr->addr) = linkPtr->lastValue.d;
-	    break;
-	case TCL_LINK_BOOLEAN:
-	    if (Tcl_GetBoolean(interp, value, &linkPtr->lastValue.i)
-		    != TCL_OK) {
-		Tcl_SetObjResult(interp, objPtr);
-		Tcl_SetVar(interp, linkPtr->varName,
-			StringValue(linkPtr, buffer), TCL_GLOBAL_ONLY);
-		result = "variable must have boolean value";
-		goto end;
-	    }
-	    *(int *)(linkPtr->addr) = linkPtr->lastValue.i;
-	    break;
-	case TCL_LINK_STRING:
-	    pp = (char **)(linkPtr->addr);
-	    if (*pp != NULL) {
-		ckfree(*pp);
-	    }
-	    *pp = (char *) ckalloc((unsigned) (strlen(value) + 1));
-	    strcpy(*pp, value);
-	    break;
-	default:
-	    return "internal error: bad linked variable type";
-    }
-    end:
-    Tcl_DecrRefCount(objPtr);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StringValue --
- *
- *	Converts the value of a C variable to a string for use in a
- *	Tcl variable to which it is linked.
- *
- * Results:
- *	The return value is a pointer to a string that represents
- *	the value of the C variable given by linkPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-StringValue(linkPtr, buffer)
-    Link *linkPtr;		/* Structure describing linked variable. */
-    char *buffer;		/* Small buffer to use for converting
-				 * values.  Must have TCL_DOUBLE_SPACE
-				 * bytes or more. */
-{
-    char *p;
-
-    switch (linkPtr->type) {
-	case TCL_LINK_INT:
-	    linkPtr->lastValue.i = *(int *)(linkPtr->addr);
-	    TclFormatInt(buffer, linkPtr->lastValue.i);
-	    return buffer;
-	case TCL_LINK_DOUBLE:
-	    linkPtr->lastValue.d = *(double *)(linkPtr->addr);
-	    Tcl_PrintDouble((Tcl_Interp *) NULL, linkPtr->lastValue.d, buffer);
-	    return buffer;
-	case TCL_LINK_BOOLEAN:
-	    linkPtr->lastValue.i = *(int *)(linkPtr->addr);
-	    if (linkPtr->lastValue.i != 0) {
-		return "1";
-	    }
-	    return "0";
-	case TCL_LINK_STRING:
-	    p = *(char **)(linkPtr->addr);
-	    if (p == NULL) {
-		return "NULL";
-	    }
-	    return p;
-    }
-
-    /*
-     * This code only gets executed if the link type is unknown
-     * (shouldn't ever happen).
-     */
-
-    return "??";
-}
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
deleted file mode 100644
index aceaa7a..0000000
--- a/generic/tclListObj.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/* 
- * tclListObj.c --
- *
- *	This file contains procedures that implement the Tcl list object
- *	type.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclListObj.c,v 1.4 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static void		DupListInternalRep _ANSI_ARGS_((Tcl_Obj *srcPtr,
-			    Tcl_Obj *copyPtr));
-static void		FreeListInternalRep _ANSI_ARGS_((Tcl_Obj *listPtr));
-static int		SetListFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static void		UpdateStringOfList _ANSI_ARGS_((Tcl_Obj *listPtr));
-
-/*
- * The structure below defines the list Tcl object type by means of
- * procedures that can be invoked by generic object code.
- */
-
-Tcl_ObjType tclListType = {
-    "list",				/* name */
-    FreeListInternalRep,		/* freeIntRepProc */
-    DupListInternalRep,		        /* dupIntRepProc */
-    UpdateStringOfList,			/* updateStringProc */
-    SetListFromAny			/* setFromAnyProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewListObj --
- *
- *	This procedure is normally called when not debugging: i.e., when
- *	TCL_MEM_DEBUG is not defined. It creates a new list object from an
- *	(objc,objv) array: that is, each of the objc elements of the array
- *	referenced by objv is inserted as an element into a new Tcl object.
- *
- *	When TCL_MEM_DEBUG is defined, this procedure just returns the
- *	result of calling the debugging version Tcl_DbNewListObj.
- *
- * Results:
- *	A new list object is returned that is initialized from the object
- *	pointers in objv. If objc is less than or equal to zero, an empty
- *	object is returned. The new object's string representation
- *	is left NULL. The resulting new list object has ref count 0.
- *
- * Side effects:
- *	The ref counts of the elements in objv are incremented since the
- *	resulting list now refers to them.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewListObj
-
-Tcl_Obj *
-Tcl_NewListObj(objc, objv)
-    int objc;			/* Count of objects referenced by objv. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to Tcl objects. */
-{
-    return Tcl_DbNewListObj(objc, objv, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewListObj(objc, objv)
-    int objc;			/* Count of objects referenced by objv. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to Tcl objects. */
-{
-    register Tcl_Obj *listPtr;
-    register Tcl_Obj **elemPtrs;
-    register List *listRepPtr;
-    int i;
-    
-    TclNewObj(listPtr);
-    
-    if (objc > 0) {
-	Tcl_InvalidateStringRep(listPtr);
-	
-	elemPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (objc * sizeof(Tcl_Obj *)));
-	for (i = 0;  i < objc;  i++) {
-	    elemPtrs[i] = objv[i];
-	    Tcl_IncrRefCount(elemPtrs[i]);
-	}
-	
-	listRepPtr = (List *) ckalloc(sizeof(List));
-	listRepPtr->maxElemCount = objc;
-	listRepPtr->elemCount    = objc;
-	listRepPtr->elements     = elemPtrs;
-	
-	listPtr->internalRep.otherValuePtr = (VOID *) listRepPtr;
-	listPtr->typePtr = &tclListType;
-    }
-    return listPtr;
-}
-#endif /* if TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewListObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It creates new list objects. It is the
- *	same as the Tcl_NewListObj procedure above except that it calls
- *	Tcl_DbCkalloc directly with the file name and line number from its
- *	caller. This simplifies debugging since then the checkmem command
- *	will report the correct file name and line number when reporting
- *	objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewListObj.
- *
- * Results:
- *	A new list object is returned that is initialized from the object
- *	pointers in objv. If objc is less than or equal to zero, an empty
- *	object is returned. The new object's string representation
- *	is left NULL. The new list object has ref count 0.
- *
- * Side effects:
- *	The ref counts of the elements in objv are incremented since the
- *	resulting list now refers to them.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewListObj(objc, objv, file, line)
-    int objc;			/* Count of objects referenced by objv. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to Tcl objects. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *listPtr;
-    register Tcl_Obj **elemPtrs;
-    register List *listRepPtr;
-    int i;
-    
-    TclDbNewObj(listPtr, file, line);
-    
-    if (objc > 0) {
-	Tcl_InvalidateStringRep(listPtr);
-	
-	elemPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (objc * sizeof(Tcl_Obj *)));
-	for (i = 0;  i < objc;  i++) {
-	    elemPtrs[i] = objv[i];
-	    Tcl_IncrRefCount(elemPtrs[i]);
-	}
-	
-	listRepPtr = (List *) ckalloc(sizeof(List));
-	listRepPtr->maxElemCount = objc;
-	listRepPtr->elemCount    = objc;
-	listRepPtr->elements     = elemPtrs;
-	
-	listPtr->internalRep.otherValuePtr = (VOID *) listRepPtr;
-	listPtr->typePtr = &tclListType;
-    }
-    return listPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewListObj(objc, objv, file, line)
-    int objc;			/* Count of objects referenced by objv. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to Tcl objects. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewListObj(objc, objv);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetListObj --
- *
- *	Modify an object to be a list containing each of the objc elements
- *	of the object array referenced by objv.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object is made a list object and is initialized from the object
- *	pointers in objv. If objc is less than or equal to zero, an empty
- *	object is returned. The new object's string representation
- *	is left NULL. The ref counts of the elements in objv are incremented
- *	since the list now refers to them. The object's old string and
- *	internal representations are freed and its type is set NULL.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetListObj(objPtr, objc, objv)
-    Tcl_Obj *objPtr;		/* Object whose internal rep to init. */
-    int objc;			/* Count of objects referenced by objv. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to Tcl objects. */
-{
-    register Tcl_Obj **elemPtrs;
-    register List *listRepPtr;
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    int i;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetListObj called with shared object");
-    }
-    
-    /*
-     * Free any old string rep and any internal rep for the old type.
-     */
-
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    objPtr->typePtr = NULL;
-        
-    /*
-     * Set the object's type to "list" and initialize the internal rep.
-     * However, if there are no elements to put in the list, just give
-     * the object an empty string rep and a NULL type.
-     */
-
-    if (objc > 0) {
-	elemPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (objc * sizeof(Tcl_Obj *)));
-	for (i = 0;  i < objc;  i++) {
-	    elemPtrs[i] = objv[i];
-	    Tcl_IncrRefCount(elemPtrs[i]);
-	}
-	
-	listRepPtr = (List *) ckalloc(sizeof(List));
-	listRepPtr->maxElemCount = objc;
-	listRepPtr->elemCount    = objc;
-	listRepPtr->elements     = elemPtrs;
-	
-	objPtr->internalRep.otherValuePtr = (VOID *) listRepPtr;
-	objPtr->typePtr = &tclListType;
-    } else {
-	objPtr->bytes = tclEmptyStringRep;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjGetElements --
- *
- *	This procedure returns an (objc,objv) array of the elements in a
- *	list object.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case *objcPtr is set to
- *	the count of list elements and *objvPtr is set to a pointer to an
- *	array of (*objcPtr) pointers to each list element. If listPtr does
- *	not refer to a list object and the object can not be converted to
- *	one, TCL_ERROR is returned and an error message will be left in
- *	the interpreter's result if interp is not NULL.
- *
- *	The objects referenced by the returned array should be treated as
- *	readonly and their ref counts are _not_ incremented; the caller must
- *	do that if it holds on to a reference. Furthermore, the pointer
- *	and length returned by this procedure may change as soon as any
- *	procedure is called on the list object; be careful about retaining
- *	the pointer in a local data structure.
- *
- * Side effects:
- *	The possible conversion of the object referenced by listPtr
- *	to a list object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr)
-    Tcl_Interp *interp;		/* Used to report errors if not NULL. */
-    register Tcl_Obj *listPtr;	/* List object for which an element array
-				 * is to be returned. */
-    int *objcPtr;		/* Where to store the count of objects
-				 * referenced by objv. */
-    Tcl_Obj ***objvPtr;		/* Where to store the pointer to an array
-				 * of pointers to the list's objects. */
-{
-    register List *listRepPtr;
-
-    if (listPtr->typePtr != &tclListType) {
-	int result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    *objcPtr = listRepPtr->elemCount;
-    *objvPtr = listRepPtr->elements;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjAppendList --
- *
- *	This procedure appends the objects in the list referenced by
- *	elemListPtr to the list object referenced by listPtr. If listPtr is
- *	not already a list object, an attempt will be made to convert it to
- *	one.
- *
- * Results:
- *	The return value is normally TCL_OK. If listPtr or elemListPtr do
- *	not refer to list objects and they can not be converted to one,
- *	TCL_ERROR is returned and an error message is left in
- *	the interpreter's result if interp is not NULL.
- *
- * Side effects:
- *	The reference counts of the elements in elemListPtr are incremented
- *	since the list now refers to them. listPtr and elemListPtr are
- *	converted, if necessary, to list objects. Also, appending the
- *	new elements may cause listObj's array of element pointers to grow.
- *	listPtr's old string representation, if any, is invalidated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjAppendList(interp, listPtr, elemListPtr)
-    Tcl_Interp *interp;		/* Used to report errors if not NULL. */
-    register Tcl_Obj *listPtr;	/* List object to append elements to. */
-    Tcl_Obj *elemListPtr;	/* List obj with elements to append. */
-{
-    register List *listRepPtr;
-    int listLen, objc, result;
-    Tcl_Obj **objv;
-
-    if (Tcl_IsShared(listPtr)) {
-	panic("Tcl_ListObjAppendList called with shared object");
-    }
-    if (listPtr->typePtr != &tclListType) {
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    listLen = listRepPtr->elemCount;
-
-    result = Tcl_ListObjGetElements(interp, elemListPtr, &objc, &objv);
-    if (result != TCL_OK) {
-	return result;
-    }
-
-    /*
-     * Insert objc new elements starting after the lists's last element.
-     * Delete zero existing elements.
-     */
-    
-    return Tcl_ListObjReplace(interp, listPtr, listLen, 0, objc, objv);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjAppendElement --
- *
- *	This procedure is a special purpose version of
- *	Tcl_ListObjAppendList: it appends a single object referenced by
- *	objPtr to the list object referenced by listPtr. If listPtr is not
- *	already a list object, an attempt will be made to convert it to one.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case objPtr is added
- *	to the end of listPtr's list. If listPtr does not refer to a list
- *	object and the object can not be converted to one, TCL_ERROR is
- *	returned and an error message will be left in the interpreter's
- *	result if interp is not NULL.
- *
- * Side effects:
- *	The ref count of objPtr is incremented since the list now refers 
- *	to it. listPtr will be converted, if necessary, to a list object.
- *	Also, appending the new element may cause listObj's array of element
- *	pointers to grow. listPtr's old string representation, if any,
- *	is invalidated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjAppendElement(interp, listPtr, objPtr)
-    Tcl_Interp *interp;		/* Used to report errors if not NULL. */
-    Tcl_Obj *listPtr;		/* List object to append objPtr to. */
-    Tcl_Obj *objPtr;		/* Object to append to listPtr's list. */
-{
-    register List *listRepPtr;
-    register Tcl_Obj **elemPtrs;
-    int numElems, numRequired;
-    
-    if (Tcl_IsShared(listPtr)) {
-	panic("Tcl_ListObjAppendElement called with shared object");
-    }
-    if (listPtr->typePtr != &tclListType) {
-	int result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    elemPtrs = listRepPtr->elements;
-    numElems = listRepPtr->elemCount;
-    numRequired = numElems + 1 ;
-    
-    /*
-     * If there is no room in the current array of element pointers,
-     * allocate a new, larger array and copy the pointers to it.
-     */
-
-    if (numRequired > listRepPtr->maxElemCount) {
-	int newMax = (2 * numRequired);
-	Tcl_Obj **newElemPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (newMax * sizeof(Tcl_Obj *)));
-	
-	memcpy((VOID *) newElemPtrs, (VOID *) elemPtrs,
-	       (size_t) (numElems * sizeof(Tcl_Obj *)));
-
-	listRepPtr->maxElemCount = newMax;
-	listRepPtr->elements = newElemPtrs;
-	ckfree((char *) elemPtrs);
-	elemPtrs = newElemPtrs;
-    }
-
-    /*
-     * Add objPtr to the end of listPtr's array of element
-     * pointers. Increment the ref count for the (now shared) objPtr.
-     */
-
-    elemPtrs[numElems] = objPtr;
-    Tcl_IncrRefCount(objPtr);
-    listRepPtr->elemCount++;
-
-    /*
-     * Invalidate any old string representation since the list's internal
-     * representation has changed.
-     */
-
-    Tcl_InvalidateStringRep(listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjIndex --
- *
- *	This procedure returns a pointer to the index'th object from the
- *	list referenced by listPtr. The first element has index 0. If index
- *	is negative or greater than or equal to the number of elements in
- *	the list, a NULL is returned. If listPtr is not a list object, an
- *	attempt will be made to convert it to a list.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case objPtrPtr is set
- *	to the Tcl_Obj pointer for the index'th list element or NULL if
- *	index is out of range. This object should be treated as readonly and
- *	its ref count is _not_ incremented; the caller must do that if it
- *	holds on to the reference. If listPtr does not refer to a list and
- *	can't be converted to one, TCL_ERROR is returned and an error
- *	message is left in the interpreter's result if interp is not NULL.
- *
- * Side effects:
- *	listPtr will be converted, if necessary, to a list object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjIndex(interp, listPtr, index, objPtrPtr)
-    Tcl_Interp *interp;		/* Used to report errors if not NULL. */
-    register Tcl_Obj *listPtr;	/* List object to index into. */
-    register int index;		/* Index of element to return. */
-    Tcl_Obj **objPtrPtr;	/* The resulting Tcl_Obj* is stored here. */
-{
-    register List *listRepPtr;
-    
-    if (listPtr->typePtr != &tclListType) {
-	int result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    if ((index < 0) || (index >= listRepPtr->elemCount)) {
-	*objPtrPtr = NULL;
-    } else {
-	*objPtrPtr = listRepPtr->elements[index];
-    }
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjLength --
- *
- *	This procedure returns the number of elements in a list object. If
- *	the object is not already a list object, an attempt will be made to
- *	convert it to one.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case *intPtr will be
- *	set to the integer count of list elements. If listPtr does not refer
- *	to a list object and the object can not be converted to one,
- *	TCL_ERROR is returned and an error message will be left in
- *	the interpreter's result if interp is not NULL.
- *
- * Side effects:
- *	The possible conversion of the argument object to a list object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjLength(interp, listPtr, intPtr)
-    Tcl_Interp *interp;		/* Used to report errors if not NULL. */
-    register Tcl_Obj *listPtr;	/* List object whose #elements to return. */
-    register int *intPtr;	/* The resulting int is stored here. */
-{
-    register List *listRepPtr;
-    
-    if (listPtr->typePtr != &tclListType) {
-	int result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    *intPtr = listRepPtr->elemCount;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ListObjReplace --
- * 
- *	This procedure replaces zero or more elements of the list referenced
- *	by listPtr with the objects from an (objc,objv) array. 
- *	The objc elements of the array referenced by objv replace the
- *	count elements in listPtr starting at first.
- *
- *	If the argument first is zero or negative, it refers to the first
- *	element. If first is greater than or equal to the number of elements
- *	in the list, then no elements are deleted; the new elements are
- *	appended to the list. Count gives the number of elements to
- *	replace. If count is zero or negative then no elements are deleted;
- *	the new elements are simply inserted before first.
- *
- *	The argument objv refers to an array of objc pointers to the new
- *	elements to be added to listPtr in place of those that were
- *	deleted. If objv is NULL, no new elements are added. If listPtr is
- *	not a list object, an attempt will be made to convert it to one.
- *
- * Results:
- *	The return value is normally TCL_OK. If listPtr does
- *	not refer to a list object and can not be converted to one,
- *	TCL_ERROR is returned and an error message will be left in
- *	the interpreter's result if interp is not NULL.
- *
- * Side effects:
- *	The ref counts of the objc elements in objv are incremented since
- *	the resulting list now refers to them. Similarly, the ref counts for
- *	replaced objects are decremented. listPtr is converted, if
- *	necessary, to a list object. listPtr's old string representation, if
- *	any, is freed. 
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    Tcl_Obj *listPtr;		/* List object whose elements to replace. */
-    int first;			/* Index of first element to replace. */
-    int count;			/* Number of elements to replace. */
-    int objc;			/* Number of objects to insert. */
-    Tcl_Obj *CONST objv[];	/* An array of objc pointers to Tcl objects
-				 * to insert. */
-{
-    List *listRepPtr;
-    register Tcl_Obj **elemPtrs, **newPtrs;
-    Tcl_Obj *victimPtr;
-    int numElems, numRequired, numAfterLast;
-    int start, shift, newMax, i, j, result;
-     
-    if (Tcl_IsShared(listPtr)) {
-	panic("Tcl_ListObjReplace called with shared object");
-    }
-    if (listPtr->typePtr != &tclListType) {
-	result = SetListFromAny(interp, listPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    elemPtrs = listRepPtr->elements;
-    numElems = listRepPtr->elemCount;
-
-    if (first < 0)  {
-    	first = 0;
-    }
-    if (first >= numElems) {
-	first = numElems;	/* so we'll insert after last element */
-    }
-    if (count < 0) {
-	count = 0;
-    }
-    
-    numRequired = (numElems - count + objc);
-    if (numRequired <= listRepPtr->maxElemCount) {
-	/*
-	 * Enough room in the current array. First "delete" count
-	 * elements starting at first.
-	 */
-
-	for (i = 0, j = first;  i < count;  i++, j++) {
-	    victimPtr = elemPtrs[j];
-	    TclDecrRefCount(victimPtr);
-	}
-
-	/*
-	 * Shift the elements after the last one removed to their
-	 * new locations.
-	 */
-
-	start = (first + count);
-	numAfterLast = (numElems - start);
-	shift = (objc - count);	/* numNewElems - numDeleted */
-	if ((numAfterLast > 0) && (shift != 0)) {
-	    Tcl_Obj **src, **dst;
-
-	    if (shift < 0) {
-		for (src = elemPtrs + start, dst = src + shift;
-			numAfterLast > 0; numAfterLast--, src++, dst++) {
-		    *dst = *src;
-		}
-	    } else {
-		for (src = elemPtrs + numElems - 1, dst = src + shift;
-			numAfterLast > 0; numAfterLast--, src--, dst--) {
-		    *dst = *src;
-		}
-	    }
-	}
-
-	/*
-	 * Insert the new elements into elemPtrs before "first".
-	 */
-
-	for (i = 0, j = first;  i < objc;  i++, j++) {
-            elemPtrs[j] = objv[i];
-            Tcl_IncrRefCount(objv[i]);
-        }
-
-	/*
-	 * Update the count of elements.
-	 */
-
-	listRepPtr->elemCount = numRequired;
-    } else {
-	/*
-	 * Not enough room in the current array. Allocate a larger array and
-	 * insert elements into it. 
-	 */
-
-	newMax = (2 * numRequired);
-	newPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (newMax * sizeof(Tcl_Obj *)));
-
-	/*
-	 * Copy over the elements before "first".
-	 */
-
-	if (first > 0) {
-	    memcpy((VOID *) newPtrs, (VOID *) elemPtrs,
-		    (size_t) (first * sizeof(Tcl_Obj *)));
-	}
-
-	/*
-	 * "Delete" count elements starting at first.
-	 */
-
-	for (i = 0, j = first;  i < count;  i++, j++) {
-	    victimPtr = elemPtrs[j];
-	    TclDecrRefCount(victimPtr);
-	}
-
-	/*
-	 * Copy the elements after the last one removed, shifted to
-	 * their new locations.
-	 */
-
-	start = (first + count);
-	numAfterLast = (numElems - start);
-	if (numAfterLast > 0) {
-	    memcpy((VOID *) &(newPtrs[first + objc]),
-		    (VOID *) &(elemPtrs[start]),
-		    (size_t) (numAfterLast * sizeof(Tcl_Obj *)));
-	}
-	
-	/*
-	 * Insert the new elements before "first" and update the
-	 * count of elements.
-	 */
-
-	for (i = 0, j = first;  i < objc;  i++, j++) {
-	    newPtrs[j] = objv[i];
-	    Tcl_IncrRefCount(objv[i]);
-	}
-
-	listRepPtr->elemCount = numRequired;
-	listRepPtr->maxElemCount = newMax;
-	listRepPtr->elements = newPtrs;
-	ckfree((char *) elemPtrs);
-    }
-    
-    /*
-     * Invalidate and free any old string representation since it no longer
-     * reflects the list's internal representation.
-     */
-
-    Tcl_InvalidateStringRep(listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeListInternalRep --
- *
- *	Deallocate the storage associated with a list object's internal
- *	representation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees listPtr's List* internal representation and sets listPtr's
- *	internalRep.otherValuePtr to NULL. Decrements the ref counts
- *	of all element objects, which may free them.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeListInternalRep(listPtr)
-    Tcl_Obj *listPtr;		/* List object with internal rep to free. */
-{
-    register List *listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    register Tcl_Obj **elemPtrs = listRepPtr->elements;
-    register Tcl_Obj *objPtr;
-    int numElems = listRepPtr->elemCount;
-    int i;
-    
-    for (i = 0;  i < numElems;  i++) {
-	objPtr = elemPtrs[i];
-	Tcl_DecrRefCount(objPtr);
-    }
-    ckfree((char *) elemPtrs);
-    ckfree((char *) listRepPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupListInternalRep --
- *
- *	Initialize the internal representation of a list Tcl_Obj to a
- *	copy of the internal representation of an existing list object. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	"srcPtr"s list internal rep pointer should not be NULL and we assume
- *	it is not NULL. We set "copyPtr"s internal rep to a pointer to a
- *	newly allocated List structure that, in turn, points to "srcPtr"s
- *	element objects. Those element objects are not actually copied but
- *	are shared between "srcPtr" and "copyPtr". The ref count of each
- *	element object is incremented.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupListInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;		/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr;		/* Object with internal rep to set. */
-{
-    List *srcListRepPtr = (List *) srcPtr->internalRep.otherValuePtr;
-    int numElems = srcListRepPtr->elemCount;
-    int maxElems = srcListRepPtr->maxElemCount;
-    register Tcl_Obj **srcElemPtrs = srcListRepPtr->elements;
-    register Tcl_Obj **copyElemPtrs;
-    register List *copyListRepPtr;
-    int i;
-
-    /*
-     * Allocate a new List structure that points to "srcPtr"s element
-     * objects. Increment the ref counts for those (now shared) element
-     * objects.
-     */
-    
-    copyElemPtrs = (Tcl_Obj **)
-	ckalloc((unsigned) maxElems * sizeof(Tcl_Obj *));
-    for (i = 0;  i < numElems;  i++) {
-	copyElemPtrs[i] = srcElemPtrs[i];
-	Tcl_IncrRefCount(copyElemPtrs[i]);
-    }
-    
-    copyListRepPtr = (List *) ckalloc(sizeof(List));
-    copyListRepPtr->maxElemCount = maxElems;
-    copyListRepPtr->elemCount    = numElems;
-    copyListRepPtr->elements     = copyElemPtrs;
-    
-    copyPtr->internalRep.otherValuePtr = (VOID *) copyListRepPtr;
-    copyPtr->typePtr = &tclListType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetListFromAny --
- *
- *	Attempt to generate a list internal form for the Tcl object
- *	"objPtr".
- *
- * Results:
- *	The return value is TCL_OK or TCL_ERROR. If an error occurs during
- *	conversion, an error message is left in the interpreter's result
- *	unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, a list is stored as "objPtr"s internal
- *	representation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetListFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* The object to convert. */
-{
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *string, *s;
-    CONST char *elemStart, *nextElem;
-    int lenRemain, length, estCount, elemSize, hasBrace, i, j, result;
-    char *limit;		/* Points just after string's last byte. */
-    register CONST char *p;
-    register Tcl_Obj **elemPtrs;
-    register Tcl_Obj *elemPtr;
-    List *listRepPtr;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    /*
-     * Parse the string into separate string objects, and create a List
-     * structure that points to the element string objects. We use a
-     * modified version of Tcl_SplitList's implementation to avoid one
-     * malloc and a string copy for each list element. First, estimate the
-     * number of elements by counting the number of space characters in the
-     * list.
-     */
-
-    limit = (string + length);
-    estCount = 1;
-    for (p = string;  p < limit;  p++) {
-	if (isspace(UCHAR(*p))) { /* INTL: ISO space. */
-	    estCount++;
-	}
-    }
-
-    /*
-     * Allocate a new List structure with enough room for "estCount"
-     * elements. Each element is a pointer to a Tcl_Obj with the appropriate
-     * string rep. The initial "estCount" elements are set using the
-     * corresponding "argv" strings.
-     */
-
-    elemPtrs = (Tcl_Obj **)
-	    ckalloc((unsigned) (estCount * sizeof(Tcl_Obj *)));
-    for (p = string, lenRemain = length, i = 0;
-	    lenRemain > 0;
-	    p = nextElem, lenRemain = (limit - nextElem), i++) {
-	result = TclFindElement(interp, p, lenRemain, &elemStart, &nextElem,
-				&elemSize, &hasBrace);
-	if (result != TCL_OK) {
-	    for (j = 0;  j < i;  j++) {
-		elemPtr = elemPtrs[j];
-		Tcl_DecrRefCount(elemPtr);
-	    }
-	    ckfree((char *) elemPtrs);
-	    return result;
-	}
-	if (elemStart >= limit) {
-	    break;
-	}
-	if (i > estCount) {
-	    panic("SetListFromAny: bad size estimate for list");
-	}
-
-	/*
-	 * Allocate a Tcl object for the element and initialize it from the
-	 * "elemSize" bytes starting at "elemStart".
-	 */
-
-	s = ckalloc((unsigned) elemSize + 1);
-	if (hasBrace) {
-	    memcpy((VOID *) s, (VOID *) elemStart,  (size_t) elemSize);
-	    s[elemSize] = 0;
-	} else {
-	    elemSize = TclCopyAndCollapse(elemSize, elemStart, s);
-	}
-	
-	TclNewObj(elemPtr);
-        elemPtr->bytes  = s;
-        elemPtr->length = elemSize;
-        elemPtrs[i] = elemPtr;
-	Tcl_IncrRefCount(elemPtr); /* since list now holds ref to it */
-    }
-
-    listRepPtr = (List *) ckalloc(sizeof(List));
-    listRepPtr->maxElemCount = estCount;
-    listRepPtr->elemCount    = i;
-    listRepPtr->elements     = elemPtrs;
-
-    /*
-     * Free the old internalRep before setting the new one. We do this as
-     * late as possible to allow the conversion code, in particular
-     * Tcl_GetStringFromObj, to use that old internalRep.
-     */
-
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-
-    objPtr->internalRep.otherValuePtr = (VOID *) listRepPtr;
-    objPtr->typePtr = &tclListType;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfList --
- *
- *	Update the string representation for a list object.
- *	Note: This procedure does not invalidate an existing old string rep
- *	so storage will be lost if this has not already been done. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the list-to-string conversion. This string will be empty if the
- *	list has no elements. The list internal representation
- *	should not be NULL and we assume it is not NULL.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfList(listPtr)
-    Tcl_Obj *listPtr;		/* List object with string rep to update. */
-{
-#   define LOCAL_SIZE 20
-    int localFlags[LOCAL_SIZE], *flagPtr;
-    List *listRepPtr = (List *) listPtr->internalRep.otherValuePtr;
-    int numElems = listRepPtr->elemCount;
-    register int i;
-    char *elem, *dst;
-    int length;
-
-    /*
-     * Convert each element of the list to string form and then convert it
-     * to proper list element form, adding it to the result buffer.
-     */
-
-    /*
-     * Pass 1: estimate space, gather flags.
-     */
-
-    if (numElems <= LOCAL_SIZE) {
-	flagPtr = localFlags;
-    } else {
-	flagPtr = (int *) ckalloc((unsigned) numElems*sizeof(int));
-    }
-    listPtr->length = 1;
-    for (i = 0; i < numElems; i++) {
-	elem = Tcl_GetStringFromObj(listRepPtr->elements[i], &length);
-	listPtr->length += Tcl_ScanCountedElement(elem, length,
-		&flagPtr[i]) + 1;
-    }
-
-    /*
-     * Pass 2: copy into string rep buffer.
-     */
-
-    listPtr->bytes = ckalloc((unsigned) listPtr->length);
-    dst = listPtr->bytes;
-    for (i = 0; i < numElems; i++) {
-	elem = Tcl_GetStringFromObj(listRepPtr->elements[i], &length);
-	dst += Tcl_ConvertCountedElement(elem, length, dst, flagPtr[i]);
-	*dst = ' ';
-	dst++;
-    }
-    if (flagPtr != localFlags) {
-	ckfree((char *) flagPtr);
-    }
-    if (dst == listPtr->bytes) {
-	*dst = 0;
-    } else {
-	dst--;
-	*dst = 0;
-    }
-    listPtr->length = dst - listPtr->bytes;
-}
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
deleted file mode 100644
index eb199bb..0000000
--- a/generic/tclLiteral.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/* 
- * tclLiteral.c --
- *
- *	Implementation of the global and ByteCode-local literal tables
- *	used to manage the Tcl objects created for literal values during
- *	compilation of Tcl scripts. This implementation borrows heavily
- *	from the more general hashtable implementation of Tcl hash tables
- *	that appears in tclHash.c.
- *
- * Copyright (c) 1997-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLiteral.c,v 1.2 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * When there are this many entries per bucket, on average, rebuild
- * a literal's hash table to make it larger.
- */
-
-#define REBUILD_MULTIPLIER	3
-
-/*
- * Procedure prototypes for static procedures in this file:
- */
-
-static int		AddLocalLiteralEntry _ANSI_ARGS_((
-			    CompileEnv *envPtr, LiteralEntry *globalPtr,
-			    int localHash));
-static void		ExpandLocalLiteralArray _ANSI_ARGS_((
-			    CompileEnv *envPtr));
-static unsigned int	HashString _ANSI_ARGS_((CONST char *bytes,
-			    int length));
-static void		RebuildLiteralTable _ANSI_ARGS_((
-			    LiteralTable *tablePtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitLiteralTable --
- *
- *	This procedure is called to initialize the fields of a literal table
- *	structure for either an interpreter or a compilation's CompileEnv
- *	structure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The literal table is made ready for use.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitLiteralTable(tablePtr)
-    register LiteralTable *tablePtr; /* Pointer to table structure, which
-				      * is supplied by the caller. */
-{
-#if (TCL_SMALL_HASH_TABLE != 4) 
-    panic("TclInitLiteralTable: TCL_SMALL_HASH_TABLE is %d, not 4\n",
-	    TCL_SMALL_HASH_TABLE);
-#endif
-    
-    tablePtr->buckets = tablePtr->staticBuckets;
-    tablePtr->staticBuckets[0] = tablePtr->staticBuckets[1] = 0;
-    tablePtr->staticBuckets[2] = tablePtr->staticBuckets[3] = 0;
-    tablePtr->numBuckets = TCL_SMALL_HASH_TABLE;
-    tablePtr->numEntries = 0;
-    tablePtr->rebuildSize = TCL_SMALL_HASH_TABLE*REBUILD_MULTIPLIER;
-    tablePtr->mask = 3;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDeleteLiteralTable --
- *
- *	This procedure frees up everything associated with a literal table
- *	except for the table's structure itself.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Each literal in the table is released: i.e., its reference count
- *	in the global literal table is decremented and, if it becomes zero,
- *	the literal is freed. In addition, the table's bucket array is
- *	freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclDeleteLiteralTable(interp, tablePtr)
-    Tcl_Interp *interp;		/* Interpreter containing shared literals
-				 * referenced by the table to delete. */
-    LiteralTable *tablePtr;	/* Points to the literal table to delete. */
-{
-    LiteralEntry *entryPtr;
-    int i, start;
-
-    /*
-     * Release remaining literals in the table. Note that releasing a
-     * literal might release other literals, modifying the table, so we
-     * restart the search from the bucket chain we last found an entry.
-     */
-
-#ifdef TCL_COMPILE_DEBUG
-    TclVerifyGlobalLiteralTable((Interp *) interp);
-#endif /*TCL_COMPILE_DEBUG*/
-
-    start = 0;
-    while (tablePtr->numEntries > 0) {
-	for (i = start;  i < tablePtr->numBuckets;  i++) {
-	    entryPtr = tablePtr->buckets[i];
-	    if (entryPtr != NULL) {
-		TclReleaseLiteral(interp, entryPtr->objPtr);
-		start = i;
-		break;
-	    }
-	}
-    }
-
-    /*
-     * Free up the table's bucket array if it was dynamically allocated.
-     */
-
-    if (tablePtr->buckets != tablePtr->staticBuckets) {
-	ckfree((char *) tablePtr->buckets);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRegisterLiteral --
- *
- *	Find, or if necessary create, an object in a CompileEnv literal
- *	array that has a string representation matching the argument string.
- *
- * Results:
- *	The index in the CompileEnv's literal array that references a
- *	shared literal matching the string. The object is created if
- *	necessary.
- *
- * Side effects:
- *	To maximize sharing, we look up the string in the interpreter's
- *	global literal table. If not found, we create a new shared literal
- *	in the global table. We then add a reference to the shared
- *	literal in the CompileEnv's literal array. 
- *
- *	If onHeap is 1, this procedure is given ownership of the string: if
- *	an object is created then its string representation is set directly
- *	from string, otherwise the string is freed. Typically, a caller sets
- *	onHeap 1 if "string" is an already heap-allocated buffer holding the
- *	result of backslash substitutions.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclRegisterLiteral(envPtr, bytes, length, onHeap)
-    CompileEnv *envPtr;		/* Points to the CompileEnv in whose object
-				 * array an object is found or created. */
-    register char *bytes;	/* Points to string for which to find or
-				 * create an object in CompileEnv's object
-				 * array. */
-    int length;			/* Number of bytes in the string. If < 0,
-				 * the string consists of all bytes up to
-				 * the first null character. */
-    int onHeap;			/* If 1 then the caller already malloc'd
-				 * bytes and ownership is passed to this
-				 * procedure. */
-{
-    Interp *iPtr = envPtr->iPtr;
-    LiteralTable *globalTablePtr = &(iPtr->literalTable);
-    LiteralTable *localTablePtr = &(envPtr->localLitTable);
-    register LiteralEntry *globalPtr, *localPtr;
-    register Tcl_Obj *objPtr;
-    unsigned int hash;
-    int localHash, globalHash, objIndex;
-    long n;
-    char buf[TCL_INTEGER_SPACE];
-
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    hash = HashString(bytes, length);
-
-    /*
-     * Is the literal already in the CompileEnv's local literal array?
-     * If so, just return its index.
-     */
-
-    localHash = (hash & localTablePtr->mask);
-    for (localPtr = localTablePtr->buckets[localHash];
-	    localPtr != NULL;  localPtr = localPtr->nextPtr) {
-	objPtr = localPtr->objPtr;
-	if ((objPtr->length == length) && ((length == 0)
-		|| ((objPtr->bytes[0] == bytes[0])
-			&& (memcmp(objPtr->bytes, bytes, (unsigned) length)
-				== 0)))) {
-	    if (onHeap) {
-		ckfree(bytes);
-	    }
-	    objIndex = (localPtr - envPtr->literalArrayPtr);
-#ifdef TCL_COMPILE_DEBUG
-	    TclVerifyLocalLiteralTable(envPtr);
-#endif /*TCL_COMPILE_DEBUG*/
-	    return objIndex;
-	}
-    }
-
-    /*
-     * The literal is new to this CompileEnv. Is it in the interpreter's
-     * global literal table?
-     */
-
-    globalHash = (hash & globalTablePtr->mask);
-    for (globalPtr = globalTablePtr->buckets[globalHash];
-	    globalPtr != NULL;  globalPtr = globalPtr->nextPtr) {
-	objPtr = globalPtr->objPtr;
-	if ((objPtr->length == length) && ((length == 0)
-		|| ((objPtr->bytes[0] == bytes[0])
-			&& (memcmp(objPtr->bytes, bytes, (unsigned) length)
-				== 0)))) {
-	    /*
-	     * A global literal was found. Add an entry to the CompileEnv's
-	     * local literal array.
-	     */
-	    
-	    if (onHeap) {
-		ckfree(bytes);
-	    }
-	    objIndex = AddLocalLiteralEntry(envPtr, globalPtr, localHash);
-#ifdef TCL_COMPILE_DEBUG
-	    if (globalPtr->refCount < 1) {
-		panic("TclRegisterLiteral: global literal \"%.*s\" had bad refCount %d",
-		        (length>60? 60 : length), bytes,
-		        globalPtr->refCount);
-	    }
-	    TclVerifyLocalLiteralTable(envPtr);
-#endif /*TCL_COMPILE_DEBUG*/ 
-	    return objIndex;
-	}
-    }
-
-    /*
-     * The literal is new to the interpreter. Add it to the global literal
-     * table then add an entry to the CompileEnv's local literal array.
-     * Convert the object to an integer object if possible.
-     */
-
-    TclNewObj(objPtr);
-    Tcl_IncrRefCount(objPtr);
-    if (onHeap) {
-	objPtr->bytes = bytes;
-	objPtr->length = length;
-    } else {
-	TclInitStringRep(objPtr, bytes, length);
-    }
-    if (TclLooksLikeInt(bytes, length)) {
-	if (TclGetLong((Tcl_Interp *) NULL, bytes, &n) == TCL_OK) {
-	    TclFormatInt(buf, n);
-	    if (strcmp(bytes, buf) == 0) {
-		objPtr->internalRep.longValue = n;
-		objPtr->typePtr = &tclIntType;
-	    }
-	}
-    }
-    
-#ifdef TCL_COMPILE_DEBUG
-    if (TclLookupLiteralEntry((Tcl_Interp *) iPtr, objPtr) != NULL) {
-	panic("TclRegisterLiteral: literal \"%.*s\" found globally but shouldn't be",
-	        (length>60? 60 : length), bytes);
-    }
-#endif
-
-    globalPtr = (LiteralEntry *) ckalloc((unsigned) sizeof(LiteralEntry));
-    globalPtr->objPtr = objPtr;
-    globalPtr->refCount = 0;
-    globalPtr->nextPtr = globalTablePtr->buckets[globalHash];
-    globalTablePtr->buckets[globalHash] = globalPtr;
-    globalTablePtr->numEntries++;
-
-    /*
-     * If the global literal table has exceeded a decent size, rebuild it
-     * with more buckets.
-     */
-
-    if (globalTablePtr->numEntries >= globalTablePtr->rebuildSize) {
-	RebuildLiteralTable(globalTablePtr);
-    }
-    
-    objIndex = AddLocalLiteralEntry(envPtr, globalPtr, localHash);
-
-#ifdef TCL_COMPILE_DEBUG
-    TclVerifyGlobalLiteralTable(iPtr);
-    TclVerifyLocalLiteralTable(envPtr);
-    {
-	LiteralEntry *entryPtr;
-	int found, i;
-	found = 0;
-	for (i = 0;  i < globalTablePtr->numBuckets;  i++) {
-	    for (entryPtr = globalTablePtr->buckets[i];
-		    entryPtr != NULL;  entryPtr = entryPtr->nextPtr) {
-		if ((entryPtr == globalPtr)
-		        && (entryPtr->objPtr == objPtr)) {
-		    found = 1;
-		}
-	    }
-	}
-	if (!found) {
-	    panic("TclRegisterLiteral: literal \"%.*s\" wasn't global",
-	            (length>60? 60 : length), bytes);
-	}
-    }
-#endif /*TCL_COMPILE_DEBUG*/
-#ifdef TCL_COMPILE_STATS   
-    iPtr->stats.numLiteralsCreated++;
-    iPtr->stats.totalLitStringBytes   += (double) (length + 1);
-    iPtr->stats.currentLitStringBytes += (double) (length + 1);
-    iPtr->stats.literalCount[TclLog2(length)]++;
-#endif /*TCL_COMPILE_STATS*/
-    return objIndex;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclLookupLiteralEntry --
- *
- *	Finds the LiteralEntry that corresponds to a literal Tcl object
- *      holding a literal.
- *
- * Results:
- *      Returns the matching LiteralEntry if found, otherwise NULL.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-LiteralEntry *
-TclLookupLiteralEntry(interp, objPtr)
-    Tcl_Interp *interp;		/* Interpreter for which objPtr was created
-                                 * to hold a literal. */
-    register Tcl_Obj *objPtr;	/* Points to a Tcl object holding a
-                                 * literal that was previously created by a
-                                 * call to TclRegisterLiteral. */
-{
-    Interp *iPtr = (Interp *) interp;
-    LiteralTable *globalTablePtr = &(iPtr->literalTable);
-    register LiteralEntry *entryPtr;
-    char *bytes;
-    int length, globalHash;
-
-    bytes = Tcl_GetStringFromObj(objPtr, &length);
-    globalHash = (HashString(bytes, length) & globalTablePtr->mask);
-    for (entryPtr = globalTablePtr->buckets[globalHash];
-            entryPtr != NULL;  entryPtr = entryPtr->nextPtr) {
-        if (entryPtr->objPtr == objPtr) {
-            return entryPtr;
-        }
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AddLocalLiteralEntry --
- *
- *	Insert a new literal into a CompileEnv's local literal array.
- *
- * Results:
- *	The index in the CompileEnv's literal array that references the
- *	literal.
- *
- * Side effects:
- *	Increments the ref count of the global LiteralEntry since the
- *	CompileEnv now refers to the literal. Expands the literal array
- *	if necessary. May rebuild the hash bucket array of the CompileEnv's
- *	literal array if it becomes too large.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-AddLocalLiteralEntry(envPtr, globalPtr, localHash)
-    register CompileEnv *envPtr; /* Points to CompileEnv in whose literal
-				  * array the object is to be inserted. */
-    LiteralEntry *globalPtr;	 /* Points to the global LiteralEntry for
-				  * the literal to add to the CompileEnv. */
-    int localHash;		 /* Hash value for the literal's string. */
-{
-    register LiteralTable *localTablePtr = &(envPtr->localLitTable);
-    register LiteralEntry *localPtr;
-    int objIndex;
-    
-    if (envPtr->literalArrayNext >= envPtr->literalArrayEnd) {
-	ExpandLocalLiteralArray(envPtr);
-    }
-    objIndex = envPtr->literalArrayNext;
-    envPtr->literalArrayNext++;
-
-    localPtr = &(envPtr->literalArrayPtr[objIndex]);
-    localPtr->objPtr = globalPtr->objPtr;
-    localPtr->refCount = -1;	/* i.e., unused */
-    localPtr->nextPtr = localTablePtr->buckets[localHash];
-    localTablePtr->buckets[localHash] = localPtr;
-    localTablePtr->numEntries++;
-
-    globalPtr->refCount++;
-
-    /*
-     * If the CompileEnv's local literal table has exceeded a decent size,
-     * rebuild it with more buckets.
-     */
-
-    if (localTablePtr->numEntries >= localTablePtr->rebuildSize) {
-	RebuildLiteralTable(localTablePtr);
-    }
-
-#ifdef TCL_COMPILE_DEBUG
-    TclVerifyLocalLiteralTable(envPtr);
-    {
-	char *bytes;
-	int length, found, i;
-	found = 0;
-	for (i = 0;  i < localTablePtr->numBuckets;  i++) {
-	    for (localPtr = localTablePtr->buckets[i];
-		    localPtr != NULL;  localPtr = localPtr->nextPtr) {
-		if (localPtr->objPtr == globalPtr->objPtr) {
-		    found = 1;
-		}
-	    }
-	}
-	if (!found) {
-	    bytes = Tcl_GetStringFromObj(globalPtr->objPtr, &length);
-	    panic("AddLocalLiteralEntry: literal \"%.*s\" wasn't found locally",
-	            (length>60? 60 : length), bytes);
-	}
-    }
-#endif /*TCL_COMPILE_DEBUG*/
-    return objIndex;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ExpandLocalLiteralArray --
- *
- *	Procedure that uses malloc to allocate more storage for a
- *	CompileEnv's local literal array.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The literal array in *envPtr is reallocated to a new array of
- *	double the size, and if envPtr->mallocedLiteralArray is non-zero
- *	the old array is freed. Entries are copied from the old array
- *	to the new one. The local literal table is updated to refer to
- *	the new entries.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ExpandLocalLiteralArray(envPtr)
-    register CompileEnv *envPtr; /* Points to the CompileEnv whose object
-				  * array must be enlarged. */
-{
-    /*
-     * The current allocated local literal entries are stored between
-     * elements 0 and (envPtr->literalArrayNext - 1) [inclusive].
-     */
-
-    LiteralTable *localTablePtr = &(envPtr->localLitTable);
-    int currElems = envPtr->literalArrayNext;
-    size_t currBytes = (currElems * sizeof(LiteralEntry));
-    register LiteralEntry *currArrayPtr = envPtr->literalArrayPtr;
-    register LiteralEntry *newArrayPtr =
-	    (LiteralEntry *) ckalloc((unsigned) (2 * currBytes));
-    int i;
-    
-    /*
-     * Copy from the old literal array to the new, then update the local
-     * literal table's bucket array.
-     */
-
-    memcpy((VOID *) newArrayPtr, (VOID *) currArrayPtr, currBytes);
-    for (i = 0;  i < currElems;  i++) {
-	if (currArrayPtr[i].nextPtr == NULL) {
-	    newArrayPtr[i].nextPtr = NULL;
-	} else {
-	    newArrayPtr[i].nextPtr = newArrayPtr
-		    + (currArrayPtr[i].nextPtr - currArrayPtr);
-	}
-    }
-    for (i = 0;  i < localTablePtr->numBuckets;  i++) {
-	if (localTablePtr->buckets[i] != NULL) {
-	    localTablePtr->buckets[i] = newArrayPtr
-	            + (localTablePtr->buckets[i] - currArrayPtr);
-	}
-    }
-
-    /*
-     * Free the old literal array if needed, and mark the new literal
-     * array as malloced.
-     */
-    
-    if (envPtr->mallocedLiteralArray) {
-	ckfree((char *) currArrayPtr);
-    }
-    envPtr->literalArrayPtr = newArrayPtr;
-    envPtr->literalArrayEnd = (2 * currElems);
-    envPtr->mallocedLiteralArray = 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclReleaseLiteral --
- *
- *	This procedure releases a reference to one of the shared Tcl objects
- *	that hold literals. It is called to release the literals referenced
- *	by a ByteCode that is being destroyed, and it is also called by
- *	TclDeleteLiteralTable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The reference count for the global LiteralTable entry that 
- *	corresponds to the literal is decremented. If no other reference
- *	to a global literal object remains, it is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclReleaseLiteral(interp, objPtr)
-    Tcl_Interp *interp;		/* Interpreter for which objPtr was created
-				 * to hold a literal. */
-    register Tcl_Obj *objPtr;	/* Points to a literal object that was
-				 * previously created by a call to
-				 * TclRegisterLiteral. */
-{
-    Interp *iPtr = (Interp *) interp;
-    LiteralTable *globalTablePtr = &(iPtr->literalTable);
-    register LiteralEntry *entryPtr, *prevPtr;
-    ByteCode* codePtr;
-    char *bytes;
-    int length, index;
-
-    bytes = Tcl_GetStringFromObj(objPtr, &length);
-    index = (HashString(bytes, length) & globalTablePtr->mask);
-    for (prevPtr = NULL, entryPtr = globalTablePtr->buckets[index];
-	    entryPtr != NULL;
-	    prevPtr = entryPtr, entryPtr = entryPtr->nextPtr) {
-	if (entryPtr->objPtr == objPtr) {
-	    entryPtr->refCount--;
-
-	    /*
-	     * We found the matching LiteralEntry. Check if it's only being
-	     * kept alive only by a circular reference from a ByteCode
-	     * stored as its internal rep.
-	     */
-	    
-	    if ((entryPtr->refCount == 1)
-		    && (objPtr->typePtr == &tclByteCodeType)) {
-		codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr;
-		if ((codePtr->numLitObjects == 1)
-		        && (codePtr->objArrayPtr[0] == objPtr)) {
-		    entryPtr->refCount = 0;
-
-		    /*
-		     * Set the ByteCode object array entry NULL to signal
-		     * to TclCleanupByteCode to not try to release this
-		     * about to be freed literal again.
-		     */
-
-		    codePtr->objArrayPtr[0] = NULL;
-		}
-	    }
-
-	    /*
-	     * If the literal is no longer being used by any ByteCode,
-	     * delete the entry then decrement the ref count of its object.
-	     */
-		
-	    if (entryPtr->refCount == 0) {
-		if (prevPtr == NULL) {
-		    globalTablePtr->buckets[index] = entryPtr->nextPtr;
-		} else {
-		    prevPtr->nextPtr = entryPtr->nextPtr;
-		}
-#ifdef TCL_COMPILE_STATS
-		iPtr->stats.currentLitStringBytes -= (double) (length + 1);
-#endif /*TCL_COMPILE_STATS*/
-		ckfree((char *) entryPtr);
-		globalTablePtr->numEntries--;
-		TclDecrRefCount(objPtr);
-	    }
-	    return;
-	}
-    }
-#ifdef TCL_COMPILE_DEBUG
-    panic("TclReleaseLiteral: literal \"%.*s\" not found",
-	    (length>60? 60 : length), bytes);
-#endif /*TCL_COMPILE_DEBUG*/
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * HashString --
- *
- *	Compute a one-word summary of a text string, which can be
- *	used to generate a hash index.
- *
- * Results:
- *	The return value is a one-word summary of the information in
- *	string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static unsigned int
-HashString(bytes, length)
-    register CONST char *bytes; /* String for which to compute hash
-				 * value. */
-    int length;			/* Number of bytes in the string. */
-{
-    register unsigned int result;
-    register int i;
-
-    /*
-     * I tried a zillion different hash functions and asked many other
-     * people for advice.  Many people had their own favorite functions,
-     * all different, but no-one had much idea why they were good ones.
-     * I chose the one below (multiply by 9 and add new character)
-     * because of the following reasons:
-     *
-     * 1. Multiplying by 10 is perfect for keys that are decimal strings,
-     *    and multiplying by 9 is just about as good.
-     * 2. Times-9 is (shift-left-3) plus (old).  This means that each
-     *    character's bits hang around in the low-order bits of the
-     *    hash value for ever, plus they spread fairly rapidly up to
-     *    the high-order bits to fill out the hash value.  This seems
-     *    works well both for decimal and non-decimal strings.
-     */
-
-    result = 0;
-    for (i = 0;  i < length;  i++) {
-	result += (result<<3) + *bytes++;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RebuildLiteralTable --
- *
- *	This procedure is invoked when the ratio of entries to hash buckets
- *	becomes too large in a local or global literal table. It allocates
- *	a larger bucket array and moves the entries into the new buckets.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory gets reallocated and entries get rehashed into new buckets.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RebuildLiteralTable(tablePtr)
-    register LiteralTable *tablePtr; /* Local or global table to enlarge. */
-{
-    LiteralEntry **oldBuckets;
-    register LiteralEntry **oldChainPtr, **newChainPtr;
-    register LiteralEntry *entryPtr;
-    LiteralEntry **bucketPtr;
-    char *bytes;
-    int oldSize, count, index, length;
-
-    oldSize = tablePtr->numBuckets;
-    oldBuckets = tablePtr->buckets;
-
-    /*
-     * Allocate and initialize the new bucket array, and set up
-     * hashing constants for new array size.
-     */
-
-    tablePtr->numBuckets *= 4;
-    tablePtr->buckets = (LiteralEntry **) ckalloc((unsigned)
-	    (tablePtr->numBuckets * sizeof(LiteralEntry *)));
-    for (count = tablePtr->numBuckets, newChainPtr = tablePtr->buckets;
-	    count > 0;
-	    count--, newChainPtr++) {
-	*newChainPtr = NULL;
-    }
-    tablePtr->rebuildSize *= 4;
-    tablePtr->mask = (tablePtr->mask << 2) + 3;
-
-    /*
-     * Rehash all of the existing entries into the new bucket array.
-     */
-
-    for (oldChainPtr = oldBuckets;
-	    oldSize > 0;
-	    oldSize--, oldChainPtr++) {
-	for (entryPtr = *oldChainPtr;  entryPtr != NULL;
-	        entryPtr = *oldChainPtr) {
-	    bytes = Tcl_GetStringFromObj(entryPtr->objPtr, &length);
-	    index = (HashString(bytes, length) & tablePtr->mask);
-	    
-	    *oldChainPtr = entryPtr->nextPtr;
-	    bucketPtr = &(tablePtr->buckets[index]);
-	    entryPtr->nextPtr = *bucketPtr;
-	    *bucketPtr = entryPtr;
-	}
-    }
-
-    /*
-     * Free up the old bucket array, if it was dynamically allocated.
-     */
-
-    if (oldBuckets != tablePtr->staticBuckets) {
-	ckfree((char *) oldBuckets);
-    }
-}
-
-#ifdef TCL_COMPILE_STATS
-/*
- *----------------------------------------------------------------------
- *
- * TclLiteralStats --
- *
- *	Return statistics describing the layout of the hash table
- *	in its hash buckets.
- *
- * Results:
- *	The return value is a malloc-ed string containing information
- *	about tablePtr.  It is the caller's responsibility to free
- *	this string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclLiteralStats(tablePtr)
-    LiteralTable *tablePtr;	/* Table for which to produce stats. */
-{
-#define NUM_COUNTERS 10
-    int count[NUM_COUNTERS], overflow, i, j;
-    double average, tmp;
-    register LiteralEntry *entryPtr;
-    char *result, *p;
-
-    /*
-     * Compute a histogram of bucket usage. For each bucket chain i,
-     * j is the number of entries in the chain.
-     */
-
-    for (i = 0;  i < NUM_COUNTERS;  i++) {
-	count[i] = 0;
-    }
-    overflow = 0;
-    average = 0.0;
-    for (i = 0;  i < tablePtr->numBuckets;  i++) {
-	j = 0;
-	for (entryPtr = tablePtr->buckets[i];  entryPtr != NULL;
-	        entryPtr = entryPtr->nextPtr) {
-	    j++;
-	}
-	if (j < NUM_COUNTERS) {
-	    count[j]++;
-	} else {
-	    overflow++;
-	}
-	tmp = j;
-	average += (tmp+1.0)*(tmp/tablePtr->numEntries)/2.0;
-    }
-
-    /*
-     * Print out the histogram and a few other pieces of information.
-     */
-
-    result = (char *) ckalloc((unsigned) ((NUM_COUNTERS*60) + 300));
-    sprintf(result, "%d entries in table, %d buckets\n",
-	    tablePtr->numEntries, tablePtr->numBuckets);
-    p = result + strlen(result);
-    for (i = 0; i < NUM_COUNTERS; i++) {
-	sprintf(p, "number of buckets with %d entries: %d\n",
-		i, count[i]);
-	p += strlen(p);
-    }
-    sprintf(p, "number of buckets with %d or more entries: %d\n",
-	    NUM_COUNTERS, overflow);
-    p += strlen(p);
-    sprintf(p, "average search distance for entry: %.1f", average);
-    return result;
-}
-#endif /*TCL_COMPILE_STATS*/
-
-#ifdef TCL_COMPILE_DEBUG
-/*
- *----------------------------------------------------------------------
- *
- * TclVerifyLocalLiteralTable --
- *
- *	Check a CompileEnv's local literal table for consistency.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Panics if problems are found.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclVerifyLocalLiteralTable(envPtr)
-    CompileEnv *envPtr;		/* Points to CompileEnv whose literal
-				 * table is to be validated. */
-{
-    register LiteralTable *localTablePtr = &(envPtr->localLitTable);
-    register LiteralEntry *localPtr;
-    char *bytes;
-    register int i;
-    int length, count;
-
-    count = 0;
-    for (i = 0;  i < localTablePtr->numBuckets;  i++) {
-	for (localPtr = localTablePtr->buckets[i];
-	        localPtr != NULL;  localPtr = localPtr->nextPtr) {
-	    count++;
-	    if (localPtr->refCount != -1) {
-		bytes = Tcl_GetStringFromObj(localPtr->objPtr, &length);
-		panic("TclVerifyLocalLiteralTable: local literal \"%.*s\" had bad refCount %d",
-		        (length>60? 60 : length), bytes,
-		        localPtr->refCount);
-	    }
-	    if (TclLookupLiteralEntry((Tcl_Interp *) envPtr->iPtr,
-		    localPtr->objPtr) == NULL) {
-		bytes = Tcl_GetStringFromObj(localPtr->objPtr, &length);
-		panic("TclVerifyLocalLiteralTable: local literal \"%.*s\" is not global",
-		         (length>60? 60 : length), bytes);
-	    }
-	    if (localPtr->objPtr->bytes == NULL) {
-		panic("TclVerifyLocalLiteralTable: literal has NULL string rep");
-	    }
-	}
-    }
-    if (count != localTablePtr->numEntries) {
-	panic("TclVerifyLocalLiteralTable: local literal table had %d entries, should be %d",
-	      count, localTablePtr->numEntries);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclVerifyGlobalLiteralTable --
- *
- *	Check an interpreter's global literal table literal for consistency.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Panics if problems are found.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclVerifyGlobalLiteralTable(iPtr)
-    Interp *iPtr;		/* Points to interpreter whose global
-				 * literal table is to be validated. */
-{
-    register LiteralTable *globalTablePtr = &(iPtr->literalTable);
-    register LiteralEntry *globalPtr;
-    char *bytes;
-    register int i;
-    int length, count;
-
-    count = 0;
-    for (i = 0;  i < globalTablePtr->numBuckets;  i++) {
-	for (globalPtr = globalTablePtr->buckets[i];
-	        globalPtr != NULL;  globalPtr = globalPtr->nextPtr) {
-	    count++;
-	    if (globalPtr->refCount < 1) {
-		bytes = Tcl_GetStringFromObj(globalPtr->objPtr, &length);
-		panic("TclVerifyGlobalLiteralTable: global literal \"%.*s\" had bad refCount %d",
-		        (length>60? 60 : length), bytes,
-		        globalPtr->refCount);
-	    }
-	    if (globalPtr->objPtr->bytes == NULL) {
-		panic("TclVerifyGlobalLiteralTable: literal has NULL string rep");
-	    }
-	}
-    }
-    if (count != globalTablePtr->numEntries) {
-	panic("TclVerifyGlobalLiteralTable: global literal table had %d entries, should be %d",
-	      count, globalTablePtr->numEntries);
-    }
-}
-#endif /*TCL_COMPILE_DEBUG*/
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
deleted file mode 100644
index 68a0f8c..0000000
--- a/generic/tclLoad.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* 
- * tclLoad.c --
- *
- *	This file provides the generic portion (those that are the same
- *	on all platforms) of Tcl's dynamic loading facilities.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoad.c,v 1.3 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * The following structure describes a package that has been loaded
- * either dynamically (with the "load" command) or statically (as
- * indicated by a call to TclGetLoadedPackages).  All such packages
- * are linked together into a single list for the process.  Packages
- * are never unloaded, so these structures are never freed.
- */
-
-typedef struct LoadedPackage {
-    char *fileName;		/* Name of the file from which the
-				 * package was loaded.  An empty string
-				 * means the package is loaded statically.
-				 * Malloc-ed. */
-    char *packageName;		/* Name of package prefix for the package,
-				 * properly capitalized (first letter UC,
-				 * others LC), no "_", as in "Net". 
-				 * Malloc-ed. */
-    ClientData clientData;	/* Token for the loaded file which should be
-				 * passed to TclpUnloadFile() when the file
-				 * is no longer needed.  If fileName is NULL,
-				 * then this field is irrelevant. */
-    Tcl_PackageInitProc *initProc;
-				/* Initialization procedure to call to
-				 * incorporate this package into a trusted
-				 * interpreter. */
-    Tcl_PackageInitProc *safeInitProc;
-				/* Initialization procedure to call to
-				 * incorporate this package into a safe
-				 * interpreter (one that will execute
-				 * untrusted scripts).   NULL means the
-				 * package can't be used in unsafe
-				 * interpreters. */
-    struct LoadedPackage *nextPtr;
-				/* Next in list of all packages loaded into
-				 * this application process.  NULL means
-				 * end of list. */
-} LoadedPackage;
-
-/*
- * TCL_THREADS
- * There is a global list of packages that is anchored at firstPackagePtr.
- * Access to this list is governed by a mutex.
- */
-
-static LoadedPackage *firstPackagePtr = NULL;
-				/* First in list of all packages loaded into
-				 * this process. */
-
-TCL_DECLARE_MUTEX(packageMutex)
-
-/*
- * The following structure represents a particular package that has
- * been incorporated into a particular interpreter (by calling its
- * initialization procedure).  There is a list of these structures for
- * each interpreter, with an AssocData value (key "load") for the
- * interpreter that points to the first package (if any).
- */
-
-typedef struct InterpPackage {
-    LoadedPackage *pkgPtr;	/* Points to detailed information about
-				 * package. */
-    struct InterpPackage *nextPtr;
-				/* Next package in this interpreter, or
-				 * NULL for end of list. */
-} InterpPackage;
-
-/*
- * Prototypes for procedures that are private to this file:
- */
-
-static void		LoadCleanupProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LoadObjCmd --
- *
- *	This procedure is invoked to process the "load" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_LoadObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Interp *target;
-    LoadedPackage *pkgPtr, *defaultPtr;
-    Tcl_DString pkgName, tmp, initName, safeInitName, fileName;
-    Tcl_PackageInitProc *initProc, *safeInitProc;
-    InterpPackage *ipFirstPtr, *ipPtr;
-    int code, namesMatch, filesMatch;
-    char *p, *tempString, *fullFileName, *packageName;
-    ClientData clientData;
-    Tcl_UniChar ch;
-    int offset;
-
-    if ((objc < 2) || (objc > 4)) {
-        Tcl_WrongNumArgs(interp, 1, objv, "fileName ?packageName? ?interp?");
-	return TCL_ERROR;
-    }
-    tempString = Tcl_GetString(objv[1]);
-    fullFileName = Tcl_TranslateFileName(interp, tempString, &fileName);
-    if (fullFileName == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_DStringInit(&pkgName);
-    Tcl_DStringInit(&initName);
-    Tcl_DStringInit(&safeInitName);
-    Tcl_DStringInit(&tmp);
-
-    packageName = NULL;
-    if (objc >= 3) {
-	packageName = Tcl_GetString(objv[2]);
-	if (packageName[0] == '\0') {
-	    packageName = NULL;
-	}
-    }
-    if ((fullFileName[0] == 0) && (packageName == NULL)) {
-	Tcl_SetResult(interp,
-		"must specify either file name or package name",
-		TCL_STATIC);
-	code = TCL_ERROR;
-	goto done;
-    }
-
-    /*
-     * Figure out which interpreter we're going to load the package into.
-     */
-
-    target = interp;
-    if (objc == 4) {
-	char *slaveIntName;
-	slaveIntName = Tcl_GetString(objv[3]);
-	target = Tcl_GetSlave(interp, slaveIntName);
-	if (target == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Scan through the packages that are currently loaded to see if the
-     * package we want is already loaded.  We'll use a loaded package if
-     * it meets any of the following conditions:
-     *  - Its name and file match the once we're looking for.
-     *  - Its file matches, and we weren't given a name.
-     *  - Its name matches, the file name was specified as empty, and there
-     *    is only no statically loaded package with the same name.
-     */
-    Tcl_MutexLock(&packageMutex);
-
-    defaultPtr = NULL;
-    for (pkgPtr = firstPackagePtr; pkgPtr != NULL; pkgPtr = pkgPtr->nextPtr) {
-	if (packageName == NULL) {
-	    namesMatch = 0;
-	} else {
-	    Tcl_DStringSetLength(&pkgName, 0);
-	    Tcl_DStringAppend(&pkgName, packageName, -1);
-	    Tcl_DStringSetLength(&tmp, 0);
-	    Tcl_DStringAppend(&tmp, pkgPtr->packageName, -1);
-	    Tcl_UtfToLower(Tcl_DStringValue(&pkgName));
-	    Tcl_UtfToLower(Tcl_DStringValue(&tmp));
-	    if (strcmp(Tcl_DStringValue(&tmp),
-		    Tcl_DStringValue(&pkgName)) == 0) {
-		namesMatch = 1;
-	    } else {
-		namesMatch = 0;
-	    }
-	}
-	Tcl_DStringSetLength(&pkgName, 0);
-
-	filesMatch = (strcmp(pkgPtr->fileName, fullFileName) == 0);
-	if (filesMatch && (namesMatch || (packageName == NULL))) {
-	    break;
-	}
-	if (namesMatch && (fullFileName[0] == 0)) {
-	    defaultPtr = pkgPtr;
-	}
-	if (filesMatch && !namesMatch && (fullFileName[0] != 0)) {
-	    /*
-	     * Can't have two different packages loaded from the same
-	     * file.
-	     */
-
-	    Tcl_AppendResult(interp, "file \"", fullFileName,
-		    "\" is already loaded for package \"",
-		    pkgPtr->packageName, "\"", (char *) NULL);
-	    code = TCL_ERROR;
-	    Tcl_MutexUnlock(&packageMutex);
-	    goto done;
-	}
-    }
-    Tcl_MutexUnlock(&packageMutex);
-    if (pkgPtr == NULL) {
-	pkgPtr = defaultPtr;
-    }
-
-    /*
-     * Scan through the list of packages already loaded in the target
-     * interpreter.  If the package we want is already loaded there,
-     * then there's nothing for us to to.
-     */
-
-    if (pkgPtr != NULL) {
-	ipFirstPtr = (InterpPackage *) Tcl_GetAssocData(target, "tclLoad",
-		(Tcl_InterpDeleteProc **) NULL);
-	for (ipPtr = ipFirstPtr; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
-	    if (ipPtr->pkgPtr == pkgPtr) {
-		code = TCL_OK;
-		goto done;
-	    }
-	}
-    }
-
-    if (pkgPtr == NULL) {
-	/*
-	 * The desired file isn't currently loaded, so load it.  It's an
-	 * error if the desired package is a static one.
-	 */
-
-	if (fullFileName[0] == 0) {
-	    Tcl_AppendResult(interp, "package \"", packageName,
-		    "\" isn't loaded statically", (char *) NULL);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-
-	/*
-	 * Figure out the module name if it wasn't provided explicitly.
-	 */
-
-	if (packageName != NULL) {
-	    Tcl_DStringAppend(&pkgName, packageName, -1);
-	} else {
-	    int retc;
-	    /*
-	     * Threading note - this call used to be protected by a mutex.
-	     */
-	    retc = TclGuessPackageName(fullFileName, &pkgName);
-	    if (!retc) {
-		int pargc;
-		char **pargv, *pkgGuess;
-
-		/*
-		 * The platform-specific code couldn't figure out the
-		 * module name.  Make a guess by taking the last element
-		 * of the file name, stripping off any leading "lib",
-		 * and then using all of the alphabetic and underline
-		 * characters that follow that.
-		 */
-
-		Tcl_SplitPath(fullFileName, &pargc, &pargv);
-		pkgGuess = pargv[pargc-1];
-		if ((pkgGuess[0] == 'l') && (pkgGuess[1] == 'i')
-			&& (pkgGuess[2] == 'b')) {
-		    pkgGuess += 3;
-		}
-		for (p = pkgGuess; *p != 0; p += offset) {
-		    offset = Tcl_UtfToUniChar(p, &ch);
-		    if ((ch > 0x100)
-			    || !(isalpha(UCHAR(ch)) /* INTL: ISO only */
-				    || (UCHAR(ch) == '_'))) {
-			break;
-		    }
-		}
-		if (p == pkgGuess) {
-		    ckfree((char *)pargv);
-		    Tcl_AppendResult(interp,
-			    "couldn't figure out package name for ",
-			    fullFileName, (char *) NULL);
-		    code = TCL_ERROR;
-		    goto done;
-		}
-		Tcl_DStringAppend(&pkgName, pkgGuess, (p - pkgGuess));
-		ckfree((char *)pargv);
-	    }
-	}
-
-	/*
-	 * Fix the capitalization in the package name so that the first
-	 * character is in caps (or title case) but the others are all
-	 * lower-case.
-	 */
-    
-	Tcl_DStringSetLength(&pkgName,
-		Tcl_UtfToTitle(Tcl_DStringValue(&pkgName)));
-
-	/*
-	 * Compute the names of the two initialization procedures,
-	 * based on the package name.
-	 */
-    
-	Tcl_DStringAppend(&initName, Tcl_DStringValue(&pkgName), -1);
-	Tcl_DStringAppend(&initName, "_Init", 5);
-	Tcl_DStringAppend(&safeInitName, Tcl_DStringValue(&pkgName), -1);
-	Tcl_DStringAppend(&safeInitName, "_SafeInit", 9);
-
-	/*
-	 * Call platform-specific code to load the package and find the
-	 * two initialization procedures.
-	 */
-
-	Tcl_MutexLock(&packageMutex);
-	code = TclpLoadFile(interp, fullFileName, Tcl_DStringValue(&initName),
-		Tcl_DStringValue(&safeInitName), &initProc, &safeInitProc,
-		&clientData);
-	Tcl_MutexUnlock(&packageMutex);
-	if (code != TCL_OK) {
-	    goto done;
-	}
-	if (initProc == NULL) {
-	    Tcl_AppendResult(interp, "couldn't find procedure ",
-		    Tcl_DStringValue(&initName), (char *) NULL);
-	    TclpUnloadFile(clientData);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-
-	/*
-	 * Create a new record to describe this package.
-	 */
-
-	pkgPtr = (LoadedPackage *) ckalloc(sizeof(LoadedPackage));
-	pkgPtr->fileName	= (char *) ckalloc((unsigned)
-		(strlen(fullFileName) + 1));
-	strcpy(pkgPtr->fileName, fullFileName);
-	pkgPtr->packageName	= (char *) ckalloc((unsigned)
-		(Tcl_DStringLength(&pkgName) + 1));
-	strcpy(pkgPtr->packageName, Tcl_DStringValue(&pkgName));
-	pkgPtr->clientData	= clientData;
-	pkgPtr->initProc	= initProc;
-	pkgPtr->safeInitProc	= safeInitProc;
-	Tcl_MutexLock(&packageMutex);
-	pkgPtr->nextPtr		= firstPackagePtr;
-	firstPackagePtr		= pkgPtr;
-	Tcl_MutexUnlock(&packageMutex);
-    }
-
-    /*
-     * Invoke the package's initialization procedure (either the
-     * normal one or the safe one, depending on whether or not the
-     * interpreter is safe).
-     */
-
-    if (Tcl_IsSafe(target)) {
-	if (pkgPtr->safeInitProc != NULL) {
-	    code = (*pkgPtr->safeInitProc)(target);
-	} else {
-	    Tcl_AppendResult(interp,
-		    "can't use package in a safe interpreter: ",
-		    "no ", pkgPtr->packageName, "_SafeInit procedure",
-		    (char *) NULL);
-	    code = TCL_ERROR;
-	    goto done;
-	}
-    } else {
-	code = (*pkgPtr->initProc)(target);
-    }
-
-    /*
-     * Record the fact that the package has been loaded in the
-     * target interpreter.
-     */
-
-    if (code == TCL_OK) {
-	/*
-	 * Refetch ipFirstPtr: loading the package may have introduced
-	 * additional static packages at the head of the linked list!
-	 */
-
-	ipFirstPtr = (InterpPackage *) Tcl_GetAssocData(target, "tclLoad",
-		(Tcl_InterpDeleteProc **) NULL);
-	ipPtr = (InterpPackage *) ckalloc(sizeof(InterpPackage));
-	ipPtr->pkgPtr = pkgPtr;
-	ipPtr->nextPtr = ipFirstPtr;
-	Tcl_SetAssocData(target, "tclLoad", LoadCleanupProc,
-		(ClientData) ipPtr);
-    } else {
-	TclTransferResult(target, code, interp);
-    }
-
-    done:
-    Tcl_DStringFree(&pkgName);
-    Tcl_DStringFree(&initName);
-    Tcl_DStringFree(&safeInitName);
-    Tcl_DStringFree(&fileName);
-    Tcl_DStringFree(&tmp);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_StaticPackage --
- *
- *	This procedure is invoked to indicate that a particular
- *	package has been linked statically with an application.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Once this procedure completes, the package becomes loadable
- *	via the "load" command with an empty file name.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_StaticPackage(interp, pkgName, initProc, safeInitProc)
-    Tcl_Interp *interp;			/* If not NULL, it means that the
-					 * package has already been loaded
-					 * into the given interpreter by
-					 * calling the appropriate init proc. */
-    char *pkgName;			/* Name of package (must be properly
-					 * capitalized: first letter upper
-					 * case, others lower case). */
-    Tcl_PackageInitProc *initProc;	/* Procedure to call to incorporate
-					 * this package into a trusted
-					 * interpreter. */
-    Tcl_PackageInitProc *safeInitProc;	/* Procedure to call to incorporate
-					 * this package into a safe interpreter
-					 * (one that will execute untrusted
-					 * scripts).   NULL means the package
-					 * can't be used in safe
-					 * interpreters. */
-{
-    LoadedPackage *pkgPtr;
-    InterpPackage *ipPtr, *ipFirstPtr;
-
-    /*
-     * Check to see if someone else has already reported this package as
-     * statically loaded.  If this call is redundant then just return.
-     */
-
-    Tcl_MutexLock(&packageMutex);
-    for (pkgPtr = firstPackagePtr; pkgPtr != NULL; pkgPtr = pkgPtr->nextPtr) {
-	if ((pkgPtr->initProc == initProc)
-		&& (pkgPtr->safeInitProc == safeInitProc)
-		&& (strcmp(pkgPtr->packageName, pkgName) == 0)) {
-	    Tcl_MutexUnlock(&packageMutex);
-	    return;
-	}
-    }
-
-    Tcl_MutexUnlock(&packageMutex);
-
-    pkgPtr = (LoadedPackage *) ckalloc(sizeof(LoadedPackage));
-    pkgPtr->fileName		= (char *) ckalloc((unsigned) 1);
-    pkgPtr->fileName[0]		= 0;
-    pkgPtr->packageName		= (char *) ckalloc((unsigned)
-	    (strlen(pkgName) + 1));
-    strcpy(pkgPtr->packageName, pkgName);
-    pkgPtr->clientData		= NULL;
-    pkgPtr->initProc		= initProc;
-    pkgPtr->safeInitProc	= safeInitProc;
-    Tcl_MutexLock(&packageMutex);
-    pkgPtr->nextPtr		= firstPackagePtr;
-    firstPackagePtr		= pkgPtr;
-    Tcl_MutexUnlock(&packageMutex);
-
-    if (interp != NULL) {
-	ipFirstPtr = (InterpPackage *) Tcl_GetAssocData(interp, "tclLoad",
-		(Tcl_InterpDeleteProc **) NULL);
-	ipPtr = (InterpPackage *) ckalloc(sizeof(InterpPackage));
-	ipPtr->pkgPtr = pkgPtr;
-	ipPtr->nextPtr = ipFirstPtr;
-	Tcl_SetAssocData(interp, "tclLoad", LoadCleanupProc,
-		(ClientData) ipPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetLoadedPackages --
- *
- *	This procedure returns information about all of the files
- *	that are loaded (either in a particular intepreter, or
- *	for all interpreters).
- *
- * Results:
- *	The return value is a standard Tcl completion code.  If
- *	successful, a list of lists is placed in the interp's result.
- *	Each sublist corresponds to one loaded file;  its first
- *	element is the name of the file (or an empty string for
- *	something that's statically loaded) and the second element
- *	is the name of the package in that file.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGetLoadedPackages(interp, targetName)
-    Tcl_Interp *interp;		/* Interpreter in which to return
-				 * information or error message. */
-    char *targetName;		/* Name of target interpreter or NULL.
-				 * If NULL, return info about all interps;
-				 * otherwise, just return info about this
-				 * interpreter. */
-{
-    Tcl_Interp *target;
-    LoadedPackage *pkgPtr;
-    InterpPackage *ipPtr;
-    char *prefix;
-
-    if (targetName == NULL) {
-	/* 
-	 * Return information about all of the available packages.
-	 */
-
-	prefix = "{";
-	Tcl_MutexLock(&packageMutex);
-	for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
-		pkgPtr = pkgPtr->nextPtr) {
-	    Tcl_AppendResult(interp, prefix, (char *) NULL);
-	    Tcl_AppendElement(interp, pkgPtr->fileName);
-	    Tcl_AppendElement(interp, pkgPtr->packageName);
-	    Tcl_AppendResult(interp, "}", (char *) NULL);
-	    prefix = " {";
-	}
-	Tcl_MutexUnlock(&packageMutex);
-	return TCL_OK;
-    }
-
-    /*
-     * Return information about only the packages that are loaded in
-     * a given interpreter.
-     */
-
-    target = Tcl_GetSlave(interp, targetName);
-    if (target == NULL) {
-	return TCL_ERROR;
-    }
-    ipPtr = (InterpPackage *) Tcl_GetAssocData(target, "tclLoad",
-	    (Tcl_InterpDeleteProc **) NULL);
-    prefix = "{";
-    for ( ; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
-	pkgPtr = ipPtr->pkgPtr;
-	Tcl_AppendResult(interp, prefix, (char *) NULL);
-	Tcl_AppendElement(interp, pkgPtr->fileName);
-	Tcl_AppendElement(interp, pkgPtr->packageName);
-	Tcl_AppendResult(interp, "}", (char *) NULL);
-	prefix = " {";
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * LoadCleanupProc --
- *
- *	This procedure is called to delete all of the InterpPackage
- *	structures for an interpreter when the interpreter is deleted.
- *	It gets invoked via the Tcl AssocData mechanism.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Storage for all of the InterpPackage procedures for interp
- *	get deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-LoadCleanupProc(clientData, interp)
-    ClientData clientData;	/* Pointer to first InterpPackage structure
-				 * for interp. */
-    Tcl_Interp *interp;		/* Interpreter that is being deleted. */
-{
-    InterpPackage *ipPtr, *nextPtr;
-
-    ipPtr = (InterpPackage *) clientData;
-    while (ipPtr != NULL) {
-	nextPtr = ipPtr->nextPtr;
-	ckfree((char *) ipPtr);
-	ipPtr = nextPtr;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeLoad --
- *
- *	This procedure is invoked just before the application exits.
- *	It frees all of the LoadedPackage structures.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeLoad()
-{
-    LoadedPackage *pkgPtr;
-
-    /*
-     * No synchronization here because there should just be
-     * one thread alive at this point.  Logically, 
-     * packageMutex should be grabbed at this point, but
-     * the Mutexes get finalized before the call to this routine.
-     * The only subsystem left alive at this point is the
-     * memory allocator.
-     */
-
-    while (firstPackagePtr != NULL) {
-	pkgPtr = firstPackagePtr;
-	firstPackagePtr = pkgPtr->nextPtr;
-	if (pkgPtr->fileName[0] != '\0') {
-	    TclpUnloadFile(pkgPtr->clientData);
-	}
-	ckfree(pkgPtr->fileName);
-	ckfree(pkgPtr->packageName);
-	ckfree((char *) pkgPtr);
-    }
-}
diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
deleted file mode 100644
index ca0046e..0000000
--- a/generic/tclLoadNone.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
- * tclLoadNone.c --
- *
- *	This procedure provides a version of the TclLoadFile for use
- *	in systems that don't support dynamic loading; it just returns
- *	an error.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadNone.c,v 1.3 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- *----------------------------------------------------------------------
- *
- * TclLoadFile --
- *
- *	This procedure is called to carry out dynamic loading of binary
- *	code;  it is intended for use only on systems that don't support
- *	dynamic loading (it returns an error).
- *
- * Results:
- *	The result is TCL_ERROR, and an error message is left in
- *	the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-{
-    Tcl_SetResult(interp,
-	    "dynamic loading is not currently available on this system",
-	    TCL_STATIC);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/generic/tclMain.c b/generic/tclMain.c
deleted file mode 100644
index 089452d..0000000
--- a/generic/tclMain.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* 
- * tclMain.c --
- *
- *	Main program for Tcl shells and other Tcl-based applications.
- *
- * Copyright (c) 1988-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMain.c,v 1.5 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
- * The following code ensures that tclLink.c is linked whenever
- * Tcl is linked.  Without this code there's no reference to the
- * code in that file from anywhere in Tcl, so it may not be
- * linked into the application.
- */
-
-EXTERN int Tcl_LinkVar();
-int (*tclDummyLinkVarPtr)() = Tcl_LinkVar;
-
-/*
- * Declarations for various library procedures and variables (don't want
- * to include tclPort.h here, because people might copy this file out of
- * the Tcl source directory to make their own modified versions).
- * Note:  "exit" should really be declared here, but there's no way to
- * declare it without causing conflicts with other definitions elsewher
- * on some systems, so it's better just to leave it out.
- */
-
-extern int		isatty _ANSI_ARGS_((int fd));
-extern char *		strcpy _ANSI_ARGS_((char *dst, CONST char *src));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Main --
- *
- *	Main program for tclsh and most other Tcl-based applications.
- *
- * Results:
- *	None. This procedure never returns (it exits the process when
- *	it's done.
- *
- * Side effects:
- *	This procedure initializes the Tk world and then starts
- *	interpreting commands;  almost anything could happen, depending
- *	on the script being interpreted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Main(argc, argv, appInitProc)
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Array of argument strings. */
-    Tcl_AppInitProc *appInitProc;
-				/* Application-specific initialization
-				 * procedure to call after most
-				 * initialization but before starting to
-				 * execute commands. */
-{
-    Tcl_Obj *resultPtr;
-    Tcl_Obj *commandPtr = NULL;
-    char buffer[1000], *args, *fileName;
-    int code, gotPartial, tty, length;
-    int exitCode = 0;
-    Tcl_Channel inChannel, outChannel, errChannel;
-    Tcl_Interp *interp;
-    Tcl_DString argString;
-
-    Tcl_FindExecutable(argv[0]);
-    interp = Tcl_CreateInterp();
-#ifdef TCL_MEM_DEBUG
-    Tcl_InitMemory(interp);
-#endif
-
-    /*
-     * Make command-line arguments available in the Tcl variables "argc"
-     * and "argv".  If the first argument doesn't start with a "-" then
-     * strip it off and use it as the name of a script file to process.
-     */
-
-    fileName = NULL;
-    if ((argc > 1) && (argv[1][0] != '-')) {
-	fileName = argv[1];
-	argc--;
-	argv++;
-    }
-    args = Tcl_Merge(argc-1, argv+1);
-    Tcl_ExternalToUtfDString(NULL, args, -1, &argString);
-    Tcl_SetVar(interp, "argv", Tcl_DStringValue(&argString), TCL_GLOBAL_ONLY);
-    Tcl_DStringFree(&argString);
-    ckfree(args);
-
-    if (fileName == NULL) {
-	Tcl_ExternalToUtfDString(NULL, argv[0], -1, &argString);
-    } else {
-	fileName = Tcl_ExternalToUtfDString(NULL, fileName, -1, &argString);
-    }
-
-    TclFormatInt(buffer, argc-1);
-    Tcl_SetVar(interp, "argc", buffer, TCL_GLOBAL_ONLY);
-    Tcl_SetVar(interp, "argv0", Tcl_DStringValue(&argString), TCL_GLOBAL_ONLY);
-
-    /*
-     * Set the "tcl_interactive" variable.
-     */
-
-    tty = isatty(0);
-    Tcl_SetVar(interp, "tcl_interactive",
-	    ((fileName == NULL) && tty) ? "1" : "0", TCL_GLOBAL_ONLY);
-    
-    /*
-     * Invoke application-specific initialization.
-     */
-
-    if ((*appInitProc)(interp) != TCL_OK) {
-	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	if (errChannel) {
-	    Tcl_WriteChars(errChannel,
-		    "application-specific initialization failed: ", -1);
-	    Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-	    Tcl_WriteChars(errChannel, "\n", 1);
-	}
-    }
-
-    /*
-     * If a script file was specified then just source that file
-     * and quit.
-     */
-
-    if (fileName != NULL) {
-	code = Tcl_EvalFile(interp, fileName);
-	if (code != TCL_OK) {
-	    errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	    if (errChannel) {
-		/*
-		 * The following statement guarantees that the errorInfo
-		 * variable is set properly.
-		 */
-
-		Tcl_AddErrorInfo(interp, "");
-		Tcl_WriteObj(errChannel, Tcl_GetVar2Ex(interp, "errorInfo",
-			NULL, TCL_GLOBAL_ONLY));
-		Tcl_WriteChars(errChannel, "\n", 1);
-	    }
-	    exitCode = 1;
-	}
-	goto done;
-    }
-    Tcl_DStringFree(&argString);
-
-    /*
-     * We're running interactively.  Source a user-specific startup
-     * file if the application specified one and if the file exists.
-     */
-
-    Tcl_SourceRCFile(interp);
-
-    /*
-     * Process commands from stdin until there's an end-of-file.  Note
-     * that we need to fetch the standard channels again after every
-     * eval, since they may have been changed.
-     */
-
-    commandPtr = Tcl_NewObj();
-    Tcl_IncrRefCount(commandPtr);
-
-    inChannel = Tcl_GetStdChannel(TCL_STDIN);
-    outChannel = Tcl_GetStdChannel(TCL_STDOUT);
-    gotPartial = 0;
-    while (1) {
-	if (tty) {
-	    Tcl_Obj *promptCmdPtr;
-
-	    promptCmdPtr = Tcl_GetVar2Ex(interp,
-		    (gotPartial ? "tcl_prompt2" : "tcl_prompt1"),
-		    NULL, TCL_GLOBAL_ONLY);
-	    if (promptCmdPtr == NULL) {
-                defaultPrompt:
-		if (!gotPartial && outChannel) {
-		    Tcl_WriteChars(outChannel, "% ", 2);
-		}
-	    } else {
-		code = Tcl_EvalObjEx(interp, promptCmdPtr, 0);
-		inChannel = Tcl_GetStdChannel(TCL_STDIN);
-		outChannel = Tcl_GetStdChannel(TCL_STDOUT);
-		errChannel = Tcl_GetStdChannel(TCL_STDERR);
-		if (code != TCL_OK) {
-		    if (errChannel) {
-			Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-			Tcl_WriteChars(errChannel, "\n", 1);
-		    }
-		    Tcl_AddErrorInfo(interp,
-			    "\n    (script that generates prompt)");
-		    goto defaultPrompt;
-		}
-	    }
-	    if (outChannel) {
-		Tcl_Flush(outChannel);
-	    }
-	}
-	if (!inChannel) {
-	    goto done;
-	}
-        length = Tcl_GetsObj(inChannel, commandPtr);
-	if (length < 0) {
-	    goto done;
-	}
-	if ((length == 0) && Tcl_Eof(inChannel) && (!gotPartial)) {
-	    goto done;
-	}
-
-        /*
-         * Add the newline removed by Tcl_GetsObj back to the string.
-         */
-
-	Tcl_AppendToObj(commandPtr, "\n", 1);
-	if (!TclObjCommandComplete(commandPtr)) {
-	    gotPartial = 1;
-	    continue;
-	}
-
-	gotPartial = 0;
-	code = Tcl_RecordAndEvalObj(interp, commandPtr, 0);
-	inChannel = Tcl_GetStdChannel(TCL_STDIN);
-	outChannel = Tcl_GetStdChannel(TCL_STDOUT);
-	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	Tcl_SetObjLength(commandPtr, 0);
-	if (code != TCL_OK) {
-	    if (errChannel) {
-		Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-		Tcl_WriteChars(errChannel, "\n", 1);
-	    }
-	} else if (tty) {
-	    resultPtr = Tcl_GetObjResult(interp);
-	    Tcl_GetStringFromObj(resultPtr, &length);
-	    if ((length > 0) && outChannel) {
-		Tcl_WriteObj(outChannel, resultPtr);
-		Tcl_WriteChars(outChannel, "\n", 1);
-	    }
-	}
-#ifdef TCL_MEM_DEBUG
-	if (tclMemDumpFileName != NULL) {
-	    Tcl_DecrRefCount(commandPtr);
-	    Tcl_DeleteInterp(interp);
-	    Tcl_Exit(0);
-	}
-#endif
-    }
-
-    /*
-     * Rather than calling exit, invoke the "exit" command so that
-     * users can replace "exit" with some other command to do additional
-     * cleanup on exit.  The Tcl_Eval call should never return.
-     */
-
-    done:
-    if (commandPtr != NULL) {
-	Tcl_DecrRefCount(commandPtr);
-    }
-    sprintf(buffer, "exit %d", exitCode);
-    Tcl_Eval(interp, buffer);
-}
diff --git a/generic/tclMath.h b/generic/tclMath.h
deleted file mode 100644
index ee1a02e..0000000
--- a/generic/tclMath.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * tclMath.h --
- *
- *	This file is necessary because of Metrowerks CodeWarrior Pro 1
- *	on the Macintosh. With 8-byte doubles turned on, the definitions of
- *	sin, cos, acos, etc., are screwed up.  They are fine as long as
- *	they are used as function calls, but if the function pointers
- *	are passed around and used, they will crash hard on the 68K.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMath.h,v 1.2 1998/09/14 18:40:01 stanton Exp $
- */
-
-#ifndef _TCLMATH
-#define _TCLMATH
-
-#if defined(MAC_TCL)
-#   include "tclMacMath.h"
-#else
-#   include <math.h>
-#endif
-
-#endif /* _TCLMATH */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
deleted file mode 100644
index b01cb84..0000000
--- a/generic/tclNamesp.c
+++ /dev/null
@@ -1,3869 +0,0 @@
-/*
- * tclNamesp.c --
- *
- *      Contains support for namespaces, which provide a separate context of
- *      commands and global variables. The global :: namespace is the
- *      traditional Tcl "global" scope. Other namespaces are created as
- *      children of the global namespace. These other namespaces contain
- *      special-purpose commands and variables for packages.
- *
- * Copyright (c) 1993-1997 Lucent Technologies.
- * Copyright (c) 1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * Originally implemented by
- *   Michael J. McLennan
- *   Bell Labs Innovations for Lucent Technologies
- *   mmclennan@lucent.com
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclNamesp.c,v 1.11 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Flag passed to TclGetNamespaceForQualName to indicate that it should
- * search for a namespace rather than a command or variable inside a
- * namespace. Note that this flag's value must not conflict with the values
- * of TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY, or CREATE_NS_IF_UNKNOWN.
- */
-
-#define FIND_ONLY_NS	0x1000
-
-/*
- * Initial size of stack allocated space for tail list - used when resetting
- * shadowed command references in the functin: TclResetShadowedCmdRefs.
- */
-
-#define NUM_TRAIL_ELEMS 5
-
-/*
- * Count of the number of namespaces created. This value is used as a
- * unique id for each namespace.
- */
-
-static long numNsCreated = 0; 
-TCL_DECLARE_MUTEX(nsMutex)
-
-/*
- * This structure contains a cached pointer to a namespace that is the
- * result of resolving the namespace's name in some other namespace. It is
- * the internal representation for a nsName object. It contains the
- * pointer along with some information that is used to check the cached
- * pointer's validity.
- */
-
-typedef struct ResolvedNsName {
-    Namespace *nsPtr;		/* A cached namespace pointer. */
-    long nsId;			/* nsPtr's unique namespace id. Used to
-				 * verify that nsPtr is still valid
-				 * (e.g., it's possible that the namespace
-				 * was deleted and a new one created at
-				 * the same address). */
-    Namespace *refNsPtr;	/* Points to the namespace containing the
-				 * reference (not the namespace that
-				 * contains the referenced namespace). */
-    int refCount;		/* Reference count: 1 for each nsName
-				 * object that has a pointer to this
-				 * ResolvedNsName structure as its internal
-				 * rep. This structure can be freed when
-				 * refCount becomes zero. */
-} ResolvedNsName;
-
-/*
- * Declarations for procedures local to this file:
- */
-
-static void		DeleteImportedCmd _ANSI_ARGS_((
-			    ClientData clientData));
-static void		DupNsNameInternalRep _ANSI_ARGS_((Tcl_Obj *objPtr,
-			    Tcl_Obj *copyPtr));
-static void		FreeNsNameInternalRep _ANSI_ARGS_((
-			    Tcl_Obj *objPtr));
-static int		GetNamespaceFromObj _ANSI_ARGS_((
-			    Tcl_Interp *interp, Tcl_Obj *objPtr,
-			    Tcl_Namespace **nsPtrPtr));
-static int		InvokeImportedCmd _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceChildrenCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceCodeCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceCurrentCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceDeleteCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceEvalCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceExportCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceForgetCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static void		NamespaceFree _ANSI_ARGS_((Namespace *nsPtr));
-static int		NamespaceImportCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceInscopeCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceOriginCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceParentCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceQualifiersCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceTailCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		NamespaceWhichCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		SetNsNameFromAny _ANSI_ARGS_((
-			    Tcl_Interp *interp, Tcl_Obj *objPtr));
-static void		UpdateStringOfNsName _ANSI_ARGS_((Tcl_Obj *objPtr));
-
-/*
- * This structure defines a Tcl object type that contains a
- * namespace reference.  It is used in commands that take the
- * name of a namespace as an argument.  The namespace reference
- * is resolved, and the result in cached in the object.
- */
-
-Tcl_ObjType tclNsNameType = {
-    "nsName",			/* the type's name */
-    FreeNsNameInternalRep,	/* freeIntRepProc */
-    DupNsNameInternalRep,	/* dupIntRepProc */
-    UpdateStringOfNsName,	/* updateStringProc */
-    SetNsNameFromAny		/* setFromAnyProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitNamespaceSubsystem --
- *
- *	This procedure is called to initialize all the structures that 
- *	are used by namespaces on a per-process basis.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The namespace object type is registered with the Tcl compiler.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitNamespaceSubsystem()
-{
-    Tcl_RegisterObjType(&tclNsNameType);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCurrentNamespace --
- *
- *	Returns a pointer to an interpreter's currently active namespace.
- *
- * Results:
- *	Returns a pointer to the interpreter's current namespace.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Namespace *
-Tcl_GetCurrentNamespace(interp)
-    register Tcl_Interp *interp; /* Interpreter whose current namespace is
-				  * being queried. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    register Namespace *nsPtr;
-
-    if (iPtr->varFramePtr != NULL) {
-        nsPtr = iPtr->varFramePtr->nsPtr;
-    } else {
-        nsPtr = iPtr->globalNsPtr;
-    }
-    return (Tcl_Namespace *) nsPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetGlobalNamespace --
- *
- *	Returns a pointer to an interpreter's global :: namespace.
- *
- * Results:
- *	Returns a pointer to the specified interpreter's global namespace.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Namespace *
-Tcl_GetGlobalNamespace(interp)
-    register Tcl_Interp *interp; /* Interpreter whose global namespace 
-				  * should be returned. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    
-    return (Tcl_Namespace *) iPtr->globalNsPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PushCallFrame --
- *
- *	Pushes a new call frame onto the interpreter's Tcl call stack.
- *	Called when executing a Tcl procedure or a "namespace eval" or
- *	"namespace inscope" command. 
- *
- * Results:
- *	Returns TCL_OK if successful, or TCL_ERROR (along with an error
- *	message in the interpreter's result object) if something goes wrong.
- *
- * Side effects:
- *	Modifies the interpreter's Tcl call stack.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_PushCallFrame(interp, callFramePtr, namespacePtr, isProcCallFrame)
-    Tcl_Interp *interp;		 /* Interpreter in which the new call frame
-				  * is to be pushed. */
-    Tcl_CallFrame *callFramePtr; /* Points to a call frame structure to
-				  * push. Storage for this have already been
-				  * allocated by the caller; typically this
-				  * is the address of a CallFrame structure
-				  * allocated on the caller's C stack.  The
-				  * call frame will be initialized by this
-				  * procedure. The caller can pop the frame
-				  * later with Tcl_PopCallFrame, and it is
-				  * responsible for freeing the frame's
-				  * storage. */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace in which the
-				  * frame will execute. If NULL, the
-				  * interpreter's current namespace will
-				  * be used. */
-    int isProcCallFrame;	 /* If nonzero, the frame represents a
-				  * called Tcl procedure and may have local
-				  * vars. Vars will ordinarily be looked up
-				  * in the frame. If new variables are
-				  * created, they will be created in the
-				  * frame. If 0, the frame is for a
-				  * "namespace eval" or "namespace inscope"
-				  * command and var references are treated
-				  * as references to namespace variables. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register CallFrame *framePtr = (CallFrame *) callFramePtr;
-    register Namespace *nsPtr;
-
-    if (namespacePtr == NULL) {
-	nsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    } else {
-        nsPtr = (Namespace *) namespacePtr;
-        if (nsPtr->flags & NS_DEAD) {
-	    panic("Trying to push call frame for dead namespace");
-	    /*NOTREACHED*/
-        }
-    }
-
-    nsPtr->activationCount++;
-    framePtr->nsPtr = nsPtr;
-    framePtr->isProcCallFrame = isProcCallFrame;
-    framePtr->objc = 0;
-    framePtr->objv = NULL;
-    framePtr->callerPtr = iPtr->framePtr;
-    framePtr->callerVarPtr = iPtr->varFramePtr;
-    if (iPtr->varFramePtr != NULL) {
-        framePtr->level = (iPtr->varFramePtr->level + 1);
-    } else {
-        framePtr->level = 1;
-    }
-    framePtr->procPtr = NULL; 	   /* no called procedure */
-    framePtr->varTablePtr = NULL;  /* and no local variables */
-    framePtr->numCompiledLocals = 0;
-    framePtr->compiledLocals = NULL;
-
-    /*
-     * Push the new call frame onto the interpreter's stack of procedure
-     * call frames making it the current frame.
-     */
-
-    iPtr->framePtr = framePtr;
-    iPtr->varFramePtr = framePtr;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PopCallFrame --
- *
- *	Removes a call frame from the Tcl call stack for the interpreter.
- *	Called to remove a frame previously pushed by Tcl_PushCallFrame.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Modifies the call stack of the interpreter. Resets various fields of
- *	the popped call frame. If a namespace has been deleted and
- *	has no more activations on the call stack, the namespace is
- *	destroyed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_PopCallFrame(interp)
-    Tcl_Interp* interp;		/* Interpreter with call frame to pop. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    register CallFrame *framePtr = iPtr->framePtr;
-    int saveErrFlag;
-    Namespace *nsPtr;
-
-    /*
-     * It's important to remove the call frame from the interpreter's stack
-     * of call frames before deleting local variables, so that traces
-     * invoked by the variable deletion don't see the partially-deleted
-     * frame.
-     */
-
-    iPtr->framePtr = framePtr->callerPtr;
-    iPtr->varFramePtr = framePtr->callerVarPtr;
-
-    /*
-     * Delete the local variables. As a hack, we save then restore the
-     * ERR_IN_PROGRESS flag in the interpreter. The problem is that there
-     * could be unset traces on the variables, which cause scripts to be
-     * evaluated. This will clear the ERR_IN_PROGRESS flag, losing stack
-     * trace information if the procedure was exiting with an error. The
-     * code below preserves the flag. Unfortunately, that isn't really
-     * enough: we really should preserve the errorInfo variable too
-     * (otherwise a nested error in the trace script will trash errorInfo).
-     * What's really needed is a general-purpose mechanism for saving and
-     * restoring interpreter state.
-     */
-
-    saveErrFlag = (iPtr->flags & ERR_IN_PROGRESS);
-
-    if (framePtr->varTablePtr != NULL) {
-        TclDeleteVars(iPtr, framePtr->varTablePtr);
-        ckfree((char *) framePtr->varTablePtr);
-        framePtr->varTablePtr = NULL;
-    }
-    if (framePtr->numCompiledLocals > 0) {
-        TclDeleteCompiledLocalVars(iPtr, framePtr);
-    }
-
-    iPtr->flags |= saveErrFlag;
-
-    /*
-     * Decrement the namespace's count of active call frames. If the
-     * namespace is "dying" and there are no more active call frames,
-     * call Tcl_DeleteNamespace to destroy it.
-     */
-
-    nsPtr = framePtr->nsPtr;
-    nsPtr->activationCount--;
-    if ((nsPtr->flags & NS_DYING)
-	    && (nsPtr->activationCount == 0)) {
-        Tcl_DeleteNamespace((Tcl_Namespace *) nsPtr);
-    }
-    framePtr->nsPtr = NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateNamespace --
- *
- *	Creates a new namespace with the given name. If there is no
- *	active namespace (i.e., the interpreter is being initialized),
- *	the global :: namespace is created and returned.
- *
- * Results:
- *	Returns a pointer to the new namespace if successful. If the
- *	namespace already exists or if another error occurs, this routine
- *	returns NULL, along with an error message in the interpreter's
- *	result object.
- *
- * Side effects:
- *	If the name contains "::" qualifiers and a parent namespace does
- *	not already exist, it is automatically created. 
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Namespace *
-Tcl_CreateNamespace(interp, name, clientData, deleteProc)
-    Tcl_Interp *interp;             /* Interpreter in which a new namespace
-				     * is being created. Also used for
-				     * error reporting. */
-    char *name;                     /* Name for the new namespace. May be a
-				     * qualified name with names of ancestor
-				     * namespaces separated by "::"s. */
-    ClientData clientData;	    /* One-word value to store with
-				     * namespace. */
-    Tcl_NamespaceDeleteProc *deleteProc;
-    				    /* Procedure called to delete client
-				     * data when the namespace is deleted.
-				     * NULL if no procedure should be
-				     * called. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Namespace *nsPtr, *ancestorPtr;
-    Namespace *parentPtr, *dummy1Ptr, *dummy2Ptr;
-    Namespace *globalNsPtr = iPtr->globalNsPtr;
-    char *simpleName;
-    Tcl_HashEntry *entryPtr;
-    Tcl_DString buffer1, buffer2;
-    int newEntry;
-
-    /*
-     * If there is no active namespace, the interpreter is being
-     * initialized. 
-     */
-
-    if ((globalNsPtr == NULL) && (iPtr->varFramePtr == NULL)) {
-	/*
-	 * Treat this namespace as the global namespace, and avoid
-	 * looking for a parent.
-	 */
-	
-        parentPtr = NULL;
-        simpleName = "";
-    } else if (*name == '\0') {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"can't create namespace \"\": only global namespace can have empty name", (char *) NULL);
-	return NULL;
-    } else {
-	/*
-	 * Find the parent for the new namespace.
-	 */
-
-	TclGetNamespaceForQualName(interp, name, (Namespace *) NULL,
-		/*flags*/ (CREATE_NS_IF_UNKNOWN | TCL_LEAVE_ERR_MSG),
-		&parentPtr, &dummy1Ptr, &dummy2Ptr, &simpleName);
-
-	/*
-	 * If the unqualified name at the end is empty, there were trailing
-	 * "::"s after the namespace's name which we ignore. The new
-	 * namespace was already (recursively) created and is pointed to
-	 * by parentPtr.
-	 */
-
-	if (*simpleName == '\0') {
-	    return (Tcl_Namespace *) parentPtr;
-	}
-
-        /*
-         * Check for a bad namespace name and make sure that the name
-	 * does not already exist in the parent namespace.
-	 */
-
-        if (Tcl_FindHashEntry(&parentPtr->childTable, simpleName) != NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "can't create namespace \"", name,
-    	    	    "\": already exists", (char *) NULL);
-            return NULL;
-        }
-    }
-
-    /*
-     * Create the new namespace and root it in its parent. Increment the
-     * count of namespaces created.
-     */
-
-
-    nsPtr = (Namespace *) ckalloc(sizeof(Namespace));
-    nsPtr->name            = (char *) ckalloc((unsigned) (strlen(simpleName)+1));
-    strcpy(nsPtr->name, simpleName);
-    nsPtr->fullName        = NULL;   /* set below */
-    nsPtr->clientData      = clientData;
-    nsPtr->deleteProc      = deleteProc;
-    nsPtr->parentPtr       = parentPtr;
-    Tcl_InitHashTable(&nsPtr->childTable, TCL_STRING_KEYS);
-    Tcl_MutexLock(&nsMutex);
-    numNsCreated++;
-    nsPtr->nsId            = numNsCreated;
-    Tcl_MutexUnlock(&nsMutex);
-    nsPtr->interp          = interp;
-    nsPtr->flags           = 0;
-    nsPtr->activationCount = 0;
-    nsPtr->refCount        = 0;
-    Tcl_InitHashTable(&nsPtr->cmdTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&nsPtr->varTable, TCL_STRING_KEYS);
-    nsPtr->exportArrayPtr  = NULL;
-    nsPtr->numExportPatterns = 0;
-    nsPtr->maxExportPatterns = 0;
-    nsPtr->cmdRefEpoch       = 0;
-    nsPtr->resolverEpoch     = 0;
-    nsPtr->cmdResProc        = NULL;
-    nsPtr->varResProc        = NULL;
-    nsPtr->compiledVarResProc = NULL;
-
-    if (parentPtr != NULL) {
-        entryPtr = Tcl_CreateHashEntry(&parentPtr->childTable, simpleName,
-	        &newEntry);
-        Tcl_SetHashValue(entryPtr, (ClientData) nsPtr);
-    }
-
-    /*
-     * Build the fully qualified name for this namespace.
-     */
-
-    Tcl_DStringInit(&buffer1);
-    Tcl_DStringInit(&buffer2);
-    for (ancestorPtr = nsPtr;  ancestorPtr != NULL;
-	    ancestorPtr = ancestorPtr->parentPtr) {
-        if (ancestorPtr != globalNsPtr) {
-            Tcl_DStringAppend(&buffer1, "::", 2);
-            Tcl_DStringAppend(&buffer1, ancestorPtr->name, -1);
-        }
-        Tcl_DStringAppend(&buffer1, Tcl_DStringValue(&buffer2), -1);
-
-        Tcl_DStringSetLength(&buffer2, 0);
-        Tcl_DStringAppend(&buffer2, Tcl_DStringValue(&buffer1), -1);
-        Tcl_DStringSetLength(&buffer1, 0);
-    }
-    
-    name = Tcl_DStringValue(&buffer2);
-    nsPtr->fullName = (char *) ckalloc((unsigned) (strlen(name)+1));
-    strcpy(nsPtr->fullName, name);
-
-    Tcl_DStringFree(&buffer1);
-    Tcl_DStringFree(&buffer2);
-
-    /*
-     * Return a pointer to the new namespace.
-     */
-
-    return (Tcl_Namespace *) nsPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteNamespace --
- *
- *	Deletes a namespace and all of the commands, variables, and other
- *	namespaces within it.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	When a namespace is deleted, it is automatically removed as a
- *	child of its parent namespace. Also, all its commands, variables
- *	and child namespaces are deleted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteNamespace(namespacePtr)
-    Tcl_Namespace *namespacePtr;   /* Points to the namespace to delete. */
-{
-    register Namespace *nsPtr = (Namespace *) namespacePtr;
-    Interp *iPtr = (Interp *) nsPtr->interp;
-    Namespace *globalNsPtr =
-	    (Namespace *) Tcl_GetGlobalNamespace((Tcl_Interp *) iPtr);
-    Tcl_HashEntry *entryPtr;
-
-    /*
-     * If the namespace is on the call frame stack, it is marked as "dying"
-     * (NS_DYING is OR'd into its flags): the namespace can't be looked up
-     * by name but its commands and variables are still usable by those
-     * active call frames. When all active call frames referring to the
-     * namespace have been popped from the Tcl stack, Tcl_PopCallFrame will
-     * call this procedure again to delete everything in the namespace.
-     * If no nsName objects refer to the namespace (i.e., if its refCount 
-     * is zero), its commands and variables are deleted and the storage for
-     * its namespace structure is freed. Otherwise, if its refCount is
-     * nonzero, the namespace's commands and variables are deleted but the
-     * structure isn't freed. Instead, NS_DEAD is OR'd into the structure's
-     * flags to allow the namespace resolution code to recognize that the
-     * namespace is "deleted". The structure's storage is freed by
-     * FreeNsNameInternalRep when its refCount reaches 0.
-     */
-
-    if (nsPtr->activationCount > 0) {
-        nsPtr->flags |= NS_DYING;
-        if (nsPtr->parentPtr != NULL) {
-            entryPtr = Tcl_FindHashEntry(&nsPtr->parentPtr->childTable,
-		    nsPtr->name);
-            if (entryPtr != NULL) {
-                Tcl_DeleteHashEntry(entryPtr);
-            }
-        }
-        nsPtr->parentPtr = NULL;
-    } else {
-	/*
-	 * Delete the namespace and everything in it. If this is the global
-	 * namespace, then clear it but don't free its storage unless the
-	 * interpreter is being torn down.
-	 */
-
-        TclTeardownNamespace(nsPtr);
-
-        if ((nsPtr != globalNsPtr) || (iPtr->flags & DELETED)) {
-            /*
-	     * If this is the global namespace, then it may have residual
-             * "errorInfo" and "errorCode" variables for errors that
-             * occurred while it was being torn down.  Try to clear the
-             * variable list one last time.
-	     */
-
-            TclDeleteVars((Interp *) nsPtr->interp, &nsPtr->varTable);
-	    
-            Tcl_DeleteHashTable(&nsPtr->childTable);
-            Tcl_DeleteHashTable(&nsPtr->cmdTable);
-
-            /*
-             * If the reference count is 0, then discard the namespace.
-             * Otherwise, mark it as "dead" so that it can't be used.
-             */
-
-            if (nsPtr->refCount == 0) {
-                NamespaceFree(nsPtr);
-            } else {
-                nsPtr->flags |= NS_DEAD;
-            }
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclTeardownNamespace --
- *
- *	Used internally to dismantle and unlink a namespace when it is
- *	deleted. Divorces the namespace from its parent, and deletes all
- *	commands, variables, and child namespaces.
- *
- *	This is kept separate from Tcl_DeleteNamespace so that the global
- *	namespace can be handled specially. Global variables like
- *	"errorInfo" and "errorCode" need to remain intact while other
- *	namespaces and commands are torn down, in case any errors occur.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes this namespace from its parent's child namespace hashtable.
- *	Deletes all commands, variables and namespaces in this namespace.
- *	If this is the global namespace, the "errorInfo" and "errorCode"
- *	variables are left alone and deleted later.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclTeardownNamespace(nsPtr)
-    register Namespace *nsPtr;	/* Points to the namespace to be dismantled
-				 * and unlinked from its parent. */
-{
-    Interp *iPtr = (Interp *) nsPtr->interp;
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Tcl_Namespace *childNsPtr;
-    Tcl_Command cmd;
-    Namespace *globalNsPtr =
-	    (Namespace *) Tcl_GetGlobalNamespace((Tcl_Interp *) iPtr);
-    int i;
-
-    /*
-     * Start by destroying the namespace's variable table,
-     * since variables might trigger traces.
-     */
-
-    if (nsPtr == globalNsPtr) {
-	/*
-	 * This is the global namespace, so be careful to preserve the
-	 * "errorInfo" and "errorCode" variables. These might be needed
-	 * later on if errors occur while deleting commands. We are careful
-	 * to destroy and recreate the "errorInfo" and "errorCode"
-	 * variables, in case they had any traces on them.
-	 */
-    
-        char *str, *errorInfoStr, *errorCodeStr;
-
-        str = Tcl_GetVar((Tcl_Interp *) iPtr, "errorInfo", TCL_GLOBAL_ONLY);
-        if (str != NULL) {
-            errorInfoStr = ckalloc((unsigned) (strlen(str)+1));
-            strcpy(errorInfoStr, str);
-        } else {
-            errorInfoStr = NULL;
-        }
-
-        str = Tcl_GetVar((Tcl_Interp *) iPtr, "errorCode", TCL_GLOBAL_ONLY);
-        if (str != NULL) {
-            errorCodeStr = ckalloc((unsigned) (strlen(str)+1));
-            strcpy(errorCodeStr, str);
-        } else {
-            errorCodeStr = NULL;
-        }
-
-        TclDeleteVars(iPtr, &nsPtr->varTable);
-        Tcl_InitHashTable(&nsPtr->varTable, TCL_STRING_KEYS);
-
-        if (errorInfoStr != NULL) {
-            Tcl_SetVar((Tcl_Interp *) iPtr, "errorInfo", errorInfoStr,
-                TCL_GLOBAL_ONLY);
-            ckfree(errorInfoStr);
-        }
-        if (errorCodeStr != NULL) {
-            Tcl_SetVar((Tcl_Interp *) iPtr, "errorCode", errorCodeStr,
-                TCL_GLOBAL_ONLY);
-            ckfree(errorCodeStr);
-        }
-    } else {
-	/*
-	 * Variable table should be cleared but not freed! TclDeleteVars
-	 * frees it, so we reinitialize it afterwards.
-	 */
-    
-        TclDeleteVars(iPtr, &nsPtr->varTable);
-        Tcl_InitHashTable(&nsPtr->varTable, TCL_STRING_KEYS);
-    }
-
-    /*
-     * Remove the namespace from its parent's child hashtable.
-     */
-
-    if (nsPtr->parentPtr != NULL) {
-        entryPtr = Tcl_FindHashEntry(&nsPtr->parentPtr->childTable,
-	        nsPtr->name);
-        if (entryPtr != NULL) {
-            Tcl_DeleteHashEntry(entryPtr);
-        }
-    }
-    nsPtr->parentPtr = NULL;
-
-    /*
-     * Delete all the child namespaces.
-     *
-     * BE CAREFUL: When each child is deleted, it will divorce
-     *    itself from its parent. You can't traverse a hash table
-     *    properly if its elements are being deleted. We use only
-     *    the Tcl_FirstHashEntry function to be safe.
-     */
-
-    for (entryPtr = Tcl_FirstHashEntry(&nsPtr->childTable, &search);
-            entryPtr != NULL;
-            entryPtr = Tcl_FirstHashEntry(&nsPtr->childTable, &search)) {
-        childNsPtr = (Tcl_Namespace *) Tcl_GetHashValue(entryPtr);
-        Tcl_DeleteNamespace(childNsPtr);
-    }
-
-    /*
-     * Delete all commands in this namespace. Be careful when traversing the
-     * hash table: when each command is deleted, it removes itself from the
-     * command table.
-     */
-
-    for (entryPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search);
-            entryPtr != NULL;
-            entryPtr = Tcl_FirstHashEntry(&nsPtr->cmdTable, &search)) {
-        cmd = (Tcl_Command) Tcl_GetHashValue(entryPtr);
-        Tcl_DeleteCommandFromToken((Tcl_Interp *) iPtr, cmd);
-    }
-    Tcl_DeleteHashTable(&nsPtr->cmdTable);
-    Tcl_InitHashTable(&nsPtr->cmdTable, TCL_STRING_KEYS);
-
-    /*
-     * Free the namespace's export pattern array.
-     */
-
-    if (nsPtr->exportArrayPtr != NULL) {
-	for (i = 0;  i < nsPtr->numExportPatterns;  i++) {
-	    ckfree(nsPtr->exportArrayPtr[i]);
-	}
-        ckfree((char *) nsPtr->exportArrayPtr);
-	nsPtr->exportArrayPtr = NULL;
-	nsPtr->numExportPatterns = 0;
-	nsPtr->maxExportPatterns = 0;
-    }
-
-    /*
-     * Free any client data associated with the namespace.
-     */
-
-    if (nsPtr->deleteProc != NULL) {
-        (*nsPtr->deleteProc)(nsPtr->clientData);
-    }
-    nsPtr->deleteProc = NULL;
-    nsPtr->clientData = NULL;
-
-    /*
-     * Reset the namespace's id field to ensure that this namespace won't
-     * be interpreted as valid by, e.g., the cache validation code for
-     * cached command references in Tcl_GetCommandFromObj.
-     */
-
-    nsPtr->nsId = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceFree --
- *
- *	Called after a namespace has been deleted, when its
- *	reference count reaches 0.  Frees the data structure
- *	representing the namespace.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-NamespaceFree(nsPtr)
-    register Namespace *nsPtr;	/* Points to the namespace to free. */
-{
-    /*
-     * Most of the namespace's contents are freed when the namespace is
-     * deleted by Tcl_DeleteNamespace. All that remains is to free its names
-     * (for error messages), and the structure itself.
-     */
-
-    ckfree(nsPtr->name);
-    ckfree(nsPtr->fullName);
-
-    ckfree((char *) nsPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Export --
- *
- *	Makes all the commands matching a pattern available to later be
- *	imported from the namespace specified by contextNsPtr (or the
- *	current namespace if contextNsPtr is NULL). The specified pattern is
- *	appended onto the namespace's export pattern list, which is
- *	optionally cleared beforehand.
- *
- * Results:
- *	Returns TCL_OK if successful, or TCL_ERROR (along with an error
- *	message in the interpreter's result) if something goes wrong.
- *
- * Side effects:
- *	Appends the export pattern onto the namespace's export list.
- *	Optionally reset the namespace's export pattern list.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Export(interp, namespacePtr, pattern, resetListFirst)
-    Tcl_Interp *interp;		 /* Current interpreter. */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace from which 
-				  * commands are to be exported. NULL for
-                                  * the current namespace. */
-    char *pattern;               /* String pattern indicating which commands
-                                  * to export. This pattern may not include
-				  * any namespace qualifiers; only commands
-				  * in the specified namespace may be
-				  * exported. */
-    int resetListFirst;		 /* If nonzero, resets the namespace's
-				  * export list before appending 
-				  * be overwritten by imported commands.
-				  * If 0, return an error if an imported
-				  * cmd conflicts with an existing one. */
-{
-#define INIT_EXPORT_PATTERNS 5    
-    Namespace *nsPtr, *exportNsPtr, *dummyPtr;
-    Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    char *simplePattern, *patternCpy;
-    int neededElems, len, i;
-
-    /*
-     * If the specified namespace is NULL, use the current namespace.
-     */
-
-    if (namespacePtr == NULL) {
-        nsPtr = (Namespace *) currNsPtr;
-    } else {
-        nsPtr = (Namespace *) namespacePtr;
-    }
-
-    /*
-     * If resetListFirst is true (nonzero), clear the namespace's export
-     * pattern list.
-     */
-
-    if (resetListFirst) {
-	if (nsPtr->exportArrayPtr != NULL) {
-	    for (i = 0;  i < nsPtr->numExportPatterns;  i++) {
-		ckfree(nsPtr->exportArrayPtr[i]);
-	    }
-	    ckfree((char *) nsPtr->exportArrayPtr);
-	    nsPtr->exportArrayPtr = NULL;
-	    nsPtr->numExportPatterns = 0;
-	    nsPtr->maxExportPatterns = 0;
-	}
-    }
-
-    /*
-     * Check that the pattern doesn't have namespace qualifiers.
-     */
-
-    TclGetNamespaceForQualName(interp, pattern, nsPtr,
-	    /*flags*/ TCL_LEAVE_ERR_MSG, &exportNsPtr, &dummyPtr,
-	    &dummyPtr, &simplePattern);
-
-    if ((exportNsPtr != nsPtr) || (strcmp(pattern, simplePattern) != 0)) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-	        "invalid export pattern \"", pattern,
-		"\": pattern can't specify a namespace",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure there is room in the namespace's pattern array for the
-     * new pattern.
-     */
-
-    neededElems = nsPtr->numExportPatterns + 1;
-    if (nsPtr->exportArrayPtr == NULL) {
-	nsPtr->exportArrayPtr = (char **)
-	        ckalloc((unsigned) (INIT_EXPORT_PATTERNS * sizeof(char *)));
-	nsPtr->numExportPatterns = 0;
-	nsPtr->maxExportPatterns = INIT_EXPORT_PATTERNS;
-    } else if (neededElems > nsPtr->maxExportPatterns) {
-	int numNewElems = 2 * nsPtr->maxExportPatterns;
-	size_t currBytes = nsPtr->numExportPatterns * sizeof(char *);
-	size_t newBytes  = numNewElems * sizeof(char *);
-	char **newPtr = (char **) ckalloc((unsigned) newBytes);
-
-	memcpy((VOID *) newPtr, (VOID *) nsPtr->exportArrayPtr,
-	        currBytes);
-	ckfree((char *) nsPtr->exportArrayPtr);
-	nsPtr->exportArrayPtr = (char **) newPtr;
-	nsPtr->maxExportPatterns = numNewElems;
-    }
-
-    /*
-     * Add the pattern to the namespace's array of export patterns.
-     */
-
-    len = strlen(pattern);
-    patternCpy = (char *) ckalloc((unsigned) (len + 1));
-    strcpy(patternCpy, pattern);
-    
-    nsPtr->exportArrayPtr[nsPtr->numExportPatterns] = patternCpy;
-    nsPtr->numExportPatterns++;
-    return TCL_OK;
-#undef INIT_EXPORT_PATTERNS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendExportList --
- *
- *	Appends onto the argument object the list of export patterns for the
- *	specified namespace.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case the object
- *	referenced by objPtr has each export pattern appended to it. If an
- *	error occurs, TCL_ERROR is returned and the interpreter's result
- *	holds an error message.
- *
- * Side effects:
- *	If necessary, the object referenced by objPtr is converted into
- *	a list object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppendExportList(interp, namespacePtr, objPtr)
-    Tcl_Interp *interp;		 /* Interpreter used for error reporting. */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace whose export
-				  * pattern list is appended onto objPtr.
-				  * NULL for the current namespace. */
-    Tcl_Obj *objPtr;		 /* Points to the Tcl object onto which the
-				  * export pattern list is appended. */
-{
-    Namespace *nsPtr;
-    int i, result;
-
-    /*
-     * If the specified namespace is NULL, use the current namespace.
-     */
-
-    if (namespacePtr == NULL) {
-        nsPtr = (Namespace *) (Namespace *) Tcl_GetCurrentNamespace(interp);
-    } else {
-        nsPtr = (Namespace *) namespacePtr;
-    }
-
-    /*
-     * Append the export pattern list onto objPtr.
-     */
-
-    for (i = 0;  i < nsPtr->numExportPatterns;  i++) {
-	result = Tcl_ListObjAppendElement(interp, objPtr,
-		Tcl_NewStringObj(nsPtr->exportArrayPtr[i], -1));
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Import --
- *
- *	Imports all of the commands matching a pattern into the namespace
- *	specified by contextNsPtr (or the current namespace if contextNsPtr
- *	is NULL). This is done by creating a new command (the "imported
- *	command") that points to the real command in its original namespace.
- *
- *      If matching commands are on the autoload path but haven't been
- *	loaded yet, this command forces them to be loaded, then creates
- *	the links to them.
- *
- * Results:
- *	Returns TCL_OK if successful, or TCL_ERROR (along with an error
- *	message in the interpreter's result) if something goes wrong.
- *
- * Side effects:
- *	Creates new commands in the importing namespace. These indirect
- *	calls back to the real command and are deleted if the real commands
- *	are deleted.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Import(interp, namespacePtr, pattern, allowOverwrite)
-    Tcl_Interp *interp;		 /* Current interpreter. */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace into which the
-				  * commands are to be imported. NULL for
-                                  * the current namespace. */
-    char *pattern;               /* String pattern indicating which commands
-                                  * to import. This pattern should be
-				  * qualified by the name of the namespace
-				  * from which to import the command(s). */
-    int allowOverwrite;		 /* If nonzero, allow existing commands to
-				  * be overwritten by imported commands.
-				  * If 0, return an error if an imported
-				  * cmd conflicts with an existing one. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Namespace *nsPtr, *importNsPtr, *dummyPtr;
-    Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    char *simplePattern, *cmdName;
-    register Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    Command *cmdPtr, *realCmdPtr;
-    ImportRef *refPtr;
-    Tcl_Command autoCmd, importedCmd;
-    ImportedCmdData *dataPtr;
-    int wasExported, i, result;
-
-    /*
-     * If the specified namespace is NULL, use the current namespace.
-     */
-
-    if (namespacePtr == NULL) {
-        nsPtr = (Namespace *) currNsPtr;
-    } else {
-        nsPtr = (Namespace *) namespacePtr;
-    }
- 
-    /*
-     * First, invoke the "auto_import" command with the pattern
-     * being imported.  This command is part of the Tcl library.
-     * It looks for imported commands in autoloaded libraries and
-     * loads them in.  That way, they will be found when we try
-     * to create links below.
-     */
-    
-    autoCmd = Tcl_FindCommand(interp, "auto_import",
- 	    (Tcl_Namespace *) NULL, /*flags*/ TCL_GLOBAL_ONLY);
- 
-    if (autoCmd != NULL) {
-	Tcl_Obj *objv[2];
- 
-	objv[0] = Tcl_NewStringObj("auto_import", -1);
-	Tcl_IncrRefCount(objv[0]);
-	objv[1] = Tcl_NewStringObj(pattern, -1);
-	Tcl_IncrRefCount(objv[1]);
- 
-	cmdPtr = (Command *) autoCmd;
-	result = (*cmdPtr->objProc)(cmdPtr->objClientData, interp,
-		2, objv);
- 
-	Tcl_DecrRefCount(objv[0]);
-	Tcl_DecrRefCount(objv[1]);
- 
-	if (result != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_ResetResult(interp);
-    }
-
-    /*
-     * From the pattern, find the namespace from which we are importing
-     * and get the simple pattern (no namespace qualifiers or ::'s) at
-     * the end.
-     */
-
-    if (strlen(pattern) == 0) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp),
-	        "empty import pattern", -1);
-        return TCL_ERROR;
-    }
-    TclGetNamespaceForQualName(interp, pattern, nsPtr,
-	    /*flags*/ TCL_LEAVE_ERR_MSG, &importNsPtr, &dummyPtr,
-	    &dummyPtr, &simplePattern);
-
-    if (importNsPtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"unknown namespace in import pattern \"",
-		pattern, "\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (importNsPtr == nsPtr) {
-	if (pattern == simplePattern) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "no namespace specified in import pattern \"", pattern,
-		    "\"", (char *) NULL);
-	} else {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "import pattern \"", pattern,
-		    "\" tries to import from namespace \"",
-		    importNsPtr->name, "\" into itself", (char *) NULL);
-	}
-        return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the command table in the source namespace and look for
-     * exported commands that match the string pattern. Create an "imported
-     * command" in the current namespace for each imported command; these
-     * commands redirect their invocations to the "real" command.
-     */
-
-    for (hPtr = Tcl_FirstHashEntry(&importNsPtr->cmdTable, &search);
-	    (hPtr != NULL);
-	    hPtr = Tcl_NextHashEntry(&search)) {
-        cmdName = Tcl_GetHashKey(&importNsPtr->cmdTable, hPtr);
-        if (Tcl_StringMatch(cmdName, simplePattern)) {
-	    /*
-	     * The command cmdName in the source namespace matches the
-	     * pattern. Check whether it was exported. If it wasn't,
-	     * we ignore it.
-	     */
-
-	    wasExported = 0;
-	    for (i = 0;  i < importNsPtr->numExportPatterns;  i++) {
-		if (Tcl_StringMatch(cmdName,
-			importNsPtr->exportArrayPtr[i])) {
-		    wasExported = 1;
-		    break;
-		}
-	    }
-	    if (!wasExported) {
-		continue;
-            }
-
-	    /*
-	     * Unless there is a name clash, create an imported command
-	     * in the current namespace that refers to cmdPtr.
-	     */
-	    
-            if ((Tcl_FindHashEntry(&nsPtr->cmdTable, cmdName) == NULL)
-		    || allowOverwrite) {
-		/*
-		 * Create the imported command and its client data.
-		 * To create the new command in the current namespace, 
-		 * generate a fully qualified name for it.
-		 */
-
-		Tcl_DString ds;
-
-		Tcl_DStringInit(&ds);
-		Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
-		if (nsPtr != iPtr->globalNsPtr) {
-		    Tcl_DStringAppend(&ds, "::", 2);
-		}
-		Tcl_DStringAppend(&ds, cmdName, -1);
-
-		/*
-		 * Check whether creating the new imported command in the
-		 * current namespace would create a cycle of imported->real
-		 * command references that also would destroy an existing
-		 * "real" command already in the current namespace.
-		 */
-
-		cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-		if (cmdPtr->deleteProc == DeleteImportedCmd) {
-		    realCmdPtr = (Command *) TclGetOriginalCommand(
-			    (Tcl_Command) cmdPtr);
-		    if ((realCmdPtr != NULL)
-			    && (realCmdPtr->nsPtr == currNsPtr)
-			    && (Tcl_FindHashEntry(&currNsPtr->cmdTable,
-			            cmdName) != NULL)) {
-			Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			        "import pattern \"", pattern,
-				"\" would create a loop containing command \"",
-				Tcl_DStringValue(&ds), "\"", (char *) NULL);
-			return TCL_ERROR;
-		    }
-		}
-
-		dataPtr = (ImportedCmdData *)
-		        ckalloc(sizeof(ImportedCmdData));
-                importedCmd = Tcl_CreateObjCommand(interp, 
-                        Tcl_DStringValue(&ds), InvokeImportedCmd,
-                        (ClientData) dataPtr, DeleteImportedCmd);
-		dataPtr->realCmdPtr = cmdPtr;
-		dataPtr->selfPtr = (Command *) importedCmd;
-
-		/*
-		 * Create an ImportRef structure describing this new import
-		 * command and add it to the import ref list in the "real"
-		 * command.
-		 */
-
-                refPtr = (ImportRef *) ckalloc(sizeof(ImportRef));
-                refPtr->importedCmdPtr = (Command *) importedCmd;
-                refPtr->nextPtr = cmdPtr->importRefPtr;
-                cmdPtr->importRefPtr = refPtr;
-            } else {
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		        "can't import command \"", cmdName,
-			"\": already exists", (char *) NULL);
-                return TCL_ERROR;
-            }
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ForgetImport --
- *
- *	Deletes previously imported commands. Given a pattern that may
- *	include the name of an exporting namespace, this procedure first
- *	finds all matching exported commands. It then looks in the namespace
- *	specified by namespacePtr for any corresponding previously imported
- *	commands, which it deletes. If namespacePtr is NULL, commands are
- *	deleted from the current namespace.
- *
- * Results:
- *	Returns TCL_OK if successful. If there is an error, returns
- *	TCL_ERROR and puts an error message in the interpreter's result
- *	object.
- *
- * Side effects:
- *	May delete commands. 
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ForgetImport(interp, namespacePtr, pattern)
-    Tcl_Interp *interp;		 /* Current interpreter. */
-    Tcl_Namespace *namespacePtr; /* Points to the namespace from which
-				  * previously imported commands should be
-				  * removed. NULL for current namespace. */
-    char *pattern;		 /* String pattern indicating which imported
-				  * commands to remove. This pattern should
-				  * be qualified by the name of the
-				  * namespace from which the command(s) were
-				  * imported. */
-{
-    Namespace *nsPtr, *importNsPtr, *dummyPtr, *actualCtxPtr;
-    char *simplePattern, *cmdName;
-    register Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    Command *cmdPtr;
-
-    /*
-     * If the specified namespace is NULL, use the current namespace.
-     */
-
-    if (namespacePtr == NULL) {
-        nsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    } else {
-        nsPtr = (Namespace *) namespacePtr;
-    }
-
-    /*
-     * From the pattern, find the namespace from which we are importing
-     * and get the simple pattern (no namespace qualifiers or ::'s) at
-     * the end.
-     */
-
-    TclGetNamespaceForQualName(interp, pattern, nsPtr,
-	    /*flags*/ TCL_LEAVE_ERR_MSG, &importNsPtr, &dummyPtr,
-	    &actualCtxPtr, &simplePattern);
-
-    if (importNsPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"unknown namespace in namespace forget pattern \"",
-		pattern, "\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Scan through the command table in the source namespace and look for
-     * exported commands that match the string pattern. If the current
-     * namespace has an imported command that refers to one of those real
-     * commands, delete it.
-     */
-
-    for (hPtr = Tcl_FirstHashEntry(&importNsPtr->cmdTable, &search);
-            (hPtr != NULL);
-            hPtr = Tcl_NextHashEntry(&search)) {
-        cmdName = Tcl_GetHashKey(&importNsPtr->cmdTable, hPtr);
-        if (Tcl_StringMatch(cmdName, simplePattern)) {
-            hPtr = Tcl_FindHashEntry(&nsPtr->cmdTable, cmdName);
-            if (hPtr != NULL) {	/* cmd of same name in current namespace */
-                cmdPtr = (Command *) Tcl_GetHashValue(hPtr);
-                if (cmdPtr->deleteProc == DeleteImportedCmd) { 
-                    Tcl_DeleteCommandFromToken(interp, (Tcl_Command) cmdPtr);
-                }
-            }
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetOriginalCommand --
- *
- *	An imported command is created in an namespace when it imports a
- *	"real" command from another namespace. If the specified command is a
- *	imported command, this procedure returns the original command it
- *	refers to.  
- *
- * Results:
- *	If the command was imported into a sequence of namespaces a, b,...,n
- *	where each successive namespace just imports the command from the
- *	previous namespace, this procedure returns the Tcl_Command token in
- *	the first namespace, a. Otherwise, if the specified command is not
- *	an imported command, the procedure returns NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-TclGetOriginalCommand(command)
-    Tcl_Command command;	/* The command for which the original
-				 * command should be returned. */
-{
-    register Command *cmdPtr = (Command *) command;
-    ImportedCmdData *dataPtr;
-
-    if (cmdPtr->deleteProc != DeleteImportedCmd) {
-	return (Tcl_Command) NULL;
-    }
-    
-    while (cmdPtr->deleteProc == DeleteImportedCmd) {
-	dataPtr = (ImportedCmdData *) cmdPtr->objClientData;
-	cmdPtr = dataPtr->realCmdPtr;
-    }
-    return (Tcl_Command) cmdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InvokeImportedCmd --
- *
- *	Invoked by Tcl whenever the user calls an imported command that
- *	was created by Tcl_Import. Finds the "real" command (in another
- *	namespace), and passes control to it.
- *
- * Results:
- *	Returns TCL_OK if successful, and  TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result object is set to an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-InvokeImportedCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Points to the imported command's
-				 * ImportedCmdData structure. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    register ImportedCmdData *dataPtr = (ImportedCmdData *) clientData;
-    register Command *realCmdPtr = dataPtr->realCmdPtr;
-
-    return (*realCmdPtr->objProc)(realCmdPtr->objClientData, interp,
-            objc, objv);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteImportedCmd --
- *
- *	Invoked by Tcl whenever an imported command is deleted. The "real"
- *	command keeps a list of all the imported commands that refer to it,
- *	so those imported commands can be deleted when the real command is
- *	deleted. This procedure removes the imported command reference from
- *	the real command's list, and frees up the memory associated with
- *	the imported command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the imported command from the real command's import list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteImportedCmd(clientData)
-    ClientData clientData;	/* Points to the imported command's
-				 * ImportedCmdData structure. */
-{
-    ImportedCmdData *dataPtr = (ImportedCmdData *) clientData;
-    Command *realCmdPtr = dataPtr->realCmdPtr;
-    Command *selfPtr = dataPtr->selfPtr;
-    register ImportRef *refPtr, *prevPtr;
-
-    prevPtr = NULL;
-    for (refPtr = realCmdPtr->importRefPtr;  refPtr != NULL;
-            refPtr = refPtr->nextPtr) {
-	if (refPtr->importedCmdPtr == selfPtr) {
-	    /*
-	     * Remove *refPtr from real command's list of imported commands
-	     * that refer to it.
-	     */
-	    
-	    if (prevPtr == NULL) { /* refPtr is first in list */
-		realCmdPtr->importRefPtr = refPtr->nextPtr;
-	    } else {
-		prevPtr->nextPtr = refPtr->nextPtr;
-	    }
-	    ckfree((char *) refPtr);
-	    ckfree((char *) dataPtr);
-	    return;
-	}
-	prevPtr = refPtr;
-    }
-	
-    panic("DeleteImportedCmd: did not find cmd in real cmd's list of import references");
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetNamespaceForQualName --
- *
- *	Given a qualified name specifying a command, variable, or namespace,
- *	and a namespace in which to resolve the name, this procedure returns
- *	a pointer to the namespace that contains the item. A qualified name
- *	consists of the "simple" name of an item qualified by the names of
- *	an arbitrary number of containing namespace separated by "::"s. If
- *	the qualified name starts with "::", it is interpreted absolutely
- *	from the global namespace. Otherwise, it is interpreted relative to
- *	the namespace specified by cxtNsPtr if it is non-NULL. If cxtNsPtr
- *	is NULL, the name is interpreted relative to the current namespace.
- *
- *	A relative name like "foo::bar::x" can be found starting in either
- *	the current namespace or in the global namespace. So each search
- *	usually follows two tracks, and two possible namespaces are
- *	returned. If the procedure sets either *nsPtrPtr or *altNsPtrPtr to
- *	NULL, then that path failed.
- *
- *	If "flags" contains TCL_GLOBAL_ONLY, the relative qualified name is
- *	sought only in the global :: namespace. The alternate search
- *	(also) starting from the global namespace is ignored and
- *	*altNsPtrPtr is set NULL. 
- *
- *	If "flags" contains TCL_NAMESPACE_ONLY, the relative qualified
- *	name is sought only in the namespace specified by cxtNsPtr. The
- *	alternate search starting from the global namespace is ignored and
- *	*altNsPtrPtr is set NULL. If both TCL_GLOBAL_ONLY and
- *	TCL_NAMESPACE_ONLY are specified, TCL_GLOBAL_ONLY is ignored and
- *	the search starts from the namespace specified by cxtNsPtr.
- *
- *	If "flags" contains CREATE_NS_IF_UNKNOWN, all namespace
- *	components of the qualified name that cannot be found are
- *	automatically created within their specified parent. This makes sure
- *	that functions like Tcl_CreateCommand always succeed. There is no
- *	alternate search path, so *altNsPtrPtr is set NULL.
- *
- *	If "flags" contains FIND_ONLY_NS, the qualified name is treated as a
- *	reference to a namespace, and the entire qualified name is
- *	followed. If the name is relative, the namespace is looked up only
- *	in the current namespace. A pointer to the namespace is stored in
- *	*nsPtrPtr and NULL is stored in *simpleNamePtr. Otherwise, if
- *	FIND_ONLY_NS is not specified, only the leading components are
- *	treated as namespace names, and a pointer to the simple name of the
- *	final component is stored in *simpleNamePtr.
- *
- * Results:
- *	It sets *nsPtrPtr and *altNsPtrPtr to point to the two possible
- *	namespaces which represent the last (containing) namespace in the
- *	qualified name. If the procedure sets either *nsPtrPtr or *altNsPtrPtr
- *	to NULL, then the search along that path failed.  The procedure also
- *	stores a pointer to the simple name of the final component in
- *	*simpleNamePtr. If the qualified name is "::" or was treated as a
- *	namespace reference (FIND_ONLY_NS), the procedure stores a pointer
- *	to the namespace in *nsPtrPtr, NULL in *altNsPtrPtr, and sets
- *	*simpleNamePtr to point to an empty string.
- *
- *	If there is an error, this procedure returns TCL_ERROR. If "flags"
- *	contains TCL_LEAVE_ERR_MSG, an error message is returned in the
- *	interpreter's result object. Otherwise, the interpreter's result
- *	object is left unchanged.
- *
- *	*actualCxtPtrPtr is set to the actual context namespace. It is
- *	set to the input context namespace pointer in cxtNsPtr. If cxtNsPtr
- *	is NULL, it is set to the current namespace context.
- *
- *	For backwards compatibility with the TclPro byte code loader,
- *	this function always returns TCL_OK.
- *
- * Side effects:
- *	If "flags" contains CREATE_NS_IF_UNKNOWN, new namespaces may be
- *	created.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
-	nsPtrPtr, altNsPtrPtr, actualCxtPtrPtr, simpleNamePtr)
-    Tcl_Interp *interp;		 /* Interpreter in which to find the
-				  * namespace containing qualName. */
-    register char *qualName;	 /* A namespace-qualified name of an
-				  * command, variable, or namespace. */
-    Namespace *cxtNsPtr;	 /* The namespace in which to start the
-				  * search for qualName's namespace. If NULL
-				  * start from the current namespace.
-				  * Ignored if TCL_GLOBAL_ONLY or
-				  * TCL_NAMESPACE_ONLY are set. */
-    int flags;			 /* Flags controlling the search: an OR'd
-				  * combination of TCL_GLOBAL_ONLY,
-				  * TCL_NAMESPACE_ONLY,
-				  * CREATE_NS_IF_UNKNOWN, and
-				  * FIND_ONLY_NS. */
-    Namespace **nsPtrPtr;	 /* Address where procedure stores a pointer
-				  * to containing namespace if qualName is
-				  * found starting from *cxtNsPtr or, if
-				  * TCL_GLOBAL_ONLY is set, if qualName is
-				  * found in the global :: namespace. NULL
-				  * is stored otherwise. */
-    Namespace **altNsPtrPtr;	 /* Address where procedure stores a pointer
-				  * to containing namespace if qualName is
-				  * found starting from the global ::
-				  * namespace. NULL is stored if qualName
-				  * isn't found starting from :: or if the
-				  * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
-				  * CREATE_NS_IF_UNKNOWN, FIND_ONLY_NS flag
-				  * is set. */
-    Namespace **actualCxtPtrPtr; /* Address where procedure stores a pointer
-				  * to the actual namespace from which the
-				  * search started. This is either cxtNsPtr,
-				  * the :: namespace if TCL_GLOBAL_ONLY was
-				  * specified, or the current namespace if
-				  * cxtNsPtr was NULL. */
-    char **simpleNamePtr;	 /* Address where procedure stores the
-				  * simple name at end of the qualName, or
-				  * NULL if qualName is "::" or the flag
-				  * FIND_ONLY_NS was specified. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Namespace *nsPtr = cxtNsPtr;
-    Namespace *altNsPtr;
-    Namespace *globalNsPtr = iPtr->globalNsPtr;
-    register char *start, *end;
-    char *nsName;
-    Tcl_HashEntry *entryPtr;
-    Tcl_DString buffer;
-    int len;
-
-    /*
-     * Determine the context namespace nsPtr in which to start the primary
-     * search. If TCL_NAMESPACE_ONLY or FIND_ONLY_NS was specified, search
-     * from the current namespace. If the qualName name starts with a "::"
-     * or TCL_GLOBAL_ONLY was specified, search from the global
-     * namespace. Otherwise, use the given namespace given in cxtNsPtr, or
-     * if that is NULL, use the current namespace context. Note that we
-     * always treat two or more adjacent ":"s as a namespace separator.
-     */
-
-    if (flags & (TCL_NAMESPACE_ONLY | FIND_ONLY_NS)) {
-	nsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    } else if (flags & TCL_GLOBAL_ONLY) {
-	nsPtr = globalNsPtr;
-    } else if (nsPtr == NULL) {
-	if (iPtr->varFramePtr != NULL) {
-	    nsPtr = iPtr->varFramePtr->nsPtr;
-	} else {
-	    nsPtr = iPtr->globalNsPtr;
-	}
-    }
-
-    start = qualName;		/* pts to start of qualifying namespace */
-    if ((*qualName == ':') && (*(qualName+1) == ':')) {
-	start = qualName+2;	/* skip over the initial :: */
-	while (*start == ':') {
-            start++;		/* skip over a subsequent : */
-	}
-        nsPtr = globalNsPtr;
-        if (*start == '\0') {	/* qualName is just two or more ":"s */
-            *nsPtrPtr        = globalNsPtr;
-            *altNsPtrPtr     = NULL;
-	    *actualCxtPtrPtr = globalNsPtr;
-            *simpleNamePtr   = start; /* points to empty string */
-            return TCL_OK;
-        }
-    }
-    *actualCxtPtrPtr = nsPtr;
-
-    /*
-     * Start an alternate search path starting with the global namespace.
-     * However, if the starting context is the global namespace, or if the
-     * flag is set to search only the namespace *cxtNsPtr, ignore the
-     * alternate search path.
-     */
-
-    altNsPtr = globalNsPtr;
-    if ((nsPtr == globalNsPtr)
-	    || (flags & (TCL_NAMESPACE_ONLY | FIND_ONLY_NS))) {
-        altNsPtr = NULL;
-    }
-
-    /*
-     * Loop to resolve each namespace qualifier in qualName.
-     */
-
-    Tcl_DStringInit(&buffer);
-    end = start;
-    while (*start != '\0') {
-        /*
-         * Find the next namespace qualifier (i.e., a name ending in "::")
-	 * or the end of the qualified name  (i.e., a name ending in "\0").
-	 * Set len to the number of characters, starting from start,
-	 * in the name; set end to point after the "::"s or at the "\0".
-         */
-
-	len = 0;
-        for (end = start;  *end != '\0';  end++) {
-	    if ((*end == ':') && (*(end+1) == ':')) {
-		end += 2;	/* skip over the initial :: */
-		while (*end == ':') {
-		    end++;	/* skip over the subsequent : */
-		}
-		break;		/* exit for loop; end is after ::'s */
-	    }
-            len++;
-	}
-
-	if ((*end == '\0')
-	        && !((end-start >= 2) && (*(end-1) == ':') && (*(end-2) == ':'))) {
-	    /*
-	     * qualName ended with a simple name at start. If FIND_ONLY_NS
-	     * was specified, look this up as a namespace. Otherwise,
-	     * start is the name of a cmd or var and we are done.
-	     */
-	    
-	    if (flags & FIND_ONLY_NS) {
-		nsName = start;
-	    } else {
-		*nsPtrPtr      = nsPtr;
-		*altNsPtrPtr   = altNsPtr;
-		*simpleNamePtr = start;
-		Tcl_DStringFree(&buffer);
-		return TCL_OK;
-	    }
-	} else {
-	    /*
-	     * start points to the beginning of a namespace qualifier ending
-	     * in "::". end points to the start of a name in that namespace
-	     * that might be empty. Copy the namespace qualifier to a
-	     * buffer so it can be null terminated. We can't modify the
-	     * incoming qualName since it may be a string constant.
-	     */
-
-	    Tcl_DStringSetLength(&buffer, 0);
-            Tcl_DStringAppend(&buffer, start, len);
-            nsName = Tcl_DStringValue(&buffer);
-        }
-
-        /*
-	 * Look up the namespace qualifier nsName in the current namespace
-         * context. If it isn't found but CREATE_NS_IF_UNKNOWN is set,
-         * create that qualifying namespace. This is needed for procedures
-         * like Tcl_CreateCommand that cannot fail.
-	 */
-
-        if (nsPtr != NULL) {
-            entryPtr = Tcl_FindHashEntry(&nsPtr->childTable, nsName);
-            if (entryPtr != NULL) {
-                nsPtr = (Namespace *) Tcl_GetHashValue(entryPtr);
-            } else if (flags & CREATE_NS_IF_UNKNOWN) {
-		Tcl_CallFrame frame;
-		
-		(void) Tcl_PushCallFrame(interp, &frame,
-		        (Tcl_Namespace *) nsPtr, /*isProcCallFrame*/ 0);
-
-                nsPtr = (Namespace *) Tcl_CreateNamespace(interp, nsName,
-		        (ClientData) NULL, (Tcl_NamespaceDeleteProc *) NULL);
-                Tcl_PopCallFrame(interp);
-
-                if (nsPtr == NULL) {
-                    panic("Could not create namespace '%s'", nsName);
-                }
-            } else {		/* namespace not found and wasn't created */
-                nsPtr = NULL;
-            }
-        }
-
-        /*
-         * Look up the namespace qualifier in the alternate search path too.
-         */
-
-        if (altNsPtr != NULL) {
-            entryPtr = Tcl_FindHashEntry(&altNsPtr->childTable, nsName);
-            if (entryPtr != NULL) {
-                altNsPtr = (Namespace *) Tcl_GetHashValue(entryPtr);
-            } else {
-                altNsPtr = NULL;
-            }
-        }
-
-        /*
-         * If both search paths have failed, return NULL results.
-         */
-
-        if ((nsPtr == NULL) && (altNsPtr == NULL)) {
-            *nsPtrPtr      = NULL;
-            *altNsPtrPtr   = NULL;
-            *simpleNamePtr = NULL;
-            Tcl_DStringFree(&buffer);
-            return TCL_OK;
-        }
-
-	start = end;
-    }
-
-    /*
-     * We ignore trailing "::"s in a namespace name, but in a command or
-     * variable name, trailing "::"s refer to the cmd or var named {}.
-     */
-
-    if ((flags & FIND_ONLY_NS)
-	    || ((end > start ) && (*(end-1) != ':'))) {
-	*simpleNamePtr = NULL; /* found namespace name */
-    } else {
-	*simpleNamePtr = end;  /* found cmd/var: points to empty string */
-    }
-
-    /*
-     * As a special case, if we are looking for a namespace and qualName
-     * is "" and the current active namespace (nsPtr) is not the global
-     * namespace, return NULL (no namespace was found). This is because
-     * namespaces can not have empty names except for the global namespace.
-     */
-
-    if ((flags & FIND_ONLY_NS) && (*qualName == '\0')
-	    && (nsPtr != globalNsPtr)) {
-	nsPtr = NULL;
-    }
-
-    *nsPtrPtr    = nsPtr;
-    *altNsPtrPtr = altNsPtr;
-    Tcl_DStringFree(&buffer);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FindNamespace --
- *
- *	Searches for a namespace.
- *
- * Results:
- *	Returns a pointer to the namespace if it is found. Otherwise,
- *	returns NULL and leaves an error message in the interpreter's
- *	result object if "flags" contains TCL_LEAVE_ERR_MSG.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Namespace *
-Tcl_FindNamespace(interp, name, contextNsPtr, flags)
-    Tcl_Interp *interp;		 /* The interpreter in which to find the
-				  * namespace. */
-    char *name;			 /* Namespace name. If it starts with "::",
-				  * will be looked up in global namespace.
-				  * Else, looked up first in contextNsPtr
-				  * (current namespace if contextNsPtr is
-				  * NULL), then in global namespace. */
-    Tcl_Namespace *contextNsPtr; /* Ignored if TCL_GLOBAL_ONLY flag is set
-				  * or if the name starts with "::".
-				  * Otherwise, points to namespace in which
-				  * to resolve name; if NULL, look up name
-				  * in the current namespace. */
-    register int flags;		 /* Flags controlling namespace lookup: an
-				  * OR'd combination of TCL_GLOBAL_ONLY and
-				  * TCL_LEAVE_ERR_MSG flags. */
-{
-    Namespace *nsPtr, *dummy1Ptr, *dummy2Ptr;
-    char *dummy;
-
-    /*
-     * Find the namespace(s) that contain the specified namespace name.
-     * Add the FIND_ONLY_NS flag to resolve the name all the way down
-     * to its last component, a namespace.
-     */
-
-    TclGetNamespaceForQualName(interp, name, (Namespace *) contextNsPtr,
-	    (flags | FIND_ONLY_NS), &nsPtr, &dummy1Ptr, &dummy2Ptr, &dummy);
-    
-    if (nsPtr != NULL) {
-       return (Tcl_Namespace *) nsPtr;
-    } else if (flags & TCL_LEAVE_ERR_MSG) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "unknown namespace \"", name, "\"", (char *) NULL);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FindCommand --
- *
- *	Searches for a command.
- *
- * Results:
- *	Returns a token for the command if it is found. Otherwise, if it
- *	can't be found or there is an error, returns NULL and leaves an
- *	error message in the interpreter's result object if "flags"
- *	contains TCL_LEAVE_ERR_MSG.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Command
-Tcl_FindCommand(interp, name, contextNsPtr, flags)
-    Tcl_Interp *interp;         /* The interpreter in which to find the
-				  * command and to report errors. */
-    char *name;		         /* Command's name. If it starts with "::",
-				  * will be looked up in global namespace.
-				  * Else, looked up first in contextNsPtr
-				  * (current namespace if contextNsPtr is
-				  * NULL), then in global namespace. */
-    Tcl_Namespace *contextNsPtr; /* Ignored if TCL_GLOBAL_ONLY flag set.
-				  * Otherwise, points to namespace in which
-				  * to resolve name. If NULL, look up name
-				  * in the current namespace. */
-    int flags;                   /* An OR'd combination of flags:
-				  * TCL_GLOBAL_ONLY (look up name only in
-				  * global namespace), TCL_NAMESPACE_ONLY
-				  * (look up only in contextNsPtr, or the
-				  * current namespace if contextNsPtr is
-				  * NULL), and TCL_LEAVE_ERR_MSG. If both
-				  * TCL_GLOBAL_ONLY and TCL_NAMESPACE_ONLY
-				  * are given, TCL_GLOBAL_ONLY is
-				  * ignored. */
-{
-    Interp *iPtr = (Interp*)interp;
-
-    ResolverScheme *resPtr;
-    Namespace *nsPtr[2], *cxtNsPtr;
-    char *simpleName;
-    register Tcl_HashEntry *entryPtr;
-    register Command *cmdPtr;
-    register int search;
-    int result;
-    Tcl_Command cmd;
-
-    /*
-     * If this namespace has a command resolver, then give it first
-     * crack at the command resolution.  If the interpreter has any
-     * command resolvers, consult them next.  The command resolver
-     * procedures may return a Tcl_Command value, they may signal
-     * to continue onward, or they may signal an error.
-     */
-    if ((flags & TCL_GLOBAL_ONLY) != 0) {
-        cxtNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    }
-    else if (contextNsPtr != NULL) {
-        cxtNsPtr = (Namespace *) contextNsPtr;
-    }
-    else {
-        cxtNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    }
-
-    if (cxtNsPtr->cmdResProc != NULL || iPtr->resolverPtr != NULL) {
-        resPtr = iPtr->resolverPtr;
-
-        if (cxtNsPtr->cmdResProc) {
-            result = (*cxtNsPtr->cmdResProc)(interp, name,
-                (Tcl_Namespace *) cxtNsPtr, flags, &cmd);
-        } else {
-            result = TCL_CONTINUE;
-        }
-
-        while (result == TCL_CONTINUE && resPtr) {
-            if (resPtr->cmdResProc) {
-                result = (*resPtr->cmdResProc)(interp, name,
-                    (Tcl_Namespace *) cxtNsPtr, flags, &cmd);
-            }
-            resPtr = resPtr->nextPtr;
-        }
-
-        if (result == TCL_OK) {
-            return cmd;
-        }
-        else if (result != TCL_CONTINUE) {
-            return (Tcl_Command) NULL;
-        }
-    }
-
-    /*
-     * Find the namespace(s) that contain the command.
-     */
-
-    TclGetNamespaceForQualName(interp, name, (Namespace *) contextNsPtr,
-	    flags, &nsPtr[0], &nsPtr[1], &cxtNsPtr, &simpleName);
-
-    /*
-     * Look for the command in the command table of its namespace.
-     * Be sure to check both possible search paths: from the specified
-     * namespace context and from the global namespace.
-     */
-
-    cmdPtr = NULL;
-    for (search = 0;  (search < 2) && (cmdPtr == NULL);  search++) {
-        if ((nsPtr[search] != NULL) && (simpleName != NULL)) {
-	    entryPtr = Tcl_FindHashEntry(&nsPtr[search]->cmdTable,
-		    simpleName);
-            if (entryPtr != NULL) {
-                cmdPtr = (Command *) Tcl_GetHashValue(entryPtr);
-            }
-        }
-    }
-    if (cmdPtr != NULL) {
-        return (Tcl_Command) cmdPtr;
-    } else if (flags & TCL_LEAVE_ERR_MSG) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "unknown command \"", name, "\"", (char *) NULL);
-    }
-
-    return (Tcl_Command) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FindNamespaceVar --
- *
- *	Searches for a namespace variable, a variable not local to a
- *	procedure. The variable can be either a scalar or an array, but
- *	may not be an element of an array.
- *
- * Results:
- *	Returns a token for the variable if it is found. Otherwise, if it
- *	can't be found or there is an error, returns NULL and leaves an
- *	error message in the interpreter's result object if "flags"
- *	contains TCL_LEAVE_ERR_MSG.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Var
-Tcl_FindNamespaceVar(interp, name, contextNsPtr, flags)
-    Tcl_Interp *interp;		 /* The interpreter in which to find the
-				  * variable. */
-    char *name;			 /* Variable's name. If it starts with "::",
-				  * will be looked up in global namespace.
-				  * Else, looked up first in contextNsPtr
-				  * (current namespace if contextNsPtr is
-				  * NULL), then in global namespace. */
-    Tcl_Namespace *contextNsPtr; /* Ignored if TCL_GLOBAL_ONLY flag set.
-				  * Otherwise, points to namespace in which
-				  * to resolve name. If NULL, look up name
-				  * in the current namespace. */
-    int flags;			 /* An OR'd combination of flags:
-				  * TCL_GLOBAL_ONLY (look up name only in
-				  * global namespace), TCL_NAMESPACE_ONLY
-				  * (look up only in contextNsPtr, or the
-				  * current namespace if contextNsPtr is
-				  * NULL), and TCL_LEAVE_ERR_MSG. If both
-				  * TCL_GLOBAL_ONLY and TCL_NAMESPACE_ONLY
-				  * are given, TCL_GLOBAL_ONLY is
-				  * ignored. */
-{
-    Interp *iPtr = (Interp*)interp;
-    ResolverScheme *resPtr;
-    Namespace *nsPtr[2], *cxtNsPtr;
-    char *simpleName;
-    Tcl_HashEntry *entryPtr;
-    Var *varPtr;
-    register int search;
-    int result;
-    Tcl_Var var;
-
-    /*
-     * If this namespace has a variable resolver, then give it first
-     * crack at the variable resolution.  It may return a Tcl_Var
-     * value, it may signal to continue onward, or it may signal
-     * an error.
-     */
-    if ((flags & TCL_GLOBAL_ONLY) != 0) {
-        cxtNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    }
-    else if (contextNsPtr != NULL) {
-        cxtNsPtr = (Namespace *) contextNsPtr;
-    }
-    else {
-        cxtNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    }
-
-    if (cxtNsPtr->varResProc != NULL || iPtr->resolverPtr != NULL) {
-        resPtr = iPtr->resolverPtr;
-
-        if (cxtNsPtr->varResProc) {
-            result = (*cxtNsPtr->varResProc)(interp, name,
-                (Tcl_Namespace *) cxtNsPtr, flags, &var);
-        } else {
-            result = TCL_CONTINUE;
-        }
-
-        while (result == TCL_CONTINUE && resPtr) {
-            if (resPtr->varResProc) {
-                result = (*resPtr->varResProc)(interp, name,
-                    (Tcl_Namespace *) cxtNsPtr, flags, &var);
-            }
-            resPtr = resPtr->nextPtr;
-        }
-
-        if (result == TCL_OK) {
-            return var;
-        }
-        else if (result != TCL_CONTINUE) {
-            return (Tcl_Var) NULL;
-        }
-    }
-
-    /*
-     * Find the namespace(s) that contain the variable.
-     */
-
-    TclGetNamespaceForQualName(interp, name, (Namespace *) contextNsPtr,
-	    flags, &nsPtr[0], &nsPtr[1], &cxtNsPtr, &simpleName);
-
-    /*
-     * Look for the variable in the variable table of its namespace.
-     * Be sure to check both possible search paths: from the specified
-     * namespace context and from the global namespace.
-     */
-
-    varPtr = NULL;
-    for (search = 0;  (search < 2) && (varPtr == NULL);  search++) {
-        if ((nsPtr[search] != NULL) && (simpleName != NULL)) {
-            entryPtr = Tcl_FindHashEntry(&nsPtr[search]->varTable,
-		    simpleName);
-            if (entryPtr != NULL) {
-                varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-            }
-        }
-    }
-    if (varPtr != NULL) {
-	return (Tcl_Var) varPtr;
-    } else if (flags & TCL_LEAVE_ERR_MSG) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                "unknown variable \"", name, "\"", (char *) NULL);
-    }
-    return (Tcl_Var) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclResetShadowedCmdRefs --
- *
- *	Called when a command is added to a namespace to check for existing
- *	command references that the new command may invalidate. Consider the
- *	following cases that could happen when you add a command "foo" to a
- *	namespace "b":
- *	   1. It could shadow a command named "foo" at the global scope.
- *	      If it does, all command references in the namespace "b" are
- *	      suspect.
- *	   2. Suppose the namespace "b" resides in a namespace "a".
- *	      Then to "a" the new command "b::foo" could shadow another
- *	      command "b::foo" in the global namespace. If so, then all
- *	      command references in "a" are suspect.
- *	The same checks are applied to all parent namespaces, until we
- *	reach the global :: namespace.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If the new command shadows an existing command, the cmdRefEpoch
- *	counter is incremented in each namespace that sees the shadow.
- *	This invalidates all command references that were previously cached
- *	in that namespace. The next time the commands are used, they are
- *	resolved from scratch.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclResetShadowedCmdRefs(interp, newCmdPtr)
-    Tcl_Interp *interp;	       /* Interpreter containing the new command. */
-    Command *newCmdPtr;	       /* Points to the new command. */
-{
-    char *cmdName;
-    Tcl_HashEntry *hPtr;
-    register Namespace *nsPtr;
-    Namespace *trailNsPtr, *shadowNsPtr;
-    Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    int found, i;
-
-    /*
-     * This procedure generates an array used to hold the trail list. This
-     * starts out with stack-allocated space but uses dynamically-allocated
-     * storage if needed.
-     */
-
-    Namespace *(trailStorage[NUM_TRAIL_ELEMS]);
-    Namespace **trailPtr = trailStorage;
-    int trailFront = -1;
-    int trailSize = NUM_TRAIL_ELEMS;
-
-    /*
-     * Start at the namespace containing the new command, and work up
-     * through the list of parents. Stop just before the global namespace,
-     * since the global namespace can't "shadow" its own entries.
-     *
-     * The namespace "trail" list we build consists of the names of each
-     * namespace that encloses the new command, in order from outermost to
-     * innermost: for example, "a" then "b". Each iteration of this loop
-     * eventually extends the trail upwards by one namespace, nsPtr. We use
-     * this trail list to see if nsPtr (e.g. "a" in 2. above) could have
-     * now-invalid cached command references. This will happen if nsPtr
-     * (e.g. "a") contains a sequence of child namespaces (e.g. "b")
-     * such that there is a identically-named sequence of child namespaces
-     * starting from :: (e.g. "::b") whose tail namespace contains a command
-     * also named cmdName.
-     */
-
-    cmdName = Tcl_GetHashKey(newCmdPtr->hPtr->tablePtr, newCmdPtr->hPtr);
-    for (nsPtr = newCmdPtr->nsPtr;
-	    (nsPtr != NULL) && (nsPtr != globalNsPtr);
-            nsPtr = nsPtr->parentPtr) {
-        /*
-	 * Find the maximal sequence of child namespaces contained in nsPtr
-	 * such that there is a identically-named sequence of child
-	 * namespaces starting from ::. shadowNsPtr will be the tail of this
-	 * sequence, or the deepest namespace under :: that might contain a
-	 * command now shadowed by cmdName. We check below if shadowNsPtr
-	 * actually contains a command cmdName.
-	 */
-
-        found = 1;
-        shadowNsPtr = globalNsPtr;
-
-        for (i = trailFront;  i >= 0;  i--) {
-            trailNsPtr = trailPtr[i];
-            hPtr = Tcl_FindHashEntry(&shadowNsPtr->childTable,
-		    trailNsPtr->name);
-            if (hPtr != NULL) {
-                shadowNsPtr = (Namespace *) Tcl_GetHashValue(hPtr);
-            } else {
-                found = 0;
-                break;
-            }
-        }
-
-        /*
-	 * If shadowNsPtr contains a command named cmdName, we invalidate
-         * all of the command refs cached in nsPtr. As a boundary case,
-	 * shadowNsPtr is initially :: and we check for case 1. above.
-	 */
-
-        if (found) {
-            hPtr = Tcl_FindHashEntry(&shadowNsPtr->cmdTable, cmdName);
-            if (hPtr != NULL) {
-                nsPtr->cmdRefEpoch++;
-            }
-        }
-
-        /*
-	 * Insert nsPtr at the front of the trail list: i.e., at the end
-	 * of the trailPtr array.
-	 */
-
-	trailFront++;
-	if (trailFront == trailSize) {
-	    size_t currBytes = trailSize * sizeof(Namespace *);
-	    int newSize = 2*trailSize;
-	    size_t newBytes = newSize * sizeof(Namespace *);
-	    Namespace **newPtr =
-		    (Namespace **) ckalloc((unsigned) newBytes);
-	    
-	    memcpy((VOID *) newPtr, (VOID *) trailPtr, currBytes);
-	    if (trailPtr != trailStorage) {
-		ckfree((char *) trailPtr);
-	    }
-	    trailPtr = newPtr;
-	    trailSize = newSize;
-	}
-	trailPtr[trailFront] = nsPtr;
-    }
-
-    /*
-     * Free any allocated storage.
-     */
-    
-    if (trailPtr != trailStorage) {
-	ckfree((char *) trailPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetNamespaceFromObj --
- *
- *	Returns the namespace specified by the name in a Tcl_Obj.
- *
- * Results:
- *	Returns TCL_OK if the namespace was resolved successfully, and
- *	stores a pointer to the namespace in the location specified by
- *	nsPtrPtr. If the namespace can't be found, the procedure stores
- *	NULL in *nsPtrPtr and returns TCL_OK. If anything else goes wrong,
- *	this procedure returns TCL_ERROR.
- *
- * Side effects:
- *	May update the internal representation for the object, caching the
- *	namespace reference. The next time this procedure is called, the
- *	namespace value can be found quickly.
- *
- *	If anything goes wrong, an error message is left in the
- *	interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetNamespaceFromObj(interp, objPtr, nsPtrPtr)
-    Tcl_Interp *interp;		/* The current interpreter. */
-    Tcl_Obj *objPtr;		/* The object to be resolved as the name
-				 * of a namespace. */
-    Tcl_Namespace **nsPtrPtr;	/* Result namespace pointer goes here. */
-{
-    register ResolvedNsName *resNamePtr;
-    register Namespace *nsPtr;
-    Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    int result;
-
-    /*
-     * Get the internal representation, converting to a namespace type if
-     * needed. The internal representation is a ResolvedNsName that points
-     * to the actual namespace.
-     */
-
-    if (objPtr->typePtr != &tclNsNameType) {
-        result = tclNsNameType.setFromAnyProc(interp, objPtr);
-        if (result != TCL_OK) {
-            return TCL_ERROR;
-        }
-    }
-    resNamePtr = (ResolvedNsName *) objPtr->internalRep.otherValuePtr;
-
-    /*
-     * Check the context namespace of the resolved symbol to make sure that
-     * it is fresh. If not, then force another conversion to the namespace
-     * type, to discard the old rep and create a new one. Note that we
-     * verify that the namespace id of the cached namespace is the same as
-     * the id when we cached it; this insures that the namespace wasn't
-     * deleted and a new one created at the same address.
-     */
-
-    nsPtr = NULL;
-    if ((resNamePtr != NULL)
-	    && (resNamePtr->refNsPtr == currNsPtr)
-	    && (resNamePtr->nsId == resNamePtr->nsPtr->nsId)) {
-        nsPtr = resNamePtr->nsPtr;
-	if (nsPtr->flags & NS_DEAD) {
-	    nsPtr = NULL;
-	}
-    }
-    if (nsPtr == NULL) {	/* try again */
-        result = tclNsNameType.setFromAnyProc(interp, objPtr);
-        if (result != TCL_OK) {
-            return TCL_ERROR;
-        }
-        resNamePtr = (ResolvedNsName *) objPtr->internalRep.otherValuePtr;
-        if (resNamePtr != NULL) {
-            nsPtr = resNamePtr->nsPtr;
-            if (nsPtr->flags & NS_DEAD) {
-                nsPtr = NULL;
-            }
-        }
-    }
-    *nsPtrPtr = (Tcl_Namespace *) nsPtr;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NamespaceObjCmd --
- *
- *	Invoked to implement the "namespace" command that creates, deletes,
- *	or manipulates Tcl namespaces. Handles the following syntax:
- *
- *	    namespace children ?name? ?pattern?
- *	    namespace code arg
- *	    namespace current
- *	    namespace delete ?name name...?
- *	    namespace eval name arg ?arg...?
- *	    namespace export ?-clear? ?pattern pattern...?
- *	    namespace forget ?pattern pattern...?
- *	    namespace import ?-force? ?pattern pattern...?
- *	    namespace inscope name arg ?arg...?
- *	    namespace origin name
- *	    namespace parent ?name?
- *	    namespace qualifiers string
- *	    namespace tail string
- *	    namespace which ?-command? ?-variable? name
- *
- * Results:
- *	Returns TCL_OK if the command is successful. Returns TCL_ERROR if
- *	anything goes wrong.
- *
- * Side effects:
- *	Based on the subcommand name (e.g., "import"), this procedure
- *	dispatches to a corresponding procedure NamespaceXXXCmd defined
- *	statically in this file. This procedure's side effects depend on
- *	whatever that subcommand procedure does. If there is an error, this
- *	procedure returns an error message in the interpreter's result
- *	object. Otherwise it may return a result in the interpreter's result
- *	object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_NamespaceObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;		/* Arbitrary value passed to cmd. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    register int objc;			/* Number of arguments. */
-    register Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    static char *subCmds[] = {
-            "children", "code", "current", "delete",
-	    "eval", "export", "forget", "import",
-	    "inscope", "origin", "parent", "qualifiers",
-	    "tail", "which", (char *) NULL};
-    enum NSSubCmdIdx {
-	    NSChildrenIdx, NSCodeIdx, NSCurrentIdx, NSDeleteIdx,
-	    NSEvalIdx, NSExportIdx, NSForgetIdx, NSImportIdx,
-	    NSInscopeIdx, NSOriginIdx, NSParentIdx, NSQualifiersIdx,
-	    NSTailIdx, NSWhichIdx
-    };
-    int index, result;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?arg ...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Return an index reflecting the particular subcommand.
-     */
-
-    result = Tcl_GetIndexFromObj((Tcl_Interp *) interp, objv[1], subCmds,
-	    "option", /*flags*/ 0, (int *) &index);
-    if (result != TCL_OK) {
-	return result;
-    }
-    
-    switch (index) {
-        case NSChildrenIdx:
-	    result = NamespaceChildrenCmd(clientData, interp, objc, objv);
-            break;
-        case NSCodeIdx:
-	    result = NamespaceCodeCmd(clientData, interp, objc, objv);
-            break;
-        case NSCurrentIdx:
-	    result = NamespaceCurrentCmd(clientData, interp, objc, objv);
-            break;
-        case NSDeleteIdx:
-	    result = NamespaceDeleteCmd(clientData, interp, objc, objv);
-            break;
-        case NSEvalIdx:
-	    result = NamespaceEvalCmd(clientData, interp, objc, objv);
-            break;
-        case NSExportIdx:
-	    result = NamespaceExportCmd(clientData, interp, objc, objv);
-            break;
-        case NSForgetIdx:
-	    result = NamespaceForgetCmd(clientData, interp, objc, objv);
-            break;
-        case NSImportIdx:
-	    result = NamespaceImportCmd(clientData, interp, objc, objv);
-            break;
-        case NSInscopeIdx:
-	    result = NamespaceInscopeCmd(clientData, interp, objc, objv);
-            break;
-        case NSOriginIdx:
-	    result = NamespaceOriginCmd(clientData, interp, objc, objv);
-            break;
-        case NSParentIdx:
-	    result = NamespaceParentCmd(clientData, interp, objc, objv);
-            break;
-        case NSQualifiersIdx:
-	    result = NamespaceQualifiersCmd(clientData, interp, objc, objv);
-            break;
-        case NSTailIdx:
-	    result = NamespaceTailCmd(clientData, interp, objc, objv);
-            break;
-        case NSWhichIdx:
-	    result = NamespaceWhichCmd(clientData, interp, objc, objv);
-            break;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceChildrenCmd --
- *
- *	Invoked to implement the "namespace children" command that returns a
- *	list containing the fully-qualified names of the child namespaces of
- *	a given namespace. Handles the following syntax:
- *
- *	    namespace children ?name? ?pattern?
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceChildrenCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Namespace *namespacePtr;
-    Namespace *nsPtr, *childNsPtr;
-    Namespace *globalNsPtr = (Namespace *) Tcl_GetGlobalNamespace(interp);
-    char *pattern = NULL;
-    Tcl_DString buffer;
-    register Tcl_HashEntry *entryPtr;
-    Tcl_HashSearch search;
-    Tcl_Obj *listPtr, *elemPtr;
-
-    /*
-     * Get a pointer to the specified namespace, or the current namespace.
-     */
-
-    if (objc == 2) {
-	nsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    } else if ((objc == 3) || (objc == 4)) {
-        if (GetNamespaceFromObj(interp, objv[2], &namespacePtr) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (namespacePtr == NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "unknown namespace \"", Tcl_GetString(objv[2]),
-		    "\" in namespace children command", (char *) NULL);
-            return TCL_ERROR;
-        }
-        nsPtr = (Namespace *) namespacePtr;
-    } else {
-	Tcl_WrongNumArgs(interp, 2, objv, "?name? ?pattern?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Get the glob-style pattern, if any, used to narrow the search.
-     */
-
-    Tcl_DStringInit(&buffer);
-    if (objc == 4) {
-        char *name = Tcl_GetString(objv[3]);
-	
-        if ((*name == ':') && (*(name+1) == ':')) {
-            pattern = name;
-        } else {
-            Tcl_DStringAppend(&buffer, nsPtr->fullName, -1);
-            if (nsPtr != globalNsPtr) {
-                Tcl_DStringAppend(&buffer, "::", 2);
-            }
-            Tcl_DStringAppend(&buffer, name, -1);
-            pattern = Tcl_DStringValue(&buffer);
-        }
-    }
-
-    /*
-     * Create a list containing the full names of all child namespaces
-     * whose names match the specified pattern, if any.
-     */
-
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    entryPtr = Tcl_FirstHashEntry(&nsPtr->childTable, &search);
-    while (entryPtr != NULL) {
-        childNsPtr = (Namespace *) Tcl_GetHashValue(entryPtr);
-        if ((pattern == NULL)
-	        || Tcl_StringMatch(childNsPtr->fullName, pattern)) {
-            elemPtr = Tcl_NewStringObj(childNsPtr->fullName, -1);
-            Tcl_ListObjAppendElement(interp, listPtr, elemPtr);
-        }
-        entryPtr = Tcl_NextHashEntry(&search);
-    }
-
-    Tcl_SetObjResult(interp, listPtr);
-    Tcl_DStringFree(&buffer);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceCodeCmd --
- *
- *	Invoked to implement the "namespace code" command to capture the
- *	namespace context of a command. Handles the following syntax:
- *
- *	    namespace code arg
- *
- *	Here "arg" can be a list. "namespace code arg" produces a result
- *	equivalent to that produced by the command
- *
- *	    list namespace inscope [namespace current] $arg
- *
- *	However, if "arg" is itself a scoped value starting with
- *	"namespace inscope", then the result is just "arg".
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	If anything goes wrong, this procedure returns an error
- *	message as the result in the interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceCodeCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Namespace *currNsPtr;
-    Tcl_Obj *listPtr, *objPtr;
-    register char *arg, *p;
-    int length;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 2, objv, "arg");
-        return TCL_ERROR;
-    }
-
-    /*
-     * If "arg" is already a scoped value, then return it directly.
-     */
-
-    arg = Tcl_GetStringFromObj(objv[2], &length);
-    if ((*arg == 'n') && (length > 17)
-	    && (strncmp(arg, "namespace", 9) == 0)) {
-	for (p = (arg + 9);  (*p == ' ');  p++) {
-	    /* empty body: skip over spaces */
-	}
-	if ((*p == 'i') && ((p + 7) <= (arg + length))
-	        && (strncmp(p, "inscope", 7) == 0)) {
-	    Tcl_SetObjResult(interp, objv[2]);
-	    return TCL_OK;
-	}
-    }
-
-    /*
-     * Otherwise, construct a scoped command by building a list with
-     * "namespace inscope", the full name of the current namespace, and 
-     * the argument "arg". By constructing a list, we ensure that scoped
-     * commands are interpreted properly when they are executed later,
-     * by the "namespace inscope" command.
-     */
-
-    listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    Tcl_ListObjAppendElement(interp, listPtr,
-            Tcl_NewStringObj("namespace", -1));
-    Tcl_ListObjAppendElement(interp, listPtr,
-	    Tcl_NewStringObj("inscope", -1));
-
-    currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    if (currNsPtr == (Namespace *) Tcl_GetGlobalNamespace(interp)) {
-	objPtr = Tcl_NewStringObj("::", -1);
-    } else {
-	objPtr = Tcl_NewStringObj(currNsPtr->fullName, -1);
-    }
-    Tcl_ListObjAppendElement(interp, listPtr, objPtr);
-    
-    Tcl_ListObjAppendElement(interp, listPtr, objv[2]);
-
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceCurrentCmd --
- *
- *	Invoked to implement the "namespace current" command which returns
- *	the fully-qualified name of the current namespace. Handles the
- *	following syntax:
- *
- *	    namespace current
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceCurrentCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Namespace *currNsPtr;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 2, objv, NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * The "real" name of the global namespace ("::") is the null string,
-     * but we return "::" for it as a convenience to programmers. Note that
-     * "" and "::" are treated as synonyms by the namespace code so that it
-     * is still easy to do things like:
-     *
-     *    namespace [namespace current]::bar { ... }
-     */
-
-    currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-    if (currNsPtr == (Namespace *) Tcl_GetGlobalNamespace(interp)) {
-        Tcl_AppendToObj(Tcl_GetObjResult(interp), "::", -1);
-    } else {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), currNsPtr->fullName, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceDeleteCmd --
- *
- *	Invoked to implement the "namespace delete" command to delete
- *	namespace(s). Handles the following syntax:
- *
- *	    namespace delete ?name name...?
- *
- *	Each name identifies a namespace. It may include a sequence of
- *	namespace qualifiers separated by "::"s. If a namespace is found, it
- *	is deleted: all variables and procedures contained in that namespace
- *	are deleted. If that namespace is being used on the call stack, it
- *	is kept alive (but logically deleted) until it is removed from the
- *	call stack: that is, it can no longer be referenced by name but any
- *	currently executing procedure that refers to it is allowed to do so
- *	until the procedure returns. If the namespace can't be found, this
- *	procedure returns an error. If no namespaces are specified, this
- *	command does nothing.
- *
- * Results:
- *	Returns TCL_OK if successful, and  TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Deletes the specified namespaces. If anything goes wrong, this
- *	procedure returns an error message in the interpreter's
- *	result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceDeleteCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Namespace *namespacePtr;
-    char *name;
-    register int i;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, "?name name...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Destroying one namespace may cause another to be destroyed. Break
-     * this into two passes: first check to make sure that all namespaces on
-     * the command line are valid, and report any errors.
-     */
-
-    for (i = 2;  i < objc;  i++) {
-        name = Tcl_GetString(objv[i]);
-	namespacePtr = Tcl_FindNamespace(interp, name,
-		(Tcl_Namespace *) NULL, /*flags*/ 0);
-        if (namespacePtr == NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "unknown namespace \"", Tcl_GetString(objv[i]),
-		    "\" in namespace delete command", (char *) NULL);
-            return TCL_ERROR;
-        }
-    }
-
-    /*
-     * Okay, now delete each namespace.
-     */
-
-    for (i = 2;  i < objc;  i++) {
-        name = Tcl_GetString(objv[i]);
-	namespacePtr = Tcl_FindNamespace(interp, name,
-	    (Tcl_Namespace *) NULL, /* flags */ 0);
-	if (namespacePtr) {
-            Tcl_DeleteNamespace(namespacePtr);
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceEvalCmd --
- *
- *	Invoked to implement the "namespace eval" command. Executes
- *	commands in a namespace. If the namespace does not already exist,
- *	it is created. Handles the following syntax:
- *
- *	    namespace eval name arg ?arg...?
- *
- *	If more than one arg argument is specified, the command that is
- *	executed is the result of concatenating the arguments together with
- *	a space between each argument.
- *
- * Results:
- *	Returns TCL_OK if the namespace is found and the commands are
- *	executed successfully. Returns TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns the result of the command in the interpreter's result
- *	object. If anything goes wrong, this procedure returns an error
- *	message as the result.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceEvalCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Namespace *namespacePtr;
-    Tcl_CallFrame frame;
-    Tcl_Obj *objPtr;
-    char *name;
-    int length, result;
-
-    if (objc < 4) {
-        Tcl_WrongNumArgs(interp, 2, objv, "name arg ?arg...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Try to resolve the namespace reference, caching the result in the
-     * namespace object along the way.
-     */
-
-    result = GetNamespaceFromObj(interp, objv[2], &namespacePtr);
-    if (result != TCL_OK) {
-        return result;
-    }
-
-    /*
-     * If the namespace wasn't found, try to create it.
-     */
-    
-    if (namespacePtr == NULL) {
-	name = Tcl_GetStringFromObj(objv[2], &length);
-	namespacePtr = Tcl_CreateNamespace(interp, name, (ClientData) NULL, 
-                (Tcl_NamespaceDeleteProc *) NULL);
-	if (namespacePtr == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Make the specified namespace the current namespace and evaluate
-     * the command(s).
-     */
-
-    result = Tcl_PushCallFrame(interp, &frame, namespacePtr,
-	    /*isProcCallFrame*/ 0);
-    if (result != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    if (objc == 4) {
-        result = Tcl_EvalObjEx(interp, objv[3], 0);
-    } else {
-        objPtr = Tcl_ConcatObj(objc-3, objv+3);
-
-	/* 
-	 * Tcl_EvalObj will delete the object when it decrements its
-	 * refcount after eval'ing it.
-	 */
-
-        result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_DIRECT);
-    }
-    if (result == TCL_ERROR) {
-        char msg[256 + TCL_INTEGER_SPACE];
-	
-        sprintf(msg, "\n    (in namespace eval \"%.200s\" script line %d)",
-            namespacePtr->fullName, interp->errorLine);
-        Tcl_AddObjErrorInfo(interp, msg, -1);
-    }
-
-    /*
-     * Restore the previous "current" namespace.
-     */
-    
-    Tcl_PopCallFrame(interp);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceExportCmd --
- *
- *	Invoked to implement the "namespace export" command that specifies
- *	which commands are exported from a namespace. The exported commands
- *	are those that can be imported into another namespace using
- *	"namespace import". Both commands defined in a namespace and
- *	commands the namespace has imported can be exported by a
- *	namespace. This command has the following syntax:
- *
- *	    namespace export ?-clear? ?pattern pattern...?
- *
- *	Each pattern may contain "string match"-style pattern matching
- *	special characters, but the pattern may not include any namespace
- *	qualifiers: that is, the pattern must specify commands in the
- *	current (exporting) namespace. The specified patterns are appended
- *	onto the namespace's list of export patterns.
- *
- *	To reset the namespace's export pattern list, specify the "-clear"
- *	flag.
- *
- *	If there are no export patterns and the "-clear" flag isn't given,
- *	this command returns the namespace's current export list.
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceExportCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Namespace *currNsPtr = (Namespace*) Tcl_GetCurrentNamespace(interp);
-    char *pattern, *string;
-    int resetListFirst = 0;
-    int firstArg, patternCt, i, result;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 2, objv,
-	        "?-clear? ?pattern pattern...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Process the optional "-clear" argument.
-     */
-
-    firstArg = 2;
-    if (firstArg < objc) {
-	string = Tcl_GetString(objv[firstArg]);
-	if (strcmp(string, "-clear") == 0) {
-	    resetListFirst = 1;
-	    firstArg++;
-	}
-    }
-
-    /*
-     * If no pattern arguments are given, and "-clear" isn't specified,
-     * return the namespace's current export pattern list.
-     */
-
-    patternCt = (objc - firstArg);
-    if (patternCt == 0) {
-	if (firstArg > 2) {
-	    return TCL_OK;
-	} else {		/* create list with export patterns */
-	    Tcl_Obj *listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-	    result = Tcl_AppendExportList(interp,
-		    (Tcl_Namespace *) currNsPtr, listPtr);
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	    Tcl_SetObjResult(interp, listPtr);
-	    return TCL_OK;
-	}
-    }
-
-    /*
-     * Add each pattern to the namespace's export pattern list.
-     */
-    
-    for (i = firstArg;  i < objc;  i++) {
-	pattern = Tcl_GetString(objv[i]);
-	result = Tcl_Export(interp, (Tcl_Namespace *) currNsPtr, pattern,
-		((i == firstArg)? resetListFirst : 0));
-        if (result != TCL_OK) {
-            return result;
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceForgetCmd --
- *
- *	Invoked to implement the "namespace forget" command to remove
- *	imported commands from a namespace. Handles the following syntax:
- *
- *	    namespace forget ?pattern pattern...?
- *
- *	Each pattern is a name like "foo::*" or "a::b::x*". That is, the
- *	pattern may include the special pattern matching characters
- *	recognized by the "string match" command, but only in the command
- *	name at the end of the qualified name; the special pattern
- *	characters may not appear in a namespace name. All of the commands
- *	that match that pattern are checked to see if they have an imported
- *	command in the current namespace that refers to the matched
- *	command. If there is an alias, it is removed.
- *	
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Imported commands are removed from the current namespace. If
- *	anything goes wrong, this procedure returns an error message in the
- *	interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceForgetCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *pattern;
-    register int i, result;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 2, objv, "?pattern pattern...?");
-        return TCL_ERROR;
-    }
-
-    for (i = 2;  i < objc;  i++) {
-        pattern = Tcl_GetString(objv[i]);
-	result = Tcl_ForgetImport(interp, (Tcl_Namespace *) NULL, pattern);
-        if (result != TCL_OK) {
-            return result;
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceImportCmd --
- *
- *	Invoked to implement the "namespace import" command that imports
- *	commands into a namespace. Handles the following syntax:
- *
- *	    namespace import ?-force? ?pattern pattern...?
- *
- *	Each pattern is a namespace-qualified name like "foo::*",
- *	"a::b::x*", or "bar::p". That is, the pattern may include the
- *	special pattern matching characters recognized by the "string match"
- *	command, but only in the command name at the end of the qualified
- *	name; the special pattern characters may not appear in a namespace
- *	name. All of the commands that match the pattern and which are
- *	exported from their namespace are made accessible from the current
- *	namespace context. This is done by creating a new "imported command"
- *	in the current namespace that points to the real command in its
- *	original namespace; when the imported command is called, it invokes
- *	the real command.
- *
- *	If an imported command conflicts with an existing command, it is
- *	treated as an error. But if the "-force" option is included, then
- *	existing commands are overwritten by the imported commands.
- *	
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Adds imported commands to the current namespace. If anything goes
- *	wrong, this procedure returns an error message in the interpreter's
- *	result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceImportCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int allowOverwrite = 0;
-    char *string, *pattern;
-    register int i, result;
-    int firstArg;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 2, objv,
-	        "?-force? ?pattern pattern...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Skip over the optional "-force" as the first argument.
-     */
-
-    firstArg = 2;
-    if (firstArg < objc) {
-	string = Tcl_GetString(objv[firstArg]);
-	if ((*string == '-') && (strcmp(string, "-force") == 0)) {
-	    allowOverwrite = 1;
-	    firstArg++;
-	}
-    }
-
-    /*
-     * Handle the imports for each of the patterns.
-     */
-
-    for (i = firstArg;  i < objc;  i++) {
-        pattern = Tcl_GetString(objv[i]);
-	result = Tcl_Import(interp, (Tcl_Namespace *) NULL, pattern,
-	        allowOverwrite);
-        if (result != TCL_OK) {
-            return result;
-        }
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceInscopeCmd --
- *
- *	Invoked to implement the "namespace inscope" command that executes a
- *	script in the context of a particular namespace. This command is not
- *	expected to be used directly by programmers; calls to it are
- *	generated implicitly when programs use "namespace code" commands
- *	to register callback scripts. Handles the following syntax:
- *
- *	    namespace inscope name arg ?arg...?
- *
- *	The "namespace inscope" command is much like the "namespace eval"
- *	command except that it has lappend semantics and the namespace must
- *	already exist. It treats the first argument as a list, and appends
- *	any arguments after the first onto the end as proper list elements.
- *	For example,
- *
- *	    namespace inscope ::foo a b c d
- *
- *	is equivalent to
- *
- *	    namespace eval ::foo [concat a [list b c d]]
- *
- *	This lappend semantics is important because many callback scripts
- *	are actually prefixes.
- *
- * Results:
- *	Returns TCL_OK to indicate success, or TCL_ERROR to indicate
- *	failure.
- *
- * Side effects:
- *	Returns a result in the Tcl interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceInscopeCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Namespace *namespacePtr;
-    Tcl_CallFrame frame;
-    int i, result;
-
-    if (objc < 4) {
-	Tcl_WrongNumArgs(interp, 2, objv, "name arg ?arg...?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Resolve the namespace reference.
-     */
-
-    result = GetNamespaceFromObj(interp, objv[2], &namespacePtr);
-    if (result != TCL_OK) {
-        return result;
-    }
-    if (namespacePtr == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-	        "unknown namespace \"", Tcl_GetString(objv[2]),
-		"\" in inscope namespace command", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * Make the specified namespace the current namespace.
-     */
-
-    result = Tcl_PushCallFrame(interp, &frame, namespacePtr,
-	    /*isProcCallFrame*/ 0);
-    if (result != TCL_OK) {
-        return result;
-    }
-
-    /*
-     * Execute the command. If there is just one argument, just treat it as
-     * a script and evaluate it. Otherwise, create a list from the arguments
-     * after the first one, then concatenate the first argument and the list
-     * of extra arguments to form the command to evaluate.
-     */
-
-    if (objc == 4) {
-        result = Tcl_EvalObjEx(interp, objv[3], 0);
-    } else {
-	Tcl_Obj *concatObjv[2];
-	register Tcl_Obj *listPtr, *cmdObjPtr;
-	
-        listPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-        for (i = 4;  i < objc;  i++) {
-	    result = Tcl_ListObjAppendElement(interp, listPtr, objv[i]);
-            if (result != TCL_OK) {
-                Tcl_DecrRefCount(listPtr); /* free unneeded obj */
-                return result;
-            }
-        }
-
-	concatObjv[0] = objv[3];
-	concatObjv[1] = listPtr;
-	cmdObjPtr = Tcl_ConcatObj(2, concatObjv);
-        result = Tcl_EvalObjEx(interp, cmdObjPtr, TCL_EVAL_DIRECT);
-	Tcl_DecrRefCount(listPtr);    /* we're done with the list object */
-    }
-    if (result == TCL_ERROR) {
-        char msg[256 + TCL_INTEGER_SPACE];
-	
-        sprintf(msg,
-	    "\n    (in namespace inscope \"%.200s\" script line %d)",
-            namespacePtr->fullName, interp->errorLine);
-        Tcl_AddObjErrorInfo(interp, msg, -1);
-    }
-
-    /*
-     * Restore the previous "current" namespace.
-     */
-
-    Tcl_PopCallFrame(interp);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceOriginCmd --
- *
- *	Invoked to implement the "namespace origin" command to return the
- *	fully-qualified name of the "real" command to which the specified
- *	"imported command" refers. Handles the following syntax:
- *
- *	    namespace origin name
- *
- * Results:
- *	An imported command is created in an namespace when that namespace
- *	imports a command from another namespace. If a command is imported
- *	into a sequence of namespaces a, b,...,n where each successive
- *	namespace just imports the command from the previous namespace, this
- *	command returns the fully-qualified name of the original command in
- *	the first namespace, a. If "name" does not refer to an alias, its
- *	fully-qualified name is returned. The returned name is stored in the
- *	interpreter's result object. This procedure returns TCL_OK if
- *	successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	If anything goes wrong, this procedure returns an error message in
- *	the interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceOriginCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Command command, origCommand;
-
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 2, objv, "name");
-        return TCL_ERROR;
-    }
-
-    command = Tcl_GetCommandFromObj(interp, objv[2]);
-    if (command == (Tcl_Command) NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"invalid command name \"", Tcl_GetString(objv[2]),
-		"\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    origCommand = TclGetOriginalCommand(command);
-    if (origCommand == (Tcl_Command) NULL) {
-	/*
-	 * The specified command isn't an imported command. Return the
-	 * command's name qualified by the full name of the namespace it
-	 * was defined in.
-	 */
-	
-	Tcl_GetCommandFullName(interp, command, Tcl_GetObjResult(interp));
-    } else {
-	Tcl_GetCommandFullName(interp, origCommand, Tcl_GetObjResult(interp));
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceParentCmd --
- *
- *	Invoked to implement the "namespace parent" command that returns the
- *	fully-qualified name of the parent namespace for a specified
- *	namespace. Handles the following syntax:
- *
- *	    namespace parent ?name?
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceParentCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Namespace *nsPtr;
-    int result;
-
-    if (objc == 2) {
-        nsPtr = Tcl_GetCurrentNamespace(interp);
-    } else if (objc == 3) {
-	result = GetNamespaceFromObj(interp, objv[2], &nsPtr);
-        if (result != TCL_OK) {
-            return result;
-        }
-        if (nsPtr == NULL) {
-            Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "unknown namespace \"", Tcl_GetString(objv[2]),
-		    "\" in namespace parent command", (char *) NULL);
-            return TCL_ERROR;
-        }
-    } else {
-        Tcl_WrongNumArgs(interp, 2, objv, "?name?");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Report the parent of the specified namespace.
-     */
-
-    if (nsPtr->parentPtr != NULL) {
-        Tcl_SetStringObj(Tcl_GetObjResult(interp),
-	        nsPtr->parentPtr->fullName, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceQualifiersCmd --
- *
- *	Invoked to implement the "namespace qualifiers" command that returns
- *	any leading namespace qualifiers in a string. These qualifiers are
- *	namespace names separated by "::"s. For example, for "::foo::p" this
- *	command returns "::foo", and for "::" it returns "". This command
- *	is the complement of the "namespace tail" command. Note that this
- *	command does not check whether the "namespace" names are, in fact,
- *	the names of currently defined namespaces. Handles the following
- *	syntax:
- *
- *	    namespace qualifiers string
- *
- * Results:
- *	Returns TCL_OK if successful, and  TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceQualifiersCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register char *name, *p;
-    int length;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 2, objv, "string");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Find the end of the string, then work backward and find
-     * the start of the last "::" qualifier.
-     */
-
-    name = Tcl_GetString(objv[2]);
-    for (p = name;  *p != '\0';  p++) {
-	/* empty body */
-    }
-    while (--p >= name) {
-        if ((*p == ':') && (p > name) && (*(p-1) == ':')) {
-	    p -= 2;		/* back up over the :: */
-	    while ((p >= name) && (*p == ':')) {
-		p--;		/* back up over the preceeding : */
-	    }
-	    break;
-        }
-    }
-
-    if (p >= name) {
-        length = p-name+1;
-        Tcl_AppendToObj(Tcl_GetObjResult(interp), name, length);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceTailCmd --
- *
- *	Invoked to implement the "namespace tail" command that returns the
- *	trailing name at the end of a string with "::" namespace
- *	qualifiers. These qualifiers are namespace names separated by
- *	"::"s. For example, for "::foo::p" this command returns "p", and for
- *	"::" it returns "". This command is the complement of the "namespace
- *	qualifiers" command. Note that this command does not check whether
- *	the "namespace" names are, in fact, the names of currently defined
- *	namespaces. Handles the following syntax:
- *
- *	    namespace tail string
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceTailCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register char *name, *p;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 2, objv, "string");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Find the end of the string, then work backward and find the
-     * last "::" qualifier.
-     */
-
-    name = Tcl_GetString(objv[2]);
-    for (p = name;  *p != '\0';  p++) {
-	/* empty body */
-    }
-    while (--p > name) {
-        if ((*p == ':') && (*(p-1) == ':')) {
-            p++;		/* just after the last "::" */
-            break;
-        }
-    }
-    
-    if (p >= name) {
-        Tcl_AppendToObj(Tcl_GetObjResult(interp), p, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NamespaceWhichCmd --
- *
- *	Invoked to implement the "namespace which" command that returns the
- *	fully-qualified name of a command or variable. If the specified
- *	command or variable does not exist, it returns "". Handles the
- *	following syntax:
- *
- *	    namespace which ?-command? ?-variable? name
- *
- * Results:
- *	Returns TCL_OK if successful, and TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	Returns a result in the interpreter's result object. If anything
- *	goes wrong, the result is an error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NamespaceWhichCmd(dummy, interp, objc, objv)
-    ClientData dummy;                   /* Not used. */
-    Tcl_Interp *interp;                 /* Current interpreter. */
-    int objc;                           /* Number of arguments. */
-    Tcl_Obj *CONST objv[];              /* Argument objects. */
-{
-    register char *arg;
-    Tcl_Command cmd;
-    Tcl_Var variable;
-    int argIndex, lookup;
-
-    if (objc < 3) {
-        badArgs:
-        Tcl_WrongNumArgs(interp, 2, objv,
-	        "?-command? ?-variable? name");
-        return TCL_ERROR;
-    }
-
-    /*
-     * Look for a flag controlling the lookup.
-     */
-
-    argIndex = 2;
-    lookup = 0;			/* assume command lookup by default */
-    arg = Tcl_GetString(objv[2]);
-    if (*arg == '-') {
-	if (strncmp(arg, "-command", 8) == 0) {
-	    lookup = 0;
-	} else if (strncmp(arg, "-variable", 9) == 0) {
-	    lookup = 1;
-	} else {
-	    goto badArgs;
-	}
-	argIndex = 3;
-    }
-    if (objc != (argIndex + 1)) {
-	goto badArgs;
-    }
-
-    switch (lookup) {
-    case 0:			/* -command */
-	cmd = Tcl_GetCommandFromObj(interp, objv[argIndex]);
-        if (cmd == (Tcl_Command) NULL) {	
-            return TCL_OK;	/* cmd not found, just return (no error) */
-        }
-	Tcl_GetCommandFullName(interp, cmd, Tcl_GetObjResult(interp));
-        break;
-
-    case 1:			/* -variable */
-        arg = Tcl_GetString(objv[argIndex]);
-	variable = Tcl_FindNamespaceVar(interp, arg, (Tcl_Namespace *) NULL,
-		/*flags*/ 0);
-        if (variable != (Tcl_Var) NULL) {
-            Tcl_GetVariableFullName(interp, variable, Tcl_GetObjResult(interp));
-        }
-        break;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeNsNameInternalRep --
- *
- *	Frees the resources associated with a nsName object's internal
- *	representation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Decrements the ref count of any Namespace structure pointed
- *	to by the nsName's internal representation. If there are no more
- *	references to the namespace, it's structure will be freed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeNsNameInternalRep(objPtr)
-    register Tcl_Obj *objPtr;   /* nsName object with internal
-                                 * representation to free */
-{
-    register ResolvedNsName *resNamePtr =
-        (ResolvedNsName *) objPtr->internalRep.otherValuePtr;
-    Namespace *nsPtr;
-
-    /*
-     * Decrement the reference count of the namespace. If there are no
-     * more references, free it up.
-     */
-
-    if (resNamePtr != NULL) {
-        resNamePtr->refCount--;
-        if (resNamePtr->refCount == 0) {
-
-            /*
-	     * Decrement the reference count for the cached namespace.  If
-	     * the namespace is dead, and there are no more references to
-	     * it, free it.
-	     */
-
-            nsPtr = resNamePtr->nsPtr;
-            nsPtr->refCount--;
-            if ((nsPtr->refCount == 0) && (nsPtr->flags & NS_DEAD)) {
-                NamespaceFree(nsPtr);
-            }
-            ckfree((char *) resNamePtr);
-        }
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupNsNameInternalRep --
- *
- *	Initializes the internal representation of a nsName object to a copy
- *	of the internal representation of another nsName object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	copyPtr's internal rep is set to refer to the same namespace
- *	referenced by srcPtr's internal rep. Increments the ref count of
- *	the ResolvedNsName structure used to hold the namespace reference.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupNsNameInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;                /* Object with internal rep to copy. */
-    register Tcl_Obj *copyPtr;      /* Object with internal rep to set. */
-{
-    register ResolvedNsName *resNamePtr =
-        (ResolvedNsName *) srcPtr->internalRep.otherValuePtr;
-
-    copyPtr->internalRep.otherValuePtr = (VOID *) resNamePtr;
-    if (resNamePtr != NULL) {
-        resNamePtr->refCount++;
-    }
-    copyPtr->typePtr = &tclNsNameType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetNsNameFromAny --
- *
- *	Attempt to generate a nsName internal representation for a
- *	Tcl object.
- *
- * Results:
- *	Returns TCL_OK if the value could be converted to a proper
- *	namespace reference. Otherwise, it returns TCL_ERROR, along
- *	with an error message in the interpreter's result object.
- *
- * Side effects:
- *	If successful, the object is made a nsName object. Its internal rep
- *	is set to point to a ResolvedNsName, which contains a cached pointer
- *	to the Namespace. Reference counts are kept on both the
- *	ResolvedNsName and the Namespace, so we can keep track of their
- *	usage and free them when appropriate.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetNsNameFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Points to the namespace in which to
-				 * resolve name. Also used for error
-				 * reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *name, *dummy;
-    Namespace *nsPtr, *dummy1Ptr, *dummy2Ptr;
-    register ResolvedNsName *resNamePtr;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    name = objPtr->bytes;
-    if (name == NULL) {
-	name = Tcl_GetString(objPtr);
-    }
-
-    /*
-     * Look for the namespace "name" in the current namespace. If there is
-     * an error parsing the (possibly qualified) name, return an error.
-     * If the namespace isn't found, we convert the object to an nsName
-     * object with a NULL ResolvedNsName* internal rep.
-     */
-
-    TclGetNamespaceForQualName(interp, name, (Namespace *) NULL,
-            FIND_ONLY_NS, &nsPtr, &dummy1Ptr, &dummy2Ptr, &dummy);
-
-    /*
-     * If we found a namespace, then create a new ResolvedNsName structure
-     * that holds a reference to it.
-     */
-
-    if (nsPtr != NULL) {
-	Namespace *currNsPtr =
-	        (Namespace *) Tcl_GetCurrentNamespace(interp);
-	
-        nsPtr->refCount++;
-        resNamePtr = (ResolvedNsName *) ckalloc(sizeof(ResolvedNsName));
-        resNamePtr->nsPtr = nsPtr;
-        resNamePtr->nsId = nsPtr->nsId;
-        resNamePtr->refNsPtr = currNsPtr;
-        resNamePtr->refCount = 1;
-    } else {
-        resNamePtr = NULL;
-    }
-
-    /*
-     * Free the old internalRep before setting the new one.
-     * We do this as late as possible to allow the conversion code
-     * (in particular, Tcl_GetStringFromObj) to use that old internalRep.
-     */
-
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-        oldTypePtr->freeIntRepProc(objPtr);
-    }
-
-    objPtr->internalRep.otherValuePtr = (VOID *) resNamePtr;
-    objPtr->typePtr = &tclNsNameType;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfNsName --
- *
- *	Updates the string representation for a nsName object.
- *	Note: This procedure does not free an existing old string rep
- *	so storage will be lost if this has not already been done.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a copy of the fully qualified
- *	namespace name.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfNsName(objPtr)
-    register Tcl_Obj *objPtr; /* nsName object with string rep to update. */
-{
-    ResolvedNsName *resNamePtr =
-        (ResolvedNsName *) objPtr->internalRep.otherValuePtr;
-    register Namespace *nsPtr;
-    char *name = "";
-    int length;
-
-    if ((resNamePtr != NULL)
-	    && (resNamePtr->nsId == resNamePtr->nsPtr->nsId)) {
-        nsPtr = resNamePtr->nsPtr;
-        if (nsPtr->flags & NS_DEAD) {
-            nsPtr = NULL;
-        }
-        if (nsPtr != NULL) {
-            name = nsPtr->fullName;
-        }
-    }
-
-    /*
-     * The following sets the string rep to an empty string on the heap
-     * if the internal rep is NULL.
-     */
-
-    length = strlen(name);
-    if (length == 0) {
-	objPtr->bytes = tclEmptyStringRep;
-    } else {
-	objPtr->bytes = (char *) ckalloc((unsigned) (length + 1));
-	memcpy((VOID *) objPtr->bytes, (VOID *) name, (unsigned) length);
-	objPtr->bytes[length] = '\0';
-    }
-    objPtr->length = length;
-}
diff --git a/generic/tclNotify.c b/generic/tclNotify.c
deleted file mode 100644
index 15553b9..0000000
--- a/generic/tclNotify.c
+++ /dev/null
@@ -1,1046 +0,0 @@
-/* 
- * tclNotify.c --
- *
- *	This file implements the generic portion of the Tcl notifier.
- *	The notifier is lowest-level part of the event system.  It
- *	manages an event queue that holds Tcl_Event structures.  The
- *	platform specific portion of the notifier is defined in the
- *	tcl*Notify.c files in each platform directory.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclNotify.c,v 1.4 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * For each event source (created with Tcl_CreateEventSource) there
- * is a structure of the following type:
- */
-
-typedef struct EventSource {
-    Tcl_EventSetupProc *setupProc;
-    Tcl_EventCheckProc *checkProc;
-    ClientData clientData;
-    struct EventSource *nextPtr;
-} EventSource;
-
-/*
- * The following structure keeps track of the state of the notifier on a
- * per-thread basis. The first three elements keep track of the event queue.
- * In addition to the first (next to be serviced) and last events in the queue,
- * we keep track of a "marker" event.  This provides a simple priority
- * mechanism whereby events can be inserted at the front of the queue but
- * behind all other high-priority events already in the queue (this is used for
- * things like a sequence of Enter and Leave events generated during a grab in
- * Tk).  These elements are protected by the queueMutex so that any thread
- * can queue an event on any notifier.  Note that all of the values in this
- * structure will be initialized to 0.
- */
-
-typedef struct ThreadSpecificData {
-    Tcl_Event *firstEventPtr;	/* First pending event, or NULL if none. */
-    Tcl_Event *lastEventPtr;	/* Last pending event, or NULL if none. */
-    Tcl_Event *markerEventPtr;	/* Last high-priority event in queue, or
-				 * NULL if none. */
-    Tcl_Mutex queueMutex;	/* Mutex to protect access to the previous
-				 * three fields. */
-    int serviceMode;		/* One of TCL_SERVICE_NONE or
-				 * TCL_SERVICE_ALL. */
-    int blockTimeSet;		/* 0 means there is no maximum block
-				 * time:  block forever. */
-    Tcl_Time blockTime;		/* If blockTimeSet is 1, gives the
-				 * maximum elapsed time for the next block. */
-    int inTraversal;		/* 1 if Tcl_SetMaxBlockTime is being
-				 * called during an event source traversal. */
-    EventSource *firstEventSourcePtr;
-				/* Pointer to first event source in
-				 * list of event sources for this thread. */
-    Tcl_ThreadId threadId;	/* Thread that owns this notifier instance. */
-    ClientData clientData;	/* Opaque handle for platform specific
-				 * notifier. */
-    struct ThreadSpecificData *nextPtr;
-				/* Next notifier in global list of notifiers.
-				 * Access is controlled by the listLock global
-				 * mutex. */
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Global list of notifiers.  Access to this list is controlled by the
- * listLock mutex.  If this becomes a performance bottleneck, this could
- * be replaced with a hashtable.
- */
-
-static ThreadSpecificData *firstNotifierPtr;
-TCL_DECLARE_MUTEX(listLock)
-
-/*
- * Declarations for routines used only in this file.
- */
-
-static void		QueueEvent _ANSI_ARGS_((ThreadSpecificData *tsdPtr,
-			    Tcl_Event* evPtr, Tcl_QueuePosition position));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclInitNotifier --
- *
- *	Initialize the thread local data structures for the notifier
- *	subsystem.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adds the current thread to the global list of notifiers.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclInitNotifier()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    Tcl_MutexLock(&listLock);
-
-    tsdPtr->threadId = Tcl_GetCurrentThread();
-    tsdPtr->clientData = Tcl_InitNotifier();
-    tsdPtr->nextPtr = firstNotifierPtr;
-    firstNotifierPtr = tsdPtr;
-
-    Tcl_MutexUnlock(&listLock);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeNotifier --
- *
- *	Finalize the thread local data structures for the notifier
- *	subsystem.
- *
- * Results:
- *	None.	
- *
- * Side effects:
- *	Removes the notifier associated with the current thread from
- *	the global notifier list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeNotifier()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    ThreadSpecificData **prevPtrPtr;
-
-    Tcl_MutexLock(&listLock);
-
-    Tcl_FinalizeNotifier(tsdPtr->clientData);
-    TclFinalizeMutex(&(tsdPtr->queueMutex));
-    for (prevPtrPtr = &firstNotifierPtr; *prevPtrPtr != NULL;
-	 prevPtrPtr = &((*prevPtrPtr)->nextPtr)) {
-	if (*prevPtrPtr == tsdPtr) {
-	    *prevPtrPtr = tsdPtr->nextPtr;
-	    break;
-	}
-    }
-
-    Tcl_MutexUnlock(&listLock);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateEventSource --
- *
- *	This procedure is invoked to create a new source of events.
- *	The source is identified by a procedure that gets invoked
- *	during Tcl_DoOneEvent to check for events on that source
- *	and queue them.
- *
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	SetupProc and checkProc will be invoked each time that Tcl_DoOneEvent
- *	runs out of things to do.  SetupProc will be invoked before
- *	Tcl_DoOneEvent calls select or whatever else it uses to wait
- *	for events.  SetupProc typically calls functions like
- *	Tcl_SetMaxBlockTime to indicate what to wait for.
- *
- *	CheckProc is called after select or whatever operation was actually
- *	used to wait.  It figures out whether anything interesting actually
- *	happened (e.g. by calling Tcl_AsyncReady), and then calls
- *	Tcl_QueueEvent to queue any events that are ready.
- *
- *	Each of these procedures is passed two arguments, e.g.
- *		(*checkProc)(ClientData clientData, int flags));
- *	ClientData is the same as the clientData argument here, and flags
- *	is a combination of things like TCL_FILE_EVENTS that indicates
- *	what events are of interest:  setupProc and checkProc use flags
- *	to figure out whether their events are relevant or not.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateEventSource(setupProc, checkProc, clientData)
-    Tcl_EventSetupProc *setupProc;	/* Procedure to invoke to figure out
-					 * what to wait for. */
-    Tcl_EventCheckProc *checkProc;	/* Procedure to call after waiting
-					 * to see what happened. */
-    ClientData clientData;		/* One-word argument to pass to
-					 * setupProc and checkProc. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    EventSource *sourcePtr = (EventSource *) ckalloc(sizeof(EventSource));
-
-    sourcePtr->setupProc = setupProc;
-    sourcePtr->checkProc = checkProc;
-    sourcePtr->clientData = clientData;
-    sourcePtr->nextPtr = tsdPtr->firstEventSourcePtr;
-    tsdPtr->firstEventSourcePtr = sourcePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteEventSource --
- *
- *	This procedure is invoked to delete the source of events
- *	given by proc and clientData.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The given event source is cancelled, so its procedure will
- *	never again be called.  If no such source exists, nothing
- *	happens.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteEventSource(setupProc, checkProc, clientData)
-    Tcl_EventSetupProc *setupProc;	/* Procedure to invoke to figure out
-					 * what to wait for. */
-    Tcl_EventCheckProc *checkProc;	/* Procedure to call after waiting
-					 * to see what happened. */
-    ClientData clientData;		/* One-word argument to pass to
-					 * setupProc and checkProc. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    EventSource *sourcePtr, *prevPtr;
-
-    for (sourcePtr = tsdPtr->firstEventSourcePtr, prevPtr = NULL;
-	    sourcePtr != NULL;
-	    prevPtr = sourcePtr, sourcePtr = sourcePtr->nextPtr) {
-	if ((sourcePtr->setupProc != setupProc)
-		|| (sourcePtr->checkProc != checkProc)
-		|| (sourcePtr->clientData != clientData)) {
-	    continue;
-	}
-	if (prevPtr == NULL) {
-	    tsdPtr->firstEventSourcePtr = sourcePtr->nextPtr;
-	} else {
-	    prevPtr->nextPtr = sourcePtr->nextPtr;
-	}
-	ckfree((char *) sourcePtr);
-	return;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_QueueEvent --
- *
- *	Queue an event on the event queue associated with the
- *	current thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_QueueEvent(evPtr, position)
-    Tcl_Event* evPtr;		/* Event to add to queue.  The storage
-				 * space must have been allocated the caller
-				 * with malloc (ckalloc), and it becomes
-				 * the property of the event queue.  It
-				 * will be freed after the event has been
-				 * handled. */
-    Tcl_QueuePosition position;	/* One of TCL_QUEUE_TAIL, TCL_QUEUE_HEAD,
-				 * TCL_QUEUE_MARK. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    QueueEvent(tsdPtr, evPtr, position);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ThreadQueueEvent --
- *
- *	Queue an event on the specified thread's event queue.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ThreadQueueEvent(threadId, evPtr, position)
-    Tcl_ThreadId threadId;	/* Identifier for thread to use. */
-    Tcl_Event* evPtr;		/* Event to add to queue.  The storage
-				 * space must have been allocated the caller
-				 * with malloc (ckalloc), and it becomes
-				 * the property of the event queue.  It
-				 * will be freed after the event has been
-				 * handled. */
-    Tcl_QueuePosition position;	/* One of TCL_QUEUE_TAIL, TCL_QUEUE_HEAD,
-				 * TCL_QUEUE_MARK. */
-{
-    ThreadSpecificData *tsdPtr;
-
-    /*
-     * Find the notifier associated with the specified thread.
-     */
-
-    Tcl_MutexLock(&listLock);
-    for (tsdPtr = firstNotifierPtr; tsdPtr && tsdPtr->threadId != threadId;
-	     tsdPtr = tsdPtr->nextPtr) {
-	/* Empty loop body. */
-    }
-
-    /*
-     * Queue the event if there was a notifier associated with the thread.
-     */
-
-    if (tsdPtr) {
-	QueueEvent(tsdPtr, evPtr, position);
-    }
-    Tcl_MutexUnlock(&listLock);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * QueueEvent --
- *
- *	Insert an event into the specified thread's event queue at one
- *	of three positions: the head, the tail, or before a floating
- *	marker. Events inserted before the marker will be processed in
- *	first-in-first-out order, but before any events inserted at
- *	the tail of the queue.  Events inserted at the head of the
- *	queue will be processed in last-in-first-out order.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-QueueEvent(tsdPtr, evPtr, position)
-    ThreadSpecificData *tsdPtr;	/* Handle to thread local data that indicates
-				 * which event queue to use. */
-    Tcl_Event* evPtr;		/* Event to add to queue.  The storage
-				 * space must have been allocated the caller
-				 * with malloc (ckalloc), and it becomes
-				 * the property of the event queue.  It
-				 * will be freed after the event has been
-				 * handled. */
-    Tcl_QueuePosition position;	/* One of TCL_QUEUE_TAIL, TCL_QUEUE_HEAD,
-				 * TCL_QUEUE_MARK. */
-{
-    Tcl_MutexLock(&(tsdPtr->queueMutex));
-    if (position == TCL_QUEUE_TAIL) {
-	/*
-	 * Append the event on the end of the queue.
-	 */
-
-	evPtr->nextPtr = NULL;
-	if (tsdPtr->firstEventPtr == NULL) {
-	    tsdPtr->firstEventPtr = evPtr;
-	} else {
-	    tsdPtr->lastEventPtr->nextPtr = evPtr;
-	}
-	tsdPtr->lastEventPtr = evPtr;
-    } else if (position == TCL_QUEUE_HEAD) {
-	/*
-	 * Push the event on the head of the queue.
-	 */
-
-	evPtr->nextPtr = tsdPtr->firstEventPtr;
-	if (tsdPtr->firstEventPtr == NULL) {
-	    tsdPtr->lastEventPtr = evPtr;
-	}	    
-	tsdPtr->firstEventPtr = evPtr;
-    } else if (position == TCL_QUEUE_MARK) {
-	/*
-	 * Insert the event after the current marker event and advance
-	 * the marker to the new event.
-	 */
-
-	if (tsdPtr->markerEventPtr == NULL) {
-	    evPtr->nextPtr = tsdPtr->firstEventPtr;
-	    tsdPtr->firstEventPtr = evPtr;
-	} else {
-	    evPtr->nextPtr = tsdPtr->markerEventPtr->nextPtr;
-	    tsdPtr->markerEventPtr->nextPtr = evPtr;
-	}
-	tsdPtr->markerEventPtr = evPtr;
-	if (evPtr->nextPtr == NULL) {
-	    tsdPtr->lastEventPtr = evPtr;
-	}
-    }
-    Tcl_MutexUnlock(&(tsdPtr->queueMutex));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteEvents --
- *
- *	Calls a procedure for each event in the queue and deletes those
- *	for which the procedure returns 1. Events for which the
- *	procedure returns 0 are left in the queue.  Operates on the
- *	queue associated with the current thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Potentially removes one or more events from the event queue.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteEvents(proc, clientData)
-    Tcl_EventDeleteProc *proc;		/* The procedure to call. */
-    ClientData clientData;    		/* type-specific data. */
-{
-    Tcl_Event *evPtr, *prevPtr, *hold;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    Tcl_MutexLock(&(tsdPtr->queueMutex));
-    for (prevPtr = (Tcl_Event *) NULL, evPtr = tsdPtr->firstEventPtr;
-             evPtr != (Tcl_Event *) NULL;
-             ) {
-        if ((*proc) (evPtr, clientData) == 1) {
-            if (tsdPtr->firstEventPtr == evPtr) {
-                tsdPtr->firstEventPtr = evPtr->nextPtr;
-                if (evPtr->nextPtr == (Tcl_Event *) NULL) {
-                    tsdPtr->lastEventPtr = prevPtr;
-                }
-		if (tsdPtr->markerEventPtr == evPtr) {
-		    tsdPtr->markerEventPtr = prevPtr;
-		}
-            } else {
-                prevPtr->nextPtr = evPtr->nextPtr;
-            }
-            hold = evPtr;
-            evPtr = evPtr->nextPtr;
-            ckfree((char *) hold);
-        } else {
-            prevPtr = evPtr;
-            evPtr = evPtr->nextPtr;
-        }
-    }
-    Tcl_MutexUnlock(&(tsdPtr->queueMutex));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ServiceEvent --
- *
- *	Process one event from the event queue, or invoke an
- *	asynchronous event handler.  Operates on event queue for
- *	current thread.
- *
- * Results:
- *	The return value is 1 if the procedure actually found an event
- *	to process.  If no processing occurred, then 0 is returned.
- *
- * Side effects:
- *	Invokes all of the event handlers for the highest priority
- *	event in the event queue.  May collapse some events into a
- *	single event or discard stale events.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ServiceEvent(flags)
-    int flags;			/* Indicates what events should be processed.
-				 * May be any combination of TCL_WINDOW_EVENTS
-				 * TCL_FILE_EVENTS, TCL_TIMER_EVENTS, or other
-				 * flags defined elsewhere.  Events not
-				 * matching this will be skipped for processing
-				 * later. */
-{
-    Tcl_Event *evPtr, *prevPtr;
-    Tcl_EventProc *proc;
-    int result;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Asynchronous event handlers are considered to be the highest
-     * priority events, and so must be invoked before we process events
-     * on the event queue.
-     */
-    
-    if (Tcl_AsyncReady()) {
-	(void) Tcl_AsyncInvoke((Tcl_Interp *) NULL, 0);
-	return 1;
-    }
-
-    /*
-     * No event flags is equivalent to TCL_ALL_EVENTS.
-     */
-    
-    if ((flags & TCL_ALL_EVENTS) == 0) {
-	flags |= TCL_ALL_EVENTS;
-    }
-
-    /*
-     * Loop through all the events in the queue until we find one
-     * that can actually be handled.
-     */
-
-    Tcl_MutexLock(&(tsdPtr->queueMutex));
-    for (evPtr = tsdPtr->firstEventPtr; evPtr != NULL;
-	 evPtr = evPtr->nextPtr) {
-	/*
-	 * Call the handler for the event.  If it actually handles the
-	 * event then free the storage for the event.  There are two
-	 * tricky things here, both stemming from the fact that the event
-	 * code may be re-entered while servicing the event:
-	 *
-	 * 1. Set the "proc" field to NULL.  This is a signal to ourselves
-	 *    that we shouldn't reexecute the handler if the event loop
-	 *    is re-entered.
-	 * 2. When freeing the event, must search the queue again from the
-	 *    front to find it.  This is because the event queue could
-	 *    change almost arbitrarily while handling the event, so we
-	 *    can't depend on pointers found now still being valid when
-	 *    the handler returns.
-	 */
-
-	proc = evPtr->proc;
-	if (proc == NULL) {
-	    continue;
-	}
-	evPtr->proc = NULL;
-
-	/*
-	 * Release the lock before calling the event procedure.  This
-	 * allows other threads to post events if we enter a recursive
-	 * event loop in this thread.  Note that we are making the assumption
-	 * that if the proc returns 0, the event is still in the list.
-	 */
-
-	Tcl_MutexUnlock(&(tsdPtr->queueMutex));
-	result = (*proc)(evPtr, flags);
-	Tcl_MutexLock(&(tsdPtr->queueMutex));
-
-	if (result) {
-	    /*
-	     * The event was processed, so remove it from the queue.
-	     */
-
-	    if (tsdPtr->firstEventPtr == evPtr) {
-		tsdPtr->firstEventPtr = evPtr->nextPtr;
-		if (evPtr->nextPtr == NULL) {
-		    tsdPtr->lastEventPtr = NULL;
-		}
-		if (tsdPtr->markerEventPtr == evPtr) {
-		    tsdPtr->markerEventPtr = NULL;
-		}
-	    } else {
-		for (prevPtr = tsdPtr->firstEventPtr;
-		     prevPtr && prevPtr->nextPtr != evPtr;
-		     prevPtr = prevPtr->nextPtr) {
-		    /* Empty loop body. */
-		}
-		if (prevPtr) {
-		    prevPtr->nextPtr = evPtr->nextPtr;
-		    if (evPtr->nextPtr == NULL) {
-			tsdPtr->lastEventPtr = prevPtr;
-		    }
-		    if (tsdPtr->markerEventPtr == evPtr) {
-			tsdPtr->markerEventPtr = prevPtr;
-		    }
-		} else {
-		    evPtr = NULL;
-		}
-	    }
-	    if (evPtr) {
-		ckfree((char *) evPtr);
-	    }
-	    Tcl_MutexUnlock(&(tsdPtr->queueMutex));
-	    return 1;
-	} else {
-	    /*
-	     * The event wasn't actually handled, so we have to restore
-	     * the proc field to allow the event to be attempted again.
-	     */
-
-	    evPtr->proc = proc;
-	}
-    }
-    Tcl_MutexUnlock(&(tsdPtr->queueMutex));
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetServiceMode --
- *
- *	This routine returns the current service mode of the notifier.
- *
- * Results:
- *	Returns either TCL_SERVICE_ALL or TCL_SERVICE_NONE.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetServiceMode()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    return tsdPtr->serviceMode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetServiceMode --
- *
- *	This routine sets the current service mode of the tsdPtr->
- *
- * Results:
- *	Returns the previous service mode.
- *
- * Side effects:
- *	Invokes the notifier service mode hook procedure.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_SetServiceMode(mode)
-    int mode;			/* New service mode: TCL_SERVICE_ALL or
-				 * TCL_SERVICE_NONE */
-{
-    int oldMode;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    oldMode = tsdPtr->serviceMode;
-    tsdPtr->serviceMode = mode;
-    Tcl_ServiceModeHook(mode);
-    return oldMode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetMaxBlockTime --
- *
- *	This procedure is invoked by event sources to tell the notifier
- *	how long it may block the next time it blocks.  The timePtr
- *	argument gives a maximum time;  the actual time may be less if
- *	some other event source requested a smaller time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May reduce the length of the next sleep in the tsdPtr->
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetMaxBlockTime(timePtr)
-    Tcl_Time *timePtr;		/* Specifies a maximum elapsed time for
-				 * the next blocking operation in the
-				 * event tsdPtr-> */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!tsdPtr->blockTimeSet || (timePtr->sec < tsdPtr->blockTime.sec)
-	    || ((timePtr->sec == tsdPtr->blockTime.sec)
-	    && (timePtr->usec < tsdPtr->blockTime.usec))) {
-	tsdPtr->blockTime = *timePtr;
-	tsdPtr->blockTimeSet = 1;
-    }
-
-    /*
-     * If we are called outside an event source traversal, set the
-     * timeout immediately.
-     */
-
-    if (!tsdPtr->inTraversal) {
-	if (tsdPtr->blockTimeSet) {
-	    Tcl_SetTimer(&tsdPtr->blockTime);
-	} else {
-	    Tcl_SetTimer(NULL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DoOneEvent --
- *
- *	Process a single event of some sort.  If there's no work to
- *	do, wait for an event to occur, then process it.
- *
- * Results:
- *	The return value is 1 if the procedure actually found an event
- *	to process.  If no processing occurred, then 0 is returned (this
- *	can happen if the TCL_DONT_WAIT flag is set or if there are no
- *	event handlers to wait for in the set specified by flags).
- *
- * Side effects:
- *	May delay execution of process while waiting for an event,
- *	unless TCL_DONT_WAIT is set in the flags argument.  Event
- *	sources are invoked to check for and queue events.  Event
- *	handlers may produce arbitrary side effects.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_DoOneEvent(flags)
-    int flags;			/* Miscellaneous flag values:  may be any
-				 * combination of TCL_DONT_WAIT,
-				 * TCL_WINDOW_EVENTS, TCL_FILE_EVENTS,
-				 * TCL_TIMER_EVENTS, TCL_IDLE_EVENTS, or
-				 * others defined by event sources. */
-{
-    int result = 0, oldMode;
-    EventSource *sourcePtr;
-    Tcl_Time *timePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * The first thing we do is to service any asynchronous event
-     * handlers.
-     */
-    
-    if (Tcl_AsyncReady()) {
-	(void) Tcl_AsyncInvoke((Tcl_Interp *) NULL, 0);
-	return 1;
-    }
-
-    /*
-     * No event flags is equivalent to TCL_ALL_EVENTS.
-     */
-    
-    if ((flags & TCL_ALL_EVENTS) == 0) {
-	flags |= TCL_ALL_EVENTS;
-    }
-
-    /*
-     * Set the service mode to none so notifier event routines won't
-     * try to service events recursively.
-     */
-
-    oldMode = tsdPtr->serviceMode;
-    tsdPtr->serviceMode = TCL_SERVICE_NONE;
-
-    /*
-     * The core of this procedure is an infinite loop, even though
-     * we only service one event.  The reason for this is that we
-     * may be processing events that don't do anything inside of Tcl.
-     */
-
-    while (1) {
-
-	/*
-	 * If idle events are the only things to service, skip the
-	 * main part of the loop and go directly to handle idle
-	 * events (i.e. don't wait even if TCL_DONT_WAIT isn't set).
-	 */
-
-	if ((flags & TCL_ALL_EVENTS) == TCL_IDLE_EVENTS) {
-	    flags = TCL_IDLE_EVENTS|TCL_DONT_WAIT;
-	    goto idleEvents;
-	}
-
-	/*
-	 * Ask Tcl to service a queued event, if there are any.
-	 */
-
-	if (Tcl_ServiceEvent(flags)) {
-	    result = 1;	    
-	    break;
-	}
-
-	/*
-	 * If TCL_DONT_WAIT is set, be sure to poll rather than
-	 * blocking, otherwise reset the block time to infinity.
-	 */
-
-	if (flags & TCL_DONT_WAIT) {
-	    tsdPtr->blockTime.sec = 0;
-	    tsdPtr->blockTime.usec = 0;
-	    tsdPtr->blockTimeSet = 1;
-	} else {
-	    tsdPtr->blockTimeSet = 0;
-	}
-
-	/*
-	 * Set up all the event sources for new events.  This will
-	 * cause the block time to be updated if necessary.
-	 */
-
-	tsdPtr->inTraversal = 1;
-	for (sourcePtr = tsdPtr->firstEventSourcePtr; sourcePtr != NULL;
-	     sourcePtr = sourcePtr->nextPtr) {
-	    if (sourcePtr->setupProc) {
-		(sourcePtr->setupProc)(sourcePtr->clientData, flags);
-	    }
-	}
-	tsdPtr->inTraversal = 0;
-
-	if ((flags & TCL_DONT_WAIT) || tsdPtr->blockTimeSet) {
-	    timePtr = &tsdPtr->blockTime;
-	} else {
-	    timePtr = NULL;
-	}
-
-	/*
-	 * Wait for a new event or a timeout.  If Tcl_WaitForEvent
-	 * returns -1, we should abort Tcl_DoOneEvent.
-	 */
-
-	result = Tcl_WaitForEvent(timePtr);
-	if (result < 0) {
-	    result = 0;
-	    break;
-	}
-
-	/*
-	 * Check all the event sources for new events.
-	 */
-
-	for (sourcePtr = tsdPtr->firstEventSourcePtr; sourcePtr != NULL;
-	     sourcePtr = sourcePtr->nextPtr) {
-	    if (sourcePtr->checkProc) {
-		(sourcePtr->checkProc)(sourcePtr->clientData, flags);
-	    }
-	}
-
-	/*
-	 * Check for events queued by the notifier or event sources.
-	 */
-
-	if (Tcl_ServiceEvent(flags)) {
-	    result = 1;
-	    break;
-	}
-
-	/*
-	 * We've tried everything at this point, but nobody we know
-	 * about had anything to do.  Check for idle events.  If none,
-	 * either quit or go back to the top and try again.
-	 */
-
-	idleEvents:
-	if (flags & TCL_IDLE_EVENTS) {
-	    if (TclServiceIdle()) {
-		result = 1;
-		break;
-	    }
-	}
-	if (flags & TCL_DONT_WAIT) {
-	    break;
-	}
-
-	/*
-	 * If Tcl_WaitForEvent has returned 1,
-	 * indicating that one system event has been dispatched
-	 * (and thus that some Tcl code might have been indirectly executed),
-	 * we break out of the loop.
-	 * We do this to give VwaitCmd for instance a chance to check 
-	 * if that system event had the side effect of changing the 
-	 * variable (so the vwait can return and unwind properly).
-	 *
-	 * NB: We will process idle events if any first, because
-	 *     otherwise we might never do the idle events if the notifier
-	 *     always gets system events.
-	 */
-
-	if (result) {
-	    break;
-	}
-
-    }
-
-    tsdPtr->serviceMode = oldMode;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ServiceAll --
- *
- *	This routine checks all of the event sources, processes
- *	events that are on the Tcl event queue, and then calls the
- *	any idle handlers.  Platform specific notifier callbacks that
- *	generate events should call this routine before returning to
- *	the system in order to ensure that Tcl gets a chance to
- *	process the new events.
- *
- * Results:
- *	Returns 1 if an event or idle handler was invoked, else 0.
- *
- * Side effects:
- *	Anything that an event or idle handler may do.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ServiceAll()
-{
-    int result = 0;
-    EventSource *sourcePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (tsdPtr->serviceMode == TCL_SERVICE_NONE) {
-	return result;
-    }
-
-    /*
-     * We need to turn off event servicing like we to in Tcl_DoOneEvent,
-     * to avoid recursive calls.
-     */
-    
-    tsdPtr->serviceMode = TCL_SERVICE_NONE;
-
-    /*
-     * Check async handlers first.
-     */
-
-    if (Tcl_AsyncReady()) {
-	(void) Tcl_AsyncInvoke((Tcl_Interp *) NULL, 0);
-    }
-
-    /*
-     * Make a single pass through all event sources, queued events,
-     * and idle handlers.  Note that we wait to update the notifier
-     * timer until the end so we can avoid multiple changes.
-     */
-
-    tsdPtr->inTraversal = 1;
-    tsdPtr->blockTimeSet = 0;
-
-    for (sourcePtr = tsdPtr->firstEventSourcePtr; sourcePtr != NULL;
-	 sourcePtr = sourcePtr->nextPtr) {
-	if (sourcePtr->setupProc) {
-	    (sourcePtr->setupProc)(sourcePtr->clientData, TCL_ALL_EVENTS);
-	}
-    }
-    for (sourcePtr = tsdPtr->firstEventSourcePtr; sourcePtr != NULL;
-	 sourcePtr = sourcePtr->nextPtr) {
-	if (sourcePtr->checkProc) {
-	    (sourcePtr->checkProc)(sourcePtr->clientData, TCL_ALL_EVENTS);
-	}
-    }
-
-    while (Tcl_ServiceEvent(0)) {
-	result = 1;
-    }
-    if (TclServiceIdle()) {
-	result = 1;
-    }
-
-    if (!tsdPtr->blockTimeSet) {
-	Tcl_SetTimer(NULL);
-    } else {
-	Tcl_SetTimer(&tsdPtr->blockTime);
-    }
-    tsdPtr->inTraversal = 0;
-    tsdPtr->serviceMode = TCL_SERVICE_ALL;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ThreadAlert --
- *
- *	This function wakes up the notifier associated with the
- *	specified thread (if there is one).  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ThreadAlert(threadId)
-    Tcl_ThreadId threadId;	/* Identifier for thread to use. */
-{
-    ThreadSpecificData *tsdPtr;
-
-    /*
-     * Find the notifier associated with the specified thread.
-     * Note that we need to hold the listLock while calling
-     * Tcl_AlertNotifier to avoid a race condition where
-     * the specified thread might destroy its notifier.
-     */
-
-    Tcl_MutexLock(&listLock);
-    for (tsdPtr = firstNotifierPtr; tsdPtr; tsdPtr = tsdPtr->nextPtr) {
-	if (tsdPtr->threadId == threadId) {
-	    Tcl_AlertNotifier(tsdPtr->clientData);
-	    break;
-	}
-    }
-    Tcl_MutexUnlock(&listLock);
-}
diff --git a/generic/tclObj.c b/generic/tclObj.c
deleted file mode 100644
index c4895ee..0000000
--- a/generic/tclObj.c
+++ /dev/null
@@ -1,2088 +0,0 @@
-/* 
- * tclObj.c --
- *
- *	This file contains Tcl object-related procedures that are used by
- * 	many Tcl commands.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclObj.c,v 1.5 1999/04/16 00:46:50 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Table of all object types.
- */
-
-static Tcl_HashTable typeTable;
-static int typeTableInitialized = 0;    /* 0 means not yet initialized. */
-TCL_DECLARE_MUTEX(tableMutex)
-
-/*
- * Head of the list of free Tcl_Obj structs we maintain.
- */
-
-Tcl_Obj *tclFreeObjList = NULL;
-
-/*
- * The object allocator is single threaded.  This mutex is referenced
- * by the TclNewObj macro, however, so must be visible.
- */
-
-#ifdef TCL_THREADS
-Tcl_Mutex tclObjMutex;
-#endif
-
-/*
- * Pointer to a heap-allocated string of length zero that the Tcl core uses
- * as the value of an empty string representation for an object. This value
- * is shared by all new objects allocated by Tcl_NewObj.
- */
-
-static char emptyString;
-char *tclEmptyStringRep = &emptyString;
-
-/*
- * The number of Tcl objects ever allocated (by Tcl_NewObj) and freed
- * (by TclFreeObj).
- */
-
-#ifdef TCL_COMPILE_STATS
-long tclObjsAlloced = 0;
-long tclObjsFreed = 0;
-#endif /* TCL_COMPILE_STATS */
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int		SetBooleanFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static int		SetDoubleFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static int		SetIntFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static void		UpdateStringOfBoolean _ANSI_ARGS_((Tcl_Obj *objPtr));
-static void		UpdateStringOfDouble _ANSI_ARGS_((Tcl_Obj *objPtr));
-static void		UpdateStringOfInt _ANSI_ARGS_((Tcl_Obj *objPtr));
-
-/*
- * The structures below defines the Tcl object types defined in this file by
- * means of procedures that can be invoked by generic object code. See also
- * tclStringObj.c, tclListObj.c, tclByteCode.c for other type manager
- * implementations.
- */
-
-Tcl_ObjType tclBooleanType = {
-    "boolean",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,   /* freeIntRepProc */
-    (Tcl_DupInternalRepProc *) NULL,	/* dupIntRepProc */
-    UpdateStringOfBoolean,		/* updateStringProc */
-    SetBooleanFromAny			/* setFromAnyProc */
-};
-
-Tcl_ObjType tclDoubleType = {
-    "double",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,   /* freeIntRepProc */
-    (Tcl_DupInternalRepProc *) NULL,	/* dupIntRepProc */
-    UpdateStringOfDouble,		/* updateStringProc */
-    SetDoubleFromAny			/* setFromAnyProc */
-};
-
-Tcl_ObjType tclIntType = {
-    "int",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,   /* freeIntRepProc */
-    (Tcl_DupInternalRepProc *) NULL,	/* dupIntRepProc */
-    UpdateStringOfInt,			/* updateStringProc */
-    SetIntFromAny			/* setFromAnyProc */
-};
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclInitObjectSubsystem --
- *
- *	This procedure is invoked to perform once-only initialization of
- *	the type table. It also registers the object types defined in 
- *	this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Initializes the table of defined object types "typeTable" with
- *	builtin object types defined in this file.  
- *
- *-------------------------------------------------------------------------
- */
-
-void
-TclInitObjSubsystem()
-{
-    Tcl_MutexLock(&tableMutex);
-    typeTableInitialized = 1;
-    Tcl_InitHashTable(&typeTable, TCL_STRING_KEYS);
-    Tcl_MutexUnlock(&tableMutex);
-
-    Tcl_RegisterObjType(&tclBooleanType);
-    Tcl_RegisterObjType(&tclByteArrayType);
-    Tcl_RegisterObjType(&tclDoubleType);
-    Tcl_RegisterObjType(&tclIntType);
-    Tcl_RegisterObjType(&tclStringType);
-    Tcl_RegisterObjType(&tclListType);
-    Tcl_RegisterObjType(&tclByteCodeType);
-    Tcl_RegisterObjType(&tclProcBodyType);
-
-#ifdef TCL_COMPILE_STATS
-    Tcl_MutexLock(&tclObjMutex);
-    tclObjsAlloced = 0;
-    tclObjsFreed = 0;
-    Tcl_MutexUnlock(&tclObjMutex);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeCompExecEnv --
- *
- *	This procedure is called by Tcl_Finalize to clean up the Tcl
- *	compilation and execution environment so it can later be properly
- *	reinitialized.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Cleans up the compilation and execution environment
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeCompExecEnv()
-{
-    Tcl_MutexLock(&tableMutex);
-    if (typeTableInitialized) {
-        Tcl_DeleteHashTable(&typeTable);
-        typeTableInitialized = 0;
-    }
-    Tcl_MutexUnlock(&tableMutex);
-    Tcl_MutexLock(&tclObjMutex);
-    tclFreeObjList = NULL;
-    Tcl_MutexUnlock(&tclObjMutex);
-
-    TclFinalizeCompilation();
-    TclFinalizeExecution();
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_RegisterObjType --
- *
- *	This procedure is called to register a new Tcl object type
- *	in the table of all object types supported by Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The type is registered in the Tcl type table. If there was already
- *	a type with the same name as in typePtr, it is replaced with the
- *	new type.
- *
- *--------------------------------------------------------------
- */
-
-void
-Tcl_RegisterObjType(typePtr)
-    Tcl_ObjType *typePtr;	/* Information about object type;
-				 * storage must be statically
-				 * allocated (must live forever). */
-{
-    register Tcl_HashEntry *hPtr;
-    int new;
-
-    /*
-     * If there's already an object type with the given name, remove it.
-     */
-    Tcl_MutexLock(&tableMutex);
-    hPtr = Tcl_FindHashEntry(&typeTable, typePtr->name);
-    if (hPtr != (Tcl_HashEntry *) NULL) {
-        Tcl_DeleteHashEntry(hPtr);
-    }
-
-    /*
-     * Now insert the new object type.
-     */
-
-    hPtr = Tcl_CreateHashEntry(&typeTable, typePtr->name, &new);
-    if (new) {
-	Tcl_SetHashValue(hPtr, typePtr);
-    }
-    Tcl_MutexUnlock(&tableMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendAllObjTypes --
- *
- *	This procedure appends onto the argument object the name of each
- *	object type as a list element. This includes the builtin object
- *	types (e.g. int, list) as well as those added using
- *	Tcl_NewObj. These names can be used, for example, with
- *	Tcl_GetObjType to get pointers to the corresponding Tcl_ObjType
- *	structures.
- *
- * Results:
- *	The return value is normally TCL_OK; in this case the object
- *	referenced by objPtr has each type name appended to it. If an
- *	error occurs, TCL_ERROR is returned and the interpreter's result
- *	holds an error message.
- *
- * Side effects:
- *	If necessary, the object referenced by objPtr is converted into
- *	a list object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppendAllObjTypes(interp, objPtr)
-    Tcl_Interp *interp;		/* Interpreter used for error reporting. */
-    Tcl_Obj *objPtr;		/* Points to the Tcl object onto which the
-				 * name of each registered type is appended
-				 * as a list element. */
-{
-    register Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    Tcl_ObjType *typePtr;
-    int result;
- 
-    /*
-     * This code assumes that types names do not contain embedded NULLs.
-     */
-
-    Tcl_MutexLock(&tableMutex);
-    for (hPtr = Tcl_FirstHashEntry(&typeTable, &search);
-	    hPtr != NULL;  hPtr = Tcl_NextHashEntry(&search)) {
-        typePtr = (Tcl_ObjType *) Tcl_GetHashValue(hPtr);
-	result = Tcl_ListObjAppendElement(interp, objPtr,
-	        Tcl_NewStringObj(typePtr->name, -1));
-	if (result == TCL_ERROR) {
-	    Tcl_MutexUnlock(&tableMutex);
-	    return result;
-	}
-    }
-    Tcl_MutexUnlock(&tableMutex);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetObjType --
- *
- *	This procedure looks up an object type by name.
- *
- * Results:
- *	If an object type with name matching "typeName" is found, a pointer
- *	to its Tcl_ObjType structure is returned; otherwise, NULL is
- *	returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_ObjType *
-Tcl_GetObjType(typeName)
-    char *typeName;		/* Name of Tcl object type to look up. */
-{
-    register Tcl_HashEntry *hPtr;
-    Tcl_ObjType *typePtr;
-
-    Tcl_MutexLock(&tableMutex);
-    hPtr = Tcl_FindHashEntry(&typeTable, typeName);
-    if (hPtr != (Tcl_HashEntry *) NULL) {
-        typePtr = (Tcl_ObjType *) Tcl_GetHashValue(hPtr);
-	Tcl_MutexUnlock(&tableMutex);
-	return typePtr;
-    }
-    Tcl_MutexUnlock(&tableMutex);
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConvertToType --
- *
- *	Convert the Tcl object "objPtr" to have type "typePtr" if possible.
- *
- * Results:
- *	The return value is TCL_OK on success and TCL_ERROR on failure. If
- *	TCL_ERROR is returned, then the interpreter's result contains an
- *	error message unless "interp" is NULL. Passing a NULL "interp"
- *	allows this procedure to be used as a test whether the conversion
- *	could be done (and in fact was done).
- *
- * Side effects:
- *	Any internal representation for the old type is freed.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ConvertToType(interp, objPtr, typePtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* The object to convert. */
-    Tcl_ObjType *typePtr;	/* The target type. */
-{
-    if (objPtr->typePtr == typePtr) {
-	return TCL_OK;
-    }
-
-    /*
-     * Use the target type's Tcl_SetFromAnyProc to set "objPtr"s internal
-     * form as appropriate for the target type. This frees the old internal
-     * representation.
-     */
-
-    return typePtr->setFromAnyProc(interp, objPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewObj --
- *
- *	This procedure is normally called when not debugging: i.e., when
- *	TCL_MEM_DEBUG is not defined. It creates new Tcl objects that denote
- *	the empty string. These objects have a NULL object type and NULL
- *	string representation byte pointer. Type managers call this routine
- *	to allocate new objects that they further initialize.
- *
- *	When TCL_MEM_DEBUG is defined, this procedure just returns the
- *	result of calling the debugging version Tcl_DbNewObj.
- *
- * Results:
- *	The result is a newly allocated object that represents the empty
- *	string. The new object's typePtr is set NULL and its ref count
- *	is set to 0.
- *
- * Side effects:
- *	If compiling with TCL_COMPILE_STATS, this procedure increments
- *	the global count of allocated objects (tclObjsAlloced).
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewObj
-
-Tcl_Obj *
-Tcl_NewObj()
-{
-    return Tcl_DbNewObj("unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewObj()
-{
-    register Tcl_Obj *objPtr;
-
-    /*
-     * Allocate the object using the list of free Tcl_Obj structs
-     * we maintain.
-     */
-
-    Tcl_MutexLock(&tclObjMutex);
-    if (tclFreeObjList == NULL) {
-	TclAllocateFreeObjects();
-    }
-    objPtr = tclFreeObjList;
-    tclFreeObjList = (Tcl_Obj *) tclFreeObjList->internalRep.otherValuePtr;
-    
-    objPtr->refCount = 0;
-    objPtr->bytes    = tclEmptyStringRep;
-    objPtr->length   = 0;
-    objPtr->typePtr  = NULL;
-#ifdef TCL_COMPILE_STATS
-    tclObjsAlloced++;
-#endif /* TCL_COMPILE_STATS */
-    Tcl_MutexUnlock(&tclObjMutex);
-    return objPtr;
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It creates new Tcl objects that denote the
- *	empty string. It is the same as the Tcl_NewObj procedure above
- *	except that it calls Tcl_DbCkalloc directly with the file name and
- *	line number from its caller. This simplifies debugging since then
- *	the checkmem command will report the correct file name and line
- *	number when reporting objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewObj.
- *
- * Results:
- *	The result is a newly allocated that represents the empty string.
- *	The new object's typePtr is set NULL and its ref count is set to 0.
- *
- * Side effects:
- *	If compiling with TCL_COMPILE_STATS, this procedure increments
- *	the global count of allocated objects (tclObjsAlloced).
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewObj(file, line)
-    register char *file;	/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    register int line;		/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *objPtr;
-
-    /*
-     * If debugging Tcl's memory usage, allocate the object using ckalloc.
-     * Otherwise, allocate it using the list of free Tcl_Obj structs we
-     * maintain.
-     */
-
-    objPtr = (Tcl_Obj *) Tcl_DbCkalloc(sizeof(Tcl_Obj), file, line);
-    objPtr->refCount = 0;
-    objPtr->bytes    = tclEmptyStringRep;
-    objPtr->length   = 0;
-    objPtr->typePtr  = NULL;
-#ifdef TCL_COMPILE_STATS
-    Tcl_MutexLock(&tclObjMutex);
-    tclObjsAlloced++;
-    Tcl_MutexUnlock(&tclObjMutex);
-#endif /* TCL_COMPILE_STATS */
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewObj(file, line)
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewObj();
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclAllocateFreeObjects --
- *
- *	Procedure to allocate a number of free Tcl_Objs. This is done using
- *	a single ckalloc to reduce the overhead for Tcl_Obj allocation.
- *
- *	Assumes mutex is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	tclFreeObjList, the head of the list of free Tcl_Objs, is set to the
- *	first of a number of free Tcl_Obj's linked together by their
- *	internalRep.otherValuePtrs.
- *
- *----------------------------------------------------------------------
- */
-
-#define OBJS_TO_ALLOC_EACH_TIME 100
-
-void
-TclAllocateFreeObjects()
-{
-    Tcl_Obj tmp[2];
-    size_t objSizePlusPadding =	/* NB: this assumes byte addressing. */
-	((int)(&(tmp[1])) - (int)(&(tmp[0])));
-    size_t bytesToAlloc = (OBJS_TO_ALLOC_EACH_TIME * objSizePlusPadding);
-    char *basePtr;
-    register Tcl_Obj *prevPtr, *objPtr;
-    register int i;
-
-    basePtr = (char *) ckalloc(bytesToAlloc);
-    memset(basePtr, 0, bytesToAlloc);
-
-    prevPtr = NULL;
-    objPtr = (Tcl_Obj *) basePtr;
-    for (i = 0;  i < OBJS_TO_ALLOC_EACH_TIME;  i++) {
-	objPtr->internalRep.otherValuePtr = (VOID *) prevPtr;
-	prevPtr = objPtr;
-	objPtr = (Tcl_Obj *) (((char *)objPtr) + objSizePlusPadding);
-    }
-    tclFreeObjList = prevPtr;
-}
-#undef OBJS_TO_ALLOC_EACH_TIME
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFreeObj --
- *
- *	This procedure frees the memory associated with the argument
- *	object. It is called by the tcl.h macro Tcl_DecrRefCount when an
- *	object's ref count is zero. It is only "public" since it must
- *	be callable by that macro wherever the macro is used. It should not
- *	be directly called by clients.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deallocates the storage for the object's Tcl_Obj structure
- *	after deallocating the string representation and calling the
- *	type-specific Tcl_FreeInternalRepProc to deallocate the object's
- *	internal representation. If compiling with TCL_COMPILE_STATS,
- *	this procedure increments the global count of freed objects
- *	(tclObjsFreed).
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFreeObj(objPtr)
-    register Tcl_Obj *objPtr;	/* The object to be freed. */
-{
-    register Tcl_ObjType *typePtr = objPtr->typePtr;
-    
-#ifdef TCL_MEM_DEBUG
-    if ((objPtr)->refCount < -1) {
-	panic("Reference count for %lx was negative", objPtr);
-    }
-#endif /* TCL_MEM_DEBUG */
-
-    if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
-	typePtr->freeIntRepProc(objPtr);
-    }
-    Tcl_InvalidateStringRep(objPtr);
-
-    /*
-     * If debugging Tcl's memory usage, deallocate the object using ckfree.
-     * Otherwise, deallocate it by adding it onto the list of free
-     * Tcl_Obj structs we maintain.
-     */
-
-    Tcl_MutexLock(&tclObjMutex);
-#ifdef TCL_MEM_DEBUG
-    ckfree((char *) objPtr);
-#else
-    objPtr->internalRep.otherValuePtr = (VOID *) tclFreeObjList;
-    tclFreeObjList = objPtr;
-#endif /* TCL_MEM_DEBUG */
-
-#ifdef TCL_COMPILE_STATS
-    tclObjsFreed++;
-#endif /* TCL_COMPILE_STATS */
-    Tcl_MutexUnlock(&tclObjMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DuplicateObj --
- *
- *	Create and return a new object that is a duplicate of the argument
- *	object.
- *
- * Results:
- *	The return value is a pointer to a newly created Tcl_Obj. This
- *	object has reference count 0 and the same type, if any, as the
- *	source object objPtr. Also:
- *	  1) If the source object has a valid string rep, we copy it;
- *	     otherwise, the duplicate's string rep is set NULL to mark
- *	     it invalid.
- *	  2) If the source object has an internal representation (i.e. its
- *	     typePtr is non-NULL), the new object's internal rep is set to
- *	     a copy; otherwise the new internal rep is marked invalid.
- *
- * Side effects:
- *      What constitutes "copying" the internal representation depends on
- *	the type. For example, if the argument object is a list,
- *	the element objects it points to will not actually be copied but
- *	will be shared with the duplicate list. That is, the ref counts of
- *	the element objects will be incremented.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_DuplicateObj(objPtr)
-    register Tcl_Obj *objPtr;		/* The object to duplicate. */
-{
-    register Tcl_ObjType *typePtr = objPtr->typePtr;
-    register Tcl_Obj *dupPtr;
-
-    TclNewObj(dupPtr);
-
-    if (objPtr->bytes == NULL) {
-	dupPtr->bytes = NULL;
-    } else if (objPtr->bytes != tclEmptyStringRep) {
-	int len = objPtr->length;
-	
-	dupPtr->bytes = (char *) ckalloc((unsigned) len+1);
-	if (len > 0) {
-	    memcpy((VOID *) dupPtr->bytes, (VOID *) objPtr->bytes,
-		   (unsigned) len);
-	}
-	dupPtr->bytes[len] = '\0';
-	dupPtr->length = len;
-    }
-    
-    if (typePtr != NULL) {
-	if (typePtr->dupIntRepProc == NULL) {
-	    dupPtr->internalRep = objPtr->internalRep;
-	    dupPtr->typePtr = typePtr;
-	} else {
-	    (*typePtr->dupIntRepProc)(objPtr, dupPtr);
-	}
-    }
-    return dupPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetString --
- *
- *	Returns the string representation byte array pointer for an object.
- *
- * Results:
- *	Returns a pointer to the string representation of objPtr. The byte
- *	array referenced by the returned pointer must not be modified by the
- *	caller. Furthermore, the caller must copy the bytes if they need to
- *	retain them since the object's string rep can change as a result of
- *	other operations.
- *
- * Side effects:
- *	May call the object's updateStringProc to update the string
- *	representation from the internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetString(objPtr)
-    register Tcl_Obj *objPtr;	/* Object whose string rep byte pointer
-				 * should be returned. */
-{
-    if (objPtr->bytes != NULL) {
-	return objPtr->bytes;
-    }
-
-    if (objPtr->typePtr->updateStringProc == NULL) {
-	panic("UpdateStringProc should not be invoked for type %s",
-		objPtr->typePtr->name);
-    }
-    (*objPtr->typePtr->updateStringProc)(objPtr);
-    return objPtr->bytes;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetStringFromObj --
- *
- *	Returns the string representation's byte array pointer and length
- *	for an object.
- *
- * Results:
- *	Returns a pointer to the string representation of objPtr. If
- *	lengthPtr isn't NULL, the length of the string representation is
- *	stored at *lengthPtr. The byte array referenced by the returned
- *	pointer must not be modified by the caller. Furthermore, the
- *	caller must copy the bytes if they need to retain them since the
- *	object's string rep can change as a result of other operations.
- *
- * Side effects:
- *	May call the object's updateStringProc to update the string
- *	representation from the internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetStringFromObj(objPtr, lengthPtr)
-    register Tcl_Obj *objPtr;	/* Object whose string rep byte pointer
-				 * should be returned. */
-    register int *lengthPtr;	/* If non-NULL, the location where the
-				 * string rep's byte array length should be
-				 * stored. If NULL, no length is stored. */
-{
-    if (objPtr->bytes != NULL) {
-	if (lengthPtr != NULL) {
-	    *lengthPtr = objPtr->length;
-	}
-	return objPtr->bytes;
-    }
-
-    if (objPtr->typePtr->updateStringProc == NULL) {
-	panic("UpdateStringProc should not be invoked for type %s",
-		objPtr->typePtr->name);
-    }
-    (*objPtr->typePtr->updateStringProc)(objPtr);
-    if (lengthPtr != NULL) {
-	*lengthPtr = objPtr->length;
-    }
-    return objPtr->bytes;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InvalidateStringRep --
- *
- *	This procedure is called to invalidate an object's string
- *	representation. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deallocates the storage for any old string representation, then
- *	sets the string representation NULL to mark it invalid.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_InvalidateStringRep(objPtr)
-     register Tcl_Obj *objPtr;	/* Object whose string rep byte pointer
-				 * should be freed. */
-{
-    if (objPtr->bytes != NULL) {
-	if (objPtr->bytes != tclEmptyStringRep) {
-	    ckfree((char *) objPtr->bytes);
-	}
-	objPtr->bytes = NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewBooleanObj --
- *
- *	This procedure is normally called when not debugging: i.e., when
- *	TCL_MEM_DEBUG is not defined. It creates a new boolean object and
- *	initializes it from the argument boolean value. A nonzero
- *	"boolValue" is coerced to 1.
- *
- *	When TCL_MEM_DEBUG is defined, this procedure just returns the
- *	result of calling the debugging version Tcl_DbNewBooleanObj.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewBooleanObj
-
-Tcl_Obj *
-Tcl_NewBooleanObj(boolValue)
-    register int boolValue;	/* Boolean used to initialize new object. */
-{
-    return Tcl_DbNewBooleanObj(boolValue, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewBooleanObj(boolValue)
-    register int boolValue;	/* Boolean used to initialize new object. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclNewObj(objPtr);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.longValue = (boolValue? 1 : 0);
-    objPtr->typePtr = &tclBooleanType;
-    return objPtr;
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewBooleanObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It creates new boolean objects. It is the
- *	same as the Tcl_NewBooleanObj procedure above except that it calls
- *	Tcl_DbCkalloc directly with the file name and line number from its
- *	caller. This simplifies debugging since then the checkmem command
- *	will report the correct file name and line number when reporting
- *	objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewBooleanObj.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewBooleanObj(boolValue, file, line)
-    register int boolValue;	/* Boolean used to initialize new object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclDbNewObj(objPtr, file, line);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.longValue = (boolValue? 1 : 0);
-    objPtr->typePtr = &tclBooleanType;
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewBooleanObj(boolValue, file, line)
-    register int boolValue;	/* Boolean used to initialize new object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewBooleanObj(boolValue);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetBooleanObj --
- *
- *	Modify an object to be a boolean object and to have the specified
- *	boolean value. A nonzero "boolValue" is coerced to 1.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep, if any, is freed. Also, any old
- *	internal rep is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetBooleanObj(objPtr, boolValue)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to init. */
-    register int boolValue;	/* Boolean used to set object's value. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetBooleanObj called with shared object");
-    }
-    
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = (boolValue? 1 : 0);
-    objPtr->typePtr = &tclBooleanType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetBooleanFromObj --
- *
- *	Attempt to return a boolean from the Tcl object "objPtr". If the
- *	object is not already a boolean, an attempt will be made to convert
- *	it to one.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	If the object is not already a boolean, the conversion will free
- *	any old internal representation. 
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetBooleanFromObj(interp, objPtr, boolPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object from which to get boolean. */
-    register int *boolPtr;	/* Place to store resulting boolean. */
-{
-    register int result;
-
-    result = SetBooleanFromAny(interp, objPtr);
-    if (result == TCL_OK) {
-	*boolPtr = (int) objPtr->internalRep.longValue;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetBooleanFromAny --
- *
- *	Attempt to generate a boolean internal form for the Tcl object
- *	"objPtr".
- *
- * Results:
- *	The return value is a standard Tcl result. If an error occurs during
- *	conversion, an error message is left in the interpreter's result
- *	unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, an integer 1 or 0 is stored as "objPtr"s
- *	internal representation and the type of "objPtr" is set to boolean.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetBooleanFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *string, *end;
-    register char c;
-    char lowerCase[10];
-    int newBool, length;
-    register int i;
-    double dbl;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    /*
-     * Copy the string converting its characters to lower case.
-     */
-
-    for (i = 0;  (i < 9) && (i < length);  i++) {
-	c = string[i];
-	/*
-	 * Weed out international characters so we can safely operate
-	 * on single bytes.
-	 */
-
-	if (c & 0x80) {
-	    goto badBoolean;
-	}
-	if (isupper(UCHAR(c))) { /* INTL: ISO only. */
-	    c = (char) UCHAR(tolower(UCHAR(c))); /* INTL: ISO only. */
-	}
-	lowerCase[i] = c;
-    }
-    lowerCase[i] = 0;
-
-    /*
-     * Parse the string as a boolean. We use an implementation here that
-     * doesn't report errors in interp if interp is NULL.
-     */
-
-    c = lowerCase[0];
-    if ((c == '0') && (lowerCase[1] == '\0')) {
-	newBool = 0;
-    } else if ((c == '1') && (lowerCase[1] == '\0')) {
-	newBool = 1;
-    } else if ((c == 'y') && (strncmp(lowerCase, "yes", (size_t) length) == 0)) {
-	newBool = 1;
-    } else if ((c == 'n') && (strncmp(lowerCase, "no", (size_t) length) == 0)) {
-	newBool = 0;
-    } else if ((c == 't') && (strncmp(lowerCase, "true", (size_t) length) == 0)) {
-	newBool = 1;
-    } else if ((c == 'f') && (strncmp(lowerCase, "false", (size_t) length) == 0)) {
-	newBool = 0;
-    } else if ((c == 'o') && (length >= 2)) {
-	if (strncmp(lowerCase, "on", (size_t) length) == 0) {
-	    newBool = 1;
-	} else if (strncmp(lowerCase, "off", (size_t) length) == 0) {
-	    newBool = 0;
-	} else {
-	    goto badBoolean;
-	}
-    } else {
-        /*
-         * Still might be a string containing the characters representing an
-         * int or double that wasn't handled above. This would be a string
-         * like "27" or "1.0" that is non-zero and not "1". Such a string
-         * whould result in the boolean value true. We try converting to
-         * double. If that succeeds and the resulting double is non-zero, we
-         * have a "true". Note that numbers can't have embedded NULLs.
-	 */
-
-	dbl = strtod(string, &end);
-	if (end == string) {
-	    goto badBoolean;
-	}
-
-	/*
-	 * Make sure the string has no garbage after the end of the double.
-	 */
-	
-	while ((end < (string+length))
-		&& isspace(UCHAR(*end))) { /* INTL: ISO only */
-	    end++;
-	}
-	if (end != (string+length)) {
-	    goto badBoolean;
-	}
-	newBool = (dbl != 0.0);
-    }
-
-    /*
-     * Free the old internalRep before setting the new one. We do this as
-     * late as possible to allow the conversion code, in particular
-     * Tcl_GetStringFromObj, to use that old internalRep.
-     */
-
-    if ((oldTypePtr != NULL) &&	(oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-
-    objPtr->internalRep.longValue = newBool;
-    objPtr->typePtr = &tclBooleanType;
-    return TCL_OK;
-
-    badBoolean:
-    if (interp != NULL) {
-	/*
-	 * Must copy string before resetting the result in case a caller
-	 * is trying to convert the interpreter's result to a boolean.
-	 */
-	
-	char buf[100];
-	sprintf(buf, "expected boolean value but got \"%.50s\"", string);
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfBoolean --
- *
- *	Update the string representation for a boolean object.
- *	Note: This procedure does not free an existing old string rep
- *	so storage will be lost if this has not already been done. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the boolean-to-string conversion.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfBoolean(objPtr)
-    register Tcl_Obj *objPtr;	/* Int object whose string rep to update. */
-{
-    char *s = ckalloc((unsigned) 2);
-    
-    s[0] = (char) (objPtr->internalRep.longValue? '1' : '0');
-    s[1] = '\0';
-    objPtr->bytes = s;
-    objPtr->length = 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewDoubleObj --
- *
- *	This procedure is normally called when not debugging: i.e., when
- *	TCL_MEM_DEBUG is not defined. It creates a new double object and
- *	initializes it from the argument double value.
- *
- *	When TCL_MEM_DEBUG is defined, this procedure just returns the
- *	result of calling the debugging version Tcl_DbNewDoubleObj.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewDoubleObj
-
-Tcl_Obj *
-Tcl_NewDoubleObj(dblValue)
-    register double dblValue;	/* Double used to initialize the object. */
-{
-    return Tcl_DbNewDoubleObj(dblValue, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewDoubleObj(dblValue)
-    register double dblValue;	/* Double used to initialize the object. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclNewObj(objPtr);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.doubleValue = dblValue;
-    objPtr->typePtr = &tclDoubleType;
-    return objPtr;
-}
-#endif /* if TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewDoubleObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It creates new double objects. It is the
- *	same as the Tcl_NewDoubleObj procedure above except that it calls
- *	Tcl_DbCkalloc directly with the file name and line number from its
- *	caller. This simplifies debugging since then the checkmem command
- *	will report the correct file name and line number when reporting
- *	objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewDoubleObj.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewDoubleObj(dblValue, file, line)
-    register double dblValue;	/* Double used to initialize the object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclDbNewObj(objPtr, file, line);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.doubleValue = dblValue;
-    objPtr->typePtr = &tclDoubleType;
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewDoubleObj(dblValue, file, line)
-    register double dblValue;	/* Double used to initialize the object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewDoubleObj(dblValue);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetDoubleObj --
- *
- *	Modify an object to be a double object and to have the specified
- *	double value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep, if any, is freed. Also, any old
- *	internal rep is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetDoubleObj(objPtr, dblValue)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to init. */
-    register double dblValue;	/* Double used to set the object's value. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetDoubleObj called with shared object");
-    }
-
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.doubleValue = dblValue;
-    objPtr->typePtr = &tclDoubleType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetDoubleFromObj --
- *
- *	Attempt to return a double from the Tcl object "objPtr". If the
- *	object is not already a double, an attempt will be made to convert
- *	it to one.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	If the object is not already a double, the conversion will free
- *	any old internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetDoubleFromObj(interp, objPtr, dblPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object from which to get a double. */
-    register double *dblPtr;	/* Place to store resulting double. */
-{
-    register int result;
-    
-    if (objPtr->typePtr == &tclDoubleType) {
-	*dblPtr = objPtr->internalRep.doubleValue;
-	return TCL_OK;
-    }
-
-    result = SetDoubleFromAny(interp, objPtr);
-    if (result == TCL_OK) {
-	*dblPtr = objPtr->internalRep.doubleValue;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetDoubleFromAny --
- *
- *	Attempt to generate an double-precision floating point internal form
- *	for the Tcl object "objPtr".
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, a double is stored as "objPtr"s internal
- *	representation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetDoubleFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *string, *end;
-    double newDouble;
-    int length;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    /*
-     * Now parse "objPtr"s string as an double. Numbers can't have embedded
-     * NULLs. We use an implementation here that doesn't report errors in
-     * interp if interp is NULL.
-     */
-
-    errno = 0;
-    newDouble = strtod(string, &end);
-    if (end == string) {
-	badDouble:
-	if (interp != NULL) {
-	    /*
-	     * Must copy string before resetting the result in case a caller
-	     * is trying to convert the interpreter's result to an int.
-	     */
-	    
-	    char buf[100];
-	    sprintf(buf, "expected floating-point number but got \"%.50s\"",
-	            string);
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-	}
-	return TCL_ERROR;
-    }
-    if (errno != 0) {
-	if (interp != NULL) {
-	    TclExprFloatError(interp, newDouble);
-	}
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure that the string has no garbage after the end of the double.
-     */
-    
-    while ((end < (string+length))
-	    && isspace(UCHAR(*end))) { /* INTL: ISO space. */
-	end++;
-    }
-    if (end != (string+length)) {
-	goto badDouble;
-    }
-    
-    /*
-     * The conversion to double succeeded. Free the old internalRep before
-     * setting the new one. We do this as late as possible to allow the
-     * conversion code, in particular Tcl_GetStringFromObj, to use that old
-     * internalRep.
-     */
-    
-    if ((oldTypePtr != NULL) &&	(oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-
-    objPtr->internalRep.doubleValue = newDouble;
-    objPtr->typePtr = &tclDoubleType;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfDouble --
- *
- *	Update the string representation for a double-precision floating
- *	point object. This must obey the current tcl_precision value for
- *	double-to-string conversions. Note: This procedure does not free an
- *	existing old string rep so storage will be lost if this has not
- *	already been done.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the double-to-string conversion.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfDouble(objPtr)
-    register Tcl_Obj *objPtr;	/* Double obj with string rep to update. */
-{
-    char buffer[TCL_DOUBLE_SPACE];
-    register int len;
-    
-    Tcl_PrintDouble((Tcl_Interp *) NULL, objPtr->internalRep.doubleValue,
-	    buffer);
-    len = strlen(buffer);
-    
-    objPtr->bytes = (char *) ckalloc((unsigned) len + 1);
-    strcpy(objPtr->bytes, buffer);
-    objPtr->length = len;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewIntObj --
- *
- *	If a client is compiled with TCL_MEM_DEBUG defined, calls to
- *	Tcl_NewIntObj to create a new integer object end up calling the
- *	debugging procedure Tcl_DbNewLongObj instead.
- *
- *	Otherwise, if the client is compiled without TCL_MEM_DEBUG defined,
- *	calls to Tcl_NewIntObj result in a call to one of the two
- *	Tcl_NewIntObj implementations below. We provide two implementations
- *	so that the Tcl core can be compiled to do memory debugging of the 
- *	core even if a client does not request it for itself.
- *
- *	Integer and long integer objects share the same "integer" type
- *	implementation. We store all integers as longs and Tcl_GetIntFromObj
- *	checks whether the current value of the long can be represented by
- *	an int.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewIntObj
-
-Tcl_Obj *
-Tcl_NewIntObj(intValue)
-    register int intValue;	/* Int used to initialize the new object. */
-{
-    return Tcl_DbNewLongObj((long)intValue, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewIntObj(intValue)
-    register int intValue;	/* Int used to initialize the new object. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclNewObj(objPtr);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.longValue = (long)intValue;
-    objPtr->typePtr = &tclIntType;
-    return objPtr;
-}
-#endif /* if TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetIntObj --
- *
- *	Modify an object to be an integer and to have the specified integer
- *	value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep, if any, is freed. Also, any old
- *	internal rep is freed. 
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetIntObj(objPtr, intValue)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to init. */
-    register int intValue;	/* Integer used to set object's value. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetIntObj called with shared object");
-    }
-    
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = (long) intValue;
-    objPtr->typePtr = &tclIntType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetIntFromObj --
- *
- *	Attempt to return an int from the Tcl object "objPtr". If the object
- *	is not already an int, an attempt will be made to convert it to one.
- *
- *	Integer and long integer objects share the same "integer" type
- *	implementation. We store all integers as longs and Tcl_GetIntFromObj
- *	checks whether the current value of the long can be represented by
- *	an int.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion or if the long integer held by the object
- *	can not be represented by an int, an error message is left in
- *	the interpreter's result unless "interp" is NULL.
- *
- * Side effects:
- *	If the object is not already an int, the conversion will free
- *	any old internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetIntFromObj(interp, objPtr, intPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object from which to get a int. */
-    register int *intPtr;	/* Place to store resulting int. */
-{
-    register long l;
-    int result;
-    
-    if (objPtr->typePtr != &tclIntType) {
-	result = SetIntFromAny(interp, objPtr);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    l = objPtr->internalRep.longValue;
-    if (((long)((int)l)) == l) {
-	*intPtr = (int)objPtr->internalRep.longValue;
-	return TCL_OK;
-    }
-    if (interp != NULL) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"integer value too large to represent as non-long integer", -1);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetIntFromAny --
- *
- *	Attempt to generate an integer internal form for the Tcl object
- *	"objPtr".
- *
- * Results:
- *	The return value is a standard object Tcl result. If an error occurs
- *	during conversion, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, an int is stored as "objPtr"s internal
- *	representation. 
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetIntFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object to convert. */
-{
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *string, *end;
-    int length;
-    register char *p;
-    long newLong;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    /*
-     * Now parse "objPtr"s string as an int. We use an implementation here
-     * that doesn't report errors in interp if interp is NULL. Note: use
-     * strtoul instead of strtol for integer conversions to allow full-size
-     * unsigned numbers, but don't depend on strtoul to handle sign
-     * characters; it won't in some implementations.
-     */
-
-    errno = 0;
-    for (p = string;  isspace(UCHAR(*p));  p++) { /* INTL: ISO space. */
-	/* Empty loop body. */
-    }
-    if (*p == '-') {
-	p++;
-	newLong = -((long)strtoul(p, &end, 0));
-    } else if (*p == '+') {
-	p++;
-	newLong = strtoul(p, &end, 0);
-    } else {
-	newLong = strtoul(p, &end, 0);
-    }
-    if (end == p) {
-	badInteger:
-	if (interp != NULL) {
-	    /*
-	     * Must copy string before resetting the result in case a caller
-	     * is trying to convert the interpreter's result to an int.
-	     */
-	    
-	    char buf[100];
-	    sprintf(buf, "expected integer but got \"%.50s\"", string);
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-	}
-	return TCL_ERROR;
-    }
-    if (errno == ERANGE) {
-	if (interp != NULL) {
-	    char *s = "integer value too large to represent";
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), s, -1);
-	    Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, (char *) NULL);
-	}
-	return TCL_ERROR;
-    }
-
-    /*
-     * Make sure that the string has no garbage after the end of the int.
-     */
-    
-    while ((end < (string+length))
-	    && isspace(UCHAR(*end))) { /* INTL: ISO space. */
-	end++;
-    }
-    if (end != (string+length)) {
-	goto badInteger;
-    }
-
-    /*
-     * The conversion to int succeeded. Free the old internalRep before
-     * setting the new one. We do this as late as possible to allow the
-     * conversion code, in particular Tcl_GetStringFromObj, to use that old
-     * internalRep.
-     */
-
-    if ((oldTypePtr != NULL) &&	(oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = newLong;
-    objPtr->typePtr = &tclIntType;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfInt --
- *
- *	Update the string representation for an integer object.
- *	Note: This procedure does not free an existing old string rep
- *	so storage will be lost if this has not already been done. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the int-to-string conversion.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfInt(objPtr)
-    register Tcl_Obj *objPtr;	/* Int object whose string rep to update. */
-{
-    char buffer[TCL_INTEGER_SPACE];
-    register int len;
-    
-    len = TclFormatInt(buffer, objPtr->internalRep.longValue);
-    
-    objPtr->bytes = ckalloc((unsigned) len + 1);
-    strcpy(objPtr->bytes, buffer);
-    objPtr->length = len;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewLongObj --
- *
- *	If a client is compiled with TCL_MEM_DEBUG defined, calls to
- *	Tcl_NewLongObj to create a new long integer object end up calling
- *	the debugging procedure Tcl_DbNewLongObj instead.
- *
- *	Otherwise, if the client is compiled without TCL_MEM_DEBUG defined,
- *	calls to Tcl_NewLongObj result in a call to one of the two
- *	Tcl_NewLongObj implementations below. We provide two implementations
- *	so that the Tcl core can be compiled to do memory debugging of the 
- *	core even if a client does not request it for itself.
- *
- *	Integer and long integer objects share the same "integer" type
- *	implementation. We store all integers as longs and Tcl_GetIntFromObj
- *	checks whether the current value of the long can be represented by
- *	an int.
- *
- * Results:
- *	The newly created object is returned. This object will have an
- *	invalid string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewLongObj
-
-Tcl_Obj *
-Tcl_NewLongObj(longValue)
-    register long longValue;	/* Long integer used to initialize the
-				 * new object. */
-{
-    return Tcl_DbNewLongObj(longValue, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewLongObj(longValue)
-    register long longValue;	/* Long integer used to initialize the
-				 * new object. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclNewObj(objPtr);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.longValue = longValue;
-    objPtr->typePtr = &tclIntType;
-    return objPtr;
-}
-#endif /* if TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewLongObj --
- *
- *	If a client is compiled with TCL_MEM_DEBUG defined, calls to
- *	Tcl_NewIntObj and Tcl_NewLongObj to create new integer or
- *	long integer objects end up calling the debugging procedure
- *	Tcl_DbNewLongObj instead. We provide two implementations of
- *	Tcl_DbNewLongObj so that whether the Tcl core is compiled to do
- *	memory debugging of the core is independent of whether a client
- *	requests debugging for itself.
- *
- *	When the core is compiled with TCL_MEM_DEBUG defined,
- *	Tcl_DbNewLongObj calls Tcl_DbCkalloc directly with the file name and
- *	line number from its caller. This simplifies debugging since then
- *	the checkmem command will report the caller's file name and line
- *	number when reporting objects that haven't been freed.
- *
- *	Otherwise, when the core is compiled without TCL_MEM_DEBUG defined,
- *	this procedure just returns the result of calling Tcl_NewLongObj.
- *
- * Results:
- *	The newly created long integer object is returned. This object
- *	will have an invalid string representation. The returned object has
- *	ref count 0.
- *
- * Side effects:
- *	Allocates memory.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewLongObj(longValue, file, line)
-    register long longValue;	/* Long integer used to initialize the
-				 * new object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *objPtr;
-
-    TclDbNewObj(objPtr, file, line);
-    objPtr->bytes = NULL;
-    
-    objPtr->internalRep.longValue = longValue;
-    objPtr->typePtr = &tclIntType;
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewLongObj(longValue, file, line)
-    register long longValue;	/* Long integer used to initialize the
-				 * new object. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewLongObj(longValue);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetLongObj --
- *
- *	Modify an object to be an integer object and to have the specified
- *	long integer value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep, if any, is freed. Also, any old
- *	internal rep is freed. 
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetLongObj(objPtr, longValue)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to init. */
-    register long longValue;	/* Long integer used to initialize the
-				 * object's value. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetLongObj called with shared object");
-    }
-
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = longValue;
-    objPtr->typePtr = &tclIntType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetLongFromObj --
- *
- *	Attempt to return an long integer from the Tcl object "objPtr". If
- *	the object is not already an int object, an attempt will be made to
- *	convert it to one.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion, an error message is left in the interpreter's
- *	result unless "interp" is NULL.
- *
- * Side effects:
- *	If the object is not already an int object, the conversion will free
- *	any old internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetLongFromObj(interp, objPtr, longPtr)
-    Tcl_Interp *interp; 	/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr;	/* The object from which to get a long. */
-    register long *longPtr;	/* Place to store resulting long. */
-{
-    register int result;
-    
-    if (objPtr->typePtr == &tclIntType) {
-	*longPtr = objPtr->internalRep.longValue;
-	return TCL_OK;
-    }
-    result = SetIntFromAny(interp, objPtr);
-    if (result == TCL_OK) {
-	*longPtr = objPtr->internalRep.longValue;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbIncrRefCount --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. This checks to see whether or not
- *	the memory has been freed before incrementing the ref count.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just increments
- *	the reference count of the object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's ref count is incremented.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DbIncrRefCount(objPtr, file, line)
-    register Tcl_Obj *objPtr;	/* The object we are registering a
-				 * reference to. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-#ifdef TCL_MEM_DEBUG
-    if (objPtr->refCount == 0x61616161) {
-	fprintf(stderr, "file = %s, line = %d\n", file, line);
-	fflush(stderr);
-	panic("Trying to increment refCount of previously disposed object.");
-    }
-#endif
-    ++(objPtr)->refCount;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbDecrRefCount --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. This checks to see whether or not
- *	the memory has been freed before decrementing the ref count.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just decrements
- *	the reference count of the object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's ref count is incremented.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DbDecrRefCount(objPtr, file, line)
-    register Tcl_Obj *objPtr;	/* The object we are releasing a reference
-				 * to. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-#ifdef TCL_MEM_DEBUG
-    if (objPtr->refCount == 0x61616161) {
-	fprintf(stderr, "file = %s, line = %d\n", file, line);
-	fflush(stderr);
-	panic("Trying to decrement refCount of previously disposed object.");
-    }
-#endif
-    if (--(objPtr)->refCount <= 0) {
-	TclFreeObj(objPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbIsShared --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It tests whether the object has a ref
- *	count greater than one.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just tests
- *	if the object has a ref count greater than one.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_DbIsShared(objPtr, file, line)
-    register Tcl_Obj *objPtr;	/* The object to test for being shared. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-#ifdef TCL_MEM_DEBUG
-    if (objPtr->refCount == 0x61616161) {
-	fprintf(stderr, "file = %s, line = %d\n", file, line);
-	fflush(stderr);
-	panic("Trying to check whether previously disposed object is shared.");
-    }
-#endif
-    return ((objPtr)->refCount > 1);
-}
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
deleted file mode 100644
index 87bc177..0000000
--- a/generic/tclPanic.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* 
- * tclPanic.c --
- *
- *	Source code for the "Tcl_Panic" library procedure for Tcl;
- *	individual applications will probably override this with
- *	an application-specific panic procedure.
- *
- * Copyright (c) 1988-1993 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPanic.c,v 1.2 1999/03/04 01:01:59 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * The panicProc variable contains a pointer to an application
- * specific panic procedure.
- */
-
-void (*panicProc) _ANSI_ARGS_(TCL_VARARGS(char *,format)) = NULL;
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetPanicProc --
- *
- *	Replace the default panic behavior with the specified functiion.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the panicProc variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetPanicProc(proc)
-    void (*proc) _ANSI_ARGS_(TCL_VARARGS(char *,format));
-{
-    panicProc = proc;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PanicVA --
- *
- *	Print an error message and kill the process.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The process dies, entering the debugger if possible.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_PanicVA (format, argList)
-    char *format;		/* Format string, suitable for passing to
-				 * fprintf. */
-    va_list argList;		/* Variable argument list. */
-{
-    char *arg1, *arg2, *arg3, *arg4;	/* Additional arguments (variable in
-					 * number) to pass to fprintf. */
-    char *arg5, *arg6, *arg7, *arg8;
-
-    arg1 = va_arg(argList, char *);
-    arg2 = va_arg(argList, char *);
-    arg3 = va_arg(argList, char *);
-    arg4 = va_arg(argList, char *);
-    arg5 = va_arg(argList, char *);
-    arg6 = va_arg(argList, char *);
-    arg7 = va_arg(argList, char *);
-    arg8 = va_arg(argList, char *);
-    
-    if (panicProc != NULL) {
-	(void) (*panicProc)(format, arg1, arg2, arg3, arg4,
-		arg5, arg6, arg7, arg8);
-    } else {
-	(void) fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6,
-		arg7, arg8);
-	(void) fprintf(stderr, "\n");
-	(void) fflush(stderr);
-	abort();
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * panic --
- *
- *	Print an error message and kill the process.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The process dies, entering the debugger if possible.
- *
- *----------------------------------------------------------------------
- */
-
-	/* VARARGS ARGSUSED */
-void
-panic TCL_VARARGS_DEF(char *,arg1)
-{
-    va_list argList;
-    char *format;
-
-    format = TCL_VARARGS_START(char *,arg1,argList);
-    Tcl_PanicVA(format, argList);
-    va_end (argList);
-}
diff --git a/generic/tclParse.c b/generic/tclParse.c
deleted file mode 100644
index 679b039..0000000
--- a/generic/tclParse.c
+++ /dev/null
@@ -1,2224 +0,0 @@
-/* 
- * tclParse.c --
- *
- *	This file contains procedures that parse Tcl scripts.  They
- *	do so in a general-purpose fashion that can be used for many
- *	different purposes, including compilation, direct execution,
- *	code analysis, etc.  This file also includes a few additional
- *	procedures such as Tcl_EvalObjv, Tcl_Eval, and Tcl_EvalEx, which
- *	allow scripts to be evaluated directly, without compiling.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclParse.c,v 1.3 1999/04/16 00:46:51 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The following table provides parsing information about each possible
- * 8-bit character.  The table is designed to be referenced with either
- * signed or unsigned characters, so it has 384 entries.  The first 128
- * entries correspond to negative character values, the next 256 correspond
- * to positive character values.  The last 128 entries are identical to the
- * first 128.  The table is always indexed with a 128-byte offset (the 128th
- * entry corresponds to a character value of 0).
- *
- * The macro CHAR_TYPE is used to index into the table and return
- * information about its character argument.  The following return
- * values are defined.
- *
- * TYPE_NORMAL -	All characters that don't have special significance
- *			to the Tcl parser.
- * TYPE_SPACE -		The character is a whitespace character other
- *			than newline.
- * TYPE_COMMAND_END -	Character is newline or semicolon.
- * TYPE_SUBS -		Character begins a substitution or has other
- *			special meaning in ParseTokens: backslash, dollar
- *			sign, open bracket, or null.
- * TYPE_QUOTE -		Character is a double quote.
- * TYPE_CLOSE_PAREN -	Character is a right parenthesis.
- * TYPE_CLOSE_BRACK -	Character is a right square bracket.
- * TYPE_BRACE -		Character is a curly brace (either left or right).
- */
-
-#define TYPE_NORMAL		0
-#define TYPE_SPACE		0x1
-#define TYPE_COMMAND_END	0x2
-#define TYPE_SUBS		0x4
-#define TYPE_QUOTE		0x8
-#define TYPE_CLOSE_PAREN	0x10
-#define TYPE_CLOSE_BRACK	0x20
-#define TYPE_BRACE		0x40
-
-#define CHAR_TYPE(c) (typeTable+128)[(int)(c)]
-
-char typeTable[] = {
-    /*
-     * Negative character values, from -128 to -1:
-     */
-
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-
-    /*
-     * Positive character values, from 0-127:
-     */
-
-    TYPE_SUBS,        TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_SPACE,       TYPE_COMMAND_END, TYPE_SPACE,
-    TYPE_SPACE,       TYPE_SPACE,       TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_SPACE,       TYPE_NORMAL,      TYPE_QUOTE,       TYPE_NORMAL,
-    TYPE_SUBS,        TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_CLOSE_PAREN, TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_COMMAND_END,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_SUBS,
-    TYPE_SUBS,        TYPE_CLOSE_BRACK, TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_BRACE,
-    TYPE_NORMAL,      TYPE_BRACE,       TYPE_NORMAL,      TYPE_NORMAL,
-
-    /*
-     * Large unsigned character values, from 128-255:
-     */
-
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-    TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,      TYPE_NORMAL,
-};
-
-/*
- * Prototypes for local procedures defined in this file:
- */
-
-static int		CommandComplete _ANSI_ARGS_((char *script,
-			    int length));
-static int		ParseTokens _ANSI_ARGS_((char *src, int mask,
-			    Tcl_Parse *parsePtr));
-static int		EvalObjv _ANSI_ARGS_((Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[], char *command, int length,
-			    int flags));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseCommand --
- *
- *	Given a string, this procedure parses the first Tcl command
- *	in the string and returns information about the structure of
- *	the command.
- *
- * Results:
- *	The return value is TCL_OK if the command was parsed
- *	successfully and TCL_ERROR otherwise.  If an error occurs
- *	and interp isn't NULL then an error message is left in
- *	its result.  On a successful return, parsePtr is filled in
- *	with information about the command that was parsed.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the command, then additional space is
- *	malloc-ed.  If the procedure returns TCL_OK then the caller must
- *	eventually invoke Tcl_FreeParse to release any additional space
- *	that was allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ParseCommand(interp, string, numBytes, nested, parsePtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting;
-				 * if NULL, then no error message is
-				 * provided. */
-    char *string;		/* First character of string containing
-				 * one or more Tcl commands.  The string
-				 * must be in writable memory and must
-				 * have one additional byte of space at
-				 * string[length] where we can
-				 * temporarily store a 0 sentinel
-				 * character. */
-    int numBytes;		/* Total number of bytes in string.  If < 0,
-				 * the script consists of all bytes up to 
-				 * the first null character. */
-    int nested;			/* Non-zero means this is a nested command:
-				 * close bracket should be considered
-				 * a command terminator. If zero, then close
-				 * bracket has no special meaning. */
-    register Tcl_Parse *parsePtr;
-    				/* Structure to fill in with information
-				 * about the parsed command; any previous
-				 * information in the structure is
-				 * ignored. */
-{
-    register char *src;		/* Points to current character
-				 * in the command. */
-    int type;			/* Result returned by CHAR_TYPE(*src). */
-    Tcl_Token *tokenPtr;	/* Pointer to token being filled in. */
-    int wordIndex;		/* Index of word token for current word. */
-    char utfBytes[TCL_UTF_MAX];	/* Holds result of backslash substitution. */
-    int terminators;		/* CHAR_TYPE bits that indicate the end
-				 * of a command. */
-    char *termPtr;		/* Set by Tcl_ParseBraces/QuotedString to
-				 * point to char after terminating one. */
-    int length, savedChar;
-
-
-    if (numBytes < 0) {
-	numBytes = (string? strlen(string) : 0);
-    }
-    parsePtr->commentStart = NULL;
-    parsePtr->commentSize = 0;
-    parsePtr->commandStart = NULL;
-    parsePtr->commandSize = 0;
-    parsePtr->numWords = 0;
-    parsePtr->tokenPtr = parsePtr->staticTokens;
-    parsePtr->numTokens = 0;
-    parsePtr->tokensAvailable = NUM_STATIC_TOKENS;
-    parsePtr->string = string;
-    parsePtr->end = string + numBytes;
-    parsePtr->interp = interp;
-    parsePtr->incomplete = 0;
-    if (nested != 0) {
-	terminators = TYPE_COMMAND_END | TYPE_CLOSE_BRACK;
-    } else {
-	terminators = TYPE_COMMAND_END;
-    }
-
-    /*
-     * Temporarily overwrite the character just after the end of the
-     * string with a 0 byte.  This acts as a sentinel and reduces the
-     * number of places where we have to check for the end of the
-     * input string.  The original value of the byte is restored at
-     * the end of the parse.
-     */
-
-    savedChar = string[numBytes];
-    string[numBytes] = 0;
-
-    /*
-     * Parse any leading space and comments before the first word of the
-     * command.
-     */
-
-    src = string;
-    while (1) {
-	while ((CHAR_TYPE(*src) == TYPE_SPACE) || (*src == '\n')) {
-	    src++;
-	}
-	if ((*src == '\\') && (src[1] == '\n')) {
-	    /*
-	     * Skip backslash-newline sequence: it should be treated
-	     * just like white space.
-	     */
-
-	    if ((src + 2) == parsePtr->end) {
-		parsePtr->incomplete = 1;
-	    }
-	    src += 2;
-	    continue;
-	}
-	if (*src != '#') {
-	    break;
-	}
-	if (parsePtr->commentStart == NULL) {
-	    parsePtr->commentStart = src;
-	}
-	while (1) {
-	    if (src == parsePtr->end) {
-		if (nested) {
-		    parsePtr->incomplete = nested;
-		}
-		parsePtr->commentSize = src - parsePtr->commentStart;
-		break;
-	    } else if (*src == '\\') {
-		if ((src[1] == '\n') && ((src + 2) == parsePtr->end)) {
-		    parsePtr->incomplete = 1;
-		}
-		Tcl_UtfBackslash(src, &length, utfBytes);
-		src += length;
-	    } else if (*src == '\n') {
-		src++;
-		parsePtr->commentSize = src - parsePtr->commentStart;
-		break;
-	    } else {
-		src++;
-	    }
-	}
-    }
-
-    /*
-     * The following loop parses the words of the command, one word
-     * in each iteration through the loop.
-     */
-
-    parsePtr->commandStart = src;
-    while (1) {
-	/*
-	 * Create the token for the word.
-	 */
-
-	if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	wordIndex = parsePtr->numTokens;
-	tokenPtr = &parsePtr->tokenPtr[wordIndex];
-	tokenPtr->type = TCL_TOKEN_WORD;
-
-	/*
-	 * Skip white space before the word. Also skip a backslash-newline
-	 * sequence: it should be treated just like white space.
-	 */
-
-	while (1) {
-	    type = CHAR_TYPE(*src);
-	    if (type == TYPE_SPACE) {
-		src++;
-		continue;
-	    } else if ((*src == '\\') && (src[1] == '\n')) {
-		if ((src + 2) == parsePtr->end) {
-		    parsePtr->incomplete = 1;
-		}
-		Tcl_UtfBackslash(src, &length, utfBytes);
-		src += length;
-		continue;
-	    }
-	    break;
-	}
-	if ((type & terminators) != 0) {
-	    src++;
-	    break;
-	}
-	if (src == parsePtr->end) {
-	    break;
-	}
-	tokenPtr->start = src;
-	parsePtr->numTokens++;
-	parsePtr->numWords++;
-
-	/*
-	 * At this point the word can have one of three forms: something
-	 * enclosed in quotes, something enclosed in braces, or an
-	 * unquoted word (anything else).
-	 */
-
-	if (*src == '"') {
-	    if (Tcl_ParseQuotedString(interp, src, (parsePtr->end - src),
-	            parsePtr, 1, &termPtr) != TCL_OK) {
-		goto error;
-	    }
-	    src = termPtr;
-	} else if (*src == '{') {
-	    if (Tcl_ParseBraces(interp, src, (parsePtr->end - src),
-	            parsePtr, 1, &termPtr) != TCL_OK) {
-		goto error;
-	    }
-	    src = termPtr;
-	} else {
-	    /*
-	     * This is an unquoted word.  Call ParseTokens and let it do
-	     * all of the work.
-	     */
-
-	    if (ParseTokens(src, TYPE_SPACE|terminators, 
-		    parsePtr) != TCL_OK) {
-		goto error;
-	    }
-	    src = parsePtr->term;
-	}
-
-	/*
-	 * Finish filling in the token for the word and check for the
-	 * special case of a word consisting of a single range of
-	 * literal text.
-	 */
-
-	tokenPtr = &parsePtr->tokenPtr[wordIndex];
-	tokenPtr->size = src - tokenPtr->start;
-	tokenPtr->numComponents = parsePtr->numTokens - (wordIndex + 1);
-	if ((tokenPtr->numComponents == 1)
-		&& (tokenPtr[1].type == TCL_TOKEN_TEXT)) {
-	    tokenPtr->type = TCL_TOKEN_SIMPLE_WORD;
-	}
-
-	/*
-	 * Do two additional checks: (a) make sure we're really at the
-	 * end of a word (there might have been garbage left after a
-	 * quoted or braced word), and (b) check for the end of the
-	 * command.
-	 */
-
-	type = CHAR_TYPE(*src);
-	if (type == TYPE_SPACE) {
-	    src++;
-	    continue;
-	} else {
-	    /*
-	     * Backslash-newline (and any following white space) must be
-	     * treated as if it were a space character.
-	     */
-
-	    if ((*src == '\\') && (src[1] == '\n')) {
-		if ((src + 2) == parsePtr->end) {
-		    parsePtr->incomplete = 1;
-		}
-		Tcl_UtfBackslash(src, &length, utfBytes);
-		src += length;
-		continue;
-	    }
-	}
-
-	if ((type & terminators) != 0) {
-	    src++;
-	    break;
-	}
-	if (src == parsePtr->end) {
-	    break;
-	}
-	if (interp != NULL) {
-	    if (src[-1] == '"') { 
-		Tcl_SetResult(interp, "extra characters after close-quote",
-			TCL_STATIC);
-	    } else {
-		Tcl_SetResult(interp, "extra characters after close-brace",
-			TCL_STATIC);
-	    }
-	}
-	parsePtr->term = src;
-	goto error;
-    }
-
-
-    parsePtr->commandSize = src - parsePtr->commandStart;
-    string[numBytes] = (char) savedChar;
-    return TCL_OK;
-
-    error:
-    string[numBytes] = (char) savedChar;
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-    if (parsePtr->commandStart == NULL) {
-	parsePtr->commandStart = string;
-    }
-    parsePtr->commandSize = parsePtr->term - parsePtr->commandStart;
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseTokens --
- *
- *	This procedure forms the heart of the Tcl parser.  It parses one
- *	or more tokens from a string, up to a termination point
- *	specified by the caller.  This procedure is used to parse
- *	unquoted command words (those not in quotes or braces), words in
- *	quotes, and array indices for variables.
- *
- * Results:
- *	Tokens are added to parsePtr and parsePtr->term is filled in
- *	with the address of the character that terminated the parse (the
- *	first one whose CHAR_TYPE matched mask or the character at
- *	parsePtr->end).  The return value is TCL_OK if the parse
- *	completed successfully and TCL_ERROR otherwise.  If a parse
- *	error occurs and parsePtr->interp isn't NULL, then an error
- *	message is left in the interpreter's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseTokens(src, mask, parsePtr)
-    register char *src;		/* First character to parse. */
-    int mask;			/* Specifies when to stop parsing.  The
-				 * parse stops at the first unquoted
-				 * character whose CHAR_TYPE contains
-				 * any of the bits in mask. */
-    Tcl_Parse *parsePtr;	/* Information about parse in progress.
-				 * Updated with additional tokens and
-				 * termination information. */
-{
-    int type, originalTokens, varToken;
-    char utfBytes[TCL_UTF_MAX];
-    Tcl_Token *tokenPtr;
-    Tcl_Parse nested;
-
-    /*
-     * Each iteration through the following loop adds one token of
-     * type TCL_TOKEN_TEXT, TCL_TOKEN_BS, TCL_TOKEN_COMMAND, or
-     * TCL_TOKEN_VARIABLE to parsePtr.  For TCL_TOKEN_VARIABLE tokens,
-     * additional tokens are added for the parsed variable name.
-     */
-
-    originalTokens = parsePtr->numTokens;
-    while (1) {
-	if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-	tokenPtr->start = src;
-	tokenPtr->numComponents = 0;
-
-	type = CHAR_TYPE(*src);
-	if (type & mask) {
-	    break;
-	}
-
-	if ((type & TYPE_SUBS) == 0) {
-	    /*
-	     * This is a simple range of characters.  Scan to find the end
-	     * of the range.
-	     */
-
-	    while (1) {
-		src++;
-		if (CHAR_TYPE(*src) & (mask | TYPE_SUBS)) {
-		    break;
-		}
-	    }
-	    tokenPtr->type = TCL_TOKEN_TEXT;
-	    tokenPtr->size = src - tokenPtr->start;
-	    parsePtr->numTokens++;
-	} else if (*src == '$') {
-	    /*
-	     * This is a variable reference.  Call Tcl_ParseVarName to do
-	     * all the dirty work of parsing the name.
-	     */
-
-	    varToken = parsePtr->numTokens;
-	    if (Tcl_ParseVarName(parsePtr->interp, src, parsePtr->end - src,
-		    parsePtr, 1) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    src += parsePtr->tokenPtr[varToken].size;
-	} else if (*src == '[') {
-	    /*
-	     * Command substitution.  Call Tcl_ParseCommand recursively
-	     * (and repeatedly) to parse the nested command(s), then
-	     * throw away the parse information.
-	     */
-
-	    src++;
-	    while (1) {
-		if (Tcl_ParseCommand(parsePtr->interp, src,
-			parsePtr->end - src, 1, &nested) != TCL_OK) {
-		    parsePtr->term = nested.term;
-		    parsePtr->incomplete = nested.incomplete;
-		    return TCL_ERROR;
-		}
-		src = nested.commandStart + nested.commandSize;
-		if (nested.tokenPtr != nested.staticTokens) {
-		    ckfree((char *) nested.tokenPtr);
-		}
-		if ((src[-1] == ']') && !nested.incomplete) {
-		    break;
-		}
-		if (src == parsePtr->end) {
-		    if (parsePtr->interp != NULL) {
-			Tcl_SetResult(parsePtr->interp,
-			    "missing close-bracket", TCL_STATIC);
-		    }
-		    parsePtr->term = tokenPtr->start;
-		    parsePtr->incomplete = 1;
-		    return TCL_ERROR;
-		}
-	    }
-	    tokenPtr->type = TCL_TOKEN_COMMAND;
-	    tokenPtr->size = src - tokenPtr->start;
-	    parsePtr->numTokens++;
-	} else if (*src == '\\') {
-	    /*
-	     * Backslash substitution.
-	     */
-
-	    if (src[1] == '\n') {
-		if ((src + 2) == parsePtr->end) {
-		    parsePtr->incomplete = 1;
-		}
-
-		/*
-		 * Note: backslash-newline is special in that it is
-		 * treated the same as a space character would be.  This
-		 * means that it could terminate the token.
-		 */
-
-		if (mask & TYPE_SPACE) {
-		    break;
-		}
-	    }
-	    tokenPtr->type = TCL_TOKEN_BS;
-	    Tcl_UtfBackslash(src, &tokenPtr->size, utfBytes);
-	    parsePtr->numTokens++;
-	    src += tokenPtr->size;
-	} else if (*src == 0) {
-	    /*
-	     * We encountered a null character.  If it is the null
-	     * character at the end of the string, then return.
-	     * Otherwise generate a text token for the single
-	     * character.
-	     */
-
-	    if (src == parsePtr->end) {
-		break;
-	    }
-	    tokenPtr->type = TCL_TOKEN_TEXT;
-	    tokenPtr->size = 1;
-	    parsePtr->numTokens++;
-	    src++;
-	} else {
-	    panic("ParseTokens encountered unknown character");
-	}
-    }
-    if (parsePtr->numTokens == originalTokens) {
-	/*
-	 * There was nothing in this range of text.  Add an empty token
-	 * for the empty range, so that there is always at least one
-	 * token added.
-	 */
-
-	tokenPtr->type = TCL_TOKEN_TEXT;
-	tokenPtr->size = 0;
-	parsePtr->numTokens++;
-    }
-    parsePtr->term = src;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FreeParse --
- *
- *	This procedure is invoked to free any dynamic storage that may
- *	have been allocated by a previous call to Tcl_ParseCommand.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there is any dynamically allocated memory in *parsePtr,
- *	it is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FreeParse(parsePtr)
-    Tcl_Parse *parsePtr;	/* Structure that was filled in by a
-				 * previous call to Tcl_ParseCommand. */
-{
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclExpandTokenArray --
- *
- *	This procedure is invoked when the current space for tokens in
- *	a Tcl_Parse structure fills up; it allocates memory to grow the
- *	token array
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory is allocated for a new larger token array; the memory
- *	for the old array is freed, if it had been dynamically allocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclExpandTokenArray(parsePtr)
-    Tcl_Parse *parsePtr;	/* Parse structure whose token space
-				 * has overflowed. */
-{
-    int newCount;
-    Tcl_Token *newPtr;
-
-    newCount = parsePtr->tokensAvailable*2;
-    newPtr = (Tcl_Token *) ckalloc((unsigned) (newCount * sizeof(Tcl_Token)));
-    memcpy((VOID *) newPtr, (VOID *) parsePtr->tokenPtr,
-	    (size_t) (parsePtr->tokensAvailable * sizeof(Tcl_Token)));
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-    parsePtr->tokenPtr = newPtr;
-    parsePtr->tokensAvailable = newCount;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * EvalObjv --
- *
- *	This procedure evaluates a Tcl command that has already been
- *	parsed into words, with one Tcl_Obj holding each word.
- *
- * Results:
- *	The return value is a standard Tcl completion code such as
- *	TCL_OK or TCL_ERROR.  A result or error message is left in
- *	interp's result.  If an error occurs, this procedure does
- *	NOT add any information to the errorInfo variable.
- *
- * Side effects:
- *	Depends on the command.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-EvalObjv(interp, objc, objv, command, length, flags)
-    Tcl_Interp *interp;		/* Interpreter in which to evaluate the
-				 * command.  Also used for error
-				 * reporting. */
-    int objc;			/* Number of words in command. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to objects that are
-				 * the words that make up the command. */
-    char *command;		/* Points to the beginning of the string
-				 * representation of the command; this
-				 * is used for traces.  If the string
-				 * representation of the command is
-				 * unknown, an empty string should be
-				 * supplied. */
-    int length;			/* Number of bytes in command; if -1, all
-				 * characters up to the first null byte are
-				 * used. */
-    int flags;			/* Collection of OR-ed bits that control
-				 * the evaluation of the script.  Only
-				 * TCL_EVAL_GLOBAL is currently
-				 * supported. */
-
-{
-    Command *cmdPtr;
-    Interp *iPtr = (Interp *) interp;
-    Tcl_Obj **newObjv;
-    int i, code;
-    Trace *tracePtr, *nextPtr;
-    char **argv, *commandCopy;
-    CallFrame *savedVarFramePtr;	/* Saves old copy of iPtr->varFramePtr
-					 * in case TCL_EVAL_GLOBAL was set. */
-
-    Tcl_ResetResult(interp);
-    if (objc == 0) {
-	return TCL_OK;
-    }
-
-    /*
-     * If the interpreter was deleted, return an error.
-     */
-    
-    if (iPtr->flags & DELETED) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"attempt to call eval in deleted interpreter", -1);
-	Tcl_SetErrorCode(interp, "CORE", "IDELETE",
-		"attempt to call eval in deleted interpreter",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Check depth of nested calls to Tcl_Eval:  if this gets too large,
-     * it's probably because of an infinite loop somewhere.
-     */
-
-    if (iPtr->numLevels >= iPtr->maxNestingDepth) {
-	iPtr->result =  "too many nested calls to Tcl_Eval (infinite loop?)";
-	return TCL_ERROR;
-    }
-    iPtr->numLevels++;
-
-    /*
-     * On the Mac, we will never reach the default recursion limit before
-     * blowing the stack. So we need to do a check here.
-     */
-    
-    if (TclpCheckStackSpace() == 0) {
-	/*NOTREACHED*/
-	iPtr->numLevels--;
-	iPtr->result =  "too many nested calls to Tcl_Eval (infinite loop?)";
-	return TCL_ERROR;
-    }
-    
-    /*
-     * Find the procedure to execute this command. If there isn't one,
-     * then see if there is a command "unknown".  If so, create a new
-     * word array with "unknown" as the first word and the original
-     * command words as arguments.  Then call ourselves recursively
-     * to execute it.
-     */
-    
-    cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, objv[0]);
-    if (cmdPtr == NULL) {
-	newObjv = (Tcl_Obj **) ckalloc((unsigned)
-		((objc + 1) * sizeof (Tcl_Obj *)));
-	for (i = objc-1; i >= 0; i--) {
-	    newObjv[i+1] = objv[i];
-	}
-	newObjv[0] = Tcl_NewStringObj("unknown", -1);
-	Tcl_IncrRefCount(newObjv[0]);
-	cmdPtr = (Command *) Tcl_GetCommandFromObj(interp, newObjv[0]);
-	if (cmdPtr == NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "invalid command name \"", Tcl_GetString(objv[0]), "\"",
-		    (char *) NULL);
-	    code = TCL_ERROR;
-	} else {
-	    code = EvalObjv(interp, objc+1, newObjv, command, length, 0);
-	}
-	Tcl_DecrRefCount(newObjv[0]);
-	ckfree((char *) newObjv);
-	goto done;
-    }
-    
-    /*
-     * Call trace procedures if needed.
-     */
-
-    argv = NULL;
-    commandCopy = command;
-
-    for (tracePtr = iPtr->tracePtr; tracePtr != NULL; tracePtr = nextPtr) {
-	nextPtr = tracePtr->nextPtr;
-	if (iPtr->numLevels > tracePtr->level) {
-	    continue;
-	}
-
-	/*
-	 * This is a bit messy because we have to emulate the old trace
-	 * interface, which uses strings for everything.
-	 */
-
-	if (argv == NULL) {
-	    argv = (char **) ckalloc((unsigned) (objc + 1) * sizeof(char *));
-	    for (i = 0; i < objc; i++) {
-		argv[i] = Tcl_GetString(objv[i]);
-	    }
-	    argv[objc] = 0;
-
-	    if (length < 0) {
-		length = strlen(command);
-	    } else if ((size_t)length < strlen(command)) {
-		commandCopy = (char *) ckalloc((unsigned) (length + 1));
-		strncpy(commandCopy, command, (size_t) length);
-		commandCopy[length] = 0;
-	    }
-	}
-	(*tracePtr->proc)(tracePtr->clientData, interp, iPtr->numLevels,
-			  commandCopy, cmdPtr->proc, cmdPtr->clientData,
-			  objc, argv);
-    }
-    if (argv != NULL) {
-	ckfree((char *) argv);
-    }
-    if (commandCopy != command) {
-	ckfree((char *) commandCopy);
-    }
-    
-    /*
-     * Finally, invoke the command's Tcl_ObjCmdProc.
-     */
-    
-    iPtr->cmdCount++;
-    savedVarFramePtr = iPtr->varFramePtr;
-    if (flags & TCL_EVAL_GLOBAL) {
-	iPtr->varFramePtr = NULL;
-    }
-    code = (*cmdPtr->objProc)(cmdPtr->objClientData, interp, objc, objv);
-    iPtr->varFramePtr = savedVarFramePtr;
-    if (Tcl_AsyncReady()) {
-	code = Tcl_AsyncInvoke(interp, code);
-    }
-
-    /*
-     * If the interpreter has a non-empty string result, the result
-     * object is either empty or stale because some procedure set
-     * interp->result directly. If so, move the string result to the
-     * result object, then reset the string result.
-     */
-    
-    if (*(iPtr->result) != 0) {
-	(void) Tcl_GetObjResult(interp);
-    }
-
-    done:
-    iPtr->numLevels--;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalObjv --
- *
- *	This procedure evaluates a Tcl command that has already been
- *	parsed into words, with one Tcl_Obj holding each word.
- *
- * Results:
- *	The return value is a standard Tcl completion code such as
- *	TCL_OK or TCL_ERROR.  A result or error message is left in
- *	interp's result.
- *
- * Side effects:
- *	Depends on the command.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EvalObjv(interp, objc, objv, flags)
-    Tcl_Interp *interp;		/* Interpreter in which to evaluate the
-				 * command.  Also used for error
-				 * reporting. */
-    int objc;			/* Number of words in command. */
-    Tcl_Obj *CONST objv[];	/* An array of pointers to objects that are
-				 * the words that make up the command. */
-    int flags;			/* Collection of OR-ed bits that control
-				 * the evaluation of the script.  Only
-				 * TCL_EVAL_GLOBAL is currently
-				 * supported. */
-{
-    Interp *iPtr = (Interp *)interp;
-    Trace *tracePtr;
-    Tcl_DString cmdBuf;
-    char *cmdString = "";
-    int cmdLen = 0;
-    int code = TCL_OK;
-
-    for (tracePtr = iPtr->tracePtr; tracePtr; tracePtr = tracePtr->nextPtr) {
-	/*
-	 * EvalObjv will increment numLevels so use "<" rather than "<="
-	 */
-	if (iPtr->numLevels < tracePtr->level) {
-	    int i;
-	    /*
-	     * The command will be needed for an execution trace or stack trace
-	     * generate a command string.
-	     */
-	cmdtraced:
-	    Tcl_DStringInit(&cmdBuf);
-	    for (i = 0; i < objc; i++) {
-		Tcl_DStringAppendElement(&cmdBuf, Tcl_GetString(objv[i]));
-	    }
-	    cmdString = Tcl_DStringValue(&cmdBuf);
-	    cmdLen = Tcl_DStringLength(&cmdBuf);
-	    break;
-	}
-    }
-
-    /*
-     * Execute the command if we have not done so already
-     */
-    switch (code) {
-	case TCL_OK:
-	    code = EvalObjv(interp, objc, objv, cmdString, cmdLen, flags);
-	    if (code == TCL_ERROR && cmdLen == 0)
-		goto cmdtraced;
-	    break;
-	case TCL_ERROR:
-	    Tcl_LogCommandInfo(interp, cmdString, cmdString, cmdLen);
-	    break;
-	default:
-	    /*NOTREACHED*/
-	    break;
-    }
-
-    if (cmdLen != 0) {
-	Tcl_DStringFree(&cmdBuf);
-    }
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LogCommandInfo --
- *
- *	This procedure is invoked after an error occurs in an interpreter.
- *	It adds information to the "errorInfo" variable to describe the
- *	command that was being executed when the error occurred.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Information about the command is added to errorInfo and the
- *	line number stored internally in the interpreter is set.  If this
- *	is the first call to this procedure or Tcl_AddObjErrorInfo since
- *	an error occurred, then old information in errorInfo is
- *	deleted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_LogCommandInfo(interp, script, command, length)
-    Tcl_Interp *interp;		/* Interpreter in which to log information. */
-    char *script;		/* First character in script containing
-				 * command (must be <= command). */
-    char *command;		/* First character in command that
-				 * generated the error. */
-    int length;			/* Number of bytes in command (-1 means
-				 * use all bytes up to first null byte). */
-{
-    char buffer[200];
-    register char *p;
-    char *ellipsis = "";
-    Interp *iPtr = (Interp *) interp;
-
-    if (iPtr->flags & ERR_ALREADY_LOGGED) {
-	/*
-	 * Someone else has already logged error information for this
-	 * command; we shouldn't add anything more.
-	 */
-
-	return;
-    }
-
-    /*
-     * Compute the line number where the error occurred.
-     */
-
-    iPtr->errorLine = 1;
-    for (p = script; p != command; p++) {
-	if (*p == '\n') {
-	    iPtr->errorLine++;
-	}
-    }
-
-    /*
-     * Create an error message to add to errorInfo, including up to a
-     * maximum number of characters of the command.
-     */
-
-    if (length < 0) {
-	length = strlen(command);
-    }
-    if (length > 150) {
-	length = 150;
-	ellipsis = "...";
-    }
-    if (!(iPtr->flags & ERR_IN_PROGRESS)) {
-	sprintf(buffer, "\n    while executing\n\"%.*s%s\"",
-		length, command, ellipsis);
-    } else {
-	sprintf(buffer, "\n    invoked from within\n\"%.*s%s\"",
-		length, command, ellipsis);
-    }
-    Tcl_AddObjErrorInfo(interp, buffer, -1);
-    iPtr->flags &= ~ERR_ALREADY_LOGGED;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalTokens --
- *
- *	Given an array of tokens parsed from a Tcl command (e.g., the
- *	tokens that make up a word or the index for an array variable)
- *	this procedure evaluates the tokens and concatenates their
- *	values to form a single result value.
- *
- * Results:
- *	The return value is a pointer to a newly allocated Tcl_Obj
- *	containing the value of the array of tokens.  The reference
- *	count of the returned object has been incremented.  If an error
- *	occurs in evaluating the tokens then a NULL value is returned
- *	and an error message is left in interp's result.
- *
- * Side effects:
- *	A new object is allocated to hold the result.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_EvalTokens(interp, tokenPtr, count)
-    Tcl_Interp *interp;		/* Interpreter in which to lookup
-				 * variables, execute nested commands,
-				 * and report errors. */
-    Tcl_Token *tokenPtr;	/* Pointer to first in an array of tokens
-				 * to evaluate and concatenate. */
-    int count;			/* Number of tokens to consider at tokenPtr.
-				 * Must be at least 1. */
-{
-    Tcl_Obj *resultPtr, *indexPtr, *valuePtr, *newPtr;
-    char buffer[TCL_UTF_MAX];
-#ifdef TCL_MEM_DEBUG
-#   define  MAX_VAR_CHARS 5
-#else
-#   define  MAX_VAR_CHARS 30
-#endif
-    char nameBuffer[MAX_VAR_CHARS+1];
-    char *varName, *index;
-    char *p = NULL;		/* Initialized to avoid compiler warning. */
-    int length, code;
-
-    /*
-     * The only tricky thing about this procedure is that it attempts to
-     * avoid object creation and string copying whenever possible.  For
-     * example, if the value is just a nested command, then use the
-     * command's result object directly.
-     */
-
-    resultPtr = NULL;
-    for ( ; count > 0; count--, tokenPtr++) {
-	valuePtr = NULL;
-
-	/*
-	 * The switch statement below computes the next value to be
-	 * concat to the result, as either a range of text or an
-	 * object.
-	 */
-
-	switch (tokenPtr->type) {
-	    case TCL_TOKEN_TEXT:
-		p = tokenPtr->start;
-		length = tokenPtr->size;
-		break;
-
-	    case TCL_TOKEN_BS:
-		length = Tcl_UtfBackslash(tokenPtr->start, (int *) NULL,
-			buffer);
-		p = buffer;
-		break;
-
-	    case TCL_TOKEN_COMMAND:
-		code = Tcl_EvalEx(interp, tokenPtr->start+1, tokenPtr->size-2,
-			0);
-		if (code != TCL_OK) {
-		    goto error;
-		}
-		valuePtr = Tcl_GetObjResult(interp);
-		break;
-
-	    case TCL_TOKEN_VARIABLE:
-		if (tokenPtr->numComponents == 1) {
-		    indexPtr = NULL;
-		} else {
-		    indexPtr = Tcl_EvalTokens(interp, tokenPtr+2,
-			    tokenPtr->numComponents - 1);
-		    if (indexPtr == NULL) {
-			goto error;
-		    }
-		}
-
-		/*
-		 * We have to make a copy of the variable name in order
-		 * to have a null-terminated string.  We can't make a
-		 * temporary modification to the script to null-terminate
-		 * the name, because a trace callback might potentially
-		 * reuse the script and be affected by the null character.
-		 */
-
-		if (tokenPtr[1].size <= MAX_VAR_CHARS) {
-		    varName = nameBuffer;
-		} else {
-		    varName = ckalloc((unsigned) (tokenPtr[1].size + 1));
-		}
-		strncpy(varName, tokenPtr[1].start, (size_t) tokenPtr[1].size);
-		varName[tokenPtr[1].size] = 0;
-		if (indexPtr != NULL) {
-		    index = TclGetString(indexPtr);
-		} else {
-		    index = NULL;
-		}
-		valuePtr = Tcl_GetVar2Ex(interp, varName, index,
-			TCL_LEAVE_ERR_MSG);
-		if (varName != nameBuffer) {
-		    ckfree(varName);
-		}
-		if (indexPtr != NULL) {
-		    Tcl_DecrRefCount(indexPtr);
-		}
-		if (valuePtr == NULL) {
-		    goto error;
-		}
-		count -= tokenPtr->numComponents;
-		tokenPtr += tokenPtr->numComponents;
-		break;
-
-	    default:
-		panic("unexpected token type in Tcl_EvalTokens");
-	}
-
-	/*
-	 * If valuePtr isn't NULL, the next piece of text comes from that
-	 * object; otherwise, take length bytes starting at p.
-	 */
-
-	if (resultPtr == NULL) {
-	    if (valuePtr != NULL) {
-		resultPtr = valuePtr;
-	    } else {
-		resultPtr = Tcl_NewStringObj(p, length);
-	    }
-	    Tcl_IncrRefCount(resultPtr);
-	} else {
-	    if (Tcl_IsShared(resultPtr)) {
-		newPtr = Tcl_DuplicateObj(resultPtr);
-		Tcl_DecrRefCount(resultPtr);
-		resultPtr = newPtr;
-		Tcl_IncrRefCount(resultPtr);
-	    }
-	    if (valuePtr != NULL) {
-		p = Tcl_GetStringFromObj(valuePtr, &length);
-	    }
-	    Tcl_AppendToObj(resultPtr, p, length);
-	}
-    }
-    return resultPtr;
-
-    error:
-    if (resultPtr != NULL) {
-	Tcl_DecrRefCount(resultPtr);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalEx --
- *
- *	This procedure evaluates a Tcl script without using the compiler
- *	or byte-code interpreter.  It just parses the script, creates
- *	values for each word of each command, then calls EvalObjv
- *	to execute each command.
- *
- * Results:
- *	The return value is a standard Tcl completion code such as
- *	TCL_OK or TCL_ERROR.  A result or error message is left in
- *	interp's result.
- *
- * Side effects:
- *	Depends on the script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EvalEx(interp, script, numBytes, flags)
-    Tcl_Interp *interp;		/* Interpreter in which to evaluate the
-				 * script.  Also used for error reporting. */
-    char *script;		/* First character of script to evaluate. */
-    int numBytes;		/* Number of bytes in script.  If < 0, the
-				 * script consists of all bytes up to the
-				 * first null character. */
-    int flags;			/* Collection of OR-ed bits that control
-				 * the evaluation of the script.  Only
-				 * TCL_EVAL_GLOBAL is currently
-				 * supported. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *p, *next;
-    Tcl_Parse parse;
-#define NUM_STATIC_OBJS 20
-    Tcl_Obj *staticObjArray[NUM_STATIC_OBJS], **objv;
-    Tcl_Token *tokenPtr;
-    int i, code, commandLength, bytesLeft, nested;
-    CallFrame *savedVarFramePtr;	/* Saves old copy of iPtr->varFramePtr
-					 * in case TCL_EVAL_GLOBAL was set. */
-
-    /*
-     * The variables below keep track of how much state has been
-     * allocated while evaluating the script, so that it can be freed
-     * properly if an error occurs.
-     */
-
-    int gotParse = 0, objectsUsed = 0;
-
-    if (numBytes < 0) {
-	numBytes = strlen(script);
-    }
-    Tcl_ResetResult(interp);
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    if (flags & TCL_EVAL_GLOBAL) {
-	iPtr->varFramePtr = NULL;
-    }
-
-    /*
-     * Each iteration through the following loop parses the next
-     * command from the script and then executes it.
-     */
-
-    objv = staticObjArray;
-    p = script;
-    bytesLeft = numBytes;
-    if (iPtr->evalFlags & TCL_BRACKET_TERM) {
-	nested = 1;
-    } else {
-	nested = 0;
-    }
-    iPtr->evalFlags = 0;
-    do {
-	if (Tcl_ParseCommand(interp, p, bytesLeft, nested, &parse)
-	        != TCL_OK) {
-	    code = TCL_ERROR;
-	    goto error;
-	}
-	gotParse = 1; 
-	if (parse.numWords > 0) {
-	    /*
-	     * Generate an array of objects for the words of the command.
-	     */
-    
-	    if (parse.numWords <= NUM_STATIC_OBJS) {
-		objv = staticObjArray;
-	    } else {
-		objv = (Tcl_Obj **) ckalloc((unsigned)
-		    (parse.numWords * sizeof (Tcl_Obj *)));
-	    }
-	    for (objectsUsed = 0, tokenPtr = parse.tokenPtr;
-		    objectsUsed < parse.numWords;
-		    objectsUsed++, tokenPtr += (tokenPtr->numComponents + 1)) {
-		objv[objectsUsed] = Tcl_EvalTokens(interp, tokenPtr+1,
-			tokenPtr->numComponents);
-		if (objv[objectsUsed] == NULL) {
-		    code = TCL_ERROR;
-		    goto error;
-		}
-	    }
-    
-	    /*
-	     * Execute the command and free the objects for its words.
-	     */
-    
-	    code = EvalObjv(interp, objectsUsed, objv, p, bytesLeft, 0);
-	    if (code != TCL_OK) {
-		goto error;
-	    }
-	    for (i = 0; i < objectsUsed; i++) {
-		Tcl_DecrRefCount(objv[i]);
-	    }
-	    objectsUsed = 0;
-	    if (objv != staticObjArray) {
-		ckfree((char *) objv);
-		objv = staticObjArray;
-	    }
-	}
-
-	/*
-	 * Advance to the next command in the script.
-	 */
-
-	next = parse.commandStart + parse.commandSize;
-	bytesLeft -= next - p;
-	p = next;
-	Tcl_FreeParse(&parse);
-	gotParse = 0;
-	if ((nested != 0) && (p > script) && (p[-1] == ']')) {
-	    /*
-	     * We get here in the special case where the TCL_BRACKET_TERM
-	     * flag was set in the interpreter and we reached a close
-	     * bracket in the script.  Return immediately.
-	     */
-
-	    iPtr->termOffset = (p - 1) - script;
-	    iPtr->varFramePtr = savedVarFramePtr;
-	    return TCL_OK;
-	}
-    } while (bytesLeft > 0);
-    iPtr->termOffset = p - script;
-    iPtr->varFramePtr = savedVarFramePtr;
-    return TCL_OK;
-
-    error:
-    /*
-     * Generate various pieces of error information, such as the line
-     * number where the error occurred and information to add to the
-     * errorInfo variable.  Then free resources that had been allocated
-     * to the command.
-     */
-
-    if ((code == TCL_ERROR) && !(iPtr->flags & ERR_ALREADY_LOGGED)) { 
-	commandLength = parse.commandSize;
-	if ((parse.commandStart + commandLength) != (script + numBytes)) {
-	    /*
-	     * The command where the error occurred didn't end at the end
-	     * of the script (i.e. it ended at a terminator character such
-	     * as ";".  Reduce the length by one so that the error message
-	     * doesn't include the terminator character.
-	     */
-	    
-	    commandLength -= 1;
-	}
-	Tcl_LogCommandInfo(interp, script, parse.commandStart, commandLength);
-    }
-    
-    for (i = 0; i < objectsUsed; i++) {
-	Tcl_DecrRefCount(objv[i]);
-    }
-    if (gotParse) {
-	Tcl_FreeParse(&parse);
-    }
-    if (objv != staticObjArray) {
-	ckfree((char *) objv);
-    }
-    iPtr->varFramePtr = savedVarFramePtr;
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Eval --
- *
- *	Execute a Tcl command in a string.  This procedure executes the
- *	script directly, rather than compiling it to bytecodes.  Before
- *	the arrival of the bytecode compiler in Tcl 8.0 Tcl_Eval was
- *	the main procedure used for executing Tcl commands, but nowadays
- *	it isn't used much.
- *
- * Results:
- *	The return value is one of the return codes defined in tcl.h
- *	(such as TCL_OK), and interp's result contains a value
- *	to supplement the return code. The value of the result
- *	will persist only until the next call to Tcl_Eval or Tcl_EvalObj:
- *	you must copy it or lose it!
- *
- * Side effects:
- *	Can be almost arbitrary, depending on the commands in the script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Eval(interp, string)
-    Tcl_Interp *interp;		/* Token for command interpreter (returned
-				 * by previous call to Tcl_CreateInterp). */
-    char *string;		/* Pointer to TCL command to execute. */
-{
-    int code;
-
-    code = Tcl_EvalEx(interp, string, -1, 0);
-
-    /*
-     * For backwards compatibility with old C code that predates the
-     * object system in Tcl 8.0, we have to mirror the object result
-     * back into the string result (some callers may expect it there).
-     */
-
-    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	    TCL_VOLATILE);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EvalObj, Tcl_GlobalEvalObj --
- *
- *	These functions are deprecated but we keep them around for backwards
- *	compatibility reasons.
- *
- * Results:
- *	See the functions they call.
- *
- * Side effects:
- *	See the functions they call.
- *
- *----------------------------------------------------------------------
- */
-
-#undef Tcl_EvalObj
-int
-Tcl_EvalObj(interp, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-{
-    return Tcl_EvalObjEx(interp, objPtr, 0);
-}
-
-#undef Tcl_GlobalEvalObj
-int
-Tcl_GlobalEvalObj(interp, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-{
-    return Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseVarName --
- *
- *	Given a string starting with a $ sign, parse off a variable
- *	name and return information about the parse.
- *
- * Results:
- *	The return value is TCL_OK if the command was parsed
- *	successfully and TCL_ERROR otherwise.  If an error occurs and
- *	interp isn't NULL then an error message is left in its result. 
- *	On a successful return, tokenPtr and numTokens fields of
- *	parsePtr are filled in with information about the variable name
- *	that was parsed.  The "size" field of the first new token gives
- *	the total number of bytes in the variable name.  Other fields in
- *	parsePtr are undefined.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the command, then additional space is
- *	malloc-ed.  If the procedure returns TCL_OK then the caller must
- *	eventually invoke Tcl_FreeParse to release any additional space
- *	that was allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ParseVarName(interp, string, numBytes, parsePtr, append)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting;
-				 * if NULL, then no error message is
-				 * provided. */
-    char *string;		/* String containing variable name.  First
-				 * character must be "$". */
-    int numBytes;		/* Total number of bytes in string.  If < 0,
-				 * the string consists of all bytes up to the
-				 * first null character. */
-    Tcl_Parse *parsePtr;	/* Structure to fill in with information
-				 * about the variable name. */
-    int append;			/* Non-zero means append tokens to existing
-				 * information in parsePtr; zero means ignore
-				 * existing tokens in parsePtr and reinitialize
-				 * it. */
-{
-    Tcl_Token *tokenPtr;
-    char *end, *src;
-    unsigned char c;
-    int varIndex, offset;
-    Tcl_UniChar ch;
-
-    if (numBytes >= 0) {
-	end = string + numBytes;
-    } else {
-	end = string + strlen(string);
-    }
-
-    if (!append) {
-	parsePtr->numWords = 0;
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-	parsePtr->numTokens = 0;
-	parsePtr->tokensAvailable = NUM_STATIC_TOKENS;
-	parsePtr->string = string;
-	parsePtr->end = end;
-	parsePtr->interp = interp;
-	parsePtr->incomplete = 0;
-    }
-
-    /*
-     * Generate one token for the variable, an additional token for the
-     * name, plus any number of additional tokens for the index, if
-     * there is one.
-     */
-
-    src = string;
-    if ((parsePtr->numTokens + 2) > parsePtr->tokensAvailable) {
-	TclExpandTokenArray(parsePtr);
-    }
-    tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-    tokenPtr->type = TCL_TOKEN_VARIABLE;
-    tokenPtr->start = src;
-    varIndex = parsePtr->numTokens;
-    parsePtr->numTokens++;
-    tokenPtr++;
-    src++;
-    if (src >= end) {
-	goto justADollarSign;
-    }
-    tokenPtr->type = TCL_TOKEN_TEXT;
-    tokenPtr->start = src;
-    tokenPtr->numComponents = 0;
-
-    /*
-     * The name of the variable can have three forms:
-     * 1. The $ sign is followed by an open curly brace.  Then 
-     *    the variable name is everything up to the next close
-     *    curly brace, and the variable is a scalar variable.
-     * 2. The $ sign is not followed by an open curly brace.  Then
-     *    the variable name is everything up to the next
-     *    character that isn't a letter, digit, or underscore.
-     *    :: sequences are also considered part of the variable
-     *    name, in order to support namespaces. If the following
-     *    character is an open parenthesis, then the information
-     *    between parentheses is the array element name.
-     * 3. The $ sign is followed by something that isn't a letter,
-     *    digit, or underscore:  in this case, there is no variable
-     *    name and the token is just "$".
-     */
-
-    if (*src == '{') {
-	src++;
-	tokenPtr->type = TCL_TOKEN_TEXT;
-	tokenPtr->start = src;
-	tokenPtr->numComponents = 0;
-	while (1) {
-	    if (src == end) {
-		if (interp != NULL) {
-		    Tcl_SetResult(interp,
-			"missing close-brace for variable name",
-			TCL_STATIC);
-		}
-		parsePtr->term = tokenPtr->start-1;
-		parsePtr->incomplete = 1;
-		goto error;
-	    }
-	    if (*src == '}') {
-		break;
-	    }
-	    src++;
-	}
-	tokenPtr->size = src - tokenPtr->start;
-	tokenPtr[-1].size = src - tokenPtr[-1].start;
-	parsePtr->numTokens++;
-	src++;
-    } else {
-	tokenPtr->type = TCL_TOKEN_TEXT;
-	tokenPtr->start = src;
-	tokenPtr->numComponents = 0;
-	while (src != end) {
-	    offset = Tcl_UtfToUniChar(src, &ch);
-	    c = UCHAR(ch);
-	    if (isalnum(c) || (c == '_')) { /* INTL: ISO only, UCHAR. */
-		src += offset;
-		continue;
-	    }
-	    if ((c == ':') && (((src+1) != end) && (src[1] == ':'))) {
-		src += 2;
-		while ((src != end) && (*src == ':')) {
-		    src += 1;
-		}
-		continue;
-	    }
-	    break;
-	}
-	tokenPtr->size = src - tokenPtr->start;
-	if (tokenPtr->size == 0) {
-	    goto justADollarSign;
-	}
-	parsePtr->numTokens++;
-	if ((src != end) && (*src == '(')) {
-	    /*
-	     * This is a reference to an array element.  Call
-	     * ParseTokens recursively to parse the element name,
-	     * since it could contain any number of substitutions.
-	     */
-
-	    if (ParseTokens(src+1, TYPE_CLOSE_PAREN, parsePtr)
-		    != TCL_OK) {
-		goto error;
-	    }
-	    if ((parsePtr->term == end) || (*parsePtr->term != ')')) { 
-		if (parsePtr->interp != NULL) {
-		    Tcl_SetResult(parsePtr->interp, "missing )",
-			    TCL_STATIC);
-		}
-		parsePtr->term = src;
-		parsePtr->incomplete = 1;
-		goto error;
-	    }
-	    src = parsePtr->term + 1;
-	}
-    }
-    tokenPtr = &parsePtr->tokenPtr[varIndex];
-    tokenPtr->size = src - tokenPtr->start;
-    tokenPtr->numComponents = parsePtr->numTokens - (varIndex + 1);
-    return TCL_OK;
-
-    /*
-     * The dollar sign isn't followed by a variable name.
-     * replace the TCL_TOKEN_VARIABLE token with a
-     * TCL_TOKEN_TEXT token for the dollar sign.
-     */
-
-    justADollarSign:
-    tokenPtr = &parsePtr->tokenPtr[varIndex];
-    tokenPtr->type = TCL_TOKEN_TEXT;
-    tokenPtr->size = 1;
-    tokenPtr->numComponents = 0;
-    return TCL_OK;
-
-    error:
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseVar --
- *
- *	Given a string starting with a $ sign, parse off a variable
- *	name and return its value.
- *
- * Results:
- *	The return value is the contents of the variable given by
- *	the leading characters of string.  If termPtr isn't NULL,
- *	*termPtr gets filled in with the address of the character
- *	just after the last one in the variable specifier.  If the
- *	variable doesn't exist, then the return value is NULL and
- *	an error message will be left in interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_ParseVar(interp, string, termPtr)
-    Tcl_Interp *interp;			/* Context for looking up variable. */
-    register char *string;		/* String containing variable name.
-					 * First character must be "$". */
-    char **termPtr;			/* If non-NULL, points to word to fill
-					 * in with character just after last
-					 * one in the variable specifier. */
-
-{
-    Tcl_Parse parse;
-    register Tcl_Obj *objPtr;
-
-    if (Tcl_ParseVarName(interp, string, -1, &parse, 0) != TCL_OK) {
-	return NULL;
-    }
-
-    if (termPtr != NULL) {
-	*termPtr = string + parse.tokenPtr->size;
-    }
-    if (parse.numTokens == 1) {
-	/*
-	 * There isn't a variable name after all: the $ is just a $.
-	 */
-
-	return "$";
-    }
-
-    objPtr = Tcl_EvalTokens(interp, parse.tokenPtr, parse.numTokens);
-    if (objPtr == NULL) {
-	return NULL;
-    }
-
-    /*
-     * At this point we should have an object containing the value of
-     * a variable.  Just return the string from that object.
-     */
-
-#ifdef TCL_COMPILE_DEBUG
-    if (objPtr->refCount < 2) {
-	panic("Tcl_ParseVar got temporary object from Tcl_EvalTokens");
-    }
-#endif /*TCL_COMPILE_DEBUG*/    
-    TclDecrRefCount(objPtr);
-    return TclGetString(objPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseBraces --
- *
- *	Given a string in braces such as a Tcl command argument or a string
- *	value in a Tcl expression, this procedure parses the string and
- *	returns information about the parse.
- *
- * Results:
- *	The return value is TCL_OK if the string was parsed successfully and
- *	TCL_ERROR otherwise. If an error occurs and interp isn't NULL then
- *	an error message is left in its result. On a successful return,
- *	tokenPtr and numTokens fields of parsePtr are filled in with
- *	information about the string that was parsed. Other fields in
- *	parsePtr are undefined. termPtr is set to point to the character
- *	just after the last one in the braced string.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the command, then additional space is
- *	malloc-ed. If the procedure returns TCL_OK then the caller must
- *	eventually invoke Tcl_FreeParse to release any additional space
- *	that was allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ParseBraces(interp, string, numBytes, parsePtr, append, termPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting;
-				 * if NULL, then no error message is
-				 * provided. */
-    char *string;		/* String containing the string in braces.
-				 * The first character must be '{'. */
-    int numBytes;		/* Total number of bytes in string. If < 0,
-				 * the string consists of all bytes up to
-				 * the first null character. */
-    register Tcl_Parse *parsePtr;
-    				/* Structure to fill in with information
-				 * about the string. */
-    int append;			/* Non-zero means append tokens to existing
-				 * information in parsePtr; zero means
-				 * ignore existing tokens in parsePtr and
-				 * reinitialize it. */
-    char **termPtr;		/* If non-NULL, points to word in which to
-				 * store a pointer to the character just
-				 * after the terminating '}' if the parse
-				 * was successful. */
-
-{
-    char utfBytes[TCL_UTF_MAX];	/* For result of backslash substitution. */
-    Tcl_Token *tokenPtr;
-    register char *src, *end;
-    int startIndex, level, length;
-
-    if ((numBytes >= 0) || (string == NULL)) {
-	end = string + numBytes;
-    } else {
-	end = string + strlen(string);
-    }
-    
-    if (!append) {
-	parsePtr->numWords = 0;
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-	parsePtr->numTokens = 0;
-	parsePtr->tokensAvailable = NUM_STATIC_TOKENS;
-	parsePtr->string = string;
-	parsePtr->end = end;
-	parsePtr->interp = interp;
-    }
-
-    src = string+1;
-    startIndex = parsePtr->numTokens;
-
-    if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	TclExpandTokenArray(parsePtr);
-    }
-    tokenPtr = &parsePtr->tokenPtr[startIndex];
-    tokenPtr->type = TCL_TOKEN_TEXT;
-    tokenPtr->start = src;
-    tokenPtr->numComponents = 0;
-    level = 1;
-    while (1) {
-	while (CHAR_TYPE(*src) == TYPE_NORMAL) {
-	    src++;
-	}
-	if (*src == '}') {
-	    level--;
-	    if (level == 0) {
-		break;
-	    }
-	    src++;
-	} else if (*src == '{') {
-	    level++;
-	    src++;
-	} else if (*src == '\\') {
-	    Tcl_UtfBackslash(src, &length, utfBytes);
-	    if (src[1] == '\n') {
-		/*
-		 * A backslash-newline sequence must be collapsed, even
-		 * inside braces, so we have to split the word into
-		 * multiple tokens so that the backslash-newline can be
-		 * represented explicitly.
-		 */
-		
-		if ((src + 2) == end) {
-		    parsePtr->incomplete = 1;
-		}
-		tokenPtr->size = (src - tokenPtr->start);
-		if (tokenPtr->size != 0) {
-		    parsePtr->numTokens++;
-		}
-		if ((parsePtr->numTokens+1) >= parsePtr->tokensAvailable) {
-		    TclExpandTokenArray(parsePtr);
-		}
-		tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-		tokenPtr->type = TCL_TOKEN_BS;
-		tokenPtr->start = src;
-		tokenPtr->size = length;
-		tokenPtr->numComponents = 0;
-		parsePtr->numTokens++;
-		
-		src += length;
-		tokenPtr++;
-		tokenPtr->type = TCL_TOKEN_TEXT;
-		tokenPtr->start = src;
-		tokenPtr->numComponents = 0;
-	    } else {
-		src += length;
-	    }
-	} else if (src == end) {
-	    if (interp != NULL) {
-		Tcl_SetResult(interp, "missing close-brace", TCL_STATIC);
-	    }
-	    parsePtr->term = string;
-	    parsePtr->incomplete = 1;
-	    goto error;
-	} else {
-	    src++;
-	}
-    }
-
-    /*
-     * Decide if we need to finish emitting a partially-finished token.
-     * There are 3 cases:
-     *     {abc \newline xyz} or {xyz}	- finish emitting "xyz" token
-     *     {abc \newline}		- don't emit token after \newline
-     *     {}				- finish emitting zero-sized token
-     * The last case ensures that there is a token (even if empty) that
-     * describes the braced string.
-     */
-    
-    if ((src != tokenPtr->start)
-	    || (parsePtr->numTokens == startIndex)) {
-	tokenPtr->size = (src - tokenPtr->start);
-	parsePtr->numTokens++;
-    }
-    if (termPtr != NULL) {
-	*termPtr = src+1;
-    }
-    return TCL_OK;
-
-    error:
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseQuotedString --
- *
- *	Given a double-quoted string such as a quoted Tcl command argument
- *	or a quoted value in a Tcl expression, this procedure parses the
- *	string and returns information about the parse.
- *
- * Results:
- *	The return value is TCL_OK if the string was parsed successfully and
- *	TCL_ERROR otherwise. If an error occurs and interp isn't NULL then
- *	an error message is left in its result. On a successful return,
- *	tokenPtr and numTokens fields of parsePtr are filled in with
- *	information about the string that was parsed. Other fields in
- *	parsePtr are undefined. termPtr is set to point to the character
- *	just after the quoted string's terminating close-quote.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the command, then additional space is
- *	malloc-ed. If the procedure returns TCL_OK then the caller must
- *	eventually invoke Tcl_FreeParse to release any additional space
- *	that was allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ParseQuotedString(interp, string, numBytes, parsePtr, append, termPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting;
-				 * if NULL, then no error message is
-				 * provided. */
-    char *string;		/* String containing the quoted string. 
-				 * The first character must be '"'. */
-    int numBytes;		/* Total number of bytes in string. If < 0,
-				 * the string consists of all bytes up to
-				 * the first null character. */
-    register Tcl_Parse *parsePtr;
-    				/* Structure to fill in with information
-				 * about the string. */
-    int append;			/* Non-zero means append tokens to existing
-				 * information in parsePtr; zero means
-				 * ignore existing tokens in parsePtr and
-				 * reinitialize it. */
-    char **termPtr;		/* If non-NULL, points to word in which to
-				 * store a pointer to the character just
-				 * after the quoted string's terminating
-				 * close-quote if the parse succeeds. */
-{
-    char *end;
-    
-    if ((numBytes >= 0) || (string == NULL)) {
-	end = string + numBytes;
-    } else {
-	end = string + strlen(string);
-    }
-    
-    if (!append) {
-	parsePtr->numWords = 0;
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-	parsePtr->numTokens = 0;
-	parsePtr->tokensAvailable = NUM_STATIC_TOKENS;
-	parsePtr->string = string;
-	parsePtr->end = end;
-	parsePtr->interp = interp;
-    }
-    
-    if (ParseTokens(string+1, TYPE_QUOTE, parsePtr) != TCL_OK) {
-	goto error;
-    }
-    if (*parsePtr->term != '"') {
-	if (interp != NULL) {
-	    Tcl_SetResult(parsePtr->interp, "missing \"", TCL_STATIC);
-	}
-	parsePtr->term = string;
-	parsePtr->incomplete = 1;
-	goto error;
-    }
-    if (termPtr != NULL) {
-	*termPtr = (parsePtr->term + 1);
-    }
-    return TCL_OK;
-
-    error:
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-	parsePtr->tokenPtr = parsePtr->staticTokens;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CommandComplete --
- *
- *	This procedure is shared by TclCommandComplete and
- *	Tcl_ObjCommandcoComplete; it does all the real work of seeing
- *	whether a script is complete
- *
- * Results:
- *	1 is returned if the script is complete, 0 if there are open
- *	delimiters such as " or (. 1 is also returned if there is a
- *	parse error in the script other than unmatched delimiters.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CommandComplete(script, length)
-    char *script;			/* Script to check. */
-    int length;				/* Number of bytes in script. */
-{
-    Tcl_Parse parse;
-    char *p, *end;
-
-    p = script;
-    end = p + length;
-    while (Tcl_ParseCommand((Tcl_Interp *) NULL, p, end - p, 0, &parse)
-	    == TCL_OK) {
-	p = parse.commandStart + parse.commandSize;
-	if (*p == 0) {
-	    break;
-	}
-    }
-    if (parse.incomplete) {
-	return 0;
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CommandComplete --
- *
- *	Given a partial or complete Tcl script, this procedure
- *	determines whether the script is complete in the sense
- *	of having matched braces and quotes and brackets.
- *
- * Results:
- *	1 is returned if the script is complete, 0 otherwise.
- *	1 is also returned if there is a parse error in the script
- *	other than unmatched delimiters.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_CommandComplete(script)
-    char *script;			/* Script to check. */
-{
-    return CommandComplete(script, (int) strlen(script));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclObjCommandComplete --
- *
- *	Given a partial or complete Tcl command in a Tcl object, this
- *	procedure determines whether the command is complete in the sense of
- *	having matched braces and quotes and brackets.
- *
- * Results:
- *	1 is returned if the command is complete, 0 otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjCommandComplete(objPtr)
-    Tcl_Obj *objPtr;			/* Points to object holding script
-					 * to check. */
-{
-    char *script;
-    int length;
-
-    script = Tcl_GetStringFromObj(objPtr, &length);
-    return CommandComplete(script, length);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclIsLocalScalar --
- *
- *	Check to see if a given string is a legal scalar variable
- *	name with no namespace qualifiers or substitutions.
- *
- * Results:
- *	Returns 1 if the variable is a local scalar.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclIsLocalScalar(src, len)
-    CONST char *src;
-    int len;
-{
-    CONST char *p;
-    CONST char *lastChar = src + (len - 1);
-
-    for (p = src; p <= lastChar; p++) {
-	if ((CHAR_TYPE(*p) != TYPE_NORMAL) &&
-		(CHAR_TYPE(*p) != TYPE_COMMAND_END)) {
-	    /*
-	     * TCL_COMMAND_END is returned for the last character
-	     * of the string.  By this point we know it isn't
-	     * an array or namespace reference.
-	     */
-
-	    return 0;
-	}
-	if  (*p == '(') {
-	    if (*lastChar == ')') { /* we have an array element */
-		return 0;
-	    }
-	} else if (*p == ':') {
-	    if ((p != lastChar) && *(p+1) == ':') { /* qualified name */
-		return 0;
-	    }
-	}
-    }
-	
-    return 1;
-}
diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c
deleted file mode 100644
index 306d5de..0000000
--- a/generic/tclParseExpr.c
+++ /dev/null
@@ -1,1826 +0,0 @@
-/* 
- * tclParseExpr.c --
- *
- *	This file contains procedures that parse Tcl expressions. They
- *	do so in a general-purpose fashion that can be used for many
- *	different purposes, including compilation, direct execution,
- *	code analysis, etc.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclParseExpr.c,v 1.2 1999/04/16 00:46:51 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * The stuff below is a bit of a hack so that this file can be used in
- * environments that include no UNIX, i.e. no errno: just arrange to use
- * the errno from tclExecute.c here.
- */
-
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
-#define NO_ERRNO_H
-#endif
-
-#ifdef NO_ERRNO_H
-extern int errno;			/* Use errno from tclExecute.c. */
-#define ERANGE 34
-#endif
-
-/*
- * Boolean variable that controls whether expression parse tracing
- * is enabled.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static int traceParseExpr = 0;
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- * The ParseInfo structure holds state while parsing an expression.
- * A pointer to an ParseInfo record is passed among the routines in
- * this module.
- */
-
-typedef struct ParseInfo {
-    Tcl_Parse *parsePtr;	/* Points to structure to fill in with
-				 * information about the expression. */
-    int lexeme;			/* Type of last lexeme scanned in expr.
-				 * See below for definitions. Corresponds to
-				 * size characters beginning at start. */
-    char *start;		/* First character in lexeme. */
-    int size;			/* Number of bytes in lexeme. */
-    char *next;			/* Position of the next character to be
-				 * scanned in the expression string. */
-    char *prevEnd;		/* Points to the character just after the
-				 * last one in the previous lexeme. Used to
-				 * compute size of subexpression tokens. */
-    char *originalExpr;		/* Points to the start of the expression
-				 * originally passed to Tcl_ParseExpr. */
-    char *lastChar;		/* Points just after last byte of expr. */
-} ParseInfo;
-
-/*
- * Definitions of the different lexemes that appear in expressions. The
- * order of these must match the corresponding entries in the
- * operatorStrings array below.
- */
-
-#define LITERAL		0
-#define FUNC_NAME	1
-#define OPEN_BRACKET	2
-#define OPEN_BRACE	3
-#define OPEN_PAREN	4
-#define CLOSE_PAREN	5
-#define DOLLAR		6
-#define QUOTE		7
-#define COMMA		8
-#define END		9
-#define UNKNOWN		10
-
-/*
- * Binary operators:
- */
-
-#define MULT		11
-#define DIVIDE		12
-#define MOD		13
-#define PLUS		14
-#define MINUS		15
-#define LEFT_SHIFT	16
-#define RIGHT_SHIFT	17
-#define LESS		18
-#define GREATER		19
-#define LEQ		20
-#define GEQ		21
-#define EQUAL		22
-#define NEQ		23
-#define BIT_AND		24
-#define BIT_XOR		25
-#define BIT_OR		26
-#define AND		27
-#define OR		28
-#define QUESTY		29
-#define COLON		30
-
-/*
- * Unary operators. Unary minus and plus are represented by the (binary)
- * lexemes MINUS and PLUS.
- */
-
-#define NOT		31
-#define BIT_NOT		32
-
-/*
- * Mapping from lexemes to strings; used for debugging messages. These
- * entries must match the order and number of the lexeme definitions above.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-static char *lexemeStrings[] = {
-    "LITERAL", "FUNCNAME",
-    "[", "{", "(", ")", "$", "\"", ",", "END", "UNKNOWN",
-    "*", "/", "%", "+", "-",
-    "<<", ">>", "<", ">", "<=", ">=", "==", "!=",
-    "&", "^", "|", "&&", "||", "?", ":",
-    "!", "~"
-};
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- * Declarations for local procedures to this file:
- */
-
-static int		GetLexeme _ANSI_ARGS_((ParseInfo *infoPtr));
-static void		LogSyntaxError _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseAddExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseBitAndExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseBitOrExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseBitXorExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseCondExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseEqualityExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseLandExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseLorExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseMultiplyExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParsePrimaryExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseRelationalExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseShiftExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static int		ParseUnaryExpr _ANSI_ARGS_((ParseInfo *infoPtr));
-static void		PrependSubExprTokens _ANSI_ARGS_((char *op,
-			    int opBytes, char *src, int srcBytes,
-			    int firstIndex, ParseInfo *infoPtr));
-
-/*
- * Macro used to debug the execution of the recursive descent parser used
- * to parse expressions.
- */
-
-#ifdef TCL_COMPILE_DEBUG
-#define HERE(production, level) \
-    if (traceParseExpr) { \
-	fprintf(stderr, "%*s%s: lexeme=%s, next=\"%.20s\"\n", \
-		(level), " ", (production), \
-		lexemeStrings[infoPtr->lexeme], infoPtr->next); \
-    }
-#else
-#define HERE(production, level)
-#endif /* TCL_COMPILE_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ParseExpr --
- *
- *	Given a string, this procedure parses the first Tcl expression
- *	in the string and returns information about the structure of
- *	the expression. This procedure is the top-level interface to the
- *	the expression parsing module.
- *
- * Results:
- *	The return value is TCL_OK if the command was parsed successfully
- *	and TCL_ERROR otherwise. If an error occurs and interp isn't NULL
- *	then an error message is left in its result. On a successful return,
- *	parsePtr is filled in with information about the expression that 
- *	was parsed.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the expression, then additional space is
- *	malloc-ed. If the procedure returns TCL_OK then the caller must
- *	eventually invoke Tcl_FreeParse to release any additional space
- *	that was allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ParseExpr(interp, string, numBytes, parsePtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *string;		/* The source string to parse. */
-    int numBytes;		/* Number of bytes in string. If < 0, the
-				 * string consists of all bytes up to the
-				 * first null character. */
-    Tcl_Parse *parsePtr;	/* Structure to fill with information about
-				 * the parsed expression; any previous
-				 * information in the structure is
-				 * ignored. */
-{
-    ParseInfo info;
-    int code;
-    char savedChar;
-
-    if (numBytes < 0) {
-	numBytes = (string? strlen(string) : 0);
-    }
-#ifdef TCL_COMPILE_DEBUG
-    if (traceParseExpr) {
-	fprintf(stderr, "Tcl_ParseExpr: string=\"%.*s\"\n",
-	        numBytes, string);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-    
-    parsePtr->commentStart = NULL;
-    parsePtr->commentSize = 0;
-    parsePtr->commandStart = NULL;
-    parsePtr->commandSize = 0;
-    parsePtr->numWords = 0;
-    parsePtr->tokenPtr = parsePtr->staticTokens;
-    parsePtr->numTokens = 0;
-    parsePtr->tokensAvailable = NUM_STATIC_TOKENS;
-    parsePtr->string = string;
-    parsePtr->end = (string + numBytes);
-    parsePtr->interp = interp;
-    parsePtr->term = string;
-    parsePtr->incomplete = 0;
-
-    /*
-     * Temporarily overwrite the character just after the end of the
-     * string with a 0 byte.  This acts as a sentinel and reduces the
-     * number of places where we have to check for the end of the
-     * input string.  The original value of the byte is restored at
-     * the end of the parse.
-     */
-
-    savedChar = string[numBytes];
-    string[numBytes] = 0;
-
-    /*
-     * Initialize the ParseInfo structure that holds state while parsing
-     * the expression.
-     */
-
-    info.parsePtr = parsePtr;
-    info.lexeme = UNKNOWN;
-    info.start = NULL;
-    info.size = 0;
-    info.next = string;
-    info.prevEnd = string;
-    info.originalExpr = string;
-    info.lastChar = (string + numBytes); /* just after last char of expr */
-
-    /*
-     * Get the first lexeme then parse the expression.
-     */
-
-    code = GetLexeme(&info);
-    if (code != TCL_OK) {
-	goto error;
-    }
-    code = ParseCondExpr(&info);
-    if (code != TCL_OK) {
-	goto error;
-    }
-    if (info.lexeme != END) {
-	LogSyntaxError(&info);
-	goto error;
-    }
-    string[numBytes] = (char) savedChar;
-    return TCL_OK;
-    
-    error:
-    string[numBytes] = (char) savedChar;
-    if (parsePtr->tokenPtr != parsePtr->staticTokens) {
-	ckfree((char *) parsePtr->tokenPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseCondExpr --
- *
- *	This procedure parses a Tcl conditional expression:
- *	condExpr ::= lorExpr ['?' condExpr ':' condExpr]
- *
- *	Note that this is the topmost recursive-descent parsing routine used
- *	by TclParseExpr to parse expressions. This avoids an extra procedure
- *	call since such a procedure would only return the result of calling
- *	ParseCondExpr. Other recursive-descent procedures that need to parse
- *	complete expressions also call ParseCondExpr.
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseCondExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    Tcl_Token *tokenPtr, *firstTokenPtr, *condTokenPtr;
-    int firstIndex, numToMove, code;
-    char *srcStart;
-    
-    HERE("condExpr", 1);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseLorExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    
-    if (infoPtr->lexeme == QUESTY) {
-	/*
-	 * Emit two tokens: one TCL_TOKEN_SUB_EXPR token for the entire
-	 * conditional expression, and a TCL_TOKEN_OPERATOR token for 
-	 * the "?" operator. Note that these two tokens must be inserted
-	 * before the LOR operand tokens generated above.
-	 */
-
-	if ((parsePtr->numTokens + 1) >= parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	firstTokenPtr = &parsePtr->tokenPtr[firstIndex];
-	tokenPtr = (firstTokenPtr + 2);
-	numToMove = (parsePtr->numTokens - firstIndex);
-	memmove((VOID *) tokenPtr, (VOID *) firstTokenPtr,
-	        (size_t) (numToMove * sizeof(Tcl_Token)));
-	parsePtr->numTokens += 2;
-	
-	tokenPtr = firstTokenPtr;
-	tokenPtr->type = TCL_TOKEN_SUB_EXPR;
-	tokenPtr->start = srcStart;
-	
-	tokenPtr++;
-	tokenPtr->type = TCL_TOKEN_OPERATOR;
-	tokenPtr->start = infoPtr->start;
-	tokenPtr->size = 1;
-	tokenPtr->numComponents = 0;
-    
-	/*
-	 * Skip over the '?'.
-	 */
-	
-	code = GetLexeme(infoPtr); 
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Parse the "then" expression.
-	 */
-
-	code = ParseCondExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	if (infoPtr->lexeme != COLON) {
-	    LogSyntaxError(infoPtr);
-	    return TCL_ERROR;
-	}
-	code = GetLexeme(infoPtr); /* skip over the ':' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Parse the "else" expression.
-	 */
-
-	code = ParseCondExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Now set the size-related fields in the '?' subexpression token.
-	 */
-
-	condTokenPtr = &parsePtr->tokenPtr[firstIndex];
-	condTokenPtr->size = (infoPtr->prevEnd - srcStart);
-	condTokenPtr->numComponents = parsePtr->numTokens - (firstIndex+1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseLorExpr --
- *
- *	This procedure parses a Tcl logical or expression:
- *	lorExpr ::= landExpr {'||' landExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseLorExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, code;
-    char *srcStart, *operator;
-    
-    HERE("lorExpr", 2);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseLandExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    while (infoPtr->lexeme == OR) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the '||' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseLandExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the LOR subexpression and the '||' operator.
-	 */
-
-	PrependSubExprTokens(operator, 2, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseLandExpr --
- *
- *	This procedure parses a Tcl logical and expression:
- *	landExpr ::= bitOrExpr {'&&' bitOrExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseLandExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, code;
-    char *srcStart, *operator;
-
-    HERE("landExpr", 3);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseBitOrExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    while (infoPtr->lexeme == AND) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the '&&' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseBitOrExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the LAND subexpression and the '&&' operator.
-	 */
-
-	PrependSubExprTokens(operator, 2, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseBitOrExpr --
- *
- *	This procedure parses a Tcl bitwise or expression:
- *	bitOrExpr ::= bitXorExpr {'|' bitXorExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseBitOrExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, code;
-    char *srcStart, *operator;
-
-    HERE("bitOrExpr", 4);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseBitXorExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    
-    while (infoPtr->lexeme == BIT_OR) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the '|' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	code = ParseBitXorExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	
-	/*
-	 * Generate tokens for the BITOR subexpression and the '|' operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseBitXorExpr --
- *
- *	This procedure parses a Tcl bitwise exclusive or expression:
- *	bitXorExpr ::= bitAndExpr {'^' bitAndExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseBitXorExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, code;
-    char *srcStart, *operator;
-
-    HERE("bitXorExpr", 5);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseBitAndExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    
-    while (infoPtr->lexeme == BIT_XOR) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the '^' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	code = ParseBitAndExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	
-	/*
-	 * Generate tokens for the XOR subexpression and the '^' operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseBitAndExpr --
- *
- *	This procedure parses a Tcl bitwise and expression:
- *	bitAndExpr ::= equalityExpr {'&' equalityExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseBitAndExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, code;
-    char *srcStart, *operator;
-
-    HERE("bitAndExpr", 6);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseEqualityExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    
-    while (infoPtr->lexeme == BIT_AND) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the '&' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseEqualityExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	
-	/*
-	 * Generate tokens for the BITAND subexpression and '&' operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseEqualityExpr --
- *
- *	This procedure parses a Tcl equality (inequality) expression:
- *	equalityExpr ::= relationalExpr {('==' | '!=') relationalExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseEqualityExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, code;
-    char *srcStart, *operator;
-
-    HERE("equalityExpr", 7);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseRelationalExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    lexeme = infoPtr->lexeme;
-    while ((lexeme == EQUAL) || (lexeme == NEQ)) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over == or != */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseRelationalExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and '==' or '!=' operator.
-	 */
-
-	PrependSubExprTokens(operator, 2, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-	lexeme = infoPtr->lexeme;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseRelationalExpr --
- *
- *	This procedure parses a Tcl relational expression:
- *	relationalExpr ::= shiftExpr {('<' | '>' | '<=' | '>=') shiftExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseRelationalExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, operatorSize, code;
-    char *srcStart, *operator;
-
-    HERE("relationalExpr", 8);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseShiftExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    lexeme = infoPtr->lexeme;
-    while ((lexeme == LESS) || (lexeme == GREATER) || (lexeme == LEQ)
-            || (lexeme == GEQ)) {
-	operator = infoPtr->start;
-	if ((lexeme == LEQ) || (lexeme == GEQ)) {
-	    operatorSize = 2;
-	} else {
-	    operatorSize = 1;
-	}
-	code = GetLexeme(infoPtr); /* skip over the operator */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseShiftExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and the operator.
-	 */
-
-	PrependSubExprTokens(operator, operatorSize, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-	lexeme = infoPtr->lexeme;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseShiftExpr --
- *
- *	This procedure parses a Tcl shift expression:
- *	shiftExpr ::= addExpr {('<<' | '>>') addExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseShiftExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, code;
-    char *srcStart, *operator;
-
-    HERE("shiftExpr", 9);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseAddExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    lexeme = infoPtr->lexeme;
-    while ((lexeme == LEFT_SHIFT) || (lexeme == RIGHT_SHIFT)) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over << or >> */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseAddExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and '<<' or '>>' operator.
-	 */
-
-	PrependSubExprTokens(operator, 2, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-	lexeme = infoPtr->lexeme;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseAddExpr --
- *
- *	This procedure parses a Tcl addition expression:
- *	addExpr ::= multiplyExpr {('+' | '-') multiplyExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseAddExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, code;
-    char *srcStart, *operator;
-
-    HERE("addExpr", 10);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseMultiplyExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    lexeme = infoPtr->lexeme;
-    while ((lexeme == PLUS) || (lexeme == MINUS)) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over + or - */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseMultiplyExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and '+' or '-' operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-	lexeme = infoPtr->lexeme;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseMultiplyExpr --
- *
- *	This procedure parses a Tcl multiply expression:
- *	multiplyExpr ::= unaryExpr {('*' | '/' | '%') unaryExpr}
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseMultiplyExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, code;
-    char *srcStart, *operator;
-
-    HERE("multiplyExpr", 11);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    code = ParseUnaryExpr(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-
-    lexeme = infoPtr->lexeme;
-    while ((lexeme == MULT) || (lexeme == DIVIDE) || (lexeme == MOD)) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over * or / or % */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseUnaryExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and * or / or % operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-	lexeme = infoPtr->lexeme;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseUnaryExpr --
- *
- *	This procedure parses a Tcl unary expression:
- *	unaryExpr ::= ('+' | '-' | '~' | '!') unaryExpr | primaryExpr
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseUnaryExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    int firstIndex, lexeme, code;
-    char *srcStart, *operator;
-
-    HERE("unaryExpr", 12);
-    srcStart = infoPtr->start;
-    firstIndex = parsePtr->numTokens;
-    
-    lexeme = infoPtr->lexeme;
-    if ((lexeme == PLUS) || (lexeme == MINUS) || (lexeme == BIT_NOT)
-            || (lexeme == NOT)) {
-	operator = infoPtr->start;
-	code = GetLexeme(infoPtr); /* skip over the unary operator */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseUnaryExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	/*
-	 * Generate tokens for the subexpression and the operator.
-	 */
-
-	PrependSubExprTokens(operator, 1, srcStart,
-	        (infoPtr->prevEnd - srcStart), firstIndex, infoPtr);
-    } else {			/* must be a primaryExpr */
-	code = ParsePrimaryExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParsePrimaryExpr --
- *
- *	This procedure parses a Tcl primary expression:
- *	primaryExpr ::= literal | varReference | quotedString |
- *			'[' command ']' | mathFuncCall | '(' condExpr ')'
- *
- * Results:
- *	The return value is TCL_OK on a successful parse and TCL_ERROR
- *	on failure. If TCL_ERROR is returned, then the interpreter's result
- *	contains an error message.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParsePrimaryExpr(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    Tcl_Interp *interp = parsePtr->interp;
-    Tcl_Token *tokenPtr, *exprTokenPtr;
-    Tcl_Parse nested;
-    char *dollarPtr, *stringStart, *termPtr, *src;
-    int lexeme, exprIndex, firstIndex, numToMove, code;
-
-    /*
-     * We simply recurse on parenthesized subexpressions.
-     */
-
-    HERE("primaryExpr", 13);
-    lexeme = infoPtr->lexeme;
-    if (lexeme == OPEN_PAREN) {
-	code = GetLexeme(infoPtr); /* skip over the '(' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	code = ParseCondExpr(infoPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	if (infoPtr->lexeme != CLOSE_PAREN) {
-	    goto syntaxError;
-	}
-	code = GetLexeme(infoPtr); /* skip over the ')' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	return TCL_OK;
-    }
-
-    /*
-     * Start a TCL_TOKEN_SUB_EXPR token for the primary.
-     */
-
-    if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	TclExpandTokenArray(parsePtr);
-    }
-    exprIndex = parsePtr->numTokens;
-    exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-    exprTokenPtr->type = TCL_TOKEN_SUB_EXPR;
-    exprTokenPtr->start = infoPtr->start;
-    parsePtr->numTokens++;
-
-    /*
-     * Process the primary then finish setting the fields of the
-     * TCL_TOKEN_SUB_EXPR token. Note that we can't use the pointer now
-     * stored in "exprTokenPtr" in the code below since the token array
-     * might be reallocated.
-     */
-
-    firstIndex = parsePtr->numTokens;
-    switch (lexeme) {
-    case LITERAL:
-	/*
-	 * Int or double number.
-	 */
-	
-	if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-	tokenPtr->type = TCL_TOKEN_TEXT;
-	tokenPtr->start = infoPtr->start;
-	tokenPtr->size = infoPtr->size;
-	tokenPtr->numComponents = 0;
-	parsePtr->numTokens++;
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = infoPtr->size;
-	exprTokenPtr->numComponents = 1;
-	break;
-	
-    case DOLLAR:
-	/*
-	 * $var variable reference.
-	 */
-	
-	dollarPtr = (infoPtr->next - 1);
-	code = Tcl_ParseVarName(interp, dollarPtr,
-	        (infoPtr->lastChar - dollarPtr), parsePtr, 1);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	infoPtr->next = dollarPtr + parsePtr->tokenPtr[firstIndex].size;
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = parsePtr->tokenPtr[firstIndex].size;
-	exprTokenPtr->numComponents =
-	        (parsePtr->tokenPtr[firstIndex].numComponents + 1);
-	break;
-	
-    case QUOTE:
-	/*
-	 * '"' string '"'
-	 */
-	
-	stringStart = infoPtr->next;
-	code = Tcl_ParseQuotedString(interp, infoPtr->start,
-	        (infoPtr->lastChar - stringStart), parsePtr, 1, &termPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	infoPtr->next = termPtr;
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = (termPtr - exprTokenPtr->start);
-	exprTokenPtr->numComponents = parsePtr->numTokens - firstIndex;
-
-	/*
-	 * If parsing the quoted string resulted in more than one token,
-	 * insert a TCL_TOKEN_WORD token before them. This indicates that
-	 * the quoted string represents a concatenation of multiple tokens.
-	 */
-
-	if (exprTokenPtr->numComponents > 1) {
-	    if (parsePtr->numTokens >= parsePtr->tokensAvailable) {
-		TclExpandTokenArray(parsePtr);
-	    }
-	    tokenPtr = &parsePtr->tokenPtr[firstIndex];
-	    numToMove = (parsePtr->numTokens - firstIndex);
-	    memmove((VOID *) (tokenPtr + 1), (VOID *) tokenPtr,
-	            (size_t) (numToMove * sizeof(Tcl_Token)));
-	    parsePtr->numTokens++;
-
-	    exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	    exprTokenPtr->numComponents++;
-
-	    tokenPtr->type = TCL_TOKEN_WORD;
-	    tokenPtr->start = exprTokenPtr->start;
-	    tokenPtr->size = exprTokenPtr->size;
-	    tokenPtr->numComponents = (exprTokenPtr->numComponents - 1);
-	}
-	break;
-	
-    case OPEN_BRACKET:
-	/*
-	 * '[' command {command} ']'
-	 */
-
-	if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-	tokenPtr->type = TCL_TOKEN_COMMAND;
-	tokenPtr->start = infoPtr->start;
-	tokenPtr->numComponents = 0;
-	parsePtr->numTokens++;
-
-	/*
-	 * Call Tcl_ParseCommand repeatedly to parse the nested command(s)
-	 * to find their end, then throw away that parse information.
-	 */
-	
-	src = infoPtr->next;
-	while (1) {
-	    if (Tcl_ParseCommand(interp, src, (parsePtr->end - src), 1,
-		    &nested) != TCL_OK) {
-		parsePtr->term = nested.term;
-		parsePtr->incomplete = nested.incomplete;
-		return TCL_ERROR;
-	    }
-	    src = (nested.commandStart + nested.commandSize);
-	    if (nested.tokenPtr != nested.staticTokens) {
-		ckfree((char *) nested.tokenPtr);
-	    }
-	    if ((src[-1] == ']') && !nested.incomplete) {
-		break;
-	    }
-	    if (src == parsePtr->end) {
-		if (parsePtr->interp != NULL) {
-		    Tcl_SetResult(interp, "missing close-bracket",
-			    TCL_STATIC);
-		}
-		parsePtr->term = tokenPtr->start;
-		parsePtr->incomplete = 1;
-		return TCL_ERROR;
-	    }
-	}
-	tokenPtr->size = (src - tokenPtr->start);
-	infoPtr->next = src;
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = (src - tokenPtr->start);
-	exprTokenPtr->numComponents = 1;
-	break;
-
-    case OPEN_BRACE:
-	/*
-	 * '{' string '}'
-	 */
-
-	code = Tcl_ParseBraces(interp, infoPtr->start,
-	        (infoPtr->lastChar - infoPtr->start), parsePtr, 1,
-		&termPtr);
-	if (code != TCL_OK) {
-	    return code;
-	}
-	infoPtr->next = termPtr;
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = (termPtr - infoPtr->start);
-	exprTokenPtr->numComponents = parsePtr->numTokens - firstIndex;
-
-	/*
-	 * If parsing the braced string resulted in more than one token,
-	 * insert a TCL_TOKEN_WORD token before them. This indicates that
-	 * the braced string represents a concatenation of multiple tokens.
-	 */
-
-	if (exprTokenPtr->numComponents > 1) {
-	    if (parsePtr->numTokens >= parsePtr->tokensAvailable) {
-		TclExpandTokenArray(parsePtr);
-	    }
-	    tokenPtr = &parsePtr->tokenPtr[firstIndex];
-	    numToMove = (parsePtr->numTokens - firstIndex);
-	    memmove((VOID *) (tokenPtr + 1), (VOID *) tokenPtr,
-	            (size_t) (numToMove * sizeof(Tcl_Token)));
-	    parsePtr->numTokens++;
-
-	    exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	    exprTokenPtr->numComponents++;
-	    
-	    tokenPtr->type = TCL_TOKEN_WORD;
-	    tokenPtr->start = exprTokenPtr->start;
-	    tokenPtr->size = exprTokenPtr->size;
-	    tokenPtr->numComponents = exprTokenPtr->numComponents-1;
-	}
-	break;
-	
-    case FUNC_NAME:
-	/*
-	 * math_func '(' expr {',' expr} ')'
-	 */
-	
-	if (parsePtr->numTokens == parsePtr->tokensAvailable) {
-	    TclExpandTokenArray(parsePtr);
-	}
-	tokenPtr = &parsePtr->tokenPtr[parsePtr->numTokens];
-	tokenPtr->type = TCL_TOKEN_OPERATOR;
-	tokenPtr->start = infoPtr->start;
-	tokenPtr->size = infoPtr->size;
-	tokenPtr->numComponents = 0;
-	parsePtr->numTokens++;
-	
-	code = GetLexeme(infoPtr); /* skip over function name */
-	if (code != TCL_OK) {
-	    return code;
-	}
-	if (infoPtr->lexeme != OPEN_PAREN) {
-	    goto syntaxError;
-	}
-	code = GetLexeme(infoPtr); /* skip over '(' */
-	if (code != TCL_OK) {
-	    return code;
-	}
-
-	while (infoPtr->lexeme != CLOSE_PAREN) {
-	    code = ParseCondExpr(infoPtr);
-	    if (code != TCL_OK) {
-		return code;
-	    }
-	    
-	    if (infoPtr->lexeme == COMMA) {
-		code = GetLexeme(infoPtr); /* skip over , */
-		if (code != TCL_OK) {
-		    return code;
-		}
-	    } else if (infoPtr->lexeme != CLOSE_PAREN) {
-		goto syntaxError;
-	    }
-	}
-
-	exprTokenPtr = &parsePtr->tokenPtr[exprIndex];
-	exprTokenPtr->size = (infoPtr->next - exprTokenPtr->start);
-	exprTokenPtr->numComponents = parsePtr->numTokens - firstIndex;
-	break;
-	
-    default:
-	goto syntaxError;
-    }
-
-    /*
-     * Advance to the next lexeme before returning.
-     */
-    
-    code = GetLexeme(infoPtr);
-    if (code != TCL_OK) {
-	return code;
-    }
-    parsePtr->term = infoPtr->next;
-    return TCL_OK;
-
-    syntaxError:
-    LogSyntaxError(infoPtr);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetLexeme --
- *
- *	Lexical scanner for Tcl expressions: scans a single operator or
- *	other syntactic element from an expression string.
- *
- * Results:
- *	TCL_OK is returned unless an error occurred. In that case a standard
- *	Tcl error code is returned and, if infoPtr->parsePtr->interp is
- *	non-NULL, the interpreter's result is set to hold an error
- *	message. TCL_ERROR is returned if an integer overflow, or a
- *	floating-point overflow or underflow occurred while reading in a
- *	number. If the lexical analysis is successful, infoPtr->lexeme
- *	refers to the next symbol in the expression string, and
- *	infoPtr->next is advanced past the lexeme. Also, if the lexeme is a
- *	LITERAL or FUNC_NAME, then infoPtr->start is set to the first
- *	character of the lexeme; otherwise it is set NULL.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold all the
- *	information about the subexpression, then additional space is
- *	malloc-ed..
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetLexeme(infoPtr)
-    ParseInfo *infoPtr;		/* Holds state needed to parse the expr,
-				 * including the resulting lexeme. */
-{
-    register char *src;		/* Points to current source char. */
-    char *termPtr;		/* Points to char terminating a literal. */
-    double doubleValue;		/* Value of a scanned double literal. */
-    char c;
-    int startsWithDigit, offset;
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    Tcl_Interp *interp = parsePtr->interp;
-    Tcl_UniChar ch;
-
-    /*
-     * Record where the previous lexeme ended. Since we always read one
-     * lexeme ahead during parsing, this helps us know the source length of
-     * subexpression tokens.
-     */
-
-    infoPtr->prevEnd = infoPtr->next;
-
-    /*
-     * Scan over leading white space at the start of a lexeme. Note that a
-     * backslash-newline is treated as a space.
-     */
-
-    src = infoPtr->next;
-    c = *src;
-    while (isspace(UCHAR(c)) || (c == '\\')) { /* INTL: ISO space */
-	if (c == '\\') {
-	    if (src[1] == '\n') {
-		src += 2;
-	    } else {
-		break;	/* no longer white space */
-	    }
-	} else {
-	    src++;
-	}
-	c = *src;
-    }
-    parsePtr->term = src;
-    if (src >= infoPtr->lastChar) {
-	infoPtr->lexeme = END;
-	infoPtr->next = src;
-	return TCL_OK;
-    }
-
-    /*
-     * Try to parse the lexeme first as an integer or floating-point
-     * number. Don't check for a number if the first character c is
-     * "+" or "-". If we did, we might treat a binary operator as unary
-     * by mistake, which would eventually cause a syntax error.
-     */
-
-    if ((c != '+') && (c != '-')) {
-	startsWithDigit = isdigit(UCHAR(c)); /* INTL: digit */
-	if (startsWithDigit && TclLooksLikeInt(src, -1)) {
-	    errno = 0;
-	    (void) strtoul(src, &termPtr, 0);
-	    if (errno == ERANGE) {
-		if (interp != NULL) {
-		    char *s = "integer value too large to represent";
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendToObj(Tcl_GetObjResult(interp), s, -1);
-		    Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s,
-			    (char *) NULL);
-		}
-		return TCL_ERROR;
-	    }
- 	    if (termPtr != src) {
-                /*
-                 * src was the start of a valid integer.
-                 */
-
-                infoPtr->lexeme = LITERAL;
-		infoPtr->start = src;
-		infoPtr->size = (termPtr - src);
-                infoPtr->next = termPtr;
-		parsePtr->term = termPtr;
-                return TCL_OK;
-	    }
-	} else if (startsWithDigit || (c == '.')
-	        || (c == 'n') || (c == 'N')) {
-	    errno = 0;
-	    doubleValue = strtod(src, &termPtr);
-	    if (termPtr != src) {
-		if (errno != 0) {
-		    if (interp != NULL) {
-			TclExprFloatError(interp, doubleValue);
-		    }
-		    return TCL_ERROR;
-		}
-		
-		/*
-                 * src was the start of a valid double.
-                 */
-		
-		infoPtr->lexeme = LITERAL;
-		infoPtr->start = src;
-		infoPtr->size = (termPtr - src);
-		infoPtr->next = termPtr;
-		parsePtr->term = termPtr;
-		return TCL_OK;
-	    }
-	}
-    }
-
-    /*
-     * Not an integer or double literal. Initialize the lexeme's fields
-     * assuming the common case of a single character lexeme.
-     */
-
-    infoPtr->start = src;
-    infoPtr->size = 1;
-    infoPtr->next = src+1;
-    parsePtr->term = infoPtr->next;
-    
-    switch (*src) {
-	case '[':
-	    infoPtr->lexeme = OPEN_BRACKET;
-	    return TCL_OK;
-
-        case '{':
-	    infoPtr->lexeme = OPEN_BRACE;
-	    return TCL_OK;
-
-	case '(':
-	    infoPtr->lexeme = OPEN_PAREN;
-	    return TCL_OK;
-
-	case ')':
-	    infoPtr->lexeme = CLOSE_PAREN;
-	    return TCL_OK;
-
-	case '$':
-	    infoPtr->lexeme = DOLLAR;
-	    return TCL_OK;
-
-	case '"':
-	    infoPtr->lexeme = QUOTE;
-	    return TCL_OK;
-
-	case ',':
-	    infoPtr->lexeme = COMMA;
-	    return TCL_OK;
-
-	case '*':
-	    infoPtr->lexeme = MULT;
-	    return TCL_OK;
-
-	case '/':
-	    infoPtr->lexeme = DIVIDE;
-	    return TCL_OK;
-
-	case '%':
-	    infoPtr->lexeme = MOD;
-	    return TCL_OK;
-
-	case '+':
-	    infoPtr->lexeme = PLUS;
-	    return TCL_OK;
-
-	case '-':
-	    infoPtr->lexeme = MINUS;
-	    return TCL_OK;
-
-	case '?':
-	    infoPtr->lexeme = QUESTY;
-	    return TCL_OK;
-
-	case ':':
-	    infoPtr->lexeme = COLON;
-	    return TCL_OK;
-
-	case '<':
-	    switch (src[1]) {
-		case '<':
-		    infoPtr->lexeme = LEFT_SHIFT;
-		    infoPtr->size = 2;
-		    infoPtr->next = src+2;
-		    break;
-		case '=':
-		    infoPtr->lexeme = LEQ;
-		    infoPtr->size = 2;
-		    infoPtr->next = src+2;
-		    break;
-		default:
-		    infoPtr->lexeme = LESS;
-		    break;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '>':
-	    switch (src[1]) {
-		case '>':
-		    infoPtr->lexeme = RIGHT_SHIFT;
-		    infoPtr->size = 2;
-		    infoPtr->next = src+2;
-		    break;
-		case '=':
-		    infoPtr->lexeme = GEQ;
-		    infoPtr->size = 2;
-		    infoPtr->next = src+2;
-		    break;
-		default:
-		    infoPtr->lexeme = GREATER;
-		    break;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '=':
-	    if (src[1] == '=') {
-		infoPtr->lexeme = EQUAL;
-		infoPtr->size = 2;
-		infoPtr->next = src+2;
-	    } else {
-		infoPtr->lexeme = UNKNOWN;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '!':
-	    if (src[1] == '=') {
-		infoPtr->lexeme = NEQ;
-		infoPtr->size = 2;
-		infoPtr->next = src+2;
-	    } else {
-		infoPtr->lexeme = NOT;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '&':
-	    if (src[1] == '&') {
-		infoPtr->lexeme = AND;
-		infoPtr->size = 2;
-		infoPtr->next = src+2;
-	    } else {
-		infoPtr->lexeme = BIT_AND;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '^':
-	    infoPtr->lexeme = BIT_XOR;
-	    return TCL_OK;
-
-	case '|':
-	    if (src[1] == '|') {
-		infoPtr->lexeme = OR;
-		infoPtr->size = 2;
-		infoPtr->next = src+2;
-	    } else {
-		infoPtr->lexeme = BIT_OR;
-	    }
-	    parsePtr->term = infoPtr->next;
-	    return TCL_OK;
-
-	case '~':
-	    infoPtr->lexeme = BIT_NOT;
-	    return TCL_OK;
-
-	default:
-	    offset = Tcl_UtfToUniChar(src, &ch);
-	    c = UCHAR(ch);
-	    if (isalpha(UCHAR(c))) {	/* INTL: ISO only. */
-		infoPtr->lexeme = FUNC_NAME;
-		while (isalnum(UCHAR(c)) || (c == '_')) { /* INTL: ISO only. */
-		    src += offset;
-		    offset = Tcl_UtfToUniChar(src, &ch);
-		    c = UCHAR(ch);
-		}
-		infoPtr->size = (src - infoPtr->start);
-		infoPtr->next = src;
-		parsePtr->term = infoPtr->next;
-		return TCL_OK;
-	    }
-	    infoPtr->lexeme = UNKNOWN;
-	    return TCL_OK;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PrependSubExprTokens --
- *
- *	This procedure is called after the operands of an subexpression have
- *	been parsed. It generates two tokens: a TCL_TOKEN_SUB_EXPR token for
- *	the subexpression, and a TCL_TOKEN_OPERATOR token for its operator.
- *	These two tokens are inserted before the operand tokens.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there is insufficient space in parsePtr to hold the new tokens,
- *	additional space is malloc-ed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PrependSubExprTokens(op, opBytes, src, srcBytes, firstIndex, infoPtr)
-    char *op;			/* Points to first byte of the operator
-				 * in the source script. */
-    int opBytes;		/* Number of bytes in the operator. */
-    char *src;			/* Points to first byte of the subexpression
-				 * in the source script. */
-    int srcBytes;		/* Number of bytes in subexpression's
-				 * source. */
-    int firstIndex;		/* Index of first token already emitted for
-				 * operator's first (or only) operand. */
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    Tcl_Parse *parsePtr = infoPtr->parsePtr;
-    Tcl_Token *tokenPtr, *firstTokenPtr;
-    int numToMove;
-
-    if ((parsePtr->numTokens + 1) >= parsePtr->tokensAvailable) {
-	TclExpandTokenArray(parsePtr);
-    }
-    firstTokenPtr = &parsePtr->tokenPtr[firstIndex];
-    tokenPtr = (firstTokenPtr + 2);
-    numToMove = (parsePtr->numTokens - firstIndex);
-    memmove((VOID *) tokenPtr, (VOID *) firstTokenPtr,
-            (size_t) (numToMove * sizeof(Tcl_Token)));
-    parsePtr->numTokens += 2;
-    
-    tokenPtr = firstTokenPtr;
-    tokenPtr->type = TCL_TOKEN_SUB_EXPR;
-    tokenPtr->start = src;
-    tokenPtr->size = srcBytes;
-    tokenPtr->numComponents = parsePtr->numTokens - (firstIndex + 1);
-    
-    tokenPtr++;
-    tokenPtr->type = TCL_TOKEN_OPERATOR;
-    tokenPtr->start = op;
-    tokenPtr->size = opBytes;
-    tokenPtr->numComponents = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * LogSyntaxError --
- *
- *	This procedure is invoked after an error occurs when parsing an
- *	expression. It sets the interpreter result to an error message
- *	describing the error.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the interpreter result to an error message describing the
- *	expression that was being parsed when the error occurred.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-LogSyntaxError(infoPtr)
-    ParseInfo *infoPtr;		/* Holds the parse state for the
-				 * expression being parsed. */
-{
-    int numBytes = (infoPtr->lastChar - infoPtr->originalExpr);
-    char buffer[100];
-
-    sprintf(buffer, "syntax error in expression \"%.*s\"",
-	    ((numBytes > 60)? 60 : numBytes), infoPtr->originalExpr);
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(infoPtr->parsePtr->interp),
-	    buffer, (char *) NULL);
-}
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
deleted file mode 100644
index 4f39c93..0000000
--- a/generic/tclPipe.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* 
- * tclPipe.c --
- *
- *	This file contains the generic portion of the command channel
- *	driver as well as various utility routines used in managing
- *	subprocesses.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPipe.c,v 1.3 1999/04/16 00:46:51 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * A linked list of the following structures is used to keep track
- * of child processes that have been detached but haven't exited
- * yet, so we can make sure that they're properly "reaped" (officially
- * waited for) and don't lie around as zombies cluttering the
- * system.
- */
-
-typedef struct Detached {
-    Tcl_Pid pid;			/* Id of process that's been detached
-					 * but isn't known to have exited. */
-    struct Detached *nextPtr;		/* Next in list of all detached
-					 * processes. */
-} Detached;
-
-static Detached *detList = NULL;	/* List of all detached proceses. */
-TCL_DECLARE_MUTEX(pipeMutex)		/* Guard access to detList. */
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static TclFile	FileForRedirect _ANSI_ARGS_((Tcl_Interp *interp,
-	            char *spec, int atOk, char *arg, char *nextArg, 
-		    int flags, int *skipPtr, int *closePtr, int *releasePtr));
-
-/*
- *----------------------------------------------------------------------
- *
- * FileForRedirect --
- *
- *	This procedure does much of the work of parsing redirection
- *	operators.  It handles "@" if specified and allowed, and a file
- *	name, and opens the file if necessary.
- *
- * Results:
- *	The return value is the descriptor number for the file.  If an
- *	error occurs then NULL is returned and an error message is left
- *	in the interp's result.  Several arguments are side-effected; see
- *	the argument list below for details.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static TclFile
-FileForRedirect(interp, spec, atOK, arg, nextArg, flags, skipPtr, closePtr,
-	releasePtr)
-    Tcl_Interp *interp;		/* Intepreter to use for error reporting. */
-    char *spec;			/* Points to character just after
-				 * redirection character. */
-    char *arg;			/* Pointer to entire argument containing 
-				 * spec:  used for error reporting. */
-    int atOK;			/* Non-zero means that '@' notation can be 
-				 * used to specify a channel, zero means that
-				 * it isn't. */
-    char *nextArg;		/* Next argument in argc/argv array, if needed 
-				 * for file name or channel name.  May be 
-				 * NULL. */
-    int flags;			/* Flags to use for opening file or to 
-				 * specify mode for channel. */
-    int *skipPtr;		/* Filled with 1 if redirection target was
-				 * in spec, 2 if it was in nextArg. */
-    int *closePtr;		/* Filled with one if the caller should 
-				 * close the file when done with it, zero
-				 * otherwise. */
-    int *releasePtr;
-{
-    int writing = (flags & O_WRONLY);
-    Tcl_Channel chan;
-    TclFile file;
-
-    *skipPtr = 1;
-    if ((atOK != 0)  && (*spec == '@')) {
-	spec++;
-	if (*spec == '\0') {
-	    spec = nextArg;
-	    if (spec == NULL) {
-		goto badLastArg;
-	    }
-	    *skipPtr = 2;
-	}
-        chan = Tcl_GetChannel(interp, spec, NULL);
-        if (chan == (Tcl_Channel) NULL) {
-            return NULL;
-        }
-	file = TclpMakeFile(chan, writing ? TCL_WRITABLE : TCL_READABLE);
-        if (file == NULL) {
-            Tcl_AppendResult(interp, "channel \"", Tcl_GetChannelName(chan),
-                    "\" wasn't opened for ",
-                    ((writing) ? "writing" : "reading"), (char *) NULL);
-            return NULL;
-        }
-	*releasePtr = 1;
-	if (writing) {
-
-	    /*
-	     * Be sure to flush output to the file, so that anything
-	     * written by the child appears after stuff we've already
-	     * written.
-	     */
-
-            Tcl_Flush(chan);
-	}
-    } else {
-	char *name;
-	Tcl_DString nameString;
-
-	if (*spec == '\0') {
-	    spec = nextArg;
-	    if (spec == NULL) {
-		goto badLastArg;
-	    }
-	    *skipPtr = 2;
-	}
-	name = Tcl_TranslateFileName(interp, spec, &nameString);
-	if (name != NULL) {
-	    file = TclpOpenFile(name, flags);
-	} else {
-	    file = NULL;
-	}
-	Tcl_DStringFree(&nameString);
-	if (file == NULL) {
-	    Tcl_AppendResult(interp, "couldn't ",
-		    ((writing) ? "write" : "read"), " file \"", spec, "\": ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	    return NULL;
-	}
-        *closePtr = 1;
-    }
-    return file;
-
-    badLastArg:
-    Tcl_AppendResult(interp, "can't specify \"", arg,
-	    "\" as last word in command", (char *) NULL);
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DetachPids --
- *
- *	This procedure is called to indicate that one or more child
- *	processes have been placed in background and will never be
- *	waited for;  they should eventually be reaped by
- *	Tcl_ReapDetachedProcs.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DetachPids(numPids, pidPtr)
-    int numPids;		/* Number of pids to detach:  gives size
-				 * of array pointed to by pidPtr. */
-    Tcl_Pid *pidPtr;		/* Array of pids to detach. */
-{
-    register Detached *detPtr;
-    int i;
-
-    Tcl_MutexLock(&pipeMutex);
-    for (i = 0; i < numPids; i++) {
-	detPtr = (Detached *) ckalloc(sizeof(Detached));
-	detPtr->pid = pidPtr[i];
-	detPtr->nextPtr = detList;
-	detList = detPtr;
-    }
-    Tcl_MutexUnlock(&pipeMutex);
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ReapDetachedProcs --
- *
- *	This procedure checks to see if any detached processes have
- *	exited and, if so, it "reaps" them by officially waiting on
- *	them.  It should be called "occasionally" to make sure that
- *	all detached processes are eventually reaped.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Processes are waited on, so that they can be reaped by the
- *	system.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ReapDetachedProcs()
-{
-    register Detached *detPtr;
-    Detached *nextPtr, *prevPtr;
-    int status;
-    Tcl_Pid pid;
-
-    Tcl_MutexLock(&pipeMutex);
-    for (detPtr = detList, prevPtr = NULL; detPtr != NULL; ) {
-	pid = Tcl_WaitPid(detPtr->pid, &status, WNOHANG);
-	if ((pid == 0) || ((pid == (Tcl_Pid) -1) && (errno != ECHILD))) {
-	    prevPtr = detPtr;
-	    detPtr = detPtr->nextPtr;
-	    continue;
-	}
-	nextPtr = detPtr->nextPtr;
-	if (prevPtr == NULL) {
-	    detList = detPtr->nextPtr;
-	} else {
-	    prevPtr->nextPtr = detPtr->nextPtr;
-	}
-	ckfree((char *) detPtr);
-	detPtr = nextPtr;
-    }
-    Tcl_MutexUnlock(&pipeMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCleanupChildren --
- *
- *	This is a utility procedure used to wait for child processes
- *	to exit, record information about abnormal exits, and then
- *	collect any stderr output generated by them.
- *
- * Results:
- *	The return value is a standard Tcl result.  If anything at
- *	weird happened with the child processes, TCL_ERROR is returned
- *	and a message is left in the interp's result.
- *
- * Side effects:
- *	If the last character of the interp's result is a newline, then it
- *	is removed unless keepNewline is non-zero.  File errorId gets
- *	closed, and pidPtr is freed back to the storage allocator.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCleanupChildren(interp, numPids, pidPtr, errorChan)
-    Tcl_Interp *interp;		/* Used for error messages. */
-    int numPids;		/* Number of entries in pidPtr array. */
-    Tcl_Pid *pidPtr;		/* Array of process ids of children. */
-    Tcl_Channel errorChan;	/* Channel for file containing stderr output
-				 * from pipeline.  NULL means there isn't any
-				 * stderr output. */
-{
-    int result = TCL_OK;
-    int i, abnormalExit, anyErrorInfo;
-    Tcl_Pid pid;
-    WAIT_STATUS_TYPE waitStatus;
-    char *msg;
-
-    abnormalExit = 0;
-    for (i = 0; i < numPids; i++) {
-        pid = Tcl_WaitPid(pidPtr[i], (int *) &waitStatus, 0);
-	if (pid == (Tcl_Pid) -1) {
-	    result = TCL_ERROR;
-            if (interp != (Tcl_Interp *) NULL) {
-                msg = Tcl_PosixError(interp);
-                if (errno == ECHILD) {
-		    /*
-                     * This changeup in message suggested by Mark Diekhans
-                     * to remind people that ECHILD errors can occur on
-                     * some systems if SIGCHLD isn't in its default state.
-                     */
-
-                    msg =
-                        "child process lost (is SIGCHLD ignored or trapped?)";
-                }
-                Tcl_AppendResult(interp, "error waiting for process to exit: ",
-                        msg, (char *) NULL);
-            }
-	    continue;
-	}
-
-	/*
-	 * Create error messages for unusual process exits.  An
-	 * extra newline gets appended to each error message, but
-	 * it gets removed below (in the same fashion that an
-	 * extra newline in the command's output is removed).
-	 */
-
-	if (!WIFEXITED(waitStatus) || (WEXITSTATUS(waitStatus) != 0)) {
-	    char msg1[TCL_INTEGER_SPACE], msg2[TCL_INTEGER_SPACE];
-
-	    result = TCL_ERROR;
-	    TclFormatInt(msg1, (long) TclpGetPid(pid));
-	    if (WIFEXITED(waitStatus)) {
-                if (interp != (Tcl_Interp *) NULL) {
-		    TclFormatInt(msg2, WEXITSTATUS(waitStatus));
-                    Tcl_SetErrorCode(interp, "CHILDSTATUS", msg1, msg2,
-                            (char *) NULL);
-                }
-		abnormalExit = 1;
-	    } else if (WIFSIGNALED(waitStatus)) {
-                if (interp != (Tcl_Interp *) NULL) {
-                    char *p;
-                    
-                    p = Tcl_SignalMsg((int) (WTERMSIG(waitStatus)));
-                    Tcl_SetErrorCode(interp, "CHILDKILLED", msg1,
-                            Tcl_SignalId((int) (WTERMSIG(waitStatus))), p,
-                            (char *) NULL);
-                    Tcl_AppendResult(interp, "child killed: ", p, "\n",
-                            (char *) NULL);
-                }
-	    } else if (WIFSTOPPED(waitStatus)) {
-                if (interp != (Tcl_Interp *) NULL) {
-                    char *p;
-
-                    p = Tcl_SignalMsg((int) (WSTOPSIG(waitStatus)));
-                    Tcl_SetErrorCode(interp, "CHILDSUSP", msg1,
-                            Tcl_SignalId((int) (WSTOPSIG(waitStatus))),
-                            p, (char *) NULL);
-                    Tcl_AppendResult(interp, "child suspended: ", p, "\n",
-                            (char *) NULL);
-                }
-	    } else {
-                if (interp != (Tcl_Interp *) NULL) {
-                    Tcl_AppendResult(interp,
-                            "child wait status didn't make sense\n",
-                            (char *) NULL);
-                }
-	    }
-	}
-    }
-
-    /*
-     * Read the standard error file.  If there's anything there,
-     * then return an error and add the file's contents to the result
-     * string.
-     */
-
-    anyErrorInfo = 0;
-    if (errorChan != NULL) {
-
-	/*
-	 * Make sure we start at the beginning of the file.
-	 */
-
-        if (interp != NULL) {
-	    int count;
-	    Tcl_Obj *objPtr;
-	    
-	    Tcl_Seek(errorChan, 0L, SEEK_SET);
-	    objPtr = Tcl_NewObj();
-	    count = Tcl_ReadChars(errorChan, objPtr, -1, 0);
-	    if (count < 0) {
-		result = TCL_ERROR;
-		Tcl_DecrRefCount(objPtr);
-		Tcl_ResetResult(interp);
-		Tcl_AppendResult(interp, "error reading stderr output file: ",
-			Tcl_PosixError(interp), NULL);
-	    } else if (count > 0) {
-		anyErrorInfo = 1;
-		Tcl_SetObjResult(interp, objPtr);
-		result = TCL_ERROR;
-	    } else {
-		Tcl_DecrRefCount(objPtr);
-	    }
-	}
-	Tcl_Close(NULL, errorChan);
-    }
-
-    /*
-     * If a child exited abnormally but didn't output any error information
-     * at all, generate an error message here.
-     */
-
-    if ((abnormalExit != 0) && (anyErrorInfo == 0) && (interp != NULL)) {
-	Tcl_AppendResult(interp, "child process exited abnormally",
-		(char *) NULL);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreatePipeline --
- *
- *	Given an argc/argv array, instantiate a pipeline of processes
- *	as described by the argv.
- *
- *	This procedure is unofficially exported for use by BLT.
- *
- * Results:
- *	The return value is a count of the number of new processes
- *	created, or -1 if an error occurred while creating the pipeline.
- *	*pidArrayPtr is filled in with the address of a dynamically
- *	allocated array giving the ids of all of the processes.  It
- *	is up to the caller to free this array when it isn't needed
- *	anymore.  If inPipePtr is non-NULL, *inPipePtr is filled in
- *	with the file id for the input pipe for the pipeline (if any):
- *	the caller must eventually close this file.  If outPipePtr
- *	isn't NULL, then *outPipePtr is filled in with the file id
- *	for the output pipe from the pipeline:  the caller must close
- *	this file.  If errFilePtr isn't NULL, then *errFilePtr is filled
- *	with a file id that may be used to read error output after the
- *	pipeline completes.
- *
- * Side effects:
- *	Processes and pipes are created.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCreatePipeline(interp, argc, argv, pidArrayPtr, inPipePtr,
-	outPipePtr, errFilePtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
-    int argc;			/* Number of entries in argv. */
-    char **argv;		/* Array of strings describing commands in
-				 * pipeline plus I/O redirection with <,
-				 * <<,  >, etc.  Argv[argc] must be NULL. */
-    Tcl_Pid **pidArrayPtr;	/* Word at *pidArrayPtr gets filled in with
-				 * address of array of pids for processes
-				 * in pipeline (first pid is first process
-				 * in pipeline). */
-    TclFile *inPipePtr;		/* If non-NULL, input to the pipeline comes
-				 * from a pipe (unless overridden by
-				 * redirection in the command).  The file
-				 * id with which to write to this pipe is
-				 * stored at *inPipePtr.  NULL means command
-				 * specified its own input source. */
-    TclFile *outPipePtr;	/* If non-NULL, output to the pipeline goes
-				 * to a pipe, unless overriden by redirection
-				 * in the command.  The file id with which to
-				 * read frome this pipe is stored at
-				 * *outPipePtr.  NULL means command specified
-				 * its own output sink. */
-    TclFile *errFilePtr;	/* If non-NULL, all stderr output from the
-				 * pipeline will go to a temporary file
-				 * created here, and a descriptor to read
-				 * the file will be left at *errFilePtr.
-				 * The file will be removed already, so
-				 * closing this descriptor will be the end
-				 * of the file.  If this is NULL, then
-				 * all stderr output goes to our stderr.
-				 * If the pipeline specifies redirection
-				 * then the file will still be created
-				 * but it will never get any data. */
-{
-    Tcl_Pid *pidPtr = NULL;	/* Points to malloc-ed array holding all
-				 * the pids of child processes. */
-    int numPids;		/* Actual number of processes that exist
-				 * at *pidPtr right now. */
-    int cmdCount;		/* Count of number of distinct commands
-				 * found in argc/argv. */
-    char *inputLiteral = NULL;	/* If non-null, then this points to a
-				 * string containing input data (specified
-				 * via <<) to be piped to the first process
-				 * in the pipeline. */
-    TclFile inputFile = NULL;	/* If != NULL, gives file to use as input for
-				 * first process in pipeline (specified via <
-				 * or <@). */
-    int inputClose = 0;		/* If non-zero, then inputFile should be 
-    				 * closed when cleaning up. */
-    int inputRelease = 0;
-    TclFile outputFile = NULL;	/* Writable file for output from last command
-				 * in pipeline (could be file or pipe).  NULL
-				 * means use stdout. */
-    int outputClose = 0;	/* If non-zero, then outputFile should be 
-    				 * closed when cleaning up. */
-    int outputRelease = 0;
-    TclFile errorFile = NULL;	/* Writable file for error output from all
-				 * commands in pipeline.  NULL means use
-				 * stderr. */
-    int errorClose = 0;		/* If non-zero, then errorFile should be 
-    				 * closed when cleaning up. */
-    int errorRelease = 0;
-    char *p;
-    int skip, lastBar, lastArg, i, j, atOK, flags, errorToOutput;
-    Tcl_DString execBuffer;
-    TclFile pipeIn;
-    TclFile curInFile, curOutFile, curErrFile;
-    Tcl_Channel channel;
-
-    if (inPipePtr != NULL) {
-	*inPipePtr = NULL;
-    }
-    if (outPipePtr != NULL) {
-	*outPipePtr = NULL;
-    }
-    if (errFilePtr != NULL) {
-	*errFilePtr = NULL;
-    }
-
-    Tcl_DStringInit(&execBuffer);
-    
-    pipeIn = NULL;
-    curInFile = NULL;
-    curOutFile = NULL;
-    numPids = 0;
-
-    /*
-     * First, scan through all the arguments to figure out the structure
-     * of the pipeline.  Process all of the input and output redirection
-     * arguments and remove them from the argument list in the pipeline.
-     * Count the number of distinct processes (it's the number of "|"
-     * arguments plus one) but don't remove the "|" arguments because 
-     * they'll be used in the second pass to seperate the individual 
-     * child processes.  Cannot start the child processes in this pass 
-     * because the redirection symbols may appear anywhere in the 
-     * command line -- e.g., the '<' that specifies the input to the 
-     * entire pipe may appear at the very end of the argument list.
-     */
-
-    lastBar = -1;
-    cmdCount = 1;
-    for (i = 0; i < argc; i++) {
-        skip = 0;
-	p = argv[i];
-	switch (*p++) {
-	case '|':
-	    if (*p == '&') {
-		p++;
-	    }
-	    if (*p == '\0') {
-		if ((i == (lastBar + 1)) || (i == (argc - 1))) {
-		    Tcl_SetResult(interp,
-			    "illegal use of | or |& in command",
-			    TCL_STATIC);
-		    goto error;
-		}
-	    }
-	    lastBar = i;
-	    cmdCount++;
-	    break;
-
-	case '<':
-	    if (inputClose != 0) {
-		inputClose = 0;
-		TclpCloseFile(inputFile);
-	    }
-	    if (inputRelease != 0) {
-		inputRelease = 0;
-		TclpReleaseFile(inputFile);
-	    }
-	    if (*p == '<') {
-		inputFile = NULL;
-		inputLiteral = p + 1;
-		skip = 1;
-		if (*inputLiteral == '\0') {
-		    inputLiteral = argv[i + 1];
-		    if (inputLiteral == NULL) {
-			Tcl_AppendResult(interp, "can't specify \"", argv[i],
-				"\" as last word in command", (char *) NULL);
-			goto error;
-		    }
-		    skip = 2;
-		}
-	    } else {
-		inputLiteral = NULL;
-		inputFile = FileForRedirect(interp, p, 1, argv[i], 
-			argv[i + 1], O_RDONLY, &skip, &inputClose, &inputRelease);
-		if (inputFile == NULL) {
-		    goto error;
-		}
-	    }
-	    break;
-
-	case '>':
-	    atOK = 1;
-	    flags = O_WRONLY | O_CREAT | O_TRUNC;
-	    errorToOutput = 0;
-	    if (*p == '>') {
-		p++;
-		atOK = 0;
-		flags = O_WRONLY | O_CREAT;
-	    }
-	    if (*p == '&') {
-		if (errorClose != 0) {
-		    errorClose = 0;
-		    TclpCloseFile(errorFile);
-		}
-		errorToOutput = 1;
-		p++;
-	    }
-
-	    /*
-	     * Close the old output file, but only if the error file is
-	     * not also using it.
-	     */
-
-	    if (outputClose != 0) {
-		outputClose = 0;
-		if (errorFile == outputFile) {
-		    errorClose = 1;
-		} else {
-		    TclpCloseFile(outputFile);
-		}
-	    }
-	    if (outputRelease != 0) {
-		outputRelease = 0;
-		if (errorFile == outputFile) {
-		    errorRelease = 1;
-		} else {
-		    TclpReleaseFile(outputFile);
-		}
-	    }
-	    outputFile = FileForRedirect(interp, p, atOK, argv[i], 
-		    argv[i + 1], flags, &skip, &outputClose, &outputRelease);
-	    if (outputFile == NULL) {
-		goto error;
-	    }
-	    if (errorToOutput) {
-		if (errorClose != 0) {
-		    errorClose = 0;
-		    TclpCloseFile(errorFile);
-		}
-		if (errorRelease != 0) {
-		    errorRelease = 0;
-		    TclpReleaseFile(errorFile);
-		}
-		errorFile = outputFile;
-	    }
-	    break;
-
-	case '2':
-	    if (*p != '>') {
-		break;
-	    }
-	    p++;
-	    atOK = 1;
-	    flags = O_WRONLY | O_CREAT | O_TRUNC;
-	    if (*p == '>') {
-		p++;
-		atOK = 0;
-		flags = O_WRONLY | O_CREAT;
-	    }
-	    if (errorClose != 0) {
-		errorClose = 0;
-		TclpCloseFile(errorFile);
-	    }
-	    if (errorRelease != 0) {
-		errorRelease = 0;
-		TclpReleaseFile(errorFile);
-	    }
-	    errorFile = FileForRedirect(interp, p, atOK, argv[i], 
-		    argv[i + 1], flags, &skip, &errorClose, &errorRelease);
-	    if (errorFile == NULL) {
-		goto error;
-	    }
-	    break;
-	}
-
-	if (skip != 0) {
-	    for (j = i + skip; j < argc; j++) {
-		argv[j - skip] = argv[j];
-	    }
-	    argc -= skip;
-	    i -= 1;
-	}
-    }
-
-    if (inputFile == NULL) {
-	if (inputLiteral != NULL) {
-	    /*
-	     * The input for the first process is immediate data coming from
-	     * Tcl.  Create a temporary file for it and put the data into the
-	     * file.
-	     */
-	    inputFile = TclpCreateTempFile(inputLiteral);
-	    if (inputFile == NULL) {
-		Tcl_AppendResult(interp,
-			"couldn't create input file for command: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		goto error;
-	    }
-	    inputClose = 1;
-	} else if (inPipePtr != NULL) {
-	    /*
-	     * The input for the first process in the pipeline is to
-	     * come from a pipe that can be written from by the caller.
-	     */
-
-	    if (TclpCreatePipe(&inputFile, inPipePtr) == 0) {
-		Tcl_AppendResult(interp, 
-			"couldn't create input pipe for command: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		goto error;
-	    }
-	    inputClose = 1;
-	} else {
-	    /*
-	     * The input for the first process comes from stdin.
-	     */
-
-	    channel = Tcl_GetStdChannel(TCL_STDIN);
-	    if (channel != NULL) {
-		inputFile = TclpMakeFile(channel, TCL_READABLE);
-		if (inputFile != NULL) {
-		    inputRelease = 1;
-		}
-	    }
-	}
-    }
-
-    if (outputFile == NULL) {
-	if (outPipePtr != NULL) {
-	    /*
-	     * Output from the last process in the pipeline is to go to a
-	     * pipe that can be read by the caller.
-	     */
-
-	    if (TclpCreatePipe(outPipePtr, &outputFile) == 0) {
-		Tcl_AppendResult(interp, 
-			"couldn't create output pipe for command: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		goto error;
-	    }
-	    outputClose = 1;
-	} else {
-	    /*
-	     * The output for the last process goes to stdout.
-	     */
-
-	    channel = Tcl_GetStdChannel(TCL_STDOUT);
-	    if (channel) {
-		outputFile = TclpMakeFile(channel, TCL_WRITABLE);
-		if (outputFile != NULL) {
-		    outputRelease = 1;
-		}
-	    }
-	}
-    }
-
-    if (errorFile == NULL) {
-	if (errFilePtr != NULL) {
-	    /*
-	     * Set up the standard error output sink for the pipeline, if
-	     * requested.  Use a temporary file which is opened, then deleted.
-	     * Could potentially just use pipe, but if it filled up it could
-	     * cause the pipeline to deadlock:  we'd be waiting for processes
-	     * to complete before reading stderr, and processes couldn't 
-	     * complete because stderr was backed up.
-	     */
-
-	    errorFile = TclpCreateTempFile(NULL);
-	    if (errorFile == NULL) {
-		Tcl_AppendResult(interp,
-			"couldn't create error file for command: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		goto error;
-	    }
-	    *errFilePtr = errorFile;
-	} else {
-	    /*
-	     * Errors from the pipeline go to stderr.
-	     */
-
-	    channel = Tcl_GetStdChannel(TCL_STDERR);
-	    if (channel) {
-		errorFile = TclpMakeFile(channel, TCL_WRITABLE);
-		if (errorFile != NULL) {
-		    errorRelease = 1;
-		}
-	    }
-	}
-    }
-	
-    /*
-     * Scan through the argc array, creating a process for each
-     * group of arguments between the "|" characters.
-     */
-
-    Tcl_ReapDetachedProcs();
-    pidPtr = (Tcl_Pid *) ckalloc((unsigned) (cmdCount * sizeof(Tcl_Pid)));
-
-    curInFile = inputFile;
-
-    for (i = 0; i < argc; i = lastArg + 1) { 
-	int result, joinThisError;
-	Tcl_Pid pid;
-	char *oldName;
-
-	/*
-	 * Convert the program name into native form. 
-	 */
-
-	if (Tcl_TranslateFileName(interp, argv[i], &execBuffer) == NULL) {
-	    goto error;
-	}
-
-	/*
-	 * Find the end of the current segment of the pipeline.
-	 */
-
-	joinThisError = 0;
-	for (lastArg = i; lastArg < argc; lastArg++) {
-	    if (argv[lastArg][0] == '|') { 
-		if (argv[lastArg][1] == '\0') { 
-		    break;
-		}
-		if ((argv[lastArg][1] == '&') && (argv[lastArg][2] == '\0')) {
-		    joinThisError = 1;
-		    break;
-		}
-	    }
-	}
-	argv[lastArg] = NULL;
-
-	/*
-	 * If this is the last segment, use the specified outputFile.
-	 * Otherwise create an intermediate pipe.  pipeIn will become the
-	 * curInFile for the next segment of the pipe.
-	 */
-
-	if (lastArg == argc) { 
-	    curOutFile = outputFile;
-	} else {
-	    if (TclpCreatePipe(&pipeIn, &curOutFile) == 0) {
-		Tcl_AppendResult(interp, "couldn't create pipe: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		goto error;
-	    }
-	}
-
-	if (joinThisError != 0) {
-	    curErrFile = curOutFile;
-	} else {
-	    curErrFile = errorFile;
-	}
-
-	/*
-	 * Restore argv[i], since a caller wouldn't expect the contents of
-	 * argv to be modified.
-	 */
-	 
-	oldName = argv[i];
-	argv[i] = Tcl_DStringValue(&execBuffer);
-	result = TclpCreateProcess(interp, lastArg - i, argv + i,
-		curInFile, curOutFile, curErrFile, &pid);
-	argv[i] = oldName;
-	if (result != TCL_OK) {
-	    goto error;
-	}
-	Tcl_DStringFree(&execBuffer);
-
-	pidPtr[numPids] = pid;
-	numPids++;
-
-	/*
-	 * Close off our copies of file descriptors that were set up for
-	 * this child, then set up the input for the next child.
-	 */
-
-	if ((curInFile != NULL) && (curInFile != inputFile)) {
-	    TclpCloseFile(curInFile);
-	}
-	curInFile = pipeIn;
-	pipeIn = NULL;
-
-	if ((curOutFile != NULL) && (curOutFile != outputFile)) {
-	    TclpCloseFile(curOutFile);
-	}
-	curOutFile = NULL;
-    }
-
-    *pidArrayPtr = pidPtr;
-
-    /*
-     * All done.  Cleanup open files lying around and then return.
-     */
-
-cleanup:
-    Tcl_DStringFree(&execBuffer);
-
-    if (inputClose) {
-	TclpCloseFile(inputFile);
-    } else if (inputRelease) {
-	TclpReleaseFile(inputFile);
-    }
-    if (outputClose) {
-	TclpCloseFile(outputFile);
-    } else if (outputRelease) {
-	TclpReleaseFile(outputFile);
-    }
-    if (errorClose) {
-	TclpCloseFile(errorFile);
-    } else if (errorRelease) {
-	TclpReleaseFile(errorFile);
-    }
-    return numPids;
-
-    /*
-     * An error occurred.  There could have been extra files open, such
-     * as pipes between children.  Clean them all up.  Detach any child
-     * processes that have been created.
-     */
-
-error:
-    if (pipeIn != NULL) {
-	TclpCloseFile(pipeIn);
-    }
-    if ((curOutFile != NULL) && (curOutFile != outputFile)) {
-	TclpCloseFile(curOutFile);
-    }
-    if ((curInFile != NULL) && (curInFile != inputFile)) {
-	TclpCloseFile(curInFile);
-    }
-    if ((inPipePtr != NULL) && (*inPipePtr != NULL)) {
-	TclpCloseFile(*inPipePtr);
-	*inPipePtr = NULL;
-    }
-    if ((outPipePtr != NULL) && (*outPipePtr != NULL)) {
-	TclpCloseFile(*outPipePtr);
-	*outPipePtr = NULL;
-    }
-    if ((errFilePtr != NULL) && (*errFilePtr != NULL)) {
-	TclpCloseFile(*errFilePtr);
-	*errFilePtr = NULL;
-    }
-    if (pidPtr != NULL) {
-	for (i = 0; i < numPids; i++) {
-	    if (pidPtr[i] != (Tcl_Pid) -1) {
-		Tcl_DetachPids(1, &pidPtr[i]);
-	    }
-	}
-	ckfree((char *) pidPtr);
-    }
-    numPids = -1;
-    goto cleanup;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenCommandChannel --
- *
- *	Opens an I/O channel to one or more subprocesses specified
- *	by argc and argv.  The flags argument determines the
- *	disposition of the stdio handles.  If the TCL_STDIN flag is
- *	set then the standard input for the first subprocess will
- *	be tied to the channel:  writing to the channel will provide
- *	input to the subprocess.  If TCL_STDIN is not set, then
- *	standard input for the first subprocess will be the same as
- *	this application's standard input.  If TCL_STDOUT is set then
- *	standard output from the last subprocess can be read from the
- *	channel;  otherwise it goes to this application's standard
- *	output.  If TCL_STDERR is set, standard error output for all
- *	subprocesses is returned to the channel and results in an error
- *	when the channel is closed;  otherwise it goes to this
- *	application's standard error.  If TCL_ENFORCE_MODE is not set,
- *	then argc and argv can redirect the stdio handles to override
- *	TCL_STDIN, TCL_STDOUT, and TCL_STDERR;  if it is set, then it 
- *	is an error for argc and argv to override stdio channels for
- *	which TCL_STDIN, TCL_STDOUT, and TCL_STDERR have been set.
- *
- * Results:
- *	A new command channel, or NULL on failure with an error
- *	message left in interp.
- *
- * Side effects:
- *	Creates processes, opens pipes.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenCommandChannel(interp, argc, argv, flags)
-    Tcl_Interp *interp;		/* Interpreter for error reporting. Can
-                                 * NOT be NULL. */
-    int argc;			/* How many arguments. */
-    char **argv;		/* Array of arguments for command pipe. */
-    int flags;			/* Or'ed combination of TCL_STDIN, TCL_STDOUT,
-				 * TCL_STDERR, and TCL_ENFORCE_MODE. */
-{
-    TclFile *inPipePtr, *outPipePtr, *errFilePtr;
-    TclFile inPipe, outPipe, errFile;
-    int numPids;
-    Tcl_Pid *pidPtr;
-    Tcl_Channel channel;
-
-    inPipe = outPipe = errFile = NULL;
-
-    inPipePtr = (flags & TCL_STDIN) ? &inPipe : NULL;
-    outPipePtr = (flags & TCL_STDOUT) ? &outPipe : NULL;
-    errFilePtr = (flags & TCL_STDERR) ? &errFile : NULL;
-    
-    numPids = TclCreatePipeline(interp, argc, argv, &pidPtr, inPipePtr,
-            outPipePtr, errFilePtr);
-
-    if (numPids < 0) {
-	goto error;
-    }
-
-    /*
-     * Verify that the pipes that were created satisfy the
-     * readable/writable constraints. 
-     */
-
-    if (flags & TCL_ENFORCE_MODE) {
-	if ((flags & TCL_STDOUT) && (outPipe == NULL)) {
-	    Tcl_AppendResult(interp, "can't read output from command:",
-		    " standard output was redirected", (char *) NULL);
-	    goto error;
-	}
-	if ((flags & TCL_STDIN) && (inPipe == NULL)) {
-	    Tcl_AppendResult(interp, "can't write input to command:",
-		    " standard input was redirected", (char *) NULL);
-	    goto error;
-	}
-    }
-    
-    channel = TclpCreateCommandChannel(outPipe, inPipe, errFile,
-	    numPids, pidPtr);
-
-    if (channel == (Tcl_Channel) NULL) {
-        Tcl_AppendResult(interp, "pipe for command could not be created",
-                (char *) NULL);
-	goto error;
-    }
-    return channel;
-
-error:
-    if (numPids > 0) {
-	Tcl_DetachPids(numPids, pidPtr);
-	ckfree((char *) pidPtr);
-    }
-    if (inPipe != NULL) {
-	TclpCloseFile(inPipe);
-    }
-    if (outPipe != NULL) {
-	TclpCloseFile(outPipe);
-    }
-    if (errFile != NULL) {
-	TclpCloseFile(errFile);
-    }
-    return NULL;
-}
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
deleted file mode 100644
index 5cb1818..0000000
--- a/generic/tclPkg.c
+++ /dev/null
@@ -1,976 +0,0 @@
-/* 
- * tclPkg.c --
- *
- *	This file implements package and version control for Tcl via
- *	the "package" command and a few C APIs.
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPkg.c,v 1.4 1999/04/16 00:46:51 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Each invocation of the "package ifneeded" command creates a structure
- * of the following type, which is used to load the package into the
- * interpreter if it is requested with a "package require" command.
- */
-
-typedef struct PkgAvail {
-    char *version;		/* Version string; malloc'ed. */
-    char *script;		/* Script to invoke to provide this version
-				 * of the package.  Malloc'ed and protected
-				 * by Tcl_Preserve and Tcl_Release. */
-    struct PkgAvail *nextPtr;	/* Next in list of available versions of
-				 * the same package. */
-} PkgAvail;
-
-/*
- * For each package that is known in any way to an interpreter, there
- * is one record of the following type.  These records are stored in
- * the "packageTable" hash table in the interpreter, keyed by
- * package name such as "Tk" (no version number).
- */
-
-typedef struct Package {
-    char *version;		/* Version that has been supplied in this
-				 * interpreter via "package provide"
-				 * (malloc'ed).  NULL means the package doesn't
-				 * exist in this interpreter yet. */
-    PkgAvail *availPtr;		/* First in list of all available versions
-				 * of this package. */
-    ClientData clientData;	/* Client data. */
-} Package;
-
-/*
- * Prototypes for procedures defined in this file:
- */
-
-static int		CheckVersion _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string));
-static int		ComparePkgVersions _ANSI_ARGS_((char *v1, char *v2,
-			    int *satPtr));
-static Package *	FindPackage _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *name));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PkgProvide / Tcl_PkgProvideEx --
- *
- *	This procedure is invoked to declare that a particular version
- *	of a particular package is now present in an interpreter.  There
- *	must not be any other version of this package already
- *	provided in the interpreter.
- *
- * Results:
- *	Normally returns TCL_OK;  if there is already another version
- *	of the package loaded then TCL_ERROR is returned and an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	The interpreter remembers that this package is available,
- *	so that no other version of the package may be provided for
- *	the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_PkgProvide(interp, name, version)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of package. */
-    char *version;		/* Version string for package. */
-{
-    return Tcl_PkgProvideEx(interp, name, version, (ClientData) NULL);
-}
-
-int
-Tcl_PkgProvideEx(interp, name, version, clientData)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of package. */
-    char *version;		/* Version string for package. */
-    ClientData clientData;      /* clientdata for this package (normally
-                                 * used for C callback function table) */
-{
-    Package *pkgPtr;
-
-    pkgPtr = FindPackage(interp, name);
-    if (pkgPtr->version == NULL) {
-	pkgPtr->version = ckalloc((unsigned) (strlen(version) + 1));
-	strcpy(pkgPtr->version, version);
-	pkgPtr->clientData = clientData;
-	return TCL_OK;
-    }
-    if (ComparePkgVersions(pkgPtr->version, version, (int *) NULL) == 0) {
-	if (clientData != NULL) {
-	    pkgPtr->clientData = clientData;
-	}
-	return TCL_OK;
-    }
-    Tcl_AppendResult(interp, "conflicting versions provided for package \"",
-	    name, "\": ", pkgPtr->version, ", then ", version, (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PkgRequire / Tcl_PkgRequireEx --
- *
- *	This procedure is called by code that depends on a particular
- *	version of a particular package.  If the package is not already
- *	provided in the interpreter, this procedure invokes a Tcl script
- *	to provide it.  If the package is already provided, this
- *	procedure makes sure that the caller's needs don't conflict with
- *	the version that is present.
- *
- * Results:
- *	If successful, returns the version string for the currently
- *	provided version of the package, which may be different from
- *	the "version" argument.  If the caller's requirements
- *	cannot be met (e.g. the version requested conflicts with
- *	a currently provided version, or the required version cannot
- *	be found, or the script to provide the required version
- *	generates an error), NULL is returned and an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	The script from some previous "package ifneeded" command may
- *	be invoked to provide the package.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_PkgRequire(interp, name, version, exact)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of desired package. */
-    char *version;		/* Version string for desired version;
-				 * NULL means use the latest version
-				 * available. */
-    int exact;			/* Non-zero means that only the particular
-				 * version given is acceptable. Zero means
-				 * use the latest compatible version. */
-{
-    return Tcl_PkgRequireEx(interp, name, version, exact, (ClientData *) NULL);
-}
-
-char *
-Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of desired package. */
-    char *version;		/* Version string for desired version;
-				 * NULL means use the latest version
-				 * available. */
-    int exact;			/* Non-zero means that only the particular
-				 * version given is acceptable. Zero means
-				 * use the latest compatible version. */
-    ClientData *clientDataPtr;	/* Used to return the client data for this
-				 * package. If it is NULL then the client
-				 * data is not returned. This is unchanged
-				 * if this call fails for any reason. */
-{
-    Package *pkgPtr;
-    PkgAvail *availPtr, *bestPtr;
-    char *script;
-    int code, satisfies, result, pass;
-    Tcl_DString command;
-
-    /*
-     * If an attempt is being made to load this into a standalong executable
-     * on a platform where backlinking is not supported then this must be
-     * a shared version of Tcl (Otherwise the load would have failed).
-     * Detect this situation by checking that this library has been correctly
-     * initialised. If it has not been then return immediately as nothing will
-     * work.
-     */
-    
-    if (!tclEmptyStringRep) {
-        Tcl_AppendResult(interp, "Cannot load package \"", name, 
-                "\" in standalone executable: This package is not ",
-                "compiled with stub support", NULL);
-        return NULL;
-    }
-
-    /*
-     * It can take up to three passes to find the package:  one pass to
-     * run the "package unknown" script, one to run the "package ifneeded"
-     * script for a specific version, and a final pass to lookup the
-     * package loaded by the "package ifneeded" script.
-     */
-
-    for (pass = 1; ; pass++) {
-	pkgPtr = FindPackage(interp, name);
-	if (pkgPtr->version != NULL) {
-	    break;
-	}
-
-	/*
-	 * The package isn't yet present.  Search the list of available
-	 * versions and invoke the script for the best available version.
-	 */
-    
-	bestPtr = NULL;
-	for (availPtr = pkgPtr->availPtr; availPtr != NULL;
-		availPtr = availPtr->nextPtr) {
-	    if ((bestPtr != NULL) && (ComparePkgVersions(availPtr->version,
-		    bestPtr->version, (int *) NULL) <= 0)) {
-		continue;
-	    }
-	    if (version != NULL) {
-		result = ComparePkgVersions(availPtr->version, version,
-			&satisfies);
-		if ((result != 0) && exact) {
-		    continue;
-		}
-		if (!satisfies) {
-		    continue;
-		}
-	    }
-	    bestPtr = availPtr;
-	}
-	if (bestPtr != NULL) {
-	    /*
-	     * We found an ifneeded script for the package.  Be careful while
-	     * executing it:  this could cause reentrancy, so (a) protect the
-	     * script itself from deletion and (b) don't assume that bestPtr
-	     * will still exist when the script completes.
-	     */
-	
-	    script = bestPtr->script;
-	    Tcl_Preserve((ClientData) script);
-	    code = Tcl_GlobalEval(interp, script);
-	    Tcl_Release((ClientData) script);
-	    if (code != TCL_OK) {
-		if (code == TCL_ERROR) {
-		    Tcl_AddErrorInfo(interp,
-			    "\n    (\"package ifneeded\" script)");
-		}
-		return NULL;
-	    }
-	    Tcl_ResetResult(interp);
-	    pkgPtr = FindPackage(interp, name);
-	    break;
-	}
-
-	/*
-	 * Package not in the database.  If there is a "package unknown"
-	 * command, invoke it (but only on the first pass;  after that,
-	 * we should not get here in the first place).
-	 */
-
-	if (pass > 1) {
-	    break;
-	}
-	script = ((Interp *) interp)->packageUnknown;
-	if (script != NULL) {
-	    Tcl_DStringInit(&command);
-	    Tcl_DStringAppend(&command, script, -1);
-	    Tcl_DStringAppendElement(&command, name);
-	    Tcl_DStringAppend(&command, " ", 1);
-	    Tcl_DStringAppend(&command, (version != NULL) ? version : "{}",
-		    -1);
-	    if (exact) {
-		Tcl_DStringAppend(&command, " -exact", 7);
-	    }
-	    code = Tcl_GlobalEval(interp, Tcl_DStringValue(&command));
-	    Tcl_DStringFree(&command);
-	    if (code != TCL_OK) {
-		if (code == TCL_ERROR) {
-		    Tcl_AddErrorInfo(interp,
-			    "\n    (\"package unknown\" script)");
-		}
-		return NULL;
-	    }
-	    Tcl_ResetResult(interp);
-	}
-    }
-
-    if (pkgPtr->version == NULL) {
-	Tcl_AppendResult(interp, "can't find package ", name,
-		(char *) NULL);
-	if (version != NULL) {
-	    Tcl_AppendResult(interp, " ", version, (char *) NULL);
-	}
-	return NULL;
-    }
-
-    /*
-     * At this point we know that the package is present.  Make sure that the
-     * provided version meets the current requirement.
-     */
-
-    if (version == NULL) {
-        if (clientDataPtr) {
-	    *clientDataPtr = pkgPtr->clientData;
-	}
-	return pkgPtr->version;
-    }
-    result = ComparePkgVersions(pkgPtr->version, version, &satisfies);
-    if ((satisfies && !exact) || (result == 0)) {
-	if (clientDataPtr) {
-	    *clientDataPtr = pkgPtr->clientData;
-	}
-	return pkgPtr->version;
-    }
-    Tcl_AppendResult(interp, "version conflict for package \"",
-	    name, "\": have ", pkgPtr->version, ", need ", version,
-	    (char *) NULL);
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PkgPresent / Tcl_PkgPresentEx --
- *
- *	Checks to see whether the specified package is present. If it
- *	is not then no additional action is taken.
- *
- * Results:
- *	If successful, returns the version string for the currently
- *	provided version of the package, which may be different from
- *	the "version" argument.  If the caller's requirements
- *	cannot be met (e.g. the version requested conflicts with
- *	a currently provided version), NULL is returned and an error
- *	message is left in interp->result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_PkgPresent(interp, name, version, exact)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of desired package. */
-    char *version;		/* Version string for desired version;
-				 * NULL means use the latest version
-				 * available. */
-    int exact;			/* Non-zero means that only the particular
-				 * version given is acceptable. Zero means
-				 * use the latest compatible version. */
-{
-    return Tcl_PkgPresentEx(interp, name, version, exact, (ClientData *) NULL);
-}
-
-char *
-Tcl_PkgPresentEx(interp, name, version, exact, clientDataPtr)
-    Tcl_Interp *interp;		/* Interpreter in which package is now
-				 * available. */
-    char *name;			/* Name of desired package. */
-    char *version;		/* Version string for desired version;
-				 * NULL means use the latest version
-				 * available. */
-    int exact;			/* Non-zero means that only the particular
-				 * version given is acceptable. Zero means
-				 * use the latest compatible version. */
-    ClientData *clientDataPtr;	/* Used to return the client data for this
-				 * package. If it is NULL then the client
-				 * data is not returned. This is unchanged
-				 * if this call fails for any reason. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashEntry *hPtr;
-    Package *pkgPtr;
-    int satisfies, result;
-
-    /*
-     * If an attempt is being made to load this into a standalone executable
-     * on a platform where backlinking is not supported then this must be
-     * a shared version of Tcl (Otherwise the load would have failed).
-     * Detect this situation by checking that this library has been correctly
-     * initialised. If it has not been then return immediately as nothing will
-     * work.
-     */
-    
-    if (!tclEmptyStringRep) {
-        Tcl_AppendResult(interp, "Cannot load package \"", name, 
-                "\" in standalone executable: This package is not ",
-                "compiled with stub support", NULL);
-        return NULL;
-    }
-
-    hPtr = Tcl_FindHashEntry(&iPtr->packageTable, name);
-    if (hPtr) {
-	pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-	if (pkgPtr->version != NULL) {
-	    
-	    /*
-	     * At this point we know that the package is present.  Make sure
-	     * that the provided version meets the current requirement.
-	     */
-
-	    if (version == NULL) {
-		if (clientDataPtr) {
-		    *clientDataPtr = pkgPtr->clientData;
-		}
-		
-		return pkgPtr->version;
-	    }
-	    result = ComparePkgVersions(pkgPtr->version, version, &satisfies);
-	    if ((satisfies && !exact) || (result == 0)) {
-		if (clientDataPtr) {
-		    *clientDataPtr = pkgPtr->clientData;
-		}
-    
-		return pkgPtr->version;
-	    }
-	    Tcl_AppendResult(interp, "version conflict for package \"",
-			     name, "\": have ", pkgPtr->version,
-			     ", need ", version, (char *) NULL);
-	    return NULL;
-	}
-    }
-
-    if (version != NULL) {
-	Tcl_AppendResult(interp, "package ", name, " ", version,
-			 " is not present", (char *) NULL);
-    } else {
-	Tcl_AppendResult(interp, "package ", name, " is not present",
-			 (char *) NULL);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PackageObjCmd --
- *
- *	This procedure is invoked to process the "package" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_PackageObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    static char *pkgOptions[] = {
-	"forget", "ifneeded", "names", "present", "provide", "require",
-	"unknown", "vcompare", "versions", "vsatisfies", (char *) NULL
-    };
-    enum pkgOptions {
-	PKG_FORGET, PKG_IFNEEDED, PKG_NAMES, PKG_PRESENT,
-	PKG_PROVIDE, PKG_REQUIRE, PKG_UNKNOWN, PKG_VCOMPARE,
-	PKG_VERSIONS, PKG_VSATISFIES
-    };
-    Interp *iPtr = (Interp *) interp;
-    int optionIndex, exact, i, satisfies;
-    PkgAvail *availPtr, *prevPtr;
-    Package *pkgPtr;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    Tcl_HashTable *tablePtr;
-    char *version, *argv2, *argv3, *argv4;
-
-    if (objc < 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], pkgOptions, "option", 0,
-	    &optionIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    switch ((enum pkgOptions) optionIndex) {
-	case PKG_FORGET: {
-	    char *keyString;
-	    for (i = 2; i < objc; i++) {
-		keyString = Tcl_GetString(objv[i]);
-		hPtr = Tcl_FindHashEntry(&iPtr->packageTable, keyString);
-		if (hPtr == NULL) {
-		    return TCL_OK;
-		}
-		pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-		Tcl_DeleteHashEntry(hPtr);
-		if (pkgPtr->version != NULL) {
-		    ckfree(pkgPtr->version);
-		}
-		while (pkgPtr->availPtr != NULL) {
-		    availPtr = pkgPtr->availPtr;
-		    pkgPtr->availPtr = availPtr->nextPtr;
-		    ckfree(availPtr->version);
-		    Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
-		    ckfree((char *) availPtr);
-		}
-		ckfree((char *) pkgPtr);
-	    }
-	    break;
-	}
-	case PKG_IFNEEDED: {
-	    int length;
-	    if ((objc != 4) && (objc != 5)) {
-		Tcl_WrongNumArgs(interp, 2, objv, "package version ?script?");
-		return TCL_ERROR;
-	    }
-	    argv3 = Tcl_GetString(objv[3]);
-	    if (CheckVersion(interp, argv3) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    argv2 = Tcl_GetString(objv[2]);
-	    if (objc == 4) {
-		hPtr = Tcl_FindHashEntry(&iPtr->packageTable, argv2);
-		if (hPtr == NULL) {
-		    return TCL_OK;
-		}
-		pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-	    } else {
-		pkgPtr = FindPackage(interp, argv2);
-	    }
-	    argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	    for (availPtr = pkgPtr->availPtr, prevPtr = NULL; availPtr != NULL;
-		 prevPtr = availPtr, availPtr = availPtr->nextPtr) {
-		if (ComparePkgVersions(availPtr->version, argv3, (int *) NULL)
-			== 0) {
-		    if (objc == 4) {
-			Tcl_SetResult(interp, availPtr->script, TCL_VOLATILE);
-			return TCL_OK;
-		    }
-		    Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
-		    break;
-		}
-	    }
-	    if (objc == 4) {
-		return TCL_OK;
-	    }
-	    if (availPtr == NULL) {
-		availPtr = (PkgAvail *) ckalloc(sizeof(PkgAvail));
-		availPtr->version = ckalloc((unsigned) (length + 1));
-		strcpy(availPtr->version, argv3);
-		if (prevPtr == NULL) {
-		    availPtr->nextPtr = pkgPtr->availPtr;
-		    pkgPtr->availPtr = availPtr;
-		} else {
-		    availPtr->nextPtr = prevPtr->nextPtr;
-		    prevPtr->nextPtr = availPtr;
-		}
-	    }
-	    argv4 = Tcl_GetStringFromObj(objv[4], &length);
-	    availPtr->script = ckalloc((unsigned) (length + 1));
-	    strcpy(availPtr->script, argv4);
-	    break;
-	}
-	case PKG_NAMES: {
-	    if (objc != 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    tablePtr = &iPtr->packageTable;
-	    for (hPtr = Tcl_FirstHashEntry(tablePtr, &search); hPtr != NULL;
-		 hPtr = Tcl_NextHashEntry(&search)) {
-		pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-		if ((pkgPtr->version != NULL) || (pkgPtr->availPtr != NULL)) {
-		    Tcl_AppendElement(interp, Tcl_GetHashKey(tablePtr, hPtr));
-		}
-	    }
-	    break;
-	}
-	case PKG_PRESENT: {
-	    if (objc < 3) {
-		presentSyntax:
-		Tcl_WrongNumArgs(interp, 2, objv, "?-exact? package ?version?");
-		return TCL_ERROR;
-	    }
-	    argv2 = Tcl_GetString(objv[2]);
-	    if ((argv2[0] == '-') && (strcmp(argv2, "-exact") == 0)) {
-		exact = 1;
-	    } else {
-		exact = 0;
-	    }
-	    version = NULL;
-	    if (objc == (4 + exact)) {
-		version =  Tcl_GetString(objv[3 + exact]);
-		if (CheckVersion(interp, version) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-	    } else if ((objc != 3) || exact) {
-		goto presentSyntax;
-	    }
-	    if (exact) {
-		argv3 =  Tcl_GetString(objv[3]);
-		version = Tcl_PkgPresent(interp, argv3, version, exact);
-	    } else {
-		version = Tcl_PkgPresent(interp, argv2, version, exact);
-	    }
-	    if (version == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetResult(interp, version, TCL_VOLATILE);
-	    break;
-	}
-	case PKG_PROVIDE: {
-	    if ((objc != 3) && (objc != 4)) {
-		Tcl_WrongNumArgs(interp, 2, objv, "package ?version?");
-		return TCL_ERROR;
-	    }
-	    argv2 = Tcl_GetString(objv[2]);
-	    if (objc == 3) {
-		hPtr = Tcl_FindHashEntry(&iPtr->packageTable, argv2);
-		if (hPtr != NULL) {
-		    pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-		    if (pkgPtr->version != NULL) {
-			Tcl_SetResult(interp, pkgPtr->version, TCL_VOLATILE);
-		    }
-		}
-		return TCL_OK;
-	    }
-	    argv3 = Tcl_GetString(objv[3]);
-	    if (CheckVersion(interp, argv3) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    return Tcl_PkgProvide(interp, argv2, argv3);
-	}
-	case PKG_REQUIRE: {
-	    if (objc < 3) {
-		requireSyntax:
-		Tcl_WrongNumArgs(interp, 2, objv, "?-exact? package ?version?");
-		return TCL_ERROR;
-	    }
-	    argv2 = Tcl_GetString(objv[2]);
-	    if ((argv2[0] == '-') && (strcmp(argv2, "-exact") == 0)) {
-		exact = 1;
-	    } else {
-		exact = 0;
-	    }
-	    version = NULL;
-	    if (objc == (4 + exact)) {
-		version =  Tcl_GetString(objv[3 + exact]);
-		if (CheckVersion(interp, version) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-	    } else if ((objc != 3) || exact) {
-		goto requireSyntax;
-	    }
-	    if (exact) {
-		argv3 =  Tcl_GetString(objv[3]);
-		version = Tcl_PkgRequire(interp, argv3, version, exact);
-	    } else {
-		version = Tcl_PkgRequire(interp, argv2, version, exact);
-	    }
-	    if (version == NULL) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetResult(interp, version, TCL_VOLATILE);
-	    break;
-	}
-	case PKG_UNKNOWN: {
-	    int length;
-	    if (objc == 2) {
-		if (iPtr->packageUnknown != NULL) {
-		    Tcl_SetResult(interp, iPtr->packageUnknown, TCL_VOLATILE);
-		}
-	    } else if (objc == 3) {
-		if (iPtr->packageUnknown != NULL) {
-		    ckfree(iPtr->packageUnknown);
-		}
-		argv2 = Tcl_GetStringFromObj(objv[2], &length);
-		if (argv2[0] == 0) {
-		    iPtr->packageUnknown = NULL;
-		} else {
-		    iPtr->packageUnknown = (char *) ckalloc((unsigned)
-			    (length + 1));
-		    strcpy(iPtr->packageUnknown, argv2);
-		}
-	    } else {
-		Tcl_WrongNumArgs(interp, 2, objv, "?command?");
-		return TCL_ERROR;
-	    }
-	    break;
-	}
-	case PKG_VCOMPARE: {
-	    if (objc != 4) {
-		Tcl_WrongNumArgs(interp, 2, objv, "version1 version2");
-		return TCL_ERROR;
-	    }
-	    argv3 = Tcl_GetString(objv[3]);
-	    argv2 = Tcl_GetString(objv[2]);
-	    if ((CheckVersion(interp, argv2) != TCL_OK)
-		    || (CheckVersion(interp, argv3) != TCL_OK)) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp),
-		    ComparePkgVersions(argv2, argv3, (int *) NULL));
-	    break;
-	}
-	case PKG_VERSIONS: {
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "package");
-		return TCL_ERROR;
-	    }
-	    argv2 = Tcl_GetString(objv[2]);
-	    hPtr = Tcl_FindHashEntry(&iPtr->packageTable, argv2);
-	    if (hPtr != NULL) {
-		pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-		for (availPtr = pkgPtr->availPtr; availPtr != NULL;
-		     availPtr = availPtr->nextPtr) {
-		    Tcl_AppendElement(interp, availPtr->version);
-		}
-	    }
-	    break;
-	}
-	case PKG_VSATISFIES: {
-	    if (objc != 4) {
-		Tcl_WrongNumArgs(interp, 2, objv, "version1 version2");
-		return TCL_ERROR;
-	    }
-	    argv3 = Tcl_GetString(objv[3]);
-	    argv2 = Tcl_GetString(objv[2]);
-	    if ((CheckVersion(interp, argv2) != TCL_OK)
-		    || (CheckVersion(interp, argv3) != TCL_OK)) {
-		return TCL_ERROR;
-	    }
-	    ComparePkgVersions(argv2, argv3, &satisfies);
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), satisfies);
-	    break;
-	}
-	default: {
-	    panic("Tcl_PackageObjCmd: bad option index to pkgOptions");
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FindPackage --
- *
- *	This procedure finds the Package record for a particular package
- *	in a particular interpreter, creating a record if one doesn't
- *	already exist.
- *
- * Results:
- *	The return value is a pointer to the Package record for the
- *	package.
- *
- * Side effects:
- *	A new Package record may be created.
- *
- *----------------------------------------------------------------------
- */
-
-static Package *
-FindPackage(interp, name)
-    Tcl_Interp *interp;		/* Interpreter to use for package lookup. */
-    char *name;			/* Name of package to fine. */
-{
-    Interp *iPtr = (Interp *) interp;
-    Tcl_HashEntry *hPtr;
-    int new;
-    Package *pkgPtr;
-
-    hPtr = Tcl_CreateHashEntry(&iPtr->packageTable, name, &new);
-    if (new) {
-	pkgPtr = (Package *) ckalloc(sizeof(Package));
-	pkgPtr->version = NULL;
-	pkgPtr->availPtr = NULL;
-	pkgPtr->clientData = NULL;
-	Tcl_SetHashValue(hPtr, pkgPtr);
-    } else {
-	pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-    }
-    return pkgPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFreePackageInfo --
- *
- *	This procedure is called during interpreter deletion to
- *	free all of the package-related information for the
- *	interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFreePackageInfo(iPtr)
-    Interp *iPtr;		/* Interpereter that is being deleted. */
-{
-    Package *pkgPtr;
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hPtr;
-    PkgAvail *availPtr;
-
-    for (hPtr = Tcl_FirstHashEntry(&iPtr->packageTable, &search);
-	    hPtr != NULL;  hPtr = Tcl_NextHashEntry(&search)) {
-	pkgPtr = (Package *) Tcl_GetHashValue(hPtr);
-	if (pkgPtr->version != NULL) {
-	    ckfree(pkgPtr->version);
-	}
-	while (pkgPtr->availPtr != NULL) {
-	    availPtr = pkgPtr->availPtr;
-	    pkgPtr->availPtr = availPtr->nextPtr;
-	    ckfree(availPtr->version);
-	    Tcl_EventuallyFree((ClientData)availPtr->script, TCL_DYNAMIC);
-	    ckfree((char *) availPtr);
-	}
-	ckfree((char *) pkgPtr);
-    }
-    Tcl_DeleteHashTable(&iPtr->packageTable);
-    if (iPtr->packageUnknown != NULL) {
-	ckfree(iPtr->packageUnknown);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckVersion --
- *
- *	This procedure checks to see whether a version number has
- *	valid syntax.
- *
- * Results:
- *	If string is a properly formed version number the TCL_OK
- *	is returned.  Otherwise TCL_ERROR is returned and an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CheckVersion(interp, string)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *string;		/* Supposedly a version number, which is
-				 * groups of decimal digits separated
-				 * by dots. */
-{
-    char *p = string;
-
-    if (!isdigit(UCHAR(*p))) {	/* INTL: digit */
-	goto error;
-    }
-    for (p++; *p != 0; p++) {
-	if (!isdigit(UCHAR(*p)) && (*p != '.')) { /* INTL: digit */
-	    goto error;
-	}
-    }
-    if (p[-1] != '.') {
-	return TCL_OK;
-    }
-
-    error:
-    Tcl_AppendResult(interp, "expected version number but got \"",
-	    string, "\"", (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ComparePkgVersions --
- *
- *	This procedure compares two version numbers.
- *
- * Results:
- *	The return value is -1 if v1 is less than v2, 0 if the two
- *	version numbers are the same, and 1 if v1 is greater than v2.
- *	If *satPtr is non-NULL, the word it points to is filled in
- *	with 1 if v2 >= v1 and both numbers have the same major number
- *	or 0 otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ComparePkgVersions(v1, v2, satPtr)
-    char *v1, *v2;		/* Versions strings, of form 2.1.3 (any
-				 * number of version numbers). */
-    int *satPtr;		/* If non-null, the word pointed to is
-				 * filled in with a 0/1 value.  1 means
-				 * v1 "satisfies" v2:  v1 is greater than
-				 * or equal to v2 and both version numbers
-				 * have the same major number. */
-{
-    int thisIsMajor, n1, n2;
-
-    /*
-     * Each iteration of the following loop processes one number from
-     * each string, terminated by a ".".  If those numbers don't match
-     * then the comparison is over;  otherwise, we loop back for the
-     * next number.
-     */
-
-    thisIsMajor = 1;
-    while (1) {
-	/*
-	 * Parse one decimal number from the front of each string.
-	 */
-
-	n1 = n2 = 0;
-	while ((*v1 != 0) && (*v1 != '.')) {
-	    n1 = 10*n1 + (*v1 - '0');
-	    v1++;
-	}
-	while ((*v2 != 0) && (*v2 != '.')) {
-	    n2 = 10*n2 + (*v2 - '0');
-	    v2++;
-	}
-
-	/*
-	 * Compare and go on to the next version number if the
-	 * current numbers match.
-	 */
-
-	if (n1 != n2) {
-	    break;
-	}
-	if (*v1 != 0) {
-	    v1++;
-	} else if (*v2 == 0) {
-	    break;
-	}
-	if (*v2 != 0) {
-	    v2++;
-	}
-	thisIsMajor = 0;
-    }
-    if (satPtr != NULL) {
-	*satPtr = (n1 == n2) || ((n1 > n2) && !thisIsMajor);
-    }
-    if (n1 > n2) {
-	return 1;
-    } else if (n1 == n2) {
-	return 0;
-    } else {
-	return -1;
-    }
-}
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
deleted file mode 100644
index 214020d..0000000
--- a/generic/tclPlatDecls.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * tclPlatDecls.h --
- *
- *	Declarations of platform specific Tcl APIs.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- * All rights reserved.
- *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.4 1999/04/16 00:46:51 stanton Exp $
- */
-
-#ifndef _TCLPLATDECLS
-#define _TCLPLATDECLS
-
-/* !BEGIN!: Do not edit below this line. */
-
-/*
- * Exported function declarations:
- */
-
-#ifdef __WIN32__
-/* 0 */
-EXTERN TCHAR *		Tcl_WinUtfToTChar _ANSI_ARGS_((CONST char * str, 
-				int len, Tcl_DString * dsPtr));
-/* 1 */
-EXTERN char *		Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str, 
-				int len, Tcl_DString * dsPtr));
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-/* 0 */
-EXTERN void		Tcl_MacSetEventProc _ANSI_ARGS_((
-				Tcl_MacConvertEventPtr procPtr));
-/* 1 */
-EXTERN char *		Tcl_MacConvertTextResource _ANSI_ARGS_((
-				Handle resource));
-/* 2 */
-EXTERN int		Tcl_MacEvalResource _ANSI_ARGS_((Tcl_Interp * interp, 
-				char * resourceName, int resourceNumber, 
-				char * fileName));
-/* 3 */
-EXTERN Handle		Tcl_MacFindResource _ANSI_ARGS_((Tcl_Interp * interp, 
-				long resourceType, char * resourceName, 
-				int resourceNumber, char * resFileRef, 
-				int * releaseIt));
-/* 4 */
-EXTERN int		Tcl_GetOSTypeFromObj _ANSI_ARGS_((
-				Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				OSType * osTypePtr));
-/* 5 */
-EXTERN void		Tcl_SetOSTypeObj _ANSI_ARGS_((Tcl_Obj * objPtr, 
-				OSType osType));
-/* 6 */
-EXTERN Tcl_Obj *	Tcl_NewOSTypeObj _ANSI_ARGS_((OSType osType));
-/* 7 */
-EXTERN int		strncasecmp _ANSI_ARGS_((CONST char * s1, 
-				CONST char * s2, size_t n));
-/* 8 */
-EXTERN int		strcasecmp _ANSI_ARGS_((CONST char * s1, 
-				CONST char * s2));
-#endif /* MAC_TCL */
-
-typedef struct TclPlatStubs {
-    int magic;
-    struct TclPlatStubHooks *hooks;
-
-#ifdef __WIN32__
-    TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */
-    char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tcl_MacSetEventProc) _ANSI_ARGS_((Tcl_MacConvertEventPtr procPtr)); /* 0 */
-    char * (*tcl_MacConvertTextResource) _ANSI_ARGS_((Handle resource)); /* 1 */
-    int (*tcl_MacEvalResource) _ANSI_ARGS_((Tcl_Interp * interp, char * resourceName, int resourceNumber, char * fileName)); /* 2 */
-    Handle (*tcl_MacFindResource) _ANSI_ARGS_((Tcl_Interp * interp, long resourceType, char * resourceName, int resourceNumber, char * resFileRef, int * releaseIt)); /* 3 */
-    int (*tcl_GetOSTypeFromObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, OSType * osTypePtr)); /* 4 */
-    void (*tcl_SetOSTypeObj) _ANSI_ARGS_((Tcl_Obj * objPtr, OSType osType)); /* 5 */
-    Tcl_Obj * (*tcl_NewOSTypeObj) _ANSI_ARGS_((OSType osType)); /* 6 */
-    int (*strncasecmp) _ANSI_ARGS_((CONST char * s1, CONST char * s2, size_t n)); /* 7 */
-    int (*strcasecmp) _ANSI_ARGS_((CONST char * s1, CONST char * s2)); /* 8 */
-#endif /* MAC_TCL */
-} TclPlatStubs;
-
-extern TclPlatStubs *tclPlatStubsPtr;
-
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-
-/*
- * Inline function declarations:
- */
-
-#ifdef __WIN32__
-#ifndef Tcl_WinUtfToTChar
-#define Tcl_WinUtfToTChar \
-	(tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */
-#endif
-#ifndef Tcl_WinTCharToUtf
-#define Tcl_WinTCharToUtf \
-	(tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */
-#endif
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef Tcl_MacSetEventProc
-#define Tcl_MacSetEventProc \
-	(tclPlatStubsPtr->tcl_MacSetEventProc) /* 0 */
-#endif
-#ifndef Tcl_MacConvertTextResource
-#define Tcl_MacConvertTextResource \
-	(tclPlatStubsPtr->tcl_MacConvertTextResource) /* 1 */
-#endif
-#ifndef Tcl_MacEvalResource
-#define Tcl_MacEvalResource \
-	(tclPlatStubsPtr->tcl_MacEvalResource) /* 2 */
-#endif
-#ifndef Tcl_MacFindResource
-#define Tcl_MacFindResource \
-	(tclPlatStubsPtr->tcl_MacFindResource) /* 3 */
-#endif
-#ifndef Tcl_GetOSTypeFromObj
-#define Tcl_GetOSTypeFromObj \
-	(tclPlatStubsPtr->tcl_GetOSTypeFromObj) /* 4 */
-#endif
-#ifndef Tcl_SetOSTypeObj
-#define Tcl_SetOSTypeObj \
-	(tclPlatStubsPtr->tcl_SetOSTypeObj) /* 5 */
-#endif
-#ifndef Tcl_NewOSTypeObj
-#define Tcl_NewOSTypeObj \
-	(tclPlatStubsPtr->tcl_NewOSTypeObj) /* 6 */
-#endif
-#ifndef strncasecmp
-#define strncasecmp \
-	(tclPlatStubsPtr->strncasecmp) /* 7 */
-#endif
-#ifndef strcasecmp
-#define strcasecmp \
-	(tclPlatStubsPtr->strcasecmp) /* 8 */
-#endif
-#endif /* MAC_TCL */
-
-#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
-
-/* !END!: Do not edit above this line. */
-
-#endif /* _TCLPLATDECLS */
-
-
diff --git a/generic/tclPort.h b/generic/tclPort.h
deleted file mode 100644
index 5c7c486..0000000
--- a/generic/tclPort.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * tclPort.h --
- *
- *	This header file handles porting issues that occur because
- *	of differences between systems.  It reads in platform specific
- *	portability files.
- *
- * Copyright (c) 1994-1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPort.h,v 1.3 1999/04/16 00:46:52 stanton Exp $
- */
-
-#ifndef _TCLPORT
-#define _TCLPORT
-
-#if defined(__WIN32__)
-#   include "../win/tclWinPort.h"
-#else
-#   if defined(MAC_TCL)
-#	include "tclMacPort.h"
-#    else
-#	include "../unix/tclUnixPort.h"
-#    endif
-#endif
-
-#endif /* _TCLPORT */
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
deleted file mode 100644
index 7e61d20..0000000
--- a/generic/tclPosixStr.c
+++ /dev/null
@@ -1,1174 +0,0 @@
-/* 
- * tclPosixStr.c --
- *
- *	This file contains procedures that generate strings
- *	corresponding to various POSIX-related codes, such
- *	as errno and signals.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPosixStr.c,v 1.4 1999/04/16 00:46:52 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ErrnoId --
- *
- *	Return a textual identifier for the current errno value.
- *
- * Results:
- *	This procedure returns a machine-readable textual identifier
- *	that corresponds to the current errno value (e.g. "EPERM").
- *	The identifier is the same as the #define name in errno.h.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_ErrnoId()
-{
-    switch (errno) {
-#ifdef E2BIG
-	case E2BIG: return "E2BIG";
-#endif
-#ifdef EACCES
-	case EACCES: return "EACCES";
-#endif
-#ifdef EADDRINUSE
-	case EADDRINUSE: return "EADDRINUSE";
-#endif
-#ifdef EADDRNOTAVAIL
-	case EADDRNOTAVAIL: return "EADDRNOTAVAIL";
-#endif
-#ifdef EADV
-	case EADV: return "EADV";
-#endif
-#ifdef EAFNOSUPPORT
-	case EAFNOSUPPORT: return "EAFNOSUPPORT";
-#endif
-#ifdef EAGAIN
-	case EAGAIN: return "EAGAIN";
-#endif
-#ifdef EALIGN
-	case EALIGN: return "EALIGN";
-#endif
-#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY ))
-	case EALREADY: return "EALREADY";
-#endif
-#ifdef EBADE
-	case EBADE: return "EBADE";
-#endif
-#ifdef EBADF
-	case EBADF: return "EBADF";
-#endif
-#ifdef EBADFD
-	case EBADFD: return "EBADFD";
-#endif
-#ifdef EBADMSG
-	case EBADMSG: return "EBADMSG";
-#endif
-#ifdef EBADR
-	case EBADR: return "EBADR";
-#endif
-#ifdef EBADRPC
-	case EBADRPC: return "EBADRPC";
-#endif
-#ifdef EBADRQC
-	case EBADRQC: return "EBADRQC";
-#endif
-#ifdef EBADSLT
-	case EBADSLT: return "EBADSLT";
-#endif
-#ifdef EBFONT
-	case EBFONT: return "EBFONT";
-#endif
-#ifdef EBUSY
-	case EBUSY: return "EBUSY";
-#endif
-#ifdef ECHILD
-	case ECHILD: return "ECHILD";
-#endif
-#ifdef ECHRNG
-	case ECHRNG: return "ECHRNG";
-#endif
-#ifdef ECOMM
-	case ECOMM: return "ECOMM";
-#endif
-#ifdef ECONNABORTED
-	case ECONNABORTED: return "ECONNABORTED";
-#endif
-#ifdef ECONNREFUSED
-	case ECONNREFUSED: return "ECONNREFUSED";
-#endif
-#ifdef ECONNRESET
-	case ECONNRESET: return "ECONNRESET";
-#endif
-#if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
-	case EDEADLK: return "EDEADLK";
-#endif
-#if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
-	case EDEADLOCK: return "EDEADLOCK";
-#endif
-#ifdef EDESTADDRREQ
-	case EDESTADDRREQ: return "EDESTADDRREQ";
-#endif
-#ifdef EDIRTY
-	case EDIRTY: return "EDIRTY";
-#endif
-#ifdef EDOM
-	case EDOM: return "EDOM";
-#endif
-#ifdef EDOTDOT
-	case EDOTDOT: return "EDOTDOT";
-#endif
-#ifdef EDQUOT
-	case EDQUOT: return "EDQUOT";
-#endif
-#ifdef EDUPPKG
-	case EDUPPKG: return "EDUPPKG";
-#endif
-#ifdef EEXIST
-	case EEXIST: return "EEXIST";
-#endif
-#ifdef EFAULT
-	case EFAULT: return "EFAULT";
-#endif
-#ifdef EFBIG
-	case EFBIG: return "EFBIG";
-#endif
-#ifdef EHOSTDOWN
-	case EHOSTDOWN: return "EHOSTDOWN";
-#endif
-#ifdef EHOSTUNREACH
-	case EHOSTUNREACH: return "EHOSTUNREACH";
-#endif
-#if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
-	case EIDRM: return "EIDRM";
-#endif
-#ifdef EINIT
-	case EINIT: return "EINIT";
-#endif
-#ifdef EINPROGRESS
-	case EINPROGRESS: return "EINPROGRESS";
-#endif
-#ifdef EINTR
-	case EINTR: return "EINTR";
-#endif
-#ifdef EINVAL
-	case EINVAL: return "EINVAL";
-#endif
-#ifdef EIO
-	case EIO: return "EIO";
-#endif
-#ifdef EISCONN
-	case EISCONN: return "EISCONN";
-#endif
-#ifdef EISDIR
-	case EISDIR: return "EISDIR";
-#endif
-#ifdef EISNAME
-	case EISNAM: return "EISNAM";
-#endif
-#ifdef ELBIN
-	case ELBIN: return "ELBIN";
-#endif
-#ifdef EL2HLT
-	case EL2HLT: return "EL2HLT";
-#endif
-#ifdef EL2NSYNC
-	case EL2NSYNC: return "EL2NSYNC";
-#endif
-#ifdef EL3HLT
-	case EL3HLT: return "EL3HLT";
-#endif
-#ifdef EL3RST
-	case EL3RST: return "EL3RST";
-#endif
-#ifdef ELIBACC
-	case ELIBACC: return "ELIBACC";
-#endif
-#ifdef ELIBBAD
-	case ELIBBAD: return "ELIBBAD";
-#endif
-#ifdef ELIBEXEC
-	case ELIBEXEC: return "ELIBEXEC";
-#endif
-#ifdef ELIBMAX
-	case ELIBMAX: return "ELIBMAX";
-#endif
-#ifdef ELIBSCN
-	case ELIBSCN: return "ELIBSCN";
-#endif
-#ifdef ELNRNG
-	case ELNRNG: return "ELNRNG";
-#endif
-#if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
-	case ELOOP: return "ELOOP";
-#endif
-#ifdef EMFILE
-	case EMFILE: return "EMFILE";
-#endif
-#ifdef EMLINK
-	case EMLINK: return "EMLINK";
-#endif
-#ifdef EMSGSIZE
-	case EMSGSIZE: return "EMSGSIZE";
-#endif
-#ifdef EMULTIHOP
-	case EMULTIHOP: return "EMULTIHOP";
-#endif
-#ifdef ENAMETOOLONG
-	case ENAMETOOLONG: return "ENAMETOOLONG";
-#endif
-#ifdef ENAVAIL
-	case ENAVAIL: return "ENAVAIL";
-#endif
-#ifdef ENET
-	case ENET: return "ENET";
-#endif
-#ifdef ENETDOWN
-	case ENETDOWN: return "ENETDOWN";
-#endif
-#ifdef ENETRESET
-	case ENETRESET: return "ENETRESET";
-#endif
-#ifdef ENETUNREACH
-	case ENETUNREACH: return "ENETUNREACH";
-#endif
-#ifdef ENFILE
-	case ENFILE: return "ENFILE";
-#endif
-#ifdef ENOANO
-	case ENOANO: return "ENOANO";
-#endif
-#if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
-	case ENOBUFS: return "ENOBUFS";
-#endif
-#ifdef ENOCSI
-	case ENOCSI: return "ENOCSI";
-#endif
-#if defined(ENODATA) && (!defined(ECONNREFUSED) || (ENODATA != ECONNREFUSED))
-	case ENODATA: return "ENODATA";
-#endif
-#ifdef ENODEV
-	case ENODEV: return "ENODEV";
-#endif
-#ifdef ENOENT
-	case ENOENT: return "ENOENT";
-#endif
-#ifdef ENOEXEC
-	case ENOEXEC: return "ENOEXEC";
-#endif
-#ifdef ENOLCK
-	case ENOLCK: return "ENOLCK";
-#endif
-#ifdef ENOLINK
-	case ENOLINK: return "ENOLINK";
-#endif
-#ifdef ENOMEM
-	case ENOMEM: return "ENOMEM";
-#endif
-#ifdef ENOMSG
-	case ENOMSG: return "ENOMSG";
-#endif
-#ifdef ENONET
-	case ENONET: return "ENONET";
-#endif
-#ifdef ENOPKG
-	case ENOPKG: return "ENOPKG";
-#endif
-#ifdef ENOPROTOOPT
-	case ENOPROTOOPT: return "ENOPROTOOPT";
-#endif
-#ifdef ENOSPC
-	case ENOSPC: return "ENOSPC";
-#endif
-#if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-	case ENOSR: return "ENOSR";
-#endif
-#if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-	case ENOSTR: return "ENOSTR";
-#endif
-#ifdef ENOSYM
-	case ENOSYM: return "ENOSYM";
-#endif
-#ifdef ENOSYS
-	case ENOSYS: return "ENOSYS";
-#endif
-#ifdef ENOTBLK
-	case ENOTBLK: return "ENOTBLK";
-#endif
-#ifdef ENOTCONN
-	case ENOTCONN: return "ENOTCONN";
-#endif
-#ifdef ENOTDIR
-	case ENOTDIR: return "ENOTDIR";
-#endif
-#if defined(ENOTEMPTY) && (!defined(EEXIST) || (ENOTEMPTY != EEXIST))
-	case ENOTEMPTY: return "ENOTEMPTY";
-#endif
-#ifdef ENOTNAM
-	case ENOTNAM: return "ENOTNAM";
-#endif
-#ifdef ENOTSOCK
-	case ENOTSOCK: return "ENOTSOCK";
-#endif
-#ifdef ENOTSUP
-	case ENOTSUP: return "ENOTSUP";
-#endif
-#ifdef ENOTTY
-	case ENOTTY: return "ENOTTY";
-#endif
-#ifdef ENOTUNIQ
-	case ENOTUNIQ: return "ENOTUNIQ";
-#endif
-#ifdef ENXIO
-	case ENXIO: return "ENXIO";
-#endif
-#if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
-	case EOPNOTSUPP: return "EOPNOTSUPP";
-#endif
-#ifdef EPERM
-	case EPERM: return "EPERM";
-#endif
-#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-	case EPFNOSUPPORT: return "EPFNOSUPPORT";
-#endif
-#ifdef EPIPE
-	case EPIPE: return "EPIPE";
-#endif
-#ifdef EPROCLIM
-	case EPROCLIM: return "EPROCLIM";
-#endif
-#ifdef EPROCUNAVAIL
-	case EPROCUNAVAIL: return "EPROCUNAVAIL";
-#endif
-#ifdef EPROGMISMATCH
-	case EPROGMISMATCH: return "EPROGMISMATCH";
-#endif
-#ifdef EPROGUNAVAIL
-	case EPROGUNAVAIL: return "EPROGUNAVAIL";
-#endif
-#ifdef EPROTO
-	case EPROTO: return "EPROTO";
-#endif
-#ifdef EPROTONOSUPPORT
-	case EPROTONOSUPPORT: return "EPROTONOSUPPORT";
-#endif
-#ifdef EPROTOTYPE
-	case EPROTOTYPE: return "EPROTOTYPE";
-#endif
-#ifdef ERANGE
-	case ERANGE: return "ERANGE";
-#endif
-#if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
-	case EREFUSED: return "EREFUSED";
-#endif
-#ifdef EREMCHG
-	case EREMCHG: return "EREMCHG";
-#endif
-#ifdef EREMDEV
-	case EREMDEV: return "EREMDEV";
-#endif
-#ifdef EREMOTE
-	case EREMOTE: return "EREMOTE";
-#endif
-#ifdef EREMOTEIO
-	case EREMOTEIO: return "EREMOTEIO";
-#endif
-#ifdef EREMOTERELEASE
-	case EREMOTERELEASE: return "EREMOTERELEASE";
-#endif
-#ifdef EROFS
-	case EROFS: return "EROFS";
-#endif
-#ifdef ERPCMISMATCH
-	case ERPCMISMATCH: return "ERPCMISMATCH";
-#endif
-#ifdef ERREMOTE
-	case ERREMOTE: return "ERREMOTE";
-#endif
-#ifdef ESHUTDOWN
-	case ESHUTDOWN: return "ESHUTDOWN";
-#endif
-#ifdef ESOCKTNOSUPPORT
-	case ESOCKTNOSUPPORT: return "ESOCKTNOSUPPORT";
-#endif
-#ifdef ESPIPE
-	case ESPIPE: return "ESPIPE";
-#endif
-#ifdef ESRCH
-	case ESRCH: return "ESRCH";
-#endif
-#ifdef ESRMNT
-	case ESRMNT: return "ESRMNT";
-#endif
-#ifdef ESTALE
-	case ESTALE: return "ESTALE";
-#endif
-#ifdef ESUCCESS
-	case ESUCCESS: return "ESUCCESS";
-#endif
-#if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
-	case ETIME: return "ETIME";
-#endif
-#if defined(ETIMEDOUT) && (!defined(ENOSTR) || (ETIMEDOUT != ENOSTR))
-	case ETIMEDOUT: return "ETIMEDOUT";
-#endif
-#ifdef ETOOMANYREFS
-	case ETOOMANYREFS: return "ETOOMANYREFS";
-#endif
-#ifdef ETXTBSY
-	case ETXTBSY: return "ETXTBSY";
-#endif
-#ifdef EUCLEAN
-	case EUCLEAN: return "EUCLEAN";
-#endif
-#ifdef EUNATCH
-	case EUNATCH: return "EUNATCH";
-#endif
-#ifdef EUSERS
-	case EUSERS: return "EUSERS";
-#endif
-#ifdef EVERSION
-	case EVERSION: return "EVERSION";
-#endif
-#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-	case EWOULDBLOCK: return "EWOULDBLOCK";
-#endif
-#ifdef EXDEV
-	case EXDEV: return "EXDEV";
-#endif
-#ifdef EXFULL
-	case EXFULL: return "EXFULL";
-#endif
-    }
-    return "unknown error";
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ErrnoMsg --
- *
- *	Return a human-readable message corresponding to a given
- *	errno value.
- *
- * Results:
- *	The return value is the standard POSIX error message for
- *	errno.  This procedure is used instead of strerror because
- *	strerror returns slightly different values on different
- *	machines (e.g. different capitalizations), which cause
- *	problems for things such as regression tests.  This procedure
- *	provides messages for most standard errors, then it calls
- *	strerror for things it doesn't understand.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_ErrnoMsg(err)
-    int err;			/* Error number (such as in errno variable). */
-{
-    switch (err) {
-#ifdef E2BIG
-	case E2BIG: return "argument list too long";
-#endif
-#ifdef EACCES
-	case EACCES: return "permission denied";
-#endif
-#ifdef EADDRINUSE
-	case EADDRINUSE: return "address already in use";
-#endif
-#ifdef EADDRNOTAVAIL
-	case EADDRNOTAVAIL: return "can't assign requested address";
-#endif
-#ifdef EADV
-	case EADV: return "advertise error";
-#endif
-#ifdef EAFNOSUPPORT
-	case EAFNOSUPPORT: return "address family not supported by protocol family";
-#endif
-#ifdef EAGAIN
-	case EAGAIN: return "resource temporarily unavailable";
-#endif
-#ifdef EALIGN
-	case EALIGN: return "EALIGN";
-#endif
-#if defined(EALREADY) && (!defined(EBUSY) || (EALREADY != EBUSY ))
-	case EALREADY: return "operation already in progress";
-#endif
-#ifdef EBADE
-	case EBADE: return "bad exchange descriptor";
-#endif
-#ifdef EBADF
-	case EBADF: return "bad file number";
-#endif
-#ifdef EBADFD
-	case EBADFD: return "file descriptor in bad state";
-#endif
-#ifdef EBADMSG
-	case EBADMSG: return "not a data message";
-#endif
-#ifdef EBADR
-	case EBADR: return "bad request descriptor";
-#endif
-#ifdef EBADRPC
-	case EBADRPC: return "RPC structure is bad";
-#endif
-#ifdef EBADRQC
-	case EBADRQC: return "bad request code";
-#endif
-#ifdef EBADSLT
-	case EBADSLT: return "invalid slot";
-#endif
-#ifdef EBFONT
-	case EBFONT: return "bad font file format";
-#endif
-#ifdef EBUSY
-	case EBUSY: return "file busy";
-#endif
-#ifdef ECHILD
-	case ECHILD: return "no children";
-#endif
-#ifdef ECHRNG
-	case ECHRNG: return "channel number out of range";
-#endif
-#ifdef ECOMM
-	case ECOMM: return "communication error on send";
-#endif
-#ifdef ECONNABORTED
-	case ECONNABORTED: return "software caused connection abort";
-#endif
-#ifdef ECONNREFUSED
-	case ECONNREFUSED: return "connection refused";
-#endif
-#ifdef ECONNRESET
-	case ECONNRESET: return "connection reset by peer";
-#endif
-#if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
-	case EDEADLK: return "resource deadlock avoided";
-#endif
-#if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
-	case EDEADLOCK: return "resource deadlock avoided";
-#endif
-#ifdef EDESTADDRREQ
-	case EDESTADDRREQ: return "destination address required";
-#endif
-#ifdef EDIRTY
-	case EDIRTY: return "mounting a dirty fs w/o force";
-#endif
-#ifdef EDOM
-	case EDOM: return "math argument out of range";
-#endif
-#ifdef EDOTDOT
-	case EDOTDOT: return "cross mount point";
-#endif
-#ifdef EDQUOT
-	case EDQUOT: return "disk quota exceeded";
-#endif
-#ifdef EDUPPKG
-	case EDUPPKG: return "duplicate package name";
-#endif
-#ifdef EEXIST
-	case EEXIST: return "file already exists";
-#endif
-#ifdef EFAULT
-	case EFAULT: return "bad address in system call argument";
-#endif
-#ifdef EFBIG
-	case EFBIG: return "file too large";
-#endif
-#ifdef EHOSTDOWN
-	case EHOSTDOWN: return "host is down";
-#endif
-#ifdef EHOSTUNREACH
-	case EHOSTUNREACH: return "host is unreachable";
-#endif
-#if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
-	case EIDRM: return "identifier removed";
-#endif
-#ifdef EINIT
-	case EINIT: return "initialization error";
-#endif
-#ifdef EINPROGRESS
-	case EINPROGRESS: return "operation now in progress";
-#endif
-#ifdef EINTR
-	case EINTR: return "interrupted system call";
-#endif
-#ifdef EINVAL
-	case EINVAL: return "invalid argument";
-#endif
-#ifdef EIO
-	case EIO: return "I/O error";
-#endif
-#ifdef EISCONN
-	case EISCONN: return "socket is already connected";
-#endif
-#ifdef EISDIR
-	case EISDIR: return "illegal operation on a directory";
-#endif
-#ifdef EISNAME
-	case EISNAM: return "is a name file";
-#endif
-#ifdef ELBIN
-	case ELBIN: return "ELBIN";
-#endif
-#ifdef EL2HLT
-	case EL2HLT: return "level 2 halted";
-#endif
-#ifdef EL2NSYNC
-	case EL2NSYNC: return "level 2 not synchronized";
-#endif
-#ifdef EL3HLT
-	case EL3HLT: return "level 3 halted";
-#endif
-#ifdef EL3RST
-	case EL3RST: return "level 3 reset";
-#endif
-#ifdef ELIBACC
-	case ELIBACC: return "can not access a needed shared library";
-#endif
-#ifdef ELIBBAD
-	case ELIBBAD: return "accessing a corrupted shared library";
-#endif
-#ifdef ELIBEXEC
-	case ELIBEXEC: return "can not exec a shared library directly";
-#endif
-#ifdef ELIBMAX
-	case ELIBMAX: return
-		"attempting to link in more shared libraries than system limit";
-#endif
-#ifdef ELIBSCN
-	case ELIBSCN: return ".lib section in a.out corrupted";
-#endif
-#ifdef ELNRNG
-	case ELNRNG: return "link number out of range";
-#endif
-#if defined(ELOOP) && (!defined(ENOENT) || (ELOOP != ENOENT))
-	case ELOOP: return "too many levels of symbolic links";
-#endif
-#ifdef EMFILE
-	case EMFILE: return "too many open files";
-#endif
-#ifdef EMLINK
-	case EMLINK: return "too many links";
-#endif
-#ifdef EMSGSIZE
-	case EMSGSIZE: return "message too long";
-#endif
-#ifdef EMULTIHOP
-	case EMULTIHOP: return "multihop attempted";
-#endif
-#ifdef ENAMETOOLONG
-	case ENAMETOOLONG: return "file name too long";
-#endif
-#ifdef ENAVAIL
-	case ENAVAIL: return "not available";
-#endif
-#ifdef ENET
-	case ENET: return "ENET";
-#endif
-#ifdef ENETDOWN
-	case ENETDOWN: return "network is down";
-#endif
-#ifdef ENETRESET
-	case ENETRESET: return "network dropped connection on reset";
-#endif
-#ifdef ENETUNREACH
-	case ENETUNREACH: return "network is unreachable";
-#endif
-#ifdef ENFILE
-	case ENFILE: return "file table overflow";
-#endif
-#ifdef ENOANO
-	case ENOANO: return "anode table overflow";
-#endif
-#if defined(ENOBUFS) && (!defined(ENOSR) || (ENOBUFS != ENOSR))
-	case ENOBUFS: return "no buffer space available";
-#endif
-#ifdef ENOCSI
-	case ENOCSI: return "no CSI structure available";
-#endif
-#if defined(ENODATA) && (!defined(ECONNREFUSED) || (ENODATA != ECONNREFUSED))
-	case ENODATA: return "no data available";
-#endif
-#ifdef ENODEV
-	case ENODEV: return "no such device";
-#endif
-#ifdef ENOENT
-	case ENOENT: return "no such file or directory";
-#endif
-#ifdef ENOEXEC
-	case ENOEXEC: return "exec format error";
-#endif
-#ifdef ENOLCK
-	case ENOLCK: return "no locks available";
-#endif
-#ifdef ENOLINK
-	case ENOLINK: return "link has be severed";
-#endif
-#ifdef ENOMEM
-	case ENOMEM: return "not enough memory";
-#endif
-#ifdef ENOMSG
-	case ENOMSG: return "no message of desired type";
-#endif
-#ifdef ENONET
-	case ENONET: return "machine is not on the network";
-#endif
-#ifdef ENOPKG
-	case ENOPKG: return "package not installed";
-#endif
-#ifdef ENOPROTOOPT
-	case ENOPROTOOPT: return "bad proocol option";
-#endif
-#ifdef ENOSPC
-	case ENOSPC: return "no space left on device";
-#endif
-#if defined(ENOSR) && (!defined(ENAMETOOLONG) || (ENAMETOOLONG != ENOSR))
-	case ENOSR: return "out of stream resources";
-#endif
-#if defined(ENOSTR) && (!defined(ENOTTY) || (ENOTTY != ENOSTR))
-	case ENOSTR: return "not a stream device";
-#endif
-#ifdef ENOSYM
-	case ENOSYM: return "unresolved symbol name";
-#endif
-#ifdef ENOSYS
-	case ENOSYS: return "function not implemented";
-#endif
-#ifdef ENOTBLK
-	case ENOTBLK: return "block device required";
-#endif
-#ifdef ENOTCONN
-	case ENOTCONN: return "socket is not connected";
-#endif
-#ifdef ENOTDIR
-	case ENOTDIR: return "not a directory";
-#endif
-#if defined(ENOTEMPTY) && (!defined(EEXIST) || (ENOTEMPTY != EEXIST))
-	case ENOTEMPTY: return "directory not empty";
-#endif
-#ifdef ENOTNAM
-	case ENOTNAM: return "not a name file";
-#endif
-#ifdef ENOTSOCK
-	case ENOTSOCK: return "socket operation on non-socket";
-#endif
-#ifdef ENOTSUP
-	case ENOTSUP: return "operation not supported";
-#endif
-#ifdef ENOTTY
-	case ENOTTY: return "inappropriate device for ioctl";
-#endif
-#ifdef ENOTUNIQ
-	case ENOTUNIQ: return "name not unique on network";
-#endif
-#ifdef ENXIO
-	case ENXIO: return "no such device or address";
-#endif
-#if defined(EOPNOTSUPP) &&  (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
-	case EOPNOTSUPP: return "operation not supported on socket";
-#endif
-#ifdef EPERM
-	case EPERM: return "not owner";
-#endif
-#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-	case EPFNOSUPPORT: return "protocol family not supported";
-#endif
-#ifdef EPIPE
-	case EPIPE: return "broken pipe";
-#endif
-#ifdef EPROCLIM
-	case EPROCLIM: return "too many processes";
-#endif
-#ifdef EPROCUNAVAIL
-	case EPROCUNAVAIL: return "bad procedure for program";
-#endif
-#ifdef EPROGMISMATCH
-	case EPROGMISMATCH: return "program version wrong";
-#endif
-#ifdef EPROGUNAVAIL
-	case EPROGUNAVAIL: return "RPC program not available";
-#endif
-#ifdef EPROTO
-	case EPROTO: return "protocol error";
-#endif
-#ifdef EPROTONOSUPPORT
-	case EPROTONOSUPPORT: return "protocol not suppored";
-#endif
-#ifdef EPROTOTYPE
-	case EPROTOTYPE: return "protocol wrong type for socket";
-#endif
-#ifdef ERANGE
-	case ERANGE: return "math result unrepresentable";
-#endif
-#if defined(EREFUSED) && (!defined(ECONNREFUSED) || (EREFUSED != ECONNREFUSED))
-	case EREFUSED: return "EREFUSED";
-#endif
-#ifdef EREMCHG
-	case EREMCHG: return "remote address changed";
-#endif
-#ifdef EREMDEV
-	case EREMDEV: return "remote device";
-#endif
-#ifdef EREMOTE
-	case EREMOTE: return "pathname hit remote file system";
-#endif
-#ifdef EREMOTEIO
-	case EREMOTEIO: return "remote i/o error";
-#endif
-#ifdef EREMOTERELEASE
-	case EREMOTERELEASE: return "EREMOTERELEASE";
-#endif
-#ifdef EROFS
-	case EROFS: return "read-only file system";
-#endif
-#ifdef ERPCMISMATCH
-	case ERPCMISMATCH: return "RPC version is wrong";
-#endif
-#ifdef ERREMOTE
-	case ERREMOTE: return "object is remote";
-#endif
-#ifdef ESHUTDOWN
-	case ESHUTDOWN: return "can't send afer socket shutdown";
-#endif
-#ifdef ESOCKTNOSUPPORT
-	case ESOCKTNOSUPPORT: return "socket type not supported";
-#endif
-#ifdef ESPIPE
-	case ESPIPE: return "invalid seek";
-#endif
-#ifdef ESRCH
-	case ESRCH: return "no such process";
-#endif
-#ifdef ESRMNT
-	case ESRMNT: return "srmount error";
-#endif
-#ifdef ESTALE
-	case ESTALE: return "stale remote file handle";
-#endif
-#ifdef ESUCCESS
-	case ESUCCESS: return "Error 0";
-#endif
-#if defined(ETIME) && (!defined(ELOOP) || (ETIME != ELOOP))
-	case ETIME: return "timer expired";
-#endif
-#if defined(ETIMEDOUT) && (!defined(ENOSTR) || (ETIMEDOUT != ENOSTR))
-	case ETIMEDOUT: return "connection timed out";
-#endif
-#ifdef ETOOMANYREFS
-	case ETOOMANYREFS: return "too many references: can't splice";
-#endif
-#ifdef ETXTBSY
-	case ETXTBSY: return "text file or pseudo-device busy";
-#endif
-#ifdef EUCLEAN
-	case EUCLEAN: return "structure needs cleaning";
-#endif
-#ifdef EUNATCH
-	case EUNATCH: return "protocol driver not attached";
-#endif
-#ifdef EUSERS
-	case EUSERS: return "too many users";
-#endif
-#ifdef EVERSION
-	case EVERSION: return "version mismatch";
-#endif
-#if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-	case EWOULDBLOCK: return "operation would block";
-#endif
-#ifdef EXDEV
-	case EXDEV: return "cross-domain link";
-#endif
-#ifdef EXFULL
-	case EXFULL: return "message tables full";
-#endif
-	default:
-#ifdef NO_STRERROR
-	    return "unknown POSIX error";
-#else
-	    return strerror(errno);
-#endif
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SignalId --
- *
- *	Return a textual identifier for a signal number.
- *
- * Results:
- *	This procedure returns a machine-readable textual identifier
- *	that corresponds to sig.  The identifier is the same as the
- *	#define name in signal.h.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_SignalId(sig)
-    int sig;			/* Number of signal. */
-{
-    switch (sig) {
-#ifdef SIGABRT
-	case SIGABRT: return "SIGABRT";
-#endif
-#ifdef SIGALRM
-	case SIGALRM: return "SIGALRM";
-#endif
-#ifdef SIGBUS
-	case SIGBUS: return "SIGBUS";
-#endif
-#ifdef SIGCHLD
-	case SIGCHLD: return "SIGCHLD";
-#endif
-#if defined(SIGCLD) && (!defined(SIGCHLD) || (SIGCLD != SIGCHLD))
-	case SIGCLD: return "SIGCLD";
-#endif
-#ifdef SIGCONT
-	case SIGCONT: return "SIGCONT";
-#endif
-#if defined(SIGEMT) && (!defined(SIGXCPU) || (SIGEMT != SIGXCPU))
-	case SIGEMT: return "SIGEMT";
-#endif
-#ifdef SIGFPE
-	case SIGFPE: return "SIGFPE";
-#endif
-#ifdef SIGHUP
-	case SIGHUP: return "SIGHUP";
-#endif
-#ifdef SIGILL
-	case SIGILL: return "SIGILL";
-#endif
-#ifdef SIGINT
-	case SIGINT: return "SIGINT";
-#endif
-#ifdef SIGIO
-	case SIGIO: return "SIGIO";
-#endif
-#if defined(SIGIOT) && (!defined(SIGABRT) || (SIGIOT != SIGABRT))
-	case SIGIOT: return "SIGIOT";
-#endif
-#ifdef SIGKILL
-	case SIGKILL: return "SIGKILL";
-#endif
-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGURG) || (SIGLOST != SIGURG)) && (!defined(SIGPROF) || (SIGLOST != SIGPROF)) && (!defined(SIGIO) || (SIGLOST != SIGIO))
-	case SIGLOST: return "SIGLOST";
-#endif
-#ifdef SIGPIPE
-	case SIGPIPE: return "SIGPIPE";
-#endif
-#if defined(SIGPOLL) && (!defined(SIGIO) || (SIGPOLL != SIGIO))
-	case SIGPOLL: return "SIGPOLL";
-#endif
-#ifdef SIGPROF
-	case SIGPROF: return "SIGPROF";
-#endif
-#if defined(SIGPWR) && (!defined(SIGXFSZ) || (SIGPWR != SIGXFSZ))
-	case SIGPWR: return "SIGPWR";
-#endif
-#ifdef SIGQUIT
-	case SIGQUIT: return "SIGQUIT";
-#endif
-#ifdef SIGSEGV
-	case SIGSEGV: return "SIGSEGV";
-#endif
-#ifdef SIGSTOP
-	case SIGSTOP: return "SIGSTOP";
-#endif
-#ifdef SIGSYS
-	case SIGSYS: return "SIGSYS";
-#endif
-#ifdef SIGTERM
-	case SIGTERM: return "SIGTERM";
-#endif
-#ifdef SIGTRAP
-	case SIGTRAP: return "SIGTRAP";
-#endif
-#ifdef SIGTSTP
-	case SIGTSTP: return "SIGTSTP";
-#endif
-#ifdef SIGTTIN
-	case SIGTTIN: return "SIGTTIN";
-#endif
-#ifdef SIGTTOU
-	case SIGTTOU: return "SIGTTOU";
-#endif
-#if defined(SIGURG) && (!defined(SIGIO) || (SIGURG != SIGIO))
-	case SIGURG: return "SIGURG";
-#endif
-#if defined(SIGUSR1) && (!defined(SIGIO) || (SIGUSR1 != SIGIO))
-	case SIGUSR1: return "SIGUSR1";
-#endif
-#if defined(SIGUSR2) && (!defined(SIGURG) || (SIGUSR2 != SIGURG))
-	case SIGUSR2: return "SIGUSR2";
-#endif
-#ifdef SIGVTALRM
-	case SIGVTALRM: return "SIGVTALRM";
-#endif
-#ifdef SIGWINCH
-	case SIGWINCH: return "SIGWINCH";
-#endif
-#ifdef SIGXCPU
-	case SIGXCPU: return "SIGXCPU";
-#endif
-#ifdef SIGXFSZ
-	case SIGXFSZ: return "SIGXFSZ";
-#endif
-    }
-    return "unknown signal";
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SignalMsg --
- *
- *	Return a human-readable message describing a signal.
- *
- * Results:
- *	This procedure returns a string describing sig that should
- *	make sense to a human.  It may not be easy for a machine
- *	to parse.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_SignalMsg(sig)
-    int sig;			/* Number of signal. */
-{
-    switch (sig) {
-#ifdef SIGABRT
-	case SIGABRT: return "SIGABRT";
-#endif
-#ifdef SIGALRM
-	case SIGALRM: return "alarm clock";
-#endif
-#ifdef SIGBUS
-	case SIGBUS: return "bus error";
-#endif
-#ifdef SIGCHLD
-	case SIGCHLD: return "child status changed";
-#endif
-#if defined(SIGCLD) && (!defined(SIGCHLD) || (SIGCLD != SIGCHLD))
-	case SIGCLD: return "child status changed";
-#endif
-#ifdef SIGCONT
-	case SIGCONT: return "continue after stop";
-#endif
-#if defined(SIGEMT) && (!defined(SIGXCPU) || (SIGEMT != SIGXCPU))
-	case SIGEMT: return "EMT instruction";
-#endif
-#ifdef SIGFPE
-	case SIGFPE: return "floating-point exception";
-#endif
-#ifdef SIGHUP
-	case SIGHUP: return "hangup";
-#endif
-#ifdef SIGILL
-	case SIGILL: return "illegal instruction";
-#endif
-#ifdef SIGINT
-	case SIGINT: return "interrupt";
-#endif
-#ifdef SIGIO
-	case SIGIO: return "input/output possible on file";
-#endif
-#if defined(SIGIOT) && (!defined(SIGABRT) || (SIGABRT != SIGIOT))
-	case SIGIOT: return "IOT instruction";
-#endif
-#ifdef SIGKILL
-	case SIGKILL: return "kill signal";
-#endif
-#if defined(SIGLOST) && (!defined(SIGIOT) || (SIGLOST != SIGIOT)) && (!defined(SIGURG) || (SIGLOST != SIGURG)) && (!defined(SIGPROF) || (SIGLOST != SIGPROF)) && (!defined(SIGIO) || (SIGLOST != SIGIO))
-	case SIGLOST: return "resource lost";
-#endif
-#ifdef SIGPIPE
-	case SIGPIPE: return "write on pipe with no readers";
-#endif
-#if defined(SIGPOLL) && (!defined(SIGIO) || (SIGPOLL != SIGIO))
-	case SIGPOLL: return "input/output possible on file";
-#endif
-#ifdef SIGPROF
-	case SIGPROF: return "profiling alarm";
-#endif
-#if defined(SIGPWR) && (!defined(SIGXFSZ) || (SIGPWR != SIGXFSZ))
-	case SIGPWR: return "power-fail restart";
-#endif
-#ifdef SIGQUIT
-	case SIGQUIT: return "quit signal";
-#endif
-#ifdef SIGSEGV
-	case SIGSEGV: return "segmentation violation";
-#endif
-#ifdef SIGSTOP
-	case SIGSTOP: return "stop";
-#endif
-#ifdef SIGSYS
-	case SIGSYS: return "bad argument to system call";
-#endif
-#ifdef SIGTERM
-	case SIGTERM: return "software termination signal";
-#endif
-#ifdef SIGTRAP
-	case SIGTRAP: return "trace trap";
-#endif
-#ifdef SIGTSTP
-	case SIGTSTP: return "stop signal from tty";
-#endif
-#ifdef SIGTTIN
-	case SIGTTIN: return "background tty read";
-#endif
-#ifdef SIGTTOU
-	case SIGTTOU: return "background tty write";
-#endif
-#if defined(SIGURG) && (!defined(SIGIO) || (SIGURG != SIGIO))
-	case SIGURG: return "urgent I/O condition";
-#endif
-#if defined(SIGUSR1) && (!defined(SIGIO) || (SIGUSR1 != SIGIO))
-	case SIGUSR1: return "user-defined signal 1";
-#endif
-#if defined(SIGUSR2) && (!defined(SIGURG) || (SIGUSR2 != SIGURG))
-	case SIGUSR2: return "user-defined signal 2";
-#endif
-#ifdef SIGVTALRM
-	case SIGVTALRM: return "virtual time alarm";
-#endif
-#ifdef SIGWINCH
-	case SIGWINCH: return "window changed";
-#endif
-#ifdef SIGXCPU
-	case SIGXCPU: return "exceeded CPU time limit";
-#endif
-#ifdef SIGXFSZ
-	case SIGXFSZ: return "exceeded file size limit";
-#endif
-    }
-    return "unknown signal";
-}
diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c
deleted file mode 100644
index 50dfb02..0000000
--- a/generic/tclPreserve.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/* 
- * tclPreserve.c --
- *
- *	This file contains a collection of procedures that are used
- *	to make sure that widget records and other data structures
- *	aren't reallocated when there are nested procedures that
- *	depend on their existence.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclPreserve.c,v 1.3 1999/04/16 00:46:52 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * The following data structure is used to keep track of all the
- * Tcl_Preserve calls that are still in effect.  It grows as needed
- * to accommodate any number of calls in effect.
- */
-
-typedef struct {
-    ClientData clientData;	/* Address of preserved block. */
-    int refCount;		/* Number of Tcl_Preserve calls in effect
-				 * for block. */
-    int mustFree;		/* Non-zero means Tcl_EventuallyFree was
-				 * called while a Tcl_Preserve call was in
-				 * effect, so the structure must be freed
-				 * when refCount becomes zero. */
-    Tcl_FreeProc *freeProc;	/* Procedure to call to free. */
-} Reference;
-
-static Reference *refArray;	/* First in array of references. */
-static int spaceAvl = 0;	/* Total number of structures available
-				 * at *firstRefPtr. */
-static int inUse = 0;		/* Count of structures currently in use
-				 * in refArray. */
-#define INITIAL_SIZE 2
-TCL_DECLARE_MUTEX(preserveMutex)/* To protect the above statics */
-
-/*
- * The following data structure is used to keep track of whether an
- * arbitrary block of memory has been deleted.  This is used by the
- * TclHandle code to avoid the more time-expensive algorithm of
- * Tcl_Preserve().  This mechanism is mainly used when we have lots of
- * references to a few big, expensive objects that we don't want to live
- * any longer than necessary.
- */
-
-typedef struct HandleStruct {
-    VOID *ptr;			/* Pointer to the memory block being
-				 * tracked.  This field will become NULL when
-				 * the memory block is deleted.  This field
-				 * must be the first in the structure. */
-#ifdef TCL_MEM_DEBUG
-    VOID *ptr2;			/* Backup copy of the abpve pointer used to
-				 * ensure that the contents of the handle are
-				 * not changed by anyone else. */
-#endif
-    int refCount;		/* Number of TclHandlePreserve() calls in
-				 * effect on this handle. */
-} HandleStruct;
-
-
-/*
- * Static routines in this file:
- */
-
-static void	PreserveExitProc _ANSI_ARGS_((ClientData clientData));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * PreserveExitProc --
- *
- *	Called during exit processing to clean up the reference array.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees the storage of the reference array.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static void
-PreserveExitProc(clientData)
-    ClientData clientData;		/* NULL -Unused. */
-{
-    Tcl_MutexLock(&preserveMutex);
-    if (spaceAvl != 0) {
-        ckfree((char *) refArray);
-        refArray = (Reference *) NULL;
-        inUse = 0;
-        spaceAvl = 0;
-    }
-    Tcl_MutexUnlock(&preserveMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Preserve --
- *
- *	This procedure is used by a procedure to declare its interest
- *	in a particular block of memory, so that the block will not be
- *	reallocated until a matching call to Tcl_Release has been made.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Information is retained so that the block of memory will
- *	not be freed until at least the matching call to Tcl_Release.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Preserve(clientData)
-    ClientData clientData;	/* Pointer to malloc'ed block of memory. */
-{
-    Reference *refPtr;
-    int i;
-
-    /*
-     * See if there is already a reference for this pointer.  If so,
-     * just increment its reference count.
-     */
-
-    Tcl_MutexLock(&preserveMutex);
-    for (i = 0, refPtr = refArray; i < inUse; i++, refPtr++) {
-	if (refPtr->clientData == clientData) {
-	    refPtr->refCount++;
-	    Tcl_MutexUnlock(&preserveMutex);
-	    return;
-	}
-    }
-
-    /*
-     * Make a reference array if it doesn't already exist, or make it
-     * bigger if it is full.
-     */
-
-    if (inUse == spaceAvl) {
-	if (spaceAvl == 0) {
-            Tcl_CreateExitHandler((Tcl_ExitProc *) PreserveExitProc,
-                    (ClientData) NULL);
-	    refArray = (Reference *) ckalloc((unsigned)
-		    (INITIAL_SIZE*sizeof(Reference)));
-	    spaceAvl = INITIAL_SIZE;
-	} else {
-	    Reference *new;
-
-	    new = (Reference *) ckalloc((unsigned)
-		    (2*spaceAvl*sizeof(Reference)));
-	    memcpy((VOID *) new, (VOID *) refArray,
-                    spaceAvl*sizeof(Reference));
-	    ckfree((char *) refArray);
-	    refArray = new;
-	    spaceAvl *= 2;
-	}
-    }
-
-    /*
-     * Make a new entry for the new reference.
-     */
-
-    refPtr = &refArray[inUse];
-    refPtr->clientData = clientData;
-    refPtr->refCount = 1;
-    refPtr->mustFree = 0;
-    refPtr->freeProc = TCL_STATIC;
-    inUse += 1;
-    Tcl_MutexUnlock(&preserveMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Release --
- *
- *	This procedure is called to cancel a previous call to
- *	Tcl_Preserve, thereby allowing a block of memory to be
- *	freed (if no one else cares about it).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If Tcl_EventuallyFree has been called for clientData, and if
- *	no other call to Tcl_Preserve is still in effect, the block of
- *	memory is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Release(clientData)
-    ClientData clientData;	/* Pointer to malloc'ed block of memory. */
-{
-    Reference *refPtr;
-    int mustFree;
-    Tcl_FreeProc *freeProc;
-    int i;
-
-    Tcl_MutexLock(&preserveMutex);
-    for (i = 0, refPtr = refArray; i < inUse; i++, refPtr++) {
-	if (refPtr->clientData != clientData) {
-	    continue;
-	}
-	refPtr->refCount--;
-	if (refPtr->refCount == 0) {
-
-            /*
-             * Must remove information from the slot before calling freeProc
-             * to avoid reentrancy problems if the freeProc calls Tcl_Preserve
-             * on the same clientData. Copy down the last reference in the
-             * array to overwrite the current slot.
-             */
-
-            freeProc = refPtr->freeProc;
-            mustFree = refPtr->mustFree;
-	    inUse--;
-	    if (i < inUse) {
-		refArray[i] = refArray[inUse];
-	    }
-	    if (mustFree) {
-		if ((freeProc == TCL_DYNAMIC) ||
-                        (freeProc == (Tcl_FreeProc *) free)) {
-		    ckfree((char *) clientData);
-		} else {
-		    Tcl_MutexUnlock(&preserveMutex);
-		    (*freeProc)((char *) clientData);
-		    return;
-		}
-	    }
-	}
-	Tcl_MutexUnlock(&preserveMutex);
-	return;
-    }
-    Tcl_MutexUnlock(&preserveMutex);
-
-    /*
-     * Reference not found.  This is a bug in the caller.
-     */
-
-    panic("Tcl_Release couldn't find reference for 0x%x", clientData);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EventuallyFree --
- *
- *	Free up a block of memory, unless a call to Tcl_Preserve is in
- *	effect for that block.  In this case, defer the free until all
- *	calls to Tcl_Preserve have been undone by matching calls to
- *	Tcl_Release.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Ptr may be released by calling free().
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_EventuallyFree(clientData, freeProc)
-    ClientData clientData;	/* Pointer to malloc'ed block of memory. */
-    Tcl_FreeProc *freeProc;	/* Procedure to actually do free. */
-{
-    Reference *refPtr;
-    int i;
-
-    /*
-     * See if there is a reference for this pointer.  If so, set its
-     * "mustFree" flag (the flag had better not be set already!).
-     */
-
-    Tcl_MutexLock(&preserveMutex);
-    for (i = 0, refPtr = refArray; i < inUse; i++, refPtr++) {
-	if (refPtr->clientData != clientData) {
-	    continue;
-	}
-	if (refPtr->mustFree) {
-	    panic("Tcl_EventuallyFree called twice for 0x%x\n", clientData);
-        }
-        refPtr->mustFree = 1;
-	refPtr->freeProc = freeProc;
-	Tcl_MutexUnlock(&preserveMutex);
-        return;
-    }
-    Tcl_MutexUnlock(&preserveMutex);
-
-    /*
-     * No reference for this block.  Free it now.
-     */
-
-    if ((freeProc == TCL_DYNAMIC)
-	    || (freeProc == (Tcl_FreeProc *) free)) {
-	ckfree((char *) clientData);
-    } else {
-	(*freeProc)((char *)clientData);
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclHandleCreate --
- *
- *	Allocate a handle that contains enough information to determine
- *	if an arbitrary malloc'd block has been deleted.  This is 
- *	used to avoid the more time-expensive algorithm of Tcl_Preserve().
- *
- * Results:
- *	The return value is a TclHandle that refers to the given malloc'd
- *	block.  Doubly dereferencing the returned handle will give
- *	back the pointer to the block, or will give NULL if the block has
- *	been deleted.
- *
- * Side effects:
- *	The caller must keep track of this handle (generally by storing
- *	it in a field in the malloc'd block) and call TclHandleFree()
- *	on this handle when the block is deleted.  Everything else that
- *	wishes to keep track of whether the malloc'd block has been deleted
- *	should use calls to TclHandlePreserve() and TclHandleRelease()
- *	on the associated handle.
- *
- *---------------------------------------------------------------------------
- */
-
-TclHandle
-TclHandleCreate(ptr)
-    VOID *ptr;			/* Pointer to an arbitrary block of memory
-				 * to be tracked for deletion.  Must not be
-				 * NULL. */
-{
-    HandleStruct *handlePtr;
-
-    handlePtr = (HandleStruct *) ckalloc(sizeof(HandleStruct));
-    handlePtr->ptr = ptr;
-#ifdef TCL_MEM_DEBUG
-    handlePtr->ptr2 = ptr;
-#endif
-    handlePtr->refCount = 0;
-    return (TclHandle) handlePtr;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclHandleFree --
- *
- *	Called when the arbitrary malloc'd block associated with the
- *	handle is being deleted.  Modifies the handle so that doubly
- *	dereferencing it will give NULL.  This informs any user of the
- *	handle that the block of memory formerly referenced by the
- *	handle has been freed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If nothing is referring to the handle, the handle will be reclaimed.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclHandleFree(handle)
-    TclHandle handle;		/* Previously created handle associated
-				 * with a malloc'd block that is being
-				 * deleted.  The handle is modified so that
-				 * doubly dereferencing it will give NULL. */
-{
-    HandleStruct *handlePtr;
-
-    handlePtr = (HandleStruct *) handle;
-#ifdef TCL_MEM_DEBUG
-    if (handlePtr->refCount == 0x61616161) {
-	panic("using previously disposed TclHandle %x", handlePtr);
-    }
-    if (handlePtr->ptr2 != handlePtr->ptr) {
-	panic("someone has changed the block referenced by the handle %x\nfrom %x to %x",
-		handlePtr, handlePtr->ptr2, handlePtr->ptr);
-    }
-#endif
-    handlePtr->ptr = NULL;
-    if (handlePtr->refCount == 0) {
-	ckfree((char *) handlePtr);
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclHandlePreserve --
- *
- *	Declare an interest in the arbitrary malloc'd block associated
- *	with the handle.  
- *
- * Results:
- *	The return value is the handle argument, with its ref count
- *	incremented.
- *
- * Side effects:
- *	For each call to TclHandlePreserve(), there should be a matching
- *	call to TclHandleRelease() when the caller is no longer interested
- *	in the malloc'd block associated with the handle.
- *
- *---------------------------------------------------------------------------
- */
-
-TclHandle
-TclHandlePreserve(handle)
-    TclHandle handle;		/* Declare an interest in the block of
-				 * memory referenced by this handle. */
-{
-    HandleStruct *handlePtr;
-
-    handlePtr = (HandleStruct *) handle;
-#ifdef TCL_MEM_DEBUG
-    if (handlePtr->refCount == 0x61616161) {
-	panic("using previously disposed TclHandle %x", handlePtr);
-    }
-    if ((handlePtr->ptr != NULL)
-	    && (handlePtr->ptr != handlePtr->ptr2)) {
-	panic("someone has changed the block referenced by the handle %x\nfrom %x to %x",
-		handlePtr, handlePtr->ptr2, handlePtr->ptr);
-    }
-#endif
-    handlePtr->refCount++;
-
-    return handle;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclHandleRelease --
- *
- *	This procedure is called to release an interest in the malloc'd
- *	block associated with the handle.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The ref count of the handle is decremented.  If the malloc'd block
- *	has been freed and if no one is using the handle any more, the
- *	handle will be reclaimed.
- *
- *---------------------------------------------------------------------------
- */
- 
-void
-TclHandleRelease(handle)
-    TclHandle handle;		/* Unregister interest in the block of
-				 * memory referenced by this handle. */
-{
-    HandleStruct *handlePtr;
-
-    handlePtr = (HandleStruct *) handle;
-#ifdef TCL_MEM_DEBUG
-    if (handlePtr->refCount == 0x61616161) {
-	panic("using previously disposed TclHandle %x", handlePtr);
-    }
-    if ((handlePtr->ptr != NULL)
-	    && (handlePtr->ptr != handlePtr->ptr2)) {
-	panic("someone has changed the block referenced by the handle %x\nfrom %x to %x",
-		handlePtr, handlePtr->ptr2, handlePtr->ptr);
-    }
-#endif
-    handlePtr->refCount--;
-    if ((handlePtr->refCount == 0) && (handlePtr->ptr == NULL)) {
-	ckfree((char *) handlePtr);
-    }
-}
-    
diff --git a/generic/tclProc.c b/generic/tclProc.c
deleted file mode 100644
index 3609d16..0000000
--- a/generic/tclProc.c
+++ /dev/null
@@ -1,1557 +0,0 @@
-/* 
- * tclProc.c --
- *
- *	This file contains routines that implement Tcl procedures,
- *	including the "proc" and "uplevel" commands.
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclProc.c,v 1.19 1999/04/16 00:46:52 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclCompile.h"
-
-/*
- * Prototypes for static functions in this file
- */
-
-static void	ProcBodyDup _ANSI_ARGS_((Tcl_Obj *srcPtr, Tcl_Obj *dupPtr));
-static void	ProcBodyFree _ANSI_ARGS_((Tcl_Obj *objPtr));
-static int	ProcBodySetFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-		Tcl_Obj *objPtr));
-static void	ProcBodyUpdateString _ANSI_ARGS_((Tcl_Obj *objPtr));
-static  int	ProcessProcResultCode _ANSI_ARGS_((Tcl_Interp *interp,
-		    char *procName, int nameLen, int returnCode));
-
-/*
- * The ProcBodyObjType type
- */
-
-Tcl_ObjType tclProcBodyType = {
-    "procbody",			/* name for this type */
-    ProcBodyFree,		/* FreeInternalRep procedure */
-    ProcBodyDup,		/* DupInternalRep procedure */
-    ProcBodyUpdateString,	/* UpdateString procedure */
-    ProcBodySetFromAny		/* SetFromAny procedure */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ProcObjCmd --
- *
- *	This object-based procedure is invoked to process the "proc" Tcl 
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	A new procedure gets created.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ProcObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    Proc *procPtr;
-    char *fullName, *procName;
-    Namespace *nsPtr, *altNsPtr, *cxtNsPtr;
-    Tcl_Command cmd;
-    Tcl_DString ds;
-
-    if (objc != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "name args body");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Determine the namespace where the procedure should reside. Unless
-     * the command name includes namespace qualifiers, this will be the
-     * current namespace.
-     */
-    
-    fullName = TclGetString(objv[1]);
-    TclGetNamespaceForQualName(interp, fullName, (Namespace *) NULL,
-	    0, &nsPtr, &altNsPtr, &cxtNsPtr, &procName);
-
-    if (nsPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"can't create procedure \"", fullName,
-		"\": unknown namespace", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (procName == NULL) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"can't create procedure \"", fullName,
-		"\": bad procedure name", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if ((nsPtr != iPtr->globalNsPtr)
-	    && (procName != NULL) && (procName[0] == ':')) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"can't create procedure \"", procName,
-		"\" in non-global namespace with name starting with \":\"",
-	        (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Create the data structure to represent the procedure.
-     */
-    if (TclCreateProc(interp, nsPtr, procName, objv[2], objv[3],
-        &procPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-
-    /*
-     * Now create a command for the procedure. This will initially be in
-     * the current namespace unless the procedure's name included namespace
-     * qualifiers. To create the new command in the right namespace, we
-     * generate a fully qualified name for it.
-     */
-
-    Tcl_DStringInit(&ds);
-    if (nsPtr != iPtr->globalNsPtr) {
-	Tcl_DStringAppend(&ds, nsPtr->fullName, -1);
-	Tcl_DStringAppend(&ds, "::", 2);
-    }
-    Tcl_DStringAppend(&ds, procName, -1);
-    
-    Tcl_CreateCommand(interp, Tcl_DStringValue(&ds), TclProcInterpProc,
-	    (ClientData) procPtr, TclProcDeleteProc);
-    cmd = Tcl_CreateObjCommand(interp, Tcl_DStringValue(&ds),
-	    TclObjInterpProc, (ClientData) procPtr, TclProcDeleteProc);
-
-    /*
-     * Now initialize the new procedure's cmdPtr field. This will be used
-     * later when the procedure is called to determine what namespace the
-     * procedure will run in. This will be different than the current
-     * namespace if the proc was renamed into a different namespace.
-     */
-    
-    procPtr->cmdPtr = (Command *) cmd;
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreateProc --
- *
- *	Creates the data associated with a Tcl procedure definition.
- *	This procedure knows how to handle two types of body objects:
- *	strings and procbody. Strings are the traditional (and common) value
- *	for bodies, procbody are values created by extensions that have
- *	loaded a previously compiled script.
- *
- * Results:
- *	Returns TCL_OK on success, along with a pointer to a Tcl
- *	procedure definition in procPtrPtr.  This definition should
- *	be freed by calling TclCleanupProc() when it is no longer
- *	needed.  Returns TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	If anything goes wrong, this procedure returns an error
- *	message in the interpreter.
- *
- *----------------------------------------------------------------------
- */
-int
-TclCreateProc(interp, nsPtr, procName, argsPtr, bodyPtr, procPtrPtr)
-    Tcl_Interp *interp;         /* interpreter containing proc */
-    Namespace *nsPtr;           /* namespace containing this proc */
-    char *procName;             /* unqualified name of this proc */
-    Tcl_Obj *argsPtr;           /* description of arguments */
-    Tcl_Obj *bodyPtr;           /* command body */
-    Proc **procPtrPtr;          /* returns:  pointer to proc data */
-{
-    Interp *iPtr = (Interp*)interp;
-    char **argArray = NULL;
-
-    register Proc *procPtr;
-    int i, length, result, numArgs;
-    char *args, *bytes, *p;
-    register CompiledLocal *localPtr = NULL;
-    Tcl_Obj *defPtr;
-    int precompiled = 0;
-    
-    if (bodyPtr->typePtr == &tclProcBodyType) {
-        /*
-         * Because the body is a TclProProcBody, the actual body is already
-         * compiled, and it is not shared with anyone else, so it's OK not to
-         * unshare it (as a matter of fact, it is bad to unshare it, because
-         * there may be no source code).
-         *
-         * We don't create and initialize a Proc structure for the procedure;
-         * rather, we use what is in the body object. Note that
-         * we initialize its cmdPtr field below after we've created the command
-         * for the procedure. We increment the ref count of the Proc struct
-         * since the command (soon to be created) will be holding a reference
-         * to it.
-         */
-    
-        procPtr = (Proc *) bodyPtr->internalRep.otherValuePtr;
-        procPtr->iPtr = iPtr;
-        procPtr->refCount++;
-        precompiled = 1;
-    } else {
-        /*
-         * If the procedure's body object is shared because its string value is
-         * identical to, e.g., the body of another procedure, we must create a
-         * private copy for this procedure to use. Such sharing of procedure
-         * bodies is rare but can cause problems. A procedure body is compiled
-         * in a context that includes the number of compiler-allocated "slots"
-         * for local variables. Each formal parameter is given a local variable
-         * slot (the "procPtr->numCompiledLocals = numArgs" assignment
-         * below). This means that the same code can not be shared by two
-         * procedures that have a different number of arguments, even if their
-         * bodies are identical. Note that we don't use Tcl_DuplicateObj since
-         * we would not want any bytecode internal representation.
-         */
-
-        if (Tcl_IsShared(bodyPtr)) {
-            bytes = Tcl_GetStringFromObj(bodyPtr, &length);
-            bodyPtr = Tcl_NewStringObj(bytes, length);
-        }
-
-        /*
-         * Create and initialize a Proc structure for the procedure. Note that
-         * we initialize its cmdPtr field below after we've created the command
-         * for the procedure. We increment the ref count of the procedure's
-         * body object since there will be a reference to it in the Proc
-         * structure.
-         */
-    
-        Tcl_IncrRefCount(bodyPtr);
-
-        procPtr = (Proc *) ckalloc(sizeof(Proc));
-        procPtr->iPtr = iPtr;
-        procPtr->refCount = 1;
-        procPtr->bodyPtr = bodyPtr;
-        procPtr->numArgs  = 0;	/* actual argument count is set below. */
-        procPtr->numCompiledLocals = 0;
-        procPtr->firstLocalPtr = NULL;
-        procPtr->lastLocalPtr = NULL;
-    }
-    
-    /*
-     * Break up the argument list into argument specifiers, then process
-     * each argument specifier.
-     * If the body is precompiled, processing is limited to checking that
-     * the the parsed argument is consistent with the one stored in the
-     * Proc.
-     * THIS FAILS IF THE ARG LIST OBJECT'S STRING REP CONTAINS NULLS.
-     */
-
-    args = Tcl_GetStringFromObj(argsPtr, &length);
-    result = Tcl_SplitList(interp, args, &numArgs, &argArray);
-    if (result != TCL_OK) {
-        goto procError;
-    }
-
-    if (precompiled) {
-        if (numArgs > procPtr->numArgs) {
-            char buf[128];
-            sprintf(buf, "\": arg list contains %d entries, precompiled header expects %d",
-                    numArgs, procPtr->numArgs);
-            Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "procedure \"", procName,
-                    buf, (char *) NULL);
-            goto procError;
-        }
-        localPtr = procPtr->firstLocalPtr;
-    } else {
-        procPtr->numArgs = numArgs;
-        procPtr->numCompiledLocals = numArgs;
-    }
-    for (i = 0;  i < numArgs;  i++) {
-        int fieldCount, nameLength, valueLength;
-        char **fieldValues;
-
-        /*
-         * Now divide the specifier up into name and default.
-         */
-
-        result = Tcl_SplitList(interp, argArray[i], &fieldCount,
-                &fieldValues);
-        if (result != TCL_OK) {
-            goto procError;
-        }
-        if (fieldCount > 2) {
-            ckfree((char *) fieldValues);
-            Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "too many fields in argument specifier \"",
-                    argArray[i], "\"", (char *) NULL);
-            goto procError;
-        }
-        if ((fieldCount == 0) || (*fieldValues[0] == 0)) {
-            ckfree((char *) fieldValues);
-            Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                    "procedure \"", procName,
-                    "\" has argument with no name", (char *) NULL);
-            goto procError;
-        }
-	
-        nameLength = strlen(fieldValues[0]);
-        if (fieldCount == 2) {
-            valueLength = strlen(fieldValues[1]);
-        } else {
-            valueLength = 0;
-        }
-
-        /*
-         * Check that the formal parameter name is a scalar.
-         */
-
-        p = fieldValues[0];
-        while (*p != '\0') {
-            if (*p == '(') {
-                char *q = p;
-                do {
-		    q++;
-		} while (*q != '\0');
-		q--;
-		if (*q == ')') { /* we have an array element */
-		    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		            "procedure \"", procName,
-		            "\" has formal parameter \"", fieldValues[0],
-			    "\" that is an array element",
-			    (char *) NULL);
-		    ckfree((char *) fieldValues);
-		    goto procError;
-		}
-	    }
-	    p++;
-	}
-
-        if (precompiled) {
-            /*
-             * compare the parsed argument with the stored one
-             */
-
-            if ((localPtr->nameLength != nameLength)
-                    || (strcmp(localPtr->name, fieldValues[0]))
-                    || (localPtr->frameIndex != i)
-                    || (localPtr->flags != (VAR_SCALAR | VAR_ARGUMENT))
-                    || ((localPtr->defValuePtr == NULL)
-                            && (fieldCount == 2))
-                    || ((localPtr->defValuePtr != NULL)
-                            && (fieldCount != 2))) {
-                char buf[128];
-                sprintf(buf, "\": formal parameter %d is inconsistent with precompiled body",
-                        i);
-                Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                        "procedure \"", procName,
-                        buf, (char *) NULL);
-                ckfree((char *) fieldValues);
-                goto procError;
-            }
-
-            /*
-             * compare the default value if any
-             */
-
-            if (localPtr->defValuePtr != NULL) {
-                int tmpLength;
-                char *tmpPtr = Tcl_GetStringFromObj(localPtr->defValuePtr,
-                        &tmpLength);
-                if ((valueLength != tmpLength)
-                        || (strncmp(fieldValues[1], tmpPtr,
-                                (size_t) tmpLength))) {
-                    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-                            "procedure \"", procName,
-                            "\": formal parameter \"",
-                            fieldValues[0],
-                            "\" has default value inconsistent with precompiled body",
-                            (char *) NULL);
-                    ckfree((char *) fieldValues);
-                    goto procError;
-                }
-            }
-
-            localPtr = localPtr->nextPtr;
-        } else {
-            /*
-             * Allocate an entry in the runtime procedure frame's array of
-             * local variables for the argument. 
-             */
-
-            localPtr = (CompiledLocal *) ckalloc((unsigned) 
-                    (sizeof(CompiledLocal) - sizeof(localPtr->name)
-                            + nameLength+1));
-            if (procPtr->firstLocalPtr == NULL) {
-                procPtr->firstLocalPtr = procPtr->lastLocalPtr = localPtr;
-            } else {
-                procPtr->lastLocalPtr->nextPtr = localPtr;
-                procPtr->lastLocalPtr = localPtr;
-            }
-            localPtr->nextPtr = NULL;
-            localPtr->nameLength = nameLength;
-            localPtr->frameIndex = i;
-            localPtr->flags = VAR_SCALAR | VAR_ARGUMENT;
-            localPtr->resolveInfo = NULL;
-	
-            if (fieldCount == 2) {
-                localPtr->defValuePtr =
-		    Tcl_NewStringObj(fieldValues[1], valueLength);
-                Tcl_IncrRefCount(localPtr->defValuePtr);
-            } else {
-                localPtr->defValuePtr = NULL;
-            }
-            strcpy(localPtr->name, fieldValues[0]);
-	}
-
-        ckfree((char *) fieldValues);
-    }
-
-    /*
-     * Now initialize the new procedure's cmdPtr field. This will be used
-     * later when the procedure is called to determine what namespace the
-     * procedure will run in. This will be different than the current
-     * namespace if the proc was renamed into a different namespace.
-     */
-    
-    *procPtrPtr = procPtr;
-    ckfree((char *) argArray);
-    return TCL_OK;
-
-procError:
-    if (precompiled) {
-        procPtr->refCount--;
-    } else {
-        Tcl_DecrRefCount(bodyPtr);
-        while (procPtr->firstLocalPtr != NULL) {
-            localPtr = procPtr->firstLocalPtr;
-            procPtr->firstLocalPtr = localPtr->nextPtr;
-	
-            defPtr = localPtr->defValuePtr;
-            if (defPtr != NULL) {
-                Tcl_DecrRefCount(defPtr);
-            }
-	
-            ckfree((char *) localPtr);
-        }
-        ckfree((char *) procPtr);
-    }
-    if (argArray != NULL) {
-	ckfree((char *) argArray);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetFrame --
- *
- *	Given a description of a procedure frame, such as the first
- *	argument to an "uplevel" or "upvar" command, locate the
- *	call frame for the appropriate level of procedure.
- *
- * Results:
- *	The return value is -1 if an error occurred in finding the frame
- *	(in this case an error message is left in the interp's result).
- *	1 is returned if string was either a number or a number preceded
- *	by "#" and it specified a valid frame.  0 is returned if string
- *	isn't one of the two things above (in this case, the lookup
- *	acts as if string were "1").  The variable pointed to by
- *	framePtrPtr is filled in with the address of the desired frame
- *	(unless an error occurs, in which case it isn't modified).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGetFrame(interp, string, framePtrPtr)
-    Tcl_Interp *interp;		/* Interpreter in which to find frame. */
-    char *string;		/* String describing frame. */
-    CallFrame **framePtrPtr;	/* Store pointer to frame here (or NULL
-				 * if global frame indicated). */
-{
-    register Interp *iPtr = (Interp *) interp;
-    int curLevel, level, result;
-    CallFrame *framePtr;
-
-    /*
-     * Parse string to figure out which level number to go to.
-     */
-
-    result = 1;
-    curLevel = (iPtr->varFramePtr == NULL) ? 0 : iPtr->varFramePtr->level;
-    if (*string == '#') {
-	if (Tcl_GetInt(interp, string+1, &level) != TCL_OK) {
-	    return -1;
-	}
-	if (level < 0) {
-	    levelError:
-	    Tcl_AppendResult(interp, "bad level \"", string, "\"",
-		    (char *) NULL);
-	    return -1;
-	}
-    } else if (isdigit(UCHAR(*string))) { /* INTL: digit */
-	if (Tcl_GetInt(interp, string, &level) != TCL_OK) {
-	    return -1;
-	}
-	level = curLevel - level;
-    } else {
-	level = curLevel - 1;
-	result = 0;
-    }
-
-    /*
-     * Figure out which frame to use, and modify the interpreter so
-     * its variables come from that frame.
-     */
-
-    if (level == 0) {
-	framePtr = NULL;
-    } else {
-	for (framePtr = iPtr->varFramePtr; framePtr != NULL;
-		framePtr = framePtr->callerVarPtr) {
-	    if (framePtr->level == level) {
-		break;
-	    }
-	}
-	if (framePtr == NULL) {
-	    goto levelError;
-	}
-    }
-    *framePtrPtr = framePtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UplevelObjCmd --
- *
- *	This object procedure is invoked to process the "uplevel" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_UplevelObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    char *optLevel;
-    int result;
-    CallFrame *savedVarFramePtr, *framePtr;
-
-    if (objc < 2) {
-	uplevelSyntax:
-	Tcl_WrongNumArgs(interp, 1, objv, "?level? command ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Find the level to use for executing the command.
-     */
-
-    optLevel = TclGetString(objv[1]);
-    result = TclGetFrame(interp, optLevel, &framePtr);
-    if (result == -1) {
-	return TCL_ERROR;
-    }
-    objc -= (result+1);
-    if (objc == 0) {
-	goto uplevelSyntax;
-    }
-    objv += (result+1);
-
-    /*
-     * Modify the interpreter state to execute in the given frame.
-     */
-
-    savedVarFramePtr = iPtr->varFramePtr;
-    iPtr->varFramePtr = framePtr;
-
-    /*
-     * Execute the residual arguments as a command.
-     */
-
-    if (objc == 1) {
-	result = Tcl_EvalObjEx(interp, objv[0], 0);
-    } else {
-	Tcl_Obj *objPtr;
-
-	objPtr = Tcl_ConcatObj(objc, objv);
-	result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_DIRECT);
-    }
-    if (result == TCL_ERROR) {
-	char msg[32 + TCL_INTEGER_SPACE];
-	sprintf(msg, "\n    (\"uplevel\" body line %d)", interp->errorLine);
-	Tcl_AddObjErrorInfo(interp, msg, -1);
-    }
-
-    /*
-     * Restore the variable frame, and return.
-     */
-
-    iPtr->varFramePtr = savedVarFramePtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFindProc --
- *
- *	Given the name of a procedure, return a pointer to the
- *	record describing the procedure. The procedure will be
- *	looked up using the usual rules: first in the current
- *	namespace and then in the global namespace.
- *
- * Results:
- *	NULL is returned if the name doesn't correspond to any
- *	procedure. Otherwise, the return value is a pointer to
- *	the procedure's record. If the name is found but refers
- *	to an imported command that points to a "real" procedure
- *	defined in another namespace, a pointer to that "real"
- *	procedure's structure is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Proc *
-TclFindProc(iPtr, procName)
-    Interp *iPtr;		/* Interpreter in which to look. */
-    char *procName;		/* Name of desired procedure. */
-{
-    Tcl_Command cmd;
-    Tcl_Command origCmd;
-    Command *cmdPtr;
-    
-    cmd = Tcl_FindCommand((Tcl_Interp *) iPtr, procName,
-            (Tcl_Namespace *) NULL, /*flags*/ 0);
-    if (cmd == (Tcl_Command) NULL) {
-        return NULL;
-    }
-    cmdPtr = (Command *) cmd;
-
-    origCmd = TclGetOriginalCommand(cmd);
-    if (origCmd != NULL) {
-	cmdPtr = (Command *) origCmd;
-    }
-    if (cmdPtr->proc != TclProcInterpProc) {
-	return NULL;
-    }
-    return (Proc *) cmdPtr->clientData;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclIsProc --
- *
- *	Tells whether a command is a Tcl procedure or not.
- *
- * Results:
- *	If the given command is actually a Tcl procedure, the
- *	return value is the address of the record describing
- *	the procedure.  Otherwise the return value is 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Proc *
-TclIsProc(cmdPtr)
-    Command *cmdPtr;		/* Command to test. */
-{
-    Tcl_Command origCmd;
-
-    origCmd = TclGetOriginalCommand((Tcl_Command) cmdPtr);
-    if (origCmd != NULL) {
-	cmdPtr = (Command *) origCmd;
-    }
-    if (cmdPtr->proc == TclProcInterpProc) {
-	return (Proc *) cmdPtr->clientData;
-    }
-    return (Proc *) 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcInterpProc --
- *
- *	When a Tcl procedure gets invoked with an argc/argv array of
- *	strings, this routine gets invoked to interpret the procedure.
- *
- * Results:
- *	A standard Tcl result value, usually TCL_OK.
- *
- * Side effects:
- *	Depends on the commands in the procedure.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclProcInterpProc(clientData, interp, argc, argv)
-    ClientData clientData;	/* Record describing procedure to be
-				 * interpreted. */
-    Tcl_Interp *interp;		/* Interpreter in which procedure was
-				 * invoked. */
-    int argc;			/* Count of number of arguments to this
-				 * procedure. */
-    register char **argv;	/* Argument values. */
-{
-    register Tcl_Obj *objPtr;
-    register int i;
-    int result;
-
-    /*
-     * This procedure generates an objv array for object arguments that hold
-     * the argv strings. It starts out with stack-allocated space but uses
-     * dynamically-allocated storage if needed.
-     */
-
-#define NUM_ARGS 20
-    Tcl_Obj *(objStorage[NUM_ARGS]);
-    register Tcl_Obj **objv = objStorage;
-
-    /*
-     * Create the object argument array "objv". Make sure objv is large
-     * enough to hold the objc arguments plus 1 extra for the zero
-     * end-of-objv word.
-     */
-
-    if ((argc + 1) > NUM_ARGS) {
-	objv = (Tcl_Obj **)
-	    ckalloc((unsigned)(argc + 1) * sizeof(Tcl_Obj *));
-    }
-
-    for (i = 0;  i < argc;  i++) {
-	objv[i] = Tcl_NewStringObj(argv[i], -1);
-	Tcl_IncrRefCount(objv[i]);
-    }
-    objv[argc] = 0;
-
-    /*
-     * Use TclObjInterpProc to actually interpret the procedure.
-     */
-
-    result = TclObjInterpProc(clientData, interp, argc, objv);
-
-    /*
-     * Move the interpreter's object result to the string result, 
-     * then reset the object result.
-     */
-    
-    Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	    TCL_VOLATILE);
-
-    /*
-     * Decrement the ref counts on the objv elements since we are done
-     * with them.
-     */
-
-    for (i = 0;  i < argc;  i++) {
-	objPtr = objv[i];
-	TclDecrRefCount(objPtr);
-    }
-    
-    /*
-     * Free the objv array if malloc'ed storage was used.
-     */
-
-    if (objv != objStorage) {
-	ckfree((char *) objv);
-    }
-    return result;
-#undef NUM_ARGS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclObjInterpProc --
- *
- *	When a Tcl procedure gets invoked during bytecode evaluation, this 
- *	object-based routine gets invoked to interpret the procedure.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	Depends on the commands in the procedure.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjInterpProc(clientData, interp, objc, objv)
-    ClientData clientData; 	 /* Record describing procedure to be
-				  * interpreted. */
-    register Tcl_Interp *interp; /* Interpreter in which procedure was
-				  * invoked. */
-    int objc;			 /* Count of number of arguments to this
-				  * procedure. */
-    Tcl_Obj *CONST objv[];	 /* Argument value objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Proc *procPtr = (Proc *) clientData;
-    Namespace *nsPtr = procPtr->cmdPtr->nsPtr;
-    CallFrame frame;
-    register CallFrame *framePtr = &frame;
-    register Var *varPtr;
-    register CompiledLocal *localPtr;
-    char *procName;
-    int nameLen, localCt, numArgs, argCt, i, result;
-
-    /*
-     * This procedure generates an array "compiledLocals" that holds the
-     * storage for local variables. It starts out with stack-allocated space
-     * but uses dynamically-allocated storage if needed.
-     */
-
-#define NUM_LOCALS 20
-    Var localStorage[NUM_LOCALS];
-    Var *compiledLocals = localStorage;
-
-    /*
-     * Get the procedure's name.
-     */
-    
-    procName = Tcl_GetStringFromObj(objv[0], &nameLen);
-
-    /*
-     * If necessary, compile the procedure's body. The compiler will
-     * allocate frame slots for the procedure's non-argument local
-     * variables.  Note that compiling the body might increase
-     * procPtr->numCompiledLocals if new local variables are found
-     * while compiling.
-     */
-
-    result = TclProcCompileProc(interp, procPtr, procPtr->bodyPtr, nsPtr,
-	    "body of proc", procName);
-    
-    if (result != TCL_OK) {
-        return result;
-    }
-
-    /*
-     * Create the "compiledLocals" array. Make sure it is large enough to
-     * hold all the procedure's compiled local variables, including its
-     * formal parameters.
-     */
-
-    localCt = procPtr->numCompiledLocals;
-    if (localCt > NUM_LOCALS) {
-	compiledLocals = (Var *) ckalloc((unsigned) localCt * sizeof(Var));
-    }
-    
-    /*
-     * Set up and push a new call frame for the new procedure invocation.
-     * This call frame will execute in the proc's namespace, which might
-     * be different than the current namespace. The proc's namespace is
-     * that of its command, which can change if the command is renamed
-     * from one namespace to another.
-     */
-
-    result = Tcl_PushCallFrame(interp, (Tcl_CallFrame *) framePtr,
-            (Tcl_Namespace *) nsPtr, /*isProcCallFrame*/ 1);
-
-    if (result != TCL_OK) {
-        return result;
-    }
-
-    framePtr->objc = objc;
-    framePtr->objv = objv;  /* ref counts for args are incremented below */
-
-    /*
-     * Initialize and resolve compiled variable references.
-     */
-
-    framePtr->procPtr = procPtr;
-    framePtr->numCompiledLocals = localCt;
-    framePtr->compiledLocals = compiledLocals;
-
-    TclInitCompiledLocals(interp, framePtr, nsPtr);
-
-    /*
-     * Match and assign the call's actual parameters to the procedure's
-     * formal arguments. The formal arguments are described by the first
-     * numArgs entries in both the Proc structure's local variable list and
-     * the call frame's local variable array.
-     */
-
-    numArgs = procPtr->numArgs;
-    varPtr = framePtr->compiledLocals;
-    localPtr = procPtr->firstLocalPtr;
-    argCt = objc;
-    for (i = 1, argCt -= 1;  i <= numArgs;  i++, argCt--) {
-	if (!TclIsVarArgument(localPtr)) {
-	    panic("TclObjInterpProc: local variable %s is not argument but should be",
-		  localPtr->name);
-	    return TCL_ERROR;
-	}
-	if (TclIsVarTemporary(localPtr)) {
-	    panic("TclObjInterpProc: local variable %d is temporary but should be an argument", i);
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * Handle the special case of the last formal being "args".  When
-	 * it occurs, assign it a list consisting of all the remaining
-	 * actual arguments.
-	 */
-
-	if ((i == numArgs) && ((localPtr->name[0] == 'a')
-	        && (strcmp(localPtr->name, "args") == 0))) {
-	    Tcl_Obj *listPtr = Tcl_NewListObj(argCt, &(objv[i]));
-	    varPtr->value.objPtr = listPtr;
-	    Tcl_IncrRefCount(listPtr); /* local var is a reference */
-	    varPtr->flags &= ~VAR_UNDEFINED;
-	    argCt = 0;
-	    break;		/* done processing args */
-	} else if (argCt > 0) {
-	    Tcl_Obj *objPtr = objv[i];
-	    varPtr->value.objPtr = objPtr;
-	    varPtr->flags &= ~VAR_UNDEFINED;
-	    Tcl_IncrRefCount(objPtr);  /* since the local variable now has
-					* another reference to object. */
-	} else if (localPtr->defValuePtr != NULL) {
-	    Tcl_Obj *objPtr = localPtr->defValuePtr;
-	    varPtr->value.objPtr = objPtr;
-	    varPtr->flags &= ~VAR_UNDEFINED;
-	    Tcl_IncrRefCount(objPtr);  /* since the local variable now has
-					* another reference to object. */
-	} else {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "no value given for parameter \"", localPtr->name,
-		    "\" to \"", Tcl_GetString(objv[0]), "\"", (char *) NULL);
-	    result = TCL_ERROR;
-	    goto procDone;
-	}
-	varPtr++;
-	localPtr = localPtr->nextPtr;
-    }
-    if (argCt > 0) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"called \"", Tcl_GetString(objv[0]),
-		"\" with too many arguments", (char *) NULL);
-	result = TCL_ERROR;
-	goto procDone;
-    }
-
-    /*
-     * Invoke the commands in the procedure's body.
-     */
-
-    if (tclTraceExec >= 1) {
-#ifdef TCL_COMPILE_DEBUG
-	fprintf(stdout, "Calling proc ");
-	for (i = 0;  i < objc;  i++) {
-	    TclPrintObject(stdout, objv[i], 15);
-	    fprintf(stdout, " ");
-	}
-	fprintf(stdout, "\n");
-#else /* TCL_COMPILE_DEBUG */
-	fprintf(stdout, "Calling proc %.*s\n", nameLen, procName);
-#endif /*TCL_COMPILE_DEBUG*/
-	fflush(stdout);
-    }
-
-    iPtr->returnCode = TCL_OK;
-    procPtr->refCount++;
-    result = Tcl_EvalObjEx(interp, procPtr->bodyPtr, 0);
-    procPtr->refCount--;
-    if (procPtr->refCount <= 0) {
-	TclProcCleanupProc(procPtr);
-    }
-
-    if (result != TCL_OK) {
-	result = ProcessProcResultCode(interp, procName, nameLen, result);
-    }
-    
-    /*
-     * Pop and free the call frame for this procedure invocation, then
-     * free the compiledLocals array if malloc'ed storage was used.
-     */
-    
-    procDone:
-    Tcl_PopCallFrame(interp);
-    if (compiledLocals != localStorage) {
-	ckfree((char *) compiledLocals);
-    }
-    return result;
-#undef NUM_LOCALS
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcCompileProc --
- *
- *	Called just before a procedure is executed to compile the
- *	body to byte codes.  If the type of the body is not
- *	"byte code" or if the compile conditions have changed
- *	(namespace context, epoch counters, etc.) then the body
- *	is recompiled.  Otherwise, this procedure does nothing.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May change the internal representation of the body object
- *	to compiled code.
- *
- *----------------------------------------------------------------------
- */
- 
-int
-TclProcCompileProc(interp, procPtr, bodyPtr, nsPtr, description, procName)
-    Tcl_Interp *interp;		/* Interpreter containing procedure. */
-    Proc *procPtr;		/* Data associated with procedure. */
-    Tcl_Obj *bodyPtr;		/* Body of proc. (Usually procPtr->bodyPtr,
- 				 * but could be any code fragment compiled
- 				 * in the context of this procedure.) */
-    Namespace *nsPtr;		/* Namespace containing procedure. */
-    CONST char *description;	/* string describing this body of code. */
-    CONST char *procName;	/* Name of this procedure. */
-{
-    Interp *iPtr = (Interp*)interp;
-    int result;
-    Tcl_CallFrame frame;
-    Proc *saveProcPtr;
-    ByteCode *codePtr = (ByteCode *) bodyPtr->internalRep.otherValuePtr;
- 
-    /*
-     * If necessary, compile the procedure's body. The compiler will
-     * allocate frame slots for the procedure's non-argument local
-     * variables. If the ByteCode already exists, make sure it hasn't been
-     * invalidated by someone redefining a core command (this might make the
-     * compiled code wrong). Also, if the code was compiled in/for a
-     * different interpreter, we recompile it. Note that compiling the body
-     * might increase procPtr->numCompiledLocals if new local variables are
-     * found while compiling.
-     *
-     * Precompiled procedure bodies, however, are immutable and therefore
-     * they are not recompiled, even if things have changed.
-     */
- 
-    if (bodyPtr->typePtr == &tclByteCodeType) {
- 	if (((Interp *) *codePtr->interpHandle != iPtr)
- 	        || (codePtr->compileEpoch != iPtr->compileEpoch)
- 	        || (codePtr->nsPtr != nsPtr)) {
-            if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
-                if ((Interp *) *codePtr->interpHandle != iPtr) {
-                    Tcl_AppendResult(interp,
-                            "a precompiled script jumped interps", NULL);
-                    return TCL_ERROR;
-                }
-	        codePtr->compileEpoch = iPtr->compileEpoch;
-                codePtr->nsPtr = nsPtr;
-            } else {
-                (*tclByteCodeType.freeIntRepProc)(bodyPtr);
-                bodyPtr->typePtr = (Tcl_ObjType *) NULL;
-            }
- 	}
-    }
-    if (bodyPtr->typePtr != &tclByteCodeType) {
- 	char buf[100];
- 	int numChars;
- 	char *ellipsis;
- 	
- 	if (tclTraceCompile >= 1) {
- 	    /*
- 	     * Display a line summarizing the top level command we
- 	     * are about to compile.
- 	     */
- 
- 	    numChars = strlen(procName);
- 	    ellipsis = "";
- 	    if (numChars > 50) {
- 		numChars = 50;
- 		ellipsis = "...";
- 	    }
- 	    fprintf(stdout, "Compiling %s \"%.*s%s\"\n",
- 		    description, numChars, procName, ellipsis);
- 	}
- 	
- 	/*
- 	 * Plug the current procPtr into the interpreter and coerce
- 	 * the code body to byte codes.  The interpreter needs to
- 	 * know which proc it's compiling so that it can access its
- 	 * list of compiled locals.
- 	 *
- 	 * TRICKY NOTE:  Be careful to push a call frame with the
- 	 *   proper namespace context, so that the byte codes are
- 	 *   compiled in the appropriate class context.
- 	 */
- 
- 	saveProcPtr = iPtr->compiledProcPtr;
- 	iPtr->compiledProcPtr = procPtr;
- 
- 	result = Tcl_PushCallFrame(interp, &frame,
-		(Tcl_Namespace*)nsPtr, /* isProcCallFrame */ 0);
- 
- 	if (result == TCL_OK) {
-	    result = tclByteCodeType.setFromAnyProc(interp, bodyPtr);
-	    Tcl_PopCallFrame(interp);
-	}
- 
- 	iPtr->compiledProcPtr = saveProcPtr;
- 	
- 	if (result != TCL_OK) {
- 	    if (result == TCL_ERROR) {
- 		numChars = strlen(procName);
- 		ellipsis = "";
- 		if (numChars > 50) {
- 		    numChars = 50;
- 		    ellipsis = "...";
- 		}
- 		sprintf(buf, "\n    (compiling %s \"%.*s%s\", line %d)",
- 			description, numChars, procName, ellipsis,
- 			interp->errorLine);
- 		Tcl_AddObjErrorInfo(interp, buf, -1);
- 	    }
- 	    return result;
- 	}
-    } else if (codePtr->nsEpoch != nsPtr->resolverEpoch) {
-	register CompiledLocal *localPtr;
- 	
-	/*
-	 * The resolver epoch has changed, but we only need to invalidate
-	 * the resolver cache.
-	 */
-
-	for (localPtr = procPtr->firstLocalPtr;  localPtr != NULL;
-	    localPtr = localPtr->nextPtr) {
-	    localPtr->flags &= ~(VAR_RESOLVED);
-	    if (localPtr->resolveInfo) {
-		if (localPtr->resolveInfo->deleteProc) {
-		    localPtr->resolveInfo->deleteProc(localPtr->resolveInfo);
-		} else {
-		    ckfree((char*)localPtr->resolveInfo);
-		}
-		localPtr->resolveInfo = NULL;
-	    }
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcessProcResultCode --
- *
- *	Procedure called by TclObjInterpProc to process a return code other
- *	than TCL_OK returned by a Tcl procedure.
- *
- * Results:
- *	Depending on the argument return code, the result returned is
- *	another return code and the interpreter's result is set to a value
- *	to supplement that return code.
- *
- * Side effects:
- *	If the result returned is TCL_ERROR, traceback information about
- *	the procedure just executed is appended to the interpreter's
- *	"errorInfo" variable.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcessProcResultCode(interp, procName, nameLen, returnCode)
-    Tcl_Interp *interp;		/* The interpreter in which the procedure
-				 * was called and returned returnCode. */
-    char *procName;		/* Name of the procedure. Used for error
-				 * messages and trace information. */
-    int nameLen;		/* Number of bytes in procedure's name. */
-    int returnCode;		/* The unexpected result code. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char msg[100 + TCL_INTEGER_SPACE];
-    
-    if (returnCode == TCL_RETURN) {
-	returnCode = TclUpdateReturnInfo(iPtr);
-    } else if (returnCode == TCL_ERROR) {
-	sprintf(msg, "\n    (procedure \"%.*s\" line %d)",
-		nameLen, procName, iPtr->errorLine);
-	Tcl_AddObjErrorInfo(interp, msg, -1);
-    } else if (returnCode == TCL_BREAK) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		"invoked \"break\" outside of a loop", -1);
-	returnCode = TCL_ERROR;
-    } else if (returnCode == TCL_CONTINUE) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        "invoked \"continue\" outside of a loop", -1);
-	returnCode = TCL_ERROR;
-    }
-    return returnCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcDeleteProc --
- *
- *	This procedure is invoked just before a command procedure is
- *	removed from an interpreter.  Its job is to release all the
- *	resources allocated to the procedure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory gets freed, unless the procedure is actively being
- *	executed.  In this case the cleanup is delayed until the
- *	last call to the current procedure completes.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclProcDeleteProc(clientData)
-    ClientData clientData;		/* Procedure to be deleted. */
-{
-    Proc *procPtr = (Proc *) clientData;
-
-    procPtr->refCount--;
-    if (procPtr->refCount <= 0) {
-	TclProcCleanupProc(procPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclProcCleanupProc --
- *
- *	This procedure does all the real work of freeing up a Proc
- *	structure.  It's called only when the structure's reference
- *	count becomes zero.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory gets freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclProcCleanupProc(procPtr)
-    register Proc *procPtr;		/* Procedure to be deleted. */
-{
-    register CompiledLocal *localPtr;
-    Tcl_Obj *bodyPtr = procPtr->bodyPtr;
-    Tcl_Obj *defPtr;
-    Tcl_ResolvedVarInfo *resVarInfo;
-
-    if (bodyPtr != NULL) {
-	Tcl_DecrRefCount(bodyPtr);
-    }
-    for (localPtr = procPtr->firstLocalPtr;  localPtr != NULL;  ) {
-	CompiledLocal *nextPtr = localPtr->nextPtr;
-
-        resVarInfo = localPtr->resolveInfo;
-	if (resVarInfo) {
-	    if (resVarInfo->deleteProc) {
-		(*resVarInfo->deleteProc)(resVarInfo);
-	    } else {
-		ckfree((char *) resVarInfo);
-	    }
-        }
-
-	if (localPtr->defValuePtr != NULL) {
-	    defPtr = localPtr->defValuePtr;
-	    Tcl_DecrRefCount(defPtr);
-	}
-	ckfree((char *) localPtr);
-	localPtr = nextPtr;
-    }
-    ckfree((char *) procPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclUpdateReturnInfo --
- *
- *	This procedure is called when procedures return, and at other
- *	points where the TCL_RETURN code is used.  It examines fields
- *	such as iPtr->returnCode and iPtr->errorCode and modifies
- *	the real return status accordingly.
- *
- * Results:
- *	The return value is the true completion code to use for
- *	the procedure, instead of TCL_RETURN.
- *
- * Side effects:
- *	The errorInfo and errorCode variables may get modified.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclUpdateReturnInfo(iPtr)
-    Interp *iPtr;		/* Interpreter for which TCL_RETURN
-				 * exception is being processed. */
-{
-    int code;
-
-    code = iPtr->returnCode;
-    iPtr->returnCode = TCL_OK;
-    if (code == TCL_ERROR) {
-	Tcl_SetVar2((Tcl_Interp *) iPtr, "errorCode", (char *) NULL,
-		(iPtr->errorCode != NULL) ? iPtr->errorCode : "NONE",
-		TCL_GLOBAL_ONLY);
-	iPtr->flags |= ERROR_CODE_SET;
-	if (iPtr->errorInfo != NULL) {
-	    Tcl_SetVar2((Tcl_Interp *) iPtr, "errorInfo", (char *) NULL,
-		    iPtr->errorInfo, TCL_GLOBAL_ONLY);
-	    iPtr->flags |= ERR_IN_PROGRESS;
-	}
-    }
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetInterpProc --
- *
- *  Returns a pointer to the TclProcInterpProc procedure; this is different
- *  from the value obtained from the TclProcInterpProc reference on systems
- *  like Windows where import and export versions of a procedure exported
- *  by a DLL exist.
- *
- * Results:
- *  Returns the internal address of the TclProcInterpProc procedure.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-TclCmdProcType
-TclGetInterpProc()
-{
-    return (TclCmdProcType) TclProcInterpProc;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetObjInterpProc --
- *
- *  Returns a pointer to the TclObjInterpProc procedure; this is different
- *  from the value obtained from the TclObjInterpProc reference on systems
- *  like Windows where import and export versions of a procedure exported
- *  by a DLL exist.
- *
- * Results:
- *  Returns the internal address of the TclObjInterpProc procedure.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-TclObjCmdProcType
-TclGetObjInterpProc()
-{
-    return (TclObjCmdProcType) TclObjInterpProc;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclNewProcBodyObj --
- *
- *  Creates a new object, of type "procbody", whose internal
- *  representation is the given Proc struct.
- *  The newly created object's reference count is 0.
- *
- * Results:
- *  Returns a pointer to a newly allocated Tcl_Obj, 0 on error.
- *
- * Side effects:
- *  The reference count in the ByteCode attached to the Proc is bumped up
- *  by one, since the internal rep stores a pointer to it.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclNewProcBodyObj(procPtr)
-    Proc *procPtr;	/* the Proc struct to store as the internal
-                         * representation. */
-{
-    Tcl_Obj *objPtr;
-
-    if (!procPtr) {
-        return (Tcl_Obj *) NULL;
-    }
-    
-    objPtr = Tcl_NewStringObj("", 0);
-
-    if (objPtr) {
-        objPtr->typePtr = &tclProcBodyType;
-        objPtr->internalRep.otherValuePtr = (VOID *) procPtr;
-
-        procPtr->refCount++;
-    }
-
-    return objPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodyDup --
- *
- *  Tcl_ObjType's Dup function for the proc body object.
- *  Bumps the reference count on the Proc stored in the internal
- *  representation.
- *
- * Results:
- *  None.
- *
- * Side effects:
- *  Sets up the object in dupPtr to be a duplicate of the one in srcPtr.
- *
- *----------------------------------------------------------------------
- */
-
-static void ProcBodyDup(srcPtr, dupPtr)
-    Tcl_Obj *srcPtr;		/* object to copy */
-    Tcl_Obj *dupPtr;		/* target object for the duplication */
-{
-    Proc *procPtr = (Proc *) srcPtr->internalRep.otherValuePtr;
-    
-    dupPtr->typePtr = &tclProcBodyType;
-    dupPtr->internalRep.otherValuePtr = (VOID *) procPtr;
-    procPtr->refCount++;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodyFree --
- *
- *  Tcl_ObjType's Free function for the proc body object.
- *  The reference count on its Proc struct is decreased by 1; if the count
- *  reaches 0, the proc is freed.
- *
- * Results:
- *  None.
- *
- * Side effects:
- *  If the reference count on the Proc struct reaches 0, the struct is freed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcBodyFree(objPtr)
-    Tcl_Obj *objPtr;		/* the object to clean up */
-{
-    Proc *procPtr = (Proc *) objPtr->internalRep.otherValuePtr;
-    procPtr->refCount--;
-    if (procPtr->refCount <= 0) {
-        TclProcCleanupProc(procPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodySetFromAny --
- *
- *  Tcl_ObjType's SetFromAny function for the proc body object.
- *  Calls panic.
- *
- * Results:
- *  Theoretically returns a TCL result code.
- *
- * Side effects:
- *  Calls panic, since we can't set the value of the object from a string
- *  representation (or any other internal ones).
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcBodySetFromAny(interp, objPtr)
-    Tcl_Interp *interp;			/* current interpreter */
-    Tcl_Obj *objPtr;			/* object pointer */
-{
-    panic("called ProcBodySetFromAny");
-
-    /*
-     * this to keep compilers happy.
-     */
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodyUpdateString --
- *
- *  Tcl_ObjType's UpdateString function for the proc body object.
- *  Calls panic.
- *
- * Results:
- *  None.
- *
- * Side effects:
- *  Calls panic, since we this type has no string representation.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcBodyUpdateString(objPtr)
-    Tcl_Obj *objPtr;		/* the object to update */
-{
-    panic("called ProcBodyUpdateString");
-}
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
deleted file mode 100644
index 96d2aea..0000000
--- a/generic/tclRegexp.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/* 
- * tclRegexp.c --
- *
- *	This file contains the public interfaces to the Tcl regular
- *	expression mechanism.
- *
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclRegexp.c,v 1.2 1999/04/16 00:46:52 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclRegexp.h"
-
-/*
- *----------------------------------------------------------------------
- * The routines in this file use Henry Spencer's regular expression
- * package contained in the following additional source files:
- *
- *	regc_color.c	regc_cvec.c	regc_lex.c
- *	regc_nfa.c	regcomp.c	regcustom.h
- *	rege_dfa.c	regerror.c	regerrs.h
- *	regex.h		regexec.c	regfree.c
- *	regfronts.c	regguts.h
- *
- * Copyright (c) 1998 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * *** NOTE: this code has been altered slightly for use in Tcl: ***
- * *** 1. Names have been changed, e.g. from re_comp to		 ***
- * ***    TclRegComp, to avoid clashes with other 		 ***
- * ***    regexp implementations used by applications. 		 ***
- */
-
-/*
- * Declarations for functions used only in this file.
- */
-
-static void		DupRegexpInternalRep _ANSI_ARGS_((Tcl_Obj *srcPtr,
-			    Tcl_Obj *copyPtr));
-static void		FreeRegexpInternalRep _ANSI_ARGS_((Tcl_Obj *regexpPtr));
-static int		SetRegexpFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static TclRegexp *	CompileRegexp _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *pattern, int length, int flags));
-
-/*
- * The regular expression Tcl object type.  This serves as a cache
- * of the compiled form of the regular expression.
- */
-
-Tcl_ObjType tclRegexpType = {
-    "regexp",				/* name */
-    FreeRegexpInternalRep,		/* freeIntRepProc */
-    DupRegexpInternalRep,		/* dupIntRepProc */
-    NULL,				/* updateStringProc */
-    SetRegexpFromAny			/* setFromAnyProc */
-};
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegExpCompile --
- *
- *	Compile a regular expression into a form suitable for fast
- *	matching.  This procedure is DEPRECATED in favor of the
- *	object version of the command.
- *
- * Results:
- *	The return value is a pointer to the compiled form of string,
- *	suitable for passing to Tcl_RegExpExec.  This compiled form
- *	is only valid up until the next call to this procedure, so
- *	don't keep these around for a long time!  If an error occurred
- *	while compiling the pattern, then NULL is returned and an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	Updates the cache of compiled regexps.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_RegExp
-Tcl_RegExpCompile(interp, string)
-    Tcl_Interp *interp;			/* For use in error reporting. */
-    char *string;			/* String for which to produce
-					 * compiled regular expression. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int i, length;
-    TclRegexp *result;
-
-    length = strlen(string);
-    for (i = 0; i < NUM_REGEXPS; i++) {
-	if ((length == iPtr->patLengths[i])
-		&& (strcmp(string, iPtr->patterns[i]) == 0)) {
-	    /*
-	     * Move the matched pattern to the first slot in the
-	     * cache and shift the other patterns down one position.
-	     */
-
-	    if (i != 0) {
-		int j;
-		char *cachedString;
-
-		cachedString = iPtr->patterns[i];
-		result = iPtr->regexps[i];
-		for (j = i-1; j >= 0; j--) {
-		    iPtr->patterns[j+1] = iPtr->patterns[j];
-		    iPtr->patLengths[j+1] = iPtr->patLengths[j];
-		    iPtr->regexps[j+1] = iPtr->regexps[j];
-		}
-		iPtr->patterns[0] = cachedString;
-		iPtr->patLengths[0] = length;
-		iPtr->regexps[0] = result;
-	    }
-	    return (Tcl_RegExp) iPtr->regexps[0];
-	}
-    }
-
-    /*
-     * No match in the cache.  Compile the string and add it to the
-     * cache.
-     */
-
-    result = CompileRegexp(interp, string, length, REG_ADVANCED);
-    if (!result) {
-	return NULL;
-    }
-
-    /*
-     * We successfully compiled the expression, so add it to the cache.
-     */
-
-    if (iPtr->patterns[NUM_REGEXPS-1] != NULL) {
-	ckfree(iPtr->patterns[NUM_REGEXPS-1]);
-	TclReFree(&(iPtr->regexps[NUM_REGEXPS-1]->re));
-	ckfree((char *) iPtr->regexps[NUM_REGEXPS-1]);
-    }
-    for (i = NUM_REGEXPS - 2; i >= 0; i--) {
-	iPtr->patterns[i+1] = iPtr->patterns[i];
-	iPtr->patLengths[i+1] = iPtr->patLengths[i];
-	iPtr->regexps[i+1] = iPtr->regexps[i];
-    }
-    iPtr->patterns[0] = (char *) ckalloc((unsigned) (length+1));
-    strcpy(iPtr->patterns[0], string);
-    iPtr->patLengths[0] = length;
-    iPtr->regexps[0] = result;
-    return (Tcl_RegExp) result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegExpExec --
- *
- *	Execute the regular expression matcher using a compiled form
- *	of a regular expression and save information about any match
- *	that is found.
- *
- * Results:
- *	If an error occurs during the matching operation then -1
- *	is returned and the interp's result contains an error message.
- *	Otherwise the return value is 1 if a matching range is
- *	found and 0 if there is no matching range.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_RegExpExec(interp, re, string, start)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
-    Tcl_RegExp re;		/* Compiled regular expression;  must have
-				 * been returned by previous call to
-				 * Tcl_GetRegExpFromObj. */
-    CONST char *string;		/* String against which to match re. */
-    CONST char *start;		/* If string is part of a larger string,
-				 * this identifies beginning of larger
-				 * string, so that "^" won't match. */
-{
-    int result, numChars;
-    Tcl_DString stringBuffer;
-    Tcl_UniChar *uniString;
-
-    TclRegexp *regexpPtr = (TclRegexp *) re;
-
-    /*
-     * Remember the UTF-8 string so Tcl_RegExpRange() can convert the
-     * matches from character to byte offsets.
-     */
-
-    regexpPtr->string = string;
-
-    Tcl_DStringInit(&stringBuffer);
-    uniString = Tcl_UtfToUniCharDString(string, -1, &stringBuffer);
-    numChars = Tcl_DStringLength(&stringBuffer) / sizeof(Tcl_UniChar);
-
-    /*
-     * Perform the regexp match.
-     */
-
-    result = TclRegExpExecUniChar(interp, re, uniString, numChars, -1,
-	    ((string > start) ? REG_NOTBOL : 0));
-
-    Tcl_DStringFree(&stringBuffer);
-
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_RegExpRange --
- *
- *	Returns pointers describing the range of a regular expression match,
- *	or one of the subranges within the match.
- *
- * Results:
- *	The variables at *startPtr and *endPtr are modified to hold the
- *	addresses of the endpoints of the range given by index.  If the
- *	specified range doesn't exist then NULLs are returned.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-Tcl_RegExpRange(re, index, startPtr, endPtr)
-    Tcl_RegExp re;		/* Compiled regular expression that has
-				 * been passed to Tcl_RegExpExec. */
-    int index;			/* 0 means give the range of the entire
-				 * match, > 0 means give the range of
-				 * a matching subrange. */
-    char **startPtr;		/* Store address of first character in
-				 * (sub-) range here. */
-    char **endPtr;		/* Store address of character just after last
-				 * in (sub-) range here. */
-{
-    TclRegexp *regexpPtr = (TclRegexp *) re;
-
-    if ((size_t) index > regexpPtr->re.re_nsub) {
-	*startPtr = *endPtr = NULL;
-    } else if (regexpPtr->matches[index].rm_so < 0) {
-	*startPtr = *endPtr = NULL;
-    } else {
-	*startPtr = Tcl_UtfAtIndex(regexpPtr->string,
-		regexpPtr->matches[index].rm_so);
-	*endPtr = Tcl_UtfAtIndex(regexpPtr->string,
-		regexpPtr->matches[index].rm_eo);
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclRegExpExecUniChar --
- *
- *	Execute the regular expression matcher using a compiled form of a
- *	regular expression and save information about any match that is
- *	found.
- *
- * Results:
- *	If an error occurs during the matching operation then -1 is
- *	returned and an error message is left in interp's result.
- *	Otherwise the return value is 1 if a matching range was found or
- *	0 if there was no matching range.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclRegExpExecUniChar(interp, re, wString, numChars, nmatches, flags)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. */
-    Tcl_RegExp re;		/* Compiled regular expression; returned by
-				 * a previous call to Tcl_GetRegExpFromObj */
-    CONST Tcl_UniChar *wString;	/* String against which to match re. */
-    int numChars;		/* Length of Tcl_UniChar string (must
-				 * be >= 0). */
-    int nmatches;		/* How many subexpression matches (counting
-				 * the whole match as subexpression 0) are
-				 * of interest.  -1 means "don't know". */
-    int flags;			/* Regular expression flags. */
-{
-    int status;
-    TclRegexp *regexpPtr = (TclRegexp *) re;
-    size_t nm = regexpPtr->re.re_nsub + 1;
-
-    if (nmatches >= 0 && (size_t) nmatches < nm)
-	nm = (size_t) nmatches;
-
-    status = TclReExec(&regexpPtr->re, wString, (size_t) numChars,
-	    (rm_detail_t *)NULL, nm, regexpPtr->matches, flags);
-
-    /*
-     * Check for errors.
-     */
-
-    if (status != REG_OKAY) {
-	if (status == REG_NOMATCH) {
-	    return 0;
-	}
-	if (interp != NULL) {
-	    TclRegError(interp, "error while matching regular expression: ",
-		    status);
-	}
-	return -1;
-    }
-    return 1;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclRegExpRangeUniChar --
- *
- *	Returns pointers describing the range of a regular expression match,
- *	or one of the subranges within the match.
- *
- * Results:
- *	The variables at *startPtr and *endPtr are modified to hold the
- *	addresses of the endpoints of the range given by index.  If the
- *	specified range doesn't exist then NULLs are returned.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclRegExpRangeUniChar(re, index, startPtr, endPtr)
-    Tcl_RegExp re;		/* Compiled regular expression that has
-				 * been passed to Tcl_RegExpExec. */
-    int index;			/* 0 means give the range of the entire
-				 * match, > 0 means give the range of
-				 * a matching subrange. */
-    int *startPtr;		/* Store address of first character in
-				 * (sub-) range here. */
-    int *endPtr;		/* Store address of character just after last
-				 * in (sub-) range here. */
-{
-    TclRegexp *regexpPtr = (TclRegexp *) re;
-
-    if ((size_t) index > regexpPtr->re.re_nsub) {
-	*startPtr = -1;
-	*endPtr = -1;
-    } else {
-	*startPtr = regexpPtr->matches[index].rm_so;
-	*endPtr = regexpPtr->matches[index].rm_eo;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RegExpMatch --
- *
- *	See if a string matches a regular expression.
- *
- * Results:
- *	If an error occurs during the matching operation then -1
- *	is returned and the interp's result contains an error message.
- *	Otherwise the return value is 1 if "string" matches "pattern"
- *	and 0 otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_RegExpMatch(interp, string, pattern)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *string;		/* String. */
-    char *pattern;		/* Regular expression to match against
-				 * string. */
-{
-    Tcl_RegExp re;
-
-    re = Tcl_RegExpCompile(interp, pattern);
-    if (re == NULL) {
-	return -1;
-    }
-    return Tcl_RegExpExec(interp, re, string, string);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRegExpMatchObj --
- *
- *	See if a string matches a regular expression pattern object.
- *
- * Results:
- *	If an error occurs during the matching operation then -1
- *	is returned and the interp's result contains an error message.
- *	Otherwise the return value is 1 if "string" matches "pattern"
- *	and 0 otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclRegExpMatchObj(interp, string, patObj)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *string;		/* String. */
-    Tcl_Obj *patObj;		/* Regular expression to match against
-				 * string. */
-{
-    Tcl_RegExp re;
-
-    re = Tcl_GetRegExpFromObj(interp, patObj, REG_ADVANCED);
-    if (re == NULL) {
-	return -1;
-    }
-    return Tcl_RegExpExec(interp, re, string, string);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetRegExpFromObj --
- *
- *	Compile a regular expression into a form suitable for fast
- *	matching.  This procedure caches the result in a Tcl_Obj.
- *
- * Results:
- *	The return value is a pointer to the compiled form of string,
- *	suitable for passing to Tcl_RegExpExec.  If an error occurred
- *	while compiling the pattern, then NULL is returned and an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	Updates the native rep of the Tcl_Obj.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_RegExp
-Tcl_GetRegExpFromObj(interp, objPtr, flags)
-    Tcl_Interp *interp;		/* For use in error reporting. */
-    Tcl_Obj *objPtr;		/* Object whose string rep contains regular
-				 * expression pattern.  Internal rep will be
-				 * changed to compiled form of this regular
-				 * expression. */
-    int flags;			/* Regular expression compilation flags. */
-{
-    int length;
-    Tcl_ObjType *typePtr;
-    TclRegexp *regexpPtr;
-    char *pattern;
-
-    typePtr = objPtr->typePtr;
-    regexpPtr = (TclRegexp *) objPtr->internalRep.otherValuePtr;
-
-    if ((typePtr != &tclRegexpType) || (regexpPtr->flags != flags)) {
-	pattern = Tcl_GetStringFromObj(objPtr, &length);
-	regexpPtr = CompileRegexp(interp, pattern, length, flags);
-	if (regexpPtr == NULL) {
-	    return NULL;
-	}
-
-	/*
-	 * Free the old representation and set our type.
-	 */
-
-	if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
-	    (*typePtr->freeIntRepProc)(objPtr);
-	}
-	objPtr->internalRep.otherValuePtr = (VOID *) regexpPtr;
-	objPtr->typePtr = &tclRegexpType;
-    }
-    return (Tcl_RegExp) regexpPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRegAbout --
- *
- *	Return information about a compiled regular expression.
- *
- * Results:
- *	The return value is -1 for failure, 0 for success, although at
- *	the moment there's nothing that could fail.  On success, a list
- *	is left in the interp's result:  first element is the subexpression
- *	count, second is a list of re_info bit names.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclRegAbout(interp, re)
-    Tcl_Interp *interp;		/* For use in variable assignment. */
-    Tcl_RegExp re;		/* The compiled regular expression. */
-{
-    TclRegexp *regexpPtr = (TclRegexp *)re;
-    char buf[TCL_INTEGER_SPACE];
-    static struct infoname {
-	int bit;
-	char *text;
-    } infonames[] = {
-	{REG_UBACKREF,		"REG_UBACKREF"},
-	{REG_ULOOKAHEAD,	"REG_ULOOKAHEAD"},
-	{REG_UBOUNDS,		"REG_UBOUNDS"},
-	{REG_UBRACES,		"REG_UBRACES"},
-	{REG_UBSALNUM,		"REG_UBSALNUM"},
-	{REG_UPBOTCH,		"REG_UPBOTCH"},
-	{REG_UBBS,		"REG_UBBS"},
-	{REG_UNONPOSIX,		"REG_UNONPOSIX"},
-	{REG_UUNSPEC,		"REG_UUNSPEC"},
-	{REG_UUNPORT,		"REG_UUNPORT"},
-	{REG_ULOCALE,		"REG_ULOCALE"},
-	{REG_UEMPTYMATCH,	"REG_UEMPTYMATCH"},
-	{REG_UIMPOSSIBLE,	"REG_UIMPOSSIBLE"},
-	 {0,			""}
-    };
-    struct infoname *inf;
-    int n;
-
-    Tcl_ResetResult(interp);
-
-    sprintf(buf, "%u", (unsigned)(regexpPtr->re.re_nsub));
-    Tcl_AppendElement(interp, buf);
-
-    /*
-     * Must count bits before generating list, because we must know
-     * whether {} are needed before we start appending names.
-     */
-    n = 0;
-    for (inf = infonames; inf->bit != 0; inf++) {
-	if (regexpPtr->re.re_info&inf->bit) {
-	    n++;
-	}
-    }
-    if (n != 1) {
-	Tcl_AppendResult(interp, " {", NULL);
-    }
-    for (inf = infonames; inf->bit != 0; inf++) {
-	if (regexpPtr->re.re_info&inf->bit) {
-	    Tcl_AppendElement(interp, inf->text);
-	}
-    }
-    if (n != 1) {
-	Tcl_AppendResult(interp, "}", NULL);
-    }
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRegError --
- *
- *	Generate an error message based on the regexp status code.
- *
- * Results:
- *	Places an error in the interpreter.
- *
- * Side effects:
- *	Sets errorCode as well.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclRegError(interp, msg, status)
-    Tcl_Interp *interp;		/* Interpreter for error reporting. */
-    char *msg;			/* Message to prepend to error. */
-    int status;			/* Status code to report. */
-{
-    char buf[100];		/* ample in practice */
-    char cbuf[100];		/* lots in practice */
-    size_t n;
-    char *p;
-
-    Tcl_ResetResult(interp);
-    n = TclReError(status, (regex_t *)NULL, buf, sizeof(buf));
-    p = (n > sizeof(buf)) ? "..." : "";
-    Tcl_AppendResult(interp, msg, buf, p, NULL);
-
-    sprintf(cbuf, "%d", status);
-    (VOID) TclReError(REG_ITOA, (regex_t *)NULL, cbuf, sizeof(cbuf));
-    Tcl_SetErrorCode(interp, "REGEXP", cbuf, buf, NULL);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeRegexpInternalRep --
- *
- *	Deallocate the storage associated with a regexp object's internal
- *	representation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees the compiled regular expression.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeRegexpInternalRep(objPtr)
-    Tcl_Obj *objPtr;		/* Regexp object with internal rep to free. */
-{
-    TclRegexp *regexpRepPtr = (TclRegexp *) objPtr->internalRep.otherValuePtr;
-
-    TclReFree(&regexpRepPtr->re);
-    if (regexpRepPtr->matches) {
-	ckfree((char *) regexpRepPtr->matches);
-    }
-    ckfree((char *) regexpRepPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupRegexpInternalRep --
- *
- *	It is way too hairy to copy a regular expression, so we punt
- *	and revert the object back to a vanilla string. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Changes the type back to string.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupRegexpInternalRep(srcPtr, copyPtr)
-    Tcl_Obj *srcPtr;		/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr;		/* Object with internal rep to set. */
-{
-    copyPtr->internalRep.longValue = (long)copyPtr->length;
-    copyPtr->typePtr = &tclStringType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetRegexpFromAny --
- *
- *	Attempt to generate a compiled regular expression for the Tcl object
- *	"objPtr".
- *
- * Results:
- *	The return value is TCL_OK or TCL_ERROR. If an error occurs during
- *	conversion, an error message is left in the interpreter's result
- *	unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, a regular expression is stored as "objPtr"s internal
- *	representation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetRegexpFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* The object to convert. */
-{
-    if (Tcl_GetRegExpFromObj(interp, objPtr, REG_ADVANCED) == NULL) {
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CompileRegexp --
- *
- *	Attempt to compile the given regexp pattern
- *
- * Results:
- *	The return value is a pointer to a newly allocated TclRegexp
- *	that represents the compiled pattern, or NULL if the pattern
- *	could not be compiled.  If NULL is returned, an error message is
- *	left in the interp's result.
- *
- * Side effects:
- *	Memory allocated.
- *
- *----------------------------------------------------------------------
- */
-
-static TclRegexp *
-CompileRegexp(interp, string, length, flags)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    char *string;		/* The regexp to compile (UTF-8). */
-    int length;			/* The length of the string in bytes. */
-    int flags;			/* Compilation flags. */
-{
-    TclRegexp *regexpPtr;
-    Tcl_UniChar *uniString;
-    int numChars;
-    Tcl_DString stringBuf;
-    int status;
-
-    regexpPtr = (TclRegexp *) ckalloc(sizeof(TclRegexp));
-
-    /*
-     * Get the up-to-date string representation and map to unicode.
-     */
-
-    Tcl_DStringInit(&stringBuf);
-    uniString = Tcl_UtfToUniCharDString(string, length, &stringBuf);
-    numChars = Tcl_DStringLength(&stringBuf) / sizeof(Tcl_UniChar);
-
-    /*
-     * Compile the string and check for errors.
-     */
-
-    regexpPtr->flags = flags;
-    status = TclReComp(&regexpPtr->re, uniString, (size_t) numChars, flags);
-    Tcl_DStringFree(&stringBuf);
-
-    if (status != REG_OKAY) {
-	/*
-	 * Clean up and report errors in the interpreter, if possible.
-	 */
-	ckfree((char *)regexpPtr);
-	if (interp) {
-	    TclRegError(interp,
-		    "couldn't compile regular expression pattern: ",
-		    status);
-	}
-	return NULL;
-    }
-
-    /*
-     * Allocate enough space for all of the subexpressions, plus one
-     * extra for the entire pattern.
-     */
-
-    regexpPtr->matches = (regmatch_t *) ckalloc(
-	    sizeof(regmatch_t) * (regexpPtr->re.re_nsub + 1));
-
-    return regexpPtr;
-}
diff --git a/generic/tclRegexp.h b/generic/tclRegexp.h
deleted file mode 100644
index 7be13c1..0000000
--- a/generic/tclRegexp.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* 
- * tclRegexp.h --
- *
- * 	This file contains definitions used internally by Henry
- *	Spencer's regular expression code.
- *
- * Copyright (c) 1998 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and
- * Scriptics Corporation, none of whom are responsible for the results.
- * The author thanks all of them.
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications. 
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclRegexp.h,v 1.5 1999/04/16 00:46:52 stanton Exp $
- */
-
-#ifndef _TCLREGEXP
-#define _TCLREGEXP
-
-#include "regex.h"
-
-#ifdef BUILD_tcl
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- * The TclRegexp structure encapsulates a compiled regex_t,
- * the flags that were used to compile it, and an array of pointers
- * that are used to indicate subexpressions after a call to Tcl_RegExpExec.
- */
-
-typedef struct TclRegexp {
-    int flags;			/* Regexp compile flags. */
-    regex_t re;			/* Compiled re, includes number of
-				 * subexpressions. */
-    CONST char *string;		/* Last string matched with this regexp
-				 * (UTF-8), so Tcl_RegExpRange() can convert
-				 * the matches from character indices to UTF-8
-				 * byte offsets. */
-    regmatch_t *matches;	/* Array of indices into the Tcl_UniChar
-				 * representation of the last string matched
-				 * with this regexp to indicate the location
-				 * of subexpressions. */
-} TclRegexp;
-
-/*
- * Functions exported for use within the rest of Tcl.
- */
-
-EXTERN int		TclRegAbout _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_RegExp re));
-EXTERN VOID		TclRegXflags _ANSI_ARGS_((char *string, int length,
-			    int *cflagsPtr, int *eflagsPtr));
-EXTERN int		TclRegExpExecUniChar _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_RegExp re, CONST Tcl_UniChar *uniString,
-			    int numChars, int nmatches, int flags));
-EXTERN int		TclRegExpMatchObj _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, Tcl_Obj *patObj));
-EXTERN void		TclRegExpRangeUniChar _ANSI_ARGS_((Tcl_RegExp re,
-			    int index, int *startPtr, int *endPtr));
-
-/*
- * Functions exported from the regexp package for the test package to use.
- */
-
-EXTERN void		TclRegError _ANSI_ARGS_((Tcl_Interp *interp, char *msg,
-			    int status));
-
-#endif /* _TCLREGEXP */
diff --git a/generic/tclResolve.c b/generic/tclResolve.c
deleted file mode 100644
index 0a5b7c1..0000000
--- a/generic/tclResolve.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * tclResolve.c --
- *
- *      Contains hooks for customized command/variable name resolution
- *      schemes.  These hooks allow extensions like [incr Tcl] to add
- *      their own name resolution rules to the Tcl language.  Rules can
- *      be applied to a particular namespace, to the interpreter as a
- *      whole, or both.
- *
- * Copyright (c) 1998 Lucent Technologies, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclResolve.c,v 1.3 1998/10/06 19:12:06 rjohnson Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Declarations for procedures local to this file:
- */
-
-static void		BumpCmdRefEpochs _ANSI_ARGS_((Namespace *nsPtr));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AddInterpResolvers --
- *
- *	Adds a set of command/variable resolution procedures to an
- *	interpreter.  These procedures are consulted when commands
- *	are resolved in Tcl_FindCommand, and when variables are
- *	resolved in TclLookupVar and LookupCompiledLocal.  Each
- *	namespace may also have its own set of resolution procedures
- *	which take precedence over those for the interpreter.
- *
- *	When a name is resolved, it is handled as follows.  First,
- *	the name is passed to the resolution procedures for the
- *	namespace.  If not resolved, the name is passed to each of
- *	the resolution procedures added to the interpreter.  Finally,
- *	if still not resolved, the name is handled using the default
- *	Tcl rules for name resolution.
- *
- * Results:
- *	Returns pointers to the current name resolution procedures
- *	in the cmdProcPtr, varProcPtr and compiledVarProcPtr
- *	arguments.
- *
- * Side effects:
- *	If a compiledVarProc is specified, this procedure bumps the
- *	compileEpoch for the interpreter, forcing all code to be
- *	recompiled.  If a cmdProc is specified, this procedure bumps
- *	the cmdRefEpoch in all namespaces, forcing commands to be
- *	resolved again using the new rules.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AddInterpResolvers(interp, name, cmdProc, varProc, compiledVarProc)
-
-    Tcl_Interp *interp;			/* Interpreter whose name resolution
-					 * rules are being modified. */
-    char *name;				/* Name of this resolution scheme. */
-    Tcl_ResolveCmdProc *cmdProc;	/* New procedure for command
-					 * resolution */
-    Tcl_ResolveVarProc *varProc;	/* Procedure for variable resolution
-					 * at runtime */
-    Tcl_ResolveCompiledVarProc *compiledVarProc;
-					/* Procedure for variable resolution
-					 * at compile time. */
-{
-    Interp *iPtr = (Interp*)interp;
-    ResolverScheme *resPtr;
-
-    /*
-     *  Since we're adding a new name resolution scheme, we must force
-     *  all code to be recompiled to use the new scheme.  If there
-     *  are new compiled variable resolution rules, bump the compiler
-     *  epoch to invalidate compiled code.  If there are new command
-     *  resolution rules, bump the cmdRefEpoch in all namespaces.
-     */
-    if (compiledVarProc) {
-        iPtr->compileEpoch++;
-    }
-    if (cmdProc) {
-        BumpCmdRefEpochs(iPtr->globalNsPtr);
-    }
-
-    /*
-     *  Look for an existing scheme with the given name.  If found,
-     *  then replace its rules.
-     */
-    for (resPtr = iPtr->resolverPtr; resPtr != NULL; resPtr = resPtr->nextPtr) {
-        if (*name == *resPtr->name && strcmp(name, resPtr->name) == 0) {
-            resPtr->cmdResProc = cmdProc;
-            resPtr->varResProc = varProc;
-            resPtr->compiledVarResProc = compiledVarProc;
-            return;
-        }
-    }
-
-    /*
-     *  Otherwise, this is a new scheme.  Add it to the FRONT
-     *  of the linked list, so that it overrides existing schemes.
-     */
-    resPtr = (ResolverScheme *) ckalloc(sizeof(ResolverScheme));
-    resPtr->name = (char*)ckalloc((unsigned)(strlen(name)+1));
-    strcpy(resPtr->name, name);
-    resPtr->cmdResProc = cmdProc;
-    resPtr->varResProc = varProc;
-    resPtr->compiledVarResProc = compiledVarProc;
-    resPtr->nextPtr = iPtr->resolverPtr;
-    iPtr->resolverPtr = resPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetInterpResolvers --
- *
- *	Looks for a set of command/variable resolution procedures with
- *	the given name in an interpreter.  These procedures are
- *	registered by calling Tcl_AddInterpResolvers.
- *
- * Results:
- *	If the name is recognized, this procedure returns non-zero,
- *	along with pointers to the name resolution procedures in
- *	the Tcl_ResolverInfo structure.  If the name is not recognized,
- *	this procedure returns zero.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetInterpResolvers(interp, name, resInfoPtr)
-
-    Tcl_Interp *interp;			/* Interpreter whose name resolution
-					 * rules are being queried. */
-    char *name;                         /* Look for a scheme with this name. */
-    Tcl_ResolverInfo *resInfoPtr;	/* Returns pointers to the procedures,
-					 * if found */
-{
-    Interp *iPtr = (Interp*)interp;
-    ResolverScheme *resPtr;
-
-    /*
-     *  Look for an existing scheme with the given name.  If found,
-     *  then return pointers to its procedures.
-     */
-    for (resPtr = iPtr->resolverPtr; resPtr != NULL; resPtr = resPtr->nextPtr) {
-        if (*name == *resPtr->name && strcmp(name, resPtr->name) == 0) {
-	    resInfoPtr->cmdResProc = resPtr->cmdResProc;
-	    resInfoPtr->varResProc = resPtr->varResProc;
-	    resInfoPtr->compiledVarResProc = resPtr->compiledVarResProc;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RemoveInterpResolvers --
- *
- *	Removes a set of command/variable resolution procedures
- *	previously added by Tcl_AddInterpResolvers.  The next time
- *	a command/variable name is resolved, these procedures
- *	won't be consulted.
- *
- * Results:
- *	Returns non-zero if the name was recognized and the
- *	resolution scheme was deleted.  Returns zero otherwise.
- *
- * Side effects:
- *	If a scheme with a compiledVarProc was deleted, this procedure
- *	bumps the compileEpoch for the interpreter, forcing all code
- *	to be recompiled.  If a scheme with a cmdProc was deleted,
- *	this procedure bumps the cmdRefEpoch in all namespaces,
- *	forcing commands to be resolved again using the new rules.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_RemoveInterpResolvers(interp, name)
-
-    Tcl_Interp *interp;			/* Interpreter whose name resolution
-					 * rules are being modified. */
-    char *name;                         /* Name of the scheme to be removed. */
-{
-    Interp *iPtr = (Interp*)interp;
-    ResolverScheme **prevPtrPtr, *resPtr;
-
-    /*
-     *  Look for an existing scheme with the given name.
-     */
-    prevPtrPtr = &iPtr->resolverPtr;
-    for (resPtr = iPtr->resolverPtr; resPtr != NULL; resPtr = resPtr->nextPtr) {
-        if (*name == *resPtr->name && strcmp(name, resPtr->name) == 0) {
-            break;
-        }
-        prevPtrPtr = &resPtr->nextPtr;
-    }
-
-    /*
-     *  If we found the scheme, delete it.
-     */
-    if (resPtr) {
-        /*
-         *  If we're deleting a scheme with compiled variable resolution
-         *  rules, bump the compiler epoch to invalidate compiled code.
-         *  If we're deleting a scheme with command resolution rules,
-         *  bump the cmdRefEpoch in all namespaces.
-         */
-        if (resPtr->compiledVarResProc) {
-            iPtr->compileEpoch++;
-        }
-        if (resPtr->cmdResProc) {
-            BumpCmdRefEpochs(iPtr->globalNsPtr);
-        }
-
-        *prevPtrPtr = resPtr->nextPtr;
-        ckfree(resPtr->name);
-        ckfree((char *) resPtr);
-
-        return 1;
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * BumpCmdRefEpochs --
- *
- *	This procedure is used to bump the cmdRefEpoch counters in
- *	the specified namespace and all of its child namespaces.
- *	It is used whenever name resolution schemes are added/removed
- *	from an interpreter, to invalidate all command references.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Bumps the cmdRefEpoch in the specified namespace and its
- *	children, recursively.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-BumpCmdRefEpochs(nsPtr)
-    Namespace *nsPtr;			/* Namespace being modified. */
-{
-    Tcl_HashEntry *entry;
-    Tcl_HashSearch search;
-    Namespace *childNsPtr;
-
-    nsPtr->cmdRefEpoch++;
-
-    for (entry = Tcl_FirstHashEntry(&nsPtr->childTable, &search);
-	    entry != NULL;
-	    entry = Tcl_NextHashEntry(&search)) {
-
-        childNsPtr = (Namespace *) Tcl_GetHashValue(entry);
-        BumpCmdRefEpochs(childNsPtr);
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetNamespaceResolvers --
- *
- *	Sets the command/variable resolution procedures for a namespace,
- *	thereby changing the way that command/variable names are
- *	interpreted.  This allows extension writers to support different
- *	name resolution schemes, such as those for object-oriented
- *	packages.
- *
- *	Command resolution is handled by a procedure of the following
- *	type:
- *
- *	  typedef int (Tcl_ResolveCmdProc) _ANSI_ARGS_((
- *		Tcl_Interp* interp, char* name, Tcl_Namespace *context,
- *              int flags, Tcl_Command *rPtr));
- *          
- *	Whenever a command is executed or Tcl_FindCommand is invoked
- *	within the namespace, this procedure is called to resolve the
- *	command name.  If this procedure is able to resolve the name,
- *	it should return the status code TCL_OK, along with the
- *	corresponding Tcl_Command in the rPtr argument.  Otherwise,
- *	the procedure can return TCL_CONTINUE, and the command will
- *	be treated under the usual name resolution rules.  Or, it can
- *	return TCL_ERROR, and the command will be considered invalid.
- *
- *	Variable resolution is handled by two procedures.  The first
- *	is called whenever a variable needs to be resolved at compile
- *	time:
- *
- *        typedef int (Tcl_ResolveCompiledVarProc) _ANSI_ARGS_((
- *	        Tcl_Interp* interp, char* name, Tcl_Namespace *context,
- *	        Tcl_ResolvedVarInfo *rPtr));
- *
- *      If this procedure is able to resolve the name, it should return
- *      the status code TCL_OK, along with variable resolution info in
- *      the rPtr argument; this info will be used to set up compiled
- *	locals in the call frame at runtime.  The procedure may also
- *	return TCL_CONTINUE, and the variable will be treated under
- *	the usual name resolution rules.  Or, it can return TCL_ERROR,
- *	and the variable will be considered invalid.
- *
- *	Another procedure is used whenever a variable needs to be
- *	resolved at runtime but it is not recognized as a compiled local.
- *	(For example, the variable may be requested via
- *	Tcl_FindNamespaceVar.) This procedure has the following type:
- *
- *	  typedef int (Tcl_ResolveVarProc) _ANSI_ARGS_((
- *	        Tcl_Interp* interp, char* name, Tcl_Namespace *context,
- *	        int flags, Tcl_Var *rPtr));
- *
- *	This procedure is quite similar to the compile-time version.
- *	It returns the same status codes, but if variable resolution
- *	succeeds, this procedure returns a Tcl_Var directly via the
- *	rPtr argument.
- *
- * Results:
- *	Nothing.
- *
- * Side effects:
- *	Bumps the command epoch counter for the namespace, invalidating
- *	all command references in that namespace.  Also bumps the
- *	resolver epoch counter for the namespace, forcing all code
- *	in the namespace to be recompiled.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetNamespaceResolvers(namespacePtr, cmdProc, varProc, compiledVarProc)
-    Tcl_Namespace *namespacePtr;	/* Namespace whose resolution rules
-					 * are being modified. */
-    Tcl_ResolveCmdProc *cmdProc;	/* Procedure for command resolution */
-    Tcl_ResolveVarProc *varProc;	/* Procedure for variable resolution
-					 * at runtime */
-    Tcl_ResolveCompiledVarProc *compiledVarProc;
-					/* Procedure for variable resolution
-					 * at compile time. */
-{
-    Namespace *nsPtr = (Namespace*)namespacePtr;
-
-    /*
-     *  Plug in the new command resolver, and bump the epoch counters
-     *  so that all code will have to be recompiled and all commands
-     *  will have to be resolved again using the new policy.
-     */
-    nsPtr->cmdResProc = cmdProc;
-    nsPtr->varResProc = varProc;
-    nsPtr->compiledVarResProc = compiledVarProc;
-
-    nsPtr->cmdRefEpoch++;
-    nsPtr->resolverEpoch++;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetNamespaceResolvers --
- *
- *	Returns the current command/variable resolution procedures
- *	for a namespace.  By default, these procedures are NULL.
- *	New procedures can be installed by calling
- *	Tcl_SetNamespaceResolvers, to provide new name resolution
- *	rules.
- *
- * Results:
- *	Returns non-zero if any name resolution procedures have been
- *	assigned to this namespace; also returns pointers to the
- *	procedures in the Tcl_ResolverInfo structure.  Returns zero
- *	otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetNamespaceResolvers(namespacePtr, resInfoPtr)
-
-    Tcl_Namespace *namespacePtr;	/* Namespace whose resolution rules
-					 * are being modified. */
-    Tcl_ResolverInfo *resInfoPtr;	/* Returns: pointers for all
-					 * name resolution procedures
-					 * assigned to this namespace. */
-{
-    Namespace *nsPtr = (Namespace*)namespacePtr;
-
-    resInfoPtr->cmdResProc = nsPtr->cmdResProc;
-    resInfoPtr->varResProc = nsPtr->varResProc;
-    resInfoPtr->compiledVarResProc = nsPtr->compiledVarResProc;
-
-    if (nsPtr->cmdResProc != NULL ||
-        nsPtr->varResProc != NULL ||
-        nsPtr->compiledVarResProc != NULL) {
-	return 1;
-    }
-    return 0;
-}
diff --git a/generic/tclResult.c b/generic/tclResult.c
deleted file mode 100644
index 002437d..0000000
--- a/generic/tclResult.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-/* 
- * tclResult.c --
- *
- *	This file contains code to manage the interpreter result.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclResult.c,v 1.2 1999/04/16 00:46:53 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Function prototypes for local procedures in this file:
- */
-
-static void             ResetObjResult _ANSI_ARGS_((Interp *iPtr));
-static void		SetupAppendBuffer _ANSI_ARGS_((Interp *iPtr,
-			    int newSpace));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SaveResult --
- *
- *      Takes a snapshot of the current result state of the interpreter.
- *      The snapshot can be restored at any point by
- *      Tcl_RestoreResult. Note that this routine does not 
- *	preserve the errorCode, errorInfo, or flags fields so it
- *	should not be used if an error is in progress.
- *
- *      Once a snapshot is saved, it must be restored by calling
- *      Tcl_RestoreResult, or discarded by calling
- *      Tcl_DiscardResult.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Resets the interpreter result.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SaveResult(interp, statePtr)
-    Tcl_Interp *interp;		/* Interpreter to save. */
-    Tcl_SavedResult *statePtr;	/* Pointer to state structure. */
-{
-    Interp *iPtr = (Interp *) interp;
-
-    /*
-     * Move the result object into the save state.  Note that we don't need
-     * to change its refcount because we're moving it, not adding a new
-     * reference.  Put an empty object into the interpreter.
-     */
-
-    statePtr->objResultPtr = iPtr->objResultPtr;
-    iPtr->objResultPtr = Tcl_NewObj(); 
-    Tcl_IncrRefCount(iPtr->objResultPtr); 
-
-    /*
-     * Save the string result. 
-     */
-
-    statePtr->freeProc = iPtr->freeProc;
-    if (iPtr->result == iPtr->resultSpace) {
-	/*
-	 * Copy the static string data out of the interp buffer.
-	 */
-
-	statePtr->result = statePtr->resultSpace;
-	strcpy(statePtr->result, iPtr->result);
-	statePtr->appendResult = NULL;
-    } else if (iPtr->result == iPtr->appendResult) {
-	/*
-	 * Move the append buffer out of the interp.
-	 */
-
-	statePtr->appendResult = iPtr->appendResult;
-	statePtr->appendAvl = iPtr->appendAvl;
-	statePtr->appendUsed = iPtr->appendUsed;
-	statePtr->result = statePtr->appendResult;
-	iPtr->appendResult = NULL;
-	iPtr->appendAvl = 0;
-	iPtr->appendUsed = 0;
-    } else {
-	/*
-	 * Move the dynamic or static string out of the interpreter.
-	 */
-
-	statePtr->result = iPtr->result;
-	statePtr->appendResult = NULL;
-    }
-
-    iPtr->result = iPtr->resultSpace;
-    iPtr->resultSpace[0] = 0;
-    iPtr->freeProc = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_RestoreResult --
- *
- *      Restores the state of the interpreter to a snapshot taken
- *      by Tcl_SaveResult.  After this call, the token for
- *      the interpreter state is no longer valid.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      Restores the interpreter result.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_RestoreResult(interp, statePtr)
-    Tcl_Interp* interp;		/* Interpreter being restored. */
-    Tcl_SavedResult *statePtr;	/* State returned by Tcl_SaveResult. */
-{
-    Interp *iPtr = (Interp *) interp;
-
-    Tcl_ResetResult(interp);
-
-    /*
-     * Restore the string result.
-     */
-
-    iPtr->freeProc = statePtr->freeProc;
-    if (statePtr->result == statePtr->resultSpace) {
-	/*
-	 * Copy the static string data into the interp buffer.
-	 */
-
-	iPtr->result = iPtr->resultSpace;
-	strcpy(iPtr->result, statePtr->result);
-    } else if (statePtr->result == statePtr->appendResult) {
-	/*
-	 * Move the append buffer back into the interp.
-	 */
-
-	if (iPtr->appendResult != NULL) {
-	    ckfree((char *)iPtr->appendResult);
-	}
-
-	iPtr->appendResult = statePtr->appendResult;
-	iPtr->appendAvl = statePtr->appendAvl;
-	iPtr->appendUsed = statePtr->appendUsed;
-	iPtr->result = iPtr->appendResult;
-    } else {
-	/*
-	 * Move the dynamic or static string back into the interpreter.
-	 */
-
-	iPtr->result = statePtr->result;
-    }
-
-    /*
-     * Restore the object result.
-     */
-
-    Tcl_DecrRefCount(iPtr->objResultPtr);
-    iPtr->objResultPtr = statePtr->objResultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DiscardResult --
- *
- *      Frees the memory associated with an interpreter snapshot
- *      taken by Tcl_SaveResult.  If the snapshot is not
- *      restored, this procedure must be called to discard it,
- *      or the memory will be lost.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DiscardResult(statePtr)
-    Tcl_SavedResult *statePtr;	/* State returned by Tcl_SaveResult. */
-{
-    TclDecrRefCount(statePtr->objResultPtr);
-
-    if (statePtr->result == statePtr->appendResult) {
-	ckfree(statePtr->appendResult);
-    } else if (statePtr->freeProc) {
-	if ((statePtr->freeProc == TCL_DYNAMIC)
-	        || (statePtr->freeProc == (Tcl_FreeProc *) free)) {
-	    ckfree(statePtr->result);
-	} else {
-	    (*statePtr->freeProc)(statePtr->result);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetResult --
- *
- *	Arrange for "string" to be the Tcl return value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	interp->result is left pointing either to "string" (if "copy" is 0)
- *	or to a copy of string. Also, the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetResult(interp, string, freeProc)
-    Tcl_Interp *interp;		/* Interpreter with which to associate the
-				 * return value. */
-    register char *string;	/* Value to be returned.  If NULL, the
-				 * result is set to an empty string. */
-    Tcl_FreeProc *freeProc;	/* Gives information about the string:
-				 * TCL_STATIC, TCL_VOLATILE, or the address
-				 * of a Tcl_FreeProc such as free. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int length;
-    register Tcl_FreeProc *oldFreeProc = iPtr->freeProc;
-    char *oldResult = iPtr->result;
-
-    if (string == NULL) {
-	iPtr->resultSpace[0] = 0;
-	iPtr->result = iPtr->resultSpace;
-	iPtr->freeProc = 0;
-    } else if (freeProc == TCL_VOLATILE) {
-	length = strlen(string);
-	if (length > TCL_RESULT_SIZE) {
-	    iPtr->result = (char *) ckalloc((unsigned) length+1);
-	    iPtr->freeProc = TCL_DYNAMIC;
-	} else {
-	    iPtr->result = iPtr->resultSpace;
-	    iPtr->freeProc = 0;
-	}
-	strcpy(iPtr->result, string);
-    } else {
-	iPtr->result = string;
-	iPtr->freeProc = freeProc;
-    }
-
-    /*
-     * If the old result was dynamically-allocated, free it up.  Do it
-     * here, rather than at the beginning, in case the new result value
-     * was part of the old result value.
-     */
-
-    if (oldFreeProc != 0) {
-	if ((oldFreeProc == TCL_DYNAMIC)
-		|| (oldFreeProc == (Tcl_FreeProc *) free)) {
-	    ckfree(oldResult);
-	} else {
-	    (*oldFreeProc)(oldResult);
-	}
-    }
-
-    /*
-     * Reset the object result since we just set the string result.
-     */
-
-    ResetObjResult(iPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetStringResult --
- *
- *	Returns an interpreter's result value as a string.
- *
- * Results:
- *	The interpreter's result as a string.
- *
- * Side effects:
- *	If the string result is empty, the object result is moved to the
- *	string result, then the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetStringResult(interp)
-     register Tcl_Interp *interp; /* Interpreter whose result to return. */
-{
-    /*
-     * If the string result is empty, move the object result to the
-     * string result, then reset the object result.
-     */
-    
-    if (*(interp->result) == 0) {
-	Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	        TCL_VOLATILE);
-    }
-    return interp->result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetObjResult --
- *
- *	Arrange for objPtr to be an interpreter's result value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	interp->objResultPtr is left pointing to the object referenced
- *	by objPtr. The object's reference count is incremented since
- *	there is now a new reference to it. The reference count for any
- *	old objResultPtr value is decremented. Also, the string result
- *	is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetObjResult(interp, objPtr)
-    Tcl_Interp *interp;		/* Interpreter with which to associate the
-				 * return object value. */
-    register Tcl_Obj *objPtr;	/* Tcl object to be returned. If NULL, the
-				 * obj result is made an empty string
-				 * object. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    register Tcl_Obj *oldObjResult = iPtr->objResultPtr;
-
-    iPtr->objResultPtr = objPtr;
-    Tcl_IncrRefCount(objPtr);	/* since interp result is a reference */
-
-    /*
-     * We wait until the end to release the old object result, in case
-     * we are setting the result to itself.
-     */
-    
-    TclDecrRefCount(oldObjResult);
-
-    /*
-     * Reset the string result since we just set the result object.
-     */
-
-    if (iPtr->freeProc != NULL) {
-	if ((iPtr->freeProc == TCL_DYNAMIC)
-	        || (iPtr->freeProc == (Tcl_FreeProc *) free)) {
-	    ckfree(iPtr->result);
-	} else {
-	    (*iPtr->freeProc)(iPtr->result);
-	}
-	iPtr->freeProc = 0;
-    }
-    iPtr->result = iPtr->resultSpace;
-    iPtr->resultSpace[0] = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetObjResult --
- *
- *	Returns an interpreter's result value as a Tcl object. The object's
- *	reference count is not modified; the caller must do that if it
- *	needs to hold on to a long-term reference to it.
- *
- * Results:
- *	The interpreter's result as an object.
- *
- * Side effects:
- *	If the interpreter has a non-empty string result, the result object
- *	is either empty or stale because some procedure set interp->result
- *	directly. If so, the string result is moved to the result object
- *	then the string result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_GetObjResult(interp)
-    Tcl_Interp *interp;		/* Interpreter whose result to return. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *objResultPtr;
-    int length;
-
-    /*
-     * If the string result is non-empty, move the string result to the
-     * object result, then reset the string result.
-     */
-    
-    if (*(iPtr->result) != 0) {
-	ResetObjResult(iPtr);
-	
-	objResultPtr = iPtr->objResultPtr;
-	length = strlen(iPtr->result);
-	TclInitStringRep(objResultPtr, iPtr->result, length);
-	
-	if (iPtr->freeProc != NULL) {
-	    if ((iPtr->freeProc == TCL_DYNAMIC)
-	            || (iPtr->freeProc == (Tcl_FreeProc *) free)) {
-		ckfree(iPtr->result);
-	    } else {
-		(*iPtr->freeProc)(iPtr->result);
-	    }
-	    iPtr->freeProc = 0;
-	}
-	iPtr->result = iPtr->resultSpace;
-	iPtr->resultSpace[0] = 0;
-    }
-    return iPtr->objResultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendResultVA --
- *
- *	Append a variable number of strings onto the interpreter's string
- *	result.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The result of the interpreter given by the first argument is
- *	extended by the strings in the va_list (up to a terminating NULL
- *	argument).
- *
- *	If the string result is empty, the object result is moved to the
- *	string result, then the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendResultVA (interp, argList)
-    Tcl_Interp *interp;		/* Interpreter with which to associate the
-				 * return value. */
-    va_list argList;		/* Variable argument list. */
-{
-    Interp *iPtr = (Interp *) interp;
-    va_list tmpArgList;
-    char *string;
-    int newSpace;
-
-    /*
-     * If the string result is empty, move the object result to the
-     * string result, then reset the object result.
-     */
-
-    if (*(iPtr->result) == 0) {
-	Tcl_SetResult((Tcl_Interp *) iPtr,
-	        TclGetString(Tcl_GetObjResult((Tcl_Interp *) iPtr)),
-	        TCL_VOLATILE);
-    }
-    
-    /*
-     * Scan through all the arguments to see how much space is needed.
-     */
-
-    tmpArgList = argList;
-    newSpace = 0;
-    while (1) {
-	string = va_arg(tmpArgList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	newSpace += strlen(string);
-    }
-
-    /*
-     * If the append buffer isn't already setup and large enough to hold
-     * the new data, set it up.
-     */
-
-    if ((iPtr->result != iPtr->appendResult)
-	    || (iPtr->appendResult[iPtr->appendUsed] != 0)
-	    || ((newSpace + iPtr->appendUsed) >= iPtr->appendAvl)) {
-       SetupAppendBuffer(iPtr, newSpace);
-    }
-
-    /*
-     * Now go through all the argument strings again, copying them into the
-     * buffer.
-     */
-
-    while (1) {
-	string = va_arg(argList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	strcpy(iPtr->appendResult + iPtr->appendUsed, string);
-	iPtr->appendUsed += strlen(string);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendResult --
- *
- *	Append a variable number of strings onto the interpreter's string
- *	result.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The result of the interpreter given by the first argument is
- *	extended by the strings given by the second and following arguments
- *	(up to a terminating NULL argument).
- *
- *	If the string result is empty, the object result is moved to the
- *	string result, then the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendResult TCL_VARARGS_DEF(Tcl_Interp *,arg1)
-{
-    Tcl_Interp *interp;
-    va_list argList;
-
-    interp = TCL_VARARGS_START(Tcl_Interp *,arg1,argList);
-    Tcl_AppendResultVA(interp, argList);
-    va_end(argList);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendElement --
- *
- *	Convert a string to a valid Tcl list element and append it to the
- *	result (which is ostensibly a list).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The result in the interpreter given by the first argument is
- *	extended with a list element converted from string. A separator
- *	space is added before the converted list element unless the current
- *	result is empty, contains the single character "{", or ends in " {".
- *
- *	If the string result is empty, the object result is moved to the
- *	string result, then the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendElement(interp, string)
-    Tcl_Interp *interp;		/* Interpreter whose result is to be
-				 * extended. */
-    CONST char *string;		/* String to convert to list element and
-				 * add to result. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *dst;
-    int size;
-    int flags;
-
-    /*
-     * If the string result is empty, move the object result to the
-     * string result, then reset the object result.
-     */
-
-    if (*(iPtr->result) == 0) {
-	Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	        TCL_VOLATILE);
-    }
-
-    /*
-     * See how much space is needed, and grow the append buffer if
-     * needed to accommodate the list element.
-     */
-
-    size = Tcl_ScanElement(string, &flags) + 1;
-    if ((iPtr->result != iPtr->appendResult)
-	    || (iPtr->appendResult[iPtr->appendUsed] != 0)
-	    || ((size + iPtr->appendUsed) >= iPtr->appendAvl)) {
-       SetupAppendBuffer(iPtr, size+iPtr->appendUsed);
-    }
-
-    /*
-     * Convert the string into a list element and copy it to the
-     * buffer that's forming, with a space separator if needed.
-     */
-
-    dst = iPtr->appendResult + iPtr->appendUsed;
-    if (TclNeedSpace(iPtr->appendResult, dst)) {
-	iPtr->appendUsed++;
-	*dst = ' ';
-	dst++;
-    }
-    iPtr->appendUsed += Tcl_ConvertElement(string, dst, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetupAppendBuffer --
- *
- *	This procedure makes sure that there is an append buffer properly
- *	initialized, if necessary, from the interpreter's result, and
- *	that it has at least enough room to accommodate newSpace new
- *	bytes of information.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SetupAppendBuffer(iPtr, newSpace)
-    Interp *iPtr;		/* Interpreter whose result is being set up. */
-    int newSpace;		/* Make sure that at least this many bytes
-				 * of new information may be added. */
-{
-    int totalSpace;
-
-    /*
-     * Make the append buffer larger, if that's necessary, then copy the
-     * result into the append buffer and make the append buffer the official
-     * Tcl result.
-     */
-
-    if (iPtr->result != iPtr->appendResult) {
-	/*
-	 * If an oversized buffer was used recently, then free it up
-	 * so we go back to a smaller buffer.  This avoids tying up
-	 * memory forever after a large operation.
-	 */
-
-	if (iPtr->appendAvl > 500) {
-	    ckfree(iPtr->appendResult);
-	    iPtr->appendResult = NULL;
-	    iPtr->appendAvl = 0;
-	}
-	iPtr->appendUsed = strlen(iPtr->result);
-    } else if (iPtr->result[iPtr->appendUsed] != 0) {
-	/*
-	 * Most likely someone has modified a result created by
-	 * Tcl_AppendResult et al. so that it has a different size.
-	 * Just recompute the size.
-	 */
-
-	iPtr->appendUsed = strlen(iPtr->result);
-    }
-    
-    totalSpace = newSpace + iPtr->appendUsed;
-    if (totalSpace >= iPtr->appendAvl) {
-	char *new;
-
-	if (totalSpace < 100) {
-	    totalSpace = 200;
-	} else {
-	    totalSpace *= 2;
-	}
-	new = (char *) ckalloc((unsigned) totalSpace);
-	strcpy(new, iPtr->result);
-	if (iPtr->appendResult != NULL) {
-	    ckfree(iPtr->appendResult);
-	}
-	iPtr->appendResult = new;
-	iPtr->appendAvl = totalSpace;
-    } else if (iPtr->result != iPtr->appendResult) {
-	strcpy(iPtr->appendResult, iPtr->result);
-    }
-    
-    Tcl_FreeResult((Tcl_Interp *) iPtr);
-    iPtr->result = iPtr->appendResult;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FreeResult --
- *
- *	This procedure frees up the memory associated with an interpreter's
- *	string result. It also resets the interpreter's result object.
- *	Tcl_FreeResult is most commonly used when a procedure is about to
- *	replace one result value with another.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees the memory associated with interp's string result and sets
- *	interp->freeProc to zero, but does not change interp->result or
- *	clear error state. Resets interp's result object to an unshared
- *	empty object.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FreeResult(interp)
-    register Tcl_Interp *interp; /* Interpreter for which to free result. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    
-    if (iPtr->freeProc != NULL) {
-	if ((iPtr->freeProc == TCL_DYNAMIC)
-	        || (iPtr->freeProc == (Tcl_FreeProc *) free)) {
-	    ckfree(iPtr->result);
-	} else {
-	    (*iPtr->freeProc)(iPtr->result);
-	}
-	iPtr->freeProc = 0;
-    }
-    
-    ResetObjResult(iPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ResetResult --
- *
- *	This procedure resets both the interpreter's string and object
- *	results.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	It resets the result object to an unshared empty object. It
- *	then restores the interpreter's string result area to its default
- *	initialized state, freeing up any memory that may have been
- *	allocated. It also clears any error information for the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ResetResult(interp)
-    register Tcl_Interp *interp; /* Interpreter for which to clear result. */
-{
-    register Interp *iPtr = (Interp *) interp;
-
-    ResetObjResult(iPtr);
-    if (iPtr->freeProc != NULL) {
-	if ((iPtr->freeProc == TCL_DYNAMIC)
-	        || (iPtr->freeProc == (Tcl_FreeProc *) free)) {
-	    ckfree(iPtr->result);
-	} else {
-	    (*iPtr->freeProc)(iPtr->result);
-	}
-	iPtr->freeProc = 0;
-    }
-    iPtr->result = iPtr->resultSpace;
-    iPtr->resultSpace[0] = 0;
-    iPtr->flags &= ~(ERR_ALREADY_LOGGED | ERR_IN_PROGRESS | ERROR_CODE_SET);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ResetObjResult --
- *
- *	Procedure used to reset an interpreter's Tcl result object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Resets the interpreter's result object to an unshared empty string
- *	object with ref count one. It does not clear any error information
- *	in the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ResetObjResult(iPtr)
-    register Interp *iPtr;	/* Points to the interpreter whose result
-				 * object should be reset. */
-{
-    register Tcl_Obj *objResultPtr = iPtr->objResultPtr;
-
-    if (Tcl_IsShared(objResultPtr)) {
-	TclDecrRefCount(objResultPtr);
-	TclNewObj(objResultPtr);
-	Tcl_IncrRefCount(objResultPtr);
-	iPtr->objResultPtr = objResultPtr;
-    } else {
-	if ((objResultPtr->bytes != NULL)
-	        && (objResultPtr->bytes != tclEmptyStringRep)) {
-	    ckfree((char *) objResultPtr->bytes);
-	}
-	objResultPtr->bytes  = tclEmptyStringRep;
-	objResultPtr->length = 0;
-	if ((objResultPtr->typePtr != NULL)
-	        && (objResultPtr->typePtr->freeIntRepProc != NULL)) {
-	    objResultPtr->typePtr->freeIntRepProc(objResultPtr);
-	}
-	objResultPtr->typePtr = (Tcl_ObjType *) NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetErrorCodeVA --
- *
- *	This procedure is called to record machine-readable information
- *	about an error that is about to be returned.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The errorCode global variable is modified to hold all of the
- *	arguments to this procedure, in a list form with each argument
- *	becoming one element of the list.  A flag is set internally
- *	to remember that errorCode has been set, so the variable doesn't
- *	get set automatically when the error is returned.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetErrorCodeVA (interp, argList)
-    Tcl_Interp *interp;		/* Interpreter in which to access the errorCode
-				 * variable. */
-    va_list argList;		/* Variable argument list. */
-{
-    char *string;
-    int flags;
-    Interp *iPtr = (Interp *) interp;
-
-    /*
-     * Scan through the arguments one at a time, appending them to
-     * $errorCode as list elements.
-     */
-
-    flags = TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT;
-    while (1) {
-	string = va_arg(argList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	(void) Tcl_SetVar2((Tcl_Interp *) iPtr, "errorCode",
-		(char *) NULL, string, flags);
-	flags |= TCL_APPEND_VALUE;
-    }
-    iPtr->flags |= ERROR_CODE_SET;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetErrorCode --
- *
- *	This procedure is called to record machine-readable information
- *	about an error that is about to be returned.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The errorCode global variable is modified to hold all of the
- *	arguments to this procedure, in a list form with each argument
- *	becoming one element of the list.  A flag is set internally
- *	to remember that errorCode has been set, so the variable doesn't
- *	get set automatically when the error is returned.
- *
- *----------------------------------------------------------------------
- */
-	/* VARARGS2 */
-void
-Tcl_SetErrorCode TCL_VARARGS_DEF(Tcl_Interp *,arg1)
-{
-    Tcl_Interp *interp;
-    va_list argList;
-
-    /*
-     * Scan through the arguments one at a time, appending them to
-     * $errorCode as list elements.
-     */
-
-    interp = TCL_VARARGS_START(Tcl_Interp *,arg1,argList);
-    Tcl_SetErrorCodeVA(interp, argList);
-    va_end(argList);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetObjErrorCode --
- *
- *	This procedure is called to record machine-readable information
- *	about an error that is about to be returned. The caller should
- *	build a list object up and pass it to this routine.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The errorCode global variable is modified to be the new value.
- *	A flag is set internally to remember that errorCode has been
- *	set, so the variable doesn't get set automatically when the
- *	error is returned.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetObjErrorCode(interp, errorObjPtr)
-    Tcl_Interp *interp;
-    Tcl_Obj *errorObjPtr;
-{
-    Interp *iPtr;
-    
-    iPtr = (Interp *) interp;
-    Tcl_SetVar2Ex(interp, "errorCode", NULL, errorObjPtr, TCL_GLOBAL_ONLY);
-    iPtr->flags |= ERROR_CODE_SET;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclTransferResult --
- *
- *	Copy the result (and error information) from one interp to 
- *	another.  Used when one interp has caused another interp to 
- *	evaluate a script and then wants to transfer the results back
- *	to itself.
- *
- *	This routine copies the string reps of the result and error 
- *	information.  It does not simply increment the refcounts of the
- *	result and error information objects themselves.
- *	It is not legal to exchange objects between interps, because an
- *	object may be kept alive by one interp, but have an internal rep 
- *	that is only valid while some other interp is alive.  
- *
- * Results:
- *	The target interp's result is set to a copy of the source interp's
- *	result.  The source's error information "$errorInfo" may be
- *	appended to the target's error information and the source's error
- *	code "$errorCode" may be stored in the target's error code.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-	
-void
-TclTransferResult(sourceInterp, result, targetInterp)
-    Tcl_Interp *sourceInterp;	/* Interp whose result and error information
-				 * should be moved to the target interp.  
-				 * After moving result, this interp's result 
-				 * is reset. */
-    int result;			/* TCL_OK if just the result should be copied, 
-				 * TCL_ERROR if both the result and error 
-				 * information should be copied. */
-    Tcl_Interp *targetInterp;	/* Interp where result and error information 
-				 * should be stored.  If source and target
-				 * are the same, nothing is done. */
-{
-    Interp *iPtr;
-    Tcl_Obj *objPtr;
-
-    if (sourceInterp == targetInterp) {
-	return;
-    }
-
-    if (result == TCL_ERROR) {
-	/*
-	 * An error occurred, so transfer error information from the source
-	 * interpreter to the target interpreter.  Setting the flags tells
-	 * the target interp that it has inherited a partial traceback
-	 * chain, not just a simple error message.
-	 */
-
-	iPtr = (Interp *) sourceInterp;
-        if ((iPtr->flags & ERR_ALREADY_LOGGED) == 0) {
-            Tcl_AddErrorInfo(sourceInterp, "");
-        }
-        iPtr->flags &= ~(ERR_ALREADY_LOGGED);
-        
-        Tcl_ResetResult(targetInterp);
-        
-	objPtr = Tcl_GetVar2Ex(sourceInterp, "errorInfo", NULL,
-		TCL_GLOBAL_ONLY);
-	Tcl_SetVar2Ex(targetInterp, "errorInfo", NULL, objPtr,
-		TCL_GLOBAL_ONLY);
-
-	objPtr = Tcl_GetVar2Ex(sourceInterp, "errorCode", NULL,
-		TCL_GLOBAL_ONLY);
-	Tcl_SetVar2Ex(targetInterp, "errorCode", NULL, objPtr,
-		TCL_GLOBAL_ONLY);
-
-	((Interp *) targetInterp)->flags |= (ERR_IN_PROGRESS | ERROR_CODE_SET);
-    }
-
-    ((Interp *) targetInterp)->returnCode = ((Interp *) sourceInterp)->returnCode;
-    Tcl_SetObjResult(targetInterp, Tcl_GetObjResult(sourceInterp));
-    Tcl_ResetResult(sourceInterp);
-}
diff --git a/generic/tclScan.c b/generic/tclScan.c
deleted file mode 100644
index 92b192c..0000000
--- a/generic/tclScan.c
+++ /dev/null
@@ -1,1032 +0,0 @@
-/* 
- * tclScan.c --
- *
- *	This file contains the implementation of the "scan" command.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclScan.c,v 1.2 1999/04/16 00:46:53 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Flag values used by Tcl_ScanObjCmd.
- */
-
-#define SCAN_NOSKIP	0x1		  /* Don't skip blanks. */
-#define SCAN_SUPPRESS	0x2		  /* Suppress assignment. */
-#define SCAN_UNSIGNED	0x4		  /* Read an unsigned value. */
-#define SCAN_WIDTH	0x8		  /* A width value was supplied. */
-
-#define SCAN_SIGNOK	0x10		  /* A +/- character is allowed. */
-#define SCAN_NODIGITS	0x20		  /* No digits have been scanned. */
-#define SCAN_NOZERO	0x40		  /* No zero digits have been scanned. */
-#define SCAN_XOK	0x80		  /* An 'x' is allowed. */
-#define SCAN_PTOK	0x100		  /* Decimal point is allowed. */
-#define SCAN_EXPOK	0x200		  /* An exponent is allowed. */
-
-
-/*
- * The following structure contains the information associated with
- * a character set.
- */
-
-typedef struct CharSet {
-    int exclude;		/* 1 if this is an exclusion set. */
-    int nchars;
-    Tcl_UniChar *chars;
-    int nranges;
-    struct Range {
-	Tcl_UniChar start;
-	Tcl_UniChar end;
-    } *ranges;
-} CharSet;
-
-/*
- * Declarations for functions used only in this file.
- */
-
-static char *	BuildCharSet _ANSI_ARGS_((CharSet *cset, char *format));
-static int	CharInSet _ANSI_ARGS_((CharSet *cset, int ch));
-static void	ReleaseCharSet _ANSI_ARGS_((CharSet *cset));
-static int	ValidateFormat _ANSI_ARGS_((Tcl_Interp *interp, char *format,
-		    int numVars));
-
-/*
- *----------------------------------------------------------------------
- *
- * BuildCharSet --
- *
- *	This function examines a character set format specification
- *	and builds a CharSet containing the individual characters and
- *	character ranges specified.
- *
- * Results:
- *	Returns the next format position.
- *
- * Side effects:
- *	Initializes the charset.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-BuildCharSet(cset, format)
-    CharSet *cset;
-    char *format;		/* Points to first char of set. */
-{
-    Tcl_UniChar ch, start;
-    int offset, nranges;
-    char *end;
-
-    memset(cset, 0, sizeof(CharSet));
-    
-    offset = Tcl_UtfToUniChar(format, &ch);
-    if (ch == '^') {
-	cset->exclude = 1;
-	format += offset;
-	offset = Tcl_UtfToUniChar(format, &ch);
-    }
-    end = format + offset;
-
-    /*
-     * Find the close bracket so we can overallocate the set.
-     */
-
-    if (ch == ']') {
-	end += Tcl_UtfToUniChar(end, &ch);
-    }
-    nranges = 0;
-    while (ch != ']') {
-	if (ch == '-') {
-	    nranges++;
-	}
-	end += Tcl_UtfToUniChar(end, &ch);
-    }
-
-    cset->chars = (Tcl_UniChar *) ckalloc(sizeof(Tcl_UniChar)
-	    * (end - format - 1));
-    if (nranges > 0) {
-	cset->ranges = (struct Range *) ckalloc(sizeof(struct Range)*nranges);
-    } else {
-	cset->ranges = NULL;
-    }
-
-    /*
-     * Now build the character set.
-     */
-
-    cset->nchars = cset->nranges = 0;
-    format += Tcl_UtfToUniChar(format, &ch);
-    start = ch;
-    if (ch == ']' || ch == '-') {
-	cset->chars[cset->nchars++] = ch;
-	format += Tcl_UtfToUniChar(format, &ch);
-    }
-    while (ch != ']') {
-	if (*format == '-') {
-	    /*
-	     * This may be the first character of a range, so don't add
-	     * it yet.
-	     */
-
-	    start = ch;
-	} else if (ch == '-') {
-	    /*
-	     * Check to see if this is the last character in the set, in which
-	     * case it is not a range and we should add the previous character
-	     * as well as the dash.
-	     */
-
-	    if (*format == ']') {
-		cset->chars[cset->nchars++] = start;
-		cset->chars[cset->nchars++] = ch;
-	    } else {
-		format += Tcl_UtfToUniChar(format, &ch);
-
-		/*
-		 * Check to see if the range is in reverse order.
-		 */
-
-		if (start < ch) {
-		    cset->ranges[cset->nranges].start = start;
-		    cset->ranges[cset->nranges].end = ch;
-		} else {
-		    cset->ranges[cset->nranges].start = ch;
-		    cset->ranges[cset->nranges].end = start;
-		}		    
-		cset->nranges++;
-	    }
-	} else {
-	    cset->chars[cset->nchars++] = ch;
-	}
-	format += Tcl_UtfToUniChar(format, &ch);
-    }
-    return format;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CharInSet --
- *
- *	Check to see if a character matches the given set.
- *
- * Results:
- *	Returns non-zero if the character matches the given set.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CharInSet(cset, c)
-    CharSet *cset;
-    int c;			/* Character to test, passed as int because
-				 * of non-ANSI prototypes. */
-{
-    Tcl_UniChar ch = (Tcl_UniChar) c;
-    int i, match = 0;
-    for (i = 0; i < cset->nchars; i++) {
-	if (cset->chars[i] == ch) {
-	    match = 1;
-	    break;
-	}
-    }
-    if (!match) {
-	for (i = 0; i < cset->nranges; i++) {
-	    if ((cset->ranges[i].start <= ch)
-		    && (ch <= cset->ranges[i].end)) {
-		match = 1;
-		break;
-	    }
-	}
-    }
-    return (cset->exclude ? !match : match);    
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ReleaseCharSet --
- *
- *	Free the storage associated with a character set.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ReleaseCharSet(cset)
-    CharSet *cset;
-{
-    ckfree((char *)cset->chars);
-    if (cset->ranges) {
-	ckfree((char *)cset->ranges);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ValidateFormat --
- *
- *	Parse the format string and verify that it is properly formed
- *	and that there are exactly enough variables on the command line.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	May place an error in the interpreter result.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ValidateFormat(interp, format, numVars)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    char *format;		/* The format string. */
-    int numVars;		/* The number of variables passed to the
-				 * scan command. */
-{
-    int gotXpg, gotSequential, value, i, flags;
-    char *end;
-    Tcl_UniChar ch;
-    int *nassign = (int*)ckalloc(sizeof(int) * numVars);
-    int objIndex;
-
-    /*
-     * Initialize an array that records the number of times a variable
-     * is assigned to by the format string.  We use this to detect if
-     * a variable is multiply assigned or left unassigned.
-     */
-
-    for (i = 0; i < numVars; i++) {
-	nassign[i] = 0;
-    }
-
-    objIndex = gotXpg = gotSequential = 0;
-
-    while (*format != '\0') {
-	format += Tcl_UtfToUniChar(format, &ch);
-
-	flags = 0;
-
-	if (ch != '%') {
-	    continue;
-	}
-	format += Tcl_UtfToUniChar(format, &ch);
-	if (ch == '%') {
-	    continue;
-	}
-	if (ch == '*') {
-	    flags |= SCAN_SUPPRESS;
-	    format += Tcl_UtfToUniChar(format, &ch);
-	    goto xpgCheckDone;
-	}
-
-	if ((ch < 0x80) && isdigit(UCHAR(ch))) { /* INTL: "C" locale. */
-	    /*
-	     * Check for an XPG3-style %n$ specification.  Note: there
-	     * must not be a mixture of XPG3 specs and non-XPG3 specs
-	     * in the same format string.
-	     */
-
-	    value = strtoul(format-1, &end, 10); /* INTL: "C" locale. */
-	    if (*end != '$') {
-		goto notXpg;
-	    }
-	    format = end+1;
-	    format += Tcl_UtfToUniChar(format, &ch);
-	    gotXpg = 1;
-	    if (gotSequential) {
-		goto mixedXPG;
-	    }
-	    objIndex = value - 1;
-	    if ((objIndex < 0) || (objIndex >= numVars)) {
-		goto badIndex;
-	    }
-	    goto xpgCheckDone;
-	}
-
-	notXpg:
-	gotSequential = 1;
-	if (gotXpg) {
-	    mixedXPG:
-	    Tcl_SetResult(interp,
-		    "cannot mix \"%\" and \"%n$\" conversion specifiers",
-		    TCL_STATIC);
-	    goto error;
-	}
-
-	xpgCheckDone:
-	/*
-	 * Parse any width specifier.
-	 */
-
-	if ((ch < 0x80) && isdigit(UCHAR(ch))) { /* INTL: "C" locale. */
-	    value = strtoul(format-1, &format, 10); /* INTL: "C" locale. */
-	    flags |= SCAN_WIDTH;
-	    format += Tcl_UtfToUniChar(format, &ch);
-	}
-
-	/*
-	 * Ignore size specifier.
-	 */
-
- 	if ((ch == 'l') || (ch == 'L') || (ch == 'h')) {
-	    format += Tcl_UtfToUniChar(format, &ch);
-	}
-
-	if (!(flags & SCAN_SUPPRESS) && objIndex >= numVars) {
-	    goto badIndex;
-	}
-
-	/*
-	 * Handle the various field types.
-	 */
-
-	switch (ch) {
-	    case 'n':
-	    case 'd':
-	    case 'i':
-	    case 'o':
-	    case 'x':
-	    case 'u':
-	    case 'f':
-	    case 'e':
-	    case 'g':
-	    case 's':
-		break;
-	    case 'c':
-                if (flags & SCAN_WIDTH) {
-		    Tcl_SetResult(interp, "field width may not be specified in %c conversion", TCL_STATIC);
-		    goto error;
-                }
-		break;
-	    case '[':
-		if (*format == '\0') {
-		    goto badSet;
-		}
-		format += Tcl_UtfToUniChar(format, &ch);
-		if (ch == '^') {
-		    if (*format == '\0') {
-			goto badSet;
-		    }
-		    format += Tcl_UtfToUniChar(format, &ch);
-		}
-		if (ch == ']') {
-		    if (*format == '\0') {
-			goto badSet;
-		    }
-		    format += Tcl_UtfToUniChar(format, &ch);
-		}
-		while (ch != ']') {
-		    if (*format == '\0') {
-			goto badSet;
-		    }
-		    format += Tcl_UtfToUniChar(format, &ch);
-		}
-		break;
-	    badSet:
-		Tcl_SetResult(interp, "unmatched [ in format string",
-			TCL_STATIC);
-		goto error;
-	    default:
-	    {
-		char buf[TCL_UTF_MAX+1];
-
-		buf[Tcl_UniCharToUtf(ch, buf)] = '\0';
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"bad scan conversion character \"", buf, "\"", NULL);
-		goto error;
-	    }
-	}
-	if (!(flags & SCAN_SUPPRESS)) {
-	    nassign[objIndex]++;
-	    objIndex++;
-	}
-    }
-
-    /*
-     * Verify that all of the variable were assigned exactly once.
-     */
-
-    for (i = 0; i < numVars; i++) {
-	if (nassign[i] > 1) {
-	    Tcl_SetResult(interp, "variable is assigned by multiple \"%n$\" conversion specifiers", TCL_STATIC);
-	    goto error;
-	} else if (nassign[i] == 0) {
-	    Tcl_SetResult(interp, "variable is not assigend by any conversion specifiers", TCL_STATIC);
-	    goto error;
-	}
-    }
-
-    ckfree((char *)nassign);
-    return TCL_OK;
-
-    badIndex:
-    if (gotXpg) {
-	Tcl_SetResult(interp, "\"%n$\" argument index out of range",
-		TCL_STATIC);
-    } else {
-	Tcl_SetResult(interp, 
-		"different numbers of variable names and field specifiers",
-		TCL_STATIC);
-    }
-
-    error:
-    ckfree((char *)nassign);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ScanObjCmd --
- *
- *	This procedure is invoked to process the "scan" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ScanObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;    	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *format;
-    int numVars, nconversions;
-    int objIndex, offset, i, value, result, code;
-    char *string, *end, *baseString;
-    char op = 0;
-    int base = 0;
-    int underflow = 0;
-    size_t width;
-    long (*fn)() = NULL;
-    Tcl_UniChar ch, sch;
-    Tcl_Obj **objs, *objPtr;
-    int flags;
-    char buf[513];			  /* Temporary buffer to hold scanned
-					   * number strings before they are
-					   * passed to strtoul. */
-
-    if (objc < 3) {
-        Tcl_WrongNumArgs(interp, 1, objv,
-		"string format ?varName varName ...?");
-	return TCL_ERROR;
-    }
-
-    format = Tcl_GetStringFromObj(objv[2], NULL);
-    numVars = objc-3;
-
-    /*
-     * Check for errors in the format string.
-     */
-    
-    if (ValidateFormat(interp, format, numVars) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Allocate space for the result objects.
-     */
-    
-    objs = (Tcl_Obj **) ckalloc(sizeof(Tcl_Obj*) * numVars);
-    for (i = 0; i < numVars; i++) {
-	objs[i] = NULL;
-    }
-
-    string = Tcl_GetStringFromObj(objv[1], NULL);
-    baseString = string;
-
-    /*
-     * Iterate over the format string filling in the result objects until
-     * we reach the end of input, the end of the format string, or there
-     * is a mismatch.
-     */
-
-    objIndex = 0;
-    nconversions = 0;
-    while (*format != '\0') {
-	format += Tcl_UtfToUniChar(format, &ch);
-
-	flags = 0;
-
-	/*
-	 * If we see whitespace in the format, skip whitespace in the string.
-	 */
-
-	if (Tcl_UniCharIsSpace(ch)) {
-	    offset = Tcl_UtfToUniChar(string, &sch);
-	    while (Tcl_UniCharIsSpace(sch)) {
-		if (*string == '\0') {
-		    goto done;
-		}
-		string += offset;
-		offset = Tcl_UtfToUniChar(string, &sch);
-	    }
-	    continue;
-	}
-	    
-	if (ch != '%') {
-	    literal:
-	    if (*string == '\0') {
-		underflow = 1;
-		goto done;
-	    }
-	    string += Tcl_UtfToUniChar(string, &sch);
-	    if (ch != sch) {
-		goto done;
-	    }
-	    continue;
-	}
-
-	format += Tcl_UtfToUniChar(format, &ch);
-	if (ch == '%') {
-	    goto literal;
-	}
-
-	/*
-	 * Check for assignment suppression ('*') or an XPG3-style
-	 * assignment ('%n$').
-	 */
-
-	if (ch == '*') {
-	    flags |= SCAN_SUPPRESS;
-	    format += Tcl_UtfToUniChar(format, &ch);
-	} else if ((ch < 0x80) && isdigit(UCHAR(ch))) { /* INTL: "C" locale. */
-	    value = strtoul(format-1, &end, 10); /* INTL: "C" locale. */
-	    if (*end == '$') {
-		format = end+1;
-		format += Tcl_UtfToUniChar(format, &ch);
-		objIndex = value - 1;
-	    }
-	}
-
-	/*
-	 * Parse any width specifier.
-	 */
-
-	if ((ch < 0x80) && isdigit(UCHAR(ch))) { /* INTL: "C" locale. */
-	    width = strtoul(format-1, &format, 10); /* INTL: "C" locale. */
-	    format += Tcl_UtfToUniChar(format, &ch);
-	} else {
-	    width = 0;
-	}
-
-	/*
-	 * Ignore size specifier.
-	 */
-
- 	if ((ch == 'l') || (ch == 'L') || (ch == 'h')) {
-	    format += Tcl_UtfToUniChar(format, &ch);
-	}
-
-	/*
-	 * Handle the various field types.
-	 */
-
-	switch (ch) {
-	    case 'n':
-		if (!(flags & SCAN_SUPPRESS)) {
-		    objPtr = Tcl_NewIntObj(string - baseString);
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-		nconversions++;
-		continue;
-
-	    case 'd':
-		op = 'i';
-		base = 10;
-		fn = (long (*)())strtol;
-		break;
-	    case 'i':
-		op = 'i';
-		base = 0;
-		fn = (long (*)())strtol;
-		break;
-	    case 'o':
-		op = 'i';
-		base = 8;
-		fn = (long (*)())strtol;
-		break;
-	    case 'x':
-		op = 'i';
-		base = 16;
-		fn = (long (*)())strtol;
-		break;
-	    case 'u':
-		op = 'i';
-		base = 10;
-		flags |= SCAN_UNSIGNED;
-		fn = (long (*)())strtoul;
-		break;
-
-	    case 'f':
-	    case 'e':
-	    case 'g':
-		op = 'f';
-		break;
-
-	    case 's':
-		op = 's';
-		break;
-
-	    case 'c':
-		op = 'c';
-		flags |= SCAN_NOSKIP;
-		break;
-	    case '[':
-		op = '[';
-		flags |= SCAN_NOSKIP;
-		break;
-	}
-
-	/*
-	 * At this point, we will need additional characters from the
-	 * string to proceed.
-	 */
-
-	if (*string == '\0') {
-	    underflow = 1;
-	    goto done;
-	}
-	
-	/*
-	 * Skip any leading whitespace at the beginning of a field unless
-	 * the format suppresses this behavior.
-	 */
-
-	if (!(flags & SCAN_NOSKIP)) {
-	    while (*string != '\0') {
-		offset = Tcl_UtfToUniChar(string, &sch);
-		if (!Tcl_UniCharIsSpace(sch)) {
-		    break;
-		}
-		string += offset;
-	    }
-	    if (*string == '\0') {
-		underflow = 1;
-		goto done;
-	    }
-	}
-
-	/*
-	 * Perform the requested scanning operation.
-	 */
-	
-	switch (op) {
-	    case 's':
-		/*
-		 * Scan a string up to width characters or whitespace.
-		 */
-
-		if (width == 0) {
-		    width = (size_t) ~0;
-		}
-		end = string;
-		while (*end != '\0') {
-		    offset = Tcl_UtfToUniChar(end, &sch);
-		    if (Tcl_UniCharIsSpace(sch)) {
-			break;
-		    }
-		    end += offset;
-		    if (--width == 0) {
-			break;
-		    }
-		}
-		if (!(flags & SCAN_SUPPRESS)) {
-		    objPtr = Tcl_NewStringObj(string, end-string);
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-		string = end;
-		break;
-
-	    case '[': {
-		CharSet cset;
-
-		if (width == 0) {
-		    width = (size_t) ~0;
-		}
-		end = string;
-
-		format = BuildCharSet(&cset, format);
-		while (*end != '\0') {
-		    offset = Tcl_UtfToUniChar(end, &sch);
-		    if (!CharInSet(&cset, (int)sch)) {
-			break;
-		    }
-		    end += offset;
-		    if (--width == 0) {
-			break;
-		    }
-		}
-		ReleaseCharSet(&cset);
-
-		if (!(flags & SCAN_SUPPRESS)) {
-		    objPtr = Tcl_NewStringObj(string, end-string);
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-		string = end;
-		
-		break;
-	    }
-	    case 'c':
-		/*
-		 * Scan a single Unicode character.
-		 */
-
-		string += Tcl_UtfToUniChar(string, &sch);
-		if (!(flags & SCAN_SUPPRESS)) {
-		    objPtr = Tcl_NewIntObj((int)sch);
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-		break;
-
-	    case 'i':
-		/*
-		 * Scan an unsigned or signed integer.
-		 */
-
-		if ((width == 0) || (width > sizeof(buf) - 1)) {
-		    width = sizeof(buf) - 1;
-		}
-		flags |= SCAN_SIGNOK | SCAN_NODIGITS | SCAN_NOZERO;
-		for (end = buf; width > 0; width--) {
-		    switch (*string) {
-			/*
-			 * The 0 digit has special meaning at the beginning of
-			 * a number.  If we are unsure of the base, it
-			 * indicates that we are in base 8 or base 16 (if it is
-			 * followed by an 'x').
-			 */
-			case '0':
-			    if (base == 0) {
-				base = 8;
-				flags |= SCAN_XOK;
-			    }
-			    if (flags & SCAN_NOZERO) {
-				flags &= ~(SCAN_SIGNOK | SCAN_NODIGITS
-					| SCAN_NOZERO);
-			    } else {
-				flags &= ~(SCAN_SIGNOK | SCAN_XOK
-					| SCAN_NODIGITS);
-			    }
-			    goto addToInt;
-
-			case '1': case '2': case '3': case '4':
-			case '5': case '6': case '7':
-			    if (base == 0) {
-				base = 10;
-			    }
-			    flags &= ~(SCAN_SIGNOK | SCAN_XOK | SCAN_NODIGITS);
-			    goto addToInt;
-
-			case '8': case '9':
-			    if (base == 0) {
-				base = 10;
-			    }
-			    if (base <= 8) {
-				break;
-			    }
-			    flags &= ~(SCAN_SIGNOK | SCAN_XOK | SCAN_NODIGITS);
-			    goto addToInt;
-
-			case 'A': case 'B': case 'C':
-			case 'D': case 'E': case 'F': 
-			case 'a': case 'b': case 'c':
-			case 'd': case 'e': case 'f':
-			    if (base <= 10) {
-				break;
-			    }
-			    flags &= ~(SCAN_SIGNOK | SCAN_XOK | SCAN_NODIGITS);
-			    goto addToInt;
-
-			case '+': case '-':
-			    if (flags & SCAN_SIGNOK) {
-				flags &= ~SCAN_SIGNOK;
-				goto addToInt;
-			    }
-			    break;
-
-			case 'x': case 'X':
-			    if ((flags & SCAN_XOK) && (end == buf+1)) {
-				base = 16;
-				flags &= ~SCAN_XOK;
-				goto addToInt;
-			    }
-			    break;
-		    }
-
-		    /*
-		     * We got an illegal character so we are done accumulating.
-		     */
-
-		    break;
-
-		    addToInt:
-		    /*
-		     * Add the character to the temporary buffer.
-		     */
-
-		    *end++ = *string++;
-		    if (*string == '\0') {
-			break;
-		    }
-		}
-
-		/*
-		 * Check to see if we need to back up because we only got a
-		 * sign or a trailing x after a 0.
-		 */
-
-		if (flags & SCAN_NODIGITS) {
-		    if (*string == '\0') {
-			underflow = 1;
-		    }
-		    goto done;
-		} else if (end[-1] == 'x' || end[-1] == 'X') {
-		    end--;
-		    string--;
-		}
-
-
-		/*
-		 * Scan the value from the temporary buffer.  If we are
-		 * returning a large unsigned value, we have to convert it back
-		 * to a string since Tcl only supports signed values.
-		 */
-
-		if (!(flags & SCAN_SUPPRESS)) {
-		    *end = '\0';
-		    value = (int) (*fn)(buf, NULL, base);
-		    if ((flags & SCAN_UNSIGNED) && (value < 0)) {
-			sprintf(buf, "%u", value); /* INTL: ISO digit */
-			objPtr = Tcl_NewStringObj(buf, -1);
-		    } else {
-			objPtr = Tcl_NewIntObj(value);
-		    }
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-
-		break;
-
-	    case 'f':
-		/*
-		 * Scan a floating point number
-		 */
-
-		if ((width == 0) || (width > sizeof(buf) - 1)) {
-		    width = sizeof(buf) - 1;
-		}
-		flags |= SCAN_SIGNOK | SCAN_NODIGITS | SCAN_PTOK | SCAN_EXPOK;
-		for (end = buf; width > 0; width--) {
-		    switch (*string) {
-			case '0': case '1': case '2': case '3':
-			case '4': case '5': case '6': case '7':
-			case '8': case '9':
-			    flags &= ~(SCAN_SIGNOK | SCAN_NODIGITS);
-			    goto addToFloat;
-			case '+': case '-':
-			    if (flags & SCAN_SIGNOK) {
-				flags &= ~SCAN_SIGNOK;
-				goto addToFloat;
-			    }
-			    break;
-			case '.':
-			    if (flags & SCAN_PTOK) {
-				flags &= ~(SCAN_SIGNOK | SCAN_PTOK);
-				goto addToFloat;
-			    }
-			    break;
-			case 'e': case 'E':
-			    /*
-			     * An exponent is not allowed until there has
-			     * been at least one digit.
-			     */
-
-			    if ((flags & (SCAN_NODIGITS | SCAN_EXPOK))
-				    == SCAN_EXPOK) {
-				flags = (flags & ~(SCAN_EXPOK|SCAN_PTOK))
-				    | SCAN_SIGNOK | SCAN_NODIGITS;
-				goto addToFloat;
-			    }
-			    break;
-		    }
-
-		    /*
-		     * We got an illegal character so we are done accumulating.
-		     */
-
-		    break;
-
-		    addToFloat:
-		    /*
-		     * Add the character to the temporary buffer.
-		     */
-
-		    *end++ = *string++;
-		    if (*string == '\0') {
-			break;
-		    }
-		}
-
-		/*
-		 * Check to see if we need to back up because we saw a
-		 * trailing 'e' or sign.
-		 */
-
-		if (flags & SCAN_NODIGITS) {
-		    if (flags & SCAN_EXPOK) {
-			/*
-			 * There were no digits at all so scanning has
-			 * failed and we are done.
-			 */
-			if (*string == '\0') {
-			    underflow = 1;
-			}
-			goto done;
-		    }
-
-		    /*
-		     * We got a bad exponent ('e' and maybe a sign).
-		     */
-
-		    end--;
-		    string--;
-		    if (*end != 'e' && *end != 'E') {
-			end--;
-			string--;
-		    }
-		}
-
-		/*
-		 * Scan the value from the temporary buffer.
-		 */
-
-		if (!(flags & SCAN_SUPPRESS)) {
-		    double dvalue;
-		    *end = '\0';
-		    dvalue = strtod(buf, NULL);
-		    objPtr = Tcl_NewDoubleObj(dvalue);
-		    Tcl_IncrRefCount(objPtr);
-		    objs[objIndex++] = objPtr;
-		}
-		break;
-	}
-	nconversions++;
-    }
-
-    done:
-    result = 0;
-    code = TCL_OK;
-
-    for (i = 0; i < numVars; i++) {
-	if (objs[i] != NULL) {
-	    result++;
-	    if (Tcl_ObjSetVar2(interp, objv[i+3], NULL, objs[i], 0) == NULL) {
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"couldn't set variable \"",
-			Tcl_GetString(objv[i+3]), "\"", (char *) NULL);
-		code = TCL_ERROR;
-	    }
-	    Tcl_DecrRefCount(objs[i]);
-	}
-    }
-    ckfree((char*) objs);
-    if (code == TCL_OK) {
-	if (underflow && (nconversions == 0)) {
-	    result = -1;
-	}
-	Tcl_SetObjResult(interp, Tcl_NewIntObj(result));
-    }
-    return code;
-}
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
deleted file mode 100644
index c0261c7..0000000
--- a/generic/tclStringObj.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* 
- * tclStringObj.c --
- *
- *	This file contains procedures that implement string operations
- *	on Tcl objects.  To do this efficiently (i.e. to allow many
- *	appends to be done to an object without constantly reallocating
- *	the space for the string representation) we overallocate the
- *	space for the string and use the internal representation to keep
- *	track of the extra space.  Objects with this internal
- *	representation are called "expandable string objects".
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclStringObj.c,v 1.4 1999/04/16 00:46:53 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static void		ConvertToStringType _ANSI_ARGS_((Tcl_Obj *objPtr));
-static void		DupStringInternalRep _ANSI_ARGS_((Tcl_Obj *objPtr,
-			    Tcl_Obj *copyPtr));
-static int		SetStringFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static void		UpdateStringOfString _ANSI_ARGS_((Tcl_Obj *objPtr));
-
-/*
- * The structure below defines the string Tcl object type by means of
- * procedures that can be invoked by generic object code.
- */
-
-Tcl_ObjType tclStringType = {
-    "string",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,	/* freeIntRepProc */
-    DupStringInternalRep,		/* dupIntRepProc */
-    UpdateStringOfString,		/* updateStringProc */
-    SetStringFromAny			/* setFromAnyProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewStringObj --
- *
- *	This procedure is normally called when not debugging: i.e., when
- *	TCL_MEM_DEBUG is not defined. It creates a new string object and
- *	initializes it from the byte pointer and length arguments.
- *
- *	When TCL_MEM_DEBUG is defined, this procedure just returns the
- *	result of calling the debugging version Tcl_DbNewStringObj.
- *
- * Results:
- *	A newly created string object is returned that has ref count zero.
- *
- * Side effects:
- *	The new object's internal string representation will be set to a
- *	copy of the length bytes starting at "bytes". If "length" is
- *	negative, use bytes up to the first NULL byte; i.e., assume "bytes"
- *	points to a C-style NULL-terminated string. The object's type is set
- *	to NULL. An extra NULL is added to the end of the new object's byte
- *	array.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-#undef Tcl_NewStringObj
-
-Tcl_Obj *
-Tcl_NewStringObj(bytes, length)
-    CONST char *bytes;		/* Points to the first of the length bytes
-				 * used to initialize the new object. */
-    int length;			/* The number of bytes to copy from "bytes"
-				 * when initializing the new object. If 
-				 * negative, use bytes up to the first
-				 * NULL byte. */
-{
-    return Tcl_DbNewStringObj(bytes, length, "unknown", 0);
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_NewStringObj(bytes, length)
-    CONST char *bytes;		/* Points to the first of the length bytes
-				 * used to initialize the new object. */
-    int length;			/* The number of bytes to copy from "bytes"
-				 * when initializing the new object. If 
-				 * negative, use bytes up to the first
-				 * NULL byte. */
-{
-    register Tcl_Obj *objPtr;
-
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    TclNewObj(objPtr);
-    TclInitStringRep(objPtr, bytes, length);
-    return objPtr;
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DbNewStringObj --
- *
- *	This procedure is normally called when debugging: i.e., when
- *	TCL_MEM_DEBUG is defined. It creates new string objects. It is the
- *	same as the Tcl_NewStringObj procedure above except that it calls
- *	Tcl_DbCkalloc directly with the file name and line number from its
- *	caller. This simplifies debugging since then the checkmem command
- *	will report the correct file name and line number when reporting
- *	objects that haven't been freed.
- *
- *	When TCL_MEM_DEBUG is not defined, this procedure just returns the
- *	result of calling Tcl_NewStringObj.
- *
- * Results:
- *	A newly created string object is returned that has ref count zero.
- *
- * Side effects:
- *	The new object's internal string representation will be set to a
- *	copy of the length bytes starting at "bytes". If "length" is
- *	negative, use bytes up to the first NULL byte; i.e., assume "bytes"
- *	points to a C-style NULL-terminated string. The object's type is set
- *	to NULL. An extra NULL is added to the end of the new object's byte
- *	array.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef TCL_MEM_DEBUG
-
-Tcl_Obj *
-Tcl_DbNewStringObj(bytes, length, file, line)
-    CONST char *bytes;		/* Points to the first of the length bytes
-				 * used to initialize the new object. */
-    int length;			/* The number of bytes to copy from "bytes"
-				 * when initializing the new object. If 
-				 * negative, use bytes up to the first
-				 * NULL byte. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    register Tcl_Obj *objPtr;
-
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    TclDbNewObj(objPtr, file, line);
-    TclInitStringRep(objPtr, bytes, length);
-    return objPtr;
-}
-
-#else /* if not TCL_MEM_DEBUG */
-
-Tcl_Obj *
-Tcl_DbNewStringObj(bytes, length, file, line)
-    CONST char *bytes;		/* Points to the first of the length bytes
-				 * used to initialize the new object. */
-    register int length;	/* The number of bytes to copy from "bytes"
-				 * when initializing the new object. If 
-				 * negative, use bytes up to the first
-				 * NULL byte. */
-    char *file;			/* The name of the source file calling this
-				 * procedure; used for debugging. */
-    int line;			/* Line number in the source file; used
-				 * for debugging. */
-{
-    return Tcl_NewStringObj(bytes, length);
-}
-#endif /* TCL_MEM_DEBUG */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetStringObj --
- *
- *	Modify an object to hold a string that is a copy of the bytes
- *	indicated by the byte pointer and length arguments. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string representation will be set to a copy of
- *	the "length" bytes starting at "bytes". If "length" is negative, use
- *	bytes up to the first NULL byte; i.e., assume "bytes" points to a
- *	C-style NULL-terminated string. The object's old string and internal
- *	representations are freed and the object's type is set NULL.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetStringObj(objPtr, bytes, length)
-    register Tcl_Obj *objPtr;	/* Object whose internal rep to init. */
-    char *bytes;		/* Points to the first of the length bytes
-				 * used to initialize the object. */
-    register int length;	/* The number of bytes to copy from "bytes"
-				 * when initializing the object. If 
-				 * negative, use bytes up to the first
-				 * NULL byte.*/
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    /*
-     * Free any old string rep, then set the string rep to a copy of
-     * the length bytes starting at "bytes".
-     */
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetStringObj called with shared object");
-    }
-
-    Tcl_InvalidateStringRep(objPtr);
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    TclInitStringRep(objPtr, bytes, length);
-        
-    /*
-     * Set the type to NULL and free any internal rep for the old type.
-     */
-
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    objPtr->typePtr = NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetObjLength --
- *
- *	This procedure changes the length of the string representation
- *	of an object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If the size of objPtr's string representation is greater than
- *	length, then it is reduced to length and a new terminating null
- *	byte is stored in the strength.  If the length of the string
- *	representation is greater than length, the storage space is
- *	reallocated to the given length; a null byte is stored at the
- *	end, but other bytes past the end of the original string
- *	representation are undefined.  The object's internal
- *	representation is changed to "expendable string".
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetObjLength(objPtr, length)
-    register Tcl_Obj *objPtr;	/* Pointer to object.  This object must
-				 * not currently be shared. */
-    register int length;	/* Number of bytes desired for string
-				 * representation of object, not including
-				 * terminating null byte. */
-{
-    char *new;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_SetObjLength called with shared object");
-    }
-    if (objPtr->typePtr != &tclStringType) {
-	ConvertToStringType(objPtr);
-    }
-    
-    if ((long)length > objPtr->internalRep.longValue) {
-	/*
-	 * Not enough space in current string. Reallocate the string
-	 * space and free the old string.
-	 */
-
-	new = (char *) ckalloc((unsigned) (length+1));
-	if (objPtr->bytes != NULL) {
-	    memcpy((VOID *) new, (VOID *) objPtr->bytes,
-		    (size_t) objPtr->length);
-	    Tcl_InvalidateStringRep(objPtr);
-	}
-	objPtr->bytes = new;
-	objPtr->internalRep.longValue = (long) length;
-    }
-    objPtr->length = length;
-    if ((objPtr->bytes != NULL) && (objPtr->bytes != tclEmptyStringRep)) {
-	objPtr->bytes[length] = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendToObj --
- *
- *	This procedure appends a sequence of bytes to an object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The bytes at *bytes are appended to the string representation
- *	of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendToObj(objPtr, bytes, length)
-    register Tcl_Obj *objPtr;	/* Points to the object to append to. */
-    char *bytes;		/* Points to the bytes to append to the
-				 * object. */
-    register int length;	/* The number of bytes to append from
-				 * "bytes". If < 0, then append all bytes
-				 * up to NULL byte. */
-{
-    int newLength, oldLength;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_AppendToObj called with shared object");
-    }
-    if (objPtr->typePtr != &tclStringType) {
-	ConvertToStringType(objPtr);
-    }
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    if (length == 0) {
-	return;
-    }
-    oldLength = objPtr->length;
-    newLength = length + oldLength;
-    if ((long)newLength > objPtr->internalRep.longValue) {
-	/*
-	 * There isn't currently enough space in the string
-	 * representation so allocate additional space.  In fact,
-	 * overallocate so that there is room for future growth without
-	 * having to reallocate again.
-	 */
-
-	Tcl_SetObjLength(objPtr, 2*newLength);
-    }
-    if (length > 0) {
-	memcpy((VOID *) (objPtr->bytes + oldLength), (VOID *) bytes,
-	       (size_t) length);
-	objPtr->length = newLength;
-	objPtr->bytes[objPtr->length] = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendObjToObj --
- *
- *	This procedure appends the string rep of one object to another.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The string rep of appendObjPtr is appended to the string 
- *	representation of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendObjToObj(objPtr, appendObjPtr)
-    Tcl_Obj *objPtr;		/* Points to the object to append to. */
-    Tcl_Obj *appendObjPtr;	/* Object to append. */
-{
-    int length;
-    char *stringRep;
-
-    stringRep = Tcl_GetStringFromObj(appendObjPtr, &length);
-    Tcl_AppendToObj(objPtr, stringRep, length);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendStringsToObjVA --
- *
- *	This procedure appends one or more null-terminated strings
- *	to an object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The contents of all the string arguments are appended to the
- *	string representation of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendStringsToObjVA (objPtr, argList)
-    Tcl_Obj *objPtr;		/* Points to the object to append to. */
-    va_list argList;		/* Variable argument list. */
-{
-    va_list tmpArgList;
-    int newLength, oldLength;
-    register char *string, *dst;
-
-    if (Tcl_IsShared(objPtr)) {
-	panic("Tcl_AppendStringsToObj called with shared object");
-    }
-    if (objPtr->typePtr != &tclStringType) {
-	ConvertToStringType(objPtr);
-    }
-
-    /*
-     * Figure out how much space is needed for all the strings, and
-     * expand the string representation if it isn't big enough. If no
-     * bytes would be appended, just return.
-     */
-
-    tmpArgList = argList;
-    newLength = oldLength = objPtr->length;
-    while (1) {
-	string = va_arg(tmpArgList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	newLength += strlen(string);
-    }
-    if (newLength == oldLength) {
-	return;
-    }
-
-    if ((long)newLength > objPtr->internalRep.longValue) {
-	/*
-	 * There isn't currently enough space in the string
-	 * representation so allocate additional space.  If the current
-	 * string representation isn't empty (i.e. it looks like we're
-	 * doing a series of appends) then overallocate the space so
-	 * that we won't have to do as much reallocation in the future.
-	 */
-
-	Tcl_SetObjLength(objPtr,
-		(objPtr->length == 0) ? newLength : 2*newLength);
-    }
-
-    /*
-     * Make a second pass through the arguments, appending all the
-     * strings to the object.
-     */
-
-    dst = objPtr->bytes + oldLength;
-    while (1) {
-	string = va_arg(argList, char *);
-	if (string == NULL) {
-	    break;
-	}
-	while (*string != 0) {
-	    *dst = *string;
-	    dst++;
-	    string++;
-	}
-    }
-
-    /*
-     * Add a null byte to terminate the string.  However, be careful:
-     * it's possible that the object is totally empty (if it was empty
-     * originally and there was nothing to append).  In this case dst is
-     * NULL; just leave everything alone.
-     */
-
-    if (dst != NULL) {
-	*dst = 0;
-    }
-    objPtr->length = newLength;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendStringsToObj --
- *
- *	This procedure appends one or more null-terminated strings
- *	to an object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The contents of all the string arguments are appended to the
- *	string representation of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AppendStringsToObj TCL_VARARGS_DEF(Tcl_Obj *,arg1)
-{
-    register Tcl_Obj *objPtr;
-    va_list argList;
-
-    objPtr = TCL_VARARGS_START(Tcl_Obj *,arg1,argList);
-    Tcl_AppendStringsToObjVA(objPtr, argList);
-    va_end(argList);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConvertToStringType --
- *
- *	This procedure converts the internal representation of an object
- *	to "expandable string" type.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Any old internal reputation for objPtr is freed and the
- *	internal representation is set to that for an expandable string
- *	(the field internalRep.longValue holds 1 less than the allocated
- *	length of objPtr's string representation).
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ConvertToStringType(objPtr)
-    register Tcl_Obj *objPtr;	/* Pointer to object.  Must have a
-				 * typePtr that isn't &tclStringType. */
-{
-    if (objPtr->typePtr != NULL) {
-	if (objPtr->bytes == NULL) {
-	    objPtr->typePtr->updateStringProc(objPtr);
-	}
-	if (objPtr->typePtr->freeIntRepProc != NULL) {
-	    objPtr->typePtr->freeIntRepProc(objPtr);
-	}
-    }
-    objPtr->typePtr = &tclStringType;
-    if (objPtr->bytes != NULL) {
-	objPtr->internalRep.longValue = (long)objPtr->length;
-    } else {
-	objPtr->internalRep.longValue = 0;
-	objPtr->length = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupStringInternalRep --
- *
- *	Initialize the internal representation of a new Tcl_Obj to a
- *	copy of the internal representation of an existing string object.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	copyPtr's internal rep is set to a copy of srcPtr's internal
- *	representation.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupStringInternalRep(srcPtr, copyPtr)
-    register Tcl_Obj *srcPtr;	/* Object with internal rep to copy.  Must
-				 * have an internal representation of type
-				 * "expandable string". */
-    register Tcl_Obj *copyPtr;	/* Object with internal rep to set.  Must
-				 * not currently have an internal rep.*/
-{
-    /*
-     * Tricky point: the string value was copied by generic object
-     * management code, so it doesn't contain any extra bytes that
-     * might exist in the source object.
-     */
-
-    copyPtr->internalRep.longValue = (long)copyPtr->length;
-    copyPtr->typePtr = &tclStringType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetStringFromAny --
- *
- *	Create an internal representation of type "expandable string"
- *	for an object.
- *
- * Results:
- *	This operation always succeeds and returns TCL_OK.
- *
- * Side effects:
- *	This procedure does nothing; there is no advantage in converting
- *	the internal representation now, so we just defer it.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetStringFromAny(interp, objPtr)
-    Tcl_Interp *interp;		/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr;		/* The object to convert. */
-{
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfString --
- *
- *	Update the string representation for an object whose internal
- *	representation is "expandable string".
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfString(objPtr)
-    Tcl_Obj *objPtr;		/* Object with string rep to update. */
-{
-    /*
-     * The string is almost always valid already, in which case there's
-     * nothing for us to do. The only case we have to worry about is if
-     * the object is totally null. In this case, set the string rep to
-     * an empty string.
-     */
-
-    if (objPtr->bytes == NULL) {
-	objPtr->bytes = tclEmptyStringRep;
-	objPtr->length = 0;
-    }
-    return;
-}
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
deleted file mode 100644
index d11b0b3..0000000
--- a/generic/tclStubInit.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/* 
- * tclStubInit.c --
- *
- *	This file contains the initializers for the Tcl stub vectors.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclStubInit.c,v 1.7 1999/04/16 00:46:53 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Remove macros that will interfere with the definitions below.
- */
-
-#undef Tcl_Alloc
-#undef Tcl_Free
-#undef Tcl_Realloc
-#undef Tcl_NewBooleanObj
-#undef Tcl_NewByteArrayObj
-#undef Tcl_NewDoubleObj
-#undef Tcl_NewIntObj
-#undef Tcl_NewListObj
-#undef Tcl_NewLongObj
-#undef Tcl_NewObj
-#undef Tcl_NewStringObj
-#undef Tcl_DumpActiveMemory
-#undef Tcl_ValidateAllMemory
-
-/*
- * WARNING: The contents of this file is automatically generated by the
- * tools/genStubs.tcl script. Any modifications to the function declarations
- * below should be made in the generic/tcl.decls script.
- */
-
-/* !BEGIN!: Do not edit below this line. */
-
-static TclStubHooks tclStubHooks;
-
-TclStubs tclStubs = {
-    TCL_STUB_MAGIC,
-    &tclStubHooks,
-    Tcl_PkgProvideEx, /* 0 */
-    Tcl_PkgRequireEx, /* 1 */
-    Tcl_Panic, /* 2 */
-    Tcl_Alloc, /* 3 */
-    Tcl_Free, /* 4 */
-    Tcl_Realloc, /* 5 */
-    Tcl_DbCkalloc, /* 6 */
-    Tcl_DbCkfree, /* 7 */
-    Tcl_DbCkrealloc, /* 8 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_CreateFileHandler, /* 9 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 9 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 9 */
-#endif /* MAC_TCL */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_DeleteFileHandler, /* 10 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 10 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 10 */
-#endif /* MAC_TCL */
-    Tcl_SetTimer, /* 11 */
-    Tcl_Sleep, /* 12 */
-    Tcl_WaitForEvent, /* 13 */
-    Tcl_AppendAllObjTypes, /* 14 */
-    Tcl_AppendStringsToObj, /* 15 */
-    Tcl_AppendToObj, /* 16 */
-    Tcl_ConcatObj, /* 17 */
-    Tcl_ConvertToType, /* 18 */
-    Tcl_DbDecrRefCount, /* 19 */
-    Tcl_DbIncrRefCount, /* 20 */
-    Tcl_DbIsShared, /* 21 */
-    Tcl_DbNewBooleanObj, /* 22 */
-    Tcl_DbNewByteArrayObj, /* 23 */
-    Tcl_DbNewDoubleObj, /* 24 */
-    Tcl_DbNewListObj, /* 25 */
-    Tcl_DbNewLongObj, /* 26 */
-    Tcl_DbNewObj, /* 27 */
-    Tcl_DbNewStringObj, /* 28 */
-    Tcl_DuplicateObj, /* 29 */
-    TclFreeObj, /* 30 */
-    Tcl_GetBoolean, /* 31 */
-    Tcl_GetBooleanFromObj, /* 32 */
-    Tcl_GetByteArrayFromObj, /* 33 */
-    Tcl_GetDouble, /* 34 */
-    Tcl_GetDoubleFromObj, /* 35 */
-    Tcl_GetIndexFromObj, /* 36 */
-    Tcl_GetInt, /* 37 */
-    Tcl_GetIntFromObj, /* 38 */
-    Tcl_GetLongFromObj, /* 39 */
-    Tcl_GetObjType, /* 40 */
-    Tcl_GetStringFromObj, /* 41 */
-    Tcl_InvalidateStringRep, /* 42 */
-    Tcl_ListObjAppendList, /* 43 */
-    Tcl_ListObjAppendElement, /* 44 */
-    Tcl_ListObjGetElements, /* 45 */
-    Tcl_ListObjIndex, /* 46 */
-    Tcl_ListObjLength, /* 47 */
-    Tcl_ListObjReplace, /* 48 */
-    Tcl_NewBooleanObj, /* 49 */
-    Tcl_NewByteArrayObj, /* 50 */
-    Tcl_NewDoubleObj, /* 51 */
-    Tcl_NewIntObj, /* 52 */
-    Tcl_NewListObj, /* 53 */
-    Tcl_NewLongObj, /* 54 */
-    Tcl_NewObj, /* 55 */
-    Tcl_NewStringObj, /* 56 */
-    Tcl_SetBooleanObj, /* 57 */
-    Tcl_SetByteArrayLength, /* 58 */
-    Tcl_SetByteArrayObj, /* 59 */
-    Tcl_SetDoubleObj, /* 60 */
-    Tcl_SetIntObj, /* 61 */
-    Tcl_SetListObj, /* 62 */
-    Tcl_SetLongObj, /* 63 */
-    Tcl_SetObjLength, /* 64 */
-    Tcl_SetStringObj, /* 65 */
-    Tcl_AddErrorInfo, /* 66 */
-    Tcl_AddObjErrorInfo, /* 67 */
-    Tcl_AllowExceptions, /* 68 */
-    Tcl_AppendElement, /* 69 */
-    Tcl_AppendResult, /* 70 */
-    Tcl_AsyncCreate, /* 71 */
-    Tcl_AsyncDelete, /* 72 */
-    Tcl_AsyncInvoke, /* 73 */
-    Tcl_AsyncMark, /* 74 */
-    Tcl_AsyncReady, /* 75 */
-    Tcl_BackgroundError, /* 76 */
-    Tcl_Backslash, /* 77 */
-    Tcl_BadChannelOption, /* 78 */
-    Tcl_CallWhenDeleted, /* 79 */
-    Tcl_CancelIdleCall, /* 80 */
-    Tcl_Close, /* 81 */
-    Tcl_CommandComplete, /* 82 */
-    Tcl_Concat, /* 83 */
-    Tcl_ConvertElement, /* 84 */
-    Tcl_ConvertCountedElement, /* 85 */
-    Tcl_CreateAlias, /* 86 */
-    Tcl_CreateAliasObj, /* 87 */
-    Tcl_CreateChannel, /* 88 */
-    Tcl_CreateChannelHandler, /* 89 */
-    Tcl_CreateCloseHandler, /* 90 */
-    Tcl_CreateCommand, /* 91 */
-    Tcl_CreateEventSource, /* 92 */
-    Tcl_CreateExitHandler, /* 93 */
-    Tcl_CreateInterp, /* 94 */
-    Tcl_CreateMathFunc, /* 95 */
-    Tcl_CreateObjCommand, /* 96 */
-    Tcl_CreateSlave, /* 97 */
-    Tcl_CreateTimerHandler, /* 98 */
-    Tcl_CreateTrace, /* 99 */
-    Tcl_DeleteAssocData, /* 100 */
-    Tcl_DeleteChannelHandler, /* 101 */
-    Tcl_DeleteCloseHandler, /* 102 */
-    Tcl_DeleteCommand, /* 103 */
-    Tcl_DeleteCommandFromToken, /* 104 */
-    Tcl_DeleteEvents, /* 105 */
-    Tcl_DeleteEventSource, /* 106 */
-    Tcl_DeleteExitHandler, /* 107 */
-    Tcl_DeleteHashEntry, /* 108 */
-    Tcl_DeleteHashTable, /* 109 */
-    Tcl_DeleteInterp, /* 110 */
-    Tcl_DetachPids, /* 111 */
-    Tcl_DeleteTimerHandler, /* 112 */
-    Tcl_DeleteTrace, /* 113 */
-    Tcl_DontCallWhenDeleted, /* 114 */
-    Tcl_DoOneEvent, /* 115 */
-    Tcl_DoWhenIdle, /* 116 */
-    Tcl_DStringAppend, /* 117 */
-    Tcl_DStringAppendElement, /* 118 */
-    Tcl_DStringEndSublist, /* 119 */
-    Tcl_DStringFree, /* 120 */
-    Tcl_DStringGetResult, /* 121 */
-    Tcl_DStringInit, /* 122 */
-    Tcl_DStringResult, /* 123 */
-    Tcl_DStringSetLength, /* 124 */
-    Tcl_DStringStartSublist, /* 125 */
-    Tcl_Eof, /* 126 */
-    Tcl_ErrnoId, /* 127 */
-    Tcl_ErrnoMsg, /* 128 */
-    Tcl_Eval, /* 129 */
-    Tcl_EvalFile, /* 130 */
-    Tcl_EvalObj, /* 131 */
-    Tcl_EventuallyFree, /* 132 */
-    Tcl_Exit, /* 133 */
-    Tcl_ExposeCommand, /* 134 */
-    Tcl_ExprBoolean, /* 135 */
-    Tcl_ExprBooleanObj, /* 136 */
-    Tcl_ExprDouble, /* 137 */
-    Tcl_ExprDoubleObj, /* 138 */
-    Tcl_ExprLong, /* 139 */
-    Tcl_ExprLongObj, /* 140 */
-    Tcl_ExprObj, /* 141 */
-    Tcl_ExprString, /* 142 */
-    Tcl_Finalize, /* 143 */
-    Tcl_FindExecutable, /* 144 */
-    Tcl_FirstHashEntry, /* 145 */
-    Tcl_Flush, /* 146 */
-    Tcl_FreeResult, /* 147 */
-    Tcl_GetAlias, /* 148 */
-    Tcl_GetAliasObj, /* 149 */
-    Tcl_GetAssocData, /* 150 */
-    Tcl_GetChannel, /* 151 */
-    Tcl_GetChannelBufferSize, /* 152 */
-    Tcl_GetChannelHandle, /* 153 */
-    Tcl_GetChannelInstanceData, /* 154 */
-    Tcl_GetChannelMode, /* 155 */
-    Tcl_GetChannelName, /* 156 */
-    Tcl_GetChannelOption, /* 157 */
-    Tcl_GetChannelType, /* 158 */
-    Tcl_GetCommandInfo, /* 159 */
-    Tcl_GetCommandName, /* 160 */
-    Tcl_GetErrno, /* 161 */
-    Tcl_GetHostName, /* 162 */
-    Tcl_GetInterpPath, /* 163 */
-    Tcl_GetMaster, /* 164 */
-    Tcl_GetNameOfExecutable, /* 165 */
-    Tcl_GetObjResult, /* 166 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_GetOpenFile, /* 167 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    NULL, /* 167 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 167 */
-#endif /* MAC_TCL */
-    Tcl_GetPathType, /* 168 */
-    Tcl_Gets, /* 169 */
-    Tcl_GetsObj, /* 170 */
-    Tcl_GetServiceMode, /* 171 */
-    Tcl_GetSlave, /* 172 */
-    Tcl_GetStdChannel, /* 173 */
-    Tcl_GetStringResult, /* 174 */
-    Tcl_GetVar, /* 175 */
-    Tcl_GetVar2, /* 176 */
-    Tcl_GlobalEval, /* 177 */
-    Tcl_GlobalEvalObj, /* 178 */
-    Tcl_HideCommand, /* 179 */
-    Tcl_Init, /* 180 */
-    Tcl_InitHashTable, /* 181 */
-    Tcl_InputBlocked, /* 182 */
-    Tcl_InputBuffered, /* 183 */
-    Tcl_InterpDeleted, /* 184 */
-    Tcl_IsSafe, /* 185 */
-    Tcl_JoinPath, /* 186 */
-    Tcl_LinkVar, /* 187 */
-    NULL, /* 188 */
-    Tcl_MakeFileChannel, /* 189 */
-    Tcl_MakeSafe, /* 190 */
-    Tcl_MakeTcpClientChannel, /* 191 */
-    Tcl_Merge, /* 192 */
-    Tcl_NextHashEntry, /* 193 */
-    Tcl_NotifyChannel, /* 194 */
-    Tcl_ObjGetVar2, /* 195 */
-    Tcl_ObjSetVar2, /* 196 */
-    Tcl_OpenCommandChannel, /* 197 */
-    Tcl_OpenFileChannel, /* 198 */
-    Tcl_OpenTcpClient, /* 199 */
-    Tcl_OpenTcpServer, /* 200 */
-    Tcl_Preserve, /* 201 */
-    Tcl_PrintDouble, /* 202 */
-    Tcl_PutEnv, /* 203 */
-    Tcl_PosixError, /* 204 */
-    Tcl_QueueEvent, /* 205 */
-    Tcl_Read, /* 206 */
-    Tcl_ReapDetachedProcs, /* 207 */
-    Tcl_RecordAndEval, /* 208 */
-    Tcl_RecordAndEvalObj, /* 209 */
-    Tcl_RegisterChannel, /* 210 */
-    Tcl_RegisterObjType, /* 211 */
-    Tcl_RegExpCompile, /* 212 */
-    Tcl_RegExpExec, /* 213 */
-    Tcl_RegExpMatch, /* 214 */
-    Tcl_RegExpRange, /* 215 */
-    Tcl_Release, /* 216 */
-    Tcl_ResetResult, /* 217 */
-    Tcl_ScanElement, /* 218 */
-    Tcl_ScanCountedElement, /* 219 */
-    Tcl_Seek, /* 220 */
-    Tcl_ServiceAll, /* 221 */
-    Tcl_ServiceEvent, /* 222 */
-    Tcl_SetAssocData, /* 223 */
-    Tcl_SetChannelBufferSize, /* 224 */
-    Tcl_SetChannelOption, /* 225 */
-    Tcl_SetCommandInfo, /* 226 */
-    Tcl_SetErrno, /* 227 */
-    Tcl_SetErrorCode, /* 228 */
-    Tcl_SetMaxBlockTime, /* 229 */
-    Tcl_SetPanicProc, /* 230 */
-    Tcl_SetRecursionLimit, /* 231 */
-    Tcl_SetResult, /* 232 */
-    Tcl_SetServiceMode, /* 233 */
-    Tcl_SetObjErrorCode, /* 234 */
-    Tcl_SetObjResult, /* 235 */
-    Tcl_SetStdChannel, /* 236 */
-    Tcl_SetVar, /* 237 */
-    Tcl_SetVar2, /* 238 */
-    Tcl_SignalId, /* 239 */
-    Tcl_SignalMsg, /* 240 */
-    Tcl_SourceRCFile, /* 241 */
-    Tcl_SplitList, /* 242 */
-    Tcl_SplitPath, /* 243 */
-    Tcl_StaticPackage, /* 244 */
-    Tcl_StringMatch, /* 245 */
-    Tcl_Tell, /* 246 */
-    Tcl_TraceVar, /* 247 */
-    Tcl_TraceVar2, /* 248 */
-    Tcl_TranslateFileName, /* 249 */
-    Tcl_Ungets, /* 250 */
-    Tcl_UnlinkVar, /* 251 */
-    Tcl_UnregisterChannel, /* 252 */
-    Tcl_UnsetVar, /* 253 */
-    Tcl_UnsetVar2, /* 254 */
-    Tcl_UntraceVar, /* 255 */
-    Tcl_UntraceVar2, /* 256 */
-    Tcl_UpdateLinkedVar, /* 257 */
-    Tcl_UpVar, /* 258 */
-    Tcl_UpVar2, /* 259 */
-    Tcl_VarEval, /* 260 */
-    Tcl_VarTraceInfo, /* 261 */
-    Tcl_VarTraceInfo2, /* 262 */
-    Tcl_Write, /* 263 */
-    Tcl_WrongNumArgs, /* 264 */
-    Tcl_DumpActiveMemory, /* 265 */
-    Tcl_ValidateAllMemory, /* 266 */
-    Tcl_AppendResultVA, /* 267 */
-    Tcl_AppendStringsToObjVA, /* 268 */
-    Tcl_HashStats, /* 269 */
-    Tcl_ParseVar, /* 270 */
-    Tcl_PkgPresent, /* 271 */
-    Tcl_PkgPresentEx, /* 272 */
-    Tcl_PkgProvide, /* 273 */
-    Tcl_PkgRequire, /* 274 */
-    Tcl_SetErrorCodeVA, /* 275 */
-    Tcl_VarEvalVA, /* 276 */
-    Tcl_WaitPid, /* 277 */
-    Tcl_PanicVA, /* 278 */
-    Tcl_GetVersion, /* 279 */
-    Tcl_InitMemory, /* 280 */
-    NULL, /* 281 */
-    NULL, /* 282 */
-    NULL, /* 283 */
-    NULL, /* 284 */
-    NULL, /* 285 */
-    Tcl_AppendObjToObj, /* 286 */
-    Tcl_CreateEncoding, /* 287 */
-    Tcl_CreateThreadExitHandler, /* 288 */
-    Tcl_DeleteThreadExitHandler, /* 289 */
-    Tcl_DiscardResult, /* 290 */
-    Tcl_EvalEx, /* 291 */
-    Tcl_EvalObjv, /* 292 */
-    Tcl_EvalObjEx, /* 293 */
-    Tcl_ExitThread, /* 294 */
-    Tcl_ExternalToUtf, /* 295 */
-    Tcl_ExternalToUtfDString, /* 296 */
-    Tcl_FinalizeThread, /* 297 */
-    Tcl_FinalizeNotifier, /* 298 */
-    Tcl_FreeEncoding, /* 299 */
-    Tcl_GetCurrentThread, /* 300 */
-    Tcl_GetEncoding, /* 301 */
-    Tcl_GetEncodingName, /* 302 */
-    Tcl_GetEncodingNames, /* 303 */
-    Tcl_GetIndexFromObjStruct, /* 304 */
-    Tcl_GetThreadData, /* 305 */
-    Tcl_GetVar2Ex, /* 306 */
-    Tcl_InitNotifier, /* 307 */
-    Tcl_MutexLock, /* 308 */
-    Tcl_MutexUnlock, /* 309 */
-    Tcl_ConditionNotify, /* 310 */
-    Tcl_ConditionWait, /* 311 */
-    Tcl_NumUtfChars, /* 312 */
-    Tcl_ReadChars, /* 313 */
-    Tcl_RestoreResult, /* 314 */
-    Tcl_SaveResult, /* 315 */
-    Tcl_SetSystemEncoding, /* 316 */
-    Tcl_SetVar2Ex, /* 317 */
-    Tcl_ThreadAlert, /* 318 */
-    Tcl_ThreadQueueEvent, /* 319 */
-    Tcl_UniCharAtIndex, /* 320 */
-    Tcl_UniCharToLower, /* 321 */
-    Tcl_UniCharToTitle, /* 322 */
-    Tcl_UniCharToUpper, /* 323 */
-    Tcl_UniCharToUtf, /* 324 */
-    Tcl_UtfAtIndex, /* 325 */
-    Tcl_UtfCharComplete, /* 326 */
-    Tcl_UtfBackslash, /* 327 */
-    Tcl_UtfFindFirst, /* 328 */
-    Tcl_UtfFindLast, /* 329 */
-    Tcl_UtfNext, /* 330 */
-    Tcl_UtfPrev, /* 331 */
-    Tcl_UtfToExternal, /* 332 */
-    Tcl_UtfToExternalDString, /* 333 */
-    Tcl_UtfToLower, /* 334 */
-    Tcl_UtfToTitle, /* 335 */
-    Tcl_UtfToUniChar, /* 336 */
-    Tcl_UtfToUpper, /* 337 */
-    Tcl_WriteChars, /* 338 */
-    Tcl_WriteObj, /* 339 */
-    Tcl_GetString, /* 340 */
-    Tcl_GetDefaultEncodingDir, /* 341 */
-    Tcl_SetDefaultEncodingDir, /* 342 */
-    Tcl_AlertNotifier, /* 343 */
-    Tcl_ServiceModeHook, /* 344 */
-    Tcl_UniCharIsAlnum, /* 345 */
-    Tcl_UniCharIsAlpha, /* 346 */
-    Tcl_UniCharIsDigit, /* 347 */
-    Tcl_UniCharIsLower, /* 348 */
-    Tcl_UniCharIsSpace, /* 349 */
-    Tcl_UniCharIsUpper, /* 350 */
-    Tcl_UniCharIsWordChar, /* 351 */
-    Tcl_UniCharLen, /* 352 */
-    Tcl_UniCharNcmp, /* 353 */
-    Tcl_UniCharToUtfDString, /* 354 */
-    Tcl_UtfToUniCharDString, /* 355 */
-    Tcl_GetRegExpFromObj, /* 356 */
-    Tcl_EvalTokens, /* 357 */
-    Tcl_FreeParse, /* 358 */
-    Tcl_LogCommandInfo, /* 359 */
-    Tcl_ParseBraces, /* 360 */
-    Tcl_ParseCommand, /* 361 */
-    Tcl_ParseExpr, /* 362 */
-    Tcl_ParseQuotedString, /* 363 */
-    Tcl_ParseVarName, /* 364 */
-    Tcl_GetCwd, /* 365 */
-    Tcl_Chdir, /* 366 */
-};
-
-TclIntStubs tclIntStubs = {
-    TCL_STUB_MAGIC,
-    NULL,
-    TclAccess, /* 0 */
-    TclAccessDeleteProc, /* 1 */
-    TclAccessInsertProc, /* 2 */
-    TclAllocateFreeObjects, /* 3 */
-    NULL, /* 4 */
-    TclCleanupChildren, /* 5 */
-    TclCleanupCommand, /* 6 */
-    TclCopyAndCollapse, /* 7 */
-    TclCopyChannel, /* 8 */
-    TclCreatePipeline, /* 9 */
-    TclCreateProc, /* 10 */
-    TclDeleteCompiledLocalVars, /* 11 */
-    TclDeleteVars, /* 12 */
-    TclDoGlob, /* 13 */
-    TclDumpMemoryInfo, /* 14 */
-    NULL, /* 15 */
-    TclExprFloatError, /* 16 */
-    TclFileAttrsCmd, /* 17 */
-    TclFileCopyCmd, /* 18 */
-    TclFileDeleteCmd, /* 19 */
-    TclFileMakeDirsCmd, /* 20 */
-    TclFileRenameCmd, /* 21 */
-    TclFindElement, /* 22 */
-    TclFindProc, /* 23 */
-    TclFormatInt, /* 24 */
-    TclFreePackageInfo, /* 25 */
-    NULL, /* 26 */
-    TclGetDate, /* 27 */
-    TclpGetDefaultStdChannel, /* 28 */
-    TclGetElementOfIndexedArray, /* 29 */
-    NULL, /* 30 */
-    TclGetExtension, /* 31 */
-    TclGetFrame, /* 32 */
-    TclGetInterpProc, /* 33 */
-    TclGetIntForIndex, /* 34 */
-    TclGetIndexedScalar, /* 35 */
-    TclGetLong, /* 36 */
-    TclGetLoadedPackages, /* 37 */
-    TclGetNamespaceForQualName, /* 38 */
-    TclGetObjInterpProc, /* 39 */
-    TclGetOpenMode, /* 40 */
-    TclGetOriginalCommand, /* 41 */
-    TclpGetUserHome, /* 42 */
-    TclGlobalInvoke, /* 43 */
-    TclGuessPackageName, /* 44 */
-    TclHideUnsafeCommands, /* 45 */
-    TclInExit, /* 46 */
-    TclIncrElementOfIndexedArray, /* 47 */
-    TclIncrIndexedScalar, /* 48 */
-    TclIncrVar2, /* 49 */
-    TclInitCompiledLocals, /* 50 */
-    TclInterpInit, /* 51 */
-    TclInvoke, /* 52 */
-    TclInvokeObjectCommand, /* 53 */
-    TclInvokeStringCommand, /* 54 */
-    TclIsProc, /* 55 */
-    NULL, /* 56 */
-    NULL, /* 57 */
-    TclLookupVar, /* 58 */
-    TclpMatchFiles, /* 59 */
-    TclNeedSpace, /* 60 */
-    TclNewProcBodyObj, /* 61 */
-    TclObjCommandComplete, /* 62 */
-    TclObjInterpProc, /* 63 */
-    TclObjInvoke, /* 64 */
-    TclObjInvokeGlobal, /* 65 */
-    TclOpenFileChannelDeleteProc, /* 66 */
-    TclOpenFileChannelInsertProc, /* 67 */
-    TclpAccess, /* 68 */
-    TclpAlloc, /* 69 */
-    TclpCopyFile, /* 70 */
-    TclpCopyDirectory, /* 71 */
-    TclpCreateDirectory, /* 72 */
-    TclpDeleteFile, /* 73 */
-    TclpFree, /* 74 */
-    TclpGetClicks, /* 75 */
-    TclpGetSeconds, /* 76 */
-    TclpGetTime, /* 77 */
-    TclpGetTimeZone, /* 78 */
-    TclpListVolumes, /* 79 */
-    TclpOpenFileChannel, /* 80 */
-    TclpRealloc, /* 81 */
-    TclpRemoveDirectory, /* 82 */
-    TclpRenameFile, /* 83 */
-    NULL, /* 84 */
-    NULL, /* 85 */
-    NULL, /* 86 */
-    NULL, /* 87 */
-    TclPrecTraceProc, /* 88 */
-    TclPreventAliasLoop, /* 89 */
-    NULL, /* 90 */
-    TclProcCleanupProc, /* 91 */
-    TclProcCompileProc, /* 92 */
-    TclProcDeleteProc, /* 93 */
-    TclProcInterpProc, /* 94 */
-    TclpStat, /* 95 */
-    TclRenameCommand, /* 96 */
-    TclResetShadowedCmdRefs, /* 97 */
-    TclServiceIdle, /* 98 */
-    TclSetElementOfIndexedArray, /* 99 */
-    TclSetIndexedScalar, /* 100 */
-    NULL, /* 101 */
-    TclSetupEnv, /* 102 */
-    TclSockGetPort, /* 103 */
-    TclSockMinimumBuffers, /* 104 */
-    TclStat, /* 105 */
-    TclStatDeleteProc, /* 106 */
-    TclStatInsertProc, /* 107 */
-    TclTeardownNamespace, /* 108 */
-    TclUpdateReturnInfo, /* 109 */
-    NULL, /* 110 */
-    Tcl_AddInterpResolvers, /* 111 */
-    Tcl_AppendExportList, /* 112 */
-    Tcl_CreateNamespace, /* 113 */
-    Tcl_DeleteNamespace, /* 114 */
-    Tcl_Export, /* 115 */
-    Tcl_FindCommand, /* 116 */
-    Tcl_FindNamespace, /* 117 */
-    Tcl_GetInterpResolvers, /* 118 */
-    Tcl_GetNamespaceResolvers, /* 119 */
-    Tcl_FindNamespaceVar, /* 120 */
-    Tcl_ForgetImport, /* 121 */
-    Tcl_GetCommandFromObj, /* 122 */
-    Tcl_GetCommandFullName, /* 123 */
-    Tcl_GetCurrentNamespace, /* 124 */
-    Tcl_GetGlobalNamespace, /* 125 */
-    Tcl_GetVariableFullName, /* 126 */
-    Tcl_Import, /* 127 */
-    Tcl_PopCallFrame, /* 128 */
-    Tcl_PushCallFrame, /* 129 */
-    Tcl_RemoveInterpResolvers, /* 130 */
-    Tcl_SetNamespaceResolvers, /* 131 */
-    TclpHasSockets, /* 132 */
-    TclpGetDate, /* 133 */
-    TclpStrftime, /* 134 */
-    TclpCheckStackSpace, /* 135 */
-    NULL, /* 136 */
-    TclpChdir, /* 137 */
-    TclGetEnv, /* 138 */
-    TclpLoadFile, /* 139 */
-    TclLooksLikeInt, /* 140 */
-    TclpGetCwd, /* 141 */
-};
-
-TclIntPlatStubs tclIntPlatStubs = {
-    TCL_STUB_MAGIC,
-    NULL,
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    TclGetAndDetachPids, /* 0 */
-    TclpCloseFile, /* 1 */
-    TclpCreateCommandChannel, /* 2 */
-    TclpCreatePipe, /* 3 */
-    TclpCreateProcess, /* 4 */
-    NULL, /* 5 */
-    TclpMakeFile, /* 6 */
-    TclpOpenFile, /* 7 */
-    TclUnixWaitForFile, /* 8 */
-    TclpCreateTempFile, /* 9 */
-#endif /* UNIX */
-#ifdef __WIN32__
-    TclWinConvertError, /* 0 */
-    TclWinConvertWSAError, /* 1 */
-    TclWinGetServByName, /* 2 */
-    TclWinGetSockOpt, /* 3 */
-    TclWinGetTclInstance, /* 4 */
-    NULL, /* 5 */
-    TclWinNToHS, /* 6 */
-    TclWinSetSockOpt, /* 7 */
-    TclpGetPid, /* 8 */
-    TclWinGetPlatformId, /* 9 */
-    TclWinSynchSpawn, /* 10 */
-    TclGetAndDetachPids, /* 11 */
-    TclpCloseFile, /* 12 */
-    TclpCreateCommandChannel, /* 13 */
-    TclpCreatePipe, /* 14 */
-    TclpCreateProcess, /* 15 */
-    NULL, /* 16 */
-    NULL, /* 17 */
-    TclpMakeFile, /* 18 */
-    TclpOpenFile, /* 19 */
-    TclWinAddProcess, /* 20 */
-    TclpAsyncMark, /* 21 */
-    TclpCreateTempFile, /* 22 */
-    TclpGetTZName, /* 23 */
-    TclWinNoBackslash, /* 24 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    TclpSysAlloc, /* 0 */
-    TclpSysFree, /* 1 */
-    TclpSysRealloc, /* 2 */
-    TclpExit, /* 3 */
-    FSpGetDefaultDir, /* 4 */
-    FSpSetDefaultDir, /* 5 */
-    FSpFindFolder, /* 6 */
-    GetGlobalMouse, /* 7 */
-    FSpGetDirectoryID, /* 8 */
-    FSpOpenResFileCompat, /* 9 */
-    FSpCreateResFileCompat, /* 10 */
-    FSpLocationFromPath, /* 11 */
-    FSpPathFromLocation, /* 12 */
-    TclMacExitHandler, /* 13 */
-    TclMacInitExitToShell, /* 14 */
-    TclMacInstallExitToShellPatch, /* 15 */
-    TclMacOSErrorToPosixError, /* 16 */
-    TclMacRemoveTimer, /* 17 */
-    TclMacStartTimer, /* 18 */
-    TclMacTimerExpired, /* 19 */
-    TclMacRegisterResourceFork, /* 20 */
-    TclMacUnRegisterResourceFork, /* 21 */
-    TclMacCreateEnv, /* 22 */
-    TclMacFOpenHack, /* 23 */
-    NULL, /* 24 */
-    TclMacChmod, /* 25 */
-#endif /* MAC_TCL */
-};
-
-TclPlatStubs tclPlatStubs = {
-    TCL_STUB_MAGIC,
-    NULL,
-#ifdef __WIN32__
-    Tcl_WinUtfToTChar, /* 0 */
-    Tcl_WinTCharToUtf, /* 1 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    Tcl_MacSetEventProc, /* 0 */
-    Tcl_MacConvertTextResource, /* 1 */
-    Tcl_MacEvalResource, /* 2 */
-    Tcl_MacFindResource, /* 3 */
-    Tcl_GetOSTypeFromObj, /* 4 */
-    Tcl_SetOSTypeObj, /* 5 */
-    Tcl_NewOSTypeObj, /* 6 */
-    strncasecmp, /* 7 */
-    strcasecmp, /* 8 */
-#endif /* MAC_TCL */
-};
-
-static TclStubHooks tclStubHooks = {
-    &tclPlatStubs,
-    &tclIntStubs,
-    &tclIntPlatStubs
-};
-
-
-/* !END!: Do not edit above this line. */
diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
deleted file mode 100644
index 6a3f308..0000000
--- a/generic/tclStubLib.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
- * tclStubLib.c --
- *
- *	Stub object that will be statically linked into extensions that wish
- *	to access Tcl.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- * Copyright (c) 1998 Paul Duffin.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclStubLib.c,v 1.3 1999/03/10 05:52:50 stanton Exp $
- */
-
-/*
- * We need to ensure that we use the stub macros so that this file contains
- * no references to any of the stub functions.  This will make it possible
- * to build an extension that references Tcl_InitStubs but doesn't end up
- * including the rest of the stub functions.
- */
-
-#ifndef USE_TCL_STUBS
-#define USE_TCL_STUBS
-#endif
-#undef USE_TCL_STUB_PROCS
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * Ensure that Tcl_InitStubs is built as an exported symbol.  The other stub
- * functions should be built as non-exported symbols.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-TclStubs *tclStubsPtr;
-TclPlatStubs *tclPlatStubsPtr;
-TclIntStubs *tclIntStubsPtr;
-TclIntPlatStubs *tclIntPlatStubsPtr;
-
-static TclStubs *	HasStubSupport _ANSI_ARGS_((Tcl_Interp *interp));
-
-static TclStubs *
-HasStubSupport (interp)
-    Tcl_Interp *interp;
-{
-    Interp *iPtr = (Interp *) interp;
-
-    if (iPtr->stubTable && (iPtr->stubTable->magic == TCL_STUB_MAGIC)) {
-	return iPtr->stubTable;
-    }
-    interp->result = "This interpreter does not support stubs-enabled extensions.";
-    interp->freeProc = TCL_STATIC;
-
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitStubs --
- *
- *	Tries to initialise the stub table pointers and ensures that
- *	the correct version of Tcl is loaded.
- *
- * Results:
- *	The actual version of Tcl that satisfies the request, or
- *	NULL to indicate that an error occurred.
- *
- * Side effects:
- *	Sets the stub table pointers.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_InitStubs (interp, version, exact)
-    Tcl_Interp *interp;
-    char *version;
-    int exact;
-{
-    char *actualVersion;
-    TclStubs *tmp;
-    
-    if (!tclStubsPtr) {
-	tclStubsPtr = HasStubSupport(interp);
-	if (!tclStubsPtr) {
-            return NULL;
-        }
-    }
-
-    actualVersion = Tcl_PkgRequireEx(interp, "Tcl", version, exact,
-	    (ClientData *) &tmp);
-    if (actualVersion == NULL) {
-	tclStubsPtr = NULL;
-	return NULL;
-    }
-
-    if (tclStubsPtr->hooks) {
-	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
-	tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
-	tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
-    } else {
-	tclPlatStubsPtr = NULL;
-	tclIntStubsPtr = NULL;
-	tclIntPlatStubsPtr = NULL;
-    }
-    
-    return actualVersion;
-}
diff --git a/generic/tclStubs.c b/generic/tclStubs.c
deleted file mode 100644
index 21ebe06..0000000
--- a/generic/tclStubs.c
+++ /dev/null
@@ -1,3267 +0,0 @@
-/* 
- * tclStubs.c --
- *
- *	This file contains the wrapper functions for the platform independent
- *	public Tcl API.
- *
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclStubs.c,v 1.7 1999/04/16 00:46:53 stanton Exp $
- */
-
-#include "tcl.h"
-
-/*
- * Undefine function macros that will interfere with the defintions below.
- */
-
-#undef Tcl_Alloc
-#undef Tcl_Free
-#undef Tcl_Realloc
-#undef Tcl_NewBooleanObj
-#undef Tcl_NewByteArrayObj
-#undef Tcl_NewDoubleObj
-#undef Tcl_NewIntObj
-#undef Tcl_NewListObj
-#undef Tcl_NewLongObj
-#undef Tcl_NewObj
-#undef Tcl_NewStringObj
-#undef Tcl_InitMemory
-#undef Tcl_DumpActiveMemory
-#undef Tcl_ValidateAllMemory
-#undef Tcl_EvalObj
-#undef Tcl_GlobalEvalObj
-#undef Tcl_MutexLock
-#undef Tcl_MutexUnlock
-#undef Tcl_ConditionNotify
-#undef Tcl_ConditionWait
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tcl.decls script.
- */
-
-/* !BEGIN!: Do not edit below this line. */
-
-/*
- * Exported stub functions:
- */
-
-/* Slot 0 */
-int
-Tcl_PkgProvideEx(interp, name, version, clientData)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_PkgProvideEx)(interp, name, version, clientData);
-}
-
-/* Slot 1 */
-char *
-Tcl_PkgRequireEx(interp, name, version, exact, clientDataPtr)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-    int exact;
-    ClientData * clientDataPtr;
-{
-    return (tclStubsPtr->tcl_PkgRequireEx)(interp, name, version, exact, clientDataPtr);
-}
-
-/* Slot 2 */
-void
-Tcl_Panic TCL_VARARGS_DEF(char *,format)
-{
-    char * var;
-    va_list argList;
-
-    var = (char *) TCL_VARARGS_START(char *,format,argList);
-
-    (tclStubsPtr->tcl_PanicVA)(var, argList);
-    va_end(argList);
-}
-
-/* Slot 3 */
-char *
-Tcl_Alloc(size)
-    unsigned int size;
-{
-    return (tclStubsPtr->tcl_Alloc)(size);
-}
-
-/* Slot 4 */
-void
-Tcl_Free(ptr)
-    char * ptr;
-{
-    (tclStubsPtr->tcl_Free)(ptr);
-}
-
-/* Slot 5 */
-char *
-Tcl_Realloc(ptr, size)
-    char * ptr;
-    unsigned int size;
-{
-    return (tclStubsPtr->tcl_Realloc)(ptr, size);
-}
-
-/* Slot 6 */
-char *
-Tcl_DbCkalloc(size, file, line)
-    unsigned int size;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbCkalloc)(size, file, line);
-}
-
-/* Slot 7 */
-int
-Tcl_DbCkfree(ptr, file, line)
-    char * ptr;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbCkfree)(ptr, file, line);
-}
-
-/* Slot 8 */
-char *
-Tcl_DbCkrealloc(ptr, size, file, line)
-    char * ptr;
-    unsigned int size;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbCkrealloc)(ptr, size, file, line);
-}
-
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* Slot 9 */
-void
-Tcl_CreateFileHandler(fd, mask, proc, clientData)
-    int fd;
-    int mask;
-    Tcl_FileProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateFileHandler)(fd, mask, proc, clientData);
-}
-
-#endif /* UNIX */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* Slot 10 */
-void
-Tcl_DeleteFileHandler(fd)
-    int fd;
-{
-    (tclStubsPtr->tcl_DeleteFileHandler)(fd);
-}
-
-#endif /* UNIX */
-/* Slot 11 */
-void
-Tcl_SetTimer(timePtr)
-    Tcl_Time * timePtr;
-{
-    (tclStubsPtr->tcl_SetTimer)(timePtr);
-}
-
-/* Slot 12 */
-void
-Tcl_Sleep(ms)
-    int ms;
-{
-    (tclStubsPtr->tcl_Sleep)(ms);
-}
-
-/* Slot 13 */
-int
-Tcl_WaitForEvent(timePtr)
-    Tcl_Time * timePtr;
-{
-    return (tclStubsPtr->tcl_WaitForEvent)(timePtr);
-}
-
-/* Slot 14 */
-int
-Tcl_AppendAllObjTypes(interp, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_AppendAllObjTypes)(interp, objPtr);
-}
-
-/* Slot 15 */
-void
-Tcl_AppendStringsToObj TCL_VARARGS_DEF(Tcl_Obj *,objPtr)
-{
-    Tcl_Obj * var;
-    va_list argList;
-
-    var = (Tcl_Obj *) TCL_VARARGS_START(Tcl_Obj *,objPtr,argList);
-
-    (tclStubsPtr->tcl_AppendStringsToObjVA)(var, argList);
-    va_end(argList);
-}
-
-/* Slot 16 */
-void
-Tcl_AppendToObj(objPtr, bytes, length)
-    Tcl_Obj * objPtr;
-    char * bytes;
-    int length;
-{
-    (tclStubsPtr->tcl_AppendToObj)(objPtr, bytes, length);
-}
-
-/* Slot 17 */
-Tcl_Obj *
-Tcl_ConcatObj(objc, objv)
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    return (tclStubsPtr->tcl_ConcatObj)(objc, objv);
-}
-
-/* Slot 18 */
-int
-Tcl_ConvertToType(interp, objPtr, typePtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    Tcl_ObjType * typePtr;
-{
-    return (tclStubsPtr->tcl_ConvertToType)(interp, objPtr, typePtr);
-}
-
-/* Slot 19 */
-void
-Tcl_DbDecrRefCount(objPtr, file, line)
-    Tcl_Obj * objPtr;
-    char * file;
-    int line;
-{
-    (tclStubsPtr->tcl_DbDecrRefCount)(objPtr, file, line);
-}
-
-/* Slot 20 */
-void
-Tcl_DbIncrRefCount(objPtr, file, line)
-    Tcl_Obj * objPtr;
-    char * file;
-    int line;
-{
-    (tclStubsPtr->tcl_DbIncrRefCount)(objPtr, file, line);
-}
-
-/* Slot 21 */
-int
-Tcl_DbIsShared(objPtr, file, line)
-    Tcl_Obj * objPtr;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbIsShared)(objPtr, file, line);
-}
-
-/* Slot 22 */
-Tcl_Obj *
-Tcl_DbNewBooleanObj(boolValue, file, line)
-    int boolValue;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewBooleanObj)(boolValue, file, line);
-}
-
-/* Slot 23 */
-Tcl_Obj *
-Tcl_DbNewByteArrayObj(bytes, length, file, line)
-    unsigned char * bytes;
-    int length;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewByteArrayObj)(bytes, length, file, line);
-}
-
-/* Slot 24 */
-Tcl_Obj *
-Tcl_DbNewDoubleObj(doubleValue, file, line)
-    double doubleValue;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewDoubleObj)(doubleValue, file, line);
-}
-
-/* Slot 25 */
-Tcl_Obj *
-Tcl_DbNewListObj(objc, objv, file, line)
-    int objc;
-    Tcl_Obj *CONST objv[];
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewListObj)(objc, objv, file, line);
-}
-
-/* Slot 26 */
-Tcl_Obj *
-Tcl_DbNewLongObj(longValue, file, line)
-    long longValue;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewLongObj)(longValue, file, line);
-}
-
-/* Slot 27 */
-Tcl_Obj *
-Tcl_DbNewObj(file, line)
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewObj)(file, line);
-}
-
-/* Slot 28 */
-Tcl_Obj *
-Tcl_DbNewStringObj(bytes, length, file, line)
-    CONST char * bytes;
-    int length;
-    char * file;
-    int line;
-{
-    return (tclStubsPtr->tcl_DbNewStringObj)(bytes, length, file, line);
-}
-
-/* Slot 29 */
-Tcl_Obj *
-Tcl_DuplicateObj(objPtr)
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_DuplicateObj)(objPtr);
-}
-
-/* Slot 30 */
-void
-TclFreeObj(objPtr)
-    Tcl_Obj * objPtr;
-{
-    (tclStubsPtr->tclFreeObj)(objPtr);
-}
-
-/* Slot 31 */
-int
-Tcl_GetBoolean(interp, str, boolPtr)
-    Tcl_Interp * interp;
-    char * str;
-    int * boolPtr;
-{
-    return (tclStubsPtr->tcl_GetBoolean)(interp, str, boolPtr);
-}
-
-/* Slot 32 */
-int
-Tcl_GetBooleanFromObj(interp, objPtr, boolPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    int * boolPtr;
-{
-    return (tclStubsPtr->tcl_GetBooleanFromObj)(interp, objPtr, boolPtr);
-}
-
-/* Slot 33 */
-unsigned char *
-Tcl_GetByteArrayFromObj(objPtr, lengthPtr)
-    Tcl_Obj * objPtr;
-    int * lengthPtr;
-{
-    return (tclStubsPtr->tcl_GetByteArrayFromObj)(objPtr, lengthPtr);
-}
-
-/* Slot 34 */
-int
-Tcl_GetDouble(interp, str, doublePtr)
-    Tcl_Interp * interp;
-    char * str;
-    double * doublePtr;
-{
-    return (tclStubsPtr->tcl_GetDouble)(interp, str, doublePtr);
-}
-
-/* Slot 35 */
-int
-Tcl_GetDoubleFromObj(interp, objPtr, doublePtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    double * doublePtr;
-{
-    return (tclStubsPtr->tcl_GetDoubleFromObj)(interp, objPtr, doublePtr);
-}
-
-/* Slot 36 */
-int
-Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    char ** tablePtr;
-    char * msg;
-    int flags;
-    int * indexPtr;
-{
-    return (tclStubsPtr->tcl_GetIndexFromObj)(interp, objPtr, tablePtr, msg, flags, indexPtr);
-}
-
-/* Slot 37 */
-int
-Tcl_GetInt(interp, str, intPtr)
-    Tcl_Interp * interp;
-    char * str;
-    int * intPtr;
-{
-    return (tclStubsPtr->tcl_GetInt)(interp, str, intPtr);
-}
-
-/* Slot 38 */
-int
-Tcl_GetIntFromObj(interp, objPtr, intPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    int * intPtr;
-{
-    return (tclStubsPtr->tcl_GetIntFromObj)(interp, objPtr, intPtr);
-}
-
-/* Slot 39 */
-int
-Tcl_GetLongFromObj(interp, objPtr, longPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    long * longPtr;
-{
-    return (tclStubsPtr->tcl_GetLongFromObj)(interp, objPtr, longPtr);
-}
-
-/* Slot 40 */
-Tcl_ObjType *
-Tcl_GetObjType(typeName)
-    char * typeName;
-{
-    return (tclStubsPtr->tcl_GetObjType)(typeName);
-}
-
-/* Slot 41 */
-char *
-Tcl_GetStringFromObj(objPtr, lengthPtr)
-    Tcl_Obj * objPtr;
-    int * lengthPtr;
-{
-    return (tclStubsPtr->tcl_GetStringFromObj)(objPtr, lengthPtr);
-}
-
-/* Slot 42 */
-void
-Tcl_InvalidateStringRep(objPtr)
-    Tcl_Obj * objPtr;
-{
-    (tclStubsPtr->tcl_InvalidateStringRep)(objPtr);
-}
-
-/* Slot 43 */
-int
-Tcl_ListObjAppendList(interp, listPtr, elemListPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    Tcl_Obj * elemListPtr;
-{
-    return (tclStubsPtr->tcl_ListObjAppendList)(interp, listPtr, elemListPtr);
-}
-
-/* Slot 44 */
-int
-Tcl_ListObjAppendElement(interp, listPtr, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_ListObjAppendElement)(interp, listPtr, objPtr);
-}
-
-/* Slot 45 */
-int
-Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    int * objcPtr;
-    Tcl_Obj *** objvPtr;
-{
-    return (tclStubsPtr->tcl_ListObjGetElements)(interp, listPtr, objcPtr, objvPtr);
-}
-
-/* Slot 46 */
-int
-Tcl_ListObjIndex(interp, listPtr, index, objPtrPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    int index;
-    Tcl_Obj ** objPtrPtr;
-{
-    return (tclStubsPtr->tcl_ListObjIndex)(interp, listPtr, index, objPtrPtr);
-}
-
-/* Slot 47 */
-int
-Tcl_ListObjLength(interp, listPtr, intPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    int * intPtr;
-{
-    return (tclStubsPtr->tcl_ListObjLength)(interp, listPtr, intPtr);
-}
-
-/* Slot 48 */
-int
-Tcl_ListObjReplace(interp, listPtr, first, count, objc, objv)
-    Tcl_Interp * interp;
-    Tcl_Obj * listPtr;
-    int first;
-    int count;
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    return (tclStubsPtr->tcl_ListObjReplace)(interp, listPtr, first, count, objc, objv);
-}
-
-/* Slot 49 */
-Tcl_Obj *
-Tcl_NewBooleanObj(boolValue)
-    int boolValue;
-{
-    return (tclStubsPtr->tcl_NewBooleanObj)(boolValue);
-}
-
-/* Slot 50 */
-Tcl_Obj *
-Tcl_NewByteArrayObj(bytes, length)
-    unsigned char * bytes;
-    int length;
-{
-    return (tclStubsPtr->tcl_NewByteArrayObj)(bytes, length);
-}
-
-/* Slot 51 */
-Tcl_Obj *
-Tcl_NewDoubleObj(doubleValue)
-    double doubleValue;
-{
-    return (tclStubsPtr->tcl_NewDoubleObj)(doubleValue);
-}
-
-/* Slot 52 */
-Tcl_Obj *
-Tcl_NewIntObj(intValue)
-    int intValue;
-{
-    return (tclStubsPtr->tcl_NewIntObj)(intValue);
-}
-
-/* Slot 53 */
-Tcl_Obj *
-Tcl_NewListObj(objc, objv)
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    return (tclStubsPtr->tcl_NewListObj)(objc, objv);
-}
-
-/* Slot 54 */
-Tcl_Obj *
-Tcl_NewLongObj(longValue)
-    long longValue;
-{
-    return (tclStubsPtr->tcl_NewLongObj)(longValue);
-}
-
-/* Slot 55 */
-Tcl_Obj *
-Tcl_NewObj()
-{
-    return (tclStubsPtr->tcl_NewObj)();
-}
-
-/* Slot 56 */
-Tcl_Obj *
-Tcl_NewStringObj(bytes, length)
-    CONST char * bytes;
-    int length;
-{
-    return (tclStubsPtr->tcl_NewStringObj)(bytes, length);
-}
-
-/* Slot 57 */
-void
-Tcl_SetBooleanObj(objPtr, boolValue)
-    Tcl_Obj * objPtr;
-    int boolValue;
-{
-    (tclStubsPtr->tcl_SetBooleanObj)(objPtr, boolValue);
-}
-
-/* Slot 58 */
-unsigned char *
-Tcl_SetByteArrayLength(objPtr, length)
-    Tcl_Obj * objPtr;
-    int length;
-{
-    return (tclStubsPtr->tcl_SetByteArrayLength)(objPtr, length);
-}
-
-/* Slot 59 */
-void
-Tcl_SetByteArrayObj(objPtr, bytes, length)
-    Tcl_Obj * objPtr;
-    unsigned char * bytes;
-    int length;
-{
-    (tclStubsPtr->tcl_SetByteArrayObj)(objPtr, bytes, length);
-}
-
-/* Slot 60 */
-void
-Tcl_SetDoubleObj(objPtr, doubleValue)
-    Tcl_Obj * objPtr;
-    double doubleValue;
-{
-    (tclStubsPtr->tcl_SetDoubleObj)(objPtr, doubleValue);
-}
-
-/* Slot 61 */
-void
-Tcl_SetIntObj(objPtr, intValue)
-    Tcl_Obj * objPtr;
-    int intValue;
-{
-    (tclStubsPtr->tcl_SetIntObj)(objPtr, intValue);
-}
-
-/* Slot 62 */
-void
-Tcl_SetListObj(objPtr, objc, objv)
-    Tcl_Obj * objPtr;
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    (tclStubsPtr->tcl_SetListObj)(objPtr, objc, objv);
-}
-
-/* Slot 63 */
-void
-Tcl_SetLongObj(objPtr, longValue)
-    Tcl_Obj * objPtr;
-    long longValue;
-{
-    (tclStubsPtr->tcl_SetLongObj)(objPtr, longValue);
-}
-
-/* Slot 64 */
-void
-Tcl_SetObjLength(objPtr, length)
-    Tcl_Obj * objPtr;
-    int length;
-{
-    (tclStubsPtr->tcl_SetObjLength)(objPtr, length);
-}
-
-/* Slot 65 */
-void
-Tcl_SetStringObj(objPtr, bytes, length)
-    Tcl_Obj * objPtr;
-    char * bytes;
-    int length;
-{
-    (tclStubsPtr->tcl_SetStringObj)(objPtr, bytes, length);
-}
-
-/* Slot 66 */
-void
-Tcl_AddErrorInfo(interp, message)
-    Tcl_Interp * interp;
-    CONST char * message;
-{
-    (tclStubsPtr->tcl_AddErrorInfo)(interp, message);
-}
-
-/* Slot 67 */
-void
-Tcl_AddObjErrorInfo(interp, message, length)
-    Tcl_Interp * interp;
-    CONST char * message;
-    int length;
-{
-    (tclStubsPtr->tcl_AddObjErrorInfo)(interp, message, length);
-}
-
-/* Slot 68 */
-void
-Tcl_AllowExceptions(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_AllowExceptions)(interp);
-}
-
-/* Slot 69 */
-void
-Tcl_AppendElement(interp, string)
-    Tcl_Interp * interp;
-    CONST char * string;
-{
-    (tclStubsPtr->tcl_AppendElement)(interp, string);
-}
-
-/* Slot 70 */
-void
-Tcl_AppendResult TCL_VARARGS_DEF(Tcl_Interp *,interp)
-{
-    Tcl_Interp * var;
-    va_list argList;
-
-    var = (Tcl_Interp *) TCL_VARARGS_START(Tcl_Interp *,interp,argList);
-
-    (tclStubsPtr->tcl_AppendResultVA)(var, argList);
-    va_end(argList);
-}
-
-/* Slot 71 */
-Tcl_AsyncHandler
-Tcl_AsyncCreate(proc, clientData)
-    Tcl_AsyncProc * proc;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_AsyncCreate)(proc, clientData);
-}
-
-/* Slot 72 */
-void
-Tcl_AsyncDelete(async)
-    Tcl_AsyncHandler async;
-{
-    (tclStubsPtr->tcl_AsyncDelete)(async);
-}
-
-/* Slot 73 */
-int
-Tcl_AsyncInvoke(interp, code)
-    Tcl_Interp * interp;
-    int code;
-{
-    return (tclStubsPtr->tcl_AsyncInvoke)(interp, code);
-}
-
-/* Slot 74 */
-void
-Tcl_AsyncMark(async)
-    Tcl_AsyncHandler async;
-{
-    (tclStubsPtr->tcl_AsyncMark)(async);
-}
-
-/* Slot 75 */
-int
-Tcl_AsyncReady()
-{
-    return (tclStubsPtr->tcl_AsyncReady)();
-}
-
-/* Slot 76 */
-void
-Tcl_BackgroundError(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_BackgroundError)(interp);
-}
-
-/* Slot 77 */
-char
-Tcl_Backslash(src, readPtr)
-    CONST char * src;
-    int * readPtr;
-{
-    return (tclStubsPtr->tcl_Backslash)(src, readPtr);
-}
-
-/* Slot 78 */
-int
-Tcl_BadChannelOption(interp, optionName, optionList)
-    Tcl_Interp * interp;
-    char * optionName;
-    char * optionList;
-{
-    return (tclStubsPtr->tcl_BadChannelOption)(interp, optionName, optionList);
-}
-
-/* Slot 79 */
-void
-Tcl_CallWhenDeleted(interp, proc, clientData)
-    Tcl_Interp * interp;
-    Tcl_InterpDeleteProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CallWhenDeleted)(interp, proc, clientData);
-}
-
-/* Slot 80 */
-void
-Tcl_CancelIdleCall(idleProc, clientData)
-    Tcl_IdleProc * idleProc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CancelIdleCall)(idleProc, clientData);
-}
-
-/* Slot 81 */
-int
-Tcl_Close(interp, chan)
-    Tcl_Interp * interp;
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_Close)(interp, chan);
-}
-
-/* Slot 82 */
-int
-Tcl_CommandComplete(cmd)
-    char * cmd;
-{
-    return (tclStubsPtr->tcl_CommandComplete)(cmd);
-}
-
-/* Slot 83 */
-char *
-Tcl_Concat(argc, argv)
-    int argc;
-    char ** argv;
-{
-    return (tclStubsPtr->tcl_Concat)(argc, argv);
-}
-
-/* Slot 84 */
-int
-Tcl_ConvertElement(src, dst, flags)
-    CONST char * src;
-    char * dst;
-    int flags;
-{
-    return (tclStubsPtr->tcl_ConvertElement)(src, dst, flags);
-}
-
-/* Slot 85 */
-int
-Tcl_ConvertCountedElement(src, length, dst, flags)
-    CONST char * src;
-    int length;
-    char * dst;
-    int flags;
-{
-    return (tclStubsPtr->tcl_ConvertCountedElement)(src, length, dst, flags);
-}
-
-/* Slot 86 */
-int
-Tcl_CreateAlias(slave, slaveCmd, target, targetCmd, argc, argv)
-    Tcl_Interp * slave;
-    char * slaveCmd;
-    Tcl_Interp * target;
-    char * targetCmd;
-    int argc;
-    char ** argv;
-{
-    return (tclStubsPtr->tcl_CreateAlias)(slave, slaveCmd, target, targetCmd, argc, argv);
-}
-
-/* Slot 87 */
-int
-Tcl_CreateAliasObj(slave, slaveCmd, target, targetCmd, objc, objv)
-    Tcl_Interp * slave;
-    char * slaveCmd;
-    Tcl_Interp * target;
-    char * targetCmd;
-    int objc;
-    Tcl_Obj *CONST objv[];
-{
-    return (tclStubsPtr->tcl_CreateAliasObj)(slave, slaveCmd, target, targetCmd, objc, objv);
-}
-
-/* Slot 88 */
-Tcl_Channel
-Tcl_CreateChannel(typePtr, chanName, instanceData, mask)
-    Tcl_ChannelType * typePtr;
-    char * chanName;
-    ClientData instanceData;
-    int mask;
-{
-    return (tclStubsPtr->tcl_CreateChannel)(typePtr, chanName, instanceData, mask);
-}
-
-/* Slot 89 */
-void
-Tcl_CreateChannelHandler(chan, mask, proc, clientData)
-    Tcl_Channel chan;
-    int mask;
-    Tcl_ChannelProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateChannelHandler)(chan, mask, proc, clientData);
-}
-
-/* Slot 90 */
-void
-Tcl_CreateCloseHandler(chan, proc, clientData)
-    Tcl_Channel chan;
-    Tcl_CloseProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateCloseHandler)(chan, proc, clientData);
-}
-
-/* Slot 91 */
-Tcl_Command
-Tcl_CreateCommand(interp, cmdName, proc, clientData, deleteProc)
-    Tcl_Interp * interp;
-    char * cmdName;
-    Tcl_CmdProc * proc;
-    ClientData clientData;
-    Tcl_CmdDeleteProc * deleteProc;
-{
-    return (tclStubsPtr->tcl_CreateCommand)(interp, cmdName, proc, clientData, deleteProc);
-}
-
-/* Slot 92 */
-void
-Tcl_CreateEventSource(setupProc, checkProc, clientData)
-    Tcl_EventSetupProc * setupProc;
-    Tcl_EventCheckProc * checkProc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateEventSource)(setupProc, checkProc, clientData);
-}
-
-/* Slot 93 */
-void
-Tcl_CreateExitHandler(proc, clientData)
-    Tcl_ExitProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateExitHandler)(proc, clientData);
-}
-
-/* Slot 94 */
-Tcl_Interp *
-Tcl_CreateInterp()
-{
-    return (tclStubsPtr->tcl_CreateInterp)();
-}
-
-/* Slot 95 */
-void
-Tcl_CreateMathFunc(interp, name, numArgs, argTypes, proc, clientData)
-    Tcl_Interp * interp;
-    char * name;
-    int numArgs;
-    Tcl_ValueType * argTypes;
-    Tcl_MathProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateMathFunc)(interp, name, numArgs, argTypes, proc, clientData);
-}
-
-/* Slot 96 */
-Tcl_Command
-Tcl_CreateObjCommand(interp, cmdName, proc, clientData, deleteProc)
-    Tcl_Interp * interp;
-    char * cmdName;
-    Tcl_ObjCmdProc * proc;
-    ClientData clientData;
-    Tcl_CmdDeleteProc * deleteProc;
-{
-    return (tclStubsPtr->tcl_CreateObjCommand)(interp, cmdName, proc, clientData, deleteProc);
-}
-
-/* Slot 97 */
-Tcl_Interp *
-Tcl_CreateSlave(interp, slaveName, isSafe)
-    Tcl_Interp * interp;
-    char * slaveName;
-    int isSafe;
-{
-    return (tclStubsPtr->tcl_CreateSlave)(interp, slaveName, isSafe);
-}
-
-/* Slot 98 */
-Tcl_TimerToken
-Tcl_CreateTimerHandler(milliseconds, proc, clientData)
-    int milliseconds;
-    Tcl_TimerProc * proc;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_CreateTimerHandler)(milliseconds, proc, clientData);
-}
-
-/* Slot 99 */
-Tcl_Trace
-Tcl_CreateTrace(interp, level, proc, clientData)
-    Tcl_Interp * interp;
-    int level;
-    Tcl_CmdTraceProc * proc;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_CreateTrace)(interp, level, proc, clientData);
-}
-
-/* Slot 100 */
-void
-Tcl_DeleteAssocData(interp, name)
-    Tcl_Interp * interp;
-    char * name;
-{
-    (tclStubsPtr->tcl_DeleteAssocData)(interp, name);
-}
-
-/* Slot 101 */
-void
-Tcl_DeleteChannelHandler(chan, proc, clientData)
-    Tcl_Channel chan;
-    Tcl_ChannelProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteChannelHandler)(chan, proc, clientData);
-}
-
-/* Slot 102 */
-void
-Tcl_DeleteCloseHandler(chan, proc, clientData)
-    Tcl_Channel chan;
-    Tcl_CloseProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteCloseHandler)(chan, proc, clientData);
-}
-
-/* Slot 103 */
-int
-Tcl_DeleteCommand(interp, cmdName)
-    Tcl_Interp * interp;
-    char * cmdName;
-{
-    return (tclStubsPtr->tcl_DeleteCommand)(interp, cmdName);
-}
-
-/* Slot 104 */
-int
-Tcl_DeleteCommandFromToken(interp, command)
-    Tcl_Interp * interp;
-    Tcl_Command command;
-{
-    return (tclStubsPtr->tcl_DeleteCommandFromToken)(interp, command);
-}
-
-/* Slot 105 */
-void
-Tcl_DeleteEvents(proc, clientData)
-    Tcl_EventDeleteProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteEvents)(proc, clientData);
-}
-
-/* Slot 106 */
-void
-Tcl_DeleteEventSource(setupProc, checkProc, clientData)
-    Tcl_EventSetupProc * setupProc;
-    Tcl_EventCheckProc * checkProc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteEventSource)(setupProc, checkProc, clientData);
-}
-
-/* Slot 107 */
-void
-Tcl_DeleteExitHandler(proc, clientData)
-    Tcl_ExitProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteExitHandler)(proc, clientData);
-}
-
-/* Slot 108 */
-void
-Tcl_DeleteHashEntry(entryPtr)
-    Tcl_HashEntry * entryPtr;
-{
-    (tclStubsPtr->tcl_DeleteHashEntry)(entryPtr);
-}
-
-/* Slot 109 */
-void
-Tcl_DeleteHashTable(tablePtr)
-    Tcl_HashTable * tablePtr;
-{
-    (tclStubsPtr->tcl_DeleteHashTable)(tablePtr);
-}
-
-/* Slot 110 */
-void
-Tcl_DeleteInterp(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_DeleteInterp)(interp);
-}
-
-/* Slot 111 */
-void
-Tcl_DetachPids(numPids, pidPtr)
-    int numPids;
-    Tcl_Pid * pidPtr;
-{
-    (tclStubsPtr->tcl_DetachPids)(numPids, pidPtr);
-}
-
-/* Slot 112 */
-void
-Tcl_DeleteTimerHandler(token)
-    Tcl_TimerToken token;
-{
-    (tclStubsPtr->tcl_DeleteTimerHandler)(token);
-}
-
-/* Slot 113 */
-void
-Tcl_DeleteTrace(interp, trace)
-    Tcl_Interp * interp;
-    Tcl_Trace trace;
-{
-    (tclStubsPtr->tcl_DeleteTrace)(interp, trace);
-}
-
-/* Slot 114 */
-void
-Tcl_DontCallWhenDeleted(interp, proc, clientData)
-    Tcl_Interp * interp;
-    Tcl_InterpDeleteProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DontCallWhenDeleted)(interp, proc, clientData);
-}
-
-/* Slot 115 */
-int
-Tcl_DoOneEvent(flags)
-    int flags;
-{
-    return (tclStubsPtr->tcl_DoOneEvent)(flags);
-}
-
-/* Slot 116 */
-void
-Tcl_DoWhenIdle(proc, clientData)
-    Tcl_IdleProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DoWhenIdle)(proc, clientData);
-}
-
-/* Slot 117 */
-char *
-Tcl_DStringAppend(dsPtr, str, length)
-    Tcl_DString * dsPtr;
-    CONST char * str;
-    int length;
-{
-    return (tclStubsPtr->tcl_DStringAppend)(dsPtr, str, length);
-}
-
-/* Slot 118 */
-char *
-Tcl_DStringAppendElement(dsPtr, string)
-    Tcl_DString * dsPtr;
-    CONST char * string;
-{
-    return (tclStubsPtr->tcl_DStringAppendElement)(dsPtr, string);
-}
-
-/* Slot 119 */
-void
-Tcl_DStringEndSublist(dsPtr)
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringEndSublist)(dsPtr);
-}
-
-/* Slot 120 */
-void
-Tcl_DStringFree(dsPtr)
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringFree)(dsPtr);
-}
-
-/* Slot 121 */
-void
-Tcl_DStringGetResult(interp, dsPtr)
-    Tcl_Interp * interp;
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringGetResult)(interp, dsPtr);
-}
-
-/* Slot 122 */
-void
-Tcl_DStringInit(dsPtr)
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringInit)(dsPtr);
-}
-
-/* Slot 123 */
-void
-Tcl_DStringResult(interp, dsPtr)
-    Tcl_Interp * interp;
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringResult)(interp, dsPtr);
-}
-
-/* Slot 124 */
-void
-Tcl_DStringSetLength(dsPtr, length)
-    Tcl_DString * dsPtr;
-    int length;
-{
-    (tclStubsPtr->tcl_DStringSetLength)(dsPtr, length);
-}
-
-/* Slot 125 */
-void
-Tcl_DStringStartSublist(dsPtr)
-    Tcl_DString * dsPtr;
-{
-    (tclStubsPtr->tcl_DStringStartSublist)(dsPtr);
-}
-
-/* Slot 126 */
-int
-Tcl_Eof(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_Eof)(chan);
-}
-
-/* Slot 127 */
-char *
-Tcl_ErrnoId()
-{
-    return (tclStubsPtr->tcl_ErrnoId)();
-}
-
-/* Slot 128 */
-char *
-Tcl_ErrnoMsg(err)
-    int err;
-{
-    return (tclStubsPtr->tcl_ErrnoMsg)(err);
-}
-
-/* Slot 129 */
-int
-Tcl_Eval(interp, string)
-    Tcl_Interp * interp;
-    char * string;
-{
-    return (tclStubsPtr->tcl_Eval)(interp, string);
-}
-
-/* Slot 130 */
-int
-Tcl_EvalFile(interp, fileName)
-    Tcl_Interp * interp;
-    char * fileName;
-{
-    return (tclStubsPtr->tcl_EvalFile)(interp, fileName);
-}
-
-/* Slot 131 */
-int
-Tcl_EvalObj(interp, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_EvalObj)(interp, objPtr);
-}
-
-/* Slot 132 */
-void
-Tcl_EventuallyFree(clientData, freeProc)
-    ClientData clientData;
-    Tcl_FreeProc * freeProc;
-{
-    (tclStubsPtr->tcl_EventuallyFree)(clientData, freeProc);
-}
-
-/* Slot 133 */
-void
-Tcl_Exit(status)
-    int status;
-{
-    (tclStubsPtr->tcl_Exit)(status);
-}
-
-/* Slot 134 */
-int
-Tcl_ExposeCommand(interp, hiddenCmdToken, cmdName)
-    Tcl_Interp * interp;
-    char * hiddenCmdToken;
-    char * cmdName;
-{
-    return (tclStubsPtr->tcl_ExposeCommand)(interp, hiddenCmdToken, cmdName);
-}
-
-/* Slot 135 */
-int
-Tcl_ExprBoolean(interp, str, ptr)
-    Tcl_Interp * interp;
-    char * str;
-    int * ptr;
-{
-    return (tclStubsPtr->tcl_ExprBoolean)(interp, str, ptr);
-}
-
-/* Slot 136 */
-int
-Tcl_ExprBooleanObj(interp, objPtr, ptr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    int * ptr;
-{
-    return (tclStubsPtr->tcl_ExprBooleanObj)(interp, objPtr, ptr);
-}
-
-/* Slot 137 */
-int
-Tcl_ExprDouble(interp, str, ptr)
-    Tcl_Interp * interp;
-    char * str;
-    double * ptr;
-{
-    return (tclStubsPtr->tcl_ExprDouble)(interp, str, ptr);
-}
-
-/* Slot 138 */
-int
-Tcl_ExprDoubleObj(interp, objPtr, ptr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    double * ptr;
-{
-    return (tclStubsPtr->tcl_ExprDoubleObj)(interp, objPtr, ptr);
-}
-
-/* Slot 139 */
-int
-Tcl_ExprLong(interp, str, ptr)
-    Tcl_Interp * interp;
-    char * str;
-    long * ptr;
-{
-    return (tclStubsPtr->tcl_ExprLong)(interp, str, ptr);
-}
-
-/* Slot 140 */
-int
-Tcl_ExprLongObj(interp, objPtr, ptr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    long * ptr;
-{
-    return (tclStubsPtr->tcl_ExprLongObj)(interp, objPtr, ptr);
-}
-
-/* Slot 141 */
-int
-Tcl_ExprObj(interp, objPtr, resultPtrPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    Tcl_Obj ** resultPtrPtr;
-{
-    return (tclStubsPtr->tcl_ExprObj)(interp, objPtr, resultPtrPtr);
-}
-
-/* Slot 142 */
-int
-Tcl_ExprString(interp, string)
-    Tcl_Interp * interp;
-    char * string;
-{
-    return (tclStubsPtr->tcl_ExprString)(interp, string);
-}
-
-/* Slot 143 */
-void
-Tcl_Finalize()
-{
-    (tclStubsPtr->tcl_Finalize)();
-}
-
-/* Slot 144 */
-void
-Tcl_FindExecutable(argv0)
-    CONST char * argv0;
-{
-    (tclStubsPtr->tcl_FindExecutable)(argv0);
-}
-
-/* Slot 145 */
-Tcl_HashEntry *
-Tcl_FirstHashEntry(tablePtr, searchPtr)
-    Tcl_HashTable * tablePtr;
-    Tcl_HashSearch * searchPtr;
-{
-    return (tclStubsPtr->tcl_FirstHashEntry)(tablePtr, searchPtr);
-}
-
-/* Slot 146 */
-int
-Tcl_Flush(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_Flush)(chan);
-}
-
-/* Slot 147 */
-void
-Tcl_FreeResult(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_FreeResult)(interp);
-}
-
-/* Slot 148 */
-int
-Tcl_GetAlias(interp, slaveCmd, targetInterpPtr, targetCmdPtr, argcPtr, argvPtr)
-    Tcl_Interp * interp;
-    char * slaveCmd;
-    Tcl_Interp ** targetInterpPtr;
-    char ** targetCmdPtr;
-    int * argcPtr;
-    char *** argvPtr;
-{
-    return (tclStubsPtr->tcl_GetAlias)(interp, slaveCmd, targetInterpPtr, targetCmdPtr, argcPtr, argvPtr);
-}
-
-/* Slot 149 */
-int
-Tcl_GetAliasObj(interp, slaveCmd, targetInterpPtr, targetCmdPtr, objcPtr, objv)
-    Tcl_Interp * interp;
-    char * slaveCmd;
-    Tcl_Interp ** targetInterpPtr;
-    char ** targetCmdPtr;
-    int * objcPtr;
-    Tcl_Obj *** objv;
-{
-    return (tclStubsPtr->tcl_GetAliasObj)(interp, slaveCmd, targetInterpPtr, targetCmdPtr, objcPtr, objv);
-}
-
-/* Slot 150 */
-ClientData
-Tcl_GetAssocData(interp, name, procPtr)
-    Tcl_Interp * interp;
-    char * name;
-    Tcl_InterpDeleteProc ** procPtr;
-{
-    return (tclStubsPtr->tcl_GetAssocData)(interp, name, procPtr);
-}
-
-/* Slot 151 */
-Tcl_Channel
-Tcl_GetChannel(interp, chanName, modePtr)
-    Tcl_Interp * interp;
-    char * chanName;
-    int * modePtr;
-{
-    return (tclStubsPtr->tcl_GetChannel)(interp, chanName, modePtr);
-}
-
-/* Slot 152 */
-int
-Tcl_GetChannelBufferSize(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_GetChannelBufferSize)(chan);
-}
-
-/* Slot 153 */
-int
-Tcl_GetChannelHandle(chan, direction, handlePtr)
-    Tcl_Channel chan;
-    int direction;
-    ClientData * handlePtr;
-{
-    return (tclStubsPtr->tcl_GetChannelHandle)(chan, direction, handlePtr);
-}
-
-/* Slot 154 */
-ClientData
-Tcl_GetChannelInstanceData(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_GetChannelInstanceData)(chan);
-}
-
-/* Slot 155 */
-int
-Tcl_GetChannelMode(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_GetChannelMode)(chan);
-}
-
-/* Slot 156 */
-char *
-Tcl_GetChannelName(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_GetChannelName)(chan);
-}
-
-/* Slot 157 */
-int
-Tcl_GetChannelOption(interp, chan, optionName, dsPtr)
-    Tcl_Interp * interp;
-    Tcl_Channel chan;
-    char * optionName;
-    Tcl_DString * dsPtr;
-{
-    return (tclStubsPtr->tcl_GetChannelOption)(interp, chan, optionName, dsPtr);
-}
-
-/* Slot 158 */
-Tcl_ChannelType *
-Tcl_GetChannelType(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_GetChannelType)(chan);
-}
-
-/* Slot 159 */
-int
-Tcl_GetCommandInfo(interp, cmdName, infoPtr)
-    Tcl_Interp * interp;
-    char * cmdName;
-    Tcl_CmdInfo * infoPtr;
-{
-    return (tclStubsPtr->tcl_GetCommandInfo)(interp, cmdName, infoPtr);
-}
-
-/* Slot 160 */
-char *
-Tcl_GetCommandName(interp, command)
-    Tcl_Interp * interp;
-    Tcl_Command command;
-{
-    return (tclStubsPtr->tcl_GetCommandName)(interp, command);
-}
-
-/* Slot 161 */
-int
-Tcl_GetErrno()
-{
-    return (tclStubsPtr->tcl_GetErrno)();
-}
-
-/* Slot 162 */
-char *
-Tcl_GetHostName()
-{
-    return (tclStubsPtr->tcl_GetHostName)();
-}
-
-/* Slot 163 */
-int
-Tcl_GetInterpPath(askInterp, slaveInterp)
-    Tcl_Interp * askInterp;
-    Tcl_Interp * slaveInterp;
-{
-    return (tclStubsPtr->tcl_GetInterpPath)(askInterp, slaveInterp);
-}
-
-/* Slot 164 */
-Tcl_Interp *
-Tcl_GetMaster(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_GetMaster)(interp);
-}
-
-/* Slot 165 */
-CONST char *
-Tcl_GetNameOfExecutable()
-{
-    return (tclStubsPtr->tcl_GetNameOfExecutable)();
-}
-
-/* Slot 166 */
-Tcl_Obj *
-Tcl_GetObjResult(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_GetObjResult)(interp);
-}
-
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-/* Slot 167 */
-int
-Tcl_GetOpenFile(interp, str, write, checkUsage, filePtr)
-    Tcl_Interp * interp;
-    char * str;
-    int write;
-    int checkUsage;
-    ClientData * filePtr;
-{
-    return (tclStubsPtr->tcl_GetOpenFile)(interp, str, write, checkUsage, filePtr);
-}
-
-#endif /* UNIX */
-/* Slot 168 */
-Tcl_PathType
-Tcl_GetPathType(path)
-    char * path;
-{
-    return (tclStubsPtr->tcl_GetPathType)(path);
-}
-
-/* Slot 169 */
-int
-Tcl_Gets(chan, dsPtr)
-    Tcl_Channel chan;
-    Tcl_DString * dsPtr;
-{
-    return (tclStubsPtr->tcl_Gets)(chan, dsPtr);
-}
-
-/* Slot 170 */
-int
-Tcl_GetsObj(chan, objPtr)
-    Tcl_Channel chan;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_GetsObj)(chan, objPtr);
-}
-
-/* Slot 171 */
-int
-Tcl_GetServiceMode()
-{
-    return (tclStubsPtr->tcl_GetServiceMode)();
-}
-
-/* Slot 172 */
-Tcl_Interp *
-Tcl_GetSlave(interp, slaveName)
-    Tcl_Interp * interp;
-    char * slaveName;
-{
-    return (tclStubsPtr->tcl_GetSlave)(interp, slaveName);
-}
-
-/* Slot 173 */
-Tcl_Channel
-Tcl_GetStdChannel(type)
-    int type;
-{
-    return (tclStubsPtr->tcl_GetStdChannel)(type);
-}
-
-/* Slot 174 */
-char *
-Tcl_GetStringResult(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_GetStringResult)(interp);
-}
-
-/* Slot 175 */
-char *
-Tcl_GetVar(interp, varName, flags)
-    Tcl_Interp * interp;
-    char * varName;
-    int flags;
-{
-    return (tclStubsPtr->tcl_GetVar)(interp, varName, flags);
-}
-
-/* Slot 176 */
-char *
-Tcl_GetVar2(interp, part1, part2, flags)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-{
-    return (tclStubsPtr->tcl_GetVar2)(interp, part1, part2, flags);
-}
-
-/* Slot 177 */
-int
-Tcl_GlobalEval(interp, command)
-    Tcl_Interp * interp;
-    char * command;
-{
-    return (tclStubsPtr->tcl_GlobalEval)(interp, command);
-}
-
-/* Slot 178 */
-int
-Tcl_GlobalEvalObj(interp, objPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_GlobalEvalObj)(interp, objPtr);
-}
-
-/* Slot 179 */
-int
-Tcl_HideCommand(interp, cmdName, hiddenCmdToken)
-    Tcl_Interp * interp;
-    char * cmdName;
-    char * hiddenCmdToken;
-{
-    return (tclStubsPtr->tcl_HideCommand)(interp, cmdName, hiddenCmdToken);
-}
-
-/* Slot 180 */
-int
-Tcl_Init(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_Init)(interp);
-}
-
-/* Slot 181 */
-void
-Tcl_InitHashTable(tablePtr, keyType)
-    Tcl_HashTable * tablePtr;
-    int keyType;
-{
-    (tclStubsPtr->tcl_InitHashTable)(tablePtr, keyType);
-}
-
-/* Slot 182 */
-int
-Tcl_InputBlocked(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_InputBlocked)(chan);
-}
-
-/* Slot 183 */
-int
-Tcl_InputBuffered(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_InputBuffered)(chan);
-}
-
-/* Slot 184 */
-int
-Tcl_InterpDeleted(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_InterpDeleted)(interp);
-}
-
-/* Slot 185 */
-int
-Tcl_IsSafe(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_IsSafe)(interp);
-}
-
-/* Slot 186 */
-char *
-Tcl_JoinPath(argc, argv, resultPtr)
-    int argc;
-    CONST char ** argv;
-    Tcl_DString * resultPtr;
-{
-    return (tclStubsPtr->tcl_JoinPath)(argc, argv, resultPtr);
-}
-
-/* Slot 187 */
-int
-Tcl_LinkVar(interp, varName, addr, type)
-    Tcl_Interp * interp;
-    char * varName;
-    char * addr;
-    int type;
-{
-    return (tclStubsPtr->tcl_LinkVar)(interp, varName, addr, type);
-}
-
-/* Slot 188 is reserved */
-/* Slot 189 */
-Tcl_Channel
-Tcl_MakeFileChannel(handle, mode)
-    ClientData handle;
-    int mode;
-{
-    return (tclStubsPtr->tcl_MakeFileChannel)(handle, mode);
-}
-
-/* Slot 190 */
-int
-Tcl_MakeSafe(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_MakeSafe)(interp);
-}
-
-/* Slot 191 */
-Tcl_Channel
-Tcl_MakeTcpClientChannel(tcpSocket)
-    ClientData tcpSocket;
-{
-    return (tclStubsPtr->tcl_MakeTcpClientChannel)(tcpSocket);
-}
-
-/* Slot 192 */
-char *
-Tcl_Merge(argc, argv)
-    int argc;
-    char ** argv;
-{
-    return (tclStubsPtr->tcl_Merge)(argc, argv);
-}
-
-/* Slot 193 */
-Tcl_HashEntry *
-Tcl_NextHashEntry(searchPtr)
-    Tcl_HashSearch * searchPtr;
-{
-    return (tclStubsPtr->tcl_NextHashEntry)(searchPtr);
-}
-
-/* Slot 194 */
-void
-Tcl_NotifyChannel(channel, mask)
-    Tcl_Channel channel;
-    int mask;
-{
-    (tclStubsPtr->tcl_NotifyChannel)(channel, mask);
-}
-
-/* Slot 195 */
-Tcl_Obj *
-Tcl_ObjGetVar2(interp, part1Ptr, part2Ptr, flags)
-    Tcl_Interp * interp;
-    Tcl_Obj * part1Ptr;
-    Tcl_Obj * part2Ptr;
-    int flags;
-{
-    return (tclStubsPtr->tcl_ObjGetVar2)(interp, part1Ptr, part2Ptr, flags);
-}
-
-/* Slot 196 */
-Tcl_Obj *
-Tcl_ObjSetVar2(interp, part1Ptr, part2Ptr, newValuePtr, flags)
-    Tcl_Interp * interp;
-    Tcl_Obj * part1Ptr;
-    Tcl_Obj * part2Ptr;
-    Tcl_Obj * newValuePtr;
-    int flags;
-{
-    return (tclStubsPtr->tcl_ObjSetVar2)(interp, part1Ptr, part2Ptr, newValuePtr, flags);
-}
-
-/* Slot 197 */
-Tcl_Channel
-Tcl_OpenCommandChannel(interp, argc, argv, flags)
-    Tcl_Interp * interp;
-    int argc;
-    char ** argv;
-    int flags;
-{
-    return (tclStubsPtr->tcl_OpenCommandChannel)(interp, argc, argv, flags);
-}
-
-/* Slot 198 */
-Tcl_Channel
-Tcl_OpenFileChannel(interp, fileName, modeString, permissions)
-    Tcl_Interp * interp;
-    char * fileName;
-    char * modeString;
-    int permissions;
-{
-    return (tclStubsPtr->tcl_OpenFileChannel)(interp, fileName, modeString, permissions);
-}
-
-/* Slot 199 */
-Tcl_Channel
-Tcl_OpenTcpClient(interp, port, address, myaddr, myport, async)
-    Tcl_Interp * interp;
-    int port;
-    char * address;
-    char * myaddr;
-    int myport;
-    int async;
-{
-    return (tclStubsPtr->tcl_OpenTcpClient)(interp, port, address, myaddr, myport, async);
-}
-
-/* Slot 200 */
-Tcl_Channel
-Tcl_OpenTcpServer(interp, port, host, acceptProc, callbackData)
-    Tcl_Interp * interp;
-    int port;
-    char * host;
-    Tcl_TcpAcceptProc * acceptProc;
-    ClientData callbackData;
-{
-    return (tclStubsPtr->tcl_OpenTcpServer)(interp, port, host, acceptProc, callbackData);
-}
-
-/* Slot 201 */
-void
-Tcl_Preserve(data)
-    ClientData data;
-{
-    (tclStubsPtr->tcl_Preserve)(data);
-}
-
-/* Slot 202 */
-void
-Tcl_PrintDouble(interp, value, dst)
-    Tcl_Interp * interp;
-    double value;
-    char * dst;
-{
-    (tclStubsPtr->tcl_PrintDouble)(interp, value, dst);
-}
-
-/* Slot 203 */
-int
-Tcl_PutEnv(string)
-    CONST char * string;
-{
-    return (tclStubsPtr->tcl_PutEnv)(string);
-}
-
-/* Slot 204 */
-char *
-Tcl_PosixError(interp)
-    Tcl_Interp * interp;
-{
-    return (tclStubsPtr->tcl_PosixError)(interp);
-}
-
-/* Slot 205 */
-void
-Tcl_QueueEvent(evPtr, position)
-    Tcl_Event * evPtr;
-    Tcl_QueuePosition position;
-{
-    (tclStubsPtr->tcl_QueueEvent)(evPtr, position);
-}
-
-/* Slot 206 */
-int
-Tcl_Read(chan, bufPtr, toRead)
-    Tcl_Channel chan;
-    char * bufPtr;
-    int toRead;
-{
-    return (tclStubsPtr->tcl_Read)(chan, bufPtr, toRead);
-}
-
-/* Slot 207 */
-void
-Tcl_ReapDetachedProcs()
-{
-    (tclStubsPtr->tcl_ReapDetachedProcs)();
-}
-
-/* Slot 208 */
-int
-Tcl_RecordAndEval(interp, cmd, flags)
-    Tcl_Interp * interp;
-    char * cmd;
-    int flags;
-{
-    return (tclStubsPtr->tcl_RecordAndEval)(interp, cmd, flags);
-}
-
-/* Slot 209 */
-int
-Tcl_RecordAndEvalObj(interp, cmdPtr, flags)
-    Tcl_Interp * interp;
-    Tcl_Obj * cmdPtr;
-    int flags;
-{
-    return (tclStubsPtr->tcl_RecordAndEvalObj)(interp, cmdPtr, flags);
-}
-
-/* Slot 210 */
-void
-Tcl_RegisterChannel(interp, chan)
-    Tcl_Interp * interp;
-    Tcl_Channel chan;
-{
-    (tclStubsPtr->tcl_RegisterChannel)(interp, chan);
-}
-
-/* Slot 211 */
-void
-Tcl_RegisterObjType(typePtr)
-    Tcl_ObjType * typePtr;
-{
-    (tclStubsPtr->tcl_RegisterObjType)(typePtr);
-}
-
-/* Slot 212 */
-Tcl_RegExp
-Tcl_RegExpCompile(interp, string)
-    Tcl_Interp * interp;
-    char * string;
-{
-    return (tclStubsPtr->tcl_RegExpCompile)(interp, string);
-}
-
-/* Slot 213 */
-int
-Tcl_RegExpExec(interp, regexp, str, start)
-    Tcl_Interp * interp;
-    Tcl_RegExp regexp;
-    CONST char * str;
-    CONST char * start;
-{
-    return (tclStubsPtr->tcl_RegExpExec)(interp, regexp, str, start);
-}
-
-/* Slot 214 */
-int
-Tcl_RegExpMatch(interp, str, pattern)
-    Tcl_Interp * interp;
-    char * str;
-    char * pattern;
-{
-    return (tclStubsPtr->tcl_RegExpMatch)(interp, str, pattern);
-}
-
-/* Slot 215 */
-void
-Tcl_RegExpRange(regexp, index, startPtr, endPtr)
-    Tcl_RegExp regexp;
-    int index;
-    char ** startPtr;
-    char ** endPtr;
-{
-    (tclStubsPtr->tcl_RegExpRange)(regexp, index, startPtr, endPtr);
-}
-
-/* Slot 216 */
-void
-Tcl_Release(clientData)
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_Release)(clientData);
-}
-
-/* Slot 217 */
-void
-Tcl_ResetResult(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_ResetResult)(interp);
-}
-
-/* Slot 218 */
-int
-Tcl_ScanElement(str, flagPtr)
-    CONST char * str;
-    int * flagPtr;
-{
-    return (tclStubsPtr->tcl_ScanElement)(str, flagPtr);
-}
-
-/* Slot 219 */
-int
-Tcl_ScanCountedElement(str, length, flagPtr)
-    CONST char * str;
-    int length;
-    int * flagPtr;
-{
-    return (tclStubsPtr->tcl_ScanCountedElement)(str, length, flagPtr);
-}
-
-/* Slot 220 */
-int
-Tcl_Seek(chan, offset, mode)
-    Tcl_Channel chan;
-    int offset;
-    int mode;
-{
-    return (tclStubsPtr->tcl_Seek)(chan, offset, mode);
-}
-
-/* Slot 221 */
-int
-Tcl_ServiceAll()
-{
-    return (tclStubsPtr->tcl_ServiceAll)();
-}
-
-/* Slot 222 */
-int
-Tcl_ServiceEvent(flags)
-    int flags;
-{
-    return (tclStubsPtr->tcl_ServiceEvent)(flags);
-}
-
-/* Slot 223 */
-void
-Tcl_SetAssocData(interp, name, proc, clientData)
-    Tcl_Interp * interp;
-    char * name;
-    Tcl_InterpDeleteProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_SetAssocData)(interp, name, proc, clientData);
-}
-
-/* Slot 224 */
-void
-Tcl_SetChannelBufferSize(chan, sz)
-    Tcl_Channel chan;
-    int sz;
-{
-    (tclStubsPtr->tcl_SetChannelBufferSize)(chan, sz);
-}
-
-/* Slot 225 */
-int
-Tcl_SetChannelOption(interp, chan, optionName, newValue)
-    Tcl_Interp * interp;
-    Tcl_Channel chan;
-    char * optionName;
-    char * newValue;
-{
-    return (tclStubsPtr->tcl_SetChannelOption)(interp, chan, optionName, newValue);
-}
-
-/* Slot 226 */
-int
-Tcl_SetCommandInfo(interp, cmdName, infoPtr)
-    Tcl_Interp * interp;
-    char * cmdName;
-    Tcl_CmdInfo * infoPtr;
-{
-    return (tclStubsPtr->tcl_SetCommandInfo)(interp, cmdName, infoPtr);
-}
-
-/* Slot 227 */
-void
-Tcl_SetErrno(err)
-    int err;
-{
-    (tclStubsPtr->tcl_SetErrno)(err);
-}
-
-/* Slot 228 */
-void
-Tcl_SetErrorCode TCL_VARARGS_DEF(Tcl_Interp *,interp)
-{
-    Tcl_Interp * var;
-    va_list argList;
-
-    var = (Tcl_Interp *) TCL_VARARGS_START(Tcl_Interp *,interp,argList);
-
-    (tclStubsPtr->tcl_SetErrorCodeVA)(var, argList);
-    va_end(argList);
-}
-
-/* Slot 229 */
-void
-Tcl_SetMaxBlockTime(timePtr)
-    Tcl_Time * timePtr;
-{
-    (tclStubsPtr->tcl_SetMaxBlockTime)(timePtr);
-}
-
-/* Slot 230 */
-void
-Tcl_SetPanicProc(panicProc)
-    Tcl_PanicProc * panicProc;
-{
-    (tclStubsPtr->tcl_SetPanicProc)(panicProc);
-}
-
-/* Slot 231 */
-int
-Tcl_SetRecursionLimit(interp, depth)
-    Tcl_Interp * interp;
-    int depth;
-{
-    return (tclStubsPtr->tcl_SetRecursionLimit)(interp, depth);
-}
-
-/* Slot 232 */
-void
-Tcl_SetResult(interp, str, freeProc)
-    Tcl_Interp * interp;
-    char * str;
-    Tcl_FreeProc * freeProc;
-{
-    (tclStubsPtr->tcl_SetResult)(interp, str, freeProc);
-}
-
-/* Slot 233 */
-int
-Tcl_SetServiceMode(mode)
-    int mode;
-{
-    return (tclStubsPtr->tcl_SetServiceMode)(mode);
-}
-
-/* Slot 234 */
-void
-Tcl_SetObjErrorCode(interp, errorObjPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * errorObjPtr;
-{
-    (tclStubsPtr->tcl_SetObjErrorCode)(interp, errorObjPtr);
-}
-
-/* Slot 235 */
-void
-Tcl_SetObjResult(interp, resultObjPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * resultObjPtr;
-{
-    (tclStubsPtr->tcl_SetObjResult)(interp, resultObjPtr);
-}
-
-/* Slot 236 */
-void
-Tcl_SetStdChannel(channel, type)
-    Tcl_Channel channel;
-    int type;
-{
-    (tclStubsPtr->tcl_SetStdChannel)(channel, type);
-}
-
-/* Slot 237 */
-char *
-Tcl_SetVar(interp, varName, newValue, flags)
-    Tcl_Interp * interp;
-    char * varName;
-    char * newValue;
-    int flags;
-{
-    return (tclStubsPtr->tcl_SetVar)(interp, varName, newValue, flags);
-}
-
-/* Slot 238 */
-char *
-Tcl_SetVar2(interp, part1, part2, newValue, flags)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    char * newValue;
-    int flags;
-{
-    return (tclStubsPtr->tcl_SetVar2)(interp, part1, part2, newValue, flags);
-}
-
-/* Slot 239 */
-char *
-Tcl_SignalId(sig)
-    int sig;
-{
-    return (tclStubsPtr->tcl_SignalId)(sig);
-}
-
-/* Slot 240 */
-char *
-Tcl_SignalMsg(sig)
-    int sig;
-{
-    return (tclStubsPtr->tcl_SignalMsg)(sig);
-}
-
-/* Slot 241 */
-void
-Tcl_SourceRCFile(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_SourceRCFile)(interp);
-}
-
-/* Slot 242 */
-int
-Tcl_SplitList(interp, listStr, argcPtr, argvPtr)
-    Tcl_Interp * interp;
-    CONST char * listStr;
-    int * argcPtr;
-    char *** argvPtr;
-{
-    return (tclStubsPtr->tcl_SplitList)(interp, listStr, argcPtr, argvPtr);
-}
-
-/* Slot 243 */
-void
-Tcl_SplitPath(path, argcPtr, argvPtr)
-    CONST char * path;
-    int * argcPtr;
-    char *** argvPtr;
-{
-    (tclStubsPtr->tcl_SplitPath)(path, argcPtr, argvPtr);
-}
-
-/* Slot 244 */
-void
-Tcl_StaticPackage(interp, pkgName, initProc, safeInitProc)
-    Tcl_Interp * interp;
-    char * pkgName;
-    Tcl_PackageInitProc * initProc;
-    Tcl_PackageInitProc * safeInitProc;
-{
-    (tclStubsPtr->tcl_StaticPackage)(interp, pkgName, initProc, safeInitProc);
-}
-
-/* Slot 245 */
-int
-Tcl_StringMatch(str, pattern)
-    CONST char * str;
-    CONST char * pattern;
-{
-    return (tclStubsPtr->tcl_StringMatch)(str, pattern);
-}
-
-/* Slot 246 */
-int
-Tcl_Tell(chan)
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_Tell)(chan);
-}
-
-/* Slot 247 */
-int
-Tcl_TraceVar(interp, varName, flags, proc, clientData)
-    Tcl_Interp * interp;
-    char * varName;
-    int flags;
-    Tcl_VarTraceProc * proc;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_TraceVar)(interp, varName, flags, proc, clientData);
-}
-
-/* Slot 248 */
-int
-Tcl_TraceVar2(interp, part1, part2, flags, proc, clientData)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-    Tcl_VarTraceProc * proc;
-    ClientData clientData;
-{
-    return (tclStubsPtr->tcl_TraceVar2)(interp, part1, part2, flags, proc, clientData);
-}
-
-/* Slot 249 */
-char *
-Tcl_TranslateFileName(interp, name, bufferPtr)
-    Tcl_Interp * interp;
-    CONST char * name;
-    Tcl_DString * bufferPtr;
-{
-    return (tclStubsPtr->tcl_TranslateFileName)(interp, name, bufferPtr);
-}
-
-/* Slot 250 */
-int
-Tcl_Ungets(chan, str, len, atHead)
-    Tcl_Channel chan;
-    char * str;
-    int len;
-    int atHead;
-{
-    return (tclStubsPtr->tcl_Ungets)(chan, str, len, atHead);
-}
-
-/* Slot 251 */
-void
-Tcl_UnlinkVar(interp, varName)
-    Tcl_Interp * interp;
-    char * varName;
-{
-    (tclStubsPtr->tcl_UnlinkVar)(interp, varName);
-}
-
-/* Slot 252 */
-int
-Tcl_UnregisterChannel(interp, chan)
-    Tcl_Interp * interp;
-    Tcl_Channel chan;
-{
-    return (tclStubsPtr->tcl_UnregisterChannel)(interp, chan);
-}
-
-/* Slot 253 */
-int
-Tcl_UnsetVar(interp, varName, flags)
-    Tcl_Interp * interp;
-    char * varName;
-    int flags;
-{
-    return (tclStubsPtr->tcl_UnsetVar)(interp, varName, flags);
-}
-
-/* Slot 254 */
-int
-Tcl_UnsetVar2(interp, part1, part2, flags)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-{
-    return (tclStubsPtr->tcl_UnsetVar2)(interp, part1, part2, flags);
-}
-
-/* Slot 255 */
-void
-Tcl_UntraceVar(interp, varName, flags, proc, clientData)
-    Tcl_Interp * interp;
-    char * varName;
-    int flags;
-    Tcl_VarTraceProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_UntraceVar)(interp, varName, flags, proc, clientData);
-}
-
-/* Slot 256 */
-void
-Tcl_UntraceVar2(interp, part1, part2, flags, proc, clientData)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-    Tcl_VarTraceProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_UntraceVar2)(interp, part1, part2, flags, proc, clientData);
-}
-
-/* Slot 257 */
-void
-Tcl_UpdateLinkedVar(interp, varName)
-    Tcl_Interp * interp;
-    char * varName;
-{
-    (tclStubsPtr->tcl_UpdateLinkedVar)(interp, varName);
-}
-
-/* Slot 258 */
-int
-Tcl_UpVar(interp, frameName, varName, localName, flags)
-    Tcl_Interp * interp;
-    char * frameName;
-    char * varName;
-    char * localName;
-    int flags;
-{
-    return (tclStubsPtr->tcl_UpVar)(interp, frameName, varName, localName, flags);
-}
-
-/* Slot 259 */
-int
-Tcl_UpVar2(interp, frameName, part1, part2, localName, flags)
-    Tcl_Interp * interp;
-    char * frameName;
-    char * part1;
-    char * part2;
-    char * localName;
-    int flags;
-{
-    return (tclStubsPtr->tcl_UpVar2)(interp, frameName, part1, part2, localName, flags);
-}
-
-/* Slot 260 */
-int
-Tcl_VarEval TCL_VARARGS_DEF(Tcl_Interp *,interp)
-{
-    Tcl_Interp * var;
-    va_list argList;
-    int resultValue;
-
-    var = (Tcl_Interp *) TCL_VARARGS_START(Tcl_Interp *,interp,argList);
-
-    resultValue = (tclStubsPtr->tcl_VarEvalVA)(var, argList);
-    va_end(argList);
-return resultValue;
-}
-
-/* Slot 261 */
-ClientData
-Tcl_VarTraceInfo(interp, varName, flags, procPtr, prevClientData)
-    Tcl_Interp * interp;
-    char * varName;
-    int flags;
-    Tcl_VarTraceProc * procPtr;
-    ClientData prevClientData;
-{
-    return (tclStubsPtr->tcl_VarTraceInfo)(interp, varName, flags, procPtr, prevClientData);
-}
-
-/* Slot 262 */
-ClientData
-Tcl_VarTraceInfo2(interp, part1, part2, flags, procPtr, prevClientData)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-    Tcl_VarTraceProc * procPtr;
-    ClientData prevClientData;
-{
-    return (tclStubsPtr->tcl_VarTraceInfo2)(interp, part1, part2, flags, procPtr, prevClientData);
-}
-
-/* Slot 263 */
-int
-Tcl_Write(chan, s, slen)
-    Tcl_Channel chan;
-    char * s;
-    int slen;
-{
-    return (tclStubsPtr->tcl_Write)(chan, s, slen);
-}
-
-/* Slot 264 */
-void
-Tcl_WrongNumArgs(interp, objc, objv, message)
-    Tcl_Interp * interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-    char * message;
-{
-    (tclStubsPtr->tcl_WrongNumArgs)(interp, objc, objv, message);
-}
-
-/* Slot 265 */
-int
-Tcl_DumpActiveMemory(fileName)
-    char * fileName;
-{
-    return (tclStubsPtr->tcl_DumpActiveMemory)(fileName);
-}
-
-/* Slot 266 */
-void
-Tcl_ValidateAllMemory(file, line)
-    char * file;
-    int line;
-{
-    (tclStubsPtr->tcl_ValidateAllMemory)(file, line);
-}
-
-/* Slot 267 */
-void
-Tcl_AppendResultVA(interp, argList)
-    Tcl_Interp * interp;
-    va_list argList;
-{
-    (tclStubsPtr->tcl_AppendResultVA)(interp, argList);
-}
-
-/* Slot 268 */
-void
-Tcl_AppendStringsToObjVA(objPtr, argList)
-    Tcl_Obj * objPtr;
-    va_list argList;
-{
-    (tclStubsPtr->tcl_AppendStringsToObjVA)(objPtr, argList);
-}
-
-/* Slot 269 */
-char *
-Tcl_HashStats(tablePtr)
-    Tcl_HashTable * tablePtr;
-{
-    return (tclStubsPtr->tcl_HashStats)(tablePtr);
-}
-
-/* Slot 270 */
-char *
-Tcl_ParseVar(interp, str, termPtr)
-    Tcl_Interp * interp;
-    char * str;
-    char ** termPtr;
-{
-    return (tclStubsPtr->tcl_ParseVar)(interp, str, termPtr);
-}
-
-/* Slot 271 */
-char *
-Tcl_PkgPresent(interp, name, version, exact)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-    int exact;
-{
-    return (tclStubsPtr->tcl_PkgPresent)(interp, name, version, exact);
-}
-
-/* Slot 272 */
-char *
-Tcl_PkgPresentEx(interp, name, version, exact, clientDataPtr)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-    int exact;
-    ClientData * clientDataPtr;
-{
-    return (tclStubsPtr->tcl_PkgPresentEx)(interp, name, version, exact, clientDataPtr);
-}
-
-/* Slot 273 */
-int
-Tcl_PkgProvide(interp, name, version)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-{
-    return (tclStubsPtr->tcl_PkgProvide)(interp, name, version);
-}
-
-/* Slot 274 */
-char *
-Tcl_PkgRequire(interp, name, version, exact)
-    Tcl_Interp * interp;
-    char * name;
-    char * version;
-    int exact;
-{
-    return (tclStubsPtr->tcl_PkgRequire)(interp, name, version, exact);
-}
-
-/* Slot 275 */
-void
-Tcl_SetErrorCodeVA(interp, argList)
-    Tcl_Interp * interp;
-    va_list argList;
-{
-    (tclStubsPtr->tcl_SetErrorCodeVA)(interp, argList);
-}
-
-/* Slot 276 */
-int
-Tcl_VarEvalVA(interp, argList)
-    Tcl_Interp * interp;
-    va_list argList;
-{
-    return (tclStubsPtr->tcl_VarEvalVA)(interp, argList);
-}
-
-/* Slot 277 */
-Tcl_Pid
-Tcl_WaitPid(pid, statPtr, options)
-    Tcl_Pid pid;
-    int * statPtr;
-    int options;
-{
-    return (tclStubsPtr->tcl_WaitPid)(pid, statPtr, options);
-}
-
-/* Slot 278 */
-void
-Tcl_PanicVA(format, argList)
-    char * format;
-    va_list argList;
-{
-    (tclStubsPtr->tcl_PanicVA)(format, argList);
-}
-
-/* Slot 279 */
-void
-Tcl_GetVersion(major, minor, patchLevel, type)
-    int * major;
-    int * minor;
-    int * patchLevel;
-    int * type;
-{
-    (tclStubsPtr->tcl_GetVersion)(major, minor, patchLevel, type);
-}
-
-/* Slot 280 is reserved */
-/* Slot 281 is reserved */
-/* Slot 282 is reserved */
-/* Slot 283 is reserved */
-/* Slot 284 is reserved */
-/* Slot 285 is reserved */
-/* Slot 286 */
-void
-Tcl_AppendObjToObj(objPtr, appendObjPtr)
-    Tcl_Obj * objPtr;
-    Tcl_Obj * appendObjPtr;
-{
-    (tclStubsPtr->tcl_AppendObjToObj)(objPtr, appendObjPtr);
-}
-
-/* Slot 287 */
-Tcl_Encoding
-Tcl_CreateEncoding(typePtr)
-    Tcl_EncodingType * typePtr;
-{
-    return (tclStubsPtr->tcl_CreateEncoding)(typePtr);
-}
-
-/* Slot 288 */
-void
-Tcl_CreateThreadExitHandler(proc, clientData)
-    Tcl_ExitProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_CreateThreadExitHandler)(proc, clientData);
-}
-
-/* Slot 289 */
-void
-Tcl_DeleteThreadExitHandler(proc, clientData)
-    Tcl_ExitProc * proc;
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_DeleteThreadExitHandler)(proc, clientData);
-}
-
-/* Slot 290 */
-void
-Tcl_DiscardResult(statePtr)
-    Tcl_SavedResult * statePtr;
-{
-    (tclStubsPtr->tcl_DiscardResult)(statePtr);
-}
-
-/* Slot 291 */
-int
-Tcl_EvalEx(interp, script, numBytes, flags)
-    Tcl_Interp * interp;
-    char * script;
-    int numBytes;
-    int flags;
-{
-    return (tclStubsPtr->tcl_EvalEx)(interp, script, numBytes, flags);
-}
-
-/* Slot 292 */
-int
-Tcl_EvalObjv(interp, objc, objv, flags)
-    Tcl_Interp * interp;
-    int objc;
-    Tcl_Obj *CONST objv[];
-    int flags;
-{
-    return (tclStubsPtr->tcl_EvalObjv)(interp, objc, objv, flags);
-}
-
-/* Slot 293 */
-int
-Tcl_EvalObjEx(interp, objPtr, flags)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    int flags;
-{
-    return (tclStubsPtr->tcl_EvalObjEx)(interp, objPtr, flags);
-}
-
-/* Slot 294 */
-void
-Tcl_ExitThread(status)
-    int status;
-{
-    (tclStubsPtr->tcl_ExitThread)(status);
-}
-
-/* Slot 295 */
-int
-Tcl_ExternalToUtf(interp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr)
-    Tcl_Interp * interp;
-    Tcl_Encoding encoding;
-    CONST char * src;
-    int srcLen;
-    int flags;
-    Tcl_EncodingState * statePtr;
-    char * dst;
-    int dstLen;
-    int * srcReadPtr;
-    int * dstWrotePtr;
-    int * dstCharsPtr;
-{
-    return (tclStubsPtr->tcl_ExternalToUtf)(interp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr);
-}
-
-/* Slot 296 */
-char *
-Tcl_ExternalToUtfDString(encoding, src, srcLen, dsPtr)
-    Tcl_Encoding encoding;
-    CONST char * src;
-    int srcLen;
-    Tcl_DString * dsPtr;
-{
-    return (tclStubsPtr->tcl_ExternalToUtfDString)(encoding, src, srcLen, dsPtr);
-}
-
-/* Slot 297 */
-void
-Tcl_FinalizeThread()
-{
-    (tclStubsPtr->tcl_FinalizeThread)();
-}
-
-/* Slot 298 */
-void
-Tcl_FinalizeNotifier(clientData)
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_FinalizeNotifier)(clientData);
-}
-
-/* Slot 299 */
-void
-Tcl_FreeEncoding(encoding)
-    Tcl_Encoding encoding;
-{
-    (tclStubsPtr->tcl_FreeEncoding)(encoding);
-}
-
-/* Slot 300 */
-Tcl_ThreadId
-Tcl_GetCurrentThread()
-{
-    return (tclStubsPtr->tcl_GetCurrentThread)();
-}
-
-/* Slot 301 */
-Tcl_Encoding
-Tcl_GetEncoding(interp, name)
-    Tcl_Interp * interp;
-    CONST char * name;
-{
-    return (tclStubsPtr->tcl_GetEncoding)(interp, name);
-}
-
-/* Slot 302 */
-char *
-Tcl_GetEncodingName(encoding)
-    Tcl_Encoding encoding;
-{
-    return (tclStubsPtr->tcl_GetEncodingName)(encoding);
-}
-
-/* Slot 303 */
-void
-Tcl_GetEncodingNames(interp)
-    Tcl_Interp * interp;
-{
-    (tclStubsPtr->tcl_GetEncodingNames)(interp);
-}
-
-/* Slot 304 */
-int
-Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, indexPtr)
-    Tcl_Interp * interp;
-    Tcl_Obj * objPtr;
-    char ** tablePtr;
-    int offset;
-    char * msg;
-    int flags;
-    int * indexPtr;
-{
-    return (tclStubsPtr->tcl_GetIndexFromObjStruct)(interp, objPtr, tablePtr, offset, msg, flags, indexPtr);
-}
-
-/* Slot 305 */
-VOID *
-Tcl_GetThreadData(keyPtr, size)
-    Tcl_ThreadDataKey * keyPtr;
-    int size;
-{
-    return (tclStubsPtr->tcl_GetThreadData)(keyPtr, size);
-}
-
-/* Slot 306 */
-Tcl_Obj *
-Tcl_GetVar2Ex(interp, part1, part2, flags)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    int flags;
-{
-    return (tclStubsPtr->tcl_GetVar2Ex)(interp, part1, part2, flags);
-}
-
-/* Slot 307 */
-ClientData
-Tcl_InitNotifier()
-{
-    return (tclStubsPtr->tcl_InitNotifier)();
-}
-
-/* Slot 308 */
-void
-Tcl_MutexLock(mutexPtr)
-    Tcl_Mutex * mutexPtr;
-{
-    (tclStubsPtr->tcl_MutexLock)(mutexPtr);
-}
-
-/* Slot 309 */
-void
-Tcl_MutexUnlock(mutexPtr)
-    Tcl_Mutex * mutexPtr;
-{
-    (tclStubsPtr->tcl_MutexUnlock)(mutexPtr);
-}
-
-/* Slot 310 */
-void
-Tcl_ConditionNotify(condPtr)
-    Tcl_Condition * condPtr;
-{
-    (tclStubsPtr->tcl_ConditionNotify)(condPtr);
-}
-
-/* Slot 311 */
-void
-Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-    Tcl_Condition * condPtr;
-    Tcl_Mutex * mutexPtr;
-    Tcl_Time * timePtr;
-{
-    (tclStubsPtr->tcl_ConditionWait)(condPtr, mutexPtr, timePtr);
-}
-
-/* Slot 312 */
-int
-Tcl_NumUtfChars(src, len)
-    CONST char * src;
-    int len;
-{
-    return (tclStubsPtr->tcl_NumUtfChars)(src, len);
-}
-
-/* Slot 313 */
-int
-Tcl_ReadChars(channel, objPtr, charsToRead, appendFlag)
-    Tcl_Channel channel;
-    Tcl_Obj * objPtr;
-    int charsToRead;
-    int appendFlag;
-{
-    return (tclStubsPtr->tcl_ReadChars)(channel, objPtr, charsToRead, appendFlag);
-}
-
-/* Slot 314 */
-void
-Tcl_RestoreResult(interp, statePtr)
-    Tcl_Interp * interp;
-    Tcl_SavedResult * statePtr;
-{
-    (tclStubsPtr->tcl_RestoreResult)(interp, statePtr);
-}
-
-/* Slot 315 */
-void
-Tcl_SaveResult(interp, statePtr)
-    Tcl_Interp * interp;
-    Tcl_SavedResult * statePtr;
-{
-    (tclStubsPtr->tcl_SaveResult)(interp, statePtr);
-}
-
-/* Slot 316 */
-int
-Tcl_SetSystemEncoding(interp, name)
-    Tcl_Interp * interp;
-    CONST char * name;
-{
-    return (tclStubsPtr->tcl_SetSystemEncoding)(interp, name);
-}
-
-/* Slot 317 */
-Tcl_Obj *
-Tcl_SetVar2Ex(interp, part1, part2, newValuePtr, flags)
-    Tcl_Interp * interp;
-    char * part1;
-    char * part2;
-    Tcl_Obj * newValuePtr;
-    int flags;
-{
-    return (tclStubsPtr->tcl_SetVar2Ex)(interp, part1, part2, newValuePtr, flags);
-}
-
-/* Slot 318 */
-void
-Tcl_ThreadAlert(threadId)
-    Tcl_ThreadId threadId;
-{
-    (tclStubsPtr->tcl_ThreadAlert)(threadId);
-}
-
-/* Slot 319 */
-void
-Tcl_ThreadQueueEvent(threadId, evPtr, position)
-    Tcl_ThreadId threadId;
-    Tcl_Event* evPtr;
-    Tcl_QueuePosition position;
-{
-    (tclStubsPtr->tcl_ThreadQueueEvent)(threadId, evPtr, position);
-}
-
-/* Slot 320 */
-Tcl_UniChar
-Tcl_UniCharAtIndex(src, index)
-    CONST char * src;
-    int index;
-{
-    return (tclStubsPtr->tcl_UniCharAtIndex)(src, index);
-}
-
-/* Slot 321 */
-Tcl_UniChar
-Tcl_UniCharToLower(ch)
-    int ch;
-{
-    return (tclStubsPtr->tcl_UniCharToLower)(ch);
-}
-
-/* Slot 322 */
-Tcl_UniChar
-Tcl_UniCharToTitle(ch)
-    int ch;
-{
-    return (tclStubsPtr->tcl_UniCharToTitle)(ch);
-}
-
-/* Slot 323 */
-Tcl_UniChar
-Tcl_UniCharToUpper(ch)
-    int ch;
-{
-    return (tclStubsPtr->tcl_UniCharToUpper)(ch);
-}
-
-/* Slot 324 */
-int
-Tcl_UniCharToUtf(ch, buf)
-    int ch;
-    char * buf;
-{
-    return (tclStubsPtr->tcl_UniCharToUtf)(ch, buf);
-}
-
-/* Slot 325 */
-char *
-Tcl_UtfAtIndex(src, index)
-    CONST char * src;
-    int index;
-{
-    return (tclStubsPtr->tcl_UtfAtIndex)(src, index);
-}
-
-/* Slot 326 */
-int
-Tcl_UtfCharComplete(src, len)
-    CONST char * src;
-    int len;
-{
-    return (tclStubsPtr->tcl_UtfCharComplete)(src, len);
-}
-
-/* Slot 327 */
-int
-Tcl_UtfBackslash(src, readPtr, dst)
-    CONST char * src;
-    int * readPtr;
-    char * dst;
-{
-    return (tclStubsPtr->tcl_UtfBackslash)(src, readPtr, dst);
-}
-
-/* Slot 328 */
-char *
-Tcl_UtfFindFirst(src, ch)
-    CONST char * src;
-    int ch;
-{
-    return (tclStubsPtr->tcl_UtfFindFirst)(src, ch);
-}
-
-/* Slot 329 */
-char *
-Tcl_UtfFindLast(src, ch)
-    CONST char * src;
-    int ch;
-{
-    return (tclStubsPtr->tcl_UtfFindLast)(src, ch);
-}
-
-/* Slot 330 */
-char *
-Tcl_UtfNext(src)
-    CONST char * src;
-{
-    return (tclStubsPtr->tcl_UtfNext)(src);
-}
-
-/* Slot 331 */
-char *
-Tcl_UtfPrev(src, start)
-    CONST char * src;
-    CONST char * start;
-{
-    return (tclStubsPtr->tcl_UtfPrev)(src, start);
-}
-
-/* Slot 332 */
-int
-Tcl_UtfToExternal(interp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr)
-    Tcl_Interp * interp;
-    Tcl_Encoding encoding;
-    CONST char * src;
-    int srcLen;
-    int flags;
-    Tcl_EncodingState * statePtr;
-    char * dst;
-    int dstLen;
-    int * srcReadPtr;
-    int * dstWrotePtr;
-    int * dstCharsPtr;
-{
-    return (tclStubsPtr->tcl_UtfToExternal)(interp, encoding, src, srcLen, flags, statePtr, dst, dstLen, srcReadPtr, dstWrotePtr, dstCharsPtr);
-}
-
-/* Slot 333 */
-char *
-Tcl_UtfToExternalDString(encoding, src, srcLen, dsPtr)
-    Tcl_Encoding encoding;
-    CONST char * src;
-    int srcLen;
-    Tcl_DString * dsPtr;
-{
-    return (tclStubsPtr->tcl_UtfToExternalDString)(encoding, src, srcLen, dsPtr);
-}
-
-/* Slot 334 */
-int
-Tcl_UtfToLower(src)
-    char * src;
-{
-    return (tclStubsPtr->tcl_UtfToLower)(src);
-}
-
-/* Slot 335 */
-int
-Tcl_UtfToTitle(src)
-    char * src;
-{
-    return (tclStubsPtr->tcl_UtfToTitle)(src);
-}
-
-/* Slot 336 */
-int
-Tcl_UtfToUniChar(src, chPtr)
-    CONST char * src;
-    Tcl_UniChar * chPtr;
-{
-    return (tclStubsPtr->tcl_UtfToUniChar)(src, chPtr);
-}
-
-/* Slot 337 */
-int
-Tcl_UtfToUpper(src)
-    char * src;
-{
-    return (tclStubsPtr->tcl_UtfToUpper)(src);
-}
-
-/* Slot 338 */
-int
-Tcl_WriteChars(chan, src, srcLen)
-    Tcl_Channel chan;
-    CONST char * src;
-    int srcLen;
-{
-    return (tclStubsPtr->tcl_WriteChars)(chan, src, srcLen);
-}
-
-/* Slot 339 */
-int
-Tcl_WriteObj(chan, objPtr)
-    Tcl_Channel chan;
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_WriteObj)(chan, objPtr);
-}
-
-/* Slot 340 */
-char *
-Tcl_GetString(objPtr)
-    Tcl_Obj * objPtr;
-{
-    return (tclStubsPtr->tcl_GetString)(objPtr);
-}
-
-/* Slot 341 */
-char *
-Tcl_GetDefaultEncodingDir()
-{
-    return (tclStubsPtr->tcl_GetDefaultEncodingDir)();
-}
-
-/* Slot 342 */
-void
-Tcl_SetDefaultEncodingDir(path)
-    char * path;
-{
-    (tclStubsPtr->tcl_SetDefaultEncodingDir)(path);
-}
-
-/* Slot 343 */
-void
-Tcl_AlertNotifier(clientData)
-    ClientData clientData;
-{
-    (tclStubsPtr->tcl_AlertNotifier)(clientData);
-}
-
-/* Slot 344 */
-void
-Tcl_ServiceModeHook(mode)
-    int mode;
-{
-    (tclStubsPtr->tcl_ServiceModeHook)(mode);
-}
-
-
-/* !END!: Do not edit above this line. */
diff --git a/generic/tclTest.c b/generic/tclTest.c
deleted file mode 100644
index 80b296a..0000000
--- a/generic/tclTest.c
+++ /dev/null
@@ -1,4226 +0,0 @@
-/* 
- * tclTest.c --
- *
- *	This file contains C command procedures for a bunch of additional
- *	Tcl commands that are used for testing out Tcl's C interfaces.
- *	These commands are not normally included in Tcl applications;
- *	they're only used for testing.
- *
- * Copyright (c) 1993-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclTest.c,v 1.10 1999/04/16 00:46:54 stanton Exp $
- */
-
-#define TCL_TEST
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclRegexp.h"
-#include <locale.h>
-
-/*
- * Declare external functions used in Windows tests.
- */
-
-#if defined(__WIN32__)
-extern TclPlatformType *TclWinGetPlatform(void);
-EXTERN void		TclWinSetInterfaces(int);
-#endif
-
-/*
- * Dynamic string shared by TestdcallCmd and DelCallbackProc;  used
- * to collect the results of the various deletion callbacks.
- */
-
-static Tcl_DString delString;
-static Tcl_Interp *delInterp;
-
-/*
- * One of the following structures exists for each asynchronous
- * handler created by the "testasync" command".
- */
-
-typedef struct TestAsyncHandler {
-    int id;				/* Identifier for this handler. */
-    Tcl_AsyncHandler handler;		/* Tcl's token for the handler. */
-    char *command;			/* Command to invoke when the
-					 * handler is invoked. */
-    struct TestAsyncHandler *nextPtr;	/* Next is list of handlers. */
-} TestAsyncHandler;
-
-static TestAsyncHandler *firstHandler = NULL;
-
-/*
- * The dynamic string below is used by the "testdstring" command
- * to test the dynamic string facilities.
- */
-
-static Tcl_DString dstring;
-
-/*
- * The command trace below is used by the "testcmdtraceCmd" command
- * to test the command tracing facilities.
- */
-
-static Tcl_Trace cmdTrace;
-
-/*
- * One of the following structures exists for each command created
- * by TestdelCmd:
- */
-
-typedef struct DelCmd {
-    Tcl_Interp *interp;		/* Interpreter in which command exists. */
-    char *deleteCmd;		/* Script to execute when command is
-				 * deleted.  Malloc'ed. */
-} DelCmd;
-
-/*
- * The following is used to keep track of an encoding that invokes a Tcl
- * command. 
- */
-
-typedef struct TclEncoding {
-    Tcl_Interp *interp;
-    char *toUtfCmd;
-    char *fromUtfCmd;
-} TclEncoding;
-
-/*
- * The counter below is used to determine if the TestsaveresultFree
- * routine was called for a result.
- */
-
-static int freeCount;
-
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-int			Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-static int		AsyncHandlerProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int code));
-static void		CleanupTestSetassocdataTests _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp));
-static void		CmdDelProc1 _ANSI_ARGS_((ClientData clientData));
-static void		CmdDelProc2 _ANSI_ARGS_((ClientData clientData));
-static int		CmdProc1 _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		CmdProc2 _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-static void		CmdTraceDeleteProc _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int level, char *command, Tcl_CmdProc *cmdProc,
-			    ClientData cmdClientData, int argc,
-			    char **argv));
-static void		CmdTraceProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int level, char *command,
-			    Tcl_CmdProc *cmdProc, ClientData cmdClientData,
-                            int argc, char **argv));
-static int		CreatedCommandProc _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int argc, char **argv));
-static int		CreatedCommandProc2 _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int argc, char **argv));
-static void		DelCallbackProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp));
-static int		DelCmdProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-static void		DelDeleteProc _ANSI_ARGS_((ClientData clientData));
-static void		EncodingFreeProc _ANSI_ARGS_((ClientData clientData));
-static int		EncodingToUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst,
-			    int dstLen, int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static int		EncodingFromUtfProc _ANSI_ARGS_((ClientData clientData,
-			    CONST char *src, int srcLen, int flags,
-			    Tcl_EncodingState *statePtr, char *dst,
-			    int dstLen, int *srcReadPtr, int *dstWrotePtr,
-			    int *dstCharsPtr));
-static void		ExitProcEven _ANSI_ARGS_((ClientData clientData));
-static void		ExitProcOdd _ANSI_ARGS_((ClientData clientData));
-static int              GetTimesCmd _ANSI_ARGS_((ClientData clientData,
-                            Tcl_Interp *interp, int argc, char **argv));
-static int              NoopCmd _ANSI_ARGS_((ClientData clientData,
-                            Tcl_Interp *interp, int argc, char **argv));
-static int              NoopObjCmd _ANSI_ARGS_((ClientData clientData,
-                            Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static void		PrintParse _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Parse *parsePtr));
-static void		SpecialFree _ANSI_ARGS_((char *blockPtr));
-static int		StaticInitProc _ANSI_ARGS_((Tcl_Interp *interp));
-static int		TestaccessprocCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestAccessProc1 _ANSI_ARGS_((CONST char *path,
-			   int mode));
-static int		TestAccessProc2 _ANSI_ARGS_((CONST char *path,
-			   int mode));
-static int		TestAccessProc3 _ANSI_ARGS_((CONST char *path,
-			   int mode));
-static int		TestasyncCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestcmdinfoCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestcmdtokenCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestcmdtraceCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestchmodCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestcreatecommandCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestdcallCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestdelCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestdelassocdataCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestdstringCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestencodingObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc, 
-			    Tcl_Obj *CONST objv[]));
-static int		TestevalexObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc, 
-			    Tcl_Obj *CONST objv[]));
-static int		TestevalobjvObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc, 
-			    Tcl_Obj *CONST objv[]));
-static int		TestexithandlerCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestexprlongCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestexprparserObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestexprstringCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestfileCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestfeventCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgetassocdataCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgetplatformCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgetvarfullnameCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		TestinterpdeleteCmd _ANSI_ARGS_((ClientData dummy,
-		            Tcl_Interp *interp, int argc, char **argv));
-static int		TestlinkCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestlocaleCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestMathFunc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, Tcl_Value *args,
-			    Tcl_Value *resultPtr));
-static int		TestMathFunc2 _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, Tcl_Value *args,
-			    Tcl_Value *resultPtr));
-static Tcl_Channel	TestOpenFileChannelProc1 _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *filename, char *modeString, int permissions));
-static Tcl_Channel	TestOpenFileChannelProc2 _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *filename, char *modeString, int permissions));
-static Tcl_Channel	TestOpenFileChannelProc3 _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *filename, char *modeString, int permissions));
-static int		TestpanicCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestparserObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestparsevarObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestparsevarnameObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestregexpObjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static void		TestregexpXflags _ANSI_ARGS_((char *string,
-			    int length, int *cflagsPtr, int *eflagsPtr));
-static int		TestsaveresultCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static void		TestsaveresultFree _ANSI_ARGS_((char *blockPtr));
-static int		TestsetassocdataCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestsetCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestsetobjerrorcodeCmd _ANSI_ARGS_((
-			    ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		TestopenfilechannelprocCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestsetplatformCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestsetrecursionlimitCmd _ANSI_ARGS_((
-                            ClientData dummy, Tcl_Interp *interp,
-			    int objc, Tcl_Obj *CONST objv[]));
-static int		TeststaticpkgCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestStatProc1 _ANSI_ARGS_((CONST char *path,
-			    TclStat_ *buf));
-static int		TestStatProc2 _ANSI_ARGS_((CONST char *path,
-			    TclStat_ *buf));
-static int		TestStatProc3 _ANSI_ARGS_((CONST char *path,
-			    TclStat_ *buf));
-static int		TeststatprocCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TesttranslatefilenameCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestupvarCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- * External (platform specific) initialization routine, these declarations
- * explicitly don't use EXTERN since this code does not get compiled
- * into the library:
- */
-
-extern int		TclplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcltest_Init --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcltest_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter for application. */
-{
-    Tcl_ValueType t3ArgTypes[2];
-	
-    if (Tcl_PkgProvide(interp, "Tcltest", TCL_VERSION) == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-
-    /*
-     * Create additional commands and math functions for testing Tcl.
-     */
-
-    Tcl_CreateCommand(interp, "gettimes", GetTimesCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "noop", NoopCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "noop", NoopObjCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testaccessproc", TestaccessprocCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testasync", TestasyncCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testchannel", TclTestChannelCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testchannelevent", TclTestChannelEventCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testchmod", TestchmodCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testcmdtoken", TestcmdtokenCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testcmdinfo", TestcmdinfoCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testcmdtrace", TestcmdtraceCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testcreatecommand", TestcreatecommandCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testdcall", TestdcallCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testdel", TestdelCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testdelassocdata", TestdelassocdataCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_DStringInit(&dstring);
-    Tcl_CreateCommand(interp, "testdstring", TestdstringCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testencoding", TestencodingObjCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testevalex", TestevalexObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testevalobjv", TestevalobjvObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testexithandler", TestexithandlerCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testexprlong", TestexprlongCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testexprparser", TestexprparserObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testexprstring", TestexprstringCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testfevent", TestfeventCmd, (ClientData) 0,
-            (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testfile", TestfileCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testgetassocdata", TestgetassocdataCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testgetplatform", TestgetplatformCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testgetvarfullname",
-	    TestgetvarfullnameCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testinterpdelete", TestinterpdeleteCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testlink", TestlinkCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testlocale", TestlocaleCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testopenfilechannelproc",
-    	    TestopenfilechannelprocCmd, (ClientData) 0, 
-    	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testpanic", TestpanicCmd, (ClientData) 0,
-            (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testparser", TestparserObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testparsevar", TestparsevarObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testparsevarname", TestparsevarnameObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testregexp", TestregexpObjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testsaveresult", TestsaveresultCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testsetassocdata", TestsetassocdataCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testsetnoerr", TestsetCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testseterr", TestsetCmd,
-            (ClientData) TCL_LEAVE_ERR_MSG, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testsetobjerrorcode", 
-	    TestsetobjerrorcodeCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testsetplatform", TestsetplatformCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testsetrecursionlimit",
-	    TestsetrecursionlimitCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "teststaticpkg", TeststaticpkgCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testtranslatefilename",
-            TesttranslatefilenameCmd, (ClientData) 0,
-            (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testupvar", TestupvarCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateMathFunc(interp, "T1", 0, (Tcl_ValueType *) NULL, TestMathFunc,
-	    (ClientData) 123);
-    Tcl_CreateMathFunc(interp, "T2", 0, (Tcl_ValueType *) NULL, TestMathFunc,
-	    (ClientData) 345);
-    Tcl_CreateCommand(interp, "teststatproc", TeststatprocCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    t3ArgTypes[0] = TCL_EITHER;
-    t3ArgTypes[1] = TCL_EITHER;
-    Tcl_CreateMathFunc(interp, "T3", 2, t3ArgTypes, TestMathFunc2,
-	    (ClientData) 0);
-
-#ifdef TCL_THREADS
-    if (TclThread_Init(interp) != TCL_OK) {
-	return TCL_ERROR;
-    }
-#endif
-
-    /*
-     * And finally add any platform specific test commands.
-     */
-    
-    return TclplatformtestInit(interp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestasyncCmd --
- *
- *	This procedure implements the "testasync" command.  It is used
- *	to test the asynchronous handler facilities of Tcl.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates, deletes, and invokes handlers.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestasyncCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    TestAsyncHandler *asyncPtr, *prevPtr;
-    int id, code;
-    static int nextId = 1;
-    char buf[TCL_INTEGER_SPACE];
-
-    if (argc < 2) {
-	wrongNumArgs:
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	if (argc != 3) {
-	    goto wrongNumArgs;
-	}
-	asyncPtr = (TestAsyncHandler *) ckalloc(sizeof(TestAsyncHandler));
-	asyncPtr->id = nextId;
-	nextId++;
-	asyncPtr->handler = Tcl_AsyncCreate(AsyncHandlerProc,
-		(ClientData) asyncPtr);
-	asyncPtr->command = (char *) ckalloc((unsigned) (strlen(argv[2]) + 1));
-	strcpy(asyncPtr->command, argv[2]);
-	asyncPtr->nextPtr = firstHandler;
-	firstHandler = asyncPtr;
-	TclFormatInt(buf, asyncPtr->id);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	if (argc == 2) {
-	    while (firstHandler != NULL) {
-		asyncPtr = firstHandler;
-		firstHandler = asyncPtr->nextPtr;
-		Tcl_AsyncDelete(asyncPtr->handler);
-		ckfree(asyncPtr->command);
-		ckfree((char *) asyncPtr);
-	    }
-	    return TCL_OK;
-	}
-	if (argc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_GetInt(interp, argv[2], &id) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	for (prevPtr = NULL, asyncPtr = firstHandler; asyncPtr != NULL;
-		prevPtr = asyncPtr, asyncPtr = asyncPtr->nextPtr) {
-	    if (asyncPtr->id != id) {
-		continue;
-	    }
-	    if (prevPtr == NULL) {
-		firstHandler = asyncPtr->nextPtr;
-	    } else {
-		prevPtr->nextPtr = asyncPtr->nextPtr;
-	    }
-	    Tcl_AsyncDelete(asyncPtr->handler);
-	    ckfree(asyncPtr->command);
-	    ckfree((char *) asyncPtr);
-	    break;
-	}
-    } else if (strcmp(argv[1], "mark") == 0) {
-	if (argc != 5) {
-	    goto wrongNumArgs;
-	}
-	if ((Tcl_GetInt(interp, argv[2], &id) != TCL_OK)
-		|| (Tcl_GetInt(interp, argv[4], &code) != TCL_OK)) {
-	    return TCL_ERROR;
-	}
-	for (asyncPtr = firstHandler; asyncPtr != NULL;
-		asyncPtr = asyncPtr->nextPtr) {
-	    if (asyncPtr->id == id) {
-		Tcl_AsyncMark(asyncPtr->handler);
-		break;
-	    }
-	}
-	Tcl_SetResult(interp, argv[3], TCL_VOLATILE);
-	return code;
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create, delete, int, or mark",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-static int
-AsyncHandlerProc(clientData, interp, code)
-    ClientData clientData;	/* Pointer to TestAsyncHandler structure. */
-    Tcl_Interp *interp;		/* Interpreter in which command was
-				 * executed, or NULL. */
-    int code;			/* Current return code from command. */
-{
-    TestAsyncHandler *asyncPtr = (TestAsyncHandler *) clientData;
-    char *listArgv[4];
-    char string[TCL_INTEGER_SPACE], *cmd;
-
-    TclFormatInt(string, code);
-    listArgv[0] = asyncPtr->command;
-    listArgv[1] = Tcl_GetStringResult(interp);
-    listArgv[2] = string;
-    listArgv[3] = NULL;
-    cmd = Tcl_Merge(3, listArgv);
-    code = Tcl_Eval(interp, cmd);
-    ckfree(cmd);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestcmdinfoCmd --
- *
- *	This procedure implements the "testcmdinfo" command.  It is used
- *	to test Tcl_GetCommandInfo, Tcl_SetCommandInfo, and command creation
- *	and deletion.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes various commands and modifies their data.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestcmdinfoCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_CmdInfo info;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option cmdName\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	Tcl_CreateCommand(interp, argv[2], CmdProc1, (ClientData) "original",
-		CmdDelProc1);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	Tcl_DStringInit(&delString);
-	Tcl_DeleteCommand(interp, argv[2]);
-	Tcl_DStringResult(interp, &delString);
-    } else if (strcmp(argv[1], "get") == 0) {
-	if (Tcl_GetCommandInfo(interp, argv[2], &info) ==0) {
-	    Tcl_SetResult(interp, "??", TCL_STATIC);
-	    return TCL_OK;
-	}
-	if (info.proc == CmdProc1) {
-	    Tcl_AppendResult(interp, "CmdProc1", " ",
-		    (char *) info.clientData, (char *) NULL);
-	} else if (info.proc == CmdProc2) {
-	    Tcl_AppendResult(interp, "CmdProc2", " ",
-		    (char *) info.clientData, (char *) NULL);
-	} else {
-	    Tcl_AppendResult(interp, "unknown", (char *) NULL);
-	}
-	if (info.deleteProc == CmdDelProc1) {
-	    Tcl_AppendResult(interp, " CmdDelProc1", " ",
-		    (char *) info.deleteData, (char *) NULL);
-	} else if (info.deleteProc == CmdDelProc2) {
-	    Tcl_AppendResult(interp, " CmdDelProc2", " ",
-		    (char *) info.deleteData, (char *) NULL);
-	} else {
-	    Tcl_AppendResult(interp, " unknown", (char *) NULL);
-	}
-	Tcl_AppendResult(interp, " ", info.namespacePtr->fullName,
-	        (char *) NULL);
-	if (info.isNativeObjectProc) {
-	    Tcl_AppendResult(interp, " nativeObjectProc", (char *) NULL);
-	} else {
-	    Tcl_AppendResult(interp, " stringProc", (char *) NULL);
-	}
-    } else if (strcmp(argv[1], "modify") == 0) {
-	info.proc = CmdProc2;
-	info.clientData = (ClientData) "new_command_data";
-	info.objProc = NULL;
-        info.objClientData = (ClientData) NULL;
-	info.deleteProc = CmdDelProc2;
-	info.deleteData = (ClientData) "new_delete_data";
-	if (Tcl_SetCommandInfo(interp, argv[2], &info) == 0) {
-	    Tcl_SetResult(interp, "0", TCL_STATIC);
-	} else {
-	    Tcl_SetResult(interp, "1", TCL_STATIC);
-	}
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create, delete, get, or modify",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-	/*ARGSUSED*/
-static int
-CmdProc1(clientData, interp, argc, argv)
-    ClientData clientData;		/* String to return. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_AppendResult(interp, "CmdProc1 ", (char *) clientData,
-	    (char *) NULL);
-    return TCL_OK;
-}
-
-	/*ARGSUSED*/
-static int
-CmdProc2(clientData, interp, argc, argv)
-    ClientData clientData;		/* String to return. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_AppendResult(interp, "CmdProc2 ", (char *) clientData,
-	    (char *) NULL);
-    return TCL_OK;
-}
-
-static void
-CmdDelProc1(clientData)
-    ClientData clientData;		/* String to save. */
-{
-    Tcl_DStringInit(&delString);
-    Tcl_DStringAppend(&delString, "CmdDelProc1 ", -1);
-    Tcl_DStringAppend(&delString, (char *) clientData, -1);
-}
-
-static void
-CmdDelProc2(clientData)
-    ClientData clientData;		/* String to save. */
-{
-    Tcl_DStringInit(&delString);
-    Tcl_DStringAppend(&delString, "CmdDelProc2 ", -1);
-    Tcl_DStringAppend(&delString, (char *) clientData, -1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestcmdtokenCmd --
- *
- *	This procedure implements the "testcmdtoken" command. It is used
- *	to test Tcl_Command tokens and procedures such as
- *	Tcl_GetCommandFullName.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes various commands and modifies their data.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestcmdtokenCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_Command token;
-    long int l;
-    char buf[30];
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option arg\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	token = Tcl_CreateCommand(interp, argv[2], CmdProc1,
-		(ClientData) "original", (Tcl_CmdDeleteProc *) NULL);
-	sprintf(buf, "%lx", (long int) token);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(argv[1], "name") == 0) {
-	Tcl_Obj *objPtr;
-	
-	if (sscanf(argv[2], "%lx", &l) != 1) {
-	    Tcl_AppendResult(interp, "bad command token \"", argv[2],
-		    "\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-
-	objPtr = Tcl_NewObj();
-	Tcl_GetCommandFullName(interp, (Tcl_Command) l, objPtr);
-	
-	Tcl_AppendElement(interp,
-	        Tcl_GetCommandName(interp, (Tcl_Command) l));
-	Tcl_AppendElement(interp, Tcl_GetString(objPtr));
-	Tcl_DecrRefCount(objPtr);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create or name", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestcmdtraceCmd --
- *
- *	This procedure implements the "testcmdtrace" command. It is used
- *	to test Tcl_CreateTrace and Tcl_DeleteTrace.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes a command trace, and tests the invocation of
- *	a procedure by the command trace.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestcmdtraceCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_DString buffer;
-    int result;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option script\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1], "tracetest") == 0) {
-	Tcl_DStringInit(&buffer);
-	cmdTrace = Tcl_CreateTrace(interp, 50000,
-	        (Tcl_CmdTraceProc *) CmdTraceProc, (ClientData) &buffer);
-	result = Tcl_Eval(interp, argv[2]);
-	if (result == TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), NULL);
-	}
-	Tcl_DeleteTrace(interp, cmdTrace);
-	Tcl_DStringFree(&buffer);
-    } else if (strcmp(argv[1], "deletetest") == 0) {
-	/*
-	 * Create a command trace then eval a script to check whether it is
-	 * called. Note that this trace procedure removes itself as a
-	 * further check of the robustness of the trace proc calling code in
-	 * TclExecuteByteCode.
-	 */
-	
-	cmdTrace = Tcl_CreateTrace(interp, 50000,
-	        (Tcl_CmdTraceProc *) CmdTraceDeleteProc, (ClientData) NULL);
-	Tcl_Eval(interp, argv[2]);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be tracetest or deletetest", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-static void
-CmdTraceProc(clientData, interp, level, command, cmdProc, cmdClientData,
-        argc, argv)
-    ClientData clientData;	/* Pointer to buffer in which the
-				 * command and arguments are appended.
-				 * Accumulates test result. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int level;			/* Current trace level. */
-    char *command;		/* The command being traced (after
-				 * substitutions). */
-    Tcl_CmdProc *cmdProc;	/* Points to command's command procedure. */
-    ClientData cmdClientData;	/* Client data associated with command
-				 * procedure. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
-{
-    Tcl_DString *bufPtr = (Tcl_DString *) clientData;
-    int i;
-
-    Tcl_DStringAppendElement(bufPtr, command);
-
-    Tcl_DStringStartSublist(bufPtr);
-    for (i = 0;  i < argc;  i++) {
-	Tcl_DStringAppendElement(bufPtr, argv[i]);
-    }
-    Tcl_DStringEndSublist(bufPtr);
-}
-
-static void
-CmdTraceDeleteProc(clientData, interp, level, command, cmdProc,
-	cmdClientData, argc, argv)
-    ClientData clientData;	/* Unused. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int level;			/* Current trace level. */
-    char *command;		/* The command being traced (after
-				 * substitutions). */
-    Tcl_CmdProc *cmdProc;	/* Points to command's command procedure. */
-    ClientData cmdClientData;	/* Client data associated with command
-				 * procedure. */
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Argument strings. */
-{
-    /*
-     * Remove ourselves to test whether calling Tcl_DeleteTrace within
-     * a trace callback causes the for loop in TclExecuteByteCode that
-     * calls traces to reference freed memory.
-     */
-    
-    Tcl_DeleteTrace(interp, cmdTrace);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestcreatecommandCmd --
- *
- *	This procedure implements the "testcreatecommand" command. It is
- *	used to test that the Tcl_CreateCommand creates a new command in
- *	the namespace specified as part of its name, if any. It also
- *	checks that the namespace code ignore single ":"s in the middle
- *	or end of a command name.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes two commands ("test_ns_basic::createdcommand"
- *	and "value:at:").
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestcreatecommandCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	Tcl_CreateCommand(interp, "test_ns_basic::createdcommand",
-		CreatedCommandProc, (ClientData) NULL,
-		(Tcl_CmdDeleteProc *) NULL);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	Tcl_DeleteCommand(interp, "test_ns_basic::createdcommand");
-    } else if (strcmp(argv[1], "create2") == 0) {
-	Tcl_CreateCommand(interp, "value:at:",
-		CreatedCommandProc2, (ClientData) NULL,
-		(Tcl_CmdDeleteProc *) NULL);
-    } else if (strcmp(argv[1], "delete2") == 0) {
-	Tcl_DeleteCommand(interp, "value:at:");
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create, delete, create2, or delete2",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-static int
-CreatedCommandProc(clientData, interp, argc, argv)
-    ClientData clientData;		/* String to return. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_CmdInfo info;
-    int found;
-
-    found = Tcl_GetCommandInfo(interp, "test_ns_basic::createdcommand",
-	    &info);
-    if (!found) {
-	Tcl_AppendResult(interp, "CreatedCommandProc could not get command info for test_ns_basic::createdcommand",
-	        (char *) NULL);
-	return TCL_ERROR;
-    }
-    Tcl_AppendResult(interp, "CreatedCommandProc in ",
-	    info.namespacePtr->fullName, (char *) NULL);
-    return TCL_OK;
-}
-
-static int
-CreatedCommandProc2(clientData, interp, argc, argv)
-    ClientData clientData;		/* String to return. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_CmdInfo info;
-    int found;
-
-    found = Tcl_GetCommandInfo(interp, "value:at:", &info);
-    if (!found) {
-	Tcl_AppendResult(interp, "CreatedCommandProc2 could not get command info for test_ns_basic::createdcommand",
-	        (char *) NULL);
-	return TCL_ERROR;
-    }
-    Tcl_AppendResult(interp, "CreatedCommandProc2 in ",
-	    info.namespacePtr->fullName, (char *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestdcallCmd --
- *
- *	This procedure implements the "testdcall" command.  It is used
- *	to test Tcl_CallWhenDeleted.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes interpreters.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestdcallCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int i, id;
-
-    delInterp = Tcl_CreateInterp();
-    Tcl_DStringInit(&delString);
-    for (i = 1; i < argc; i++) {
-	if (Tcl_GetInt(interp, argv[i], &id) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (id < 0) {
-	    Tcl_DontCallWhenDeleted(delInterp, DelCallbackProc,
-		    (ClientData) (-id));
-	} else {
-	    Tcl_CallWhenDeleted(delInterp, DelCallbackProc,
-		    (ClientData) id);
-	}
-    }
-    Tcl_DeleteInterp(delInterp);
-    Tcl_DStringResult(interp, &delString);
-    return TCL_OK;
-}
-
-/*
- * The deletion callback used by TestdcallCmd:
- */
-
-static void
-DelCallbackProc(clientData, interp)
-    ClientData clientData;		/* Numerical value to append to
-					 * delString. */
-    Tcl_Interp *interp;			/* Interpreter being deleted. */
-{
-    int id = (int) clientData;
-    char buffer[TCL_INTEGER_SPACE];
-
-    TclFormatInt(buffer, id);
-    Tcl_DStringAppendElement(&delString, buffer);
-    if (interp != delInterp) {
-	Tcl_DStringAppendElement(&delString, "bogus interpreter argument!");
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestdelCmd --
- *
- *	This procedure implements the "testdcall" command.  It is used
- *	to test Tcl_CallWhenDeleted.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes interpreters.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestdelCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    DelCmd *dPtr;
-    Tcl_Interp *slave;
-
-    if (argc != 4) {
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
-	return TCL_ERROR;
-    }
-
-    slave = Tcl_GetSlave(interp, argv[1]);
-    if (slave == NULL) {
-	return TCL_ERROR;
-    }
-
-    dPtr = (DelCmd *) ckalloc(sizeof(DelCmd));
-    dPtr->interp = interp;
-    dPtr->deleteCmd = (char *) ckalloc((unsigned) (strlen(argv[3]) + 1));
-    strcpy(dPtr->deleteCmd, argv[3]);
-
-    Tcl_CreateCommand(slave, argv[2], DelCmdProc, (ClientData) dPtr,
-	    DelDeleteProc);
-    return TCL_OK;
-}
-
-static int
-DelCmdProc(clientData, interp, argc, argv)
-    ClientData clientData;		/* String result to return. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    DelCmd *dPtr = (DelCmd *) clientData;
-
-    Tcl_AppendResult(interp, dPtr->deleteCmd, (char *) NULL);
-    ckfree(dPtr->deleteCmd);
-    ckfree((char *) dPtr);
-    return TCL_OK;
-}
-
-static void
-DelDeleteProc(clientData)
-    ClientData clientData;		/* String command to evaluate. */
-{
-    DelCmd *dPtr = (DelCmd *) clientData;
-
-    Tcl_Eval(dPtr->interp, dPtr->deleteCmd);
-    Tcl_ResetResult(dPtr->interp);
-    ckfree(dPtr->deleteCmd);
-    ckfree((char *) dPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestdelassocdataCmd --
- *
- *	This procedure implements the "testdelassocdata" command. It is used
- *	to test Tcl_DeleteAssocData.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Deletes an association between a key and associated data from an
- *	interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestdelassocdataCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " data_key\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    Tcl_DeleteAssocData(interp, argv[1]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestdstringCmd --
- *
- *	This procedure implements the "testdstring" command.  It is used
- *	to test the dynamic string facilities of Tcl.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates, deletes, and invokes handlers.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestdstringCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int count;
-
-    if (argc < 2) {
-	wrongNumArgs:
-	Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "append") == 0) {
-	if (argc != 4) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_GetInt(interp, argv[3], &count) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_DStringAppend(&dstring, argv[2], count);
-    } else if (strcmp(argv[1], "element") == 0) {
-	if (argc != 3) {
-	    goto wrongNumArgs;
-	}
-	Tcl_DStringAppendElement(&dstring, argv[2]);
-    } else if (strcmp(argv[1], "end") == 0) {
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	Tcl_DStringEndSublist(&dstring);
-    } else if (strcmp(argv[1], "free") == 0) {
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	Tcl_DStringFree(&dstring);
-    } else if (strcmp(argv[1], "get") == 0) {
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	Tcl_SetResult(interp, Tcl_DStringValue(&dstring), TCL_VOLATILE);
-    } else if (strcmp(argv[1], "gresult") == 0) {
-	if (argc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (strcmp(argv[2], "staticsmall") == 0) {
-	    Tcl_SetResult(interp, "short", TCL_STATIC);
-	} else if (strcmp(argv[2], "staticlarge") == 0) {
-	    Tcl_SetResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", TCL_STATIC);
-	} else if (strcmp(argv[2], "free") == 0) {
-	    Tcl_SetResult(interp, (char *) ckalloc(100), TCL_DYNAMIC);
-	    strcpy(interp->result, "This is a malloc-ed string");
-	} else if (strcmp(argv[2], "special") == 0) {
-	    interp->result = (char *) ckalloc(100);
-	    interp->result += 4;
-	    interp->freeProc = SpecialFree;
-	    strcpy(interp->result, "This is a specially-allocated string");
-	} else {
-	    Tcl_AppendResult(interp, "bad gresult option \"", argv[2],
-		    "\": must be staticsmall, staticlarge, free, or special",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	Tcl_DStringGetResult(interp, &dstring);
-    } else if (strcmp(argv[1], "length") == 0) {
-	char buf[TCL_INTEGER_SPACE];
-	
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	TclFormatInt(buf, Tcl_DStringLength(&dstring));
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(argv[1], "result") == 0) {
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	Tcl_DStringResult(interp, &dstring);
-    } else if (strcmp(argv[1], "trunc") == 0) {
-	if (argc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_GetInt(interp, argv[2], &count) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_DStringTrunc(&dstring, count);
-    } else if (strcmp(argv[1], "start") == 0) {
-	if (argc != 2) {
-	    goto wrongNumArgs;
-	}
-	Tcl_DStringStartSublist(&dstring);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be append, element, end, free, get, length, ",
-		"result, trunc, or start", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- * The procedure below is used as a special freeProc to test how well
- * Tcl_DStringGetResult handles freeProc's other than free.
- */
-
-static void SpecialFree(blockPtr)
-    char *blockPtr;			/* Block to free. */
-{
-    ckfree(blockPtr - 4);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestencodingCmd --
- *
- *	This procedure implements the "testencoding" command.  It is used
- *	to test the encoding package.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Load encodings.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestencodingObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Encoding encoding;
-    int index, length;
-    char *string;
-    TclEncoding *encodingPtr;
-    static char *optionStrings[] = {
-	"create",	"delete",	"path",
-	NULL
-    };
-    enum options {
-	ENC_CREATE,	ENC_DELETE,	ENC_PATH
-    };
-    
-    if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch ((enum options) index) {
-	case ENC_CREATE: {
-	    Tcl_EncodingType type;
-
-	    if (objc != 5) {
-		return TCL_ERROR;
-	    }
-	    encodingPtr = (TclEncoding *) ckalloc(sizeof(TclEncoding));
-	    encodingPtr->interp = interp;
-
-	    string = Tcl_GetStringFromObj(objv[3], &length);
-	    encodingPtr->toUtfCmd = (char *) ckalloc((unsigned) (length + 1));
-	    memcpy(encodingPtr->toUtfCmd, string, (unsigned) length + 1);
-
-	    string = Tcl_GetStringFromObj(objv[4], &length);
-	    encodingPtr->fromUtfCmd = (char *) ckalloc((unsigned) (length + 1));
-	    memcpy(encodingPtr->fromUtfCmd, string, (unsigned) (length + 1));
-
-	    string = Tcl_GetStringFromObj(objv[2], &length);
-
-	    type.encodingName = string;
-	    type.toUtfProc = EncodingToUtfProc;
-	    type.fromUtfProc = EncodingFromUtfProc;
-	    type.freeProc = EncodingFreeProc;
-	    type.clientData = (ClientData) encodingPtr;
-	    type.nullSize = 1;
-
-	    Tcl_CreateEncoding(&type);
-	    break;
-	}
-	case ENC_DELETE: {
-	    if (objc != 3) {
-		return TCL_ERROR;
-	    }
-	    encoding = Tcl_GetEncoding(NULL, Tcl_GetString(objv[2]));
-	    Tcl_FreeEncoding(encoding);
-	    Tcl_FreeEncoding(encoding);
-	    break;
-	}
-	case ENC_PATH: {
-	    if (objc == 2) {
-		Tcl_SetObjResult(interp, TclGetLibraryPath());
-	    } else {
-		TclSetLibraryPath(objv[2]);
-	    }
-	    break;
-	}
-    }
-    return TCL_OK;
-}
-static int 
-EncodingToUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* TclEncoding structure. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Current state. */
-    char *dst;			/* Output buffer. */
-    int dstLen;			/* The maximum length of output buffer. */
-    int *srcReadPtr;		/* Filled with number of bytes read. */
-    int *dstWrotePtr;		/* Filled with number of bytes stored. */
-    int *dstCharsPtr;		/* Filled with number of chars stored. */
-{
-    int len;
-    TclEncoding *encodingPtr;
-
-    encodingPtr = (TclEncoding *) clientData;
-    Tcl_GlobalEval(encodingPtr->interp, encodingPtr->toUtfCmd);
-
-    len = strlen(Tcl_GetStringResult(encodingPtr->interp));
-    if (len > dstLen) {
-	len = dstLen;
-    }
-    memcpy(dst, Tcl_GetStringResult(encodingPtr->interp), (unsigned) len);
-    Tcl_ResetResult(encodingPtr->interp);
-
-    *srcReadPtr = srcLen;
-    *dstWrotePtr = len;
-    *dstCharsPtr = len;
-    return TCL_OK;
-}
-static int 
-EncodingFromUtfProc(clientData, src, srcLen, flags, statePtr, dst, dstLen,
-	srcReadPtr, dstWrotePtr, dstCharsPtr)
-    ClientData clientData;	/* TclEncoding structure. */
-    CONST char *src;		/* Source string in specified encoding. */
-    int srcLen;			/* Source string length in bytes. */
-    int flags;			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr;/* Current state. */
-    char *dst;			/* Output buffer. */
-    int dstLen;			/* The maximum length of output buffer. */
-    int *srcReadPtr;		/* Filled with number of bytes read. */
-    int *dstWrotePtr;		/* Filled with number of bytes stored. */
-    int *dstCharsPtr;		/* Filled with number of chars stored. */
-{
-    int len;
-    TclEncoding *encodingPtr;
-
-    encodingPtr = (TclEncoding *) clientData;
-    Tcl_GlobalEval(encodingPtr->interp, encodingPtr->fromUtfCmd);
-
-    len = strlen(Tcl_GetStringResult(encodingPtr->interp));
-    if (len > dstLen) {
-	len = dstLen;
-    }
-    memcpy(dst, Tcl_GetStringResult(encodingPtr->interp), (unsigned) len);
-    Tcl_ResetResult(encodingPtr->interp);
-
-    *srcReadPtr = srcLen;
-    *dstWrotePtr = len;
-    *dstCharsPtr = len;
-    return TCL_OK;
-}
-static void
-EncodingFreeProc(clientData)
-    ClientData clientData;	/* ClientData associated with type. */
-{
-    TclEncoding *encodingPtr;
-
-    encodingPtr = (TclEncoding *) clientData;
-    ckfree((char *) encodingPtr->toUtfCmd);
-    ckfree((char *) encodingPtr->fromUtfCmd);
-    ckfree((char *) encodingPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestevalexObjCmd --
- *
- *	This procedure implements the "testevalex" command.  It is
- *	used to test Tcl_EvalEx.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestevalexObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int code, oldFlags, length, flags;
-    char *string;
-
-    if (objc == 1) {
-	/*
-	 * The command was invoked with no arguments, so just toggle
-	 * the flag that determines whether we use Tcl_EvalEx.
-	 */
-
-	if (iPtr->flags & USE_EVAL_DIRECT) {
-	    iPtr->flags &= ~USE_EVAL_DIRECT;
-	    Tcl_SetResult(interp, "disabling direct evaluation", TCL_STATIC);
-	} else {
-	    iPtr->flags |= USE_EVAL_DIRECT;
-	    Tcl_SetResult(interp, "enabling direct evaluation", TCL_STATIC);
-	}
-	return TCL_OK;
-    }
-
-    flags = 0;
-    if (objc == 3) {
-	string = Tcl_GetStringFromObj(objv[2], &length);
-	if (strcmp(string, "global") != 0) {
-	    Tcl_AppendResult(interp, "bad value \"", string,
-		    "\": must be global", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	flags = TCL_EVAL_GLOBAL;
-    } else if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "script ?global?");
-        return TCL_ERROR;
-    }
-    Tcl_SetResult(interp, "xxx", TCL_STATIC);
-
-    /*
-     * Note, we have to set the USE_EVAL_DIRECT flag in the interpreter
-     * in addition to calling Tcl_EvalEx.  This is needed so that even nested
-     * commands are evaluated directly.
-     */
-
-    oldFlags = iPtr->flags;
-    iPtr->flags |= USE_EVAL_DIRECT;
-    string = Tcl_GetStringFromObj(objv[1], &length);
-    code = Tcl_EvalEx(interp, string, length, flags); 
-    iPtr->flags = (iPtr->flags & ~USE_EVAL_DIRECT)
-	    | (oldFlags & USE_EVAL_DIRECT);
-    return code;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestevalobjvObjCmd --
- *
- *	This procedure implements the "testevalobjv" command.  It is
- *	used to test Tcl_EvalObjv.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestevalobjvObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int evalGlobal;
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "global word ?word ...?");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[1], &evalGlobal) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    return Tcl_EvalObjv(interp, objc-2, objv+2,
-	    (evalGlobal) ? TCL_EVAL_GLOBAL : 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestexithandlerCmd --
- *
- *	This procedure implements the "testexithandler" command. It is
- *	used to test Tcl_CreateExitHandler and Tcl_DeleteExitHandler.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestexithandlerCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int value;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " create|delete value\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (Tcl_GetInt(interp, argv[2], &value) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	Tcl_CreateExitHandler((value & 1) ? ExitProcOdd : ExitProcEven,
-		(ClientData) value);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	Tcl_DeleteExitHandler((value & 1) ? ExitProcOdd : ExitProcEven,
-		(ClientData) value);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be create or delete", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-static void
-ExitProcOdd(clientData)
-    ClientData clientData;		/* Integer value to print. */
-{
-    char buf[16 + TCL_INTEGER_SPACE];
-
-    sprintf(buf, "odd %d\n", (int) clientData);
-    write(1, buf, strlen(buf));
-}
-
-static void
-ExitProcEven(clientData)
-    ClientData clientData;		/* Integer value to print. */
-{
-    char buf[16 + TCL_INTEGER_SPACE];
-
-    sprintf(buf, "even %d\n", (int) clientData);
-    write(1, buf, strlen(buf));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestexprlongCmd --
- *
- *	This procedure verifies that Tcl_ExprLong does not modify the
- *	interpreter result if there is no error.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestexprlongCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    long exprResult;
-    char buf[4 + TCL_INTEGER_SPACE];
-    int result;
-    
-    Tcl_SetResult(interp, "This is a result", TCL_STATIC);
-    result = Tcl_ExprLong(interp, "4+1", &exprResult);
-    if (result != TCL_OK) {
-        return result;
-    }
-    sprintf(buf, ": %ld", exprResult);
-    Tcl_AppendResult(interp, buf, NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestexprstringCmd --
- *
- *	This procedure tests the basic operation of Tcl_ExprString.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestexprstringCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " expression\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    return Tcl_ExprString(interp, argv[1]);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestgetassocdataCmd --
- *
- *	This procedure implements the "testgetassocdata" command. It is
- *	used to test Tcl_GetAssocData.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetassocdataCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    char *res;
-    
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " data_key\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    res = (char *) Tcl_GetAssocData(interp, argv[1], NULL);
-    if (res != NULL) {
-        Tcl_AppendResult(interp, res, NULL);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestgetplatformCmd --
- *
- *	This procedure implements the "testgetplatform" command. It is
- *	used to retrievel the value of the tclPlatform global variable.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetplatformCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    static char *platformStrings[] = { "unix", "mac", "windows" };
-    TclPlatformType *platform;
-
-#ifdef __WIN32__
-    platform = TclWinGetPlatform();
-#else
-    platform = &tclPlatform;
-#endif
-    
-    if (argc != 1) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		(char *) NULL);
-        return TCL_ERROR;
-    }
-
-    Tcl_AppendResult(interp, platformStrings[*platform], NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestinterpdeleteCmd --
- *
- *	This procedure tests the code in tclInterp.c that deals with
- *	interpreter deletion. It deletes a user-specified interpreter
- *	from the hierarchy, and subsequent code checks integrity.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Deletes one or more interpreters.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestinterpdeleteCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_Interp *slaveToDelete;
-
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-                " path\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (argv[1][0] == '\0') {
-        Tcl_AppendResult(interp, "cannot delete current interpreter",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-    slaveToDelete = Tcl_GetSlave(interp, argv[1]);
-    if (slaveToDelete == (Tcl_Interp *) NULL) {
-        return TCL_ERROR;
-    }
-    Tcl_DeleteInterp(slaveToDelete);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestlinkCmd --
- *
- *	This procedure implements the "testlink" command.  It is used
- *	to test Tcl_LinkVar and related library procedures.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes various variable links, plus returns
- *	values of the linked variables.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestlinkCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    static int intVar = 43;
-    static int boolVar = 4;
-    static double realVar = 1.23;
-    static char *stringVar = NULL;
-    static int created = 0;
-    char buffer[TCL_DOUBLE_SPACE];
-    int writable, flag;
-
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option ?arg arg arg?\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "create") == 0) {
-	if (created) {
-	    Tcl_UnlinkVar(interp, "int");
-	    Tcl_UnlinkVar(interp, "real");
-	    Tcl_UnlinkVar(interp, "bool");
-	    Tcl_UnlinkVar(interp, "string");
-	}
-	created = 1;
-	if (Tcl_GetBoolean(interp, argv[2], &writable) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "int", (char *) &intVar,
-		TCL_LINK_INT | flag) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetBoolean(interp, argv[3], &writable) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "real", (char *) &realVar,
-		TCL_LINK_DOUBLE | flag) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetBoolean(interp, argv[4], &writable) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "bool", (char *) &boolVar,
-		TCL_LINK_BOOLEAN | flag) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetBoolean(interp, argv[5], &writable) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	flag = (writable != 0) ? 0 : TCL_LINK_READ_ONLY;
-	if (Tcl_LinkVar(interp, "string", (char *) &stringVar,
-		TCL_LINK_STRING | flag) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else if (strcmp(argv[1], "delete") == 0) {
-	Tcl_UnlinkVar(interp, "int");
-	Tcl_UnlinkVar(interp, "real");
-	Tcl_UnlinkVar(interp, "bool");
-	Tcl_UnlinkVar(interp, "string");
-	created = 0;
-    } else if (strcmp(argv[1], "get") == 0) {
-	TclFormatInt(buffer, intVar);
-	Tcl_AppendElement(interp, buffer);
-	Tcl_PrintDouble((Tcl_Interp *) NULL, realVar, buffer);
-	Tcl_AppendElement(interp, buffer);
-	TclFormatInt(buffer, boolVar);
-	Tcl_AppendElement(interp, buffer);
-	Tcl_AppendElement(interp, (stringVar == NULL) ? "-" : stringVar);
-    } else if (strcmp(argv[1], "set") == 0) {
-	if (argc != 6) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " ", argv[1],
-		"intValue realValue boolValue stringValue\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (argv[2][0] != 0) {
-	    if (Tcl_GetInt(interp, argv[2], &intVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	}
-	if (argv[3][0] != 0) {
-	    if (Tcl_GetDouble(interp, argv[3], &realVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	}
-	if (argv[4][0] != 0) {
-	    if (Tcl_GetInt(interp, argv[4], &boolVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	}
-	if (argv[5][0] != 0) {
-	    if (stringVar != NULL) {
-		ckfree(stringVar);
-	    }
-	    if (strcmp(argv[5], "-") == 0) {
-		stringVar = NULL;
-	    } else {
-		stringVar = (char *) ckalloc((unsigned) (strlen(argv[5]) + 1));
-		strcpy(stringVar, argv[5]);
-	    }
-	}
-    } else if (strcmp(argv[1], "update") == 0) {
-	if (argc != 6) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " ", argv[1],
-		"intValue realValue boolValue stringValue\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (argv[2][0] != 0) {
-	    if (Tcl_GetInt(interp, argv[2], &intVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_UpdateLinkedVar(interp, "int");
-	}
-	if (argv[3][0] != 0) {
-	    if (Tcl_GetDouble(interp, argv[3], &realVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_UpdateLinkedVar(interp, "real");
-	}
-	if (argv[4][0] != 0) {
-	    if (Tcl_GetInt(interp, argv[4], &boolVar) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    Tcl_UpdateLinkedVar(interp, "bool");
-	}
-	if (argv[5][0] != 0) {
-	    if (stringVar != NULL) {
-		ckfree(stringVar);
-	    }
-	    if (strcmp(argv[5], "-") == 0) {
-		stringVar = NULL;
-	    } else {
-		stringVar = (char *) ckalloc((unsigned) (strlen(argv[5]) + 1));
-		strcpy(stringVar, argv[5]);
-	    }
-	    Tcl_UpdateLinkedVar(interp, "string");
-	}
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": should be create, delete, get, set, or update",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestlocaleCmd --
- *
- *	This procedure implements the "testlocale" command.  It is used
- *	to test the effects of setting different locales in Tcl.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Modifies the current C locale.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestlocaleCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    int index;
-    char *locale;
-
-    static char *optionStrings[] = {
-    	"ctype", "numeric", "time", "collate", "monetary", 
-	"all",	NULL
-    };
-    static int lcTypes[] = {
-	LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY,
-	LC_ALL
-    };
-
-    /*
-     * LC_CTYPE, etc. correspond to the indices for the strings.
-     */
-
-    if (objc < 2 || objc > 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "category ?locale?");
-	return TCL_ERROR;
-    }
-    
-    if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    if (objc == 3) {
-	locale = Tcl_GetString(objv[2]);
-    } else {
-	locale = NULL;
-    }
-    locale = setlocale(lcTypes[index], locale);
-    if (locale) {
-	Tcl_SetStringObj(Tcl_GetObjResult(interp), locale, -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestMathFunc --
- *
- *	This is a user-defined math procedure to test out math procedures
- *	with no arguments.
- *
- * Results:
- *	A normal Tcl completion code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestMathFunc(clientData, interp, args, resultPtr)
-    ClientData clientData;		/* Integer value to return. */
-    Tcl_Interp *interp;			/* Not used. */
-    Tcl_Value *args;			/* Not used. */
-    Tcl_Value *resultPtr;		/* Where to store result. */
-{
-    resultPtr->type = TCL_INT;
-    resultPtr->intValue = (int) clientData;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestMathFunc2 --
- *
- *	This is a user-defined math procedure to test out math procedures
- *	that do have arguments, in this case 2.
- *
- * Results:
- *	A normal Tcl completion code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestMathFunc2(clientData, interp, args, resultPtr)
-    ClientData clientData;		/* Integer value to return. */
-    Tcl_Interp *interp;			/* Used to report errors. */
-    Tcl_Value *args;			/* Points to an array of two
-					 * Tcl_Value structs for the 
-					 * two arguments. */
-    Tcl_Value *resultPtr;		/* Where to store the result. */
-{
-    int result = TCL_OK;
-    
-    /*
-     * Return the maximum of the two arguments with the correct type.
-     */
-    
-    if (args[0].type == TCL_INT) {
-	int i0 = args[0].intValue;
-	
-	if (args[1].type == TCL_INT) {
-	    int i1 = args[1].intValue;
-	    
-	    resultPtr->type = TCL_INT;
-	    resultPtr->intValue = ((i0 > i1)? i0 : i1);
-	} else if (args[1].type == TCL_DOUBLE) {
-	    double d0 = i0;
-	    double d1 = args[1].doubleValue;
-
-	    resultPtr->type = TCL_DOUBLE;
-	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
-	} else {
-	    Tcl_SetResult(interp, "T2: wrong type for arg 2", TCL_STATIC);
-	    result = TCL_ERROR;
-	}
-    } else if (args[0].type == TCL_DOUBLE) {
-	double d0 = args[0].doubleValue;
-	
-	if (args[1].type == TCL_INT) {
-	    double d1 = args[1].intValue;
-	    
-	    resultPtr->type = TCL_DOUBLE;
-	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
-	} else if (args[1].type == TCL_DOUBLE) {
-	    double d1 = args[1].doubleValue;
-
-	    resultPtr->type = TCL_DOUBLE;
-	    resultPtr->doubleValue = ((d0 > d1)? d0 : d1);
-	} else {
-	    Tcl_SetResult(interp, "T2: wrong type for arg 2", TCL_STATIC);
-	    result = TCL_ERROR;
-	}
-    } else {
-	Tcl_SetResult(interp, "T2: wrong type for arg 1", TCL_STATIC);
-	result = TCL_ERROR;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanupTestSetassocdataTests --
- *
- *	This function is called when an interpreter is deleted to clean
- *	up any data left over from running the testsetassocdata command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Releases storage.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-static void
-CleanupTestSetassocdataTests(clientData, interp)
-    ClientData clientData;		/* Data to be released. */
-    Tcl_Interp *interp;			/* Interpreter being deleted. */
-{
-    ckfree((char *) clientData);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestparserObjCmd --
- *
- *	This procedure implements the "testparser" command.  It is
- *	used for testing the new Tcl script parser in Tcl 8.1.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestparserObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *script;
-    int length, dummy;
-    Tcl_Parse parse;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "script length");
-	return TCL_ERROR;
-    }
-    script = Tcl_GetStringFromObj(objv[1], &dummy);
-    if (Tcl_GetIntFromObj(interp, objv[2], &length)) {
-	return TCL_ERROR;
-    }
-    if (length == 0) {
-	length = dummy;
-    }
-    if (Tcl_ParseCommand(interp, script, length, 0, &parse) != TCL_OK) {
-	Tcl_AddErrorInfo(interp, "\n    (remainder of script: \"");
-	Tcl_AddErrorInfo(interp, parse.term);
-	Tcl_AddErrorInfo(interp, "\")");
-	return TCL_ERROR;
-    }
-
-    /*
-     * The parse completed successfully.  Just print out the contents
-     * of the parse structure into the interpreter's result.
-     */
-
-    PrintParse(interp, &parse);
-    Tcl_FreeParse(&parse);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestexprparserObjCmd --
- *
- *	This procedure implements the "testexprparser" command.  It is
- *	used for testing the new Tcl expression parser in Tcl 8.1.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestexprparserObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *script;
-    int length, dummy;
-    Tcl_Parse parse;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "expr length");
-	return TCL_ERROR;
-    }
-    script = Tcl_GetStringFromObj(objv[1], &dummy);
-    if (Tcl_GetIntFromObj(interp, objv[2], &length)) {
-	return TCL_ERROR;
-    }
-    if (length == 0) {
-	length = dummy;
-    }
-    if (Tcl_ParseExpr(interp, script, length, &parse) != TCL_OK) {
-	Tcl_AddErrorInfo(interp, "\n    (remainder of expr: \"");
-	Tcl_AddErrorInfo(interp, parse.term);
-	Tcl_AddErrorInfo(interp, "\")");
-	return TCL_ERROR;
-    }
-
-    /*
-     * The parse completed successfully.  Just print out the contents
-     * of the parse structure into the interpreter's result.
-     */
-
-    PrintParse(interp, &parse);
-    Tcl_FreeParse(&parse);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PrintParse --
- *
- *	This procedure prints out the contents of a Tcl_Parse structure
- *	in the result of an interpreter.
- *
- * Results:
- *	Interp's result is set to a prettily formatted version of the
- *	contents of parsePtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PrintParse(interp, parsePtr)
-    Tcl_Interp *interp;		/* Interpreter whose result is to be set to
-				 * the contents of a parse structure. */
-    Tcl_Parse *parsePtr;	/* Parse structure to print out. */
-{
-    Tcl_Obj *objPtr;
-    char *typeString;
-    Tcl_Token *tokenPtr;
-    int i;
-
-    objPtr = Tcl_GetObjResult(interp);
-    if (parsePtr->commentSize > 0) {
-	Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-		Tcl_NewStringObj(parsePtr->commentStart,
-			parsePtr->commentSize));
-    } else {
-	Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-		Tcl_NewStringObj("-", 1));
-    }
-    Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-	    Tcl_NewStringObj(parsePtr->commandStart, parsePtr->commandSize));
-    Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-	    Tcl_NewIntObj(parsePtr->numWords));
-    for (i = 0; i < parsePtr->numTokens; i++) {
-	tokenPtr = &parsePtr->tokenPtr[i];
-	switch (tokenPtr->type) {
-	    case TCL_TOKEN_WORD:
-		typeString = "word";
-		break;
-	    case TCL_TOKEN_SIMPLE_WORD:
-		typeString = "simple";
-		break;
-	    case TCL_TOKEN_TEXT:
-		typeString = "text";
-		break;
-	    case TCL_TOKEN_BS:
-		typeString = "backslash";
-		break;
-	    case TCL_TOKEN_COMMAND:
-		typeString = "command";
-		break;
-	    case TCL_TOKEN_VARIABLE:
-		typeString = "variable";
-		break;
-	    case TCL_TOKEN_SUB_EXPR:
-		typeString = "subexpr";
-		break;
-	    case TCL_TOKEN_OPERATOR:
-		typeString = "operator";
-		break;
-	    default:
-		typeString = "??";
-		break;
-	}
-	Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-		Tcl_NewStringObj(typeString, -1));
-	Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-		Tcl_NewStringObj(tokenPtr->start, tokenPtr->size));
-	Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-		Tcl_NewIntObj(tokenPtr->numComponents));
-    }
-    Tcl_ListObjAppendElement((Tcl_Interp *) NULL, objPtr,
-	    Tcl_NewStringObj(parsePtr->commandStart + parsePtr->commandSize,
-	    -1));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestparsevarObjCmd --
- *
- *	This procedure implements the "testparsevar" command.  It is
- *	used for testing Tcl_ParseVar.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestparsevarObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *name, *value, *termPtr;
-
-    if (objc != 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName");
-	return TCL_ERROR;
-    }
-    name = Tcl_GetString(objv[1]);
-    value = Tcl_ParseVar(interp, name, &termPtr);
-    if (value == NULL) {
-	return TCL_ERROR;
-    }
-
-    Tcl_AppendElement(interp, value);
-    Tcl_AppendElement(interp, termPtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestparsevarnameObjCmd --
- *
- *	This procedure implements the "testparsevarname" command.  It is
- *	used for testing the new Tcl script parser in Tcl 8.1.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestparsevarnameObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *script;
-    int append, length, dummy;
-    Tcl_Parse parse;
-
-    if (objc != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "script length append");
-	return TCL_ERROR;
-    }
-    script = Tcl_GetStringFromObj(objv[1], &dummy);
-    if (Tcl_GetIntFromObj(interp, objv[2], &length)) {
-	return TCL_ERROR;
-    }
-    if (length == 0) {
-	length = dummy;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[3], &append)) {
-	return TCL_ERROR;
-    }
-    if (Tcl_ParseVarName(interp, script, length, &parse, append) != TCL_OK) {
-	Tcl_AddErrorInfo(interp, "\n    (remainder of script: \"");
-	Tcl_AddErrorInfo(interp, parse.term);
-	Tcl_AddErrorInfo(interp, "\")");
-	return TCL_ERROR;
-    }
-
-    /*
-     * The parse completed successfully.  Just print out the contents
-     * of the parse structure into the interpreter's result.
-     */
-
-    parse.commentSize = 0;
-    parse.commandStart = script + parse.tokenPtr->size;
-    parse.commandSize = 0;
-    PrintParse(interp, &parse);
-    Tcl_FreeParse(&parse);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestregexpObjCmd --
- *
- *	This procedure implements the "testregexp" command. It is
- *	used to give a direct interface for regexp flags.  It's identical
- *	to Tcl_RegexpObjCmd except for the REGEXP_TEST define, which
- *	enables the -xflags option.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-TestregexpObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    int i, result, indices, stringLength, wLen, match, about;
-    int hasxflags, cflags, eflags;
-    Tcl_RegExp regExpr;
-    char *string;
-    Tcl_DString stringBuffer, valueBuffer;
-    Tcl_UniChar *wStart;
-#   define	REGEXP_TEST	/* yes */
-    static char *options[] = {
-	"-indices",	"-nocase",	"-about",	"-expanded",
-	"-line",	"-linestop",	"-lineanchor",
-#ifdef REGEXP_TEST
-	"-xflags",
-#endif
-	"--",		(char *) NULL
-    };
-    enum options {
-	REGEXP_INDICES, REGEXP_NOCASE,	REGEXP_ABOUT,	REGEXP_EXPANDED,
-	REGEXP_MULTI,	REGEXP_NOCROSS,	REGEXP_NEWL,
-#ifdef REGEXP_TEST
-	REGEXP_XFLAGS,
-#endif
-	REGEXP_LAST
-    };
-#ifndef REGEXP_TEST
-#   define REGEXP_XFLAGS	-1	/* impossible value */
-#   define TestregexpXflags(a,b,c,d)	/* do nothing */
-#endif
-
-    indices = 0;
-    about = 0;
-    cflags = REG_ADVANCED;
-    eflags = 0;
-    hasxflags = 0;
-    
-    for (i = 1; i < objc; i++) {
-	char *name;
-	int index;
-
-	name = Tcl_GetString(objv[i]);
-	if (name[0] != '-') {
-	    break;
-	}
-	if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", TCL_EXACT,
-		&index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	switch ((enum options) index) {
-	    case REGEXP_INDICES: {
-		indices = 1;
-		break;
-	    }
-	    case REGEXP_NOCASE: {
-		cflags |= REG_ICASE;
-		break;
-	    }
-	    case REGEXP_ABOUT: {
-		about = 1;
-		break;
-	    }
-	    case REGEXP_EXPANDED: {
-		cflags |= REG_EXPANDED;
-		break;
-	    }
-	    case REGEXP_MULTI: {
-		cflags |= REG_NEWLINE;
-		break;
-	    }
-	    case REGEXP_NOCROSS: {
-		cflags |= REG_NLSTOP;
-		break;
-	    }
-	    case REGEXP_NEWL: {
-		cflags |= REG_NLANCH;
-		break;
-	    }
-	    case REGEXP_XFLAGS: {
-		hasxflags = 1;
-		break;
-	    }
-	    case REGEXP_LAST: {
-		i++;
-		goto endOfForLoop;
-	    }
-	}
-    }
-
-    endOfForLoop:
-    if (objc - i < hasxflags + 2 - about) {
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?");
-	return TCL_ERROR;
-    }
-    objc -= i;
-    objv += i;
-
-    if (hasxflags) {
-	string = Tcl_GetStringFromObj(objv[0], &stringLength);
-	TestregexpXflags(string, stringLength, &cflags, &eflags);
-	objc--;
-	objv++;
-    }
-
-    regExpr = Tcl_GetRegExpFromObj(interp, objv[0], cflags);
-    if (regExpr == NULL) {
-	return TCL_ERROR;
-    }
-
-    if (about) {
-	if (TclRegAbout(interp, regExpr) < 0) {
-	    return TCL_ERROR;
-	}
-	return TCL_OK;
-    }
-
-    result = TCL_OK;
-    string = Tcl_GetStringFromObj(objv[1], &stringLength);
-
-    Tcl_DStringInit(&valueBuffer);
-    
-    Tcl_DStringInit(&stringBuffer);
-    wStart = Tcl_UtfToUniCharDString(string, stringLength, &stringBuffer);
-    wLen = Tcl_DStringLength(&stringBuffer) / sizeof(Tcl_UniChar);
-
-    match = TclRegExpExecUniChar(interp, regExpr, wStart, wLen, objc-2, eflags);
-    if (match < 0) {
-	result = TCL_ERROR;
-	goto done;
-    }
-    if (match == 0) {
-	/*
-	 * Set the interpreter's object result to an integer object w/ value 0. 
-	 */
-	
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), 0);
-	goto done;
-    }
-
-    /*
-     * If additional variable names have been specified, return
-     * index information in those variables.
-     */
-
-    objc -= 2;
-    objv += 2;
-
-    for (i = 0; i < objc; i++) {
-	char *varName, *value;
-	int start, end;
-	
-	varName = Tcl_GetString(objv[i]);
-
-	TclRegExpRangeUniChar(regExpr, i, &start, &end);
-	if (start < 0) {
-	    if (indices) {
-		value = Tcl_SetVar(interp, varName, "-1 -1", 0);
-	    } else {
-		value = Tcl_SetVar(interp, varName, "", 0);
-	    }
-	} else {
-	    if (indices) {
-		char info[TCL_INTEGER_SPACE * 2];
-		
-		sprintf(info, "%d %d", start, end - 1);
-		value = Tcl_SetVar(interp, varName, info, 0);
-	    } else {
-		value = Tcl_UniCharToUtfDString(wStart + start, end - start,
-			&valueBuffer);
-		value = Tcl_SetVar(interp, varName, value, 0);
-		Tcl_DStringSetLength(&valueBuffer, 0);
-	    }
-	}
-	if (value == NULL) {
-	    Tcl_AppendResult(interp, "couldn't set variable \"",
-		    varName, "\"", (char *) NULL);
-	    result = TCL_ERROR;
-	    goto done;
-	}
-    }
-
-    /*
-     * Set the interpreter's object result to an integer object w/ value 1. 
-     */
-	
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), 1);
-
-    done:
-    Tcl_DStringFree(&stringBuffer);
-    Tcl_DStringFree(&valueBuffer);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TestregexpXflags --
- *
- *	Parse a string of extended regexp flag letters, for testing.
- *
- * Results:
- *	No return value (you're on your own for errors here).
- *
- * Side effects:
- *	Modifies *cflagsPtr, a regcomp flags word, and *eflagsPtr, a
- *	regexec flags word, as appropriate.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TestregexpXflags(string, length, cflagsPtr, eflagsPtr)
-    char *string;		/* The string of flags. */
-    int length;			/* The length of the string in bytes. */
-    int *cflagsPtr;		/* compile flags word */
-    int *eflagsPtr;		/* exec flags word */
-{
-    int i;
-    int cflags;
-    int eflags;
-
-    cflags = *cflagsPtr;
-    eflags = *eflagsPtr;
-    for (i = 0; i < length; i++) {
-	switch (string[i]) {
-	    case 'a': {
-		cflags |= REG_ADVF;
-		break;
-	    }
-	    case 'b': {
-		cflags &= ~REG_ADVANCED;
-		break;
-	    }
-	    case 'e': {
-		cflags &= ~REG_ADVANCED;
-		cflags |= REG_EXTENDED;
-		break;
-	    }
-	    case 'q': {
-		cflags &= ~REG_ADVANCED;
-		cflags |= REG_QUOTE;
-		break;
-	    }
-	    case 'o': {			/* o for opaque */
-		cflags |= REG_NOSUB;
-		break;
-	    }
-	    case '+': {
-		cflags |= REG_FAKEEC;
-		break;
-	    }
-	    case ',': {
-		cflags |= REG_PROGRESS;
-		break;
-	    }
-	    case '.': {
-		cflags |= REG_DUMP;
-		break;
-	    }
-	    case ':': {
-		eflags |= REG_MTRACE;
-		break;
-	    }
-	    case ';': {
-		eflags |= REG_FTRACE;
-		break;
-	    }
-	    case '^': {
-		eflags |= REG_NOTBOL;
-		break;
-	    }
-	    case '$': {
-		eflags |= REG_NOTEOL;
-		break;
-	    }
-	    case '%': {
-		eflags |= REG_SMALL;
-		break;
-	    }
-	}
-    }
-
-    *cflagsPtr = cflags;
-    *eflagsPtr = eflags;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetassocdataCmd --
- *
- *	This procedure implements the "testsetassocdata" command. It is used
- *	to test Tcl_SetAssocData.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Modifies or creates an association between a key and associated
- *	data for this interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestsetassocdataCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    char *buf;
-    char *oldData;
-    Tcl_InterpDeleteProc *procPtr;
-    
-    if (argc != 3) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " data_key data_item\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    buf = ckalloc((unsigned) strlen(argv[2]) + 1);
-    strcpy(buf, argv[2]);
-
-    /*
-     * If we previously associated a malloced value with the variable,
-     * free it before associating a new value.
-     */
-
-    oldData = (char *) Tcl_GetAssocData(interp, argv[1], &procPtr);
-    if ((oldData != NULL) && (procPtr == CleanupTestSetassocdataTests)) {
-	ckfree(oldData);
-    }
-    
-    Tcl_SetAssocData(interp, argv[1], CleanupTestSetassocdataTests, 
-	(ClientData) buf);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetplatformCmd --
- *
- *	This procedure implements the "testsetplatform" command. It is
- *	used to change the tclPlatform global variable so all file
- *	name conversions can be tested on a single platform.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Sets the tclPlatform global variable.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestsetplatformCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    size_t length;
-    TclPlatformType *platform;
-
-#ifdef __WIN32__
-    platform = TclWinGetPlatform();
-#else
-    platform = &tclPlatform;
-#endif
-    
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " platform\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    length = strlen(argv[1]);
-    if (strncmp(argv[1], "unix", length) == 0) {
-	*platform = TCL_PLATFORM_UNIX;
-    } else if (strncmp(argv[1], "mac", length) == 0) {
-	*platform = TCL_PLATFORM_MAC;
-    } else if (strncmp(argv[1], "windows", length) == 0) {
-	*platform = TCL_PLATFORM_WINDOWS;
-    } else {
-        Tcl_AppendResult(interp, "unsupported platform: should be one of ",
-		"unix, mac, or windows", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetrecursionlimitCmd --
- *
- *	This procedure implements the "testsetrecursionlimit" command. It is
- *	used to change the interp recursion limit (to test the effects
- *      of Tcl_SetRecursionLimit).
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Sets the interp's recursion limit.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestsetrecursionlimitCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    int     value;
-
-    if (objc != 2) {
-    	Tcl_WrongNumArgs(interp, 1, objv, "integer");
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[1], &value) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    value = Tcl_SetRecursionLimit(interp, value);
-    Tcl_SetIntObj(Tcl_GetObjResult(interp), value);
-    return TCL_OK;
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TeststaticpkgCmd --
- *
- *	This procedure implements the "teststaticpkg" command.
- *	It is used to test the procedure Tcl_StaticPackage.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	When the packge given by argv[1] is loaded into an interpeter,
- *	variable "x" in that interpreter is set to "loaded".
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TeststaticpkgCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int safe, loaded;
-
-    if (argc != 4) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " pkgName safe loaded\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (Tcl_GetInt(interp, argv[2], &safe) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (Tcl_GetInt(interp, argv[3], &loaded) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage((loaded) ? interp : NULL, argv[1], StaticInitProc,
-	    (safe) ? StaticInitProc : NULL);
-    return TCL_OK;
-}
-
-static int
-StaticInitProc(interp)
-    Tcl_Interp *interp;			/* Interpreter in which package
-					 * is supposedly being loaded. */
-{
-    Tcl_SetVar(interp, "x", "loaded", TCL_GLOBAL_ONLY);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TesttranslatefilenameCmd --
- *
- *	This procedure implements the "testtranslatefilename" command.
- *	It is used to test the Tcl_TranslateFileName command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TesttranslatefilenameCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_DString buffer;
-    char *result;
-
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " path\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    result = Tcl_TranslateFileName(interp, argv[1], &buffer);
-    if (result == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_AppendResult(interp, result, NULL);
-    Tcl_DStringFree(&buffer);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestupvarCmd --
- *
- *	This procedure implements the "testupvar2" command.  It is used
- *	to test Tcl_UpVar and Tcl_UpVar2.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates or modifies an "upvar" reference.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestupvarCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int flags = 0;
-    
-    if ((argc != 5) && (argc != 6)) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-		argv[0], " level name ?name2? dest global\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (argc == 5) {
-	if (strcmp(argv[4], "global") == 0) {
-	    flags = TCL_GLOBAL_ONLY;
-	} else if (strcmp(argv[4], "namespace") == 0) {
-	    flags = TCL_NAMESPACE_ONLY;
-	}
-	return Tcl_UpVar(interp, argv[1], argv[2], argv[3], flags);
-    } else {
-	if (strcmp(argv[5], "global") == 0) {
-	    flags = TCL_GLOBAL_ONLY;
-	} else if (strcmp(argv[5], "namespace") == 0) {
-	    flags = TCL_NAMESPACE_ONLY;
-	}
-	return Tcl_UpVar2(interp, argv[1], argv[2], 
-		(argv[3][0] == 0) ? (char *) NULL : argv[3], argv[4],
-		flags);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetobjerrorcodeCmd --
- *
- *	This procedure implements the "testsetobjerrorcodeCmd".
- *	This tests up to five elements passed to the
- *	Tcl_SetObjErrorCode command.
- *
- * Results:
- *	A standard Tcl result. Always returns TCL_ERROR so that
- *	the error code can be tested.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestsetobjerrorcodeCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    Tcl_Obj *listObjPtr;
-
-    if (objc > 1) {
-	listObjPtr = Tcl_ConcatObj(objc - 1, objv + 1);
-    } else {
-	listObjPtr = Tcl_NewObj();
-    }
-    Tcl_IncrRefCount(listObjPtr);
-    Tcl_SetObjErrorCode(interp, listObjPtr);
-    Tcl_DecrRefCount(listObjPtr);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestfeventCmd --
- *
- *	This procedure implements the "testfevent" command.  It is
- *	used for testing the "fileevent" command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Creates and deletes interpreters.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestfeventCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    static Tcl_Interp *interp2 = NULL;
-    int code;
-    Tcl_Channel chan;
-
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" option ?arg arg ...?", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "cmd") == 0) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		    " cmd script", (char *) NULL);
-	    return TCL_ERROR;
-	}
-        if (interp2 != (Tcl_Interp *) NULL) {
-            code = Tcl_GlobalEval(interp2, argv[2]);
-	    Tcl_SetObjResult(interp, Tcl_GetObjResult(interp2));
-            return code;
-        } else {
-            Tcl_AppendResult(interp,
-                    "called \"testfevent code\" before \"testfevent create\"",
-                    (char *) NULL);
-            return TCL_ERROR;
-        }
-    } else if (strcmp(argv[1], "create") == 0) {
-	if (interp2 != NULL) {
-            Tcl_DeleteInterp(interp2);
-	}
-        interp2 = Tcl_CreateInterp();
-	return TCL_OK;
-    } else if (strcmp(argv[1], "delete") == 0) {
-	if (interp2 != NULL) {
-            Tcl_DeleteInterp(interp2);
-	}
-	interp2 = NULL;
-    } else if (strcmp(argv[1], "share") == 0) {
-        if (interp2 != NULL) {
-            chan = Tcl_GetChannel(interp, argv[2], NULL);
-            if (chan == (Tcl_Channel) NULL) {
-                return TCL_ERROR;
-            }
-            Tcl_RegisterChannel(interp2, chan);
-        }
-    }
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestpanicCmd --
- *
- *	Calls the panic routine.
- *
- * Results:
- *      Always returns TCL_OK. 
- *
- * Side effects:
- *	May exit application.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestpanicCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    char *argString;
-    
-    /*
-     *  Put the arguments into a var args structure
-     *  Append all of the arguments together separated by spaces
-     */
-
-    argString = Tcl_Merge(argc-1, argv+1);
-    panic(argString);
-    ckfree(argString);
- 
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TestchmodCmd --
- *
- *	Implements the "testchmod" cmd.  Used when testing "file"
- *	command.  The only attribute used by the Mac and Windows platforms
- *	is the user write flag; if this is not set, the file is
- *	made read-only.  Otehrwise, the file is made read-write.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Changes permissions of specified files.
- *
- *---------------------------------------------------------------------------
- */
- 
-static int
-TestchmodCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int i, mode;
-    char *rest;
-
-    if (argc < 2) {
-	usage:
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" mode file ?file ...?", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    mode = (int) strtol(argv[1], &rest, 8);
-    if ((rest == argv[1]) || (*rest != '\0')) {
-	goto usage;
-    }
-
-    for (i = 2; i < argc; i++) {
-        Tcl_DString buffer;
-        
-        argv[i] = Tcl_TranslateFileName(interp, argv[i], &buffer);
-        if (argv[i] == NULL) {
-            return TCL_ERROR;
-        }
-	if (chmod(argv[i], (unsigned) mode) != 0) {
-	    Tcl_AppendResult(interp, argv[i], ": ", Tcl_PosixError(interp),
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-        Tcl_DStringFree(&buffer);
-    }
-    return TCL_OK;
-}
-
-static int
-TestfileCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int force, i, j, result;
-    Tcl_DString error, name[2];
-    
-    if (argc < 3) {
-	return TCL_ERROR;
-    }
-
-    force = 0;
-    i = 2;
-    if (strcmp(argv[2], "-force") == 0) {
-        force = 1;
-	i = 3;
-    }
-
-    Tcl_DStringInit(&name[0]);
-    Tcl_DStringInit(&name[1]);
-    Tcl_DStringInit(&error);
-
-    if (argc - i > 2) {
-	return TCL_ERROR;
-    }
-
-    for (j = i; j < argc; j++) {
-        argv[j] = Tcl_TranslateFileName(interp, argv[j], &name[j - i]);
-	if (argv[j] == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-
-    if (strcmp(argv[1], "mv") == 0) {
-	result = TclpRenameFile(argv[i], argv[i + 1]);
-    } else if (strcmp(argv[1], "cp") == 0) {
-        result = TclpCopyFile(argv[i], argv[i + 1]);
-    } else if (strcmp(argv[1], "rm") == 0) {
-        result = TclpDeleteFile(argv[i]);
-    } else if (strcmp(argv[1], "mkdir") == 0) {
-        result = TclpCreateDirectory(argv[i]);
-    } else if (strcmp(argv[1], "cpdir") == 0) {
-        result = TclpCopyDirectory(argv[i], argv[i + 1], &error);
-    } else if (strcmp(argv[1], "rmdir") == 0) {
-        result = TclpRemoveDirectory(argv[i], force, &error);
-    } else {
-        result = TCL_ERROR;
-	goto end;
-    }
-	
-    if (result != TCL_OK) {
-	if (Tcl_DStringValue(&error)[0] != '\0') {
-	    Tcl_AppendResult(interp, Tcl_DStringValue(&error), " ", NULL);
-	}
-	Tcl_AppendResult(interp, Tcl_ErrnoId(), (char *) NULL);
-    }
-
-    end:
-    Tcl_DStringFree(&error);
-    Tcl_DStringFree(&name[0]);
-    Tcl_DStringFree(&name[1]);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestgetvarfullnameCmd --
- *
- *	Implements the "testgetvarfullname" cmd that is used when testing
- *	the Tcl_GetVariableFullName procedure.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetvarfullnameCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    char *name, *arg;
-    int flags = 0;
-    Tcl_Namespace *namespacePtr;
-    Tcl_CallFrame frame;
-    Tcl_Var variable;
-    int result;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "name scope");
-        return TCL_ERROR;
-    }
-    
-    name = Tcl_GetString(objv[1]);
-
-    arg = Tcl_GetString(objv[2]);
-    if (strcmp(arg, "global") == 0) {
-	flags = TCL_GLOBAL_ONLY;
-    } else if (strcmp(arg, "namespace") == 0) {
-	flags = TCL_NAMESPACE_ONLY;
-    }
-
-    /*
-     * This command, like any other created with Tcl_Create[Obj]Command,
-     * runs in the global namespace. As a "namespace-aware" command that
-     * needs to run in a particular namespace, it must activate that
-     * namespace itself.
-     */
-
-    if (flags == TCL_NAMESPACE_ONLY) {
-	namespacePtr = Tcl_FindNamespace(interp, "::test_ns_var",
-	        (Tcl_Namespace *) NULL, TCL_LEAVE_ERR_MSG);
-	if (namespacePtr == NULL) {
-	    return TCL_ERROR;
-	}
-	result = Tcl_PushCallFrame(interp, &frame, namespacePtr,
-                /*isProcCallFrame*/ 0);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    
-    variable = Tcl_FindNamespaceVar(interp, name, (Tcl_Namespace *) NULL,
-	    (flags | TCL_LEAVE_ERR_MSG));
-
-    if (flags == TCL_NAMESPACE_ONLY) {
-	Tcl_PopCallFrame(interp);
-    }
-    if (variable == (Tcl_Var) NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_GetVariableFullName(interp, variable, Tcl_GetObjResult(interp));
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetTimesCmd --
- *
- *	This procedure implements the "gettimes" command.  It is
- *	used for computing the time needed for various basic operations
- *	such as reading variables, allocating memory, sprintf, converting
- *	variables, etc.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Allocates and frees memory, sets a variable "a" in the interpreter.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetTimesCmd(unused, interp, argc, argv)
-    ClientData unused;		/* Unused. */
-    Tcl_Interp *interp;		/* The current interpreter. */
-    int argc;			/* The number of arguments. */
-    char **argv;		/* The argument strings. */
-{
-    Interp *iPtr = (Interp *) interp;
-    int i, n;
-    double timePer;
-    Tcl_Time start, stop;
-    Tcl_Obj *objPtr;
-    Tcl_Obj **objv;
-    char *s;
-    char newString[TCL_INTEGER_SPACE];
-
-    /* alloc & free 100000 times */
-    fprintf(stderr, "alloc & free 100000 6 word items\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	objPtr = (Tcl_Obj *) ckalloc(sizeof(Tcl_Obj));
-	ckfree((char *) objPtr);
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per alloc+free\n", timePer/100000);
-    
-    /* alloc 5000 times */
-    fprintf(stderr, "alloc 5000 6 word items\n");
-    objv = (Tcl_Obj **) ckalloc(5000 * sizeof(Tcl_Obj *));
-    TclpGetTime(&start);
-    for (i = 0;  i < 5000;  i++) {
-	objv[i] = (Tcl_Obj *) ckalloc(sizeof(Tcl_Obj));
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per alloc\n", timePer/5000);
-    
-    /* free 5000 times */
-    fprintf(stderr, "free 5000 6 word items\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 5000;  i++) {
-	ckfree((char *) objv[i]);
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per free\n", timePer/5000);
-
-    /* Tcl_NewObj 5000 times */
-    fprintf(stderr, "Tcl_NewObj 5000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 5000;  i++) {
-	objv[i] = Tcl_NewObj();
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_NewObj\n", timePer/5000);
-    
-    /* Tcl_DecrRefCount 5000 times */
-    fprintf(stderr, "Tcl_DecrRefCount 5000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 5000;  i++) {
-	objPtr = objv[i];
-	Tcl_DecrRefCount(objPtr);
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_DecrRefCount\n", timePer/5000);
-    ckfree((char *) objv);
-
-    /* TclGetString 100000 times */
-    fprintf(stderr, "TclGetStringFromObj of \"12345\" 100000 times\n");
-    objPtr = Tcl_NewStringObj("12345", -1);
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	(void) TclGetString(objPtr);
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per TclGetStringFromObj of \"12345\"\n",
-	    timePer/100000);
-
-    /* Tcl_GetIntFromObj 100000 times */
-    fprintf(stderr, "Tcl_GetIntFromObj of \"12345\" 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	if (Tcl_GetIntFromObj(interp, objPtr, &n) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_GetIntFromObj of \"12345\"\n",
-	    timePer/100000);
-    Tcl_DecrRefCount(objPtr);
-    
-    /* Tcl_GetInt 100000 times */
-    fprintf(stderr, "Tcl_GetInt of \"12345\" 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	if (Tcl_GetInt(interp, "12345", &n) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_GetInt of \"12345\"\n",
-	    timePer/100000);
-
-    /* sprintf 100000 times */
-    fprintf(stderr, "sprintf of 12345 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	sprintf(newString, "%d", 12345);
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per sprintf of 12345\n",
-	    timePer/100000);
-
-    /* hashtable lookup 100000 times */
-    fprintf(stderr, "hashtable lookup of \"gettimes\" 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	(void) Tcl_FindHashEntry(&iPtr->globalNsPtr->cmdTable, "gettimes");
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per hashtable lookup of \"gettimes\"\n",
-	    timePer/100000);
-
-    /* Tcl_SetVar 100000 times */
-    fprintf(stderr, "Tcl_SetVar of \"12345\" 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	s = Tcl_SetVar(interp, "a", "12345", TCL_LEAVE_ERR_MSG);
-	if (s == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_SetVar of a to \"12345\"\n",
-	    timePer/100000);
-
-    /* Tcl_GetVar 100000 times */
-    fprintf(stderr, "Tcl_GetVar of a==\"12345\" 100000 times\n");
-    TclpGetTime(&start);
-    for (i = 0;  i < 100000;  i++) {
-	s = Tcl_GetVar(interp, "a", TCL_LEAVE_ERR_MSG);
-	if (s == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-    TclpGetTime(&stop);
-    timePer = (stop.sec - start.sec)*1000000 + (stop.usec - start.usec);
-    fprintf(stderr, "   %.3f usec per Tcl_GetVar of a==\"12345\"\n",
-	    timePer/100000);
-    
-    Tcl_ResetResult(interp);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NoopCmd --
- *
- *	This procedure is just used to time the overhead involved in
- *	parsing and invoking a command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NoopCmd(unused, interp, argc, argv)
-    ClientData unused;		/* Unused. */
-    Tcl_Interp *interp;		/* The current interpreter. */
-    int argc;			/* The number of arguments. */
-    char **argv;		/* The argument strings. */
-{
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NoopObjCmd --
- *
- *	This object-based procedure is just used to time the overhead
- *	involved in parsing and invoking a command.
- *
- * Results:
- *	Returns the TCL_OK result code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-NoopObjCmd(unused, interp, objc, objv)
-    ClientData unused;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetCmd --
- *
- *	Implements the "testset{err,noerr}" cmds that are used when testing
- *	Tcl_Set/GetVar C Api with/without TCL_LEAVE_ERR_MSG flag
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *     Variables may be set.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestsetCmd(data, interp, argc, argv)
-    ClientData data;			/* Additional flags for Get/SetVar2. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int flags = (int) data;
-    char *value;
-
-    if (argc == 2) {
-        Tcl_SetResult(interp, "before get", TCL_STATIC);
-	value = Tcl_GetVar2(interp, argv[1], (char *) NULL, flags);
-        if (value == NULL) {
-            return TCL_ERROR;
-        }
-	Tcl_AppendElement(interp, value);
-        return TCL_OK;
-    } else if (argc == 3) {
-	Tcl_SetResult(interp, "before set", TCL_STATIC);
-        value = Tcl_SetVar2(interp, argv[1], (char *) NULL, argv[2], flags);
-        if (value == NULL) {
-            return TCL_ERROR;
-        }
-	Tcl_AppendElement(interp, value);
-	return TCL_OK;
-    } else {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " varName ?newValue?\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsaveresultCmd --
- *
- *	Implements the "testsaveresult" cmd that is used when testing
- *	the Tcl_SaveResult, Tcl_RestoreResult, and
- *	Tcl_DiscardResult interfaces.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TestsaveresultCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* The argument objects. */
-{
-    int discard, result, index;
-    Tcl_SavedResult state;
-    Tcl_Obj *objPtr;
-    static char *optionStrings[] = {
-	"append", "dynamic", "free", "object", "small", NULL
-    };
-    enum options {
-	RESULT_APPEND, RESULT_DYNAMIC, RESULT_FREE, RESULT_OBJECT, RESULT_SMALL
-    };
-
-    /*
-     * Parse arguments
-     */
-
-    if (objc != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "type script discard");
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], optionStrings, "option", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (Tcl_GetBooleanFromObj(interp, objv[3], &discard) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    objPtr = NULL;		/* Lint. */
-    switch ((enum options) index) {
-	case RESULT_SMALL:
-	    Tcl_SetResult(interp, "small result", TCL_VOLATILE);
-	    break;
-	case RESULT_APPEND:
-	    Tcl_AppendResult(interp, "append result", NULL);
-	    break;
-	case RESULT_FREE: {
-	    char *buf = ckalloc(200);
-	    strcpy(buf, "free result");
-	    Tcl_SetResult(interp, buf, TCL_DYNAMIC);
-	    break;
-	}
-	case RESULT_DYNAMIC:
-	    Tcl_SetResult(interp, "dynamic result", TestsaveresultFree);
-	    break;
-	case RESULT_OBJECT:
-	    objPtr = Tcl_NewStringObj("object result", -1);
-	    Tcl_SetObjResult(interp, objPtr);
-	    break;
-    }
-
-    freeCount = 0;
-    Tcl_SaveResult(interp, &state);
-
-    if (((enum options) index) == RESULT_OBJECT) {
-	result = Tcl_EvalObjEx(interp, objv[2], 0);
-    } else {
-	result = Tcl_Eval(interp, Tcl_GetString(objv[2]));
-    }
-
-    if (discard) {
-	Tcl_DiscardResult(&state);
-    } else {
-	Tcl_RestoreResult(interp, &state);
-	result = TCL_OK;
-    }
-
-    switch ((enum options) index) {
-	case RESULT_DYNAMIC: {
-	    int present = interp->freeProc == TestsaveresultFree;
-	    int called = freeCount;
-	    Tcl_AppendElement(interp, called ? "called" : "notCalled");
-	    Tcl_AppendElement(interp, present ? "present" : "missing");
-	    break;
-	}
-	case RESULT_OBJECT:
-	    Tcl_AppendElement(interp, Tcl_GetObjResult(interp) == objPtr
-		    ? "same" : "different");
-	    break;
-	default:
-	    break;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsaveresultFree --
- *
- *	Special purpose freeProc used by TestsaveresultCmd.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Increments the freeCount.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TestsaveresultFree(blockPtr)
-    char *blockPtr;
-{
-    freeCount++;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TeststatprocCmd  --
- *
- *	Implements the "testTclStatProc" cmd that is used to test the
- *	'TclStatInsertProc' & 'TclStatDeleteProc' C Apis.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TeststatprocCmd (dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    TclStatProc_ *proc;
-    int retVal;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option arg\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[2], "TclpStat") == 0) {
-	proc = TclpStat;
-    } else if (strcmp(argv[2], "TestStatProc1") == 0) {
-	proc = TestStatProc1;
-    } else if (strcmp(argv[2], "TestStatProc2") == 0) {
-	proc = TestStatProc2;
-    } else if (strcmp(argv[2], "TestStatProc3") == 0) {
-	proc = TestStatProc3;
-    } else {
-	Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		"must be TclpStat, ",
-		"TestStatProc1, TestStatProc2, or TestStatProc3",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1], "insert") == 0) {
-	if (proc == TclpStat) {
-	    Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		   "must be ",
-		   "TestStatProc1, TestStatProc2, or TestStatProc3",
-		   (char *) NULL);
-	    return TCL_ERROR;
-	}
-	retVal = TclStatInsertProc(proc);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	retVal = TclStatDeleteProc(proc);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
-		"must be insert or delete", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (retVal == TCL_ERROR) {
-	Tcl_AppendResult(interp, "\"", argv[2], "\": ",
-		"could not be ", argv[1], "ed", (char *) NULL);
-    }
-
-    return retVal;
-}
-
-/* Be careful in the compares in these tests, since the Macintosh puts a  
- * leading : in the beginning of non-absolute paths before passing them 
- * into the file command procedures.
- */
- 
-static int
-TestStatProc1(path, buf)
-    CONST char *path;
-    TclStat_ *buf;
-{
-    buf->st_size = 1234;
-    return ((strstr(path, "testStat1%.fil") == NULL) ? -1 : 0);
-}
-
-
-static int
-TestStatProc2(path, buf)
-    CONST char *path;
-    TclStat_ *buf;
-{
-    buf->st_size = 2345;
-    return ((strstr(path, "testStat2%.fil") == NULL) ? -1 : 0);
-}
-
-
-static int
-TestStatProc3(path, buf)
-    CONST char *path;
-    TclStat_ *buf;
-{
-    buf->st_size = 3456;
-    return ((strstr(path, "testStat3%.fil") == NULL) ? -1 : 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestaccessprocCmd  --
- *
- *	Implements the "testTclAccessProc" cmd that is used to test the
- *	'TclAccessInsertProc' & 'TclAccessDeleteProc' C Apis.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestaccessprocCmd (dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    TclAccessProc_ *proc;
-    int retVal;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option arg\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[2], "TclpAccess") == 0) {
-	proc = TclpAccess;
-    } else if (strcmp(argv[2], "TestAccessProc1") == 0) {
-	proc = TestAccessProc1;
-    } else if (strcmp(argv[2], "TestAccessProc2") == 0) {
-	proc = TestAccessProc2;
-    } else if (strcmp(argv[2], "TestAccessProc3") == 0) {
-	proc = TestAccessProc3;
-    } else {
-	Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		"must be TclpAccess, ",
-		"TestAccessProc1, TestAccessProc2, or TestAccessProc3",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1], "insert") == 0) {
-	if (proc == TclpAccess) {
-	    Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		   "must be ",
-		   "TestAccessProc1, TestAccessProc2, or TestAccessProc3",
-		   (char *) NULL);
-	    return TCL_ERROR;
-	}
-	retVal = TclAccessInsertProc(proc);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	retVal = TclAccessDeleteProc(proc);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
-		"must be insert or delete", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (retVal == TCL_ERROR) {
-	Tcl_AppendResult(interp, "\"", argv[2], "\": ",
-		"could not be ", argv[1], "ed", (char *) NULL);
-    }
-
-    return retVal;
-}
-
-
-static int
-TestAccessProc1(path, mode)
-    CONST char *path;
-    int mode;
-{
-    return ((strstr(path, "testAccess1%.fil") == NULL) ? -1 : 0);
-}
-
-
-static int
-TestAccessProc2(path, mode)
-    CONST char *path;
-    int mode;
-{
-    return ((strstr(path, "testAccess2%.fil") == NULL) ? -1 : 0);
-}
-
-
-static int
-TestAccessProc3(path, mode)
-    CONST char *path;
-    int mode;
-{
-    return ((strstr(path, "testAccess3%.fil") == NULL) ? -1 : 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestopenfilechannelprocCmd  --
- *
- *	Implements the "testTclOpenFileChannelProc" cmd that is used to test the
- *	'TclOpenFileChannelInsertProc' & 'TclOpenFileChannelDeleteProc' C Apis.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestopenfilechannelprocCmd (dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    TclOpenFileChannelProc_ *proc;
-    int retVal;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option arg\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[2], "TclpOpenFileChannel") == 0) {
-	proc = TclpOpenFileChannel;
-    } else if (strcmp(argv[2], "TestOpenFileChannelProc1") == 0) {
-	proc = TestOpenFileChannelProc1;
-    } else if (strcmp(argv[2], "TestOpenFileChannelProc2") == 0) {
-	proc = TestOpenFileChannelProc2;
-    } else if (strcmp(argv[2], "TestOpenFileChannelProc3") == 0) {
-	proc = TestOpenFileChannelProc3;
-    } else {
-	Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		"must be TclpOpenFileChannel, ",
-		"TestOpenFileChannelProc1, TestOpenFileChannelProc2, or ",
-		"TestOpenFileChannelProc3",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1], "insert") == 0) {
-	if (proc == TclpOpenFileChannel) {
-	    Tcl_AppendResult(interp, "bad arg \"", argv[1], "\": ",
-		   "must be ",
-		   "TestOpenFileChannelProc1, TestOpenFileChannelProc2, or ",
-		   "TestOpenFileChannelProc3",
-		   (char *) NULL);
-	    return TCL_ERROR;
-	}
-	retVal = TclOpenFileChannelInsertProc(proc);
-    } else if (strcmp(argv[1], "delete") == 0) {
-	retVal = TclOpenFileChannelDeleteProc(proc);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1], "\": ",
-		"must be insert or delete", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (retVal == TCL_ERROR) {
-	Tcl_AppendResult(interp, "\"", argv[2], "\": ",
-		"could not be ", argv[1], "ed", (char *) NULL);
-    }
-
-    return retVal;
-}
-
-
-static Tcl_Channel
-TestOpenFileChannelProc1(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;                 /* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;                     /* Name of file to open. */
-    char *modeString;                   /* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;                    /* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    if (!strcmp("testOpenFileChannel1%.fil", fileName)) {
-	return (TclpOpenFileChannel(interp, "__testOpenFileChannel1%__.fil",
-		modeString, permissions));
-    } else {
-	return (NULL);
-    }
-}
-
-
-static Tcl_Channel
-TestOpenFileChannelProc2(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;                 /* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;                     /* Name of file to open. */
-    char *modeString;                   /* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;                    /* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    if (!strcmp("testOpenFileChannel2%.fil", fileName)) {
-	return (TclpOpenFileChannel(interp, "__testOpenFileChannel2%__.fil",
-		modeString, permissions));
-    } else {
-	return (NULL);
-    }
-}
-
-
-static Tcl_Channel
-TestOpenFileChannelProc3(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;                 /* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;                     /* Name of file to open. */
-    char *modeString;                   /* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;                    /* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    if (!strcmp("testOpenFileChannel3%.fil", fileName)) {
-	return (TclpOpenFileChannel(interp, "__testOpenFileChannel3%__.fil",
-		modeString, permissions));
-    } else {
-	return (NULL);
-    }
-}
diff --git a/generic/tclTestObj.c b/generic/tclTestObj.c
deleted file mode 100644
index d604c5b..0000000
--- a/generic/tclTestObj.c
+++ /dev/null
@@ -1,1110 +0,0 @@
-/* 
- * tclTestObj.c --
- *
- *	This file contains C command procedures for the additional Tcl
- *	commands that are used for testing implementations of the Tcl object
- *	types. These commands are not normally included in Tcl
- *	applications; they're only used for testing.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclTestObj.c,v 1.3 1999/04/16 00:46:54 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * An array of Tcl_Obj pointers used in the commands that operate on or get
- * the values of Tcl object-valued variables. varPtr[i] is the i-th
- * variable's Tcl_Obj *.
- */
-
-#define NUMBER_OF_OBJECT_VARS 20
-static Tcl_Obj *varPtr[NUMBER_OF_OBJECT_VARS];
-
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-static int		CheckIfVarUnset _ANSI_ARGS_((Tcl_Interp *interp,
-			    int varIndex));
-static int		GetVariableIndex _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, int *indexPtr));
-static void		SetVarToObj _ANSI_ARGS_((int varIndex,
-			    Tcl_Obj *objPtr));
-int			TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-static int		TestbooleanobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestconvertobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestdoubleobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestindexobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestintobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TestobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-static int		TeststringobjCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclObjTest_Init --
- *
- *	This procedure creates additional commands that are used to test the
- *	Tcl object support.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Creates and registers several new testing commands.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjTest_Init(interp)
-    Tcl_Interp *interp;
-{
-    register int i;
-    
-    for (i = 0;  i < NUMBER_OF_OBJECT_VARS;  i++) {
-        varPtr[i] = NULL;
-    }
-	
-    Tcl_CreateObjCommand(interp, "testbooleanobj", TestbooleanobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testconvertobj", TestconvertobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testdoubleobj", TestdoubleobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testintobj", TestintobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testindexobj", TestindexobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "testobj", TestobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateObjCommand(interp, "teststringobj", TeststringobjCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestbooleanobjCmd --
- *
- *	This procedure implements the "testbooleanobj" command.  It is used
- *	to test the boolean Tcl object type implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees boolean objects, and also converts objects to
- *	have boolean type.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestbooleanobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int varIndex, boolValue;
-    char *index, *subCmd;
-
-    if (objc < 3) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    index = Tcl_GetString(objv[2]);
-    if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "set") == 0) {
-	if (objc != 4) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_GetBooleanFromObj(interp, objv[3], &boolValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * If the object currently bound to the variable with index varIndex
-	 * has ref count 1 (i.e. the object is unshared) we can modify that
-	 * object directly. Otherwise, if RC>1 (i.e. the object is shared),
-	 * we must create a new object to modify/set and decrement the old
-	 * formerly-shared object's ref count. This is "copy on write".
-	 */
-
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetBooleanObj(varPtr[varIndex], boolValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewBooleanObj(boolValue));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "get") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "not") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetBooleanFromObj(interp, varPtr[varIndex],
-				  &boolValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetBooleanObj(varPtr[varIndex], !boolValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewBooleanObj(!boolValue));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"", Tcl_GetString(objv[1]),
-		"\": must be set, get, or not", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestconvertobjCmd --
- *
- *	This procedure implements the "testconvertobj" command. It is used
- *	to test converting objects to new types.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Converts objects to new types.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestconvertobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    char *subCmd;
-    char buf[20];
-
-    if (objc < 3) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "double") == 0) {
-	double d;
-
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (Tcl_GetDoubleFromObj(interp, objv[2], &d) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	sprintf(buf, "%f", d);
-        Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"", Tcl_GetString(objv[1]),
-		"\": must be double", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestdoubleobjCmd --
- *
- *	This procedure implements the "testdoubleobj" command.  It is used
- *	to test the double-precision floating point Tcl object type
- *	implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees double objects, and also converts objects to
- *	have double type.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestdoubleobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int varIndex;
-    double doubleValue;
-    char *index, *subCmd, *string;
-	
-    if (objc < 3) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    index = Tcl_GetString(objv[2]);
-    if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "set") == 0) {
-	if (objc != 4) {
-	    goto wrongNumArgs;
-	}
-	string = Tcl_GetString(objv[3]);
-	if (Tcl_GetDouble(interp, string, &doubleValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * If the object currently bound to the variable with index varIndex
-	 * has ref count 1 (i.e. the object is unshared) we can modify that
-	 * object directly. Otherwise, if RC>1 (i.e. the object is shared),
-	 * we must create a new object to modify/set and decrement the old
-	 * formerly-shared object's ref count. This is "copy on write".
-	 */
-
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetDoubleObj(varPtr[varIndex], doubleValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewDoubleObj(doubleValue));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "get") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "mult10") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetDoubleFromObj(interp, varPtr[varIndex],
-				 &doubleValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetDoubleObj(varPtr[varIndex], (doubleValue * 10.0));
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewDoubleObj( (doubleValue * 10.0) ));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "div10") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetDoubleFromObj(interp, varPtr[varIndex],
-				 &doubleValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetDoubleObj(varPtr[varIndex], (doubleValue / 10.0));
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewDoubleObj( (doubleValue / 10.0) ));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"", Tcl_GetString(objv[1]),
-		"\": must be set, get, mult10, or div10", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestindexobjCmd --
- *
- *	This procedure implements the "testindexobj" command. It is used to
- *	test the index Tcl object type implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees int objects, and also converts objects to
- *	have int type.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestindexobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int allowAbbrev, index, index2, setError, i, result;
-    char **argv;
-    static char *tablePtr[] = {"a", "b", "check", (char *) NULL};
-
-    if ((objc == 3) && (strcmp(Tcl_GetString(objv[1]),
-	    "check") == 0)) {
-	/*
-	 * This code checks to be sure that the results of
-	 * Tcl_GetIndexFromObj are properly cached in the object and
-	 * returned on subsequent lookups.
-	 */
-
-	Tcl_GetIndexFromObj((Tcl_Interp *) NULL, objv[1], tablePtr,
-		"token", 0, &index);
-	if (Tcl_GetIntFromObj(interp, objv[2], &index2) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	objv[1]->internalRep.twoPtrValue.ptr2 = (VOID *) index2;
-	result = Tcl_GetIndexFromObj((Tcl_Interp *) NULL, objv[1],
-		tablePtr, "token", 0, &index);
-	if (result == TCL_OK) {
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), index);
-	}
-	return result;
-    }
-
-    if (objc < 5) {
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "wrong # args", -1);
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetBooleanFromObj(interp, objv[1], &setError) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (Tcl_GetBooleanFromObj(interp, objv[2], &allowAbbrev) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    argv = (char **) ckalloc((unsigned) ((objc-3) * sizeof(char *)));
-    for (i = 4; i < objc; i++) {
-	argv[i-4] = Tcl_GetString(objv[i]);
-    }
-    argv[objc-4] = NULL;
-    
-    /*
-     * Tcl_GetIndexFromObj assumes that the table is statically-allocated
-     * so that its address is different for each index object. If we
-     * accidently allocate a table at the same address as that cached in
-     * the index object, clear out the object's cached state.
-     */
-
-    if ((objv[3]->typePtr == Tcl_GetObjType("index"))
-	    && (objv[3]->internalRep.twoPtrValue.ptr1 == (VOID *) argv)) {
-	objv[3]->typePtr = NULL;
-    }
-
-    result = Tcl_GetIndexFromObj((setError? interp : NULL), objv[3],
-	    argv, "token", (allowAbbrev? 0 : TCL_EXACT), &index);
-    ckfree((char *) argv);
-    if (result == TCL_OK) {
-	Tcl_SetIntObj(Tcl_GetObjResult(interp), index);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestintobjCmd --
- *
- *	This procedure implements the "testintobj" command. It is used to
- *	test the int Tcl object type implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees int objects, and also converts objects to
- *	have int type.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestintobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int intValue, varIndex, i;
-    long longValue;
-    char *index, *subCmd, *string;
-	
-    if (objc < 3) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    index = Tcl_GetString(objv[2]);
-    if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "set") == 0) {
-	if (objc != 4) {
-	    goto wrongNumArgs;
-	}
-	string = Tcl_GetString(objv[3]);
-	if (Tcl_GetInt(interp, string, &i) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	intValue = i;
-
-	/*
-	 * If the object currently bound to the variable with index varIndex
-	 * has ref count 1 (i.e. the object is unshared) we can modify that
-	 * object directly. Otherwise, if RC>1 (i.e. the object is shared),
-	 * we must create a new object to modify/set and decrement the old
-	 * formerly-shared object's ref count. This is "copy on write".
-	 */
-
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetIntObj(varPtr[varIndex], intValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewIntObj(intValue));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "set2") == 0) { /* doesn't set result */
-	if (objc != 4) {
-	    goto wrongNumArgs;
-	}
-	string = Tcl_GetString(objv[3]);
-	if (Tcl_GetInt(interp, string, &i) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	intValue = i;
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetIntObj(varPtr[varIndex], intValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewIntObj(intValue));
-	}
-    } else if (strcmp(subCmd, "setlong") == 0) {
-	if (objc != 4) {
-	    goto wrongNumArgs;
-	}
-	string = Tcl_GetString(objv[3]);
-	if (Tcl_GetInt(interp, string, &i) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	intValue = i;
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetLongObj(varPtr[varIndex], intValue);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewLongObj(intValue));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "setmaxlong") == 0) {
-	long maxLong = LONG_MAX;
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetLongObj(varPtr[varIndex], maxLong);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewLongObj(maxLong));
-	}
-    } else if (strcmp(subCmd, "ismaxlong") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetLongFromObj(interp, varPtr[varIndex], &longValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp),
-	        ((longValue == LONG_MAX)? "1" : "0"), -1);
-    } else if (strcmp(subCmd, "get") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "get2") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	string = Tcl_GetString(varPtr[varIndex]);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), string, -1);
-    } else if (strcmp(subCmd, "inttoobigtest") == 0) {
-	/*
-	 * If long ints have more bits than ints on this platform, verify
-	 * that Tcl_GetIntFromObj returns an error if the long int held
-	 * in an integer object's internal representation is too large
-	 * to fit in an int.
-	 */
-	
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-#if (INT_MAX == LONG_MAX)   /* int is same size as long int */
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
-#else 
-	if ((varPtr[varIndex] != NULL) && !Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetLongObj(varPtr[varIndex], LONG_MAX);
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewLongObj(LONG_MAX));
-	}
-	if (Tcl_GetIntFromObj(interp, varPtr[varIndex], &i) != TCL_OK) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "1", -1);
-	    return TCL_OK;
-	}
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "0", -1);
-#endif
-    } else if (strcmp(subCmd, "mult10") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetIntFromObj(interp, varPtr[varIndex],
-			      &intValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetIntObj(varPtr[varIndex], (intValue * 10));
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewIntObj( (intValue * 10) ));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "div10") == 0) {
-	if (objc != 3) {
-	    goto wrongNumArgs;
-	}
-	if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	if (Tcl_GetIntFromObj(interp, varPtr[varIndex],
-			      &intValue) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (!Tcl_IsShared(varPtr[varIndex])) {
-	    Tcl_SetIntObj(varPtr[varIndex], (intValue / 10));
-	} else {
-	    SetVarToObj(varIndex, Tcl_NewIntObj( (intValue / 10) ));
-	}
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"", Tcl_GetString(objv[1]),
-		"\": must be set, get, get2, mult10, or div10",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestobjCmd --
- *
- *	This procedure implements the "testobj" command. It is used to test
- *	the type-independent portions of the Tcl object type implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees objects.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int varIndex, destIndex, i;
-    char *index, *subCmd, *string;
-    Tcl_ObjType *targetType;
-	
-    if (objc < 2) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    subCmd = Tcl_GetString(objv[1]);
-    if (strcmp(subCmd, "assign") == 0) {
-        if (objc != 4) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	string = Tcl_GetString(objv[3]);
-        if (GetVariableIndex(interp, string, &destIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        SetVarToObj(destIndex, varPtr[varIndex]);
-	Tcl_SetObjResult(interp, varPtr[destIndex]);
-     } else if (strcmp(subCmd, "convert") == 0) {
-        char *typeName;
-        if (objc != 4) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-        typeName = Tcl_GetString(objv[3]);
-        if ((targetType = Tcl_GetObjType(typeName)) == NULL) {
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "no type ", typeName, " found", (char *) NULL);
-            return TCL_ERROR;
-        }
-        if (Tcl_ConvertToType(interp, varPtr[varIndex], targetType)
-            != TCL_OK) {
-            return TCL_ERROR;
-        }
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "duplicate") == 0) {
-        if (objc != 4) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	string = Tcl_GetString(objv[3]);
-        if (GetVariableIndex(interp, string, &destIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        SetVarToObj(destIndex, Tcl_DuplicateObj(varPtr[varIndex]));
-	Tcl_SetObjResult(interp, varPtr[destIndex]);
-    } else if (strcmp(subCmd, "freeallvars") == 0) {
-        if (objc != 2) {
-            goto wrongNumArgs;
-        }
-        for (i = 0;  i < NUMBER_OF_OBJECT_VARS;  i++) {
-            if (varPtr[i] != NULL) {
-                Tcl_DecrRefCount(varPtr[i]);
-                varPtr[i] = NULL;
-            }
-        }
-    } else if (strcmp(subCmd, "newobj") == 0) {
-        if (objc != 3) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        SetVarToObj(varIndex, Tcl_NewObj());
-	Tcl_SetObjResult(interp, varPtr[varIndex]);
-    } else if (strcmp(subCmd, "refcount") == 0) {
-	char buf[TCL_INTEGER_SPACE];
-
-        if (objc != 3) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-	TclFormatInt(buf, varPtr[varIndex]->refCount);
-        Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(subCmd, "type") == 0) {
-        if (objc != 3) {
-            goto wrongNumArgs;
-        }
-        index = Tcl_GetString(objv[2]);
-        if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if (CheckIfVarUnset(interp, varIndex)) {
-	    return TCL_ERROR;
-	}
-        if (varPtr[varIndex]->typePtr == NULL) { /* a string! */
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), "string", -1);
-        } else {
-            Tcl_AppendToObj(Tcl_GetObjResult(interp),
-                    varPtr[varIndex]->typePtr->name, -1);
-        }
-    } else if (strcmp(subCmd, "types") == 0) {
-        if (objc != 2) {
-            goto wrongNumArgs;
-        }
-	if (Tcl_AppendAllObjTypes(interp, Tcl_GetObjResult(interp)) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"bad option \"",
-		Tcl_GetString(objv[1]),
-		"\": must be assign, convert, duplicate, freeallvars, ",
-		"newobj, objcount, refcount, type, or types",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TeststringobjCmd --
- *
- *	This procedure implements the "teststringobj" command. It is used to
- *	test the string Tcl object type implementation.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	Creates and frees string objects, and also converts objects to
- *	have string type.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TeststringobjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int varIndex, option, i, length;
-#define MAX_STRINGS 11
-    char *index, *string, *strings[MAX_STRINGS+1];
-    static char *options[] = {
-	"append", "appendstrings", "get", "get2", "length", "length2",
-	"set", "set2", "setlength", (char *) NULL
-    };
-
-    if (objc < 3) {
-	wrongNumArgs:
-	Tcl_WrongNumArgs(interp, 1, objv, "option arg ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    index = Tcl_GetString(objv[2]);
-    if (GetVariableIndex(interp, index, &varIndex) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &option)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-    switch (option) {
-	case 0:				/* append */
-	    if (objc != 5) {
-		goto wrongNumArgs;
-	    }
-	    if (Tcl_GetIntFromObj(interp, objv[4], &length) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (varPtr[varIndex] == NULL) {
-		SetVarToObj(varIndex, Tcl_NewObj());
-	    }
-	    
-	    /*
-	     * If the object bound to variable "varIndex" is shared, we must
-	     * "copy on write" and append to a copy of the object. 
-	     */
-	    
-	    if (Tcl_IsShared(varPtr[varIndex])) {
-		SetVarToObj(varIndex, Tcl_DuplicateObj(varPtr[varIndex]));
-	    }
-	    string = Tcl_GetString(objv[3]);
-	    Tcl_AppendToObj(varPtr[varIndex], string, length);
-	    Tcl_SetObjResult(interp, varPtr[varIndex]);
-	    break;
-	case 1:				/* appendstrings */
-	    if (objc > (MAX_STRINGS+3)) {
-		goto wrongNumArgs;
-	    }
-	    if (varPtr[varIndex] == NULL) {
-		SetVarToObj(varIndex, Tcl_NewObj());
-	    }
-
-	    /*
-	     * If the object bound to variable "varIndex" is shared, we must
-	     * "copy on write" and append to a copy of the object. 
-	     */
-
-	    if (Tcl_IsShared(varPtr[varIndex])) {
-		SetVarToObj(varIndex, Tcl_DuplicateObj(varPtr[varIndex]));
-	    }
-	    for (i = 3;  i < objc;  i++) {
-		strings[i-3] = Tcl_GetString(objv[i]);
-	    }
-	    for ( ; i < 12 + 3; i++) {
-		strings[i - 3] = NULL;
-	    }
-	    Tcl_AppendStringsToObj(varPtr[varIndex], strings[0], strings[1],
-		    strings[2], strings[3], strings[4], strings[5],
-		    strings[6], strings[7], strings[8], strings[9],
-		    strings[10], strings[11]);
-	    Tcl_SetObjResult(interp, varPtr[varIndex]);
-	    break;
-	case 2:				/* get */
-	    if (objc != 3) {
-		goto wrongNumArgs;
-	    }
-	    if (CheckIfVarUnset(interp, varIndex)) {
-		return TCL_ERROR;
-	    }
-	    Tcl_SetObjResult(interp, varPtr[varIndex]);
-	    break;
-	case 3:				/* get2 */
-	    if (objc != 3) {
-		goto wrongNumArgs;
-	    }
-	    if (CheckIfVarUnset(interp, varIndex)) {
-		return TCL_ERROR;
-	    }
-	    string = Tcl_GetString(varPtr[varIndex]);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp), string, -1);
-	    break;
-	case 4:				/* length */
-	    if (objc != 3) {
-		goto wrongNumArgs;
-	    }
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), (varPtr[varIndex] != NULL)
-		    ? varPtr[varIndex]->length : -1);
-	    break;
-	case 5:				/* length2 */
-	    if (objc != 3) {
-		goto wrongNumArgs;
-	    }
-	    Tcl_SetIntObj(Tcl_GetObjResult(interp), (varPtr[varIndex] != NULL)
-		    ? (int) varPtr[varIndex]->internalRep.longValue : -1);
-	    break;
-	case 6:				/* set */
-	    if (objc != 4) {
-		goto wrongNumArgs;
-	    }
-
-	    /*
-	     * If the object currently bound to the variable with index
-	     * varIndex has ref count 1 (i.e. the object is unshared) we
-	     * can modify that object directly. Otherwise, if RC>1 (i.e.
-	     * the object is shared), we must create a new object to
-	     * modify/set and decrement the old formerly-shared object's
-	     * ref count. This is "copy on write".
-	     */
-    
-	    string = Tcl_GetStringFromObj(objv[3], &length);
-	    if ((varPtr[varIndex] != NULL)
-		    && !Tcl_IsShared(varPtr[varIndex])) {
-		Tcl_SetStringObj(varPtr[varIndex], string, length);
-	    } else {
-		SetVarToObj(varIndex, Tcl_NewStringObj(string, length));
-	    }
-	    Tcl_SetObjResult(interp, varPtr[varIndex]);
-	    break;
-	case 7:				/* set2 */
-	    if (objc != 4) {
-		goto wrongNumArgs;
-	    }
-	    SetVarToObj(varIndex, objv[3]);
-	    break;
-	case 8:				/* setlength */
-	    if (objc != 4) {
-		goto wrongNumArgs;
-	    }
-	    if (Tcl_GetIntFromObj(interp, objv[3], &length) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (varPtr[varIndex] != NULL) {
-		Tcl_SetObjLength(varPtr[varIndex], length);
-	    }
-	    break;
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetVarToObj --
- *
- *	Utility routine to assign a Tcl_Obj* to a test variable. The
- *	Tcl_Obj* can be NULL.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This routine handles ref counting details for assignment:
- *	i.e. the old value's ref count must be decremented (if not NULL) and
- *	the new one incremented (also if not NULL).
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SetVarToObj(varIndex, objPtr)
-    int varIndex;		/* Designates the assignment variable. */
-    Tcl_Obj *objPtr;		/* Points to object to assign to var. */
-{
-    if (varPtr[varIndex] != NULL) {
-	Tcl_DecrRefCount(varPtr[varIndex]);
-    }
-    varPtr[varIndex] = objPtr;
-    if (objPtr != NULL) {
-	Tcl_IncrRefCount(objPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetVariableIndex --
- *
- *	Utility routine to get a test variable index from the command line.
- *
- * Results:
- *	A standard Tcl object result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetVariableIndex(interp, string, indexPtr)
-    Tcl_Interp *interp;         /* Interpreter for error reporting. */
-    char *string;               /* String containing a variable index
-				 * specified as a nonnegative number less
-				 * than NUMBER_OF_OBJECT_VARS. */
-    int *indexPtr;              /* Place to store converted result. */
-{
-    int index;
-    
-    if (Tcl_GetInt(interp, string, &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (index < 0 || index >= NUMBER_OF_OBJECT_VARS) {
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), "bad variable index", -1);
-	return TCL_ERROR;
-    }
-
-    *indexPtr = index;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckIfVarUnset --
- *
- *	Utility procedure that checks whether a test variable is readable:
- *	i.e., that varPtr[varIndex] is non-NULL.
- *
- * Results:
- *	1 if the test variable is unset (NULL); 0 otherwise.
- *
- * Side effects:
- *	Sets the interpreter result to an error message if the variable is
- *	unset (NULL).
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CheckIfVarUnset(interp, varIndex)
-    Tcl_Interp *interp;		/* Interpreter for error reporting. */
-    int varIndex;		/* Index of the test variable to check. */
-{
-    if (varPtr[varIndex] == NULL) {
-	char buf[32 + TCL_INTEGER_SPACE];
-	
-	sprintf(buf, "variable %d is unset (NULL)", varIndex);
-	Tcl_ResetResult(interp);
-	Tcl_AppendToObj(Tcl_GetObjResult(interp), buf, -1);
-	return 1;
-    }
-    return 0;
-}
diff --git a/generic/tclTestProcBodyObj.c b/generic/tclTestProcBodyObj.c
deleted file mode 100644
index 7d66e75..0000000
--- a/generic/tclTestProcBodyObj.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* 
- * tclTestProcBodyObj.c --
- *
- *	Implements the "procbodytest" package, which contains commands
- *	to test creation of Tcl procedures whose body argument is a
- *	Tcl_Obj of type "procbody" rather than a string.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclTestProcBodyObj.c,v 1.2 1998/11/10 06:54:44 jingham Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * name and version of this package
- */
-
-static char packageName[] = "procbodytest";
-static char packageVersion[] = "1.0";
-
-/*
- * Name of the commands exported by this package
- */
-
-static char procCommand[] = "proc";
-
-/*
- * this struct describes an entry in the table of command names and command
- * procs
- */
-
-typedef struct CmdTable
-{
-    char *cmdName;		/* command name */
-    Tcl_ObjCmdProc *proc;	/* command proc */
-    int exportIt;		/* if 1, export the command */
-} CmdTable;
-
-/*
- * Declarations for functions defined in this file.
- */
-
-static int	ProcBodyTestProcObjCmd _ANSI_ARGS_((ClientData dummy,
-			Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-static int	ProcBodyTestInitInternal _ANSI_ARGS_((Tcl_Interp *interp,
-			int isSafe));
-static int	RegisterCommand _ANSI_ARGS_((Tcl_Interp* interp,
-			char *namespace, CONST CmdTable *cmdTablePtr));
-int             Procbodytest_Init _ANSI_ARGS_((Tcl_Interp * interp));
-int             Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp * interp));
-
-/*
- * List of commands to create when the package is loaded; must go after the
- * declarations of the enable command procedure.
- */
-
-static CONST CmdTable commands[] =
-{
-    { procCommand,	ProcBodyTestProcObjCmd,	1 },
-
-    { 0, 0, 0 }
-};
-
-static CONST CmdTable safeCommands[] =
-{
-    { procCommand,	ProcBodyTestProcObjCmd,	1 },
-
-    { 0, 0, 0 }
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * Procbodytest_Init --
- *
- *  This procedure initializes the "procbodytest" package.
- *
- * Results:
- *  A standard Tcl result.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Procbodytest_Init(interp)
-    Tcl_Interp *interp;		/* the Tcl interpreter for which the package
-                                 * is initialized */
-{
-    return ProcBodyTestInitInternal(interp, 0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Procbodytest_SafeInit --
- *
- *  This procedure initializes the "procbodytest" package.
- *
- * Results:
- *  A standard Tcl result.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Procbodytest_SafeInit(interp)
-    Tcl_Interp *interp;		/* the Tcl interpreter for which the package
-                                 * is initialized */
-{
-    return ProcBodyTestInitInternal(interp, 1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RegisterCommand --
- *
- *  This procedure registers a command in the context of the given namespace.
- *
- * Results:
- *  A standard Tcl result.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-static int RegisterCommand(interp, namespace, cmdTablePtr)
-    Tcl_Interp* interp;			/* the Tcl interpreter for which the
-                                         * operation is performed */
-    char *namespace;			/* the namespace in which the command
-                                         * is registered */
-    CONST CmdTable *cmdTablePtr;	/* the command to register */
-{
-    char buf[128];
-
-    if (cmdTablePtr->exportIt) {
-        sprintf(buf, "namespace eval %s { namespace export %s }",
-                namespace, cmdTablePtr->cmdName);
-        if (Tcl_Eval(interp, buf) != TCL_OK)
-            return TCL_ERROR;
-    }
-    
-    sprintf(buf, "%s::%s", namespace, cmdTablePtr->cmdName);
-    Tcl_CreateObjCommand(interp, buf, cmdTablePtr->proc, 0, 0);
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodyTestInitInternal --
- *
- *  This procedure initializes the Loader package.
- *  The isSafe flag is 1 if the interpreter is safe, 0 otherwise.
- *
- * Results:
- *  A standard Tcl result.
- *
- * Side effects:
- *  None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcBodyTestInitInternal(interp, isSafe)
-    Tcl_Interp *interp;		/* the Tcl interpreter for which the package
-                                 * is initialized */
-    int isSafe;			/* 1 if this is a safe interpreter */
-{
-    CONST CmdTable *cmdTablePtr;
-
-    cmdTablePtr = (isSafe) ? &safeCommands[0] : &commands[0];
-    for ( ; cmdTablePtr->cmdName ; cmdTablePtr++) {
-        if (RegisterCommand(interp, packageName, cmdTablePtr) != TCL_OK) {
-            return TCL_ERROR;
-        }
-    }
-    
-    return Tcl_PkgProvide(interp, packageName, packageVersion);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcBodyTestProcObjCmd --
- *
- *  Implements the "procbodytest::proc" command. Here is the command
- *  description:
- *	procbodytest::proc newName argList bodyName
- *  Looks up a procedure called $bodyName and, if the procedure exists,
- *  constructs a Tcl_Obj of type "procbody" and calls Tcl_ProcObjCmd.
- *  Arguments:
- *    newName		the name of the procedure to be created
- *    argList		the argument list for the procedure
- *    bodyName		the name of an existing procedure from which the
- *			body is to be copied.
- *  This command can be used to trigger the branches in Tcl_ProcObjCmd that
- *  construct a proc from a "procbody", for example:
- *	proc a {x} {return $x}
- *	a 123
- *	procbodytest::proc b {x} a
- *  Note the call to "a 123", which is necessary so that the Proc pointer
- *  for "a" is filled in by the internal compiler; this is a hack.
- *
- * Results:
- *  Returns a standard Tcl code.
- *
- * Side effects:
- *  A new procedure is created.
- *  Leaves an error message in the interp's result on error.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ProcBodyTestProcObjCmd (dummy, interp, objc, objv)
-    ClientData dummy;		/* context; not used */
-    Tcl_Interp *interp;		/* the current interpreter */
-    int objc;			/* argument count */
-    Tcl_Obj *CONST objv[];	/* arguments */
-{
-    char *fullName;
-    Tcl_Command procCmd;
-    Command *cmdPtr;
-    Proc *procPtr = (Proc *) NULL;
-    Tcl_Obj *bodyObjPtr;
-    Tcl_Obj *myobjv[5];
-    int result;
-    
-    if (objc != 4) {
-	Tcl_WrongNumArgs(interp, 1, objv, "newName argsList bodyName");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Find the Command pointer to this procedure
-     */
-    
-    fullName = Tcl_GetStringFromObj(objv[3], (int *) NULL);
-    procCmd = Tcl_FindCommand(interp, fullName, (Tcl_Namespace *) NULL,
-            TCL_LEAVE_ERR_MSG);
-    if (procCmd == NULL) {
-        return TCL_ERROR;
-    }
-
-    cmdPtr = (Command *) procCmd;
-
-    /*
-     * check that this is a procedure and not a builtin command:
-     * If a procedure, cmdPtr->objProc is either 0 or TclObjInterpProc,
-     * and cmdPtr->proc is either 0 or TclProcInterpProc.
-     * Also, the compile proc should be 0, but we don't check for that.
-     */
-
-    if (((cmdPtr->objProc != NULL)
-            && (cmdPtr->objProc != TclGetObjInterpProc()))
-            || ((cmdPtr->proc != NULL)
-                    && (cmdPtr->proc != TclGetInterpProc()))) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"command \"", fullName,
-		"\" is not a Tcl procedure", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * it is a Tcl procedure: the client data is the Proc structure
-     */
-    
-    if (cmdPtr->objProc != NULL) {
-        procPtr = (Proc *) cmdPtr->objClientData;
-    } else if (cmdPtr->proc != NULL) {
-        procPtr = (Proc *) cmdPtr->clientData;
-    }
-
-    if (procPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"procedure \"", fullName,
-		"\" does not have a Proc struct!", (char *) NULL);
-        return TCL_ERROR;
-    }
-        
-    /*
-     * create a new object, initialize our argument vector, call into Tcl
-     */
-
-    bodyObjPtr = TclNewProcBodyObj(procPtr);
-    if (bodyObjPtr == NULL) {
-        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"failed to create a procbody object for procedure \"",
-                fullName, "\"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    Tcl_IncrRefCount(bodyObjPtr);
-
-    myobjv[0] = objv[0];
-    myobjv[1] = objv[1];
-    myobjv[2] = objv[2];
-    myobjv[3] = bodyObjPtr;
-    myobjv[4] = (Tcl_Obj *) NULL;
-
-    result = Tcl_ProcObjCmd((ClientData) NULL, interp, objc, myobjv);
-    Tcl_DecrRefCount(bodyObjPtr);
-
-    return result;
-}
diff --git a/generic/tclThread.c b/generic/tclThread.c
deleted file mode 100644
index 2dcd832..0000000
--- a/generic/tclThread.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/* 
- * tclThread.c --
- *
- *	This file implements   Platform independent thread operations.
- *	Most of the real work is done in the platform dependent files.
- *
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclThread.c,v 1.2 1999/04/16 00:46:54 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * There are three classes of synchronization objects:
- * mutexes, thread data keys, and condition variables.
- * The following are used to record the memory used for these
- * objects so they can be finalized.
- *
- * These statics are guarded by the mutex in the caller of
- * TclRememberThreadData, e.g., TclpThreadDataKeyInit
- */
-
-typedef struct {
-    int num;		/* Number of objects remembered */
-    int max;		/* Max size of the array */
-    char **list;	/* List of pointers */
-} SyncObjRecord;
-
-static SyncObjRecord keyRecord;
-static SyncObjRecord mutexRecord;
-static SyncObjRecord condRecord;
-
-/*
- * Prototypes of functions used only in this file
- */
- 
-static void		RememberSyncObject _ANSI_ARGS_((char *objPtr,
-			    SyncObjRecord *recPtr));
-static void		ForgetSyncObject _ANSI_ARGS_((char *objPtr,
-			    SyncObjRecord *recPtr));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetThreadData --
- *
- *	This procedure allocates and initializes a chunk of thread
- *	local storage.
- *
- * Results:
- *	A thread-specific pointer to the data structure.
- *
- * Side effects:
- *	Will allocate memory the first time this thread calls for
- *	this chunk of storage.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-Tcl_GetThreadData(keyPtr, size)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk */
-    int size;			/* Size of storage block */
-{
-    VOID *result;
-#ifdef TCL_THREADS
-
-    /*
-     * See if this is the first thread to init this key.
-     */
-
-    if (*keyPtr == NULL) {
-	TclpThreadDataKeyInit(keyPtr);
-    }
-
-    /*
-     * Initialize the key for this thread.
-     */
-
-    result = TclpThreadDataKeyGet(keyPtr);
-    if (result == NULL) {
-	result  = (VOID *)ckalloc((size_t)size);
-	memset(result, 0, (size_t)size);
-	TclpThreadDataKeySet(keyPtr, result);
-    }
-#else
-    if (*keyPtr == NULL) {
-	result = (VOID *)ckalloc((size_t)size);
-	memset((char *)result, 0, (size_t)size);
-	*keyPtr = (Tcl_ThreadDataKey)result;
-	TclRememberDataKey(keyPtr);
-    }
-    result = *(VOID **)keyPtr;
-#endif
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclThreadDataKeyGet --
- *
- *	This procedure returns a pointer to a block of thread local storage.
- *
- * Results:
- *	A thread-specific pointer to the data structure, or NULL
- *	if the memory has not been assigned to this key for this thread.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclThreadDataKeyGet(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-{
-#ifdef TCL_THREADS
-    return (VOID *)TclpThreadDataKeyGet(keyPtr);
-#else
-    char *result = *(char **)keyPtr;
-    return (VOID *)result;
-#endif /* TCL_THREADS */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclThreadDataKeySet --
- *
- *	This procedure sets a thread local storage pointer.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The assigned value will be returned by TclpThreadDataKeyGet.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclThreadDataKeySet(keyPtr, data)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-    VOID *data;			/* Thread local storage */
-{
-#ifdef TCL_THREADS
-    if (*keyPtr == NULL) {
-	TclpThreadDataKeyInit(keyPtr);
-    }
-    TclpThreadDataKeySet(keyPtr, data);
-#else
-    *keyPtr = (Tcl_ThreadDataKey)data;
-#endif /* TCL_THREADS */
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * RememberSyncObject
- *
- *      Keep a list of (mutexes/condition variable/data key)
- *	used during finalization.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Add to the appropriate list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-RememberSyncObject(objPtr, recPtr)
-    char *objPtr;		/* Pointer to sync object */
-    SyncObjRecord *recPtr;	/* Record of sync objects */
-{
-    char **newList;
-    int i, j;
-
-    /*
-     * Save the pointer to the allocated object so it can be finalized.
-     * Grow the list of pointers if necessary, copying only non-NULL
-     * pointers to the new list.
-     */
-
-    if (recPtr->num >= recPtr->max) {
-	recPtr->max += 8;
-	newList = (char **)ckalloc(recPtr->max * sizeof(char *));
-	for (i=0,j=0 ; i<recPtr->num ; i++) {
-            if (recPtr->list[i] != NULL) {
-		newList[j++] = recPtr->list[i];
-            }
-	}
-	if (recPtr->list != NULL) {
-	    ckfree((char *)recPtr->list);
-	}
-	recPtr->list = newList;
-	recPtr->num = j;
-    }
-    recPtr->list[recPtr->num] = objPtr;
-    recPtr->num++;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ForgetSyncObject
- *
- *      Remove a single object from the list.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Remove from the appropriate list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ForgetSyncObject(objPtr, recPtr)
-    char *objPtr;		/* Pointer to sync object */
-    SyncObjRecord *recPtr;	/* Record of sync objects */
-{
-    int i;
-
-    for (i=0 ; i<recPtr->num ; i++) {
-	if (objPtr == recPtr->list[i]) {
-	    recPtr->list[i] = NULL;
-	    return;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRememberMutex
- *
- *      Keep a list of mutexes used during finalization.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Add to the mutex list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclRememberMutex(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-    RememberSyncObject((char *)mutexPtr, &mutexRecord);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeMutex
- *
- *      Finalize a single mutex and remove it from the
- *	list of remembered objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Remove the mutex from the list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeMutex(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-#ifdef TCL_THREADS
-    TclpFinalizeMutex(mutexPtr);
-#endif
-    ForgetSyncObject((char *)mutexPtr, &mutexRecord);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRememberDataKey
- *
- *      Keep a list of thread data keys used during finalization.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Add to the key list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclRememberDataKey(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    RememberSyncObject((char *)keyPtr, &keyRecord);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclRememberCondition
- *
- *      Keep a list of condition variables used during finalization.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Add to the condition variable list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclRememberCondition(condPtr)
-    Tcl_Condition *condPtr;
-{
-    RememberSyncObject((char *)condPtr, &condRecord);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeCondition
- *
- *      Finalize a single condition variable and remove it from the
- *	list of remembered objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Remove the condition variable from the list.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeCondition(condPtr)
-    Tcl_Condition *condPtr;
-{
-#ifdef TCL_THREADS
-    TclpFinalizeCondition(condPtr);
-#endif
-    ForgetSyncObject((char *)condPtr, &condRecord);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeThreadData --
- *
- *	This procedure cleans up the thread-local storage.  This is
- *	called once for each thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees up all thread local storage.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeThreadData()
-{
-    int i;
-    Tcl_ThreadDataKey *keyPtr;
-
-    TclpMasterLock();
-    for (i=0 ; i<keyRecord.num ; i++) {
-	keyPtr = (Tcl_ThreadDataKey *) keyRecord.list[i];
-#ifdef TCL_THREADS
-	TclpFinalizeThreadData(keyPtr);
-#else
-	if (*keyPtr != NULL) {
-	    ckfree((char *)*keyPtr);
-	    *keyPtr = NULL;
-	}
-#endif
-    }
-    TclpMasterUnlock();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFinalizeSyncronization --
- *
- *      This procedure cleans up all synchronization objects:
- *      mutexes, condition variables, and thread-local storage.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees up the memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclFinalizeSynchronization()
-{
-#ifdef TCL_THREADS
-    Tcl_ThreadDataKey *keyPtr;
-    Tcl_Mutex *mutexPtr;
-    Tcl_Condition *condPtr;
-    int i;
-
-    TclpMasterLock();
-    for (i=0 ; i<keyRecord.num ; i++) {
-	keyPtr = (Tcl_ThreadDataKey *)keyRecord.list[i];
-	TclpFinalizeThreadDataKey(keyPtr);
-    }
-    if (keyRecord.list != NULL) {
-	ckfree((char *)keyRecord.list);
-	keyRecord.list = NULL;
-    }
-    keyRecord.max = 0;
-    keyRecord.num = 0;
-
-    for (i=0 ; i<mutexRecord.num ; i++) {
-	mutexPtr = (Tcl_Mutex *)mutexRecord.list[i];
-	if (mutexPtr != NULL) {
-	    TclpFinalizeMutex(mutexPtr);
-	}
-    }
-    if (mutexRecord.list != NULL) {
-	ckfree((char *)mutexRecord.list);
-	mutexRecord.list = NULL;
-    }
-    mutexRecord.max = 0;
-    mutexRecord.num = 0;
-
-    for (i=0 ; i<condRecord.num ; i++) {
-	condPtr = (Tcl_Condition *)condRecord.list[i];
-	if (condPtr != NULL) {
-	    TclpFinalizeCondition(condPtr);
-	}
-    }
-    if (condRecord.list != NULL) {
-	ckfree((char *)condRecord.list);
-	condRecord.list = NULL;
-    }
-    condRecord.max = 0;
-    condRecord.num = 0;
-
-    TclpMasterUnlock();
-#else
-    if (keyRecord.list != NULL) {
-	ckfree((char *)keyRecord.list);
-	keyRecord.list = NULL;
-    }
-    keyRecord.max = 0;
-    keyRecord.num = 0;
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ExitThread --
- *
- *	This procedure is called to terminate the current thread.
- *	This should be used by extensions that create threads with
- *	additional interpreters in them.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	All thread exit handlers are invoked, then the thread dies.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ExitThread(status)
-    int status;
-{
-    Tcl_FinalizeThread();
-#ifdef TCL_THREADS
-    TclpThreadExit(status);
-#endif
-}
-
-#ifndef TCL_THREADS
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionWait, et al. --
- *
- *	These noop procedures are provided so the stub table does
- *	not have to be conditionalized for threads.  The real
- *	implementations of these functions live in the platform
- *	specific files.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-#undef Tcl_ConditionWait
-void
-Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-    Tcl_Condition *condPtr;	/* Really (pthread_cond_t **) */
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-    Tcl_Time *timePtr;		/* Timeout on waiting period */
-{
-}
-
-#undef Tcl_ConditionNotify
-void
-Tcl_ConditionNotify(condPtr)
-    Tcl_Condition *condPtr;
-{
-}
-
-#undef Tcl_MutexLock
-void
-Tcl_MutexLock(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-}
-
-#undef Tcl_MutexUnlock
-void
-Tcl_MutexUnlock(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-}
-#endif
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
deleted file mode 100644
index 0acba19..0000000
--- a/generic/tclThreadTest.c
+++ /dev/null
@@ -1,898 +0,0 @@
-/* 
- * tclThreadTest.c --
- *
- *	This file implements the testthread command.  Eventually this
- *	should be tclThreadCmd.c
- *	Some of this code is based on work done by Richard Hipp on behalf of
- *	Conservation Through Innovation, Limited, with their permission.
- *
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclThreadTest.c,v 1.2 1999/04/16 00:46:54 stanton Exp $
- */
-
-#include "tclInt.h"
-
-#ifdef TCL_THREADS
-/*
- * Each thread has an single instance of the following structure.  There
- * is one instance of this structure per thread even if that thread contains
- * multiple interpreters.  The interpreter identified by this structure is
- * the main interpreter for the thread.  
- *
- * The main interpreter is the one that will process any messages 
- * received by a thread.  Any thread can send messages but only the
- * main interpreter can receive them.
- */
-
-typedef struct ThreadSpecificData {
-    Tcl_ThreadId  threadId;          /* Tcl ID for this thread */
-    Tcl_Interp *interp;              /* Main interpreter for this thread */
-    int flags;                       /* See the TP_ defines below... */
-    struct ThreadSpecificData *nextPtr;	/* List for "thread names" */
-    struct ThreadSpecificData *prevPtr;	/* List for "thread names" */
-} ThreadSpecificData;
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * This list is used to list all threads that have interpreters.
- * This is protected by threadMutex.
- */
-
-static struct ThreadSpecificData *threadList;
-
-/*
- * The following bit-values are legal for the "flags" field of the
- * ThreadSpecificData structure.
- */
-#define TP_Dying               0x001 /* This thread is being cancelled */
-
-/*
- * An instance of the following structure contains all information that is
- * passed into a new thread when the thread is created using either the
- * "thread create" Tcl command or the TclCreateThread() C function.
- */
-
-typedef struct ThreadCtrl {
-    char *script;    /* The TCL command this thread should execute */
-    int flags;        /* Initial value of the "flags" field in the 
-                       * ThreadSpecificData structure for the new thread.
-                       * Might contain TP_Detached or TP_TclThread. */
-    Tcl_Condition condWait;
-    /* This condition variable is used to synchronize
-     * the parent and child threads.  The child won't run
-     * until it acquires threadMutex, and the parent function
-     * won't complete until signaled on this condition
-     * variable. */
-} ThreadCtrl;
-
-/*
- * This is the event used to send scripts to other threads.
- */
-
-typedef struct ThreadEvent {
-    Tcl_Event event;		/* Must be first */
-    char *script;		/* The script to execute. */
-    struct ThreadEventResult *resultPtr;
-				/* To communicate the result.  This is
-				 * NULL if we don't care about it. */
-} ThreadEvent;
-
-typedef struct ThreadEventResult {
-    Tcl_Condition done;		/* Signaled when the script completes */
-    int code;			/* Return value of Tcl_Eval */
-    char *result;		/* Result from the script */
-    char *errorInfo;		/* Copy of errorInfo variable */
-    char *errorCode;		/* Copy of errorCode variable */
-    Tcl_ThreadId srcThreadId;	/* Id of sending thread, in case it dies */
-    Tcl_ThreadId dstThreadId;	/* Id of target thread, in case it dies */
-    struct ThreadEvent *eventPtr;	/* Back pointer */
-    struct ThreadEventResult *nextPtr;	/* List for cleanup */
-    struct ThreadEventResult *prevPtr;
-
-} ThreadEventResult;
-
-static ThreadEventResult *resultList;
-
-/*
- * This is for simple error handling when a thread script exits badly.
- */
-
-static Tcl_ThreadId errorThreadId;
-static char *errorProcString;
-
-/* 
- * Access to the list of threads and to the thread send results is
- * guarded by this mutex. 
- */
-
-TCL_DECLARE_MUTEX(threadMutex)
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-EXTERN int	TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int	Tcl_ThreadObjCmd _ANSI_ARGS_((ClientData clientData,
-	Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]));
-EXTERN int	TclCreateThread _ANSI_ARGS_((Tcl_Interp *interp,
-	CONST char *script));
-EXTERN int	TclThreadList _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int	TclThreadSend _ANSI_ARGS_((Tcl_Interp *interp, Tcl_ThreadId id,
-	char *script, int wait));
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
-#ifdef MAC_TCL
-static pascal void *NewThread _ANSI_ARGS_((ClientData clientData));
-#else
-static void     NewThread _ANSI_ARGS_((ClientData clientData));
-#endif
-static void	ListRemove _ANSI_ARGS_((ThreadSpecificData *tsdPtr));
-static void	ListUpdateInner _ANSI_ARGS_((ThreadSpecificData *tsdPtr));
-static int	ThreadEventProc _ANSI_ARGS_((Tcl_Event *evPtr, int mask));
-static void	ThreadErrorProc _ANSI_ARGS_((Tcl_Interp *interp));
-static void	ThreadExitProc _ANSI_ARGS_((ClientData clientData));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclThread_Init --
- *
- *	Initialize the test thread command.
- *
- * Results:
- *      TCL_OK if the package was properly initialized.
- *
- * Side effects:
- *	Add the "testthread" command to the interp.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclThread_Init(interp)
-    Tcl_Interp *interp; /* The current Tcl interpreter */
-{
-    
-    Tcl_CreateObjCommand(interp,"testthread", Tcl_ThreadObjCmd, 
-	    (ClientData)NULL ,NULL);
-    if (Tcl_PkgProvide(interp, "Thread", "1.0" ) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ThreadObjCmd --
- *
- *	This procedure is invoked to process the "testthread" Tcl command.
- *	See the user documentation for details on what it does.
- *
- *	thread create
- *	thread send id ?-async? script
- *	thread exit
- *	thread info id
- *	thread names
- *	thread wait
- *	thread errorproc proc
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ThreadObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    int option;
-    static char *threadOptions[] = {"create", "exit", "id", "names",
-				    "send", "wait", "errorproc", (char *) NULL};
-    enum options {THREAD_CREATE, THREAD_EXIT, THREAD_ID, THREAD_NAMES,
-		  THREAD_SEND, THREAD_WAIT, THREAD_ERRORPROC};
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?args?");
-	return TCL_ERROR;
-    }
-    if (Tcl_GetIndexFromObj(interp, objv[1], threadOptions,
-	    "option", 0, &option) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    /* 
-     * Make sure the initial thread is on the list before doing anything.
-     */
-
-    if (tsdPtr->interp == NULL) {
-	Tcl_MutexLock(&threadMutex);
-	tsdPtr->interp = interp;
-	ListUpdateInner(tsdPtr);
-	Tcl_CreateThreadExitHandler(ThreadExitProc, NULL);
-	Tcl_MutexUnlock(&threadMutex);
-    }
-
-    switch ((enum options)option) {
-	case THREAD_CREATE: {
-	    char *script;
-	    if (objc == 2) {
-		script = "testthread wait";	/* Just enter the event loop */
-	    } else if (objc == 3) {
-		script = Tcl_GetString(objv[2]);
-	    } else {
-		Tcl_WrongNumArgs(interp, 2, objv, "?script?");
-		return TCL_ERROR;
-	    }
-	    return TclCreateThread(interp, script);
-	}
-	case THREAD_EXIT: {
-	    if (objc > 2) {
-		Tcl_WrongNumArgs(interp, 1, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    ListRemove(NULL);
-	    Tcl_ExitThread(0);
-	    return TCL_OK;
-	}
-	case THREAD_ID:
-	    if (objc == 2) {
-		Tcl_Obj *idObj = Tcl_NewIntObj((int)Tcl_GetCurrentThread());
-		Tcl_SetObjResult(interp, idObj);
-		return TCL_OK;
-	    } else {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	case THREAD_NAMES: {
-	    if (objc > 2) {
-		Tcl_WrongNumArgs(interp, 2, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    return TclThreadList(interp);
-	}
-	case THREAD_SEND: {
-	    int id;
-	    char *script;
-	    int wait, arg;
-
-	    if ((objc != 4) && (objc != 5)) {
-		Tcl_WrongNumArgs(interp, 1, objv, "send ?-async? id script");
-		return TCL_ERROR;
-	    }
-	    if (objc == 5) {
-		if (strcmp("-async", Tcl_GetString(objv[2])) != 0) {
-		    Tcl_WrongNumArgs(interp, 1, objv, "send ?-async? id script");
-		    return TCL_ERROR;
-		}
-		wait = 0;
-		arg = 3;
-	    } else {
-		wait = 1;
-		arg = 2;
-	    }
-	    if (Tcl_GetIntFromObj(interp, objv[arg], &id) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    arg++;
-	    script = Tcl_GetString(objv[arg]);
-	    return TclThreadSend(interp, (Tcl_ThreadId) id, script, wait);
-	}
-	case THREAD_WAIT: {
-	    while (1) {
-		(void) Tcl_DoOneEvent(TCL_ALL_EVENTS);
-	    }
-	}
-	case THREAD_ERRORPROC: {
-	    /*
-	     * Arrange for this proc to handle thread death errors.
-	     */
-
-	    char *proc;
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 1, objv, "errorproc proc");
-		return TCL_ERROR;
-	    }
-	    Tcl_MutexLock(&threadMutex);
-	    errorThreadId = Tcl_GetCurrentThread();
-	    if (errorProcString) {
-		ckfree(errorProcString);
-	    }
-	    proc = Tcl_GetString(objv[2]);
-	    errorProcString = ckalloc(strlen(proc)+1);
-	    strcpy(errorProcString, proc);
-	    Tcl_MutexUnlock(&threadMutex);
-	    return TCL_OK;
-	}
-    }
-    return TCL_OK;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCreateThread --
- *
- *	This procedure is invoked to create a thread containing an interp to
- *	run a script.  This returns after the thread has started executing.
- *
- * Results:
- *	A standard Tcl result, which is the thread ID.
- *
- * Side effects:
- *	Create a thread.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-TclCreateThread(interp, script)
-    Tcl_Interp *interp;			/* Current interpreter. */
-    CONST char *script;			/* Script to execute */
-{
-    ThreadCtrl ctrl;
-    Tcl_ThreadId id;
-
-    ctrl.script = (char*)ckalloc( strlen(script) + 1 );
-    strcpy(ctrl.script, script);
-    ctrl.condWait = NULL;
-    ctrl.flags = 0;
-
-    Tcl_MutexLock(&threadMutex);
-    if (TclpThreadCreate(&id, NewThread, (ClientData) &ctrl) != TCL_OK) {
-	Tcl_MutexUnlock(&threadMutex);
-        Tcl_AppendResult(interp,"can't create a new thread",0);
-	ckfree((void*)ctrl.script);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Wait for the thread to start because it is using something on our stack!
-     */
-
-    Tcl_ConditionWait(&ctrl.condWait, &threadMutex, NULL);
-    Tcl_MutexUnlock(&threadMutex);
-    TclFinalizeCondition(&ctrl.condWait);
-    Tcl_SetObjResult(interp, Tcl_NewIntObj((int)id));
-    return TCL_OK;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * NewThread --
- *
- *    This routine is the "main()" for a new thread whose task is to
- *    execute a single TCL script.  The argument to this function is
- *    a pointer to a structure that contains the text of the TCL script
- *    to be executed.
- *
- *    Space to hold the script field of the ThreadControl structure passed 
- *    in as the only argument was obtained from malloc() and must be freed 
- *    by this function before it exits.  Space to hold the ThreadControl
- *    structure itself is released by the calling function, and the
- *    two condition variables in the ThreadControl structure are destroyed
- *    by the calling function.  The calling function will destroy the
- *    ThreadControl structure and the condition variable as soon as
- *    ctrlPtr->condWait is signaled, so this routine must make copies of
- *    any data it might need after that point.
- *
- * Results:
- *    none
- *
- * Side effects:
- *    A TCL script is executed in a new thread.
- *
- *------------------------------------------------------------------------
- */
-#ifdef MAC_TCL
-static pascal void *
-#else
-static void
-#endif
-NewThread(clientData)
-    ClientData clientData;
-{
-    ThreadCtrl *ctrlPtr = (ThreadCtrl*)clientData;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    ThreadCtrl ctrl;
-    int result;
-
-    ctrl = *ctrlPtr;
-
-    /*
-     * Initialize the interpreter.  This should be more general.
-     */
-
-    tsdPtr->interp = Tcl_CreateInterp();
-    result = Tcl_Init(tsdPtr->interp);
-    result = TclThread_Init(tsdPtr->interp);
-
-    /*
-     * Update the list of threads.
-     */
-
-    Tcl_MutexLock(&threadMutex);
-    ListUpdateInner(tsdPtr);
-    Tcl_CreateThreadExitHandler(ThreadExitProc, NULL);
-
-    /*
-     * Notify the parent we are alive.
-     */
-
-    Tcl_ConditionNotify(&ctrlPtr->condWait);
-    Tcl_MutexUnlock(&threadMutex);
-
-    /*
-     * Run the script.
-     */
-
-    Tcl_Preserve((ClientData) tsdPtr->interp);
-    result = Tcl_Eval(tsdPtr->interp, ctrl.script);
-    if (result != TCL_OK) {
-	ThreadErrorProc(tsdPtr->interp);
-    }
-
-    /*
-     * Clean up.
-     */
-
-    ListRemove(tsdPtr);
-    ckfree((char*)ctrl.script);
-    Tcl_Release((ClientData) tsdPtr->interp);
-    Tcl_DeleteInterp(tsdPtr->interp);
-    Tcl_ExitThread(result);
-#ifdef MAC_TCL
-    return NULL;
-#endif
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * ThreadErrorProc --
- *
- *    Send a message to the thread willing to hear about errors.
- *
- * Results:
- *    none
- *
- * Side effects:
- *    Send an event.
- *
- *------------------------------------------------------------------------
- */
-static void
-ThreadErrorProc(interp)
-    Tcl_Interp *interp;		/* Interp that failed */
-{
-    Tcl_Channel errChannel;
-    char *errorInfo, *script;
-    char *argv[3];
-    char buf[10];
-    sprintf(buf, "%ld", (long) Tcl_GetCurrentThread());
-
-    errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-    if (errorProcString == NULL) {
-	errChannel = Tcl_GetStdChannel(TCL_STDERR);
-	Tcl_WriteChars(errChannel, "Error from thread ", -1);
-	Tcl_WriteChars(errChannel, buf, -1);
-	Tcl_WriteChars(errChannel, "\n", 1);
-	Tcl_WriteChars(errChannel, errorInfo, -1);
-	Tcl_WriteChars(errChannel, "\n", 1);
-    } else {
-	argv[0] = errorProcString;
-	argv[1] = buf;
-	argv[2] = errorInfo;
-	script = Tcl_Merge(3, argv);
-	TclThreadSend(interp, errorThreadId, script, 0);
-	ckfree(script);
-    }
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * ListUpdateInner --
- *
- *    Add the thread local storage to the list.  This assumes
- *	the caller has obtained the mutex.
- *
- * Results:
- *    none
- *
- * Side effects:
- *    Add the thread local storage to its list.
- *
- *------------------------------------------------------------------------
- */
-static void
-ListUpdateInner(tsdPtr)
-    ThreadSpecificData *tsdPtr;
-{
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-    }
-    tsdPtr->threadId = Tcl_GetCurrentThread();
-    tsdPtr->nextPtr = threadList;
-    if (threadList) {
-	threadList->prevPtr = tsdPtr;
-    }
-    tsdPtr->prevPtr = NULL;
-    threadList = tsdPtr;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * ListRemove --
- *
- *    Remove the thread local storage from its list.  This grabs the
- *	mutex to protect the list.
- *
- * Results:
- *    none
- *
- * Side effects:
- *    Remove the thread local storage from its list.
- *
- *------------------------------------------------------------------------
- */
-static void
-ListRemove(tsdPtr)
-    ThreadSpecificData *tsdPtr;
-{
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-    }
-    Tcl_MutexLock(&threadMutex);
-    if (tsdPtr->prevPtr) {
-	tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
-    } else {
-	threadList = tsdPtr->nextPtr;
-    }
-    if (tsdPtr->nextPtr) {
-	tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
-    }
-    tsdPtr->nextPtr = tsdPtr->prevPtr = 0;
-    Tcl_MutexUnlock(&threadMutex);
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * TclThreadList --
- *
- *    Return a list of threads running Tcl interpreters.
- *
- * Results:
- *    A standard Tcl result.
- *
- * Side effects:
- *    None.
- *
- *------------------------------------------------------------------------
- */
-int
-TclThreadList(interp)
-    Tcl_Interp *interp;
-{
-    ThreadSpecificData *tsdPtr;
-    Tcl_Obj *listPtr;
-
-    listPtr = Tcl_NewListObj(0, NULL);
-    Tcl_MutexLock(&threadMutex);
-    for (tsdPtr = threadList ; tsdPtr ; tsdPtr = tsdPtr->nextPtr) {
-	Tcl_ListObjAppendElement(interp, listPtr,
-		Tcl_NewIntObj((int)tsdPtr->threadId));
-    }
-    Tcl_MutexUnlock(&threadMutex);
-    Tcl_SetObjResult(interp, listPtr);
-    return TCL_OK;
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * TclThreadSend --
- *
- *    Send a script to another thread.
- *
- * Results:
- *    A standard Tcl result.
- *
- * Side effects:
- *    None.
- *
- *------------------------------------------------------------------------
- */
-int
-TclThreadSend(interp, id, script, wait)
-    Tcl_Interp *interp;		/* The current interpreter. */
-    Tcl_ThreadId id;		/* Thread Id of other interpreter. */
-    char *script;		/* The script to evaluate. */
-    int wait;			/* If 1, we block for the result. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    ThreadEvent *threadEventPtr;
-    ThreadEventResult *resultPtr;
-    int found, code;
-    Tcl_ThreadId threadId = (Tcl_ThreadId) id;
-
-    /* 
-     * Verify the thread exists.
-     */
-
-    Tcl_MutexLock(&threadMutex);
-    found = 0;
-    for (tsdPtr = threadList ; tsdPtr ; tsdPtr = tsdPtr->nextPtr) {
-	if (tsdPtr->threadId == threadId) {
-	    found = 1;
-	    break;
-	}
-    }
-    if (!found) {
-	Tcl_MutexUnlock(&threadMutex);
-	Tcl_AppendResult(interp, "invalid thread id", NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Short circut sends to ourself.  Ought to do something with -async,
-     * like run in an idle handler.
-     */
-
-    if (threadId == Tcl_GetCurrentThread()) {
-        Tcl_MutexUnlock(&threadMutex);
-	return Tcl_GlobalEval(interp, script);
-    }
-
-    /* 
-     * Create the event for its event queue.
-     */
-
-    threadEventPtr = (ThreadEvent *) ckalloc(sizeof(ThreadEvent));
-    threadEventPtr->script = ckalloc(strlen(script) + 1);
-    strcpy(threadEventPtr->script, script);
-    if (!wait) {
-	threadEventPtr->resultPtr = NULL;
-    } else {
-	resultPtr = (ThreadEventResult *) ckalloc(sizeof(ThreadEventResult));
-	threadEventPtr->resultPtr = resultPtr;
-
-	/*
-	 * Initialize the result fields.
-	 */
-
-	resultPtr->done = NULL;
-	resultPtr->code = 0;
-	resultPtr->result = NULL;
-	resultPtr->errorInfo = NULL;
-	resultPtr->errorCode = NULL;
-
-	/* 
-	 * Maintain the cleanup list.
-	 */
-
-	resultPtr->srcThreadId = Tcl_GetCurrentThread();
-	resultPtr->dstThreadId = threadId;
-	resultPtr->eventPtr = threadEventPtr;
-	resultPtr->nextPtr = resultList;
-	if (resultList) {
-	    resultList->prevPtr = resultPtr;
-	}
-	resultPtr->prevPtr = NULL;
-	resultList = resultPtr;
-    }
-
-    /*
-     * Queue the event and poke the other thread's notifier.
-     */
-
-    threadEventPtr->event.proc = ThreadEventProc;
-    Tcl_ThreadQueueEvent(threadId, (Tcl_Event *)threadEventPtr, 
-	    TCL_QUEUE_TAIL);
-    Tcl_MutexUnlock(&threadMutex);
-    Tcl_ThreadAlert(threadId);
-
-    if (!wait) {
-	return TCL_OK;
-    }
-
-    /* 
-     * Block on the results and then get them.
-     */
-
-    Tcl_ResetResult(interp);
-    Tcl_MutexLock(&threadMutex);
-    while (resultPtr->result == NULL) {
-        Tcl_ConditionWait(&resultPtr->done, &threadMutex, NULL);
-    }
-
-    /*
-     * Unlink result from the result list.
-     */
-
-    if (resultPtr->prevPtr) {
-	resultPtr->prevPtr->nextPtr = resultPtr->nextPtr;
-    } else {
-	resultList = resultPtr->nextPtr;
-    }
-    if (resultPtr->nextPtr) {
-	resultPtr->nextPtr->prevPtr = resultPtr->prevPtr;
-    }
-    resultPtr->eventPtr = NULL;
-    resultPtr->nextPtr = NULL;
-    resultPtr->prevPtr = NULL;
-
-    Tcl_MutexUnlock(&threadMutex);
-
-    if (resultPtr->code != TCL_OK) {
-	if (resultPtr->errorCode) {
-	    Tcl_SetErrorCode(interp, resultPtr->errorCode, NULL);
-	    ckfree(resultPtr->errorCode);
-	}
-	if (resultPtr->errorInfo) {
-	    Tcl_AddErrorInfo(interp, resultPtr->errorInfo);
-	    ckfree(resultPtr->errorInfo);
-	}
-    }
-    Tcl_SetResult(interp, resultPtr->result, TCL_DYNAMIC);
-    TclFinalizeCondition(&resultPtr->done);
-    code = resultPtr->code;
-
-    ckfree((char *) resultPtr);
-
-    return code;
-}
-
-
-/*
- *------------------------------------------------------------------------
- *
- * ThreadEventProc --
- *
- *    Handle the event in the target thread.
- *
- * Results:
- *    Returns 1 to indicate that the event was processed.
- *
- * Side effects:
- *    Fills out the ThreadEventResult struct.
- *
- *------------------------------------------------------------------------
- */
-int
-ThreadEventProc(evPtr, mask)
-    Tcl_Event *evPtr;		/* Really ThreadEvent */
-    int mask;
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    ThreadEvent *threadEventPtr = (ThreadEvent *)evPtr;
-    ThreadEventResult *resultPtr = threadEventPtr->resultPtr;
-    Tcl_Interp *interp = tsdPtr->interp;
-    int code;
-    char *result, *errorCode, *errorInfo;
-
-    if (interp == NULL) {
-	code = TCL_ERROR;
-	result = "no target interp!";
-	errorCode = "THREAD";
-	errorInfo = "";
-    } else {
-	Tcl_Preserve((ClientData) interp);
-	Tcl_ResetResult(interp);
-	code = Tcl_GlobalEval(interp, threadEventPtr->script);
-	result = Tcl_GetStringResult(interp);
-	if (code != TCL_OK) {
-	    errorCode = Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY);
-	    errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
-	} else {
-	    errorCode = errorInfo = NULL;
-	}
-    }
-    ckfree(threadEventPtr->script);
-    if (resultPtr) {
-	Tcl_MutexLock(&threadMutex);
-	resultPtr->code = code;
-	resultPtr->result = ckalloc(strlen(result) + 1);
-	strcpy(resultPtr->result, result);
-	if (errorCode != NULL) {
-	    resultPtr->errorCode = ckalloc(strlen(errorCode) + 1);
-	    strcpy(resultPtr->errorCode, errorCode);
-	}
-	if (errorInfo != NULL) {
-	    resultPtr->errorInfo = ckalloc(strlen(errorInfo) + 1);
-	    strcpy(resultPtr->errorInfo, errorInfo);
-	}
-	Tcl_ConditionNotify(&resultPtr->done);
-	Tcl_MutexUnlock(&threadMutex);
-    }
-    if (interp != NULL) {
-	Tcl_Release((ClientData) interp);
-    }
-    return 1;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * ThreadExitProc --
- *
- *    This is called when the thread exits.  
- *
- * Results:
- *    None.
- *
- * Side effects:
- *	It unblocks anyone that is waiting on a send to this thread.
- *	It cleans up any events in the event queue for this thread.
- *
- *------------------------------------------------------------------------
- */
-     /* ARGSUSED */
-void
-ThreadExitProc(dummy)
-    ClientData dummy;
-{
-    ThreadEventResult *resultPtr, *nextPtr;
-    Tcl_ThreadId self = Tcl_GetCurrentThread();
-
-    Tcl_MutexLock(&threadMutex);
-    for (resultPtr = resultList ; resultPtr ; resultPtr = nextPtr) {
-	nextPtr = resultPtr->nextPtr;
-	if (resultPtr->srcThreadId == self) {
-	    /*
-	     * We are going away.  By freeing up the result we signal
-	     * to the other thread we don't care about the result.
-	     */
-	    if (resultPtr->prevPtr) {
-		resultPtr->prevPtr->nextPtr = resultPtr->nextPtr;
-	    } else {
-		resultList = resultPtr->nextPtr;
-	    }
-	    if (resultPtr->nextPtr) {
-		resultPtr->nextPtr->prevPtr = resultPtr->prevPtr;
-	    }
-	    resultPtr->nextPtr = resultPtr->prevPtr = 0;
-	    resultPtr->eventPtr->resultPtr = NULL;
-	    ckfree((char *)resultPtr);
-	} else if (resultPtr->dstThreadId == self) {
-	    /*
-	     * Dang.  The target is going away.  Unblock the caller.
-	     * The result string must be dynamically allocated because
-	     * the main thread is going to call free on it.
-	     */
-
-	    char *msg = "target thread died";
-	    resultPtr->result = ckalloc(strlen(msg)+1);
-	    strcpy(resultPtr->result, msg);
-	    resultPtr->code = TCL_ERROR;
-	    Tcl_ConditionNotify(&resultPtr->done);
-	}
-    }
-    Tcl_MutexUnlock(&threadMutex);
-}
-
-#endif /* TCL_THREADS */
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
deleted file mode 100644
index 3397cb7..0000000
--- a/generic/tclTimer.c
+++ /dev/null
@@ -1,1128 +0,0 @@
-/* 
- * tclTimer.c --
- *
- *	This file provides timer event management facilities for Tcl,
- *	including the "after" command.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclTimer.c,v 1.3 1999/04/16 00:46:54 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * For each timer callback that's pending there is one record of the following
- * type.  The normal handlers (created by Tcl_CreateTimerHandler) are chained
- * together in a list sorted by time (earliest event first).
- */
-
-typedef struct TimerHandler {
-    Tcl_Time time;			/* When timer is to fire. */
-    Tcl_TimerProc *proc;		/* Procedure to call. */
-    ClientData clientData;		/* Argument to pass to proc. */
-    Tcl_TimerToken token;		/* Identifies handler so it can be
-					 * deleted. */
-    struct TimerHandler *nextPtr;	/* Next event in queue, or NULL for
-					 * end of queue. */
-} TimerHandler;
-
-/*
- * The data structure below is used by the "after" command to remember
- * the command to be executed later.  All of the pending "after" commands
- * for an interpreter are linked together in a list.
- */
-
-typedef struct AfterInfo {
-    struct AfterAssocData *assocPtr;
-				/* Pointer to the "tclAfter" assocData for
-				 * the interp in which command will be
-				 * executed. */
-    Tcl_Obj *commandPtr;	/* Command to execute. */
-    int id;			/* Integer identifier for command;  used to
-				 * cancel it. */
-    Tcl_TimerToken token;	/* Used to cancel the "after" command.  NULL
-				 * means that the command is run as an
-				 * idle handler rather than as a timer
-				 * handler.  NULL means this is an "after
-				 * idle" handler rather than a
-                                 * timer handler. */
-    struct AfterInfo *nextPtr;	/* Next in list of all "after" commands for
-				 * this interpreter. */
-} AfterInfo;
-
-/*
- * One of the following structures is associated with each interpreter
- * for which an "after" command has ever been invoked.  A pointer to
- * this structure is stored in the AssocData for the "tclAfter" key.
- */
-
-typedef struct AfterAssocData {
-    Tcl_Interp *interp;		/* The interpreter for which this data is
-				 * registered. */
-    AfterInfo *firstAfterPtr;	/* First in list of all "after" commands
-				 * still pending for this interpreter, or
-				 * NULL if none. */
-} AfterAssocData;
-
-/*
- * There is one of the following structures for each of the
- * handlers declared in a call to Tcl_DoWhenIdle.  All of the
- * currently-active handlers are linked together into a list.
- */
-
-typedef struct IdleHandler {
-    Tcl_IdleProc (*proc);	/* Procedure to call. */
-    ClientData clientData;	/* Value to pass to proc. */
-    int generation;		/* Used to distinguish older handlers from
-				 * recently-created ones. */
-    struct IdleHandler *nextPtr;/* Next in list of active handlers. */
-} IdleHandler;
-
-/*
- * The timer and idle queues are per-thread because they are associated
- * with the notifier, which is also per-thread.
- *
- * All static variables used in this file are collected into a single
- * instance of the following structure.  For multi-threaded implementations,
- * there is one instance of this structure for each thread.
- *
- * Notice that different structures with the same name appear in other
- * files.  The structure defined below is used in this file only.
- */
-
-typedef struct ThreadSpecificData {
-    TimerHandler *firstTimerHandlerPtr;	/* First event in queue. */
-    int lastTimerId;		/* Timer identifier of most recently
-				 * created timer. */
-    int timerPending;		/* 1 if a timer event is in the queue. */
-    IdleHandler *idleList;	/* First in list of all idle handlers. */
-    IdleHandler *lastIdlePtr;	/* Last in list (or NULL for empty list). */
-    int idleGeneration;		/* Used to fill in the "generation" fields
-				 * of IdleHandler structures.  Increments
-				 * each time Tcl_DoOneEvent starts calling
-				 * idle handlers, so that all old handlers
-				 * can be called without calling any of the
-				 * new ones created by old ones. */
-    int afterId;		/* For unique identifiers of after events. */
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Prototypes for procedures referenced only in this file:
- */
-
-static void		AfterCleanupProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp));
-static void		AfterProc _ANSI_ARGS_((ClientData clientData));
-static void		FreeAfterPtr _ANSI_ARGS_((AfterInfo *afterPtr));
-static AfterInfo *	GetAfterEvent _ANSI_ARGS_((AfterAssocData *assocPtr,
-			    Tcl_Obj *commandPtr));
-static ThreadSpecificData *InitTimer _ANSI_ARGS_((void));
-static void		TimerExitProc _ANSI_ARGS_((ClientData clientData));
-static int		TimerHandlerEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-			    int flags));
-static void		TimerCheckProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static void		TimerSetupProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-
-/*
- *----------------------------------------------------------------------
- *
- * InitTimer --
- *
- *	This function initializes the timer module.
- *
- * Results:
- *	A pointer to the thread specific data.
- *
- * Side effects:
- *	Registers the idle and timer event sources.
- *
- *----------------------------------------------------------------------
- */
-
-static ThreadSpecificData *
-InitTimer()
-{
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *) TclThreadDataKeyGet(&dataKey);
-
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	Tcl_CreateEventSource(TimerSetupProc, TimerCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(TimerExitProc, NULL);
-    }
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TimerExitProc --
- *
- *	This function is call at exit or unload time to remove the
- *	timer and idle event sources.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the timer and idle event sources.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TimerExitProc(clientData)
-    ClientData clientData;	/* Not used. */
-{
-    Tcl_DeleteEventSource(TimerSetupProc, TimerCheckProc, NULL);
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_CreateTimerHandler --
- *
- *	Arrange for a given procedure to be invoked at a particular
- *	time in the future.
- *
- * Results:
- *	The return value is a token for the timer event, which
- *	may be used to delete the event before it fires.
- *
- * Side effects:
- *	When milliseconds have elapsed, proc will be invoked
- *	exactly once.
- *
- *--------------------------------------------------------------
- */
-
-Tcl_TimerToken
-Tcl_CreateTimerHandler(milliseconds, proc, clientData)
-    int milliseconds;		/* How many milliseconds to wait
-				 * before invoking proc. */
-    Tcl_TimerProc *proc;	/* Procedure to invoke. */
-    ClientData clientData;	/* Arbitrary data to pass to proc. */
-{
-    register TimerHandler *timerHandlerPtr, *tPtr2, *prevPtr;
-    Tcl_Time time;
-    ThreadSpecificData *tsdPtr;
-
-    tsdPtr = InitTimer();
-
-    timerHandlerPtr = (TimerHandler *) ckalloc(sizeof(TimerHandler));
-
-    /*
-     * Compute when the event should fire.
-     */
-
-    TclpGetTime(&time);
-    timerHandlerPtr->time.sec = time.sec + milliseconds/1000;
-    timerHandlerPtr->time.usec = time.usec + (milliseconds%1000)*1000;
-    if (timerHandlerPtr->time.usec >= 1000000) {
-	timerHandlerPtr->time.usec -= 1000000;
-	timerHandlerPtr->time.sec += 1;
-    }
-
-    /*
-     * Fill in other fields for the event.
-     */
-
-    timerHandlerPtr->proc = proc;
-    timerHandlerPtr->clientData = clientData;
-    tsdPtr->lastTimerId++;
-    timerHandlerPtr->token = (Tcl_TimerToken) tsdPtr->lastTimerId;
-
-    /*
-     * Add the event to the queue in the correct position
-     * (ordered by event firing time).
-     */
-
-    for (tPtr2 = tsdPtr->firstTimerHandlerPtr, prevPtr = NULL; tPtr2 != NULL;
-	    prevPtr = tPtr2, tPtr2 = tPtr2->nextPtr) {
-	if ((tPtr2->time.sec > timerHandlerPtr->time.sec)
-		|| ((tPtr2->time.sec == timerHandlerPtr->time.sec)
-		&& (tPtr2->time.usec > timerHandlerPtr->time.usec))) {
-	    break;
-	}
-    }
-    timerHandlerPtr->nextPtr = tPtr2;
-    if (prevPtr == NULL) {
-	tsdPtr->firstTimerHandlerPtr = timerHandlerPtr;
-    } else {
-	prevPtr->nextPtr = timerHandlerPtr;
-    }
-
-    TimerSetupProc(NULL, TCL_ALL_EVENTS);
-
-    return timerHandlerPtr->token;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_DeleteTimerHandler --
- *
- *	Delete a previously-registered timer handler.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Destroy the timer callback identified by TimerToken,
- *	so that its associated procedure will not be called.
- *	If the callback has already fired, or if the given
- *	token doesn't exist, then nothing happens.
- *
- *--------------------------------------------------------------
- */
-
-void
-Tcl_DeleteTimerHandler(token)
-    Tcl_TimerToken token;	/* Result previously returned by
-				 * Tcl_DeleteTimerHandler. */
-{
-    register TimerHandler *timerHandlerPtr, *prevPtr;
-    ThreadSpecificData *tsdPtr;
-
-    tsdPtr = InitTimer();
-    for (timerHandlerPtr = tsdPtr->firstTimerHandlerPtr, prevPtr = NULL;
-	    timerHandlerPtr != NULL; prevPtr = timerHandlerPtr,
-	    timerHandlerPtr = timerHandlerPtr->nextPtr) {
-	if (timerHandlerPtr->token != token) {
-	    continue;
-	}
-	if (prevPtr == NULL) {
-	    tsdPtr->firstTimerHandlerPtr = timerHandlerPtr->nextPtr;
-	} else {
-	    prevPtr->nextPtr = timerHandlerPtr->nextPtr;
-	}
-	ckfree((char *) timerHandlerPtr);
-	return;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TimerSetupProc --
- *
- *	This function is called by Tcl_DoOneEvent to setup the timer
- *	event source for before blocking.  This routine checks both the
- *	idle and after timer lists.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May update the maximum notifier block time.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TimerSetupProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    Tcl_Time blockTime;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    if (((flags & TCL_IDLE_EVENTS) && tsdPtr->idleList)
-	    || ((flags & TCL_TIMER_EVENTS) && tsdPtr->timerPending)) {
-	/*
-	 * There is an idle handler or a pending timer event, so just poll.
-	 */
-
-	blockTime.sec = 0;
-	blockTime.usec = 0;
-
-    } else if ((flags & TCL_TIMER_EVENTS) && tsdPtr->firstTimerHandlerPtr) {
-	/*
-	 * Compute the timeout for the next timer on the list.
-	 */
-
-	TclpGetTime(&blockTime);
-	blockTime.sec = tsdPtr->firstTimerHandlerPtr->time.sec - blockTime.sec;
-	blockTime.usec = tsdPtr->firstTimerHandlerPtr->time.usec -
-		blockTime.usec;
-	if (blockTime.usec < 0) {
-	    blockTime.sec -= 1;
-	    blockTime.usec += 1000000;
-	}
-	if (blockTime.sec < 0) {
-	    blockTime.sec = 0;
-	    blockTime.usec = 0;
-	}
-    } else {
-	return;
-    }
-	
-    Tcl_SetMaxBlockTime(&blockTime);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TimerCheckProc --
- *
- *	This function is called by Tcl_DoOneEvent to check the timer
- *	event source for events.  This routine checks both the
- *	idle and after timer lists.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event and update the maximum notifier block time.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TimerCheckProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    Tcl_Event *timerEvPtr;
-    Tcl_Time blockTime;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    if ((flags & TCL_TIMER_EVENTS) && tsdPtr->firstTimerHandlerPtr) {
-	/*
-	 * Compute the timeout for the next timer on the list.
-	 */
-
-	TclpGetTime(&blockTime);
-	blockTime.sec = tsdPtr->firstTimerHandlerPtr->time.sec - blockTime.sec;
-	blockTime.usec = tsdPtr->firstTimerHandlerPtr->time.usec -
-		blockTime.usec;
-	if (blockTime.usec < 0) {
-	    blockTime.sec -= 1;
-	    blockTime.usec += 1000000;
-	}
-	if (blockTime.sec < 0) {
-	    blockTime.sec = 0;
-	    blockTime.usec = 0;
-	}
-
-	/*
-	 * If the first timer has expired, stick an event on the queue.
-	 */
-
-	if (blockTime.sec == 0 && blockTime.usec == 0 &&
-		!tsdPtr->timerPending) {
-	    tsdPtr->timerPending = 1;
-	    timerEvPtr = (Tcl_Event *) ckalloc(sizeof(Tcl_Event));
-	    timerEvPtr->proc = TimerHandlerEventProc;
-	    Tcl_QueueEvent(timerEvPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TimerHandlerEventProc --
- *
- *	This procedure is called by Tcl_ServiceEvent when a timer event
- *	reaches the front of the event queue.  This procedure handles
- *	the event by invoking the callbacks for all timers that are
- *	ready.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_TIMER_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the timer handler callback procedures do.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TimerHandlerEventProc(evPtr, flags)
-    Tcl_Event *evPtr;		/* Event to service. */
-    int flags;			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    TimerHandler *timerHandlerPtr, **nextPtrPtr;
-    Tcl_Time time;
-    int currentTimerId;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    /*
-     * Do nothing if timers aren't enabled.  This leaves the event on the
-     * queue, so we will get to it as soon as ServiceEvents() is called
-     * with timers enabled.
-     */
-
-    if (!(flags & TCL_TIMER_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * The code below is trickier than it may look, for the following
-     * reasons:
-     *
-     * 1. New handlers can get added to the list while the current
-     *    one is being processed.  If new ones get added, we don't
-     *    want to process them during this pass through the list to avoid
-     *	  starving other event sources.  This is implemented using the
-     *	  token number in the handler:  new handlers will have a
-     *    newer token than any of the ones currently on the list.
-     * 2. The handler can call Tcl_DoOneEvent, so we have to remove
-     *    the handler from the list before calling it. Otherwise an
-     *    infinite loop could result.
-     * 3. Tcl_DeleteTimerHandler can be called to remove an element from
-     *    the list while a handler is executing, so the list could
-     *    change structure during the call.
-     * 4. Because we only fetch the current time before entering the loop,
-     *    the only way a new timer will even be considered runnable is if
-     *	  its expiration time is within the same millisecond as the
-     *	  current time.  This is fairly likely on Windows, since it has
-     *	  a course granularity clock.  Since timers are placed
-     *	  on the queue in time order with the most recently created
-     *    handler appearing after earlier ones with the same expiration
-     *	  time, we don't have to worry about newer generation timers
-     *	  appearing before later ones.
-     */
-
-    tsdPtr->timerPending = 0;
-    currentTimerId = tsdPtr->lastTimerId;
-    TclpGetTime(&time);
-    while (1) {
-	nextPtrPtr = &tsdPtr->firstTimerHandlerPtr;
-	timerHandlerPtr = tsdPtr->firstTimerHandlerPtr;
-	if (timerHandlerPtr == NULL) {
-	    break;
-	}
-	    
-	if ((timerHandlerPtr->time.sec > time.sec)
-		|| ((timerHandlerPtr->time.sec == time.sec)
-			&& (timerHandlerPtr->time.usec > time.usec))) {
-	    break;
-	}
-
-	/*
-	 * Bail out if the next timer is of a newer generation.
-	 */
-
-	if ((currentTimerId - (int)timerHandlerPtr->token) < 0) {
-	    break;
-	}
-
-	/*
-	 * Remove the handler from the queue before invoking it,
-	 * to avoid potential reentrancy problems.
-	 */
-
-	(*nextPtrPtr) = timerHandlerPtr->nextPtr;
-	(*timerHandlerPtr->proc)(timerHandlerPtr->clientData);
-	ckfree((char *) timerHandlerPtr);
-    }
-    TimerSetupProc(NULL, TCL_TIMER_EVENTS);
-    return 1;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_DoWhenIdle --
- *
- *	Arrange for proc to be invoked the next time the system is
- *	idle (i.e., just before the next time that Tcl_DoOneEvent
- *	would have to wait for something to happen).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Proc will eventually be called, with clientData as argument.
- *	See the manual entry for details.
- *
- *--------------------------------------------------------------
- */
-
-void
-Tcl_DoWhenIdle(proc, clientData)
-    Tcl_IdleProc *proc;		/* Procedure to invoke. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    register IdleHandler *idlePtr;
-    Tcl_Time blockTime;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    idlePtr = (IdleHandler *) ckalloc(sizeof(IdleHandler));
-    idlePtr->proc = proc;
-    idlePtr->clientData = clientData;
-    idlePtr->generation = tsdPtr->idleGeneration;
-    idlePtr->nextPtr = NULL;
-    if (tsdPtr->lastIdlePtr == NULL) {
-	tsdPtr->idleList = idlePtr;
-    } else {
-	tsdPtr->lastIdlePtr->nextPtr = idlePtr;
-    }
-    tsdPtr->lastIdlePtr = idlePtr;
-
-    blockTime.sec = 0;
-    blockTime.usec = 0;
-    Tcl_SetMaxBlockTime(&blockTime);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CancelIdleCall --
- *
- *	If there are any when-idle calls requested to a given procedure
- *	with given clientData, cancel all of them.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If the proc/clientData combination were on the when-idle list,
- *	they are removed so that they will never be called.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CancelIdleCall(proc, clientData)
-    Tcl_IdleProc *proc;		/* Procedure that was previously registered. */
-    ClientData clientData;	/* Arbitrary value to pass to proc. */
-{
-    register IdleHandler *idlePtr, *prevPtr;
-    IdleHandler *nextPtr;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    for (prevPtr = NULL, idlePtr = tsdPtr->idleList; idlePtr != NULL;
-	    prevPtr = idlePtr, idlePtr = idlePtr->nextPtr) {
-	while ((idlePtr->proc == proc)
-		&& (idlePtr->clientData == clientData)) {
-	    nextPtr = idlePtr->nextPtr;
-	    ckfree((char *) idlePtr);
-	    idlePtr = nextPtr;
-	    if (prevPtr == NULL) {
-		tsdPtr->idleList = idlePtr;
-	    } else {
-		prevPtr->nextPtr = idlePtr;
-	    }
-	    if (idlePtr == NULL) {
-		tsdPtr->lastIdlePtr = prevPtr;
-		return;
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclServiceIdle --
- *
- *	This procedure is invoked by the notifier when it becomes
- *	idle.  It will invoke all idle handlers that are present at
- *	the time the call is invoked, but not those added during idle
- *	processing.
- *
- * Results:
- *	The return value is 1 if TclServiceIdle found something to
- *	do, otherwise return value is 0.
- *
- * Side effects:
- *	Invokes all pending idle handlers.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclServiceIdle()
-{
-    IdleHandler *idlePtr;
-    int oldGeneration;
-    Tcl_Time blockTime;
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    if (tsdPtr->idleList == NULL) {
-	return 0;
-    }
-
-    oldGeneration = tsdPtr->idleGeneration;
-    tsdPtr->idleGeneration++;
-
-    /*
-     * The code below is trickier than it may look, for the following
-     * reasons:
-     *
-     * 1. New handlers can get added to the list while the current
-     *    one is being processed.  If new ones get added, we don't
-     *    want to process them during this pass through the list (want
-     *    to check for other work to do first).  This is implemented
-     *    using the generation number in the handler:  new handlers
-     *    will have a different generation than any of the ones currently
-     *    on the list.
-     * 2. The handler can call Tcl_DoOneEvent, so we have to remove
-     *    the handler from the list before calling it. Otherwise an
-     *    infinite loop could result.
-     * 3. Tcl_CancelIdleCall can be called to remove an element from
-     *    the list while a handler is executing, so the list could
-     *    change structure during the call.
-     */
-
-    for (idlePtr = tsdPtr->idleList;
-	    ((idlePtr != NULL)
-		    && ((oldGeneration - idlePtr->generation) >= 0));
-	    idlePtr = tsdPtr->idleList) {
-	tsdPtr->idleList = idlePtr->nextPtr;
-	if (tsdPtr->idleList == NULL) {
-	    tsdPtr->lastIdlePtr = NULL;
-	}
-	(*idlePtr->proc)(idlePtr->clientData);
-	ckfree((char *) idlePtr);
-    }
-    if (tsdPtr->idleList) {
-	blockTime.sec = 0;
-	blockTime.usec = 0;
-	Tcl_SetMaxBlockTime(&blockTime);
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AfterObjCmd --
- *
- *	This procedure is invoked to process the "after" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_AfterObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;	/* Points to the "tclAfter" assocData for
-				 * this interpreter, or NULL if the assocData
-				 * hasn't been created yet.*/
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    int ms;
-    AfterInfo *afterPtr;
-    AfterAssocData *assocPtr = (AfterAssocData *) clientData;
-    Tcl_CmdInfo cmdInfo;
-    int length;
-    char *argString;
-    int index;
-    char buf[16 + TCL_INTEGER_SPACE];
-    static char *afterSubCmds[] = {"cancel", "idle", "info", (char *) NULL};
-    enum afterSubCmds {AFTER_CANCEL, AFTER_IDLE, AFTER_INFO};
-    ThreadSpecificData *tsdPtr = InitTimer();
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Create the "after" information associated for this interpreter,
-     * if it doesn't already exist.  Associate it with the command too,
-     * so that it will be passed in as the ClientData argument in the
-     * future.
-     */
-
-    if (assocPtr == NULL) {
-	assocPtr = (AfterAssocData *) ckalloc(sizeof(AfterAssocData));
-	assocPtr->interp = interp;
-	assocPtr->firstAfterPtr = NULL;
-	Tcl_SetAssocData(interp, "tclAfter", AfterCleanupProc,
-		(ClientData) assocPtr);
-	cmdInfo.proc = NULL;
-	cmdInfo.clientData = (ClientData) NULL;
-	cmdInfo.objProc = Tcl_AfterObjCmd;
-	cmdInfo.objClientData = (ClientData) assocPtr;
-	cmdInfo.deleteProc = NULL;
-	cmdInfo.deleteData = (ClientData) assocPtr;
-	Tcl_SetCommandInfo(interp, Tcl_GetStringFromObj(objv[0], &length),
-		&cmdInfo);
-    }
-
-    /*
-     * First lets see if the command was passed a number as the first argument.
-     */
-
-    if (objv[1]->typePtr == &tclIntType) {
-	ms = (int) objv[1]->internalRep.longValue;
-	goto processInteger;
-    }
-    argString = Tcl_GetStringFromObj(objv[1], &length);
-    if (isdigit(UCHAR(argString[0]))) {	/* INTL: digit */
-	if (Tcl_GetIntFromObj(interp, objv[1], &ms) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-processInteger:
-	if (ms < 0) {
-	    ms = 0;
-	}
-	if (objc == 2) {
-	    Tcl_Sleep(ms);
-	    return TCL_OK;
-	}
-	afterPtr = (AfterInfo *) ckalloc((unsigned) (sizeof(AfterInfo)));
-	afterPtr->assocPtr = assocPtr;
-	if (objc == 3) {
-	    afterPtr->commandPtr = objv[2];
-	} else {
- 	    afterPtr->commandPtr = Tcl_ConcatObj(objc-2, objv+2);
-	}
-	Tcl_IncrRefCount(afterPtr->commandPtr);
-	/*
-	 * The variable below is used to generate unique identifiers for
-	 * after commands.  This id can wrap around, which can potentially
-	 * cause problems.  However, there are not likely to be problems
-	 * in practice, because after commands can only be requested to
-	 * about a month in the future, and wrap-around is unlikely to
-	 * occur in less than about 1-10 years.  Thus it's unlikely that
-	 * any old ids will still be around when wrap-around occurs.
-	 */
-	afterPtr->id = tsdPtr->afterId;
-	tsdPtr->afterId += 1;
-	afterPtr->token = Tcl_CreateTimerHandler(ms, AfterProc,
-		(ClientData) afterPtr);
-	afterPtr->nextPtr = assocPtr->firstAfterPtr;
-	assocPtr->firstAfterPtr = afterPtr;
-	sprintf(buf, "after#%d", afterPtr->id);
-	Tcl_AppendResult(interp, buf, (char *) NULL);
-	return TCL_OK;
-    }
-
-    /*
-     * If it's not a number it must be a subcommand.
-     */
-
-    if (Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "argument",
-            0, &index) != TCL_OK) {
-	Tcl_AppendResult(interp, "bad argument \"", argString,
-		"\": must be cancel, idle, info, or a number",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    switch ((enum afterSubCmds) index) {
-        case AFTER_CANCEL: {
-	    Tcl_Obj *commandPtr;
-	    char *command, *tempCommand;
-	    int tempLength;
-
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "id|command");
-		return TCL_ERROR;
-	    }
-	    if (objc == 3) {
-		commandPtr = objv[2];
-	    } else {
-		commandPtr = Tcl_ConcatObj(objc-2, objv+2);;
-	    }
-	    command = Tcl_GetStringFromObj(commandPtr, &length);
-	    for (afterPtr = assocPtr->firstAfterPtr;  afterPtr != NULL;
-		    afterPtr = afterPtr->nextPtr) {
-		tempCommand = Tcl_GetStringFromObj(afterPtr->commandPtr,
-			&tempLength);
-		if ((length == tempLength)
-		        && (memcmp((void*) command, (void*) tempCommand,
-			        (unsigned) length) == 0)) {
-		    break;
-		}
-	    }
-	    if (afterPtr == NULL) {
-		afterPtr = GetAfterEvent(assocPtr, commandPtr);
-	    }
-	    if (objc != 3) {
-		Tcl_DecrRefCount(commandPtr);
-	    }
-	    if (afterPtr != NULL) {
-		if (afterPtr->token != NULL) {
-		    Tcl_DeleteTimerHandler(afterPtr->token);
-		} else {
-		    Tcl_CancelIdleCall(AfterProc, (ClientData) afterPtr);
-		}
-		FreeAfterPtr(afterPtr);
-	    }
-	    break;
-	}
-	case AFTER_IDLE:
-	    if (objc < 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "script script ...");
-		return TCL_ERROR;
-	    }
-	    afterPtr = (AfterInfo *) ckalloc((unsigned) (sizeof(AfterInfo)));
-	    afterPtr->assocPtr = assocPtr;
-	    if (objc == 3) {
- 		afterPtr->commandPtr = objv[2];
-	    } else {
-		afterPtr->commandPtr = Tcl_ConcatObj(objc-2, objv+2);
-	    }
-	    Tcl_IncrRefCount(afterPtr->commandPtr);
-	    afterPtr->id = tsdPtr->afterId;
-	    tsdPtr->afterId += 1;
-	    afterPtr->token = NULL;
-	    afterPtr->nextPtr = assocPtr->firstAfterPtr;
-	    assocPtr->firstAfterPtr = afterPtr;
-	    Tcl_DoWhenIdle(AfterProc, (ClientData) afterPtr);
-	    sprintf(buf, "after#%d", afterPtr->id);
-	    Tcl_AppendResult(interp, buf, (char *) NULL);
-	    break;
-	case AFTER_INFO: {
-	    Tcl_Obj *resultListPtr;
-
-	    if (objc == 2) {
-		for (afterPtr = assocPtr->firstAfterPtr; afterPtr != NULL;
-		     afterPtr = afterPtr->nextPtr) {
-		    if (assocPtr->interp == interp) {
-			sprintf(buf, "after#%d", afterPtr->id);
-			Tcl_AppendElement(interp, buf);
-		    }
-		}
-		return TCL_OK;
-	    }
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "?id?");
-		return TCL_ERROR;
-	    }
-	    afterPtr = GetAfterEvent(assocPtr, objv[2]);
-	    if (afterPtr == NULL) {
-		Tcl_AppendResult(interp, "event \"", Tcl_GetString(objv[2]),
-			"\" doesn't exist", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    resultListPtr = Tcl_GetObjResult(interp);
- 	    Tcl_ListObjAppendElement(interp, resultListPtr, afterPtr->commandPtr);
- 	    Tcl_ListObjAppendElement(interp, resultListPtr, Tcl_NewStringObj(
- 		(afterPtr->token == NULL) ? "idle" : "timer", -1));
-	    Tcl_SetObjResult(interp, resultListPtr);
-	    break;
-	}
-	default: {
-	    panic("Tcl_AfterObjCmd: bad subcommand index to afterSubCmds");
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetAfterEvent --
- *
- *	This procedure parses an "after" id such as "after#4" and
- *	returns a pointer to the AfterInfo structure.
- *
- * Results:
- *	The return value is either a pointer to an AfterInfo structure,
- *	if one is found that corresponds to "cmdString" and is for interp,
- *	or NULL if no corresponding after event can be found.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static AfterInfo *
-GetAfterEvent(assocPtr, commandPtr)
-    AfterAssocData *assocPtr;	/* Points to "after"-related information for
-				 * this interpreter. */
-    Tcl_Obj *commandPtr;
-{
-    char *cmdString;		/* Textual identifier for after event, such
-				 * as "after#6". */
-    AfterInfo *afterPtr;
-    int id;
-    char *end;
-
-    cmdString = Tcl_GetString(commandPtr);
-    if (strncmp(cmdString, "after#", 6) != 0) {
-	return NULL;
-    }
-    cmdString += 6;
-    id = strtoul(cmdString, &end, 10);
-    if ((end == cmdString) || (*end != 0)) {
-	return NULL;
-    }
-    for (afterPtr = assocPtr->firstAfterPtr; afterPtr != NULL;
-	    afterPtr = afterPtr->nextPtr) {
-	if (afterPtr->id == id) {
-	    return afterPtr;
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AfterProc --
- *
- *	Timer callback to execute commands registered with the
- *	"after" command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Executes whatever command was specified.  If the command
- *	returns an error, then the command "bgerror" is invoked
- *	to process the error;  if bgerror fails then information
- *	about the error is output on stderr.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AfterProc(clientData)
-    ClientData clientData;	/* Describes command to execute. */
-{
-    AfterInfo *afterPtr = (AfterInfo *) clientData;
-    AfterAssocData *assocPtr = afterPtr->assocPtr;
-    AfterInfo *prevPtr;
-    int result;
-    Tcl_Interp *interp;
-    char *script;
-    int numBytes;
-
-    /*
-     * First remove the callback from our list of callbacks;  otherwise
-     * someone could delete the callback while it's being executed, which
-     * could cause a core dump.
-     */
-
-    if (assocPtr->firstAfterPtr == afterPtr) {
-	assocPtr->firstAfterPtr = afterPtr->nextPtr;
-    } else {
-	for (prevPtr = assocPtr->firstAfterPtr; prevPtr->nextPtr != afterPtr;
-		prevPtr = prevPtr->nextPtr) {
-	    /* Empty loop body. */
-	}
-	prevPtr->nextPtr = afterPtr->nextPtr;
-    }
-
-    /*
-     * Execute the callback.
-     */
-
-    interp = assocPtr->interp;
-    Tcl_Preserve((ClientData) interp);
-    script = Tcl_GetStringFromObj(afterPtr->commandPtr, &numBytes);
-    result = Tcl_EvalEx(interp, script, numBytes, TCL_EVAL_GLOBAL);
-    if (result != TCL_OK) {
-	Tcl_AddErrorInfo(interp, "\n    (\"after\" script)");
-	Tcl_BackgroundError(interp);
-    }
-    Tcl_Release((ClientData) interp);
-    
-    /*
-     * Free the memory for the callback.
-     */
-
-    Tcl_DecrRefCount(afterPtr->commandPtr);
-    ckfree((char *) afterPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeAfterPtr --
- *
- *	This procedure removes an "after" command from the list of
- *	those that are pending and frees its resources.  This procedure
- *	does *not* cancel the timer handler;  if that's needed, the
- *	caller must do it.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The memory associated with afterPtr is released.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeAfterPtr(afterPtr)
-    AfterInfo *afterPtr;		/* Command to be deleted. */
-{
-    AfterInfo *prevPtr;
-    AfterAssocData *assocPtr = afterPtr->assocPtr;
-
-    if (assocPtr->firstAfterPtr == afterPtr) {
-	assocPtr->firstAfterPtr = afterPtr->nextPtr;
-    } else {
-	for (prevPtr = assocPtr->firstAfterPtr; prevPtr->nextPtr != afterPtr;
-		prevPtr = prevPtr->nextPtr) {
-	    /* Empty loop body. */
-	}
-	prevPtr->nextPtr = afterPtr->nextPtr;
-    }
-    Tcl_DecrRefCount(afterPtr->commandPtr);
-    ckfree((char *) afterPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AfterCleanupProc --
- *
- *	This procedure is invoked whenever an interpreter is deleted
- *	to cleanup the AssocData for "tclAfter".
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	After commands are removed.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static void
-AfterCleanupProc(clientData, interp)
-    ClientData clientData;	/* Points to AfterAssocData for the
-				 * interpreter. */
-    Tcl_Interp *interp;		/* Interpreter that is being deleted. */
-{
-    AfterAssocData *assocPtr = (AfterAssocData *) clientData;
-    AfterInfo *afterPtr;
-
-    while (assocPtr->firstAfterPtr != NULL) {
-	afterPtr = assocPtr->firstAfterPtr;
-	assocPtr->firstAfterPtr = afterPtr->nextPtr;
-	if (afterPtr->token != NULL) {
-	    Tcl_DeleteTimerHandler(afterPtr->token);
-	} else {
-	    Tcl_CancelIdleCall(AfterProc, (ClientData) afterPtr);
-	}
-	Tcl_DecrRefCount(afterPtr->commandPtr);
-	ckfree((char *) afterPtr);
-    }
-    ckfree((char *) assocPtr);
-}
diff --git a/generic/tclUniData.c b/generic/tclUniData.c
deleted file mode 100644
index 976a914..0000000
--- a/generic/tclUniData.c
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * tclUtfData.c --
- *
- *	Declarations of Unicode character information tables.  This file is
- *	automatically generated by the tools/uniParse.tcl script.  Do not
- *	modify this file by hand.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- * All rights reserved.
- *
- * RCS: @(#) $Id: tclUniData.c,v 1.2 1999/04/16 00:46:55 stanton Exp $
- */
-
-/*
- * A 16-bit Unicode character is split into two parts in order to index
- * into the following tables.  The lower OFFSET_BITS comprise an offset
- * into a page of characters.  The upper bits comprise the page number.
- */
-
-#define OFFSET_BITS 6
-
-/*
- * The pageMap is indexed by page number and returns an alternate page number
- * that identifies a unique page of characters.  Many Unicode characters map
- * to the same alternate page number.
- */
-
-static char pageMap[] = {
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 28, 28, 28, 28, 28, 28, 28, 29, 
-    30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 
-    28, 28, 47, 48, 49, 50, 51, 52, 53, 28, 28, 28, 54, 55, 56, 57, 58, 
-    59, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 60, 60, 
-    61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 75, 75, 
-    76, 77, 78, 28, 28, 79, 80, 81, 82, 83, 83, 84, 85, 86, 85, 28, 28, 
-    87, 88, 89, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 90, 91, 92, 93, 94, 56, 95, 28, 96, 97, 98, 99, 83, 100, 83, 
-    101, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 102, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 
-    28, 28, 28, 28, 28, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
-    56, 56, 56, 56, 56, 56, 56, 56, 56, 103, 28, 104, 104, 104, 104, 104, 
-    104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 
-    104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 56, 56, 56, 56, 106, 28, 28, 28, 107, 108, 109, 110, 56, 56, 56, 
-    56, 111, 112, 113, 114, 115, 116, 56, 117, 118, 119, 120, 121
-};
-
-/*
- * The groupMap is indexed by combining the alternate page number with
- * the page offset and returns a group number that identifies a unique
- * set of character attributes.
- */
-
-static char groupMap[] = {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 4, 3, 3, 3, 5, 6, 3, 7, 3, 8, 
-    3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 3, 7, 7, 7, 3, 3, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 5, 3, 6, 11, 12, 11, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 5, 7, 6, 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, 4, 
-    4, 14, 14, 11, 14, 15, 16, 7, 8, 14, 11, 14, 7, 17, 17, 11, 15, 14, 
-    3, 11, 17, 15, 18, 17, 17, 17, 3, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 7, 10, 10, 
-    10, 10, 10, 10, 10, 15, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 7, 13, 13, 13, 13, 
-    13, 13, 13, 19, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 22, 23, 20, 21, 20, 21, 20, 21, 15, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 15, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 24, 20, 21, 20, 21, 20, 21, 25, 15, 26, 20, 21, 
-    20, 21, 27, 20, 21, 28, 28, 20, 21, 15, 29, 30, 31, 20, 21, 28, 32, 
-    15, 33, 34, 20, 21, 15, 15, 33, 35, 15, 36, 20, 21, 20, 21, 20, 21, 
-    37, 20, 21, 38, 39, 15, 20, 21, 38, 20, 21, 40, 40, 20, 21, 20, 21, 
-    41, 20, 21, 15, 39, 20, 21, 39, 39, 39, 39, 39, 39, 42, 43, 44, 42, 
-    43, 44, 42, 43, 44, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 45, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 15, 42, 43, 44, 20, 21, 0, 0, 0, 0, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 15, 15, 15, 46, 47, 15, 48, 48, 15, 49, 15, 50, 15, 15, 15, 15, 
-    48, 15, 15, 51, 15, 15, 15, 15, 52, 53, 15, 15, 15, 15, 15, 53, 15, 
-    15, 54, 15, 15, 55, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-    15, 56, 15, 15, 15, 15, 56, 15, 57, 57, 15, 15, 15, 15, 15, 15, 58, 
-    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-    15, 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 59, 59, 59, 59, 59, 59, 59, 
-    59, 59, 11, 11, 59, 59, 59, 59, 59, 59, 59, 11, 11, 11, 11, 11, 11, 
-    11, 11, 11, 11, 11, 11, 11, 11, 59, 59, 11, 11, 11, 11, 11, 11, 11, 
-    11, 11, 11, 11, 11, 11, 0, 59, 59, 59, 59, 59, 11, 11, 11, 11, 11, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 3, 3, 0, 0, 0, 0, 59, 0, 0, 0, 3, 0, 0, 0, 0, 0, 11, 11, 61, 
-    3, 62, 62, 62, 0, 63, 0, 64, 64, 15, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 65, 66, 66, 66, 15, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 67, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    68, 69, 69, 0, 70, 71, 37, 37, 37, 72, 73, 0, 0, 0, 37, 0, 37, 0, 37, 
-    0, 37, 0, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 74, 
-    75, 45, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, 76, 76, 76, 
-    76, 76, 76, 76, 76, 76, 76, 76, 0, 76, 76, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 0, 75, 75, 75, 75, 75, 75, 75, 75, 75, 
-    75, 75, 75, 0, 75, 75, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 14, 60, 60, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 39, 20, 
-    21, 20, 21, 0, 0, 20, 21, 0, 0, 20, 21, 0, 0, 0, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 0, 0, 20, 21, 20, 21, 20, 21, 20, 21, 0, 0, 
-    20, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 0, 0, 59, 3, 3, 
-    3, 3, 3, 3, 0, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 
-    78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 
-    78, 78, 78, 78, 78, 78, 78, 78, 15, 0, 3, 0, 0, 0, 0, 0, 0, 0, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 60, 60, 60, 0, 60, 60, 60, 3, 60, 3, 60, 60, 3, 60, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    0, 0, 0, 0, 0, 39, 39, 39, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 3, 0, 0, 0, 3, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 
-    0, 0, 0, 0, 59, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 60, 60, 60, 
-    60, 60, 60, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 9, 3, 3, 3, 3, 0, 0, 60, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 39, 39, 
-    39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 0, 39, 39, 39, 39, 3, 39, 60, 60, 60, 60, 60, 60, 60, 79, 79, 
-    60, 60, 60, 60, 60, 60, 59, 59, 60, 60, 14, 60, 60, 60, 60, 0, 0, 9, 
-    9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 60, 80, 0, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 60, 39, 
-    80, 80, 80, 60, 60, 60, 60, 60, 60, 60, 60, 80, 80, 80, 80, 60, 0, 
-    0, 14, 60, 60, 60, 60, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 60, 60, 3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 80, 80, 0, 39, 39, 39, 39, 39, 39, 
-    39, 39, 0, 0, 39, 39, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 
-    39, 39, 39, 0, 39, 0, 0, 0, 39, 39, 39, 39, 0, 0, 60, 0, 80, 80, 80, 
-    60, 60, 60, 60, 0, 0, 80, 80, 0, 0, 80, 80, 60, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 80, 0, 0, 0, 0, 39, 39, 0, 39, 39, 39, 60, 60, 0, 0, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 9, 39, 39, 4, 4, 17, 17, 17, 17, 17, 17, 14, 0, 0, 
-    0, 0, 0, 0, 0, 60, 0, 0, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 39, 39, 
-    0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 0, 
-    39, 39, 0, 39, 39, 0, 0, 60, 0, 80, 80, 80, 60, 60, 0, 0, 0, 0, 60, 
-    60, 0, 0, 60, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 39, 39, 
-    39, 0, 39, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 60, 60, 
-    39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 60, 80, 0, 39, 
-    39, 39, 39, 39, 39, 39, 0, 39, 0, 39, 39, 39, 0, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    0, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 0, 39, 39, 39, 39, 39, 0, 
-    0, 60, 39, 80, 80, 80, 60, 60, 60, 60, 60, 0, 60, 60, 80, 0, 80, 80, 
-    60, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, 0, 
-    0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 60, 80, 80, 0, 39, 39, 39, 39, 39, 39, 39, 39, 
-    0, 0, 39, 39, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 
-    39, 0, 39, 39, 0, 0, 39, 39, 39, 39, 0, 0, 60, 39, 80, 60, 80, 60, 
-    60, 60, 0, 0, 0, 80, 80, 0, 0, 80, 80, 60, 0, 0, 0, 0, 0, 0, 0, 0, 
-    60, 80, 0, 0, 0, 0, 39, 39, 0, 39, 39, 39, 0, 0, 0, 0, 9, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 60, 80, 0, 39, 39, 39, 39, 39, 39, 0, 0, 0, 39, 39, 39, 0, 39, 
-    39, 39, 39, 0, 0, 0, 39, 39, 0, 39, 0, 39, 39, 0, 0, 0, 39, 39, 0, 
-    0, 0, 39, 39, 39, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 
-    39, 0, 0, 0, 0, 80, 80, 60, 80, 80, 0, 0, 0, 80, 80, 80, 0, 80, 80, 
-    80, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 17, 17, 17, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 0, 39, 39, 39, 39, 39, 39, 39, 
-    39, 0, 39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 0, 0, 0, 0, 60, 60, 60, 
-    80, 80, 80, 80, 0, 60, 60, 60, 0, 60, 60, 60, 60, 0, 0, 0, 0, 0, 0, 
-    0, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 39, 0, 0, 0, 0, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 80, 80, 0, 39, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 0, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    0, 39, 39, 39, 39, 39, 0, 0, 0, 0, 80, 60, 80, 80, 80, 80, 80, 0, 60, 
-    80, 80, 0, 80, 80, 60, 60, 0, 0, 0, 0, 0, 0, 0, 80, 80, 0, 0, 0, 0, 
-    0, 0, 0, 39, 0, 39, 39, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 0, 39, 39, 
-    39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 
-    0, 0, 0, 80, 80, 80, 60, 60, 60, 0, 0, 80, 80, 80, 0, 80, 80, 80, 60, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 0, 0, 0, 0, 0, 0, 39, 39, 0, 0, 
-    0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 3, 
-    39, 60, 39, 39, 60, 60, 60, 60, 60, 60, 60, 0, 0, 0, 0, 4, 39, 39, 
-    39, 39, 39, 39, 59, 60, 60, 60, 60, 60, 60, 60, 60, 14, 9, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 
-    39, 0, 39, 0, 0, 39, 39, 0, 39, 0, 0, 39, 0, 0, 0, 0, 0, 0, 39, 39, 
-    39, 39, 0, 39, 39, 39, 39, 39, 39, 39, 0, 39, 39, 39, 0, 39, 0, 39, 
-    0, 0, 39, 39, 0, 39, 39, 3, 39, 60, 39, 39, 60, 60, 60, 60, 60, 60, 
-    0, 60, 60, 39, 0, 0, 39, 39, 39, 39, 39, 0, 59, 0, 60, 60, 60, 60, 
-    60, 60, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 39, 39, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-    3, 3, 3, 3, 3, 3, 14, 14, 14, 14, 14, 60, 60, 14, 14, 14, 14, 14, 14, 
-    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    14, 60, 14, 60, 14, 60, 5, 6, 5, 6, 5, 6, 39, 39, 39, 39, 39, 39, 39, 
-    39, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 0, 0, 0, 0, 0, 0, 0, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 80, 60, 60, 60, 60, 60, 3, 60, 60, 14, 14, 14, 14, 0, 0, 
-    0, 0, 60, 60, 60, 60, 60, 60, 0, 60, 0, 60, 60, 60, 60, 60, 60, 60, 
-    60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, 0, 0, 60, 
-    60, 60, 60, 60, 60, 60, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 15, 15, 
-    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-    15, 0, 0, 0, 0, 3, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    0, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 0, 0, 0, 0, 0, 0, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 15, 15, 15, 15, 15, 81, 0, 0, 0, 0, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 
-    20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 21, 20, 
-    21, 20, 21, 0, 0, 0, 0, 0, 0, 82, 82, 82, 82, 82, 82, 82, 82, 83, 83, 
-    83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 0, 0, 83, 83, 83, 83, 
-    83, 83, 0, 0, 82, 82, 82, 82, 82, 82, 82, 82, 83, 83, 83, 83, 83, 83, 
-    83, 83, 82, 82, 82, 82, 82, 82, 82, 82, 83, 83, 83, 83, 83, 83, 83, 
-    83, 82, 82, 82, 82, 82, 82, 0, 0, 83, 83, 83, 83, 83, 83, 0, 0, 15, 
-    82, 15, 82, 15, 82, 15, 82, 0, 83, 0, 83, 0, 83, 0, 83, 82, 82, 82, 
-    82, 82, 82, 82, 82, 83, 83, 83, 83, 83, 83, 83, 83, 84, 84, 85, 85, 
-    85, 85, 86, 86, 87, 87, 88, 88, 89, 89, 0, 0, 82, 82, 82, 82, 82, 82, 
-    82, 82, 83, 83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, 
-    82, 83, 83, 83, 83, 83, 83, 83, 83, 82, 82, 82, 82, 82, 82, 82, 82, 
-    83, 83, 83, 83, 83, 83, 83, 83, 82, 82, 15, 90, 15, 0, 15, 15, 83, 
-    83, 91, 91, 92, 11, 37, 11, 11, 11, 15, 90, 15, 0, 15, 15, 93, 93, 
-    93, 93, 92, 11, 11, 11, 82, 82, 15, 15, 0, 0, 15, 15, 83, 83, 94, 94, 
-    0, 11, 11, 11, 82, 82, 15, 15, 15, 95, 15, 15, 83, 83, 96, 96, 97, 
-    11, 11, 11, 0, 0, 15, 90, 15, 0, 15, 15, 98, 98, 99, 99, 92, 11, 11, 
-    0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 100, 100, 100, 100, 8, 8, 8, 
-    8, 8, 8, 3, 3, 16, 18, 5, 16, 16, 18, 5, 16, 3, 3, 3, 3, 3, 3, 3, 3, 
-    101, 102, 100, 100, 100, 100, 100, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 16, 
-    18, 3, 3, 3, 3, 12, 12, 3, 3, 3, 7, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 100, 100, 100, 100, 100, 100, 17, 0, 0, 0, 17, 17, 17, 17, 
-    17, 17, 7, 7, 7, 5, 6, 15, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    7, 7, 7, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 79, 79, 79, 
-    79, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 37, 14, 14, 14, 14, 37, 14, 14, 
-    15, 37, 37, 37, 15, 15, 37, 37, 37, 15, 14, 37, 14, 14, 37, 37, 37, 
-    37, 37, 37, 14, 14, 14, 14, 14, 14, 37, 14, 37, 14, 37, 14, 37, 37, 
-    37, 37, 15, 15, 37, 37, 14, 37, 15, 39, 39, 39, 39, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 103, 103, 103, 103, 
-    103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 103, 104, 104, 
-    104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 
-    105, 105, 105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 7, 14, 7, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 14, 14, 14, 14, 14, 14, 7, 
-    7, 7, 7, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 7, 7, 14, 14, 14, 14, 14, 14, 14, 5, 6, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 106, 106, 106, 
-    106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, 
-    106, 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    0, 14, 14, 14, 14, 0, 14, 14, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 0, 14, 0, 14, 14, 14, 14, 0, 0, 0, 14, 
-    0, 14, 14, 14, 14, 14, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 14, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 14, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 2, 3, 3, 
-    3, 14, 59, 3, 105, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 14, 14, 5, 6, 5, 6, 
-    5, 6, 5, 6, 8, 5, 6, 6, 14, 105, 105, 105, 105, 105, 105, 105, 105, 
-    105, 60, 60, 60, 60, 60, 60, 8, 59, 59, 59, 59, 59, 14, 14, 0, 0, 0, 
-    0, 0, 0, 0, 14, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 0, 0, 0, 0, 60, 60, 59, 59, 59, 59, 0, 0, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 3, 59, 59, 59, 0, 0, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 
-    0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 14, 
-    14, 17, 17, 17, 17, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 0, 0, 0, 14, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 108, 108, 108, 108, 
-    108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-    108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-    108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-    108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 
-    108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 
-    109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 
-    109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 
-    109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 
-    109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 15, 15, 15, 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 15, 15, 15, 15, 15, 0, 0, 0, 0, 0, 0, 60, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 7, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 0, 39, 39, 39, 39, 39, 0, 39, 0, 39, 39, 0, 39, 
-    39, 0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 60, 60, 60, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 8, 8, 
-    12, 12, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 0, 0, 0, 0, 
-    3, 3, 3, 3, 12, 12, 12, 3, 3, 3, 0, 3, 3, 3, 3, 8, 5, 6, 5, 6, 5, 6, 
-    3, 3, 3, 7, 8, 7, 7, 7, 0, 3, 4, 3, 3, 0, 0, 0, 0, 39, 39, 39, 0, 39, 
-    0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 0, 0, 100, 0, 3, 3, 3, 4, 3, 3, 3, 5, 6, 3, 7, 3, 8, 
-    3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 3, 7, 7, 7, 3, 3, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 5, 3, 6, 11, 12, 11, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 5, 7, 6, 7, 0, 0, 3, 5, 6, 3, 3, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 59, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 59, 
-    59, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 
-    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 0, 0, 0, 
-    39, 39, 39, 39, 39, 39, 0, 0, 39, 39, 39, 39, 39, 39, 0, 0, 39, 39, 
-    39, 39, 39, 39, 0, 0, 39, 39, 39, 0, 0, 0, 4, 4, 7, 11, 14, 4, 4, 0, 
-    7, 7, 7, 7, 7, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 
-    0, 0
-};
-
-/*
- * Each group represents a unique set of character attributes.  The attributes
- * are encoded into a 32-bit value as follows:
- *
- * Bits 0-4	Character category: see the constants listed below.
- *
- * Bits 5-7	Case delta type: 000 = identity
- *				 010 = add delta for lower
- *				 011 = add delta for lower, add 1 for title
- *				 100 = sutract delta for title/upper
- *				 101 = sub delta for upper, sub 1 for title
- *				 110 = sub delta for upper, add delta for lower
- *
- * Bits 8-21	Reserved for future use.
- *
- * Bits 22-31	Case delta: delta for case conversions.  This should be the
- *			    highest field so we can easily sign extend.
- */
-
-static int groups[] = {
-    0, 15, 12, 25, 27, 21, 22, 26, 20, 9, 134217793, 28, 19, 134217858, 
-    29, 2, 23, 11, 24, -507510654, 4194369, 4194434, -834666431, 973078658, 
-    -507510719, 1258291330, 880803905, 864026689, 859832385, 331350081, 
-    847249473, 851443777, 868220993, 884998209, 876609601, 893386817, 
-    897581121, 1, 914358337, 5, 910164033, 918552641, 8388705, 4194499, 
-    8388770, 331350146, 880803970, 864026754, 859832450, 847249538, 
-    851443842, 868221058, 876609666, 884998274, 893386882, 897581186, 
-    914358402, 910164098, 918552706, 4, 6, 159383617, 155189313, 268435521, 
-    264241217, 159383682, 155189378, 130023554, 268435586, 264241282, 
-    260046978, 239075458, 197132418, 226492546, 360710274, 335544450, 
-    335544385, 201326657, 201326722, 7, 8, 247464066, -33554302, -33554367, 
-    -310378366, -360710014, -419430270, -536870782, -469761918, -528482174, 
-    -37748606, -310378431, -37748671, -360710079, -419430335, -29359998, 
-    -469761983, -29360063, -536870847, -528482239, 16, 13, 14, 67108938, 
-    67109002, 10, 109051997, 109052061, 18, 17
-};
-
-/*
- * The following constants are used to determine the category of a
- * Unicode character.
- */
-
-#define UNICODE_CATEGORY_MASK 0X1F
-
-enum {
-    UNASSIGNED,
-    UPPERCASE_LETTER,
-    LOWERCASE_LETTER,
-    TITLECASE_LETTER,
-    MODIFIER_LETTER,
-    OTHER_LETTER,
-    NON_SPACING_MARK,
-    ENCLOSING_MARK,
-    COMBINING_SPACING_MARK,
-    DECIMAL_DIGIT_NUMBER,
-    LETTER_NUMBER,
-    OTHER_NUMBER,
-    SPACE_SEPARATOR,
-    LINE_SEPARATOR,
-    PARAGRAPH_SEPARATOR,
-    CONTROL,
-    FORMAT,
-    PRIVATE_USE,
-    SURROGATE,
-    CONNECTOR_PUNCTUATION,
-    DASH_PUNCTUATION,
-    OPEN_PUNCTUATION,
-    CLOSE_PUNCTUATION,
-    INITIAL_QUOTE_PUNCTUATION,
-    FINAL_QUOTE_PUNCTUATION,
-    OTHER_PUNCTUATION,
-    MATH_SYMBOL,
-    CURRENCY_SYMBOL,
-    MODIFIER_SYMBOL,
-    OTHER_SYMBOL
-};
-
-/*
- * The following macros extract the fields of the character info.  The
- * GetDelta() macro is complicated because we can't rely on the C compiler
- * to do sign extension on right shifts.
- */
-
-#define GetCaseType(info) (((info) & 0xE0) >> 5)
-#define GetCategory(info) ((info) & 0x1F)
-#define GetDelta(infO) (((info) > 0) ? ((info) >> 22) : (~(~((info)) >> 22)))
-
-/*
- * This macro extracts the information about a character from the
- * Unicode character tables.
- */
-
-#define GetUniCharInfo(ch) (groups[(int)groupMap[(int)((pageMap[(((int)(ch)) & 0xffff) >> OFFSET_BITS] << OFFSET_BITS) | ((ch) & ((1 << OFFSET_BITS)-1)))]])
-
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
deleted file mode 100644
index 89c6b60..0000000
--- a/generic/tclUtf.c
+++ /dev/null
@@ -1,1287 +0,0 @@
-/*
- * tclUtf.c --
- *
- *	Routines for manipulating UTF-8 strings.
- *
- * Copyright (c) 1997-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUtf.c,v 1.2 1999/04/16 00:46:55 stanton Exp $
- */
-
-#include "tclInt.h"
-
-/*
- * Include the static character classification tables and macros.
- */
-
-#include "tclUniData.c"
-
-/*
- * The following macros are used for fast character category tests.  The
- * x_BITS values are shifted right by the category value to determine whether
- * the given category is included in the set.
- */ 
-
-#define ALPHA_BITS ((1 << UPPERCASE_LETTER) | (1 << LOWERCASE_LETTER) \
-    | (1 << TITLECASE_LETTER) | (1 << MODIFIER_LETTER) | (1 << OTHER_LETTER))
-
-#define DIGIT_BITS (1 << DECIMAL_DIGIT_NUMBER)
-
-#define SPACE_BITS ((1 << SPACE_SEPARATOR) | (1 << LINE_SEPARATOR) \
-    | (1 << PARAGRAPH_SEPARATOR))
-
-#define CONNECTOR_BITS (1 << CONNECTOR_PUNCTUATION)
-
-/*
- * Unicode characters less than this value are represented by themselves 
- * in UTF-8 strings. 
- */
-
-#define UNICODE_SELF	0x80
-
-/*
- * The following structures are used when mapping between Unicode (UCS-2)
- * and UTF-8.
- */
- 
-CONST unsigned char totalBytes[256] = {
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-#if TCL_UTF_MAX > 3
-    4,4,4,4,4,4,4,4,
-#else
-    1,1,1,1,1,1,1,1,
-#endif
-#if TCL_UTF_MAX > 4
-    5,5,5,5,
-#else
-    1,1,1,1,
-#endif
-#if TCL_UTF_MAX > 5
-    6,6,6,6
-#else
-    1,1,1,1
-#endif
-};
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UniCharToUtf --
- *
- *	Store the given Tcl_UniChar as a sequence of UTF-8 bytes in the
- *	provided buffer.  Equivalent to Plan 9 runetochar().
- *
- * Results:
- *	The return values is the number of bytes in the buffer that
- *	were consumed.  
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-INLINE int
-Tcl_UniCharToUtf(ch, str)
-    int ch;			/* The Tcl_UniChar to be stored in the
-				 * buffer. */
-    char *str;			/* Buffer in which the UTF-8 representation
-				 * of the Tcl_UniChar is stored.  Buffer must
-				 * be large enough to hold the UTF-8 character
-				 * (at most TCL_UTF_MAX bytes). */
-{
-    if ((ch > 0) && (ch < UNICODE_SELF)) {
-	str[0] = (char) ch;
-	return 1;
-    }
-    if (ch <= 0x7FF) {
-	str[1] = (char) ((ch | 0x80) & 0xBF);
-	str[0] = (char) ((ch >> 6) | 0xC0);
-	return 2;
-    }
-    if (ch <= 0xFFFF) {
-	three:
-	str[2] = (char) ((ch | 0x80) & 0xBF);
-	str[1] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	str[0] = (char) ((ch >> 12) | 0xE0);
-	return 3;
-    }
-
-#if TCL_UTF_MAX > 3
-    if (ch <= 0x1FFFFF) {
-	str[3] = (char) ((ch | 0x80) & 0xBF);
-	str[2] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	str[1] = (char) (((ch >> 12) | 0x80) & 0xBF);
-	str[0] = (char) ((ch >> 18) | 0xF0);
-	return 4;
-    }
-    if (ch <= 0x3FFFFFF) {
-	str[4] = (char) ((ch | 0x80) & 0xBF);
-	str[3] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	str[2] = (char) (((ch >> 12) | 0x80) & 0xBF);
-	str[1] = (char) (((ch >> 18) | 0x80) & 0xBF);
-	str[0] = (char) ((ch >> 24) | 0xF8);
-	return 5;
-    }
-    if (ch <= 0x7FFFFFFF) {
-	str[5] = (char) ((ch | 0x80) & 0xBF);
-	str[4] = (char) (((ch >> 6) | 0x80) & 0xBF);
-	str[3] = (char) (((ch >> 12) | 0x80) & 0xBF);
-	str[2] = (char) (((ch >> 18) | 0x80) & 0xBF);
-	str[1] = (char) (((ch >> 24) | 0x80) & 0xBF);
-	str[0] = (char) ((ch >> 30) | 0xFC);
-	return 6;
-    }
-#endif
-
-    ch = 0xFFFD;
-    goto three;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UniCharToUtfDString --
- *
- *	Convert the given Unicode string to UTF-8.
- *
- * Results:
- *	The return value is a pointer to the UTF-8 representation of the
- *	Unicode string.  Storage for the return value is appended to the
- *	end of dsPtr.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-char *
-Tcl_UniCharToUtfDString(wString, numChars, dsPtr)
-    CONST Tcl_UniChar *wString;	/* Unicode string to convert to UTF-8. */
-    int numChars;		/* Length of Unicode string in Tcl_UniChars
-				 * (must be >= 0). */
-    Tcl_DString *dsPtr;		/* UTF-8 representation of string is
-				 * appended to this previously initialized
-				 * DString. */
-{
-    CONST Tcl_UniChar *w, *wEnd;
-    char *p, *string;
-    int oldLength;
-
-    /*
-     * UTF-8 string length in bytes will be <= Unicode string length *
-     * TCL_UTF_MAX.
-     */
-
-    oldLength = Tcl_DStringLength(dsPtr);
-    Tcl_DStringSetLength(dsPtr, (oldLength + numChars + 1) * TCL_UTF_MAX);
-    string = Tcl_DStringValue(dsPtr) + oldLength;
-
-    p = string;
-    wEnd = wString + numChars;
-    for (w = wString; w < wEnd; ) {
-	p += Tcl_UniCharToUtf(*w, p);
-	w++;
-    }
-    Tcl_DStringSetLength(dsPtr, oldLength + (p - string));
-
-    return string;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfToUniChar --
- *
- *	Extract the Tcl_UniChar represented by the UTF-8 string.  Bad
- *	UTF-8 sequences are converted to valid Tcl_UniChars and processing
- *	continues.  Equivalent to Plan 9 chartorune().
- *
- *	The caller must ensure that the source buffer is long enough that
- *	this routine does not run off the end and dereference non-existent
- *	memory looking for trail bytes.  If the source buffer is known to
- *	be '\0' terminated, this cannot happen.  Otherwise, the caller
- *	should call Tcl_UtfCharComplete() before calling this routine to
- *	ensure that enough bytes remain in the string.
- *
- * Results:
- *	*chPtr is filled with the Tcl_UniChar, and the return value is the
- *	number of bytes from the UTF-8 string that were consumed.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-int
-Tcl_UtfToUniChar(str, chPtr)
-    register CONST char *str;	 /* The UTF-8 string. */
-    register Tcl_UniChar *chPtr; /* Filled with the Tcl_UniChar represented
-				  * by the UTF-8 string. */
-{
-    register int byte;
-    
-    /*
-     * Unroll 1 to 3 byte UTF-8 sequences, use loop to handle longer ones.
-     */
-
-    byte = *((unsigned char *) str);
-    if (byte < 0xC0) {
-	/*
-	 * Handles properly formed UTF-8 characters between 0x01 and 0x7F.
-	 * Also treats \0 and naked trail bytes 0x80 to 0xBF as valid
-	 * characters representing themselves.
-	 */
-	 
-	*chPtr = (Tcl_UniChar) byte;
-	return 1;
-    } else if (byte < 0xE0) {
-	if ((str[1] & 0xC0) == 0x80) {
-	    /*
-	     * Two-byte-character lead-byte followed by a trail-byte.
-	     */
-	     
-	    *chPtr = (Tcl_UniChar) (((byte & 0x1F) << 6) | (str[1] & 0x3F));
-	    return 2;
-	}
-	/*
-	 * A two-byte-character lead-byte not followed by trail-byte
-	 * represents itself.
-	 */
-	 
-	*chPtr = (Tcl_UniChar) byte;
-	return 1;
-    } else if (byte < 0xF0) {
-	if (((str[1] & 0xC0) == 0x80) && ((str[2] & 0xC0) == 0x80)) {
-	    /*
-	     * Three-byte-character lead byte followed by two trail bytes.
-	     */
-
-	    *chPtr = (Tcl_UniChar) (((byte & 0x0F) << 12) 
-		    | ((str[1] & 0x3F) << 6) | (str[2] & 0x3F));
-	    return 3;
-	}
-	/*
-	 * A three-byte-character lead-byte not followed by two trail-bytes
-	 * represents itself.
-	 */
-
-	*chPtr = (Tcl_UniChar) byte;
-	return 1;
-    }
-#if TCL_UTF_MAX > 3
-    else {
-	int ch, total, trail;
-
-	total = totalBytes[byte];
-	trail = total - 1;
-	if (trail > 0) {
-	    ch = byte & (0x3F >> trail);
-	    do {
-		str++;
-		if ((*str & 0xC0) != 0x80) {
-		    *chPtr = byte;
-		    return 1;
-		}
-		ch <<= 6;
-		ch |= (*str & 0x3F);
-		trail--;
-	    } while (trail > 0);
-	    *chPtr = ch;
-	    return total;
-	}
-    }
-#endif
-
-    *chPtr = (Tcl_UniChar) byte;
-    return 1;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfToUniCharDString --
- *
- *	Convert the UTF-8 string to Unicode.
- *
- * Results:
- *	The return value is a pointer to the Unicode representation of the
- *	UTF-8 string.  Storage for the return value is appended to the
- *	end of dsPtr.  The Unicode string is terminated with a Unicode
- *	NULL character.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-Tcl_UniChar *
-Tcl_UtfToUniCharDString(string, length, dsPtr)
-    CONST char *string;		/* UTF-8 string to convert to Unicode. */
-    int length;			/* Length of UTF-8 string in bytes, or -1
-				 * for strlen(). */
-    Tcl_DString *dsPtr;		/* Unicode representation of string is
-				 * appended to this previously initialized
-				 * DString. */
-{
-    Tcl_UniChar *w, *wString;
-    CONST char *p, *end;
-    int oldLength;
-
-    if (length < 0) {
-	length = strlen(string);
-    }
-
-    /*
-     * Unicode string length in Tcl_UniChars will be <= UTF-8 string length
-     * in bytes.
-     */
-
-    oldLength = Tcl_DStringLength(dsPtr);
-    Tcl_DStringSetLength(dsPtr,
-	    (int) ((oldLength + length + 1) * sizeof(Tcl_UniChar)));
-    wString = (Tcl_UniChar *) (Tcl_DStringValue(dsPtr) + oldLength);
-
-    w = wString;
-    end = string + length;
-    for (p = string; p < end; ) {
-	p += Tcl_UtfToUniChar(p, w);
-	w++;
-    }
-    *w = '\0';
-    Tcl_DStringSetLength(dsPtr,
-	    (oldLength + ((char *) w - (char *) wString)));
-
-    return wString;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfCharComplete --
- *
- *	Determine if the UTF-8 string of the given length is long enough
- *	to be decoded by Tcl_UtfToUniChar().  This does not ensure that the
- *	UTF-8 string is properly formed.  Equivalent to Plan 9 fullrune().
- *
- * Results:
- *	The return value is 0 if the string is not long enough, non-zero
- *	otherwise.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_UtfCharComplete(str, len)
-    CONST char *str;		/* String to check if first few bytes
-				 * contain a complete UTF-8 character. */
-    int len;			/* Length of above string in bytes. */
-{
-    int ch;
-
-    ch = *((unsigned char *) str);
-    return len >= totalBytes[ch];
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_NumUtfChars --
- *
- *	Returns the number of characters (not bytes) in the UTF-8 string,
- *	not including the terminating NULL byte.  This is equivalent to
- *	Plan 9 utflen() and utfnlen().
- *
- * Results:
- *	As above.  
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-int 
-Tcl_NumUtfChars(str, len)
-    register CONST char *str;	/* The UTF-8 string to measure. */
-    int len;			/* The length of the string in bytes, or -1
-				 * for strlen(string). */
-{
-    Tcl_UniChar ch;
-    register Tcl_UniChar *chPtr = &ch;
-    register int n;
-    int i;
-
-    /*
-     * The separate implementations are faster.
-     */
-     
-    i = 0;
-    if (len < 0) {
-	while (1) {
-	    str += Tcl_UtfToUniChar(str, chPtr);
-	    if (ch == '\0') {
-		break;
-	    }
-	    i++;
-	}
-    } else {
-	while (len > 0) {
-	    n = Tcl_UtfToUniChar(str, chPtr);
-	    len -= n;
-	    str += n;
-	    i++;
-	}
-    }
-    return i;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfFindFirst --
- *
- *	Returns a pointer to the first occurance of the given Tcl_UniChar
- *	in the NULL-terminated UTF-8 string.  The NULL terminator is
- *	considered part of the UTF-8 string.  Equivalent to Plan 9
- *	utfrune().
- *
- * Results:
- *	As above.  If the Tcl_UniChar does not exist in the given string,
- *	the return value is NULL.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-char *
-Tcl_UtfFindFirst(string, ch)
-    CONST char *string;		/* The UTF-8 string to be searched. */
-    int ch;			/* The Tcl_UniChar to search for. */
-{
-    int len;
-    Tcl_UniChar find;
-    
-    while (1) {
-	len = Tcl_UtfToUniChar(string, &find);
-	if (find == ch) {
-	    return (char *) string;
-	}
-	if (*string == '\0') {
-	    return NULL;
-	}
-	string += len;
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfFindLast --
- *
- *	Returns a pointer to the last occurance of the given Tcl_UniChar
- *	in the NULL-terminated UTF-8 string.  The NULL terminator is
- *	considered part of the UTF-8 string.  Equivalent to Plan 9
- *	utfrrune().
- *
- * Results:
- *	As above.  If the Tcl_UniChar does not exist in the given string,
- *	the return value is NULL.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-Tcl_UtfFindLast(string, ch)
-    CONST char *string;		/* The UTF-8 string to be searched. */
-    int ch;			/* The Tcl_UniChar to search for. */
-{
-    int len;
-    Tcl_UniChar find;
-    CONST char *last;
-	
-    last = NULL;
-    while (1) {
-	len = Tcl_UtfToUniChar(string, &find);
-	if (find == ch) {
-	    last = string;
-	}
-	if (*string == '\0') {
-	    break;
-	}
-	string += len;
-    }
-    return (char *) last;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfNext --
- *
- *	Given a pointer to some current location in a UTF-8 string,
- *	move forward one character.  The caller must ensure that they
- *	are not asking for the next character after the last character
- *	in the string.
- *
- * Results:
- *	The return value is the pointer to the next character in
- *	the UTF-8 string.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-char *
-Tcl_UtfNext(str) 
-    CONST char *str;		    /* The current location in the string. */
-{
-    Tcl_UniChar ch;
-
-    return (char *) str + Tcl_UtfToUniChar(str, &ch);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfPrev --
- *
- *	Given a pointer to some current location in a UTF-8 string,
- *	move backwards one character.
- *
- * Results:
- *	The return value is a pointer to the previous character in the
- *	UTF-8 string.  If the current location was already at the
- *	beginning of the string, the return value will also be a
- *	pointer to the beginning of the string.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-Tcl_UtfPrev(str, start)
-    CONST char *str;		    /* The current location in the string. */
-    CONST char *start;		    /* Pointer to the beginning of the
-				     * string, to avoid going backwards too
-				     * far. */
-{
-    CONST char *look;
-    int i, byte;
-    
-    str--;
-    look = str;
-    for (i = 0; i < TCL_UTF_MAX; i++) {
-	if (look < start) {
-	    if (str < start) {
-		str = start;
-	    }
-	    break;
-	}
-	byte = *((unsigned char *) look);
-	if (byte < 0x80) {
-	    break;
-	} 
-	if (byte >= 0xC0) {
-	    if (totalBytes[byte] != i + 1) {
-		break;
-	    }
-	    return (char *) look;
-	}
-	look--;
-    }
-    return (char *) str;
-}
-	
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UniCharAtIndex --
- *
- *	Returns the Unicode character represented at the specified
- *	character (not byte) position in the UTF-8 string.
- *
- * Results:
- *	As above.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-Tcl_UniChar
-Tcl_UniCharAtIndex(src, index)
-    register CONST char *src;	/* The UTF-8 string to dereference. */
-    register int index;		/* The position of the desired character. */
-{
-    Tcl_UniChar ch;
-
-    while (index >= 0) {
-	index--;
-	src += Tcl_UtfToUniChar(src, &ch);
-    }
-    return ch;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfAtIndex --
- *
- *	Returns a pointer to the specified character (not byte) position
- *	in the UTF-8 string.
- *
- * Results:
- *	As above.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-Tcl_UtfAtIndex(src, index)
-    register CONST char *src;	/* The UTF-8 string. */
-    register int index;		/* The position of the desired character. */
-{
-    Tcl_UniChar ch;
-    
-    while (index > 0) {
-	index--;
-	src += Tcl_UtfToUniChar(src, &ch);
-    }
-    return (char *) src;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_UtfBackslash --
- *
- *	Figure out how to handle a backslash sequence.
- *
- * Results:
- *	Stores the bytes represented by the backslash sequence in dst and
- *	returns the number of bytes written to dst.  At most TCL_UTF_MAX
- *	bytes are written to dst; dst must have been large enough to accept
- *	those bytes.  If readPtr isn't NULL then it is filled in with a
- *	count of the number of bytes in the backslash sequence.  
- *
- * Side effects:
- *	The maximum number of bytes it takes to represent a Unicode
- *	character in UTF-8 is guaranteed to be less than the number of
- *	bytes used to express the backslash sequence that represents
- *	that Unicode character.  If the target buffer into which the
- *	caller is going to store the bytes that represent the Unicode
- *	character is at least as large as the source buffer from which
- *	the backslashed sequence was extracted, no buffer overruns should
- *	occur.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-Tcl_UtfBackslash(src, readPtr, dst)
-    CONST char *src;		/* Points to the backslash character of
-				 * a backslash sequence. */
-    int *readPtr;		/* Fill in with number of characters read
-				 * from src, unless NULL. */
-    char *dst;			/* Filled with the bytes represented by the
-				 * backslash sequence. */
-{
-    register CONST char *p = src+1;
-    int result, count, n;
-    char buf[TCL_UTF_MAX];
-
-    if (dst == NULL) {
-	dst = buf;
-    }
-
-    count = 2;
-    switch (*p) {
-	/*
-         * Note: in the conversions below, use absolute values (e.g.,
-         * 0xa) rather than symbolic values (e.g. \n) that get converted
-         * by the compiler.  It's possible that compilers on some
-         * platforms will do the symbolic conversions differently, which
-         * could result in non-portable Tcl scripts.
-         */
-
-        case 'a':
-            result = 0x7;
-            break;
-        case 'b':
-            result = 0x8;
-            break;
-        case 'f':
-            result = 0xc;
-            break;
-        case 'n':
-            result = 0xa;
-            break;
-        case 'r':
-            result = 0xd;
-            break;
-        case 't':
-            result = 0x9;
-            break;
-        case 'v':
-            result = 0xb;
-            break;
-        case 'x':
-            if (isxdigit(UCHAR(p[1]))) { /* INTL: digit */
-                char *end;
-
-                result = (unsigned char) strtoul(p+1, &end, 16);
-                count = end - src;
-            } else {
-                count = 2;
-                result = 'x';
-            }
-            break;
-	case 'u':
-	    result = 0;
-	    for (count = 0; count < 4; count++) {
-		p++;
-		if (!isxdigit(UCHAR(*p))) { /* INTL: digit */
-		    break;
-		}
-		n = *p - '0';
-		if (n > 9) {
-		    n = n + '0' + 10 - 'A';
-		}
-		if (n > 16) {
-		    n = n + 'A' - 'a';
-		}
-		result = (result << 4) + n;
-	    }
-	    if (count == 0) {
-		result = 'u';
-	    }
-	    count += 2;
-	    break;
-		    
-        case '\n':
-            do {
-                p++;
-            } while ((*p == ' ') || (*p == '\t'));
-            result = ' ';
-            count = p - src;
-            break;
-        case 0:
-            result = '\\';
-            count = 1;
-            break;
-	default:
-	    if (isdigit(UCHAR(*p))) { /* INTL: digit */
-		result = (unsigned char)(*p - '0');
-		p++;
-		if (!isdigit(UCHAR(*p))) { /* INTL: digit */
-		    break;
-		}
-		count = 3;
-		result = (unsigned char)((result << 3) + (*p - '0'));
-		p++;
-		if (!isdigit(UCHAR(*p))) { /* INTL: digit */
-		    break;
-		}
-		count = 4;
-		result = (unsigned char)((result << 3) + (*p - '0'));
-		break;
-	    }
-	    result = *p;
-	    count = 2;
-	    break;
-    }
-
-    if (readPtr != NULL) {
-	*readPtr = count;
-    }
-    return Tcl_UniCharToUtf(result, dst);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UtfToUpper --
- *
- *	Convert lowercase characters to uppercase characters in a UTF
- *	string in place.  The conversion may shrink the UTF string.
- *
- * Results:
- *	Returns the number of bytes in the resulting string
- *	excluding the trailing null.
- *
- * Side effects:
- *	Writes a terminating null after the last converted character.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UtfToUpper(str)
-    char *str;			/* String to convert in place. */
-{
-    Tcl_UniChar ch;
-    char *src, *dst;
-    
-    /*
-     * Iterate over the string until we hit the terminating null.
-     */
-
-    src = dst = str;
-    while (*src) {
-	src += Tcl_UtfToUniChar(src, &ch);
-	dst += Tcl_UniCharToUtf(Tcl_UniCharToUpper(ch), dst);
-    }
-    *dst = '\0';
-    return (dst - str);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UtfToLower --
- *
- *	Convert uppercase characters to lowercase characters in a UTF
- *	string in place.  The conversion may shrink the UTF string.
- *
- * Results:
- *	Returns the number of bytes in the resulting string
- *	excluding the trailing null.
- *
- * Side effects:
- *	Writes a terminating null after the last converted character.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UtfToLower(str)
-    char *str;			/* String to convert in place. */
-{
-    Tcl_UniChar ch;
-    char *src, *dst;
-    
-    /*
-     * Iterate over the string until we hit the terminating null.
-     */
-
-    src = dst = str;
-    while (*src) {
-	src += Tcl_UtfToUniChar(src, &ch);
-	dst += Tcl_UniCharToUtf(Tcl_UniCharToLower(ch), dst);
-    }
-    *dst = '\0';
-    return (dst - str);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UtfToTitle --
- *
- *	Changes the first character of a UTF string to title case or
- *	uppercase and the rest of the string to lowercase.  The
- *	conversion happens in place and may shrink the UTF string.
- *
- * Results:
- *	Returns the number of bytes in the resulting string
- *	excluding the trailing null.
- *
- * Side effects:
- *	Writes a terminating null after the last converted character.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UtfToTitle(str)
-    char *str;			/* String to convert in place. */
-{
-    Tcl_UniChar ch;
-    char *src, *dst;
-    
-    /*
-     * Capitalize the first character and then lowercase the rest of the
-     * characters until we get to a null.
-     */
-
-    src = dst = str;
-
-    if (*src) {
-	src += Tcl_UtfToUniChar(src, &ch);
-	dst += Tcl_UniCharToUtf(Tcl_UniCharToTitle(ch), dst);
-    }
-    while (*src) {
-	src += Tcl_UtfToUniChar(src, &ch);
-	dst += Tcl_UniCharToUtf(Tcl_UniCharToLower(ch), dst);
-    }
-    *dst = '\0';
-    return (dst - str);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharToUpper --
- *
- *	Compute the uppercase equivalent of the given Unicode character.
- *
- * Results:
- *	Returns the uppercase Unicode character.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_UniChar
-Tcl_UniCharToUpper(ch)
-    int ch;			/* Unicode character to convert. */
-{
-    int info = GetUniCharInfo(ch);
-
-    if (GetCaseType(info) & 0x04) {
-	return (Tcl_UniChar) (ch - GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharToLower --
- *
- *	Compute the lowercase equivalent of the given Unicode character.
- *
- * Results:
- *	Returns the lowercase Unicode character.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_UniChar
-Tcl_UniCharToLower(ch)
-    int ch;			/* Unicode character to convert. */
-{
-    int info = GetUniCharInfo(ch);
-
-    if (GetCaseType(info) & 0x02) {
-	return (Tcl_UniChar) (ch + GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharToTitle --
- *
- *	Compute the titlecase equivalent of the given Unicode character.
- *
- * Results:
- *	Returns the titlecase Unicode character.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_UniChar
-Tcl_UniCharToTitle(ch)
-    int ch;			/* Unicode character to convert. */
-{
-    int info = GetUniCharInfo(ch);
-    int mode = GetCaseType(info);
-
-    if (mode & 0x1) {
-	/*
-	 * Subtract or add one depending on the original case.
-	 */
-
-	return (Tcl_UniChar) (ch + ((mode & 0x4) ? -1 : 1));
-    } else if (mode == 0x4) {
-	return (Tcl_UniChar) (ch - GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharLen --
- *
- *	Find the length of a UniChar string.  The str input must be null
- *	terminated.
- *
- * Results:
- *	Returns the length of str in UniChars (not bytes).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharLen(str)
-    Tcl_UniChar *str;		/* Unicode string to find length of. */
-{
-    int len = 0;
-    
-    while (*str != '\0') {
-	len++;
-	str++;
-    }
-    return len;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharNcmp --
- *
- *	Compare at most n unichars of string cs to string ct.  Both cs
- *	and ct are assumed to be at least n unichars long.
- *
- * Results:
- *	Return <0 if cs < ct, 0 if cs == ct, or >0 if cs > ct.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharNcmp(cs, ct, n)
-    CONST Tcl_UniChar *cs;		/* Unicode string to compare to ct. */
-    CONST Tcl_UniChar *ct;		/* Unicode string cs is compared to. */
-    size_t n;				/* Number of unichars to compare. */
-{
-    for ( ; n != 0; n--, cs++, ct++) {
-	if (*cs != *ct) {
-	    return *cs - *ct;
-	}
-	if (*cs == '\0') {
-	    break;
-	}
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsAlnum --
- *
- *	Test if a character is an alphanumeric Unicode character.
- *
- * Results:
- *	Returns 1 if character is alphanumeric.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsAlnum(ch)
-    int ch;			/* Unicode character to test. */
-{
-    register int category = (GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK);
-
-    return (((ALPHA_BITS | DIGIT_BITS) >> category) & 1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsAlpha --
- *
- *	Test if a character is an alphabetic Unicode character.
- *
- * Results:
- *	Returns 1 if character is alphabetic.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsAlpha(ch)
-    int ch;			/* Unicode character to test. */
-{
-    register int category = (GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK);
-    return ((ALPHA_BITS >> category) & 1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsDigit --
- *
- *	Test if a character is a numeric Unicode character.
- *
- * Results:
- *	Returns non-zero if character is a digit.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsDigit(ch)
-    int ch;			/* Unicode character to test. */
-{
-    return ((GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK)
-	    == DECIMAL_DIGIT_NUMBER);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsLower --
- *
- *	Test if a character is a lowercase Unicode character.
- *
- * Results:
- *	Returns non-zero if character is lowercase.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsLower(ch)
-    int ch;			/* Unicode character to test. */
-{
-    return ((GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK) == LOWERCASE_LETTER);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsSpace --
- *
- *	Test if a character is a whitespace Unicode character.
- *
- * Results:
- *	Returns non-zero if character is a space.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsSpace(ch)
-    int ch;			/* Unicode character to test. */
-{
-    register int category;
-
-    /*
-     * If the character is within the first 127 characters, just use the
-     * standard C function, otherwise consult the Unicode table.
-     */
-
-    if (ch < 0x80) {
-	return isspace(UCHAR(ch)); /* INTL: ISO space */
-    } else {
-	category = (GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK);
-	return ((SPACE_BITS >> category) & 1);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsUpper --
- *
- *	Test if a character is a uppercase Unicode character.
- *
- * Results:
- *	Returns non-zero if character is uppercase.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsUpper(ch)
-    int ch;			/* Unicode character to test. */
-{
-    return ((GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK) == UPPERCASE_LETTER);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsWordChar --
- *
- *	Test if a character is alphanumeric or a connector punctuation
- *	mark.
- *
- * Results:
- *	Returns 1 if character is a word character.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsWordChar(ch)
-    int ch;			/* Unicode character to test. */
-{
-    register int category = (GetUniCharInfo(ch) & UNICODE_CATEGORY_MASK);
-
-    return (((ALPHA_BITS | DIGIT_BITS | CONNECTOR_BITS) >> category) & 1);
-}
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
deleted file mode 100644
index 54811df..0000000
--- a/generic/tclUtil.c
+++ /dev/null
@@ -1,2160 +0,0 @@
-/* 
- * tclUtil.c --
- *
- *	This file contains utility procedures that are used by many Tcl
- *	commands.
- *
- * Copyright (c) 1987-1993 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- *  RCS: @(#) $Id: tclUtil.c,v 1.5 1999/04/16 00:46:55 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The following variable holds the full path name of the binary
- * from which this application was executed, or NULL if it isn't
- * know.  The value of the variable is set by the procedure
- * Tcl_FindExecutable.  The storage space is dynamically allocated.
- */
-
-char *tclExecutableName = NULL;
-char *tclNativeExecutableName = NULL;
-
-/*
- * The following values are used in the flags returned by Tcl_ScanElement
- * and used by Tcl_ConvertElement.  The value TCL_DONT_USE_BRACES is also
- * defined in tcl.h;  make sure its value doesn't overlap with any of the
- * values below.
- *
- * TCL_DONT_USE_BRACES -	1 means the string mustn't be enclosed in
- *				braces (e.g. it contains unmatched braces,
- *				or ends in a backslash character, or user
- *				just doesn't want braces);  handle all
- *				special characters by adding backslashes.
- * USE_BRACES -			1 means the string contains a special
- *				character that can be handled simply by
- *				enclosing the entire argument in braces.
- * BRACES_UNMATCHED -		1 means that braces aren't properly matched
- *				in the argument.
- */
-
-#define USE_BRACES		2
-#define BRACES_UNMATCHED	4
-
-/*
- * The following values determine the precision used when converting
- * floating-point values to strings.  This information is linked to all
- * of the tcl_precision variables in all interpreters via the procedure
- * TclPrecTraceProc.
- */
-
-static char precisionString[10] = "12";
-				/* The string value of all the tcl_precision
-				 * variables. */
-static char precisionFormat[10] = "%.12g";
-				/* The format string actually used in calls
-				 * to sprintf. */
-TCL_DECLARE_MUTEX(precisionMutex)
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFindElement --
- *
- *	Given a pointer into a Tcl list, locate the first (or next)
- *	element in the list.
- *
- * Results:
- *	The return value is normally TCL_OK, which means that the
- *	element was successfully located.  If TCL_ERROR is returned
- *	it means that list didn't have proper list structure;
- *	the interp's result contains a more detailed error message.
- *
- *	If TCL_OK is returned, then *elementPtr will be set to point to the
- *	first element of list, and *nextPtr will be set to point to the
- *	character just after any white space following the last character
- *	that's part of the element. If this is the last argument in the
- *	list, then *nextPtr will point just after the last character in the
- *	list (i.e., at the character at list+listLength). If sizePtr is
- *	non-NULL, *sizePtr is filled in with the number of characters in the
- *	element.  If the element is in braces, then *elementPtr will point
- *	to the character after the opening brace and *sizePtr will not
- *	include either of the braces. If there isn't an element in the list,
- *	*sizePtr will be zero, and both *elementPtr and *termPtr will point
- *	just after the last character in the list. Note: this procedure does
- *	NOT collapse backslash sequences.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclFindElement(interp, list, listLength, elementPtr, nextPtr, sizePtr,
-	       bracePtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. 
-				 * If NULL, then no error message is left
-				 * after errors. */
-    CONST char *list;		/* Points to the first byte of a string
-				 * containing a Tcl list with zero or more
-				 * elements (possibly in braces). */
-    int listLength;		/* Number of bytes in the list's string. */
-    CONST char **elementPtr;	/* Where to put address of first significant
-				 * character in first element of list. */
-    CONST char **nextPtr;	/* Fill in with location of character just
-				 * after all white space following end of
-				 * argument (next arg or end of list). */
-    int *sizePtr;		/* If non-zero, fill in with size of
-				 * element. */
-    int *bracePtr;		/* If non-zero, fill in with non-zero/zero
-				 * to indicate that arg was/wasn't
-				 * in braces. */
-{
-    CONST char *p = list;
-    CONST char *elemStart;	/* Points to first byte of first element. */
-    CONST char *limit;		/* Points just after list's last byte. */
-    int openBraces = 0;		/* Brace nesting level during parse. */
-    int inQuotes = 0;
-    int size = 0;		/* lint. */
-    int numChars;
-    CONST char *p2;
-    
-    /*
-     * Skim off leading white space and check for an opening brace or
-     * quote. We treat embedded NULLs in the list as bytes belonging to
-     * a list element.
-     */
-
-    limit = (list + listLength);
-    while ((p < limit) && (isspace(UCHAR(*p)))) { /* INTL: ISO space. */
-	p++;
-    }
-    if (p == limit) {		/* no element found */
-	elemStart = limit;
-	goto done;
-    }
-
-    if (*p == '{') {
-	openBraces = 1;
-	p++;
-    } else if (*p == '"') {
-	inQuotes = 1;
-	p++;
-    }
-    elemStart = p;
-    if (bracePtr != 0) {
-	*bracePtr = openBraces;
-    }
-
-    /*
-     * Find element's end (a space, close brace, or the end of the string).
-     */
-
-    while (p < limit) {
-	switch (*p) {
-
-	    /*
-	     * Open brace: don't treat specially unless the element is in
-	     * braces. In this case, keep a nesting count.
-	     */
-
-	    case '{':
-		if (openBraces != 0) {
-		    openBraces++;
-		}
-		break;
-
-	    /*
-	     * Close brace: if element is in braces, keep nesting count and
-	     * quit when the last close brace is seen.
-	     */
-
-	    case '}':
-		if (openBraces > 1) {
-		    openBraces--;
-		} else if (openBraces == 1) {
-		    size = (p - elemStart);
-		    p++;
-		    if ((p >= limit)
-			    || isspace(UCHAR(*p))) { /* INTL: ISO space. */
-			goto done;
-		    }
-
-		    /*
-		     * Garbage after the closing brace; return an error.
-		     */
-		    
-		    if (interp != NULL) {
-			char buf[100];
-			
-			p2 = p;
-			while ((p2 < limit)
-				&& (!isspace(UCHAR(*p2))) /* INTL: ISO space. */
-			        && (p2 < p+20)) {
-			    p2++;
-			}
-			sprintf(buf,
-				"list element in braces followed by \"%.*s\" instead of space",
-				(int) (p2-p), p);
-			Tcl_SetResult(interp, buf, TCL_VOLATILE);
-		    }
-		    return TCL_ERROR;
-		}
-		break;
-
-	    /*
-	     * Backslash:  skip over everything up to the end of the
-	     * backslash sequence.
-	     */
-
-	    case '\\': {
-		Tcl_UtfBackslash(p, &numChars, NULL);
-		p += (numChars - 1);
-		break;
-	    }
-
-	    /*
-	     * Space: ignore if element is in braces or quotes; otherwise
-	     * terminate element.
-	     */
-
-	    case ' ':
-	    case '\f':
-	    case '\n':
-	    case '\r':
-	    case '\t':
-	    case '\v':
-		if ((openBraces == 0) && !inQuotes) {
-		    size = (p - elemStart);
-		    goto done;
-		}
-		break;
-
-	    /*
-	     * Double-quote: if element is in quotes then terminate it.
-	     */
-
-	    case '"':
-		if (inQuotes) {
-		    size = (p - elemStart);
-		    p++;
-		    if ((p >= limit)
-			    || isspace(UCHAR(*p))) { /* INTL: ISO space */
-			goto done;
-		    }
-
-		    /*
-		     * Garbage after the closing quote; return an error.
-		     */
-		    
-		    if (interp != NULL) {
-			char buf[100];
-			
-			p2 = p;
-			while ((p2 < limit)
-				&& (!isspace(UCHAR(*p2))) /* INTL: ISO space */
-				 && (p2 < p+20)) {
-			    p2++;
-			}
-			sprintf(buf,
-				"list element in quotes followed by \"%.*s\" %s",
-				(int) (p2-p), p, "instead of space");
-			Tcl_SetResult(interp, buf, TCL_VOLATILE);
-		    }
-		    return TCL_ERROR;
-		}
-		break;
-	}
-	p++;
-    }
-
-
-    /*
-     * End of list: terminate element.
-     */
-
-    if (p == limit) {
-	if (openBraces != 0) {
-	    if (interp != NULL) {
-		Tcl_SetResult(interp, "unmatched open brace in list",
-			TCL_STATIC);
-	    }
-	    return TCL_ERROR;
-	} else if (inQuotes) {
-	    if (interp != NULL) {
-		Tcl_SetResult(interp, "unmatched open quote in list",
-			TCL_STATIC);
-	    }
-	    return TCL_ERROR;
-	}
-	size = (p - elemStart);
-    }
-
-    done:
-    while ((p < limit) && (isspace(UCHAR(*p)))) { /* INTL: ISO space. */
-	p++;
-    }
-    *elementPtr = elemStart;
-    *nextPtr = p;
-    if (sizePtr != 0) {
-	*sizePtr = size;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclCopyAndCollapse --
- *
- *	Copy a string and eliminate any backslashes that aren't in braces.
- *
- * Results:
- *	There is no return value. Count characters get copied from src to
- *	dst. Along the way, if backslash sequences are found outside braces,
- *	the backslashes are eliminated in the copy. After scanning count
- *	chars from source, a null character is placed at the end of dst.
- *	Returns the number of characters that got copied.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclCopyAndCollapse(count, src, dst)
-    int count;			/* Number of characters to copy from src. */
-    CONST char *src;		/* Copy from here... */
-    char *dst;			/* ... to here. */
-{
-    register char c;
-    int numRead;
-    int newCount = 0;
-    int backslashCount;
-
-    for (c = *src;  count > 0;  src++, c = *src, count--) {
-	if (c == '\\') {
-	    backslashCount = Tcl_UtfBackslash(src, &numRead, dst);
-	    dst += backslashCount;
-	    newCount += backslashCount;
-	    src += numRead-1;
-	    count -= numRead-1;
-	} else {
-	    *dst = c;
-	    dst++;
-	    newCount++;
-	}
-    }
-    *dst = 0;
-    return newCount;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SplitList --
- *
- *	Splits a list up into its constituent fields.
- *
- * Results
- *	The return value is normally TCL_OK, which means that
- *	the list was successfully split up.  If TCL_ERROR is
- *	returned, it means that "list" didn't have proper list
- *	structure;  the interp's result will contain a more detailed
- *	error message.
- *
- *	*argvPtr will be filled in with the address of an array
- *	whose elements point to the elements of list, in order.
- *	*argcPtr will get filled in with the number of valid elements
- *	in the array.  A single block of memory is dynamically allocated
- *	to hold both the argv array and a copy of the list (with
- *	backslashes and braces removed in the standard way).
- *	The caller must eventually free this memory by calling free()
- *	on *argvPtr.  Note:  *argvPtr and *argcPtr are only modified
- *	if the procedure returns normally.
- *
- * Side effects:
- *	Memory is allocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_SplitList(interp, list, argcPtr, argvPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. 
-				 * If NULL, no error message is left. */
-    CONST char *list;		/* Pointer to string with list structure. */
-    int *argcPtr;		/* Pointer to location to fill in with
-				 * the number of elements in the list. */
-    char ***argvPtr;		/* Pointer to place to store pointer to
-				 * array of pointers to list elements. */
-{
-    char **argv;
-    CONST char *l;
-    char *p;
-    int length, size, i, result, elSize, brace;
-    CONST char *element;
-
-    /*
-     * Figure out how much space to allocate.  There must be enough
-     * space for both the array of pointers and also for a copy of
-     * the list.  To estimate the number of pointers needed, count
-     * the number of space characters in the list.
-     */
-
-    for (size = 1, l = list; *l != 0; l++) {
-	if (isspace(UCHAR(*l))) { /* INTL: ISO space. */
-	    size++;
-	}
-    }
-    size++;			/* Leave space for final NULL pointer. */
-    argv = (char **) ckalloc((unsigned)
-	    ((size * sizeof(char *)) + (l - list) + 1));
-    length = strlen(list);
-    for (i = 0, p = ((char *) argv) + size*sizeof(char *);
-	    *list != 0;  i++) {
-	CONST char *prevList = list;
-	
-	result = TclFindElement(interp, list, length, &element,
-				&list, &elSize, &brace);
-	length -= (list - prevList);
-	if (result != TCL_OK) {
-	    ckfree((char *) argv);
-	    return result;
-	}
-	if (*element == 0) {
-	    break;
-	}
-	if (i >= size) {
-	    ckfree((char *) argv);
-	    if (interp != NULL) {
-		Tcl_SetResult(interp, "internal error in Tcl_SplitList",
-			TCL_STATIC);
-	    }
-	    return TCL_ERROR;
-	}
-	argv[i] = p;
-	if (brace) {
-	    memcpy((VOID *) p, (VOID *) element, (size_t) elSize);
-	    p += elSize;
-	    *p = 0;
-	    p++;
-	} else {
-	    TclCopyAndCollapse(elSize, element, p);
-	    p += elSize+1;
-	}
-    }
-
-    argv[i] = NULL;
-    *argvPtr = argv;
-    *argcPtr = i;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ScanElement --
- *
- *	This procedure is a companion procedure to Tcl_ConvertElement.
- *	It scans a string to see what needs to be done to it (e.g. add
- *	backslashes or enclosing braces) to make the string into a
- *	valid Tcl list element.
- *
- * Results:
- *	The return value is an overestimate of the number of characters
- *	that will be needed by Tcl_ConvertElement to produce a valid
- *	list element from string.  The word at *flagPtr is filled in
- *	with a value needed by Tcl_ConvertElement when doing the actual
- *	conversion.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ScanElement(string, flagPtr)
-    register CONST char *string; /* String to convert to list element. */
-    register int *flagPtr;	 /* Where to store information to guide
-				  * Tcl_ConvertCountedElement. */
-{
-    return Tcl_ScanCountedElement(string, -1, flagPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ScanCountedElement --
- *
- *	This procedure is a companion procedure to
- *	Tcl_ConvertCountedElement.  It scans a string to see what
- *	needs to be done to it (e.g. add backslashes or enclosing
- *	braces) to make the string into a valid Tcl list element.
- *	If length is -1, then the string is scanned up to the first
- *	null byte.
- *
- * Results:
- *	The return value is an overestimate of the number of characters
- *	that will be needed by Tcl_ConvertCountedElement to produce a
- *	valid list element from string.  The word at *flagPtr is
- *	filled in with a value needed by Tcl_ConvertCountedElement
- *	when doing the actual conversion.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ScanCountedElement(string, length, flagPtr)
-    CONST char *string;		/* String to convert to Tcl list element. */
-    int length;			/* Number of bytes in string, or -1. */
-    int *flagPtr;		/* Where to store information to guide
-				 * Tcl_ConvertElement. */
-{
-    int flags, nestingLevel;
-    register CONST char *p, *lastChar;
-
-    /*
-     * This procedure and Tcl_ConvertElement together do two things:
-     *
-     * 1. They produce a proper list, one that will yield back the
-     * argument strings when evaluated or when disassembled with
-     * Tcl_SplitList.  This is the most important thing.
-     * 
-     * 2. They try to produce legible output, which means minimizing the
-     * use of backslashes (using braces instead).  However, there are
-     * some situations where backslashes must be used (e.g. an element
-     * like "{abc": the leading brace will have to be backslashed.
-     * For each element, one of three things must be done:
-     *
-     * (a) Use the element as-is (it doesn't contain any special
-     * characters).  This is the most desirable option.
-     *
-     * (b) Enclose the element in braces, but leave the contents alone.
-     * This happens if the element contains embedded space, or if it
-     * contains characters with special interpretation ($, [, ;, or \),
-     * or if it starts with a brace or double-quote, or if there are
-     * no characters in the element.
-     *
-     * (c) Don't enclose the element in braces, but add backslashes to
-     * prevent special interpretation of special characters.  This is a
-     * last resort used when the argument would normally fall under case
-     * (b) but contains unmatched braces.  It also occurs if the last
-     * character of the argument is a backslash or if the element contains
-     * a backslash followed by newline.
-     *
-     * The procedure figures out how many bytes will be needed to store
-     * the result (actually, it overestimates). It also collects information
-     * about the element in the form of a flags word.
-     *
-     * Note: list elements produced by this procedure and
-     * Tcl_ConvertCountedElement must have the property that they can be
-     * enclosing in curly braces to make sub-lists.  This means, for
-     * example, that we must not leave unmatched curly braces in the
-     * resulting list element.  This property is necessary in order for
-     * procedures like Tcl_DStringStartSublist to work.
-     */
-
-    nestingLevel = 0;
-    flags = 0;
-    if (string == NULL) {
-	string = "";
-    }
-    if (length == -1) {
-	length = strlen(string);
-    }
-    lastChar = string + length;
-    p = string;
-    if ((p == lastChar) || (*p == '{') || (*p == '"')) {
-	flags |= USE_BRACES;
-    }
-    for ( ; p != lastChar; p++) {
-	switch (*p) {
-	    case '{':
-		nestingLevel++;
-		break;
-	    case '}':
-		nestingLevel--;
-		if (nestingLevel < 0) {
-		    flags |= TCL_DONT_USE_BRACES|BRACES_UNMATCHED;
-		}
-		break;
-	    case '[':
-	    case '$':
-	    case ';':
-	    case ' ':
-	    case '\f':
-	    case '\n':
-	    case '\r':
-	    case '\t':
-	    case '\v':
-		flags |= USE_BRACES;
-		break;
-	    case '\\':
-		if ((p+1 == lastChar) || (p[1] == '\n')) {
-		    flags = TCL_DONT_USE_BRACES | BRACES_UNMATCHED;
-		} else {
-		    int size;
-
-		    Tcl_UtfBackslash(p, &size, NULL);
-		    p += size-1;
-		    flags |= USE_BRACES;
-		}
-		break;
-	}
-    }
-    if (nestingLevel != 0) {
-	flags = TCL_DONT_USE_BRACES | BRACES_UNMATCHED;
-    }
-    *flagPtr = flags;
-
-    /*
-     * Allow enough space to backslash every character plus leave
-     * two spaces for braces.
-     */
-
-    return 2*(p-string) + 2;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConvertElement --
- *
- *	This is a companion procedure to Tcl_ScanElement.  Given
- *	the information produced by Tcl_ScanElement, this procedure
- *	converts a string to a list element equal to that string.
- *
- * Results:
- *	Information is copied to *dst in the form of a list element
- *	identical to src (i.e. if Tcl_SplitList is applied to dst it
- *	will produce a string identical to src).  The return value is
- *	a count of the number of characters copied (not including the
- *	terminating NULL character).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ConvertElement(src, dst, flags)
-    register CONST char *src;	/* Source information for list element. */
-    register char *dst;		/* Place to put list-ified element. */
-    register int flags;		/* Flags produced by Tcl_ScanElement. */
-{
-    return Tcl_ConvertCountedElement(src, -1, dst, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConvertCountedElement --
- *
- *	This is a companion procedure to Tcl_ScanCountedElement.  Given
- *	the information produced by Tcl_ScanCountedElement, this
- *	procedure converts a string to a list element equal to that
- *	string.
- *
- * Results:
- *	Information is copied to *dst in the form of a list element
- *	identical to src (i.e. if Tcl_SplitList is applied to dst it
- *	will produce a string identical to src).  The return value is
- *	a count of the number of characters copied (not including the
- *	terminating NULL character).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ConvertCountedElement(src, length, dst, flags)
-    register CONST char *src;	/* Source information for list element. */
-    int length;			/* Number of bytes in src, or -1. */
-    char *dst;			/* Place to put list-ified element. */
-    int flags;			/* Flags produced by Tcl_ScanElement. */
-{
-    register char *p = dst;
-    register CONST char *lastChar;
-
-    /*
-     * See the comment block at the beginning of the Tcl_ScanElement
-     * code for details of how this works.
-     */
-
-    if (src && length == -1) {
-	length = strlen(src);
-    }
-    if ((src == NULL) || (length == 0)) {
-	p[0] = '{';
-	p[1] = '}';
-	p[2] = 0;
-	return 2;
-    }
-    lastChar = src + length;
-    if ((flags & USE_BRACES) && !(flags & TCL_DONT_USE_BRACES)) {
-	*p = '{';
-	p++;
-	for ( ; src != lastChar; src++, p++) {
-	    *p = *src;
-	}
-	*p = '}';
-	p++;
-    } else {
-	if (*src == '{') {
-	    /*
-	     * Can't have a leading brace unless the whole element is
-	     * enclosed in braces.  Add a backslash before the brace.
-	     * Furthermore, this may destroy the balance between open
-	     * and close braces, so set BRACES_UNMATCHED.
-	     */
-
-	    p[0] = '\\';
-	    p[1] = '{';
-	    p += 2;
-	    src++;
-	    flags |= BRACES_UNMATCHED;
-	}
-	for (; src != lastChar; src++) {
-	    switch (*src) {
-		case ']':
-		case '[':
-		case '$':
-		case ';':
-		case ' ':
-		case '\\':
-		case '"':
-		    *p = '\\';
-		    p++;
-		    break;
-		case '{':
-		case '}':
-		    /*
-		     * It may not seem necessary to backslash braces, but
-		     * it is.  The reason for this is that the resulting
-		     * list element may actually be an element of a sub-list
-		     * enclosed in braces (e.g. if Tcl_DStringStartSublist
-		     * has been invoked), so there may be a brace mismatch
-		     * if the braces aren't backslashed.
-		     */
-
-		    if (flags & BRACES_UNMATCHED) {
-			*p = '\\';
-			p++;
-		    }
-		    break;
-		case '\f':
-		    *p = '\\';
-		    p++;
-		    *p = 'f';
-		    p++;
-		    continue;
-		case '\n':
-		    *p = '\\';
-		    p++;
-		    *p = 'n';
-		    p++;
-		    continue;
-		case '\r':
-		    *p = '\\';
-		    p++;
-		    *p = 'r';
-		    p++;
-		    continue;
-		case '\t':
-		    *p = '\\';
-		    p++;
-		    *p = 't';
-		    p++;
-		    continue;
-		case '\v':
-		    *p = '\\';
-		    p++;
-		    *p = 'v';
-		    p++;
-		    continue;
-	    }
-	    *p = *src;
-	    p++;
-	}
-    }
-    *p = '\0';
-    return p-dst;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Merge --
- *
- *	Given a collection of strings, merge them together into a
- *	single string that has proper Tcl list structured (i.e.
- *	Tcl_SplitList may be used to retrieve strings equal to the
- *	original elements, and Tcl_Eval will parse the string back
- *	into its original elements).
- *
- * Results:
- *	The return value is the address of a dynamically-allocated
- *	string containing the merged list.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_Merge(argc, argv)
-    int argc;			/* How many strings to merge. */
-    char **argv;		/* Array of string values. */
-{
-#   define LOCAL_SIZE 20
-    int localFlags[LOCAL_SIZE], *flagPtr;
-    int numChars;
-    char *result;
-    char *dst;
-    int i;
-
-    /*
-     * Pass 1: estimate space, gather flags.
-     */
-
-    if (argc <= LOCAL_SIZE) {
-	flagPtr = localFlags;
-    } else {
-	flagPtr = (int *) ckalloc((unsigned) argc*sizeof(int));
-    }
-    numChars = 1;
-    for (i = 0; i < argc; i++) {
-	numChars += Tcl_ScanElement(argv[i], &flagPtr[i]) + 1;
-    }
-
-    /*
-     * Pass two: copy into the result area.
-     */
-
-    result = (char *) ckalloc((unsigned) numChars);
-    dst = result;
-    for (i = 0; i < argc; i++) {
-	numChars = Tcl_ConvertElement(argv[i], dst, flagPtr[i]);
-	dst += numChars;
-	*dst = ' ';
-	dst++;
-    }
-    if (dst == result) {
-	*dst = 0;
-    } else {
-	dst[-1] = 0;
-    }
-
-    if (flagPtr != localFlags) {
-	ckfree((char *) flagPtr);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Backslash --
- *
- *	Figure out how to handle a backslash sequence.
- *
- * Results:
- *	The return value is the character that should be substituted
- *	in place of the backslash sequence that starts at src.  If
- *	readPtr isn't NULL then it is filled in with a count of the
- *	number of characters in the backslash sequence.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char
-Tcl_Backslash(src, readPtr)
-    CONST char *src;		/* Points to the backslash character of
-				 * a backslash sequence. */
-    int *readPtr;		/* Fill in with number of characters read
-				 * from src, unless NULL. */
-{
-    char buf[TCL_UTF_MAX];
-    Tcl_UniChar ch;
-
-    Tcl_UtfBackslash(src, readPtr, buf);
-    Tcl_UtfToUniChar(buf, &ch);
-    return (char) ch;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Concat --
- *
- *	Concatenate a set of strings into a single large string.
- *
- * Results:
- *	The return value is dynamically-allocated string containing
- *	a concatenation of all the strings in argv, with spaces between
- *	the original argv elements.
- *
- * Side effects:
- *	Memory is allocated for the result;  the caller is responsible
- *	for freeing the memory.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_Concat(argc, argv)
-    int argc;			/* Number of strings to concatenate. */
-    char **argv;		/* Array of strings to concatenate. */
-{
-    int totalSize, i;
-    char *p;
-    char *result;
-
-    for (totalSize = 1, i = 0; i < argc; i++) {
-	totalSize += strlen(argv[i]) + 1;
-    }
-    result = (char *) ckalloc((unsigned) totalSize);
-    if (argc == 0) {
-	*result = '\0';
-	return result;
-    }
-    for (p = result, i = 0; i < argc; i++) {
-	char *element;
-	int length;
-
-	/*
-	 * Clip white space off the front and back of the string
-	 * to generate a neater result, and ignore any empty
-	 * elements.
-	 */
-
-	element = argv[i];
-	while (isspace(UCHAR(*element))) { /* INTL: ISO space. */
-	    element++;
-	}
-	for (length = strlen(element);
-		(length > 0)
-		&& (isspace(UCHAR(element[length-1]))) /* INTL: ISO space. */
-		&& ((length < 2) || (element[length-2] != '\\'));
-	        length--) {
-	    /* Null loop body. */
-	}
-	if (length == 0) {
-	    continue;
-	}
-	memcpy((VOID *) p, (VOID *) element, (size_t) length);
-	p += length;
-	*p = ' ';
-	p++;
-    }
-    if (p != result) {
-	p[-1] = 0;
-    } else {
-	*p = 0;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConcatObj --
- *
- *	Concatenate the strings from a set of objects into a single string
- *	object with spaces between the original strings.
- *
- * Results:
- *	The return value is a new string object containing a concatenation
- *	of the strings in objv. Its ref count is zero.
- *
- * Side effects:
- *	A new object is created.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_ConcatObj(objc, objv)
-    int objc;			/* Number of objects to concatenate. */
-    Tcl_Obj *CONST objv[];	/* Array of objects to concatenate. */
-{
-    int allocSize, finalSize, length, elemLength, i;
-    char *p;
-    char *element;
-    char *concatStr;
-    Tcl_Obj *objPtr;
-
-    allocSize = 0;
-    for (i = 0;  i < objc;  i++) {
-	objPtr = objv[i];
-	element = Tcl_GetStringFromObj(objPtr, &length);
-	if ((element != NULL) && (length > 0)) {
-	    allocSize += (length + 1);
-	}
-    }
-    if (allocSize == 0) {
-	allocSize = 1;		/* enough for the NULL byte at end */
-    }
-
-    /*
-     * Allocate storage for the concatenated result. Note that allocSize
-     * is one more than the total number of characters, and so includes
-     * room for the terminating NULL byte.
-     */
-    
-    concatStr = (char *) ckalloc((unsigned) allocSize);
-
-    /*
-     * Now concatenate the elements. Clip white space off the front and back
-     * to generate a neater result, and ignore any empty elements. Also put
-     * a null byte at the end.
-     */
-
-    finalSize = 0;
-    if (objc == 0) {
-	*concatStr = '\0';
-    } else {
-	p = concatStr;
-        for (i = 0;  i < objc;  i++) {
-	    objPtr = objv[i];
-	    element = Tcl_GetStringFromObj(objPtr, &elemLength);
-	    while ((elemLength > 0)
-		    && (isspace(UCHAR(*element)))) { /* INTL: ISO space. */
-	         element++;
-		 elemLength--;
-	    }
-
-	    /*
-	     * Trim trailing white space.  But, be careful not to trim
-	     * a space character if it is preceded by a backslash: in
-	     * this case it could be significant.
-	     */
-
-	    while ((elemLength > 0)
-		    && isspace(UCHAR(element[elemLength-1])) /* INTL: ISO space. */
-		    && ((elemLength < 2) || (element[elemLength-2] != '\\'))) {
-		elemLength--;
-	    }
-	    if (elemLength == 0) {
-	         continue;	/* nothing left of this element */
-	    }
-	    memcpy((VOID *) p, (VOID *) element, (size_t) elemLength);
-	    p += elemLength;
-	    *p = ' ';
-	    p++;
-	    finalSize += (elemLength + 1);
-        }
-        if (p != concatStr) {
-	    p[-1] = 0;
-	    finalSize -= 1;	/* we overwrote the final ' ' */
-        } else {
-	    *p = 0;
-        }
-    }
-    
-    TclNewObj(objPtr);
-    objPtr->bytes  = concatStr;
-    objPtr->length = finalSize;
-    return objPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_StringMatch --
- *
- *	See if a particular string matches a particular pattern.
- *
- * Results:
- *	The return value is 1 if string matches pattern, and
- *	0 otherwise.  The matching operation permits the following
- *	special characters in the pattern: *?\[] (see the manual
- *	entry for details on what these mean).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_StringMatch(string, pattern)
-    CONST char *string;		/* String. */
-    CONST char *pattern;	/* Pattern, which may contain special
-				 * characters. */
-{
-    int p, s;
-    CONST char *pstart = pattern;
-    
-    while (1) {
-	p = *pattern;
-	s = *string;
-	
-	/*
-	 * See if we're at the end of both the pattern and the string.  If
-	 * so, we succeeded.  If we're at the end of the pattern but not at
-	 * the end of the string, we failed.
-	 */
-	
-	if (p == '\0') {
-	    if (s == '\0') {
-		return 1;
-	    } else {
-		return 0;
-	    }
-	}
-	if ((s == '\0') && (p != '*')) {
-	    return 0;
-	}
-
-	/* Check for a "*" as the next pattern character.  It matches
-	 * any substring.  We handle this by calling ourselves
-	 * recursively for each postfix of string, until either we
-	 * match or we reach the end of the string.
-	 */
-	
-	if (p == '*') {
-	    pattern++;
-	    if (*pattern == '\0') {
-		return 1;
-	    }
-	    while (1) {
-		if (Tcl_StringMatch(string, pattern)) {
-		    return 1;
-		}
-		if (*string == '\0') {
-		    return 0;
-		}
-		string++;
-	    }
-	}
-
-	/* Check for a "?" as the next pattern character.  It matches
-	 * any single character.
-	 */
-
-	if (p == '?') {
-	    Tcl_UniChar ch;
-	    
-	    pattern++;
-	    string += Tcl_UtfToUniChar(string, &ch);
-	    continue;
-	}
-
-	/* Check for a "[" as the next pattern character.  It is followed
-	 * by a list of characters that are acceptable, or by a range
-	 * (two characters separated by "-").
-	 */
-	
-	if (p == '[') {
-	    Tcl_UniChar ch, startChar, endChar;
-
-	    pattern++;
-	    string += Tcl_UtfToUniChar(string, &ch);
-
-	    while (1) {
-		if ((*pattern == ']') || (*pattern == '\0')) {
-		    return 0;
-		}
-		pattern += Tcl_UtfToUniChar(pattern, &startChar);
-		if (*pattern == '-') {
-		    pattern++;
-		    if (*pattern == '\0') {
-			return 0;
-		    }
-		    pattern += Tcl_UtfToUniChar(pattern, &endChar);
-		    if (((startChar <= ch) && (ch <= endChar))
-			    || ((endChar <= ch) && (ch <= startChar))) {
-			/*
-			 * Matches ranges of form [a-z] or [z-a].
-			 */
-
-			break;
-		    }
-		} else if (startChar == ch) {
-		    break;
-		}
-	    }
-	    while (*pattern != ']') {
-		if (*pattern == '\0') {
-		    pattern = Tcl_UtfPrev(pattern, pstart);
-		    break;
-		}
-		pattern++;
-	    }
-	    pattern++;
-	    continue;
-	}
-    
-	/* If the next pattern character is '\', just strip off the '\'
-	 * so we do exact matching on the character that follows.
-	 */
-	
-	if (p == '\\') {
-	    pattern++;
-	    p = *pattern;
-	    if (p == '\0') {
-		return 0;
-	    }
-	}
-
-	/* There's no special character.  Just make sure that the next
-	 * bytes of each string match.
-	 */
-	
-	if (s != p) {
-	    return 0;
-	}
-	pattern++;
-	string++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringInit --
- *
- *	Initializes a dynamic string, discarding any previous contents
- *	of the string (Tcl_DStringFree should have been called already
- *	if the dynamic string was previously in use).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The dynamic string is initialized to be empty.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringInit(dsPtr)
-    Tcl_DString *dsPtr;		/* Pointer to structure for dynamic string. */
-{
-    dsPtr->string = dsPtr->staticSpace;
-    dsPtr->length = 0;
-    dsPtr->spaceAvl = TCL_DSTRING_STATIC_SIZE;
-    dsPtr->staticSpace[0] = '\0';
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringAppend --
- *
- *	Append more characters to the current value of a dynamic string.
- *
- * Results:
- *	The return value is a pointer to the dynamic string's new value.
- *
- * Side effects:
- *	Length bytes from string (or all of string if length is less
- *	than zero) are added to the current value of the string. Memory
- *	gets reallocated if needed to accomodate the string's new size.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_DStringAppend(dsPtr, string, length)
-    Tcl_DString *dsPtr;		/* Structure describing dynamic string. */
-    CONST char *string;		/* String to append.  If length is -1 then
-				 * this must be null-terminated. */
-    int length;			/* Number of characters from string to
-				 * append.  If < 0, then append all of string,
-				 * up to null at end. */
-{
-    int newSize;
-    char *dst;
-    CONST char *end;
-
-    if (length < 0) {
-	length = strlen(string);
-    }
-    newSize = length + dsPtr->length;
-
-    /*
-     * Allocate a larger buffer for the string if the current one isn't
-     * large enough. Allocate extra space in the new buffer so that there
-     * will be room to grow before we have to allocate again.
-     */
-
-    if (newSize >= dsPtr->spaceAvl) {
-	dsPtr->spaceAvl = newSize * 2;
-	if (dsPtr->string == dsPtr->staticSpace) {
-	    char *newString;
-
-	    newString = (char *) ckalloc((unsigned) dsPtr->spaceAvl);
-	    memcpy((VOID *) newString, (VOID *) dsPtr->string,
-		    (size_t) dsPtr->length);
-	    dsPtr->string = newString;
-	} else {
-	    dsPtr->string = (char *) ckrealloc((VOID *) dsPtr->string,
-		    (size_t) dsPtr->spaceAvl);
-	}
-    }
-
-    /*
-     * Copy the new string into the buffer at the end of the old
-     * one.
-     */
-
-    for (dst = dsPtr->string + dsPtr->length, end = string+length;
-	    string < end; string++, dst++) {
-	*dst = *string;
-    }
-    *dst = '\0';
-    dsPtr->length += length;
-    return dsPtr->string;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringAppendElement --
- *
- *	Append a list element to the current value of a dynamic string.
- *
- * Results:
- *	The return value is a pointer to the dynamic string's new value.
- *
- * Side effects:
- *	String is reformatted as a list element and added to the current
- *	value of the string.  Memory gets reallocated if needed to
- *	accomodate the string's new size.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_DStringAppendElement(dsPtr, string)
-    Tcl_DString *dsPtr;		/* Structure describing dynamic string. */
-    CONST char *string;		/* String to append.  Must be
-				 * null-terminated. */
-{
-    int newSize, flags;
-    char *dst;
-
-    newSize = Tcl_ScanElement(string, &flags) + dsPtr->length + 1;
-
-    /*
-     * Allocate a larger buffer for the string if the current one isn't
-     * large enough.  Allocate extra space in the new buffer so that there
-     * will be room to grow before we have to allocate again.
-     * SPECIAL NOTE: must use memcpy, not strcpy, to copy the string
-     * to a larger buffer, since there may be embedded NULLs in the
-     * string in some cases.
-     */
-
-    if (newSize >= dsPtr->spaceAvl) {
-	dsPtr->spaceAvl = newSize * 2;
-	if (dsPtr->string == dsPtr->staticSpace) {
-	    char *newString;
-
-	    newString = (char *) ckalloc((unsigned) dsPtr->spaceAvl);
-	    memcpy((VOID *) newString, (VOID *) dsPtr->string,
-		    (size_t) dsPtr->length);
-	    dsPtr->string = newString;
-	} else {
-	    dsPtr->string = (char *) ckrealloc((VOID *) dsPtr->string,
-		    (size_t) dsPtr->spaceAvl);
-	}
-    }
-
-    /*
-     * Convert the new string to a list element and copy it into the
-     * buffer at the end, with a space, if needed.
-     */
-
-    dst = dsPtr->string + dsPtr->length;
-    if (TclNeedSpace(dsPtr->string, dst)) {
-	*dst = ' ';
-	dst++;
-	dsPtr->length++;
-    }
-    dsPtr->length += Tcl_ConvertElement(string, dst, flags);
-    return dsPtr->string;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringSetLength --
- *
- *	Change the length of a dynamic string.  This can cause the
- *	string to either grow or shrink, depending on the value of
- *	length.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The length of dsPtr is changed to length and a null byte is
- *	stored at that position in the string.  If length is larger
- *	than the space allocated for dsPtr, then a panic occurs.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringSetLength(dsPtr, length)
-    Tcl_DString *dsPtr;		/* Structure describing dynamic string. */
-    int length;			/* New length for dynamic string. */
-{
-    int newsize;
-
-    if (length < 0) {
-	length = 0;
-    }
-    if (length >= dsPtr->spaceAvl) {
-	/*
-	 * There are two interesting cases here.  In the first case, the user
-	 * may be trying to allocate a large buffer of a specific size.  It
-	 * would be wasteful to overallocate that buffer, so we just allocate
-	 * enough for the requested size plus the trailing null byte.  In the
-	 * second case, we are growing the buffer incrementally, so we need
-	 * behavior similar to Tcl_DStringAppend.  The requested length will
-	 * usually be a small delta above the current spaceAvl, so we'll end up
-	 * doubling the old size.  This won't grow the buffer quite as quickly,
-	 * but it should be close enough.
-	 */
-
-	newsize = dsPtr->spaceAvl * 2;
-	if (length < newsize) {
-	    dsPtr->spaceAvl = newsize;
-	} else {
-	    dsPtr->spaceAvl = length + 1;
-	}
-	if (dsPtr->string == dsPtr->staticSpace) {
-	    char *newString;
-
-	    newString = (char *) ckalloc((unsigned) dsPtr->spaceAvl);
-	    memcpy((VOID *) newString, (VOID *) dsPtr->string,
-		    (size_t) dsPtr->length);
-	    dsPtr->string = newString;
-	} else {
-	    dsPtr->string = (char *) ckrealloc((VOID *) dsPtr->string,
-		    (size_t) dsPtr->spaceAvl);
-	}
-    }
-    dsPtr->length = length;
-    dsPtr->string[length] = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringFree --
- *
- *	Frees up any memory allocated for the dynamic string and
- *	reinitializes the string to an empty state.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The previous contents of the dynamic string are lost, and
- *	the new value is an empty string.
- *
- *---------------------------------------------------------------------- */
-
-void
-Tcl_DStringFree(dsPtr)
-    Tcl_DString *dsPtr;		/* Structure describing dynamic string. */
-{
-    if (dsPtr->string != dsPtr->staticSpace) {
-	ckfree(dsPtr->string);
-    }
-    dsPtr->string = dsPtr->staticSpace;
-    dsPtr->length = 0;
-    dsPtr->spaceAvl = TCL_DSTRING_STATIC_SIZE;
-    dsPtr->staticSpace[0] = '\0';
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringResult --
- *
- *	This procedure moves the value of a dynamic string into an
- *	interpreter as its string result. Afterwards, the dynamic string
- *	is reset to an empty string.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The string is "moved" to interp's result, and any existing
- *	string result for interp is freed. dsPtr is reinitialized to
- *	an empty string.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringResult(interp, dsPtr)
-    Tcl_Interp *interp;		/* Interpreter whose result is to be reset. */
-    Tcl_DString *dsPtr;		/* Dynamic string that is to become the
-				 * result of interp. */
-{
-    Tcl_ResetResult(interp);
-    
-    if (dsPtr->string != dsPtr->staticSpace) {
-	interp->result = dsPtr->string;
-	interp->freeProc = TCL_DYNAMIC;
-    } else if (dsPtr->length < TCL_RESULT_SIZE) {
-	interp->result = ((Interp *) interp)->resultSpace;
-	strcpy(interp->result, dsPtr->string);
-    } else {
-	Tcl_SetResult(interp, dsPtr->string, TCL_VOLATILE);
-    }
-    
-    dsPtr->string = dsPtr->staticSpace;
-    dsPtr->length = 0;
-    dsPtr->spaceAvl = TCL_DSTRING_STATIC_SIZE;
-    dsPtr->staticSpace[0] = '\0';
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringGetResult --
- *
- *	This procedure moves an interpreter's result into a dynamic string.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The interpreter's string result is cleared, and the previous
- *	contents of dsPtr are freed.
- *
- *	If the string result is empty, the object result is moved to the
- *	string result, then the object result is reset.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringGetResult(interp, dsPtr)
-    Tcl_Interp *interp;		/* Interpreter whose result is to be reset. */
-    Tcl_DString *dsPtr;		/* Dynamic string that is to become the
-				 * result of interp. */
-{
-    Interp *iPtr = (Interp *) interp;
-    
-    if (dsPtr->string != dsPtr->staticSpace) {
-	ckfree(dsPtr->string);
-    }
-
-    /*
-     * If the string result is empty, move the object result to the
-     * string result, then reset the object result.
-     */
-
-    if (*(iPtr->result) == 0) {
-	Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
-	        TCL_VOLATILE);
-    }
-
-    dsPtr->length = strlen(iPtr->result);
-    if (iPtr->freeProc != NULL) {
-	if ((iPtr->freeProc == TCL_DYNAMIC)
-		|| (iPtr->freeProc == (Tcl_FreeProc *) free)) {
-	    dsPtr->string = iPtr->result;
-	    dsPtr->spaceAvl = dsPtr->length+1;
-	} else {
-	    dsPtr->string = (char *) ckalloc((unsigned) (dsPtr->length+1));
-	    strcpy(dsPtr->string, iPtr->result);
-	    (*iPtr->freeProc)(iPtr->result);
-	}
-	dsPtr->spaceAvl = dsPtr->length+1;
-	iPtr->freeProc = NULL;
-    } else {
-	if (dsPtr->length < TCL_DSTRING_STATIC_SIZE) {
-	    dsPtr->string = dsPtr->staticSpace;
-	    dsPtr->spaceAvl = TCL_DSTRING_STATIC_SIZE;
-	} else {
-	    dsPtr->string = (char *) ckalloc((unsigned) (dsPtr->length + 1));
-	    dsPtr->spaceAvl = dsPtr->length + 1;
-	}
-	strcpy(dsPtr->string, iPtr->result);
-    }
-    
-    iPtr->result = iPtr->resultSpace;
-    iPtr->resultSpace[0] = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringStartSublist --
- *
- *	This procedure adds the necessary information to a dynamic
- *	string (e.g. " {" to start a sublist.  Future element
- *	appends will be in the sublist rather than the main list.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Characters get added to the dynamic string.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringStartSublist(dsPtr)
-    Tcl_DString *dsPtr;			/* Dynamic string. */
-{
-    if (TclNeedSpace(dsPtr->string, dsPtr->string + dsPtr->length)) {
-	Tcl_DStringAppend(dsPtr, " {", -1);
-    } else {
-	Tcl_DStringAppend(dsPtr, "{", -1);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DStringEndSublist --
- *
- *	This procedure adds the necessary characters to a dynamic
- *	string to end a sublist (e.g. "}").  Future element appends
- *	will be in the enclosing (sub)list rather than the current
- *	sublist.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DStringEndSublist(dsPtr)
-    Tcl_DString *dsPtr;			/* Dynamic string. */
-{
-    Tcl_DStringAppend(dsPtr, "}", -1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PrintDouble --
- *
- *	Given a floating-point value, this procedure converts it to
- *	an ASCII string using.
- *
- * Results:
- *	The ASCII equivalent of "value" is written at "dst".  It is
- *	written using the current precision, and it is guaranteed to
- *	contain a decimal point or exponent, so that it looks like
- *	a floating-point value and not an integer.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_PrintDouble(interp, value, dst)
-    Tcl_Interp *interp;			/* Interpreter whose tcl_precision
-					 * variable used to be used to control
-					 * printing.  It's ignored now. */
-    double value;			/* Value to print as string. */
-    char *dst;				/* Where to store converted value;
-					 * must have at least TCL_DOUBLE_SPACE
-					 * characters. */
-{
-    char *p, c;
-    Tcl_UniChar ch;
-
-    Tcl_MutexLock(&precisionMutex);
-    sprintf(dst, precisionFormat, value);
-    Tcl_MutexUnlock(&precisionMutex);
-
-    /*
-     * If the ASCII result looks like an integer, add ".0" so that it
-     * doesn't look like an integer anymore.  This prevents floating-point
-     * values from being converted to integers unintentionally.
-     */
-
-    for (p = dst; *p != 0; ) {
-	p += Tcl_UtfToUniChar(p, &ch);
-	c = UCHAR(ch);
-	if ((c == '.') || isalpha(UCHAR(c))) {	/* INTL: ISO only. */
-	    return;
-	}
-    }
-    p[0] = '.';
-    p[1] = '0';
-    p[2] = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPrecTraceProc --
- *
- *	This procedure is invoked whenever the variable "tcl_precision"
- *	is written.
- *
- * Results:
- *	Returns NULL if all went well, or an error message if the
- *	new value for the variable doesn't make sense.
- *
- * Side effects:
- *	If the new value doesn't make sense then this procedure
- *	undoes the effect of the variable modification.  Otherwise
- *	it modifies the format string that's used by Tcl_PrintDouble.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-char *
-TclPrecTraceProc(clientData, interp, name1, name2, flags)
-    ClientData clientData;	/* Not used. */
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
-    char *name2;		/* Second part of variable name. */
-    int flags;			/* Information about what happened. */
-{
-    char *value, *end;
-    int prec;
-
-    /*
-     * If the variable is unset, then recreate the trace.
-     */
-
-    if (flags & TCL_TRACE_UNSETS) {
-	if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
-	    Tcl_TraceVar2(interp, name1, name2,
-		    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES
-		    |TCL_TRACE_UNSETS, TclPrecTraceProc, clientData);
-	}
-	return (char *) NULL;
-    }
-
-    /*
-     * When the variable is read, reset its value from our shared
-     * value.  This is needed in case the variable was modified in
-     * some other interpreter so that this interpreter's value is
-     * out of date.
-     */
-
-    Tcl_MutexLock(&precisionMutex);
-
-    if (flags & TCL_TRACE_READS) {
-	Tcl_SetVar2(interp, name1, name2, precisionString,
-		flags & TCL_GLOBAL_ONLY);
-	Tcl_MutexUnlock(&precisionMutex);
-	return (char *) NULL;
-    }
-
-    /*
-     * The variable is being written.  Check the new value and disallow
-     * it if it isn't reasonable or if this is a safe interpreter (we
-     * don't want safe interpreters messing up the precision of other
-     * interpreters).
-     */
-
-    if (Tcl_IsSafe(interp)) {
-	Tcl_SetVar2(interp, name1, name2, precisionString,
-		flags & TCL_GLOBAL_ONLY);
-	Tcl_MutexUnlock(&precisionMutex);
-	return "can't modify precision from a safe interpreter";
-    }
-    value = Tcl_GetVar2(interp, name1, name2, flags & TCL_GLOBAL_ONLY);
-    if (value == NULL) {
-	value = "";
-    }
-    prec = strtoul(value, &end, 10);
-    if ((prec <= 0) || (prec > TCL_MAX_PREC) || (prec > 100) ||
-	    (end == value) || (*end != 0)) {
-	Tcl_SetVar2(interp, name1, name2, precisionString,
-		flags & TCL_GLOBAL_ONLY);
-	Tcl_MutexUnlock(&precisionMutex);
-	return "improper value for precision";
-    }
-    TclFormatInt(precisionString, prec);
-    sprintf(precisionFormat, "%%.%dg", prec);
-    Tcl_MutexUnlock(&precisionMutex);
-    return (char *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclNeedSpace --
- *
- *	This procedure checks to see whether it is appropriate to
- *	add a space before appending a new list element to an
- *	existing string.
- *
- * Results:
- *	The return value is 1 if a space is appropriate, 0 otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclNeedSpace(start, end)
-    char *start;		/* First character in string. */
-    char *end;			/* End of string (place where space will
-				 * be added, if appropriate). */
-{
-    /*
-     * A space is needed unless either
-     * (a) we're at the start of the string, or
-     * (b) the trailing characters of the string consist of one or more
-     *     open curly braces preceded by a space or extending back to
-     *     the beginning of the string.
-     * (c) the trailing characters of the string consist of a space
-     *	   preceded by a character other than backslash.
-     */
-
-    if (end == start) {
-	return 0;
-    }
-    end--;
-    if (*end != '{') {
-	if (isspace(UCHAR(*end)) /* INTL: ISO space. */
-		&& ((end == start) || (end[-1] != '\\'))) {
-	    return 0;
-	}
-	return 1;
-    }
-    do {
-	if (end == start) {
-	    return 0;
-	}
-	end--;
-    } while (*end == '{');
-    if (isspace(UCHAR(*end))) {	/* INTL: ISO space. */
-	return 0;
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclFormatInt --
- *
- *	This procedure formats an integer into a sequence of decimal digit
- *	characters in a buffer. If the integer is negative, a minus sign is
- *	inserted at the start of the buffer. A null character is inserted at
- *	the end of the formatted characters. It is the caller's
- *	responsibility to ensure that enough storage is available. This
- *	procedure has the effect of sprintf(buffer, "%d", n) but is faster.
- *
- * Results:
- *	An integer representing the number of characters formatted, not
- *	including the terminating \0.
- *
- * Side effects:
- *	The formatted characters are written into the storage pointer to
- *	by the "buffer" argument.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclFormatInt(buffer, n)
-    char *buffer;		/* Points to the storage into which the
-				 * formatted characters are written. */
-    long n;			/* The integer to format. */
-{
-    long intVal;
-    int i;
-    int numFormatted, j;
-    char *digits = "0123456789";
-
-    /*
-     * Check first whether "n" is zero.
-     */
-
-    if (n == 0) {
-	buffer[0] = '0';
-	buffer[1] = 0;
-	return 1;
-    }
-
-    /*
-     * Check whether "n" is the maximum negative value. This is
-     * -2^(m-1) for an m-bit word, and has no positive equivalent;
-     * negating it produces the same value.
-     */
-
-    if (n == -n) {
-	sprintf(buffer, "%ld", n);
-	return strlen(buffer);
-    }
-
-    /*
-     * Generate the characters of the result backwards in the buffer.
-     */
-
-    intVal = (n < 0? -n : n);
-    i = 0;
-    buffer[0] = '\0';
-    do {
-	i++;
-	buffer[i] = digits[intVal % 10];
-	intVal = intVal/10;
-    } while (intVal > 0);
-    if (n < 0) {
-	i++;
-	buffer[i] = '-';
-    }
-    numFormatted = i;
-
-    /*
-     * Now reverse the characters.
-     */
-
-    for (j = 0;  j < i;  j++, i--) {
-	char tmp = buffer[i];
-	buffer[i] = buffer[j];
-	buffer[j] = tmp;
-    }
-    return numFormatted;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclLooksLikeInt --
- *
- *	This procedure decides whether the leading characters of a
- *	string look like an integer or something else (such as a
- *	floating-point number or string).
- *
- * Results:
- *	The return value is 1 if the leading characters of p look
- *	like a valid Tcl integer.  If they look like a floating-point
- *	number (e.g. "e01" or "2.4"), or if they don't look like a
- *	number at all, then 0 is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclLooksLikeInt(bytes, length)
-    register char *bytes;	/* Points to first byte of the string. */
-    int length;			/* Number of bytes in the string. If < 0
-				 * bytes up to the first null byte are
-				 * considered (if they may appear in an 
-				 * integer). */
-{
-    register char *p, *end;
-
-    if (length < 0) {
-	length = (bytes? strlen(bytes) : 0);
-    }
-    end = (bytes + length);
-
-    p = bytes;
-    while ((p < end) && isspace(UCHAR(*p))) { /* INTL: ISO space. */
-	p++;
-    }
-    if (p == end) {
-	return 0;
-    }
-    
-    if ((*p == '+') || (*p == '-')) {
-	p++;
-    }
-    if ((p == end) || !isdigit(UCHAR(*p))) { /* INTL: digit */
-	return 0;
-    }
-    p++;
-    while ((p < end) && isdigit(UCHAR(*p))) { /* INTL: digit */
-	p++;
-    }
-    if (p == end) {
-	return 1;
-    }
-    if ((*p != '.') && (*p != 'e') && (*p != 'E')) {
-	return 1;
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetIntForIndex --
- *
- *	This procedure returns an integer corresponding to the list index
- *	held in a Tcl object. The Tcl object's value is expected to be
- *	either an integer or the string "end". 
- *
- * Results:
- *	The return value is normally TCL_OK, which means that the index was
- *	successfully stored into the location referenced by "indexPtr".  If
- *	the Tcl object referenced by "objPtr" has the value "end", the
- *	value stored is "endValue". If "objPtr"s values is not "end" and
- *	can not be converted to an integer, TCL_ERROR is returned and, if
- *	"interp" is non-NULL, an error message is left in the interpreter's
- *	result object.
- *
- * Side effects:
- *	The object referenced by "objPtr" might be converted to an
- *	integer object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGetIntForIndex(interp, objPtr, endValue, indexPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for error reporting. 
-				 * If NULL, then no error message is left
-				 * after errors. */
-    Tcl_Obj *objPtr;		/* Points to an object containing either
-				 * "end" or an integer. */
-    int endValue;		/* The value to be stored at "indexPtr" if
-				 * "objPtr" holds "end". */
-    int *indexPtr;		/* Location filled in with an integer
-				 * representing an index. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *bytes;
-    int index, length, result;
-
-    if (objPtr->typePtr == &tclIntType) {
-	*indexPtr = (int)objPtr->internalRep.longValue;
-	return TCL_OK;
-    }
-    
-    bytes = Tcl_GetStringFromObj(objPtr, &length);
-    if ((*bytes == 'e')
-	    && (strncmp(bytes, "end", (unsigned) length) == 0)) {
-	index = endValue;
-    } else {
-	result = Tcl_GetIntFromObj((Tcl_Interp *) NULL, objPtr, &index);
-	if (result != TCL_OK) {
-	    if (iPtr != NULL) {
-		Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-			"bad index \"", bytes,
-			"\": must be integer or \"end\"", (char *) NULL);
-	    }
-	    return result;
-	}
-    }
-    *indexPtr = index;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetNameOfExecutable --
- *
- *	This procedure simply returns a pointer to the internal full
- *	path name of the executable file as computed by
- *	Tcl_FindExecutable.  This procedure call is the C API
- *	equivalent to the "info nameofexecutable" command.
- *
- * Results:
- *	A pointer to the internal string or NULL if the internal full
- *	path name has not been computed or unknown.
- *
- * Side effects:
- *	The object referenced by "objPtr" might be converted to an
- *	integer object.
- *
- *----------------------------------------------------------------------
- */
-
-CONST char *
-Tcl_GetNameOfExecutable()
-{
-    return (tclExecutableName);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCwd --
- *
- *	This function replaces the library version of getcwd().
- *
- * Results:
- *	The result is a pointer to a string specifying the current
- *	directory, or NULL if the current directory could not be
- *	determined.  If NULL is returned, an error message is left in the
- *	interp's result.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetCwd(interp, cwdPtr)
-    Tcl_Interp *interp;
-    Tcl_DString *cwdPtr;
-{
-    return TclpGetCwd(interp, cwdPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Chdir --
- *
- *	This function replaces the library version of chdir().
- *
- * Results:
- *	See chdir() documentation.
- *
- * Side effects:
- *	See chdir() documentation.  
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Chdir(dirName)
-    CONST char *dirName;
-{
-    return TclpChdir(dirName);
-}
-
diff --git a/generic/tclVar.c b/generic/tclVar.c
deleted file mode 100644
index 03b7757..0000000
--- a/generic/tclVar.c
+++ /dev/null
@@ -1,4655 +0,0 @@
-/* 
- * tclVar.c --
- *
- *	This file contains routines that implement Tcl variables
- *	(both scalars and arrays).
- *
- *	The implementation of arrays is modelled after an initial
- *	implementation by Mark Diekhans and Karl Lehenbauer.
- *
- * Copyright (c) 1987-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclVar.c,v 1.8 1999/04/16 00:46:55 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The strings below are used to indicate what went wrong when a
- * variable access is denied.
- */
-
-static char *noSuchVar =	"no such variable";
-static char *isArray =		"variable is array";
-static char *needArray =	"variable isn't array";
-static char *noSuchElement =	"no such element in array";
-static char *danglingElement =  "upvar refers to element in deleted array";
-static char *danglingVar =     "upvar refers to variable in deleted namespace";
-static char *badNamespace =	"parent namespace doesn't exist";
-static char *missingName =	"missing variable name";
-
-/*
- * Forward references to procedures defined later in this file:
- */
-
-static  char *		CallTraces _ANSI_ARGS_((Interp *iPtr, Var *arrayPtr,
-			    Var *varPtr, char *part1, char *part2,
-			    int flags));
-static void		CleanupVar _ANSI_ARGS_((Var *varPtr,
-			    Var *arrayPtr));
-static void		DeleteSearches _ANSI_ARGS_((Var *arrayVarPtr));
-static void		DeleteArray _ANSI_ARGS_((Interp *iPtr,
-			    char *arrayName, Var *varPtr, int flags));
-static int		MakeUpvar _ANSI_ARGS_((
-			    Interp *iPtr, CallFrame *framePtr,
-			    char *otherP1, char *otherP2, int otherFlags,
-			    char *myName, int myFlags));
-static Var *		NewVar _ANSI_ARGS_((void));
-static ArraySearch *	ParseSearchId _ANSI_ARGS_((Tcl_Interp *interp,
-			    Var *varPtr, char *varName, char *string));
-static void		VarErrMsg _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *part1, char *part2, char *operation,
-			    char *reason));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclLookupVar --
- *
- *	This procedure is used by virtually all of the variable code to
- *	locate a variable given its name(s).
- *
- * Results:
- *	The return value is a pointer to the variable structure indicated by
- *	part1 and part2, or NULL if the variable couldn't be found. If the
- *	variable is found, *arrayPtrPtr is filled in with the address of the
- *	variable structure for the array that contains the variable (or NULL
- *	if the variable is a scalar). If the variable can't be found and
- *	either createPart1 or createPart2 are 1, a new as-yet-undefined
- *	(VAR_UNDEFINED) variable structure is created, entered into a hash
- *	table, and returned.
- *
- *	If the variable isn't found and creation wasn't specified, or some
- *	other error occurs, NULL is returned and an error message is left in
- *	the interp's result if TCL_LEAVE_ERR_MSG is set in flags. 
- *
- *	Note: it's possible for the variable returned to be VAR_UNDEFINED
- *	even if createPart1 or createPart2 are 1 (these only cause the hash
- *	table entry or array to be created). For example, the variable might
- *	be a global that has been unset but is still referenced by a
- *	procedure, or a variable that has been unset but it only being kept
- *	in existence (if VAR_UNDEFINED) by a trace.
- *
- * Side effects:
- *	New hashtable entries may be created if createPart1 or createPart2
- *	are 1.
- *
- *----------------------------------------------------------------------
- */
-
-Var *
-TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2,
-        arrayPtrPtr)
-    Tcl_Interp *interp;		/* Interpreter to use for lookup. */
-    register char *part1;	/* If part2 isn't NULL, this is the name of
-				 * an array. Otherwise, this
-				 * is a full variable name that could
-				 * include a parenthesized array element. */
-    char *part2;		/* Name of element within array, or NULL. */
-    int flags;			/* Only TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
-				 * and TCL_LEAVE_ERR_MSG bits matter. */
-    char *msg;			/* Verb to use in error messages, e.g.
-				 * "read" or "set". Only needed if
-				 * TCL_LEAVE_ERR_MSG is set in flags. */
-    int createPart1;		/* If 1, create hash table entry for part 1
-				 * of name, if it doesn't already exist. If
-				 * 0, return error if it doesn't exist. */
-    int createPart2;		/* If 1, create hash table entry for part 2
-				 * of name, if it doesn't already exist. If
-				 * 0, return error if it doesn't exist. */
-    Var **arrayPtrPtr;		/* If the name refers to an element of an
-				 * array, *arrayPtrPtr gets filled in with
-				 * address of array variable. Otherwise
-				 * this is set to NULL. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CallFrame *varFramePtr = iPtr->varFramePtr;
-				/* Points to the procedure call frame whose
-				 * variables are currently in use. Same as
-				 * the current procedure's frame, if any,
-				 * unless an "uplevel" is executing. */
-    Tcl_HashTable *tablePtr;	/* Points to the hashtable, if any, in which
-				 * to look up the variable. */
-    Tcl_Var var;                /* Used to search for global names. */
-    Var *varPtr;		/* Points to the Var structure returned for
-    				 * the variable. */
-    char *elName;		/* Name of array element or NULL; may be
-				 * same as part2, or may be openParen+1. */
-    char *openParen, *closeParen;
-                                /* If this procedure parses a name into
-				 * array and index, these point to the
-				 * parens around the index.  Otherwise they
-				 * are NULL. These are needed to restore
-				 * the parens after parsing the name. */
-    Namespace *varNsPtr, *cxtNsPtr, *dummy1Ptr, *dummy2Ptr;
-    ResolverScheme *resPtr;
-    Tcl_HashEntry *hPtr;
-    register char *p;
-    int new, i, result;
-
-    varPtr = NULL;
-    *arrayPtrPtr = NULL;
-    openParen = closeParen = NULL;
-    varNsPtr = NULL;		/* set non-NULL if a nonlocal variable */
-
-    /*
-     * Parse part1 into array name and index.
-     * Always check if part1 is an array element name and allow it only if
-     * part2 is not given.   
-     * (if one does not care about creating array elements that can't be used
-     *  from tcl, and prefer slightly better performance, one can put
-     *  the following in an   if (part2 == NULL) { ... } block and remove
-     *  the part2's test and error reporting  or move that code in array set)
-     */
-
-    elName = part2;
-    for (p = part1; *p ; p++) {
-	if (*p == '(') {
-	    openParen = p;
-	    do {
-		p++;
-	    } while (*p != '\0');
-	    p--;
-	    if (*p == ')') {
-		if (part2 != NULL) {
-		    openParen = NULL;
-		    if (flags & TCL_LEAVE_ERR_MSG) {
-			VarErrMsg(interp, part1, part2, msg, needArray);
-		    }
-		    goto done;
-		}
-		closeParen = p;
-		*openParen = 0;
-		elName = openParen+1;
-	    } else {
-		openParen = NULL;
-	    }
-	    break;
-	}
-    }
-
-    /*
-     * If this namespace has a variable resolver, then give it first
-     * crack at the variable resolution.  It may return a Tcl_Var
-     * value, it may signal to continue onward, or it may signal
-     * an error.
-     */
-    if ((flags & TCL_GLOBAL_ONLY) != 0 || iPtr->varFramePtr == NULL) {
-        cxtNsPtr = iPtr->globalNsPtr;
-    } else {
-        cxtNsPtr = iPtr->varFramePtr->nsPtr;
-    }
-
-    if (cxtNsPtr->varResProc != NULL || iPtr->resolverPtr != NULL) {
-        resPtr = iPtr->resolverPtr;
-
-        if (cxtNsPtr->varResProc) {
-            result = (*cxtNsPtr->varResProc)(interp, part1,
-		    (Tcl_Namespace *) cxtNsPtr, flags, &var);
-        } else {
-            result = TCL_CONTINUE;
-        }
-
-        while (result == TCL_CONTINUE && resPtr) {
-            if (resPtr->varResProc) {
-                result = (*resPtr->varResProc)(interp, part1,
-			(Tcl_Namespace *) cxtNsPtr, flags, &var);
-            }
-            resPtr = resPtr->nextPtr;
-        }
-
-        if (result == TCL_OK) {
-            varPtr = (Var *) var;
-            goto lookupVarPart2;
-        } else if (result != TCL_CONTINUE) {
-            return (Var *) NULL;
-        }
-    }
-
-    /*
-     * Look up part1. Look it up as either a namespace variable or as a
-     * local variable in a procedure call frame (varFramePtr).
-     * Interpret part1 as a namespace variable if:
-     *    1) so requested by a TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY flag,
-     *    2) there is no active frame (we're at the global :: scope),
-     *    3) the active frame was pushed to define the namespace context
-     *       for a "namespace eval" or "namespace inscope" command,
-     *    4) the name has namespace qualifiers ("::"s).
-     * Otherwise, if part1 is a local variable, search first in the
-     * frame's array of compiler-allocated local variables, then in its
-     * hashtable for runtime-created local variables.
-     *
-     * If createPart1 and the variable isn't found, create the variable and,
-     * if necessary, create varFramePtr's local var hashtable.
-     */
-
-    if (((flags & (TCL_GLOBAL_ONLY | TCL_NAMESPACE_ONLY)) != 0)
-	    || (varFramePtr == NULL)
-	    || !varFramePtr->isProcCallFrame
-	    || (strstr(part1, "::") != NULL)) {
-	char *tail;
-	
-	/*
-	 * Don't pass TCL_LEAVE_ERR_MSG, we may yet create the variable,
-	 * or otherwise generate our own error!
-	 */
-	var = Tcl_FindNamespaceVar(interp, part1, (Tcl_Namespace *) NULL,
-		flags & ~TCL_LEAVE_ERR_MSG);
-	if (var != (Tcl_Var) NULL) {
-            varPtr = (Var *) var;
-        }
-	if (varPtr == NULL) {
-	    if (createPart1) {   /* var wasn't found so create it  */
-		TclGetNamespaceForQualName(interp, part1, (Namespace *) NULL,
-			flags, &varNsPtr, &dummy1Ptr, &dummy2Ptr, &tail);
-
-		if (varNsPtr == NULL) {
-		    if (flags & TCL_LEAVE_ERR_MSG) {
-			VarErrMsg(interp, part1, part2, msg, badNamespace);
-		    }
-		    goto done;
-		}
-		if (tail == NULL) {
-		    if (flags & TCL_LEAVE_ERR_MSG) {
-			VarErrMsg(interp, part1, part2, msg, missingName);
-		    }
-		    goto done;
-		}
-		hPtr = Tcl_CreateHashEntry(&varNsPtr->varTable, tail, &new);
-		varPtr = NewVar();
-		Tcl_SetHashValue(hPtr, varPtr);
-		varPtr->hPtr = hPtr;
-		varPtr->nsPtr = varNsPtr;
-	    } else {		/* var wasn't found and not to create it */
-		if (flags & TCL_LEAVE_ERR_MSG) {
-		    VarErrMsg(interp, part1, part2, msg, noSuchVar);
-		}
-		goto done;
-	    }
-	}
-    } else {			/* local var: look in frame varFramePtr */
-	Proc *procPtr = varFramePtr->procPtr;
-	int localCt = procPtr->numCompiledLocals;
-	CompiledLocal *localPtr = procPtr->firstLocalPtr;
-	Var *localVarPtr = varFramePtr->compiledLocals;
-	int part1Len = strlen(part1);
-	
-	for (i = 0;  i < localCt;  i++) {
-	    if (!TclIsVarTemporary(localPtr)) {
-		register char *localName = localVarPtr->name;
-		if ((part1[0] == localName[0])
-		        && (part1Len == localPtr->nameLength)
-		        && (strcmp(part1, localName) == 0)) {
-		    varPtr = localVarPtr;
-		    break;
-		}
-	    }
-	    localVarPtr++;
-	    localPtr = localPtr->nextPtr;
-	}
-	if (varPtr == NULL) {	/* look in the frame's var hash table */
-	    tablePtr = varFramePtr->varTablePtr;
-	    if (createPart1) {
-		if (tablePtr == NULL) {
-		    tablePtr = (Tcl_HashTable *)
-			ckalloc(sizeof(Tcl_HashTable));
-		    Tcl_InitHashTable(tablePtr, TCL_STRING_KEYS);
-		    varFramePtr->varTablePtr = tablePtr;
-		}
-		hPtr = Tcl_CreateHashEntry(tablePtr, part1, &new);
-		if (new) {
-		    varPtr = NewVar();
-		    Tcl_SetHashValue(hPtr, varPtr);
-		    varPtr->hPtr = hPtr;
-                    varPtr->nsPtr = NULL; /* a local variable */
-		} else {
-		    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-		}
-	    } else {
-		hPtr = NULL;
-		if (tablePtr != NULL) {
-		    hPtr = Tcl_FindHashEntry(tablePtr, part1);
-		}
-		if (hPtr == NULL) {
-		    if (flags & TCL_LEAVE_ERR_MSG) {
-			VarErrMsg(interp, part1, part2, msg, noSuchVar);
-		    }
-		    goto done;
-		}
-		varPtr = (Var *) Tcl_GetHashValue(hPtr);
-	    }
-	}
-    }
-
-    lookupVarPart2:
-    if (openParen != NULL) {
-	*openParen = '(';
-	openParen = NULL;
-    }
-
-    /*
-     * If varPtr is a link variable, we have a reference to some variable
-     * that was created through an "upvar" or "global" command. Traverse
-     * through any links until we find the referenced variable.
-     */
-	
-    while (TclIsVarLink(varPtr)) {
-	varPtr = varPtr->value.linkPtr;
-    }
-
-    /*
-     * If we're not dealing with an array element, return varPtr.
-     */
-    
-    if (elName == NULL) {
-        goto done;
-    }
-
-    /*
-     * We're dealing with an array element. Make sure the variable is an
-     * array and look up the element (create the element if desired).
-     */
-
-    if (TclIsVarUndefined(varPtr) && !TclIsVarArrayElement(varPtr)) {
-	if (!createPart1) {
-	    if (flags & TCL_LEAVE_ERR_MSG) {
-		VarErrMsg(interp, part1, part2, msg, noSuchVar);
-	    }
-	    varPtr = NULL;
-	    goto done;
-	}
-
-	/*
-	 * Make sure we are not resurrecting a namespace variable from a
-	 * deleted namespace!
-	 */
-	if ((varPtr->flags & VAR_IN_HASHTABLE) && (varPtr->hPtr == NULL)) {
-	    if (flags & TCL_LEAVE_ERR_MSG) {
-		VarErrMsg(interp, part1, part2, msg, danglingVar);
-	    }
-	    varPtr = NULL;
-	    goto done;
-	}
-
-	TclSetVarArray(varPtr);
-	TclClearVarUndefined(varPtr);
-	varPtr->value.tablePtr =
-	    (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-	Tcl_InitHashTable(varPtr->value.tablePtr, TCL_STRING_KEYS);
-    } else if (!TclIsVarArray(varPtr)) {
-	if (flags & TCL_LEAVE_ERR_MSG) {
-	    VarErrMsg(interp, part1, part2, msg, needArray);
-	}
-	varPtr = NULL;
-	goto done;
-    }
-    *arrayPtrPtr = varPtr;
-    if (closeParen != NULL) {
-	*closeParen = 0;
-    }
-    if (createPart2) {
-	hPtr = Tcl_CreateHashEntry(varPtr->value.tablePtr, elName, &new);
-	if (closeParen != NULL) {
-	    *closeParen = ')';
-	}
-	if (new) {
-	    if (varPtr->searchPtr != NULL) {
-		DeleteSearches(varPtr);
-	    }
-	    varPtr = NewVar();
-	    Tcl_SetHashValue(hPtr, varPtr);
-	    varPtr->hPtr = hPtr;
-	    varPtr->nsPtr = varNsPtr;
-	    TclSetVarArrayElement(varPtr);
-	}
-    } else {
-	hPtr = Tcl_FindHashEntry(varPtr->value.tablePtr, elName);
-	if (closeParen != NULL) {
-	    *closeParen = ')';
-	}
-	if (hPtr == NULL) {
-	    if (flags & TCL_LEAVE_ERR_MSG) {
-		VarErrMsg(interp, part1, part2, msg, noSuchElement);
-	    }
-	    varPtr = NULL;
-	    goto done;
-	}
-    }
-    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-
-    done:
-    if (openParen != NULL) {
-        *openParen = '(';
-    }
-    return varPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetVar --
- *
- *	Return the value of a Tcl variable as a string.
- *
- * Results:
- *	The return value points to the current value of varName as a string.
- *	If the variable is not defined or can't be read because of a clash
- *	in array usage then a NULL pointer is returned and an error message
- *	is left in the interp's result if the TCL_LEAVE_ERR_MSG flag is set.
- *	Note: the return value is only valid up until the next change to the
- *	variable; if you depend on the value lasting longer than that, then
- *	make yourself a private copy.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetVar(interp, varName, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which varName is
-				 * to be looked up. */
-    char *varName;		/* Name of a variable in interp. */
-    int flags;			/* OR-ed combination of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY or TCL_LEAVE_ERR_MSG
-				 * bits. */
-{
-    return Tcl_GetVar2(interp, varName, (char *) NULL, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetVar2 --
- *
- *	Return the value of a Tcl variable as a string, given a two-part
- *	name consisting of array name and element within array.
- *
- * Results:
- *	The return value points to the current value of the variable given
- *	by part1 and part2 as a string. If the specified variable doesn't
- *	exist, or if there is a clash in array usage, then NULL is returned
- *	and a message will be left in the interp's result if the
- *	TCL_LEAVE_ERR_MSG flag is set. Note: the return value is only valid
- *	up until the next change to the variable; if you depend on the value
- *	lasting longer than that, then make yourself a private copy.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetVar2(interp, part1, part2, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be looked up. */
-    char *part1;		/* Name of an array (if part2 is non-NULL)
-				 * or the name of a variable. */
-    char *part2;		/* If non-NULL, gives the name of an element
-				 * in the array part1. */
-    int flags;			/* OR-ed combination of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY and TCL_LEAVE_ERR_MSG
-                                 * bits. */
-{
-    Tcl_Obj *objPtr;
-
-    objPtr = Tcl_GetVar2Ex(interp, part1, part2, flags);
-    if (objPtr == NULL) {
-	return NULL;
-    }
-    return TclGetString(objPtr);
-}
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ObjGetVar2 --
- *
- *	Return the value of a Tcl variable as a Tcl object, given a
- *	two-part name consisting of array name and element within array.
- *
- * Results:
- *	The return value points to the current object value of the variable
- *	given by part1Ptr and part2Ptr. If the specified variable doesn't
- *	exist, or if there is a clash in array usage, then NULL is returned
- *	and a message will be left in the interpreter's result if the
- *	TCL_LEAVE_ERR_MSG flag is set.
- *
- * Side effects:
- *	The ref count for the returned object is _not_ incremented to
- *	reflect the returned reference; if you want to keep a reference to
- *	the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_ObjGetVar2(interp, part1Ptr, part2Ptr, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be looked up. */
-    register Tcl_Obj *part1Ptr;	/* Points to an object holding the name of
-				 * an array (if part2 is non-NULL) or the
-				 * name of a variable. */
-    register Tcl_Obj *part2Ptr;	/* If non-null, points to an object holding
-				 * the name of an element in the array
-				 * part1Ptr. */
-    int flags;			/* OR-ed combination of TCL_GLOBAL_ONLY,
-				 * TCL_LEAVE_ERR_MSG, and
-				 * TCL_PARSE_PART1 bits. */
-{
-    char *part1, *part2;
-
-    part1 = Tcl_GetString(part1Ptr);
-    if (part2Ptr != NULL) {
-	part2 = Tcl_GetString(part2Ptr);
-    } else {
-	part2 = NULL;
-    }
-    
-    return Tcl_GetVar2Ex(interp, part1, part2, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetVar2Ex --
- *
- *	Return the value of a Tcl variable as a Tcl object, given a
- *	two-part name consisting of array name and element within array.
- *
- * Results:
- *	The return value points to the current object value of the variable
- *	given by part1Ptr and part2Ptr. If the specified variable doesn't
- *	exist, or if there is a clash in array usage, then NULL is returned
- *	and a message will be left in the interpreter's result if the
- *	TCL_LEAVE_ERR_MSG flag is set.
- *
- * Side effects:
- *	The ref count for the returned object is _not_ incremented to
- *	reflect the returned reference; if you want to keep a reference to
- *	the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_GetVar2Ex(interp, part1, part2, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be looked up. */
-    char *part1;		/* Name of an array (if part2 is non-NULL)
-				 * or the name of a variable. */
-    char *part2;		/* If non-NULL, gives the name of an element
-				 * in the array part1. */
-    int flags;			/* OR-ed combination of TCL_GLOBAL_ONLY,
-				 * and TCL_LEAVE_ERR_MSG bits. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Var *varPtr;
-    Var *arrayPtr;
-    char *msg;
-
-    varPtr = TclLookupVar(interp, part1, part2, flags, "read",
-            /*createPart1*/ 0, /*createPart2*/ 1, &arrayPtr);
-    if (varPtr == NULL) {
-	return NULL;
-    }
-
-    /*
-     * Invoke any traces that have been set for the variable.
-     */
-
-    if ((varPtr->tracePtr != NULL)
-	    || ((arrayPtr != NULL) && (arrayPtr->tracePtr != NULL))) {
-	msg = CallTraces(iPtr, arrayPtr, varPtr, part1, part2,
-		(flags & (TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY)) | TCL_TRACE_READS);
-	if (msg != NULL) {
-	    if (flags & TCL_LEAVE_ERR_MSG) {
-		VarErrMsg(interp, part1, part2, "read", msg);
-	    }
-	    goto errorReturn;
-	}
-    }
-
-    /*
-     * Return the element if it's an existing scalar variable.
-     */
-    
-    if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
-	return varPtr->value.objPtr;
-    }
-    
-    if (flags & TCL_LEAVE_ERR_MSG) {
-	if (TclIsVarUndefined(varPtr) && (arrayPtr != NULL)
-	        && !TclIsVarUndefined(arrayPtr)) {
-	    msg = noSuchElement;
-	} else if (TclIsVarArray(varPtr)) {
-	    msg = isArray;
-	} else {
-	    msg = noSuchVar;
-	}
-	VarErrMsg(interp, part1, part2, "read", msg);
-    }
-
-    /*
-     * An error. If the variable doesn't exist anymore and no-one's using
-     * it, then free up the relevant structures and hash table entries.
-     */
-
-    errorReturn:
-    if (TclIsVarUndefined(varPtr)) {
-	CleanupVar(varPtr, arrayPtr);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetIndexedScalar --
- *
- *	Return the Tcl object value of a local scalar variable in the active
- *	procedure, given its index in the procedure's array of compiler
- *	allocated local variables.
- *
- * Results:
- *	The return value points to the current object value of the variable
- *	given by localIndex. If the specified variable doesn't exist, or
- *	there is a clash in array usage, or an error occurs while executing
- *	variable traces, then NULL is returned and a message will be left in
- *	the interpreter's result if leaveErrorMsg is 1.
- *
- * Side effects:
- *	The ref count for the returned object is _not_ incremented to
- *	reflect the returned reference; if you want to keep a reference to
- *	the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclGetIndexedScalar(interp, localIndex, leaveErrorMsg)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be looked up. */
-    register int localIndex;	/* Index of variable in procedure's array
-				 * of local variables. */
-    int leaveErrorMsg;		/* 1 if to leave an error message in
-				 * interpreter's result on an error.
-				 * Otherwise no error message is left. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CallFrame *varFramePtr = iPtr->varFramePtr;
-				/* Points to the procedure call frame whose
-				 * variables are currently in use. Same as
-				 * the current procedure's frame, if any,
-				 * unless an "uplevel" is executing. */
-    Var *compiledLocals = varFramePtr->compiledLocals;
-    register Var *varPtr;	/* Points to the variable's in-frame Var
-				 * structure. */
-    char *varName;		/* Name of the local variable. */
-    char *msg;
-
-#ifdef TCL_COMPILE_DEBUG
-    int localCt = varFramePtr->procPtr->numCompiledLocals;
-
-    if (compiledLocals == NULL) {
-	fprintf(stderr, "\nTclGetIndexedScalar: can't get local %i in frame 0x%x, no compiled locals\n",
-		localIndex, (unsigned int) varFramePtr);
-	panic("TclGetIndexedScalar: no compiled locals in frame 0x%x",
-		(unsigned int) varFramePtr);
-    }
-    if ((localIndex < 0) || (localIndex >= localCt)) {
-	fprintf(stderr, "\nTclGetIndexedScalar: can't get local %i in frame 0x%x with %i locals\n",
-		localIndex, (unsigned int) varFramePtr, localCt);
-	panic("TclGetIndexedScalar: bad local index %i in frame 0x%x",
-		localIndex, (unsigned int) varFramePtr);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-    
-    varPtr = &(compiledLocals[localIndex]);
-    varName = varPtr->name;
-
-    /*
-     * If varPtr is a link variable, we have a reference to some variable
-     * that was created through an "upvar" or "global" command, or we have a
-     * reference to a variable in an enclosing namespace. Traverse through
-     * any links until we find the referenced variable.
-     */
-	
-    while (TclIsVarLink(varPtr)) {
-	varPtr = varPtr->value.linkPtr;
-    }
-
-    /*
-     * Invoke any traces that have been set for the variable.
-     */
-
-    if (varPtr->tracePtr != NULL) {
-	msg = CallTraces(iPtr, /*arrayPtr*/ NULL, varPtr, varName, NULL,
-		TCL_TRACE_READS);
-	if (msg != NULL) {
-	    if (leaveErrorMsg) {
-		VarErrMsg(interp, varName, NULL, "read", msg);
-	    }
-	    return NULL;
-	}
-    }
-
-    /*
-     * Make sure we're dealing with a scalar variable and not an array, and
-     * that the variable exists (isn't undefined).
-     */
-
-    if (!TclIsVarScalar(varPtr) || TclIsVarUndefined(varPtr)) {
-	if (leaveErrorMsg) {
-	    if (TclIsVarArray(varPtr)) {
-		msg = isArray;
-	    } else {
-		msg = noSuchVar;
-	    }
-	    VarErrMsg(interp, varName, NULL, "read", msg);
-
-	}
-	return NULL;
-    }
-    return varPtr->value.objPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetElementOfIndexedArray --
- *
- *	Return the Tcl object value for an element in a local array
- *	variable. The element is named by the object elemPtr while the 
- *	array is specified by its index in the active procedure's array
- *	of compiler allocated local variables.
- *
- * Results:
- *	The return value points to the current object value of the
- *	element. If the specified array or element doesn't exist, or there
- *	is a clash in array usage, or an error occurs while executing
- *	variable traces, then NULL is returned and a message will be left in
- *	the interpreter's result if leaveErrorMsg is 1.
- *
- * Side effects:
- *	The ref count for the returned object is _not_ incremented to
- *	reflect the returned reference; if you want to keep a reference to
- *	the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclGetElementOfIndexedArray(interp, localIndex, elemPtr, leaveErrorMsg)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be looked up. */
-    int localIndex;		/* Index of array variable in procedure's
-				 * array of local variables. */
-    Tcl_Obj *elemPtr;		/* Points to an object holding the name of
-				 * an element to get in the array. */
-    int leaveErrorMsg;		/* 1 if to leave an error message in
-				 * the interpreter's result on an error.
-				 * Otherwise no error message is left. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CallFrame *varFramePtr = iPtr->varFramePtr;
-				/* Points to the procedure call frame whose
-				 * variables are currently in use. Same as
-				 * the current procedure's frame, if any,
-				 * unless an "uplevel" is executing. */
-    Var *compiledLocals = varFramePtr->compiledLocals;
-    Var *arrayPtr;		/* Points to the array's in-frame Var
-				 * structure. */
-    char *arrayName;		/* Name of the local array. */
-    Tcl_HashEntry *hPtr;
-    Var *varPtr = NULL;		/* Points to the element's Var structure
-				 * that we return. Initialized to avoid
-				 * compiler warning. */
-    char *elem, *msg;
-    int new;
-
-#ifdef TCL_COMPILE_DEBUG
-    Proc *procPtr = varFramePtr->procPtr;
-    int localCt = procPtr->numCompiledLocals;
-
-    if (compiledLocals == NULL) {
-	fprintf(stderr, "\nTclGetElementOfIndexedArray: can't get element of local %i in frame 0x%x, no compiled locals\n",
-		localIndex, (unsigned int) varFramePtr);
-	panic("TclGetIndexedScalar: no compiled locals in frame 0x%x",
-		(unsigned int) varFramePtr);
-    }
-    if ((localIndex < 0) || (localIndex >= localCt)) {
-	fprintf(stderr, "\nTclGetIndexedScalar: can't get element of local %i in frame 0x%x with %i locals\n",
-		localIndex, (unsigned int) varFramePtr, localCt);
-	panic("TclGetElementOfIndexedArray: bad local index %i in frame 0x%x",
-		localIndex, (unsigned int) varFramePtr);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-
-    elem = TclGetString(elemPtr);
-    arrayPtr = &(compiledLocals[localIndex]);
-    arrayName = arrayPtr->name;
-
-    /*
-     * If arrayPtr is a link variable, we have a reference to some variable
-     * that was created through an "upvar" or "global" command, or we have a
-     * reference to a variable in an enclosing namespace. Traverse through
-     * any links until we find the referenced variable.
-     */
-	
-    while (TclIsVarLink(arrayPtr)) {
-	arrayPtr = arrayPtr->value.linkPtr;
-    }
-
-    /*
-     * Make sure we're dealing with an array and that the array variable
-     * exists (isn't undefined).
-     */
-
-    if (!TclIsVarArray(arrayPtr) || TclIsVarUndefined(arrayPtr)) {
-	if (leaveErrorMsg) {
-	    VarErrMsg(interp, arrayName, elem, "read", noSuchVar);
-	}
-	goto errorReturn;
-    } 
-
-    /*
-     * Look up the element. Note that we must create the element (but leave
-     * it marked undefined) if it does not already exist. This allows a
-     * trace to create new array elements "on the fly" that did not exist
-     * before. A trace is always passed a variable for the array element. If
-     * the trace does not define the variable, it will be deleted below (at
-     * errorReturn) and an error returned.
-     */
-
-    hPtr = Tcl_CreateHashEntry(arrayPtr->value.tablePtr, elem, &new);
-    if (new) {
-	if (arrayPtr->searchPtr != NULL) {
-	    DeleteSearches(arrayPtr);
-	}
-	varPtr = NewVar();
-	Tcl_SetHashValue(hPtr, varPtr);
-	varPtr->hPtr = hPtr;
-	varPtr->nsPtr = varFramePtr->nsPtr;
-	TclSetVarArrayElement(varPtr);
-    } else {
-	varPtr = (Var *) Tcl_GetHashValue(hPtr);
-    }
-
-    /*
-     * Invoke any traces that have been set for the element variable.
-     */
-
-    if ((varPtr->tracePtr != NULL)
-            || ((arrayPtr != NULL) && (arrayPtr->tracePtr != NULL))) {
-	msg = CallTraces(iPtr, arrayPtr, varPtr, arrayName, elem,
-	        TCL_TRACE_READS);
-	if (msg != NULL) {
-	    if (leaveErrorMsg) {
-		VarErrMsg(interp, arrayName, elem, "read", msg);
-	    }
-	    goto errorReturn;
-	}
-    }
-
-    /*
-     * Return the element if it's an existing scalar variable.
-     */
-    
-    if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
-	return varPtr->value.objPtr;
-    }
-    
-    if (leaveErrorMsg) {
-	if (TclIsVarArray(varPtr)) {
-	    msg = isArray;
-	} else {
-	    msg = noSuchVar;
-	}
-	VarErrMsg(interp, arrayName, elem, "read", msg);
-    }
-
-    /*
-     * An error. If the variable doesn't exist anymore and no-one's using
-     * it, then free up the relevant structures and hash table entries.
-     */
-
-    errorReturn:
-    if ((varPtr != NULL) && TclIsVarUndefined(varPtr)) {
-	CleanupVar(varPtr, NULL); /* the array is not in a hashtable */
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetObjCmd --
- *
- *	This procedure is invoked to process the "set" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result value.
- *
- * Side effects:
- *	A variable's value may be changed.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_SetObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;			/* Not used. */
-    register Tcl_Interp *interp;	/* Current interpreter. */
-    int objc;				/* Number of arguments. */
-    Tcl_Obj *CONST objv[];		/* Argument objects. */
-{
-    Tcl_Obj *varValueObj;
-
-    if (objc == 2) {
-	varValueObj = Tcl_ObjGetVar2(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG);
-	if (varValueObj == NULL) {
-	    return TCL_ERROR;
-	}
-	Tcl_SetObjResult(interp, varValueObj);
-	return TCL_OK;
-    } else if (objc == 3) {
-
-	varValueObj = Tcl_ObjSetVar2(interp, objv[1], NULL, objv[2],
-		TCL_LEAVE_ERR_MSG);
-	if (varValueObj == NULL) {
-	    return TCL_ERROR;
-	}
-	Tcl_SetObjResult(interp, varValueObj);
-	return TCL_OK;
-    } else {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName ?newValue?");
-	return TCL_ERROR;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetVar --
- *
- *	Change the value of a variable.
- *
- * Results:
- *	Returns a pointer to the malloc'ed string which is the character
- *	representation of the variable's new value. The caller must not
- *	modify this string. If the write operation was disallowed then NULL
- *	is returned; if the TCL_LEAVE_ERR_MSG flag is set, then an
- *	explanatory message will be left in the interp's result. Note that the
- *	returned string may not be the same as newValue; this is because
- *	variable traces may modify the variable's value.
- *
- * Side effects:
- *	If varName is defined as a local or global variable in interp,
- *	its value is changed to newValue. If varName isn't currently
- *	defined, then a new global variable by that name is created.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_SetVar(interp, varName, newValue, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which varName is
-				 * to be looked up. */
-    char *varName;		/* Name of a variable in interp. */
-    char *newValue;		/* New value for varName. */
-    int flags;			/* Various flags that tell how to set value:
-				 * any of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, TCL_APPEND_VALUE,
-				 * TCL_LIST_ELEMENT, TCL_LEAVE_ERR_MSG. */
-{
-    return Tcl_SetVar2(interp, varName, (char *) NULL, newValue, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetVar2 --
- *
- *      Given a two-part variable name, which may refer either to a
- *      scalar variable or an element of an array, change the value
- *      of the variable.  If the named scalar or array or element
- *      doesn't exist then create one.
- *
- * Results:
- *	Returns a pointer to the malloc'ed string which is the character
- *	representation of the variable's new value. The caller must not
- *	modify this string. If the write operation was disallowed because an
- *	array was expected but not found (or vice versa), then NULL is
- *	returned; if the TCL_LEAVE_ERR_MSG flag is set, then an explanatory
- *	message will be left in the interp's result. Note that the returned
- *	string may not be the same as newValue; this is because variable
- *	traces may modify the variable's value.
- *
- * Side effects:
- *      The value of the given variable is set. If either the array
- *      or the entry didn't exist then a new one is created.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_SetVar2(interp, part1, part2, newValue, flags)
-    Tcl_Interp *interp;         /* Command interpreter in which variable is
-                                 * to be looked up. */
-    char *part1;                /* If part2 is NULL, this is name of scalar
-                                 * variable. Otherwise it is the name of
-                                 * an array. */
-    char *part2;                /* Name of an element within an array, or
-				 * NULL. */
-    char *newValue;             /* New value for variable. */
-    int flags;                  /* Various flags that tell how to set value:
-				 * any of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, TCL_APPEND_VALUE,
-				 * TCL_LIST_ELEMENT, or TCL_LEAVE_ERR_MSG */
-{
-    register Tcl_Obj *valuePtr;
-    Tcl_Obj *varValuePtr;
-
-    /*
-     * Create an object holding the variable's new value and use
-     * Tcl_SetVar2Ex to actually set the variable.
-     */
-
-    valuePtr = Tcl_NewStringObj(newValue, -1);
-    Tcl_IncrRefCount(valuePtr);
-
-    varValuePtr = Tcl_SetVar2Ex(interp, part1, part2, valuePtr, flags);
-    Tcl_DecrRefCount(valuePtr); /* done with the object */
-    
-    if (varValuePtr == NULL) {
-	return NULL;
-    }
-    return TclGetString(varValuePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ObjSetVar2 --
- *
- *	This function is the same as Tcl_SetVar2Ex below, except the
- *	variable names are passed in Tcl object instead of strings.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	variable. If the write operation was disallowed because an array was
- *	expected but not found (or vice versa), then NULL is returned; if
- *	the TCL_LEAVE_ERR_MSG flag is set, then an explanatory message will
- *	be left in the interpreter's result. Note that the returned object
- *	may not be the same one referenced by newValuePtr; this is because
- *	variable traces may modify the variable's value.
- *
- * Side effects:
- *	The value of the given variable is set. If either the array or the
- *	entry didn't exist then a new variable is created.
-
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_ObjSetVar2(interp, part1Ptr, part2Ptr, newValuePtr, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be found. */
-    register Tcl_Obj *part1Ptr;	/* Points to an object holding the name of
-				 * an array (if part2 is non-NULL) or the
-				 * name of a variable. */
-    register Tcl_Obj *part2Ptr;	/* If non-null, points to an object holding
-				 * the name of an element in the array
-				 * part1Ptr. */
-    Tcl_Obj *newValuePtr;	/* New value for variable. */
-    int flags;			/* Various flags that tell how to set value:
-				 * any of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, TCL_APPEND_VALUE,
-				 * TCL_LIST_ELEMENT, TCL_LEAVE_ERR_MSG, or
-				 * TCL_PARSE_PART1. */
-{
-    char *part1, *part2;
-
-    part1 = Tcl_GetString(part1Ptr);
-    if (part2Ptr != NULL) {
-	part2 = Tcl_GetString(part2Ptr);
-    } else {
-	part2 = NULL;
-    }
-    
-    return Tcl_SetVar2Ex(interp, part1, part2, newValuePtr, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetVar2Ex --
- *
- *	Given a two-part variable name, which may refer either to a scalar
- *	variable or an element of an array, change the value of the variable
- *	to a new Tcl object value. If the named scalar or array or element
- *	doesn't exist then create one.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	variable. If the write operation was disallowed because an array was
- *	expected but not found (or vice versa), then NULL is returned; if
- *	the TCL_LEAVE_ERR_MSG flag is set, then an explanatory message will
- *	be left in the interpreter's result. Note that the returned object
- *	may not be the same one referenced by newValuePtr; this is because
- *	variable traces may modify the variable's value.
- *
- * Side effects:
- *	The value of the given variable is set. If either the array or the
- *	entry didn't exist then a new variable is created.
- *
- *	The reference count is decremented for any old value of the variable
- *	and incremented for its new value. If the new value for the variable
- *	is not the same one referenced by newValuePtr (perhaps as a result
- *	of a variable trace), then newValuePtr's ref count is left unchanged
- *	by Tcl_SetVar2Ex. newValuePtr's ref count is also left unchanged if
- *	we are appending it as a string value: that is, if "flags" includes
- *	TCL_APPEND_VALUE but not TCL_LIST_ELEMENT.
- *
- *	The reference count for the returned object is _not_ incremented: if
- *	you want to keep a reference to the object you must increment its
- *	ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_SetVar2Ex(interp, part1, part2, newValuePtr, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be found. */
-    char *part1;		/* Name of an array (if part2 is non-NULL)
-				 * or the name of a variable. */
-    char *part2;		/* If non-NULL, gives the name of an element
-				 * in the array part1. */
-    Tcl_Obj *newValuePtr;	/* New value for variable. */
-    int flags;			/* Various flags that tell how to set value:
-				 * any of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, TCL_APPEND_VALUE,
-				 * TCL_LIST_ELEMENT or TCL_LEAVE_ERR_MSG. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Var *varPtr;
-    Var *arrayPtr;
-    Tcl_Obj *oldValuePtr;
-    Tcl_Obj *resultPtr = NULL;
-    char *bytes;
-    int length, result;
-
-    varPtr = TclLookupVar(interp, part1, part2, flags, "set",
-	    /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
-    if (varPtr == NULL) {
-	return NULL;
-    }
-
-    /*
-     * If the variable is in a hashtable and its hPtr field is NULL, then we
-     * may have an upvar to an array element where the array was deleted
-     * or an upvar to a namespace variable whose namespace was deleted.
-     * Generate an error (allowing the variable to be reset would screw up
-     * our storage allocation and is meaningless anyway).
-     */
-
-    if ((varPtr->flags & VAR_IN_HASHTABLE) && (varPtr->hPtr == NULL)) {
-	if (flags & TCL_LEAVE_ERR_MSG) {
-	    if (TclIsVarArrayElement(varPtr)) {
-		VarErrMsg(interp, part1, part2, "set", danglingElement);
-	    } else {
-		VarErrMsg(interp, part1, part2, "set", danglingVar);
-	    }
-	}
-	return NULL;
-    }
-
-    /*
-     * It's an error to try to set an array variable itself.
-     */
-
-    if (TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
-	if (flags & TCL_LEAVE_ERR_MSG) {
-	    VarErrMsg(interp, part1, part2, "set", isArray);
-	}
-	return NULL;
-    }
-
-    /*
-     * At this point, if we were appending, we used to call read traces: we
-     * treated append as a read-modify-write. However, it seemed unlikely to
-     * us that a real program would be interested in such reads being done
-     * during a set operation.
-     */
-
-    /*
-     * Set the variable's new value. If appending, append the new value to
-     * the variable, either as a list element or as a string. Also, if
-     * appending, then if the variable's old value is unshared we can modify
-     * it directly, otherwise we must create a new copy to modify: this is
-     * "copy on write".
-     */
-
-    oldValuePtr = varPtr->value.objPtr;
-    if (flags & TCL_APPEND_VALUE) {
-	if (TclIsVarUndefined(varPtr) && (oldValuePtr != NULL)) {
-	    Tcl_DecrRefCount(oldValuePtr);     /* discard old value */
-	    varPtr->value.objPtr = NULL;
-	    oldValuePtr = NULL;
-	}
-	if (flags & TCL_LIST_ELEMENT) {	       /* append list element */
-	    if (oldValuePtr == NULL) {
-		TclNewObj(oldValuePtr);
-		varPtr->value.objPtr = oldValuePtr;
-		Tcl_IncrRefCount(oldValuePtr); /* since var is reference */
-	    } else if (Tcl_IsShared(oldValuePtr)) {
-		varPtr->value.objPtr = Tcl_DuplicateObj(oldValuePtr);
-		Tcl_DecrRefCount(oldValuePtr);
-		oldValuePtr = varPtr->value.objPtr;
-		Tcl_IncrRefCount(oldValuePtr); /* since var is reference */
-	    }
-	    result = Tcl_ListObjAppendElement(interp, oldValuePtr,
-		    newValuePtr);
-	    if (result != TCL_OK) {
-		return NULL;
-	    }
-	} else {		               /* append string */
-	    /*
-	     * We append newValuePtr's bytes but don't change its ref count.
-	     */
-
-	    bytes = Tcl_GetStringFromObj(newValuePtr, &length);
-	    if (oldValuePtr == NULL) {
-		varPtr->value.objPtr = Tcl_NewStringObj(bytes, length);
-		Tcl_IncrRefCount(varPtr->value.objPtr);
-	    } else {
-		if (Tcl_IsShared(oldValuePtr)) {   /* append to copy */
-		    varPtr->value.objPtr = Tcl_DuplicateObj(oldValuePtr);
-		    TclDecrRefCount(oldValuePtr);
-		    oldValuePtr = varPtr->value.objPtr;
-		    Tcl_IncrRefCount(oldValuePtr); /* since var is ref */
-		}
-		Tcl_AppendToObj(oldValuePtr, bytes, length);
-	    }
-	}
-    } else {
-	if (flags & TCL_LIST_ELEMENT) {	       /* set var to list element */
-	    int neededBytes, listFlags;
-
-	    /*
-	     * We set the variable to the result of converting newValuePtr's
-	     * string rep to a list element. We do not change newValuePtr's
-	     * ref count.
-	     */
-
-	    if (oldValuePtr != NULL) {
-		Tcl_DecrRefCount(oldValuePtr); /* discard old value */
-	    }
-	    bytes = Tcl_GetStringFromObj(newValuePtr, &length);
-	    neededBytes = Tcl_ScanElement(bytes, &listFlags);
-	    oldValuePtr = Tcl_NewObj();
-	    oldValuePtr->bytes = (char *)
-		ckalloc((unsigned) (neededBytes + 1));
-	    oldValuePtr->length = Tcl_ConvertElement(bytes,
-		    oldValuePtr->bytes, listFlags);
-	    varPtr->value.objPtr = oldValuePtr;
-	    Tcl_IncrRefCount(varPtr->value.objPtr);
-	} else if (newValuePtr != oldValuePtr) {
-	    varPtr->value.objPtr = newValuePtr;
-	    Tcl_IncrRefCount(newValuePtr);      /* var is another ref */
-	    if (oldValuePtr != NULL) {
-		TclDecrRefCount(oldValuePtr);   /* discard old value */
-	    }
-	}
-    }
-    TclSetVarScalar(varPtr);
-    TclClearVarUndefined(varPtr);
-    if (arrayPtr != NULL) {
-	TclClearVarUndefined(arrayPtr);
-    }
-
-    /*
-     * Invoke any write traces for the variable.
-     */
-
-    if ((varPtr->tracePtr != NULL)
-	    || ((arrayPtr != NULL) && (arrayPtr->tracePtr != NULL))) {
-	char *msg = CallTraces(iPtr, arrayPtr, varPtr, part1, part2,
-	        (flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY)) | TCL_TRACE_WRITES);
-	if (msg != NULL) {
-	    if (flags & TCL_LEAVE_ERR_MSG) {
-		VarErrMsg(interp, part1, part2, "set", msg);
-	    }
-	    goto cleanup;
-	}
-    }
-
-    /*
-     * Return the variable's value unless the variable was changed in some
-     * gross way by a trace (e.g. it was unset and then recreated as an
-     * array). 
-     */
-
-    if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
-	return varPtr->value.objPtr;
-    }
-
-    /*
-     * A trace changed the value in some gross way. Return an empty string
-     * object.
-     */
-    
-    resultPtr = iPtr->emptyObjPtr;
-
-    /*
-     * If the variable doesn't exist anymore and no-one's using it, then
-     * free up the relevant structures and hash table entries.
-     */
-
-    cleanup:
-    if (TclIsVarUndefined(varPtr)) {
-	CleanupVar(varPtr, arrayPtr);
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetIndexedScalar --
- *
- *	Change the Tcl object value of a local scalar variable in the active
- *	procedure, given its compile-time allocated index in the procedure's
- *	array of local variables.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	variable given by localIndex. If the specified variable doesn't
- *	exist, or there is a clash in array usage, or an error occurs while
- *	executing variable traces, then NULL is returned and a message will
- *	be left in the interpreter's result if leaveErrorMsg is 1. Note
- *	that the returned object may not be the same one referenced by
- *	newValuePtr; this is because variable traces may modify the
- *	variable's value.
- *
- * Side effects:
- *	The value of the given variable is set. The reference count is
- *	decremented for any old value of the variable and incremented for
- *	its new value. If as a result of a variable trace the new value for
- *	the variable is not the same one referenced by newValuePtr, then
- *	newValuePtr's ref count is left unchanged. The ref count for the
- *	returned object is _not_ incremented to reflect the returned
- *	reference; if you want to keep a reference to the object you must
- *	increment its ref count yourself. This procedure does not create
- *	new variables, but only sets those recognized at compile time.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclSetIndexedScalar(interp, localIndex, newValuePtr, leaveErrorMsg)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be found. */
-    int localIndex;		/* Index of variable in procedure's array
-				 * of local variables. */
-    Tcl_Obj *newValuePtr;	/* New value for variable. */
-    int leaveErrorMsg;		/* 1 if to leave an error message in
-				 * the interpreter's result on an error.
-				 * Otherwise no error message is left. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CallFrame *varFramePtr = iPtr->varFramePtr;
-				/* Points to the procedure call frame whose
-				 * variables are currently in use. Same as
-				 * the current procedure's frame, if any,
-				 * unless an "uplevel" is executing. */
-    Var *compiledLocals = varFramePtr->compiledLocals;
-    register Var *varPtr;	/* Points to the variable's in-frame Var
-				 * structure. */
-    char *varName;		/* Name of the local variable. */
-    Tcl_Obj *oldValuePtr;
-    Tcl_Obj *resultPtr = NULL;
-
-#ifdef TCL_COMPILE_DEBUG
-    Proc *procPtr = varFramePtr->procPtr;
-    int localCt = procPtr->numCompiledLocals;
-
-    if (compiledLocals == NULL) {
-	fprintf(stderr, "\nTclSetIndexedScalar: can't set local %i in frame 0x%x, no compiled locals\n",
-		localIndex, (unsigned int) varFramePtr);
-	panic("TclSetIndexedScalar: no compiled locals in frame 0x%x",
-		(unsigned int) varFramePtr);
-    }
-    if ((localIndex < 0) || (localIndex >= localCt)) {
-	fprintf(stderr, "\nTclSetIndexedScalar: can't set local %i in frame 0x%x with %i locals\n",
-		localIndex, (unsigned int) varFramePtr, localCt);
-	panic("TclSetIndexedScalar: bad local index %i in frame 0x%x",
-		localIndex, (unsigned int) varFramePtr);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-    
-    varPtr = &(compiledLocals[localIndex]);
-    varName = varPtr->name;
-
-    /*
-     * If varPtr is a link variable, we have a reference to some variable
-     * that was created through an "upvar" or "global" command, or we have a
-     * reference to a variable in an enclosing namespace. Traverse through
-     * any links until we find the referenced variable.
-     */
-	
-    while (TclIsVarLink(varPtr)) {
-	varPtr = varPtr->value.linkPtr;
-    }
-
-    /*
-     * If the variable is in a hashtable and its hPtr field is NULL, then we
-     * may have an upvar to an array element where the array was deleted
-     * or an upvar to a namespace variable whose namespace was deleted.
-     * Generate an error (allowing the variable to be reset would screw up
-     * our storage allocation and is meaningless anyway).
-     */
-
-    if ((varPtr->flags & VAR_IN_HASHTABLE) && (varPtr->hPtr == NULL)) {
-	if (leaveErrorMsg) {
-	    if (TclIsVarArrayElement(varPtr)) {
-		VarErrMsg(interp, varName, NULL, "set", danglingElement);
-	    } else {
-		VarErrMsg(interp, varName, NULL, "set", danglingVar);
-	    }
-	}
-	return NULL;
-    }
-
-    /*
-     * It's an error to try to set an array variable itself.
-     */
-
-    if (TclIsVarArray(varPtr) && !TclIsVarUndefined(varPtr)) {
-	if (leaveErrorMsg) {
-	    VarErrMsg(interp, varName, NULL, "set", isArray);
-	}
-	return NULL;
-    }
-
-    /*
-     * Set the variable's new value and discard its old value. We don't
-     * append with this "set" procedure so the old value isn't needed.
-     */
-
-    oldValuePtr = varPtr->value.objPtr;
-    if (newValuePtr != oldValuePtr) {        /* set new value */
-	varPtr->value.objPtr = newValuePtr;
-	Tcl_IncrRefCount(newValuePtr);       /* var is another ref to obj */
-	if (oldValuePtr != NULL) {
-	    TclDecrRefCount(oldValuePtr);    /* discard old value */
-	}
-    }
-    TclSetVarScalar(varPtr);
-    TclClearVarUndefined(varPtr);
-
-    /*
-     * Invoke any write traces for the variable.
-     */
-
-    if (varPtr->tracePtr != NULL) {
-	char *msg = CallTraces(iPtr, /*arrayPtr*/ NULL, varPtr,
-	        varName, (char *) NULL, TCL_TRACE_WRITES);
-	if (msg != NULL) {
-	    if (leaveErrorMsg) {
-		VarErrMsg(interp, varName, NULL, "set", msg);
-	    }
-	    goto cleanup;
-	}
-    }
-
-    /*
-     * Return the variable's value unless the variable was changed in some
-     * gross way by a trace (e.g. it was unset and then recreated as an
-     * array). If it was changed is a gross way, just return an empty string
-     * object.
-     */
-
-    if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
-	return varPtr->value.objPtr;
-    }
-    
-    resultPtr = Tcl_NewObj();
-
-    /*
-     * If the variable doesn't exist anymore and no-one's using it, then
-     * free up the relevant structures and hash table entries.
-     */
-
-    cleanup:
-    if (TclIsVarUndefined(varPtr)) {
-	CleanupVar(varPtr, NULL);
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetElementOfIndexedArray --
- *
- *	Change the Tcl object value of an element in a local array
- *	variable. The element is named by the object elemPtr while the array
- *	is specified by its index in the active procedure's array of
- *	compiler allocated local variables.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	element. If the specified array or element doesn't exist, or there
- *	is a clash in array usage, or an error occurs while executing
- *	variable traces, then NULL is returned and a message will be left in
- *	the interpreter's result if leaveErrorMsg is 1. Note that the
- *	returned object may not be the same one referenced by newValuePtr;
- *	this is because variable traces may modify the variable's value.
- *
- * Side effects:
- *	The value of the given array element is set. The reference count is
- *	decremented for any old value of the element and incremented for its
- *	new value. If as a result of a variable trace the new value for the
- *	element is not the same one referenced by newValuePtr, then
- *	newValuePtr's ref count is left unchanged. The ref count for the
- *	returned object is _not_ incremented to reflect the returned
- *	reference; if you want to keep a reference to the object you must
- *	increment its ref count yourself. This procedure will not create new
- *	array variables, but only sets elements of those arrays recognized
- *	at compile time. However, if the entry doesn't exist then a new
- *	variable is created.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclSetElementOfIndexedArray(interp, localIndex, elemPtr, newValuePtr,
-        leaveErrorMsg)
-    Tcl_Interp *interp;		/* Command interpreter in which the array is
-				 * to be found. */
-    int localIndex;		/* Index of array variable in procedure's
-				 * array of local variables. */
-    Tcl_Obj *elemPtr;		/* Points to an object holding the name of
-				 * an element to set in the array. */
-    Tcl_Obj *newValuePtr;	/* New value for variable. */
-    int leaveErrorMsg;		/* 1 if to leave an error message in
-				 * the interpreter's result on an error.
-				 * Otherwise no error message is left. */
-{
-    Interp *iPtr = (Interp *) interp;
-    CallFrame *varFramePtr = iPtr->varFramePtr;
-				/* Points to the procedure call frame whose
-				 * variables are currently in use. Same as
-				 * the current procedure's frame, if any,
-				 * unless an "uplevel" is executing. */
-    Var *compiledLocals = varFramePtr->compiledLocals;
-    Var *arrayPtr;		/* Points to the array's in-frame Var
-				 * structure. */
-    char *arrayName;		/* Name of the local array. */
-    char *elem;
-    Tcl_HashEntry *hPtr;
-    Var *varPtr = NULL;		/* Points to the element's Var structure
-				 * that we return. */
-    Tcl_Obj *resultPtr = NULL;
-    Tcl_Obj *oldValuePtr;
-    int new;
-    
-#ifdef TCL_COMPILE_DEBUG
-    Proc *procPtr = varFramePtr->procPtr;
-    int localCt = procPtr->numCompiledLocals;
-
-    if (compiledLocals == NULL) {
-	fprintf(stderr, "\nTclSetElementOfIndexedArray: can't set element of local %i in frame 0x%x, no compiled locals\n",
-		localIndex, (unsigned int) varFramePtr);
-	panic("TclSetIndexedScalar: no compiled locals in frame 0x%x",
-		(unsigned int) varFramePtr);
-    }
-    if ((localIndex < 0) || (localIndex >= localCt)) {
-	fprintf(stderr, "\nTclSetIndexedScalar: can't set elememt of local %i in frame 0x%x with %i locals\n",
-		localIndex, (unsigned int) varFramePtr, localCt);
-	panic("TclSetElementOfIndexedArray: bad local index %i in frame 0x%x",
-		localIndex, (unsigned int) varFramePtr);
-    }
-#endif /* TCL_COMPILE_DEBUG */
-
-    elem = TclGetString(elemPtr);
-    arrayPtr = &(compiledLocals[localIndex]);
-    arrayName = arrayPtr->name;
-
-    /*
-     * If arrayPtr is a link variable, we have a reference to some variable
-     * that was created through an "upvar" or "global" command, or we have a
-     * reference to a variable in an enclosing namespace. Traverse through
-     * any links until we find the referenced variable.
-     */
-	
-    while (TclIsVarLink(arrayPtr)) {
-	arrayPtr = arrayPtr->value.linkPtr;
-    }
-
-    /*
-     * If the variable is in a hashtable and its hPtr field is NULL, then we
-     * may have an upvar to an array element where the array was deleted
-     * or an upvar to a namespace variable whose namespace was deleted.
-     * Generate an error (allowing the variable to be reset would screw up
-     * our storage allocation and is meaningless anyway).
-     */
-
-    if ((arrayPtr->flags & VAR_IN_HASHTABLE) && (arrayPtr->hPtr == NULL)) {
-	if (leaveErrorMsg) {
-	    if (TclIsVarArrayElement(arrayPtr)) {
-		VarErrMsg(interp, arrayName, elem, "set", danglingElement);
-	    } else {
-		VarErrMsg(interp, arrayName, elem, "set", danglingVar);
-	    }
-	}
-	goto errorReturn;
-    }
-
-    /*
-     * Make sure we're dealing with an array.
-     */
-
-    if (TclIsVarUndefined(arrayPtr) && !TclIsVarArrayElement(arrayPtr)) {
-	TclSetVarArray(arrayPtr);
-	arrayPtr->value.tablePtr =
-	    (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-	Tcl_InitHashTable(arrayPtr->value.tablePtr, TCL_STRING_KEYS);
-	TclClearVarUndefined(arrayPtr);
-    } else if (!TclIsVarArray(arrayPtr)) {
-	if (leaveErrorMsg) {
-	    VarErrMsg(interp, arrayName, elem, "set", needArray);
-	}
-	goto errorReturn;
-    } 
-
-    /*
-     * Look up the element.
-     */
-
-    hPtr = Tcl_CreateHashEntry(arrayPtr->value.tablePtr, elem, &new);
-    if (new) {
-	if (arrayPtr->searchPtr != NULL) {
-	    DeleteSearches(arrayPtr);
-	}
-	varPtr = NewVar();
-	Tcl_SetHashValue(hPtr, varPtr);
-	varPtr->hPtr = hPtr;
-        varPtr->nsPtr = varFramePtr->nsPtr;
-	TclSetVarArrayElement(varPtr);
-    }
-    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-
-    /*
-     * It's an error to try to set an array variable itself.
-     */
-
-    if (TclIsVarArray(varPtr)) {
-	if (leaveErrorMsg) {
-	    VarErrMsg(interp, arrayName, elem, "set", isArray);
-	}
-	goto errorReturn;
-    }
-
-    /*
-     * Set the variable's new value and discard the old one. We don't
-     * append with this "set" procedure so the old value isn't needed.
-     */
-
-    oldValuePtr = varPtr->value.objPtr;
-    if (newValuePtr != oldValuePtr) {	     /* set new value */
-	varPtr->value.objPtr = newValuePtr;
-	Tcl_IncrRefCount(newValuePtr);       /* var is another ref to obj */
-	if (oldValuePtr != NULL) {
-	    TclDecrRefCount(oldValuePtr);    /* discard old value */
-	}
-    }
-    TclSetVarScalar(varPtr);
-    TclClearVarUndefined(varPtr);
-
-    /*
-     * Invoke any write traces for the element variable.
-     */
-
-    if ((varPtr->tracePtr != NULL)
-	    || ((arrayPtr != NULL) && (arrayPtr->tracePtr != NULL))) {
-	char *msg = CallTraces(iPtr, arrayPtr, varPtr, arrayName, elem,
-		TCL_TRACE_WRITES);
-	if (msg != NULL) {
-	    if (leaveErrorMsg) {
-		VarErrMsg(interp, arrayName, elem, "set", msg);
-	    }
-	    goto errorReturn;
-	}
-    }
-
-    /*
-     * Return the element's value unless it was changed in some gross way by
-     * a trace (e.g. it was unset and then recreated as an array). If it was
-     * changed is a gross way, just return an empty string object.
-     */
-
-    if (TclIsVarScalar(varPtr) && !TclIsVarUndefined(varPtr)) {
-	return varPtr->value.objPtr;
-    }
-    
-    resultPtr = Tcl_NewObj();
-
-    /*
-     * An error. If the variable doesn't exist anymore and no-one's using
-     * it, then free up the relevant structures and hash table entries.
-     */
-
-    errorReturn:
-    if (varPtr != NULL) {
-	if (TclIsVarUndefined(varPtr)) {
-	    CleanupVar(varPtr, NULL); /* note: array isn't in hashtable */
-	}
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclIncrVar2 --
- *
- *	Given a two-part variable name, which may refer either to a scalar
- *	variable or an element of an array, increment the Tcl object value
- *	of the variable by a specified amount.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	variable. If the specified variable doesn't exist, or there is a
- *	clash in array usage, or an error occurs while executing variable
- *	traces, then NULL is returned and a message will be left in
- *	the interpreter's result.
- *
- * Side effects:
- *	The value of the given variable is incremented by the specified
- *	amount. If either the array or the entry didn't exist then a new
- *	variable is created. The ref count for the returned object is _not_
- *	incremented to reflect the returned reference; if you want to keep a
- *	reference to the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclIncrVar2(interp, part1Ptr, part2Ptr, incrAmount, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be found. */
-    Tcl_Obj *part1Ptr;		/* Points to an object holding the name of
-				 * an array (if part2 is non-NULL) or the
-				 * name of a variable. */
-    Tcl_Obj *part2Ptr;		/* If non-null, points to an object holding
-				 * the name of an element in the array
-				 * part1Ptr. */
-    long incrAmount;		/* Amount to be added to variable. */
-    int flags;                  /* Various flags that tell how to incr value:
-				 * any of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, TCL_APPEND_VALUE,
-				 * TCL_LIST_ELEMENT, TCL_LEAVE_ERR_MSG. */
-{
-    register Tcl_Obj *varValuePtr;
-    Tcl_Obj *resultPtr;
-    int createdNewObj;		/* Set 1 if var's value object is shared
-				 * so we must increment a copy (i.e. copy
-				 * on write). */
-    long i;
-    int result;
-
-    varValuePtr = Tcl_ObjGetVar2(interp, part1Ptr, part2Ptr, flags);
-    if (varValuePtr == NULL) {
-	Tcl_AddObjErrorInfo(interp,
-		"\n    (reading value of variable to increment)", -1);
-	return NULL;
-    }
-
-    /*
-     * Increment the variable's value. If the object is unshared we can
-     * modify it directly, otherwise we must create a new copy to modify:
-     * this is "copy on write". Then free the variable's old string
-     * representation, if any, since it will no longer be valid.
-     */
-
-    createdNewObj = 0;
-    if (Tcl_IsShared(varValuePtr)) {
-	varValuePtr = Tcl_DuplicateObj(varValuePtr);
-	createdNewObj = 1;
-    }
-    result = Tcl_GetLongFromObj(interp, varValuePtr, &i);
-    if (result != TCL_OK) {
-	if (createdNewObj) {
-	    Tcl_DecrRefCount(varValuePtr); /* free unneeded copy */
-	}
-	return NULL;
-    }
-    Tcl_SetLongObj(varValuePtr, (i + incrAmount));
-
-    /*
-     * Store the variable's new value and run any write traces.
-     */
-    
-    resultPtr = Tcl_ObjSetVar2(interp, part1Ptr, part2Ptr, varValuePtr, flags);
-    if (resultPtr == NULL) {
-	return NULL;
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclIncrIndexedScalar --
- *
- *	Increments the Tcl object value of a local scalar variable in the
- *	active procedure, given its compile-time allocated index in the
- *	procedure's array of local variables.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	variable given by localIndex. If the specified variable doesn't
- *	exist, or there is a clash in array usage, or an error occurs while
- *	executing variable traces, then NULL is returned and a message will
- *	be left in the interpreter's result. 
- *
- * Side effects:
- *	The value of the given variable is incremented by the specified
- *	amount. The ref count for the returned object is _not_ incremented
- *	to reflect the returned reference; if you want to keep a reference
- *	to the object you must increment its ref count yourself.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclIncrIndexedScalar(interp, localIndex, incrAmount)
-    Tcl_Interp *interp;		/* Command interpreter in which variable is
-				 * to be found. */
-    int localIndex;		/* Index of variable in procedure's array
-				 * of local variables. */
-    long incrAmount;		/* Amount to be added to variable. */
-{
-    register Tcl_Obj *varValuePtr;
-    Tcl_Obj *resultPtr;
-    int createdNewObj;		/* Set 1 if var's value object is shared
-				 * so we must increment a copy (i.e. copy
-				 * on write). */
-    long i;
-    int result;
-
-    varValuePtr = TclGetIndexedScalar(interp, localIndex,
-	    /*leaveErrorMsg*/ 1);
-    if (varValuePtr == NULL) {
-	Tcl_AddObjErrorInfo(interp,
-		"\n    (reading value of variable to increment)", -1);
-	return NULL;
-    }
-
-    /*
-     * Reach into the object's representation to extract and increment the
-     * variable's value. If the object is unshared we can modify it
-     * directly, otherwise we must create a new copy to modify: this is
-     * "copy on write". Then free the variable's old string representation,
-     * if any, since it will no longer be valid.
-     */
-
-    createdNewObj = 0;
-    if (Tcl_IsShared(varValuePtr)) {
-	createdNewObj = 1;
-	varValuePtr = Tcl_DuplicateObj(varValuePtr);
-    }
-    result = Tcl_GetLongFromObj(interp, varValuePtr, &i);
-    if (result != TCL_OK) {
-	if (createdNewObj) {
-	    Tcl_DecrRefCount(varValuePtr); /* free unneeded copy */
-	}
-	return NULL;
-    }
-    Tcl_SetLongObj(varValuePtr, (i + incrAmount));
-
-    /*
-     * Store the variable's new value and run any write traces.
-     */
-    
-    resultPtr = TclSetIndexedScalar(interp, localIndex, varValuePtr,
-	    /*leaveErrorMsg*/ 1);
-    if (resultPtr == NULL) {
-	return NULL;
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclIncrElementOfIndexedArray --
- *
- *	Increments the Tcl object value of an element in a local array
- *	variable. The element is named by the object elemPtr while the array
- *	is specified by its index in the active procedure's array of
- *	compiler allocated local variables.
- *
- * Results:
- *	Returns a pointer to the Tcl_Obj holding the new value of the
- *	element. If the specified array or element doesn't exist, or there
- *	is a clash in array usage, or an error occurs while executing
- *	variable traces, then NULL is returned and a message will be left in
- *	the interpreter's result.
- *
- * Side effects:
- *	The value of the given array element is incremented by the specified
- *	amount. The ref count for the returned object is _not_ incremented
- *	to reflect the returned reference; if you want to keep a reference
- *	to the object you must increment its ref count yourself. If the
- *	entry doesn't exist then a new variable is created.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-TclIncrElementOfIndexedArray(interp, localIndex, elemPtr, incrAmount)
-    Tcl_Interp *interp;		/* Command interpreter in which the array is
-				 * to be found. */
-    int localIndex;		/* Index of array variable in procedure's
-				 * array of local variables. */
-    Tcl_Obj *elemPtr;		/* Points to an object holding the name of
-				 * an element to increment in the array. */
-    long incrAmount;		/* Amount to be added to variable. */
-{
-    register Tcl_Obj *varValuePtr;
-    Tcl_Obj *resultPtr;
-    int createdNewObj;		/* Set 1 if var's value object is shared
-				 * so we must increment a copy (i.e. copy
-				 * on write). */
-    long i;
-    int result;
-
-    varValuePtr = TclGetElementOfIndexedArray(interp, localIndex, elemPtr,
-	    /*leaveErrorMsg*/ 1);
-    if (varValuePtr == NULL) {
-	Tcl_AddObjErrorInfo(interp,
-		"\n    (reading value of variable to increment)", -1);
-	return NULL;
-    }
-
-    /*
-     * Reach into the object's representation to extract and increment the
-     * variable's value. If the object is unshared we can modify it
-     * directly, otherwise we must create a new copy to modify: this is
-     * "copy on write". Then free the variable's old string representation,
-     * if any, since it will no longer be valid.
-     */
-
-    createdNewObj = 0;
-    if (Tcl_IsShared(varValuePtr)) {
-	createdNewObj = 1;
-	varValuePtr = Tcl_DuplicateObj(varValuePtr);
-    }
-    result = Tcl_GetLongFromObj(interp, varValuePtr, &i);
-    if (result != TCL_OK) {
-	if (createdNewObj) {
-	    Tcl_DecrRefCount(varValuePtr); /* free unneeded copy */
-	}
-	return NULL;
-    }
-    Tcl_SetLongObj(varValuePtr, (i + incrAmount));
-    
-    /*
-     * Store the variable's new value and run any write traces.
-     */
-    
-    resultPtr = TclSetElementOfIndexedArray(interp, localIndex, elemPtr,
-	    varValuePtr,
-	    /*leaveErrorMsg*/ 1);
-    if (resultPtr == NULL) {
-	return NULL;
-    }
-    return resultPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UnsetVar --
- *
- *	Delete a variable, so that it may not be accessed anymore.
- *
- * Results:
- *	Returns TCL_OK if the variable was successfully deleted, TCL_ERROR
- *	if the variable can't be unset.  In the event of an error,
- *	if the TCL_LEAVE_ERR_MSG flag is set then an error message
- *	is left in the interp's result.
- *
- * Side effects:
- *	If varName is defined as a local or global variable in interp,
- *	it is deleted.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UnsetVar(interp, varName, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which varName is
-				 * to be looked up. */
-    char *varName;		/* Name of a variable in interp.  May be
-				 * either a scalar name or an array name
-				 * or an element in an array. */
-    int flags;			/* OR-ed combination of any of
-				 * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY or
-				 * TCL_LEAVE_ERR_MSG. */
-{
-    return Tcl_UnsetVar2(interp, varName, (char *) NULL, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UnsetVar2 --
- *
- *	Delete a variable, given a 2-part name.
- *
- * Results:
- *	Returns TCL_OK if the variable was successfully deleted, TCL_ERROR
- *	if the variable can't be unset.  In the event of an error,
- *	if the TCL_LEAVE_ERR_MSG flag is set then an error message
- *	is left in the interp's result.
- *
- * Side effects:
- *	If part1 and part2 indicate a local or global variable in interp,
- *	it is deleted.  If part1 is an array name and part2 is NULL, then
- *	the whole array is deleted.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UnsetVar2(interp, part1, part2, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which varName is
-				 * to be looked up. */
-    char *part1;		/* Name of variable or array. */
-    char *part2;		/* Name of element within array or NULL. */
-    int flags;			/* OR-ed combination of any of
-				 * TCL_GLOBAL_ONLY, TCL_NAMESPACE_ONLY,
-				 * TCL_LEAVE_ERR_MSG. */
-{
-    Var dummyVar;
-    Var *varPtr, *dummyVarPtr;
-    Interp *iPtr = (Interp *) interp;
-    Var *arrayPtr;
-    ActiveVarTrace *activePtr;
-    Tcl_Obj *objPtr;
-    int result;
-
-    varPtr = TclLookupVar(interp, part1, part2, flags, "unset",
-	    /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-    if (varPtr == NULL) {
-	return TCL_ERROR;
-    }
-    result = (TclIsVarUndefined(varPtr)? TCL_ERROR : TCL_OK);
-
-    if ((arrayPtr != NULL) && (arrayPtr->searchPtr != NULL)) {
-	DeleteSearches(arrayPtr);
-    }
-
-    /*
-     * The code below is tricky, because of the possibility that
-     * a trace procedure might try to access a variable being
-     * deleted. To handle this situation gracefully, do things
-     * in three steps:
-     * 1. Copy the contents of the variable to a dummy variable
-     *    structure, and mark the original Var structure as undefined.
-     * 2. Invoke traces and clean up the variable, using the dummy copy.
-     * 3. If at the end of this the original variable is still
-     *    undefined and has no outstanding references, then delete
-     *	  it (but it could have gotten recreated by a trace).
-     */
-
-    dummyVar = *varPtr;
-    TclSetVarUndefined(varPtr);
-    TclSetVarScalar(varPtr);
-    varPtr->value.objPtr = NULL; /* dummyVar points to any value object */
-    varPtr->tracePtr = NULL;
-    varPtr->searchPtr = NULL;
-
-    /*
-     * Call trace procedures for the variable being deleted. Then delete
-     * its traces. Be sure to abort any other traces for the variable
-     * that are still pending. Special tricks:
-     * 1. We need to increment varPtr's refCount around this: CallTraces
-     *    will use dummyVar so it won't increment varPtr's refCount itself.
-     * 2. Turn off the VAR_TRACE_ACTIVE flag in dummyVar: we want to
-     *    call unset traces even if other traces are pending.
-     */
-
-    if ((dummyVar.tracePtr != NULL)
-	    || ((arrayPtr != NULL) && (arrayPtr->tracePtr != NULL))) {
-	varPtr->refCount++;
-	dummyVar.flags &= ~VAR_TRACE_ACTIVE;
-	(void) CallTraces(iPtr, arrayPtr, &dummyVar, part1, part2,
-		(flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY)) | TCL_TRACE_UNSETS);
-	while (dummyVar.tracePtr != NULL) {
-	    VarTrace *tracePtr = dummyVar.tracePtr;
-	    dummyVar.tracePtr = tracePtr->nextPtr;
-	    ckfree((char *) tracePtr);
-	}
-	for (activePtr = iPtr->activeTracePtr;  activePtr != NULL;
-	     activePtr = activePtr->nextPtr) {
-	    if (activePtr->varPtr == varPtr) {
-		activePtr->nextTracePtr = NULL;
-	    }
-	}
-	varPtr->refCount--;
-    }
-
-    /*
-     * If the variable is an array, delete all of its elements. This must be
-     * done after calling the traces on the array, above (that's the way
-     * traces are defined). If it is a scalar, "discard" its object
-     * (decrement the ref count of its object, if any).
-     */
-
-    dummyVarPtr = &dummyVar;
-    if (TclIsVarArray(dummyVarPtr) && !TclIsVarUndefined(dummyVarPtr)) {
-	DeleteArray(iPtr, part1, dummyVarPtr,
-		(flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY)) | TCL_TRACE_UNSETS);
-    }
-    if (TclIsVarScalar(dummyVarPtr)
-	    && (dummyVarPtr->value.objPtr != NULL)) {
-	objPtr = dummyVarPtr->value.objPtr;
-	TclDecrRefCount(objPtr);
-	dummyVarPtr->value.objPtr = NULL;
-    }
-
-    /*
-     * If the variable was a namespace variable, decrement its reference count.
-     */
-    
-    if (varPtr->flags & VAR_NAMESPACE_VAR) {
-	varPtr->flags &= ~VAR_NAMESPACE_VAR;
-	varPtr->refCount--;
-    }
-
-    /*
-     * It's an error to unset an undefined variable.
-     */
-	
-    if (result != TCL_OK) {
-	if (flags & TCL_LEAVE_ERR_MSG) {
-	    VarErrMsg(interp, part1, part2, "unset", 
-		    ((arrayPtr == NULL) ? noSuchVar : noSuchElement));
-	}
-    }
-
-    /*
-     * Finally, if the variable is truly not in use then free up its Var
-     * structure and remove it from its hash table, if any. The ref count of
-     * its value object, if any, was decremented above.
-     */
-
-    CleanupVar(varPtr, arrayPtr);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_TraceVar --
- *
- *	Arrange for reads and/or writes to a variable to cause a
- *	procedure to be invoked, which can monitor the operations
- *	and/or change their actions.
- *
- * Results:
- *	A standard Tcl return value.
- *
- * Side effects:
- *	A trace is set up on the variable given by varName, such that
- *	future references to the variable will be intermediated by
- *	proc.  See the manual entry for complete details on the calling
- *	sequence for proc.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_TraceVar(interp, varName, flags, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter in which variable is
-				 * to be traced. */
-    char *varName;		/* Name of variable;  may end with "(index)"
-				 * to signify an array reference. */
-    int flags;			/* OR-ed collection of bits, including any
-				 * of TCL_TRACE_READS, TCL_TRACE_WRITES,
-				 * TCL_TRACE_UNSETS, TCL_GLOBAL_ONLY, and
-				 * TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure to call when specified ops are
-				 * invoked upon varName. */
-    ClientData clientData;	/* Arbitrary argument to pass to proc. */
-{
-    return Tcl_TraceVar2(interp, varName, (char *) NULL, 
-	    flags, proc, clientData);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_TraceVar2 --
- *
- *	Arrange for reads and/or writes to a variable to cause a
- *	procedure to be invoked, which can monitor the operations
- *	and/or change their actions.
- *
- * Results:
- *	A standard Tcl return value.
- *
- * Side effects:
- *	A trace is set up on the variable given by part1 and part2, such
- *	that future references to the variable will be intermediated by
- *	proc.  See the manual entry for complete details on the calling
- *	sequence for proc.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_TraceVar2(interp, part1, part2, flags, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter in which variable is
-				 * to be traced. */
-    char *part1;		/* Name of scalar variable or array. */
-    char *part2;		/* Name of element within array;  NULL means
-				 * trace applies to scalar variable or array
-				 * as-a-whole. */
-    int flags;			/* OR-ed collection of bits, including any
-				 * of TCL_TRACE_READS, TCL_TRACE_WRITES,
-				 * TCL_TRACE_UNSETS, TCL_GLOBAL_ONLY,
-				 * and TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure to call when specified ops are
-				 * invoked upon varName. */
-    ClientData clientData;	/* Arbitrary argument to pass to proc. */
-{
-    Var *varPtr, *arrayPtr;
-    register VarTrace *tracePtr;
-
-    varPtr = TclLookupVar(interp, part1, part2, (flags | TCL_LEAVE_ERR_MSG),
-	    "trace", /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
-    if (varPtr == NULL) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Set up trace information.
-     */
-
-    tracePtr = (VarTrace *) ckalloc(sizeof(VarTrace));
-    tracePtr->traceProc = proc;
-    tracePtr->clientData = clientData;
-    tracePtr->flags = 
-	flags & (TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS | 
-		TCL_TRACE_ARRAY);
-    tracePtr->nextPtr = varPtr->tracePtr;
-    varPtr->tracePtr = tracePtr;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UntraceVar --
- *
- *	Remove a previously-created trace for a variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there exists a trace for the variable given by varName
- *	with the given flags, proc, and clientData, then that trace
- *	is removed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_UntraceVar(interp, varName, flags, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *varName;		/* Name of variable; may end with "(index)"
-				 * to signify an array reference. */
-    int flags;			/* OR-ed collection of bits describing
-				 * current trace, including any of
-				 * TCL_TRACE_READS, TCL_TRACE_WRITES,
-				 * TCL_TRACE_UNSETS, TCL_GLOBAL_ONLY
-				 * and TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure assocated with trace. */
-    ClientData clientData;	/* Arbitrary argument to pass to proc. */
-{
-    Tcl_UntraceVar2(interp, varName, (char *) NULL, flags, proc, clientData);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UntraceVar2 --
- *
- *	Remove a previously-created trace for a variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If there exists a trace for the variable given by part1
- *	and part2 with the given flags, proc, and clientData, then
- *	that trace is removed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_UntraceVar2(interp, part1, part2, flags, proc, clientData)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *part1;		/* Name of variable or array. */
-    char *part2;		/* Name of element within array;  NULL means
-				 * trace applies to scalar variable or array
-				 * as-a-whole. */
-    int flags;			/* OR-ed collection of bits describing
-				 * current trace, including any of
-				 * TCL_TRACE_READS, TCL_TRACE_WRITES,
-				 * TCL_TRACE_UNSETS, TCL_GLOBAL_ONLY,
-				 * and TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure assocated with trace. */
-    ClientData clientData;	/* Arbitrary argument to pass to proc. */
-{
-    register VarTrace *tracePtr;
-    VarTrace *prevPtr;
-    Var *varPtr, *arrayPtr;
-    Interp *iPtr = (Interp *) interp;
-    ActiveVarTrace *activePtr;
-
-    varPtr = TclLookupVar(interp, part1, part2,
-	    flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY),
-	    /*msg*/ (char *) NULL,
-	    /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-    if (varPtr == NULL) {
-	return;
-    }
-
-    flags &= (TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS |
-	    TCL_TRACE_ARRAY);
-    for (tracePtr = varPtr->tracePtr, prevPtr = NULL;  ;
-	 prevPtr = tracePtr, tracePtr = tracePtr->nextPtr) {
-	if (tracePtr == NULL) {
-	    return;
-	}
-	if ((tracePtr->traceProc == proc) && (tracePtr->flags == flags)
-		&& (tracePtr->clientData == clientData)) {
-	    break;
-	}
-    }
-
-    /*
-     * The code below makes it possible to delete traces while traces
-     * are active: it makes sure that the deleted trace won't be
-     * processed by CallTraces.
-     */
-
-    for (activePtr = iPtr->activeTracePtr;  activePtr != NULL;
-	 activePtr = activePtr->nextPtr) {
-	if (activePtr->nextTracePtr == tracePtr) {
-	    activePtr->nextTracePtr = tracePtr->nextPtr;
-	}
-    }
-    if (prevPtr == NULL) {
-	varPtr->tracePtr = tracePtr->nextPtr;
-    } else {
-	prevPtr->nextPtr = tracePtr->nextPtr;
-    }
-    ckfree((char *) tracePtr);
-
-    /*
-     * If this is the last trace on the variable, and the variable is
-     * unset and unused, then free up the variable.
-     */
-
-    if (TclIsVarUndefined(varPtr)) {
-	CleanupVar(varPtr, (Var *) NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VarTraceInfo --
- *
- *	Return the clientData value associated with a trace on a
- *	variable.  This procedure can also be used to step through
- *	all of the traces on a particular variable that have the
- *	same trace procedure.
- *
- * Results:
- *	The return value is the clientData value associated with
- *	a trace on the given variable.  Information will only be
- *	returned for a trace with proc as trace procedure.  If
- *	the clientData argument is NULL then the first such trace is
- *	returned;  otherwise, the next relevant one after the one
- *	given by clientData will be returned.  If the variable
- *	doesn't exist, or if there are no (more) traces for it,
- *	then NULL is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *varName;		/* Name of variable;  may end with "(index)"
-				 * to signify an array reference. */
-    int flags;			/* 0, TCL_GLOBAL_ONLY, or
-				 * TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure assocated with trace. */
-    ClientData prevClientData;	/* If non-NULL, gives last value returned
-				 * by this procedure, so this call will
-				 * return the next trace after that one.
-				 * If NULL, this call will return the
-				 * first trace. */
-{
-    return Tcl_VarTraceInfo2(interp, varName, (char *) NULL,
-	    flags, proc, prevClientData);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VarTraceInfo2 --
- *
- *	Same as Tcl_VarTraceInfo, except takes name in two pieces
- *	instead of one.
- *
- * Results:
- *	Same as Tcl_VarTraceInfo.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_VarTraceInfo2(interp, part1, part2, flags, proc, prevClientData)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *part1;		/* Name of variable or array. */
-    char *part2;		/* Name of element within array;  NULL means
-				 * trace applies to scalar variable or array
-				 * as-a-whole. */
-    int flags;			/* OR-ed combination of TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY. */
-    Tcl_VarTraceProc *proc;	/* Procedure assocated with trace. */
-    ClientData prevClientData;	/* If non-NULL, gives last value returned
-				 * by this procedure, so this call will
-				 * return the next trace after that one.
-				 * If NULL, this call will return the
-				 * first trace. */
-{
-    register VarTrace *tracePtr;
-    Var *varPtr, *arrayPtr;
-
-    varPtr = TclLookupVar(interp, part1, part2,
-	    flags & (TCL_GLOBAL_ONLY|TCL_NAMESPACE_ONLY),
-	    /*msg*/ (char *) NULL,
-	    /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-    if (varPtr == NULL) {
-	return NULL;
-    }
-
-    /*
-     * Find the relevant trace, if any, and return its clientData.
-     */
-
-    tracePtr = varPtr->tracePtr;
-    if (prevClientData != NULL) {
-	for ( ;  tracePtr != NULL;  tracePtr = tracePtr->nextPtr) {
-	    if ((tracePtr->clientData == prevClientData)
-		    && (tracePtr->traceProc == proc)) {
-		tracePtr = tracePtr->nextPtr;
-		break;
-	    }
-	}
-    }
-    for ( ;  tracePtr != NULL;  tracePtr = tracePtr->nextPtr) {
-	if (tracePtr->traceProc == proc) {
-	    return tracePtr->clientData;
-	}
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UnsetObjCmd --
- *
- *	This object-based procedure is invoked to process the "unset" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_UnsetObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register int i;
-    register char *name;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName ?varName ...?");
-	return TCL_ERROR;
-    }
-    
-    for (i = 1;  i < objc;  i++) {
-	name = TclGetString(objv[i]);
-	if (Tcl_UnsetVar2(interp, name, (char *) NULL,
-		TCL_LEAVE_ERR_MSG) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppendObjCmd --
- *
- *	This object-based procedure is invoked to process the "append" 
- *	Tcl command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	A variable's value may be changed.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_AppendObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Tcl_Obj *varValuePtr = NULL;
-    					/* Initialized to avoid compiler
-				         * warning. */
-    int i;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName ?value value ...?");
-	return TCL_ERROR;
-    }
-    if (objc == 2) {
-	varValuePtr = Tcl_ObjGetVar2(interp, objv[1], NULL, TCL_LEAVE_ERR_MSG);
-	if (varValuePtr == NULL) {
-	    return TCL_ERROR;
-	}
-    } else {
-	for (i = 2;  i < objc;  i++) {
-	    varValuePtr = Tcl_ObjSetVar2(interp, objv[1], (Tcl_Obj *) NULL,
-		    objv[i], (TCL_APPEND_VALUE | TCL_LEAVE_ERR_MSG));
-	    if (varValuePtr == NULL) {
-		return TCL_ERROR;
-	    }
-	}
-    }
-    Tcl_SetObjResult(interp, varValuePtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LappendObjCmd --
- *
- *	This object-based procedure is invoked to process the "lappend" 
- *	Tcl command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	A variable's value may be changed.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_LappendObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Tcl_Obj *varValuePtr, *newValuePtr;
-    register List *listRepPtr;
-    register Tcl_Obj **elemPtrs;
-    int numElems, numRequired, createdNewObj, createVar, i, j;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName ?value value ...?");
-	return TCL_ERROR;
-    }
-    if (objc == 2) {
-	newValuePtr = Tcl_ObjGetVar2(interp, objv[1], (Tcl_Obj *) NULL,
-		(TCL_LEAVE_ERR_MSG));
-	if (newValuePtr == NULL) {
-	    /*
-	     * The variable doesn't exist yet. Just create it with an empty
-	     * initial value.
-	     */
-	    
-	    Tcl_Obj *nullObjPtr = Tcl_NewObj();
-	    newValuePtr = Tcl_ObjSetVar2(interp, objv[1], NULL,
-		    nullObjPtr, TCL_LEAVE_ERR_MSG);
-	    if (newValuePtr == NULL) {
-		Tcl_DecrRefCount(nullObjPtr); /* free unneeded object */
-		return TCL_ERROR;
-	    }
-	}
-    } else {
-	/*
-	 * We have arguments to append. We used to call Tcl_SetVar2 to
-	 * append each argument one at a time to ensure that traces were run
-	 * for each append step. We now append the arguments all at once
-	 * because it's faster. Note that a read trace and a write trace for
-	 * the variable will now each only be called once. Also, if the
-	 * variable's old value is unshared we modify it directly, otherwise
-	 * we create a new copy to modify: this is "copy on write".
-	 */
-
-	createdNewObj = 0;
-	createVar = 1;
-	varValuePtr = Tcl_ObjGetVar2(interp, objv[1], NULL, 0);
-	if (varValuePtr == NULL) {
-	    /*
-	     * We couldn't read the old value: either the var doesn't yet
-	     * exist or it's an array element. If it's new, we will try to
-	     * create it with Tcl_ObjSetVar2 below.
-	     */
-	    
-	    char *p, *varName;
-	    int nameBytes, i;
-
-	    varName = Tcl_GetStringFromObj(objv[1], &nameBytes);
-	    for (i = 0, p = varName;  i < nameBytes;  i++, p++) {
-		if (*p == '(') {
-		    p = (varName + nameBytes-1);	
-		    if (*p == ')') { /* last char is ')' => array ref */
-			createVar = 0;
-		    }
-		    break;
-		}
-	    }
-	    varValuePtr = Tcl_NewObj();
-	    createdNewObj = 1;
-	} else if (Tcl_IsShared(varValuePtr)) {	
-	    varValuePtr = Tcl_DuplicateObj(varValuePtr);
-	    createdNewObj = 1;
-	}
-
-	/*
-	 * Convert the variable's old value to a list object if necessary.
-	 */
-
-	if (varValuePtr->typePtr != &tclListType) {
-	    int result = tclListType.setFromAnyProc(interp, varValuePtr);
-	    if (result != TCL_OK) {
-		if (createdNewObj) {
-		    Tcl_DecrRefCount(varValuePtr); /* free unneeded obj. */
-		}
-		return result;
-	    }
-	}
-	listRepPtr = (List *) varValuePtr->internalRep.otherValuePtr;
-	elemPtrs = listRepPtr->elements;
-	numElems = listRepPtr->elemCount;
-
-	/*
-	 * If there is no room in the current array of element pointers,
-	 * allocate a new, larger array and copy the pointers to it.
-	 */
-	
-	numRequired = numElems + (objc-2);
-	if (numRequired > listRepPtr->maxElemCount) {
-	    int newMax = (2 * numRequired);
-	    Tcl_Obj **newElemPtrs = (Tcl_Obj **)
-		ckalloc((unsigned) (newMax * sizeof(Tcl_Obj *)));
-	    
-	    memcpy((VOID *) newElemPtrs, (VOID *) elemPtrs,
-		    (size_t) (numElems * sizeof(Tcl_Obj *)));
-	    listRepPtr->maxElemCount = newMax;
-	    listRepPtr->elements = newElemPtrs;
-	    ckfree((char *) elemPtrs);
-	    elemPtrs = newElemPtrs;
-	}
-
-	/*
-	 * Insert the new elements at the end of the list.
-	 */
-
-	for (i = 2, j = numElems;  i < objc;  i++, j++) {
-            elemPtrs[j] = objv[i];
-            Tcl_IncrRefCount(objv[i]);
-        }
-	listRepPtr->elemCount = numRequired;
-
-	/*
-	 * Invalidate and free any old string representation since it no
-	 * longer reflects the list's internal representation.
-	 */
-
-	Tcl_InvalidateStringRep(varValuePtr);
-
-	/*
-	 * Now store the list object back into the variable. If there is an
-	 * error setting the new value, decrement its ref count if it
-	 * was new and we didn't create the variable.
-	 */
-	
-	newValuePtr = Tcl_ObjSetVar2(interp, objv[1], NULL, varValuePtr,
-		TCL_LEAVE_ERR_MSG);
-	if (newValuePtr == NULL) {
-	    if (createdNewObj && !createVar) {
-		Tcl_DecrRefCount(varValuePtr); /* free unneeded obj */
-	    }
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Set the interpreter's object result to refer to the variable's value
-     * object.
-     */
-
-    Tcl_SetObjResult(interp, newValuePtr);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ArrayObjCmd --
- *
- *	This object-based procedure is invoked to process the "array" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result object.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_ArrayObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    /*
-     * The list of constants below should match the arrayOptions string array
-     * below.
-     */
-
-    enum {ARRAY_ANYMORE, ARRAY_DONESEARCH,  ARRAY_EXISTS, ARRAY_GET,
-	  ARRAY_NAMES, ARRAY_NEXTELEMENT, ARRAY_SET, ARRAY_SIZE,
-	  ARRAY_STARTSEARCH}; 
-    static char *arrayOptions[] = {"anymore", "donesearch", "exists",
-				   "get", "names", "nextelement", "set",
-				   "size", "startsearch", (char *) NULL};
-
-    Interp *iPtr = (Interp *) interp;
-    Var *varPtr, *arrayPtr;
-    Tcl_HashEntry *hPtr;
-    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
-    int notArray;
-    char *varName, *msg;
-    int index, result;
-
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option arrayName ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], arrayOptions, "option",
-	    0, &index) != TCL_OK) {
-    	return TCL_ERROR;
-    }
-
-    /*
-     * Locate the array variable (and it better be an array).
-     */
-    
-    varName = TclGetString(objv[2]);
-    varPtr = TclLookupVar(interp, varName, (char *) NULL, /*flags*/ 0,
-            /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    notArray = 0;
-    if ((varPtr == NULL) || !TclIsVarArray(varPtr)
-	    || TclIsVarUndefined(varPtr)) {
-	notArray = 1;
-    }
-
-    /*
-     * Special array trace used to keep the env array in sync for
-     * array names, array get, etc.
-     */
-
-    if (varPtr != NULL && varPtr->tracePtr != NULL) {
-	msg = CallTraces(iPtr, arrayPtr, varPtr, varName, NULL,
-		(TCL_LEAVE_ERR_MSG|TCL_NAMESPACE_ONLY|TCL_GLOBAL_ONLY|
-		TCL_TRACE_ARRAY));
-	if (msg != NULL) {
-	    VarErrMsg(interp, varName, NULL, "trace array", msg);
-	    return TCL_ERROR;
-	}
-    }
-
-    switch (index) {
-        case ARRAY_ANYMORE: {
-	    ArraySearch *searchPtr;
-	    char *searchId;
-	    
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, 
-                        "arrayName searchId");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-	        goto error;
-	    }
-	    searchId = Tcl_GetString(objv[3]);
-	    searchPtr = ParseSearchId(interp, varPtr, varName, searchId);
-	    if (searchPtr == NULL) {
-	        return TCL_ERROR;
-	    }
-	    while (1) {
-	        Var *varPtr2;
-
-		if (searchPtr->nextEntry != NULL) {
-		    varPtr2 = (Var *) Tcl_GetHashValue(searchPtr->nextEntry);
-		    if (!TclIsVarUndefined(varPtr2)) {
-		        break;
-		    }
-		}
-		searchPtr->nextEntry = Tcl_NextHashEntry(&searchPtr->search);
-		if (searchPtr->nextEntry == NULL) {
-		    Tcl_SetIntObj(resultPtr, 0);
-		    return TCL_OK;
-		}
-	    }
-	    Tcl_SetIntObj(resultPtr, 1);
-	    break;
-	}
-        case ARRAY_DONESEARCH: {
-	    ArraySearch *searchPtr, *prevPtr;
-	    char *searchId;
-
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, 
-                        "arrayName searchId");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-	        goto error;
-	    }
-	    searchId = Tcl_GetString(objv[3]);
-	    searchPtr = ParseSearchId(interp, varPtr, varName, searchId);
-	    if (searchPtr == NULL) {
-	        return TCL_ERROR;
-	    }
-	    if (varPtr->searchPtr == searchPtr) {
-	        varPtr->searchPtr = searchPtr->nextPtr;
-	    } else {
-	        for (prevPtr = varPtr->searchPtr;  ;
-		     prevPtr = prevPtr->nextPtr) {
-		    if (prevPtr->nextPtr == searchPtr) {
-		        prevPtr->nextPtr = searchPtr->nextPtr;
-			break;
-		    }
-		}
-	    }
-	    ckfree((char *) searchPtr);
-	    break;
-	}
-        case ARRAY_EXISTS: {
-	    if (objc != 3) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName");
-	        return TCL_ERROR;
-	    }
-	    Tcl_SetIntObj(resultPtr, !notArray);
-	    break;
-	}
-        case ARRAY_GET: {
-	    Tcl_HashSearch search;
-	    Var *varPtr2;
-	    char *pattern = NULL;
-	    char *name;
-	    Tcl_Obj *namePtr, *valuePtr;
-	    
-	    if ((objc != 3) && (objc != 4)) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName ?pattern?");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-	        return TCL_OK;
-	    }
-	    if (objc == 4) {
-	        pattern = TclGetString(objv[3]);
-	    }
-	    for (hPtr = Tcl_FirstHashEntry(varPtr->value.tablePtr, &search);
-		 hPtr != NULL;  hPtr = Tcl_NextHashEntry(&search)) {
-	        varPtr2 = (Var *) Tcl_GetHashValue(hPtr);
-		if (TclIsVarUndefined(varPtr2)) {
-		    continue;
-		}
-		name = Tcl_GetHashKey(varPtr->value.tablePtr, hPtr);
-		if ((objc == 4) && !Tcl_StringMatch(name, pattern)) {
-		    continue;	/* element name doesn't match pattern */
-		}
-		
-		namePtr = Tcl_NewStringObj(name, -1);
-		result = Tcl_ListObjAppendElement(interp, resultPtr,
-		        namePtr);
-		if (result != TCL_OK) {
-		    Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
-		    return result;
-		}
-
-		valuePtr = Tcl_ObjGetVar2(interp, objv[2], namePtr,
-	                TCL_LEAVE_ERR_MSG);
-		if (valuePtr == NULL) {
-		    Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
-		    return result;
-		}
-		result = Tcl_ListObjAppendElement(interp, resultPtr,
-			valuePtr);
-		if (result != TCL_OK) {
-		    Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
-		    return result;
-		}
-	    }
-	    break;
-	}
-        case ARRAY_NAMES: {
-	    Tcl_HashSearch search;
-	    Var *varPtr2;
-	    char *pattern = NULL;
-	    char *name;
-	    Tcl_Obj *namePtr;
-	    
-	    if ((objc != 3) && (objc != 4)) {
-  	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName ?pattern?");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-	        return TCL_OK;
-	    }
-	    if (objc == 4) {
-	        pattern = Tcl_GetString(objv[3]);
-	    }
-	    for (hPtr = Tcl_FirstHashEntry(varPtr->value.tablePtr, &search);
-		 hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	        varPtr2 = (Var *) Tcl_GetHashValue(hPtr);
-		if (TclIsVarUndefined(varPtr2)) {
-		    continue;
-		}
-		name = Tcl_GetHashKey(varPtr->value.tablePtr, hPtr);
-		if ((objc == 4) && !Tcl_StringMatch(name, pattern)) {
- 		    continue;	/* element name doesn't match pattern */
-		}
-		
-		namePtr = Tcl_NewStringObj(name, -1);
-		result = Tcl_ListObjAppendElement(interp, resultPtr, namePtr);
-		if (result != TCL_OK) {
-		    Tcl_DecrRefCount(namePtr); /* free unneeded name obj */
-		    return result;
-		}
-	    }
-	    break;
-	}
-        case ARRAY_NEXTELEMENT: {
-	    ArraySearch *searchPtr;
-	    char *searchId;
-	    Tcl_HashEntry *hPtr;
-	    
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, 
-                        "arrayName searchId");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-  	        goto error;
-	    }
-	    searchId = Tcl_GetString(objv[3]);
-	    searchPtr = ParseSearchId(interp, varPtr, varName, searchId);
-	    if (searchPtr == NULL) {
-	        return TCL_ERROR;
-	    }
-	    while (1) {
-	        Var *varPtr2;
-
-		hPtr = searchPtr->nextEntry;
-		if (hPtr == NULL) {
-		    hPtr = Tcl_NextHashEntry(&searchPtr->search);
-		    if (hPtr == NULL) {
-		        return TCL_OK;
-		    }
-		} else {
-		    searchPtr->nextEntry = NULL;
-		}
-		varPtr2 = (Var *) Tcl_GetHashValue(hPtr);
-		if (!TclIsVarUndefined(varPtr2)) {
-		    break;
-		}
-	    }
-	    Tcl_SetStringObj(resultPtr,
-	            Tcl_GetHashKey(varPtr->value.tablePtr, hPtr), -1);
-	    break;
-	}
-        case ARRAY_SET: {
-	    if (objc != 4) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName list");
-		return TCL_ERROR;
-	    }
-	    return(TclArraySet(interp, objv[2], objv[3]));
-	}
-        case ARRAY_SIZE: {
-	    Tcl_HashSearch search;
-	    Var *varPtr2;
-	    int size;
-
-	    if (objc != 3) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName");
-		return TCL_ERROR;
-	    }
-	    size = 0;
-	    if (!notArray) {
-	        for (hPtr = Tcl_FirstHashEntry(varPtr->value.tablePtr, 
-                        &search);
-		     hPtr != NULL;  hPtr = Tcl_NextHashEntry(&search)) {
-		    varPtr2 = (Var *) Tcl_GetHashValue(hPtr);
-		    if (TclIsVarUndefined(varPtr2)) {
-		        continue;
-		    }
-		    size++;
-		}
-	    }
-	    Tcl_SetIntObj(resultPtr, size);
-	    break;
-	}
-        case ARRAY_STARTSEARCH: {
-	    ArraySearch *searchPtr;
-
-	    if (objc != 3) {
-	        Tcl_WrongNumArgs(interp, 2, objv, "arrayName");
-		return TCL_ERROR;
-	    }
-	    if (notArray) {
-	        goto error;
-	    }
-	    searchPtr = (ArraySearch *) ckalloc(sizeof(ArraySearch));
-	    if (varPtr->searchPtr == NULL) {
-	        searchPtr->id = 1;
-		Tcl_AppendStringsToObj(resultPtr, "s-1-", varName,
-		        (char *) NULL);
-	    } else {
-	        char string[TCL_INTEGER_SPACE];
-
-		searchPtr->id = varPtr->searchPtr->id + 1;
-		TclFormatInt(string, searchPtr->id);
-		Tcl_AppendStringsToObj(resultPtr, "s-", string, "-", varName,
-			(char *) NULL);
-	    }
-	    searchPtr->varPtr = varPtr;
-	    searchPtr->nextEntry = Tcl_FirstHashEntry(varPtr->value.tablePtr,
-		    &searchPtr->search);
-	    searchPtr->nextPtr = varPtr->searchPtr;
-	    varPtr->searchPtr = searchPtr;
-	    break;
-	}
-    }
-    return TCL_OK;
-
-    error:
-    Tcl_AppendStringsToObj(resultPtr, "\"", varName, "\" isn't an array",
-	    (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclArraySet --
- *
- *	Set the elements of an array.  If there are no elements to
- *	set, create an empty array.  This routine is used by the
- *	Tcl_ArrayObjCmd and by the TclSetupEnv routine.
- *
- * Results:
- *	A standard Tcl result object.
- *
- * Side effects:
- *	A variable will be created if one does not already exist.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclArraySet(interp, arrayNameObj, arrayElemObj)
-    Tcl_Interp *interp;		/* Current interpreter. */
-    Tcl_Obj *arrayNameObj;	/* The array name. */
-    Tcl_Obj *arrayElemObj;	/* The array elements list.  If this is
-				 * NULL, create an empty array. */
-{
-    Var *varPtr, *arrayPtr;
-    Tcl_Obj **elemPtrs;
-    int result, elemLen, i;
-    char *varName;
-    
-    varName = TclGetString(arrayNameObj);
-    varPtr = TclLookupVar(interp, varName, (char *) NULL, /*flags*/ 0,
-            /*msg*/ 0, /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr);
-
-    if (arrayElemObj != NULL) {
-	result = Tcl_ListObjGetElements(interp, arrayElemObj,
-		&elemLen, &elemPtrs);
-	if (result != TCL_OK) {
-	    return result;
-	}
-	if (elemLen & 1) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendToObj(Tcl_GetObjResult(interp),
-		    "list must have an even number of elements", -1);
-	    return TCL_ERROR;
-	}
-	if (elemLen > 0) {
-	    for (i = 0;  i < elemLen;  i += 2) {
-		if (Tcl_ObjSetVar2(interp, arrayNameObj, elemPtrs[i],
-			elemPtrs[i+1], TCL_LEAVE_ERR_MSG) == NULL) {
-		    result = TCL_ERROR;
-		    break;
-		}
-	    }
-	    return result;
-	}
-    }
-    
-    /*
-     * The list is empty make sure we have an array, or create
-     * one if necessary.
-     */
-    
-    if (varPtr != NULL) {
-	if (!TclIsVarUndefined(varPtr) && TclIsVarArray(varPtr)) {
-	    /*
-	     * Already an array, done.
-	     */
-	    
-	    return TCL_OK;
-	}
-	if (TclIsVarArrayElement(varPtr) ||
-		!TclIsVarUndefined(varPtr)) {
-	    /*
-	     * Either an array element, or a scalar: lose!
-	     */
-	    
-	    VarErrMsg(interp, varName, (char *)NULL, "array set", needArray);
-	    return TCL_ERROR;
-	}
-    } else {
-	/*
-	 * Create variable for new array.
-	 */
-	
-	varPtr = TclLookupVar(interp, varName, (char *) NULL, 0, 0,
-	        /*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr);
-    }
-    TclSetVarArray(varPtr);
-    TclClearVarUndefined(varPtr);
-    varPtr->value.tablePtr =
-	(Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-    Tcl_InitHashTable(varPtr->value.tablePtr, TCL_STRING_KEYS);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MakeUpvar --
- *
- *	This procedure does all of the work of the "global" and "upvar"
- *	commands.
- *
- * Results:
- *	A standard Tcl completion code. If an error occurs then an
- *	error message is left in iPtr->result.
- *
- * Side effects:
- *	The variable given by myName is linked to the variable in framePtr
- *	given by otherP1 and otherP2, so that references to myName are
- *	redirected to the other variable like a symbolic link.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-MakeUpvar(iPtr, framePtr, otherP1, otherP2, otherFlags, myName, myFlags)
-    Interp *iPtr;		/* Interpreter containing variables. Used
-				 * for error messages, too. */
-    CallFrame *framePtr;	/* Call frame containing "other" variable.
-				 * NULL means use global :: context. */
-    char *otherP1, *otherP2;	/* Two-part name of variable in framePtr. */
-    int otherFlags;		/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
-				 * indicates scope of "other" variable. */
-    char *myName;		/* Name of variable which will refer to
-				 * otherP1/otherP2. Must be a scalar. */
-    int myFlags;		/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
-				 * indicates scope of myName. */
-{
-    Tcl_HashEntry *hPtr;
-    Var *otherPtr, *varPtr, *arrayPtr;
-    CallFrame *varFramePtr;
-    CallFrame *savedFramePtr = NULL;  /* Init. to avoid compiler warning. */
-    Tcl_HashTable *tablePtr;
-    Namespace *nsPtr, *altNsPtr, *dummyNsPtr;
-    char *tail;
-    int new;
-
-    /*
-     * Find "other" in "framePtr". If not looking up other in just the
-     * current namespace, temporarily replace the current var frame
-     * pointer in the interpreter in order to use TclLookupVar.
-     */
-
-    if (!(otherFlags & TCL_NAMESPACE_ONLY)) {
-	savedFramePtr = iPtr->varFramePtr;
-	iPtr->varFramePtr = framePtr;
-    }
-    otherPtr = TclLookupVar((Tcl_Interp *) iPtr, otherP1, otherP2,
-	    (otherFlags | TCL_LEAVE_ERR_MSG), "access",
-            /*createPart1*/ 1, /*createPart2*/ 1, &arrayPtr);
-    if (!(otherFlags & TCL_NAMESPACE_ONLY)) {
-	iPtr->varFramePtr = savedFramePtr;
-    }
-    if (otherPtr == NULL) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Now create a hashtable entry for "myName". Create it as either a
-     * namespace variable or as a local variable in a procedure call
-     * frame. Interpret myName as a namespace variable if:
-     *    1) so requested by a TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY flag,
-     *    2) there is no active frame (we're at the global :: scope),
-     *    3) the active frame was pushed to define the namespace context
-     *       for a "namespace eval" or "namespace inscope" command,
-     *    4) the name has namespace qualifiers ("::"s).
-     * If creating myName in the active procedure, look first in the
-     * frame's array of compiler-allocated local variables, then in its
-     * hashtable for runtime-created local variables. Create that
-     * procedure's local variable hashtable if necessary.
-     */
-
-    varFramePtr = iPtr->varFramePtr;
-    if ((myFlags & (TCL_GLOBAL_ONLY | TCL_NAMESPACE_ONLY))
-	    || (varFramePtr == NULL)
-	    || !varFramePtr->isProcCallFrame
-	    || (strstr(myName, "::") != NULL)) {
-	TclGetNamespaceForQualName((Tcl_Interp *) iPtr, myName,
-		(Namespace *) NULL, myFlags, &nsPtr, &altNsPtr, &dummyNsPtr, &tail);
-
-        if (nsPtr == NULL) {
-            nsPtr = altNsPtr;
-        }
-        if (nsPtr == NULL) {
-	    Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
-		    myName, "\": unknown namespace", (char *) NULL);
-            return TCL_ERROR;
-        }
-	
-	/*
-	 * Check that we are not trying to create a namespace var linked to
-	 * a local variable in a procedure. If we allowed this, the local
-	 * variable in the shorter-lived procedure frame could go away
-	 * leaving the namespace var's reference invalid.
-	 */
-
-	if ((otherP2 ? arrayPtr->nsPtr : otherPtr->nsPtr) == NULL) {
-	    Tcl_AppendResult((Tcl_Interp *) iPtr, "bad variable name \"",
-                    myName, "\": upvar won't create namespace variable that refers to procedure variable",
-		    (char *) NULL);
-            return TCL_ERROR;
-        }
-	
-	hPtr = Tcl_CreateHashEntry(&nsPtr->varTable, tail, &new);
-	if (new) {
-	    varPtr = NewVar();
-	    Tcl_SetHashValue(hPtr, varPtr);
-	    varPtr->hPtr = hPtr;
-            varPtr->nsPtr = nsPtr;
-	} else {
-	    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-	}
-    } else {			/* look in the call frame */
-	Proc *procPtr = varFramePtr->procPtr;
-	int localCt = procPtr->numCompiledLocals;
-	CompiledLocal *localPtr = procPtr->firstLocalPtr;
-	Var *localVarPtr = varFramePtr->compiledLocals;
-	int nameLen = strlen(myName);
-	int i;
-
-	varPtr = NULL;
-	for (i = 0;  i < localCt;  i++) {
-	    if (!TclIsVarTemporary(localPtr)) {
-		char *localName = localVarPtr->name;
-		if ((myName[0] == localName[0])
-		        && (nameLen == localPtr->nameLength)
-		        && (strcmp(myName, localName) == 0)) {
-		    varPtr = localVarPtr;
-		    new = 0;
-		    break;
-		}
-	    }
-	    localVarPtr++;
-	    localPtr = localPtr->nextPtr;
-	}
-	if (varPtr == NULL) {	/* look in frame's local var hashtable */
-	    tablePtr = varFramePtr->varTablePtr;
-	    if (tablePtr == NULL) {
-		tablePtr = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-		Tcl_InitHashTable(tablePtr, TCL_STRING_KEYS);
-		varFramePtr->varTablePtr = tablePtr;
-	    }
-	    hPtr = Tcl_CreateHashEntry(tablePtr, myName, &new);
-	    if (new) {
-		varPtr = NewVar();
-		Tcl_SetHashValue(hPtr, varPtr);
-		varPtr->hPtr = hPtr;
-                varPtr->nsPtr = varFramePtr->nsPtr;
-	    } else {
-		varPtr = (Var *) Tcl_GetHashValue(hPtr);
-	    }
-	}
-    }
-
-    if (!new) {
-	/*
-	 * The variable already exists. Make sure this variable "varPtr"
-	 * isn't the same as "otherPtr" (avoid circular links). Also, if
-	 * it's not an upvar then it's an error. If it is an upvar, then
-	 * just disconnect it from the thing it currently refers to.
-	 */
-
-	if (varPtr == otherPtr) {
-	    Tcl_SetResult((Tcl_Interp *) iPtr,
-		    "can't upvar from variable to itself", TCL_STATIC);
-	    return TCL_ERROR;
-	}
-	if (TclIsVarLink(varPtr)) {
-	    Var *linkPtr = varPtr->value.linkPtr;
-	    if (linkPtr == otherPtr) {
-		return TCL_OK;
-	    }
-	    linkPtr->refCount--;
-	    if (TclIsVarUndefined(linkPtr)) {
-		CleanupVar(linkPtr, (Var *) NULL);
-	    }
-	} else if (!TclIsVarUndefined(varPtr)) {
-	    Tcl_AppendResult((Tcl_Interp *) iPtr, "variable \"", myName,
-		    "\" already exists", (char *) NULL);
-	    return TCL_ERROR;
-	} else if (varPtr->tracePtr != NULL) {
-	    Tcl_AppendResult((Tcl_Interp *) iPtr, "variable \"", myName,
-		    "\" has traces: can't use for upvar", (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-    TclSetVarLink(varPtr);
-    TclClearVarUndefined(varPtr);
-    varPtr->value.linkPtr = otherPtr;
-    otherPtr->refCount++;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UpVar --
- *
- *	This procedure links one variable to another, just like
- *	the "upvar" command.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs then
- *	an error message is left in the interp's result.
- *
- * Side effects:
- *	The variable in frameName whose name is given by varName becomes
- *	accessible under the name localName, so that references to
- *	localName are redirected to the other variable like a symbolic
- *	link.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UpVar(interp, frameName, varName, localName, flags)
-    Tcl_Interp *interp;		/* Command interpreter in which varName is
-				 * to be looked up. */
-    char *frameName;		/* Name of the frame containing the source
-				 * variable, such as "1" or "#0". */
-    char *varName;		/* Name of a variable in interp to link to.
-				 * May be either a scalar name or an
-				 * element in an array. */
-    char *localName;		/* Name of link variable. */
-    int flags;			/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
-				 * indicates scope of localName. */
-{
-    int result;
-    CallFrame *framePtr;
-    register char *p;
-
-    result = TclGetFrame(interp, frameName, &framePtr);
-    if (result == -1) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Figure out whether varName is an array reference, then call
-     * MakeUpvar to do all the real work.
-     */
-
-    for (p = varName;  *p != '\0';  p++) {
-	if (*p == '(') {
-	    char *openParen = p;
-	    do {
-		p++;
-	    } while (*p != '\0');
-	    p--;
-	    if (*p != ')') {
-		goto scalar;
-	    }
-	    *openParen = '\0';
-	    *p = '\0';
-	    result = MakeUpvar((Interp *) interp, framePtr, varName,
-		    openParen+1, 0, localName, flags);
-	    *openParen = '(';
-	    *p = ')';
-	    return result;
-	}
-    }
-
-    scalar:
-    return MakeUpvar((Interp *) interp, framePtr, varName, (char *) NULL,
-	    0, localName, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UpVar2 --
- *
- *	This procedure links one variable to another, just like
- *	the "upvar" command.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs then
- *	an error message is left in the interp's result.
- *
- * Side effects:
- *	The variable in frameName whose name is given by part1 and
- *	part2 becomes accessible under the name localName, so that
- *	references to localName are redirected to the other variable
- *	like a symbolic link.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UpVar2(interp, frameName, part1, part2, localName, flags)
-    Tcl_Interp *interp;		/* Interpreter containing variables.  Used
-				 * for error messages too. */
-    char *frameName;		/* Name of the frame containing the source
-				 * variable, such as "1" or "#0". */
-    char *part1, *part2;	/* Two parts of source variable name to
-				 * link to. */
-    char *localName;		/* Name of link variable. */
-    int flags;			/* 0, TCL_GLOBAL_ONLY or TCL_NAMESPACE_ONLY:
-				 * indicates scope of localName. */
-{
-    int result;
-    CallFrame *framePtr;
-
-    result = TclGetFrame(interp, frameName, &framePtr);
-    if (result == -1) {
-	return TCL_ERROR;
-    }
-    return MakeUpvar((Interp *) interp, framePtr, part1, part2, 0,
-	    localName, flags);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetVariableFullName --
- *
- *	Given a Tcl_Var token returned by Tcl_FindNamespaceVar, this
- *	procedure appends to an object the namespace variable's full
- *	name, qualified by a sequence of parent namespace names.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      The variable's fully-qualified name is appended to the string
- *	representation of objPtr.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_GetVariableFullName(interp, variable, objPtr)
-    Tcl_Interp *interp;	        /* Interpreter containing the variable. */
-    Tcl_Var variable;		/* Token for the variable returned by a
-				 * previous call to Tcl_FindNamespaceVar. */
-    Tcl_Obj *objPtr;		/* Points to the object onto which the
-				 * variable's full name is appended. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Var *varPtr = (Var *) variable;
-    char *name;
-
-    /*
-     * Add the full name of the containing namespace (if any), followed by
-     * the "::" separator, then the variable name.
-     */
-
-    if (varPtr != NULL) {
-	if (!TclIsVarArrayElement(varPtr)) {
-	    if (varPtr->nsPtr != NULL) {
-		Tcl_AppendToObj(objPtr, varPtr->nsPtr->fullName, -1);
-		if (varPtr->nsPtr != iPtr->globalNsPtr) {
-		    Tcl_AppendToObj(objPtr, "::", 2);
-		}
-	    }
-	    if (varPtr->name != NULL) {
-		Tcl_AppendToObj(objPtr, varPtr->name, -1);
-	    } else if (varPtr->hPtr != NULL) {
-		name = Tcl_GetHashKey(varPtr->hPtr->tablePtr, varPtr->hPtr);
-		Tcl_AppendToObj(objPtr, name, -1);
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GlobalObjCmd --
- *
- *	This object-based procedure is invoked to process the "global" Tcl
- *	command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GlobalObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    register Tcl_Obj *objPtr;
-    char *varName;
-    register char *tail;
-    int result, i;
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "varName ?varName ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * If we are not executing inside a Tcl procedure, just return.
-     */
-    
-    if ((iPtr->varFramePtr == NULL)
-	    || !iPtr->varFramePtr->isProcCallFrame) {
-	return TCL_OK;
-    }
-
-    for (i = 1;  i < objc;  i++) {
-	/*
-	 * Make a local variable linked to its counterpart in the global ::
-	 * namespace.
-	 */
-	
-	objPtr = objv[i];
-	varName = TclGetString(objPtr);
-
-	/*
-	 * The variable name might have a scope qualifier, but the name for
-         * the local "link" variable must be the simple name at the tail.
-	 */
-
-	for (tail = varName;  *tail != '\0';  tail++) {
-	    /* empty body */
-	}
-        while ((tail > varName) && ((*tail != ':') || (*(tail-1) != ':'))) {
-            tail--;
-	}
-        if (*tail == ':') {
-            tail++;
-	}
-
-	/*
-	 * Link to the variable "varName" in the global :: namespace.
-	 */
-	
-	result = MakeUpvar(iPtr, (CallFrame *) NULL,
-		varName, (char *) NULL, /*otherFlags*/ TCL_GLOBAL_ONLY,
-	        /*myName*/ tail, /*myFlags*/ 0);
-	if (result != TCL_OK) {
-	    return result;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_VariableObjCmd --
- *
- *	Invoked to implement the "variable" command that creates one or more
- *	global variables. Handles the following syntax:
- *
- *	    variable ?name value...? name ?value?
- *
- *	One or more variables can be created. The variables are initialized
- *	with the specified values. The value for the last variable is
- *	optional.
- *
- *	If the variable does not exist, it is created and given the optional
- *	value. If it already exists, it is simply set to the optional
- *	value. Normally, "name" is an unqualified name, so it is created in
- *	the current namespace. If it includes namespace qualifiers, it can
- *	be created in another namespace.
- *
- *	If the variable command is executed inside a Tcl procedure, it
- *	creates a local variable linked to the newly-created namespace
- *	variable.
- *
- * Results:
- *	Returns TCL_OK if the variable is found or created. Returns
- *	TCL_ERROR if anything goes wrong.
- *
- * Side effects:
- *	If anything goes wrong, this procedure returns an error message
- *	as the result in the interpreter's result object.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_VariableObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    Interp *iPtr = (Interp *) interp;
-    char *varName, *tail, *cp;
-    Var *varPtr, *arrayPtr;
-    Tcl_Obj *varValuePtr;
-    int i, result;
-
-    for (i = 1;  i < objc;  i = i+2) {
-	/*
-	 * Look up each variable in the current namespace context, creating
-	 * it if necessary.
-	 */
-	
-	varName = TclGetString(objv[i]);
-	varPtr = TclLookupVar(interp, varName, (char *) NULL,
-                (TCL_NAMESPACE_ONLY | TCL_LEAVE_ERR_MSG), "define",
-                /*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr);
-	if (varPtr == NULL) {
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * Mark the variable as a namespace variable and increment its 
-	 * reference count so that it will persist until its namespace is
-	 * destroyed or until the variable is unset.
-	 */
-
-	if (!(varPtr->flags & VAR_NAMESPACE_VAR)) {
-	    varPtr->flags |= VAR_NAMESPACE_VAR;
-	    varPtr->refCount++;
-	}
-
-	/*
-	 * If a value was specified, set the variable to that value.
-	 * Otherwise, if the variable is new, leave it undefined.
-	 * (If the variable already exists and no value was specified,
-	 * leave its value unchanged; just create the local link if
-	 * we're in a Tcl procedure).
-	 */
-
-	if (i+1 < objc) {	/* a value was specified */
-	    varValuePtr = Tcl_ObjSetVar2(interp, objv[i], NULL, objv[i+1],
-		    (TCL_NAMESPACE_ONLY | TCL_LEAVE_ERR_MSG));
-	    if (varValuePtr == NULL) {
-		return TCL_ERROR;
-	    }
-	}
-
-	/*
-	 * If we are executing inside a Tcl procedure, create a local
-	 * variable linked to the new namespace variable "varName".
-	 */
-
-	if ((iPtr->varFramePtr != NULL)
-	        && iPtr->varFramePtr->isProcCallFrame) {
-	    /*
-	     * varName might have a scope qualifier, but the name for the
-	     * local "link" variable must be the simple name at the tail.
-	     *
-	     * Locate tail in one pass: drop any prefix after two *or more*
-	     * consecutive ":" characters).
-	     */
-
-	    for (tail = cp = varName;  *cp != '\0'; ) {
-		if (*cp++ == ':') {
-		    while (*cp++ == ':') {
-			tail = cp;
-		    }
-		}
-	    }
-	    
-	    /*
-	     * Create a local link "tail" to the variable "varName" in the
-	     * current namespace.
-	     */
-	    
-	    result = MakeUpvar(iPtr, (CallFrame *) NULL,
-		    /*otherP1*/ varName, /*otherP2*/ (char *) NULL,
-                    /*otherFlags*/ TCL_NAMESPACE_ONLY,
-		    /*myName*/ tail, /*myFlags*/ 0);
-	    if (result != TCL_OK) {
-		return result;
-	    }
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UpvarObjCmd --
- *
- *	This object-based procedure is invoked to process the "upvar"
- *	Tcl command. See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl object result value.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_UpvarObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. */
-{
-    register Interp *iPtr = (Interp *) interp;
-    CallFrame *framePtr;
-    char *frameSpec, *otherVarName, *myVarName;
-    register char *p;
-    int result;
-
-    if (objc < 3) {
-	upvarSyntax:
-	Tcl_WrongNumArgs(interp, 1, objv,
-		"?level? otherVar localVar ?otherVar localVar ...?");
-	return TCL_ERROR;
-    }
-
-    /*
-     * Find the call frame containing each of the "other variables" to be
-     * linked to. 
-     */
-
-    frameSpec = TclGetString(objv[1]);
-    result = TclGetFrame(interp, frameSpec, &framePtr);
-    if (result == -1) {
-	return TCL_ERROR;
-    }
-    objc -= result+1;
-    if ((objc & 1) != 0) {
-	goto upvarSyntax;
-    }
-    objv += result+1;
-
-    /*
-     * Iterate over each (other variable, local variable) pair.
-     * Divide the other variable name into two parts, then call
-     * MakeUpvar to do all the work of linking it to the local variable.
-     */
-
-    for ( ;  objc > 0;  objc -= 2, objv += 2) {
-	myVarName = TclGetString(objv[1]);
-	otherVarName = TclGetString(objv[0]);
-	for (p = otherVarName;  *p != 0;  p++) {
-	    if (*p == '(') {
-		char *openParen = p;
-
-		do {
-		    p++;
-		} while (*p != '\0');
-		p--;
-		if (*p != ')') {
-		    goto scalar;
-		}
-		*openParen = '\0';
-		*p = '\0';
-		result = MakeUpvar(iPtr, framePtr,
-		        otherVarName, openParen+1, /*otherFlags*/ 0,
-			myVarName, /*flags*/ 0);
-		*openParen = '(';
-		*p = ')';
-		goto checkResult;
-	    }
-	}
-	scalar:
-	result = MakeUpvar(iPtr, framePtr, otherVarName, (char *) NULL, 0,
-	        myVarName, /*flags*/ 0);
-
-	checkResult:
-	if (result != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CallTraces --
- *
- *	This procedure is invoked to find and invoke relevant
- *	trace procedures associated with a particular operation on
- *	a variable. This procedure invokes traces both on the
- *	variable and on its containing array (where relevant).
- *
- * Results:
- *	The return value is NULL if no trace procedures were invoked, or
- *	if all the invoked trace procedures returned successfully.
- *	The return value is non-NULL if a trace procedure returned an
- *	error (in this case no more trace procedures were invoked after
- *	the error was returned). In this case the return value is a
- *	pointer to a static string describing the error.
- *
- * Side effects:
- *	Almost anything can happen, depending on trace; this procedure
- *	itself doesn't have any side effects.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-CallTraces(iPtr, arrayPtr, varPtr, part1, part2, flags)
-    Interp *iPtr;		/* Interpreter containing variable. */
-    register Var *arrayPtr;	/* Pointer to array variable that contains
-				 * the variable, or NULL if the variable
-				 * isn't an element of an array. */
-    Var *varPtr;		/* Variable whose traces are to be
-				 * invoked. */
-    char *part1, *part2;	/* Variable's two-part name. */
-    int flags;			/* Flags passed to trace procedures:
-				 * indicates what's happening to variable,
-				 * plus other stuff like TCL_GLOBAL_ONLY,
-				 * TCL_NAMESPACE_ONLY, and
-				 * TCL_INTERP_DESTROYED. */
-{
-    register VarTrace *tracePtr;
-    ActiveVarTrace active;
-    char *result, *openParen, *p;
-    Tcl_DString nameCopy;
-    int copiedName;
-
-    /*
-     * If there are already similar trace procedures active for the
-     * variable, don't call them again.
-     */
-
-    if (varPtr->flags & VAR_TRACE_ACTIVE) {
-	return NULL;
-    }
-    varPtr->flags |= VAR_TRACE_ACTIVE;
-    varPtr->refCount++;
-
-    /*
-     * If the variable name hasn't been parsed into array name and
-     * element, do it here.  If there really is an array element,
-     * make a copy of the original name so that NULLs can be
-     * inserted into it to separate the names (can't modify the name
-     * string in place, because the string might get used by the
-     * callbacks we invoke).
-     */
-
-    copiedName = 0;
-    if (part2 == NULL) {
-	for (p = part1; *p ; p++) {
-	    if (*p == '(') {
-		openParen = p;
-		do {
-		    p++;
-		} while (*p != '\0');
-		p--;
-		if (*p == ')') {
-		    Tcl_DStringInit(&nameCopy);
-		    Tcl_DStringAppend(&nameCopy, part1, (p-part1));
-		    part2 = Tcl_DStringValue(&nameCopy)
-			+ (openParen + 1 - part1);
-		    part2[-1] = 0;
-		    part1 = Tcl_DStringValue(&nameCopy);
-		    copiedName = 1;
-		}
-		break;
-	    }
-	}
-    }
-
-    /*
-     * Invoke traces on the array containing the variable, if relevant.
-     */
-
-    result = NULL;
-    active.nextPtr = iPtr->activeTracePtr;
-    iPtr->activeTracePtr = &active;
-    if (arrayPtr != NULL) {
-	arrayPtr->refCount++;
-	active.varPtr = arrayPtr;
-	for (tracePtr = arrayPtr->tracePtr;  tracePtr != NULL;
-	     tracePtr = active.nextTracePtr) {
-	    active.nextTracePtr = tracePtr->nextPtr;
-	    if (!(tracePtr->flags & flags)) {
-		continue;
-	    }
-	    result = (*tracePtr->traceProc)(tracePtr->clientData,
-		    (Tcl_Interp *) iPtr, part1, part2, flags);
-	    if (result != NULL) {
-		if (flags & TCL_TRACE_UNSETS) {
-		    result = NULL;
-		} else {
-		    goto done;
-		}
-	    }
-	}
-    }
-
-    /*
-     * Invoke traces on the variable itself.
-     */
-
-    if (flags & TCL_TRACE_UNSETS) {
-	flags |= TCL_TRACE_DESTROYED;
-    }
-    active.varPtr = varPtr;
-    for (tracePtr = varPtr->tracePtr; tracePtr != NULL;
-	 tracePtr = active.nextTracePtr) {
-	active.nextTracePtr = tracePtr->nextPtr;
-	if (!(tracePtr->flags & flags)) {
-	    continue;
-	}
-	result = (*tracePtr->traceProc)(tracePtr->clientData,
-		(Tcl_Interp *) iPtr, part1, part2, flags);
-	if (result != NULL) {
-	    if (flags & TCL_TRACE_UNSETS) {
-		result = NULL;
-	    } else {
-		goto done;
-	    }
-	}
-    }
-
-    /*
-     * Restore the variable's flags, remove the record of our active
-     * traces, and then return.
-     */
-
-    done:
-    if (arrayPtr != NULL) {
-	arrayPtr->refCount--;
-    }
-    if (copiedName) {
-	Tcl_DStringFree(&nameCopy);
-    }
-    varPtr->flags &= ~VAR_TRACE_ACTIVE;
-    varPtr->refCount--;
-    iPtr->activeTracePtr = active.nextPtr;
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NewVar --
- *
- *	Create a new heap-allocated variable that will eventually be
- *	entered into a hashtable.
- *
- * Results:
- *	The return value is a pointer to the new variable structure. It is
- *	marked as a scalar variable (and not a link or array variable). Its
- *	value initially is NULL. The variable is not part of any hash table
- *	yet. Since it will be in a hashtable and not in a call frame, its
- *	name field is set NULL. It is initially marked as undefined.
- *
- * Side effects:
- *	Storage gets allocated.
- *
- *----------------------------------------------------------------------
- */
-
-static Var *
-NewVar()
-{
-    register Var *varPtr;
-
-    varPtr = (Var *) ckalloc(sizeof(Var));
-    varPtr->value.objPtr = NULL;
-    varPtr->name = NULL;
-    varPtr->nsPtr = NULL;
-    varPtr->hPtr = NULL;
-    varPtr->refCount = 0;
-    varPtr->tracePtr = NULL;
-    varPtr->searchPtr = NULL;
-    varPtr->flags = (VAR_SCALAR | VAR_UNDEFINED | VAR_IN_HASHTABLE);
-    return varPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseSearchId --
- *
- *	This procedure translates from a string to a pointer to an
- *	active array search (if there is one that matches the string).
- *
- * Results:
- *	The return value is a pointer to the array search indicated
- *	by string, or NULL if there isn't one.  If NULL is returned,
- *	the interp's result contains an error message.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static ArraySearch *
-ParseSearchId(interp, varPtr, varName, string)
-    Tcl_Interp *interp;		/* Interpreter containing variable. */
-    Var *varPtr;		/* Array variable search is for. */
-    char *varName;		/* Name of array variable that search is
-				 * supposed to be for. */
-    char *string;		/* String containing id of search. Must have
-				 * form "search-num-var" where "num" is a
-				 * decimal number and "var" is a variable
-				 * name. */
-{
-    char *end;
-    int id;
-    ArraySearch *searchPtr;
-
-    /*
-     * Parse the id into the three parts separated by dashes.
-     */
-
-    if ((string[0] != 's') || (string[1] != '-')) {
-	syntax:
-	Tcl_AppendResult(interp, "illegal search identifier \"", string,
-		"\"", (char *) NULL);
-	return NULL;
-    }
-    id = strtoul(string+2, &end, 10);
-    if ((end == (string+2)) || (*end != '-')) {
-	goto syntax;
-    }
-    if (strcmp(end+1, varName) != 0) {
-	Tcl_AppendResult(interp, "search identifier \"", string,
-		"\" isn't for variable \"", varName, "\"", (char *) NULL);
-	return NULL;
-    }
-
-    /*
-     * Search through the list of active searches on the interpreter
-     * to see if the desired one exists.
-     */
-
-    for (searchPtr = varPtr->searchPtr; searchPtr != NULL;
-	 searchPtr = searchPtr->nextPtr) {
-	if (searchPtr->id == id) {
-	    return searchPtr;
-	}
-    }
-    Tcl_AppendResult(interp, "couldn't find search \"", string, "\"",
-	    (char *) NULL);
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteSearches --
- *
- *	This procedure is called to free up all of the searches
- *	associated with an array variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory is released to the storage allocator.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteSearches(arrayVarPtr)
-    register Var *arrayVarPtr;		/* Variable whose searches are
-					 * to be deleted. */
-{
-    ArraySearch *searchPtr;
-
-    while (arrayVarPtr->searchPtr != NULL) {
-	searchPtr = arrayVarPtr->searchPtr;
-	arrayVarPtr->searchPtr = searchPtr->nextPtr;
-	ckfree((char *) searchPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDeleteVars --
- *
- *	This procedure is called to recycle all the storage space
- *	associated with a table of variables. For this procedure
- *	to work correctly, it must not be possible for any of the
- *	variables in the table to be accessed from Tcl commands
- *	(e.g. from trace procedures).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Variables are deleted and trace procedures are invoked, if
- *	any are declared.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclDeleteVars(iPtr, tablePtr)
-    Interp *iPtr;		/* Interpreter to which variables belong. */
-    Tcl_HashTable *tablePtr;	/* Hash table containing variables to
-				 * delete. */
-{
-    Tcl_Interp *interp = (Tcl_Interp *) iPtr;
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hPtr;
-    register Var *varPtr;
-    Var *linkPtr;
-    int flags;
-    ActiveVarTrace *activePtr;
-    Tcl_Obj *objPtr;
-    Namespace *currNsPtr = (Namespace *) Tcl_GetCurrentNamespace(interp);
-
-    /*
-     * Determine what flags to pass to the trace callback procedures.
-     */
-
-    flags = TCL_TRACE_UNSETS;
-    if (tablePtr == &iPtr->globalNsPtr->varTable) {
-	flags |= (TCL_INTERP_DESTROYED | TCL_GLOBAL_ONLY);
-    } else if (tablePtr == &currNsPtr->varTable) {
-	flags |= TCL_NAMESPACE_ONLY;
-    }
-
-    for (hPtr = Tcl_FirstHashEntry(tablePtr, &search);  hPtr != NULL;
-	 hPtr = Tcl_NextHashEntry(&search)) {
-	varPtr = (Var *) Tcl_GetHashValue(hPtr);
-
-	/*
-	 * For global/upvar variables referenced in procedures, decrement
-	 * the reference count on the variable referred to, and free
-	 * the referenced variable if it's no longer needed. Don't delete
-	 * the hash entry for the other variable if it's in the same table
-	 * as us: this will happen automatically later on.
-	 */
-
-	if (TclIsVarLink(varPtr)) {
-	    linkPtr = varPtr->value.linkPtr;
-	    linkPtr->refCount--;
-	    if ((linkPtr->refCount == 0) && TclIsVarUndefined(linkPtr)
-		    && (linkPtr->tracePtr == NULL)
-		    && (linkPtr->flags & VAR_IN_HASHTABLE)) {
-		if (linkPtr->hPtr == NULL) {
-		    ckfree((char *) linkPtr);
-		} else if (linkPtr->hPtr->tablePtr != tablePtr) {
-		    Tcl_DeleteHashEntry(linkPtr->hPtr);
-		    ckfree((char *) linkPtr);
-		}
-	    }
-	}
-
-	/*
-	 * Invoke traces on the variable that is being deleted, then
-	 * free up the variable's space (no need to free the hash entry
-	 * here, unless we're dealing with a global variable: the
-	 * hash entries will be deleted automatically when the whole
-	 * table is deleted). Note that we give CallTraces the variable's
-	 * fully-qualified name so that any called trace procedures can
-	 * refer to these variables being deleted.
-	 */
-
-	if (varPtr->tracePtr != NULL) {
-	    objPtr = Tcl_NewObj();
-	    Tcl_IncrRefCount(objPtr); /* until done with traces */
-	    Tcl_GetVariableFullName(interp, (Tcl_Var) varPtr, objPtr);
-	    (void) CallTraces(iPtr, (Var *) NULL, varPtr,
-		    Tcl_GetString(objPtr), (char *) NULL, flags);
-	    Tcl_DecrRefCount(objPtr); /* free no longer needed obj */
-
-	    while (varPtr->tracePtr != NULL) {
-		VarTrace *tracePtr = varPtr->tracePtr;
-		varPtr->tracePtr = tracePtr->nextPtr;
-		ckfree((char *) tracePtr);
-	    }
-	    for (activePtr = iPtr->activeTracePtr; activePtr != NULL;
-		 activePtr = activePtr->nextPtr) {
-		if (activePtr->varPtr == varPtr) {
-		    activePtr->nextTracePtr = NULL;
-		}
-	    }
-	}
-	    
-	if (TclIsVarArray(varPtr)) {
-	    DeleteArray(iPtr, Tcl_GetHashKey(tablePtr, hPtr), varPtr,
-	            flags);
-	    varPtr->value.tablePtr = NULL;
-	}
-	if (TclIsVarScalar(varPtr) && (varPtr->value.objPtr != NULL)) {
-	    objPtr = varPtr->value.objPtr;
-	    TclDecrRefCount(objPtr);
-	    varPtr->value.objPtr = NULL;
-	}
-	varPtr->hPtr = NULL;
-	varPtr->tracePtr = NULL;
-	TclSetVarUndefined(varPtr);
-	TclSetVarScalar(varPtr);
-
-	/*
-	 * If the variable was a namespace variable, decrement its 
-	 * reference count. We are in the process of destroying its
-	 * namespace so that namespace will no longer "refer" to the
-	 * variable.
-	 */
-
-	if (varPtr->flags & VAR_NAMESPACE_VAR) {
-	    varPtr->flags &= ~VAR_NAMESPACE_VAR;
-	    varPtr->refCount--;
-	}
-
-	/*
-	 * Recycle the variable's memory space if there aren't any upvar's
-	 * pointing to it. If there are upvars to this variable, then the
-	 * variable will get freed when the last upvar goes away.
-	 */
-
-	if (varPtr->refCount == 0) {
-	    ckfree((char *) varPtr); /* this Var must be VAR_IN_HASHTABLE */
-	}
-    }
-    Tcl_DeleteHashTable(tablePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclDeleteCompiledLocalVars --
- *
- *	This procedure is called to recycle storage space associated with
- *	the compiler-allocated array of local variables in a procedure call
- *	frame. This procedure resembles TclDeleteVars above except that each
- *	variable is stored in a call frame and not a hash table. For this
- *	procedure to work correctly, it must not be possible for any of the
- *	variable in the table to be accessed from Tcl commands (e.g. from
- *	trace procedures).
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Variables are deleted and trace procedures are invoked, if
- *	any are declared.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclDeleteCompiledLocalVars(iPtr, framePtr)
-    Interp *iPtr;		/* Interpreter to which variables belong. */
-    CallFrame *framePtr;	/* Procedure call frame containing
-				 * compiler-assigned local variables to
-				 * delete. */
-{
-    register Var *varPtr;
-    int flags;			/* Flags passed to trace procedures. */
-    Var *linkPtr;
-    ActiveVarTrace *activePtr;
-    int numLocals, i;
-
-    flags = TCL_TRACE_UNSETS;
-    numLocals = framePtr->numCompiledLocals;
-    varPtr = framePtr->compiledLocals;
-    for (i = 0;  i < numLocals;  i++) {
-	/*
-	 * For global/upvar variables referenced in procedures, decrement
-	 * the reference count on the variable referred to, and free
-	 * the referenced variable if it's no longer needed. Don't delete
-	 * the hash entry for the other variable if it's in the same table
-	 * as us: this will happen automatically later on.
-	 */
-
-	if (TclIsVarLink(varPtr)) {
-	    linkPtr = varPtr->value.linkPtr;
-	    linkPtr->refCount--;
-	    if ((linkPtr->refCount == 0) && TclIsVarUndefined(linkPtr)
-		    && (linkPtr->tracePtr == NULL)
-		    && (linkPtr->flags & VAR_IN_HASHTABLE)) {
-		if (linkPtr->hPtr == NULL) {
-		    ckfree((char *) linkPtr);
-		} else {
-		    Tcl_DeleteHashEntry(linkPtr->hPtr);
-		    ckfree((char *) linkPtr);
-		}
-	    }
-	}
-
-	/*
-	 * Invoke traces on the variable that is being deleted. Then delete
-	 * the variable's trace records.
-	 */
-
-	if (varPtr->tracePtr != NULL) {
-	    (void) CallTraces(iPtr, (Var *) NULL, varPtr,
-		    varPtr->name, (char *) NULL, flags);
-	    while (varPtr->tracePtr != NULL) {
-		VarTrace *tracePtr = varPtr->tracePtr;
-		varPtr->tracePtr = tracePtr->nextPtr;
-		ckfree((char *) tracePtr);
-	    }
-	    for (activePtr = iPtr->activeTracePtr; activePtr != NULL;
-		 activePtr = activePtr->nextPtr) {
-		if (activePtr->varPtr == varPtr) {
-		    activePtr->nextTracePtr = NULL;
-		}
-	    }
-	}
-
-        /*
-	 * Now if the variable is an array, delete its element hash table.
-	 * Otherwise, if it's a scalar variable, decrement the ref count
-	 * of its value.
-	 */
-	    
-	if (TclIsVarArray(varPtr) && (varPtr->value.tablePtr != NULL)) {
-	    DeleteArray(iPtr, varPtr->name, varPtr, flags);
-	}
-	if (TclIsVarScalar(varPtr) && (varPtr->value.objPtr != NULL)) {
-	    TclDecrRefCount(varPtr->value.objPtr);
-	    varPtr->value.objPtr = NULL;
-	}
-	varPtr->hPtr = NULL;
-	varPtr->tracePtr = NULL;
-	TclSetVarUndefined(varPtr);
-	TclSetVarScalar(varPtr);
-	varPtr++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteArray --
- *
- *	This procedure is called to free up everything in an array
- *	variable.  It's the caller's responsibility to make sure
- *	that the array is no longer accessible before this procedure
- *	is called.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	All storage associated with varPtr's array elements is deleted
- *	(including the array's hash table). Deletion trace procedures for
- *	array elements are invoked, then deleted. Any pending traces for
- *	array elements are also deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DeleteArray(iPtr, arrayName, varPtr, flags)
-    Interp *iPtr;			/* Interpreter containing array. */
-    char *arrayName;			/* Name of array (used for trace
-					 * callbacks). */
-    Var *varPtr;			/* Pointer to variable structure. */
-    int flags;				/* Flags to pass to CallTraces:
-					 * TCL_TRACE_UNSETS and sometimes
-					 * TCL_INTERP_DESTROYED,
-					 * TCL_NAMESPACE_ONLY, or
-					 * TCL_GLOBAL_ONLY. */
-{
-    Tcl_HashSearch search;
-    register Tcl_HashEntry *hPtr;
-    register Var *elPtr;
-    ActiveVarTrace *activePtr;
-    Tcl_Obj *objPtr;
-
-    DeleteSearches(varPtr);
-    for (hPtr = Tcl_FirstHashEntry(varPtr->value.tablePtr, &search);
-	 hPtr != NULL;  hPtr = Tcl_NextHashEntry(&search)) {
-	elPtr = (Var *) Tcl_GetHashValue(hPtr);
-	if (TclIsVarScalar(elPtr) && (elPtr->value.objPtr != NULL)) {
-	    objPtr = elPtr->value.objPtr;
-	    TclDecrRefCount(objPtr);
-	    elPtr->value.objPtr = NULL;
-	}
-	elPtr->hPtr = NULL;
-	if (elPtr->tracePtr != NULL) {
-	    elPtr->flags &= ~VAR_TRACE_ACTIVE;
-	    (void) CallTraces(iPtr, (Var *) NULL, elPtr, arrayName,
-		    Tcl_GetHashKey(varPtr->value.tablePtr, hPtr), flags);
-	    while (elPtr->tracePtr != NULL) {
-		VarTrace *tracePtr = elPtr->tracePtr;
-		elPtr->tracePtr = tracePtr->nextPtr;
-		ckfree((char *) tracePtr);
-	    }
-	    for (activePtr = iPtr->activeTracePtr; activePtr != NULL;
-		 activePtr = activePtr->nextPtr) {
-		if (activePtr->varPtr == elPtr) {
-		    activePtr->nextTracePtr = NULL;
-		}
-	    }
-	}
-	TclSetVarUndefined(elPtr);
-	TclSetVarScalar(elPtr);
-	if (elPtr->refCount == 0) {
-	    ckfree((char *) elPtr); /* element Vars are VAR_IN_HASHTABLE */
-	}
-    }
-    Tcl_DeleteHashTable(varPtr->value.tablePtr);
-    ckfree((char *) varPtr->value.tablePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanupVar --
- *
- *	This procedure is called when it looks like it may be OK to free up
- *	a variable's storage. If the variable is in a hashtable, its Var
- *	structure and hash table entry will be freed along with those of its
- *	containing array, if any. This procedure is called, for example,
- *	when a trace on a variable deletes a variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If the variable (or its containing array) really is dead and in a
- *	hashtable, then its Var structure, and possibly its hash table
- *	entry, is freed up.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CleanupVar(varPtr, arrayPtr)
-    Var *varPtr;		/* Pointer to variable that may be a
-				 * candidate for being expunged. */
-    Var *arrayPtr;		/* Array that contains the variable, or
-				 * NULL if this variable isn't an array
-				 * element. */
-{
-    if (TclIsVarUndefined(varPtr) && (varPtr->refCount == 0)
-	    && (varPtr->tracePtr == NULL)
-	    && (varPtr->flags & VAR_IN_HASHTABLE)) {
-	if (varPtr->hPtr != NULL) {
-	    Tcl_DeleteHashEntry(varPtr->hPtr);
-	}
-	ckfree((char *) varPtr);
-    }
-    if (arrayPtr != NULL) {
-	if (TclIsVarUndefined(arrayPtr) && (arrayPtr->refCount == 0)
-		&& (arrayPtr->tracePtr == NULL)
-	        && (arrayPtr->flags & VAR_IN_HASHTABLE)) {
-	    if (arrayPtr->hPtr != NULL) {
-		Tcl_DeleteHashEntry(arrayPtr->hPtr);
-	    }
-	    ckfree((char *) arrayPtr);
-	}
-    }
-}
-/*
- *----------------------------------------------------------------------
- *
- * VarErrMsg --
- *
- *      Generate a reasonable error message describing why a variable
- *      operation failed.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      The interp's result is set to hold a message identifying the
- *      variable given by part1 and part2 and describing why the
- *      variable operation failed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-VarErrMsg(interp, part1, part2, operation, reason)
-    Tcl_Interp *interp;         /* Interpreter in which to record message. */
-    char *part1, *part2;        /* Variable's two-part name. */
-    char *operation;            /* String describing operation that failed,
-                                 * e.g. "read", "set", or "unset". */
-    char *reason;               /* String describing why operation failed. */
-{
-    Tcl_ResetResult(interp);
-    Tcl_AppendResult(interp, "can't ", operation, " \"", part1,
-	    (char *) NULL);
-    if (part2 != NULL) {
-        Tcl_AppendResult(interp, "(", part2, ")", (char *) NULL);
-    }
-    Tcl_AppendResult(interp, "\": ", reason, (char *) NULL);
-}
diff --git a/library/auto.tcl b/library/auto.tcl
deleted file mode 100644
index 7e43aaf..0000000
--- a/library/auto.tcl
+++ /dev/null
@@ -1,553 +0,0 @@
-# auto.tcl --
-#
-# utility procs formerly in init.tcl dealing with auto execution
-# of commands and can be auto loaded themselves.
-#
-# RCS: @(#) $Id: auto.tcl,v 1.2 1999/04/16 00:46:56 stanton Exp $
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# auto_reset --
-#
-# Destroy all cached information for auto-loading and auto-execution,
-# so that the information gets recomputed the next time it's needed.
-# Also delete any procedures that are listed in the auto-load index
-# except those defined in this file.
-#
-# Arguments: 
-# None.
-
-proc auto_reset {} {
-    global auto_execs auto_index auto_oldpath
-    foreach p [info procs] {
-	if {[info exists auto_index($p)] && ![string match auto_* $p]
-		&& ([lsearch -exact {unknown pkg_mkIndex tclPkgSetup
-			tcl_findLibrary pkg_compareExtension
-			tclMacPkgSearch tclPkgUnknown} $p] < 0)} {
-	    rename $p {}
-	}
-    }
-    catch {unset auto_execs}
-    catch {unset auto_index}
-    catch {unset auto_oldpath}
-}
-
-# tcl_findLibrary --
-#
-#	This is a utility for extensions that searches for a library directory
-#	using a canonical searching algorithm. A side effect is to source
-#	the initialization script and set a global library variable.
-#
-# Arguments:
-# 	basename	Prefix of the directory name, (e.g., "tk")
-#	version		Version number of the package, (e.g., "8.0")
-#	patch		Patchlevel of the package, (e.g., "8.0.3")
-#	initScript	Initialization script to source (e.g., tk.tcl)
-#	enVarName	environment variable to honor (e.g., TK_LIBRARY)
-#	varName		Global variable to set when done (e.g., tk_library)
-
-proc tcl_findLibrary {basename version patch initScript enVarName varName} {
-    upvar #0 $varName the_library
-    global env errorInfo
-
-    set dirs {}
-    set errors {}
-
-    # The C application may have hardwired a path, which we honor
-    
-    if {[info exist the_library] && [string compare $the_library {}]} {
-	lappend dirs $the_library
-    } else {
-
-	# Do the canonical search
-
-	# 1. From an environment variable, if it exists
-
-        if {[info exists env($enVarName)]} {
-            lappend dirs $env($enVarName)
-        }
-
-	# 2. Relative to the Tcl library
-
-        lappend dirs [file join [file dirname [info library]] \
-		$basename$version]
-
-	# 3. Various locations relative to the executable
-	# ../lib/foo1.0		(From bin directory in install hierarchy)
-	# ../../lib/foo1.0	(From bin/arch directory in install hierarchy)
-	# ../library		(From unix directory in build hierarchy)
-	# ../../library		(From unix/arch directory in build hierarchy)
-	# ../../foo1.0b1/library (From unix directory in parallel build hierarchy)
-	# ../../../foo1.0b1/library (From unix/arch directory in parallel build hierarchy)
-
-        set parentDir [file dirname [file dirname [info nameofexecutable]]]
-        set grandParentDir [file dirname $parentDir]
-        lappend dirs [file join $parentDir lib $basename$version]
-        lappend dirs [file join $grandParentDir lib $basename$version]
-        lappend dirs [file join $parentDir library]
-        lappend dirs [file join $grandParentDir library]
-        if {![regexp {.*[ab][0-9]*} $patch ver]} {
-            set ver $version
-        }
-        lappend dirs [file join $grandParentDir $basename$ver library]
-        lappend dirs [file join [file dirname $grandParentDir] $basename$ver library]
-    }
-    foreach i $dirs {
-        set the_library $i
-        set file [file join $i $initScript]
-
-	# source everything when in a safe interpreter because
-	# we have a source command, but no file exists command
-
-        if {[interp issafe] || [file exists $file]} {
-            if {![catch {uplevel #0 [list source $file]} msg]} {
-                return
-            } else {
-                append errors "$file: $msg\n$errorInfo\n"
-            }
-        }
-    }
-    set msg "Can't find a usable $initScript in the following directories: \n"
-    append msg "    $dirs\n\n"
-    append msg "$errors\n\n"
-    append msg "This probably means that $basename wasn't installed properly.\n"
-    error $msg
-}
-
-
-# ----------------------------------------------------------------------
-# auto_mkindex
-# ----------------------------------------------------------------------
-# The following procedures are used to generate the tclIndex file
-# from Tcl source files.  They use a special safe interpreter to
-# parse Tcl source files, writing out index entries as "proc"
-# commands are encountered.  This implementation won't work in a
-# safe interpreter, since a safe interpreter can't create the
-# special parser and mess with its commands.  
-
-if {[interp issafe]} {
-    return	;# Stop sourcing the file here
-}
-
-# auto_mkindex --
-# Regenerate a tclIndex file from Tcl source files.  Takes as argument
-# the name of the directory in which the tclIndex file is to be placed,
-# followed by any number of glob patterns to use in that directory to
-# locate all of the relevant files.
-#
-# Arguments: 
-# dir -		Name of the directory in which to create an index.
-# args -	Any number of additional arguments giving the
-#		names of files within dir.  If no additional
-#		are given auto_mkindex will look for *.tcl.
-
-proc auto_mkindex {dir args} {
-    global errorCode errorInfo
-
-    if {[interp issafe]} {
-        error "can't generate index within safe interpreter"
-    }
-
-    set oldDir [pwd]
-    cd $dir
-    set dir [pwd]
-
-    append index "# Tcl autoload index file, version 2.0\n"
-    append index "# This file is generated by the \"auto_mkindex\" command\n"
-    append index "# and sourced to set up indexing information for one or\n"
-    append index "# more commands.  Typically each line is a command that\n"
-    append index "# sets an element in the auto_index array, where the\n"
-    append index "# element name is the name of a command and the value is\n"
-    append index "# a script that loads the command.\n\n"
-    if {$args == ""} {
-	set args *.tcl
-    }
-
-    auto_mkindex_parser::init
-    foreach file [eval glob $args] {
-        if {[catch {auto_mkindex_parser::mkindex $file} msg] == 0} {
-            append index $msg
-        } else {
-            set code $errorCode
-            set info $errorInfo
-            cd $oldDir
-            error $msg $info $code
-        }
-    }
-    auto_mkindex_parser::cleanup
-
-    set fid [open "tclIndex" w]
-    puts $fid $index nonewline
-    close $fid
-    cd $oldDir
-}
-
-# Original version of auto_mkindex that just searches the source
-# code for "proc" at the beginning of the line.
-
-proc auto_mkindex_old {dir args} {
-    global errorCode errorInfo
-    set oldDir [pwd]
-    cd $dir
-    set dir [pwd]
-    append index "# Tcl autoload index file, version 2.0\n"
-    append index "# This file is generated by the \"auto_mkindex\" command\n"
-    append index "# and sourced to set up indexing information for one or\n"
-    append index "# more commands.  Typically each line is a command that\n"
-    append index "# sets an element in the auto_index array, where the\n"
-    append index "# element name is the name of a command and the value is\n"
-    append index "# a script that loads the command.\n\n"
-    if {$args == ""} {
-	set args *.tcl
-    }
-    foreach file [eval glob $args] {
-	set f ""
-	set error [catch {
-	    set f [open $file]
-	    while {[gets $f line] >= 0} {
-		if {[regexp {^proc[ 	]+([^ 	]*)} $line match procName]} {
-		    set procName [lindex [auto_qualify $procName "::"] 0]
-		    append index "set [list auto_index($procName)]"
-		    append index " \[list source \[file join \$dir [list $file]\]\]\n"
-		}
-	    }
-	    close $f
-	} msg]
-	if {$error} {
-	    set code $errorCode
-	    set info $errorInfo
-	    catch {close $f}
-	    cd $oldDir
-	    error $msg $info $code
-	}
-    }
-    set f ""
-    set error [catch {
-	set f [open tclIndex w]
-	puts $f $index nonewline
-	close $f
-	cd $oldDir
-    } msg]
-    if {$error} {
-	set code $errorCode
-	set info $errorInfo
-	catch {close $f}
-	cd $oldDir
-	error $msg $info $code
-    }
-}
-
-# Create a safe interpreter that can be used to parse Tcl source files
-# generate a tclIndex file for autoloading.  This interp contains
-# commands for things that need index entries.  Each time a command
-# is executed, it writes an entry out to the index file.
-
-namespace eval auto_mkindex_parser {
-    variable parser ""          ;# parser used to build index
-    variable index ""           ;# maintains index as it is built
-    variable scriptFile ""      ;# name of file being processed
-    variable contextStack ""    ;# stack of namespace scopes
-    variable imports ""         ;# keeps track of all imported cmds
-    variable initCommands ""    ;# list of commands that create aliases
-
-    proc init {} {
-	variable parser
-	variable initCommands
-
-	if {![interp issafe]} {
-	    set parser [interp create -safe]
-	    $parser hide info
-	    $parser hide rename
-	    $parser hide proc
-	    $parser hide namespace
-	    $parser hide eval
-	    $parser hide puts
-	    $parser invokehidden namespace delete ::
-	    $parser invokehidden proc unknown {args} {}
-
-	    # We'll need access to the "namespace" command within the
-	    # interp.  Put it back, but move it out of the way.
-
-	    $parser expose namespace
-	    $parser invokehidden rename namespace _%@namespace
-	    $parser expose eval
-	    $parser invokehidden rename eval _%@eval
-
-	    # Install all the registered psuedo-command implementations
-
-	    foreach cmd $initCommands {
-		eval $cmd
-	    }
-	}
-    }
-    proc cleanup {} {
-	variable parser
-	interp delete $parser
-	unset parser
-    }
-}
-
-# auto_mkindex_parser::mkindex --
-#
-# Used by the "auto_mkindex" command to create a "tclIndex" file for
-# the given Tcl source file.  Executes the commands in the file, and
-# handles things like the "proc" command by adding an entry for the
-# index file.  Returns a string that represents the index file.
-#
-# Arguments: 
-#	file	Name of Tcl source file to be indexed.
-
-proc auto_mkindex_parser::mkindex {file} {
-    variable parser
-    variable index
-    variable scriptFile
-    variable contextStack
-    variable imports
-
-    set scriptFile $file
-
-    set fid [open $file]
-    set contents [read $fid]
-    close $fid
-
-    # There is one problem with sourcing files into the safe
-    # interpreter:  references like "$x" will fail since code is not
-    # really being executed and variables do not really exist.
-    # Be careful to escape all naked "$" before evaluating.
-
-    regsub -all {([^\$])\$([^\$])} $contents {\1\\$\2} contents
-
-    set index ""
-    set contextStack ""
-    set imports ""
-
-    $parser eval $contents
-
-    foreach name $imports {
-        catch {$parser eval [list _%@namespace forget $name]}
-    }
-    return $index
-}
-
-# auto_mkindex_parser::hook command
-#
-# Registers a Tcl command to evaluate when initializing the
-# slave interpreter used by the mkindex parser.
-# The command is evaluated in the master interpreter, and can
-# use the variable auto_mkindex_parser::parser to get to the slave
-
-proc auto_mkindex_parser::hook {cmd} {
-    variable initCommands
-
-    lappend initCommands $cmd
-}
-
-# auto_mkindex_parser::slavehook command
-#
-# Registers a Tcl command to evaluate when initializing the
-# slave interpreter used by the mkindex parser.
-# The command is evaluated in the slave interpreter.
-
-proc auto_mkindex_parser::slavehook {cmd} {
-    variable initCommands
-
-    # The $parser variable is defined to be the name of the
-    # slave interpreter when this command is used later.
-
-    lappend initCommands "\$parser eval [list $cmd]"
-}
-
-# auto_mkindex_parser::command --
-#
-# Registers a new command with the "auto_mkindex_parser" interpreter
-# that parses Tcl files.  These commands are fake versions of things
-# like the "proc" command.  When you execute them, they simply write
-# out an entry to a "tclIndex" file for auto-loading.
-#
-# This procedure allows extensions to register their own commands
-# with the auto_mkindex facility.  For example, a package like
-# [incr Tcl] might register a "class" command so that class definitions
-# could be added to a "tclIndex" file for auto-loading.
-#
-# Arguments:
-#	name 	Name of command recognized in Tcl files.
-#	arglist	Argument list for command.
-#	body 	Implementation of command to handle indexing.
-
-proc auto_mkindex_parser::command {name arglist body} {
-    hook [list auto_mkindex_parser::commandInit $name $arglist $body]
-}
-
-# auto_mkindex_parser::commandInit --
-#
-# This does the actual work set up by auto_mkindex_parser::command
-# This is called when the interpreter used by the parser is created.
-#
-# Arguments:
-#	name 	Name of command recognized in Tcl files.
-#	arglist	Argument list for command.
-#	body 	Implementation of command to handle indexing.
-
-proc auto_mkindex_parser::commandInit {name arglist body} {
-    variable parser
-
-    set ns [namespace qualifiers $name]
-    set tail [namespace tail $name]
-    if {$ns == ""} {
-        set fakeName "[namespace current]::_%@fake_$tail"
-    } else {
-        set fakeName "_%@fake_$name"
-        regsub -all {::} $fakeName "_" fakeName
-        set fakeName "[namespace current]::$fakeName"
-    }
-    proc $fakeName $arglist $body
-
-    # YUK!  Tcl won't let us alias fully qualified command names,
-    # so we can't handle names like "::itcl::class".  Instead,
-    # we have to build procs with the fully qualified names, and
-    # have the procs point to the aliases.
-
-    if {[regexp {::} $name]} {
-        set exportCmd [list _%@namespace export [namespace tail $name]]
-        $parser eval [list _%@namespace eval $ns $exportCmd]
- 
-	# The following proc definition does not work if you
-	# want to tolerate space or something else diabolical
-	# in the procedure name, (i.e., space in $alias)
-	# The following does not work:
-	#   "_%@eval {$alias} \$args"
-	# because $alias gets concat'ed to $args.
-	# The following does not work because $cmd is somehow undefined
-	#   "set cmd {$alias} \; _%@eval {\$cmd} \$args"
-	# A gold star to someone that can make test
-	# autoMkindex-3.3 work properly
-
-        set alias [namespace tail $fakeName]
-        $parser invokehidden proc $name {args} "_%@eval {$alias} \$args"
-        $parser alias $alias $fakeName
-    } else {
-        $parser alias $name $fakeName
-    }
-    return
-}
-
-# auto_mkindex_parser::fullname --
-# Used by commands like "proc" within the auto_mkindex parser.
-# Returns the qualified namespace name for the "name" argument.
-# If the "name" does not start with "::", elements are added from
-# the current namespace stack to produce a qualified name.  Then,
-# the name is examined to see whether or not it should really be
-# qualified.  If the name has more than the leading "::", it is
-# returned as a fully qualified name.  Otherwise, it is returned
-# as a simple name.  That way, the Tcl autoloader will recognize
-# it properly.
-#
-# Arguments:
-# name -		Name that is being added to index.
-
-proc auto_mkindex_parser::fullname {name} {
-    variable contextStack
-
-    if {![string match ::* $name]} {
-        foreach ns $contextStack {
-            set name "${ns}::$name"
-            if {[string match ::* $name]} {
-                break
-            }
-        }
-    }
-
-    if {[namespace qualifiers $name] == ""} {
-        return [namespace tail $name]
-    } elseif {![string match ::* $name]} {
-        return "::$name"
-    }
-    return $name
-}
-
-# Register all of the procedures for the auto_mkindex parser that
-# will build the "tclIndex" file.
-
-# AUTO MKINDEX:  proc name arglist body
-# Adds an entry to the auto index list for the given procedure name.
-
-auto_mkindex_parser::command proc {name args} {
-    variable index
-    variable scriptFile
-    append index [list set auto_index([fullname $name])] \
-	    " \[list source \[file join \$dir [list $scriptFile]\]\]\n"
-}
-
-# Conditionally add support for Tcl byte code files.  There are some
-# tricky details here.  First, we need to get the tbcload library
-# initialized in the current interpreter.  We cannot load tbcload into the
-# slave until we have done so because it needs access to the tcl_patchLevel
-# variable.  Second, because the package index file may defer loading the
-# library until we invoke a command, we need to explicitly invoke auto_load
-# to force it to be loaded.  This should be a noop if the package has
-# already been loaded
-
-auto_mkindex_parser::hook {
-    if {![catch {package require tbcload}]} {
-	if {[info commands tbcload::bcproc] == ""} {
-	    auto_load tbcload::bcproc
-	}
-	load {} tbcload $auto_mkindex_parser::parser
-
-	# AUTO MKINDEX:  tbcload::bcproc name arglist body
-	# Adds an entry to the auto index list for the given pre-compiled
-	# procedure name.  
-
-	auto_mkindex_parser::commandInit tbcload::bcproc {name args} {
-	    variable index
-	    variable scriptFile
-	    append index [list set auto_index([fullname $name])] \
-		    " \[list source \[file join \$dir [list $scriptFile]\]\]\n"
-	}
-    }
-}
-
-# AUTO MKINDEX:  namespace eval name command ?arg arg...?
-# Adds the namespace name onto the context stack and evaluates the
-# associated body of commands.
-#
-# AUTO MKINDEX:  namespace import ?-force? pattern ?pattern...?
-# Performs the "import" action in the parser interpreter.  This is
-# important for any commands contained in a namespace that affect
-# the index.  For example, a script may say "itcl::class ...",
-# or it may import "itcl::*" and then say "class ...".  This
-# procedure does the import operation, but keeps track of imported
-# patterns so we can remove the imports later.
-
-auto_mkindex_parser::command namespace {op args} {
-    switch -- $op {
-        eval {
-            variable parser
-            variable contextStack
-
-            set name [lindex $args 0]
-            set args [lrange $args 1 end]
-
-            set contextStack [linsert $contextStack 0 $name]
-	    $parser eval [list _%@namespace eval $name] $args
-            set contextStack [lrange $contextStack 1 end]
-        }
-        import {
-            variable parser
-            variable imports
-            foreach pattern $args {
-                if {$pattern != "-force"} {
-                    lappend imports $pattern
-                }
-            }
-            catch {$parser eval "_%@namespace import $args"}
-        }
-    }
-}
-
-return
diff --git a/library/encoding/ascii.enc b/library/encoding/ascii.enc
deleted file mode 100644
index e0320b8..0000000
--- a/library/encoding/ascii.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: ascii, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/big5.enc b/library/encoding/big5.enc
deleted file mode 100644
index 26179f4..0000000
--- a/library/encoding/big5.enc
+++ /dev/null
@@ -1,1516 +0,0 @@
-# Encoding file: big5, multi-byte
-M
-003F 0 89
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3000FF0C30013002FF0E2022FF1BFF1AFF1FFF01FE3020262025FE50FF64FE52
-00B7FE54FE55FE56FE57FF5C2013FE312014FE33FFFDFE34FE4FFF08FF09FE35
-FE36FF5BFF5DFE37FE3830143015FE39FE3A30103011FE3BFE3C300A300BFE3D
-FE3E30083009FE3FFE40300C300DFE41FE42300E300FFE43FE44FE59FE5A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FE5BFE5CFE5DFE5E20182019201C201D301D301E20352032FF03FF06FF0A
-203B00A7300325CB25CF25B325B225CE2606260525C725C625A125A025BD25BC
-32A32105203EFFFDFF3FFFFDFE49FE4AFE4DFE4EFE4BFE4CFE5FFE60FE61FF0B
-FF0D00D700F700B1221AFF1CFF1EFF1D226622672260221E22522261FE62FE63
-FE64FE65FE66223C2229222A22A52220221F22BF33D233D1222B222E22352234
-26402642264126092191219321902192219621972199219822252223FFFD0000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FFFDFF0FFF3CFF0400A5301200A200A3FF05FF2021032109FE69FE6AFE6B33D5
-339C339D339E33CE33A1338E338F33C400B05159515B515E515D5161516355E7
-74E97CCE25812582258325842585258625872588258F258E258D258C258B258A
-2589253C2534252C2524251C2594250025022595250C251025142518256D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000256E2570256F2550255E256A256125E225E325E525E4257125722573FF10
-FF11FF12FF13FF14FF15FF16FF17FF18FF192160216121622163216421652166
-216721682169302130223023302430253026302730283029FFFD5344FFFDFF21
-FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2FFF30FF31
-FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF41FF42FF43FF44FF45FF46FF47
-FF48FF49FF4AFF4BFF4CFF4DFF4EFF4FFF50FF51FF52FF53FF54FF55FF560000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FF57FF58FF59FF5A039103920393039403950396039703980399039A039B039C
-039D039E039F03A003A103A303A403A503A603A703A803A903B103B203B303B4
-03B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C103C303C403C5
-03C603C703C803C931053106310731083109310A310B310C310D310E310F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00003110311131123113311431153116311731183119311A311B311C311D311E
-311F312031213122312331243125312631273128312902D902C902CA02C702CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E004E594E014E034E434E5D4E864E8C4EBA513F5165516B51E052005201529B
-53155341535C53C84E094E0B4E084E0A4E2B4E3851E14E454E484E5F4E5E4E8E
-4EA15140520352FA534353C953E3571F58EB5915592759735B505B515B535BF8
-5C0F5C225C385C715DDD5DE55DF15DF25DF35DFE5E725EFE5F0B5F13624D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E114E104E0D4E2D4E304E394E4B5C394E884E914E954E924E944EA24EC1
-4EC04EC34EC64EC74ECD4ECA4ECB4EC4514351415167516D516E516C519751F6
-52065207520852FB52FE52FF53165339534853475345535E538453CB53CA53CD
-58EC5929592B592A592D5B545C115C245C3A5C6F5DF45E7B5EFF5F145F155FC3
-62086236624B624E652F6587659765A465B965E566F0670867286B206B626B79
-6BCB6BD46BDB6C0F6C34706B722A7236723B72477259725B72AC738B4E190000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E164E154E144E184E3B4E4D4E4F4E4E4EE54ED84ED44ED54ED64ED74EE34EE4
-4ED94EDE514551445189518A51AC51F951FA51F8520A52A0529F530553065317
-531D4EDF534A534953615360536F536E53BB53EF53E453F353EC53EE53E953E8
-53FC53F853F553EB53E653EA53F253F153F053E553ED53FB56DB56DA59160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000592E5931597459765B555B835C3C5DE85DE75DE65E025E035E735E7C5F01
-5F185F175FC5620A625362546252625165A565E6672E672C672A672B672D6B63
-6BCD6C116C106C386C416C406C3E72AF7384738974DC74E67518751F75287529
-7530753175327533758B767D76AE76BF76EE77DB77E277F3793A79BE7A747ACB
-4E1E4E1F4E524E534E694E994EA44EA64EA54EFF4F094F194F0A4F154F0D4F10
-4F114F0F4EF24EF64EFB4EF04EF34EFD4F014F0B514951475146514851680000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5171518D51B0521752115212520E521652A3530853215320537053715409540F
-540C540A54105401540B54045411540D54085403540E5406541256E056DE56DD
-573357305728572D572C572F57295919591A59375938598459785983597D5979
-598259815B575B585B875B885B855B895BFA5C165C795DDE5E065E765E740000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F0F5F1B5FD95FD6620E620C620D62106263625B6258653665E965E865EC
-65ED66F266F36709673D6734673167356B216B646B7B6C166C5D6C576C596C5F
-6C606C506C556C616C5B6C4D6C4E7070725F725D767E7AF97C737CF87F367F8A
-7FBD80018003800C80128033807F8089808B808C81E381EA81F381FC820C821B
-821F826E8272827E866B8840884C8863897F96214E324EA84F4D4F4F4F474F57
-4F5E4F344F5B4F554F304F504F514F3D4F3A4F384F434F544F3C4F464F630000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F5C4F604F2F4F4E4F364F594F5D4F484F5A514C514B514D517551B651B75225
-52245229522A522852AB52A952AA52AC532353735375541D542D541E543E5426
-544E542754465443543354485442541B5429544A5439543B5438542E54355436
-5420543C54405431542B541F542C56EA56F056E456EB574A57515740574D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005747574E573E5750574F573B58EF593E599D599259A8599E59A359995996
-598D59A45993598A59A55B5D5B5C5B5A5B5B5B8C5B8B5B8F5C2C5C405C415C3F
-5C3E5C905C915C945C8C5DEB5E0C5E8F5E875E8A5EF75F045F1F5F645F625F77
-5F795FD85FCC5FD75FCD5FF15FEB5FF85FEA6212621162846297629662806276
-6289626D628A627C627E627962736292626F6298626E62956293629162866539
-653B653865F166F4675F674E674F67506751675C6756675E6749674667600000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-675367576B656BCF6C426C5E6C996C816C886C896C856C9B6C6A6C7A6C906C70
-6C8C6C686C966C926C7D6C836C726C7E6C746C866C766C8D6C946C986C827076
-707C707D707872627261726072C472C27396752C752B75377538768276EF77E3
-79C179C079BF7A767CFB7F5580968093809D8098809B809A80B2826F82920000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000828B828D898B89D28A008C378C468C558C9D8D648D708DB38EAB8ECA8F9B
-8FB08FC28FC68FC58FC45DE1909190A290AA90A690A3914991C691CC9632962E
-9631962A962C4E264E564E734E8B4E9B4E9E4EAB4EAC4F6F4F9D4F8D4F734F7F
-4F6C4F9B4F8B4F864F834F704F754F884F694F7B4F964F7E4F8F4F914F7A5154
-51525155516951775176517851BD51FD523B52385237523A5230522E52365241
-52BE52BB5352535453535351536653775378537953D653D453D7547354750000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5496547854955480547B5477548454925486547C549054715476548C549A5462
-5468548B547D548E56FA57835777576A5769576157665764577C591C59495947
-59485944595459BE59BB59D459B959AE59D159C659D059CD59CB59D359CA59AF
-59B359D259C55B5F5B645B635B975B9A5B985B9C5B995B9B5C1A5C485C450000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C465CB75CA15CB85CA95CAB5CB15CB35E185E1A5E165E155E1B5E115E78
-5E9A5E975E9C5E955E965EF65F265F275F295F805F815F7F5F7C5FDD5FE05FFD
-5FF55FFF600F6014602F60356016602A6015602160276029602B601B62166215
-623F623E6240627F62C962CC62C462BF62C262B962D262DB62AB62D362D462CB
-62C862A862BD62BC62D062D962C762CD62B562DA62B162D862D662D762C662AC
-62CE653E65A765BC65FA66146613660C66066602660E6600660F6615660A0000
-AA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6607670D670B676D678B67956771679C677367776787679D6797676F6770677F
-6789677E67906775679A6793677C676A67726B236B666B676B7F6C136C1B6CE3
-6CE86CF36CB16CCC6CE56CB36CBD6CBE6CBC6CE26CAB6CD56CD36CB86CC46CB9
-6CC16CAE6CD76CC56CF16CBF6CBB6CE16CDB6CCA6CAC6CEF6CDC6CD66CE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007095708E7092708A7099722C722D723872487267726972C072CE72D972D7
-72D073A973A8739F73AB73A5753D759D7599759A768476C276F276F477E577FD
-793E7940794179C979C87A7A7A797AFA7CFE7F547F8C7F8B800580BA80A580A2
-80B180A180AB80A980B480AA80AF81E581FE820D82B3829D829982AD82BD829F
-82B982B182AC82A582AF82B882A382B082BE82B7864E8671521D88688ECB8FCE
-8FD48FD190B590B890B190B691C791D195779580961C9640963F963B96440000
-AB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-964296B996E89752975E4E9F4EAD4EAE4FE14FB54FAF4FBF4FE04FD14FCF4FDD
-4FC34FB64FD84FDF4FCA4FD74FAE4FD04FC44FC24FDA4FCE4FDE4FB751575192
-519151A0524E5243524A524D524C524B524752C752C952C352C1530D5357537B
-539A53DB54AC54C054A854CE54C954B854A654B354C754C254BD54AA54C10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054C454C854AF54AB54B154BB54A954A754BF56FF5782578B57A057A357A2
-57CE57AE579359555951594F594E595059DC59D859FF59E359E85A0359E559EA
-59DA59E65A0159FB5B695BA35BA65BA45BA25BA55C015C4E5C4F5C4D5C4B5CD9
-5CD25DF75E1D5E255E1F5E7D5EA05EA65EFA5F085F2D5F655F885F855F8A5F8B
-5F875F8C5F896012601D60206025600E6028604D60706068606260466043606C
-606B606A6064624162DC6316630962FC62ED630162EE62FD630762F162F70000
-AC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62EF62EC62FE62F463116302653F654565AB65BD65E26625662D66206627662F
-661F66286631662466F767FF67D367F167D467D067EC67B667AF67F567E967EF
-67C467D167B467DA67E567B867CF67DE67F367B067D967E267DD67D26B6A6B83
-6B866BB56BD26BD76C1F6CC96D0B6D326D2A6D416D256D0C6D316D1E6D170000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D3B6D3D6D3E6D366D1B6CF56D396D276D386D296D2E6D356D0E6D2B70AB
-70BA70B370AC70AF70AD70B870AE70A472307272726F727472E972E072E173B7
-73CA73BB73B273CD73C073B3751A752D754F754C754E754B75AB75A475A575A2
-75A3767876867687768876C876C676C376C5770176F976F87709770B76FE76FC
-770777DC78027814780C780D794679497948794779B979BA79D179D279CB7A7F
-7A817AFF7AFD7C7D7D027D057D007D097D077D047D067F387F8E7FBF80040000
-AD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8010800D8011803680D680E580DA80C380C480CC80E180DB80CE80DE80E480DD
-81F4822282E78303830582E382DB82E6830482E58302830982D282D782F18301
-82DC82D482D182DE82D382DF82EF830686508679867B867A884D886B898189D4
-8A088A028A038C9E8CA08D748D738DB48ECD8ECC8FF08FE68FE28FEA8FE50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008FED8FEB8FE48FE890CA90CE90C190C3914B914A91CD95829650964B964C
-964D9762976997CB97ED97F3980198A898DB98DF999699994E584EB3500C500D
-50234FEF502650254FF8502950165006503C501F501A501250114FFA50005014
-50284FF15021500B501950184FF34FEE502D502A4FFE502B5009517C51A451A5
-51A251CD51CC51C651CB5256525C5254525B525D532A537F539F539D53DF54E8
-55105501553754FC54E554F2550654FA551454E954ED54E1550954EE54EA0000
-AE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54E65527550754FD550F5703570457C257D457CB57C35809590F59575958595A
-5A115A185A1C5A1F5A1B5A1359EC5A205A235A295A255A0C5A095B6B5C585BB0
-5BB35BB65BB45BAE5BB55BB95BB85C045C515C555C505CED5CFD5CFB5CEA5CE8
-5CF05CF65D015CF45DEE5E2D5E2B5EAB5EAD5EA75F315F925F915F9060590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006063606560506055606D6069606F6084609F609A608D6094608C60856096
-624762F3630862FF634E633E632F635563426346634F6349633A6350633D632A
-632B6328634D634C65486549659965C165C566426649664F66436652664C6645
-664166F867146715671768216838684868466853683968426854682968B36817
-684C6851683D67F468506840683C6843682A68456813681868416B8A6B896BB7
-6C236C276C286C266C246CF06D6A6D956D886D876D666D786D776D596D930000
-AF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D6C6D896D6E6D5A6D746D696D8C6D8A6D796D856D656D9470CA70D870E470D9
-70C870CF7239727972FC72F972FD72F872F7738673ED740973EE73E073EA73DE
-7554755D755C755A755975BE75C575C775B275B375BD75BC75B975C275B8768B
-76B076CA76CD76CE7729771F7720772877E9783078277838781D783478370000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007825782D7820781F7832795579507960795F7956795E795D7957795A79E4
-79E379E779DF79E679E979D87A847A887AD97B067B117C897D217D177D0B7D0A
-7D207D227D147D107D157D1A7D1C7D0D7D197D1B7F3A7F5F7F947FC57FC18006
-8018801580198017803D803F80F1810280F0810580ED80F4810680F880F38108
-80FD810A80FC80EF81ED81EC82008210822A822B8228822C82BB832B83528354
-834A83388350834983358334834F833283398336831783408331832883430000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8654868A86AA869386A486A9868C86A3869C8870887788818882887D88798A18
-8A108A0E8A0C8A158A0A8A178A138A168A0F8A118C488C7A8C798CA18CA28D77
-8EAC8ED28ED48ECF8FB1900190068FF790008FFA8FF490038FFD90058FF89095
-90E190DD90E29152914D914C91D891DD91D791DC91D995839662966396610000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000965B965D96649658965E96BB98E299AC9AA89AD89B259B329B3C4E7E507A
-507D505C50475043504C505A504950655076504E5055507550745077504F500F
-506F506D515C519551F0526A526F52D252D952D852D55310530F5319533F5340
-533E53C366FC5546556A55665544555E55615543554A55315556554F5555552F
-55645538552E555C552C55635533554155575708570B570957DF5805580A5806
-57E057E457FA5802583557F757F9592059625A365A415A495A665A6A5A400000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A3C5A625A5A5A465A4A5B705BC75BC55BC45BC25BBF5BC65C095C085C075C60
-5C5C5C5D5D075D065D0E5D1B5D165D225D115D295D145D195D245D275D175DE2
-5E385E365E335E375EB75EB85EB65EB55EBE5F355F375F575F6C5F695F6B5F97
-5F995F9E5F985FA15FA05F9C607F60A3608960A060A860CB60B460E660BD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060C560BB60B560DC60BC60D860D560C660DF60B860DA60C7621A621B6248
-63A063A76372639663A263A563776367639863AA637163A963896383639B636B
-63A863846388639963A163AC6392638F6380637B63696368637A655D65566551
-65596557555F654F655865556554659C659B65AC65CF65CB65CC65CE665D665A
-666466686666665E66F952D7671B688168AF68A2689368B5687F687668B168A7
-689768B0688368C468AD688668856894689D68A8689F68A168826B326BBA0000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BEB6BEC6C2B6D8E6DBC6DF36DD96DB26DE16DCC6DE46DFB6DFA6E056DC76DCB
-6DAF6DD16DAE6DDE6DF96DB86DF76DF56DC56DD26E1A6DB56DDA6DEB6DD86DEA
-6DF16DEE6DE86DC66DC46DAA6DEC6DBF6DE670F97109710A70FD70EF723D727D
-7281731C731B73167313731973877405740A7403740673FE740D74E074F60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000074F7751C75227565756675627570758F75D475D575B575CA75CD768E76D4
-76D276DB7737773E773C77367738773A786B7843784E79657968796D79FB7A92
-7A957B207B287B1B7B2C7B267B197B1E7B2E7C927C977C957D467D437D717D2E
-7D397D3C7D407D307D337D447D2F7D427D327D317F3D7F9E7F9A7FCC7FCE7FD2
-801C804A8046812F81168123812B81298130812482028235823782368239838E
-839E8398837883A2839683BD83AB8392838A8393838983A08377837B837C0000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-838683A786555F6A86C786C086B686C486B586C686CB86B186AF86C98853889E
-888888AB88928896888D888B8993898F8A2A8A1D8A238A258A318A2D8A1F8A1B
-8A228C498C5A8CA98CAC8CAB8CA88CAA8CA78D678D668DBE8DBA8EDB8EDF9019
-900D901A90179023901F901D90109015901E9020900F90229016901B90140000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090E890ED90FD915791CE91F591E691E391E791ED91E99589966A96759673
-96789670967496769677966C96C096EA96E97AE07ADF980298039B5A9CE59E75
-9E7F9EA59EBB50A2508D508550995091508050965098509A670051F152725274
-5275526952DE52DD52DB535A53A5557B558055A7557C558A559D55985582559C
-55AA55945587558B558355B355AE559F553E55B2559A55BB55AC55B1557E5589
-55AB5599570D582F582A58345824583058315821581D582058F958FA59600000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A775A9A5A7F5A925A9B5AA75B735B715BD25BCC5BD35BD05C0A5C0B5C315D4C
-5D505D345D475DFD5E455E3D5E405E435E7E5ECA5EC15EC25EC45F3C5F6D5FA9
-5FAA5FA860D160E160B260B660E0611C612360FA611560F060FB60F4616860F1
-610E60F6610961006112621F624963A3638C63CF63C063E963C963C663CD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000063D263E363D063E163D663ED63EE637663F463EA63DB645263DA63F9655E
-6566656265636591659065AF666E667066746676666F6691667A667E667766FE
-66FF671F671D68FA68D568E068D868D7690568DF68F568EE68E768F968D268F2
-68E368CB68CD690D6912690E68C968DA696E68FB6B3E6B3A6B3D6B986B966BBC
-6BEF6C2E6C2F6C2C6E2F6E386E546E216E326E676E4A6E206E256E236E1B6E5B
-6E586E246E566E6E6E2D6E266E6F6E346E4D6E3A6E2C6E436E1D6E3E6ECB0000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E896E196E4E6E636E446E726E696E5F7119711A7126713071217136716E711C
-724C728472807336732573347329743A742A743374227425743574367434742F
-741B7426742875257526756B756A75E275DB75E375D975D875DE75E0767B767C
-7696769376B476DC774F77ED785D786C786F7A0D7A087A0B7A057A007A980000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A977A967AE57AE37B497B567B467B507B527B547B4D7B4B7B4F7B517C9F
-7CA57D5E7D507D687D557D2B7D6E7D727D617D667D627D707D7355847FD47FD5
-800B8052808581558154814B8151814E81398146813E814C815381748212821C
-83E9840383F8840D83E083C5840B83C183EF83F183F48457840A83F0840C83CC
-83FD83F283CA8438840E840483DC840783D483DF865B86DF86D986ED86D486DB
-86E486D086DE885788C188C288B1898389968A3B8A608A558A5E8A3C8A410000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8A548A5B8A508A468A348A3A8A368A568C618C828CAF8CBC8CB38CBD8CC18CBB
-8CC08CB48CB78CB68CBF8CB88D8A8D858D818DCE8DDD8DCB8DDA8DD18DCC8DDB
-8DC68EFB8EF88EFC8F9C902E90359031903890329036910290F5910990FE9163
-916591CF9214921592239209921E920D9210920792119594958F958B95910000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000095939592958E968A968E968B967D96859686968D9672968496C196C596C4
-96C696C796EF96F297CC98059806980898E798EA98EF98E998F298ED99AE99AD
-9EC39ECD9ED14E8250AD50B550B250B350C550BE50AC50B750BB50AF50C7527F
-5277527D52DF52E652E452E252E3532F55DF55E855D355E655CE55DC55C755D1
-55E355E455EF55DA55E155C555C655E555C957125713585E585158585857585A
-5854586B584C586D584A58625852584B59675AC15AC95ACC5ABE5ABD5ABC0000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5AB35AC25AB25D695D6F5E4C5E795EC95EC85F125F595FAC5FAE611A610F6148
-611F60F3611B60F961016108614E614C6144614D613E61346127610D61066137
-622162226413643E641E642A642D643D642C640F641C6414640D643664166417
-6406656C659F65B06697668966876688669666846698668D67036994696D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000695A697769606954697569306982694A6968696B695E695369796986695D
-6963695B6B476B726BC06BBF6BD36BFD6EA26EAF6ED36EB66EC26E906E9D6EC7
-6EC56EA56E986EBC6EBA6EAB6ED16E966E9C6EC46ED46EAA6EA76EB4714E7159
-7169716471497167715C716C7166714C7165715E714671687156723A72527337
-7345733F733E746F745A7455745F745E7441743F7459745B745C757675787600
-75F0760175F275F175FA75FF75F475F376DE76DF775B776B7766775E77630000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7779776A776C775C77657768776277EE788E78B078977898788C7889787C7891
-7893787F797A797F7981842C79BD7A1C7A1A7A207A147A1F7A1E7A9F7AA07B77
-7BC07B607B6E7B677CB17CB37CB57D937D797D917D817D8F7D5B7F6E7F697F6A
-7F727FA97FA87FA480568058808680848171817081788165816E8173816B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008179817A81668205824784828477843D843184758466846B8449846C845B
-843C8435846184638469846D8446865E865C865F86F9871387088707870086FE
-86FB870287038706870A885988DF88D488D988DC88D888DD88E188CA88D588D2
-899C89E38A6B8A728A738A668A698A708A878A7C8A638AA08A718A858A6D8A62
-8A6E8A6C8A798A7B8A3E8A688C628C8A8C898CCA8CC78CC88CC48CB28CC38CC2
-8CC58DE18DDF8DE88DEF8DF38DFA8DEA8DE48DE68EB28F038F098EFE8F0A0000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8F9F8FB2904B904A905390429054903C905590509047904F904E904D9051903E
-904191129117916C916A916991C9923792579238923D9240923E925B924B9264
-925192349249924D92459239923F925A959896989694969596CD96CB96C996CA
-96F796FB96F996F6975697749776981098119813980A9812980C98FC98F40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000098FD98FE99B399B199B49AE19CE99E829F0E9F139F2050E750EE50E550D6
-50ED50DA50D550CF50D150F150CE50E9516251F352835282533153AD55FE5600
-561B561755FD561456065609560D560E55F75616561F5608561055F657185716
-5875587E58835893588A58795885587D58FD592559225924596A59695AE15AE6
-5AE95AD75AD65AD85AE35B755BDE5BE75BE15BE55BE65BE85BE25BE45BDF5C0D
-5C625D845D875E5B5E635E555E575E545ED35ED65F0A5F465F705FB961470000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-613F614B617761626163615F615A61586175622A64876458645464A46478645F
-647A645164676434646D647B657265A165D765D666A266A8669D699C69A86995
-69C169AE69D369CB699B69B769BB69AB69B469D069CD69AD69CC69A669C369A3
-6B496B4C6C336F336F146EFE6F136EF46F296F3E6F206F2C6F0F6F026F220000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006EFF6EEF6F066F316F386F326F236F156F2B6F2F6F886F2A6EEC6F016EF2
-6ECC6EF771947199717D718A71847192723E729272967344735074647463746A
-7470746D750475917627760D760B7609761376E176E37784777D777F776178C1
-789F78A778B378A978A3798E798F798D7A2E7A317AAA7AA97AED7AEF7BA17B95
-7B8B7B757B977B9D7B947B8F7BB87B877B847CB97CBD7CBE7DBB7DB07D9C7DBD
-7DBE7DA07DCA7DB47DB27DB17DBA7DA27DBF7DB57DB87DAD7DD27DC77DAC0000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7F707FE07FE17FDF805E805A808781508180818F8188818A817F818281E781FA
-82078214821E824B84C984BF84C684C48499849E84B2849C84CB84B884C084D3
-849084BC84D184CA873F871C873B872287258734871887558737872988F38902
-88F488F988F888FD88E8891A88EF8AA68A8C8A9E8AA38A8D8AA18A938AA40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AAA8AA58AA88A988A918A9A8AA78C6A8C8D8C8C8CD38CD18CD28D6B8D99
-8D958DFC8F148F128F158F138FA390609058905C90639059905E9062905D905B
-91199118911E917591789177917492789280928592989296927B9293929C92A8
-927C929195A195A895A995A395A595A49699969C969B96CC96D29700977C9785
-97F69817981898AF98B199039905990C990999C19AAF9AB09AE69B419B429CF4
-9CF69CF39EBC9F3B9F4A5104510050FB50F550F9510251085109510551DC0000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-528752885289528D528A52F053B2562E563B56395632563F563456295653564E
-565756745636562F56305880589F589E58B3589C58AE58A958A6596D5B095AFB
-5B0B5AF55B0C5B085BEE5BEC5BE95BEB5C645C655D9D5D945E625E5F5E615EE2
-5EDA5EDF5EDD5EE35EE05F485F715FB75FB561766167616E615D615561820000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000617C6170616B617E61A7619061AB618E61AC619A61A4619461AE622E6469
-646F6479649E64B26488649064B064A56493649564A9649264AE64AD64AB649A
-64AC649964A264B365756577657866AE66AB66B466B16A236A1F69E86A016A1E
-6A1969FD6A216A136A0A69F36A026A0569ED6A116B506B4E6BA46BC56BC66F3F
-6F7C6F846F516F666F546F866F6D6F5B6F786F6E6F8E6F7A6F706F646F976F58
-6ED56F6F6F606F5F719F71AC71B171A87256729B734E73577469748B74830000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-747E7480757F76207629761F7624762676217622769A76BA76E4778E7787778C
-7791778B78CB78C578BA78CA78BE78D578BC78D07A3F7A3C7A407A3D7A377A3B
-7AAF7AAE7BAD7BB17BC47BB47BC67BC77BC17BA07BCC7CCA7DE07DF47DEF7DFB
-7DD87DEC7DDD7DE87DE37DDA7DDE7DE97D9E7DD97DF27DF97F757F777FAF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007FE98026819B819C819D81A0819A81988517853D851A84EE852C852D8513
-851185238521851484EC852584FF850687828774877687608766877887688759
-8757874C8753885B885D89108907891289138915890A8ABC8AD28AC78AC48A95
-8ACB8AF88AB28AC98AC28ABF8AB08AD68ACD8AB68AB98ADB8C4C8C4E8C6C8CE0
-8CDE8CE68CE48CEC8CED8CE28CE38CDC8CEA8CE18D6D8D9F8DA38E2B8E108E1D
-8E228E0F8E298E1F8E218E1E8EBA8F1D8F1B8F1F8F298F268F2A8F1C8F1E0000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8F259069906E9068906D90779130912D9127913191879189918B918392C592BB
-92B792EA92AC92E492C192B392BC92D292C792F092B295AD95B1970497069707
-97099760978D978B978F9821982B981C98B3990A99139912991899DD99D099DF
-99DB99D199D599D299D99AB79AEE9AEF9B279B459B449B779B6F9D069D090000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D039EA99EBE9ECE58A89F5251125118511451105115518051AA51DD5291
-529352F35659566B5679566956645678566A566856655671566F566C56625676
-58C158BE58C758C5596E5B1D5B345B785BF05C0E5F4A61B2619161A9618A61CD
-61B661BE61CA61C8623064C564C164CB64BB64BC64DA64C464C764C264CD64BF
-64D264D464BE657466C666C966B966C466C766B86A3D6A386A3A6A596A6B6A58
-6A396A446A626A616A4B6A476A356A5F6A486B596B776C056FC26FB16FA10000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6FC36FA46FC16FA76FB36FC06FB96FB66FA66FA06FB471BE71C971D071D271C8
-71D571B971CE71D971DC71C371C47368749C74A37498749F749E74E2750C750D
-76347638763A76E776E577A0779E779F77A578E878DA78EC78E779A67A4D7A4E
-7A467A4C7A4B7ABA7BD97C117BC97BE47BDB7BE17BE97BE67CD57CD67E0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E117E087E1B7E237E1E7E1D7E097E107F797FB27FF07FF17FEE802881B3
-81A981A881FB820882588259854A855985488568856985438549856D856A855E
-8783879F879E87A2878D8861892A89328925892B892189AA89A68AE68AFA8AEB
-8AF18B008ADC8AE78AEE8AFE8B018B028AF78AED8AF38AF68AFC8C6B8C6D8C93
-8CF48E448E318E348E428E398E358F3B8F2F8F388F338FA88FA6907590749078
-9072907C907A913491929320933692F89333932F932292FC932B9304931A0000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9310932693219315932E931995BB96A796A896AA96D5970E97119716970D9713
-970F975B975C9766979898309838983B9837982D9839982499109928991E991B
-9921991A99ED99E299F19AB89ABC9AFB9AED9B289B919D159D239D269D289D12
-9D1B9ED89ED49F8D9F9C512A511F5121513252F5568E56805690568556870000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000568F58D558D358D158CE5B305B2A5B245B7A5C375C685DBC5DBA5DBD5DB8
-5E6B5F4C5FBD61C961C261C761E661CB6232623464CE64CA64D864E064F064E6
-64EC64F164E264ED6582658366D966D66A806A946A846AA26A9C6ADB6AA36A7E
-6A976A906AA06B5C6BAE6BDA6C086FD86FF16FDF6FE06FDB6FE46FEB6FEF6F80
-6FEC6FE16FE96FD56FEE6FF071E771DF71EE71E671E571ED71EC71F471E07235
-72467370737274A974B074A674A876467642764C76EA77B377AA77B077AC0000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77A777AD77EF78F778FA78F478EF790179A779AA7A577ABF7C077C0D7BFE7BF7
-7C0C7BE07CE07CDC7CDE7CE27CDF7CD97CDD7E2E7E3E7E467E377E327E437E2B
-7E3D7E317E457E417E347E397E487E357E3F7E2F7F447FF37FFC807180728070
-806F807381C681C381BA81C281C081BF81BD81C981BE81E88209827185AA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008584857E859C8591859485AF859B858785A8858A866787C087D187B387D2
-87C687AB87BB87BA87C887CB893B893689448938893D89AC8B0E8B178B198B1B
-8B0A8B208B1D8B048B108C418C3F8C738CFA8CFD8CFC8CF88CFB8DA88E498E4B
-8E488E4A8F448F3E8F428F458F3F907F907D9084908190829080913991A3919E
-919C934D938293289375934A9365934B9318937E936C935B9370935A935495CA
-95CB95CC95C895C696B196B896D6971C971E97A097D3984698B699359A010000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-99FF9BAE9BAB9BAA9BAD9D3B9D3F9E8B9ECF9EDE9EDC9EDD9EDB9F3E9F4B53E2
-569556AE58D958D85B385F5D61E3623364F464F264FE650664FA64FB64F765B7
-66DC67266AB36AAC6AC36ABB6AB86AC26AAE6AAF6B5F6B786BAF7009700B6FFE
-70066FFA7011700F71FB71FC71FE71F87377737574A774BF7515765676580000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000765277BD77BF77BB77BC790E79AE7A617A627A607AC47AC57C2B7C277C2A
-7C1E7C237C217CE77E547E557E5E7E5A7E617E527E597F487FF97FFB80778076
-81CD81CF820A85CF85A985CD85D085C985B085BA85B985A687EF87EC87F287E0
-898689B289F48B288B398B2C8B2B8C508D058E598E638E668E648E5F8E558EC0
-8F498F4D90879083908891AB91AC91D09394938A939693A293B393AE93AC93B0
-9398939A939795D495D695D095D596E296DC96D996DB96DE972497A397A60000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-97AD97F9984D984F984C984E985398BA993E993F993D992E99A59A0E9AC19B03
-9B069B4F9B4E9B4D9BCA9BC99BFD9BC89BC09D519D5D9D609EE09F159F2C5133
-56A558DE58DF58E25BF59F905EEC61F261F761F661F56500650F66E066DD6AE5
-6ADD6ADA6AD3701B701F7028701A701D701570187206720D725872A273780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000737A74BD74CA74E375877586765F766177C7791979B17A6B7A697C3E7C3F
-7C387C3D7C377C407E6B7E6D7E797E697E6A7F857E737FB67FB97FB881D885E9
-85DD85EA85D585E485E585F787FB8805880D87F987FE8960895F8956895E8B41
-8B5C8B588B498B5A8B4E8B4F8B468B598D088D0A8E7C8E728E878E768E6C8E7A
-8E748F548F4E8FAD908A908B91B191AE93E193D193DF93C393C893DC93DD93D6
-93E293CD93D893E493D793E895DC96B496E3972A9727976197DC97FB985E0000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9858985B98BC994599499A169A199B0D9BE89BE79BD69BDB9D899D619D729D6A
-9D6C9E929E979E939EB452F856A856B756B656B456BC58E45B405B435B7D5BF6
-5DC961F861FA65186514651966E667276AEC703E703070327210737B74CF7662
-76657926792A792C792B7AC77AF67C4C7C437C4D7CEF7CF08FAE7E7D7E7C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E827F4C800081DA826685FB85F9861185FA8606860B8607860A88148815
-896489BA89F88B708B6C8B668B6F8B5F8B6B8D0F8D0D8E898E818E858E8291B4
-91CB9418940393FD95E1973098C49952995199A89A2B9A309A379A359C139C0D
-9E799EB59EE89F2F9F5F9F639F615137513856C156C056C259145C6C5DCD61FC
-61FE651D651C659566E96AFB6B046AFA6BB2704C721B72A774D674D4766977D3
-7C507E8F7E8C7FBC8617862D861A882388228821881F896A896C89BD8B740000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B778B7D8D138E8A8E8D8E8B8F5F8FAF91BA942E94339435943A94389432942B
-95E297389739973297FF9867986599579A459A439A409A3E9ACF9B549B519C2D
-9C259DAF9DB49DC29DB89E9D9EEF9F199F5C9F669F67513C513B56C856CA56C9
-5B7F5DD45DD25F4E61FF65246B0A6B6170517058738074E4758A766E766C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079B37C607C5F807E807D81DF8972896F89FC8B808D168D178E918E938F61
-9148944494519452973D973E97C397C1986B99559A559A4D9AD29B1A9C499C31
-9C3E9C3B9DD39DD79F349F6C9F6A9F9456CC5DD662006523652B652A66EC6B10
-74DA7ACA7C647C637C657E937E967E9481E28638863F88318B8A9090908F9463
-946094649768986F995C9A5A9A5B9A579AD39AD49AD19C549C579C569DE59E9F
-9EF456D158E9652C705E7671767277D77F507F888836883988628B938B920000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B9682778D1B91C0946A97429748974497C698709A5F9B229B589C5F9DF99DFA
-9E7C9E7D9F079F779F725EF36B1670637C6C7C6E883B89C08EA191C194729470
-9871995E9AD69B239ECC706477DA8B9A947797C99A629A657E9C8B9C8EAA91C5
-947D947E947C9C779C789EF78C54947F9E1A72289A6A9B319E1B9E1E7C720000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030FE309D309E3005304130423043304430453046304730483049304A304B
-304C304D304E304F3050305130523053305430553056305730583059305A305B
-305C305D305E305F3060306130623063306430653066306730683069306A306B
-306C306D306E306F3070307130723073307430753076307730783079307A307B
-307C307D307E307F3080308130823083308430853086308730883089308A308B
-308C308D308E308F309030913092309330A130A230A330A430A530A630A70000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30A830A930AA30AB30AC30AD30AE30AF30B030B130B230B330B430B530B630B7
-30B830B930BA30BB30BC30BD30BE30BF30C030C130C230C330C430C530C630C7
-30C830C930CA30CB30CC30CD30CE30CF30D030D130D230D330D430D530D630D7
-30D830D930DA30DB30DC30DD30DE30DF30E030E130E230E330E430E530E60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030E730E830E930EA30EB30EC30ED30EE30EF30F030F130F230F330F430F5
-30F60414041504010416041704180419041A041B041C04230424042504260427
-04280429042A042B042C042D042E042F04300431043204330434043504510436
-043704380439043A043B043C043D043E043F0440044104420443044404450446
-044704480449044A044B044C044D044E044F2460246124622463246424652466
-246724682469247424752476247724782479247A247B247C247D000000000000
-C9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E424E5C51F5531A53824E074E0C4E474E8D56D7FA0C5C6E5F734E0F51874E0E
-4E2E4E934EC24EC94EC8519852FC536C53B957205903592C5C105DFF65E16BB3
-6BCC6C14723F4E314E3C4EE84EDC4EE94EE14EDD4EDA520C531C534C57225723
-5917592F5B815B845C125C3B5C745C735E045E805E825FC9620962506C150000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C366C436C3F6C3B72AE72B0738A79B8808A961E4F0E4F184F2C4EF54F14
-4EF14F004EF74F084F1D4F024F054F224F134F044EF44F1251B1521352095210
-52A65322531F534D538A540756E156DF572E572A5734593C5980597C5985597B
-597E5977597F5B565C155C255C7C5C7A5C7B5C7E5DDF5E755E845F025F1A5F74
-5FD55FD45FCF625C625E626462616266626262596260625A626565EF65EE673E
-67396738673B673A673F673C67336C186C466C526C5C6C4F6C4A6C546C4B0000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C4C7071725E72B472B5738E752A767F7A757F518278827C8280827D827F864D
-897E909990979098909B909496229624962096234F564F3B4F624F494F534F64
-4F3E4F674F524F5F4F414F584F2D4F334F3F4F61518F51B9521C521E522152AD
-52AE530953635372538E538F54305437542A545454455419541C542554180000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000543D544F544154285424544756EE56E756E557415745574C5749574B5752
-5906594059A6599859A05997598E59A25990598F59A759A15B8E5B925C285C2A
-5C8D5C8F5C885C8B5C895C925C8A5C865C935C955DE05E0A5E0E5E8B5E895E8C
-5E885E8D5F055F1D5F785F765FD25FD15FD05FED5FE85FEE5FF35FE15FE45FE3
-5FFA5FEF5FF75FFB60005FF4623A6283628C628E628F629462876271627B627A
-6270628162886277627D62726274653765F065F465F365F265F5674567470000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67596755674C6748675D674D675A674B6BD06C196C1A6C786C676C6B6C846C8B
-6C8F6C716C6F6C696C9A6C6D6C876C956C9C6C666C736C656C7B6C8E7074707A
-726372BF72BD72C372C672C172BA72C573957397739373947392753A75397594
-75957681793D80348095809980908092809C8290828F8285828E829182930000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000828A828382848C788FC98FBF909F90A190A5909E90A790A096309628962F
-962D4E334F984F7C4F854F7D4F804F874F764F744F894F844F774F4C4F974F6A
-4F9A4F794F814F784F904F9C4F944F9E4F924F824F954F6B4F6E519E51BC51BE
-5235523252335246523152BC530A530B533C539253945487547F548154915482
-5488546B547A547E5465546C54745466548D546F546154605498546354675464
-56F756F9576F5772576D576B57715770577657805775577B5773577457620000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5768577D590C594559B559BA59CF59CE59B259CC59C159B659BC59C359D659B1
-59BD59C059C859B459C75B625B655B935B955C445C475CAE5CA45CA05CB55CAF
-5CA85CAC5C9F5CA35CAD5CA25CAA5CA75C9D5CA55CB65CB05CA65E175E145E19
-5F285F225F235F245F545F825F7E5F7D5FDE5FE5602D602660196032600B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006034600A60176033601A601E602C6022600D6010602E60136011600C6009
-601C6214623D62AD62B462D162BE62AA62B662CA62AE62B362AF62BB62A962B0
-62B8653D65A865BB660965FC66046612660865FB6603660B660D660565FD6611
-661066F6670A6785676C678E67926776677B6798678667846774678D678C677A
-679F679167996783677D67816778677967946B256B806B7E6BDE6C1D6C936CEC
-6CEB6CEE6CD96CB66CD46CAD6CE76CB76CD06CC26CBA6CC36CC66CED6CF20000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6CD26CDD6CB46C8A6C9D6C806CDE6CC06D306CCD6CC76CB06CF96CCF6CE96CD1
-709470987085709370867084709170967082709A7083726A72D672CB72D872C9
-72DC72D272D472DA72CC72D173A473A173AD73A673A273A073AC739D74DD74E8
-753F7540753E758C759876AF76F376F176F076F577F877FC77F977FB77FA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077F77942793F79C57A787A7B7AFB7C757CFD8035808F80AE80A380B880B5
-80AD822082A082C082AB829A8298829B82B582A782AE82BC829E82BA82B482A8
-82A182A982C282A482C382B682A28670866F866D866E8C568FD28FCB8FD38FCD
-8FD68FD58FD790B290B490AF90B390B09639963D963C963A96434FCD4FC54FD3
-4FB24FC94FCB4FC14FD44FDC4FD94FBB4FB34FDB4FC74FD64FBA4FC04FB94FEC
-5244524952C052C2533D537C539753965399539854BA54A154AD54A554CF0000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54C3830D54B754AE54D654B654C554C654A0547054BC54A254BE547254DE54B0
-57B5579E579F57A4578C5797579D579B57945798578F579957A5579A579558F4
-590D595359E159DE59EE5A0059F159DD59FA59FD59FC59F659E459F259F759DB
-59E959F359F559E059FE59F459ED5BA85C4C5CD05CD85CCC5CD75CCB5CDB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005CDE5CDA5CC95CC75CCA5CD65CD35CD45CCF5CC85CC65CCE5CDF5CF85DF9
-5E215E225E235E205E245EB05EA45EA25E9B5EA35EA55F075F2E5F565F866037
-603960546072605E6045605360476049605B604C60406042605F602460446058
-6066606E6242624362CF630D630B62F5630E630362EB62F9630F630C62F862F6
-63006313631462FA631562FB62F06541654365AA65BF6636662166326635661C
-662666226633662B663A661D66346639662E670F671067C167F267C867BA0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67DC67BB67F867D867C067B767C567EB67E467DF67B567CD67B367F767F667EE
-67E367C267B967CE67E767F067B267FC67C667ED67CC67AE67E667DB67FA67C9
-67CA67C367EA67CB6B286B826B846BB66BD66BD86BE06C206C216D286D346D2D
-6D1F6D3C6D3F6D126D0A6CDA6D336D046D196D3A6D1A6D116D006D1D6D420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D016D186D376D036D0F6D406D076D206D2C6D086D226D096D1070B7709F
-70BE70B170B070A170B470B570A972417249724A726C72707273726E72CA72E4
-72E872EB72DF72EA72E672E3738573CC73C273C873C573B973B673B573B473EB
-73BF73C773BE73C373C673B873CB74EC74EE752E7547754875A775AA767976C4
-7708770377047705770A76F776FB76FA77E777E878067811781278057810780F
-780E780978037813794A794C794B7945794479D579CD79CF79D679CE7A800000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A7E7AD17B007B017C7A7C787C797C7F7C807C817D037D087D017F587F917F8D
-7FBE8007800E800F8014803780D880C780E080D180C880C280D080C580E380D9
-80DC80CA80D580C980CF80D780E680CD81FF8221829482D982FE82F9830782E8
-830082D5833A82EB82D682F482EC82E182F282F5830C82FB82F682F082EA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000082E482E082FA82F382ED86778674867C86738841884E8867886A886989D3
-8A048A078D728FE38FE18FEE8FE090F190BD90BF90D590C590BE90C790CB90C8
-91D491D39654964F96519653964A964E501E50055007501350225030501B4FF5
-4FF450335037502C4FF64FF75017501C502050275035502F5031500E515A5194
-519351CA51C451C551C851CE5261525A5252525E525F5255526252CD530E539E
-552654E25517551254E754F354E4551A54FF5504550854EB5511550554F10000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-550A54FB54F754F854E0550E5503550B5701570257CC583257D557D257BA57C6
-57BD57BC57B857B657BF57C757D057B957C1590E594A5A195A165A2D5A2E5A15
-5A0F5A175A0A5A1E5A335B6C5BA75BAD5BAC5C035C565C545CEC5CFF5CEE5CF1
-5CF75D005CF95E295E285EA85EAE5EAA5EAC5F335F305F67605D605A60670000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000604160A26088608060926081609D60836095609B60976087609C608E6219
-624662F263106356632C634463456336634363E46339634B634A633C63296341
-6334635863546359632D63476333635A63516338635763406348654A654665C6
-65C365C465C2664A665F6647665167126713681F681A684968326833683B684B
-684F68166831681C6835682B682D682F684E68446834681D6812681468266828
-682E684D683A682568206B2C6B2F6B2D6B316B346B6D80826B886BE66BE40000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BE86BE36BE26BE76C256D7A6D636D646D766D0D6D616D926D586D626D6D6D6F
-6D916D8D6DEF6D7F6D866D5E6D676D606D976D706D7C6D5F6D826D986D2F6D68
-6D8B6D7E6D806D846D166D836D7B6D7D6D756D9070DC70D370D170DD70CB7F39
-70E270D770D270DE70E070D470CD70C570C670C770DA70CE70E1724272780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072777276730072FA72F472FE72F672F372FB730173D373D973E573D673BC
-73E773E373E973DC73D273DB73D473DD73DA73D773D873E874DE74DF74F474F5
-7521755B755F75B075C175BB75C475C075BF75B675BA768A76C9771D771B7710
-771377127723771177157719771A772277277823782C78227835782F7828782E
-782B782178297833782A78317954795B794F795C79537952795179EB79EC79E0
-79EE79ED79EA79DC79DE79DD7A867A897A857A8B7A8C7A8A7A877AD87B100000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7B047B137B057B0F7B087B0A7B0E7B097B127C847C917C8A7C8C7C887C8D7C85
-7D1E7D1D7D117D0E7D187D167D137D1F7D127D0F7D0C7F5C7F617F5E7F607F5D
-7F5B7F967F927FC37FC27FC08016803E803980FA80F280F980F5810180FB8100
-8201822F82258333832D83448319835183258356833F83418326831C83220000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008342834E831B832A8308833C834D8316832483208337832F832983478345
-834C8353831E832C834B832783488653865286A286A88696868D8691869E8687
-86978686868B869A868586A5869986A186A786958698868E869D869086948843
-8844886D88758876887288808871887F886F8883887E8874887C8A128C478C57
-8C7B8CA48CA38D768D788DB58DB78DB68ED18ED38FFE8FF590028FFF8FFB9004
-8FFC8FF690D690E090D990DA90E390DF90E590D890DB90D790DC90E491500000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-914E914F91D591E291DA965C965F96BC98E39ADF9B2F4E7F5070506A5061505E
-50605053504B505D50725048504D5041505B504A506250155045505F5069506B
-5063506450465040506E50735057505151D0526B526D526C526E52D652D3532D
-539C55755576553C554D55505534552A55515562553655355530555255450000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000550C55325565554E55395548552D553B5540554B570A570757FB581457E2
-57F657DC57F4580057ED57FD580857F8580B57F357CF580757EE57E357F257E5
-57EC57E1580E57FC581057E75801580C57F157E957F0580D5804595C5A605A58
-5A555A675A5E5A385A355A6D5A505A5F5A655A6C5A535A645A575A435A5D5A52
-5A445A5B5A485A8E5A3E5A4D5A395A4C5A705A695A475A515A565A425A5C5B72
-5B6E5BC15BC05C595D1E5D0B5D1D5D1A5D205D0C5D285D0D5D265D255D0F0000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D305D125D235D1F5D2E5E3E5E345EB15EB45EB95EB25EB35F365F385F9B5F96
-5F9F608A6090608660BE60B060BA60D360D460CF60E460D960DD60C860B160DB
-60B760CA60BF60C360CD60C063326365638A6382637D63BD639E63AD639D6397
-63AB638E636F63876390636E63AF6375639C636D63AE637C63A4633B639F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006378638563816391638D6370655365CD66656661665B6659665C66626718
-687968876890689C686D686E68AE68AB6956686F68A368AC68A96875687468B2
-688F68776892687C686B687268AA68806871687E689B6896688B68A0688968A4
-6878687B6891688C688A687D6B366B336B376B386B916B8F6B8D6B8E6B8C6C2A
-6DC06DAB6DB46DB36E746DAC6DE96DE26DB76DF66DD46E006DC86DE06DDF6DD6
-6DBE6DE56DDC6DDD6DDB6DF46DCA6DBD6DED6DF06DBA6DD56DC26DCF6DC90000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6DD06DF26DD36DFD6DD76DCD6DE36DBB70FA710D70F7711770F4710C70F07104
-70F3711070FC70FF71067113710070F870F6710B7102710E727E727B727C727F
-731D7317730773117318730A730872FF730F731E738873F673F873F574047401
-73FD7407740073FA73FC73FF740C740B73F474087564756375CE75D275CF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075CB75CC75D175D0768F768976D37739772F772D7731773277347733773D
-7725773B7735784878527849784D784A784C782678457850796479677969796A
-7963796B796179BB79FA79F879F679F77A8F7A947A907B357B477B347B257B30
-7B227B247B337B187B2A7B1D7B317B2B7B2D7B2F7B327B387B1A7B237C947C98
-7C967CA37D357D3D7D387D367D3A7D457D2C7D297D417D477D3E7D3F7D4A7D3B
-7D287F637F957F9C7F9D7F9B7FCA7FCB7FCD7FD07FD17FC77FCF7FC9801F0000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-801E801B804780438048811881258119811B812D811F812C811E812181158127
-811D8122821182388233823A823482328274839083A383A8838D837A837383A4
-8374838F8381839583998375839483A9837D8383838C839D839B83AA838B837E
-83A583AF8388839783B0837F83A6838783AE8376839A8659865686BF86B70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000086C286C186C586BA86B086C886B986B386B886CC86B486BB86BC86C386BD
-86BE88528889889588A888A288AA889A889188A1889F889888A78899889B8897
-88A488AC888C8893888E898289D689D989D58A308A278A2C8A1E8C398C3B8C5C
-8C5D8C7D8CA58D7D8D7B8D798DBC8DC28DB98DBF8DC18ED88EDE8EDD8EDC8ED7
-8EE08EE19024900B9011901C900C902190EF90EA90F090F490F290F390D490EB
-90EC90E991569158915A9153915591EC91F491F191F391F891E491F991EA0000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-91EB91F791E891EE957A95869588967C966D966B9671966F96BF976A980498E5
-9997509B50955094509E508B50A35083508C508E509D5068509C509250825087
-515F51D45312531153A453A7559155A855A555AD5577564555A255935588558F
-55B5558155A3559255A4557D558C55A6557F559555A1558E570C582958370000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005819581E58275823582857F558485825581C581B5833583F5836582E5839
-5838582D582C583B59615AAF5A945A9F5A7A5AA25A9E5A785AA65A7C5AA55AAC
-5A955AAE5A375A845A8A5A975A835A8B5AA95A7B5A7D5A8C5A9C5A8F5A935A9D
-5BEA5BCD5BCB5BD45BD15BCA5BCE5C0C5C305D375D435D6B5D415D4B5D3F5D35
-5D515D4E5D555D335D3A5D525D3D5D315D595D425D395D495D385D3C5D325D36
-5D405D455E445E415F585FA65FA55FAB60C960B960CC60E260CE60C461140000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60F2610A6116610560F5611360F860FC60FE60C161036118611D611060FF6104
-610B624A639463B163B063CE63E563E863EF63C3649D63F363CA63E063F663D5
-63F263F5646163DF63BE63DD63DC63C463D863D363C263C763CC63CB63C863F0
-63D763D965326567656A6564655C65686565658C659D659E65AE65D065D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000667C666C667B668066716679666A66726701690C68D3690468DC692A68EC
-68EA68F1690F68D668F768EB68E468F66913691068F368E1690768CC69086970
-68B4691168EF68C6691468F868D068FD68FC68E8690B690A691768CE68C868DD
-68DE68E668F468D1690668D468E96915692568C76B396B3B6B3F6B3C6B946B97
-6B996B956BBD6BF06BF26BF36C306DFC6E466E476E1F6E496E886E3C6E3D6E45
-6E626E2B6E3F6E416E5D6E736E1C6E336E4B6E406E516E3B6E036E2E6E5E0000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E686E5C6E616E316E286E606E716E6B6E396E226E306E536E656E276E786E64
-6E776E556E796E526E666E356E366E5A7120711E712F70FB712E713171237125
-71227132711F7128713A711B724B725A7288728972867285728B7312730B7330
-73227331733373277332732D732673237335730C742E742C7430742B74160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000741A7421742D743174247423741D74297420743274FB752F756F756C75E7
-75DA75E175E675DD75DF75E475D77695769276DA774677477744774D7745774A
-774E774B774C77DE77EC786078647865785C786D7871786A786E787078697868
-785E786279747973797279707A027A0A7A037A0C7A047A997AE67AE47B4A7B3B
-7B447B487B4C7B4E7B407B587B457CA27C9E7CA87CA17D587D6F7D637D537D56
-7D677D6A7D4F7D6D7D5C7D6B7D527D547D697D517D5F7D4E7F3E7F3F7F650000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7F667FA27FA07FA17FD78051804F805080FE80D48143814A8152814F8147813D
-814D813A81E681EE81F781F881F98204823C823D823F8275833B83CF83F98423
-83C083E8841283E783E483FC83F6841083C683C883EB83E383BF840183DD83E5
-83D883FF83E183CB83CE83D683F583C98409840F83DE8411840683C283F30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000083D583FA83C783D183EA841383C383EC83EE83C483FB83D783E2841B83DB
-83FE86D886E286E686D386E386DA86EA86DD86EB86DC86EC86E986D786E886D1
-88488856885588BA88D788B988B888C088BE88B688BC88B788BD88B2890188C9
-89958998899789DD89DA89DB8A4E8A4D8A398A598A408A578A588A448A458A52
-8A488A518A4A8A4C8A4F8C5F8C818C808CBA8CBE8CB08CB98CB58D848D808D89
-8DD88DD38DCD8DC78DD68DDC8DCF8DD58DD98DC88DD78DC58EEF8EF78EFA0000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8EF98EE68EEE8EE58EF58EE78EE88EF68EEB8EF18EEC8EF48EE9902D9034902F
-9106912C910490FF90FC910890F990FB9101910091079105910391619164915F
-916291609201920A92259203921A9226920F920C9200921291FF91FD92069204
-92279202921C92249219921792059216957B958D958C95909687967E96880000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000096899683968096C296C896C396F196F0976C9770976E980798A998EB9CE6
-9EF94E834E844EB650BD50BF50C650AE50C450CA50B450C850C250B050C150BA
-50B150CB50C950B650B851D7527A5278527B527C55C355DB55CC55D055CB55CA
-55DD55C055D455C455E955BF55D2558D55CF55D555E255D655C855F255CD55D9
-55C25714585358685864584F584D5849586F5855584E585D58595865585B583D
-5863587158FC5AC75AC45ACB5ABA5AB85AB15AB55AB05ABF5AC85ABB5AC60000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5AB75AC05ACA5AB45AB65ACD5AB95A905BD65BD85BD95C1F5C335D715D635D4A
-5D655D725D6C5D5E5D685D675D625DF05E4F5E4E5E4A5E4D5E4B5EC55ECC5EC6
-5ECB5EC75F405FAF5FAD60F76149614A612B614561366132612E6146612F614F
-612961406220916862236225622463C563F163EB641064126409642064240000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064336443641F641564186439643764226423640C64266430642864416435
-642F640A641A644064256427640B63E7641B642E6421640E656F659265D36686
-668C66956690668B668A66996694667867206966695F6938694E69626971693F
-6945696A6939694269576959697A694869496935696C6933693D696568F06978
-693469696940696F69446976695869416974694C693B694B6937695C694F6951
-69326952692F697B693C6B466B456B436B426B486B416B9BFA0D6BFB6BFC0000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BF96BF76BF86E9B6ED66EC86E8F6EC06E9F6E936E946EA06EB16EB96EC66ED2
-6EBD6EC16E9E6EC96EB76EB06ECD6EA66ECF6EB26EBE6EC36EDC6ED86E996E92
-6E8E6E8D6EA46EA16EBF6EB36ED06ECA6E976EAE6EA371477154715271637160
-7141715D716271727178716A7161714271587143714B7170715F715071530000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007144714D715A724F728D728C72917290728E733C7342733B733A7340734A
-73497444744A744B7452745174577440744F7450744E74427446744D745474E1
-74FF74FE74FD751D75797577698375EF760F760375F775FE75FC75F975F87610
-75FB75F675ED75F575FD769976B576DD7755775F776077527756775A77697767
-77547759776D77E07887789A7894788F788478957885788678A1788378797899
-78807896787B797C7982797D79797A117A187A197A127A177A157A227A130000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A1B7A107AA37AA27A9E7AEB7B667B647B6D7B747B697B727B657B737B717B70
-7B617B787B767B637CB27CB47CAF7D887D867D807D8D7D7F7D857D7A7D8E7D7B
-7D837D7C7D8C7D947D847D7D7D927F6D7F6B7F677F687F6C7FA67FA57FA77FDB
-7FDC8021816481608177815C8169815B816281726721815E81768167816F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081448161821D8249824482408242824584F1843F845684768479848F848D
-846584518440848684678430844D847D845A845984748473845D8507845E8437
-843A8434847A8443847884328445842983D9844B842F8442842D845F84708439
-844E844C8452846F84C5848E843B8447843684338468847E8444842B84608454
-846E8450870B870486F7870C86FA86D686F5874D86F8870E8709870186F6870D
-870588D688CB88CD88CE88DE88DB88DA88CC88D08985899B89DF89E589E40000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89E189E089E289DC89E68A768A868A7F8A618A3F8A778A828A848A758A838A81
-8A748A7A8C3C8C4B8C4A8C658C648C668C868C848C858CCC8D688D698D918D8C
-8D8E8D8F8D8D8D938D948D908D928DF08DE08DEC8DF18DEE8DD08DE98DE38DE2
-8DE78DF28DEB8DF48F068EFF8F018F008F058F078F088F028F0B9052903F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090449049903D9110910D910F911191169114910B910E916E916F92489252
-9230923A926692339265925E9283922E924A9246926D926C924F92609267926F
-92369261927092319254926392509272924E9253924C92569232959F959C959E
-959B969296939691969796CE96FA96FD96F896F59773977797789772980F980D
-980E98AC98F698F999AF99B299B099B59AAD9AAB9B5B9CEA9CED9CE79E809EFD
-50E650D450D750E850F350DB50EA50DD50E450D350EC50F050EF50E350E00000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51D85280528152E952EB533053AC56275615560C561255FC560F561C56015613
-560255FA561D560455FF55F95889587C5890589858865881587F5874588B587A
-58875891588E587658825888587B5894588F58FE596B5ADC5AEE5AE55AD55AEA
-5ADA5AED5AEB5AF35AE25AE05ADB5AEC5ADE5ADD5AD95AE85ADF5B775BE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005BE35C635D825D805D7D5D865D7A5D815D775D8A5D895D885D7E5D7C5D8D
-5D795D7F5E585E595E535ED85ED15ED75ECE5EDC5ED55ED95ED25ED45F445F43
-5F6F5FB6612C61286141615E61716173615261536172616C618061746154617A
-615B6165613B616A6161615662296227622B642B644D645B645D647464766472
-6473647D6475646664A6644E6482645E645C644B645364606450647F643F646C
-646B645964656477657365A066A166A0669F67056704672269B169B669C90000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69A069CE699669B069AC69BC69916999698E69A7698D69A969BE69AF69BF69C4
-69BD69A469D469B969CA699A69CF69B3699369AA69A1699E69D96997699069C2
-69B569A569C66B4A6B4D6B4B6B9E6B9F6BA06BC36BC46BFE6ECE6EF56EF16F03
-6F256EF86F376EFB6F2E6F096F4E6F196F1A6F276F186F3B6F126EED6F0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F366F736EF96EEE6F2D6F406F306F3C6F356EEB6F076F0E6F436F056EFD
-6EF66F396F1C6EFC6F3A6F1F6F0D6F1E6F086F21718771907189718071857182
-718F717B718671817197724472537297729572937343734D7351734C74627473
-7471747574727467746E750075027503757D759076167608760C76157611760A
-761476B87781777C77857782776E7780776F777E778378B278AA78B478AD78A8
-787E78AB789E78A578A078AC78A278A47998798A798B79967995799479930000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-79977988799279907A2B7A4A7A307A2F7A287A267AA87AAB7AAC7AEE7B887B9C
-7B8A7B917B907B967B8D7B8C7B9B7B8E7B857B9852847B997BA47B827CBB7CBF
-7CBC7CBA7DA77DB77DC27DA37DAA7DC17DC07DC57D9D7DCE7DC47DC67DCB7DCC
-7DAF7DB97D967DBC7D9F7DA67DAE7DA97DA17DC97F737FE27FE37FE57FDE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008024805D805C8189818681838187818D818C818B8215849784A484A1849F
-84BA84CE84C284AC84AE84AB84B984B484C184CD84AA849A84B184D0849D84A7
-84BB84A2849484C784CC849B84A984AF84A884D6849884B684CF84A084D784D4
-84D284DB84B084918661873387238728876B8740872E871E87218719871B8743
-872C8741873E874687208732872A872D873C8712873A87318735874287268727
-87388724871A8730871188F788E788F188F288FA88FE88EE88FC88F688FB0000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-88F088EC88EB899D89A1899F899E89E989EB89E88AAB8A998A8B8A928A8F8A96
-8C3D8C688C698CD58CCF8CD78D968E098E028DFF8E0D8DFD8E0A8E038E078E06
-8E058DFE8E008E048F108F118F0E8F0D9123911C91209122911F911D911A9124
-9121911B917A91729179917392A592A49276929B927A92A0929492AA928D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000092A6929A92AB92799297927F92A392EE928E9282929592A2927D928892A1
-928A9286928C929992A7927E928792A9929D928B922D969E96A196FF9758977D
-977A977E978397809782977B97849781977F97CE97CD981698AD98AE99029900
-9907999D999C99C399B999BB99BA99C299BD99C79AB19AE39AE79B3E9B3F9B60
-9B619B5F9CF19CF29CF59EA750FF5103513050F85106510750F650FE510B510C
-50FD510A528B528C52F152EF56485642564C56355641564A5649564656580000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-565A56405633563D562C563E5638562A563A571A58AB589D58B158A058A358AF
-58AC58A558A158FF5AFF5AF45AFD5AF75AF65B035AF85B025AF95B015B075B05
-5B0F5C675D995D975D9F5D925DA25D935D955DA05D9C5DA15D9A5D9E5E695E5D
-5E605E5C7DF35EDB5EDE5EE15F495FB2618B6183617961B161B061A261890000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000619B619361AF61AD619F619261AA61A1618D616661B3622D646E64706496
-64A064856497649C648F648B648A648C64A3649F646864B164986576657A6579
-657B65B265B366B566B066A966B266B766AA66AF6A006A066A1769E569F86A15
-69F169E46A2069FF69EC69E26A1B6A1D69FE6A2769F269EE6A1469F769E76A40
-6A0869E669FB6A0D69FC69EB6A096A046A186A256A0F69F66A266A0769F46A16
-6B516BA56BA36BA26BA66C016C006BFF6C026F416F266F7E6F876FC66F920000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F8D6F896F8C6F626F4F6F856F5A6F966F766F6C6F826F556F726F526F506F57
-6F946F936F5D6F006F616F6B6F7D6F676F906F536F8B6F696F7F6F956F636F77
-6F6A6F7B71B271AF719B71B071A0719A71A971B5719D71A5719E71A471A171AA
-719C71A771B37298729A73587352735E735F7360735D735B7361735A73590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000736274877489748A74867481747D74857488747C747975087507757E7625
-761E7619761D761C7623761A7628761B769C769D769E769B778D778F77897788
-78CD78BB78CF78CC78D178CE78D478C878C378C478C9799A79A179A0799C79A2
-799B6B767A397AB27AB47AB37BB77BCB7BBE7BAC7BCE7BAF7BB97BCA7BB57CC5
-7CC87CCC7CCB7DF77DDB7DEA7DE77DD77DE17E037DFA7DE67DF67DF17DF07DEE
-7DDF7F767FAC7FB07FAD7FED7FEB7FEA7FEC7FE67FE88064806781A3819F0000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-819E819581A2819981978216824F825382528250824E82518524853B850F8500
-8529850E8509850D851F850A8527851C84FB852B84FA8508850C84F4852A84F2
-851584F784EB84F384FC851284EA84E9851684FE8528851D852E850284FD851E
-84F68531852684E784E884F084EF84F9851885208530850B8519852F86620000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000875687638764877787E1877387588754875B87528761875A8751875E876D
-876A8750874E875F875D876F876C877A876E875C8765874F877B877587628767
-8769885A8905890C8914890B891789188919890689168911890E890989A289A4
-89A389ED89F089EC8ACF8AC68AB88AD38AD18AD48AD58ABB8AD78ABE8AC08AC5
-8AD88AC38ABA8ABD8AD98C3E8C4D8C8F8CE58CDF8CD98CE88CDA8CDD8CE78DA0
-8D9C8DA18D9B8E208E238E258E248E2E8E158E1B8E168E118E198E268E270000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E148E128E188E138E1C8E178E1A8F2C8F248F188F1A8F208F238F168F179073
-9070906F9067906B912F912B9129912A91329126912E91859186918A91819182
-9184918092D092C392C492C092D992B692CF92F192DF92D892E992D792DD92CC
-92EF92C292E892CA92C892CE92E692CD92D592C992E092DE92E792D192D30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000092B592E192C692B4957C95AC95AB95AE95B096A496A296D3970597089702
-975A978A978E978897D097CF981E981D9826982998289820981B982798B29908
-98FA9911991499169917991599DC99CD99CF99D399D499CE99C999D699D899CB
-99D799CC9AB39AEC9AEB9AF39AF29AF19B469B439B679B749B719B669B769B75
-9B709B689B649B6C9CFC9CFA9CFD9CFF9CF79D079D009CF99CFB9D089D059D04
-9E839ED39F0F9F10511C51135117511A511151DE533453E156705660566E0000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-567356665663566D5672565E5677571C571B58C858BD58C958BF58BA58C258BC
-58C65B175B195B1B5B215B145B135B105B165B285B1A5B205B1E5BEF5DAC5DB1
-5DA95DA75DB55DB05DAE5DAA5DA85DB25DAD5DAF5DB45E675E685E665E6F5EE9
-5EE75EE65EE85EE55F4B5FBC619D61A8619661C561B461C661C161CC61BA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000061BF61B8618C64D764D664D064CF64C964BD648964C364DB64F364D96533
-657F657C65A266C866BE66C066CA66CB66CF66BD66BB66BA66CC67236A346A66
-6A496A676A326A686A3E6A5D6A6D6A766A5B6A516A286A5A6A3B6A3F6A416A6A
-6A646A506A4F6A546A6F6A696A606A3C6A5E6A566A556A4D6A4E6A466B556B54
-6B566BA76BAA6BAB6BC86BC76C046C036C066FAD6FCB6FA36FC76FBC6FCE6FC8
-6F5E6FC46FBD6F9E6FCA6FA870046FA56FAE6FBA6FAC6FAA6FCF6FBF6FB80000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6FA26FC96FAB6FCD6FAF6FB26FB071C571C271BF71B871D671C071C171CB71D4
-71CA71C771CF71BD71D871BC71C671DA71DB729D729E736973667367736C7365
-736B736A747F749A74A074947492749574A1750B7580762F762D7631763D7633
-763C76357632763076BB76E6779A779D77A1779C779B77A277A3779577990000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000779778DD78E978E578EA78DE78E378DB78E178E278ED78DF78E079A47A44
-7A487A477AB67AB87AB57AB17AB77BDE7BE37BE77BDD7BD57BE57BDA7BE87BF9
-7BD47BEA7BE27BDC7BEB7BD87BDF7CD27CD47CD77CD07CD17E127E217E177E0C
-7E1F7E207E137E0E7E1C7E157E1A7E227E0B7E0F7E167E0D7E147E257E247F43
-7F7B7F7C7F7A7FB17FEF802A8029806C81B181A681AE81B981B581AB81B081AC
-81B481B281B781A781F282558256825785568545856B854D8553856185580000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-854085468564854185628544855185478563853E855B8571854E856E85758555
-85678560858C8566855D85548565856C866386658664879B878F879787938792
-87888781879687988779878787A3878587908791879D87848794879C879A8789
-891E89268930892D892E89278931892289298923892F892C891F89F18AE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AE28AF28AF48AF58ADD8B148AE48ADF8AF08AC88ADE8AE18AE88AFF8AEF
-8AFB8C918C928C908CF58CEE8CF18CF08CF38D6C8D6E8DA58DA78E338E3E8E38
-8E408E458E368E3C8E3D8E418E308E3F8EBD8F368F2E8F358F328F398F378F34
-90769079907B908690FA913391359136919391909191918D918F9327931E9308
-931F9306930F937A9338933C931B9323931293019346932D930E930D92CB931D
-92FA9325931392F992F793349302932492FF932993399335932A9314930C0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-930B92FE9309930092FB931695BC95CD95BE95B995BA95B695BF95B595BD96A9
-96D4970B9712971097999797979497F097F89835982F98329924991F99279929
-999E99EE99EC99E599E499F099E399EA99E999E79AB99ABF9AB49ABB9AF69AFA
-9AF99AF79B339B809B859B879B7C9B7E9B7B9B829B939B929B909B7A9B950000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B7D9B889D259D179D209D1E9D149D299D1D9D189D229D109D199D1F9E88
-9E869E879EAE9EAD9ED59ED69EFA9F129F3D51265125512251245120512952F4
-5693568C568D568656845683567E5682567F568158D658D458CF58D25B2D5B25
-5B325B235B2C5B275B265B2F5B2E5B7B5BF15BF25DB75E6C5E6A5FBE5FBB61C3
-61B561BC61E761E061E561E461E861DE64EF64E964E364EB64E464E865816580
-65B665DA66D26A8D6A966A816AA56A896A9F6A9B6AA16A9E6A876A936A8E0000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A956A836AA86AA46A916A7F6AA66A9A6A856A8C6A926B5B6BAD6C096FCC6FA9
-6FF46FD46FE36FDC6FED6FE76FE66FDE6FF26FDD6FE26FE871E171F171E871F2
-71E471F071E27373736E736F749774B274AB749074AA74AD74B174A574AF7510
-75117512750F7584764376487649764776A476E977B577AB77B277B777B60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077B477B177A877F078F378FD790278FB78FC78F2790578F978FE790479AB
-79A87A5C7A5B7A567A587A547A5A7ABE7AC07AC17C057C0F7BF27C007BFF7BFB
-7C0E7BF47C0B7BF37C027C097C037C017BF87BFD7C067BF07BF17C107C0A7CE8
-7E2D7E3C7E427E3398487E387E2A7E497E407E477E297E4C7E307E3B7E367E44
-7E3A7F457F7F7F7E7F7D7FF47FF2802C81BB81C481CC81CA81C581C781BC81E9
-825B825A825C85838580858F85A7859585A0858B85A3857B85A4859A859E0000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8577857C858985A1857A85788557858E85968586858D8599859D858185A28582
-858885858579857685988590859F866887BE87AA87AD87C587B087AC87B987B5
-87BC87AE87C987C387C287CC87B787AF87C487CA87B487B687BF87B887BD87DE
-87B289358933893C893E894189528937894289AD89AF89AE89F289F38B1E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B188B168B118B058B0B8B228B0F8B128B158B078B0D8B088B068B1C8B13
-8B1A8C4F8C708C728C718C6F8C958C948CF98D6F8E4E8E4D8E538E508E4C8E47
-8F438F409085907E9138919A91A2919B9199919F91A1919D91A093A1938393AF
-936493569347937C9358935C93769349935093519360936D938F934C936A9379
-935793559352934F93719377937B9361935E936393679380934E935995C795C0
-95C995C395C595B796AE96B096AC9720971F9718971D9719979A97A1979C0000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-979E979D97D597D497F198419844984A9849984598439925992B992C992A9933
-9932992F992D99319930999899A399A19A0299FA99F499F799F999F899F699FB
-99FD99FE99FC9A039ABE9AFE9AFD9B019AFC9B489B9A9BA89B9E9B9B9BA69BA1
-9BA59BA49B869BA29BA09BAF9D339D419D679D369D2E9D2F9D319D389D300000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D459D429D439D3E9D379D409D3D7FF59D2D9E8A9E899E8D9EB09EC89EDA
-9EFB9EFF9F249F239F229F549FA05131512D512E5698569C5697569A569D5699
-59705B3C5C695C6A5DC05E6D5E6E61D861DF61ED61EE61F161EA61F061EB61D6
-61E964FF650464FD64F86501650364FC659465DB66DA66DB66D86AC56AB96ABD
-6AE16AC66ABA6AB66AB76AC76AB46AAD6B5E6BC96C0B7007700C700D70017005
-7014700E6FFF70006FFB70266FFC6FF7700A720171FF71F9720371FD73760000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74B874C074B574C174BE74B674BB74C275147513765C76647659765076537657
-765A76A676BD76EC77C277BA78FF790C79137914790979107912791179AD79AC
-7A5F7C1C7C297C197C207C1F7C2D7C1D7C267C287C227C257C307E5C7E507E56
-7E637E587E627E5F7E517E607E577E537FB57FB37FF77FF8807581D181D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081D0825F825E85B485C685C085C385C285B385B585BD85C785C485BF85CB
-85CE85C885C585B185B685D2862485B885B785BE866987E787E687E287DB87EB
-87EA87E587DF87F387E487D487DC87D387ED87D887E387A487D787D9880187F4
-87E887DD8953894B894F894C89468950895189498B2A8B278B238B338B308B35
-8B478B2F8B3C8B3E8B318B258B378B268B368B2E8B248B3B8B3D8B3A8C428C75
-8C998C988C978CFE8D048D028D008E5C8E628E608E578E568E5E8E658E670000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E5B8E5A8E618E5D8E698E548F468F478F488F4B9128913A913B913E91A891A5
-91A791AF91AA93B5938C939293B7939B939D938993A7938E93AA939E93A69395
-93889399939F938D93B1939193B293A493A893B493A393A595D295D395D196B3
-96D796DA5DC296DF96D896DD97239722972597AC97AE97A897AB97A497AA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000097A297A597D797D997D697D897FA98509851985298B89941993C993A9A0F
-9A0B9A099A0D9A049A119A0A9A059A079A069AC09ADC9B089B049B059B299B35
-9B4A9B4C9B4B9BC79BC69BC39BBF9BC19BB59BB89BD39BB69BC49BB99BBD9D5C
-9D539D4F9D4A9D5B9D4B9D599D569D4C9D579D529D549D5F9D589D5A9E8E9E8C
-9EDF9F019F009F169F259F2B9F2A9F299F289F4C9F5551345135529652F753B4
-56AB56AD56A656A756AA56AC58DA58DD58DB59125B3D5B3E5B3F5DC35E700000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5FBF61FB65076510650D6509650C650E658465DE65DD66DE6AE76AE06ACC6AD1
-6AD96ACB6ADF6ADC6AD06AEB6ACF6ACD6ADE6B606BB06C0C7019702770207016
-702B702170227023702970177024701C702A720C720A72077202720572A572A6
-72A472A372A174CB74C574B774C37516766077C977CA77C477F1791D791B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007921791C7917791E79B07A677A687C337C3C7C397C2C7C3B7CEC7CEA7E76
-7E757E787E707E777E6F7E7A7E727E747E687F4B7F4A7F837F867FB77FFD7FFE
-807881D781D582648261826385EB85F185ED85D985E185E885DA85D785EC85F2
-85F885D885DF85E385DC85D185F085E685EF85DE85E2880087FA880387F687F7
-8809880C880B880687FC880887FF880A88028962895A895B89578961895C8958
-895D8959898889B789B689F68B508B488B4A8B408B538B568B548B4B8B550000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B518B428B528B578C438C778C768C9A8D068D078D098DAC8DAA8DAD8DAB8E6D
-8E788E738E6A8E6F8E7B8EC28F528F518F4F8F508F538FB49140913F91B091AD
-93DE93C793CF93C293DA93D093F993EC93CC93D993A993E693CA93D493EE93E3
-93D593C493CE93C093D293E7957D95DA95DB96E19729972B972C972897260000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000097B397B797B697DD97DE97DF985C9859985D985798BF98BD98BB98BE9948
-9947994399A699A79A1A9A159A259A1D9A249A1B9A229A209A279A239A1E9A1C
-9A149AC29B0B9B0A9B0E9B0C9B379BEA9BEB9BE09BDE9BE49BE69BE29BF09BD4
-9BD79BEC9BDC9BD99BE59BD59BE19BDA9D779D819D8A9D849D889D719D809D78
-9D869D8B9D8C9D7D9D6B9D749D759D709D699D859D739D7B9D829D6F9D799D7F
-9D879D689E949E919EC09EFC9F2D9F409F419F4D9F569F579F58533756B20000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56B556B358E35B455DC65DC75EEE5EEF5FC05FC161F9651765166515651365DF
-66E866E366E46AF36AF06AEA6AE86AF96AF16AEE6AEF703C7035702F70377034
-703170427038703F703A70397040703B703370417213721472A8737D737C74BA
-76AB76AA76BE76ED77CC77CE77CF77CD77F27925792379277928792479290000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079B27A6E7A6C7A6D7AF77C497C487C4A7C477C457CEE7E7B7E7E7E817E80
-7FBA7FFF807981DB81D9820B82688269862285FF860185FE861B860085F68604
-86098605860C85FD8819881088118817881388168963896689B989F78B608B6A
-8B5D8B688B638B658B678B6D8DAE8E868E888E848F598F568F578F558F588F5A
-908D9143914191B791B591B291B3940B941393FB9420940F941493FE94159410
-94289419940D93F5940093F79407940E9416941293FA940993F8940A93FF0000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93FC940C93F69411940695DE95E095DF972E972F97B997BB97FD97FE98609862
-9863985F98C198C29950994E9959994C994B99539A329A349A319A2C9A2A9A36
-9A299A2E9A389A2D9AC79ACA9AC69B109B129B119C0B9C089BF79C059C129BF8
-9C409C079C0E9C069C179C149C099D9F9D999DA49D9D9D929D989D909D9B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009DA09D949D9C9DAA9D979DA19D9A9DA29DA89D9E9DA39DBF9DA99D969DA6
-9DA79E999E9B9E9A9EE59EE49EE79EE69F309F2E9F5B9F609F5E9F5D9F599F91
-513A51395298529756C356BD56BE5B485B475DCB5DCF5EF161FD651B6B026AFC
-6B036AF86B0070437044704A7048704970457046721D721A7219737E7517766A
-77D0792D7931792F7C547C537CF27E8A7E877E887E8B7E867E8D7F4D7FBB8030
-81DD8618862A8626861F8623861C86198627862E862186208629861E86250000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8829881D881B88208824881C882B884A896D8969896E896B89FA8B798B788B45
-8B7A8B7B8D108D148DAF8E8E8E8C8F5E8F5B8F5D91469144914591B9943F943B
-94369429943D943C94309439942A9437942C9440943195E595E495E39735973A
-97BF97E1986498C998C698C0995899569A399A3D9A469A449A429A419A3A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009A3F9ACD9B159B179B189B169B3A9B529C2B9C1D9C1C9C2C9C239C289C29
-9C249C219DB79DB69DBC9DC19DC79DCA9DCF9DBE9DC59DC39DBB9DB59DCE9DB9
-9DBA9DAC9DC89DB19DAD9DCC9DB39DCD9DB29E7A9E9C9EEB9EEE9EED9F1B9F18
-9F1A9F319F4E9F659F649F924EB956C656C556CB59715B4B5B4C5DD55DD15EF2
-65216520652665226B0B6B086B096C0D7055705670577052721E721F72A9737F
-74D874D574D974D7766D76AD793579B47A707A717C577C5C7C597C5B7C5A0000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7CF47CF17E917F4F7F8781DE826B863486358633862C86328636882C88288826
-882A8825897189BF89BE89FB8B7E8B848B828B868B858B7F8D158E958E948E9A
-8E928E908E968E978F608F629147944C9450944A944B944F9447944594489449
-9446973F97E3986A986998CB9954995B9A4E9A539A549A4C9A4F9A489A4A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009A499A529A509AD09B199B2B9B3B9B569B559C469C489C3F9C449C399C33
-9C419C3C9C379C349C329C3D9C369DDB9DD29DDE9DDA9DCB9DD09DDC9DD19DDF
-9DE99DD99DD89DD69DF59DD59DDD9EB69EF09F359F339F329F429F6B9F959FA2
-513D529958E858E759725B4D5DD8882F5F4F62016203620465296525659666EB
-6B116B126B0F6BCA705B705A7222738273817383767077D47C677C667E95826C
-863A86408639863C8631863B863E88308832882E883389768974897389FE0000
-F8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B8C8B8E8B8B8B888C458D198E988F648F6391BC94629455945D9457945E97C4
-97C598009A569A599B1E9B1F9B209C529C589C509C4A9C4D9C4B9C559C599C4C
-9C4E9DFB9DF79DEF9DE39DEB9DF89DE49DF69DE19DEE9DE69DF29DF09DE29DEC
-9DF49DF39DE89DED9EC29ED09EF29EF39F069F1C9F389F379F369F439F4F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009F719F709F6E9F6F56D356CD5B4E5C6D652D66ED66EE6B13705F7061705D
-7060722374DB74E577D5793879B779B67C6A7E977F89826D8643883888378835
-884B8B948B958E9E8E9F8EA08E9D91BE91BD91C2946B9468946996E597469743
-974797C797E59A5E9AD59B599C639C679C669C629C5E9C609E029DFE9E079E03
-9E069E059E009E019E099DFF9DFD9E049EA09F1E9F469F749F759F7656D4652E
-65B86B186B196B176B1A7062722672AA77D877D979397C697C6B7CF67E9A0000
-F9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E987E9B7E9981E081E18646864786488979897A897C897B89FF8B988B998EA5
-8EA48EA3946E946D946F9471947397499872995F9C689C6E9C6D9E0B9E0D9E10
-9E0F9E129E119EA19EF59F099F479F789F7B9F7A9F79571E70667C6F883C8DB2
-8EA691C394749478947694759A609C749C739C719C759E149E139EF69F0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009FA4706870657CF7866A883E883D883F8B9E8C9C8EA98EC9974B98739874
-98CC996199AB9A649A669A679B249E159E179F4862076B1E7227864C8EA89482
-948094819A699A689B2E9E197229864B8B9F94839C799EB776759A6B9C7A9E1D
-7069706A9EA49F7E9F499F980000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/cp1250.enc b/library/encoding/cp1250.enc
deleted file mode 100644
index 934539a..0000000
--- a/library/encoding/cp1250.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1250, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0083201E2026202020210088203001602039015A0164017D0179
-009020182019201C201D202220132014009821220161203A015B0165017E017A
-00A002C702D8014100A4010400A600A700A800A9015E00AB000000AD00AE017B
-00B000B102DB014200B400B500B600B700B80105015F00BB013D02DD013E017C
-015400C100C2010200C40139010600C7010C00C9011800CB011A00CD00CE010E
-01100143014700D300D4015000D600D70158016E00DA017000DC00DD016200DF
-015500E100E2010300E4013A010700E7010D00E9011900EB011B00ED00EE010F
-01110144014800F300F4015100F600F70159016F00FA017100FC00FD016302D9
diff --git a/library/encoding/cp1251.enc b/library/encoding/cp1251.enc
deleted file mode 100644
index 7daed16..0000000
--- a/library/encoding/cp1251.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1251, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-04020403201A0453201E2026202020210088203004092039040A040C040B040F
-045220182019201C201D202220132014009821220459203A045A045C045B045F
-00A0040E045E040800A4049000A600A7040100A9040400AB00AC00AD00AE0407
-00B000B104060456049100B500B600B704512116045400BB0458040504550457
-0410041104120413041404150416041704180419041A041B041C041D041E041F
-0420042104220423042404250426042704280429042A042B042C042D042E042F
-0430043104320433043404350436043704380439043A043B043C043D043E043F
-0440044104420443044404450446044704480449044A044B044C044D044E044F
diff --git a/library/encoding/cp1252.enc b/library/encoding/cp1252.enc
deleted file mode 100644
index fe55a46..0000000
--- a/library/encoding/cp1252.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1252, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0192201E20262020202102C62030016020390152008D008E008F
-009020182019201C201D20222013201402DC21220161203A0153009D009E0178
-00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
-00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
-00D000D100D200D300D400D500D600D700D800D900DA00DB00DC00DD00DE00DF
-00E000E100E200E300E400E500E600E700E800E900EA00EB00EC00ED00EE00EF
-00F000F100F200F300F400F500F600F700F800F900FA00FB00FC00FD00FE00FF
diff --git a/library/encoding/cp1253.enc b/library/encoding/cp1253.enc
deleted file mode 100644
index a934bc9..0000000
--- a/library/encoding/cp1253.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1253, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0192201E20262020202100882030008A2039008C008D008E008F
-009020182019201C201D20222013201400982122009A203A009C009D009E009F
-00A00385038600A300A400A500A600A700A800A9000000AB00AC00AD00AE2015
-00B000B100B200B3038400B500B600B703880389038A00BB038C00BD038E038F
-0390039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A1000003A303A403A503A603A703A803A903AA03AB03AC03AD03AE03AF
-03B003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C203C303C403C503C603C703C803C903CA03CB03CC03CD03CE0000
diff --git a/library/encoding/cp1254.enc b/library/encoding/cp1254.enc
deleted file mode 100644
index d8553a2..0000000
--- a/library/encoding/cp1254.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1254, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0192201E20262020202102C62030016020390152008D008E008F
-009020182019201C201D20222013201402DC21220161203A0153009D009E0178
-00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
-00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
-011E00D100D200D300D400D500D600D700D800D900DA00DB00DC0130015E00DF
-00E000E100E200E300E400E500E600E700E800E900EA00EB00EC00ED00EE00EF
-011F00F100F200F300F400F500F600F700F800F900FA00FB00FC0131015F00FF
diff --git a/library/encoding/cp1255.enc b/library/encoding/cp1255.enc
deleted file mode 100644
index 275c016..0000000
--- a/library/encoding/cp1255.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1255, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0192201E20262020202102C62030008A2039008C008D008E008F
-009020182019201C201D20222013201402DC2122009A203A009C009D009E009F
-00A0000000A200A320AA00A500A600A700A800A9000000AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B7000000B9000000BB00BC00BD00BE0000
-05B005B105B205B305B405B505B605B705B805B905BA05BB05BC05BD05BE05BF
-05C005C105C205C305F005F105F2000000000000000000000000000000000000
-05D005D105D205D305D405D505D605D705D805D905DA05DB05DC05DD05DE05DF
-05E005E105E205E305E405E505E605E705E805E905EA00000000200E200F0000
diff --git a/library/encoding/cp1256.enc b/library/encoding/cp1256.enc
deleted file mode 100644
index 1a9d8a6..0000000
--- a/library/encoding/cp1256.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1256, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080067E201A0192201E20262020202102C62030008A2039015206860698008F
-06AF20182019201C201D20222013201400982122009A203A0153200C200D009F
-00A0060C00A200A300A400A500A600A700A800A9000000AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B9061B00BB00BC00BD00BE061F
-0000062106220623062406250626062706280629062A062B062C062D062E062F
-063006310632063306340635063600D7063706380639063A0640064106420643
-00E0064400E2064506460647064800E700E800E900EA00EB0649064A00EE00EF
-064B064C064D064E00F4064F065000F7065100F9065200FB00FC200E200F0000
diff --git a/library/encoding/cp1257.enc b/library/encoding/cp1257.enc
deleted file mode 100644
index 4aab0c6..0000000
--- a/library/encoding/cp1257.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1257, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0083201E20262020202100882030008A2039008C00A802C700B8
-009020182019201C201D20222013201400982122009A203A009C00AF02DB009F
-00A0000000A200A300A4000000A600A700D800A9015600AB00AC00AD00AE00C6
-00B000B100B200B300B400B500B600B700F800B9015700BB00BC00BD00BE00E6
-0104012E0100010600C400C501180112010C00C90179011601220136012A013B
-01600143014500D3014C00D500D600D701720141015A016A00DC017B017D00DF
-0105012F0101010700E400E501190113010D00E9017A011701230137012B013C
-01610144014600F3014D00F500F600F701730142015B016B00FC017C017E02D9
diff --git a/library/encoding/cp1258.enc b/library/encoding/cp1258.enc
deleted file mode 100644
index 8c1fce8..0000000
--- a/library/encoding/cp1258.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp1258, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00800081201A0192201E20262020202102C62030008A20390152008D008E008F
-009020182019201C201D20222013201402DC2122009A203A0153009D009E0178
-00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
-00C000C100C2010200C400C500C600C700C800C900CA00CB034000CD00CE00CF
-011000D1030900D300D401A000D600D700D800D900DA00DB00DC01AF030300DF
-00E000E100E2010300E400E500E600E700E800E900EA00EB034100ED00EE00EF
-011100F1032300F300F401A100F600F700F800F900FA00FB00FC01B020AB00FF
diff --git a/library/encoding/cp437.enc b/library/encoding/cp437.enc
deleted file mode 100644
index ecae4e6..0000000
--- a/library/encoding/cp437.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp437, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E400E000E500E700EA00EB00E800EF00EE00EC00C400C5
-00C900E600C600F400F600F200FB00F900FF00D600DC00A200A300A520A70192
-00E100ED00F300FA00F100D100AA00BA00BF231000AC00BD00BC00A100AB00BB
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp737.enc b/library/encoding/cp737.enc
deleted file mode 100644
index 5b59661..0000000
--- a/library/encoding/cp737.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp737, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-039103920393039403950396039703980399039A039B039C039D039E039F03A0
-03A103A303A403A503A603A703A803A903B103B203B303B403B503B603B703B8
-03B903BA03BB03BC03BD03BE03BF03C003C103C303C203C403C503C603C703C8
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03C903AC03AD03AE03CA03AF03CC03CD03CB03CE038603880389038A038C038E
-038F00B12265226403AA03AB00F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp775.enc b/library/encoding/cp775.enc
deleted file mode 100644
index 71b65c3..0000000
--- a/library/encoding/cp775.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp775, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-010600FC00E9010100E4012300E501070142011301560157012B017900C400C5
-00C900E600C6014D00F6012200A2015A015B00D600DC00F800A300D800D700A4
-0100012A00F3017B017C017A201D00A600A900AE00AC00BD00BC014100AB00BB
-259125922593250225240104010C01180116256325512557255D012E01602510
-25142534252C251C2500253C0172016A255A25542569256625602550256C017D
-0105010D01190117012F01610173016B017E2518250C25882584258C25902580
-00D300DF014C014300F500D500B5014401360137013B013C0146011201452019
-00AD00B1201C00BE00B600A700F7201E00B0221900B700B900B300B225A000A0
diff --git a/library/encoding/cp850.enc b/library/encoding/cp850.enc
deleted file mode 100644
index 4e7a90d..0000000
--- a/library/encoding/cp850.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp850, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E400E000E500E700EA00EB00E800EF00EE00EC00C400C5
-00C900E600C600F400F600F200FB00F900FF00D600DC00F800A300D800D70192
-00E100ED00F300FA00F100D100AA00BA00BF00AE00AC00BD00BC00A100AB00BB
-2591259225932502252400C100C200C000A9256325512557255D00A200A52510
-25142534252C251C2500253C00E300C3255A25542569256625602550256C00A4
-00F000D000CA00CB00C8013100CD00CE00CF2518250C2588258400A600CC2580
-00D300DF00D400D200F500D500B500FE00DE00DA00DB00D900FD00DD00AF00B4
-00AD00B1201700BE00B600A700F700B800B000A800B700B900B300B225A000A0
diff --git a/library/encoding/cp852.enc b/library/encoding/cp852.enc
deleted file mode 100644
index f34899e..0000000
--- a/library/encoding/cp852.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp852, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E4016F010700E7014200EB0150015100EE017900C40106
-00C90139013A00F400F6013D013E015A015B00D600DC01640165014100D7010D
-00E100ED00F300FA01040105017D017E0118011900AC017A010C015F00AB00BB
-2591259225932502252400C100C2011A015E256325512557255D017B017C2510
-25142534252C251C2500253C01020103255A25542569256625602550256C00A4
-01110110010E00CB010F014700CD00CE011B2518250C258825840162016E2580
-00D300DF00D401430144014801600161015400DA0155017000FD00DD016300B4
-00AD02DD02DB02C702D800A700F700B800B000A802D901710158015925A000A0
diff --git a/library/encoding/cp855.enc b/library/encoding/cp855.enc
deleted file mode 100644
index 4d58b86..0000000
--- a/library/encoding/cp855.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp855, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0452040204530403045104010454040404550405045604060457040704580408
-04590409045A040A045B040B045C040C045E040E045F040F044E042E044A042A
-0430041004310411044604260434041404350415044404240433041300AB00BB
-259125922593250225240445042504380418256325512557255D043904192510
-25142534252C251C2500253C043A041A255A25542569256625602550256C00A4
-043B041B043C041C043D041D043E041E043F2518250C25882584041F044F2580
-042F044004200441042104420422044304230436041604320412044C042C2116
-00AD044B042B0437041704480428044D042D044904290447042700A725A000A0
diff --git a/library/encoding/cp857.enc b/library/encoding/cp857.enc
deleted file mode 100644
index b42ed55..0000000
--- a/library/encoding/cp857.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp857, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E400E000E500E700EA00EB00E800EF00EE013100C400C5
-00C900E600C600F400F600F200FB00F9013000D600DC00F800A300D8015E015F
-00E100ED00F300FA00F100D1011E011F00BF00AE00AC00BD00BC00A100AB00BB
-2591259225932502252400C100C200C000A9256325512557255D00A200A52510
-25142534252C251C2500253C00E300C3255A25542569256625602550256C00A4
-00BA00AA00CA00CB00C8000000CD00CE00CF2518250C2588258400A600CC2580
-00D300DF00D400D200F500D500B5000000D700DA00DB00D900EC00FF00AF00B4
-00AD00B1000000BE00B600A700F700B800B000A800B700B900B300B225A000A0
diff --git a/library/encoding/cp860.enc b/library/encoding/cp860.enc
deleted file mode 100644
index 871943b..0000000
--- a/library/encoding/cp860.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp860, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E300E000C100E700EA00CA00E800CD00D400EC00C300C2
-00C900C000C800F400F500F200DA00F900CC00D500DC00A200A300D920A700D3
-00E100ED00F300FA00F100D100AA00BA00BF00D200AC00BD00BC00A100AB00BB
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp861.enc b/library/encoding/cp861.enc
deleted file mode 100644
index 3f8f605..0000000
--- a/library/encoding/cp861.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp861, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E400E000E500E700EA00EB00E800D000F000DE00C400C5
-00C900E600C600F400F600FE00FB00DD00FD00D600DC00F800A300D820A70192
-00E100ED00F300FA00C100CD00D300DA00BF231000AC00BD00BC00A100AB00BB
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp862.enc b/library/encoding/cp862.enc
deleted file mode 100644
index 5f9d16c..0000000
--- a/library/encoding/cp862.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp862, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-05D005D105D205D305D405D505D605D705D805D905DA05DB05DC05DD05DE05DF
-05E005E105E205E305E405E505E605E705E805E905EA00A200A300A520A70192
-00E100ED00F300FA00F100D100AA00BA00BF231000AC00BD00BC00A100AB00BB
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp863.enc b/library/encoding/cp863.enc
deleted file mode 100644
index c8b8686..0000000
--- a/library/encoding/cp863.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp863, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200C200E000B600E700EA00EB00E800EF00EE201700C000A7
-00C900C800CA00F400CB00CF00FB00F900A400D400DC00A200A300D900DB0192
-00A600B400F300FA00A800B800B300AF00CE231000AC00BD00BC00BE00AB00BB
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp864.enc b/library/encoding/cp864.enc
deleted file mode 100644
index 71f9e62..0000000
--- a/library/encoding/cp864.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp864, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-00200021002200230024066A0026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00B000B72219221A259225002502253C2524252C251C25342510250C25142518
-03B2221E03C600B100BD00BC224800AB00BBFEF7FEF8009B009CFEFBFEFC009F
-00A000ADFE8200A300A4FE8400000000FE8EFE8FFE95FE99060CFE9DFEA1FEA5
-0660066106620663066406650666066706680669FED1061BFEB1FEB5FEB9061F
-00A2FE80FE81FE83FE85FECAFE8BFE8DFE91FE93FE97FE9BFE9FFEA3FEA7FEA9
-FEABFEADFEAFFEB3FEB7FEBBFEBFFEC1FEC5FECBFECF00A600AC00F700D7FEC9
-0640FED3FED7FEDBFEDFFEE3FEE7FEEBFEEDFEEFFEF3FEBDFECCFECEFECDFEE1
-FE7D0651FEE5FEE9FEECFEF0FEF2FED0FED5FEF5FEF6FEDDFED9FEF125A00000
diff --git a/library/encoding/cp865.enc b/library/encoding/cp865.enc
deleted file mode 100644
index 543da9c..0000000
--- a/library/encoding/cp865.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp865, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C700FC00E900E200E400E000E500E700EA00EB00E800EF00EE00EC00C400C5
-00C900E600C600F400F600F200FB00F900FF00D600DC00F800A300D820A70192
-00E100ED00F300FA00F100D100AA00BA00BF231000AC00BD00BC00A100AB00A4
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-03B100DF039303C003A303C300B503C403A6039803A903B4221E03C603B52229
-226100B1226522642320232100F7224800B0221900B7221A207F00B225A000A0
diff --git a/library/encoding/cp866.enc b/library/encoding/cp866.enc
deleted file mode 100644
index b851cf5..0000000
--- a/library/encoding/cp866.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp866, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0410041104120413041404150416041704180419041A041B041C041D041E041F
-0420042104220423042404250426042704280429042A042B042C042D042E042F
-0430043104320433043404350436043704380439043A043B043C043D043E043F
-259125922593250225242561256225562555256325512557255D255C255B2510
-25142534252C251C2500253C255E255F255A25542569256625602550256C2567
-2568256425652559255825522553256B256A2518250C25882584258C25902580
-0440044104420443044404450446044704480449044A044B044C044D044E044F
-040104510404045404070457040E045E00B0221900B7221A211600A425A000A0
diff --git a/library/encoding/cp869.enc b/library/encoding/cp869.enc
deleted file mode 100644
index 9fd2929..0000000
--- a/library/encoding/cp869.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp869, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850386008700B700AC00A620182019038820150389
-038A03AA038C00930094038E03AB00A9038F00B200B303AC00A303AD03AE03AF
-03CA039003CC03CD039103920393039403950396039700BD0398039900AB00BB
-25912592259325022524039A039B039C039D256325512557255D039E039F2510
-25142534252C251C2500253C03A003A1255A25542569256625602550256C03A3
-03A403A503A603A703A803A903B103B203B32518250C2588258403B403B52580
-03B603B703B803B903BA03BB03BC03BD03BE03BF03C003C103C303C203C40384
-00AD00B103C503C603C700A703C8038500B000A803C903CB03B003CE25A000A0
diff --git a/library/encoding/cp874.enc b/library/encoding/cp874.enc
deleted file mode 100644
index cdcca32..0000000
--- a/library/encoding/cp874.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: cp874, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008420260086008700880089008A008B008C008D008E008F
-009020182019201C201D20222013201400980099009A009B009C009D009E009F
-00A00E010E020E030E040E050E060E070E080E090E0A0E0B0E0C0E0D0E0E0E0F
-0E100E110E120E130E140E150E160E170E180E190E1A0E1B0E1C0E1D0E1E0E1F
-0E200E210E220E230E240E250E260E270E280E290E2A0E2B0E2C0E2D0E2E0E2F
-0E300E310E320E330E340E350E360E370E380E390E3A00000000000000000E3F
-0E400E410E420E430E440E450E460E470E480E490E4A0E4B0E4C0E4D0E4E0E4F
-0E500E510E520E530E540E550E560E570E580E590E5A0E5B0000000000000000
diff --git a/library/encoding/cp932.enc b/library/encoding/cp932.enc
deleted file mode 100644
index 027f7d8..0000000
--- a/library/encoding/cp932.enc
+++ /dev/null
@@ -1,785 +0,0 @@
-# Encoding file: cp932, multi-byte
-M
-003F 0 46
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000850086000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8FF3E
-FFE3FF3F30FD30FE309D309E30034EDD30053006300730FC20152010FF0FFF3C
-FF5E2225FF5C2026202520182019201C201DFF08FF0930143015FF3BFF3DFF5B
-FF5D30083009300A300B300C300D300E300F30103011FF0BFF0D00B100D70000
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF04FFE0FFE1FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC203B301221922190219121933013000000000000
-000000000000000000000000000000002208220B2286228722822283222A2229
-0000000000000000000000000000000022272228FFE221D221D4220022030000
-0000000000000000000000000000000000000000222022A52312220222072261
-2252226A226B221A223D221D2235222B222C0000000000000000000000000000
-212B2030266F266D266A2020202100B6000000000000000025EF000000000000
-82
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000FF10
-FF11FF12FF13FF14FF15FF16FF17FF18FF190000000000000000000000000000
-FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2FFF30
-FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3A000000000000000000000000
-0000FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000003041
-30423043304430453046304730483049304A304B304C304D304E304F30503051
-30523053305430553056305730583059305A305B305C305D305E305F30603061
-30623063306430653066306730683069306A306B306C306D306E306F30703071
-30723073307430753076307730783079307A307B307C307D307E307F30803081
-30823083308430853086308730883089308A308B308C308D308E308F30903091
-3092309300000000000000000000000000000000000000000000000000000000
-83
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF30B0
-30B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF30C0
-30C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF30D0
-30D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF0000
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000391
-03920393039403950396039703980399039A039B039C039D039E039F03A003A1
-03A303A403A503A603A703A803A90000000000000000000000000000000003B1
-03B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C1
-03C303C403C503C603C703C803C9000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-04100411041204130414041504010416041704180419041A041B041C041D041E
-041F0420042104220423042404250426042704280429042A042B042C042D042E
-042F000000000000000000000000000000000000000000000000000000000000
-04300431043204330434043504510436043704380439043A043B043C043D0000
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000002500
-2502250C251025182514251C252C25242534253C25012503250F2513251B2517
-25232533252B253B254B2520252F25282537253F251D25302525253825420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-87
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2460246124622463246424652466246724682469246A246B246C246D246E246F
-2470247124722473216021612162216321642165216621672168216900003349
-33143322334D331833273303333633513357330D33263323332B334A333B339C
-339D339E338E338F33C433A100000000000000000000000000000000337B0000
-301D301F211633CD212132A432A532A632A732A8323132323239337E337D337C
-22522261222B222E2211221A22A52220221F22BF22352229222A000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-88
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000004E9C
-55165A03963F54C0611B632859F690228475831C7A5060AA63E16E2565ED8466
-82A69BF56893572765A162715B9B59D0867B98F47D627DBE9B8E62167C9F88B7
-5B895EB563096697684895C7978D674F4EE54F0A4F4D4F9D504956F2593759D4
-5A015C0960DF610F61706613690570BA754F757079FB7DAD7DEF80C3840E8863
-8B029055907A533B4E954EA557DF80B290C178EF4E0058F16EA290387A328328
-828B9C2F5141537054BD54E156E059FB5F1598F26DEB80E4852D000000000000
-89
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9662967096A097FB540B53F35B8770CF7FBD8FC296E8536F9D5C7ABA4E117893
-81FC6E26561855046B1D851A9C3B59E553A96D6674DC958F56424E91904B96F2
-834F990C53E155B65B305F71662066F368046C386CF36D29745B76C87A4E9834
-82F1885B8A6092ED6DB275AB76CA99C560A68B018D8A95B2698E53AD51860000
-5712583059445BB45EF6602863A963F46CBF6F14708E7114715971D5733F7E01
-827682D185979060925B9D1B586965BC6C5A752551F9592E59655F805FDC62BC
-65FA6A2A6B276BB4738B7FC189569D2C9D0E9EC45CA16C96837B51045C4B61B6
-81C6687672614E594FFA537860696E297A4F97F34E0B53164EEE4F554F3D4FA1
-4F7352A053EF5609590F5AC15BB65BE179D16687679C67B66B4C6CB3706B73C2
-798D79BE7A3C7B8782B182DB8304837783EF83D387668AB256298CA88FE6904E
-971E868A4FC45CE862117259753B81E582BD86FE8CC096C5991399D54ECB4F1A
-89E356DE584A58CA5EFB5FEB602A6094606261D0621262D06539000000000000
-8A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9B41666668B06D777070754C76867D7582A587F9958B968E8C9D51F152BE5916
-54B35BB35D16616869826DAF788D84CB88578A7293A79AB86D6C99A886D957A3
-67FF86CE920E5283568754045ED362E164B9683C68386BBB737278BA7A6B899A
-89D28D6B8F0390ED95A3969497695B665CB3697D984D984E639B7B206A2B0000
-6A7F68B69C0D6F5F5272559D607062EC6D3B6E076ED1845B89108F444E149C39
-53F6691B6A3A9784682A515C7AC384B291DC938C565B9D286822830584317CA5
-520882C574E64E7E4F8351A05BD2520A52D852E75DFB559A582A59E65B8C5B98
-5BDB5E725E7960A3611F616361BE63DB656267D1685368FA6B3E6B536C576F22
-6F976F4574B0751876E3770B7AFF7BA17C217DE97F367FF0809D8266839E89B3
-8ACC8CAB908494519593959195A2966597D3992882184E38542B5CB85DCC73A9
-764C773C5CA97FEB8D0B96C19811985498584F014F0E5371559C566857FA5947
-5B095BC45C905E0C5E7E5FCC63EE673A65D765E2671F68CB68C4000000000000
-8B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A5F5E306BC56C176C7D757F79485B637A007D005FBD898F8A188CB48D778ECC
-8F1D98E29A0E9B3C4E80507D510059935B9C622F628064EC6B3A72A075917947
-7FA987FB8ABC8B7063AC83CA97A05409540355AB68546A588A70782767759ECD
-53745BA2811A865090064E184E454EC74F1153CA54385BAE5F13602565510000
-673D6C426C726CE3707874037A767AAE7B087D1A7CFE7D6665E7725B53BB5C45
-5DE862D262E063196E20865A8A318DDD92F86F0179A69B5A4EA84EAB4EAC4F9B
-4FA050D151477AF6517151F653545321537F53EB55AC58835CE15F375F4A602F
-6050606D631F65596A4B6CC172C272ED77EF80F881058208854E90F793E197FF
-99579A5A4EF051DD5C2D6681696D5C4066F26975738968507C8150C552E45747
-5DFE932665A46B236B3D7434798179BD7B4B7DCA82B983CC887F895F8B398FD1
-91D1541F92804E5D503653E5533A72D7739677E982E68EAF99C699C899D25177
-611A865E55B07A7A50765BD3904796854E326ADB91E75C515C48000000000000
-8C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63987A9F6C9397748F617AAA718A96887C8268177E706851936C52F2541B85AB
-8A137FA48ECD90E15366888879414FC250BE521151445553572D73EA578B5951
-5F625F8460756176616761A963B2643A656C666F68426E1375667A3D7CFB7D4C
-7D997E4B7F6B830E834A86CD8A088A638B668EFD981A9D8F82B88FCE9BE80000
-5287621F64836FC09699684150916B206C7A6F547A747D5088408A2367084EF6
-503950265065517C5238526355A7570F58055ACC5EFA61B261F862F36372691C
-6A29727D72AC732E7814786F7D79770C80A9898B8B198CE28ED290639375967A
-98559A139E785143539F53B35E7B5F266E1B6E90738473FE7D4382378A008AFA
-96504E4E500B53E4547C56FA59D15B645DF15EAB5F276238654567AF6E5672D0
-7CCA88B480A180E183F0864E8A878DE8923796C798679F134E944E924F0D5348
-5449543E5A2F5F8C5FA1609F68A76A8E745A78818A9E8AA48B7791904E5E9BC9
-4EA44F7C4FAF501950165149516C529F52B952FE539A53E35411000000000000
-8D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-540E5589575157A2597D5B545B5D5B8F5DE55DE75DF75E785E835E9A5EB75F18
-6052614C629762D863A7653B6602664366F4676D6821689769CB6C5F6D2A6D69
-6E2F6E9D75327687786C7A3F7CE07D057D187D5E7DB18015800380AF80B18154
-818F822A8352884C88618B1B8CA28CFC90CA91759271783F92FC95A4964D0000
-980599999AD89D3B525B52AB53F7540858D562F76FE08C6A8F5F9EB9514B523B
-544A56FD7A4091779D609ED273446F09817075115FFD60DA9AA872DB8FBC6B64
-98034ECA56F0576458BE5A5A606861C7660F6606683968B16DF775D57D3A826E
-9B424E9B4F5053C955065D6F5DE65DEE67FB6C99747378028A50939688DF5750
-5EA7632B50B550AC518D670054C9585E59BB5BB05F69624D63A1683D6B736E08
-707D91C7728078157826796D658E7D3083DC88C18F09969B5264572867507F6A
-8CA151B45742962A583A698A80B454B25D0E57FC78959DFA4F5C524A548B643E
-6628671467F57A847B567D22932F685C9BAD7B395319518A5237000000000000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5BDF62F664AE64E6672D6BBA85A996D176909BD6634C93069BAB76BF66524E09
-509853C25C7160E864926563685F71E673CA75237B977E8286958B838CDB9178
-991065AC66AB6B8B4ED54ED44F3A4F7F523A53F853F255E356DB58EB59CB59C9
-59FF5B505C4D5E025E2B5FD7601D6307652F5B5C65AF65BD65E8679D6B620000
-6B7B6C0F7345794979C17CF87D197D2B80A2810281F389968A5E8A698A668A8C
-8AEE8CC78CDC96CC98FC6B6F4E8B4F3C4F8D51505B575BFA6148630166426B21
-6ECB6CBB723E74BD75D478C1793A800C803381EA84948F9E6C509E7F5F0F8B58
-9D2B7AFA8EF85B8D96EB4E0353F157F759315AC95BA460896E7F6F0675BE8CEA
-5B9F85007BE0507267F4829D5C61854A7E1E820E51995C0463688D66659C716E
-793E7D1780058B1D8ECA906E86C790AA501F52FA5C3A6753707C7235914C91C8
-932B82E55BC25F3160F94E3B53D65B88624B67316B8A72E973E07A2E816B8DA3
-91529996511253D7546A5BFF63886A397DAC970056DA53CE5468000000000000
-8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B975C315DDE4FEE610162FE6D3279C079CB7D427E4D7FD281ED821F84908846
-89728B908E748F2F9031914B916C96C6919C4EC04F4F514553415F93620E67D4
-6C416E0B73637E2691CD928353D459195BBF6DD1795D7E2E7C9B587E719F51FA
-88538FF04FCA5CFB662577AC7AE3821C99FF51C65FAA65EC696F6B896DF30000
-6E966F6476FE7D145DE190759187980651E6521D6240669166D96E1A5EB67DD2
-7F7266F885AF85F78AF852A953D959735E8F5F90605592E4966450B7511F52DD
-5320534753EC54E8554655315617596859BE5A3C5BB55C065C0F5C115C1A5E84
-5E8A5EE05F70627F628462DB638C63776607660C662D6676677E68A26A1F6A35
-6CBC6D886E096E58713C7126716775C77701785D7901796579F07AE07B117CA7
-7D39809683D6848B8549885D88F38A1F8A3C8A548A738C618CDE91A49266937E
-9418969C97984E0A4E084E1E4E575197527057CE583458CC5B225E3860C564FE
-676167566D4472B675737A6384B88B7291B89320563157F498FE000000000000
-90
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62ED690D6B9671ED7E548077827289E698DF87558FB15C3B4F384FE14FB55507
-5A205BDD5BE95FC3614E632F65B0664B68EE699B6D786DF1753375B9771F795E
-79E67D3381E382AF85AA89AA8A3A8EAB8F9B903291DD97074EBA4EC152035875
-58EC5C0B751A5C3D814E8A0A8FC59663976D7B258ACF9808916256F353A80000
-9017543957825E2563A86C34708A77617C8B7FE088709042915493109318968F
-745E9AC45D075D69657067A28DA896DB636E6749691983C5981796C088FE6F84
-647A5BF84E16702C755D662F51C4523652E259D35F8160276210653F6574661F
-667468F268166B636E057272751F76DB7CBE805658F088FD897F8AA08A938ACB
-901D91929752975965897A0E810696BB5E2D60DC621A65A56614679077F37A4D
-7C4D7E3E810A8CAC8D648DE18E5F78A9520762D963A5644262988A2D7A837BC0
-8AAC96EA7D76820C87494ED95148534353605BA35C025C165DDD6226624764B0
-681368346CC96D456D1767D36F5C714E717D65CB7A7F7BAD7DDA000000000000
-91
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E4A7FA8817A821B823985A68A6E8CCE8DF59078907792AD929195839BAE524D
-55846F387136516879857E5581B37CCE564C58515CA863AA66FE66FD695A72D9
-758F758E790E795679DF7C977D207D4486078A34963B90619F2050E7527553CC
-53E2500955AA58EE594F723D5B8B5C64531D60E360F3635C6383633F63BB0000
-64CD65E966F95DE369CD69FD6F1571E54E8975E976F87A937CDF7DCF7D9C8061
-83498358846C84BC85FB88C58D709001906D9397971C9A1250CF5897618E81D3
-85358D0890204FC3507452475373606F6349675F6E2C8DB3901F4FD75C5E8CCA
-65CF7D9A53528896517663C35B585B6B5C0A640D6751905C4ED6591A592A6C70
-8A51553E581559A560F0625367C182356955964099C49A284F5358065BFE8010
-5CB15E2F5F856020614B623466FF6CF06EDE80CE817F82D4888B8CB89000902E
-968A9EDB9BDB4EE353F059277B2C918D984C9DF96EDD7027535355445B856258
-629E62D36CA26FEF74228A1794386FC18AFE833851E786F853EA000000000000
-92
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53E94F4690548FB0596A81315DFD7AEA8FBF68DA8C3772F89C486A3D8AB04E39
-53585606576662C563A265E66B4E6DE16E5B70AD77ED7AEF7BAA7DBB803D80C6
-86CB8A95935B56E358C75F3E65AD66966A806BB575378AC7502477E557305F1B
-6065667A6C6075F47A1A7F6E81F48718904599B37BC9755C7AF97B5184C40000
-901079E97A9283365AE177404E2D4EF25B995FE062BD663C67F16CE8866B8877
-8A3B914E92F399D06A177026732A82E784578CAF4E01514651CB558B5BF55E16
-5E335E815F145F355F6B5FB461F2631166A2671D6F6E7252753A773A80748139
-817887768ABF8ADC8D858DF3929A957798029CE552C5635776F467156C8873CD
-8CC393AE96736D25589C690E69CC8FFD939A75DB901A585A680263B469FB4F43
-6F2C67D88FBB85267DB49354693F6F70576A58F75B2C7D2C722A540A91E39DB4
-4EAD4F4E505C507552438C9E544858245B9A5E1D5E955EAD5EF75F1F608C62B5
-633A63D068AF6C407887798E7A0B7DE082478A028AE68E449013000000000000
-93
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-90B8912D91D89F0E6CE5645864E265756EF476847B1B906993D16EBA54F25FB9
-64A48F4D8FED92445178586B59295C555E976DFB7E8F751C8CBC8EE2985B70B9
-4F1D6BBF6FB1753096FB514E54105835585759AC5C605F926597675C6E21767B
-83DF8CED901490FD934D7825783A52AA5EA6571F597460125012515A51AC0000
-51CD520055105854585859575B955CF65D8B60BC6295642D6771684368BC68DF
-76D76DD86E6F6D9B706F71C85F5375D879777B497B547B527CD67D7152308463
-856985E48A0E8B048C468E0F9003900F94199676982D9A3095D850CD52D5540C
-58025C0E61A7649E6D1E77B37AE580F48404905392855CE09D07533F5F975FB3
-6D9C7279776379BF7BE46BD272EC8AAD68036A6151F87A8169345C4A9CF682EB
-5BC59149701E56785C6F60C765666C8C8C5A90419813545166C7920D594890A3
-51854E4D51EA85998B0E7058637A934B696299B47E047577535769608EDF96E3
-6C5D4E8C5C3C5F108FE953028CD1808986795EFF65E54E735165000000000000
-94
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59825C3F97EE4EFB598A5FCD8A8D6FE179B079625BE78471732B71B15E745FF5
-637B649A71C37C984E435EFC4E4B57DC56A260A96FC37D0D80FD813381BF8FB2
-899786A45DF4628A64AD898767776CE26D3E743678345A467F7582AD99AC4FF3
-5EC362DD63926557676F76C3724C80CC80BA8F29914D500D57F95A9268850000
-6973716472FD8CB758F28CE0966A9019877F79E477E784294F2F5265535A62CD
-67CF6CCA767D7B947C95823685848FEB66DD6F2072067E1B83AB99C19EA651FD
-7BB178727BB880877B486AE85E61808C75517560516B92626E8C767A91979AEA
-4F107F70629C7B4F95A59CE9567A585986E496BC4F345224534A53CD53DB5E06
-642C6591677F6C3E6C4E724872AF73ED75547E41822C85E98CA97BC491C67169
-981298EF633D6669756A76E478D0854386EE532A5351542659835E875F7C60B2
-6249627962AB65906BD46CCC75B276AE789179D87DCB7F7780A588AB8AB98CBB
-907F975E98DB6A0B7C3850995C3E5FAE67876BD8743577097F8E000000000000
-95
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9F3B67CA7A175339758B9AED5F66819D83F180985F3C5FC575627B46903C6867
-59EB5A9B7D10767E8B2C4FF55F6A6A196C376F0274E2796888688A558C795EDF
-63CF75C579D282D7932892F2849C86ED9C2D54C15F6C658C6D5C70158CA78CD3
-983B654F74F64E0D4ED857E0592B5A665BCC51A85E035E9C6016627665770000
-65A7666E6D6E72367B268150819A82998B5C8CA08CE68D74961C96444FAE64AB
-6B66821E8461856A90E85C01695398A8847A85574F0F526F5FA95E45670D798F
-8179890789866DF55F1762556CB84ECF72699B925206543B567458B361A4626E
-711A596E7C897CDE7D1B96F06587805E4E194F75517558405E635E735F0A67C4
-4E26853D9589965B7C73980150FB58C1765678A7522577A585117B86504F5909
-72477BC77DE88FBA8FD4904D4FBF52C95A295F0197AD4FDD821792EA57036355
-6B69752B88DC8F147A4252DF58936155620A66AE6BCD7C3F83E950234FF85305
-5446583159495B9D5CF05CEF5D295E9662B16367653E65B9670B000000000000
-96
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6CD56CE170F978327E2B80DE82B3840C84EC870289128A2A8C4A90A692D298FD
-9CF39D6C4E4F4EA1508D5256574A59A85E3D5FD85FD9623F66B4671B67D068D2
-51927D2180AA81A88B008C8C8CBF927E96325420982C531750D5535C58A864B2
-6734726777667A4691E652C36CA16B8658005E4C5954672C7FFB51E176C60000
-646978E89B549EBB57CB59B96627679A6BCE54E969D95E55819C67959BAA67FE
-9C52685D4EA64FE353C862B9672B6CAB8FC44FAD7E6D9EBF4E0761626E806F2B
-85135473672A9B455DF37B955CAC5BC6871C6E4A84D17A14810859997C8D6C11
-772052D959227121725F77DB97279D61690B5A7F5A1851A5540D547D660E76DF
-8FF792989CF459EA725D6EC5514D68C97DBF7DEC97629EBA64786A2183025984
-5B5F6BDB731B76F27DB280178499513267289ED976EE676252FF99055C24623B
-7C7E8CB0554F60B67D0B958053014E5F51B6591C723A803691CE5F2577E25384
-5F797D0485AC8A338E8D975667F385AE9453610961086CB97652000000000000
-97
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8AED8F38552F4F51512A52C753CB5BA55E7D60A0618263D6670967DA6E676D8C
-733673377531795088D58A98904A909190F596C4878D59154E884F594E0E8A89
-8F3F981050AD5E7C59965BB95EB863DA63FA64C166DC694A69D86D0B6EB67194
-75287AAF7F8A8000844984C989818B218E0A9065967D990A617E62916B320000
-6C836D747FCC7FFC6DC07F8587BA88F8676583B1983C96F76D1B7D61843D916A
-4E7153755D506B046FEB85CD862D89A75229540F5C65674E68A87406748375E2
-88CF88E191CC96E296785F8B73877ACB844E63A0756552896D416E9C74097559
-786B7C9296867ADC9F8D4FB6616E65C5865C4E864EAE50DA4E2151CC5BEE6599
-68816DBC731F764277AD7A1C7CE7826F8AD2907C91CF96759818529B7DD1502B
-539867976DCB71D0743381E88F2A96A39C579E9F746058416D997D2F985E4EE4
-4F364F8B51B752B15DBA601C73B2793C82D3923496B796F6970A9E979F6266A6
-6B74521752A370C888C25EC9604B61906F2371497C3E7DF4806F000000000000
-98
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84EE9023932C54429B6F6AD370898CC28DEF973252B45A415ECA5F046717697C
-69946D6A6F0F726272FC7BED8001807E874B90CE516D9E937984808B93328AD6
-502D548C8A716B6A8CC4810760D167A09DF24E994E989C108A6B85C185686900
-6E7E789781550000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000005F0C
-4E104E154E2A4E314E364E3C4E3F4E424E564E584E824E858C6B4E8A82125F0D
-4E8E4E9E4E9F4EA04EA24EB04EB34EB64ECE4ECD4EC44EC64EC24ED74EDE4EED
-4EDF4EF74F094F5A4F304F5B4F5D4F574F474F764F884F8F4F984F7B4F694F70
-4F914F6F4F864F9651184FD44FDF4FCE4FD84FDB4FD14FDA4FD04FE44FE5501A
-50285014502A502550054F1C4FF650215029502C4FFE4FEF5011500650435047
-6703505550505048505A5056506C50785080509A508550B450B2000000000000
-99
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50C950CA50B350C250D650DE50E550ED50E350EE50F950F55109510151025116
-51155114511A5121513A5137513C513B513F51405152514C515451627AF85169
-516A516E5180518256D8518C5189518F519151935195519651A451A651A251A9
-51AA51AB51B351B151B251B051B551BD51C551C951DB51E0865551E951ED0000
-51F051F551FE5204520B5214520E5227522A522E52335239524F5244524B524C
-525E5254526A527452695273527F527D528D529452925271528852918FA88FA7
-52AC52AD52BC52B552C152CD52D752DE52E352E698ED52E052F352F552F852F9
-530653087538530D5310530F5315531A5323532F533153335338534053465345
-4E175349534D51D6535E5369536E5918537B53775382539653A053A653A553AE
-53B053B653C37C1296D953DF66FC71EE53EE53E853ED53FA5401543D5440542C
-542D543C542E54365429541D544E548F5475548E545F5471547754705492547B
-5480547654845490548654C754A254B854A554AC54C454C854A8000000000000
-9A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54AB54C254A454BE54BC54D854E554E6550F551454FD54EE54ED54FA54E25539
-55405563554C552E555C55455556555755385533555D5599558054AF558A559F
-557B557E5598559E55AE557C558355A9558755A855DA55C555DF55C455DC55E4
-55D4561455F7561655FE55FD561B55F9564E565071DF56345636563256380000
-566B5664562F566C566A56865680568A56A05694568F56A556AE56B656B456C2
-56BC56C156C356C056C856CE56D156D356D756EE56F9570056FF570457095708
-570B570D57135718571655C7571C572657375738574E573B5740574F576957C0
-57885761577F5789579357A057B357A457AA57B057C357C657D457D257D3580A
-57D657E3580B5819581D587258215862584B58706BC05852583D5879588558B9
-589F58AB58BA58DE58BB58B858AE58C558D358D158D758D958D858E558DC58E4
-58DF58EF58FA58F958FB58FC58FD5902590A5910591B68A65925592C592D5932
-5938593E7AD259555950594E595A5958596259605967596C5969000000000000
-9B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59785981599D4F5E4FAB59A359B259C659E859DC598D59D959DA5A255A1F5A11
-5A1C5A095A1A5A405A6C5A495A355A365A625A6A5A9A5ABC5ABE5ACB5AC25ABD
-5AE35AD75AE65AE95AD65AFA5AFB5B0C5B0B5B165B325AD05B2A5B365B3E5B43
-5B455B405B515B555B5A5B5B5B655B695B705B735B755B7865885B7A5B800000
-5B835BA65BB85BC35BC75BC95BD45BD05BE45BE65BE25BDE5BE55BEB5BF05BF6
-5BF35C055C075C085C0D5C135C205C225C285C385C395C415C465C4E5C535C50
-5C4F5B715C6C5C6E4E625C765C795C8C5C915C94599B5CAB5CBB5CB65CBC5CB7
-5CC55CBE5CC75CD95CE95CFD5CFA5CED5D8C5CEA5D0B5D155D175D5C5D1F5D1B
-5D115D145D225D1A5D195D185D4C5D525D4E5D4B5D6C5D735D765D875D845D82
-5DA25D9D5DAC5DAE5DBD5D905DB75DBC5DC95DCD5DD35DD25DD65DDB5DEB5DF2
-5DF55E0B5E1A5E195E115E1B5E365E375E445E435E405E4E5E575E545E5F5E62
-5E645E475E755E765E7A9EBC5E7F5EA05EC15EC25EC85ED05ECF000000000000
-9C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5ED65EE35EDD5EDA5EDB5EE25EE15EE85EE95EEC5EF15EF35EF05EF45EF85EFE
-5F035F095F5D5F5C5F0B5F115F165F295F2D5F385F415F485F4C5F4E5F2F5F51
-5F565F575F595F615F6D5F735F775F835F825F7F5F8A5F885F915F875F9E5F99
-5F985FA05FA85FAD5FBC5FD65FFB5FE45FF85FF15FDD60B35FFF602160600000
-601960106029600E6031601B6015602B6026600F603A605A6041606A6077605F
-604A6046604D6063604360646042606C606B60596081608D60E76083609A6084
-609B60966097609260A7608B60E160B860E060D360B45FF060BD60C660B560D8
-614D6115610660F660F7610060F460FA6103612160FB60F1610D610E6147613E
-61286127614A613F613C612C6134613D614261446173617761586159615A616B
-6174616F61656171615F615D6153617561996196618761AC6194619A618A6191
-61AB61AE61CC61CA61C961F761C861C361C661BA61CB7F7961CD61E661E361F6
-61FA61F461FF61FD61FC61FE620062086209620D620C6214621B000000000000
-9D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-621E6221622A622E6230623262336241624E625E6263625B62606268627C6282
-6289627E62926293629662D46283629462D762D162BB62CF62FF62C664D462C8
-62DC62CC62CA62C262C7629B62C9630C62EE62F163276302630862EF62F56350
-633E634D641C634F6396638E638063AB637663A3638F6389639F63B5636B0000
-636963BE63E963C063C663E363C963D263F663C4641664346406641364266436
-651D64176428640F6467646F6476644E652A6495649364A564A9648864BC64DA
-64D264C564C764BB64D864C264F164E7820964E064E162AC64E364EF652C64F6
-64F464F264FA650064FD6518651C650565246523652B65346535653765366538
-754B654865566555654D6558655E655D65726578658265838B8A659B659F65AB
-65B765C365C665C165C465CC65D265DB65D965E065E165F16772660A660365FB
-6773663566366634661C664F664466496641665E665D666466676668665F6662
-667066836688668E668966846698669D66C166B966C966BE66BC000000000000
-9E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66C466B866D666DA66E0663F66E666E966F066F566F7670F6716671E67266727
-9738672E673F67366741673867376746675E67606759676367646789677067A9
-677C676A678C678B67A667A1678567B767EF67B467EC67B367E967B867E467DE
-67DD67E267EE67B967CE67C667E76A9C681E684668296840684D6832684E0000
-68B3682B685968636877687F689F688F68AD6894689D689B68836AAE68B96874
-68B568A068BA690F688D687E690168CA690868D86922692668E1690C68CD68D4
-68E768D569366912690468D768E3692568F968E068EF6928692A691A69236921
-68C669796977695C6978696B6954697E696E69396974693D695969306961695E
-695D6981696A69B269AE69D069BF69C169D369BE69CE5BE869CA69DD69BB69C3
-69A76A2E699169A0699C699569B469DE69E86A026A1B69FF6B0A69F969F269E7
-6A0569B16A1E69ED6A1469EB6A0A6A126AC16A236A136A446A0C6A726A366A78
-6A476A626A596A666A486A386A226A906A8D6AA06A846AA26AA3000000000000
-9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A9786176ABB6AC36AC26AB86AB36AAC6ADE6AD16ADF6AAA6ADA6AEA6AFB6B05
-86166AFA6B126B169B316B1F6B386B3776DC6B3998EE6B476B436B496B506B59
-6B546B5B6B5F6B616B786B796B7F6B806B846B836B8D6B986B956B9E6BA46BAA
-6BAB6BAF6BB26BB16BB36BB76BBC6BC66BCB6BD36BDF6BEC6BEB6BF36BEF0000
-9EBE6C086C136C146C1B6C246C236C5E6C556C626C6A6C826C8D6C9A6C816C9B
-6C7E6C686C736C926C906CC46CF16CD36CBD6CD76CC56CDD6CAE6CB16CBE6CBA
-6CDB6CEF6CD96CEA6D1F884D6D366D2B6D3D6D386D196D356D336D126D0C6D63
-6D936D646D5A6D796D596D8E6D956FE46D856DF96E156E0A6DB56DC76DE66DB8
-6DC66DEC6DDE6DCC6DE86DD26DC56DFA6DD96DE46DD56DEA6DEE6E2D6E6E6E2E
-6E196E726E5F6E3E6E236E6B6E2B6E766E4D6E1F6E436E3A6E4E6E246EFF6E1D
-6E386E826EAA6E986EC96EB76ED36EBD6EAF6EC46EB26ED46ED56E8F6EA56EC2
-6E9F6F416F11704C6EEC6EF86EFE6F3F6EF26F316EEF6F326ECC000000000000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F3E6F136EF76F866F7A6F786F816F806F6F6F5B6FF36F6D6F826F7C6F586F8E
-6F916FC26F666FB36FA36FA16FA46FB96FC66FAA6FDF6FD56FEC6FD46FD86FF1
-6FEE6FDB7009700B6FFA70117001700F6FFE701B701A6F74701D7018701F7030
-703E7032705170637099709270AF70F170AC70B870B370AE70DF70CB70DD0000
-70D9710970FD711C711971657155718871667162714C7156716C718F71FB7184
-719571A871AC71D771B971BE71D271C971D471CE71E071EC71E771F571FC71F9
-71FF720D7210721B7228722D722C72307232723B723C723F72407246724B7258
-7274727E7282728172877292729672A272A772B972B272C372C672C472CE72D2
-72E272E072E172F972F7500F7317730A731C7316731D7334732F73297325733E
-734E734F9ED87357736A7368737073787375737B737A73C873B373CE73BB73C0
-73E573EE73DE74A27405746F742573F87432743A7455743F745F74597441745C
-746974707463746A7476747E748B749E74A774CA74CF74D473F1000000000000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74E074E374E774E974EE74F274F074F174F874F7750475037505750C750E750D
-75157513751E7526752C753C7544754D754A7549755B7546755A756975647567
-756B756D75787576758675877574758A758975827594759A759D75A575A375C2
-75B375C375B575BD75B875BC75B175CD75CA75D275D975E375DE75FE75FF0000
-75FC760175F075FA75F275F3760B760D7609761F762776207621762276247634
-7630763B764776487646765C76587661766276687669766A7667766C76707672
-76767678767C768076837688768B768E769676937699769A76B076B476B876B9
-76BA76C276CD76D676D276DE76E176E576E776EA862F76FB7708770777047729
-7724771E77257726771B773777387747775A7768776B775B7765777F777E7779
-778E778B779177A0779E77B077B677B977BF77BC77BD77BB77C777CD77D777DA
-77DC77E377EE77FC780C781279267820792A7845788E78747886787C789A788C
-78A378B578AA78AF78D178C678CB78D478BE78BC78C578CA78EC000000000000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-78E778DA78FD78F47907791279117919792C792B794079607957795F795A7955
-7953797A797F798A799D79A79F4B79AA79AE79B379B979BA79C979D579E779EC
-79E179E37A087A0D7A187A197A207A1F79807A317A3B7A3E7A377A437A577A49
-7A617A627A699F9D7A707A797A7D7A887A977A957A987A967AA97AC87AB00000
-7AB67AC57AC47ABF90837AC77ACA7ACD7ACF7AD57AD37AD97ADA7ADD7AE17AE2
-7AE67AED7AF07B027B0F7B0A7B067B337B187B197B1E7B357B287B367B507B7A
-7B047B4D7B0B7B4C7B457B757B657B747B677B707B717B6C7B6E7B9D7B987B9F
-7B8D7B9C7B9A7B8B7B927B8F7B5D7B997BCB7BC17BCC7BCF7BB47BC67BDD7BE9
-7C117C147BE67BE57C607C007C077C137BF37BF77C177C0D7BF67C237C277C2A
-7C1F7C377C2B7C3D7C4C7C437C547C4F7C407C507C587C5F7C647C567C657C6C
-7C757C837C907CA47CAD7CA27CAB7CA17CA87CB37CB27CB17CAE7CB97CBD7CC0
-7CC57CC27CD87CD27CDC7CE29B3B7CEF7CF27CF47CF67CFA7D06000000000000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D027D1C7D157D0A7D457D4B7D2E7D327D3F7D357D467D737D567D4E7D727D68
-7D6E7D4F7D637D937D897D5B7D8F7D7D7D9B7DBA7DAE7DA37DB57DC77DBD7DAB
-7E3D7DA27DAF7DDC7DB87D9F7DB07DD87DDD7DE47DDE7DFB7DF27DE17E057E0A
-7E237E217E127E317E1F7E097E0B7E227E467E667E3B7E357E397E437E370000
-7E327E3A7E677E5D7E567E5E7E597E5A7E797E6A7E697E7C7E7B7E837DD57E7D
-8FAE7E7F7E887E897E8C7E927E907E937E947E967E8E7E9B7E9C7F387F3A7F45
-7F4C7F4D7F4E7F507F517F557F547F587F5F7F607F687F697F677F787F827F86
-7F837F887F877F8C7F947F9E7F9D7F9A7FA37FAF7FB27FB97FAE7FB67FB88B71
-7FC57FC67FCA7FD57FD47FE17FE67FE97FF37FF998DC80068004800B80128018
-8019801C80218028803F803B804A804680528058805A805F8062806880738072
-807080768079807D807F808480868085809B8093809A80AD519080AC80DB80E5
-80D980DD80C480DA80D6810980EF80F1811B81298123812F814B000000000000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-968B8146813E8153815180FC8171816E81658166817481838188818A81808182
-81A0819581A481A3815F819381A981B081B581BE81B881BD81C081C281BA81C9
-81CD81D181D981D881C881DA81DF81E081E781FA81FB81FE8201820282058207
-820A820D821082168229822B82388233824082598258825D825A825F82640000
-82628268826A826B822E827182778278827E828D829282AB829F82BB82AC82E1
-82E382DF82D282F482F382FA8393830382FB82F982DE830682DC830982D98335
-83348316833283318340833983508345832F832B831783188385839A83AA839F
-83A283968323838E8387838A837C83B58373837583A0838983A883F4841383EB
-83CE83FD840383D8840B83C183F7840783E083F2840D8422842083BD84388506
-83FB846D842A843C855A84848477846B84AD846E848284698446842C846F8479
-843584CA846284B984BF849F84D984CD84BB84DA84D084C184C684D684A18521
-84FF84F485178518852C851F8515851484FC8540856385588548000000000000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85418602854B8555858085A485888591858A85A8856D8594859B85EA8587859C
-8577857E859085C985BA85CF85B985D085D585DD85E585DC85F9860A8613860B
-85FE85FA86068622861A8630863F864D4E558654865F86678671869386A386A9
-86AA868B868C86B686AF86C486C686B086C9882386AB86D486DE86E986EC0000
-86DF86DB86EF8712870687088700870386FB87118709870D86F9870A8734873F
-8737873B87258729871A8760875F8778874C874E877487578768876E87598753
-8763876A880587A2879F878287AF87CB87BD87C087D096D687AB87C487B387C7
-87C687BB87EF87F287E0880F880D87FE87F687F7880E87D28811881688158822
-88218831883688398827883B8844884288528859885E8862886B8881887E889E
-8875887D88B5887288828897889288AE889988A2888D88A488B088BF88B188C3
-88C488D488D888D988DD88F9890288FC88F488E888F28904890C890A89138943
-891E8925892A892B89418944893B89368938894C891D8960895E000000000000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89668964896D896A896F89748977897E89838988898A8993899889A189A989A6
-89AC89AF89B289BA89BD89BF89C089DA89DC89DD89E789F489F88A038A168A10
-8A0C8A1B8A1D8A258A368A418A5B8A528A468A488A7C8A6D8A6C8A628A858A82
-8A848AA88AA18A918AA58AA68A9A8AA38AC48ACD8AC28ADA8AEB8AF38AE70000
-8AE48AF18B148AE08AE28AF78ADE8ADB8B0C8B078B1A8AE18B168B108B178B20
-8B3397AB8B268B2B8B3E8B288B418B4C8B4F8B4E8B498B568B5B8B5A8B6B8B5F
-8B6C8B6F8B748B7D8B808B8C8B8E8B928B938B968B998B9A8C3A8C418C3F8C48
-8C4C8C4E8C508C558C628C6C8C788C7A8C828C898C858C8A8C8D8C8E8C948C7C
-8C98621D8CAD8CAA8CBD8CB28CB38CAE8CB68CC88CC18CE48CE38CDA8CFD8CFA
-8CFB8D048D058D0A8D078D0F8D0D8D109F4E8D138CCD8D148D168D678D6D8D71
-8D738D818D998DC28DBE8DBA8DCF8DDA8DD68DCC8DDB8DCB8DEA8DEB8DDF8DE3
-8DFC8E088E098DFF8E1D8E1E8E108E1F8E428E358E308E348E4A000000000000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E478E498E4C8E508E488E598E648E608E2A8E638E558E768E728E7C8E818E87
-8E858E848E8B8E8A8E938E918E948E998EAA8EA18EAC8EB08EC68EB18EBE8EC5
-8EC88ECB8EDB8EE38EFC8EFB8EEB8EFE8F0A8F058F158F128F198F138F1C8F1F
-8F1B8F0C8F268F338F3B8F398F458F428F3E8F4C8F498F468F4E8F578F5C0000
-8F628F638F648F9C8F9F8FA38FAD8FAF8FB78FDA8FE58FE28FEA8FEF90878FF4
-90058FF98FFA901190159021900D901E9016900B90279036903590398FF8904F
-905090519052900E9049903E90569058905E9068906F907696A890729082907D
-90819080908A9089908F90A890AF90B190B590E290E4624890DB910291129119
-91329130914A9156915891639165916991739172918B9189918291A291AB91AF
-91AA91B591B491BA91C091C191C991CB91D091D691DF91E191DB91FC91F591F6
-921E91FF9214922C92159211925E925792459249926492489295923F924B9250
-929C92969293929B925A92CF92B992B792E9930F92FA9344932E000000000000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93199322931A9323933A9335933B935C9360937C936E935693B093AC93AD9394
-93B993D693D793E893E593D893C393DD93D093C893E4941A9414941394039407
-94109436942B94359421943A944194529444945B94609462945E946A92299470
-94759477947D945A947C947E9481947F95829587958A95949596959895990000
-95A095A895A795AD95BC95BB95B995BE95CA6FF695C395CD95CC95D595D495D6
-95DC95E195E595E296219628962E962F9642964C964F964B9677965C965E965D
-965F96669672966C968D96989695969796AA96A796B196B296B096B496B696B8
-96B996CE96CB96C996CD894D96DC970D96D596F99704970697089713970E9711
-970F971697199724972A97309739973D973E97449746974897429749975C9760
-97649766976852D2976B977197799785977C9781977A9786978B978F9790979C
-97A897A697A397B397B497C397C697C897CB97DC97ED9F4F97F27ADF97F697F5
-980F980C9838982498219837983D9846984F984B986B986F9870000000000000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-98719874987398AA98AF98B198B698C498C398C698E998EB9903990999129914
-99189921991D991E99249920992C992E993D993E9942994999459950994B9951
-9952994C99559997999899A599AD99AE99BC99DF99DB99DD99D899D199ED99EE
-99F199F299FB99F89A019A0F9A0599E29A199A2B9A379A459A429A409A430000
-9A3E9A559A4D9A5B9A579A5F9A629A659A649A699A6B9A6A9AAD9AB09ABC9AC0
-9ACF9AD19AD39AD49ADE9ADF9AE29AE39AE69AEF9AEB9AEE9AF49AF19AF79AFB
-9B069B189B1A9B1F9B229B239B259B279B289B299B2A9B2E9B2F9B329B449B43
-9B4F9B4D9B4E9B519B589B749B939B839B919B969B979B9F9BA09BA89BB49BC0
-9BCA9BB99BC69BCF9BD19BD29BE39BE29BE49BD49BE19C3A9BF29BF19BF09C15
-9C149C099C139C0C9C069C089C129C0A9C049C2E9C1B9C259C249C219C309C47
-9C329C469C3E9C5A9C609C679C769C789CE79CEC9CF09D099D089CEB9D039D06
-9D2A9D269DAF9D239D1F9D449D159D129D419D3F9D3E9D469D48000000000000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9D5D9D5E9D649D519D509D599D729D899D879DAB9D6F9D7A9D9A9DA49DA99DB2
-9DC49DC19DBB9DB89DBA9DC69DCF9DC29DD99DD39DF89DE69DED9DEF9DFD9E1A
-9E1B9E1E9E759E799E7D9E819E889E8B9E8C9E929E959E919E9D9EA59EA99EB8
-9EAA9EAD97619ECC9ECE9ECF9ED09ED49EDC9EDE9EDD9EE09EE59EE89EEF0000
-9EF49EF69EF79EF99EFB9EFC9EFD9F079F0876B79F159F219F2C9F3E9F4A9F52
-9F549F639F5F9F609F619F669F679F6C9F6A9F779F729F769F959F9C9FA0582F
-69C79059746451DC719900000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E8A891C9348928884DC4FC970BB663168C892F966FB5F454E284EE14EFC4F00
-4F034F394F564F924F8A4F9A4F944FCD504050224FFF501E5046507050425094
-50F450D8514A5164519D51BE51EC5215529C52A652C052DB5300530753245372
-539353B253DDFA0E549C548A54A954FF55865759576557AC57C857C7FA0F0000
-FA10589E58B2590B5953595B595D596359A459BA5B565BC0752F5BD85BEC5C1E
-5CA65CBA5CF55D275D53FA115D425D6D5DB85DB95DD05F215F345F675FB75FDE
-605D6085608A60DE60D5612060F26111613761306198621362A663F56460649D
-64CE654E66006615663B6609662E661E6624666566576659FA126673669966A0
-66B266BF66FA670EF929676667BB685267C06801684468CFFA136968FA146998
-69E26A306A6B6A466A736A7E6AE26AE46BD66C3F6C5C6C866C6F6CDA6D046D87
-6D6F6D966DAC6DCF6DF86DF26DFC6E396E5C6E276E3C6EBF6F886FB56FF57005
-70077028708570AB710F7104715C71467147FA1571C171FE72B1000000000000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72BE7324FA16737773BD73C973D673E373D2740773F57426742A7429742E7462
-7489749F7501756F7682769C769E769B76A6FA17774652AF7821784E7864787A
-7930FA18FA19FA1A7994FA1B799B7AD17AE7FA1C7AEB7B9EFA1D7D487D5C7DB7
-7DA07DD67E527F477FA1FA1E83018362837F83C783F6844884B4855385590000
-856BFA1F85B0FA20FA21880788F58A128A378A798AA78ABE8ADFFA228AF68B53
-8B7F8CF08CF48D128D76FA238ECFFA24FA25906790DEFA269115912791DA91D7
-91DE91ED91EE91E491E592069210920A923A9240923C924E9259925192399267
-92A79277927892E792D792D992D0FA2792D592E092D39325932192FBFA28931E
-92FF931D93029370935793A493C693DE93F89431944594489592F9DCFA29969D
-96AF9733973B9743974D974F9751975598579865FA2AFA2B9927FA2C999E9A4E
-9AD99ADC9B759B729B8F9BB19BBB9C009D709D6BFA2D9E199ED1000000002170
-217121722173217421752176217721782179FFE2FFE4FF07FF02000000000000
-FA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2170217121722173217421752176217721782179216021612162216321642165
-2166216721682169FFE2FFE4FF07FF0232312116212122357E8A891C93489288
-84DC4FC970BB663168C892F966FB5F454E284EE14EFC4F004F034F394F564F92
-4F8A4F9A4F944FCD504050224FFF501E504650705042509450F450D8514A0000
-5164519D51BE51EC5215529C52A652C052DB5300530753245372539353B253DD
-FA0E549C548A54A954FF55865759576557AC57C857C7FA0FFA10589E58B2590B
-5953595B595D596359A459BA5B565BC0752F5BD85BEC5C1E5CA65CBA5CF55D27
-5D53FA115D425D6D5DB85DB95DD05F215F345F675FB75FDE605D6085608A60DE
-60D5612060F26111613761306198621362A663F56460649D64CE654E66006615
-663B6609662E661E6624666566576659FA126673669966A066B266BF66FA670E
-F929676667BB685267C06801684468CFFA136968FA14699869E26A306A6B6A46
-6A736A7E6AE26AE46BD66C3F6C5C6C866C6F6CDA6D046D876D6F000000000000
-FB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D966DAC6DCF6DF86DF26DFC6E396E5C6E276E3C6EBF6F886FB56FF570057007
-7028708570AB710F7104715C71467147FA1571C171FE72B172BE7324FA167377
-73BD73C973D673E373D2740773F57426742A7429742E74627489749F7501756F
-7682769C769E769B76A6FA17774652AF7821784E7864787A7930FA18FA190000
-FA1A7994FA1B799B7AD17AE7FA1C7AEB7B9EFA1D7D487D5C7DB77DA07DD67E52
-7F477FA1FA1E83018362837F83C783F6844884B485538559856BFA1F85B0FA20
-FA21880788F58A128A378A798AA78ABE8ADFFA228AF68B538B7F8CF08CF48D12
-8D76FA238ECFFA24FA25906790DEFA269115912791DA91D791DE91ED91EE91E4
-91E592069210920A923A9240923C924E925992519239926792A79277927892E7
-92D792D992D0FA2792D592E092D39325932192FBFA28931E92FF931D93029370
-935793A493C693DE93F89431944594489592F9DCFA29969D96AF9733973B9743
-974D974F9751975598579865FA2AFA2B9927FA2C999E9A4E9AD9000000000000
-FC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9ADC9B759B729B8F9BB19BBB9C009D709D6BFA2D9E199ED10000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/cp936.enc b/library/encoding/cp936.enc
deleted file mode 100644
index 53d975c..0000000
--- a/library/encoding/cp936.enc
+++ /dev/null
@@ -1,2162 +0,0 @@
-# Encoding file: cp936, multi-byte
-M
-003F 0 127
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E024E044E054E064E0F4E124E174E1F4E204E214E234E264E294E2E4E2F4E31
-4E334E354E374E3C4E404E414E424E444E464E4A4E514E554E574E5A4E5B4E62
-4E634E644E654E674E684E6A4E6B4E6C4E6D4E6E4E6F4E724E744E754E764E77
-4E784E794E7A4E7B4E7C4E7D4E7F4E804E814E824E834E844E854E874E8A0000
-4E904E964E974E994E9C4E9D4E9E4EA34EAA4EAF4EB04EB14EB44EB64EB74EB8
-4EB94EBC4EBD4EBE4EC84ECC4ECF4ED04ED24EDA4EDB4EDC4EE04EE24EE64EE7
-4EE94EED4EEE4EEF4EF14EF44EF84EF94EFA4EFC4EFE4F004F024F034F044F05
-4F064F074F084F0B4F0C4F124F134F144F154F164F1C4F1D4F214F234F284F29
-4F2C4F2D4F2E4F314F334F354F374F394F3B4F3E4F3F4F404F414F424F444F45
-4F474F484F494F4A4F4B4F4C4F524F544F564F614F624F664F684F6A4F6B4F6D
-4F6E4F714F724F754F774F784F794F7A4F7D4F804F814F824F854F864F874F8A
-4F8C4F8E4F904F924F934F954F964F984F994F9A4F9C4F9E4F9F4FA14FA20000
-82
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4FA44FAB4FAD4FB04FB14FB24FB34FB44FB64FB74FB84FB94FBA4FBB4FBC4FBD
-4FBE4FC04FC14FC24FC64FC74FC84FC94FCB4FCC4FCD4FD24FD34FD44FD54FD6
-4FD94FDB4FE04FE24FE44FE54FE74FEB4FEC4FF04FF24FF44FF54FF64FF74FF9
-4FFB4FFC4FFD4FFF5000500150025003500450055006500750085009500A0000
-500B500E501050115013501550165017501B501D501E50205022502350245027
-502B502F5030503150325033503450355036503750385039503B503D503F5040
-504150425044504550465049504A504B504D5050505150525053505450565057
-50585059505B505D505E505F506050615062506350645066506750685069506A
-506B506D506E506F50705071507250735074507550785079507A507C507D5081
-508250835084508650875089508A508B508C508E508F50905091509250935094
-50955096509750985099509A509B509C509D509E509F50A050A150A250A450A6
-50AA50AB50AD50AE50AF50B050B150B350B450B550B650B750B850B950BC0000
-83
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50BD50BE50BF50C050C150C250C350C450C550C650C750C850C950CA50CB50CC
-50CD50CE50D050D150D250D350D450D550D750D850D950DB50DC50DD50DE50DF
-50E050E150E250E350E450E550E850E950EA50EB50EF50F050F150F250F450F6
-50F750F850F950FA50FC50FD50FE50FF51005101510251035104510551080000
-5109510A510C510D510E510F511051115113511451155116511751185119511A
-511B511C511D511E511F512051225123512451255126512751285129512A512B
-512C512D512E512F5130513151325133513451355136513751385139513A513B
-513C513D513E51425147514A514C514E514F515051525153515751585159515B
-515D515E515F5160516151635164516651675169516A516F5172517A517E517F
-5183518451865187518A518B518E518F51905191519351945198519A519D519E
-519F51A151A351A651A751A851A951AA51AD51AE51B451B851B951BA51BE51BF
-51C151C251C351C551C851CA51CD51CE51D051D251D351D451D551D651D70000
-84
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51D851D951DA51DC51DE51DF51E251E351E551E651E751E851E951EA51EC51EE
-51F151F251F451F751FE520452055209520B520C520F5210521352145215521C
-521E521F522152225223522552265227522A522C522F5231523252345235523C
-523E524452455246524752485249524B524E524F525252535255525752580000
-5259525A525B525D525F526052625263526452665268526B526C526D526E5270
-52715273527452755276527752785279527A527B527C527E5280528352845285
-528652875289528A528B528C528D528E528F5291529252945295529652975298
-5299529A529C52A452A552A652A752AE52AF52B052B452B552B652B752B852B9
-52BA52BB52BC52BD52C052C152C252C452C552C652C852CA52CC52CD52CE52CF
-52D152D352D452D552D752D952DA52DB52DC52DD52DE52E052E152E252E352E5
-52E652E752E852E952EA52EB52EC52ED52EE52EF52F152F252F352F452F552F6
-52F752F852FB52FC52FD530153025303530453075309530A530B530C530E0000
-85
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53115312531353145318531B531C531E531F532253245325532753285329532B
-532C532D532F533053315332533353345335533653375338533C533D53405342
-53445346534B534C534D5350535453585359535B535D53655368536A536C536D
-537253765379537B537C537D537E53805381538353875388538A538E538F0000
-53905391539253935394539653975399539B539C539E53A053A153A453A753AA
-53AB53AC53AD53AF53B053B153B253B353B453B553B753B853B953BA53BC53BD
-53BE53C053C353C453C553C653C753CE53CF53D053D253D353D553DA53DC53DD
-53DE53E153E253E753F453FA53FE53FF5400540254055407540B541454185419
-541A541C542254245425542A5430543354365437543A543D543F544154425444
-544554475449544C544D544E544F5451545A545D545E545F5460546154635465
-54675469546A546B546C546D546E546F547054745479547A547E547F54815483
-5485548754885489548A548D5491549354975498549C549E549F54A054A10000
-86
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54A254A554AE54B054B254B554B654B754B954BA54BC54BE54C354C554CA54CB
-54D654D854DB54E054E154E254E354E454EB54EC54EF54F054F154F454F554F6
-54F754F854F954FB54FE550055025503550455055508550A550B550C550D550E
-5512551355155516551755185519551A551C551D551E551F5521552555260000
-55285529552B552D553255345535553655385539553A553B553D554055425545
-55475548554B554C554D554E554F5551555255535554555755585559555A555B
-555D555E555F55605562556355685569556B556F557055715572557355745579
-557A557D557F55855586558C558D558E559055925593559555965597559A559B
-559E55A055A155A255A355A455A555A655A855A955AA55AB55AC55AD55AE55AF
-55B055B255B455B655B855BA55BC55BF55C055C155C255C355C655C755C855CA
-55CB55CE55CF55D055D555D755D855D955DA55DB55DE55E055E255E755E955ED
-55EE55F055F155F455F655F855F955FA55FB55FC55FF56025603560456050000
-87
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56065607560A560B560D561056115612561356145615561656175619561A561C
-561D5620562156225625562656285629562A562B562E562F5630563356355637
-5638563A563C563D563E5640564156425643564456455646564756485649564A
-564B564F565056515652565356555656565A565B565D565E565F566056610000
-5663566556665667566D566E566F56705672567356745675567756785679567A
-567D567E567F56805681568256835684568756885689568A568B568C568D5690
-56915692569456955696569756985699569A569B569C569D569E569F56A056A1
-56A256A456A556A656A756A856A956AA56AB56AC56AD56AE56B056B156B256B3
-56B456B556B656B856B956BA56BB56BD56BE56BF56C056C156C256C356C456C5
-56C656C756C856C956CB56CC56CD56CE56CF56D056D156D256D356D556D656D8
-56D956DC56E356E556E656E756E856E956EA56EC56EE56EF56F256F356F656F7
-56F856FB56FC57005701570257055707570B570C570D570E570F571057110000
-88
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57125713571457155716571757185719571A571B571D571E5720572157225724
-572557265727572B5731573257345735573657375738573C573D573F57415743
-57445745574657485749574B5752575357545755575657585759576257635765
-5767576C576E5770577157725774577557785779577A577D577E577F57800000
-5781578757885789578A578D578E578F57905791579457955796579757985799
-579A579C579D579E579F57A557A857AA57AC57AF57B057B157B357B557B657B7
-57B957BA57BB57BC57BD57BE57BF57C057C157C457C557C657C757C857C957CA
-57CC57CD57D057D157D357D657D757DB57DC57DE57E157E257E357E557E657E7
-57E857E957EA57EB57EC57EE57F057F157F257F357F557F657F757FB57FC57FE
-57FF580158035804580558085809580A580C580E580F58105812581358145816
-58175818581A581B581C581D581F5822582358255826582758285829582B582C
-582D582E582F58315832583358345836583758385839583A583B583C583D0000
-89
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-583E583F584058415842584358455846584758485849584A584B584E584F5850
-585258535855585658575859585A585B585C585D585F58605861586258635864
-5866586758685869586A586D586E586F58705871587258735874587558765877
-58785879587A587B587C587D587F58825884588658875888588A588B588C0000
-588D588E588F5890589158945895589658975898589B589C589D58A058A158A2
-58A358A458A558A658A758AA58AB58AC58AD58AE58AF58B058B158B258B358B4
-58B558B658B758B858B958BA58BB58BD58BE58BF58C058C258C358C458C658C7
-58C858C958CA58CB58CC58CD58CE58CF58D058D258D358D458D658D758D858D9
-58DA58DB58DC58DD58DE58DF58E058E158E258E358E558E658E758E858E958EA
-58ED58EF58F158F258F458F558F758F858FA58FB58FC58FD58FE58FF59005901
-59035905590659085909590A590B590C590E591059115912591359175918591B
-591D591E592059215922592359265928592C59305932593359355936593B0000
-8A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-593D593E593F5940594359455946594A594C594D5950595259535959595B595C
-595D595E595F5961596359645966596759685969596A596B596C596D596E596F
-59705971597259755977597A597B597C597E597F598059855989598B598C598E
-598F59905991599459955998599A599B599C599D599F59A059A159A259A60000
-59A759AC59AD59B059B159B359B459B559B659B759B859BA59BC59BD59BF59C0
-59C159C259C359C459C559C759C859C959CC59CD59CE59CF59D559D659D959DB
-59DE59DF59E059E159E259E459E659E759E959EA59EB59ED59EE59EF59F059F1
-59F259F359F459F559F659F759F859FA59FC59FD59FE5A005A025A0A5A0B5A0D
-5A0E5A0F5A105A125A145A155A165A175A195A1A5A1B5A1D5A1E5A215A225A24
-5A265A275A285A2A5A2B5A2C5A2D5A2E5A2F5A305A335A355A375A385A395A3A
-5A3B5A3D5A3E5A3F5A415A425A435A445A455A475A485A4B5A4C5A4D5A4E5A4F
-5A505A515A525A535A545A565A575A585A595A5B5A5C5A5D5A5E5A5F5A600000
-8B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A615A635A645A655A665A685A695A6B5A6C5A6D5A6E5A6F5A705A715A725A73
-5A785A795A7B5A7C5A7D5A7E5A805A815A825A835A845A855A865A875A885A89
-5A8A5A8B5A8C5A8D5A8E5A8F5A905A915A935A945A955A965A975A985A995A9C
-5A9D5A9E5A9F5AA05AA15AA25AA35AA45AA55AA65AA75AA85AA95AAB5AAC0000
-5AAD5AAE5AAF5AB05AB15AB45AB65AB75AB95ABA5ABB5ABC5ABD5ABF5AC05AC3
-5AC45AC55AC65AC75AC85ACA5ACB5ACD5ACE5ACF5AD05AD15AD35AD55AD75AD9
-5ADA5ADB5ADD5ADE5ADF5AE25AE45AE55AE75AE85AEA5AEC5AED5AEE5AEF5AF0
-5AF25AF35AF45AF55AF65AF75AF85AF95AFA5AFB5AFC5AFD5AFE5AFF5B005B01
-5B025B035B045B055B065B075B085B0A5B0B5B0C5B0D5B0E5B0F5B105B115B12
-5B135B145B155B185B195B1A5B1B5B1C5B1D5B1E5B1F5B205B215B225B235B24
-5B255B265B275B285B295B2A5B2B5B2C5B2D5B2E5B2F5B305B315B335B355B36
-5B385B395B3A5B3B5B3C5B3D5B3E5B3F5B415B425B435B445B455B465B470000
-8C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B485B495B4A5B4B5B4C5B4D5B4E5B4F5B525B565B5E5B605B615B675B685B6B
-5B6D5B6E5B6F5B725B745B765B775B785B795B7B5B7C5B7E5B7F5B825B865B8A
-5B8D5B8E5B905B915B925B945B965B9F5BA75BA85BA95BAC5BAD5BAE5BAF5BB1
-5BB25BB75BBA5BBB5BBC5BC05BC15BC35BC85BC95BCA5BCB5BCD5BCE5BCF0000
-5BD15BD45BD55BD65BD75BD85BD95BDA5BDB5BDC5BE05BE25BE35BE65BE75BE9
-5BEA5BEB5BEC5BED5BEF5BF15BF25BF35BF45BF55BF65BF75BFD5BFE5C005C02
-5C035C055C075C085C0B5C0C5C0D5C0E5C105C125C135C175C195C1B5C1E5C1F
-5C205C215C235C265C285C295C2A5C2B5C2D5C2E5C2F5C305C325C335C355C36
-5C375C435C445C465C475C4C5C4D5C525C535C545C565C575C585C5A5C5B5C5C
-5C5D5C5F5C625C645C675C685C695C6A5C6B5C6C5C6D5C705C725C735C745C75
-5C765C775C785C7B5C7C5C7D5C7E5C805C835C845C855C865C875C895C8A5C8B
-5C8E5C8F5C925C935C955C9D5C9E5C9F5CA05CA15CA45CA55CA65CA75CA80000
-8D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5CAA5CAE5CAF5CB05CB25CB45CB65CB95CBA5CBB5CBC5CBE5CC05CC25CC35CC5
-5CC65CC75CC85CC95CCA5CCC5CCD5CCE5CCF5CD05CD15CD35CD45CD55CD65CD7
-5CD85CDA5CDB5CDC5CDD5CDE5CDF5CE05CE25CE35CE75CE95CEB5CEC5CEE5CEF
-5CF15CF25CF35CF45CF55CF65CF75CF85CF95CFA5CFC5CFD5CFE5CFF5D000000
-5D015D045D055D085D095D0A5D0B5D0C5D0D5D0F5D105D115D125D135D155D17
-5D185D195D1A5D1C5D1D5D1F5D205D215D225D235D255D285D2A5D2B5D2C5D2F
-5D305D315D325D335D355D365D375D385D395D3A5D3B5D3C5D3F5D405D415D42
-5D435D445D455D465D485D495D4D5D4E5D4F5D505D515D525D535D545D555D56
-5D575D595D5A5D5C5D5E5D5F5D605D615D625D635D645D655D665D675D685D6A
-5D6D5D6E5D705D715D725D735D755D765D775D785D795D7A5D7B5D7C5D7D5D7E
-5D7F5D805D815D835D845D855D865D875D885D895D8A5D8B5D8C5D8D5D8E5D8F
-5D905D915D925D935D945D955D965D975D985D9A5D9B5D9C5D9E5D9F5DA00000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5DA15DA25DA35DA45DA55DA65DA75DA85DA95DAA5DAB5DAC5DAD5DAE5DAF5DB0
-5DB15DB25DB35DB45DB55DB65DB85DB95DBA5DBB5DBC5DBD5DBE5DBF5DC05DC1
-5DC25DC35DC45DC65DC75DC85DC95DCA5DCB5DCC5DCE5DCF5DD05DD15DD25DD3
-5DD45DD55DD65DD75DD85DD95DDA5DDC5DDF5DE05DE35DE45DEA5DEC5DED0000
-5DF05DF55DF65DF85DF95DFA5DFB5DFC5DFF5E005E045E075E095E0A5E0B5E0D
-5E0E5E125E135E175E1E5E1F5E205E215E225E235E245E255E285E295E2A5E2B
-5E2C5E2F5E305E325E335E345E355E365E395E3A5E3E5E3F5E405E415E435E46
-5E475E485E495E4A5E4B5E4D5E4E5E4F5E505E515E525E535E565E575E585E59
-5E5A5E5C5E5D5E5F5E605E635E645E655E665E675E685E695E6A5E6B5E6C5E6D
-5E6E5E6F5E705E715E755E775E795E7E5E815E825E835E855E885E895E8C5E8D
-5E8E5E925E985E9B5E9D5EA15EA25EA35EA45EA85EA95EAA5EAB5EAC5EAE5EAF
-5EB05EB15EB25EB45EBA5EBB5EBC5EBD5EBF5EC05EC15EC25EC35EC45EC50000
-8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5EC65EC75EC85ECB5ECC5ECD5ECE5ECF5ED05ED45ED55ED75ED85ED95EDA5EDC
-5EDD5EDE5EDF5EE05EE15EE25EE35EE45EE55EE65EE75EE95EEB5EEC5EED5EEE
-5EEF5EF05EF15EF25EF35EF55EF85EF95EFB5EFC5EFD5F055F065F075F095F0C
-5F0D5F0E5F105F125F145F165F195F1A5F1C5F1D5F1E5F215F225F235F240000
-5F285F2B5F2C5F2E5F305F325F335F345F355F365F375F385F3B5F3D5F3E5F3F
-5F415F425F435F445F455F465F475F485F495F4A5F4B5F4C5F4D5F4E5F4F5F51
-5F545F595F5A5F5B5F5C5F5E5F5F5F605F635F655F675F685F6B5F6E5F6F5F72
-5F745F755F765F785F7A5F7D5F7E5F7F5F835F865F8D5F8E5F8F5F915F935F94
-5F965F9A5F9B5F9D5F9E5F9F5FA05FA25FA35FA45FA55FA65FA75FA95FAB5FAC
-5FAF5FB05FB15FB25FB35FB45FB65FB85FB95FBA5FBB5FBE5FBF5FC05FC15FC2
-5FC75FC85FCA5FCB5FCE5FD35FD45FD55FDA5FDB5FDC5FDE5FDF5FE25FE35FE5
-5FE65FE85FE95FEC5FEF5FF05FF25FF35FF45FF65FF75FF95FFA5FFC60070000
-90
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60086009600B600C60106011601360176018601A601E601F602260236024602C
-602D602E603060316032603360346036603760386039603A603D603E60406044
-60456046604760486049604A604C604E604F605160536054605660576058605B
-605C605E605F6060606160656066606E60716072607460756077607E60800000
-608160826085608660876088608A608B608E608F609060916093609560976098
-6099609C609E60A160A260A460A560A760A960AA60AE60B060B360B560B660B7
-60B960BA60BD60BE60BF60C060C160C260C360C460C760C860C960CC60CD60CE
-60CF60D060D260D360D460D660D760D960DB60DE60E160E260E360E460E560EA
-60F160F260F560F760F860FB60FC60FD60FE60FF61026103610461056107610A
-610B610C611061116112611361146116611761186119611B611C611D611E6121
-6122612561286129612A612C612D612E612F6130613161326133613461356136
-613761386139613A613B613C613D613E61406141614261436144614561460000
-91
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61476149614B614D614F61506152615361546156615761586159615A615B615C
-615E615F6160616161636164616561666169616A616B616C616D616E616F6171
-617261736174617661786179617A617B617C617D617E617F6180618161826183
-618461856186618761886189618A618C618D618F619061916192619361950000
-6196619761986199619A619B619C619E619F61A061A161A261A361A461A561A6
-61AA61AB61AD61AE61AF61B061B161B261B361B461B561B661B861B961BA61BB
-61BC61BD61BF61C061C161C361C461C561C661C761C961CC61CD61CE61CF61D0
-61D361D561D661D761D861D961DA61DB61DC61DD61DE61DF61E061E161E261E3
-61E461E561E761E861E961EA61EB61EC61ED61EE61EF61F061F161F261F361F4
-61F661F761F861F961FA61FB61FC61FD61FE6200620162026203620462056207
-6209621362146219621C621D621E622062236226622762286229622B622D622F
-6230623162326235623662386239623A623B623C6242624462456246624A0000
-92
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-624F62506255625662576259625A625C625D625E625F62606261626262646265
-6268627162726274627562776278627A627B627D628162826283628562866287
-6288628B628C628D628E628F629062946299629C629D629E62A362A662A762A9
-62AA62AD62AE62AF62B062B262B362B462B662B762B862BA62BE62C062C10000
-62C362CB62CF62D162D562DD62DE62E062E162E462EA62EB62F062F262F562F8
-62F962FA62FB63006303630463056306630A630B630C630D630F631063126313
-63146315631763186319631C632663276329632C632D632E6330633163336334
-6335633663376338633B633C633E633F63406341634463476348634A63516352
-635363546356635763586359635A635B635C635D63606364636563666368636A
-636B636C636F6370637263736374637563786379637C637D637E637F63816383
-638463856386638B638D639163936394639563976399639A639B639C639D639E
-639F63A163A463A663AB63AF63B163B263B563B663B963BB63BD63BF63C00000
-93
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63C163C263C363C563C763C863CA63CB63CC63D163D363D463D563D763D863D9
-63DA63DB63DC63DD63DF63E263E463E563E663E763E863EB63EC63EE63EF63F0
-63F163F363F563F763F963FA63FB63FC63FE640364046406640764086409640A
-640D640E6411641264156416641764186419641A641D641F6422642364240000
-6425642764286429642B642E642F643064316432643364356436643764386439
-643B643C643E6440644264436449644B644C644D644E644F6450645164536455
-645664576459645A645B645C645D645F64606461646264636464646564666468
-646A646B646C646E646F64706471647264736474647564766477647B647C647D
-647E647F648064816483648664886489648A648B648C648D648E648F64906493
-649464976498649A649B649C649D649F64A064A164A264A364A564A664A764A8
-64AA64AB64AF64B164B264B364B464B664B964BB64BD64BE64BF64C164C364C4
-64C664C764C864C964CA64CB64CC64CF64D164D364D464D564D664D964DA0000
-94
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64DB64DC64DD64DF64E064E164E364E564E764E864E964EA64EB64EC64ED64EE
-64EF64F064F164F264F364F464F564F664F764F864F964FA64FB64FC64FD64FE
-64FF65016502650365046505650665076508650A650B650C650D650E650F6510
-6511651365146515651665176519651A651B651C651D651E651F652065210000
-6522652365246526652765286529652A652C652D65306531653265336537653A
-653C653D6540654165426543654465466547654A654B654D654E655065526553
-655465576558655A655C655F6560656165646565656765686569656A656D656E
-656F657165736575657665786579657A657B657C657D657E657F658065816582
-658365846585658665886589658A658D658E658F65926594659565966598659A
-659D659E65A065A265A365A665A865AA65AC65AE65B165B265B365B465B565B6
-65B765B865BA65BB65BE65BF65C065C265C765C865C965CA65CD65D065D165D3
-65D465D565D865D965DA65DB65DC65DD65DE65DF65E165E365E465EA65EB0000
-95
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65F265F365F465F565F865F965FB65FC65FD65FE65FF66016604660566076608
-6609660B660D661066116612661666176618661A661B661C661E662166226623
-662466266629662A662B662C662E663066326633663766386639663A663B663D
-663F66406642664466456646664766486649664A664D664E6650665166580000
-6659665B665C665D665E666066626663666566676669666A666B666C666D6671
-66726673667566786679667B667C667D667F6680668166836685668666886689
-668A668B668D668E668F6690669266936694669566986699669A669B669C669E
-669F66A066A166A266A366A466A566A666A966AA66AB66AC66AD66AF66B066B1
-66B266B366B566B666B766B866BA66BB66BC66BD66BF66C066C166C266C366C4
-66C566C666C766C866C966CA66CB66CC66CD66CE66CF66D066D166D266D366D4
-66D566D666D766D866DA66DE66DF66E066E166E266E366E466E566E766E866EA
-66EB66EC66ED66EE66EF66F166F566F666F866FA66FB66FD6701670267030000
-96
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6704670567066707670C670E670F671167126713671667186719671A671C671E
-67206721672267236724672567276729672E6730673267336736673767386739
-673B673C673E673F6741674467456747674A674B674D67526754675567576758
-6759675A675B675D67626763676467666767676B676C676E6771677467760000
-67786779677A677B677D678067826783678567866788678A678C678D678E678F
-679167926793679467966799679B679F67A067A167A467A667A967AC67AE67B1
-67B267B467B967BA67BB67BC67BD67BE67BF67C067C267C567C667C767C867C9
-67CA67CB67CC67CD67CE67D567D667D767DB67DF67E167E367E467E667E767E8
-67EA67EB67ED67EE67F267F567F667F767F867F967FA67FB67FC67FE68016802
-680368046806680D681068126814681568186819681A681B681C681E681F6820
-6822682368246825682668276828682B682C682D682E682F6830683168346835
-6836683A683B683F6847684B684D684F68526856685768586859685A685B0000
-97
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-685C685D685E685F686A686C686D686E686F6870687168726873687568786879
-687A687B687C687D687E687F688068826884688768886889688A688B688C688D
-688E68906891689268946895689668986899689A689B689C689D689E689F68A0
-68A168A368A468A568A968AA68AB68AC68AE68B168B268B468B668B768B80000
-68B968BA68BB68BC68BD68BE68BF68C168C368C468C568C668C768C868CA68CC
-68CE68CF68D068D168D368D468D668D768D968DB68DC68DD68DE68DF68E168E2
-68E468E568E668E768E868E968EA68EB68EC68ED68EF68F268F368F468F668F7
-68F868FB68FD68FE68FF69006902690369046906690769086909690A690C690F
-69116913691469156916691769186919691A691B691C691D691E692169226923
-69256926692769286929692A692B692C692E692F693169326933693569366937
-6938693A693B693C693E694069416943694469456946694769486949694A694B
-694C694D694E694F69506951695269536955695669586959695B695C695F0000
-98
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6961696269646965696769686969696A696C696D696F69706972697369746975
-6976697A697B697D697E697F698169836985698A698B698C698E698F69906991
-69926993699669976999699A699D699E699F69A069A169A269A369A469A569A6
-69A969AA69AC69AE69AF69B069B269B369B569B669B869B969BA69BC69BD0000
-69BE69BF69C069C269C369C469C569C669C769C869C969CB69CD69CF69D169D2
-69D369D569D669D769D869D969DA69DC69DD69DE69E169E269E369E469E569E6
-69E769E869E969EA69EB69EC69EE69EF69F069F169F369F469F569F669F769F8
-69F969FA69FB69FC69FE6A006A016A026A036A046A056A066A076A086A096A0B
-6A0C6A0D6A0E6A0F6A106A116A126A136A146A156A166A196A1A6A1B6A1C6A1D
-6A1E6A206A226A236A246A256A266A276A296A2B6A2C6A2D6A2E6A306A326A33
-6A346A366A376A386A396A3A6A3B6A3C6A3F6A406A416A426A436A456A466A48
-6A496A4A6A4B6A4C6A4D6A4E6A4F6A516A526A536A546A556A566A576A5A0000
-99
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A5C6A5D6A5E6A5F6A606A626A636A646A666A676A686A696A6A6A6B6A6C6A6D
-6A6E6A6F6A706A726A736A746A756A766A776A786A7A6A7B6A7D6A7E6A7F6A81
-6A826A836A856A866A876A886A896A8A6A8B6A8C6A8D6A8F6A926A936A946A95
-6A966A986A996A9A6A9B6A9C6A9D6A9E6A9F6AA16AA26AA36AA46AA56AA60000
-6AA76AA86AAA6AAD6AAE6AAF6AB06AB16AB26AB36AB46AB56AB66AB76AB86AB9
-6ABA6ABB6ABC6ABD6ABE6ABF6AC06AC16AC26AC36AC46AC56AC66AC76AC86AC9
-6ACA6ACB6ACC6ACD6ACE6ACF6AD06AD16AD26AD36AD46AD56AD66AD76AD86AD9
-6ADA6ADB6ADC6ADD6ADE6ADF6AE06AE16AE26AE36AE46AE56AE66AE76AE86AE9
-6AEA6AEB6AEC6AED6AEE6AEF6AF06AF16AF26AF36AF46AF56AF66AF76AF86AF9
-6AFA6AFB6AFC6AFD6AFE6AFF6B006B016B026B036B046B056B066B076B086B09
-6B0A6B0B6B0C6B0D6B0E6B0F6B106B116B126B136B146B156B166B176B186B19
-6B1A6B1B6B1C6B1D6B1E6B1F6B256B266B286B296B2A6B2B6B2C6B2D6B2E0000
-9A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B2F6B306B316B336B346B356B366B386B3B6B3C6B3D6B3F6B406B416B426B44
-6B456B486B4A6B4B6B4D6B4E6B4F6B506B516B526B536B546B556B566B576B58
-6B5A6B5B6B5C6B5D6B5E6B5F6B606B616B686B696B6B6B6C6B6D6B6E6B6F6B70
-6B716B726B736B746B756B766B776B786B7A6B7D6B7E6B7F6B806B856B880000
-6B8C6B8E6B8F6B906B916B946B956B976B986B996B9C6B9D6B9E6B9F6BA06BA2
-6BA36BA46BA56BA66BA76BA86BA96BAB6BAC6BAD6BAE6BAF6BB06BB16BB26BB6
-6BB86BB96BBA6BBB6BBC6BBD6BBE6BC06BC36BC46BC66BC76BC86BC96BCA6BCC
-6BCE6BD06BD16BD86BDA6BDC6BDD6BDE6BDF6BE06BE26BE36BE46BE56BE66BE7
-6BE86BE96BEC6BED6BEE6BF06BF16BF26BF46BF66BF76BF86BFA6BFB6BFC6BFE
-6BFF6C006C016C026C036C046C086C096C0A6C0B6C0C6C0E6C126C176C1C6C1D
-6C1E6C206C236C256C2B6C2C6C2D6C316C336C366C376C396C3A6C3B6C3C6C3E
-6C3F6C436C446C456C486C4B6C4C6C4D6C4E6C4F6C516C526C536C566C580000
-9B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C596C5A6C626C636C656C666C676C6B6C6C6C6D6C6E6C6F6C716C736C756C77
-6C786C7A6C7B6C7C6C7F6C806C846C876C8A6C8B6C8D6C8E6C916C926C956C96
-6C976C986C9A6C9C6C9D6C9E6CA06CA26CA86CAC6CAF6CB06CB46CB56CB66CB7
-6CBA6CC06CC16CC26CC36CC66CC76CC86CCB6CCD6CCE6CCF6CD16CD26CD80000
-6CD96CDA6CDC6CDD6CDF6CE46CE66CE76CE96CEC6CED6CF26CF46CF96CFF6D00
-6D026D036D056D066D086D096D0A6D0D6D0F6D106D116D136D146D156D166D18
-6D1C6D1D6D1F6D206D216D226D236D246D266D286D296D2C6D2D6D2F6D306D34
-6D366D376D386D3A6D3F6D406D426D446D496D4C6D506D556D566D576D586D5B
-6D5D6D5F6D616D626D646D656D676D686D6B6D6C6D6D6D706D716D726D736D75
-6D766D796D7A6D7B6D7D6D7E6D7F6D806D816D836D846D866D876D8A6D8B6D8D
-6D8F6D906D926D966D976D986D996D9A6D9C6DA26DA56DAC6DAD6DB06DB16DB3
-6DB46DB66DB76DB96DBA6DBB6DBC6DBD6DBE6DC16DC26DC36DC86DC96DCA0000
-9C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6DCD6DCE6DCF6DD06DD26DD36DD46DD56DD76DDA6DDB6DDC6DDF6DE26DE36DE5
-6DE76DE86DE96DEA6DED6DEF6DF06DF26DF46DF56DF66DF86DFA6DFD6DFE6DFF
-6E006E016E026E036E046E066E076E086E096E0B6E0F6E126E136E156E186E19
-6E1B6E1C6E1E6E1F6E226E266E276E286E2A6E2C6E2E6E306E316E336E350000
-6E366E376E396E3B6E3C6E3D6E3E6E3F6E406E416E426E456E466E476E486E49
-6E4A6E4B6E4C6E4F6E506E516E526E556E576E596E5A6E5C6E5D6E5E6E606E61
-6E626E636E646E656E666E676E686E696E6A6E6C6E6D6E6F6E706E716E726E73
-6E746E756E766E776E786E796E7A6E7B6E7C6E7D6E806E816E826E846E876E88
-6E8A6E8B6E8C6E8D6E8E6E916E926E936E946E956E966E976E996E9A6E9B6E9D
-6E9E6EA06EA16EA36EA46EA66EA86EA96EAB6EAC6EAD6EAE6EB06EB36EB56EB8
-6EB96EBC6EBE6EBF6EC06EC36EC46EC56EC66EC86EC96ECA6ECC6ECD6ECE6ED0
-6ED26ED66ED86ED96EDB6EDC6EDD6EE36EE76EEA6EEB6EEC6EED6EEE6EEF0000
-9D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6EF06EF16EF26EF36EF56EF66EF76EF86EFA6EFB6EFC6EFD6EFE6EFF6F006F01
-6F036F046F056F076F086F0A6F0B6F0C6F0D6F0E6F106F116F126F166F176F18
-6F196F1A6F1B6F1C6F1D6F1E6F1F6F216F226F236F256F266F276F286F2C6F2E
-6F306F326F346F356F376F386F396F3A6F3B6F3C6F3D6F3F6F406F416F420000
-6F436F446F456F486F496F4A6F4C6F4E6F4F6F506F516F526F536F546F556F56
-6F576F596F5A6F5B6F5D6F5F6F606F616F636F646F656F676F686F696F6A6F6B
-6F6C6F6F6F706F716F736F756F766F776F796F7B6F7D6F7E6F7F6F806F816F82
-6F836F856F866F876F8A6F8B6F8F6F906F916F926F936F946F956F966F976F98
-6F996F9A6F9B6F9D6F9E6F9F6FA06FA26FA36FA46FA56FA66FA86FA96FAA6FAB
-6FAC6FAD6FAE6FAF6FB06FB16FB26FB46FB56FB76FB86FBA6FBB6FBC6FBD6FBE
-6FBF6FC16FC36FC46FC56FC66FC76FC86FCA6FCB6FCC6FCD6FCE6FCF6FD06FD3
-6FD46FD56FD66FD76FD86FD96FDA6FDB6FDC6FDD6FDF6FE26FE36FE46FE50000
-9E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6FE66FE76FE86FE96FEA6FEB6FEC6FED6FF06FF16FF26FF36FF46FF56FF66FF7
-6FF86FF96FFA6FFB6FFC6FFD6FFE6FFF70007001700270037004700570067007
-70087009700A700B700C700D700E700F70107012701370147015701670177018
-7019701C701D701E701F702070217022702470257026702770287029702A0000
-702B702C702D702E702F70307031703270337034703670377038703A703B703C
-703D703E703F7040704170427043704470457046704770487049704A704B704D
-704E7050705170527053705470557056705770587059705A705B705C705D705F
-7060706170627063706470657066706770687069706A706E7071707270737074
-70777079707A707B707D7081708270837084708670877088708B708C708D708F
-70907091709370977098709A709B709E709F70A070A170A270A370A470A570A6
-70A770A870A970AA70B070B270B470B570B670BA70BE70BF70C470C570C670C7
-70C970CB70CC70CD70CE70CF70D070D170D270D370D470D570D670D770DA0000
-9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-70DC70DD70DE70E070E170E270E370E570EA70EE70F070F170F270F370F470F5
-70F670F870FA70FB70FC70FE70FF710071017102710371047105710671077108
-710B710C710D710E710F7111711271147117711B711C711D711E711F71207121
-7122712371247125712771287129712A712B712C712D712E7132713371340000
-7135713771387139713A713B713C713D713E713F714071417142714371447146
-714771487149714B714D714F7150715171527153715471557156715771587159
-715A715B715D715F716071617162716371657169716A716B716C716D716F7170
-717171747175717671777179717B717C717E717F718071817182718371857186
-718771887189718B718C718D718E7190719171927193719571967197719A719B
-719C719D719E71A171A271A371A471A571A671A771A971AA71AB71AD71AE71AF
-71B071B171B271B471B671B771B871BA71BB71BC71BD71BE71BF71C071C171C2
-71C471C571C671C771C871C971CA71CB71CC71CD71CF71D071D171D271D30000
-A0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-71D671D771D871D971DA71DB71DC71DD71DE71DF71E171E271E371E471E671E8
-71E971EA71EB71EC71ED71EF71F071F171F271F371F471F571F671F771F871FA
-71FB71FC71FD71FE71FF720072017202720372047205720772087209720A720B
-720C720D720E720F7210721172127213721472157216721772187219721A0000
-721B721C721E721F722072217222722372247225722672277229722B722D722E
-722F723272337234723A723C723E72407241724272437244724572467249724A
-724B724E724F7250725172537254725572577258725A725C725E726072637264
-72657268726A726B726C726D7270727172737274727672777278727B727C727D
-7282728372857286728772887289728C728E7290729172937294729572967297
-72987299729A729B729C729D729E72A072A172A272A372A472A572A672A772A8
-72A972AA72AB72AE72B172B272B372B572BA72BB72BC72BD72BE72BF72C072C5
-72C672C772C972CA72CB72CC72CF72D172D372D472D572D672D872DA72DB0000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300200B702C902C700A8300330052014FF5E2016202620182019
-201C201D3014301530083009300A300B300C300D300E300F3016301730103011
-00B100D700F72236222722282211220F222A222922082237221A22A522252220
-23122299222B222E2261224C2248223D221D2260226E226F22642265221E2235
-22342642264000B0203220332103FF0400A4FFE0FFE1203000A7211626062605
-25CB25CF25CE25C725C625A125A025B325B2203B219221902191219330130000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000217021712172217321742175217621772178217900000000000000000000
-000024882489248A248B248C248D248E248F2490249124922493249424952496
-249724982499249A249B247424752476247724782479247A247B247C247D247E
-247F248024812482248324842485248624872460246124622463246424652466
-2467246824690000000032203221322232233224322532263227322832290000
-00002160216121622163216421652166216721682169216A216B000000000000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FFE5FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFF3CFF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-FE35FE36FE39FE3AFE3FFE40FE3DFE3EFE41FE42FE43FE4400000000FE3BFE3C
-FE37FE38FE310000FE33FE340000000000000000000000000000000000000000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-02CA02CB02D920132015202520352105210921962197219821992215221F2223
-22522266226722BF2550255125522553255425552556255725582559255A255B
-255C255D255E255F2560256125622563256425652566256725682569256A256B
-256C256D256E256F257025712572257325812582258325842585258625870000
-25882589258A258B258C258D258E258F25932594259525BC25BD25E225E325E4
-25E5260922953012301D301E0000000000000000000000000000000000000000
-0000010100E101CE00E0011300E9011B00E8012B00ED01D000EC014D00F301D2
-00F2016B00FA01D400F901D601D801DA01DC00FC00EA02510000014401480000
-0261000000000000000031053106310731083109310A310B310C310D310E310F
-3110311131123113311431153116311731183119311A311B311C311D311E311F
-3120312131223123312431253126312731283129000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30213022302330243025302630273028302932A3338E338F339C339D339E33A1
-33C433CE33D133D233D5FE30FFE2FFE400002121323100002010000000000000
-30FC309B309C30FD30FE3006309D309EFE49FE4AFE4BFE4CFE4DFE4EFE4FFE50
-FE51FE52FE54FE55FE56FE57FE59FE5AFE5BFE5CFE5DFE5EFE5FFE60FE610000
-FE62FE63FE64FE65FE66FE68FE69FE6AFE6B0000000000000000000000000000
-0000000000000000000000003007000000000000000000000000000000000000
-00000000000000002500250125022503250425052506250725082509250A250B
-250C250D250E250F2510251125122513251425152516251725182519251A251B
-251C251D251E251F2520252125222523252425252526252725282529252A252B
-252C252D252E252F2530253125322533253425352536253725382539253A253B
-253C253D253E253F2540254125422543254425452546254725482549254A254B
-0000000000000000000000000000000000000000000000000000000000000000
-AA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72DC72DD72DF72E272E372E472E572E672E772EA72EB72F572F672F972FD72FE
-72FF73007302730473057306730773087309730B730C730D730F731073117312
-731473187319731A731F732073237324732673277328732D732F733073327333
-73357336733A733B733C733D7340734173427343734473457346734773480000
-7349734A734B734C734E734F7351735373547355735673587359735A735B735C
-735D735E735F736173627363736473657366736773687369736A736B736E7370
-7371000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73727373737473757376737773787379737A737B737C737D737F738073817382
-7383738573867388738A738C738D738F73907392739373947395739773987399
-739A739C739D739E73A073A173A373A473A573A673A773A873AA73AC73AD73B1
-73B473B573B673B873B973BC73BD73BE73BF73C173C373C473C573C673C70000
-73CB73CC73CE73D273D373D473D573D673D773D873DA73DB73DC73DD73DF73E1
-73E273E373E473E673E873EA73EB73EC73EE73EF73F073F173F373F473F573F6
-73F7000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73F873F973FA73FB73FC73FD73FE73FF740074017402740474077408740B740C
-740D740E741174127413741474157416741774187419741C741D741E741F7420
-74217423742474277429742B742D742F74317432743774387439743A743B743D
-743E743F744074427443744474457446744774487449744A744B744C744D0000
-744E744F7450745174527453745474567458745D746074617462746374647465
-7466746774687469746A746B746C746E746F7471747274737474747574787479
-747A000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-747B747C747D747F748274847485748674887489748A748C748D748F74917492
-7493749474957496749774987499749A749B749D749F74A074A174A274A374A4
-74A574A674AA74AB74AC74AD74AE74AF74B074B174B274B374B474B574B674B7
-74B874B974BB74BC74BD74BE74BF74C074C174C274C374C474C574C674C70000
-74C874C974CA74CB74CC74CD74CE74CF74D074D174D374D474D574D674D774D8
-74D974DA74DB74DD74DF74E174E574E774E874E974EA74EB74EC74ED74F074F1
-74F2000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74F374F574F874F974FA74FB74FC74FD74FE7500750175027503750575067507
-75087509750A750B750C750E751075127514751575167517751B751D751E7520
-752175227523752475267527752A752E753475367539753C753D753F75417542
-75437544754675477549754A754D755075517552755375557556755775580000
-755D755E755F75607561756275637564756775687569756B756C756D756E756F
-757075717573757575767577757A757B757C757D757E75807581758275847585
-7587000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-75887589758A758C758D758E7590759375957598759B759C759E75A275A675A7
-75A875A975AA75AD75B675B775BA75BB75BF75C075C175C675CB75CC75CE75CF
-75D075D175D375D775D975DA75DC75DD75DF75E075E175E575E975EC75ED75EE
-75EF75F275F375F575F675F775F875FA75FB75FD75FE76027604760676070000
-76087609760B760D760E760F76117612761376147616761A761C761D761E7621
-762376277628762C762E762F76317632763676377639763A763B763D76417642
-7644000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-76457646764776487649764A764B764E764F7650765176527653765576577658
-7659765A765B765D765F766076617662766476657666766776687669766A766C
-766D766E767076717672767376747675767676777679767A767C767F76807681
-768376857689768A768C768D768F769076927694769576977698769A769B0000
-769C769D769E769F76A076A176A276A376A576A676A776A876A976AA76AB76AC
-76AD76AF76B076B376B576B676B776B876B976BA76BB76BC76BD76BE76C076C1
-76C3554A963F57C3632854CE550954C07691764C853C77EE827E788D72319698
-978D6C285B894FFA630966975CB880FA684880AE660276CE51F9655671AC7FF1
-888450B2596561CA6FB382AD634C625253ED54277B06516B75A45DF462D48DCB
-9776628A8019575D97387F627238767D67CF767E64464F708D2562DC7A176591
-73ED642C6273822C9881677F7248626E62CC4F3474E3534A529E7ECA90A65E2E
-6886699C81807ED168D278C5868C9551508D8C2482DE80DE5305891252650000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-76C476C776C976CB76CC76D376D576D976DA76DC76DD76DE76E076E176E276E3
-76E476E676E776E876E976EA76EB76EC76ED76F076F376F576F676F776FA76FB
-76FD76FF77007702770377057706770A770C770E770F77107711771277137714
-7715771677177718771B771C771D771E77217723772477257727772A772B0000
-772C772E773077317732773377347739773B773D773E773F7742774477457746
-77487749774A774B774C774D774E774F77527753775477557756775777587759
-775C858496F94FDD582199715B9D62B162A566B48C799C8D7206676F789160B2
-535153178F8880CC8D1D94A1500D72C8590760EB711988AB595482EF672C7B28
-5D297EF7752D6CF58E668FF8903C9F3B6BD491197B145F7C78A784D6853D6BD5
-6BD96BD65E015E8775F995ED655D5F0A5FC58F9F58C181C2907F965B97AD8FB9
-7F168D2C62414FBF53D8535E8FA88FA98FAB904D68075F6A819888689CD6618B
-522B762A5F6C658C6FD26EE85BBE6448517551B067C44E1979C9997C70B30000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-775D775E775F7760776477677769776A776D776E776F77707771777277737774
-7775777677777778777A777B777C7781778277837786778777887789778A778B
-778F77907793779477957796779777987799779A779B779C779D779E77A177A3
-77A477A677A877AB77AD77AE77AF77B177B277B477B677B777B877B977BA0000
-77BC77BE77C077C177C277C377C477C577C677C777C877C977CA77CB77CC77CE
-77CF77D077D177D277D377D477D577D677D877D977DA77DD77DE77DF77E077E1
-77E475C55E7673BB83E064AD62E894B56CE2535A52C3640F94C27B944F2F5E1B
-82368116818A6E246CCA9A736355535C54FA886557E04E0D5E036B657C3F90E8
-601664E6731C88C16750624D8D22776C8E2991C75F6983DC8521991053C28695
-6B8B60ED60E8707F82CD82314ED36CA785CF64CD7CD969FD66F9834953957B56
-4FA7518C6D4B5C428E6D63D253C9832C833667E578B4643D5BDF5C945DEE8BE7
-62C667F48C7A640063BA8749998B8C177F2094F24EA7961098A4660C73160000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77E677E877EA77EF77F077F177F277F477F577F777F977FA77FB77FC78037804
-7805780678077808780A780B780E780F7810781378157819781B781E78207821
-782278247828782A782B782E782F78317832783378357836783D783F78417842
-78437844784678487849784A784B784D784F78517853785478587859785A0000
-785B785C785E785F7860786178627863786478657866786778687869786F7870
-78717872787378747875787678787879787A787B787D787E787F788078817882
-7883573A5C1D5E38957F507F80A05382655E7545553150218D856284949E671D
-56326F6E5DE2543570928F66626F64A463A35F7B6F8890F481E38FB05C186668
-5FF16C8996488D81886C649179F057CE6A59621054484E587A0B60E96F848BDA
-627F901E9A8B79E4540375F4630153196C608FDF5F1B9A70803B9F7F4F885C3A
-8D647FC565A570BD514551B2866B5D075BA062BD916C75748E0C7A2061017B79
-4EC77EF877854E1181ED521D51FA6A7153A88E87950496CF6EC19664695A0000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7884788578867888788A788B788F789078927894789578967899789D789E78A0
-78A278A478A678A878A978AA78AB78AC78AD78AE78AF78B578B678B778B878BA
-78BB78BC78BD78BF78C078C278C378C478C678C778C878CC78CD78CE78CF78D1
-78D278D378D678D778D878DA78DB78DC78DD78DE78DF78E078E178E278E30000
-78E478E578E678E778E978EA78EB78ED78EE78EF78F078F178F378F578F678F8
-78F978FB78FC78FD78FE78FF79007902790379047906790779087909790A790B
-790C784050A877D7641089E6590463E35DDD7A7F693D4F20823955984E3275AE
-7A975E625E8A95EF521B5439708A6376952457826625693F918755076DF37EAF
-882262337EF075B5832878C196CC8F9E614874F78BCD6B64523A8D506B21806A
-847156F153064ECE4E1B51D17C97918B7C074FC38E7F7BE17A9C64675D1450AC
-810676017CB96DEC7FE067515B585BF878CB64AE641363AA632B9519642D8FBE
-7B5476296253592754466B7950A362345E266B864EE38D37888B5F85902E0000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-790D790E790F791079117912791479157916791779187919791A791B791C791D
-791F792079217922792379257926792779287929792A792B792C792D792E792F
-793079317932793379357936793779387939793D793F79427943794479457947
-794A794B794C794D794E794F7950795179527954795579587959796179630000
-796479667969796A796B796C796E79707971797279737974797579767979797B
-797C797D797E797F798279837986798779887989798B798C798D798E79907991
-79926020803D62C54E39535590F863B880C665E66C2E4F4660EE6DE18BDE5F39
-86CB5F536321515A83616863520063638E4850125C9B79775BFC52307A3B60BC
-905376D75FB75F9776848E6C706F767B7B4977AA51F3909358244F4E6EF48FEA
-654C7B1B72C46DA47FDF5AE162B55E95573084827B2C5E1D5F1F90127F1498A0
-63826EC7789870B95178975B57AB75354F4375385E9760E659606DC06BBF7889
-53FC96D551CB52016389540A94938C038DCC7239789F87768FED8C0D53E00000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7993799479957996799779987999799B799C799D799E799F79A079A179A279A3
-79A479A579A679A879A979AA79AB79AC79AD79AE79AF79B079B179B279B479B5
-79B679B779B879BC79BF79C279C479C579C779C879CA79CC79CE79CF79D079D3
-79D479D679D779D979DA79DB79DC79DD79DE79E079E179E279E579E879EA0000
-79EC79EE79F179F279F379F479F579F679F779F979FA79FC79FE79FF7A017A04
-7A057A077A087A097A0A7A0C7A0F7A107A117A127A137A157A167A187A197A1B
-7A1C4E0176EF53EE948998769F0E952D5B9A8BA24E224E1C51AC846361C252A8
-680B4F97606B51BB6D1E515C6296659796618C46901775D890FD77636BD2728A
-72EC8BFB583577798D4C675C9540809A5EA66E2159927AEF77ED953B6BB565AD
-7F0E58065151961F5BF958A954288E726566987F56E4949D76FE9041638754C6
-591A593A579B8EB267358DFA8235524160F0581586FE5CE89E454FC4989D8BB9
-5A2560765384627C904F9102997F6069800C513F80335C1499756D314E8C0000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A1D7A1F7A217A227A247A257A267A277A287A297A2A7A2B7A2C7A2D7A2E7A2F
-7A307A317A327A347A357A367A387A3A7A3E7A407A417A427A437A447A457A47
-7A487A497A4A7A4B7A4C7A4D7A4E7A4F7A507A527A537A547A557A567A587A59
-7A5A7A5B7A5C7A5D7A5E7A5F7A607A617A627A637A647A657A667A677A680000
-7A697A6A7A6B7A6C7A6D7A6E7A6F7A717A727A737A757A7B7A7C7A7D7A7E7A82
-7A857A877A897A8A7A8B7A8C7A8E7A8F7A907A937A947A997A9A7A9B7A9E7AA1
-7AA28D3053D17F5A7B4F4F104E4F96006CD573D085E95E06756A7FFB6A0A77FE
-94927E4151E170E653CD8FD483038D2972AF996D6CDB574A82B365B980AA623F
-963259A84EFF8BBF7EBA653E83F2975E556198DE80A5532A8BFD542080BA5E9F
-6CB88D3982AC915A54296C1B52067EB7575F711A6C7E7C89594B4EFD5FFF6124
-7CAA4E305C0167AB87025CF0950B98CE75AF70FD902251AF7F1D8BBD594951E4
-4F5B5426592B657780A45B75627662C28F905E456C1F7B264F0F4FD8670D0000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7AA37AA47AA77AA97AAA7AAB7AAE7AAF7AB07AB17AB27AB47AB57AB67AB77AB8
-7AB97ABA7ABB7ABC7ABD7ABE7AC07AC17AC27AC37AC47AC57AC67AC77AC87AC9
-7ACA7ACC7ACD7ACE7ACF7AD07AD17AD27AD37AD47AD57AD77AD87ADA7ADB7ADC
-7ADD7AE17AE27AE47AE77AE87AE97AEA7AEB7AEC7AEE7AF07AF17AF27AF30000
-7AF47AF57AF67AF77AF87AFB7AFC7AFE7B007B017B027B057B077B097B0C7B0D
-7B0E7B107B127B137B167B177B187B1A7B1C7B1D7B1F7B217B227B237B277B29
-7B2D6D6E6DAA798F88B15F17752B629A8F854FEF91DC65A7812F81515E9C8150
-8D74526F89868D4B590D50854ED8961C723681798D1F5BCC8BA3964459877F1A
-54905676560E8BE565396982949976D66E895E727518674667D17AFF809D8D76
-611F79C665628D635188521A94A27F38809B7EB25C976E2F67607BD9768B9AD8
-818F7F947CD5641E95507A3F544A54E56B4C640162089E3D80F3759952729769
-845B683C86E49601969494EC4E2A54047ED968398DDF801566F45E9A7FB90000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7B2F7B307B327B347B357B367B377B397B3B7B3D7B3F7B407B417B427B437B44
-7B467B487B4A7B4D7B4E7B537B557B577B597B5C7B5E7B5F7B617B637B647B65
-7B667B677B687B697B6A7B6B7B6C7B6D7B6F7B707B737B747B767B787B7A7B7C
-7B7D7B7F7B817B827B837B847B867B877B887B897B8A7B8B7B8C7B8E7B8F0000
-7B917B927B937B967B987B997B9A7B9B7B9E7B9F7BA07BA37BA47BA57BAE7BAF
-7BB07BB27BB37BB57BB67BB77BB97BBA7BBB7BBC7BBD7BBE7BBF7BC07BC27BC3
-7BC457C2803F68975DE5653B529F606D9F9A4F9B8EAC516C5BAB5F135DE96C5E
-62F18D21517194A952FE6C9F82DF72D757A267848D2D591F8F9C83C754957B8D
-4F306CBD5B6459D19F1353E486CA9AA88C3780A16545987E56FA96C7522E74DC
-52505BE1630289024E5662D0602A68FA51735B9851A089C27BA199867F5060EF
-704C8D2F51495E7F901B747089C4572D78455F529F9F95FA8F689B3C8BE17678
-684267DC8DEA8D35523D8F8A6EDA68CD950590ED56FD679C88F98FC754C80000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7BC57BC87BC97BCA7BCB7BCD7BCE7BCF7BD07BD27BD47BD57BD67BD77BD87BDB
-7BDC7BDE7BDF7BE07BE27BE37BE47BE77BE87BE97BEB7BEC7BED7BEF7BF07BF2
-7BF37BF47BF57BF67BF87BF97BFA7BFB7BFD7BFF7C007C017C027C037C047C05
-7C067C087C097C0A7C0D7C0E7C107C117C127C137C147C157C177C187C190000
-7C1A7C1B7C1C7C1D7C1E7C207C217C227C237C247C257C287C297C2B7C2C7C2D
-7C2E7C2F7C307C317C327C337C347C357C367C377C397C3A7C3B7C3C7C3D7C3E
-7C429AB85B696D776C264EA55BB39A87916361A890AF97E9542B6DB55BD251FD
-558A7F557FF064BC634D65F161BE608D710A6C576C49592F676D822A58D5568E
-8C6A6BEB90DD597D801753F76D695475559D837783CF683879BE548C4F555408
-76D28C8996026CB36DB88D6B89109E648D3A563F9ED175D55F8872E0606854FC
-4EA86A2A886160528F7054C470D886799E3F6D2A5B8F5F187EA255894FAF7334
-543C539A5019540E547C4E4E5FFD745A58F6846B80E1877472D07CCA6E560000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7C437C447C457C467C477C487C497C4A7C4B7C4C7C4E7C4F7C507C517C527C53
-7C547C557C567C577C587C597C5A7C5B7C5C7C5D7C5E7C5F7C607C617C627C63
-7C647C657C667C677C687C697C6A7C6B7C6C7C6D7C6E7C6F7C707C717C727C75
-7C767C777C787C797C7A7C7E7C7F7C807C817C827C837C847C857C867C870000
-7C887C8A7C8B7C8C7C8D7C8E7C8F7C907C937C947C967C997C9A7C9B7CA07CA1
-7CA37CA67CA77CA87CA97CAB7CAC7CAD7CAF7CB07CB47CB57CB67CB77CB87CBA
-7CBB5F27864E552C62A44E926CAA623782B154D7534E733E6ED1753B52125316
-8BDD69D05F8A60006DEE574F6B2273AF68538FD87F13636260A3552475EA8C62
-71156DA35BA65E7B8352614C9EC478FA87577C27768751F060F6714C66435E4C
-604D8C0E707063258F895FBD606286D456DE6BC160946167534960E066668D3F
-79FD4F1A70E96C478BB38BF27ED88364660F5A5A9B426D516DF78C416D3B4F19
-706B83B7621660D1970D8D27797851FB573E57FA673A75787A3D79EF7B950000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7CBF7CC07CC27CC37CC47CC67CC97CCB7CCE7CCF7CD07CD17CD27CD37CD47CD8
-7CDA7CDB7CDD7CDE7CE17CE27CE37CE47CE57CE67CE77CE97CEA7CEB7CEC7CED
-7CEE7CF07CF17CF27CF37CF47CF57CF67CF77CF97CFA7CFC7CFD7CFE7CFF7D00
-7D017D027D037D047D057D067D077D087D097D0B7D0C7D0D7D0E7D0F7D100000
-7D117D127D137D147D157D167D177D187D197D1A7D1B7D1C7D1D7D1E7D1F7D21
-7D237D247D257D267D287D297D2A7D2C7D2D7D2E7D307D317D327D337D347D35
-7D36808C99658FF96FC08BA59E2159EC7EE97F095409678168D88F917C4D96C6
-53CA602575BE6C7253735AC97EA7632451E0810A5DF184DF628051805B634F0E
-796D524260B86D4E5BC45BC28BA18BB065E25FCC964559937EE77EAA560967B7
-59394F735BB652A0835A988A8D3E753294BE50477A3C4EF767B69A7E5AC16B7C
-76D1575A5C167B3A95F4714E517C80A9827059787F04832768C067EC78B17877
-62E363617B804FED526A51CF835069DB92748DF58D3189C1952E7BAD4EF60000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D377D387D397D3A7D3B7D3C7D3D7D3E7D3F7D407D417D427D437D447D457D46
-7D477D487D497D4A7D4B7D4C7D4D7D4E7D4F7D507D517D527D537D547D557D56
-7D577D587D597D5A7D5B7D5C7D5D7D5E7D5F7D607D617D627D637D647D657D66
-7D677D687D697D6A7D6B7D6C7D6D7D6F7D707D717D727D737D747D757D760000
-7D787D797D7A7D7B7D7C7D7D7D7E7D7F7D807D817D827D837D847D857D867D87
-7D887D897D8A7D8B7D8C7D8D7D8E7D8F7D907D917D927D937D947D957D967D97
-7D98506582305251996F6E106E856DA75EFA50F559DC5C066D466C5F7586848B
-686859568BB253209171964D854969127901712680F64EA490CA6D479A845A07
-56BC640594F077EB4FA5811A72E189D2997A7F347EDE527F655991758F7F8F83
-53EB7A9663ED63A5768679F888579636622A52AB8282685467706377776B7AED
-6D017ED389E359D0621285C982A5754C501F4ECB75A58BEB5C4A5DFE7B4B65A4
-91D14ECA6D25895F7D2795264EC58C288FDB9773664B79818FD170EC6D780000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D997D9A7D9B7D9C7D9D7D9E7D9F7DA07DA17DA27DA37DA47DA57DA77DA87DA9
-7DAA7DAB7DAC7DAD7DAF7DB07DB17DB27DB37DB47DB57DB67DB77DB87DB97DBA
-7DBB7DBC7DBD7DBE7DBF7DC07DC17DC27DC37DC47DC57DC67DC77DC87DC97DCA
-7DCB7DCC7DCD7DCE7DCF7DD07DD17DD27DD37DD47DD57DD67DD77DD87DD90000
-7DDA7DDB7DDC7DDD7DDE7DDF7DE07DE17DE27DE37DE47DE57DE67DE77DE87DE9
-7DEA7DEB7DEC7DED7DEE7DEF7DF07DF17DF27DF37DF47DF57DF67DF77DF87DF9
-7DFA5C3D52B283465162830E775B66769CB84EAC60CA7CBE7CB37ECF4E958B66
-666F988897595883656C955C5F8475C997567ADF7ADE51C070AF7A9863EA7A76
-7EA0739697ED4E4570784E5D915253A9655165E781FC8205548E5C31759A97A0
-62D872D975BD5C459A7983CA5C40548077E94E3E6CAE805A62D2636E5DE85177
-8DDD8E1E952F4FF153E560E770AC526763509E435A1F5026773753777EE26485
-652B628963985014723589C951B38BC07EDD574783CC94A7519B541B5CFB0000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7DFB7DFC7DFD7DFE7DFF7E007E017E027E037E047E057E067E077E087E097E0A
-7E0B7E0C7E0D7E0E7E0F7E107E117E127E137E147E157E167E177E187E197E1A
-7E1B7E1C7E1D7E1E7E1F7E207E217E227E237E247E257E267E277E287E297E2A
-7E2B7E2C7E2D7E2E7E2F7E307E317E327E337E347E357E367E377E387E390000
-7E3A7E3C7E3D7E3E7E3F7E407E427E437E447E457E467E487E497E4A7E4B7E4C
-7E4D7E4E7E4F7E507E517E527E537E547E557E567E577E587E597E5A7E5B7E5C
-7E5D4FCA7AE36D5A90E19A8F55805496536154AF5F0063E9697751EF6168520A
-582A52D8574E780D770B5EB761777CE0625B62974EA27095800362F770E49760
-577782DB67EF68F578D5989779D158F354B353EF6E34514B523B5BA28BFE80AF
-554357A660735751542D7A7A60505B5463A762A053E362635BC767AF54ED7A9F
-82E691775E9388E4593857AE630E8DE880EF57577B774FA95FEB5BBD6B3E5321
-7B5072C2684677FF773665F751B54E8F76D45CBF7AA58475594E9B4150800000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E5E7E5F7E607E617E627E637E647E657E667E677E687E697E6A7E6B7E6C7E6D
-7E6E7E6F7E707E717E727E737E747E757E767E777E787E797E7A7E7B7E7C7E7D
-7E7E7E7F7E807E817E837E847E857E867E877E887E897E8A7E8B7E8C7E8D7E8E
-7E8F7E907E917E927E937E947E957E967E977E987E997E9A7E9C7E9D7E9E0000
-7EAE7EB47EBB7EBC7ED67EE47EEC7EF97F0A7F107F1E7F377F397F3B7F3C7F3D
-7F3E7F3F7F407F417F437F467F477F487F497F4A7F4B7F4C7F4D7F4E7F4F7F52
-7F53998861276E8357646606634656F062EC62695ED39614578362C955878721
-814A8FA3556683B167658D5684DD5A6A680F62E67BEE961151706F9C8C3063FD
-89C861D27F0670C26EE57405699472FC5ECA90CE67176D6A635E52B372628001
-4F6C59E5916A70D96D9D52D24E5096F7956D857E78CA7D2F5121579264C2808B
-7C7B6CEA68F1695E51B7539868A872819ECE7BF172F879BB6F137406674E91CC
-9CA4793C83898354540F68174E3D538952B1783E5386522950884F8B4FD00000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7F567F597F5B7F5C7F5D7F5E7F607F637F647F657F667F677F6B7F6C7F6D7F6F
-7F707F737F757F767F777F787F7A7F7B7F7C7F7D7F7F7F807F827F837F847F85
-7F867F877F887F897F8B7F8D7F8F7F907F917F927F937F957F967F977F987F99
-7F9B7F9C7FA07FA27FA37FA57FA67FA87FA97FAA7FAB7FAC7FAD7FAE7FB10000
-7FB37FB47FB57FB67FB77FBA7FBB7FBE7FC07FC27FC37FC47FC67FC77FC87FC9
-7FCB7FCD7FCF7FD07FD17FD27FD37FD67FD77FD97FDA7FDB7FDC7FDD7FDE7FE2
-7FE375E27ACB7C926CA596B6529B748354E94FE9805483B28FDE95705EC9601C
-6D9F5E18655B813894FE604B70BC7EC37CAE51C968817CB1826F4E248F8691CF
-667E4EAE8C0564A9804A50DA759771CE5BE58FBD6F664E86648295635ED66599
-521788C270C852A3730E7433679778F797164E3490BB9CDE6DCB51DB8D41541D
-62CE73B283F196F69F8494C34F367F9A51CC707596755CAD988653E64EE46E9C
-740969B4786B998F7559521876246D4167F3516D9F99804B54997B3C7ABF0000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7FE47FE77FE87FEA7FEB7FEC7FED7FEF7FF27FF47FF57FF67FF77FF87FF97FFA
-7FFD7FFE7FFF8002800780088009800A800E800F80118013801A801B801D801E
-801F802180238024802B802C802D802E802F8030803280348039803A803C803E
-8040804180448045804780488049804E804F8050805180538055805680570000
-8059805B805C805D805E805F806080618062806380648065806680678068806B
-806C806D806E806F807080728073807480758076807780788079807A807B807C
-807D9686578462E29647697C5A0464027BD36F0F964B82A6536298855E907089
-63B35364864F9C819E93788C97328DEF8D429E7F6F5E79845F559646622E9A74
-541594DD4FA365C55C655C617F1586516C2F5F8B73876EE47EFF5CE6631B5B6A
-6EE653754E7163A0756562A18F6E4F264ED16CA67EB68BBA841D87BA7F57903B
-95237BA99AA188F8843D6D1B9A867EDC59889EBB739B780186829A6C9A82561B
-541757CB4E709EA653568FC881097792999286EE6EE1851366FC61626F2B0000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-807E8081808280858088808A808D808E808F8090809180928094809580978099
-809E80A380A680A780A880AC80B080B380B580B680B880B980BB80C580C780C8
-80C980CA80CB80CF80D080D180D280D380D480D580D880DF80E080E280E380E6
-80EE80F580F780F980FB80FE80FF8100810181038104810581078108810B0000
-810C811581178119811B811C811D811F81208121812281238124812581268127
-81288129812A812B812D812E813081338134813581378139813A813B813C813D
-813F8C298292832B76F26C135FD983BD732B8305951A6BDB77DB94C6536F8302
-51925E3D8C8C8D384E4873AB679A68859176970971646CA177095A9295416BCF
-7F8E66275BD059B95A9A95E895F74EEC840C84996AAC76DF9530731B68A65B5F
-772F919A97617CDC8FF78C1C5F257C7379D889C56CCC871C5BC65E4268C97720
-7EF55195514D52C95A297F05976282D763CF778485D079D26E3A5E9959998511
-706D6C1162BF76BF654F60AF95FD660E879F9E2394ED540D547D8C2C64780000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81408141814281438144814581478149814D814E814F8152815681578158815B
-815C815D815E815F816181628163816481668168816A816B816C816F81728173
-81758176817781788181818381848185818681878189818B818C818D818E8190
-8192819381948195819681978199819A819E819F81A081A181A281A481A50000
-81A781A981AB81AC81AD81AE81AF81B081B181B281B481B581B681B781B881B9
-81BC81BD81BE81BF81C481C581C781C881C981CB81CD81CE81CF81D081D181D2
-81D3647986116A21819C78E864699B5462B9672B83AB58A89ED86CAB6F205BDE
-964C8C0B725F67D062C772614EA959C66BCD589366AE5E5552DF6155672876EE
-776672677A4662FF54EA545094A090A35A1C7EB36C164E435976801059485357
-753796BE56CA63208111607C95F96DD65462998151855AE980FD59AE9713502A
-6CE55C3C62DF4F60533F817B90066EBA852B62C85E7478BE64B5637B5FF55A18
-917F9E1F5C3F634F80425B7D556E954A954D6D8560A867E072DE51DD5B810000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81D481D581D681D781D881D981DA81DB81DC81DD81DE81DF81E081E181E281E4
-81E581E681E881E981EB81EE81EF81F081F181F281F581F681F781F881F981FA
-81FD81FF8203820782088209820A820B820E820F821182138215821682178218
-8219821A821D822082248225822682278229822E8232823A823C823D823F0000
-8240824182428243824582468248824A824C824D824E82508251825282538254
-8255825682578259825B825C825D825E82608261826282638264826582668267
-826962E76CDE725B626D94AE7EBD81136D53519C5F04597452AA601259736696
-8650759F632A61E67CEF8BFA54E66B279E256BB485D5545550766CA4556A8DB4
-722C5E156015743662CD6392724C5F986E436D3E65006F5876D878D076FC7554
-522453DB4E535E9E65C1802A80D6629B5486522870AE888D8DD16CE1547880DA
-57F988F48D54966A914D4F696C9B55B776C6783062A870F96F8E5F6D84EC68DA
-787C7BF781A8670B9E4F636778B0576F78129739627962AB528874356BD70000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-826A826B826C826D82718275827682778278827B827C82808281828382858286
-82878289828C82908293829482958296829A829B829E82A082A282A382A782B2
-82B582B682BA82BB82BC82BF82C082C282C382C582C682C982D082D682D982DA
-82DD82E282E782E882E982EA82EC82ED82EE82F082F282F382F582F682F80000
-82FA82FC82FD82FE82FF8300830A830B830D831083128313831683188319831D
-831E831F83208321832283238324832583268329832A832E833083328337833B
-833D5564813E75B276AE533975DE50FB5C418B6C7BC7504F72479A9798D86F02
-74E27968648777A562FC98918D2B54C180584E52576A82F9840D5E7351ED74F6
-8BC45C4F57616CFC98875A4678349B448FEB7C955256625194FA4EC683868461
-83E984B257D467345703666E6D668C3166DD7011671F6B3A6816621A59BB4E03
-51C46F0667D26C8F517668CB59476B6775665D0E81109F5065D7794879419A91
-8D775C824E5E4F01542F5951780C56686C148FC45F036C7D6CE38BAB63900000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-833E833F83418342834483458348834A834B834C834D834E8353835583568357
-83588359835D836283708371837283738374837583768379837A837E837F8380
-838183828383838483878388838A838B838C838D838F83908391839483958396
-83978399839A839D839F83A183A283A383A483A583A683A783AC83AD83AE0000
-83AF83B583BB83BE83BF83C283C383C483C683C883C983CB83CD83CE83D083D1
-83D283D383D583D783D983DA83DB83DE83E283E383E483E683E783E883EB83EC
-83ED60706D3D72756266948E94C553438FC17B7E4EDF8C264E7E9ED494B194B3
-524D6F5C90636D458C3458115D4C6B206B4967AA545B81547F8C589985375F3A
-62A26A47953965726084686577A74E544FA85DE7979864AC7FD85CED4FCF7A8D
-520783044E14602F7A8394A64FB54EB279E6743452E482B964D279BD5BDD6C81
-97528F7B6C22503E537F6E0564CE66746C3060C598778BF75E86743C7A7779CB
-4E1890B174036C4256DA914B6CC58D8B533A86C666F28EAF5C489A716E200000
-C8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-83EE83EF83F383F483F583F683F783FA83FB83FC83FE83FF8400840284058407
-84088409840A84108412841384148415841684178419841A841B841E841F8420
-8421842284238429842A842B842C842D842E842F843084328433843484358436
-84378439843A843B843E843F8440844184428443844484458447844884490000
-844A844B844C844D844E844F8450845284538454845584568458845D845E845F
-8460846284648465846684678468846A846E846F84708472847484778479847B
-847C53D65A369F8B8DA353BB570898A76743919B6CC9516875CA62F372AC5238
-529D7F3A7094763853749E4A69B7786E96C088D97FA4713671C3518967D374E4
-58E4651856B78BA9997662707ED560F970ED58EC4EC14EBA5FCD97E74EFB8BA4
-5203598A7EAB62544ECD65E5620E833884C98363878D71946EB65BB97ED25197
-63C967D480898339881551125B7A59828FB14E736C5D516589258F6F962E854A
-745E951095F06DA682E55F3164926D128428816E9CC3585E8D5B4E0953C10000
-C9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-847D847E847F848084818483848484858486848A848D848F8490849184928493
-8494849584968498849A849B849D849E849F84A084A284A384A484A584A684A7
-84A884A984AA84AB84AC84AD84AE84B084B184B384B584B684B784BB84BC84BE
-84C084C284C384C584C684C784C884CB84CC84CE84CF84D284D484D584D70000
-84D884D984DA84DB84DC84DE84E184E284E484E784E884E984EA84EB84ED84EE
-84EF84F184F284F384F484F584F684F784F884F984FA84FB84FD84FE85008501
-85024F1E6563685155D34E2764149A9A626B5AC2745F82726DA968EE50E7838E
-7802674052396C997EB150BB5565715E7B5B665273CA82EB67495C715220717D
-886B95EA965564C58D6181B355846C5562477F2E58924F2455468D4F664C4E0A
-5C1A88F368A2634E7A0D70E7828D52FA97F65C1154E890B57ECD59628D4A86C7
-820C820D8D6664445C0461516D89793E8BBE78377533547B4F388EAB6DF15A20
-7EC5795E6C885BA15A76751A80BE614E6E1758F0751F7525727253477EF30000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8503850485058506850785088509850A850B850D850E850F8510851285148515
-851685188519851B851C851D851E852085228523852485258526852785288529
-852A852D852E852F8530853185328533853485358536853E853F854085418542
-8544854585468547854B854C854D854E854F8550855185528553855485550000
-85578558855A855B855C855D855F85608561856285638565856685678569856A
-856B856C856D856E856F8570857185738575857685778578857C857D857F8580
-8581770176DB526980DC57235E08593172EE65BD6E7F8BD75C388671534177F3
-62FE65F64EC098DF86805B9E8BC653F277E24F7F5C4E9A7659CB5F0F793A58EB
-4E1667FF4E8B62ED8A93901D52BF662F55DC566C90024ED54F8D91CA99706C0F
-5E0260435BA489C68BD56536624B99965B885BFF6388552E53D77626517D852C
-67A268B36B8A62928F9353D482126DD1758F4E668D4E5B70719F85AF669166D9
-7F7287009ECD9F205C5E672F8FF06811675F620D7AD658855EB665706F310000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85828583858685888589858A858B858C858D858E859085918592859385948595
-8596859785988599859A859D859E859F85A085A185A285A385A585A685A785A9
-85AB85AC85AD85B185B285B385B485B585B685B885BA85BB85BC85BD85BE85BF
-85C085C285C385C485C585C685C785C885CA85CB85CC85CD85CE85D185D20000
-85D485D685D785D885D985DA85DB85DD85DE85DF85E085E185E285E385E585E6
-85E785E885EA85EB85EC85ED85EE85EF85F085F185F285F385F485F585F685F7
-85F860555237800D6454887075295E05681362F4971C53CC723D8C016C347761
-7A0E542E77AC987A821C8BF47855671470C165AF64955636601D79C153F84E1D
-6B7B80865BFA55E356DB4F3A4F3C99725DF3677E80386002988290015B8B8BBC
-8BF5641C825864DE55FD82CF91654FD77D20901F7C9F50F358516EAF5BBF8BC9
-80839178849C7B97867D968B968F7EE59AD3788E5C817A57904296A7795F5B59
-635F7B0B84D168AD55067F2974107D2295016240584C4ED65B83597958540000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85F985FA85FC85FD85FE860086018602860386048606860786088609860A860B
-860C860D860E860F86108612861386148615861786188619861A861B861C861D
-861E861F86208621862286238624862586268628862A862B862C862D862E862F
-863086318632863386348635863686378639863A863B863D863E863F86400000
-864186428643864486458646864786488649864A864B864C8652865386558656
-865786588659865B865C865D865F866086618663866486658666866786688669
-866A736D631E8E4B8E0F80CE82D462AC53F06CF0915E592A60016C70574D644A
-8D2A762B6EE9575B6A8075F06F6D8C2D8C0857666BEF889278B363A253F970AD
-6C645858642A580268E0819B55107CD650188EBA6DCC8D9F70EB638F6D9B6ED4
-7EE68404684390036DD896768BA85957727985E4817E75BC8A8A68AF52548E22
-951163D098988E44557C4F5366FF568F60D56D9552435C4959296DFB586B7530
-751C606C82148146631167618FE2773A8DF38D3494C15E165385542C70C30000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-866D866F86708672867386748675867686778678868386848685868686878688
-8689868E868F86908691869286948696869786988699869A869B869E869F86A0
-86A186A286A586A686AB86AD86AE86B286B386B786B886B986BB86BC86BD86BE
-86BF86C186C286C386C586C886CC86CD86D286D386D586D686D786DA86DC0000
-86DD86E086E186E286E386E586E686E786E886EA86EB86EC86EF86F586F686F7
-86FA86FB86FC86FD86FF8701870487058706870B870C870E870F871087118714
-87166C405EF7505C4EAD5EAD633A8247901A6850916E77B3540C94DC5F647AE5
-687663457B527EDF75DB507762955934900F51F879C37A8156FE5F9290146D82
-5C60571F541051546E4D56E263A89893817F8715892A9000541E5C6F81C062D6
-625881319E3596409A6E9A7C692D59A562D3553E631654C786D96D3C5A0374E6
-889C6B6A59168C4C5F2F6E7E73A9987D4E3870F75B8C7897633D665A769660CB
-5B9B5A494E0781556C6A738B4EA167897F515F8065FA671B5FD859845A010000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8719871B871D871F87208724872687278728872A872B872C872D872F87308732
-87338735873687388739873A873C873D8740874187428743874487458746874A
-874B874D874F8750875187528754875587568758875A875B875C875D875E875F
-876187628766876787688769876A876B876C876D876F87718772877387750000
-877787788779877A877F878087818784878687878789878A878C878E878F8790
-8791879287948795879687988799879A879B879C879D879E87A087A187A287A3
-87A45DCD5FAE537197E68FDD684556F4552F60DF4E3A6F4D7EF482C7840E59D4
-4F1F4F2A5C3E7EAC672A851A5473754F80C355829B4F4F4D6E2D8C135C096170
-536B761F6E29868A658795FB7EB9543B7A337D0A95EE55E17FC174EE631D8717
-6DA17A9D621165A1536763E16C835DEB545C94A84E4C6C618BEC5C4B65E0829C
-68A7543E54346BCB6B664E9463425348821E4F0D4FAE575E620A96FE66647269
-52FF52A1609F8BEF661471996790897F785277FD6670563B54389521727A0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-87A587A687A787A987AA87AE87B087B187B287B487B687B787B887B987BB87BC
-87BE87BF87C187C287C387C487C587C787C887C987CC87CD87CE87CF87D087D4
-87D587D687D787D887D987DA87DC87DD87DE87DF87E187E287E387E487E687E7
-87E887E987EB87EC87ED87EF87F087F187F287F387F487F587F687F787F80000
-87FA87FB87FC87FD87FF880088018802880488058806880788088809880B880C
-880D880E880F8810881188128814881788188819881A881C881D881E881F8820
-88237A00606F5E0C6089819D591560DC718470EF6EAA6C5072806A8488AD5E2D
-4E605AB3559C94E36D177CFB9699620F7EC6778E867E5323971E8F9666875CE1
-4FA072ED4E0B53A6590F54136380952851484ED99C9C7EA454B88D2488548237
-95F26D8E5F265ACC663E966973B0732E53BF817A99857FA15BAA967796507EBF
-76F853A2957699997BB189446E584E617FD479658BE660F354CD4EAB98795DF7
-6A6150CF54118C618427785D9704524A54EE56A395006D885BB56DC666530000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-882488258826882788288829882A882B882C882D882E882F8830883188338834
-8835883688378838883A883B883D883E883F8841884288438846884788488849
-884A884B884E884F8850885188528853885588568858885A885B885C885D885E
-885F886088668867886A886D886F8871887388748875887688788879887A0000
-887B887C88808883888688878889888A888C888E888F88908891889388948895
-889788988899889A889B889D889E889F88A088A188A388A588A688A788A888A9
-88AA5C0F5B5D6821809655787B11654869544E9B6B47874E978B534F631F643A
-90AA659C80C18C10519968B0537887F961C86CC46CFB8C225C5185AA82AF950C
-6B238F9B65B05FFB5FC34FE18845661F8165732960FA51745211578B5F6290A2
-884C91925E78674F602759D3514451F680F853086C7996C4718A4F114FEE7F9E
-673D55C5950879C088967EE3589F620C9700865A5618987B5F908BB884C49157
-53D965ED5E8F755C60647D6E5A7F7EEA7EED8F6955A75BA360AC65CB73840000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-88AC88AE88AF88B088B288B388B488B588B688B888B988BA88BB88BD88BE88BF
-88C088C388C488C788C888CA88CB88CC88CD88CF88D088D188D388D688D788DA
-88DB88DC88DD88DE88E088E188E688E788E988EA88EB88EC88ED88EE88EF88F2
-88F588F688F788FA88FB88FD88FF890089018903890489058906890789080000
-8909890B890C890D890E890F891189148915891689178918891C891D891E891F
-89208922892389248926892789288929892C892D892E892F8931893289338935
-89379009766377297EDA9774859B5B667A7496EA884052CB718F5FAA65EC8BE2
-5BFB9A6F5DE16B896C5B8BAD8BAF900A8FC5538B62BC9E269E2D54404E2B82BD
-7259869C5D1688596DAF96C554D14E9A8BB6710954BD960970DF6DF976D04E25
-781487125CA95EF68A00989C960E708E6CBF594463A9773C884D6F1482735830
-71D5538C781A96C155015F6671305BB48C1A9A8C6B83592E9E2F79E76768626C
-4F6F75A17F8A6D0B96336C274EF075D2517B68376F3E90808170599674760000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89388939893A893B893C893D893E893F89408942894389458946894789488949
-894A894B894C894D894E894F8950895189528953895489558956895789588959
-895A895B895C895D896089618962896389648965896789688969896A896B896C
-896D896E896F8970897189728973897489758976897789788979897A897C0000
-897D897E8980898289848985898789888989898A898B898C898D898E898F8990
-899189928993899489958996899789988999899A899B899C899D899E899F89A0
-89A164475C2790657A918C2359DA54AC8200836F898180006930564E80367237
-91CE51B64E5F987563964E1A53F666F3814B591C6DB24E0058F9533B63D694F1
-4F9D4F0A886398905937905779FB4EEA80F075916C825B9C59E85F5D69058681
-501A5DF24E5977E34EE5827A6291661390915C794EBF5F7981C69038808475AB
-4EA688D4610F6BC55FC64E4976CA6EA28BE38BAE8C0A8BD15F027FFC7FCC7ECE
-8335836B56E06BB797F3963459FB541F94F66DEB5BC5996E5C395F1596900000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89A289A389A489A589A689A789A889A989AA89AB89AC89AD89AE89AF89B089B1
-89B289B389B489B589B689B789B889B989BA89BB89BC89BD89BE89BF89C089C3
-89CD89D389D489D589D789D889D989DB89DD89DF89E089E189E289E489E789E8
-89E989EA89EC89ED89EE89F089F189F289F489F589F689F789F889F989FA0000
-89FB89FC89FD89FE89FF8A018A028A038A048A058A068A088A098A0A8A0B8A0C
-8A0D8A0E8A0F8A108A118A128A138A148A158A168A178A188A198A1A8A1B8A1C
-8A1D537082F16A315A749E705E947F2883B984248425836787478FCE8D6276C8
-5F719896786C662054DF62E54F6381C375C85EB896CD8E0A86F9548F6CF36D8C
-6C38607F52C775285E7D4F1860A05FE75C24753190AE94C072B96CB96E389149
-670953CB53F34F5191C98BF153C85E7C8FC26DE44E8E76C26986865E611A8206
-4F594FDE903E9C7C61096E1D6E1496854E885A3196E84E0E5C7F79B95B878BED
-7FBD738957DF828B90C15401904755BB5CEA5FA161086B3272F180B28A890000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8A1E8A1F8A208A218A228A238A248A258A268A278A288A298A2A8A2B8A2C8A2D
-8A2E8A2F8A308A318A328A338A348A358A368A378A388A398A3A8A3B8A3C8A3D
-8A3F8A408A418A428A438A448A458A468A478A498A4A8A4B8A4C8A4D8A4E8A4F
-8A508A518A528A538A548A558A568A578A588A598A5A8A5B8A5C8A5D8A5E0000
-8A5F8A608A618A628A638A648A658A668A678A688A698A6A8A6B8A6C8A6D8A6E
-8A6F8A708A718A728A738A748A758A768A778A788A7A8A7B8A7C8A7D8A7E8A7F
-8A806D745BD388D598848C6B9A6D9E336E0A51A4514357A38881539F63F48F95
-56ED54585706733F6E907F188FDC82D1613F6028966266F07EA68D8A8DC394A5
-5CB37CA4670860A6960580184E9190E75300966851418FD08574915D665597F5
-5B55531D78386742683D54C9707E5BB08F7D518D572854B1651266828D5E8D43
-810F846C906D7CDF51FF85FB67A365E96FA186A48E81566A90207682707671E5
-8D2362E952196CFD8D3C600E589E618E66FE8D60624E55B36E23672D8F670000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8A818A828A838A848A858A868A878A888A8B8A8C8A8D8A8E8A8F8A908A918A92
-8A948A958A968A978A988A998A9A8A9B8A9C8A9D8A9E8A9F8AA08AA18AA28AA3
-8AA48AA58AA68AA78AA88AA98AAA8AAB8AAC8AAD8AAE8AAF8AB08AB18AB28AB3
-8AB48AB58AB68AB78AB88AB98ABA8ABB8ABC8ABD8ABE8ABF8AC08AC18AC20000
-8AC38AC48AC58AC68AC78AC88AC98ACA8ACB8ACC8ACD8ACE8ACF8AD08AD18AD2
-8AD38AD48AD58AD68AD78AD88AD98ADA8ADB8ADC8ADD8ADE8ADF8AE08AE18AE2
-8AE394E195F87728680569A8548B4E4D70B88BC86458658B5B857A84503A5BE8
-77BB6BE18A797C986CBE76CF65A98F975D2D5C5586386808536062187AD96E5B
-7EFD6A1F7AE05F706F335F20638C6DA867564E085E108D264ED780C07634969C
-62DB662D627E6CBC8D7571677F695146808753EC906E629854F286F08F998005
-951785178FD96D5973CD659F771F7504782781FB8D1E94884FA6679575B98BCA
-9707632F9547963584B8632377415F8172F04E896014657462EF6B63653F0000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8AE48AE58AE68AE78AE88AE98AEA8AEB8AEC8AED8AEE8AEF8AF08AF18AF28AF3
-8AF48AF58AF68AF78AF88AF98AFA8AFB8AFC8AFD8AFE8AFF8B008B018B028B03
-8B048B058B068B088B098B0A8B0B8B0C8B0D8B0E8B0F8B108B118B128B138B14
-8B158B168B178B188B198B1A8B1B8B1C8B1D8B1E8B1F8B208B218B228B230000
-8B248B258B278B288B298B2A8B2B8B2C8B2D8B2E8B2F8B308B318B328B338B34
-8B358B368B378B388B398B3A8B3B8B3C8B3D8B3E8B3F8B408B418B428B438B44
-8B455E2775C790D18BC1829D679D652F5431871877E580A281026C414E4B7EC7
-804C76F4690D6B966267503C4F84574063076B628DBE53EA65E87EB85FD7631A
-63B781F381F47F6E5E1C5CD95236667A79E97A1A8D28709975D46EDE6CBB7A92
-4E2D76C55FE0949F88777EC879CD80BF91CD4EF24F17821F54685DDE6D328BCC
-7CA58F7480985E1A549276B15B99663C9AA473E0682A86DB6731732A8BF88BDB
-90107AF970DB716E62C477A956314E3B845767F152A986C08D2E94F87B510000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B468B478B488B498B4A8B4B8B4C8B4D8B4E8B4F8B508B518B528B538B548B55
-8B568B578B588B598B5A8B5B8B5C8B5D8B5E8B5F8B608B618B628B638B648B65
-8B678B688B698B6A8B6B8B6D8B6E8B6F8B708B718B728B738B748B758B768B77
-8B788B798B7A8B7B8B7C8B7D8B7E8B7F8B808B818B828B838B848B858B860000
-8B878B888B898B8A8B8B8B8C8B8D8B8E8B8F8B908B918B928B938B948B958B96
-8B978B988B998B9A8B9B8B9C8B9D8B9E8B9F8BAC8BB18BBB8BC78BD08BEA8C09
-8C1E4F4F6CE8795D9A7B6293722A62FD4E1378168F6C64B08D5A7BC668695E84
-88C55986649E58EE72B6690E95258FFD8D5857607F008C0651C6634962D95353
-684C74228301914C55447740707C6D4A517954A88D4459FF6ECB6DC45B5C7D2B
-4ED47C7D6ED35B5081EA6E0D5B579B0368D58E2A5B977EFC603B7EB590B98D70
-594F63CD79DF8DB3535265CF79568BC5963B7EC494BB7E825634918967007F6A
-5C0A907566285DE64F5067DE505A4F5C57505EA7000000000000000000000000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8C388C398C3A8C3B8C3C8C3D8C3E8C3F8C408C428C438C448C458C488C4A8C4B
-8C4D8C4E8C4F8C508C518C528C538C548C568C578C588C598C5B8C5C8C5D8C5E
-8C5F8C608C638C648C658C668C678C688C698C6C8C6D8C6E8C6F8C708C718C72
-8C748C758C768C778C7B8C7C8C7D8C7E8C7F8C808C818C838C848C868C870000
-8C888C8B8C8D8C8E8C8F8C908C918C928C938C958C968C978C998C9A8C9B8C9C
-8C9D8C9E8C9F8CA08CA18CA28CA38CA48CA58CA68CA78CA88CA98CAA8CAB8CAC
-8CAD4E8D4E0C51404E105EFF53454E154E984E1E9B325B6C56694E2879BA4E3F
-53154E47592D723B536E6C1056DF80E499976BD3777E9F174E364E9F9F104E5C
-4E694E9382885B5B556C560F4EC4538D539D53A353A553AE97658D5D531A53F5
-5326532E533E8D5C5366536352025208520E522D5233523F5240524C525E5261
-525C84AF527D528252815290529351827F544EBB4EC34EC94EC24EE84EE14EEB
-4EDE4F1B4EF34F224F644EF54F254F274F094F2B4F5E4F6765384F5A4F5D0000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8CAE8CAF8CB08CB18CB28CB38CB48CB58CB68CB78CB88CB98CBA8CBB8CBC8CBD
-8CBE8CBF8CC08CC18CC28CC38CC48CC58CC68CC78CC88CC98CCA8CCB8CCC8CCD
-8CCE8CCF8CD08CD18CD28CD38CD48CD58CD68CD78CD88CD98CDA8CDB8CDC8CDD
-8CDE8CDF8CE08CE18CE28CE38CE48CE58CE68CE78CE88CE98CEA8CEB8CEC0000
-8CED8CEE8CEF8CF08CF18CF28CF38CF48CF58CF68CF78CF88CF98CFA8CFB8CFC
-8CFD8CFE8CFF8D008D018D028D038D048D058D068D078D088D098D0A8D0B8D0C
-8D0D4F5F4F574F324F3D4F764F744F914F894F834F8F4F7E4F7B4FAA4F7C4FAC
-4F944FE64FE84FEA4FC54FDA4FE34FDC4FD14FDF4FF85029504C4FF3502C500F
-502E502D4FFE501C500C50255028507E504350555048504E506C507B50A550A7
-50A950BA50D6510650ED50EC50E650EE5107510B4EDD6C3D4F584F654FCE9FA0
-6C467C74516E5DFD9EC999985181591452F9530D8A07531051EB591951554EA0
-51564EB3886E88A44EB5811488D279805B3488037FB851AB51B151BD51BC0000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8D0E8D0F8D108D118D128D138D148D158D168D178D188D198D1A8D1B8D1C8D20
-8D518D528D578D5F8D658D688D698D6A8D6C8D6E8D6F8D718D728D788D798D7A
-8D7B8D7C8D7D8D7E8D7F8D808D828D838D868D878D888D898D8C8D8D8D8E8D8F
-8D908D928D938D958D968D978D988D998D9A8D9B8D9C8D9D8D9E8DA08DA10000
-8DA28DA48DA58DA68DA78DA88DA98DAA8DAB8DAC8DAD8DAE8DAF8DB08DB28DB6
-8DB78DB98DBB8DBD8DC08DC18DC28DC58DC78DC88DC98DCA8DCD8DD08DD28DD3
-8DD451C7519651A251A58BA08BA68BA78BAA8BB48BB58BB78BC28BC38BCB8BCF
-8BCE8BD28BD38BD48BD68BD88BD98BDC8BDF8BE08BE48BE88BE98BEE8BF08BF3
-8BF68BF98BFC8BFF8C008C028C048C078C0C8C0F8C118C128C148C158C168C19
-8C1B8C188C1D8C1F8C208C218C258C278C2A8C2B8C2E8C2F8C328C338C358C36
-5369537A961D962296219631962A963D963C964296499654965F9667966C9672
-96749688968D969796B09097909B909D909990AC90A190B490B390B690BA0000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8DD58DD88DD98DDC8DE08DE18DE28DE58DE68DE78DE98DED8DEE8DF08DF18DF2
-8DF48DF68DFC8DFE8DFF8E008E018E028E038E048E068E078E088E0B8E0D8E0E
-8E108E118E128E138E158E168E178E188E198E1A8E1B8E1C8E208E218E248E25
-8E268E278E288E2B8E2D8E308E328E338E348E368E378E388E3B8E3C8E3E0000
-8E3F8E438E458E468E4C8E4D8E4E8E4F8E508E538E548E558E568E578E588E5A
-8E5B8E5C8E5D8E5E8E5F8E608E618E628E638E648E658E678E688E6A8E6B8E6E
-8E7190B890B090CF90C590BE90D090C490C790D390E690E290DC90D790DB90EB
-90EF90FE91049122911E91239131912F913991439146520D594252A252AC52AD
-52BE54FF52D052D652F053DF71EE77CD5EF451F551FC9B2F53B65F01755A5DEF
-574C57A957A1587E58BC58C558D15729572C572A57335739572E572F575C573B
-574257695785576B5786577C577B5768576D5776577357AD57A4578C57B257CF
-57A757B4579357A057D557D857DA57D957D257B857F457EF57F857E457DD0000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E738E758E778E788E798E7A8E7B8E7D8E7E8E808E828E838E848E868E888E89
-8E8A8E8B8E8C8E8D8E8E8E918E928E938E958E968E978E988E998E9A8E9B8E9D
-8E9F8EA08EA18EA28EA38EA48EA58EA68EA78EA88EA98EAA8EAD8EAE8EB08EB1
-8EB38EB48EB58EB68EB78EB88EB98EBB8EBC8EBD8EBE8EBF8EC08EC18EC20000
-8EC38EC48EC58EC68EC78EC88EC98ECA8ECB8ECC8ECD8ECF8ED08ED18ED28ED3
-8ED48ED58ED68ED78ED88ED98EDA8EDB8EDC8EDD8EDE8EDF8EE08EE18EE28EE3
-8EE4580B580D57FD57ED5800581E5819584458205865586C58815889589A5880
-99A89F1961FF8279827D827F828F828A82A88284828E82918297829982AB82B8
-82BE82B082C882CA82E3829882B782AE82CB82CC82C182A982B482A182AA829F
-82C482CE82A482E1830982F782E4830F830782DC82F482D282D8830C82FB82D3
-8311831A83068314831582E082D5831C8351835B835C83088392833C83348331
-839B835E832F834F83478343835F834083178360832D833A8333836683650000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8EE58EE68EE78EE88EE98EEA8EEB8EEC8EED8EEE8EEF8EF08EF18EF28EF38EF4
-8EF58EF68EF78EF88EF98EFA8EFB8EFC8EFD8EFE8EFF8F008F018F028F038F04
-8F058F068F078F088F098F0A8F0B8F0C8F0D8F0E8F0F8F108F118F128F138F14
-8F158F168F178F188F198F1A8F1B8F1C8F1D8F1E8F1F8F208F218F228F230000
-8F248F258F268F278F288F298F2A8F2B8F2C8F2D8F2E8F2F8F308F318F328F33
-8F348F358F368F378F388F398F3A8F3B8F3C8F3D8F3E8F3F8F408F418F428F43
-8F448368831B8369836C836A836D836E83B0837883B383B483A083AA8393839C
-8385837C83B683A9837D83B8837B8398839E83A883BA83BC83C1840183E583D8
-58078418840B83DD83FD83D6841C84388411840683D483DF840F840383F883F9
-83EA83C583C0842683F083E1845C8451845A8459847384878488847A84898478
-843C844684698476848C848E8431846D84C184CD84D084E684BD84D384CA84BF
-84BA84E084A184B984B4849784E584E3850C750D853884F08539851F853A0000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8F458F468F478F488F498F4A8F4B8F4C8F4D8F4E8F4F8F508F518F528F538F54
-8F558F568F578F588F598F5A8F5B8F5C8F5D8F5E8F5F8F608F618F628F638F64
-8F658F6A8F808F8C8F928F9D8FA08FA18FA28FA48FA58FA68FA78FAA8FAC8FAD
-8FAE8FAF8FB28FB38FB48FB58FB78FB88FBA8FBB8FBC8FBF8FC08FC38FC60000
-8FC98FCA8FCB8FCC8FCD8FCF8FD28FD68FD78FDA8FE08FE18FE38FE78FEC8FEF
-8FF18FF28FF48FF58FF68FFA8FFB8FFC8FFE8FFF90079008900C900E90139015
-90188556853B84FF84FC8559854885688564855E857A77A285438572857B85A4
-85A88587858F857985AE859C858585B985B785B085D385C185DC85FF86278605
-86298616863C5EFE5F08593C594180375955595A5958530F5C225C255C2C5C34
-624C626A629F62BB62CA62DA62D762EE632262F66339634B634363AD63F66371
-637A638E63B4636D63AC638A636963AE63BC63F263F863E063FF63C463DE63CE
-645263C663BE64456441640B641B6420640C64266421645E6484646D64960000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9019901C902390249025902790289029902A902B902C90309031903290339034
-90379039903A903D903F904090439045904690489049904A904B904C904E9054
-905590569059905A905C905D905E905F906090619064906690679069906A906B
-906C906F90709071907290739076907790789079907A907B907C907E90810000
-90849085908690879089908A908C908D908E908F90909092909490969098909A
-909C909E909F90A090A490A590A790A890A990AB90AD90B290B790BC90BD90BF
-90C0647A64B764B8649964BA64C064D064D764E464E265096525652E5F0B5FD2
-75195F11535F53F153FD53E953E853FB541254165406544B5452545354545456
-54435421545754595423543254825494547754715464549A549B548454765466
-549D54D054AD54C254B454D254A754A654D354D4547254A354D554BB54BF54CC
-54D954DA54DC54A954AA54A454DD54CF54DE551B54E7552054FD551454F35522
-5523550F55115527552A5567558F55B55549556D55415555553F5550553C0000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-90C290C390C690C890C990CB90CC90CD90D290D490D590D690D890D990DA90DE
-90DF90E090E390E490E590E990EA90EC90EE90F090F190F290F390F590F690F7
-90F990FA90FB90FC90FF91009101910391059106910791089109910A910B910C
-910D910E910F911091119112911391149115911691179118911A911B911C0000
-911D911F91209121912491259126912791289129912A912B912C912D912E9130
-9132913391349135913691379138913A913B913C913D913E913F914091419142
-91445537555655755576557755335530555C558B55D2558355B155B955885581
-559F557E55D65591557B55DF55BD55BE5594559955EA55F755C9561F55D155EB
-55EC55D455E655DD55C455EF55E555F255F355CC55CD55E855F555E48F94561E
-5608560C56015624562355FE56005627562D565856395657562C564D56625659
-565C564C5654568656645671566B567B567C5685569356AF56D456D756DD56E1
-56F556EB56F956FF5704570A5709571C5E0F5E195E145E115E315E3B5E3C0000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9145914791489151915391549155915691589159915B915C915F916091669167
-9168916B916D9173917A917B917C9180918191829183918491869188918A918E
-918F9193919491959196919791989199919C919D919E919F91A091A191A491A5
-91A691A791A891A991AB91AC91B091B191B291B391B691B791B891B991BB0000
-91BC91BD91BE91BF91C091C191C291C391C491C591C691C891CB91D091D291D3
-91D491D591D691D791D891D991DA91DB91DD91DE91DF91E091E191E291E391E4
-91E55E375E445E545E5B5E5E5E615C8C5C7A5C8D5C905C965C885C985C995C91
-5C9A5C9C5CB55CA25CBD5CAC5CAB5CB15CA35CC15CB75CC45CD25CE45CCB5CE5
-5D025D035D275D265D2E5D245D1E5D065D1B5D585D3E5D345D3D5D6C5D5B5D6F
-5D5D5D6B5D4B5D4A5D695D745D825D995D9D8C735DB75DC55F735F775F825F87
-5F895F8C5F955F995F9C5FA85FAD5FB55FBC88625F6172AD72B072B472B772B8
-72C372C172CE72CD72D272E872EF72E972F272F472F7730172F3730372FA0000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-91E691E791E891E991EA91EB91EC91ED91EE91EF91F091F191F291F391F491F5
-91F691F791F891F991FA91FB91FC91FD91FE91FF920092019202920392049205
-9206920792089209920A920B920C920D920E920F921092119212921392149215
-9216921792189219921A921B921C921D921E921F922092219222922392240000
-92259226922792289229922A922B922C922D922E922F92309231923292339234
-92359236923792389239923A923B923C923D923E923F92409241924292439244
-924572FB731773137321730A731E731D7315732273397325732C733873317350
-734D73577360736C736F737E821B592598E7592459029963996799689969996A
-996B996C99749977997D998099849987998A998D999099919993999499955E80
-5E915E8B5E965EA55EA05EB95EB55EBE5EB38D535ED25ED15EDB5EE85EEA81BA
-5FC45FC95FD65FCF60035FEE60045FE15FE45FFE600560065FEA5FED5FF86019
-60356026601B600F600D6029602B600A603F602160786079607B607A60420000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9246924792489249924A924B924C924D924E924F925092519252925392549255
-9256925792589259925A925B925C925D925E925F926092619262926392649265
-9266926792689269926A926B926C926D926E926F927092719272927392759276
-927792789279927A927B927C927D927E927F9280928192829283928492850000
-9286928792889289928A928B928C928D928F9290929192929293929492959296
-929792989299929A929B929C929D929E929F92A092A192A292A392A492A592A6
-92A7606A607D6096609A60AD609D60836092608C609B60EC60BB60B160DD60D8
-60C660DA60B4612061266115612360F46100610E612B614A617561AC619461A7
-61B761D461F55FDD96B395E995EB95F195F395F595F695FC95FE960396049606
-9608960A960B960C960D960F96129615961696179619961A4E2C723F62156C35
-6C546C5C6C4A6CA36C856C906C946C8C6C686C696C746C766C866CA96CD06CD4
-6CAD6CF76CF86CF16CD76CB26CE06CD66CFA6CEB6CEE6CB16CD36CEF6CFE0000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-92A892A992AA92AB92AC92AD92AF92B092B192B292B392B492B592B692B792B8
-92B992BA92BB92BC92BD92BE92BF92C092C192C292C392C492C592C692C792C9
-92CA92CB92CC92CD92CE92CF92D092D192D292D392D492D592D692D792D892D9
-92DA92DB92DC92DD92DE92DF92E092E192E292E392E492E592E692E792E80000
-92E992EA92EB92EC92ED92EE92EF92F092F192F292F392F492F592F692F792F8
-92F992FA92FB92FC92FD92FE92FF930093019302930393049305930693079308
-93096D396D276D0C6D436D486D076D046D196D0E6D2B6D4D6D2E6D356D1A6D4F
-6D526D546D336D916D6F6D9E6DA06D5E6D936D946D5C6D606D7C6D636E1A6DC7
-6DC56DDE6E0E6DBF6DE06E116DE66DDD6DD96E166DAB6E0C6DAE6E2B6E6E6E4E
-6E6B6EB26E5F6E866E536E546E326E256E446EDF6EB16E986EE06F2D6EE26EA5
-6EA76EBD6EBB6EB76ED76EB46ECF6E8F6EC26E9F6F626F466F476F246F156EF9
-6F2F6F366F4B6F746F2A6F096F296F896F8D6F8C6F786F726F7C6F7A6FD10000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-930A930B930C930D930E930F9310931193129313931493159316931793189319
-931A931B931C931D931E931F9320932193229323932493259326932793289329
-932A932B932C932D932E932F9330933193329333933493359336933793389339
-933A933B933C933D933F93409341934293439344934593469347934893490000
-934A934B934C934D934E934F9350935193529353935493559356935793589359
-935A935B935C935D935E935F9360936193629363936493659366936793689369
-936B6FC96FA76FB96FB66FC26FE16FEE6FDE6FE06FEF701A7023701B70397035
-704F705E5B805B845B955B935BA55BB8752F9A9E64345BE45BEE89305BF08E47
-8B078FB68FD38FD58FE58FEE8FE48FE98FE68FF38FE890059004900B90269011
-900D9016902190359036902D902F9044905190529050906890589062905B66B9
-9074907D908290889083908B5F505F575F565F585C3B54AB5C505C595B715C63
-5C667FBC5F2A5F295F2D82745F3C9B3B5C6E59815983598D59A959AA59A30000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-936C936D936E936F9370937193729373937493759376937793789379937A937B
-937C937D937E937F9380938193829383938493859386938793889389938A938B
-938C938D938E9390939193929393939493959396939793989399939A939B939C
-939D939E939F93A093A193A293A393A493A593A693A793A893A993AA93AB0000
-93AC93AD93AE93AF93B093B193B293B393B493B593B693B793B893B993BA93BB
-93BC93BD93BE93BF93C093C193C293C393C493C593C693C793C893C993CB93CC
-93CD599759CA59AB599E59A459D259B259AF59D759BE5A055A0659DD5A0859E3
-59D859F95A0C5A095A325A345A115A235A135A405A675A4A5A555A3C5A625A75
-80EC5AAA5A9B5A775A7A5ABE5AEB5AB25AD25AD45AB85AE05AE35AF15AD65AE6
-5AD85ADC5B095B175B165B325B375B405C155C1C5B5A5B655B735B515B535B62
-9A759A779A789A7A9A7F9A7D9A809A819A859A889A8A9A909A929A939A969A98
-9A9B9A9C9A9D9A9F9AA09AA29AA39AA59AA77E9F7EA17EA37EA57EA87EA90000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93CE93CF93D093D193D293D393D493D593D793D893D993DA93DB93DC93DD93DE
-93DF93E093E193E293E393E493E593E693E793E893E993EA93EB93EC93ED93EE
-93EF93F093F193F293F393F493F593F693F793F893F993FA93FB93FC93FD93FE
-93FF9400940194029403940494059406940794089409940A940B940C940D0000
-940E940F9410941194129413941494159416941794189419941A941B941C941D
-941E941F9420942194229423942494259426942794289429942A942B942C942D
-942E7EAD7EB07EBE7EC07EC17EC27EC97ECB7ECC7ED07ED47ED77EDB7EE07EE1
-7EE87EEB7EEE7EEF7EF17EF27F0D7EF67EFA7EFB7EFE7F017F027F037F077F08
-7F0B7F0C7F0F7F117F127F177F197F1C7F1B7F1F7F217F227F237F247F257F26
-7F277F2A7F2B7F2C7F2D7F2F7F307F317F327F337F355E7A757F5DDB753E9095
-738E739173AE73A2739F73CF73C273D173B773B373C073C973C873E573D9987C
-740A73E973E773DE73BA73F2740F742A745B7426742574287430742E742C0000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-942F9430943194329433943494359436943794389439943A943B943C943D943F
-9440944194429443944494459446944794489449944A944B944C944D944E944F
-9450945194529453945494559456945794589459945A945B945C945D945E945F
-9460946194629463946494659466946794689469946A946C946D946E946F0000
-9470947194729473947494759476947794789479947A947B947C947D947E947F
-9480948194829483948494919496949894C794CF94D394D494DA94E694FB951C
-9520741B741A7441745C7457745574597477746D747E749C748E748074817487
-748B749E74A874A9749074A774D274BA97EA97EB97EC674C6753675E67486769
-67A56787676A6773679867A7677567A8679E67AD678B6777677C67F0680967D8
-680A67E967B0680C67D967B567DA67B367DD680067C367B867E2680E67C167FD
-6832683368606861684E6862684468646883681D68556866684168676840683E
-684A6849682968B5688F687468776893686B68C2696E68FC691F692068F90000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-95279533953D95439548954B9555955A9560956E95749575957795789579957A
-957B957C957D957E9580958195829583958495859586958795889589958A958B
-958C958D958E958F9590959195929593959495959596959795989599959A959B
-959C959D959E959F95A095A195A295A395A495A595A695A795A895A995AA0000
-95AB95AC95AD95AE95AF95B095B195B295B395B495B595B695B795B895B995BA
-95BB95BC95BD95BE95BF95C095C195C295C395C495C595C695C795C895C995CA
-95CB692468F0690B6901695768E369106971693969606942695D6984696B6980
-69986978693469CC6987698869CE6989696669636979699B69A769BB69AB69AD
-69D469B169C169CA69DF699569E0698D69FF6A2F69ED6A176A186A6569F26A44
-6A3E6AA06A506A5B6A356A8E6A796A3D6A286A586A7C6A916A906AA96A976AAB
-733773526B816B826B876B846B926B936B8D6B9A6B9B6BA16BAA8F6B8F6D8F71
-8F728F738F758F768F788F778F798F7A8F7C8F7E8F818F828F848F878F8B0000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-95CC95CD95CE95CF95D095D195D295D395D495D595D695D795D895D995DA95DB
-95DC95DD95DE95DF95E095E195E295E395E495E595E695E795EC95FF96079613
-9618961B961E96209623962496259626962796289629962B962C962D962F9630
-963796389639963A963E96419643964A964E964F965196529653965696570000
-96589659965A965C965D965E9660966396659666966B966D966E966F96709671
-967396789679967A967B967C967D967E967F9680968196829683968496879689
-968A8F8D8F8E8F8F8F988F9A8ECE620B6217621B621F6222622162256224622C
-81E774EF74F474FF750F75117513653465EE65EF65F0660A6619677266036615
-6600708566F7661D66346631663666358006665F66546641664F665666616657
-66776684668C66A7669D66BE66DB66DC66E666E98D328D338D368D3B8D3D8D40
-8D458D468D488D498D478D4D8D558D5989C789CA89CB89CC89CE89CF89D089D1
-726E729F725D7266726F727E727F7284728B728D728F72926308633263B00000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-968C968E96919692969396959696969A969B969D969E969F96A096A196A296A3
-96A496A596A696A896A996AA96AB96AC96AD96AE96AF96B196B296B496B596B7
-96B896BA96BB96BF96C296C396C896CA96CB96D096D196D396D496D696D796D8
-96D996DA96DB96DC96DD96DE96DF96E196E296E396E496E596E696E796EB0000
-96EC96ED96EE96F096F196F296F496F596F896FA96FB96FC96FD96FF97029703
-9705970A970B970C97109711971297149715971797189719971A971B971D971F
-9720643F64D880046BEA6BF36BFD6BF56BF96C056C076C066C0D6C156C186C19
-6C1A6C216C296C246C2A6C3265356555656B724D72527256723086625216809F
-809C809380BC670A80BD80B180AB80AD80B480B780E780E880E980EA80DB80C2
-80C480D980CD80D7671080DD80EB80F180F480ED810D810E80F280FC67158112
-8C5A8136811E812C811881328148814C815381748159815A817181608169817C
-817D816D8167584D5AB58188818281916ED581A381AA81CC672681CA81BB0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-972197229723972497259726972797289729972B972C972E972F973197339734
-973597369737973A973B973C973D973F97409741974297439744974597469747
-97489749974A974B974C974D974E974F975097519754975597579758975A975C
-975D975F97639764976697679768976A976B976C976D976E976F977097710000
-97729775977797789779977A977B977D977E977F978097819782978397849786
-978797889789978A978C978E978F979097939795979697979799979A979B979C
-979D81C181A66B246B376B396B436B466B5998D198D298D398D598D998DA6BB3
-5F406BC289F365909F51659365BC65C665C465C365CC65CE65D265D67080709C
-7096709D70BB70C070B770AB70B170E870CA711071137116712F71317173715C
-716871457172714A7178717A719871B371B571A871A071E071D471E771F9721D
-7228706C7118716671B9623E623D624362486249793B794079467949795B795C
-7953795A796279577960796F7967797A7985798A799A79A779B35FD15FD00000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-979E979F97A197A297A497A597A697A797A897A997AA97AC97AE97B097B197B3
-97B597B697B797B897B997BA97BB97BC97BD97BE97BF97C097C197C297C397C4
-97C597C697C797C897C997CA97CB97CC97CD97CE97CF97D097D197D297D397D4
-97D597D697D797D897D997DA97DB97DC97DD97DE97DF97E097E197E297E30000
-97E497E597E897EE97EF97F097F197F297F497F797F897F997FA97FB97FC97FD
-97FE97FF9800980198029803980498059806980798089809980A980B980C980D
-980E603C605D605A606760416059606360AB6106610D615D61A9619D61CB61D1
-62068080807F6C936CF66DFC77F677F87800780978177818781165AB782D781C
-781D7839783A783B781F783C7825782C78237829784E786D7856785778267850
-7847784C786A789B7893789A7887789C78A178A378B278B978A578D478D978C9
-78EC78F2790578F479137924791E79349F9B9EF99EFB9EFC76F17704770D76F9
-77077708771A77227719772D7726773577387750775177477743775A77680000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-980F9810981198129813981498159816981798189819981A981B981C981D981E
-981F9820982198229823982498259826982798289829982A982B982C982D982E
-982F9830983198329833983498359836983798389839983A983B983C983D983E
-983F9840984198429843984498459846984798489849984A984B984C984D0000
-984E984F9850985198529853985498559856985798589859985A985B985C985D
-985E985F9860986198629863986498659866986798689869986A986B986C986D
-986E77627765777F778D777D7780778C7791779F77A077B077B577BD753A7540
-754E754B7548755B7572757975837F587F617F5F8A487F687F747F717F797F81
-7F7E76CD76E58832948594869487948B948A948C948D948F9490949494979495
-949A949B949C94A394A494AB94AA94AD94AC94AF94B094B294B494B694B794B8
-94B994BA94BC94BD94BF94C494C894C994CA94CB94CC94CD94CE94D094D194D2
-94D594D694D794D994D894DB94DE94DF94E094E294E494E594E794E894EA0000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-986F98709871987298739874988B988E98929895989998A398A898A998AA98AB
-98AC98AD98AE98AF98B098B198B298B398B498B598B698B798B898B998BA98BB
-98BC98BD98BE98BF98C098C198C298C398C498C598C698C798C898C998CA98CB
-98CC98CD98CF98D098D498D698D798DB98DC98DD98E098E198E298E398E40000
-98E598E698E998EA98EB98EC98ED98EE98EF98F098F198F298F398F498F598F6
-98F798F898F998FA98FB98FC98FD98FE98FF9900990199029903990499059906
-990794E994EB94EE94EF94F394F494F594F794F994FC94FD94FF950395029506
-95079509950A950D950E950F951295139514951595169518951B951D951E951F
-9522952A952B9529952C953195329534953695379538953C953E953F95429535
-9544954595469549954C954E954F9552955395549556955795589559955B955E
-955F955D95619562956495659566956795689569956A956B956C956F95719572
-9573953A77E777EC96C979D579ED79E379EB7A065D477A037A027A1E7A140000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-99089909990A990B990C990E990F991199129913991499159916991799189919
-991A991B991C991D991E991F9920992199229923992499259926992799289929
-992A992B992C992D992F9930993199329933993499359936993799389939993A
-993B993C993D993E993F99409941994299439944994599469947994899490000
-994A994B994C994D994E994F99509951995299539956995799589959995A995B
-995C995D995E995F99609961996299649966997399789979997B997E99829983
-99897A397A377A519ECF99A57A707688768E7693769976A474DE74E0752C9E20
-9E229E289E299E2A9E2B9E2C9E329E319E369E389E379E399E3A9E3E9E419E42
-9E449E469E479E489E499E4B9E4C9E4E9E519E559E579E5A9E5B9E5C9E5E9E63
-9E669E679E689E699E6A9E6B9E6C9E719E6D9E7375927594759675A0759D75AC
-75A375B375B475B875C475B175B075C375C275D675CD75E375E875E675E475EB
-75E7760375F175FC75FF761076007605760C7617760A76257618761576190000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-998C998E999A999B999C999D999E999F99A099A199A299A399A499A699A799A9
-99AA99AB99AC99AD99AE99AF99B099B199B299B399B499B599B699B799B899B9
-99BA99BB99BC99BD99BE99BF99C099C199C299C399C499C599C699C799C899C9
-99CA99CB99CC99CD99CE99CF99D099D199D299D399D499D599D699D799D80000
-99D999DA99DB99DC99DD99DE99DF99E099E199E299E399E499E599E699E799E8
-99E999EA99EB99EC99ED99EE99EF99F099F199F299F399F499F599F699F799F8
-99F9761B763C762276207640762D7630763F76357643763E7633764D765E7654
-765C7656766B766F7FCA7AE67A787A797A807A867A887A957AA67AA07AAC7AA8
-7AAD7AB3886488698872887D887F888288A288C688B788BC88C988E288CE88E3
-88E588F1891A88FC88E888FE88F0892189198913891B890A8934892B89368941
-8966897B758B80E576B276B477DC801280148016801C80208022802580268027
-802980288031800B803580438046804D80528069807189839878988098830000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-99FA99FB99FC99FD99FE99FF9A009A019A029A039A049A059A069A079A089A09
-9A0A9A0B9A0C9A0D9A0E9A0F9A109A119A129A139A149A159A169A179A189A19
-9A1A9A1B9A1C9A1D9A1E9A1F9A209A219A229A239A249A259A269A279A289A29
-9A2A9A2B9A2C9A2D9A2E9A2F9A309A319A329A339A349A359A369A379A380000
-9A399A3A9A3B9A3C9A3D9A3E9A3F9A409A419A429A439A449A459A469A479A48
-9A499A4A9A4B9A4C9A4D9A4E9A4F9A509A519A529A539A549A559A569A579A58
-9A599889988C988D988F9894989A989B989E989F98A198A298A598A6864D8654
-866C866E867F867A867C867B86A8868D868B86AC869D86A786A386AA869386A9
-86B686C486B586CE86B086BA86B186AF86C986CF86B486E986F186F286ED86F3
-86D0871386DE86F486DF86D886D18703870786F88708870A870D87098723873B
-871E8725872E871A873E87488734873187298737873F87828722877D877E877B
-87608770874C876E878B87538763877C876487598765879387AF87A887D20000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9A5A9A5B9A5C9A5D9A5E9A5F9A609A619A629A639A649A659A669A679A689A69
-9A6A9A6B9A729A839A899A8D9A8E9A949A959A999AA69AA99AAA9AAB9AAC9AAD
-9AAE9AAF9AB29AB39AB49AB59AB99ABB9ABD9ABE9ABF9AC39AC49AC69AC79AC8
-9AC99ACA9ACD9ACE9ACF9AD09AD29AD49AD59AD69AD79AD99ADA9ADB9ADC0000
-9ADD9ADE9AE09AE29AE39AE49AE59AE79AE89AE99AEA9AEC9AEE9AF09AF19AF2
-9AF39AF49AF59AF69AF79AF89AFA9AFC9AFD9AFE9AFF9B009B019B029B049B05
-9B0687C68788878587AD8797878387AB87E587AC87B587B387CB87D387BD87D1
-87C087CA87DB87EA87E087EE8816881387FE880A881B88218839883C7F367F42
-7F447F4582107AFA7AFD7B087B037B047B157B0A7B2B7B0F7B477B387B2A7B19
-7B2E7B317B207B257B247B337B3E7B1E7B587B5A7B457B757B4C7B5D7B607B6E
-7B7B7B627B727B717B907BA67BA77BB87BAC7B9D7BA87B857BAA7B9C7BA27BAB
-7BB47BD17BC17BCC7BDD7BDA7BE57BE67BEA7C0C7BFE7BFC7C0F7C167C0B0000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9B079B099B0A9B0B9B0C9B0D9B0E9B109B119B129B149B159B169B179B189B19
-9B1A9B1B9B1C9B1D9B1E9B209B219B229B249B259B269B279B289B299B2A9B2B
-9B2C9B2D9B2E9B309B319B339B349B359B369B379B389B399B3A9B3D9B3E9B3F
-9B409B469B4A9B4B9B4C9B4E9B509B529B539B559B569B579B589B599B5A0000
-9B5B9B5C9B5D9B5E9B5F9B609B619B629B639B649B659B669B679B689B699B6A
-9B6B9B6C9B6D9B6E9B6F9B709B719B729B739B749B759B769B779B789B799B7A
-9B7B7C1F7C2A7C267C387C417C4081FE82018202820481EC8844822182228223
-822D822F8228822B8238823B82338234823E82448249824B824F825A825F8268
-887E8885888888D888DF895E7F9D7F9F7FA77FAF7FB07FB27C7C65497C917C9D
-7C9C7C9E7CA27CB27CBC7CBD7CC17CC77CCC7CCD7CC87CC57CD77CE8826E66A8
-7FBF7FCE7FD57FE57FE17FE67FE97FEE7FF37CF87D777DA67DAE7E477E9B9EB8
-9EB48D738D848D948D918DB18D678D6D8C478C49914A9150914E914F91640000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9B7C9B7D9B7E9B7F9B809B819B829B839B849B859B869B879B889B899B8A9B8B
-9B8C9B8D9B8E9B8F9B909B919B929B939B949B959B969B979B989B999B9A9B9B
-9B9C9B9D9B9E9B9F9BA09BA19BA29BA39BA49BA59BA69BA79BA89BA99BAA9BAB
-9BAC9BAD9BAE9BAF9BB09BB19BB29BB39BB49BB59BB69BB79BB89BB99BBA0000
-9BBB9BBC9BBD9BBE9BBF9BC09BC19BC29BC39BC49BC59BC69BC79BC89BC99BCA
-9BCB9BCC9BCD9BCE9BCF9BD09BD19BD29BD39BD49BD59BD69BD79BD89BD99BDA
-9BDB9162916191709169916F917D917E917291749179918C91859190918D9191
-91A291A391AA91AD91AE91AF91B591B491BA8C559E7E8DB88DEB8E058E598E69
-8DB58DBF8DBC8DBA8DC48DD68DD78DDA8DDE8DCE8DCF8DDB8DC68DEC8DF78DF8
-8DE38DF98DFB8DE48E098DFD8E148E1D8E1F8E2C8E2E8E238E2F8E3A8E408E39
-8E358E3D8E318E498E418E428E518E528E4A8E708E768E7C8E6F8E748E858E8F
-8E948E908E9C8E9E8C788C828C8A8C858C988C94659B89D689DE89DA89DC0000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9BDC9BDD9BDE9BDF9BE09BE19BE29BE39BE49BE59BE69BE79BE89BE99BEA9BEB
-9BEC9BED9BEE9BEF9BF09BF19BF29BF39BF49BF59BF69BF79BF89BF99BFA9BFB
-9BFC9BFD9BFE9BFF9C009C019C029C039C049C059C069C079C089C099C0A9C0B
-9C0C9C0D9C0E9C0F9C109C119C129C139C149C159C169C179C189C199C1A0000
-9C1B9C1C9C1D9C1E9C1F9C209C219C229C239C249C259C269C279C289C299C2A
-9C2B9C2C9C2D9C2E9C2F9C309C319C329C339C349C359C369C379C389C399C3A
-9C3B89E589EB89EF8A3E8B26975396E996F396EF970697019708970F970E972A
-972D9730973E9F809F839F859F869F879F889F899F8A9F8C9EFE9F0B9F0D96B9
-96BC96BD96CE96D277BF96E0928E92AE92C8933E936A93CA938F943E946B9C7F
-9C829C859C869C879C887A239C8B9C8E9C909C919C929C949C959C9A9C9B9C9E
-9C9F9CA09CA19CA29CA39CA59CA69CA79CA89CA99CAB9CAD9CAE9CB09CB19CB2
-9CB39CB49CB59CB69CB79CBA9CBB9CBC9CBD9CC49CC59CC69CC79CCA9CCB0000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9C3C9C3D9C3E9C3F9C409C419C429C439C449C459C469C479C489C499C4A9C4B
-9C4C9C4D9C4E9C4F9C509C519C529C539C549C559C569C579C589C599C5A9C5B
-9C5C9C5D9C5E9C5F9C609C619C629C639C649C659C669C679C689C699C6A9C6B
-9C6C9C6D9C6E9C6F9C709C719C729C739C749C759C769C779C789C799C7A0000
-9C7B9C7D9C7E9C809C839C849C899C8A9C8C9C8F9C939C969C979C989C999C9D
-9CAA9CAC9CAF9CB99CBE9CBF9CC09CC19CC29CC89CC99CD19CD29CDA9CDB9CE0
-9CE19CCC9CCD9CCE9CCF9CD09CD39CD49CD59CD79CD89CD99CDC9CDD9CDF9CE2
-977C978597919792979497AF97AB97A397B297B49AB19AB09AB79E589AB69ABA
-9ABC9AC19AC09AC59AC29ACB9ACC9AD19B459B439B479B499B489B4D9B5198E8
-990D992E995599549ADF9AE19AE69AEF9AEB9AFB9AED9AF99B089B0F9B139B1F
-9B239EBD9EBE7E3B9E829E879E889E8B9E9293D69E9D9E9F9EDB9EDC9EDD9EE0
-9EDF9EE29EE99EE79EE59EEA9EEF9F229F2C9F2F9F399F379F3D9F3E9F440000
-F8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9CE39CE49CE59CE69CE79CE89CE99CEA9CEB9CEC9CED9CEE9CEF9CF09CF19CF2
-9CF39CF49CF59CF69CF79CF89CF99CFA9CFB9CFC9CFD9CFE9CFF9D009D019D02
-9D039D049D059D069D079D089D099D0A9D0B9D0C9D0D9D0E9D0F9D109D119D12
-9D139D149D159D169D179D189D199D1A9D1B9D1C9D1D9D1E9D1F9D209D210000
-9D229D239D249D259D269D279D289D299D2A9D2B9D2C9D2D9D2E9D2F9D309D31
-9D329D339D349D359D369D379D389D399D3A9D3B9D3C9D3D9D3E9D3F9D409D41
-9D42000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-F9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9D439D449D459D469D479D489D499D4A9D4B9D4C9D4D9D4E9D4F9D509D519D52
-9D539D549D559D569D579D589D599D5A9D5B9D5C9D5D9D5E9D5F9D609D619D62
-9D639D649D659D669D679D689D699D6A9D6B9D6C9D6D9D6E9D6F9D709D719D72
-9D739D749D759D769D779D789D799D7A9D7B9D7C9D7D9D7E9D7F9D809D810000
-9D829D839D849D859D869D879D889D899D8A9D8B9D8C9D8D9D8E9D8F9D909D91
-9D929D939D949D959D969D979D989D999D9A9D9B9D9C9D9D9D9E9D9F9DA09DA1
-9DA2000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9DA39DA49DA59DA69DA79DA89DA99DAA9DAB9DAC9DAD9DAE9DAF9DB09DB19DB2
-9DB39DB49DB59DB69DB79DB89DB99DBA9DBB9DBC9DBD9DBE9DBF9DC09DC19DC2
-9DC39DC49DC59DC69DC79DC89DC99DCA9DCB9DCC9DCD9DCE9DCF9DD09DD19DD2
-9DD39DD49DD59DD69DD79DD89DD99DDA9DDB9DDC9DDD9DDE9DDF9DE09DE10000
-9DE29DE39DE49DE59DE69DE79DE89DE99DEA9DEB9DEC9DED9DEE9DEF9DF09DF1
-9DF29DF39DF49DF59DF69DF79DF89DF99DFA9DFB9DFC9DFD9DFE9DFF9E009E01
-9E02000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9E039E049E059E069E079E089E099E0A9E0B9E0C9E0D9E0E9E0F9E109E119E12
-9E139E149E159E169E179E189E199E1A9E1B9E1C9E1D9E1E9E249E279E2E9E30
-9E349E3B9E3C9E409E4D9E509E529E539E549E569E599E5D9E5F9E609E619E62
-9E659E6E9E6F9E729E749E759E769E779E789E799E7A9E7B9E7C9E7D9E800000
-9E819E839E849E859E869E899E8A9E8C9E8D9E8E9E8F9E909E919E949E959E96
-9E979E989E999E9A9E9B9E9C9E9E9EA09EA19EA29EA39EA49EA59EA79EA89EA9
-9EAA000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9EAB9EAC9EAD9EAE9EAF9EB09EB19EB29EB39EB59EB69EB79EB99EBA9EBC9EBF
-9EC09EC19EC29EC39EC59EC69EC79EC89ECA9ECB9ECC9ED09ED29ED39ED59ED6
-9ED79ED99EDA9EDE9EE19EE39EE49EE69EE89EEB9EEC9EED9EEE9EF09EF19EF2
-9EF39EF49EF59EF69EF79EF89EFA9EFD9EFF9F009F019F029F039F049F050000
-9F069F079F089F099F0A9F0C9F0F9F119F129F149F159F169F189F1A9F1B9F1C
-9F1D9F1E9F1F9F219F239F249F259F269F279F289F299F2A9F2B9F2D9F2E9F30
-9F31000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9F329F339F349F359F369F389F3A9F3C9F3F9F409F419F429F439F459F469F47
-9F489F499F4A9F4B9F4C9F4D9F4E9F4F9F529F539F549F559F569F579F589F59
-9F5A9F5B9F5C9F5D9F5E9F5F9F609F619F629F639F649F659F669F679F689F69
-9F6A9F6B9F6C9F6D9F6E9F6F9F709F719F729F739F749F759F769F779F780000
-9F799F7A9F7B9F7C9F7D9F7E9F819F829F8D9F8E9F8F9F909F919F929F939F94
-9F959F969F979F989F9C9F9D9F9E9FA19FA29FA39FA49FA5F92CF979F995F9E7
-F9F1000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FA0CFA0DFA0EFA0FFA11FA13FA14FA18FA1FFA20FA21FA23FA24FA27FA28FA29
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/cp949.enc b/library/encoding/cp949.enc
deleted file mode 100644
index 697fc6f94..0000000
--- a/library/encoding/cp949.enc
+++ /dev/null
@@ -1,2128 +0,0 @@
-# Encoding file: cp949, multi-byte
-M
-003F 0 125
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AC02AC03AC05AC06AC0BAC0CAC0DAC0EAC0FAC18AC1EAC1FAC21AC22AC23
-AC25AC26AC27AC28AC29AC2AAC2BAC2EAC32AC33AC3400000000000000000000
-0000AC35AC36AC37AC3AAC3BAC3DAC3EAC3FAC41AC42AC43AC44AC45AC46AC47
-AC48AC49AC4AAC4CAC4EAC4FAC50AC51AC52AC53AC5500000000000000000000
-0000AC56AC57AC59AC5AAC5BAC5DAC5EAC5FAC60AC61AC62AC63AC64AC65AC66
-AC67AC68AC69AC6AAC6BAC6CAC6DAC6EAC6FAC72AC73AC75AC76AC79AC7BAC7C
-AC7DAC7EAC7FAC82AC87AC88AC8DAC8EAC8FAC91AC92AC93AC95AC96AC97AC98
-AC99AC9AAC9BAC9EACA2ACA3ACA4ACA5ACA6ACA7ACABACADACAEACB1ACB2ACB3
-ACB4ACB5ACB6ACB7ACBAACBEACBFACC0ACC2ACC3ACC5ACC6ACC7ACC9ACCAACCB
-ACCDACCEACCFACD0ACD1ACD2ACD3ACD4ACD6ACD8ACD9ACDAACDBACDCACDDACDE
-ACDFACE2ACE3ACE5ACE6ACE9ACEBACEDACEEACF2ACF4ACF7ACF8ACF9ACFAACFB
-ACFEACFFAD01AD02AD03AD05AD07AD08AD09AD0AAD0BAD0EAD10AD12AD130000
-82
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AD14AD15AD16AD17AD19AD1AAD1BAD1DAD1EAD1FAD21AD22AD23AD24AD25
-AD26AD27AD28AD2AAD2BAD2EAD2FAD30AD31AD32AD3300000000000000000000
-0000AD36AD37AD39AD3AAD3BAD3DAD3EAD3FAD40AD41AD42AD43AD46AD48AD4A
-AD4BAD4CAD4DAD4EAD4FAD51AD52AD53AD55AD56AD5700000000000000000000
-0000AD59AD5AAD5BAD5CAD5DAD5EAD5FAD60AD62AD64AD65AD66AD67AD68AD69
-AD6AAD6BAD6EAD6FAD71AD72AD77AD78AD79AD7AAD7EAD80AD83AD84AD85AD86
-AD87AD8AAD8BAD8DAD8EAD8FAD91AD92AD93AD94AD95AD96AD97AD98AD99AD9A
-AD9BAD9EAD9FADA0ADA1ADA2ADA3ADA5ADA6ADA7ADA8ADA9ADAAADABADACADAD
-ADAEADAFADB0ADB1ADB2ADB3ADB4ADB5ADB6ADB8ADB9ADBAADBBADBCADBDADBE
-ADBFADC2ADC3ADC5ADC6ADC7ADC9ADCAADCBADCCADCDADCEADCFADD2ADD4ADD5
-ADD6ADD7ADD8ADD9ADDAADDBADDDADDEADDFADE1ADE2ADE3ADE5ADE6ADE7ADE8
-ADE9ADEAADEBADECADEDADEEADEFADF0ADF1ADF2ADF3ADF4ADF5ADF6ADF70000
-83
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000ADFAADFBADFDADFEAE02AE03AE04AE05AE06AE07AE0AAE0CAE0EAE0FAE10
-AE11AE12AE13AE15AE16AE17AE18AE19AE1AAE1BAE1C00000000000000000000
-0000AE1DAE1EAE1FAE20AE21AE22AE23AE24AE25AE26AE27AE28AE29AE2AAE2B
-AE2CAE2DAE2EAE2FAE32AE33AE35AE36AE39AE3BAE3C00000000000000000000
-0000AE3DAE3EAE3FAE42AE44AE47AE48AE49AE4BAE4FAE51AE52AE53AE55AE57
-AE58AE59AE5AAE5BAE5EAE62AE63AE64AE66AE67AE6AAE6BAE6DAE6EAE6FAE71
-AE72AE73AE74AE75AE76AE77AE7AAE7EAE7FAE80AE81AE82AE83AE86AE87AE88
-AE89AE8AAE8BAE8DAE8EAE8FAE90AE91AE92AE93AE94AE95AE96AE97AE98AE99
-AE9AAE9BAE9CAE9DAE9EAE9FAEA0AEA1AEA2AEA3AEA4AEA5AEA6AEA7AEA8AEA9
-AEAAAEABAEACAEADAEAEAEAFAEB0AEB1AEB2AEB3AEB4AEB5AEB6AEB7AEB8AEB9
-AEBAAEBBAEBFAEC1AEC2AEC3AEC5AEC6AEC7AEC8AEC9AECAAECBAECEAED2AED3
-AED4AED5AED6AED7AEDAAEDBAEDDAEDEAEDFAEE0AEE1AEE2AEE3AEE4AEE50000
-84
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AEE6AEE7AEE9AEEAAEECAEEEAEEFAEF0AEF1AEF2AEF3AEF5AEF6AEF7AEF9
-AEFAAEFBAEFDAEFEAEFFAF00AF01AF02AF03AF04AF0500000000000000000000
-0000AF06AF09AF0AAF0BAF0CAF0EAF0FAF11AF12AF13AF14AF15AF16AF17AF18
-AF19AF1AAF1BAF1CAF1DAF1EAF1FAF20AF21AF22AF2300000000000000000000
-0000AF24AF25AF26AF27AF28AF29AF2AAF2BAF2EAF2FAF31AF33AF35AF36AF37
-AF38AF39AF3AAF3BAF3EAF40AF44AF45AF46AF47AF4AAF4BAF4CAF4DAF4EAF4F
-AF51AF52AF53AF54AF55AF56AF57AF58AF59AF5AAF5BAF5EAF5FAF60AF61AF62
-AF63AF66AF67AF68AF69AF6AAF6BAF6CAF6DAF6EAF6FAF70AF71AF72AF73AF74
-AF75AF76AF77AF78AF7AAF7BAF7CAF7DAF7EAF7FAF81AF82AF83AF85AF86AF87
-AF89AF8AAF8BAF8CAF8DAF8EAF8FAF92AF93AF94AF96AF97AF98AF99AF9AAF9B
-AF9DAF9EAF9FAFA0AFA1AFA2AFA3AFA4AFA5AFA6AFA7AFA8AFA9AFAAAFABAFAC
-AFADAFAEAFAFAFB0AFB1AFB2AFB3AFB4AFB5AFB6AFB7AFBAAFBBAFBDAFBE0000
-85
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AFBFAFC1AFC2AFC3AFC4AFC5AFC6AFCAAFCCAFCFAFD0AFD1AFD2AFD3AFD5
-AFD6AFD7AFD8AFD9AFDAAFDBAFDDAFDEAFDFAFE0AFE100000000000000000000
-0000AFE2AFE3AFE4AFE5AFE6AFE7AFEAAFEBAFECAFEDAFEEAFEFAFF2AFF3AFF5
-AFF6AFF7AFF9AFFAAFFBAFFCAFFDAFFEAFFFB002B00300000000000000000000
-0000B005B006B007B008B009B00AB00BB00DB00EB00FB011B012B013B015B016
-B017B018B019B01AB01BB01EB01FB020B021B022B023B024B025B026B027B029
-B02AB02BB02CB02DB02EB02FB030B031B032B033B034B035B036B037B038B039
-B03AB03BB03CB03DB03EB03FB040B041B042B043B046B047B049B04BB04DB04F
-B050B051B052B056B058B05AB05BB05CB05EB05FB060B061B062B063B064B065
-B066B067B068B069B06AB06BB06CB06DB06EB06FB070B071B072B073B074B075
-B076B077B078B079B07AB07BB07EB07FB081B082B083B085B086B087B088B089
-B08AB08BB08EB090B092B093B094B095B096B097B09BB09DB09EB0A3B0A40000
-86
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B0A5B0A6B0A7B0AAB0B0B0B2B0B6B0B7B0B9B0BAB0BBB0BDB0BEB0BFB0C0
-B0C1B0C2B0C3B0C6B0CAB0CBB0CCB0CDB0CEB0CFB0D200000000000000000000
-0000B0D3B0D5B0D6B0D7B0D9B0DAB0DBB0DCB0DDB0DEB0DFB0E1B0E2B0E3B0E4
-B0E6B0E7B0E8B0E9B0EAB0EBB0ECB0EDB0EEB0EFB0F000000000000000000000
-0000B0F1B0F2B0F3B0F4B0F5B0F6B0F7B0F8B0F9B0FAB0FBB0FCB0FDB0FEB0FF
-B100B101B102B103B104B105B106B107B10AB10DB10EB10FB111B114B115B116
-B117B11AB11EB11FB120B121B122B126B127B129B12AB12BB12DB12EB12FB130
-B131B132B133B136B13AB13BB13CB13DB13EB13FB142B143B145B146B147B149
-B14AB14BB14CB14DB14EB14FB152B153B156B157B159B15AB15BB15DB15EB15F
-B161B162B163B164B165B166B167B168B169B16AB16BB16CB16DB16EB16FB170
-B171B172B173B174B175B176B177B17AB17BB17DB17EB17FB181B183B184B185
-B186B187B18AB18CB18EB18FB190B191B195B196B197B199B19AB19BB19D0000
-87
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B19EB19FB1A0B1A1B1A2B1A3B1A4B1A5B1A6B1A7B1A9B1AAB1ABB1ACB1AD
-B1AEB1AFB1B0B1B1B1B2B1B3B1B4B1B5B1B6B1B7B1B800000000000000000000
-0000B1B9B1BAB1BBB1BCB1BDB1BEB1BFB1C0B1C1B1C2B1C3B1C4B1C5B1C6B1C7
-B1C8B1C9B1CAB1CBB1CDB1CEB1CFB1D1B1D2B1D3B1D500000000000000000000
-0000B1D6B1D7B1D8B1D9B1DAB1DBB1DEB1E0B1E1B1E2B1E3B1E4B1E5B1E6B1E7
-B1EAB1EBB1EDB1EEB1EFB1F1B1F2B1F3B1F4B1F5B1F6B1F7B1F8B1FAB1FCB1FE
-B1FFB200B201B202B203B206B207B209B20AB20DB20EB20FB210B211B212B213
-B216B218B21AB21BB21CB21DB21EB21FB221B222B223B224B225B226B227B228
-B229B22AB22BB22CB22DB22EB22FB230B231B232B233B235B236B237B238B239
-B23AB23BB23DB23EB23FB240B241B242B243B244B245B246B247B248B249B24A
-B24BB24CB24DB24EB24FB250B251B252B253B254B255B256B257B259B25AB25B
-B25DB25EB25FB261B262B263B264B265B266B267B26AB26BB26CB26DB26E0000
-88
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B26FB270B271B272B273B276B277B278B279B27AB27BB27DB27EB27FB280
-B281B282B283B286B287B288B28AB28BB28CB28DB28E00000000000000000000
-0000B28FB292B293B295B296B297B29BB29CB29DB29EB29FB2A2B2A4B2A7B2A8
-B2A9B2ABB2ADB2AEB2AFB2B1B2B2B2B3B2B5B2B6B2B700000000000000000000
-0000B2B8B2B9B2BAB2BBB2BCB2BDB2BEB2BFB2C0B2C1B2C2B2C3B2C4B2C5B2C6
-B2C7B2CAB2CBB2CDB2CEB2CFB2D1B2D3B2D4B2D5B2D6B2D7B2DAB2DCB2DEB2DF
-B2E0B2E1B2E3B2E7B2E9B2EAB2F0B2F1B2F2B2F6B2FCB2FDB2FEB302B303B305
-B306B307B309B30AB30BB30CB30DB30EB30FB312B316B317B318B319B31AB31B
-B31DB31EB31FB320B321B322B323B324B325B326B327B328B329B32AB32BB32C
-B32DB32EB32FB330B331B332B333B334B335B336B337B338B339B33AB33BB33C
-B33DB33EB33FB340B341B342B343B344B345B346B347B348B349B34AB34BB34C
-B34DB34EB34FB350B351B352B353B357B359B35AB35DB360B361B362B3630000
-89
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B366B368B36AB36CB36DB36FB372B373B375B376B377B379B37AB37BB37C
-B37DB37EB37FB382B386B387B388B389B38AB38BB38D00000000000000000000
-0000B38EB38FB391B392B393B395B396B397B398B399B39AB39BB39CB39DB39E
-B39FB3A2B3A3B3A4B3A5B3A6B3A7B3A9B3AAB3ABB3AD00000000000000000000
-0000B3AEB3AFB3B0B3B1B3B2B3B3B3B4B3B5B3B6B3B7B3B8B3B9B3BAB3BBB3BC
-B3BDB3BEB3BFB3C0B3C1B3C2B3C3B3C6B3C7B3C9B3CAB3CDB3CFB3D1B3D2B3D3
-B3D6B3D8B3DAB3DCB3DEB3DFB3E1B3E2B3E3B3E5B3E6B3E7B3E9B3EAB3EBB3EC
-B3EDB3EEB3EFB3F0B3F1B3F2B3F3B3F4B3F5B3F6B3F7B3F8B3F9B3FAB3FBB3FD
-B3FEB3FFB400B401B402B403B404B405B406B407B408B409B40AB40BB40CB40D
-B40EB40FB411B412B413B414B415B416B417B419B41AB41BB41DB41EB41FB421
-B422B423B424B425B426B427B42AB42CB42DB42EB42FB430B431B432B433B435
-B436B437B438B439B43AB43BB43CB43DB43EB43FB440B441B442B443B4440000
-8A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B445B446B447B448B449B44AB44BB44CB44DB44EB44FB452B453B455B456
-B457B459B45AB45BB45CB45DB45EB45FB462B464B46600000000000000000000
-0000B467B468B469B46AB46BB46DB46EB46FB470B471B472B473B474B475B476
-B477B478B479B47AB47BB47CB47DB47EB47FB481B48200000000000000000000
-0000B483B484B485B486B487B489B48AB48BB48CB48DB48EB48FB490B491B492
-B493B494B495B496B497B498B499B49AB49BB49CB49EB49FB4A0B4A1B4A2B4A3
-B4A5B4A6B4A7B4A9B4AAB4ABB4ADB4AEB4AFB4B0B4B1B4B2B4B3B4B4B4B6B4B8
-B4BAB4BBB4BCB4BDB4BEB4BFB4C1B4C2B4C3B4C5B4C6B4C7B4C9B4CAB4CBB4CC
-B4CDB4CEB4CFB4D1B4D2B4D3B4D4B4D6B4D7B4D8B4D9B4DAB4DBB4DEB4DFB4E1
-B4E2B4E5B4E7B4E8B4E9B4EAB4EBB4EEB4F0B4F2B4F3B4F4B4F5B4F6B4F7B4F9
-B4FAB4FBB4FCB4FDB4FEB4FFB500B501B502B503B504B505B506B507B508B509
-B50AB50BB50CB50DB50EB50FB510B511B512B513B516B517B519B51AB51D0000
-8B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B51EB51FB520B521B522B523B526B52BB52CB52DB52EB52FB532B533B535
-B536B537B539B53AB53BB53CB53DB53EB53FB542B54600000000000000000000
-0000B547B548B549B54AB54EB54FB551B552B553B555B556B557B558B559B55A
-B55BB55EB562B563B564B565B566B567B568B569B56A00000000000000000000
-0000B56BB56CB56DB56EB56FB570B571B572B573B574B575B576B577B578B579
-B57AB57BB57CB57DB57EB57FB580B581B582B583B584B585B586B587B588B589
-B58AB58BB58CB58DB58EB58FB590B591B592B593B594B595B596B597B598B599
-B59AB59BB59CB59DB59EB59FB5A2B5A3B5A5B5A6B5A7B5A9B5ACB5ADB5AEB5AF
-B5B2B5B6B5B7B5B8B5B9B5BAB5BEB5BFB5C1B5C2B5C3B5C5B5C6B5C7B5C8B5C9
-B5CAB5CBB5CEB5D2B5D3B5D4B5D5B5D6B5D7B5D9B5DAB5DBB5DCB5DDB5DEB5DF
-B5E0B5E1B5E2B5E3B5E4B5E5B5E6B5E7B5E8B5E9B5EAB5EBB5EDB5EEB5EFB5F0
-B5F1B5F2B5F3B5F4B5F5B5F6B5F7B5F8B5F9B5FAB5FBB5FCB5FDB5FEB5FF0000
-8C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B600B601B602B603B604B605B606B607B608B609B60AB60BB60CB60DB60E
-B60FB612B613B615B616B617B619B61AB61BB61CB61D00000000000000000000
-0000B61EB61FB620B621B622B623B624B626B627B628B629B62AB62BB62DB62E
-B62FB630B631B632B633B635B636B637B638B639B63A00000000000000000000
-0000B63BB63CB63DB63EB63FB640B641B642B643B644B645B646B647B649B64A
-B64BB64CB64DB64EB64FB650B651B652B653B654B655B656B657B658B659B65A
-B65BB65CB65DB65EB65FB660B661B662B663B665B666B667B669B66AB66BB66C
-B66DB66EB66FB670B671B672B673B674B675B676B677B678B679B67AB67BB67C
-B67DB67EB67FB680B681B682B683B684B685B686B687B688B689B68AB68BB68C
-B68DB68EB68FB690B691B692B693B694B695B696B697B698B699B69AB69BB69E
-B69FB6A1B6A2B6A3B6A5B6A6B6A7B6A8B6A9B6AAB6ADB6AEB6AFB6B0B6B2B6B3
-B6B4B6B5B6B6B6B7B6B8B6B9B6BAB6BBB6BCB6BDB6BEB6BFB6C0B6C1B6C20000
-8D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B6C3B6C4B6C5B6C6B6C7B6C8B6C9B6CAB6CBB6CCB6CDB6CEB6CFB6D0B6D1
-B6D2B6D3B6D5B6D6B6D7B6D8B6D9B6DAB6DBB6DCB6DD00000000000000000000
-0000B6DEB6DFB6E0B6E1B6E2B6E3B6E4B6E5B6E6B6E7B6E8B6E9B6EAB6EBB6EC
-B6EDB6EEB6EFB6F1B6F2B6F3B6F5B6F6B6F7B6F9B6FA00000000000000000000
-0000B6FBB6FCB6FDB6FEB6FFB702B703B704B706B707B708B709B70AB70BB70C
-B70DB70EB70FB710B711B712B713B714B715B716B717B718B719B71AB71BB71C
-B71DB71EB71FB720B721B722B723B724B725B726B727B72AB72BB72DB72EB731
-B732B733B734B735B736B737B73AB73CB73DB73EB73FB740B741B742B743B745
-B746B747B749B74AB74BB74DB74EB74FB750B751B752B753B756B757B758B759
-B75AB75BB75CB75DB75EB75FB761B762B763B765B766B767B769B76AB76BB76C
-B76DB76EB76FB772B774B776B777B778B779B77AB77BB77EB77FB781B782B783
-B785B786B787B788B789B78AB78BB78EB793B794B795B79AB79BB79DB79E0000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B79FB7A1B7A2B7A3B7A4B7A5B7A6B7A7B7AAB7AEB7AFB7B0B7B1B7B2B7B3
-B7B6B7B7B7B9B7BAB7BBB7BCB7BDB7BEB7BFB7C0B7C100000000000000000000
-0000B7C2B7C3B7C4B7C5B7C6B7C8B7CAB7CBB7CCB7CDB7CEB7CFB7D0B7D1B7D2
-B7D3B7D4B7D5B7D6B7D7B7D8B7D9B7DAB7DBB7DCB7DD00000000000000000000
-0000B7DEB7DFB7E0B7E1B7E2B7E3B7E4B7E5B7E6B7E7B7E8B7E9B7EAB7EBB7EE
-B7EFB7F1B7F2B7F3B7F5B7F6B7F7B7F8B7F9B7FAB7FBB7FEB802B803B804B805
-B806B80AB80BB80DB80EB80FB811B812B813B814B815B816B817B81AB81CB81E
-B81FB820B821B822B823B826B827B829B82AB82BB82DB82EB82FB830B831B832
-B833B836B83AB83BB83CB83DB83EB83FB841B842B843B845B846B847B848B849
-B84AB84BB84CB84DB84EB84FB850B852B854B855B856B857B858B859B85AB85B
-B85EB85FB861B862B863B865B866B867B868B869B86AB86BB86EB870B872B873
-B874B875B876B877B879B87AB87BB87DB87EB87FB880B881B882B883B8840000
-8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B885B886B887B888B889B88AB88BB88CB88EB88FB890B891B892B893B894
-B895B896B897B898B899B89AB89BB89CB89DB89EB89F00000000000000000000
-0000B8A0B8A1B8A2B8A3B8A4B8A5B8A6B8A7B8A9B8AAB8ABB8ACB8ADB8AEB8AF
-B8B1B8B2B8B3B8B5B8B6B8B7B8B9B8BAB8BBB8BCB8BD00000000000000000000
-0000B8BEB8BFB8C2B8C4B8C6B8C7B8C8B8C9B8CAB8CBB8CDB8CEB8CFB8D1B8D2
-B8D3B8D5B8D6B8D7B8D8B8D9B8DAB8DBB8DCB8DEB8E0B8E2B8E3B8E4B8E5B8E6
-B8E7B8EAB8EBB8EDB8EEB8EFB8F1B8F2B8F3B8F4B8F5B8F6B8F7B8FAB8FCB8FE
-B8FFB900B901B902B903B905B906B907B908B909B90AB90BB90CB90DB90EB90F
-B910B911B912B913B914B915B916B917B919B91AB91BB91CB91DB91EB91FB921
-B922B923B924B925B926B927B928B929B92AB92BB92CB92DB92EB92FB930B931
-B932B933B934B935B936B937B938B939B93AB93BB93EB93FB941B942B943B945
-B946B947B948B949B94AB94BB94DB94EB950B952B953B954B955B956B9570000
-90
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B95AB95BB95DB95EB95FB961B962B963B964B965B966B967B96AB96CB96E
-B96FB970B971B972B973B976B977B979B97AB97BB97D00000000000000000000
-0000B97EB97FB980B981B982B983B986B988B98BB98CB98FB990B991B992B993
-B994B995B996B997B998B999B99AB99BB99CB99DB99E00000000000000000000
-0000B99FB9A0B9A1B9A2B9A3B9A4B9A5B9A6B9A7B9A8B9A9B9AAB9ABB9AEB9AF
-B9B1B9B2B9B3B9B5B9B6B9B7B9B8B9B9B9BAB9BBB9BEB9C0B9C2B9C3B9C4B9C5
-B9C6B9C7B9CAB9CBB9CDB9D3B9D4B9D5B9D6B9D7B9DAB9DCB9DFB9E0B9E2B9E6
-B9E7B9E9B9EAB9EBB9EDB9EEB9EFB9F0B9F1B9F2B9F3B9F6B9FBB9FCB9FDB9FE
-B9FFBA02BA03BA04BA05BA06BA07BA09BA0ABA0BBA0CBA0DBA0EBA0FBA10BA11
-BA12BA13BA14BA16BA17BA18BA19BA1ABA1BBA1CBA1DBA1EBA1FBA20BA21BA22
-BA23BA24BA25BA26BA27BA28BA29BA2ABA2BBA2CBA2DBA2EBA2FBA30BA31BA32
-BA33BA34BA35BA36BA37BA3ABA3BBA3DBA3EBA3FBA41BA43BA44BA45BA460000
-91
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BA47BA4ABA4CBA4FBA50BA51BA52BA56BA57BA59BA5ABA5BBA5DBA5EBA5F
-BA60BA61BA62BA63BA66BA6ABA6BBA6CBA6DBA6EBA6F00000000000000000000
-0000BA72BA73BA75BA76BA77BA79BA7ABA7BBA7CBA7DBA7EBA7FBA80BA81BA82
-BA86BA88BA89BA8ABA8BBA8DBA8EBA8FBA90BA91BA9200000000000000000000
-0000BA93BA94BA95BA96BA97BA98BA99BA9ABA9BBA9CBA9DBA9EBA9FBAA0BAA1
-BAA2BAA3BAA4BAA5BAA6BAA7BAAABAADBAAEBAAFBAB1BAB3BAB4BAB5BAB6BAB7
-BABABABCBABEBABFBAC0BAC1BAC2BAC3BAC5BAC6BAC7BAC9BACABACBBACCBACD
-BACEBACFBAD0BAD1BAD2BAD3BAD4BAD5BAD6BAD7BADABADBBADCBADDBADEBADF
-BAE0BAE1BAE2BAE3BAE4BAE5BAE6BAE7BAE8BAE9BAEABAEBBAECBAEDBAEEBAEF
-BAF0BAF1BAF2BAF3BAF4BAF5BAF6BAF7BAF8BAF9BAFABAFBBAFDBAFEBAFFBB01
-BB02BB03BB05BB06BB07BB08BB09BB0ABB0BBB0CBB0EBB10BB12BB13BB14BB15
-BB16BB17BB19BB1ABB1BBB1DBB1EBB1FBB21BB22BB23BB24BB25BB26BB270000
-92
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BB28BB2ABB2CBB2DBB2EBB2FBB30BB31BB32BB33BB37BB39BB3ABB3FBB40
-BB41BB42BB43BB46BB48BB4ABB4BBB4CBB4EBB51BB5200000000000000000000
-0000BB53BB55BB56BB57BB59BB5ABB5BBB5CBB5DBB5EBB5FBB60BB62BB64BB65
-BB66BB67BB68BB69BB6ABB6BBB6DBB6EBB6FBB70BB7100000000000000000000
-0000BB72BB73BB74BB75BB76BB77BB78BB79BB7ABB7BBB7CBB7DBB7EBB7FBB80
-BB81BB82BB83BB84BB85BB86BB87BB89BB8ABB8BBB8DBB8EBB8FBB91BB92BB93
-BB94BB95BB96BB97BB98BB99BB9ABB9BBB9CBB9DBB9EBB9FBBA0BBA1BBA2BBA3
-BBA5BBA6BBA7BBA9BBAABBABBBADBBAEBBAFBBB0BBB1BBB2BBB3BBB5BBB6BBB8
-BBB9BBBABBBBBBBCBBBDBBBEBBBFBBC1BBC2BBC3BBC5BBC6BBC7BBC9BBCABBCB
-BBCCBBCDBBCEBBCFBBD1BBD2BBD4BBD5BBD6BBD7BBD8BBD9BBDABBDBBBDCBBDD
-BBDEBBDFBBE0BBE1BBE2BBE3BBE4BBE5BBE6BBE7BBE8BBE9BBEABBEBBBECBBED
-BBEEBBEFBBF0BBF1BBF2BBF3BBF4BBF5BBF6BBF7BBFABBFBBBFDBBFEBC010000
-93
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BC03BC04BC05BC06BC07BC0ABC0EBC10BC12BC13BC19BC1ABC20BC21BC22
-BC23BC26BC28BC2ABC2BBC2CBC2EBC2FBC32BC33BC3500000000000000000000
-0000BC36BC37BC39BC3ABC3BBC3CBC3DBC3EBC3FBC42BC46BC47BC48BC4ABC4B
-BC4EBC4FBC51BC52BC53BC54BC55BC56BC57BC58BC5900000000000000000000
-0000BC5ABC5BBC5CBC5EBC5FBC60BC61BC62BC63BC64BC65BC66BC67BC68BC69
-BC6ABC6BBC6CBC6DBC6EBC6FBC70BC71BC72BC73BC74BC75BC76BC77BC78BC79
-BC7ABC7BBC7CBC7DBC7EBC7FBC80BC81BC82BC83BC86BC87BC89BC8ABC8DBC8F
-BC90BC91BC92BC93BC96BC98BC9BBC9CBC9DBC9EBC9FBCA2BCA3BCA5BCA6BCA9
-BCAABCABBCACBCADBCAEBCAFBCB2BCB6BCB7BCB8BCB9BCBABCBBBCBEBCBFBCC1
-BCC2BCC3BCC5BCC6BCC7BCC8BCC9BCCABCCBBCCCBCCEBCD2BCD3BCD4BCD6BCD7
-BCD9BCDABCDBBCDDBCDEBCDFBCE0BCE1BCE2BCE3BCE4BCE5BCE6BCE7BCE8BCE9
-BCEABCEBBCECBCEDBCEEBCEFBCF0BCF1BCF2BCF3BCF7BCF9BCFABCFBBCFD0000
-94
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BCFEBCFFBD00BD01BD02BD03BD06BD08BD0ABD0BBD0CBD0DBD0EBD0FBD11
-BD12BD13BD15BD16BD17BD18BD19BD1ABD1BBD1CBD1D00000000000000000000
-0000BD1EBD1FBD20BD21BD22BD23BD25BD26BD27BD28BD29BD2ABD2BBD2DBD2E
-BD2FBD30BD31BD32BD33BD34BD35BD36BD37BD38BD3900000000000000000000
-0000BD3ABD3BBD3CBD3DBD3EBD3FBD41BD42BD43BD44BD45BD46BD47BD4ABD4B
-BD4DBD4EBD4FBD51BD52BD53BD54BD55BD56BD57BD5ABD5BBD5CBD5DBD5EBD5F
-BD60BD61BD62BD63BD65BD66BD67BD69BD6ABD6BBD6CBD6DBD6EBD6FBD70BD71
-BD72BD73BD74BD75BD76BD77BD78BD79BD7ABD7BBD7CBD7DBD7EBD7FBD82BD83
-BD85BD86BD8BBD8CBD8DBD8EBD8FBD92BD94BD96BD97BD98BD9BBD9DBD9EBD9F
-BDA0BDA1BDA2BDA3BDA5BDA6BDA7BDA8BDA9BDAABDABBDACBDADBDAEBDAFBDB1
-BDB2BDB3BDB4BDB5BDB6BDB7BDB9BDBABDBBBDBCBDBDBDBEBDBFBDC0BDC1BDC2
-BDC3BDC4BDC5BDC6BDC7BDC8BDC9BDCABDCBBDCCBDCDBDCEBDCFBDD0BDD10000
-95
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BDD2BDD3BDD6BDD7BDD9BDDABDDBBDDDBDDEBDDFBDE0BDE1BDE2BDE3BDE4
-BDE5BDE6BDE7BDE8BDEABDEBBDECBDEDBDEEBDEFBDF100000000000000000000
-0000BDF2BDF3BDF5BDF6BDF7BDF9BDFABDFBBDFCBDFDBDFEBDFFBE01BE02BE04
-BE06BE07BE08BE09BE0ABE0BBE0EBE0FBE11BE12BE1300000000000000000000
-0000BE15BE16BE17BE18BE19BE1ABE1BBE1EBE20BE21BE22BE23BE24BE25BE26
-BE27BE28BE29BE2ABE2BBE2CBE2DBE2EBE2FBE30BE31BE32BE33BE34BE35BE36
-BE37BE38BE39BE3ABE3BBE3CBE3DBE3EBE3FBE40BE41BE42BE43BE46BE47BE49
-BE4ABE4BBE4DBE4FBE50BE51BE52BE53BE56BE58BE5CBE5DBE5EBE5FBE62BE63
-BE65BE66BE67BE69BE6BBE6CBE6DBE6EBE6FBE72BE76BE77BE78BE79BE7ABE7E
-BE7FBE81BE82BE83BE85BE86BE87BE88BE89BE8ABE8BBE8EBE92BE93BE94BE95
-BE96BE97BE9ABE9BBE9CBE9DBE9EBE9FBEA0BEA1BEA2BEA3BEA4BEA5BEA6BEA7
-BEA9BEAABEABBEACBEADBEAEBEAFBEB0BEB1BEB2BEB3BEB4BEB5BEB6BEB70000
-96
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BEB8BEB9BEBABEBBBEBCBEBDBEBEBEBFBEC0BEC1BEC2BEC3BEC4BEC5BEC6
-BEC7BEC8BEC9BECABECBBECCBECDBECEBECFBED2BED300000000000000000000
-0000BED5BED6BED9BEDABEDBBEDCBEDDBEDEBEDFBEE1BEE2BEE6BEE7BEE8BEE9
-BEEABEEBBEEDBEEEBEEFBEF0BEF1BEF2BEF3BEF4BEF500000000000000000000
-0000BEF6BEF7BEF8BEF9BEFABEFBBEFCBEFDBEFEBEFFBF00BF02BF03BF04BF05
-BF06BF07BF0ABF0BBF0CBF0DBF0EBF0FBF10BF11BF12BF13BF14BF15BF16BF17
-BF1ABF1EBF1FBF20BF21BF22BF23BF24BF25BF26BF27BF28BF29BF2ABF2BBF2C
-BF2DBF2EBF2FBF30BF31BF32BF33BF34BF35BF36BF37BF38BF39BF3ABF3BBF3C
-BF3DBF3EBF3FBF42BF43BF45BF46BF47BF49BF4ABF4BBF4CBF4DBF4EBF4FBF52
-BF53BF54BF56BF57BF58BF59BF5ABF5BBF5CBF5DBF5EBF5FBF60BF61BF62BF63
-BF64BF65BF66BF67BF68BF69BF6ABF6BBF6CBF6DBF6EBF6FBF70BF71BF72BF73
-BF74BF75BF76BF77BF78BF79BF7ABF7BBF7CBF7DBF7EBF7FBF80BF81BF820000
-97
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BF83BF84BF85BF86BF87BF88BF89BF8ABF8BBF8CBF8DBF8EBF8FBF90BF91
-BF92BF93BF95BF96BF97BF98BF99BF9ABF9BBF9CBF9D00000000000000000000
-0000BF9EBF9FBFA0BFA1BFA2BFA3BFA4BFA5BFA6BFA7BFA8BFA9BFAABFABBFAC
-BFADBFAEBFAFBFB1BFB2BFB3BFB4BFB5BFB6BFB7BFB800000000000000000000
-0000BFB9BFBABFBBBFBCBFBDBFBEBFBFBFC0BFC1BFC2BFC3BFC4BFC6BFC7BFC8
-BFC9BFCABFCBBFCEBFCFBFD1BFD2BFD3BFD5BFD6BFD7BFD8BFD9BFDABFDBBFDD
-BFDEBFE0BFE2BFE3BFE4BFE5BFE6BFE7BFE8BFE9BFEABFEBBFECBFEDBFEEBFEF
-BFF0BFF1BFF2BFF3BFF4BFF5BFF6BFF7BFF8BFF9BFFABFFBBFFCBFFDBFFEBFFF
-C000C001C002C003C004C005C006C007C008C009C00AC00BC00CC00DC00EC00F
-C010C011C012C013C014C015C016C017C018C019C01AC01BC01CC01DC01EC01F
-C020C021C022C023C024C025C026C027C028C029C02AC02BC02CC02DC02EC02F
-C030C031C032C033C034C035C036C037C038C039C03AC03BC03DC03EC03F0000
-98
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C040C041C042C043C044C045C046C047C048C049C04AC04BC04CC04DC04E
-C04FC050C052C053C054C055C056C057C059C05AC05B00000000000000000000
-0000C05DC05EC05FC061C062C063C064C065C066C067C06AC06BC06CC06DC06E
-C06FC070C071C072C073C074C075C076C077C078C07900000000000000000000
-0000C07AC07BC07CC07DC07EC07FC080C081C082C083C084C085C086C087C088
-C089C08AC08BC08CC08DC08EC08FC092C093C095C096C097C099C09AC09BC09C
-C09DC09EC09FC0A2C0A4C0A6C0A7C0A8C0A9C0AAC0ABC0AEC0B1C0B2C0B7C0B8
-C0B9C0BAC0BBC0BEC0C2C0C3C0C4C0C6C0C7C0CAC0CBC0CDC0CEC0CFC0D1C0D2
-C0D3C0D4C0D5C0D6C0D7C0DAC0DEC0DFC0E0C0E1C0E2C0E3C0E6C0E7C0E9C0EA
-C0EBC0EDC0EEC0EFC0F0C0F1C0F2C0F3C0F6C0F8C0FAC0FBC0FCC0FDC0FEC0FF
-C101C102C103C105C106C107C109C10AC10BC10CC10DC10EC10FC111C112C113
-C114C116C117C118C119C11AC11BC121C122C125C128C129C12AC12BC12E0000
-99
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C132C133C134C135C137C13AC13BC13DC13EC13FC141C142C143C144C145
-C146C147C14AC14EC14FC150C151C152C153C156C15700000000000000000000
-0000C159C15AC15BC15DC15EC15FC160C161C162C163C166C16AC16BC16CC16D
-C16EC16FC171C172C173C175C176C177C179C17AC17B00000000000000000000
-0000C17CC17DC17EC17FC180C181C182C183C184C186C187C188C189C18AC18B
-C18FC191C192C193C195C197C198C199C19AC19BC19EC1A0C1A2C1A3C1A4C1A6
-C1A7C1AAC1ABC1ADC1AEC1AFC1B1C1B2C1B3C1B4C1B5C1B6C1B7C1B8C1B9C1BA
-C1BBC1BCC1BEC1BFC1C0C1C1C1C2C1C3C1C5C1C6C1C7C1C9C1CAC1CBC1CDC1CE
-C1CFC1D0C1D1C1D2C1D3C1D5C1D6C1D9C1DAC1DBC1DCC1DDC1DEC1DFC1E1C1E2
-C1E3C1E5C1E6C1E7C1E9C1EAC1EBC1ECC1EDC1EEC1EFC1F2C1F4C1F5C1F6C1F7
-C1F8C1F9C1FAC1FBC1FEC1FFC201C202C203C205C206C207C208C209C20AC20B
-C20EC210C212C213C214C215C216C217C21AC21BC21DC21EC221C222C2230000
-9A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C224C225C226C227C22AC22CC22EC230C233C235C236C237C238C239C23A
-C23BC23CC23DC23EC23FC240C241C242C243C244C24500000000000000000000
-0000C246C247C249C24AC24BC24CC24DC24EC24FC252C253C255C256C257C259
-C25AC25BC25CC25DC25EC25FC261C262C263C264C26600000000000000000000
-0000C267C268C269C26AC26BC26EC26FC271C272C273C275C276C277C278C279
-C27AC27BC27EC280C282C283C284C285C286C287C28AC28BC28CC28DC28EC28F
-C291C292C293C294C295C296C297C299C29AC29CC29EC29FC2A0C2A1C2A2C2A3
-C2A6C2A7C2A9C2AAC2ABC2AEC2AFC2B0C2B1C2B2C2B3C2B6C2B8C2BAC2BBC2BC
-C2BDC2BEC2BFC2C0C2C1C2C2C2C3C2C4C2C5C2C6C2C7C2C8C2C9C2CAC2CBC2CC
-C2CDC2CEC2CFC2D0C2D1C2D2C2D3C2D4C2D5C2D6C2D7C2D8C2D9C2DAC2DBC2DE
-C2DFC2E1C2E2C2E5C2E6C2E7C2E8C2E9C2EAC2EEC2F0C2F2C2F3C2F4C2F5C2F7
-C2FAC2FDC2FEC2FFC301C302C303C304C305C306C307C30AC30BC30EC30F0000
-9B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C310C311C312C316C317C319C31AC31BC31DC31EC31FC320C321C322C323
-C326C327C32AC32BC32CC32DC32EC32FC330C331C33200000000000000000000
-0000C333C334C335C336C337C338C339C33AC33BC33CC33DC33EC33FC340C341
-C342C343C344C346C347C348C349C34AC34BC34CC34D00000000000000000000
-0000C34EC34FC350C351C352C353C354C355C356C357C358C359C35AC35BC35C
-C35DC35EC35FC360C361C362C363C364C365C366C367C36AC36BC36DC36EC36F
-C371C373C374C375C376C377C37AC37BC37EC37FC380C381C382C383C385C386
-C387C389C38AC38BC38DC38EC38FC390C391C392C393C394C395C396C397C398
-C399C39AC39BC39CC39DC39EC39FC3A0C3A1C3A2C3A3C3A4C3A5C3A6C3A7C3A8
-C3A9C3AAC3ABC3ACC3ADC3AEC3AFC3B0C3B1C3B2C3B3C3B4C3B5C3B6C3B7C3B8
-C3B9C3BAC3BBC3BCC3BDC3BEC3BFC3C1C3C2C3C3C3C4C3C5C3C6C3C7C3C8C3C9
-C3CAC3CBC3CCC3CDC3CEC3CFC3D0C3D1C3D2C3D3C3D4C3D5C3D6C3D7C3DA0000
-9C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C3DBC3DDC3DEC3E1C3E3C3E4C3E5C3E6C3E7C3EAC3EBC3ECC3EEC3EFC3F0
-C3F1C3F2C3F3C3F6C3F7C3F9C3FAC3FBC3FCC3FDC3FE00000000000000000000
-0000C3FFC400C401C402C403C404C405C406C407C409C40AC40BC40CC40DC40E
-C40FC411C412C413C414C415C416C417C418C419C41A00000000000000000000
-0000C41BC41CC41DC41EC41FC420C421C422C423C425C426C427C428C429C42A
-C42BC42DC42EC42FC431C432C433C435C436C437C438C439C43AC43BC43EC43F
-C440C441C442C443C444C445C446C447C449C44AC44BC44CC44DC44EC44FC450
-C451C452C453C454C455C456C457C458C459C45AC45BC45CC45DC45EC45FC460
-C461C462C463C466C467C469C46AC46BC46DC46EC46FC470C471C472C473C476
-C477C478C47AC47BC47CC47DC47EC47FC481C482C483C484C485C486C487C488
-C489C48AC48BC48CC48DC48EC48FC490C491C492C493C495C496C497C498C499
-C49AC49BC49DC49EC49FC4A0C4A1C4A2C4A3C4A4C4A5C4A6C4A7C4A8C4A90000
-9D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C4AAC4ABC4ACC4ADC4AEC4AFC4B0C4B1C4B2C4B3C4B4C4B5C4B6C4B7C4B9
-C4BAC4BBC4BDC4BEC4BFC4C0C4C1C4C2C4C3C4C4C4C500000000000000000000
-0000C4C6C4C7C4C8C4C9C4CAC4CBC4CCC4CDC4CEC4CFC4D0C4D1C4D2C4D3C4D4
-C4D5C4D6C4D7C4D8C4D9C4DAC4DBC4DCC4DDC4DEC4DF00000000000000000000
-0000C4E0C4E1C4E2C4E3C4E4C4E5C4E6C4E7C4E8C4EAC4EBC4ECC4EDC4EEC4EF
-C4F2C4F3C4F5C4F6C4F7C4F9C4FBC4FCC4FDC4FEC502C503C504C505C506C507
-C508C509C50AC50BC50DC50EC50FC511C512C513C515C516C517C518C519C51A
-C51BC51DC51EC51FC520C521C522C523C524C525C526C527C52AC52BC52DC52E
-C52FC531C532C533C534C535C536C537C53AC53CC53EC53FC540C541C542C543
-C546C547C54BC54FC550C551C552C556C55AC55BC55CC55FC562C563C565C566
-C567C569C56AC56BC56CC56DC56EC56FC572C576C577C578C579C57AC57BC57E
-C57FC581C582C583C585C586C588C589C58AC58BC58EC590C592C593C5940000
-9E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C596C599C59AC59BC59DC59EC59FC5A1C5A2C5A3C5A4C5A5C5A6C5A7C5A8
-C5AAC5ABC5ACC5ADC5AEC5AFC5B0C5B1C5B2C5B3C5B600000000000000000000
-0000C5B7C5BAC5BFC5C0C5C1C5C2C5C3C5CBC5CDC5CFC5D2C5D3C5D5C5D6C5D7
-C5D9C5DAC5DBC5DCC5DDC5DEC5DFC5E2C5E4C5E6C5E700000000000000000000
-0000C5E8C5E9C5EAC5EBC5EFC5F1C5F2C5F3C5F5C5F8C5F9C5FAC5FBC602C603
-C604C609C60AC60BC60DC60EC60FC611C612C613C614C615C616C617C61AC61D
-C61EC61FC620C621C622C623C626C627C629C62AC62BC62FC631C632C636C638
-C63AC63CC63DC63EC63FC642C643C645C646C647C649C64AC64BC64CC64DC64E
-C64FC652C656C657C658C659C65AC65BC65EC65FC661C662C663C664C665C666
-C667C668C669C66AC66BC66DC66EC670C672C673C674C675C676C677C67AC67B
-C67DC67EC67FC681C682C683C684C685C686C687C68AC68CC68EC68FC690C691
-C692C693C696C697C699C69AC69BC69DC69EC69FC6A0C6A1C6A2C6A3C6A60000
-9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C6A8C6AAC6ABC6ACC6ADC6AEC6AFC6B2C6B3C6B5C6B6C6B7C6BBC6BCC6BD
-C6BEC6BFC6C2C6C4C6C6C6C7C6C8C6C9C6CAC6CBC6CE00000000000000000000
-0000C6CFC6D1C6D2C6D3C6D5C6D6C6D7C6D8C6D9C6DAC6DBC6DEC6DFC6E2C6E3
-C6E4C6E5C6E6C6E7C6EAC6EBC6EDC6EEC6EFC6F1C6F200000000000000000000
-0000C6F3C6F4C6F5C6F6C6F7C6FAC6FBC6FCC6FEC6FFC700C701C702C703C706
-C707C709C70AC70BC70DC70EC70FC710C711C712C713C716C718C71AC71BC71C
-C71DC71EC71FC722C723C725C726C727C729C72AC72BC72CC72DC72EC72FC732
-C734C736C738C739C73AC73BC73EC73FC741C742C743C745C746C747C748C749
-C74BC74EC750C759C75AC75BC75DC75EC75FC761C762C763C764C765C766C767
-C769C76AC76CC76DC76EC76FC770C771C772C773C776C777C779C77AC77BC77F
-C780C781C782C786C78BC78CC78DC78FC792C793C795C799C79BC79CC79DC79E
-C79FC7A2C7A7C7A8C7A9C7AAC7ABC7AEC7AFC7B1C7B2C7B3C7B5C7B6C7B70000
-A0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C7B8C7B9C7BAC7BBC7BEC7C2C7C3C7C4C7C5C7C6C7C7C7CAC7CBC7CDC7CF
-C7D1C7D2C7D3C7D4C7D5C7D6C7D7C7D9C7DAC7DBC7DC00000000000000000000
-0000C7DEC7DFC7E0C7E1C7E2C7E3C7E5C7E6C7E7C7E9C7EAC7EBC7EDC7EEC7EF
-C7F0C7F1C7F2C7F3C7F4C7F5C7F6C7F7C7F8C7F9C7FA00000000000000000000
-0000C7FBC7FCC7FDC7FEC7FFC802C803C805C806C807C809C80BC80CC80DC80E
-C80FC812C814C817C818C819C81AC81BC81EC81FC821C822C823C825C826C827
-C828C829C82AC82BC82EC830C832C833C834C835C836C837C839C83AC83BC83D
-C83EC83FC841C842C843C844C845C846C847C84AC84BC84EC84FC850C851C852
-C853C855C856C857C858C859C85AC85BC85CC85DC85EC85FC860C861C862C863
-C864C865C866C867C868C869C86AC86BC86CC86DC86EC86FC872C873C875C876
-C877C879C87BC87CC87DC87EC87FC882C884C888C889C88AC88EC88FC890C891
-C892C893C895C896C897C898C899C89AC89BC89CC89EC8A0C8A2C8A3C8A40000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C8A5C8A6C8A7C8A9C8AAC8ABC8ACC8ADC8AEC8AFC8B0C8B1C8B2C8B3C8B4
-C8B5C8B6C8B7C8B8C8B9C8BAC8BBC8BEC8BFC8C0C8C100000000000000000000
-0000C8C2C8C3C8C5C8C6C8C7C8C9C8CAC8CBC8CDC8CEC8CFC8D0C8D1C8D2C8D3
-C8D6C8D8C8DAC8DBC8DCC8DDC8DEC8DFC8E2C8E3C8E500000000000000000000
-0000C8E6C8E7C8E8C8E9C8EAC8EBC8ECC8EDC8EEC8EFC8F0C8F1C8F2C8F3C8F4
-C8F6C8F7C8F8C8F9C8FAC8FBC8FEC8FFC901C902C903C907C908C909C90AC90B
-C90E30003001300200B72025202600A8300300AD20152225FF3C223C20182019
-201C201D3014301530083009300A300B300C300D300E300F3010301100B100D7
-00F7226022642265221E223400B0203220332103212BFFE0FFE1FFE526422640
-222022A52312220222072261225200A7203B2606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC219221902191219321943013226A226B221A223D
-221D2235222B222C2208220B2286228722822283222A222922272228FFE20000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C910C912C913C914C915C916C917C919C91AC91BC91CC91DC91EC91FC920
-C921C922C923C924C925C926C927C928C929C92AC92B00000000000000000000
-0000C92DC92EC92FC930C931C932C933C935C936C937C938C939C93AC93BC93C
-C93DC93EC93FC940C941C942C943C944C945C946C94700000000000000000000
-0000C948C949C94AC94BC94CC94DC94EC94FC952C953C955C956C957C959C95A
-C95BC95CC95DC95EC95FC962C964C965C966C967C968C969C96AC96BC96DC96E
-C96F21D221D42200220300B4FF5E02C702D802DD02DA02D900B802DB00A100BF
-02D0222E2211220F00A42109203025C125C025B725B626642660266126652667
-2663229925C825A325D025D1259225A425A525A825A725A625A92668260F260E
-261C261E00B62020202121952197219921962198266D2669266A266C327F321C
-211633C7212233C233D821210000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C971C972C973C975C976C977C978C979C97AC97BC97DC97EC97FC980C981
-C982C983C984C985C986C987C98AC98BC98DC98EC98F00000000000000000000
-0000C991C992C993C994C995C996C997C99AC99CC99EC99FC9A0C9A1C9A2C9A3
-C9A4C9A5C9A6C9A7C9A8C9A9C9AAC9ABC9ACC9ADC9AE00000000000000000000
-0000C9AFC9B0C9B1C9B2C9B3C9B4C9B5C9B6C9B7C9B8C9B9C9BAC9BBC9BCC9BD
-C9BEC9BFC9C2C9C3C9C5C9C6C9C9C9CBC9CCC9CDC9CEC9CFC9D2C9D4C9D7C9D8
-C9DBFF01FF02FF03FF04FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFFE6FF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C9DEC9DFC9E1C9E3C9E5C9E6C9E8C9E9C9EAC9EBC9EEC9F2C9F3C9F4C9F5
-C9F6C9F7C9FAC9FBC9FDC9FEC9FFCA01CA02CA03CA0400000000000000000000
-0000CA05CA06CA07CA0ACA0ECA0FCA10CA11CA12CA13CA15CA16CA17CA19CA1A
-CA1BCA1CCA1DCA1ECA1FCA20CA21CA22CA23CA24CA2500000000000000000000
-0000CA26CA27CA28CA2ACA2BCA2CCA2DCA2ECA2FCA30CA31CA32CA33CA34CA35
-CA36CA37CA38CA39CA3ACA3BCA3CCA3DCA3ECA3FCA40CA41CA42CA43CA44CA45
-CA46313131323133313431353136313731383139313A313B313C313D313E313F
-3140314131423143314431453146314731483149314A314B314C314D314E314F
-3150315131523153315431553156315731583159315A315B315C315D315E315F
-3160316131623163316431653166316731683169316A316B316C316D316E316F
-3170317131723173317431753176317731783179317A317B317C317D317E317F
-3180318131823183318431853186318731883189318A318B318C318D318E0000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CA47CA48CA49CA4ACA4BCA4ECA4FCA51CA52CA53CA55CA56CA57CA58CA59
-CA5ACA5BCA5ECA62CA63CA64CA65CA66CA67CA69CA6A00000000000000000000
-0000CA6BCA6CCA6DCA6ECA6FCA70CA71CA72CA73CA74CA75CA76CA77CA78CA79
-CA7ACA7BCA7CCA7ECA7FCA80CA81CA82CA83CA85CA8600000000000000000000
-0000CA87CA88CA89CA8ACA8BCA8CCA8DCA8ECA8FCA90CA91CA92CA93CA94CA95
-CA96CA97CA99CA9ACA9BCA9CCA9DCA9ECA9FCAA0CAA1CAA2CAA3CAA4CAA5CAA6
-CAA7217021712172217321742175217621772178217900000000000000000000
-2160216121622163216421652166216721682169000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CAA8CAA9CAAACAABCAACCAADCAAECAAFCAB0CAB1CAB2CAB3CAB4CAB5CAB6
-CAB7CAB8CAB9CABACABBCABECABFCAC1CAC2CAC3CAC500000000000000000000
-0000CAC6CAC7CAC8CAC9CACACACBCACECAD0CAD2CAD4CAD5CAD6CAD7CADACADB
-CADCCADDCADECADFCAE1CAE2CAE3CAE4CAE5CAE6CAE700000000000000000000
-0000CAE8CAE9CAEACAEBCAEDCAEECAEFCAF0CAF1CAF2CAF3CAF5CAF6CAF7CAF8
-CAF9CAFACAFBCAFCCAFDCAFECAFFCB00CB01CB02CB03CB04CB05CB06CB07CB09
-CB0A25002502250C251025182514251C252C25242534253C25012503250F2513
-251B251725232533252B253B254B2520252F25282537253F251D253025252538
-254225122511251A251925162515250E250D251E251F25212522252625272529
-252A252D252E25312532253525362539253A253D253E25402541254325442545
-2546254725482549254A00000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CB0BCB0CCB0DCB0ECB0FCB11CB12CB13CB15CB16CB17CB19CB1ACB1BCB1C
-CB1DCB1ECB1FCB22CB23CB24CB25CB26CB27CB28CB2900000000000000000000
-0000CB2ACB2BCB2CCB2DCB2ECB2FCB30CB31CB32CB33CB34CB35CB36CB37CB38
-CB39CB3ACB3BCB3CCB3DCB3ECB3FCB40CB42CB43CB4400000000000000000000
-0000CB45CB46CB47CB4ACB4BCB4DCB4ECB4FCB51CB52CB53CB54CB55CB56CB57
-CB5ACB5BCB5CCB5ECB5FCB60CB61CB62CB63CB65CB66CB67CB68CB69CB6ACB6B
-CB6C3395339633972113339833C433A333A433A533A63399339A339B339C339D
-339E339F33A033A133A233CA338D338E338F33CF3388338933C833A733A833B0
-33B133B233B333B433B533B633B733B833B93380338133823383338433BA33BB
-33BC33BD33BE33BF33903391339233933394212633C033C1338A338B338C33D6
-33C533AD33AE33AF33DB33A933AA33AB33AC33DD33D033D333C333C933DC33C6
-0000000000000000000000000000000000000000000000000000000000000000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CB6DCB6ECB6FCB70CB71CB72CB73CB74CB75CB76CB77CB7ACB7BCB7CCB7D
-CB7ECB7FCB80CB81CB82CB83CB84CB85CB86CB87CB8800000000000000000000
-0000CB89CB8ACB8BCB8CCB8DCB8ECB8FCB90CB91CB92CB93CB94CB95CB96CB97
-CB98CB99CB9ACB9BCB9DCB9ECB9FCBA0CBA1CBA2CBA300000000000000000000
-0000CBA4CBA5CBA6CBA7CBA8CBA9CBAACBABCBACCBADCBAECBAFCBB0CBB1CBB2
-CBB3CBB4CBB5CBB6CBB7CBB9CBBACBBBCBBCCBBDCBBECBBFCBC0CBC1CBC2CBC3
-CBC400C600D000AA0126000001320000013F014100D8015200BA00DE0166014A
-00003260326132623263326432653266326732683269326A326B326C326D326E
-326F3270327132723273327432753276327732783279327A327B24D024D124D2
-24D324D424D524D624D724D824D924DA24DB24DC24DD24DE24DF24E024E124E2
-24E324E424E524E624E724E824E9246024612462246324642465246624672468
-2469246A246B246C246D246E00BD2153215400BC00BE215B215C215D215E0000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CBC5CBC6CBC7CBC8CBC9CBCACBCBCBCCCBCDCBCECBCFCBD0CBD1CBD2CBD3
-CBD5CBD6CBD7CBD8CBD9CBDACBDBCBDCCBDDCBDECBDF00000000000000000000
-0000CBE0CBE1CBE2CBE3CBE5CBE6CBE8CBEACBEBCBECCBEDCBEECBEFCBF0CBF1
-CBF2CBF3CBF4CBF5CBF6CBF7CBF8CBF9CBFACBFBCBFC00000000000000000000
-0000CBFDCBFECBFFCC00CC01CC02CC03CC04CC05CC06CC07CC08CC09CC0ACC0B
-CC0ECC0FCC11CC12CC13CC15CC16CC17CC18CC19CC1ACC1BCC1ECC1FCC20CC23
-CC2400E6011100F001270131013301380140014200F8015300DF00FE0167014B
-01493200320132023203320432053206320732083209320A320B320C320D320E
-320F3210321132123213321432153216321732183219321A321B249C249D249E
-249F24A024A124A224A324A424A524A624A724A824A924AA24AB24AC24AD24AE
-24AF24B024B124B224B324B424B5247424752476247724782479247A247B247C
-247D247E247F24802481248200B900B200B32074207F20812082208320840000
-AA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CC25CC26CC2ACC2BCC2DCC2FCC31CC32CC33CC34CC35CC36CC37CC3ACC3F
-CC40CC41CC42CC43CC46CC47CC49CC4ACC4BCC4DCC4E00000000000000000000
-0000CC4FCC50CC51CC52CC53CC56CC5ACC5BCC5CCC5DCC5ECC5FCC61CC62CC63
-CC65CC67CC69CC6ACC6BCC6CCC6DCC6ECC6FCC71CC7200000000000000000000
-0000CC73CC74CC76CC77CC78CC79CC7ACC7BCC7CCC7DCC7ECC7FCC80CC81CC82
-CC83CC84CC85CC86CC87CC88CC89CC8ACC8BCC8CCC8DCC8ECC8FCC90CC91CC92
-CC93304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-AB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CC94CC95CC96CC97CC9ACC9BCC9DCC9ECC9FCCA1CCA2CCA3CCA4CCA5CCA6
-CCA7CCAACCAECCAFCCB0CCB1CCB2CCB3CCB6CCB7CCB900000000000000000000
-0000CCBACCBBCCBDCCBECCBFCCC0CCC1CCC2CCC3CCC6CCC8CCCACCCBCCCCCCCD
-CCCECCCFCCD1CCD2CCD3CCD5CCD6CCD7CCD8CCD9CCDA00000000000000000000
-0000CCDBCCDCCCDDCCDECCDFCCE0CCE1CCE2CCE3CCE5CCE6CCE7CCE8CCE9CCEA
-CCEBCCEDCCEECCEFCCF1CCF2CCF3CCF4CCF5CCF6CCF7CCF8CCF9CCFACCFBCCFC
-CCFD30A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-AC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CCFECCFFCD00CD02CD03CD04CD05CD06CD07CD0ACD0BCD0DCD0ECD0FCD11
-CD12CD13CD14CD15CD16CD17CD1ACD1CCD1ECD1FCD2000000000000000000000
-0000CD21CD22CD23CD25CD26CD27CD29CD2ACD2BCD2DCD2ECD2FCD30CD31CD32
-CD33CD34CD35CD36CD37CD38CD3ACD3BCD3CCD3DCD3E00000000000000000000
-0000CD3FCD40CD41CD42CD43CD44CD45CD46CD47CD48CD49CD4ACD4BCD4CCD4D
-CD4ECD4FCD50CD51CD52CD53CD54CD55CD56CD57CD58CD59CD5ACD5BCD5DCD5E
-CD5F04100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-AD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CD61CD62CD63CD65CD66CD67CD68CD69CD6ACD6BCD6ECD70CD72CD73CD74
-CD75CD76CD77CD79CD7ACD7BCD7CCD7DCD7ECD7FCD8000000000000000000000
-0000CD81CD82CD83CD84CD85CD86CD87CD89CD8ACD8BCD8CCD8DCD8ECD8FCD90
-CD91CD92CD93CD96CD97CD99CD9ACD9BCD9DCD9ECD9F00000000000000000000
-0000CDA0CDA1CDA2CDA3CDA6CDA8CDAACDABCDACCDADCDAECDAFCDB1CDB2CDB3
-CDB4CDB5CDB6CDB7CDB8CDB9CDBACDBBCDBCCDBDCDBECDBFCDC0CDC1CDC2CDC3
-CDC5000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CDC6CDC7CDC8CDC9CDCACDCBCDCDCDCECDCFCDD1CDD2CDD3CDD4CDD5CDD6
-CDD7CDD8CDD9CDDACDDBCDDCCDDDCDDECDDFCDE0CDE100000000000000000000
-0000CDE2CDE3CDE4CDE5CDE6CDE7CDE9CDEACDEBCDEDCDEECDEFCDF1CDF2CDF3
-CDF4CDF5CDF6CDF7CDFACDFCCDFECDFFCE00CE01CE0200000000000000000000
-0000CE03CE05CE06CE07CE09CE0ACE0BCE0DCE0ECE0FCE10CE11CE12CE13CE15
-CE16CE17CE18CE1ACE1BCE1CCE1DCE1ECE1FCE22CE23CE25CE26CE27CE29CE2A
-CE2B000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-AF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CE2CCE2DCE2ECE2FCE32CE34CE36CE37CE38CE39CE3ACE3BCE3CCE3DCE3E
-CE3FCE40CE41CE42CE43CE44CE45CE46CE47CE48CE4900000000000000000000
-0000CE4ACE4BCE4CCE4DCE4ECE4FCE50CE51CE52CE53CE54CE55CE56CE57CE5A
-CE5BCE5DCE5ECE62CE63CE64CE65CE66CE67CE6ACE6C00000000000000000000
-0000CE6ECE6FCE70CE71CE72CE73CE76CE77CE79CE7ACE7BCE7DCE7ECE7FCE80
-CE81CE82CE83CE86CE88CE8ACE8BCE8CCE8DCE8ECE8FCE92CE93CE95CE96CE97
-CE99000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CE9ACE9BCE9CCE9DCE9ECE9FCEA2CEA6CEA7CEA8CEA9CEAACEABCEAECEAF
-CEB0CEB1CEB2CEB3CEB4CEB5CEB6CEB7CEB8CEB9CEBA00000000000000000000
-0000CEBBCEBCCEBDCEBECEBFCEC0CEC2CEC3CEC4CEC5CEC6CEC7CEC8CEC9CECA
-CECBCECCCECDCECECECFCED0CED1CED2CED3CED4CED500000000000000000000
-0000CED6CED7CED8CED9CEDACEDBCEDCCEDDCEDECEDFCEE0CEE1CEE2CEE3CEE6
-CEE7CEE9CEEACEEDCEEECEEFCEF0CEF1CEF2CEF3CEF6CEFACEFBCEFCCEFDCEFE
-CEFFAC00AC01AC04AC07AC08AC09AC0AAC10AC11AC12AC13AC14AC15AC16AC17
-AC19AC1AAC1BAC1CAC1DAC20AC24AC2CAC2DAC2FAC30AC31AC38AC39AC3CAC40
-AC4BAC4DAC54AC58AC5CAC70AC71AC74AC77AC78AC7AAC80AC81AC83AC84AC85
-AC86AC89AC8AAC8BAC8CAC90AC94AC9CAC9DAC9FACA0ACA1ACA8ACA9ACAAACAC
-ACAFACB0ACB8ACB9ACBBACBCACBDACC1ACC4ACC8ACCCACD5ACD7ACE0ACE1ACE4
-ACE7ACE8ACEAACECACEFACF0ACF1ACF3ACF5ACF6ACFCACFDAD00AD04AD060000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CF02CF03CF05CF06CF07CF09CF0ACF0BCF0CCF0DCF0ECF0FCF12CF14CF16
-CF17CF18CF19CF1ACF1BCF1DCF1ECF1FCF21CF22CF2300000000000000000000
-0000CF25CF26CF27CF28CF29CF2ACF2BCF2ECF32CF33CF34CF35CF36CF37CF39
-CF3ACF3BCF3CCF3DCF3ECF3FCF40CF41CF42CF43CF4400000000000000000000
-0000CF45CF46CF47CF48CF49CF4ACF4BCF4CCF4DCF4ECF4FCF50CF51CF52CF53
-CF56CF57CF59CF5ACF5BCF5DCF5ECF5FCF60CF61CF62CF63CF66CF68CF6ACF6B
-CF6CAD0CAD0DAD0FAD11AD18AD1CAD20AD29AD2CAD2DAD34AD35AD38AD3CAD44
-AD45AD47AD49AD50AD54AD58AD61AD63AD6CAD6DAD70AD73AD74AD75AD76AD7B
-AD7CAD7DAD7FAD81AD82AD88AD89AD8CAD90AD9CAD9DADA4ADB7ADC0ADC1ADC4
-ADC8ADD0ADD1ADD3ADDCADE0ADE4ADF8ADF9ADFCADFFAE00AE01AE08AE09AE0B
-AE0DAE14AE30AE31AE34AE37AE38AE3AAE40AE41AE43AE45AE46AE4AAE4CAE4D
-AE4EAE50AE54AE56AE5CAE5DAE5FAE60AE61AE65AE68AE69AE6CAE70AE780000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CF6DCF6ECF6FCF72CF73CF75CF76CF77CF79CF7ACF7BCF7CCF7DCF7ECF7F
-CF81CF82CF83CF84CF86CF87CF88CF89CF8ACF8BCF8D00000000000000000000
-0000CF8ECF8FCF90CF91CF92CF93CF94CF95CF96CF97CF98CF99CF9ACF9BCF9C
-CF9DCF9ECF9FCFA0CFA2CFA3CFA4CFA5CFA6CFA7CFA900000000000000000000
-0000CFAACFABCFACCFADCFAECFAFCFB1CFB2CFB3CFB4CFB5CFB6CFB7CFB8CFB9
-CFBACFBBCFBCCFBDCFBECFBFCFC0CFC1CFC2CFC3CFC5CFC6CFC7CFC8CFC9CFCA
-CFCBAE79AE7BAE7CAE7DAE84AE85AE8CAEBCAEBDAEBEAEC0AEC4AECCAECDAECF
-AED0AED1AED8AED9AEDCAEE8AEEBAEEDAEF4AEF8AEFCAF07AF08AF0DAF10AF2C
-AF2DAF30AF32AF34AF3CAF3DAF3FAF41AF42AF43AF48AF49AF50AF5CAF5DAF64
-AF65AF79AF80AF84AF88AF90AF91AF95AF9CAFB8AFB9AFBCAFC0AFC7AFC8AFC9
-AFCBAFCDAFCEAFD4AFDCAFE8AFE9AFF0AFF1AFF4AFF8B000B001B004B00CB010
-B014B01CB01DB028B044B045B048B04AB04CB04EB053B054B055B057B0590000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CFCCCFCDCFCECFCFCFD0CFD1CFD2CFD3CFD4CFD5CFD6CFD7CFD8CFD9CFDA
-CFDBCFDCCFDDCFDECFDFCFE2CFE3CFE5CFE6CFE7CFE900000000000000000000
-0000CFEACFEBCFECCFEDCFEECFEFCFF2CFF4CFF6CFF7CFF8CFF9CFFACFFBCFFD
-CFFECFFFD001D002D003D005D006D007D008D009D00A00000000000000000000
-0000D00BD00CD00DD00ED00FD010D012D013D014D015D016D017D019D01AD01B
-D01CD01DD01ED01FD020D021D022D023D024D025D026D027D028D029D02AD02B
-D02CB05DB07CB07DB080B084B08CB08DB08FB091B098B099B09AB09CB09FB0A0
-B0A1B0A2B0A8B0A9B0ABB0ACB0ADB0AEB0AFB0B1B0B3B0B4B0B5B0B8B0BCB0C4
-B0C5B0C7B0C8B0C9B0D0B0D1B0D4B0D8B0E0B0E5B108B109B10BB10CB110B112
-B113B118B119B11BB11CB11DB123B124B125B128B12CB134B135B137B138B139
-B140B141B144B148B150B151B154B155B158B15CB160B178B179B17CB180B182
-B188B189B18BB18DB192B193B194B198B19CB1A8B1CCB1D0B1D4B1DCB1DD0000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D02ED02FD030D031D032D033D036D037D039D03AD03BD03DD03ED03FD040
-D041D042D043D046D048D04AD04BD04CD04DD04ED04F00000000000000000000
-0000D051D052D053D055D056D057D059D05AD05BD05CD05DD05ED05FD061D062
-D063D064D065D066D067D068D069D06AD06BD06ED06F00000000000000000000
-0000D071D072D073D075D076D077D078D079D07AD07BD07ED07FD080D082D083
-D084D085D086D087D088D089D08AD08BD08CD08DD08ED08FD090D091D092D093
-D094B1DFB1E8B1E9B1ECB1F0B1F9B1FBB1FDB204B205B208B20BB20CB214B215
-B217B219B220B234B23CB258B25CB260B268B269B274B275B27CB284B285B289
-B290B291B294B298B299B29AB2A0B2A1B2A3B2A5B2A6B2AAB2ACB2B0B2B4B2C8
-B2C9B2CCB2D0B2D2B2D8B2D9B2DBB2DDB2E2B2E4B2E5B2E6B2E8B2EBB2ECB2ED
-B2EEB2EFB2F3B2F4B2F5B2F7B2F8B2F9B2FAB2FBB2FFB300B301B304B308B310
-B311B313B314B315B31CB354B355B356B358B35BB35CB35EB35FB364B3650000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D095D096D097D098D099D09AD09BD09CD09DD09ED09FD0A0D0A1D0A2D0A3
-D0A6D0A7D0A9D0AAD0ABD0ADD0AED0AFD0B0D0B1D0B200000000000000000000
-0000D0B3D0B6D0B8D0BAD0BBD0BCD0BDD0BED0BFD0C2D0C3D0C5D0C6D0C7D0CA
-D0CBD0CCD0CDD0CED0CFD0D2D0D6D0D7D0D8D0D9D0DA00000000000000000000
-0000D0DBD0DED0DFD0E1D0E2D0E3D0E5D0E6D0E7D0E8D0E9D0EAD0EBD0EED0F2
-D0F3D0F4D0F5D0F6D0F7D0F9D0FAD0FBD0FCD0FDD0FED0FFD100D101D102D103
-D104B367B369B36BB36EB370B371B374B378B380B381B383B384B385B38CB390
-B394B3A0B3A1B3A8B3ACB3C4B3C5B3C8B3CBB3CCB3CEB3D0B3D4B3D5B3D7B3D9
-B3DBB3DDB3E0B3E4B3E8B3FCB410B418B41CB420B428B429B42BB434B450B451
-B454B458B460B461B463B465B46CB480B488B49DB4A4B4A8B4ACB4B5B4B7B4B9
-B4C0B4C4B4C8B4D0B4D5B4DCB4DDB4E0B4E3B4E4B4E6B4ECB4EDB4EFB4F1B4F8
-B514B515B518B51BB51CB524B525B527B528B529B52AB530B531B534B5380000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D105D106D107D108D109D10AD10BD10CD10ED10FD110D111D112D113D114
-D115D116D117D118D119D11AD11BD11CD11DD11ED11F00000000000000000000
-0000D120D121D122D123D124D125D126D127D128D129D12AD12BD12CD12DD12E
-D12FD132D133D135D136D137D139D13BD13CD13DD13E00000000000000000000
-0000D13FD142D146D147D148D149D14AD14BD14ED14FD151D152D153D155D156
-D157D158D159D15AD15BD15ED160D162D163D164D165D166D167D169D16AD16B
-D16DB540B541B543B544B545B54BB54CB54DB550B554B55CB55DB55FB560B561
-B5A0B5A1B5A4B5A8B5AAB5ABB5B0B5B1B5B3B5B4B5B5B5BBB5BCB5BDB5C0B5C4
-B5CCB5CDB5CFB5D0B5D1B5D8B5ECB610B611B614B618B625B62CB634B648B664
-B668B69CB69DB6A0B6A4B6ABB6ACB6B1B6D4B6F0B6F4B6F8B700B701B705B728
-B729B72CB72FB730B738B739B73BB744B748B74CB754B755B760B764B768B770
-B771B773B775B77CB77DB780B784B78CB78DB78FB790B791B792B796B7970000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D16ED16FD170D171D172D173D174D175D176D177D178D179D17AD17BD17D
-D17ED17FD180D181D182D183D185D186D187D189D18A00000000000000000000
-0000D18BD18CD18DD18ED18FD190D191D192D193D194D195D196D197D198D199
-D19AD19BD19CD19DD19ED19FD1A2D1A3D1A5D1A6D1A700000000000000000000
-0000D1A9D1AAD1ABD1ACD1ADD1AED1AFD1B2D1B4D1B6D1B7D1B8D1B9D1BBD1BD
-D1BED1BFD1C1D1C2D1C3D1C4D1C5D1C6D1C7D1C8D1C9D1CAD1CBD1CCD1CDD1CE
-D1CFB798B799B79CB7A0B7A8B7A9B7ABB7ACB7ADB7B4B7B5B7B8B7C7B7C9B7EC
-B7EDB7F0B7F4B7FCB7FDB7FFB800B801B807B808B809B80CB810B818B819B81B
-B81DB824B825B828B82CB834B835B837B838B839B840B844B851B853B85CB85D
-B860B864B86CB86DB86FB871B878B87CB88DB8A8B8B0B8B4B8B8B8C0B8C1B8C3
-B8C5B8CCB8D0B8D4B8DDB8DFB8E1B8E8B8E9B8ECB8F0B8F8B8F9B8FBB8FDB904
-B918B920B93CB93DB940B944B94CB94FB951B958B959B95CB960B968B9690000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D1D0D1D1D1D2D1D3D1D4D1D5D1D6D1D7D1D9D1DAD1DBD1DCD1DDD1DED1DF
-D1E0D1E1D1E2D1E3D1E4D1E5D1E6D1E7D1E8D1E9D1EA00000000000000000000
-0000D1EBD1ECD1EDD1EED1EFD1F0D1F1D1F2D1F3D1F5D1F6D1F7D1F9D1FAD1FB
-D1FCD1FDD1FED1FFD200D201D202D203D204D205D20600000000000000000000
-0000D208D20AD20BD20CD20DD20ED20FD211D212D213D214D215D216D217D218
-D219D21AD21BD21CD21DD21ED21FD220D221D222D223D224D225D226D227D228
-D229B96BB96DB974B975B978B97CB984B985B987B989B98AB98DB98EB9ACB9AD
-B9B0B9B4B9BCB9BDB9BFB9C1B9C8B9C9B9CCB9CEB9CFB9D0B9D1B9D2B9D8B9D9
-B9DBB9DDB9DEB9E1B9E3B9E4B9E5B9E8B9ECB9F4B9F5B9F7B9F8B9F9B9FABA00
-BA01BA08BA15BA38BA39BA3CBA40BA42BA48BA49BA4BBA4DBA4EBA53BA54BA55
-BA58BA5CBA64BA65BA67BA68BA69BA70BA71BA74BA78BA83BA84BA85BA87BA8C
-BAA8BAA9BAABBAACBAB0BAB2BAB8BAB9BABBBABDBAC4BAC8BAD8BAD9BAFC0000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D22AD22BD22ED22FD231D232D233D235D236D237D238D239D23AD23BD23E
-D240D242D243D244D245D246D247D249D24AD24BD24C00000000000000000000
-0000D24DD24ED24FD250D251D252D253D254D255D256D257D258D259D25AD25B
-D25DD25ED25FD260D261D262D263D265D266D267D26800000000000000000000
-0000D269D26AD26BD26CD26DD26ED26FD270D271D272D273D274D275D276D277
-D278D279D27AD27BD27CD27DD27ED27FD282D283D285D286D287D289D28AD28B
-D28CBB00BB04BB0DBB0FBB11BB18BB1CBB20BB29BB2BBB34BB35BB36BB38BB3B
-BB3CBB3DBB3EBB44BB45BB47BB49BB4DBB4FBB50BB54BB58BB61BB63BB6CBB88
-BB8CBB90BBA4BBA8BBACBBB4BBB7BBC0BBC4BBC8BBD0BBD3BBF8BBF9BBFCBBFF
-BC00BC02BC08BC09BC0BBC0CBC0DBC0FBC11BC14BC15BC16BC17BC18BC1BBC1C
-BC1DBC1EBC1FBC24BC25BC27BC29BC2DBC30BC31BC34BC38BC40BC41BC43BC44
-BC45BC49BC4CBC4DBC50BC5DBC84BC85BC88BC8BBC8CBC8EBC94BC95BC970000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D28DD28ED28FD292D293D294D296D297D298D299D29AD29BD29DD29ED29F
-D2A1D2A2D2A3D2A5D2A6D2A7D2A8D2A9D2AAD2ABD2AD00000000000000000000
-0000D2AED2AFD2B0D2B2D2B3D2B4D2B5D2B6D2B7D2BAD2BBD2BDD2BED2C1D2C3
-D2C4D2C5D2C6D2C7D2CAD2CCD2CDD2CED2CFD2D0D2D100000000000000000000
-0000D2D2D2D3D2D5D2D6D2D7D2D9D2DAD2DBD2DDD2DED2DFD2E0D2E1D2E2D2E3
-D2E6D2E7D2E8D2E9D2EAD2EBD2ECD2EDD2EED2EFD2F2D2F3D2F5D2F6D2F7D2F9
-D2FABC99BC9ABCA0BCA1BCA4BCA7BCA8BCB0BCB1BCB3BCB4BCB5BCBCBCBDBCC0
-BCC4BCCDBCCFBCD0BCD1BCD5BCD8BCDCBCF4BCF5BCF6BCF8BCFCBD04BD05BD07
-BD09BD10BD14BD24BD2CBD40BD48BD49BD4CBD50BD58BD59BD64BD68BD80BD81
-BD84BD87BD88BD89BD8ABD90BD91BD93BD95BD99BD9ABD9CBDA4BDB0BDB8BDD4
-BDD5BDD8BDDCBDE9BDF0BDF4BDF8BE00BE03BE05BE0CBE0DBE10BE14BE1CBE1D
-BE1FBE44BE45BE48BE4CBE4EBE54BE55BE57BE59BE5ABE5BBE60BE61BE640000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D2FBD2FCD2FDD2FED2FFD302D304D306D307D308D309D30AD30BD30FD311
-D312D313D315D317D318D319D31AD31BD31ED322D32300000000000000000000
-0000D324D326D327D32AD32BD32DD32ED32FD331D332D333D334D335D336D337
-D33AD33ED33FD340D341D342D343D346D347D348D34900000000000000000000
-0000D34AD34BD34CD34DD34ED34FD350D351D352D353D354D355D356D357D358
-D359D35AD35BD35CD35DD35ED35FD360D361D362D363D364D365D366D367D368
-D369BE68BE6ABE70BE71BE73BE74BE75BE7BBE7CBE7DBE80BE84BE8CBE8DBE8F
-BE90BE91BE98BE99BEA8BED0BED1BED4BED7BED8BEE0BEE3BEE4BEE5BEECBF01
-BF08BF09BF18BF19BF1BBF1CBF1DBF40BF41BF44BF48BF50BF51BF55BF94BFB0
-BFC5BFCCBFCDBFD0BFD4BFDCBFDFBFE1C03CC051C058C05CC060C068C069C090
-C091C094C098C0A0C0A1C0A3C0A5C0ACC0ADC0AFC0B0C0B3C0B4C0B5C0B6C0BC
-C0BDC0BFC0C0C0C1C0C5C0C8C0C9C0CCC0D0C0D8C0D9C0DBC0DCC0DDC0E40000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D36AD36BD36CD36DD36ED36FD370D371D372D373D374D375D376D377D378
-D379D37AD37BD37ED37FD381D382D383D385D386D38700000000000000000000
-0000D388D389D38AD38BD38ED392D393D394D395D396D397D39AD39BD39DD39E
-D39FD3A1D3A2D3A3D3A4D3A5D3A6D3A7D3AAD3ACD3AE00000000000000000000
-0000D3AFD3B0D3B1D3B2D3B3D3B5D3B6D3B7D3B9D3BAD3BBD3BDD3BED3BFD3C0
-D3C1D3C2D3C3D3C6D3C7D3CAD3CBD3CCD3CDD3CED3CFD3D1D3D2D3D3D3D4D3D5
-D3D6C0E5C0E8C0ECC0F4C0F5C0F7C0F9C100C104C108C110C115C11CC11DC11E
-C11FC120C123C124C126C127C12CC12DC12FC130C131C136C138C139C13CC140
-C148C149C14BC14CC14DC154C155C158C15CC164C165C167C168C169C170C174
-C178C185C18CC18DC18EC190C194C196C19CC19DC19FC1A1C1A5C1A8C1A9C1AC
-C1B0C1BDC1C4C1C8C1CCC1D4C1D7C1D8C1E0C1E4C1E8C1F0C1F1C1F3C1FCC1FD
-C200C204C20CC20DC20FC211C218C219C21CC21FC220C228C229C22BC22D0000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D3D7D3D9D3DAD3DBD3DCD3DDD3DED3DFD3E0D3E2D3E4D3E5D3E6D3E7D3E8
-D3E9D3EAD3EBD3EED3EFD3F1D3F2D3F3D3F5D3F6D3F700000000000000000000
-0000D3F8D3F9D3FAD3FBD3FED400D402D403D404D405D406D407D409D40AD40B
-D40CD40DD40ED40FD410D411D412D413D414D415D41600000000000000000000
-0000D417D418D419D41AD41BD41CD41ED41FD420D421D422D423D424D425D426
-D427D428D429D42AD42BD42CD42DD42ED42FD430D431D432D433D434D435D436
-D437C22FC231C232C234C248C250C251C254C258C260C265C26CC26DC270C274
-C27CC27DC27FC281C288C289C290C298C29BC29DC2A4C2A5C2A8C2ACC2ADC2B4
-C2B5C2B7C2B9C2DCC2DDC2E0C2E3C2E4C2EBC2ECC2EDC2EFC2F1C2F6C2F8C2F9
-C2FBC2FCC300C308C309C30CC30DC313C314C315C318C31CC324C325C328C329
-C345C368C369C36CC370C372C378C379C37CC37DC384C388C38CC3C0C3D8C3D9
-C3DCC3DFC3E0C3E2C3E8C3E9C3EDC3F4C3F5C3F8C408C410C424C42CC4300000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D438D439D43AD43BD43CD43DD43ED43FD441D442D443D445D446D447D448
-D449D44AD44BD44CD44DD44ED44FD450D451D452D45300000000000000000000
-0000D454D455D456D457D458D459D45AD45BD45DD45ED45FD461D462D463D465
-D466D467D468D469D46AD46BD46CD46ED470D471D47200000000000000000000
-0000D473D474D475D476D477D47AD47BD47DD47ED481D483D484D485D486D487
-D48AD48CD48ED48FD490D491D492D493D495D496D497D498D499D49AD49BD49C
-D49DC434C43CC43DC448C464C465C468C46CC474C475C479C480C494C49CC4B8
-C4BCC4E9C4F0C4F1C4F4C4F8C4FAC4FFC500C501C50CC510C514C51CC528C529
-C52CC530C538C539C53BC53DC544C545C548C549C54AC54CC54DC54EC553C554
-C555C557C558C559C55DC55EC560C561C564C568C570C571C573C574C575C57C
-C57DC580C584C587C58CC58DC58FC591C595C597C598C59CC5A0C5A9C5B4C5B5
-C5B8C5B9C5BBC5BCC5BDC5BEC5C4C5C5C5C6C5C7C5C8C5C9C5CAC5CCC5CE0000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D49ED49FD4A0D4A1D4A2D4A3D4A4D4A5D4A6D4A7D4A8D4AAD4ABD4ACD4AD
-D4AED4AFD4B0D4B1D4B2D4B3D4B4D4B5D4B6D4B7D4B800000000000000000000
-0000D4B9D4BAD4BBD4BCD4BDD4BED4BFD4C0D4C1D4C2D4C3D4C4D4C5D4C6D4C7
-D4C8D4C9D4CAD4CBD4CDD4CED4CFD4D1D4D2D4D3D4D500000000000000000000
-0000D4D6D4D7D4D8D4D9D4DAD4DBD4DDD4DED4E0D4E1D4E2D4E3D4E4D4E5D4E6
-D4E7D4E9D4EAD4EBD4EDD4EED4EFD4F1D4F2D4F3D4F4D4F5D4F6D4F7D4F9D4FA
-D4FCC5D0C5D1C5D4C5D8C5E0C5E1C5E3C5E5C5ECC5EDC5EEC5F0C5F4C5F6C5F7
-C5FCC5FDC5FEC5FFC600C601C605C606C607C608C60CC610C618C619C61BC61C
-C624C625C628C62CC62DC62EC630C633C634C635C637C639C63BC640C641C644
-C648C650C651C653C654C655C65CC65DC660C66CC66FC671C678C679C67CC680
-C688C689C68BC68DC694C695C698C69CC6A4C6A5C6A7C6A9C6B0C6B1C6B4C6B8
-C6B9C6BAC6C0C6C1C6C3C6C5C6CCC6CDC6D0C6D4C6DCC6DDC6E0C6E1C6E80000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D4FED4FFD500D501D502D503D505D506D507D509D50AD50BD50DD50ED50F
-D510D511D512D513D516D518D519D51AD51BD51CD51D00000000000000000000
-0000D51ED51FD520D521D522D523D524D525D526D527D528D529D52AD52BD52C
-D52DD52ED52FD530D531D532D533D534D535D536D53700000000000000000000
-0000D538D539D53AD53BD53ED53FD541D542D543D545D546D547D548D549D54A
-D54BD54ED550D552D553D554D555D556D557D55AD55BD55DD55ED55FD561D562
-D563C6E9C6ECC6F0C6F8C6F9C6FDC704C705C708C70CC714C715C717C719C720
-C721C724C728C730C731C733C735C737C73CC73DC740C744C74AC74CC74DC74F
-C751C752C753C754C755C756C757C758C75CC760C768C76BC774C775C778C77C
-C77DC77EC783C784C785C787C788C789C78AC78EC790C791C794C796C797C798
-C79AC7A0C7A1C7A3C7A4C7A5C7A6C7ACC7ADC7B0C7B4C7BCC7BDC7BFC7C0C7C1
-C7C8C7C9C7CCC7CEC7D0C7D8C7DDC7E4C7E8C7ECC800C801C804C808C80A0000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D564D566D567D56AD56CD56ED56FD570D571D572D573D576D577D579D57A
-D57BD57DD57ED57FD580D581D582D583D586D58AD58B00000000000000000000
-0000D58CD58DD58ED58FD591D592D593D594D595D596D597D598D599D59AD59B
-D59CD59DD59ED59FD5A0D5A1D5A2D5A3D5A4D5A6D5A700000000000000000000
-0000D5A8D5A9D5AAD5ABD5ACD5ADD5AED5AFD5B0D5B1D5B2D5B3D5B4D5B5D5B6
-D5B7D5B8D5B9D5BAD5BBD5BCD5BDD5BED5BFD5C0D5C1D5C2D5C3D5C4D5C5D5C6
-D5C7C810C811C813C815C816C81CC81DC820C824C82CC82DC82FC831C838C83C
-C840C848C849C84CC84DC854C870C871C874C878C87AC880C881C883C885C886
-C887C88BC88CC88DC894C89DC89FC8A1C8A8C8BCC8BDC8C4C8C8C8CCC8D4C8D5
-C8D7C8D9C8E0C8E1C8E4C8F5C8FCC8FDC900C904C905C906C90CC90DC90FC911
-C918C92CC934C950C951C954C958C960C961C963C96CC970C974C97CC988C989
-C98CC990C998C999C99BC99DC9C0C9C1C9C4C9C7C9C8C9CAC9D0C9D1C9D30000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D5CAD5CBD5CDD5CED5CFD5D1D5D3D5D4D5D5D5D6D5D7D5DAD5DCD5DED5DF
-D5E0D5E1D5E2D5E3D5E6D5E7D5E9D5EAD5EBD5EDD5EE00000000000000000000
-0000D5EFD5F0D5F1D5F2D5F3D5F6D5F8D5FAD5FBD5FCD5FDD5FED5FFD602D603
-D605D606D607D609D60AD60BD60CD60DD60ED60FD61200000000000000000000
-0000D616D617D618D619D61AD61BD61DD61ED61FD621D622D623D625D626D627
-D628D629D62AD62BD62CD62ED62FD630D631D632D633D634D635D636D637D63A
-D63BC9D5C9D6C9D9C9DAC9DCC9DDC9E0C9E2C9E4C9E7C9ECC9EDC9EFC9F0C9F1
-C9F8C9F9C9FCCA00CA08CA09CA0BCA0CCA0DCA14CA18CA29CA4CCA4DCA50CA54
-CA5CCA5DCA5FCA60CA61CA68CA7DCA84CA98CABCCABDCAC0CAC4CACCCACDCACF
-CAD1CAD3CAD8CAD9CAE0CAECCAF4CB08CB10CB14CB18CB20CB21CB41CB48CB49
-CB4CCB50CB58CB59CB5DCB64CB78CB79CB9CCBB8CBD4CBE4CBE7CBE9CC0CCC0D
-CC10CC14CC1CCC1DCC21CC22CC27CC28CC29CC2CCC2ECC30CC38CC39CC3B0000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D63DD63ED63FD641D642D643D644D646D647D64AD64CD64ED64FD650D652
-D653D656D657D659D65AD65BD65DD65ED65FD660D66100000000000000000000
-0000D662D663D664D665D666D668D66AD66BD66CD66DD66ED66FD672D673D675
-D676D677D678D679D67AD67BD67CD67DD67ED67FD68000000000000000000000
-0000D681D682D684D686D687D688D689D68AD68BD68ED68FD691D692D693D695
-D696D697D698D699D69AD69BD69CD69ED6A0D6A2D6A3D6A4D6A5D6A6D6A7D6A9
-D6AACC3CCC3DCC3ECC44CC45CC48CC4CCC54CC55CC57CC58CC59CC60CC64CC66
-CC68CC70CC75CC98CC99CC9CCCA0CCA8CCA9CCABCCACCCADCCB4CCB5CCB8CCBC
-CCC4CCC5CCC7CCC9CCD0CCD4CCE4CCECCCF0CD01CD08CD09CD0CCD10CD18CD19
-CD1BCD1DCD24CD28CD2CCD39CD5CCD60CD64CD6CCD6DCD6FCD71CD78CD88CD94
-CD95CD98CD9CCDA4CDA5CDA7CDA9CDB0CDC4CDCCCDD0CDE8CDECCDF0CDF8CDF9
-CDFBCDFDCE04CE08CE0CCE14CE19CE20CE21CE24CE28CE30CE31CE33CE350000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D6ABD6ADD6AED6AFD6B1D6B2D6B3D6B4D6B5D6B6D6B7D6B8D6BAD6BCD6BD
-D6BED6BFD6C0D6C1D6C2D6C3D6C6D6C7D6C9D6CAD6CB00000000000000000000
-0000D6CDD6CED6CFD6D0D6D2D6D3D6D5D6D6D6D8D6DAD6DBD6DCD6DDD6DED6DF
-D6E1D6E2D6E3D6E5D6E6D6E7D6E9D6EAD6EBD6ECD6ED00000000000000000000
-0000D6EED6EFD6F1D6F2D6F3D6F4D6F6D6F7D6F8D6F9D6FAD6FBD6FED6FFD701
-D702D703D705D706D707D708D709D70AD70BD70CD70DD70ED70FD710D712D713
-D714CE58CE59CE5CCE5FCE60CE61CE68CE69CE6BCE6DCE74CE75CE78CE7CCE84
-CE85CE87CE89CE90CE91CE94CE98CEA0CEA1CEA3CEA4CEA5CEACCEADCEC1CEE4
-CEE5CEE8CEEBCEECCEF4CEF5CEF7CEF8CEF9CF00CF01CF04CF08CF10CF11CF13
-CF15CF1CCF20CF24CF2CCF2DCF2FCF30CF31CF38CF54CF55CF58CF5CCF64CF65
-CF67CF69CF70CF71CF74CF78CF80CF85CF8CCFA1CFA8CFB0CFC4CFE0CFE1CFE4
-CFE8CFF0CFF1CFF3CFF5CFFCD000D004D011D018D02DD034D035D038D03C0000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D715D716D717D71AD71BD71DD71ED71FD721D722D723D724D725D726D727
-D72AD72CD72ED72FD730D731D732D733D736D737D73900000000000000000000
-0000D73AD73BD73DD73ED73FD740D741D742D743D745D746D748D74AD74BD74C
-D74DD74ED74FD752D753D755D75AD75BD75CD75DD75E00000000000000000000
-0000D75FD762D764D766D767D768D76AD76BD76DD76ED76FD771D772D773D775
-D776D777D778D779D77AD77BD77ED77FD780D782D783D784D785D786D787D78A
-D78BD044D045D047D049D050D054D058D060D06CD06DD070D074D07CD07DD081
-D0A4D0A5D0A8D0ACD0B4D0B5D0B7D0B9D0C0D0C1D0C4D0C8D0C9D0D0D0D1D0D3
-D0D4D0D5D0DCD0DDD0E0D0E4D0ECD0EDD0EFD0F0D0F1D0F8D10DD130D131D134
-D138D13AD140D141D143D144D145D14CD14DD150D154D15CD15DD15FD161D168
-D16CD17CD184D188D1A0D1A1D1A4D1A8D1B0D1B1D1B3D1B5D1BAD1BCD1C0D1D8
-D1F4D1F8D207D209D210D22CD22DD230D234D23CD23DD23FD241D248D25C0000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D78DD78ED78FD791D792D793D794D795D796D797D79AD79CD79ED79FD7A0
-D7A1D7A2D7A30000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D264D280D281D284D288D290D291D295D29CD2A0D2A4D2ACD2B1D2B8D2B9
-D2BCD2BFD2C0D2C2D2C8D2C9D2CBD2D4D2D8D2DCD2E4D2E5D2F0D2F1D2F4D2F8
-D300D301D303D305D30CD30DD30ED310D314D316D31CD31DD31FD320D321D325
-D328D329D32CD330D338D339D33BD33CD33DD344D345D37CD37DD380D384D38C
-D38DD38FD390D391D398D399D39CD3A0D3A8D3A9D3ABD3ADD3B4D3B8D3BCD3C4
-D3C5D3C8D3C9D3D0D3D8D3E1D3E3D3ECD3EDD3F0D3F4D3FCD3FDD3FFD4010000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D408D41DD440D444D45CD460D464D46DD46FD478D479D47CD47FD480D482
-D488D489D48BD48DD494D4A9D4CCD4D0D4D4D4DCD4DFD4E8D4ECD4F0D4F8D4FB
-D4FDD504D508D50CD514D515D517D53CD53DD540D544D54CD54DD54FD551D558
-D559D55CD560D565D568D569D56BD56DD574D575D578D57CD584D585D587D588
-D589D590D5A5D5C8D5C9D5CCD5D0D5D2D5D8D5D9D5DBD5DDD5E4D5E5D5E8D5EC
-D5F4D5F5D5F7D5F9D600D601D604D608D610D611D613D614D615D61CD6200000
-C8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D624D62DD638D639D63CD640D645D648D649D64BD64DD651D654D655D658
-D65CD667D669D670D671D674D683D685D68CD68DD690D694D69DD69FD6A1D6A8
-D6ACD6B0D6B9D6BBD6C4D6C5D6C8D6CCD6D1D6D4D6D7D6D9D6E0D6E4D6E8D6F0
-D6F5D6FCD6FDD700D704D711D718D719D71CD720D728D729D72BD72DD734D735
-D738D73CD744D747D749D750D751D754D756D757D758D759D760D761D763D765
-D769D76CD770D774D77CD77DD781D788D789D78CD790D798D799D79BD79D0000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F3D4F73504750F952A053EF547554E556095AC15BB6668767B667B767EF
-6B4C73C275C27A3C82DB8304885788888A368CC88DCF8EFB8FE699D5523B5374
-5404606A61646BBC73CF811A89BA89D295A34F83520A58BE597859E65E725E79
-61C763C0674667EC687F6F97764E770B78F57A087AFF7C21809D826E82718AEB
-95934E6B559D66F76E3478A37AED845B8910874E97A852D8574E582A5D4C611F
-61BE6221656267D16A446E1B751875B376E377B07D3A90AF945194529F950000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053235CAC753280DB92409598525B580859DC5CA15D175EB75F3A5F4A6177
-6C5F757A75867CE07D737DB17F8C81548221859189418B1B92FC964D9C474ECB
-4EF7500B51F1584F6137613E6168653969EA6F1175A5768676D67B8782A584CB
-F90093A7958B55805BA25751F9017CB37FB991B5502853BB5C455DE862D2636E
-64DA64E76E2070AC795B8DDD8E1EF902907D924592F84E7E4EF650655DFE5EFA
-61066957817186548E4793759A2B4E5E5091677068405109528D52926AA20000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077BC92109ED452AB602F8FF2504861A963ED64CA683C6A846FC0818889A1
-96945805727D72AC75047D797E6D80A9898B8B7490639D5162896C7A6F547D50
-7F3A8A23517C614A7B9D8B199257938C4EAC4FD3501E50BE510652C152CD537F
-577058835E9A5F91617661AC64CE656C666F66BB66F468976D87708570F1749F
-74A574CA75D9786C78EC7ADF7AF67D457D938015803F811B83968B668F159015
-93E1980398389A5A9BE84FC25553583A59515B635C4660B86212684268B00000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068E86EAA754C767878CE7A3D7CFB7E6B7E7C8A088AA18C3F968E9DC453E4
-53E9544A547156FA59D15B645C3B5EAB62F765376545657266A067AF69C16CBD
-75FC7690777E7A3F7F94800380A1818F82E682FD83F085C1883188B48AA5F903
-8F9C932E96C798679AD89F1354ED659B66F2688F7A408C379D6056F057645D11
-660668B168CD6EFE7428889E9BE46C68F9049AA84F9B516C5171529F5B545DE5
-6050606D62F163A7653B73D97A7A86A38CA2978F4E325BE16208679C74DC0000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079D183D38A878AB28DE8904E934B98465ED369E885FF90EDF90551A05B98
-5BEC616368FA6B3E704C742F74D87BA17F5083C589C08CAB95DC9928522E605D
-62EC90024F8A5149532158D95EE366E06D38709A72C273D67B5080F1945B5366
-639B7F6B4E565080584A58DE602A612762D069D09B415B8F7D1880B18F5F4EA4
-50D154AC55AC5B0C5DA05DE7652A654E68216A4B72E1768E77EF7D5E7FF981A0
-854E86DF8F038F4E90CA99039A559BAB4E184E454E5D4EC74FF1517752FE0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000534053E353E5548E5614577557A25BC75D875ED061FC62D8655167B867E9
-69CB6B506BC66BEC6C426E9D707872D77396740377BF77E97A767D7F800981FC
-8205820A82DF88628B338CFC8EC0901190B1926492B699D29A459CE99DD79F9C
-570B5C4083CA97A097AB9EB4541B7A987FA488D98ECD90E158005C4863987A9F
-5BAE5F137A797AAE828E8EAC5026523852F85377570862F363726B0A6DC37737
-53A5735785688E7695D5673A6AC36F708A6D8ECC994BF90666776B788CB40000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B3CF90753EB572D594E63C669FB73EA78457ABA7AC57CFE8475898F8D73
-903595A852FB574775477B6083CC921EF9086A58514B524B5287621F68D86975
-969950C552A452E461C365A4683969FF747E7B4B82B983EB89B28B398FD19949
-F9094ECA599764D266116A8E7434798179BD82A9887E887F895FF90A93264F0B
-53CA602562716C727D1A7D664E98516277DC80AF4F014F0E5176518055DC5668
-573B57FA57FC5914594759935BC45C905D0E5DF15E7E5FCC628065D765E30000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000671E671F675E68CB68C46A5F6B3A6C236C7D6C826DC773987426742A7482
-74A37578757F788178EF794179477948797A7B957D007DBA7F888006802D808C
-8A188B4F8C488D779321932498E299519A0E9A0F9A659E927DCA4F76540962EE
-685491D155AB513AF90BF90C5A1C61E6F90D62CF62FFF90EF90FF910F911F912
-F91390A3F914F915F916F917F9188AFEF919F91AF91BF91C6696F91D7156F91E
-F91F96E3F920634F637A5357F921678F69606E73F9227537F923F924F9250000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D0DF926F927887256CA5A18F928F929F92AF92BF92C4E43F92D51675948
-67F08010F92E59735E74649A79CA5FF5606C62C8637B5BE75BD752AAF92F5974
-5F296012F930F931F9327459F933F934F935F936F937F93899D1F939F93AF93B
-F93CF93DF93EF93FF940F941F942F9436FC3F944F94581BF8FB260F1F946F947
-8166F948F9495C3FF94AF94BF94CF94DF94EF94FF950F9515AE98A25677B7D10
-F952F953F954F955F956F95780FDF958F9595C3C6CE5533F6EBA591A83360000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E394EB64F4655AE571858C75F5665B765E66A806BB56E4D77ED7AEF7C1E
-7DDE86CB88929132935B64BB6FBE737A75B890545556574D61BA64D466C76DE1
-6E5B6F6D6FB975F0804381BD854189838AC78B5A931F6C9375537B548E0F905D
-5510580258585E626207649E68E075767CD687B39EE84EE35788576E59275C0D
-5CB15E365F85623464E173B381FA888B8CB8968A9EDB5B855FB760B350125200
-52305716583558575C0E5C605CF65D8B5EA65F9260BC63116389641768430000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068F96AC26DD86E216ED46FE471FE76DC777979B17A3B840489A98CED8DF3
-8E4890039014905390FD934D967697DC6BD27006725872A27368776379BF7BE4
-7E9B8B8058A960C7656665FD66BE6C8C711E71C98C5A98134E6D7A814EDD51AC
-51CD52D5540C61A76771685068DF6D1E6F7C75BC77B37AE580F484639285515C
-6597675C679375D87AC78373F95A8C469017982D5C6F81C0829A9041906F920D
-5F975D9D6A5971C8767B7B4985E48B0491279A30558761F6F95B76697F850000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000863F87BA88F8908FF95C6D1B70D973DE7D61843DF95D916A99F1F95E4E82
-53756B046B12703E721B862D9E1E524C8FA35D5064E5652C6B166FEB7C437E9C
-85CD896489BD62C981D8881F5ECA67176D6A72FC7405746F878290DE4F865D0D
-5FA0840A51B763A075654EAE5006516951C968816A117CAE7CB17CE7826F8AD2
-8F1B91CF4FB6513752F554425EEC616E623E65C56ADA6FFE792A85DC882395AD
-9A629A6A9E979ECE529B66C66B77701D792B8F6297426190620065236F230000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714974897DF4806F84EE8F269023934A51BD521752A36D0C70C888C25EC9
-65826BAE6FC27C3E73754EE44F3656F9F95F5CBA5DBA601C73B27B2D7F9A7FCE
-8046901E923496F6974898189F614F8B6FA779AE91B496B752DEF960648864C4
-6AD36F5E7018721076E780018606865C8DEF8F0597329B6F9DFA9E75788C797F
-7DA083C993049E7F9E938AD658DF5F046727702774CF7C60807E512170287262
-78CA8CC28CDA8CF496F74E8650DA5BEE5ED6659971CE764277AD804A84FC0000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000907C9B279F8D58D85A415C626A136DDA6F0F763B7D2F7E37851E893893E4
-964B528965D267F369B46D416E9C700F7409746075597624786B8B2C985E516D
-622E96784F96502B5D196DEA7DB88F2A5F8B61446817F961968652D2808B51DC
-51CC695E7A1C7DBE83F196754FDA52295398540F550E5C6560A7674E68A86D6C
-728172F874067483F96275E27C6C7F797FB8838988CF88E191CC91D096E29BC9
-541D6F7E71D0749885FA8EAA96A39C579E9F67976DCB743381E89716782C0000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007ACB7B207C926469746A75F278BC78E899AC9B549EBB5BDE5E556F20819C
-83AB90884E07534D5A295DD25F4E6162633D666966FC6EFF6F2B7063779E842C
-8513883B8F1399459C3B551C62B9672B6CAB8309896A977A4EA159845FD85FD9
-671B7DB27F548292832B83BD8F1E909957CB59B95A925BD06627679A68856BCF
-71647F758CB78CE390819B4581088C8A964C9A409EA55B5F6C13731B76F276DF
-840C51AA8993514D519552C968C96C94770477207DBF7DEC97629EB56EC50000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000851151A5540D547D660E669D69276E9F76BF7791831784C2879F91699298
-9CF488824FAE519252DF59C65E3D61556478647966AE67D06A216BCD6BDB725F
-72617441773877DB801782BC83058B008B288C8C67286C90726776EE77667A46
-9DA96B7F6C92592267268499536F589359995EDF63CF663467736E3A732B7AD7
-82D7932852D95DEB61AE61CB620A62C764AB65E069596B666BCB712173F7755D
-7E46821E8302856A8AA38CBF97279D6158A89ED85011520E543B554F65870000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C767D0A7D0B805E868A958096EF52FF6C95726954735A9A5C3E5D4B5F4C
-5FAE672A68B669636E3C6E4477097C737F8E85878B0E8FF797619EF45CB760B6
-610D61AB654F65FB65FC6C116CEF739F73C97DE195945BC6871C8B10525D535A
-62CD640F64B267346A386CCA73C0749E7B947C957E1B818A823685848FEB96F9
-99C14F34534A53CD53DB62CC642C6500659169C36CEE6F5873ED7554762276E4
-76FC78D078FB792C7D46822C87E08FD4981298EF52C362D464A56E246F510000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000767C8DCB91B192629AEE9B435023508D574A59A85C285E475F77623F653E
-65B965C16609678B699C6EC278C57D2180AA8180822B82B384A1868C8A2A8B17
-90A696329F90500D4FF3F96357F95F9862DC6392676F6E43711976C380CC80DA
-88F488F589198CE08F29914D966A4F2F4F705E1B67CF6822767D767E9B445E61
-6A0A716971D4756AF9647E41854385E998DC4F107B4F7F7095A551E15E0668B5
-6C3E6C4E6CDB72AF7BC483036CD5743A50FB528858C164D86A9774A776560000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078A7861795E29739F965535E5F018B8A8FA88FAF908A522577A59C499F08
-4E19500251755C5B5E77661E663A67C468C570B3750175C579C97ADD8F279920
-9A084FDD582158315BF6666E6B656D116E7A6F7D73E4752B83E988DC89138B5C
-8F144F0F50D55310535C5B935FA9670D798F8179832F8514890789868F398F3B
-99A59C12672C4E764FF859495C015CEF5CF0636768D270FD71A2742B7E2B84EC
-8702902292D29CF34E0D4ED84FEF50855256526F5426549057E0592B5A660000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005B5A5B755BCC5E9CF9666276657765A76D6E6EA572367B267C3F7F368150
-8151819A8240829983A98A038CA08CE68CFB8D748DBA90E891DC961C964499D9
-9CE7531752065429567458B35954596E5FFF61A4626E66106C7E711A76C67C89
-7CDE7D1B82AC8CC196F0F9674F5B5F175F7F62C25D29670B68DA787C7E439D6C
-4E1550995315532A535159835A625E8760B2618A624962796590678769A76BD4
-6BD66BD76BD86CB8F968743575FA7812789179D579D87C837DCB7FE180A50000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000813E81C283F2871A88E88AB98B6C8CBB9119975E98DB9F3B56AC5B2A5F6C
-658C6AB36BAF6D5C6FF17015725D73AD8CA78CD3983B61916C3780589A014E4D
-4E8B4E9B4ED54F3A4F3C4F7F4FDF50FF53F253F8550655E356DB58EB59625A11
-5BEB5BFA5C045DF35E2B5F99601D6368659C65AF67F667FB68AD6B7B6C996CD7
-6E23700973457802793E7940796079C17BE97D177D728086820D838E84D186C7
-88DF8A508A5E8B1D8CDC8D668FAD90AA98FC99DF9E9D524AF9696714F96A0000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005098522A5C7165636C5573CA7523759D7B97849C917897304E7764926BBA
-715E85A94E09F96B674968EE6E17829F8518886B63F76F81921298AF4E0A50B7
-50CF511F554655AA56175B405C195CE05E385E8A5EA05EC260F368516A616E58
-723D724072C076F879657BB17FD488F389F48A738C618CDE971C585E74BD8CFD
-55C7F96C7A617D2282727272751F7525F96D7B19588558FB5DBC5E8F5EB65F90
-60556292637F654D669166D966F8681668F27280745E7B6E7D6E7DD67F720000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000080E5821285AF897F8A93901D92E49ECD9F205915596D5E2D60DC66146673
-67906C506DC56F5F77F378A984C691CB932B4ED950CA514855845B0B5BA36247
-657E65CB6E32717D74017444748774BF766C79AA7DDA7E557FA8817A81B38239
-861A87EC8A758DE3907892919425994D9BAE53685C5169546CC46D296E2B820C
-859B893B8A2D8AAA96EA9F67526166B96BB27E9687FE8D0D9583965D651D6D89
-71EEF96E57CE59D35BAC602760FA6210661F665F732973F976DB77017B6C0000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008056807281658AA091924E1652E26B726D177A057B397D30F96F8CB053EC
-562F58515BB55C0F5C115DE2624063836414662D68B36CBC6D886EAF701F70A4
-71D27526758F758E76197B117BE07C2B7D207D39852C856D86078A34900D9061
-90B592B797F69A374FD75C6C675F6D917C9F7E8C8B168D16901F5B6B5DFD640D
-84C0905C98E173875B8B609A677E6DDE8A1F8AA69001980C5237F9707051788E
-9396887091D74FEE53D755FD56DA578258FD5AC25B885CAB5CC05E2561010000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000620D624B6388641C653665786A396B8A6C346D196F3171E772E973787407
-74B27626776179C07A577AEA7CB97D8F7DAC7E617F9E81298331849084DA85EA
-88968AB08B908F3890429083916C929692B9968B96A796A896D6970098089996
-9AD39B1A53D4587E59195B705BBF6DD16F5A719F742174B9808583FD5DE15F87
-5FAA604265EC6812696F6A536B896D356DF373E376FE77AC7B4D7D148123821C
-834084F485638A628AC49187931E980699B4620C88538FF092655D075D270000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005D69745F819D87686FD562FE7FD2893689724E1E4E5850E752DD5347627F
-66077E698805965E4F8D5319563659CB5AA45C385C4E5C4D5E025F11604365BD
-662F664267BE67F4731C77E2793A7FC5849484CD89968A668A698AE18C558C7A
-57F45BD45F0F606F62ED690D6B966E5C71847BD287558B588EFE98DF98FE4F38
-4F814FE1547B5A205BB8613C65B0666871FC7533795E7D33814E81E3839885AA
-85CE87038A0A8EAB8F9BF9718FC559315BA45BE660895BE95C0B5FC36C810000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9726DF1700B751A82AF8AF64EC05341F97396D96C0F4E9E4FC45152555E
-5A255CE86211725982BD83AA86FE88598A1D963F96C599139D099D5D580A5CB3
-5DBD5E4460E1611563E16A026E2591029354984E9C109F775B895CB86309664F
-6848773C96C1978D98549B9F65A18B018ECB95BC55355CA95DD65EB56697764C
-83F495C758D362BC72CE9D284EF0592E600F663B6B8379E79D26539354C057C3
-5D16611B66D66DAF788D827E969897445384627C63966DB27E0A814B984D0000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006AFB7F4C9DAF9E1A4E5F503B51B6591C60F963F66930723A8036F97491CE
-5F31F975F9767D0482E5846F84BB85E58E8DF9774F6FF978F97958E45B436059
-63DA6518656D6698F97A694A6A236D0B7001716C75D2760D79B37A70F97B7F8A
-F97C8944F97D8B9391C0967DF97E990A57045FA165BC6F01760079A68A9E99AD
-9B5A9F6C510461B662916A8D81C6504358305F6671098A008AFA5B7C86164FFA
-513C56B4594463A96DF95DAA696D51864E884F59F97FF980F9815982F9820000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9836B5F6C5DF98474B57916F9858207824583398F3F8F5DF9869918F987
-F988F9894EA6F98A57DF5F796613F98BF98C75AB7E798B6FF98D90069A5B56A5
-582759F85A1F5BB4F98E5EF6F98FF9906350633BF991693D6C876CBF6D8E6D93
-6DF56F14F99270DF71367159F99371C371D5F994784F786FF9957B757DE3F996
-7E2FF997884D8EDFF998F999F99A925BF99B9CF6F99CF99DF99E60856D85F99F
-71B1F9A0F9A195B153ADF9A2F9A3F9A467D3F9A5708E71307430827682D20000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9A695BB9AE59E7D66C4F9A771C18449F9A8F9A9584BF9AAF9AB5DB85F71
-F9AC6620668E697969AE6C386CF36E366F416FDA701B702F715071DF7370F9AD
-745BF9AE74D476C87A4E7E93F9AFF9B082F18A608FCEF9B19348F9B29719F9B3
-F9B44E42502AF9B5520853E166F36C6D6FCA730A777F7A6282AE85DD8602F9B6
-88D48A638B7D8C6BF9B792B3F9B8971398104E944F0D4FC950B25348543E5433
-55DA586258BA59675A1B5BE4609FF9B961CA655665FF666468A76C5A6FB30000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000070CF71AC73527B7D87088AA49C329F075C4B6C8373447389923A6EAB7465
-761F7A697E15860A514058C564C174EE751576707FC1909596CD99546E2674E6
-7AA97AAA81E586D987788A1B5A495B8C5B9B68A169006D6373A97413742C7897
-7DE97FEB81188155839E8C4C962E981166F05F8065FA67896C6A738B502D5A03
-6B6A77EE59165D6C5DCD7325754FF9BAF9BB50E551F9582F592D599659DA5BE5
-F9BCF9BD5DA262D76416649364FEF9BE66DCF9BF6A48F9C071FF7464F9C10000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A887AAF7E477E5E80008170F9C287EF89818B209059F9C390809952617E
-6B326D747E1F89258FB14FD150AD519752C757C758895BB95EB8614269956D8C
-6E676EB6719474627528752C8073833884C98E0A939493DEF9C44E8E4F515076
-512A53C853CB53F35B875BD35C24611A618265F4725B7397744076C279507991
-79B97D067FBD828B85D5865E8FC2904790F591EA968596E896E952D65F6765ED
-6631682F715C7A3690C1980A4E91F9C56A526B9E6F907189801882B885530000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000904B969596F297FB851A9B314E90718A96C45143539F54E15713571257A3
-5A9B5AC45BC36028613F63F46C856D396E726E907230733F745782D188818F45
-9060F9C6966298589D1B67088D8A925E4F4D504950DE5371570D59D45A015C09
-617066906E2D7232744B7DEF80C3840E8466853F875F885B89188B02905597CB
-9B4F4E734F915112516AF9C7552F55A95B7A5BA55E7C5E7D5EBE60A060DF6108
-610963C465386709F9C867D467DAF9C9696169626CB96D27F9CA6E38F9CB0000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FE173367337F9CC745C7531F9CD7652F9CEF9CF7DAD81FE843888D58A98
-8ADB8AED8E308E42904A903E907A914991C9936EF9D0F9D15809F9D26BD38089
-80B2F9D3F9D45141596B5C39F9D5F9D66F6473A780E48D07F9D79217958FF9D8
-F9D9F9DAF9DB807F620E701C7D68878DF9DC57A0606961476BB78ABE928096B1
-4E59541F6DEB852D967097F398EE63D66CE3909151DD61C981BA9DF94F9D501A
-51005B9C610F61FF64EC69056BC5759177E37FA98264858F87FB88638ABC0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B7091AB4E8C4EE54F0AF9DDF9DE593759E8F9DF5DF25F1B5F5B6021F9E0
-F9E1F9E2F9E3723E73E5F9E4757075CDF9E579FBF9E6800C8033808482E18351
-F9E7F9E88CBD8CB39087F9E9F9EA98F4990CF9EBF9EC703776CA7FCA7FCC7FFC
-8B1A4EBA4EC152035370F9ED54BD56E059FB5BC55F155FCD6E6EF9EEF9EF7D6A
-8335F9F086938A8DF9F1976D9777F9F2F9F34E004F5A4F7E58F965E56EA29038
-93B099B94EFB58EC598A59D96041F9F4F9F57A14F9F6834F8CC3516553440000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9F7F9F8F9F94ECD52695B5582BF4ED4523A54A859C959FF5B505B575B5C
-606361486ECB7099716E738674F775B578C17D2B800581EA8328851785C98AEE
-8CC796CC4F5C52FA56BC65AB6628707C70B872357DBD828D914C96C09D725B71
-68E76B986F7A76DE5C9166AB6F5B7BB47C2A883696DC4E084ED75320583458BB
-58EF596C5C075E335E845F35638C66B267566A1F6AA36B0C6F3F7246F9FA7350
-748B7AE07CA7817881DF81E7838A846C8523859485CF88DD8D1391AC95770000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000969C518D54C957285BB0624D6750683D68936E3D6ED3707D7E2188C18CA1
-8F099F4B9F4E722D7B8F8ACD931A4F474F4E5132548059D05E9562B56775696E
-6A176CAE6E1A72D9732A75BD7BB87D3582E783F9845785F78A5B8CAF8E879019
-90B896CE9F5F52E3540A5AE15BC2645865756EF472C4F9FB76847A4D7B1B7C4D
-7E3E7FDF837B8B2B8CCA8D648DE18E5F8FEA8FF9906993D14F434F7A50B35168
-5178524D526A5861587C59605C085C555EDB609B623068136BBF6C086FB10000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714E742075307538755176727B4C7B8B7BAD7BC67E8F8A6E8F3E8F49923F
-92939322942B96FB985A986B991E5207622A62986D5976647ACA7BC07D765360
-5CBE5E976F3870B97C9897119B8E9EDE63A5647A87764E014E954EAD505C5075
-544859C35B9A5E405EAD5EF75F8160C5633A653F657465CC6676667867FE6968
-6A896B636C406DC06DE86E1F6E5E701E70A1738E73FD753A775B7887798E7A0B
-7A7D7CBE7D8E82478A028AEA8C9E912D914A91D8926692CC9320970697560000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000975C98029F0E52365291557C58245E1D5F1F608C63D068AF6FDF796D7B2C
-81CD85BA88FD8AF88E44918D9664969B973D984C9F4A4FCE514651CB52A95632
-5F145F6B63AA64CD65E9664166FA66F9671D689D68D769FD6F156F6E716771E5
-722A74AA773A7956795A79DF7A207A957C977CDF7D447E70808785FB86A48A54
-8ABF8D998E819020906D91E3963B96D59CE565CF7C078DB393C35B585C0A5352
-62D9731D50275B975F9E60B0616B68D56DD9742E7A2E7D427D9C7E31816B0000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E2A8E35937E94184F5057505DE65EA7632B7F6A4E3B4F4F4F8F505A59DD
-80C4546A546855FE594F5B995DDE5EDA665D673167F1682A6CE86D326E4A6F8D
-70B773E075877C4C7D027D2C7DA2821F86DB8A3B8A858D708E8A8F339031914E
-9152944499D07AF97CA54FCA510151C657C85BEF5CFB66596A3D6D5A6E966FEC
-710C756F7AE388229021907596CB99FF83014E2D4EF2884691CD537D6ADB696B
-6C41847A589E618E66FE62EF70DD751175C77E5284B88B498D084E4B53EA0000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054AB573057405FD763016307646F652F65E8667A679D67B36B626C606C9A
-6F2C77E57825794979577D1980A2810281F3829D82B787188A8CF9FC8D048DBE
-907276F47A197A377E548077550755D45875632F64226649664B686D699B6B84
-6D256EB173CD746874A1755B75B976E1771E778B79E67E097E1D81FB852F8897
-8A3A8CD18EEB8FB0903293AD9663967397074F8453F159EA5AC95E19684E74C6
-75BE79E97A9281A386ED8CEA8DCC8FED659F6715F9FD57F76F577DDD8F2F0000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093F696C65FB561F26F844E144F98501F53C955DF5D6F5DEE6B216B6478CB
-7B9AF9FE8E498ECA906E6349643E77407A84932F947F9F6A64B06FAF71E674A8
-74DA7AC47C127E827CB27E988B9A8D0A947D9910994C52395BDF64E6672D7D2E
-50ED53C358796158615961FA65AC7AD98B928B9650095021527555315A3C5EE0
-5F706134655E660C663666A269CD6EC46F32731676217A938139825983D684BC
-50B557F05BC05BE85F6963A178267DB583DC852191C791F5518A67F57B560000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008CAC51C459BB60BD8655501CF9FF52545C3A617D621A62D364F265A56ECC
-7620810A8E60965F96BB4EDF5343559859295DDD64C56CC96DFA73947A7F821B
-85A68CE48E10907791E795E1962197C651F854F255865FB964A46F887DB48F1F
-8F4D943550C95C166CBE6DFB751B77BB7C3D7C648A798AC2581E59BE5E166377
-7252758A776B8ADC8CBC8F125EF366746DF8807D83C18ACB97519BD6FA005243
-66FF6D956EEF7DE08AE6902E905E9AD4521D527F54E86194628462DB68A20000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006912695A6A3570927126785D7901790E79D27A0D8096827882D583498549
-8C828D859162918B91AE4FC356D171ED77D7870089F85BF85FD6675190A853E2
-585A5BF560A4618164607E3D80708525928364AE50AC5D146700589C62BD63A8
-690E69786A1E6E6B76BA79CB82BB84298ACF8DA88FFD9112914B919C93109318
-939A96DB9A369C0D4E11755C795D7AFA7B517BC97E2E84C48E598E748EF89010
-6625693F744351FA672E9EDC51455FE06C9687F2885D887760B481B584030000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008D0553D6543956345A365C31708A7FE0805A810681ED8DA391899A5F9DF2
-50744EC453A060FB6E2C5C644F88502455E45CD95E5F606568946CBB6DC471BE
-75D475F476617A1A7A497DC77DFB7F6E81F486A98F1C96C999B39F52524752C5
-98ED89AA4E0367D26F064FB55BE267956C886D78741B782791DD937C87C479E4
-7A315FEB4ED654A4553E58AE59A560F0625362D6673669558235964099B199DD
-502C53535544577CFA016258FA0264E2666B67DD6FC16FEF742274388A170000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094385451560657665F48619A6B4E705870AD7DBB8A95596A812B63A27708
-803D8CAA5854642D69BB5B955E116E6FFA038569514C53F0592A6020614B6B86
-6C706CF07B1E80CE82D48DC690B098B1FA0464C76FA464916504514E5410571F
-8A0E615F6876FA0575DB7B527D71901A580669CC817F892A9000983950785957
-59AC6295900F9B2A615D727995D657615A465DF4628A64AD64FA67776CE26D3E
-722C743678347F7782AD8DDB981752245742677F724874E38CA98FA692110000
-F8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000962A516B53ED634C4F695504609665576C9B6D7F724C72FD7A1789878C9D
-5F6D6F8E70F981A8610E4FBF504F624172477BC77DE87FE9904D97AD9A198CB6
-576A5E7367B0840D8A5554205B165E635EE25F0A658380BA853D9589965B4F48
-5305530D530F548654FA57035E036016629B62B16355FA066CE16D6675B17832
-80DE812F82DE846184B2888D8912900B92EA98FD9B915E4566B466DD70117206
-FA074FF5527D5F6A615367536A196F0274E2796888688C7998C798C49A430000
-F9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054C17A1F69538AF78C4A98A899AE5F7C62AB75B276AE88AB907F96425339
-5F3C5FC56CCC73CC7562758B7B4682FE999D4E4F903C4E0B4F5553A6590F5EC8
-66306CB37455837787668CC09050971E9C1558D15B7886508B149DB45BD26068
-608D65F16C576F226FA3701A7F557FF095919592965097D352728F4451FD542B
-54B85563558A6ABB6DB57DD88266929C96779E79540854C876D286E495A495D4
-965C4EA24F0959EE5AE65DF760526297676D68416C866E2F7F38809B822A0000
-FA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FA08FA0998054EA5505554B35793595A5B695BB361C869776D77702387F9
-89E38A728AE7908299ED9AB852BE683850165E78674F8347884C4EAB541156AE
-73E6911597FF9909995799995653589F865B8A3161B26AF6737B8ED26B4796AA
-9A57595572008D6B97694FD45CF45F2661F8665B6CEB70AB738473B973FE7729
-774D7D437D627E2382378852FA0A8CE29249986F5B517A74884098015ACC4FE0
-5354593E5CFD633E6D7972F98105810783A292CF98304EA851445211578B0000
-FB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F626CC26ECE7005705070AF719273E97469834A87A28861900890A293A3
-99A8516E5F5760E0616766B385598E4A91AF978B4E4E4E92547C58D558FA597D
-5CB55F2762366248660A66676BEB6D696DCF6E566EF86F946FE06FE9705D72D0
-7425745A74E07693795C7CCA7E1E80E182A6846B84BF864E865F87748B778C6A
-93AC9800986560D1621691775A5A660F6DF76E3E743F9B425FFD60DA7B0F54C4
-5F186C5E6CD36D2A70D87D0586798A0C9D3B5316548C5B056A3A706B75750000
-FC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000798D79BE82B183EF8A718B418CA89774FA0B64F4652B78BA78BB7A6B4E38
-559A59505BA65E7B60A363DB6B61666568536E19716574B07D0890849A699C25
-6D3B6ED1733E8C4195CA51F05E4C5FA8604D60F66130614C6643664469A56CC1
-6E5F6EC96F62714C749C76877BC17C27835287579051968D9EC3532F56DE5EFB
-5F8A6062609461F7666667036A9C6DEE6FAE7070736A7E6A81BE833486D48AA8
-8CC4528373725B966A6B940454EE56865B5D6548658566C9689F6D8D6DC60000
-FD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000723B80B491759A4D4FAF5019539A540E543C558955C55E3F5F8C673D7166
-73DD900552DB52F3586458CE7104718F71FB85B08A13668885A855A76684714A
-8431534955996BC15F595FBD63EE668971478AF18F1D9EBE4F11643A70CB7566
-866760648B4E9DF8514751F653086D3680F89ED166156B23709875D554035C79
-7D078A166B206B3D6B46543860706D3D7FD5820850D651DE559C566B56CD59EC
-5B095E0C619961986231665E66E6719971B971BA72A779A77A007FB28A700000
diff --git a/library/encoding/cp950.enc b/library/encoding/cp950.enc
deleted file mode 100644
index 8816284..0000000
--- a/library/encoding/cp950.enc
+++ /dev/null
@@ -1,1499 +0,0 @@
-# Encoding file: cp950, multi-byte
-M
-003F 0 88
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3000FF0C30013002FF0E2027FF1BFF1AFF1FFF01FE3020262025FE50FE51FE52
-00B7FE54FE55FE56FE57FF5C2013FE312014FE332574FE34FE4FFF08FF09FE35
-FE36FF5BFF5DFE37FE3830143015FE39FE3A30103011FE3BFE3C300A300BFE3D
-FE3E30083009FE3FFE40300C300DFE41FE42300E300FFE43FE44FE59FE5A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FE5BFE5CFE5DFE5E20182019201C201D301D301E20352032FF03FF06FF0A
-203B00A7300325CB25CF25B325B225CE2606260525C725C625A125A025BD25BC
-32A3210500AFFFE3FF3F02CDFE49FE4AFE4DFE4EFE4BFE4CFE5FFE60FE61FF0B
-FF0D00D700F700B1221AFF1CFF1EFF1D226622672260221E22522261FE62FE63
-FE64FE65FE66FF5E2229222A22A52220221F22BF33D233D1222B222E22352234
-26402642229522992191219321902192219621972199219822252223FF0F0000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FF3C2215FE68FF04FFE53012FFE0FFE1FF05FF2021032109FE69FE6AFE6B33D5
-339C339D339E33CE33A1338E338F33C400B05159515B515E515D5161516355E7
-74E97CCE25812582258325842585258625872588258F258E258D258C258B258A
-2589253C2534252C2524251C2594250025022595250C251025142518256D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000256E2570256F2550255E256A256125E225E325E525E4257125722573FF10
-FF11FF12FF13FF14FF15FF16FF17FF18FF192160216121622163216421652166
-216721682169302130223023302430253026302730283029534153445345FF21
-FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2FFF30FF31
-FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF41FF42FF43FF44FF45FF46FF47
-FF48FF49FF4AFF4BFF4CFF4DFF4EFF4FFF50FF51FF52FF53FF54FF55FF560000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FF57FF58FF59FF5A039103920393039403950396039703980399039A039B039C
-039D039E039F03A003A103A303A403A503A603A703A803A903B103B203B303B4
-03B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C103C303C403C5
-03C603C703C803C931053106310731083109310A310B310C310D310E310F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00003110311131123113311431153116311731183119311A311B311C311D311E
-311F312031213122312331243125312631273128312902D902C902CA02C702CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E004E594E014E034E434E5D4E864E8C4EBA513F5165516B51E052005201529B
-53155341535C53C84E094E0B4E084E0A4E2B4E3851E14E454E484E5F4E5E4E8E
-4EA15140520352FA534353C953E3571F58EB5915592759735B505B515B535BF8
-5C0F5C225C385C715DDD5DE55DF15DF25DF35DFE5E725EFE5F0B5F13624D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E114E104E0D4E2D4E304E394E4B5C394E884E914E954E924E944EA24EC1
-4EC04EC34EC64EC74ECD4ECA4ECB4EC4514351415167516D516E516C519751F6
-52065207520852FB52FE52FF53165339534853475345535E538453CB53CA53CD
-58EC5929592B592A592D5B545C115C245C3A5C6F5DF45E7B5EFF5F145F155FC3
-62086236624B624E652F6587659765A465B965E566F0670867286B206B626B79
-6BCB6BD46BDB6C0F6C34706B722A7236723B72477259725B72AC738B4E190000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E164E154E144E184E3B4E4D4E4F4E4E4EE54ED84ED44ED54ED64ED74EE34EE4
-4ED94EDE514551445189518A51AC51F951FA51F8520A52A0529F530553065317
-531D4EDF534A534953615360536F536E53BB53EF53E453F353EC53EE53E953E8
-53FC53F853F553EB53E653EA53F253F153F053E553ED53FB56DB56DA59160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000592E5931597459765B555B835C3C5DE85DE75DE65E025E035E735E7C5F01
-5F185F175FC5620A625362546252625165A565E6672E672C672A672B672D6B63
-6BCD6C116C106C386C416C406C3E72AF7384738974DC74E67518751F75287529
-7530753175327533758B767D76AE76BF76EE77DB77E277F3793A79BE7A747ACB
-4E1E4E1F4E524E534E694E994EA44EA64EA54EFF4F094F194F0A4F154F0D4F10
-4F114F0F4EF24EF64EFB4EF04EF34EFD4F014F0B514951475146514851680000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5171518D51B0521752115212520E521652A3530853215320537053715409540F
-540C540A54105401540B54045411540D54085403540E5406541256E056DE56DD
-573357305728572D572C572F57295919591A59375938598459785983597D5979
-598259815B575B585B875B885B855B895BFA5C165C795DDE5E065E765E740000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F0F5F1B5FD95FD6620E620C620D62106263625B6258653665E965E865EC
-65ED66F266F36709673D6734673167356B216B646B7B6C166C5D6C576C596C5F
-6C606C506C556C616C5B6C4D6C4E7070725F725D767E7AF97C737CF87F367F8A
-7FBD80018003800C80128033807F8089808B808C81E381EA81F381FC820C821B
-821F826E8272827E866B8840884C8863897F96214E324EA84F4D4F4F4F474F57
-4F5E4F344F5B4F554F304F504F514F3D4F3A4F384F434F544F3C4F464F630000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F5C4F604F2F4F4E4F364F594F5D4F484F5A514C514B514D517551B651B75225
-52245229522A522852AB52A952AA52AC532353735375541D542D541E543E5426
-544E542754465443543354485442541B5429544A5439543B5438542E54355436
-5420543C54405431542B541F542C56EA56F056E456EB574A57515740574D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005747574E573E5750574F573B58EF593E599D599259A8599E59A359995996
-598D59A45993598A59A55B5D5B5C5B5A5B5B5B8C5B8B5B8F5C2C5C405C415C3F
-5C3E5C905C915C945C8C5DEB5E0C5E8F5E875E8A5EF75F045F1F5F645F625F77
-5F795FD85FCC5FD75FCD5FF15FEB5FF85FEA6212621162846297629662806276
-6289626D628A627C627E627962736292626F6298626E62956293629162866539
-653B653865F166F4675F674E674F67506751675C6756675E6749674667600000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-675367576B656BCF6C426C5E6C996C816C886C896C856C9B6C6A6C7A6C906C70
-6C8C6C686C966C926C7D6C836C726C7E6C746C866C766C8D6C946C986C827076
-707C707D707872627261726072C472C27396752C752B75377538768276EF77E3
-79C179C079BF7A767CFB7F5580968093809D8098809B809A80B2826F82920000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000828B828D898B89D28A008C378C468C558C9D8D648D708DB38EAB8ECA8F9B
-8FB08FC28FC68FC58FC45DE1909190A290AA90A690A3914991C691CC9632962E
-9631962A962C4E264E564E734E8B4E9B4E9E4EAB4EAC4F6F4F9D4F8D4F734F7F
-4F6C4F9B4F8B4F864F834F704F754F884F694F7B4F964F7E4F8F4F914F7A5154
-51525155516951775176517851BD51FD523B52385237523A5230522E52365241
-52BE52BB5352535453535351536653775378537953D653D453D7547354750000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5496547854955480547B5477548454925486547C549054715476548C549A5462
-5468548B547D548E56FA57835777576A5769576157665764577C591C59495947
-59485944595459BE59BB59D459B959AE59D159C659D059CD59CB59D359CA59AF
-59B359D259C55B5F5B645B635B975B9A5B985B9C5B995B9B5C1A5C485C450000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C465CB75CA15CB85CA95CAB5CB15CB35E185E1A5E165E155E1B5E115E78
-5E9A5E975E9C5E955E965EF65F265F275F295F805F815F7F5F7C5FDD5FE05FFD
-5FF55FFF600F6014602F60356016602A6015602160276029602B601B62166215
-623F623E6240627F62C962CC62C462BF62C262B962D262DB62AB62D362D462CB
-62C862A862BD62BC62D062D962C762CD62B562DA62B162D862D662D762C662AC
-62CE653E65A765BC65FA66146613660C66066602660E6600660F6615660A0000
-AA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6607670D670B676D678B67956771679C677367776787679D6797676F6770677F
-6789677E67906775679A6793677C676A67726B236B666B676B7F6C136C1B6CE3
-6CE86CF36CB16CCC6CE56CB36CBD6CBE6CBC6CE26CAB6CD56CD36CB86CC46CB9
-6CC16CAE6CD76CC56CF16CBF6CBB6CE16CDB6CCA6CAC6CEF6CDC6CD66CE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007095708E7092708A7099722C722D723872487267726972C072CE72D972D7
-72D073A973A8739F73AB73A5753D759D7599759A768476C276F276F477E577FD
-793E7940794179C979C87A7A7A797AFA7CFE7F547F8C7F8B800580BA80A580A2
-80B180A180AB80A980B480AA80AF81E581FE820D82B3829D829982AD82BD829F
-82B982B182AC82A582AF82B882A382B082BE82B7864E8671521D88688ECB8FCE
-8FD48FD190B590B890B190B691C791D195779580961C9640963F963B96440000
-AB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-964296B996E89752975E4E9F4EAD4EAE4FE14FB54FAF4FBF4FE04FD14FCF4FDD
-4FC34FB64FD84FDF4FCA4FD74FAE4FD04FC44FC24FDA4FCE4FDE4FB751575192
-519151A0524E5243524A524D524C524B524752C752C952C352C1530D5357537B
-539A53DB54AC54C054A854CE54C954B854A654B354C754C254BD54AA54C10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054C454C854AF54AB54B154BB54A954A754BF56FF5782578B57A057A357A2
-57CE57AE579359555951594F594E595059DC59D859FF59E359E85A0359E559EA
-59DA59E65A0159FB5B695BA35BA65BA45BA25BA55C015C4E5C4F5C4D5C4B5CD9
-5CD25DF75E1D5E255E1F5E7D5EA05EA65EFA5F085F2D5F655F885F855F8A5F8B
-5F875F8C5F896012601D60206025600E6028604D60706068606260466043606C
-606B606A6064624162DC6316630962FC62ED630162EE62FD630762F162F70000
-AC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62EF62EC62FE62F463116302653F654565AB65BD65E26625662D66206627662F
-661F66286631662466F767FF67D367F167D467D067EC67B667AF67F567E967EF
-67C467D167B467DA67E567B867CF67DE67F367B067D967E267DD67D26B6A6B83
-6B866BB56BD26BD76C1F6CC96D0B6D326D2A6D416D256D0C6D316D1E6D170000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D3B6D3D6D3E6D366D1B6CF56D396D276D386D296D2E6D356D0E6D2B70AB
-70BA70B370AC70AF70AD70B870AE70A472307272726F727472E972E072E173B7
-73CA73BB73B273CD73C073B3751A752D754F754C754E754B75AB75A475A575A2
-75A3767876867687768876C876C676C376C5770176F976F87709770B76FE76FC
-770777DC78027814780C780D794679497948794779B979BA79D179D279CB7A7F
-7A817AFF7AFD7C7D7D027D057D007D097D077D047D067F387F8E7FBF80040000
-AD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8010800D8011803680D680E580DA80C380C480CC80E180DB80CE80DE80E480DD
-81F4822282E78303830582E382DB82E6830482E58302830982D282D782F18301
-82DC82D482D182DE82D382DF82EF830686508679867B867A884D886B898189D4
-8A088A028A038C9E8CA08D748D738DB48ECD8ECC8FF08FE68FE28FEA8FE50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008FED8FEB8FE48FE890CA90CE90C190C3914B914A91CD95829650964B964C
-964D9762976997CB97ED97F3980198A898DB98DF999699994E584EB3500C500D
-50234FEF502650254FF8502950165006503C501F501A501250114FFA50005014
-50284FF15021500B501950184FF34FEE502D502A4FFE502B5009517C51A451A5
-51A251CD51CC51C651CB5256525C5254525B525D532A537F539F539D53DF54E8
-55105501553754FC54E554F2550654FA551454E954ED54E1550954EE54EA0000
-AE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54E65527550754FD550F5703570457C257D457CB57C35809590F59575958595A
-5A115A185A1C5A1F5A1B5A1359EC5A205A235A295A255A0C5A095B6B5C585BB0
-5BB35BB65BB45BAE5BB55BB95BB85C045C515C555C505CED5CFD5CFB5CEA5CE8
-5CF05CF65D015CF45DEE5E2D5E2B5EAB5EAD5EA75F315F925F915F9060590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006063606560506055606D6069606F6084609F609A608D6094608C60856096
-624762F3630862FF634E633E632F635563426346634F6349633A6350633D632A
-632B6328634D634C65486549659965C165C566426649664F66436652664C6645
-664166F867146715671768216838684868466853683968426854682968B36817
-684C6851683D67F468506840683C6843682A68456813681868416B8A6B896BB7
-6C236C276C286C266C246CF06D6A6D956D886D876D666D786D776D596D930000
-AF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D6C6D896D6E6D5A6D746D696D8C6D8A6D796D856D656D9470CA70D870E470D9
-70C870CF7239727972FC72F972FD72F872F7738673ED740973EE73E073EA73DE
-7554755D755C755A755975BE75C575C775B275B375BD75BC75B975C275B8768B
-76B076CA76CD76CE7729771F7720772877E9783078277838781D783478370000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007825782D7820781F7832795579507960795F7956795E795D7957795A79E4
-79E379E779DF79E679E979D87A847A887AD97B067B117C897D217D177D0B7D0A
-7D207D227D147D107D157D1A7D1C7D0D7D197D1B7F3A7F5F7F947FC57FC18006
-8018801580198017803D803F80F1810280F0810580ED80F4810680F880F38108
-80FD810A80FC80EF81ED81EC82008210822A822B8228822C82BB832B83528354
-834A83388350834983358334834F833283398336831783408331832883430000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8654868A86AA869386A486A9868C86A3869C8870887788818882887D88798A18
-8A108A0E8A0C8A158A0A8A178A138A168A0F8A118C488C7A8C798CA18CA28D77
-8EAC8ED28ED48ECF8FB1900190068FF790008FFA8FF490038FFD90058FF89095
-90E190DD90E29152914D914C91D891DD91D791DC91D995839662966396610000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000965B965D96649658965E96BB98E299AC9AA89AD89B259B329B3C4E7E507A
-507D505C50475043504C505A504950655076504E5055507550745077504F500F
-506F506D515C519551F0526A526F52D252D952D852D55310530F5319533F5340
-533E53C366FC5546556A55665544555E55615543554A55315556554F5555552F
-55645538552E555C552C55635533554155575708570B570957DF5805580A5806
-57E057E457FA5802583557F757F9592059625A365A415A495A665A6A5A400000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A3C5A625A5A5A465A4A5B705BC75BC55BC45BC25BBF5BC65C095C085C075C60
-5C5C5C5D5D075D065D0E5D1B5D165D225D115D295D145D195D245D275D175DE2
-5E385E365E335E375EB75EB85EB65EB55EBE5F355F375F575F6C5F695F6B5F97
-5F995F9E5F985FA15FA05F9C607F60A3608960A060A860CB60B460E660BD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060C560BB60B560DC60BC60D860D560C660DF60B860DA60C7621A621B6248
-63A063A76372639663A263A563776367639863AA637163A963896383639B636B
-63A863846388639963A163AC6392638F6380637B63696368637A655D65566551
-65596557555F654F655865556554659C659B65AC65CF65CB65CC65CE665D665A
-666466686666665E66F952D7671B688168AF68A2689368B5687F687668B168A7
-689768B0688368C468AD688668856894689D68A8689F68A168826B326BBA0000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BEB6BEC6C2B6D8E6DBC6DF36DD96DB26DE16DCC6DE46DFB6DFA6E056DC76DCB
-6DAF6DD16DAE6DDE6DF96DB86DF76DF56DC56DD26E1A6DB56DDA6DEB6DD86DEA
-6DF16DEE6DE86DC66DC46DAA6DEC6DBF6DE670F97109710A70FD70EF723D727D
-7281731C731B73167313731973877405740A7403740673FE740D74E074F60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000074F7751C75227565756675627570758F75D475D575B575CA75CD768E76D4
-76D276DB7737773E773C77367738773A786B7843784E79657968796D79FB7A92
-7A957B207B287B1B7B2C7B267B197B1E7B2E7C927C977C957D467D437D717D2E
-7D397D3C7D407D307D337D447D2F7D427D327D317F3D7F9E7F9A7FCC7FCE7FD2
-801C804A8046812F81168123812B81298130812482028235823782368239838E
-839E8398837883A2839683BD83AB8392838A8393838983A08377837B837C0000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-838683A786555F6A86C786C086B686C486B586C686CB86B186AF86C98853889E
-888888AB88928896888D888B8993898F8A2A8A1D8A238A258A318A2D8A1F8A1B
-8A228C498C5A8CA98CAC8CAB8CA88CAA8CA78D678D668DBE8DBA8EDB8EDF9019
-900D901A90179023901F901D90109015901E9020900F90229016901B90140000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090E890ED90FD915791CE91F591E691E391E791ED91E99589966A96759673
-96789670967496769677966C96C096EA96E97AE07ADF980298039B5A9CE59E75
-9E7F9EA59EBB50A2508D508550995091508050965098509A670051F152725274
-5275526952DE52DD52DB535A53A5557B558055A7557C558A559D55985582559C
-55AA55945587558B558355B355AE559F553E55B2559A55BB55AC55B1557E5589
-55AB5599570D582F582A58345824583058315821581D582058F958FA59600000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A775A9A5A7F5A925A9B5AA75B735B715BD25BCC5BD35BD05C0A5C0B5C315D4C
-5D505D345D475DFD5E455E3D5E405E435E7E5ECA5EC15EC25EC45F3C5F6D5FA9
-5FAA5FA860D160E160B260B660E0611C612360FA611560F060FB60F4616860F1
-610E60F6610961006112621F624963A3638C63CF63C063E963C963C663CD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000063D263E363D063E163D663ED63EE637663F463EA63DB645263DA63F9655E
-6566656265636591659065AF666E667066746676666F6691667A667E667766FE
-66FF671F671D68FA68D568E068D868D7690568DF68F568EE68E768F968D268F2
-68E368CB68CD690D6912690E68C968DA696E68FB6B3E6B3A6B3D6B986B966BBC
-6BEF6C2E6C2F6C2C6E2F6E386E546E216E326E676E4A6E206E256E236E1B6E5B
-6E586E246E566E6E6E2D6E266E6F6E346E4D6E3A6E2C6E436E1D6E3E6ECB0000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E896E196E4E6E636E446E726E696E5F7119711A7126713071217136716E711C
-724C728472807336732573347329743A742A743374227425743574367434742F
-741B7426742875257526756B756A75E275DB75E375D975D875DE75E0767B767C
-7696769376B476DC774F77ED785D786C786F7A0D7A087A0B7A057A007A980000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A977A967AE57AE37B497B567B467B507B527B547B4D7B4B7B4F7B517C9F
-7CA57D5E7D507D687D557D2B7D6E7D727D617D667D627D707D7355847FD47FD5
-800B8052808581558154814B8151814E81398146813E814C815381748212821C
-83E9840383F8840D83E083C5840B83C183EF83F183F48457840A83F0840C83CC
-83FD83F283CA8438840E840483DC840783D483DF865B86DF86D986ED86D486DB
-86E486D086DE885788C188C288B1898389968A3B8A608A558A5E8A3C8A410000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8A548A5B8A508A468A348A3A8A368A568C618C828CAF8CBC8CB38CBD8CC18CBB
-8CC08CB48CB78CB68CBF8CB88D8A8D858D818DCE8DDD8DCB8DDA8DD18DCC8DDB
-8DC68EFB8EF88EFC8F9C902E90359031903890329036910290F5910990FE9163
-916591CF9214921592239209921E920D9210920792119594958F958B95910000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000095939592958E968A968E968B967D96859686968D9672968496C196C596C4
-96C696C796EF96F297CC98059806980898E798EA98EF98E998F298ED99AE99AD
-9EC39ECD9ED14E8250AD50B550B250B350C550BE50AC50B750BB50AF50C7527F
-5277527D52DF52E652E452E252E3532F55DF55E855D355E655CE55DC55C755D1
-55E355E455EF55DA55E155C555C655E555C957125713585E585158585857585A
-5854586B584C586D584A58625852584B59675AC15AC95ACC5ABE5ABD5ABC0000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5AB35AC25AB25D695D6F5E4C5E795EC95EC85F125F595FAC5FAE611A610F6148
-611F60F3611B60F961016108614E614C6144614D613E61346127610D61066137
-622162226413643E641E642A642D643D642C640F641C6414640D643664166417
-6406656C659F65B06697668966876688669666846698668D67036994696D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000695A697769606954697569306982694A6968696B695E695369796986695D
-6963695B6B476B726BC06BBF6BD36BFD6EA26EAF6ED36EB66EC26E906E9D6EC7
-6EC56EA56E986EBC6EBA6EAB6ED16E966E9C6EC46ED46EAA6EA76EB4714E7159
-7169716471497167715C716C7166714C7165715E714671687156723A72527337
-7345733F733E746F745A7455745F745E7441743F7459745B745C757675787600
-75F0760175F275F175FA75FF75F475F376DE76DF775B776B7766775E77630000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7779776A776C775C77657768776277EE788E78B078977898788C7889787C7891
-7893787F797A797F7981842C79BD7A1C7A1A7A207A147A1F7A1E7A9F7AA07B77
-7BC07B607B6E7B677CB17CB37CB57D937D797D917D817D8F7D5B7F6E7F697F6A
-7F727FA97FA87FA480568058808680848171817081788165816E8173816B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008179817A81668205824784828477843D843184758466846B8449846C845B
-843C8435846184638469846D8446865E865C865F86F9871387088707870086FE
-86FB870287038706870A885988DF88D488D988DC88D888DD88E188CA88D588D2
-899C89E38A6B8A728A738A668A698A708A878A7C8A638AA08A718A858A6D8A62
-8A6E8A6C8A798A7B8A3E8A688C628C8A8C898CCA8CC78CC88CC48CB28CC38CC2
-8CC58DE18DDF8DE88DEF8DF38DFA8DEA8DE48DE68EB28F038F098EFE8F0A0000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8F9F8FB2904B904A905390429054903C905590509047904F904E904D9051903E
-904191129117916C916A916991C9923792579238923D9240923E925B924B9264
-925192349249924D92459239923F925A959896989694969596CD96CB96C996CA
-96F796FB96F996F6975697749776981098119813980A9812980C98FC98F40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000098FD98FE99B399B199B49AE19CE99E829F0E9F139F2050E750EE50E550D6
-50ED50DA50D550CF50D150F150CE50E9516251F352835282533153AD55FE5600
-561B561755FD561456065609560D560E55F75616561F5608561055F657185716
-5875587E58835893588A58795885587D58FD592559225924596A59695AE15AE6
-5AE95AD75AD65AD85AE35B755BDE5BE75BE15BE55BE65BE85BE25BE45BDF5C0D
-5C625D845D875E5B5E635E555E575E545ED35ED65F0A5F465F705FB961470000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-613F614B617761626163615F615A61586175622A64876458645464A46478645F
-647A645164676434646D647B657265A165D765D666A266A8669D699C69A86995
-69C169AE69D369CB699B69B769BB69AB69B469D069CD69AD69CC69A669C369A3
-6B496B4C6C336F336F146EFE6F136EF46F296F3E6F206F2C6F0F6F026F220000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006EFF6EEF6F066F316F386F326F236F156F2B6F2F6F886F2A6EEC6F016EF2
-6ECC6EF771947199717D718A71847192723E729272967344735074647463746A
-7470746D750475917627760D760B7609761376E176E37784777D777F776178C1
-789F78A778B378A978A3798E798F798D7A2E7A317AAA7AA97AED7AEF7BA17B95
-7B8B7B757B977B9D7B947B8F7BB87B877B847CB97CBD7CBE7DBB7DB07D9C7DBD
-7DBE7DA07DCA7DB47DB27DB17DBA7DA27DBF7DB57DB87DAD7DD27DC77DAC0000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7F707FE07FE17FDF805E805A808781508180818F8188818A817F818281E781FA
-82078214821E824B84C984BF84C684C48499849E84B2849C84CB84B884C084D3
-849084BC84D184CA873F871C873B872287258734871887558737872988F38902
-88F488F988F888FD88E8891A88EF8AA68A8C8A9E8AA38A8D8AA18A938AA40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AAA8AA58AA88A988A918A9A8AA78C6A8C8D8C8C8CD38CD18CD28D6B8D99
-8D958DFC8F148F128F158F138FA390609058905C90639059905E9062905D905B
-91199118911E917591789177917492789280928592989296927B9293929C92A8
-927C929195A195A895A995A395A595A49699969C969B96CC96D29700977C9785
-97F69817981898AF98B199039905990C990999C19AAF9AB09AE69B419B429CF4
-9CF69CF39EBC9F3B9F4A5104510050FB50F550F9510251085109510551DC0000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-528752885289528D528A52F053B2562E563B56395632563F563456295653564E
-565756745636562F56305880589F589E58B3589C58AE58A958A6596D5B095AFB
-5B0B5AF55B0C5B085BEE5BEC5BE95BEB5C645C655D9D5D945E625E5F5E615EE2
-5EDA5EDF5EDD5EE35EE05F485F715FB75FB561766167616E615D615561820000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000617C6170616B617E61A7619061AB618E61AC619A61A4619461AE622E6469
-646F6479649E64B26488649064B064A56493649564A9649264AE64AD64AB649A
-64AC649964A264B365756577657866AE66AB66B466B16A236A1F69E86A016A1E
-6A1969FD6A216A136A0A69F36A026A0569ED6A116B506B4E6BA46BC56BC66F3F
-6F7C6F846F516F666F546F866F6D6F5B6F786F6E6F8E6F7A6F706F646F976F58
-6ED56F6F6F606F5F719F71AC71B171A87256729B734E73577469748B74830000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-747E7480757F76207629761F7624762676217622769A76BA76E4778E7787778C
-7791778B78CB78C578BA78CA78BE78D578BC78D07A3F7A3C7A407A3D7A377A3B
-7AAF7AAE7BAD7BB17BC47BB47BC67BC77BC17BA07BCC7CCA7DE07DF47DEF7DFB
-7DD87DEC7DDD7DE87DE37DDA7DDE7DE97D9E7DD97DF27DF97F757F777FAF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007FE98026819B819C819D81A0819A81988517853D851A84EE852C852D8513
-851185238521851484EC852584FF850687828774877687608766877887688759
-8757874C8753885B885D89108907891289138915890A8ABC8AD28AC78AC48A95
-8ACB8AF88AB28AC98AC28ABF8AB08AD68ACD8AB68AB98ADB8C4C8C4E8C6C8CE0
-8CDE8CE68CE48CEC8CED8CE28CE38CDC8CEA8CE18D6D8D9F8DA38E2B8E108E1D
-8E228E0F8E298E1F8E218E1E8EBA8F1D8F1B8F1F8F298F268F2A8F1C8F1E0000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8F259069906E9068906D90779130912D9127913191879189918B918392C592BB
-92B792EA92AC92E492C192B392BC92D292C792F092B295AD95B1970497069707
-97099760978D978B978F9821982B981C98B3990A99139912991899DD99D099DF
-99DB99D199D599D299D99AB79AEE9AEF9B279B459B449B779B6F9D069D090000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D039EA99EBE9ECE58A89F5251125118511451105115518051AA51DD5291
-529352F35659566B5679566956645678566A566856655671566F566C56625676
-58C158BE58C758C5596E5B1D5B345B785BF05C0E5F4A61B2619161A9618A61CD
-61B661BE61CA61C8623064C564C164CB64BB64BC64DA64C464C764C264CD64BF
-64D264D464BE657466C666C966B966C466C766B86A3D6A386A3A6A596A6B6A58
-6A396A446A626A616A4B6A476A356A5F6A486B596B776C056FC26FB16FA10000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6FC36FA46FC16FA76FB36FC06FB96FB66FA66FA06FB471BE71C971D071D271C8
-71D571B971CE71D971DC71C371C47368749C74A37498749F749E74E2750C750D
-76347638763A76E776E577A0779E779F77A578E878DA78EC78E779A67A4D7A4E
-7A467A4C7A4B7ABA7BD97C117BC97BE47BDB7BE17BE97BE67CD57CD67E0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E117E087E1B7E237E1E7E1D7E097E107F797FB27FF07FF17FEE802881B3
-81A981A881FB820882588259854A855985488568856985438549856D856A855E
-8783879F879E87A2878D8861892A89328925892B892189AA89A68AE68AFA8AEB
-8AF18B008ADC8AE78AEE8AFE8B018B028AF78AED8AF38AF68AFC8C6B8C6D8C93
-8CF48E448E318E348E428E398E358F3B8F2F8F388F338FA88FA6907590749078
-9072907C907A913491929320933692F89333932F932292FC932B9304931A0000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9310932693219315932E931995BB96A796A896AA96D5970E97119716970D9713
-970F975B975C9766979898309838983B9837982D9839982499109928991E991B
-9921991A99ED99E299F19AB89ABC9AFB9AED9B289B919D159D239D269D289D12
-9D1B9ED89ED49F8D9F9C512A511F5121513252F5568E56805690568556870000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000568F58D558D358D158CE5B305B2A5B245B7A5C375C685DBC5DBA5DBD5DB8
-5E6B5F4C5FBD61C961C261C761E661CB6232623464CE64CA64D864E064F064E6
-64EC64F164E264ED6582658366D966D66A806A946A846AA26A9C6ADB6AA36A7E
-6A976A906AA06B5C6BAE6BDA6C086FD86FF16FDF6FE06FDB6FE46FEB6FEF6F80
-6FEC6FE16FE96FD56FEE6FF071E771DF71EE71E671E571ED71EC71F471E07235
-72467370737274A974B074A674A876467642764C76EA77B377AA77B077AC0000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77A777AD77EF78F778FA78F478EF790179A779AA7A577ABF7C077C0D7BFE7BF7
-7C0C7BE07CE07CDC7CDE7CE27CDF7CD97CDD7E2E7E3E7E467E377E327E437E2B
-7E3D7E317E457E417E347E397E487E357E3F7E2F7F447FF37FFC807180728070
-806F807381C681C381BA81C281C081BF81BD81C981BE81E88209827185AA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008584857E859C8591859485AF859B858785A8858A866787C087D187B387D2
-87C687AB87BB87BA87C887CB893B893689448938893D89AC8B0E8B178B198B1B
-8B0A8B208B1D8B048B108C418C3F8C738CFA8CFD8CFC8CF88CFB8DA88E498E4B
-8E488E4A8F448F3E8F428F458F3F907F907D9084908190829080913991A3919E
-919C934D938293289375934A9365934B9318937E936C935B9370935A935495CA
-95CB95CC95C895C696B196B896D6971C971E97A097D3984698B699359A010000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-99FF9BAE9BAB9BAA9BAD9D3B9D3F9E8B9ECF9EDE9EDC9EDD9EDB9F3E9F4B53E2
-569556AE58D958D85B385F5D61E3623364F464F264FE650664FA64FB64F765B7
-66DC67266AB36AAC6AC36ABB6AB86AC26AAE6AAF6B5F6B786BAF7009700B6FFE
-70066FFA7011700F71FB71FC71FE71F87377737574A774BF7515765676580000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000765277BD77BF77BB77BC790E79AE7A617A627A607AC47AC57C2B7C277C2A
-7C1E7C237C217CE77E547E557E5E7E5A7E617E527E597F487FF97FFB80778076
-81CD81CF820A85CF85A985CD85D085C985B085BA85B985A687EF87EC87F287E0
-898689B289F48B288B398B2C8B2B8C508D058E598E638E668E648E5F8E558EC0
-8F498F4D90879083908891AB91AC91D09394938A939693A293B393AE93AC93B0
-9398939A939795D495D695D095D596E296DC96D996DB96DE972497A397A60000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-97AD97F9984D984F984C984E985398BA993E993F993D992E99A59A0E9AC19B03
-9B069B4F9B4E9B4D9BCA9BC99BFD9BC89BC09D519D5D9D609EE09F159F2C5133
-56A558DE58DF58E25BF59F905EEC61F261F761F661F56500650F66E066DD6AE5
-6ADD6ADA6AD3701B701F7028701A701D701570187206720D725872A273780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000737A74BD74CA74E375877586765F766177C7791979B17A6B7A697C3E7C3F
-7C387C3D7C377C407E6B7E6D7E797E697E6A7F857E737FB67FB97FB881D885E9
-85DD85EA85D585E485E585F787FB8805880D87F987FE8960895F8956895E8B41
-8B5C8B588B498B5A8B4E8B4F8B468B598D088D0A8E7C8E728E878E768E6C8E7A
-8E748F548F4E8FAD908A908B91B191AE93E193D193DF93C393C893DC93DD93D6
-93E293CD93D893E493D793E895DC96B496E3972A9727976197DC97FB985E0000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9858985B98BC994599499A169A199B0D9BE89BE79BD69BDB9D899D619D729D6A
-9D6C9E929E979E939EB452F856A856B756B656B456BC58E45B405B435B7D5BF6
-5DC961F861FA65186514651966E667276AEC703E703070327210737B74CF7662
-76657926792A792C792B7AC77AF67C4C7C437C4D7CEF7CF08FAE7E7D7E7C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E827F4C800081DA826685FB85F9861185FA8606860B8607860A88148815
-896489BA89F88B708B6C8B668B6F8B5F8B6B8D0F8D0D8E898E818E858E8291B4
-91CB9418940393FD95E1973098C49952995199A89A2B9A309A379A359C139C0D
-9E799EB59EE89F2F9F5F9F639F615137513856C156C056C259145C6C5DCD61FC
-61FE651D651C659566E96AFB6B046AFA6BB2704C721B72A774D674D4766977D3
-7C507E8F7E8C7FBC8617862D861A882388228821881F896A896C89BD8B740000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B778B7D8D138E8A8E8D8E8B8F5F8FAF91BA942E94339435943A94389432942B
-95E297389739973297FF9867986599579A459A439A409A3E9ACF9B549B519C2D
-9C259DAF9DB49DC29DB89E9D9EEF9F199F5C9F669F67513C513B56C856CA56C9
-5B7F5DD45DD25F4E61FF65246B0A6B6170517058738074E4758A766E766C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079B37C607C5F807E807D81DF8972896F89FC8B808D168D178E918E938F61
-9148944494519452973D973E97C397C1986B99559A559A4D9AD29B1A9C499C31
-9C3E9C3B9DD39DD79F349F6C9F6A9F9456CC5DD662006523652B652A66EC6B10
-74DA7ACA7C647C637C657E937E967E9481E28638863F88318B8A9090908F9463
-946094649768986F995C9A5A9A5B9A579AD39AD49AD19C549C579C569DE59E9F
-9EF456D158E9652C705E7671767277D77F507F888836883988628B938B920000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B9682778D1B91C0946A97429748974497C698709A5F9B229B589C5F9DF99DFA
-9E7C9E7D9F079F779F725EF36B1670637C6C7C6E883B89C08EA191C194729470
-9871995E9AD69B239ECC706477DA8B9A947797C99A629A657E9C8B9C8EAA91C5
-947D947E947C9C779C789EF78C54947F9E1A72289A6A9B319E1B9E1E7C720000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-C9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E424E5C51F5531A53824E074E0C4E474E8D56D7FA0C5C6E5F734E0F51874E0E
-4E2E4E934EC24EC94EC8519852FC536C53B957205903592C5C105DFF65E16BB3
-6BCC6C14723F4E314E3C4EE84EDC4EE94EE14EDD4EDA520C531C534C57225723
-5917592F5B815B845C125C3B5C745C735E045E805E825FC9620962506C150000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C366C436C3F6C3B72AE72B0738A79B8808A961E4F0E4F184F2C4EF54F14
-4EF14F004EF74F084F1D4F024F054F224F134F044EF44F1251B1521352095210
-52A65322531F534D538A540756E156DF572E572A5734593C5980597C5985597B
-597E5977597F5B565C155C255C7C5C7A5C7B5C7E5DDF5E755E845F025F1A5F74
-5FD55FD45FCF625C625E626462616266626262596260625A626565EF65EE673E
-67396738673B673A673F673C67336C186C466C526C5C6C4F6C4A6C546C4B0000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C4C7071725E72B472B5738E752A767F7A757F518278827C8280827D827F864D
-897E909990979098909B909496229624962096234F564F3B4F624F494F534F64
-4F3E4F674F524F5F4F414F584F2D4F334F3F4F61518F51B9521C521E522152AD
-52AE530953635372538E538F54305437542A545454455419541C542554180000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000543D544F544154285424544756EE56E756E557415745574C5749574B5752
-5906594059A6599859A05997598E59A25990598F59A759A15B8E5B925C285C2A
-5C8D5C8F5C885C8B5C895C925C8A5C865C935C955DE05E0A5E0E5E8B5E895E8C
-5E885E8D5F055F1D5F785F765FD25FD15FD05FED5FE85FEE5FF35FE15FE45FE3
-5FFA5FEF5FF75FFB60005FF4623A6283628C628E628F629462876271627B627A
-6270628162886277627D62726274653765F065F465F365F265F5674567470000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67596755674C6748675D674D675A674B6BD06C196C1A6C786C676C6B6C846C8B
-6C8F6C716C6F6C696C9A6C6D6C876C956C9C6C666C736C656C7B6C8E7074707A
-726372BF72BD72C372C672C172BA72C573957397739373947392753A75397594
-75957681793D80348095809980908092809C8290828F8285828E829182930000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000828A828382848C788FC98FBF909F90A190A5909E90A790A096309628962F
-962D4E334F984F7C4F854F7D4F804F874F764F744F894F844F774F4C4F974F6A
-4F9A4F794F814F784F904F9C4F944F9E4F924F824F954F6B4F6E519E51BC51BE
-5235523252335246523152BC530A530B533C539253945487547F548154915482
-5488546B547A547E5465546C54745466548D546F546154605498546354675464
-56F756F9576F5772576D576B57715770577657805775577B5773577457620000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5768577D590C594559B559BA59CF59CE59B259CC59C159B659BC59C359D659B1
-59BD59C059C859B459C75B625B655B935B955C445C475CAE5CA45CA05CB55CAF
-5CA85CAC5C9F5CA35CAD5CA25CAA5CA75C9D5CA55CB65CB05CA65E175E145E19
-5F285F225F235F245F545F825F7E5F7D5FDE5FE5602D602660196032600B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006034600A60176033601A601E602C6022600D6010602E60136011600C6009
-601C6214623D62AD62B462D162BE62AA62B662CA62AE62B362AF62BB62A962B0
-62B8653D65A865BB660965FC66046612660865FB6603660B660D660565FD6611
-661066F6670A6785676C678E67926776677B6798678667846774678D678C677A
-679F679167996783677D67816778677967946B256B806B7E6BDE6C1D6C936CEC
-6CEB6CEE6CD96CB66CD46CAD6CE76CB76CD06CC26CBA6CC36CC66CED6CF20000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6CD26CDD6CB46C8A6C9D6C806CDE6CC06D306CCD6CC76CB06CF96CCF6CE96CD1
-709470987085709370867084709170967082709A7083726A72D672CB72D872C9
-72DC72D272D472DA72CC72D173A473A173AD73A673A273A073AC739D74DD74E8
-753F7540753E758C759876AF76F376F176F076F577F877FC77F977FB77FA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077F77942793F79C57A787A7B7AFB7C757CFD8035808F80AE80A380B880B5
-80AD822082A082C082AB829A8298829B82B582A782AE82BC829E82BA82B482A8
-82A182A982C282A482C382B682A28670866F866D866E8C568FD28FCB8FD38FCD
-8FD68FD58FD790B290B490AF90B390B09639963D963C963A96434FCD4FC54FD3
-4FB24FC94FCB4FC14FD44FDC4FD94FBB4FB34FDB4FC74FD64FBA4FC04FB94FEC
-5244524952C052C2533D537C539753965399539854BA54A154AD54A554CF0000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54C3830D54B754AE54D654B654C554C654A0547054BC54A254BE547254DE54B0
-57B5579E579F57A4578C5797579D579B57945798578F579957A5579A579558F4
-590D595359E159DE59EE5A0059F159DD59FA59FD59FC59F659E459F259F759DB
-59E959F359F559E059FE59F459ED5BA85C4C5CD05CD85CCC5CD75CCB5CDB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005CDE5CDA5CC95CC75CCA5CD65CD35CD45CCF5CC85CC65CCE5CDF5CF85DF9
-5E215E225E235E205E245EB05EA45EA25E9B5EA35EA55F075F2E5F565F866037
-603960546072605E6045605360476049605B604C60406042605F602460446058
-6066606E6242624362CF630D630B62F5630E630362EB62F9630F630C62F862F6
-63006313631462FA631562FB62F06541654365AA65BF6636662166326635661C
-662666226633662B663A661D66346639662E670F671067C167F267C867BA0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67DC67BB67F867D867C067B767C567EB67E467DF67B567CD67B367F767F667EE
-67E367C267B967CE67E767F067B267FC67C667ED67CC67AE67E667DB67FA67C9
-67CA67C367EA67CB6B286B826B846BB66BD66BD86BE06C206C216D286D346D2D
-6D1F6D3C6D3F6D126D0A6CDA6D336D046D196D3A6D1A6D116D006D1D6D420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D016D186D376D036D0F6D406D076D206D2C6D086D226D096D1070B7709F
-70BE70B170B070A170B470B570A972417249724A726C72707273726E72CA72E4
-72E872EB72DF72EA72E672E3738573CC73C273C873C573B973B673B573B473EB
-73BF73C773BE73C373C673B873CB74EC74EE752E7547754875A775AA767976C4
-7708770377047705770A76F776FB76FA77E777E878067811781278057810780F
-780E780978037813794A794C794B7945794479D579CD79CF79D679CE7A800000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A7E7AD17B007B017C7A7C787C797C7F7C807C817D037D087D017F587F917F8D
-7FBE8007800E800F8014803780D880C780E080D180C880C280D080C580E380D9
-80DC80CA80D580C980CF80D780E680CD81FF8221829482D982FE82F9830782E8
-830082D5833A82EB82D682F482EC82E182F282F5830C82FB82F682F082EA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000082E482E082FA82F382ED86778674867C86738841884E8867886A886989D3
-8A048A078D728FE38FE18FEE8FE090F190BD90BF90D590C590BE90C790CB90C8
-91D491D39654964F96519653964A964E501E50055007501350225030501B4FF5
-4FF450335037502C4FF64FF75017501C502050275035502F5031500E515A5194
-519351CA51C451C551C851CE5261525A5252525E525F5255526252CD530E539E
-552654E25517551254E754F354E4551A54FF5504550854EB5511550554F10000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-550A54FB54F754F854E0550E5503550B5701570257CC583257D557D257BA57C6
-57BD57BC57B857B657BF57C757D057B957C1590E594A5A195A165A2D5A2E5A15
-5A0F5A175A0A5A1E5A335B6C5BA75BAD5BAC5C035C565C545CEC5CFF5CEE5CF1
-5CF75D005CF95E295E285EA85EAE5EAA5EAC5F335F305F67605D605A60670000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000604160A26088608060926081609D60836095609B60976087609C608E6219
-624662F263106356632C634463456336634363E46339634B634A633C63296341
-6334635863546359632D63476333635A63516338635763406348654A654665C6
-65C365C465C2664A665F6647665167126713681F681A684968326833683B684B
-684F68166831681C6835682B682D682F684E68446834681D6812681468266828
-682E684D683A682568206B2C6B2F6B2D6B316B346B6D80826B886BE66BE40000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BE86BE36BE26BE76C256D7A6D636D646D766D0D6D616D926D586D626D6D6D6F
-6D916D8D6DEF6D7F6D866D5E6D676D606D976D706D7C6D5F6D826D986D2F6D68
-6D8B6D7E6D806D846D166D836D7B6D7D6D756D9070DC70D370D170DD70CB7F39
-70E270D770D270DE70E070D470CD70C570C670C770DA70CE70E1724272780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072777276730072FA72F472FE72F672F372FB730173D373D973E573D673BC
-73E773E373E973DC73D273DB73D473DD73DA73D773D873E874DE74DF74F474F5
-7521755B755F75B075C175BB75C475C075BF75B675BA768A76C9771D771B7710
-771377127723771177157719771A772277277823782C78227835782F7828782E
-782B782178297833782A78317954795B794F795C79537952795179EB79EC79E0
-79EE79ED79EA79DC79DE79DD7A867A897A857A8B7A8C7A8A7A877AD87B100000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7B047B137B057B0F7B087B0A7B0E7B097B127C847C917C8A7C8C7C887C8D7C85
-7D1E7D1D7D117D0E7D187D167D137D1F7D127D0F7D0C7F5C7F617F5E7F607F5D
-7F5B7F967F927FC37FC27FC08016803E803980FA80F280F980F5810180FB8100
-8201822F82258333832D83448319835183258356833F83418326831C83220000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008342834E831B832A8308833C834D8316832483208337832F832983478345
-834C8353831E832C834B832783488653865286A286A88696868D8691869E8687
-86978686868B869A868586A5869986A186A786958698868E869D869086948843
-8844886D88758876887288808871887F886F8883887E8874887C8A128C478C57
-8C7B8CA48CA38D768D788DB58DB78DB68ED18ED38FFE8FF590028FFF8FFB9004
-8FFC8FF690D690E090D990DA90E390DF90E590D890DB90D790DC90E491500000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-914E914F91D591E291DA965C965F96BC98E39ADF9B2F4E7F5070506A5061505E
-50605053504B505D50725048504D5041505B504A506250155045505F5069506B
-5063506450465040506E50735057505151D0526B526D526C526E52D652D3532D
-539C55755576553C554D55505534552A55515562553655355530555255450000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000550C55325565554E55395548552D553B5540554B570A570757FB581457E2
-57F657DC57F4580057ED57FD580857F8580B57F357CF580757EE57E357F257E5
-57EC57E1580E57FC581057E75801580C57F157E957F0580D5804595C5A605A58
-5A555A675A5E5A385A355A6D5A505A5F5A655A6C5A535A645A575A435A5D5A52
-5A445A5B5A485A8E5A3E5A4D5A395A4C5A705A695A475A515A565A425A5C5B72
-5B6E5BC15BC05C595D1E5D0B5D1D5D1A5D205D0C5D285D0D5D265D255D0F0000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D305D125D235D1F5D2E5E3E5E345EB15EB45EB95EB25EB35F365F385F9B5F96
-5F9F608A6090608660BE60B060BA60D360D460CF60E460D960DD60C860B160DB
-60B760CA60BF60C360CD60C063326365638A6382637D63BD639E63AD639D6397
-63AB638E636F63876390636E63AF6375639C636D63AE637C63A4633B639F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006378638563816391638D6370655365CD66656661665B6659665C66626718
-687968876890689C686D686E68AE68AB6956686F68A368AC68A96875687468B2
-688F68776892687C686B687268AA68806871687E689B6896688B68A0688968A4
-6878687B6891688C688A687D6B366B336B376B386B916B8F6B8D6B8E6B8C6C2A
-6DC06DAB6DB46DB36E746DAC6DE96DE26DB76DF66DD46E006DC86DE06DDF6DD6
-6DBE6DE56DDC6DDD6DDB6DF46DCA6DBD6DED6DF06DBA6DD56DC26DCF6DC90000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6DD06DF26DD36DFD6DD76DCD6DE36DBB70FA710D70F7711770F4710C70F07104
-70F3711070FC70FF71067113710070F870F6710B7102710E727E727B727C727F
-731D7317730773117318730A730872FF730F731E738873F673F873F574047401
-73FD7407740073FA73FC73FF740C740B73F474087564756375CE75D275CF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075CB75CC75D175D0768F768976D37739772F772D7731773277347733773D
-7725773B7735784878527849784D784A784C782678457850796479677969796A
-7963796B796179BB79FA79F879F679F77A8F7A947A907B357B477B347B257B30
-7B227B247B337B187B2A7B1D7B317B2B7B2D7B2F7B327B387B1A7B237C947C98
-7C967CA37D357D3D7D387D367D3A7D457D2C7D297D417D477D3E7D3F7D4A7D3B
-7D287F637F957F9C7F9D7F9B7FCA7FCB7FCD7FD07FD17FC77FCF7FC9801F0000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-801E801B804780438048811881258119811B812D811F812C811E812181158127
-811D8122821182388233823A823482328274839083A383A8838D837A837383A4
-8374838F8381839583998375839483A9837D8383838C839D839B83AA838B837E
-83A583AF8388839783B0837F83A6838783AE8376839A8659865686BF86B70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000086C286C186C586BA86B086C886B986B386B886CC86B486BB86BC86C386BD
-86BE88528889889588A888A288AA889A889188A1889F889888A78899889B8897
-88A488AC888C8893888E898289D689D989D58A308A278A2C8A1E8C398C3B8C5C
-8C5D8C7D8CA58D7D8D7B8D798DBC8DC28DB98DBF8DC18ED88EDE8EDD8EDC8ED7
-8EE08EE19024900B9011901C900C902190EF90EA90F090F490F290F390D490EB
-90EC90E991569158915A9153915591EC91F491F191F391F891E491F991EA0000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-91EB91F791E891EE957A95869588967C966D966B9671966F96BF976A980498E5
-9997509B50955094509E508B50A35083508C508E509D5068509C509250825087
-515F51D45312531153A453A7559155A855A555AD5577564555A255935588558F
-55B5558155A3559255A4557D558C55A6557F559555A1558E570C582958370000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005819581E58275823582857F558485825581C581B5833583F5836582E5839
-5838582D582C583B59615AAF5A945A9F5A7A5AA25A9E5A785AA65A7C5AA55AAC
-5A955AAE5A375A845A8A5A975A835A8B5AA95A7B5A7D5A8C5A9C5A8F5A935A9D
-5BEA5BCD5BCB5BD45BD15BCA5BCE5C0C5C305D375D435D6B5D415D4B5D3F5D35
-5D515D4E5D555D335D3A5D525D3D5D315D595D425D395D495D385D3C5D325D36
-5D405D455E445E415F585FA65FA55FAB60C960B960CC60E260CE60C461140000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60F2610A6116610560F5611360F860FC60FE60C161036118611D611060FF6104
-610B624A639463B163B063CE63E563E863EF63C3649D63F363CA63E063F663D5
-63F263F5646163DF63BE63DD63DC63C463D863D363C263C763CC63CB63C863F0
-63D763D965326567656A6564655C65686565658C659D659E65AE65D065D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000667C666C667B668066716679666A66726701690C68D3690468DC692A68EC
-68EA68F1690F68D668F768EB68E468F66913691068F368E1690768CC69086970
-68B4691168EF68C6691468F868D068FD68FC68E8690B690A691768CE68C868DD
-68DE68E668F468D1690668D468E96915692568C76B396B3B6B3F6B3C6B946B97
-6B996B956BBD6BF06BF26BF36C306DFC6E466E476E1F6E496E886E3C6E3D6E45
-6E626E2B6E3F6E416E5D6E736E1C6E336E4B6E406E516E3B6E036E2E6E5E0000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E686E5C6E616E316E286E606E716E6B6E396E226E306E536E656E276E786E64
-6E776E556E796E526E666E356E366E5A7120711E712F70FB712E713171237125
-71227132711F7128713A711B724B725A7288728972867285728B7312730B7330
-73227331733373277332732D732673237335730C742E742C7430742B74160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000741A7421742D743174247423741D74297420743274FB752F756F756C75E7
-75DA75E175E675DD75DF75E475D77695769276DA774677477744774D7745774A
-774E774B774C77DE77EC786078647865785C786D7871786A786E787078697868
-785E786279747973797279707A027A0A7A037A0C7A047A997AE67AE47B4A7B3B
-7B447B487B4C7B4E7B407B587B457CA27C9E7CA87CA17D587D6F7D637D537D56
-7D677D6A7D4F7D6D7D5C7D6B7D527D547D697D517D5F7D4E7F3E7F3F7F650000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7F667FA27FA07FA17FD78051804F805080FE80D48143814A8152814F8147813D
-814D813A81E681EE81F781F881F98204823C823D823F8275833B83CF83F98423
-83C083E8841283E783E483FC83F6841083C683C883EB83E383BF840183DD83E5
-83D883FF83E183CB83CE83D683F583C98409840F83DE8411840683C283F30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000083D583FA83C783D183EA841383C383EC83EE83C483FB83D783E2841B83DB
-83FE86D886E286E686D386E386DA86EA86DD86EB86DC86EC86E986D786E886D1
-88488856885588BA88D788B988B888C088BE88B688BC88B788BD88B2890188C9
-89958998899789DD89DA89DB8A4E8A4D8A398A598A408A578A588A448A458A52
-8A488A518A4A8A4C8A4F8C5F8C818C808CBA8CBE8CB08CB98CB58D848D808D89
-8DD88DD38DCD8DC78DD68DDC8DCF8DD58DD98DC88DD78DC58EEF8EF78EFA0000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8EF98EE68EEE8EE58EF58EE78EE88EF68EEB8EF18EEC8EF48EE9902D9034902F
-9106912C910490FF90FC910890F990FB9101910091079105910391619164915F
-916291609201920A92259203921A9226920F920C9200921291FF91FD92069204
-92279202921C92249219921792059216957B958D958C95909687967E96880000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000096899683968096C296C896C396F196F0976C9770976E980798A998EB9CE6
-9EF94E834E844EB650BD50BF50C650AE50C450CA50B450C850C250B050C150BA
-50B150CB50C950B650B851D7527A5278527B527C55C355DB55CC55D055CB55CA
-55DD55C055D455C455E955BF55D2558D55CF55D555E255D655C855F255CD55D9
-55C25714585358685864584F584D5849586F5855584E585D58595865585B583D
-5863587158FC5AC75AC45ACB5ABA5AB85AB15AB55AB05ABF5AC85ABB5AC60000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5AB75AC05ACA5AB45AB65ACD5AB95A905BD65BD85BD95C1F5C335D715D635D4A
-5D655D725D6C5D5E5D685D675D625DF05E4F5E4E5E4A5E4D5E4B5EC55ECC5EC6
-5ECB5EC75F405FAF5FAD60F76149614A612B614561366132612E6146612F614F
-612961406220916862236225622463C563F163EB641064126409642064240000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064336443641F641564186439643764226423640C64266430642864416435
-642F640A641A644064256427640B63E7641B642E6421640E656F659265D36686
-668C66956690668B668A66996694667867206966695F6938694E69626971693F
-6945696A6939694269576959697A694869496935696C6933693D696568F06978
-693469696940696F69446976695869416974694C693B694B6937695C694F6951
-69326952692F697B693C6B466B456B436B426B486B416B9BFA0D6BFB6BFC0000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6BF96BF76BF86E9B6ED66EC86E8F6EC06E9F6E936E946EA06EB16EB96EC66ED2
-6EBD6EC16E9E6EC96EB76EB06ECD6EA66ECF6EB26EBE6EC36EDC6ED86E996E92
-6E8E6E8D6EA46EA16EBF6EB36ED06ECA6E976EAE6EA371477154715271637160
-7141715D716271727178716A7161714271587143714B7170715F715071530000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007144714D715A724F728D728C72917290728E733C7342733B733A7340734A
-73497444744A744B7452745174577440744F7450744E74427446744D745474E1
-74FF74FE74FD751D75797577698375EF760F760375F775FE75FC75F975F87610
-75FB75F675ED75F575FD769976B576DD7755775F776077527756775A77697767
-77547759776D77E07887789A7894788F788478957885788678A1788378797899
-78807896787B797C7982797D79797A117A187A197A127A177A157A227A130000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A1B7A107AA37AA27A9E7AEB7B667B647B6D7B747B697B727B657B737B717B70
-7B617B787B767B637CB27CB47CAF7D887D867D807D8D7D7F7D857D7A7D8E7D7B
-7D837D7C7D8C7D947D847D7D7D927F6D7F6B7F677F687F6C7FA67FA57FA77FDB
-7FDC8021816481608177815C8169815B816281726721815E81768167816F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081448161821D8249824482408242824584F1843F845684768479848F848D
-846584518440848684678430844D847D845A845984748473845D8507845E8437
-843A8434847A8443847884328445842983D9844B842F8442842D845F84708439
-844E844C8452846F84C5848E843B8447843684338468847E8444842B84608454
-846E8450870B870486F7870C86FA86D686F5874D86F8870E8709870186F6870D
-870588D688CB88CD88CE88DE88DB88DA88CC88D08985899B89DF89E589E40000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89E189E089E289DC89E68A768A868A7F8A618A3F8A778A828A848A758A838A81
-8A748A7A8C3C8C4B8C4A8C658C648C668C868C848C858CCC8D688D698D918D8C
-8D8E8D8F8D8D8D938D948D908D928DF08DE08DEC8DF18DEE8DD08DE98DE38DE2
-8DE78DF28DEB8DF48F068EFF8F018F008F058F078F088F028F0B9052903F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090449049903D9110910D910F911191169114910B910E916E916F92489252
-9230923A926692339265925E9283922E924A9246926D926C924F92609267926F
-92369261927092319254926392509272924E9253924C92569232959F959C959E
-959B969296939691969796CE96FA96FD96F896F59773977797789772980F980D
-980E98AC98F698F999AF99B299B099B59AAD9AAB9B5B9CEA9CED9CE79E809EFD
-50E650D450D750E850F350DB50EA50DD50E450D350EC50F050EF50E350E00000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51D85280528152E952EB533053AC56275615560C561255FC560F561C56015613
-560255FA561D560455FF55F95889587C5890589858865881587F5874588B587A
-58875891588E587658825888587B5894588F58FE596B5ADC5AEE5AE55AD55AEA
-5ADA5AED5AEB5AF35AE25AE05ADB5AEC5ADE5ADD5AD95AE85ADF5B775BE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005BE35C635D825D805D7D5D865D7A5D815D775D8A5D895D885D7E5D7C5D8D
-5D795D7F5E585E595E535ED85ED15ED75ECE5EDC5ED55ED95ED25ED45F445F43
-5F6F5FB6612C61286141615E61716173615261536172616C618061746154617A
-615B6165613B616A6161615662296227622B642B644D645B645D647464766472
-6473647D6475646664A6644E6482645E645C644B645364606450647F643F646C
-646B645964656477657365A066A166A0669F67056704672269B169B669C90000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69A069CE699669B069AC69BC69916999698E69A7698D69A969BE69AF69BF69C4
-69BD69A469D469B969CA699A69CF69B3699369AA69A1699E69D96997699069C2
-69B569A569C66B4A6B4D6B4B6B9E6B9F6BA06BC36BC46BFE6ECE6EF56EF16F03
-6F256EF86F376EFB6F2E6F096F4E6F196F1A6F276F186F3B6F126EED6F0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F366F736EF96EEE6F2D6F406F306F3C6F356EEB6F076F0E6F436F056EFD
-6EF66F396F1C6EFC6F3A6F1F6F0D6F1E6F086F21718771907189718071857182
-718F717B718671817197724472537297729572937343734D7351734C74627473
-7471747574727467746E750075027503757D759076167608760C76157611760A
-761476B87781777C77857782776E7780776F777E778378B278AA78B478AD78A8
-787E78AB789E78A578A078AC78A278A47998798A798B79967995799479930000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-79977988799279907A2B7A4A7A307A2F7A287A267AA87AAB7AAC7AEE7B887B9C
-7B8A7B917B907B967B8D7B8C7B9B7B8E7B857B9852847B997BA47B827CBB7CBF
-7CBC7CBA7DA77DB77DC27DA37DAA7DC17DC07DC57D9D7DCE7DC47DC67DCB7DCC
-7DAF7DB97D967DBC7D9F7DA67DAE7DA97DA17DC97F737FE27FE37FE57FDE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008024805D805C8189818681838187818D818C818B8215849784A484A1849F
-84BA84CE84C284AC84AE84AB84B984B484C184CD84AA849A84B184D0849D84A7
-84BB84A2849484C784CC849B84A984AF84A884D6849884B684CF84A084D784D4
-84D284DB84B084918661873387238728876B8740872E871E87218719871B8743
-872C8741873E874687208732872A872D873C8712873A87318735874287268727
-87388724871A8730871188F788E788F188F288FA88FE88EE88FC88F688FB0000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-88F088EC88EB899D89A1899F899E89E989EB89E88AAB8A998A8B8A928A8F8A96
-8C3D8C688C698CD58CCF8CD78D968E098E028DFF8E0D8DFD8E0A8E038E078E06
-8E058DFE8E008E048F108F118F0E8F0D9123911C91209122911F911D911A9124
-9121911B917A91729179917392A592A49276929B927A92A0929492AA928D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000092A6929A92AB92799297927F92A392EE928E9282929592A2927D928892A1
-928A9286928C929992A7927E928792A9929D928B922D969E96A196FF9758977D
-977A977E978397809782977B97849781977F97CE97CD981698AD98AE99029900
-9907999D999C99C399B999BB99BA99C299BD99C79AB19AE39AE79B3E9B3F9B60
-9B619B5F9CF19CF29CF59EA750FF5103513050F85106510750F650FE510B510C
-50FD510A528B528C52F152EF56485642564C56355641564A5649564656580000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-565A56405633563D562C563E5638562A563A571A58AB589D58B158A058A358AF
-58AC58A558A158FF5AFF5AF45AFD5AF75AF65B035AF85B025AF95B015B075B05
-5B0F5C675D995D975D9F5D925DA25D935D955DA05D9C5DA15D9A5D9E5E695E5D
-5E605E5C7DF35EDB5EDE5EE15F495FB2618B6183617961B161B061A261890000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000619B619361AF61AD619F619261AA61A1618D616661B3622D646E64706496
-64A064856497649C648F648B648A648C64A3649F646864B164986576657A6579
-657B65B265B366B566B066A966B266B766AA66AF6A006A066A1769E569F86A15
-69F169E46A2069FF69EC69E26A1B6A1D69FE6A2769F269EE6A1469F769E76A40
-6A0869E669FB6A0D69FC69EB6A096A046A186A256A0F69F66A266A0769F46A16
-6B516BA56BA36BA26BA66C016C006BFF6C026F416F266F7E6F876FC66F920000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F8D6F896F8C6F626F4F6F856F5A6F966F766F6C6F826F556F726F526F506F57
-6F946F936F5D6F006F616F6B6F7D6F676F906F536F8B6F696F7F6F956F636F77
-6F6A6F7B71B271AF719B71B071A0719A71A971B5719D71A5719E71A471A171AA
-719C71A771B37298729A73587352735E735F7360735D735B7361735A73590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000736274877489748A74867481747D74857488747C747975087507757E7625
-761E7619761D761C7623761A7628761B769C769D769E769B778D778F77897788
-78CD78BB78CF78CC78D178CE78D478C878C378C478C9799A79A179A0799C79A2
-799B6B767A397AB27AB47AB37BB77BCB7BBE7BAC7BCE7BAF7BB97BCA7BB57CC5
-7CC87CCC7CCB7DF77DDB7DEA7DE77DD77DE17E037DFA7DE67DF67DF17DF07DEE
-7DDF7F767FAC7FB07FAD7FED7FEB7FEA7FEC7FE67FE88064806781A3819F0000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-819E819581A2819981978216824F825382528250824E82518524853B850F8500
-8529850E8509850D851F850A8527851C84FB852B84FA8508850C84F4852A84F2
-851584F784EB84F384FC851284EA84E9851684FE8528851D852E850284FD851E
-84F68531852684E784E884F084EF84F9851885208530850B8519852F86620000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000875687638764877787E1877387588754875B87528761875A8751875E876D
-876A8750874E875F875D876F876C877A876E875C8765874F877B877587628767
-8769885A8905890C8914890B891789188919890689168911890E890989A289A4
-89A389ED89F089EC8ACF8AC68AB88AD38AD18AD48AD58ABB8AD78ABE8AC08AC5
-8AD88AC38ABA8ABD8AD98C3E8C4D8C8F8CE58CDF8CD98CE88CDA8CDD8CE78DA0
-8D9C8DA18D9B8E208E238E258E248E2E8E158E1B8E168E118E198E268E270000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E148E128E188E138E1C8E178E1A8F2C8F248F188F1A8F208F238F168F179073
-9070906F9067906B912F912B9129912A91329126912E91859186918A91819182
-9184918092D092C392C492C092D992B692CF92F192DF92D892E992D792DD92CC
-92EF92C292E892CA92C892CE92E692CD92D592C992E092DE92E792D192D30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000092B592E192C692B4957C95AC95AB95AE95B096A496A296D3970597089702
-975A978A978E978897D097CF981E981D9826982998289820981B982798B29908
-98FA9911991499169917991599DC99CD99CF99D399D499CE99C999D699D899CB
-99D799CC9AB39AEC9AEB9AF39AF29AF19B469B439B679B749B719B669B769B75
-9B709B689B649B6C9CFC9CFA9CFD9CFF9CF79D079D009CF99CFB9D089D059D04
-9E839ED39F0F9F10511C51135117511A511151DE533453E156705660566E0000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-567356665663566D5672565E5677571C571B58C858BD58C958BF58BA58C258BC
-58C65B175B195B1B5B215B145B135B105B165B285B1A5B205B1E5BEF5DAC5DB1
-5DA95DA75DB55DB05DAE5DAA5DA85DB25DAD5DAF5DB45E675E685E665E6F5EE9
-5EE75EE65EE85EE55F4B5FBC619D61A8619661C561B461C661C161CC61BA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000061BF61B8618C64D764D664D064CF64C964BD648964C364DB64F364D96533
-657F657C65A266C866BE66C066CA66CB66CF66BD66BB66BA66CC67236A346A66
-6A496A676A326A686A3E6A5D6A6D6A766A5B6A516A286A5A6A3B6A3F6A416A6A
-6A646A506A4F6A546A6F6A696A606A3C6A5E6A566A556A4D6A4E6A466B556B54
-6B566BA76BAA6BAB6BC86BC76C046C036C066FAD6FCB6FA36FC76FBC6FCE6FC8
-6F5E6FC46FBD6F9E6FCA6FA870046FA56FAE6FBA6FAC6FAA6FCF6FBF6FB80000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6FA26FC96FAB6FCD6FAF6FB26FB071C571C271BF71B871D671C071C171CB71D4
-71CA71C771CF71BD71D871BC71C671DA71DB729D729E736973667367736C7365
-736B736A747F749A74A074947492749574A1750B7580762F762D7631763D7633
-763C76357632763076BB76E6779A779D77A1779C779B77A277A3779577990000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000779778DD78E978E578EA78DE78E378DB78E178E278ED78DF78E079A47A44
-7A487A477AB67AB87AB57AB17AB77BDE7BE37BE77BDD7BD57BE57BDA7BE87BF9
-7BD47BEA7BE27BDC7BEB7BD87BDF7CD27CD47CD77CD07CD17E127E217E177E0C
-7E1F7E207E137E0E7E1C7E157E1A7E227E0B7E0F7E167E0D7E147E257E247F43
-7F7B7F7C7F7A7FB17FEF802A8029806C81B181A681AE81B981B581AB81B081AC
-81B481B281B781A781F282558256825785568545856B854D8553856185580000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-854085468564854185628544855185478563853E855B8571854E856E85758555
-85678560858C8566855D85548565856C866386658664879B878F879787938792
-87888781879687988779878787A3878587908791879D87848794879C879A8789
-891E89268930892D892E89278931892289298923892F892C891F89F18AE00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AE28AF28AF48AF58ADD8B148AE48ADF8AF08AC88ADE8AE18AE88AFF8AEF
-8AFB8C918C928C908CF58CEE8CF18CF08CF38D6C8D6E8DA58DA78E338E3E8E38
-8E408E458E368E3C8E3D8E418E308E3F8EBD8F368F2E8F358F328F398F378F34
-90769079907B908690FA913391359136919391909191918D918F9327931E9308
-931F9306930F937A9338933C931B9323931293019346932D930E930D92CB931D
-92FA9325931392F992F793349302932492FF932993399335932A9314930C0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-930B92FE9309930092FB931695BC95CD95BE95B995BA95B695BF95B595BD96A9
-96D4970B9712971097999797979497F097F89835982F98329924991F99279929
-999E99EE99EC99E599E499F099E399EA99E999E79AB99ABF9AB49ABB9AF69AFA
-9AF99AF79B339B809B859B879B7C9B7E9B7B9B829B939B929B909B7A9B950000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B7D9B889D259D179D209D1E9D149D299D1D9D189D229D109D199D1F9E88
-9E869E879EAE9EAD9ED59ED69EFA9F129F3D51265125512251245120512952F4
-5693568C568D568656845683567E5682567F568158D658D458CF58D25B2D5B25
-5B325B235B2C5B275B265B2F5B2E5B7B5BF15BF25DB75E6C5E6A5FBE5FBB61C3
-61B561BC61E761E061E561E461E861DE64EF64E964E364EB64E464E865816580
-65B665DA66D26A8D6A966A816AA56A896A9F6A9B6AA16A9E6A876A936A8E0000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A956A836AA86AA46A916A7F6AA66A9A6A856A8C6A926B5B6BAD6C096FCC6FA9
-6FF46FD46FE36FDC6FED6FE76FE66FDE6FF26FDD6FE26FE871E171F171E871F2
-71E471F071E27373736E736F749774B274AB749074AA74AD74B174A574AF7510
-75117512750F7584764376487649764776A476E977B577AB77B277B777B60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077B477B177A877F078F378FD790278FB78FC78F2790578F978FE790479AB
-79A87A5C7A5B7A567A587A547A5A7ABE7AC07AC17C057C0F7BF27C007BFF7BFB
-7C0E7BF47C0B7BF37C027C097C037C017BF87BFD7C067BF07BF17C107C0A7CE8
-7E2D7E3C7E427E3398487E387E2A7E497E407E477E297E4C7E307E3B7E367E44
-7E3A7F457F7F7F7E7F7D7FF47FF2802C81BB81C481CC81CA81C581C781BC81E9
-825B825A825C85838580858F85A7859585A0858B85A3857B85A4859A859E0000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8577857C858985A1857A85788557858E85968586858D8599859D858185A28582
-858885858579857685988590859F866887BE87AA87AD87C587B087AC87B987B5
-87BC87AE87C987C387C287CC87B787AF87C487CA87B487B687BF87B887BD87DE
-87B289358933893C893E894189528937894289AD89AF89AE89F289F38B1E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B188B168B118B058B0B8B228B0F8B128B158B078B0D8B088B068B1C8B13
-8B1A8C4F8C708C728C718C6F8C958C948CF98D6F8E4E8E4D8E538E508E4C8E47
-8F438F409085907E9138919A91A2919B9199919F91A1919D91A093A1938393AF
-936493569347937C9358935C93769349935093519360936D938F934C936A9379
-935793559352934F93719377937B9361935E936393679380934E935995C795C0
-95C995C395C595B796AE96B096AC9720971F9718971D9719979A97A1979C0000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-979E979D97D597D497F198419844984A9849984598439925992B992C992A9933
-9932992F992D99319930999899A399A19A0299FA99F499F799F999F899F699FB
-99FD99FE99FC9A039ABE9AFE9AFD9B019AFC9B489B9A9BA89B9E9B9B9BA69BA1
-9BA59BA49B869BA29BA09BAF9D339D419D679D369D2E9D2F9D319D389D300000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D459D429D439D3E9D379D409D3D7FF59D2D9E8A9E899E8D9EB09EC89EDA
-9EFB9EFF9F249F239F229F549FA05131512D512E5698569C5697569A569D5699
-59705B3C5C695C6A5DC05E6D5E6E61D861DF61ED61EE61F161EA61F061EB61D6
-61E964FF650464FD64F86501650364FC659465DB66DA66DB66D86AC56AB96ABD
-6AE16AC66ABA6AB66AB76AC76AB46AAD6B5E6BC96C0B7007700C700D70017005
-7014700E6FFF70006FFB70266FFC6FF7700A720171FF71F9720371FD73760000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74B874C074B574C174BE74B674BB74C275147513765C76647659765076537657
-765A76A676BD76EC77C277BA78FF790C79137914790979107912791179AD79AC
-7A5F7C1C7C297C197C207C1F7C2D7C1D7C267C287C227C257C307E5C7E507E56
-7E637E587E627E5F7E517E607E577E537FB57FB37FF77FF8807581D181D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081D0825F825E85B485C685C085C385C285B385B585BD85C785C485BF85CB
-85CE85C885C585B185B685D2862485B885B785BE866987E787E687E287DB87EB
-87EA87E587DF87F387E487D487DC87D387ED87D887E387A487D787D9880187F4
-87E887DD8953894B894F894C89468950895189498B2A8B278B238B338B308B35
-8B478B2F8B3C8B3E8B318B258B378B268B368B2E8B248B3B8B3D8B3A8C428C75
-8C998C988C978CFE8D048D028D008E5C8E628E608E578E568E5E8E658E670000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E5B8E5A8E618E5D8E698E548F468F478F488F4B9128913A913B913E91A891A5
-91A791AF91AA93B5938C939293B7939B939D938993A7938E93AA939E93A69395
-93889399939F938D93B1939193B293A493A893B493A393A595D295D395D196B3
-96D796DA5DC296DF96D896DD97239722972597AC97AE97A897AB97A497AA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000097A297A597D797D997D697D897FA98509851985298B89941993C993A9A0F
-9A0B9A099A0D9A049A119A0A9A059A079A069AC09ADC9B089B049B059B299B35
-9B4A9B4C9B4B9BC79BC69BC39BBF9BC19BB59BB89BD39BB69BC49BB99BBD9D5C
-9D539D4F9D4A9D5B9D4B9D599D569D4C9D579D529D549D5F9D589D5A9E8E9E8C
-9EDF9F019F009F169F259F2B9F2A9F299F289F4C9F5551345135529652F753B4
-56AB56AD56A656A756AA56AC58DA58DD58DB59125B3D5B3E5B3F5DC35E700000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5FBF61FB65076510650D6509650C650E658465DE65DD66DE6AE76AE06ACC6AD1
-6AD96ACB6ADF6ADC6AD06AEB6ACF6ACD6ADE6B606BB06C0C7019702770207016
-702B702170227023702970177024701C702A720C720A72077202720572A572A6
-72A472A372A174CB74C574B774C37516766077C977CA77C477F1791D791B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007921791C7917791E79B07A677A687C337C3C7C397C2C7C3B7CEC7CEA7E76
-7E757E787E707E777E6F7E7A7E727E747E687F4B7F4A7F837F867FB77FFD7FFE
-807881D781D582648261826385EB85F185ED85D985E185E885DA85D785EC85F2
-85F885D885DF85E385DC85D185F085E685EF85DE85E2880087FA880387F687F7
-8809880C880B880687FC880887FF880A88028962895A895B89578961895C8958
-895D8959898889B789B689F68B508B488B4A8B408B538B568B548B4B8B550000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B518B428B528B578C438C778C768C9A8D068D078D098DAC8DAA8DAD8DAB8E6D
-8E788E738E6A8E6F8E7B8EC28F528F518F4F8F508F538FB49140913F91B091AD
-93DE93C793CF93C293DA93D093F993EC93CC93D993A993E693CA93D493EE93E3
-93D593C493CE93C093D293E7957D95DA95DB96E19729972B972C972897260000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000097B397B797B697DD97DE97DF985C9859985D985798BF98BD98BB98BE9948
-9947994399A699A79A1A9A159A259A1D9A249A1B9A229A209A279A239A1E9A1C
-9A149AC29B0B9B0A9B0E9B0C9B379BEA9BEB9BE09BDE9BE49BE69BE29BF09BD4
-9BD79BEC9BDC9BD99BE59BD59BE19BDA9D779D819D8A9D849D889D719D809D78
-9D869D8B9D8C9D7D9D6B9D749D759D709D699D859D739D7B9D829D6F9D799D7F
-9D879D689E949E919EC09EFC9F2D9F409F419F4D9F569F579F58533756B20000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56B556B358E35B455DC65DC75EEE5EEF5FC05FC161F9651765166515651365DF
-66E866E366E46AF36AF06AEA6AE86AF96AF16AEE6AEF703C7035702F70377034
-703170427038703F703A70397040703B703370417213721472A8737D737C74BA
-76AB76AA76BE76ED77CC77CE77CF77CD77F27925792379277928792479290000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079B27A6E7A6C7A6D7AF77C497C487C4A7C477C457CEE7E7B7E7E7E817E80
-7FBA7FFF807981DB81D9820B82688269862285FF860185FE861B860085F68604
-86098605860C85FD8819881088118817881388168963896689B989F78B608B6A
-8B5D8B688B638B658B678B6D8DAE8E868E888E848F598F568F578F558F588F5A
-908D9143914191B791B591B291B3940B941393FB9420940F941493FE94159410
-94289419940D93F5940093F79407940E9416941293FA940993F8940A93FF0000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93FC940C93F69411940695DE95E095DF972E972F97B997BB97FD97FE98609862
-9863985F98C198C29950994E9959994C994B99539A329A349A319A2C9A2A9A36
-9A299A2E9A389A2D9AC79ACA9AC69B109B129B119C0B9C089BF79C059C129BF8
-9C409C079C0E9C069C179C149C099D9F9D999DA49D9D9D929D989D909D9B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009DA09D949D9C9DAA9D979DA19D9A9DA29DA89D9E9DA39DBF9DA99D969DA6
-9DA79E999E9B9E9A9EE59EE49EE79EE69F309F2E9F5B9F609F5E9F5D9F599F91
-513A51395298529756C356BD56BE5B485B475DCB5DCF5EF161FD651B6B026AFC
-6B036AF86B0070437044704A7048704970457046721D721A7219737E7517766A
-77D0792D7931792F7C547C537CF27E8A7E877E887E8B7E867E8D7F4D7FBB8030
-81DD8618862A8626861F8623861C86198627862E862186208629861E86250000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8829881D881B88208824881C882B884A896D8969896E896B89FA8B798B788B45
-8B7A8B7B8D108D148DAF8E8E8E8C8F5E8F5B8F5D91469144914591B9943F943B
-94369429943D943C94309439942A9437942C9440943195E595E495E39735973A
-97BF97E1986498C998C698C0995899569A399A3D9A469A449A429A419A3A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009A3F9ACD9B159B179B189B169B3A9B529C2B9C1D9C1C9C2C9C239C289C29
-9C249C219DB79DB69DBC9DC19DC79DCA9DCF9DBE9DC59DC39DBB9DB59DCE9DB9
-9DBA9DAC9DC89DB19DAD9DCC9DB39DCD9DB29E7A9E9C9EEB9EEE9EED9F1B9F18
-9F1A9F319F4E9F659F649F924EB956C656C556CB59715B4B5B4C5DD55DD15EF2
-65216520652665226B0B6B086B096C0D7055705670577052721E721F72A9737F
-74D874D574D974D7766D76AD793579B47A707A717C577C5C7C597C5B7C5A0000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7CF47CF17E917F4F7F8781DE826B863486358633862C86328636882C88288826
-882A8825897189BF89BE89FB8B7E8B848B828B868B858B7F8D158E958E948E9A
-8E928E908E968E978F608F629147944C9450944A944B944F9447944594489449
-9446973F97E3986A986998CB9954995B9A4E9A539A549A4C9A4F9A489A4A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009A499A529A509AD09B199B2B9B3B9B569B559C469C489C3F9C449C399C33
-9C419C3C9C379C349C329C3D9C369DDB9DD29DDE9DDA9DCB9DD09DDC9DD19DDF
-9DE99DD99DD89DD69DF59DD59DDD9EB69EF09F359F339F329F429F6B9F959FA2
-513D529958E858E759725B4D5DD8882F5F4F62016203620465296525659666EB
-6B116B126B0F6BCA705B705A7222738273817383767077D47C677C667E95826C
-863A86408639863C8631863B863E88308832882E883389768974897389FE0000
-F8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8B8C8B8E8B8B8B888C458D198E988F648F6391BC94629455945D9457945E97C4
-97C598009A569A599B1E9B1F9B209C529C589C509C4A9C4D9C4B9C559C599C4C
-9C4E9DFB9DF79DEF9DE39DEB9DF89DE49DF69DE19DEE9DE69DF29DF09DE29DEC
-9DF49DF39DE89DED9EC29ED09EF29EF39F069F1C9F389F379F369F439F4F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009F719F709F6E9F6F56D356CD5B4E5C6D652D66ED66EE6B13705F7061705D
-7060722374DB74E577D5793879B779B67C6A7E977F89826D8643883888378835
-884B8B948B958E9E8E9F8EA08E9D91BE91BD91C2946B9468946996E597469743
-974797C797E59A5E9AD59B599C639C679C669C629C5E9C609E029DFE9E079E03
-9E069E059E009E019E099DFF9DFD9E049EA09F1E9F469F749F759F7656D4652E
-65B86B186B196B176B1A7062722672AA77D877D979397C697C6B7CF67E9A0000
-F9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E987E9B7E9981E081E18646864786488979897A897C897B89FF8B988B998EA5
-8EA48EA3946E946D946F9471947397499872995F9C689C6E9C6D9E0B9E0D9E10
-9E0F9E129E119EA19EF59F099F479F789F7B9F7A9F79571E70667C6F883C8DB2
-8EA691C394749478947694759A609C749C739C719C759E149E139EF69F0A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009FA4706870657CF7866A883E883D883F8B9E8C9C8EA98EC9974B98739874
-98CC996199AB9A649A669A679B249E159E179F4862076B1E7227864C8EA89482
-948094819A699A689B2E9E197229864B8B9F94839C799EB776759A6B9C7A9E1D
-7069706A9EA49F7E9F499F98788192B988CF58BB60527CA75AFA255425662557
-2560256C2563255A2569255D255225642555255E256A256125582567255B2553
-25652556255F256B256225592568255C25512550256D256E2570256F25930000
diff --git a/library/encoding/dingbats.enc b/library/encoding/dingbats.enc
deleted file mode 100644
index 9729487..0000000
--- a/library/encoding/dingbats.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: dingbats, single-byte
-S
-003F 1 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-00202701270227032704260E2706270727082709261B261E270C270D270E270F
-2710271127122713271427152716271727182719271A271B271C271D271E271F
-2720272127222723272427252726272726052729272A272B272C272D272E272F
-2730273127322733273427352736273727382739273A273B273C273D273E273F
-2740274127422743274427452746274727482749274A274B25CF274D25A0274F
-27502751275225B225BC25C6275625D727582759275A275B275C275D275E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000276127622763276427652766276726632666266526602460246124622463
-2464246524662467246824692776277727782779277A277B277C277D277E277F
-2780278127822783278427852786278727882789278A278B278C278D278E278F
-2790279127922793279421922194219527982799279A279B279C279D279E279F
-27A027A127A227A327A427A527A627A727A827A927AA27AB27AC27AD27AE27AF
-000027B127B227B327B427B527B627B727B827B927BA27BB27BC27BD27BE0000
diff --git a/library/encoding/euc-cn.enc b/library/encoding/euc-cn.enc
deleted file mode 100644
index 4b2f8c7..0000000
--- a/library/encoding/euc-cn.enc
+++ /dev/null
@@ -1,1397 +0,0 @@
-# Encoding file: euc-cn, multi-byte
-M
-003F 0 82
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300230FB02C902C700A8300330052015FF5E2225202620182019
-201C201D3014301530083009300A300B300C300D300E300F3016301730103011
-00B100D700F72236222722282211220F222A222922082237221A22A522252220
-23122299222B222E2261224C2248223D221D2260226E226F22642265221E2235
-22342642264000B0203220332103FF0400A4FFE0FFE1203000A7211626062605
-25CB25CF25CE25C725C625A125A025B325B2203B219221902191219330130000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000024882489248A248B248C248D248E248F2490249124922493249424952496
-249724982499249A249B247424752476247724782479247A247B247C247D247E
-247F248024812482248324842485248624872460246124622463246424652466
-2467246824690000000032203221322232233224322532263227322832290000
-00002160216121622163216421652166216721682169216A216B000000000000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FFE5FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFF3CFF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000010100E101CE00E0011300E9011B00E8012B00ED01D000EC014D00F301D2
-00F2016B00FA01D400F901D601D801DA01DC00FC00EA00000000000000000000
-0000000000000000000031053106310731083109310A310B310C310D310E310F
-3110311131123113311431153116311731183119311A311B311C311D311E311F
-3120312131223123312431253126312731283129000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000002500250125022503250425052506250725082509250A250B
-250C250D250E250F2510251125122513251425152516251725182519251A251B
-251C251D251E251F2520252125222523252425252526252725282529252A252B
-252C252D252E252F2530253125322533253425352536253725382539253A253B
-253C253D253E253F2540254125422543254425452546254725482549254A254B
-0000000000000000000000000000000000000000000000000000000000000000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000554A963F57C3632854CE550954C07691764C853C77EE827E788D72319698
-978D6C285B894FFA630966975CB880FA684880AE660276CE51F9655671AC7FF1
-888450B2596561CA6FB382AD634C625253ED54277B06516B75A45DF462D48DCB
-9776628A8019575D97387F627238767D67CF767E64464F708D2562DC7A176591
-73ED642C6273822C9881677F7248626E62CC4F3474E3534A529E7ECA90A65E2E
-6886699C81807ED168D278C5868C9551508D8C2482DE80DE5305891252650000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000858496F94FDD582199715B9D62B162A566B48C799C8D7206676F789160B2
-535153178F8880CC8D1D94A1500D72C8590760EB711988AB595482EF672C7B28
-5D297EF7752D6CF58E668FF8903C9F3B6BD491197B145F7C78A784D6853D6BD5
-6BD96BD65E015E8775F995ED655D5F0A5FC58F9F58C181C2907F965B97AD8FB9
-7F168D2C62414FBF53D8535E8FA88FA98FAB904D68075F6A819888689CD6618B
-522B762A5F6C658C6FD26EE85BBE6448517551B067C44E1979C9997C70B30000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075C55E7673BB83E064AD62E894B56CE2535A52C3640F94C27B944F2F5E1B
-82368116818A6E246CCA9A736355535C54FA886557E04E0D5E036B657C3F90E8
-601664E6731C88C16750624D8D22776C8E2991C75F6983DC8521991053C28695
-6B8B60ED60E8707F82CD82314ED36CA785CF64CD7CD969FD66F9834953957B56
-4FA7518C6D4B5C428E6D63D253C9832C833667E578B4643D5BDF5C945DEE8BE7
-62C667F48C7A640063BA8749998B8C177F2094F24EA7961098A4660C73160000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000573A5C1D5E38957F507F80A05382655E7545553150218D856284949E671D
-56326F6E5DE2543570928F66626F64A463A35F7B6F8890F481E38FB05C186668
-5FF16C8996488D81886C649179F057CE6A59621054484E587A0B60E96F848BDA
-627F901E9A8B79E4540375F4630153196C608FDF5F1B9A70803B9F7F4F885C3A
-8D647FC565A570BD514551B2866B5D075BA062BD916C75748E0C7A2061017B79
-4EC77EF877854E1181ED521D51FA6A7153A88E87950496CF6EC19664695A0000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000784050A877D7641089E6590463E35DDD7A7F693D4F20823955984E3275AE
-7A975E625E8A95EF521B5439708A6376952457826625693F918755076DF37EAF
-882262337EF075B5832878C196CC8F9E614874F78BCD6B64523A8D506B21806A
-847156F153064ECE4E1B51D17C97918B7C074FC38E7F7BE17A9C64675D1450AC
-810676017CB96DEC7FE067515B585BF878CB64AE641363AA632B9519642D8FBE
-7B5476296253592754466B7950A362345E266B864EE38D37888B5F85902E0000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006020803D62C54E39535590F863B880C665E66C2E4F4660EE6DE18BDE5F39
-86CB5F536321515A83616863520063638E4850125C9B79775BFC52307A3B60BC
-905376D75FB75F9776848E6C706F767B7B4977AA51F3909358244F4E6EF48FEA
-654C7B1B72C46DA47FDF5AE162B55E95573084827B2C5E1D5F1F90127F1498A0
-63826EC7789870B95178975B57AB75354F4375385E9760E659606DC06BBF7889
-53FC96D551CB52016389540A94938C038DCC7239789F87768FED8C0D53E00000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E0176EF53EE948998769F0E952D5B9A8BA24E224E1C51AC846361C252A8
-680B4F97606B51BB6D1E515C6296659796618C46901775D890FD77636BD2728A
-72EC8BFB583577798D4C675C9540809A5EA66E2159927AEF77ED953B6BB565AD
-7F0E58065151961F5BF958A954288E726566987F56E4949D76FE9041638754C6
-591A593A579B8EB267358DFA8235524160F0581586FE5CE89E454FC4989D8BB9
-5A2560765384627C904F9102997F6069800C513F80335C1499756D314E8C0000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008D3053D17F5A7B4F4F104E4F96006CD573D085E95E06756A7FFB6A0A77FE
-94927E4151E170E653CD8FD483038D2972AF996D6CDB574A82B365B980AA623F
-963259A84EFF8BBF7EBA653E83F2975E556198DE80A5532A8BFD542080BA5E9F
-6CB88D3982AC915A54296C1B52067EB7575F711A6C7E7C89594B4EFD5FFF6124
-7CAA4E305C0167AB87025CF0950B98CE75AF70FD902251AF7F1D8BBD594951E4
-4F5B5426592B657780A45B75627662C28F905E456C1F7B264F0F4FD8670D0000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D6E6DAA798F88B15F17752B629A8F854FEF91DC65A7812F81515E9C8150
-8D74526F89868D4B590D50854ED8961C723681798D1F5BCC8BA3964459877F1A
-54905676560E8BE565396982949976D66E895E727518674667D17AFF809D8D76
-611F79C665628D635188521A94A27F38809B7EB25C976E2F67607BD9768B9AD8
-818F7F947CD5641E95507A3F544A54E56B4C640162089E3D80F3759952729769
-845B683C86E49601969494EC4E2A54047ED968398DDF801566F45E9A7FB90000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000057C2803F68975DE5653B529F606D9F9A4F9B8EAC516C5BAB5F135DE96C5E
-62F18D21517194A952FE6C9F82DF72D757A267848D2D591F8F9C83C754957B8D
-4F306CBD5B6459D19F1353E486CA9AA88C3780A16545987E56FA96C7522E74DC
-52505BE1630289024E5662D0602A68FA51735B9851A089C27BA199867F5060EF
-704C8D2F51495E7F901B747089C4572D78455F529F9F95FA8F689B3C8BE17678
-684267DC8DEA8D35523D8F8A6EDA68CD950590ED56FD679C88F98FC754C80000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009AB85B696D776C264EA55BB39A87916361A890AF97E9542B6DB55BD251FD
-558A7F557FF064BC634D65F161BE608D710A6C576C49592F676D822A58D5568E
-8C6A6BEB90DD597D801753F76D695475559D837783CF683879BE548C4F555408
-76D28C8996026CB36DB88D6B89109E648D3A563F9ED175D55F8872E0606854FC
-4EA86A2A886160528F7054C470D886799E3F6D2A5B8F5F187EA255894FAF7334
-543C539A5019540E547C4E4E5FFD745A58F6846B80E1877472D07CCA6E560000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F27864E552C62A44E926CAA623782B154D7534E733E6ED1753B52125316
-8BDD69D05F8A60006DEE574F6B2273AF68538FD87F13636260A3552475EA8C62
-71156DA35BA65E7B8352614C9EC478FA87577C27768751F060F6714C66435E4C
-604D8C0E707063258F895FBD606286D456DE6BC160946167534960E066668D3F
-79FD4F1A70E96C478BB38BF27ED88364660F5A5A9B426D516DF78C416D3B4F19
-706B83B7621660D1970D8D27797851FB573E57FA673A75787A3D79EF7B950000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000808C99658FF96FC08BA59E2159EC7EE97F095409678168D88F917C4D96C6
-53CA602575BE6C7253735AC97EA7632451E0810A5DF184DF628051805B634F0E
-796D524260B86D4E5BC45BC28BA18BB065E25FCC964559937EE77EAA560967B7
-59394F735BB652A0835A988A8D3E753294BE50477A3C4EF767B69A7E5AC16B7C
-76D1575A5C167B3A95F4714E517C80A9827059787F04832768C067EC78B17877
-62E363617B804FED526A51CF835069DB92748DF58D3189C1952E7BAD4EF60000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000506582305251996F6E106E856DA75EFA50F559DC5C066D466C5F7586848B
-686859568BB253209171964D854969127901712680F64EA490CA6D479A845A07
-56BC640594F077EB4FA5811A72E189D2997A7F347EDE527F655991758F7F8F83
-53EB7A9663ED63A5768679F888579636622A52AB8282685467706377776B7AED
-6D017ED389E359D0621285C982A5754C501F4ECB75A58BEB5C4A5DFE7B4B65A4
-91D14ECA6D25895F7D2795264EC58C288FDB9773664B79818FD170EC6D780000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C3D52B283465162830E775B66769CB84EAC60CA7CBE7CB37ECF4E958B66
-666F988897595883656C955C5F8475C997567ADF7ADE51C070AF7A9863EA7A76
-7EA0739697ED4E4570784E5D915253A9655165E781FC8205548E5C31759A97A0
-62D872D975BD5C459A7983CA5C40548077E94E3E6CAE805A62D2636E5DE85177
-8DDD8E1E952F4FF153E560E770AC526763509E435A1F5026773753777EE26485
-652B628963985014723589C951B38BC07EDD574783CC94A7519B541B5CFB0000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004FCA7AE36D5A90E19A8F55805496536154AF5F0063E9697751EF6168520A
-582A52D8574E780D770B5EB761777CE0625B62974EA27095800362F770E49760
-577782DB67EF68F578D5989779D158F354B353EF6E34514B523B5BA28BFE80AF
-554357A660735751542D7A7A60505B5463A762A053E362635BC767AF54ED7A9F
-82E691775E9388E4593857AE630E8DE880EF57577B774FA95FEB5BBD6B3E5321
-7B5072C2684677FF773665F751B54E8F76D45CBF7AA58475594E9B4150800000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000998861276E8357646606634656F062EC62695ED39614578362C955878721
-814A8FA3556683B167658D5684DD5A6A680F62E67BEE961151706F9C8C3063FD
-89C861D27F0670C26EE57405699472FC5ECA90CE67176D6A635E52B372628001
-4F6C59E5916A70D96D9D52D24E5096F7956D857E78CA7D2F5121579264C2808B
-7C7B6CEA68F1695E51B7539868A872819ECE7BF172F879BB6F137406674E91CC
-9CA4793C83898354540F68174E3D538952B1783E5386522950884F8B4FD00000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075E27ACB7C926CA596B6529B748354E94FE9805483B28FDE95705EC9601C
-6D9F5E18655B813894FE604B70BC7EC37CAE51C968817CB1826F4E248F8691CF
-667E4EAE8C0564A9804A50DA759771CE5BE58FBD6F664E86648295635ED66599
-521788C270C852A3730E7433679778F797164E3490BB9CDE6DCB51DB8D41541D
-62CE73B283F196F69F8494C34F367F9A51CC707596755CAD988653E64EE46E9C
-740969B4786B998F7559521876246D4167F3516D9F99804B54997B3C7ABF0000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009686578462E29647697C5A0464027BD36F0F964B82A6536298855E907089
-63B35364864F9C819E93788C97328DEF8D429E7F6F5E79845F559646622E9A74
-541594DD4FA365C55C655C617F1586516C2F5F8B73876EE47EFF5CE6631B5B6A
-6EE653754E7163A0756562A18F6E4F264ED16CA67EB68BBA841D87BA7F57903B
-95237BA99AA188F8843D6D1B9A867EDC59889EBB739B780186829A6C9A82561B
-541757CB4E709EA653568FC881097792999286EE6EE1851366FC61626F2B0000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008C298292832B76F26C135FD983BD732B8305951A6BDB77DB94C6536F8302
-51925E3D8C8C8D384E4873AB679A68859176970971646CA177095A9295416BCF
-7F8E66275BD059B95A9A95E895F74EEC840C84996AAC76DF9530731B68A65B5F
-772F919A97617CDC8FF78C1C5F257C7379D889C56CCC871C5BC65E4268C97720
-7EF55195514D52C95A297F05976282D763CF778485D079D26E3A5E9959998511
-706D6C1162BF76BF654F60AF95FD660E879F9E2394ED540D547D8C2C64780000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647986116A21819C78E864699B5462B9672B83AB58A89ED86CAB6F205BDE
-964C8C0B725F67D062C772614EA959C66BCD589366AE5E5552DF6155672876EE
-776672677A4662FF54EA545094A090A35A1C7EB36C164E435976801059485357
-753796BE56CA63208111607C95F96DD65462998151855AE980FD59AE9713502A
-6CE55C3C62DF4F60533F817B90066EBA852B62C85E7478BE64B5637B5FF55A18
-917F9E1F5C3F634F80425B7D556E954A954D6D8560A867E072DE51DD5B810000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062E76CDE725B626D94AE7EBD81136D53519C5F04597452AA601259736696
-8650759F632A61E67CEF8BFA54E66B279E256BB485D5545550766CA4556A8DB4
-722C5E156015743662CD6392724C5F986E436D3E65006F5876D878D076FC7554
-522453DB4E535E9E65C1802A80D6629B5486522870AE888D8DD16CE1547880DA
-57F988F48D54966A914D4F696C9B55B776C6783062A870F96F8E5F6D84EC68DA
-787C7BF781A8670B9E4F636778B0576F78129739627962AB528874356BD70000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005564813E75B276AE533975DE50FB5C418B6C7BC7504F72479A9798D86F02
-74E27968648777A562FC98918D2B54C180584E52576A82F9840D5E7351ED74F6
-8BC45C4F57616CFC98875A4678349B448FEB7C955256625194FA4EC683868461
-83E984B257D467345703666E6D668C3166DD7011671F6B3A6816621A59BB4E03
-51C46F0667D26C8F517668CB59476B6775665D0E81109F5065D7794879419A91
-8D775C824E5E4F01542F5951780C56686C148FC45F036C7D6CE38BAB63900000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060706D3D72756266948E94C553438FC17B7E4EDF8C264E7E9ED494B194B3
-524D6F5C90636D458C3458115D4C6B206B4967AA545B81547F8C589985375F3A
-62A26A47953965726084686577A74E544FA85DE7979864AC7FD85CED4FCF7A8D
-520783044E14602F7A8394A64FB54EB279E6743452E482B964D279BD5BDD6C81
-97528F7B6C22503E537F6E0564CE66746C3060C598778BF75E86743C7A7779CB
-4E1890B174036C4256DA914B6CC58D8B533A86C666F28EAF5C489A716E200000
-C8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053D65A369F8B8DA353BB570898A76743919B6CC9516875CA62F372AC5238
-529D7F3A7094763853749E4A69B7786E96C088D97FA4713671C3518967D374E4
-58E4651856B78BA9997662707ED560F970ED58EC4EC14EBA5FCD97E74EFB8BA4
-5203598A7EAB62544ECD65E5620E833884C98363878D71946EB65BB97ED25197
-63C967D480898339881551125B7A59828FB14E736C5D516589258F6F962E854A
-745E951095F06DA682E55F3164926D128428816E9CC3585E8D5B4E0953C10000
-C9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F1E6563685155D34E2764149A9A626B5AC2745F82726DA968EE50E7838E
-7802674052396C997EB150BB5565715E7B5B665273CA82EB67495C715220717D
-886B95EA965564C58D6181B355846C5562477F2E58924F2455468D4F664C4E0A
-5C1A88F368A2634E7A0D70E7828D52FA97F65C1154E890B57ECD59628D4A86C7
-820C820D8D6664445C0461516D89793E8BBE78377533547B4F388EAB6DF15A20
-7EC5795E6C885BA15A76751A80BE614E6E1758F0751F7525727253477EF30000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000770176DB526980DC57235E08593172EE65BD6E7F8BD75C388671534177F3
-62FE65F64EC098DF86805B9E8BC653F277E24F7F5C4E9A7659CB5F0F793A58EB
-4E1667FF4E8B62ED8A93901D52BF662F55DC566C90024ED54F8D91CA99706C0F
-5E0260435BA489C68BD56536624B99965B885BFF6388552E53D77626517D852C
-67A268B36B8A62928F9353D482126DD1758F4E668D4E5B70719F85AF669166D9
-7F7287009ECD9F205C5E672F8FF06811675F620D7AD658855EB665706F310000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060555237800D6454887075295E05681362F4971C53CC723D8C016C347761
-7A0E542E77AC987A821C8BF47855671470C165AF64955636601D79C153F84E1D
-6B7B80865BFA55E356DB4F3A4F3C99725DF3677E80386002988290015B8B8BBC
-8BF5641C825864DE55FD82CF91654FD77D20901F7C9F50F358516EAF5BBF8BC9
-80839178849C7B97867D968B968F7EE59AD3788E5C817A57904296A7795F5B59
-635F7B0B84D168AD55067F2974107D2295016240584C4ED65B83597958540000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000736D631E8E4B8E0F80CE82D462AC53F06CF0915E592A60016C70574D644A
-8D2A762B6EE9575B6A8075F06F6D8C2D8C0857666BEF889278B363A253F970AD
-6C645858642A580268E0819B55107CD650188EBA6DCC8D9F70EB638F6D9B6ED4
-7EE68404684390036DD896768BA85957727985E4817E75BC8A8A68AF52548E22
-951163D098988E44557C4F5366FF568F60D56D9552435C4959296DFB586B7530
-751C606C82148146631167618FE2773A8DF38D3494C15E165385542C70C30000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C405EF7505C4EAD5EAD633A8247901A6850916E77B3540C94DC5F647AE5
-687663457B527EDF75DB507762955934900F51F879C37A8156FE5F9290146D82
-5C60571F541051546E4D56E263A89893817F8715892A9000541E5C6F81C062D6
-625881319E3596409A6E9A7C692D59A562D3553E631654C786D96D3C5A0374E6
-889C6B6A59168C4C5F2F6E7E73A9987D4E3870F75B8C7897633D665A769660CB
-5B9B5A494E0781556C6A738B4EA167897F515F8065FA671B5FD859845A010000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005DCD5FAE537197E68FDD684556F4552F60DF4E3A6F4D7EF482C7840E59D4
-4F1F4F2A5C3E7EAC672A851A5473754F80C355829B4F4F4D6E2D8C135C096170
-536B761F6E29868A658795FB7EB9543B7A337D0A95EE55E17FC174EE631D8717
-6DA17A9D621165A1536763E16C835DEB545C94A84E4C6C618BEC5C4B65E0829C
-68A7543E54346BCB6B664E9463425348821E4F0D4FAE575E620A96FE66647269
-52FF52A1609F8BEF661471996790897F785277FD6670563B54389521727A0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A00606F5E0C6089819D591560DC718470EF6EAA6C5072806A8488AD5E2D
-4E605AB3559C94E36D177CFB9699620F7EC6778E867E5323971E8F9666875CE1
-4FA072ED4E0B53A6590F54136380952851484ED99C9C7EA454B88D2488548237
-95F26D8E5F265ACC663E966973B0732E53BF817A99857FA15BAA967796507EBF
-76F853A2957699997BB189446E584E617FD479658BE660F354CD4EAB98795DF7
-6A6150CF54118C618427785D9704524A54EE56A395006D885BB56DC666530000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C0F5B5D6821809655787B11654869544E9B6B47874E978B534F631F643A
-90AA659C80C18C10519968B0537887F961C86CC46CFB8C225C5185AA82AF950C
-6B238F9B65B05FFB5FC34FE18845661F8165732960FA51745211578B5F6290A2
-884C91925E78674F602759D3514451F680F853086C7996C4718A4F114FEE7F9E
-673D55C5950879C088967EE3589F620C9700865A5618987B5F908BB884C49157
-53D965ED5E8F755C60647D6E5A7F7EEA7EED8F6955A75BA360AC65CB73840000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009009766377297EDA9774859B5B667A7496EA884052CB718F5FAA65EC8BE2
-5BFB9A6F5DE16B896C5B8BAD8BAF900A8FC5538B62BC9E269E2D54404E2B82BD
-7259869C5D1688596DAF96C554D14E9A8BB6710954BD960970DF6DF976D04E25
-781487125CA95EF68A00989C960E708E6CBF594463A9773C884D6F1482735830
-71D5538C781A96C155015F6671305BB48C1A9A8C6B83592E9E2F79E76768626C
-4F6F75A17F8A6D0B96336C274EF075D2517B68376F3E90808170599674760000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064475C2790657A918C2359DA54AC8200836F898180006930564E80367237
-91CE51B64E5F987563964E1A53F666F3814B591C6DB24E0058F9533B63D694F1
-4F9D4F0A886398905937905779FB4EEA80F075916C825B9C59E85F5D69058681
-501A5DF24E5977E34EE5827A6291661390915C794EBF5F7981C69038808475AB
-4EA688D4610F6BC55FC64E4976CA6EA28BE38BAE8C0A8BD15F027FFC7FCC7ECE
-8335836B56E06BB797F3963459FB541F94F66DEB5BC5996E5C395F1596900000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000537082F16A315A749E705E947F2883B984248425836787478FCE8D6276C8
-5F719896786C662054DF62E54F6381C375C85EB896CD8E0A86F9548F6CF36D8C
-6C38607F52C775285E7D4F1860A05FE75C24753190AE94C072B96CB96E389149
-670953CB53F34F5191C98BF153C85E7C8FC26DE44E8E76C26986865E611A8206
-4F594FDE903E9C7C61096E1D6E1496854E885A3196E84E0E5C7F79B95B878BED
-7FBD738957DF828B90C15401904755BB5CEA5FA161086B3272F180B28A890000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D745BD388D598848C6B9A6D9E336E0A51A4514357A38881539F63F48F95
-56ED54585706733F6E907F188FDC82D1613F6028966266F07EA68D8A8DC394A5
-5CB37CA4670860A6960580184E9190E75300966851418FD08574915D665597F5
-5B55531D78386742683D54C9707E5BB08F7D518D572854B1651266828D5E8D43
-810F846C906D7CDF51FF85FB67A365E96FA186A48E81566A90207682707671E5
-8D2362E952196CFD8D3C600E589E618E66FE8D60624E55B36E23672D8F670000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094E195F87728680569A8548B4E4D70B88BC86458658B5B857A84503A5BE8
-77BB6BE18A797C986CBE76CF65A98F975D2D5C5586386808536062187AD96E5B
-7EFD6A1F7AE05F706F335F20638C6DA867564E085E108D264ED780C07634969C
-62DB662D627E6CBC8D7571677F695146808753EC906E629854F286F08F998005
-951785178FD96D5973CD659F771F7504782781FB8D1E94884FA6679575B98BCA
-9707632F9547963584B8632377415F8172F04E896014657462EF6B63653F0000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E2775C790D18BC1829D679D652F5431871877E580A281026C414E4B7EC7
-804C76F4690D6B966267503C4F84574063076B628DBE53EA65E87EB85FD7631A
-63B781F381F47F6E5E1C5CD95236667A79E97A1A8D28709975D46EDE6CBB7A92
-4E2D76C55FE0949F88777EC879CD80BF91CD4EF24F17821F54685DDE6D328BCC
-7CA58F7480985E1A549276B15B99663C9AA473E0682A86DB6731732A8BF88BDB
-90107AF970DB716E62C477A956314E3B845767F152A986C08D2E94F87B510000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F4F6CE8795D9A7B6293722A62FD4E1378168F6C64B08D5A7BC668695E84
-88C55986649E58EE72B6690E95258FFD8D5857607F008C0651C6634962D95353
-684C74228301914C55447740707C6D4A517954A88D4459FF6ECB6DC45B5C7D2B
-4ED47C7D6ED35B5081EA6E0D5B579B0368D58E2A5B977EFC603B7EB590B98D70
-594F63CD79DF8DB3535265CF79568BC5963B7EC494BB7E825634918967007F6A
-5C0A907566285DE64F5067DE505A4F5C57505EA7000000000000000000000000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E8D4E0C51404E105EFF53454E154E984E1E9B325B6C56694E2879BA4E3F
-53154E47592D723B536E6C1056DF80E499976BD3777E9F174E364E9F9F104E5C
-4E694E9382885B5B556C560F4EC4538D539D53A353A553AE97658D5D531A53F5
-5326532E533E8D5C5366536352025208520E522D5233523F5240524C525E5261
-525C84AF527D528252815290529351827F544EBB4EC34EC94EC24EE84EE14EEB
-4EDE4F1B4EF34F224F644EF54F254F274F094F2B4F5E4F6765384F5A4F5D0000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F5F4F574F324F3D4F764F744F914F894F834F8F4F7E4F7B4FAA4F7C4FAC
-4F944FE64FE84FEA4FC54FDA4FE34FDC4FD14FDF4FF85029504C4FF3502C500F
-502E502D4FFE501C500C50255028507E504350555048504E506C507B50A550A7
-50A950BA50D6510650ED50EC50E650EE5107510B4EDD6C3D4F584F654FCE9FA0
-6C467C74516E5DFD9EC999985181591452F9530D8A07531051EB591951554EA0
-51564EB3886E88A44EB5811488D279805B3488037FB851AB51B151BD51BC0000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051C7519651A251A58BA08BA68BA78BAA8BB48BB58BB78BC28BC38BCB8BCF
-8BCE8BD28BD38BD48BD68BD88BD98BDC8BDF8BE08BE48BE88BE98BEE8BF08BF3
-8BF68BF98BFC8BFF8C008C028C048C078C0C8C0F8C118C128C148C158C168C19
-8C1B8C188C1D8C1F8C208C218C258C278C2A8C2B8C2E8C2F8C328C338C358C36
-5369537A961D962296219631962A963D963C964296499654965F9667966C9672
-96749688968D969796B09097909B909D909990AC90A190B490B390B690BA0000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090B890B090CF90C590BE90D090C490C790D390E690E290DC90D790DB90EB
-90EF90FE91049122911E91239131912F913991439146520D594252A252AC52AD
-52BE54FF52D052D652F053DF71EE77CD5EF451F551FC9B2F53B65F01755A5DEF
-574C57A957A1587E58BC58C558D15729572C572A57335739572E572F575C573B
-574257695785576B5786577C577B5768576D5776577357AD57A4578C57B257CF
-57A757B4579357A057D557D857DA57D957D257B857F457EF57F857E457DD0000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000580B580D57FD57ED5800581E5819584458205865586C58815889589A5880
-99A89F1961FF8279827D827F828F828A82A88284828E82918297829982AB82B8
-82BE82B082C882CA82E3829882B782AE82CB82CC82C182A982B482A182AA829F
-82C482CE82A482E1830982F782E4830F830782DC82F482D282D8830C82FB82D3
-8311831A83068314831582E082D5831C8351835B835C83088392833C83348331
-839B835E832F834F83478343835F834083178360832D833A8333836683650000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008368831B8369836C836A836D836E83B0837883B383B483A083AA8393839C
-8385837C83B683A9837D83B8837B8398839E83A883BA83BC83C1840183E583D8
-58078418840B83DD83FD83D6841C84388411840683D483DF840F840383F883F9
-83EA83C583C0842683F083E1845C8451845A8459847384878488847A84898478
-843C844684698476848C848E8431846D84C184CD84D084E684BD84D384CA84BF
-84BA84E084A184B984B4849784E584E3850C750D853884F08539851F853A0000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008556853B84FF84FC8559854885688564855E857A77A285438572857B85A4
-85A88587858F857985AE859C858585B985B785B085D385C185DC85FF86278605
-86298616863C5EFE5F08593C594180375955595A5958530F5C225C255C2C5C34
-624C626A629F62BB62CA62DA62D762EE632262F66339634B634363AD63F66371
-637A638E63B4636D63AC638A636963AE63BC63F263F863E063FF63C463DE63CE
-645263C663BE64456441640B641B6420640C64266421645E6484646D64960000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647A64B764B8649964BA64C064D064D764E464E265096525652E5F0B5FD2
-75195F11535F53F153FD53E953E853FB541254165406544B5452545354545456
-54435421545754595423543254825494547754715464549A549B548454765466
-549D54D054AD54C254B454D254A754A654D354D4547254A354D554BB54BF54CC
-54D954DA54DC54A954AA54A454DD54CF54DE551B54E7552054FD551454F35522
-5523550F55115527552A5567558F55B55549556D55415555553F5550553C0000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005537555655755576557755335530555C558B55D2558355B155B955885581
-559F557E55D65591557B55DF55BD55BE5594559955EA55F755C9561F55D155EB
-55EC55D455E655DD55C455EF55E555F255F355CC55CD55E855F555E48F94561E
-5608560C56015624562355FE56005627562D565856395657562C564D56625659
-565C564C5654568656645671566B567B567C5685569356AF56D456D756DD56E1
-56F556EB56F956FF5704570A5709571C5E0F5E195E145E115E315E3B5E3C0000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E375E445E545E5B5E5E5E615C8C5C7A5C8D5C905C965C885C985C995C91
-5C9A5C9C5CB55CA25CBD5CAC5CAB5CB15CA35CC15CB75CC45CD25CE45CCB5CE5
-5D025D035D275D265D2E5D245D1E5D065D1B5D585D3E5D345D3D5D6C5D5B5D6F
-5D5D5D6B5D4B5D4A5D695D745D825D995D9D8C735DB75DC55F735F775F825F87
-5F895F8C5F955F995F9C5FA85FAD5FB55FBC88625F6172AD72B072B472B772B8
-72C372C172CE72CD72D272E872EF72E972F272F472F7730172F3730372FA0000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072FB731773137321730A731E731D7315732273397325732C733873317350
-734D73577360736C736F737E821B592598E7592459029963996799689969996A
-996B996C99749977997D998099849987998A998D999099919993999499955E80
-5E915E8B5E965EA55EA05EB95EB55EBE5EB38D535ED25ED15EDB5EE85EEA81BA
-5FC45FC95FD65FCF60035FEE60045FE15FE45FFE600560065FEA5FED5FF86019
-60356026601B600F600D6029602B600A603F602160786079607B607A60420000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000606A607D6096609A60AD609D60836092608C609B60EC60BB60B160DD60D8
-60C660DA60B4612061266115612360F46100610E612B614A617561AC619461A7
-61B761D461F55FDD96B395E995EB95F195F395F595F695FC95FE960396049606
-9608960A960B960C960D960F96129615961696179619961A4E2C723F62156C35
-6C546C5C6C4A6CA36C856C906C946C8C6C686C696C746C766C866CA96CD06CD4
-6CAD6CF76CF86CF16CD76CB26CE06CD66CFA6CEB6CEE6CB16CD36CEF6CFE0000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D396D276D0C6D436D486D076D046D196D0E6D2B6D4D6D2E6D356D1A6D4F
-6D526D546D336D916D6F6D9E6DA06D5E6D936D946D5C6D606D7C6D636E1A6DC7
-6DC56DDE6E0E6DBF6DE06E116DE66DDD6DD96E166DAB6E0C6DAE6E2B6E6E6E4E
-6E6B6EB26E5F6E866E536E546E326E256E446EDF6EB16E986EE06F2D6EE26EA5
-6EA76EBD6EBB6EB76ED76EB46ECF6E8F6EC26E9F6F626F466F476F246F156EF9
-6F2F6F366F4B6F746F2A6F096F296F896F8D6F8C6F786F726F7C6F7A6FD10000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FC96FA76FB96FB66FC26FE16FEE6FDE6FE06FEF701A7023701B70397035
-704F705E5B805B845B955B935BA55BB8752F9A9E64345BE45BEE89305BF08E47
-8B078FB68FD38FD58FE58FEE8FE48FE98FE68FF38FE890059004900B90269011
-900D9016902190359036902D902F9044905190529050906890589062905B66B9
-9074907D908290889083908B5F505F575F565F585C3B54AB5C505C595B715C63
-5C667FBC5F2A5F295F2D82745F3C9B3B5C6E59815983598D59A959AA59A30000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000599759CA59AB599E59A459D259B259AF59D759BE5A055A0659DD5A0859E3
-59D859F95A0C5A095A325A345A115A235A135A405A675A4A5A555A3C5A625A75
-80EC5AAA5A9B5A775A7A5ABE5AEB5AB25AD25AD45AB85AE05AE35AF15AD65AE6
-5AD85ADC5B095B175B165B325B375B405C155C1C5B5A5B655B735B515B535B62
-9A759A779A789A7A9A7F9A7D9A809A819A859A889A8A9A909A929A939A969A98
-9A9B9A9C9A9D9A9F9AA09AA29AA39AA59AA77E9F7EA17EA37EA57EA87EA90000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007EAD7EB07EBE7EC07EC17EC27EC97ECB7ECC7ED07ED47ED77EDB7EE07EE1
-7EE87EEB7EEE7EEF7EF17EF27F0D7EF67EFA7EFB7EFE7F017F027F037F077F08
-7F0B7F0C7F0F7F117F127F177F197F1C7F1B7F1F7F217F227F237F247F257F26
-7F277F2A7F2B7F2C7F2D7F2F7F307F317F327F337F355E7A757F5DDB753E9095
-738E739173AE73A2739F73CF73C273D173B773B373C073C973C873E573D9987C
-740A73E973E773DE73BA73F2740F742A745B7426742574287430742E742C0000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000741B741A7441745C7457745574597477746D747E749C748E748074817487
-748B749E74A874A9749074A774D274BA97EA97EB97EC674C6753675E67486769
-67A56787676A6773679867A7677567A8679E67AD678B6777677C67F0680967D8
-680A67E967B0680C67D967B567DA67B367DD680067C367B867E2680E67C167FD
-6832683368606861684E6862684468646883681D68556866684168676840683E
-684A6849682968B5688F687468776893686B68C2696E68FC691F692068F90000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000692468F0690B6901695768E369106971693969606942695D6984696B6980
-69986978693469CC6987698869CE6989696669636979699B69A769BB69AB69AD
-69D469B169C169CA69DF699569E0698D69FF6A2F69ED6A176A186A6569F26A44
-6A3E6AA06A506A5B6A356A8E6A796A3D6A286A586A7C6A916A906AA96A976AAB
-733773526B816B826B876B846B926B936B8D6B9A6B9B6BA16BAA8F6B8F6D8F71
-8F728F738F758F768F788F778F798F7A8F7C8F7E8F818F828F848F878F8B0000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008F8D8F8E8F8F8F988F9A8ECE620B6217621B621F6222622162256224622C
-81E774EF74F474FF750F75117513653465EE65EF65F0660A6619677266036615
-6600708566F7661D66346631663666358006665F66546641664F665666616657
-66776684668C66A7669D66BE66DB66DC66E666E98D328D338D368D3B8D3D8D40
-8D458D468D488D498D478D4D8D558D5989C789CA89CB89CC89CE89CF89D089D1
-726E729F725D7266726F727E727F7284728B728D728F72926308633263B00000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000643F64D880046BEA6BF36BFD6BF56BF96C056C076C066C0D6C156C186C19
-6C1A6C216C296C246C2A6C3265356555656B724D72527256723086625216809F
-809C809380BC670A80BD80B180AB80AD80B480B780E780E880E980EA80DB80C2
-80C480D980CD80D7671080DD80EB80F180F480ED810D810E80F280FC67158112
-8C5A8136811E812C811881328148814C815381748159815A817181608169817C
-817D816D8167584D5AB58188818281916ED581A381AA81CC672681CA81BB0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081C181A66B246B376B396B436B466B5998D198D298D398D598D998DA6BB3
-5F406BC289F365909F51659365BC65C665C465C365CC65CE65D265D67080709C
-7096709D70BB70C070B770AB70B170E870CA711071137116712F71317173715C
-716871457172714A7178717A719871B371B571A871A071E071D471E771F9721D
-7228706C7118716671B9623E623D624362486249793B794079467949795B795C
-7953795A796279577960796F7967797A7985798A799A79A779B35FD15FD00000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000603C605D605A606760416059606360AB6106610D615D61A9619D61CB61D1
-62068080807F6C936CF66DFC77F677F87800780978177818781165AB782D781C
-781D7839783A783B781F783C7825782C78237829784E786D7856785778267850
-7847784C786A789B7893789A7887789C78A178A378B278B978A578D478D978C9
-78EC78F2790578F479137924791E79349F9B9EF99EFB9EFC76F17704770D76F9
-77077708771A77227719772D7726773577387750775177477743775A77680000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077627765777F778D777D7780778C7791779F77A077B077B577BD753A7540
-754E754B7548755B7572757975837F587F617F5F8A487F687F747F717F797F81
-7F7E76CD76E58832948594869487948B948A948C948D948F9490949494979495
-949A949B949C94A394A494AB94AA94AD94AC94AF94B094B294B494B694B794B8
-94B994BA94BC94BD94BF94C494C894C994CA94CB94CC94CD94CE94D094D194D2
-94D594D694D794D994D894DB94DE94DF94E094E294E494E594E794E894EA0000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094E994EB94EE94EF94F394F494F594F794F994FC94FD94FF950395029506
-95079509950A950D950E950F951295139514951595169518951B951D951E951F
-9522952A952B9529952C953195329534953695379538953C953E953F95429535
-9544954595469549954C954E954F9552955395549556955795589559955B955E
-955F955D95619562956495659566956795689569956A956B956C956F95719572
-9573953A77E777EC96C979D579ED79E379EB7A065D477A037A027A1E7A140000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A397A377A519ECF99A57A707688768E7693769976A474DE74E0752C9E20
-9E229E289E299E2A9E2B9E2C9E329E319E369E389E379E399E3A9E3E9E419E42
-9E449E469E479E489E499E4B9E4C9E4E9E519E559E579E5A9E5B9E5C9E5E9E63
-9E669E679E689E699E6A9E6B9E6C9E719E6D9E7375927594759675A0759D75AC
-75A375B375B475B875C475B175B075C375C275D675CD75E375E875E675E475EB
-75E7760375F175FC75FF761076007605760C7617760A76257618761576190000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000761B763C762276207640762D7630763F76357643763E7633764D765E7654
-765C7656766B766F7FCA7AE67A787A797A807A867A887A957AA67AA07AAC7AA8
-7AAD7AB3886488698872887D887F888288A288C688B788BC88C988E288CE88E3
-88E588F1891A88FC88E888FE88F0892189198913891B890A8934892B89368941
-8966897B758B80E576B276B477DC801280148016801C80208022802580268027
-802980288031800B803580438046804D80528069807189839878988098830000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009889988C988D988F9894989A989B989E989F98A198A298A598A6864D8654
-866C866E867F867A867C867B86A8868D868B86AC869D86A786A386AA869386A9
-86B686C486B586CE86B086BA86B186AF86C986CF86B486E986F186F286ED86F3
-86D0871386DE86F486DF86D886D18703870786F88708870A870D87098723873B
-871E8725872E871A873E87488734873187298737873F87828722877D877E877B
-87608770874C876E878B87538763877C876487598765879387AF87A887D20000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000087C68788878587AD8797878387AB87E587AC87B587B387CB87D387BD87D1
-87C087CA87DB87EA87E087EE8816881387FE880A881B88218839883C7F367F42
-7F447F4582107AFA7AFD7B087B037B047B157B0A7B2B7B0F7B477B387B2A7B19
-7B2E7B317B207B257B247B337B3E7B1E7B587B5A7B457B757B4C7B5D7B607B6E
-7B7B7B627B727B717B907BA67BA77BB87BAC7B9D7BA87B857BAA7B9C7BA27BAB
-7BB47BD17BC17BCC7BDD7BDA7BE57BE67BEA7C0C7BFE7BFC7C0F7C167C0B0000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007C1F7C2A7C267C387C417C4081FE82018202820481EC8844822182228223
-822D822F8228822B8238823B82338234823E82448249824B824F825A825F8268
-887E8885888888D888DF895E7F9D7F9F7FA77FAF7FB07FB27C7C65497C917C9D
-7C9C7C9E7CA27CB27CBC7CBD7CC17CC77CCC7CCD7CC87CC57CD77CE8826E66A8
-7FBF7FCE7FD57FE57FE17FE67FE97FEE7FF37CF87D777DA67DAE7E477E9B9EB8
-9EB48D738D848D948D918DB18D678D6D8C478C49914A9150914E914F91640000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009162916191709169916F917D917E917291749179918C91859190918D9191
-91A291A391AA91AD91AE91AF91B591B491BA8C559E7E8DB88DEB8E058E598E69
-8DB58DBF8DBC8DBA8DC48DD68DD78DDA8DDE8DCE8DCF8DDB8DC68DEC8DF78DF8
-8DE38DF98DFB8DE48E098DFD8E148E1D8E1F8E2C8E2E8E238E2F8E3A8E408E39
-8E358E3D8E318E498E418E428E518E528E4A8E708E768E7C8E6F8E748E858E8F
-8E948E908E9C8E9E8C788C828C8A8C858C988C94659B89D689DE89DA89DC0000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000089E589EB89EF8A3E8B26975396E996F396EF970697019708970F970E972A
-972D9730973E9F809F839F859F869F879F889F899F8A9F8C9EFE9F0B9F0D96B9
-96BC96BD96CE96D277BF96E0928E92AE92C8933E936A93CA938F943E946B9C7F
-9C829C859C869C879C887A239C8B9C8E9C909C919C929C949C959C9A9C9B9C9E
-9C9F9CA09CA19CA29CA39CA59CA69CA79CA89CA99CAB9CAD9CAE9CB09CB19CB2
-9CB39CB49CB59CB69CB79CBA9CBB9CBC9CBD9CC49CC59CC69CC79CCA9CCB0000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009CCC9CCD9CCE9CCF9CD09CD39CD49CD59CD79CD89CD99CDC9CDD9CDF9CE2
-977C978597919792979497AF97AB97A397B297B49AB19AB09AB79E589AB69ABA
-9ABC9AC19AC09AC59AC29ACB9ACC9AD19B459B439B479B499B489B4D9B5198E8
-990D992E995599549ADF9AE19AE69AEF9AEB9AFB9AED9AF99B089B0F9B139B1F
-9B239EBD9EBE7E3B9E829E879E889E8B9E9293D69E9D9E9F9EDB9EDC9EDD9EE0
-9EDF9EE29EE99EE79EE59EEA9EEF9F229F2C9F2F9F399F379F3D9F3E9F440000
diff --git a/library/encoding/euc-jp.enc b/library/encoding/euc-jp.enc
deleted file mode 100644
index 9b7abb1..0000000
--- a/library/encoding/euc-jp.enc
+++ /dev/null
@@ -1,1346 +0,0 @@
-# Encoding file: euc-jp, multi-byte
-M
-003F 0 79
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D0000008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8
-FF3EFFE3FF3F30FD30FE309D309E30034EDD30053006300730FC20152010FF0F
-FF3C301C2016FF5C2026202520182019201C201DFF08FF0930143015FF3BFF3D
-FF5BFF5D30083009300A300B300C300D300E300F30103011FF0B221200B100D7
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF0400A200A3FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C70000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025C625A125A025B325B225BD25BC203B3012219221902191219330130000
-00000000000000000000000000000000000000002208220B2286228722822283
-222A2229000000000000000000000000000000002227222800AC21D221D42200
-220300000000000000000000000000000000000000000000222022A523122202
-220722612252226A226B221A223D221D2235222B222C00000000000000000000
-00000000212B2030266F266D266A2020202100B6000000000000000025EF0000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19000000000000000000000000
-0000FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3A00000000000000000000
-0000FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000000000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025002502250C251025182514251C252C25242534253C25012503250F2513
-251B251725232533252B253B254B2520252F25282537253F251D253025252538
-2542000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E9C55165A03963F54C0611B632859F690228475831C7A5060AA63E16E25
-65ED846682A69BF56893572765A162715B9B59D0867B98F47D627DBE9B8E6216
-7C9F88B75B895EB563096697684895C7978D674F4EE54F0A4F4D4F9D504956F2
-593759D45A015C0960DF610F61706613690570BA754F757079FB7DAD7DEF80C3
-840E88638B029055907A533B4E954EA557DF80B290C178EF4E0058F16EA29038
-7A328328828B9C2F5141537054BD54E156E059FB5F1598F26DEB80E4852D0000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009662967096A097FB540B53F35B8770CF7FBD8FC296E8536F9D5C7ABA4E11
-789381FC6E26561855046B1D851A9C3B59E553A96D6674DC958F56424E91904B
-96F2834F990C53E155B65B305F71662066F368046C386CF36D29745B76C87A4E
-983482F1885B8A6092ED6DB275AB76CA99C560A68B018D8A95B2698E53AD5186
-5712583059445BB45EF6602863A963F46CBF6F14708E7114715971D5733F7E01
-827682D185979060925B9D1B586965BC6C5A752551F9592E59655F805FDC0000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062BC65FA6A2A6B276BB4738B7FC189569D2C9D0E9EC45CA16C96837B5104
-5C4B61B681C6687672614E594FFA537860696E297A4F97F34E0B53164EEE4F55
-4F3D4FA14F7352A053EF5609590F5AC15BB65BE179D16687679C67B66B4C6CB3
-706B73C2798D79BE7A3C7B8782B182DB8304837783EF83D387668AB256298CA8
-8FE6904E971E868A4FC45CE862117259753B81E582BD86FE8CC096C5991399D5
-4ECB4F1A89E356DE584A58CA5EFB5FEB602A6094606261D0621262D065390000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B41666668B06D777070754C76867D7582A587F9958B968E8C9D51F152BE
-591654B35BB35D16616869826DAF788D84CB88578A7293A79AB86D6C99A886D9
-57A367FF86CE920E5283568754045ED362E164B9683C68386BBB737278BA7A6B
-899A89D28D6B8F0390ED95A3969497695B665CB3697D984D984E639B7B206A2B
-6A7F68B69C0D6F5F5272559D607062EC6D3B6E076ED1845B89108F444E149C39
-53F6691B6A3A9784682A515C7AC384B291DC938C565B9D286822830584310000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007CA5520882C574E64E7E4F8351A05BD2520A52D852E75DFB559A582A59E6
-5B8C5B985BDB5E725E7960A3611F616361BE63DB656267D1685368FA6B3E6B53
-6C576F226F976F4574B0751876E3770B7AFF7BA17C217DE97F367FF0809D8266
-839E89B38ACC8CAB908494519593959195A2966597D3992882184E38542B5CB8
-5DCC73A9764C773C5CA97FEB8D0B96C19811985498584F014F0E5371559C5668
-57FA59475B095BC45C905E0C5E7E5FCC63EE673A65D765E2671F68CB68C40000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006A5F5E306BC56C176C7D757F79485B637A007D005FBD898F8A188CB48D77
-8ECC8F1D98E29A0E9B3C4E80507D510059935B9C622F628064EC6B3A72A07591
-79477FA987FB8ABC8B7063AC83CA97A05409540355AB68546A588A7078276775
-9ECD53745BA2811A865090064E184E454EC74F1153CA54385BAE5F1360256551
-673D6C426C726CE3707874037A767AAE7B087D1A7CFE7D6665E7725B53BB5C45
-5DE862D262E063196E20865A8A318DDD92F86F0179A69B5A4EA84EAB4EAC0000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F9B4FA050D151477AF6517151F653545321537F53EB55AC58835CE15F37
-5F4A602F6050606D631F65596A4B6CC172C272ED77EF80F881058208854E90F7
-93E197FF99579A5A4EF051DD5C2D6681696D5C4066F26975738968507C8150C5
-52E457475DFE932665A46B236B3D7434798179BD7B4B7DCA82B983CC887F895F
-8B398FD191D1541F92804E5D503653E5533A72D7739677E982E68EAF99C699C8
-99D25177611A865E55B07A7A50765BD3904796854E326ADB91E75C515C480000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000063987A9F6C9397748F617AAA718A96887C8268177E706851936C52F2541B
-85AB8A137FA48ECD90E15366888879414FC250BE521151445553572D73EA578B
-59515F625F8460756176616761A963B2643A656C666F68426E1375667A3D7CFB
-7D4C7D997E4B7F6B830E834A86CD8A088A638B668EFD981A9D8F82B88FCE9BE8
-5287621F64836FC09699684150916B206C7A6F547A747D5088408A2367084EF6
-503950265065517C5238526355A7570F58055ACC5EFA61B261F862F363720000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000691C6A29727D72AC732E7814786F7D79770C80A9898B8B198CE28ED29063
-9375967A98559A139E785143539F53B35E7B5F266E1B6E90738473FE7D438237
-8A008AFA96504E4E500B53E4547C56FA59D15B645DF15EAB5F276238654567AF
-6E5672D07CCA88B480A180E183F0864E8A878DE8923796C798679F134E944E92
-4F0D53485449543E5A2F5F8C5FA1609F68A76A8E745A78818A9E8AA48B779190
-4E5E9BC94EA44F7C4FAF501950165149516C529F52B952FE539A53E354110000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000540E5589575157A2597D5B545B5D5B8F5DE55DE75DF75E785E835E9A5EB7
-5F186052614C629762D863A7653B6602664366F4676D6821689769CB6C5F6D2A
-6D696E2F6E9D75327687786C7A3F7CE07D057D187D5E7DB18015800380AF80B1
-8154818F822A8352884C88618B1B8CA28CFC90CA91759271783F92FC95A4964D
-980599999AD89D3B525B52AB53F7540858D562F76FE08C6A8F5F9EB9514B523B
-544A56FD7A4091779D609ED273446F09817075115FFD60DA9AA872DB8FBC0000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B6498034ECA56F0576458BE5A5A606861C7660F6606683968B16DF775D5
-7D3A826E9B424E9B4F5053C955065D6F5DE65DEE67FB6C99747378028A509396
-88DF57505EA7632B50B550AC518D670054C9585E59BB5BB05F69624D63A1683D
-6B736E08707D91C7728078157826796D658E7D3083DC88C18F09969B52645728
-67507F6A8CA151B45742962A583A698A80B454B25D0E57FC78959DFA4F5C524A
-548B643E6628671467F57A847B567D22932F685C9BAD7B395319518A52370000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005BDF62F664AE64E6672D6BBA85A996D176909BD6634C93069BAB76BF6652
-4E09509853C25C7160E864926563685F71E673CA75237B977E8286958B838CDB
-9178991065AC66AB6B8B4ED54ED44F3A4F7F523A53F853F255E356DB58EB59CB
-59C959FF5B505C4D5E025E2B5FD7601D6307652F5B5C65AF65BD65E8679D6B62
-6B7B6C0F7345794979C17CF87D197D2B80A2810281F389968A5E8A698A668A8C
-8AEE8CC78CDC96CC98FC6B6F4E8B4F3C4F8D51505B575BFA6148630166420000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B216ECB6CBB723E74BD75D478C1793A800C803381EA84948F9E6C509E7F
-5F0F8B589D2B7AFA8EF85B8D96EB4E0353F157F759315AC95BA460896E7F6F06
-75BE8CEA5B9F85007BE0507267F4829D5C61854A7E1E820E51995C0463688D66
-659C716E793E7D1780058B1D8ECA906E86C790AA501F52FA5C3A6753707C7235
-914C91C8932B82E55BC25F3160F94E3B53D65B88624B67316B8A72E973E07A2E
-816B8DA391529996511253D7546A5BFF63886A397DAC970056DA53CE54680000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005B975C315DDE4FEE610162FE6D3279C079CB7D427E4D7FD281ED821F8490
-884689728B908E748F2F9031914B916C96C6919C4EC04F4F514553415F93620E
-67D46C416E0B73637E2691CD928353D459195BBF6DD1795D7E2E7C9B587E719F
-51FA88538FF04FCA5CFB662577AC7AE3821C99FF51C65FAA65EC696F6B896DF3
-6E966F6476FE7D145DE190759187980651E6521D6240669166D96E1A5EB67DD2
-7F7266F885AF85F78AF852A953D959735E8F5F90605592E4966450B7511F0000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000052DD5320534753EC54E8554655315617596859BE5A3C5BB55C065C0F5C11
-5C1A5E845E8A5EE05F70627F628462DB638C63776607660C662D6676677E68A2
-6A1F6A356CBC6D886E096E58713C7126716775C77701785D7901796579F07AE0
-7B117CA77D39809683D6848B8549885D88F38A1F8A3C8A548A738C618CDE91A4
-9266937E9418969C97984E0A4E084E1E4E575197527057CE583458CC5B225E38
-60C564FE676167566D4472B675737A6384B88B7291B89320563157F498FE0000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062ED690D6B9671ED7E548077827289E698DF87558FB15C3B4F384FE14FB5
-55075A205BDD5BE95FC3614E632F65B0664B68EE699B6D786DF1753375B9771F
-795E79E67D3381E382AF85AA89AA8A3A8EAB8F9B903291DD97074EBA4EC15203
-587558EC5C0B751A5C3D814E8A0A8FC59663976D7B258ACF9808916256F353A8
-9017543957825E2563A86C34708A77617C8B7FE088709042915493109318968F
-745E9AC45D075D69657067A28DA896DB636E6749691983C5981796C088FE0000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F84647A5BF84E16702C755D662F51C4523652E259D35F8160276210653F
-6574661F667468F268166B636E057272751F76DB7CBE805658F088FD897F8AA0
-8A938ACB901D91929752975965897A0E810696BB5E2D60DC621A65A566146790
-77F37A4D7C4D7E3E810A8CAC8D648DE18E5F78A9520762D963A5644262988A2D
-7A837BC08AAC96EA7D76820C87494ED95148534353605BA35C025C165DDD6226
-624764B0681368346CC96D456D1767D36F5C714E717D65CB7A7F7BAD7DDA0000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E4A7FA8817A821B823985A68A6E8CCE8DF59078907792AD929195839BAE
-524D55846F387136516879857E5581B37CCE564C58515CA863AA66FE66FD695A
-72D9758F758E790E795679DF7C977D207D4486078A34963B90619F2050E75275
-53CC53E2500955AA58EE594F723D5B8B5C64531D60E360F3635C6383633F63BB
-64CD65E966F95DE369CD69FD6F1571E54E8975E976F87A937CDF7DCF7D9C8061
-83498358846C84BC85FB88C58D709001906D9397971C9A1250CF5897618E0000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081D385358D0890204FC3507452475373606F6349675F6E2C8DB3901F4FD7
-5C5E8CCA65CF7D9A53528896517663C35B585B6B5C0A640D6751905C4ED6591A
-592A6C708A51553E581559A560F0625367C182356955964099C49A284F535806
-5BFE80105CB15E2F5F856020614B623466FF6CF06EDE80CE817F82D4888B8CB8
-9000902E968A9EDB9BDB4EE353F059277B2C918D984C9DF96EDD702753535544
-5B856258629E62D36CA26FEF74228A1794386FC18AFE833851E786F853EA0000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053E94F4690548FB0596A81315DFD7AEA8FBF68DA8C3772F89C486A3D8AB0
-4E3953585606576662C563A265E66B4E6DE16E5B70AD77ED7AEF7BAA7DBB803D
-80C686CB8A95935B56E358C75F3E65AD66966A806BB575378AC7502477E55730
-5F1B6065667A6C6075F47A1A7F6E81F48718904599B37BC9755C7AF97B5184C4
-901079E97A9283365AE177404E2D4EF25B995FE062BD663C67F16CE8866B8877
-8A3B914E92F399D06A177026732A82E784578CAF4E01514651CB558B5BF50000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E165E335E815F145F355F6B5FB461F2631166A2671D6F6E7252753A773A
-80748139817887768ABF8ADC8D858DF3929A957798029CE552C5635776F46715
-6C8873CD8CC393AE96736D25589C690E69CC8FFD939A75DB901A585A680263B4
-69FB4F436F2C67D88FBB85267DB49354693F6F70576A58F75B2C7D2C722A540A
-91E39DB44EAD4F4E505C507552438C9E544858245B9A5E1D5E955EAD5EF75F1F
-608C62B5633A63D068AF6C407887798E7A0B7DE082478A028AE68E4490130000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090B8912D91D89F0E6CE5645864E265756EF476847B1B906993D16EBA54F2
-5FB964A48F4D8FED92445178586B59295C555E976DFB7E8F751C8CBC8EE2985B
-70B94F1D6BBF6FB1753096FB514E54105835585759AC5C605F926597675C6E21
-767B83DF8CED901490FD934D7825783A52AA5EA6571F597460125012515A51AC
-51CD520055105854585859575B955CF65D8B60BC6295642D6771684368BC68DF
-76D76DD86E6F6D9B706F71C85F5375D879777B497B547B527CD67D7152300000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008463856985E48A0E8B048C468E0F9003900F94199676982D9A3095D850CD
-52D5540C58025C0E61A7649E6D1E77B37AE580F48404905392855CE09D07533F
-5F975FB36D9C7279776379BF7BE46BD272EC8AAD68036A6151F87A8169345C4A
-9CF682EB5BC59149701E56785C6F60C765666C8C8C5A90419813545166C7920D
-594890A351854E4D51EA85998B0E7058637A934B696299B47E04757753576960
-8EDF96E36C5D4E8C5C3C5F108FE953028CD1808986795EFF65E54E7351650000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000059825C3F97EE4EFB598A5FCD8A8D6FE179B079625BE78471732B71B15E74
-5FF5637B649A71C37C984E435EFC4E4B57DC56A260A96FC37D0D80FD813381BF
-8FB2899786A45DF4628A64AD898767776CE26D3E743678345A467F7582AD99AC
-4FF35EC362DD63926557676F76C3724C80CC80BA8F29914D500D57F95A926885
-6973716472FD8CB758F28CE0966A9019877F79E477E784294F2F5265535A62CD
-67CF6CCA767D7B947C95823685848FEB66DD6F2072067E1B83AB99C19EA60000
-C8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051FD7BB178727BB880877B486AE85E61808C75517560516B92626E8C767A
-91979AEA4F107F70629C7B4F95A59CE9567A585986E496BC4F345224534A53CD
-53DB5E06642C6591677F6C3E6C4E724872AF73ED75547E41822C85E98CA97BC4
-91C67169981298EF633D6669756A76E478D0854386EE532A5351542659835E87
-5F7C60B26249627962AB65906BD46CCC75B276AE789179D87DCB7F7780A588AB
-8AB98CBB907F975E98DB6A0B7C3850995C3E5FAE67876BD8743577097F8E0000
-C9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009F3B67CA7A175339758B9AED5F66819D83F180985F3C5FC575627B46903C
-686759EB5A9B7D10767E8B2C4FF55F6A6A196C376F0274E2796888688A558C79
-5EDF63CF75C579D282D7932892F2849C86ED9C2D54C15F6C658C6D5C70158CA7
-8CD3983B654F74F64E0D4ED857E0592B5A665BCC51A85E035E9C601662766577
-65A7666E6D6E72367B268150819A82998B5C8CA08CE68D74961C96444FAE64AB
-6B66821E8461856A90E85C01695398A8847A85574F0F526F5FA95E45670D0000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000798F8179890789866DF55F1762556CB84ECF72699B925206543B567458B3
-61A4626E711A596E7C897CDE7D1B96F06587805E4E194F75517558405E635E73
-5F0A67C44E26853D9589965B7C73980150FB58C1765678A7522577A585117B86
-504F590972477BC77DE88FBA8FD4904D4FBF52C95A295F0197AD4FDD821792EA
-570363556B69752B88DC8F147A4252DF58936155620A66AE6BCD7C3F83E95023
-4FF853055446583159495B9D5CF05CEF5D295E9662B16367653E65B9670B0000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006CD56CE170F978327E2B80DE82B3840C84EC870289128A2A8C4A90A692D2
-98FD9CF39D6C4E4F4EA1508D5256574A59A85E3D5FD85FD9623F66B4671B67D0
-68D251927D2180AA81A88B008C8C8CBF927E96325420982C531750D5535C58A8
-64B26734726777667A4691E652C36CA16B8658005E4C5954672C7FFB51E176C6
-646978E89B549EBB57CB59B96627679A6BCE54E969D95E55819C67959BAA67FE
-9C52685D4EA64FE353C862B9672B6CAB8FC44FAD7E6D9EBF4E0761626E800000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F2B85135473672A9B455DF37B955CAC5BC6871C6E4A84D17A1481085999
-7C8D6C11772052D959227121725F77DB97279D61690B5A7F5A1851A5540D547D
-660E76DF8FF792989CF459EA725D6EC5514D68C97DBF7DEC97629EBA64786A21
-830259845B5F6BDB731B76F27DB280178499513267289ED976EE676252FF9905
-5C24623B7C7E8CB0554F60B67D0B958053014E5F51B6591C723A803691CE5F25
-77E253845F797D0485AC8A338E8D975667F385AE9453610961086CB976520000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AED8F38552F4F51512A52C753CB5BA55E7D60A0618263D6670967DA6E67
-6D8C733673377531795088D58A98904A909190F596C4878D59154E884F594E0E
-8A898F3F981050AD5E7C59965BB95EB863DA63FA64C166DC694A69D86D0B6EB6
-719475287AAF7F8A8000844984C989818B218E0A9065967D990A617E62916B32
-6C836D747FCC7FFC6DC07F8587BA88F8676583B1983C96F76D1B7D61843D916A
-4E7153755D506B046FEB85CD862D89A75229540F5C65674E68A8740674830000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075E288CF88E191CC96E296785F8B73877ACB844E63A0756552896D416E9C
-74097559786B7C9296867ADC9F8D4FB6616E65C5865C4E864EAE50DA4E2151CC
-5BEE659968816DBC731F764277AD7A1C7CE7826F8AD2907C91CF96759818529B
-7DD1502B539867976DCB71D0743381E88F2A96A39C579E9F746058416D997D2F
-985E4EE44F364F8B51B752B15DBA601C73B2793C82D3923496B796F6970A9E97
-9F6266A66B74521752A370C888C25EC9604B61906F2371497C3E7DF4806F0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000084EE9023932C54429B6F6AD370898CC28DEF973252B45A415ECA5F046717
-697C69946D6A6F0F726272FC7BED8001807E874B90CE516D9E937984808B9332
-8AD6502D548C8A716B6A8CC4810760D167A09DF24E994E989C108A6B85C18568
-69006E7E78978155000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F0C4E104E154E2A4E314E364E3C4E3F4E424E564E584E824E858C6B4E8A
-82125F0D4E8E4E9E4E9F4EA04EA24EB04EB34EB64ECE4ECD4EC44EC64EC24ED7
-4EDE4EED4EDF4EF74F094F5A4F304F5B4F5D4F574F474F764F884F8F4F984F7B
-4F694F704F914F6F4F864F9651184FD44FDF4FCE4FD84FDB4FD14FDA4FD04FE4
-4FE5501A50285014502A502550054F1C4FF650215029502C4FFE4FEF50115006
-504350476703505550505048505A5056506C50785080509A508550B450B20000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000050C950CA50B350C250D650DE50E550ED50E350EE50F950F5510951015102
-511651155114511A5121513A5137513C513B513F51405152514C515451627AF8
-5169516A516E5180518256D8518C5189518F519151935195519651A451A651A2
-51A951AA51AB51B351B151B251B051B551BD51C551C951DB51E0865551E951ED
-51F051F551FE5204520B5214520E5227522A522E52335239524F5244524B524C
-525E5254526A527452695273527F527D528D529452925271528852918FA80000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008FA752AC52AD52BC52B552C152CD52D752DE52E352E698ED52E052F352F5
-52F852F9530653087538530D5310530F5315531A5323532F5331533353385340
-534653454E175349534D51D6535E5369536E5918537B53775382539653A053A6
-53A553AE53B053B653C37C1296D953DF66FC71EE53EE53E853ED53FA5401543D
-5440542C542D543C542E54365429541D544E548F5475548E545F547154775470
-5492547B5480547654845490548654C754A254B854A554AC54C454C854A80000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054AB54C254A454BE54BC54D854E554E6550F551454FD54EE54ED54FA54E2
-553955405563554C552E555C55455556555755385533555D5599558054AF558A
-559F557B557E5598559E55AE557C558355A9558755A855DA55C555DF55C455DC
-55E455D4561455F7561655FE55FD561B55F9564E565071DF5634563656325638
-566B5664562F566C566A56865680568A56A05694568F56A556AE56B656B456C2
-56BC56C156C356C056C856CE56D156D356D756EE56F9570056FF570457090000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005708570B570D57135718571655C7571C572657375738574E573B5740574F
-576957C057885761577F5789579357A057B357A457AA57B057C357C657D457D2
-57D3580A57D657E3580B5819581D587258215862584B58706BC05852583D5879
-588558B9589F58AB58BA58DE58BB58B858AE58C558D358D158D758D958D858E5
-58DC58E458DF58EF58FA58F958FB58FC58FD5902590A5910591B68A65925592C
-592D59325938593E7AD259555950594E595A5958596259605967596C59690000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000059785981599D4F5E4FAB59A359B259C659E859DC598D59D959DA5A255A1F
-5A115A1C5A095A1A5A405A6C5A495A355A365A625A6A5A9A5ABC5ABE5ACB5AC2
-5ABD5AE35AD75AE65AE95AD65AFA5AFB5B0C5B0B5B165B325AD05B2A5B365B3E
-5B435B455B405B515B555B5A5B5B5B655B695B705B735B755B7865885B7A5B80
-5B835BA65BB85BC35BC75BC95BD45BD05BE45BE65BE25BDE5BE55BEB5BF05BF6
-5BF35C055C075C085C0D5C135C205C225C285C385C395C415C465C4E5C530000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C505C4F5B715C6C5C6E4E625C765C795C8C5C915C94599B5CAB5CBB5CB6
-5CBC5CB75CC55CBE5CC75CD95CE95CFD5CFA5CED5D8C5CEA5D0B5D155D175D5C
-5D1F5D1B5D115D145D225D1A5D195D185D4C5D525D4E5D4B5D6C5D735D765D87
-5D845D825DA25D9D5DAC5DAE5DBD5D905DB75DBC5DC95DCD5DD35DD25DD65DDB
-5DEB5DF25DF55E0B5E1A5E195E115E1B5E365E375E445E435E405E4E5E575E54
-5E5F5E625E645E475E755E765E7A9EBC5E7F5EA05EC15EC25EC85ED05ECF0000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005ED65EE35EDD5EDA5EDB5EE25EE15EE85EE95EEC5EF15EF35EF05EF45EF8
-5EFE5F035F095F5D5F5C5F0B5F115F165F295F2D5F385F415F485F4C5F4E5F2F
-5F515F565F575F595F615F6D5F735F775F835F825F7F5F8A5F885F915F875F9E
-5F995F985FA05FA85FAD5FBC5FD65FFB5FE45FF85FF15FDD60B35FFF60216060
-601960106029600E6031601B6015602B6026600F603A605A6041606A6077605F
-604A6046604D6063604360646042606C606B60596081608D60E76083609A0000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006084609B60966097609260A7608B60E160B860E060D360B45FF060BD60C6
-60B560D8614D6115610660F660F7610060F460FA6103612160FB60F1610D610E
-6147613E61286127614A613F613C612C6134613D614261446173617761586159
-615A616B6174616F61656171615F615D6153617561996196618761AC6194619A
-618A619161AB61AE61CC61CA61C961F761C861C361C661BA61CB7F7961CD61E6
-61E361F661FA61F461FF61FD61FC61FE620062086209620D620C6214621B0000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000621E6221622A622E6230623262336241624E625E6263625B62606268627C
-62826289627E62926293629662D46283629462D762D162BB62CF62FF62C664D4
-62C862DC62CC62CA62C262C7629B62C9630C62EE62F163276302630862EF62F5
-6350633E634D641C634F6396638E638063AB637663A3638F6389639F63B5636B
-636963BE63E963C063C663E363C963D263F663C4641664346406641364266436
-651D64176428640F6467646F6476644E652A6495649364A564A9648864BC0000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064DA64D264C564C764BB64D864C264F164E7820964E064E162AC64E364EF
-652C64F664F464F264FA650064FD6518651C650565246523652B653465356537
-65366538754B654865566555654D6558655E655D65726578658265838B8A659B
-659F65AB65B765C365C665C165C465CC65D265DB65D965E065E165F16772660A
-660365FB6773663566366634661C664F664466496641665E665D666466676668
-665F6662667066836688668E668966846698669D66C166B966C966BE66BC0000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000066C466B866D666DA66E0663F66E666E966F066F566F7670F6716671E6726
-67279738672E673F67366741673867376746675E676067596763676467896770
-67A9677C676A678C678B67A667A1678567B767EF67B467EC67B367E967B867E4
-67DE67DD67E267EE67B967CE67C667E76A9C681E684668296840684D6832684E
-68B3682B685968636877687F689F688F68AD6894689D689B68836AAE68B96874
-68B568A068BA690F688D687E690168CA690868D86922692668E1690C68CD0000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068D468E768D569366912690468D768E3692568F968E068EF6928692A691A
-6923692168C669796977695C6978696B6954697E696E69396974693D69596930
-6961695E695D6981696A69B269AE69D069BF69C169D369BE69CE5BE869CA69DD
-69BB69C369A76A2E699169A0699C699569B469DE69E86A026A1B69FF6B0A69F9
-69F269E76A0569B16A1E69ED6A1469EB6A0A6A126AC16A236A136A446A0C6A72
-6A366A786A476A626A596A666A486A386A226A906A8D6AA06A846AA26AA30000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006A9786176ABB6AC36AC26AB86AB36AAC6ADE6AD16ADF6AAA6ADA6AEA6AFB
-6B0586166AFA6B126B169B316B1F6B386B3776DC6B3998EE6B476B436B496B50
-6B596B546B5B6B5F6B616B786B796B7F6B806B846B836B8D6B986B956B9E6BA4
-6BAA6BAB6BAF6BB26BB16BB36BB76BBC6BC66BCB6BD36BDF6BEC6BEB6BF36BEF
-9EBE6C086C136C146C1B6C246C236C5E6C556C626C6A6C826C8D6C9A6C816C9B
-6C7E6C686C736C926C906CC46CF16CD36CBD6CD76CC56CDD6CAE6CB16CBE0000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006CBA6CDB6CEF6CD96CEA6D1F884D6D366D2B6D3D6D386D196D356D336D12
-6D0C6D636D936D646D5A6D796D596D8E6D956FE46D856DF96E156E0A6DB56DC7
-6DE66DB86DC66DEC6DDE6DCC6DE86DD26DC56DFA6DD96DE46DD56DEA6DEE6E2D
-6E6E6E2E6E196E726E5F6E3E6E236E6B6E2B6E766E4D6E1F6E436E3A6E4E6E24
-6EFF6E1D6E386E826EAA6E986EC96EB76ED36EBD6EAF6EC46EB26ED46ED56E8F
-6EA56EC26E9F6F416F11704C6EEC6EF86EFE6F3F6EF26F316EEF6F326ECC0000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F3E6F136EF76F866F7A6F786F816F806F6F6F5B6FF36F6D6F826F7C6F58
-6F8E6F916FC26F666FB36FA36FA16FA46FB96FC66FAA6FDF6FD56FEC6FD46FD8
-6FF16FEE6FDB7009700B6FFA70117001700F6FFE701B701A6F74701D7018701F
-7030703E7032705170637099709270AF70F170AC70B870B370AE70DF70CB70DD
-70D9710970FD711C711971657155718871667162714C7156716C718F71FB7184
-719571A871AC71D771B971BE71D271C971D471CE71E071EC71E771F571FC0000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000071F971FF720D7210721B7228722D722C72307232723B723C723F72407246
-724B72587274727E7282728172877292729672A272A772B972B272C372C672C4
-72CE72D272E272E072E172F972F7500F7317730A731C7316731D7334732F7329
-7325733E734E734F9ED87357736A7368737073787375737B737A73C873B373CE
-73BB73C073E573EE73DE74A27405746F742573F87432743A7455743F745F7459
-7441745C746974707463746A7476747E748B749E74A774CA74CF74D473F10000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000074E074E374E774E974EE74F274F074F174F874F7750475037505750C750E
-750D75157513751E7526752C753C7544754D754A7549755B7546755A75697564
-7567756B756D75787576758675877574758A758975827594759A759D75A575A3
-75C275B375C375B575BD75B875BC75B175CD75CA75D275D975E375DE75FE75FF
-75FC760175F075FA75F275F3760B760D7609761F762776207621762276247634
-7630763B764776487646765C76587661766276687669766A7667766C76700000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000767276767678767C768076837688768B768E769676937699769A76B076B4
-76B876B976BA76C276CD76D676D276DE76E176E576E776EA862F76FB77087707
-770477297724771E77257726771B773777387747775A7768776B775B7765777F
-777E7779778E778B779177A0779E77B077B677B977BF77BC77BD77BB77C777CD
-77D777DA77DC77E377EE77FC780C781279267820792A7845788E78747886787C
-789A788C78A378B578AA78AF78D178C678CB78D478BE78BC78C578CA78EC0000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078E778DA78FD78F47907791279117919792C792B794079607957795F795A
-79557953797A797F798A799D79A79F4B79AA79AE79B379B979BA79C979D579E7
-79EC79E179E37A087A0D7A187A197A207A1F79807A317A3B7A3E7A377A437A57
-7A497A617A627A699F9D7A707A797A7D7A887A977A957A987A967AA97AC87AB0
-7AB67AC57AC47ABF90837AC77ACA7ACD7ACF7AD57AD37AD97ADA7ADD7AE17AE2
-7AE67AED7AF07B027B0F7B0A7B067B337B187B197B1E7B357B287B367B500000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007B7A7B047B4D7B0B7B4C7B457B757B657B747B677B707B717B6C7B6E7B9D
-7B987B9F7B8D7B9C7B9A7B8B7B927B8F7B5D7B997BCB7BC17BCC7BCF7BB47BC6
-7BDD7BE97C117C147BE67BE57C607C007C077C137BF37BF77C177C0D7BF67C23
-7C277C2A7C1F7C377C2B7C3D7C4C7C437C547C4F7C407C507C587C5F7C647C56
-7C657C6C7C757C837C907CA47CAD7CA27CAB7CA17CA87CB37CB27CB17CAE7CB9
-7CBD7CC07CC57CC27CD87CD27CDC7CE29B3B7CEF7CF27CF47CF67CFA7D060000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D027D1C7D157D0A7D457D4B7D2E7D327D3F7D357D467D737D567D4E7D72
-7D687D6E7D4F7D637D937D897D5B7D8F7D7D7D9B7DBA7DAE7DA37DB57DC77DBD
-7DAB7E3D7DA27DAF7DDC7DB87D9F7DB07DD87DDD7DE47DDE7DFB7DF27DE17E05
-7E0A7E237E217E127E317E1F7E097E0B7E227E467E667E3B7E357E397E437E37
-7E327E3A7E677E5D7E567E5E7E597E5A7E797E6A7E697E7C7E7B7E837DD57E7D
-8FAE7E7F7E887E897E8C7E927E907E937E947E967E8E7E9B7E9C7F387F3A0000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007F457F4C7F4D7F4E7F507F517F557F547F587F5F7F607F687F697F677F78
-7F827F867F837F887F877F8C7F947F9E7F9D7F9A7FA37FAF7FB27FB97FAE7FB6
-7FB88B717FC57FC67FCA7FD57FD47FE17FE67FE97FF37FF998DC80068004800B
-801280188019801C80218028803F803B804A804680528058805A805F80628068
-80738072807080768079807D807F808480868085809B8093809A80AD519080AC
-80DB80E580D980DD80C480DA80D6810980EF80F1811B81298123812F814B0000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000968B8146813E8153815180FC8171816E81658166817481838188818A8180
-818281A0819581A481A3815F819381A981B081B581BE81B881BD81C081C281BA
-81C981CD81D181D981D881C881DA81DF81E081E781FA81FB81FE820182028205
-8207820A820D821082168229822B82388233824082598258825D825A825F8264
-82628268826A826B822E827182778278827E828D829282AB829F82BB82AC82E1
-82E382DF82D282F482F382FA8393830382FB82F982DE830682DC830982D90000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000833583348316833283318340833983508345832F832B831783188385839A
-83AA839F83A283968323838E8387838A837C83B58373837583A0838983A883F4
-841383EB83CE83FD840383D8840B83C183F7840783E083F2840D8422842083BD
-8438850683FB846D842A843C855A84848477846B84AD846E848284698446842C
-846F8479843584CA846284B984BF849F84D984CD84BB84DA84D084C184C684D6
-84A1852184FF84F485178518852C851F8515851484FC85408563855885480000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000085418602854B8555858085A485888591858A85A8856D8594859B85EA8587
-859C8577857E859085C985BA85CF85B985D085D585DD85E585DC85F9860A8613
-860B85FE85FA86068622861A8630863F864D4E558654865F86678671869386A3
-86A986AA868B868C86B686AF86C486C686B086C9882386AB86D486DE86E986EC
-86DF86DB86EF8712870687088700870386FB87118709870D86F9870A8734873F
-8737873B87258729871A8760875F8778874C874E877487578768876E87590000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000087538763876A880587A2879F878287AF87CB87BD87C087D096D687AB87C4
-87B387C787C687BB87EF87F287E0880F880D87FE87F687F7880E87D288118816
-8815882288218831883688398827883B8844884288528859885E8862886B8881
-887E889E8875887D88B5887288828897889288AE889988A2888D88A488B088BF
-88B188C388C488D488D888D988DD88F9890288FC88F488E888F28904890C890A
-89138943891E8925892A892B89418944893B89368938894C891D8960895E0000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000089668964896D896A896F89748977897E89838988898A8993899889A189A9
-89A689AC89AF89B289BA89BD89BF89C089DA89DC89DD89E789F489F88A038A16
-8A108A0C8A1B8A1D8A258A368A418A5B8A528A468A488A7C8A6D8A6C8A628A85
-8A828A848AA88AA18A918AA58AA68A9A8AA38AC48ACD8AC28ADA8AEB8AF38AE7
-8AE48AF18B148AE08AE28AF78ADE8ADB8B0C8B078B1A8AE18B168B108B178B20
-8B3397AB8B268B2B8B3E8B288B418B4C8B4F8B4E8B498B568B5B8B5A8B6B0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B5F8B6C8B6F8B748B7D8B808B8C8B8E8B928B938B968B998B9A8C3A8C41
-8C3F8C488C4C8C4E8C508C558C628C6C8C788C7A8C828C898C858C8A8C8D8C8E
-8C948C7C8C98621D8CAD8CAA8CBD8CB28CB38CAE8CB68CC88CC18CE48CE38CDA
-8CFD8CFA8CFB8D048D058D0A8D078D0F8D0D8D109F4E8D138CCD8D148D168D67
-8D6D8D718D738D818D998DC28DBE8DBA8DCF8DDA8DD68DCC8DDB8DCB8DEA8DEB
-8DDF8DE38DFC8E088E098DFF8E1D8E1E8E108E1F8E428E358E308E348E4A0000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E478E498E4C8E508E488E598E648E608E2A8E638E558E768E728E7C8E81
-8E878E858E848E8B8E8A8E938E918E948E998EAA8EA18EAC8EB08EC68EB18EBE
-8EC58EC88ECB8EDB8EE38EFC8EFB8EEB8EFE8F0A8F058F158F128F198F138F1C
-8F1F8F1B8F0C8F268F338F3B8F398F458F428F3E8F4C8F498F468F4E8F578F5C
-8F628F638F648F9C8F9F8FA38FAD8FAF8FB78FDA8FE58FE28FEA8FEF90878FF4
-90058FF98FFA901190159021900D901E9016900B90279036903590398FF80000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000904F905090519052900E9049903E90569058905E9068906F907696A89072
-9082907D90819080908A9089908F90A890AF90B190B590E290E4624890DB9102
-9112911991329130914A9156915891639165916991739172918B9189918291A2
-91AB91AF91AA91B591B491BA91C091C191C991CB91D091D691DF91E191DB91FC
-91F591F6921E91FF9214922C92159211925E925792459249926492489295923F
-924B9250929C92969293929B925A92CF92B992B792E9930F92FA9344932E0000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093199322931A9323933A9335933B935C9360937C936E935693B093AC93AD
-939493B993D693D793E893E593D893C393DD93D093C893E4941A941494139403
-940794109436942B94359421943A944194529444945B94609462945E946A9229
-947094759477947D945A947C947E9481947F95829587958A9594959695989599
-95A095A895A795AD95BC95BB95B995BE95CA6FF695C395CD95CC95D595D495D6
-95DC95E195E595E296219628962E962F9642964C964F964B9677965C965E0000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000965D965F96669672966C968D96989695969796AA96A796B196B296B096B4
-96B696B896B996CE96CB96C996CD894D96DC970D96D596F99704970697089713
-970E9711970F971697199724972A97309739973D973E97449746974897429749
-975C976097649766976852D2976B977197799785977C9781977A9786978B978F
-9790979C97A897A697A397B397B497C397C697C897CB97DC97ED9F4F97F27ADF
-97F697F5980F980C9838982498219837983D9846984F984B986B986F98700000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000098719874987398AA98AF98B198B698C498C398C698E998EB990399099912
-991499189921991D991E99249920992C992E993D993E9942994999459950994B
-99519952994C99559997999899A599AD99AE99BC99DF99DB99DD99D899D199ED
-99EE99F199F299FB99F89A019A0F9A0599E29A199A2B9A379A459A429A409A43
-9A3E9A559A4D9A5B9A579A5F9A629A659A649A699A6B9A6A9AAD9AB09ABC9AC0
-9ACF9AD19AD39AD49ADE9ADF9AE29AE39AE69AEF9AEB9AEE9AF49AF19AF70000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009AFB9B069B189B1A9B1F9B229B239B259B279B289B299B2A9B2E9B2F9B32
-9B449B439B4F9B4D9B4E9B519B589B749B939B839B919B969B979B9F9BA09BA8
-9BB49BC09BCA9BB99BC69BCF9BD19BD29BE39BE29BE49BD49BE19C3A9BF29BF1
-9BF09C159C149C099C139C0C9C069C089C129C0A9C049C2E9C1B9C259C249C21
-9C309C479C329C469C3E9C5A9C609C679C769C789CE79CEC9CF09D099D089CEB
-9D039D069D2A9D269DAF9D239D1F9D449D159D129D419D3F9D3E9D469D480000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D5D9D5E9D649D519D509D599D729D899D879DAB9D6F9D7A9D9A9DA49DA9
-9DB29DC49DC19DBB9DB89DBA9DC69DCF9DC29DD99DD39DF89DE69DED9DEF9DFD
-9E1A9E1B9E1E9E759E799E7D9E819E889E8B9E8C9E929E959E919E9D9EA59EA9
-9EB89EAA9EAD97619ECC9ECE9ECF9ED09ED49EDC9EDE9EDD9EE09EE59EE89EEF
-9EF49EF69EF79EF99EFB9EFC9EFD9F079F0876B79F159F219F2C9F3E9F4A9F52
-9F549F639F5F9F609F619F669F679F6C9F6A9F779F729F769F959F9C9FA00000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000582F69C79059746451DC7199000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/euc-kr.enc b/library/encoding/euc-kr.enc
deleted file mode 100644
index 5e9bb93..0000000
--- a/library/encoding/euc-kr.enc
+++ /dev/null
@@ -1,1533 +0,0 @@
-# Encoding file: euc-kr, multi-byte
-M
-003F 0 90
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300200B72025202600A8300300AD20152225FF3C223C20182019
-201C201D3014301530083009300A300B300C300D300E300F3010301100B100D7
-00F7226022642265221E223400B0203220332103212BFFE0FFE1FFE526422640
-222022A52312220222072261225200A7203B2606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC219221902191219321943013226A226B221A223D
-221D2235222B222C2208220B2286228722822283222A222922272228FFE20000
-A2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000021D221D42200220300B4FF5E02C702D802DD02DA02D900B802DB00A100BF
-02D0222E2211220F00A42109203025C125C025B725B626642660266126652667
-2663229925C825A325D025D1259225A425A525A825A725A625A92668260F260E
-261C261E00B62020202121952197219921962198266D2669266A266C327F321C
-211633C7212233C233D821210000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FF04FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFFE6FF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-A4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000313131323133313431353136313731383139313A313B313C313D313E313F
-3140314131423143314431453146314731483149314A314B314C314D314E314F
-3150315131523153315431553156315731583159315A315B315C315D315E315F
-3160316131623163316431653166316731683169316A316B316C316D316E316F
-3170317131723173317431753176317731783179317A317B317C317D317E317F
-3180318131823183318431853186318731883189318A318B318C318D318E0000
-A5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000217021712172217321742175217621772178217900000000000000000000
-2160216121622163216421652166216721682169000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-A6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025002502250C251025182514251C252C25242534253C25012503250F2513
-251B251725232533252B253B254B2520252F25282537253F251D253025252538
-254225122511251A251925162515250E250D251E251F25212522252625272529
-252A252D252E25312532253525362539253A253D253E25402541254325442545
-2546254725482549254A00000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-A7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00003395339633972113339833C433A333A433A533A63399339A339B339C339D
-339E339F33A033A133A233CA338D338E338F33CF3388338933C833A733A833B0
-33B133B233B333B433B533B633B733B833B93380338133823383338433BA33BB
-33BC33BD33BE33BF33903391339233933394212633C033C1338A338B338C33D6
-33C533AD33AE33AF33DB33A933AA33AB33AC33DD33D033D333C333C933DC33C6
-0000000000000000000000000000000000000000000000000000000000000000
-A8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000C600D000AA0126000001320000013F014100D8015200BA00DE0166014A
-00003260326132623263326432653266326732683269326A326B326C326D326E
-326F3270327132723273327432753276327732783279327A327B24D024D124D2
-24D324D424D524D624D724D824D924DA24DB24DC24DD24DE24DF24E024E124E2
-24E324E424E524E624E724E824E9246024612462246324642465246624672468
-2469246A246B246C246D246E00BD2153215400BC00BE215B215C215D215E0000
-A9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000E6011100F001270131013301380140014200F8015300DF00FE0167014B
-01493200320132023203320432053206320732083209320A320B320C320D320E
-320F3210321132123213321432153216321732183219321A321B249C249D249E
-249F24A024A124A224A324A424A524A624A724A824A924AA24AB24AC24AD24AE
-24AF24B024B124B224B324B424B5247424752476247724782479247A247B247C
-247D247E247F24802481248200B900B200B32074207F20812082208320840000
-AA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-AB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-AC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-B0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AC00AC01AC04AC07AC08AC09AC0AAC10AC11AC12AC13AC14AC15AC16AC17
-AC19AC1AAC1BAC1CAC1DAC20AC24AC2CAC2DAC2FAC30AC31AC38AC39AC3CAC40
-AC4BAC4DAC54AC58AC5CAC70AC71AC74AC77AC78AC7AAC80AC81AC83AC84AC85
-AC86AC89AC8AAC8BAC8CAC90AC94AC9CAC9DAC9FACA0ACA1ACA8ACA9ACAAACAC
-ACAFACB0ACB8ACB9ACBBACBCACBDACC1ACC4ACC8ACCCACD5ACD7ACE0ACE1ACE4
-ACE7ACE8ACEAACECACEFACF0ACF1ACF3ACF5ACF6ACFCACFDAD00AD04AD060000
-B1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AD0CAD0DAD0FAD11AD18AD1CAD20AD29AD2CAD2DAD34AD35AD38AD3CAD44
-AD45AD47AD49AD50AD54AD58AD61AD63AD6CAD6DAD70AD73AD74AD75AD76AD7B
-AD7CAD7DAD7FAD81AD82AD88AD89AD8CAD90AD9CAD9DADA4ADB7ADC0ADC1ADC4
-ADC8ADD0ADD1ADD3ADDCADE0ADE4ADF8ADF9ADFCADFFAE00AE01AE08AE09AE0B
-AE0DAE14AE30AE31AE34AE37AE38AE3AAE40AE41AE43AE45AE46AE4AAE4CAE4D
-AE4EAE50AE54AE56AE5CAE5DAE5FAE60AE61AE65AE68AE69AE6CAE70AE780000
-B2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AE79AE7BAE7CAE7DAE84AE85AE8CAEBCAEBDAEBEAEC0AEC4AECCAECDAECF
-AED0AED1AED8AED9AEDCAEE8AEEBAEEDAEF4AEF8AEFCAF07AF08AF0DAF10AF2C
-AF2DAF30AF32AF34AF3CAF3DAF3FAF41AF42AF43AF48AF49AF50AF5CAF5DAF64
-AF65AF79AF80AF84AF88AF90AF91AF95AF9CAFB8AFB9AFBCAFC0AFC7AFC8AFC9
-AFCBAFCDAFCEAFD4AFDCAFE8AFE9AFF0AFF1AFF4AFF8B000B001B004B00CB010
-B014B01CB01DB028B044B045B048B04AB04CB04EB053B054B055B057B0590000
-B3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B05DB07CB07DB080B084B08CB08DB08FB091B098B099B09AB09CB09FB0A0
-B0A1B0A2B0A8B0A9B0ABB0ACB0ADB0AEB0AFB0B1B0B3B0B4B0B5B0B8B0BCB0C4
-B0C5B0C7B0C8B0C9B0D0B0D1B0D4B0D8B0E0B0E5B108B109B10BB10CB110B112
-B113B118B119B11BB11CB11DB123B124B125B128B12CB134B135B137B138B139
-B140B141B144B148B150B151B154B155B158B15CB160B178B179B17CB180B182
-B188B189B18BB18DB192B193B194B198B19CB1A8B1CCB1D0B1D4B1DCB1DD0000
-B4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B1DFB1E8B1E9B1ECB1F0B1F9B1FBB1FDB204B205B208B20BB20CB214B215
-B217B219B220B234B23CB258B25CB260B268B269B274B275B27CB284B285B289
-B290B291B294B298B299B29AB2A0B2A1B2A3B2A5B2A6B2AAB2ACB2B0B2B4B2C8
-B2C9B2CCB2D0B2D2B2D8B2D9B2DBB2DDB2E2B2E4B2E5B2E6B2E8B2EBB2ECB2ED
-B2EEB2EFB2F3B2F4B2F5B2F7B2F8B2F9B2FAB2FBB2FFB300B301B304B308B310
-B311B313B314B315B31CB354B355B356B358B35BB35CB35EB35FB364B3650000
-B5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B367B369B36BB36EB370B371B374B378B380B381B383B384B385B38CB390
-B394B3A0B3A1B3A8B3ACB3C4B3C5B3C8B3CBB3CCB3CEB3D0B3D4B3D5B3D7B3D9
-B3DBB3DDB3E0B3E4B3E8B3FCB410B418B41CB420B428B429B42BB434B450B451
-B454B458B460B461B463B465B46CB480B488B49DB4A4B4A8B4ACB4B5B4B7B4B9
-B4C0B4C4B4C8B4D0B4D5B4DCB4DDB4E0B4E3B4E4B4E6B4ECB4EDB4EFB4F1B4F8
-B514B515B518B51BB51CB524B525B527B528B529B52AB530B531B534B5380000
-B6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B540B541B543B544B545B54BB54CB54DB550B554B55CB55DB55FB560B561
-B5A0B5A1B5A4B5A8B5AAB5ABB5B0B5B1B5B3B5B4B5B5B5BBB5BCB5BDB5C0B5C4
-B5CCB5CDB5CFB5D0B5D1B5D8B5ECB610B611B614B618B625B62CB634B648B664
-B668B69CB69DB6A0B6A4B6ABB6ACB6B1B6D4B6F0B6F4B6F8B700B701B705B728
-B729B72CB72FB730B738B739B73BB744B748B74CB754B755B760B764B768B770
-B771B773B775B77CB77DB780B784B78CB78DB78FB790B791B792B796B7970000
-B7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B798B799B79CB7A0B7A8B7A9B7ABB7ACB7ADB7B4B7B5B7B8B7C7B7C9B7EC
-B7EDB7F0B7F4B7FCB7FDB7FFB800B801B807B808B809B80CB810B818B819B81B
-B81DB824B825B828B82CB834B835B837B838B839B840B844B851B853B85CB85D
-B860B864B86CB86DB86FB871B878B87CB88DB8A8B8B0B8B4B8B8B8C0B8C1B8C3
-B8C5B8CCB8D0B8D4B8DDB8DFB8E1B8E8B8E9B8ECB8F0B8F8B8F9B8FBB8FDB904
-B918B920B93CB93DB940B944B94CB94FB951B958B959B95CB960B968B9690000
-B8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B96BB96DB974B975B978B97CB984B985B987B989B98AB98DB98EB9ACB9AD
-B9B0B9B4B9BCB9BDB9BFB9C1B9C8B9C9B9CCB9CEB9CFB9D0B9D1B9D2B9D8B9D9
-B9DBB9DDB9DEB9E1B9E3B9E4B9E5B9E8B9ECB9F4B9F5B9F7B9F8B9F9B9FABA00
-BA01BA08BA15BA38BA39BA3CBA40BA42BA48BA49BA4BBA4DBA4EBA53BA54BA55
-BA58BA5CBA64BA65BA67BA68BA69BA70BA71BA74BA78BA83BA84BA85BA87BA8C
-BAA8BAA9BAABBAACBAB0BAB2BAB8BAB9BABBBABDBAC4BAC8BAD8BAD9BAFC0000
-B9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BB00BB04BB0DBB0FBB11BB18BB1CBB20BB29BB2BBB34BB35BB36BB38BB3B
-BB3CBB3DBB3EBB44BB45BB47BB49BB4DBB4FBB50BB54BB58BB61BB63BB6CBB88
-BB8CBB90BBA4BBA8BBACBBB4BBB7BBC0BBC4BBC8BBD0BBD3BBF8BBF9BBFCBBFF
-BC00BC02BC08BC09BC0BBC0CBC0DBC0FBC11BC14BC15BC16BC17BC18BC1BBC1C
-BC1DBC1EBC1FBC24BC25BC27BC29BC2DBC30BC31BC34BC38BC40BC41BC43BC44
-BC45BC49BC4CBC4DBC50BC5DBC84BC85BC88BC8BBC8CBC8EBC94BC95BC970000
-BA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BC99BC9ABCA0BCA1BCA4BCA7BCA8BCB0BCB1BCB3BCB4BCB5BCBCBCBDBCC0
-BCC4BCCDBCCFBCD0BCD1BCD5BCD8BCDCBCF4BCF5BCF6BCF8BCFCBD04BD05BD07
-BD09BD10BD14BD24BD2CBD40BD48BD49BD4CBD50BD58BD59BD64BD68BD80BD81
-BD84BD87BD88BD89BD8ABD90BD91BD93BD95BD99BD9ABD9CBDA4BDB0BDB8BDD4
-BDD5BDD8BDDCBDE9BDF0BDF4BDF8BE00BE03BE05BE0CBE0DBE10BE14BE1CBE1D
-BE1FBE44BE45BE48BE4CBE4EBE54BE55BE57BE59BE5ABE5BBE60BE61BE640000
-BB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BE68BE6ABE70BE71BE73BE74BE75BE7BBE7CBE7DBE80BE84BE8CBE8DBE8F
-BE90BE91BE98BE99BEA8BED0BED1BED4BED7BED8BEE0BEE3BEE4BEE5BEECBF01
-BF08BF09BF18BF19BF1BBF1CBF1DBF40BF41BF44BF48BF50BF51BF55BF94BFB0
-BFC5BFCCBFCDBFD0BFD4BFDCBFDFBFE1C03CC051C058C05CC060C068C069C090
-C091C094C098C0A0C0A1C0A3C0A5C0ACC0ADC0AFC0B0C0B3C0B4C0B5C0B6C0BC
-C0BDC0BFC0C0C0C1C0C5C0C8C0C9C0CCC0D0C0D8C0D9C0DBC0DCC0DDC0E40000
-BC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C0E5C0E8C0ECC0F4C0F5C0F7C0F9C100C104C108C110C115C11CC11DC11E
-C11FC120C123C124C126C127C12CC12DC12FC130C131C136C138C139C13CC140
-C148C149C14BC14CC14DC154C155C158C15CC164C165C167C168C169C170C174
-C178C185C18CC18DC18EC190C194C196C19CC19DC19FC1A1C1A5C1A8C1A9C1AC
-C1B0C1BDC1C4C1C8C1CCC1D4C1D7C1D8C1E0C1E4C1E8C1F0C1F1C1F3C1FCC1FD
-C200C204C20CC20DC20FC211C218C219C21CC21FC220C228C229C22BC22D0000
-BD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C22FC231C232C234C248C250C251C254C258C260C265C26CC26DC270C274
-C27CC27DC27FC281C288C289C290C298C29BC29DC2A4C2A5C2A8C2ACC2ADC2B4
-C2B5C2B7C2B9C2DCC2DDC2E0C2E3C2E4C2EBC2ECC2EDC2EFC2F1C2F6C2F8C2F9
-C2FBC2FCC300C308C309C30CC30DC313C314C315C318C31CC324C325C328C329
-C345C368C369C36CC370C372C378C379C37CC37DC384C388C38CC3C0C3D8C3D9
-C3DCC3DFC3E0C3E2C3E8C3E9C3EDC3F4C3F5C3F8C408C410C424C42CC4300000
-BE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C434C43CC43DC448C464C465C468C46CC474C475C479C480C494C49CC4B8
-C4BCC4E9C4F0C4F1C4F4C4F8C4FAC4FFC500C501C50CC510C514C51CC528C529
-C52CC530C538C539C53BC53DC544C545C548C549C54AC54CC54DC54EC553C554
-C555C557C558C559C55DC55EC560C561C564C568C570C571C573C574C575C57C
-C57DC580C584C587C58CC58DC58FC591C595C597C598C59CC5A0C5A9C5B4C5B5
-C5B8C5B9C5BBC5BCC5BDC5BEC5C4C5C5C5C6C5C7C5C8C5C9C5CAC5CCC5CE0000
-BF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C5D0C5D1C5D4C5D8C5E0C5E1C5E3C5E5C5ECC5EDC5EEC5F0C5F4C5F6C5F7
-C5FCC5FDC5FEC5FFC600C601C605C606C607C608C60CC610C618C619C61BC61C
-C624C625C628C62CC62DC62EC630C633C634C635C637C639C63BC640C641C644
-C648C650C651C653C654C655C65CC65DC660C66CC66FC671C678C679C67CC680
-C688C689C68BC68DC694C695C698C69CC6A4C6A5C6A7C6A9C6B0C6B1C6B4C6B8
-C6B9C6BAC6C0C6C1C6C3C6C5C6CCC6CDC6D0C6D4C6DCC6DDC6E0C6E1C6E80000
-C0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C6E9C6ECC6F0C6F8C6F9C6FDC704C705C708C70CC714C715C717C719C720
-C721C724C728C730C731C733C735C737C73CC73DC740C744C74AC74CC74DC74F
-C751C752C753C754C755C756C757C758C75CC760C768C76BC774C775C778C77C
-C77DC77EC783C784C785C787C788C789C78AC78EC790C791C794C796C797C798
-C79AC7A0C7A1C7A3C7A4C7A5C7A6C7ACC7ADC7B0C7B4C7BCC7BDC7BFC7C0C7C1
-C7C8C7C9C7CCC7CEC7D0C7D8C7DDC7E4C7E8C7ECC800C801C804C808C80A0000
-C1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C810C811C813C815C816C81CC81DC820C824C82CC82DC82FC831C838C83C
-C840C848C849C84CC84DC854C870C871C874C878C87AC880C881C883C885C886
-C887C88BC88CC88DC894C89DC89FC8A1C8A8C8BCC8BDC8C4C8C8C8CCC8D4C8D5
-C8D7C8D9C8E0C8E1C8E4C8F5C8FCC8FDC900C904C905C906C90CC90DC90FC911
-C918C92CC934C950C951C954C958C960C961C963C96CC970C974C97CC988C989
-C98CC990C998C999C99BC99DC9C0C9C1C9C4C9C7C9C8C9CAC9D0C9D1C9D30000
-C2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C9D5C9D6C9D9C9DAC9DCC9DDC9E0C9E2C9E4C9E7C9ECC9EDC9EFC9F0C9F1
-C9F8C9F9C9FCCA00CA08CA09CA0BCA0CCA0DCA14CA18CA29CA4CCA4DCA50CA54
-CA5CCA5DCA5FCA60CA61CA68CA7DCA84CA98CABCCABDCAC0CAC4CACCCACDCACF
-CAD1CAD3CAD8CAD9CAE0CAECCAF4CB08CB10CB14CB18CB20CB21CB41CB48CB49
-CB4CCB50CB58CB59CB5DCB64CB78CB79CB9CCBB8CBD4CBE4CBE7CBE9CC0CCC0D
-CC10CC14CC1CCC1DCC21CC22CC27CC28CC29CC2CCC2ECC30CC38CC39CC3B0000
-C3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CC3CCC3DCC3ECC44CC45CC48CC4CCC54CC55CC57CC58CC59CC60CC64CC66
-CC68CC70CC75CC98CC99CC9CCCA0CCA8CCA9CCABCCACCCADCCB4CCB5CCB8CCBC
-CCC4CCC5CCC7CCC9CCD0CCD4CCE4CCECCCF0CD01CD08CD09CD0CCD10CD18CD19
-CD1BCD1DCD24CD28CD2CCD39CD5CCD60CD64CD6CCD6DCD6FCD71CD78CD88CD94
-CD95CD98CD9CCDA4CDA5CDA7CDA9CDB0CDC4CDCCCDD0CDE8CDECCDF0CDF8CDF9
-CDFBCDFDCE04CE08CE0CCE14CE19CE20CE21CE24CE28CE30CE31CE33CE350000
-C4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CE58CE59CE5CCE5FCE60CE61CE68CE69CE6BCE6DCE74CE75CE78CE7CCE84
-CE85CE87CE89CE90CE91CE94CE98CEA0CEA1CEA3CEA4CEA5CEACCEADCEC1CEE4
-CEE5CEE8CEEBCEECCEF4CEF5CEF7CEF8CEF9CF00CF01CF04CF08CF10CF11CF13
-CF15CF1CCF20CF24CF2CCF2DCF2FCF30CF31CF38CF54CF55CF58CF5CCF64CF65
-CF67CF69CF70CF71CF74CF78CF80CF85CF8CCFA1CFA8CFB0CFC4CFE0CFE1CFE4
-CFE8CFF0CFF1CFF3CFF5CFFCD000D004D011D018D02DD034D035D038D03C0000
-C5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D044D045D047D049D050D054D058D060D06CD06DD070D074D07CD07DD081
-D0A4D0A5D0A8D0ACD0B4D0B5D0B7D0B9D0C0D0C1D0C4D0C8D0C9D0D0D0D1D0D3
-D0D4D0D5D0DCD0DDD0E0D0E4D0ECD0EDD0EFD0F0D0F1D0F8D10DD130D131D134
-D138D13AD140D141D143D144D145D14CD14DD150D154D15CD15DD15FD161D168
-D16CD17CD184D188D1A0D1A1D1A4D1A8D1B0D1B1D1B3D1B5D1BAD1BCD1C0D1D8
-D1F4D1F8D207D209D210D22CD22DD230D234D23CD23DD23FD241D248D25C0000
-C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D264D280D281D284D288D290D291D295D29CD2A0D2A4D2ACD2B1D2B8D2B9
-D2BCD2BFD2C0D2C2D2C8D2C9D2CBD2D4D2D8D2DCD2E4D2E5D2F0D2F1D2F4D2F8
-D300D301D303D305D30CD30DD30ED310D314D316D31CD31DD31FD320D321D325
-D328D329D32CD330D338D339D33BD33CD33DD344D345D37CD37DD380D384D38C
-D38DD38FD390D391D398D399D39CD3A0D3A8D3A9D3ABD3ADD3B4D3B8D3BCD3C4
-D3C5D3C8D3C9D3D0D3D8D3E1D3E3D3ECD3EDD3F0D3F4D3FCD3FDD3FFD4010000
-C7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D408D41DD440D444D45CD460D464D46DD46FD478D479D47CD47FD480D482
-D488D489D48BD48DD494D4A9D4CCD4D0D4D4D4DCD4DFD4E8D4ECD4F0D4F8D4FB
-D4FDD504D508D50CD514D515D517D53CD53DD540D544D54CD54DD54FD551D558
-D559D55CD560D565D568D569D56BD56DD574D575D578D57CD584D585D587D588
-D589D590D5A5D5C8D5C9D5CCD5D0D5D2D5D8D5D9D5DBD5DDD5E4D5E5D5E8D5EC
-D5F4D5F5D5F7D5F9D600D601D604D608D610D611D613D614D615D61CD6200000
-C8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D624D62DD638D639D63CD640D645D648D649D64BD64DD651D654D655D658
-D65CD667D669D670D671D674D683D685D68CD68DD690D694D69DD69FD6A1D6A8
-D6ACD6B0D6B9D6BBD6C4D6C5D6C8D6CCD6D1D6D4D6D7D6D9D6E0D6E4D6E8D6F0
-D6F5D6FCD6FDD700D704D711D718D719D71CD720D728D729D72BD72DD734D735
-D738D73CD744D747D749D750D751D754D756D757D758D759D760D761D763D765
-D769D76CD770D774D77CD77DD781D788D789D78CD790D798D799D79BD79D0000
-CA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F3D4F73504750F952A053EF547554E556095AC15BB6668767B667B767EF
-6B4C73C275C27A3C82DB8304885788888A368CC88DCF8EFB8FE699D5523B5374
-5404606A61646BBC73CF811A89BA89D295A34F83520A58BE597859E65E725E79
-61C763C0674667EC687F6F97764E770B78F57A087AFF7C21809D826E82718AEB
-95934E6B559D66F76E3478A37AED845B8910874E97A852D8574E582A5D4C611F
-61BE6221656267D16A446E1B751875B376E377B07D3A90AF945194529F950000
-CB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053235CAC753280DB92409598525B580859DC5CA15D175EB75F3A5F4A6177
-6C5F757A75867CE07D737DB17F8C81548221859189418B1B92FC964D9C474ECB
-4EF7500B51F1584F6137613E6168653969EA6F1175A5768676D67B8782A584CB
-F90093A7958B55805BA25751F9017CB37FB991B5502853BB5C455DE862D2636E
-64DA64E76E2070AC795B8DDD8E1EF902907D924592F84E7E4EF650655DFE5EFA
-61066957817186548E4793759A2B4E5E5091677068405109528D52926AA20000
-CC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077BC92109ED452AB602F8FF2504861A963ED64CA683C6A846FC0818889A1
-96945805727D72AC75047D797E6D80A9898B8B7490639D5162896C7A6F547D50
-7F3A8A23517C614A7B9D8B199257938C4EAC4FD3501E50BE510652C152CD537F
-577058835E9A5F91617661AC64CE656C666F66BB66F468976D87708570F1749F
-74A574CA75D9786C78EC7ADF7AF67D457D938015803F811B83968B668F159015
-93E1980398389A5A9BE84FC25553583A59515B635C4660B86212684268B00000
-CD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068E86EAA754C767878CE7A3D7CFB7E6B7E7C8A088AA18C3F968E9DC453E4
-53E9544A547156FA59D15B645C3B5EAB62F765376545657266A067AF69C16CBD
-75FC7690777E7A3F7F94800380A1818F82E682FD83F085C1883188B48AA5F903
-8F9C932E96C798679AD89F1354ED659B66F2688F7A408C379D6056F057645D11
-660668B168CD6EFE7428889E9BE46C68F9049AA84F9B516C5171529F5B545DE5
-6050606D62F163A7653B73D97A7A86A38CA2978F4E325BE16208679C74DC0000
-CE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079D183D38A878AB28DE8904E934B98465ED369E885FF90EDF90551A05B98
-5BEC616368FA6B3E704C742F74D87BA17F5083C589C08CAB95DC9928522E605D
-62EC90024F8A5149532158D95EE366E06D38709A72C273D67B5080F1945B5366
-639B7F6B4E565080584A58DE602A612762D069D09B415B8F7D1880B18F5F4EA4
-50D154AC55AC5B0C5DA05DE7652A654E68216A4B72E1768E77EF7D5E7FF981A0
-854E86DF8F038F4E90CA99039A559BAB4E184E454E5D4EC74FF1517752FE0000
-CF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000534053E353E5548E5614577557A25BC75D875ED061FC62D8655167B867E9
-69CB6B506BC66BEC6C426E9D707872D77396740377BF77E97A767D7F800981FC
-8205820A82DF88628B338CFC8EC0901190B1926492B699D29A459CE99DD79F9C
-570B5C4083CA97A097AB9EB4541B7A987FA488D98ECD90E158005C4863987A9F
-5BAE5F137A797AAE828E8EAC5026523852F85377570862F363726B0A6DC37737
-53A5735785688E7695D5673A6AC36F708A6D8ECC994BF90666776B788CB40000
-D0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B3CF90753EB572D594E63C669FB73EA78457ABA7AC57CFE8475898F8D73
-903595A852FB574775477B6083CC921EF9086A58514B524B5287621F68D86975
-969950C552A452E461C365A4683969FF747E7B4B82B983EB89B28B398FD19949
-F9094ECA599764D266116A8E7434798179BD82A9887E887F895FF90A93264F0B
-53CA602562716C727D1A7D664E98516277DC80AF4F014F0E5176518055DC5668
-573B57FA57FC5914594759935BC45C905D0E5DF15E7E5FCC628065D765E30000
-D1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000671E671F675E68CB68C46A5F6B3A6C236C7D6C826DC773987426742A7482
-74A37578757F788178EF794179477948797A7B957D007DBA7F888006802D808C
-8A188B4F8C488D779321932498E299519A0E9A0F9A659E927DCA4F76540962EE
-685491D155AB513AF90BF90C5A1C61E6F90D62CF62FFF90EF90FF910F911F912
-F91390A3F914F915F916F917F9188AFEF919F91AF91BF91C6696F91D7156F91E
-F91F96E3F920634F637A5357F921678F69606E73F9227537F923F924F9250000
-D2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D0DF926F927887256CA5A18F928F929F92AF92BF92C4E43F92D51675948
-67F08010F92E59735E74649A79CA5FF5606C62C8637B5BE75BD752AAF92F5974
-5F296012F930F931F9327459F933F934F935F936F937F93899D1F939F93AF93B
-F93CF93DF93EF93FF940F941F942F9436FC3F944F94581BF8FB260F1F946F947
-8166F948F9495C3FF94AF94BF94CF94DF94EF94FF950F9515AE98A25677B7D10
-F952F953F954F955F956F95780FDF958F9595C3C6CE5533F6EBA591A83360000
-D3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E394EB64F4655AE571858C75F5665B765E66A806BB56E4D77ED7AEF7C1E
-7DDE86CB88929132935B64BB6FBE737A75B890545556574D61BA64D466C76DE1
-6E5B6F6D6FB975F0804381BD854189838AC78B5A931F6C9375537B548E0F905D
-5510580258585E626207649E68E075767CD687B39EE84EE35788576E59275C0D
-5CB15E365F85623464E173B381FA888B8CB8968A9EDB5B855FB760B350125200
-52305716583558575C0E5C605CF65D8B5EA65F9260BC63116389641768430000
-D4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068F96AC26DD86E216ED46FE471FE76DC777979B17A3B840489A98CED8DF3
-8E4890039014905390FD934D967697DC6BD27006725872A27368776379BF7BE4
-7E9B8B8058A960C7656665FD66BE6C8C711E71C98C5A98134E6D7A814EDD51AC
-51CD52D5540C61A76771685068DF6D1E6F7C75BC77B37AE580F484639285515C
-6597675C679375D87AC78373F95A8C469017982D5C6F81C0829A9041906F920D
-5F975D9D6A5971C8767B7B4985E48B0491279A30558761F6F95B76697F850000
-D5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000863F87BA88F8908FF95C6D1B70D973DE7D61843DF95D916A99F1F95E4E82
-53756B046B12703E721B862D9E1E524C8FA35D5064E5652C6B166FEB7C437E9C
-85CD896489BD62C981D8881F5ECA67176D6A72FC7405746F878290DE4F865D0D
-5FA0840A51B763A075654EAE5006516951C968816A117CAE7CB17CE7826F8AD2
-8F1B91CF4FB6513752F554425EEC616E623E65C56ADA6FFE792A85DC882395AD
-9A629A6A9E979ECE529B66C66B77701D792B8F6297426190620065236F230000
-D6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714974897DF4806F84EE8F269023934A51BD521752A36D0C70C888C25EC9
-65826BAE6FC27C3E73754EE44F3656F9F95F5CBA5DBA601C73B27B2D7F9A7FCE
-8046901E923496F6974898189F614F8B6FA779AE91B496B752DEF960648864C4
-6AD36F5E7018721076E780018606865C8DEF8F0597329B6F9DFA9E75788C797F
-7DA083C993049E7F9E938AD658DF5F046727702774CF7C60807E512170287262
-78CA8CC28CDA8CF496F74E8650DA5BEE5ED6659971CE764277AD804A84FC0000
-D7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000907C9B279F8D58D85A415C626A136DDA6F0F763B7D2F7E37851E893893E4
-964B528965D267F369B46D416E9C700F7409746075597624786B8B2C985E516D
-622E96784F96502B5D196DEA7DB88F2A5F8B61446817F961968652D2808B51DC
-51CC695E7A1C7DBE83F196754FDA52295398540F550E5C6560A7674E68A86D6C
-728172F874067483F96275E27C6C7F797FB8838988CF88E191CC91D096E29BC9
-541D6F7E71D0749885FA8EAA96A39C579E9F67976DCB743381E89716782C0000
-D8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007ACB7B207C926469746A75F278BC78E899AC9B549EBB5BDE5E556F20819C
-83AB90884E07534D5A295DD25F4E6162633D666966FC6EFF6F2B7063779E842C
-8513883B8F1399459C3B551C62B9672B6CAB8309896A977A4EA159845FD85FD9
-671B7DB27F548292832B83BD8F1E909957CB59B95A925BD06627679A68856BCF
-71647F758CB78CE390819B4581088C8A964C9A409EA55B5F6C13731B76F276DF
-840C51AA8993514D519552C968C96C94770477207DBF7DEC97629EB56EC50000
-D9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000851151A5540D547D660E669D69276E9F76BF7791831784C2879F91699298
-9CF488824FAE519252DF59C65E3D61556478647966AE67D06A216BCD6BDB725F
-72617441773877DB801782BC83058B008B288C8C67286C90726776EE77667A46
-9DA96B7F6C92592267268499536F589359995EDF63CF663467736E3A732B7AD7
-82D7932852D95DEB61AE61CB620A62C764AB65E069596B666BCB712173F7755D
-7E46821E8302856A8AA38CBF97279D6158A89ED85011520E543B554F65870000
-DA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C767D0A7D0B805E868A958096EF52FF6C95726954735A9A5C3E5D4B5F4C
-5FAE672A68B669636E3C6E4477097C737F8E85878B0E8FF797619EF45CB760B6
-610D61AB654F65FB65FC6C116CEF739F73C97DE195945BC6871C8B10525D535A
-62CD640F64B267346A386CCA73C0749E7B947C957E1B818A823685848FEB96F9
-99C14F34534A53CD53DB62CC642C6500659169C36CEE6F5873ED7554762276E4
-76FC78D078FB792C7D46822C87E08FD4981298EF52C362D464A56E246F510000
-DB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000767C8DCB91B192629AEE9B435023508D574A59A85C285E475F77623F653E
-65B965C16609678B699C6EC278C57D2180AA8180822B82B384A1868C8A2A8B17
-90A696329F90500D4FF3F96357F95F9862DC6392676F6E43711976C380CC80DA
-88F488F589198CE08F29914D966A4F2F4F705E1B67CF6822767D767E9B445E61
-6A0A716971D4756AF9647E41854385E998DC4F107B4F7F7095A551E15E0668B5
-6C3E6C4E6CDB72AF7BC483036CD5743A50FB528858C164D86A9774A776560000
-DC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078A7861795E29739F965535E5F018B8A8FA88FAF908A522577A59C499F08
-4E19500251755C5B5E77661E663A67C468C570B3750175C579C97ADD8F279920
-9A084FDD582158315BF6666E6B656D116E7A6F7D73E4752B83E988DC89138B5C
-8F144F0F50D55310535C5B935FA9670D798F8179832F8514890789868F398F3B
-99A59C12672C4E764FF859495C015CEF5CF0636768D270FD71A2742B7E2B84EC
-8702902292D29CF34E0D4ED84FEF50855256526F5426549057E0592B5A660000
-DD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005B5A5B755BCC5E9CF9666276657765A76D6E6EA572367B267C3F7F368150
-8151819A8240829983A98A038CA08CE68CFB8D748DBA90E891DC961C964499D9
-9CE7531752065429567458B35954596E5FFF61A4626E66106C7E711A76C67C89
-7CDE7D1B82AC8CC196F0F9674F5B5F175F7F62C25D29670B68DA787C7E439D6C
-4E1550995315532A535159835A625E8760B2618A624962796590678769A76BD4
-6BD66BD76BD86CB8F968743575FA7812789179D579D87C837DCB7FE180A50000
-DE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000813E81C283F2871A88E88AB98B6C8CBB9119975E98DB9F3B56AC5B2A5F6C
-658C6AB36BAF6D5C6FF17015725D73AD8CA78CD3983B61916C3780589A014E4D
-4E8B4E9B4ED54F3A4F3C4F7F4FDF50FF53F253F8550655E356DB58EB59625A11
-5BEB5BFA5C045DF35E2B5F99601D6368659C65AF67F667FB68AD6B7B6C996CD7
-6E23700973457802793E7940796079C17BE97D177D728086820D838E84D186C7
-88DF8A508A5E8B1D8CDC8D668FAD90AA98FC99DF9E9D524AF9696714F96A0000
-DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005098522A5C7165636C5573CA7523759D7B97849C917897304E7764926BBA
-715E85A94E09F96B674968EE6E17829F8518886B63F76F81921298AF4E0A50B7
-50CF511F554655AA56175B405C195CE05E385E8A5EA05EC260F368516A616E58
-723D724072C076F879657BB17FD488F389F48A738C618CDE971C585E74BD8CFD
-55C7F96C7A617D2282727272751F7525F96D7B19588558FB5DBC5E8F5EB65F90
-60556292637F654D669166D966F8681668F27280745E7B6E7D6E7DD67F720000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000080E5821285AF897F8A93901D92E49ECD9F205915596D5E2D60DC66146673
-67906C506DC56F5F77F378A984C691CB932B4ED950CA514855845B0B5BA36247
-657E65CB6E32717D74017444748774BF766C79AA7DDA7E557FA8817A81B38239
-861A87EC8A758DE3907892919425994D9BAE53685C5169546CC46D296E2B820C
-859B893B8A2D8AAA96EA9F67526166B96BB27E9687FE8D0D9583965D651D6D89
-71EEF96E57CE59D35BAC602760FA6210661F665F732973F976DB77017B6C0000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008056807281658AA091924E1652E26B726D177A057B397D30F96F8CB053EC
-562F58515BB55C0F5C115DE2624063836414662D68B36CBC6D886EAF701F70A4
-71D27526758F758E76197B117BE07C2B7D207D39852C856D86078A34900D9061
-90B592B797F69A374FD75C6C675F6D917C9F7E8C8B168D16901F5B6B5DFD640D
-84C0905C98E173875B8B609A677E6DDE8A1F8AA69001980C5237F9707051788E
-9396887091D74FEE53D755FD56DA578258FD5AC25B885CAB5CC05E2561010000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000620D624B6388641C653665786A396B8A6C346D196F3171E772E973787407
-74B27626776179C07A577AEA7CB97D8F7DAC7E617F9E81298331849084DA85EA
-88968AB08B908F3890429083916C929692B9968B96A796A896D6970098089996
-9AD39B1A53D4587E59195B705BBF6DD16F5A719F742174B9808583FD5DE15F87
-5FAA604265EC6812696F6A536B896D356DF373E376FE77AC7B4D7D148123821C
-834084F485638A628AC49187931E980699B4620C88538FF092655D075D270000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005D69745F819D87686FD562FE7FD2893689724E1E4E5850E752DD5347627F
-66077E698805965E4F8D5319563659CB5AA45C385C4E5C4D5E025F11604365BD
-662F664267BE67F4731C77E2793A7FC5849484CD89968A668A698AE18C558C7A
-57F45BD45F0F606F62ED690D6B966E5C71847BD287558B588EFE98DF98FE4F38
-4F814FE1547B5A205BB8613C65B0666871FC7533795E7D33814E81E3839885AA
-85CE87038A0A8EAB8F9BF9718FC559315BA45BE660895BE95C0B5FC36C810000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9726DF1700B751A82AF8AF64EC05341F97396D96C0F4E9E4FC45152555E
-5A255CE86211725982BD83AA86FE88598A1D963F96C599139D099D5D580A5CB3
-5DBD5E4460E1611563E16A026E2591029354984E9C109F775B895CB86309664F
-6848773C96C1978D98549B9F65A18B018ECB95BC55355CA95DD65EB56697764C
-83F495C758D362BC72CE9D284EF0592E600F663B6B8379E79D26539354C057C3
-5D16611B66D66DAF788D827E969897445384627C63966DB27E0A814B984D0000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006AFB7F4C9DAF9E1A4E5F503B51B6591C60F963F66930723A8036F97491CE
-5F31F975F9767D0482E5846F84BB85E58E8DF9774F6FF978F97958E45B436059
-63DA6518656D6698F97A694A6A236D0B7001716C75D2760D79B37A70F97B7F8A
-F97C8944F97D8B9391C0967DF97E990A57045FA165BC6F01760079A68A9E99AD
-9B5A9F6C510461B662916A8D81C6504358305F6671098A008AFA5B7C86164FFA
-513C56B4594463A96DF95DAA696D51864E884F59F97FF980F9815982F9820000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9836B5F6C5DF98474B57916F9858207824583398F3F8F5DF9869918F987
-F988F9894EA6F98A57DF5F796613F98BF98C75AB7E798B6FF98D90069A5B56A5
-582759F85A1F5BB4F98E5EF6F98FF9906350633BF991693D6C876CBF6D8E6D93
-6DF56F14F99270DF71367159F99371C371D5F994784F786FF9957B757DE3F996
-7E2FF997884D8EDFF998F999F99A925BF99B9CF6F99CF99DF99E60856D85F99F
-71B1F9A0F9A195B153ADF9A2F9A3F9A467D3F9A5708E71307430827682D20000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9A695BB9AE59E7D66C4F9A771C18449F9A8F9A9584BF9AAF9AB5DB85F71
-F9AC6620668E697969AE6C386CF36E366F416FDA701B702F715071DF7370F9AD
-745BF9AE74D476C87A4E7E93F9AFF9B082F18A608FCEF9B19348F9B29719F9B3
-F9B44E42502AF9B5520853E166F36C6D6FCA730A777F7A6282AE85DD8602F9B6
-88D48A638B7D8C6BF9B792B3F9B8971398104E944F0D4FC950B25348543E5433
-55DA586258BA59675A1B5BE4609FF9B961CA655665FF666468A76C5A6FB30000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000070CF71AC73527B7D87088AA49C329F075C4B6C8373447389923A6EAB7465
-761F7A697E15860A514058C564C174EE751576707FC1909596CD99546E2674E6
-7AA97AAA81E586D987788A1B5A495B8C5B9B68A169006D6373A97413742C7897
-7DE97FEB81188155839E8C4C962E981166F05F8065FA67896C6A738B502D5A03
-6B6A77EE59165D6C5DCD7325754FF9BAF9BB50E551F9582F592D599659DA5BE5
-F9BCF9BD5DA262D76416649364FEF9BE66DCF9BF6A48F9C071FF7464F9C10000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A887AAF7E477E5E80008170F9C287EF89818B209059F9C390809952617E
-6B326D747E1F89258FB14FD150AD519752C757C758895BB95EB8614269956D8C
-6E676EB6719474627528752C8073833884C98E0A939493DEF9C44E8E4F515076
-512A53C853CB53F35B875BD35C24611A618265F4725B7397744076C279507991
-79B97D067FBD828B85D5865E8FC2904790F591EA968596E896E952D65F6765ED
-6631682F715C7A3690C1980A4E91F9C56A526B9E6F907189801882B885530000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000904B969596F297FB851A9B314E90718A96C45143539F54E15713571257A3
-5A9B5AC45BC36028613F63F46C856D396E726E907230733F745782D188818F45
-9060F9C6966298589D1B67088D8A925E4F4D504950DE5371570D59D45A015C09
-617066906E2D7232744B7DEF80C3840E8466853F875F885B89188B02905597CB
-9B4F4E734F915112516AF9C7552F55A95B7A5BA55E7C5E7D5EBE60A060DF6108
-610963C465386709F9C867D467DAF9C9696169626CB96D27F9CA6E38F9CB0000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FE173367337F9CC745C7531F9CD7652F9CEF9CF7DAD81FE843888D58A98
-8ADB8AED8E308E42904A903E907A914991C9936EF9D0F9D15809F9D26BD38089
-80B2F9D3F9D45141596B5C39F9D5F9D66F6473A780E48D07F9D79217958FF9D8
-F9D9F9DAF9DB807F620E701C7D68878DF9DC57A0606961476BB78ABE928096B1
-4E59541F6DEB852D967097F398EE63D66CE3909151DD61C981BA9DF94F9D501A
-51005B9C610F61FF64EC69056BC5759177E37FA98264858F87FB88638ABC0000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B7091AB4E8C4EE54F0AF9DDF9DE593759E8F9DF5DF25F1B5F5B6021F9E0
-F9E1F9E2F9E3723E73E5F9E4757075CDF9E579FBF9E6800C8033808482E18351
-F9E7F9E88CBD8CB39087F9E9F9EA98F4990CF9EBF9EC703776CA7FCA7FCC7FFC
-8B1A4EBA4EC152035370F9ED54BD56E059FB5BC55F155FCD6E6EF9EEF9EF7D6A
-8335F9F086938A8DF9F1976D9777F9F2F9F34E004F5A4F7E58F965E56EA29038
-93B099B94EFB58EC598A59D96041F9F4F9F57A14F9F6834F8CC3516553440000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9F7F9F8F9F94ECD52695B5582BF4ED4523A54A859C959FF5B505B575B5C
-606361486ECB7099716E738674F775B578C17D2B800581EA8328851785C98AEE
-8CC796CC4F5C52FA56BC65AB6628707C70B872357DBD828D914C96C09D725B71
-68E76B986F7A76DE5C9166AB6F5B7BB47C2A883696DC4E084ED75320583458BB
-58EF596C5C075E335E845F35638C66B267566A1F6AA36B0C6F3F7246F9FA7350
-748B7AE07CA7817881DF81E7838A846C8523859485CF88DD8D1391AC95770000
-EE
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000969C518D54C957285BB0624D6750683D68936E3D6ED3707D7E2188C18CA1
-8F099F4B9F4E722D7B8F8ACD931A4F474F4E5132548059D05E9562B56775696E
-6A176CAE6E1A72D9732A75BD7BB87D3582E783F9845785F78A5B8CAF8E879019
-90B896CE9F5F52E3540A5AE15BC2645865756EF472C4F9FB76847A4D7B1B7C4D
-7E3E7FDF837B8B2B8CCA8D648DE18E5F8FEA8FF9906993D14F434F7A50B35168
-5178524D526A5861587C59605C085C555EDB609B623068136BBF6C086FB10000
-EF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714E742075307538755176727B4C7B8B7BAD7BC67E8F8A6E8F3E8F49923F
-92939322942B96FB985A986B991E5207622A62986D5976647ACA7BC07D765360
-5CBE5E976F3870B97C9897119B8E9EDE63A5647A87764E014E954EAD505C5075
-544859C35B9A5E405EAD5EF75F8160C5633A653F657465CC6676667867FE6968
-6A896B636C406DC06DE86E1F6E5E701E70A1738E73FD753A775B7887798E7A0B
-7A7D7CBE7D8E82478A028AEA8C9E912D914A91D8926692CC9320970697560000
-F0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000975C98029F0E52365291557C58245E1D5F1F608C63D068AF6FDF796D7B2C
-81CD85BA88FD8AF88E44918D9664969B973D984C9F4A4FCE514651CB52A95632
-5F145F6B63AA64CD65E9664166FA66F9671D689D68D769FD6F156F6E716771E5
-722A74AA773A7956795A79DF7A207A957C977CDF7D447E70808785FB86A48A54
-8ABF8D998E819020906D91E3963B96D59CE565CF7C078DB393C35B585C0A5352
-62D9731D50275B975F9E60B0616B68D56DD9742E7A2E7D427D9C7E31816B0000
-F1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E2A8E35937E94184F5057505DE65EA7632B7F6A4E3B4F4F4F8F505A59DD
-80C4546A546855FE594F5B995DDE5EDA665D673167F1682A6CE86D326E4A6F8D
-70B773E075877C4C7D027D2C7DA2821F86DB8A3B8A858D708E8A8F339031914E
-9152944499D07AF97CA54FCA510151C657C85BEF5CFB66596A3D6D5A6E966FEC
-710C756F7AE388229021907596CB99FF83014E2D4EF2884691CD537D6ADB696B
-6C41847A589E618E66FE62EF70DD751175C77E5284B88B498D084E4B53EA0000
-F2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054AB573057405FD763016307646F652F65E8667A679D67B36B626C606C9A
-6F2C77E57825794979577D1980A2810281F3829D82B787188A8CF9FC8D048DBE
-907276F47A197A377E548077550755D45875632F64226649664B686D699B6B84
-6D256EB173CD746874A1755B75B976E1771E778B79E67E097E1D81FB852F8897
-8A3A8CD18EEB8FB0903293AD9663967397074F8453F159EA5AC95E19684E74C6
-75BE79E97A9281A386ED8CEA8DCC8FED659F6715F9FD57F76F577DDD8F2F0000
-F3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093F696C65FB561F26F844E144F98501F53C955DF5D6F5DEE6B216B6478CB
-7B9AF9FE8E498ECA906E6349643E77407A84932F947F9F6A64B06FAF71E674A8
-74DA7AC47C127E827CB27E988B9A8D0A947D9910994C52395BDF64E6672D7D2E
-50ED53C358796158615961FA65AC7AD98B928B9650095021527555315A3C5EE0
-5F706134655E660C663666A269CD6EC46F32731676217A938139825983D684BC
-50B557F05BC05BE85F6963A178267DB583DC852191C791F5518A67F57B560000
-F4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008CAC51C459BB60BD8655501CF9FF52545C3A617D621A62D364F265A56ECC
-7620810A8E60965F96BB4EDF5343559859295DDD64C56CC96DFA73947A7F821B
-85A68CE48E10907791E795E1962197C651F854F255865FB964A46F887DB48F1F
-8F4D943550C95C166CBE6DFB751B77BB7C3D7C648A798AC2581E59BE5E166377
-7252758A776B8ADC8CBC8F125EF366746DF8807D83C18ACB97519BD6FA005243
-66FF6D956EEF7DE08AE6902E905E9AD4521D527F54E86194628462DB68A20000
-F5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006912695A6A3570927126785D7901790E79D27A0D8096827882D583498549
-8C828D859162918B91AE4FC356D171ED77D7870089F85BF85FD6675190A853E2
-585A5BF560A4618164607E3D80708525928364AE50AC5D146700589C62BD63A8
-690E69786A1E6E6B76BA79CB82BB84298ACF8DA88FFD9112914B919C93109318
-939A96DB9A369C0D4E11755C795D7AFA7B517BC97E2E84C48E598E748EF89010
-6625693F744351FA672E9EDC51455FE06C9687F2885D887760B481B584030000
-F6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008D0553D6543956345A365C31708A7FE0805A810681ED8DA391899A5F9DF2
-50744EC453A060FB6E2C5C644F88502455E45CD95E5F606568946CBB6DC471BE
-75D475F476617A1A7A497DC77DFB7F6E81F486A98F1C96C999B39F52524752C5
-98ED89AA4E0367D26F064FB55BE267956C886D78741B782791DD937C87C479E4
-7A315FEB4ED654A4553E58AE59A560F0625362D6673669558235964099B199DD
-502C53535544577CFA016258FA0264E2666B67DD6FC16FEF742274388A170000
-F7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094385451560657665F48619A6B4E705870AD7DBB8A95596A812B63A27708
-803D8CAA5854642D69BB5B955E116E6FFA038569514C53F0592A6020614B6B86
-6C706CF07B1E80CE82D48DC690B098B1FA0464C76FA464916504514E5410571F
-8A0E615F6876FA0575DB7B527D71901A580669CC817F892A9000983950785957
-59AC6295900F9B2A615D727995D657615A465DF4628A64AD64FA67776CE26D3E
-722C743678347F7782AD8DDB981752245742677F724874E38CA98FA692110000
-F8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000962A516B53ED634C4F695504609665576C9B6D7F724C72FD7A1789878C9D
-5F6D6F8E70F981A8610E4FBF504F624172477BC77DE87FE9904D97AD9A198CB6
-576A5E7367B0840D8A5554205B165E635EE25F0A658380BA853D9589965B4F48
-5305530D530F548654FA57035E036016629B62B16355FA066CE16D6675B17832
-80DE812F82DE846184B2888D8912900B92EA98FD9B915E4566B466DD70117206
-FA074FF5527D5F6A615367536A196F0274E2796888688C7998C798C49A430000
-F9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054C17A1F69538AF78C4A98A899AE5F7C62AB75B276AE88AB907F96425339
-5F3C5FC56CCC73CC7562758B7B4682FE999D4E4F903C4E0B4F5553A6590F5EC8
-66306CB37455837787668CC09050971E9C1558D15B7886508B149DB45BD26068
-608D65F16C576F226FA3701A7F557FF095919592965097D352728F4451FD542B
-54B85563558A6ABB6DB57DD88266929C96779E79540854C876D286E495A495D4
-965C4EA24F0959EE5AE65DF760526297676D68416C866E2F7F38809B822A0000
-FA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FA08FA0998054EA5505554B35793595A5B695BB361C869776D77702387F9
-89E38A728AE7908299ED9AB852BE683850165E78674F8347884C4EAB541156AE
-73E6911597FF9909995799995653589F865B8A3161B26AF6737B8ED26B4796AA
-9A57595572008D6B97694FD45CF45F2661F8665B6CEB70AB738473B973FE7729
-774D7D437D627E2382378852FA0A8CE29249986F5B517A74884098015ACC4FE0
-5354593E5CFD633E6D7972F98105810783A292CF98304EA851445211578B0000
-FB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F626CC26ECE7005705070AF719273E97469834A87A28861900890A293A3
-99A8516E5F5760E0616766B385598E4A91AF978B4E4E4E92547C58D558FA597D
-5CB55F2762366248660A66676BEB6D696DCF6E566EF86F946FE06FE9705D72D0
-7425745A74E07693795C7CCA7E1E80E182A6846B84BF864E865F87748B778C6A
-93AC9800986560D1621691775A5A660F6DF76E3E743F9B425FFD60DA7B0F54C4
-5F186C5E6CD36D2A70D87D0586798A0C9D3B5316548C5B056A3A706B75750000
-FC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000798D79BE82B183EF8A718B418CA89774FA0B64F4652B78BA78BB7A6B4E38
-559A59505BA65E7B60A363DB6B61666568536E19716574B07D0890849A699C25
-6D3B6ED1733E8C4195CA51F05E4C5FA8604D60F66130614C6643664469A56CC1
-6E5F6EC96F62714C749C76877BC17C27835287579051968D9EC3532F56DE5EFB
-5F8A6062609461F7666667036A9C6DEE6FAE7070736A7E6A81BE833486D48AA8
-8CC4528373725B966A6B940454EE56865B5D6548658566C9689F6D8D6DC60000
-FD
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000723B80B491759A4D4FAF5019539A540E543C558955C55E3F5F8C673D7166
-73DD900552DB52F3586458CE7104718F71FB85B08A13668885A855A76684714A
-8431534955996BC15F595FBD63EE668971478AF18F1D9EBE4F11643A70CB7566
-866760648B4E9DF8514751F653086D3680F89ED166156B23709875D554035C79
-7D078A166B206B3D6B46543860706D3D7FD5820850D651DE559C566B56CD59EC
-5B095E0C619961986231665E66E6719971B971BA72A779A77A007FB28A700000
diff --git a/library/encoding/gb12345.enc b/library/encoding/gb12345.enc
deleted file mode 100644
index 3f3f4d2..0000000
--- a/library/encoding/gb12345.enc
+++ /dev/null
@@ -1,1414 +0,0 @@
-# Encoding file: gb12345, double-byte
-D
-233F 0 83
-21
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300230FB02C902C700A8300330052015FF5E2225202620182019
-201C201D3014301530083009300A300B300C300D300E300F3016301730103011
-00B100D700F72236222722282211220F222A222922082237221A22A522252220
-23122299222B222E2261224C2248223D221D2260226E226F22642265221E2235
-22342642264000B0203220332103FF0400A4FFE0FFE1203000A7211626062605
-25CB25CF25CE25C725C625A125A025B325B2203B219221902191219330130000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-22
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000024882489248A248B248C248D248E248F2490249124922493249424952496
-249724982499249A249B247424752476247724782479247A247B247C247D247E
-247F248024812482248324842485248624872460246124622463246424652466
-2467246824690000000032203221322232233224322532263227322832290000
-00002160216121622163216421652166216721682169216A216B000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-23
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FFE5FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFF3CFF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-24
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-25
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-26
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-27
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-28
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000010100E101CE00E0011300E9011B00E8012B00ED01D000EC014D00F301D2
-00F2016B00FA01D400F901D601D801DA01DC00FC00EA00000000000000000000
-0000000000000000000031053106310731083109310A310B310C310D310E310F
-3110311131123113311431153116311731183119311A311B311C311D311E311F
-3120312131223123312431253126312731283129000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-29
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000002500250125022503250425052506250725082509250A250B
-250C250D250E250F2510251125122513251425152516251725182519251A251B
-251C251D251E251F2520252125222523252425252526252725282529252A252B
-252C252D252E252F2530253125322533253425352536253725382539253A253B
-253C253D253E253F2540254125422543254425452546254725482549254A254B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000554A963F57C3632854CE550954C0769A764C85F977EE827E7919611B9698
-978D6C285B894FFA630966975CB880FA68489AAF660276CE51F9655671AC7FF1
-895650B2596561CA6FB382AD634C625253ED54277B06516B75A45DF462D48DCB
-9776628A801958E997387F777238767D67CF767E64FA4F70655762DC7A176591
-73ED642C6273822C9812677F7248626E62CC4F3474E3534A8FA67D4690A65E6B
-6886699C81807D8168D278C5868C938A508D8B1782DE80DE5305891252650000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-31
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000858496F94FDD582198FD5BF662B1583166B48C799B917206676F789160B2
-535153178F2980CC8C9D92C7500D72FD5099618A711988AB595482EF672C7B28
-5D297DB3752D6CF58E668FF8903C9F3B6BD491197B465F7C78A784D6853D7562
-65836BD65E635E8775F99589655D5F0A5FC58F9F58C181C2907F965B97AD908A
-7DE88CB662414FBF8B8A535E8FA88FAF8FAE904D6A195F6A819888689C49618B
-522B765F5F6C658C70156FF18CD364EF517551B067C44E1979C9990570B30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-32
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075C55E7673BB83E064AD64A592626CE2535A52C3640F92517B944F2F5E1B
-82368116818A6E246CCA99C16355535C54FA88DC57E04E0D5E036B657C3F90E8
-601664E6731C88C16750624D8CA1776C8E2991C75F6983DC8521991053C38836
-6B98615A615871E684BC825950096EC485CF64CD7CD969FD66F9834953A07B56
-5074518C6E2C5C648E6D63D253C9832C833667E578B4643D5BDF5C945DEE8A6B
-62C667F48C7A6519647B87EC995E8B927E8F93DF752395E1986B660C73160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-33
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000583456175E389577511F81785EE0655E66A2553150218D8562849214671D
-56326F6E5DE2543570928ECA626F64A463A35FB96F8890F481E38FB058756668
-5FF16C8996738D81896F64917A3157CE6A59621054484E587A0B61F26F848AA0
-627F901E9A0179E4540375F4630153196C6090725F1B99B3803B9F524F885C3A
-8D647FC565A571BE5145885D87F25D075BF562BD916C75878E8A7A2061017C4C
-4EC77DA27785919C81ED521D51FA6A7153A88E8792E496DB6EC19664695A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-34
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000790E513277D7641089F8865563E35DDD7A7F693D50B3823955984E327621
-7A975E625E8A95D652755439708A6376931857826625693F918755076DF37D14
-882262337DBD75B5832878C196CC8FAD614874F78A5E6B64523A8CDC6B218070
-847156F153065F9E53E251D17C97918B7C074FC38EA57BE17AC464675D1450AC
-810676017CB96DEC7FE067515B585BF878CB64AE641363AA632B932F642D9054
-7B5476296253592754466B7950A362345E366B864EE38CB8888B5F85902E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-35
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006020803D64D44E3955AE913264A381BD65E66C2E4F46619A6DE18A955F48
-86CB757664CB9EE885696A94520064178E4850125CF679B15C0E52307A3B60BC
-905376D75FB75F9776848E6C71C8767B7B4977AA51F3912758244F4E6EF48FEA
-65757B1B72C46ECC7FDF5AE162B55E95573084827B2C5E1D5F1F905E7DE0985B
-63826EC778989EDE5178975B588A96FB4F4375385E9760E659606FB16BBF7889
-53FC96D551CB52016389540A91E38ABF8DCC7239789F87768FED8ADC758A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-36
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E0176EF53EE91D898029F0E93205B9A8A024E22677151AC846361C252D5
-68DF4F97606B51CD6D1E515C62969B2596618C46901775D890FD77636BD272A2
-73688B80583577798CED675C934D809A5EA66E2159927AEF77ED935B6BB565B7
-7DDE58065151968A5C0D58A956788E726566981356E4920D76FE9041638754C6
-591A596A579B8EB267358DFA8235524160F058AE86FE5CE89D5D4FC4984D8A1B
-5A2560E15384627C904F910299136069800C51528033723E990C6D314E8C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-37
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008CB3767C7F707B4F4F104E4F95A56CD573D085E95E06756A7FFB6A0A792C
-91E97E4151E1716953CD8FD47BC48CA972AF98EF6CDB574A82B365B980AA623F
-963259A84EFF8A2A7D21653E83F2975E556198DB80A5532A8AB9542080BA5EE2
-6CB88CBB82AC915A54296C1B52067D1B58B3711A6C7E7C89596E4EFD5FFF61A4
-7CDE8C505C01695387025CF092D298A8760B70FD902299AE7E2B8AF759499CF3
-4F5B5426592B6577819A5B75627662C28F3B5E456C1F7B264F0F4FD8670D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-38
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D6E6DAA798F88B15F17752B64AB8F144FEF91DC65A7812F81515E9C8150
-8D74526F89868CE65FA950854ED8961C723681798CA05BCC8A0396445A667E1B
-54905676560E8A7265396982922384CB6E895E797518674667D17AFF809D8D95
-611F79C665628D1B5CA1525B92FC7F38809B7DB15D176E2F67607BD9768B9AD8
-818F7F947CD5641E93AC7A3F544A54E56B4C64F162089D3F80F3759952729769
-845B683C86E495A39694927B500B54047D6668398DDF801566F45E9A7FB90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-39
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000057C2803F68975DE5653B529F606D9F944F9B8EAC516C5BAB5F13978F6C5E
-62F18CA25171920E52FE6E9D82DF72D757A269CB8CFC591F8F9C83C754957B8D
-4F306CBD5B6459D19F1353E488319AA88C3780A16545986756FA96C7522E74DC
-526E5BE1630289024E5662D0602A68FA95DC5B9851A089C07BA199287F506163
-704C8CAB51495EE3901B7470898F572D78456B789F9C95A88ECC9B3C8A6D7678
-68426AC38DEA8CB4528A8F256EDA68CD934B90ED570B679C88F9904E54C80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009AB85B696D776C264EA55BB399ED916361A890AF97D3542B6DB55BD251FD
-558A7F557FF064BC634D65F161BE608D710A6C576F22592F676D822A58D5568E
-8C6A6BEB90DD597D8017865F6D695475559D837783CF683879BE548C4F555408
-76D28C8995A16CB36DB88D6B89109DB48CC0563F9ED175D55F8872E0606854FC
-4EA86A2A886160528F5F54C470D886799D3B6D2A5B8F5F187D0555894FAF7334
-543C539A50195F8C547C4E4E5FFD745A58FA846B80E1877472D07CCA6E560000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F27864E552C8B774E926EEC623782B1562983EF733E6ED1756B52835316
-8A7169D05F8A61F76DEE58DE6B6174B0685390847DE963DB60A3559A76138C62
-71656E195BA65E7B8352614C9EC478FA87577C27768751F060F6714C66435E4C
-604D8B0A707063EE8F1D5FBD606286D456DE6BC160946167534960E066668CC4
-7A62670371F4532F8AF18AA87E6A8477660F5A5A9B426E3E6DF78C416D3B4F19
-706B7372621660D1970D8CA8798D64CA573E57FA6A5F75787A3D7A4D7B950000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000808C99518FF96FC08B4F9DC459EC7E3E7DDD5409697568D88F2F7C4D96C6
-53CA602575BE6C7253735AC97D1A64E05E7E810A5DF1858A628051805B634F0E
-796D529160B86FDF5BC45BC28A088A1865E25FCC969B59937E7C7D00560967B7
-593E4F735BB652A083A298308CC87532924050477A3C50F967B699D55AC16BB2
-76E358055C167B8B9593714E517C80A9827159787DD87E6D6AA267EC78B19E7C
-63C064BF7C215109526A51CF85A66ABB94528E108CE4898B93757BAD4EF60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000050658266528D991E6F386FFA6F975EFA50F559DC5C076F3F6C5F75868523
-69F3596C8B1B532091AC964D854969127901712681A04EA490CA6F869A555B0C
-56BC652A927877EF50E5811A72E189D299037E737D5E527F655991758F4E8F03
-53EB7A9663ED63A5768679F88857968E622A52AB7BC0685467706377776B7AED
-6F547D5089E359D0621285C982A5754C501F4ECB75A58AA15C4A5DFE7B4B65A4
-91D14ECA6D25895F7DCA932650C58B3990329773664979818FD171FC6D780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000076E152C1834651628396775B66769BE84EAC9A5A7CBE7CB37D934E958B66
-666F9838975C5883656C93E15F9175D997567ADF7AF651C870AF7A9863EA7A76
-7CFE739697ED4E4570784E5D915253A96551820A81FC8205548E5C31759A97A0
-62D872D975BD5C4599D283CA5C40548077E982096CAE805A62D264DA5DE85177
-8DDD8E1E92F84FF153E561FC70AC528763509D515A1F5026773753777D796485
-652B628963985014723589BA51B38A237D76574783CC921E8ECD541B5CFB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004FCA7AE36D5A90E199FF55805496536154AF958B63E9697751F16168520A
-582A52D8574E780D770B5EB761777CE0625B62974EA27095800362F770E49760
-577782DB67EF68F578D5984679D16BBB54B353EF6E34514B523B5BA28AB280AF
-554358BE61C75751542D7A7A60505B5463A7647353E362635BC767AF54ED7A9F
-82E691775EAB89328A8757AE630E8DE880EF584A7B7751085FEB5BEC6B3E5321
-7B5072C268467926773666E051B5866776D45DCB7ABA8475594E9B4150800000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-40
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000994B61276F7057646606634656F062EC64F45ED395CA578362C95587881F
-81D88FA35566840A4F868CF485CD5A6A6B0465147C4395CC862D703E8B95652C
-89BD61F67E9C721B6FEB7405699472FC5ECA90CE67176D6A648852DE72628001
-4F6C59E5916A70D96F8752D26A0296F79433857E78CA7D2F512158D864C2808B
-985E6CEA68F1695E51B7539868A872819ECE7C6C72F896E270557406674E88CF
-9BC979AE83898354540F68179E9753B252F5792B6B77522950884F8B4FD00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-41
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075E27ACB7C92701D96B8529B748354E95006806F84EE9023942E5EC96190
-6F237C3E658281C993C8620071497DF47CE751C968817CB1826F51698F1B91CF
-667E4EAE8AD264A9804A50DA764271CE5BE5907C6F664E86648294105ED66599
-521788C270C852A373757433679778F7971681E891309C576DCB51DB8CC3541D
-62CE73B283F196F69F6192344F367F9A51CC974896755DBA981853E64EE46E9C
-740969B4786B993E7559528976246D4167F3516D9F8D807E56A87C607ABF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-42
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000968658DF650F96B46A135A41645F7C0D6F0F964B860676E798715EEC7210
-64C46EF7865C9B6F9E93788C97328DEF8CC29E7F6F5E798493329678622E9A62
-541592C14FA365C55C655C627E37616E6C2F5F8B73876FFE7DD15DD265235B7F
-706453754E8263A0756563848F2A502B4F966DEA7DB88AD6863F87BA7F85908F
-947C7C6E9A3E88F8843D6D1B99F17D615ABD9EBB746A78BC879E99AC99E1561B
-55CE57CB8CB79EA58CE390818109779E9945883B6EFF851366FC61626F2B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-43
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B3E8292832B76F26C135FD983BD732B830593286BDB77DB925A536F8302
-51925E3D8C8C8CBF9EBD73AB679A68859176970971646CA177095A9293826BCF
-7F8E66275BD059B95A9A958060B65011840C84996AAC76DF9333731B59225B5F
-772F919A97617CDC8FF78B0E5F4C7C7379D889936CCC871C5BC65E4268C97720
-7DBF5195514D52C95A297DEC976282D763CF778485D079D26E3A5EDF59998511
-6EC56C1162BF76BF654F61AB95A9660E879F9CF49298540D547D8B2C64780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-44
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647986116A21819C78E864699B5462B9672B83AB58A89ED86CAB6F205BDE
-964C8B00725F67D062C77261755D59C66BCD589366AE5E5552DF6155672876EE
-776672677A4662FF54EA5450920990A35A1C7D0D6C164E435976801059485357
-753796E356CA6493816660F19B276DD65462991251855AE980FD59AE9713502A
-6CE55C3C64EC4F60533F81A990066EBA852B62C85E7478BE6506637B5FF55A18
-91C09CE55C3F634F80765B7D5699947793B36D8560A86AB8737051DD5BE70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-45
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064F06FD8725B626D92157D1081BF6FC38FB25F04597452AA601259736696
-86507627632A61E67CEF8AFE54E66B509DD76BC685D5561450766F1A556A8DB4
-722C5E156015743662CD6392724C5F986E436D3E65006F5876E478D076FC7554
-522453DB4E539F9065C1802A80D6629B5486522870AE888D8DD16CE1547880DA
-57F988F48CE0966A914D4F696C9B567476C6783062A870F96F8E5F6D84EC68DA
-787C7BF781A8670B9D6C636778B0576F78129739627962AB528874356BD70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-46
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005564813E75B276AE533975DE50FB5C418B6C7BC7504F72479A1998C46F02
-74E27968648777A562FC983B8CA754C180584E52576A860B840D5E73619174F6
-8A555C4F57616F5198175A4678349B448FEB7C95525664B292EA50D583868461
-83E984B257D46A385703666E6D668B5C66DD7011671F6B3A68F2621A59BB4E03
-51C46F0667D26C8F517668CB59476B6775665D0E81CD9F4A65D7794879419A0E
-8D778C484E5E4F0155535951780C56686C238FC468C46C7D6CE38A1663900000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-47
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060706D3D727D626691FA925B534390777C3D4EDF8B194E7E9ED493229257
-524D6F5B90636DFA8B7458795D4C6B206B4969CD55C681547F8C58BB85945F3A
-64366A47936C657260846A4B77A755AC50D15DE7979864AC7FF95CED4FCF7AC5
-520783044E14602F7ACA6B3D4FB589AA79E6743452E482B964D279BD5BE26C81
-97528F156C2B50BE537F6E0564CE66746C3060C598038ACB617674CA7AAE79CB
-4E1890B174036C4256DA914B6CC58DA8534086C666F28EC05C489A456E200000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-48
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053D65A369F728DA353BB570898746B0A919B6CC9516875CA62F372AC5238
-52F87F3A7094763853749D7269B778BA96C088D97FA4713671C3518967D374E4
-58E4651856B78B93995264FE7E5E60F971B158EC4EC14EBA5FCD97CC4EFB8A8D
-5203598A7D0962544ECD65E5620E833884C969AE878D71946EB65BB97D685197
-63C967D480898339881551125B7A59828FB14E736C5D516589258EDF962E854A
-745E92ED958F6F6482E55F316492705185A9816E9C13585E8CFD4E0953C10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-49
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000050986563685155D355AA64149A3763835AC2745F82726F8068EE50E7838E
-78026BBA52396C997D1750BB5565715E7BE966EC73CA82EB67495C715220717D
-886B9583965D64C58D0D81B355846C5562477E55589250B755468CDE664C4E0A
-5C1A88F368A2634E7A0D71D2828D52FA97F65C1154E890B57D3959628CD286C7
-820C63688D66651D5C0461FE6D89793E8A2D78377533547B4F388EAB6DF15A20
-7D33795E6C885BE95B38751A814E614E6EF28072751F7525727253477E690000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000770176DB526952DD80565E2B5931734565BD6FD58A695C388671534177F3
-62FE66424EC098DF87555BE68B5853F277E24F7F5C4E99DB59CB5F0F793A58EB
-4E1667FF4E8B62ED8A93901D52E2662F55DC566C90694ED54F8D91CB98FE6C0F
-5E0260435BA489968A666536624B99965B8858FD6388552E53D776267378852C
-6A1E68B36B8A62928F3853D482126DD1758F66F88D165B70719F85AF669166D9
-7F7287009ECD9F205C6C88538FF06A39675F620D7AEA58855EB665786F310000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060555237800D6454887075295E25681362F4971C96D9723D8AB06C347761
-7A0E542E77AC9806821C8AAC78A96714720D65AF64955636601D79C153F87D72
-6B7B80865BFA55E356DB4F3A4F3C98FC5DF39B068073616B980C90015B8B8A1F
-8AA6641C825864FB55FD860791654FD77D20901F7C9F50F358516EAF5BBF8A34
-80859178849C7B9796D6968B96A87D8F9AD3788E6B727A57904296A7795F5B6B
-640D7B0B84D168AD55067E2E74637D2293966240584C4ED65B83597958540000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000737A64BB8E4B8E0F80CE82D462AC81FA6CF0915E592A614B6C70574D6524
-8CAA7671705858C76A8075F06F6D8B5A8AC757666BEF889278B363A2560670AD
-6E6F5858642A580268E0819B55107CD650188EBA6DCC8D9F71D9638F6FE46ED4
-7E278404684390036DD896768A0E5957727985E49A3075BC8B0468AF52548E22
-92BB63D0984C8E44557C9AD466FF568F60D56D9552435C4959296DFB586B7530
-751C606C821481466311689D8FE2773A8DF38CBC94355E165EF3807D70F40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C405EF7505C4EAD5EAD633A8247901A6850916E77B3540C92855F647AE5
-687663457B527D7175DB50776295982D900F51F879C37A8157165F9290145857
-5C60571F541051546E4D571863A8983D817F8715892A9000541E5C6F81C062D6
-625881319D15964099B199DD6A6259A562D3553E631654C786D97AAA5A0374E6
-896A6B6A59168C4C5F4E706373A998114E3870F75B8C7897633D665A769660CB
-5B9B5A49842C81556C6A738B4EA167897DB25F8065FA671B5FD859845A010000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005DCD5FAE537197CB90556845570D552F60DF72326FF07DAD8466840E59D4
-504950DE5C3E7DEF672A851A5473754F80C355829B4F4F4D6E2D8B025C096170
-885B761F6E29868A6587805E7D0B543B7A697D0A554F55E17FC174EE64BE8778
-6E267AA9621165A1536763E16C835DEB55DA93A270CF6C618AA35C4B7121856A
-68A7543E54346BCB6B664E9463425348821E4F0D4FAE5862620A972766647269
-52FF52D9609F8AA4661471996790897F785277FD6670563B5438932B72A70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A00606F5E0C6089819D591560DC718470EF6EAA6C5072806A8489725E2D
-7FD25AB3559C92916D177CFB969962327D30778E87665323971E8F4466875CFD
-4FE072F94E0B53A6590F56876380934151484ED99BAE7E9654B88CE2929C8237
-95916D8E5F265ACC986F96AA73FE737B7E23817A99217FA161B2967796507DAB
-76F853A2947299997BB189446E5891097FD479658A7360F397FF4EAB98055DF7
-6A6150CF54118C61856D785D9704524A54EE56C292B76D885BB56DC666C90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C0F5B5D68218096562F7B11654869544E9B6B47874E978B5354633E643A
-90AA659C81058AE75BEB68B0537887F961C86CC470098B1D5C5185AA82AF92C5
-6B238F9B65B05FFB5FC34FE191C1661F8165732960FA82085211578B5F6290A2
-884C91925E78674F602759D3514451F680F853086C7996C4718A4F114FEE7F9E
-673D55C592B979C088967D89589F620C9700865A561898085F908A3184C49157
-53D965ED5E8F755C60647D6E5A7F7DD27E8C8ED255A75BA361F865CB73840000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009078766C77297D629774859B5B787A7496EA884052DB718F5FAA65EC8A62
-5C0B99B45DE16B896C5B8A138A0A905C8FC558D362BC9D099D2854404E2B82BD
-7259869C5D1688596DAF96C5555E4E9E8A1D710954BD95B970DF6DF99E7D56B4
-781487125CA95EF68A00985495BB708E6CBF594463A9773C884D6F1482775830
-71D553AD786F96C155015F6671305BB48AFA9A576B83592E9D2679E7694A63DA
-4F6F760D7F8A6D0B967D6C274EF07662990A6A236F3E90808170599674760000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-52
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006447582F90657A918B2159DA54AC820085E5898180006930564E8036723A
-91CE51B64E5F98016396696D844966F3814B591C6DB24E0058F991AB63D692A5
-4F9D4F0A886398245937907A79FB510080F075916C825B9C59E85F5D690587FB
-501A5DF24E5977E34EE585DD6291661390915C7951045F7981C69038808475AB
-4EA688D4610F6BC561B67FA976CA6EA28A638B708ABC8B6F5F027FFC7FCC7E79
-8335852D56E06BB797F3967059FB541F92806DEB5BC598F25C395F1596B10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000537082F16AFB5B309DF961C97E93746987A271DF719288058FCE8D0F76C8
-5F717A4E786C662055B264C150AD81C376705EB896CD8E3486F9548F6CF36D8C
-6C38607F52C775285E7D512A60A061825C24753190F5923E73366CB96E389149
-670953CB53F34F5191C98A9853C85E7C8FC26DE44E8E76C26986865E611A8F3F
-99184FDE903E9B5A61096E1D6F0196854E885A3196E882075DBC79B95B878A9E
-7FBD738957DF828B9B315401904755BB5CEA5FA161086B32734480B28B7D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D745BD388D598108C6B99AD9D1B6DF551A4514357A38881539F63F48F45
-571254E15713733F6E907DE3906082D198586028966266F07D048D8A8E8D9470
-5CB37CA4670860A695B2801896F29116530096955141904B85F49196668897F5
-5B55531D783896DC683D54C9707E5BB08F09518D572854B1652266AB8D0A8D1C
-81DF846C906D7CDF947F85FB68D765E96FA186A48E81566A902076827AC871E5
-8CAC64C752476FA48CCA600E589E618E66FE8D08624E55B36E23672D8ECB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-55
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000935895987728680569A8548B4E4D70B88A5064589F4B5B857A8450B55BE8
-77BB6C088A797C986CBE76DE65AC8F3E5D845C55863868E7536062307AD96E5B
-7DBB6A1F7AE05F706F335F35638C6F3267564E085E338CEC4ED781397634969C
-62DB662D627E6CBC8D9971677F695146808753EC906E629854F287C48F4D8005
-937A851790196D5973CD659F771F7504782781FB8C9E91DD5075679575B98A3A
-9707632F93AE966384B86399775C5F817319722D6014657462EF6B63653F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E407665912D8B49829D679D652F5431871877E580A281026C414E4B7E54
-807776F4690D6B9657F7503C4F84574063076B628DBE887965E87D195FD7646F
-64F281F381F47F6E5E5F5CD95236667A79E97A1A8CEA709975D46EEF6CBB7A92
-4E2D76C55FE0941888777D427A2E816B91CD4EF28846821F54685DDE6D328B05
-7CA58EF880985E1A549276BA5B99665D9A5F73E0682A86DB6731732A8AF88A85
-90107AF971ED716E62C477DA56D14E3B845767F152A986C08CAF94447BC90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F4F6CE8795D99D06293722A62FD5C0878DA8F4964B08CFA7BC66A01838A
-88DD599D649E58EF72C0690E93108FFD8D05589C7DB48AC46E96634962D95353
-684C74228301914C55447740707C6FC1517954A88CC759FF6ECB6DC45B5C7D2B
-4ED47C7D6ED35B5081EA6F2C5B579B0368D58E2A5B977D9C7E3D7E3191128D70
-594F63CD79DF8DB3535265CF79568A5B963B7D44947D7E825634918967007F6A
-5C0A907566285DE64F5067DE505A4F5C57505EA7000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-58
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E8D4E0C51404E105EFF53454E154E984E1E9B325B6C56694E2879BA4E3F
-53154E47592D723B536E6C1056DF80E499976BD3777E9F174E364E9F9F104E5C
-4E694E9382885B5B55C7560F4EC45399539D53B453A553AE97688D0B531A53F5
-532D5331533E8CFE5366536352025208520E52445233528C5274524C525E5261
-525C84AF527D528252815290529351827F544EBB4EC34EC94EC24EE84EE14EEB
-4EDE50B44EF34F224F644EF5500050964F094F474F5E4F6765384F5A4F5D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F5F4F574F324F3D4F764F744F914F894F834F8F4F7E4F7B51154F7C5102
-4F945114513C51374FC54FDA4FE34FDC4FD14FDF4FF85029504C4FF3502C500F
-502E502D4FFE501C500C5025502850E8504350555048504E506C50C2513B5110
-513A50BA50D6510650ED50EC50E650EE5107510B4EDD6C3D4F5850C94FCE9FA0
-6C467CF4516E5DFD9ECC999856C5591452F9530D8A0753109CEC591951554EA0
-51564EB3886E88A4893B81E088D279805B3488037FB851AB51B151BD51BC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051C7519651A251A58A018A108A0C8A158B338A4E8A258A418A368A468A54
-8A588A528A868A848A7F8A708A7C8A758A6C8A6E8ACD8AE28A618A9A8AA58A91
-8A928ACF8AD18AC98ADB8AD78AC28AB68AF68AEB8B148B018AE48AED8AFC8AF3
-8AE68AEE8ADE8B288B9C8B168B1A8B108B2B8B2D8B568B598B4E8B9E8B6B8B96
-5369537A961D962296219631962A963D963C964296589654965F9689966C9672
-96749688968D969796B09097909B913A9099911490A190B490B390B691340000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090B890B090DF90C590BE913690C490C79106914890E290DC90D790DB90EB
-90EF90FE91049122911E91239131912F91399143914682BB595052F152AC52AD
-52BE54FF52D052D652F053DF71EE77CD5EF451F551FC9B2F53B65F01755A5DF0
-574C580A57A1587E58BC58C558D15729572C572A573358D9572E572F58E2573B
-5742576958E0576B58DA577C577B5768576D5776577357E157A4578C584F57CF
-57A75816579357A057D55852581D586457D257B857F457EF57F857E457DD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000580B580D57FD57ED5800581E5819584458205865586C58815889589A5880
-99A89F1961FF8279827D827F828F828A82A88284828E8291858C829982AB8553
-82BE82B085F682CA82E3829882B782AE83A7840784EF82A982B482A182AA829F
-82C482E782A482E1830982F782E48622830782DC82F482D282D8830C82FB82D3
-8526831A8306584B716282E082D5831C8351855884FD83088392833C83348331
-839B854E832F834F8347834385888340831785BA832D833A833372966ECE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008541831B85CE855284C08452846483B083788494843583A083AA8393839C
-8385837C859F83A9837D8555837B8398839E83A89DAF849383C1840183E583D8
-58078418840B83DD83FD83D6841C84388411840683D483DF840F840383F883F9
-83EA83C583C07E0883F083E1845C8451845A8459847385468488847A85628478
-843C844684698476851E848E8431846D84C184CD84D09A4084BD84D384CA84BF
-84BA863A84A184B984B4849793A38577850C750D853884F0861E851F85FA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008556853B84FF84FC8559854885688564855E857A77A285438604857B85A4
-85A88587858F857985EA859C858585B985B785B0861A85C185DC85FF86278605
-86298616863C5EFE5F08593C596980375955595A5958530F5C225C255C2C5C37
-624C636B647662BB62CA62DA62D762EE649F62F66339634B634363AD63F66371
-637A638E6451636D63AC638A636963AE645C63F263F863E064B363C463DE63CE
-645263C663BE65046441640B641B6420640C64266421645E6516646D64960000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647A64F764FC6499651B64C064D064D764E464E265096525652E5F0B5FD2
-75195F11535F53F1563053E953E853FB541254165406544B563856C8545456A6
-54435421550454BC5423543254825494547754715464549A5680548454765466
-565D54D054AD54C254B4566054A754A6563555F6547254A3566654BB54BF54CC
-567254DA568C54A954AA54A4566554CF54DE561C54E7562E54FD551454F355E9
-5523550F55115527552A5616558F55B5554956C055415555553F5550553C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005537555655755576557755335530555C558B55D2558355B155B955885581
-559F557E55D65591557B55DF560D56B35594559955EA55F755C9561F55D156C1
-55EC55D455E655DD55C455EF55E555F2566F55CC55CD55E855F555E48F61561E
-5608560C560156B6562355FE56005627562D565856395657562C564D56625659
-5695564C5654568656645671566B567B567C5685569356AF56D456D756DD56E1
-570756EB56F956FF5704570A5709571C5E435E195E145E115E6C5E585E570000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E375E445E545E5B5E5E5E615C8C5C7A5C8D5C905D875C885CF45C995C91
-5D505C9C5CB55CA25D2C5CAC5CAB5CB15CA35CC15CB75DA75CD25DA05CCB5D22
-5D975D0D5D275D265D2E5D245D1E5D065D1B5DB85D3E5D345D3D5D6C5D5B5D6F
-5D815D6B5D4B5D4A5D695D745D825D995D9D8C735DB75DD45F735F775F825F87
-5F89540E5FA05F995F9C5FA85FAD5FB55FBC88625F6172AD72B072B473777341
-72C372C172CE72CD72D272E8736A72E9733B72F472F7730172F3736B72FA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072FB731773137380730A731E731D737C732273397325732C733873317350
-734D73577360736C736F737E821B592598E75924590298E0993398E9993C98EA
-98EB98ED98F4990999114F59991B9937993F994399489949994A994C99625E80
-5EE15E8B5E965EA55EA05EB95EB55EBE5EB38CE15ED25ED15EDB5EE85EEA81BA
-5FC45FC95FD661FA61AE5FEE616A5FE15FE4613E60B561345FEA5FED5FF86019
-60356026601B600F600D6029602B600A61CC6021615F61E860FB613760420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000606A60F26096609A6173609D60836092608C609B611C60BB60B160DD60D8
-60C660DA60B4612061926115612360F46100610E612B614A617561AC619461A7
-61B761D461F55FDD96B39582958695C8958E9594958C95E595AD95AB9B2E95AC
-95BE95B69B2995BF95BD95BC95C395CB95D495D095D595DE4E2C723F62156C35
-6C546C5C6C4A70436C856C906C946C8C6C686C696C746C766C866F596CD06CD4
-6CAD702770186CF16CD76CB26CE06CD66FFC6CEB6CEE6CB16CD36CEF6D870000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D396D276D0C6D796E5E6D076D046D196D0E6D2B6FAE6D2E6D356D1A700F
-6EF86F6F6D336D916D6F6DF66F7F6D5E6D936D946D5C6D606D7C6D636E1A6DC7
-6DC56DDE70066DBF6DE06FA06DE66DDD6DD9700B6DAB6E0C6DAE6E2B6E6E6E4E
-6E6B6EB26E5F6E866E536E546E326E256E4470676EB16E9870446F2D70056EA5
-6EA76EBD6EBB6EB76F776EB46ECF6E8F6EC26E9F6F627020701F6F246F156EF9
-6F2F6F3670326F746F2A6F096F296F896F8D6F8C6F786F726F7C6F7A70280000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FC96FA76FB96FB66FC26FE16FEE6FDE6FE06FEF701A7023701B70397035
-705D705E5B805B845B955B935BA55BB8752F9A2B64345BE45BEE89305BF08E47
-8B078FB68FD38FD58FE58FEE8FE490878FE690158FE890059004900B90909011
-900D9016902190359036902D902F9044905190529050906890589062905B66B9
-9074907D908290889083908B5F505F575F565F585C3B54AB5C505C595B715C63
-5C687FBC5F335F295F2D82745F3C9B3B5C6E59815983598D5AF55AD759A30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000599759CA5B00599E59A459D259B259AF59D759BE5A6D5B0859DD5B4C59E3
-59D859F95A0C5A095AA75AFB5A115A235A135A405A675A4A5A555A3C5A625B0B
-80EC5AAA5A9B5A775A7A5ABE5AEB5AB25B215B2A5AB85AE05AE35B195AD65AE6
-5AD85ADC5B095B175B165B325B375B405C155C1C5B5A5B655B735B515B535B62
-99D499DF99D99A369A5B99D199D89A4D9A4A99E29A6A9A0F9A0D9A059A429A2D
-9A169A419A2E9A389A439A449A4F9A659A647CF97D067D027D077D087E8A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D1C7D157D137D3A7D327D317E107D3C7D407D3F7D5D7D4E7D737D867D83
-7D887DBE7DBA7DCB7DD47DC47D9E7DAC7DB97DA37DB07DC77DD97DD77DF97DF2
-7E627DE67DF67DF17E0B7DE17E097E1D7E1F7E1E7E2D7E0A7E117E7D7E397E35
-7E327E467E457E887E5A7E527E6E7E7E7E707E6F7E985E7A757F5DDB753E9095
-738E74A3744B73A2739F73CF73C274CF73B773B373C073C973C873E573D9980A
-740A73E973E773DE74BD743F7489742A745B7426742574287430742E742C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-68
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000741B741A7441745C74577455745974A6746D747E749C74D4748074817487
-748B749E74A874A9749074A774DA74BA97D997DE97DC674C6753675E674869AA
-6AEA6787676A677367986898677568D66A05689F678B6777677C67F06ADB67D8
-6AF367E967B06AE867D967B567DA67B367DD680067C367B867E26ADF67C16A89
-68326833690F6A48684E6968684469BF6883681D68556A3A68416A9C68406B12
-684A6849682968B5688F687468776893686B6B1E696E68FC6ADD69E768F90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B0F68F0690B6901695768E369106971693969606942695D6B16696B6980
-69986978693469CC6AEC6ADA69CE6AF8696669636979699B69A769BB69AB69AD
-69D469B169C169CA6AB369956AE7698D69FF6AA369ED6A176A186A6569F26A44
-6A3E6AA06A506A5B6A356A8E6AD36A3D6A286A586ADE6A916A906AA96A976AAB
-733773526B816B826BA46B846B9E6BAE6B8D6BAB6B9B6BAF6BAA8ED48EDB8EF2
-8EFB8F648EF98EFC8EEB8EE48F628EFA8EFE8F0A8F078F058F128F268F1E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008F1F8F1C8F338F468F548ECE62146227621B621F62226221622562246229
-81E7750C74F474FF750F75117513653465EE65EF65F0660A66C7677266036615
-6600708566F7661D66346631663666358006665F66C46641664F668966616657
-66776684668C66D6669D66BE66DB66DC66E666E98CC18CB08CBA8CBD8D048CB2
-8CC58D108CD18CDA8CD58CEB8CE78CFB899889AC89A189BF89A689AF89B289B7
-726E729F725D7266726F727E727F7284728B728D728F72926308633263B00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000643F64D880046BEA6BF36BFD6BFF6BF96C056C0C6C066C0D6C156C186C19
-6C1A6C216C2C6C246C2A6C3265356555656B725872527256723086625216809F
-809C809380BC670A80BD80B180AB80AD80B480B76727815680E981DA80DB80C2
-80C480D980CD80D7671080DD811B80F180F480ED81BE810E80F280FC67158112
-8C5A8161811E812C811881328148814C815381748159815A817181608169817C
-817D816D8167584D5AB58188818281CF6ED581A381AA81CC672681CA81BB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081C181A66B5F6B376B396B436B466B5998AE98AF98B698BC98C698C86BB3
-5F408F4289F365909F4F659565BC65C665C465C365CC65CE65D265D6716C7152
-7096719770BB70C070B770AB70B171C170CA7110711371DC712F71317173715C
-716871457172714A7178717A719871B371B571A871A071E071D471E771F9721D
-7228706C71FE716671B9623E623D624362486249793B794079467949795B795C
-7953795A79B079577960798E7967797A79AA798A799A79A779B35FD15FD00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000061DF605D605A606760416059606361646106610D615D61A9619D61CB61E3
-62078080807F6C936FA96DFC78EF77F878AD780978687818781165AB782D78B8
-781D7839792A7931781F783C7825782C78237829784E786D786478FD78267850
-7847784C786A78E77893789A788778E378A178A378B278B978A578D478D978C9
-78EC78F2790578F479137924791E79349F959EF99EFB9EFC76F17704779876F9
-77077708771A77227719772D772677357738775E77BC77477743775A77680000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077627765777F778D777D7780778C7791779F77A077B077B577BD753A7540
-754E754B7548755B7572757975837F587F617F5F8A487F687F867F717F797F88
-7F7E76CD76E5883291D291D391D491D991D791D591F791E791E4934691F591F9
-9208922692459211921092019227920492259200923A9266923792339255923D
-9238925E926C926D923F9460923092499248924D922E9239943892AC92A0927A
-92AA92EE92CF940392E3943A92B192A693A7929692CC92A993F59293927F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093A9929A931A92AB9283940B92A892A39412933892F193D792E592F092EF
-92E892BC92DD92F69426942792C392DF92E6931293069369931B934093019315
-932E934393079308931F93199365934793769354936493AA9370938493E493D8
-9428938793CC939893B893BF93A693B093B5944C93E293DC93DD93CD93DE93C3
-93C793D19414941D93F794659413946D9420947993F99419944A9432943F9454
-9463937E77E777EC96C979D579ED79E379EB7A065D477A037A027A1E7A140000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-70
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A397A377A619ECF99A57A707688768E7693769976A474DE74E0752C9CE9
-9CF69D079D069D239D879E159D1D9D1F9DE59D2F9DD99D309D429E1E9D539E1D
-9D609D529DF39D5C9D619D939D6A9D6F9D899D989D9A9DC09DA59DA99DC29DBC
-9E1A9DD39DDA9DEF9DE69DF29DF89E0C9DFA9E1B7592759476647658759D7667
-75A375B375B475B875C475B175B075C375C2760275CD75E3764675E675E47647
-75E7760375F175FC75FF761076007649760C761E760A7625763B761576190000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-71
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000761B763C762276207640762D7630766D76357643766E7633764D76697654
-765C76567672766F7FCA7AE67A787A797A807A867A887A957AC77AA07AAC7AA8
-7AB67AB3886488698872887D887F888288A2896088B788BC88C9893388CE895D
-894788F1891A88FC88E888FE88F08921891989138938890A8964892B89368941
-8966897B758B80E576B876B477DC801280148016801C8020802E80258026802C
-802980288031800B803580438046807980528075807189839807980E980F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009821981C6F4198269837984E98539873986298599865986C9870864D8654
-866C87E38806867A867C867B86A8868D868B8706869D86A786A386AA869386A9
-86B686C486B5882386B086BA86B186AF86C987F686B486E986FA87EF86ED8784
-86D0871386DE881086DF86D886D18703870786F88708870A870D87098723873B
-871E8725872E871A873E87C88734873187298737873F87828722877D8811877B
-87608770874C876E878B8753876387BB876487598765879387AF87CE87D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000087C68788878587AD8797878387AB87E587AC87B587B387CB87D387BD87D1
-87C087CA87DB87EA87E087EE8816881387FE880A881B88218839883C7F367F4C
-7F447F4582107AFA7AFD7B087BE47B047B677B0A7B2B7B0F7B477B387B2A7B19
-7B2E7B317B207B257B247B337C697B1E7B587BF37B457B757B4C7B8F7B607B6E
-7B7B7B627B727B717B907C007BCB7BB87BAC7B9D7C5C7B857C1E7B9C7BA27C2B
-7BB47C237BC17BCC7BDD7BDA7BE57BE67BEA7C0C7BFE7BFC7C0F7C6A7C0B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007C1F7C2A7C267C387C5F7C4081FE82018202820481EC8844822182228264
-822D822F8228822B8238826B82338234823E82448249824B824F825A825F8268
-887E88CA888888D888DF895E7F9D7FA57FA77FAF7FB07FB27C7C65497C917CF2
-7CF67C9E7CA27CB27CBC7CBD7CDD7CC77CCC7CCD7CC87CC57CD77CE8826E66A8
-7FBF7FCE7FD57FE57FE17FE67FE97FEE7FF37CF87E367DA67DAE7E477E9B9EA9
-9EB48D738D848D948D918DB28D678D6D8C478C49914A9150914E914F91640000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-75
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009162916191709169916F91C591C3917291749179918C91859190918D9191
-91A291A391AA91AD91AE91AF91B591B491BA8C559E7A8E898DEB8E058E598E69
-8DB58DBF8DBC8DBA8E4C8DD68DD78DDA8E928DCE8DCF8DDB8DC68DEC8E7A8E55
-8DE38E9A8E8B8DE48E098DFD8E148E1D8E1F8E938E2E8E238E918E3A8E408E39
-8E358E3D8E318E498E418E428EA18E638E4A8E708E768E7C8E6F8E748E858EAA
-8E948E908EA68E9E8C788C828C8A8C858C988C94659B89D689F489DA89DC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-76
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000089E589EB89F68A3E8B26975A96E9974296EF9706973D9708970F970E972A
-97449730973E9F549F5F9F599F609F5C9F669F6C9F6A9F779EFD9EFF9F0996B9
-96BC96BD96CE96D277BF8B8E928E947E92C893E8936A93CA938F943E946B9B77
-9B749B819B839B8E9C787A4C9B929C5F9B909BAD9B9A9BAA9B9E9C6D9BAB9B9D
-9C589BC19C7A9C319C399C239C379BC09BCA9BC79BFD9BD69BEA9BEB9BE19BE4
-9BE79BDD9BE29BF09BDB9BF49BD49C5D9C089C109C0D9C129C099BFF9C200000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009C329C2D9C289C259C299C339C3E9C489C3B9C359C459C569C549C529C67
-977C978597C397BD979497C997AB97A397B297B49AB19AB09AB79DBB9AB69ABA
-9ABC9AC19AC09ACF9AC29AD69AD59AD19B459B439B589B4E9B489B4D9B519957
-995C992E995599549ADF9AE19AE69AEF9AEB9AFB9AED9AF99B089B0F9B229B1F
-9B234E489EBE7E3B9E829E879E889E8B9E9293D69E9D9E9F9EDB9EDC9EDD9EE0
-9EDF9EE29EF79EE79EE59EF29EEF9F229F2C9F2F9F399F379F3D9F3E9F440000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-78
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000896C95C693365F4685147E94538251B24E119F635679515A6DC09F156597
-56419AEE83034E3089075E727A4098B35E7F95A49B0D52128FF45F597A6B98E2
-51E050A24EF7835085915118636E6372524B5938774F8721814A7E8D91CC66C6
-5E1877AD9E7556C99EF46FDB61DE77C770309EB5884A95E282F951ED62514EC6
-673497C67C647E3497A69EAF786E820D672F677E56CC53F098B16AAF7F4E6D82
-7CF04E074FC27E6B9E7956AE9B1A846F53F690C179A67C72613F4E919AD20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-79
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075C796BB53EA7DFB88FD79CD78437B5151C6000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/gb1988.enc b/library/encoding/gb1988.enc
deleted file mode 100644
index 298732c..0000000
--- a/library/encoding/gb1988.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: gb1988, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-002000210022002300A500250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D203E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/gb2312.enc b/library/encoding/gb2312.enc
deleted file mode 100644
index 813d7a6..0000000
--- a/library/encoding/gb2312.enc
+++ /dev/null
@@ -1,1380 +0,0 @@
-# Encoding file: gb2312, double-byte
-D
-233F 0 81
-21
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300230FB02C902C700A8300330052015FF5E2225202620182019
-201C201D3014301530083009300A300B300C300D300E300F3016301730103011
-00B100D700F72236222722282211220F222A222922082237221A22A522252220
-23122299222B222E2261224C2248223D221D2260226E226F22642265221E2235
-22342642264000B0203220332103FF0400A4FFE0FFE1203000A7211626062605
-25CB25CF25CE25C725C625A125A025B325B2203B219221902191219330130000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-22
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000024882489248A248B248C248D248E248F2490249124922493249424952496
-249724982499249A249B247424752476247724782479247A247B247C247D247E
-247F248024812482248324842485248624872460246124622463246424652466
-2467246824690000000032203221322232233224322532263227322832290000
-00002160216121622163216421652166216721682169216A216B000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-23
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FFE5FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFF3CFF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-24
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-25
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-26
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-27
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-28
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000010100E101CE00E0011300E9011B00E8012B00ED01D000EC014D00F301D2
-00F2016B00FA01D400F901D601D801DA01DC00FC00EA00000000000000000000
-0000000000000000000031053106310731083109310A310B310C310D310E310F
-3110311131123113311431153116311731183119311A311B311C311D311E311F
-3120312131223123312431253126312731283129000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-29
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000002500250125022503250425052506250725082509250A250B
-250C250D250E250F2510251125122513251425152516251725182519251A251B
-251C251D251E251F2520252125222523252425252526252725282529252A252B
-252C252D252E252F2530253125322533253425352536253725382539253A253B
-253C253D253E253F2540254125422543254425452546254725482549254A254B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000554A963F57C3632854CE550954C07691764C853C77EE827E788D72319698
-978D6C285B894FFA630966975CB880FA684880AE660276CE51F9655671AC7FF1
-888450B2596561CA6FB382AD634C625253ED54277B06516B75A45DF462D48DCB
-9776628A8019575D97387F627238767D67CF767E64464F708D2562DC7A176591
-73ED642C6273822C9881677F7248626E62CC4F3474E3534A529E7ECA90A65E2E
-6886699C81807ED168D278C5868C9551508D8C2482DE80DE5305891252650000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-31
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000858496F94FDD582199715B9D62B162A566B48C799C8D7206676F789160B2
-535153178F8880CC8D1D94A1500D72C8590760EB711988AB595482EF672C7B28
-5D297EF7752D6CF58E668FF8903C9F3B6BD491197B145F7C78A784D6853D6BD5
-6BD96BD65E015E8775F995ED655D5F0A5FC58F9F58C181C2907F965B97AD8FB9
-7F168D2C62414FBF53D8535E8FA88FA98FAB904D68075F6A819888689CD6618B
-522B762A5F6C658C6FD26EE85BBE6448517551B067C44E1979C9997C70B30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-32
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075C55E7673BB83E064AD62E894B56CE2535A52C3640F94C27B944F2F5E1B
-82368116818A6E246CCA9A736355535C54FA886557E04E0D5E036B657C3F90E8
-601664E6731C88C16750624D8D22776C8E2991C75F6983DC8521991053C28695
-6B8B60ED60E8707F82CD82314ED36CA785CF64CD7CD969FD66F9834953957B56
-4FA7518C6D4B5C428E6D63D253C9832C833667E578B4643D5BDF5C945DEE8BE7
-62C667F48C7A640063BA8749998B8C177F2094F24EA7961098A4660C73160000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-33
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000573A5C1D5E38957F507F80A05382655E7545553150218D856284949E671D
-56326F6E5DE2543570928F66626F64A463A35F7B6F8890F481E38FB05C186668
-5FF16C8996488D81886C649179F057CE6A59621054484E587A0B60E96F848BDA
-627F901E9A8B79E4540375F4630153196C608FDF5F1B9A70803B9F7F4F885C3A
-8D647FC565A570BD514551B2866B5D075BA062BD916C75748E0C7A2061017B79
-4EC77EF877854E1181ED521D51FA6A7153A88E87950496CF6EC19664695A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-34
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000784050A877D7641089E6590463E35DDD7A7F693D4F20823955984E3275AE
-7A975E625E8A95EF521B5439708A6376952457826625693F918755076DF37EAF
-882262337EF075B5832878C196CC8F9E614874F78BCD6B64523A8D506B21806A
-847156F153064ECE4E1B51D17C97918B7C074FC38E7F7BE17A9C64675D1450AC
-810676017CB96DEC7FE067515B585BF878CB64AE641363AA632B9519642D8FBE
-7B5476296253592754466B7950A362345E266B864EE38D37888B5F85902E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-35
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006020803D62C54E39535590F863B880C665E66C2E4F4660EE6DE18BDE5F39
-86CB5F536321515A83616863520063638E4850125C9B79775BFC52307A3B60BC
-905376D75FB75F9776848E6C706F767B7B4977AA51F3909358244F4E6EF48FEA
-654C7B1B72C46DA47FDF5AE162B55E95573084827B2C5E1D5F1F90127F1498A0
-63826EC7789870B95178975B57AB75354F4375385E9760E659606DC06BBF7889
-53FC96D551CB52016389540A94938C038DCC7239789F87768FED8C0D53E00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-36
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E0176EF53EE948998769F0E952D5B9A8BA24E224E1C51AC846361C252A8
-680B4F97606B51BB6D1E515C6296659796618C46901775D890FD77636BD2728A
-72EC8BFB583577798D4C675C9540809A5EA66E2159927AEF77ED953B6BB565AD
-7F0E58065151961F5BF958A954288E726566987F56E4949D76FE9041638754C6
-591A593A579B8EB267358DFA8235524160F0581586FE5CE89E454FC4989D8BB9
-5A2560765384627C904F9102997F6069800C513F80335C1499756D314E8C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-37
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008D3053D17F5A7B4F4F104E4F96006CD573D085E95E06756A7FFB6A0A77FE
-94927E4151E170E653CD8FD483038D2972AF996D6CDB574A82B365B980AA623F
-963259A84EFF8BBF7EBA653E83F2975E556198DE80A5532A8BFD542080BA5E9F
-6CB88D3982AC915A54296C1B52067EB7575F711A6C7E7C89594B4EFD5FFF6124
-7CAA4E305C0167AB87025CF0950B98CE75AF70FD902251AF7F1D8BBD594951E4
-4F5B5426592B657780A45B75627662C28F905E456C1F7B264F0F4FD8670D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-38
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D6E6DAA798F88B15F17752B629A8F854FEF91DC65A7812F81515E9C8150
-8D74526F89868D4B590D50854ED8961C723681798D1F5BCC8BA3964459877F1A
-54905676560E8BE565396982949976D66E895E727518674667D17AFF809D8D76
-611F79C665628D635188521A94A27F38809B7EB25C976E2F67607BD9768B9AD8
-818F7F947CD5641E95507A3F544A54E56B4C640162089E3D80F3759952729769
-845B683C86E49601969494EC4E2A54047ED968398DDF801566F45E9A7FB90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-39
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000057C2803F68975DE5653B529F606D9F9A4F9B8EAC516C5BAB5F135DE96C5E
-62F18D21517194A952FE6C9F82DF72D757A267848D2D591F8F9C83C754957B8D
-4F306CBD5B6459D19F1353E486CA9AA88C3780A16545987E56FA96C7522E74DC
-52505BE1630289024E5662D0602A68FA51735B9851A089C27BA199867F5060EF
-704C8D2F51495E7F901B747089C4572D78455F529F9F95FA8F689B3C8BE17678
-684267DC8DEA8D35523D8F8A6EDA68CD950590ED56FD679C88F98FC754C80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009AB85B696D776C264EA55BB39A87916361A890AF97E9542B6DB55BD251FD
-558A7F557FF064BC634D65F161BE608D710A6C576C49592F676D822A58D5568E
-8C6A6BEB90DD597D801753F76D695475559D837783CF683879BE548C4F555408
-76D28C8996026CB36DB88D6B89109E648D3A563F9ED175D55F8872E0606854FC
-4EA86A2A886160528F7054C470D886799E3F6D2A5B8F5F187EA255894FAF7334
-543C539A5019540E547C4E4E5FFD745A58F6846B80E1877472D07CCA6E560000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F27864E552C62A44E926CAA623782B154D7534E733E6ED1753B52125316
-8BDD69D05F8A60006DEE574F6B2273AF68538FD87F13636260A3552475EA8C62
-71156DA35BA65E7B8352614C9EC478FA87577C27768751F060F6714C66435E4C
-604D8C0E707063258F895FBD606286D456DE6BC160946167534960E066668D3F
-79FD4F1A70E96C478BB38BF27ED88364660F5A5A9B426D516DF78C416D3B4F19
-706B83B7621660D1970D8D27797851FB573E57FA673A75787A3D79EF7B950000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000808C99658FF96FC08BA59E2159EC7EE97F095409678168D88F917C4D96C6
-53CA602575BE6C7253735AC97EA7632451E0810A5DF184DF628051805B634F0E
-796D524260B86D4E5BC45BC28BA18BB065E25FCC964559937EE77EAA560967B7
-59394F735BB652A0835A988A8D3E753294BE50477A3C4EF767B69A7E5AC16B7C
-76D1575A5C167B3A95F4714E517C80A9827059787F04832768C067EC78B17877
-62E363617B804FED526A51CF835069DB92748DF58D3189C1952E7BAD4EF60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000506582305251996F6E106E856DA75EFA50F559DC5C066D466C5F7586848B
-686859568BB253209171964D854969127901712680F64EA490CA6D479A845A07
-56BC640594F077EB4FA5811A72E189D2997A7F347EDE527F655991758F7F8F83
-53EB7A9663ED63A5768679F888579636622A52AB8282685467706377776B7AED
-6D017ED389E359D0621285C982A5754C501F4ECB75A58BEB5C4A5DFE7B4B65A4
-91D14ECA6D25895F7D2795264EC58C288FDB9773664B79818FD170EC6D780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C3D52B283465162830E775B66769CB84EAC60CA7CBE7CB37ECF4E958B66
-666F988897595883656C955C5F8475C997567ADF7ADE51C070AF7A9863EA7A76
-7EA0739697ED4E4570784E5D915253A9655165E781FC8205548E5C31759A97A0
-62D872D975BD5C459A7983CA5C40548077E94E3E6CAE805A62D2636E5DE85177
-8DDD8E1E952F4FF153E560E770AC526763509E435A1F5026773753777EE26485
-652B628963985014723589C951B38BC07EDD574783CC94A7519B541B5CFB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004FCA7AE36D5A90E19A8F55805496536154AF5F0063E9697751EF6168520A
-582A52D8574E780D770B5EB761777CE0625B62974EA27095800362F770E49760
-577782DB67EF68F578D5989779D158F354B353EF6E34514B523B5BA28BFE80AF
-554357A660735751542D7A7A60505B5463A762A053E362635BC767AF54ED7A9F
-82E691775E9388E4593857AE630E8DE880EF57577B774FA95FEB5BBD6B3E5321
-7B5072C2684677FF773665F751B54E8F76D45CBF7AA58475594E9B4150800000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-40
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000998861276E8357646606634656F062EC62695ED39614578362C955878721
-814A8FA3556683B167658D5684DD5A6A680F62E67BEE961151706F9C8C3063FD
-89C861D27F0670C26EE57405699472FC5ECA90CE67176D6A635E52B372628001
-4F6C59E5916A70D96D9D52D24E5096F7956D857E78CA7D2F5121579264C2808B
-7C7B6CEA68F1695E51B7539868A872819ECE7BF172F879BB6F137406674E91CC
-9CA4793C83898354540F68174E3D538952B1783E5386522950884F8B4FD00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-41
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075E27ACB7C926CA596B6529B748354E94FE9805483B28FDE95705EC9601C
-6D9F5E18655B813894FE604B70BC7EC37CAE51C968817CB1826F4E248F8691CF
-667E4EAE8C0564A9804A50DA759771CE5BE58FBD6F664E86648295635ED66599
-521788C270C852A3730E7433679778F797164E3490BB9CDE6DCB51DB8D41541D
-62CE73B283F196F69F8494C34F367F9A51CC707596755CAD988653E64EE46E9C
-740969B4786B998F7559521876246D4167F3516D9F99804B54997B3C7ABF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-42
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009686578462E29647697C5A0464027BD36F0F964B82A6536298855E907089
-63B35364864F9C819E93788C97328DEF8D429E7F6F5E79845F559646622E9A74
-541594DD4FA365C55C655C617F1586516C2F5F8B73876EE47EFF5CE6631B5B6A
-6EE653754E7163A0756562A18F6E4F264ED16CA67EB68BBA841D87BA7F57903B
-95237BA99AA188F8843D6D1B9A867EDC59889EBB739B780186829A6C9A82561B
-541757CB4E709EA653568FC881097792999286EE6EE1851366FC61626F2B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-43
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008C298292832B76F26C135FD983BD732B8305951A6BDB77DB94C6536F8302
-51925E3D8C8C8D384E4873AB679A68859176970971646CA177095A9295416BCF
-7F8E66275BD059B95A9A95E895F74EEC840C84996AAC76DF9530731B68A65B5F
-772F919A97617CDC8FF78C1C5F257C7379D889C56CCC871C5BC65E4268C97720
-7EF55195514D52C95A297F05976282D763CF778485D079D26E3A5E9959998511
-706D6C1162BF76BF654F60AF95FD660E879F9E2394ED540D547D8C2C64780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-44
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647986116A21819C78E864699B5462B9672B83AB58A89ED86CAB6F205BDE
-964C8C0B725F67D062C772614EA959C66BCD589366AE5E5552DF6155672876EE
-776672677A4662FF54EA545094A090A35A1C7EB36C164E435976801059485357
-753796BE56CA63208111607C95F96DD65462998151855AE980FD59AE9713502A
-6CE55C3C62DF4F60533F817B90066EBA852B62C85E7478BE64B5637B5FF55A18
-917F9E1F5C3F634F80425B7D556E954A954D6D8560A867E072DE51DD5B810000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-45
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062E76CDE725B626D94AE7EBD81136D53519C5F04597452AA601259736696
-8650759F632A61E67CEF8BFA54E66B279E256BB485D5545550766CA4556A8DB4
-722C5E156015743662CD6392724C5F986E436D3E65006F5876D878D076FC7554
-522453DB4E535E9E65C1802A80D6629B5486522870AE888D8DD16CE1547880DA
-57F988F48D54966A914D4F696C9B55B776C6783062A870F96F8E5F6D84EC68DA
-787C7BF781A8670B9E4F636778B0576F78129739627962AB528874356BD70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-46
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005564813E75B276AE533975DE50FB5C418B6C7BC7504F72479A9798D86F02
-74E27968648777A562FC98918D2B54C180584E52576A82F9840D5E7351ED74F6
-8BC45C4F57616CFC98875A4678349B448FEB7C955256625194FA4EC683868461
-83E984B257D467345703666E6D668C3166DD7011671F6B3A6816621A59BB4E03
-51C46F0667D26C8F517668CB59476B6775665D0E81109F5065D7794879419A91
-8D775C824E5E4F01542F5951780C56686C148FC45F036C7D6CE38BAB63900000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-47
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060706D3D72756266948E94C553438FC17B7E4EDF8C264E7E9ED494B194B3
-524D6F5C90636D458C3458115D4C6B206B4967AA545B81547F8C589985375F3A
-62A26A47953965726084686577A74E544FA85DE7979864AC7FD85CED4FCF7A8D
-520783044E14602F7A8394A64FB54EB279E6743452E482B964D279BD5BDD6C81
-97528F7B6C22503E537F6E0564CE66746C3060C598778BF75E86743C7A7779CB
-4E1890B174036C4256DA914B6CC58D8B533A86C666F28EAF5C489A716E200000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-48
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053D65A369F8B8DA353BB570898A76743919B6CC9516875CA62F372AC5238
-529D7F3A7094763853749E4A69B7786E96C088D97FA4713671C3518967D374E4
-58E4651856B78BA9997662707ED560F970ED58EC4EC14EBA5FCD97E74EFB8BA4
-5203598A7EAB62544ECD65E5620E833884C98363878D71946EB65BB97ED25197
-63C967D480898339881551125B7A59828FB14E736C5D516589258F6F962E854A
-745E951095F06DA682E55F3164926D128428816E9CC3585E8D5B4E0953C10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-49
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F1E6563685155D34E2764149A9A626B5AC2745F82726DA968EE50E7838E
-7802674052396C997EB150BB5565715E7B5B665273CA82EB67495C715220717D
-886B95EA965564C58D6181B355846C5562477F2E58924F2455468D4F664C4E0A
-5C1A88F368A2634E7A0D70E7828D52FA97F65C1154E890B57ECD59628D4A86C7
-820C820D8D6664445C0461516D89793E8BBE78377533547B4F388EAB6DF15A20
-7EC5795E6C885BA15A76751A80BE614E6E1758F0751F7525727253477EF30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000770176DB526980DC57235E08593172EE65BD6E7F8BD75C388671534177F3
-62FE65F64EC098DF86805B9E8BC653F277E24F7F5C4E9A7659CB5F0F793A58EB
-4E1667FF4E8B62ED8A93901D52BF662F55DC566C90024ED54F8D91CA99706C0F
-5E0260435BA489C68BD56536624B99965B885BFF6388552E53D77626517D852C
-67A268B36B8A62928F9353D482126DD1758F4E668D4E5B70719F85AF669166D9
-7F7287009ECD9F205C5E672F8FF06811675F620D7AD658855EB665706F310000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060555237800D6454887075295E05681362F4971C53CC723D8C016C347761
-7A0E542E77AC987A821C8BF47855671470C165AF64955636601D79C153F84E1D
-6B7B80865BFA55E356DB4F3A4F3C99725DF3677E80386002988290015B8B8BBC
-8BF5641C825864DE55FD82CF91654FD77D20901F7C9F50F358516EAF5BBF8BC9
-80839178849C7B97867D968B968F7EE59AD3788E5C817A57904296A7795F5B59
-635F7B0B84D168AD55067F2974107D2295016240584C4ED65B83597958540000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000736D631E8E4B8E0F80CE82D462AC53F06CF0915E592A60016C70574D644A
-8D2A762B6EE9575B6A8075F06F6D8C2D8C0857666BEF889278B363A253F970AD
-6C645858642A580268E0819B55107CD650188EBA6DCC8D9F70EB638F6D9B6ED4
-7EE68404684390036DD896768BA85957727985E4817E75BC8A8A68AF52548E22
-951163D098988E44557C4F5366FF568F60D56D9552435C4959296DFB586B7530
-751C606C82148146631167618FE2773A8DF38D3494C15E165385542C70C30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C405EF7505C4EAD5EAD633A8247901A6850916E77B3540C94DC5F647AE5
-687663457B527EDF75DB507762955934900F51F879C37A8156FE5F9290146D82
-5C60571F541051546E4D56E263A89893817F8715892A9000541E5C6F81C062D6
-625881319E3596409A6E9A7C692D59A562D3553E631654C786D96D3C5A0374E6
-889C6B6A59168C4C5F2F6E7E73A9987D4E3870F75B8C7897633D665A769660CB
-5B9B5A494E0781556C6A738B4EA167897F515F8065FA671B5FD859845A010000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005DCD5FAE537197E68FDD684556F4552F60DF4E3A6F4D7EF482C7840E59D4
-4F1F4F2A5C3E7EAC672A851A5473754F80C355829B4F4F4D6E2D8C135C096170
-536B761F6E29868A658795FB7EB9543B7A337D0A95EE55E17FC174EE631D8717
-6DA17A9D621165A1536763E16C835DEB545C94A84E4C6C618BEC5C4B65E0829C
-68A7543E54346BCB6B664E9463425348821E4F0D4FAE575E620A96FE66647269
-52FF52A1609F8BEF661471996790897F785277FD6670563B54389521727A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A00606F5E0C6089819D591560DC718470EF6EAA6C5072806A8488AD5E2D
-4E605AB3559C94E36D177CFB9699620F7EC6778E867E5323971E8F9666875CE1
-4FA072ED4E0B53A6590F54136380952851484ED99C9C7EA454B88D2488548237
-95F26D8E5F265ACC663E966973B0732E53BF817A99857FA15BAA967796507EBF
-76F853A2957699997BB189446E584E617FD479658BE660F354CD4EAB98795DF7
-6A6150CF54118C618427785D9704524A54EE56A395006D885BB56DC666530000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C0F5B5D6821809655787B11654869544E9B6B47874E978B534F631F643A
-90AA659C80C18C10519968B0537887F961C86CC46CFB8C225C5185AA82AF950C
-6B238F9B65B05FFB5FC34FE18845661F8165732960FA51745211578B5F6290A2
-884C91925E78674F602759D3514451F680F853086C7996C4718A4F114FEE7F9E
-673D55C5950879C088967EE3589F620C9700865A5618987B5F908BB884C49157
-53D965ED5E8F755C60647D6E5A7F7EEA7EED8F6955A75BA360AC65CB73840000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009009766377297EDA9774859B5B667A7496EA884052CB718F5FAA65EC8BE2
-5BFB9A6F5DE16B896C5B8BAD8BAF900A8FC5538B62BC9E269E2D54404E2B82BD
-7259869C5D1688596DAF96C554D14E9A8BB6710954BD960970DF6DF976D04E25
-781487125CA95EF68A00989C960E708E6CBF594463A9773C884D6F1482735830
-71D5538C781A96C155015F6671305BB48C1A9A8C6B83592E9E2F79E76768626C
-4F6F75A17F8A6D0B96336C274EF075D2517B68376F3E90808170599674760000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-52
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064475C2790657A918C2359DA54AC8200836F898180006930564E80367237
-91CE51B64E5F987563964E1A53F666F3814B591C6DB24E0058F9533B63D694F1
-4F9D4F0A886398905937905779FB4EEA80F075916C825B9C59E85F5D69058681
-501A5DF24E5977E34EE5827A6291661390915C794EBF5F7981C69038808475AB
-4EA688D4610F6BC55FC64E4976CA6EA28BE38BAE8C0A8BD15F027FFC7FCC7ECE
-8335836B56E06BB797F3963459FB541F94F66DEB5BC5996E5C395F1596900000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000537082F16A315A749E705E947F2883B984248425836787478FCE8D6276C8
-5F719896786C662054DF62E54F6381C375C85EB896CD8E0A86F9548F6CF36D8C
-6C38607F52C775285E7D4F1860A05FE75C24753190AE94C072B96CB96E389149
-670953CB53F34F5191C98BF153C85E7C8FC26DE44E8E76C26986865E611A8206
-4F594FDE903E9C7C61096E1D6E1496854E885A3196E84E0E5C7F79B95B878BED
-7FBD738957DF828B90C15401904755BB5CEA5FA161086B3272F180B28A890000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D745BD388D598848C6B9A6D9E336E0A51A4514357A38881539F63F48F95
-56ED54585706733F6E907F188FDC82D1613F6028966266F07EA68D8A8DC394A5
-5CB37CA4670860A6960580184E9190E75300966851418FD08574915D665597F5
-5B55531D78386742683D54C9707E5BB08F7D518D572854B1651266828D5E8D43
-810F846C906D7CDF51FF85FB67A365E96FA186A48E81566A90207682707671E5
-8D2362E952196CFD8D3C600E589E618E66FE8D60624E55B36E23672D8F670000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-55
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094E195F87728680569A8548B4E4D70B88BC86458658B5B857A84503A5BE8
-77BB6BE18A797C986CBE76CF65A98F975D2D5C5586386808536062187AD96E5B
-7EFD6A1F7AE05F706F335F20638C6DA867564E085E108D264ED780C07634969C
-62DB662D627E6CBC8D7571677F695146808753EC906E629854F286F08F998005
-951785178FD96D5973CD659F771F7504782781FB8D1E94884FA6679575B98BCA
-9707632F9547963584B8632377415F8172F04E896014657462EF6B63653F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E2775C790D18BC1829D679D652F5431871877E580A281026C414E4B7EC7
-804C76F4690D6B966267503C4F84574063076B628DBE53EA65E87EB85FD7631A
-63B781F381F47F6E5E1C5CD95236667A79E97A1A8D28709975D46EDE6CBB7A92
-4E2D76C55FE0949F88777EC879CD80BF91CD4EF24F17821F54685DDE6D328BCC
-7CA58F7480985E1A549276B15B99663C9AA473E0682A86DB6731732A8BF88BDB
-90107AF970DB716E62C477A956314E3B845767F152A986C08D2E94F87B510000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F4F6CE8795D9A7B6293722A62FD4E1378168F6C64B08D5A7BC668695E84
-88C55986649E58EE72B6690E95258FFD8D5857607F008C0651C6634962D95353
-684C74228301914C55447740707C6D4A517954A88D4459FF6ECB6DC45B5C7D2B
-4ED47C7D6ED35B5081EA6E0D5B579B0368D58E2A5B977EFC603B7EB590B98D70
-594F63CD79DF8DB3535265CF79568BC5963B7EC494BB7E825634918967007F6A
-5C0A907566285DE64F5067DE505A4F5C57505EA7000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-58
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E8D4E0C51404E105EFF53454E154E984E1E9B325B6C56694E2879BA4E3F
-53154E47592D723B536E6C1056DF80E499976BD3777E9F174E364E9F9F104E5C
-4E694E9382885B5B556C560F4EC4538D539D53A353A553AE97658D5D531A53F5
-5326532E533E8D5C5366536352025208520E522D5233523F5240524C525E5261
-525C84AF527D528252815290529351827F544EBB4EC34EC94EC24EE84EE14EEB
-4EDE4F1B4EF34F224F644EF54F254F274F094F2B4F5E4F6765384F5A4F5D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F5F4F574F324F3D4F764F744F914F894F834F8F4F7E4F7B4FAA4F7C4FAC
-4F944FE64FE84FEA4FC54FDA4FE34FDC4FD14FDF4FF85029504C4FF3502C500F
-502E502D4FFE501C500C50255028507E504350555048504E506C507B50A550A7
-50A950BA50D6510650ED50EC50E650EE5107510B4EDD6C3D4F584F654FCE9FA0
-6C467C74516E5DFD9EC999985181591452F9530D8A07531051EB591951554EA0
-51564EB3886E88A44EB5811488D279805B3488037FB851AB51B151BD51BC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051C7519651A251A58BA08BA68BA78BAA8BB48BB58BB78BC28BC38BCB8BCF
-8BCE8BD28BD38BD48BD68BD88BD98BDC8BDF8BE08BE48BE88BE98BEE8BF08BF3
-8BF68BF98BFC8BFF8C008C028C048C078C0C8C0F8C118C128C148C158C168C19
-8C1B8C188C1D8C1F8C208C218C258C278C2A8C2B8C2E8C2F8C328C338C358C36
-5369537A961D962296219631962A963D963C964296499654965F9667966C9672
-96749688968D969796B09097909B909D909990AC90A190B490B390B690BA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090B890B090CF90C590BE90D090C490C790D390E690E290DC90D790DB90EB
-90EF90FE91049122911E91239131912F913991439146520D594252A252AC52AD
-52BE54FF52D052D652F053DF71EE77CD5EF451F551FC9B2F53B65F01755A5DEF
-574C57A957A1587E58BC58C558D15729572C572A57335739572E572F575C573B
-574257695785576B5786577C577B5768576D5776577357AD57A4578C57B257CF
-57A757B4579357A057D557D857DA57D957D257B857F457EF57F857E457DD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000580B580D57FD57ED5800581E5819584458205865586C58815889589A5880
-99A89F1961FF8279827D827F828F828A82A88284828E82918297829982AB82B8
-82BE82B082C882CA82E3829882B782AE82CB82CC82C182A982B482A182AA829F
-82C482CE82A482E1830982F782E4830F830782DC82F482D282D8830C82FB82D3
-8311831A83068314831582E082D5831C8351835B835C83088392833C83348331
-839B835E832F834F83478343835F834083178360832D833A8333836683650000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008368831B8369836C836A836D836E83B0837883B383B483A083AA8393839C
-8385837C83B683A9837D83B8837B8398839E83A883BA83BC83C1840183E583D8
-58078418840B83DD83FD83D6841C84388411840683D483DF840F840383F883F9
-83EA83C583C0842683F083E1845C8451845A8459847384878488847A84898478
-843C844684698476848C848E8431846D84C184CD84D084E684BD84D384CA84BF
-84BA84E084A184B984B4849784E584E3850C750D853884F08539851F853A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008556853B84FF84FC8559854885688564855E857A77A285438572857B85A4
-85A88587858F857985AE859C858585B985B785B085D385C185DC85FF86278605
-86298616863C5EFE5F08593C594180375955595A5958530F5C225C255C2C5C34
-624C626A629F62BB62CA62DA62D762EE632262F66339634B634363AD63F66371
-637A638E63B4636D63AC638A636963AE63BC63F263F863E063FF63C463DE63CE
-645263C663BE64456441640B641B6420640C64266421645E6484646D64960000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000647A64B764B8649964BA64C064D064D764E464E265096525652E5F0B5FD2
-75195F11535F53F153FD53E953E853FB541254165406544B5452545354545456
-54435421545754595423543254825494547754715464549A549B548454765466
-549D54D054AD54C254B454D254A754A654D354D4547254A354D554BB54BF54CC
-54D954DA54DC54A954AA54A454DD54CF54DE551B54E7552054FD551454F35522
-5523550F55115527552A5567558F55B55549556D55415555553F5550553C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005537555655755576557755335530555C558B55D2558355B155B955885581
-559F557E55D65591557B55DF55BD55BE5594559955EA55F755C9561F55D155EB
-55EC55D455E655DD55C455EF55E555F255F355CC55CD55E855F555E48F94561E
-5608560C56015624562355FE56005627562D565856395657562C564D56625659
-565C564C5654568656645671566B567B567C5685569356AF56D456D756DD56E1
-56F556EB56F956FF5704570A5709571C5E0F5E195E145E115E315E3B5E3C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E375E445E545E5B5E5E5E615C8C5C7A5C8D5C905C965C885C985C995C91
-5C9A5C9C5CB55CA25CBD5CAC5CAB5CB15CA35CC15CB75CC45CD25CE45CCB5CE5
-5D025D035D275D265D2E5D245D1E5D065D1B5D585D3E5D345D3D5D6C5D5B5D6F
-5D5D5D6B5D4B5D4A5D695D745D825D995D9D8C735DB75DC55F735F775F825F87
-5F895F8C5F955F995F9C5FA85FAD5FB55FBC88625F6172AD72B072B472B772B8
-72C372C172CE72CD72D272E872EF72E972F272F472F7730172F3730372FA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072FB731773137321730A731E731D7315732273397325732C733873317350
-734D73577360736C736F737E821B592598E7592459029963996799689969996A
-996B996C99749977997D998099849987998A998D999099919993999499955E80
-5E915E8B5E965EA55EA05EB95EB55EBE5EB38D535ED25ED15EDB5EE85EEA81BA
-5FC45FC95FD65FCF60035FEE60045FE15FE45FFE600560065FEA5FED5FF86019
-60356026601B600F600D6029602B600A603F602160786079607B607A60420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000606A607D6096609A60AD609D60836092608C609B60EC60BB60B160DD60D8
-60C660DA60B4612061266115612360F46100610E612B614A617561AC619461A7
-61B761D461F55FDD96B395E995EB95F195F395F595F695FC95FE960396049606
-9608960A960B960C960D960F96129615961696179619961A4E2C723F62156C35
-6C546C5C6C4A6CA36C856C906C946C8C6C686C696C746C766C866CA96CD06CD4
-6CAD6CF76CF86CF16CD76CB26CE06CD66CFA6CEB6CEE6CB16CD36CEF6CFE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006D396D276D0C6D436D486D076D046D196D0E6D2B6D4D6D2E6D356D1A6D4F
-6D526D546D336D916D6F6D9E6DA06D5E6D936D946D5C6D606D7C6D636E1A6DC7
-6DC56DDE6E0E6DBF6DE06E116DE66DDD6DD96E166DAB6E0C6DAE6E2B6E6E6E4E
-6E6B6EB26E5F6E866E536E546E326E256E446EDF6EB16E986EE06F2D6EE26EA5
-6EA76EBD6EBB6EB76ED76EB46ECF6E8F6EC26E9F6F626F466F476F246F156EF9
-6F2F6F366F4B6F746F2A6F096F296F896F8D6F8C6F786F726F7C6F7A6FD10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FC96FA76FB96FB66FC26FE16FEE6FDE6FE06FEF701A7023701B70397035
-704F705E5B805B845B955B935BA55BB8752F9A9E64345BE45BEE89305BF08E47
-8B078FB68FD38FD58FE58FEE8FE48FE98FE68FF38FE890059004900B90269011
-900D9016902190359036902D902F9044905190529050906890589062905B66B9
-9074907D908290889083908B5F505F575F565F585C3B54AB5C505C595B715C63
-5C667FBC5F2A5F295F2D82745F3C9B3B5C6E59815983598D59A959AA59A30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000599759CA59AB599E59A459D259B259AF59D759BE5A055A0659DD5A0859E3
-59D859F95A0C5A095A325A345A115A235A135A405A675A4A5A555A3C5A625A75
-80EC5AAA5A9B5A775A7A5ABE5AEB5AB25AD25AD45AB85AE05AE35AF15AD65AE6
-5AD85ADC5B095B175B165B325B375B405C155C1C5B5A5B655B735B515B535B62
-9A759A779A789A7A9A7F9A7D9A809A819A859A889A8A9A909A929A939A969A98
-9A9B9A9C9A9D9A9F9AA09AA29AA39AA59AA77E9F7EA17EA37EA57EA87EA90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007EAD7EB07EBE7EC07EC17EC27EC97ECB7ECC7ED07ED47ED77EDB7EE07EE1
-7EE87EEB7EEE7EEF7EF17EF27F0D7EF67EFA7EFB7EFE7F017F027F037F077F08
-7F0B7F0C7F0F7F117F127F177F197F1C7F1B7F1F7F217F227F237F247F257F26
-7F277F2A7F2B7F2C7F2D7F2F7F307F317F327F337F355E7A757F5DDB753E9095
-738E739173AE73A2739F73CF73C273D173B773B373C073C973C873E573D9987C
-740A73E973E773DE73BA73F2740F742A745B7426742574287430742E742C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-68
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000741B741A7441745C7457745574597477746D747E749C748E748074817487
-748B749E74A874A9749074A774D274BA97EA97EB97EC674C6753675E67486769
-67A56787676A6773679867A7677567A8679E67AD678B6777677C67F0680967D8
-680A67E967B0680C67D967B567DA67B367DD680067C367B867E2680E67C167FD
-6832683368606861684E6862684468646883681D68556866684168676840683E
-684A6849682968B5688F687468776893686B68C2696E68FC691F692068F90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000692468F0690B6901695768E369106971693969606942695D6984696B6980
-69986978693469CC6987698869CE6989696669636979699B69A769BB69AB69AD
-69D469B169C169CA69DF699569E0698D69FF6A2F69ED6A176A186A6569F26A44
-6A3E6AA06A506A5B6A356A8E6A796A3D6A286A586A7C6A916A906AA96A976AAB
-733773526B816B826B876B846B926B936B8D6B9A6B9B6BA16BAA8F6B8F6D8F71
-8F728F738F758F768F788F778F798F7A8F7C8F7E8F818F828F848F878F8B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008F8D8F8E8F8F8F988F9A8ECE620B6217621B621F6222622162256224622C
-81E774EF74F474FF750F75117513653465EE65EF65F0660A6619677266036615
-6600708566F7661D66346631663666358006665F66546641664F665666616657
-66776684668C66A7669D66BE66DB66DC66E666E98D328D338D368D3B8D3D8D40
-8D458D468D488D498D478D4D8D558D5989C789CA89CB89CC89CE89CF89D089D1
-726E729F725D7266726F727E727F7284728B728D728F72926308633263B00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000643F64D880046BEA6BF36BFD6BF56BF96C056C076C066C0D6C156C186C19
-6C1A6C216C296C246C2A6C3265356555656B724D72527256723086625216809F
-809C809380BC670A80BD80B180AB80AD80B480B780E780E880E980EA80DB80C2
-80C480D980CD80D7671080DD80EB80F180F480ED810D810E80F280FC67158112
-8C5A8136811E812C811881328148814C815381748159815A817181608169817C
-817D816D8167584D5AB58188818281916ED581A381AA81CC672681CA81BB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081C181A66B246B376B396B436B466B5998D198D298D398D598D998DA6BB3
-5F406BC289F365909F51659365BC65C665C465C365CC65CE65D265D67080709C
-7096709D70BB70C070B770AB70B170E870CA711071137116712F71317173715C
-716871457172714A7178717A719871B371B571A871A071E071D471E771F9721D
-7228706C7118716671B9623E623D624362486249793B794079467949795B795C
-7953795A796279577960796F7967797A7985798A799A79A779B35FD15FD00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000603C605D605A606760416059606360AB6106610D615D61A9619D61CB61D1
-62068080807F6C936CF66DFC77F677F87800780978177818781165AB782D781C
-781D7839783A783B781F783C7825782C78237829784E786D7856785778267850
-7847784C786A789B7893789A7887789C78A178A378B278B978A578D478D978C9
-78EC78F2790578F479137924791E79349F9B9EF99EFB9EFC76F17704770D76F9
-77077708771A77227719772D7726773577387750775177477743775A77680000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077627765777F778D777D7780778C7791779F77A077B077B577BD753A7540
-754E754B7548755B7572757975837F587F617F5F8A487F687F747F717F797F81
-7F7E76CD76E58832948594869487948B948A948C948D948F9490949494979495
-949A949B949C94A394A494AB94AA94AD94AC94AF94B094B294B494B694B794B8
-94B994BA94BC94BD94BF94C494C894C994CA94CB94CC94CD94CE94D094D194D2
-94D594D694D794D994D894DB94DE94DF94E094E294E494E594E794E894EA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094E994EB94EE94EF94F394F494F594F794F994FC94FD94FF950395029506
-95079509950A950D950E950F951295139514951595169518951B951D951E951F
-9522952A952B9529952C953195329534953695379538953C953E953F95429535
-9544954595469549954C954E954F9552955395549556955795589559955B955E
-955F955D95619562956495659566956795689569956A956B956C956F95719572
-9573953A77E777EC96C979D579ED79E379EB7A065D477A037A027A1E7A140000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-70
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A397A377A519ECF99A57A707688768E7693769976A474DE74E0752C9E20
-9E229E289E299E2A9E2B9E2C9E329E319E369E389E379E399E3A9E3E9E419E42
-9E449E469E479E489E499E4B9E4C9E4E9E519E559E579E5A9E5B9E5C9E5E9E63
-9E669E679E689E699E6A9E6B9E6C9E719E6D9E7375927594759675A0759D75AC
-75A375B375B475B875C475B175B075C375C275D675CD75E375E875E675E475EB
-75E7760375F175FC75FF761076007605760C7617760A76257618761576190000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-71
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000761B763C762276207640762D7630763F76357643763E7633764D765E7654
-765C7656766B766F7FCA7AE67A787A797A807A867A887A957AA67AA07AAC7AA8
-7AAD7AB3886488698872887D887F888288A288C688B788BC88C988E288CE88E3
-88E588F1891A88FC88E888FE88F0892189198913891B890A8934892B89368941
-8966897B758B80E576B276B477DC801280148016801C80208022802580268027
-802980288031800B803580438046804D80528069807189839878988098830000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009889988C988D988F9894989A989B989E989F98A198A298A598A6864D8654
-866C866E867F867A867C867B86A8868D868B86AC869D86A786A386AA869386A9
-86B686C486B586CE86B086BA86B186AF86C986CF86B486E986F186F286ED86F3
-86D0871386DE86F486DF86D886D18703870786F88708870A870D87098723873B
-871E8725872E871A873E87488734873187298737873F87828722877D877E877B
-87608770874C876E878B87538763877C876487598765879387AF87A887D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000087C68788878587AD8797878387AB87E587AC87B587B387CB87D387BD87D1
-87C087CA87DB87EA87E087EE8816881387FE880A881B88218839883C7F367F42
-7F447F4582107AFA7AFD7B087B037B047B157B0A7B2B7B0F7B477B387B2A7B19
-7B2E7B317B207B257B247B337B3E7B1E7B587B5A7B457B757B4C7B5D7B607B6E
-7B7B7B627B727B717B907BA67BA77BB87BAC7B9D7BA87B857BAA7B9C7BA27BAB
-7BB47BD17BC17BCC7BDD7BDA7BE57BE67BEA7C0C7BFE7BFC7C0F7C167C0B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007C1F7C2A7C267C387C417C4081FE82018202820481EC8844822182228223
-822D822F8228822B8238823B82338234823E82448249824B824F825A825F8268
-887E8885888888D888DF895E7F9D7F9F7FA77FAF7FB07FB27C7C65497C917C9D
-7C9C7C9E7CA27CB27CBC7CBD7CC17CC77CCC7CCD7CC87CC57CD77CE8826E66A8
-7FBF7FCE7FD57FE57FE17FE67FE97FEE7FF37CF87D777DA67DAE7E477E9B9EB8
-9EB48D738D848D948D918DB18D678D6D8C478C49914A9150914E914F91640000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-75
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009162916191709169916F917D917E917291749179918C91859190918D9191
-91A291A391AA91AD91AE91AF91B591B491BA8C559E7E8DB88DEB8E058E598E69
-8DB58DBF8DBC8DBA8DC48DD68DD78DDA8DDE8DCE8DCF8DDB8DC68DEC8DF78DF8
-8DE38DF98DFB8DE48E098DFD8E148E1D8E1F8E2C8E2E8E238E2F8E3A8E408E39
-8E358E3D8E318E498E418E428E518E528E4A8E708E768E7C8E6F8E748E858E8F
-8E948E908E9C8E9E8C788C828C8A8C858C988C94659B89D689DE89DA89DC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-76
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000089E589EB89EF8A3E8B26975396E996F396EF970697019708970F970E972A
-972D9730973E9F809F839F859F869F879F889F899F8A9F8C9EFE9F0B9F0D96B9
-96BC96BD96CE96D277BF96E0928E92AE92C8933E936A93CA938F943E946B9C7F
-9C829C859C869C879C887A239C8B9C8E9C909C919C929C949C959C9A9C9B9C9E
-9C9F9CA09CA19CA29CA39CA59CA69CA79CA89CA99CAB9CAD9CAE9CB09CB19CB2
-9CB39CB49CB59CB69CB79CBA9CBB9CBC9CBD9CC49CC59CC69CC79CCA9CCB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009CCC9CCD9CCE9CCF9CD09CD39CD49CD59CD79CD89CD99CDC9CDD9CDF9CE2
-977C978597919792979497AF97AB97A397B297B49AB19AB09AB79E589AB69ABA
-9ABC9AC19AC09AC59AC29ACB9ACC9AD19B459B439B479B499B489B4D9B5198E8
-990D992E995599549ADF9AE19AE69AEF9AEB9AFB9AED9AF99B089B0F9B139B1F
-9B239EBD9EBE7E3B9E829E879E889E8B9E9293D69E9D9E9F9EDB9EDC9EDD9EE0
-9EDF9EE29EE99EE79EE59EEA9EEF9F229F2C9F2F9F399F379F3D9F3E9F440000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/iso2022-jp.enc b/library/encoding/iso2022-jp.enc
deleted file mode 100644
index a4e455f..0000000
--- a/library/encoding/iso2022-jp.enc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Encoding file: iso2022-jp, escape-driven
-E
-name		iso2022-jp
-init		{}
-final		{}
-iso8859-1	\x1b(B
-jis0201		\x1b(J
-jis0208		\x1b$@
-jis0208		\x1b$B
-jis0212		\x1b$(D
-gb2312		\x1b$A
-ksc5601		\x1b$(C
diff --git a/library/encoding/iso2022-kr.enc b/library/encoding/iso2022-kr.enc
deleted file mode 100644
index d20ce2b..0000000
--- a/library/encoding/iso2022-kr.enc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Encoding file: iso2022-kr, escape-driven
-E
-name		iso2022-kr
-init		\x1b$)C
-final		{}
-iso8859-1	\x0f
-ksc5601		\x0e
diff --git a/library/encoding/iso2022.enc b/library/encoding/iso2022.enc
deleted file mode 100644
index ae7cde1..0000000
--- a/library/encoding/iso2022.enc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Encoding file: iso2022, escape-driven
-E
-name		iso2022
-init		{}
-final		{}
-iso8859-1	\x1b(B
-jis0201		\x1b(J
-gb1988		\x1b(T
-jis0208		\x1b$@
-jis0208		\x1b$B
-jis0212		\x1b$(D
-gb2312		\x1b$A
-ksc5601		\x1b$(C
-jis0208		\x1b&@\x1b$B
-
-
diff --git a/library/encoding/iso8859-1.enc b/library/encoding/iso8859-1.enc
deleted file mode 100644
index 045d8fa..0000000
--- a/library/encoding/iso8859-1.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-1, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
-00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
-00D000D100D200D300D400D500D600D700D800D900DA00DB00DC00DD00DE00DF
-00E000E100E200E300E400E500E600E700E800E900EA00EB00EC00ED00EE00EF
-00F000F100F200F300F400F500F600F700F800F900FA00FB00FC00FD00FE00FF
diff --git a/library/encoding/iso8859-2.enc b/library/encoding/iso8859-2.enc
deleted file mode 100644
index 16faab6..0000000
--- a/library/encoding/iso8859-2.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-2, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A0010402D8014100A4013D015A00A700A80160015E0164017900AD017D017B
-00B0010502DB014200B4013E015B02C700B80161015F0165017A02DD017E017C
-015400C100C2010200C40139010600C7010C00C9011800CB011A00CD00CE010E
-01100143014700D300D4015000D600D70158016E00DA017000DC00DD016200DF
-015500E100E2010300E4013A010700E7010D00E9011900EB011B00ED00EE010F
-01110144014800F300F4015100F600F70159016F00FA017100FC00FD016302D9
diff --git a/library/encoding/iso8859-3.enc b/library/encoding/iso8859-3.enc
deleted file mode 100644
index c914bce..0000000
--- a/library/encoding/iso8859-3.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-3, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A0012602D800A300A40000012400A700A80130015E011E013400AD0000017B
-00B0012700B200B300B400B5012500B700B80131015F011F013500BD0000017C
-00C000C100C2000000C4010A010800C700C800C900CA00CB00CC00CD00CE00CF
-000000D100D200D300D4012000D600D7011C00D900DA00DB00DC016C015C00DF
-00E000E100E2000000E4010B010900E700E800E900EA00EB00EC00ED00EE00EF
-000000F100F200F300F4012100F600F7011D00F900FA00FB00FC016D015D02D9
diff --git a/library/encoding/iso8859-4.enc b/library/encoding/iso8859-4.enc
deleted file mode 100644
index ef5c5a9..0000000
--- a/library/encoding/iso8859-4.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-4, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A001040138015600A40128013B00A700A8016001120122016600AD017D00AF
-00B0010502DB015700B40129013C02C700B80161011301230167014A017E014B
-010000C100C200C300C400C500C6012E010C00C9011800CB011600CD00CE012A
-01100145014C013600D400D500D600D700D8017200DA00DB00DC0168016A00DF
-010100E100E200E300E400E500E6012F010D00E9011900EB011700ED00EE012B
-01110146014D013700F400F500F600F700F8017300FA00FB00FC0169016B02D9
diff --git a/library/encoding/iso8859-5.enc b/library/encoding/iso8859-5.enc
deleted file mode 100644
index bf4ee82..0000000
--- a/library/encoding/iso8859-5.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-5, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A0040104020403040404050406040704080409040A040B040C00AD040E040F
-0410041104120413041404150416041704180419041A041B041C041D041E041F
-0420042104220423042404250426042704280429042A042B042C042D042E042F
-0430043104320433043404350436043704380439043A043B043C043D043E043F
-0440044104420443044404450446044704480449044A044B044C044D044E044F
-2116045104520453045404550456045704580459045A045B045C00A7045E045F
diff --git a/library/encoding/iso8859-6.enc b/library/encoding/iso8859-6.enc
deleted file mode 100644
index 6510af7..0000000
--- a/library/encoding/iso8859-6.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-6, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0660066106620663066406650666066706680669003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A000000000000000A40000000000000000000000000000060C00AD00000000
-00000000000000000000000000000000000000000000061B000000000000061F
-0000062106220623062406250626062706280629062A062B062C062D062E062F
-0630063106320633063406350636063706380639063A00000000000000000000
-0640064106420643064406450646064706480649064A064B064C064D064E064F
-0650065106520000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/iso8859-7.enc b/library/encoding/iso8859-7.enc
deleted file mode 100644
index 2cb69a2..0000000
--- a/library/encoding/iso8859-7.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-7, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A002BD02BC00A30000000000A600A700A800A9000000AB00AC00AD00002015
-00B000B100B200B303840385038600B703880389038A00BB038C00BD038E038F
-0390039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A1000003A303A403A503A603A703A803A903AA03AB03AC03AD03AE03AF
-03B003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C203C303C403C503C603C703C803C903CA03CB03CC03CD03CE0000
diff --git a/library/encoding/iso8859-8.enc b/library/encoding/iso8859-8.enc
deleted file mode 100644
index 6b424d5..0000000
--- a/library/encoding/iso8859-8.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-8, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A0000000A200A300A400A500A600A700A800A900D700AB00AC00AD00AE203E
-00B000B100B200B300B400B500B600B700B800B900F700BB00BC00BD00BE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000002017
-05D005D105D205D305D405D505D605D705D805D905DA05DB05DC05DD05DE05DF
-05E005E105E205E305E405E505E605E705E805E905EA00000000000000000000
diff --git a/library/encoding/iso8859-9.enc b/library/encoding/iso8859-9.enc
deleted file mode 100644
index 6eed3f1..0000000
--- a/library/encoding/iso8859-9.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: iso8859-9, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-00A000A100A200A300A400A500A600A700A800A900AA00AB00AC00AD00AE00AF
-00B000B100B200B300B400B500B600B700B800B900BA00BB00BC00BD00BE00BF
-00C000C100C200C300C400C500C600C700C800C900CA00CB00CC00CD00CE00CF
-011E00D100D200D300D400D500D600D700D800D900DA00DB00DC0130015E00DF
-00E000E100E200E300E400E500E600E700E800E900EA00EB00EC00ED00EE00EF
-011F00F100F200F300F400F500F600F700F800F900FA00FB00FC0131015F00FF
diff --git a/library/encoding/jis0201.enc b/library/encoding/jis0201.enc
deleted file mode 100644
index 64f423f..0000000
--- a/library/encoding/jis0201.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: jis0201, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D203E007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/jis0208.enc b/library/encoding/jis0208.enc
deleted file mode 100644
index 7102e88..0000000
--- a/library/encoding/jis0208.enc
+++ /dev/null
@@ -1,1312 +0,0 @@
-# Encoding file: jis0208, double-byte
-D
-2129 0 77
-21
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8
-FF3EFFE3FF3F30FD30FE309D309E30034EDD30053006300730FC20152010FF0F
-FF3C301C2016FF5C2026202520182019201C201DFF08FF0930143015FF3BFF3D
-FF5BFF5D30083009300A300B300C300D300E300F30103011FF0B221200B100D7
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF0400A200A3FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-22
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025C625A125A025B325B225BD25BC203B3012219221902191219330130000
-00000000000000000000000000000000000000002208220B2286228722822283
-222A2229000000000000000000000000000000002227222800AC21D221D42200
-220300000000000000000000000000000000000000000000222022A523122202
-220722612252226A226B221A223D221D2235222B222C00000000000000000000
-00000000212B2030266F266D266A2020202100B6000000000000000025EF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-23
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19000000000000000000000000
-0000FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3A00000000000000000000
-0000FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-24
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-25
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-26
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-27
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-28
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025002502250C251025182514251C252C25242534253C25012503250F2513
-251B251725232533252B253B254B2520252F25282537253F251D253025252538
-2542000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E9C55165A03963F54C0611B632859F690228475831C7A5060AA63E16E25
-65ED846682A69BF56893572765A162715B9B59D0867B98F47D627DBE9B8E6216
-7C9F88B75B895EB563096697684895C7978D674F4EE54F0A4F4D4F9D504956F2
-593759D45A015C0960DF610F61706613690570BA754F757079FB7DAD7DEF80C3
-840E88638B029055907A533B4E954EA557DF80B290C178EF4E0058F16EA29038
-7A328328828B9C2F5141537054BD54E156E059FB5F1598F26DEB80E4852D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-31
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009662967096A097FB540B53F35B8770CF7FBD8FC296E8536F9D5C7ABA4E11
-789381FC6E26561855046B1D851A9C3B59E553A96D6674DC958F56424E91904B
-96F2834F990C53E155B65B305F71662066F368046C386CF36D29745B76C87A4E
-983482F1885B8A6092ED6DB275AB76CA99C560A68B018D8A95B2698E53AD5186
-5712583059445BB45EF6602863A963F46CBF6F14708E7114715971D5733F7E01
-827682D185979060925B9D1B586965BC6C5A752551F9592E59655F805FDC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-32
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062BC65FA6A2A6B276BB4738B7FC189569D2C9D0E9EC45CA16C96837B5104
-5C4B61B681C6687672614E594FFA537860696E297A4F97F34E0B53164EEE4F55
-4F3D4FA14F7352A053EF5609590F5AC15BB65BE179D16687679C67B66B4C6CB3
-706B73C2798D79BE7A3C7B8782B182DB8304837783EF83D387668AB256298CA8
-8FE6904E971E868A4FC45CE862117259753B81E582BD86FE8CC096C5991399D5
-4ECB4F1A89E356DE584A58CA5EFB5FEB602A6094606261D0621262D065390000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-33
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B41666668B06D777070754C76867D7582A587F9958B968E8C9D51F152BE
-591654B35BB35D16616869826DAF788D84CB88578A7293A79AB86D6C99A886D9
-57A367FF86CE920E5283568754045ED362E164B9683C68386BBB737278BA7A6B
-899A89D28D6B8F0390ED95A3969497695B665CB3697D984D984E639B7B206A2B
-6A7F68B69C0D6F5F5272559D607062EC6D3B6E076ED1845B89108F444E149C39
-53F6691B6A3A9784682A515C7AC384B291DC938C565B9D286822830584310000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-34
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007CA5520882C574E64E7E4F8351A05BD2520A52D852E75DFB559A582A59E6
-5B8C5B985BDB5E725E7960A3611F616361BE63DB656267D1685368FA6B3E6B53
-6C576F226F976F4574B0751876E3770B7AFF7BA17C217DE97F367FF0809D8266
-839E89B38ACC8CAB908494519593959195A2966597D3992882184E38542B5CB8
-5DCC73A9764C773C5CA97FEB8D0B96C19811985498584F014F0E5371559C5668
-57FA59475B095BC45C905E0C5E7E5FCC63EE673A65D765E2671F68CB68C40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-35
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006A5F5E306BC56C176C7D757F79485B637A007D005FBD898F8A188CB48D77
-8ECC8F1D98E29A0E9B3C4E80507D510059935B9C622F628064EC6B3A72A07591
-79477FA987FB8ABC8B7063AC83CA97A05409540355AB68546A588A7078276775
-9ECD53745BA2811A865090064E184E454EC74F1153CA54385BAE5F1360256551
-673D6C426C726CE3707874037A767AAE7B087D1A7CFE7D6665E7725B53BB5C45
-5DE862D262E063196E20865A8A318DDD92F86F0179A69B5A4EA84EAB4EAC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-36
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F9B4FA050D151477AF6517151F653545321537F53EB55AC58835CE15F37
-5F4A602F6050606D631F65596A4B6CC172C272ED77EF80F881058208854E90F7
-93E197FF99579A5A4EF051DD5C2D6681696D5C4066F26975738968507C8150C5
-52E457475DFE932665A46B236B3D7434798179BD7B4B7DCA82B983CC887F895F
-8B398FD191D1541F92804E5D503653E5533A72D7739677E982E68EAF99C699C8
-99D25177611A865E55B07A7A50765BD3904796854E326ADB91E75C515C480000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-37
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000063987A9F6C9397748F617AAA718A96887C8268177E706851936C52F2541B
-85AB8A137FA48ECD90E15366888879414FC250BE521151445553572D73EA578B
-59515F625F8460756176616761A963B2643A656C666F68426E1375667A3D7CFB
-7D4C7D997E4B7F6B830E834A86CD8A088A638B668EFD981A9D8F82B88FCE9BE8
-5287621F64836FC09699684150916B206C7A6F547A747D5088408A2367084EF6
-503950265065517C5238526355A7570F58055ACC5EFA61B261F862F363720000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-38
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000691C6A29727D72AC732E7814786F7D79770C80A9898B8B198CE28ED29063
-9375967A98559A139E785143539F53B35E7B5F266E1B6E90738473FE7D438237
-8A008AFA96504E4E500B53E4547C56FA59D15B645DF15EAB5F276238654567AF
-6E5672D07CCA88B480A180E183F0864E8A878DE8923796C798679F134E944E92
-4F0D53485449543E5A2F5F8C5FA1609F68A76A8E745A78818A9E8AA48B779190
-4E5E9BC94EA44F7C4FAF501950165149516C529F52B952FE539A53E354110000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-39
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000540E5589575157A2597D5B545B5D5B8F5DE55DE75DF75E785E835E9A5EB7
-5F186052614C629762D863A7653B6602664366F4676D6821689769CB6C5F6D2A
-6D696E2F6E9D75327687786C7A3F7CE07D057D187D5E7DB18015800380AF80B1
-8154818F822A8352884C88618B1B8CA28CFC90CA91759271783F92FC95A4964D
-980599999AD89D3B525B52AB53F7540858D562F76FE08C6A8F5F9EB9514B523B
-544A56FD7A4091779D609ED273446F09817075115FFD60DA9AA872DB8FBC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B6498034ECA56F0576458BE5A5A606861C7660F6606683968B16DF775D5
-7D3A826E9B424E9B4F5053C955065D6F5DE65DEE67FB6C99747378028A509396
-88DF57505EA7632B50B550AC518D670054C9585E59BB5BB05F69624D63A1683D
-6B736E08707D91C7728078157826796D658E7D3083DC88C18F09969B52645728
-67507F6A8CA151B45742962A583A698A80B454B25D0E57FC78959DFA4F5C524A
-548B643E6628671467F57A847B567D22932F685C9BAD7B395319518A52370000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005BDF62F664AE64E6672D6BBA85A996D176909BD6634C93069BAB76BF6652
-4E09509853C25C7160E864926563685F71E673CA75237B977E8286958B838CDB
-9178991065AC66AB6B8B4ED54ED44F3A4F7F523A53F853F255E356DB58EB59CB
-59C959FF5B505C4D5E025E2B5FD7601D6307652F5B5C65AF65BD65E8679D6B62
-6B7B6C0F7345794979C17CF87D197D2B80A2810281F389968A5E8A698A668A8C
-8AEE8CC78CDC96CC98FC6B6F4E8B4F3C4F8D51505B575BFA6148630166420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B216ECB6CBB723E74BD75D478C1793A800C803381EA84948F9E6C509E7F
-5F0F8B589D2B7AFA8EF85B8D96EB4E0353F157F759315AC95BA460896E7F6F06
-75BE8CEA5B9F85007BE0507267F4829D5C61854A7E1E820E51995C0463688D66
-659C716E793E7D1780058B1D8ECA906E86C790AA501F52FA5C3A6753707C7235
-914C91C8932B82E55BC25F3160F94E3B53D65B88624B67316B8A72E973E07A2E
-816B8DA391529996511253D7546A5BFF63886A397DAC970056DA53CE54680000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005B975C315DDE4FEE610162FE6D3279C079CB7D427E4D7FD281ED821F8490
-884689728B908E748F2F9031914B916C96C6919C4EC04F4F514553415F93620E
-67D46C416E0B73637E2691CD928353D459195BBF6DD1795D7E2E7C9B587E719F
-51FA88538FF04FCA5CFB662577AC7AE3821C99FF51C65FAA65EC696F6B896DF3
-6E966F6476FE7D145DE190759187980651E6521D6240669166D96E1A5EB67DD2
-7F7266F885AF85F78AF852A953D959735E8F5F90605592E4966450B7511F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000052DD5320534753EC54E8554655315617596859BE5A3C5BB55C065C0F5C11
-5C1A5E845E8A5EE05F70627F628462DB638C63776607660C662D6676677E68A2
-6A1F6A356CBC6D886E096E58713C7126716775C77701785D7901796579F07AE0
-7B117CA77D39809683D6848B8549885D88F38A1F8A3C8A548A738C618CDE91A4
-9266937E9418969C97984E0A4E084E1E4E575197527057CE583458CC5B225E38
-60C564FE676167566D4472B675737A6384B88B7291B89320563157F498FE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000062ED690D6B9671ED7E548077827289E698DF87558FB15C3B4F384FE14FB5
-55075A205BDD5BE95FC3614E632F65B0664B68EE699B6D786DF1753375B9771F
-795E79E67D3381E382AF85AA89AA8A3A8EAB8F9B903291DD97074EBA4EC15203
-587558EC5C0B751A5C3D814E8A0A8FC59663976D7B258ACF9808916256F353A8
-9017543957825E2563A86C34708A77617C8B7FE088709042915493109318968F
-745E9AC45D075D69657067A28DA896DB636E6749691983C5981796C088FE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-40
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F84647A5BF84E16702C755D662F51C4523652E259D35F8160276210653F
-6574661F667468F268166B636E057272751F76DB7CBE805658F088FD897F8AA0
-8A938ACB901D91929752975965897A0E810696BB5E2D60DC621A65A566146790
-77F37A4D7C4D7E3E810A8CAC8D648DE18E5F78A9520762D963A5644262988A2D
-7A837BC08AAC96EA7D76820C87494ED95148534353605BA35C025C165DDD6226
-624764B0681368346CC96D456D1767D36F5C714E717D65CB7A7F7BAD7DDA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-41
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007E4A7FA8817A821B823985A68A6E8CCE8DF59078907792AD929195839BAE
-524D55846F387136516879857E5581B37CCE564C58515CA863AA66FE66FD695A
-72D9758F758E790E795679DF7C977D207D4486078A34963B90619F2050E75275
-53CC53E2500955AA58EE594F723D5B8B5C64531D60E360F3635C6383633F63BB
-64CD65E966F95DE369CD69FD6F1571E54E8975E976F87A937CDF7DCF7D9C8061
-83498358846C84BC85FB88C58D709001906D9397971C9A1250CF5897618E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-42
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000081D385358D0890204FC3507452475373606F6349675F6E2C8DB3901F4FD7
-5C5E8CCA65CF7D9A53528896517663C35B585B6B5C0A640D6751905C4ED6591A
-592A6C708A51553E581559A560F0625367C182356955964099C49A284F535806
-5BFE80105CB15E2F5F856020614B623466FF6CF06EDE80CE817F82D4888B8CB8
-9000902E968A9EDB9BDB4EE353F059277B2C918D984C9DF96EDD702753535544
-5B856258629E62D36CA26FEF74228A1794386FC18AFE833851E786F853EA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-43
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053E94F4690548FB0596A81315DFD7AEA8FBF68DA8C3772F89C486A3D8AB0
-4E3953585606576662C563A265E66B4E6DE16E5B70AD77ED7AEF7BAA7DBB803D
-80C686CB8A95935B56E358C75F3E65AD66966A806BB575378AC7502477E55730
-5F1B6065667A6C6075F47A1A7F6E81F48718904599B37BC9755C7AF97B5184C4
-901079E97A9283365AE177404E2D4EF25B995FE062BD663C67F16CE8866B8877
-8A3B914E92F399D06A177026732A82E784578CAF4E01514651CB558B5BF50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-44
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005E165E335E815F145F355F6B5FB461F2631166A2671D6F6E7252753A773A
-80748139817887768ABF8ADC8D858DF3929A957798029CE552C5635776F46715
-6C8873CD8CC393AE96736D25589C690E69CC8FFD939A75DB901A585A680263B4
-69FB4F436F2C67D88FBB85267DB49354693F6F70576A58F75B2C7D2C722A540A
-91E39DB44EAD4F4E505C507552438C9E544858245B9A5E1D5E955EAD5EF75F1F
-608C62B5633A63D068AF6C407887798E7A0B7DE082478A028AE68E4490130000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-45
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090B8912D91D89F0E6CE5645864E265756EF476847B1B906993D16EBA54F2
-5FB964A48F4D8FED92445178586B59295C555E976DFB7E8F751C8CBC8EE2985B
-70B94F1D6BBF6FB1753096FB514E54105835585759AC5C605F926597675C6E21
-767B83DF8CED901490FD934D7825783A52AA5EA6571F597460125012515A51AC
-51CD520055105854585859575B955CF65D8B60BC6295642D6771684368BC68DF
-76D76DD86E6F6D9B706F71C85F5375D879777B497B547B527CD67D7152300000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-46
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008463856985E48A0E8B048C468E0F9003900F94199676982D9A3095D850CD
-52D5540C58025C0E61A7649E6D1E77B37AE580F48404905392855CE09D07533F
-5F975FB36D9C7279776379BF7BE46BD272EC8AAD68036A6151F87A8169345C4A
-9CF682EB5BC59149701E56785C6F60C765666C8C8C5A90419813545166C7920D
-594890A351854E4D51EA85998B0E7058637A934B696299B47E04757753576960
-8EDF96E36C5D4E8C5C3C5F108FE953028CD1808986795EFF65E54E7351650000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-47
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000059825C3F97EE4EFB598A5FCD8A8D6FE179B079625BE78471732B71B15E74
-5FF5637B649A71C37C984E435EFC4E4B57DC56A260A96FC37D0D80FD813381BF
-8FB2899786A45DF4628A64AD898767776CE26D3E743678345A467F7582AD99AC
-4FF35EC362DD63926557676F76C3724C80CC80BA8F29914D500D57F95A926885
-6973716472FD8CB758F28CE0966A9019877F79E477E784294F2F5265535A62CD
-67CF6CCA767D7B947C95823685848FEB66DD6F2072067E1B83AB99C19EA60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-48
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051FD7BB178727BB880877B486AE85E61808C75517560516B92626E8C767A
-91979AEA4F107F70629C7B4F95A59CE9567A585986E496BC4F345224534A53CD
-53DB5E06642C6591677F6C3E6C4E724872AF73ED75547E41822C85E98CA97BC4
-91C67169981298EF633D6669756A76E478D0854386EE532A5351542659835E87
-5F7C60B26249627962AB65906BD46CCC75B276AE789179D87DCB7F7780A588AB
-8AB98CBB907F975E98DB6A0B7C3850995C3E5FAE67876BD8743577097F8E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-49
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009F3B67CA7A175339758B9AED5F66819D83F180985F3C5FC575627B46903C
-686759EB5A9B7D10767E8B2C4FF55F6A6A196C376F0274E2796888688A558C79
-5EDF63CF75C579D282D7932892F2849C86ED9C2D54C15F6C658C6D5C70158CA7
-8CD3983B654F74F64E0D4ED857E0592B5A665BCC51A85E035E9C601662766577
-65A7666E6D6E72367B268150819A82998B5C8CA08CE68D74961C96444FAE64AB
-6B66821E8461856A90E85C01695398A8847A85574F0F526F5FA95E45670D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000798F8179890789866DF55F1762556CB84ECF72699B925206543B567458B3
-61A4626E711A596E7C897CDE7D1B96F06587805E4E194F75517558405E635E73
-5F0A67C44E26853D9589965B7C73980150FB58C1765678A7522577A585117B86
-504F590972477BC77DE88FBA8FD4904D4FBF52C95A295F0197AD4FDD821792EA
-570363556B69752B88DC8F147A4252DF58936155620A66AE6BCD7C3F83E95023
-4FF853055446583159495B9D5CF05CEF5D295E9662B16367653E65B9670B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006CD56CE170F978327E2B80DE82B3840C84EC870289128A2A8C4A90A692D2
-98FD9CF39D6C4E4F4EA1508D5256574A59A85E3D5FD85FD9623F66B4671B67D0
-68D251927D2180AA81A88B008C8C8CBF927E96325420982C531750D5535C58A8
-64B26734726777667A4691E652C36CA16B8658005E4C5954672C7FFB51E176C6
-646978E89B549EBB57CB59B96627679A6BCE54E969D95E55819C67959BAA67FE
-9C52685D4EA64FE353C862B9672B6CAB8FC44FAD7E6D9EBF4E0761626E800000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F2B85135473672A9B455DF37B955CAC5BC6871C6E4A84D17A1481085999
-7C8D6C11772052D959227121725F77DB97279D61690B5A7F5A1851A5540D547D
-660E76DF8FF792989CF459EA725D6EC5514D68C97DBF7DEC97629EBA64786A21
-830259845B5F6BDB731B76F27DB280178499513267289ED976EE676252FF9905
-5C24623B7C7E8CB0554F60B67D0B958053014E5F51B6591C723A803691CE5F25
-77E253845F797D0485AC8A338E8D975667F385AE9453610961086CB976520000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AED8F38552F4F51512A52C753CB5BA55E7D60A0618263D6670967DA6E67
-6D8C733673377531795088D58A98904A909190F596C4878D59154E884F594E0E
-8A898F3F981050AD5E7C59965BB95EB863DA63FA64C166DC694A69D86D0B6EB6
-719475287AAF7F8A8000844984C989818B218E0A9065967D990A617E62916B32
-6C836D747FCC7FFC6DC07F8587BA88F8676583B1983C96F76D1B7D61843D916A
-4E7153755D506B046FEB85CD862D89A75229540F5C65674E68A8740674830000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075E288CF88E191CC96E296785F8B73877ACB844E63A0756552896D416E9C
-74097559786B7C9296867ADC9F8D4FB6616E65C5865C4E864EAE50DA4E2151CC
-5BEE659968816DBC731F764277AD7A1C7CE7826F8AD2907C91CF96759818529B
-7DD1502B539867976DCB71D0743381E88F2A96A39C579E9F746058416D997D2F
-985E4EE44F364F8B51B752B15DBA601C73B2793C82D3923496B796F6970A9E97
-9F6266A66B74521752A370C888C25EC9604B61906F2371497C3E7DF4806F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000084EE9023932C54429B6F6AD370898CC28DEF973252B45A415ECA5F046717
-697C69946D6A6F0F726272FC7BED8001807E874B90CE516D9E937984808B9332
-8AD6502D548C8A716B6A8CC4810760D167A09DF24E994E989C108A6B85C18568
-69006E7E78978155000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F0C4E104E154E2A4E314E364E3C4E3F4E424E564E584E824E858C6B4E8A
-82125F0D4E8E4E9E4E9F4EA04EA24EB04EB34EB64ECE4ECD4EC44EC64EC24ED7
-4EDE4EED4EDF4EF74F094F5A4F304F5B4F5D4F574F474F764F884F8F4F984F7B
-4F694F704F914F6F4F864F9651184FD44FDF4FCE4FD84FDB4FD14FDA4FD04FE4
-4FE5501A50285014502A502550054F1C4FF650215029502C4FFE4FEF50115006
-504350476703505550505048505A5056506C50785080509A508550B450B20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000050C950CA50B350C250D650DE50E550ED50E350EE50F950F5510951015102
-511651155114511A5121513A5137513C513B513F51405152514C515451627AF8
-5169516A516E5180518256D8518C5189518F519151935195519651A451A651A2
-51A951AA51AB51B351B151B251B051B551BD51C551C951DB51E0865551E951ED
-51F051F551FE5204520B5214520E5227522A522E52335239524F5244524B524C
-525E5254526A527452695273527F527D528D529452925271528852918FA80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-52
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008FA752AC52AD52BC52B552C152CD52D752DE52E352E698ED52E052F352F5
-52F852F9530653087538530D5310530F5315531A5323532F5331533353385340
-534653454E175349534D51D6535E5369536E5918537B53775382539653A053A6
-53A553AE53B053B653C37C1296D953DF66FC71EE53EE53E853ED53FA5401543D
-5440542C542D543C542E54365429541D544E548F5475548E545F547154775470
-5492547B5480547654845490548654C754A254B854A554AC54C454C854A80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054AB54C254A454BE54BC54D854E554E6550F551454FD54EE54ED54FA54E2
-553955405563554C552E555C55455556555755385533555D5599558054AF558A
-559F557B557E5598559E55AE557C558355A9558755A855DA55C555DF55C455DC
-55E455D4561455F7561655FE55FD561B55F9564E565071DF5634563656325638
-566B5664562F566C566A56865680568A56A05694568F56A556AE56B656B456C2
-56BC56C156C356C056C856CE56D156D356D756EE56F9570056FF570457090000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005708570B570D57135718571655C7571C572657375738574E573B5740574F
-576957C057885761577F5789579357A057B357A457AA57B057C357C657D457D2
-57D3580A57D657E3580B5819581D587258215862584B58706BC05852583D5879
-588558B9589F58AB58BA58DE58BB58B858AE58C558D358D158D758D958D858E5
-58DC58E458DF58EF58FA58F958FB58FC58FD5902590A5910591B68A65925592C
-592D59325938593E7AD259555950594E595A5958596259605967596C59690000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-55
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000059785981599D4F5E4FAB59A359B259C659E859DC598D59D959DA5A255A1F
-5A115A1C5A095A1A5A405A6C5A495A355A365A625A6A5A9A5ABC5ABE5ACB5AC2
-5ABD5AE35AD75AE65AE95AD65AFA5AFB5B0C5B0B5B165B325AD05B2A5B365B3E
-5B435B455B405B515B555B5A5B5B5B655B695B705B735B755B7865885B7A5B80
-5B835BA65BB85BC35BC75BC95BD45BD05BE45BE65BE25BDE5BE55BEB5BF05BF6
-5BF35C055C075C085C0D5C135C205C225C285C385C395C415C465C4E5C530000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C505C4F5B715C6C5C6E4E625C765C795C8C5C915C94599B5CAB5CBB5CB6
-5CBC5CB75CC55CBE5CC75CD95CE95CFD5CFA5CED5D8C5CEA5D0B5D155D175D5C
-5D1F5D1B5D115D145D225D1A5D195D185D4C5D525D4E5D4B5D6C5D735D765D87
-5D845D825DA25D9D5DAC5DAE5DBD5D905DB75DBC5DC95DCD5DD35DD25DD65DDB
-5DEB5DF25DF55E0B5E1A5E195E115E1B5E365E375E445E435E405E4E5E575E54
-5E5F5E625E645E475E755E765E7A9EBC5E7F5EA05EC15EC25EC85ED05ECF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005ED65EE35EDD5EDA5EDB5EE25EE15EE85EE95EEC5EF15EF35EF05EF45EF8
-5EFE5F035F095F5D5F5C5F0B5F115F165F295F2D5F385F415F485F4C5F4E5F2F
-5F515F565F575F595F615F6D5F735F775F835F825F7F5F8A5F885F915F875F9E
-5F995F985FA05FA85FAD5FBC5FD65FFB5FE45FF85FF15FDD60B35FFF60216060
-601960106029600E6031601B6015602B6026600F603A605A6041606A6077605F
-604A6046604D6063604360646042606C606B60596081608D60E76083609A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-58
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006084609B60966097609260A7608B60E160B860E060D360B45FF060BD60C6
-60B560D8614D6115610660F660F7610060F460FA6103612160FB60F1610D610E
-6147613E61286127614A613F613C612C6134613D614261446173617761586159
-615A616B6174616F61656171615F615D6153617561996196618761AC6194619A
-618A619161AB61AE61CC61CA61C961F761C861C361C661BA61CB7F7961CD61E6
-61E361F661FA61F461FF61FD61FC61FE620062086209620D620C6214621B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000621E6221622A622E6230623262336241624E625E6263625B62606268627C
-62826289627E62926293629662D46283629462D762D162BB62CF62FF62C664D4
-62C862DC62CC62CA62C262C7629B62C9630C62EE62F163276302630862EF62F5
-6350633E634D641C634F6396638E638063AB637663A3638F6389639F63B5636B
-636963BE63E963C063C663E363C963D263F663C4641664346406641364266436
-651D64176428640F6467646F6476644E652A6495649364A564A9648864BC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064DA64D264C564C764BB64D864C264F164E7820964E064E162AC64E364EF
-652C64F664F464F264FA650064FD6518651C650565246523652B653465356537
-65366538754B654865566555654D6558655E655D65726578658265838B8A659B
-659F65AB65B765C365C665C165C465CC65D265DB65D965E065E165F16772660A
-660365FB6773663566366634661C664F664466496641665E665D666466676668
-665F6662667066836688668E668966846698669D66C166B966C966BE66BC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000066C466B866D666DA66E0663F66E666E966F066F566F7670F6716671E6726
-67279738672E673F67366741673867376746675E676067596763676467896770
-67A9677C676A678C678B67A667A1678567B767EF67B467EC67B367E967B867E4
-67DE67DD67E267EE67B967CE67C667E76A9C681E684668296840684D6832684E
-68B3682B685968636877687F689F688F68AD6894689D689B68836AAE68B96874
-68B568A068BA690F688D687E690168CA690868D86922692668E1690C68CD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068D468E768D569366912690468D768E3692568F968E068EF6928692A691A
-6923692168C669796977695C6978696B6954697E696E69396974693D69596930
-6961695E695D6981696A69B269AE69D069BF69C169D369BE69CE5BE869CA69DD
-69BB69C369A76A2E699169A0699C699569B469DE69E86A026A1B69FF6B0A69F9
-69F269E76A0569B16A1E69ED6A1469EB6A0A6A126AC16A236A136A446A0C6A72
-6A366A786A476A626A596A666A486A386A226A906A8D6AA06A846AA26AA30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006A9786176ABB6AC36AC26AB86AB36AAC6ADE6AD16ADF6AAA6ADA6AEA6AFB
-6B0586166AFA6B126B169B316B1F6B386B3776DC6B3998EE6B476B436B496B50
-6B596B546B5B6B5F6B616B786B796B7F6B806B846B836B8D6B986B956B9E6BA4
-6BAA6BAB6BAF6BB26BB16BB36BB76BBC6BC66BCB6BD36BDF6BEC6BEB6BF36BEF
-9EBE6C086C136C146C1B6C246C236C5E6C556C626C6A6C826C8D6C9A6C816C9B
-6C7E6C686C736C926C906CC46CF16CD36CBD6CD76CC56CDD6CAE6CB16CBE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006CBA6CDB6CEF6CD96CEA6D1F884D6D366D2B6D3D6D386D196D356D336D12
-6D0C6D636D936D646D5A6D796D596D8E6D956FE46D856DF96E156E0A6DB56DC7
-6DE66DB86DC66DEC6DDE6DCC6DE86DD26DC56DFA6DD96DE46DD56DEA6DEE6E2D
-6E6E6E2E6E196E726E5F6E3E6E236E6B6E2B6E766E4D6E1F6E436E3A6E4E6E24
-6EFF6E1D6E386E826EAA6E986EC96EB76ED36EBD6EAF6EC46EB26ED46ED56E8F
-6EA56EC26E9F6F416F11704C6EEC6EF86EFE6F3F6EF26F316EEF6F326ECC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006F3E6F136EF76F866F7A6F786F816F806F6F6F5B6FF36F6D6F826F7C6F58
-6F8E6F916FC26F666FB36FA36FA16FA46FB96FC66FAA6FDF6FD56FEC6FD46FD8
-6FF16FEE6FDB7009700B6FFA70117001700F6FFE701B701A6F74701D7018701F
-7030703E7032705170637099709270AF70F170AC70B870B370AE70DF70CB70DD
-70D9710970FD711C711971657155718871667162714C7156716C718F71FB7184
-719571A871AC71D771B971BE71D271C971D471CE71E071EC71E771F571FC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000071F971FF720D7210721B7228722D722C72307232723B723C723F72407246
-724B72587274727E7282728172877292729672A272A772B972B272C372C672C4
-72CE72D272E272E072E172F972F7500F7317730A731C7316731D7334732F7329
-7325733E734E734F9ED87357736A7368737073787375737B737A73C873B373CE
-73BB73C073E573EE73DE74A27405746F742573F87432743A7455743F745F7459
-7441745C746974707463746A7476747E748B749E74A774CA74CF74D473F10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000074E074E374E774E974EE74F274F074F174F874F7750475037505750C750E
-750D75157513751E7526752C753C7544754D754A7549755B7546755A75697564
-7567756B756D75787576758675877574758A758975827594759A759D75A575A3
-75C275B375C375B575BD75B875BC75B175CD75CA75D275D975E375DE75FE75FF
-75FC760175F075FA75F275F3760B760D7609761F762776207621762276247634
-7630763B764776487646765C76587661766276687669766A7667766C76700000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000767276767678767C768076837688768B768E769676937699769A76B076B4
-76B876B976BA76C276CD76D676D276DE76E176E576E776EA862F76FB77087707
-770477297724771E77257726771B773777387747775A7768776B775B7765777F
-777E7779778E778B779177A0779E77B077B677B977BF77BC77BD77BB77C777CD
-77D777DA77DC77E377EE77FC780C781279267820792A7845788E78747886787C
-789A788C78A378B578AA78AF78D178C678CB78D478BE78BC78C578CA78EC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078E778DA78FD78F47907791279117919792C792B794079607957795F795A
-79557953797A797F798A799D79A79F4B79AA79AE79B379B979BA79C979D579E7
-79EC79E179E37A087A0D7A187A197A207A1F79807A317A3B7A3E7A377A437A57
-7A497A617A627A699F9D7A707A797A7D7A887A977A957A987A967AA97AC87AB0
-7AB67AC57AC47ABF90837AC77ACA7ACD7ACF7AD57AD37AD97ADA7ADD7AE17AE2
-7AE67AED7AF07B027B0F7B0A7B067B337B187B197B1E7B357B287B367B500000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007B7A7B047B4D7B0B7B4C7B457B757B657B747B677B707B717B6C7B6E7B9D
-7B987B9F7B8D7B9C7B9A7B8B7B927B8F7B5D7B997BCB7BC17BCC7BCF7BB47BC6
-7BDD7BE97C117C147BE67BE57C607C007C077C137BF37BF77C177C0D7BF67C23
-7C277C2A7C1F7C377C2B7C3D7C4C7C437C547C4F7C407C507C587C5F7C647C56
-7C657C6C7C757C837C907CA47CAD7CA27CAB7CA17CA87CB37CB27CB17CAE7CB9
-7CBD7CC07CC57CC27CD87CD27CDC7CE29B3B7CEF7CF27CF47CF67CFA7D060000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D027D1C7D157D0A7D457D4B7D2E7D327D3F7D357D467D737D567D4E7D72
-7D687D6E7D4F7D637D937D897D5B7D8F7D7D7D9B7DBA7DAE7DA37DB57DC77DBD
-7DAB7E3D7DA27DAF7DDC7DB87D9F7DB07DD87DDD7DE47DDE7DFB7DF27DE17E05
-7E0A7E237E217E127E317E1F7E097E0B7E227E467E667E3B7E357E397E437E37
-7E327E3A7E677E5D7E567E5E7E597E5A7E797E6A7E697E7C7E7B7E837DD57E7D
-8FAE7E7F7E887E897E8C7E927E907E937E947E967E8E7E9B7E9C7F387F3A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007F457F4C7F4D7F4E7F507F517F557F547F587F5F7F607F687F697F677F78
-7F827F867F837F887F877F8C7F947F9E7F9D7F9A7FA37FAF7FB27FB97FAE7FB6
-7FB88B717FC57FC67FCA7FD57FD47FE17FE67FE97FF37FF998DC80068004800B
-801280188019801C80218028803F803B804A804680528058805A805F80628068
-80738072807080768079807D807F808480868085809B8093809A80AD519080AC
-80DB80E580D980DD80C480DA80D6810980EF80F1811B81298123812F814B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000968B8146813E8153815180FC8171816E81658166817481838188818A8180
-818281A0819581A481A3815F819381A981B081B581BE81B881BD81C081C281BA
-81C981CD81D181D981D881C881DA81DF81E081E781FA81FB81FE820182028205
-8207820A820D821082168229822B82388233824082598258825D825A825F8264
-82628268826A826B822E827182778278827E828D829282AB829F82BB82AC82E1
-82E382DF82D282F482F382FA8393830382FB82F982DE830682DC830982D90000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-68
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000833583348316833283318340833983508345832F832B831783188385839A
-83AA839F83A283968323838E8387838A837C83B58373837583A0838983A883F4
-841383EB83CE83FD840383D8840B83C183F7840783E083F2840D8422842083BD
-8438850683FB846D842A843C855A84848477846B84AD846E848284698446842C
-846F8479843584CA846284B984BF849F84D984CD84BB84DA84D084C184C684D6
-84A1852184FF84F485178518852C851F8515851484FC85408563855885480000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000085418602854B8555858085A485888591858A85A8856D8594859B85EA8587
-859C8577857E859085C985BA85CF85B985D085D585DD85E585DC85F9860A8613
-860B85FE85FA86068622861A8630863F864D4E558654865F86678671869386A3
-86A986AA868B868C86B686AF86C486C686B086C9882386AB86D486DE86E986EC
-86DF86DB86EF8712870687088700870386FB87118709870D86F9870A8734873F
-8737873B87258729871A8760875F8778874C874E877487578768876E87590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000087538763876A880587A2879F878287AF87CB87BD87C087D096D687AB87C4
-87B387C787C687BB87EF87F287E0880F880D87FE87F687F7880E87D288118816
-8815882288218831883688398827883B8844884288528859885E8862886B8881
-887E889E8875887D88B5887288828897889288AE889988A2888D88A488B088BF
-88B188C388C488D488D888D988DD88F9890288FC88F488E888F28904890C890A
-89138943891E8925892A892B89418944893B89368938894C891D8960895E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000089668964896D896A896F89748977897E89838988898A8993899889A189A9
-89A689AC89AF89B289BA89BD89BF89C089DA89DC89DD89E789F489F88A038A16
-8A108A0C8A1B8A1D8A258A368A418A5B8A528A468A488A7C8A6D8A6C8A628A85
-8A828A848AA88AA18A918AA58AA68A9A8AA38AC48ACD8AC28ADA8AEB8AF38AE7
-8AE48AF18B148AE08AE28AF78ADE8ADB8B0C8B078B1A8AE18B168B108B178B20
-8B3397AB8B268B2B8B3E8B288B418B4C8B4F8B4E8B498B568B5B8B5A8B6B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B5F8B6C8B6F8B748B7D8B808B8C8B8E8B928B938B968B998B9A8C3A8C41
-8C3F8C488C4C8C4E8C508C558C628C6C8C788C7A8C828C898C858C8A8C8D8C8E
-8C948C7C8C98621D8CAD8CAA8CBD8CB28CB38CAE8CB68CC88CC18CE48CE38CDA
-8CFD8CFA8CFB8D048D058D0A8D078D0F8D0D8D109F4E8D138CCD8D148D168D67
-8D6D8D718D738D818D998DC28DBE8DBA8DCF8DDA8DD68DCC8DDB8DCB8DEA8DEB
-8DDF8DE38DFC8E088E098DFF8E1D8E1E8E108E1F8E428E358E308E348E4A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E478E498E4C8E508E488E598E648E608E2A8E638E558E768E728E7C8E81
-8E878E858E848E8B8E8A8E938E918E948E998EAA8EA18EAC8EB08EC68EB18EBE
-8EC58EC88ECB8EDB8EE38EFC8EFB8EEB8EFE8F0A8F058F158F128F198F138F1C
-8F1F8F1B8F0C8F268F338F3B8F398F458F428F3E8F4C8F498F468F4E8F578F5C
-8F628F638F648F9C8F9F8FA38FAD8FAF8FB78FDA8FE58FE28FEA8FEF90878FF4
-90058FF98FFA901190159021900D901E9016900B90279036903590398FF80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000904F905090519052900E9049903E90569058905E9068906F907696A89072
-9082907D90819080908A9089908F90A890AF90B190B590E290E4624890DB9102
-9112911991329130914A9156915891639165916991739172918B9189918291A2
-91AB91AF91AA91B591B491BA91C091C191C991CB91D091D691DF91E191DB91FC
-91F591F6921E91FF9214922C92159211925E925792459249926492489295923F
-924B9250929C92969293929B925A92CF92B992B792E9930F92FA9344932E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093199322931A9323933A9335933B935C9360937C936E935693B093AC93AD
-939493B993D693D793E893E593D893C393DD93D093C893E4941A941494139403
-940794109436942B94359421943A944194529444945B94609462945E946A9229
-947094759477947D945A947C947E9481947F95829587958A9594959695989599
-95A095A895A795AD95BC95BB95B995BE95CA6FF695C395CD95CC95D595D495D6
-95DC95E195E595E296219628962E962F9642964C964F964B9677965C965E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-70
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000965D965F96669672966C968D96989695969796AA96A796B196B296B096B4
-96B696B896B996CE96CB96C996CD894D96DC970D96D596F99704970697089713
-970E9711970F971697199724972A97309739973D973E97449746974897429749
-975C976097649766976852D2976B977197799785977C9781977A9786978B978F
-9790979C97A897A697A397B397B497C397C697C897CB97DC97ED9F4F97F27ADF
-97F697F5980F980C9838982498219837983D9846984F984B986B986F98700000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-71
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000098719874987398AA98AF98B198B698C498C398C698E998EB990399099912
-991499189921991D991E99249920992C992E993D993E9942994999459950994B
-99519952994C99559997999899A599AD99AE99BC99DF99DB99DD99D899D199ED
-99EE99F199F299FB99F89A019A0F9A0599E29A199A2B9A379A459A429A409A43
-9A3E9A559A4D9A5B9A579A5F9A629A659A649A699A6B9A6A9AAD9AB09ABC9AC0
-9ACF9AD19AD39AD49ADE9ADF9AE29AE39AE69AEF9AEB9AEE9AF49AF19AF70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009AFB9B069B189B1A9B1F9B229B239B259B279B289B299B2A9B2E9B2F9B32
-9B449B439B4F9B4D9B4E9B519B589B749B939B839B919B969B979B9F9BA09BA8
-9BB49BC09BCA9BB99BC69BCF9BD19BD29BE39BE29BE49BD49BE19C3A9BF29BF1
-9BF09C159C149C099C139C0C9C069C089C129C0A9C049C2E9C1B9C259C249C21
-9C309C479C329C469C3E9C5A9C609C679C769C789CE79CEC9CF09D099D089CEB
-9D039D069D2A9D269DAF9D239D1F9D449D159D129D419D3F9D3E9D469D480000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D5D9D5E9D649D519D509D599D729D899D879DAB9D6F9D7A9D9A9DA49DA9
-9DB29DC49DC19DBB9DB89DBA9DC69DCF9DC29DD99DD39DF89DE69DED9DEF9DFD
-9E1A9E1B9E1E9E759E799E7D9E819E889E8B9E8C9E929E959E919E9D9EA59EA9
-9EB89EAA9EAD97619ECC9ECE9ECF9ED09ED49EDC9EDE9EDD9EE09EE59EE89EEF
-9EF49EF69EF79EF99EFB9EFC9EFD9F079F0876B79F159F219F2C9F3E9F4A9F52
-9F549F639F5F9F609F619F669F679F6C9F6A9F779F729F769F959F9C9FA00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000582F69C79059746451DC7199000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/jis0212.enc b/library/encoding/jis0212.enc
deleted file mode 100644
index cddbbba..0000000
--- a/library/encoding/jis0212.enc
+++ /dev/null
@@ -1,1159 +0,0 @@
-# Encoding file: jis0212, double-byte
-D
-2244 0 68
-22
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000000000000000000002D8
-02C700B802D902DD00AF02DB02DA007E03840385000000000000000000000000
-0000000000A100A600BF00000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000BA00AA00A900AE2122
-00A4211600000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-26
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000038603880389038A03AA0000038C0000038E03AB0000038F000000000000
-000003AC03AD03AE03AF03CA039003CC03C203CD03CB03B003CE000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-27
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000004020403040404050406040704080409040A040B040C040E040F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000004520453045404550456045704580459045A045B045C045E045F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-29
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000C60110000001260000013200000141013F0000014A00D8015200000166
-00DE000000000000000000000000000000000000000000000000000000000000
-000000E6011100F00127013101330138014201400149014B00F8015300DF0167
-00FE000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000C100C000C400C2010201CD0100010400C500C301060108010C00C7010A
-010E00C900C800CB00CA011A0116011201180000011C011E01220120012400CD
-00CC00CF00CE01CF0130012A012E0128013401360139013D013B014301470145
-00D100D300D200D600D401D10150014C00D5015401580156015A015C0160015E
-0164016200DA00D900DC00DB016C01D30170016A0172016E016801D701DB01D9
-01D5017400DD017801760179017D017B00000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000E100E000E400E2010301CE0101010500E500E301070109010D00E7010B
-010F00E900E800EB00EA011B01170113011901F5011D011F00000121012500ED
-00EC00EF00EE01D00000012B012F012901350137013A013E013C014401480146
-00F100F300F200F600F401D20151014D00F5015501590157015B015D0161015F
-0165016300FA00F900FC00FB016D01D40171016B0173016F016901D801DC01DA
-01D6017500FD00FF0177017A017E017C00000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E024E044E054E0C4E124E1F4E234E244E284E2B4E2E4E2F4E304E354E40
-4E414E444E474E514E5A4E5C4E634E684E694E744E754E794E7F4E8D4E964E97
-4E9D4EAF4EB94EC34ED04EDA4EDB4EE04EE14EE24EE84EEF4EF14EF34EF54EFD
-4EFE4EFF4F004F024F034F084F0B4F0C4F124F154F164F174F194F2E4F314F60
-4F334F354F374F394F3B4F3E4F404F424F484F494F4B4F4C4F524F544F564F58
-4F5F4F634F6A4F6C4F6E4F714F774F784F794F7A4F7D4F7E4F814F824F840000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-31
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F854F894F8A4F8C4F8E4F904F924F934F944F974F994F9A4F9E4F9F4FB2
-4FB74FB94FBB4FBC4FBD4FBE4FC04FC14FC54FC64FC84FC94FCB4FCC4FCD4FCF
-4FD24FDC4FE04FE24FF04FF24FFC4FFD4FFF5000500150045007500A500C500E
-5010501350175018501B501C501D501E50225027502E50305032503350355040
-5041504250455046504A504C504E50515052505350575059505F506050625063
-50665067506A506D50705071503B5081508350845086508A508E508F50900000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-32
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005092509350945096509B509C509E509F50A050A150A250AA50AF50B050B9
-50BA50BD50C050C350C450C750CC50CE50D050D350D450D850DC50DD50DF50E2
-50E450E650E850E950EF50F150F650FA50FE5103510651075108510B510C510D
-510E50F2511051175119511B511C511D511E512351275128512C512D512F5131
-513351345135513851395142514A514F5153515551575158515F51645166517E
-51835184518B518E5198519D51A151A351AD51B851BA51BC51BE51BF51C20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-33
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000051C851CF51D151D251D351D551D851DE51E251E551EE51F251F351F451F7
-5201520252055212521352155216521852225228523152325235523C52455249
-525552575258525A525C525F526052615266526E527752785279528052825285
-528A528C52935295529652975298529A529C52A452A552A652A752AF52B052B6
-52B752B852BA52BB52BD52C052C452C652C852CC52CF52D152D452D652DB52DC
-52E152E552E852E952EA52EC52F052F152F452F652F753005303530A530B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-34
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000530C531153135318531B531C531E531F5325532753285329532B532C532D
-533053325335533C533D533E5342534C534B5359535B536153635365536C536D
-53725379537E538353875388538E539353945399539D53A153A453AA53AB53AF
-53B253B453B553B753B853BA53BD53C053C553CF53D253D353D553DA53DD53DE
-53E053E653E753F554025413541A542154275428542A542F5431543454355443
-54445447544D544F545E54625464546654675469546B546D546E5474547F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-35
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054815483548554885489548D549154955496549C549F54A154A654A754A9
-54AA54AD54AE54B154B754B954BA54BB54BF54C654CA54CD54CE54E054EA54EC
-54EF54F654FC54FE54FF55005501550555085509550C550D550E5515552A552B
-553255355536553B553C553D554155475549554A554D555055515558555A555B
-555E5560556155645566557F5581558255865588558E558F5591559255935594
-559755A355A455AD55B255BF55C155C355C655C955CB55CC55CE55D155D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-36
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000055D355D755D855DB55DE55E255E955F655FF56055608560A560D560E560F
-5610561156125619562C56305633563556375639563B563C563D563F56405641
-5643564456465649564B564D564F5654565E566056615662566356665669566D
-566F567156725675568456855688568B568C56955699569A569D569E569F56A6
-56A756A856A956AB56AC56AD56B156B356B756BE56C556C956CA56CB56CF56D0
-56CC56CD56D956DC56DD56DF56E156E456E556E656E756E856F156EB56ED0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-37
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000056F656F7570157025707570A570C57115715571A571B571D572057225723
-572457255729572A572C572E572F57335734573D573E573F57455746574C574D
-57525762576557675768576B576D576E576F5770577157735774577557775779
-577A577B577C577E57815783578C579457975799579A579C579D579E579F57A1
-579557A757A857A957AC57B857BD57C757C857CC57CF57D557DD57DE57E457E6
-57E757E957ED57F057F557F657F857FD57FE57FF580358045808580957E10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-38
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000580C580D581B581E581F582058265827582D58325839583F5849584C584D
-584F58505855585F58615864586758685878587C587F58805881588758885889
-588A588C588D588F589058945896589D58A058A158A258A658A958B158B258C4
-58BC58C258C858CD58CE58D058D258D458D658DA58DD58E158E258E958F35905
-5906590B590C5912591359148641591D5921592359245928592F593059335935
-5936593F59435946595259535959595B595D595E595F59615963596B596D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-39
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000596F5972597559765979597B597C598B598C598E599259955997599F59A4
-59A759AD59AE59AF59B059B359B759BA59BC59C159C359C459C859CA59CD59D2
-59DD59DE59DF59E359E459E759EE59EF59F159F259F459F75A005A045A0C5A0D
-5A0E5A125A135A1E5A235A245A275A285A2A5A2D5A305A445A455A475A485A4C
-5A505A555A5E5A635A655A675A6D5A775A7A5A7B5A7E5A8B5A905A935A965A99
-5A9C5A9E5A9F5AA05AA25AA75AAC5AB15AB25AB35AB55AB85ABA5ABB5ABF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005AC45AC65AC85ACF5ADA5ADC5AE05AE55AEA5AEE5AF55AF65AFD5B005B01
-5B085B175B345B195B1B5B1D5B215B255B2D5B385B415B4B5B4C5B525B565B5E
-5B685B6E5B6F5B7C5B7D5B7E5B7F5B815B845B865B8A5B8E5B905B915B935B94
-5B965BA85BA95BAC5BAD5BAF5BB15BB25BB75BBA5BBC5BC05BC15BCD5BCF5BD6
-5BD75BD85BD95BDA5BE05BEF5BF15BF45BFD5C0C5C175C1E5C1F5C235C265C29
-5C2B5C2C5C2E5C305C325C355C365C595C5A5C5C5C625C635C675C685C690000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005C6D5C705C745C755C7A5C7B5C7C5C7D5C875C885C8A5C8F5C925C9D5C9F
-5CA05CA25CA35CA65CAA5CB25CB45CB55CBA5CC95CCB5CD25CDD5CD75CEE5CF1
-5CF25CF45D015D065D0D5D125D2B5D235D245D265D275D315D345D395D3D5D3F
-5D425D435D465D485D555D515D595D4A5D5F5D605D615D625D645D6A5D6D5D70
-5D795D7A5D7E5D7F5D815D835D885D8A5D925D935D945D955D995D9B5D9F5DA0
-5DA75DAB5DB05DB45DB85DB95DC35DC75DCB5DD05DCE5DD85DD95DE05DE40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005DE95DF85DF95E005E075E0D5E125E145E155E185E1F5E205E2E5E285E32
-5E355E3E5E4B5E505E495E515E565E585E5B5E5C5E5E5E685E6A5E6B5E6C5E6D
-5E6E5E705E805E8B5E8E5EA25EA45EA55EA85EAA5EAC5EB15EB35EBD5EBE5EBF
-5EC65ECC5ECB5ECE5ED15ED25ED45ED55EDC5EDE5EE55EEB5F025F065F075F08
-5F0E5F195F1C5F1D5F215F225F235F245F285F2B5F2C5F2E5F305F345F365F3B
-5F3D5F3F5F405F445F455F475F4D5F505F545F585F5B5F605F635F645F670000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F6F5F725F745F755F785F7A5F7D5F7E5F895F8D5F8F5F965F9C5F9D5FA2
-5FA75FAB5FA45FAC5FAF5FB05FB15FB85FC45FC75FC85FC95FCB5FD05FD15FD2
-5FD35FD45FDE5FE15FE25FE85FE95FEA5FEC5FED5FEE5FEF5FF25FF35FF65FFA
-5FFC6007600A600D6013601460176018601A601F6024602D6033603560406047
-60486049604C6051605460566057605D606160676071607E607F608260866088
-608A608E6091609360956098609D609E60A260A460A560A860B060B160B70000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000060BB60BE60C260C460C860C960CA60CB60CE60CF60D460D560D960DB60DD
-60DE60E260E560F260F560F860FC60FD61026107610A610C6110611161126113
-6114611661176119611C611E6122612A612B6130613161356136613761396141
-614561466149615E6160616C61726178617B617C617F6180618161836184618B
-618D6192619361976198619C619D619F61A061A561A861AA61AD61B861B961BC
-61C061C161C261CE61CF61D561DC61DD61DE61DF61E161E261E761E961E50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000061EC61ED61EF620162036204620762136215621C62206222622362276229
-622B6239623D6242624362446246624C62506251625262546256625A625C6264
-626D626F6273627A627D628D628E628F629062A662A862B362B662B762BA62BE
-62BF62C462CE62D562D662DA62EA62F262F462FC62FD63036304630A630B630D
-63106313631663186329632A632D633563366339633C63416342634363446346
-634A634B634E6352635363546358635B63656366636C636D6371637463750000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-40
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006378637C637D637F638263846387638A6390639463956399639A639E63A4
-63A663AD63AE63AF63BD63C163C563C863CE63D163D363D463D563DC63E063E5
-63EA63EC63F263F363F563F863F96409640A6410641264146418641E64206422
-642464256429642A642F64306435643D643F644B644F6451645264536454645A
-645B645C645D645F646064616463646D64736474647B647D64856487648F6490
-649164986499649B649D649F64A164A364A664A864AC64B364BD64BE64BF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-41
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000064C464C964CA64CB64CC64CE64D064D164D564D764E464E564E964EA64ED
-64F064F564F764FB64FF6501650465086509650A650F6513651465166519651B
-651E651F652265266529652E6531653A653C653D654365476549655065526554
-655F65606567656B657A657D65816585658A659265956598659D65A065A365A6
-65AE65B265B365B465BF65C265C865C965CE65D065D465D665D865DF65F065F2
-65F465F565F965FE65FF6600660466086609660D6611661266156616661D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-42
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000661E662166226623662466266629662A662B662C662E6630663166336639
-6637664066456646664A664C6651664E665766586659665B665C6660666166FB
-666A666B666C667E66736675667F667766786679667B6680667C668B668C668D
-669066926699669A669B669C669F66A066A466AD66B166B266B566BB66BF66C0
-66C266C366C866CC66CE66CF66D466DB66DF66E866EB66EC66EE66FA67056707
-670E67136719671C672067226733673E674567476748674C67546755675D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-43
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006766676C676E67746776677B67816784678E678F67916793679667986799
-679B67B067B167B267B567BB67BC67BD67F967C067C267C367C567C867C967D2
-67D767D967DC67E167E667F067F267F667F7685268146819681D681F68286827
-682C682D682F683068316833683B683F68446845684A684C685568576858685B
-686B686E686F68706871687268756879687A687B687C68826884688668886896
-6898689A689C68A168A368A568A968AA68AE68B268BB68C568C868CC68CF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-44
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068D068D168D368D668D968DC68DD68E568E868EA68EB68EC68ED68F068F1
-68F568F668FB68FC68FD69066909690A69106911691369166917693169336935
-6938693B694269456949694E6957695B696369646965696669686969696C6970
-69716972697A697B697F6980698D69926996699869A169A569A669A869AB69AD
-69AF69B769B869BA69BC69C569C869D169D669D769E269E569EE69EF69F169F3
-69F569FE6A006A016A036A0F6A116A156A1A6A1D6A206A246A286A306A320000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-45
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006A346A376A3B6A3E6A3F6A456A466A496A4A6A4E6A506A516A526A556A56
-6A5B6A646A676A6A6A716A736A7E6A816A836A866A876A896A8B6A916A9B6A9D
-6A9E6A9F6AA56AAB6AAF6AB06AB16AB46ABD6ABE6ABF6AC66AC96AC86ACC6AD0
-6AD46AD56AD66ADC6ADD6AE46AE76AEC6AF06AF16AF26AFC6AFD6B026B036B06
-6B076B096B0F6B106B116B176B1B6B1E6B246B286B2B6B2C6B2F6B356B366B3B
-6B3F6B466B4A6B4D6B526B566B586B5D6B606B676B6B6B6E6B706B756B7D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-46
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006B7E6B826B856B976B9B6B9F6BA06BA26BA36BA86BA96BAC6BAD6BAE6BB0
-6BB86BB96BBD6BBE6BC36BC46BC96BCC6BD66BDA6BE16BE36BE66BE76BEE6BF1
-6BF76BF96BFF6C026C046C056C096C0D6C0E6C106C126C196C1F6C266C276C28
-6C2C6C2E6C336C356C366C3A6C3B6C3F6C4A6C4B6C4D6C4F6C526C546C596C5B
-6C5C6C6B6C6D6C6F6C746C766C786C796C7B6C856C866C876C896C946C956C97
-6C986C9C6C9F6CB06CB26CB46CC26CC66CCD6CCF6CD06CD16CD26CD46CD60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-47
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006CDA6CDC6CE06CE76CE96CEB6CEC6CEE6CF26CF46D046D076D0A6D0E6D0F
-6D116D136D1A6D266D276D286C676D2E6D2F6D316D396D3C6D3F6D576D5E6D5F
-6D616D656D676D6F6D706D7C6D826D876D916D926D946D966D976D986DAA6DAC
-6DB46DB76DB96DBD6DBF6DC46DC86DCA6DCE6DCF6DD66DDB6DDD6DDF6DE06DE2
-6DE56DE96DEF6DF06DF46DF66DFC6E006E046E1E6E226E276E326E366E396E3B
-6E3C6E446E456E486E496E4B6E4F6E516E526E536E546E576E5C6E5D6E5E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-48
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006E626E636E686E736E7B6E7D6E8D6E936E996EA06EA76EAD6EAE6EB16EB3
-6EBB6EBF6EC06EC16EC36EC76EC86ECA6ECD6ECE6ECF6EEB6EED6EEE6EF96EFB
-6EFD6F046F086F0A6F0C6F0D6F166F186F1A6F1B6F266F296F2A6F2F6F306F33
-6F366F3B6F3C6F2D6F4F6F516F526F536F576F596F5A6F5D6F5E6F616F626F68
-6F6C6F7D6F7E6F836F876F886F8B6F8C6F8D6F906F926F936F946F966F9A6F9F
-6FA06FA56FA66FA76FA86FAE6FAF6FB06FB56FB66FBC6FC56FC76FC86FCA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-49
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FDA6FDE6FE86FE96FF06FF56FF96FFC6FFD7000700570067007700D7017
-70207023702F703470377039703C7043704470487049704A704B70547055705D
-705E704E70647065706C706E70757076707E7081708570867094709570967097
-7098709B70A470AB70B070B170B470B770CA70D170D370D470D570D670D870DC
-70E470FA71037104710571067107710B710C710F711E7120712B712D712F7130
-713171387141714571467147714A714B715071527157715A715C715E71600000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000071687179718071857187718C7192719A719B71A071A271AF71B071B271B3
-71BA71BF71C071C171C471CB71CC71D371D671D971DA71DC71F871FE72007207
-7208720972137217721A721D721F7224722B722F723472387239724172427243
-7245724E724F7250725372557256725A725C725E726072637268726B726E726F
-727172777278727B727C727F72847289728D728E7293729B72A872AD72AE72B1
-72B472BE72C172C772C972CC72D572D672D872DF72E572F372F472FA72FB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000072FE7302730473057307730B730D7312731373187319731E732273247327
-7328732C733173327335733A733B733D7343734D7350735273567358735D735E
-735F7360736673677369736B736C736E736F737173777379737C738073817383
-73857386738E73907393739573977398739C739E739F73A073A273A573A673AA
-73AB73AD73B573B773B973BC73BD73BF73C573C673C973CB73CC73CF73D273D3
-73D673D973DD73E173E373E673E773E973F473F573F773F973FA73FB73FD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000073FF7400740174047407740A7411741A741B7424742674287429742A742B
-742C742D742E742F74307431743974407443744474467447744B744D74517452
-7457745D7462746674677468746B746D746E7471747274807481748574867487
-7489748F74907491749274987499749A749C749F74A074A174A374A674A874A9
-74AA74AB74AE74AF74B174B274B574B974BB74BF74C874C974CC74D074D374D8
-74DA74DB74DE74DF74E474E874EA74EB74EF74F474FA74FB74FC74FF75060000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000075127516751775207521752475277529752A752F75367539753D753E753F
-7540754375477548754E755075527557755E755F7561756F75717579757A757B
-757C757D757E7581758575907592759375957599759C75A275A475B475BA75BF
-75C075C175C475C675CC75CE75CF75D775DC75DF75E075E175E475E775EC75EE
-75EF75F175F9760076027603760476077608760A760C760F7612761376157616
-7619761B761C761D761E7623762576267629762D763276337635763876390000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000763A763C764A764076417643764476457649764B76557659765F76647665
-766D766E766F7671767476817685768C768D7695769B769C769D769F76A076A2
-76A376A476A576A676A776A876AA76AD76BD76C176C576C976CB76CC76CE76D4
-76D976E076E676E876EC76F076F176F676F976FC77007706770A770E77127714
-771577177719771A771C77227728772D772E772F7734773577367739773D773E
-774277457746774A774D774E774F775277567757775C775E775F776077620000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077647767776A776C7770777277737774777A777D77807784778C778D7794
-77957796779A779F77A277A777AA77AE77AF77B177B577BE77C377C977D177D2
-77D577D977DE77DF77E077E477E677EA77EC77F077F177F477F877FB78057806
-7809780D780E7811781D782178227823782D782E783078357837784378447847
-7848784C784E7852785C785E78607861786378647868786A786E787A787E788A
-788F7894789878A1789D789E789F78A478A878AC78AD78B078B178B278B30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078BB78BD78BF78C778C878C978CC78CE78D278D378D578D678E478DB78DF
-78E078E178E678EA78F278F3790078F678F778FA78FB78FF7906790C7910791A
-791C791E791F7920792579277929792D793179347935793B793D793F79447945
-7946794A794B794F795179547958795B795C79677969796B79727979797B797C
-797E798B798C799179937994799579967998799B799C79A179A879A979AB79AF
-79B179B479B879BB79C279C479C779C879CA79CF79D479D679DA79DD79DE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079E079E279E579EA79EB79ED79F179F879FC7A027A037A077A097A0A7A0C
-7A117A157A1B7A1E7A217A277A2B7A2D7A2F7A307A347A357A387A397A3A7A44
-7A457A477A487A4C7A557A567A597A5C7A5D7A5F7A607A657A677A6A7A6D7A75
-7A787A7E7A807A827A857A867A8A7A8B7A907A917A947A9E7AA07AA37AAC7AB3
-7AB57AB97ABB7ABC7AC67AC97ACC7ACE7AD17ADB7AE87AE97AEB7AEC7AF17AF4
-7AFB7AFD7AFE7B077B147B1F7B237B277B297B2A7B2B7B2D7B2E7B2F7B300000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-52
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007B317B347B3D7B3F7B407B417B477B4E7B557B607B647B667B697B6A7B6D
-7B6F7B727B737B777B847B897B8E7B907B917B967B9B7B9E7BA07BA57BAC7BAF
-7BB07BB27BB57BB67BBA7BBB7BBC7BBD7BC27BC57BC87BCA7BD47BD67BD77BD9
-7BDA7BDB7BE87BEA7BF27BF47BF57BF87BF97BFA7BFC7BFE7C017C027C037C04
-7C067C097C0B7C0C7C0E7C0F7C197C1B7C207C257C267C287C2C7C317C337C34
-7C367C397C3A7C467C4A7C557C517C527C537C597C5A7C5B7C5C7C5D7C5E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007C617C637C677C697C6D7C6E7C707C727C797C7C7C7D7C867C877C8F7C94
-7C9E7CA07CA67CB07CB67CB77CBA7CBB7CBC7CBF7CC47CC77CC87CC97CCD7CCF
-7CD37CD47CD57CD77CD97CDA7CDD7CE67CE97CEB7CF57D037D077D087D097D0F
-7D117D127D137D167D1D7D1E7D237D267D2A7D2D7D317D3C7D3D7D3E7D407D41
-7D477D487D4D7D517D537D577D597D5A7D5C7D5D7D657D677D6A7D707D787D7A
-7D7B7D7F7D817D827D837D857D867D887D8B7D8C7D8D7D917D967D977D9D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D9E7DA67DA77DAA7DB37DB67DB77DB97DC27DC37DC47DC57DC67DCC7DCD
-7DCE7DD77DD97E007DE27DE57DE67DEA7DEB7DED7DF17DF57DF67DF97DFA7E08
-7E107E117E157E177E1C7E1D7E207E277E287E2C7E2D7E2F7E337E367E3F7E44
-7E457E477E4E7E507E527E587E5F7E617E627E657E6B7E6E7E6F7E737E787E7E
-7E817E867E877E8A7E8D7E917E957E987E9A7E9D7E9E7F3C7F3B7F3D7F3E7F3F
-7F437F447F477F4F7F527F537F5B7F5C7F5D7F617F637F647F657F667F6D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-55
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007F717F7D7F7E7F7F7F807F8B7F8D7F8F7F907F917F967F977F9C7FA17FA2
-7FA67FAA7FAD7FB47FBC7FBF7FC07FC37FC87FCE7FCF7FDB7FDF7FE37FE57FE8
-7FEC7FEE7FEF7FF27FFA7FFD7FFE7FFF80078008800A800D800E800F80118013
-80148016801D801E801F802080248026802C802E80308034803580378039803A
-803C803E80408044806080648066806D8071807580818088808E809C809E80A6
-80A780AB80B880B980C880CD80CF80D280D480D580D780D880E080ED80EE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000080F080F280F380F680F980FA80FE8103810B811681178118811C811E8120
-81248127812C81308135813A813C81458147814A814C81528157816081618167
-81688169816D816F817781818190818481858186818B818E81968198819B819E
-81A281AE81B281B481BB81CB81C381C581CA81CE81CF81D581D781DB81DD81DE
-81E181E481EB81EC81F081F181F281F581F681F881F981FD81FF82008203820F
-821382148219821A821D82218222822882328234823A82438244824582460000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000824B824E824F82518256825C826082638267826D8274827B827D827F8280
-82818283828482878289828A828E8291829482968298829A829B82A082A182A3
-82A482A782A882A982AA82AE82B082B282B482B782BA82BC82BE82BF82C682D0
-82D582DA82E082E282E482E882EA82ED82EF82F682F782FD82FE830083018307
-8308830A830B8354831B831D831E831F83218322832C832D832E833083338337
-833A833C833D8342834383448347834D834E8351835583568357837083780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-58
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000837D837F8380838283848386838D83928394839583988399839B839C839D
-83A683A783A983AC83BE83BF83C083C783C983CF83D083D183D483DD835383E8
-83EA83F683F883F983FC84018406840A840F84118415841983AD842F84398445
-84478448844A844D844F84518452845684588459845A845C8460846484658467
-846A84708473847484768478847C847D84818485849284938495849E84A684A8
-84A984AA84AF84B184B484BA84BD84BE84C084C284C784C884CC84CF84D30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000084DC84E784EA84EF84F084F184F284F7853284FA84FB84FD850285038507
-850C850E8510851C851E85228523852485258527852A852B852F853385348536
-853F8546854F855085518552855385568559855C855D855E855F856085618562
-8564856B856F8579857A857B857D857F8581858585868589858B858C858F8593
-8598859D859F85A085A285A585A785B485B685B785B885BC85BD85BE85BF85C2
-85C785CA85CB85CE85AD85D885DA85DF85E085E685E885ED85F385F685FC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000085FF860086048605860D860E86108611861286188619861B861E86218627
-862986368638863A863C863D864086428646865286538656865786588659865D
-866086618662866386648669866C866F867586768677867A868D869186968698
-869A869C86A186A686A786A886AD86B186B386B486B586B786B886B986BF86C0
-86C186C386C586D186D286D586D786DA86DC86E086E386E586E7868886FA86FC
-86FD870487058707870B870E870F8710871387148719871E871F872187230000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008728872E872F873187328739873A873C873D873E874087438745874D8758
-875D876187648765876F87718772877B8783878487858786878787888789878B
-878C879087938795879787988799879E87A087A387A787AC87AD87AE87B187B5
-87BE87BF87C187C887C987CA87CE87D587D687D987DA87DC87DF87E287E387E4
-87EA87EB87ED87F187F387F887FA87FF8801880388068809880A880B88108819
-8812881388148818881A881B881C881E881F8828882D882E8830883288350000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000883A883C88418843884588488849884A884B884E8851885588568858885A
-885C885F88608864886988718879887B88808898889A889B889C889F88A088A8
-88AA88BA88BD88BE88C088CA88CB88CC88CD88CE88D188D288D388DB88DE88E7
-88EF88F088F188F588F789018906890D890E890F8915891689188919891A891C
-892089268927892889308931893289358939893A893E89408942894589468949
-894F89528957895A895B895C896189628963896B896E897089738975897A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000897B897C897D8989898D899089948995899B899C899F89A089A589B089B4
-89B589B689B789BC89D489D589D689D789D889E589E989EB89ED89F189F389F6
-89F989FD89FF8A048A058A078A0F8A118A128A148A158A1E8A208A228A248A26
-8A2B8A2C8A2F8A358A378A3D8A3E8A408A438A458A478A498A4D8A4E8A538A56
-8A578A588A5C8A5D8A618A658A678A758A768A778A798A7A8A7B8A7E8A7F8A80
-8A838A868A8B8A8F8A908A928A968A978A998A9F8AA78AA98AAE8AAF8AB30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008AB68AB78ABB8ABE8AC38AC68AC88AC98ACA8AD18AD38AD48AD58AD78ADD
-8ADF8AEC8AF08AF48AF58AF68AFC8AFF8B058B068B0B8B118B1C8B1E8B1F8B0A
-8B2D8B308B378B3C8B428B438B448B458B468B488B528B538B548B598B4D8B5E
-8B638B6D8B768B788B798B7C8B7E8B818B848B858B8B8B8D8B8F8B948B958B9C
-8B9E8B9F8C388C398C3D8C3E8C458C478C498C4B8C4F8C518C538C548C578C58
-8C5B8C5D8C598C638C648C668C688C698C6D8C738C758C768C7B8C7E8C860000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008C878C8B8C908C928C938C998C9B8C9C8CA48CB98CBA8CC58CC68CC98CCB
-8CCF8CD68CD58CD98CDD8CE18CE88CEC8CEF8CF08CF28CF58CF78CF88CFE8CFF
-8D018D038D098D128D178D1B8D658D698D6C8D6E8D7F8D828D848D888D8D8D90
-8D918D958D9E8D9F8DA08DA68DAB8DAC8DAF8DB28DB58DB78DB98DBB8DC08DC5
-8DC68DC78DC88DCA8DCE8DD18DD48DD58DD78DD98DE48DE58DE78DEC8DF08DBC
-8DF18DF28DF48DFD8E018E048E058E068E0B8E118E148E168E208E218E220000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E238E268E278E318E338E368E378E388E398E3D8E408E418E4B8E4D8E4E
-8E4F8E548E5B8E5C8E5D8E5E8E618E628E698E6C8E6D8E6F8E708E718E798E7A
-8E7B8E828E838E898E908E928E958E9A8E9B8E9D8E9E8EA28EA78EA98EAD8EAE
-8EB38EB58EBA8EBB8EC08EC18EC38EC48EC78ECF8ED18ED48EDC8EE88EEE8EF0
-8EF18EF78EF98EFA8EED8F008F028F078F088F0F8F108F168F178F188F1E8F20
-8F218F238F258F278F288F2C8F2D8F2E8F348F358F368F378F3A8F408F410000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008F438F478F4F8F518F528F538F548F558F588F5D8F5E8F658F9D8FA08FA1
-8FA48FA58FA68FB58FB68FB88FBE8FC08FC18FC68FCA8FCB8FCD8FD08FD28FD3
-8FD58FE08FE38FE48FE88FEE8FF18FF58FF68FFB8FFE900290049008900C9018
-901B90289029902F902A902C902D903390349037903F90439044904C905B905D
-906290669067906C90709074907990859088908B908C908E9090909590979098
-9099909B90A090A190A290A590B090B290B390B490B690BD90CC90BE90C30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000090C490C590C790C890D590D790D890D990DC90DD90DF90E590D290F690EB
-90EF90F090F490FE90FF91009104910591069108910D91109114911691179118
-911A911C911E912091259122912391279129912E912F91319134913691379139
-913A913C913D914391479148914F915391579159915A915B916191649167916D
-91749179917A917B9181918391859186918A918E91919193919491959198919E
-91A191A691A891AC91AD91AE91B091B191B291B391B691BB91BC91BD91BF0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000091C291C391C591D391D491D791D991DA91DE91E491E591E991EA91EC91ED
-91EE91EF91F091F191F791F991FB91FD9200920192049205920692079209920A
-920C92109212921392169218921C921D92239224922592269228922E922F9230
-92339235923692389239923A923C923E92409242924392469247924A924D924E
-924F925192589259925C925D926092619265926792689269926E926F92709275
-9276927792789279927B927C927D927F92889289928A928D928E929292970000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009299929F92A092A492A592A792A892AB92AF92B292B692B892BA92BB92BC
-92BD92BF92C092C192C292C392C592C692C792C892CB92CC92CD92CE92D092D3
-92D592D792D892D992DC92DD92DF92E092E192E392E592E792E892EC92EE92F0
-92F992FB92FF930093029308930D931193149315931C931D931E931F93219324
-932593279329932A933393349336933793479348934993509351935293559357
-9358935A935E9364936593679369936A936D936F937093719373937493760000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000937A937D937F9380938193829388938A938B938D938F939293959398939B
-939E93A193A393A493A693A893AB93B493B593B693BA93A993C193C493C593C6
-93C793C993CA93CB93CC93CD93D393D993DC93DE93DF93E293E693E793F993F7
-93F893FA93FB93FD94019402940494089409940D940E940F941594169417941F
-942E942F9431943294339434943B943F943D944394459448944A944C94559459
-945C945F946194639468946B946D946E946F9471947294849483957895790000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000957E95849588958C958D958E959D959E959F95A195A695A995AB95AC95B4
-95B695BA95BD95BF95C695C895C995CB95D095D195D295D395D995DA95DD95DE
-95DF95E095E495E6961D961E9622962496259626962C96319633963796389639
-963A963C963D9641965296549656965796589661966E9674967B967C967E967F
-9681968296839684968996919696969A969D969F96A496A596A696A996AE96AF
-96B396BA96CA96D25DB296D896DA96DD96DE96DF96E996EF96F196FA97020000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000970397059709971A971B971D97219722972397289731973397419743974A
-974E974F975597579758975A975B97639767976A976E9773977697779778977B
-977D977F978097899795979697979799979A979E979F97A297AC97AE97B197B2
-97B597B697B897B997BA97BC97BE97BF97C197C497C597C797C997CA97CC97CD
-97CE97D097D197D497D797D897D997DD97DE97E097DB97E197E497EF97F197F4
-97F797F897FA9807980A9819980D980E98149816981C981E9820982398260000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-68
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000982B982E982F98309832983398359825983E98449847984A985198529853
-985698579859985A9862986398659866986A986C98AB98AD98AE98B098B498B7
-98B898BA98BB98BF98C298C598C898CC98E198E398E598E698E798EA98F398F6
-9902990799089911991599169917991A991B991C991F992299269927992B9931
-99329933993499359939993A993B993C99409941994699479948994D994E9954
-99589959995B995C995E995F9960999B999D999F99A699B099B199B299B50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000099B999BA99BD99BF99C399C999D399D499D999DA99DC99DE99E799EA99EB
-99EC99F099F499F599F999FD99FE9A029A039A049A0B9A0C9A109A119A169A1E
-9A209A229A239A249A279A2D9A2E9A339A359A369A389A479A419A449A4A9A4B
-9A4C9A4E9A519A549A569A5D9AAA9AAC9AAE9AAF9AB29AB49AB59AB69AB99ABB
-9ABE9ABF9AC19AC39AC69AC89ACE9AD09AD29AD59AD69AD79ADB9ADC9AE09AE4
-9AE59AE79AE99AEC9AF29AF39AF59AF99AFA9AFD9AFF9B009B019B029B030000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B049B059B089B099B0B9B0C9B0D9B0E9B109B129B169B199B1B9B1C9B20
-9B269B2B9B2D9B339B349B359B379B399B3A9B3D9B489B4B9B4C9B559B569B57
-9B5B9B5E9B619B639B659B669B689B6A9B6B9B6C9B6D9B6E9B739B759B779B78
-9B799B7F9B809B849B859B869B879B899B8A9B8B9B8D9B8F9B909B949B9A9B9D
-9B9E9BA69BA79BA99BAC9BB09BB19BB29BB79BB89BBB9BBC9BBE9BBF9BC19BC7
-9BC89BCE9BD09BD79BD89BDD9BDF9BE59BE79BEA9BEB9BEF9BF39BF79BF80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009BF99BFA9BFD9BFF9C009C029C0B9C0F9C119C169C189C199C1A9C1C9C1E
-9C229C239C269C279C289C299C2A9C319C359C369C379C3D9C419C439C449C45
-9C499C4A9C4E9C4F9C509C539C549C569C589C5B9C5D9C5E9C5F9C639C699C6A
-9C5C9C6B9C689C6E9C709C729C759C779C7B9CE69CF29CF79CF99D0B9D029D11
-9D179D189D1C9D1D9D1E9D2F9D309D329D339D349D3A9D3C9D459D3D9D429D43
-9D479D4A9D539D549D5F9D639D629D659D699D6A9D6B9D709D769D779D7B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009D7C9D7E9D839D849D869D8A9D8D9D8E9D929D939D959D969D979D989DA1
-9DAA9DAC9DAE9DB19DB59DB99DBC9DBF9DC39DC79DC99DCA9DD49DD59DD69DD7
-9DDA9DDE9DDF9DE09DE59DE79DE99DEB9DEE9DF09DF39DF49DFE9E0A9E029E07
-9E0E9E109E119E129E159E169E199E1C9E1D9E7A9E7B9E7C9E809E829E839E84
-9E859E879E8E9E8F9E969E989E9B9E9E9EA49EA89EAC9EAE9EAF9EB09EB39EB4
-9EB59EC69EC89ECB9ED59EDF9EE49EE79EEC9EED9EEE9EF09EF19EF29EF50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009EF89EFF9F029F039F099F0F9F109F119F129F149F169F179F199F1A9F1B
-9F1F9F229F269F2A9F2B9F2F9F319F329F349F379F399F3A9F3C9F3D9F3F9F41
-9F439F449F459F469F479F539F559F569F579F589F5A9F5D9F5E9F689F699F6D
-9F6E9F6F9F709F719F739F759F7A9F7D9F8F9F909F919F929F949F969F979F9E
-9FA19FA29FA39FA5000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/ksc5601.enc b/library/encoding/ksc5601.enc
deleted file mode 100644
index bec61d0..0000000
--- a/library/encoding/ksc5601.enc
+++ /dev/null
@@ -1,1516 +0,0 @@
-# Encoding file: ksc5601, double-byte
-D
-233F 0 89
-21
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030003001300200B72025202600A8300300AD20152225FF3C223C20182019
-201C201D3014301530083009300A300B300C300D300E300F3010301100B100D7
-00F7226022642265221E223400B0203220332103212BFFE0FFE1FFE526422640
-222022A52312220222072261225200A7203B2606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC219221902191219321943013226A226B221A223D
-221D2235222B222C2208220B2286228722822283222A222922272228FFE20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-22
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000021D221D42200220300B4FF5E02C702D802DD02DA02D900B802DB00A100BF
-02D0222E2211220F00A42109203025C125C025B725B626642660266126652667
-2663229925C825A325D025D1259225A425A525A825A725A625A92668260F260E
-261C261E00B62020202121952197219921962198266D2669266A266C327F321C
-211633C7212233C233D821210000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-23
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF01FF02FF03FF04FF05FF06FF07FF08FF09FF0AFF0BFF0CFF0DFF0EFF0F
-FF10FF11FF12FF13FF14FF15FF16FF17FF18FF19FF1AFF1BFF1CFF1DFF1EFF1F
-FF20FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2F
-FF30FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3AFF3BFFE6FF3DFF3EFF3F
-FF40FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5AFF5BFF5CFF5DFFE30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-24
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000313131323133313431353136313731383139313A313B313C313D313E313F
-3140314131423143314431453146314731483149314A314B314C314D314E314F
-3150315131523153315431553156315731583159315A315B315C315D315E315F
-3160316131623163316431653166316731683169316A316B316C316D316E316F
-3170317131723173317431753176317731783179317A317B317C317D317E317F
-3180318131823183318431853186318731883189318A318B318C318D318E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-25
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000217021712172217321742175217621772178217900000000000000000000
-2160216121622163216421652166216721682169000000000000000000000000
-0000039103920393039403950396039703980399039A039B039C039D039E039F
-03A003A103A303A403A503A603A703A803A90000000000000000000000000000
-000003B103B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF
-03C003C103C303C403C503C603C703C803C90000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-26
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000025002502250C251025182514251C252C25242534253C25012503250F2513
-251B251725232533252B253B254B2520252F25282537253F251D253025252538
-254225122511251A251925162515250E250D251E251F25212522252625272529
-252A252D252E25312532253525362539253A253D253E25402541254325442545
-2546254725482549254A00000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-27
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00003395339633972113339833C433A333A433A533A63399339A339B339C339D
-339E339F33A033A133A233CA338D338E338F33CF3388338933C833A733A833B0
-33B133B233B333B433B533B633B733B833B93380338133823383338433BA33BB
-33BC33BD33BE33BF33903391339233933394212633C033C1338A338B338C33D6
-33C533AD33AE33AF33DB33A933AA33AB33AC33DD33D033D333C333C933DC33C6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-28
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000C600D000AA0126000001320000013F014100D8015200BA00DE0166014A
-00003260326132623263326432653266326732683269326A326B326C326D326E
-326F3270327132723273327432753276327732783279327A327B24D024D124D2
-24D324D424D524D624D724D824D924DA24DB24DC24DD24DE24DF24E024E124E2
-24E324E424E524E624E724E824E9246024612462246324642465246624672468
-2469246A246B246C246D246E00BD2153215400BC00BE215B215C215D215E0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-29
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000E6011100F001270131013301380140014200F8015300DF00FE0167014B
-01493200320132023203320432053206320732083209320A320B320C320D320E
-320F3210321132123213321432153216321732183219321A321B249C249D249E
-249F24A024A124A224A324A424A524A624A724A824A924AA24AB24AC24AD24AE
-24AF24B024B124B224B324B424B5247424752476247724782479247A247B247C
-247D247E247F24802481248200B900B200B32074207F20812082208320840000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000304130423043304430453046304730483049304A304B304C304D304E304F
-3050305130523053305430553056305730583059305A305B305C305D305E305F
-3060306130623063306430653066306730683069306A306B306C306D306E306F
-3070307130723073307430753076307730783079307A307B307C307D307E307F
-3080308130823083308430853086308730883089308A308B308C308D308E308F
-3090309130923093000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000030A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF
-30B030B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF
-30C030C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF
-30D030D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000004100411041204130414041504010416041704180419041A041B041C041D
-041E041F0420042104220423042404250426042704280429042A042B042C042D
-042E042F00000000000000000000000000000000000000000000000000000000
-000004300431043204330434043504510436043704380439043A043B043C043D
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AC00AC01AC04AC07AC08AC09AC0AAC10AC11AC12AC13AC14AC15AC16AC17
-AC19AC1AAC1BAC1CAC1DAC20AC24AC2CAC2DAC2FAC30AC31AC38AC39AC3CAC40
-AC4BAC4DAC54AC58AC5CAC70AC71AC74AC77AC78AC7AAC80AC81AC83AC84AC85
-AC86AC89AC8AAC8BAC8CAC90AC94AC9CAC9DAC9FACA0ACA1ACA8ACA9ACAAACAC
-ACAFACB0ACB8ACB9ACBBACBCACBDACC1ACC4ACC8ACCCACD5ACD7ACE0ACE1ACE4
-ACE7ACE8ACEAACECACEFACF0ACF1ACF3ACF5ACF6ACFCACFDAD00AD04AD060000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-31
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AD0CAD0DAD0FAD11AD18AD1CAD20AD29AD2CAD2DAD34AD35AD38AD3CAD44
-AD45AD47AD49AD50AD54AD58AD61AD63AD6CAD6DAD70AD73AD74AD75AD76AD7B
-AD7CAD7DAD7FAD81AD82AD88AD89AD8CAD90AD9CAD9DADA4ADB7ADC0ADC1ADC4
-ADC8ADD0ADD1ADD3ADDCADE0ADE4ADF8ADF9ADFCADFFAE00AE01AE08AE09AE0B
-AE0DAE14AE30AE31AE34AE37AE38AE3AAE40AE41AE43AE45AE46AE4AAE4CAE4D
-AE4EAE50AE54AE56AE5CAE5DAE5FAE60AE61AE65AE68AE69AE6CAE70AE780000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-32
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000AE79AE7BAE7CAE7DAE84AE85AE8CAEBCAEBDAEBEAEC0AEC4AECCAECDAECF
-AED0AED1AED8AED9AEDCAEE8AEEBAEEDAEF4AEF8AEFCAF07AF08AF0DAF10AF2C
-AF2DAF30AF32AF34AF3CAF3DAF3FAF41AF42AF43AF48AF49AF50AF5CAF5DAF64
-AF65AF79AF80AF84AF88AF90AF91AF95AF9CAFB8AFB9AFBCAFC0AFC7AFC8AFC9
-AFCBAFCDAFCEAFD4AFDCAFE8AFE9AFF0AFF1AFF4AFF8B000B001B004B00CB010
-B014B01CB01DB028B044B045B048B04AB04CB04EB053B054B055B057B0590000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-33
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B05DB07CB07DB080B084B08CB08DB08FB091B098B099B09AB09CB09FB0A0
-B0A1B0A2B0A8B0A9B0ABB0ACB0ADB0AEB0AFB0B1B0B3B0B4B0B5B0B8B0BCB0C4
-B0C5B0C7B0C8B0C9B0D0B0D1B0D4B0D8B0E0B0E5B108B109B10BB10CB110B112
-B113B118B119B11BB11CB11DB123B124B125B128B12CB134B135B137B138B139
-B140B141B144B148B150B151B154B155B158B15CB160B178B179B17CB180B182
-B188B189B18BB18DB192B193B194B198B19CB1A8B1CCB1D0B1D4B1DCB1DD0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-34
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B1DFB1E8B1E9B1ECB1F0B1F9B1FBB1FDB204B205B208B20BB20CB214B215
-B217B219B220B234B23CB258B25CB260B268B269B274B275B27CB284B285B289
-B290B291B294B298B299B29AB2A0B2A1B2A3B2A5B2A6B2AAB2ACB2B0B2B4B2C8
-B2C9B2CCB2D0B2D2B2D8B2D9B2DBB2DDB2E2B2E4B2E5B2E6B2E8B2EBB2ECB2ED
-B2EEB2EFB2F3B2F4B2F5B2F7B2F8B2F9B2FAB2FBB2FFB300B301B304B308B310
-B311B313B314B315B31CB354B355B356B358B35BB35CB35EB35FB364B3650000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-35
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B367B369B36BB36EB370B371B374B378B380B381B383B384B385B38CB390
-B394B3A0B3A1B3A8B3ACB3C4B3C5B3C8B3CBB3CCB3CEB3D0B3D4B3D5B3D7B3D9
-B3DBB3DDB3E0B3E4B3E8B3FCB410B418B41CB420B428B429B42BB434B450B451
-B454B458B460B461B463B465B46CB480B488B49DB4A4B4A8B4ACB4B5B4B7B4B9
-B4C0B4C4B4C8B4D0B4D5B4DCB4DDB4E0B4E3B4E4B4E6B4ECB4EDB4EFB4F1B4F8
-B514B515B518B51BB51CB524B525B527B528B529B52AB530B531B534B5380000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-36
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B540B541B543B544B545B54BB54CB54DB550B554B55CB55DB55FB560B561
-B5A0B5A1B5A4B5A8B5AAB5ABB5B0B5B1B5B3B5B4B5B5B5BBB5BCB5BDB5C0B5C4
-B5CCB5CDB5CFB5D0B5D1B5D8B5ECB610B611B614B618B625B62CB634B648B664
-B668B69CB69DB6A0B6A4B6ABB6ACB6B1B6D4B6F0B6F4B6F8B700B701B705B728
-B729B72CB72FB730B738B739B73BB744B748B74CB754B755B760B764B768B770
-B771B773B775B77CB77DB780B784B78CB78DB78FB790B791B792B796B7970000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-37
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B798B799B79CB7A0B7A8B7A9B7ABB7ACB7ADB7B4B7B5B7B8B7C7B7C9B7EC
-B7EDB7F0B7F4B7FCB7FDB7FFB800B801B807B808B809B80CB810B818B819B81B
-B81DB824B825B828B82CB834B835B837B838B839B840B844B851B853B85CB85D
-B860B864B86CB86DB86FB871B878B87CB88DB8A8B8B0B8B4B8B8B8C0B8C1B8C3
-B8C5B8CCB8D0B8D4B8DDB8DFB8E1B8E8B8E9B8ECB8F0B8F8B8F9B8FBB8FDB904
-B918B920B93CB93DB940B944B94CB94FB951B958B959B95CB960B968B9690000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-38
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000B96BB96DB974B975B978B97CB984B985B987B989B98AB98DB98EB9ACB9AD
-B9B0B9B4B9BCB9BDB9BFB9C1B9C8B9C9B9CCB9CEB9CFB9D0B9D1B9D2B9D8B9D9
-B9DBB9DDB9DEB9E1B9E3B9E4B9E5B9E8B9ECB9F4B9F5B9F7B9F8B9F9B9FABA00
-BA01BA08BA15BA38BA39BA3CBA40BA42BA48BA49BA4BBA4DBA4EBA53BA54BA55
-BA58BA5CBA64BA65BA67BA68BA69BA70BA71BA74BA78BA83BA84BA85BA87BA8C
-BAA8BAA9BAABBAACBAB0BAB2BAB8BAB9BABBBABDBAC4BAC8BAD8BAD9BAFC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-39
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BB00BB04BB0DBB0FBB11BB18BB1CBB20BB29BB2BBB34BB35BB36BB38BB3B
-BB3CBB3DBB3EBB44BB45BB47BB49BB4DBB4FBB50BB54BB58BB61BB63BB6CBB88
-BB8CBB90BBA4BBA8BBACBBB4BBB7BBC0BBC4BBC8BBD0BBD3BBF8BBF9BBFCBBFF
-BC00BC02BC08BC09BC0BBC0CBC0DBC0FBC11BC14BC15BC16BC17BC18BC1BBC1C
-BC1DBC1EBC1FBC24BC25BC27BC29BC2DBC30BC31BC34BC38BC40BC41BC43BC44
-BC45BC49BC4CBC4DBC50BC5DBC84BC85BC88BC8BBC8CBC8EBC94BC95BC970000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BC99BC9ABCA0BCA1BCA4BCA7BCA8BCB0BCB1BCB3BCB4BCB5BCBCBCBDBCC0
-BCC4BCCDBCCFBCD0BCD1BCD5BCD8BCDCBCF4BCF5BCF6BCF8BCFCBD04BD05BD07
-BD09BD10BD14BD24BD2CBD40BD48BD49BD4CBD50BD58BD59BD64BD68BD80BD81
-BD84BD87BD88BD89BD8ABD90BD91BD93BD95BD99BD9ABD9CBDA4BDB0BDB8BDD4
-BDD5BDD8BDDCBDE9BDF0BDF4BDF8BE00BE03BE05BE0CBE0DBE10BE14BE1CBE1D
-BE1FBE44BE45BE48BE4CBE4EBE54BE55BE57BE59BE5ABE5BBE60BE61BE640000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000BE68BE6ABE70BE71BE73BE74BE75BE7BBE7CBE7DBE80BE84BE8CBE8DBE8F
-BE90BE91BE98BE99BEA8BED0BED1BED4BED7BED8BEE0BEE3BEE4BEE5BEECBF01
-BF08BF09BF18BF19BF1BBF1CBF1DBF40BF41BF44BF48BF50BF51BF55BF94BFB0
-BFC5BFCCBFCDBFD0BFD4BFDCBFDFBFE1C03CC051C058C05CC060C068C069C090
-C091C094C098C0A0C0A1C0A3C0A5C0ACC0ADC0AFC0B0C0B3C0B4C0B5C0B6C0BC
-C0BDC0BFC0C0C0C1C0C5C0C8C0C9C0CCC0D0C0D8C0D9C0DBC0DCC0DDC0E40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C0E5C0E8C0ECC0F4C0F5C0F7C0F9C100C104C108C110C115C11CC11DC11E
-C11FC120C123C124C126C127C12CC12DC12FC130C131C136C138C139C13CC140
-C148C149C14BC14CC14DC154C155C158C15CC164C165C167C168C169C170C174
-C178C185C18CC18DC18EC190C194C196C19CC19DC19FC1A1C1A5C1A8C1A9C1AC
-C1B0C1BDC1C4C1C8C1CCC1D4C1D7C1D8C1E0C1E4C1E8C1F0C1F1C1F3C1FCC1FD
-C200C204C20CC20DC20FC211C218C219C21CC21FC220C228C229C22BC22D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C22FC231C232C234C248C250C251C254C258C260C265C26CC26DC270C274
-C27CC27DC27FC281C288C289C290C298C29BC29DC2A4C2A5C2A8C2ACC2ADC2B4
-C2B5C2B7C2B9C2DCC2DDC2E0C2E3C2E4C2EBC2ECC2EDC2EFC2F1C2F6C2F8C2F9
-C2FBC2FCC300C308C309C30CC30DC313C314C315C318C31CC324C325C328C329
-C345C368C369C36CC370C372C378C379C37CC37DC384C388C38CC3C0C3D8C3D9
-C3DCC3DFC3E0C3E2C3E8C3E9C3EDC3F4C3F5C3F8C408C410C424C42CC4300000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C434C43CC43DC448C464C465C468C46CC474C475C479C480C494C49CC4B8
-C4BCC4E9C4F0C4F1C4F4C4F8C4FAC4FFC500C501C50CC510C514C51CC528C529
-C52CC530C538C539C53BC53DC544C545C548C549C54AC54CC54DC54EC553C554
-C555C557C558C559C55DC55EC560C561C564C568C570C571C573C574C575C57C
-C57DC580C584C587C58CC58DC58FC591C595C597C598C59CC5A0C5A9C5B4C5B5
-C5B8C5B9C5BBC5BCC5BDC5BEC5C4C5C5C5C6C5C7C5C8C5C9C5CAC5CCC5CE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C5D0C5D1C5D4C5D8C5E0C5E1C5E3C5E5C5ECC5EDC5EEC5F0C5F4C5F6C5F7
-C5FCC5FDC5FEC5FFC600C601C605C606C607C608C60CC610C618C619C61BC61C
-C624C625C628C62CC62DC62EC630C633C634C635C637C639C63BC640C641C644
-C648C650C651C653C654C655C65CC65DC660C66CC66FC671C678C679C67CC680
-C688C689C68BC68DC694C695C698C69CC6A4C6A5C6A7C6A9C6B0C6B1C6B4C6B8
-C6B9C6BAC6C0C6C1C6C3C6C5C6CCC6CDC6D0C6D4C6DCC6DDC6E0C6E1C6E80000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-40
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C6E9C6ECC6F0C6F8C6F9C6FDC704C705C708C70CC714C715C717C719C720
-C721C724C728C730C731C733C735C737C73CC73DC740C744C74AC74CC74DC74F
-C751C752C753C754C755C756C757C758C75CC760C768C76BC774C775C778C77C
-C77DC77EC783C784C785C787C788C789C78AC78EC790C791C794C796C797C798
-C79AC7A0C7A1C7A3C7A4C7A5C7A6C7ACC7ADC7B0C7B4C7BCC7BDC7BFC7C0C7C1
-C7C8C7C9C7CCC7CEC7D0C7D8C7DDC7E4C7E8C7ECC800C801C804C808C80A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-41
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C810C811C813C815C816C81CC81DC820C824C82CC82DC82FC831C838C83C
-C840C848C849C84CC84DC854C870C871C874C878C87AC880C881C883C885C886
-C887C88BC88CC88DC894C89DC89FC8A1C8A8C8BCC8BDC8C4C8C8C8CCC8D4C8D5
-C8D7C8D9C8E0C8E1C8E4C8F5C8FCC8FDC900C904C905C906C90CC90DC90FC911
-C918C92CC934C950C951C954C958C960C961C963C96CC970C974C97CC988C989
-C98CC990C998C999C99BC99DC9C0C9C1C9C4C9C7C9C8C9CAC9D0C9D1C9D30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-42
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000C9D5C9D6C9D9C9DAC9DCC9DDC9E0C9E2C9E4C9E7C9ECC9EDC9EFC9F0C9F1
-C9F8C9F9C9FCCA00CA08CA09CA0BCA0CCA0DCA14CA18CA29CA4CCA4DCA50CA54
-CA5CCA5DCA5FCA60CA61CA68CA7DCA84CA98CABCCABDCAC0CAC4CACCCACDCACF
-CAD1CAD3CAD8CAD9CAE0CAECCAF4CB08CB10CB14CB18CB20CB21CB41CB48CB49
-CB4CCB50CB58CB59CB5DCB64CB78CB79CB9CCBB8CBD4CBE4CBE7CBE9CC0CCC0D
-CC10CC14CC1CCC1DCC21CC22CC27CC28CC29CC2CCC2ECC30CC38CC39CC3B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-43
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CC3CCC3DCC3ECC44CC45CC48CC4CCC54CC55CC57CC58CC59CC60CC64CC66
-CC68CC70CC75CC98CC99CC9CCCA0CCA8CCA9CCABCCACCCADCCB4CCB5CCB8CCBC
-CCC4CCC5CCC7CCC9CCD0CCD4CCE4CCECCCF0CD01CD08CD09CD0CCD10CD18CD19
-CD1BCD1DCD24CD28CD2CCD39CD5CCD60CD64CD6CCD6DCD6FCD71CD78CD88CD94
-CD95CD98CD9CCDA4CDA5CDA7CDA9CDB0CDC4CDCCCDD0CDE8CDECCDF0CDF8CDF9
-CDFBCDFDCE04CE08CE0CCE14CE19CE20CE21CE24CE28CE30CE31CE33CE350000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-44
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000CE58CE59CE5CCE5FCE60CE61CE68CE69CE6BCE6DCE74CE75CE78CE7CCE84
-CE85CE87CE89CE90CE91CE94CE98CEA0CEA1CEA3CEA4CEA5CEACCEADCEC1CEE4
-CEE5CEE8CEEBCEECCEF4CEF5CEF7CEF8CEF9CF00CF01CF04CF08CF10CF11CF13
-CF15CF1CCF20CF24CF2CCF2DCF2FCF30CF31CF38CF54CF55CF58CF5CCF64CF65
-CF67CF69CF70CF71CF74CF78CF80CF85CF8CCFA1CFA8CFB0CFC4CFE0CFE1CFE4
-CFE8CFF0CFF1CFF3CFF5CFFCD000D004D011D018D02DD034D035D038D03C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-45
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D044D045D047D049D050D054D058D060D06CD06DD070D074D07CD07DD081
-D0A4D0A5D0A8D0ACD0B4D0B5D0B7D0B9D0C0D0C1D0C4D0C8D0C9D0D0D0D1D0D3
-D0D4D0D5D0DCD0DDD0E0D0E4D0ECD0EDD0EFD0F0D0F1D0F8D10DD130D131D134
-D138D13AD140D141D143D144D145D14CD14DD150D154D15CD15DD15FD161D168
-D16CD17CD184D188D1A0D1A1D1A4D1A8D1B0D1B1D1B3D1B5D1BAD1BCD1C0D1D8
-D1F4D1F8D207D209D210D22CD22DD230D234D23CD23DD23FD241D248D25C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-46
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D264D280D281D284D288D290D291D295D29CD2A0D2A4D2ACD2B1D2B8D2B9
-D2BCD2BFD2C0D2C2D2C8D2C9D2CBD2D4D2D8D2DCD2E4D2E5D2F0D2F1D2F4D2F8
-D300D301D303D305D30CD30DD30ED310D314D316D31CD31DD31FD320D321D325
-D328D329D32CD330D338D339D33BD33CD33DD344D345D37CD37DD380D384D38C
-D38DD38FD390D391D398D399D39CD3A0D3A8D3A9D3ABD3ADD3B4D3B8D3BCD3C4
-D3C5D3C8D3C9D3D0D3D8D3E1D3E3D3ECD3EDD3F0D3F4D3FCD3FDD3FFD4010000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-47
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D408D41DD440D444D45CD460D464D46DD46FD478D479D47CD47FD480D482
-D488D489D48BD48DD494D4A9D4CCD4D0D4D4D4DCD4DFD4E8D4ECD4F0D4F8D4FB
-D4FDD504D508D50CD514D515D517D53CD53DD540D544D54CD54DD54FD551D558
-D559D55CD560D565D568D569D56BD56DD574D575D578D57CD584D585D587D588
-D589D590D5A5D5C8D5C9D5CCD5D0D5D2D5D8D5D9D5DBD5DDD5E4D5E5D5E8D5EC
-D5F4D5F5D5F7D5F9D600D601D604D608D610D611D613D614D615D61CD6200000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-48
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000D624D62DD638D639D63CD640D645D648D649D64BD64DD651D654D655D658
-D65CD667D669D670D671D674D683D685D68CD68DD690D694D69DD69FD6A1D6A8
-D6ACD6B0D6B9D6BBD6C4D6C5D6C8D6CCD6D1D6D4D6D7D6D9D6E0D6E4D6E8D6F0
-D6F5D6FCD6FDD700D704D711D718D719D71CD720D728D729D72BD72DD734D735
-D738D73CD744D747D749D750D751D754D756D757D758D759D760D761D763D765
-D769D76CD770D774D77CD77DD781D788D789D78CD790D798D799D79BD79D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004F3D4F73504750F952A053EF547554E556095AC15BB6668767B667B767EF
-6B4C73C275C27A3C82DB8304885788888A368CC88DCF8EFB8FE699D5523B5374
-5404606A61646BBC73CF811A89BA89D295A34F83520A58BE597859E65E725E79
-61C763C0674667EC687F6F97764E770B78F57A087AFF7C21809D826E82718AEB
-95934E6B559D66F76E3478A37AED845B8910874E97A852D8574E582A5D4C611F
-61BE6221656267D16A446E1B751875B376E377B07D3A90AF945194529F950000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000053235CAC753280DB92409598525B580859DC5CA15D175EB75F3A5F4A6177
-6C5F757A75867CE07D737DB17F8C81548221859189418B1B92FC964D9C474ECB
-4EF7500B51F1584F6137613E6168653969EA6F1175A5768676D67B8782A584CB
-F90093A7958B55805BA25751F9017CB37FB991B5502853BB5C455DE862D2636E
-64DA64E76E2070AC795B8DDD8E1EF902907D924592F84E7E4EF650655DFE5EFA
-61066957817186548E4793759A2B4E5E5091677068405109528D52926AA20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000077BC92109ED452AB602F8FF2504861A963ED64CA683C6A846FC0818889A1
-96945805727D72AC75047D797E6D80A9898B8B7490639D5162896C7A6F547D50
-7F3A8A23517C614A7B9D8B199257938C4EAC4FD3501E50BE510652C152CD537F
-577058835E9A5F91617661AC64CE656C666F66BB66F468976D87708570F1749F
-74A574CA75D9786C78EC7ADF7AF67D457D938015803F811B83968B668F159015
-93E1980398389A5A9BE84FC25553583A59515B635C4660B86212684268B00000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068E86EAA754C767878CE7A3D7CFB7E6B7E7C8A088AA18C3F968E9DC453E4
-53E9544A547156FA59D15B645C3B5EAB62F765376545657266A067AF69C16CBD
-75FC7690777E7A3F7F94800380A1818F82E682FD83F085C1883188B48AA5F903
-8F9C932E96C798679AD89F1354ED659B66F2688F7A408C379D6056F057645D11
-660668B168CD6EFE7428889E9BE46C68F9049AA84F9B516C5171529F5B545DE5
-6050606D62F163A7653B73D97A7A86A38CA2978F4E325BE16208679C74DC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000079D183D38A878AB28DE8904E934B98465ED369E885FF90EDF90551A05B98
-5BEC616368FA6B3E704C742F74D87BA17F5083C589C08CAB95DC9928522E605D
-62EC90024F8A5149532158D95EE366E06D38709A72C273D67B5080F1945B5366
-639B7F6B4E565080584A58DE602A612762D069D09B415B8F7D1880B18F5F4EA4
-50D154AC55AC5B0C5DA05DE7652A654E68216A4B72E1768E77EF7D5E7FF981A0
-854E86DF8F038F4E90CA99039A559BAB4E184E454E5D4EC74FF1517752FE0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-4F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000534053E353E5548E5614577557A25BC75D875ED061FC62D8655167B867E9
-69CB6B506BC66BEC6C426E9D707872D77396740377BF77E97A767D7F800981FC
-8205820A82DF88628B338CFC8EC0901190B1926492B699D29A459CE99DD79F9C
-570B5C4083CA97A097AB9EB4541B7A987FA488D98ECD90E158005C4863987A9F
-5BAE5F137A797AAE828E8EAC5026523852F85377570862F363726B0A6DC37737
-53A5735785688E7695D5673A6AC36F708A6D8ECC994BF90666776B788CB40000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00009B3CF90753EB572D594E63C669FB73EA78457ABA7AC57CFE8475898F8D73
-903595A852FB574775477B6083CC921EF9086A58514B524B5287621F68D86975
-969950C552A452E461C365A4683969FF747E7B4B82B983EB89B28B398FD19949
-F9094ECA599764D266116A8E7434798179BD82A9887E887F895FF90A93264F0B
-53CA602562716C727D1A7D664E98516277DC80AF4F014F0E5176518055DC5668
-573B57FA57FC5914594759935BC45C905D0E5DF15E7E5FCC628065D765E30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-51
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000671E671F675E68CB68C46A5F6B3A6C236C7D6C826DC773987426742A7482
-74A37578757F788178EF794179477948797A7B957D007DBA7F888006802D808C
-8A188B4F8C488D779321932498E299519A0E9A0F9A659E927DCA4F76540962EE
-685491D155AB513AF90BF90C5A1C61E6F90D62CF62FFF90EF90FF910F911F912
-F91390A3F914F915F916F917F9188AFEF919F91AF91BF91C6696F91D7156F91E
-F91F96E3F920634F637A5357F921678F69606E73F9227537F923F924F9250000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-52
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007D0DF926F927887256CA5A18F928F929F92AF92BF92C4E43F92D51675948
-67F08010F92E59735E74649A79CA5FF5606C62C8637B5BE75BD752AAF92F5974
-5F296012F930F931F9327459F933F934F935F936F937F93899D1F939F93AF93B
-F93CF93DF93EF93FF940F941F942F9436FC3F944F94581BF8FB260F1F946F947
-8166F948F9495C3FF94AF94BF94CF94DF94EF94FF950F9515AE98A25677B7D10
-F952F953F954F955F956F95780FDF958F9595C3C6CE5533F6EBA591A83360000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00004E394EB64F4655AE571858C75F5665B765E66A806BB56E4D77ED7AEF7C1E
-7DDE86CB88929132935B64BB6FBE737A75B890545556574D61BA64D466C76DE1
-6E5B6F6D6FB975F0804381BD854189838AC78B5A931F6C9375537B548E0F905D
-5510580258585E626207649E68E075767CD687B39EE84EE35788576E59275C0D
-5CB15E365F85623464E173B381FA888B8CB8968A9EDB5B855FB760B350125200
-52305716583558575C0E5C605CF65D8B5EA65F9260BC63116389641768430000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000068F96AC26DD86E216ED46FE471FE76DC777979B17A3B840489A98CED8DF3
-8E4890039014905390FD934D967697DC6BD27006725872A27368776379BF7BE4
-7E9B8B8058A960C7656665FD66BE6C8C711E71C98C5A98134E6D7A814EDD51AC
-51CD52D5540C61A76771685068DF6D1E6F7C75BC77B37AE580F484639285515C
-6597675C679375D87AC78373F95A8C469017982D5C6F81C0829A9041906F920D
-5F975D9D6A5971C8767B7B4985E48B0491279A30558761F6F95B76697F850000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-55
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000863F87BA88F8908FF95C6D1B70D973DE7D61843DF95D916A99F1F95E4E82
-53756B046B12703E721B862D9E1E524C8FA35D5064E5652C6B166FEB7C437E9C
-85CD896489BD62C981D8881F5ECA67176D6A72FC7405746F878290DE4F865D0D
-5FA0840A51B763A075654EAE5006516951C968816A117CAE7CB17CE7826F8AD2
-8F1B91CF4FB6513752F554425EEC616E623E65C56ADA6FFE792A85DC882395AD
-9A629A6A9E979ECE529B66C66B77701D792B8F6297426190620065236F230000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-56
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714974897DF4806F84EE8F269023934A51BD521752A36D0C70C888C25EC9
-65826BAE6FC27C3E73754EE44F3656F9F95F5CBA5DBA601C73B27B2D7F9A7FCE
-8046901E923496F6974898189F614F8B6FA779AE91B496B752DEF960648864C4
-6AD36F5E7018721076E780018606865C8DEF8F0597329B6F9DFA9E75788C797F
-7DA083C993049E7F9E938AD658DF5F046727702774CF7C60807E512170287262
-78CA8CC28CDA8CF496F74E8650DA5BEE5ED6659971CE764277AD804A84FC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-57
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000907C9B279F8D58D85A415C626A136DDA6F0F763B7D2F7E37851E893893E4
-964B528965D267F369B46D416E9C700F7409746075597624786B8B2C985E516D
-622E96784F96502B5D196DEA7DB88F2A5F8B61446817F961968652D2808B51DC
-51CC695E7A1C7DBE83F196754FDA52295398540F550E5C6560A7674E68A86D6C
-728172F874067483F96275E27C6C7F797FB8838988CF88E191CC91D096E29BC9
-541D6F7E71D0749885FA8EAA96A39C579E9F67976DCB743381E89716782C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-58
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007ACB7B207C926469746A75F278BC78E899AC9B549EBB5BDE5E556F20819C
-83AB90884E07534D5A295DD25F4E6162633D666966FC6EFF6F2B7063779E842C
-8513883B8F1399459C3B551C62B9672B6CAB8309896A977A4EA159845FD85FD9
-671B7DB27F548292832B83BD8F1E909957CB59B95A925BD06627679A68856BCF
-71647F758CB78CE390819B4581088C8A964C9A409EA55B5F6C13731B76F276DF
-840C51AA8993514D519552C968C96C94770477207DBF7DEC97629EB56EC50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000851151A5540D547D660E669D69276E9F76BF7791831784C2879F91699298
-9CF488824FAE519252DF59C65E3D61556478647966AE67D06A216BCD6BDB725F
-72617441773877DB801782BC83058B008B288C8C67286C90726776EE77667A46
-9DA96B7F6C92592267268499536F589359995EDF63CF663467736E3A732B7AD7
-82D7932852D95DEB61AE61CB620A62C764AB65E069596B666BCB712173F7755D
-7E46821E8302856A8AA38CBF97279D6158A89ED85011520E543B554F65870000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006C767D0A7D0B805E868A958096EF52FF6C95726954735A9A5C3E5D4B5F4C
-5FAE672A68B669636E3C6E4477097C737F8E85878B0E8FF797619EF45CB760B6
-610D61AB654F65FB65FC6C116CEF739F73C97DE195945BC6871C8B10525D535A
-62CD640F64B267346A386CCA73C0749E7B947C957E1B818A823685848FEB96F9
-99C14F34534A53CD53DB62CC642C6500659169C36CEE6F5873ED7554762276E4
-76FC78D078FB792C7D46822C87E08FD4981298EF52C362D464A56E246F510000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000767C8DCB91B192629AEE9B435023508D574A59A85C285E475F77623F653E
-65B965C16609678B699C6EC278C57D2180AA8180822B82B384A1868C8A2A8B17
-90A696329F90500D4FF3F96357F95F9862DC6392676F6E43711976C380CC80DA
-88F488F589198CE08F29914D966A4F2F4F705E1B67CF6822767D767E9B445E61
-6A0A716971D4756AF9647E41854385E998DC4F107B4F7F7095A551E15E0668B5
-6C3E6C4E6CDB72AF7BC483036CD5743A50FB528858C164D86A9774A776560000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000078A7861795E29739F965535E5F018B8A8FA88FAF908A522577A59C499F08
-4E19500251755C5B5E77661E663A67C468C570B3750175C579C97ADD8F279920
-9A084FDD582158315BF6666E6B656D116E7A6F7D73E4752B83E988DC89138B5C
-8F144F0F50D55310535C5B935FA9670D798F8179832F8514890789868F398F3B
-99A59C12672C4E764FF859495C015CEF5CF0636768D270FD71A2742B7E2B84EC
-8702902292D29CF34E0D4ED84FEF50855256526F5426549057E0592B5A660000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005B5A5B755BCC5E9CF9666276657765A76D6E6EA572367B267C3F7F368150
-8151819A8240829983A98A038CA08CE68CFB8D748DBA90E891DC961C964499D9
-9CE7531752065429567458B35954596E5FFF61A4626E66106C7E711A76C67C89
-7CDE7D1B82AC8CC196F0F9674F5B5F175F7F62C25D29670B68DA787C7E439D6C
-4E1550995315532A535159835A625E8760B2618A624962796590678769A76BD4
-6BD66BD76BD86CB8F968743575FA7812789179D579D87C837DCB7FE180A50000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000813E81C283F2871A88E88AB98B6C8CBB9119975E98DB9F3B56AC5B2A5F6C
-658C6AB36BAF6D5C6FF17015725D73AD8CA78CD3983B61916C3780589A014E4D
-4E8B4E9B4ED54F3A4F3C4F7F4FDF50FF53F253F8550655E356DB58EB59625A11
-5BEB5BFA5C045DF35E2B5F99601D6368659C65AF67F667FB68AD6B7B6C996CD7
-6E23700973457802793E7940796079C17BE97D177D728086820D838E84D186C7
-88DF8A508A5E8B1D8CDC8D668FAD90AA98FC99DF9E9D524AF9696714F96A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005098522A5C7165636C5573CA7523759D7B97849C917897304E7764926BBA
-715E85A94E09F96B674968EE6E17829F8518886B63F76F81921298AF4E0A50B7
-50CF511F554655AA56175B405C195CE05E385E8A5EA05EC260F368516A616E58
-723D724072C076F879657BB17FD488F389F48A738C618CDE971C585E74BD8CFD
-55C7F96C7A617D2282727272751F7525F96D7B19588558FB5DBC5E8F5EB65F90
-60556292637F654D669166D966F8681668F27280745E7B6E7D6E7DD67F720000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-60
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000080E5821285AF897F8A93901D92E49ECD9F205915596D5E2D60DC66146673
-67906C506DC56F5F77F378A984C691CB932B4ED950CA514855845B0B5BA36247
-657E65CB6E32717D74017444748774BF766C79AA7DDA7E557FA8817A81B38239
-861A87EC8A758DE3907892919425994D9BAE53685C5169546CC46D296E2B820C
-859B893B8A2D8AAA96EA9F67526166B96BB27E9687FE8D0D9583965D651D6D89
-71EEF96E57CE59D35BAC602760FA6210661F665F732973F976DB77017B6C0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-61
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008056807281658AA091924E1652E26B726D177A057B397D30F96F8CB053EC
-562F58515BB55C0F5C115DE2624063836414662D68B36CBC6D886EAF701F70A4
-71D27526758F758E76197B117BE07C2B7D207D39852C856D86078A34900D9061
-90B592B797F69A374FD75C6C675F6D917C9F7E8C8B168D16901F5B6B5DFD640D
-84C0905C98E173875B8B609A677E6DDE8A1F8AA69001980C5237F9707051788E
-9396887091D74FEE53D755FD56DA578258FD5AC25B885CAB5CC05E2561010000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000620D624B6388641C653665786A396B8A6C346D196F3171E772E973787407
-74B27626776179C07A577AEA7CB97D8F7DAC7E617F9E81298331849084DA85EA
-88968AB08B908F3890429083916C929692B9968B96A796A896D6970098089996
-9AD39B1A53D4587E59195B705BBF6DD16F5A719F742174B9808583FD5DE15F87
-5FAA604265EC6812696F6A536B896D356DF373E376FE77AC7B4D7D148123821C
-834084F485638A628AC49187931E980699B4620C88538FF092655D075D270000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005D69745F819D87686FD562FE7FD2893689724E1E4E5850E752DD5347627F
-66077E698805965E4F8D5319563659CB5AA45C385C4E5C4D5E025F11604365BD
-662F664267BE67F4731C77E2793A7FC5849484CD89968A668A698AE18C558C7A
-57F45BD45F0F606F62ED690D6B966E5C71847BD287558B588EFE98DF98FE4F38
-4F814FE1547B5A205BB8613C65B0666871FC7533795E7D33814E81E3839885AA
-85CE87038A0A8EAB8F9BF9718FC559315BA45BE660895BE95C0B5FC36C810000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-64
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9726DF1700B751A82AF8AF64EC05341F97396D96C0F4E9E4FC45152555E
-5A255CE86211725982BD83AA86FE88598A1D963F96C599139D099D5D580A5CB3
-5DBD5E4460E1611563E16A026E2591029354984E9C109F775B895CB86309664F
-6848773C96C1978D98549B9F65A18B018ECB95BC55355CA95DD65EB56697764C
-83F495C758D362BC72CE9D284EF0592E600F663B6B8379E79D26539354C057C3
-5D16611B66D66DAF788D827E969897445384627C63966DB27E0A814B984D0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-65
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006AFB7F4C9DAF9E1A4E5F503B51B6591C60F963F66930723A8036F97491CE
-5F31F975F9767D0482E5846F84BB85E58E8DF9774F6FF978F97958E45B436059
-63DA6518656D6698F97A694A6A236D0B7001716C75D2760D79B37A70F97B7F8A
-F97C8944F97D8B9391C0967DF97E990A57045FA165BC6F01760079A68A9E99AD
-9B5A9F6C510461B662916A8D81C6504358305F6671098A008AFA5B7C86164FFA
-513C56B4594463A96DF95DAA696D51864E884F59F97FF980F9815982F9820000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9836B5F6C5DF98474B57916F9858207824583398F3F8F5DF9869918F987
-F988F9894EA6F98A57DF5F796613F98BF98C75AB7E798B6FF98D90069A5B56A5
-582759F85A1F5BB4F98E5EF6F98FF9906350633BF991693D6C876CBF6D8E6D93
-6DF56F14F99270DF71367159F99371C371D5F994784F786FF9957B757DE3F996
-7E2FF997884D8EDFF998F999F99A925BF99B9CF6F99CF99DF99E60856D85F99F
-71B1F9A0F9A195B153ADF9A2F9A3F9A467D3F9A5708E71307430827682D20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-67
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9A695BB9AE59E7D66C4F9A771C18449F9A8F9A9584BF9AAF9AB5DB85F71
-F9AC6620668E697969AE6C386CF36E366F416FDA701B702F715071DF7370F9AD
-745BF9AE74D476C87A4E7E93F9AFF9B082F18A608FCEF9B19348F9B29719F9B3
-F9B44E42502AF9B5520853E166F36C6D6FCA730A777F7A6282AE85DD8602F9B6
-88D48A638B7D8C6BF9B792B3F9B8971398104E944F0D4FC950B25348543E5433
-55DA586258BA59675A1B5BE4609FF9B961CA655665FF666468A76C5A6FB30000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-68
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000070CF71AC73527B7D87088AA49C329F075C4B6C8373447389923A6EAB7465
-761F7A697E15860A514058C564C174EE751576707FC1909596CD99546E2674E6
-7AA97AAA81E586D987788A1B5A495B8C5B9B68A169006D6373A97413742C7897
-7DE97FEB81188155839E8C4C962E981166F05F8065FA67896C6A738B502D5A03
-6B6A77EE59165D6C5DCD7325754FF9BAF9BB50E551F9582F592D599659DA5BE5
-F9BCF9BD5DA262D76416649364FEF9BE66DCF9BF6A48F9C071FF7464F9C10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-69
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00007A887AAF7E477E5E80008170F9C287EF89818B209059F9C390809952617E
-6B326D747E1F89258FB14FD150AD519752C757C758895BB95EB8614269956D8C
-6E676EB6719474627528752C8073833884C98E0A939493DEF9C44E8E4F515076
-512A53C853CB53F35B875BD35C24611A618265F4725B7397744076C279507991
-79B97D067FBD828B85D5865E8FC2904790F591EA968596E896E952D65F6765ED
-6631682F715C7A3690C1980A4E91F9C56A526B9E6F907189801882B885530000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000904B969596F297FB851A9B314E90718A96C45143539F54E15713571257A3
-5A9B5AC45BC36028613F63F46C856D396E726E907230733F745782D188818F45
-9060F9C6966298589D1B67088D8A925E4F4D504950DE5371570D59D45A015C09
-617066906E2D7232744B7DEF80C3840E8466853F875F885B89188B02905597CB
-9B4F4E734F915112516AF9C7552F55A95B7A5BA55E7C5E7D5EBE60A060DF6108
-610963C465386709F9C867D467DAF9C9696169626CB96D27F9CA6E38F9CB0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006FE173367337F9CC745C7531F9CD7652F9CEF9CF7DAD81FE843888D58A98
-8ADB8AED8E308E42904A903E907A914991C9936EF9D0F9D15809F9D26BD38089
-80B2F9D3F9D45141596B5C39F9D5F9D66F6473A780E48D07F9D79217958FF9D8
-F9D9F9DAF9DB807F620E701C7D68878DF9DC57A0606961476BB78ABE928096B1
-4E59541F6DEB852D967097F398EE63D66CE3909151DD61C981BA9DF94F9D501A
-51005B9C610F61FF64EC69056BC5759177E37FA98264858F87FB88638ABC0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008B7091AB4E8C4EE54F0AF9DDF9DE593759E8F9DF5DF25F1B5F5B6021F9E0
-F9E1F9E2F9E3723E73E5F9E4757075CDF9E579FBF9E6800C8033808482E18351
-F9E7F9E88CBD8CB39087F9E9F9EA98F4990CF9EBF9EC703776CA7FCA7FCC7FFC
-8B1A4EBA4EC152035370F9ED54BD56E059FB5BC55F155FCD6E6EF9EEF9EF7D6A
-8335F9F086938A8DF9F1976D9777F9F2F9F34E004F5A4F7E58F965E56EA29038
-93B099B94EFB58EC598A59D96041F9F4F9F57A14F9F6834F8CC3516553440000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F9F7F9F8F9F94ECD52695B5582BF4ED4523A54A859C959FF5B505B575B5C
-606361486ECB7099716E738674F775B578C17D2B800581EA8328851785C98AEE
-8CC796CC4F5C52FA56BC65AB6628707C70B872357DBD828D914C96C09D725B71
-68E76B986F7A76DE5C9166AB6F5B7BB47C2A883696DC4E084ED75320583458BB
-58EF596C5C075E335E845F35638C66B267566A1F6AA36B0C6F3F7246F9FA7350
-748B7AE07CA7817881DF81E7838A846C8523859485CF88DD8D1391AC95770000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000969C518D54C957285BB0624D6750683D68936E3D6ED3707D7E2188C18CA1
-8F099F4B9F4E722D7B8F8ACD931A4F474F4E5132548059D05E9562B56775696E
-6A176CAE6E1A72D9732A75BD7BB87D3582E783F9845785F78A5B8CAF8E879019
-90B896CE9F5F52E3540A5AE15BC2645865756EF472C4F9FB76847A4D7B1B7C4D
-7E3E7FDF837B8B2B8CCA8D648DE18E5F8FEA8FF9906993D14F434F7A50B35168
-5178524D526A5861587C59605C085C555EDB609B623068136BBF6C086FB10000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000714E742075307538755176727B4C7B8B7BAD7BC67E8F8A6E8F3E8F49923F
-92939322942B96FB985A986B991E5207622A62986D5976647ACA7BC07D765360
-5CBE5E976F3870B97C9897119B8E9EDE63A5647A87764E014E954EAD505C5075
-544859C35B9A5E405EAD5EF75F8160C5633A653F657465CC6676667867FE6968
-6A896B636C406DC06DE86E1F6E5E701E70A1738E73FD753A775B7887798E7A0B
-7A7D7CBE7D8E82478A028AEA8C9E912D914A91D8926692CC9320970697560000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-70
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000975C98029F0E52365291557C58245E1D5F1F608C63D068AF6FDF796D7B2C
-81CD85BA88FD8AF88E44918D9664969B973D984C9F4A4FCE514651CB52A95632
-5F145F6B63AA64CD65E9664166FA66F9671D689D68D769FD6F156F6E716771E5
-722A74AA773A7956795A79DF7A207A957C977CDF7D447E70808785FB86A48A54
-8ABF8D998E819020906D91E3963B96D59CE565CF7C078DB393C35B585C0A5352
-62D9731D50275B975F9E60B0616B68D56DD9742E7A2E7D427D9C7E31816B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-71
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008E2A8E35937E94184F5057505DE65EA7632B7F6A4E3B4F4F4F8F505A59DD
-80C4546A546855FE594F5B995DDE5EDA665D673167F1682A6CE86D326E4A6F8D
-70B773E075877C4C7D027D2C7DA2821F86DB8A3B8A858D708E8A8F339031914E
-9152944499D07AF97CA54FCA510151C657C85BEF5CFB66596A3D6D5A6E966FEC
-710C756F7AE388229021907596CB99FF83014E2D4EF2884691CD537D6ADB696B
-6C41847A589E618E66FE62EF70DD751175C77E5284B88B498D084E4B53EA0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-72
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054AB573057405FD763016307646F652F65E8667A679D67B36B626C606C9A
-6F2C77E57825794979577D1980A2810281F3829D82B787188A8CF9FC8D048DBE
-907276F47A197A377E548077550755D45875632F64226649664B686D699B6B84
-6D256EB173CD746874A1755B75B976E1771E778B79E67E097E1D81FB852F8897
-8A3A8CD18EEB8FB0903293AD9663967397074F8453F159EA5AC95E19684E74C6
-75BE79E97A9281A386ED8CEA8DCC8FED659F6715F9FD57F76F577DDD8F2F0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-73
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000093F696C65FB561F26F844E144F98501F53C955DF5D6F5DEE6B216B6478CB
-7B9AF9FE8E498ECA906E6349643E77407A84932F947F9F6A64B06FAF71E674A8
-74DA7AC47C127E827CB27E988B9A8D0A947D9910994C52395BDF64E6672D7D2E
-50ED53C358796158615961FA65AC7AD98B928B9650095021527555315A3C5EE0
-5F706134655E660C663666A269CD6EC46F32731676217A938139825983D684BC
-50B557F05BC05BE85F6963A178267DB583DC852191C791F5518A67F57B560000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008CAC51C459BB60BD8655501CF9FF52545C3A617D621A62D364F265A56ECC
-7620810A8E60965F96BB4EDF5343559859295DDD64C56CC96DFA73947A7F821B
-85A68CE48E10907791E795E1962197C651F854F255865FB964A46F887DB48F1F
-8F4D943550C95C166CBE6DFB751B77BB7C3D7C648A798AC2581E59BE5E166377
-7252758A776B8ADC8CBC8F125EF366746DF8807D83C18ACB97519BD6FA005243
-66FF6D956EEF7DE08AE6902E905E9AD4521D527F54E86194628462DB68A20000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-75
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00006912695A6A3570927126785D7901790E79D27A0D8096827882D583498549
-8C828D859162918B91AE4FC356D171ED77D7870089F85BF85FD6675190A853E2
-585A5BF560A4618164607E3D80708525928364AE50AC5D146700589C62BD63A8
-690E69786A1E6E6B76BA79CB82BB84298ACF8DA88FFD9112914B919C93109318
-939A96DB9A369C0D4E11755C795D7AFA7B517BC97E2E84C48E598E748EF89010
-6625693F744351FA672E9EDC51455FE06C9687F2885D887760B481B584030000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-76
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00008D0553D6543956345A365C31708A7FE0805A810681ED8DA391899A5F9DF2
-50744EC453A060FB6E2C5C644F88502455E45CD95E5F606568946CBB6DC471BE
-75D475F476617A1A7A497DC77DFB7F6E81F486A98F1C96C999B39F52524752C5
-98ED89AA4E0367D26F064FB55BE267956C886D78741B782791DD937C87C479E4
-7A315FEB4ED654A4553E58AE59A560F0625362D6673669558235964099B199DD
-502C53535544577CFA016258FA0264E2666B67DD6FC16FEF742274388A170000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-77
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000094385451560657665F48619A6B4E705870AD7DBB8A95596A812B63A27708
-803D8CAA5854642D69BB5B955E116E6FFA038569514C53F0592A6020614B6B86
-6C706CF07B1E80CE82D48DC690B098B1FA0464C76FA464916504514E5410571F
-8A0E615F6876FA0575DB7B527D71901A580669CC817F892A9000983950785957
-59AC6295900F9B2A615D727995D657615A465DF4628A64AD64FA67776CE26D3E
-722C743678347F7782AD8DDB981752245742677F724874E38CA98FA692110000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-78
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000962A516B53ED634C4F695504609665576C9B6D7F724C72FD7A1789878C9D
-5F6D6F8E70F981A8610E4FBF504F624172477BC77DE87FE9904D97AD9A198CB6
-576A5E7367B0840D8A5554205B165E635EE25F0A658380BA853D9589965B4F48
-5305530D530F548654FA57035E036016629B62B16355FA066CE16D6675B17832
-80DE812F82DE846184B2888D8912900B92EA98FD9B915E4566B466DD70117206
-FA074FF5527D5F6A615367536A196F0274E2796888688C7998C798C49A430000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-79
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000054C17A1F69538AF78C4A98A899AE5F7C62AB75B276AE88AB907F96425339
-5F3C5FC56CCC73CC7562758B7B4682FE999D4E4F903C4E0B4F5553A6590F5EC8
-66306CB37455837787668CC09050971E9C1558D15B7886508B149DB45BD26068
-608D65F16C576F226FA3701A7F557FF095919592965097D352728F4451FD542B
-54B85563558A6ABB6DB57DD88266929C96779E79540854C876D286E495A495D4
-965C4EA24F0959EE5AE65DF760526297676D68416C866E2F7F38809B822A0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FA08FA0998054EA5505554B35793595A5B695BB361C869776D77702387F9
-89E38A728AE7908299ED9AB852BE683850165E78674F8347884C4EAB541156AE
-73E6911597FF9909995799995653589F865B8A3161B26AF6737B8ED26B4796AA
-9A57595572008D6B97694FD45CF45F2661F8665B6CEB70AB738473B973FE7729
-774D7D437D627E2382378852FA0A8CE29249986F5B517A74884098015ACC4FE0
-5354593E5CFD633E6D7972F98105810783A292CF98304EA851445211578B0000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00005F626CC26ECE7005705070AF719273E97469834A87A28861900890A293A3
-99A8516E5F5760E0616766B385598E4A91AF978B4E4E4E92547C58D558FA597D
-5CB55F2762366248660A66676BEB6D696DCF6E566EF86F946FE06FE9705D72D0
-7425745A74E07693795C7CCA7E1E80E182A6846B84BF864E865F87748B778C6A
-93AC9800986560D1621691775A5A660F6DF76E3E743F9B425FFD60DA7B0F54C4
-5F186C5E6CD36D2A70D87D0586798A0C9D3B5316548C5B056A3A706B75750000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000798D79BE82B183EF8A718B418CA89774FA0B64F4652B78BA78BB7A6B4E38
-559A59505BA65E7B60A363DB6B61666568536E19716574B07D0890849A699C25
-6D3B6ED1733E8C4195CA51F05E4C5FA8604D60F66130614C6643664469A56CC1
-6E5F6EC96F62714C749C76877BC17C27835287579051968D9EC3532F56DE5EFB
-5F8A6062609461F7666667036A9C6DEE6FAE7070736A7E6A81BE833486D48AA8
-8CC4528373725B966A6B940454EE56865B5D6548658566C9689F6D8D6DC60000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000723B80B491759A4D4FAF5019539A540E543C558955C55E3F5F8C673D7166
-73DD900552DB52F3586458CE7104718F71FB85B08A13668885A855A76684714A
-8431534955996BC15F595FBD63EE668971478AF18F1D9EBE4F11643A70CB7566
-866760648B4E9DF8514751F653086D3680F89ED166156B23709875D554035C79
-7D078A166B206B3D6B46543860706D3D7FD5820850D651DE559C566B56CD59EC
-5B095E0C619961986231665E66E6719971B971BA72A779A77A007FB28A700000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/macCentEuro.enc b/library/encoding/macCentEuro.enc
deleted file mode 100644
index dde616a..0000000
--- a/library/encoding/macCentEuro.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macCentEuro, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C40100010100C9010400D600DC00E10105010C00E4010D0106010700E90179
-017A010E00ED010F01120113011600F3011700F400F600F500FA011A011B00FC
-202000B0011800A300A7202200B600DF00AE00A92122011900A822600123012E
-012F012A22642265012B0136220222110142013B013C013D013E0139013A0145
-0146014300AC221A01440147220600AB00BB202600A00148015000D50151014C
-20132014201C201D2018201900F725CA014D0154015501582039203A01590156
-01570160201A201E0161015A015B00C10164016500CD017D017E016A00D300D4
-016B016E00DA016F017001710172017300DD00FD0137017B0141017C012202C7
diff --git a/library/encoding/macCroatian.enc b/library/encoding/macCroatian.enc
deleted file mode 100644
index 132a74c..0000000
--- a/library/encoding/macCroatian.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macCroatian, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400C500C700C900D100D600DC00E100E000E200E400E300E500E700E900E8
-00EA00EB00ED00EC00EE00EF00F100F300F200F400F600F500FA00F900FB00FC
-202000B000A200A300A7202200B600DF00AE0160212200B400A82260017D00D8
-221E00B122642265220600B522022211220F0161222B00AA00BA2126017E00F8
-00BF00A100AC221A01922248010600AB010C202600A000C000C300D501520153
-01102014201C201D2018201900F725CAF8FF00A9204400A42039203A00C600BB
-201300B7201A201E203000C2010700C1010D00C800CD00CE00CF00CC00D300D4
-011100D200DA00DB00D9013102C602DC00AF03C000CB02DA00B800CA00E602C7
diff --git a/library/encoding/macCyrillic.enc b/library/encoding/macCyrillic.enc
deleted file mode 100644
index 5590833..0000000
--- a/library/encoding/macCyrillic.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macCyrillic, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0410041104120413041404150416041704180419041A041B041C041D041E041F
-0420042104220423042404250426042704280429042A042B042C042D042E042F
-202000B000A200A300A7202200B6040600AE00A9212204020452226004030453
-221E00B122642265045600B522020408040404540407045704090459040A045A
-0458040500AC221A01922248220600AB00BB202600A0040B045B040C045C0455
-20132014201C201D2018201900F7201E040E045E040F045F211604010451044F
-0430043104320433043404350436043704380439043A043B043C043D043E043F
-0440044104420443044404450446044704480449044A044B044C044D044E00A4
diff --git a/library/encoding/macDingbats.enc b/library/encoding/macDingbats.enc
deleted file mode 100644
index 28449cd..0000000
--- a/library/encoding/macDingbats.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macDingbats, single-byte
-S
-003F 1 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-00202701270227032704260E2706270727082709261B261E270C270D270E270F
-2710271127122713271427152716271727182719271A271B271C271D271E271F
-2720272127222723272427252726272726052729272A272B272C272D272E272F
-2730273127322733273427352736273727382739273A273B273C273D273E273F
-2740274127422743274427452746274727482749274A274B25CF274D25A0274F
-27502751275225B225BC25C6275625D727582759275A275B275C275D275E007F
-F8D7F8D8F8D9F8DAF8DBF8DCF8DDF8DEF8DFF8E0F8E1F8E2F8E3F8E4008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-0000276127622763276427652766276726632666266526602460246124622463
-2464246524662467246824692776277727782779277A277B277C277D277E277F
-2780278127822783278427852786278727882789278A278B278C278D278E278F
-2790279127922793279421922194219527982799279A279B279C279D279E279F
-27A027A127A227A327A427A527A627A727A827A927AA27AB27AC27AD27AE27AF
-000027B127B227B327B427B527B627B727B827B927BA27BB27BC27BD27BE0000
diff --git a/library/encoding/macGreek.enc b/library/encoding/macGreek.enc
deleted file mode 100644
index fbfa51f..0000000
--- a/library/encoding/macGreek.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macGreek, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400B900B200C900B300D600DC038500E000E200E4038400A800E700E900E8
-00EA00EB00A3212200EE00EF202200BD203000F400F600A600AD00F900FB00FC
-2020039303940398039B039E03A000DF00AE00A903A303AA00A7226000B00387
-039100B12264226500A503920395039603970399039A039C03A603AB03A803A9
-03AC039D00AC039F03A1224803A400AB00BB202600A003A503A7038603880153
-20132015201C201D2018201900F70389038A038C038E03AD03AE03AF03CC038F
-03CD03B103B203C803B403B503C603B303B703B903BE03BA03BB03BC03BD03BF
-03C003CE03C103C303C403B803C903C203C703C503B603CA03CB039003B0F8A0
diff --git a/library/encoding/macIceland.enc b/library/encoding/macIceland.enc
deleted file mode 100644
index e3fe9a9..0000000
--- a/library/encoding/macIceland.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macIceland, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400C500C700C900D100D600DC00E100E000E200E400E300E500E700E900E8
-00EA00EB00ED00EC00EE00EF00F100F300F200F400F600F500FA00F900FB00FC
-00DD00B000A200A300A7202200B600DF00AE00A9212200B400A8226000C600D8
-221E00B12264226500A500B522022211220F03C0222B00AA00BA212600E600F8
-00BF00A100AC221A01922248220600AB00BB202600A000C000C300D501520153
-20132014201C201D2018201900F725CA00FF0178204400A400D000F000DE00FE
-00FD00B7201A201E203000C200CA00C100CB00C800CD00CE00CF00CC00D300D4
-F8FF00D200DA00DB00D9013102C602DC00AF02D802D902DA00B802DD02DB02C7
diff --git a/library/encoding/macJapan.enc b/library/encoding/macJapan.enc
deleted file mode 100644
index dba24bd..0000000
--- a/library/encoding/macJapan.enc
+++ /dev/null
@@ -1,785 +0,0 @@
-# Encoding file: macJapan, multi-byte
-M
-003F 0 46
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00A0FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000A921222026
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8FF3E
-203EFF3F30FD30FE309D309E30034EDD30053006300730FC20142010FF0FFF3C
-301C2016FF5C22EF202520182019201C201DFF08FF0930143015FF3BFF3DFF5B
-FF5D30083009300A300B300C300D300E300F30103011FF0B221200B100D70000
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF0400A200A3FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC203B301221922190219121933013000000000000
-000000000000000000000000000000002208220B2286228722822283222A2229
-000000000000000000000000000000002227222800AC21D221D4220022030000
-0000000000000000000000000000000000000000222022A52312220222072261
-2252226A226B221A223D221D2235222B222C0000000000000000000000000000
-212B2030266F266D266A2020202100B6000000000000000025EF000000000000
-82
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000FF10
-FF11FF12FF13FF14FF15FF16FF17FF18FF190000000000000000000000000000
-FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2FFF30
-FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3A000000000000000000000000
-0000FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000003041
-30423043304430453046304730483049304A304B304C304D304E304F30503051
-30523053305430553056305730583059305A305B305C305D305E305F30603061
-30623063306430653066306730683069306A306B306C306D306E306F30703071
-30723073307430753076307730783079307A307B307C307D307E307F30803081
-30823083308430853086308730883089308A308B308C308D308E308F30903091
-3092309300000000000000000000000000000000000000000000000000000000
-83
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF30B0
-30B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF30C0
-30C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF30D0
-30D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF0000
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000391
-03920393039403950396039703980399039A039B039C039D039E039F03A003A1
-03A303A403A503A603A703A803A90000000000000000000000000000000003B1
-03B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C1
-03C303C403C503C603C703C803C9000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-04100411041204130414041504010416041704180419041A041B041C041D041E
-041F0420042104220423042404250426042704280429042A042B042C042D042E
-042F000000000000000000000000000000000000000000000000000000000000
-04300431043204330434043504510436043704380439043A043B043C043D0000
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000002500
-2502250C251025182514251C252C25242534253C25012503250F2513251B2517
-25232533252B253B254B2520252F25282537253F251D25302525253825420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-2460246124622463246424652466246724682469246A246B246C246D246E246F
-2470247124722473000000000000000000000000000000000000000024742475
-2476247724782479247A247B247C247D247E247F248024812482248324842485
-2486248700000000000000000000000000000000000000002776277727780000
-2779277A277B277C277D277E0000000000000000000000000000000000000000
-0000F8A124882489248A248B248C248D248E248F249000000000000000002160
-216121622163216421652166216721682169216A216BF8A2F8A3F8A400000000
-0000000000002170217121722173217421752176217721782179217A217BF8A5
-F8A6F8A700000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000249C249D249E249F24A0
-24A124A224A324A424A524A624A724A824A924AA24AB24AC24AD24AE24AF24B0
-24B124B224B324B424B500000000000000000000000000000000000000000000
-86
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-339C339F339D33A033A4F8A833A133A5339E33A2338EF8A9338F33C433963397
-F8AA339833B333B233B133B0210933D433CB3390338533863387F8AB00000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000000000000000000000000000211633CD2121F8AC2664
-2667266126622660266326652666000000000000000000000000000000000000
-0000000000003020260E30040000000000000000000000000000000000000000
-0000000000000000000000000000261E261C261D261F21C621C421C5F8AD21E8
-21E621E721E9F8AEF8AFF8B0F8B1000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-87
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-3230322A322B322C322D322E322F32403237324232433239323A3231323E3234
-3232323B323632333235323C323D323F32380000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000059275C0F32A432A532A632A732A832A93296329D3298329E63A732993349
-3322334D3314331633053333334E330333363318331533273351334A33393357
-330D334233233326333B332B00000000000000000000000000003300331E332A
-3331334700000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000000000000000337E337D337C337B0000000000000000000000000000
-0000000000000000000000000000000000000000337FF8B2F8B3000000000000
-88
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-222E221F22BF0000000000000000000000000000000000000000000000000000
-0000000000000000301DF8B40000000000000000000000000000000000000000
-000000000000000000000000000000003094000030F730F830F930FA00000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000004E9C
-55165A03963F54C0611B632859F690228475831C7A5060AA63E16E2565ED8466
-82A69BF56893572765A162715B9B59D0867B98F47D627DBE9B8E62167C9F88B7
-5B895EB563096697684895C7978D674F4EE54F0A4F4D4F9D504956F2593759D4
-5A015C0960DF610F61706613690570BA754F757079FB7DAD7DEF80C3840E8863
-8B029055907A533B4E954EA557DF80B290C178EF4E0058F16EA290387A328328
-828B9C2F5141537054BD54E156E059FB5F1598F26DEB80E4852D000000000000
-89
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9662967096A097FB540B53F35B8770CF7FBD8FC296E8536F9D5C7ABA4E117893
-81FC6E26561855046B1D851A9C3B59E553A96D6674DC958F56424E91904B96F2
-834F990C53E155B65B305F71662066F368046C386CF36D29745B76C87A4E9834
-82F1885B8A6092ED6DB275AB76CA99C560A68B018D8A95B2698E53AD51860000
-5712583059445BB45EF6602863A963F46CBF6F14708E7114715971D5733F7E01
-827682D185979060925B9D1B586965BC6C5A752551F9592E59655F805FDC62BC
-65FA6A2A6B276BB4738B7FC189569D2C9D0E9EC45CA16C96837B51045C4B61B6
-81C6687672614E594FFA537860696E297A4F97F34E0B53164EEE4F554F3D4FA1
-4F7352A053EF5609590F5AC15BB65BE179D16687679C67B66B4C6CB3706B73C2
-798D79BE7A3C7B8782B182DB8304837783EF83D387668AB256298CA88FE6904E
-971E868A4FC45CE862117259753B81E582BD86FE8CC096C5991399D54ECB4F1A
-89E356DE584A58CA5EFB5FEB602A6094606261D0621262D06539000000000000
-8A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9B41666668B06D777070754C76867D7582A587F9958B968E8C9D51F152BE5916
-54B35BB35D16616869826DAF788D84CB88578A7293A79AB86D6C99A886D957A3
-67FF86CE920E5283568754045ED362E164B9683C68386BBB737278BA7A6B899A
-89D28D6B8F0390ED95A3969497695B665CB3697D984D984E639B7B206A2B0000
-6A7F68B69C0D6F5F5272559D607062EC6D3B6E076ED1845B89108F444E149C39
-53F6691B6A3A9784682A515C7AC384B291DC938C565B9D286822830584317CA5
-520882C574E64E7E4F8351A05BD2520A52D852E75DFB559A582A59E65B8C5B98
-5BDB5E725E7960A3611F616361BE63DB656267D1685368FA6B3E6B536C576F22
-6F976F4574B0751876E3770B7AFF7BA17C217DE97F367FF0809D8266839E89B3
-8ACC8CAB908494519593959195A2966597D3992882184E38542B5CB85DCC73A9
-764C773C5CA97FEB8D0B96C19811985498584F014F0E5371559C566857FA5947
-5B095BC45C905E0C5E7E5FCC63EE673A65D765E2671F68CB68C4000000000000
-8B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A5F5E306BC56C176C7D757F79485B637A007D005FBD898F8A188CB48D778ECC
-8F1D98E29A0E9B3C4E80507D510059935B9C622F628064EC6B3A72A075917947
-7FA987FB8ABC8B7063AC83CA97A05409540355AB68546A588A70782767759ECD
-53745BA2811A865090064E184E454EC74F1153CA54385BAE5F13602565510000
-673D6C426C726CE3707874037A767AAE7B087D1A7CFE7D6665E7725B53BB5C45
-5DE862D262E063196E20865A8A318DDD92F86F0179A69B5A4EA84EAB4EAC4F9B
-4FA050D151477AF6517151F653545321537F53EB55AC58835CE15F375F4A602F
-6050606D631F65596A4B6CC172C272ED77EF80F881058208854E90F793E197FF
-99579A5A4EF051DD5C2D6681696D5C4066F26975738968507C8150C552E45747
-5DFE932665A46B236B3D7434798179BD7B4B7DCA82B983CC887F895F8B398FD1
-91D1541F92804E5D503653E5533A72D7739677E982E68EAF99C699C899D25177
-611A865E55B07A7A50765BD3904796854E326ADB91E75C515C48000000000000
-8C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63987A9F6C9397748F617AAA718A96887C8268177E706851936C52F2541B85AB
-8A137FA48ECD90E15366888879414FC250BE521151445553572D73EA578B5951
-5F625F8460756176616761A963B2643A656C666F68426E1375667A3D7CFB7D4C
-7D997E4B7F6B830E834A86CD8A088A638B668EFD981A9D8F82B88FCE9BE80000
-5287621F64836FC09699684150916B206C7A6F547A747D5088408A2367084EF6
-503950265065517C5238526355A7570F58055ACC5EFA61B261F862F36372691C
-6A29727D72AC732E7814786F7D79770C80A9898B8B198CE28ED290639375967A
-98559A139E785143539F53B35E7B5F266E1B6E90738473FE7D4382378A008AFA
-96504E4E500B53E4547C56FA59D15B645DF15EAB5F276238654567AF6E5672D0
-7CCA88B480A180E183F0864E8A878DE8923796C798679F134E944E924F0D5348
-5449543E5A2F5F8C5FA1609F68A76A8E745A78818A9E8AA48B7791904E5E9BC9
-4EA44F7C4FAF501950165149516C529F52B952FE539A53E35411000000000000
-8D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-540E5589575157A2597D5B545B5D5B8F5DE55DE75DF75E785E835E9A5EB75F18
-6052614C629762D863A7653B6602664366F4676D6821689769CB6C5F6D2A6D69
-6E2F6E9D75327687786C7A3F7CE07D057D187D5E7DB18015800380AF80B18154
-818F822A8352884C88618B1B8CA28CFC90CA91759271783F92FC95A4964D0000
-980599999AD89D3B525B52AB53F7540858D562F76FE08C6A8F5F9EB9514B523B
-544A56FD7A4091779D609ED273446F09817075115FFD60DA9AA872DB8FBC6B64
-98034ECA56F0576458BE5A5A606861C7660F6606683968B16DF775D57D3A826E
-9B424E9B4F5053C955065D6F5DE65DEE67FB6C99747378028A50939688DF5750
-5EA7632B50B550AC518D670054C9585E59BB5BB05F69624D63A1683D6B736E08
-707D91C7728078157826796D658E7D3083DC88C18F09969B5264572867507F6A
-8CA151B45742962A583A698A80B454B25D0E57FC78959DFA4F5C524A548B643E
-6628671467F57A847B567D22932F685C9BAD7B395319518A5237000000000000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5BDF62F664AE64E6672D6BBA85A996D176909BD6634C93069BAB76BF66524E09
-509853C25C7160E864926563685F71E673CA75237B977E8286958B838CDB9178
-991065AC66AB6B8B4ED54ED44F3A4F7F523A53F853F255E356DB58EB59CB59C9
-59FF5B505C4D5E025E2B5FD7601D6307652F5B5C65AF65BD65E8679D6B620000
-6B7B6C0F7345794979C17CF87D197D2B80A2810281F389968A5E8A698A668A8C
-8AEE8CC78CDC96CC98FC6B6F4E8B4F3C4F8D51505B575BFA6148630166426B21
-6ECB6CBB723E74BD75D478C1793A800C803381EA84948F9E6C509E7F5F0F8B58
-9D2B7AFA8EF85B8D96EB4E0353F157F759315AC95BA460896E7F6F0675BE8CEA
-5B9F85007BE0507267F4829D5C61854A7E1E820E51995C0463688D66659C716E
-793E7D1780058B1D8ECA906E86C790AA501F52FA5C3A6753707C7235914C91C8
-932B82E55BC25F3160F94E3B53D65B88624B67316B8A72E973E07A2E816B8DA3
-91529996511253D7546A5BFF63886A397DAC970056DA53CE5468000000000000
-8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B975C315DDE4FEE610162FE6D3279C079CB7D427E4D7FD281ED821F84908846
-89728B908E748F2F9031914B916C96C6919C4EC04F4F514553415F93620E67D4
-6C416E0B73637E2691CD928353D459195BBF6DD1795D7E2E7C9B587E719F51FA
-88538FF04FCA5CFB662577AC7AE3821C99FF51C65FAA65EC696F6B896DF30000
-6E966F6476FE7D145DE190759187980651E6521D6240669166D96E1A5EB67DD2
-7F7266F885AF85F78AF852A953D959735E8F5F90605592E4966450B7511F52DD
-5320534753EC54E8554655315617596859BE5A3C5BB55C065C0F5C115C1A5E84
-5E8A5EE05F70627F628462DB638C63776607660C662D6676677E68A26A1F6A35
-6CBC6D886E096E58713C7126716775C77701785D7901796579F07AE07B117CA7
-7D39809683D6848B8549885D88F38A1F8A3C8A548A738C618CDE91A49266937E
-9418969C97984E0A4E084E1E4E575197527057CE583458CC5B225E3860C564FE
-676167566D4472B675737A6384B88B7291B89320563157F498FE000000000000
-90
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62ED690D6B9671ED7E548077827289E698DF87558FB15C3B4F384FE14FB55507
-5A205BDD5BE95FC3614E632F65B0664B68EE699B6D786DF1753375B9771F795E
-79E67D3381E382AF85AA89AA8A3A8EAB8F9B903291DD97074EBA4EC152035875
-58EC5C0B751A5C3D814E8A0A8FC59663976D7B258ACF9808916256F353A80000
-9017543957825E2563A86C34708A77617C8B7FE088709042915493109318968F
-745E9AC45D075D69657067A28DA896DB636E6749691983C5981796C088FE6F84
-647A5BF84E16702C755D662F51C4523652E259D35F8160276210653F6574661F
-667468F268166B636E057272751F76DB7CBE805658F088FD897F8AA08A938ACB
-901D91929752975965897A0E810696BB5E2D60DC621A65A56614679077F37A4D
-7C4D7E3E810A8CAC8D648DE18E5F78A9520762D963A5644262988A2D7A837BC0
-8AAC96EA7D76820C87494ED95148534353605BA35C025C165DDD6226624764B0
-681368346CC96D456D1767D36F5C714E717D65CB7A7F7BAD7DDA000000000000
-91
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E4A7FA8817A821B823985A68A6E8CCE8DF59078907792AD929195839BAE524D
-55846F387136516879857E5581B37CCE564C58515CA863AA66FE66FD695A72D9
-758F758E790E795679DF7C977D207D4486078A34963B90619F2050E7527553CC
-53E2500955AA58EE594F723D5B8B5C64531D60E360F3635C6383633F63BB0000
-64CD65E966F95DE369CD69FD6F1571E54E8975E976F87A937CDF7DCF7D9C8061
-83498358846C84BC85FB88C58D709001906D9397971C9A1250CF5897618E81D3
-85358D0890204FC3507452475373606F6349675F6E2C8DB3901F4FD75C5E8CCA
-65CF7D9A53528896517663C35B585B6B5C0A640D6751905C4ED6591A592A6C70
-8A51553E581559A560F0625367C182356955964099C49A284F5358065BFE8010
-5CB15E2F5F856020614B623466FF6CF06EDE80CE817F82D4888B8CB89000902E
-968A9EDB9BDB4EE353F059277B2C918D984C9DF96EDD7027535355445B856258
-629E62D36CA26FEF74228A1794386FC18AFE833851E786F853EA000000000000
-92
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53E94F4690548FB0596A81315DFD7AEA8FBF68DA8C3772F89C486A3D8AB04E39
-53585606576662C563A265E66B4E6DE16E5B70AD77ED7AEF7BAA7DBB803D80C6
-86CB8A95935B56E358C75F3E65AD66966A806BB575378AC7502477E557305F1B
-6065667A6C6075F47A1A7F6E81F48718904599B37BC9755C7AF97B5184C40000
-901079E97A9283365AE177404E2D4EF25B995FE062BD663C67F16CE8866B8877
-8A3B914E92F399D06A177026732A82E784578CAF4E01514651CB558B5BF55E16
-5E335E815F145F355F6B5FB461F2631166A2671D6F6E7252753A773A80748139
-817887768ABF8ADC8D858DF3929A957798029CE552C5635776F467156C8873CD
-8CC393AE96736D25589C690E69CC8FFD939A75DB901A585A680263B469FB4F43
-6F2C67D88FBB85267DB49354693F6F70576A58F75B2C7D2C722A540A91E39DB4
-4EAD4F4E505C507552438C9E544858245B9A5E1D5E955EAD5EF75F1F608C62B5
-633A63D068AF6C407887798E7A0B7DE082478A028AE68E449013000000000000
-93
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-90B8912D91D89F0E6CE5645864E265756EF476847B1B906993D16EBA54F25FB9
-64A48F4D8FED92445178586B59295C555E976DFB7E8F751C8CBC8EE2985B70B9
-4F1D6BBF6FB1753096FB514E54105835585759AC5C605F926597675C6E21767B
-83DF8CED901490FD934D7825783A52AA5EA6571F597460125012515A51AC0000
-51CD520055105854585859575B955CF65D8B60BC6295642D6771684368BC68DF
-76D76DD86E6F6D9B706F71C85F5375D879777B497B547B527CD67D7152308463
-856985E48A0E8B048C468E0F9003900F94199676982D9A3095D850CD52D5540C
-58025C0E61A7649E6D1E77B37AE580F48404905392855CE09D07533F5F975FB3
-6D9C7279776379BF7BE46BD272EC8AAD68036A6151F87A8169345C4A9CF682EB
-5BC59149701E56785C6F60C765666C8C8C5A90419813545166C7920D594890A3
-51854E4D51EA85998B0E7058637A934B696299B47E047577535769608EDF96E3
-6C5D4E8C5C3C5F108FE953028CD1808986795EFF65E54E735165000000000000
-94
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59825C3F97EE4EFB598A5FCD8A8D6FE179B079625BE78471732B71B15E745FF5
-637B649A71C37C984E435EFC4E4B57DC56A260A96FC37D0D80FD813381BF8FB2
-899786A45DF4628A64AD898767776CE26D3E743678345A467F7582AD99AC4FF3
-5EC362DD63926557676F76C3724C80CC80BA8F29914D500D57F95A9268850000
-6973716472FD8CB758F28CE0966A9019877F79E477E784294F2F5265535A62CD
-67CF6CCA767D7B947C95823685848FEB66DD6F2072067E1B83AB99C19EA651FD
-7BB178727BB880877B486AE85E61808C75517560516B92626E8C767A91979AEA
-4F107F70629C7B4F95A59CE9567A585986E496BC4F345224534A53CD53DB5E06
-642C6591677F6C3E6C4E724872AF73ED75547E41822C85E98CA97BC491C67169
-981298EF633D6669756A76E478D0854386EE532A5351542659835E875F7C60B2
-6249627962AB65906BD46CCC75B276AE789179D87DCB7F7780A588AB8AB98CBB
-907F975E98DB6A0B7C3850995C3E5FAE67876BD8743577097F8E000000000000
-95
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9F3B67CA7A175339758B9AED5F66819D83F180985F3C5FC575627B46903C6867
-59EB5A9B7D10767E8B2C4FF55F6A6A196C376F0274E2796888688A558C795EDF
-63CF75C579D282D7932892F2849C86ED9C2D54C15F6C658C6D5C70158CA78CD3
-983B654F74F64E0D4ED857E0592B5A665BCC51A85E035E9C6016627665770000
-65A7666E6D6E72367B268150819A82998B5C8CA08CE68D74961C96444FAE64AB
-6B66821E8461856A90E85C01695398A8847A85574F0F526F5FA95E45670D798F
-8179890789866DF55F1762556CB84ECF72699B925206543B567458B361A4626E
-711A596E7C897CDE7D1B96F06587805E4E194F75517558405E635E735F0A67C4
-4E26853D9589965B7C73980150FB58C1765678A7522577A585117B86504F5909
-72477BC77DE88FBA8FD4904D4FBF52C95A295F0197AD4FDD821792EA57036355
-6B69752B88DC8F147A4252DF58936155620A66AE6BCD7C3F83E950234FF85305
-5446583159495B9D5CF05CEF5D295E9662B16367653E65B9670B000000000000
-96
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6CD56CE170F978327E2B80DE82B3840C84EC870289128A2A8C4A90A692D298FD
-9CF39D6C4E4F4EA1508D5256574A59A85E3D5FD85FD9623F66B4671B67D068D2
-51927D2180AA81A88B008C8C8CBF927E96325420982C531750D5535C58A864B2
-6734726777667A4691E652C36CA16B8658005E4C5954672C7FFB51E176C60000
-646978E89B549EBB57CB59B96627679A6BCE54E969D95E55819C67959BAA67FE
-9C52685D4EA64FE353C862B9672B6CAB8FC44FAD7E6D9EBF4E0761626E806F2B
-85135473672A9B455DF37B955CAC5BC6871C6E4A84D17A14810859997C8D6C11
-772052D959227121725F77DB97279D61690B5A7F5A1851A5540D547D660E76DF
-8FF792989CF459EA725D6EC5514D68C97DBF7DEC97629EBA64786A2183025984
-5B5F6BDB731B76F27DB280178499513267289ED976EE676252FF99055C24623B
-7C7E8CB0554F60B67D0B958053014E5F51B6591C723A803691CE5F2577E25384
-5F797D0485AC8A338E8D975667F385AE9453610961086CB97652000000000000
-97
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8AED8F38552F4F51512A52C753CB5BA55E7D60A0618263D6670967DA6E676D8C
-733673377531795088D58A98904A909190F596C4878D59154E884F594E0E8A89
-8F3F981050AD5E7C59965BB95EB863DA63FA64C166DC694A69D86D0B6EB67194
-75287AAF7F8A8000844984C989818B218E0A9065967D990A617E62916B320000
-6C836D747FCC7FFC6DC07F8587BA88F8676583B1983C96F76D1B7D61843D916A
-4E7153755D506B046FEB85CD862D89A75229540F5C65674E68A87406748375E2
-88CF88E191CC96E296785F8B73877ACB844E63A0756552896D416E9C74097559
-786B7C9296867ADC9F8D4FB6616E65C5865C4E864EAE50DA4E2151CC5BEE6599
-68816DBC731F764277AD7A1C7CE7826F8AD2907C91CF96759818529B7DD1502B
-539867976DCB71D0743381E88F2A96A39C579E9F746058416D997D2F985E4EE4
-4F364F8B51B752B15DBA601C73B2793C82D3923496B796F6970A9E979F6266A6
-6B74521752A370C888C25EC9604B61906F2371497C3E7DF4806F000000000000
-98
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84EE9023932C54429B6F6AD370898CC28DEF973252B45A415ECA5F046717697C
-69946D6A6F0F726272FC7BED8001807E874B90CE516D9E937984808B93328AD6
-502D548C8A716B6A8CC4810760D167A09DF24E994E989C108A6B85C185686900
-6E7E789781550000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000005F0C
-4E104E154E2A4E314E364E3C4E3F4E424E564E584E824E858C6B4E8A82125F0D
-4E8E4E9E4E9F4EA04EA24EB04EB34EB64ECE4ECD4EC44EC64EC24ED74EDE4EED
-4EDF4EF74F094F5A4F304F5B4F5D4F574F474F764F884F8F4F984F7B4F694F70
-4F914F6F4F864F9651184FD44FDF4FCE4FD84FDB4FD14FDA4FD04FE44FE5501A
-50285014502A502550054F1C4FF650215029502C4FFE4FEF5011500650435047
-6703505550505048505A5056506C50785080509A508550B450B2000000000000
-99
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50C950CA50B350C250D650DE50E550ED50E350EE50F950F55109510151025116
-51155114511A5121513A5137513C513B513F51405152514C515451627AF85169
-516A516E5180518256D8518C5189518F519151935195519651A451A651A251A9
-51AA51AB51B351B151B251B051B551BD51C551C951DB51E0865551E951ED0000
-51F051F551FE5204520B5214520E5227522A522E52335239524F5244524B524C
-525E5254526A527452695273527F527D528D529452925271528852918FA88FA7
-52AC52AD52BC52B552C152CD52D752DE52E352E698ED52E052F352F552F852F9
-530653087538530D5310530F5315531A5323532F533153335338534053465345
-4E175349534D51D6535E5369536E5918537B53775382539653A053A653A553AE
-53B053B653C37C1296D953DF66FC71EE53EE53E853ED53FA5401543D5440542C
-542D543C542E54365429541D544E548F5475548E545F5471547754705492547B
-5480547654845490548654C754A254B854A554AC54C454C854A8000000000000
-9A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54AB54C254A454BE54BC54D854E554E6550F551454FD54EE54ED54FA54E25539
-55405563554C552E555C55455556555755385533555D5599558054AF558A559F
-557B557E5598559E55AE557C558355A9558755A855DA55C555DF55C455DC55E4
-55D4561455F7561655FE55FD561B55F9564E565071DF56345636563256380000
-566B5664562F566C566A56865680568A56A05694568F56A556AE56B656B456C2
-56BC56C156C356C056C856CE56D156D356D756EE56F9570056FF570457095708
-570B570D57135718571655C7571C572657375738574E573B5740574F576957C0
-57885761577F5789579357A057B357A457AA57B057C357C657D457D257D3580A
-57D657E3580B5819581D587258215862584B58706BC05852583D5879588558B9
-589F58AB58BA58DE58BB58B858AE58C558D358D158D758D958D858E558DC58E4
-58DF58EF58FA58F958FB58FC58FD5902590A5910591B68A65925592C592D5932
-5938593E7AD259555950594E595A5958596259605967596C5969000000000000
-9B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59785981599D4F5E4FAB59A359B259C659E859DC598D59D959DA5A255A1F5A11
-5A1C5A095A1A5A405A6C5A495A355A365A625A6A5A9A5ABC5ABE5ACB5AC25ABD
-5AE35AD75AE65AE95AD65AFA5AFB5B0C5B0B5B165B325AD05B2A5B365B3E5B43
-5B455B405B515B555B5A5B5B5B655B695B705B735B755B7865885B7A5B800000
-5B835BA65BB85BC35BC75BC95BD45BD05BE45BE65BE25BDE5BE55BEB5BF05BF6
-5BF35C055C075C085C0D5C135C205C225C285C385C395C415C465C4E5C535C50
-5C4F5B715C6C5C6E4E625C765C795C8C5C915C94599B5CAB5CBB5CB65CBC5CB7
-5CC55CBE5CC75CD95CE95CFD5CFA5CED5D8C5CEA5D0B5D155D175D5C5D1F5D1B
-5D115D145D225D1A5D195D185D4C5D525D4E5D4B5D6C5D735D765D875D845D82
-5DA25D9D5DAC5DAE5DBD5D905DB75DBC5DC95DCD5DD35DD25DD65DDB5DEB5DF2
-5DF55E0B5E1A5E195E115E1B5E365E375E445E435E405E4E5E575E545E5F5E62
-5E645E475E755E765E7A9EBC5E7F5EA05EC15EC25EC85ED05ECF000000000000
-9C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5ED65EE35EDD5EDA5EDB5EE25EE15EE85EE95EEC5EF15EF35EF05EF45EF85EFE
-5F035F095F5D5F5C5F0B5F115F165F295F2D5F385F415F485F4C5F4E5F2F5F51
-5F565F575F595F615F6D5F735F775F835F825F7F5F8A5F885F915F875F9E5F99
-5F985FA05FA85FAD5FBC5FD65FFB5FE45FF85FF15FDD60B35FFF602160600000
-601960106029600E6031601B6015602B6026600F603A605A6041606A6077605F
-604A6046604D6063604360646042606C606B60596081608D60E76083609A6084
-609B60966097609260A7608B60E160B860E060D360B45FF060BD60C660B560D8
-614D6115610660F660F7610060F460FA6103612160FB60F1610D610E6147613E
-61286127614A613F613C612C6134613D614261446173617761586159615A616B
-6174616F61656171615F615D6153617561996196618761AC6194619A618A6191
-61AB61AE61CC61CA61C961F761C861C361C661BA61CB7F7961CD61E661E361F6
-61FA61F461FF61FD61FC61FE620062086209620D620C6214621B000000000000
-9D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-621E6221622A622E6230623262336241624E625E6263625B62606268627C6282
-6289627E62926293629662D46283629462D762D162BB62CF62FF62C664D462C8
-62DC62CC62CA62C262C7629B62C9630C62EE62F163276302630862EF62F56350
-633E634D641C634F6396638E638063AB637663A3638F6389639F63B5636B0000
-636963BE63E963C063C663E363C963D263F663C4641664346406641364266436
-651D64176428640F6467646F6476644E652A6495649364A564A9648864BC64DA
-64D264C564C764BB64D864C264F164E7820964E064E162AC64E364EF652C64F6
-64F464F264FA650064FD6518651C650565246523652B65346535653765366538
-754B654865566555654D6558655E655D65726578658265838B8A659B659F65AB
-65B765C365C665C165C465CC65D265DB65D965E065E165F16772660A660365FB
-6773663566366634661C664F664466496641665E665D666466676668665F6662
-667066836688668E668966846698669D66C166B966C966BE66BC000000000000
-9E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66C466B866D666DA66E0663F66E666E966F066F566F7670F6716671E67266727
-9738672E673F67366741673867376746675E67606759676367646789677067A9
-677C676A678C678B67A667A1678567B767EF67B467EC67B367E967B867E467DE
-67DD67E267EE67B967CE67C667E76A9C681E684668296840684D6832684E0000
-68B3682B685968636877687F689F688F68AD6894689D689B68836AAE68B96874
-68B568A068BA690F688D687E690168CA690868D86922692668E1690C68CD68D4
-68E768D569366912690468D768E3692568F968E068EF6928692A691A69236921
-68C669796977695C6978696B6954697E696E69396974693D695969306961695E
-695D6981696A69B269AE69D069BF69C169D369BE69CE5BE869CA69DD69BB69C3
-69A76A2E699169A0699C699569B469DE69E86A026A1B69FF6B0A69F969F269E7
-6A0569B16A1E69ED6A1469EB6A0A6A126AC16A236A136A446A0C6A726A366A78
-6A476A626A596A666A486A386A226A906A8D6AA06A846AA26AA3000000000000
-9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A9786176ABB6AC36AC26AB86AB36AAC6ADE6AD16ADF6AAA6ADA6AEA6AFB6B05
-86166AFA6B126B169B316B1F6B386B3776DC6B3998EE6B476B436B496B506B59
-6B546B5B6B5F6B616B786B796B7F6B806B846B836B8D6B986B956B9E6BA46BAA
-6BAB6BAF6BB26BB16BB36BB76BBC6BC66BCB6BD36BDF6BEC6BEB6BF36BEF0000
-9EBE6C086C136C146C1B6C246C236C5E6C556C626C6A6C826C8D6C9A6C816C9B
-6C7E6C686C736C926C906CC46CF16CD36CBD6CD76CC56CDD6CAE6CB16CBE6CBA
-6CDB6CEF6CD96CEA6D1F884D6D366D2B6D3D6D386D196D356D336D126D0C6D63
-6D936D646D5A6D796D596D8E6D956FE46D856DF96E156E0A6DB56DC76DE66DB8
-6DC66DEC6DDE6DCC6DE86DD26DC56DFA6DD96DE46DD56DEA6DEE6E2D6E6E6E2E
-6E196E726E5F6E3E6E236E6B6E2B6E766E4D6E1F6E436E3A6E4E6E246EFF6E1D
-6E386E826EAA6E986EC96EB76ED36EBD6EAF6EC46EB26ED46ED56E8F6EA56EC2
-6E9F6F416F11704C6EEC6EF86EFE6F3F6EF26F316EEF6F326ECC000000000000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F3E6F136EF76F866F7A6F786F816F806F6F6F5B6FF36F6D6F826F7C6F586F8E
-6F916FC26F666FB36FA36FA16FA46FB96FC66FAA6FDF6FD56FEC6FD46FD86FF1
-6FEE6FDB7009700B6FFA70117001700F6FFE701B701A6F74701D7018701F7030
-703E7032705170637099709270AF70F170AC70B870B370AE70DF70CB70DD0000
-70D9710970FD711C711971657155718871667162714C7156716C718F71FB7184
-719571A871AC71D771B971BE71D271C971D471CE71E071EC71E771F571FC71F9
-71FF720D7210721B7228722D722C72307232723B723C723F72407246724B7258
-7274727E7282728172877292729672A272A772B972B272C372C672C472CE72D2
-72E272E072E172F972F7500F7317730A731C7316731D7334732F73297325733E
-734E734F9ED87357736A7368737073787375737B737A73C873B373CE73BB73C0
-73E573EE73DE74A27405746F742573F87432743A7455743F745F74597441745C
-746974707463746A7476747E748B749E74A774CA74CF74D473F1000000000000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74E074E374E774E974EE74F274F074F174F874F7750475037505750C750E750D
-75157513751E7526752C753C7544754D754A7549755B7546755A756975647567
-756B756D75787576758675877574758A758975827594759A759D75A575A375C2
-75B375C375B575BD75B875BC75B175CD75CA75D275D975E375DE75FE75FF0000
-75FC760175F075FA75F275F3760B760D7609761F762776207621762276247634
-7630763B764776487646765C76587661766276687669766A7667766C76707672
-76767678767C768076837688768B768E769676937699769A76B076B476B876B9
-76BA76C276CD76D676D276DE76E176E576E776EA862F76FB7708770777047729
-7724771E77257726771B773777387747775A7768776B775B7765777F777E7779
-778E778B779177A0779E77B077B677B977BF77BC77BD77BB77C777CD77D777DA
-77DC77E377EE77FC780C781279267820792A7845788E78747886787C789A788C
-78A378B578AA78AF78D178C678CB78D478BE78BC78C578CA78EC000000000000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-78E778DA78FD78F47907791279117919792C792B794079607957795F795A7955
-7953797A797F798A799D79A79F4B79AA79AE79B379B979BA79C979D579E779EC
-79E179E37A087A0D7A187A197A207A1F79807A317A3B7A3E7A377A437A577A49
-7A617A627A699F9D7A707A797A7D7A887A977A957A987A967AA97AC87AB00000
-7AB67AC57AC47ABF90837AC77ACA7ACD7ACF7AD57AD37AD97ADA7ADD7AE17AE2
-7AE67AED7AF07B027B0F7B0A7B067B337B187B197B1E7B357B287B367B507B7A
-7B047B4D7B0B7B4C7B457B757B657B747B677B707B717B6C7B6E7B9D7B987B9F
-7B8D7B9C7B9A7B8B7B927B8F7B5D7B997BCB7BC17BCC7BCF7BB47BC67BDD7BE9
-7C117C147BE67BE57C607C007C077C137BF37BF77C177C0D7BF67C237C277C2A
-7C1F7C377C2B7C3D7C4C7C437C547C4F7C407C507C587C5F7C647C567C657C6C
-7C757C837C907CA47CAD7CA27CAB7CA17CA87CB37CB27CB17CAE7CB97CBD7CC0
-7CC57CC27CD87CD27CDC7CE29B3B7CEF7CF27CF47CF67CFA7D06000000000000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D027D1C7D157D0A7D457D4B7D2E7D327D3F7D357D467D737D567D4E7D727D68
-7D6E7D4F7D637D937D897D5B7D8F7D7D7D9B7DBA7DAE7DA37DB57DC77DBD7DAB
-7E3D7DA27DAF7DDC7DB87D9F7DB07DD87DDD7DE47DDE7DFB7DF27DE17E057E0A
-7E237E217E127E317E1F7E097E0B7E227E467E667E3B7E357E397E437E370000
-7E327E3A7E677E5D7E567E5E7E597E5A7E797E6A7E697E7C7E7B7E837DD57E7D
-8FAE7E7F7E887E897E8C7E927E907E937E947E967E8E7E9B7E9C7F387F3A7F45
-7F4C7F4D7F4E7F507F517F557F547F587F5F7F607F687F697F677F787F827F86
-7F837F887F877F8C7F947F9E7F9D7F9A7FA37FAF7FB27FB97FAE7FB67FB88B71
-7FC57FC67FCA7FD57FD47FE17FE67FE97FF37FF998DC80068004800B80128018
-8019801C80218028803F803B804A804680528058805A805F8062806880738072
-807080768079807D807F808480868085809B8093809A80AD519080AC80DB80E5
-80D980DD80C480DA80D6810980EF80F1811B81298123812F814B000000000000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-968B8146813E8153815180FC8171816E81658166817481838188818A81808182
-81A0819581A481A3815F819381A981B081B581BE81B881BD81C081C281BA81C9
-81CD81D181D981D881C881DA81DF81E081E781FA81FB81FE8201820282058207
-820A820D821082168229822B82388233824082598258825D825A825F82640000
-82628268826A826B822E827182778278827E828D829282AB829F82BB82AC82E1
-82E382DF82D282F482F382FA8393830382FB82F982DE830682DC830982D98335
-83348316833283318340833983508345832F832B831783188385839A83AA839F
-83A283968323838E8387838A837C83B58373837583A0838983A883F4841383EB
-83CE83FD840383D8840B83C183F7840783E083F2840D8422842083BD84388506
-83FB846D842A843C855A84848477846B84AD846E848284698446842C846F8479
-843584CA846284B984BF849F84D984CD84BB84DA84D084C184C684D684A18521
-84FF84F485178518852C851F8515851484FC8540856385588548000000000000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85418602854B8555858085A485888591858A85A8856D8594859B85EA8587859C
-8577857E859085C985BA85CF85B985D085D585DD85E585DC85F9860A8613860B
-85FE85FA86068622861A8630863F864D4E558654865F86678671869386A386A9
-86AA868B868C86B686AF86C486C686B086C9882386AB86D486DE86E986EC0000
-86DF86DB86EF8712870687088700870386FB87118709870D86F9870A8734873F
-8737873B87258729871A8760875F8778874C874E877487578768876E87598753
-8763876A880587A2879F878287AF87CB87BD87C087D096D687AB87C487B387C7
-87C687BB87EF87F287E0880F880D87FE87F687F7880E87D28811881688158822
-88218831883688398827883B8844884288528859885E8862886B8881887E889E
-8875887D88B5887288828897889288AE889988A2888D88A488B088BF88B188C3
-88C488D488D888D988DD88F9890288FC88F488E888F28904890C890A89138943
-891E8925892A892B89418944893B89368938894C891D8960895E000000000000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89668964896D896A896F89748977897E89838988898A8993899889A189A989A6
-89AC89AF89B289BA89BD89BF89C089DA89DC89DD89E789F489F88A038A168A10
-8A0C8A1B8A1D8A258A368A418A5B8A528A468A488A7C8A6D8A6C8A628A858A82
-8A848AA88AA18A918AA58AA68A9A8AA38AC48ACD8AC28ADA8AEB8AF38AE70000
-8AE48AF18B148AE08AE28AF78ADE8ADB8B0C8B078B1A8AE18B168B108B178B20
-8B3397AB8B268B2B8B3E8B288B418B4C8B4F8B4E8B498B568B5B8B5A8B6B8B5F
-8B6C8B6F8B748B7D8B808B8C8B8E8B928B938B968B998B9A8C3A8C418C3F8C48
-8C4C8C4E8C508C558C628C6C8C788C7A8C828C898C858C8A8C8D8C8E8C948C7C
-8C98621D8CAD8CAA8CBD8CB28CB38CAE8CB68CC88CC18CE48CE38CDA8CFD8CFA
-8CFB8D048D058D0A8D078D0F8D0D8D109F4E8D138CCD8D148D168D678D6D8D71
-8D738D818D998DC28DBE8DBA8DCF8DDA8DD68DCC8DDB8DCB8DEA8DEB8DDF8DE3
-8DFC8E088E098DFF8E1D8E1E8E108E1F8E428E358E308E348E4A000000000000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E478E498E4C8E508E488E598E648E608E2A8E638E558E768E728E7C8E818E87
-8E858E848E8B8E8A8E938E918E948E998EAA8EA18EAC8EB08EC68EB18EBE8EC5
-8EC88ECB8EDB8EE38EFC8EFB8EEB8EFE8F0A8F058F158F128F198F138F1C8F1F
-8F1B8F0C8F268F338F3B8F398F458F428F3E8F4C8F498F468F4E8F578F5C0000
-8F628F638F648F9C8F9F8FA38FAD8FAF8FB78FDA8FE58FE28FEA8FEF90878FF4
-90058FF98FFA901190159021900D901E9016900B90279036903590398FF8904F
-905090519052900E9049903E90569058905E9068906F907696A890729082907D
-90819080908A9089908F90A890AF90B190B590E290E4624890DB910291129119
-91329130914A9156915891639165916991739172918B9189918291A291AB91AF
-91AA91B591B491BA91C091C191C991CB91D091D691DF91E191DB91FC91F591F6
-921E91FF9214922C92159211925E925792459249926492489295923F924B9250
-929C92969293929B925A92CF92B992B792E9930F92FA9344932E000000000000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93199322931A9323933A9335933B935C9360937C936E935693B093AC93AD9394
-93B993D693D793E893E593D893C393DD93D093C893E4941A9414941394039407
-94109436942B94359421943A944194529444945B94609462945E946A92299470
-94759477947D945A947C947E9481947F95829587958A95949596959895990000
-95A095A895A795AD95BC95BB95B995BE95CA6FF695C395CD95CC95D595D495D6
-95DC95E195E595E296219628962E962F9642964C964F964B9677965C965E965D
-965F96669672966C968D96989695969796AA96A796B196B296B096B496B696B8
-96B996CE96CB96C996CD894D96DC970D96D596F99704970697089713970E9711
-970F971697199724972A97309739973D973E97449746974897429749975C9760
-97649766976852D2976B977197799785977C9781977A9786978B978F9790979C
-97A897A697A397B397B497C397C697C897CB97DC97ED9F4F97F27ADF97F697F5
-980F980C9838982498219837983D9846984F984B986B986F9870000000000000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-98719874987398AA98AF98B198B698C498C398C698E998EB9903990999129914
-99189921991D991E99249920992C992E993D993E9942994999459950994B9951
-9952994C99559997999899A599AD99AE99BC99DF99DB99DD99D899D199ED99EE
-99F199F299FB99F89A019A0F9A0599E29A199A2B9A379A459A429A409A430000
-9A3E9A559A4D9A5B9A579A5F9A629A659A649A699A6B9A6A9AAD9AB09ABC9AC0
-9ACF9AD19AD39AD49ADE9ADF9AE29AE39AE69AEF9AEB9AEE9AF49AF19AF79AFB
-9B069B189B1A9B1F9B229B239B259B279B289B299B2A9B2E9B2F9B329B449B43
-9B4F9B4D9B4E9B519B589B749B939B839B919B969B979B9F9BA09BA89BB49BC0
-9BCA9BB99BC69BCF9BD19BD29BE39BE29BE49BD49BE19C3A9BF29BF19BF09C15
-9C149C099C139C0C9C069C089C129C0A9C049C2E9C1B9C259C249C219C309C47
-9C329C469C3E9C5A9C609C679C769C789CE79CEC9CF09D099D089CEB9D039D06
-9D2A9D269DAF9D239D1F9D449D159D129D419D3F9D3E9D469D48000000000000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9D5D9D5E9D649D519D509D599D729D899D879DAB9D6F9D7A9D9A9DA49DA99DB2
-9DC49DC19DBB9DB89DBA9DC69DCF9DC29DD99DD39DF89DE69DED9DEF9DFD9E1A
-9E1B9E1E9E759E799E7D9E819E889E8B9E8C9E929E959E919E9D9EA59EA99EB8
-9EAA9EAD97619ECC9ECE9ECF9ED09ED49EDC9EDE9EDD9EE09EE59EE89EEF0000
-9EF49EF69EF79EF99EFB9EFC9EFD9F079F0876B79F159F219F2C9F3E9F4A9F52
-9F549F639F5F9F609F619F669F679F6C9F6A9F779F729F769F959F9C9FA0582F
-69C79059746451DC719900000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-EB
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F8B5F8B60000000000000000000000000000000000000000000000000000
-F8B7FE33000000000000000000000000000000000000F8B8FE31F8B900000000
-F8BAF8BBF8BCF8BDFE300000000000000000FE35FE36FE39FE3AF8BEF8BFFE37
-FE38FE3FFE40FE3DFE3EFE41FE42FE43FE44FE3BFE3C00000000000000000000
-0000F8C000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-EC
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000F8C1
-0000F8C20000F8C30000F8C40000F8C500000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F8C600000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000F8C70000F8C80000F8C9000000000000000000000000F8CA000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-ED
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-F8CB0000F8CC0000F8CD0000F8CE0000F8CF0000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-00000000F8D00000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000F8D10000F8D20000F8D3000000000000000000000000F8D40000
-00000000000000000000F8D5F8D6000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/macRoman.enc b/library/encoding/macRoman.enc
deleted file mode 100644
index 6cfd749..0000000
--- a/library/encoding/macRoman.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macRoman, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400C500C700C900D100D600DC00E100E000E200E400E300E500E700E900E8
-00EA00EB00ED00EC00EE00EF00F100F300F200F400F600F500FA00F900FB00FC
-202000B000A200A300A7202200B600DF00AE00A9212200B400A8226000C600D8
-221E00B12264226500A500B522022211220F03C0222B00AA00BA212600E600F8
-00BF00A100AC221A01922248220600AB00BB202600A000C000C300D501520153
-20132014201C201D2018201900F725CA00FF0178204400A42039203AFB01FB02
-202100B7201A201E203000C200CA00C100CB00C800CD00CE00CF00CC00D300D4
-F8FF00D200DA00DB00D9013102C602DC00AF02D802D902DA00B802DD02DB02C7
diff --git a/library/encoding/macRomania.enc b/library/encoding/macRomania.enc
deleted file mode 100644
index ce41cf4..0000000
--- a/library/encoding/macRomania.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macRomania, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400C500C700C900D100D600DC00E100E000E200E400E300E500E700E900E8
-00EA00EB00ED00EC00EE00EF00F100F300F200F400F600F500FA00F900FB00FC
-202000B000A200A300A7202200B600DF00AE00A9212200B400A822600102015E
-221E00B12264226500A500B522022211220F03C0222B00AA00BA21260103015F
-00BF00A100AC221A01922248220600AB00BB202600A000C000C300D501520153
-20132014201C201D2018201900F725CA00FF0178204400A42039203A01620163
-202100B7201A201E203000C200CA00C100CB00C800CD00CE00CF00CC00D300D4
-F8FF00D200DA00DB00D9013102C602DC00AF02D802D902DA00B802DD02DB02C7
diff --git a/library/encoding/macThai.enc b/library/encoding/macThai.enc
deleted file mode 100644
index 7d9c8ad..0000000
--- a/library/encoding/macThai.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macThai, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00AB00BB2026F88CF88FF892F895F898F88BF88EF891F894F897201C201DF899
-FFFD2022F884F889F885F886F887F888F88AF88DF890F893F89620182019FFFD
-00A00E010E020E030E040E050E060E070E080E090E0A0E0B0E0C0E0D0E0E0E0F
-0E100E110E120E130E140E150E160E170E180E190E1A0E1B0E1C0E1D0E1E0E1F
-0E200E210E220E230E240E250E260E270E280E290E2A0E2B0E2C0E2D0E2E0E2F
-0E300E310E320E330E340E350E360E370E380E390E3AFEFF200B201320140E3F
-0E400E410E420E430E440E450E460E470E480E490E4A0E4B0E4C0E4D21220E4F
-0E500E510E520E530E540E550E560E570E580E5900AE00A9FFFDFFFDFFFDFFFD
diff --git a/library/encoding/macTurkish.enc b/library/encoding/macTurkish.enc
deleted file mode 100644
index 73e8687..0000000
--- a/library/encoding/macTurkish.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macTurkish, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-00C400C500C700C900D100D600DC00E100E000E200E400E300E500E700E900E8
-00EA00EB00ED00EC00EE00EF00F100F300F200F400F600F500FA00F900FB00FC
-202000B000A200A300A7202200B600DF00AE00A9212200B400A8226000C600D8
-221E00B12264226500A500B522022211220F03C0222B00AA00BA212600E600F8
-00BF00A100AC221A01922248220600AB00BB202600A000C000C300D501520153
-20132014201C201D2018201900F725CA00FF0178011E011F01300131015E015F
-202100B7201A201E203000C200CA00C100CB00C800CD00CE00CF00CC00D300D4
-F8FF00D200DA00DB00D9F8A002C602DC00AF02D802D902DA00B802DD02DB02C7
diff --git a/library/encoding/macUkraine.enc b/library/encoding/macUkraine.enc
deleted file mode 100644
index 643cc45..0000000
--- a/library/encoding/macUkraine.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: macUkraine, single-byte
-S
-003F 0 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0410041104120413041404150416041704180419041A041B041C041D041E041F
-0420042104220423042404250426042704280429042A042B042C042D042E042F
-202000B0049000A300A7202200B6040600AE00A9212204020452226004030453
-221E00B122642265045600B504910408040404540407045704090459040A045A
-0458040500AC221A01922248220600AB00BB202600A0040B045B040C045C0455
-20132014201C201D2018201900F7201E040E045E040F045F211604010451044F
-0430043104320433043404350436043704380439043A043B043C043D043E043F
-0440044104420443044404450446044704480449044A044B044C044D044E00A4
diff --git a/library/encoding/shiftjis.enc b/library/encoding/shiftjis.enc
deleted file mode 100644
index c8d2504..0000000
--- a/library/encoding/shiftjis.enc
+++ /dev/null
@@ -1,683 +0,0 @@
-# Encoding file: shiftjis, multi-byte
-M
-003F 0 40
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002100220023002400250026002700280029002A002B002C002D002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-0040004100420043004400450046004700480049004A004B004C004D004E004F
-0050005100520053005400550056005700580059005A005B005C005D005E005F
-0060006100620063006400650066006700680069006A006B006C006D006E006F
-0070007100720073007400750076007700780079007A007B007C007D007E007F
-0080000000000000000000850086008700000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000FF61FF62FF63FF64FF65FF66FF67FF68FF69FF6AFF6BFF6CFF6DFF6EFF6F
-FF70FF71FF72FF73FF74FF75FF76FF77FF78FF79FF7AFF7BFF7CFF7DFF7EFF7F
-FF80FF81FF82FF83FF84FF85FF86FF87FF88FF89FF8AFF8BFF8CFF8DFF8EFF8F
-FF90FF91FF92FF93FF94FF95FF96FF97FF98FF99FF9AFF9BFF9CFF9DFF9EFF9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-81
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-300030013002FF0CFF0E30FBFF1AFF1BFF1FFF01309B309C00B4FF4000A8FF3E
-FFE3FF3F30FD30FE309D309E30034EDD30053006300730FC20152010FF0FFF3C
-301C2016FF5C2026202520182019201C201DFF08FF0930143015FF3BFF3DFF5B
-FF5D30083009300A300B300C300D300E300F30103011FF0B221200B100D70000
-00F7FF1D2260FF1CFF1E22662267221E22342642264000B0203220332103FFE5
-FF0400A200A3FF05FF03FF06FF0AFF2000A72606260525CB25CF25CE25C725C6
-25A125A025B325B225BD25BC203B301221922190219121933013000000000000
-000000000000000000000000000000002208220B2286228722822283222A2229
-000000000000000000000000000000002227222800AC21D221D4220022030000
-0000000000000000000000000000000000000000222022A52312220222072261
-2252226A226B221A223D221D2235222B222C0000000000000000000000000000
-212B2030266F266D266A2020202100B6000000000000000025EF000000000000
-82
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000FF10
-FF11FF12FF13FF14FF15FF16FF17FF18FF190000000000000000000000000000
-FF21FF22FF23FF24FF25FF26FF27FF28FF29FF2AFF2BFF2CFF2DFF2EFF2FFF30
-FF31FF32FF33FF34FF35FF36FF37FF38FF39FF3A000000000000000000000000
-0000FF41FF42FF43FF44FF45FF46FF47FF48FF49FF4AFF4BFF4CFF4DFF4EFF4F
-FF50FF51FF52FF53FF54FF55FF56FF57FF58FF59FF5A00000000000000003041
-30423043304430453046304730483049304A304B304C304D304E304F30503051
-30523053305430553056305730583059305A305B305C305D305E305F30603061
-30623063306430653066306730683069306A306B306C306D306E306F30703071
-30723073307430753076307730783079307A307B307C307D307E307F30803081
-30823083308430853086308730883089308A308B308C308D308E308F30903091
-3092309300000000000000000000000000000000000000000000000000000000
-83
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-30A130A230A330A430A530A630A730A830A930AA30AB30AC30AD30AE30AF30B0
-30B130B230B330B430B530B630B730B830B930BA30BB30BC30BD30BE30BF30C0
-30C130C230C330C430C530C630C730C830C930CA30CB30CC30CD30CE30CF30D0
-30D130D230D330D430D530D630D730D830D930DA30DB30DC30DD30DE30DF0000
-30E030E130E230E330E430E530E630E730E830E930EA30EB30EC30ED30EE30EF
-30F030F130F230F330F430F530F6000000000000000000000000000000000391
-03920393039403950396039703980399039A039B039C039D039E039F03A003A1
-03A303A403A503A603A703A803A90000000000000000000000000000000003B1
-03B203B303B403B503B603B703B803B903BA03BB03BC03BD03BE03BF03C003C1
-03C303C403C503C603C703C803C9000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-04100411041204130414041504010416041704180419041A041B041C041D041E
-041F0420042104220423042404250426042704280429042A042B042C042D042E
-042F000000000000000000000000000000000000000000000000000000000000
-04300431043204330434043504510436043704380439043A043B043C043D0000
-043E043F0440044104420443044404450446044704480449044A044B044C044D
-044E044F00000000000000000000000000000000000000000000000000002500
-2502250C251025182514251C252C25242534253C25012503250F2513251B2517
-25232533252B253B254B2520252F25282537253F251D25302525253825420000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-88
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000004E9C
-55165A03963F54C0611B632859F690228475831C7A5060AA63E16E2565ED8466
-82A69BF56893572765A162715B9B59D0867B98F47D627DBE9B8E62167C9F88B7
-5B895EB563096697684895C7978D674F4EE54F0A4F4D4F9D504956F2593759D4
-5A015C0960DF610F61706613690570BA754F757079FB7DAD7DEF80C3840E8863
-8B029055907A533B4E954EA557DF80B290C178EF4E0058F16EA290387A328328
-828B9C2F5141537054BD54E156E059FB5F1598F26DEB80E4852D000000000000
-89
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9662967096A097FB540B53F35B8770CF7FBD8FC296E8536F9D5C7ABA4E117893
-81FC6E26561855046B1D851A9C3B59E553A96D6674DC958F56424E91904B96F2
-834F990C53E155B65B305F71662066F368046C386CF36D29745B76C87A4E9834
-82F1885B8A6092ED6DB275AB76CA99C560A68B018D8A95B2698E53AD51860000
-5712583059445BB45EF6602863A963F46CBF6F14708E7114715971D5733F7E01
-827682D185979060925B9D1B586965BC6C5A752551F9592E59655F805FDC62BC
-65FA6A2A6B276BB4738B7FC189569D2C9D0E9EC45CA16C96837B51045C4B61B6
-81C6687672614E594FFA537860696E297A4F97F34E0B53164EEE4F554F3D4FA1
-4F7352A053EF5609590F5AC15BB65BE179D16687679C67B66B4C6CB3706B73C2
-798D79BE7A3C7B8782B182DB8304837783EF83D387668AB256298CA88FE6904E
-971E868A4FC45CE862117259753B81E582BD86FE8CC096C5991399D54ECB4F1A
-89E356DE584A58CA5EFB5FEB602A6094606261D0621262D06539000000000000
-8A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9B41666668B06D777070754C76867D7582A587F9958B968E8C9D51F152BE5916
-54B35BB35D16616869826DAF788D84CB88578A7293A79AB86D6C99A886D957A3
-67FF86CE920E5283568754045ED362E164B9683C68386BBB737278BA7A6B899A
-89D28D6B8F0390ED95A3969497695B665CB3697D984D984E639B7B206A2B0000
-6A7F68B69C0D6F5F5272559D607062EC6D3B6E076ED1845B89108F444E149C39
-53F6691B6A3A9784682A515C7AC384B291DC938C565B9D286822830584317CA5
-520882C574E64E7E4F8351A05BD2520A52D852E75DFB559A582A59E65B8C5B98
-5BDB5E725E7960A3611F616361BE63DB656267D1685368FA6B3E6B536C576F22
-6F976F4574B0751876E3770B7AFF7BA17C217DE97F367FF0809D8266839E89B3
-8ACC8CAB908494519593959195A2966597D3992882184E38542B5CB85DCC73A9
-764C773C5CA97FEB8D0B96C19811985498584F014F0E5371559C566857FA5947
-5B095BC45C905E0C5E7E5FCC63EE673A65D765E2671F68CB68C4000000000000
-8B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A5F5E306BC56C176C7D757F79485B637A007D005FBD898F8A188CB48D778ECC
-8F1D98E29A0E9B3C4E80507D510059935B9C622F628064EC6B3A72A075917947
-7FA987FB8ABC8B7063AC83CA97A05409540355AB68546A588A70782767759ECD
-53745BA2811A865090064E184E454EC74F1153CA54385BAE5F13602565510000
-673D6C426C726CE3707874037A767AAE7B087D1A7CFE7D6665E7725B53BB5C45
-5DE862D262E063196E20865A8A318DDD92F86F0179A69B5A4EA84EAB4EAC4F9B
-4FA050D151477AF6517151F653545321537F53EB55AC58835CE15F375F4A602F
-6050606D631F65596A4B6CC172C272ED77EF80F881058208854E90F793E197FF
-99579A5A4EF051DD5C2D6681696D5C4066F26975738968507C8150C552E45747
-5DFE932665A46B236B3D7434798179BD7B4B7DCA82B983CC887F895F8B398FD1
-91D1541F92804E5D503653E5533A72D7739677E982E68EAF99C699C899D25177
-611A865E55B07A7A50765BD3904796854E326ADB91E75C515C48000000000000
-8C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-63987A9F6C9397748F617AAA718A96887C8268177E706851936C52F2541B85AB
-8A137FA48ECD90E15366888879414FC250BE521151445553572D73EA578B5951
-5F625F8460756176616761A963B2643A656C666F68426E1375667A3D7CFB7D4C
-7D997E4B7F6B830E834A86CD8A088A638B668EFD981A9D8F82B88FCE9BE80000
-5287621F64836FC09699684150916B206C7A6F547A747D5088408A2367084EF6
-503950265065517C5238526355A7570F58055ACC5EFA61B261F862F36372691C
-6A29727D72AC732E7814786F7D79770C80A9898B8B198CE28ED290639375967A
-98559A139E785143539F53B35E7B5F266E1B6E90738473FE7D4382378A008AFA
-96504E4E500B53E4547C56FA59D15B645DF15EAB5F276238654567AF6E5672D0
-7CCA88B480A180E183F0864E8A878DE8923796C798679F134E944E924F0D5348
-5449543E5A2F5F8C5FA1609F68A76A8E745A78818A9E8AA48B7791904E5E9BC9
-4EA44F7C4FAF501950165149516C529F52B952FE539A53E35411000000000000
-8D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-540E5589575157A2597D5B545B5D5B8F5DE55DE75DF75E785E835E9A5EB75F18
-6052614C629762D863A7653B6602664366F4676D6821689769CB6C5F6D2A6D69
-6E2F6E9D75327687786C7A3F7CE07D057D187D5E7DB18015800380AF80B18154
-818F822A8352884C88618B1B8CA28CFC90CA91759271783F92FC95A4964D0000
-980599999AD89D3B525B52AB53F7540858D562F76FE08C6A8F5F9EB9514B523B
-544A56FD7A4091779D609ED273446F09817075115FFD60DA9AA872DB8FBC6B64
-98034ECA56F0576458BE5A5A606861C7660F6606683968B16DF775D57D3A826E
-9B424E9B4F5053C955065D6F5DE65DEE67FB6C99747378028A50939688DF5750
-5EA7632B50B550AC518D670054C9585E59BB5BB05F69624D63A1683D6B736E08
-707D91C7728078157826796D658E7D3083DC88C18F09969B5264572867507F6A
-8CA151B45742962A583A698A80B454B25D0E57FC78959DFA4F5C524A548B643E
-6628671467F57A847B567D22932F685C9BAD7B395319518A5237000000000000
-8E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5BDF62F664AE64E6672D6BBA85A996D176909BD6634C93069BAB76BF66524E09
-509853C25C7160E864926563685F71E673CA75237B977E8286958B838CDB9178
-991065AC66AB6B8B4ED54ED44F3A4F7F523A53F853F255E356DB58EB59CB59C9
-59FF5B505C4D5E025E2B5FD7601D6307652F5B5C65AF65BD65E8679D6B620000
-6B7B6C0F7345794979C17CF87D197D2B80A2810281F389968A5E8A698A668A8C
-8AEE8CC78CDC96CC98FC6B6F4E8B4F3C4F8D51505B575BFA6148630166426B21
-6ECB6CBB723E74BD75D478C1793A800C803381EA84948F9E6C509E7F5F0F8B58
-9D2B7AFA8EF85B8D96EB4E0353F157F759315AC95BA460896E7F6F0675BE8CEA
-5B9F85007BE0507267F4829D5C61854A7E1E820E51995C0463688D66659C716E
-793E7D1780058B1D8ECA906E86C790AA501F52FA5C3A6753707C7235914C91C8
-932B82E55BC25F3160F94E3B53D65B88624B67316B8A72E973E07A2E816B8DA3
-91529996511253D7546A5BFF63886A397DAC970056DA53CE5468000000000000
-8F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5B975C315DDE4FEE610162FE6D3279C079CB7D427E4D7FD281ED821F84908846
-89728B908E748F2F9031914B916C96C6919C4EC04F4F514553415F93620E67D4
-6C416E0B73637E2691CD928353D459195BBF6DD1795D7E2E7C9B587E719F51FA
-88538FF04FCA5CFB662577AC7AE3821C99FF51C65FAA65EC696F6B896DF30000
-6E966F6476FE7D145DE190759187980651E6521D6240669166D96E1A5EB67DD2
-7F7266F885AF85F78AF852A953D959735E8F5F90605592E4966450B7511F52DD
-5320534753EC54E8554655315617596859BE5A3C5BB55C065C0F5C115C1A5E84
-5E8A5EE05F70627F628462DB638C63776607660C662D6676677E68A26A1F6A35
-6CBC6D886E096E58713C7126716775C77701785D7901796579F07AE07B117CA7
-7D39809683D6848B8549885D88F38A1F8A3C8A548A738C618CDE91A49266937E
-9418969C97984E0A4E084E1E4E575197527057CE583458CC5B225E3860C564FE
-676167566D4472B675737A6384B88B7291B89320563157F498FE000000000000
-90
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-62ED690D6B9671ED7E548077827289E698DF87558FB15C3B4F384FE14FB55507
-5A205BDD5BE95FC3614E632F65B0664B68EE699B6D786DF1753375B9771F795E
-79E67D3381E382AF85AA89AA8A3A8EAB8F9B903291DD97074EBA4EC152035875
-58EC5C0B751A5C3D814E8A0A8FC59663976D7B258ACF9808916256F353A80000
-9017543957825E2563A86C34708A77617C8B7FE088709042915493109318968F
-745E9AC45D075D69657067A28DA896DB636E6749691983C5981796C088FE6F84
-647A5BF84E16702C755D662F51C4523652E259D35F8160276210653F6574661F
-667468F268166B636E057272751F76DB7CBE805658F088FD897F8AA08A938ACB
-901D91929752975965897A0E810696BB5E2D60DC621A65A56614679077F37A4D
-7C4D7E3E810A8CAC8D648DE18E5F78A9520762D963A5644262988A2D7A837BC0
-8AAC96EA7D76820C87494ED95148534353605BA35C025C165DDD6226624764B0
-681368346CC96D456D1767D36F5C714E717D65CB7A7F7BAD7DDA000000000000
-91
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7E4A7FA8817A821B823985A68A6E8CCE8DF59078907792AD929195839BAE524D
-55846F387136516879857E5581B37CCE564C58515CA863AA66FE66FD695A72D9
-758F758E790E795679DF7C977D207D4486078A34963B90619F2050E7527553CC
-53E2500955AA58EE594F723D5B8B5C64531D60E360F3635C6383633F63BB0000
-64CD65E966F95DE369CD69FD6F1571E54E8975E976F87A937CDF7DCF7D9C8061
-83498358846C84BC85FB88C58D709001906D9397971C9A1250CF5897618E81D3
-85358D0890204FC3507452475373606F6349675F6E2C8DB3901F4FD75C5E8CCA
-65CF7D9A53528896517663C35B585B6B5C0A640D6751905C4ED6591A592A6C70
-8A51553E581559A560F0625367C182356955964099C49A284F5358065BFE8010
-5CB15E2F5F856020614B623466FF6CF06EDE80CE817F82D4888B8CB89000902E
-968A9EDB9BDB4EE353F059277B2C918D984C9DF96EDD7027535355445B856258
-629E62D36CA26FEF74228A1794386FC18AFE833851E786F853EA000000000000
-92
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-53E94F4690548FB0596A81315DFD7AEA8FBF68DA8C3772F89C486A3D8AB04E39
-53585606576662C563A265E66B4E6DE16E5B70AD77ED7AEF7BAA7DBB803D80C6
-86CB8A95935B56E358C75F3E65AD66966A806BB575378AC7502477E557305F1B
-6065667A6C6075F47A1A7F6E81F48718904599B37BC9755C7AF97B5184C40000
-901079E97A9283365AE177404E2D4EF25B995FE062BD663C67F16CE8866B8877
-8A3B914E92F399D06A177026732A82E784578CAF4E01514651CB558B5BF55E16
-5E335E815F145F355F6B5FB461F2631166A2671D6F6E7252753A773A80748139
-817887768ABF8ADC8D858DF3929A957798029CE552C5635776F467156C8873CD
-8CC393AE96736D25589C690E69CC8FFD939A75DB901A585A680263B469FB4F43
-6F2C67D88FBB85267DB49354693F6F70576A58F75B2C7D2C722A540A91E39DB4
-4EAD4F4E505C507552438C9E544858245B9A5E1D5E955EAD5EF75F1F608C62B5
-633A63D068AF6C407887798E7A0B7DE082478A028AE68E449013000000000000
-93
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-90B8912D91D89F0E6CE5645864E265756EF476847B1B906993D16EBA54F25FB9
-64A48F4D8FED92445178586B59295C555E976DFB7E8F751C8CBC8EE2985B70B9
-4F1D6BBF6FB1753096FB514E54105835585759AC5C605F926597675C6E21767B
-83DF8CED901490FD934D7825783A52AA5EA6571F597460125012515A51AC0000
-51CD520055105854585859575B955CF65D8B60BC6295642D6771684368BC68DF
-76D76DD86E6F6D9B706F71C85F5375D879777B497B547B527CD67D7152308463
-856985E48A0E8B048C468E0F9003900F94199676982D9A3095D850CD52D5540C
-58025C0E61A7649E6D1E77B37AE580F48404905392855CE09D07533F5F975FB3
-6D9C7279776379BF7BE46BD272EC8AAD68036A6151F87A8169345C4A9CF682EB
-5BC59149701E56785C6F60C765666C8C8C5A90419813545166C7920D594890A3
-51854E4D51EA85998B0E7058637A934B696299B47E047577535769608EDF96E3
-6C5D4E8C5C3C5F108FE953028CD1808986795EFF65E54E735165000000000000
-94
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59825C3F97EE4EFB598A5FCD8A8D6FE179B079625BE78471732B71B15E745FF5
-637B649A71C37C984E435EFC4E4B57DC56A260A96FC37D0D80FD813381BF8FB2
-899786A45DF4628A64AD898767776CE26D3E743678345A467F7582AD99AC4FF3
-5EC362DD63926557676F76C3724C80CC80BA8F29914D500D57F95A9268850000
-6973716472FD8CB758F28CE0966A9019877F79E477E784294F2F5265535A62CD
-67CF6CCA767D7B947C95823685848FEB66DD6F2072067E1B83AB99C19EA651FD
-7BB178727BB880877B486AE85E61808C75517560516B92626E8C767A91979AEA
-4F107F70629C7B4F95A59CE9567A585986E496BC4F345224534A53CD53DB5E06
-642C6591677F6C3E6C4E724872AF73ED75547E41822C85E98CA97BC491C67169
-981298EF633D6669756A76E478D0854386EE532A5351542659835E875F7C60B2
-6249627962AB65906BD46CCC75B276AE789179D87DCB7F7780A588AB8AB98CBB
-907F975E98DB6A0B7C3850995C3E5FAE67876BD8743577097F8E000000000000
-95
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9F3B67CA7A175339758B9AED5F66819D83F180985F3C5FC575627B46903C6867
-59EB5A9B7D10767E8B2C4FF55F6A6A196C376F0274E2796888688A558C795EDF
-63CF75C579D282D7932892F2849C86ED9C2D54C15F6C658C6D5C70158CA78CD3
-983B654F74F64E0D4ED857E0592B5A665BCC51A85E035E9C6016627665770000
-65A7666E6D6E72367B268150819A82998B5C8CA08CE68D74961C96444FAE64AB
-6B66821E8461856A90E85C01695398A8847A85574F0F526F5FA95E45670D798F
-8179890789866DF55F1762556CB84ECF72699B925206543B567458B361A4626E
-711A596E7C897CDE7D1B96F06587805E4E194F75517558405E635E735F0A67C4
-4E26853D9589965B7C73980150FB58C1765678A7522577A585117B86504F5909
-72477BC77DE88FBA8FD4904D4FBF52C95A295F0197AD4FDD821792EA57036355
-6B69752B88DC8F147A4252DF58936155620A66AE6BCD7C3F83E950234FF85305
-5446583159495B9D5CF05CEF5D295E9662B16367653E65B9670B000000000000
-96
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6CD56CE170F978327E2B80DE82B3840C84EC870289128A2A8C4A90A692D298FD
-9CF39D6C4E4F4EA1508D5256574A59A85E3D5FD85FD9623F66B4671B67D068D2
-51927D2180AA81A88B008C8C8CBF927E96325420982C531750D5535C58A864B2
-6734726777667A4691E652C36CA16B8658005E4C5954672C7FFB51E176C60000
-646978E89B549EBB57CB59B96627679A6BCE54E969D95E55819C67959BAA67FE
-9C52685D4EA64FE353C862B9672B6CAB8FC44FAD7E6D9EBF4E0761626E806F2B
-85135473672A9B455DF37B955CAC5BC6871C6E4A84D17A14810859997C8D6C11
-772052D959227121725F77DB97279D61690B5A7F5A1851A5540D547D660E76DF
-8FF792989CF459EA725D6EC5514D68C97DBF7DEC97629EBA64786A2183025984
-5B5F6BDB731B76F27DB280178499513267289ED976EE676252FF99055C24623B
-7C7E8CB0554F60B67D0B958053014E5F51B6591C723A803691CE5F2577E25384
-5F797D0485AC8A338E8D975667F385AE9453610961086CB9765200000000FF5E
-97
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8AED8F38552F4F51512A52C753CB5BA55E7D60A0618263D6670967DA6E676D8C
-733673377531795088D58A98904A909190F596C4878D59154E884F594E0E8A89
-8F3F981050AD5E7C59965BB95EB863DA63FA64C166DC694A69D86D0B6EB67194
-75287AAF7F8A8000844984C989818B218E0A9065967D990A617E62916B320000
-6C836D747FCC7FFC6DC07F8587BA88F8676583B1983C96F76D1B7D61843D916A
-4E7153755D506B046FEB85CD862D89A75229540F5C65674E68A87406748375E2
-88CF88E191CC96E296785F8B73877ACB844E63A0756552896D416E9C74097559
-786B7C9296867ADC9F8D4FB6616E65C5865C4E864EAE50DA4E2151CC5BEE6599
-68816DBC731F764277AD7A1C7CE7826F8AD2907C91CF96759818529B7DD1502B
-539867976DCB71D0743381E88F2A96A39C579E9F746058416D997D2F985E4EE4
-4F364F8B51B752B15DBA601C73B2793C82D3923496B796F6970A9E979F6266A6
-6B74521752A370C888C25EC9604B61906F2371497C3E7DF4806F000000000000
-98
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-84EE9023932C54429B6F6AD370898CC28DEF973252B45A415ECA5F046717697C
-69946D6A6F0F726272FC7BED8001807E874B90CE516D9E937984808B93328AD6
-502D548C8A716B6A8CC4810760D167A09DF24E994E989C108A6B85C185686900
-6E7E789781550000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000005F0C
-4E104E154E2A4E314E364E3C4E3F4E424E564E584E824E858C6B4E8A82125F0D
-4E8E4E9E4E9F4EA04EA24EB04EB34EB64ECE4ECD4EC44EC64EC24ED74EDE4EED
-4EDF4EF74F094F5A4F304F5B4F5D4F574F474F764F884F8F4F984F7B4F694F70
-4F914F6F4F864F9651184FD44FDF4FCE4FD84FDB4FD14FDA4FD04FE44FE5501A
-50285014502A502550054F1C4FF650215029502C4FFE4FEF5011500650435047
-6703505550505048505A5056506C50785080509A508550B450B2000000000000
-99
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-50C950CA50B350C250D650DE50E550ED50E350EE50F950F55109510151025116
-51155114511A5121513A5137513C513B513F51405152514C515451627AF85169
-516A516E5180518256D8518C5189518F519151935195519651A451A651A251A9
-51AA51AB51B351B151B251B051B551BD51C551C951DB51E0865551E951ED0000
-51F051F551FE5204520B5214520E5227522A522E52335239524F5244524B524C
-525E5254526A527452695273527F527D528D529452925271528852918FA88FA7
-52AC52AD52BC52B552C152CD52D752DE52E352E698ED52E052F352F552F852F9
-530653087538530D5310530F5315531A5323532F533153335338534053465345
-4E175349534D51D6535E5369536E5918537B53775382539653A053A653A553AE
-53B053B653C37C1296D953DF66FC71EE53EE53E853ED53FA5401543D5440542C
-542D543C542E54365429541D544E548F5475548E545F5471547754705492547B
-5480547654845490548654C754A254B854A554AC54C454C854A8000000000000
-9A
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-54AB54C254A454BE54BC54D854E554E6550F551454FD54EE54ED54FA54E25539
-55405563554C552E555C55455556555755385533555D5599558054AF558A559F
-557B557E5598559E55AE557C558355A9558755A855DA55C555DF55C455DC55E4
-55D4561455F7561655FE55FD561B55F9564E565071DF56345636563256380000
-566B5664562F566C566A56865680568A56A05694568F56A556AE56B656B456C2
-56BC56C156C356C056C856CE56D156D356D756EE56F9570056FF570457095708
-570B570D57135718571655C7571C572657375738574E573B5740574F576957C0
-57885761577F5789579357A057B357A457AA57B057C357C657D457D257D3580A
-57D657E3580B5819581D587258215862584B58706BC05852583D5879588558B9
-589F58AB58BA58DE58BB58B858AE58C558D358D158D758D958D858E558DC58E4
-58DF58EF58FA58F958FB58FC58FD5902590A5910591B68A65925592C592D5932
-5938593E7AD259555950594E595A5958596259605967596C5969000000000000
-9B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-59785981599D4F5E4FAB59A359B259C659E859DC598D59D959DA5A255A1F5A11
-5A1C5A095A1A5A405A6C5A495A355A365A625A6A5A9A5ABC5ABE5ACB5AC25ABD
-5AE35AD75AE65AE95AD65AFA5AFB5B0C5B0B5B165B325AD05B2A5B365B3E5B43
-5B455B405B515B555B5A5B5B5B655B695B705B735B755B7865885B7A5B800000
-5B835BA65BB85BC35BC75BC95BD45BD05BE45BE65BE25BDE5BE55BEB5BF05BF6
-5BF35C055C075C085C0D5C135C205C225C285C385C395C415C465C4E5C535C50
-5C4F5B715C6C5C6E4E625C765C795C8C5C915C94599B5CAB5CBB5CB65CBC5CB7
-5CC55CBE5CC75CD95CE95CFD5CFA5CED5D8C5CEA5D0B5D155D175D5C5D1F5D1B
-5D115D145D225D1A5D195D185D4C5D525D4E5D4B5D6C5D735D765D875D845D82
-5DA25D9D5DAC5DAE5DBD5D905DB75DBC5DC95DCD5DD35DD25DD65DDB5DEB5DF2
-5DF55E0B5E1A5E195E115E1B5E365E375E445E435E405E4E5E575E545E5F5E62
-5E645E475E755E765E7A9EBC5E7F5EA05EC15EC25EC85ED05ECF000000000000
-9C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-5ED65EE35EDD5EDA5EDB5EE25EE15EE85EE95EEC5EF15EF35EF05EF45EF85EFE
-5F035F095F5D5F5C5F0B5F115F165F295F2D5F385F415F485F4C5F4E5F2F5F51
-5F565F575F595F615F6D5F735F775F835F825F7F5F8A5F885F915F875F9E5F99
-5F985FA05FA85FAD5FBC5FD65FFB5FE45FF85FF15FDD60B35FFF602160600000
-601960106029600E6031601B6015602B6026600F603A605A6041606A6077605F
-604A6046604D6063604360646042606C606B60596081608D60E76083609A6084
-609B60966097609260A7608B60E160B860E060D360B45FF060BD60C660B560D8
-614D6115610660F660F7610060F460FA6103612160FB60F1610D610E6147613E
-61286127614A613F613C612C6134613D614261446173617761586159615A616B
-6174616F61656171615F615D6153617561996196618761AC6194619A618A6191
-61AB61AE61CC61CA61C961F761C861C361C661BA61CB7F7961CD61E661E361F6
-61FA61F461FF61FD61FC61FE620062086209620D620C6214621B000000000000
-9D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-621E6221622A622E6230623262336241624E625E6263625B62606268627C6282
-6289627E62926293629662D46283629462D762D162BB62CF62FF62C664D462C8
-62DC62CC62CA62C262C7629B62C9630C62EE62F163276302630862EF62F56350
-633E634D641C634F6396638E638063AB637663A3638F6389639F63B5636B0000
-636963BE63E963C063C663E363C963D263F663C4641664346406641364266436
-651D64176428640F6467646F6476644E652A6495649364A564A9648864BC64DA
-64D264C564C764BB64D864C264F164E7820964E064E162AC64E364EF652C64F6
-64F464F264FA650064FD6518651C650565246523652B65346535653765366538
-754B654865566555654D6558655E655D65726578658265838B8A659B659F65AB
-65B765C365C665C165C465CC65D265DB65D965E065E165F16772660A660365FB
-6773663566366634661C664F664466496641665E665D666466676668665F6662
-667066836688668E668966846698669D66C166B966C966BE66BC000000000000
-9E
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-66C466B866D666DA66E0663F66E666E966F066F566F7670F6716671E67266727
-9738672E673F67366741673867376746675E67606759676367646789677067A9
-677C676A678C678B67A667A1678567B767EF67B467EC67B367E967B867E467DE
-67DD67E267EE67B967CE67C667E76A9C681E684668296840684D6832684E0000
-68B3682B685968636877687F689F688F68AD6894689D689B68836AAE68B96874
-68B568A068BA690F688D687E690168CA690868D86922692668E1690C68CD68D4
-68E768D569366912690468D768E3692568F968E068EF6928692A691A69236921
-68C669796977695C6978696B6954697E696E69396974693D695969306961695E
-695D6981696A69B269AE69D069BF69C169D369BE69CE5BE869CA69DD69BB69C3
-69A76A2E699169A0699C699569B469DE69E86A026A1B69FF6B0A69F969F269E7
-6A0569B16A1E69ED6A1469EB6A0A6A126AC16A236A136A446A0C6A726A366A78
-6A476A626A596A666A486A386A226A906A8D6AA06A846AA26AA3000000000000
-9F
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6A9786176ABB6AC36AC26AB86AB36AAC6ADE6AD16ADF6AAA6ADA6AEA6AFB6B05
-86166AFA6B126B169B316B1F6B386B3776DC6B3998EE6B476B436B496B506B59
-6B546B5B6B5F6B616B786B796B7F6B806B846B836B8D6B986B956B9E6BA46BAA
-6BAB6BAF6BB26BB16BB36BB76BBC6BC66BCB6BD36BDF6BEC6BEB6BF36BEF0000
-9EBE6C086C136C146C1B6C246C236C5E6C556C626C6A6C826C8D6C9A6C816C9B
-6C7E6C686C736C926C906CC46CF16CD36CBD6CD76CC56CDD6CAE6CB16CBE6CBA
-6CDB6CEF6CD96CEA6D1F884D6D366D2B6D3D6D386D196D356D336D126D0C6D63
-6D936D646D5A6D796D596D8E6D956FE46D856DF96E156E0A6DB56DC76DE66DB8
-6DC66DEC6DDE6DCC6DE86DD26DC56DFA6DD96DE46DD56DEA6DEE6E2D6E6E6E2E
-6E196E726E5F6E3E6E236E6B6E2B6E766E4D6E1F6E436E3A6E4E6E246EFF6E1D
-6E386E826EAA6E986EC96EB76ED36EBD6EAF6EC46EB26ED46ED56E8F6EA56EC2
-6E9F6F416F11704C6EEC6EF86EFE6F3F6EF26F316EEF6F326ECC000000000000
-E0
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-6F3E6F136EF76F866F7A6F786F816F806F6F6F5B6FF36F6D6F826F7C6F586F8E
-6F916FC26F666FB36FA36FA16FA46FB96FC66FAA6FDF6FD56FEC6FD46FD86FF1
-6FEE6FDB7009700B6FFA70117001700F6FFE701B701A6F74701D7018701F7030
-703E7032705170637099709270AF70F170AC70B870B370AE70DF70CB70DD0000
-70D9710970FD711C711971657155718871667162714C7156716C718F71FB7184
-719571A871AC71D771B971BE71D271C971D471CE71E071EC71E771F571FC71F9
-71FF720D7210721B7228722D722C72307232723B723C723F72407246724B7258
-7274727E7282728172877292729672A272A772B972B272C372C672C472CE72D2
-72E272E072E172F972F7500F7317730A731C7316731D7334732F73297325733E
-734E734F9ED87357736A7368737073787375737B737A73C873B373CE73BB73C0
-73E573EE73DE74A27405746F742573F87432743A7455743F745F74597441745C
-746974707463746A7476747E748B749E74A774CA74CF74D473F1000000000000
-E1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-74E074E374E774E974EE74F274F074F174F874F7750475037505750C750E750D
-75157513751E7526752C753C7544754D754A7549755B7546755A756975647567
-756B756D75787576758675877574758A758975827594759A759D75A575A375C2
-75B375C375B575BD75B875BC75B175CD75CA75D275D975E375DE75FE75FF0000
-75FC760175F075FA75F275F3760B760D7609761F762776207621762276247634
-7630763B764776487646765C76587661766276687669766A7667766C76707672
-76767678767C768076837688768B768E769676937699769A76B076B476B876B9
-76BA76C276CD76D676D276DE76E176E576E776EA862F76FB7708770777047729
-7724771E77257726771B773777387747775A7768776B775B7765777F777E7779
-778E778B779177A0779E77B077B677B977BF77BC77BD77BB77C777CD77D777DA
-77DC77E377EE77FC780C781279267820792A7845788E78747886787C789A788C
-78A378B578AA78AF78D178C678CB78D478BE78BC78C578CA78EC000000000000
-E2
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-78E778DA78FD78F47907791279117919792C792B794079607957795F795A7955
-7953797A797F798A799D79A79F4B79AA79AE79B379B979BA79C979D579E779EC
-79E179E37A087A0D7A187A197A207A1F79807A317A3B7A3E7A377A437A577A49
-7A617A627A699F9D7A707A797A7D7A887A977A957A987A967AA97AC87AB00000
-7AB67AC57AC47ABF90837AC77ACA7ACD7ACF7AD57AD37AD97ADA7ADD7AE17AE2
-7AE67AED7AF07B027B0F7B0A7B067B337B187B197B1E7B357B287B367B507B7A
-7B047B4D7B0B7B4C7B457B757B657B747B677B707B717B6C7B6E7B9D7B987B9F
-7B8D7B9C7B9A7B8B7B927B8F7B5D7B997BCB7BC17BCC7BCF7BB47BC67BDD7BE9
-7C117C147BE67BE57C607C007C077C137BF37BF77C177C0D7BF67C237C277C2A
-7C1F7C377C2B7C3D7C4C7C437C547C4F7C407C507C587C5F7C647C567C657C6C
-7C757C837C907CA47CAD7CA27CAB7CA17CA87CB37CB27CB17CAE7CB97CBD7CC0
-7CC57CC27CD87CD27CDC7CE29B3B7CEF7CF27CF47CF67CFA7D06000000000000
-E3
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-7D027D1C7D157D0A7D457D4B7D2E7D327D3F7D357D467D737D567D4E7D727D68
-7D6E7D4F7D637D937D897D5B7D8F7D7D7D9B7DBA7DAE7DA37DB57DC77DBD7DAB
-7E3D7DA27DAF7DDC7DB87D9F7DB07DD87DDD7DE47DDE7DFB7DF27DE17E057E0A
-7E237E217E127E317E1F7E097E0B7E227E467E667E3B7E357E397E437E370000
-7E327E3A7E677E5D7E567E5E7E597E5A7E797E6A7E697E7C7E7B7E837DD57E7D
-8FAE7E7F7E887E897E8C7E927E907E937E947E967E8E7E9B7E9C7F387F3A7F45
-7F4C7F4D7F4E7F507F517F557F547F587F5F7F607F687F697F677F787F827F86
-7F837F887F877F8C7F947F9E7F9D7F9A7FA37FAF7FB27FB97FAE7FB67FB88B71
-7FC57FC67FCA7FD57FD47FE17FE67FE97FF37FF998DC80068004800B80128018
-8019801C80218028803F803B804A804680528058805A805F8062806880738072
-807080768079807D807F808480868085809B8093809A80AD519080AC80DB80E5
-80D980DD80C480DA80D6810980EF80F1811B81298123812F814B000000000000
-E4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-968B8146813E8153815180FC8171816E81658166817481838188818A81808182
-81A0819581A481A3815F819381A981B081B581BE81B881BD81C081C281BA81C9
-81CD81D181D981D881C881DA81DF81E081E781FA81FB81FE8201820282058207
-820A820D821082168229822B82388233824082598258825D825A825F82640000
-82628268826A826B822E827182778278827E828D829282AB829F82BB82AC82E1
-82E382DF82D282F482F382FA8393830382FB82F982DE830682DC830982D98335
-83348316833283318340833983508345832F832B831783188385839A83AA839F
-83A283968323838E8387838A837C83B58373837583A0838983A883F4841383EB
-83CE83FD840383D8840B83C183F7840783E083F2840D8422842083BD84388506
-83FB846D842A843C855A84848477846B84AD846E848284698446842C846F8479
-843584CA846284B984BF849F84D984CD84BB84DA84D084C184C684D684A18521
-84FF84F485178518852C851F8515851484FC8540856385588548000000000000
-E5
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-85418602854B8555858085A485888591858A85A8856D8594859B85EA8587859C
-8577857E859085C985BA85CF85B985D085D585DD85E585DC85F9860A8613860B
-85FE85FA86068622861A8630863F864D4E558654865F86678671869386A386A9
-86AA868B868C86B686AF86C486C686B086C9882386AB86D486DE86E986EC0000
-86DF86DB86EF8712870687088700870386FB87118709870D86F9870A8734873F
-8737873B87258729871A8760875F8778874C874E877487578768876E87598753
-8763876A880587A2879F878287AF87CB87BD87C087D096D687AB87C487B387C7
-87C687BB87EF87F287E0880F880D87FE87F687F7880E87D28811881688158822
-88218831883688398827883B8844884288528859885E8862886B8881887E889E
-8875887D88B5887288828897889288AE889988A2888D88A488B088BF88B188C3
-88C488D488D888D988DD88F9890288FC88F488E888F28904890C890A89138943
-891E8925892A892B89418944893B89368938894C891D8960895E000000000000
-E6
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-89668964896D896A896F89748977897E89838988898A8993899889A189A989A6
-89AC89AF89B289BA89BD89BF89C089DA89DC89DD89E789F489F88A038A168A10
-8A0C8A1B8A1D8A258A368A418A5B8A528A468A488A7C8A6D8A6C8A628A858A82
-8A848AA88AA18A918AA58AA68A9A8AA38AC48ACD8AC28ADA8AEB8AF38AE70000
-8AE48AF18B148AE08AE28AF78ADE8ADB8B0C8B078B1A8AE18B168B108B178B20
-8B3397AB8B268B2B8B3E8B288B418B4C8B4F8B4E8B498B568B5B8B5A8B6B8B5F
-8B6C8B6F8B748B7D8B808B8C8B8E8B928B938B968B998B9A8C3A8C418C3F8C48
-8C4C8C4E8C508C558C628C6C8C788C7A8C828C898C858C8A8C8D8C8E8C948C7C
-8C98621D8CAD8CAA8CBD8CB28CB38CAE8CB68CC88CC18CE48CE38CDA8CFD8CFA
-8CFB8D048D058D0A8D078D0F8D0D8D109F4E8D138CCD8D148D168D678D6D8D71
-8D738D818D998DC28DBE8DBA8DCF8DDA8DD68DCC8DDB8DCB8DEA8DEB8DDF8DE3
-8DFC8E088E098DFF8E1D8E1E8E108E1F8E428E358E308E348E4A000000000000
-E7
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-8E478E498E4C8E508E488E598E648E608E2A8E638E558E768E728E7C8E818E87
-8E858E848E8B8E8A8E938E918E948E998EAA8EA18EAC8EB08EC68EB18EBE8EC5
-8EC88ECB8EDB8EE38EFC8EFB8EEB8EFE8F0A8F058F158F128F198F138F1C8F1F
-8F1B8F0C8F268F338F3B8F398F458F428F3E8F4C8F498F468F4E8F578F5C0000
-8F628F638F648F9C8F9F8FA38FAD8FAF8FB78FDA8FE58FE28FEA8FEF90878FF4
-90058FF98FFA901190159021900D901E9016900B90279036903590398FF8904F
-905090519052900E9049903E90569058905E9068906F907696A890729082907D
-90819080908A9089908F90A890AF90B190B590E290E4624890DB910291129119
-91329130914A9156915891639165916991739172918B9189918291A291AB91AF
-91AA91B591B491BA91C091C191C991CB91D091D691DF91E191DB91FC91F591F6
-921E91FF9214922C92159211925E925792459249926492489295923F924B9250
-929C92969293929B925A92CF92B992B792E9930F92FA9344932E000000000000
-E8
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-93199322931A9323933A9335933B935C9360937C936E935693B093AC93AD9394
-93B993D693D793E893E593D893C393DD93D093C893E4941A9414941394039407
-94109436942B94359421943A944194529444945B94609462945E946A92299470
-94759477947D945A947C947E9481947F95829587958A95949596959895990000
-95A095A895A795AD95BC95BB95B995BE95CA6FF695C395CD95CC95D595D495D6
-95DC95E195E595E296219628962E962F9642964C964F964B9677965C965E965D
-965F96669672966C968D96989695969796AA96A796B196B296B096B496B696B8
-96B996CE96CB96C996CD894D96DC970D96D596F99704970697089713970E9711
-970F971697199724972A97309739973D973E97449746974897429749975C9760
-97649766976852D2976B977197799785977C9781977A9786978B978F9790979C
-97A897A697A397B397B497C397C697C897CB97DC97ED9F4F97F27ADF97F697F5
-980F980C9838982498219837983D9846984F984B986B986F9870000000000000
-E9
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-98719874987398AA98AF98B198B698C498C398C698E998EB9903990999129914
-99189921991D991E99249920992C992E993D993E9942994999459950994B9951
-9952994C99559997999899A599AD99AE99BC99DF99DB99DD99D899D199ED99EE
-99F199F299FB99F89A019A0F9A0599E29A199A2B9A379A459A429A409A430000
-9A3E9A559A4D9A5B9A579A5F9A629A659A649A699A6B9A6A9AAD9AB09ABC9AC0
-9ACF9AD19AD39AD49ADE9ADF9AE29AE39AE69AEF9AEB9AEE9AF49AF19AF79AFB
-9B069B189B1A9B1F9B229B239B259B279B289B299B2A9B2E9B2F9B329B449B43
-9B4F9B4D9B4E9B519B589B749B939B839B919B969B979B9F9BA09BA89BB49BC0
-9BCA9BB99BC69BCF9BD19BD29BE39BE29BE49BD49BE19C3A9BF29BF19BF09C15
-9C149C099C139C0C9C069C089C129C0A9C049C2E9C1B9C259C249C219C309C47
-9C329C469C3E9C5A9C609C679C769C789CE79CEC9CF09D099D089CEB9D039D06
-9D2A9D269DAF9D239D1F9D449D159D129D419D3F9D3E9D469D48000000000000
-EA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-9D5D9D5E9D649D519D509D599D729D899D879DAB9D6F9D7A9D9A9DA49DA99DB2
-9DC49DC19DBB9DB89DBA9DC69DCF9DC29DD99DD39DF89DE69DED9DEF9DFD9E1A
-9E1B9E1E9E759E799E7D9E819E889E8B9E8C9E929E959E919E9D9EA59EA99EB8
-9EAA9EAD97619ECC9ECE9ECF9ED09ED49EDC9EDE9EDD9EE09EE59EE89EEF0000
-9EF49EF69EF79EF99EFB9EFC9EFD9F079F0876B79F159F219F2C9F3E9F4A9F52
-9F549F639F5F9F609F619F669F679F6C9F6A9F779F729F769F959F9C9FA0582F
-69C79059746451DC719900000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
diff --git a/library/encoding/symbol.enc b/library/encoding/symbol.enc
deleted file mode 100644
index ffda9e3..0000000
--- a/library/encoding/symbol.enc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Encoding file: symbol, single-byte
-S
-003F 1 1
-00
-0000000100020003000400050006000700080009000A000B000C000D000E000F
-0010001100120013001400150016001700180019001A001B001C001D001E001F
-0020002122000023220300250026220D002800292217002B002C2212002E002F
-0030003100320033003400350036003700380039003A003B003C003D003E003F
-22450391039203A70394039503A603930397039903D1039A039B039C039D039F
-03A0039803A103A303A403A503C203A9039E03A80396005B2234005D22A5005F
-F8E503B103B203C703B403B503C603B303B703B903D503BA03BB03BC03BD03BF
-03C003B803C103C303C403C503D603C903BE03C803B6007B007C007D223C007F
-0080008100820083008400850086008700880089008A008B008C008D008E008F
-0090009100920093009400950096009700980099009A009B009C009D009E009F
-000003D2203222642044221E0192266326662665266021942190219121922193
-00B000B12033226500D7221D2202202200F72260226122482026F8E6F8E721B5
-21352111211C21182297229522052229222A2283228722842282228622082209
-2220220700AE00A92122220F221A22C500AC2227222821D421D021D121D221D3
-22C42329F8E8F8E9F8EA2211F8EBF8ECF8EDF8EEF8EFF8F0F8F1F8F2F8F3F8F4
-F8FF232A222B2320F8F52321F8F6F8F7F8F8F8F9F8FAF8FBF8FCF8FDF8FE0000
diff --git a/library/history.tcl b/library/history.tcl
deleted file mode 100644
index a3bfb85..0000000
--- a/library/history.tcl
+++ /dev/null
@@ -1,369 +0,0 @@
-# history.tcl --
-#
-# Implementation of the history command.
-#
-# RCS: @(#) $Id: history.tcl,v 1.3 1998/09/14 18:40:03 stanton Exp $
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# The tcl::history array holds the history list and
-# some additional bookkeeping variables.
-#
-# nextid	the index used for the next history list item.
-# keep		the max size of the history list
-# oldest	the index of the oldest item in the history.
-
-namespace eval tcl {
-    variable history
-    if {![info exists history]} {
-	array set history {
-	    nextid	0
-	    keep	20
-	    oldest	-20
-	}
-    }
-}
-
-# history --
-#
-#	This is the main history command.  See the man page for its interface.
-#	This does argument checking and calls helper procedures in the
-#	history namespace.
-
-proc history {args} {
-    set len [llength $args]
-    if {$len == 0} {
-	return [tcl::HistInfo]
-    }
-    set key [lindex $args 0]
-    set options "add, change, clear, event, info, keep, nextid, or redo"
-    switch -glob -- $key {
-	a* { # history add
-
-	    if {$len > 3} {
-		return -code error "wrong # args: should be \"history add event ?exec?\""
-	    }
-	    if {![string match $key* add]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    if {$len == 3} {
-		set arg [lindex $args 2]
-		if {! ([string match e* $arg] && [string match $arg* exec])} {
-		    return -code error "bad argument \"$arg\": should be \"exec\""
-		}
-	    }
-	    return [tcl::HistAdd [lindex $args 1] [lindex $args 2]]
-	}
-	ch* { # history change
-
-	    if {($len > 3) || ($len < 2)} {
-		return -code error "wrong # args: should be \"history change newValue ?event?\""
-	    }
-	    if {![string match $key* change]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    if {$len == 2} {
-		set event 0
-	    } else {
-		set event [lindex $args 2]
-	    }
-
-	    return [tcl::HistChange [lindex $args 1] $event]
-	}
-	cl* { # history clear
-
-	    if {($len > 1)} {
-		return -code error "wrong # args: should be \"history clear\""
-	    }
-	    if {![string match $key* clear]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    return [tcl::HistClear]
-	}
-	e* { # history event
-
-	    if {$len > 2} {
-		return -code error "wrong # args: should be \"history event ?event?\""
-	    }
-	    if {![string match $key* event]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    if {$len == 1} {
-		set event -1
-	    } else {
-		set event [lindex $args 1]
-	    }
-	    return [tcl::HistEvent $event]
-	}
-	i* { # history info
-
-	    if {$len > 2} {
-		return -code error "wrong # args: should be \"history info ?count?\""
-	    }
-	    if {![string match $key* info]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    return [tcl::HistInfo [lindex $args 1]]
-	}
-	k* { # history keep
-
-	    if {$len > 2} {
-		return -code error "wrong # args: should be \"history keep ?count?\""
-	    }
-	    if {$len == 1} {
-		return [tcl::HistKeep]
-	    } else {
-		set limit [lindex $args 1]
-		if {[catch {expr {~$limit}}] || ($limit < 0)} {
-		    return -code error "illegal keep count \"$limit\""
-		}
-		return [tcl::HistKeep $limit]
-	    }
-	}
-	n* { # history nextid
-
-	    if {$len > 1} {
-		return -code error "wrong # args: should be \"history nextid\""
-	    }
-	    if {![string match $key* nextid]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    return [expr {$tcl::history(nextid) + 1}]
-	}
-	r* { # history redo
-
-	    if {$len > 2} {
-		return -code error "wrong # args: should be \"history redo ?event?\""
-	    }
-	    if {![string match $key* redo]} {
-		return -code error "bad option \"$key\": must be $options"
-	    }
-	    return [tcl::HistRedo [lindex $args 1]]
-	}
-	default {
-	    return -code error "bad option \"$key\": must be $options"
-	}
-    }
-}
-
-# tcl::HistAdd --
-#
-#	Add an item to the history, and optionally eval it at the global scope
-#
-# Parameters:
-#	command		the command to add
-#	exec		(optional) a substring of "exec" causes the
-#			command to be evaled.
-# Results:
-# 	If executing, then the results of the command are returned
-#
-# Side Effects:
-#	Adds to the history list
-
- proc tcl::HistAdd {command {exec {}}} {
-    variable history
-    set i [incr history(nextid)]
-    set history($i) $command
-    set j [incr history(oldest)]
-    if {[info exists history($j)]} {unset history($j)}
-    if {[string match e* $exec]} {
-	return [uplevel #0 $command]
-    } else {
-	return {}
-    }
-}
-
-# tcl::HistKeep --
-#
-#	Set or query the limit on the length of the history list
-#
-# Parameters:
-#	limit	(optional) the length of the history list
-#
-# Results:
-#	If no limit is specified, the current limit is returned
-#
-# Side Effects:
-#	Updates history(keep) if a limit is specified
-
- proc tcl::HistKeep {{limit {}}} {
-    variable history
-    if {[string length $limit] == 0} {
-	return $history(keep)
-    } else {
-	set oldold $history(oldest)
-	set history(oldest) [expr {$history(nextid) - $limit}]
-	for {} {$oldold <= $history(oldest)} {incr oldold} {
-	    if {[info exists history($oldold)]} {unset history($oldold)}
-	}
-	set history(keep) $limit
-    }
-}
-
-# tcl::HistClear --
-#
-#	Erase the history list
-#
-# Parameters:
-#	none
-#
-# Results:
-#	none
-#
-# Side Effects:
-#	Resets the history array, except for the keep limit
-
- proc tcl::HistClear {} {
-    variable history
-    set keep $history(keep)
-    unset history
-    array set history [list \
-	nextid	0	\
-	keep	$keep	\
-	oldest	-$keep	\
-    ]
-}
-
-# tcl::HistInfo --
-#
-#	Return a pretty-printed version of the history list
-#
-# Parameters:
-#	num	(optional) the length of the history list to return
-#
-# Results:
-#	A formatted history list
-
- proc tcl::HistInfo {{num {}}} {
-    variable history
-    if {$num == {}} {
-	set num [expr {$history(keep) + 1}]
-    }
-    set result {}
-    set newline ""
-    for {set i [expr {$history(nextid) - $num + 1}]} \
-	    {$i <= $history(nextid)} {incr i} {
-	if {![info exists history($i)]} {
-	    continue
-	}
-	set cmd [string trimright $history($i) \ \n]
-	regsub -all \n $cmd "\n\t" cmd
-	append result $newline[format "%6d  %s" $i $cmd]
-	set newline \n
-    }
-    return $result
-}
-
-# tcl::HistRedo --
-#
-#	Fetch the previous or specified event, execute it, and then
-#	replace the current history item with that event.
-#
-# Parameters:
-#	event	(optional) index of history item to redo.  Defaults to -1,
-#		which means the previous event.
-#
-# Results:
-#	Those of the command being redone.
-#
-# Side Effects:
-#	Replaces the current history list item with the one being redone.
-
- proc tcl::HistRedo {{event -1}} {
-    variable history
-    if {[string length $event] == 0} {
-	set event -1
-    }
-    set i [HistIndex $event]
-    if {$i == $history(nextid)} {
-	return -code error "cannot redo the current event"
-    }
-    set cmd $history($i)
-    HistChange $cmd 0
-    uplevel #0 $cmd
-}
-
-# tcl::HistIndex --
-#
-#	Map from an event specifier to an index in the history list.
-#
-# Parameters:
-#	event	index of history item to redo.
-#		If this is a positive number, it is used directly.
-#		If it is a negative number, then it counts back to a previous
-#		event, where -1 is the most recent event.
-#		A string can be matched, either by being the prefix of
-#		a command or by matching a command with string match.
-#
-# Results:
-#	The index into history, or an error if the index didn't match.
-
- proc tcl::HistIndex {event} {
-    variable history
-    if {[catch {expr {~$event}}]} {
-	for {set i $history(nextid)} {[info exists history($i)]} {incr i -1} {
-	    if {[string match $event* $history($i)]} {
-		return $i;
-	    }
-	    if {[string match $event $history($i)]} {
-		return $i;
-	    }
-	}
-	return -code error "no event matches \"$event\""
-    } elseif {$event <= 0} {
-	set i [expr {$history(nextid) + $event}]
-    } else {
-	set i $event
-    }
-    if {$i <= $history(oldest)} {
-	return -code error "event \"$event\" is too far in the past"
-    }
-    if {$i > $history(nextid)} {
-	return -code error "event \"$event\" hasn't occured yet"
-    }
-    return $i
-}
-
-# tcl::HistEvent --
-#
-#	Map from an event specifier to the value in the history list.
-#
-# Parameters:
-#	event	index of history item to redo.  See index for a
-#		description of possible event patterns.
-#
-# Results:
-#	The value from the history list.
-
- proc tcl::HistEvent {event} {
-    variable history
-    set i [HistIndex $event]
-    if {[info exists history($i)]} {
-	return [string trimright $history($i) \ \n]
-    } else {
-	return "";
-    }
-}
-
-# tcl::HistChange --
-#
-#	Replace a value in the history list.
-#
-# Parameters:
-#	cmd	The new value to put into the history list.
-#	event	(optional) index of history item to redo.  See index for a
-#		description of possible event patterns.  This defaults
-#		to 0, which specifies the current event.
-#
-# Side Effects:
-#	Changes the history list.
-
- proc tcl::HistChange {cmd {event 0}} {
-    variable history
-    set i [HistIndex $event]
-    set history($i) $cmd
-}
diff --git a/library/http/http.tcl b/library/http/http.tcl
deleted file mode 100644
index 6ad16df..0000000
--- a/library/http/http.tcl
+++ /dev/null
@@ -1,466 +0,0 @@
-# http.tcl --
-#
-#	Client-side HTTP for GET, POST, and HEAD commands.
-#	These routines can be used in untrusted code that uses 
-#	the Safesock security policy.  These procedures use a 
-#	callback interface to avoid using vwait, which is not 
-#	defined in the safe base.
-#
-# See the file "license.terms" for information on usage and
-# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: http.tcl,v 1.5 1999/02/02 22:28:30 stanton Exp $
-
-package provide http 2.0	;# This uses Tcl namespaces
-
-namespace eval http {
-    variable http
-
-    array set http {
-	-accept */*
-	-proxyhost {}
-	-proxyport {}
-	-useragent {Tcl http client package 2.0}
-	-proxyfilter http::ProxyRequired
-    }
-
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-
-    for {set i 1} {$i <= 256} {incr i} {
-	set c [format %c $i]
-	if {![string match \[$alphanumeric\] $c]} {
-	    set formMap($c) %[format %.2x $i]
-	}
-    }
-    # These are handled specially
-    array set formMap {
-	" " +   \n %0d%0a
-    }
-
-    namespace export geturl config reset wait formatQuery 
-    # Useful, but not exported: data size status code
-}
-
-# http::config --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	args		Options parsed by the procedure.
-# Results:
-#        TODO
-
-proc http::config {args} {
-    variable http
-    set options [lsort [array names http -*]]
-    set usage [join $options ", "]
-    if {[llength $args] == 0} {
-	set result {}
-	foreach name $options {
-	    lappend result $name $http($name)
-	}
-	return $result
-    }
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    if {[llength $args] == 1} {
-	set flag [lindex $args 0]
-	if {[regexp -- $pat $flag]} {
-	    return $http($flag)
-	} else {
-	    return -code error "Unknown option $flag, must be: $usage"
-	}
-    } else {
-	foreach {flag value} $args {
-	    if {[regexp -- $pat $flag]} {
-		set http($flag) $value
-	    } else {
-		return -code error "Unknown option $flag, must be: $usage"
-	    }
-	}
-    }
-}
-
- proc http::Finish { token {errormsg ""} } {
-    variable $token
-    upvar 0 $token state
-    global errorInfo errorCode
-    if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
-	set state(status) error
-    }
-    catch {close $state(sock)}
-    catch {after cancel $state(after)}
-    if {[info exists state(-command)]} {
-	if {[catch {eval $state(-command) {$token}} err]} {
-	    if {[string length $errormsg] == 0} {
-		set state(error) [list $err $errorInfo $errorCode]
-		set state(status) error
-	    }
-	}
-	if {[info exist state(-command)]} {
-	    # Command callback may already have unset our state
-	    unset state(-command)
-	}
-    }
-}
-
-# http::reset --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-#	why	Status info.
-# Results:
-#        TODO
-
-proc http::reset { token {why reset} } {
-    variable $token
-    upvar 0 $token state
-    set state(status) $why
-    catch {fileevent $state(sock) readable {}}
-    Finish $token
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-}
-
-# http::geturl --
-#
-#	Establishes a connection to a remote url via http.
-#
-# Arguments:
-#        url		The http URL to goget.
-#        args		Option value pairs. Valid options include:
-#				-blocksize, -validate, -headers, -timeout
-# Results:
-#        Returns a token for this connection.
-
-
-proc http::geturl { url args } {
-    variable http
-    if {![info exists http(uid)]} {
-	set http(uid) 0
-    }
-    set token [namespace current]::[incr http(uid)]
-    variable $token
-    upvar 0 $token state
-    reset $token
-    array set state {
-	-blocksize 	8192
-	-validate 	0
-	-headers 	{}
-	-timeout 	0
-	state		header
-	meta		{}
-	currentsize	0
-	totalsize	0
-        type            text/html
-        body            {}
-	status		""
-    }
-    set options {-blocksize -channel -command -handler -headers \
-		-progress -query -validate -timeout}
-    set usage [join $options ", "]
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    foreach {flag value} $args {
-	if {[regexp $pat $flag]} {
-	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [regexp {^[0-9]+$} $state($flag)] && \
-		    ![regexp {^[0-9]+$} $value]} {
-		return -code error "Bad value for $flag ($value), must be integer"
-	    }
-	    set state($flag) $value
-	} else {
-	    return -code error "Unknown option $flag, can be: $usage"
-	}
-    }
-    if {! [regexp -nocase {^(http://)?([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-	    x proto host y port srvurl]} {
-	error "Unsupported URL: $url"
-    }
-    if {[string length $port] == 0} {
-	set port 80
-    }
-    if {[string length $srvurl] == 0} {
-	set srvurl /
-    }
-    if {[string length $proto] == 0} {
-	set url http://$url
-    }
-    set state(url) $url
-    if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
-    }
-    if {$state(-timeout) > 0} {
-	set state(after) [after $state(-timeout) [list http::reset $token timeout]]
-    }
-    if {[info exists phost] && [string length $phost]} {
-	set srvurl $url
-	set s [socket $phost $pport]
-    } else {
-	set s [socket $host $port]
-    }
-    set state(sock) $s
-
-    # Send data in cr-lf format, but accept any line terminators
-
-    fconfigure $s -translation {auto crlf} -buffersize $state(-blocksize)
-
-    # The following is disallowed in safe interpreters, but the socket
-    # is already in non-blocking mode in that case.
-
-    catch {fconfigure $s -blocking off}
-    set len 0
-    set how GET
-    if {[info exists state(-query)]} {
-	set len [string length $state(-query)]
-	if {$len > 0} {
-	    set how POST
-	}
-    } elseif {$state(-validate)} {
-	set how HEAD
-    }
-    puts $s "$how $srvurl HTTP/1.0"
-    puts $s "Accept: $http(-accept)"
-    puts $s "Host: $host"
-    puts $s "User-Agent: $http(-useragent)"
-    foreach {key value} $state(-headers) {
-	regsub -all \[\n\r\]  $value {} value
-	set key [string trim $key]
-	if {[string length $key]} {
-	    puts $s "$key: $value"
-	}
-    }
-    if {$len > 0} {
-	puts $s "Content-Length: $len"
-	puts $s "Content-Type: application/x-www-form-urlencoded"
-	puts $s ""
-	fconfigure $s -translation {auto binary}
-	puts $s $state(-query)
-    } else {
-	puts $s ""
-    }
-    flush $s
-    fileevent $s readable [list http::Event $token]
-    if {! [info exists state(-command)]} {
-	wait $token
-    }
-    return $token
-}
-
-# Data access functions:
-# Data - the URL data
-# Status - the transaction status: ok, reset, eof, timeout
-# Code - the HTTP transaction code, e.g., 200
-# Size - the size of the URL data
-
-proc http::data {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(body)
-}
-proc http::status {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(status)
-}
-proc http::code {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(http)
-}
-proc http::size {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(currentsize)
-}
-
- proc http::Event {token} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-
-     if {[::eof $s]} {
-	Eof $token
-	return
-    }
-    if {$state(state) == "header"} {
-	set n [gets $s line]
-	if {$n == 0} {
-	    set state(state) body
-	    if {![regexp -nocase ^text $state(type)]} {
-		# Turn off conversions for non-text data
-		fconfigure $s -translation binary
-		if {[info exists state(-channel)]} {
-		    fconfigure $state(-channel) -translation binary
-		}
-	    }
-	    if {[info exists state(-channel)] &&
-		    ![info exists state(-handler)]} {
-		# Initiate a sequence of background fcopies
-		fileevent $s readable {}
-		CopyStart $s $token
-	    }
-	} elseif {$n > 0} {
-	    if {[regexp -nocase {^content-type:(.+)$} $line x type]} {
-		set state(type) [string trim $type]
-	    }
-	    if {[regexp -nocase {^content-length:(.+)$} $line x length]} {
-		set state(totalsize) [string trim $length]
-	    }
-	    if {[regexp -nocase {^([^:]+):(.+)$} $line x key value]} {
-		lappend state(meta) $key $value
-	    } elseif {[regexp ^HTTP $line]} {
-		set state(http) $line
-	    }
-	}
-    } else {
-	if {[catch {
-	    if {[info exists state(-handler)]} {
-		set n [eval $state(-handler) {$s $token}]
-	    } else {
-		set block [read $s $state(-blocksize)]
-		set n [string length $block]
-		if {$n >= 0} {
-		    append state(body) $block
-		}
-	    }
-	    if {$n >= 0} {
-		incr state(currentsize) $n
-	    }
-	} err]} {
-	    Finish $token $err
-	} else {
-	    if {[info exists state(-progress)]} {
-		eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-	    }
-	}
-    }
-}
- proc http::CopyStart {s token} {
-    variable $token
-    upvar 0 $token state
-    if {[catch {
-	fcopy $s $state(-channel) -size $state(-blocksize) -command \
-	    [list http::CopyDone $token]
-    } err]} {
-	Finish $token $err
-    }
-}
- proc http::CopyDone {token count {error {}}} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-    incr state(currentsize) $count
-    if {[info exists state(-progress)]} {
-	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-    }
-    # At this point the token may have been reset
-    if {([string length $error] != 0)} {
-	Finish $token $error
-    } elseif {[catch {::eof $s} iseof] || $iseof} {
-	Eof $token
-    } else {
-	CopyStart $s $token
-    }
-}
- proc http::Eof {token} {
-    variable $token
-    upvar 0 $token state
-    if {$state(state) == "header"} {
-	# Premature eof
-	set state(status) eof
-    } else {
-	set state(status) ok
-    }
-    set state(state) eof
-    Finish $token
-}
-
-# http::wait --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-# Results:
-#        The status after the wait.
-
-proc http::wait {token} {
-    variable $token
-    upvar 0 $token state
-
-    if {![info exists state(status)] || [string length $state(status)] == 0} {
-	vwait $token\(status)
-    }
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-    return $state(status)
-}
-
-# http::formatQuery --
-#
-#	See documentaion for details.
-#	Call http::formatQuery with an even number of arguments, where 
-#	the first is a name, the second is a value, the third is another 
-#	name, and so on.
-#
-# Arguments:
-#	args	A list of name-value pairs.
-# Results:
-#        TODO
-
-proc http::formatQuery {args} {
-    set result ""
-    set sep ""
-    foreach i $args {
-	append result  $sep [mapReply $i]
-	if {$sep != "="} {
-	    set sep =
-	} else {
-	    set sep &
-	}
-    }
-    return $result
-}
-
-# do x-www-urlencoded character mapping
-# The spec says: "non-alphanumeric characters are replaced by '%HH'"
-# 1 leave alphanumerics characters alone
-# 2 Convert every other character to an array lookup
-# 3 Escape constructs that are "special" to the tcl parser
-# 4 "subst" the result, doing all the array substitutions
- 
- proc http::mapReply {string} {
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-    regsub -all \[^$alphanumeric\] $string {$formMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
-    regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
-}
-
-# Default proxy filter. 
- proc http::ProxyRequired {host} {
-    variable http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || ![string length $http(-proxyport)]} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
-    } else {
-	return {}
-    }
-}
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
deleted file mode 100644
index 01052f3..0000000
--- a/library/http/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.0
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded http 2.0 [list tclPkgSetup $dir http 2.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait}}}]
diff --git a/library/http1.0/http.tcl b/library/http1.0/http.tcl
deleted file mode 100644
index fe78879..0000000
--- a/library/http1.0/http.tcl
+++ /dev/null
@@ -1,379 +0,0 @@
-# http.tcl
-# Client-side HTTP for GET, POST, and HEAD commands.
-# These routines can be used in untrusted code that uses the Safesock
-# security policy.
-# These procedures use a callback interface to avoid using vwait,
-# which is not defined in the safe base.
-#
-# RCS: @(#) $Id: http.tcl,v 1.3 1998/09/14 18:40:03 stanton Exp $
-#
-# See the http.n man page for documentation
-
-package provide http 1.0
-
-array set http {
-    -accept */*
-    -proxyhost {}
-    -proxyport {}
-    -useragent {Tcl http client package 1.0}
-    -proxyfilter httpProxyRequired
-}
-proc http_config {args} {
-    global http
-    set options [lsort [array names http -*]]
-    set usage [join $options ", "]
-    if {[llength $args] == 0} {
-	set result {}
-	foreach name $options {
-	    lappend result $name $http($name)
-	}
-	return $result
-    }
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    if {[llength $args] == 1} {
-	set flag [lindex $args 0]
-	if {[regexp -- $pat $flag]} {
-	    return $http($flag)
-	} else {
-	    return -code error "Unknown option $flag, must be: $usage"
-	}
-    } else {
-	foreach {flag value} $args {
-	    if {[regexp -- $pat $flag]} {
-		set http($flag) $value
-	    } else {
-		return -code error "Unknown option $flag, must be: $usage"
-	    }
-	}
-    }
-}
-
- proc httpFinish { token {errormsg ""} } {
-    upvar #0 $token state
-    global errorInfo errorCode
-    if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
-	set state(status) error
-    }
-    catch {close $state(sock)}
-    catch {after cancel $state(after)}
-    if {[info exists state(-command)]} {
-	if {[catch {eval $state(-command) {$token}} err]} {
-	    if {[string length $errormsg] == 0} {
-		set state(error) [list $err $errorInfo $errorCode]
-		set state(status) error
-	    }
-	}
-	unset state(-command)
-    }
-}
-proc http_reset { token {why reset} } {
-    upvar #0 $token state
-    set state(status) $why
-    catch {fileevent $state(sock) readable {}}
-    httpFinish $token
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-}
-proc http_get { url args } {
-    global http
-    if {![info exists http(uid)]} {
-	set http(uid) 0
-    }
-    set token http#[incr http(uid)]
-    upvar #0 $token state
-    http_reset $token
-    array set state {
-	-blocksize 	8192
-	-validate 	0
-	-headers 	{}
-	-timeout 	0
-	state		header
-	meta		{}
-	currentsize	0
-	totalsize	0
-        type            text/html
-        body            {}
-	status		""
-    }
-    set options {-blocksize -channel -command -handler -headers \
-		-progress -query -validate -timeout}
-    set usage [join $options ", "]
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    foreach {flag value} $args {
-	if {[regexp $pat $flag]} {
-	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [regexp {^[0-9]+$} $state($flag)] && \
-		    ![regexp {^[0-9]+$} $value]} {
-		return -code error "Bad value for $flag ($value), must be integer"
-	    }
-	    set state($flag) $value
-	} else {
-	    return -code error "Unknown option $flag, can be: $usage"
-	}
-    }
-    if {! [regexp -nocase {^(http://)?([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-	    x proto host y port srvurl]} {
-	error "Unsupported URL: $url"
-    }
-    if {[string length $port] == 0} {
-	set port 80
-    }
-    if {[string length $srvurl] == 0} {
-	set srvurl /
-    }
-    if {[string length $proto] == 0} {
-	set url http://$url
-    }
-    set state(url) $url
-    if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
-    }
-    if {$state(-timeout) > 0} {
-	set state(after) [after $state(-timeout) [list http_reset $token timeout]]
-    }
-    if {[info exists phost] && [string length $phost]} {
-	set srvurl $url
-	set s [socket $phost $pport]
-    } else {
-	set s [socket $host $port]
-    }
-    set state(sock) $s
-
-    # Send data in cr-lf format, but accept any line terminators
-
-    fconfigure $s -translation {auto crlf} -buffersize $state(-blocksize)
-
-    # The following is disallowed in safe interpreters, but the socket
-    # is already in non-blocking mode in that case.
-
-    catch {fconfigure $s -blocking off}
-    set len 0
-    set how GET
-    if {[info exists state(-query)]} {
-	set len [string length $state(-query)]
-	if {$len > 0} {
-	    set how POST
-	}
-    } elseif {$state(-validate)} {
-	set how HEAD
-    }
-    puts $s "$how $srvurl HTTP/1.0"
-    puts $s "Accept: $http(-accept)"
-    puts $s "Host: $host"
-    puts $s "User-Agent: $http(-useragent)"
-    foreach {key value} $state(-headers) {
-	regsub -all \[\n\r\]  $value {} value
-	set key [string trim $key]
-	if {[string length $key]} {
-	    puts $s "$key: $value"
-	}
-    }
-    if {$len > 0} {
-	puts $s "Content-Length: $len"
-	puts $s "Content-Type: application/x-www-form-urlencoded"
-	puts $s ""
-	fconfigure $s -translation {auto binary}
-	puts $s $state(-query)
-    } else {
-	puts $s ""
-    }
-    flush $s
-    fileevent $s readable [list httpEvent $token]
-    if {! [info exists state(-command)]} {
-	http_wait $token
-    }
-    return $token
-}
-proc http_data {token} {
-    upvar #0 $token state
-    return $state(body)
-}
-proc http_status {token} {
-    upvar #0 $token state
-    return $state(status)
-}
-proc http_code {token} {
-    upvar #0 $token state
-    return $state(http)
-}
-proc http_size {token} {
-    upvar #0 $token state
-    return $state(currentsize)
-}
-
- proc httpEvent {token} {
-    upvar #0 $token state
-    set s $state(sock)
-
-     if {[eof $s]} {
-	httpEof $token
-	return
-    }
-    if {$state(state) == "header"} {
-	set n [gets $s line]
-	if {$n == 0} {
-	    set state(state) body
-	    if {![regexp -nocase ^text $state(type)]} {
-		# Turn off conversions for non-text data
-		fconfigure $s -translation binary
-		if {[info exists state(-channel)]} {
-		    fconfigure $state(-channel) -translation binary
-		}
-	    }
-	    if {[info exists state(-channel)] &&
-		    ![info exists state(-handler)]} {
-		# Initiate a sequence of background fcopies
-		fileevent $s readable {}
-		httpCopyStart $s $token
-	    }
-	} elseif {$n > 0} {
-	    if {[regexp -nocase {^content-type:(.+)$} $line x type]} {
-		set state(type) [string trim $type]
-	    }
-	    if {[regexp -nocase {^content-length:(.+)$} $line x length]} {
-		set state(totalsize) [string trim $length]
-	    }
-	    if {[regexp -nocase {^([^:]+):(.+)$} $line x key value]} {
-		lappend state(meta) $key $value
-	    } elseif {[regexp ^HTTP $line]} {
-		set state(http) $line
-	    }
-	}
-    } else {
-	if {[catch {
-	    if {[info exists state(-handler)]} {
-		set n [eval $state(-handler) {$s $token}]
-	    } else {
-		set block [read $s $state(-blocksize)]
-		set n [string length $block]
-		if {$n >= 0} {
-		    append state(body) $block
-		}
-	    }
-	    if {$n >= 0} {
-		incr state(currentsize) $n
-	    }
-	} err]} {
-	    httpFinish $token $err
-	} else {
-	    if {[info exists state(-progress)]} {
-		eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-	    }
-	}
-    }
-}
- proc httpCopyStart {s token} {
-    upvar #0 $token state
-    if {[catch {
-	fcopy $s $state(-channel) -size $state(-blocksize) -command \
-	    [list httpCopyDone $token]
-    } err]} {
-	httpFinish $token $err
-    }
-}
- proc httpCopyDone {token count {error {}}} {
-    upvar #0 $token state
-    set s $state(sock)
-    incr state(currentsize) $count
-    if {[info exists state(-progress)]} {
-	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-    }
-    if {([string length $error] != 0)} {
-	httpFinish $token $error
-    } elseif {[eof $s]} {
-	httpEof $token
-    } else {
-	httpCopyStart $s $token
-    }
-}
- proc httpEof {token} {
-    upvar #0 $token state
-    if {$state(state) == "header"} {
-	# Premature eof
-	set state(status) eof
-    } else {
-	set state(status) ok
-    }
-    set state(state) eof
-    httpFinish $token
-}
-proc http_wait {token} {
-    upvar #0 $token state
-    if {![info exists state(status)] || [string length $state(status)] == 0} {
-	vwait $token\(status)
-    }
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-    return $state(status)
-}
-
-# Call http_formatQuery with an even number of arguments, where the first is
-# a name, the second is a value, the third is another name, and so on.
-
-proc http_formatQuery {args} {
-    set result ""
-    set sep ""
-    foreach i $args {
-	append result  $sep [httpMapReply $i]
-	if {$sep != "="} {
-	    set sep =
-	} else {
-	    set sep &
-	}
-    }
-    return $result
-}
-
-# do x-www-urlencoded character mapping
-# The spec says: "non-alphanumeric characters are replaced by '%HH'"
-# 1 leave alphanumerics characters alone
-# 2 Convert every other character to an array lookup
-# 3 Escape constructs that are "special" to the tcl parser
-# 4 "subst" the result, doing all the array substitutions
- 
- proc httpMapReply {string} {
-    global httpFormMap
-    set alphanumeric	a-zA-Z0-9
-    if {![info exists httpFormMap]} {
-	 
-	for {set i 1} {$i <= 256} {incr i} {
-	    set c [format %c $i]
-	    if {![string match \[$alphanumeric\] $c]} {
-		set httpFormMap($c) %[format %.2x $i]
-	    }
-	}
-	# These are handled specially
-	array set httpFormMap {
-	    " " +   \n %0d%0a
-	}
-    }
-    regsub -all \[^$alphanumeric\] $string {$httpFormMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
-    regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
-}
-
-# Default proxy filter. 
- proc httpProxyRequired {host} {
-    global http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || ![string length $http(-proxyport)]} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
-    } else {
-	return {}
-    }
-}
diff --git a/library/http1.0/pkgIndex.tcl b/library/http1.0/pkgIndex.tcl
deleted file mode 100644
index ab6170f..0000000
--- a/library/http1.0/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.0
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded http 1.0 [list tclPkgSetup $dir http 1.0 {{http.tcl source {httpCopyDone httpCopyStart httpEof httpEvent httpFinish httpMapReply httpProxyRequired http_code http_config http_data http_formatQuery http_get http_reset http_size http_status http_wait}}}]
diff --git a/library/http2.0/http.tcl b/library/http2.0/http.tcl
deleted file mode 100644
index 6ad16df..0000000
--- a/library/http2.0/http.tcl
+++ /dev/null
@@ -1,466 +0,0 @@
-# http.tcl --
-#
-#	Client-side HTTP for GET, POST, and HEAD commands.
-#	These routines can be used in untrusted code that uses 
-#	the Safesock security policy.  These procedures use a 
-#	callback interface to avoid using vwait, which is not 
-#	defined in the safe base.
-#
-# See the file "license.terms" for information on usage and
-# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: http.tcl,v 1.5 1999/02/02 22:28:30 stanton Exp $
-
-package provide http 2.0	;# This uses Tcl namespaces
-
-namespace eval http {
-    variable http
-
-    array set http {
-	-accept */*
-	-proxyhost {}
-	-proxyport {}
-	-useragent {Tcl http client package 2.0}
-	-proxyfilter http::ProxyRequired
-    }
-
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-
-    for {set i 1} {$i <= 256} {incr i} {
-	set c [format %c $i]
-	if {![string match \[$alphanumeric\] $c]} {
-	    set formMap($c) %[format %.2x $i]
-	}
-    }
-    # These are handled specially
-    array set formMap {
-	" " +   \n %0d%0a
-    }
-
-    namespace export geturl config reset wait formatQuery 
-    # Useful, but not exported: data size status code
-}
-
-# http::config --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	args		Options parsed by the procedure.
-# Results:
-#        TODO
-
-proc http::config {args} {
-    variable http
-    set options [lsort [array names http -*]]
-    set usage [join $options ", "]
-    if {[llength $args] == 0} {
-	set result {}
-	foreach name $options {
-	    lappend result $name $http($name)
-	}
-	return $result
-    }
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    if {[llength $args] == 1} {
-	set flag [lindex $args 0]
-	if {[regexp -- $pat $flag]} {
-	    return $http($flag)
-	} else {
-	    return -code error "Unknown option $flag, must be: $usage"
-	}
-    } else {
-	foreach {flag value} $args {
-	    if {[regexp -- $pat $flag]} {
-		set http($flag) $value
-	    } else {
-		return -code error "Unknown option $flag, must be: $usage"
-	    }
-	}
-    }
-}
-
- proc http::Finish { token {errormsg ""} } {
-    variable $token
-    upvar 0 $token state
-    global errorInfo errorCode
-    if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
-	set state(status) error
-    }
-    catch {close $state(sock)}
-    catch {after cancel $state(after)}
-    if {[info exists state(-command)]} {
-	if {[catch {eval $state(-command) {$token}} err]} {
-	    if {[string length $errormsg] == 0} {
-		set state(error) [list $err $errorInfo $errorCode]
-		set state(status) error
-	    }
-	}
-	if {[info exist state(-command)]} {
-	    # Command callback may already have unset our state
-	    unset state(-command)
-	}
-    }
-}
-
-# http::reset --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-#	why	Status info.
-# Results:
-#        TODO
-
-proc http::reset { token {why reset} } {
-    variable $token
-    upvar 0 $token state
-    set state(status) $why
-    catch {fileevent $state(sock) readable {}}
-    Finish $token
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-}
-
-# http::geturl --
-#
-#	Establishes a connection to a remote url via http.
-#
-# Arguments:
-#        url		The http URL to goget.
-#        args		Option value pairs. Valid options include:
-#				-blocksize, -validate, -headers, -timeout
-# Results:
-#        Returns a token for this connection.
-
-
-proc http::geturl { url args } {
-    variable http
-    if {![info exists http(uid)]} {
-	set http(uid) 0
-    }
-    set token [namespace current]::[incr http(uid)]
-    variable $token
-    upvar 0 $token state
-    reset $token
-    array set state {
-	-blocksize 	8192
-	-validate 	0
-	-headers 	{}
-	-timeout 	0
-	state		header
-	meta		{}
-	currentsize	0
-	totalsize	0
-        type            text/html
-        body            {}
-	status		""
-    }
-    set options {-blocksize -channel -command -handler -headers \
-		-progress -query -validate -timeout}
-    set usage [join $options ", "]
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    foreach {flag value} $args {
-	if {[regexp $pat $flag]} {
-	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [regexp {^[0-9]+$} $state($flag)] && \
-		    ![regexp {^[0-9]+$} $value]} {
-		return -code error "Bad value for $flag ($value), must be integer"
-	    }
-	    set state($flag) $value
-	} else {
-	    return -code error "Unknown option $flag, can be: $usage"
-	}
-    }
-    if {! [regexp -nocase {^(http://)?([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-	    x proto host y port srvurl]} {
-	error "Unsupported URL: $url"
-    }
-    if {[string length $port] == 0} {
-	set port 80
-    }
-    if {[string length $srvurl] == 0} {
-	set srvurl /
-    }
-    if {[string length $proto] == 0} {
-	set url http://$url
-    }
-    set state(url) $url
-    if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
-    }
-    if {$state(-timeout) > 0} {
-	set state(after) [after $state(-timeout) [list http::reset $token timeout]]
-    }
-    if {[info exists phost] && [string length $phost]} {
-	set srvurl $url
-	set s [socket $phost $pport]
-    } else {
-	set s [socket $host $port]
-    }
-    set state(sock) $s
-
-    # Send data in cr-lf format, but accept any line terminators
-
-    fconfigure $s -translation {auto crlf} -buffersize $state(-blocksize)
-
-    # The following is disallowed in safe interpreters, but the socket
-    # is already in non-blocking mode in that case.
-
-    catch {fconfigure $s -blocking off}
-    set len 0
-    set how GET
-    if {[info exists state(-query)]} {
-	set len [string length $state(-query)]
-	if {$len > 0} {
-	    set how POST
-	}
-    } elseif {$state(-validate)} {
-	set how HEAD
-    }
-    puts $s "$how $srvurl HTTP/1.0"
-    puts $s "Accept: $http(-accept)"
-    puts $s "Host: $host"
-    puts $s "User-Agent: $http(-useragent)"
-    foreach {key value} $state(-headers) {
-	regsub -all \[\n\r\]  $value {} value
-	set key [string trim $key]
-	if {[string length $key]} {
-	    puts $s "$key: $value"
-	}
-    }
-    if {$len > 0} {
-	puts $s "Content-Length: $len"
-	puts $s "Content-Type: application/x-www-form-urlencoded"
-	puts $s ""
-	fconfigure $s -translation {auto binary}
-	puts $s $state(-query)
-    } else {
-	puts $s ""
-    }
-    flush $s
-    fileevent $s readable [list http::Event $token]
-    if {! [info exists state(-command)]} {
-	wait $token
-    }
-    return $token
-}
-
-# Data access functions:
-# Data - the URL data
-# Status - the transaction status: ok, reset, eof, timeout
-# Code - the HTTP transaction code, e.g., 200
-# Size - the size of the URL data
-
-proc http::data {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(body)
-}
-proc http::status {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(status)
-}
-proc http::code {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(http)
-}
-proc http::size {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(currentsize)
-}
-
- proc http::Event {token} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-
-     if {[::eof $s]} {
-	Eof $token
-	return
-    }
-    if {$state(state) == "header"} {
-	set n [gets $s line]
-	if {$n == 0} {
-	    set state(state) body
-	    if {![regexp -nocase ^text $state(type)]} {
-		# Turn off conversions for non-text data
-		fconfigure $s -translation binary
-		if {[info exists state(-channel)]} {
-		    fconfigure $state(-channel) -translation binary
-		}
-	    }
-	    if {[info exists state(-channel)] &&
-		    ![info exists state(-handler)]} {
-		# Initiate a sequence of background fcopies
-		fileevent $s readable {}
-		CopyStart $s $token
-	    }
-	} elseif {$n > 0} {
-	    if {[regexp -nocase {^content-type:(.+)$} $line x type]} {
-		set state(type) [string trim $type]
-	    }
-	    if {[regexp -nocase {^content-length:(.+)$} $line x length]} {
-		set state(totalsize) [string trim $length]
-	    }
-	    if {[regexp -nocase {^([^:]+):(.+)$} $line x key value]} {
-		lappend state(meta) $key $value
-	    } elseif {[regexp ^HTTP $line]} {
-		set state(http) $line
-	    }
-	}
-    } else {
-	if {[catch {
-	    if {[info exists state(-handler)]} {
-		set n [eval $state(-handler) {$s $token}]
-	    } else {
-		set block [read $s $state(-blocksize)]
-		set n [string length $block]
-		if {$n >= 0} {
-		    append state(body) $block
-		}
-	    }
-	    if {$n >= 0} {
-		incr state(currentsize) $n
-	    }
-	} err]} {
-	    Finish $token $err
-	} else {
-	    if {[info exists state(-progress)]} {
-		eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-	    }
-	}
-    }
-}
- proc http::CopyStart {s token} {
-    variable $token
-    upvar 0 $token state
-    if {[catch {
-	fcopy $s $state(-channel) -size $state(-blocksize) -command \
-	    [list http::CopyDone $token]
-    } err]} {
-	Finish $token $err
-    }
-}
- proc http::CopyDone {token count {error {}}} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-    incr state(currentsize) $count
-    if {[info exists state(-progress)]} {
-	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-    }
-    # At this point the token may have been reset
-    if {([string length $error] != 0)} {
-	Finish $token $error
-    } elseif {[catch {::eof $s} iseof] || $iseof} {
-	Eof $token
-    } else {
-	CopyStart $s $token
-    }
-}
- proc http::Eof {token} {
-    variable $token
-    upvar 0 $token state
-    if {$state(state) == "header"} {
-	# Premature eof
-	set state(status) eof
-    } else {
-	set state(status) ok
-    }
-    set state(state) eof
-    Finish $token
-}
-
-# http::wait --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-# Results:
-#        The status after the wait.
-
-proc http::wait {token} {
-    variable $token
-    upvar 0 $token state
-
-    if {![info exists state(status)] || [string length $state(status)] == 0} {
-	vwait $token\(status)
-    }
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-    return $state(status)
-}
-
-# http::formatQuery --
-#
-#	See documentaion for details.
-#	Call http::formatQuery with an even number of arguments, where 
-#	the first is a name, the second is a value, the third is another 
-#	name, and so on.
-#
-# Arguments:
-#	args	A list of name-value pairs.
-# Results:
-#        TODO
-
-proc http::formatQuery {args} {
-    set result ""
-    set sep ""
-    foreach i $args {
-	append result  $sep [mapReply $i]
-	if {$sep != "="} {
-	    set sep =
-	} else {
-	    set sep &
-	}
-    }
-    return $result
-}
-
-# do x-www-urlencoded character mapping
-# The spec says: "non-alphanumeric characters are replaced by '%HH'"
-# 1 leave alphanumerics characters alone
-# 2 Convert every other character to an array lookup
-# 3 Escape constructs that are "special" to the tcl parser
-# 4 "subst" the result, doing all the array substitutions
- 
- proc http::mapReply {string} {
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-    regsub -all \[^$alphanumeric\] $string {$formMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
-    regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
-}
-
-# Default proxy filter. 
- proc http::ProxyRequired {host} {
-    variable http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || ![string length $http(-proxyport)]} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
-    } else {
-	return {}
-    }
-}
diff --git a/library/http2.0/pkgIndex.tcl b/library/http2.0/pkgIndex.tcl
deleted file mode 100644
index 01052f3..0000000
--- a/library/http2.0/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.0
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded http 2.0 [list tclPkgSetup $dir http 2.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait}}}]
diff --git a/library/http2.1/http.tcl b/library/http2.1/http.tcl
deleted file mode 100644
index 6ad16df..0000000
--- a/library/http2.1/http.tcl
+++ /dev/null
@@ -1,466 +0,0 @@
-# http.tcl --
-#
-#	Client-side HTTP for GET, POST, and HEAD commands.
-#	These routines can be used in untrusted code that uses 
-#	the Safesock security policy.  These procedures use a 
-#	callback interface to avoid using vwait, which is not 
-#	defined in the safe base.
-#
-# See the file "license.terms" for information on usage and
-# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: http.tcl,v 1.5 1999/02/02 22:28:30 stanton Exp $
-
-package provide http 2.0	;# This uses Tcl namespaces
-
-namespace eval http {
-    variable http
-
-    array set http {
-	-accept */*
-	-proxyhost {}
-	-proxyport {}
-	-useragent {Tcl http client package 2.0}
-	-proxyfilter http::ProxyRequired
-    }
-
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-
-    for {set i 1} {$i <= 256} {incr i} {
-	set c [format %c $i]
-	if {![string match \[$alphanumeric\] $c]} {
-	    set formMap($c) %[format %.2x $i]
-	}
-    }
-    # These are handled specially
-    array set formMap {
-	" " +   \n %0d%0a
-    }
-
-    namespace export geturl config reset wait formatQuery 
-    # Useful, but not exported: data size status code
-}
-
-# http::config --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	args		Options parsed by the procedure.
-# Results:
-#        TODO
-
-proc http::config {args} {
-    variable http
-    set options [lsort [array names http -*]]
-    set usage [join $options ", "]
-    if {[llength $args] == 0} {
-	set result {}
-	foreach name $options {
-	    lappend result $name $http($name)
-	}
-	return $result
-    }
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    if {[llength $args] == 1} {
-	set flag [lindex $args 0]
-	if {[regexp -- $pat $flag]} {
-	    return $http($flag)
-	} else {
-	    return -code error "Unknown option $flag, must be: $usage"
-	}
-    } else {
-	foreach {flag value} $args {
-	    if {[regexp -- $pat $flag]} {
-		set http($flag) $value
-	    } else {
-		return -code error "Unknown option $flag, must be: $usage"
-	    }
-	}
-    }
-}
-
- proc http::Finish { token {errormsg ""} } {
-    variable $token
-    upvar 0 $token state
-    global errorInfo errorCode
-    if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
-	set state(status) error
-    }
-    catch {close $state(sock)}
-    catch {after cancel $state(after)}
-    if {[info exists state(-command)]} {
-	if {[catch {eval $state(-command) {$token}} err]} {
-	    if {[string length $errormsg] == 0} {
-		set state(error) [list $err $errorInfo $errorCode]
-		set state(status) error
-	    }
-	}
-	if {[info exist state(-command)]} {
-	    # Command callback may already have unset our state
-	    unset state(-command)
-	}
-    }
-}
-
-# http::reset --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-#	why	Status info.
-# Results:
-#        TODO
-
-proc http::reset { token {why reset} } {
-    variable $token
-    upvar 0 $token state
-    set state(status) $why
-    catch {fileevent $state(sock) readable {}}
-    Finish $token
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-}
-
-# http::geturl --
-#
-#	Establishes a connection to a remote url via http.
-#
-# Arguments:
-#        url		The http URL to goget.
-#        args		Option value pairs. Valid options include:
-#				-blocksize, -validate, -headers, -timeout
-# Results:
-#        Returns a token for this connection.
-
-
-proc http::geturl { url args } {
-    variable http
-    if {![info exists http(uid)]} {
-	set http(uid) 0
-    }
-    set token [namespace current]::[incr http(uid)]
-    variable $token
-    upvar 0 $token state
-    reset $token
-    array set state {
-	-blocksize 	8192
-	-validate 	0
-	-headers 	{}
-	-timeout 	0
-	state		header
-	meta		{}
-	currentsize	0
-	totalsize	0
-        type            text/html
-        body            {}
-	status		""
-    }
-    set options {-blocksize -channel -command -handler -headers \
-		-progress -query -validate -timeout}
-    set usage [join $options ", "]
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    foreach {flag value} $args {
-	if {[regexp $pat $flag]} {
-	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [regexp {^[0-9]+$} $state($flag)] && \
-		    ![regexp {^[0-9]+$} $value]} {
-		return -code error "Bad value for $flag ($value), must be integer"
-	    }
-	    set state($flag) $value
-	} else {
-	    return -code error "Unknown option $flag, can be: $usage"
-	}
-    }
-    if {! [regexp -nocase {^(http://)?([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-	    x proto host y port srvurl]} {
-	error "Unsupported URL: $url"
-    }
-    if {[string length $port] == 0} {
-	set port 80
-    }
-    if {[string length $srvurl] == 0} {
-	set srvurl /
-    }
-    if {[string length $proto] == 0} {
-	set url http://$url
-    }
-    set state(url) $url
-    if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
-    }
-    if {$state(-timeout) > 0} {
-	set state(after) [after $state(-timeout) [list http::reset $token timeout]]
-    }
-    if {[info exists phost] && [string length $phost]} {
-	set srvurl $url
-	set s [socket $phost $pport]
-    } else {
-	set s [socket $host $port]
-    }
-    set state(sock) $s
-
-    # Send data in cr-lf format, but accept any line terminators
-
-    fconfigure $s -translation {auto crlf} -buffersize $state(-blocksize)
-
-    # The following is disallowed in safe interpreters, but the socket
-    # is already in non-blocking mode in that case.
-
-    catch {fconfigure $s -blocking off}
-    set len 0
-    set how GET
-    if {[info exists state(-query)]} {
-	set len [string length $state(-query)]
-	if {$len > 0} {
-	    set how POST
-	}
-    } elseif {$state(-validate)} {
-	set how HEAD
-    }
-    puts $s "$how $srvurl HTTP/1.0"
-    puts $s "Accept: $http(-accept)"
-    puts $s "Host: $host"
-    puts $s "User-Agent: $http(-useragent)"
-    foreach {key value} $state(-headers) {
-	regsub -all \[\n\r\]  $value {} value
-	set key [string trim $key]
-	if {[string length $key]} {
-	    puts $s "$key: $value"
-	}
-    }
-    if {$len > 0} {
-	puts $s "Content-Length: $len"
-	puts $s "Content-Type: application/x-www-form-urlencoded"
-	puts $s ""
-	fconfigure $s -translation {auto binary}
-	puts $s $state(-query)
-    } else {
-	puts $s ""
-    }
-    flush $s
-    fileevent $s readable [list http::Event $token]
-    if {! [info exists state(-command)]} {
-	wait $token
-    }
-    return $token
-}
-
-# Data access functions:
-# Data - the URL data
-# Status - the transaction status: ok, reset, eof, timeout
-# Code - the HTTP transaction code, e.g., 200
-# Size - the size of the URL data
-
-proc http::data {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(body)
-}
-proc http::status {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(status)
-}
-proc http::code {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(http)
-}
-proc http::size {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(currentsize)
-}
-
- proc http::Event {token} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-
-     if {[::eof $s]} {
-	Eof $token
-	return
-    }
-    if {$state(state) == "header"} {
-	set n [gets $s line]
-	if {$n == 0} {
-	    set state(state) body
-	    if {![regexp -nocase ^text $state(type)]} {
-		# Turn off conversions for non-text data
-		fconfigure $s -translation binary
-		if {[info exists state(-channel)]} {
-		    fconfigure $state(-channel) -translation binary
-		}
-	    }
-	    if {[info exists state(-channel)] &&
-		    ![info exists state(-handler)]} {
-		# Initiate a sequence of background fcopies
-		fileevent $s readable {}
-		CopyStart $s $token
-	    }
-	} elseif {$n > 0} {
-	    if {[regexp -nocase {^content-type:(.+)$} $line x type]} {
-		set state(type) [string trim $type]
-	    }
-	    if {[regexp -nocase {^content-length:(.+)$} $line x length]} {
-		set state(totalsize) [string trim $length]
-	    }
-	    if {[regexp -nocase {^([^:]+):(.+)$} $line x key value]} {
-		lappend state(meta) $key $value
-	    } elseif {[regexp ^HTTP $line]} {
-		set state(http) $line
-	    }
-	}
-    } else {
-	if {[catch {
-	    if {[info exists state(-handler)]} {
-		set n [eval $state(-handler) {$s $token}]
-	    } else {
-		set block [read $s $state(-blocksize)]
-		set n [string length $block]
-		if {$n >= 0} {
-		    append state(body) $block
-		}
-	    }
-	    if {$n >= 0} {
-		incr state(currentsize) $n
-	    }
-	} err]} {
-	    Finish $token $err
-	} else {
-	    if {[info exists state(-progress)]} {
-		eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-	    }
-	}
-    }
-}
- proc http::CopyStart {s token} {
-    variable $token
-    upvar 0 $token state
-    if {[catch {
-	fcopy $s $state(-channel) -size $state(-blocksize) -command \
-	    [list http::CopyDone $token]
-    } err]} {
-	Finish $token $err
-    }
-}
- proc http::CopyDone {token count {error {}}} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-    incr state(currentsize) $count
-    if {[info exists state(-progress)]} {
-	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-    }
-    # At this point the token may have been reset
-    if {([string length $error] != 0)} {
-	Finish $token $error
-    } elseif {[catch {::eof $s} iseof] || $iseof} {
-	Eof $token
-    } else {
-	CopyStart $s $token
-    }
-}
- proc http::Eof {token} {
-    variable $token
-    upvar 0 $token state
-    if {$state(state) == "header"} {
-	# Premature eof
-	set state(status) eof
-    } else {
-	set state(status) ok
-    }
-    set state(state) eof
-    Finish $token
-}
-
-# http::wait --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-# Results:
-#        The status after the wait.
-
-proc http::wait {token} {
-    variable $token
-    upvar 0 $token state
-
-    if {![info exists state(status)] || [string length $state(status)] == 0} {
-	vwait $token\(status)
-    }
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-    return $state(status)
-}
-
-# http::formatQuery --
-#
-#	See documentaion for details.
-#	Call http::formatQuery with an even number of arguments, where 
-#	the first is a name, the second is a value, the third is another 
-#	name, and so on.
-#
-# Arguments:
-#	args	A list of name-value pairs.
-# Results:
-#        TODO
-
-proc http::formatQuery {args} {
-    set result ""
-    set sep ""
-    foreach i $args {
-	append result  $sep [mapReply $i]
-	if {$sep != "="} {
-	    set sep =
-	} else {
-	    set sep &
-	}
-    }
-    return $result
-}
-
-# do x-www-urlencoded character mapping
-# The spec says: "non-alphanumeric characters are replaced by '%HH'"
-# 1 leave alphanumerics characters alone
-# 2 Convert every other character to an array lookup
-# 3 Escape constructs that are "special" to the tcl parser
-# 4 "subst" the result, doing all the array substitutions
- 
- proc http::mapReply {string} {
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-    regsub -all \[^$alphanumeric\] $string {$formMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
-    regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
-}
-
-# Default proxy filter. 
- proc http::ProxyRequired {host} {
-    variable http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || ![string length $http(-proxyport)]} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
-    } else {
-	return {}
-    }
-}
diff --git a/library/http2.1/pkgIndex.tcl b/library/http2.1/pkgIndex.tcl
deleted file mode 100644
index 01052f3..0000000
--- a/library/http2.1/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.0
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded http 2.0 [list tclPkgSetup $dir http 2.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait}}}]
diff --git a/library/http2.3/http.tcl b/library/http2.3/http.tcl
deleted file mode 100644
index 6ad16df..0000000
--- a/library/http2.3/http.tcl
+++ /dev/null
@@ -1,466 +0,0 @@
-# http.tcl --
-#
-#	Client-side HTTP for GET, POST, and HEAD commands.
-#	These routines can be used in untrusted code that uses 
-#	the Safesock security policy.  These procedures use a 
-#	callback interface to avoid using vwait, which is not 
-#	defined in the safe base.
-#
-# See the file "license.terms" for information on usage and
-# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: http.tcl,v 1.5 1999/02/02 22:28:30 stanton Exp $
-
-package provide http 2.0	;# This uses Tcl namespaces
-
-namespace eval http {
-    variable http
-
-    array set http {
-	-accept */*
-	-proxyhost {}
-	-proxyport {}
-	-useragent {Tcl http client package 2.0}
-	-proxyfilter http::ProxyRequired
-    }
-
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-
-    for {set i 1} {$i <= 256} {incr i} {
-	set c [format %c $i]
-	if {![string match \[$alphanumeric\] $c]} {
-	    set formMap($c) %[format %.2x $i]
-	}
-    }
-    # These are handled specially
-    array set formMap {
-	" " +   \n %0d%0a
-    }
-
-    namespace export geturl config reset wait formatQuery 
-    # Useful, but not exported: data size status code
-}
-
-# http::config --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	args		Options parsed by the procedure.
-# Results:
-#        TODO
-
-proc http::config {args} {
-    variable http
-    set options [lsort [array names http -*]]
-    set usage [join $options ", "]
-    if {[llength $args] == 0} {
-	set result {}
-	foreach name $options {
-	    lappend result $name $http($name)
-	}
-	return $result
-    }
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    if {[llength $args] == 1} {
-	set flag [lindex $args 0]
-	if {[regexp -- $pat $flag]} {
-	    return $http($flag)
-	} else {
-	    return -code error "Unknown option $flag, must be: $usage"
-	}
-    } else {
-	foreach {flag value} $args {
-	    if {[regexp -- $pat $flag]} {
-		set http($flag) $value
-	    } else {
-		return -code error "Unknown option $flag, must be: $usage"
-	    }
-	}
-    }
-}
-
- proc http::Finish { token {errormsg ""} } {
-    variable $token
-    upvar 0 $token state
-    global errorInfo errorCode
-    if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
-	set state(status) error
-    }
-    catch {close $state(sock)}
-    catch {after cancel $state(after)}
-    if {[info exists state(-command)]} {
-	if {[catch {eval $state(-command) {$token}} err]} {
-	    if {[string length $errormsg] == 0} {
-		set state(error) [list $err $errorInfo $errorCode]
-		set state(status) error
-	    }
-	}
-	if {[info exist state(-command)]} {
-	    # Command callback may already have unset our state
-	    unset state(-command)
-	}
-    }
-}
-
-# http::reset --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-#	why	Status info.
-# Results:
-#        TODO
-
-proc http::reset { token {why reset} } {
-    variable $token
-    upvar 0 $token state
-    set state(status) $why
-    catch {fileevent $state(sock) readable {}}
-    Finish $token
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-}
-
-# http::geturl --
-#
-#	Establishes a connection to a remote url via http.
-#
-# Arguments:
-#        url		The http URL to goget.
-#        args		Option value pairs. Valid options include:
-#				-blocksize, -validate, -headers, -timeout
-# Results:
-#        Returns a token for this connection.
-
-
-proc http::geturl { url args } {
-    variable http
-    if {![info exists http(uid)]} {
-	set http(uid) 0
-    }
-    set token [namespace current]::[incr http(uid)]
-    variable $token
-    upvar 0 $token state
-    reset $token
-    array set state {
-	-blocksize 	8192
-	-validate 	0
-	-headers 	{}
-	-timeout 	0
-	state		header
-	meta		{}
-	currentsize	0
-	totalsize	0
-        type            text/html
-        body            {}
-	status		""
-    }
-    set options {-blocksize -channel -command -handler -headers \
-		-progress -query -validate -timeout}
-    set usage [join $options ", "]
-    regsub -all -- - $options {} options
-    set pat ^-([join $options |])$
-    foreach {flag value} $args {
-	if {[regexp $pat $flag]} {
-	    # Validate numbers
-	    if {[info exists state($flag)] && \
-		    [regexp {^[0-9]+$} $state($flag)] && \
-		    ![regexp {^[0-9]+$} $value]} {
-		return -code error "Bad value for $flag ($value), must be integer"
-	    }
-	    set state($flag) $value
-	} else {
-	    return -code error "Unknown option $flag, can be: $usage"
-	}
-    }
-    if {! [regexp -nocase {^(http://)?([^/:]+)(:([0-9]+))?(/.*)?$} $url \
-	    x proto host y port srvurl]} {
-	error "Unsupported URL: $url"
-    }
-    if {[string length $port] == 0} {
-	set port 80
-    }
-    if {[string length $srvurl] == 0} {
-	set srvurl /
-    }
-    if {[string length $proto] == 0} {
-	set url http://$url
-    }
-    set state(url) $url
-    if {![catch {$http(-proxyfilter) $host} proxy]} {
-	set phost [lindex $proxy 0]
-	set pport [lindex $proxy 1]
-    }
-    if {$state(-timeout) > 0} {
-	set state(after) [after $state(-timeout) [list http::reset $token timeout]]
-    }
-    if {[info exists phost] && [string length $phost]} {
-	set srvurl $url
-	set s [socket $phost $pport]
-    } else {
-	set s [socket $host $port]
-    }
-    set state(sock) $s
-
-    # Send data in cr-lf format, but accept any line terminators
-
-    fconfigure $s -translation {auto crlf} -buffersize $state(-blocksize)
-
-    # The following is disallowed in safe interpreters, but the socket
-    # is already in non-blocking mode in that case.
-
-    catch {fconfigure $s -blocking off}
-    set len 0
-    set how GET
-    if {[info exists state(-query)]} {
-	set len [string length $state(-query)]
-	if {$len > 0} {
-	    set how POST
-	}
-    } elseif {$state(-validate)} {
-	set how HEAD
-    }
-    puts $s "$how $srvurl HTTP/1.0"
-    puts $s "Accept: $http(-accept)"
-    puts $s "Host: $host"
-    puts $s "User-Agent: $http(-useragent)"
-    foreach {key value} $state(-headers) {
-	regsub -all \[\n\r\]  $value {} value
-	set key [string trim $key]
-	if {[string length $key]} {
-	    puts $s "$key: $value"
-	}
-    }
-    if {$len > 0} {
-	puts $s "Content-Length: $len"
-	puts $s "Content-Type: application/x-www-form-urlencoded"
-	puts $s ""
-	fconfigure $s -translation {auto binary}
-	puts $s $state(-query)
-    } else {
-	puts $s ""
-    }
-    flush $s
-    fileevent $s readable [list http::Event $token]
-    if {! [info exists state(-command)]} {
-	wait $token
-    }
-    return $token
-}
-
-# Data access functions:
-# Data - the URL data
-# Status - the transaction status: ok, reset, eof, timeout
-# Code - the HTTP transaction code, e.g., 200
-# Size - the size of the URL data
-
-proc http::data {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(body)
-}
-proc http::status {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(status)
-}
-proc http::code {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(http)
-}
-proc http::size {token} {
-    variable $token
-    upvar 0 $token state
-    return $state(currentsize)
-}
-
- proc http::Event {token} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-
-     if {[::eof $s]} {
-	Eof $token
-	return
-    }
-    if {$state(state) == "header"} {
-	set n [gets $s line]
-	if {$n == 0} {
-	    set state(state) body
-	    if {![regexp -nocase ^text $state(type)]} {
-		# Turn off conversions for non-text data
-		fconfigure $s -translation binary
-		if {[info exists state(-channel)]} {
-		    fconfigure $state(-channel) -translation binary
-		}
-	    }
-	    if {[info exists state(-channel)] &&
-		    ![info exists state(-handler)]} {
-		# Initiate a sequence of background fcopies
-		fileevent $s readable {}
-		CopyStart $s $token
-	    }
-	} elseif {$n > 0} {
-	    if {[regexp -nocase {^content-type:(.+)$} $line x type]} {
-		set state(type) [string trim $type]
-	    }
-	    if {[regexp -nocase {^content-length:(.+)$} $line x length]} {
-		set state(totalsize) [string trim $length]
-	    }
-	    if {[regexp -nocase {^([^:]+):(.+)$} $line x key value]} {
-		lappend state(meta) $key $value
-	    } elseif {[regexp ^HTTP $line]} {
-		set state(http) $line
-	    }
-	}
-    } else {
-	if {[catch {
-	    if {[info exists state(-handler)]} {
-		set n [eval $state(-handler) {$s $token}]
-	    } else {
-		set block [read $s $state(-blocksize)]
-		set n [string length $block]
-		if {$n >= 0} {
-		    append state(body) $block
-		}
-	    }
-	    if {$n >= 0} {
-		incr state(currentsize) $n
-	    }
-	} err]} {
-	    Finish $token $err
-	} else {
-	    if {[info exists state(-progress)]} {
-		eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-	    }
-	}
-    }
-}
- proc http::CopyStart {s token} {
-    variable $token
-    upvar 0 $token state
-    if {[catch {
-	fcopy $s $state(-channel) -size $state(-blocksize) -command \
-	    [list http::CopyDone $token]
-    } err]} {
-	Finish $token $err
-    }
-}
- proc http::CopyDone {token count {error {}}} {
-    variable $token
-    upvar 0 $token state
-    set s $state(sock)
-    incr state(currentsize) $count
-    if {[info exists state(-progress)]} {
-	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
-    }
-    # At this point the token may have been reset
-    if {([string length $error] != 0)} {
-	Finish $token $error
-    } elseif {[catch {::eof $s} iseof] || $iseof} {
-	Eof $token
-    } else {
-	CopyStart $s $token
-    }
-}
- proc http::Eof {token} {
-    variable $token
-    upvar 0 $token state
-    if {$state(state) == "header"} {
-	# Premature eof
-	set state(status) eof
-    } else {
-	set state(status) ok
-    }
-    set state(state) eof
-    Finish $token
-}
-
-# http::wait --
-#
-#	See documentaion for details.
-#
-# Arguments:
-#	token	Connection token.
-# Results:
-#        The status after the wait.
-
-proc http::wait {token} {
-    variable $token
-    upvar 0 $token state
-
-    if {![info exists state(status)] || [string length $state(status)] == 0} {
-	vwait $token\(status)
-    }
-    if {[info exists state(error)]} {
-	set errorlist $state(error)
-	unset state(error)
-	eval error $errorlist
-    }
-    return $state(status)
-}
-
-# http::formatQuery --
-#
-#	See documentaion for details.
-#	Call http::formatQuery with an even number of arguments, where 
-#	the first is a name, the second is a value, the third is another 
-#	name, and so on.
-#
-# Arguments:
-#	args	A list of name-value pairs.
-# Results:
-#        TODO
-
-proc http::formatQuery {args} {
-    set result ""
-    set sep ""
-    foreach i $args {
-	append result  $sep [mapReply $i]
-	if {$sep != "="} {
-	    set sep =
-	} else {
-	    set sep &
-	}
-    }
-    return $result
-}
-
-# do x-www-urlencoded character mapping
-# The spec says: "non-alphanumeric characters are replaced by '%HH'"
-# 1 leave alphanumerics characters alone
-# 2 Convert every other character to an array lookup
-# 3 Escape constructs that are "special" to the tcl parser
-# 4 "subst" the result, doing all the array substitutions
- 
- proc http::mapReply {string} {
-    variable formMap
-    set alphanumeric	a-zA-Z0-9
-    regsub -all \[^$alphanumeric\] $string {$formMap(&)} string
-    regsub -all \n $string {\\n} string
-    regsub -all \t $string {\\t} string
-    regsub -all {[][{})\\]\)} $string {\\&} string
-    return [subst $string]
-}
-
-# Default proxy filter. 
- proc http::ProxyRequired {host} {
-    variable http
-    if {[info exists http(-proxyhost)] && [string length $http(-proxyhost)]} {
-	if {![info exists http(-proxyport)] || ![string length $http(-proxyport)]} {
-	    set http(-proxyport) 8080
-	}
-	return [list $http(-proxyhost) $http(-proxyport)]
-    } else {
-	return {}
-    }
-}
diff --git a/library/http2.3/pkgIndex.tcl b/library/http2.3/pkgIndex.tcl
deleted file mode 100644
index 01052f3..0000000
--- a/library/http2.3/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.0
-# This file is generated by the "pkg_mkIndex" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded http 2.0 [list tclPkgSetup $dir http 2.0 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait}}}]
diff --git a/library/init.tcl b/library/init.tcl
deleted file mode 100644
index acd403d..0000000
--- a/library/init.tcl
+++ /dev/null
@@ -1,562 +0,0 @@
-# init.tcl --
-#
-# Default system startup file for Tcl-based applications.  Defines
-# "unknown" procedure and auto-load facilities.
-#
-# RCS: @(#) $Id: init.tcl,v 1.29 1999/04/16 00:46:56 stanton Exp $
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-if {[info commands package] == ""} {
-    error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
-}
-package require -exact Tcl 8.1
-
-# Compute the auto path to use in this interpreter.
-# The values on the path come from several locations:
-#
-# The environment variable TCLLIBPATH
-#
-# tcl_library, which is the directory containing this init.tcl script.
-# tclInitScript.h searches around for the directory containing this
-# init.tcl and defines tcl_library to that location before sourcing it.
-#
-# The parent directory of tcl_library. Adding the parent
-# means that packages in peer directories will be found automatically.
-#
-# tcl_pkgPath, which is set by the platform-specific initialization routines
-#	On UNIX it is compiled in
-#	On Windows it comes from the registry
-#	On Macintosh it is "Tool Command Language" in the Extensions folder
-
-if {![info exists auto_path]} {
-    if {[info exist env(TCLLIBPATH)]} {
-	set auto_path $env(TCLLIBPATH)
-    } else {
-	set auto_path ""
-    }
-}
-if {[string compare [info library] {}]} {
-    foreach __dir [list [info library] [file dirname [info library]]] {
-	if {[lsearch -exact $auto_path $__dir] < 0} {
-	    lappend auto_path $__dir
-	}
-    }
-}
-if {[info exist tcl_pkgPath]} {
-    foreach __dir $tcl_pkgPath {
-	if {[lsearch -exact $auto_path $__dir] < 0} {
-	    lappend auto_path $__dir
-	}
-    }
-}
-if {[info exists __dir]} {
-    unset __dir
-}
-  
-# Windows specific end of initialization
-
-if {(![interp issafe]) && ($tcl_platform(platform) == "windows")} {
-    namespace eval tcl {
-	proc envTraceProc {lo n1 n2 op} {
-	    set x $::env($n2)
-	    set ::env($lo) $x
-	    set ::env([string toupper $lo]) $x
-	}
-    }
-    foreach p [array names env] {
-	set u [string toupper $p]
-	if {$u != $p} {
-	    switch -- $u {
-		COMSPEC -
-		PATH {
-		    if {![info exists env($u)]} {
-			set env($u) $env($p)
-		    }
-		    trace variable env($p) w [list tcl::envTraceProc $p]
-		    trace variable env($u) w [list tcl::envTraceProc $p]
-		}
-	    }
-	}
-    }
-    if {[info exists p]} {
-	unset p
-    }
-    if {[info exists u]} {
-	unset u
-    }
-    if {![info exists env(COMSPEC)]} {
-	if {$tcl_platform(os) == {Windows NT}} {
-	    set env(COMSPEC) cmd.exe
-	} else {
-	    set env(COMSPEC) command.com
-	}
-    }
-}
-
-# Setup the unknown package handler
-
-package unknown tclPkgUnknown
-
-# Conditionalize for presence of exec.
-
-if {[info commands exec] == ""} {
-
-    # Some machines, such as the Macintosh, do not have exec. Also, on all
-    # platforms, safe interpreters do not have exec.
-
-    set auto_noexec 1
-}
-set errorCode ""
-set errorInfo ""
-
-# Define a log command (which can be overwitten to log errors
-# differently, specially when stderr is not available)
-
-if {[info commands tclLog] == ""} {
-    proc tclLog {string} {
-	catch {puts stderr $string}
-    }
-}
-
-# unknown --
-# This procedure is called when a Tcl command is invoked that doesn't
-# exist in the interpreter.  It takes the following steps to make the
-# command available:
-#
-#	1. See if the command has the form "namespace inscope ns cmd" and
-#	   if so, concatenate its arguments onto the end and evaluate it.
-#	2. See if the autoload facility can locate the command in a
-#	   Tcl script file.  If so, load it and execute it.
-#	3. If the command was invoked interactively at top-level:
-#	    (a) see if the command exists as an executable UNIX program.
-#		If so, "exec" the command.
-#	    (b) see if the command requests csh-like history substitution
-#		in one of the common forms !!, !<number>, or ^old^new.  If
-#		so, emulate csh's history substitution.
-#	    (c) see if the command is a unique abbreviation for another
-#		command.  If so, invoke the command.
-#
-# Arguments:
-# args -	A list whose elements are the words of the original
-#		command, including the command name.
-
-proc unknown args {
-    global auto_noexec auto_noload env unknown_pending tcl_interactive
-    global errorCode errorInfo
-
-    # If the command word has the form "namespace inscope ns cmd"
-    # then concatenate its arguments onto the end and evaluate it.
-
-    set cmd [lindex $args 0]
-    if {[regexp "^namespace\[ \t\n\]+inscope" $cmd] && [llength $cmd] == 4} {
-        set arglist [lrange $args 1 end]
-	set ret [catch {uplevel $cmd $arglist} result]
-        if {$ret == 0} {
-            return $result
-        } else {
-	    return -code $ret -errorcode $errorCode $result
-        }
-    }
-
-    # Save the values of errorCode and errorInfo variables, since they
-    # may get modified if caught errors occur below.  The variables will
-    # be restored just before re-executing the missing command.
-
-    set savedErrorCode $errorCode
-    set savedErrorInfo $errorInfo
-    set name [lindex $args 0]
-    if {![info exists auto_noload]} {
-	#
-	# Make sure we're not trying to load the same proc twice.
-	#
-	if {[info exists unknown_pending($name)]} {
-	    return -code error "self-referential recursion in \"unknown\" for command \"$name\"";
-	}
-	set unknown_pending($name) pending;
-	set ret [catch {auto_load $name [uplevel 1 {namespace current}]} msg]
-	unset unknown_pending($name);
-	if {$ret != 0} {
-	    return -code $ret -errorcode $errorCode \
-		"error while autoloading \"$name\": $msg"
-	}
-	if {![array size unknown_pending]} {
-	    unset unknown_pending
-	}
-	if {$msg} {
-	    set errorCode $savedErrorCode
-	    set errorInfo $savedErrorInfo
-	    set code [catch {uplevel 1 $args} msg]
-	    if {$code ==  1} {
-		#
-		# Strip the last five lines off the error stack (they're
-		# from the "uplevel" command).
-		#
-
-		set new [split $errorInfo \n]
-		set new [join [lrange $new 0 [expr {[llength $new] - 6}]] \n]
-		return -code error -errorcode $errorCode \
-			-errorinfo $new $msg
-	    } else {
-		return -code $code $msg
-	    }
-	}
-    }
-
-    if {([info level] == 1) && ([info script] == "") \
-	    && [info exists tcl_interactive] && $tcl_interactive} {
-	if {![info exists auto_noexec]} {
-	    set new [auto_execok $name]
-	    if {$new != ""} {
-		set errorCode $savedErrorCode
-		set errorInfo $savedErrorInfo
-		set redir ""
-		if {[info commands console] == ""} {
-		    set redir ">&@stdout <@stdin"
-		}
-		return [uplevel exec $redir $new [lrange $args 1 end]]
-	    }
-	}
-	set errorCode $savedErrorCode
-	set errorInfo $savedErrorInfo
-	if {$name == "!!"} {
-	    set newcmd [history event]
-	} elseif {[regexp {^!(.+)$} $name dummy event]} {
-	    set newcmd [history event $event]
-	} elseif {[regexp {^\^([^^]*)\^([^^]*)\^?$} $name dummy old new]} {
-	    set newcmd [history event -1]
-	    catch {regsub -all -- $old $newcmd $new newcmd}
-	}
-	if {[info exists newcmd]} {
-	    tclLog $newcmd
-	    history change $newcmd 0
-	    return [uplevel $newcmd]
-	}
-
-	set ret [catch {set cmds [info commands $name*]} msg]
-	if {[string compare $name "::"] == 0} {
-	    set name ""
-	}
-	if {$ret != 0} {
-	    return -code $ret -errorcode $errorCode \
-		"error in unknown while checking if \"$name\" is a unique command abbreviation: $msg"
-	}
-	if {[llength $cmds] == 1} {
-	    return [uplevel [lreplace $args 0 0 $cmds]]
-	}
-	if {[llength $cmds] != 0} {
-	    if {$name == ""} {
-		return -code error "empty command name \"\""
-	    } else {
-		return -code error \
-			"ambiguous command name \"$name\": [lsort $cmds]"
-	    }
-	}
-    }
-    return -code error "invalid command name \"$name\""
-}
-
-# auto_load --
-# Checks a collection of library directories to see if a procedure
-# is defined in one of them.  If so, it sources the appropriate
-# library file to create the procedure.  Returns 1 if it successfully
-# loaded the procedure, 0 otherwise.
-#
-# Arguments: 
-# cmd -			Name of the command to find and load.
-# namespace (optional)  The namespace where the command is being used - must be
-#                       a canonical namespace as returned [namespace current]
-#                       for instance. If not given, namespace current is used.
-
-proc auto_load {cmd {namespace {}}} {
-    global auto_index auto_oldpath auto_path
-
-    if {[string length $namespace] == 0} {
-	set namespace [uplevel {namespace current}]
-    }
-    set nameList [auto_qualify $cmd $namespace]
-    # workaround non canonical auto_index entries that might be around
-    # from older auto_mkindex versions
-    lappend nameList $cmd
-    foreach name $nameList {
-	if {[info exists auto_index($name)]} {
-	    uplevel #0 $auto_index($name)
-	    return [expr {[info commands $name] != ""}]
-	}
-    }
-    if {![info exists auto_path]} {
-	return 0
-    }
-
-    if {![auto_load_index]} {
-	return 0
-    }
-
-    foreach name $nameList {
-	if {[info exists auto_index($name)]} {
-	    uplevel #0 $auto_index($name)
-	    if {[info commands $name] != ""} {
-		return 1
-	    }
-	}
-    }
-    return 0
-}
-
-# auto_load_index --
-# Loads the contents of tclIndex files on the auto_path directory
-# list.  This is usually invoked within auto_load to load the index
-# of available commands.  Returns 1 if the index is loaded, and 0 if
-# the index is already loaded and up to date.
-#
-# Arguments: 
-# None.
-
-proc auto_load_index {} {
-    global auto_index auto_oldpath auto_path errorInfo errorCode
-
-    if {[info exists auto_oldpath]} {
-	if {$auto_oldpath == $auto_path} {
-	    return 0
-	}
-    }
-    set auto_oldpath $auto_path
-
-    # Check if we are a safe interpreter. In that case, we support only
-    # newer format tclIndex files.
-
-    set issafe [interp issafe]
-    for {set i [expr {[llength $auto_path] - 1}]} {$i >= 0} {incr i -1} {
-	set dir [lindex $auto_path $i]
-	set f ""
-	if {$issafe} {
-	    catch {source [file join $dir tclIndex]}
-	} elseif {[catch {set f [open [file join $dir tclIndex]]}]} {
-	    continue
-	} else {
-	    set error [catch {
-		set id [gets $f]
-		if {$id == "# Tcl autoload index file, version 2.0"} {
-		    eval [read $f]
-		} elseif {$id == \
-		    "# Tcl autoload index file: each line identifies a Tcl"} {
-		    while {[gets $f line] >= 0} {
-			if {([string index $line 0] == "#")
-				|| ([llength $line] != 2)} {
-			    continue
-			}
-			set name [lindex $line 0]
-			set auto_index($name) \
-			    "source [file join $dir [lindex $line 1]]"
-		    }
-		} else {
-		    error \
-		      "[file join $dir tclIndex] isn't a proper Tcl index file"
-		}
-	    } msg]
-	    if {$f != ""} {
-		close $f
-	    }
-	    if {$error} {
-		error $msg $errorInfo $errorCode
-	    }
-	}
-    }
-    return 1
-}
-
-# auto_qualify --
-#
-# Compute a fully qualified names list for use in the auto_index array.
-# For historical reasons, commands in the global namespace do not have leading
-# :: in the index key. The list has two elements when the command name is
-# relative (no leading ::) and the namespace is not the global one. Otherwise
-# only one name is returned (and searched in the auto_index).
-#
-# Arguments -
-# cmd		The command name. Can be any name accepted for command
-#               invocations (Like "foo::::bar").
-# namespace	The namespace where the command is being used - must be
-#               a canonical namespace as returned by [namespace current]
-#               for instance.
-
-proc auto_qualify {cmd namespace} {
-
-    # count separators and clean them up
-    # (making sure that foo:::::bar will be treated as foo::bar)
-    set n [regsub -all {::+} $cmd :: cmd]
-
-    # Ignore namespace if the name starts with ::
-    # Handle special case of only leading ::
-
-    # Before each return case we give an example of which category it is
-    # with the following form :
-    # ( inputCmd, inputNameSpace) -> output
-
-    if {[regexp {^::(.*)$} $cmd x tail]} {
-	if {$n > 1} {
-	    # ( ::foo::bar , * ) -> ::foo::bar
-	    return [list $cmd]
-	} else {
-	    # ( ::global , * ) -> global
-	    return [list $tail]
-	}
-    }
-    
-    # Potentially returning 2 elements to try  :
-    # (if the current namespace is not the global one)
-
-    if {$n == 0} {
-	if {[string compare $namespace ::] == 0} {
-	    # ( nocolons , :: ) -> nocolons
-	    return [list $cmd]
-	} else {
-	    # ( nocolons , ::sub ) -> ::sub::nocolons nocolons
-	    return [list ${namespace}::$cmd $cmd]
-	}
-    } else {
-	if {[string compare $namespace ::] == 0} {
-	    #  ( foo::bar , :: ) -> ::foo::bar
-	    return [list ::$cmd]
-	} else {
-	    # ( foo::bar , ::sub ) -> ::sub::foo::bar ::foo::bar
-	    return [list ${namespace}::$cmd ::$cmd]
-	}
-    }
-}
-
-# auto_import --
-#
-# Invoked during "namespace import" to make see if the imported commands
-# reside in an autoloaded library.  If so, the commands are loaded so
-# that they will be available for the import links.  If not, then this
-# procedure does nothing.
-#
-# Arguments -
-# pattern	The pattern of commands being imported (like "foo::*")
-#               a canonical namespace as returned by [namespace current]
-
-proc auto_import {pattern} {
-    global auto_index
-
-    set ns [uplevel namespace current]
-    set patternList [auto_qualify $pattern $ns]
-
-    auto_load_index
-
-    foreach pattern $patternList {
-        foreach name [array names auto_index] {
-            if {[string match $pattern $name] && "" == [info commands $name]} {
-                uplevel #0 $auto_index($name)
-            }
-        }
-    }
-}
-
-# auto_execok --
-#
-# Returns string that indicates name of program to execute if 
-# name corresponds to a shell builtin or an executable in the
-# Windows search path, or "" otherwise.  Builds an associative 
-# array auto_execs that caches information about previous checks, 
-# for speed.
-#
-# Arguments: 
-# name -			Name of a command.
-
-if {[string compare $tcl_platform(platform) windows] == 0} {
-# Windows version.
-#
-# Note that info executable doesn't work under Windows, so we have to
-# look for files with .exe, .com, or .bat extensions.  Also, the path
-# may be in the Path or PATH environment variables, and path
-# components are separated with semicolons, not colons as under Unix.
-#
-proc auto_execok name {
-    global auto_execs env tcl_platform
-
-    if {[info exists auto_execs($name)]} {
-	return $auto_execs($name)
-    }
-    set auto_execs($name) ""
-
-    if {[lsearch -exact {cls copy date del erase dir echo mkdir md rename 
-	    ren rmdir rd time type ver vol} $name] != -1} {
-	return [set auto_execs($name) [list $env(COMSPEC) /c $name]]
-    }
-
-    if {[llength [file split $name]] != 1} {
-	foreach ext {{} .com .exe .bat} {
-	    set file ${name}${ext}
-	    if {[file exists $file] && ![file isdirectory $file]} {
-		return [set auto_execs($name) [list $file]]
-	    }
-	}
-	return ""
-    }
-
-    set path "[file dirname [info nameof]];.;"
-    if {[info exists env(WINDIR)]} {
-	set windir $env(WINDIR) 
-    }
-    if {[info exists windir]} {
-	if {$tcl_platform(os) == "Windows NT"} {
-	    append path "$windir/system32;"
-	}
-	append path "$windir/system;$windir;"
-    }
-
-    if {[info exists env(PATH)]} {
-	append path $env(PATH)
-    }
-
-    foreach dir [split $path {;}] {
-	if {$dir == ""} {
-	    set dir .
-	}
-	foreach ext {{} .com .exe .bat} {
-	    set file [file join $dir ${name}${ext}]
-	    if {[file exists $file] && ![file isdirectory $file]} {
-		return [set auto_execs($name) [list $file]]
-	    }
-	}
-    }
-    return ""
-}
-
-} else {
-# Unix version.
-#
-proc auto_execok name {
-    global auto_execs env
-
-    if {[info exists auto_execs($name)]} {
-	return $auto_execs($name)
-    }
-    set auto_execs($name) ""
-    if {[llength [file split $name]] != 1} {
-	if {[file executable $name] && ![file isdirectory $name]} {
-	    set auto_execs($name) [list $name]
-	}
-	return $auto_execs($name)
-    }
-    foreach dir [split $env(PATH) :] {
-	if {$dir == ""} {
-	    set dir .
-	}
-	set file [file join $dir $name]
-	if {[file executable $file] && ![file isdirectory $file]} {
-	    set auto_execs($name) [list $file]
-	    return $auto_execs($name)
-	}
-    }
-    return ""
-}
-
-}
diff --git a/library/ldAout.tcl b/library/ldAout.tcl
deleted file mode 100644
index ad12624..0000000
--- a/library/ldAout.tcl
+++ /dev/null
@@ -1,240 +0,0 @@
-# ldAout.tcl --
-#
-#	This "tclldAout" procedure in this script acts as a replacement
-#	for the "ld" command when linking an object file that will be
-#	loaded dynamically into Tcl or Tk using pseudo-static linking.
-#
-# Parameters:
-#	The arguments to the script are the command line options for
-#	an "ld" command.
-#
-# Results:
-#	The "ld" command is parsed, and the "-o" option determines the
-#	module name.  ".a" and ".o" options are accumulated.
-#	The input archives and object files are examined with the "nm"
-#	command to determine whether the modules initialization
-#	entry and safe initialization entry are present.  A trivial
-#	C function that locates the entries is composed, compiled, and
-#	its .o file placed before all others in the command; then
-#	"ld" is executed to bind the objects together.
-#
-# RCS: @(#) $Id: ldAout.tcl,v 1.3 1998/11/11 02:39:31 welch Exp $
-#
-# Copyright (c) 1995, by General Electric Company. All rights reserved.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# This work was supported in part by the ARPA Manufacturing Automation
-# and Design Engineering (MADE) Initiative through ARPA contract
-# F33615-94-C-4400.
-
-proc tclLdAout {{cc {}} {shlib_suffix {}} {shlib_cflags none}} {
-  global env
-  global argv
-
-  if {$cc==""} {
-    set cc $env(CC)
-  }
-
-  # if only two parameters are supplied there is assumed that the
-  # only shlib_suffix is missing. This parameter is anyway available
-  # as "info sharedlibextension" too, so there is no need to transfer
-  # 3 parameters to the function tclLdAout. For compatibility, this
-  # function now accepts both 2 and 3 parameters.
-
-  if {$shlib_suffix==""} {
-    set shlib_cflags $env(SHLIB_CFLAGS)
-  } else {
-    if {$shlib_cflags=="none"} {
-      set shlib_cflags $shlib_suffix
-    }
-  }
-
-  # seenDotO is nonzero if a .o or .a file has been seen
-
-  set seenDotO 0
-
-  # minusO is nonzero if the last command line argument was "-o".
-
-  set minusO 0
-
-  # head has command line arguments up to but not including the first
-  # .o or .a file. tail has the rest of the arguments.
-
-  set head {}
-  set tail {}
-
-  # nmCommand is the "nm" command that lists global symbols from the
-  # object files.
-
-  set nmCommand {|nm -g}
-
-  # entryProtos is the table of _Init and _SafeInit prototypes found in the
-  # module.
-
-  set entryProtos {}
-
-  # entryPoints is the table of _Init and _SafeInit entries found in the
-  # module.
-
-  set entryPoints {}
-
-  # libraries is the list of -L and -l flags to the linker.
-
-  set libraries {}
-  set libdirs {}
-
-  # Process command line arguments
-
-  foreach a $argv {
-    if {!$minusO && [regexp {\.[ao]$} $a]} {
-      set seenDotO 1
-      lappend nmCommand $a
-    }
-    if {$minusO} {
-      set outputFile $a
-      set minusO 0
-    } elseif {![string compare $a -o]} {
-      set minusO 1
-    }
-    if {[regexp {^-[lL]} $a]} {
-	lappend libraries $a
-	if {[regexp {^-L} $a]} {
-	    lappend libdirs [string range $a 2 end]
-	}
-    } elseif {$seenDotO} {
-	lappend tail $a
-    } else {
-	lappend head $a
-    }
-  }
-  lappend libdirs /lib /usr/lib
-
-  # MIPS -- If there are corresponding G0 libraries, replace the
-  # ordinary ones with the G0 ones.
-
-  set libs {}
-  foreach lib $libraries {
-      if {[regexp {^-l} $lib]} {
-	  set lname [string range $lib 2 end]
-	  foreach dir $libdirs {
-	      if {[file exists [file join $dir lib${lname}_G0.a]]} {
-		  set lname ${lname}_G0
-		  break
-	      }
-	  }
-	  lappend libs -l$lname
-      } else {
-	  lappend libs $lib
-      }
-  }
-  set libraries $libs
-
-  # Extract the module name from the "-o" option
-
-  if {![info exists outputFile]} {
-    error "-o option must be supplied to link a Tcl load module"
-  }
-  set m [file tail $outputFile]
-  if {[regexp {\.a$} $outputFile]} {
-    set shlib_suffix .a
-  } else {
-    set shlib_suffix ""
-  }
-  if {[regexp {\..*$} $outputFile match]} {
-    set l [expr {[string length $m] - [string length $match]}]
-  } else {
-    error "Output file does not appear to have a suffix"
-  }
-  set modName [string tolower [string range $m 0 [expr {$l-1}]]]
-  if {[regexp {^lib} $modName]} {
-    set modName [string range $modName 3 end]
-  }
-  if {[regexp {[0-9\.]*(_g0)?$} $modName match]} {
-    set modName [string range $modName 0 [expr {[string length $modName]-[string length $match]-1}]]
-  }
-  set modName "[string toupper [string index $modName 0]][string range $modName 1 end]"
-  
-  # Catalog initialization entry points found in the module
-
-  set f [open $nmCommand r]
-  while {[gets $f l] >= 0} {
-    if {[regexp {T[ 	]*_?([A-Z][a-z0-9_]*_(Safe)?Init(__FP10Tcl_Interp)?)$} $l trash symbol]} {
-      if {![regexp {_?([A-Z][a-z0-9_]*_(Safe)?Init)} $symbol trash s]} {
-	set s $symbol
-      }
-      append entryProtos {extern int } $symbol { (); } \n
-      append entryPoints {  } \{ { "} $s {", } $symbol { } \} , \n
-    }
-  }
-  close $f
-
-  if {$entryPoints==""} {
-    error "No entry point found in objects"
-  }
-
-  # Compose a C function that resolves the initialization entry points and
-  # embeds the required libraries in the object code.
-
-  set C {#include <string.h>}
-  append C \n
-  append C {char TclLoadLibraries_} $modName { [] =} \n
-  append C {  "@LIBS: } $libraries {";} \n
-  append C $entryProtos
-  append C {static struct } \{ \n
-  append C {  char * name;} \n
-  append C {  int (*value)();} \n
-  append C \} {dictionary [] = } \{ \n
-  append C $entryPoints
-  append C {  0, 0 } \n \} \; \n
-  append C {typedef struct Tcl_Interp Tcl_Interp;} \n
-  append C {typedef int Tcl_PackageInitProc (Tcl_Interp *);} \n
-  append C {Tcl_PackageInitProc *} \n
-  append C TclLoadDictionary_ $modName { (symbol)} \n
-  append C {    char * symbol;} \n
-  append C {{
-    int i;
-    for (i = 0; dictionary [i] . name != 0; ++i) {
-      if (!strcmp (symbol, dictionary [i] . name)) {
-	return dictionary [i].value;
-      }
-    }
-    return 0;
-}} \n
-
-  # Write the C module and compile it
-
-  set cFile tcl$modName.c
-  set f [open $cFile w]
-  puts -nonewline $f $C
-  close $f
-  set ccCommand "$cc -c $shlib_cflags $cFile"
-  puts stderr $ccCommand
-  eval exec $ccCommand
-
-  # Now compose and execute the ld command that packages the module
-
-  if {$shlib_suffix == ".a"} {
-    set ldCommand "ar cr $outputFile"
-    regsub { -o} $tail {} tail
-  } else {
-    set ldCommand ld
-    foreach item $head {
-      lappend ldCommand $item
-    }
-  }
-  lappend ldCommand tcl$modName.o
-  foreach item $tail {
-    lappend ldCommand $item
-  }
-  puts stderr $ldCommand
-  eval exec $ldCommand
-  if {$shlib_suffix == ".a"} {
-    exec ranlib $outputFile
-  }
-
-  # Clean up working files
-
-  exec /bin/rm $cFile [file rootname $cFile].o
-}
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
deleted file mode 100644
index 37676da..0000000
--- a/library/msgcat/msgcat.tcl
+++ /dev/null
@@ -1,177 +0,0 @@
-# msgcat.tcl --
-#
-#	This file defines various procedures which implement a
-#	message catalog facility for Tcl programs.  It should be
-#	loaded with the command "package require msgcat".
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# Copyright (c) 1998 by Mark Harrison.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: msgcat.tcl,v 1.2 1999/04/16 00:47:17 stanton Exp $
-
-package provide msgcat 1.0
-
-namespace eval msgcat {
-    namespace export mc mcset mclocale mcpreferences mcunknown
-
-    # Records the current locale as passed to mclocale
-    variable locale ""
-
-    # Records the list of locales to search
-    variable loclist {}
-
-    # Records the mapping between source strings and translated strings.  The
-    # array key is of the form "<locale>,<namespace>,<src>" and the value is
-    # the translated string.
-    array set msgs {}
-}
-
-# msgcat::mc --
-#
-#	Find the translation for the given string based on the current
-#	locale setting.
-#
-# Arguments:
-#	src	The string to translate.
-#
-# Results:
-#	Returns the translatd string.
-
-proc msgcat::mc {src} {
-    set ns [uplevel {namespace current}]
-    foreach loc $::msgcat::loclist {
-	if {[info exists ::msgcat::msgs($loc,$ns,$src)]} {
-	    return $::msgcat::msgs($loc,$ns,$src)
-	}
-    }
-    # we have not found the translation
-    return [uplevel 1 [list [namespace origin mcunknown] \
-	    $::msgcat::locale $src]]
-}
-
-# msgcat::mclocale --
-#
-#	Query or set the current locale.
-#
-# Arguments:
-#	newLocale	(Optional) The new locale string. Locale strings
-#			should be composed of one or more sublocale parts
-#			separated by underscores (e.g. en_US).
-#
-# Results:
-#	Returns the current locale.
-
-proc msgcat::mclocale {args} {
-    set len [llength $args]
-
-    if {$len > 1} {
-	error {wrong # args: should be "mclocale ?newLocale?"}
-    }
-
-    set args [string tolower $args]
-    if {$len == 1} {
-	set ::msgcat::locale $args
-	set ::msgcat::loclist {}
-	set word ""
-	foreach part [split $args _] {
-	    set word [string trimleft "${word}_${part}" _]
-	    set ::msgcat::loclist \
-                    [linsert $::msgcat::loclist 0 $word]
-	}
-    }
-    return $::msgcat::locale
-}
-
-# msgcat::mcpreferences --
-#
-#	Fetch the list of locales used to look up strings, ordered from
-#	most preferred to least preferred.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	Returns an ordered list of the locales preferred by the user.
-
-proc msgcat::mcpreferences {} {
-    return $::msgcat::loclist
-}
-
-# msgcat::mcload --
-#
-#	Attempt to load message catalogs for each locale in the
-#	preference list from the specified directory.
-#
-# Arguments:
-#	langdir		The directory to search.
-#
-# Results:
-#	Returns the number of message catalogs that were loaded.
-
-proc msgcat::mcload {langdir} {
-    set x 0
-    foreach p [::msgcat::mcpreferences] {
-	set langfile [file join $langdir $p.msg]
-	if {[file exists $langfile]} {
-	    incr x
-	    uplevel [list source $langfile]
-	}
-    }
-    return $x
-}
-
-# msgcat::mcset --
-#
-#	Set the translation for a given string in a specified locale.
-#
-# Arguments:
-#	locale		The locale to use.
-#	src		The source string.
-#	dest		(Optional) The translated string.  If omitted,
-#			the source string is used.
-#
-# Results:
-#	Returns the new locale.
-
-proc msgcat::mcset {locale src {dest ""}} {
-    if {$dest == ""} {
-	set dest $src
-    }
-
-    set ns [uplevel {namespace current}]
-
-    set ::msgcat::msgs([string tolower $locale],$ns,$src) $dest
-    return $dest
-}
-
-# msgcat::mcunknown --
-#
-#	This routine is called by msgcat::mc if a translation cannot
-#	be found for a string.  This routine is intended to be replaced
-#	by an application specific routine for error reporting
-#	purposes.  The default behavior is to return the source string.  
-#
-# Arguments:
-#	locale		The current locale.
-#	src		The string to be translated.
-#
-# Results:
-#	Returns the translated value.
-
-proc msgcat::mcunknown {locale src} {
-    return $src
-}
-
-# Initialize the default locale
-
-namespace eval msgcat {
-    # set default locale, try to get from environment
-    if {[info exists ::env(LANG)]} {
-        mclocale $::env(LANG)
-    } else {
-        mclocale "C"
-    }
-}
diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl
deleted file mode 100644
index b40a4f3..0000000
--- a/library/msgcat/pkgIndex.tcl
+++ /dev/null
@@ -1 +0,0 @@
-package ifneeded msgcat 1.0 [list source [file join $dir msgcat.tcl]]
diff --git a/library/msgcat1.0/msgcat.tcl b/library/msgcat1.0/msgcat.tcl
deleted file mode 100644
index 37676da..0000000
--- a/library/msgcat1.0/msgcat.tcl
+++ /dev/null
@@ -1,177 +0,0 @@
-# msgcat.tcl --
-#
-#	This file defines various procedures which implement a
-#	message catalog facility for Tcl programs.  It should be
-#	loaded with the command "package require msgcat".
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# Copyright (c) 1998 by Mark Harrison.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: msgcat.tcl,v 1.2 1999/04/16 00:47:17 stanton Exp $
-
-package provide msgcat 1.0
-
-namespace eval msgcat {
-    namespace export mc mcset mclocale mcpreferences mcunknown
-
-    # Records the current locale as passed to mclocale
-    variable locale ""
-
-    # Records the list of locales to search
-    variable loclist {}
-
-    # Records the mapping between source strings and translated strings.  The
-    # array key is of the form "<locale>,<namespace>,<src>" and the value is
-    # the translated string.
-    array set msgs {}
-}
-
-# msgcat::mc --
-#
-#	Find the translation for the given string based on the current
-#	locale setting.
-#
-# Arguments:
-#	src	The string to translate.
-#
-# Results:
-#	Returns the translatd string.
-
-proc msgcat::mc {src} {
-    set ns [uplevel {namespace current}]
-    foreach loc $::msgcat::loclist {
-	if {[info exists ::msgcat::msgs($loc,$ns,$src)]} {
-	    return $::msgcat::msgs($loc,$ns,$src)
-	}
-    }
-    # we have not found the translation
-    return [uplevel 1 [list [namespace origin mcunknown] \
-	    $::msgcat::locale $src]]
-}
-
-# msgcat::mclocale --
-#
-#	Query or set the current locale.
-#
-# Arguments:
-#	newLocale	(Optional) The new locale string. Locale strings
-#			should be composed of one or more sublocale parts
-#			separated by underscores (e.g. en_US).
-#
-# Results:
-#	Returns the current locale.
-
-proc msgcat::mclocale {args} {
-    set len [llength $args]
-
-    if {$len > 1} {
-	error {wrong # args: should be "mclocale ?newLocale?"}
-    }
-
-    set args [string tolower $args]
-    if {$len == 1} {
-	set ::msgcat::locale $args
-	set ::msgcat::loclist {}
-	set word ""
-	foreach part [split $args _] {
-	    set word [string trimleft "${word}_${part}" _]
-	    set ::msgcat::loclist \
-                    [linsert $::msgcat::loclist 0 $word]
-	}
-    }
-    return $::msgcat::locale
-}
-
-# msgcat::mcpreferences --
-#
-#	Fetch the list of locales used to look up strings, ordered from
-#	most preferred to least preferred.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	Returns an ordered list of the locales preferred by the user.
-
-proc msgcat::mcpreferences {} {
-    return $::msgcat::loclist
-}
-
-# msgcat::mcload --
-#
-#	Attempt to load message catalogs for each locale in the
-#	preference list from the specified directory.
-#
-# Arguments:
-#	langdir		The directory to search.
-#
-# Results:
-#	Returns the number of message catalogs that were loaded.
-
-proc msgcat::mcload {langdir} {
-    set x 0
-    foreach p [::msgcat::mcpreferences] {
-	set langfile [file join $langdir $p.msg]
-	if {[file exists $langfile]} {
-	    incr x
-	    uplevel [list source $langfile]
-	}
-    }
-    return $x
-}
-
-# msgcat::mcset --
-#
-#	Set the translation for a given string in a specified locale.
-#
-# Arguments:
-#	locale		The locale to use.
-#	src		The source string.
-#	dest		(Optional) The translated string.  If omitted,
-#			the source string is used.
-#
-# Results:
-#	Returns the new locale.
-
-proc msgcat::mcset {locale src {dest ""}} {
-    if {$dest == ""} {
-	set dest $src
-    }
-
-    set ns [uplevel {namespace current}]
-
-    set ::msgcat::msgs([string tolower $locale],$ns,$src) $dest
-    return $dest
-}
-
-# msgcat::mcunknown --
-#
-#	This routine is called by msgcat::mc if a translation cannot
-#	be found for a string.  This routine is intended to be replaced
-#	by an application specific routine for error reporting
-#	purposes.  The default behavior is to return the source string.  
-#
-# Arguments:
-#	locale		The current locale.
-#	src		The string to be translated.
-#
-# Results:
-#	Returns the translated value.
-
-proc msgcat::mcunknown {locale src} {
-    return $src
-}
-
-# Initialize the default locale
-
-namespace eval msgcat {
-    # set default locale, try to get from environment
-    if {[info exists ::env(LANG)]} {
-        mclocale $::env(LANG)
-    } else {
-        mclocale "C"
-    }
-}
diff --git a/library/msgcat1.0/pkgIndex.tcl b/library/msgcat1.0/pkgIndex.tcl
deleted file mode 100644
index b40a4f3..0000000
--- a/library/msgcat1.0/pkgIndex.tcl
+++ /dev/null
@@ -1 +0,0 @@
-package ifneeded msgcat 1.0 [list source [file join $dir msgcat.tcl]]
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
deleted file mode 100644
index 289a39a..0000000
--- a/library/opt/optparse.tcl
+++ /dev/null
@@ -1,1097 +0,0 @@
-# optparse.tcl --
-#
-#       (private) Option parsing package
-#       Primarily used internally by the safe:: code.
-#
-#	WARNING: This code will go away in a future release
-#	of Tcl.  It is NOT supported and you should not rely
-#	on it.  If your code does rely on this package you
-#	may directly incorporate this code into your application.
-#
-# RCS: @(#) $Id: optparse.tcl,v 1.2 1999/04/16 00:47:18 stanton Exp $
-
-package provide opt 0.4.1
-
-namespace eval ::tcl {
-
-    # Exported APIs
-    namespace export OptKeyRegister OptKeyDelete OptKeyError OptKeyParse \
-             OptProc OptProcArgGiven OptParse \
-	     Lempty Lget \
-             Lassign Lvarpop Lvarpop1 Lvarset Lvarincr Lfirst Lrest \
-             SetMax SetMin
-
-
-#################  Example of use / 'user documentation'  ###################
-
-    proc OptCreateTestProc {} {
-
-	# Defines ::tcl::OptParseTest as a test proc with parsed arguments
-	# (can't be defined before the code below is loaded (before "OptProc"))
-
-	# Every OptProc give usage information on "procname -help".
-	# Try "tcl::OptParseTest -help" and "tcl::OptParseTest -a" and
-	# then other arguments.
-	# 
-	# example of 'valid' call:
-	# ::tcl::OptParseTest save -4 -pr 23 -libsok SybTcl\
-	#		-nostatics false ch1
-	OptProc OptParseTest {
-            {subcommand -choice {save print} "sub command"}
-            {arg1 3 "some number"}
-            {-aflag}
-            {-intflag      7}
-            {-weirdflag                    "help string"}
-            {-noStatics                    "Not ok to load static packages"}
-            {-nestedloading1 true           "OK to load into nested slaves"}
-            {-nestedloading2 -boolean true "OK to load into nested slaves"}
-            {-libsOK        -choice {Tk SybTcl}
-		                      "List of packages that can be loaded"}
-            {-precision     -int 12        "Number of digits of precision"}
-            {-intval        7               "An integer"}
-            {-scale         -float 1.0     "Scale factor"}
-            {-zoom          1.0             "Zoom factor"}
-            {-arbitrary     foobar          "Arbitrary string"}
-            {-random        -string 12   "Random string"}
-            {-listval       -list {}       "List value"}
-            {-blahflag       -blah abc       "Funny type"}
-	    {arg2 -boolean "a boolean"}
-	    {arg3 -choice "ch1 ch2"}
-	    {?optarg? -list {} "optional argument"}
-        } {
-	    foreach v [info locals] {
-		puts stderr [format "%14s : %s" $v [set $v]]
-	    }
-	}
-    }
-
-###################  No User serviceable part below ! ###############
-# You should really not look any further :
-# The following is private unexported undocumented unblessed... code 
-# time to hit "q" ;-) !
-
-# Hmmm... ok, you really want to know ?
-
-# You've been warned... Here it is...
-
-    # Array storing the parsed descriptions
-    variable OptDesc;
-    array set OptDesc {};
-    # Next potentially free key id (numeric)
-    variable OptDescN 0;
-
-# Inside algorithm/mechanism description:
-# (not for the faint hearted ;-)
-#
-# The argument description is parsed into a "program tree"
-# It is called a "program" because it is the program used by
-# the state machine interpreter that use that program to
-# actually parse the arguments at run time.
-#
-# The general structure of a "program" is
-# notation (pseudo bnf like)
-#    name :== definition        defines "name" as being "definition" 
-#    { x y z }                  means list of x, y, and z  
-#    x*                         means x repeated 0 or more time
-#    x+                         means "x x*"
-#    x?                         means optionally x
-#    x | y                      means x or y
-#    "cccc"                     means the literal string
-#
-#    program        :== { programCounter programStep* }
-#
-#    programStep    :== program | singleStep
-#
-#    programCounter :== {"P" integer+ }
-#
-#    singleStep     :== { instruction parameters* }
-#
-#    instruction    :== single element list
-#
-# (the difference between singleStep and program is that \
-#   llength [Lfirst $program] >= 2
-# while
-#   llength [Lfirst $singleStep] == 1
-# )
-#
-# And for this application:
-#
-#    singleStep     :== { instruction varname {hasBeenSet currentValue} type 
-#                         typeArgs help }
-#    instruction    :== "flags" | "value"
-#    type           :== knowType | anyword
-#    knowType       :== "string" | "int" | "boolean" | "boolflag" | "float"
-#                       | "choice"
-#
-# for type "choice" typeArgs is a list of possible choices, the first one
-# is the default value. for all other types the typeArgs is the default value
-#
-# a "boolflag" is the type for a flag whose presence or absence, without
-# additional arguments means respectively true or false (default flag type).
-#
-# programCounter is the index in the list of the currently processed
-# programStep (thus starting at 1 (0 is {"P" prgCounterValue}).
-# If it is a list it points toward each currently selected programStep.
-# (like for "flags", as they are optional, form a set and programStep).
-
-# Performance/Implementation issues
-# ---------------------------------
-# We use tcl lists instead of arrays because with tcl8.0
-# they should start to be much faster.
-# But this code use a lot of helper procs (like Lvarset)
-# which are quite slow and would be helpfully optimized
-# for instance by being written in C. Also our struture
-# is complex and there is maybe some places where the
-# string rep might be calculated at great exense. to be checked.
-
-#
-# Parse a given description and saves it here under the given key
-# generate a unused keyid if not given
-#
-proc ::tcl::OptKeyRegister {desc {key ""}} {
-    variable OptDesc;
-    variable OptDescN;
-    if {[string compare $key ""] == 0} {
-        # in case a key given to us as a parameter was a number
-        while {[info exists OptDesc($OptDescN)]} {incr OptDescN}
-        set key $OptDescN;
-        incr OptDescN;
-    }
-    # program counter
-    set program [list [list "P" 1]];
-
-    # are we processing flags (which makes a single program step)
-    set inflags 0;
-
-    set state {};
-
-    # flag used to detect that we just have a single (flags set) subprogram.
-    set empty 1;
-
-    foreach item $desc {
-	if {$state == "args"} {
-	    # more items after 'args'...
-	    return -code error "'args' special argument must be the last one";
-	}
-        set res [OptNormalizeOne $item];
-        set state [Lfirst $res];
-        if {$inflags} {
-            if {$state == "flags"} {
-		# add to 'subprogram'
-                lappend flagsprg $res;
-            } else {
-                # put in the flags
-                # structure for flag programs items is a list of
-                # {subprgcounter {prg flag 1} {prg flag 2} {...}}
-                lappend program $flagsprg;
-                # put the other regular stuff
-                lappend program $res;
-		set inflags 0;
-		set empty 0;
-            }
-        } else {
-           if {$state == "flags"} {
-               set inflags 1;
-               # sub program counter + first sub program
-               set flagsprg [list [list "P" 1] $res];
-           } else {
-               lappend program $res;
-               set empty 0;
-           }
-       }
-   }
-   if {$inflags} {
-       if {$empty} {
-	   # We just have the subprogram, optimize and remove
-	   # unneeded level:
-	   set program $flagsprg;
-       } else {
-	   lappend program $flagsprg;
-       }
-   }
-
-   set OptDesc($key) $program;
-
-   return $key;
-}
-
-#
-# Free the storage for that given key
-#
-proc ::tcl::OptKeyDelete {key} {
-    variable OptDesc;
-    unset OptDesc($key);
-}
-
-    # Get the parsed description stored under the given key.
-    proc OptKeyGetDesc {descKey} {
-        variable OptDesc;
-        if {![info exists OptDesc($descKey)]} {
-            return -code error "Unknown option description key \"$descKey\"";
-        }
-        set OptDesc($descKey);
-    }
-
-# Parse entry point for ppl who don't want to register with a key,
-# for instance because the description changes dynamically.
-#  (otherwise one should really use OptKeyRegister once + OptKeyParse
-#   as it is way faster or simply OptProc which does it all)
-# Assign a temporary key, call OptKeyParse and then free the storage
-proc ::tcl::OptParse {desc arglist} {
-    set tempkey [OptKeyRegister $desc];
-    set ret [catch {uplevel [list ::tcl::OptKeyParse $tempkey $arglist]} res];
-    OptKeyDelete $tempkey;
-    return -code $ret $res;
-}
-
-# Helper function, replacement for proc that both
-# register the description under a key which is the name of the proc
-# (and thus unique to that code)
-# and add a first line to the code to call the OptKeyParse proc
-# Stores the list of variables that have been actually given by the user
-# (the other will be sets to their default value)
-# into local variable named "Args".
-proc ::tcl::OptProc {name desc body} {
-    set namespace [uplevel namespace current];
-    if {   ([string match $name "::*"]) 
-        || ([string compare $namespace "::"]==0)} {
-        # absolute name or global namespace, name is the key
-        set key $name;
-    } else {
-        # we are relative to some non top level namespace:
-        set key "${namespace}::${name}";
-    }
-    OptKeyRegister $desc $key;
-    uplevel [list proc $name args "set Args \[::tcl::OptKeyParse $key \$args\]\n$body"];
-    return $key;
-}
-# Check that a argument has been given
-# assumes that "OptProc" has been used as it will check in "Args" list
-proc ::tcl::OptProcArgGiven {argname} {
-    upvar Args alist;
-    expr {[lsearch $alist $argname] >=0}
-}
-
-    #######
-    # Programs/Descriptions manipulation
-
-    # Return the instruction word/list of a given step/(sub)program
-    proc OptInstr {lst} {
-	Lfirst $lst;
-    }
-    # Is a (sub) program or a plain instruction ?
-    proc OptIsPrg {lst} {
-	expr {[llength [OptInstr $lst]]>=2}
-    }
-    # Is this instruction a program counter or a real instr
-    proc OptIsCounter {item} {
-	expr {[Lfirst $item]=="P"}
-    }
-    # Current program counter (2nd word of first word)
-    proc OptGetPrgCounter {lst} {
-	Lget $lst {0 1}
-    }
-    # Current program counter (2nd word of first word)
-    proc OptSetPrgCounter {lstName newValue} {
-	upvar $lstName lst;
-	set lst [lreplace $lst 0 0 [concat "P" $newValue]];
-    }
-    # returns a list of currently selected items.
-    proc OptSelection {lst} {
-	set res {};
-	foreach idx [lrange [Lfirst $lst] 1 end] {
-	    lappend res [Lget $lst $idx];
-	}
-	return $res;
-    }
-
-    # Advance to next description
-    proc OptNextDesc {descName} {
-        uplevel [list Lvarincr $descName {0 1}];
-    }
-
-    # Get the current description, eventually descend
-    proc OptCurDesc {descriptions} {
-        lindex $descriptions [OptGetPrgCounter $descriptions];
-    }
-    # get the current description, eventually descend
-    # through sub programs as needed.
-    proc OptCurDescFinal {descriptions} {
-        set item [OptCurDesc $descriptions];
-	# Descend untill we get the actual item and not a sub program
-        while {[OptIsPrg $item]} {
-            set item [OptCurDesc $item];
-        }
-	return $item;
-    }
-    # Current final instruction adress
-    proc OptCurAddr {descriptions {start {}}} {
-	set adress [OptGetPrgCounter $descriptions];
-	lappend start $adress;
-	set item [lindex $descriptions $adress];
-	if {[OptIsPrg $item]} {
-	    return [OptCurAddr $item $start];
-	} else {
-	    return $start;
-	}
-    }
-    # Set the value field of the current instruction
-    proc OptCurSetValue {descriptionsName value} {
-	upvar $descriptionsName descriptions
-	# get the current item full adress
-        set adress [OptCurAddr $descriptions];
-	# use the 3th field of the item  (see OptValue / OptNewInst)
-	lappend adress 2
-	Lvarset descriptions $adress [list 1 $value];
-	#                                  ^hasBeenSet flag
-    }
-
-    # empty state means done/paste the end of the program
-    proc OptState {item} {
-        Lfirst $item
-    }
-    
-    # current state
-    proc OptCurState {descriptions} {
-        OptState [OptCurDesc $descriptions];
-    }
-
-    #######
-    # Arguments manipulation
-
-    # Returns the argument that has to be processed now
-    proc OptCurrentArg {lst} {
-        Lfirst $lst;
-    }
-    # Advance to next argument
-    proc OptNextArg {argsName} {
-        uplevel [list Lvarpop1 $argsName];
-    }
-    #######
-
-
-
-
-
-    # Loop over all descriptions, calling OptDoOne which will
-    # eventually eat all the arguments.
-    proc OptDoAll {descriptionsName argumentsName} {
-	upvar $descriptionsName descriptions
-	upvar $argumentsName arguments;
-#	puts "entered DoAll";
-	# Nb: the places where "state" can be set are tricky to figure
-	#     because DoOne sets the state to flagsValue and return -continue
-	#     when needed...
-	set state [OptCurState $descriptions];
-	# We'll exit the loop in "OptDoOne" or when state is empty.
-        while 1 {
-	    set curitem [OptCurDesc $descriptions];
-	    # Do subprograms if needed, call ourselves on the sub branch
-	    while {[OptIsPrg $curitem]} {
-		OptDoAll curitem arguments
-#		puts "done DoAll sub";
-		# Insert back the results in current tree;
-		Lvarset1nc descriptions [OptGetPrgCounter $descriptions]\
-			$curitem;
-		OptNextDesc descriptions;
-		set curitem [OptCurDesc $descriptions];
-                set state [OptCurState $descriptions];
-	    }
-#           puts "state = \"$state\" - arguments=($arguments)";
-	    if {[Lempty $state]} {
-		# Nothing left to do, we are done in this branch:
-		break;
-	    }
-	    # The following statement can make us terminate/continue
-	    # as it use return -code {break, continue, return and error}
-	    # codes
-            OptDoOne descriptions state arguments;
-	    # If we are here, no special return code where issued,
-	    # we'll step to next instruction :
-#           puts "new state  = \"$state\"";
-	    OptNextDesc descriptions;
-	    set state [OptCurState $descriptions];
-        }
-    }
-
-    # Process one step for the state machine,
-    # eventually consuming the current argument.
-    proc OptDoOne {descriptionsName stateName argumentsName} {
-        upvar $argumentsName arguments;
-        upvar $descriptionsName descriptions;
-	upvar $stateName state;
-
-	# the special state/instruction "args" eats all
-	# the remaining args (if any)
-	if {($state == "args")} {
-	    if {![Lempty $arguments]} {
-		# If there is no additional arguments, leave the default value
-		# in.
-		OptCurSetValue descriptions $arguments;
-		set arguments {};
-	    }
-#            puts "breaking out ('args' state: consuming every reminding args)"
-	    return -code break;
-	}
-
-	if {[Lempty $arguments]} {
-	    if {$state == "flags"} {
-		# no argument and no flags : we're done
-#                puts "returning to previous (sub)prg (no more args)";
-		return -code return;
-	    } elseif {$state == "optValue"} {
-		set state next; # not used, for debug only
-		# go to next state
-		return ;
-	    } else {
-		return -code error [OptMissingValue $descriptions];
-	    }
-	} else {
-	    set arg [OptCurrentArg $arguments];
-	}
-
-        switch $state {
-            flags {
-                # A non-dash argument terminates the options, as does --
-
-                # Still a flag ?
-                if {![OptIsFlag $arg]} {
-                    # don't consume the argument, return to previous prg
-                    return -code return;
-                }
-                # consume the flag
-                OptNextArg arguments;
-                if {[string compare "--" $arg] == 0} {
-                    # return from 'flags' state
-                    return -code return;
-                }
-
-                set hits [OptHits descriptions $arg];
-                if {$hits > 1} {
-                    return -code error [OptAmbigous $descriptions $arg]
-                } elseif {$hits == 0} {
-                    return -code error [OptFlagUsage $descriptions $arg]
-                }
-		set item [OptCurDesc $descriptions];
-                if {[OptNeedValue $item]} {
-		    # we need a value, next state is
-		    set state flagValue;
-                } else {
-                    OptCurSetValue descriptions 1;
-                }
-		# continue
-		return -code continue;
-            }
-	    flagValue -
-	    value {
-		set item [OptCurDesc $descriptions];
-                # Test the values against their required type
-		if {[catch {OptCheckType $arg\
-			[OptType $item] [OptTypeArgs $item]} val]} {
-		    return -code error [OptBadValue $item $arg $val]
-		}
-                # consume the value
-                OptNextArg arguments;
-		# set the value
-		OptCurSetValue descriptions $val;
-		# go to next state
-		if {$state == "flagValue"} {
-		    set state flags
-		    return -code continue;
-		} else {
-		    set state next; # not used, for debug only
-		    return ; # will go on next step
-		}
-	    }
-	    optValue {
-		set item [OptCurDesc $descriptions];
-                # Test the values against their required type
-		if {![catch {OptCheckType $arg\
-			[OptType $item] [OptTypeArgs $item]} val]} {
-		    # right type, so :
-		    # consume the value
-		    OptNextArg arguments;
-		    # set the value
-		    OptCurSetValue descriptions $val;
-		}
-		# go to next state
-		set state next; # not used, for debug only
-		return ; # will go on next step
-	    }
-        }
-	# If we reach this point: an unknown
-	# state as been entered !
-	return -code error "Bug! unknown state in DoOne \"$state\"\
-		(prg counter [OptGetPrgCounter $descriptions]:\
-			[OptCurDesc $descriptions])";
-    }
-
-# Parse the options given the key to previously registered description
-# and arguments list
-proc ::tcl::OptKeyParse {descKey arglist} {
-
-    set desc [OptKeyGetDesc $descKey];
-
-    # make sure -help always give usage
-    if {[string compare "-help" [string tolower $arglist]] == 0} {
-	return -code error [OptError "Usage information:" $desc 1];
-    }
-
-    OptDoAll desc arglist;
-
-    if {![Lempty $arglist]} {
-	return -code error [OptTooManyArgs $desc $arglist];
-    }
-    
-    # Analyse the result
-    # Walk through the tree:
-    OptTreeVars $desc "#[expr {[info level]-1}]" ;
-}
-
-    # determine string length for nice tabulated output
-    proc OptTreeVars {desc level {vnamesLst {}}} {
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		set vnamesLst [OptTreeVars $item $level $vnamesLst];
-	    } else {
-		set vname [OptVarName $item];
-		upvar $level $vname var
-		if {[OptHasBeenSet $item]} {
-#		    puts "adding $vname"
-		    # lets use the input name for the returned list
-		    # it is more usefull, for instance you can check that
-		    # no flags at all was given with expr
-		    # {![string match "*-*" $Args]}
-		    lappend vnamesLst [OptName $item];
-		    set var [OptValue $item];
-		} else {
-		    set var [OptDefaultValue $item];
-		}
-	    }
-	}
-	return $vnamesLst
-    }
-
-
-# Check the type of a value
-# and emit an error if arg is not of the correct type
-# otherwise returns the canonical value of that arg (ie 0/1 for booleans)
-proc ::tcl::OptCheckType {arg type {typeArgs ""}} {
-#    puts "checking '$arg' against '$type' ($typeArgs)";
-
-    # only types "any", "choice", and numbers can have leading "-"
-
-    switch -exact -- $type {
-        int {
-            if {![regexp {^(-+)?[0-9]+$} $arg]} {
-                error "not an integer"
-            }
-	    return $arg;
-        }
-        float {
-            return [expr {double($arg)}]
-        }
-	script -
-        list {
-	    # if llength fail : malformed list
-            if {[llength $arg]==0} {
-		if {[OptIsFlag $arg]} {
-		    error "no values with leading -"
-		}
-	    }
-	    return $arg;
-        }
-        boolean {
-	    if {![regexp -nocase {^(true|false|0|1)$} $arg]} {
-		error "non canonic boolean"
-            }
-	    # convert true/false because expr/if is broken with "!,...
-	    if {$arg} {
-		return 1
-	    } else {
-		return 0
-	    }
-        }
-        choice {
-            if {[lsearch -exact $typeArgs $arg] < 0} {
-                error "invalid choice"
-            }
-	    return $arg;
-        }
-	any {
-	    return $arg;
-	}
-	string -
-	default {
-            if {[OptIsFlag $arg]} {
-                error "no values with leading -"
-            }
-	    return $arg
-        }
-    }
-    return neverReached;
-}
-
-    # internal utilities
-
-    # returns the number of flags matching the given arg
-    # sets the (local) prg counter to the list of matches
-    proc OptHits {descName arg} {
-        upvar $descName desc;
-        set hits 0
-        set hitems {}
-	set i 1;
-
-	set larg [string tolower $arg];
-	set len  [string length $larg];
-	set last [expr {$len-1}];
-
-        foreach item [lrange $desc 1 end] {
-            set flag [OptName $item]
-	    # lets try to match case insensitively
-	    # (string length ought to be cheap)
-	    set lflag [string tolower $flag];
-	    if {$len == [string length $lflag]} {
-		if {[string compare $larg $lflag]==0} {
-		    # Exact match case
-		    OptSetPrgCounter desc $i;
-		    return 1;
-		}
-	    } else {
-		if {[string compare $larg [string range $lflag 0 $last]]==0} {
-		    lappend hitems $i;
-		    incr hits;
-		}
-            }
-	    incr i;
-        }
-	if {$hits} {
-	    OptSetPrgCounter desc $hitems;
-	}
-        return $hits
-    }
-
-    # Extract fields from the list structure:
-
-    proc OptName {item} {
-        lindex $item 1;
-    }
-    # 
-    proc OptHasBeenSet {item} {
-	Lget $item {2 0};
-    }
-    # 
-    proc OptValue {item} {
-	Lget $item {2 1};
-    }
-
-    proc OptIsFlag {name} {
-        string match "-*" $name;
-    }
-    proc OptIsOpt {name} {
-        string match {\?*} $name;
-    }
-    proc OptVarName {item} {
-        set name [OptName $item];
-        if {[OptIsFlag $name]} {
-            return [string range $name 1 end];
-        } elseif {[OptIsOpt $name]} {
-	    return [string trim $name "?"];
-	} else {
-            return $name;
-        }
-    }
-    proc OptType {item} {
-        lindex $item 3
-    }
-    proc OptTypeArgs {item} {
-        lindex $item 4
-    }
-    proc OptHelp {item} {
-        lindex $item 5
-    }
-    proc OptNeedValue {item} {
-        string compare [OptType $item] boolflag
-    }
-    proc OptDefaultValue {item} {
-        set val [OptTypeArgs $item]
-        switch -exact -- [OptType $item] {
-            choice {return [lindex $val 0]}
-	    boolean -
-	    boolflag {
-		# convert back false/true to 0/1 because expr !$bool
-		# is broken..
-		if {$val} {
-		    return 1
-		} else {
-		    return 0
-		}
-	    }
-        }
-        return $val
-    }
-
-    # Description format error helper
-    proc OptOptUsage {item {what ""}} {
-        return -code error "invalid description format$what: $item\n\
-                should be a list of {varname|-flagname ?-type? ?defaultvalue?\
-                ?helpstring?}";
-    }
-
-
-    # Generate a canonical form single instruction
-    proc OptNewInst {state varname type typeArgs help} {
-	list $state $varname [list 0 {}] $type $typeArgs $help;
-	#                          ^  ^
-	#                          |  |
-	#               hasBeenSet=+  +=currentValue
-    }
-
-    # Translate one item to canonical form
-    proc OptNormalizeOne {item} {
-        set lg [Lassign $item varname arg1 arg2 arg3];
-#       puts "called optnormalizeone '$item' v=($varname), lg=$lg";
-        set isflag [OptIsFlag $varname];
-	set isopt  [OptIsOpt  $varname];
-        if {$isflag} {
-            set state "flags";
-        } elseif {$isopt} {
-	    set state "optValue";
-	} elseif {[string compare $varname "args"]} {
-	    set state "value";
-	} else {
-	    set state "args";
-	}
-
-	# apply 'smart' 'fuzzy' logic to try to make
-	# description writer's life easy, and our's difficult :
-	# let's guess the missing arguments :-)
-
-        switch $lg {
-            1 {
-                if {$isflag} {
-                    return [OptNewInst $state $varname boolflag false ""];
-                } else {
-                    return [OptNewInst $state $varname any "" ""];
-                }
-            }
-            2 {
-                # varname default
-                # varname help
-                set type [OptGuessType $arg1]
-                if {[string compare $type "string"] == 0} {
-                    if {$isflag} {
-			set type boolflag
-			set def false
-		    } else {
-			set type any
-			set def ""
-		    }
-		    set help $arg1
-                } else {
-                    set help ""
-                    set def $arg1
-                }
-                return [OptNewInst $state $varname $type $def $help];
-            }
-            3 {
-                # varname type value
-                # varname value comment
-		
-                if {[regexp {^-(.+)$} $arg1 x type]} {
-		    # flags/optValue as they are optional, need a "value",
-		    # on the contrary, for a variable (non optional),
-	            # default value is pointless, 'cept for choices :
-		    if {$isflag || $isopt || ($type == "choice")} {
-			return [OptNewInst $state $varname $type $arg2 ""];
-		    } else {
-			return [OptNewInst $state $varname $type "" $arg2];
-		    }
-                } else {
-                    return [OptNewInst $state $varname\
-			    [OptGuessType $arg1] $arg1 $arg2]
-                }
-            }
-            4 {
-                if {[regexp {^-(.+)$} $arg1 x type]} {
-		    return [OptNewInst $state $varname $type $arg2 $arg3];
-                } else {
-                    return -code error [OptOptUsage $item];
-                }
-            }
-            default {
-                return -code error [OptOptUsage $item];
-            }
-        }
-    }
-
-    # Auto magic lasy type determination
-    proc OptGuessType {arg} {
-        if {[regexp -nocase {^(true|false)$} $arg]} {
-            return boolean
-        }
-        if {[regexp {^(-+)?[0-9]+$} $arg]} {
-            return int
-        }
-        if {![catch {expr {double($arg)}}]} {
-            return float
-        }
-        return string
-    }
-
-    # Error messages front ends
-
-    proc OptAmbigous {desc arg} {
-        OptError "ambigous option \"$arg\", choose from:" [OptSelection $desc]
-    }
-    proc OptFlagUsage {desc arg} {
-        OptError "bad flag \"$arg\", must be one of" $desc;
-    }
-    proc OptTooManyArgs {desc arguments} {
-        OptError "too many arguments (unexpected argument(s): $arguments),\
-		usage:"\
-		$desc 1
-    }
-    proc OptParamType {item} {
-	if {[OptIsFlag $item]} {
-	    return "flag";
-	} else {
-	    return "parameter";
-	}
-    }
-    proc OptBadValue {item arg {err {}}} {
-#       puts "bad val err = \"$err\"";
-        OptError "bad value \"$arg\" for [OptParamType $item]"\
-		[list $item]
-    }
-    proc OptMissingValue {descriptions} {
-#        set item [OptCurDescFinal $descriptions];
-        set item [OptCurDesc $descriptions];
-        OptError "no value given for [OptParamType $item] \"[OptName $item]\"\
-		(use -help for full usage) :"\
-		[list $item]
-    }
-
-proc ::tcl::OptKeyError {prefix descKey {header 0}} {
-    OptError $prefix [OptKeyGetDesc $descKey] $header;
-}
-
-    # determine string length for nice tabulated output
-    proc OptLengths {desc nlName tlName dlName} {
-	upvar $nlName nl;
-	upvar $tlName tl;
-	upvar $dlName dl;
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		OptLengths $item nl tl dl
-	    } else {
-		SetMax nl [string length [OptName $item]]
-		SetMax tl [string length [OptType $item]]
-		set dv [OptTypeArgs $item];
-		if {[OptState $item] != "header"} {
-		    set dv "($dv)";
-		}
-		set l [string length $dv];
-		# limit the space allocated to potentially big "choices"
-		if {([OptType $item] != "choice") || ($l<=12)} {
-		    SetMax dl $l
-		} else {
-		    if {![info exists dl]} {
-			set dl 0
-		    }
-		}
-	    }
-	}
-    }
-    # output the tree
-    proc OptTree {desc nl tl dl} {
-	set res "";
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		append res [OptTree $item $nl $tl $dl];
-	    } else {
-		set dv [OptTypeArgs $item];
-		if {[OptState $item] != "header"} {
-		    set dv "($dv)";
-		}
-		append res [format "\n    %-*s %-*s %-*s %s" \
-			$nl [OptName $item] $tl [OptType $item] \
-			$dl $dv [OptHelp $item]]
-	    }
-	}
-	return $res;
-    }
-
-# Give nice usage string
-proc ::tcl::OptError {prefix desc {header 0}} {
-    # determine length
-    if {$header} {
-	# add faked instruction
-	set h [list [OptNewInst header Var/FlagName Type Value Help]];
-	lappend h   [OptNewInst header ------------ ---- ----- ----];
-	lappend h   [OptNewInst header {( -help} "" "" {gives this help )}]
-	set desc [concat $h $desc]
-    }
-    OptLengths $desc nl tl dl
-    # actually output 
-    return "$prefix[OptTree $desc $nl $tl $dl]"
-}
-
-
-################     General Utility functions   #######################
-
-#
-# List utility functions
-# Naming convention:
-#     "Lvarxxx" take the list VARiable name as argument
-#     "Lxxxx"   take the list value as argument
-#               (which is not costly with Tcl8 objects system
-#                as it's still a reference and not a copy of the values)
-#
-
-# Is that list empty ?
-proc ::tcl::Lempty {list} {
-    expr {[llength $list]==0}
-}
-
-# Gets the value of one leaf of a lists tree
-proc ::tcl::Lget {list indexLst} {
-    if {[llength $indexLst] <= 1} {
-        return [lindex $list $indexLst];
-    }
-    Lget [lindex $list [Lfirst $indexLst]] [Lrest $indexLst];
-}
-# Sets the value of one leaf of a lists tree
-# (we use the version that does not create the elements because
-#  it would be even slower... needs to be written in C !)
-# (nb: there is a non trivial recursive problem with indexes 0,
-#  which appear because there is no difference between a list
-#  of 1 element and 1 element alone : [list "a"] == "a" while 
-#  it should be {a} and [listp a] should be 0 while [listp {a b}] would be 1
-#  and [listp "a b"] maybe 0. listp does not exist either...)
-proc ::tcl::Lvarset {listName indexLst newValue} {
-    upvar $listName list;
-    if {[llength $indexLst] <= 1} {
-        Lvarset1nc list $indexLst $newValue;
-    } else {
-        set idx [Lfirst $indexLst];
-        set targetList [lindex $list $idx];
-        # reduce refcount on targetList (not really usefull now,
-	# could be with optimizing compiler)
-#        Lvarset1 list $idx {};
-        # recursively replace in targetList
-        Lvarset targetList [Lrest $indexLst] $newValue;
-        # put updated sub list back in the tree
-        Lvarset1nc list $idx $targetList;
-    }
-}
-# Set one cell to a value, eventually create all the needed elements
-# (on level-1 of lists)
-variable emptyList {}
-proc ::tcl::Lvarset1 {listName index newValue} {
-    upvar $listName list;
-    if {$index < 0} {return -code error "invalid negative index"}
-    set lg [llength $list];
-    if {$index >= $lg} {
-        variable emptyList;
-        for {set i $lg} {$i<$index} {incr i} {
-            lappend list $emptyList;
-        }
-        lappend list $newValue;
-    } else {
-        set list [lreplace $list $index $index $newValue];
-    }
-}
-# same as Lvarset1 but no bound checking / creation
-proc ::tcl::Lvarset1nc {listName index newValue} {
-    upvar $listName list;
-    set list [lreplace $list $index $index $newValue];
-}
-# Increments the value of one leaf of a lists tree
-# (which must exists)
-proc ::tcl::Lvarincr {listName indexLst {howMuch 1}} {
-    upvar $listName list;
-    if {[llength $indexLst] <= 1} {
-        Lvarincr1 list $indexLst $howMuch;
-    } else {
-        set idx [Lfirst $indexLst];
-        set targetList [lindex $list $idx];
-        # reduce refcount on targetList
-        Lvarset1nc list $idx {};
-        # recursively replace in targetList
-        Lvarincr targetList [Lrest $indexLst] $howMuch;
-        # put updated sub list back in the tree
-        Lvarset1nc list $idx $targetList;
-    }
-}
-# Increments the value of one cell of a list
-proc ::tcl::Lvarincr1 {listName index {howMuch 1}} {
-    upvar $listName list;
-    set newValue [expr {[lindex $list $index]+$howMuch}];
-    set list [lreplace $list $index $index $newValue];
-    return $newValue;
-}
-# Returns the first element of a list
-proc ::tcl::Lfirst {list} {
-    lindex $list 0
-}
-# Returns the rest of the list minus first element
-proc ::tcl::Lrest {list} {
-    lrange $list 1 end
-}
-# Removes the first element of a list
-# and returns the new list value
-proc ::tcl::Lvarpop1 {listName} {
-    upvar $listName list;
-    set list [lrange $list 1 end];
-}
-# Same but returns the removed element
-# (Like the tclX version)
-proc ::tcl::Lvarpop {listName} {
-    upvar $listName list;
-    set el [Lfirst $list];
-    set list [lrange $list 1 end];
-    return $el;
-}
-# Assign list elements to variables and return the length of the list
-proc ::tcl::Lassign {list args} {
-    # faster than direct blown foreach (which does not byte compile)
-    set i 0;
-    set lg [llength $list];
-    foreach vname $args {
-        if {$i>=$lg} break
-        uplevel [list set $vname [lindex $list $i]];
-        incr i;
-    }
-    return $lg;
-}
-
-# Misc utilities
-
-# Set the varname to value if value is greater than varname's current value
-# or if varname is undefined
-proc ::tcl::SetMax {varname value} {
-    upvar 1 $varname var
-    if {![info exists var] || $value > $var} {
-        set var $value
-    }
-}
-
-# Set the varname to value if value is smaller than varname's current value
-# or if varname is undefined
-proc ::tcl::SetMin {varname value} {
-    upvar 1 $varname var
-    if {![info exists var] || $value < $var} {
-        set var $value
-    }
-}
-
-
-    # everything loaded fine, lets create the test proc:
- #    OptCreateTestProc
-    # Don't need the create temp proc anymore:
- #    rename OptCreateTestProc {}
-}
diff --git a/library/opt/pkgIndex.tcl b/library/opt/pkgIndex.tcl
deleted file mode 100644
index 260e572..0000000
--- a/library/opt/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.1
-# This file is generated by the "pkg_mkIndex -direct" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded opt 0.4.1 [list source [file join $dir optparse.tcl]]
diff --git a/library/opt0.4/optparse.tcl b/library/opt0.4/optparse.tcl
deleted file mode 100644
index 289a39a..0000000
--- a/library/opt0.4/optparse.tcl
+++ /dev/null
@@ -1,1097 +0,0 @@
-# optparse.tcl --
-#
-#       (private) Option parsing package
-#       Primarily used internally by the safe:: code.
-#
-#	WARNING: This code will go away in a future release
-#	of Tcl.  It is NOT supported and you should not rely
-#	on it.  If your code does rely on this package you
-#	may directly incorporate this code into your application.
-#
-# RCS: @(#) $Id: optparse.tcl,v 1.2 1999/04/16 00:47:18 stanton Exp $
-
-package provide opt 0.4.1
-
-namespace eval ::tcl {
-
-    # Exported APIs
-    namespace export OptKeyRegister OptKeyDelete OptKeyError OptKeyParse \
-             OptProc OptProcArgGiven OptParse \
-	     Lempty Lget \
-             Lassign Lvarpop Lvarpop1 Lvarset Lvarincr Lfirst Lrest \
-             SetMax SetMin
-
-
-#################  Example of use / 'user documentation'  ###################
-
-    proc OptCreateTestProc {} {
-
-	# Defines ::tcl::OptParseTest as a test proc with parsed arguments
-	# (can't be defined before the code below is loaded (before "OptProc"))
-
-	# Every OptProc give usage information on "procname -help".
-	# Try "tcl::OptParseTest -help" and "tcl::OptParseTest -a" and
-	# then other arguments.
-	# 
-	# example of 'valid' call:
-	# ::tcl::OptParseTest save -4 -pr 23 -libsok SybTcl\
-	#		-nostatics false ch1
-	OptProc OptParseTest {
-            {subcommand -choice {save print} "sub command"}
-            {arg1 3 "some number"}
-            {-aflag}
-            {-intflag      7}
-            {-weirdflag                    "help string"}
-            {-noStatics                    "Not ok to load static packages"}
-            {-nestedloading1 true           "OK to load into nested slaves"}
-            {-nestedloading2 -boolean true "OK to load into nested slaves"}
-            {-libsOK        -choice {Tk SybTcl}
-		                      "List of packages that can be loaded"}
-            {-precision     -int 12        "Number of digits of precision"}
-            {-intval        7               "An integer"}
-            {-scale         -float 1.0     "Scale factor"}
-            {-zoom          1.0             "Zoom factor"}
-            {-arbitrary     foobar          "Arbitrary string"}
-            {-random        -string 12   "Random string"}
-            {-listval       -list {}       "List value"}
-            {-blahflag       -blah abc       "Funny type"}
-	    {arg2 -boolean "a boolean"}
-	    {arg3 -choice "ch1 ch2"}
-	    {?optarg? -list {} "optional argument"}
-        } {
-	    foreach v [info locals] {
-		puts stderr [format "%14s : %s" $v [set $v]]
-	    }
-	}
-    }
-
-###################  No User serviceable part below ! ###############
-# You should really not look any further :
-# The following is private unexported undocumented unblessed... code 
-# time to hit "q" ;-) !
-
-# Hmmm... ok, you really want to know ?
-
-# You've been warned... Here it is...
-
-    # Array storing the parsed descriptions
-    variable OptDesc;
-    array set OptDesc {};
-    # Next potentially free key id (numeric)
-    variable OptDescN 0;
-
-# Inside algorithm/mechanism description:
-# (not for the faint hearted ;-)
-#
-# The argument description is parsed into a "program tree"
-# It is called a "program" because it is the program used by
-# the state machine interpreter that use that program to
-# actually parse the arguments at run time.
-#
-# The general structure of a "program" is
-# notation (pseudo bnf like)
-#    name :== definition        defines "name" as being "definition" 
-#    { x y z }                  means list of x, y, and z  
-#    x*                         means x repeated 0 or more time
-#    x+                         means "x x*"
-#    x?                         means optionally x
-#    x | y                      means x or y
-#    "cccc"                     means the literal string
-#
-#    program        :== { programCounter programStep* }
-#
-#    programStep    :== program | singleStep
-#
-#    programCounter :== {"P" integer+ }
-#
-#    singleStep     :== { instruction parameters* }
-#
-#    instruction    :== single element list
-#
-# (the difference between singleStep and program is that \
-#   llength [Lfirst $program] >= 2
-# while
-#   llength [Lfirst $singleStep] == 1
-# )
-#
-# And for this application:
-#
-#    singleStep     :== { instruction varname {hasBeenSet currentValue} type 
-#                         typeArgs help }
-#    instruction    :== "flags" | "value"
-#    type           :== knowType | anyword
-#    knowType       :== "string" | "int" | "boolean" | "boolflag" | "float"
-#                       | "choice"
-#
-# for type "choice" typeArgs is a list of possible choices, the first one
-# is the default value. for all other types the typeArgs is the default value
-#
-# a "boolflag" is the type for a flag whose presence or absence, without
-# additional arguments means respectively true or false (default flag type).
-#
-# programCounter is the index in the list of the currently processed
-# programStep (thus starting at 1 (0 is {"P" prgCounterValue}).
-# If it is a list it points toward each currently selected programStep.
-# (like for "flags", as they are optional, form a set and programStep).
-
-# Performance/Implementation issues
-# ---------------------------------
-# We use tcl lists instead of arrays because with tcl8.0
-# they should start to be much faster.
-# But this code use a lot of helper procs (like Lvarset)
-# which are quite slow and would be helpfully optimized
-# for instance by being written in C. Also our struture
-# is complex and there is maybe some places where the
-# string rep might be calculated at great exense. to be checked.
-
-#
-# Parse a given description and saves it here under the given key
-# generate a unused keyid if not given
-#
-proc ::tcl::OptKeyRegister {desc {key ""}} {
-    variable OptDesc;
-    variable OptDescN;
-    if {[string compare $key ""] == 0} {
-        # in case a key given to us as a parameter was a number
-        while {[info exists OptDesc($OptDescN)]} {incr OptDescN}
-        set key $OptDescN;
-        incr OptDescN;
-    }
-    # program counter
-    set program [list [list "P" 1]];
-
-    # are we processing flags (which makes a single program step)
-    set inflags 0;
-
-    set state {};
-
-    # flag used to detect that we just have a single (flags set) subprogram.
-    set empty 1;
-
-    foreach item $desc {
-	if {$state == "args"} {
-	    # more items after 'args'...
-	    return -code error "'args' special argument must be the last one";
-	}
-        set res [OptNormalizeOne $item];
-        set state [Lfirst $res];
-        if {$inflags} {
-            if {$state == "flags"} {
-		# add to 'subprogram'
-                lappend flagsprg $res;
-            } else {
-                # put in the flags
-                # structure for flag programs items is a list of
-                # {subprgcounter {prg flag 1} {prg flag 2} {...}}
-                lappend program $flagsprg;
-                # put the other regular stuff
-                lappend program $res;
-		set inflags 0;
-		set empty 0;
-            }
-        } else {
-           if {$state == "flags"} {
-               set inflags 1;
-               # sub program counter + first sub program
-               set flagsprg [list [list "P" 1] $res];
-           } else {
-               lappend program $res;
-               set empty 0;
-           }
-       }
-   }
-   if {$inflags} {
-       if {$empty} {
-	   # We just have the subprogram, optimize and remove
-	   # unneeded level:
-	   set program $flagsprg;
-       } else {
-	   lappend program $flagsprg;
-       }
-   }
-
-   set OptDesc($key) $program;
-
-   return $key;
-}
-
-#
-# Free the storage for that given key
-#
-proc ::tcl::OptKeyDelete {key} {
-    variable OptDesc;
-    unset OptDesc($key);
-}
-
-    # Get the parsed description stored under the given key.
-    proc OptKeyGetDesc {descKey} {
-        variable OptDesc;
-        if {![info exists OptDesc($descKey)]} {
-            return -code error "Unknown option description key \"$descKey\"";
-        }
-        set OptDesc($descKey);
-    }
-
-# Parse entry point for ppl who don't want to register with a key,
-# for instance because the description changes dynamically.
-#  (otherwise one should really use OptKeyRegister once + OptKeyParse
-#   as it is way faster or simply OptProc which does it all)
-# Assign a temporary key, call OptKeyParse and then free the storage
-proc ::tcl::OptParse {desc arglist} {
-    set tempkey [OptKeyRegister $desc];
-    set ret [catch {uplevel [list ::tcl::OptKeyParse $tempkey $arglist]} res];
-    OptKeyDelete $tempkey;
-    return -code $ret $res;
-}
-
-# Helper function, replacement for proc that both
-# register the description under a key which is the name of the proc
-# (and thus unique to that code)
-# and add a first line to the code to call the OptKeyParse proc
-# Stores the list of variables that have been actually given by the user
-# (the other will be sets to their default value)
-# into local variable named "Args".
-proc ::tcl::OptProc {name desc body} {
-    set namespace [uplevel namespace current];
-    if {   ([string match $name "::*"]) 
-        || ([string compare $namespace "::"]==0)} {
-        # absolute name or global namespace, name is the key
-        set key $name;
-    } else {
-        # we are relative to some non top level namespace:
-        set key "${namespace}::${name}";
-    }
-    OptKeyRegister $desc $key;
-    uplevel [list proc $name args "set Args \[::tcl::OptKeyParse $key \$args\]\n$body"];
-    return $key;
-}
-# Check that a argument has been given
-# assumes that "OptProc" has been used as it will check in "Args" list
-proc ::tcl::OptProcArgGiven {argname} {
-    upvar Args alist;
-    expr {[lsearch $alist $argname] >=0}
-}
-
-    #######
-    # Programs/Descriptions manipulation
-
-    # Return the instruction word/list of a given step/(sub)program
-    proc OptInstr {lst} {
-	Lfirst $lst;
-    }
-    # Is a (sub) program or a plain instruction ?
-    proc OptIsPrg {lst} {
-	expr {[llength [OptInstr $lst]]>=2}
-    }
-    # Is this instruction a program counter or a real instr
-    proc OptIsCounter {item} {
-	expr {[Lfirst $item]=="P"}
-    }
-    # Current program counter (2nd word of first word)
-    proc OptGetPrgCounter {lst} {
-	Lget $lst {0 1}
-    }
-    # Current program counter (2nd word of first word)
-    proc OptSetPrgCounter {lstName newValue} {
-	upvar $lstName lst;
-	set lst [lreplace $lst 0 0 [concat "P" $newValue]];
-    }
-    # returns a list of currently selected items.
-    proc OptSelection {lst} {
-	set res {};
-	foreach idx [lrange [Lfirst $lst] 1 end] {
-	    lappend res [Lget $lst $idx];
-	}
-	return $res;
-    }
-
-    # Advance to next description
-    proc OptNextDesc {descName} {
-        uplevel [list Lvarincr $descName {0 1}];
-    }
-
-    # Get the current description, eventually descend
-    proc OptCurDesc {descriptions} {
-        lindex $descriptions [OptGetPrgCounter $descriptions];
-    }
-    # get the current description, eventually descend
-    # through sub programs as needed.
-    proc OptCurDescFinal {descriptions} {
-        set item [OptCurDesc $descriptions];
-	# Descend untill we get the actual item and not a sub program
-        while {[OptIsPrg $item]} {
-            set item [OptCurDesc $item];
-        }
-	return $item;
-    }
-    # Current final instruction adress
-    proc OptCurAddr {descriptions {start {}}} {
-	set adress [OptGetPrgCounter $descriptions];
-	lappend start $adress;
-	set item [lindex $descriptions $adress];
-	if {[OptIsPrg $item]} {
-	    return [OptCurAddr $item $start];
-	} else {
-	    return $start;
-	}
-    }
-    # Set the value field of the current instruction
-    proc OptCurSetValue {descriptionsName value} {
-	upvar $descriptionsName descriptions
-	# get the current item full adress
-        set adress [OptCurAddr $descriptions];
-	# use the 3th field of the item  (see OptValue / OptNewInst)
-	lappend adress 2
-	Lvarset descriptions $adress [list 1 $value];
-	#                                  ^hasBeenSet flag
-    }
-
-    # empty state means done/paste the end of the program
-    proc OptState {item} {
-        Lfirst $item
-    }
-    
-    # current state
-    proc OptCurState {descriptions} {
-        OptState [OptCurDesc $descriptions];
-    }
-
-    #######
-    # Arguments manipulation
-
-    # Returns the argument that has to be processed now
-    proc OptCurrentArg {lst} {
-        Lfirst $lst;
-    }
-    # Advance to next argument
-    proc OptNextArg {argsName} {
-        uplevel [list Lvarpop1 $argsName];
-    }
-    #######
-
-
-
-
-
-    # Loop over all descriptions, calling OptDoOne which will
-    # eventually eat all the arguments.
-    proc OptDoAll {descriptionsName argumentsName} {
-	upvar $descriptionsName descriptions
-	upvar $argumentsName arguments;
-#	puts "entered DoAll";
-	# Nb: the places where "state" can be set are tricky to figure
-	#     because DoOne sets the state to flagsValue and return -continue
-	#     when needed...
-	set state [OptCurState $descriptions];
-	# We'll exit the loop in "OptDoOne" or when state is empty.
-        while 1 {
-	    set curitem [OptCurDesc $descriptions];
-	    # Do subprograms if needed, call ourselves on the sub branch
-	    while {[OptIsPrg $curitem]} {
-		OptDoAll curitem arguments
-#		puts "done DoAll sub";
-		# Insert back the results in current tree;
-		Lvarset1nc descriptions [OptGetPrgCounter $descriptions]\
-			$curitem;
-		OptNextDesc descriptions;
-		set curitem [OptCurDesc $descriptions];
-                set state [OptCurState $descriptions];
-	    }
-#           puts "state = \"$state\" - arguments=($arguments)";
-	    if {[Lempty $state]} {
-		# Nothing left to do, we are done in this branch:
-		break;
-	    }
-	    # The following statement can make us terminate/continue
-	    # as it use return -code {break, continue, return and error}
-	    # codes
-            OptDoOne descriptions state arguments;
-	    # If we are here, no special return code where issued,
-	    # we'll step to next instruction :
-#           puts "new state  = \"$state\"";
-	    OptNextDesc descriptions;
-	    set state [OptCurState $descriptions];
-        }
-    }
-
-    # Process one step for the state machine,
-    # eventually consuming the current argument.
-    proc OptDoOne {descriptionsName stateName argumentsName} {
-        upvar $argumentsName arguments;
-        upvar $descriptionsName descriptions;
-	upvar $stateName state;
-
-	# the special state/instruction "args" eats all
-	# the remaining args (if any)
-	if {($state == "args")} {
-	    if {![Lempty $arguments]} {
-		# If there is no additional arguments, leave the default value
-		# in.
-		OptCurSetValue descriptions $arguments;
-		set arguments {};
-	    }
-#            puts "breaking out ('args' state: consuming every reminding args)"
-	    return -code break;
-	}
-
-	if {[Lempty $arguments]} {
-	    if {$state == "flags"} {
-		# no argument and no flags : we're done
-#                puts "returning to previous (sub)prg (no more args)";
-		return -code return;
-	    } elseif {$state == "optValue"} {
-		set state next; # not used, for debug only
-		# go to next state
-		return ;
-	    } else {
-		return -code error [OptMissingValue $descriptions];
-	    }
-	} else {
-	    set arg [OptCurrentArg $arguments];
-	}
-
-        switch $state {
-            flags {
-                # A non-dash argument terminates the options, as does --
-
-                # Still a flag ?
-                if {![OptIsFlag $arg]} {
-                    # don't consume the argument, return to previous prg
-                    return -code return;
-                }
-                # consume the flag
-                OptNextArg arguments;
-                if {[string compare "--" $arg] == 0} {
-                    # return from 'flags' state
-                    return -code return;
-                }
-
-                set hits [OptHits descriptions $arg];
-                if {$hits > 1} {
-                    return -code error [OptAmbigous $descriptions $arg]
-                } elseif {$hits == 0} {
-                    return -code error [OptFlagUsage $descriptions $arg]
-                }
-		set item [OptCurDesc $descriptions];
-                if {[OptNeedValue $item]} {
-		    # we need a value, next state is
-		    set state flagValue;
-                } else {
-                    OptCurSetValue descriptions 1;
-                }
-		# continue
-		return -code continue;
-            }
-	    flagValue -
-	    value {
-		set item [OptCurDesc $descriptions];
-                # Test the values against their required type
-		if {[catch {OptCheckType $arg\
-			[OptType $item] [OptTypeArgs $item]} val]} {
-		    return -code error [OptBadValue $item $arg $val]
-		}
-                # consume the value
-                OptNextArg arguments;
-		# set the value
-		OptCurSetValue descriptions $val;
-		# go to next state
-		if {$state == "flagValue"} {
-		    set state flags
-		    return -code continue;
-		} else {
-		    set state next; # not used, for debug only
-		    return ; # will go on next step
-		}
-	    }
-	    optValue {
-		set item [OptCurDesc $descriptions];
-                # Test the values against their required type
-		if {![catch {OptCheckType $arg\
-			[OptType $item] [OptTypeArgs $item]} val]} {
-		    # right type, so :
-		    # consume the value
-		    OptNextArg arguments;
-		    # set the value
-		    OptCurSetValue descriptions $val;
-		}
-		# go to next state
-		set state next; # not used, for debug only
-		return ; # will go on next step
-	    }
-        }
-	# If we reach this point: an unknown
-	# state as been entered !
-	return -code error "Bug! unknown state in DoOne \"$state\"\
-		(prg counter [OptGetPrgCounter $descriptions]:\
-			[OptCurDesc $descriptions])";
-    }
-
-# Parse the options given the key to previously registered description
-# and arguments list
-proc ::tcl::OptKeyParse {descKey arglist} {
-
-    set desc [OptKeyGetDesc $descKey];
-
-    # make sure -help always give usage
-    if {[string compare "-help" [string tolower $arglist]] == 0} {
-	return -code error [OptError "Usage information:" $desc 1];
-    }
-
-    OptDoAll desc arglist;
-
-    if {![Lempty $arglist]} {
-	return -code error [OptTooManyArgs $desc $arglist];
-    }
-    
-    # Analyse the result
-    # Walk through the tree:
-    OptTreeVars $desc "#[expr {[info level]-1}]" ;
-}
-
-    # determine string length for nice tabulated output
-    proc OptTreeVars {desc level {vnamesLst {}}} {
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		set vnamesLst [OptTreeVars $item $level $vnamesLst];
-	    } else {
-		set vname [OptVarName $item];
-		upvar $level $vname var
-		if {[OptHasBeenSet $item]} {
-#		    puts "adding $vname"
-		    # lets use the input name for the returned list
-		    # it is more usefull, for instance you can check that
-		    # no flags at all was given with expr
-		    # {![string match "*-*" $Args]}
-		    lappend vnamesLst [OptName $item];
-		    set var [OptValue $item];
-		} else {
-		    set var [OptDefaultValue $item];
-		}
-	    }
-	}
-	return $vnamesLst
-    }
-
-
-# Check the type of a value
-# and emit an error if arg is not of the correct type
-# otherwise returns the canonical value of that arg (ie 0/1 for booleans)
-proc ::tcl::OptCheckType {arg type {typeArgs ""}} {
-#    puts "checking '$arg' against '$type' ($typeArgs)";
-
-    # only types "any", "choice", and numbers can have leading "-"
-
-    switch -exact -- $type {
-        int {
-            if {![regexp {^(-+)?[0-9]+$} $arg]} {
-                error "not an integer"
-            }
-	    return $arg;
-        }
-        float {
-            return [expr {double($arg)}]
-        }
-	script -
-        list {
-	    # if llength fail : malformed list
-            if {[llength $arg]==0} {
-		if {[OptIsFlag $arg]} {
-		    error "no values with leading -"
-		}
-	    }
-	    return $arg;
-        }
-        boolean {
-	    if {![regexp -nocase {^(true|false|0|1)$} $arg]} {
-		error "non canonic boolean"
-            }
-	    # convert true/false because expr/if is broken with "!,...
-	    if {$arg} {
-		return 1
-	    } else {
-		return 0
-	    }
-        }
-        choice {
-            if {[lsearch -exact $typeArgs $arg] < 0} {
-                error "invalid choice"
-            }
-	    return $arg;
-        }
-	any {
-	    return $arg;
-	}
-	string -
-	default {
-            if {[OptIsFlag $arg]} {
-                error "no values with leading -"
-            }
-	    return $arg
-        }
-    }
-    return neverReached;
-}
-
-    # internal utilities
-
-    # returns the number of flags matching the given arg
-    # sets the (local) prg counter to the list of matches
-    proc OptHits {descName arg} {
-        upvar $descName desc;
-        set hits 0
-        set hitems {}
-	set i 1;
-
-	set larg [string tolower $arg];
-	set len  [string length $larg];
-	set last [expr {$len-1}];
-
-        foreach item [lrange $desc 1 end] {
-            set flag [OptName $item]
-	    # lets try to match case insensitively
-	    # (string length ought to be cheap)
-	    set lflag [string tolower $flag];
-	    if {$len == [string length $lflag]} {
-		if {[string compare $larg $lflag]==0} {
-		    # Exact match case
-		    OptSetPrgCounter desc $i;
-		    return 1;
-		}
-	    } else {
-		if {[string compare $larg [string range $lflag 0 $last]]==0} {
-		    lappend hitems $i;
-		    incr hits;
-		}
-            }
-	    incr i;
-        }
-	if {$hits} {
-	    OptSetPrgCounter desc $hitems;
-	}
-        return $hits
-    }
-
-    # Extract fields from the list structure:
-
-    proc OptName {item} {
-        lindex $item 1;
-    }
-    # 
-    proc OptHasBeenSet {item} {
-	Lget $item {2 0};
-    }
-    # 
-    proc OptValue {item} {
-	Lget $item {2 1};
-    }
-
-    proc OptIsFlag {name} {
-        string match "-*" $name;
-    }
-    proc OptIsOpt {name} {
-        string match {\?*} $name;
-    }
-    proc OptVarName {item} {
-        set name [OptName $item];
-        if {[OptIsFlag $name]} {
-            return [string range $name 1 end];
-        } elseif {[OptIsOpt $name]} {
-	    return [string trim $name "?"];
-	} else {
-            return $name;
-        }
-    }
-    proc OptType {item} {
-        lindex $item 3
-    }
-    proc OptTypeArgs {item} {
-        lindex $item 4
-    }
-    proc OptHelp {item} {
-        lindex $item 5
-    }
-    proc OptNeedValue {item} {
-        string compare [OptType $item] boolflag
-    }
-    proc OptDefaultValue {item} {
-        set val [OptTypeArgs $item]
-        switch -exact -- [OptType $item] {
-            choice {return [lindex $val 0]}
-	    boolean -
-	    boolflag {
-		# convert back false/true to 0/1 because expr !$bool
-		# is broken..
-		if {$val} {
-		    return 1
-		} else {
-		    return 0
-		}
-	    }
-        }
-        return $val
-    }
-
-    # Description format error helper
-    proc OptOptUsage {item {what ""}} {
-        return -code error "invalid description format$what: $item\n\
-                should be a list of {varname|-flagname ?-type? ?defaultvalue?\
-                ?helpstring?}";
-    }
-
-
-    # Generate a canonical form single instruction
-    proc OptNewInst {state varname type typeArgs help} {
-	list $state $varname [list 0 {}] $type $typeArgs $help;
-	#                          ^  ^
-	#                          |  |
-	#               hasBeenSet=+  +=currentValue
-    }
-
-    # Translate one item to canonical form
-    proc OptNormalizeOne {item} {
-        set lg [Lassign $item varname arg1 arg2 arg3];
-#       puts "called optnormalizeone '$item' v=($varname), lg=$lg";
-        set isflag [OptIsFlag $varname];
-	set isopt  [OptIsOpt  $varname];
-        if {$isflag} {
-            set state "flags";
-        } elseif {$isopt} {
-	    set state "optValue";
-	} elseif {[string compare $varname "args"]} {
-	    set state "value";
-	} else {
-	    set state "args";
-	}
-
-	# apply 'smart' 'fuzzy' logic to try to make
-	# description writer's life easy, and our's difficult :
-	# let's guess the missing arguments :-)
-
-        switch $lg {
-            1 {
-                if {$isflag} {
-                    return [OptNewInst $state $varname boolflag false ""];
-                } else {
-                    return [OptNewInst $state $varname any "" ""];
-                }
-            }
-            2 {
-                # varname default
-                # varname help
-                set type [OptGuessType $arg1]
-                if {[string compare $type "string"] == 0} {
-                    if {$isflag} {
-			set type boolflag
-			set def false
-		    } else {
-			set type any
-			set def ""
-		    }
-		    set help $arg1
-                } else {
-                    set help ""
-                    set def $arg1
-                }
-                return [OptNewInst $state $varname $type $def $help];
-            }
-            3 {
-                # varname type value
-                # varname value comment
-		
-                if {[regexp {^-(.+)$} $arg1 x type]} {
-		    # flags/optValue as they are optional, need a "value",
-		    # on the contrary, for a variable (non optional),
-	            # default value is pointless, 'cept for choices :
-		    if {$isflag || $isopt || ($type == "choice")} {
-			return [OptNewInst $state $varname $type $arg2 ""];
-		    } else {
-			return [OptNewInst $state $varname $type "" $arg2];
-		    }
-                } else {
-                    return [OptNewInst $state $varname\
-			    [OptGuessType $arg1] $arg1 $arg2]
-                }
-            }
-            4 {
-                if {[regexp {^-(.+)$} $arg1 x type]} {
-		    return [OptNewInst $state $varname $type $arg2 $arg3];
-                } else {
-                    return -code error [OptOptUsage $item];
-                }
-            }
-            default {
-                return -code error [OptOptUsage $item];
-            }
-        }
-    }
-
-    # Auto magic lasy type determination
-    proc OptGuessType {arg} {
-        if {[regexp -nocase {^(true|false)$} $arg]} {
-            return boolean
-        }
-        if {[regexp {^(-+)?[0-9]+$} $arg]} {
-            return int
-        }
-        if {![catch {expr {double($arg)}}]} {
-            return float
-        }
-        return string
-    }
-
-    # Error messages front ends
-
-    proc OptAmbigous {desc arg} {
-        OptError "ambigous option \"$arg\", choose from:" [OptSelection $desc]
-    }
-    proc OptFlagUsage {desc arg} {
-        OptError "bad flag \"$arg\", must be one of" $desc;
-    }
-    proc OptTooManyArgs {desc arguments} {
-        OptError "too many arguments (unexpected argument(s): $arguments),\
-		usage:"\
-		$desc 1
-    }
-    proc OptParamType {item} {
-	if {[OptIsFlag $item]} {
-	    return "flag";
-	} else {
-	    return "parameter";
-	}
-    }
-    proc OptBadValue {item arg {err {}}} {
-#       puts "bad val err = \"$err\"";
-        OptError "bad value \"$arg\" for [OptParamType $item]"\
-		[list $item]
-    }
-    proc OptMissingValue {descriptions} {
-#        set item [OptCurDescFinal $descriptions];
-        set item [OptCurDesc $descriptions];
-        OptError "no value given for [OptParamType $item] \"[OptName $item]\"\
-		(use -help for full usage) :"\
-		[list $item]
-    }
-
-proc ::tcl::OptKeyError {prefix descKey {header 0}} {
-    OptError $prefix [OptKeyGetDesc $descKey] $header;
-}
-
-    # determine string length for nice tabulated output
-    proc OptLengths {desc nlName tlName dlName} {
-	upvar $nlName nl;
-	upvar $tlName tl;
-	upvar $dlName dl;
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		OptLengths $item nl tl dl
-	    } else {
-		SetMax nl [string length [OptName $item]]
-		SetMax tl [string length [OptType $item]]
-		set dv [OptTypeArgs $item];
-		if {[OptState $item] != "header"} {
-		    set dv "($dv)";
-		}
-		set l [string length $dv];
-		# limit the space allocated to potentially big "choices"
-		if {([OptType $item] != "choice") || ($l<=12)} {
-		    SetMax dl $l
-		} else {
-		    if {![info exists dl]} {
-			set dl 0
-		    }
-		}
-	    }
-	}
-    }
-    # output the tree
-    proc OptTree {desc nl tl dl} {
-	set res "";
-	foreach item $desc {
-	    if {[OptIsCounter $item]} continue;
-	    if {[OptIsPrg $item]} {
-		append res [OptTree $item $nl $tl $dl];
-	    } else {
-		set dv [OptTypeArgs $item];
-		if {[OptState $item] != "header"} {
-		    set dv "($dv)";
-		}
-		append res [format "\n    %-*s %-*s %-*s %s" \
-			$nl [OptName $item] $tl [OptType $item] \
-			$dl $dv [OptHelp $item]]
-	    }
-	}
-	return $res;
-    }
-
-# Give nice usage string
-proc ::tcl::OptError {prefix desc {header 0}} {
-    # determine length
-    if {$header} {
-	# add faked instruction
-	set h [list [OptNewInst header Var/FlagName Type Value Help]];
-	lappend h   [OptNewInst header ------------ ---- ----- ----];
-	lappend h   [OptNewInst header {( -help} "" "" {gives this help )}]
-	set desc [concat $h $desc]
-    }
-    OptLengths $desc nl tl dl
-    # actually output 
-    return "$prefix[OptTree $desc $nl $tl $dl]"
-}
-
-
-################     General Utility functions   #######################
-
-#
-# List utility functions
-# Naming convention:
-#     "Lvarxxx" take the list VARiable name as argument
-#     "Lxxxx"   take the list value as argument
-#               (which is not costly with Tcl8 objects system
-#                as it's still a reference and not a copy of the values)
-#
-
-# Is that list empty ?
-proc ::tcl::Lempty {list} {
-    expr {[llength $list]==0}
-}
-
-# Gets the value of one leaf of a lists tree
-proc ::tcl::Lget {list indexLst} {
-    if {[llength $indexLst] <= 1} {
-        return [lindex $list $indexLst];
-    }
-    Lget [lindex $list [Lfirst $indexLst]] [Lrest $indexLst];
-}
-# Sets the value of one leaf of a lists tree
-# (we use the version that does not create the elements because
-#  it would be even slower... needs to be written in C !)
-# (nb: there is a non trivial recursive problem with indexes 0,
-#  which appear because there is no difference between a list
-#  of 1 element and 1 element alone : [list "a"] == "a" while 
-#  it should be {a} and [listp a] should be 0 while [listp {a b}] would be 1
-#  and [listp "a b"] maybe 0. listp does not exist either...)
-proc ::tcl::Lvarset {listName indexLst newValue} {
-    upvar $listName list;
-    if {[llength $indexLst] <= 1} {
-        Lvarset1nc list $indexLst $newValue;
-    } else {
-        set idx [Lfirst $indexLst];
-        set targetList [lindex $list $idx];
-        # reduce refcount on targetList (not really usefull now,
-	# could be with optimizing compiler)
-#        Lvarset1 list $idx {};
-        # recursively replace in targetList
-        Lvarset targetList [Lrest $indexLst] $newValue;
-        # put updated sub list back in the tree
-        Lvarset1nc list $idx $targetList;
-    }
-}
-# Set one cell to a value, eventually create all the needed elements
-# (on level-1 of lists)
-variable emptyList {}
-proc ::tcl::Lvarset1 {listName index newValue} {
-    upvar $listName list;
-    if {$index < 0} {return -code error "invalid negative index"}
-    set lg [llength $list];
-    if {$index >= $lg} {
-        variable emptyList;
-        for {set i $lg} {$i<$index} {incr i} {
-            lappend list $emptyList;
-        }
-        lappend list $newValue;
-    } else {
-        set list [lreplace $list $index $index $newValue];
-    }
-}
-# same as Lvarset1 but no bound checking / creation
-proc ::tcl::Lvarset1nc {listName index newValue} {
-    upvar $listName list;
-    set list [lreplace $list $index $index $newValue];
-}
-# Increments the value of one leaf of a lists tree
-# (which must exists)
-proc ::tcl::Lvarincr {listName indexLst {howMuch 1}} {
-    upvar $listName list;
-    if {[llength $indexLst] <= 1} {
-        Lvarincr1 list $indexLst $howMuch;
-    } else {
-        set idx [Lfirst $indexLst];
-        set targetList [lindex $list $idx];
-        # reduce refcount on targetList
-        Lvarset1nc list $idx {};
-        # recursively replace in targetList
-        Lvarincr targetList [Lrest $indexLst] $howMuch;
-        # put updated sub list back in the tree
-        Lvarset1nc list $idx $targetList;
-    }
-}
-# Increments the value of one cell of a list
-proc ::tcl::Lvarincr1 {listName index {howMuch 1}} {
-    upvar $listName list;
-    set newValue [expr {[lindex $list $index]+$howMuch}];
-    set list [lreplace $list $index $index $newValue];
-    return $newValue;
-}
-# Returns the first element of a list
-proc ::tcl::Lfirst {list} {
-    lindex $list 0
-}
-# Returns the rest of the list minus first element
-proc ::tcl::Lrest {list} {
-    lrange $list 1 end
-}
-# Removes the first element of a list
-# and returns the new list value
-proc ::tcl::Lvarpop1 {listName} {
-    upvar $listName list;
-    set list [lrange $list 1 end];
-}
-# Same but returns the removed element
-# (Like the tclX version)
-proc ::tcl::Lvarpop {listName} {
-    upvar $listName list;
-    set el [Lfirst $list];
-    set list [lrange $list 1 end];
-    return $el;
-}
-# Assign list elements to variables and return the length of the list
-proc ::tcl::Lassign {list args} {
-    # faster than direct blown foreach (which does not byte compile)
-    set i 0;
-    set lg [llength $list];
-    foreach vname $args {
-        if {$i>=$lg} break
-        uplevel [list set $vname [lindex $list $i]];
-        incr i;
-    }
-    return $lg;
-}
-
-# Misc utilities
-
-# Set the varname to value if value is greater than varname's current value
-# or if varname is undefined
-proc ::tcl::SetMax {varname value} {
-    upvar 1 $varname var
-    if {![info exists var] || $value > $var} {
-        set var $value
-    }
-}
-
-# Set the varname to value if value is smaller than varname's current value
-# or if varname is undefined
-proc ::tcl::SetMin {varname value} {
-    upvar 1 $varname var
-    if {![info exists var] || $value < $var} {
-        set var $value
-    }
-}
-
-
-    # everything loaded fine, lets create the test proc:
- #    OptCreateTestProc
-    # Don't need the create temp proc anymore:
- #    rename OptCreateTestProc {}
-}
diff --git a/library/opt0.4/pkgIndex.tcl b/library/opt0.4/pkgIndex.tcl
deleted file mode 100644
index 260e572..0000000
--- a/library/opt0.4/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.1
-# This file is generated by the "pkg_mkIndex -direct" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded opt 0.4.1 [list source [file join $dir optparse.tcl]]
diff --git a/library/package.tcl b/library/package.tcl
deleted file mode 100644
index cf8d1ba..0000000
--- a/library/package.tcl
+++ /dev/null
@@ -1,473 +0,0 @@
-# package.tcl --
-#
-# utility procs formerly in init.tcl which can be loaded on demand
-# for package management.
-#
-# RCS: @(#) $Id: package.tcl,v 1.2 1999/04/16 00:46:56 stanton Exp $
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-# pkg_compareExtension --
-#
-#  Used internally by pkg_mkIndex to compare the extension of a file to
-#  a given extension. On Windows, it uses a case-insensitive comparison
-#  because the file system can be file insensitive.
-#
-# Arguments:
-#  fileName	name of a file whose extension is compared
-#  ext		(optional) The extension to compare against; you must
-#		provide the starting dot.
-#		Defaults to [info sharedlibextension]
-#
-# Results:
-#  Returns 1 if the extension matches, 0 otherwise
-
-proc pkg_compareExtension { fileName {ext {}} } {
-    global tcl_platform
-    if {[string length $ext] == 0} {
-	set ext [info sharedlibextension]
-    }
-    if {[string compare $tcl_platform(platform) "windows"] == 0} {
-	return [expr {[string compare \
-		[string tolower [file extension $fileName]] \
-		[string tolower $ext]] == 0}]
-    } else {
-	return [expr {[string compare [file extension $fileName] $ext] == 0}]
-    }
-}
-
-# pkg_mkIndex --
-# This procedure creates a package index in a given directory.  The
-# package index consists of a "pkgIndex.tcl" file whose contents are
-# a Tcl script that sets up package information with "package require"
-# commands.  The commands describe all of the packages defined by the
-# files given as arguments.
-#
-# Arguments:
-# -direct		(optional) If this flag is present, the generated
-#			code in pkgMkIndex.tcl will cause the package to be
-#			loaded when "package require" is executed, rather
-#			than lazily when the first reference to an exported
-#			procedure in the package is made.
-# -verbose		(optional) Verbose output; the name of each file that
-#			was successfully rocessed is printed out. Additionally,
-#			if processing of a file failed a message is printed.
-# -load pat		(optional) Preload any packages whose names match
-#			the pattern.  Used to handle DLLs that depend on
-#			other packages during their Init procedure.
-# dir -			Name of the directory in which to create the index.
-# args -		Any number of additional arguments, each giving
-#			a glob pattern that matches the names of one or
-#			more shared libraries or Tcl script files in
-#			dir.
-
-proc pkg_mkIndex {args} {
-    global errorCode errorInfo
-    set usage {"pkg_mkIndex ?-direct? ?-verbose? ?-load pattern? ?--? dir ?pattern ...?"};
-
-    set argCount [llength $args]
-    if {$argCount < 1} {
-	return -code error "wrong # args: should be\n$usage"
-    }
-
-    set more ""
-    set direct 0
-    set doVerbose 0
-    set loadPat ""
-    for {set idx 0} {$idx < $argCount} {incr idx} {
-	set flag [lindex $args $idx]
-	switch -glob -- $flag {
-	    -- {
-		# done with the flags
-		incr idx
-		break
-	    }
-	    -verbose {
-		set doVerbose 1
-	    }
-	    -direct {
-		set direct 1
-		append more " -direct"
-	    }
-	    -load {
-		incr idx
-		set loadPat [lindex $args $idx]
-		append more " -load $loadPat"
-	    }
-	    -* {
-		return -code error "unknown flag $flag: should be\n$usage"
-	    }
-	    default {
-		# done with the flags
-		break
-	    }
-	}
-    }
-
-    set dir [lindex $args $idx]
-    set patternList [lrange $args [expr {$idx + 1}] end]
-    if {[llength $patternList] == 0} {
-	set patternList [list "*.tcl" "*[info sharedlibextension]"]
-    }
-
-    append index "# Tcl package index file, version 1.1\n"
-    append index "# This file is generated by the \"pkg_mkIndex$more\" command\n"
-    append index "# and sourced either when an application starts up or\n"
-    append index "# by a \"package unknown\" script.  It invokes the\n"
-    append index "# \"package ifneeded\" command to set up package-related\n"
-    append index "# information so that packages will be loaded automatically\n"
-    append index "# in response to \"package require\" commands.  When this\n"
-    append index "# script is sourced, the variable \$dir must contain the\n"
-    append index "# full path name of this file's directory.\n"
-    set oldDir [pwd]
-    cd $dir
-
-    if {[catch {eval glob $patternList} fileList]} {
-	global errorCode errorInfo
-	cd $oldDir
-	return -code error -errorcode $errorCode -errorinfo $errorInfo $fileList
-    }
-    foreach file $fileList {
-	# For each file, figure out what commands and packages it provides.
-	# To do this, create a child interpreter, load the file into the
-	# interpreter, and get a list of the new commands and packages
-	# that are defined.
-
-	if {[string compare $file "pkgIndex.tcl"] == 0} {
-	    continue
-	}
-
-	# Changed back to the original directory before initializing the
-	# slave in case TCL_LIBRARY is a relative path (e.g. in the test
-	# suite). 
-
-	cd $oldDir
-	set c [interp create]
-
-	# Load into the child any packages currently loaded in the parent
-	# interpreter that match the -load pattern.
-
-	foreach pkg [info loaded] {
-	    if {! [string match $loadPat [lindex $pkg 1]]} {
-		continue
-	    }
-	    if {[lindex $pkg 1] == "Tk"} {
-		$c eval {set argv {-geometry +0+0}}
-	    }
-	    if {[catch {
-		load [lindex $pkg 0] [lindex $pkg 1] $c
-	    } err]} {
-		if {$doVerbose} {
-		    tclLog "warning: load [lindex $pkg 0] [lindex $pkg 1]\nfailed with: $err"
-		}
-	    } else {
-		if {$doVerbose} {
-		    tclLog "loaded [lindex $pkg 0] [lindex $pkg 1]"
-		}
-	    }
-	}
-	cd $dir
-
-	$c eval {
-	    # Stub out the package command so packages can
-	    # require other packages.
-
-	    rename package __package_orig
-	    proc package {what args} {
-		switch -- $what {
-		    require { return ; # ignore transitive requires }
-		    default { eval __package_orig {$what} $args }
-		}
-	    }
-	    proc tclPkgUnknown args {}
-	    package unknown tclPkgUnknown
-
-	    # Stub out the unknown command so package can call
-	    # into each other during their initialilzation.
-
-	    proc unknown {args} {}
-
-	    # Stub out the auto_import mechanism
-
-	    proc auto_import {args} {}
-
-	    # reserve the ::tcl namespace for support procs
-	    # and temporary variables.  This might make it awkward
-	    # to generate a pkgIndex.tcl file for the ::tcl namespace.
-
-	    namespace eval ::tcl {
-		variable file		;# Current file being processed
-		variable direct		;# -direct flag value
-		variable x		;# Loop variable
-		variable debug		;# For debugging
-		variable type		;# "load" or "source", for -direct
-		variable namespaces	;# Existing namespaces (e.g., ::tcl)
-		variable packages	;# Existing packages (e.g., Tcl)
-		variable origCmds	;# Existing commands
-		variable newCmds	;# Newly created commands
-		variable newPkgs {}	;# Newly created packages
-	    }
-	}
-
-	$c eval [list set ::tcl::file $file]
-	$c eval [list set ::tcl::direct $direct]
-
-	# Download needed procedures into the slave because we've
-	# just deleted the unknown procedure.  This doesn't handle
-	# procedures with default arguments.
-
-	foreach p {pkg_compareExtension} {
-	    $c eval [list proc $p [info args $p] [info body $p]]
-	}
-
-	if {[catch {
-	    $c eval {
-		set ::tcl::debug "loading or sourcing"
-
-		# we need to track command defined by each package even in
-		# the -direct case, because they are needed internally by
-		# the "partial pkgIndex.tcl" step above.
-
-		proc ::tcl::GetAllNamespaces {{root ::}} {
-		    set list $root
-		    foreach ns [namespace children $root] {
-			eval lappend list [::tcl::GetAllNamespaces $ns]
-		    }
-		    return $list
-		}
-
-		# initialize the list of existing namespaces, packages, commands
-
-		foreach ::tcl::x [::tcl::GetAllNamespaces] {
-		    set ::tcl::namespaces($::tcl::x) 1
-		}
-		foreach ::tcl::x [package names] {
-		    set ::tcl::packages($::tcl::x) 1
-		}
-		set ::tcl::origCmds [info commands]
-
-		# Try to load the file if it has the shared library
-		# extension, otherwise source it.  It's important not to
-		# try to load files that aren't shared libraries, because
-		# on some systems (like SunOS) the loader will abort the
-		# whole application when it gets an error.
-
-		if {[pkg_compareExtension $::tcl::file [info sharedlibextension]]} {
-		    # The "file join ." command below is necessary.
-		    # Without it, if the file name has no \'s and we're
-		    # on UNIX, the load command will invoke the
-		    # LD_LIBRARY_PATH search mechanism, which could cause
-		    # the wrong file to be used.
-
-		    set ::tcl::debug loading
-		    load [file join . $::tcl::file]
-		    set ::tcl::type load
-		} else {
-		    set ::tcl::debug sourcing
-		    source $::tcl::file
-		    set ::tcl::type source
-		}
-
-		# See what new namespaces appeared, and import commands
-		# from them.  Only exported commands go into the index.
-
-		foreach ::tcl::x [::tcl::GetAllNamespaces] {
-		    if {! [info exists ::tcl::namespaces($::tcl::x)]} {
-			namespace import -force ${::tcl::x}::*
-		    }
-		}
-
-		# Figure out what commands appeared
-
-		foreach ::tcl::x [info commands] {
-		    set ::tcl::newCmds($::tcl::x) 1
-		}
-		foreach ::tcl::x $::tcl::origCmds {
-		    catch {unset ::tcl::newCmds($::tcl::x)}
-		}
-		foreach ::tcl::x [array names ::tcl::newCmds] {
-		    # reverse engineer which namespace a command comes from
-		    
-		    set ::tcl::abs [namespace origin $::tcl::x]
-
-		    # special case so that global names have no leading
-		    # ::, this is required by the unknown command
-
-		    set ::tcl::abs [auto_qualify $::tcl::abs ::]
-
-		    if {[string compare $::tcl::x $::tcl::abs] != 0} {
-			# Name changed during qualification
-
-			set ::tcl::newCmds($::tcl::abs) 1
-			unset ::tcl::newCmds($::tcl::x)
-		    }
-		}
-
-		# Look through the packages that appeared, and if there is
-		# a version provided, then record it
-
-		foreach ::tcl::x [package names] {
-		    if {([string compare [package provide $::tcl::x] ""] != 0) \
-			    && ![info exists ::tcl::packages($::tcl::x)]} {
-			lappend ::tcl::newPkgs \
-			    [list $::tcl::x [package provide $::tcl::x]]
-		    }
-		}
-	    }
-	} msg] == 1} {
-	    set what [$c eval set ::tcl::debug]
-	    if {$doVerbose} {
-		tclLog "warning: error while $what $file: $msg"
-	    }
-	} else {
-	    set type [$c eval set ::tcl::type]
-	    set cmds [lsort [$c eval array names ::tcl::newCmds]]
-	    set pkgs [$c eval set ::tcl::newPkgs]
-	    if {[llength $pkgs] > 1} {
-		tclLog "warning: \"$file\" provides more than one package ($pkgs)"
-	    }
-	    foreach pkg $pkgs {
-		# cmds is empty/not used in the direct case
-		lappend files($pkg) [list $file $type $cmds]
-	    }
-
-	    if {$doVerbose} {
-		tclLog "processed $file"
-	    }
-	    interp delete $c
-	}
-    }
-
-    foreach pkg [lsort [array names files]] {
-	append index "\npackage ifneeded $pkg "
-	if {$direct} {
-	    set cmdList {}
-	    foreach elem $files($pkg) {
-		set file [lindex $elem 0]
-		set type [lindex $elem 1]
-		lappend cmdList "\[list $type \[file join \$dir\
-			[list $file]\]\]"
-	    }
-	    append index [join $cmdList "\\n"]
-	} else {
-	    append index "\[list tclPkgSetup \$dir [lrange $pkg 0 0]\
-		    [lrange $pkg 1 1] [list $files($pkg)]\]"
-	}
-    }
-    set f [open pkgIndex.tcl w]
-    puts $f $index
-    close $f
-    cd $oldDir
-}
-
-# tclPkgSetup --
-# This is a utility procedure use by pkgIndex.tcl files.  It is invoked
-# as part of a "package ifneeded" script.  It calls "package provide"
-# to indicate that a package is available, then sets entries in the
-# auto_index array so that the package's files will be auto-loaded when
-# the commands are used.
-#
-# Arguments:
-# dir -			Directory containing all the files for this package.
-# pkg -			Name of the package (no version number).
-# version -		Version number for the package, such as 2.1.3.
-# files -		List of files that constitute the package.  Each
-#			element is a sub-list with three elements.  The first
-#			is the name of a file relative to $dir, the second is
-#			"load" or "source", indicating whether the file is a
-#			loadable binary or a script to source, and the third
-#			is a list of commands defined by this file.
-
-proc tclPkgSetup {dir pkg version files} {
-    global auto_index
-
-    package provide $pkg $version
-    foreach fileInfo $files {
-	set f [lindex $fileInfo 0]
-	set type [lindex $fileInfo 1]
-	foreach cmd [lindex $fileInfo 2] {
-	    if {$type == "load"} {
-		set auto_index($cmd) [list load [file join $dir $f] $pkg]
-	    } else {
-		set auto_index($cmd) [list source [file join $dir $f]]
-	    } 
-	}
-    }
-}
-
-# tclMacPkgSearch --
-# The procedure is used on the Macintosh to search a given directory for files
-# with a TEXT resource named "pkgIndex".  If it exists it is sourced in to the
-# interpreter to setup the package database.
-
-proc tclMacPkgSearch {dir} {
-    foreach x [glob -nocomplain [file join $dir *.shlb]] {
-	if {[file isfile $x]} {
-	    set res [resource open $x]
-	    foreach y [resource list TEXT $res] {
-		if {$y == "pkgIndex"} {source -rsrc pkgIndex}
-	    }
-	    catch {resource close $res}
-	}
-    }
-}
-
-# tclPkgUnknown --
-# This procedure provides the default for the "package unknown" function.
-# It is invoked when a package that's needed can't be found.  It scans
-# the auto_path directories and their immediate children looking for
-# pkgIndex.tcl files and sources any such files that are found to setup
-# the package database.  (On the Macintosh we also search for pkgIndex
-# TEXT resources in all files.)
-#
-# Arguments:
-# name -		Name of desired package.  Not used.
-# version -		Version of desired package.  Not used.
-# exact -		Either "-exact" or omitted.  Not used.
-
-proc tclPkgUnknown {name version {exact {}}} {
-    global auto_path tcl_platform env
-
-    if {![info exists auto_path]} {
-	return
-    }
-    for {set i [expr {[llength $auto_path] - 1}]} {$i >= 0} {incr i -1} {
-	# we can't use glob in safe interps, so enclose the following
-	# in a catch statement
-	catch {
-	    foreach file [glob -nocomplain [file join [lindex $auto_path $i] \
-		    * pkgIndex.tcl]] {
-		set dir [file dirname $file]
-		if {[catch {source $file} msg]} {
-		    tclLog "error reading package index file $file: $msg"
-		}
-	    }
-        }
-	set dir [lindex $auto_path $i]
-	set file [file join $dir pkgIndex.tcl]
-	# safe interps usually don't have "file readable", nor stderr channel
-	if {[interp issafe] || [file readable $file]} {
-	    if {[catch {source $file} msg] && ![interp issafe]}  {
-		tclLog "error reading package index file $file: $msg"
-	    }
-	}
-	# On the Macintosh we also look in the resource fork 
-	# of shared libraries
-	# We can't use tclMacPkgSearch in safe interps because it uses glob
-	if {(![interp issafe]) && ($tcl_platform(platform) == "macintosh")} {
-	    set dir [lindex $auto_path $i]
-	    tclMacPkgSearch $dir
-	    foreach x [glob -nocomplain [file join $dir *]] {
-		if {[file isdirectory $x]} {
-		    set dir $x
-		    tclMacPkgSearch $dir
-		}
-	    }
-	}
-    }
-}
diff --git a/library/parray.tcl b/library/parray.tcl
deleted file mode 100644
index 92655b2..0000000
--- a/library/parray.tcl
+++ /dev/null
@@ -1,29 +0,0 @@
-# parray:
-# Print the contents of a global array on stdout.
-#
-# RCS: @(#) $Id: parray.tcl,v 1.3 1998/09/14 18:40:03 stanton Exp $
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-
-proc parray {a {pattern *}} {
-    upvar 1 $a array
-    if {![array exists array]} {
-	error "\"$a\" isn't an array"
-    }
-    set maxl 0
-    foreach name [lsort [array names array $pattern]] {
-	if {[string length $name] > $maxl} {
-	    set maxl [string length $name]
-	}
-    }
-    set maxl [expr {$maxl + [string length $a] + 2}]
-    foreach name [lsort [array names array $pattern]] {
-	set nameString [format %s(%s) $a $name]
-	puts stdout [format "%-*s = %s" $maxl $nameString $array($name)]
-    }
-}
diff --git a/library/safe.tcl b/library/safe.tcl
deleted file mode 100644
index 3be7739..0000000
--- a/library/safe.tcl
+++ /dev/null
@@ -1,931 +0,0 @@
-# safe.tcl --
-#
-# This file provide a safe loading/sourcing mechanism for safe interpreters.
-# It implements a virtual path mecanism to hide the real pathnames from the
-# slave. It runs in a master interpreter and sets up data structure and
-# aliases that will be invoked when used from a slave interpreter.
-# 
-# See the safe.n man page for details.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: safe.tcl,v 1.5 1999/04/16 00:46:57 stanton Exp $
-
-#
-# The implementation is based on namespaces. These naming conventions
-# are followed:
-# Private procs starts with uppercase.
-# Public  procs are exported and starts with lowercase
-#
-
-# Needed utilities package
-package require opt 0.4.1;
-
-# Create the safe namespace
-namespace eval ::safe {
-
-    # Exported API:
-    namespace export interpCreate interpInit interpConfigure interpDelete \
-	    interpAddToAccessPath interpFindInAccessPath \
-	    setLogCmd ;
-
-    ####
-    #
-    # Setup the arguments parsing
-    #
-    ####
-
-    # Share the descriptions
-    set temp [::tcl::OptKeyRegister {
-	{-accessPath -list {} "access path for the slave"}
-	{-noStatics "prevent loading of statically linked pkgs"}
-	{-statics true "loading of statically linked pkgs"}
-	{-nestedLoadOk "allow nested loading"}
-	{-nested false "nested loading"}
-	{-deleteHook -script {} "delete hook"}
-    }]
-
-    # create case (slave is optional)
-    ::tcl::OptKeyRegister {
-	{?slave? -name {} "name of the slave (optional)"}
-    } ::safe::interpCreate ;
-    # adding the flags sub programs to the command program
-    # (relying on Opt's internal implementation details)
-    lappend ::tcl::OptDesc(::safe::interpCreate) $::tcl::OptDesc($temp);
-
-    # init and configure (slave is needed)
-    ::tcl::OptKeyRegister {
-	{slave -name {} "name of the slave"}
-    } ::safe::interpIC;
-    # adding the flags sub programs to the command program
-    # (relying on Opt's internal implementation details)
-    lappend ::tcl::OptDesc(::safe::interpIC) $::tcl::OptDesc($temp);
-    # temp not needed anymore
-    ::tcl::OptKeyDelete $temp;
-
-
-    # Helper function to resolve the dual way of specifying staticsok
-    # (either by -noStatics or -statics 0)
-    proc InterpStatics {} {
-	foreach v {Args statics noStatics} {
-	    upvar $v $v
-	}
-	set flag [::tcl::OptProcArgGiven -noStatics];
-	if {$flag && ($noStatics == $statics) 
-	          && ([::tcl::OptProcArgGiven -statics])} {
-	    return -code error\
-		    "conflicting values given for -statics and -noStatics";
-	}
-	if {$flag} {
-	    return [expr {!$noStatics}];
-	} else {
-	    return $statics
-	}
-    }
-
-    # Helper function to resolve the dual way of specifying nested loading
-    # (either by -nestedLoadOk or -nested 1)
-    proc InterpNested {} {
-	foreach v {Args nested nestedLoadOk} {
-	    upvar $v $v
-	}
-	set flag [::tcl::OptProcArgGiven -nestedLoadOk];
-	# note that the test here is the opposite of the "InterpStatics"
-	# one (it is not -noNested... because of the wanted default value)
-	if {$flag && ($nestedLoadOk != $nested) 
-	          && ([::tcl::OptProcArgGiven -nested])} {
-	    return -code error\
-		    "conflicting values given for -nested and -nestedLoadOk";
-	}
-	if {$flag} {
-	    # another difference with "InterpStatics"
-	    return $nestedLoadOk
-	} else {
-	    return $nested
-	}
-    }
-
-    ####
-    #
-    #  API entry points that needs argument parsing :
-    #
-    ####
-
-
-    # Interface/entry point function and front end for "Create"
-    proc interpCreate {args} {
-	set Args [::tcl::OptKeyParse ::safe::interpCreate $args]
-	InterpCreate $slave $accessPath \
-		[InterpStatics] [InterpNested] $deleteHook;
-    }
-
-    proc interpInit {args} {
-	set Args [::tcl::OptKeyParse ::safe::interpIC $args]
-	if {![::interp exists $slave]} {
-	    return -code error \
-		    "\"$slave\" is not an interpreter";
-	}
-	InterpInit $slave $accessPath \
-		[InterpStatics] [InterpNested] $deleteHook;
-    }
-
-    proc CheckInterp {slave} {
-	if {![IsInterp $slave]} {
-	    return -code error \
-		    "\"$slave\" is not an interpreter managed by ::safe::" ;
-	}
-    }
-
-    # Interface/entry point function and front end for "Configure"
-    # This code is awfully pedestrian because it would need
-    # more coupling and support between the way we store the
-    # configuration values in safe::interp's and the Opt package
-    # Obviously we would like an OptConfigure
-    # to avoid duplicating all this code everywhere. -> TODO
-    # (the app should share or access easily the program/value
-    #  stored by opt)
-    # This is even more complicated by the boolean flags with no values
-    # that we had the bad idea to support for the sake of user simplicity
-    # in create/init but which makes life hard in configure...
-    # So this will be hopefully written and some integrated with opt1.0
-    # (hopefully for tcl8.1 ?)
-    proc interpConfigure {args} {
-	switch [llength $args] {
-	    1 {
-		# If we have exactly 1 argument
-		# the semantic is to return all the current configuration
-		# We still call OptKeyParse though we know that "slave"
-		# is our given argument because it also checks
-		# for the "-help" option.
-		set Args [::tcl::OptKeyParse ::safe::interpIC $args];
-		CheckInterp $slave;
-		set res {}
-		lappend res [list -accessPath [Set [PathListName $slave]]]
-		lappend res [list -statics    [Set [StaticsOkName $slave]]]
-		lappend res [list -nested     [Set [NestedOkName $slave]]]
-		lappend res [list -deleteHook [Set [DeleteHookName $slave]]]
-		join $res
-	    }
-	    2 {
-		# If we have exactly 2 arguments
-		# the semantic is a "configure get"
-		::tcl::Lassign $args slave arg;
-		# get the flag sub program (we 'know' about Opt's internal
-		# representation of data)
-		set desc [lindex [::tcl::OptKeyGetDesc ::safe::interpIC] 2]
-		set hits [::tcl::OptHits desc $arg];
-                if {$hits > 1} {
-                    return -code error [::tcl::OptAmbigous $desc $arg]
-                } elseif {$hits == 0} {
-                    return -code error [::tcl::OptFlagUsage $desc $arg]
-                }
-		CheckInterp $slave;
-		set item [::tcl::OptCurDesc $desc];
-		set name [::tcl::OptName $item];
-		switch -exact -- $name {
-		    -accessPath {
-			return [list -accessPath [Set [PathListName $slave]]]
-		    }
-		    -statics {
-			return [list -statics    [Set [StaticsOkName $slave]]]
-		    }
-		    -nested {
-			return [list -nested     [Set [NestedOkName $slave]]]
-		    }
-		    -deleteHook {
-			return [list -deleteHook [Set [DeleteHookName $slave]]]
-		    }
-		    -noStatics {
-			# it is most probably a set in fact
-			# but we would need then to jump to the set part
-			# and it is not *sure* that it is a set action
-			# that the user want, so force it to use the
-			# unambigous -statics ?value? instead:
-			return -code error\
-				"ambigous query (get or set -noStatics ?)\
-				use -statics instead";
-		    }
-		    -nestedLoadOk {
-			return -code error\
-				"ambigous query (get or set -nestedLoadOk ?)\
-				use -nested instead";
-		    }
-		    default {
-			return -code error "unknown flag $name (bug)";
-		    }
-		}
-	    }
-	    default {
-		# Otherwise we want to parse the arguments like init and create
-		# did
-		set Args [::tcl::OptKeyParse ::safe::interpIC $args];
-		CheckInterp $slave;
-		# Get the current (and not the default) values of
-		# whatever has not been given:
-		if {![::tcl::OptProcArgGiven -accessPath]} {
-		    set doreset 1
-		    set accessPath [Set [PathListName $slave]]
-		} else {
-		    set doreset 0
-		}
-		if {    (![::tcl::OptProcArgGiven -statics]) 
-                     && (![::tcl::OptProcArgGiven -noStatics]) } {
-		    set statics    [Set [StaticsOkName $slave]]
-		} else {
-		    set statics    [InterpStatics]
-		}
-		if {    ([::tcl::OptProcArgGiven -nested]) 
-                     || ([::tcl::OptProcArgGiven -nestedLoadOk]) } {
-		    set nested     [InterpNested]
-		} else {
-		    set nested     [Set [NestedOkName $slave]]
-		}
-		if {![::tcl::OptProcArgGiven -deleteHook]} {
-		    set deleteHook [Set [DeleteHookName $slave]]
-		}
-		# we can now reconfigure :
-		InterpSetConfig $slave $accessPath \
-			$statics $nested $deleteHook;
-		# auto_reset the slave (to completly synch the new access_path)
-		if {$doreset} {
-		    if {[catch {::interp eval $slave {auto_reset}} msg]} {
-			Log $slave "auto_reset failed: $msg";
-		    } else {
-			Log $slave "successful auto_reset" NOTICE;
-		    }
-		}
-	    }
-	}
-    }
-
-
-    ####
-    #
-    #  Functions that actually implements the exported APIs
-    #
-    ####
-
-
-    #
-    # safe::InterpCreate : doing the real job
-    #
-    # This procedure creates a safe slave and initializes it with the
-    # safe base aliases.
-    # NB: slave name must be simple alphanumeric string, no spaces,
-    # no (), no {},...  {because the state array is stored as part of the name}
-    #
-    # Returns the slave name.
-    #
-    # Optional Arguments : 
-    # + slave name : if empty, generated name will be used
-    # + access_path: path list controlling where load/source can occur,
-    #                if empty: the master auto_path will be used.
-    # + staticsok  : flag, if 0 :no static package can be loaded (load {} Xxx)
-    #                      if 1 :static packages are ok.
-    # + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub)
-    #                      if 1 : multiple levels are ok.
-    
-    # use the full name and no indent so auto_mkIndex can find us
-    proc ::safe::InterpCreate {
-	slave 
-	access_path
-	staticsok
-	nestedok
-	deletehook
-    } {
-	# Create the slave.
-	if {[string compare "" $slave]} {
-	    ::interp create -safe $slave;
-	} else {
-	    # empty argument: generate slave name
-	    set slave [::interp create -safe];
-	}
-	Log $slave "Created" NOTICE;
-
-	# Initialize it. (returns slave name)
-	InterpInit $slave $access_path $staticsok $nestedok $deletehook;
-    }
-
-
-    #
-    # InterpSetConfig (was setAccessPath) :
-    #    Sets up slave virtual auto_path and corresponding structure
-    #    within the master. Also sets the tcl_library in the slave
-    #    to be the first directory in the path.
-    #    Nb: If you change the path after the slave has been initialized
-    #    you probably need to call "auto_reset" in the slave in order that it
-    #    gets the right auto_index() array values.
-
-    proc ::safe::InterpSetConfig {slave access_path staticsok\
-	    nestedok deletehook} {
-
-	# determine and store the access path if empty
-	if {[string match "" $access_path]} {
-	    set access_path [uplevel #0 set auto_path];
-	    # Make sure that tcl_library is in auto_path
-	    # and at the first position (needed by setAccessPath)
-	    set where [lsearch -exact $access_path [info library]];
-	    if {$where == -1} {
-		# not found, add it.
-		set access_path [concat [list [info library]] $access_path];
-		Log $slave "tcl_library was not in auto_path,\
-			added it to slave's access_path" NOTICE;
-	    } elseif {$where != 0} {
-		# not first, move it first
-		set access_path [concat [list [info library]]\
-			[lreplace $access_path $where $where]];
-		Log $slave "tcl_libray was not in first in auto_path,\
-			moved it to front of slave's access_path" NOTICE;
-	    
-	    }
-
-	    # Add 1st level sub dirs (will searched by auto loading from tcl
-	    # code in the slave using glob and thus fail, so we add them
-	    # here so by default it works the same).
-	    set access_path [AddSubDirs $access_path];
-	}
-
-	Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
-		nestedok=$nestedok deletehook=($deletehook)" NOTICE;
-
-	# clear old autopath if it existed
-	set nname [PathNumberName $slave];
-	if {[Exists $nname]} {
-	    set n [Set $nname];
-	    for {set i 0} {$i<$n} {incr i} {
-		Unset [PathToken $i $slave];
-	    }
-	}
-
-	# build new one
-	set slave_auto_path {}
-	set i 0;
-	foreach dir $access_path {
-	    Set [PathToken $i $slave] $dir;
-	    lappend slave_auto_path "\$[PathToken $i]";
-	    incr i;
-	}
-	Set $nname $i;
-	Set [PathListName $slave] $access_path;
-	Set [VirtualPathListName $slave] $slave_auto_path;
-
-	Set [StaticsOkName $slave] $staticsok
-	Set [NestedOkName $slave] $nestedok
-	Set [DeleteHookName $slave] $deletehook
-
-	SyncAccessPath $slave;
-    }
-
-    #
-    #
-    # FindInAccessPath:
-    #    Search for a real directory and returns its virtual Id
-    #    (including the "$")
-proc ::safe::interpFindInAccessPath {slave path} {
-	set access_path [GetAccessPath $slave];
-	set where [lsearch -exact $access_path $path];
-	if {$where == -1} {
-	    return -code error "$path not found in access path $access_path";
-	}
-	return "\$[PathToken $where]";
-    }
-
-    #
-    # addToAccessPath:
-    #    add (if needed) a real directory to access path
-    #    and return its virtual token (including the "$").
-proc ::safe::interpAddToAccessPath {slave path} {
-	# first check if the directory is already in there
-	if {![catch {interpFindInAccessPath $slave $path} res]} {
-	    return $res;
-	}
-	# new one, add it:
-	set nname [PathNumberName $slave];
-	set n [Set $nname];
-	Set [PathToken $n $slave] $path;
-
-	set token "\$[PathToken $n]";
-
-	Lappend [VirtualPathListName $slave] $token;
-	Lappend [PathListName $slave] $path;
-	Set $nname [expr {$n+1}];
-
-	SyncAccessPath $slave;
-
-	return $token;
-    }
-
-    # This procedure applies the initializations to an already existing
-    # interpreter. It is useful when you want to install the safe base
-    # aliases into a preexisting safe interpreter.
-    proc ::safe::InterpInit {
-	slave 
-	access_path
-	staticsok
-	nestedok
-	deletehook
-    } {
-
-	# Configure will generate an access_path when access_path is
-	# empty.
-	InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook;
-
-	# These aliases let the slave load files to define new commands
-
-	# NB we need to add [namespace current], aliases are always
-	# absolute paths.
-	::interp alias $slave source {} [namespace current]::AliasSource $slave
-	::interp alias $slave load {} [namespace current]::AliasLoad $slave
-
-	# This alias lets the slave use the encoding names, convertfrom,
-	# convertto, and system, but not "encoding system <name>" to set
-	# the system encoding.
-
-	::interp alias $slave encoding {} [namespace current]::AliasEncoding \
-		$slave
-
-	# This alias lets the slave have access to a subset of the 'file'
-	# command functionality.
-
-	AliasSubset $slave file file dir.* join root.* ext.* tail \
-		path.* split
-
-	# This alias interposes on the 'exit' command and cleanly terminates
-	# the slave.
-
-	::interp alias $slave exit {} [namespace current]::interpDelete $slave
-
-	# The allowed slave variables already have been set
-	# by Tcl_MakeSafe(3)
-
-
-	# Source init.tcl into the slave, to get auto_load and other
-	# procedures defined:
-
-	# We don't try to use the -rsrc on the mac because it would get
-	# confusing if you would want to customize init.tcl
-	# for a given set of safe slaves, on all the platforms
-	# you just need to give a specific access_path and
-	# the mac should be no exception. As there is no
-	# obvious full "safe ressources" design nor implementation
-	# for the mac, safe interps there will just don't
-	# have that ability. (A specific app can still reenable
-	# that using custom aliases if they want to).
-	# It would also make the security analysis and the Safe Tcl security
-	# model platform dependant and thus more error prone.
-
-	if {[catch {::interp eval $slave\
-		{source [file join $tcl_library init.tcl]}}\
-		msg]} {
-	    Log $slave "can't source init.tcl ($msg)";
-	    error "can't source init.tcl into slave $slave ($msg)"
-	}
-
-	return $slave
-    }
-
-
-    # Add (only if needed, avoid duplicates) 1 level of
-    # sub directories to an existing path list.
-    # Also removes non directories from the returned list.
-    proc AddSubDirs {pathList} {
-	set res {}
-	foreach dir $pathList {
-	    if {[file isdirectory $dir]} {
-		# check that we don't have it yet as a children
-		# of a previous dir
-		if {[lsearch -exact $res $dir]<0} {
-		    lappend res $dir;
-		}
-		foreach sub [glob -nocomplain -- [file join $dir *]] {
-		    if {    ([file isdirectory $sub])
-		         && ([lsearch -exact $res $sub]<0) } {
-			# new sub dir, add it !
-	                lappend res $sub;
-	            }
-		}
-	    }
-	}
-	return $res;
-    }
-
-    # This procedure deletes a safe slave managed by Safe Tcl and
-    # cleans up associated state:
-
-proc ::safe::interpDelete {slave} {
-
-        Log $slave "About to delete" NOTICE;
-
-	# If the slave has a cleanup hook registered, call it.
-	# check the existance because we might be called to delete an interp
-	# which has not been registered with us at all
-	set hookname [DeleteHookName $slave];
-	if {[Exists $hookname]} {
-	    set hook [Set $hookname];
-	    if {![::tcl::Lempty $hook]} {
-		# remove the hook now, otherwise if the hook
-		# calls us somehow, we'll loop
-		Unset $hookname;
-		if {[catch {eval $hook [list $slave]} err]} {
-		    Log $slave "Delete hook error ($err)";
-		}
-	    }
-	}
-
-	# Discard the global array of state associated with the slave, and
-	# delete the interpreter.
-
-	set statename [InterpStateName $slave];
-	if {[Exists $statename]} {
-	    Unset $statename;
-	}
-
-	# if we have been called twice, the interp might have been deleted
-	# already
-	if {[::interp exists $slave]} {
-	    ::interp delete $slave;
-	    Log $slave "Deleted" NOTICE;
-	}
-
-	return
-    }
-
-    # Set (or get) the loging mecanism 
-
-proc ::safe::setLogCmd {args} {
-    variable Log;
-    if {[llength $args] == 0} {
-	return $Log;
-    } else {
-	if {[llength $args] == 1} {
-	    set Log [lindex $args 0];
-	} else {
-	    set Log $args
-	}
-    }
-}
-
-    # internal variable
-    variable Log {}
-
-    # ------------------- END OF PUBLIC METHODS ------------
-
-
-    #
-    # sets the slave auto_path to the master recorded value.
-    # also sets tcl_library to the first token of the virtual path.
-    #
-    proc SyncAccessPath {slave} {
-	set slave_auto_path [Set [VirtualPathListName $slave]];
-	::interp eval $slave [list set auto_path $slave_auto_path];
-	Log $slave \
-		"auto_path in $slave has been set to $slave_auto_path"\
-		NOTICE;
-	::interp eval $slave [list set tcl_library [lindex $slave_auto_path 0]];
-    }
-
-    # base name for storing all the slave states
-    # the array variable name for slave foo is thus "Sfoo"
-    # and for sub slave {foo bar} "Sfoo bar" (spaces are handled
-    # ok everywhere (or should))
-    # We add the S prefix to avoid that a slave interp called "Log"
-    # would smash our "Log" variable.
-    proc InterpStateName {slave} {
-	return "S$slave";
-    }
-
-    # Check that the given slave is "one of us"
-    proc IsInterp {slave} {
-	expr {    ([Exists [InterpStateName $slave]]) 
-	       && ([::interp exists $slave])}
-    }
-
-    # returns the virtual token for directory number N
-    # if the slave argument is given, 
-    # it will return the corresponding master global variable name
-    proc PathToken {n {slave ""}} {
-	if {[string compare "" $slave]} {
-	    return "[InterpStateName $slave](access_path,$n)";
-	} else {
-	    # We need to have a ":" in the token string so
-	    # [file join] on the mac won't turn it into a relative
-	    # path.
-	    return "p(:$n:)";
-	}
-    }
-    # returns the variable name of the complete path list
-    proc PathListName {slave} {
-	return "[InterpStateName $slave](access_path)";
-    }
-    # returns the variable name of the complete path list
-    proc VirtualPathListName {slave} {
-	return "[InterpStateName $slave](access_path_slave)";
-    }
-    # returns the variable name of the number of items
-    proc PathNumberName {slave} {
-	return "[InterpStateName $slave](access_path,n)";
-    }
-    # returns the staticsok flag var name
-    proc StaticsOkName {slave} {
-	return "[InterpStateName $slave](staticsok)";
-    }
-    # returns the nestedok flag var name
-    proc NestedOkName {slave} {
-	return "[InterpStateName $slave](nestedok)";
-    }
-    # Run some code at the namespace toplevel
-    proc Toplevel {args} {
-	namespace eval [namespace current] $args;
-    }
-    # set/get values
-    proc Set {args} {
-	eval Toplevel set $args;
-    }
-    # lappend on toplevel vars
-    proc Lappend {args} {
-	eval Toplevel lappend $args;
-    }
-    # unset a var/token (currently just an global level eval)
-    proc Unset {args} {
-	eval Toplevel unset $args;
-    }
-    # test existance 
-    proc Exists {varname} {
-	Toplevel info exists $varname;
-    }
-    # short cut for access path getting
-    proc GetAccessPath {slave} {
-	Set [PathListName $slave]
-    }
-    # short cut for statics ok flag getting
-    proc StaticsOk {slave} {
-	Set [StaticsOkName $slave]
-    }
-    # short cut for getting the multiples interps sub loading ok flag
-    proc NestedOk {slave} {
-	Set [NestedOkName $slave]
-    }
-    # interp deletion storing hook name
-    proc DeleteHookName {slave} {
-	return [InterpStateName $slave](cleanupHook)
-    }
-
-    #
-    # translate virtual path into real path
-    #
-    proc TranslatePath {slave path} {
-	# somehow strip the namespaces 'functionality' out (the danger
-	# is that we would strip valid macintosh "../" queries... :
-	if {[regexp {(::)|(\.\.)} $path]} {
-	    error "invalid characters in path $path";
-	}
-	set n [expr {[Set [PathNumberName $slave]]-1}];
-	for {} {$n>=0} {incr n -1} {
-	    # fill the token virtual names with their real value
-	    set [PathToken $n] [Set [PathToken $n $slave]];
-	}
-	# replaces the token by their value
-	subst -nobackslashes -nocommands $path;
-    }
-
-
-    # Log eventually log an error
-    # to enable error logging, set Log to {puts stderr} for instance
-    proc Log {slave msg {type ERROR}} {
-	variable Log;
-	if {[info exists Log] && [llength $Log]} {
-	    eval $Log [list "$type for slave $slave : $msg"];
-	}
-    }
-
-    
-    # file name control (limit access to files/ressources that should be
-    # a valid tcl source file)
-    proc CheckFileName {slave file} {
-	# limit what can be sourced to .tcl
-	# and forbid files with more than 1 dot and
-	# longer than 14 chars
-	set ftail [file tail $file];
-	if {[string length $ftail]>14} {
-	    error "$ftail: filename too long";
-	}
-	if {[regexp {\..*\.} $ftail]} {
-	    error "$ftail: more than one dot is forbidden";
-	}
-	if {[string compare $ftail "tclIndex"] && \
-		[string compare [string tolower [file extension $ftail]]\
-		".tcl"]} {
-	    error "$ftail: must be a *.tcl or tclIndex";
-	}
-
-	if {![file exists $file]} {
-	    # don't tell the file path
-	    error "no such file or directory";
-	}
-
-	if {![file readable $file]} {
-	    # don't tell the file path
-	    error "not readable";
-	}
-
-    }
-
-
-    # AliasSource is the target of the "source" alias in safe interpreters.
-
-    proc AliasSource {slave args} {
-
-	set argc [llength $args];
-	# Allow only "source filename"
-	# (and not mac specific -rsrc for instance - see comment in ::init
-	# for current rationale)
-	if {$argc != 1} {
-	    set msg "wrong # args: should be \"source fileName\""
-	    Log $slave "$msg ($args)";
-	    return -code error $msg;
-	}
-	set file [lindex $args 0]
-	
-	# get the real path from the virtual one.
-	if {[catch {set file [TranslatePath $slave $file]} msg]} {
-	    Log $slave $msg;
-	    return -code error "permission denied"
-	}
-	
-	# check that the path is in the access path of that slave
-	if {[catch {FileInAccessPath $slave $file} msg]} {
-	    Log $slave $msg;
-	    return -code error "permission denied"
-	}
-
-	# do the checks on the filename :
-	if {[catch {CheckFileName $slave $file} msg]} {
-	    Log $slave "$file:$msg";
-	    return -code error $msg;
-	}
-
-	# passed all the tests , lets source it:
-	if {[catch {::interp invokehidden $slave source $file} msg]} {
-	    Log $slave $msg;
-	    return -code error "script error";
-	}
-	return $msg
-    }
-
-    # AliasLoad is the target of the "load" alias in safe interpreters.
-
-    proc AliasLoad {slave file args} {
-
-	set argc [llength $args];
-	if {$argc > 2} {
-	    set msg "load error: too many arguments";
-	    Log $slave "$msg ($argc) {$file $args}";
-	    return -code error $msg;
-	}
-
-	# package name (can be empty if file is not).
-	set package [lindex $args 0];
-
-	# Determine where to load. load use a relative interp path
-	# and {} means self, so we can directly and safely use passed arg.
-	set target [lindex $args 1];
-	if {[string length $target]} {
-	    # we will try to load into a sub sub interp
-	    # check that we want to authorize that.
-	    if {![NestedOk $slave]} {
-		Log $slave "loading to a sub interp (nestedok)\
-			disabled (trying to load $package to $target)";
-		return -code error "permission denied (nested load)";
-	    }
-	    
-	}
-
-	# Determine what kind of load is requested
-	if {[string length $file] == 0} {
-	    # static package loading
-	    if {[string length $package] == 0} {
-		set msg "load error: empty filename and no package name";
-		Log $slave $msg;
-		return -code error $msg;
-	    }
-	    if {![StaticsOk $slave]} {
-		Log $slave "static packages loading disabled\
-			(trying to load $package to $target)";
-		return -code error "permission denied (static package)";
-	    }
-	} else {
-	    # file loading
-
-	    # get the real path from the virtual one.
-	    if {[catch {set file [TranslatePath $slave $file]} msg]} {
-		Log $slave $msg;
-		return -code error "permission denied"
-	    }
-
-	    # check the translated path
-	    if {[catch {FileInAccessPath $slave $file} msg]} {
-		Log $slave $msg;
-		return -code error "permission denied (path)"
-	    }
-	}
-
-	if {[catch {::interp invokehidden\
-		$slave load $file $package $target} msg]} {
-	    Log $slave $msg;
-	    return -code error $msg
-	}
-
-	return $msg
-    }
-
-    # FileInAccessPath raises an error if the file is not found in
-    # the list of directories contained in the (master side recorded) slave's
-    # access path.
-
-    # the security here relies on "file dirname" answering the proper
-    # result.... needs checking ?
-    proc FileInAccessPath {slave file} {
-
-	set access_path [GetAccessPath $slave];
-
-	if {[file isdirectory $file]} {
-	    error "\"$file\": is a directory"
-	}
-	set parent [file dirname $file]
-	if {[lsearch -exact $access_path $parent] == -1} {
-	    error "\"$file\": not in access_path";
-	}
-    }
-
-    # This procedure enables access from a safe interpreter to only a subset of
-    # the subcommands of a command:
-
-    proc Subset {slave command okpat args} {
-	set subcommand [lindex $args 0]
-	if {[regexp $okpat $subcommand]} {
-	    return [eval {$command $subcommand} [lrange $args 1 end]]
-	}
-	set msg "not allowed to invoke subcommand $subcommand of $command";
-	Log $slave $msg;
-	error $msg;
-    }
-
-    # This procedure installs an alias in a slave that invokes "safesubset"
-    # in the master to execute allowed subcommands. It precomputes the pattern
-    # of allowed subcommands; you can use wildcards in the pattern if you wish
-    # to allow subcommand abbreviation.
-    #
-    # Syntax is: AliasSubset slave alias target subcommand1 subcommand2...
-
-    proc AliasSubset {slave alias target args} {
-	set pat ^(; set sep ""
-	foreach sub $args {
-	    append pat $sep$sub
-	    set sep |
-	}
-	append pat )\$
-	::interp alias $slave $alias {}\
-		[namespace current]::Subset $slave $target $pat
-    }
-
-    # AliasEncoding is the target of the "encoding" alias in safe interpreters.
-
-    proc AliasEncoding {slave args} {
-
-	set argc [llength $args];
-
-	set okpat "^(name.*|convert.*)\$"
-	set subcommand [lindex $args 0]
-
-	if {[regexp $okpat $subcommand]} {
-	    return [eval ::interp invokehidden $slave encoding $subcommand \
-		    [lrange $args 1 end]]
-	}
-
-	if {[string match $subcommand system]} {
-	    if {$argc == 1} {
-		# passed all the tests , lets source it:
-		if {[catch {::interp invokehidden \
-			$slave encoding system} msg]} {
-		    Log $slave $msg;
-		    return -code error "script error";
-		}
-	    } else {
-		set msg "wrong # args: should be \"encoding system\"";
-		Log $slave $msg;
-		error $msg;
-	    }
-	} else {
-	    set msg "wrong # args: should be \"encoding option ?arg ...?\"";
-	    Log $slave $msg;
-	    error $msg;
-	}
-	
-	
-	return $msg
-    }
-
-}
diff --git a/library/tclIndex b/library/tclIndex
deleted file mode 100644
index 35c7cf6..0000000
--- a/library/tclIndex
+++ /dev/null
@@ -1,81 +0,0 @@
-# Tcl autoload index file, version 2.0
-# This file is generated by the "auto_mkindex" command
-# and sourced to set up indexing information for one or
-# more commands.  Typically each line is a command that
-# sets an element in the auto_index array, where the
-# element name is the name of a command and the value is
-# a script that loads the command.
-
-set auto_index(auto_reset) [list source [file join $dir auto.tcl]]
-set auto_index(tcl_findLibrary) [list source [file join $dir auto.tcl]]
-set auto_index(auto_mkindex) [list source [file join $dir auto.tcl]]
-set auto_index(auto_mkindex_old) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::init) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::cleanup) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::mkindex) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::hook) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::slavehook) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::command) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::commandInit) [list source [file join $dir auto.tcl]]
-set auto_index(::auto_mkindex_parser::fullname) [list source [file join $dir auto.tcl]]
-set auto_index(history) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistAdd) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistKeep) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistClear) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistInfo) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistRedo) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistIndex) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistEvent) [list source [file join $dir history.tcl]]
-set auto_index(::tcl::HistChange) [list source [file join $dir history.tcl]]
-set auto_index(tclLdAout) [list source [file join $dir ldAout.tcl]]
-set auto_index(pkg_compareExtension) [list source [file join $dir package.tcl]]
-set auto_index(pkg_mkIndex) [list source [file join $dir package.tcl]]
-set auto_index(tclPkgSetup) [list source [file join $dir package.tcl]]
-set auto_index(tclMacPkgSearch) [list source [file join $dir package.tcl]]
-set auto_index(tclPkgUnknown) [list source [file join $dir package.tcl]]
-set auto_index(parray) [list source [file join $dir parray.tcl]]
-set auto_index(::safe::InterpStatics) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::InterpNested) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpCreate) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpInit) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::CheckInterp) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpConfigure) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::InterpCreate) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::InterpSetConfig) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpFindInAccessPath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpAddToAccessPath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::InterpInit) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::AddSubDirs) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::interpDelete) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::setLogCmd) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::SyncAccessPath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::InterpStateName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::IsInterp) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::PathToken) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::PathListName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::VirtualPathListName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::PathNumberName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::StaticsOkName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::NestedOkName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Toplevel) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Set) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Lappend) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Unset) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Exists) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::GetAccessPath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::StaticsOk) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::NestedOk) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::DeleteHookName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::TranslatePath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Log) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::CheckFileName) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::AliasSource) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::AliasLoad) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::FileInAccessPath) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::Subset) [list source [file join $dir safe.tcl]]
-set auto_index(::safe::AliasSubset) [list source [file join $dir safe.tcl]]
-set auto_index(tcl_wordBreakAfter) [list source [file join $dir word.tcl]]
-set auto_index(tcl_wordBreakBefore) [list source [file join $dir word.tcl]]
-set auto_index(tcl_endOfWord) [list source [file join $dir word.tcl]]
-set auto_index(tcl_startOfNextWord) [list source [file join $dir word.tcl]]
-set auto_index(tcl_startOfPreviousWord) [list source [file join $dir word.tcl]]
diff --git a/library/word.tcl b/library/word.tcl
deleted file mode 100644
index 0c8d576..0000000
--- a/library/word.tcl
+++ /dev/null
@@ -1,132 +0,0 @@
-# word.tcl --
-#
-# This file defines various procedures for computing word boundaries
-# in strings.  This file is primarily needed so Tk text and entry
-# widgets behave properly for different platforms.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# Copyright (c) 1998 by Scritpics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: word.tcl,v 1.4 1999/04/16 00:46:57 stanton Exp $
-
-# The following variables are used to determine which characters are
-# interpreted as white space.  
-
-if {$tcl_platform(platform) == "windows"} {
-    # Windows style - any but space, tab, or newline
-    set tcl_wordchars "\[^ \t\n\]"
-    set tcl_nonwordchars "\[ \t\n\]"
-} else {
-    # Motif style - any number, letter, or underscore
-    set tcl_wordchars {[a-zA-Z0-9_]}
-    set tcl_nonwordchars {[^a-zA-Z0-9_]}
-}
-
-# tcl_wordBreakAfter --
-#
-# This procedure returns the index of the first word boundary
-# after the starting point in the given string, or -1 if there
-# are no more boundaries in the given string.  The index returned refers
-# to the first character of the pair that comprises a boundary.
-#
-# Arguments:
-# str -		String to search.
-# start -	Index into string specifying starting point.
-
-proc tcl_wordBreakAfter {str start} {
-    global tcl_nonwordchars tcl_wordchars
-    set str [string range $str $start end]
-    if {[regexp -indices "$tcl_wordchars$tcl_nonwordchars|$tcl_nonwordchars$tcl_wordchars" $str result]} {
-	return [expr {[lindex $result 1] + $start}]
-    }
-    return -1
-}
-
-# tcl_wordBreakBefore --
-#
-# This procedure returns the index of the first word boundary
-# before the starting point in the given string, or -1 if there
-# are no more boundaries in the given string.  The index returned
-# refers to the second character of the pair that comprises a boundary.
-#
-# Arguments:
-# str -		String to search.
-# start -	Index into string specifying starting point.
-
-proc tcl_wordBreakBefore {str start} {
-    global tcl_nonwordchars tcl_wordchars
-    if {[string compare $start end] == 0} {
-	set start [string length $str]
-    }
-    if {[regexp -indices "^.*($tcl_wordchars$tcl_nonwordchars|$tcl_nonwordchars$tcl_wordchars)" [string range $str 0 $start] result]} {
-	return [lindex $result 1]
-    }
-    return -1
-}
-
-# tcl_endOfWord --
-#
-# This procedure returns the index of the first end-of-word location
-# after a starting index in the given string.  An end-of-word location
-# is defined to be the first whitespace character following the first
-# non-whitespace character after the starting point.  Returns -1 if
-# there are no more words after the starting point.
-#
-# Arguments:
-# str -		String to search.
-# start -	Index into string specifying starting point.
-
-proc tcl_endOfWord {str start} {
-    global tcl_nonwordchars tcl_wordchars
-    if {[regexp -indices "$tcl_nonwordchars*$tcl_wordchars+$tcl_nonwordchars" \
-	    [string range $str $start end] result]} {
-	return [expr {[lindex $result 1] + $start}]
-    }
-    return -1
-}
-
-# tcl_startOfNextWord --
-#
-# This procedure returns the index of the first start-of-word location
-# after a starting index in the given string.  A start-of-word
-# location is defined to be a non-whitespace character following a
-# whitespace character.  Returns -1 if there are no more start-of-word
-# locations after the starting point.
-#
-# Arguments:
-# str -		String to search.
-# start -	Index into string specifying starting point.
-
-proc tcl_startOfNextWord {str start} {
-    global tcl_nonwordchars tcl_wordchars
-    if {[regexp -indices "$tcl_wordchars*$tcl_nonwordchars+$tcl_wordchars" \
-	    [string range $str $start end] result]} {
-	return [expr {[lindex $result 1] + $start}]
-    }
-    return -1
-}
-
-# tcl_startOfPreviousWord --
-#
-# This procedure returns the index of the first start-of-word location
-# before a starting index in the given string.
-#
-# Arguments:
-# str -		String to search.
-# start -	Index into string specifying starting point.
-
-proc tcl_startOfPreviousWord {str start} {
-    global tcl_nonwordchars tcl_wordchars
-    if {[string compare $start end] == 0} {
-	set start [string length $str]
-    }
-    if {[regexp -indices \
-	    "$tcl_nonwordchars*($tcl_wordchars+)$tcl_nonwordchars*\$" \
-	    [string range $str 0 [expr {$start - 1}]] result word]} {
-	return [lindex $word 0]
-    }
-    return -1
-}
diff --git a/license.terms b/license.terms
deleted file mode 100644
index 9df3e60..0000000
--- a/license.terms
+++ /dev/null
@@ -1,39 +0,0 @@
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., Scriptics Corporation,
-and other parties.  The following terms apply to all files associated
-with the software unless explicitly disclaimed in individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license. 
diff --git a/mac/AppleScript.html b/mac/AppleScript.html
deleted file mode 100644
index 4a73fbb..0000000
--- a/mac/AppleScript.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<HTML>
-
-<HEAD>
-
-<TITLE>tclOSAScript -- OSA</TITLE>
-
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000FF" VLINK="#FF0000" ALINK="#00FF00">
-
-<H2 ALIGN="CENTER">TclAppleScript Extension Command</H2>
-
-<H3>NAME</H3>
-<DL>
-<DT>
-AppleScript - Communicate with the AppleScript OSA component to run
-	AppleScripts from Tcl.
-</DL>
-<H3>SYNOPSIS</H3>
-<DL><DT>
-<B>AppleScript <A NAME="compile">compile</A> </B><I>?-flag value?</I> <I>scriptData1 
-	   ?ScriptData2 ...?</I><I>componentName</I>
-<BR>
-<B>AppleScript <A NAME="decompile">decompile</A></B> <I>scriptName</I>
-<BR>
-<B>AppleScript delete </B><I>scriptName</I>
-<BR>
-<B>AppleScript <A NAME="execute">execute</A> </B><I>?flags value?</I> <I>scriptData1 
-	?scriptData2 ...?</I>
-<BR>
-<B>AppleScript <A NAME="info">info</A> </B><I>what</I>
-<BR>
-<B>AppleScript <A NAME="load">load</A></B> <I>?flag value? fileName</I>
-<BR>
-<B>AppleScript <A NAME="run">run</A></B> <I>?flag value?</I>
-		    <I>scriptName</I>
-<BR>
-<B>AppleScript <A NAME="store">store</A></B> <I>?flag value? scriptName fileName</I>
-<BR>
-</DL>
-
-<H3>DESCRIPTION</H3>
-<DL>
-<DT>
-
-
-This command is used to communicate with the AppleScript OSA component.  
-You can <A HREF="#compile"><B>compile</B></A> scripts, <A 
-HREF="#run"><B>run</B></A> compiled scripts, <A 
-HREF="#execute"><B>execute</B></A> script data (i.e.  compile and run at a 
-blow).  You can get script data from a compiled script (<A 
-HREF="#decompile"><B>decompile</B></A> it), and you can <A 
-HREF="#load"><B>load</B></A> a compiled script from the scpt resource of a 
-file, or <A HREF="store"><B>store</B></A> one to a scpt resource.  You can 
-also get <A HREF="#info"><B>info</B></A> on the currently available scripts 
-and contexts.  It has the general form
-
-<DL>
-<DT>
-<P>
-<I>AppleScript option ?arg arg ...?</I>
-<P>
-</DL>
-The possible sub-commands are:
-<P>
-<DL>
-	<DT>
-	<I>AppleScript</I> <A NAME="compile"><B>compile</A> </B><I>?-flag value?</I> <I>scriptData1 
-	   ?ScriptData2 ...?</I>
-	<BR>
-	
-	<DD>
-        The scriptData 
-	elements are concatenated (with a space between each), and
-	sent to AppleScript
-        for compilation.  There is no limitation on the size of 
-	the scriptData, beyond the available memory of the Wish interpreter.  
-	<P>
-	If the compilation is successful, then the command will return a token 
-	that you can pass to the <A HREF="#run">"run"</A> subcommand.  If the 
-	compilation fails, then the return value will be the error message from 
-	AppleScript, and the pertinent line of code, with an "_" to indicate 
-	the place where it thinks the error occured.
-	<P>
-	The 
-	compilation is controlled by flag value pairs.  The available flags 
-	are:
-	<P>
-	<DL>
-		<DT>
-		<A NAME="first compile switch"><B>-augment Boolean</B></A>
-		<DD>
-		To be used in concert with the <A HREF="#-context">-context</A> flag.  
-		If augment is yes, 
-		then the scriptData augments the handlers and data already in the 
-		script context.  If augment is no, then the scriptData replaces the 
-		data and handlers already in the context.  The default is yes.  
-		<P>		
-		<!-- I'm leaving this flag out for now, since I can't seem to get the
-		     AE manager to obey it.  Even when I hard code the value, applications
-		     still switch to the foreground.  Oh, well...
-		     
-		<DT>
-		<B>-canswitch Boolean  </B>
-		<DD>
-		 If yes, then applications activated by the code in scriptData will 
-		 be allowed to switch to the foreground.  If no, then they will use 
-		 the notification manager to indicate they need attention (this 
-		 usually means they blink the Finder icon, and put a check in the 
-		 application's entry in the Finder menu). 
-		 -->
-		 
-		<DT>
-		<B><A NAME="-context">-context</A> Boolean</B>
-		<DD> 
-		This flag causes the code given in the scriptData to be compiled 
-		into a "context".  In AppleScript, this is the equivalent of creating an Tcl 
-		Namespace.  The command in this case returns the name of the context as 
-		the its result, rather than a compiled script name.
-		<P>
-		You can store data and procedures (aka 
-		handlers) in a script context.  Then later, you can 
-		run other scripts in this context, and they will see all the data and 
-		handlers that were set up with this command.  You do this by passing the
-		name of this context to the -context flag of the run or execute subcommands.
-		<P>
-		Unlike the straight compile command, the code compiled into a 
-		script context is run immediatly, when it is compiled, to set up the context.
-		<DT>
-		<P>
-		<B>-name string</B> 
-		<DD>
-		Use <I>string</I> as the name of the script or script context.  If there is 
-		already a script 
-		of this name, it will be discarded.  The same is true with script 
-		contexts, unless the <I>-augment</I> flag is true.  If no name is provided, then a 
-		unique name will be created for you.
-		<DT>
-		<P>
-		<B>-parent contextName  </B>
-		<DD>
-		This flag is also to be used in conjunction with the <A HREF="#-context">-context</A> flag.  
-		<I>contextName</I> must be the name of a compiled script context.  Then 
-		the new script context will inherit the data and handlers from the 
-		parent context.
-	</DL>
-	<P>
-	<DT>
-	<I>AppleScript</I> <B><A NAME="decompile">decompile</A></B> <I>scriptName</I>
-	<BR>
-	<DD>
-	This decompiles the script data compiled into the script scriptName,
-	and returns the source code. 
-	<P>
-	<DT>
-	<I>AppleScript</I> <B>delete </B><I>scriptName</I>
-	<BR>
-	<DD>
-	This deletes the script data compiled into the script scriptName,
-	and frees up all the resources associated with it. 
-	<P>
-	<DT>
-	<I>AppleScript</I> <B><A NAME="execute">execute</A> </B><I>?flags value?</I> <I>scriptData1 
-	?scriptData2 ...?</I>
-	<BR>
-	<DD>
-	This compiles and runs the script in scriptData (concatenating first), and 
-	returns the results of the script execution.  It is the same as doing 
-	<I>compile</I> and then <I>run</I>, except that the compiled script is 
-	immediately discarded.
-   <P>
-	<DT>
-	<I>AppleScript</I> <B><A NAME="info">info</A> </B><I>what</I>
-	<DD>
-	This gives info on the connection.  The allowed values for "what" are:
-	<P>
-	<DL>
-	    <DT>
-		<P>
-	    <B>contexts </B> <I>?pattern?</I>
-	    <DD>
-	    This gives the list of the script contexts that have been.
-            If <I>pattern</I> is given, it only reports the contexts 
-	    that match this pattern.
-	    <DT>
-	<!--	<P>
-	    <B>language</B>
-	    <DD>
-	    Returns the language of this OSA component
-	    <DT>
-        -->
-		<P>
-	    <B>scripts</B> <I>?pattern?</I>
-	    <DD>
-	    This returns a list of the scripts that have been compiled in the 
-	    current connection.  If <I>pattern</I> is given, it only reports the 
-	    script names that match this pattern.
-	</DL>
-	<P>
-	<DT>
-	<I>AppleScript</I> <B><A NAME="load">load</A></B> <I>?flag value? fileName</I>
-	<DD>
-	This loads compiled script data from a resource of type 'scpt' in the 
-	file fileName, and returns a token for the script data.  As with the 
-	<I>compile</I> command, the script is not actually executed.  Note that all 
-	scripts compiled with Apple's "Script Editor" are stored as script
-	contexts.  However, unlike with the "<I>compile -context</I>" command, the <I>load</I> 
-	command does not run these scripts automatically.  If you want to set up 
-	the handlers contained in the loaded script, you must run it manually. 
-	<P>
-	<I>load</I> takes the following flags:
-	<P>
-	<DL>
-	    <DT>
-	    <B>-rsrcname string</B>
-	    <DD>
-	    load a named resource of type 'scpt' using the rsrcname 
-	    flag.
-	    <DT>
-		<P>
-	    <B>-rsrcid integer</B>
-	    <DD>
-	    load a resource by number with the rsrcid flag.  
-	</DL>
-	<DD>
-	<P>
-	If neither the <I>rsrcname</I> nor the <I>rsrcid</I> flag is provided, then the load 
-	command defaults to -rsrcid = 128.  This is the resource in which 
-	Apple's Script Editor puts the script data when it writes out a 
-	compiled script.
-	<P>
-	<DT>
-	<I>AppleScript</I> <B><A NAME="run">run</A></B> <I>?flag value?</I> <I>scriptName</I>
-	<DD>
-	This runs the script which was previously compiled into <I>scriptName</I>.  If the script  
-	runs successfully, the command returns the return value for this command, 
-	coerced to a text string.  
-	If there is an error in 
-	the script execution, then it returns the error result from the 
-	scripting component.  It accepts the following flag:
-   
-   <DL>
-        <DT>
-		<P>
-		<B>-context contextName</B>
-		<DD> 
-		<I>contextName</I> must be a context created by a previous call to <I>compile</I> with 
-		the -<I>context</I> flag set.  This flag causes the code given in the 
-		<I>scriptData</I> to be run in this "context".  It will see all the data and 
-		handlers that were set up previously.
-   <!-- <DT>
-		<B>-canswitch Boolean  </B>
-		<DD>
-		If yes, then applications activated by the code 
-		in scriptData will be allowed to switch to the foreground.  If no, then 
-		they will use the notification manager to indicate they need attention 
-		(this usually means they blink the Finder icon, and put a check in the 
-		application's entry in the Finder menu). -->		 
-   </DL>
-   <P>
-	<DT>
-	<I>AppleScript </I> <B> <A NAME="store">store</A></B> <I>?flag value? scriptName fileName</I>
-	<DD>
-	This stores a compiled script or script context into a resource of type 'scpt' in the 
-	file fileName.  
-	<P>
-	store takes the following flags:
-	<P>
-	<DL>
-	    <DT>
-	    <B>-rsrcname string</B>
-	    <DD>
-	    store to a named resource of type 'scpt' using the rsrcname 
-	    flag.
-	    <DT>
-		<P>
-	    <B>-rsrcid integer</B>
-	    <DD>
-	    store to a numbered resource with the rsrcid flag.  
-	</DL>
-	<P>
-	<DD>
-	If neither the rsrcname nor the rsrcid flag is provided, then the load 
-	command defaults to -rsrcid = 128.  Apple's Script Editor can read in files written by 
-	tclOSAScript with this setting of the <I>-rsrcid</I> flag.
-</DL>
-</DL>
-<H2>Notes:</H2>
-
-The AppleScript command is a stopgap command to fill the place of exec
-    on the Mac.  It is not a supported command, and will likely change
-    as we broaden it to allow communication with other OSA languages.
-<H2>See Also:</H2>
-
-
-</BODY>
-
-</HTML>
diff --git a/mac/Background.doc b/mac/Background.doc
deleted file mode 100644
index d23235a..0000000
--- a/mac/Background.doc
+++ /dev/null
@@ -1,92 +0,0 @@
-Notes about the Background Only application template
-====================================================
-
-RCS: @(#) $Id: Background.doc,v 1.2 1998/09/14 18:40:03 stanton Exp $
-
-We have included sample code and project files for making a Background-Only
- application (BOA) in Tcl.  This could be used for server processes (like the 
-Tcl Web-Server).  
-
-Files:
-------
-
-* BOA_TclShells.¼    - This is the project file.
-* tclMacBOAAppInit.c - This is the AppInit file for the BOA App.
-* tclMacBOAMain      - This is a replacement for the Tcl_Main for BOA's.
-
-Caveat:
--------
-
-This is an unsupported addition to MacTcl.  The main feature that will certainly
-change is how we handle AppleEvents.  Currently, all the AppleEvent handling is
-done on the Tk side, which is not really right.  Also, there is no way to 
-register your own AppleEvent handlers, which is obviously something that would be 
-useful in a BOA App.  We will address these issues in Tcl8.1.  If you need to 
-register your own AppleEvent Handlers in the meantime, be aware that your code
-will probably break in Tcl8.1.
-
-I will also improve the basic code here based on feedback that I recieve.  This
-is to be considered a first cut only at writing a BOA in Tcl.
-
-Introduction:
--------------
-
-This project makes a double-clickable BOA application.  It obviously needs 
-some Tcl code to get it started.  It will look for this code first in a 
-'TEXT' resource in the application shell whose name is "bgScript.tcl".  If 
-it does not find any such resource, it will look for a file called 
-bgScript.tcl in the application's folder.  Otherwise it will quit with an 
-error.
-
-It creates three files in the application folder to store stdin, stdout & 
-stderr.  They are imaginatively called temp.in, temp.out & temp.err.  They 
-will be opened append, so you do not need to erase them after each use of 
-the BOA.
-
-The app does understand the "quit", and the "doScript" AppleEvents, so you can 
-kill it with the former, and instruct it with the latter.  It also has an 
-aete, so you can target it with Apple's "Script Editor".
-
-For more information on Macintosh BOA's, see the Apple TechNote: 1070.
-
-Notifications:
---------------
-
-BOA's are not supposed to have direct contact with the outside world.  They 
-are, however, allowed to go through the Notification Manager to post 
-alerts.  To this end, I have added a Tcl command called "bgnotify" to the 
-shell, that simply posts a notification through the notification manager.
-
-To use it, say:
-
-bgnotify "Hi, there little buddy"
-
-It will make the system beep, and pop up an annoying message box with the 
-text of the first argument to the command.  While the message is up, Tcl 
-is yielding processor time, but not processing any events.
-
-Errors:
--------
-
-Usually a Tcl background application will have some startup code, opening 
-up a server socket, or whatever, and at the end of this, will use the 
-vwait command to kick off the event loop.  If an error occurs in the 
-startup code, it will kill the application, and a notification of the error 
-will be posted through the Notification Manager.  
-
-If an error occurs in the event handling code after the 
-vwait, the error message will be written to the file temp.err.  However, 
-if you would like to have these errors post a notification as well, just 
-define a proc called bgerror that takes one argument, the error message, 
-and passes that off to "bgnotify", thusly:
-
-proc bgerror {mssg} {
-	bgnotify "A background error has occured\n $mssg"
-}
-
-Support:
---------
-
-If you have any questions, contact me at:
-
-jim.ingham@eng.sun.com
diff --git a/mac/MW_TclAppleScriptHeader.pch b/mac/MW_TclAppleScriptHeader.pch
deleted file mode 100644
index bf130ab..0000000
--- a/mac/MW_TclAppleScriptHeader.pch
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * MW_TclAppleScriptHeader.pch --
- *
- *  This file is the source for a pre-compilied header that gets used
- *  for TclAppleScript.  This make compilies go a bit
- *  faster.  This file is only intended to be used in the MetroWerks
- *  CodeWarrior environment.  It essentially acts as a place to set 
- *  compiler flags.  See MetroWerks documention for more details.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: MW_TclAppleScriptHeader.pch,v 1.3 1998/11/10 16:30:35 rjohnson Exp $
- */
-
-/*
- * To use the compilied header you need to set the "Prefix file" in
- * the "C/C++ Language" preference panel to point to the created
- * compilied header.  The name of the header depends on the
- * architecture we are compiling for (see the code below).  For
- * example, for a 68k app the prefix file should be: MW_TclHeader68K.
- */
-
-#if __POWERPC__
-#pragma precompile_target "MW_TclAppleScriptHeaderPPC"
-#include "MW_TclHeaderPPC"
-#elif __CFM68K__
-#pragma precompile_target "MW_TclAppleScriptHeaderCFM68K"
-#include "MW_TclHeaderCFM68K"
-#else
-#pragma precompile_target "MW_TclAppleScriptHeader68K"
-#include "MW_TclHeader68K"
-#endif
-
-
-#define TCL_REGISTER_LIBRARY 1
-/*
- * Place any includes below that will are needed by the majority of the
- * and is OK to be in any file in the system.  The pragma's are used
- * to control what functions are exported in the Tcl shared library.
- */
-
-#pragma export on
-#pragma export off
-
diff --git a/mac/MW_TclHeader.pch b/mac/MW_TclHeader.pch
deleted file mode 100644
index 4982c3b..0000000
--- a/mac/MW_TclHeader.pch
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * MW_TclHeader.pch --
- *
- *  This file is the source for a pre-compilied header that gets used
- *  for all files in the Tcl projects.  This make compilies go a bit
- *  faster.  This file is only intended to be used in the MetroWerks
- *  CodeWarrior environment.  It essentially acts as a place to set 
- *  compiler flags.  See MetroWerks documention for more details.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: MW_TclHeader.pch,v 1.6 1999/04/16 00:47:19 stanton Exp $
- */
-
-/*
- * To use the compilied header you need to set the "Prefix file" in
- * the "C/C++ Language" preference panel to point to the created
- * compilied header.  The name of the header depends on the
- * architecture we are compiling for (see the code below).  For
- * example, for a 68k app the prefix file should be: MW_TclHeader68K.
- */
-#if __POWERPC__
-#pragma precompile_target "MW_TclHeaderPPC"
-#elif __CFM68K__
-#pragma precompile_target "MW_TclHeaderCFM68K"
-#else
-#pragma precompile_target "MW_TclHeader68K"
-#endif
-
-#include "tclMacCommonPch.h"
-
-/*
- * Place any includes below that will are needed by the majority of the
- * and is OK to be in any file in the system.  The pragma's are used
- * to control what functions are exported in the Tcl shared library.
- */
-
-#pragma export on
-#include "tcl.h"
-#include "tclMac.h"
-#include "tclInt.h"
-
-#pragma export reset
-
diff --git a/mac/README b/mac/README
deleted file mode 100644
index 8f05bbc..0000000
--- a/mac/README
+++ /dev/null
@@ -1,176 +0,0 @@
-Tcl 8.1b2 for Macintosh
-
-by Ray Johnson
-Scriptics Corporation
-rjohnson@scriptics.com
-with major help from
-Jim Ingham
-Cygnus Solutions
-jingham@cygnus.com
-
-RCS: @(#) $Id: README,v 1.6 1999/04/16 00:47:19 stanton Exp $
-
-1. Introduction
----------------
-
-This is the README file for the Macintosh version of the Tcl
-scripting language.  The file consists of information specific
-to the Macintosh version of Tcl.  For more general information
-please read the README file in the main Tcl directory.
-
-2. What's new?
---------------
-
-Internationalization!  This is the first Tcl release that features
-can handle international characters.
-
-On the Macintosh, the System Encoding is taken from the script of the
-Finder Font as set in the Views control panel, or in the Finder
-Preferences in OS8.0.
-
-See the main Tcl README for other features new to Tcl 8.
-
-3. Mac specific features
-------------------------
-
-There are several features or enhancements in Tcl that are unique to 
-the Macintosh version of Tcl.  Here is a list of those features and
-pointers to where you can find more information about the feature.
-
-* The "resource" command allows you manipulate Macintosh resources.
-  A complete man page is available for this command.
-
-* The Mac version of the "source" command has an option to source from
-  a Macintosh resource.  Check the man page from the source command
-  for details.
-
-* The only command NOT available on the Mac is the exec command.
-  However, we include a Mac only package called Tclapplescript that
-  provides access to Mac's AppleScript system.  This command is still
-  under design & construction.  Documentatin can be found in the "HTML
-  Docs:tcl8.1" folder in a file called "AppleScript.html".
-
-* The env variable on the Macintosh works rather differently than on
-  Windows or UNIX platforms.  Check out the tclvars man page for
-  details.
-
-* The command "file volumes" returns the available volumes on your
-  Macintosh.  Check out the file command for details.
-
-* The command "file attributes" has the Mac specific options of
-  -creator and -type which allow you to query and set the Macintosh
-  creator and type codes for Mac files.  See file man page for details.
-
-* We have added a template for creating a Background-only Tcl application.
-  So you can use Tcl as a faceless server process.  For more details, see 
-  the file background.doc.
-  
-If you are writing cross platform code but would still like to use
-some of these Mac specific commands, please remember to use the
-tcl_platform variable to special case your code.
-
-
-4. The Distribution
--------------------
-
-Macintosh Tcl is distributed in three different forms.  This 
-should make it easier to only download what you need.  The 
-packages are as follows:
-
-mactk8.1b2.sea.hqx
-
-    This distribution is a "binary" only release.  It contains an
-    installer program that will install a 68k, PowerPC, or Fat
-    version of the "Tcl Shell" and "Wish" applications.  In addition,
-    it installs the Tcl & Tk libraries in the Extensions folder inside
-    your System Folder.
-
-mactcltk-full-8.1b2.sea.hqx
-
-    This release contains the full release of Tcl and Tk for the
-    Macintosh plus the More Files packages which Macintosh Tcl and Tk
-    rely on.
-
-mactcl-source-8.1b2.sea.hqx
-
-    This release contains the complete source for Tcl 8.1.  In
-    addition, Metrowerks CodeWarrior libraries and project files
-    are included.  However, you must already have the More Files
-    package to compile this code.
-
-5. Documentation
-----------------
-
-The "html" subdirectory contains reference documentation in
-in the HTML format.  You may also find these pages at:
-
-	http://www.scriptics.com/man/tcl8.1/contents.html
-
-Other documentation and sample Tcl scripts can be found at
-the Tcl archive site: 
-
-	ftp://ftp.neosoft.com/tcl/
-
-and the Tcl resource center:
-
-	http://www.scriptics.com/resource/
-
-The internet news group comp.lang.tcl is also a valuable
-source of information about Tcl.  A mailing list is also
-available (see below).
-
-6. Compiling Tcl
-----------------
-
-In order to compile Macintosh Tcl you must have the 
-following items:
-
-	CodeWarrior Pro 2 or 3
-	Mac Tcl 8.1 (source)
-	More Files 1.4.3
-
-There are two sets of project files included with the package. The ones
-we use for the release are for CodeWarrior Pro 3, and are not compatible
-with CodeWarrior Gold release 11 and earlier. We have included the files
-for earlier versions of CodeWarrior in the folder tcl8.1:mac:CW11 Projects,
-but they are unsupported, and a little out of date.
-
-As of Tcl8.0p2, the code will also build under CW Pro 2.  The only
-change that needs to be made is that float.mac.c should be replaced by
-float.c in the MacTcl MSL project file.
-
-However, there seems to be a bug in the CFM68K Linker in CW Pro 2,
-which renders the CFM68K Version under CW Pro 2 very unstable.  I am
-working with MetroWerks to resolve this issue.  The PPC version is
-fine, as is the Traditional 68K Shell.  But if you need to use the
-CFM68K, then you must stay with CW Pro 1 for now.
-
-The project  files included with the Mac Tcl source should work 
-fine.  The only thing you may need to update are the access paths.
-Unfortunantly, it's somewhat common for the project files to become
-slightly corrupted.  The most common problem is that the "Prefix file"
-found in the "C/C++ Preference" panel is incorrect.  This should be
-set to MW_TclHeaderPPC, MW_TclHeader68K or MW_TclHeaderCFM68K.
-
-To build the fat version of TclShell, open the project file "TclShells.¼",
-select the "TclShell" target, and build. All of the associated binaries will
-be built automoatically. There are also targets for building static 68K
-and Power PC builds, for building a CFM 68K build, and for building a
-shared library Power PC only build.
-
-Special notes:
-
-* There is a small bug in More Files 1.4.3.  Also you should not use
-  MoreFiles 1.4.4 - 1.4.6.  Look in the file named morefiles.doc for
-  more details.
-
-* You may not have the libmoto library which will cause a compile 
-  error.  You don't REALLY need it - it can be removed.  Look at the
-  file libmoto.doc for more details.
-
-* Check out the file bugs.doc for information about known bugs.
-
-If you have comments or Bug reports send them to:
-Jim Ingham
-jingham@cygnus.com
-
diff --git a/mac/bugs.doc b/mac/bugs.doc
deleted file mode 100644
index 3e1efb9..0000000
--- a/mac/bugs.doc
+++ /dev/null
@@ -1,32 +0,0 @@
-Known bug list for Tcl 8.0 for Macintosh
-
-by Ray Johnson
-Sun Microsystems Laboratories
-rjohnson@eng.sun.com
-
-RCS: @(#) $Id: bugs.doc,v 1.2 1998/09/14 18:40:04 stanton Exp $
-
-This was a new feature as of Tcl7.6b1 and as such I'll started with
-a clean slate.  I currently know of no reproducable bugs.  I often
-get vague reports - but nothing I've been able to confirm.  Let
-me know what bugs you find!
-
-The Macintosh version of Tcl passes most all tests in the Tcl
-test suite.  Slower Macs may fail some tests in event.test whose
-timing constraints are too tight.  If other tests fail please report
-them.
-
-Ray
-
-Known bugs in the current release.
-
-* With the socket code you can't use the "localhost" host name.  This
-  is actually a known bug in Apple's MacTcp stack.  However, you can
-  use [info hostname] whereever you would have used "localhost" to 
-  achive the same effect.
-
-* Most socket bugs have been fixed.  We do have a couple of test cases
-  that will hang the Mac, however, and we are still working on them.
-  If you find additional test cases that show crashes please let us
-  know!
-
diff --git a/mac/libmoto.doc b/mac/libmoto.doc
deleted file mode 100644
index 2183651..0000000
--- a/mac/libmoto.doc
+++ /dev/null
@@ -1,39 +0,0 @@
-Notes about the use of libmoto
-------------------------------
-
-RCS: @(#) $Id: libmoto.doc,v 1.2 1998/09/14 18:40:04 stanton Exp $
-
-First of all, libmoto is not required!  If you don't have it, you
-can simply remove the library reference from the project file and
-everything should compile just fine.
-
-The libmoto library replaces certain functions in the MathLib and
-ANSI libraries.  Motorola has optimized the functions in the library
-to run very fast on the PowerPC.  As I said above, you don't need
-this library, but it does make things faster.
-
-Obtaining Libmoto:
-
-	For more information about Libmoto and how to doanload
-	it, visit the following URL:
-
-    http://www.mot.com/SPS/PowerPC/library/fact_sheet/libmoto.html
-
-	You will need to register for the library.  However, the
-	library is free and you can use it in any commercial product
-	you might have.
-
-Installing Libmoto:
-
-	Just follow the instructions provided by the Motorola 
-	README file.  You need to make sure that the Libmoto
-	library is before the ANSI and MathLib libraries in
-	link order.  Also, you will get several warnings stateing
-	that certain functions have already been defined in 
-	Libmoto.  (These can safely be ignored.)
-
-Finally, you can thank Kate Stewart of Motorola for twisting my
-arm at the Tcl/Tk Conference to provide some support for Libmoto.
-
-Ray Johnson
-
diff --git a/mac/morefiles.doc b/mac/morefiles.doc
deleted file mode 100644
index 58f0929..0000000
--- a/mac/morefiles.doc
+++ /dev/null
@@ -1,74 +0,0 @@
-Notes about MoreFiles, dnr.c & other non-Tcl source files
----------------------------------------------------------
-
-RCS: @(#) $Id: morefiles.doc,v 1.2 1998/09/14 18:40:04 stanton Exp $
-
-The Macintosh distribution uses several source files that don't
-actually ship with Tcl.  This sometimes causes problems or confusion
-to developers.  This document should help clear up a few things.
-
-dnr.c
------
-
-We have found a way to work around some bugs in dnr.c that 
-Apple has never fixed even though we sent in numerous bug reports.
-The file tclMacDNR.c simply set's some #pragma's and the includes
-the Apple dnr.c file.  This should work the problems that many of
-you have reported with dnr.c.
-
-More Files
-----------
-
-Macintosh Tcl/Tk also uses Jim Luther's very useful package called
-More Files.  More Files fixes many of the broken or underfunctional
-parts of the file system.
-
-More Files can be found on the MetroWerks CD and Developer CD from
-Apple.  You can also down load the latest version from:
-
-	ftp://members.aol.com/JumpLong/
-
-The package can also be found at the home of Tcl/Tk for the mac:
-
-	ftp://ftp.sunlabs.com/pub/tcl/mac/
-
-I used to just link the More Files library in the Tcl projects.  
-However, this caused problems when libraries wern't matched correctly.
-I'm now including the files in the Tcl project directly.  This
-solves the problem of missmatched libraries - but may not always
-compile.
-
-If you get a compiliation error in MoreFiles you need to contact
-Jim Luther.  His email address:
-
-	JumpLong@aol.com
-
-The version of More Files that we use with Tcl/Tk is 1.4.3.  Early
-version may work as well..
-
-Unfortunantly, there is one bug in his library (in 1.4.3).  The bug is
-in the function FSpGetFullPath found in the file FullPath.c.  After
-the call to PBGetCatInfoSync you need to change the line:
-
-    if ( result == noErr )
-
-	to:
-
-    if ( (result == noErr) || (result == fnfErr) )
-
-
-The latest version of More Files is 1.4.6.  Unfortunantly, this
-version has a bug that keeps it from working with shared libraries
-right out of the box.  If you want to use 1.4.6 you can but you will
-need to make the following fix:
-
-	In the file "Opimization.h" in the More Files package you
-	need to remove the line "#pragma internal on".  And in the
-	file "OptimazationEnd.h" you need to remove the line
-	"#pragma internal reset".
-
-Note: the version of MoreFile downloaded from the Sun Tcl/Tk site
-will have the fix included.  (If you want you can send email to
-Jim Luther suggesting that he use Tcl for regression testing!)
-
-Ray Johnson
diff --git a/mac/porting.notes b/mac/porting.notes
deleted file mode 100644
index 5e71969..0000000
--- a/mac/porting.notes
+++ /dev/null
@@ -1,23 +0,0 @@
-Porting Notes
--------------
-
-RCS: @(#) $Id: porting.notes,v 1.2 1998/09/14 18:40:04 stanton Exp $
-
-Currently, the Macintosh version Tcl only compilies with the
-CodeWarrior C compilier from MetroWerks.  It should be straight
-forward to port the Tcl source to MPW.
-
-Tcl on the Mac no longer requires the use of GUSI.  It should now
-be easier to port Tcl/Tk to other compiliers such as Symantic C
-and MPW C.
-
-If you attempt to port Tcl to other Macintosh compiliers please
-let me know.  I would be glad to help with advice and encouragement.
-If your efforts are succesfull I wold also be interested in puting
-those changes into the core distribution.  Furthermore, please feel
-free to send me any notes you might make about your porting
-experience so I may include them in this file for others to reference.
-
-Ray Johnson
-ray.johnson@eng.sun.com
-
diff --git a/mac/tclMac.h b/mac/tclMac.h
deleted file mode 100644
index a051cc8..0000000
--- a/mac/tclMac.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * tclMac.h --
- *
- *	Declarations of Macintosh specific public variables and procedures.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMac.h,v 1.4 1999/03/10 05:52:51 stanton Exp $
- */
-
-#ifndef _TCLMAC
-#define _TCLMAC
-
-#ifndef _TCL
-#   include "tcl.h"
-#endif
-#include <Types.h>
-#include <Files.h>
-#include <Events.h>
-
-/*
- * "export" is a MetroWerks specific pragma.  It flags the linker that  
- * any symbols that are defined when this pragma is on will be exported 
- * to shared libraries that link with this library.
- */
- 
-#pragma export on
-
-typedef int (*Tcl_MacConvertEventPtr) _ANSI_ARGS_((EventRecord *eventPtr));
-
-#include "tclPlatDecls.h"
-
-#pragma export reset
-
-#endif /* _TCLMAC */
diff --git a/mac/tclMacAETE.r b/mac/tclMacAETE.r
deleted file mode 100644
index be9dd11..0000000
--- a/mac/tclMacAETE.r
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * tclMacAETE.r --
- *
- *	This file creates the Apple Event Terminology resources 
- *	for use Tcl and Tk.  It is not used in the Simple Tcl shell
- *      since SIOUX does not support AppleEvents.  An example of its
- *      use in Tcl is the TclBGOnly project.  And it is used in all the
- *      Tk Shells.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacAETE.r,v 1.2 1998/09/14 18:40:04 stanton Exp $
- */
-
-#define SystemSevenOrLater 1
-
-#include <Types.r>
-#include <SysTypes.r>
-#include <AEUserTermTypes.r>
-
-/*
- * The following resources defines the Apple Events that Tk can be
- * sent from Apple Script.
- */
-
-resource 'aete' (0, "Wish Suite") {
-    0x01, 0x00, english, roman,
-    {
-	"Required Suite", 
-	"Events that every application should support", 
-	'reqd', 1, 1,
-	{},
-	{},
-	{},
-	{},
-
-	"Wish Suite", "Events for the Wish application", 'WIsH', 1, 1,
-	{
-	    "do script", "Execute a Tcl script", 'misc', 'dosc',
-	    'TEXT', "Result", replyOptional, singleItem,
-	    notEnumerated, reserved, reserved, reserved, reserved,
-	    reserved, reserved, reserved, reserved, reserved,
-	    reserved, reserved, reserved, reserved, 
-	    'TEXT', "Script to execute", directParamRequired,
-	    singleItem, notEnumerated, changesState, reserved,
-	    reserved, reserved, reserved, reserved, reserved,
-	    reserved, reserved, reserved, reserved, reserved,
-	    reserved, 
-	    {},
-	},
-	{},
-	{},
-	{},
-    }
-};
diff --git a/mac/tclMacAlloc.c b/mac/tclMacAlloc.c
deleted file mode 100644
index 7a8efc4..0000000
--- a/mac/tclMacAlloc.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * tclMacAlloc.c --
- *
- *	This is a very fast storage allocator.  It allocates blocks of a
- *	small number of different sizes, and keeps free lists of each size.
- *	Blocks that don't exactly fit are passed up to the next larger size.
- *	Blocks over a certain size are directly allocated by calling NewPtr.
- *
- * Copyright (c) 1983 Regents of the University of California.
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * Portions contributed by Chris Kingsley, Jack Jansen and Ray Johnson
- *.
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacAlloc.c,v 1.3 1998/09/14 18:40:04 stanton Exp $
- */
-
-#include "tclMacInt.h"
-#include "tclInt.h"
-#include <Memory.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/*
- * Flags that are used by ConfigureMemory to define how the allocator
- * should work.  They can be or'd together.
- */
-#define MEMORY_ALL_SYS 1	/* All memory should come from the system
-heap. */
-
-/*
- * Amount of space to leave in the application heap for the Toolbox to work.
- */
-
-#define TOOLBOX_SPACE (32 * 1024)
-
-static int memoryFlags = 0;
-static Handle toolGuardHandle = NULL;
-				/* This handle must be around so that we don't
-				 * have NewGWorld failures. This handle is
-				 * purgeable. Before we allocate any blocks,
-				 * we see if this handle is still around.
-				 * If it is not, then we try to get it again.
-				 * If we can get it, we lock it and try
-				 * to do the normal allocation, unlocking on
-				 * the way out. If we can't, we go to the
-				 * system heap directly. */
-
-
-/*
- * The following typedef and variable are used to keep track of memory
- * blocks that are allocated directly from the System Heap.  These chunks
- * of memory must always be freed - even if we crash.
- */
-
-typedef struct listEl {
-    Handle		memoryHandle;
-    struct listEl *	next;
-} ListEl;
-
-ListEl * systemMemory = NULL;
-ListEl * appMemory = NULL;
-
-/*
- * Prototypes for functions used only in this file.
- */
-
-static pascal void	CleanUpExitProc _ANSI_ARGS_((void));
-void 			ConfigureMemory _ANSI_ARGS_((int flags));
-void			FreeAllMemory _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpSysRealloc --
- *
- *	This function reallocates a chunk of system memory.  If the
- *	chunk is already big enough to hold the new block, then no
- *	allocation happens.
- *
- * Results:
- *	Returns a pointer to the newly allocated block.
- *
- * Side effects:
- *	May copy the contents of the original block to the new block
- *	and deallocate the original block.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclpSysRealloc(
-    VOID *oldPtr,		/* Original block */
-    unsigned int size)		/* New size of block. */
-{
-    Handle hand;
-    void *newPtr;
-    int maxsize;
-
-    hand = * (Handle *) ((Ptr) oldPtr - sizeof(Handle));
-    maxsize = GetHandleSize(hand) - sizeof(Handle);
-    if (maxsize < size) {
-	newPtr = TclpSysAlloc(size, 1);
-	memcpy(newPtr, oldPtr, maxsize);
-	TclpSysFree(oldPtr);
-    } else {
-	newPtr = oldPtr;
-    }
-    return newPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpSysAlloc --
- *
- *	Allocate a new block of memory free from the System.
- *
- * Results:
- *	Returns a pointer to a new block of memory.
- *
- * Side effects:
- *	May obtain memory from app or sys space.  Info is added to
- *	overhead lists etc.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclpSysAlloc(
-    long size,		/* Size of block to allocate. */
-    int isBin)		/* Is this a bin allocation? */
-{
-    Handle hand = NULL;
-    ListEl * newMemoryRecord;
-
-    if (!(memoryFlags & MEMORY_ALL_SYS)) {
-
-    	/*
-    	 * If the guard handle has been purged, throw it away and try
-    	 * to allocate it again.
-    	 */
-
-    	if ((toolGuardHandle != NULL) && (*toolGuardHandle == NULL)) {
-    	    DisposeHandle(toolGuardHandle);
-    	    toolGuardHandle = NULL;
-    	}
-
-    	/*
-    	 * If we have never allocated the guard handle, or it was purged
-    	 * and thrown away, then try to allocate it again.
-    	 */
-
-    	if (toolGuardHandle == NULL) {
-    	    toolGuardHandle = NewHandle(TOOLBOX_SPACE);
-    	    if (toolGuardHandle != NULL) {
-    	    	HPurge(toolGuardHandle);
-    	    }
-    	}
-
-	/*
-	 * If we got the handle, lock it and do our allocation.
-	 */
-
-    	if (toolGuardHandle != NULL) {
-    	    HLock(toolGuardHandle);
-	    hand = NewHandle(size + sizeof(Handle));
-	    HUnlock(toolGuardHandle);
-	}
-    }
-    if (hand != NULL) {
-	newMemoryRecord = (ListEl *) NewPtr(sizeof(ListEl));
-	if (newMemoryRecord == NULL) {
-	    DisposeHandle(hand);
-	    return NULL;
-	}
-	newMemoryRecord->memoryHandle = hand;
-	newMemoryRecord->next = appMemory;
-	appMemory = newMemoryRecord;
-    } else {
-	/*
-	 * Ran out of memory in application space.  Lets try to get
-	 * more memory from system.  Otherwise, we return NULL to
-	 * denote failure.
-	 */
-	isBin = 0;
-	hand = NewHandleSys(size + sizeof(Handle));
-	if (hand == NULL) {
-	    return NULL;
-	}
-	if (systemMemory == NULL) {
-	    /*
-	     * This is the first time we've attempted to allocate memory
-	     * directly from the system heap.  We need to now install the
-	     * exit handle to ensure the memory is cleaned up.
-	     */
-	    TclMacInstallExitToShellPatch(CleanUpExitProc);
-	}
-	newMemoryRecord = (ListEl *) NewPtrSys(sizeof(ListEl));
-	if (newMemoryRecord == NULL) {
-	    DisposeHandle(hand);
-	    return NULL;
-	}
-	newMemoryRecord->memoryHandle = hand;
-	newMemoryRecord->next = systemMemory;
-	systemMemory = newMemoryRecord;
-    }
-    if (isBin) {
-	HLockHi(hand);
-    } else {
-	HLock(hand);
-    }
-    (** (Handle **) hand) = hand;
-
-    return (*hand + sizeof(Handle));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpSysFree --
- *
- *	Free memory that we allocated back to the system.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Memory is freed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpSysFree(
-    void * ptr)		/* Free this system memory. */
-{
-    Handle hand;
-    OSErr err;
-
-    hand = * (Handle *) ((Ptr) ptr - sizeof(Handle));
-    DisposeHandle(hand);
-    *hand = NULL;
-    err = MemError();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanUpExitProc --
- *
- *	This procedure is invoked as an exit handler when ExitToShell
- *	is called.  It removes any memory that was allocated directly
- *	from the system heap.  This must be called when the application
- *	quits or the memory will never be freed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May free memory in the system heap.
- *
- *----------------------------------------------------------------------
- */
-
-static pascal void
-CleanUpExitProc()
-{
-    ListEl * memRecord;
-
-    while (systemMemory != NULL) {
-	memRecord = systemMemory;
-	systemMemory = memRecord->next;
-        if (*(memRecord->memoryHandle) != NULL) {
-            DisposeHandle(memRecord->memoryHandle);
-        }
-	DisposePtr((void *) memRecord);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeAllMemory --
- *
- *	This procedure frees all memory blocks allocated by the memory
- *	sub-system.  Make sure you don't have any code that references
- *	any malloced data!
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees all memory allocated by TclpAlloc.
- *
- *----------------------------------------------------------------------
- */
-
-void
-FreeAllMemory()
-{
-    ListEl * memRecord;
-
-    while (systemMemory != NULL) {
-	memRecord = systemMemory;
-	systemMemory = memRecord->next;
-	if (*(memRecord->memoryHandle) != NULL) {
-            DisposeHandle(memRecord->memoryHandle);
-        }
-	DisposePtr((void *) memRecord);
-    }
-    while (appMemory != NULL) {
-	memRecord = appMemory;
-	appMemory = memRecord->next;
-	if (*(memRecord->memoryHandle) != NULL) {
-            DisposeHandle(memRecord->memoryHandle);
-        }
-	DisposePtr((void *) memRecord);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConfigureMemory --
- *
- *	This procedure sets certain flags in this file that control
- *	how memory is allocated and managed.  This call must be made
- *	before any call to TclpAlloc is made.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Certain state will be changed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-ConfigureMemory(
-    int flags)		/* Flags that control memory alloc scheme. */
-{
-    memoryFlags = flags;
-}
diff --git a/mac/tclMacAppInit.c b/mac/tclMacAppInit.c
deleted file mode 100644
index c4e4746..0000000
--- a/mac/tclMacAppInit.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* 
- * tclMacAppInit.c --
- *
- *	Provides a version of the Tcl_AppInit procedure for the example shell.
- *
- * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacAppInit.c,v 1.5 1999/04/16 00:47:19 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMac.h"
-#include "tclMacInt.h"
-
-#if defined(THINK_C)
-#   include <console.h>
-#elif defined(__MWERKS__)
-#   include <SIOUX.h>
-short InstallConsole _ANSI_ARGS_((short fd));
-#endif
-
-#ifdef TCL_TEST
-extern int		Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TCL_TEST */
-
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-static int		MacintoshInit _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	Main program for tclsh.  This file can be used as a prototype
- *	for other applications using the Tcl library.
- *
- * Results:
- *	None. This procedure never returns (it exits the process when
- *	it's done.
- *
- * Side effects:
- *	This procedure initializes the Macintosh world and then 
- *	calls Tcl_Main.  Tcl_Main will never return except to exit.
- *
- *----------------------------------------------------------------------
- */
-
-void
-main(
-    int argc,				/* Number of arguments. */
-    char **argv)			/* Array of argument strings. */
-{
-    char *newArgv[2];
-    
-    if (MacintoshInit()  != TCL_OK) {
-	Tcl_Exit(1);
-    }
-
-    argc = 1;
-    newArgv[0] = "tclsh";
-    newArgv[1] = NULL;
-    Tcl_Main(argc, newArgv, Tcl_AppInit);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(
-    Tcl_Interp *interp)		/* Interpreter for application. */
-{
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-#ifdef TCL_TEST
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
-    if (TclObjTest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    if (Procbodytest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init,
-            Procbodytest_SafeInit);
-#endif /* TCL_TEST */
-
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     * Each call would loo like this:
-     *
-     * Tcl_CreateCommand(interp, "tclName", CFuncCmd, NULL, NULL);
-     */
-
-    /*
-     * Specify a user-specific startup script to invoke if the application
-     * is run interactively.  On the Mac we can specifiy either a TEXT resource
-     * which contains the script or the more UNIX like file location
-     * may also used.  (I highly recommend using the resource method.)
-     */
-
-    Tcl_SetVar(interp, "tcl_rcRsrcName", "tclshrc", TCL_GLOBAL_ONLY);
-    /* Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY); */
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MacintoshInit --
- *
- *	This procedure calls initalization routines to set up a simple
- *	console on a Macintosh.  This is necessary as the Mac doesn't
- *	have a stdout & stderr by default.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	Inits the appropiate console package.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-MacintoshInit()
-{
-#if GENERATING68K && !GENERATINGCFM
-    SetApplLimit(GetApplLimit() - (TCL_MAC_68K_STACK_GROWTH));
-#endif
-    MaxApplZone();
-
-#if defined(THINK_C)
-
-    /* Set options for Think C console package */
-    /* The console package calls the Mac init calls */
-    console_options.pause_atexit = 0;
-    console_options.title = "\pTcl Interpreter";
-		
-#elif defined(__MWERKS__)
-
-    /* Set options for CodeWarrior SIOUX package */
-    SIOUXSettings.autocloseonquit = true;
-    SIOUXSettings.showstatusline = true;
-    SIOUXSettings.asktosaveonclose = false;
-    InstallConsole(0);
-    SIOUXSetTitle("\pTcl Interpreter");
-		
-#elif defined(applec)
-
-    /* Init packages used by MPW SIOW package */
-    InitGraf((Ptr)&qd.thePort);
-    InitFonts();
-    InitWindows();
-    InitMenus();
-    TEInit();
-    InitDialogs(nil);
-    InitCursor();
-		
-#endif
-
-    Tcl_MacSetEventProc((Tcl_MacConvertEventPtr) SIOUXHandleOneEvent);
-    
-    /* No problems with initialization */
-    return TCL_OK;
-}
diff --git a/mac/tclMacApplication.r b/mac/tclMacApplication.r
deleted file mode 100644
index 21e013e..0000000
--- a/mac/tclMacApplication.r
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
- * tclMacApplication.r --
- *
- *	This file creates resources for use Tcl Shell application.
- *	It should be viewed as an example of how to create a new
- *	Tcl application using the shared Tcl libraries.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacApplication.r,v 1.2 1998/09/14 18:40:04 stanton Exp $
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-/*
- * The folowing include and defines help construct
- * the version string for Tcl.
- */
-
-#define RESOURCE_INCLUDED
-#include "tcl.h"
-
-#if (TCL_RELEASE_LEVEL == 0)
-#   define RELEASE_LEVEL alpha
-#elif (TCL_RELEASE_LEVEL == 1)
-#   define RELEASE_LEVEL beta
-#elif (TCL_RELEASE_LEVEL == 2)
-#   define RELEASE_LEVEL final
-#endif
-
-#if (TCL_RELEASE_LEVEL == 2)
-#   define MINOR_VERSION (TCL_MINOR_VERSION * 16) + TCL_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION TCL_MINOR_VERSION * 16
-#endif
-
-resource 'vers' (1) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	TCL_PATCH_LEVEL ", by Ray Johnson © Sun Microsystems"
-};
-
-resource 'vers' (2) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	"Tcl Shell " TCL_PATCH_LEVEL " © 1996"
-};
-
-#define TCL_APP_CREATOR 'Tcl '
-
-type TCL_APP_CREATOR as 'STR ';
-resource TCL_APP_CREATOR (0, purgeable) {
-	"Tcl Shell " TCL_PATCH_LEVEL " © 1996"
-};
-
-/*
- * The 'kind' resource works with a 'BNDL' in Macintosh Easy Open
- * to affect the text the Finder displays in the "kind" column and
- * file info dialog.  This information will be applied to all files
- * with the listed creator and type.
- */
-
-resource 'kind' (128, "Tcl kind", purgeable) {
-	TCL_APP_CREATOR,
-	0, /* region = USA */
-	{
-		'APPL', "Tcl Shell",
-	}
-};
diff --git a/mac/tclMacBOAAppInit.c b/mac/tclMacBOAAppInit.c
deleted file mode 100644
index 4fc34e8..0000000
--- a/mac/tclMacBOAAppInit.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* 
- * tclMacBOAAppInit.c --
- *
- *	Provides a version of the Tcl_AppInit procedure for a 
- *      Macintosh Background Only Application.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacBOAAppInit.c,v 1.3 1999/04/16 00:47:19 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMac.h"
-#include "tclMacInt.h"
-#include <Fonts.h>
-#include <Windows.h>
-#include <Dialogs.h>
-#include <Menus.h>
-#include <Aliases.h>
-#include <LowMem.h>
-
-#include <AppleEvents.h>
-#include <SegLoad.h>
-#include <ToolUtils.h>
-
-#if defined(THINK_C)
-#   include <console.h>
-#elif defined(__MWERKS__)
-#   include <SIOUX.h>
-short InstallConsole _ANSI_ARGS_((short fd));
-#endif
-
-void TkMacInitAppleEvents(Tcl_Interp *interp);
-int HandleHighLevelEvents(EventRecord *eventPtr);	
-
-#ifdef TCL_TEST
-EXTERN int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif /* TCL_TEST */
-
-/*
- * Forward declarations for procedures defined later in this file:
- */
-
-static int		MacintoshInit _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	Main program for tclsh.  This file can be used as a prototype
- *	for other applications using the Tcl library.
- *
- * Results:
- *	None. This procedure never returns (it exits the process when
- *	it's done.
- *
- * Side effects:
- *	This procedure initializes the Macintosh world and then 
- *	calls Tcl_Main.  Tcl_Main will never return except to exit.
- *
- *----------------------------------------------------------------------
- */
-
-void
-main(
-    int argc,				/* Number of arguments. */
-    char **argv)			/* Array of argument strings. */
-{
-    char *newArgv[3];
-    
-    if (MacintoshInit()  != TCL_OK) {
-	Tcl_Exit(1);
-    }
-
-    argc = 2;
-    newArgv[0] = "tclsh";
-    newArgv[1] = "bgScript.tcl";
-    newArgv[2] = NULL;
-    Tcl_Main(argc, newArgv, Tcl_AppInit);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(
-    Tcl_Interp *interp)		/* Interpreter for application. */
-{
-    Tcl_Channel tempChan;
-    
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-#ifdef TCL_TEST
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
-    if (TclObjTest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#endif /* TCL_TEST */
-
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     * Each call would loo like this:
-     *
-     * Tcl_CreateCommand(interp, "tclName", CFuncCmd, NULL, NULL);
-     */
-
-    /*
-     * Specify a user-specific startup script to invoke if the application
-     * is run interactively.  On the Mac we can specifiy either a TEXT resource
-     * which contains the script or the more UNIX like file location
-     * may also used.  (I highly recommend using the resource method.)
-     */
-
-    Tcl_SetVar(interp, "tcl_rcRsrcName", "tclshrc", TCL_GLOBAL_ONLY);
-
-    /* Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY); */
-
-    /*
-     * We have to support at least the quit Apple Event. 
-     */
-    
-    TkMacInitAppleEvents(interp);
-    
-    /* 
-     * Open a file channel to put stderr, stdin, stdout... 
-     */
-    
-    tempChan = Tcl_OpenFileChannel(interp, ":temp.in", "a+", 0);
-    Tcl_SetStdChannel(tempChan,TCL_STDIN);
-    Tcl_RegisterChannel(interp, tempChan);
-    Tcl_SetChannelOption(NULL, tempChan, "-translation", "cr");
-    Tcl_SetChannelOption(NULL, tempChan, "-buffering", "line");
-
-    tempChan = Tcl_OpenFileChannel(interp, ":temp.out", "a+", 0);
-    Tcl_SetStdChannel(tempChan,TCL_STDOUT);
-    Tcl_RegisterChannel(interp, tempChan);
-    Tcl_SetChannelOption(NULL, tempChan, "-translation", "cr");
-    Tcl_SetChannelOption(NULL, tempChan, "-buffering", "line");
-
-    tempChan = Tcl_OpenFileChannel(interp, ":temp.err", "a+", 0);
-    Tcl_SetStdChannel(tempChan,TCL_STDERR);
-    Tcl_RegisterChannel(interp, tempChan);
-    Tcl_SetChannelOption(NULL, tempChan, "-translation", "cr");
-    Tcl_SetChannelOption(NULL, tempChan, "-buffering", "none");
-   
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MacintoshInit --
- *
- *	This procedure calls initalization routines to set up a simple
- *	console on a Macintosh.  This is necessary as the Mac doesn't
- *	have a stdout & stderr by default.
- *
- * Results:
- *	Returns TCL_OK if everything went fine.  If it didn't the 
- *	application should probably fail.
- *
- * Side effects:
- *	Inits the appropiate console package.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-MacintoshInit()
-{
-    THz theZone = GetZone();
-    SysEnvRec   sys;
-
-    
-    /*
-     * There is a bug in systems earlier that 7.5.5, where a second BOA will
-     * get a corrupted heap.  This is the fix from TechNote 1070
-     */
-     
-    SysEnvirons(1, &sys);
-
-    if (sys.systemVersion < 0x0755)
-    {
-        if ( LMGetHeapEnd() != theZone->bkLim) {
-            LMSetHeapEnd(theZone->bkLim);
-        }
-    }
-    
-#if GENERATING68K && !GENERATINGCFM
-    SetApplLimit(GetApplLimit() - (TCL_MAC_68K_STACK_GROWTH));
-#endif
-    MaxApplZone();
-
-    InitGraf((Ptr)&qd.thePort);
-    		    
-    /* No problems with initialization */
-    Tcl_MacSetEventProc(HandleHighLevelEvents);
-
-    return TCL_OK;
-}
-
-int
-HandleHighLevelEvents(
-    EventRecord *eventPtr)
-{
-    int eventFound = false;
-    
-    if (eventPtr->what == kHighLevelEvent) {
-	AEProcessAppleEvent(eventPtr);
-        eventFound = true;
-    } else if (eventPtr->what == nullEvent) {
-        eventFound = true;
-    }
-    return eventFound;    
-}
diff --git a/mac/tclMacBOAMain.c b/mac/tclMacBOAMain.c
deleted file mode 100644
index d863e9c..0000000
--- a/mac/tclMacBOAMain.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/* 
- * tclMacBGMain.c --
- *
- *	Main program for Macintosh Background Only Application shells.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacBOAMain.c,v 1.3 1999/04/16 00:47:19 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include <Resources.h>
-#include <Notification.h>
-#include <Strings.h>
-
-/*
- * This variable is used to get out of the modal loop of the
- * notification manager.
- */
-
-int NotificationIsDone = 0;
-
-/*
- * The following code ensures that tclLink.c is linked whenever
- * Tcl is linked.  Without this code there's no reference to the
- * code in that file from anywhere in Tcl, so it may not be
- * linked into the application.
- */
-
-EXTERN int Tcl_LinkVar();
-int (*tclDummyLinkVarPtr)() = Tcl_LinkVar;
-
-/*
- * Declarations for various library procedures and variables (don't want
- * to include tclPort.h here, because people might copy this file out of
- * the Tcl source directory to make their own modified versions).
- * Note:  "exit" should really be declared here, but there's no way to
- * declare it without causing conflicts with other definitions elsewher
- * on some systems, so it's better just to leave it out.
- */
-
-extern int		isatty _ANSI_ARGS_((int fd));
-extern char *		strcpy _ANSI_ARGS_((char *dst, CONST char *src));
-
-static Tcl_Interp *interp;	/* Interpreter for application. */
-
-#ifdef TCL_MEM_DEBUG
-static char dumpFile[100];	/* Records where to dump memory allocation
-				 * information. */
-static int quitFlag = 0;	/* 1 means "checkmem" command was called,
-				 * so the application should quit and dump
-				 * memory allocation information. */
-#endif
-
-/*
- * Forward references for procedures defined later in this file:
- */
-
-#ifdef TCL_MEM_DEBUG
-static int		CheckmemCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char *argv[]));
-#endif
-void TclMacDoNotification(char *mssg);
-void TclMacNotificationResponse(NMRecPtr nmRec); 
-int Tcl_MacBGNotifyObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Main --
- *
- *	Main program for tclsh and most other Tcl-based applications.
- *
- * Results:
- *	None. This procedure never returns (it exits the process when
- *	it's done.
- *
- * Side effects:
- *	This procedure initializes the Tk world and then starts
- *	interpreting commands;  almost anything could happen, depending
- *	on the script being interpreted.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Main(argc, argv, appInitProc)
-    int argc;			/* Number of arguments. */
-    char **argv;		/* Array of argument strings. */
-    Tcl_AppInitProc *appInitProc;
-				/* Application-specific initialization
-				 * procedure to call after most
-				 * initialization but before starting to
-				 * execute commands. */
-{
-    Tcl_Obj *prompt1NamePtr = NULL;
-    Tcl_Obj *prompt2NamePtr = NULL;
-    Tcl_Obj *commandPtr = NULL;
-    char buffer[1000], *args, *fileName;
-    int code, tty;
-    int exitCode = 0;
-
-    Tcl_FindExecutable(argv[0]);
-    interp = Tcl_CreateInterp();
-#ifdef TCL_MEM_DEBUG
-    Tcl_InitMemory(interp);
-    Tcl_CreateCommand(interp, "checkmem", CheckmemCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-#endif
-
-    /*
-     * Make command-line arguments available in the Tcl variables "argc"
-     * and "argv".  If the first argument doesn't start with a "-" then
-     * strip it off and use it as the name of a script file to process.
-     */
-
-    fileName = NULL;
-    if ((argc > 1) && (argv[1][0] != '-')) {
-	fileName = argv[1];
-	argc--;
-	argv++;
-    }
-    args = Tcl_Merge(argc-1, argv+1);
-    Tcl_SetVar(interp, "argv", args, TCL_GLOBAL_ONLY);
-    ckfree(args);
-    TclFormatInt(buffer, argc-1);
-    Tcl_SetVar(interp, "argc", buffer, TCL_GLOBAL_ONLY);
-    Tcl_SetVar(interp, "argv0", (fileName != NULL) ? fileName : argv[0],
-	    TCL_GLOBAL_ONLY);
-
-    /*
-     * Set the "tcl_interactive" variable.
-     */
-
-    tty = isatty(0);
-    Tcl_SetVar(interp, "tcl_interactive",
-	    ((fileName == NULL) && tty) ? "1" : "0", TCL_GLOBAL_ONLY);
-    
-    /*
-     * Invoke application-specific initialization.
-     */
-
-    if ((*appInitProc)(interp) != TCL_OK) {
-	Tcl_DString errStr;
-
-	Tcl_DStringInit(&errStr);
-	Tcl_DStringAppend(&errStr,
-		"application-specific initialization failed: \n", -1);
-	Tcl_DStringAppend(&errStr, Tcl_GetStringResult(interp), -1);
-	Tcl_DStringAppend(&errStr, "\n", 1);
-	TclMacDoNotification(Tcl_DStringValue(&errStr));
-	Tcl_DStringFree(&errStr);
-	goto done;
-    }
-
-    /*
-     * Install the BGNotify command:
-     */
-    
-    if ( Tcl_CreateObjCommand(interp, "bgnotify", Tcl_MacBGNotifyObjCmd, NULL,
-             (Tcl_CmdDeleteProc *) NULL) == NULL) {
-        goto done;
-    }
-    
-    /*
-     * If a script file was specified then just source that file
-     * and quit.  In this Mac BG Application version, we will try the
-     * resource fork first, then the file system second...
-     */
-
-    if (fileName != NULL) {
-        Str255 resName;
-        Handle resource;
-        
-        strcpy((char *) resName + 1, fileName);
-        resName[0] = strlen(fileName);
-        resource = GetNamedResource('TEXT',resName);
-        if (resource != NULL) {
-            code = Tcl_MacEvalResource(interp, fileName, -1, NULL);
-        } else {
-            code = Tcl_EvalFile(interp, fileName);
-        }
-        
-	if (code != TCL_OK) {
-            Tcl_DString errStr;
-            
-            Tcl_DStringInit(&errStr);
-            Tcl_DStringAppend(&errStr, " Error sourcing resource or file: ", -1);
-            Tcl_DStringAppend(&errStr, fileName, -1);
-            Tcl_DStringAppend(&errStr, "\n\nError was: ", -1);
-            Tcl_DStringAppend(&errStr, Tcl_GetStringResult(interp), -1);
-            TclMacDoNotification(Tcl_DStringValue(&errStr));
-	    Tcl_DStringFree(&errStr);
-        }
-	goto done;
-    }
-
-
-    /*
-     * Rather than calling exit, invoke the "exit" command so that
-     * users can replace "exit" with some other command to do additional
-     * cleanup on exit.  The Tcl_Eval call should never return.
-     */
-
-    done:
-    if (commandPtr != NULL) {
-	Tcl_DecrRefCount(commandPtr);
-    }
-    if (prompt1NamePtr != NULL) {
-	Tcl_DecrRefCount(prompt1NamePtr);
-    }
-    if (prompt2NamePtr != NULL) {
-	Tcl_DecrRefCount(prompt2NamePtr);
-    }
-    sprintf(buffer, "exit %d", exitCode);
-    Tcl_Eval(interp, buffer);
-}
-
-/*----------------------------------------------------------------------
- *
- * TclMacDoNotification --
- *
- *	This posts an error message using the Notification manager.
- *
- * Results:
- *	Post a Notification Manager dialog.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-void 
-TclMacDoNotification(mssg)
-    char *mssg;
-{
-    NMRec errorNot;
-    EventRecord *theEvent = NULL;
-    OSErr err;
-    char *ptr;
-    
-    errorNot.qType = nmType;
-    errorNot.nmMark = 0;
-    errorNot.nmIcon = 0;
-    errorNot.nmSound = (Handle) -1;
-
-    for ( ptr = mssg; *ptr != '\0'; ptr++) {
-        if (*ptr == '\n') {
-            *ptr = '\r';
-        }
-    }
-        
-    c2pstr(mssg);
-    errorNot.nmStr = (StringPtr) mssg;
-
-    errorNot.nmResp = NewNMProc(TclMacNotificationResponse);
-    errorNot.nmRefCon = SetCurrentA5();
-    
-    NotificationIsDone = 0;
-    
-    /*
-     * Cycle while waiting for the user to click on the
-     * notification box.  Don't take any events off the event queue,
-     * since we want Tcl to do this but we want to block till the notification
-     * has been handled...
-     */
-    
-    err = NMInstall(&errorNot);
-    if (err == noErr) { 
-        while (!NotificationIsDone) {
-            WaitNextEvent(0, theEvent, 20, NULL);
-        }
-        NMRemove(&errorNot);
-    }
-    	
-    p2cstr((unsigned char *) mssg);
-}
-
-void 
-TclMacNotificationResponse(nmRec) 
-    NMRecPtr nmRec;
-{
-    int curA5;
-    
-    curA5 = SetCurrentA5();
-    SetA5(nmRec->nmRefCon);
-    
-    NotificationIsDone = 1;
-    
-    SetA5(curA5);
-    
-}
-
-int 
-Tcl_MacBGNotifyObjCmd(clientData, interp, objc, objv)
-    ClientData clientData;
-    Tcl_Interp *interp;
-    int objc;
-    Tcl_Obj **objv;	
-{
-    Tcl_Obj *resultPtr;
-    
-    resultPtr = Tcl_GetObjResult(interp);
-    
-    if ( objc != 2 ) {
-        Tcl_WrongNumArgs(interp, 1, objv, "message");
-        return TCL_ERROR;
-    }
-    
-    TclMacDoNotification(Tcl_GetString(objv[1]));
-    return TCL_OK;
-           
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * CheckmemCmd --
- *
- *	This is the command procedure for the "checkmem" command, which
- *	causes the application to exit after printing information about
- *	memory usage to the file passed to this command as its first
- *	argument.
- *
- * Results:
- *	Returns a standard Tcl completion code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-#ifdef TCL_MEM_DEBUG
-
-	/* ARGSUSED */
-static int
-CheckmemCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Interpreter for evaluation. */
-    int argc;				/* Number of arguments. */
-    char *argv[];			/* String values of arguments. */
-{
-    extern char *tclMemDumpFileName;
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" fileName\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    strcpy(dumpFile, argv[1]);
-    tclMemDumpFileName = dumpFile;
-    quitFlag = 1;
-    return TCL_OK;
-}
-#endif
diff --git a/mac/tclMacChan.c b/mac/tclMacChan.c
deleted file mode 100644
index 2fbac8f..0000000
--- a/mac/tclMacChan.c
+++ /dev/null
@@ -1,1394 +0,0 @@
-/* 
- * tclMacChan.c
- *
- *	Channel drivers for Macintosh channels for the
- *	console fds.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacChan.c,v 1.6 1999/04/16 00:47:19 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMacInt.h"
-#include <Aliases.h>
-#include <Errors.h>
-#include <Files.h>
-#include <Gestalt.h>
-#include <Processes.h>
-#include <Strings.h>
-#include <FSpCompat.h>
-#include <MoreFiles.h>
-#include <MoreFilesExtras.h>
-
-
-/*
- * The following are flags returned by GetOpenMode.  They
- * are or'd together to determine how opening and handling
- * a file should occur.
- */
-
-#define TCL_RDONLY		(1<<0)
-#define TCL_WRONLY		(1<<1)
-#define TCL_RDWR		(1<<2)
-#define TCL_CREAT		(1<<3)
-#define TCL_TRUNC		(1<<4)
-#define TCL_APPEND		(1<<5)
-#define TCL_ALWAYS_APPEND	(1<<6)
-#define TCL_EXCL		(1<<7)
-#define TCL_NOCTTY		(1<<8)
-#define TCL_NONBLOCK		(1<<9)
-#define TCL_RW_MODES 		(TCL_RDONLY|TCL_WRONLY|TCL_RDWR)
-
-/*
- * This structure describes per-instance state of a 
- * macintosh file based channel.
- */
-
-typedef struct FileState {
-    short fileRef;		/* Macintosh file reference number. */
-    Tcl_Channel fileChan;	/* Pointer to the channel for this file. */
-    int watchMask;		/* OR'ed set of flags indicating which events
-    				 * are being watched. */
-    int appendMode;		/* Flag to tell if in O_APPEND mode or not. */
-    int volumeRef;		/* Flag to tell if in O_APPEND mode or not. */
-    int pending;		/* 1 if message is pending on queue. */
-    struct FileState *nextPtr;	/* Pointer to next registered file. */
-} FileState;
-
-typedef struct ThreadSpecificData {
-    int initialized;		/* True after the thread initializes */
-    FileState *firstFilePtr;	/* the head of the list of files managed
-				 * that are being watched for file events. */
-    Tcl_Channel stdinChannel;
-    Tcl_Channel stdoutChannel;	/* Note - these seem unused */
-    Tcl_Channel stderrChannel;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * file events are generated.
- */
-
-typedef struct FileEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    FileState *infoPtr;		/* Pointer to file info structure.  Note
-				 * that we still have to verify that the
-				 * file exists before dereferencing this
-				 * pointer. */
-} FileEvent;
-
-
-/*
- * Static routines for this file:
- */
-
-static int		CommonGetHandle _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static void		CommonWatch _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-static int		FileBlockMode _ANSI_ARGS_((ClientData instanceData,
-			    int mode));
-static void		FileChannelExitHandler _ANSI_ARGS_((
-		            ClientData clientData));
-static void		FileCheckProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static int		FileClose _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static int		FileEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-			    int flags));
-static ThreadSpecificData *FileInit _ANSI_ARGS_((void));
-static int		FileInput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toRead, int *errorCode));
-static int		FileOutput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toWrite, int *errorCode));
-static int		FileSeek _ANSI_ARGS_((ClientData instanceData,
-			    long offset, int mode, int *errorCode));
-static void		FileSetupProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static int		GetOpenMode _ANSI_ARGS_((Tcl_Interp *interp,
-        		    CONST char *string));
-static Tcl_Channel	OpenFileChannel _ANSI_ARGS_((CONST char *fileName, 
-			    int mode, int permissions, int *errorCodePtr));
-static int		StdIOBlockMode _ANSI_ARGS_((ClientData instanceData,
-			    int mode));
-static int		StdIOClose _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static int		StdIOInput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toRead, int *errorCode));
-static int		StdIOOutput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toWrite, int *errorCode));
-static int		StdIOSeek _ANSI_ARGS_((ClientData instanceData,
-			    long offset, int mode, int *errorCode));
-static int		StdReady _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-
-/*
- * This structure describes the channel type structure for file based IO:
- */
-
-static Tcl_ChannelType consoleChannelType = {
-    "file",			/* Type name. */
-    StdIOBlockMode,		/* Set blocking/nonblocking mode.*/
-    StdIOClose,			/* Close proc. */
-    StdIOInput,			/* Input proc. */
-    StdIOOutput,		/* Output proc. */
-    StdIOSeek,			/* Seek proc. */
-    NULL,			/* Set option proc. */
-    NULL,			/* Get option proc. */
-    CommonWatch,		/* Initialize notifier. */
-    CommonGetHandle		/* Get OS handles out of channel. */
-};
-
-/*
- * This variable describes the channel type structure for file based IO.
- */
-
-static Tcl_ChannelType fileChannelType = {
-    "file",			/* Type name. */
-    FileBlockMode,		/* Set blocking or
-                                 * non-blocking mode.*/
-    FileClose,			/* Close proc. */
-    FileInput,			/* Input proc. */
-    FileOutput,			/* Output proc. */
-    FileSeek,			/* Seek proc. */
-    NULL,			/* Set option proc. */
-    NULL,			/* Get option proc. */
-    CommonWatch,		/* Initialize notifier. */
-    CommonGetHandle		/* Get OS handles out of channel. */
-};
-
-
-/*
- * Hack to allow Mac Tk to override the TclGetStdChannels function.
- */
- 
-typedef void (*TclGetStdChannelsProc) _ANSI_ARGS_((Tcl_Channel *stdinPtr,
-	Tcl_Channel *stdoutPtr, Tcl_Channel *stderrPtr));
-	
-TclGetStdChannelsProc getStdChannelsProc = NULL;
-
-
-/*
- *----------------------------------------------------------------------
- *
- * FileInit --
- *
- *	This function initializes the file channel event source.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new event source.
- *
- *----------------------------------------------------------------------
- */
-
-static ThreadSpecificData *
-FileInit()
-{
-    ThreadSpecificData *tsdPtr =
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->firstFilePtr = NULL;
-	Tcl_CreateEventSource(FileSetupProc, FileCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(FileChannelExitHandler, NULL);
-    }
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileChannelExitHandler --
- *
- *	This function is called to cleanup the channel driver before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Destroys the communication window.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileChannelExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_DeleteEventSource(FileSetupProc, FileCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-FileSetupProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    FileState *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Check to see if there is a ready file.  If so, poll.
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask) {
-	    Tcl_SetMaxBlockTime(&blockTime);
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the file
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileCheckProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    FileEvent *evPtr;
-    FileState *infoPtr;
-    int sentMsg = 0;
-    Tcl_Time blockTime = { 0, 0 };
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready files that don't already have events
-     * queued (caused by persistent states that won't generate WinSock
-     * events).
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask && !infoPtr->pending) {
-	    infoPtr->pending = 1;
-	    evPtr = (FileEvent *) ckalloc(sizeof(FileEvent));
-	    evPtr->header.proc = FileEventProc;
-	    evPtr->infoPtr = infoPtr;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*----------------------------------------------------------------------
- *
- * FileEventProc --
- *
- *	This function is invoked by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure invokes
- *	Tcl_NotifyChannel on the file.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the notifier callback does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileEventProc(
-    Tcl_Event *evPtr,		/* Event to service. */
-    int flags)			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    FileEvent *fileEvPtr = (FileEvent *)evPtr;
-    FileState *infoPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the list of watched files for the one whose handle
-     * matches the event.  We do this rather than simply dereferencing
-     * the handle in the event so that files can be deleted while the
-     * event is in the queue.
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (fileEvPtr->infoPtr == infoPtr) {
-	    infoPtr->pending = 0;
-	    Tcl_NotifyChannel(infoPtr->fileChan, infoPtr->watchMask);
-	    break;
-	}
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StdIOBlockMode --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StdIOBlockMode(
-    ClientData instanceData,		/* Unused. */
-    int mode)				/* The mode to set. */
-{
-    /*
-     * Do not allow putting stdin, stdout or stderr into nonblocking mode.
-     */
-    
-    if (mode == TCL_MODE_NONBLOCKING) {
-	return EFAULT;
-    }
-    
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StdIOClose --
- *
- *	Closes the IO channel.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the physical channel
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StdIOClose(
-    ClientData instanceData,	/* Unused. */
-    Tcl_Interp *interp)		/* Unused. */
-{
-    int fd, errorCode = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Invalidate the stdio cache if necessary.  Note that we assume that
-     * the stdio file and channel pointers will become invalid at the same
-     * time.
-     * Do not close standard channels while in thread-exit.
-     */
-
-    fd = (int) ((FileState*)instanceData)->fileRef;
-    if (!TclInExit()) {
-	if (fd == 0) {
-	    tsdPtr->stdinChannel = NULL;
-	} else if (fd == 1) {
-	    tsdPtr->stdoutChannel = NULL;
-	} else if (fd == 2) {
-	    tsdPtr->stderrChannel = NULL;
-	} else {
-	    panic("recieved invalid std file");
-	}
-    
-	if (close(fd) < 0) {
-	    errorCode = errno;
-	}
-    }
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CommonGetHandle --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from inside
- *	a file based channel.
- *
- * Results:
- *	The appropriate handle or NULL if not present. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CommonGetHandle(
-    ClientData instanceData,		/* The file state. */
-    int direction,			/* Which handle to retrieve? */
-    ClientData *handlePtr)
-{
-    if ((direction == TCL_READABLE) || (direction == TCL_WRITABLE)) {
-	*handlePtr = (ClientData) ((FileState*)instanceData)->fileRef;
-	return TCL_OK;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StdIOInput --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-StdIOInput(
-    ClientData instanceData,		/* Unused. */
-    char *buf,				/* Where to store data read. */
-    int bufSize,			/* How much space is available
-                                         * in the buffer? */
-    int *errorCode)			/* Where to store error code. */
-{
-    int fd;
-    int bytesRead;			/* How many bytes were read? */
-
-    *errorCode = 0;
-    errno = 0;
-    fd = (int) ((FileState*)instanceData)->fileRef;
-    bytesRead = read(fd, buf, (size_t) bufSize);
-    if (bytesRead > -1) {
-        return bytesRead;
-    }
-    *errorCode = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StdIOOutput--
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StdIOOutput(
-    ClientData instanceData,		/* Unused. */
-    char *buf,				/* The data buffer. */
-    int toWrite,			/* How many bytes to write? */
-    int *errorCode)			/* Where to store error code. */
-{
-    int written;
-    int fd;
-
-    *errorCode = 0;
-    errno = 0;
-    fd = (int) ((FileState*)instanceData)->fileRef;
-    written = write(fd, buf, (size_t) toWrite);
-    if (written > -1) {
-        return written;
-    }
-    *errorCode = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StdIOSeek --
- *
- *	Seeks on an IO channel. Returns the new position.
- *
- * Results:
- *	-1 if failed, the new position if successful. If failed, it
- *	also sets *errorCodePtr to the error code.
- *
- * Side effects:
- *	Moves the location at which the channel will be accessed in
- *	future operations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-StdIOSeek(
-    ClientData instanceData,			/* Unused. */
-    long offset,				/* Offset to seek to. */
-    int mode,					/* Relative to where
-                                                 * should we seek? */
-    int *errorCodePtr)				/* To store error code. */
-{
-    int newLoc;
-    int fd;
-
-    *errorCodePtr = 0;
-    fd = (int) ((FileState*)instanceData)->fileRef;
-    newLoc = lseek(fd, offset, mode);
-    if (newLoc > -1) {
-        return newLoc;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PidObjCmd --
- *
- *      This procedure is invoked to process the "pid" Tcl command.
- *      See the user documentation for details on what it does.
- *
- * Results:
- *      A standard Tcl result.
- *
- * Side effects:
- *      See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-        /* ARGSUSED */
-int
-Tcl_PidObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;           /* Not used. */
-    Tcl_Interp *interp;         /* Current interpreter. */
-    int objc;                   /* Number of arguments. */
-    Tcl_Obj *CONST *objv;       /* Argument strings. */
-{
-    ProcessSerialNumber psn;
-    char buf[20]; 
-    Tcl_Channel chan;
-    Tcl_Obj *resultPtr;
-
-    if (objc > 2) {
-        Tcl_WrongNumArgs(interp, 1, objv, "?channelId?");
-        return TCL_ERROR;
-    }
-    if (objc == 1) {
-        resultPtr = Tcl_GetObjResult(interp);
-	GetCurrentProcess(&psn);
-	sprintf(buf, "0x%08x%08x", psn.highLongOfPSN, psn.lowLongOfPSN);
-        Tcl_SetStringObj(resultPtr, buf, -1);
-    } else {
-        chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]),
-                NULL);
-        if (chan == (Tcl_Channel) NULL) {
-            return TCL_ERROR;
-        } 
-	/*
-	 * We can't create pipelines on the Mac so
-	 * this will always return an empty list.
-	 */
-    }
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDefaultStdChannel --
- *
- *	Constructs a channel for the specified standard OS handle.
- *
- * Results:
- *	Returns the specified default standard channel, or NULL.
- *
- * Side effects:
- *	May cause the creation of a standard channel and the underlying
- *	file.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpGetDefaultStdChannel(
-    int type)			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR. */
-{
-    Tcl_Channel channel = NULL;
-    int fd = 0;			/* Initializations needed to prevent */
-    int mode = 0;		/* compiler warning (used before set). */
-    char *bufMode = NULL;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    int channelPermissions;
-    FileState *fileState;
-
-    /*
-     * If the channels were not created yet, create them now and
-     * store them in the static variables.
-     */
-
-    switch (type) {
-	case TCL_STDIN:
-	    fd = 0;
-	    channelPermissions = TCL_READABLE;
-	    bufMode = "line";
-	    break;
-	case TCL_STDOUT:
-	    fd = 1;
-	    channelPermissions = TCL_WRITABLE;
-	    bufMode = "line";
-	    break;
-	case TCL_STDERR:
-	    fd = 2;
-	    channelPermissions = TCL_WRITABLE;
-	    bufMode = "none";
-	    break;
-	default:
-	    panic("TclGetDefaultStdChannel: Unexpected channel type");
-	    break;
-    }
-
-    sprintf(channelName, "console%d", (int) fd);
-    fileState = (FileState *) ckalloc((unsigned) sizeof(FileState));
-    channel = Tcl_CreateChannel(&consoleChannelType, channelName,
-	    (ClientData) fileState, channelPermissions);
-    fileState->fileChan = channel;
-    fileState->fileRef = fd;
-
-    /*
-     * Set up the normal channel options for stdio handles.
-     */
-
-    Tcl_SetChannelOption(NULL, channel, "-translation", "cr");
-    Tcl_SetChannelOption(NULL, channel, "-buffering", bufMode);
-    
-    return channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpOpenFileChannel --
- *
- *	Open an File based channel on Unix systems.
- *
- * Results:
- *	The new channel or NULL. If NULL, the output argument
- *	errorCodePtr is set to a POSIX error.
- *
- * Side effects:
- *	May open the channel and may cause creation of a file on the
- *	file system.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpOpenFileChannel(
-    Tcl_Interp *interp,			/* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName,			/* Name of file to open. */
-    char *modeString,			/* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions)			/* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    Tcl_Channel chan;
-    int mode;
-    char *native;
-    Tcl_DString ds, buffer;
-    int errorCode;
-    
-    mode = GetOpenMode(interp, modeString);
-    if (mode == -1) {
-	return NULL;
-    }
-
-    if (Tcl_TranslateFileName(interp, fileName, &buffer) == NULL) {
-	return NULL;
-    }
-    native = Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&buffer), 
-    	    Tcl_DStringLength(&buffer), &ds);
-    chan = OpenFileChannel(native, mode, permissions, &errorCode);
-    Tcl_DStringFree(&ds);
-    Tcl_DStringFree(&buffer);
-
-    if (chan == NULL) {
-	Tcl_SetErrno(errorCode);
-	if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "couldn't open \"", fileName, "\": ",
-                    Tcl_PosixError(interp), (char *) NULL);
-        }
-	return NULL;
-    }
-    
-    return chan;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OpenFileChannel--
- *
- *	Opens a Macintosh file and creates a Tcl channel to control it.
- *
- * Results:
- *	A Tcl channel.
- *
- * Side effects:
- *	Will open a Macintosh file.
- *
- *----------------------------------------------------------------------
- */
-
-static Tcl_Channel
-OpenFileChannel(
-    CONST char *fileName,		/* Name of file to open (native). */
-    int mode,				/* Mode for opening file. */
-    int permissions,			/* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-    int *errorCodePtr)			/* Where to store error code. */
-{
-    int channelPermissions;
-    Tcl_Channel chan;
-    char macPermision;
-    FSSpec fileSpec;
-    OSErr err;
-    short fileRef;
-    FileState *fileState;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    
-    /*
-     * Note we use fsRdWrShPerm instead of fsRdWrPerm which allows shared
-     * writes on a file.  This isn't common on a mac but is common with 
-     * Windows and UNIX and the feature is used by Tcl.
-     */
-
-    switch (mode & (TCL_RDONLY | TCL_WRONLY | TCL_RDWR)) {
-	case TCL_RDWR:
-	    channelPermissions = (TCL_READABLE | TCL_WRITABLE);
-	    macPermision = fsRdWrShPerm;
-	    break;
-	case TCL_WRONLY:
-	    /*
-	     * Mac's fsRdPerm permission actually defaults to fsRdWrPerm because
-	     * the Mac OS doesn't realy support write only access.  We explicitly
-	     * set the permission fsRdWrShPerm so that we can have shared write
-	     * access.
-	     */
-	    channelPermissions = TCL_WRITABLE;
-	    macPermision = fsRdWrShPerm;
-	    break;
-	case TCL_RDONLY:
-	default:
-	    channelPermissions = TCL_READABLE;
-	    macPermision = fsRdPerm;
-	    break;
-    }
-     
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    if ((err != noErr) && (err != fnfErr)) {
-	*errorCodePtr = errno = TclMacOSErrorToPosixError(err);
-	Tcl_SetErrno(errno);
-	return NULL;
-    }
-
-    if ((err == fnfErr) && (mode & TCL_CREAT)) {
-	err = HCreate(fileSpec.vRefNum, fileSpec.parID, fileSpec.name, 'MPW ', 'TEXT');
-	if (err != noErr) {
-	    *errorCodePtr = errno = TclMacOSErrorToPosixError(err);
-	    Tcl_SetErrno(errno);
-	    return NULL;
-	}
-    } else if ((mode & TCL_CREAT) && (mode & TCL_EXCL)) {
-        *errorCodePtr = errno = EEXIST;
-	Tcl_SetErrno(errno);
-        return NULL;
-    }
-
-    err = HOpenDF(fileSpec.vRefNum, fileSpec.parID, fileSpec.name, macPermision, &fileRef);
-    if (err != noErr) {
-	*errorCodePtr = errno = TclMacOSErrorToPosixError(err);
-	Tcl_SetErrno(errno);
-	return NULL;
-    }
-
-    if (mode & TCL_TRUNC) {
-	SetEOF(fileRef, 0);
-    }
-    
-    sprintf(channelName, "file%d", (int) fileRef);
-    fileState = (FileState *) ckalloc((unsigned) sizeof(FileState));
-    chan = Tcl_CreateChannel(&fileChannelType, channelName, 
-	(ClientData) fileState, channelPermissions);
-    if (chan == (Tcl_Channel) NULL) {
-	*errorCodePtr = errno = EFAULT;
-	Tcl_SetErrno(errno);
-	FSClose(fileRef);
-	ckfree((char *) fileState);
-        return NULL;
-    }
-
-    fileState->fileChan = chan;
-    fileState->volumeRef = fileSpec.vRefNum;
-    fileState->fileRef = fileRef;
-    fileState->pending = 0;
-    fileState->watchMask = 0;
-    if (mode & TCL_ALWAYS_APPEND) {
-	fileState->appendMode = true;
-    } else {
-	fileState->appendMode = false;
-    }
-        
-    if ((mode & TCL_ALWAYS_APPEND) || (mode & TCL_APPEND)) {
-        if (Tcl_Seek(chan, 0, SEEK_END) < 0) {
-	    *errorCodePtr = errno = EFAULT;
-	    Tcl_SetErrno(errno);
-            Tcl_Close(NULL, chan);
-            FSClose(fileRef);
-            ckfree((char *) fileState);
-            return NULL;
-        }
-    }
-    
-    return chan;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeFileChannel --
- *
- *	Makes a Tcl_Channel from an existing OS level file handle.
- *
- * Results:
- *	The Tcl_Channel created around the preexisting OS level file handle.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeFileChannel(handle, mode)
-    ClientData handle;		/* OS level handle. */
-    int mode;			/* ORed combination of TCL_READABLE and
-                                 * TCL_WRITABLE to indicate file mode. */
-{
-    /*
-     * Not implemented yet.
-     */
-
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileBlockMode --
- *
- *	Set blocking or non-blocking mode on channel.  Macintosh files
- *	can never really be set to blocking or non-blocking modes.
- *	However, we don't generate an error - we just return success.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileBlockMode(
-    ClientData instanceData,		/* Unused. */
-    int mode)				/* The mode to set. */
-{
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileClose --
- *
- *	Closes the IO channel.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the physical channel
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileClose(
-    ClientData instanceData,	/* Unused. */
-    Tcl_Interp *interp)		/* Unused. */
-{
-    FileState *fileState = (FileState *) instanceData;
-    int errorCode = 0;
-    OSErr err;
-
-    err = FSClose(fileState->fileRef);
-    FlushVol(NULL, fileState->volumeRef);
-    if (err != noErr) {
-	errorCode = errno = TclMacOSErrorToPosixError(err);
-	panic("error during file close");
-    }
-
-    ckfree((char *) fileState);
-    Tcl_SetErrno(errorCode);
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileInput --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-FileInput(
-    ClientData instanceData,	/* Unused. */
-    char *buffer,				/* Where to store data read. */
-    int bufSize,				/* How much space is available
-                                 * in the buffer? */
-    int *errorCodePtr)			/* Where to store error code. */
-{
-    FileState *fileState = (FileState *) instanceData;
-    OSErr err;
-    long length = bufSize;
-
-    *errorCodePtr = 0;
-    errno = 0;
-    err = FSRead(fileState->fileRef, &length, buffer);
-    if ((err == noErr) || (err == eofErr)) {
-	return length;
-    } else {
-	switch (err) {
-	    case ioErr:
-		*errorCodePtr = errno = EIO;
-	    case afpAccessDenied:
-		*errorCodePtr = errno = EACCES;
-	    default:
-		*errorCodePtr = errno = EINVAL;
-	}
-        return -1;	
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileOutput--
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileOutput(
-    ClientData instanceData,		/* Unused. */
-    char *buffer,			/* The data buffer. */
-    int toWrite,			/* How many bytes to write? */
-    int *errorCodePtr)			/* Where to store error code. */
-{
-    FileState *fileState = (FileState *) instanceData;
-    long length = toWrite;
-    OSErr err;
-
-    *errorCodePtr = 0;
-    errno = 0;
-    
-    if (fileState->appendMode == true) {
-	FileSeek(instanceData, 0, SEEK_END, errorCodePtr);
-	*errorCodePtr = 0;
-    }
-    
-    err = FSWrite(fileState->fileRef, &length, buffer);
-    if (err == noErr) {
-	err = FlushFile(fileState->fileRef);
-    } else {
-	*errorCodePtr = errno = TclMacOSErrorToPosixError(err);
-	return -1;
-    }
-    return length;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileSeek --
- *
- *	Seeks on an IO channel. Returns the new position.
- *
- * Results:
- *	-1 if failed, the new position if successful. If failed, it
- *	also sets *errorCodePtr to the error code.
- *
- * Side effects:
- *	Moves the location at which the channel will be accessed in
- *	future operations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileSeek(
-    ClientData instanceData,	/* Unused. */
-    long offset,				/* Offset to seek to. */
-    int mode,					/* Relative to where
-                                 * should we seek? */
-    int *errorCodePtr)			/* To store error code. */
-{
-    FileState *fileState = (FileState *) instanceData;
-    IOParam pb;
-    OSErr err;
-
-    *errorCodePtr = 0;
-    pb.ioCompletion = NULL;
-    pb.ioRefNum = fileState->fileRef;
-    if (mode == SEEK_SET) {
-	pb.ioPosMode = fsFromStart;
-    } else if (mode == SEEK_END) {
-	pb.ioPosMode = fsFromLEOF;
-    } else if (mode == SEEK_CUR) {
-	err = PBGetFPosSync((ParmBlkPtr) &pb);
-	if (pb.ioResult == noErr) {
-	    if (offset == 0) {
-		return pb.ioPosOffset;
-	    }
-	    offset += pb.ioPosOffset;
-	}
-	pb.ioPosMode = fsFromStart;
-    }
-    pb.ioPosOffset = offset;
-    err = PBSetFPosSync((ParmBlkPtr) &pb);
-    if (pb.ioResult == noErr){
-	return pb.ioPosOffset;
-    } else if (pb.ioResult == eofErr) {
-	long currentEOF, newEOF;
-	long buffer, i, length;
-	
-	err = PBGetEOFSync((ParmBlkPtr) &pb);
-	currentEOF = (long) pb.ioMisc;
-	if (mode == SEEK_SET) {
-	    newEOF = offset;
-	} else if (mode == SEEK_END) {
-	    newEOF = offset + currentEOF;
-	} else if (mode == SEEK_CUR) {
-	    err = PBGetFPosSync((ParmBlkPtr) &pb);
-	    newEOF = offset + pb.ioPosOffset;
-	}
-	
-	/*
-	 * Write 0's to the new EOF.
-	 */
-	pb.ioPosOffset = 0;
-	pb.ioPosMode = fsFromLEOF;
-	err = PBGetFPosSync((ParmBlkPtr) &pb);
-	length = 1;
-	buffer = 0;
-	for (i = 0; i < (newEOF - currentEOF); i++) {
-	    err = FSWrite(fileState->fileRef, &length, &buffer);
-	}
-	err = PBGetFPosSync((ParmBlkPtr) &pb);
-	if (pb.ioResult == noErr){
-	    return pb.ioPosOffset;
-	}
-    }
-    *errorCodePtr = errno = TclMacOSErrorToPosixError(err);
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CommonWatch --
- *
- *	Initialize the notifier to watch handles from this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CommonWatch(
-    ClientData instanceData,		/* The file state. */
-    int mask)				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    FileState **nextPtrPtr, *ptr;
-    FileState *infoPtr = (FileState *) instanceData;
-    int oldMask = infoPtr->watchMask;
-    ThreadSpecificData *tsdPtr;
-
-    tsdPtr = FileInit();
-
-    infoPtr->watchMask = mask;
-    if (infoPtr->watchMask) {
-	if (!oldMask) {
-	    infoPtr->nextPtr = tsdPtr->firstFilePtr;
-	    tsdPtr->firstFilePtr = infoPtr;
-	}
-    } else {
-	if (oldMask) {
-	    /*
-	     * Remove the file from the list of watched files.
-	     */
-
-	    for (nextPtrPtr = &(tsdPtr->firstFilePtr), ptr = *nextPtrPtr;
-		 ptr != NULL;
-		 nextPtrPtr = &ptr->nextPtr, ptr = *nextPtrPtr) {
-		if (infoPtr == ptr) {
-		    *nextPtrPtr = ptr->nextPtr;
-		    break;
-		}
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetOpenMode --
- *
- * Description:
- *	Computes a POSIX mode mask from a given string and also sets
- *	a flag to indicate whether the caller should seek to EOF during
- *	opening of the file.
- *
- * Results:
- *	On success, returns mode to pass to "open". If an error occurs, the
- *	returns -1 and if interp is not NULL, sets the interp's result to an
- *	error message.
- *
- * Side effects:
- *	Sets the integer referenced by seekFlagPtr to 1 if the caller
- *	should seek to EOF during opening the file.
- *
- * Special note:
- *	This code is based on a prototype implementation contributed
- *	by Mark Diekhans.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetOpenMode(
-    Tcl_Interp *interp,			/* Interpreter to use for error
-					 * reporting - may be NULL. */
-    CONST char *string)			/* Mode string, e.g. "r+" or
-					 * "RDONLY CREAT". */
-{
-    int mode, modeArgc, c, i, gotRW;
-    char **modeArgv, *flag;
-
-    /*
-     * Check for the simpler fopen-like access modes (e.g. "r").  They
-     * are distinguished from the POSIX access modes by the presence
-     * of a lower-case first letter.
-     */
-
-    mode = 0;
-    /*
-     * Guard against international characters before using byte oriented
-     * routines.
-     */
-
-    if (!(string[0] & 0x80)
-	    && islower(UCHAR(string[0]))) { /* INTL: ISO only. */
-	switch (string[0]) {
-	    case 'r':
-		mode = TCL_RDONLY;
-		break;
-	    case 'w':
-		mode = TCL_WRONLY|TCL_CREAT|TCL_TRUNC;
-		break;
-	    case 'a':
-		mode = TCL_WRONLY|TCL_CREAT|TCL_APPEND;
-		break;
-	    default:
-		error:
-                if (interp != (Tcl_Interp *) NULL) {
-                    Tcl_AppendResult(interp,
-                            "illegal access mode \"", string, "\"",
-                            (char *) NULL);
-                }
-		return -1;
-	}
-	if (string[1] == '+') {
-	    mode &= ~(TCL_RDONLY|TCL_WRONLY);
-	    mode |= TCL_RDWR;
-	    if (string[2] != 0) {
-		goto error;
-	    }
-	} else if (string[1] != 0) {
-	    goto error;
-	}
-        return mode;
-    }
-
-    /*
-     * The access modes are specified using a list of POSIX modes
-     * such as TCL_CREAT.
-     */
-
-    if (Tcl_SplitList(interp, string, &modeArgc, &modeArgv) != TCL_OK) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AddErrorInfo(interp,
-                    "\n    while processing open access modes \"");
-            Tcl_AddErrorInfo(interp, string);
-            Tcl_AddErrorInfo(interp, "\"");
-        }
-        return -1;
-    }
-    
-    gotRW = 0;
-    for (i = 0; i < modeArgc; i++) {
-	flag = modeArgv[i];
-	c = flag[0];
-	if ((c == 'R') && (strcmp(flag, "RDONLY") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_RDONLY;
-	    gotRW = 1;
-	} else if ((c == 'W') && (strcmp(flag, "WRONLY") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_WRONLY;
-	    gotRW = 1;
-	} else if ((c == 'R') && (strcmp(flag, "RDWR") == 0)) {
-	    mode = (mode & ~TCL_RW_MODES) | TCL_RDWR;
-	    gotRW = 1;
-	} else if ((c == 'A') && (strcmp(flag, "APPEND") == 0)) {
-	    mode |= TCL_ALWAYS_APPEND;
-	} else if ((c == 'C') && (strcmp(flag, "CREAT") == 0)) {
-	    mode |= TCL_CREAT;
-	} else if ((c == 'E') && (strcmp(flag, "EXCL") == 0)) {
-	    mode |= TCL_EXCL;
-	} else if ((c == 'N') && (strcmp(flag, "NOCTTY") == 0)) {
-	    mode |= TCL_NOCTTY;
-	} else if ((c == 'N') && (strcmp(flag, "NONBLOCK") == 0)) {
-	    mode |= TCL_NONBLOCK;
-	} else if ((c == 'T') && (strcmp(flag, "TRUNC") == 0)) {
-	    mode |= TCL_TRUNC;
-	} else {
-            if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "invalid access mode \"", flag,
-                        "\": must be RDONLY, WRONLY, RDWR, APPEND, CREAT",
-                        " EXCL, NOCTTY, NONBLOCK, or TRUNC", (char *) NULL);
-            }
-	    ckfree((char *) modeArgv);
-	    return -1;
-	}
-    }
-    ckfree((char *) modeArgv);
-    if (!gotRW) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "access mode must include either",
-                    " RDONLY, WRONLY, or RDWR", (char *) NULL);
-        }
-	return -1;
-    }
-    return mode;
-}
diff --git a/mac/tclMacCommonPch.h b/mac/tclMacCommonPch.h
deleted file mode 100755
index b06a494..0000000
--- a/mac/tclMacCommonPch.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * tclMacCommonPch.h --
- *
- * 	Macintosh Tcl must be compiled with certain compiler options to
- *	ensure that it will work correctly. The following pragmas are
- *	used to ensure that those options are set correctly. An error
- * 	will occur at compile time if they are not set correctly.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacCommonPch.h,v 1.2 1998/11/11 07:46:04 jingham Exp $
- */
-
-#if !__option(enumsalwaysint)
-#error Tcl requires the Metrowerks setting "Enums always ints".
-#endif
-
-
-#if !defined(__POWERPC__)
-#if !__option(far_data)
-#error Tcl requires the Metrowerks setting "Far data".
-#endif
-#endif
-
-
-#if !defined(__POWERPC__)
-#if !__option(fourbyteints)
-#error Tcl requires the Metrowerks setting "4 byte ints".
-#endif
-#endif
-
-
-#if !defined(__POWERPC__)
-#if !__option(IEEEdoubles)
-#error Tcl requires the Metrowerks setting "8 byte doubles".
-#endif
-#endif
-
-
-/*
-* The define is used most everywhere to tell Tcl (or any Tcl
-* extensions) that we are compiling for the Macintosh platform.
-*/
-
-
-#define MAC_TCL
-
-
-/*
-* The following defines control the behavior of the Macintosh
-* Universial Headers.
-*/
-
-
-#define SystemSevenOrLater 1
-#define STRICT_CONTROLS 1
-#define STRICT_WINDOWS 1
-
-
-/*
-* Define the following symbol if you want
-* comprehensive debugging turned on.
-*/
-
-
-/* #define TCL_DEBUG */
-
-
-#ifdef TCL_DEBUG
-# define TCL_MEM_DEBUG
-# define TCL_TEST
-#endif
-
-
-
-/*
-* For a while, we will continue to use the old routine names, so that
-* people with older versions of CodeWarrior will still be able to compile
-* the source (albeit they will have to update the project files themselves).
-*
-* At some point, we will convert over to the new routine names.
-*/
-
-
-#define OLDROUTINENAMES 1
diff --git a/mac/tclMacDNR.c b/mac/tclMacDNR.c
deleted file mode 100644
index fa7058b..0000000
--- a/mac/tclMacDNR.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 
- * tclMacDNR.c
- *
- *	This file actually just includes the file "dnr.c" provided by
- *	Apple Computer and redistributed by MetroWerks (and other compiler
- *	vendors.)  Unfortunantly, despite various bug reports, dnr.c uses
- *	C++ style comments and will not compile under the "ANSI Strict"
- *	mode that the rest of Tcl compiles under.  Furthermore, the Apple
- *	license prohibits me from redistributing a corrected version of
- *	dnr.c.  This file uses a pragma to turn off the Strict ANSI option
- *	and then includes the dnr.c file.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacDNR.c,v 1.2 1998/09/14 18:40:04 stanton Exp $
- */
-
-#pragma ANSI_strict off
-#include <dnr.c>
-#pragma ANSI_strict reset
diff --git a/mac/tclMacEnv.c b/mac/tclMacEnv.c
deleted file mode 100644
index 8f6b58f..0000000
--- a/mac/tclMacEnv.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/* 
- * tclMacEnv.c --
- *
- *	Implements the "environment" on a Macintosh.
- *
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacEnv.c,v 1.2 1998/09/14 18:40:04 stanton Exp $
- */
-
-#include <Gestalt.h>
-#include <Folders.h>
-#include <TextUtils.h>
-#include <Resources.h>
-#include <string.h>
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include "tclPort.h"
-
-#define kMaxEnvStringSize 	255
-#define kMaxEnvVarSize 		100
-#define kLoginnameTag 		"LOGIN="
-#define kUsernameTag 		"USER="
-#define kDefaultDirTag 		"HOME="
-
-/* 
- * The following specifies a text file where additional environment variables 
- * can be set.  The file must reside in the preferences folder.  If the file 
- * doesn't exist NO error will occur.  Commet out the difinition if you do 
- * NOT want to use an environment variables file. 
- */
-#define kPrefsFile	 		"Tcl Environment Variables"
-
-/* 
- * The following specifies the Name of a 'STR#' resource in the application 
- * where additional environment variables may be set.  If the resource doesn't
- * exist no errors will occur.  Commet it out if you don't want it.
- */
-#define REZ_ENV "\pTcl Environment Variables"
-
-/* Globals */
-char **environ = NULL;
-
-/*
- * Declarations for local procedures defined in this file:
- */
-static char ** RezRCVariables _ANSI_ARGS_((void));
-static char ** FileRCVariables _ANSI_ARGS_((void));
-static char ** PathVariables _ANSI_ARGS_((void));
-static char ** SystemVariables _ANSI_ARGS_((void));
-static char * MakeFolderEnvVar _ANSI_ARGS_((char * prefixTag,
-	long whichFolder));
-static char * GetUserName _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * RezRCVariables --
- *
- *  Creates environment variables from the applications resource fork.
- *  The function looks for the 'STR#' resource with the name defined
- *  in the #define REZ_ENV.  If the define is not defined this code
- *  will not be included.  If the resource doesn't exist or no strings
- *  reside in the resource nothing will happen.
- *
- * Results:
- *	ptr to value on success, NULL if error.
- *
- * Side effects:
- *	Memory is allocated and returned to the caller.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef REZ_ENV
-static char ** 
-RezRCVariables()
-{
-    Handle envStrs = NULL;
-    char** rezEnv = NULL;
-    short int numStrs;
-
-    envStrs = GetNamedResource('STR#', REZ_ENV);
-    if (envStrs == NULL) return NULL;
-    numStrs = *((short *) (*envStrs));
-	
-    rezEnv = (char **) ckalloc((numStrs + 1) * sizeof(char *));
-
-    if (envStrs != NULL) {
-	ResType	theType;
-	Str255 theName;
-	short theID, index = 1;
-	int i = 0;
-	char* string;
-	
-	GetResInfo(envStrs, &theID, &theType, theName);
-	for(;;) {
-	    GetIndString(theName, theID, index++);
-	    if (theName[0] == '\0') break;
-	    string = (char *) ckalloc(theName[0] + 2);
-	    strncpy(string, (char *) theName + 1, theName[0]);
-	    string[theName[0]] = '\0';
-	    rezEnv[i++] = string;
-	}
-	ReleaseResource(envStrs);
-		
-	rezEnv[i] = NULL;
-	return rezEnv;
-    }
-	
-    return NULL;
-}
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * FileRCVariables --
- *
- *  Creates environment variables from a file in the system preferences
- *  folder.  The function looks for a file in the preferences folder 
- *  a name defined in the #define kPrefsFile.  If the define is not 
- *  defined this code will not be included.  If the resource doesn't exist or
- *  no strings reside in the resource nothing will happen.
- *
- * Results:
- *	ptr to value on success, NULL if error.
- *
- * Side effects:
- *	Memory is allocated and returned to the caller.
- *
- *----------------------------------------------------------------------
- */
-
-#ifdef kPrefsFile
-static char ** 
-FileRCVariables()
-{
-    char *prefsFolder = NULL;
-    char *tempPtr = NULL;
-    char **fileEnv = NULL;
-    FILE *thePrefsFile = NULL;
-    int	i;
-    FSSpec prefDir;
-    OSErr err;
-    Handle theString = NULL;
-    Tcl_Channel chan;
-    int size;
-    Tcl_DString lineRead;
-	
-    err = FSpFindFolder(kOnSystemDisk, kPreferencesFolderType, 
-	    kDontCreateFolder, &prefDir);
-    if (err != noErr) {
-	return NULL;
-    }
-    err = FSpPathFromLocation(&prefDir, &size, &theString);
-    if (err != noErr) {
-	return NULL;
-    }
-    (void) Munger(theString, size, NULL, 0, kPrefsFile, strlen(kPrefsFile));
-
-    HLock(theString);
-    chan = Tcl_OpenFileChannel(NULL, *theString, "r", 0);
-    HUnlock(theString);
-    DisposeHandle(theString);
-    if (chan == NULL) {
-	return NULL;
-    }
-
-    /*
-     * We found a env file.  Let start parsing it.
-     */
-    fileEnv = (char **) ckalloc((kMaxEnvVarSize + 1) * sizeof(char *));
-
-    i = 0;
-    Tcl_DStringInit(&lineRead);
-    while (Tcl_Gets(chan, &lineRead) != -1) {
-	/*
-	 * First strip off new line char
-	 */
-	if (lineRead.string[lineRead.length-1] == '\n') {
-	    lineRead.string[lineRead.length-1] = '\0';
-	}
-	if (lineRead.string[0] == '\0' || lineRead.string[0] == '#') {
-	    /*
-	     * skip empty lines or commented lines
-	     */
-	    Tcl_DStringSetLength(&lineRead, 0);
-	    continue;
-	}
-		
-	tempPtr = (char *) ckalloc(lineRead.length + 1);
-	strcpy(tempPtr, lineRead.string);
-	fileEnv[i++] = tempPtr;
-	Tcl_DStringSetLength(&lineRead, 0);
-    }
-	
-    fileEnv[i] = NULL;
-    Tcl_Close(NULL, chan);
-    Tcl_DStringFree(&lineRead);
-	
-    return fileEnv;
-}
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * MakeFolderEnvVar --
- *
- *	This function creates "environment" variable by taking a prefix and
- *	appending a folder path to a directory.  The directory is specified
- *	by a integer value acceptable by the FindFolder function.
- *
- * Results:
- *	The function returns an *allocated* string.  If the folder doesn't
- *	exist the return string is still allocated and just contains the
- *	given prefix.
- *
- * Side effects:
- *	Memory is allocated and returned to the caller.
- *
- *----------------------------------------------------------------------
- */
-
-static char * 
-MakeFolderEnvVar(
-    char * prefixTag,		/* Prefix added before result. */
-    long whichFolder)		/* Constant for FSpFindFolder. */
-{
-    char * thePath = NULL;
-    char * result = NULL;
-    OSErr theErr = noErr;
-    Handle theString = NULL;
-    FSSpec theFolder;
-    int size;
-    Tcl_DString pathStr;
-    Tcl_DString tagPathStr;
-    
-    Tcl_DStringInit(&pathStr);
-    theErr = FSpFindFolder(kOnSystemDisk, whichFolder, 
-	    kDontCreateFolder, &theFolder);
-    if (theErr == noErr) {
-	theErr = FSpPathFromLocation(&theFolder, &size, &theString);
-		
-	HLock(theString);
-	tclPlatform = TCL_PLATFORM_MAC;
-	Tcl_DStringAppend(&pathStr, *theString, -1);
-	HUnlock(theString);
-	DisposeHandle(theString);
-		
-	Tcl_DStringInit(&tagPathStr);
-	Tcl_DStringAppend(&tagPathStr, prefixTag, strlen(prefixTag));
-	Tcl_DStringAppend(&tagPathStr, pathStr.string, pathStr.length);
-	Tcl_DStringFree(&pathStr);
-	
-	/*
-	 * Make sure the path ends with a ':'
-	 */
-	if (tagPathStr.string[tagPathStr.length - 1] != ':') {
-	    Tcl_DStringAppend(&tagPathStr, ":", 1);
-	}
-
-	/*
-	 * Don't free tagPathStr - rather make sure it's allocated
-	 * and return it as the result.
-	 */
-	if (tagPathStr.string == tagPathStr.staticSpace) {
-	    result = (char *) ckalloc(tagPathStr.length + 1);
-	    strcpy(result, tagPathStr.string);
-	} else {
-	    result = tagPathStr.string;
-	}
-    } else {
-	result = (char *) ckalloc(strlen(prefixTag) + 1);
-	strcpy(result, prefixTag);
-    }
-	
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PathVariables --
- *
- *  Creates environment variables from the system call FSpFindFolder.
- *  The function generates environment variables for many of the 
- *  commonly used paths on the Macintosh.
- *
- * Results:
- *	ptr to value on success, NULL if error.
- *
- * Side effects:
- *	Memory is allocated and returned to the caller.
- *
- *----------------------------------------------------------------------
- */
-
-static char ** 
-PathVariables()
-{
-    int i = 0;
-    char **sysEnv;
-    char *thePath = NULL;
-    
-    sysEnv = (char **) ckalloc((12) * sizeof(char *));
-
-    sysEnv[i++] = MakeFolderEnvVar("PREF_FOLDER=", kPreferencesFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("SYS_FOLDER=", kSystemFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("TEMP=", kTemporaryFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("APPLE_M_FOLDER=", kAppleMenuFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("CP_FOLDER=", kControlPanelFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("DESK_FOLDER=", kDesktopFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("EXT_FOLDER=", kExtensionFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("PRINT_MON_FOLDER=",
-	    kPrintMonitorDocsFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("SHARED_TRASH_FOLDER=",
-	    kWhereToEmptyTrashFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("TRASH_FOLDER=", kTrashFolderType);
-    sysEnv[i++] = MakeFolderEnvVar("START_UP_FOLDER=", kStartupFolderType);
-    sysEnv[i++] = NULL;
-	
-    return sysEnv;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SystemVariables --
- *
- *  Creates environment variables from various Mac system calls.
- *
- * Results:
- *	ptr to value on success, NULL if error.
- *
- * Side effects:
- *	Memory is allocated and returned to the caller.
- *
- *----------------------------------------------------------------------
- */
-
-static char ** 
-SystemVariables()
-{
-    int i = 0;
-    char ** sysEnv;
-    char * thePath = NULL;
-    Handle theString = NULL;
-    FSSpec currentDir;
-    int size;
-    
-    sysEnv = (char **) ckalloc((4) * sizeof(char *));
-
-    /*
-     * Get user name from chooser.  It will be assigned to both
-     * the USER and LOGIN environment variables.
-     */
-    thePath = GetUserName();
-    if (thePath != NULL) {
-	sysEnv[i] = (char *) ckalloc(strlen(kLoginnameTag) + strlen(thePath) + 1);
-	strcpy(sysEnv[i], kLoginnameTag);
-	strcpy(sysEnv[i]+strlen(kLoginnameTag), thePath);
-	i++;
-	sysEnv[i] = (char *) ckalloc(strlen(kUsernameTag) + strlen(thePath) + 1);
-	strcpy(sysEnv[i], kUsernameTag);
-	strcpy(sysEnv[i]+strlen(kUsernameTag), thePath);
-	i++;
-    }
-
-    /*
-     * Get 'home' directory
-     */
-#ifdef kDefaultDirTag
-    FSpGetDefaultDir(&currentDir);
-    FSpPathFromLocation(&currentDir, &size, &theString);
-    HLock(theString);
-    sysEnv[i] = (char *) ckalloc(strlen(kDefaultDirTag) + size + 4);
-    strcpy(sysEnv[i], kDefaultDirTag);
-    strncpy(sysEnv[i]+strlen(kDefaultDirTag) , *theString, size);
-    if (sysEnv[i][strlen(kDefaultDirTag) + size - 1] != ':') {
-	sysEnv[i][strlen(kDefaultDirTag) + size] = ':';
-	sysEnv[i][strlen(kDefaultDirTag) + size + 1] = '\0';
-    } else {
-	sysEnv[i][strlen(kDefaultDirTag) + size] = '\0';
-    }
-    HUnlock(theString);
-    DisposeHandle(theString);
-    i++;
-#endif
-
-    sysEnv[i++] = NULL;
-    return sysEnv;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacCreateEnv --
- *
- *	This function allocates and populates the global "environ"
- *	variable.  Entries are in traditional Unix format but variables
- *	are, hopefully, a bit more relevant for the Macintosh.
- *
- * Results:
- *	The number of elements in the newly created environ array.
- *
- * Side effects:
- *	Memory is allocated and pointed too by the environ variable.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMacCreateEnv()
-{
-    char ** sysEnv = NULL;
-    char ** pathEnv = NULL;
-    char ** fileEnv = NULL;
-    char ** rezEnv = NULL;
-    int count = 0;
-    int i, j;
-
-    sysEnv = SystemVariables();
-    if (sysEnv != NULL) {
-	for (i = 0; sysEnv[i] != NULL; count++, i++) {
-	    /* Empty Loop */
-	}
-    }
-
-    pathEnv = PathVariables();
-    if (pathEnv != NULL) {
-	for (i = 0; pathEnv[i] != NULL; count++, i++) {
-	    /* Empty Loop */
-	}
-    }
-
-#ifdef kPrefsFile
-    fileEnv = FileRCVariables();
-    if (fileEnv != NULL) {
-	for (i = 0; fileEnv[i] != NULL; count++, i++) {
-	    /* Empty Loop */
-	}
-    }
-#endif
-
-#ifdef REZ_ENV
-    rezEnv = RezRCVariables();
-    if (rezEnv != NULL) {
-	for (i = 0; rezEnv[i] != NULL; count++, i++) {
-	    /* Empty Loop */
-	}
-    }
-#endif
-
-    /*
-     * Create environ variable
-     */
-    environ = (char **) ckalloc((count + 1) * sizeof(char *));
-    j = 0;
-	
-    if (sysEnv != NULL) {
-	for (i = 0; sysEnv[i] != NULL;)
-	    environ[j++] = sysEnv[i++];
-	ckfree((char *) sysEnv);
-    }
-
-    if (pathEnv != NULL) {
-	for (i = 0; pathEnv[i] != NULL;)
-	    environ[j++] = pathEnv[i++];
-	ckfree((char *) pathEnv);
-    }
-
-#ifdef kPrefsFile
-    if (fileEnv != NULL) {
-	for (i = 0; fileEnv[i] != NULL;)
-	    environ[j++] = fileEnv[i++];
-	ckfree((char *) fileEnv);
-    }
-#endif
-
-#ifdef REZ_ENV
-    if (rezEnv != NULL) {
-	for (i = 0; rezEnv[i] != NULL;)
-	    environ[j++] = rezEnv[i++];
-	ckfree((char *) rezEnv);
-    }
-#endif
-
-    environ[j] = NULL;
-    return j;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetUserName --
- *
- *	Get the user login name.
- *
- * Results:
- *  ptr to static string, NULL if error.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-GetUserName()
-{
-    static char buf[33];
-    short refnum;
-    Handle h;
-	
-    refnum = CurResFile();
-    UseResFile(0);
-    h = GetResource('STR ', -16096);
-    UseResFile(refnum);
-    if (h == NULL) {
-	return NULL;
-    }
-    
-    HLock(h);
-    strncpy(buf, (*h)+1, **h);
-    buf[**h] = '\0';
-    HUnlock(h);
-    ReleaseResource(h);
-    return(buf[0] ? buf : NULL);
-}
diff --git a/mac/tclMacExit.c b/mac/tclMacExit.c
deleted file mode 100644
index 347ff4e..0000000
--- a/mac/tclMacExit.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* 
- * tclMacExit.c --
- *
- *	This file contains routines that deal with cleaning up various state
- *	when Tcl/Tk applications quit.  Unfortunantly, not all state is cleaned
- *	up by the process when an application quites or crashes.  Also you
- *	need to do different things depending on wether you are running as
- *	68k code, PowerPC, or a code resource.  The Exit handler code was 
- *	adapted from code posted on alt.sources.mac by Dave Nebinger.
- *
- * Copyright (c) 1995 Dave Nebinger.
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacExit.c,v 1.4 1999/04/16 00:47:19 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include <SegLoad.h>
-#include <Traps.h>
-#include <Processes.h>
-
-/*
- * Various typedefs and defines needed to patch ExitToShell.
- */
- 
-enum {
-        uppExitToShellProcInfo = kPascalStackBased
-};
-
-#if GENERATINGCFM
-typedef UniversalProcPtr ExitToShellUPP;
-
-#define CallExitToShellProc(userRoutine)        \
-        CallUniversalProc((UniversalProcPtr)(userRoutine),uppExitToShellProcInfo)
-#define NewExitToShellProc(userRoutine) \
-        (ExitToShellUPP)NewRoutineDescriptor((ProcPtr)(userRoutine), \
-		uppExitToShellProcInfo, GetCurrentArchitecture())
-
-#else
-typedef ExitToShellProcPtr ExitToShellUPP;
-
-#define CallExitToShellProc(userRoutine)        \
-        (*(userRoutine))()
-#define NewExitToShellProc(userRoutine) \
-        (ExitToShellUPP)(userRoutine)
-#endif
-
-#define DisposeExitToShellProc(userRoutine) \
-        DisposeRoutineDescriptor(userRoutine)
-
-#if defined(powerc)||defined(__powerc)
-#pragma options align=mac68k
-#endif
-struct ExitToShellUPPList{
-        struct ExitToShellUPPList* nextProc;
-        ExitToShellUPP userProc;
-};
-#if defined(powerc)||defined(__powerc)
-#pragma options align=reset
-#endif
-
-typedef struct ExitToShellDataStruct ExitToShellDataRec,* ExitToShellDataPtr,** ExitToShellDataHdl;
-
-typedef struct ExitToShellUPPList ExitToShellUPPList,* ExitToShellUPPListPtr,** ExitToShellUPPHdl;
-
-#if defined(powerc)||defined(__powerc)
-#pragma options align=mac68k
-#endif
-struct ExitToShellDataStruct{
-    unsigned long a5;
-    ExitToShellUPPList* userProcs;
-    ExitToShellUPP oldProc;
-};
-#if defined(powerc)||defined(__powerc)
-#pragma options align=reset
-#endif
-
-/*
- * Static globals used within this file.
- */
-static ExitToShellDataPtr gExitToShellData = (ExitToShellDataPtr) NULL;
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclPlatformExit --
- *
- *	This procedure implements the Macintosh specific exit routine.
- *	We explicitly callthe ExitHandler function to do various clean
- *	up.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	We exit the process.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpExit(
-    int status)		/* Ignored. */
-{
-    TclMacExitHandler();
-
-/* 
- * If we are using the Metrowerks Standard Library, then we will call its exit so that it
- * will get a chance to clean up temp files, and so forth.  It always calls the standard 
- * ExitToShell, so the Tcl handlers will also get called.
- *   
- * If you have another exit, make sure that it does not patch ExitToShell, and does
- * call it.  If so, it will probably work as well.
- *
- */
- 
-#ifdef __MSL__    
-    exit(status);
-#else
-    ExitToShell();
-#endif
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacExitHandler --
- *
- *	This procedure is invoked after Tcl at the last possible moment
- *	to clean up any state Tcl has left around that may cause other
- *	applications to crash.  For example, this function can be used
- *	as the termination routine for CFM applications.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Various cleanup occurs.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclMacExitHandler()
-{
-    ExitToShellUPPListPtr curProc;
-
-    /*
-     * Loop through all installed Exit handlers
-     * and call them.  Always make sure we are in
-     * a clean state in case we are recursivly called.
-     */
-    if ((gExitToShellData) != NULL && (gExitToShellData->userProcs != NULL)){
-    
-	/*
-	 * Call the installed exit to shell routines.
-	 */
-	curProc = gExitToShellData->userProcs;
-	do {
-	    gExitToShellData->userProcs = curProc->nextProc;
-	    CallExitToShellProc(curProc->userProc);
-	    DisposeExitToShellProc(curProc->userProc);
-	    DisposePtr((Ptr) curProc);
-	    curProc = gExitToShellData->userProcs;
-	} while (curProc != (ExitToShellUPPListPtr) NULL);
-    }
-
-    return;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacInstallExitToShellPatch --
- *
- *	This procedure installs a way to clean up state at the latest
- *	possible moment before we exit.  These are things that must
- *	be cleaned up or the system will crash.  The exact way in which
- *	this is implemented depends on the architecture in which we are
- *	running.  For 68k applications we patch the ExitToShell call.
- *	For PowerPC applications we just create a list of procs to call.
- *	The function ExitHandler should be installed in the Code 
- *	Fragments terminiation routine.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Installs the new routine.
- *
- *----------------------------------------------------------------------
- */
-
-OSErr 
-TclMacInstallExitToShellPatch(
-    ExitToShellProcPtr newProc)		/* Function pointer. */
-{
-    ExitToShellUPP exitHandler;
-    ExitToShellUPPListPtr listPtr;
-
-    if (gExitToShellData == (ExitToShellDataPtr) NULL){
-	TclMacInitExitToShell(true);
-    }
-
-    /*
-     * Add the passed in function pointer to the list of functions
-     * to be called when ExitToShell is called.
-     */
-    exitHandler = NewExitToShellProc(newProc);
-    listPtr = (ExitToShellUPPListPtr) NewPtrClear(sizeof(ExitToShellUPPList));
-    listPtr->userProc = exitHandler;
-    listPtr->nextProc = gExitToShellData->userProcs;
-    gExitToShellData->userProcs = listPtr;
-
-    return noErr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ExitToShellPatchRoutine --
- *
- *	This procedure is invoked when someone calls ExitToShell for
- *	this application.  This function performs some last miniute
- *	clean up and then calls the real ExitToShell routine.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Various cleanup occurs.
- *
- *----------------------------------------------------------------------
- */
-
-static pascal void
-ExitToShellPatchRoutine()
-{
-    ExitToShellUPP oldETS;
-    long oldA5;
-
-    /*
-     * Set up our A5 world.  This allows us to have
-     * access to our global variables in the 68k world.
-     */
-    oldA5 = SetCurrentA5();
-    SetA5(gExitToShellData->a5);
-
-    /*
-     * Call the function that invokes all
-     * of the handlers.
-     */
-    TclMacExitHandler();
-
-    /*
-     * Call the origional ExitToShell routine.
-     */
-    oldETS = gExitToShellData->oldProc;
-    DisposePtr((Ptr) gExitToShellData);
-    SetA5(oldA5);
-    CallExitToShellProc(oldETS);
-    return;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacInitExitToShell --
- *
- *	This procedure initializes the ExitToShell clean up machanism.
- *	Generally, this is handled automatically when users make a call
- *	to InstallExitToShellPatch.  However, it can be called 
- *	explicitly at startup time to turn off the patching mechanism.
- *	This can be used by code resources which could be removed from
- *	the application before ExitToShell is called.
- *
- *	Note, if we are running from CFM code we never install the
- *	patch.  Instead, the function ExitHandler should be installed
- *	as the terminiation routine for the code fragment.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates global state.
- *
- *----------------------------------------------------------------------
- */
-
-void 
-TclMacInitExitToShell(
-    int usePatch)	/* True if on 68k. */
-{
-    if (gExitToShellData == (ExitToShellDataPtr) NULL){
-#if GENERATINGCFM
-	gExitToShellData = (ExitToShellDataPtr)
-	  NewPtr(sizeof(ExitToShellDataRec));
-	gExitToShellData->a5 = SetCurrentA5();
-	gExitToShellData->userProcs = (ExitToShellUPPList*) NULL;
-#else
-	ExitToShellUPP oldExitToShell, newExitToShellPatch;
-	short exitToShellTrap;
-	
-	/*
-	 * Initialize patch mechanism.
-	 */
-	 
-	gExitToShellData = (ExitToShellDataPtr) NewPtr(sizeof(ExitToShellDataRec));
-	gExitToShellData->a5 = SetCurrentA5();
-	gExitToShellData->userProcs = (ExitToShellUPPList*) NULL;
-
-	/*
-	 * Save state needed to call origional ExitToShell routine.  Install
-	 * the new ExitToShell code in it's place.
-	 */
-	if (usePatch) {
-	    exitToShellTrap = _ExitToShell & 0x3ff;
-	    newExitToShellPatch = NewExitToShellProc(ExitToShellPatchRoutine);
-	    oldExitToShell = (ExitToShellUPP)
-	      NGetTrapAddress(exitToShellTrap, ToolTrap);
-	    NSetTrapAddress((UniversalProcPtr) newExitToShellPatch,
-		    exitToShellTrap, ToolTrap);
-	    gExitToShellData->oldProc = oldExitToShell;
-	}
-#endif
-    }
-}
diff --git a/mac/tclMacFCmd.c b/mac/tclMacFCmd.c
deleted file mode 100644
index 716237e..0000000
--- a/mac/tclMacFCmd.c
+++ /dev/null
@@ -1,1535 +0,0 @@
-/* 
- * tclMacFCmd.c --
- *
- * Implements the Macintosh specific portions of the file manipulation
- * subcommands of the "file" command.
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacFCmd.c,v 1.4 1999/04/16 00:47:20 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclMac.h"
-#include "tclMacInt.h"
-#include "tclPort.h"
-#include <FSpCompat.h>
-#include <MoreFilesExtras.h>
-#include <Strings.h>
-#include <Errors.h>
-#include <FileCopy.h>
-#include <DirectoryCopy.h>
-#include <Script.h>
-#include <string.h>
-#include <Finder.h>
-
-/*
- * Callback for the file attributes code.
- */
-
-static int		GetFileFinderAttributes _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		GetFileReadOnly _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **readOnlyPtrPtr));
-static int		SetFileFinderAttributes _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *attributePtr));
-static int		SetFileReadOnly _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *readOnlyPtr));
-
-/*
- * These are indeces into the tclpFileAttrsStrings table below.
- */
-
-#define MAC_CREATOR_ATTRIBUTE	0
-#define MAC_HIDDEN_ATTRIBUTE	1
-#define MAC_READONLY_ATTRIBUTE	2
-#define MAC_TYPE_ATTRIBUTE	3
-
-/*
- * Global variables for the file attributes code.
- */
-
-char *tclpFileAttrStrings[] = {"-creator", "-hidden", "-readonly",
-	"-type", (char *) NULL};
-CONST TclFileAttrProcs tclpFileAttrProcs[] = {
-	{GetFileFinderAttributes, SetFileFinderAttributes},
-	{GetFileFinderAttributes, SetFileFinderAttributes},
-	{GetFileReadOnly, SetFileReadOnly},
-	{GetFileFinderAttributes, SetFileFinderAttributes}};
-
-
-/*
- * Prototypes for procedure only used in this file
- */
-
-static pascal Boolean 	CopyErrHandler _ANSI_ARGS_((OSErr error, 
-			    short failedOperation,
-			    short srcVRefNum, long srcDirID,
-			    StringPtr srcName, short dstVRefNum,
-			    long dstDirID,StringPtr dstName));
-static int		DoCopyDirectory _ANSI_ARGS_((CONST char *src,
-			    CONST char *dst, Tcl_DString *errorPtr));
-static int		DoCopyFile _ANSI_ARGS_((CONST char *src, 
-			    CONST char *dst));
-static int		DoCreateDirectory _ANSI_ARGS_((CONST char *path));
-static int		DoDeleteFile _ANSI_ARGS_((CONST char *path));
-static int		DoRemoveDirectory _ANSI_ARGS_((CONST char *path, 
-			    int recursive, Tcl_DString *errorPtr));
-static int		DoRenameFile _ANSI_ARGS_((CONST char *src,
-			    CONST char *dst));
-OSErr			FSpGetFLockCompat _ANSI_ARGS_((const FSSpec *specPtr, 
-			    Boolean *lockedPtr));
-static OSErr		GenerateUniqueName _ANSI_ARGS_((short vRefNum, 
-			    long dirID1, long dirID2, Str31 uniqueName));
-static OSErr		GetFileSpecs _ANSI_ARGS_((CONST char *path, 
-			    FSSpec *pathSpecPtr, FSSpec *dirSpecPtr,	
-			    Boolean *pathExistsPtr, 
-			    Boolean *pathIsDirectoryPtr));
-static OSErr		MoveRename _ANSI_ARGS_((const FSSpec *srcSpecPtr, 
-			    const FSSpec *dstSpecPtr, StringPtr copyName));
-static int		Pstrequal _ANSI_ARGS_((ConstStr255Param stringA, 
-			    ConstStr255Param stringB));
-                 
-/*
- *---------------------------------------------------------------------------
- *
- * TclpRenameFile, DoRenameFile --
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *	If src and dst refer to the same file or directory, does nothing
- *	and returns success.  Otherwise if dst already exists, it will be
- *	deleted and replaced by src subject to the following conditions:
- *	    If src is a directory, dst may be an empty directory.
- *	    If src is a file, dst may be a file.
- *	In any other situation where dst already exists, the rename will
- *	fail.  
- *
- * Results:
- *	If the directory was successfully created, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EEXIST:	    dst is a non-empty directory.
- *	EINVAL:	    src is a root directory or dst is a subdirectory of src.
- *	EISDIR:	    dst is a directory, but src is not.
- *	ENOENT:	    src doesn't exist.  src or dst is "".
- *	ENOTDIR:    src is a directory, but dst is not.  
- *	EXDEV:	    src and dst are on different filesystems.
- *	
- * Side effects:
- *	The implementation of rename may allow cross-filesystem renames,
- *	but the caller should be prepared to emulate it with copy and
- *	delete if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpRenameFile( 
-    CONST char *src,		/* Pathname of file or dir to be renamed
-				 * (UTF-8). */
-    CONST char *dst)		/* New pathname of file or directory
-				 * (UTF-8). */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-    result = DoRenameFile(Tcl_DStringValue(&srcString),
-	    Tcl_DStringValue(&dstString));
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoRenameFile(
-    CONST char *src,		/* Pathname of file or dir to be renamed
-				 * (native). */
-    CONST char *dst)		/* New pathname of file or directory
-				 * (native). */
-{
-    FSSpec srcFileSpec, dstFileSpec, dstDirSpec;
-    OSErr err; 
-    long srcID, dummy;
-    Boolean srcIsDirectory, dstIsDirectory, dstExists, dstLocked;
-
-    err = FSpLocationFromPath(strlen(src), src, &srcFileSpec);
-    if (err == noErr) {
-	FSpGetDirectoryID(&srcFileSpec, &srcID, &srcIsDirectory);
-    }
-    if (err == noErr) {
-        err = GetFileSpecs(dst, &dstFileSpec, &dstDirSpec, &dstExists, 
-        	&dstIsDirectory);
-    }
-    if (err == noErr) {
-	if (dstExists == 0) {
-            err = MoveRename(&srcFileSpec, &dstDirSpec, dstFileSpec.name);
-            goto end;
-        }
-        err = FSpGetFLockCompat(&dstFileSpec, &dstLocked);
-        if (dstLocked) {
-            FSpRstFLockCompat(&dstFileSpec);
-        }
-    }
-    if (err == noErr) {
-        if (srcIsDirectory) {
-	    if (dstIsDirectory) {
-		/*
-		 * The following call will remove an empty directory.  If it
-		 * fails, it's because it wasn't empty.
-		 */
-		 
-                if (DoRemoveDirectory(dst, 0, NULL) != TCL_OK) {
-                    return TCL_ERROR;
-                }
-                
-                /*
-		 * Now that that empty directory is gone, we can try
-		 * renaming src.  If that fails, we'll put this empty
-		 * directory back, for completeness.
-		 */
-
-		err = MoveRename(&srcFileSpec, &dstDirSpec, dstFileSpec.name);
-                if (err != noErr) {
-		    FSpDirCreateCompat(&dstFileSpec, smSystemScript, &dummy);
-		    if (dstLocked) {
-		        FSpSetFLockCompat(&dstFileSpec);
-		    }
-		}
-	    } else {
-	        errno = ENOTDIR;
-	        return TCL_ERROR;
-	    }
-	} else {   
-	    if (dstIsDirectory) {
-		errno = EISDIR;
-		return TCL_ERROR;
-	    } else {                                
-		/*
-		 * Overwrite existing file by:
-		 * 
-		 * 1. Rename existing file to temp name.
-		 * 2. Rename old file to new name.
-		 * 3. If success, delete temp file.  If failure,
-		 *    put temp file back to old name.
-		 */
-
-	        Str31 tmpName;
-	        FSSpec tmpFileSpec;
-
-	        err = GenerateUniqueName(dstFileSpec.vRefNum, 
-	        	dstFileSpec.parID, dstFileSpec.parID, tmpName);
-	        if (err == noErr) {
-	            err = FSpRenameCompat(&dstFileSpec, tmpName);
-	        }
-	        if (err == noErr) {
-	            err = FSMakeFSSpecCompat(dstFileSpec.vRefNum,
-	            	    dstFileSpec.parID, tmpName, &tmpFileSpec);
-	        }
-	        if (err == noErr) {
-	            err = MoveRename(&srcFileSpec, &dstDirSpec, 
-	            	    dstFileSpec.name);
-	        }
-	        if (err == noErr) {
-		    FSpDeleteCompat(&tmpFileSpec);
-		} else {
-		    FSpDeleteCompat(&dstFileSpec);
-		    FSpRenameCompat(&tmpFileSpec, dstFileSpec.name);
-	            if (dstLocked) {
-	            	FSpSetFLockCompat(&dstFileSpec);
-	            }
-	        }
-	    }
-   	}
-    }    
-
-    end:    
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *--------------------------------------------------------------------------
- *
- * MoveRename --
- *
- *	Helper function for TclpRenameFile.  Renames a file or directory
- *	into the same directory or another directory.  The target name
- * 	must not already exist in the destination directory.
- *
- *	Don't use FSpMoveRenameCompat because it doesn't work with
- *	directories or with locked files. 
- *
- * Results:
- *	Returns a mac error indicating the cause of the failure.
- *
- * Side effects:
- *	Creates a temp file in the target directory to handle a rename
- *	between directories.
- *
- *--------------------------------------------------------------------------
- */
-  
-static OSErr		
-MoveRename(
-    const FSSpec *srcFileSpecPtr,   /* Source object. */
-    const FSSpec *dstDirSpecPtr,    /* Destination directory. */
-    StringPtr copyName)		    /* New name for object in destination 
-    				     * directory. */
-{
-    OSErr err;
-    long srcID, dstID;
-    Boolean srcIsDir, dstIsDir;
-    Str31 tmpName;
-    FSSpec dstFileSpec, srcDirSpec, tmpSrcFileSpec, tmpDstFileSpec;
-    Boolean locked;
-    
-    if (srcFileSpecPtr->parID == 1) {
-        /*
-         * Trying to rename a volume.
-         */
-          
-        return badMovErr;
-    }
-    if (srcFileSpecPtr->vRefNum != dstDirSpecPtr->vRefNum) {
-	/*
-	 * Renaming across volumes.
-	 */
-	 
-        return diffVolErr;
-    }
-    err = FSpGetFLockCompat(srcFileSpecPtr, &locked);
-    if (locked) {
-        FSpRstFLockCompat(srcFileSpecPtr);
-    }
-    if (err == noErr) {
-	err = FSpGetDirectoryID(dstDirSpecPtr, &dstID, &dstIsDir);
-    }
-    if (err == noErr) {
-        if (srcFileSpecPtr->parID == dstID) {
-            /*
-             * Renaming object within directory. 
-             */
-            
-            err = FSpRenameCompat(srcFileSpecPtr, copyName);
-            goto done; 
-        }
-        if (Pstrequal(srcFileSpecPtr->name, copyName)) {
-	    /*
-	     * Moving object to another directory (under same name). 
-	     */
-	 
-	    err = FSpCatMoveCompat(srcFileSpecPtr, dstDirSpecPtr);
-	    goto done; 
-        } 
-        err = FSpGetDirectoryID(srcFileSpecPtr, &srcID, &srcIsDir);
-    } 
-    if (err == noErr) {
-        /*
-         * Fullblown: rename source object to temp name, move temp to
-         * dest directory, and rename temp to target.
-         */
-          
-        err = GenerateUniqueName(srcFileSpecPtr->vRefNum, 
-       		srcFileSpecPtr->parID, dstID, tmpName);
-        FSMakeFSSpecCompat(srcFileSpecPtr->vRefNum, srcFileSpecPtr->parID,
-         	tmpName, &tmpSrcFileSpec);
-        FSMakeFSSpecCompat(dstDirSpecPtr->vRefNum, dstID, tmpName,
-         	&tmpDstFileSpec);
-    }
-    if (err == noErr) {
-        err = FSpRenameCompat(srcFileSpecPtr, tmpName);
-    }
-    if (err == noErr) {
-        err = FSpCatMoveCompat(&tmpSrcFileSpec, dstDirSpecPtr);
-        if (err == noErr) {
-            err = FSpRenameCompat(&tmpDstFileSpec, copyName);
-            if (err == noErr) {
-                goto done;
-            }
-            FSMakeFSSpecCompat(srcFileSpecPtr->vRefNum, srcFileSpecPtr->parID,
-             	    NULL, &srcDirSpec);
-            FSpCatMoveCompat(&tmpDstFileSpec, &srcDirSpec);
-        }                 
-        FSpRenameCompat(&tmpSrcFileSpec, srcFileSpecPtr->name);
-    }
-    
-    done:
-    if (locked != false) {
-    	if (err == noErr) {
-	    FSMakeFSSpecCompat(dstDirSpecPtr->vRefNum, 
-	    	    dstID, copyName, &dstFileSpec);
-            FSpSetFLockCompat(&dstFileSpec);
-        } else {
-            FSpSetFLockCompat(srcFileSpecPtr);
-        }
-    }
-    return err;
-}     
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyFile, DoCopyFile --
- *
- *      Copy a single file (not a directory).  If dst already exists and
- *	is not a directory, it is removed.
- *
- * Results:
- *	If the file was successfully copied, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EISDIR:	    src or dst is a directory.
- *	ENOENT:	    src doesn't exist.  src or dst is "".
- *
- * Side effects:
- *      This procedure will also copy symbolic links, block, and
- *      character devices, and fifos.  For symbolic links, the links 
- *      themselves will be copied and not what they point to.  For the
- *	other special file types, the directory entry will be copied and
- *	not the contents of the device that it refers to.
- *
- *---------------------------------------------------------------------------
- */
- 
-int 
-TclpCopyFile(
-    CONST char *src,		/* Pathname of file to be copied (UTF-8). */
-    CONST char *dst)		/* Pathname of file to copy to (UTF-8). */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-    result = DoCopyFile(Tcl_DStringValue(&srcString), 
-    	    Tcl_DStringValue(&dstString));
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoCopyFile(
-    CONST char *src,		/* Pathname of file to be copied (native). */
-    CONST char *dst)		/* Pathname of file to copy to (native). */
-{
-    OSErr err, dstErr;
-    Boolean dstExists, dstIsDirectory, dstLocked;
-    FSSpec srcFileSpec, dstFileSpec, dstDirSpec, tmpFileSpec;
-    Str31 tmpName;
-	
-    err = FSpLocationFromPath(strlen(src), src, &srcFileSpec);
-    if (err == noErr) {
-        err = GetFileSpecs(dst, &dstFileSpec, &dstDirSpec, &dstExists,
-        	&dstIsDirectory);
-    }
-    if (dstExists) {
-        if (dstIsDirectory) {
-            errno = EISDIR;
-            return TCL_ERROR;
-        }
-        err = FSpGetFLockCompat(&dstFileSpec, &dstLocked);
-        if (dstLocked) {
-            FSpRstFLockCompat(&dstFileSpec);
-        }
-        
-        /*
-         * Backup dest file.
-         */
-         
-        dstErr = GenerateUniqueName(dstFileSpec.vRefNum, dstFileSpec.parID, 
-    	        dstFileSpec.parID, tmpName);
-        if (dstErr == noErr) {
-            dstErr = FSpRenameCompat(&dstFileSpec, tmpName);
-        }   
-    }
-    if (err == noErr) {
-    	err = FSpFileCopy(&srcFileSpec, &dstDirSpec, 
-    		(StringPtr) dstFileSpec.name, NULL, 0, true);
-    }
-    if ((dstExists != false) && (dstErr == noErr)) {
-        FSMakeFSSpecCompat(dstFileSpec.vRefNum, dstFileSpec.parID,
-        	tmpName, &tmpFileSpec);
-	if (err == noErr) {
-	    /* 
-	     * Delete backup file. 
-	     */
-	     
-	    FSpDeleteCompat(&tmpFileSpec);
-	} else {
-	
-	    /* 
-	     * Restore backup file.
-	     */
-	     
-	    FSpDeleteCompat(&dstFileSpec);
-	    FSpRenameCompat(&tmpFileSpec, dstFileSpec.name);
-	    if (dstLocked) {
-	        FSpSetFLockCompat(&dstFileSpec);
-	    }
-	}
-    }
-    
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpDeleteFile, DoDeleteFile --
- *
- *      Removes a single file (not a directory).
- *
- * Results:
- *	If the file was successfully deleted, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EISDIR:	    path is a directory.
- *	ENOENT:	    path doesn't exist or is "".
- *
- * Side effects:
- *      The file is deleted, even if it is read-only.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpDeleteFile( 
-    CONST char *path)		/* Pathname of file to be removed (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoDeleteFile(Tcl_DStringValue(&pathString));
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoDeleteFile(
-    CONST char *path)		/* Pathname of file to be removed (native). */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    Boolean isDirectory;
-    long dirID;
-    
-    err = FSpLocationFromPath(strlen(path), path, &fileSpec);
-    if (err == noErr) {
-	/*
-     	 * Since FSpDeleteCompat will delete an empty directory, make sure
-     	 * that this isn't a directory first.
-         */
-        
-        FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-	if (isDirectory == true) {
-            errno = EISDIR;
-            return TCL_ERROR;
-        }
-    }
-    err = FSpDeleteCompat(&fileSpec);
-    if (err == fLckdErr) {
-    	FSpRstFLockCompat(&fileSpec);
-    	err = FSpDeleteCompat(&fileSpec);
-    	if (err != noErr) {
-    	    FSpSetFLockCompat(&fileSpec);
-    	}
-    }
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCreateDirectory, DoCreateDirectory --
- *
- *      Creates the specified directory.  All parent directories of the
- *	specified directory must already exist.  The directory is
- *	automatically created with permissions so that user can access
- *	the new directory and create new files or subdirectories in it.
- *
- * Results:
- *	If the directory was successfully created, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EEXIST:	    path already exists.
- *	ENOENT:	    a parent directory doesn't exist.
- *
- * Side effects:
- *      A directory is created with the current umask, except that
- *	permission for u+rwx will always be added.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCreateDirectory(
-    CONST char *path)		/* Pathname of directory to create (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoCreateDirectory(Tcl_DStringValue(&pathString));
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoCreateDirectory(
-    CONST char *path)		/* Pathname of directory to create (native). */
-{
-    OSErr err;
-    FSSpec dirSpec;
-    long outDirID;
-	
-    err = FSpLocationFromPath(strlen(path), path, &dirSpec);
-    if (err == noErr) {
-        err = dupFNErr;		/* EEXIST. */
-    } else if (err == fnfErr) {
-        err = FSpDirCreateCompat(&dirSpec, smSystemScript, &outDirID);
-    } 
-    
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyDirectory, DoCopyDirectory --
- *
- *      Recursively copies a directory.  The target directory dst must
- *	not already exist.  Note that this function does not merge two
- *	directory hierarchies, even if the target directory is an an
- *	empty directory.
- *
- * Results:
- *	If the directory was successfully copied, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  See TclpCreateDirectory and TclpCopyFile
- *	for a description of possible values for errno.
- *
- * Side effects:
- *      An exact copy of the directory hierarchy src will be created
- *	with the name dst.  If an error occurs, the error will
- *      be returned immediately, and remaining files will not be
- *	processed.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCopyDirectory(
-    CONST char *src,		/* Pathname of directory to be copied
-				 * (UTF-8). */
-    CONST char *dst,		/* Pathname of target directory (UTF-8). */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-    result = DoCopyDirectory(Tcl_DStringValue(&srcString),
-	    Tcl_DStringValue(&dstString), errorPtr);
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoCopyDirectory(
-    CONST char *src,		/* Pathname of directory to be copied
-				 * (UTF-8). */
-    CONST char *dst,		/* Pathname of target directory (UTF-8). */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    OSErr err, saveErr;
-    long srcID, tmpDirID;
-    FSSpec srcFileSpec, dstFileSpec, dstDirSpec, tmpDirSpec, tmpFileSpec;
-    Boolean srcIsDirectory, srcLocked;
-    Boolean dstIsDirectory, dstExists;
-    Str31 tmpName;
-
-    err = FSpLocationFromPath(strlen(src), src, &srcFileSpec);
-    if (err == noErr) {
-    	err = FSpGetDirectoryID(&srcFileSpec, &srcID, &srcIsDirectory);
-    }
-    if (err == noErr) {
-        if (srcIsDirectory == false) {
-            err = afpObjectTypeErr;	/* ENOTDIR. */
-        }
-    }
-    if (err == noErr) {
-        err = GetFileSpecs(dst, &dstFileSpec, &dstDirSpec, &dstExists,
-        	&dstIsDirectory);
-    }
-    if (dstExists) {
-        if (dstIsDirectory == false) {
-            err = afpObjectTypeErr;	/* ENOTDIR. */
-        } else {
-            err = dupFNErr;		/* EEXIST. */
-        }
-    }
-    if (err != noErr) {
-        goto done;
-    }        
-    if ((srcFileSpec.vRefNum == dstFileSpec.vRefNum) &&
-    	    (srcFileSpec.parID == dstFileSpec.parID) &&
-            (Pstrequal(srcFileSpec.name, dstFileSpec.name) != 0)) {
-        /*
-         * Copying on top of self.  No-op.
-         */
-                    
-        goto done;
-    }
-
-    /*
-     * This algorthm will work making a copy of the source directory in
-     * the current directory with a new name, in a new directory with the
-     * same name, and in a new directory with a new name:
-     *
-     * 1. Make dstDir/tmpDir.
-     * 2. Copy srcDir/src to dstDir/tmpDir/src
-     * 3. Rename dstDir/tmpDir/src to dstDir/tmpDir/dst (if necessary).
-     * 4. CatMove dstDir/tmpDir/dst to dstDir/dst.
-     * 5. Remove dstDir/tmpDir.
-     */
-                
-    err = FSpGetFLockCompat(&srcFileSpec, &srcLocked);
-    if (srcLocked) {
-        FSpRstFLockCompat(&srcFileSpec);
-    }
-    if (err == noErr) {
-        err = GenerateUniqueName(dstFileSpec.vRefNum, dstFileSpec.parID, 
-    	        dstFileSpec.parID, tmpName);
-    }
-    if (err == noErr) {
-        FSMakeFSSpecCompat(dstFileSpec.vRefNum, dstFileSpec.parID,
-        	tmpName, &tmpDirSpec);
-        err = FSpDirCreateCompat(&tmpDirSpec, smSystemScript, &tmpDirID);
-    }
-    if (err == noErr) {
-	err = FSpDirectoryCopy(&srcFileSpec, &tmpDirSpec, NULL, 0, true,
-	    	CopyErrHandler);
-    }
-    
-    /* 
-     * Even if the Copy failed, Rename/Move whatever did get copied to the
-     * appropriate final destination, if possible.  
-     */
-     
-    saveErr = err;
-    err = noErr;
-    if (Pstrequal(srcFileSpec.name, dstFileSpec.name) == 0) {
-        err = FSMakeFSSpecCompat(tmpDirSpec.vRefNum, tmpDirID, 
-        	srcFileSpec.name, &tmpFileSpec);
-        if (err == noErr) {
-            err = FSpRenameCompat(&tmpFileSpec, dstFileSpec.name);
-        }
-    }
-    if (err == noErr) {
-        err = FSMakeFSSpecCompat(tmpDirSpec.vRefNum, tmpDirID,
-        	dstFileSpec.name, &tmpFileSpec);
-    }
-    if (err == noErr) {
-        err = FSpCatMoveCompat(&tmpFileSpec, &dstDirSpec);
-    }
-    if (err == noErr) {
-        if (srcLocked) {
-            FSpSetFLockCompat(&dstFileSpec);
-        }
-    }
-    
-    FSpDeleteCompat(&tmpDirSpec);
-    
-    if (saveErr != noErr) {
-        err = saveErr;
-    }
-    
-    done:
-    if (err != noErr) {
-        errno = TclMacOSErrorToPosixError(err);
-        if (errorPtr != NULL) {
-            Tcl_ExternalToUtfDString(NULL, dst, -1, errorPtr);
-        }
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyErrHandler --
- *
- *      This procedure is called from the MoreFiles procedure 
- *      FSpDirectoryCopy whenever an error occurs.
- *
- * Results:
- *      False if the condition should not be considered an error, true
- *      otherwise.
- *
- * Side effects:
- *      Since FSpDirectoryCopy() is called only after removing any 
- *      existing target directories, there shouldn't be any errors.
- *      
- *----------------------------------------------------------------------
- */
-
-static pascal Boolean 
-CopyErrHandler(
-    OSErr error,		/* Error that occured */
-    short failedOperation,	/* operation that caused the error */
-    short srcVRefNum,		/* volume ref number of source */
-    long srcDirID,		/* directory id of source */
-    StringPtr srcName,		/* name of source */
-    short dstVRefNum,		/* volume ref number of dst */
-    long dstDirID,		/* directory id of dst */
-    StringPtr dstName)		/* name of dst directory */
-{
-    return true;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpRemoveDirectory, DoRemoveDirectory --
- *
- *	Removes directory (and its contents, if the recursive flag is set).
- *
- * Results:
- *	If the directory was successfully removed, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  Some possible values for errno are:
- *
- *	EACCES:     path directory can't be read and/or written.
- *	EEXIST:	    path is a non-empty directory.
- *	EINVAL:	    path is a root directory.
- *	ENOENT:	    path doesn't exist or is "".
- * 	ENOTDIR:    path is not a directory.
- *
- * Side effects:
- *	Directory removed.  If an error occurs, the error will be returned
- *	immediately, and remaining files will not be deleted.
- *
- *---------------------------------------------------------------------------
- */
- 
-int
-TclpRemoveDirectory(
-    CONST char *path,		/* Pathname of directory to be removed
-				 * (UTF-8). */
-    int recursive,		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoRemoveDirectory(Tcl_DStringValue(&pathString), recursive, 
-    	    errorPtr);
-    Tcl_DStringFree(&pathString);
-
-    return result;
-}
-
-static int
-DoRemoveDirectory(
-    CONST char *path,		/* Pathname of directory to be removed
-				 * (native). */
-    int recursive,		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    long dirID;
-    int locked;
-    Boolean isDirectory;
-    CInfoPBRec pb;
-    Str255 fileName;
-
-
-    locked = 0;
-    err = FSpLocationFromPath(strlen(path), path, &fileSpec);
-    if (err != noErr) {
-        goto done;
-    }   
-
-    /*
-     * Since FSpDeleteCompat will delete a file, make sure this isn't
-     * a file first.
-     */
-         
-    isDirectory = 1;
-    FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    if (isDirectory == 0) {
-        errno = ENOTDIR;
-        return TCL_ERROR;
-    }
-    
-    err = FSpDeleteCompat(&fileSpec);
-    if (err == fLckdErr) {
-        locked = 1;
-    	FSpRstFLockCompat(&fileSpec);
-    	err = FSpDeleteCompat(&fileSpec);
-    }
-    if (err == noErr) {
-	return TCL_OK;
-    }
-    if (err != fBsyErr) {
-        goto done;
-    }
-     
-    if (recursive == 0) {
-	/*
-	 * fBsyErr means one of three things: file busy, directory not empty, 
-	 * or working directory control block open.  Determine if directory
-	 * is empty. If directory is not empty, return EEXIST.
-	 */
-
-	pb.hFileInfo.ioVRefNum = fileSpec.vRefNum;
-	pb.hFileInfo.ioDirID = dirID;
-	pb.hFileInfo.ioNamePtr = (StringPtr) fileName;
-	pb.hFileInfo.ioFDirIndex = 1;
-	if (PBGetCatInfoSync(&pb) == noErr) {
-	    err = dupFNErr;	/* EEXIST */
-	    goto done;
-	}
-    }
-	
-    /*
-     * DeleteDirectory removes a directory and all its contents, including
-     * any locked files.  There is no interface to get the name of the 
-     * file that caused the error, if an error occurs deleting this tree,
-     * unless we rewrite DeleteDirectory ourselves.
-     */
-	 
-    err = DeleteDirectory(fileSpec.vRefNum, dirID, NULL);
-
-    done:
-    if (err != noErr) {
-	if (errorPtr != NULL) {
-	    Tcl_UtfToExternalDString(NULL, path, -1, errorPtr);
-	}
-        if (locked) {
-            FSpSetFLockCompat(&fileSpec);
-        }
-    	errno = TclMacOSErrorToPosixError(err);
-    	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-			    
-/*
- *---------------------------------------------------------------------------
- *
- * GenerateUniqueName --
- *
- * 	Generate a filename that is not in either of the two specified
- *	directories (on the same volume). 
- *
- * Results:
- *	Standard macintosh error.  On success, uniqueName is filled with 
- *	the name of the temporary file.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */ 
- 
-static OSErr
-GenerateUniqueName(
-    short vRefNum,		/* Volume on which the following directories
-    				 * are located. */		
-    long dirID1,		/* ID of first directory. */
-    long dirID2,		/* ID of second directory.  May be the same
-    				 * as the first. */
-    Str31 uniqueName)		/* Filled with filename for a file that is
-    				 * not located in either of the above two
-    				 * directories. */
-{
-    OSErr err;
-    long i;
-    CInfoPBRec pb;
-    static unsigned char hexStr[16] = "0123456789ABCDEF";
-    static long startSeed = 248923489;
-    
-    pb.hFileInfo.ioVRefNum = vRefNum;
-    pb.hFileInfo.ioFDirIndex = 0;
-    pb.hFileInfo.ioNamePtr = uniqueName;
-
-    while (1) {
-        startSeed++;		
-	pb.hFileInfo.ioNamePtr[0] = 8;
-	for (i = 1; i <= 8; i++) {
-	    pb.hFileInfo.ioNamePtr[i] = hexStr[((startSeed >> ((8-i)*4)) & 0xf)];
-	}
-	pb.hFileInfo.ioDirID = dirID1;
-	err = PBGetCatInfoSync(&pb);
-	if (err == fnfErr) {
-	    if (dirID1 != dirID2) {
-		pb.hFileInfo.ioDirID = dirID2;
-		err = PBGetCatInfoSync(&pb);
-	    }
-	    if (err == fnfErr) {
-	        return noErr;
-	    }
-	}
-	if (err == noErr) {
-	    continue;
-	} 
-	return err;
-    }
-} 
-
-/*
- *---------------------------------------------------------------------------
- *
- * GetFileSpecs --
- *
- *	Gets FSSpecs for the specified path and its parent directory.
- *
- * Results:
- *	The return value is noErr if there was no error getting FSSpecs,
- *	otherwise it is an error describing the problem.  Fills buffers 
- *	with information, as above.  
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static OSErr
-GetFileSpecs(
-    CONST char *path,		/* The path to query. */
-    FSSpec *pathSpecPtr,	/* Filled with information about path. */
-    FSSpec *dirSpecPtr,		/* Filled with information about path's
-    				 * parent directory. */
-    Boolean *pathExistsPtr,	/* Set to true if path actually exists, 
-    				 * false if it doesn't or there was an 
-    				 * error reading the specified path. */
-    Boolean *pathIsDirectoryPtr)/* Set to true if path is itself a directory,
-    				 * otherwise false. */
-{
-    char *dirName;
-    OSErr err;
-    int argc;
-    char **argv;
-    long d;
-    Tcl_DString buffer;
-        
-    *pathExistsPtr = false;
-    *pathIsDirectoryPtr = false;
-    
-    Tcl_DStringInit(&buffer);
-    Tcl_SplitPath(path, &argc, &argv);
-    if (argc == 1) {
-        dirName = ":";
-    } else {
-        dirName = Tcl_JoinPath(argc - 1, argv, &buffer);
-    }
-    err = FSpLocationFromPath(strlen(dirName), dirName, dirSpecPtr);
-    Tcl_DStringFree(&buffer);
-    ckfree((char *) argv);
-
-    if (err == noErr) {
-        err = FSpLocationFromPath(strlen(path), path, pathSpecPtr);
-        if (err == noErr) {
-            *pathExistsPtr = true;
-            err = FSpGetDirectoryID(pathSpecPtr, &d, pathIsDirectoryPtr);
-        } else if (err == fnfErr) {
-            err = noErr;
-        }
-    }
-    return err;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * FSpGetFLockCompat --
- *
- *	Determines if there exists a software lock on the specified
- *	file.  The software lock could prevent the file from being 
- *	renamed or moved.
- *
- * Results:
- *	Standard macintosh error code.  
- *
- * Side effects:
- *	None.
- *
- *
- *-------------------------------------------------------------------------
- */
- 
-OSErr
-FSpGetFLockCompat(
-    const FSSpec *specPtr,	/* File to query. */
-    Boolean *lockedPtr)		/* Set to true if file is locked, false
-    				 * if it isn't or there was an error reading
-    				 * specified file. */
-{
-    CInfoPBRec pb;
-    OSErr err;
-    
-    pb.hFileInfo.ioVRefNum = specPtr->vRefNum;
-    pb.hFileInfo.ioDirID = specPtr->parID;
-    pb.hFileInfo.ioNamePtr = (StringPtr) specPtr->name;
-    pb.hFileInfo.ioFDirIndex = 0;
-    
-    err = PBGetCatInfoSync(&pb);
-    if ((err == noErr) && (pb.hFileInfo.ioFlAttrib & 0x01)) {
-        *lockedPtr = true;
-    } else {
-        *lockedPtr = false;
-    }
-    return err;
-}
-    
-/*
- *----------------------------------------------------------------------
- *
- * Pstrequal --
- *
- *      Pascal string compare. 
- *
- * Results:
- *      Returns 1 if strings equal, 0 otherwise.
- *
- * Side effects:
- *      None.
- *      
- *----------------------------------------------------------------------
- */
-
-static int 
-Pstrequal (
-    ConstStr255Param stringA,	/* Pascal string A */
-    ConstStr255Param stringB)   /* Pascal string B */
-{
-    int i, len;
-    
-    len = *stringA;
-    for (i = 0; i <= len; i++) {
-        if (*stringA++ != *stringB++) {
-            return 0;
-        }
-    }
-    return 1;
-}
-    
-/*
- *----------------------------------------------------------------------
- *
- * GetFileFinderAttributes --
- *
- *	Returns a Tcl_Obj containing the value of a file attribute
- *	which is part of the FInfo record. Which attribute is controlled
- *	by objIndex.
- *
- * Results:
- *      Returns a standard TCL error. If the return value is TCL_OK,
- *	the new creator or file type object is put into attributePtrPtr.
- *	The object will have ref count 0. If there is an error,
- *	attributePtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-GetFileFinderAttributes(
-    Tcl_Interp *interp,		/* The interp to report errors with. */
-    int objIndex,		/* The index of the attribute option. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    FInfo finfo;
-    
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    
-    if (err == noErr) {
-    	err = FSpGetFInfo(&fileSpec, &finfo);
-    }
-    
-    if (err == noErr) {
-    	switch (objIndex) {
-    	    case MAC_CREATOR_ATTRIBUTE:
-    	    	*attributePtrPtr = Tcl_NewOSTypeObj(finfo.fdCreator);
-    	    	break;
-    	    case MAC_HIDDEN_ATTRIBUTE:
-    	    	*attributePtrPtr = Tcl_NewBooleanObj(finfo.fdFlags
-    	    		& kIsInvisible);
-    	    	break;
-    	    case MAC_TYPE_ATTRIBUTE:
-    	    	*attributePtrPtr = Tcl_NewOSTypeObj(finfo.fdType);
-    	    	break;
-    	}
-    } else if (err == fnfErr) {
-    	long dirID;
-    	Boolean isDirectory = 0;
-    	
-    	err = FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    	if ((err == noErr) && isDirectory) {
-    	    if (objIndex == MAC_HIDDEN_ATTRIBUTE) {
-    	    	*attributePtrPtr = Tcl_NewBooleanObj(0);
-    	    } else {
-    	    	*attributePtrPtr = Tcl_NewOSTypeObj('Fldr');
-    	    }
-    	}
-    }
-    
-    if (err != noErr) {
-    	errno = TclMacOSErrorToPosixError(err);
-    	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-    		"could not read \"", fileName, "\": ",
-    		Tcl_PosixError(interp), (char *) NULL);
-    	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetFileReadOnly --
- *
- *	Returns a Tcl_Obj containing a Boolean value indicating whether
- *	or not the file is read-only. The object will have ref count 0.
- *	This procedure just checks the Finder attributes; it does not
- *	check AppleShare sharing attributes.
- *
- * Results:
- *      Returns a standard TCL error. If the return value is TCL_OK,
- *	the new creator type object is put into readOnlyPtrPtr.
- *	If there is an error, readOnlyPtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-GetFileReadOnly(
-    Tcl_Interp *interp,		/* The interp to report errors with. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj **readOnlyPtrPtr)	/* A pointer to return the object with. */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    CInfoPBRec paramBlock;
-    
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    
-    if (err == noErr) {
-    	if (err == noErr) {
-    	    paramBlock.hFileInfo.ioCompletion = NULL;
-    	    paramBlock.hFileInfo.ioNamePtr = fileSpec.name;
-    	    paramBlock.hFileInfo.ioVRefNum = fileSpec.vRefNum;
-    	    paramBlock.hFileInfo.ioFDirIndex = 0;
-    	    paramBlock.hFileInfo.ioDirID = fileSpec.parID;
-    	    err = PBGetCatInfo(&paramBlock, 0);
-    	    if (err == noErr) {
-    	    
-    	    	/*
-    	    	 * For some unknown reason, the Mac does not give
-    	    	 * symbols for the bits in the ioFlAttrib field.
-    	    	 * 1 -> locked.
-    	    	 */
-    	    
-    	    	*readOnlyPtrPtr = Tcl_NewBooleanObj(
-    	    		paramBlock.hFileInfo.ioFlAttrib & 1);
-    	    }
-    	}
-    }
-    if (err != noErr) {
-    	errno = TclMacOSErrorToPosixError(err);
-    	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-    		"could not read \"", fileName, "\": ",
-    		Tcl_PosixError(interp), (char *) NULL);
-    	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetFileFinderAttributes --
- *
- *	Sets the file to the creator or file type given by attributePtr.
- *	objIndex determines whether the creator or file type is set.
- *
- * Results:
- *	Returns a standard TCL error.
- *
- * Side effects:
- *      The file's attribute is set.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-SetFileFinderAttributes(
-    Tcl_Interp *interp,		/* The interp to report errors with. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj *attributePtr)	/* The command line object. */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    FInfo finfo;
-    
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    
-    if (err == noErr) {
-    	err = FSpGetFInfo(&fileSpec, &finfo);
-    }
-    
-    if (err == noErr) {
-    	switch (objIndex) {
-    	    case MAC_CREATOR_ATTRIBUTE:
-    	    	if (Tcl_GetOSTypeFromObj(interp, attributePtr,
-    	    		&finfo.fdCreator) != TCL_OK) {
-    	    	    return TCL_ERROR;
-    	    	}
-    	    	break;
-    	    case MAC_HIDDEN_ATTRIBUTE: {
-    	    	int hidden;
-    	    	
-    	    	if (Tcl_GetBooleanFromObj(interp, attributePtr, &hidden)
-    	    		!= TCL_OK) {
-    	    	    return TCL_ERROR;
-    	    	}
-    	    	if (hidden) {
-    	    	    finfo.fdFlags |= kIsInvisible;
-    	    	} else {
-    	    	    finfo.fdFlags &= ~kIsInvisible;
-    	    	}
-    	    	break;
-    	    }
-    	    case MAC_TYPE_ATTRIBUTE:
-    	    	if (Tcl_GetOSTypeFromObj(interp, attributePtr,
-    	    		&finfo.fdType) != TCL_OK) {
-    	    	    return TCL_ERROR;
-    	    	}
-    	    	break;
-    	}
-    	err = FSpSetFInfo(&fileSpec, &finfo);
-    } else if (err == fnfErr) {
-    	long dirID;
-    	Boolean isDirectory = 0;
-    	
-    	err = FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    	if ((err == noErr) && isDirectory) {
-    	    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
-    	    Tcl_AppendStringsToObj(resultPtr, "cannot set ",
-    	    	    tclpFileAttrStrings[objIndex], ": \"",
-    	    	    fileName, "\" is a directory", (char *) NULL);
-    	    return TCL_ERROR;
-    	}
-    }
-    
-    if (err != noErr) {
-    	errno = TclMacOSErrorToPosixError(err);
-    	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-    		"could not read \"", fileName, "\": ",
-    		Tcl_PosixError(interp), (char *) NULL);
-    	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetFileReadOnly --
- *
- *	Sets the file to be read-only according to the Boolean value
- *	given by hiddenPtr.
- *
- * Results:
- *	Returns a standard TCL error.
- *
- * Side effects:
- *      The file's attribute is set.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-SetFileReadOnly(
-    Tcl_Interp *interp,		/* The interp to report errors with. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj *readOnlyPtr)	/* The command line object. */
-{
-    OSErr err;
-    FSSpec fileSpec;
-    HParamBlockRec paramBlock;
-    int hidden;
-    
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    
-    if (err == noErr) {
-    	if (Tcl_GetBooleanFromObj(interp, readOnlyPtr, &hidden) != TCL_OK) {
-    	    return TCL_ERROR;
-    	}
-    
-    	paramBlock.fileParam.ioCompletion = NULL;
-    	paramBlock.fileParam.ioNamePtr = fileSpec.name;
-    	paramBlock.fileParam.ioVRefNum = fileSpec.vRefNum;
-    	paramBlock.fileParam.ioDirID = fileSpec.parID;
-    	if (hidden) {
-    	    err = PBHSetFLock(&paramBlock, 0);
-    	} else {
-    	    err = PBHRstFLock(&paramBlock, 0);
-    	}
-    }
-    
-    if (err == fnfErr) {
-    	long dirID;
-    	Boolean isDirectory = 0;
-    	err = FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    	if ((err == noErr) && isDirectory) {
-    	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-    	    	    "cannot set a directory to read-only when File Sharing is turned off",
-    	    	    (char *) NULL);
-    	    return TCL_ERROR;
-    	} else {
-    	    err = fnfErr;
-    	}
-    }
-    
-    if (err != noErr) {
-    	errno = TclMacOSErrorToPosixError(err);
-    	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-    		"could not read \"", fileName, "\": ",
-    		Tcl_PosixError(interp), (char *) NULL);
-    	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpListVolumes --
- *
- *	Lists the currently mounted volumes
- *
- * Results:
- *	A standard Tcl result.  Will always be TCL_OK, since there is no way
- *	that this command can fail.  Also, the interpreter's result is set to 
- *	the list of volumes.
- *
- * Side effects:
- *	None
- *
- *---------------------------------------------------------------------------
- */
-int
-TclpListVolumes( 
-		Tcl_Interp *interp)    /* Interpreter to which to pass the volume list */
-{
-    HParamBlockRec pb;
-    Str255 name;
-    OSErr theError = noErr;
-    Tcl_Obj *resultPtr, *elemPtr;
-    short volIndex = 1;
-    Tcl_DString dstr;
-
-    resultPtr = Tcl_NewObj();
-        
-    /*
-     * We use two facts:
-     * 1) The Mac volumes are enumerated by the ioVolIndex parameter of
-     * the HParamBlockRec.  They run through the integers contiguously, 
-     * starting at 1.  
-     * 2) PBHGetVInfoSync returns an error when you ask for a volume index
-     * that does not exist.
-     * 
-     */
-        
-    while ( 1 ) {
-        pb.volumeParam.ioNamePtr = (StringPtr) &name;
-        pb.volumeParam.ioVolIndex = volIndex;
-                
-        theError = PBHGetVInfoSync(&pb);
-
-        if ( theError != noErr ) {
-            break;
-        }
-        
-        Tcl_ExternalToUtfDString(NULL, (char *) &name[1], name[0], &dstr);  
-        elemPtr = Tcl_NewStringObj(Tcl_DStringValue(&dstr),
-		Tcl_DStringLength(&dstr));
-        Tcl_AppendToObj(elemPtr, ":", 1);
-        Tcl_ListObjAppendElement(interp, resultPtr, elemPtr);
-        
-        Tcl_DStringFree(&dstr);
-                
-        volIndex++;             
-    }
-        
-    Tcl_SetObjResult(interp, resultPtr);
-    return TCL_OK;      
-}
-
diff --git a/mac/tclMacFile.c b/mac/tclMacFile.c
deleted file mode 100644
index 94582bd..0000000
--- a/mac/tclMacFile.c
+++ /dev/null
@@ -1,832 +0,0 @@
-/* 
- * tclMacFile.c --
- *
- *      This file implements the channel drivers for Macintosh
- *	files.  It also comtains Macintosh version of other Tcl
- *	functions that deal with the file system.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacFile.c,v 1.6 1999/04/16 00:47:20 stanton Exp $
- */
-
-/*
- * Note: This code eventually needs to support async I/O.  In doing this
- * we will need to keep track of all current async I/O.  If exit to shell
- * is called - we shouldn't exit until all asyc I/O completes.
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMacInt.h"
-#include <Aliases.h>
-#include <Errors.h>
-#include <Processes.h>
-#include <Strings.h>
-#include <Types.h>
-#include <MoreFiles.h>
-#include <MoreFilesExtras.h>
-#include <FSpCompat.h>
-
-/*
- * Static variables used by the TclpStat function.
- */
-static int initialized = false;
-static long gmt_offset;
-TCL_DECLARE_MUTEX(gmtMutex)
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FindExecutable --
- *
- *	This procedure computes the absolute path name of the current
- *	application, given its argv[0] value.  However, this
- *	implementation doesn't need the argv[0] value.  NULL
- *	may be passed in its place.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The variable tclExecutableName gets filled in with the file
- *	name for the application, if we figured it out.  If we couldn't
- *	figure it out, Tcl_FindExecutable is set to NULL.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FindExecutable(
-    CONST char *argv0)		/* The value of the application's argv[0]. */
-{
-    ProcessSerialNumber psn;
-    ProcessInfoRec info;
-    Str63 appName;
-    FSSpec fileSpec;
-    int pathLength;
-    Handle pathName = NULL;
-    OSErr err;
-    Tcl_DString ds;
-    
-    TclInitSubsystems(argv0);
-    
-    GetCurrentProcess(&psn);
-    info.processInfoLength = sizeof(ProcessInfoRec);
-    info.processName = appName;
-    info.processAppSpec = &fileSpec;
-    GetProcessInformation(&psn, &info);
-
-    if (tclExecutableName != NULL) {
-	ckfree(tclExecutableName);
-	tclExecutableName = NULL;
-    }
-    
-    err = FSpPathFromLocation(&fileSpec, &pathLength, &pathName);
-    HLock(pathName);
-    Tcl_ExternalToUtfDString(NULL, *pathName, pathLength, &ds);
-    HUnlock(pathName);
-    DisposeHandle(pathName);	
-
-    tclExecutableName = (char *) ckalloc((unsigned) 
-    	    (Tcl_DStringLength(&ds) + 1));
-    strcpy(tclExecutableName, Tcl_DStringValue(&ds));
-    Tcl_DStringFree(&ds);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMatchFiles --
- *
- *	This routine is used by the globbing code to search a
- *	directory for all files which match a given pattern.
- *
- * Results: 
- *	If the tail argument is NULL, then the matching files are
- *	added to the the interp's result.  Otherwise, TclDoGlob is called
- *	recursively for each matching subdirectory.  The return value
- *	is a standard Tcl result indicating whether an error occurred
- *	in globbing.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------- */
-
-int
-TclpMatchFiles(
-    Tcl_Interp *interp,		/* Interpreter to receive results. */
-    char *separators,		/* Directory separators to pass to TclDoGlob. */
-    Tcl_DString *dirPtr,	/* Contains path to directory to search. */
-    char *pattern,		/* Pattern to match against. */
-    char *tail)			/* Pointer to end of pattern.  Tail must
-				 * point to a location in pattern and must
-				 * not be static.*/
-{
-    char *dirName, *patternEnd = tail;
-    char savedChar;
-    int result = TCL_OK;
-    int baseLength = Tcl_DStringLength(dirPtr);
-    CInfoPBRec pb;
-    OSErr err;
-    FSSpec dirSpec;
-    Boolean isDirectory;
-    long dirID;
-    short itemIndex;
-    Str255 fileName;
-    Tcl_DString fileString;    
-
-    /*
-     * Make sure that the directory part of the name really is a
-     * directory.
-     */
-
-    dirName = dirPtr->string;
-    FSpLocationFromPath(strlen(dirName), dirName, &dirSpec);
-    err = FSpGetDirectoryID(&dirSpec, &dirID, &isDirectory);
-    if ((err != noErr) || !isDirectory) {
-	return TCL_OK;
-    }
-
-    /*
-     * Now open the directory for reading and iterate over the contents.
-     */
-
-    pb.hFileInfo.ioVRefNum = dirSpec.vRefNum;
-    pb.hFileInfo.ioDirID = dirID;
-    pb.hFileInfo.ioNamePtr = (StringPtr) fileName;
-    pb.hFileInfo.ioFDirIndex = itemIndex = 1;
-    
-    /*
-     * Clean up the end of the pattern and the tail pointer.  Leave
-     * the tail pointing to the first character after the path separator
-     * following the pattern, or NULL.  Also, ensure that the pattern
-     * is null-terminated.
-     */
-
-    if (*tail == '\\') {
-	tail++;
-    }
-    if (*tail == '\0') {
-	tail = NULL;
-    } else {
-	tail++;
-    }
-    savedChar = *patternEnd;
-    *patternEnd = '\0';
-
-    while (1) {
-	pb.hFileInfo.ioFDirIndex = itemIndex;
-	pb.hFileInfo.ioDirID = dirID;
-	err = PBGetCatInfoSync(&pb);
-	if (err != noErr) {
-	    break;
-	}
-
-	/*
-	 * Now check to see if the file matches.  If there are more
-	 * characters to be processed, then ensure matching files are
-	 * directories before calling TclDoGlob. Otherwise, just add
-	 * the file to the result.
-	 */
-	 
-	Tcl_ExternalToUtfDString(NULL, (char *) fileName + 1, fileName[0],
-		&fileString);
-	if (Tcl_StringMatch(Tcl_DStringValue(&fileString), pattern)) {
-	    Tcl_DStringSetLength(dirPtr, baseLength);
-	    Tcl_DStringAppend(dirPtr, Tcl_DStringValue(&fileString), -1);
-	    if (tail == NULL) {
-		if ((dirPtr->length > 1) &&
-			(strchr(dirPtr->string+1, ':') == NULL)) {
-		    Tcl_AppendElement(interp, dirPtr->string+1);
-		} else {
-		    Tcl_AppendElement(interp, dirPtr->string);
-		}
-	    } else if ((pb.hFileInfo.ioFlAttrib & ioDirMask) != 0) {
-		Tcl_DStringAppend(dirPtr, ":", 1);
-		result = TclDoGlob(interp, separators, dirPtr, tail);
-		if (result != TCL_OK) {
-		    Tcl_DStringFree(&fileString);
-		    break;
-		}
-	    }
-	}
-	Tcl_DStringFree(&fileString);
-	
-	itemIndex++;
-    }
-    *patternEnd = savedChar;
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpAccess --
- *
- *	This function replaces the library version of access().
- *
- * Results:
- *	See access documentation.
- *
- * Side effects:
- *	See access documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpAccess(
-    CONST char *path,		/* Path of file to access (UTF-8). */
-    int mode)			/* Permission setting. */
-{
-    HFileInfo fpb;
-    HVolumeParam vpb;
-    OSErr err;
-    FSSpec fileSpec;
-    Boolean isDirectory;
-    long dirID;
-    Tcl_DString ds;
-    char *native;
-    int full_mode = 0;
-
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    err = FSpLocationFromPath(Tcl_DStringLength(&ds), native, &fileSpec);
-    Tcl_DStringFree(&ds);
-
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return -1;
-    }
-    
-    /*
-     * Fill the fpb & vpb struct up with info about file or directory.
-     */
-    FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    vpb.ioVRefNum = fpb.ioVRefNum = fileSpec.vRefNum;
-    vpb.ioNamePtr = fpb.ioNamePtr = fileSpec.name;
-    if (isDirectory) {
-	fpb.ioDirID = fileSpec.parID;
-    } else {
-	fpb.ioDirID = dirID;
-    }
-
-    fpb.ioFDirIndex = 0;
-    err = PBGetCatInfoSync((CInfoPBPtr)&fpb);
-    if (err == noErr) {
-	vpb.ioVolIndex = 0;
-	err = PBHGetVInfoSync((HParmBlkPtr)&vpb);
-	if (err == noErr) {
-	    /* 
-	     * Use the Volume Info & File Info to determine
-	     * access information.  If we have got this far
-	     * we know the directory is searchable or the file
-	     * exists.  (We have F_OK)
-	     */
-
-	    /*
-	     * Check to see if the volume is hardware or
-	     * software locked.  If so we arn't W_OK.
-	     */
-	    if (mode & W_OK) {
-		if ((vpb.ioVAtrb & 0x0080) || (vpb.ioVAtrb & 0x8000)) {
-		    errno = EROFS;
-		    return -1;
-		}
-		if (fpb.ioFlAttrib & 0x01) {
-		    errno = EACCES;
-		    return -1;
-		}
-	    }
-	    
-	    /*
-	     * Directories are always searchable and executable.  But only 
-	     * files of type 'APPL' are executable.
-	     */
-	    if (!(fpb.ioFlAttrib & 0x10) && (mode & X_OK)
-	    	&& (fpb.ioFlFndrInfo.fdType != 'APPL')) {
-		return -1;
-	    }
-	}
-    }
-
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return -1;
-    }
-    
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpChdir --
- *
- *	This function replaces the library version of chdir().
- *
- * Results:
- *	See chdir() documentation.
- *
- * Side effects:
- *	See chdir() documentation.  Also the cache maintained used by 
- *	TclGetCwd() is deallocated and set to NULL.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpChdir(
-    CONST char *dirName)     	/* Path to new working directory (UTF-8). */
-{
-    FSSpec spec;
-    OSErr err;
-    Boolean isFolder;
-    long dirID;
-    Tcl_DString ds;
-    char *native;
-
-    native = Tcl_UtfToExternalDString(NULL, dirName, -1, &ds);
-    err = FSpLocationFromPath(Tcl_DStringLength(&ds), native, &spec);
-    Tcl_DStringFree(&ds);
-
-    if (err != noErr) {
-	errno = ENOENT;
-	return -1;
-    }
-    
-    err = FSpGetDirectoryID(&spec, &dirID, &isFolder);
-    if (err != noErr) {
-	errno = ENOENT;
-	return -1;
-    }
-
-    if (isFolder != true) {
-	errno = ENOTDIR;
-	return -1;
-    }
-
-    err = FSpSetDefaultDir(&spec);
-    if (err != noErr) {
-	switch (err) {
-	    case afpAccessDenied:
-		errno = EACCES;
-		break;
-	    default:
-		errno = ENOENT;
-	}
-	return -1;
-    }
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetCwd --
- *
- *	This function replaces the library version of getcwd().
- *
- * Results:
- *	The result is a pointer to a string specifying the current
- *	directory, or NULL if the current directory could not be
- *	determined.  If NULL is returned, an error message is left in the
- *	interp's result.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetCwd(
-    Tcl_Interp *interp,		/* If non-NULL, used for error reporting. */
-    Tcl_DString *bufferPtr)	/* Uninitialized or free DString filled
-				 * with name of current directory. */
-{
-    FSSpec theSpec;
-    int length;
-    Handle pathHandle = NULL;
-    
-    if (FSpGetDefaultDir(&theSpec) != noErr) {
- 	if (interp != NULL) {
-	    Tcl_SetResult(interp, "error getting working directory name",
-		    TCL_STATIC);
-	}
-	return NULL;
-    }
-    if (FSpPathFromLocation(&theSpec, &length, &pathHandle) != noErr) {
- 	if (interp != NULL) {
-	     Tcl_SetResult(interp, "error getting working directory name",
-		    TCL_STATIC);
-	}
-	return NULL;
-    }
-    HLock(pathHandle);
-    Tcl_ExternalToUtfDString(NULL, *pathHandle, length, bufferPtr);
-    HUnlock(pathHandle);
-    DisposeHandle(pathHandle);	
-
-    return Tcl_DStringValue(bufferPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpReadlink --
- *
- *	This function replaces the library version of readlink().
- *
- * Results:
- *	The result is a pointer to a string specifying the contents
- *	of the symbolic link given by 'path', or NULL if the symbolic
- *	link could not be read.  Storage for the result string is
- *	allocated in bufferPtr; the caller must call Tcl_DStringFree()
- *	when the result is no longer needed.
- *
- * Side effects:
- *	See readlink() documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-TclpReadlink(
-    CONST char *path,		/* Path of file to readlink (UTF-8). */
-    Tcl_DString *linkPtr)	/* Uninitialized or free DString filled
-				 * with contents of link (UTF-8). */
-{
-    HFileInfo fpb;
-    OSErr err;
-    FSSpec fileSpec;
-    Boolean isDirectory;
-    Boolean wasAlias;
-    long dirID;
-    char fileName[257];
-    char *end;
-    Handle theString = NULL;
-    int pathSize;
-    Tcl_DString ds;
-    char *native;
-    
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-
-    /*
-     * Remove ending colons if they exist.
-     */
-     
-    while ((strlen(native) != 0) && (path[strlen(native) - 1] == ':')) {
-	native[strlen(native) - 1] = NULL;
-    }
-
-    if (strchr(native, ':') == NULL) {
-	strcpy(fileName + 1, native);
-	native = NULL;
-    } else {
-	end = strrchr(native, ':') + 1;
-	strcpy(fileName + 1, end);
-	*end = NULL;
-    }
-    fileName[0] = (char) strlen(fileName + 1);
-    
-    /*
-     * Create the file spec for the directory of the file
-     * we want to look at.
-     */
-
-    if (native != NULL) {
-	err = FSpLocationFromPath(strlen(native), native, &fileSpec);
-	if (err != noErr) {
-	    Tcl_DStringFree(&ds);
-	    errno = EINVAL;
-	    return NULL;
-	}
-    } else {
-	FSMakeFSSpecCompat(0, 0, NULL, &fileSpec);
-    }
-    Tcl_DStringFree(&ds);
-    
-    /*
-     * Fill the fpb struct up with info about file or directory.
-     */
-
-    FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    fpb.ioVRefNum = fileSpec.vRefNum;
-    fpb.ioDirID = dirID;
-    fpb.ioNamePtr = (StringPtr) fileName;
-
-    fpb.ioFDirIndex = 0;
-    err = PBGetCatInfoSync((CInfoPBPtr)&fpb);
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return NULL;
-    } else {
-	if (fpb.ioFlAttrib & 0x10) {
-	    errno = EINVAL;
-	    return NULL;
-	} else {
-	    if (fpb.ioFlFndrInfo.fdFlags & 0x8000) {
-		/*
-		 * The file is a link!
-		 */
-	    } else {
-		errno = EINVAL;
-		return NULL;
-	    }
-	}
-    }
-    
-    /*
-     * If we are here it's really a link - now find out
-     * where it points to.
-     */
-    err = FSMakeFSSpecCompat(fileSpec.vRefNum, dirID, (StringPtr) fileName, 
-    	    &fileSpec);
-    if (err == noErr) {
-	err = ResolveAliasFile(&fileSpec, true, &isDirectory, &wasAlias);
-    }
-    if ((err == fnfErr) || wasAlias) {
-	err = FSpPathFromLocation(&fileSpec, &pathSize, &theString);
-	if (err != noErr) {
-	    DisposeHandle(theString);
-	    errno = ENAMETOOLONG;
-	    return NULL;
-	}
-    } else {
-    	errno = EINVAL;
-	return NULL;
-    }
-    
-    Tcl_ExternalToUtfDString(NULL, *theString, pathSize, linkPtr);
-    DisposeHandle(theString);
-    
-    return Tcl_DStringValue(linkPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpStat --
- *
- *	This function replaces the library version of stat().
- *
- * Results:
- *	See stat() documentation.
- *
- * Side effects:
- *	See stat() documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpStat(
-    CONST char *path,		/* Path of file to stat (in UTF-8). */
-    struct stat *bufPtr)	/* Filled with results of stat call. */
-{
-    HFileInfo fpb;
-    HVolumeParam vpb;
-    OSErr err;
-    FSSpec fileSpec;
-    Boolean isDirectory;
-    long dirID;
-    Tcl_DString ds;
-    
-    path = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    err = FSpLocationFromPath(Tcl_DStringLength(&ds), path, &fileSpec);
-    Tcl_DStringFree(&ds);
-    
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-	return -1;
-    }
-    
-    /*
-     * Fill the fpb & vpb struct up with info about file or directory.
-     */
-     
-    FSpGetDirectoryID(&fileSpec, &dirID, &isDirectory);
-    vpb.ioVRefNum = fpb.ioVRefNum = fileSpec.vRefNum;
-    vpb.ioNamePtr = fpb.ioNamePtr = fileSpec.name;
-    if (isDirectory) {
-	fpb.ioDirID = fileSpec.parID;
-    } else {
-	fpb.ioDirID = dirID;
-    }
-
-    fpb.ioFDirIndex = 0;
-    err = PBGetCatInfoSync((CInfoPBPtr)&fpb);
-    if (err == noErr) {
-	vpb.ioVolIndex = 0;
-	err = PBHGetVInfoSync((HParmBlkPtr)&vpb);
-	if (err == noErr && bufPtr != NULL) {
-	    /* 
-	     * Files are always readable by everyone.
-	     */
-	     
-	    bufPtr->st_mode = S_IRUSR | S_IRGRP | S_IROTH;
-
-	    /* 
-	     * Use the Volume Info & File Info to fill out stat buf.
-	     */
-	    if (fpb.ioFlAttrib & 0x10) {
-		bufPtr->st_mode |= S_IFDIR;
-		bufPtr->st_nlink = 2;
-	    } else {
-		bufPtr->st_nlink = 1;
-		if (fpb.ioFlFndrInfo.fdFlags & 0x8000) {
-		    bufPtr->st_mode |= S_IFLNK;
-		} else {
-		    bufPtr->st_mode |= S_IFREG;
-		}
-	    }
-	    if ((fpb.ioFlAttrib & 0x10) || (fpb.ioFlFndrInfo.fdType == 'APPL')) {
-	    	/*
-	    	 * Directories and applications are executable by everyone.
-	    	 */
-	    	 
-	    	bufPtr->st_mode |= S_IXUSR | S_IXGRP | S_IXOTH;
-	    }
-	    if ((fpb.ioFlAttrib & 0x01) == 0){
-	    	/* 
-	    	 * If not locked, then everyone has write acces.
-	    	 */
-	    	 
-	        bufPtr->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
-	    }
-	    bufPtr->st_ino = fpb.ioDirID;
-	    bufPtr->st_dev = fpb.ioVRefNum;
-	    bufPtr->st_uid = -1;
-	    bufPtr->st_gid = -1;
-	    bufPtr->st_rdev = 0;
-	    bufPtr->st_size = fpb.ioFlLgLen;
-	    bufPtr->st_blksize = vpb.ioVAlBlkSiz;
-	    bufPtr->st_blocks = (bufPtr->st_size + bufPtr->st_blksize - 1)
-		/ bufPtr->st_blksize;
-
-	    /*
-	     * The times returned by the Mac file system are in the
-	     * local time zone.  We convert them to GMT so that the
-	     * epoch starts from GMT.  This is also consistant with
-	     * what is returned from "clock seconds".
-	     */
-
-	    Tcl_MutexLock(&gmtMutex);
-	    if (initialized == false) {
-		MachineLocation loc;
-    
-		ReadLocation(&loc);
-		gmt_offset = loc.u.gmtDelta & 0x00ffffff;
-		if (gmt_offset & 0x00800000) {
-		    gmt_offset = gmt_offset | 0xff000000;
-		}
-		initialized = true;
-	    }
-	    Tcl_MutexUnlock(&gmtMutex);
-
-	    bufPtr->st_atime = bufPtr->st_mtime = fpb.ioFlMdDat - gmt_offset;
-	    bufPtr->st_ctime = fpb.ioFlCrDat - gmt_offset;
-	}
-    }
-
-    if (err != noErr) {
-	errno = TclMacOSErrorToPosixError(err);
-    }
-    
-    return (err == noErr ? 0 : -1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitPid --
- *
- *	Fakes a call to wait pid.
- *
- * Results:
- *	Always returns -1.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Pid
-Tcl_WaitPid(
-    Tcl_Pid pid,
-    int *statPtr,
-    int options)
-{
-    return (Tcl_Pid) -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacFOpenHack --
- *
- *	This function replaces fopen.  It supports paths with alises.
- *	Note, remember to undefine the fopen macro!
- *
- * Results:
- *	See fopen documentation.
- *
- * Side effects:
- *	See fopen documentation.
- *
- *----------------------------------------------------------------------
- */
-
-#undef fopen
-FILE *
-TclMacFOpenHack(
-    CONST char *path,
-    CONST char *mode)
-{
-    OSErr err;
-    FSSpec fileSpec;
-    Handle pathString = NULL;
-    int size;
-    FILE * f;
-    
-    err = FSpLocationFromPath(strlen(path), (char *) path, &fileSpec);
-    if ((err != noErr) && (err != fnfErr)) {
-	return NULL;
-    }
-    err = FSpPathFromLocation(&fileSpec, &size, &pathString);
-    if ((err != noErr) && (err != fnfErr)) {
-	return NULL;
-    }
-    
-    HLock(pathString);
-    f = fopen(*pathString, mode);
-    HUnlock(pathString);
-    DisposeHandle(pathString);
-    return f;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacOSErrorToPosixError --
- *
- *	Given a Macintosh OSErr return the appropiate POSIX error.
- *
- * Results:
- *	A Posix error.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMacOSErrorToPosixError(
-    int error)	/* A Macintosh error. */
-{
-    switch (error) {
-	case noErr:
-	    return 0;
-	case bdNamErr:
-	    return ENAMETOOLONG;
-	case afpObjectTypeErr:
-	    return ENOTDIR;
-	case fnfErr:
-	case dirNFErr:
-	    return ENOENT;
-	case dupFNErr:
-	    return EEXIST;
-	case dirFulErr:
-	case dskFulErr:
-	    return ENOSPC;
-	case fBsyErr:
-	    return EBUSY;
-	case tmfoErr:
-	    return ENFILE;
-	case fLckdErr:
-	case permErr:
-	case afpAccessDenied:
-	    return EACCES;
-	case wPrErr:
-	case vLckdErr:
-	    return EROFS;
-	case badMovErr:
-	    return EINVAL;
-	case diffVolErr:
-	    return EXDEV;
-	default:
-	    return EINVAL;
-    }
-}
diff --git a/mac/tclMacInit.c b/mac/tclMacInit.c
deleted file mode 100644
index 6bf6169..0000000
--- a/mac/tclMacInit.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * tclMacInit.c --
- *
- *	Contains the Mac-specific interpreter initialization functions.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacInit.c,v 1.3 1999/04/16 00:47:20 stanton Exp $
- */
-
-#include <AppleEvents.h>
-#include <AEDataModel.h>
-#include <AEObjects.h>
-#include <AEPackObject.h>
-#include <AERegistry.h>
-#include <Files.h>
-#include <Folders.h>
-#include <Gestalt.h>
-#include <TextUtils.h>
-#include <Resources.h>
-#include <Strings.h>
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include "tclPort.h"
-
-/*
- * The following string is the startup script executed in new
- * interpreters.  It looks on the library path and in the resource fork for
- * a script "init.tcl" that is compatible with this version of Tcl.  The
- * init.tcl script does all of the real work of initialization.
- */
- 
-static char initCmd[] = "\
-proc sourcePath {file} {\n\
-  set dirs {}\n\
-  foreach i $::auto_path {\n\
-    set init [file join $i $file.tcl]\n\
-    if {[catch {uplevel #0 [list source $init]}] == 0} {\n\
-      return\n\
-    }\n\
-  }\n\
-  if {[catch {uplevel #0 [list source -rsrc $file]}] == 0} {\n\
-    return\n\
-  }\n\
-  rename sourcePath {}\n\
-  set msg \"can't find $file resource or a usable $file.tcl file\n\"\n\
-  append msg \"in the following directories:\n\"\n\
-  append msg \"    $::auto_path\n\"\n\
-  append msg \" perhaps you need to install Tcl or set your \n\"\n\
-  append msg \"TCL_LIBRARY environment variable?\"\n\
-  error $msg\n\
-}\n\
-if {[info exists env(EXT_FOLDER)]} {\n\
-  lappend tcl_pkgPath [file join $env(EXT_FOLDER) {:Tool Command Language}]\n\
-}\n\
-if {[info exists tcl_pkgPath] == 0} {\n\
-  set tcl_pkgPath {no extension folder}\n\
-}\n\
-sourcePath Init\n\
-sourcePath Auto\n\
-sourcePath Package\n\
-sourcePath History\n\
-sourcePath Word\n\
-rename sourcePath {}";
-
-/*
- * The following structures are used to map the script/language codes of a 
- * font to the name that should be passed to Tcl_GetEncoding() to obtain
- * the encoding for that font.  The set of numeric constants is fixed and 
- * defined by Apple.
- */
- 
-typedef struct Map {
-    int numKey;
-    char *strKey;
-} Map;
- 
-static Map scriptMap[] = {
-    {smRoman,		"macRoman"},
-    {smJapanese,	"macJapan"},
-    {smTradChinese,	"macChinese"},
-    {smKorean,		"macKorean"},
-    {smArabic,		"macArabic"},
-    {smHebrew,		"macHebrew"},
-    {smGreek,		"macGreek"},
-    {smCyrillic,	"macCyrillic"},
-    {smRSymbol,		"macRSymbol"},
-    {smDevanagari,	"macDevanagari"},
-    {smGurmukhi,	"macGurmukhi"},
-    {smGujarati,	"macGujarati"},
-    {smOriya,		"macOriya"},
-    {smBengali,		"macBengali"},
-    {smTamil,		"macTamil"},
-    {smTelugu,		"macTelugu"},
-    {smKannada,		"macKannada"},
-    {smMalayalam,	"macMalayalam"},
-    {smSinhalese,	"macSinhalese"},
-    {smBurmese,		"macBurmese"},
-    {smKhmer,		"macKhmer"},
-    {smThai,		"macThailand"},
-    {smLaotian,		"macLaos"},
-    {smGeorgian,	"macGeorgia"},
-    {smArmenian,	"macArmenia"},
-    {smSimpChinese,	"macSimpChinese"},
-    {smTibetan,		"macTIbet"},
-    {smMongolian,	"macMongolia"},
-    {smGeez,		"macEthiopia"},
-    {smEastEurRoman,	"macCentEuro"},
-    {smVietnamese,	"macVietnam"},
-    {smExtArabic,	"macSindhi"},
-    {NULL,		NULL}
-};    
-
-static Map romanMap[] = {
-    {langCroatian,	"macCroatian"},
-    {langSlovenian,	"macCroatian"},
-    {langIcelandic,	"macIceland"},
-    {langRomanian,	"macRomania"},
-    {langTurkish,	"macTurkish"},
-    {langGreek,		"macGreek"},
-    {NULL,		NULL}
-};
-
-static Map cyrillicMap[] = {
-    {langUkrainian,	"macUkraine"},
-    {langBulgarian,	"macBulgaria"},
-    {NULL,		NULL}
-};
-
-static int		GetFinderFont(int *finderID);
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GetFinderFont --
- *
- *	Gets the "views" font of the Macintosh Finder
- *
- * Results:
- *	Standard Tcl result, and sets finderID to the font family
- *      id for the current finder font.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-static int
-GetFinderFont(int *finderID)
-{
-    OSErr err = noErr;
-    OSType finderPrefs, viewFont = 'vfnt';
-    DescType returnType;
-    Size returnSize;
-    long result, sys8Mask = 0x0800;
-    static AppleEvent outgoingAevt = {typeNull, NULL};
-    AppleEvent returnAevt;
-    AEAddressDesc fndrAddress;
-    AEDesc nullContainer = {typeNull, NULL}, 
-           tempDesc = {typeNull, NULL}, 
-           tempDesc2 = {typeNull, NULL}, 
-           finalDesc = {typeNull, NULL};
-    const OSType finderSignature = 'MACS';
-    
-    
-    if (outgoingAevt.descriptorType == typeNull) {
-        if ((Gestalt(gestaltSystemVersion, &result) != noErr)
-	        || (result >= sys8Mask)) {
-            finderPrefs = 'pfrp';
-        } else {
-	    finderPrefs = 'pvwp';
-        }
-        
-        AECreateDesc(typeApplSignature, &finderSignature,
-		sizeof(finderSignature), &fndrAddress);
-            
-        err = AECreateAppleEvent(kAECoreSuite, kAEGetData, &fndrAddress, 
-                kAutoGenerateReturnID, kAnyTransactionID, &outgoingAevt);
-                
-        AEDisposeDesc(&fndrAddress);
-    
-        /*
-         * The structure is:
-         * the property view font ('vfnt')
-         *    of the property view preferences ('pvwp')
-         *        of the Null Container (i.e. the Finder itself). 
-         */
-         
-        AECreateDesc(typeType, &finderPrefs, sizeof(finderPrefs), &tempDesc);
-        err = CreateObjSpecifier(typeType, &nullContainer, formPropertyID,
-		&tempDesc, true, &tempDesc2);
-        AECreateDesc(typeType, &viewFont, sizeof(viewFont), &tempDesc);
-        err = CreateObjSpecifier(typeType, &tempDesc2, formPropertyID,
-		&tempDesc, true, &finalDesc);
-    
-        AEPutKeyDesc(&outgoingAevt, keyDirectObject, &finalDesc);
-        AEDisposeDesc(&finalDesc);
-    }
-             
-    err = AESend(&outgoingAevt, &returnAevt, kAEWaitReply, kAEHighPriority,
-	    kAEDefaultTimeout, NULL, NULL);
-    if (err == noErr) {
-        err = AEGetKeyPtr(&returnAevt, keyDirectObject, typeInteger, 
-                &returnType, (void *) finderID, sizeof(int), &returnSize);
-        if (err == noErr) {
-            return TCL_OK;
-        }
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclMacGetFontEncoding --
- *
- *	Determine the encoding of the specified font.  The encoding
- *	can be used to convert bytes from UTF-8 into the encoding of
- *	that font.
- *
- * Results:
- *	The return value is a string that specifies the font's encoding
- *	and that can be passed to Tcl_GetEncoding() to construct the
- *	encoding.  If the font's encoding could not be identified, NULL
- *	is returned.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-char *
-TclMacGetFontEncoding(
-    int fontId)
-{
-    int script, lang;
-    char *name;
-    Map *mapPtr;
-    
-    script = FontToScript(fontId);    
-    lang = GetScriptVariable(script, smScriptLang);
-    name = NULL;
-    if (script == smRoman) {
-        for (mapPtr = romanMap; mapPtr->strKey != NULL; mapPtr++) {
-            if (mapPtr->numKey == lang) {
-                name = mapPtr->strKey;
-                break;
-            }
-        }
-    } else if (script == smCyrillic) {
-        for (mapPtr = cyrillicMap; mapPtr->strKey != NULL; mapPtr++) {
-            if (mapPtr->numKey == lang) {
-                name = mapPtr->strKey;
-                break;
-            }
-        }
-    }
-    if (name == NULL) {
-        for (mapPtr = scriptMap; mapPtr->strKey != NULL; mapPtr++) {
-            if (mapPtr->numKey == script) {
-                name = mapPtr->strKey;
-                break;
-            }
-        }
-    }
-    return name;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitPlatform --
- *
- *	Initialize all the platform-dependant things like signals and
- *	floating-point error handling.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitPlatform()
-{
-    tclPlatform = TCL_PLATFORM_MAC;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitLibraryPath --
- *
- *	Initialize the library path at startup.  We have a minor
- *	metacircular problem that we don't know the encoding of the
- *	operating system but we may need to talk to operating system
- *	to find the library directories so that we know how to talk to
- *	the operating system.
- *
- *	We do not know the encoding of the operating system.
- *	We do know that the encoding is some multibyte encoding.
- *	In that multibyte encoding, the characters 0..127 are equivalent
- *	    to ascii.
- *
- *	So although we don't know the encoding, it's safe:
- *	    to look for the last colon character in a path in the encoding.
- *	    to append an ascii string to a path.
- *	    to pass those strings back to the operating system.
- *
- *	But any strings that we remembered before we knew the encoding of
- *	the operating system must be translated to UTF-8 once we know the
- *	encoding so that the rest of Tcl can use those strings.
- *
- *	This call sets the library path to strings in the unknown native
- *	encoding.  TclpSetInitialEncodings() will translate the library
- *	path from the native encoding to UTF-8 as soon as it determines
- *	what the native encoding actually is.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitLibraryPath(argv0)
-    CONST char *argv0;		/* Name of executable from argv[0] to main().
-				 * Not used because we can determine the name
-				 * by querying the module handle. */
-{
-    Tcl_Obj *objPtr, *pathPtr;
-    char *str;
-    Tcl_DString ds;
-    
-    TclMacCreateEnv();
-
-    pathPtr = Tcl_NewObj();
-    
-    str = TclGetEnv("TCL_LIBRARY", &ds);
-    if ((str != NULL) && (str[0] != '\0')) {
-	/*
-	 * If TCL_LIBRARY is set, search there.
-	 */
-	 
-	objPtr = Tcl_NewStringObj(str, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	Tcl_DStringFree(&ds);
-    }
-    
-    objPtr = TclGetLibraryPath();
-    if (objPtr != NULL) {
-        Tcl_ListObjAppendList(NULL, pathPtr, objPtr);
-    }
-    
-    /*
-     * lappend path [file join $env(EXT_FOLDER) \
-     *      ":Tool Command Language:tcl[info version]"
-     */
-
-    str = TclGetEnv("EXT_FOLDER", &ds);
-    if ((str != NULL) && (str[0] != '\0')) {
-        objPtr = Tcl_NewStringObj(str, -1);
-        if (str[strlen(str) - 1] != ':') {
-            Tcl_AppendToObj(objPtr, ":", 1);
-        }
-        Tcl_AppendToObj(objPtr, "Tool Command Language:tcl" TCL_VERSION, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	Tcl_DStringFree(&ds);
-    }    
-    TclSetLibraryPath(pathPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetInitialEncodings --
- *
- *	Based on the locale, determine the encoding of the operating
- *	system and the default encoding for newly opened files.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The Tcl library path is converted from native encoding to UTF-8.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpSetInitialEncodings()
-{
-    CONST char *encoding;
-    Tcl_Obj *pathPtr;
-    int fontId;
-    
-    fontId = 0;
-    GetFinderFont(&fontId);
-    encoding = TclMacGetFontEncoding(fontId);
-    if (encoding == NULL) {
-        encoding = "macRoman";
-    }
-    
-    Tcl_SetSystemEncoding(NULL, encoding);
-    
-    /*
-     * Until the system encoding was actually set, the library path was
-     * actually in the native multi-byte encoding, and not really UTF-8
-     * as advertised.  We cheated as follows:
-     *
-     * 1. It was safe to allow the Tcl_SetSystemEncoding() call to 
-     * append the ASCII chars that make up the encoding's filename to 
-     * the names (in the native encoding) of directories in the library 
-     * path, since all Unix multi-byte encodings have ASCII in the
-     * beginning.
-     *
-     * 2. To open the encoding file, the native bytes in the file name
-     * were passed to the OS, without translating from UTF-8 to native,
-     * because the name was already in the native encoding.
-     *
-     * Now that the system encoding was actually successfully set,
-     * translate all the names in the library path to UTF-8.  That way,
-     * next time we search the library path, we'll translate the names 
-     * from UTF-8 to the system encoding which will be the native 
-     * encoding.
-     */
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr != NULL) {
-    	int i, objc;
-	Tcl_Obj **objv;
-	
-	objc = 0;
-	Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-	for (i = 0; i < objc; i++) {
-	    int length;
-	    char *string;
-	    Tcl_DString ds;
-
-	    string = Tcl_GetStringFromObj(objv[i], &length);
-	    Tcl_ExternalToUtfDString(NULL, string, length, &ds);
-	    Tcl_SetStringObj(objv[i], Tcl_DStringValue(&ds), 
-		    Tcl_DStringLength(&ds));
-	    Tcl_DStringFree(&ds);
-	}
-    }
-
-    /*
-     * Keep the iso8859-1 encoding preloaded.  The IO package uses it for
-     * gets on a binary channel.
-     */
-
-    Tcl_GetEncoding(NULL, "iso8859-1"); 
-}   
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetVariables --
- *
- *	Performs platform-specific interpreter initialization related to
- *	the tcl_library and tcl_platform variables, and other platform-
- *	specific things.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets "tcl_library" and "tcl_platform" Tcl variables.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpSetVariables(interp)
-    Tcl_Interp *interp;
-{
-    long int gestaltResult;
-    int minor, major, objc;
-    Tcl_Obj **objv;
-    char versStr[2 * TCL_INTEGER_SPACE];
-    char *str;
-    Tcl_Obj *pathPtr;
-    Tcl_DString ds;
-
-    str = "no library";
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr != NULL) {
-        objc = 0;
-        Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-        if (objc > 0) {
-            str = Tcl_GetStringFromObj(objv[0], NULL);
-        }
-    }
-    Tcl_SetVar(interp, "tcl_library", str, TCL_GLOBAL_ONLY);
-    
-    if (pathPtr != NULL) {
-        Tcl_SetVar2Ex(interp, "tcl_pkgPath", NULL, pathPtr, TCL_GLOBAL_ONLY);
-    }
-    
-    Tcl_SetVar2(interp, "tcl_platform", "platform", "macintosh",
-	    TCL_GLOBAL_ONLY);
-    Tcl_SetVar2(interp, "tcl_platform", "os", "MacOS", TCL_GLOBAL_ONLY);
-    Gestalt(gestaltSystemVersion, &gestaltResult);
-    major = (gestaltResult & 0x0000FF00) >> 8;
-    minor = (gestaltResult & 0x000000F0) >> 4;
-    sprintf(versStr, "%d.%d", major, minor);
-    Tcl_SetVar2(interp, "tcl_platform", "osVersion", versStr, TCL_GLOBAL_ONLY);
-#if GENERATINGPOWERPC
-    Tcl_SetVar2(interp, "tcl_platform", "machine", "ppc", TCL_GLOBAL_ONLY);
-#else
-    Tcl_SetVar2(interp, "tcl_platform", "machine", "68k", TCL_GLOBAL_ONLY);
-#endif
-
-    /*
-     * Copy USER or LOGIN environment variable into tcl_platform(user)
-     * These are set by SystemVariables in tclMacEnv.c
-     */
-
-    Tcl_DStringInit(&ds);
-    str = TclGetEnv("USER", &ds);
-    if (str == NULL) {
-	str = TclGetEnv("LOGIN", &ds);
-	if (str == NULL) {
-	    str = "";
-	}
-    }
-    Tcl_SetVar2(interp, "tcl_platform", "user", str, TCL_GLOBAL_ONLY);
-    Tcl_DStringFree(&ds);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCheckStackSpace --
- *
- *	On a 68K Mac, we can detect if we are about to blow the stack.
- *	Called before an evaluation can happen when nesting depth is
- *	checked.
- *
- * Results:
- *	1 if there is enough stack space to continue; 0 if not.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCheckStackSpace()
-{
-    return StackSpace() > TCL_MAC_STACK_THRESHOLD;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Init --
- *
- *	This procedure is typically invoked by Tcl_AppInit procedures
- *	to perform additional initialization for a Tcl interpreter,
- *	such as sourcing the "init.tcl" script.
- *
- * Results:
- *	Returns a standard Tcl completion code and sets the interp's result
- *	if there is an error.
- *
- * Side effects:
- *	Depends on what's in the init.tcl script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Init(
-    Tcl_Interp *interp)		/* Interpreter to initialize. */
-{
-    Tcl_Obj *pathPtr;
-
-    /*
-     * For Macintosh applications the Init function may be contained in
-     * the application resources.  If it exists we use it - otherwise we
-     * look in the tcl_library directory.  Ditto for the history command.
-     */
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr == NULL) {
-	pathPtr = Tcl_NewObj();
-    }
-    Tcl_SetVar2Ex(interp, "auto_path", NULL, pathPtr, TCL_GLOBAL_ONLY);
-    return Tcl_Eval(interp, initCmd);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SourceRCFile --
- *
- *	This procedure is typically invoked by Tcl_Main or Tk_Main
- *	procedure to source an application specific rc file into the
- *	interpreter at startup time.  This will either source a file
- *	in the "tcl_rcFileName" variable or a TEXT resource in the
- *	"tcl_rcRsrcName" variable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on what's in the rc script.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SourceRCFile(
-    Tcl_Interp *interp)		/* Interpreter to source rc file into. */
-{
-    Tcl_DString temp;
-    char *fileName;
-    Tcl_Channel errChannel;
-    Handle h;
-
-    fileName = Tcl_GetVar(interp, "tcl_rcFileName", TCL_GLOBAL_ONLY);
-
-    if (fileName != NULL) {
-        Tcl_Channel c;
-	char *fullName;
-
-        Tcl_DStringInit(&temp);
-	fullName = Tcl_TranslateFileName(interp, fileName, &temp);
-	if (fullName == NULL) {
-	    /*
-	     * Couldn't translate the file name (e.g. it referred to a
-	     * bogus user or there was no HOME environment variable).
-	     * Just do nothing.
-	     */
-	} else {
-
-	    /*
-	     * Test for the existence of the rc file before trying to read it.
-	     */
-
-            c = Tcl_OpenFileChannel(NULL, fullName, "r", 0);
-            if (c != (Tcl_Channel) NULL) {
-                Tcl_Close(NULL, c);
-		if (Tcl_EvalFile(interp, fullName) != TCL_OK) {
-		    errChannel = Tcl_GetStdChannel(TCL_STDERR);
-		    if (errChannel) {
-			Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-			Tcl_WriteChars(errChannel, "\n", 1);
-		    }
-		}
-	    }
-	}
-        Tcl_DStringFree(&temp);
-    }
-
-    fileName = Tcl_GetVar(interp, "tcl_rcRsrcName", TCL_GLOBAL_ONLY);
-
-    if (fileName != NULL) {
-	c2pstr(fileName);
-	h = GetNamedResource('TEXT', (StringPtr) fileName);
-	p2cstr((StringPtr) fileName);
-	if (h != NULL) {
-	    if (Tcl_MacEvalResource(interp, fileName, 0, NULL) != TCL_OK) {
-		errChannel = Tcl_GetStdChannel(TCL_STDERR);
-		if (errChannel) {
-		    Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-		    Tcl_WriteChars(errChannel, "\n", 1);
-		}
-	    }
-	    Tcl_ResetResult(interp);
-	    ReleaseResource(h);
-	}
-    }
-}
diff --git a/mac/tclMacInt.h b/mac/tclMacInt.h
deleted file mode 100644
index f721e0f..0000000
--- a/mac/tclMacInt.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * tclMacInt.h --
- *
- *	Declarations of Macintosh specific shared variables and procedures.
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacInt.h,v 1.4 1999/04/16 00:47:20 stanton Exp $
- */
-
-#ifndef _TCLMACINT
-#define _TCLMACINT
-
-#ifndef _TCL
-#   include "tcl.h"
-#endif
-#ifndef _TCLMAC
-#   include "tclMac.h"
-#endif
-
-#include <Events.h>
-#include <Files.h>
-
-#pragma export on
-
-/*
- * Defines to control stack behavior
- */
-
-#define TCL_MAC_68K_STACK_GROWTH (256*1024)
-#define TCL_MAC_STACK_THRESHOLD 16384
-
-/*
- * This flag is passed to TclMacRegisterResourceFork
- * by a file (usually a library) whose resource fork
- * should not be closed by the resource command.
- */
- 
-#define TCL_RESOURCE_DONT_CLOSE  2
-
-/*
- * Typedefs used by Macintosh parts of Tcl.
- */
-typedef pascal void (*ExitToShellProcPtr)(void);
-
-/*
- * Prototypes of Mac only internal functions.
- */
-
-EXTERN char *	TclMacGetFontEncoding _ANSI_ARGS_((int fontId));
-EXTERN int	TclMacHaveThreads(void);
-
-#include "tclIntPlatDecls.h"
-    
-#pragma export reset
-
-#endif /* _TCLMACINT */
diff --git a/mac/tclMacInterupt.c b/mac/tclMacInterupt.c
deleted file mode 100644
index 7f37d2f..0000000
--- a/mac/tclMacInterupt.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* 
- * tclMacInterupt.c --
- *
- *	This file contains routines that deal with the Macintosh's low level
- *	time manager.  This code provides a better resolution timer than what
- *	can be provided by WaitNextEvent.  
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacInterupt.c,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include <LowMem.h>
-#include <Processes.h>
-#include <Timer.h>
-
-/*
- * Data structure for timer tasks.
- */
-typedef struct TMInfo {
-    TMTask		tmTask;
-    ProcessSerialNumber	psn;
-    Point 		lastPoint;
-    Point 		newPoint;
-    long 		currentA5;
-    long 		ourA5;
-    int			installed;
-} TMInfo;
-
-/*
- * Globals used within this file.
- */
- 
-static TimerUPP sleepTimerProc = NULL;
-static int interuptsInited = false;
-static ProcessSerialNumber applicationPSN;
-#define MAX_TIMER_ARRAY_SIZE 16
-static TMInfo timerInfoArray[MAX_TIMER_ARRAY_SIZE];
-static int topTimerElement = 0;
-
-/*
- * Prototypes for procedures that are referenced only in this file:
- */
-
-#if !GENERATINGCFM
-static TMInfo * 	GetTMInfo(void) ONEWORDINLINE(0x2E89); /* MOVE.L A1,(SP) */
-#endif
-static void		SleepTimerProc _ANSI_ARGS_((void));
-static pascal void	CleanUpExitProc _ANSI_ARGS_((void));
-static void		InitInteruptSystem _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * InitInteruptSystem --
- *
- *	Does various initialization for the functions used in this 
- *	file.  Sets up Universial Pricedure Pointers, installs a trap
- *	patch for ExitToShell, etc.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Various initialization.
- *
- *----------------------------------------------------------------------
- */
-
-void
-InitInteruptSystem()
-{
-    int i;
-    
-    sleepTimerProc = NewTimerProc(SleepTimerProc);
-    GetCurrentProcess(&applicationPSN);
-    for (i = 0; i < MAX_TIMER_ARRAY_SIZE; i++) {
-	timerInfoArray[i].installed = false;
-    }
-    
-    /*
-     * Install the ExitToShell patch.  We use this patch instead
-     * of the Tcl exit mechanism because we need to ensure that
-     * these routines are cleaned up even if we crash or are forced
-     * to quit.  There are some circumstances when the Tcl exit
-     * handlers may not fire.
-     */
-     
-    TclMacInstallExitToShellPatch(CleanUpExitProc);
-    interuptsInited = true;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacStartTimer --
- *
- *	Install a Time Manager task to wake our process up in the
- *	future.  The process should get a NULL event after ms 
- *	milliseconds.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Schedules our process to wake up.
- *
- *----------------------------------------------------------------------
- */
-
-void *
-TclMacStartTimer(
-    long ms)		/* Milliseconds. */
-{
-    TMInfo *timerInfoPtr;
-    
-    if (!interuptsInited) {
-	InitInteruptSystem();
-    }
-    
-    /*
-     * Obtain a pointer for the timer.  We only allocate up
-     * to MAX_TIMER_ARRAY_SIZE timers.  If we are past that
-     * max we return NULL.
-     */
-    if (topTimerElement < MAX_TIMER_ARRAY_SIZE) {
-	timerInfoPtr = &timerInfoArray[topTimerElement];
-	topTimerElement++;
-    } else {
-	return NULL;
-    }
-    
-    /*
-     * Install timer to wake process in ms milliseconds.
-     */
-    timerInfoPtr->tmTask.tmAddr = sleepTimerProc;
-    timerInfoPtr->tmTask.tmWakeUp = 0;
-    timerInfoPtr->tmTask.tmReserved = 0;
-    timerInfoPtr->psn = applicationPSN;
-    timerInfoPtr->installed = true;
-
-    InsTime((QElemPtr) timerInfoPtr);
-    PrimeTime((QElemPtr) timerInfoPtr, (long) ms);
-
-    return (void *) timerInfoPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacRemoveTimer --
- *
- *	Remove the timer event from the Time Manager.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	A scheduled timer would be removed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclMacRemoveTimer(
-    void * timerToken)		/* Token got from start timer. */
-{
-    TMInfo *timerInfoPtr = (TMInfo *) timerToken;
-    
-    if (timerInfoPtr == NULL) {
-	return;
-    }
-    
-    RmvTime((QElemPtr) timerInfoPtr);
-    timerInfoPtr->installed = false;
-    topTimerElement--;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacTimerExpired --
- *
- *	Check to see if the installed timer has expired.
- *
- * Results:
- *	True if timer has expired, false otherwise.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMacTimerExpired(
-    void * timerToken)		/* Our token again. */
-{
-    TMInfo *timerInfoPtr = (TMInfo *) timerToken;
-    
-    if ((timerInfoPtr == NULL) || 
-	!(timerInfoPtr->tmTask.qType & kTMTaskActive)) {
-	return true;
-    } else {
-	return false;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SleepTimerProc --
- *
- *	Time proc is called by the is a callback routine placed in the 
- *	system by Tcl_Sleep.  The routine is called at interupt time
- *	and threrfor can not move or allocate memory.  This call will
- *	schedule our process to wake up the next time the process gets
- *	around to consider running it.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Schedules our process to wake up.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SleepTimerProc()
-{
-    /*
-     * In CFM code we can access our code directly.  In 68k code that
-     * isn't based on CFM we must do a glorious hack.  The function 
-     * GetTMInfo is an inline assembler call that moves the pointer 
-     * at A1 to the top of the stack.  The Time Manager keeps the TMTask
-     * info record there before calling this call back.  In order for
-     * this to work the infoPtr argument must be the *last* item on the
-     * stack.  If we "piggyback" our data to the TMTask info record we 
-     * can get access to the information we need.  While this is really 
-     * ugly - it's the way Apple recomends it be done - go figure...
-     */
-    
-#if GENERATINGCFM
-    WakeUpProcess(&applicationPSN);
-#else
-    TMInfo * infoPtr;
-    
-    infoPtr = GetTMInfo();
-    WakeUpProcess(&infoPtr->psn);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanUpExitProc --
- *
- *	This procedure is invoked as an exit handler when ExitToShell
- *	is called.  It removes the system level timer handler if it 
- *	is installed.  This must be called or the Mac OS will more than 
- *	likely crash.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static pascal void
-CleanUpExitProc()
-{
-    int i;
-    
-    for (i = 0; i < MAX_TIMER_ARRAY_SIZE; i++) {
-	if (timerInfoArray[i].installed) {
-	    RmvTime((QElemPtr) &timerInfoArray[i]);
-	    timerInfoArray[i].installed = false;
-	}
-    }
-}
diff --git a/mac/tclMacLibrary.c b/mac/tclMacLibrary.c
deleted file mode 100644
index ea84b9d..0000000
--- a/mac/tclMacLibrary.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * tclMacLibrary.c --
- *
- *	This file should be included in Tcl extensions that want to 
- *	automatically oepn their resource forks when the code is linked. 
- *	These routines should not be exported but should be compiled 
- *	locally by each fragment.  Many thanks to Jay Lieske
- *	<lieske@princeton.edu> who provide an initial version of this
- *	file.
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacLibrary.c,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-/*
- * Here is another place that we are using the old routine names...
- */
- 
-#define OLDROUTINENAMES 1
-
-#include <CodeFragments.h>
-#include <Errors.h>
-#include <Resources.h>
-#include <Strings.h>
-#include "tclMacInt.h"
-
-/*
- * These function are not currently defined in any header file.  The
- * only place they should be used is in the Initialization and
- * Termination entry points for a code fragment.  The prototypes
- * are included here to avoid compile errors.
- */
-
-OSErr TclMacInitializeFragment _ANSI_ARGS_((
-			struct CFragInitBlock* initBlkPtr));
-void TclMacTerminateFragment _ANSI_ARGS_((void));
-
-/*
- * Static functions in this file.
- */
-
-static OSErr OpenLibraryResource _ANSI_ARGS_((
-			struct CFragInitBlock* initBlkPtr));
-static void CloseLibraryResource _ANSI_ARGS_((void));
-
-/* 
- * The refnum of the opened resource fork.
- */
-static short ourResFile = kResFileNotOpened;
-
-/*
- * This is the resource token for the our resource file.
- * It stores the name we registered with the resource facility.
- * We only need to use this if we are actually registering ourselves.
- */
-  
-#ifdef TCL_REGISTER_LIBRARY
-static Tcl_Obj *ourResToken;
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacInitializeFragment --
- *
- *	Called by MacOS CFM when the shared library is loaded. All this
- *	function really does is give Tcl a chance to open and register
- *	the resource fork of the library. 
- *
- * Results:
- *	MacOS error code if loading should be canceled.
- *
- * Side effects:
- *	Opens the resource fork of the shared library file.
- *
- *----------------------------------------------------------------------
- */
-
-OSErr
-TclMacInitializeFragment(
-    struct CFragInitBlock* initBlkPtr)		/* Pointer to our library. */
-{
-    OSErr err = noErr;
-
-#ifdef __MWERKS__
-    {
-    	extern OSErr __initialize( CFragInitBlock* initBlkPtr);
-    	err = __initialize((CFragInitBlock *) initBlkPtr);
-    }
-#endif
-    if (err == noErr)
-    	err = OpenLibraryResource( initBlkPtr);
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacTerminateFragment --
- *
- *	Called by MacOS CFM when the shared library is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The resource fork of the code fragment is closed.
- *
- *----------------------------------------------------------------------
- */
-
-void 
-TclMacTerminateFragment()
-{
-    CloseLibraryResource();
-
-#ifdef __MWERKS__
-    {
-    	extern void __terminate(void);
-    	__terminate();
-    }
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OpenLibraryResource --
- *
- *	This routine can be called by a MacOS fragment's initialiation 
- *	function to open the resource fork of the file.  
- *	Call it with the same data passed to the initialization function. 
- *	If the fragment loading should fail if the resource fork can't 
- *	be opened, then the initialization function can pass on this 
- *	return value.
- *
- *      If you #define TCL_REGISTER_RESOURCE before compiling this resource, 
- *	then your library will register its open resource fork with the
- *      resource command.
- *
- * Results:
- *	It returns noErr on success and a MacOS error code on failure.
- *
- * Side effects:
- *	The resource fork of the code fragment is opened read-only and 
- *	is installed at the head of the resource chain.
- *
- *----------------------------------------------------------------------
- */
-
-static OSErr 
-OpenLibraryResource(
-    struct CFragInitBlock* initBlkPtr)
-{
-    /*
-     * The 3.0 version of the Universal headers changed CFragInitBlock
-     * to an opaque pointer type.  CFragSystem7InitBlock is now the
-     * real pointer.
-     */
-     
-#if !defined(UNIVERSAL_INTERFACES_VERSION) || (UNIVERSAL_INTERFACES_VERSION < 0x0300)
-    struct CFragInitBlock *realInitBlkPtr = initBlkPtr;
-#else 
-    CFragSystem7InitBlock *realInitBlkPtr = (CFragSystem7InitBlock *) initBlkPtr;
-#endif
-    FSSpec* fileSpec = NULL;
-    OSErr err = noErr;
-    
-
-    if (realInitBlkPtr->fragLocator.where == kOnDiskFlat) {
-    	fileSpec = realInitBlkPtr->fragLocator.u.onDisk.fileSpec;
-    } else if (realInitBlkPtr->fragLocator.where == kOnDiskSegmented) {
-    	fileSpec = realInitBlkPtr->fragLocator.u.inSegs.fileSpec;
-    } else {
-    	err = resFNotFound;
-    }
-
-    /*
-     * Open the resource fork for this library in read-only mode.  
-     * This will make it the current res file, ahead of the 
-     * application's own resources.
-     */
-    
-    if (fileSpec != NULL) {
-	ourResFile = FSpOpenResFile(fileSpec, fsRdPerm);
-	if (ourResFile == kResFileNotOpened) {
-	    err = ResError();
-	} else {
-#ifdef TCL_REGISTER_LIBRARY
-	    ourResToken = Tcl_NewObj();
-	    Tcl_IncrRefCount(ourResToken);
-	    p2cstr(realInitBlkPtr->libName);
-	    Tcl_SetStringObj(ourResToken, (char *) realInitBlkPtr->libName, -1);
-	    c2pstr((char *) realInitBlkPtr->libName);
-	    TclMacRegisterResourceFork(ourResFile, ourResToken,
-	            TCL_RESOURCE_DONT_CLOSE);
-#endif
-            SetResFileAttrs(ourResFile, mapReadOnly);
-	}
-    }
-    
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CloseLibraryResource --
- *
- *	This routine should be called by a MacOS fragment's termination 
- *	function to close the resource fork of the file 
- *	that was opened with OpenLibraryResource.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The resource fork of the code fragment is closed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CloseLibraryResource()
-{
-    if (ourResFile != kResFileNotOpened) {
-#ifdef TCL_REGISTER_LIBRARY
-        int length;
-        TclMacUnRegisterResourceFork(
-	        Tcl_GetStringFromObj(ourResToken, &length),
-                NULL);
-        Tcl_DecrRefCount(ourResToken);
-#endif
-	CloseResFile(ourResFile);
-	ourResFile = kResFileNotOpened;
-    }
-}
diff --git a/mac/tclMacLibrary.r b/mac/tclMacLibrary.r
deleted file mode 100644
index eda1f7f..0000000
--- a/mac/tclMacLibrary.r
+++ /dev/null
@@ -1,221 +0,0 @@
-/* 
- * tclMacLibrary.r --
- *
- *	This file creates resources used by the Tcl shared library.
- *	Many thanks go to "Jay Lieske, Jr." <lieske@princeton.edu> who
- *	wrote the initial version of this file.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacLibrary.r,v 1.3 1999/04/16 00:47:20 stanton Exp $
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-/*
- * The folowing include and defines help construct
- * the version string for Tcl.
- */
-
-#define RESOURCE_INCLUDED
-#include "tcl.h"
-
-#if (TCL_RELEASE_LEVEL == 0)
-#   define RELEASE_LEVEL alpha
-#elif (TCL_RELEASE_LEVEL == 1)
-#   define RELEASE_LEVEL beta
-#elif (TCL_RELEASE_LEVEL == 2)
-#   define RELEASE_LEVEL final
-#endif
-
-#if (TCL_RELEASE_LEVEL == 2)
-#   define MINOR_VERSION (TCL_MINOR_VERSION * 16) + TCL_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION TCL_MINOR_VERSION * 16
-#endif
-
-resource 'vers' (1) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	TCL_PATCH_LEVEL ", by Ray Johnson © Sun Microsystems"
-};
-
-resource 'vers' (2) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	"Tcl Library " TCL_PATCH_LEVEL " © 1996"
-};
-
-/*
- * Currently the creator for all Tcl/Tk libraries and extensions
- * should be 'TclL'.  This will allow those extension and libraries
- * to use the common icon for Tcl extensions.  However, this signature
- * still needs to be approved by the signature police at Apple and may
- * change.
- */
-#define TCL_CREATOR 'TclL'
-#define TCL_LIBRARY_RESOURCES 2000
-
-/*
- * The 'BNDL' resource is the primary link between a file's
- * creator/type and its icon.  This resource acts for all Tcl shared
- * libraries; other libraries will not need one and ought to use
- * custom icons rather than new file types for a different appearance.
- */
-
-resource 'BNDL' (TCL_LIBRARY_RESOURCES, "Tcl bundle", purgeable) 
-{
-	TCL_CREATOR,
-	0,
-	{	/* array TypeArray: 2 elements */
-		/* [1] */
-		'FREF',
-		{	/* array IDArray: 1 elements */
-			/* [1] */
-			0, TCL_LIBRARY_RESOURCES
-		},
-		/* [2] */
-		'ICN#',
-		{	/* array IDArray: 1 elements */
-			/* [1] */
-			0, TCL_LIBRARY_RESOURCES
-		}
-	}
-};
-
-resource 'FREF' (TCL_LIBRARY_RESOURCES, purgeable) 
-{
-	'shlb', 0, ""
-};
-
-type TCL_CREATOR as 'STR ';
-resource TCL_CREATOR (0, purgeable) {
-	"Tcl Library " TCL_PATCH_LEVEL " © 1996"
-};
-
-/*
- * The 'kind' resource works with a 'BNDL' in Macintosh Easy Open
- * to affect the text the Finder displays in the "kind" column and
- * file info dialog.  This information will be applied to all files
- * with the listed creator and type.
- */
-
-resource 'kind' (TCL_LIBRARY_RESOURCES, "Tcl kind", purgeable) {
-	TCL_CREATOR,
-	0, /* region = USA */
-	{
-		'shlb', "Tcl Library"
-	}
-};
-
-
-/*
- * The -16397 string will be displayed by Finder when a user
- * tries to open the shared library. The string should
- * give the user a little detail about the library's capabilities
- * and enough information to install the library in the correct location.  
- * A similar string should be placed in all shared libraries.
- */
-resource 'STR ' (-16397, purgeable) {
-	"Tcl Library\n\n"
-	"This is the core library needed to run Tool Command Language programs. "
-	"To work properly, it should be placed in the ÔTool Command LanguageÕ folder "
-	"within the Extensions folder."
-};
-
-/* 
- * The mechanisim below loads Tcl source into the resource fork of the
- * application.  The example below creates a TEXT resource named
- * "Init" from the file "init.tcl".  This allows applications to use
- * Tcl to define the behavior of the application without having to
- * require some predetermined file structure - all needed Tcl "files"
- * are located within the application.  To source a file for the
- * resource fork the source command has been modified to support
- * sourcing from resources.  In the below case "source -rsrc {Init}"
- * will load the TEXT resource named "Init".
- */
-
-#include "tclMacTclCode.r"
-
-/*
- * The following are icons for the shared library.
- */
-
-data 'icl4' (2000, "Tcl Shared Library", purgeable) {
-	$"0FFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
-	$"F000 0000 0000 0000 0000 0000 000C F000"
-	$"F0CC CFFF CCCC CCC6 66CC CCCC CCCC F000"
-	$"F0CC CFFF FFFF FF66 F6CC CCCC CCCC F000"
-	$"F0CC CFFF 2000 0D66 6CCC CCCC CCCC F000"
-	$"F0CC CFFF 0202 056F 6E5C CCCC CCCC F000"
-	$"F0CC CFFF 2020 C666 F66F CCCC CCCC F000"
-	$"F0CC CFFF 0200 B66F 666B FCCC CCCC F000"
-	$"F0FC CFFF B020 55F6 6F52 BFCC CCCC F000"
-	$"FF0F 0CCC FB02 5665 66D0 2FCC CCCC F0F0"
-	$"F00F 0CCC CFB0 BF55 F6CF FFCC CCCC FFCF"
-	$"000F 0CCC CCFB 06C9 66CC CCCC CCCC F0CF"
-	$"000F 0CCC CCCF 56C6 6CCC CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 6FC6 FCCC CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 65C5 65CC CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 55D6 57CC CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 65CF 6CCC CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 5AC6 6CFF CCCC CCCC CCCF"
-	$"000F 0CCC CCCC 65C5 6CF0 FCCC CCCC CCCF"
-	$"000F 0CCC CCCC CECF CCF0 0FCC CCCC CCCF"
-	$"000F 0CCC CCCC C5C6 CCCF 20FC CCCC FCCF"
-	$"F00F 0CCC CCCF FFD5 CCCC F20F CCCC FFCF"
-	$"FF0F 0CCC CCCF 20CF CCCC F020 FCCC F0F0"
-	$"F0F0 CCCC CCCF B2C2 FFFF 0002 0FFC F000"
-	$"F00C CCCC CCCC FBC0 2000 0020 2FFC F000"
-	$"F0CC CCCC CCCC CFCB 0202 0202 0FFC F000"
-	$"F0CC CCCC CCCC CCCF B020 2020 2FFC F000"
-	$"F0CC CCCC CCCC CCDC FBBB BBBB BFFC F000"
-	$"F0CC CCCC CCCC CCCC CFFF FFFF FFFC F000"
-	$"F0CC CCCC CCCC CCCC CCCC CCCC CFFC F000"
-	$"FCCC CCCC CCCC CCCC CCCC CCCC CCCC F000"
-	$"0FFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
-};
-
-data 'ICN#' (2000, "Tcl Shared Library", purgeable) {
-	$"7FFF FFF0 8000 0008 8701 C008 87FF C008"
-	$"8703 8008 8707 E008 8707 F008 870F F808"
-	$"A78F EC08 D0CF C40A 906F DC0D 1035 C009"
-	$"101D 8001 100D 8001 100D C001 100D C001"
-	$"100D 8001 100D B001 100D A801 1005 2401"
-	$"1005 1209 901D 090D D011 088A A018 F068"
-	$"800C 0068 8005 0068 8001 8068 8000 FFE8"
-	$"8000 7FE8 8000 0068 8000 0008 7FFF FFF0"
-	$"7FFF FFF0 FFFF FFF8 FFFF FFF8 FFFF FFF8"
-	$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
-	$"FFFF FFF8 DFFF FFFA 9FFF FFFF 1FFF FFFF"
-	$"1FFF FFFF 1FFF FFFF 1FFF FFFF 1FFF FFFF"
-	$"1FFF FFFF 1FFF FFFF 1FFF FFFF 1FFF FFFF"
-	$"1FFF FFFF 9FFF FFFF DFFF FFFA FFFF FFF8"
-	$"FFFF FFF8 FFFF FFF8 FFFF FFF8 FFFF FFF8"
-	$"FFFF FFF8 FFFF FFF8 FFFF FFF8 7FFF FFF0"
-};
-
-data 'ics#' (2000, "Tcl Shared Library", purgeable) {
-	$"FFFE B582 BB82 B3C2 BFA2 43C3 4381 4381"
-	$"4381 4763 4392 856E 838E 81AE 811E FFFE"
-	$"FFFE FFFE FFFE FFFE FFFE FFFF 7FFF 7FFF"
-	$"7FFF 7FFF 7FFF FFFE FFFE FFFE FFFE FFFE"
-};
-
-data 'ics4' (2000, "Tcl Shared Library", purgeable) {
-	$"FFFF FFFF FFFF FFF0 FCFF DED5 6CCC CCF0"
-	$"FCFF C0D6 ECCC CCF0 FCFF 2056 65DC CCF0"
-	$"FDFE D256 6DAC CCFF FFCC DDDE 5DDC CCEF"
-	$"0FCC CD67 5CCC CCCF 0FCC CC5D 6CCC CCCF"
-	$"0FCC CC5D 5CCC CCCF 0FCC CCD5 5CCC CCCF"
-	$"FFCC CFFD CCFF CCFF FCCC CF2D DF20 FCFC"
-	$"FCCC CCFD D202 FEF0 FCCC CC0D 2020 FEF0"
-	$"FCCC CCCD FBBB FEF0 FFFF FFFF FFFF FFE0"
-};
-
diff --git a/mac/tclMacLoad.c b/mac/tclMacLoad.c
deleted file mode 100644
index 622eb65..0000000
--- a/mac/tclMacLoad.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * tclMacLoad.c --
- *
- *	This procedure provides a version of the TclLoadFile for use
- *	on the Macintosh.  This procedure will only work with systems 
- *	that use the Code Fragment Manager.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacLoad.c,v 1.3 1999/04/16 00:47:20 stanton Exp $
- */
-
-#include <CodeFragments.h>
-#include <Errors.h>
-#include <Resources.h>
-#include <Strings.h>
-#include <FSpCompat.h>
-
-/*
- * Seems that the 3.0.1 Universal headers leave this define out.  So we
- * define it here...
- */
- 
-#ifndef fragNoErr
-    #define fragNoErr noErr
-#endif
-
-#include "tclPort.h"
-#include "tclInt.h"
-#include "tclMacInt.h"
-
-#if GENERATINGPOWERPC
-    #define OUR_ARCH_TYPE kPowerPCCFragArch
-#else
-    #define OUR_ARCH_TYPE kMotorola68KCFragArch
-#endif
-
-/*
- * The following data structure defines the structure of a code fragment
- * resource.  We can cast the resource to be of this type to access
- * any fields we need to see.
- */
-struct CfrgHeader {
-    long 	res1;
-    long 	res2;
-    long 	version;
-    long 	res3;
-    long 	res4;
-    long 	filler1;
-    long 	filler2;
-    long 	itemCount;
-    char	arrayStart;	/* Array of externalItems begins here. */
-};
-typedef struct CfrgHeader CfrgHeader, *CfrgHeaderPtr, **CfrgHeaderPtrHand;
-
-/*
- * The below structure defines a cfrag item within the cfrag resource.
- */
-struct CfrgItem {
-    OSType 	archType;
-    long 	updateLevel;
-    long	currVersion;
-    long	oldDefVersion;
-    long	appStackSize;
-    short	appSubFolder;
-    char	usage;
-    char	location;
-    long	codeOffset;
-    long	codeLength;
-    long	res1;
-    long	res2;
-    short	itemSize;
-    Str255	name;		/* This is actually variable sized. */
-};
-typedef struct CfrgItem CfrgItem;
-
-/*
- *----------------------------------------------------------------------
- *
- * TclLoadFile --
- *
- *	This procedure is called to carry out dynamic loading of binary
- *	code for the Macintosh.  This implementation is based on the
- *	Code Fragment Manager & will not work on other systems.
- *
- * Results:
- *	The result is TCL_ERROR, and an error message is left in
- *	the interp's result.
- *
- * Side effects:
- *	New binary code is loaded.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(
-    Tcl_Interp *interp,		/* Used for error reporting. */
-    char *fileName,		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, char *sym2,	/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr,
-    Tcl_PackageInitProc **proc2Ptr,
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr)	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    CFragConnectionID connID;
-    Ptr dummy;
-    OSErr err;
-    CFragSymbolClass symClass;
-    FSSpec fileSpec;
-    short fragFileRef, saveFileRef;
-    Handle fragResource;
-    UInt32 offset = 0;
-    UInt32 length = kCFragGoesToEOF;
-    char packageName[255];
-    Str255 errName;
-    Tcl_DString ds;
-    char *native;
-    
-    /*
-     * First thing we must do is infer the package name from the sym1
-     * variable.  This is kind of dumb since the caller actually knows
-     * this value, it just doesn't give it to us.
-     */
-    strcpy(packageName, sym1);
-    Tcl_UtfToLower(packageName);
-    *(Tcl_UtfAtIndex(packageName, Tcl_NumUtfChars(packageName, -1) - 5)) = 0;
-    
-    native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    Tcl_DStringFree(&ds);
-    
-    if (err != noErr) {
-	Tcl_SetResult(interp, "could not locate shared library", TCL_STATIC);
-	return TCL_ERROR;
-    }
-    
-    /*
-     * See if this fragment has a 'cfrg' resource.  It will tell us where
-     * to look for the fragment in the file.  If it doesn't exist we will
-     * assume we have a ppc frag using the whole data fork.  If it does
-     * exist we find the frag that matches the one we are looking for and
-     * get the offset and size from the resource.
-     */
-     
-    saveFileRef = CurResFile();
-    SetResLoad(false);
-    fragFileRef = FSpOpenResFile(&fileSpec, fsRdPerm);
-    SetResLoad(true);
-    if (fragFileRef != -1) {
-	UseResFile(fragFileRef);
-	fragResource = Get1Resource(kCFragResourceType, kCFragResourceID);
-	HLock(fragResource);
-	if (ResError() == noErr) {
-	    CfrgItem* srcItem;
-	    long itemCount, index;
-	    Ptr itemStart;
-
-	    itemCount = (*(CfrgHeaderPtrHand)fragResource)->itemCount;
-	    itemStart = &(*(CfrgHeaderPtrHand)fragResource)->arrayStart;
-	    for (index = 0; index < itemCount;
-		 index++, itemStart += srcItem->itemSize) {
-		srcItem = (CfrgItem*)itemStart;
-		if (srcItem->archType != OUR_ARCH_TYPE) continue;
-		if (!strncasecmp(packageName, (char *) srcItem->name + 1,
-			srcItem->name[0])) {
-		    offset = srcItem->codeOffset;
-		    length = srcItem->codeLength;
-		}
-	    }
-	}
-	/*
-	 * Close the resource file.  If the extension wants to reopen the
-	 * resource fork it should use the tclMacLibrary.c file during it's
-	 * construction.
-	 */
-	HUnlock(fragResource);
-	ReleaseResource(fragResource);
-	CloseResFile(fragFileRef);
-	UseResFile(saveFileRef);
-    }
-
-    /*
-     * Now we can attempt to load the fragement using the offset & length
-     * obtained from the resource.  We don't worry about the main entry point
-     * as we are going to search for specific entry points passed to us.
-     */
-    
-    c2pstr(packageName);
-    err = GetDiskFragment(&fileSpec, offset, length, (StringPtr) packageName,
-	    kLoadCFrag, &connID, &dummy, errName);
-    if (err != fragNoErr) {
-	p2cstr(errName);
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-	    "\": ", errName, (char *) NULL);
-	return TCL_ERROR;
-    }
-    
-    c2pstr(sym1);
-    err = FindSymbol(connID, (StringPtr) sym1, (Ptr *) proc1Ptr, &symClass);
-    p2cstr((StringPtr) sym1);
-    if (err != fragNoErr || symClass == kDataCFragSymbol) {
-	Tcl_SetResult(interp,
-		"could not find Initialization routine in library",
-		TCL_STATIC);
-	return TCL_ERROR;
-    }
-
-    c2pstr(sym2);
-    err = FindSymbol(connID, (StringPtr) sym2, (Ptr *) proc2Ptr, &symClass);
-    p2cstr((StringPtr) sym2);
-    if (err != fragNoErr || symClass == kDataCFragSymbol) {
-	*proc2Ptr = NULL;
-    }
-    
-    *clientDataPtr = (ClientData) connID;
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Does nothing.  Can anything be done?
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(
-    char *fileName,		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr)	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/mac/tclMacMSLPrefix.h b/mac/tclMacMSLPrefix.h
deleted file mode 100644
index 1d11099..0000000
--- a/mac/tclMacMSLPrefix.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * tclMacMSLPrefix.h --
- *
- *  A wrapper for the MSL ansi_prefix.mac.h file.  This just turns export on
- *  after including the MSL prefix file, so we can export symbols from the MSL
- *  and through the Tcl shared libraries
- *  
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacMSLPrefix.h,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-#include <ansi_prefix.mac.h>
-/*
- * "export" is a MetroWerks specific pragma.  It flags the linker that  
- * any symbols that are defined when this pragma is on will be exported 
- * to shared libraries that link with this library.
- */
- 
-#pragma export on
diff --git a/mac/tclMacMath.h b/mac/tclMacMath.h
deleted file mode 100644
index 14af9a8..0000000
--- a/mac/tclMacMath.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * tclMacMath.h --
- *
- *	This file is necessary because of Metrowerks CodeWarrior Pro 1
- *	on the Macintosh. With 8-byte doubles turned on, the definitions of
- *	sin, cos, acos, etc., are screwed up.  They are fine as long as
- *	they are used as function calls, but if the function pointers
- *	are passed around and used, they will crash hard on the 68K.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacMath.h,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-#ifndef _TCLMACMATH
-#define _TCLMACMATH
-
-#include <math.h>
-
-#if defined(__MWERKS__) && !defined(__POWERPC__)
-#if __option(IEEEdoubles)
-
-#   ifdef cos
-#	undef cos
-#	define cos cosd
-#   endif
-
-#   ifdef sin
-#	undef sin
-#	define sin sind
-#   endif
-
-#   ifdef tan
-#	undef tan
-#	define tan tand
-#   endif
-
-#   ifdef acos
-#	undef acos
-#	define acos acosd
-#   endif
-
-#   ifdef asin
-#	undef asin
-#	define asin asind
-#   endif
-
-#   ifdef atan
-#	undef atan
-#	define atan atand
-#   endif
-
-#   ifdef cosh
-#	undef cosh
-#	define cosh coshd
-#   endif
-
-#   ifdef sinh
-#	undef sinh
-#	define sinh sinhd
-#   endif
-
-#   ifdef tanh
-#	undef tanh
-#	define tanh tanhd
-#   endif
-
-#   ifdef exp
-#	undef exp
-#	define exp expd
-#   endif
-
-#   ifdef ldexp
-#	undef ldexp
-#	define ldexp ldexpd
-#   endif
-
-#   ifdef log
-#	undef log
-#	define log logd
-#   endif
-
-#   ifdef log10
-#	undef log10
-#	define log10 log10d
-#   endif
-
-#   ifdef fabs
-#	undef fabs
-#	define fabs fabsd
-#   endif
-
-#   ifdef sqrt
-#	undef sqrt
-#	define sqrt sqrtd
-#   endif
-
-#   ifdef fmod
-#	undef fmod
-#	define fmod fmodd
-#   endif
-
-#   ifdef atan2
-#	undef atan2
-#	define atan2 atan2d
-#   endif
-
-#   ifdef frexp
-#	undef frexp
-#	define frexp frexpd
-#   endif
-
-#   ifdef modf
-#	undef modf
-#	define modf modfd
-#   endif
-
-#   ifdef pow
-#	undef pow
-#	define pow powd
-#   endif
-
-#   ifdef ceil
-#	undef ceil
-#	define ceil ceild
-#   endif
-
-#   ifdef floor
-#	undef floor
-#	define floor floord
-#   endif
-#endif
-#endif
-
-#if (defined(THINK_C) || defined(__MWERKS__))
-#pragma export on
-double		hypotd(double x, double y);
-#define hypot hypotd
-#pragma export reset
-#endif
-
-#endif /* _TCLMACMATH */
diff --git a/mac/tclMacNotify.c b/mac/tclMacNotify.c
deleted file mode 100644
index 773490f..0000000
--- a/mac/tclMacNotify.c
+++ /dev/null
@@ -1,554 +0,0 @@
-/* 
- * tclMacNotify.c --
- *
- *	This file contains Macintosh-specific procedures for the notifier,
- *	which is the lowest-level part of the Tcl event loop.  This file
- *	works together with ../generic/tclNotify.c.
- *
- *	The Mac notifier only polls for system and OS events, so it is process
- *	wide, rather than thread specific.  However, this means that the convert
- *	event proc will have to arbitrate which events go to which threads.
- *
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacNotify.c,v 1.3 1999/04/16 00:47:20 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMac.h"
-#include "tclMacInt.h"
-#include <signal.h>
-#include <Events.h>
-#include <LowMem.h>
-#include <Processes.h>
-#include <Timer.h>
-#include <Threads.h>
-
-
-/* 
- * This is necessary to work around a bug in Apple's Universal header files
- * for the CFM68K libraries.
- */
-
-#ifdef __CFM68K__
-#undef GetEventQueue
-extern pascal QHdrPtr GetEventQueue(void)
- THREEWORDINLINE(0x2EBC, 0x0000, 0x014A);
-#pragma import list GetEventQueue
-#define GetEvQHdr() GetEventQueue()
-#endif
-
-/*
- * The follwing static indicates whether this module has been initialized.
- */
-
-static int initialized = 0;
-
-/*
- * The following structure contains the state information for the
- * notifier module.
- */
-
-static struct {
-    int timerActive;		/* 1 if timer is running. */
-    Tcl_Time timer;		/* Time when next timer event is expected. */
-    int flags;			/* OR'ed set of flags defined below. */
-    Point lastMousePosition;	/* Last known mouse location. */
-    RgnHandle utilityRgn;	/* Region used as the mouse region for
-				 * WaitNextEvent and the update region when
-				 * checking for events. */   
-    Tcl_MacConvertEventPtr eventProcPtr;
-				/* This pointer holds the address of the
-				 * function that will handle all incoming
-				 * Macintosh events. */
-} notifier;
-
-/*
- * The following defines are used in the flags field of the notifier struct.
- */
-
-#define NOTIFY_IDLE	(1<<1)	/* Tcl_ServiceIdle should be called. */
-#define NOTIFY_TIMER	(1<<2)	/* Tcl_ServiceTimer should be called. */
-
-/*
- * Prototypes for procedures that are referenced only in this file:
- */
-
-static int		HandleMacEvents _ANSI_ARGS_((void));
-static void		InitNotifier _ANSI_ARGS_((void));
-static void		NotifierExitHandler _ANSI_ARGS_((
-			    ClientData clientData));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitNotifier --
- *
- *	Initializes the platform specific notifier state.  There is no thread
- *	specific platform notifier on the Mac, so this really doesn't do 
- *	anything.  However, we need to return the ThreadID, since the generic
- *	notifier hands this back to us in AlertThread.
- *
- * Results:
- *	Returns the threadID for this thread.  
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_InitNotifier()
-{
-    
-#ifdef TCL_THREADS
-    ThreadID curThread;
-    if (TclMacHaveThreads()) {
-        GetCurrentThread(&curThread);
-        return (ClientData) curThread;
-    } else {
-        return NULL;
-    }
-#else
-    return NULL;
-#endif
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FinalizeNotifier --
- *
- *	This function is called to cleanup the notifier state before
- *	a thread is terminated.  There is no platform thread specific
- *	notifier, so this does nothing.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FinalizeNotifier(clientData)
-    ClientData clientData;	/* Pointer to notifier data. */
-{
-    /* Nothing to do on the Mac */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AlertNotifier --
- *
- *	Wake up the specified notifier from any thread. This routine
- *	is called by the platform independent notifier code whenever
- *	the Tcl_ThreadAlert routine is called.  This routine is
- *	guaranteed not to be called on a given notifier after
- *	Tcl_FinalizeNotifier is called for that notifier.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Calls YieldToThread from this thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AlertNotifier(clientData)
-    ClientData clientData;	/* Pointer to thread data. */
-{
-
-#ifdef TCL_THREADS
-    if (TclMacHaveThreads()) {
-        YieldToThread((ThreadID) clientData);
-    }
-#endif
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InitNotifier --
- *
- *	Initializes the notifier structure.  Note - this function is never
- *	used.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new exit handler.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-InitNotifier(void)
-{
-    initialized = 1;
-    memset(&notifier, 0, sizeof(notifier));
-    Tcl_CreateExitHandler(NotifierExitHandler, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NotifierExitHandler --
- *
- *	This function is called to cleanup the notifier state before
- *	Tcl is unloaded.  This function is never used, since InitNotifier
- *	isn't either.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-NotifierExitHandler(
-    ClientData clientData)	/* Not used. */
-{
-    initialized = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * HandleMacEvents --
- *
- *	This function checks for events from the Macintosh event queue.
- *
- * Results:
- *	Returns 1 if event found, 0 otherwise.
- *
- * Side effects:
- *	Pulls events off of the Mac event queue and then calls
- *	convertEventProc.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-HandleMacEvents(void)
-{
-    EventRecord theEvent;
-    int eventFound = 0, needsUpdate = 0;
-    Point currentMouse;
-    WindowRef windowRef;
-    Rect mouseRect;
-
-    /*
-     * Check for mouse moved events.  These events aren't placed on the
-     * system event queue unless we call WaitNextEvent.
-     */
-
-    GetGlobalMouse(&currentMouse);
-    if ((notifier.eventProcPtr != NULL) &&
-	    !EqualPt(currentMouse, notifier.lastMousePosition)) {
-	notifier.lastMousePosition = currentMouse;
-	theEvent.what = nullEvent;
-	if ((*notifier.eventProcPtr)(&theEvent) == true) {
-	    eventFound = 1;
-	}
-    }
-
-    /*
-     * Check for update events.  Since update events aren't generated
-     * until we call GetNextEvent, we may need to force a call to
-     * GetNextEvent, even if the queue is empty.
-     */
-
-    for (windowRef = FrontWindow(); windowRef != NULL;
-	    windowRef = GetNextWindow(windowRef)) {
-	GetWindowUpdateRgn(windowRef, notifier.utilityRgn);
-	if (!EmptyRgn(notifier.utilityRgn)) {
-	    needsUpdate = 1;
-	    break;
-	}
-    }
-    
-    /*
-     * Process events from the OS event queue.
-     */
-
-    while (needsUpdate || (GetEvQHdr()->qHead != NULL)) {
-	GetGlobalMouse(&currentMouse);
-	SetRect(&mouseRect, currentMouse.h, currentMouse.v,
-		currentMouse.h + 1, currentMouse.v + 1);
-	RectRgn(notifier.utilityRgn, &mouseRect);
-	
-	WaitNextEvent(everyEvent, &theEvent, 5, notifier.utilityRgn);
-	needsUpdate = 0;
-	if ((notifier.eventProcPtr != NULL)
-		&& ((*notifier.eventProcPtr)(&theEvent) == true)) {
-	    eventFound = 1;
-	}
-    }
-    
-    return eventFound;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetTimer --
- *
- *	This procedure sets the current notifier timer value.  The
- *	notifier will ensure that Tcl_ServiceAll() is called after
- *	the specified interval, even if no events have occurred.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Replaces any previous timer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetTimer(
-    Tcl_Time *timePtr)		/* New value for interval timer. */
-{
-    if (!timePtr) {
-	notifier.timerActive = 0;
-    } else {
-	/*
-	 * Compute when the timer should fire.
-	 */
-	
-	TclpGetTime(&notifier.timer);
-	notifier.timer.sec += timePtr->sec;
-	notifier.timer.usec += timePtr->usec;
-	if (notifier.timer.usec >= 1000000) {
-	    notifier.timer.usec -= 1000000;
-	    notifier.timer.sec += 1;
-	}
-	notifier.timerActive = 1;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ServiceModeHook --
- *
- *	This function is invoked whenever the service mode changes.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ServiceModeHook(mode)
-    int mode;			/* Either TCL_SERVICE_ALL, or
-				 * TCL_SERVICE_NONE. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitForEvent --
- *
- *	This function is called by Tcl_DoOneEvent to wait for new
- *	events on the message queue.  If the block time is 0, then
- *	Tcl_WaitForEvent just polls the event queue without blocking.
- *
- * Results:
- *	Always returns 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WaitForEvent(
-    Tcl_Time *timePtr)		/* Maximum block time. */
-{
-    int found;
-    EventRecord macEvent;
-    long sleepTime = 5;
-    long ms;
-    Point currentMouse;
-    void * timerToken;
-    Rect mouseRect;
-
-    /*
-     * Compute the next timeout value.
-     */
-
-    if (!timePtr) {
-	ms = INT_MAX;
-    } else {
-	ms = (timePtr->sec * 1000) + (timePtr->usec / 1000);
-    }
-    timerToken = TclMacStartTimer((long) ms);
-   
-    /*
-     * Poll the Mac event sources.  This loop repeats until something
-     * happens: a timeout, a socket event, mouse motion, or some other
-     * window event.  Note that we don't call WaitNextEvent if another
-     * event is found to avoid context switches.  This effectively gives
-     * events coming in via WaitNextEvent a slightly lower priority.
-     */
-
-    found = 0;
-    if (notifier.utilityRgn == NULL) {
-	notifier.utilityRgn = NewRgn();
-    }
-
-    while (!found) {
-	/*
-	 * Check for generated and queued events.
-	 */
-
-	if (HandleMacEvents()) {
-	    found = 1;
-	}
-
-	/*
-	 * Check for time out.
-	 */
-
-	if (!found && TclMacTimerExpired(timerToken)) {
-	    found = 1;
-	}
-
-	/*
-	 * Check for window events.  We may receive a NULL event for
-	 * various reasons. 1) the timer has expired, 2) a mouse moved
-	 * event is occuring or 3) the os is giving us time for idle
-	 * events.  Note that we aren't sharing the processor very
-	 * well here.  We really ought to do a better job of calling
-	 * WaitNextEvent for time slicing purposes.
-	 */
-
-	if (!found) {
-	    /*
-	     * Set up mouse region so we will wake if the mouse is moved.
-	     * We do this by defining the smallest possible region around
-	     * the current mouse position.
-	     */
-
-	    GetGlobalMouse(&currentMouse);
-	    SetRect(&mouseRect, currentMouse.h, currentMouse.v,
-		    currentMouse.h + 1, currentMouse.v + 1);
-	    RectRgn(notifier.utilityRgn, &mouseRect);
-	
-	    WaitNextEvent(everyEvent, &macEvent, sleepTime,
-		    notifier.utilityRgn);
-
-	    if (notifier.eventProcPtr != NULL) {
-		if ((*notifier.eventProcPtr)(&macEvent) == true) {
-		    found = 1;
-		}
-	    }
-	}
-    }
-    TclMacRemoveTimer(timerToken);
-    
-    /*
-     * Yield time to nay other thread at this point.  If we find that the
-     * apps thrash too switching between threads, we can put a timer here,
-     * and only yield when the timer fires.
-     */
-     
-    if (TclMacHaveThreads()) {
-        YieldToAnyThread();
-    }
-    
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Sleep --
- *
- *	Delay execution for the specified number of milliseconds.  This
- *	is not a very good call to make.  It will block the system -
- *	you will not even be able to switch applications.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Time passes.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Sleep(
-    int ms)			/* Number of milliseconds to sleep. */
-{
-    EventRecord dummy;
-    void *timerToken;
-    
-    if (ms <= 0) {
-	return;
-    }
-    
-    timerToken = TclMacStartTimer((long) ms);
-    while (1) {
-	WaitNextEvent(0, &dummy, (ms / 16.66) + 1, NULL);
-        if (TclMacHaveThreads()) {
-	    YieldToAnyThread();
-	}
-	if (TclMacTimerExpired(timerToken)) {
-	    break;
-	}
-    }
-    TclMacRemoveTimer(timerToken);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MacSetEventProc --
- *
- *	This function sets the event handling procedure for the 
- *	application.  This function will be passed all incoming Mac
- *	events.  This function usually controls the console or some
- *	other entity like Tk.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Changes the event handling function.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MacSetEventProc(
-    Tcl_MacConvertEventPtr procPtr)
-{
-    notifier.eventProcPtr = procPtr;
-}
diff --git a/mac/tclMacOSA.c b/mac/tclMacOSA.c
deleted file mode 100644
index b09cb59..0000000
--- a/mac/tclMacOSA.c
+++ /dev/null
@@ -1,2937 +0,0 @@
-/* 
- * tclMacOSA.c --
- *
- *	This contains the initialization routines, and the implementation of
- *	the OSA and Component commands.  These commands allow you to connect
- *	with the AppleScript or any other OSA component to compile and execute
- *	scripts.
- *
- * Copyright (c) 1996 Lucent Technologies and Jim Ingham
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "License Terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacOSA.c,v 1.3 1999/04/16 00:47:20 stanton Exp $
- */
-
-#define MAC_TCL
-
-#include <Aliases.h>
-#include <string.h>
-#include <AppleEvents.h>
-#include <AppleScript.h>
-#include <OSA.h>
-#include <OSAGeneric.h>
-#include <Script.h>
-
-#include <FullPath.h>
-#include <components.h>
-
-#include <resources.h>
-#include <FSpCompat.h>
-/* 
- * The following two Includes are from the More Files package.
- */
-#include <MoreFiles.h>
-#include <FullPath.h>
-
-#include "tcl.h"
-#include "tclInt.h"
-
-/*
- * I need this only for the call to FspGetFullPath,
- * I'm really not poking my nose where it does not belong!
- */
-#include "tclMacInt.h"
-
-/*
- * Data structures used by the OSA code.
- */
-typedef struct tclOSAScript {
-    OSAID scriptID;
-    OSType languageID;
-    long modeFlags;
-} tclOSAScript;
-
-typedef struct tclOSAContext {
-	OSAID contextID;
-} tclOSAContext;
-
-typedef struct tclOSAComponent {
-	char *theName;
-	ComponentInstance theComponent; /* The OSA Component represented */
-	long componentFlags;
-	OSType languageID;
-	char *languageName;
-	Tcl_HashTable contextTable;    /* Hash Table linking the context names & ID's */
-	Tcl_HashTable scriptTable;
-	Tcl_Interp *theInterp;
-	OSAActiveUPP defActiveProc;
-	long defRefCon;
-} tclOSAComponent;
-
-/*
- * Prototypes for static procedures. 
- */
-
-static pascal OSErr	TclOSAActiveProc _ANSI_ARGS_((long refCon));
-static int		TclOSACompileCmd _ANSI_ARGS_((Tcl_Interp *interp,
-		 	    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSADecompileCmd _ANSI_ARGS_((Tcl_Interp * Interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSADeleteCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSAExecuteCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSAInfoCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSALoadCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSARunCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc,
-			    char **argv));
-static int 		tclOSAStoreCmd _ANSI_ARGS_((Tcl_Interp *interp,
-			    tclOSAComponent *OSAComponent, int argc, char
-			    **argv));
-static void		GetRawDataFromDescriptor _ANSI_ARGS_((AEDesc *theDesc,
-			    Ptr destPtr, Size destMaxSize, Size *actSize));
-static OSErr 		GetCStringFromDescriptor _ANSI_ARGS_((
-			    AEDesc *sourceDesc, char *resultStr,
-			    Size resultMaxSize,Size *resultSize));
-static int 		Tcl_OSAComponentCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv)); 
-static void 		getSortedHashKeys _ANSI_ARGS_((Tcl_HashTable *theTable,
-			    char *pattern, Tcl_DString *theResult));
-static int 		ASCIICompareProc _ANSI_ARGS_((const void *first,
-			    const void *second));
-static int 		Tcl_OSACmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv)); 
-static void 		tclOSAClose _ANSI_ARGS_((ClientData clientData));
-static void 		tclOSACloseAll _ANSI_ARGS_((ClientData clientData));
-static tclOSAComponent *tclOSAMakeNewComponent _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *cmdName, char *languageName,
-			    OSType scriptSubtype, long componentFlags));  
-static int 		prepareScriptData _ANSI_ARGS_((int argc, char **argv,
-			    Tcl_DString *scrptData ,AEDesc *scrptDesc)); 
-static void 		tclOSAResultFromID _ANSI_ARGS_((Tcl_Interp *interp,
-			    ComponentInstance theComponent, OSAID resultID));
-static void 		tclOSAASError _ANSI_ARGS_((Tcl_Interp * interp,
-			    ComponentInstance theComponent, char *scriptSource));
-static int 		tclOSAGetContextID _ANSI_ARGS_((tclOSAComponent *theComponent, 
-			    char *contextName, OSAID *theContext));
-static void 		tclOSAAddContext _ANSI_ARGS_((tclOSAComponent *theComponent, 
-			    char *contextName, const OSAID theContext));						
-static int 		tclOSAMakeContext _ANSI_ARGS_((tclOSAComponent *theComponent, 
-			    char *contextName, OSAID *theContext));						
-static int 		tclOSADeleteContext _ANSI_ARGS_((tclOSAComponent *theComponent,
-			    char *contextName)); 
-static int 		tclOSALoad _ANSI_ARGS_((Tcl_Interp *interp, 
-			    tclOSAComponent *theComponent, char *resourceName, 
-			    int resourceNumber, char *fileName,OSAID *resultID));
-static int 		tclOSAStore _ANSI_ARGS_((Tcl_Interp *interp, 
-			    tclOSAComponent *theComponent, char *resourceName, 
-			    int resourceNumber, char *fileName,char *scriptName));
-static int 		tclOSAAddScript _ANSI_ARGS_((tclOSAComponent *theComponent,
-			    char *scriptName, long modeFlags, OSAID scriptID)); 		
-static int 		tclOSAGetScriptID _ANSI_ARGS_((tclOSAComponent *theComponent,
-			    char *scriptName, OSAID *scriptID)); 
-static tclOSAScript *	tclOSAGetScript _ANSI_ARGS_((tclOSAComponent *theComponent,
-			    char *scriptName)); 
-static int 		tclOSADeleteScript _ANSI_ARGS_((tclOSAComponent *theComponent,
-			    char *scriptName,char *errMsg));
-
-/*
- * "export" is a MetroWerks specific pragma.  It flags the linker that  
- * any symbols that are defined when this pragma is on will be exported 
- * to shared libraries that link with this library.
- */
- 
-
-#pragma export on
-int Tclapplescript_Init( Tcl_Interp *interp );
-#pragma export reset
-
-/*
- *----------------------------------------------------------------------
- *
- * Tclapplescript_Init --
- *
- *	Initializes the the OSA command which opens connections to
- *	OSA components, creates the AppleScript command, which opens an 
- *	instance of the AppleScript component,and constructs the table of
- *	available languages.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side Effects:
- *	Opens one connection to the AppleScript component, if 
- *	available.  Also builds up a table of available OSA languages,
- *	and creates the OSA command.
- *
- *----------------------------------------------------------------------
- */
-
-int 
-Tclapplescript_Init(
-    Tcl_Interp *interp)		/* Tcl interpreter. */
-{
-    char *errMsg = NULL;
-    OSErr myErr = noErr;
-    Boolean gotAppleScript = false;
-    Boolean GotOneOSALanguage = false;
-    ComponentDescription compDescr = {
-	kOSAComponentType,
-	(OSType) 0,
-	(OSType) 0,
-	(long) 0,
-	(long) 0
-    }, *foundComp;
-    Component curComponent = (Component) 0;
-    ComponentInstance curOpenComponent;
-    Tcl_HashTable *ComponentTable;
-    Tcl_HashTable *LanguagesTable;
-    Tcl_HashEntry *hashEntry;
-    int newPtr;
-    AEDesc componentName = { typeNull, NULL };
-    char nameStr[32];			
-    Size nameLen;
-    long appleScriptFlags;
-	
-    /* 
-     * Here We Will Get The Available Osa Languages, Since They Can Only Be 
-     * Registered At Startup...  If You Dynamically Load Components, This
-     * Will Fail, But This Is Not A Common Thing To Do.
-     */
-	 
-    LanguagesTable = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-	
-    if (LanguagesTable == NULL) {
-	panic("Memory Error Allocating Languages Hash Table");
-    }
-	
-    Tcl_SetAssocData(interp, "OSAScript_LangTable", NULL, LanguagesTable);
-    Tcl_InitHashTable(LanguagesTable, TCL_STRING_KEYS);
-	
-			
-    while ((curComponent = FindNextComponent(curComponent, &compDescr)) != 0) {
-	int nbytes = sizeof(ComponentDescription);
-	foundComp = (ComponentDescription *)
-	    ckalloc(sizeof(ComponentDescription));
-	myErr = GetComponentInfo(curComponent, foundComp, NULL, NULL, NULL);
-	if (foundComp->componentSubType ==
-		kOSAGenericScriptingComponentSubtype) {
-	    /* Skip the generic component */
-	    ckfree((char *) foundComp);
-	} else {
-	    GotOneOSALanguage = true;
-
-	    /*
-	     * This is gross: looks like I have to open the component just  
-	     * to get its name!!! GetComponentInfo is supposed to return
-	     * the name, but AppleScript always returns an empty string.
-	     */
-		 	
-	    curOpenComponent = OpenComponent(curComponent);
-	    if (curOpenComponent == NULL) {
-		Tcl_AppendResult(interp,"Error opening component",
-			(char *) NULL);
-		return TCL_ERROR;
-	    }
-			 
-	    myErr = OSAScriptingComponentName(curOpenComponent,&componentName);
-	    if (myErr == noErr) {
-		myErr = GetCStringFromDescriptor(&componentName,
-			nameStr, 31, &nameLen);
-		AEDisposeDesc(&componentName);
-	    }
-	    CloseComponent(curOpenComponent);
-
-	    if (myErr == noErr) {
-		hashEntry = Tcl_CreateHashEntry(LanguagesTable,
-			nameStr, &newPtr);
-		Tcl_SetHashValue(hashEntry, (ClientData) foundComp);
-	    } else {
-		Tcl_AppendResult(interp,"Error getting componentName.",
-			(char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    /*
-	     * Make sure AppleScript is loaded, otherwise we will
-	     * not bother to make the AppleScript command.
-	     */
-	    if (foundComp->componentSubType == kAppleScriptSubtype) {
-		appleScriptFlags = foundComp->componentFlags;
-		gotAppleScript = true;
-	    }			
-	}
-    }				
-
-    /*
-     * Create the OSA command.
-     */
-	
-    if (!GotOneOSALanguage) {
-	Tcl_AppendResult(interp,"Could not find any OSA languages",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    /*
-     * Create the Component Assoc Data & put it in the interpreter.
-     */
-	
-    ComponentTable = (Tcl_HashTable *) ckalloc(sizeof(Tcl_HashTable));
-	
-    if (ComponentTable == NULL) {
-	panic("Memory Error Allocating Hash Table");
-    }
-	
-    Tcl_SetAssocData(interp, "OSAScript_CompTable", NULL, ComponentTable);
-			
-    Tcl_InitHashTable(ComponentTable, TCL_STRING_KEYS);
-
-    /*
-     * The OSA command is not currently supported.	 
-    Tcl_CreateCommand(interp, "OSA", Tcl_OSACmd, (ClientData) NULL,
-	    (Tcl_CmdDeleteProc *) NULL);
-     */
-     
-    /* 
-     * Open up one AppleScript component, with a default context
-     * and tie it to the AppleScript command.
-     * If the user just wants single-threaded AppleScript execution
-     * this should be enough.
-     *
-     */
-	 
-    if (gotAppleScript) {
-	if (tclOSAMakeNewComponent(interp, "AppleScript",
-		"AppleScript English", kAppleScriptSubtype,
-		appleScriptFlags) == NULL ) {
-	    return TCL_ERROR;
-	}
-    }
-
-    return Tcl_PkgProvide(interp, "OSAConnect", "1.0");
-}
-
-/*
- *---------------------------------------------------------------------- 
- *
- * Tcl_OSACmd --
- *
- *	This is the command that provides the interface to the OSA
- *	component manager.  The subcommands are: close: close a component, 
- *	info: get info on components open, and open: get a new connection
- *	with the Scripting Component
- *
- * Results:
- *  	A standard Tcl result.
- *
- * Side effects:
- *  	Depends on the subcommand, see the user documentation
- *	for more details.
- *
- *----------------------------------------------------------------------
- */
- 
-int 
-Tcl_OSACmd(
-    ClientData clientData,
-    Tcl_Interp *interp,
-    int argc,
-    char **argv)
-{
-    static unsigned short componentCmdIndex = 0;
-    char autoName[32];
-    char c;
-    int length;
-    Tcl_HashTable *ComponentTable = NULL;
-	
-
-    if (argc == 1) {
-	Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		argv[0], " option\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    c = *argv[1];
-    length = strlen(argv[1]);
-	
-    /*
-     * Query out the Component Table, since most of these commands use it...
-     */
-	
-    ComponentTable = (Tcl_HashTable *) Tcl_GetAssocData(interp,
-	    "OSAScript_CompTable", (Tcl_InterpDeleteProc **) NULL);
-	
-    if (ComponentTable == NULL) {
-	Tcl_AppendResult(interp, "Error, could not get the Component Table",
-		" from the Associated data.", (char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    if (c == 'c' && strncmp(argv[1],"close",length) == 0) {
-	Tcl_HashEntry *hashEntry;
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		    argv[0], " ",argv[1], " componentName\"",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-		
-	if ((hashEntry = Tcl_FindHashEntry(ComponentTable,argv[2])) == NULL) {
-	    Tcl_AppendResult(interp, "Component \"", argv[2], "\" not found",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	} else {
-	    Tcl_DeleteCommand(interp,argv[2]);
-	    return TCL_OK;
-	}
-    } else if (c == 'o' && strncmp(argv[1],"open",length) == 0) {
-	/*
-	 * Default language is AppleScript.
-	 */
-	OSType scriptSubtype = kAppleScriptSubtype;
-	char *languageName = "AppleScript English";
-	char *errMsg = NULL;
-	ComponentDescription *theCD;
-
-	argv += 2;
-	argc -= 2;
-		 
-	while (argc > 0 ) {
-	    if (*argv[0] == '-') {
-		c = *(argv[0] + 1);
-		if (c == 'l' && strcmp(argv[0] + 1, "language") == 0) {
-		    if (argc == 1) {
-			Tcl_AppendResult(interp,
-				"Error - no language provided for the -language switch",
-				(char *) NULL);
-			return TCL_ERROR;
-		    } else {
-			Tcl_HashEntry *hashEntry;
-			Tcl_HashSearch search;
-			Boolean gotIt = false;
-			Tcl_HashTable *LanguagesTable;
-						
-			/*
-			 * Look up the language in the languages table
-			 * Do a simple strstr match, so AppleScript
-			 * will match "AppleScript English"...
-			 */
-						
-			LanguagesTable = Tcl_GetAssocData(interp,
-				"OSAScript_LangTable",
-				(Tcl_InterpDeleteProc **) NULL);
-							
-			for (hashEntry =
-				 Tcl_FirstHashEntry(LanguagesTable, &search);
-			     hashEntry != NULL;
-			     hashEntry = Tcl_NextHashEntry(&search)) {
-			    languageName = Tcl_GetHashKey(LanguagesTable,
-				    hashEntry);
-			    if (strstr(languageName,argv[1]) != NULL) {
-				theCD = (ComponentDescription *)
-				    Tcl_GetHashValue(hashEntry);
-				gotIt = true;
-				break;
-			    }
-			}
-			if (!gotIt) {
-			    Tcl_AppendResult(interp,
-				    "Error, could not find the language \"",
-				    argv[1],
-				    "\" in the list of known languages.",
-				    (char *) NULL);
-			    return TCL_ERROR;
-			}
-		    }
-		}
-		argc -= 2;
-		argv += 2;				
-	    } else {
-		Tcl_AppendResult(interp, "Expected a flag, but got ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-	}
-			
-	sprintf(autoName, "OSAComponent%-d", componentCmdIndex++);
-	if (tclOSAMakeNewComponent(interp, autoName, languageName,
-		theCD->componentSubType, theCD->componentFlags) == NULL ) {
-	    return TCL_ERROR;
-	} else {
-	    Tcl_SetResult(interp,autoName,TCL_VOLATILE);
-	    return TCL_OK;	
-	}
-		
-    } else if (c == 'i' && strncmp(argv[1],"info",length) == 0) {
-	if (argc == 2) {
-	    Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		    argv[0], " ", argv[1], " what\"",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-		 	
-	c = *argv[2];
-	length = strlen(argv[2]);
-		
-	if (c == 'c' && strncmp(argv[2], "components", length) == 0) {
-	    Tcl_DString theResult;
-			
-	    Tcl_DStringInit(&theResult);
-			
-	    if (argc == 3) {
-		getSortedHashKeys(ComponentTable,(char *) NULL, &theResult);
-	    } else if (argc == 4) {
-		getSortedHashKeys(ComponentTable, argv[3], &theResult);
-	    } else {
-		Tcl_AppendResult(interp, "Error: wrong # of arguments",
-			", should be \"", argv[0], " ", argv[1], " ",
-			argv[2], " ?pattern?\".", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_DStringResult(interp, &theResult);
-	    return TCL_OK;			
-	} else if (c == 'l' && strncmp(argv[2],"languages",length) == 0) {
-	    Tcl_DString theResult;
-	    Tcl_HashTable *LanguagesTable;
-			
-	    Tcl_DStringInit(&theResult);
-	    LanguagesTable = Tcl_GetAssocData(interp,
-		    "OSAScript_LangTable", (Tcl_InterpDeleteProc **) NULL);
-							
-	    if (argc == 3) {
-		getSortedHashKeys(LanguagesTable, (char *) NULL, &theResult);
-	    } else if (argc == 4) {
-		getSortedHashKeys(LanguagesTable, argv[3], &theResult);
-	    } else {
-		Tcl_AppendResult(interp, "Error: wrong # of arguments",
-			", should be \"", argv[0], " ", argv[1], " ",
-			argv[2], " ?pattern?\".", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    Tcl_DStringResult(interp,&theResult);
-	    return TCL_OK;			
-	} else {
-	    Tcl_AppendResult(interp, "Unknown option: ", argv[2],
-		    " for OSA info, should be one of",
-		    " \"components\" or \"languages\"",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-    } else {
-	Tcl_AppendResult(interp, "Unknown option: ", argv[1],
-		", should be one of \"open\", \"close\" or \"info\".",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/* 
- *----------------------------------------------------------------------
- *
- * Tcl_OSAComponentCmd --
- *
- *	This is the command that provides the interface with an OSA
- *	component.  The sub commands are:
- *	- compile ? -context context? scriptData
- *		compiles the script data, returns the ScriptID
- *	- decompile ? -context context? scriptData
- *		decompiles the script data, source code
- *	- execute ?-context context? scriptData
- *		compiles and runs script data
- *	- info what: get component info
- *	- load ?-flags values? fileName
- *		loads & compiles script data from fileName
- *	- run scriptId ?options?
- *		executes the compiled script 
- *
- * Results:
- *	A standard Tcl result
- *
- * Side Effects:
- *	Depends on the subcommand, see the user documentation
- *	for more details.
- *
- *----------------------------------------------------------------------
- */
- 
-int 
-Tcl_OSAComponentCmd(
-    ClientData clientData,
-    Tcl_Interp *interp, 
-    int argc,
-    char **argv)
-{
-    int length;
-    char c;
-	
-    tclOSAComponent *OSAComponent = (tclOSAComponent *) clientData;
-	
-    if (argc == 1) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"",
-		argv[0], " option ?arg ...?\"",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    c = *argv[1];
-    length = strlen(argv[1]);
-    if (c == 'c' && strncmp(argv[1], "compile", length) == 0) {
-	return TclOSACompileCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'l' && strncmp(argv[1], "load", length) == 0) {
-	return tclOSALoadCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'e' && strncmp(argv[1], "execute", length) == 0) {
-	return tclOSAExecuteCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'i' && strncmp(argv[1], "info", length) == 0) {
-	return tclOSAInfoCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'd' && strncmp(argv[1], "decompile", length) == 0) {
-	return tclOSADecompileCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'd' && strncmp(argv[1], "delete", length) == 0) {
-	return tclOSADeleteCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 'r' && strncmp(argv[1], "run", length) == 0) {
-	return tclOSARunCmd(interp, OSAComponent, argc, argv);
-    } else if (c == 's' && strncmp(argv[1], "store", length) == 0) {
-	return tclOSAStoreCmd(interp, OSAComponent, argc, argv);
-    } else {
-	Tcl_AppendResult(interp,"bad option \"", argv[1],
-		"\": should be compile, decompile, delete, ",
-		 "execute, info, load, run or store",
-		 (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    return TCL_OK;
-}
- 
-/*
- *----------------------------------------------------------------------
- *
- * TclOSACompileCmd --
- *
- *	This is the compile subcommand for the component command.
- *
- * Results:
- *	A standard Tcl result
- *
- * Side Effects:
- *  	Compiles the script data either into a script or a script
- *	context.  Adds the script to the component's script or context
- *	table.  Sets interp's result to the name of the new script or
- *	context.
- *
- *----------------------------------------------------------------------
- */
- 
-static int 
-TclOSACompileCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    int  tclError = TCL_OK;
-    int augment = 1;
-    int makeContext = 0;
-    char c;
-    char autoName[16];
-    char buffer[32];
-    char *resultName;
-    Boolean makeNewContext = false;
-    Tcl_DString scrptData;
-    AEDesc scrptDesc = { typeNull, NULL };
-    long modeFlags = kOSAModeCanInteract;
-    OSAID resultID = kOSANullScript;
-    OSAID contextID = kOSANullScript;
-    OSAID parentID = kOSANullScript;
-    OSAError osaErr = noErr;
-	
-    if (!(OSAComponent->componentFlags && kOSASupportsCompiling)) {
-	Tcl_AppendResult(interp,
-		"OSA component does not support compiling",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /* 
-     * This signals that we should make up a name, which is the
-     * default behavior:
-     */
-	 
-    autoName[0] = '\0';
-    resultName = NULL;
-	
-    if (argc == 2) {
-	numArgs:
-	Tcl_AppendResult(interp,
-		"wrong # args: should be \"", argv[0], " ", argv[1],
-		" ?options? code\"",(char *) NULL);
-	return TCL_ERROR;
-    } 
-
-    argv += 2;
-    argc -= 2;
-
-    /*
-     * Do the argument parsing.
-     */
-	
-    while (argc > 0) {
-		
-	if (*argv[0] == '-') {
-	    c = *(argv[0] + 1);
-			
-	    /*
-	     * "--" is the only switch that has no value, stops processing
-	     */
-			
-	    if (c == '-' && *(argv[0] + 2) == '\0') {
-		argv += 1;
-		argc--;
-		break;
-	    }
-			
-	    /*
-	     * So we can check here a switch with no value.
-	     */
-			
-	    if (argc == 1)  {
-		Tcl_AppendResult(interp,
-			"no value given for switch: ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    if (c == 'c' && strcmp(argv[0] + 1, "context") == 0) {
-		if (Tcl_GetBoolean(interp, argv[1], &makeContext) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-	    } else if (c == 'a' && strcmp(argv[0] + 1, "augment") == 0) {
-		/*
-		 * Augment the current context which implies making a context.
-		 */
-
-		if (Tcl_GetBoolean(interp, argv[1], &augment) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-		makeContext = 1;
-	    } else if (c == 'n' && strcmp(argv[0] + 1, "name") == 0) {
-		resultName = argv[1];
-	    } else if (c == 'p' && strcmp(argv[0] + 1,"parent") == 0) {
-		/*
-		 * Since this implies we are compiling into a context, 
-		 * set makeContext here
-		 */
-		if (tclOSAGetContextID(OSAComponent,
-			argv[1], &parentID) != TCL_OK) {
-		    Tcl_AppendResult(interp, "context not found \"",
-			    argv[1], "\"", (char *) NULL);
-		    return TCL_ERROR;
-		}
-		makeContext = 1;
-	    } else {
-		Tcl_AppendResult(interp, "bad option \"", argv[0],
-			"\": should be -augment, -context, -name or -parent",
-			 (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    argv += 2;
-	    argc -= 2;
-			
-	} else {
-	    break;
-	}
-    }
-
-    /*
-     * Make sure we have some data left...
-     */
-    if (argc == 0) {
-	goto numArgs;
-    }
-	
-    /* 
-     * Now if we are making a context, see if it is a new one... 
-     * There are three options here:
-     * 1) There was no name provided, so we autoName it
-     * 2) There was a name, then check and see if it already exists
-     *  a) If yes, then makeNewContext is false
-     *  b) Otherwise we are making a new context
-     */
-
-    if (makeContext) {
-	modeFlags |= kOSAModeCompileIntoContext;
-	if (resultName == NULL) {
-	    /*
-	     * Auto name the new context.
-	     */
-	    resultName = autoName;
-	    resultID = kOSANullScript;
-	    makeNewContext = true;
-	} else if (tclOSAGetContextID(OSAComponent,
-		resultName, &resultID) == TCL_OK) {
-	    makeNewContext = false;
-	} else { 
-	    makeNewContext = true;
-	    resultID = kOSANullScript;
-	}
-		
-	/*
-	 * Deal with the augment now...
-	 */
-	if (augment && !makeNewContext) {
-	    modeFlags |= kOSAModeAugmentContext;
-	}
-    }
-	
-    /*
-     * Ok, now we have the options, so we can compile the script data.
-     */
-			
-    if (prepareScriptData(argc, argv, &scrptData, &scrptDesc) == TCL_ERROR) {
-	Tcl_DStringResult(interp, &scrptData);
-	AEDisposeDesc(&scrptDesc);
-	return TCL_ERROR;
-    }
-
-    /* 
-     * If we want to use a parent context, we have to make the context 
-     * by hand. Note, parentID is only specified when you make a new context. 
-     */
-	
-    if (parentID != kOSANullScript && makeNewContext) {
-	AEDesc contextDesc = { typeNull, NULL };
-
-	osaErr = OSAMakeContext(OSAComponent->theComponent,
-		&contextDesc, parentID, &resultID);
-	modeFlags |= kOSAModeAugmentContext;
-    }
-	
-    osaErr = OSACompile(OSAComponent->theComponent, &scrptDesc,
-	    modeFlags, &resultID);								
-    if (osaErr == noErr) {
-	 
-	if (makeContext) {
-	    /* 
-	     * For the compiled context to be active, you need to run 
-	     * the code that is in the context.
-	     */
-	    OSAID activateID;
-
-	    osaErr = OSAExecute(OSAComponent->theComponent, resultID,
-		    resultID, kOSAModeCanInteract, &activateID);
-	    OSADispose(OSAComponent->theComponent, activateID);
-
-	    if (osaErr == noErr) {
-		if (makeNewContext) {
-		    /*
-		     * If we have compiled into a context, 
-		     * this is added to the context table 
-		     */
-					 
-		    tclOSAAddContext(OSAComponent, resultName, resultID);
-		}
-				
-		Tcl_SetResult(interp, resultName, TCL_VOLATILE);
-		tclError = TCL_OK;
-	    }
-	} else {
-	    /*
-	     * For a script, we return the script name.
-	     */
-	    tclOSAAddScript(OSAComponent, resultName, modeFlags, resultID);
-	    Tcl_SetResult(interp, resultName, TCL_VOLATILE);
-	    tclError = TCL_OK;	
-	}
-    }
-	
-    /* 
-     * This catches the error either from the original compile, 
-     * or from the execute in case makeContext == true
-     */
-	 						
-    if (osaErr == errOSAScriptError) {
-	OSADispose(OSAComponent->theComponent, resultID);
-	tclOSAASError(interp, OSAComponent->theComponent,
-		Tcl_DStringValue(&scrptData));
-	tclError = TCL_ERROR;
-    } else if (osaErr != noErr)  {
-	sprintf(buffer, "Error #%-6d compiling script", osaErr);
-	Tcl_AppendResult(interp, buffer, (char *) NULL);
-	tclError = TCL_ERROR;		
-    } 
-
-    Tcl_DStringFree(&scrptData);
-    AEDisposeDesc(&scrptDesc);
-	
-    return tclError;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSADecompileCmd --
- *
- * 	This implements the Decompile subcommand of the component command
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side Effects:
- *  	Decompiles the script, and sets interp's result to the
- *	decompiled script data.
- *
- *----------------------------------------------------------------------
- */
- 		
-static int 
-tclOSADecompileCmd(
-    Tcl_Interp * interp,
-    tclOSAComponent *OSAComponent,
-    int argc, 
-    char **argv)
-{
-    AEDesc resultingSourceData = { typeChar, NULL };
-    OSAID scriptID;
-    Boolean isContext;
-    long result;
-    OSErr sysErr = noErr;
- 		
-    if (argc == 2) {
-	Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		argv[0], " ",argv[1], " scriptName \"", (char *) NULL );
-	return TCL_ERROR;
-    }
- 	
-    if (!(OSAComponent->componentFlags && kOSASupportsGetSource)) {
-	Tcl_AppendResult(interp,
-		"Error, this component does not support get source",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
- 	
-    if (tclOSAGetScriptID(OSAComponent, argv[2], &scriptID) == TCL_OK) {
-	isContext = false;
-    } else if (tclOSAGetContextID(OSAComponent, argv[2], &scriptID)
-	    == TCL_OK ) {
-	isContext = true;
-    } else { 
-	Tcl_AppendResult(interp, "Could not find script \"",
-		argv[2], "\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    OSAGetScriptInfo(OSAComponent->theComponent, scriptID,
-	    kOSACanGetSource, &result);
-						
-    sysErr = OSAGetSource(OSAComponent->theComponent, 
-	    scriptID, typeChar, &resultingSourceData);
-	
-    if (sysErr == noErr) {
-	Tcl_DString theResult;
-	Tcl_DStringInit(&theResult);
-
-	Tcl_DStringAppend(&theResult, *resultingSourceData.dataHandle,
-		GetHandleSize(resultingSourceData.dataHandle));
-	Tcl_DStringResult(interp, &theResult);
-	AEDisposeDesc(&resultingSourceData);
-	return TCL_OK;
-    } else {
-	Tcl_AppendResult(interp, "Error getting source data", (char *) NULL);
-	AEDisposeDesc(&resultingSourceData);
-	return TCL_ERROR;
-    }
-}			
-	 	
-/*
- *----------------------------------------------------------------------
- *
- * tclOSADeleteCmd --
- *
- *	This implements the Delete subcommand of the Component command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side Effects:
- *  	Deletes a script from the script list of the given component.
- *	Removes all references to the script, and frees the memory
- *	associated with it.
- *
- *----------------------------------------------------------------------
- */
- 
-static int 
-tclOSADeleteCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    char c,*errMsg = NULL;
-    int length;
- 	
-    if (argc < 4) {
-	Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		argv[0], " ", argv[1], " what scriptName", (char *) NULL);
-	return TCL_ERROR;
-    }
- 	
-    c = *argv[2];
-    length = strlen(argv[2]);
-    if (c == 'c' && strncmp(argv[2], "context", length) == 0) {
-	if (strcmp(argv[3], "global") == 0) {
-	    Tcl_AppendResult(interp, "You cannot delete the global context",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	} else if (tclOSADeleteContext(OSAComponent, argv[3]) != TCL_OK) {
-	    Tcl_AppendResult(interp, "Error deleting script \"", argv[2],
-		    "\": ", errMsg, (char *) NULL);
-	    ckfree(errMsg);
-	    return TCL_ERROR;
-	}
-    } else if (c == 's' && strncmp(argv[2], "script", length) == 0) {
-	if (tclOSADeleteScript(OSAComponent, argv[3], errMsg) != TCL_OK) {
-	    Tcl_AppendResult(interp, "Error deleting script \"", argv[3],
-		    "\": ", errMsg, (char *) NULL);
-	    ckfree(errMsg);
-	    return TCL_ERROR;
-	}
-    } else {
-	Tcl_AppendResult(interp,"Unknown value ", argv[2],
-		" should be one of ",
-		"\"context\" or \"script\".",
-		(char *) NULL );
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------- 
- *
- * tclOSAExecuteCmd --
- *
- *	This implements the execute subcommand of the component command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Executes the given script data, and sets interp's result to
- *	the OSA component's return value.
- *
- *---------------------------------------------------------------------- 
- */
- 
-static int 
-tclOSAExecuteCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    int tclError = TCL_OK, resID = 128;
-    char c,buffer[32],
-	*contextName = NULL,*scriptName = NULL, *resName = NULL;
-    Boolean makeNewContext = false,makeContext = false;
-    AEDesc scrptDesc = { typeNull, NULL };
-    long modeFlags = kOSAModeCanInteract;
-    OSAID resultID = kOSANullScript,
-	contextID = kOSANullScript,
-	parentID = kOSANullScript;
-    Tcl_DString scrptData;
-    OSAError osaErr = noErr;
-    OSErr  sysErr = noErr;
-
-    if (argc == 2) {
-	Tcl_AppendResult(interp,
-		"Error, no script data for \"", argv[0],
-		" run\"", (char *) NULL);
-	return TCL_ERROR;
-    } 
-
-    argv += 2;
-    argc -= 2;
-
-    /*
-     * Set the context to the global context by default.
-     * Then parse the argument list for switches
-     */
-    tclOSAGetContextID(OSAComponent, "global", &contextID);
-	
-    while (argc > 0) {
-		
-	if (*argv[0] == '-') {
-	    c = *(argv[0] + 1);
-
-	    /*
-	     * "--" is the only switch that has no value.
-	     */
-			
-	    if (c == '-' && *(argv[0] + 2) == '\0') {
-		argv += 1;
-		argc--;
-		break;
-	    }
-			
-	    /*
-	     * So we can check here for a switch with no value.
-	     */
-			
-	    if (argc == 1)  {
-		Tcl_AppendResult(interp,
-			"Error, no value given for switch ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    if (c == 'c' && strcmp(argv[0] + 1, "context") == 0) {
-		if (tclOSAGetContextID(OSAComponent,
-			argv[1], &contextID) == TCL_OK) {
-		} else {
-		    Tcl_AppendResult(interp, "Script context \"",
-			    argv[1], "\" not found", (char *) NULL);
-		    return TCL_ERROR;
-		}
-	    } else { 
-		Tcl_AppendResult(interp, "Error, invalid switch ", argv[0],
-			" should be \"-context\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    argv += 2;
-	    argc -= 2;
-	} else {
-	    break;
-	}
-    }
-	
-    if (argc == 0) {
-	Tcl_AppendResult(interp, "Error, no script data", (char *) NULL);
-	return TCL_ERROR;
-    }
-		
-    if (prepareScriptData(argc, argv, &scrptData, &scrptDesc) == TCL_ERROR) {
-	Tcl_DStringResult(interp, &scrptData);
-	AEDisposeDesc(&scrptDesc);
-	return TCL_ERROR;
-    }
-    /*
-     * Now try to compile and run, but check to make sure the
-     * component supports the one shot deal
-     */
-    if (OSAComponent->componentFlags && kOSASupportsConvenience) {
-	osaErr = OSACompileExecute(OSAComponent->theComponent,
-		&scrptDesc, contextID, modeFlags, &resultID);
-    } else {
-	/*
-	 * If not, we have to do this ourselves
-	 */
-	if (OSAComponent->componentFlags && kOSASupportsCompiling) {
-	    OSAID compiledID = kOSANullScript;
-	    osaErr = OSACompile(OSAComponent->theComponent, &scrptDesc,
-		    modeFlags, &compiledID);
-	    if (osaErr == noErr) {
-		osaErr = OSAExecute(OSAComponent->theComponent, compiledID,
-			contextID, modeFlags, &resultID);
-	    }
-	    OSADispose(OSAComponent->theComponent, compiledID);
-	} else {
-	    /*
-	     * The scripting component had better be able to load text data...
-	     */
-	    OSAID loadedID = kOSANullScript;
-			
-	    scrptDesc.descriptorType = OSAComponent->languageID;
-	    osaErr = OSALoad(OSAComponent->theComponent, &scrptDesc,
-		    modeFlags, &loadedID);
-	    if (osaErr == noErr) {
-		OSAExecute(OSAComponent->theComponent, loadedID,
-			contextID, modeFlags, &resultID);
-	    }
-	    OSADispose(OSAComponent->theComponent, loadedID);
-	}
-    }
-    if (osaErr == errOSAScriptError) {
-	tclOSAASError(interp, OSAComponent->theComponent,
-		Tcl_DStringValue(&scrptData));
-	tclError = TCL_ERROR;
-    } else if (osaErr != noErr) {
-	sprintf(buffer, "Error #%-6d compiling script", osaErr);
-	Tcl_AppendResult(interp, buffer, (char *) NULL);
-	tclError = TCL_ERROR;		
-    } else  {
-	tclOSAResultFromID(interp, OSAComponent->theComponent, resultID);
-	osaErr = OSADispose(OSAComponent->theComponent, resultID);
-	tclError = TCL_OK;
-    } 
-
-    Tcl_DStringFree(&scrptData);
-    AEDisposeDesc(&scrptDesc);	
-
-    return tclError;	
-} 
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAInfoCmd --
- *
- * This implements the Info subcommand of the component command
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Info on scripts and contexts.  See the user documentation for details.
- *
- *----------------------------------------------------------------------
- */
-static int 
-tclOSAInfoCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc, 
-    char **argv)
-{
-    char c;
-    int length;
-    Tcl_DString theResult;
-	
-    if (argc == 2) {
-	Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		argv[0], " ", argv[1], " what \"", (char *) NULL );
-	return TCL_ERROR;
-    }
- 	
-    c = *argv[2];
-    length = strlen(argv[2]);
-    if (c == 's' && strncmp(argv[2], "scripts", length) == 0) {
-	Tcl_DStringInit(&theResult);
-	if (argc == 3) {
-	    getSortedHashKeys(&OSAComponent->scriptTable, (char *) NULL,
-		    &theResult);
-	} else if (argc == 4) {
-	    getSortedHashKeys(&OSAComponent->scriptTable, argv[3], &theResult);
-	} else {
-	    Tcl_AppendResult(interp, "Error: wrong # of arguments,",
-		    " should be \"", argv[0], " ", argv[1], " ",
-		    argv[2], " ?pattern?", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	Tcl_DStringResult(interp, &theResult);
-	return TCL_OK;			
-    } else if (c == 'c' && strncmp(argv[2], "contexts", length) == 0) {
-	Tcl_DStringInit(&theResult);		
-	if (argc == 3) {
-	    getSortedHashKeys(&OSAComponent->contextTable, (char *) NULL,
-		   &theResult);
-	} else if (argc == 4) {
-	    getSortedHashKeys(&OSAComponent->contextTable,
-		    argv[3], &theResult);
-	} else {
-	    Tcl_AppendResult(interp, "Error: wrong # of arguments for ,",
-		    " should be \"", argv[0], " ", argv[1], " ",
-		    argv[2], " ?pattern?", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	Tcl_DStringResult(interp, &theResult);
-	return TCL_OK;			
-    } else if (c == 'l' && strncmp(argv[2], "language", length) == 0) {
-	Tcl_SetResult(interp, OSAComponent->languageName, TCL_STATIC);
-	return TCL_OK;
-    } else {
-	Tcl_AppendResult(interp, "Unknown argument \"", argv[2],
-		"\" for \"", argv[0], " info \", should be one of ",
-		"\"scripts\" \"language\", or \"contexts\"",
-		(char *) NULL);
-	return TCL_ERROR;
-    } 
-}
-		
-/*
- *----------------------------------------------------------------------
- *
- * tclOSALoadCmd --
- *
- *	This is the load subcommand for the Component Command
- *
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Loads script data from the given file, creates a new context
- *	for it, and sets interp's result to the name of the new context.
- *
- *----------------------------------------------------------------------
- */
- 
-static int 
-tclOSALoadCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    int tclError = TCL_OK, resID = 128;
-    char c, autoName[24],
-	*contextName = NULL, *scriptName = NULL, *resName = NULL;
-    Boolean makeNewContext = false, makeContext = false;
-    AEDesc scrptDesc = { typeNull, NULL };
-    long modeFlags = kOSAModeCanInteract;
-    OSAID resultID = kOSANullScript,
-	contextID = kOSANullScript,
-	parentID = kOSANullScript;
-    OSAError osaErr = noErr;
-    OSErr  sysErr = noErr;
-    long scptInfo;
-	
-    autoName[0] = '\0';
-    scriptName = autoName;
-    contextName = autoName;
-	
-    if (argc == 2) {
-	Tcl_AppendResult(interp,
-		"Error, no data for \"", argv[0], " ", argv[1],
-		"\"", (char *) NULL);
-	return TCL_ERROR;
-    } 
-
-    argv += 2;
-    argc -= 2;
-
-    /*
-     * Do the argument parsing.
-     */
-	
-    while (argc > 0) {
-		
-	if (*argv[0] == '-') {
-	    c = *(argv[0] + 1);
-			
-	    /*
-	     * "--" is the only switch that has no value.
-	     */
-			
-	    if (c == '-' && *(argv[0] + 2) == '\0') {
-		argv += 1;
-		argc--;
-		break;
-	    }
-			
-	    /*
-	     * So we can check here a switch with no value.
-	     */
-			
-	    if (argc == 1)  {
-		Tcl_AppendResult(interp, "Error, no value given for switch ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    if (c == 'r' && strcmp(argv[0] + 1, "rsrcname") == 0) {
-		resName = argv[1];
-	    } else if (c == 'r' && strcmp(argv[0] + 1, "rsrcid") == 0) {
-		if (Tcl_GetInt(interp, argv[1], &resID) != TCL_OK) {
-		    Tcl_AppendResult(interp,
-			    "Error getting resource ID", (char *) NULL);
-		    return TCL_ERROR;
-		}
-	    } else {
-		Tcl_AppendResult(interp, "Error, invalid switch ", argv[0],
-			" should be \"--\", \"-rsrcname\" or \"-rsrcid\"",
-			(char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    argv += 2;
-	    argc -= 2;
-	} else {
-	    break;
-	}
-    }
-    /*
-     * Ok, now we have the options, so we can load the resource,
-     */
-    if (argc == 0) {
-	Tcl_AppendResult(interp, "Error, no filename given", (char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    if (tclOSALoad(interp, OSAComponent, resName, resID,
-	    argv[0], &resultID) != TCL_OK) {
-	Tcl_AppendResult(interp, "Error in load command", (char *) NULL);
-	return TCL_ERROR;
-    }
-	 
-    /*
-     *  Now find out whether we have a script, or a script context.
-     */
-	 
-    OSAGetScriptInfo(OSAComponent->theComponent, resultID,
-	    kOSAScriptIsTypeScriptContext, &scptInfo);
-    
-    if (scptInfo) {
-	autoName[0] = '\0';
-	tclOSAAddContext(OSAComponent, autoName, resultID);
-		
-	Tcl_SetResult(interp, autoName, TCL_VOLATILE);
-    } else {
-	/*
-	 * For a script, we return the script name
-	 */
-	autoName[0] = '\0';
-	tclOSAAddScript(OSAComponent, autoName, kOSAModeCanInteract, resultID);
-	Tcl_SetResult(interp, autoName, TCL_VOLATILE);
-    }		 	
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSARunCmd --
- *
- *	This implements the run subcommand of the component command
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Runs the given compiled script, and returns the OSA
- *	component's result.
- *
- *----------------------------------------------------------------------
- */
- 
-static int 
-tclOSARunCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    int tclError = TCL_OK,
-	resID = 128;
-    char c, *contextName = NULL,
-	*scriptName = NULL, 
-	*resName = NULL;
-    AEDesc scrptDesc = { typeNull, NULL };
-    long modeFlags = kOSAModeCanInteract;
-    OSAID resultID = kOSANullScript,
-	contextID = kOSANullScript,
-	parentID = kOSANullScript;
-    OSAError osaErr = noErr;
-    OSErr sysErr = noErr;
-    char *componentName = argv[0];
-    OSAID scriptID;
-	
-    if (argc == 2) {
-	Tcl_AppendResult(interp, "Wrong # of arguments, should be \"",
-		argv[0], " ", argv[1], " scriptName", (char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    /*
-     * Set the context to the global context for this component,
-     * as a default
-     */
-    if (tclOSAGetContextID(OSAComponent, "global", &contextID) != TCL_OK) {
-	Tcl_AppendResult(interp,
-		"Could not find the global context for component ",
-		OSAComponent->theName, (char *) NULL );
-	return TCL_ERROR;
-    }
-
-    /*
-     * Now parse the argument list for switches
-     */
-    argv += 2;
-    argc -= 2;
-	
-    while (argc > 0) {
-	if (*argv[0] == '-') {
-	    c = *(argv[0] + 1);
-	    /*
-	     * "--" is the only switch that has no value
-	     */
-	    if (c == '-' && *(argv[0] + 2) == '\0') {
-		argv += 1;
-		argc--;
-		break;
-	    }
-			
-	    /*
-	     * So we can check here for a switch with no value.
-	     */
-	    if (argc == 1)  {
-		Tcl_AppendResult(interp, "Error, no value given for switch ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    if (c == 'c' && strcmp(argv[0] + 1, "context") == 0) {
-		if (argc == 1) {
-		    Tcl_AppendResult(interp,
-			    "Error - no context provided for the -context switch",
-			    (char *) NULL);
-		    return TCL_ERROR;
-		} else if (tclOSAGetContextID(OSAComponent,
-			argv[1], &contextID) == TCL_OK) {
-		} else {
-		    Tcl_AppendResult(interp, "Script context \"", argv[1],
-			    "\" not found", (char *) NULL);
-		    return TCL_ERROR;
-		} 
-	    } else {
-		Tcl_AppendResult(interp, "Error, invalid switch ", argv[0],
-			" for ", componentName,
-			" should be \"-context\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    argv += 2;
-	    argc -= 2;
-	} else {
-	    break;
-	}
-    }
-	
-    if (tclOSAGetScriptID(OSAComponent, argv[0], &scriptID) != TCL_OK) {
-	if (tclOSAGetContextID(OSAComponent, argv[0], &scriptID) != TCL_OK) {
-	    Tcl_AppendResult(interp, "Could not find script \"",
-		    argv[2], "\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-	
-    sysErr = OSAExecute(OSAComponent->theComponent,
-	    scriptID, contextID, modeFlags, &resultID);
-							
-    if (sysErr == errOSAScriptError) {
-	tclOSAASError(interp, OSAComponent->theComponent, (char *) NULL);
-	tclError = TCL_ERROR;
-    } else if (sysErr != noErr) {
-	char buffer[32];
-	sprintf(buffer, "Error #%6.6d encountered in run", sysErr);
-	Tcl_SetResult(interp, buffer, TCL_VOLATILE);
-	tclError = TCL_ERROR;
-    } else {
-	tclOSAResultFromID(interp, OSAComponent->theComponent, resultID );
-    }
-    OSADispose(OSAComponent->theComponent, resultID);
-
-    return tclError;		
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAStoreCmd --
- *
- *	This implements the store subcommand of the component command
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Runs the given compiled script, and returns the OSA
- *	component's result.
- *
- *----------------------------------------------------------------------
- */
- 
-static int 
-tclOSAStoreCmd(
-    Tcl_Interp *interp,
-    tclOSAComponent *OSAComponent,
-    int argc,
-    char **argv)
-{
-    int tclError = TCL_OK, resID = 128;
-    char c, *contextName = NULL, *scriptName = NULL, *resName = NULL;
-    Boolean makeNewContext = false, makeContext = false;
-    AEDesc scrptDesc = { typeNull, NULL };
-    long modeFlags = kOSAModeCanInteract;
-    OSAID resultID = kOSANullScript,
-	contextID = kOSANullScript,
-	parentID = kOSANullScript;
-    OSAError osaErr = noErr;
-    OSErr  sysErr = noErr;
-		
-    if (argc == 2) {
-	Tcl_AppendResult(interp, "Error, no data for \"", argv[0],
-		" ",argv[1], "\"", (char *) NULL);
-	return TCL_ERROR;
-    } 
-
-    argv += 2;
-    argc -= 2;
-
-    /*
-     * Do the argument parsing
-     */
-	
-    while (argc > 0) {
-	if (*argv[0] == '-') {
-	    c = *(argv[0] + 1);
-			
-	    /*
-	     * "--" is the only switch that has no value
-	     */
-	    if (c == '-' && *(argv[0] + 2) == '\0') {
-		argv += 1;
-		argc--;
-		break;
-	    }
-			
-	    /*
-	     * So we can check here a switch with no value.
-	     */
-	    if (argc == 1)  {
-		Tcl_AppendResult(interp,
-			"Error, no value given for switch ",
-			argv[0], (char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    if (c == 'r' && strcmp(argv[0] + 1, "rsrcname") == 0) {
-		resName = argv[1];
-	    } else if (c == 'r' && strcmp(argv[0] + 1, "rsrcid") == 0) {
-		if (Tcl_GetInt(interp, argv[1], &resID) != TCL_OK) {
-		    Tcl_AppendResult(interp,
-			    "Error getting resource ID", (char *) NULL);
-		    return TCL_ERROR;
-		}
-	    } else {
-		Tcl_AppendResult(interp, "Error, invalid switch ", argv[0],
-			" should be \"--\", \"-rsrcname\" or \"-rsrcid\"",
-			(char *) NULL);
-		return TCL_ERROR;
-	    }
-			
-	    argv += 2;
-	    argc -= 2;
-	} else {
-	    break;
-	}
-    }
-    /*
-     * Ok, now we have the options, so we can load the resource,
-     */
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "Error, wrong # of arguments, should be ",
-		argv[0], " ", argv[1], "?option flag? scriptName fileName",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-	
-    if (tclOSAStore(interp, OSAComponent, resName, resID,
-	    argv[0], argv[1]) != TCL_OK) {
-	Tcl_AppendResult(interp, "Error in load command", (char *) NULL);
-	return TCL_ERROR;
-    } else {
-	Tcl_ResetResult(interp);
-	tclError = TCL_OK;
-    }
-    
-    return tclError;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAMakeNewComponent --
- *
- *	Makes a command cmdName to represent a new connection to the
- *	OSA component with componentSubType scriptSubtype.
- *
- * Results: 
- *	Returns the tclOSAComponent structure for the connection.
- *
- * Side Effects: 
- *	Adds a new element to the component table.  If there is an
- *	error, then the result of the Tcl interpreter interp is set
- *	to an appropriate error message.
- *
- *----------------------------------------------------------------------
- */
- 
-tclOSAComponent *
-tclOSAMakeNewComponent(
-    Tcl_Interp *interp,
-    char *cmdName,
-    char *languageName, 
-    OSType scriptSubtype,
-    long componentFlags) 
-{
-    char buffer[32];
-    AEDesc resultingName = {typeNull, NULL};
-    AEDesc nullDesc = {typeNull, NULL };
-    OSAID globalContext;
-    char global[] = "global";
-    int nbytes;
-    ComponentDescription requestedComponent = {
-	kOSAComponentType,
-	(OSType) 0,
-	(OSType) 0,
-	(long int) 0,
-	(long int) 0
-    };
-    Tcl_HashTable *ComponentTable;
-    Component foundComponent = NULL;
-    OSAActiveUPP myActiveProcUPP;
-			
-    tclOSAComponent *newComponent;
-    Tcl_HashEntry *hashEntry;
-    int newPtr;
-	
-    requestedComponent.componentSubType = scriptSubtype;
-    nbytes = sizeof(tclOSAComponent);
-    newComponent = (tclOSAComponent *) ckalloc(sizeof(tclOSAComponent));
-    if (newComponent == NULL) {
-	goto CleanUp;
-    }
-	
-    foundComponent = FindNextComponent(0, &requestedComponent);
-    if (foundComponent == 0) {
-	Tcl_AppendResult(interp,
-		"Could not find component of requested type", (char *) NULL);
-	goto CleanUp;
-    } 
-	
-    newComponent->theComponent = OpenComponent(foundComponent); 
-	
-    if (newComponent->theComponent == NULL) {
-	Tcl_AppendResult(interp,
-		"Could not open component of the requested type",
-		(char *) NULL);
-	goto CleanUp;
-    }
-							
-    newComponent->languageName = (char *) ckalloc(strlen(languageName) + 1);
-    strcpy(newComponent->languageName,languageName);
-	
-    newComponent->componentFlags = componentFlags;
-	
-    newComponent->theInterp = interp;
-	
-    Tcl_InitHashTable(&newComponent->contextTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&newComponent->scriptTable, TCL_STRING_KEYS);
-		
-    if (tclOSAMakeContext(newComponent, global, &globalContext) != TCL_OK) {
-	sprintf(buffer, "%-6.6d", globalContext);
-	Tcl_AppendResult(interp, "Error ", buffer, " making ", global,
-		" context.", (char *) NULL);
-	goto CleanUp;
-    }
-    
-    newComponent->languageID = scriptSubtype;
-	
-    newComponent->theName = (char *) ckalloc(strlen(cmdName) + 1 );
-    strcpy(newComponent->theName, cmdName);
-
-    Tcl_CreateCommand(interp, newComponent->theName, Tcl_OSAComponentCmd,
-	    (ClientData) newComponent, tclOSAClose);
-					
-    /*
-     * Register the new component with the component table
-     */ 
-
-    ComponentTable = (Tcl_HashTable *) Tcl_GetAssocData(interp,
-	    "OSAScript_CompTable", (Tcl_InterpDeleteProc **) NULL);
-	
-    if (ComponentTable == NULL) {
-	Tcl_AppendResult(interp, "Error, could not get the Component Table",
-		" from the Associated data.", (char *) NULL);
-	return (tclOSAComponent *) NULL;
-    }
-	
-    hashEntry = Tcl_CreateHashEntry(ComponentTable,
-	    newComponent->theName, &newPtr);	
-    Tcl_SetHashValue(hashEntry, (ClientData) newComponent);
-
-    /*
-     * Set the active proc to call Tcl_DoOneEvent() while idle
-     */
-    if (OSAGetActiveProc(newComponent->theComponent,
-	    &newComponent->defActiveProc, &newComponent->defRefCon) != noErr ) {
-    	/* TODO -- clean up here... */
-    }
-
-    myActiveProcUPP = NewOSAActiveProc(TclOSAActiveProc);
-    OSASetActiveProc(newComponent->theComponent,
-	    myActiveProcUPP, (long) newComponent);
-    return newComponent;
-	
-    CleanUp:
-	
-    ckfree((char *) newComponent);
-    return (tclOSAComponent *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAClose --
- *
- *	This procedure closes the connection to an OSA component, and 
- *	deletes all the script and context data associated with it.
- *	It is the command deletion callback for the component's command.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	Closes the connection, and releases all the script data.
- *
- *----------------------------------------------------------------------
- */
-
-void 
-tclOSAClose(
-    ClientData clientData) 
-{
-    tclOSAComponent *theComponent = (tclOSAComponent *) clientData;
-    Tcl_HashEntry *hashEntry;
-    Tcl_HashSearch search;
-    tclOSAScript *theScript;
-    Tcl_HashTable *ComponentTable;
-	
-    /* 
-     * Delete the context and script tables 
-     * the memory for the language name, and
-     * the hash entry.
-     */
-	
-    for (hashEntry = Tcl_FirstHashEntry(&theComponent->scriptTable, &search);
-	 hashEntry != NULL;
-	 hashEntry = Tcl_NextHashEntry(&search)) {
-
-	theScript = (tclOSAScript *) Tcl_GetHashValue(hashEntry);
-	OSADispose(theComponent->theComponent, theScript->scriptID);	
-	ckfree((char *) theScript);
-	Tcl_DeleteHashEntry(hashEntry);
-    }
-	
-    for (hashEntry = Tcl_FirstHashEntry(&theComponent->contextTable, &search);
-	 hashEntry != NULL;
-	 hashEntry = Tcl_NextHashEntry(&search)) {
-
-	Tcl_DeleteHashEntry(hashEntry);
-    }
-	
-    ckfree(theComponent->languageName);
-    ckfree(theComponent->theName);
-	
-    /*
-     * Finally close the component
-     */
-	
-    CloseComponent(theComponent->theComponent);
-	
-    ComponentTable = (Tcl_HashTable *)
-	Tcl_GetAssocData(theComponent->theInterp,
-		"OSAScript_CompTable", (Tcl_InterpDeleteProc **) NULL);
-	
-    if (ComponentTable == NULL) {
-	panic("Error, could not get the Component Table from the Associated data.");
-    }
-	
-    hashEntry = Tcl_FindHashEntry(ComponentTable, theComponent->theName);
-    if (hashEntry != NULL) {
-	Tcl_DeleteHashEntry(hashEntry);
-    }
-    
-    ckfree((char *) theComponent);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAGetContextID  --
- *
- *	This returns the context ID, given the component name.
- *
- * Results:
- *	A context ID
- *
- * Side effects:
- *	None
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-tclOSAGetContextID(
-    tclOSAComponent *theComponent, 
-    char *contextName, 
-    OSAID *theContext)
-{
-    Tcl_HashEntry *hashEntry;
-    tclOSAContext *contextStruct;
-	
-    if ((hashEntry = Tcl_FindHashEntry(&theComponent->contextTable,
-	    contextName)) == NULL ) {			
-	return TCL_ERROR;
-    } else {
-	contextStruct = (tclOSAContext *) Tcl_GetHashValue(hashEntry);
-	*theContext = contextStruct->contextID;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAAddContext  --
- *
- *	This adds the context ID, with the name contextName.  If the
- *	name is passed in as a NULL string, space is malloc'ed for the
- *	string and a new name is made up, if the string is empty, you
- *	must have allocated enough space ( 24 characters is fine) for
- *	the name, which is made up and passed out.
- *
- * Results:
- *	Nothing
- *
- * Side effects:
- *	Adds the script context to the component's context table.
- *
- *----------------------------------------------------------------------
- */
-
-static void 
-tclOSAAddContext(
-    tclOSAComponent *theComponent, 
-    char *contextName,
-    const OSAID theContext)
-{
-    static unsigned short contextIndex = 0;
-    tclOSAContext *contextStruct;
-    Tcl_HashEntry *hashEntry;
-    int newPtr;
-
-    if (contextName == NULL) {
-	contextName = ckalloc(16 + TCL_INTEGER_SPACE);
-	sprintf(contextName, "OSAContext%d", contextIndex++);
-    } else if (*contextName == '\0') {
-	sprintf(contextName, "OSAContext%d", contextIndex++);
-    }
-	
-    hashEntry = Tcl_CreateHashEntry(&theComponent->contextTable,
-	    contextName, &newPtr);	
-
-    contextStruct = (tclOSAContext *) ckalloc(sizeof(tclOSAContext));
-    contextStruct->contextID = theContext;
-    Tcl_SetHashValue(hashEntry,(ClientData) contextStruct);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSADeleteContext  --
- *
- *	This deletes the context struct, with the name contextName.  
- *
- * Results:
- *	A normal Tcl result
- *
- * Side effects:
- *	Removes the script context to the component's context table,
- *	and deletes the data associated with it.
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-tclOSADeleteContext(
-    tclOSAComponent *theComponent,
-    char *contextName) 
-{
-    Tcl_HashEntry *hashEntry;
-    tclOSAContext *contextStruct;
-	
-    hashEntry = Tcl_FindHashEntry(&theComponent->contextTable, contextName);
-    if (hashEntry == NULL) {
-	return TCL_ERROR;
-    }	
-    /*
-     * Dispose of the script context data
-     */
-    contextStruct = (tclOSAContext *) Tcl_GetHashValue(hashEntry);
-    OSADispose(theComponent->theComponent,contextStruct->contextID);
-    /*
-     * Then the hash entry
-     */
-    ckfree((char *) contextStruct);
-    Tcl_DeleteHashEntry(hashEntry);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAMakeContext  --
- *
- *	This makes the context with name contextName, and returns the ID.
- *
- * Results:
- *	A standard Tcl result
- *
- * Side effects:
- *	Makes a new context, adds it to the context table, and returns 
- *	the new contextID in the variable theContext.
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-tclOSAMakeContext(
-    tclOSAComponent *theComponent, 
-    char *contextName,
-    OSAID *theContext)
-{
-    AEDesc contextNameDesc = {typeNull, NULL};
-    OSAError osaErr = noErr;
-
-    AECreateDesc(typeChar, contextName, strlen(contextName), &contextNameDesc);
-    osaErr = OSAMakeContext(theComponent->theComponent, &contextNameDesc,
-	    kOSANullScript, theContext);
-								
-    AEDisposeDesc(&contextNameDesc);
-	
-    if (osaErr == noErr) {
-	tclOSAAddContext(theComponent, contextName, *theContext);
-    } else {
-	*theContext = (OSAID) osaErr;
-	return TCL_ERROR;
-    }
-	
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAStore --
- *
- *	This stores a script resource from the file named in fileName.
- *
- *	Most of this routine is caged from the Tcl Source, from the
- *	Tcl_MacSourceCmd routine.  This is good, since it ensures this
- *	follows the same convention for looking up files as Tcl.
- *
- * Returns
- *	A standard Tcl result.
- *
- * Side Effects:
- *	The given script data is stored in the file fileName.
- *
- *----------------------------------------------------------------------
- */
- 
-int
-tclOSAStore(
-    Tcl_Interp *interp,
-    tclOSAComponent *theComponent,
-    char *resourceName,
-    int resourceNumber, 
-    char *scriptName,
-    char *fileName)
-{
-    Handle resHandle;
-    Str255 rezName;
-    int result = TCL_OK;
-    short saveRef, fileRef = -1;
-    char idStr[16 + TCL_INTEGER_SPACE];
-    FSSpec fileSpec;
-    Tcl_DString buffer;
-    char *nativeName;
-    OSErr myErr = noErr;
-    OSAID scriptID;
-    Size scriptSize;
-    AEDesc scriptData;
-
-    /*
-     * First extract the script data
-     */
-	
-    if (tclOSAGetScriptID(theComponent, scriptName, &scriptID) != TCL_OK ) {
-	if (tclOSAGetContextID(theComponent, scriptName, &scriptID)
-		!= TCL_OK) {
-	    Tcl_AppendResult(interp, "Error getting script ",
-		    scriptName, (char *) NULL);
-	    return TCL_ERROR;
-	}
-    }
-	
-    myErr = OSAStore(theComponent->theComponent, scriptID,
-	    typeOSAGenericStorage, kOSAModeNull, &scriptData);
-    if (myErr != noErr) {
-	sprintf(idStr, "%d", myErr);
-	Tcl_AppendResult(interp, "Error #", idStr,
-		" storing script ", scriptName, (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Now try to open the output file
-     */
-	
-    saveRef = CurResFile();
-	
-    if (fileName != NULL) {
-	OSErr err;
-		
-	Tcl_DStringInit(&buffer);	
-	nativeName = Tcl_TranslateFileName(interp, fileName, &buffer);
-	if (nativeName == NULL) {
-	    return TCL_ERROR;
-	}
-	err = FSpLocationFromPath(strlen(nativeName), nativeName, &fileSpec);
-		
-	Tcl_DStringFree(&buffer);
-	if ((err != noErr) && (err != fnfErr)) {
-	    Tcl_AppendResult(interp,
-		    "Error getting a location for the file: \"", 
-		    fileName, "\".", NULL);
-	    return TCL_ERROR;
-	}
-		
-	FSpCreateResFileCompat(&fileSpec,
-		'WiSH', 'osas', smSystemScript);	
-	myErr = ResError();
-	
-	if ((myErr != noErr) && (myErr != dupFNErr)) {
-	    sprintf(idStr, "%d", myErr);
-	    Tcl_AppendResult(interp, "Error #", idStr,
-		    " creating new resource file ", fileName, (char *) NULL);
-	    result = TCL_ERROR;
-	    goto rezEvalCleanUp;
-	}
-		
-	fileRef = FSpOpenResFileCompat(&fileSpec, fsRdWrPerm);
-	if (fileRef == -1) {
-	    Tcl_AppendResult(interp, "Error reading the file: \"", 
-		    fileName, "\".", NULL);
-	    result = TCL_ERROR;
-	    goto rezEvalCleanUp;
-	}
-	UseResFile(fileRef);
-    } else {
-	/*
-	 * The default behavior will search through all open resource files.
-	 * This may not be the behavior you desire.  If you want the behavior
-	 * of this call to *only* search the application resource fork, you
-	 * must call UseResFile at this point to set it to the application
-	 * file.  This means you must have already obtained the application's 
-	 * fileRef when the application started up.
-	 */
-    }
-	
-    /*
-     * Load the resource by name 
-     */
-    if (resourceName != NULL) {
-	strcpy((char *) rezName + 1, resourceName);
-	rezName[0] = strlen(resourceName);
-	resHandle = Get1NamedResource('scpt', rezName);
-	myErr = ResError();
-	if (resHandle == NULL) {
-	    /*
-	     * These signify either the resource or the resource
-	     * type were not found
-	     */
-	    if (myErr == resNotFound || myErr == noErr) {
-		short uniqueID;
-		while ((uniqueID = Unique1ID('scpt') ) < 128) {}
-		AddResource(scriptData.dataHandle, 'scpt', uniqueID, rezName);
-		WriteResource(resHandle);
-		result = TCL_OK;
-		goto rezEvalCleanUp;
-	    } else {
-		/*
-		 * This means there was some other error, for now
-		 * I just bag out.
-		 */
-		sprintf(idStr, "%d", myErr);
-		Tcl_AppendResult(interp, "Error #", idStr,
-			" opening scpt resource named ", resourceName,
-			" in file ", fileName, (char *) NULL);
-		result = TCL_ERROR;
-		goto rezEvalCleanUp;
-	    }
-	}
-	/*
-	 * Or ID
-	 */ 
-    } else {
-	resHandle = Get1Resource('scpt', resourceNumber);
-	rezName[0] = 0;
-	rezName[1] = '\0';
-	myErr = ResError();
-	if (resHandle == NULL) {
-	    /*
-	     * These signify either the resource or the resource
-	     * type were not found
-	     */
-	    if (myErr == resNotFound || myErr == noErr) {
-		AddResource(scriptData.dataHandle, 'scpt',
-			resourceNumber, rezName);
-		WriteResource(resHandle);
-		result = TCL_OK;
-		goto rezEvalCleanUp;
-	    } else {
-		/*
-		 * This means there was some other error, for now
-		 * I just bag out */
-		sprintf(idStr, "%d", myErr);
-		Tcl_AppendResult(interp, "Error #", idStr,
-			" opening scpt resource named ", resourceName,
-			" in file ", fileName,(char *) NULL);
-		result = TCL_ERROR;
-		goto rezEvalCleanUp;
-	    }
-	} 
-    }
-	
-    /* 
-     * We get to here if the resource exists 
-     * we just copy into it... 
-     */
-	 
-    scriptSize = GetHandleSize(scriptData.dataHandle);
-    SetHandleSize(resHandle, scriptSize);
-    HLock(scriptData.dataHandle);
-    HLock(resHandle);
-    BlockMove(*scriptData.dataHandle, *resHandle,scriptSize);
-    HUnlock(scriptData.dataHandle);
-    HUnlock(resHandle);
-    ChangedResource(resHandle);
-    WriteResource(resHandle);
-    result = TCL_OK;
-    goto rezEvalCleanUp;
-			
-    rezEvalError:
-    sprintf(idStr, "ID=%d", resourceNumber);
-    Tcl_AppendResult(interp, "The resource \"",
-	    (resourceName != NULL ? resourceName : idStr),
-	    "\" could not be loaded from ",
-	    (fileName != NULL ? fileName : "application"),
-	    ".", NULL);
-
-    rezEvalCleanUp:
-    if (fileRef != -1) {
-	CloseResFile(fileRef);
-    }
-
-    UseResFile(saveRef);
-	
-    return result;
-}
-
-/*----------------------------------------------------------------------
- *
- * tclOSALoad --
- *
- *	This loads a script resource from the file named in fileName.
- *	Most of this routine is caged from the Tcl Source, from the
- *	Tcl_MacSourceCmd routine.  This is good, since it ensures this
- *	follows the same convention for looking up files as Tcl.
- *
- * Returns
- *	A standard Tcl result.
- *
- * Side Effects:
- *	A new script element is created from the data in the file.
- *	The script ID is passed out in the variable resultID.
- *
- *----------------------------------------------------------------------
- */
- 
-int
-tclOSALoad(
-    Tcl_Interp *interp,
-    tclOSAComponent *theComponent,
-    char *resourceName,
-    int resourceNumber, 
-    char *fileName,
-    OSAID *resultID)
-{
-    Handle sourceData;
-    Str255 rezName;
-    int result = TCL_OK;
-    short saveRef, fileRef = -1;
-    char idStr[16 + TCL_INTEGER_SPACE];
-    FSSpec fileSpec;
-    Tcl_DString buffer;
-    char *nativeName;
-
-    saveRef = CurResFile();
-	
-    if (fileName != NULL) {
-	OSErr err;
-		
-	Tcl_DStringInit(&buffer);	
-	nativeName = Tcl_TranslateFileName(interp, fileName, &buffer);
-	if (nativeName == NULL) {
-	    return TCL_ERROR;
-	}
-	err = FSpLocationFromPath(strlen(nativeName), nativeName, &fileSpec);
-	Tcl_DStringFree(&buffer);
-	if (err != noErr) {
-	    Tcl_AppendResult(interp, "Error finding the file: \"", 
-		    fileName, "\".", NULL);
-	    return TCL_ERROR;
-	}
-			
-	fileRef = FSpOpenResFileCompat(&fileSpec, fsRdPerm);
-	if (fileRef == -1) {
-	    Tcl_AppendResult(interp, "Error reading the file: \"", 
-		    fileName, "\".", NULL);
-	    return TCL_ERROR;
-	}
-	UseResFile(fileRef);
-    } else {
-	/*
-	 * The default behavior will search through all open resource files.
-	 * This may not be the behavior you desire.  If you want the behavior
-	 * of this call to *only* search the application resource fork, you
-	 * must call UseResFile at this point to set it to the application
-	 * file.  This means you must have already obtained the application's 
-	 * fileRef when the application started up.
-	 */
-    }
-	
-    /*
-     * Load the resource by name or ID
-     */
-    if (resourceName != NULL) {
-	strcpy((char *) rezName + 1, resourceName);
-	rezName[0] = strlen(resourceName);
-	sourceData = GetNamedResource('scpt', rezName);
-    } else {
-	sourceData = GetResource('scpt', (short) resourceNumber);
-    }
-	
-    if (sourceData == NULL) {
-	result = TCL_ERROR;
-    } else {
-	AEDesc scriptDesc;
-	OSAError osaErr;
-		
-	scriptDesc.descriptorType = typeOSAGenericStorage;
-	scriptDesc.dataHandle = sourceData;
-		
-	osaErr = OSALoad(theComponent->theComponent, &scriptDesc,
-		kOSAModeNull, resultID);
-		
-	ReleaseResource(sourceData);
-		
-	if (osaErr != noErr) {
-	    result = TCL_ERROR;
-	    goto rezEvalError;
-	}
-			
-	goto rezEvalCleanUp;
-    }
-	
-    rezEvalError:
-    sprintf(idStr, "ID=%d", resourceNumber);
-    Tcl_AppendResult(interp, "The resource \"",
-	    (resourceName != NULL ? resourceName : idStr),
-	    "\" could not be loaded from ",
-	    (fileName != NULL ? fileName : "application"),
-	    ".", NULL);
-
-    rezEvalCleanUp:
-    if (fileRef != -1) {
-	CloseResFile(fileRef);
-    }
-
-    UseResFile(saveRef);
-	
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAGetScriptID  --
- *
- *	This returns the context ID, gibven the component name.
- *
- * Results:
- *	A standard Tcl result
- *
- * Side effects:
- *	Passes out the script ID in the variable scriptID.
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-tclOSAGetScriptID(
-    tclOSAComponent *theComponent,
-    char *scriptName,
-    OSAID *scriptID) 
-{
-    tclOSAScript *theScript;
-	
-    theScript = tclOSAGetScript(theComponent, scriptName);
-    if (theScript == NULL) {
-	return TCL_ERROR;
-    }
-	
-    *scriptID = theScript->scriptID;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAAddScript  --
- *
- *	This adds a script to theComponent's script table, with the
- *	given name & ID.
- *
- * Results:
- *	A standard Tcl result
- *
- * Side effects:
- *	Adds an element to the component's script table.
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-tclOSAAddScript(
-    tclOSAComponent *theComponent,
-    char *scriptName,
-    long modeFlags,
-    OSAID scriptID) 
-{
-    Tcl_HashEntry *hashEntry;
-    int newPtr;
-    static int scriptIndex = 0;
-    tclOSAScript *theScript;
-	
-    if (*scriptName == '\0') {
-	sprintf(scriptName, "OSAScript%d", scriptIndex++);
-    }
-	
-    hashEntry = Tcl_CreateHashEntry(&theComponent->scriptTable,
-	    scriptName, &newPtr);
-    if (newPtr == 0) {
-	theScript = (tclOSAScript *) Tcl_GetHashValue(hashEntry);
-	OSADispose(theComponent->theComponent, theScript->scriptID);
-    } else {		
-	theScript = (tclOSAScript *) ckalloc(sizeof(tclOSAScript));
-	if (theScript == NULL) {
-	    return TCL_ERROR;
-	}
-    }
-		
-    theScript->scriptID = scriptID;
-    theScript->languageID = theComponent->languageID;
-    theScript->modeFlags = modeFlags;
-	
-    Tcl_SetHashValue(hashEntry,(ClientData) theScript);
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAGetScriptID  --
- *
- *	This returns the script structure, given the component and script name.
- *
- * Results:
- *	A pointer to the script structure.
- *
- * Side effects:
- *	None
- *
- *----------------------------------------------------------------------
- */
- 
-static tclOSAScript *
-tclOSAGetScript(
-    tclOSAComponent *theComponent,
-    char *scriptName)
-{
-    Tcl_HashEntry *hashEntry;
-	
-    hashEntry = Tcl_FindHashEntry(&theComponent->scriptTable, scriptName);
-    if (hashEntry == NULL) {
-	return NULL;
-    }
-	
-    return (tclOSAScript *) Tcl_GetHashValue(hashEntry);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSADeleteScript  --
- *
- *	This deletes the script given by scriptName.
- *
- * Results:
- *	A standard Tcl result
- *
- * Side effects:
- *	Deletes the script from the script table, and frees up the
- *	resources associated with it.  If there is an error, then
- *	space for the error message is malloc'ed, and passed out in
- *	the variable errMsg.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-tclOSADeleteScript(
-    tclOSAComponent *theComponent,
-    char *scriptName,
-    char *errMsg) 
-{
-    Tcl_HashEntry *hashEntry;
-    tclOSAScript *scriptPtr;
-
-    hashEntry = Tcl_FindHashEntry(&theComponent->scriptTable, scriptName);
-    if (hashEntry == NULL) {
-	errMsg = ckalloc(17);
-	strcpy(errMsg,"Script not found");
-	return TCL_ERROR;
-    }
-	
-    scriptPtr = (tclOSAScript *) Tcl_GetHashValue(hashEntry);
-    OSADispose(theComponent->theComponent, scriptPtr->scriptID);
-    ckfree((char *) scriptPtr);
-    Tcl_DeleteHashEntry(hashEntry);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclOSAActiveProc --
- *
- *	This is passed to each component.  It is run periodically
- *	during script compilation and script execution.  It in turn
- *	calls Tcl_DoOneEvent to process the event queue.  We also call
- *	the default Active proc which will let the user cancel the script
- *	by hitting Command-.
- * 
- * Results:
- *	A standard MacOS system error
- *
- * Side effects:
- *	Any Tcl code may run while calling Tcl_DoOneEvent.
- *
- *----------------------------------------------------------------------
- */
- 
-static pascal OSErr 
-TclOSAActiveProc(
-    long refCon)
-{
-    tclOSAComponent *theComponent = (tclOSAComponent *) refCon;
-	
-    Tcl_DoOneEvent(TCL_DONT_WAIT);
-    CallOSAActiveProc(theComponent->defActiveProc, theComponent->defRefCon);
-	
-    return noErr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ASCIICompareProc --
- *
- *	Trivial ascii compare for use with qsort.	
- *
- * Results:
- *	strcmp of the two input strings
- *
- * Side effects:
- *	None
- *
- *----------------------------------------------------------------------
- */
-static int 
-ASCIICompareProc(const void *first,const void *second)
-{
-    int order;
-    
-    char *firstString = *((char **) first);
-    char *secondString = *((char **) second);
-
-    order = strcmp(firstString, secondString);
-	
-    return order;
-}
-
-#define REALLOC_INCR 30
-/*
- *----------------------------------------------------------------------
- *
- * getSortedHashKeys --
- *
- *	returns an alphabetically sorted list of the keys of the hash
- *	theTable which match the string "pattern" in the DString
- *	theResult. pattern == NULL matches all.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	ReInitializes the DString theResult, then copies the names of
- *	the matching keys into the string as list elements.
- *
- *----------------------------------------------------------------------
- */
- 
-static void 
-getSortedHashKeys(
-    Tcl_HashTable *theTable,
-    char *pattern,
-    Tcl_DString *theResult)
-{
-    Tcl_HashSearch search;
-    Tcl_HashEntry *hPtr;
-    Boolean compare = true;
-    char *keyPtr;
-    static char **resultArgv = NULL;
-    static int totSize = 0;
-    int totElem = 0, i;
-	
-    if (pattern == NULL || *pattern == '\0' || 
-	    (*pattern == '*' && *(pattern + 1) == '\0')) {
-	compare = false;
-    }
-	
-    for (hPtr = Tcl_FirstHashEntry(theTable,&search), totElem = 0;
-	 hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-			
-	keyPtr = (char *) Tcl_GetHashKey(theTable, hPtr);
-	if (!compare || Tcl_StringMatch(keyPtr, pattern)) {
-	    totElem++;		
-	    if (totElem >= totSize) {
-		totSize += REALLOC_INCR;
-		resultArgv = (char **) ckrealloc((char *) resultArgv,
-			totSize * sizeof(char *));
-	    }
-	    resultArgv[totElem - 1] = keyPtr;
-	} 
-    }
-		
-    Tcl_DStringInit(theResult);
-    if (totElem == 1) {
-	Tcl_DStringAppendElement(theResult, resultArgv[0]);
-    } else if (totElem > 1) {
-	qsort((VOID *) resultArgv, (size_t) totElem, sizeof (char *),
-		ASCIICompareProc);
-
-	for (i = 0; i < totElem; i++) {
-	    Tcl_DStringAppendElement(theResult, resultArgv[i]);
-	}
-    }	
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * prepareScriptData --
- *
- *	Massages the input data in the argv array, concating the 
- *	elements, with a " " between each, and replacing \n with \r,
- *	and \\n with "  ".  Puts the result in the the DString scrptData,
- *	and copies the result to the AEdesc scrptDesc.
- *
- * Results:
- *	Standard Tcl result
- *
- * Side effects:
- *	Creates a new Handle (with AECreateDesc) for the script data.
- *	Stores the script in scrptData, or the error message if there
- *	is an error creating the descriptor.
- *
- *----------------------------------------------------------------------
- */
- 
-static int
-prepareScriptData(
-    int argc,
-    char **argv,
-    Tcl_DString *scrptData,
-    AEDesc *scrptDesc) 
-{
-    char * ptr;
-    int i;
-    char buffer[7];
-    OSErr sysErr = noErr;
-		
-    Tcl_DStringInit(scrptData);
-	
-    for (i = 0; i < argc; i++) {
-	Tcl_DStringAppend(scrptData, argv[i], -1);
-	Tcl_DStringAppend(scrptData, " ", 1);
-    }
-
-    /*
-     * First replace the \n's with \r's in the script argument
-     * Also replace "\\n" with "  ".
-     */
-	 
-    for (ptr = scrptData->string; *ptr != '\0'; ptr++) {
-	if (*ptr == '\n') {
-	    *ptr = '\r';
-	} else if (*ptr == '\\') {
-	    if (*(ptr + 1) == '\n') {
-		*ptr = ' ';
-		*(ptr + 1) = ' ';
-	    }
-	}
-    }
- 	
-    sysErr = AECreateDesc(typeChar, Tcl_DStringValue(scrptData),
-	    Tcl_DStringLength(scrptData), scrptDesc);
-						
-    if (sysErr != noErr) {
-	sprintf(buffer, "%6d", sysErr);
-	Tcl_DStringFree(scrptData);
-	Tcl_DStringAppend(scrptData, "Error #", 7);
-	Tcl_DStringAppend(scrptData, buffer, -1);
-	Tcl_DStringAppend(scrptData, " creating Script Data Descriptor.", 33);
-	return TCL_ERROR;					
-    }
-	
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAResultFromID --
- *
- *	Gets a human readable version of the result from the script ID
- *	and returns it in the result of the interpreter interp
- *
- * Results:
- *	None
- *
- * Side effects:
- *	Sets the result of interp to the human readable version of resultID.
- *  
- *
- *----------------------------------------------------------------------
- */
- 
-void 
-tclOSAResultFromID(
-    Tcl_Interp *interp,
-    ComponentInstance theComponent,
-    OSAID resultID )
-{
-    OSErr myErr = noErr;
-    AEDesc resultDesc;
-    Tcl_DString resultStr;
-	
-    Tcl_DStringInit(&resultStr);
-	
-    myErr = OSADisplay(theComponent, resultID, typeChar,
-	    kOSAModeNull, &resultDesc);
-    Tcl_DStringAppend(&resultStr, (char *) *resultDesc.dataHandle,
-	    GetHandleSize(resultDesc.dataHandle));
-    Tcl_DStringResult(interp,&resultStr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * tclOSAASError --
- *
- *	Gets the error message from the AppleScript component, and adds
- *	it to interp's result. If the script data is known, will point
- *	out the offending bit of code.  This MUST BE A NULL TERMINATED
- *	C-STRING, not a typeChar.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	Sets the result of interp to error, plus the relevant portion
- *	of the script.
- *
- *----------------------------------------------------------------------
- */
- 
-void 
-tclOSAASError(
-    Tcl_Interp * interp,
-    ComponentInstance theComponent,
-    char *scriptData )
-{
-    OSErr myErr = noErr;
-    AEDesc errResult,errLimits;
-    Tcl_DString errStr;
-    DescType returnType;
-    Size returnSize;
-    short srcStart,srcEnd;
-    char buffer[16];
-	
-    Tcl_DStringInit(&errStr);
-    Tcl_DStringAppend(&errStr, "An AppleScript error was encountered.\n", -1); 
-	
-    OSAScriptError(theComponent, kOSAErrorNumber,
-	    typeShortInteger, &errResult);
-	
-    sprintf(buffer, "Error #%-6.6d\n", (short int) **errResult.dataHandle);
-
-    AEDisposeDesc(&errResult);
-	
-    Tcl_DStringAppend(&errStr,buffer, 15);
-	
-    OSAScriptError(theComponent, kOSAErrorMessage, typeChar, &errResult);
-    Tcl_DStringAppend(&errStr, (char *) *errResult.dataHandle,
-	    GetHandleSize(errResult.dataHandle));
-    AEDisposeDesc(&errResult);
-	
-    if (scriptData != NULL) {
-	int lowerB, upperB;
-		
-	myErr = OSAScriptError(theComponent, kOSAErrorRange,
-		typeOSAErrorRange, &errResult);
-		
-	myErr = AECoerceDesc(&errResult, typeAERecord, &errLimits);
-	myErr = AEGetKeyPtr(&errLimits, keyOSASourceStart,
-		typeShortInteger, &returnType, &srcStart,
-		sizeof(short int), &returnSize);
-	myErr = AEGetKeyPtr(&errLimits, keyOSASourceEnd, typeShortInteger,
-		&returnType, &srcEnd, sizeof(short int), &returnSize);
-	AEDisposeDesc(&errResult);
-	AEDisposeDesc(&errLimits);
-
-	Tcl_DStringAppend(&errStr, "\nThe offending bit of code was:\n\t", -1);
-	/*
-	 * Get the full line on which the error occured:
-	 */
-	for (lowerB = srcStart; lowerB > 0; lowerB--) {
-	    if (*(scriptData + lowerB ) == '\r') {
-		lowerB++;
-		break;
-	    }
-	}
-		
-	for (upperB = srcEnd; *(scriptData + upperB) != '\0'; upperB++) {
-	    if (*(scriptData + upperB) == '\r') {
-		break;
-	    }
-	}
-
-	Tcl_DStringAppend(&errStr, scriptData+lowerB, srcStart - lowerB);
-	Tcl_DStringAppend(&errStr, "_", 1);
-	Tcl_DStringAppend(&errStr, scriptData+srcStart, upperB - srcStart);
-    }
-	
-    Tcl_DStringResult(interp,&errStr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetRawDataFromDescriptor --
- *
- *	Get the data from a descriptor.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
- 
-static void
-GetRawDataFromDescriptor(
-    AEDesc *theDesc,
-    Ptr destPtr,
-    Size destMaxSize,
-    Size *actSize)
-  {
-      Size copySize;
-
-      if (theDesc->dataHandle) {
-	  HLock((Handle)theDesc->dataHandle);
-	  *actSize = GetHandleSize((Handle)theDesc->dataHandle);
-	  copySize = *actSize < destMaxSize ? *actSize : destMaxSize;
-	  BlockMove(*theDesc->dataHandle, destPtr, copySize);
-	  HUnlock((Handle)theDesc->dataHandle);
-      } else {
-	  *actSize = 0;
-      }
-      
-  }
-
-/*
- *----------------------------------------------------------------------
- *
- * GetRawDataFromDescriptor --
- *
- *	Get the data from a descriptor.  Assume it's a C string.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
- 
-static OSErr
-GetCStringFromDescriptor(
-    AEDesc *sourceDesc,
-    char *resultStr,
-    Size resultMaxSize,
-    Size *resultSize)
-{
-    OSErr err;
-    AEDesc resultDesc;
-
-    resultDesc.dataHandle = nil;
-				
-    err = AECoerceDesc(sourceDesc, typeChar, &resultDesc);
-		
-    if (!err) {
-	GetRawDataFromDescriptor(&resultDesc, (Ptr) resultStr,
-		resultMaxSize - 1, resultSize);
-	resultStr[*resultSize] = 0;
-    } else {
-	err = errAECoercionFail;
-    }
-			
-    if (resultDesc.dataHandle) {
-	AEDisposeDesc(&resultDesc);
-    }
-    
-    return err;
-}
diff --git a/mac/tclMacOSA.exp b/mac/tclMacOSA.exp
deleted file mode 100644
index 4cde512..0000000
--- a/mac/tclMacOSA.exp
+++ /dev/null
@@ -1 +0,0 @@
-Tclapplescript_Init
diff --git a/mac/tclMacOSA.r b/mac/tclMacOSA.r
deleted file mode 100644
index 6521ac8..0000000
--- a/mac/tclMacOSA.r
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * tkMacOSA.r --
- *
- *	This file creates resources used by the AppleScript package.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacOSA.r,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-/*
- * The folowing include and defines help construct
- * the version string for Tcl.
- */
-
-#define SCRIPT_MAJOR_VERSION 1		/* Major number */
-#define SCRIPT_MINOR_VERSION  0		/* Minor number */
-#define SCRIPT_RELEASE_SERIAL  2	/* Really minor number! */
-#define RELEASE_LEVEL alpha		/* alpha, beta, or final */
-#define SCRIPT_VERSION "1.0"
-#define SCRIPT_PATCH_LEVEL "1.0a2"
-#define FINAL 0				/* Change to 1 if final version. */
-
-#if FINAL
-#   define MINOR_VERSION (SCRIPT_MINOR_VERSION * 16) + SCRIPT_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION SCRIPT_MINOR_VERSION * 16
-#endif
-
-#define RELEASE_CODE 0x00
-
-resource 'vers' (1) {
-	SCRIPT_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	SCRIPT_PATCH_LEVEL,
-	SCRIPT_PATCH_LEVEL ", by Jim Ingham & Ray Johnson © Sun Microsystems"
-};
-
-resource 'vers' (2) {
-	SCRIPT_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	SCRIPT_PATCH_LEVEL,
-	"Tclapplescript " SCRIPT_PATCH_LEVEL " © 1996-1997"
-};
-
-/*
- * The -16397 string will be displayed by Finder when a user
- * tries to open the shared library. The string should
- * give the user a little detail about the library's capabilities
- * and enough information to install the library in the correct location.  
- * A similar string should be placed in all shared libraries.
- */
-resource 'STR ' (-16397, purgeable) {
-	"TclAppleScript Library\n\n"
-	"This library provides the ability to run AppleScript "
-	" commands from Tcl/Tk programs.  To work properly, it "
-	"should be placed in the ÔTool Command LanguageÕ folder "
-	"within the Extensions folder."
-};
-
-
-/* 
- * We now load the Tk library into the resource fork of the library.
- */
-
-data 'TEXT' (4000,"pkgIndex",purgeable, preload) {
-	"# Tcl package index file, version 1.0\n"
-	"package ifneeded Tclapplescript 1.0 [list tclPkgSetup $dir Tclapplescript 1.0 {{Tclapplescript" 
-	".shlb load AppleScript}}]\n"
-};
diff --git a/mac/tclMacPanic.c b/mac/tclMacPanic.c
deleted file mode 100644
index 081c856..0000000
--- a/mac/tclMacPanic.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* 
- * tclMacPanic.c --
- *
- *	Source code for the "panic" library procedure used in "Simple Shell";
- *	other Mac applications will probably override this with a more robust
- *	application-specific panic procedure.
- *
- * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacPanic.c,v 1.2 1998/09/14 18:40:05 stanton Exp $
- */
-
-
-#include <Events.h>
-#include <Controls.h>
-#include <Windows.h>
-#include <TextEdit.h>
-#include <Fonts.h>
-#include <Dialogs.h>
-#include <Icons.h>
-#include <Sound.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "tclInt.h"
-
-/*
- * constants for panic dialog
- */
-#define PANICHEIGHT 150				/* Height of dialog */
-#define PANICWIDTH 350				/* Width of dialog */
-#define PANIC_BUTTON_RECT {125, 260, 145, 335}	/* Rect for button. */
-#define PANIC_ICON_RECT   {10, 20, 42, 52}	/* Rect for icon. */
-#define PANIC_TEXT_RECT   {10, 65, 140, 330}	/* Rect for text. */
-#define	ENTERCODE  (0x03)
-#define	RETURNCODE (0x0D)
-
-/*
- * The panicProc variable contains a pointer to an application
- * specific panic procedure.
- */
-
-void (*panicProc) _ANSI_ARGS_(TCL_VARARGS(char *,format)) = NULL;
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetPanicProc --
- *
- *	Replace the default panic behavior with the specified functiion.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the panicProc variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetPanicProc(proc)
-    void (*proc) _ANSI_ARGS_(TCL_VARARGS(char *,format));
-{
-    panicProc = proc;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MacPanic --
- *
- *	Displays panic info..
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the panicProc variable.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-MacPanic(
-    char *msg)		/* Text to show in panic dialog. */
-{
-    WindowRef macWinPtr, foundWinPtr;
-    Rect macRect;
-    Rect buttonRect = PANIC_BUTTON_RECT;
-    Rect iconRect = PANIC_ICON_RECT;
-    Rect textRect = PANIC_TEXT_RECT;
-    ControlHandle okButtonHandle;
-    EventRecord event;
-    Handle stopIconHandle;
-    int	part;
-    Boolean done = false;
-            
-
-    /*
-     * Put up an alert without using the Resource Manager (there may 
-     * be no resources to load). Use the Window and Control Managers instead.
-     * We want the window centered on the main monitor. The following 
-     * should be tested with multiple monitors. Look and see if there is a way
-     * not using qd.screenBits.
-     */
- 
-    macRect.top = (qd.screenBits.bounds.top + qd.screenBits.bounds.bottom)
-	/ 2 - (PANICHEIGHT / 2);
-    macRect.bottom = (qd.screenBits.bounds.top + qd.screenBits.bounds.bottom)
-	/ 2 + (PANICHEIGHT / 2);
-    macRect.left = (qd.screenBits.bounds.left + qd.screenBits.bounds.right)
-	/ 2 - (PANICWIDTH / 2);
-    macRect.right = (qd.screenBits.bounds.left + qd.screenBits.bounds.right)
-	/ 2 + (PANICWIDTH / 2);
-    
-    macWinPtr = NewWindow(NULL, &macRect, "\p", true, dBoxProc, (WindowRef) -1,
-            false, 0);
-    if (macWinPtr == NULL) {
-	goto exitNow;
-    }
-    
-    okButtonHandle = NewControl(macWinPtr, &buttonRect, "\pOK", true,
-	    0, 0, 1, pushButProc, 0);
-    if (okButtonHandle == NULL) {
-	CloseWindow(macWinPtr);
-	goto exitNow;
-    }
-    
-    SelectWindow(macWinPtr);
-    SetCursor(&qd.arrow);
-    stopIconHandle = GetIcon(kStopIcon);
-            
-    while (!done) {
-	if (WaitNextEvent(mDownMask | keyDownMask | updateMask,
-		&event, 0, NULL)) {
-	    switch(event.what) {
-		case mouseDown:
-		    part = FindWindow(event.where, &foundWinPtr);
-    
-		    if ((foundWinPtr != macWinPtr) || (part != inContent)) {
-		    	SysBeep(1);
-		    } else {
-		    	SetPortWindowPort(macWinPtr);
-		    	GlobalToLocal(&event.where);
-		    	part = FindControl(event.where, macWinPtr,
-				&okButtonHandle);
-    	
-			if ((inButton == part) && 
-				(TrackControl(okButtonHandle,
-					event.where, NULL))) {
-			    done = true;
-			}
-		    }
-		    break;
-		case keyDown:
-		    switch (event.message & charCodeMask) {
-			case ENTERCODE:
-			case RETURNCODE:
-			    HiliteControl(okButtonHandle, 1);
-			    HiliteControl(okButtonHandle, 0);
-			    done = true;
-		    }
-		    break;
-		case updateEvt:   
-		    SetPortWindowPort(macWinPtr);
-		    TextFont(systemFont);
-		    
-		    BeginUpdate(macWinPtr);
-		    if (stopIconHandle != NULL) {
-			PlotIcon(&iconRect, stopIconHandle);
-		    }
-		    TextBox(msg, strlen(msg), &textRect, teFlushDefault);
-		    DrawControls(macWinPtr);
-		    EndUpdate(macWinPtr);
-	    }
-	}
-    }
-
-    CloseWindow(macWinPtr);
-
-  exitNow:
-#ifdef TCL_DEBUG
-    Debugger();
-#else
-    abort();
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * panic --
- *
- *	Print an error message and kill the process.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The process dies, entering the debugger if possible.
- *
- *----------------------------------------------------------------------
- */
-
-#pragma ignore_oldstyle on
-void
-panic(char * format, ...)
-{
-    va_list varg;
-    char errorText[256];
-	
-    if (panicProc != NULL) {
-	va_start(varg, format);
-	
-	(void) (*panicProc)(format, varg);
-	
-	va_end(varg);
-    } else {
-	va_start(varg, format);
-	
-	vsprintf(errorText, format, varg);
-	
-	va_end(varg);
-	
-	MacPanic(errorText);
-    }
-
-}
-#pragma ignore_oldstyle reset
diff --git a/mac/tclMacPort.h b/mac/tclMacPort.h
deleted file mode 100644
index 7be4938..0000000
--- a/mac/tclMacPort.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * tclMacPort.h --
- *
- *	This header file handles porting issues that occur because of
- *	differences between the Mac and Unix. It should be the only
- *	file that contains #ifdefs to handle different flavors of OS.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacPort.h,v 1.8 1999/04/16 00:47:21 stanton Exp $
- */
-
-
-#ifndef _MACPORT
-#define _MACPORT
-
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
-
-/*
- *---------------------------------------------------------------------------
- * The following sets of #includes and #ifdefs are required to get Tcl to
- * compile on the macintosh.
- *---------------------------------------------------------------------------
- */
-
-#include "tclErrno.h"
-#include <float.h>
-
-#ifdef THINK_C
-	/*
-	 * The Symantic C code has not been tested
-	 * and probably will not work.
-	 */
-#   include <pascal.h>
-#   include <posix.h>
-#   include <string.h>
-#   include <fcntl.h>
-#   include <pwd.h>
-#   include <sys/param.h>
-#   include <sys/types.h>
-#   include <sys/stat.h>
-#   include <unistd.h>
-#elif defined(__MWERKS__)
-#   include <time.h>
-#   include <unistd.h>
-
-/*
- * The following definitions are usually found if fcntl.h.
- * However, MetroWerks has screwed that file up a couple of times
- * and all we need are the defines.
- */
-
-#   define O_RDWR	  	0x0	/* open the file in read/write mode */
-#   define O_RDONLY  		0x1	/* open the file in read only mode */
-#   define O_WRONLY  		0x2	/* open the file in write only mode */
-#   define O_APPEND  		0x0100	/* open the file in append mode */
-#   define O_CREAT	  	0x0200	/* create the file if it doesn't exist */
-#   define O_EXCL	  	0x0400	/* if the file exists don't create it again */
-#   define O_TRUNC	  	0x0800	/* truncate the file after opening it */
-
-/*
- * MetroWerks stat.h file is rather weak.  The defines
- * after the include are needed to fill in the missing
- * defines.
- */
-
-#   include <stat.h>
-#   ifndef S_IFIFO
-#	define S_IFIFO		0x0100
-#   endif
-#   ifndef S_IFBLK
-#	define S_IFBLK		0x0600
-#   endif
-#   ifndef S_ISLNK
-#	define S_ISLNK(m)	(((m)&(S_IFMT)) == (S_IFLNK))
-#   endif
-#   ifndef S_ISSOCK
-#	define S_ISSOCK(m)	(((m)&(S_IFMT)) == (S_IFSOCK))
-#   endif
-#   ifndef S_IRWXU
-#	define S_IRWXU		00007	/* read, write, execute: owner */
-#   	define S_IRUSR		00004	/* read permission: owner */
-#   	define S_IWUSR		00002	/* write permission: owner */
-#   	define S_IXUSR		00001	/* execute permission: owner */
-#   	define S_IRWXG		00007	/* read, write, execute: group */
-#   	define S_IRGRP		00004	/* read permission: group */
-#   	define S_IWGRP		00002	/* write permission: group */
-#   	define S_IXGRP		00001	/* execute permission: group */
-#   	define S_IRWXO		00007	/* read, write, execute: other */
-#   	define S_IROTH		00004	/* read permission: other */
-#   	define S_IWOTH		00002	/* write permission: other */
-#   	define S_IXOTH		00001	/* execute permission: other */
-#   endif
-
-#   define isatty(arg) 		1
-
-/* 
- * Defines used by access function.  This function is provided
- * by Mac Tcl as the function TclpAccess.
- */
- 
-#   define F_OK			0	/* test for existence of file */
-#   define X_OK			0x01	/* test for execute or search permission */
-#   define W_OK			0x02	/* test for write permission */
-#   define R_OK			0x04	/* test for read permission */
-
-#endif	/* __MWERKS__ */
-
-/*
- * Many signals are not supported on the Mac and are thus not defined in
- * <signal.h>.  They are defined here so that Tcl will compile with less
- * modification.
-  */
-
-#ifndef SIGQUIT
-#define SIGQUIT 300
-#endif
-
-#ifndef SIGPIPE
-#define SIGPIPE 13
-#endif
-
-#ifndef SIGHUP
-#define SIGHUP  100
-#endif
-
-/*
- * waitpid doesn't work on a Mac - the following makes
- * Tcl compile without errors.  These would normally
- * be defined in sys/wait.h on UNIX systems.
- */
-
-#define WAIT_STATUS_TYPE 	int
-#define WNOHANG 		1
-#define WIFSTOPPED(stat) 	(1)
-#define WIFSIGNALED(stat) 	(1)
-#define WIFEXITED(stat) 	(1)
-#define WIFSTOPSIG(stat) 	(1)
-#define WIFTERMSIG(stat) 	(1)
-#define WIFEXITSTATUS(stat) 	(1)
-#define WEXITSTATUS(stat) 	(1)
-#define WTERMSIG(status) 	(1)
-#define WSTOPSIG(status) 	(1)
-
-/*
- * Make sure that MAXPATHLEN is defined.
- */
-
-#ifndef MAXPATHLEN
-#   ifdef PATH_MAX
-#       define MAXPATHLEN PATH_MAX
-#   else
-#       define MAXPATHLEN 2048
-#   endif
-#endif
-
-/*
- * Define "NBBY" (number of bits per byte) if it's not already defined.
- */
-
-#ifndef NBBY
-#   define NBBY 8
-#endif
-
-/*
- * These functions always return dummy values on Mac.
- */
-#ifndef geteuid
-#   define geteuid() 1
-#endif
-#ifndef getpid
-#   define getpid() -1
-#endif
-
-/*
- * Variables provided by the C library.
- */
- 
-extern char **environ;
-
-/*
- *---------------------------------------------------------------------------
- * The following macros and declarations represent the interface between 
- * generic and mac-specific parts of Tcl.  Some of the macros may override 
- * functions declared in tclInt.h.
- *---------------------------------------------------------------------------
- */
-
-/*
- * The default platform eol translation on Mac is TCL_TRANSLATE_CR:
- */
-
-#define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_CR
-
-/*
- * Declare dynamic loading extension macro.
- */
-
-#define TCL_SHLIB_EXT ".shlb"
-
-/*
- * The following define is bogus and needs to be fixed.  It claims that
- * struct tm has the timezone string in it, which is not true.  However,
- * the code that works around this fact does not compile on the Mac, since
- * it relies on the fact that time.h has a "timezone" variable, which the
- * Metrowerks time.h does not have...
- * 
- * The Mac timezone stuff never worked (clock format 0 -format %Z returns "Z")
- * so this just keeps the status quo.  The real answer is to not use the
- * MSL strftime, and provide the needed compat functions...
- * 
- */
- 
-#define HAVE_TM_ZONE 
- 
-/*
- * The following macros have trivial definitions, allowing generic code to 
- * address platform-specific issues.
- */
- 
-#define TclpAsyncMark(async)
-#define TclpGetPid(pid)	    	((unsigned long) (pid))
-#define TclpGetUserHome(n, b)	(NULL)
-#define TclSetSystemEnv(a,b)
-#define tzset()
-
-/*
- * The following defines replace the Macintosh version of the POSIX
- * functions "stat" and "access".  The various compilier vendors
- * don't implement this function well nor consistantly.
- */
-#define lstat(path, bufPtr) TclStat(path, bufPtr)
-
-#define fopen(path, mode) TclMacFOpenHack(path, mode)
-#define readlink(fileName, buffer, size) TclMacReadlink(fileName, buffer, size)
-#ifdef TCL_TEST
-#define chmod(path, mode) TclMacChmod(path, mode)
-#endif
-
-/*
- * Prototypes needed for compatability
- */
-
-EXTERN int	strncasecmp _ANSI_ARGS_((CONST char *s1,
-			    CONST char *s2, size_t n));
-
-/*
- * These definitions force putenv & company to use the version
- * supplied with Tcl.
- */
-#ifndef putenv
-#   define unsetenv	TclUnsetEnv
-#   define putenv	Tcl_PutEnv
-#   define setenv	TclSetEnv
-void	TclSetEnv(CONST char *name, CONST char *value);
-int	Tcl_PutEnv(CONST char *string);
-void	TclUnsetEnv(CONST char *name);
-#endif
-
-/*
- * Platform specific mutex definition used by memory allocators.
- * These are all no-ops on the Macintosh, since the threads are
- * all cooperative.
- */
-
-#ifdef TCL_THREADS
-typedef int TclpMutex;
-#define	TclpMutexInit(a)
-#define	TclpMutexLock(a)
-#define	TclpMutexUnlock(a)
-#else
-typedef int TclpMutex;
-#define	TclpMutexInit(a)
-#define	TclpMutexLock(a)
-#define	TclpMutexUnlock(a)
-#endif /* TCL_THREADS */
-
-#endif /* _MACPORT */
diff --git a/mac/tclMacProjects.sea.hqx b/mac/tclMacProjects.sea.hqx
deleted file mode 100644
index a5d6f86..0000000
--- a/mac/tclMacProjects.sea.hqx
+++ /dev/null
@@ -1 +0,0 @@
-(This file must be converted with BinHex 4.0)
:#d&bBfKTGQ8ZFf9K!%&38%aKGA0d)!#3!rB)!!"Cp#K08dP8)3!&!!$f#(*-BA8
#r`#3!aErr`!0$d*239p8Bfa6D'9XE(-ZZ3DE&S)!N!J'QaL%jTX!N"3f-`#3"2q
3"%e08(*$9dP&!3#[[Qr$XaYN+`#3"3)AYJ#3"M@Y!!$d0!#3"NDM"[L16aBq)C[
G`RrKj2NYr2"N1Ej`Zi8YI'AAB''%,DaERUpmCHBAPG2Mp%[j3QiKr2#pc-1c@pm
irZ2Rp`Zh46q6F-)*@mKbI1%,rq8*AcMKYa`rYpGj5IEj5EDpPq6f%rk%EC2`,Ri
,@`LrCF$*3TB4ArJY!ll`KGp#XF*lE*AfG[h#[H@iYh!MP#aN)Fr*3KBb@BiXC,!
-9Nl`dSPIj[(h'QK[0M+l[2eqlm+cH0,bZNcc0XYLqqf0p5jkRHGfNGeq'hQpNml
2[%E@`)(CC`0qLi2m(-3A-h2HHIDG[GG*&[2,JB1'!Q-""0akIJMS5krXc"C1q(G
N%difJ4UA!,!&(r!+I2PqA`h$ZZ-iqcK1lJ3R[qqM6RkrPaeRpNCL2TM,jrJEIL[
#QVrFLk)JM0bK+&cT9j01V#IPkmKk`Gb"[G&a#SXFClle"eFlKk6"&c[lT[m[59p
X6er026hklAUMdbZ%lGfYpl#d@2T(rjqF@jml-(rTG$A$fR6PR-R*c@%rR-cT`c9
Jr[*GFl2Mr25NIK,5YV8AGPDYiepIZIPV!k'kZ`6d-EA`#I642GeMR!2h,iG0VaV
ZVP(D1F%j+2GBIPhRIlQ)aVNLpe,ZZAe1F1C4KKXFjdr+h5NkM8SCZA+BNFG&[d-
(ACal),FTrmD@$XV@TS"cZ@Ti(kSQj%cXBT9(l*)Z")K@aCA!H4(l0HcAXAq&r62
XAf$r'[X0V($'i!AXRf2r"[Y0l0pL[iAp0[Blf,r$rMrXhf2r!IZ2f(r#IKIl2Ha
A5Aij9[)fd#Tc-PEUDdl#(S)p&(XBGKKl-2D"f!GK(i`p(2Yc@'&NjR6XNGL(BRm
HHa4@DQq+f"(X8R)p%hX@pXRBTf"r!IXN,&ci(1aQl#EX4Z`cXDGK,m*HM$dGH`R
f8ZbTf#GLDHYcXEq)I4Tf#jCH2!2l@1c6XFr!RS*p(2Eaf#GJr`hllpMr`2iRpJI
BImAqPf"&qrhlf(qa8#SYEm69TAh0IYJZE!UEaQD`JYcQB+a`8A-SYTHhrjRr&f+
PISEk'@TRqV!2ali5Hccf%GKMX-GL6m"+cjYcX#Z`Vm!q'lX++dKK"V&VXBr%VX1
HK&f224Rl+1`'l+Z`MmBq"L[e0p6G8(I6JhdepMABjf)&)mdYf&qL6Lr&ASPp'IB
Ul%Z`9f#[aViF+h8)2Sfp(#Ye#mJa)*H!A!,b#-JM8"krM2d9l+pLAiGp2IB0f$G
L,m0HLi@aAiGp-jBHkF2ZBl%9(Lqp%h`rGKTf1PCk+U$2JKp-86T`eQ#P*`*k,K"
k5Ld$qM'J(i-MX!GJ$m3HK*f"lFFk9M861m[L0M!Zr@cKq$cX4l"rK2dSpQ2B$f(
r%2Yal#H`Rm6q2[E$f%pK2ihp$"DpjR2Bcf2r'2XRf#pJ[iLp#IXPl*HaAm(q!DN
,Xc"ABPq)I4&@DQbSQk(I$,8ce-l3$iEk'fTSU+'KKSBq-I5I!4-0r@'SQD'HKRS
DHX-FJjf$(F61aFl$cXG+Ej[MX!ZaLl"$UGi8j1Jh3mmEHYl38iDq0r5l8Em,aJG
JI`!RJ)YBVJ0f)lN)0`MJ"!&F)##R!-`2b#Zi(2YmV13AA)'&38Rq!EN(m)F!rK$
!'`*i3`"[#1!0`V@%YiN9rK$!(`,U&e#rJ2S&e#qi"rZEf0r#ASpp+rEAXF+0J[Z
aEmHq"IXfl$Z`lm5q#rXlf(GMhi0p,rChXHr$[Krl!H`(XEq(&58TZ*ZD#jm`i*X
"p``iCH!F"UjK`$)$Mc$`%30R-(!5!emam"8$Mc&`#32Q'@T[i#+'qKZiMB(E',L
0JG-B1)f"daKiLS'R'(L+!4m0A-A!93aFaF"4$"c&`'N-Z'R!68-2'E$6J*e'Z#P
F)B!V"(#%3,a3H%3!M`MJ#J'm))!A"(#)!0i3J2d"R#)!C`*`*J$l!l!QJ)X%F,%
!,KE!)3)i4!#(#1!3!4`LJ%-%F)d!$KI!*3*i4!#A#q"b!9`Zj,&qKHrF9[A1ND$
4U[ZMeEU$(4bCm1YeTa`QB46@2AFJU%4HY-BT,lHZXr`iI8F$"leQc4hfil!G9BR
F@UfA[@UaeHT["NQK+[pk2lBHLF`jmDbTV-4jGP"TN!$ZmPVBm3ApcF529RK9Rc5
$NIl"C@1&SD&53Gl9AM+4rYp3'QihNk$KTf&(Rc25ljBkVdL*PXNR#@RUVNM,)bH
HQ#VkfQVBD!Ae`+qjIEjAmk1d[Q%E4)81XL+[ARi"JH&Mbe[9#6ecH'&q)CkSEdj
@1Z$XS1SP3GJNAr('T9Uph(TaVShmY`[JFKdmhPf`F*8VK6S`&4Y854B[@(MfL3k
4KGlP(ANb9bQk3*kaA5"9@615HX*qNKbbME2+1q'dB0l#fSQP6TLfQEJ(1p%fm)J
YKC!!&KYfL"VXEl6#+((a"fGjpASB0LRQf5hKaSTjTEPcddKaV[ALUPG2[H[mY3l
rMiiEcPKTF-Q5,6QXlGRU6R,H-R%5X$AX,1V!e5$GPhr$0NK8&r%(jD(P@pfZ-ZV
8bZ#0XVI"*`f!,0P11(9c*i4aS-`a!`1T0ppCZAMR,5#C4"5K38,8Am#lH[Vk9Ta
ap$aP@E'N6(3%&0SRYNh#i1(T5S44fB4LZ!T$&I$d(3Yl0'1)QCAdUYdETN#9l2Y
`!`QAI*FrV0JXf4"h,MB%!dK,p&lB*0NRU-m4+RRd"+M(U`l,U9D@(S#M5D"$6&k
dCE@`9bJB'4D$L`f4*38@U8*-,Z*cRPD&kBKM)`4L8eb0JPCL'L)+b18F[q)5M@*
X2CkbrD@i5[P)fefPN!!#Vi(CMI6#fq5KN9l6mc(fM[3D9R"kf)c$ZPq)NhBP&ZG
l#ZmI0p"cXGp-8Mr2VrD#*MlhrNM[0T!!b"+eN9j"PpCJj@J2T+ViCS%6K5rU)pD
C`k-%%q28XJ9alS6*%V'Qq%k)2TUVeTVL92+$Z![-T4KBV&hbIZKY9LqIUQh!08A
6J66SQU)Pp,!ri&2`C[-U2l)"X!S0@0'1Nl$KRZf[Z55-DV&6V)*3@k"&@bH!TSh
4Z*qi)hk5"-haf&N5N!$XDR$#HNID3EhQpUa1)Lpf&[Z9p[Li(lRQcF#3!+`9+FF
P6HZ@HD[0*T(e3k5ifDmlrF2ZB!ZDFGCDAU&3X0PMr@EU1bD)[6Mf'a@P%&84Pl#
em,r1ES@F8V-5NTR,R@UlV2!P@8@YJ-YPSicR!Hk!eaa[Hq0qeJ5('-)Yf@b+8US
IR*S9pM#h@+X&LK*55@%&$QfCMUf(&4X5eTTX5d%qaBrC!Y&$-m`Cf$%rr+)XAlT
arbXHEk(X'a6mIDAN-r8MdV1G$BVq-4[J!jM0mS"mUA38V"aM66M&C#HTiR%Vqdd
R&TfqrRAQ#5qmDTfN%XfJK6-Bc'``cm(-"8&ZES2j$MlQ-CM,B-k$Q4!h(m*-5$M
Mk5riFM@6H[3Yp5lf5R9aVbf&YB'QLj,[XIe$lY,LH9,5aEQY2kKeejli8kKq+ei
%$rSKqQL(aHSEXBaN%$q%AB4GL*f,RBHGMjf06@(ha`jJ$m"fBrZ`[GKK1mC'Zp'
#Y+GV5ddY1b*$Qp+1Y#qYl%Ce[!M)&IDRr8GTPQ#(XA6")$D&RBpGJ&f)(9*RL*f
0(F"fBaNX!DR''c&--&re'+$S%MU%kY-&9*pZT"2S$+ari3-NPkP!BQHq6i*L)#i
KI+jd)9#I204ID%AqLN"M8BdQiCqK"8,Zd,GPj!#9V[&QSE%G3FK4NfbClN&K*Y6
Lb63hc8Bl-0('*"[6,N`B-P8))$$Y`Z3-dc4-(c+9b+3J%i0-16(9a236diK-R$'
C5%X`2F-N&*-c60%`*F1d$"-d6"BbPFM8)T-d6%)"%Na"-BN'!$'4`b318ie-@c(
"b&3EP@3DNLNUTR@BhQ(U%E"KkT'T+kDV(*0LiSVT0bDPQ!*L-SJT)B#*b5bQGJ!
cTUqBk+%YhH39deC-#,QT(UCmQ-*LQSY*,DDl!%%QYU!))!66Fdc@-CR(&"I6B8a
L-KR)*#"6Jdcj-5A)0")INd9-Nc&0b13G8ha-k%&GQ$TN#T4T65EqQ!4MUSNT*LE
(!&DQb*J)Bj+6k6l((*P`BNS-!'65M`NRTU'Bm'3bP1P4*MfC0Q85P%P"TUHB1!A
8Q54P1T!!U9'3!-90MM+&#0JcHFM%+0J+m$1KbN4FrC0ZR*`"h[iGaAIdd*!!*N!
['0XaIAa[2PPRHGDB0[)#C&R%q%cC4e3G(2c[6XKf!F5JBr&!leKe99#6eVPK"&U
4PbK%H`KT5%)Z%Vj-C-r`i+"J+2YepJi[fia2jX"XU%`kIeAr3!mYhfErlfrrYp[
r(IErJIEr3IS2hB`bDTZeBcJYPe#RrGmep@$l)9Z(e`4[p"&AMBcphf[rlfZc(Y"
rU,ckCeYrhe4b(BHU[VQ*MP`YTpTAACEp8kqQ$Yib@DCe4d630qIB0h[XrfNhhc`
*p5cEF&Dq)''d[V`HT65`6Ae)cp'(p#"p4ql8N!#kd9Dd&"e$Yp!TG)P6PB`6H(9
%kjrJdDNAa)QArRRDIb(DUF`*"N(65ricr4$0lQLJ![VGY3BP$kka5P$9$[d#D`r
m!3XDR"bahaBj3JFN5Sq9[R(e4(8*&KRX@KIcjYcMZEIbIljeP31%'[,1rr3$4pA
Q6NjqfFJAd3IMp-"pi5+Mk22#6$"i!,kIm6K[`'G5-FP2miQUF1#ZH86p*1B%)j&
0BE&$1iYZ3-Ae@Z,J2HMD5%cVe'Df!KmH"HFimUFLZ`p"9J[,bBBET&E,2GafL1`
XL&X6N3e!lAi-6`kJ'pJ!Yc!LI1%H!CqG1JMCGfBI"pMXa6NR,BG(CZK,e4q[K`)
Q['#`+m9k0Gp%4IJbl"'U6f6[rQ+'0EdV!+rD-B3!LmZU[Ak!6j!!IpUlqacb94l
FaL04+KrGEB&(PXXGMN*eD-pBH8+Vp$(iNS@4dBb,!6mPSIPdb-*PcI30JLBIEHD
N+bD%($PMVX$TQNa(ZAP2TRqF)-*8&P00I%a(1@"NLSX*+$kQM0`F+$[%h!!LZjp
FCGRca-39(lZlA+1`Ji[T(MlfjM&aa-IH0bDD+#peC2)((e0+6"cKBeS-2ciQPjL
#`XGd&2A(al3A%dAii+j-Hq&MSS[*+Aa-PM%&KBmT-+DKm$'aa[362[CEN5mqpP9
"bI&45bDHm,(r$l+-Maer6%[KBemGNfDd*l9N#J`IY@#D$4r6B%b4i@0U5NFLfd5
[&5EE0$h&e"FqTYlXS+RiQ$CMQJXI!Va14,9T1SeT-(cd+&0cq0M0aD3F2QV*9"d
qpUNacBC2GJrD#69ml#TNqJ`IZrRS,q!&M!"2m0'(6,(KSlj-Xq&c%fciN!$lQA$
$aa3B8fhiQ2jL%JiIdh1mL3q-B9S1(lZf&+6E962GHG@ZA@mUeVGV&b06J2MBSDJ
$Mah#0DEUm0'hp"FqkJ8qi'0+M3NhI-JD6,cK!bH)aFHd)C0mq*LZdr'&$Ndh-Z@
($raMU!!IHmqB!-6(rMUQ'['aIdjRHMU%%qJUq'3[BDL[#%5$ep3"(eLTSe+G`LC
8&RaJ!G15q1JVa"Cme0&+2Z*M3XmU-Z*M@Jir2LBJQD6$aa3J%hViU#@pL3qFB()
5(rM0""mqGZ["&r#"fH#5Sa*-@1)$ajRQ`dHGQ2E$4jqVj0#P1Y&Iq+J&pF%((M!
KL!pLbJ3S2[!-ES+22BDmJimpG-b*iD016*2LSdlJ*$lfGHSN5jHiKFTH+A%ETJh
a`4PdKdC+0@-Z#apiT#T,5Vd0Am"(Rc#CLSrrF#9m6&SUG8YTlb+c@[M!!c!%(hL
JT$XPV!A$mE%M&!c%abj-TNlP5iYVdE2ii#dkD*-@6f!L&4qB#hr""kiaVBS2()'
liD-RQA$&4kfCC-9($[3A2UC&Q5$&"fm!kr#a)j*T8RcXmq-GI&"dDSk2ZS)Rq0L
jb$3T2RDP-[f,MjfRB$XqDX`NX(`CeCL*B(c`#DC`mF'TQ#6'"aGLSKJII3PHi30
Ei@[i`$MUKSqHYq0$iU-(`Md92S%22[Gd5,IMe%k#HXB$4pj+2ieB6Z4TqjkY1Fi
#,Ma,Z2$$bCGfb1jHYHqjQTFYi-*c`!AKA#XYTr@bIF)85Z[@[+YIF4@LKq@6Q3i
9b(e[hhdER1jHlj'G%mVRiK0B*G('Y%-i-ZZ"'IkF2UFdZ,KRMMYRFA'db0qerD9
41rEM5rNU+a4dP-VVmhNL9LMF0Qjr5b6%aCfY%,l#,L2jRaY#Pi#Hc32ZZiE3X`(
TMrEfq&8qEma`[JpKVm-1q*%AZXmC2+GBlLRdM0PTaH*hqaDRh0FNqZ(T,ek+cdH
aAX!hTf6i!G#TT)Imp!Y"h%1`UZ"1VXbXfmCh9mViCMkhB!IE9rD6+,c%MeE&V[E
b$)lmd,"lBQlqIAIPjUmiFpQJ1p`hi4cRMZMIb*aMcq!)(EQFCHk6XijGkSblbma
%ZICkfl(2fURJYShj-qlj(HIDDkrGE-dIr0D&cUC0QlEDDeLX&r[IYQ($MMIZYY@
DeYiUjZjrX1plj*%Z#AQkcap4Gr#K'HXP`)IEFXp4'[Xalqji#$2Z6XCJ9i,M6fk
$-"rcl@k[#AXMh!`ZG`+j[5EF!H6fQM"cVaS"Gb5j[5EFkq2fQR!cNpYV`[e'EUq
*h4fLHdfifmHa+U1G",VAa1Kq)GeVBM3(lrDDF015lM9T8ieeVdQEGR2SAT-flC[
3[5CYfS1JHdhD01H[HdhXEJrGDp+QfhYdVdQElL(5[5CY@UHMHdeBeqVfQV4VYPl
hQV4V0i1+mHh55h@[5E[f)qKHNhEY!Y#p*Zfk(dRhQV6VEKrGDp+Z@kKdVdQllTT
5@3"Lk[DDG+JZZYHN3cfYHddk*0lUAT-1cHlVAK1lEd2hQR3SEpeVdU(G!lVAT%-
h(HPHN`lG8U9l66V9YlVAT&-jkek66Zd2d,dQRGUMSAY01LAlk9k66Zded"Rq6Yh
-T(Y01R@lN!$Z0HR8RJ-GfqV8EJ2GDp)P(0'p*PhU"peVBRGJk&k6,LRAZYHN5rf
YHdfk*)$VAT-Zl863[5CGfN1MBd"GZRP*pjTdU3DU&(CT$iVZ0HRL6LUheb3PE0+
p*LReJHie55Prh@Z58[rTAT18GQhSAT18GLISAT18m%EhQU4d"j,Z08RT,LIGDf*
h@ZKHNj6Zh0+p*QPKJ1ie53X$G+p*@RfVHdh5UV[Z08RV[qie5@XJ82HDT)9rZYF
NV4ZRG+p*@[LRHdh5`MrGDj,@h9fkeb3MM0Hp*KPKSZiebDM2GDp*4VA3[5BCl3(
4[5BClFA3[5BCjDel66+kE8RhQQ4dEj6Z0FN)Kh5[5EHiK1iek4BQkPk6EY9EpjT
d+hqG!Hr@hK!GJZc@,JcGDp+Y1jYdVdQhDUal6EV9pkUpG1Yq,YeV-N9m3'H*T`M
[G+r*&2@m5Ya69%IGDc*&HdCdVmN8lF[3[5DXjA*l6DB)Eh5[b46G1UCl6AV5@AE
eNEIZ0HN4&ZYHNalKJJjhp+M@ZYHN4aLM#ND2GRESAT-HjDel6ATdhjAZ0HR4h@@
kek4(pj,TAT1TiQ1kef5UH)AZ0CNUV05p*P1&&lVAC+TUThY0TUURGDr*90dSTAY
0TZT1,0eV-PAhL1PHNeja-peVdU[HdVdQ[F)Yh@[5Upl6[5DpHN[hQ[6UGLVGDp+
V28Dkek4Apk,TAT-qF9VGDp)R$UCl6IV%%h5[5Cp`82HDp+RIU#%qGXp`qaFqEU[
#Miqle,J&$"mhPV&,4ljpa#Hj$3`II!QqJ`pmKh2K!i2Je2MS%hE#i)1AX2X)(cY
JZ#--(rH`X8G)[Rf&$Gb+K3rXPaZ[V)qqi9BXI14+,[M!5Ql0`JFZ`$A`d3r`Dhc
X'+12m(%I'0L)Mhdrh++&Madcm!,jpK2IjNemF$*fmZ#$Ml(6"KrB$jlMSplFV)@
2'S"&q1JPm!%I-I""I'!r1iM``6RB95AI0(&ZEYc#4qhT4ha`9lJc2MLEVVZE*Rk
#AS%2,1EZ-AaJK0`VCRh8&`k)Mee(m#pmm#hZ*T0[ZM31p!GmF(9k%apB5,rJ)eI
fQ1%$dpN$KSmqilibI23'A!-ImH!`2V!+l*+2HcEXh@Aid"Hi[``I[*Slc2#"Lr3
)2[J'2!)I1-KpC[MSCr3CI16'[Lamk$4`I2QX2-,Z1(c`$2!C(a`1I--(cd5,`!I
R89hT!'%dGpRK!brBfiD2QS)Eq0M,K9BMhi(5Mq"@q0![i"hii1(J'cii*,Z`m-&
Yi%6i`!Pk""pBBaFVLSrHS*lik&H`3Vk$T%141cl`RYeVq1KAhX%(9d0R`!IriAi
mI'!hHJXqX!2ZLBmHi+imI2!NGU2*0d0k!(jmD#[XUF-(,f4(&Ml`MleNq1!rk!R
ik"Yi%$jU#FEL)fGfa-RAVrcJSIM!H,J'2V3!Y#pmF&5p'l!IAZ3N[hl`aXd`p)-
"E-'e2UQeh3FShd`d1+[AiH012YArCZU11pArCZV'-pArCZU@0YArCY+,h)GRIB*
(h)PRI9*VlXAMQkAlhe6rQkAlqe6rQk9lle6rQkAld96rQk@lh96rQ`@'FFZEp3Q
'FKZFp8NrFd-FhfabjXiikq2q0pArCS-VGXmK2ZPeESqc2Qj28re[0Kb2'q5X6lJ
(YmKCRf!LpmGCRf!"GmMa$9!llT'c2Zi&92e[3$IXUIihS&[D92mEd$edU[m0J#[
F,@Gp`NqiAmlk"&HiBFlkT,HjCBj[$MALTMRVSfp8rjZM+bT8rjZMHpa8rjZM'ra
8rjX$9l5l(2%*Rq'Z3HX621AZ36kZ5q%Z3ZZ6@R!ISI9adk$UIi1k&8le[d(GrkE
khk$k4[@r3AJDpa0DRh!'ZcF5Rq!MGa6bcD@(ZDI3qX!BeIrQUTDUrmh9(A+Urmh
9cA+Urmh9$A1Urmf&Ah&rSI8*(q!13ljjB*!!eCEa5Ip`Pk(e5E`pD`!IY`+UrMG
20q'TrMG2G`1UrMG2Y96pEjlk8[8r@T8E"Ue2HTJl"kd2M&(pEljZUP2pEllUTrV
II2@LkRrciC!!h%"SIF*9Z)@3!'q"F%Ae[`Ad0RF3@KmBV2VI![@kkRm,G-ZGkRm
,d!LiNp$k`%M9raB)Ye6r@kJlr&6r@dL[FN1KpA&(SHTr#h9cRqTr#h@ESHTr#iA
aU[mYK&Yb&jle#EIKEMbq4EVC6r@r4H!1pq*CRr3-Gq9CRrcRpMcViqj$eIm@k5i
reIm@#Hp9reX%plEl4I%*cq3Z2HX6[X4pHRa$UU[UId2#IYArKS4KU[m08@YZeE-
qlY06r@p)GbZUrMH%&X-0HpBR1J+hl&NIH+Ekhj!!m%ce[m@kB9$e[mA+@r@ra@#
@R@A!*rh*hA[@*rPcfk$eNEIUIi[4HVK2d2V)@r@raI"KEQ,N'pB0MUVr$H['3GA
rKX@I92mETYEFe'Gph&qSqYq`lZY6r@pBrD6khl$@bk[qYd4h2kVqYd6BSrVI%M#
)ZakY6qV)IBr@aff2U[mY3ArKYN$VSdG9reX#AqA@3,kPZ[93pEqP`Kl9rjD#8pa
[D(hJJHTr5h8MS1Tr5j@IkRp,d5DiiG$kZ'&5pEq$G6qLkRm(kfj,eIm1&YkVrRF
`pE9lD2'*rX@GN!$@*cS,Yd*D(hLTqYmbhD@SqYmbhB#TqYmbBBRUIm[SFfiGY$l
*NpX'V8pd,QiFY$l4DlKcd2V!HpArPZZ@5YArPSY2U2lR(IUbZm#Lmm+mUereAMR
2bZH2f`AQKGd,'CqNk'Rjr(&Fd"GcdCM2l!bMl'8dHqVi2m88VVRD5rqFhV-k52U
i9*Jl2qri[$DR*-8R`'6[6BfqC`Eaa0ZR*2N"6TlCrX8R`2MPGVajB6$!'r-aMhf
qh6aeJH9i,l#ET9jSYe1pb'kJZY#LaN9fBp6&0Zl&p[p,E2`ep[pP0Sr,E9jAf(G
HD[1kd[jrQAhR+[[ZDqhrUfhFbqe'UeGdlR&dRkGL9f(X,UCU+pU[SljXI(kGSFR
Cl4cbMMek02H1@`fQ$qAHB9lrk*h[C*16GjMPIqM-1mcU6jPj"pcSRAQ(fIcpGY8
lHSHjr4Nlmp&j@IX1Fr`RC1r8ecK+&$2qkCQmQIp2cEc$`(PQjKef"@cGq8jF(rB
)E*Pj"eTkjX`lk!eRclc$2S)RlAdR"dLba%+q5Gcc*lrMMp0YI()ii)2lGQ`bVae
)S$Fm6@U4mNjHLqak6iZ8Gp$kMYRj6MBjH3HYEqA-1qc[@Y9j*r@H*LM[S!P1DSa
km11NGLM[S290DSIb$M[#*V9$H3G0F&)lP(I3qLBe2(Q(A@16QU#mJbBiU6(+1fL
#NjUP(J$ZmpB1[32[F#Zcr'ha(mF,j4elJ2!Ylc#(dq**d6Y-%AA2[#0QG*BPHJF
H2$PV)qm`KG5DHBRHBEIQ[M[IHF(81da4YAKVp!ic2JrC1fYMEj!!P[hVYlc$RXj
*(Lc[-![8j)pa2ZcaE2,4q"efI$CjC[`11cqE2$KqKhfJ6qVJ91-Gr`SZHjMImFC
Tm&k#`iEmECr[BX,G*i"ehV4E9Ed(hplP`Rf4rUmGGH(XcchlU&jTrlr+rRqerIq
DcVkUm0U4Lkd1GSQ0Zp6qIl(0eqf[ZQ0[9AL0LGYEeGTAjD%3GId%&lAPN[XUCHr
Z!R8eff#I[4P)VfCc-bcbhel0&[QcYZLIL0XHAkhTC-j9Irb0ef'L9XeF*Z++HGf
CacheqdPqcIV[I+qDGr1GHrVQcTiGcF-[YlR8Ar$Y45#`eA0E96Z-)8VV%6U1G9-
eFFY"A*d1h4!dKdYZ+@bd!LeLc`HIYh!"S@Ii[AlcR8LGFLS(DVV&)Qb-Uejp9kS
D[F',QN&c2*k1APN,NR$lNk[#j[BF,3&ST+mpX(*e%RREme[4MT1`iClYVlNNM'V
ESiqZ9[diGSHmC'*lk%JlU0IHbiRMFZV03q3a3Hc&XGqS[0d+d98kjF"kF9I-+mf
GZkZe`Z"'Ci@(`"4l4@EBkU8MFUaddI"E1A"Ycj*hSqVGZVC8M"Zdh'Dr2KfkcPq
lUp,V25l,hHU1q%Rb6UPAmH*Jf@ZedYMXY&)*)*2)!MiQX6%mPJ+e$8TaVYljr![
B@!h10R!5V-LBa&KJ6#)5A+a9AL%XL5fLBK+FJ')5Q@"L%KP$BLN`JC95G,@GBMc
-&bi2KjABHM-T'1BE*-,#8Z"Sc5)N,-8"K1@J@RI'-*K%*LLB4"C"-!m0#3C+K$h
l*)prfDJ#pQAMBYa,JV6J5BbVDblA!YB9!l1YQ3e8M-[k,EjP[3QfP5UU-*50+f*
D0M$"Xfa8JQACU"M(NU!%$j,)BQ[%f*8V6Kkh#R(PaP#mbK8p`USNU&kA#+15'2!
T(e$UVKLAXP%**Q@MLRL8Dq-%LakdF08Z3TB2,D"52ML'TR+N&VXFk!TF+%)"U@V
4fDl-4bYQjB-XF19$%[5Upi#L6ckiL'2jk!6-mU%*SZ9$BeJV4bBB8Jk[p9D-FSA
kjD'Z'YcS,!@p3Up%b&H1(#YGK)(P3)#`%PA[eKJ5mk%*,ZC$Lq"B`)X%)4dHf+J
6JRLlC[,`BAH`P350B1d1BF5LM&cFI5khc93L(e@HMJTA'B5(HPI)Cj*T@@M34-Z
"NQF59%ic5`k5&20F6p2,"dPUfB"b@[Qf5R+V`,%Q@)Q8,204j956blUU5&ek)!(
V8R34)8S2j%'L&*lJI5NkK[aDF!+GY4F82@Za$LV,6C'(rdCmPJ'8id-58)T,@VX
8(AGh2EK9-0IqTF"E%+$))jX2M*BlTMHei*[E0#)jY9Ki6Mf`f3i*fbP&*i5R&&d
Jm+AiQ-2AJTZP,-K0)lhr*2Qid+,Siq)UQS8,,5PS,V!S&EQiJPJ8Ka9PQ6Jf*mc
%8GAbPN5MI'3X'f8MXm+4LbMb,4GAB&a*@+8B%4Gc)6@5ji)VBQ!KY&UqJXi9Kc9
E+Upea9'UGL8KjF)@&5mA9pGK4hVhk1GKH&e"$f0E)QiBhKKP#)2VqRXB@e2JFk&
e26XAAe5dFj%Pq9TES+(%ap&P,9kM#fTm'&AA(X,BQ[S3K6D+90)Q`V!a%54mS$@
eNB3hbeXE,-L&MVGLGEJJ&jQ-&d4KpH,A4`c#f)C`98HhBRa$JkcM@c'qU3eA%+i
BA&Fa'aKAID!N"jC4VY3,66@cKR1Pm++L@8'kBR"GU+TJA5didE'DD&GmB931Vq0
G+EkQd6B3VrT!Sc(,5QdCp#Ua9E@f!R[j5aPVb&GjBP66Uq0IjBNaADq#JTAiPVE
A`-,''e@eTBb)e6BCdrKUZ&KpSD,c9G#a%Yr5qLSBfB`[kRe0T+`mXNhcUq0PpBQ
QlYG!cFBESbeF8rr+m&N2EbL!&4!YV)BE8dE#q)Bd%JD2DL0KI&-F#D-EkNJBA*G
(FV%08TjlS-6+Fk&PrUfpd*4)i[#+L+$K4C%N$'ZS*'&`A5D*BTZP+JXPBGbi8K+
q-#U9*2'Y-YI&NPcXYXDXb5@jd,aH%X8eZU#KQ)6"6FQNMRZP"jUL54hj5JqdC*-
+pT@L'm**!reU,j3CHKRrbNh4%NpU#&L1,mNR&3`X46F%P!S+eU2c%NS6"dY2M)N
SG53X2e#A84TB@(ZKfDB9*D8-KpAJQTC5!F6+fE(EeC3+,&BIZ&P2UB*MpB8a4D8
-NFhi-8*H!XTQH*eheq"bp)Q'X*!!J'BeG%aC+80R+hkmK(9aTBQKe9GZPPIU5&T
lSb@`02#dqFKB3pFePM+`0Z+E+NX&AU0,6QY66bkf02EN!UYc6bkf22MN)NZ66bk
`12S8aj8'GH,JD&)R$S[RFV*e,Smrj816!D*XD'i!bS@8*U"FB(%%+SQVPL3HJR)
ap5NS&edGJbV%eXTB()5+ieS09KL&LX2F,&358kP`D4V+"@j6rBla+qhaF6pb$Fb
8iPH0$Ze89CMX@lQkkY1I6fd+Z*T`@%baaJ1cD9DMDkR'*5kQQ'"N0V8iUTC5XF3
2F!HmjRME!apDbZBKDE-2dZfE)Nr*P&iip*mPY-2FBSfP"2+US!P)*l@SG8#e%Y9
hbY@S[K*9T"THUdVF209Ua2(P+X648ICa@#hV&PbYDcIK"C[q8G8pYKj@E!jeX48
)RAbNZ@8S`U5QqNRXC(l9K844k$J$,A9"8l-S&D(*GfppD(a)Z0)9cIKEFfh1&&F
kT%B%A'F8k@STq5+ef[C!HIY13LLUY+p@mH)$&HSA9pJEpV%c[0h4(4AGl-%qS([
FE3,FN!"Mcb)"$iiB&fNqUpUe$4KBHUXh"A(ILq$"19lh0L`Si%'R`B-MNP8,#r1
lYp%%K`HL(dcELJH@*RMHm'$k9M`iVaj8ZV,aaJJ2pZFk"V0SDQ[p53QAR@q-DUM
0Td9HY'C4H@6!,DArC",UL*'`(9ApVQ1B%HN('B-(GZEYT(DV&8E*SMlIUrP4h%f
0+$Jm%,hC[)-()6-ibqqLKJJ4(V6p'emF#CVGc0!KdJqk2Y)2C#,ZR,#jD+KGU3G
9YlpCVEGVAF*)4)3(UIr3NhaNB*!!ai1ddCY2CaKfBp+pE83T`S1-R6pB(8DqpT*
XF8mZR&BiYGXD-N4id!eIR$*Vl`''rHDbY2Zq*f+2EV@k!*bh4akVb`0RlAe(#1p
JId1++C@Y[l&kD%"A2[S!mYK3@Y`GS+lV4SChCRKA(ZYlaNB,P3QR'XIcRGcIAH8
F-PcV2*!!lNX[J4cak[8`E,TpIVec0C2jUeG6RlRpKY[dhqE"[C0MhqVPVYNAe1S
1PmG5AD$Y"FMMjS,FNFI0ad,pGalE%YQGakE9,@IHfM00[elriX6NhjkCPhrkmpb
Nr+al(&B%KIelE0V,'q09,[&K[hlRZI3f1T[(QIrEVj`,Cr1iZ6h)3cFXM4Bfc%1
@@hN#mMKp6f8RkXUjRbk2F56DRFIf1c9GZijr0SmYcX4ZR!jA4J8T8,[3)NirZM6
i)BrKM98I-*Nc`UUpc26rIr#2TmA4"kcKYMbf603VHpq4e9Z6r'a,dZi5N!!(hh+
Dj'GeABY9aKeYE#YmrJr',C@Y[h%hial0`a[!Z0HFY96hjfrl9JmYrl!HRJrQhUV
UhFap-SpGc(dbMeh-I8FHYc(hL6`QQ,ZlNmdI`0`EpIJaFamYl&h-I5+2AFbpNFD
2Q2Y%(YZCZq3a5Gj$jVjTr2rlh[["Z'9VFIf0ZaPh+`mq6`$MPUe`KjlL6Zea+hb
CIfG-NXFfC,LG-8hQXB[Tl-MM0UBcNFIY50l)idG)2T((GY#621`f`!Q%@-iLM[(
i5*%Bka$*ikQ9PE[c@&0Cq@%HQI)(Gc#Rbq95hdI`erTZ46cCT%JRlXMMl(rKLT,
(fDc9cHePE(6d'Ik+,J&ehF-CXPak1bIIRFF%FQl[XfarE0h6CVGq8p)pbf-BdjZ
UMcFFrc5U8NZ&URij&HUeYhA84bp!(L[UFH`!-3)JV6`%kkPVX&XRYkUK&k!H9Zh
c!Z6Ke,la2(DVI@FQMEScX0lNFI&'PJ@NmQ2i$lKSIRlfcfjdrMLri1VA"lkDGjp
lN5IP8[0pALEqa[b#bkl+cljbILH2*kZ,4ZZaXmp8C6QVpAkr)V&B)"V,JhXe!jh
eZDI[VFVL"HKAUl*i!I,J#q%Xq*qkfMbN2B,rkim6`kDrKc+BFRQS#m"GjZc2R+!
H`HcZ%j-2+`D[IeqE#MrABq1Ij6"HJ$b1AaQY+'"r9PGBUEpLCR(mUh+KiTIM3[I
e4ii,hGH[rS"C-FZ&pZ!(#2cBS2AK"-l1Z[SRP'Xqj96r@eHEarC,FRIQ-6(L&4c
9r@h'DrcEcA6m5M0HHcl2dScAZDdpl(5LVMk#+@qC&G[cH8"Qa4S!mU0CX4C5q`*
QaD+68qU2T,T2-(G2"62e!L#RA`'TGRi6Lh)m)*U1af96c[MR)G"Lr%#EF[CmRU9
01EZeQ(SLAS+01pXqhELclI0[EGbC'2m2CR@VQ2rIaH$m'hX%EQGHM6aqc,a'#h)
AmjV)`cZa(f%hmkSRiKIBXa$QX@P2Rj'%l#305F(B1hi!4Q$cm%VXIBJZ$dURPd(
Xl6pF(V6IfjF(qGLqeL9+iH9"[VG,P(acP`ITj5"lUfUA"qe&B9`He2ea"H,b)-m
E(P3[$r+`IHA,JrB#%#l0mDGG*TAj'%*aHC!!IRZe(K[*fLL,6'hBRrIPQckR0,L
iCiilCh&aY-MIYIfPd6RG94V!#i-"RTM22i-#rPTFp0PpqqF-9[VRQ*2mam5J)%i
I$8EiHCQQ2`-drApFb#I*TAfm+S8hl4,cil-ai[5'e&Hlm2*9Yk3q-r,FH[hh-'e
cqHb$klEFp@[NMbma(`#epDjIXr'K@F6IN!$Eq2#&Z4X11kf6KqIV%[-b6YFZ-5r
JY0rm%R-[!R2h!ehT1-lFqC5jQkX2[l!,!(2h5eeL[UI[pfSC,M(If(`89DQP3P@
rR!VeN!-GpG%,N!"(q4,cFKkeLl-,UTK9$Ed!pE"URaFJMq`PjQ0jl&Ell2A4[mh
Z2(H*ZENQpehmFSQj@IpBbpQ3!,[hqBIZAjHllA5"L9aLhYFNrS,F[GpHR&[rKl`
AAamp@SqGI9Dqa,bF4qd5md)Hj8[-lkf(99Qm!2eU94B[3"jmq8[-lkfVc51ja2c
H22CZ95iahr(Y05cF24-m!REFhfR%b63lHFa91XaFiJU+B0Ga1S"4iMC[Lc1Rm'F
aF@GYLj[+Hcdf[rBrbZ)1Be00DTh*,ikEXj6eS-4*IR&Fjp(mk@j&E'TSHqb(PA!
BerC6r&PJiYiRrYaQkr'$l,ePbr#efrIS[DY0h1@rL8m1Y,0ahq22m5EZ`IqJK$9
[1ZIq*ZiPS[VFVNiFXl$kh[9I`CHar3&0Q'lLCKb1Mb[A541-eRTm3eYijYJkACV
9li%RiG1T-I-cfAYArMkqZ5DZrFQXITpl'YmmqakEIl3HQpr#4iq3!$G`U[@lmLj
mLfcF$GPlRhd8Rjjidr&'9Vrcj"XfFIehU$ER*,(`3(Z-lb*`SZ[-4T)Uae(FV&l
q50cCiEDi6Z@p$qq"%e&FQhT#khh`lq&lU+dVHbHe2ple5Acd1hRdCZqGmZ[iMM*
a$a#$dIjiZ6$#(T3ZlhdNUrI(EmGhY1dRmY(qZ&Be8D@iAILQlped1Ek90Zip@Ar
mKVJ(GDC1Ll0kI+%IhbNQET(QZ,9q[EIKHjcY-r"@hlZkJ1raYRiIb1Uh9EMb"*X
(F9U2@HV[8fhIm%IV0dGpV0aLk)$X[HF*2j5l$,f3!0A[Df"YB-G0M[`aq[L%4M)
qMFG$Id'1"cGD-Ed4amdR(l0ZD#"1R2aKkU&RQEJCi,hM!I&lrAr+RpI6ph#aU1p
RITdr6l5iSTM,Gc8iQX@9+'l@TkEbL1-1RF+9+'lfMr2RF)Y$8Gc3JjfqE$rM1Rc
J'hh'J+hfj3h#[ZY-h#2e4YLAlHF,Qq!1mMeFI%$ll,hL('qal1`+rUaYa0YalRl
L!biZVK2FaH&V9aEh'QKMk[YX(d4aXjAI1fdI4(%$`MAA"e(F3[APNEB2SVM9fXA
JkK(&cG"%5ApDer6XAk(Ai6AbI4XH-qX9%rFJ1)QCEH*'9[0m6aUAZ[Y0i[BcX*J
HFja6Vc2[G4a"`$5ERr!RFi"jll[Rii-VN6*p%1*6HYNALC-h,9k#Jf&ITSq'XjN
IX1qpJ$qp*ZjKMa"hS)QEqbemA5Dr,hi@Rq`HXIha)A')m,fPca!h`qCaC5H2e&Z
[%YG[iTBFKHmVjMhc'AcLYh`#(UAe[JVZDm42SAAmAflH1qeca-dfF6HJ'R8BR%K
YSXr--6B2H(1(LA[r-((+#qGT0mTT*Sm0B)Da[(!CH"`X0('VZ#c5@&iirccq6$9
aQBZ*8elB,h`0qbRemP2%+5rXrel@6bI#+Bh`!Ca!N!$pX)QE!Jmc2f,LP[keHLM
-ia0I`kFmFYQKr(QVLAX(2-aB(VP!R#2XJp5EkRAi%AJT0@icIC2Z[j3ijCF$jfC
iN`BAMH&KjR4Ui2$QF,L6X6aXXhLRpYqA`8CMP(%c4Nml["NJ"f2jfIhJB`j[rP3
()qJf+pYZfKrIK1FCF6G+!3I9rPJ'9c2L5Z!Zp9@m@DNkk9cJ)B-G[%NI#DBB1j%
eT,SUhMaBp9jYqj@qecb1q&AL6M4aM`$R&'p50`P(*5rE(mr-m1B,m&GMjD6PQc+
mf3mZCj5[I1m'Aa4[dUF,Kk6[,0k!IiShhi9cQK'E"h80m5Ee"&c(M*Ui`b5*+Gk
F)Ia!5i%R%DpiXq3AL30rU#Ym@r(lJKZ*ff"jhZ9C2je!$3bm`&*Aq'U)0kR2`qd
-A-$bNVrXi%hkA$LVe82N1e6jKhL6VX-pc'DH$AjT(ab#cQ%Xcei((MZmk4-r8*i
p*,`2m5Eee*H)#hQfZCjh&@p5I`2(-TCREi8R+GkNMk5(M9RrB*lK2F@Ee$Hq3)!
ZD$Map3a[[[4Rq*5A,lSl`j[h2d#Fm[)"k36D(fIqR08p`'2iPH,%3H**bYHI,Fa
3[$NH2F$Bh5c(JBX1EiE"5Q-RJ"GPr#EpNh"IBcAMj`K,&'pqMCSDUpmYqV8-Ell
e(H*8DjcjbaQZAiGQBqbHQT-jEpAaQqqr4TcUKKfAGI!QIC4iQmkiV0'PcFT[6N%
E-&C2("$2$[%QGD2U#Pq&hm-h3Va*E85(-eD&AdE2ZAjk)lQDLfardfID6rGARkQ
qq6c93r(QmfL#aQV$c`Hh(0kF58f0PB,2&diT[rRHEa1Rf[Ca`P(YJb[313bFL`q
jcH&00c8e`QhjARJ)FHNd,MJ)M$E`CI$M-cq+6R+)L9X(KKUVSbclCJHI!PpBU'0
'Pm(RA"l,d)3-R))mES5[ZMbHF!X"e"NF26c,idMa*l3XqDk!mlNmVP8I#1D3!-G
(`!qAadh+ihbE"ra"mlK-q%'KL51qTm'dBNili,Y3I2kG$@pkSY3m!@m`4Um+lN1
V-1,[m)`qrU`hF@qL9mc2QlLeF2(JPdcF8H*jD)$bp`0S+QD@LI[@6q!$pq6[ai9
KQYm@mEQ,6"lV`IJ`[r-Rhd!l-0HBZ1[9KjVIG3m6KliNIcm"hV[mCSMRSG2+hdq
LiERmMP3YAfcj[G6-eHm`G&NM(*1r(d2$F2PYr9d#,M0aRp+Z0-h[q,m8m3McZ2*
CqM,%bm`mX-C)j`%2i01++aI$rF`0PJqK"@VFefmL$TbREq!Kmd`H$a%rdpeGalh
5`F[-*q#djKGXrm&$0)qEa$1ZYRd$E`peVr6ISbNDFV(jdBI+,kp9hlc#a,d1[06
kT41`am!",8k!!jVI*@#F%BmJ$q'8,Zj+X0Y33mXRd(I$qUA[K#XB0#MlRQ#`ijI
AJ0(QCSXh(mhbq!jkUJ'lE*cdNpB[8i5MQ&Y0h"[%$l9qAd)E0[!T'bHkRU[ILk4
A`B2NZdMm5[0lZr3N0'ILi"8DGk%ifHY-h&A59l6r8Y*+dAk*bqRVkGHSQIN0%hI
YKLb2'q(Z4KSeFH#(pYqRa91[0A&[NRi4eLpcJ(Lre5rr$`#3!`d,9'0X8fKPE'a
c,VN'NUaF"TX@JJ#3#!DE')6JZ!#3%4B!!'mm!*!%rj!%68e3FN0A588"!+qqEm1
c(4"T!*!&!X05!*!'1*N!!-+q!*!'pGB'!-9R#hr#D3XrXLpbqpKQq)8[I1'd-PF
QI`NM,$GEb-*X,3FYkh%US9EHFQ3a,Tjk-TAGHPi-rr%c0eZH46Dl6HMbaJJP1j2
F2V+3!)@`aBiXr'),ZqAB,@`K@fq4(&mBi4ICNB8XRJ[Gj$CK46MK&q(,HGEcj5A
,mH9-1aHM3)GAURAFkpa2HE([2,+5hq3@4MCCb)56@mL!%li!l0C"ITG01LmlVi9
lPYGETUAAL'jcS2AT`ZhFfL5[LmHbkc3[FqXeF-Fl[hLXDq3ep"V&,hpaiVR2lq*
jjFM&NF@[ZEfhm-[5@lami6kima-!#b$JbN'$['C&V5JId19iV-(##9piC,11EQ"
'!$UpI,m["d&0+A@48YCLPIRiL-VXfkl8Mhd"pJBVBm(91be"a9h[K+%AK(Ba$$D
ljEMPUk5FZV3@%XqM1XaeA)p5EaGl)P*A*El,e-A*r859QAdq-PC2MNA)#3,0@E0
@rq"6pah205H&N!#('!+UJebBp*hh%4T2Qcja5m,Gr'h#XTDD6M`jIjLfH$#0eeF
18H`fcFqiH)@6VcjMccMCS(N'IRC2RT5,h!qb*UdV-ZqG,6L6%IZck4Z@T#HTVLQ
X[hZdA"YdRBSE&SZjlqDkH$**'L@9L8Xb5EDGfA[9,`)bQZS!JN)!(-EMSHT,ULX
Z,35q8`l1C+"H,9BrBMf5fGQkPb02UPqfrYSkIY&LY34T@+R82a5-&"J@9CXN*im
p`fFGKk`V$Q8ESE[*frCImA",SKUYE@fbMlJlLThNFX,Va-Y!fQ`RZFaIXmf,"af
r8R2$#`&dSEXl)r$I@Y"dJcR-pa+[1f$2#ZZ`p96QQfhXL5SpSJ)ZF3i2m[@IHE1
)eC!!%j-GUBJ8lP0HHG(@NqC3rkCZ4jDmHU2QfS$!TX@JG9ZHH19N,kVf&SYjTDi
m!V$lX8lVSFF-#-@8r'NFX6h"3Bh,H[L2KQRdQ9T8"4LdaiLQD%+Eq-Q8iaidr"f
q&qGZBrfX26[K,b`f-6)6ZMN,#6GLHaRq@E&GL(p1E*p-8-!lhm#r3@crKVm``b6
MD46E4&`mVFB8RkdkchDBj"2ELEM!Cl#GJmY)X9f+bhTLqb`Zki[Y*Pa'LHfrNJV
d5SdFEb!fSaBPhL+f@EKX+,B&Z'`NYTIL-PCXEm&PR0Jq*2@#l6TFV1aNE!DR%JZ
e,FhD'#qf6A'C),CGF'N5fk'iN!"rE#r%KAH`[4bA5@+l!*I*B[Xi,TZ*lAZiE#k
frm"P#ffVB`d,fY3a,`+YGDcTTiMY)&bf%KY`rP5a%II@BL2ZU@)$G`eZ@*[4)K1
X(@`raf9EEFZ`EUH*MCLRLqdCZ'`RYS0af9jXi0d1BRX9,MZ+lHm&Il"p&*HGaIB
eA*V&pP0FRUjY@H))0B@0HL"HE2MX+VB$F4&8cl+q,CiDfiYaf80XVm0PKYMHKi[
!I2C6Z-`8'cRB8f`hil+Af&!FppDf(,(TQ@+M$[B4'r'$-pLS[lm@fl'i'*jME@I
L)VLF)plX*lB2i,+rf+l&CBlBEX6P@@,lGm&Ui"F-Q#Xf-)$mBk0ZL4dEHDFHXA%
r4'cScq!50[$[f@*l+bjJ-ME`lh#aJAr2%GY2F(QZYM83irp'E'$L%@+McTmR0R)
a6fa,F6P5E'IM-PpXa(f8f$k-bp&LqbSZcaFE123#E4Y#,R'-f-"%kKdEqDE@X"%
rA!EEFPc)1EEAih+Ff!a(5[KL)mG#HiH`lTH)lAHiJ0[Q0*)2L),65,`MRpLSHH&
fMF`MA!EEDELF*,EcF6PCE)E[*N6#DL6HN!!IE$r#aI3#F)D5X`Rc'mUi6a8E@!b
QB3-AAL)fFNfmf-!BBH9$U5#G)6ELTYkaI4QA[a2E[q,#QpMZa!AHCmi`mV%9BS0
AR#8fX*,ka3CH`#Q`NEYAL)fDIUABVX)&r-If(9aH,EEIi2)DE4Y1EJE[`dCYR5X
fF1ZeBU2f`("X[%8YBlX-PcH)l9p`HD2BEX2P6GSfJTcfc@+$Ji'pf1!*9Q8c0R#
3!$V&4Vf43fa[aq9YB[XRA,"MqbiZla$Elh&jTlD0**pmPpMJ5r!GE1!lR!XE'!5
RaNDG[&YXm*+,a2BjA#i@fbfiA+*YL!k*"m8'pVp(E060Hm9'V-5#$Dam[pM!"EJ
'0ZS"IShYFPbS)fbIa`9Xa2C$A$iSY[r%"9jJc[VNflb*$8jfKGMJBeH+$H`(cl'
4liq)M4b!4GLS*I!"'cl`3@aJrp9LJh0FSffMb,Nr*MCb6ceLJl[#RE("f84('N9
qJPk"$5cqP0M!Ldq,MGU!!f)$2q"If1l!jCqeE65e%[3(E2"cDK-EqDCHX)((Aa!
EA1+,BJ2[[L3fDKZZJBdB`'&XD#I%EXi'j&AAL`hF[8&XF-L[L!dq3ieJ!krK%GM
!KDq,MEbJcf"$YrLQYPP*")k2$5cmYYMJVq!c0R!GI--'4d+,`!D1`dQaJ4hI&aY
jr)(B`&e``j`0U3HKe@#M4Z&@f1#am!jXa!HqBD-ZEa8Eq!)R`NBHL3XE[)&mQV-
4-B$D`BCf!&CJJkrH,MBi%V@-$9b'4f-$Dp!CX&%22a2EVh""Ec&R,(%1lSN0[H-
ABS1Ar&*Xm$Gi%cCi`[m6'pK%,0M)lkqeE4aV!Me"4cM8,I9+R9+IF!(i-MQ&+m-
EiGK`Dc!&R+BHiH$8!(J'IiHl`Yh"02!'AJKrKa2#"H(qF'j`$qj-RF#Ei@c`C2J
ah"KFJ4q$aHJ,e#RB5#fK+i$AB!HB!9D!%A"%q"je"5q%$m)c`9Ai)$`3h)#(8SI
J+cJ&*X%&iB"`(6JIA!q1"lHM9Z%Ie#Jm$[i'2X$Ai'R`-MJDh!aXTRl"EcJCq!`
ZJmIJ-$SQI"RX3Kp#Xd5R3$0$Xd5V"%[3XX!#1!Pk+VS*@LUm""b"3k1R`[hKS2"
@1!qD*X!0(X+9d5rKQHL9VKX(R3!mG(d8m"X`%qi#Td"cJ#I!$m"6q!#k)(SJ')S
@#%E$1G!1dC,3'q#`k&aJ,M`*rS-f"qq$+k&(J,&S-@J3m$Zd6640-"0H#LkM#k)
(SJqKrk&KSTqLri(Gk+ISTR!ZX"[G&(i#2i1c`MIJU(!FZ#dF&@i+*i8E`hhK$("
41#MF%mi*Vi4MJ[G`5VJN("*mKM2#&H(3F!#i%"`)lS1ZJiB(Ai"lSGZKqk(hSG[
"XG(Td!AK&r"$0%9d"$35q"hD#jS,QL*k#cS,1K8k*(`4(J3(3FY$`i-c`bhJX1L
ED(CSG@LHMQ[#8q"USR(f(DIrJe&1r`FrR2j2E6[pRrTdqMqjGISrf1ldIhL$drr
K"8lr*lF1Lm"TdImYlSVqEr&6p(pEUkl$LlS8rGpb$Y(rE6f+rQqa9I4rLpP1rbH
2S[mRLC'LrbH**k,r*iPRS[mRL81LrbGCCk,r*eQ,S[mRbBP%rlHp#D,r*eR,S[m
Rb5P%rdm5Md6r6a*I42p2-THLrbI*[d6r6a,I42p2NYH)rTpL,NAr6c%AS[qRL+1
LrkH)*D,rTiJCS[qRb00%rdq4`iRqRb+2%2hIGZZ)rTmLGa2phrBqL2kI)TD+rTp
L,NAr6j(lLIkI)UF8r6p&l"2p2r@#i$c`!ND)rTpQ(BVqRfCq4Ip2%pG%rdm6DdA
r6j-,L[kI*NF9r6p0VL(kIjSB)rTrQMa0p2mdFbEBQ#C[%rdr66iTqRqDI&2drcV
LQZMrGDaEdIrVQ#r4rqZ)qD,rea'V4Iq[)dk)rPp(lLEk[qfc%2frM[a6p2mkiTr
SrhAN+D,rej%VL2jI4eiQqRmGF8,drcVb6p(r-m4VdImca%V4rc2%*Y(r-m3#dIm
cV#[4rc2-SqMr'I*adImce!"%rmq3!-H*rTmKcaEp2m0FL[kI)8k)rTmKIS[qRb%
h&[dr3m`@rGp5#G(rXm4adIqcc*2SrlDR3r6r,2-NqRq@Z4$p2dXm%2dr5jiXqRq
@H#EkIjCi*[TrP[aGp2mXHD(SrePb9p(rXq6aS[rE[Jr4rl283%6rce,M&Idr4`i
MqRq1h%$dra`a9r6r((&3p2mFF8IdraaVA[6r('Y'p(rE*b,kIijaL[kI)lF@r6p
(68,dIpXr)[TrMYaAp2mFHDrSrcPb8Y(rFmbak2mjkN'LrqGBSk,rjkLYLIjI6ri
QqRmpm9[drhVQ@26rHZ+Xk2rea"h4rp@BBjKaAqGIlk&EdHZ661lFm&+[j@2aq-C
+Kk'*8afSJJaE93[GqD)P**ARe,cYJ[KVcPmkY"0hafM)AZ!lmH[KKkGe)S!4@ME
"2iIr"[L2ahm-rN2`(i(rF2`RiVmTrT2`RbcpR2NHEL3CfLK6q+Ia(i8rY#q,I`l
r%IJ2aEm4rj%Y28DI1IV!l!GcM$bf1Ij0q1I`Ri6rC2`h%lp0m"q2ra$m*l4d0Iq
S-1hX#X"C#rTU`"%k)f"YT)d4DjelR&c0L5)hbQlh4$r)Rm1'L[EDhVZS46dqe8)
6k#2[QLh42J$(RNh1GVN(j@$#'i[r12bEm%IrG0Uhkae"ad)[4Cp#`d#l3%H!Hk*
AS)@KNk%pSS'L68,6d&(3*Y'qd-A3XG#ed"l3SY#Gd*M3lG"jd*649Y&5b4eekAT
5U%Ad%$3Qp#&d(M3JkJ[Y!ad([42G&9dER4Y0#Cd'$3EG#6dA23Gp$qd2A3Kp%ed
50S&'LUD&eZMk(Y$Ld"ZGKZmd8241G&6dA2JNqK(D'(L"&SeqMHD0TSTZ+aUKeIl
3QG#Ad'8!%YG,JZj,jD04S3fLik$IS#HK`D&ISf@LYD&(Sp1MLD'$SJ@LT3-MP$8
k)E@-hSKqMNk+pSNfL)k&cSFfL*D(pNNI!4SIqMTk(6Sq["qY(Md234$HLUk%YLH
kY%T`8UJ9Em+)!N1r4RIRK[[@G0[GIEfM[EM1'FU05Q1"PR,8Q*Nb@S`dUCR*-`E
Q4mf1)&TD[DA4+-p0)6*qqaSJ4K$&Nl!X3988e+6`3-D(8(@`JNeKiT6hjZ14$Nl
k)e%Pk[l#ZH6dfj5%+B"Hd,iADXU@j"MQ2rVX4,G#TY3!RDpFaV"ITqHi2*0(bYr
pF`*+pZ'`kUa9%jJ5TP&-)k`Le3l,TC'[$kQmmSKU*Um5Yp881Z-8&UAjEki[U`E
rT5jKZqZi$'pMr`I6%XQ8X)ZY4ke[CElDRK+Qer51Q'SF4ZiiYqV@D[EbV26%KUF
ma3jN9KFSC&jjMrQ(Q3$i4bEC1e23R)PiSFHr$Z$9j4qcND"r`NfY0$IdE8YRE(1
mF4L+9qelVN2HEdp(mVHYUml"pFTl$UB@c1c0r8XfQ'C6h[1hr'$kTK*kM1"eNGE
!$)h4@3V!%!XC++#p(C@frdH&'*'Z!Kc'6CL4AI9SbE36KV!I,m-&PSJ`DPS&`LI
AD'+9qI6a5H)*ZLAcUT9$'8kEDQ@H($qMDm@UPGIc6fGQGcc'062cI+m+pRM24UA
V)N`r[D**4%Mrk`1C,fA+'#FNZG42'p,UrlY23eNjfN3AN!"AUe&XTY1'l[XR@)j
c-,(3F@mlaaKAB%GQC54JCKIB@9RZD3BCf#&C1-"'eh"AD2#mElqKc4aA-Ia(&0`
i$1je`bf4c8*V+PdrBYpNp4amd1VCY'VGX$db@&8hf#AHCR3[@UQX1c&CFZ*RZKD
Y9H-fqUX#r%JYqVb``p48CZAq*pA%N!2-2rRP"cDUTjjkDZjr(YUq3[YlpqelkBd
(rj@F9YmUaUirr+rqj#F0#A'kSdIN(AcSm&8*m1(Hf*8jrGceb+irfb2EdPpiZ8f
fJK@9VQRRU6faeDC"QIN[E282XMZ+Z9Zf'YMpIp&Hmq[eVl,9@X`9HhKkmP$,98F
X0EpLA!r%m9$q(Sf[)rrpleALlRMRSETjS'BliiLl([d'lN3KL)-`U$PS"MibG-,
l9''pQ"Di8I+11$CK9jqQ%6F+QQ%CRXZ5*AlfD$5'I#r1PQNrd)h%BMcc4LclMff
'FC%h9NHi8bY"bjBBmM&[m[P1f8@BLG,3m,S0@E3Q6k9eYK0ANrXKZC'Q(hYe0h(
Eiml5N!#GDleL8V3eE5BJ#GdPD@USSQSlkA2+3EhKe6bhBQYqC[2VP8'3!1K%QZ5
3!-a0EC5VI-Cd[%q0UV@CB%d&,2,+6Z`&2Z)eeM"9XpH,&H1Fd(dj!5l@TK[YCFZ
hf0a[+c%lS-A`abd92!Zebc[QbAbQU!,cM+d#fq"Y,9ipQ4Mm`YR,@Ec8@l+mFP1
Zj5CPCXa0,@rVf2c5XMV'UfQShJM#Q2hMLG91V4B%2T+jU%(FD&Q5ZrRQa0-BjcK
4fDNPeJ2Fl3Vh2D+kfT!!'ql[RieKcTSjFa5cQdl6r1+mJHJ0@b""AL$FXi[Vjm`
Z-f+8c'!0SVI1Fr0!&Vm5MTLT"-m2P*QCcbI@Z,,brXjD3$,M8B3'ib,f!YkeK5p
[K4%(cj-@6fd)J%,Ua*D*jlcPL8aiARj!)9ajVJ*imSk&2BV4`mc@m#V9ki9!PZc
lF!2MEZ+GHT5q2YN`jVb["`D3!*EJ2Dp)r#I)6c06(M`"k['U`h+bjG-$F$4bG)M
*LcDY&[B+#52#SR1a)(a5B*(+`q3L2XHdbJ[('1D"3"`GP81[%HZ##"cb-BH[Z%!
$(jZ2K5GI#V-8HpVU+VN8H!h-EXB!H*YjD-D!V[N3HfF-D&B`2r#MS1CQSlJj&T(
c,F6lcmb[ZFIeim4Z!pUre!YEDIL%jc$E$FGGXB&riYc5M1+JE[q-Hpqp39L*9'm
CYE38!,kXLL+DKcHAf58hMMer2&,p([)b'aQeeKP0VeDaefb,3bG5IHjBFhcF$@h
pCN,6JCD%M4'Q0CZpiKEV3!iX)X6&ENd0MGM$$3#LQF9m!KQ-j9elZhjLQqP&l$F
jES`K""R&C(L&GjFGj6cf)e%C1T522FLrZ*0r&bHf+-kJ1$#jq!5YYlAcMMrHG"#
,AaE60&Ndd4`G*M3eFAZDkZhXhNV&SjFK4+6DP,,Ml#DfqDZ$bRfDZj20[@["Q,c
MP33T+$QTe8H&RI`6UF%kbp(M*[pS-Y1HSiAmV)5pjS66FR@!!BHVKf[BFBUk`0(
-KQ[S)01-Y+!92L`)m&K1PUQ9iGTjpk6XT'Dmk%@Zll`$F@MS[!2E(0*jKbR,MHN
lEK'RdM[d4!qGIbI4ISI0*)ChiQ&'eRVcljc4IXGZVA9h(TNZpI4AiJi-E''a5qF
G0S6BYI-18f,h6GpT``ECc6,l5Ki$!eY1R(hZRA`"f)E6FKIUZLI#1iD0eLEUK42
c[,r1-,rF%&L[,A$rrjhqjqH4SUMVb`pX+'ra+Z`C2+5%"Y"qm3#bk6EL@k3A@*@
M3%dQNB8Ih@35MNamm#H6V*dq%YVGkCp-8Rbr&[HMq3RcdI(ZrA%26QGC96Gk32d
pqSjqm1qT`8UYYQ0)BYS`0dI,Bja-VH4HIhKK&hBN@LjlMZD2@m"3H6YGE1%Z(U%
r+4F6EjFp#)1CDMh+K3l!RJ[f9FT&[pT3[$r+RL[fMVJ(mrfRI1J(F6mkckbR*M[
HUmeL+mC61D8i9!50eMM9c`aFqVm)r4E9cJJeK"aU#%Uf'V!Ed11FdQlhCUllT2e
589qY2a(I[-2@EFrX[-0mlEjq,TQGrGc11hD,cikqZH!GYPRESr-1r@YlY2SYf[[
5M"HEX6fMm`lpDihQJ(HLHBI0-LHTUH"&j41ZKhMq#!Flb6bQf2Q8jFYDXjM+RM*
&TH`Si4D6i-fGD`p9[2h46,(hRTM5G2c**rF+r*-a@R,H(Vl8J-c%LTf,NlCLlfM
Z9Z`DcGQ+AF0"9QA2D+a9fEeD@q()Ud,qiSPH&HIfbT,4@B9D#@CpP6fl8aF-ebN
l-K@XeDZY@X1*BE&V0$mXGLh14#[J463K,Cb'%J0Nj&R!amJhK-H5Sj4"bFrP1ik
rJ)d9Clq!)fG"aXM(!Q2N%H&L0I-#BC&[%48Mj`J8)mm)%b22%"*,MK'XP,`Vj46
LBCbi'!jEIGZ+5F!`,T!!!!Y,MPdj#j!!X13(%*DGUY8C`Q$N'D&Jj&N%`4JD)Ja
ddNU-IljA!IYm[a$h)LG*H16MmTU2YB"e48Hr0(e(`6MIE[(0YdEB9XUS`*!!leI
%00ma(UlS[#)Xmle#()ZF)Mb)2)ZP%@*A2MNaEKAmbS@4Re)U53q`+R*UbdZ!8C%
2q"3lP+SVa#AI+m)NhkZ)4rNbMV!SQ[)E!e,X@N#Pf$Q%TV+R2cUbk1J5A%K#!DQ
UhRj9aYk#@E'6"DlB*8+[YKS3p)QGLcJ@HdGJ&VY'L"DlaU-hLjk&3Ca&pfTYK5K
Ab&m-G4ARpXS5d#[85S"mCFrZe!8B@(B%#&ZpfUSeK-6B0F,&f,8)MJ@mL"$5iB(
efYH,6QSQdEM@9Ph-b-p,S"'hHKjF11&9(XXDXFJSdV,3))'@(8fFN9-j6*mF4#(
'A%r#Lje-D,j$CDKX@&C4E+e`,!'fHTSSBkpbU-8je#@N,Md3JAA*ZiJ3T3GLN!!
SZ8GiAr)1)ErU(%&Rp38hV,ML'`rSlB,rGRqI!C6p24*3mSY+Zq3G9RHEFfI#A2Q
A(1p'J#+2l(LJ+pdK[DNkhe@Q!FQTqX*cfK`lbL&L1bA[L2#8[!X%[Z3IF[LUFdF
U#h+6$1fZ5$l1Y5Mk1,p@cF+jPK3djeL8LTaI35`+hBUb61LE&fC#VdTk5k*4l"R
+4VkR,a`jMb,IFRi&aK@jY5BMi',1T8VbR(1V'&K`VD5[S(1&EKdP&@YGSCHSAC&
,1E&&aF[jGAFM&-HZaplj-H[P"TSpYj9G2Bfm`Vk,F8A1qE"+R3HPU(c#A)c)Gma
(%fQkT8KL8P`-*rE1ae6@i8U"P6#q'&ZC$[[K9IP"+F+iqLSMj1-AbJ2PBrpJ[(c
X@"df(a9T*IMSJA,XNAX3HZ4AMG`[k%V8[R-jBYmeL0EhU8BDPhNPh2L&FXbaIa"
il&L0[S3#P358(LRRS24%N!#'NQme%qhX3*D1D1he+Zd@81kHkRd#a#Xpd8BQA"T
+(6Ch[9p03SPkP&iS8`mAIp3KdI9Z0Hk)T,5ZDe!P+5l`XR,G'd(l6JK&6P0kSS[
6Z&48YE69F9368Q9"'YV@#SV-M1[NMjjDe15"ScI-Z2BfDP)#6ZZ-DlVKYCqM6Fb
iAZ$8316qP-Heb6`#+``P20q*A`rrrU%6IlDCN4!-26),%SYRqr"Lm`kMYcU'+pH
ehf()FFH3!!Jr12-13b+HdAQ(BF1G`jq$GeM9[R1SFr!1Dpeh$QX1hQ&iaYMjH&L
jhld$AHJEaQ'm'*l4-6`lI)F9)6Z'FBI[X&*Naj!!lI!Ge[R['1SF[X-DrKe$RF[
`SmS29rEhKr&f0G*CpiIa0pr5@iiHYcq-AV1eDk#QcFR"L-k@aVm1rk(i$m1I[9D
cq*[0pa0Ai$m#rq(iViIrk'6V#PBH55Ip+eRd,B`dak%Z!SdGBJNH0)qc-A0"fGJ
'$"!0%HcB&0MJ`A'1Z3d,#RL3!!%h6mV-LER0"RGEE*CY)c8eJ("iB2KLmK3Hq*X
SkQQ)%1!"5b-C2-M2[TmEBl26H@&PC[r4jQ5Ec@E&fr(eHZ#[8-dal$MD015ADmf
+)3`d("iBIA'%eJpB6A9HE'k6%!)m-!-$`)2Q3K#k(2@ee,ieZc4la`SeXl1XMSB
4!4i-!epXl$Uh1Z3i25$LbF0D'1c6U`2%-EZ3!&pplTh#1V[9-lZBlcF%a(&)VXm
-N!$A!dSMma'ZLH2!04Y'Xf099BkL(Q9pBjHkDQdkr+"qAf+,p[Yeb2#QMbDfC1R
i*1mf$VZ1IGH*9J0Z2eiF@peX#SMMVS6mGaahVBMb2h'X#Q3JMU1h0G683cYe[9l
fG(AkkkXXfNFrJIkLjIZ64B[(SjQhIU#5e1Me4lVJ[p+D1VV4fR2YdPBFCUHDYIP
JS3FEaehP8GJ#Z6Z[5c!`8JQ)`kcSr1HmXRb&Lk-(L3ELk1f3!+CFDmI'X949cq#
dl0CXJGUj&R'DaCYVXCD@FfipCRIV%mmRVII!2dk)`YGB`leaf*@&HdpKaqMUBAP
K(5!1MPe`qmpR$[l#Z)0"U)@MIc$ZmQEdFKjNh&eaU!'-Hrr9Dmr2LLTXR&dpbJG
clmcUJmbp,illQ(YI(2Fapp9ah-[FDh(8Q$Y(Q(Ybph8E$3$-[6dIMc$hVX5ZBHk
e11jMlZeK2-cFDh(d-RF64apjpjMldH2r9rIU"q0Q,r(UHC!!FAI'`9%#',FCbcl
p0VXpAle`'Rl!Q%`FUj!!iAl'e"I(I8aRG4ch-TeD(2FMHAXF$b0j,BjHd$0af((
m0B5`Hm*hRd#4k+i3%mIaBpbRX21BEF[liQJS[,E"GAfKN!!E[!"rRHFHa$1Mk+R
%eA%XHT8VQMJ@BA4pITTmHd8Ij@ib"14eN!!cq&bkPj-2a&&$cYikmqYMfGNbZqF
d*QX-G'2-m%4pR1Fr$&@T8i@UR,`+GI0N5he8!H*SU8@4!X3B!1Q-`f!pHD@6V9-
RYkUK#T!!$k[fU3"a1,@[*ii"YHqBZ&j6Kl"Y)A'XQ),h#ZYaf-GXlE%Q(fQSIGD
"*iiFfQRYI6I"C#-dKbk'rqR@JFre@C22i$f*ieK@89FqqZY-9*B&MG2eLX4LJDJ
l$VD85h#CZm'kYbU,#P#[9Q94!H,JH(#@H#1[0Jj6(SNhkf1r`(peZQfb8#JD!#B
#-YqQ4Md5#m`6R3mY`amiV8ejap9Bcl%F4J@)BpEQF&-@rl9jKCAU&6f,2DI#KBS
Rci@HV)mm&hUbA[@!AM(,K3Ea!`3qc'ZFlm$TckXqS9acK&-pN9FE4qrqN!$pFG4
D["*[-lreH2@F!DDM+r9i$4jPUFGV5H-X1khP952SmMDpBS0(!HN9D`H3!)Gla6U
4@J[S&3XRS9G2cMc"h*8+CUS#)+HZJ&6pTcBS4`(4G"5A56Np4b(3BR5J56Q$4eQ
DP$1JaE3&SK*-h&PeC1,1UU0[6GbTYImRZN`9rIrh-6KpBil!rFbV2Bj(Q&GA3YB
`VeSFkX4mK!(Qe4D),M"R`B[Mk,0e4K"Q*UP(#VVId3%BJBe$PCMlS-0Xb+r%("d
1"H)Y3BErm%Da*FJ#V!HLRq'"h3*#cGX54'h$Jk''qGkNlK0a"Uq(LG98ke103C(
V@FNBjhT@XQDj(NI$&aYrD%$SBCTK61YKbRiI$qa00Yr6cI!JG`%2$+[8bMK#J!I
e"[`H4c0YD96*UcGUVSeGX*X@4p9E'Shb6E2[iHG0H'imJZDQ(m2&5&'((M-K*'S
h(,'P-,k1IN`9TLGcG(GZZ'p0YphGec[DLqZFSGaSYeQP!*MmmjH63TIH%%0!0XK
&Q)m1'fLE5'*Z`,mabD2hJTeiC[jd$A,55AkmH@M$$"q95NERRGXV4)-jE,NbUrH
ZA[j(Y08lZcI1h1Y(l*ZXRS-2@MfE9UdEYNF'UqS'Zm6EM1j&+j9eje'PI[`cAB[
@UR&lhI!XlU6X`B0LZ6kcF[q6T(h@E1l*,cq`FGEZri[fQPq[Ib@RI6&Al1(Tb8-
Y9afae2b+F6d3ad2jHc5qM[ch[eH*Zq1GKqVQJCVYLN00fpMdJ'6,6h[U"cr%Dh8
6V$ZI5fc*MqhCbl[#Y)I#0YYAcHlrPk)ph0M8eUqhXHQmD)X0IkpHlcK1c8-&fpL
dM029M8d,1+fEEfbU)M"h(@LETalQlR4M2B#jke)EQ`l@r6SY`mDQ+fpm$+T5T`T
91AN9k[bp,I94"BLM[,&T1BlUCTS&9FbUKLT!2UcDT`,%i@pXfKh(J0TRYj6FGc,
Gf$4e@@B$l'CMdp5#pdbTCc2,GMqI2jDaMcq0*mh'TL1r![p2C*EYf*9CF(p2+`k
lT@4A2[VVV,baD6Q1kXDQK6M+'jXqPJqVXUJ!p@T9&K8J$NkmXHPMHE9a4"ZE2KE
(1U,0aUE+h#41Idl3M@p**JdV9*-iae[@c&`RihXpkc@eC)GYAT[%@F4T$Ai5ja2
-A81Da*QBBHl*,chHB`"JlTV@*-kqZPqRCCM%qC-rr#,BkKmR$ZC9U%d2YY4(&5#
1abGa&P8aUaUU!2Q`DTm+%)G6qhVL'&$l9NrLh2(@EdrLh((aU8QFAIRSVl2(*h%
@ihKm%QFa$UZbU!$eDP8@&5!1cU161)YjYA(mlb61BKcVL$D610N20ThFXKJ0-cc
ClAKYNY@`)l[#Xp@EfIAj"Dl[KTkaE0A[[Z0fI6CAYLBfH(#FZ@cYmiI`)+0hKEF
0+R1E$A,0jN(AUEKKC&)$#)F(KLmQ6q'"YcAq!YHJKJJ"(U41iB'aDQX8)F#$Y-D
$r#EAFf2(VcKK"3d5X)6P+`UP[*eEXGVc6@EJ%1b1RrXq(YMEmI9ki+mS0XGUAYN
HmXZeCX834LS$2+LrJ!H'4kTNB"$M3B2@QqGMI1Hmf0`Q13Gi-%6M3A-K#0eq$(4
GDYqDACUp`l5'$!%H$)1#X(VQQATkc"MlLdTH[9&c4mX'J2%Y1XG4ihT@cFRJEeC
I-(f+lY#aQ&$GKpmkF$8kTQmbZ8&$iYU-aSF3&jjfH1%eGbNeq*M4$4FfZ1KPA0M
lm&[lh1RTEh3EhA#K#5653%1%#p1!#bGKUXKEM'ki-!0N`DM1%5kd(&jiqI,Tk3p
qa1#'#LTX(d*,I`(JTlUd)ZKaI3JS!N0(KSG(Cjfb!b2VCLE!*Dm!2$D9UQk0)*R
T(mU[JDL`ZG`Rbhd5ldDdhNcXQl8M5(89JMJ)JaVh'V'Gd6MaN!!*hJCN(YkJr@$
k+Sc,mdHa')IK%Y83H@`-ldEbDT6l8!R'[Q2Z)q5qR[L2P2I(brXZRNh%EYmclq6
N2U+GM,UVQAmcG1riCPK1XQ&6Cej[NRZZr9VZ5Vk@6h0@)R*TYKN`Edk3!!cCc"R
lTV`E"@pm1jBKec%@jP`[+$ZaKrR+,8'&!pGY!XaMBq8q,RPZpdYrrZKH06'3!r0
2,Elai+bpqMGKQMmcpG#*'J34R-CX-QCe4AT8XNB`Y1mkKJmUCr9prp(RF5"r0X6
r11Nb@T`S"JN95(I*NN3T5+LYSKbF)1La&&-21-[%lf5jRb,q,jIlFSRM44,AhmS
lTdTF,jEl5q5pdq5pdmAq#VQI)Ai[6C5-K(TISPcSFdLQMab$EdR,ZKJ3DDjpVc%
DASi(U[HHrJRG"Qb*2jI4@6!F-Nj(mK1YG`LpSI-1I+1qm`jmBG2@1kQd'G+F-pV
[S'+ZRli6aC0X[`12Q04k*cdA6aKh)kilcErM"fIH'BTVFqHG%EMZeRQ(+Ykpmml
kZ1kEeNpEaCYh4Z'DIDA1JRG'ilU!lRDUELrFq1r8!%cIIdH(8h6@,4F`3-Xj'iK
FUmNKjXEi2p66GDEFAbEh&A)rUpAc4Dm$29rHC--6aHmNZCmXmESHX%Gk[la1G0I
leGRcT4,da(MGE"k#KVhaC)bXN!!*XNJQk+ZR1i4U''lB3!@bjNU"6*0K-Yf4CDr
HGB9$G5XBCE3EMYefcNljR*NIf&$HiP@+BE"jI5RCjZS`*((+k3$U8'dprSHM%M[
pCI,AZ2QH(VrAbEaMDpKr*c[A5e6AIQF6A'I1[q-(CpiCMqZHRAFQi,TAkjhFh$Y
RY0pK0memceBKMm%lQq,DeqYNhTP%r+Ve1TPh*K2VlRjR-e`lHpQ#GcE(YDr(bVf
c$SM3Bk9I6!C+U5ZlcUdE1FlFY@hNr0DqeV250GIUpb@fbVD4b3pr0,%P5mFRH9H
BYSfmrL(SXG6VC8pATlqqbU*pp"23PCE[6aiD$lj42j!!l0kGR$V5"Iq9eY64MGD
HDjHfiY#6YShXRICUiZKE&&+fK$cQ$%l,PT!!&ULGDa'RpDdY)B9aG`d1eMmBY`+
dXl@b`0aeS*fYlf2ZbGhAE63!-(IpCfGVA@$AkX'k9d"fV9lih6FHhV@k23k1%X#
iDiZj0TJUpR*9*rCTe5If6P8"pN@e#+0+l'ID82MHeYIHU5m8FS-Ai+rch)0i,ES
59mHak&@ZD1*Bj%34GhTEJM@ZLXRe+rSSGj-K)+q$R-(RdVfFI##1'R,feTPI(mY
H@bVjlY1ieVQ(3q3l-@CiSMl1maq'UY5T3P91AS@kHE+P2US!FE68SNJ"BJb!G-C
KX*km*XlSj&Be9!(bBG8q&5!1TrEea$'JpKd6ef[U8&((X@)+hLZXaf%IXlA(QRb
NSGjT(HKHIQLRYIIG"*10-#4a-Ia2Y`kmie2@j$0i6q)iPPA8PBrq1K19C8(MG,f
LXPJJkSlMX+'LVE,EcmE4R`qVXUJ!p@T9&K8J$Si(CiNhmQVM-1@4H,-qpJ[mq4A
dhB1c#d8$`(BME*GESak*"HD*cSH@i3qFeUDmifUXjeJ1S`,%-@YcZ#Q,rpUm`NU
9N`hT,4GkXMlbA1M*HY8$&'I,K3Ea!`3qc'ZFlm$TckXqS9acK&-pN9FE"jaUX$l
kGX2Cf2c@ip9c"TL1VY6M0AL8T4k[JBhNf`*4#RV&"Sm#dL[@$L!2piTe)V8@d#[
Q-IICEMJq,iVQc"2-ADPJTLS!FZS+509rDS0b&""04h'CP00c&!)Y4JHDP$0iP+9
*130D6&XJ'S%@FpFE-R&ReG'h*Zl8f[m6ADD+r[rl'*bq-8IJIZE9(XFMc+XV)@Z
B9bd1G@)q`J$cDJY%&jLci-9K9hrV2!4K0Vcf5%(h1cS!)l"aU"*c(qb-d(3b*65
El$QYaZd@b(4CqMBY(M52ZliEHQ9M'c#i2FM0P5e8$4iFKjAiY6BX+1"""T1FNbY
dJmVFCS0FXhR3G5TZ'*R8!-,KJH',CLZ[%Klibf$UDBJ3i%&+im(4F4MFkiCE)VX
81hl&#5XcDhBf&dTj1lGLYHHEc0$"iB(Gi1eH2,#hiq[e`&p4E)jKKp+Q)EpFDeB
-B53L`)2F"6``V&)P!i-B$qUe[MJIiaVRaHBfL6(!J`D0"mf&)(6l-F"cUAeVGQR
f$Y-D-J4i-03SYrp8rH#(H+e1QVcc16eTmS)pHhQhrFiVEh`-IM+amS"NQid`MXV
*ah(qhPDrX`S3"bHHa&Q1Scq[0SjS%ZGMFD`MfNcLe(PhiGEL-(2G@B-jHFIFqB8
!DS`D$ClU-a@KmZ#(3P%81L#Q*Df,-mQelcADK1@B&hYLdLY`3C@Tqk"@e`8BF$+
PVZ`k0maYR,PVPY[mdp2`UhY0&kEK+dbch,EC[QTfQrd8l@kEI6I8bfbcch9HY-@
'[eH[Gac(5K$UdL`h6@!'fc&RF&TQX&QJGUj&R0DhCV!*iqiDLDpr-'i&D#+qXX$
FGD#*q$h-hDQ1HJ"cehmQi[FbGa0((hRh*pN2eVd#-XQqI518KbICGfq@SJ3`lYV
Bd`C6aG46G@*DU6iae9-&Q-CT%8D9Q(lC82MH6(h[e"F+ZF%,m0GjlN'm&Pf*Uq0
Bp#TA0('`N3UlV#h"qP,&j2S9IC6laMihIMi'1B22TAXjq8!F0H6XV61r2TDGAjf
Rlc5H@ceSH+)qUJ$E(9Re83@)`fi-j+ddmm4f4eBe9!(bBG8q&5!1TrEea$'JpYP
0IrDGe('XQ%*V9bkc!IBa@hXb#picTCl0,0[pI2jBaMlq0*lF#0Md)rKr)V0Xakl
-J[Yl@R(B6AqkmY&ICk+b,'LFVPFN&JY%hA(B6ApB3@H`lYH4FEDH5Var4+QhUhS
8Rf!R3k!%$U9I34%F!hXGr4Drk*Hm$CFTm&[`SYp"b,@0`m5ArV[8EacLb1h8mB9
q8ri02H6iQIK#[pce6-U5%*-D8Srm"!1@Z1P`f&6lA8hq,+0KNlq#bfMYYr8kf0,
Lpiqi[%ll[HVhBE-6FFbc+h'CTIefr%rB-YS[mbjFGY*qKe0&c%SFKq%b62Z0''@
#2,pkeZ66Y0mV+!h8LprjDAbAr4PX$GT[&YkV%lmcri)jP[Sl0-hIf1YJDj3mc@,
aH(lAI!kfSGV[5Ya(6QUrec2QB9)h*Rr*bl6IFhi"$X-PIfp2icYS#@`M*$jkZDA
12[)SE$*e0r90[ZhjAI8EX+fRr5Eq)f,*DVp2rMSFeYGqDHCJ9qdhNrNE*AiS'",
(jc%[)%&IFcEl+Z,iM[Dlp!rJX)'m4fe*RYl(q-D)(ja(mM6Qil"Y+29+rMkMr4V
[Kmh-(1"-[J[aED6p2[4j1)b9ZV`&Phr3IVGYC@e*I1$K91fAr&[B0YCq@i%LT+l
5IZ1"R3BmlGNCqFL+hrmRTQbLrDlp,D9ZreAYYmRli$"HiUB1QZTa4(`0jJ-I"lc
-A9k2%b8qm,Z#1GZT(YH#&rfbR-Sb%Zq"Zi&ITSfAYbk&EB,NPGjl`F[YEf%1a1p
6DCfGmb8@YZGAYb2&baXHipZHAm0c+CiYrKCXB$,i$Ii+ASjqNS8Rq3"h"#q[fm1
#Pr`&H(R1Jl"Y,Ri"APlr-'aED,pRSCiGAYj1UMK&hU11*AqR%+Zf&$rm"5q[r%[
BRU,pIJqqi[$b3YDD-0qY%C2$bj2*pm"rkZ-EDA`R6I!KL3qFPMVEmcq)'B+lm!I
"Z4mr!"XBLrYC+9kqm5[-[G66Ue+mI!qaH9["LHPT(&mMAX+c#-GJSF2,",'"GbK
2kP,bG!1aLGSR4A5)1$`!#lEAIT2)C`3[,bl"*NaaK`qQH(RV(m&K4qfh,IQ@i1A
EISUe,[J0(a5m[)*[lDcpGQ[Mj@h$F*!!jH(R!HFFALlq'KbHVQR*0RHQH$Q+@,+
,e-GAfRJCM2qqj'l%XE[JCH!hLGaa1m(,`'m)ih&i'ILPb!@P2Tlk0l#4@r*Um0[
KjCA%ledP2QT1kZc`hfDL2ErYbGm%,ep22+Ep(CJLli*EArJBE(YS[fPrQZ,Pa&q
#66TRXXqRH,PL(fbLFk6"NaaHAXJF5QG,(AQ&a2I0Ai4Y6qehiKqRH2PAa'p4N!$
Vb*mNIqpRE(Y,RXj-mA*pjY@EqT4Fm1piEUAJ,TaX(rhH(QfmA%iXJCm5"fp,I#h
%*1QIQda-NMSlLEJLR8[6b$m&jmiQ&jqYrIB%hMZm[14hi'$``Ej(6)+Aej',Jbh
iAC6'F5jjJmJZHk%q(&iZ*0Bq5rY0*rj+RTBr""ZF$VVaZ642biJ0B#2PDI$EiH@
AbDHT"FV(e+[$bjh*Ep!FJ%eU9r"b(UIc'4jUiciPaFZ0JE@*pGT[[cp*mI)kmJ$
iK6NI!'Bi[2`B1I1cG9dHqB88,hFj$!pUJIT$jh"i+GS(jdc`[15Ni'AJ0iAmbH#
LaF[!EpT[Y[%bm%Z59dPpI*eBF,MNP9S4["a1V[NFmD1HT-jH4ildA1fh$r8&`FY
Pe%@S+D!ERZP`#hjTF0lQJhS@[(cAVm%QBaLQNC-*ATllpb3BJZZSYB+A%iJ(SVe
YGbb0lmANZk,Y[B6kP[KY34e6CY[X3'b@r0e%M*-fcHRNQS+A1j%EH$05NKp'R'1
1DEmINJG,*qi,`*-FA[k#'STSYp[pAKVIHBa9G,3TU'pACkHq!*YSIY-CNq$FeF$
QK-b,13BjFhMj9Sb%6)KqYcejM1$PiG4LT0GN1rT,(*H6diUZYq#p+9jqqY0`!"H
)JjJN6krKV"p4`lFR,j%mEF`D4NXK,H#Ji1A6'+[SM)ZJ[cLm2*Fi)4VY-ZCAm2*
%DMSLbHj!RL"iq@R@J@M-bm'j(9lq(&T8iKjGIam!IMLm(%mF29Rlr46jFRKj+$8
iF"K)3@piRZ#PD)+mpaABXPA"blaIiJEU#%m9[!cmTMrEaXXJMXZ"H80fe12a%hV
RUG$*8ZqU0b+m&rJP(rd%kHQFI"5$"i-Vbl9M#hQ8k+cKHlH3!,0HJELTSl`1P(`
RmI9GiKI`hHfSkd`4[cbZ*jmK6VpEr-+m`J1pHXS9b'@Pl@N,mQ#[,ZXAIK%fJaZ
F$2@b1[hH(G3EL*Hb44mm8[[G6Ui#9b8qH*6%GaUj,"J)VX-$[2KbRbAA28hi-EM
Xa9Ir0QT2D%(Q["4eiq+lJ*S)'L$a`4-N[SA%TjGU[eR8!b5qle,MJH06#)D(ZIa
pQ*J1,mBG29(LZikjHCR%"cjimG9I`YK@#+lJ*r8aQI8%Ic3R4je4i[[GRm-'Ib%
qkNVLZj2m!"hET1-fmP5(6k*0@lpcfrT(i(FYkm$9IGi[XBakXF1R`'mcBVc"!iY
RiA[SJ"kr56[%mPGS@M84[%IdJ26lQ5HiQ)RlBq#lJV[T@mK4iGVQ[C2q1FAG9c0
'Y&ac,J$IGRcSDq4fF'Ii"2U(ac252F6DFk5Hi1FHcdM[)[kCr&XrH+E`Q'p4DhZ
YpVX314!qP"iMpiCVQc1(r-rM3qQ0V'NdEH))G1lINp2)I,9hJhm+(dU2Ne[#Lm&
4p'M*pa*biMF*6S0(`PFZ*FGlXkk2VB!"`Lr6%rm%MlISpqUTqhKiN!$k0,A5m`3
2i(NH(U3[I4`fH)Sj-mR62"kF(L5Z[&AL[V6&Jp2[q#[Bi(fm"bmAhRB4-4&1C-l
1e1Q&YhfF@K5kM6NA8lrcH&ZkcYk'GfUrba'IifdhrLiaaX[VjSa2H0Y[L4pS0G"
-G%b[$Y*CBMcDPhP[#qJi`Y[5%p-X91%(m$e22dL[*0E!LkPAHM)NIbZTlD,cQ$L
f*)I`p)2dce+c)`r!0Ca*H2a9j-GSX15E@Tp6MdlUj5h8aTaI`*0QNSXi[i!2c54
2FRiKARVkiY+B[$M35rCKAEj5hJ[mIJ1p1h9jNUI%8HTKk2!Q-pm(,dhIT[d1BKh
3L`%Y3Xrem$LaQhAc'IhH-,cViVL'@(+YaYf$`&YF(*qKaJE1%`FkQX6aEFB0"c&
aI"BDLBYM"6'#2"ZA`q$RiMLEqLkp+Y3C[%AL1),FiJXkMXmM6KI(qiMTD1r'j3M
JZSYM-6RLPb31F%(LZ)Rp&YIT1,k)ZR4aI*4B5*dDPk1KJlXi2XLk"1XSIl3LLH2
ja#`dFh!&A"jC4eGp[[D)lcTbeQ[UcSR*"kNUq'95kdEVr4be'hTYM-X0j'F(DVm
[8DG%PcCq2q,lEp"q9e&MqUU1B`(i3l*,qcfEq!eI0Rl(!YGFI#mL$ReGah%,DdA
Lfihk"*c8[,H3!1p+I0qKCN%XaQm4Z)@,lf$@%RU4m6X1ElMi$UDfp@hYYjJp&K,
IcG44d(2`ShG"iYZ)GIaGlAFmq*@,Ea4j#69Sr*B!peemdiK00fUr&l,H*,j[r3Y
Xe*Ia1i&p)&jm)lr'RT-IL*r4+9emqj%6-LI8q#d&lVMihN&-[%Rl,5-[P2KfTTk
(lQ(m6U3q*2QE6SdC63mr%ir%0r*Ib3R41Fhj,I5BP1CEfF[)-@i9(J"IpRK**U+
Q5Bm'IPHhr,*AXeF"M))(`*RN[E-38d*V-XPVJ)-5AqB&kJeSN[!!F%lL1)$F#ld
)I)+hL0mfl)'jAIYG3Je-i[X9miI'CDPS2ViEU(R"*AN2,86H1i9F!3k,(jaBr+i
J2[e-r-LPq"e,V$%mRILqali0LHq9V$&UQIIS%j!!pdiR6d+(a`ppA2bqb2GqUIf
Z)0q3!,cZ32hEp2F4hdh3#9amCj-hd`-#Rb1r%XG#iJ6F$6rUhZ@9RSTIDlqR%2X
P[JR%H0j*r$m!N!30%&4ME'&`F'aPFf0bDA"d,VQE&S)!N!J'QaL%6Y`!N"!f-`!
!LqN!N!6rN!4069"b3eG*43%!VpMr&l-G%'N!N!8",,%!N!BF23!!PT`!N!Cm``l
i"Q9RdaadREpZ'fLaEZ9qEQ1j(5LRf8AEp$Lpc5aYfm"@jXQpPD[IAVqYek*jMEa
mbl0[dMRTICFchdkb*le$bd(1HLml6[B%lKGZVr-@[T`c1i'am)UrV!(h((#ec%Y
Z6rDPej0I"Q6E!)![!"h`c!H`eQbfhA'FL11%&MLKJ`pd3SG81mkd$SPjH5JF%Y1
FQQaEXL@4bk@bZ9K6,RY@XVAJaeT9MMF3KmSrV,l(QIPacqRbMkV[E2PAU1m+q8p
3hj[NAkQq6mTrS[TZN!$r*#f6HUV8pc!a*U[[*$'QU1md-DDUlqPL6&2I*@*-9pr
9BXa3hh[&Q+Qq,iXa5hfhLc(Eq-+(L('!qSi6BilkRLM'A2APaCLR[S[%Q+qqeiT
aS2VH,mC"kVYHM)FBAi6jHDMk$K2MB2@Y%S2Dm@h@qF,h3M&Lk[X,-CJ&I-`0qI&
p@ib('eq8HAL%qKD*m8Me0B[a+29Pa$KFI5m5Bi(khLc'%HVlY"L29Yp0BL`d[JT
QjNMe(5['8HTMlZ2U1dH-SpAh+M(S!llhL,&BI9m8BiRkIL6'-FBhJ6PCUVlMaAL
-qK*L8#qqjiVa@28ahm[8ph%aQ&Pmc-4bikX%&m!SI04'AIM@LA'#qMV&1&&p,a-
$R-(hEM&@U1qIa4"Zi2Tq,-E*aMH4HDj4(c@X90q6a+K9hh2%B-Ea[9k-eHVlHc&
184mpUc1q5H$4'[8a'ipAAj-BpHS$maV8"lkHUVkhLG'S[Xq,38jmha2M#FCA"@D
Y94rc!clJDa'$ZF$(6)#aq&iUaRVe84pjm(e1M!hUq`ma`%RJ'Y`%%r#"#m`#2[V
eC29Y%H-TkJ0(RkUq2aIM$29p4)bRUHpEBS!$8!!i`%EeJ91YkU1q0[@G*8C5IFm
6idcerDNBQp3(6S1hq1!%+IAG+JEjS4MJ2Vh#"hl!&r(4Zl6kQ'p`&GpVa-LU$db
#5q*M[TPCU!Sm*kFqm"&1JBpC8Q)jl9PL-)2iAL('-p6hB6(J9[KZ&Q1Vm8fR6p[
8"eD#`rLBRcp5h`[%H+EkrP+-FpAhGf*3,ll[L('HmFd!KmjA(lMjE28a9r3Fhi9
LJ-Ri`'0Q$GpRa(LqqQi4JpVPc)52AD!qqN4qI23*[S-221#2$ljiXISq*3Em$Ym
2aGKZI,2JACHU$pb(eq"M4Lp6(hfjA(e[%'1(qX"Jm"-I'(1PmFf'+ekP2M$XaFC
RF6MJ&(`D(JerKMI$*q(Ei!Pm@AQbbmI"52JJr!Fqc0c48cJFF`h2"DI"$IJXR)!
jJYH$0@!-f!+Q`+ZB+qB@,Z9a-lJ$(!VH!fF#(jPc-"+1"Ml#Rq"0m#9i%[`)AJ3
IJJI"Im!!Z!qF"ki$a`(,`3F`!5`!Am%"jTqj"pr!0I!-()2$`&fBIAJ,I!8H"-q
"Vi#Ym"0i%PJ"4X1(`'Hi#K`&EJ*Q`%AJ)'!5R!1Z!Bl!-q!Ai"pm!Ki"[`*A`"2
`(5`"3m!1-"jX"p2"FRJpI"jmKF[$iH'mF(mi20`GcSjf!"l$4p!)i#,`GhJlI"f
H$Zq"Pm2(iH&J&&J0piC6`,AKf2"(1#VB$@E$CF"Vm&$aHIm"reiYd#'ck8SNq'Y
9%9UPLSlb@PmR!RFmRBJqHMS4IICd)[VMk84JK+F6-EZH6X4FHMS4Xk!kNBX*UK1
j'1$K(hLL1T(c*iU$R,FS(R)qU2hK`'09*h+qT$M*Z9(aNS01S6T4L,kS6K5L"Y@
*3XbckN3Km%peSK!BS6T4#-a3R5M%2+T1&!*$9#F+[9*R&YpIkHcJZeDa!Yq(&%r
`d6r9L8*I9@c""jG6R5L%CU%k8CMqU8i8TSqU%iA*UcT4'2a3R5J-[UY1&!Bc95F
+Jj@U%i@C5p@*`[49GD)`h&9eS[#l&+I``Be9*`UM"kP1&+CrUK1&Ee--!cUB2G@
*)[4#GD))[9'G+!*QU%i8!Hp9*iU![kS64F")eBNLc*cU4"&d!G@*)Qp9MS-2h9"
eSJMm8h@L#,UHkN34H+2U4"&`3R@L+"LR1P%8A&#G+-SFUNi8C3C8*iT5JqT%8AL
3!1*T&2kL1P%8hU%k8441S6T4&"kN1P%8cU3k843HSMT4p(9LU%i8"3Y9*iSbPkS
64Dm63h@Lk'I&8*dSqJda9#H+rN!-eBNU`(69L5V!10@*+TKjeBNX#iIHd612$i*
rB*V(2HQ9acrK*[!(jK(X!pI!22!3h!(2`$G`!8i!6f(q2Gl+())Ii!!B!HpKKZ%
-c#@c!GBciq!2H!3fJ$rJ'CJ!6S)6F!@2Nc0(m##i!9J0,`$Ai$hJ2eJ2IRYFQCP
MaTPYCKVZ`$c$QF!I6rF%0cfZb!&2i8PJ,a`*h)9$`5Y+ZJ(iUKaNl(KmVhKj`VC
``P+jFUIq`dc'D)lmQ@F`5RKqKFb*5c%0CXdjpRf9$j14UT)d8CPpbASH0`9f@M+
IGl3k*"(b0jr13UAih*rVRUT*Tc3N@Np**YU5ZAaFPFMH@[TLr!,9TmIMd6eGd,'
F,2qTmTmQrqRbRb(r+I+I+2p+q9I*2aV8TSR$"%3L@",YK'D[Dfe2G(5d*r1YZ94
()ClIh+jDl0e(dYHl1Gf+9YD[hY#k*GA'VCU@jUBDdm0LqGl-$NfIDE3l+)+CdpF
NRT'SD8rNmmPmr*b8UUr&FhTG8fa0pAT3Q+`H@QN"&E5%GVYYX$G!Q&ALP$!N*--
#!h'9'dqqmM((dkrm!%L8+`ji!Djk"3j9Q)&PGQ&IRV)$ir&Q%T5Q6R*lDSq&S,G
5j#rl+5QVY(fq'ZGP@,UAH6a'1UXU5[q"HF9S2YMFK8bZ-p`G8Mk'DVK)lN1B)4`
Kjq#'PM-%JDX"m'BA`!hpU&R9F1`b9crS3lhlJ,@V6c)Y"N-86hVB5Jr5Gl1ND3S
mVP9e@P0G[#1A2$1P9alZQ'HeX,dEC0J6VceiKLLT*k+BG4e2MV5m(A12`Z8G)Yf
J(S48%V5i(F$JGMQZT#Z)B*A$Ja#XY5)4chD@,i#I*+HkU8Q8fC!!h$EJMbUmiAd
fK%C4HH!Id8*rTCC0DNMQ0L9MMF1p(clqA!`SIrr$pZm64lVd#&%!S[,R%X0Nq9I
*Ii,m+q8r8Il6j$p$rY2P2l0EpR4@TA,j3U`jZ5QGc"5Fj3B5kP-EBhATMQbZ%%0
0D@KU+EP26V5hCl1Cf#R*pJkRS59@Fh60`S8Q88ZX+C&[6E5lhVA*FjbQfP@Pe-Z
,SpIGKqE08R02M+[PE1N*DT)*+l5fLpiX#A1*h,CiUrSEQkZlI$NR8)HSVLj651E
16,3QF6BN#Ql*$FheXE@GQ8)URC65iL[Vkpd3YamD&`rb540MUa),PUE1@0CfK!Q
8E!dYQNS#9)(U,F+%Z4Q$kD+ErJ5T8bF)VrbVmfPR3dhM+Rq-h,ML91&'LRD()5A
`pbkRSk2eY6SFcR+*2BV'YN[K-NhGJ4,J"T*4r'B)L9`@Ad459pq@YYd4V0edidf
%m@PidGNpZIeaT9TdbNa)ck$G@EPIPh3bR5eNqe#NQ(#m)AfjBXhCcPaVdQRHPLm
Ndc&rh%KM*Q03N!#-Gl4ZPVB+)X9Fl&-IlDe2CEBNFaSJcI!#DMVcK@`kp[MNYV1
cZEDm8phDQXcR"4F+QkAHK"3"B"F+UFbQ[1"hHc,@)*eb[5GhTYVEBV9E#lP%hPQ
Ch0LjD9-b&c-jR9AVQU5)6,+pe!q0%+b1e@66(9*0MSNACeYbG6,MqPDQmP#Vp%B
[@"Z&beXMBL$-,m'iCGG)aZf,JQ,GfPKMKk"KkKa*3FHp+[&e94Q-!bi"2'0VY3B
BYAH,Br@*c+E1K$66(iXPEQNaU5fC5a45fBac6,%E5f29E@dTSJ4RD8JfNhHEZES
pZe&$LMfk)mJ#HYalpDJ(IJ3hSZ3HhEAcUN@QD03lTTDf`mfkSJCPF1&)ZANLGpH
A[m2UKJYSL,emBD(J`TVEElp0pp"BfBlF1abp46"k5VF-0ZL@RJG1epf"dd+AK5D
&G@q3!(IFQ`afJ@2AZ%X"F-2r&qYD3,Pjd(9rd*m0pjkdl!mBcm-0b*R&2#2hM3R
R&XTBiakm)154qrUPqaMZ(32VkZQlHfGC19Difr(ZmEEhqFF+Xb[(!R$11#0I513
X$j[&3l+"a9pCpGXqfKfDk@d8XXmFDma5UrZ@Z9@i1f'k0KIK0)Z+F))fl'lbpP6
elE$bY[DbNmME6'S,12qp0D&Eb9MHHh@k*lcl*R9hE1r&kTl`lR[@2F&GekjlBNZ
AUAH&GYekhK@[Pk"h4AThSAY(S2XLGRqdIa1k0pTFdqk*kVUeh42,iJh@1A6FXG(
"K!ifbBeGhp!EY[0HHNm#hBe`ChFer-lfPQkFl`SG(XAJ2[UZ5+kRpi800,rVmRT
2E0Fpr&dbh9k%-cR+-'F5M'#Gb6%-H#C$'I9-JL(S+mDAKkkBT(rbLZ%$FkEc-Jb
(T45$S+%TqS$4K*E4d53BJXJJIVL&!f"TBNF4df3CJFfZ((['B!K!Lr&M!ldE5S[
K1r%dL#e25KPC6B)b[*TY-h[a9C18!9BcM##X*KQ'@%e4aPM0-!5b3B,b8!CCqUF
bL"mB2@p`KS'f+mFJa(JjqU"@BmYBUaQ'`,D8B%mM"q"@JdIa9Y1-!'jhNT&a'),
F)-'qmGi0ZN(m6Y3Y"3q26"Ph08-CH#AjAY3P3aPb#4r"@c)-JbhaCD3PI!KQ[HM
b%(STqLI3#akB-(FkKU'eQ'!350`%ID"+B"P4#4q#8cpkU'd$3%VN+)U5B`4#J`c
PYJq"TaHpGfKh`kBA["-crFMGFe&'5m+lS&+VL,RS9Cr+$r$HhNe2I6Q+fjrkSVF
Z1eD`Vc9TPL%0)rP)V4kc(5a@`mHVC4*'5R9"IE"1BXH,0,h[far9PfIR6UQq,-'
HUEl`rYe6r81bVbfDD,3[QQChBc4q[$1-eEkfN!"PY#INf0d3JXHldB0pZQK[YdT
iaak[1a@QrBPD8TQeN!#,XU)'!!fVCF6[Vj9%CF@-m$hdI1q)"!V2hRB%HX$GQIC
-58!'pLJFih-5C"T@1BBQTBYZ$)b*ap2hYX,MIq0TpNb(4f''q1[iA(KTGR2BdN4
B1NjBAJJ42&("lR)11,bQF@AYiE($9eD[UaDcUDjQR6jpa*CbZ-%@GZqTm334hMa
KQpZ"$KiXhi3NN@UeYJ'$K`GL4Lad1r("!h-eSEQcJqhDbr90+cBeP!M``2#$KQ3
KPcdlQGZ5Mc8A%TQf4+j0Yhp[@mk1GlR-JT90Tl1Cj8fG'pY6VE'k6'YlCe[5$JB
E!4j%Iii(`L+XC'$3M3F94NpDhT!!c5@jRT@2,Bi[M4pR@e-8!MbBG2m,,Q4(NGd
-'Hiq$FeeY62GKfPNj2TblGD1GQ%6pqqMV%ZDY2(N9RdTSRhY6(+L"`kpHQ2rmCq
cC3diqpC`Qf-9Z,89lAd*8dKHQ0EchTA&FAfJR6hP52Y&M+V,b&AD4,[F%&b95jL
R[YalIVrrcY5r,TP,Tc+*`Ur,GmIBLVV-ch[Bf%'$liMKR6IQl"i@&[,&S%$bReQ
HU9*Ni(X`JD"(Z3m`P1G$qNq##(F*-clRN!!m8)ljihPJc`H1jf&jDFc2`e2r"[V
$!Y1MaZYK)@Tmm!N8qSaF0`rFDrCi26a2F[VS8bNN$mq@((Y5KH6KDC12(Fr$mbG
R@*5ID1%r-5*BqQCG2Ie2HE1V(([F%b2XFJZUI&dJf#YUA6dlAr0SA6Rf1&h!&[0
d-T[C!faX#!pYeHZU[!(PIkqi-bR1lfqh2h$&I@,IkjhY,cX,A2ciGD5A),MGYQm
A6k8rJ-@XT4*$!8-TaBe9TXqUS6VH8mPEkCHc-fVZi#08!dLa$#cLq0R)"I5[*&U
E&pA+U`4@bRYX-[,#f)%([YY,MJ9'Y$C[qRqFiZ6aZXML"+9I*bS5RU624eqK+(Q
bfM8D[e,ce@VFHV9ADGaUIAI3+Hi9@EP%V[@X8BQJA[d0QVG&l9-eIk2fT8Rc2%'
hF6P9TcDH@Ye3'krG8$[3AAFeX&ZN''V[&$rkH)+qfplfGQb"'lc#cS46XjQ4i3m
e0$4C!1i,`AEFKjN-AcqDD96PhjfRbCme0RD!1QSD,aQl25T2TkDaHh,8Y1IcGS!
keTb91c-Zr`IkbNU'KTDDPAD!q9ME[0B#F*''1YE9EPJAhcJLm(3prh[`Z(9X,U3
I'(lQ`khMV*&T['YHh6VfBLI2&4mp2#6p$rJ"!TqHkPMeKcSiEGR@6M[!h1IbZ9B
l3"fFZ1LE`bKl9erG1RBpj2fAGBaYBAL)IB,T0$68RcbDTqGjlJ1GEkSI3jMpG9J
$'%VMb@[f)@Ih1q2lMk@#kHc&cUihdZqTBq&#@d!G)`hj@4el!2JrkaK&mV[V%*R
X$l0[Q1R[jY9RTRZldIdFrR)r1Z6*8CD!1Z5YmErT+jIl[$U'NHKRGA6XBDHMIIA
VX!)`GlH1I0)#m&4Tq`6M[ZZUN!!m8QU-9q8,RCD!1MKa'C)(qYS%0J42Y1drPIB
*jQkTB+C@!15d+b$9A@GXJiEp3p2C[46KINeRU!klLHTmVaC6AMha#beQV)jlY*L
a1Zl4B[E9FEF@-eU(I8','Hc(Vl@BSFEHTm@-eR'2&M0BaUqdQ,%klY9L"JUa%@J
a)cR-)qP'FQbSD4cM3q6`9B["'E&qD$UlJHKq6@I2-KilJ+BMladlCNNXH)pBljR
k#`BRKHa"Q(XCh&JGpc#iX6VZBA$lkVLE`Bh@dCEmlIde[ijl'GaJ2iS-lKl'0&M
(VaM6D"el`9cUF"r`0MSMGJ$NG1YS(hQPGk$mP#GIkXKZ2'ZiMXD0CqfV``UccG!
5F`EINY#e0U9rGB+%G1q)lpkYlQH5+"Bk&(HV$qAKFFS(M1GKDF1Fm6`XP*JlRQI
rcRR*`mlj)dChb8X81qFAMGI0M[LaAI+5KahaBl[N*3p%E'bA[2ZfL2&GmT+(44j
,r&hCJhhd!qbV1q)II00XI1KqA2[N"rd2MfZIm+"liA(Y9DicXVDaF9dT3f6efY-
mY6`bShPE[T!!6#YM5#@jEc4a99ep,Hq49AX+0V[Le+j8fm[MqXAfr&9"JH'$j'e
1(Kq*#6f*0@m@K9liD4XhPLXdj@3YU8TYebpa8p@H&*38QLSP06CAar,CcPbVAiA
d1U,CTUNp3qhT'Kqpm-),(If(&ccU'Xqhqaqe!QaX$1pmVpP[CYXHYd0bhb1pqR$
#$SFG0JT1Ba0iF0CrSH*ST(hfc0(eYADkIGDffe0N6[DlBq2P9(B6ACXcm&K,+92
HEKS99qN*ThFHPXMiV4jZRB@#I[cQ*KZ[TP$E[5KQCEM**VCl*dhXRppN%pYVf%b
eh4YY%KIGFG@+,5%!ikHh91kiq(`0Qi0GZH-U4rhce*l[A(rpp9erEm$0V(G"Kcl
#e6Ccl$-6BHA"$iX+6l21c(d`UcCER(c`6I1b%d[FIUB92j,(XcVTI+'(bB8@L$a
r[X6eU+F6VjD,cX4PZZ-Q5cjRJF5PZZ0L4dT1V5pb3j!!6b!aU[@9iUCr@QVAqNT
aLk51#LGGF0AF!,PQ!UhR5aaD4#P1kR"Lk8+q0pmYBXb3!(cd+BJlJ&HV6NNAfV2
GFE-`Y+qPIXcl*jQ$)p-GqCki"G+R#IAT`UDH[XjL2JlUb!PIUjM%UemIBZ)1BNR
p)MFZHLjDb800h'1SBiV*9mA,5JifF9HpAh*HBq,129i#$Y(q(5KYUc4affk@J%1
eEP6V!dap(k5CHS0[eRSaUNbqTrbEq"kQFI#+D5EIGrp-I)HCZ2K@U@q#bAIB64,
`F-dRFFk**ZldDm6h#)hlC,'1FjmZ[NHDZ-FYNcUqD2)G"HpkP1El!20RiKC`AH4
`%cHE1Z+QMZd[BX"-h195Gl41medT!8GS[Y[%L'UqeiM[d4Uh5)b0*ZjV2a@IXXX
9e,h-a&hh&[(*h,RcK$(9a,e)CXXj5Z[BiFp6aI(d0DlpHlXr6p(h[%&m4jZi%jL
j$jPmQei&N!"TR1"(D,l*pc``DE'*1f5*'&HEI20jF5eq1A0Ilmp"aE)EaAH-L9X
Rq"h@Z9Rb#3PBDZ)+-LXqAJD,*HBJlAPi'F60AF-`+&k@iLi+m$+)Qr8Y&aF0AJC
aXepAa,Q(9`0N*Uj&AZNllAc6lhF5S+adQr6*`lQ6'L6JX5EZ(GF@FDk5Qb##'j`
6[e2%ZFGr4!+1dclpBa(RVRb*q26*%,2qY6LA9h`A!0)q[Dq)6cGr5(aJUCb8B+f
(FjZBN41d[[r[iecdeVAiP!I!jddG&BHb)1dN%lG&0Taj1(I)jjJYcBIZBrSG[HQ
(iQ0'L!2[&1Gq`TBd[@f5&&caF#lcAJP3V@)f2-(JA%AiSq,6fb#(JRF'jbUUi65
kY'hH+iXiGj2-N!#MUZZmdhbFUeMk-['YeVKR&R%Zqc(aRD*eJfI+'pBcHh8QV[e
,2Xj&Vf(Q`4-jDH%3LR-9Tp-R[A0fp,1+1,IaUH,6fck(-SZ+Fj@[&KqB)1Hm2rC
a,RS*f(UULAZVi)52Fm&6JeF`2al1"A'(J!FH,`cL1["j1"I%ZA6T5-@j)1iNX-6
JA240l,PV0('I&Ce)FDjL25mr9ZRRfB,ILR24Ve2l%pb`8'Kl%HF5cj!!#,"&6ZC
[I*b,IKibdUapj9A(LR-IJ*rT0VNj0%TalK*LQ'[Qq,)L2NAJE2!q14I)h(Ji9ip
Jh@,LX[!KjA02Hl(i0ZKFhPUXBmhPiRZLLE[`A6l14Dq&rjeZiVC2+I+jiliK[LI
Tr-(2G,kIbG`m@HG2m%Ka,[Uk-b6J+BVIk*Z+Fa14'F%+14GG8H4cE`6Eb%QI,LR
Lh'[QLNpA'XapHC(2r3ZekG+"&Fb%cY0Ai"kUckh!TcKA!6p@rHmLjPljA1JUmE@
CZ)ZC!q9cRk!'[I+iAI35aERS9liZ2Y9VNbmSi[h,H8QdhQUp92$#`lPrJ+ZSR[V
PVdPp+jVUm`8RqRhd#G9CjS$h6HPm,cqE)lc3M`Y`DcBi-82d$(K)S(0F)e`f20'
YfhN$A&hea4X%Eb*,60`VH%'elR$TQ1hMRh2e+b!!*Zj'i60H(9H!ChVrip[#%l`
khL(Fee(pk*,2&1[i'R`DR*AceEF9kh$R8[Ab@k9@VikYm#Gb8JHF@1[i`MI&ThV
@pTHkrCDECm9HFbi$GrifRHLp(IL$RmKBZ(V-HEIrm')*d$XZhlX1V$AeYD0"&%c
Fpp%'VM4aDpiX2Vf&mL24#d)c60b,iII-JT`I#jmdp6R1Fm$,XdhFEFb*eMIPMH*
$9b&1p"k[[Lf#fFif%rF6`AH[[XPIP3#pX[06`4f[[T8IP`$G`ANl@+AeI3Vp!hj
((,a@khXcR2aF`dZ`[ITbk%R`06RrlppP,K@22`DfR+GiJ$kLH2pk0"%NH1,JL"V
hcLp!K(3ZjiYaQ)Qli2RLHil'`GX0(Nmi(TlhA)f$ljNk*Ta'lZHCZ'pmAi`GTSj
,d6kS4FlPj&KMiQk#Ui#hdY+(b[cjr82$Z%$VJlGSRcE#Qbr812"Difk'(lp3im!
AlGp(`3Pd%ZS'ql9ram)9L)@R-VGDap[4+Z!Ti"cm3r[hHA",q#$RQp5TrIX1-h#
TLEY&jYRVhlB25`#D'2A4Gjf2fA!HH"paF$@Yqkqr6B0dMYpGl0peF#Gd,I+"jFV
lA`*f`,2)"lrA1Vk#VSRQ*ZHlRbVfl`Ci&6J$AX+[62mQ6!0Vi*,1r`%!N!-0$P4
ME%aTBR*KFQPPFbkjA!DE&S)!N!J'QaL%%3#3%@mm!!$-$J#3"2q3"%e08(*$9dP
&!3#[[Qq5Xad3G!#3"3*,e!#3"Mqe!!#ai3#3"J)l"[L1hGEYHFY*)`XM2-R#Rr"
eQiYD2Z9dZh$))GYXImFZbSebEe1C4qKeHFZ)(jkY*r0NYdlikY%flBSFGc%p`TI
M4cDK#q'AbfQppRPa`KG1&Mh#Lpr#&h),Ar5@)`[CHGEab-)AeR)H@Ci[C"1qm'Z
3!"lCD5jm16Z+&9lAXrVYj@NYl(X*!2Q&r%)f@Cl-0q(,5TE9[[1lhSDGPaHYma-
C0[+XMrCfFNHGIClj[Cf6r#lG3TlIQ8%[KG[&bjNj@25bFlJF[k#@CpHHG-+6ped
+6`HP$rFP*%XElJJNN!!F*$1i!E!!!Qle'r3f`62lP4fN22C`&pZ3!0mL@FlDE$-
AJ)AJ$lMcdqZXe'K8Jb"B%!5jj8(qr'U3!2rr0`6"XPAir&NZRq2SIZP'1GS8YPU
94UX`fQTXLdT*apH5mX@c@SKmQ@T4af'r'!3Rf(hN3m'5e2I4B'&kILc)(mdTSEV
Mmh1,cehqr4FPViSH!Lq[hV%Xl'p-(5jim-*pH(@3!21Qh%cZf2`9h5LmE(NZQ*e
Y1ra`0UH2Ue(Zb2H"$`6"MmrU9bj1F1`aa8Bp,$81[e%b@"iFPlXr[lYccRmkNjG
cMqHA,$JR1)GRH#%)[PS-IV$l-T(M0SkZl@qfSUf9kF1j1[cCfPC&c*0&JL[6Kr9
2#F8UK1FTY"rHfZMmblL4@ah&K&&R&e(iqUEj1-(VLTXZh9#UAKb&jDJe1MVir#Z
eI'9jPj&ADVUkP6f*99kdec(0Hr*cp5CeBR9!N!"694m*KV!ll,h@lLe&*lJd[c#
rCX(*A4"bFF!Yrk!q1*!!XPIqLFcaCppePmC*Q"i1p'TJF)Nf)Q44chh5XRDpCm%
MJalk#mXr%r*[bcrZbjrAX3'3!$-,b(H@-4$,SDL1C'-2B*FH6Q3Ia`PDZA[cTq@
rN8(ZrQETBm19,Df`YA1PG61ULj@i&-`jEUR8a`B,JieDXe+0@RYGleaa2SilSU'
SrUcIQNTpqhI$QDC*i,HmA%NDqd+YD06ha@J+ie*B2I!-iU[k-RXVpBPiVqqUF%I
i3Y,Q[CG2*ke`Amcd9*`dDS9h4M[Ie@L9prR@PNT4("G'`f4bRf2G9+9DIMkEZ5[
Hq8+4i&GILF-iMQTE[[1N1,G@%'l&adbI-hMQQ3H+`h9YUihd4885bP9&NdUpjE(
`khSXR&XI#lHQ04Fpje1XaUE"eA'0XYSE9IFkVSpf(AMAM@&V)NS+ie'522Z`+iK
@A3bEcG4clSVY"e!ZF-bMA1!DS&c"6jkpi'DH12!6P!YF0-TPRbH2FUfqQ8S1I,-
S9ha[`DA!YB"bJ@m@j3,(,-S&MJ(+&Ibb`&&`EUfJ!1@b,jC$Z4EAYYS3P-Y@KBp
b"EqZar*4VZ!'bMAl&+Xa3,R!-BYbJ@-"jE,SN88jm%qe`MC-iYj#jM+HV@`ZieZ
JFeP((q#cIJ'DHrQhXV@#FjD5C*ap,TMabC!!`Ba(-kYVIRQIL'9mLl`Zipa-l$+
HcF`ZieQJGPR(CVU8p5k@8i(GH3rA3Zrb[Zh&j"-mVd$b$#rV',jCRZ0Pr3c*bcQ
e9@H"jQ8mQhPHaV0)p$aSb'+J+AlYYDB5lq1B$@1&N@C5U99flDH5'Nh@6590ZLr
0ITZ,HhdD`p,)H+%Bm5E&Cfc1-3GCIT)j4mNbip55CS$mf5bEHD!NfHbRFJamLLQ
ZrRH`c$VRqD([f8*BI1F#,rGGmm65pm`ablaMRUhP[60d,HrRFE2J`3[XXYRATjH
"Vq'A[Nqq3(h2A)8@(0XHaLYHhqPipEBd%PUFfjmcaihcMQ'jCGPahXqPa`@RiP2
R#E,[Q@I)[QGcjmEhcE9ZmSl&j`SBVA+Dhcr3(dp@Rd2$`$F,KS&M!3X$ha`8"Tj
C*!`F!b!Xq'8,Xq!X$ee`Dh[R(!LfZ'C!)q[U3Q$JNNA!`$%!`'DriT-Bq!Ym@Y!
[m#k!AkY[fc-'d&I`kbS`(rJ+EZ"HXdrV#fG4,h$-JPlJQ-Hm`$@![)*Ikc[P!Dq
GqlAc[Ll1em(hfVPH'mm,19k4hl9aZdjHemRT#RbZRFZemEKf$YI-hij`YblHeXA
Cf[KDb0@+2+fCSlAaXhCZ&[CY6(ZK2YSb06%4Y3S1(E+q+cD-IVI9$a3YRbj&&0Z
qZN#Qd2BST"6iHLN9H[(0+@8E,F9Rm[!VqdjCNYMk8$k0E(NThcPiUMceE(XVmjJ
c#X0KI@)U"$ADTKjQTMK3$4$XE)9+)ZXpkm!-b1c#kM)Y9a90S3XiTh,2PP!akm#
r*H[!fmmkF'[,1PYMRBqG#G$qfKRhr(0Rr$VHfkr$pJIh!a4Ih(I22VR[erAQcI#
fIUS1hpMjl162bQTMLm9ZD@+#f8F$J#r0!GVJeH4IQ-Ni'VdYr`)@Yce3#fS'"C!
!*AI(iRH93"CM@aqTL0aH%H5EKmILGj4"(ZHE)eJF[PH`Am4q#IYPl'6X&1ar`Nl
&UPR"b*ZaNl$6X61`-l%6X(q1rAhXTGL&f$(BIi2GMYf"[3bl%hXMGLaf((B@GME
f,l"cX(1aml$cX8a(MX)Z`0CJ,mC@Bcq0r5Cf02B5l&H`r`(l(l&rKN@jB3rf,l&
lX8bihSbp&EXIHaZ@%VX*qehXjl'hB2m!Ha$,c1AYf$Z`Em3bKRdBqbBXNjAI`ri
cl0hB0f2[`6)BZ`Yl(rBYf$r%rKIX@l(hBlq!rEIBIiIp)b`6heABVf(lB`GJ88V
SLaf)(B3GM+h%IKAlZeJ'E8GLbl'I`Pk0[3DE`Pk,I31@-H)NGJKf+2EVf'&B""N
Za!l('Jf%%GL,dNP3Gc6dpl$I`$+TcMMT(f2r"2[[XAq+AB9GMIdfGJff%AXjYJ'
l&VX1fi4Pc2YEf-pJ'F'r#PZ2r5cf1Zcef1ABEGJEX,AB1Z`9f2ABricGJ0f)hB6
GM&f"AB6GJVd5ZaLl"2Xjl(H`5fdHGLY@k8p%VXAq#[BGf!H`[i6pPpKhBKr%[Jh
lcl'rLRdApYeBTI!4H6rf[GMhBGq2CC6pJpJ2B4r#IKMl-2EYf%H`Mf)I`rikpQ2
BMf1I`Mk0I4cl*2BCl,2Bjl!I`Ai8qca@cGa'lX$q"[BhX5pKAmCq![Z[X,q&r56
fYl(r'[Xlf#Gk(Z"ri9fSEE!1r$0[bc[a[V`VY8-Y8&2J+4J%pS+9B"re3le5mp3
2Y82G8!rJ,$9'6B%"B!Ke"KC3Xf!(p39fJ%R80V8'PS-Mi!9i!(C4Vp3Y1%a0Jp[
81YK0hB19B$1B!)D"*f!F1!4ZJ&RJ0r`!cJ#'Jqe`"6J"'!q2J#H!@q!8I!,m!R[
"CX-Ci"p`($ii!MJ*2P$le$Qi3"f$!r!L-!+m!PqeJ)T`*[!%6!AM`9!i#rJ%jS*
*B#eB"bF")`fQJA9J@B$jF"#$ph!)H"9m#Ji&Ti*(`G[JE)DE`GIJB(!l`rN-(i3
(`JF$$JJRJ*[!3H!Nm""i$R`$(J1hJH-BA)HI`)%-r`(l`2f!rm"M$%FXm%-iTZ'
'B#XB$NF`h!"1!2l$1ArdU9Fl-A9rr&[+9cXk5LdiZcFr+jI`GrPN,PZQqi%-+d#
@fDqS95)1[N4+8F4&*$jF+35&"cNTPiaNK8S[LSeKbl$Pf"4f(,B#1aBl'$X`H%f
UBL&Cqd)'C!!kNDLQ(VqUX#UDIJ2$jecGM,2D+Qi'C'QM8"cb#`#FVG)J3EUUT[l
"rPd9-CIXYhAYD'(GkN[%V0VdFCKUk(Mr`LZ@[L1L,r*Jk%6&1L)qQEbX!4SA43@
I)fq5JD-i6j!!$GVa`9"1&X0C"4"Am-9rM"c+kJFp@qAjc+&FIB6N'Lbc#HVNYcf
IMQhQ-m@&V5T'5D[aVULe25kN)c`E6KdVR*%EZ2f@h-$@94Y(#Q-A6`DR&FCeUM[
pP,F(ZI8dEdBrd(I+ZQ#LX&&%r[Jh4CbNAbeTUK'4"DA&d0[S$pH5#9S,-E89-pp
5'Sh4XfV0Q*JjcpT[LLFe$62e((eFV6cS[[lURZB`r[NhMDYPH[LQhF(1*m5U)VN
c2pUAZfHp'J5I&fZ+j(rc`m(1VccC5C+@jRcRqBVD-jPA"PNM5jcRJfT@dUc3hle
JM[-&jhQVfM'dFGbB8,A"c[1`'Q!d@I5h6+f3!!VRH8KY%pS%VLG0UXmkcbqUq84
c3Ap[SChL(1mm&kJ&4-Y"Ifp9-qUhRHFf0E&SRVJe3rY'mm0)rN6450T,qVZI*NV
8h[-90DaSDZR[!E9+ER#H[kZ@"DdDee-eBbiiaRNZ8Z1(#Y(I`hU21fY*E#+$h[F
)N!$[2!)'0([@UQdd[CC8eBE+HG+F0EL4pG6Y'kQEVkL94a[-r@MBM('HrG4NSmR
NIP5$[0Ule1+K[H9qa(M3UT!!CM(ejUP`b@H&NB+b!(af"b'b6"R6[V26I'A"JX8
d8DB`fM1e@P%$Z2QMDCGYh&N8UYE2fME4`(,I3[GIY2UFGH)c(E,6$eRiQ0P3Xdq
TElX@YljAhH[K!i[Hm1%"5SKqiS$R*3dc28kjG58G@hZVrkmAe'4T@'$if1$6"dF
ZA(0kiI3,9fpBcE&TlH!'0BmY+Tme4U!aCEa0$D&fmVE5CarJG5H(1b`%AharKdJ
K!qdpfmpRLHMA+*J[M9-%`dQZCF$L5JhY@JpHTiLDUimSS0,+M"la"mUkrGHNmVA
KalcKE[8[PEeVli#%k3B-R*ZA%5'3!%,CYAcKr*3YDZbLMKj,'PZ26[)2HbrBiT[
D'Gl"XQ(jIKVcTh&rPZqjZ+rPN@FI62QDk5mQC3h&Cb,A$'J`8D`()Y9(Ni&*A6j
'8I3XQ[UBc$CYIbE1QH,P3eR"Y)%CrQ'dM23jZrXG4(*UU6(Kbae6Hc*hk@JFKLP
IlTLQPPNk4hNcpFXGdp"-rA+(dJ(6[pbKjX")$AIrJ`26`$`eEmId-(G--M-ac4d
6`AVe"(A(m""e`4h6f%a"FmG80j23h$%ecN3dGdbp-aR0(3S0j-8G)e%b1K99h8Q
h*+CmQ*lQMQ%D*ULjBmb'5@VZQ"4RSTSlD$Q6eG`aUFhB%(G-Y%Xl-UDh&mBDNk)
&NpIFrAF16'"6cY3BNpMFN3-6fGa"VjR-jSka*8ChZ#0[TV@jBmUFL@hZQ%CRFTX
l"V4i3qj3Qf$LQV[['ji!(H!)%pMFmHj-BR2(*$B6fGb"0pacaf3ldpRF-3A2P$C
h61P6Tp`a[-A%0RI8(*2Eh&&c6(!$8q#DY!l+9EGk)P6Gm8CdZVNMEe3$Z'-)5KB
r+*H+!1S"h$%acl3rG`apS3$!(HSI6#ecKl)&drAF8H[8-[!)MM#Gcaej5aFJSEb
ah+%-`+3rGkJ(d&hJ$N8$BD%*$EA*)&a#UKSbqTD3!++)$,YTq*AaYU3`5!EDNUS
h'@&,+RmC@NZUcQ4-,5PXNm'dT*39C"3YUFPk'6j,5Y9&aX#5HQmCr%Vq#`FCp8S
*IaRZiJjX3Qf"1qU(i6RZm!(IZ'0`84UU+8hF`c@iSmji(qj3kT!!5Ib8P'*%)5%
PE%-j!SS"6d$GJ6Y`M9VQMPUP[VJM0j3AZ11p'C6MM[G'HB)le#Y3FH!1*4[CFD"
#G5Dp&deKi#2F`3&%G+G5q)AL!hI8YV66+[9H+$a`KaS%Si,F-@1-fJ4hU"$)B(Q
PP(43cH$ZVcLJL+'q2Z*DdZ6Y)bk"ZJChi"dib4fecGYbaeZ6,hHS1-LdIamTDD"
S`4e+)@!1G``$SVc"hArM3%cep4AhJhG`"kk!MGb"bbKiF!IZS#$"(6@$NJ4hR&'
Di!iP#hJ%GbL6--,*(4b4fZIZ"acJGqVV*kk'%JGhm!Bp@+VZ`(f81VJ$(aQhj)l
kep2lkSkh4XQ#1qS-p3[Z8!q"4h#(SJimMM[U'aa3Aj8i-$'jJcH!rpa4hf!bGq5
0+JPhi!U$RGa4Rp3AGq32,qD1["Q@j!k&(lJEGkJ484IF-9`,Ye*IIq%CBj[F`HY
%[D@rDTda9Zl!EK4!Z!1c'(APMVT&FB8lhK(P&HiB*%9pK6X8Lm"BlP$ZiAfi8k1
r@K&$I32%ce&ei3kFJqGb"pm$*lQ$rm$&Z)-$N!!MGl`(DLrFJ3(`#1jiDhI#+E*
8I3*i$AG`#l#)1c!2p4VZrKF(X%*p!e86a131ESbU$AIJ%2bA1cJ5R*3lm*eK8ql
!1'P@$e50S5l&(IkS3R'('K6+3pcp6`kS$UP[N!!i$4b%1lJd[)ml-*ikiJkq39e
c"rDJfX3GlmfS-hIN#HC`4ph$@lQMlX&mp3e@$`)9,Hl!'cJ)Gq!k0F)GA)@aE1l
!5T5@Z+0@iBEFN30icKfFQ,G9ha#442S$h0%M!(ZjJl[5-q%1RJDAjikk3@Q+1l!
-95MZU#9`JcX8Qq"PkKXUcShL&hId2P$RiJlZcCYc"rFM*RIN"jIN$Ra%`BNlDJ9
e*ZiiSlDP[Q(L",`RGf!!Z-dG2%q'f)H*"l""M+hQ8bc5P3he"6bYUjm[CQPV+3!
efbY09G[EPqLXMI-2R`9Lr4heH#QRJ+e%Y2mZKFa`)q83[h"iD(0THk8XhHSYikb
#G,`meKdC4R6QC%l16Z,r[IjB`'kD@P%TeG6H&C8,EKMaS1Kr0E1*N94hH*HlDfb
d)SQX(c`V&H(HPK6HK0rqB'k-F@Uc0"NNT5VaDk[94UQrC,ITbE$HZ9aHhp'jUem
reVPE-9JVCjFUeFaP3cf*@P20T1Z`+lYF2YfpA0Y)+PYhGUk9Y2@Zl"R@4h&MUPA
+%Y[3+'h[A'j%JcGcZDPHQFiZ$e@URFXeM9$2G##DL+DEcUXfhPQh,1[#Z*e`AD9
1KEPhkHeK9K"TEL4YpH5e&hHZ'SBl9idrD9Hk119GZ&`qh@bjfrS`-Ep-45hI%G@
Y&TC24k@TGJ#[Y+LVY@(lS9G'&Zhb-*kd'lA,aVlfXcA8bp(db*CYl9Y9K[,N$52
YXeFF$51G0'NEQCZ$55F$U4eG5,X-%AL0JjC98,fCS%eK+lEhDYSqB4F(SMKUl@L
l(@LA9P-MVNb2*eBKkN+*BfF5SF$&dhZdcD&FpS"Z0`VGTTBETH$##UK)&D3E6Ed
'4@1Z0M3Gr(&hHjA(1D6#bD#Mh09(mIDNd5a1+,Q-XlZ(J2)iQ,6UT6#15M8p[#p
GAF4M(9m['P,!AUQSYBfk#L'3!*q1!"2l@SRE6%4l9*HN*$kZ31&S$05krXVI69Z
*&ZaT*!h3A&af%8!`NZK6`6U$Ifj)$`rPAU[mCj4V*#&G6VAVapF@"[[PbY0X!$1
Zl0aU8,Na,%@kE+5DG!K1)SZYSc4ZXPXZDqB5j@NEDZPM+jI)"F,CIA9+ClHi5E9
E[3"2G5QE$A#VPJQ)Z$8$)TX(4bkkD#i(YD"!F+h60FS1IVT-E$H1EYTlE4+@5dQ
B@cmTVNR+E-B3+Bi2GqZ$feb0H2le`m2TV95$FGQ3!*3(1k%,YE-GpIGp8)L$bG5
@&*m1&rBRI&AUN!$2@4%L"4$j5*j6,PSJ1flHeKeUGemi+#&LHBPS&k$,Gc&2'95
pQdhc#dZ5mMMVaY0d"%CFhqVPje8ZA9%qSjZ9kaM8L$`CcfRH5k+l6aT8kiT++pB
+%MI9)&Z4P8iASHh*maP9MkI)kf'm$r(C&eX4cVhCSHel8GD[Ndr1&D5'UQ)KH5%
dm,5@AkCbiE,#8a9&Z6%Y$`8BK@N!em&ILk+`a89ZHB[mcKDj95fb'eS8PPR),e5
4hk2#ffiKZcK&X+C%mhB5rLZDA55#&55bQdF8&N%*pMYThNr&hr%NNieJPUSU1Jq
l8lTDh2QJCFd$Il1$YQ811VAr@jb%a+NqcMBaAQ[FCbEkk3NbL@pdqCRN0$VE6))
aQCrmcmh6cZQFYA[5(Q8'eY0MjX+S$@JpCK9KA#V3E,14&A3N6j9KX+fIFPpcd0G
bm1ANHpckraF[UrGX!+1krAm&r!Vp,98#aF'Akp5eIa[AE0k3!)iE(-[$DrpP[q+
ErM32pf1F9lr(JD"41Z'a9F'#mZ2"XU(,mRYQ2jIMhY&`UbH0G[M'YXj(GE$VLVj
J39qR`B,[kq1@9@PAUfR6S(@dQZ2EMQDj$'GP'Yi`CG3)6-8c4@eQI&!j-G`943q
MP'2fkq"M+Yd`@FB2M9)1#JY'+3F5,%Sj@Ne!P(,dp,iSjHMTGc-Ka,5j+1ASk@k
M1Xr8Y#MP4+5#Bj4bH#qMP)1r8FT"h8'8FK`TaBK5MU0*G&(+FD6N)8SjMT4+4#P
(Ur@)8SiMj3j4bR(%`d3Taj&+K5MP1&+,%+8F4kS0ST6Mk,d&34fT')K5ML29!&(
+F65C,dSjMLEG45R(d65l+18iQLSAT4cR#3kLP1-m`d(BBe3e+8Sj8G@-+19%pBk
LP"09A&(+LDUq45NRUJNY8FU*5Ze&P(+L8PS4TCbS*ZP&+5FU&4*4bSQUib&+19%
TFBK56P6U'++8Sa@'4#NR+X8#8FU*5V9"P(+L8Nm3TCbS*[+&#%49%k+8%p98[bM
PD%8L8FU*2X9"P()dP!P,M`Q$4#NR*S`3TCbBkP#8FQ*k8q&+-H8Q5MNaU3L)8Nj
-LL#LP"16iSXSjF5%"k+8%p2d[bMPa06m%D@FQ*3e4#NR*Y8*8FU*#HG%+5HQ@KH
PR*J8!S5&aU3b*8SjFG@h+1A%pCDLP"-A0SP56PaB)%SjFG@9+1A%p8DLP"1A-Si
SjF5&ED+8%pGELP*1A%SVST36PjU*+1A%T4iL5MPaU8')8NjF5KQLP"0AlBT56Pa
+%++8%jI#JM$AZ"30T(m6PcU&0(ZeZT)SjC5*9iK56TRiJ#MPP!P245QR6$JP[,T
-Y5Y+1@@U0e(++G-lLP*1QH++8NkC9'a%+DG-+L1LP&-Q[L*+1@95LC!!hNZC9%*
%+DG-5KY#AFZN@#&+1@95Pj!!ZFdbiE3SjC4*48Q8FXU&cD+88bjmPa()FZ'GM(#
AUjj&+DGFp50+1HA+8j4bbP@MST46VYkL+1@85ee&P(,+aDY%+DGF'#0+1H95V"#
PR()T(SP56N+i)NSj#A%58FV4DNqLP*-3YST56N,i*8Sj#H'1+18N9+ZLP*03$BK
56N*[)8Sj#I%N8FT*51e$P()58M`4TCb%&%C%+5HKfK+PR)58G83T*r'[(%3T*bR
q*dSj5I%H8FT*UXj%+5FT2L0+18Ra!9(+53T245NR+@`5TCbNX%#8FT+U+e(+5HV
Y4#NRU9LLP*183SdSj55Pr#*+1FQZ8Nj5Q#&+18QTLSK56[+V(%3T*iQ'YP(+53R
l45NR*5`8TCb8X&q8FP,#IP(+5BPhL9*15QmX5MNT[E%SjD5%hD+8Na*ZLP*15RJ
R5MNTiBXSjD48Hk+8Np*lL9*15R&&+5FPa4P4bNQ*UiP56NS+6++8Bfhi,,9+i(D
B0@pX#*),CaGLmB%T@`eQ[D2hCk*(rLLIGI8,C!JX,Cmp6[6)CVChM'ac(QAD995
%e&5m'T0Id3UGQN223kTh02-)Ir[Te0hm0dDY'KT"KlkA[KS0bfpC`9I1Q,mDll@
ki)XY3HE,KY$9XJHXCYjG*qfIJKAkBC[b(D'`E#JR(E"cii"!QhdFQX,VXcKCi!V
L-!CjTFq(8FLVjr0a"`$G1)bSAH2cCYca`-%iIPd`rRM)af%NjXhcF@4-5-GKl(#
,ciF*JRGQFGVER5S1)j1hU@c8"JFr2*L22DC&heBEf6Yh4l+)#Sr&dPJ`V3bVpZ"
RcCl)Dd8%P+h!9Q,lB2YKUl$pX31`!l'$X)1a3l"$XF1`&f![a!l(MX"HK"f*CCI
qLl(9f0(B5l#ABXGJaf,(B5r$MXG1`%l%6X*1aNl"6X91`dl(cX$1a-l#cXE1`Fl
&cX21abl!eQ!ABKGK&f1AB*GLPf&VXAAB0,BHZa+l'VX'fjL1*NHG@)Jk9+9GXjS
*Ta4SE@ZI!CfDH8"'0"lX#AZhB8%H$q*`"FI@%0i`eC6qABh*M0V8!-,JJ@TG13i
221Q9$8PB,iHYFPZ+XLC9(+`*1#R8U"QGfP*&JEDKAUT1PD1HBCKKm%$e$rSj[SJ
HiVDNGaYPp2'!GGB8(Y4d0(1Vhp*rA[pE9`CYF@Sl'NEiH1#Z5a8iqKmVGLUl(0Z
!AB9GMBeLBeJ@K@6T1IDm5@#6f"5f!PZ*lB2YLkh#pXF1`!l%$X)1aJl"XUr'-1`
&f!Za`l%MX"GK4f*(B5r'9Q0(Bbr"ASSGJaf,(BHp$$XH1`%l%6X*1aNl"6X91`d
l(6X$1a-l#cXE1`Fl&cX21aql!&Z$ABKGK&f-AB*GLPf'VF9k#dLPJS9,Re1PrEq
II8!8m241DPD")3@lR%5&1lI%E"$Rj*dRpb@cXdqBE*Rh'Adf+paReYIZP-GP(Xf
XS)b8Q9QcfkcJEGC2,UbGM'aHBAAZiJV0b(+C9F6rCS9QXdjjX%*cjkV,CXePj1!
++bicDfK@k%E1$4Nhj0Y%UXfQm+RL1ibp%cX$qbEX(ZaHl$lXIZaYf!2BJpK$f0Z
apGMPf"ABPGM,X3hB9GM9f$AB4ZaDl$TX%rB+l(VX"Za'l#EXCZ`@l*ABUl"EX9G
MVm&HLhd$pMVXpGKYf"Z`fl%lX$Za0f*[`Yk-hB@p"AXVPKAaCQ*RB@GMjf$RBZG
Kjf-AB'Z`#l',X%Z`5l(,X,AB1Q`8'm01`dl(hS%GKjfdGl1-)[[Yl+bFZh-rJjR
J*Bp3@0hDB#Ci#@lD&6!6[!3hHpE10RJ*GKBaXi#AB#@B#9k#Te5'j3%hl6"p$d[
2"k()3)Hl9@Yf,$YB-p8LmePM0fI+V*0KCrRXF5*5X1-qBb-MRDA"qC*$Ba[EfiS
lbelB[8JjVPJl[%Cmf`m@AG6Hb8JeaX3rDZHBRF[X(,GcKCh,lCb`FmV156ZEI#V
Yh-I1MAEZCqFU1rHhm`#G'EIbhbQfH'jR*09JNeL$l,c5cS2Y2-613qdmc-iAf2P
#1`qhm`JlMl6c4ABHCHH,l9aYjp&f[X61PpTjM*h(fRQFR5qcmhJl6l#cHFH*GTj
XjbPfRQVRDADHEZFCGTjTjePfRQhRHADHBqHjGPjMjrPfAQ$R'MX[l0CFr28(Gh2
b-'#4R4IEHBQGPpTjQCeVl9aRjl5G9pZj[TYhm[MjaB)%QY!6NR1X'cDP963bL`F
*h+NBilSa+KEKVaF5mR,3m+E1jGdiP8[f,L`Nlkf#k,T@CieekQcm00DTXmBIGGE
e6X0FcVTZeIN11p-8ARE-6ppcFh$00GHdEA6jZLIRlYYXfc,%pKHCVR1kDrVV&C%
lTlZ@+@1c%jQG6%616V(BZRqV&NPQU$RB*lRc-aYHk!ITcY"#N!#62@2E'0[FD($
VC`PJLrB-0(6ji11'K8rB0LSIY8e8RV5Tk)mCm(rFcNrC"LY2@paR,1kcYVA+FbD
QkhVE+0K90&LFE9r6-E)ch)RaRrpB1+1ffE3p1FlRd9JFYMe,`Lqr&P[EecJkE2Z
Ap1DaCG$f1cRrVZ[(aqBc2*Z(hXARKXQJ&-F$V20bIl"NA3EDb9[6ZqbHF!B3hRY
6HZH-ldRhip"j(&qCUl3EN!#Aab6E&qBImcMf)2mRMf2V,rdiMk1*R-Q$"I1qI2G
Z9kr22c)jqr5UR1i(Xk*)RjfhT3[E)C+C(%Th@A%Hr0dqr&r)2AM2CERhr9#k(ih
1iqK'5#IIJaD(cZ0BHIai4b@eeTSP))qIlEVNITNGP93Hh8MdiefA5[9"a4lpG"i
(JmR$1#dlqQQJ0Ui&R'D"[f1CZM'b@rfeIQTA3GNYj[prm)m$FDX(`+*Yj0(6%mM
[+YMfXILI(5!22Vh3iFmr*MH%FBHE9YJr'(I,,[rbrB4aKhPB!aMhZJ[@f5C0iCG
IFE(YXh``pkjAr3Pc2j((+HCq)Sp6c2eN(MpLlU8m5XbG6jLlFp@bbhS!-2H1phL
GZBF2HjDjPr)iaG`ldRL0ZCIbX!J`pjd6re[heJr'V6BQDBra%mEGP3HI*B"aEkR
8Ir6F`[5+mqFCGqTlM%RPF43C6M1Q%hQFBMSRmrJ4dbRPF4V*1r*i$FP,H4`(2C@
(U[Z6c&c[!(VNmcX54bT%jE&[Lqd(e[kT4@a2j*%U[UbFNL`@"fdlY22IUiLR0JQ
P%NrQXIXPVUMbB+0MEjh3MSVH%GP'CVh[fXXC-Pck1#FrNdF*1BrA@DBq$KdTXeH
rbR5"a5-BdbrY2QkVhdYAUDX,9Ibm,Y5hCcVG4bY!(ZPU(!G!M!+3!+im&0EcVXJ
NGrA*GGI3#[!HZYYR"FM$G2ZkmcM6lEXjU9@$1jMS*)m(f)6IZ6Vh-2G$,ar)cGc
IC1'*ChCHI-IZh-e[%jJS%EQU1[lhjQkV2j5EH66GR&rRFBZU+(b2RMU6,XZZjU&
kTF@LJHK)(QaJ'G'LQVeeVlXX9S"ke9d@+d!HI#kF+E'pRlqVcN194q69qQ"rjU1
8`5N@4hX!+(QK#eLL(T'P[5FQ(p)MeahU6EQIUE(Z6h-B+d!HUlDeY[CMcldVV04
H-E2Br4@j81(cZ0$jq[#id2PklHNiRfJhUdpcS9lm!)'h9TT(*h"khY8qdERQ%dl
eLhI9H4cIMEBRMa2,Y)hSr6EMeIfGB6TfT4Q[hXqb011e[hQ%RCEHpI5X@!pccmb
+pAi@N!"CX3i!H@e@V!ZTE3'cBLjcehZ1Y3G*p*jJlTB+CQS&3%kl!P,eI#HdVHd
I24f,Le*1pfFKk-ABJC4bHMr,NP,1Q9j-Hb)fJPl-X4LLZ(2dXfmTlT6'rb0p[5V
Qrdma12Z'MX"TjY@4aq[-+hb3!,2-Uj5(G8)Ii3ccDNr%,U#ci1DK0FUl2T*3#fq
jT1")($X!)p"j@#9d(baELY5XB[-"UpF2QN,XKdcjp5&6K[f`+FBqE$%I5CHmBA0
ceqmMGMD+XbrpMr+X'mFScllmXJ)Y(jlEATPZY-&mc0UZ@Rh*DYQUlUTqHRTp`kP
MK60b!lIINK[BZQVM5'(XiXRJY-+i6R@RRr,f),HHrGa(2p"hbVTJSV$4GZirrGN
3HRc&0reT(ZlRpqEfP8jiE&@`S2aiX'cSX[bHfFrPZ(H1CqEBic@(El4*c&JKf(9
&Al!Jdal'pr9eBDUd,+%DhNb26G@65Zfjq0DLA86FKAM8BR((9jC9AV#9K)m$5L4
p(0K-bXH"09Ai11Kh9rSiF+Fq2JkXVDq2!c[Vjq2!@kYm(0D*kZrMX(,8!"q(GD3
'q6LX,$ABak&T0m6(BI@TS6i1ke%0mh&BSHS#(iFeUbldF9M&DVL23ipJK)r$5PF
Aq6LXI6A5af%eV&%q$ZYMAHcMX'*@YBr$'PUMI4a@eEV%af'GV8Yp(&EH'Z2M`$c
(qMLXcMA1af'pVXYm(&E`'ZrMX+EA""q(9EiQqMLXqcA*af(0KFNq$LZ$6I&a@#p
XUSr$qQ(6I"cki00p(0BBQq(MX1VB6"q(9FKQq6KXb$,Eak'*1mI(BI@bZ6i1kjR
0mh&Bh@bqMi-Hk3)IKhA3DR`FqY`,I4a@5P[Nil"ffQ)IKpA8P[Ji0)D@qMLXXEE
-af%9YYVj1*R9V*8Akl,9qAaBU5hYil#r4,f2JrM2FKq(&Gj@q$M-&DrdFHJEAZl
M-"IFi11`3Yal$XEa,e!*H+q2`lcfmcj1)mH"2XjDMTpi*BlhX*P&JBpq&[iiYVk
P"qdXhj!!$NA[A'bdFkP4h4&3eLkbf#LU"R4BM-)iYF&N$P-mCJ(8"Z`U,"d@ZLG
d2'`LRifA1GRM9Lbemc)R#`9SXJQG1RC1GQFQQ93FC5,&6KbjD)e$rmLE!!rMd&r
b*X$$1,R*lM!1r6a[8Mb-3mr2Q`!2ip!Ap#E!`cLjbHi`$[e&Ee)mM%-2dTX!$q2
3Tr3Q`--ip$+p#I!`$Ve1E`)mM%-re*X!$q23-r8Q`--ip&5p#I!`6Qkb1rCLR0a
NGaJR0pNGaXP0GSGaFT2GBCcFC(FB*cIC(FE*6AD(FA+6h@'Fh'4h'#Fhf4h'b8e
fKh&bNpeKR0aNGaJR0pNGaXP0GSGaFT2GBCcFC(FB*cIC(FE*6AD(FA+6h@'Fh'4
h'#Fhf4h'B@E"QpJ1ic$Ai%f!Kh&bNpeKR0aNGaJR0pNGaXP0GSGaQ-A`*VE$1-a
VH"2JBCcFC(FB*cIC(FE*6AD(FCJIm5Da`cM-Q(J6i'%FjP#m#I!`6Qkb1ib6Qq`
1iq3QZm-iZFRZ-%jZXM[qBKcQDl`*jM!1-cMH"(JBKcNGE`)mM--XMcF"(XCKhXH
E!!rMj#Dl`cM-$AQ6iQ%FCSZm#I!`$[0(RC2GQ8r&BIkSFl)lL-1-8ZGNGa#(1DE
1bHiJ$V01RC2GcGmrB4!QZqP#4p-HH"N0mmTdhqkD#EGdY,9Ym@kBU'"'c1("RV"
h'aENm5!19h"@1TA0$900D4$Af+EP0M@!-(LJ'S9URJBmm24I0b4K[4bfbZf&a'Z
NU*TfThfe@U2HN``Q$"kSrS(`JeIa3,%)@aPRm2&!EHY-rk#QXe&pp9[kcqYrkdV
YMfC4Bidq(P3i20LHEY9[EfXTqAL3!1`TTrB"$MMMBEddf@"VJEfl3[8C0fi[D0A
c15[GjK+k%lfK8QY@S`*VRPF[MbI2EMC,'L@eM''"PI$c@5G66KNR6!!ikY*'Jcr
fQBU`mZ#(KD)Sl$@BCX2pM0jD0&LFE4aM,GQphZ+b`jePB@Gk1p!1GpflXl2-fbK
3@qh1VQ[d(hHQYrrXF'F4f*Nq-RNBTfAh1Jh8aV@!drDYhHZ%FBHVm0Sr',F&D"0
Hb`*cY`0Y`Y[0h2Q%Z6YA,EZX"`"cYrpX`QX4B1jUJphHZVH!E,$EX3RkDa[X(YN
Sh4,!Z%[V6UCk9@`lDChB8Y)qXFfM&@!,4id`9SQY&e2&&hITGEpNX6MBhNAN&pq
VL*GfPAJbMpd[F8@9"jZSSk#d(a'9`Z0Q+RT(p2dplM2[dFXC-Pck1#FrNdF*1Br
A@DBq$KeGQIr%9jNZEAJ%BrUPhFGYpA[T+R9eSBUIeiAkpNbRqfJ&b#0GCBGjGjA
jVMc-"[,GIA,G0E3#[)IZpPN"mM$G[ZimcR6lp)Er,ikk2"ji%1m(FJpc2r6bJGc
-rFhJe0bYc8rIX6YhmpX%*NTK[kU1rlfj@mX2j@BH*9k`iAri(Mee*Pf@AFe$p8U
,4324N6cdK[mXCpPEplV,BJ@S9pePX3,N`HI#Q9*+rrQlkMa8H84HVBqeMIVmBYm
QB'0ap,mAN@cq%18Z8Br)dYi6N`rTNHX1pDEFcp4BpkFjM"8JMeAE@P[lXHIH&9C
U1GNl@h1KmrAKFD(cp@S2f00CFk&Hr!#"YeDD4bG`HYl92Y'jjK01pBYheANFh`H
f*ir5L*F&C$0f#p#-9rGR)GL`h3idipAl@CCQ[-lXHGfHL)eJ`hBe+pEl@8"Qa6S
!j,9CX5kNYJA-LVR-[6&U6F`h441p*jLlTB+C@J'3!01ZJ&3pAdNSa`,5dl'i+19
dIaD#AS`G5#QRpl-X+H@FkF@d*f)Mk-8FLb'+1dFrqjEL6QRm2p,AUf,qra5$Xfr
S#*aQAKej[-km`JFjbla+H9JRp"(1-+rf41`#1JYZ(MZ2e"P*U2dUA&*`*)iGJ"(
S2+`5ZJpkLk'BflC9kA[h5lH-12I)eV"2YYC*p*cEDNQf8V()EE98hUYZUk8X(VM
l#qf+HUJKJSm(dIrBDUQZdTYX[DNm(UMqS[$&[pPkUfPU5l95+UbYPkT6j4jK*-,
(Jm4rEEeP)`1$("lSVCDXFPY1bGCE&VNYb0LB@4hehMLFh5qHKVMZcT0IpeQ@Neh
I%`d51Vp9YVefJ!XhhhR5,ZDUjfPlA([EYjE9apR80-#&[I#&ll$%lY-phA$K6@N
2-SF,Gi%,Mmr1IZ)c2Ga3`Cf*KLq8J`p9[H9QSY'bYGl24&[V0[fem-e%4hUQc85
lQNYfqjP(1paqNGDj(6-YG2cJe+I`iM$f6Z`-,212Gf(hB2GLpf(hBfr$(X!Ha"l
#hSkYabl(VX#Za&k1EF#Z`Ul'VX%fBYGLef'EX&GJef-hB$GL0f%hBlGJVm4HKGf
+[4Tl$ICDl"Z`ef'[afl$hS$GMYf"hBQp%AX6pQEX,Z`Yf&ZaZl%cXE1`Xl&cX(1
aml$cX3Z`0GL&f%AB*GLPf'AB@Q`G0SU0BDGKTf2[`)l$6ZSCKl'VX1b"B3(BYZ%
I2M[0lVepaNC'0X`j*BI'0VE9PTePSke)cI9Ge8T8E[G3F9baGRJ0iCeZX1JLjR6
BMecG$66rU*eMGLkcFpc1&ABZYh2#cLNl*qeXmUQdFaml0pUjRjfVl0cIcJ0d9VS
@dHila4B2ZI&6HDY*&QZ3!*eAfRQ`RBIBHDLGKpRj!MYID1IKGKjKjj&f[XM1Sqa
mXCfVl6cDcTIBq9)lMl(c@$Z2Xr0PGKj[j`Pf0ZmidFk6l6c&cP2Y2-h1dqdm`mi
cl6c,cV2Y2-r1Fq`memjVl$cIcJ[XA'2RKGfDLlqqdj'IR#i8YbdT[)Rk3`hHB-!
L1bqfma)l,lAc-M[AfVR1cQNlVlCcI6I[j2(MNj)%hpiS4b5Xa-ch6E9+UD5jKLB
PE@(1X@lBe'+J`B`8'EK6-FCeBe3X`Rp2)fPdFp(`TXlPh6L95p"DcmbXQIG@3A4
GUl2'1R8fIKVVe&RMMcVVHSG,beRA,IaDcY0b2`*`[[ZUe-ShIG%0flif&bparFm
r'H3AR"'m*[F,lAL@1&kZ&$a1l$eP2Id8mMd"hp0-dG*5!"BjMCC5"+3$4DR"PK$
(cV2a[T0E5-G6(8p%BbN6q96%lTbX&1pXPrQB[P((6APA&`SCF`ALh0@*SaU+N8[
QicMG11-ihYf*8kk`QHqqEYlX[(,eI*a-FLV10)lhq$M61GlVimcJ@0k*NcJ!##V
16)k*JhAKajR&-HRMX!0`bXHC`l(#af'hP%SICal(2Ml1I)jpIC`&(2[j1$3'URb
FK4clqcJSL3l`FCC`(16M,18if-G"I'b)Me2,FDL2`ijH`h`FGZHk`-GCc[&#(iF
GPSEl1#XjM["af%[h)KqRJH0)(iFTVe%q$T0J&rXi6)Y9qcL0(%Il1'XjAZ,MV10
iUBr$Q-FB(qF+MQ0p("5BarNi'cKHjZ-`fcAHapR%FB+2XjRM4"pR#mG*2Xk9(#I
l1&GaR1,ME18ieFHjQZ-d(qFDMY0pR'Xjc["ahX"aTSpc(FGC2JiVB-hfF9KpFik
23`GmVSr$0NIcI*`G(1Il1#cZYm$(BB[@'Kq(h3dAqMKXrl6)apR&FE'2`eC*5h`
F0T4GkZ-`SEM-af(lX9SICbr(1Kq(XEDdMm-%Alf2Fa[(j6i1ddFVI"`Qk9Ek1#`
PGEQ2`pC9$6l1(4cIiIY6Eq6icNkFa)(qUSTc*mIhq$i@BiM[pA&BU'fJMh-Aadq
m%LIcX2D&[Vqe2SkGi[29K#TlkkN*@9qq)GCLXG0-mGPC2RXF$UMT+f8rN!$1+8D
#Qp*p)L,""fh6M)GX82A$YT()`iBDM`4,d[1MYX(+BqEhkhEqL1AcZ0drBIPme2*
ld[,jQ1AhF6XraGC9I%pEh'FXlV2"XHRjZHl',$fIbU*LrFMkeF8er@XfDq5VpG0
V-ZLde%(1Qh)cZ@2ckYQD,aSXlRYPZGhK[EYffpdHalF(Z@IH'baCUINCpdXf[kP
MFEGGjhIZI6)pErqTG'pb#p0ZZp0fVA,eq[`MNl02VmVVI[!AQ0JpI&Zkj1`SZKh
*SE5@PHqAXI[cjlblN!$lfTi8i#e,ZqhD"(E5[IN`6XY1ZKUSM@X"TqeE1qN+i`k
PXZ`IM$[Fl2mXi`lcX!B`lR8AV%X4Y2YV(0edp$dX(mcpa#EpTjMlL6a1-IF6HCa
LlLIcq"&c,q94BZjm`YbG,cdmd!1!ZAHmaq[-[E6CrfRQAXVM&(-rXGRr+HCHbZ-
iFeGjR#$[QFhqHq[HqX'ijkl3r(RVpa2'hC8(Rb@!FCI@`%leUYJ#fcUa[E9pBXY
T+m"fdKTKV",E3+H+"mF`j%X@Li05fl%!I+mLAYT9iXNmGVr%&98HZm-i6N@EPAa
ciA%c&EdMNM+($H"GHcP$KNXIjq4RmLJKjr%kbp6(SCGAQ2rIAq@kF%Gi''2kTGh
(rIqiRUj59aHUq(PGU*X+RHkM&5#2G$@1!b"'!8KA(JVVH9FfG1RUNqZZS4AJ2A5
hc`U3!)ITpRARFDEEGh05U`E$-bk2"ak8N!"qG$2h3bmIb#rpQ3G4qjVcaHA$RmS
ApMa#b![!TVr%rrIcrqrcRm`[r6RTjEPjh+)U#YqMTmkNbl+VHDKHDE&S)$U5apD
eSi@JIpH42(VH3hGCV!$eUVXX9S!mq&`iLhcrAA8HUM`LVpE(fNCGZNRKja5,Scd
!p,`C5#a4MmM5hK16$qQ4k`leTYc2e&MhTcQ-&5#29GYD@rZajpi99QU[Q&RXrST
FU2"jA1KmIAKFk(bpfJ0Qa63AkX82%(KVTAPd!UIRAHd6R@Xqi95rH&HG"jbUYcj
1E%-`S[IEM&IhGiETf*9Q[(Srbp+-erlQ%ACDHPFE`C5hQKAVr5`JXf)G!2,DV&J
A8YX#CX9FjYiBY5EQQk+*hK2-h9,"6+d!b'PA3+UHVb58B`(Tk9KFP(+k2`Y",mB
1T*66qeQ@P(,1p',D%l%5+1iFr84ajqKRhe,F+Bhr4rTk9FcrRf*`pJdGJG2-Ub1
2ejPAq#"RQ9FT$qZ%2X)CjY@HL&e!Cm(03fmZe[@4K0Uee#8&4q,B!4L"cX-USI[
`6dSc*Fl)DlqPXH`pFE+IRG6GM*`-I[Q1B$Aai[*M+flrFmlP-"irY[lf[mh[X6a
8IV((-lpGRd&e3[),r-D3!&r-mJ[mbMl+SD,C3UNKHYI[+f(*Qqh9,h&q,fM68&N
EfhNhKm(1Er36h-RDfFi-KhFj[rXdQLMEL%C2jE$+q8hq&5AXqTAI`@'kme[h0h)
3[fpPm@*IjmlGFM55rcF1mjhI2FY8B+jI6"ABerNpVXhFh@e))fIp,8mJH4`@[P4
BAAilHlqq[meGTH8"hJehILpU4YMGiM4bp4p`YGrj[IdMbYAe5i$ScL,Rer42125
c20LqAI*Vq"2ZUXb2VF1PcTj4$'J2IQa5fXrj2AFfG`1FhfA8Uh1-eH9P1!bdH,c
C%ZFhAhH$c1qAXM`q*IbL4Y3hi`cbq*VcqiM@2"eLmEkI[G1MbSpG9r&lArC1PHV
Z$M1FH*E$CjeIj#6ZP1B!hbcUhcR"q6fT6Fd[G(kc6q6`-HIh$GA5F1HRB@&UkZG
m#`b,+)lkjRk+'ZrMiJhm"ac)8AeV`FYbmr[qKh!BkIaH[SlFIpRLMF)"5hh6q+L
Z*E(`eGrMpUrrL&*mY*DNRAMIlfhJRh05,DRUlAbr-Qfehjpii+l[&rZ0V$kqqM"
h&pZl6Xh`FJ*k$4'E8Sb,RNLGhAmeGk1Ghd6KUH$Pji80i#6["dd6h0V1fdIHD(R
m4SDAU5X&k1)(RNQm6lq&Zl(Q"im3[,aI-cEMl&dRChMj13fp8[Y!LYUQhq$P0jA
cH)Y(AFMllINelK5HD,m&'9iqT9`R1KS`mXH!SAZGhrZ&IF*mjcq3!1(PEQ%pld!
HEmhbZe@a`%$H$qd$UE-De6he"6qJ9J6RrR`GGp1Fhi)rcr$bPi@&@J0$2FXA-la
m@,b%'L%2DNMbq)*i,$a,I69reF&,jbPYcMl,iVdMHkI2`3NLjjRIBedmq$4hFjc
I4LQ'#9jq%#b2'&2F$UmbH2Qe-4cQ1Ep&GfCiqD!d2HBE([!Z,Pj'Ed'+,++k8pm
"H*l"bkpr3`rRqVhar4PHEKII@ZMUXSCfUX(,a-H8X"Y[X6Mc[BDAhQV`cJrmHKF
[2Er)p@"*"Lpp[`PkAi1A[TmM(*(k'(f0%REp*SN6#&iqT4J+0rM'IcZV-pe(A'T
miM-CAVlpipa4bq3"6JKZrGi3GlAf(USq$2i0&Cl*j%cb,c,mZd[B,(f1U,T2JUp
rT(Jbf4)9"NYq!p6'N!"9HAH#d`B[(rdb$Y*"MRiPHlq%FZ"0H#I`5r$b,rkC1eI
ebDP$L!EIE[J+CM5iH)IfC(JjAh8-e['Zm!5$PjZiNrQjT0jEkZaZX$aLNdX6p#k
#F`rT,4UGhqerRH%PX"9ClrcQ5%Y%m2*YUUeePJIF4I+iATJNECHl`6r$,rH+eej
Kl`dhPAIDTEF!kmKMBrC1Ra%CK'HTlalaB-(,UF*@iJ"0U[i0AQj@$VbjqRDSVb*
if9pBbCY$+iJYH2PTeIB@jrFHCJ!-AVliHcKFkI`H!e-0AXj3r`#V8[ibp@h`mJZ
IaB0q#1R6mc$mdPqjrbdI)1Jh$5pp[`Nr+e!6[26p*YrAa8[2chR2*kRP(E9NBRr
rjReXh4mpUpD-L4Ii2IRhiY40`h&#[`4X[GVi0(JMID-JhJI!IQH'[1%m2Upp5(K
Jr(cm[N%FIEVj"Hp+[d$UjU2LK0GBhZr+kUrK5pb"#D4%AF5Ghqh#IZU#HJ*hEh"
qApV"hA9@(rLjqF919Yp&C#%Q#SrGr',(AFZG#$I%K6H5haq,(dJ[m!kpJH6hIMK
La(U0NcrIbDpmd6-#&0G[XrS1ERlPHe3I-MBD[l@6ArP2L%1+CXYp`KFh[r)hh-+
G6!E[&2qrhR$#fmcCZHYpP,h"#Gm[HL1(&kc12,r)1m6[$8liIKq#CcVR'DliIT-
%jLl2U,Y2R0$YB6[A5L2U3HIh6[%*YjrSh2ET$[l9c3TchGjRG#(p-X'rZV[9aa,
GR2[")H%PG4rr+Jl5aj`Vr(Aa2RhfhGc*c-h%'cTiArIB,h%RrFh*UNqA6p6pXRT
R[+2kIShk%9j5phHUHjN+@+cqRmY,dLH+6p!()'rH5r+J24'aIZ[6i+,`NVVle$1
5A[9LF@9jlfm*jk3e29RmaUhlZNmm*),Nq[eAH,2`[235p62!+2@9IE#$"qPhL22
6+`!22YR"JlT(p@Ch'Ul!he`q@[G&p9P9(HQm&Gi,(khl8h%Y'AZDUlK56e0rP6[
CZ(UbqUp56mqpPc[ZeIFXr62K6h@cbZ0ZjdF-i8rT0iSM[YRj[D!HJmZId[hLS[4
$H%EiV9X(kHA##IT4kRX4lLlmUHjfmBclM"r3Ph*jI0fIU5EJ#j3Ur39j[b(LYI4
je2HmhY,PmHNhrl%!4IJ6I8#hcZTZ&NGrQq9(EhK-kPGrQc!,r!IRi*pZ(G4I+Ij
"(dCp,iPEZrR9rk%`'!b"cp'IN!!krP0K0(e[H!c[-E8@lqGKNC,k8mB[`&GiB!@
m#PcbicdXITP-miZX9UrS8bl[HG4@l&cR0eZp$(T(m*irkH"dj1[#$ZSAD%AV6I*
iR"jR4$a4I6q%RjJmPUQhT8QlHLF`62+i@fp&Rd6P-BAD-RQmSRk2kRrL&kH[Br*
iZl$UFeCrm"c*Skr`MpT8m5EaMLD23qSpr)(c5rePPXF2K,Q+4qJm`"'GacfcckJ
A!hF!9qM*pDNaIH[9$0pIkGeIUSAIQC!!IK5qjEKqc)"B[AZ`LrS$YcBk[pqL4a)
40eII(2(2Ah0qip3r9[e'hZN*m0ATFhkrSlGiaIR0T%mJq3eFq$3Hp!R"4AS*NTq
HY[k5LpGAEb$jI8mFPak[mTY&ACVm(K%2J&G#c45[-1rhS,#%HLFrDPVbfbJZ"#G
9SHDSVbcj0BTI8S2+Ebl[BI,lVM!,E&3Z[dRGQIG,#J1S"HAb%Mc5j2IAHP0ke2M
4Pj,m[L)-8r@,hm[`!C2IH2AZ9Im6[`r"CD11hj6G)Sj%la(H!hm@hMcmYlMlZ[%
EZ*(V9rB4eH)h$*rJda)[mK4hUXp!INq"4bDrVi[cJ22!2TaHi[89aeCc(0U2Z36
*lcja$h"!I3qPZ1,'UaB[C(j%jIGK1)I*lk[L%["SF!JH+(PFUaN-qJ2UHlIkb1,
hFA'HljJIr92aqi&Q9llVmTY'2C[mAP626[&0r4jJX-4lrRVZ[QGqm%RaZdj[,6f
CKqMAQ[G,+cpkLC(r!`!0$3a0B@08Bf`J690-,VQ5V&`'QaD#!*!)"TXBK-,Z!*!
3LqN!N!MrN!4069"b3eG*43%!VjH"CE-G%)3!!!%H!!&@@`#3!fN!!#NKhAR-6!#
3"SEZ%3!)XY&i2U8!iY1-0Q5dTqCS5Pq!I(k5%NT*arjJ*prjf$-VplrHR@26m`+
+hp"Tl31SGm@FIK8YjfVhcp'@0TbVh69(@eCVVRCdMRCfjEQD2NHVa(1e@l-eHhm
bR9hMDq-S90r#*!!!"J$&YRj(11'aIB594hKHC#AE)j[G*La#0cPqC%XBZB9XNlB
bMamY+P0#"jee55M(8hc5YpEh0[jMjr'1l@0NHf4,0Z[)2XRaMac[b@dMfmXN[*2
XCd8if@3IZAeq*pPNX%eb2,,*lI-*Ed!fZAf%5fk2b'ebfb-,"6Um31Z!qdd)RjL
p")$F*L018-!lFTZ5@fh!"PkMR+H0FQ5$(&P[4UpVN!#8RjX0XXmh"jEA1dMV+(I
hZ[KQ&rpkl6UrZ@3IfB2XM2GfpZNYAYSJ[5CjkD*GTVqFPbkkR'G'&R+,!&J!!EF
q`2V5Yl2@Nllapr[5iVFFqB8XE1XY!$[mHBlmVL#+kXDB&FCikidhp,$a,SDYFK)
qqlf#Kk[re8E9F,ZI*,8S+9D5D$i-XSk[)q@,'drIc@DPCjD@fSirA++60KhIlCF
hhQ6-MT[i+ar2(,qb($Ap)(Se`kKCEdl`lLhXlGacRmk%ZmGD"0iETp,-6plUbUJ
aarPp8HYS#R&H6NAbI@`Yr,+Bf[3Vqm&&S9m0Nl4[lS8%2%414LARb)UeGjX6j&f
a+[D$RIjXq&,qPI+[6KFEcr[h(eY-Xl"4U[YT'UE2q[IDe'T@kbqRTj'3!'m3rKq
qrP%rQK5EZHImY8m++C)f6cDk`0VLXY&QeYB4,pUZ3bkr3ICkhG,3m1L8r!Dp88p
h`8HY"-aXl3`+D!b3!$SRf++TC[b"M6!Q0ZCdf516jX6Fp`+,4C&,F*k-Xcl[MBJ
j(pIp1&A'[9B4Tm5qcX#U[[@f@5,EF*l%Z*M9ZCa&!,CTQpbY0a%Ai&Ah**!!D3I
X1LmIN!$9K4,Q)#m0eSN#BQ6a@eRQic`a,i-(m1riG&#GXPr"m%Y9afqa-#qrZVS
LkPaJ35B0KK@2hQD,P[ll+mVJ,+J$p1[(KLY*1&0EH"EfQiQ+Y(c896(C03Ik59R
kPX0N0Lb1[%CFLYpbI#XUPH'm!q+EKbqF$(E@UL5j'mBU*A5h8)*8dYT23$GGLAQ
&Xm`G+pE4'$rEH*1+Q`amA#rQT#l9L*`Mm1-lXeGY@)S"`jpRRiVY9h$k*#TLEXI
C9lD2X&I&pL$15U92cMjQ4VchN!!ML@d4,J0NUmGPS'aEZ`6#@m"PX'b[83fa[4Q
A)E*p!*HKXRd@Pf'bI3ZAi@TiDMT#0U"mT'bJhLMCcX&PY'aE#2YL!lder#[E,EL
-NqeYZ&"2E04J['arM8Z9E0r"CB+eaGK,%fA$Kal%4Kp-PZd-A+E)GJNZ8f@l'KI
GfFTf-bk#TV'[i6*G0QS`3cCU-&1fKh#CC@fkc@I,4NfVC3-$jXK@KmYFf6EK-Nq
fRa0@B(X$,[31YMr$CB&XIiA,3YNH`)AD!LNN[PJfmPiL'l'@b[C#A'TNJe`[Nqf
PZ-#8X2dQ,V!YE,IL!Y[#pQN#UGMq(TG6VDdAX@H&E26RDE+4$aL+E6dZe"`EP(f
PE$IKXNUfhm2PG0RHK`YpLZec`NaXhmEP,'[V68amJ@cdr0Qb89q`$YYDA-!FE14
pVQbrLXYUfIi%&rS#'c9H)a[B4RbJ'&aH*aZi3$fa89pB*VD0T!eLH`NZ#'cBIKZ
A#f5MRf#cf$k$biYNSkiA@9YIi[[&XP&A-!SEr811f-$[5f@l(KF`""XpY&Qf1h!
"Bl(p,5l%a2CGm3kS""aJQfaJeQ@bd@0#mbTUZ("LH`8ZPmY'VPI)"LiL-Q,l#Li
Lh&3mJFXZDkXN*SNk9NRF8BaIfqL0Uf5l"THpXS&r)Zp8XQq%qe@bEm"UE!rM3Nc
ep51(DC)0[)EAB!06i"IBk)%AbrBbA-"EE'!Hr![EKh$j"GQqLJZpV$j0UDk6$Ai
LHNGrBL,iLBeq*LpXe1[PXX'Vk&0Xlm5&2X)'PYmJ'aM`5QXE3!aiP@c`Neq5$Eb
j86Ek&[c%4Jj`&Qc`a9I,pJPFIPQfEq)#Ve6I3')R')L0[UFqf-"6q"Ffq[beXT(
Ekf6lBeaq6EDlF2PefIi"PpGEfb$L*If,$8kP04GPJa[mKQaJ$Af(MCVqPQc[`!A
-a2BTA(j(0RMHleVEB(*Dm!FE[IllXX%CrN!fm1X2CD1ArNLfYq,b*YNqMJ[m$KY
m'XkV[Z2))pmL'eb4RX)'cb%q0[!AISS0[(LlE05D'Q)$YqJAE*r(KGl("Pq%GkK
[#([a6f@M9piP'a`*hSF0A#%AE'$FZf@M9pmM'hQq9lD2iR+EE("%q*6kKT+M[em
fq2$YXS&KB$Jf1-B(C3-h`80Xi-@IbdEG2bcEah#"Df#$&pjTEF1SLIb&E'!rfJ8
fq#Ve`3E[qN[Ci!2NJJfm!9Z`N5YpLJdI-!hE0h$jT'`SH'#&qSD6Ji+Vf1#pF$T
Xm,HlCB0Mh#-EGB96B!-,d$H`88Hi*cBi$If,$BAb#pBfJ[`*(3!E(2k,XX%Y[b3
ER1G[C!2R[L`E1(+[E23'(!dE2Z5,l4&FlV1fNG4Pi#2Bd"5q*KZmpqpN!e1r,KZ
FK(l%"VE5,pMSqIYPSkEJ!lC(F3%$e6H+1JjiMJfGiKpPSiIJ%GM!)6Jb0V$qRf3
$[q!bf1J0X!iEII22eMDD'K"iMJeG!ak($Flm,l,"hrj90ZS(Em8'lRa20QT+MkK
[$2@2lmX'4kHHf1J2FRF9I%Vp'!4eY'TNV&LTP)UP$j3fE1J62*Y2+b9D&e)AZDr
hV[11,iKrkUqS6D[21d[5NG2PJmK#B!&X##YJ#Y'&"%&8)DJ3CFJ$""9L#L%&R'J
XL#H%%c#"B%)X)C3353JNa"&#$@Q%,%)5)35!'5!'H!&D%$d)(X!$kB,834BK+T!
!1XJF)!LC"+J!@-!HF)A33H4!#)JEK!fL"N'$Q!(1J"KN$")'qB*d!AU3!&#)&X3
%F!EJ)&L3!!I)%b)+a!E4"$%'iS%)J9L#5)*BJaJ$F!1ZN!!la""!#2%$%S[BJFL
"Z!'"3-a!a%#m304"Z%"X3+L!9%--)!33!3J!j!a5"SK$b#"L%$`)(%3-!JEaJJ!
#qK!85"e!$JQ$I%'k)#D3!#`)"+3+-J@*JK"!S#"*%#D)%J3*iJJjJK4"EL!,N!!
Lb""N!$%D%4VL)B+e&UX4S#'R#$U)fT!!9J4H4%d8(m34a!B)&`)[C"ea"Z%G-6f
BDN(i3)K([%HiKS`L9#0')qBK5%1m%483e"&h)2f)'*!!583XL"l#1m3)m4E#M,!
,%8-34YL&f#*d`JS3M"(8%&`4EK&X)I63$J3,4"H%)`4%4!8%9d3aa"*)+q)UJKr
L$f3*84X4&2%6`SIBLBJ+@8IX415%U#'b3R34m"!e%5N3-4%[%5d4%K"*%#F4*4%
M%H!3(a'[%'-KV!Je#)`L,,CrD[bNUY3(LKAThcSf9#`9Kf[6LCmXQSPQED%ieSV
M#*0aQkCafaJZe,+q`2MeHK6`[LZY6Fh8kQ&+ipjD0XHl'KlEbbLEdp"2!VTXEXh
-K-P8,B*Y5a!e'Rkc5Y0f[qfdZjP'pC!!aTdq-pZ#C(B%IRdU#@GVF$CZqaEM%2H
YY34$P(lXKL4TmNiGI!pMm@0Ukjk)*GT@MrbXlBCYBm22jUCQkkf3!!fJ[&4G0p@
CiFlT0%YUc9QD'KVfYR'Qe3bBamjD'YK8pb$qr*Q86RX`$EUah4PTSjrZ(L5cE`D
'Ue)dNVV[Y6h3'2K0ZMA@CTYqR3D6YQr`de5fI9%pMiIPkMc3rM4XlS*KAkh"LZQ
Ve(C,-k[,TJBE6FQ[EYE5V0SeAYXfT80IRD902mqRTJ--e8#%#-kUS3Da!$SHfF6
LlQi@,`VVX5P[Yr4FHbVMDKpP[6+hVJQ[-,L[5"YQXM3b12K8$UX($TTVbS[&3cR
AlqJk4$V$8Q+[JA9G8(mkC-iT-MBd-M'*FZVlkI9SfUqc@l@j2Qbf1XE9l0#'T'h
H8'Y@Sphd6UHdD12&IA%bIc"hI+imP,PbXIf#ZEkbrD$CG)`BT@1`TVX#FddF"lG
fF`Z+V$Y"aE%KU%CMQ-dhiMi@4eG39*5cDmfGB5)(j@`FDPYT&M@+&iH,Zk1NQTV
q)!M6&'AC0jHDF4mcB[Z+Bf'@!C%Dc5!3YDVXah&Z2De9UeH,!`YCiUGQFcMGQTd
0Nk+0'E&&VSdD-@+U0,9Cc8,[XSQXUb$&A@(G$)d@4f,!d)iV%%A,2@TQq[5`QG[
UDLP*aFjTTT!!VL)Qe5hqAHDUIDb4V"6iT(+RfLBVE*QXdUf!b@461eKQ$rUmJ6i
#dGGRY4a#QVVmT5P!qfKmeKD0cdd"1N)a&fhaD8Z6T4*0(6,3e)ErTJlX0`R1ja@
(rHCX#q1kUFDERaH`#K9X52`-[#KbEVHC&K6lUe@`*M8VI@AH6)SfkGE`35rGAe5
ifFRppTP"5c3B-fL*VQ-',G&6c+!P@SNCY%3I-B1@k"jQd",p`JaDSQ1B38Zd#M0
SLBiQJjCD,j0"5kf*bD#PeKYPd&,VJc*SUE8q'E68'Ti-@QV05`BYYHBPJjCD[j*
"5kfTbD#PeJ4&Yr+BX`aDH[5438Z2'T--@RV8P'63dQ-Ib+#P4he)"LdppS%-@RV
8H'63dU-f)i1@(QX[JjBHG8-CY25S%mUJT8Fp8!BY2HUc-QMT8AH938Z2HUS-@RV
86'A3dU2f+B1@(V90'E6df"mbD1P4$j4"5imDR`aDHY3GCG$5Bhr)S'@8Z#"UHC3
p+B1@8ID*$&T'QEm-@NDTVmQJCC3kQ3aD4SN0-QJCTCiPJjC4DPNbD"QPEL@$PP&
LJ`aD4UP$bk"PP*Uc$&T'U42,S'@8YCG"bbLe84QdM,,'-QJCT@BXJjC4kXdbD"N
MhXQJCB`i)S1@HZK9"LeMV+--@ZUK9aQdM&'rNd(,'(YG"Lhe!+`-@XDSqmUJCBa
kZ`aDaULAbk"PM&Uf$&V'U%R,S+8HM*9"baMeA4QdM&'6P8(,1(&C"LhMa$JCY)`
68f638Jr-bU"PR$dJJjCajLb$PR&UM6*S'DIQ,B1@HT!!9JBYip5XCG!bcPN"'E5
-8rqA3FXi0A`CY)a6KjG"bcMV+S1@FIDS$&V'U6r,S'@F@V`-@XCCBaQd6,$'-QL
Ck!eDkZ&F'E4-%$GPd$*"M*0"b`4a4263"2YC"Ld6l$%CY%b`lM*SQ@!YC0!b`9J
bD*NJBjC"b`3eIKQd6,!RK%dRL0NbD*RJ[)3-@LBicb#$PJR1)XLJCB,B,)1@#HV
[-QLCS1B[JjD1JSmDfAN'SbQ6[p'9`3Ek"B`&pqNMX!Zm"'rdTJf+T8kMei-cF%#
i(hKMp'hi(cd,pi2c`E[J%dB(Kq24er!8--YUpr3h2!jX-rSiq![rJ,1"L@!Nq!a
f``2!9E!!EQIR&35V08l$8m"SX"eq!Dm$Tq%JCSl"k2$dU0ALi5pJQCe,J0q!DI!
'X!AmcFm2J%efGX(-,B$EF"Xi(0`0EJErJTI"aq"K4YX(Pm!Z-!ZX!U2Xh)T`U[E
2AhB4iEkL'-iicJ41YDH(j4D4e6MliUc!@BQc(mlq1!IJ()Kc%-l"1)IJ()U6kF6
K1%IJ()Pc&-l41-IJ()Yc(%jfrBc(@B9c!Xk*1#IKR)ac#XkT1%r!13hRG*`cF-l
%13[RE*c911IJR)YcARX&L$SAi&b)Fa(1a6LAi&b+X`ER-T`Ri6`jAh1L0K)j!&!
c#Z`c5SB,i%XZ+0(V-IJ8LJlFiZrbYBqRqSUDq%EUZh#S8Yc5[ieB`L+5`0eS+$p
D0*,1)C11UNTQC8IV,KC64qAf61PdiEfh)Eq@G&Sq)rS)(RDdNp'UG1Q-J(5SkId
Sh)bBGH66Uk8F!2ZPMJ'96iY%)P$Irr4$!JZRfXBZ8KmEBIJF$&AfHPQhlTf4E6j
al@@6R6dTpjLQH+&#92Va116Bbm8"LRUl1&$R2Li1p,U[L`0k9EJi824+&`FDhmr
&J46eGh'Jr`0F(#5#J5i1G'H3!)X$qJefFC!!)BjcF@!N3e`FC)bK,Jibah!A"aP
NK)Z$9$,5a8%q'HAL)+1-GR'3!&V'Z$M)-@0G(#5EF5i1dXha,JkbcRJA"qQRbX9
"rTRJiL!46A4aN!#4*VNi5%b6A4`NU#NZ$R,89"F(bHS%&`GCDjU,Jr3ehF9"(T[
KiL#GcA4aY,cfH"cNb0NZ$T*HYBZ$T$I(a8(bQq[L)!XZIc&1+U![(ClUiL$cVR"
aN!"H6h0aN!#$DedFT0MY,Jj5l3iA"bRfFKF('IF+&`Fjp8SA"qPiTiZ$P,l,a8'
@hZhLk"e3MmG"bVr+a8&#hq[L)'mh[K%R'8qjf`@I6X8ik(YX2%h*arii`0Rl6l[
qYU@Pal3Vc0(fV3)S",K`c[j65Y"LVY*SU+2Y3qY(eqEHCrmCDkjD@[V$-e-d6br
PGD"p(FZjQFN`)j&QhC%GJ65MMhENdB`lSXm()iafc9*j,C)C,63MKHLCD*ASN!"
fV"$G$dd2[3iY,PLAC0FNQI9)4cm'$Pd!!hPZ%0"`%!c#pF8BHqYqQ2rih!-MACP
F@YEefAC`"hbTDF"NEV*m`HRcZ4kQ'U@0A3K,l2pciEk&,@X$eYA*&SdB6Q"H6G(
U0GqpFIE"f4GR"Fj+R2e`pXFj!1G!R)0`$XBj&1F`R-0aMX!j%ZFSR+0aMX%j&ZF
iR-IM()qc#ZF%R"0a6X)j'HF8R&0aRS"c'XlT1'IJR)Pc&XlC1+YacX%j&qFmR20
a,X#j%1FLR)Ya,X'j&'F0cQ8i6m*j-Xj6mMFKQ28[lTN[LQPFmaB%jmXhG&eTC22
!ZZ+kcIhMrELZ(LU0Di10+q9caLJIMl%VPm!ki(5lTC8)*d8I*NIXDcBP@%A)hVk
NadUXHY[pP-1UU*Rec29$PE(1ZVZFQlrS6RENjAc0jVZdfpl5TA&m@I%jPpEma$1
jP5lYZQQf&K4,IPc-Yd+N&[2P3jJpKDfZa3S&"FdX&8bjXCJLRd8YYJMQ-P",)0G
`&f&cTDlGH0jceFHVZA)iY@3V(QC[BXSaf-5BmXcXC%aMJpfrQ(*VAR'BG@dZNee
lQ+j'GRpMi0MDjV)b-9eTIl9PD`lLfCU%h3#Cp5U8e1kfc$La(c,RdG+,GQGNbLf
c26,PYMCU*8%ijXq%5+9KjR!,Y93Yf*kCKZc-(Nf$#0VVE'aUcD!IqcTpQ5XSNiB
cTAhYJIb9mcU[I(#&DJZf@1FX[&M2jJTDjf`4-kjCC,+HQ8i*(,-Y(RLE,JrmNQf
G+AJ1[PTm8q#6m483XcjC0Q%p-ahBl0K@Q,EfE1ebkpi-T+h1lHA-`'RJ@'`h#kU
"RmE9CUGmUE2SDMfc!'Xp!pjPI628+h$-PmX5X0`5i@C%$2`cS"Ji"lJBq'HK-I$
1S'2JE!%bljYTfR`!DB5mki&Hb)*PZhX5B*VGIFJ-h$+S'6KEi'ccl5L9JFr!V`9
"J`J"L"Em$j6C3QRHYl-adi#DG`96fr`+AC!!3GE!131ZJA-1A`0h#l&jhd)0-dT
(ENY8#rF-!Q6jCq$Gc%'$!$NH'VKRZ@MJRH'MHHFX5FT(5'h@E[%Y0N@1RlElTdK
GXlr`e-![be8$l`aIEA-q8,!NE`dF@lPV%++C[aB#&-ZGiE&jjkifc5j!Er(9R,E
0XD-GXY`fm-lbfm!li,L"IiERjTdl5PQ!BGPG(`+a#G%"aFDr"-BQa!%i0J%k!0R
i&b$CZRGdZih4dL6@1fb6!p#FMC!!4kYNK'Ci0TiG!'hm#a#GF5m9Va@QM@XR8*X
J*DM1K3M,Ai"VkejZiAE)YYijd-ki&KZN!lL0I`Gd'rmLH*X)"ILflXA#&L'm'lj
$k1k'l8l)$Z'k"09PQ#j#G!QHZk#j#jEE)6Q%ia)8Kc"FJ1!Hq1f'hQlB,8&Z'@k
,8&Z!f4,%K[!D3QXAV*BJY3LR(9$D,8Q&JP5h(08T4S959%Q)+XY344'U*%&e#9"
GmP1lq"4+6bAK+C5G#U*6Mq68,6KebddPXDNX04@&TS,-9"+C3SNT&*Lkj+@5Z&5
8PNV#%Ul"Zcm#2%`qp+-eTC8,3@LIUp&1'%UjDGUDcmdJIjJEqHGIfC%,dI,SMPb
!p"XmFTjY6r,)9DQl!S6SV!!"fLZ!ClN#QGjGdfVbm5&jqY$mA*!!9J!Vak!I`aL
CAQqYK9%&bMQ8Df'``BAa"")(aCCk9PK3PiiPMfBCU5a4keLLEH1%5l4YR(#*YSd
6,Y'fFF)PfMC1Z%6EaJQAD0Xii4*Y'bGFSQhMK%ZdECa`LED0%bl4YR(#*GSf6VK
%fmB*PfME11%5E4XRA)jYii6,X@fFF$QfM4-ZalCa`ZAB0Nki(0['#CGMfcMKFQ`
E*eb1EH1%bl&YR(!jYSd6,XHfFF,Pf$C1Z"cEaJQABpXiiA*X'bGFMQhMK-ZaECa
`1ED0%bl(YR(#jGJf6VJFfmB*Pf2E11&bE"XRA)jYii6,X@fFJmZa9Cb$bl&9R)2
,X9@FJmZa9Cb$bl&9(*Eap5c(9R&Bf0Hc(&[&BDPIch*X&BI&Ich,X98FPJ2f,-G
@F9JJf,-F@m9Kb@$2FQ`9Kd@%2FZa94b@&IBXaeCa@(VGXaaEa@(TGFpbE,d1bj@
j(2Y3(+9L0@pM+LH9qj*Epp3$KmprjVh1chf2EC8d$bR@RcbfmIR2$I)mP#)4q@p
2Cd"09Q+69ba[Vdh2[ah'0I1CPp4`$Lb('AD&053ldb,(TY3lL06MVqVZ-9Fp9$4
l(MaV,CrC1,D`bj`b9khc+89hMSf2RSPHqh4jB1Z%'YZcr4HpiDrY"elG8lMKLB2
l8U2A,qRa8Dk$VlfQlT*2[cCC[9"D4Y[NlB8eHK@i(QaC'iG"EDB@k!PFcTb24ba
jGJHhQL2T"CZhh%i$Z8JqU)j)(!QqmEZQac,@CRLFikDNfRi+TIm84YFCBU6aJ'A
2#JrD1"J$L+iH$ZEX`!1p5ED)"qU4T0IJVZC)MBIc$!q8-TER"cj6h"%ZBpEr(AL
Jq)(S"aNm8&ER'5%Si)'HA-!B'adCdB-Er5pfiHK%@c6h6MVmf&ie!,KUD(J!J6h
GSlV(G)rVRY#pPqkpGHqMHerG+h5[e,fIl[ee(k$l30d(k6jBpa0e(k,l80dAk$j
-pq'kMp"pT1kMG"qYqaMGaqSq6[IMG4q[HjAZ%h5IU2XNh5IV2NAhUEUIS2Y#h4I
T[PMh*ES[eEe'pf@kRk6lbEUIdQ[Ak)N((d1FDVjTZNrAIBEZ-h@ITI[XAM+aeFe
`Grl'A'8dh9bYqacGjqSq6hGj8UFUaE4blq%IKFpGmr)'2JEjeqKpH'[9+HXdbV9
H$a%i6mpEhD#*Q22eP-),j(H4lKI,reVG,e%H'jAATBUc5APYeRf,iQa9h2fk0mK
[Qjl,HPRRi5,fGAXZPLFMr#b"-!QQQ%6cikHGUerZSH)ZPXm*0rfT[kJjL8XXXNp
MchfMlBU+Sap[!ei4ahTHmY%mkX[$HTjdmFZpeElYUkm-kpR5ar,B80+cU)r@GFh
Bk)XC2T2(ZS(*mElT141Nk9q-pf69V2Q*RJfY[X5lFP[QmIVbH9H2j"TAp-$2QBD
IKc`qZZ2,[(Zrm2PjG'e(H6U2VS)mR8HAN!$kSc`k%hNUMiB&QiH4YEd,pYl6IU0
Bc0Z$Kb'rFXY2MIIik4IXrF)*hYl#3l"rZah2bppVU20SIT(G-r9JX%,RdDdcTal
XAbbXRiIDm1`)b'2,dFU@kmVH'j0(L%42jE(AX!rAl[Y"hSmAE,c2'hplCeQ3!,F
$HiNMhPC[krkk9lk(Mh51`2rI%HG1-qlGreiqjpc2Sp(-[BV6rZlM5!l8bHab1(e
qDH3BMb('UYHCc0BSd*1mrrHM)([6j(A@F#L2aVRkX9HkU8h52IbX-@XY%j!!"em
eQZ5RG@933"Kh8AjeIc$Z!jVD6aKh-3pR!1-qGp1@BfqJUkpX2eB2a`Gc,bQJ2fE
Z2ANFCZipH4aQlSrPFBLjPr23c2f4Dh%Uc)lGJYfC2R2A%l!qFhrKTh[-I5hXbIH
9rKGc,p6M1HCH,1`cc,fFaf(QANMM@HCHcL2(h*HIr'rQ[RcYdmbpBGBF`HN)%Y(
20QKMl[IQ11hmB0b,0[,CpDhI6aMhJ6ci(!'-@cd&iF4cLVeh(H5qrQmbT[-hFQ9
X%I'HC%`pH4aQ1SrPFBMTP22BBk+JI[0eTR$hHR2bp,IJYY(E$IZ`dfk'lISZ)e#
0TKa@M3$aQQlq8Hjrq6HqhXe$-3Y(3"k(Q8@KVXmbLh)Hh5#XmY"2NJKMq(NdT'E
$KTHC"8NdT!*2C3I1!J8JLCbP2#b&`jc0ipl,fd1YjGGbTK8E[f%lN!"mpr6mUhQ
F1cer,)r+R&+9TKB(j0VCQ[HIj&fppCA+YhkfmNRYc!Q3!%GY28e0Am!(hah)3c@
L(ZB099kYH6N"kU'e+LG!(NDV#[0i5U[DRMAUjK9'S&El[q*p&iN"$0eabb&'F$X
ATIYjA-iZ+YEML6i6M@"(I+4Id3L+h0l2JdRd#!IfMr@peJLF!2fU03)R3"iDb6@
F4IjE9jd(q`b1p8IImNZ$Dr)G9aUH'!-CDTKjUr+mUe'Vi*!!UP)HHI@k'FP4`Cd
!H@Me@V9Lij%m![8kca9&qqM+)kHZ&I0360S4N!#(SUk1J$bZ6)r@3fhZcVl&-CY
(NYXV,FB98!qPaEJ"mP"`&ZC4aV08(NSM1**(8RAHEY,ri'Zb(RX-aCL`2c+Umi(
q3'0b"15K0+BMrCV6Q&`!HHa,cIrkV,,h"-kfJ"9L"!pj"rEpaK6ZQM3R2ha9ah[
iTqik@$'b8ABZhS&VmRQDk2qG5YkHBJ51J$`8)h!%j+'3!0`9N!$(RQ8#kVVGa2&
EHD6Q2K45(FNMKe62jm&AlEq'(bZIQNL8A&*jE(k`NmIZj3$bU1`pP+N0mAVRUQ(
p!hHZq-V8"EN+0ID$I'D'riepj1@(#DKiZP$aJFQXSaSk!I,3+Td6)!qMdS9jj&@
k9"jRFNZ58F8kki%U9Ub(RiG@SC`!GG@6+XIbi$j`G-k2dkLkq")I'QQ4iHlcP`Y
!"KG!(NN9UT4(IQY"d)P*&HVrmN#AGJ,8e8Fm&d!H"[%8LAN+m5KY'q*Y`F4,U4l
jDI(f2"5MFJ6NS6L`)b!2aB&G!ARX@5DJVXa3(N2b**Fq8Sm-Pck54ij,Z`$bf*Z
VBTh-5kd*d%$Gf@H0Vq8Kf`Bkmp$E"Y5S8jK(IYY!N!#(RQZJmBrK[@D86S!m0+2
d'lEB(keE!S+kkYP(*d!HI&UG29*A*VM1LCS[D"lQmmVPbM)!'q$dI%4jUpbBjGr
f'S4IAS8+2KI6AS1MRf0TVm'Hq1JZJA*GdeT$jjGAHG[kJrd)aci(b(k%!S!mZaq
KY+25$E!IS6`H)I-46S!1FJF`GdF&-h8#)+GE!DQHq-V,)4dJQSl$C6YNq$N)Y"K
hd(E))jpMD6[N8eT-Hb)Z!LfQ+iE-IA4qlUdYNq@99j%eEc+idQDI(c1iRM`1-lL
H2!icZ-Ib1-6JbRNmbE`+H6c([)S&HBCjPI-ic,`+D6c,[(VbH**jY5IL+0MP9IU
#A9iGRaZ!%HJmR"+l[-UV[#,[@(j#@k`GZIE)TX)N-[3mc%2["(-#j((@I$,6Kr1
RGB9C1%id5VeEl'KrT(D,(HeAGi#QShH,(F-2*MB[V-A(0*dRkZUHd(6iC%ICmhA
9HA5rZHCJ([lVqhM*6L*r64R[VkKTq-ZG[CqYkdZrYNjHeqE)HhfIbqIG1mi12&!
mAEf#b)(hqMlAff[VNQpk+NhU1Nqrp*ZH1QIV(#EIcek+EhVL08qCckcjGrYm'kI
5c$r+QKd)RfH1-b[H'FI"VGdRK95$3fH#,0IRBUL1Sb&VGmlR"U)!VV4[Q'Ha-[N
f$[q`!+U-,KSmGG2dK*[PFr%b6I8'%h@Z`@Zjq0DDeIPp(Gr1TEleH$F4hhP3rrJ
f#'(hkAkelYIShU6lqHE%r(k"p1!,jIFLh5p5[KI,ISRbhDMm,e@qQj6rCYfhQ*A
jID[L0LMZ0R0mIVpXfBCmqBK!9$,&Lib)6N5b*')&cNUFG%GrR!0`$X6*k-9JR-I
K()*c+$Y8RF0aMX!j%ZFSpHSBR'0aMX0j2-la1*Q4Q)"c)Xj*1#IMR)*c+Xi6F%l
$14hR$*c-RV&(IME1DTacF,)eGal1q6K2a-RqVB8iQ@GDM(-*cU8iH8V9XQ8#m#H
+35eBZa1'Z3pG9aVC2,#ZZ'jcrhJrVUZ(5Z0X@RI+GqE`!$"JpS@M%qhC[GMUCVK
lE'KNBK,'a+!08+hl(0hRkMj2prN!h5YSkleRF1qU2GZ)UHVVE9EG-(mJ(-6+mmD
cmqARq$YSP!)AMq,SZZX(PbX'11-dq,-aRMc@00,Xm"4ilmXSIbUrh+Mkd2XTQbU
rABImiPr%C4VmGKcb'iPiIC4Il)pG[bVip9*qeQmUr+,+crTje%Ela3PHQ6(ShZr
33Ic331GD[iZS`IU+F-6Mkb21XRjc(iA09jBMhTfip,&qLajJiF6[2ELXXhi,"f$
cPHC)J9V`)ZZhrpZ`q8TcT-"ap@VVGaheAepaMK6B&j,IlG5(IH8k8YM9pG[f#'b
q-KdTI))em2e@E)@0I2&l@GI[eXr$KKk0h`fih'Mp9[k52H(laD#MHGGB[f@2`3(
GQR+K2iqfIMHbaihHGLDEfIIc1++1MUfq)6p'(P(e"mXAk6[Di5BflFiX*4kNZF2
XEk)%I4TC[XmLl6F0I4cj4b1V4iImi[Ha"LSH1*(f@rTGq#jSC,1(mH$N2k(QXaT
aLRM@leA3fD0l+m0TKQbSXAjcMFVKFedFX[&14Adpj,H(%rMT["1rlp99X)0[qpp
kG8hjH4rkFbq2G,ci%lfkT[e@8EIrM[SJlCGJ2rYp@AI'Cf$6VdL+Q)rG6TM6IV@
l*Z#Jl(b[fBpHp['[pX18RGpUr9lr3fc[f'lphX!ph@qcIL[3hpiUkrG[(%PrZr*
QhX$[qpVI23bEkPrYapa!KI9lQ'qD!#IaBhr'!1ZhRrMk6ZYh'Yi9jUfdpC[r16M
`4Kl`KMQ%8fbmQiPRB#Cj[,#EalZRB!2$e9H,1RUrYRjh%f08RA8Hh+AHhrmqE2T
Y&@SdiT)1lYCqNPLSF)1[#6R&,GlAhXKh#),Rj%(0I"bY1j0BpPljUEk*6&ZrQPr
"GT[eQr8pA*EB20l(13[Xj2d3-GAhHqfABAZrkNTI5crGF3!fDS8II5Mpp)[FCI)
"kcIcYlKma1BG)criS28l(I-KhUNfA[eRiI!KeH0KBS2[p`lf+(@MIZbhm(P2lCH
f`2CKkhF'qLqU[[NU0q,FSAV3*a1YheIq(lBla31B4j(kED@1$ckVEcVVHi[eHj!
!H5YHS2Q"iSA#UfVc9jam9(j[lZ,CD-krJ2rUZaGB9A'jp9Yq*4`qC[hZac[6"-r
UcQ@Yll*qhlUqLfF['BA$akhI@F!KJfGhF@lQ%qT,pFieU9rG!$(PNkVh&c[p9eI
NA-bRe$I`3-'Kfi$PNCpC[hhrkZ"Cl5q)@A"$mZ0G*$kHe9A)Uqj@(QrUj[%S-I)
Hb`qU`3-%cqSZ)DIkM1V"(K(TbqXCll2#!qD&"-rH4Cb'[kM[eH!4"XqfI481ReI
Hc"hjH&Cl*IR"&kcI5Q+fMfHe)IX$ENKqm!I"X`CL&Ae"hc-I*(Mf&YEb5kSh2%E
kD6jl(Qc%Mle(dNp,b(HrE2fJYB*RY4%Aj-!TS+K[l1"ChEE(i3$R95jc@5r"XeZ
)@h"ck[G!&mrfliEY2KY[1HDN$*lG`6kQ"pAh!XB@2,Z"2Idem9'9YkRI@R#i#2%
@2JI(&6cE5qcmZ[+!hdQIhABME2""PIFCk)1SjHZ4Ma0A[Q(p6X3F@1`FkrGbDJr
hU`rS&4rr)RIXJiekURL,2pV0B`0llN(VYh5aQmH,Z@"(Z1SeV,[NF3XjRZ+rQJI
3SrdDf$'8iT!!I$H4*phDm!r[Nr,1kfHck6`Ueh+RcMH&"kIMiZXF&HZ*3r3QI3!
q[XlkEH+!$ea'TE!#f11YXAlhF3i0EU9F6N2HNPr&TGI"!hi%,b5fj2F!F`"MeAF
cHpV2Vh)P1BrrTJ5[K(k6r#Spe#a#[U0Fk[k1[[&aVYHlUFI3bq!3rH(M3DrEL@F
UMUiVqT2i6DEfmehaEl"+r&lk%GLqCr0EpFpZIJ1i,1F4a@-f6q,923QELU2l!ci
TIYAN*BqUAlQ,hdR%jKr3krm"!*!$#4S!!!%!N!0AHJ!!9RS!!!*kEf`l$3N*CR-
ZF'&b583J25!UC'Pb1`d*#8jKE@9$Eh!50#i`)&0PE'BY4AKdFQ&MG'pbFJ)!N!0
"8&"-2j!%!!""8&"-2j!%)!$rN!3!N"+Xp[d9!*!'@I3*#3d*#5TfEf`J25"QFbj
f8Q9Q6R9Y1`d*#5TNDA)J25"QFbj`BA**4$X0#3P1B@eP3fp`H5KQFbjZB@eP,'j
KE@8T1`d*#3d*#5ThBA0'EfaNCA*"E'PKFb!p)'Pc4QpXC'9b1`d*#3d*#A*PG(9
bEL"bCA0eE(3l$3Pp$3N0#5Th!!!#L%&%3e)$!!-S$9d,iCE!0Qd2b6Z[IH9Ehp5
Ue9CEkEAkC*9FPqJ9+UeD(CpNDpA*@5)i3-Q)R'5k55HY1-"hcYF,r!1f#E,M5[U
MC@C+a!jlH+aC@B3V[%icXLX@fR,DNr0`SMITBMNC8cDC6Z*'D,'pk"KZJpfp@@Y
N0fce%Me#6X-#1je1j30JAcZ3!!lQ+MM%ppFL13@,l3`kNiq#Xra)29V1aZ2p8$e
-6X$$l9JkMKI#GRp!ljGYH)IYT+em*paYXfN1h`AcrADp66EM8cD0CR)dR2%&qSc
-`1RqK$iT8r%HQd[cZ"kHY4l823UZ0RLjRL2VFBIRp%(CJ[IC4YV%pd*IreFIPcl
iY(@PE[`Sl'hl8'rq(IEcAE4D$X)KIUZ@bRMmhLE5"2iFIVC40*TrJM&HU6r)*&a
MlDNGr`LGr#[p@MVJ5&qYUk3cVV@a0)lA34GE5X[i1hM(rpDrj$emhrr6A[)FrQm
Id,[m$hcUYIUPI),If"+DaGp#2rZB2Z-'k1NVp3[TL1IC#r3+A`5[qX9kSEb-Jra
'[88'i`hf%Ah)em-)[dU[PQ&iV8fKSA`Gh'3$D6KI!rhpCLf6!ILDAk+AbZYiZEe
*Er%9F,kp5-rcZI#5Ak#Ab4Y4q[3RrF'2`GYqT6iN[q#[rV!q)VmK'T-`3"4Cj"V
@eLC8PNBMkcLAbb96p2B`aCDaP&9&U@-[5hXk6QI5UA49HN(DD[*0fCDk4QmZA"b
hC9*QKDeY8Bq9e54!3"2#XdXQSE`ZSEJ`S5P3&#J)Y)Ab`R#S$SIkd&B5D'e1lV3
f*HZ5PSJk56D-!bP*#TP!2[bb3,EL8QK,"6+"jSS2"5`IY[4X3MD3!)N6iRa#69)
'!*!$,d&%3e)$!!"@$8X$RHJ'ApX&YA!,!-!YrkSA!!$3@iYDH!'Kj[m$@)8Habq
AC[SF!*!'*lp"4%05!`!rmJp9$AC'!4!aiqGMIjYcMV()-TE9'U0IM"@MlZFhK%X
0M$Q(cV&kM"'6f&`D[K#b%A#b!`R2br85Na)aK#$0iD9FNLE'pSA*#4a,Z66Aaq2
4A%Sje-FeP%XTKkD%BiLe3#RJ!((Ipr[[lr[QCJkplE[hrI`('k5R+%%3*%%52*%
"I!+Dpk1@k$81XCK2KMmBkh)ImdEZFT0$AjL%ESQ#Q[A"f+5lUd1X8%03`%TJXZ0
G8#P3K%U%iPa9heDKjeeZFCT8f%RNL[a%6Xl(Kq@H#NEkblD+H`kJd#!9&R6m19E
#N!"@#`8L1LLBQkT*bA,EbTI8INfUkU#1afYrX(Z[U%d8m(MZKZ%5'MEBDhm3C0i
JK)p5BU8akQ"S@![63Pml6kiTHVpAihr2j32Lf+fkG@ZlZ2qbbrfRcfYiFSC,bG5
Y8d[GbakZ`C*!PqQbISC,9cUh[kq,Qp3XJ@&0&dqqhqhq(hIamEjq6RGIeV6GIBq
pj1,qPhCcdd[G20RajrS$`9R3X$UYkqliY"IALYEQ6KjA1h*[iHHed5N0*R[[V!i
NhcQ&U81EjPqfE9TdZ9HB2YR2ihfK63fRECZq21eb,hd!JqT8iV&%8@1[1[8Q"(U
mB&C#-Z4L!dNfeDUT$R9UF**EDh0$am8D%VjcI3Bl(HC)AEh(&bT[R-U`MaT@Jph
SYKeETNk06r)iPN6GqD*Sf))1(1bLli`H9iDUf$lE2P[YrafP#h@UQh(Y)eAQU!L
"dYE4-rA'5f-6,@jF-Qe%FM+L3VJ20NjCD2[LY!M#e4HMHX0pp*'1e"CVaQ'`l%a
NBCU5(l-J1fM"hCpL`8$3JXIql3+aM&$4Hci))BmbK)3b8IXe[G)kX8DXmGE#9&M
+5leI#B-maQ2H"K3Xh1,p5L*fe2eSD8VFMHJJ,'U-N9kHY$IM&A@14GXKc1b`Hlk
a#dE#'"h5B*,%,2(+4)Bb"DC5Ha+[)UFl$+3fh58MPq2TKVX`,*Ffh(9Z5fmH6'*
kV36NJGU[XHe(eBR)*"IjkhBV*CH*BS&Sc6Z#@4$*j$*aR`5JE-J6C6Ipj21m0$X
JhJ(&3pi1JdT0KrXQ%UFk2KPJ`VB,"cZ,'"TZmZ(lPR9cGr$a4m0KCXk*TNYKFSp
YHhhhRQ0,4l28MU&5Yd'*'I5aqTrc4RhL6FjhV[TCfdHr%IGq0&dXBm`2Mikc4%,
+@0*N,QQb[)%-qeJ+-%*D`qVDc`fVFC523&LG+9bj#Y#X0$9Ui43UG*CT1*UeZ$-
F$A'rYYPZ6BHdUY$*Y4Tq)8-aGJ&aY'VER[)M13EffUT"Na`H$cDX3T@*GS,X08Z
"CB0,'qRUekSEZVA*YMhDbLkheN3,(9Yc&$4Q-14,NpdlLXR5TB0q3RQIrN+'IDR
`b5[G0QfPm0'CPb*#")P`%e"+4ZV'kRakDTVYa6dZ0+%Prkm&#-&!I"N-DG'NMce
bMIHiTM)8,Si3q[-$J5YPmE@i8MYGLDH6Jc$mLKi'SNEij!B')[YiVD9UbRj-DG0
1[I'i'*K'!T*0Y$1`(BE&`Z(N'&8F"N6`Z(-S%G,''V#KcX`0"D*)KeKq*2GM*E+
K9rK`Q(+8`"Df2d,Ej0`Af*!!0%-d""9Lh'Vi%L%'#LqX9cXFhmY4*SpAS4&M)`E
+)JL)i2AD"&H4I)(XkdYI1mk(IPL!6"35#,a@i(MZe8,H"d,$!8*94Z-S*BVF#+$
U[H0)p#,f2X1rJ$J5[Le6M#a%jGIcYS$XYr,iXcbdKC(G3Q$fUGmKST5B)N(k2K)
L(V39,*!!!15+8"J+5V)4'G%bL'$'UYdM6b%m8d5NaGX18lL%KTpj[R"peE$L++d
DlUXDpMRmUH(c!4,V(899``%5BijNeA#!4"5Ek8#QP,C5hSp-d"F@e2PQ3jiX'qD
,qILjGK$!Liqdl4Ah)l"e`f'%dRF5Ri@14)kbKYZ6L9))T%24-2H,C441`DF(`TL
d-03V[S2N*jXYf4TBBMN+BHf'I'!b,*l%0$(mH0L56,$k(DU3!0%X,G3*FKi3'3Y
eLhfXH`X4!ZReSrjd*&f+T!hCc,b%e"8,AcdFFXZ($0qUr8TU),,5NA%NbL0eeYP
pif-VZ+Af+erhKBa,h(,6B%rV$#2G(GkR$akADkj4Q'm00Aid1*MPE@CS`#dU)B%
MfRKL9"rjGpSdTkGcXpSrh,rlMcbZ3rM#[Icq1h-I8)cYQeAAX)Z'ep,`RqlrHXB
$1-bMIrd04*+P40V9dqmDI19Qe$XqG&b0fa&98hY#%r*H3eMH!pBbA*JI[-RpFS8
b1T3Rm[kM!mQ%Y5&2VR!f2iY`XlcRi"PZN[FVaKk`$i"Gl8q%j6)NSrj,XhdJBqq
NL3M-`E#mAjV)3arTX,bhkVLF3)"Q&8-0mq8$GM@5ar@bA&L[jXQ(3&"f,lXrZr(
NX(ji[V`A8mRi16V`ZHT#je%f'4HhTG#pThGPRPacLF[,-F@Ke"3e6fSZePkQT*Q
)jMk&N!#XP$c*9`MCd*!!NY(FBc"5`c`)0GZbPa)STi*0K@%EQaHR`18J"F$U,1q
Yj3MD%YV'R(d4&`*2fha'CjJYeSN)I&NDf2,@l5jAeR+@H"9KLbGad1mj6#'p21q
J5clY"[$8i&X!3R0,fekj"JKd!S9(@(+I*hpLKb#T0"ZfJ$8A@EI)qi2-FF0mq33
Y*mEFMk('RY#0'lB!kHb'e835a#CUrkSC*p5Vr@S`UrBd8kSQ*MV!R-X#[jbIa-F
rq)kM35QQJ1l3fGXFE'MQRilk2V6I&$iL03Xrc,ZJ@LN`j25icj!!bJ0NAS6NcUS
ZiRiS'4Ui"85MIXkG-2A'r(-JVXF`e(Kp50pIaZ11q*`5CGjfZVBkYU,V0#P2&!l
f&6Rp!2AbB,,f0!AS@`m%+3FHk9KM`V(bq$K,[19Y8R*mQTRf&l&-h)"AXcJ23h%
44bUHTLc,$!N3mk"dH+9&FD"l+eZLJZdL%TK1PX#%m4QR")BP+pP1[d08aX!XN!#
IcdLUM'3m-9pX##,C(#VijlEGCm@5N!"02#V'S#l24!EH54Rpr$2f2+",#EE3Md)
P3UlImhS-pb&6MR6hT(@f5lHIS!j#*pT%m9"#YpRSp@#k'`"YP%hHb5l9I4$0QTK
!Pj'3!)4e&50"baHc$IHaaF@%Q!k6pbNb,80KjjCZTXUr4U!m9rM-HIU%`m8%a')
N&46J&&Y5)!QUD!Kr`R!bj[@`j8m4HI`$&F@j#9e@dZY*63k`XL&FhA#3!),AR"2
qFB$`q6m4N!#C3B$-C@3`P0`D!%)!d(RqL8)"%!+`DYKfr[QdV["5(SNX-6VXK#k
q)m8!FQMk)-lNPeE394+kTlmPG@)5NcmeVI!aPF%%RjBQRj9"M)H%$fRc#p0C%)$
c,BQfLL-m0j6l[0Y@2HE0mmVN$##+kRMZYPTVED+f"HVPIr&1j+l*A@1`-j%'dir
8*9YIc"0r8Gj)+1%mVkSBVKLTbh)JJdD"L"EaGdi@,RGBAY5A[dX(k-blG8jLmff
AEGC)AH[bK'iVhk![hi@I-P+(b[FDE18l0a6`52QqNESM2Q6hJS!5YF'QM4fZJ!U
Q(LkMB6M$',[e'r6DT-'QM6#Q,'a@5$X'pBf!G!cU*TYVIiGX3pY4+!hjDhm(Yje
EdQHdpRFrq&Yh&TCj62U5%V[TQL9!''Lm#kTIc'(XdQZ0KXAP0EiXTj@TD3R@$&Z
"2&Tlj-dDEM%C(5Di5m#4JlF,kKUIj*b5#--@8ZSTF8MVB&Q!FKTe)V'49$Va"T*
mZ&)B`Z,AKY$KbLk%BEE'S'lD$PH3!-*jZ%bViVU4&p(%D6I$D(!%kZBK8MVAjIV
d!aP1AUT9EFHmEpUd8AkGLQd9@jB3f$L@9SH(3'G+TQN38kmVp1QRD0%l)h9KE'f
XPCC%ER,,PKCR+j3i*hjZN[VVYXN3K*i+Al-J'B9"q4TR`rPEBaLZMj!!NPmjNI'
m!9F*D5ZK*$r8Z!cCl,F1IfiBcE%IcN@f6@iFma`NKG8qr85'diUK%@QSJSEXrQp
L-5ArCkGke%'Gb8)L0E'3!"Jp2%mJ$M-E('YH(Mr4YJ#,#Z11F4L9jlbS"cKj0)f
f%Nh"`SQ-)%+F#1hHFeJ@&"pe+LHFJ-&"-(3Np@)2`NF($KE`E@5@`Bq4b#!,fJl
)K2DeCEl3!GNCTd-rA!Qe,FpY1h`%2hX(3j[3J+[c-29#A!I*r(!%Qh6N-,Nq[8r
$)h8[9!0ajM#4!8Z#d60L-h4V%fKZ-qdH*X4K'hqp8jJ'`KJNi0Ym68JElS5iN!$
2frhNR)1IDA$QmU@,e*!!20#i@*jUI1`X'8`AFpqd%J`U',``Y`4ESXS@Cc-fe8"
Eh6`'iHFc#'0*fHHX'f4UAR-FJr0pa8Kd6bqmH'ZYkMrj"`5YLN$-N!$Q`P%QFe,
('K!fr9Mmkli!S*DhI,h1YqLkkG$K)i1K`h$kDVh'",@i8fhDmFZEK+ba3e)hYic
4J3P#P#1CSa#`X6N#@PT-,(X$aCXI6d2TH0S4AVcaHZh`50hQkHN3LNqKDcU&BA!
NR$IkN!"KS#)XmIADNiD3!&P@M-,'%1UU,a2!CRNL!iX+KR&3Xh"3XdT#EH)RdQ&
jQS*U,#-3P625SH(i)f90@9km,&eMY'R(NB[XNM'Kfak9%'HE`p')F!pY%'XqJTE
%YT'5#H6l"0HX(#!aG46Al-6R!XU5'flbkpSSblJir+j1GY8)3jUl)h9l)aFb)+!
%LE5P6*!!JQ1$XG8BcB)"*KTTKhKAk&cMbcUe$80qChXNbE2XSc$**,P&BMMMp2M
DZH98$-0qER(5F"B+ULpNVT%QK!PhMqj#"LAEKbYIe*YV*$2,Rf2,#!"I[ZR1UH'
%MTrm[Q[BMF+(UedrAf+2NBNk-ClHQRYb%!DpN9I95p6JFFZ`@dQ@VYX-MdKma[E
TcqS0!amY%@ZfVB!4-0mdrj8#8BBE&4PiYYS02TMPmP3-LYc%TNUm3SkPq0JmI'B
)(bCZ8PS0cl!P*M$(l&%-qc'F4+%84T0RZ$r5adf@G&imeQG*pqMAkAN@)pBFlH2
qcF2fj$SL'ShN$iUQ1eH&ckfa2Y-Bh%6rfcBGpcHSprd($2&YVl6aZ+r2p2Y6pGB
qbdEFB8F%aM"R()$2AAF64rId+rQQ''rfjCGUEGfBZKR,G3El4eLZI[TQIRb!ecZ
L1BTck-fEI$hhj'3j-eqibGrLL4F+qRY@IBHh1LcS6VjbNhYB+15+ZQViq)9205[
+,Skm5eZY-QI$eDid1ARah-AIGrhXchB)+ccb`@*bpKc19NCKBPq6d*9p0)cKHDI
Y5GpTZeA4lUlQkUmDBI`RYK)$JZNm0[+NHK`CT"(X2FVHfdqF1irf5E%ppra0&'k
GrkrREk13!1diG`N44Ik*dr'ULX*lrh4,T8,&UDZh8,"N2[Gbi5N8$$BE-9KZRA[
14SAX3T5S`+8r)-iM`pKLKcrb$(m9,X$@b$0)mD*1IipH5FEk)Mqr8)+-S+!4Ka-
LL[HL!@"EKJmI0Y&[5G[lT%eEVhjk&1EjBeX5h`Ul)rVaHVXRSKqXYmI`kS2j86r
H"mGD##HB0Zi!1MK+#@e"LJXERGHDd0&4$V'Mr*I5e5kKX9L3!1e-BJPANM3!Gd3
ZcaD3!)&lKYh@HMZACmhM6Zh[rd10SR-H3qCNPVmSZK@K))BHRLES%5AdL%hb,,"
I&&$4jU'V4Ai@`Bcf#&kP0[pC[3#JV!3$jXd!B(f@k)*XHjbF&VR(Qk'1JfhY6`i
")FY&KLq43h'XhUf2rG#(%)bp'DqNhImMR4,,e5N4iI0Y(3*%ZMM!'3GDU-I*r@@
N%FV*E+!Y%!D1SA!YiR&#Q+N-eV9-rI3&U0EFbKJmZ4q$SARN5D"V"S%63qM*kFr
j@$'pr6%5am#3!"&$aU#KT#-V4e(mMUbhP5D-F6$'Q`a&-"5K)8T++*3%%A%[%2M
6N8BFaMJ3)fQkidcQ2KJ'%cPjKe2-%l82i5$m`pP)LU,K$b9Re%qCZ[!8#@beZFJ
@%F2VkVKp''lT%iPk"$5MGXmmr98%CFqffC1aqRHA+GTBV%HI'djP'aa$5cS,!NC
-I2c"$&,((C`F5N8MM1iJ#!&X(h2(K)#"d+BaM2!j,4D1pkklYhrUhNml5%N8@d)
N&MjqN!$F4ID&5(#T#5BT0a`mcUh5iMJY2KYBA*c1`N+2q!i@@X@&M04TU*1jca+
j$eMJ-SH4+jE)[F-!M!,!p`"B23"l4#)H)q+I6[52p,L#L"XCm4JM(K')`qM8P1K
E!P'SJ'qVIa(q3G`64,ajT2%"ZV4VeBMV8q(D%[Pp),HI!GVN)-f2-k)a!,U,$T3
18MV3#SRiNL$LS(eIGaAa#R)#V!qc`%3F"XCQ'&@XNAbdI@rCeP-@qm!&dE@#13*
R#Sl!05X3EUeSq0"ZI$"MN!!C!mIphN`F[4%+F#-6E(F&ZJ4AGlP%-qk-B$K-Rc@
c0H034U*`r[eI8%`qH6#$`XYJ28)"$&`*$-iVM2f)&0Bi))5[j+2S8S3&0!@Bbc#
8q@#''XPpN!$#e)0mh&qlp1"a!U,f(c6M$K-F%Jii2G)LFQB2XdRQpBdVXF!``1V
T!eK1NmErjYrL%-R&AGc)A"CR"Y$aT,$Yr@GGUcVkHcXHl1I-p0qRdd9QU%Rh-JT
Z9Jp2ZNR*RMMra-ZN[0EQKXG(1kj`YAGS)YqL&2VmpQM-kLkTd#[q@+Dlj2D1jGc
R[fpTYppA#TAL$GfS#V(M-[Im5@"4`T&5[Q2lE$-#E&((TXC5'S!,RU[`6PG(GGq
UACBf&(453EpU&ip"K0aFh8fL9+PBlF+`6qSHN3Sp%Y[6eIF5ffDaHJ$$&k4Z45V
FNYLDUfm5fcUaqJb'mk6ZFe,KGY@89k3T#c"F)R9IP!VCM1@'a(+(QC!!"&0p&Sb
Vj1`GSDDjjh8Nekr$058kV,I#FELRPlS`''[S,Cb"KMiD&*UaEE`MK)XqcJi%(5L
,D')8K(0DQG)-pCRI%04RT4iG1j`80SY')Clb)JTP34aI,T!!K8%BM0lcETYjP[I
lJb%%Q'SDEHBjU*!!mHqDN!"jfRXfmdbB'M#apmE+ii@Gp'(Hllhah['JiH6Cd-B
lbPjdPG%J%X6-L3c@I4(6`-(!dS2"p`'@MKe"039Zl5`X[ZL(%($,&N%FUdjk[mh
#P$RiD2CqQc%P'C-a&EUV!RBk!lD&!6ZEJ2ACc!XZ654XjRRTU#$@E'UKJ[FL#qa
3#"-+qkCUB4#-#kSBIp5%dF3BC`Q$!$P*Nd2GjX,N[XAQKCF+ZQcQcmUAi,@m[!A
(Y!6(Y$5b'+%2MZj%SKI%mbeBBUk$S28@%pd-l9`DA#J-3Ya"SCdVQE4!BJBEXD3
k%k(bkBdZ'%YQNqX!1F`-3!cJbl"a$"bfb4r$K,)%2p-hf-b9j5eil4-@H,m2BLY
C85XJ#aaJSZrLmR5T(Kb@-)b!B"4J93@5Q""`6qf+VZ2QP8$L([0RH'de,m9,-5r
I8'!aQCIJ)f5HMYHRjKDm$TTRSi1E'r'K0mpL(62a'M(2B4h69*YjTF28H(*5MbS
6bC1&h,4"Epkh$8,)*e-EfXb9kb'XRi"c`!Qpql2(),*[-*42aq"m$#ikdFB'NdN
$0k*M550G&SFb#eIEd&EH`P"PQ)4AZLc3BbrE5*i+lLrUlcUqmEUL"V%FDFT5Zij
BK%-e!*N01"cm,$!X0YIKCq&JU(bRpbjHqlcAT9"ChE2Cl2L0`L&54RdAl05TdQB
'MTB0JXa4bQiNk[PZ`[4#KM'$3fa!"rYBik0LR"LkEQkCCMk+c6Y+VM4NmV'6dGF
BaP#A69i$aU4$l0+EMkTC,)-4!&8Lj1ip-ZpDTD8%bJ*cN!#$c%%%L(BXB"5b$*!
!q-h)5X&N3[&V[$dNDdJ-&qF,dbDbP'faN!"X1G8+HrS,GZXCB`mr&32E'M$0IPb
[c!*,6"+I66fpe+@X&&#8"&K5b'-S+#UZS[Uih3U6Cj5-Mb4FQV8NB!SX")+P[Ur
!iKX&FLJDZ*-NJj`&KU0G5,b-U#,6aD1Q%R)D1"G'&B%i-piXJFT[TF9`1NMDNk0
ReFh1P55`eJZ11%H`aDqLZY&Lmi&E-F1@3Gh$6e)6AIY2[R&lM$SGHBdIiN!2T$)
m,F)90F5m854Q)0Pb(0JB(9K#RdCie+YJHC`kiIUE2j!!N8UNf-ATD(8q#[V5jQk
$)H'Y"$N,5)P1H5*PEUN+lMmf8[H,*B)CJE+T41i,#TKUT0!e"50(kM)253I13Kq
EbJD3!06+f04IPl&0XkB-416NCRE#%4JQKZT-r#cVkS#"#N(R,TF8d)i5-SJG$"Q
D,Jc$0(88`D2N)+T@aGr[+TKilYc,fPKA`GP98bm!S9)NR[E"2%8U+Z6&*C,4dU6
Gr'qQLY08mVke)5e$#CQ-`$1!c"GN"ej6mXZ'qk`KqDEli8'Ul"#5E9)K,48+T3)
IY+6!-Ph!346*&-Vbf'%fP8IPPjR4**k18"JrqID&$!6`*C-+NY*T$6EjPPeP6*Q
8c$9eVCKl"FGj,i5CZQSVVM@!+af5c%flYRme`65lp5db"FP*ZP`J'`VC$aR2+Q@
mERCaLh4aK9em3(jCJa!X,[C-eG925B@`9$JM&5b"UeZZXUYEF29kG[91q@8!Ib(
iqNAHl9cIqH1[rim&)h8("ZMkQi`-KHY6drhL-Ph32-T-CCc2&G"YlYbe2(a$B)R
H0YP%@IE"K'4QaV*Y+-VfGPqrIC+51&PM9`'Q4TZ*E$6,RQQbbFJR5G[2GQTEf5Y
653U$'fbb6eX2CJ13!-dQZi"U0VP$fiIAK&BA3$Yf!$kl"J6Rf$YTBZI3`9j82(#
*+j!!*CG4eSJi`iZC`Pf(Mp1Np#V0U8[Y(#0!!@$%&j+(cM!hM*`fU-JlUi*R-J)
B5El1(Yd!JD@m8['MLC@U1U(D+"b!+$YHXd5-I2ajIrd+2SkTGY,%QrI#I(kekR0
R*-aI&(I#F*k%N4a&9VeKjl-VH*Jre)-LUf##*!9,CX"i5L'fIa5BGQ[j3k`i)bF
Fk5epp"*9JQbRJAHT+J008H8fNM`UQ5+,dk4BlF686R+-LT8%9dBCTdT59BN*a,S
l!SUEMK#`jHrKjdJ)4bkHa'Y#2#&Xl%&XLhJDVfla-MTFiN*m1-9jH0d5&`J)-D2
&`hfP-2"(fCDl8S'ICr9LKUr8RSNX0HT-iY9TE`D486LN!h(&q3VX3B3Z6Mr!b@!
Ej#H"9ET1`#!r`V*HGb"4)9-bQFd&jjrUBX'JE"V&G*e-Q5XL8NNZ12"dSH+*YYZ
(+c-8C4R$%Fp4N!#m1H(ZU6@%4&N6NK-!5b0H&`c*-(XhrVL'&35[DmH%jMA3X&C
cbDbG#d*Va1[5iD!CKQQLl[!dAbr#0dQ3!(p"YV#'&Dl-V'P9cm#XKXD9@iaRHmQ
F,B![qi4XCh%(VP38EJpTTqJB!-4*C)immB4@Y`&1qpSa[%jVkhfi$$Zq*,Ij13C
+l4'`,8+Q3M8FV4((N!!")b%GHj38#FU!k&U)$)S$#Kb1$aR)ILXG%V9)jPBLJ*)
0XEhi2lI!H,e0YBRDiBjI03*Gka`ap5pNd%hmK@@qX,J#BLLbh82A#)`H,),!"'F
*XEJ"cLqfT3,*U0D`@$MiJ3a-9@drFl"Eb-*JU"BbEK3C4qNjfrX'!hNpMQ!XB,3
[KcTbE&rJf'UH9*28P)9,!S-(&J!B)@RMFR[!P#iH*4@L+Pb(N!$q50e[@aRk0GZ
Mj'3#B`#3!*-E!k)c*3qNVUcD`kpSG+89bM"6*&G6dM*cfUJqr,RhI2J'Z4M@rKk
Z"(rSkCh+U(+FcI+1qcjdcJjbcMa%$RF`9V$Q3c2*Vb1TQ8Z"369dl-XZrE%[m,0
LJfYMYX'fXG9JUmj"H1N+IMLDT8r`8lmY9$l$e#EZX-GJPDhfYr'R%GVHMm4kEfG
)GU#`-[)BjrFFX%8RG9436*0&%,)3L$!0851@KU0$1R5X!8h,LXXA"@CFe@U,MNS
,4V&J)j))bb%JiKNimY'#"4LiFIN2)hADph`ADF'P#ck!P9FYC%RY)CBCh$39$"a
qDBT'harSF#mP`(b&-D2Ke5jKc+dd$CK,*I)r)PCKdd50!$)H2##!FJDSdCN18G-
A[3+8(+2%X%Qc9ScYZ*d+B@h!SCC2DqS8@-U4)$RbS%cMN!"+)-$KXV+M-+R5X6&
Mm$d(`P``3%&B*b4mKT!!N!$#V&fpD*`QY$%KmiG$f[VfV'q$(&#[UTV)50fK'Yr
G2%r%*[j&LbUC`X'8cjh+`*60T'JI@iiNrdF$'D5XmQ@TTJFErdA$iQ-Vk%#1)6X
Fqa+&,mM4M5&QK+QA%D$,&cf,Mhe"TS)Q6S"@##20$A5e1"9rMb*3'+qAb%@[(Lk
#%8-KEiFEB$-pm!$'A,Kdr3J"Y%-MkABq",!5!![9D!29q1N3I$Gj,%p,46K1)jZ
8'`11iD`jY$*MBBf[%)c9QRBHSkQ%#GK$&)CH+N#9arDAb%@`(P1@![RQ5YN16GK
-V`D"VN-V@D0998NH6IblpMK0kmL%fCK9pFLTFLH%JY@-CS(%Qk6JeTS+[C)VbSp
RBikBriD4A#E`F)US[CiF'[*H,5aN,Z-!6h!#dB`(h'5C'8GJ(`-lBb,h#c)(1U8
VL9pUq%"'X'XY1mL66PBC(qBm90Hh5`fP4(Bq((Zdq+Pfk+K#*BS,m92'R$fd31S
qE`DF+`U%!DT-LF'eE("ZC$kjlSLI1@G&jM1hRqA1*A!5LpKeM(d[@,r,@0Z&!BQ
%L)k$V)-D"Y(1(R4J1!RA"J6aP'E*r+Tp!BBBlKFH+'*1+8NcbE(f'JH)j%Uq#`e
@(6QPS%$KFP59P"F*lL4b$VNDNT-+'BFB'K[46)i+3r,q9Zj,3RL*UNphjQreGh,
D!-Ij2*8pB!3L)j&2EB,6PA)h`HY9"lPel+Tb8jSVZ#Q"6C9!ZTFf`@NP9c6DPT3
,%0XScYmK9b!NPbHfj`L8qceQbUfXQYV*MQjZP6Y5TH$ZJki1iH,Q#MDG4Q#Nbc-
(-B3pK5BLjH4$KPlKD-`,fC+)F'"Q,hdbB$Tp#01S4ArrQS'B&0b0T%@251aAT'R
2#CFeRi%lmPkqNicNJXU(V6R0R+,)l63ARcNS[)e'ZjL#-*,,f0X`3cB2!pA34,m
IP"NX%(6L3VBK!5MPPN0,i3J6F("1`T8QU54lHTAC$Tj#GMP1e345&9LZm3)%!aZ
q4*8!M`HSm0dTMXI)E0%M@0[&a)S'Z!R'hB@FUKG4*LL%+f%Fj[Tc)CJ$a*-(Tm6
E!,d!S#Z8C6AFe`[hNRcQ%RI0EN`4h3+95#*k!@5QiHGa,0iABX&@XB+4U`'C&JU
l%KRRHVJp'C(`Q@Kk(16%50hqDXdiN33j9#Ak,Ki9Jkj62!9Jmd3'Ueba,0KP1RA
9dEP0rNqNR*mGr)0K04T)"R+IHS0,0!i*lV9*5P+J20p4ZJ8AkmT)H"aC`)9(R-$
pSjeIFFfiUaE"fA4)J`F$)I4!4TTkaN*'3d2ML@'pJe8PJ!0-9X#P'C@,9J[*dVr
@898DYS6F38'f+RN#XX,4&5#NT3S3+A-)!l12h-+TfJ-fl*h*l`ceYUjc&b[eQ8E
hBjGG[[km0EjqCj`HL0+!#N#h*JGZV,aaGCqLCPS&"PXV'+b*6S(K,+Y3iG2R*Ep
jr4[6RjMa[eZHMlBE*cmC+PDmhjMZp!pmVUaTAcH+!69qm[0+226KQ`prFVd5MmH
i&%[(@B@5-lePc1'c1Cd&4e#UG$!3MNpNU&NR2rpQb98Z2JQ6qmlYEC*UR2c9k,+
Uelq2PJ5lU,0!'Djj9Rq1UhpAr`l9YTSk"r&3'ULQb(JNU%A[3&L@QVmX5Zch96A
E3*)$DjXfd%!e`C5`6jG9iA)QVd5RSi,H&@lUj9R*AJ6ik[b'39f-*TK*9@8d+pK
NU&3ZjKPX)J`3BUA2aC4kPm2kpq@VpP520YkBe+H0JcT,Ql!-XYfAh%m$8-jRZQr
UbHeX#!ea""e48YQ)B04+"K0P#X,[8'"a8I8`&ZhqSjkj'q#&cj``((r8)+BjQKA
"a)Z@%d!T`N9IN!$aJ-H$8Bl#5E5!+Y$4Bk"'m3%EFL,iU!l(QKk9HjNe*1lj9fm
*VJc"V()#eirBH,fiblCNE8MFEqVI)G+M&S#SR`rT8D89#"ATjj%mDap-@'*P@5i
Yq`V,P!%D1"ICaiEm0LJRZpCDKi[FIhrdJ9Q,aCfME3T9NZ(LSh$#4q8e0'fS'VH
@UdAZCBpQ0a+,RNMX+b%#C`Q3!,0S)&[keN@k88Pq9%hf&)1Y!T@8,dD+bDR5&LH
P,RQS!)NiA4DZ"bj*`(i,9CjVX&"c5j2``af0hkYI3iqb@"&m'&Vr6hmB4-cCZSD
1C(HTb+iDVlTU(0I[")[H+B"d&5,NY$@kHm6P0R%rBpj4aEa$h*AFcGZDEN[jPIr
[E9NX6[XrfjLKi)hTC"[6fA4MKYki-6eXBkaA1#TkAh@)MGdDIXAbDe[65aekqkH
rP2V2MApVr&YL8Vkf$%GfR8fiP`(m)GKkqK2p+l),Qbql%[f6c*hfG,D5a%IbG(C
LGbFEZTaGGr'5[kii$bjh24F&4%QK$!*p*i04a[mCS8cN)KXbjI1cZjh6&@k1NaJ
V9Z#kILSJG,*lEVCa,VUV&9kcLbh&idCD$b"4HP)`S*0a3Lk!)D1!URJqQMfT9cb
M(ErG)qidR-*MTC!!m+jC)BSp[4-h)VeCIPYPbN3ZK(l*+-3U58H%"f&XfN80pa@
Hcrrk'b5dlXH,eBjhIq1*ZIm`p*hre&+hffjF@aVT&d@R(pPk&"ArL`SX$mhhp9r
+(-5@$4E4BlRiF,K%DNa1N!$`dY-pm2NA5)5IQ"IX8ZrJ3f"Ufb1rBc992'*UicX
D%kMY*(hm8Ip6I"VBCmP2qM3CK+)D9#9T"f[D*R&aQ0STN!!DbCXXX2`k$a8G2)P
q((mf*6H6qVljh2V$AQkDiBVdalJ0CLPHTr1EA$[%6VmMXR0arU&Tl+%DpfH[1KB
e#89+TXK)D)q4NC!!YUE(*KHX[kXi09EPDV5)FhYBf#`NP6[a'!Lrm,RU506[Fk&
jKfY53PV@9k,K5RX6GP-9ZfPll&89cYmA'#RlU2S%,S,M2a*Fe4M9ijLD0QQ6me(
T$Jri#mim[cbcrFccm1+UM"0$aQQKM%,KQ4dL5`VQMZVleYhQ(UTbM+lp,![p&3Z
fq@'Q')qdmD+VR"rGA@eC2kYYeLpMI14GHMJ!&YmBeIHi2(Mi#+m-$*d9KQB&KU#
QNI#q6%S`QP-2#VVrJ4m@#`mZN!!BLjXQ'9Kd)cpV#6,h9$F$MAAG4ee[)"*8BEq
+Q$+52dL,NpfScS2PZpMb(rbdbf1"6iHPdHmT)8@UTlHZpbUA[lJQ2AVXrZbAlNC
0E2J)QI5&6&4c,kUk(K!H##"Abh2N#M%LkX8#SEUl`Klq"A6B)hp*kX&J9J`"9RI
*)%mE"GA&('1CX"G)rVdRCU8UUV-+VAh#eU0bPT'bprm%SP2P#50c54MiI#9Pf[e
TUZ`LLEFETb2a+4%$&D@4h5Y23%'-GYR%LZTjAEh9#j%JUG8V0pJfCPF[-LbZIUp
Y6r8R9B)rJYj8A@"T!`(PJf',c%(915"6*i3RBI$+&J3+CY$aerlhVZ0i"*!!6Gb
,kSeiT@2HMdCHp8k-[!S!!!*#!*!$#J#3!h)!N!4#H!T+RFj1ZJ!d6VS!*%*R5(N
!!2rr5'm!"%KA5(J!!5)krpC1Y4!!)'d!E%k3!+Rd)MVrbQF%6V83!%je@Bm[2&T
&8Np#CkQJ*&GCMbmm4%&838*RUD!J9b"3)RJ*##45B!ibf'B+-KTJ!N)C8FRrr,[
*CZkTSkQM@Bm[2%4548a#CkQJ)&HJ*5"3iN!N$@!'-KM9Y4!!8FMrq+QM6R8JAc)
B0"L`@&I*rrT+3QIq6[!Jr#"I-KJd',#B9mRrqNT#Crj1m#$k)&mb'$3BX%*Z#T!
!3@d'd%""m!!#-""RrNl`!!!J,`!%,d%!"#)[!!J[A`!%51Fm!#3!*J&)3X6$+!!
U!8K&b-A84%K#N!2!`G##60m!2#)I6R8J,`!%,d%!"#)[!!J[A`!%51Fa!%kk!*a
-h`#-)Kp1G5![!!3[33!%)Lm!##pI!!4)jc%!6VS!I#!"60m!M#)I6R8J,`!%,d%
!"#)[!!J[A`!%51Fa!%kk!#a-h`#-)Kp1G5![!!3[33!%)Lm!##pI!!4)jc%!6VS
!$#!"60m!M#)I6R9+J'SF5S&U$%5!4)&1ZJ!J4)&1G85!6VS!&N5!4)&1G8U"DJT
%J8kk!!C%J%je,M`!!2rrXS"M"L)!F!"1GE#(BJb!`8K!-J"#3%K!6R@bKf)D,J"
#3%K!J-&)3%K(2J")4il"-!G)4c)(6R8N!#B"iSMLLE+(B[L!`F#(-J2#`#i$5%I
1`%K(dSGP#*+#BJ4%J8je8d"Jj%je!*!$A!#3!i!!!!aB!*!$B!#3!b!!!$mm!!1
Tm%&%3e)$!!"B$9-$R1S'YiZ&ElRP&ZjU#kJ&,-#Y&VE`,r!YGe&Vp9i!!4lq2r+
65hNQLaM%"%SP-R')#kJ$EAISXa!"!*!$#PM!!!`!N!--!*!&I!!"!*!&D3"M!(d
!R`3#6dX!N!Fp!'!!miKF9'KPFQ8JDA-JEQpd)'9ZEh9RD#"bEfpY)'pZ)0*H-0-
JG'mJBfpZG'PZG@8J9@j6G(9QCQPZCbiJ)%&Z)'&NC'PdD@pZB@`JAM%JBRPdCA-
JBA*P)'jPC@4PC#i!N!05!!%!N!9Y!'B!J3#L"!*25`#3"33!5!"R!31)-P0[FR*
j,#"LGA3JB5"NDA0V)(*PE'&dC@3JCA*bEh)J+&i`+5"SBA-JEf0MGA*bC@3Z!*!
$6!!#!*!&-3"R!%8!V33%8A9TG!#3"3S!8!!F!4#)'P9Z8h4eCQCTEQFJGf&c)(0
eBf0PFh0QG@`K!*!&#!!1!#J!,U!#!!%!N!0q!!%!N!96!(-!C`#["!*25`#3"33
!53"&!5k)A8&Z)'PdC@dJGf&c)'0[EA"bCA0cC@3JGfPdD#"K)'ePG'K[C#"dD'&
d)(4SDA-JGQ9bFfP[EL"[CL"dD'8JFf9XCLePH(4bB@0dEh)JC'pPFb"ZEh3JD'&
ZC'aP,J#3"&S!!3#3"9d!F!"a!+`%!Np,!*!(5J"9!41)1P0[FR*j,L!J5@jcG'&
XE'&dD@pZ)'0KEL"[EQaj)'*P)("PFQC[FQePC#"[EL")4P-JGQpXG@ePFbi!N!0
Z!!%!N!9S!(S!I!#f"!*25`#3"dJ!AJ%PL%j6EfeP)'PdC@ec)(GPFQ8JFfYTF("
PC#"LC@0KGA0P)(4SCANJBA*P)'j[G#"cGA"`Eh*dC@3JBRNJG'KTFb"cC@aQ,@9
iG(*KBh4[FLi!N!0D!!%!N!9G!(!!F3#X"!*25`#3"dS!93%6L$T8D'8JCQPXC5$
5AM$6)'eKH5"LC5"NB@eKCf9N,L!J8'aPBA0P)(9cC5"TG#"hDA4S)'0KGA4TEfi
Z!*!$+!!"!*!&c!#1!1!!dJ3)3fpZG'PZG@8!N!8%!!3!``&L`!)$k!#3!``!+!!
S!,B"(!3"998!N!--!#!!#!#L!4`!JP99!*!$$!"L!*)!m!'B!)9993#3!``!+!!
S!(8"2!#(998!N!--!%B!TJ#k!GB!KP99!*!$$!!J!!J!SJ%F!)"993#3!``!+!!
S!+i"6J#e998!N!-2!!)%)'pQ)!FJDA4PEA-Z!*!$-33!J!#3!`-d,M!Q0#i`,#!
!U5!a16N`,6Nf,#""E'&NC'PZ)&0jFh4PEA-X)%PZBbi!N!-D"!#!!*!$!c3Z-!p
6G(9QCNPd)&0&35!d,M!!N!--#e9Z8h4eCQBJBA-k!*!$#!FJCQpXC'9b!!!%-d&
%3e)$!!Ch$9803b)5%HCHEK"N,4P%D[*%*!X3@DZQ*LHh2BZ-i(ERb%Qh-e2bQAp
h[qrELM`EhmbhY8#5eFlXbH4*f,ilNa'5j9ENLDc)laq42j1IbEcCeRB454B6XMF
Yb5)S31)(rdjCKT&84$LS#cYiiLGf)5c5J1e3aD%@GK*H(mq1D3bR6lpC+R)6)mR
Y[@4[%r6@hmf'R%[)+8FIZEr5&V,ejRAjaL3*5bPTf0kN&a@6NPGC,a$mi-RK`KF
HI%V$*QM4BN6+hFfqTX2b,*5j55k)jb(*(2h&i)XDJqim&Fee*9$cG*JIMZ6*i#S
GjViNe#Xq)@+3!*h[`af,NK")heX@$ED[(5XhPA-`LA1fRcbNbSE0RBqrZ,m'l)Y
Vm[NQUD!A@)"Ck2@aqNDT+'b%UlJKdF4%D4j'8D8QKLJRXm5(8JQR40@4X8N6+L,
JmB-'82KL!,85ECR3J#8d%@TbLdfC`eLTT"qR$+aeU)[Di0J#T6DMFe4B`aLflrd
NJ-)Z!m3jBTLiESAmcl%RFHbLl9fAJNh,JDRU`pD$+ZFdM(GdeX@!G"Z$#pDfYBX
aSNc2)HBbh"2bA1lEQ20L2d(0f,[Q&#I)A'ZQ2(KBb@@qIDUNT-rSkShVZbh3b(2
j4EE#Hi"%aD`5%YXK48JPi!JpjfESS#*')G-lpU&Zma9#N6ZP%AF+hP-PhjBJ16h
DlDNc*qDmR%1jlK@TB-cEfPh+FK[jplG1#3aZ,GrmP`rLNbG@J3Mpl)N"@`NmD#E
1Ye,'NV,SJ&0-'N"4lGDH(L15jV)kGQArf*KLjXEBBNT+ilSFVqIQ2L6S6,2!-qd
r5A,SM5rZ8%e+qrrFIEa)TAK+(ePf3"KU9mH96KeiJM&J8-CCH2(UplHlTpQ8&pI
V!mfS&!eYS22Y"H59K,,GX(5'$iDUN!!D1!1%4[Dm+R'd+EK+q$Ll6eBP[SHY1Jm
&+*f0f9@c1LPl$U`!LB0EA#,N"l-#h9`&eEjM4RfXIVf`GZf$Y!rlJeGII3NEUUX
[JA!5-Xp,Z*!!K9k#PFalib#6LH[)jR!53fYB8Y@+#cA4e!fZkRA5eL(bC5reTB0
Nq+`1N!#ULm1*SfpKL@KA(V8&MK(J'6fDpK)ZJ-$X$'lTUd'pQXb1L-Hl60lqhlJ
2YkIbbBfVNkBAI5lbXT26-1CCQI@i%dADZX@J'V("P$45$f-VG@mlh@!+D@pipZK
GMr,CUC9ZcXXMqF'dI'XXGU%XA8IkajQ+#fPh$2Aj@FVRjqVrINKT#[0r9hl1a'B
ar[EhjGLF9@FZ6fPZ&[UQ90aX9RVbi))fT0[hNY60m9Pip++5qIc2PqqBK`c8pE9
GaLXRlhFHm(""&mY9YB2CTqfiUkZ$G385RX(1bd[ERX3qk'4JZaVPpDGj!R%'T["
3[!PH+Gc$PhJ`"hHqIVA3@F0Eeq31!!!",d&%3e)$!!&Z$98,Sa,3(`,[MX0G"i1
VS')4Q(4+"CeP@S'Clmb(SM82Ip(I(*K(D4A2I'$q&[0K9K8c&"2&r$@V5EkTU*K
9439&phSP6c(*!"1aC5A+J0LHE33'eM"R5Q-Af($455FbMP!J*%5L5"VfFJe#ABT
bVcRA4B@a96dp+RHhD`rFF&F@))QYk$RCaCMM3iY@r'%I9"NNRi3H&+6Nb+Ekq,R
[CKIQhmVFF$J`VdQ5m'YemhE`p&D5E6j5(VmrPl$l$k3rXTPHl)!0@&jc$0ZABIP
&mp&"JI!#DaENdTMml81I`#icTcGeq@6Upd1K&[m+1ImYiqD1UMI2ikh!"rA+h@G
FD3IbmLC@e9$jp9!k6JUl9a2!KP1+'B$U)Bc230$[U!%J"*%91SCK"!!!#4G"4%0
5!`!1K3jG#k55),ibhjhrq-jHjTcIRm3X@FlH1F3CSh%X80,b[R0QLXqEJ*aX40@
UcFUD#%5Rl(e8JllrGqBa*dc)b``NKG+`*T5N3Y"1UPMIThV[djD9N!!b0-6@8G9
SS`-*3XV@EJZ,ppfG(@H&VG9l$HjZ05)#-d3M(d0&9JkT3rK[IJhrMG+c8Cl(B+4
U`aFMihF0N!#jkkJ(bAf)aK,IG)P[ca,IG-NC,*)9Q2S@4ApLIjK&+S'Id[Z4`Ve
!C&F!hk33*VJjb0NB50)-%!X)p`RCp6"I8pTh4UI[+E8`dFID4ZkGr@lA$AQDlbl
dTY[ZH@,hr!+XiD9#H+cpQa8c%jVX(JTT(9@GRD&+8bJflXSeSl4`5cY$Y5BUZhI
&Y(p9rDdY9MhmA'a'S26RfD0D,'"MJPS)PR+'Y$*IGS48-42MQe(`[2"&@fPYS(Z
$2,ZVS#hMPle6m-bhq8GG`NZPN!#-)R+V%99PNPlh36fhm*9bM*6G5(DLl6*[`RR
N%1kYe0apJX"08h9pBpI"UeK@ZP%fDY[@f0f"j$FB'16,"hmb'lqqr(ZIF,[qqr(
8P4F2LPmU8Y6lJ@,C*HD'0C[m5%SlDaYhr0f9c5@RlpTrl%Ba0h%pIrF&([T)hhC
PQkhZV!V"p*ICGPYr00)ATYFTIIZZ+Zh!F'lqJ+RpekRmf5JSrZ#`Jfc9YhilkVT
Hh9L([6AGJPqp[j5#5'i#SGl@1!l!f0$([Z4B9)JpbTMr8K%pV8&b'lM9+a*8%hV
&U'bb498Z@DQS*MRZ&3U9S9IX$jNN*bhPP@UI8TA)Arc+eR608jlGh#RG(Y%mCIV
ZHjY0eR5&1qC1dXc90emD5,Ej@(eFD1XV&rqi5CRVdF[i&43@eN[fU#"2lpYa(Vl
C*ZUUNZp0XGNQB,2*LUI#aR9CrBK0&Sp+b8*6C1J9E63Tqf"5i25flDL4ELQ!0#R
1JdB29[1P&-F&`EQV34i-5ZXME9iP2CJ#Sq!JM5UKU,HpAUd@9Ujj,Ce3erhrA2Y
0)fVEk2m'%q('2UUC%2HLD&+GqD$mXUXk4$HdCk9'VaEk0mH(e6-fT4pmjRa9e3I
09fm)JH',*UjGkCYBVDUp[eRI+)5dJF4`UL@ija2YP0UeSHUUm2!Y1A!N#i,p%r+
mraE)KC!!h)mYI"M-*-j`h-92m%VhR)6A)GbRK)!S@)q!m3bE39ZF$L3#NlajP54
K$2XaQX4Q&+bEm4`j1AMiN!!D$8bLH48j)NdQ4ZlPFU1$$j(RK3$Nj8cC#bja3Z9
@VceajE1aV$3CP1@85*e1e)0Q)jGcLA5!ibD49*QcdSUIb6+I1lrc$,UNCTa,i@!
(l&NX8Z!UXl)Fc@N10p%$TmlaarF12*%VqVQP+IbmGAC[Z(*i4%i0ElMdXHT++-Z
e+['9N53H0#4Y9,3%Ib#8d),3L422HK!GJGBFY,LYf`X9ljIeI"9HZ54kVCUF308
$Ta+%AGi0FXiSpX5"dhYD$!,RQ3U0(P3fjfdBeq`NrZ'e,erl6RVGI#'mVR"`phb
T-2,3[')Sd$cb3&!%V`adK&KR!aa2Y%%,Z,h0rNH#iVJi,$5IJe1*KV4GN8AeTLJ
dhii*%jh+4+0lL-6G`Gb!1(p'+l"R#Xqlj[FAI)G0QQ+9i'Uh+QCdXfkhYb)Q$Qa
("&X5L'&#mPXXm@0)Ucd%5eJUcINKX48pJ6d%PbS*K&[ci9Z%V*(I3hJPL`MrdJS
I3`D53``T(FqmS[EkqkCA(rKLZIm!-KZ&[1GiTPFGl*ZpSH[blmr0kANl3fU1pr3
DII1R0R@Yr)*!qJH3!1C*GFpaYEH[Hmh&ZN*A@%M6!%pD0diEiCSl$VHQjr`k#`[
26@IZ9DI$daI6KAA2pN(q9D3Y+FMIp2MMdq%6Qblq,Td1hibPQPH&k,ZJH0C&,1f
SJfdU0CD1i33[B404!YdjT'r8eK+UMqe@Db3GV(dcl%e2@"m1dpJq%Rh(6&#9H,q
%2[!CM`9RLm[r%li9iPZYi6IUKXJLDiC`*LQ1j@0C1-R3A,AUd"L@,!$X'#)f9Q`
GU4qjDTIlE$mqA(M5%LlfVkUm(4R$6f-Y*2qH0D6p36il*,[YSYC3Ef@,rIqX9*l
!Ebf0'B$Bc0CR("AbR`1@-IY,[Y#8e9pF9R&@mL*83(aXZ8)Z"La%VB`"J[[p584
Bj!eI5+Z3!-m'FQle8ke"Xl)9E+f!P-EiV3U5Rr1e(UmFZASXGdNpP#jSPS%Mep0
4%N&XLQ8J!kB+PhfShJLZT1Hk&EZ'!AIMZcc23,,Q+,p414k9S,B6,'a82bfhAaY
ETNrA%56ja02ZG*T5j4lME!"-qUA2Y$MMJiY4T!6X@Z)k)D`B8d'!AjJ-cVeXTE3
(16-(E(Pb4Q#Tj'@9#%5hl5$Glld`DH2L9KVmeH*EFa9hpIDl1`$QYF(BlY&bTX2
dqBA$reLmd2TDRl(Y0,(GBIAPhAX"rrC*9qj6Dcd$H#M1@jc&$Y'NGA48bXlAXh*
S@kH!Zkfbli`-Z2M"q(b&pHX4I'G4%de6YE9A(RA@qh)a&f[!UpMFMmNq0q"eB[p
iVX)kEUcG1DPY3V0$`62A6#EC@@pc!%i&h!kia8UMBYEe3)A945F$!Zi8m+KTci2
1HV%pT#rHl4bkG*dEl!9mF@EmL(@Qr)X@N!!HQJGM-lYP`%2C`r@*QVC6V('0%["
TN!#F,[k0%(eX#hU3!0aHNqRj@JSe6JF*I04KqTHADUE2Tc,B-J[*j9f1hMkq&-B
!U*!!KfX`AB-8B"Ah@IS[4f&li'IQ$1CAe9if%aiqGN!&Q%S4&CiQhDIf@FS1cNU
jaA2YaBpQiQbY3i'CP4mCLmX+L8rILUK3`8dZHmjaV0YkRM[jP2ccRlVip*4Me-q
APMjP-@A,$9P,I85&#Ulqe@iaGfcqU-aPXh*qlF1-@ZZSlH5C1mA0TJqUQTkf2j&
8)5`qd`4i3-FVSVN)cQ3YT[jL52V`9&+&J$mj!EMGASjQX`p@2&,*6%A`c5D4[Tl
00DT3H*AkL5leI''P)l9im[YlhCrhTp2DG*J[E4#Y4L*[6e`je+K#q,'4%64@!PY
K&Z!k%mV9AKd1kGd&SBA5Q+kqLIFl@5H@2&IJeq44!*!$'!!d!!!"(!&S!!%"!!%
!N!8$k!#3!j3!N!-)!#!J!3!#!*!&('&eFh3!N!-"4P*&4J#3"B"*3diM!*!&J!#
3!`G"8&"-!*!&!3!!!3#3!`+!!!!%3!!!#5!!!"13!!!!*mJ!!%%%!!#"!J!"!!%
!!JI!J!32i%!)''!J%"[m%#3DP!K-'[3NRc)%-N`ek2NN05Jb%$Ii*!J`i!J%(q!
3!J$!)!%$m%!!J!#!!%#"!!!JJJ!!%q3!!!R)!!!%N!!!!!)J!!!"3!#3!i!!!!%
!N!-$J!!!"m!!!!rJ!!!Im!!!2rJ!!(rm!!$rrJ!"rrm!!rrrJ!Irrm!2rrrJ(rr
rm$rrrrKrrrrmrj!$rRrrN!-rrrrq(rrrr!rrrrJ(rrr`!rrri!(rrm!!rrq!!(r
r!!!rrJ!!(r`!!!ri!!!(m!!!!q!!!!(!!*!$J!#3"#!IU5!a16N`,6Nf)%&XB@4
ND@iJ8hPcG'9YFb`J5@jM,J!!&8J!N!-"GJ"1F8U$CKT"l3!J-,`!#$&m2c`!!M&
m!!%!"$&mUI!!"Lm$,c`!!"5Q3IVrd0$m!+)[#%+RB3!#*Ylm!""R%NU$C`4`!8j
e6Ud!)Q%!!pDTp%ja5S0Q!URdF!"1G@"b38a"4%4$69!!!`#30&"b3@e)jf$`G$+
I`Lp)!#!J6b*8-@N!&!!B)8!!*$&m!!%!,0+4)8%!,U!#hm*-h`m'6R9+1!THC``
J+J!)C``J3#!3C`B[1[q%6R9)jam'3IVrRR!-)LS!"-+i!aTKT'B!!4*)H[q16VS
%i&K2X(Vr@QB!!1bK'Li)##S!"J!%C`BJH!+QS"XX+J!%+LS!#"JU!!5Ae*A8)$V
r9U%HCJ!!c#a))$Vr5L)'`VJ$'PK"B3$r8L!krd,!Z!-D3IVr2L#!5S9Q"+%LB!3
J4D!RCJ!!Q#T),cVr!Lmkr[S[1[lb,cVr!Lmkr[T)H[m5,a!J1[m!8B""q[lf))!
J$P#!3IVqk##!5(S!HQ%!#L6Hr!!J5N"R!URr)%kJ(b"(S"Yb!")%j`RM'H34!!%
!)!)"!1!J6D"T!J!!(i!")%fJDYA8ep4"q[kB5T!!C`K`!D'BF!1KQ#"0*8J!#(!
!60pJq%je60pJq'!!rZ!J6U!IeG6Ae#"(S"X`1!)J-F!+B*()B1"19J!!51F!1#K
Z!!a(q[jD4IVq@L!8X**Y"#!5+)"+J'm5)&-LEJ!)SLiJ&0'6NC*`!'!%-$crf8c
I(!"1ANje6PEreNMR%aJX,J!35IVpmN)(S4SY52rQ5Li!#fF')(J#TU!E,c`!!+$
m6VS#RLe!rqTB6fF!!Ai[,[rU6VS"q%S!@%pR"R!"B!!"FNKZrrK)E[rd5'lrlNk
k!j)J,[rdS4iY52r`6qm!$'F!!8JJ,[riS4iY52rmC`!"1LmZrrJ[#%kk!qC+VJ!
88%pQ!!#8@Bm[2%024%9`!$m!U"mQAb!,ChiJ%h)Bd)%[!%kk!Y`-3!!$@%pQDL!
0FLM3J5e!rpSJ%h3Bd))Y32rH,`"1ZJ,`5-!Y32rL)%ZJ+5!Zrpj3J#P!!#KCMbm
,6VS3d#!IFL#3!)%T3!!X,blrr#mZrr3[,[r`,`B[,J!-5'lriLmZrpT)H[kX6VS
)9Lm,UD02l`!N+@lrkJ!-+@lrm!!3+@lrp!!8+@lrr!!B,c`!!+'B6VS"L#e!rpB
[2!!!U*p1ZJ&k)LlreV#"9X0%!dL$5--T3`!F+8B!)#PZ!!`!*%Kkr*!!2cbJr#m
m!!#Jr%kk!54BMam!6VS3@#mm!!#KQ%kk!6T+J%r[!!aR"%kk%&B`1!&Di%!-3!!
'CJK"qJ!D)FJ$2(i")'lrjU!E%!G-lKM)rm*1ANje6PB!!%MR!4K#"bmm!!#Jr%k
k!2)S3#!-@%pR5#m-6VS!8%S!@%pR2#C-,bX!$$mmS2`[2!!!S2a1ZJ#L@)mI!%k
k$pBJD`!3S"mJD`!BS"m`1!&Di%!-3!!'CJC`!#(!!caq!4!(61iBJ2rd6Pj1G8j
@!!")ja!)+'i!#(B!$+a"6%&%!!*Q&!bX4%008!!'CJT`!l"X!!TQ!RB"%!0-lK!
)rrK1ANje6PB!!&Q22cbSER!"(`"1ZJp-@Bmr2+TZF!%I!%kk$ciJ(l#ICJB`2!)
!B!3`2!3!6Pj1G8j@!!![!c!m#!$!EJ!+FJ!b!%U"8X0%!fF%F!&J!R!!*Llrr%j
H6R919J!!51FI!$iZ!!T)abm(6VVraKS!F!!3"3a!!!&B6fB3!NF(rdkkrhb`4fi
%F!"J+PQ22cbSRh!"(`"1ZJl#+"pCMcm((`91ZJkf,"qiKPI$4!0R"(!!B!)J"Nc
Z!2Mrl%jH6R919J!!51F4#$iZ!!iJEJ!)+&"f!(!!-"3-J!!!384Q,R!!-#`!!Jb
!!!"$8QBJ$%IrrfFB)#`!"%*!5%$J5#)m!*!$rm+!5-HqJ@B#GJ%3!dcZ%)Mrp%j
H6R919J!!F2m[!%KZ!!K1Z[qB5J"36fFD)'i!##!S!!4#3%K!i%JL2!#3!rr#J$!
"B!*`rdjH6R919J!!F2m[!%KZ!!K1Z[pL5J"36fF3)'i!##!m!2q3!m#S!!4J!R$
r6Pj1G8j@!!")j`!B*Qi!%#KZ!!`JEJ!)-,`$!A!!+)!'P!!!!53'P!!!!NJ'P!#
3!b!'P!#3!i!'P!#3!i!'P!!!"*!!"T3!!!%N"T3!!!53!!D8!*!$I!D8!!#!!#D
!"T-!N!-N"T-!N!-J"T-!N!0)"T-!N!-qF!"-lKJ!rrK1ANje6PErp%MR%aJQEJ!
),8[rp!DZ!*!$*2rd+'lrp!DZ!*!$)2rd,@lrp2ri"Ui!N!0)rr3YE[rdrr`'VJ#
3!clrp#!Zrr53!+i!#,#Z!!aM"R"PB!!!X%*(3NCJ4R!!-!F-3!!%9F0%!fF%F!"
J$(!!-!GCJ()%6VS0)R)!-JFAJ"J!F!!`"b"ZrrM3J$''#!"`!$!(%$-)!()"iDR
F36!(8NG`!$!($%!!*'@`3NGm!@"'F!!`"`a!!!&9`d3$C`4`!'!-F!!`"e1!FJ*
1ZJc-FJ!b"aQ!'!"`!$!()'lrr0#!-BB)!(!!-!F30!J!FJ(KUGa"-!G54h!!-!F
-3!!ICE"`!%cZ'-Mri%jH6R919[rm51F2'#CZ!!`SEJ!83NCJ$R!!-!E3J%*d#!!
`"P*'F!!`"R)!-Li!%Y+"XS"ZiN*'H!*J!!#D3N9#4h!!-!BJEJ!)jB!YF!J!rra
JE(!"`+lrr0j!F!!`"A)!-JCd!"3c'!"63NM#Y)"[+(!!-!I3J()!-M3)!%U"CJa
`!$!(d)!jK!J!9%4`!$!(d)!q0!J!B"K`!$!'FJ!b,J!5dS(5J(!!-!I3J$Q"#!!
`"9*&)#lrr1+),8$rr(!!-!9b!$)'G!!8-aJ!Y%"LJM!'8NDmEJ!5C3$rBNcZ'2$
rj%jH6R919J!!51F2'$iZ!!iQEJ!3+'i!#$JZ!"Bk"qC0F!!`"h`(c%"q!(!!-!8
30!J!l#Kb!")!F!(!!A)!%J$HJ5!(d)"b!$)c#!!Z!9*'F!!`"R))XS"Q"N*'-!9
54A!!-!63J,#(BX"`!$!%d)!L"j+!%!&-lKM`rqK1ANje6PB!!%MR$`Ji,J!52Li
!$LKZ!!Jm"qC1F!!`"hS(bN"`!$!'IJ!H0!J!F!!`"A)!-J65J1D*CbT6J@F@8i&
Q)R!!-!C8J()!%M3)!%K"3N'1JA!!-!C5J()!%M3)!1'*MS&`!$!&i+p`)*!!"(,
ri+R#Kc!"61i3m2rX6Pj1G8j@rqT)j`mB*Qi!##KZ!"!'VJ!!!53!&!DZ!!!#5!!
8,@i!&2rd"Ui!N!-J!"3YEJ!8rrJ'VJ#3!i!!&#eZ!"6rr"!6jJKb!")!F!I!!A)
!%J"536e"rqS3%q))FJ!5!(!$`!&b!")!1!&84(!"kDJp32rbF!!3%h*!`J"`!"!
"28$rm(!"kDK6J$e!rqj`!"!6FJ(#!'F+F!!`,[rZ8i"J!R$r28$rl(S)5Qlrm'G
@,bi!&#mZrr4`!$!Zrr)[!#!,8S![!%kkrcKb!$)!ji(D35mZ!"3[,[riF!!`,[r
b,`![,[rd6VS)I#mZrra`!$!Zrr)[!#mZrr3[,[ri6VVp)Nr[!$"#4f!!!2C+E[r
`Cc*`!$!Zrr)[!#mZrra`!$!&,`![#dkkrGjm!"`!F!!`"L"Zrr4b!")`#!$D38r
[!""J'R!!-!3[!(!!-!8[!#m,6VVq,M`!fN42l`!-['lrl'B3-!G54h)!-J"#0"J
!B!!!MVaZrqjQG%TZrr"R-R!!-#lrmLm!,blrr(!!-!8[!#m,6VVpF(`!(!"`!$!
')'lrp()!%M!)!0T"6qm!%'!DF!!`"#m!F!!`"5m!,`Y1Z[h!2!$D4%r[!!a@4Q!
8F!!`"e1!FJ!b"aQd#!!B!$!(8NF`"P0'5N"Qj'!5%!E3,[rV-JG54h3!0!%CJ#J
![Qi!$Q8!r`C`!$!&AS$QL%cZ'2$rdNjH6R919[q'51F2'#eZ!#6rj!DZ!*!$*!!
N,@i!*2rd"Ui!N!-J!#3YEJ!NrqJ'VJ#3!dJ!*#eZ!#6rq#CZ!"c@r!%Ne[`#50E
m!#$@r!#!e[`!J#e,rpM@r!53!#e,rpc@r!%N,8[ri0Em"*!!,8[rm0Em!(`Y5rr
)er`!!)!!)!Z3!+i!(,#Z!#"M"R"PB!!&8RS!3NFJ,[r)d,`!!)!!,8$rc#KZrmJ
YI!!!J!$rr%KZrr`[,[r))'i!#%k3!%UZrra36fB'F'GJ!!8B)!a5J,#ZrmaMC#e
-rlSYE[r-rliJ$&+!N!#ZrliY32qf)#lrZT!!V[r),8$rXL!Zrlk3!+lrZLe!rkj
R$#"-)Qlrb#!ZrkkL,LKZrklCl[r)5'lrXLmZrmJJEJ!)6T!!)#lrXV#ZrlC36f3
'F'GJ!!5U(9crah!!%#lradM!d)"63$e!rqa`!$!Zrqc3J$e!rqiJEJ!3)"$3VJ!
-,8$re#mZ!"`[,[rF5(J"*#m-6VVmG()!-J"+JGR",bi!(#mZrpK)H!%N,blrh%k
k"E`[,[rJ5(J"*#mZrp`[,[rB6VVkCLmZ!"`[,[rFF!!`,[rX,`![$%kkr#jb!$)
!5S(C`5mZ!"`[,[rBF!!`,[rX,`![,[rF6VS&FLmZrr"`!$!Zrq`[!#mZrp`[,[r
B6VVk'(S!3NFYEJ!-rp"2l`"JB!!$X%*'B!!!Q(!!-!G+J'Cd)!a5J,#ZrmaMC#e
-rkBYE[r-rkSJ$&+!N!#ZrkSY32qL)#lrTT!!V[r),8$rRL!ZrkU3!+lrTLe!rjT
R$#"-)Qlrb#!ZrjUL,LKZrjVCl[r)5'lrRLmZrmJJEJ!)6T!!)#lrRV#Zrk*36f3
'F'GJ!!0HHJ!D((i)F!(!KGa!F!!`"L"Zrq$3J$``#!$LM6!(8dG`!$!'$%!#5'8
!rf!%4J*)F!!`"Ja!!3"N%#!Zrp"5V[r3)%!3KQ!!!ZS%4J%!F!!`"L"ZrqM3J$J
`#!"`!$!')'lrj()!%M!)!$e"rm*`!$!Zrm*+J'-!!+*JH#!-8S#`V[r-Bf3Y62q
Q,@lrc2qU)!a5J*!!V[qU,8$rSL!ZrkD3!+lrb#e!rjiJ,[qUN!#ZrkBY32qDC``
J6#*ZrmJJ,[qDSLiSE[qDfHlrb%KZrji[,[r))'i!#%k3!#!Zrjk`V[qL8%pN"R"
RB!!#G(!!%"c[U)U!8%G`!$!($%!!''-!rhj`)*!!,[r$F[rJUF+&f%&`!$!Zrm,
JVCjZrm*#4Q!!!*K`!$!(5S"QG#!-8S#`V[r-Bf3Y62q5,@lrc2q@)!a5J*!!V[q
@,8$rML!Zrj+3!+lrb#e!riSJ,[q@N!#Zrj)Y32q'C``J6#*ZrmJJ,[q'SLiSE[q
'fHlrb%KZriS[,[r))'i!#%k3!#!ZriU`V[q18%pN"R"RB!!"b(S!'Kaq#(!"`)A
F3(!!-!BJE[r`d)!m-!J!iSd`"e0(['lrlQ8!rf5FE[rZF!!`"L"ZrrM3J$e`#!$
ra(!!-!BJE[rdFJ!5-!J!28(r`R!!-#lr`NU!B`!!T'"i)!a5J,#ZrmaMC#e-rkB
YE[r-rkSJ$&+!N!#ZrkSY32qL)#lrTT!!V[r),8$rRL!ZrkU3!+lrTLe!rjTR$#"
-)Qlrb#!ZrjUL,LKZrjVCl[r)5'lrRLmZrmJJEJ!)6T!!)#lrRV#Zrk*36f3'F'G
J!!$qF!!3(1qSLS"34h!!-!F-3!!BB`$rIR!JN!!Zrm0brq#T`SA6E[r%F!!`,[r
#i+fHE[r#F!!`,[r%5S!QE[r3Pm#hlJ!-C6BJE[r38Ulrd"#E)'lrd&+Zrp!3Qb!
Zrp"5V[r3)%!3Qf!+)'lrd&+Zrp!3Qc!%8d4+3'EZB&C@4#!Z!"M3VJ!8FJ!b,[r
%*#lrd*5Z!!b5JLC!Pm&J$L"Zrp"5V[r3%*X`"&0%5N4R$#!Z!"M3VJ!8X)YLiLC
Z!!aJ#L"Zrp"5V[r3%*X`"&0%5N"QlL!Zrp#`V[r8C3$m5#!Zrp#`V[r8C`4`Cf!
3)#lrd*!!VJ!-)'i!%##!F!"-lKM`rfj1ANje6PB!!%MR$aJQEJ!81#i!#LKZ!""
J!!%`2!3q,J!18NDmEJ!1C"*`!$!'FJ!b""!d#!#`0"J!CHC64lK(C"*`!$!(FJ!
b""!d#!#`0"J!BZLq4Q0)F!!`"RS!'M3)!(!!-!Gb!$)''E3)!"J!F!!`"aQ&#!"
`!$!'d)!k-`J!F!!`"p#!FJ!b"Y+"0l-)!"J!F!!`"p#!0i8)!'##Z%GQ"P*%B!!
!SR!!-!4k!"Sd#!"`!$!(FJ!b""Qd#!!B!(!!-!FCK3J!F!!`"0#!1M-)!(!!-!I
3J()!-J65J6Hc#!!B!(!!-!I3J$H&#!"`!$!(FJ!b"*!!JA)!-Li!$R3!0!G5JT+
#XS"M(Lm,,`a`!$!(,`"`!$!%,`"1Z[lQ1!G54%r[!""J)#m,,`a`!$!Z!!i[!(!
!-!G5J#m!6VVqa$e(!!j2l`!3F!!`,J!1FJ!b"*!!JA)"XS"Y!2l!61iBm2rS6Pj
1G8j@rra)j`mB+'i!&!DZ!!!"*!!8*Qi!&%*'B#"`!$!')'i!#()!-JBCX!J!'!"
`!$!'d)!hKJJ!-!C54VaZ!!jPfLm,,`a`!$!Z!!i[!(!!,`"1Z[j)3NC2l`!3B!3
`"P*'['i!$Q31F!!`"R)!%M3)!%U"CqK`!#e!rraJGR!!-!C+J'-NF!!`"R)!%M3
)!(!!-!C6J(3!&$3)!**#5-%J,[rmikJY32rmF!!`"RJ!'$3)!#SZrraq!'!1)!I
ML()"`S@#J#i"iSd`"&0%5N"QkR!!-!E3J()!-M-)!#"Z!"$PJ5'('!!`"P*')#l
rr&+ZrrbmEJ!1CB4-lKM`rq41ANje)PmJAk!P,S"U!N+A6Y%LAa)I-"p+!@F%TdC
J!U0',SK1d5*I%Km`(b"I5J&R"+C(B!+L4dl4)Pp`!D'B6Y%L,`!%)#m!#%(k!!S
bI!!#6[#5rQ!'6%%)!8je6VS!*#!"6R8L,`!%)#m!#%(k!!SbI!!#6[#5rQ!)6%%
)!F0!6R9+J'X85S&V"Nkk!%C1G85"6VS!2N5"6R9%J%U"D`T1ZJ!`4)"%J8je4)&
1ZJ!N4)"1G5)[!!3J,`!)3IS!#M*m!!*1m*,qB!K-33!"`d"1G6m"5%&+3@BF)J"
#38K"C`U#edK"5%!`!8K!J0mb!%*!5%"1G8K"2S)[!c3!*J&b!8*!5%"Q$%K!-!*
b!'!@dN&P%Y4#dB#`JfAdN!#$dN%)`3!!C1iQ(c3I6R8!!!%!N!0AHJ!!9RS!!!*
k!3,f[$J`!*!$(!*U!"&%394"!*!$NPT&8Nm!N!1H4&*&6!#3!kT$6d4&!!-!YP0
*@N8!N!2Q4%P86!!(!2*"6&*8!!B"8P088L-!!!'QGQ9bF`!"!E*69&)J!!%"bP"
cCA3!!!(L8%P$9!!"!Hj%6%p(!!!#"NCPBA3!!!)53Nj%6!!!!Kj'8N9'!!!#+NP
$6L-!!!)fBA9cG!!!!N)!!2rr+!#3#Irr#!!#M!#3"[rr+!!#[`#3"3,rrcJ!!X-
"![DF!!(rra`!+SB"![D!!!$rrbJ!,-`"![A-!!2rr`!!35i"![A3rj!%!!!Y,!#
3"!3"rrmJ!#dk!*!&KIrr*!!YZJ%#pR3!Krrr!!!Z%!#3"BErrb3!,Q!"![C-!)$
rr`!!,Z)!N!@errmJ!#p!!*!&J[rr!!![XJ#3"!2SrrmJ!$!3!*!%"!(rrb!!-$`
!N!@#rrmJ!$"-!*!&KIrr*!!`A!%#pP`!Krrr)!!`E!#3"BErrb3!-(`"![CB!)$
rrb!!-)`!N!@"rrmJ!$#F!*!&J2rr!!!`V!#3"3(rrb!!-,m!N!8#rrmJ!$$d!*!
%!J#3!b!!-4)!N!3#!3!()!!a)J#3"B$rr`!!-5i!N!9rrrm!!$9P!*!%!qMrr`!
!0TJ!N!3$k2rr)!!rX`#3"[rr)!!rc`#3"B$rr`!!2pX!N!@!rrm!!$rl!*!&J2r
r)!"!"J#3"[rr!!""#J#3"!C`FQpYF(3)a#"cG@CQDAM(93:
\ No newline at end of file
diff --git a/mac/tclMacResource.c b/mac/tclMacResource.c
deleted file mode 100644
index 312ef42..0000000
--- a/mac/tclMacResource.c
+++ /dev/null
@@ -1,2209 +0,0 @@
-/*
- * tclMacResource.c --
- *
- *	This file contains several commands that manipulate or use
- *	Macintosh resources.  Included are extensions to the "source"
- *	command, the mac specific "beep" and "resource" commands, and
- *	administration for open resource file references.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacResource.c,v 1.5 1999/04/16 00:47:21 stanton Exp $
- */
-
-#include <Errors.h>
-#include <FSpCompat.h>
-#include <Processes.h>
-#include <Resources.h>
-#include <Sound.h>
-#include <Strings.h>
-#include <Traps.h>
-#include <LowMem.h>
-
-#include "FullPath.h"
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclMac.h"
-#include "tclMacInt.h"
-#include "tclMacPort.h"
-
-/*
- * This flag tells the RegisterResource function to insert the
- * resource into the tail of the resource fork list.  Needed only
- * Resource_Init.
- */
- 
-#define TCL_RESOURCE_INSERT_TAIL 1
-/*
- * 2 is taken by TCL_RESOURCE_DONT_CLOSE
- * which is the only public flag to TclMacRegisterResourceFork.
- */
- 
-#define TCL_RESOURCE_CHECK_IF_OPEN 4
-
-/*
- * Pass this in the mode parameter of SetSoundVolume to determine
- * which volume to set.
- */
-
-enum WhichVolume {
-    SYS_BEEP_VOLUME,    /* This sets the volume for SysBeep calls */ 
-    DEFAULT_SND_VOLUME, /* This one for SndPlay calls */
-    RESET_VOLUME        /* And this undoes the last call to SetSoundVolume */
-};
- 
-/*
- * Hash table to track open resource files.
- */
-
-typedef struct OpenResourceFork {
-    short fileRef;
-    int   flags;
-} OpenResourceFork;
-
-
-
-static Tcl_HashTable nameTable;		/* Id to process number mapping. */
-static Tcl_HashTable resourceTable;	/* Process number to id mapping. */
-static Tcl_Obj *resourceForkList;       /* Ordered list of resource forks */
-static int appResourceIndex;            /* This is the index of the application*
-					 * in the list of resource forks */
-static int newId = 0;			/* Id source. */
-static int initialized = 0;		/* 0 means static structures haven't 
-					 * been initialized yet. */
-static int osTypeInit = 0;		/* 0 means Tcl object of osType hasn't 
-					 * been initialized yet. */
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static void		DupOSTypeInternalRep _ANSI_ARGS_((Tcl_Obj *srcPtr,
-			    Tcl_Obj *copyPtr));
-static void		ResourceInit _ANSI_ARGS_((void));
-static void             BuildResourceForkList _ANSI_ARGS_((void));
-static int		SetOSTypeFromAny _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_Obj *objPtr));
-static void		UpdateStringOfOSType _ANSI_ARGS_((Tcl_Obj *objPtr));
-static OpenResourceFork* GetRsrcRefFromObj _ANSI_ARGS_((Tcl_Obj *objPtr,
-		                int okayOnReadOnly, const char *operation,
-	                        Tcl_Obj *resultPtr));
-
-static void 		SetSoundVolume(int volume, enum WhichVolume mode);
-
-/*
- * The structures below defines the Tcl object type defined in this file by
- * means of procedures that can be invoked by generic object code.
- */
-
-static Tcl_ObjType osType = {
-    "ostype",				/* name */
-    (Tcl_FreeInternalRepProc *) NULL,   /* freeIntRepProc */
-    DupOSTypeInternalRep,	        /* dupIntRepProc */
-    UpdateStringOfOSType,		/* updateStringProc */
-    SetOSTypeFromAny			/* setFromAnyProc */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ResourceObjCmd --
- *
- *	This procedure is invoked to process the "resource" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_ResourceObjCmd(
-    ClientData clientData,		/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *CONST objv[])		/* Argument values. */
-{
-    Tcl_Obj *resultPtr, *objPtr;
-    int index, result;
-    long fileRef, rsrcId;
-    FSSpec fileSpec;
-    char *stringPtr;
-    char errbuf[16];
-    OpenResourceFork *resourceRef;
-    Handle resource = NULL;
-    OSErr err;
-    int count, i, limitSearch = false, length;
-    short id, saveRef, resInfo;
-    Str255 theName;
-    OSType rezType;
-    int gotInt, releaseIt = 0, force;
-    char *resourceId = NULL;	
-    long size;
-    char macPermision;
-    int mode;
-
-    static char *switches[] = {"close", "delete" ,"files", "list", 
-            "open", "read", "types", "write", (char *) NULL
-    };
-	        
-    enum {
-            RESOURCE_CLOSE, RESOURCE_DELETE, RESOURCE_FILES, RESOURCE_LIST, 
-            RESOURCE_OPEN, RESOURCE_READ, RESOURCE_TYPES, RESOURCE_WRITE
-    };
-              
-    static char *writeSwitches[] = {
-            "-id", "-name", "-file", "-force", (char *) NULL
-    };
-            
-    enum {
-            RESOURCE_WRITE_ID, RESOURCE_WRITE_NAME, 
-            RESOURCE_WRITE_FILE, RESOURCE_FORCE
-    };
-            
-    static char *deleteSwitches[] = {"-id", "-name", "-file", (char *) NULL};
-             
-    enum {RESOURCE_DELETE_ID, RESOURCE_DELETE_NAME, RESOURCE_DELETE_FILE};
-
-    resultPtr = Tcl_GetObjResult(interp);
-    
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], switches, "option", 0, &index)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-    if (!initialized) {
-	ResourceInit();
-    }
-    result = TCL_OK;
-
-    switch (index) {
-	case RESOURCE_CLOSE:			
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 2, objv, "resourceRef");
-		return TCL_ERROR;
-	    }
-	    stringPtr = Tcl_GetStringFromObj(objv[2], &length);
-	    fileRef = TclMacUnRegisterResourceFork(stringPtr, resultPtr);
-	    
-	    if (fileRef >= 0) {
-	        CloseResFile((short) fileRef);
-	        return TCL_OK;
-	    } else {
-	        return TCL_ERROR;
-	    }
-	case RESOURCE_DELETE:
-	    if (!((objc >= 3) && (objc <= 9) && ((objc % 2) == 1))) {
-		Tcl_WrongNumArgs(interp, 2, objv, 
-		    "?-id resourceId? ?-name resourceName? ?-file \
-resourceRef? resourceType");
-		return TCL_ERROR;
-	    }
-	    
-	    i = 2;
-	    fileRef = -1;
-	    gotInt = false;
-	    resourceId = NULL;
-	    limitSearch = false;
-
-	    while (i < (objc - 2)) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], deleteSwitches,
-			"option", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-
-		switch (index) {
-		    case RESOURCE_DELETE_ID:		
-			if (Tcl_GetLongFromObj(interp, objv[i+1], &rsrcId)
-				!= TCL_OK) {
-			    return TCL_ERROR;
-			}
-			gotInt = true;
-			break;
-		    case RESOURCE_DELETE_NAME:		
-			resourceId = Tcl_GetStringFromObj(objv[i+1], &length);
-			if (length > 255) {
-			    Tcl_AppendStringsToObj(resultPtr,"-name argument ",
-			            "too long, must be < 255 characters",
-			            (char *) NULL);
-			    return TCL_ERROR;
-			}
-			strcpy((char *) theName, resourceId);
-			resourceId = (char *) theName;
-			c2pstr(resourceId);
-			break;
-		    case RESOURCE_DELETE_FILE:
-		        resourceRef = GetRsrcRefFromObj(objv[i+1], 0, 
-		                "delete from", resultPtr);
-		        if (resourceRef == NULL) {
-		            return TCL_ERROR;
-		        }	
-			limitSearch = true;
-			break;
-		}
-		i += 2;
-	    }
-	    
-	    if ((resourceId == NULL) && !gotInt) {
-		Tcl_AppendStringsToObj(resultPtr,"you must specify either ",
-		        "\"-id\" or \"-name\" or both ",
-		        "to \"resource delete\"",
-		        (char *) NULL);
-	        return TCL_ERROR;
-            }
-
-	    if (Tcl_GetOSTypeFromObj(interp, objv[i], &rezType) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-
-	    if (limitSearch) {
-		saveRef = CurResFile();
-		UseResFile((short) resourceRef->fileRef);
-	    }
-	    
-	    SetResLoad(false);
-	    
-	    if (gotInt == true) {
-	        if (limitSearch) {
-		    resource = Get1Resource(rezType, rsrcId);
-		} else {
-		    resource = GetResource(rezType, rsrcId);
-		}
-                err = ResError();
-            
-                if (err == resNotFound || resource == NULL) {
-	            Tcl_AppendStringsToObj(resultPtr, "resource not found",
-	                (char *) NULL);
-	            result = TCL_ERROR;
-	            goto deleteDone;               
-                } else if (err != noErr) {
-                    char buffer[16];
-                
-                    sprintf(buffer, "%12d", err);
-	            Tcl_AppendStringsToObj(resultPtr, "resource error #",
-	                    buffer, "occured while trying to find resource",
-	                    (char *) NULL);
-	            result = TCL_ERROR;
-	            goto deleteDone;               
-	        }
-	    } 
-	    
-	    if (resourceId != NULL) {
-	        Handle tmpResource;
-	        if (limitSearch) {
-	            tmpResource = Get1NamedResource(rezType,
-			    (StringPtr) resourceId);
-	        } else {
-	            tmpResource = GetNamedResource(rezType,
-			    (StringPtr) resourceId);
-	        }
-                err = ResError();
-            
-                if (err == resNotFound || tmpResource == NULL) {
-	            Tcl_AppendStringsToObj(resultPtr, "resource not found",
-	                (char *) NULL);
-	            result = TCL_ERROR;
-	            goto deleteDone;               
-                } else if (err != noErr) {
-                    char buffer[16];
-                
-                    sprintf(buffer, "%12d", err);
-	            Tcl_AppendStringsToObj(resultPtr, "resource error #",
-	                    buffer, "occured while trying to find resource",
-	                    (char *) NULL);
-	            result = TCL_ERROR;
-	            goto deleteDone;               
-	        }
-	        
-	        if (gotInt) { 
-	            if (resource != tmpResource) {
-	                Tcl_AppendStringsToObj(resultPtr,
-				"\"-id\" and \"-name\" ",
-	                        "values do not point to the same resource",
-	                        (char *) NULL);
-	                result = TCL_ERROR;
-	                goto deleteDone;
-	            }
-	        } else {
-	            resource = tmpResource;
-	        }
-	    }
-	        
-       	    resInfo = GetResAttrs(resource);
-	    
-	    if ((resInfo & resProtected) == resProtected) {
-	        Tcl_AppendStringsToObj(resultPtr, "resource ",
-	                "cannot be deleted: it is protected.",
-	                (char *) NULL);
-	        result = TCL_ERROR;
-	        goto deleteDone;               
-	    } else if ((resInfo & resSysHeap) == resSysHeap) {   
-	        Tcl_AppendStringsToObj(resultPtr, "resource",
-	                "cannot be deleted: it is in the system heap.",
-	                (char *) NULL);
-	        result = TCL_ERROR;
-	        goto deleteDone;               
-	    }
-	    
-	    /*
-	     * Find the resource file, if it was not specified,
-	     * so we can flush the changes now.  Perhaps this is
-	     * a little paranoid, but better safe than sorry.
-	     */
-	     
-	    RemoveResource(resource);
-	    
-	    if (!limitSearch) {
-	        UpdateResFile(HomeResFile(resource));
-	    } else {
-	        UpdateResFile(resourceRef->fileRef);
-	    }
-	    
-	    
-	    deleteDone:
-	    
-            SetResLoad(true);
-	    if (limitSearch) {
-                 UseResFile(saveRef);                        
-	    }
-	    return result;
-	    
-	case RESOURCE_FILES:
-	    if ((objc < 2) || (objc > 3)) {
-		Tcl_SetStringObj(resultPtr,
-		        "wrong # args: should be \"resource files \
-?resourceId?\"", -1);
-		return TCL_ERROR;
-	    }
-	    
-	    if (objc == 2) {
-	        stringPtr = Tcl_GetStringFromObj(resourceForkList, &length);
-	        Tcl_SetStringObj(resultPtr, stringPtr, length);
-	    } else {
-                FCBPBRec fileRec;
-                Handle pathHandle;
-                short pathLength;
-                Str255 fileName;
-                Tcl_DString dstr;
-	        
-	        if (strcmp(Tcl_GetString(objv[2]), "ROM Map") == 0) {
-	            Tcl_SetStringObj(resultPtr,"no file path for ROM Map", -1);
-	            return TCL_ERROR;
-	        }
-	        
-	        resourceRef = GetRsrcRefFromObj(objv[2], 1, "files", resultPtr);
-	        if (resourceRef == NULL) {
-	            return TCL_ERROR;
-	        }
-
-                fileRec.ioCompletion = NULL;
-                fileRec.ioFCBIndx = 0;
-                fileRec.ioNamePtr = fileName;
-                fileRec.ioVRefNum = 0;
-                fileRec.ioRefNum = resourceRef->fileRef;
-                err = PBGetFCBInfo(&fileRec, false);
-                if (err != noErr) {
-                    Tcl_SetStringObj(resultPtr,
-                            "could not get FCB for resource file", -1);
-                    return TCL_ERROR;
-                }
-                
-                err = GetFullPath(fileRec.ioFCBVRefNum, fileRec.ioFCBParID,
-                        fileRec.ioNamePtr, &pathLength, &pathHandle);
-                if ( err != noErr) {
-                    Tcl_SetStringObj(resultPtr,
-                            "could not get file path from token", -1);
-                    return TCL_ERROR;
-                }
-                
-                HLock(pathHandle);
-                Tcl_ExternalToUtfDString(NULL, *pathHandle, pathLength, &dstr);
-                
-                Tcl_SetStringObj(resultPtr, Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-                HUnlock(pathHandle);
-                DisposeHandle(pathHandle);
-                Tcl_DStringFree(&dstr);
-            }                    	    
-	    return TCL_OK;
-	case RESOURCE_LIST:			
-	    if (!((objc == 3) || (objc == 4))) {
-		Tcl_WrongNumArgs(interp, 2, objv, "resourceType ?resourceRef?");
-		return TCL_ERROR;
-	    }
-	    if (Tcl_GetOSTypeFromObj(interp, objv[2], &rezType) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-
-	    if (objc == 4) {
-	        resourceRef = GetRsrcRefFromObj(objv[3], 1, 
-		                "list", resultPtr);
-		if (resourceRef == NULL) {
-		    return TCL_ERROR;
-		}	
-
-		saveRef = CurResFile();
-		UseResFile((short) resourceRef->fileRef);
-		limitSearch = true;
-	    }
-
-	    Tcl_ResetResult(interp);
-	    if (limitSearch) {
-		count = Count1Resources(rezType);
-	    } else {
-		count = CountResources(rezType);
-	    }
-	    SetResLoad(false);
-	    for (i = 1; i <= count; i++) {
-		if (limitSearch) {
-		    resource = Get1IndResource(rezType, i);
-		} else {
-		    resource = GetIndResource(rezType, i);
-		}
-		if (resource != NULL) {
-		    GetResInfo(resource, &id, (ResType *) &rezType, theName);
-		    if (theName[0] != 0) {
-		        
-			objPtr = Tcl_NewStringObj((char *) theName + 1,
-				theName[0]);
-		    } else {
-			objPtr = Tcl_NewIntObj(id);
-		    }
-		    ReleaseResource(resource);
-		    result = Tcl_ListObjAppendElement(interp, resultPtr,
-			    objPtr);
-		    if (result != TCL_OK) {
-			Tcl_DecrRefCount(objPtr);
-			break;
-		    }
-		}
-	    }
-	    SetResLoad(true);
-	
-	    if (limitSearch) {
-		UseResFile(saveRef);
-	    }
-	
-	    return TCL_OK;
-	case RESOURCE_OPEN: {
-	    Tcl_DString ds, buffer;
-	    char *str, *native;
-	    int length;
-	    			
-	    if (!((objc == 3) || (objc == 4))) {
-		Tcl_WrongNumArgs(interp, 2, objv, "fileName ?permissions?");
-		return TCL_ERROR;
-	    }
-	    str = Tcl_GetStringFromObj(objv[2], &length);
-	    if (Tcl_TranslateFileName(interp, str, &buffer) == NULL) {
-	        return TCL_ERROR;
-	    }
-	    native = Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&buffer),
-	    	    Tcl_DStringLength(&buffer), &ds);
-	    err = FSpLocationFromPath(Tcl_DStringLength(&ds), native, &fileSpec);
-	    Tcl_DStringFree(&ds);
-	    Tcl_DStringFree(&buffer);
-
-	    if (!((err == noErr) || (err == fnfErr))) {
-		Tcl_AppendStringsToObj(resultPtr, "invalid path", (char *) NULL);
-		return TCL_ERROR;
-	    }
-
-	    /*
-	     * Get permissions for the file.  We really only understand
-	     * read-only and shared-read-write.  If no permissions are 
-	     * given we default to read only.
-	     */
-	    
-	    if (objc == 4) {
-		stringPtr = Tcl_GetStringFromObj(objv[3], &length);
-		mode = TclGetOpenMode(interp, stringPtr, &index);
-		if (mode == -1) {
-		    /* TODO: TclGetOpenMode doesn't work with Obj commands. */
-		    return TCL_ERROR;
-		}
-		switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
-		    case O_RDONLY:
-			macPermision = fsRdPerm;
-		    break;
-		    case O_WRONLY:
-		    case O_RDWR:
-			macPermision = fsRdWrPerm;
-			break;
-		    default:
-			panic("Tcl_ResourceObjCmd: invalid mode value");
-		    break;
-		}
-	    } else {
-		macPermision = fsRdPerm;
-	    }
-	    
-	    /*
-	     * Don't load in any of the resources in the file, this could 
-	     * cause problems if you open a file that has CODE resources...
-	     */
-	     
-	    SetResLoad(false); 
-	    fileRef = (long) FSpOpenResFileCompat(&fileSpec, macPermision);
-	    SetResLoad(true);
-	    
-	    if (fileRef == -1) {
-	    	err = ResError();
-		if (((err == fnfErr) || (err == eofErr)) &&
-			(macPermision == fsRdWrPerm)) {
-		    /*
-		     * No resource fork existed for this file.  Since we are
-		     * opening it for writing we will create the resource fork
-		     * now.
-		     */
-		     
-		    HCreateResFile(fileSpec.vRefNum, fileSpec.parID,
-			    fileSpec.name);
-		    fileRef = (long) FSpOpenResFileCompat(&fileSpec,
-			    macPermision);
-		    if (fileRef == -1) {
-			goto openError;
-		    }
-		} else if (err == fnfErr) {
-		    Tcl_AppendStringsToObj(resultPtr,
-			"file does not exist", (char *) NULL);
-		    return TCL_ERROR;
-		} else if (err == eofErr) {
-		    Tcl_AppendStringsToObj(resultPtr,
-			"file does not contain resource fork", (char *) NULL);
-		    return TCL_ERROR;
-		} else {
-		    openError:
-		    Tcl_AppendStringsToObj(resultPtr,
-			"error opening resource file", (char *) NULL);
-		    return TCL_ERROR;
-		}
-	    }
-	    	    
-            /*
-             * The FspOpenResFile function does not set the ResFileAttrs.
-             * Even if you open the file read only, the mapReadOnly
-             * attribute is not set.  This means we can't detect writes to a 
-             * read only resource fork until the write fails, which is bogus.  
-             * So set it here...
-             */
-            
-            if (macPermision == fsRdPerm) {
-                SetResFileAttrs(fileRef, mapReadOnly);
-            }
-            
-            Tcl_SetStringObj(resultPtr, "", 0);
-            if (TclMacRegisterResourceFork(fileRef, resultPtr, 
-                    TCL_RESOURCE_CHECK_IF_OPEN) != TCL_OK) {
-                CloseResFile(fileRef);
-		return TCL_ERROR;
-            }
-	    return TCL_OK;
-	}
-	case RESOURCE_READ:			
-	    if (!((objc == 4) || (objc == 5))) {
-		Tcl_WrongNumArgs(interp, 2, objv,
-			"resourceType resourceId ?resourceRef?");
-		return TCL_ERROR;
-	    }
-
-	    if (Tcl_GetOSTypeFromObj(interp, objv[2], &rezType) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    
-	    if (Tcl_GetLongFromObj((Tcl_Interp *) NULL, objv[3], &rsrcId)
-		    != TCL_OK) {
-		resourceId = Tcl_GetStringFromObj(objv[3], &length);
-            }
-
-	    if (objc == 5) {
-		stringPtr = Tcl_GetStringFromObj(objv[4], &length);
-	    } else {
-		stringPtr = NULL;
-	    }
-	
-	    resource = Tcl_MacFindResource(interp, rezType, resourceId,
-		rsrcId, stringPtr, &releaseIt);
-			    
-	    if (resource != NULL) {
-		size = GetResourceSizeOnDisk(resource);
-		Tcl_SetByteArrayObj(resultPtr, (unsigned char *) *resource, size);
-
-		/*
-		 * Don't release the resource unless WE loaded it...
-		 */
-		 
-		if (releaseIt) {
-		    ReleaseResource(resource);
-		}
-		return TCL_OK;
-	    } else {
-		Tcl_AppendStringsToObj(resultPtr, "could not load resource",
-		    (char *) NULL);
-		return TCL_ERROR;
-	    }
-	case RESOURCE_TYPES:			
-	    if (!((objc == 2) || (objc == 3))) {
-		Tcl_WrongNumArgs(interp, 2, objv, "?resourceRef?");
-		return TCL_ERROR;
-	    }
-
-	    if (objc == 3) {
-	        resourceRef = GetRsrcRefFromObj(objv[2], 1, 
-		                "get types of", resultPtr);
-		if (resourceRef == NULL) {
-		    return TCL_ERROR;
-		}
-			
-		saveRef = CurResFile();
-		UseResFile((short) resourceRef->fileRef);
-		limitSearch = true;
-	    }
-
-	    if (limitSearch) {
-		count = Count1Types();
-	    } else {
-		count = CountTypes();
-	    }
-	    for (i = 1; i <= count; i++) {
-		if (limitSearch) {
-		    Get1IndType((ResType *) &rezType, i);
-		} else {
-		    GetIndType((ResType *) &rezType, i);
-		}
-		objPtr = Tcl_NewOSTypeObj(rezType);
-		result = Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
-		if (result != TCL_OK) {
-		    Tcl_DecrRefCount(objPtr);
-		    break;
-		}
-	    }
-		
-	    if (limitSearch) {
-		UseResFile(saveRef);
-	    }
-		
-	    return result;
-	case RESOURCE_WRITE:			
-	    if ((objc < 4) || (objc > 11)) {
-		Tcl_WrongNumArgs(interp, 2, objv, 
-		"?-id resourceId? ?-name resourceName? ?-file resourceRef?\
- ?-force? resourceType data");
-		return TCL_ERROR;
-	    }
-	    
-	    i = 2;
-	    gotInt = false;
-	    resourceId = NULL;
-	    limitSearch = false;
-	    force = 0;
-
-	    while (i < (objc - 2)) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], writeSwitches,
-			"switch", 0, &index) != TCL_OK) {
-		    return TCL_ERROR;
-		}
-
-		switch (index) {
-		    case RESOURCE_WRITE_ID:		
-			if (Tcl_GetLongFromObj(interp, objv[i+1], &rsrcId)
-				!= TCL_OK) {
-			    return TCL_ERROR;
-			}
-			gotInt = true;
-		        i += 2;
-			break;
-		    case RESOURCE_WRITE_NAME:		
-			resourceId = Tcl_GetStringFromObj(objv[i+1], &length);
-			strcpy((char *) theName, resourceId);
-			resourceId = (char *) theName;
-			c2pstr(resourceId);
-		        i += 2;
-			break;
-		    case RESOURCE_WRITE_FILE:		
-	                resourceRef = GetRsrcRefFromObj(objv[i+1], 0, 
-		                        "write to", resultPtr);
-                        if (resourceRef == NULL) {
-                            return TCL_ERROR;
-		        }	
-			limitSearch = true;
-		        i += 2;
-			break;
-		    case RESOURCE_FORCE:
-		        force = 1;
-		        i += 1;
-		        break;
-		}
-	    }
-	    if (Tcl_GetOSTypeFromObj(interp, objv[i], &rezType) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    stringPtr = (char *) Tcl_GetByteArrayFromObj(objv[i+1], &length);
-
-	    if (gotInt == false) {
-		rsrcId = UniqueID(rezType);
-	    }
-	    if (resourceId == NULL) {
-		resourceId = (char *) "\p";
-	    }
-	    if (limitSearch) {
-		saveRef = CurResFile();
-		UseResFile((short) resourceRef->fileRef);
-	    }
-	    
-	    /*
-	     * If we are adding the resource by number, then we must make sure
-	     * there is not already a resource of that number.  We are not going
-	     * load it here, since we want to detect whether we loaded it or
-	     * not.  Remember that releasing some resources in particular menu
-	     * related ones, can be fatal.
-	     */
-	     
-	    if (gotInt == true) {
-	        SetResLoad(false);
-	        resource = Get1Resource(rezType,rsrcId);
-	        SetResLoad(true);
-	    }     
-	    	    
-	    if (resource == NULL) {
-	        /*
-	         * We get into this branch either if there was not already a
-	         * resource of this type & id, or the id was not specified.
-	         */
-	         
-	        resource = NewHandle(length);
-	        if (resource == NULL) {
-	            resource = NewHandleSys(length);
-	            if (resource == NULL) {
-	                panic("could not allocate memory to write resource");
-	            }
-	        }
-	        HLock(resource);
-	        memcpy(*resource, stringPtr, length);
-	        HUnlock(resource);
-	        AddResource(resource, rezType, (short) rsrcId,
-		    (StringPtr) resourceId);
-		releaseIt = 1;
-            } else {
-                /* 
-                 * We got here because there was a resource of this type 
-                 * & ID in the file. 
-                 */ 
-                
-                if (*resource == NULL) {
-                    releaseIt = 1;
-                } else {
-                    releaseIt = 0;
-                }
-               
-                if (!force) {
-                    /*
-                     *We only overwrite extant resources
-                     * when the -force flag has been set.
-                     */
-                     
-                    sprintf(errbuf,"%d", rsrcId);
-                  
-                    Tcl_AppendStringsToObj(resultPtr, "the resource ",
-                          errbuf, " already exists, use \"-force\"",
-                          " to overwrite it.", (char *) NULL);
-                    
-                    result = TCL_ERROR;
-                    goto writeDone;
-                } else if (GetResAttrs(resource) & resProtected) {
-                    /*  
-                     *  
-                     * Next, check to see if it is protected...
-                     */
-                 
-                    sprintf(errbuf,"%d", rsrcId);
-                    Tcl_AppendStringsToObj(resultPtr,
-			    "could not write resource id ",
-                            errbuf, " of type ",
-                            Tcl_GetStringFromObj(objv[i],&length),
-                            ", it was protected.",(char *) NULL);
-                    result = TCL_ERROR;
-                    goto writeDone;
-                } else {
-                    /*
-                     * Be careful, the resource might already be in memory
-                     * if something else loaded it.
-                     */
-                     
-                    if (*resource == 0) {
-                    	LoadResource(resource);
-                    	err = ResError();
-                    	if (err != noErr) {
-                            sprintf(errbuf,"%d", rsrcId);
-                            Tcl_AppendStringsToObj(resultPtr,
-				    "error loading resource ",
-                                    errbuf, " of type ",
-                                    Tcl_GetStringFromObj(objv[i],&length),
-                                    " to overwrite it", (char *) NULL);
-                            goto writeDone;
-                    	}
-                    }
-                     
-                    SetHandleSize(resource, length);
-                    if ( MemError() != noErr ) {
-                        panic("could not allocate memory to write resource");
-                    }
-
-                    HLock(resource);
-	            memcpy(*resource, stringPtr, length);
-	            HUnlock(resource);
-	           
-                    ChangedResource(resource);
-                
-                    /*
-                     * We also may have changed the name...
-                     */ 
-                 
-                    SetResInfo(resource, rsrcId, (StringPtr) resourceId);
-                }
-            }
-            
-	    err = ResError();
-	    if (err != noErr) {
-		Tcl_AppendStringsToObj(resultPtr,
-			"error adding resource to resource map",
-		        (char *) NULL);
-		result = TCL_ERROR;
-		goto writeDone;
-	    }
-	    
-	    WriteResource(resource);
-	    err = ResError();
-	    if (err != noErr) {
-		Tcl_AppendStringsToObj(resultPtr,
-			"error writing resource to disk",
-		        (char *) NULL);
-		result = TCL_ERROR;
-	    }
-	    
-	    writeDone:
-	    
-	    if (releaseIt) {
-	        ReleaseResource(resource);
-	        err = ResError();
-	        if (err != noErr) {
-		    Tcl_AppendStringsToObj(resultPtr,
-			    "error releasing resource",
-		            (char *) NULL);
-		    result = TCL_ERROR;
-	        }
-	    }
-	    
-	    if (limitSearch) {
-		UseResFile(saveRef);
-	    }
-
-	    return result;
-	default:
-	    panic("Tcl_GetIndexFromObj returned unrecognized option");
-	    return TCL_ERROR;	/* Should never be reached. */
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MacSourceObjCmd --
- *
- *	This procedure is invoked to process the "source" Tcl command.
- *	See the user documentation for details on what it does.  In 
- *	addition, it supports sourceing from the resource fork of
- *	type 'TEXT'.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_MacSourceObjCmd(
-    ClientData dummy,			/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *CONST objv[])		/* Argument objects. */
-{
-    char *errNum = "wrong # args: ";
-    char *errBad = "bad argument: ";
-    char *errStr;
-    char *fileName = NULL, *rsrcName = NULL;
-    long rsrcID = -1;
-    char *string;
-    int length;
-
-    if (objc < 2 || objc > 4)  {
-    	errStr = errNum;
-    	goto sourceFmtErr;
-    }
-    
-    if (objc == 2)  {
-	string = Tcl_GetStringFromObj(objv[1], &length);
-	return Tcl_EvalFile(interp, string);
-    }
-    
-    /*
-     * The following code supports a few older forms of this command
-     * for backward compatability.
-     */
-    string = Tcl_GetStringFromObj(objv[1], &length);
-    if (!strcmp(string, "-rsrc") || !strcmp(string, "-rsrcname")) {
-	rsrcName = Tcl_GetStringFromObj(objv[2], &length);
-    } else if (!strcmp(string, "-rsrcid")) {
-	if (Tcl_GetLongFromObj(interp, objv[2], &rsrcID) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    } else {
-    	errStr = errBad;
-    	goto sourceFmtErr;
-    }
-    
-    if (objc == 4) {
-	fileName = Tcl_GetStringFromObj(objv[3], &length);
-    }
-    return Tcl_MacEvalResource(interp, rsrcName, rsrcID, fileName);
-	
-    sourceFmtErr:
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), errStr, "should be \"",
-		Tcl_GetString(objv[0]), " fileName\" or \"",
-		Tcl_GetString(objv[0]),	" -rsrc name ?fileName?\" or \"", 
-		Tcl_GetString(objv[0]), " -rsrcid id ?fileName?\"",
-		(char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_BeepObjCmd --
- *
- *	This procedure makes the beep sound.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Makes a beep.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_BeepObjCmd(
-    ClientData dummy,			/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *CONST objv[])		/* Argument values. */
-{
-    Tcl_Obj *resultPtr, *objPtr;
-    Handle sound;
-    Str255 sndName;
-    int volume = -1, length;
-    char * sndArg = NULL;
-
-    resultPtr = Tcl_GetObjResult(interp);
-    if (objc == 1) {
-	SysBeep(1);
-	return TCL_OK;
-    } else if (objc == 2) {
-	if (!strcmp(Tcl_GetStringFromObj(objv[1], &length), "-list")) {
-	    int count, i;
-	    short id;
-	    Str255 theName;
-	    ResType rezType;
-			
-	    count = CountResources('snd ');
-	    for (i = 1; i <= count; i++) {
-		sound = GetIndResource('snd ', i);
-		if (sound != NULL) {
-		    GetResInfo(sound, &id, &rezType, theName);
-		    if (theName[0] == 0) {
-			continue;
-		    }
-		    objPtr = Tcl_NewStringObj((char *) theName + 1,
-			    theName[0]);
-		    Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
-		}
-	    }
-	    return TCL_OK;
-	} else {
-	    sndArg = Tcl_GetStringFromObj(objv[1], &length);
-	}
-    } else if (objc == 3) {
-	if (!strcmp(Tcl_GetStringFromObj(objv[1], &length), "-volume")) {
-	    Tcl_GetIntFromObj(interp, objv[2], &volume);
-	} else {
-	    goto beepUsage;
-	}
-    } else if (objc == 4) {
-	if (!strcmp(Tcl_GetStringFromObj(objv[1], &length), "-volume")) {
-	    Tcl_GetIntFromObj(interp, objv[2], &volume);
-	    sndArg = Tcl_GetStringFromObj(objv[3], &length);
-	} else {
-	    goto beepUsage;
-	}
-    } else {
-	goto beepUsage;
-    }
-	
-    /*
-     * Play the sound
-     */
-    if (sndArg == NULL) {
-	/*
-         * Set Volume for SysBeep
-         */
-
-	if (volume >= 0) {
-	    SetSoundVolume(volume, SYS_BEEP_VOLUME);
-	}
-	SysBeep(1);
-
-	/*
-         * Reset Volume
-         */
-
-	if (volume >= 0) {
-	    SetSoundVolume(0, RESET_VOLUME);
-	}
-    } else {
-	strcpy((char *) sndName + 1, sndArg);
-	sndName[0] = length;
-	sound = GetNamedResource('snd ', sndName);
-	if (sound != NULL) {
-	    /*
-             * Set Volume for Default Output device
-             */
-
-	    if (volume >= 0) {
-		SetSoundVolume(volume, DEFAULT_SND_VOLUME);
-	    }
-
-	    SndPlay(NULL, (SndListHandle) sound, false);
-
-	    /*
-             * Reset Volume
-             */
-
-	    if (volume >= 0) {
-		SetSoundVolume(0, RESET_VOLUME);
-	    }
-	} else {
-	    Tcl_AppendStringsToObj(resultPtr, " \"", sndArg, 
-		    "\" is not a valid sound.  (Try ",
-		    Tcl_GetString(objv[0]), " -list)", NULL);
-	    return TCL_ERROR;
-	}
-    }
-
-    return TCL_OK;
-
-    beepUsage:
-    Tcl_WrongNumArgs(interp, 1, objv, "[-volume num] [-list | sndName]?");
-    return TCL_ERROR;
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * SetSoundVolume --
- *
- *	Set the volume for either the SysBeep or the SndPlay call depending
- *	on the value of mode (SYS_BEEP_VOLUME or DEFAULT_SND_VOLUME
- *      respectively.
- *
- *      It also stores the last channel set, and the old value of its 
- *	VOLUME.  If you call SetSoundVolume with a mode of RESET_VOLUME, 
- *	it will undo the last setting.  The volume parameter is
- *      ignored in this case.
- *
- * Side Effects:
- *	Sets the System Volume
- *
- * Results:
- *      None
- *
- *-----------------------------------------------------------------------------
- */
-
-void
-SetSoundVolume(
-    int volume,              /* This is the new volume */
-    enum WhichVolume mode)   /* This flag says which volume to
-			      * set: SysBeep, SndPlay, or instructs us
-			      * to reset the volume */
-{
-    static int hasSM3 = -1;
-    static enum WhichVolume oldMode;
-    static long oldVolume = -1;
-
-    /*
-     * The volume setting calls only work if we have SoundManager
-     * 3.0 or higher.  So we check that here.
-     */
-    
-    if (hasSM3 == -1) {
-    	if (GetToolboxTrapAddress(_SoundDispatch) 
-		!= GetToolboxTrapAddress(_Unimplemented)) {
-	    NumVersion SMVers = SndSoundManagerVersion();
-	    if (SMVers.majorRev > 2) {
-	    	hasSM3 = 1;
-	    } else {
-		hasSM3 = 0;
-	    }
-	} else {
-	    /*
-	     * If the SoundDispatch trap is not present, then
-	     * we don't have the SoundManager at all.
-	     */
-	    
-	    hasSM3 = 0;
-	}
-    }
-    
-    /*
-     * If we don't have Sound Manager 3.0, we can't set the sound volume.
-     * We will just ignore the request rather than raising an error.
-     */
-    
-    if (!hasSM3) {
-    	return;
-    }
-    
-    switch (mode) {
-    	case SYS_BEEP_VOLUME:
-	    GetSysBeepVolume(&oldVolume);
-	    SetSysBeepVolume(volume);
-	    oldMode = SYS_BEEP_VOLUME;
-	    break;
-	case DEFAULT_SND_VOLUME:
-	    GetDefaultOutputVolume(&oldVolume);
-	    SetDefaultOutputVolume(volume);
-	    oldMode = DEFAULT_SND_VOLUME;
-	    break;
-	case RESET_VOLUME:
-	    /*
-	     * If oldVolume is -1 someone has made a programming error
-	     * and called reset before setting the volume.  This is benign
-	     * however, so we will just exit.
-	     */
-	  
-	    if (oldVolume != -1) {	
-	        if (oldMode == SYS_BEEP_VOLUME) {
-	    	    SetSysBeepVolume(oldVolume);
-	        } else if (oldMode == DEFAULT_SND_VOLUME) {
-		    SetDefaultOutputVolume(oldVolume);
-	        }
-	    }
-	    oldVolume = -1;
-    }
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * Tcl_MacEvalResource --
- *
- *	Used to extend the source command.  Sources Tcl code from a Text
- *	resource.  Currently only sources the resouce by name file ID may be
- *	supported at a later date.
- *
- * Side Effects:
- *	Depends on the Tcl code in the resource.
- *
- * Results:
- *      Returns a Tcl result.
- *
- *-----------------------------------------------------------------------------
- */
-
-int
-Tcl_MacEvalResource(
-    Tcl_Interp *interp,		/* Interpreter in which to process file. */
-    char *resourceName,		/* Name of TEXT resource to source,
-				   NULL if number should be used. */
-    int resourceNumber,		/* Resource id of source. */
-    char *fileName)		/* Name of file to process.
-				   NULL if application resource. */
-{
-    Handle sourceText;
-    Str255 rezName;
-    char msg[200];
-    int result, iOpenedResFile = false;
-    short saveRef, fileRef = -1;
-    char idStr[64];
-    FSSpec fileSpec;
-    Tcl_DString buffer;
-    char *nativeName;
-
-    saveRef = CurResFile();
-	
-    if (fileName != NULL) {
-	OSErr err;
-	
-	nativeName = Tcl_TranslateFileName(interp, fileName, &buffer);
-	if (nativeName == NULL) {
-	    return TCL_ERROR;
-	}
-	err = FSpLocationFromPath(strlen(nativeName), nativeName,
-                &fileSpec);
-	Tcl_DStringFree(&buffer);
-	if (err != noErr) {
-	    Tcl_AppendResult(interp, "Error finding the file: \"", 
-		fileName, "\".", NULL);
-	    return TCL_ERROR;
-	}
-		
-	fileRef = FSpOpenResFileCompat(&fileSpec, fsRdPerm);
-	if (fileRef == -1) {
-	    Tcl_AppendResult(interp, "Error reading the file: \"", 
-		fileName, "\".", NULL);
-	    return TCL_ERROR;
-	}
-		
-	UseResFile(fileRef);
-	iOpenedResFile = true;
-    } else {
-	/*
-	 * The default behavior will search through all open resource files.
-	 * This may not be the behavior you desire.  If you want the behavior
-	 * of this call to *only* search the application resource fork, you
-	 * must call UseResFile at this point to set it to the application
-	 * file.  This means you must have already obtained the application's 
-	 * fileRef when the application started up.
-	 */
-    }
-	
-    /*
-     * Load the resource by name or ID
-     */
-    if (resourceName != NULL) {
-	strcpy((char *) rezName + 1, resourceName);
-	rezName[0] = strlen(resourceName);
-	sourceText = GetNamedResource('TEXT', rezName);
-    } else {
-	sourceText = GetResource('TEXT', (short) resourceNumber);
-    }
-	
-    if (sourceText == NULL) {
-	result = TCL_ERROR;
-    } else {
-	char *sourceStr = NULL;
-
-	HLock(sourceText);
-	sourceStr = Tcl_MacConvertTextResource(sourceText);
-	HUnlock(sourceText);
-	ReleaseResource(sourceText);
-		
-	/*
-	 * We now evaluate the Tcl source
-	 */
-	result = Tcl_Eval(interp, sourceStr);
-	ckfree(sourceStr);
-	if (result == TCL_RETURN) {
-	    result = TCL_OK;
-	} else if (result == TCL_ERROR) {
-	    sprintf(msg, "\n    (rsrc \"%.150s\" line %d)",
-                    resourceName,
-		    interp->errorLine);
-	    Tcl_AddErrorInfo(interp, msg);
-	}
-				
-	goto rezEvalCleanUp;
-    }
-	
-    rezEvalError:
-    sprintf(idStr, "ID=%d", resourceNumber);
-    Tcl_AppendResult(interp, "The resource \"",
-	    (resourceName != NULL ? resourceName : idStr),
-	    "\" could not be loaded from ",
-	    (fileName != NULL ? fileName : "application"),
-	    ".", NULL);
-
-    rezEvalCleanUp:
-
-    /* 
-     * TRICKY POINT: The code that you are sourcing here could load a
-     * shared library.  This will go AHEAD of the resource we stored away
-     * in saveRef on the resource path.  
-     * If you restore the saveRef in this case, you will never be able
-     * to get to the resources in the shared library, since you are now
-     * pointing too far down on the resource list.  
-     * So, we only reset the current resource file if WE opened a resource
-     * explicitly, and then only if the CurResFile is still the 
-     * one we opened... 
-     */
-     
-    if (iOpenedResFile && (CurResFile() == fileRef)) {
-        UseResFile(saveRef);
-    }
-	
-    if (fileRef != -1) {
-	CloseResFile(fileRef);
-    }
-
-    return result;
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * Tcl_MacConvertTextResource --
- *
- *	Converts a TEXT resource into a Tcl suitable string.
- *
- * Side Effects:
- *	Mallocs the returned memory, converts '\r' to '\n', and appends a NULL.
- *
- * Results:
- *      A new malloced string.
- *
- *-----------------------------------------------------------------------------
- */
-
-char *
-Tcl_MacConvertTextResource(
-    Handle resource)		/* Handle to TEXT resource. */
-{
-    int i, size;
-    char *resultStr;
-
-    size = GetResourceSizeOnDisk(resource);
-    
-    resultStr = ckalloc(size + 1);
-    
-    for (i=0; i<size; i++) {
-	if ((*resource)[i] == '\r') {
-	    resultStr[i] = '\n';
-	} else {
-	    resultStr[i] = (*resource)[i];
-	}
-    }
-    
-    resultStr[size] = '\0';
-
-    return resultStr;
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * Tcl_MacFindResource --
- *
- *	Higher level interface for loading resources.
- *
- * Side Effects:
- *	Attempts to load a resource.
- *
- * Results:
- *      A handle on success.
- *
- *-----------------------------------------------------------------------------
- */
-
-Handle
-Tcl_MacFindResource(
-    Tcl_Interp *interp,		/* Interpreter in which to process file. */
-    long resourceType,		/* Type of resource to load. */
-    char *resourceName,		/* Name of resource to find,
-				 * NULL if number should be used. */
-    int resourceNumber,		/* Resource id of source. */
-    char *resFileRef,		/* Registered resource file reference,
-				 * NULL if searching all open resource files. */
-    int *releaseIt)	        /* Should we release this resource when done. */
-{
-    Tcl_HashEntry *nameHashPtr;
-    OpenResourceFork *resourceRef;
-    int limitSearch = false;
-    short saveRef;
-    Handle resource;
-
-    if (resFileRef != NULL) {
-	nameHashPtr = Tcl_FindHashEntry(&nameTable, resFileRef);
-	if (nameHashPtr == NULL) {
-	    Tcl_AppendResult(interp, "invalid resource file reference \"",
-			     resFileRef, "\"", (char *) NULL);
-	    return NULL;
-	}
-	resourceRef = (OpenResourceFork *) Tcl_GetHashValue(nameHashPtr);
-	saveRef = CurResFile();
-	UseResFile((short) resourceRef->fileRef);
-	limitSearch = true;
-    }
-
-    /* 
-     * Some system resources (for example system resources) should not 
-     * be released.  So we set autoload to false, and try to get the resource.
-     * If the Master Pointer of the returned handle is null, then resource was 
-     * not in memory, and it is safe to release it.  Otherwise, it is not.
-     */
-    
-    SetResLoad(false);
-	 
-    if (resourceName == NULL) {
-	if (limitSearch) {
-	    resource = Get1Resource(resourceType, resourceNumber);
-	} else {
-	    resource = GetResource(resourceType, resourceNumber);
-	}
-    } else {
-	c2pstr(resourceName);
-	if (limitSearch) {
-	    resource = Get1NamedResource(resourceType,
-		    (StringPtr) resourceName);
-	} else {
-	    resource = GetNamedResource(resourceType,
-		    (StringPtr) resourceName);
-	}
-	p2cstr((StringPtr) resourceName);
-    }
-    
-    if (*resource == NULL) {
-    	*releaseIt = 1;
-    	LoadResource(resource);
-    } else {
-    	*releaseIt = 0;
-    }
-    
-    SetResLoad(true);
-    	
-
-    if (limitSearch) {
-	UseResFile(saveRef);
-    }
-
-    return resource;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ResourceInit --
- *
- *	Initialize the structures used for resource management.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Read the code.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ResourceInit()
-{
-
-    initialized = 1;
-    Tcl_InitHashTable(&nameTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&resourceTable, TCL_ONE_WORD_KEYS);
-    resourceForkList = Tcl_NewObj();
-    Tcl_IncrRefCount(resourceForkList);
-
-    BuildResourceForkList();
-    
-}
-/***/
-
-/*Tcl_RegisterObjType(typePtr) */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_NewOSTypeObj --
- *
- *	This procedure is used to create a new resource name type object.
- *
- * Results:
- *	The newly created object is returned. This object will have a NULL
- *	string representation. The returned object has ref count 0.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Obj *
-Tcl_NewOSTypeObj(
-    OSType newOSType)		/* Int used to initialize the new object. */
-{
-    register Tcl_Obj *objPtr;
-
-    if (!osTypeInit) {
-	osTypeInit = 1;
-	Tcl_RegisterObjType(&osType);
-    }
-
-    objPtr = Tcl_NewObj();
-    objPtr->bytes = NULL;
-    objPtr->internalRep.longValue = newOSType;
-    objPtr->typePtr = &osType;
-    return objPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetOSTypeObj --
- *
- *	Modify an object to be a resource type and to have the 
- *	specified long value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's old string rep, if any, is freed. Also, any old
- *	internal rep is freed. 
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetOSTypeObj(
-    Tcl_Obj *objPtr,		/* Object whose internal rep to init. */
-    OSType newOSType)		/* Integer used to set object's value. */
-{
-    register Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
-    if (!osTypeInit) {
-	osTypeInit = 1;
-	Tcl_RegisterObjType(&osType);
-    }
-
-    Tcl_InvalidateStringRep(objPtr);
-    if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = newOSType;
-    objPtr->typePtr = &osType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetOSTypeFromObj --
- *
- *	Attempt to return an int from the Tcl object "objPtr". If the object
- *	is not already an int, an attempt will be made to convert it to one.
- *
- * Results:
- *	The return value is a standard Tcl object result. If an error occurs
- *	during conversion, an error message is left in interp->objResult
- *	unless "interp" is NULL.
- *
- * Side effects:
- *	If the object is not already an int, the conversion will free
- *	any old internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetOSTypeFromObj(
-    Tcl_Interp *interp, 	/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr,		/* The object from which to get a int. */
-    OSType *osTypePtr)		/* Place to store resulting int. */
-{
-    register int result;
-    
-    if (!osTypeInit) {
-	osTypeInit = 1;
-	Tcl_RegisterObjType(&osType);
-    }
-
-    if (objPtr->typePtr == &osType) {
-	*osTypePtr = objPtr->internalRep.longValue;
-	return TCL_OK;
-    }
-
-    result = SetOSTypeFromAny(interp, objPtr);
-    if (result == TCL_OK) {
-	*osTypePtr = objPtr->internalRep.longValue;
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DupOSTypeInternalRep --
- *
- *	Initialize the internal representation of an int Tcl_Obj to a
- *	copy of the internal representation of an existing int object. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	"copyPtr"s internal rep is set to the integer corresponding to
- *	"srcPtr"s internal rep.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DupOSTypeInternalRep(
-    Tcl_Obj *srcPtr,	/* Object with internal rep to copy. */
-    Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
-{
-    copyPtr->internalRep.longValue = srcPtr->internalRep.longValue;
-    copyPtr->typePtr = &osType;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetOSTypeFromAny --
- *
- *	Attempt to generate an integer internal form for the Tcl object
- *	"objPtr".
- *
- * Results:
- *	The return value is a standard object Tcl result. If an error occurs
- *	during conversion, an error message is left in interp->objResult
- *	unless "interp" is NULL.
- *
- * Side effects:
- *	If no error occurs, an int is stored as "objPtr"s internal
- *	representation. 
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetOSTypeFromAny(
-    Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
-    Tcl_Obj *objPtr)		/* The object to convert. */
-{
-    Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-    char *string;
-    int length;
-    long newOSType;
-
-    /*
-     * Get the string representation. Make it up-to-date if necessary.
-     */
-
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    if (length != 4) {
-	if (interp != NULL) {
-	    Tcl_ResetResult(interp);
-	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		    "expected Macintosh OS type but got \"", string, "\"",
-		    (char *) NULL);
-	}
-	return TCL_ERROR;
-    }
-    newOSType =  *((long *) string);
-    
-    /*
-     * The conversion to resource type succeeded. Free the old internalRep 
-     * before setting the new one.
-     */
-
-    if ((oldTypePtr != NULL) &&	(oldTypePtr->freeIntRepProc != NULL)) {
-	oldTypePtr->freeIntRepProc(objPtr);
-    }
-    
-    objPtr->internalRep.longValue = newOSType;
-    objPtr->typePtr = &osType;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UpdateStringOfOSType --
- *
- *	Update the string representation for an resource type object.
- *	Note: This procedure does not free an existing old string rep
- *	so storage will be lost if this has not already been done. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The object's string is set to a valid string that results from
- *	the int-to-string conversion.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-UpdateStringOfOSType(
-    register Tcl_Obj *objPtr)	/* Int object whose string rep to update. */
-{
-    objPtr->bytes = ckalloc(5);
-    sprintf(objPtr->bytes, "%-4.4s", &(objPtr->internalRep.longValue));
-    objPtr->length = 4;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetRsrcRefFromObj --
- *
- *	Given a String object containing a resource file token, return
- *	the OpenResourceFork structure that it represents, or NULL if 
- *	the token cannot be found.  If okayOnReadOnly is false, it will 
- *      also check whether the token corresponds to a read-only file, 
- *      and return NULL if it is.
- *
- * Results:
- *	A pointer to an OpenResourceFork structure, or NULL.
- *
- * Side effects:
- *	An error message may be left in resultPtr.
- *
- *----------------------------------------------------------------------
- */
-
-static OpenResourceFork *
-GetRsrcRefFromObj(
-    register Tcl_Obj *objPtr,	/* String obj containing file token     */
-    int okayOnReadOnly,         /* Whether this operation is okay for a *
-                                 * read only file.                      */
-    const char *operation,      /* String containing the operation we   *
-                                 * were trying to perform, used for errors */
-    Tcl_Obj *resultPtr)         /* Tcl_Obj to contain error message     */
-{
-    char *stringPtr;
-    Tcl_HashEntry *nameHashPtr;
-    OpenResourceFork *resourceRef;
-    int length;
-    OSErr err;
-    
-    stringPtr = Tcl_GetStringFromObj(objPtr, &length);
-    nameHashPtr = Tcl_FindHashEntry(&nameTable, stringPtr);
-    if (nameHashPtr == NULL) {
-        Tcl_AppendStringsToObj(resultPtr,
-	        "invalid resource file reference \"",
-	        stringPtr, "\"", (char *) NULL);
-        return NULL;
-    }
-
-    resourceRef = (OpenResourceFork *) Tcl_GetHashValue(nameHashPtr);
-    
-    if (!okayOnReadOnly) {
-        err = GetResFileAttrs((short) resourceRef->fileRef);
-        if (err & mapReadOnly) {
-            Tcl_AppendStringsToObj(resultPtr, "cannot ", operation, 
-                    " resource file \"",
-                    stringPtr, "\", it was opened read only",
-                    (char *) NULL);
-            return NULL;
-        }
-    }
-    return resourceRef;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacRegisterResourceFork --
- *
- *	Register an open resource fork in the table of open resources 
- *	managed by the procedures in this file.  If the resource file
- *      is already registered with the table, then no new token is made.
- *
- *      The behavior is controlled by the value of tokenPtr, and of the 
- *	flags variable.  For tokenPtr, the possibilities are:
- *	  - NULL: The new token is auto-generated, but not returned.
- *        - The string value of tokenPtr is the empty string: Then
- *		the new token is auto-generated, and returned in tokenPtr
- *	  - tokenPtr has a value: The string value will be used for the token,
- *		unless it is already in use, in which case a new token will
- *		be generated, and returned in tokenPtr.
- *
- *      For the flags variable:  it can be one of:
- *	  - TCL_RESOURCE__INSERT_TAIL: The element is inserted at the
- *              end of the list of open resources.  Used only in Resource_Init.
- *	  - TCL_RESOURCE_DONT_CLOSE: The resource close command will not close
- *	        this resource.
- *	  - TCL_RESOURCE_CHECK_IF_OPEN: This will check to see if this file's
- *	        resource fork is already opened by this Tcl shell, and return 
- *	        an error without registering the resource fork.
- *
- * Results:
- *	Standard Tcl Result
- *
- * Side effects:
- *	An entry may be added to the resource name table.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMacRegisterResourceFork(
-    short fileRef,        	/* File ref for an open resource fork. */
-    Tcl_Obj *tokenPtr,		/* A Tcl Object to which to write the  *
-				 * new token */
-    int flags)	     		/* 1 means insert at the head of the resource
-                                 * fork list, 0 means at the tail */
-
-{
-    Tcl_HashEntry *resourceHashPtr;
-    Tcl_HashEntry *nameHashPtr;
-    OpenResourceFork *resourceRef;
-    int new;
-    char *resourceId = NULL;
-   
-    if (!initialized) {
-        ResourceInit();
-    }
-    
-    /*
-     * If we were asked to, check that this file has not been opened
-     * already with a different permission.  It it has, then return an error.
-     */
-     
-    new = 1;
-    
-    if (flags & TCL_RESOURCE_CHECK_IF_OPEN) {
-        Tcl_HashSearch search;
-        short oldFileRef, filePermissionFlag;
-        FCBPBRec newFileRec, oldFileRec;
-        OSErr err;
-        
-        oldFileRec.ioCompletion = NULL;
-        oldFileRec.ioFCBIndx = 0;
-        oldFileRec.ioNamePtr = NULL;
-        
-        newFileRec.ioCompletion = NULL;
-        newFileRec.ioFCBIndx = 0;
-        newFileRec.ioNamePtr = NULL;
-        newFileRec.ioVRefNum = 0;
-        newFileRec.ioRefNum = fileRef;
-        err = PBGetFCBInfo(&newFileRec, false);
-        filePermissionFlag = ( newFileRec.ioFCBFlags >> 12 ) & 0x1;
-            
-        
-        resourceHashPtr = Tcl_FirstHashEntry(&resourceTable, &search);
-        while (resourceHashPtr != NULL) {
-            oldFileRef = (short) Tcl_GetHashKey(&resourceTable,
-                    resourceHashPtr);
-            if (oldFileRef == fileRef) {
-                new = 0;
-                break;
-            }
-            oldFileRec.ioVRefNum = 0;
-            oldFileRec.ioRefNum = oldFileRef;
-            err = PBGetFCBInfo(&oldFileRec, false);
-            
-            /*
-             * err might not be noErr either because the file has closed 
-             * out from under us somehow, which is bad but we're not going
-             * to fix it here, OR because it is the ROM MAP, which has a 
-             * fileRef, but can't be gotten to by PBGetFCBInfo.
-             */
-            if ((err == noErr) 
-                    && (newFileRec.ioFCBVRefNum == oldFileRec.ioFCBVRefNum)
-                    && (newFileRec.ioFCBFlNm == oldFileRec.ioFCBFlNm)) {
-                /*
-		 * In MacOS 8.1 it seems like we get different file refs even
-                 * though we pass the same file & permissions.  This is not
-                 * what Inside Mac says should happen, but it does, so if it
-                 * does, then close the new res file and return the original
-                 * one...
-		 */
-                 
-                if (filePermissionFlag == ((oldFileRec.ioFCBFlags >> 12) & 0x1)) {
-                    CloseResFile(fileRef);
-                    new = 0;
-                    break;
-                } else {
-                    if (tokenPtr != NULL) {
-                        Tcl_SetStringObj(tokenPtr, "Resource already open with different permissions.", -1);
-                    }   	
-                    return TCL_ERROR;
-                }
-            }
-            resourceHashPtr = Tcl_NextHashEntry(&search);
-        }
-    }
-       
-    
-    /*
-     * If the file has already been opened with these same permissions, then it
-     * will be in our list and we will have set new to 0 above.
-     * So we will just return the token (if tokenPtr is non-null)
-     */
-     
-    if (new) {
-        resourceHashPtr = Tcl_CreateHashEntry(&resourceTable,
-		(char *) fileRef, &new);
-    }
-    
-    if (!new) {
-        if (tokenPtr != NULL) {   
-            resourceId = (char *) Tcl_GetHashValue(resourceHashPtr);
-	    Tcl_SetStringObj(tokenPtr, resourceId, -1);
-        }
-        return TCL_OK;
-    }        
-
-    /*
-     * If we were passed in a result pointer which is not an empty
-     * string, attempt to use that as the key.  If the key already
-     * exists, silently fall back on resource%d...
-     */
-     
-    if (tokenPtr != NULL) {
-        char *tokenVal;
-        int length;
-        tokenVal = (char *) Tcl_GetStringFromObj(tokenPtr, &length);
-        if (length > 0) {
-            nameHashPtr = Tcl_FindHashEntry(&nameTable, tokenVal);
-            if (nameHashPtr == NULL) {
-                resourceId = ckalloc(length + 1);
-                memcpy(resourceId, tokenVal, length);
-                resourceId[length] = '\0';
-            }
-        }
-    }
-    
-    if (resourceId == NULL) {	
-        resourceId = (char *) ckalloc(15);
-        sprintf(resourceId, "resource%d", newId);
-    }
-    
-    Tcl_SetHashValue(resourceHashPtr, resourceId);
-    newId++;
-
-    nameHashPtr = Tcl_CreateHashEntry(&nameTable, resourceId, &new);
-    if (!new) {
-	panic("resource id has repeated itself");
-    }
-    
-    resourceRef = (OpenResourceFork *) ckalloc(sizeof(OpenResourceFork));
-    resourceRef->fileRef = fileRef;
-    resourceRef->flags = flags;
-    
-    Tcl_SetHashValue(nameHashPtr, (ClientData) resourceRef);
-    if (tokenPtr != NULL) {
-        Tcl_SetStringObj(tokenPtr, resourceId, -1);
-    }
-    
-    if (flags & TCL_RESOURCE_INSERT_TAIL) {
-        Tcl_ListObjAppendElement(NULL, resourceForkList, tokenPtr);
-    } else {
-        Tcl_ListObjReplace(NULL, resourceForkList, 0, 0, 1, &tokenPtr);	
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacUnRegisterResourceFork --
- *
- *	Removes the entry for an open resource fork from the table of 
- *	open resources managed by the procedures in this file.
- *      If resultPtr is not NULL, it will be used for error reporting.
- *
- * Results:
- *	The fileRef for this token, or -1 if an error occured.
- *
- * Side effects:
- *	An entry is removed from the resource name table.
- *
- *----------------------------------------------------------------------
- */
-
-short
-TclMacUnRegisterResourceFork(
-    char *tokenPtr,
-    Tcl_Obj *resultPtr)
-
-{
-    Tcl_HashEntry *resourceHashPtr;
-    Tcl_HashEntry *nameHashPtr;
-    OpenResourceFork *resourceRef;
-    char *resourceId = NULL;
-    short fileRef;
-    char *bytes;
-    int i, match, index, listLen, length, elemLen;
-    Tcl_Obj **elemPtrs;
-    
-     
-    nameHashPtr = Tcl_FindHashEntry(&nameTable, tokenPtr);
-    if (nameHashPtr == NULL) {
-        if (resultPtr != NULL) {
-	    Tcl_AppendStringsToObj(resultPtr,
-		    "invalid resource file reference \"",
-		    tokenPtr, "\"", (char *) NULL);
-        }
-	return -1;
-    }
-    
-    resourceRef = (OpenResourceFork *) Tcl_GetHashValue(nameHashPtr);
-    fileRef = resourceRef->fileRef;
-        
-    if ( resourceRef->flags & TCL_RESOURCE_DONT_CLOSE ) {
-        if (resultPtr != NULL) {
-	    Tcl_AppendStringsToObj(resultPtr,
-		    "can't close \"", tokenPtr, "\" resource file", 
-		    (char *) NULL);
-	}
-	return -1;
-    }            
-
-    Tcl_DeleteHashEntry(nameHashPtr);
-    ckfree((char *) resourceRef);
-    
-    
-    /* 
-     * Now remove the resource from the resourceForkList object 
-     */
-     
-    Tcl_ListObjGetElements(NULL, resourceForkList, &listLen, &elemPtrs);
-    
- 
-    index = -1;
-    length = strlen(tokenPtr);
-    
-    for (i = 0; i < listLen; i++) {
-	match = 0;
-	bytes = Tcl_GetStringFromObj(elemPtrs[i], &elemLen);
-	if (length == elemLen) {
-		match = (memcmp(bytes, tokenPtr,
-			(size_t) length) == 0);
-	}
-	if (match) {
-	    index = i;
-	    break;
-	}
-    }
-    if (!match) {
-        panic("the resource Fork List is out of synch!");
-    }
-    
-    Tcl_ListObjReplace(NULL, resourceForkList, index, 1, 0, NULL);
-    
-    resourceHashPtr = Tcl_FindHashEntry(&resourceTable, (char *) fileRef);
-    
-    if (resourceHashPtr == NULL) {
-	panic("Resource & Name tables are out of synch in resource command.");
-    }
-    ckfree(Tcl_GetHashValue(resourceHashPtr));
-    Tcl_DeleteHashEntry(resourceHashPtr);
-    
-    return fileRef;
-
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * BuildResourceForkList --
- *
- *	Traverses the list of open resource forks, and builds the 
- *	list of resources forks.  Also creates a resource token for any that 
- *      are opened but not registered with our resource system.
- *      This is based on code from Apple DTS.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      The list of resource forks is updated.
- *	The resource name table may be augmented.
- *
- *----------------------------------------------------------------------
- */
-
-void
-BuildResourceForkList()
-{
-    Handle currentMapHandle, mSysMapHandle;  
-    Ptr tempPtr;
-    FCBPBRec fileRec;
-    char fileName[256];
-    char appName[62];
-    Tcl_Obj *nameObj;
-    OSErr err;
-    ProcessSerialNumber psn;
-    ProcessInfoRec info;
-    FSSpec fileSpec;
-        
-    /* 
-     * Get the application name, so we can substitute
-     * the token "application" for the application's resource.
-     */ 
-     
-    GetCurrentProcess(&psn);
-    info.processInfoLength = sizeof(ProcessInfoRec);
-    info.processName = (StringPtr) &appName;
-    info.processAppSpec = &fileSpec;
-    GetProcessInformation(&psn, &info);
-    p2cstr((StringPtr) appName);
-
-    
-    fileRec.ioCompletion = NULL;
-    fileRec.ioVRefNum = 0;
-    fileRec.ioFCBIndx = 0;
-    fileRec.ioNamePtr = (StringPtr) &fileName;
-    
-    
-    currentMapHandle = LMGetTopMapHndl();
-    mSysMapHandle = LMGetSysMapHndl();
-    
-    while (1) {
-        /* 
-         * Now do the ones opened after the application.
-         */
-       
-        nameObj = Tcl_NewObj();
-        
-        tempPtr = *currentMapHandle;
-
-        fileRec.ioRefNum = *((short *) (tempPtr + 20));
-        err = PBGetFCBInfo(&fileRec, false);
-        
-        if (err != noErr) {
-            /*
-             * The ROM resource map does not correspond to an opened file...
-             */
-             Tcl_SetStringObj(nameObj, "ROM Map", -1);
-        } else {
-            p2cstr((StringPtr) fileName);
-            if (strcmp(fileName,(char *) appName) == 0) {
-                Tcl_SetStringObj(nameObj, "application", -1);
-            } else {
-                Tcl_SetStringObj(nameObj, fileName, -1);
-            }
-            c2pstr(fileName);
-        }
-        
-        TclMacRegisterResourceFork(fileRec.ioRefNum, nameObj, 
-            TCL_RESOURCE_DONT_CLOSE | TCL_RESOURCE_INSERT_TAIL);
-       
-        if (currentMapHandle == mSysMapHandle) {
-            break;
-        }
-        
-        currentMapHandle = *((Handle *) (tempPtr + 16));
-    }
-}
diff --git a/mac/tclMacResource.r b/mac/tclMacResource.r
deleted file mode 100644
index f9376db..0000000
--- a/mac/tclMacResource.r
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 
- * tclMacResource.r --
- *
- *	This file creates resources for use in a simple shell.
- *	This is designed to be an example of using the Tcl libraries
- *	statically in a Macintosh Application.  For an example of
- *	of using the dynamic libraries look at tclMacApplication.r.
- *
- * Copyright (c) 1993-94 Lockheed Missle & Space Company
- * Copyright (c) 1994-97 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacResource.r,v 1.3 1999/04/16 00:47:21 stanton Exp $
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-/*
- * The folowing include and defines help construct
- * the version string for Tcl.
- */
-
-#define RESOURCE_INCLUDED
-#include "tcl.h"
-
-#if (TCL_RELEASE_LEVEL == 0)
-#   define RELEASE_LEVEL alpha
-#elif (TCL_RELEASE_LEVEL == 1)
-#   define RELEASE_LEVEL beta
-#elif (TCL_RELEASE_LEVEL == 2)
-#   define RELEASE_LEVEL final
-#endif
-
-#if (TCL_RELEASE_LEVEL == 2)
-#   define MINOR_VERSION (TCL_MINOR_VERSION * 16) + TCL_RELEASE_SERIAL
-#else
-#   define MINOR_VERSION TCL_MINOR_VERSION * 16
-#endif
-
-resource 'vers' (1) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	TCL_PATCH_LEVEL ", by Ray Johnson © Sun Microsystems"
-};
-
-resource 'vers' (2) {
-	TCL_MAJOR_VERSION, MINOR_VERSION,
-	RELEASE_LEVEL, 0x00, verUS,
-	TCL_PATCH_LEVEL,
-	"Simple Tcl Shell " TCL_PATCH_LEVEL " © 1996"
-};
-
-
-/* 
- * The mechanisim below loads Tcl source into the resource fork of the
- * application.  The example below creates a TEXT resource named
- * "Init" from the file "init.tcl".  This allows applications to use
- * Tcl to define the behavior of the application without having to
- * require some predetermined file structure - all needed Tcl "files"
- * are located within the application.  To source a file for the
- * resource fork the source command has been modified to support
- * sourcing from resources.  In the below case "source -rsrc {Init}"
- * will load the TEXT resource named "Init".
- */
-
-#include "tclMacTclCode.r"
-
-/*
- * The following resource is used when creating the 'env' variable in
- * the Macintosh environment.  The creation mechanisim looks for the
- * 'STR#' resource named "Tcl Environment Variables" rather than a
- * specific resource number.  (In other words, feel free to change the
- * resource id if it conflicts with your application.)  Each string in
- * the resource must be of the form "KEYWORD=SOME STRING".  See Tcl
- * documentation for futher information about the env variable.
- *
- * A good example of something you may want to set is: "TCL_LIBRARY=My
- * disk:etc."
- */
- 
-resource 'STR#' (128, "Tcl Environment Variables") {
-	{	"SCHEDULE_NAME=Agent Controller Schedule",
-		"SCHEDULE_PATH=Lozoya:System Folder:Tcl Lib:Tcl-Scheduler"
-	};
-};
-
diff --git a/mac/tclMacShLib.exp b/mac/tclMacShLib.exp
deleted file mode 100644
index 020380f..0000000
--- a/mac/tclMacShLib.exp
+++ /dev/null
@@ -1,1066 +0,0 @@
-AddrToName
-AddrToStr
-BuildAFPVolMountInfo
-BumpDate
-ChangeCreatorType
-ChangeFDFlags
-CheckObjectLock
-CheckVolLock
-ClearHasBeenInited
-ClearHasCustomIcon
-ClearIsInvisible
-ClearIsStationery
-ClearNameLocked
-CloseResolver
-ConfigureMemory
-CopyDirectoryAccess
-CopyFileMgrAttributes
-CopyFork
-CreateFileIDRef
-DTCopyComment
-DTGetIcon
-DTOpen
-DTSetComment
-DeleteDirectory
-DeleteDirectoryContents
-DeleteFileIDRef
-DetermineVRefNum
-DirectoryCopy
-EnumCache
-##EnvStr
-ExchangeFiles
-FSMakeFSSpecCompat
-FSReadNoCache
-FSWriteNoCache
-FSWriteVerify
-FSpBumpDate
-FSpCatMoveCompat
-FSpChangeCreatorType
-FSpChangeFDFlags
-FSpCheckObjectLock
-FSpClearHasBeenInited
-FSpClearHasCustomIcon
-FSpClearIsInvisible
-FSpClearIsStationery
-FSpClearNameLocked
-FSpCopyDirectoryAccess
-FSpCopyFile
-FSpCopyFileMgrAttributes
-FSpCreateCompat
-FSpCreateFileIDRef
-FSpCreateMinimum
-FSpCreateResFileCompat
-FSpDTCopyComment
-FSpDTSetComment
-FSpDeleteCompat
-FSpDirCreateCompat
-FSpDirectoryCopy
-FSpExchangeFilesCompat
-FSpFileCopy
-FSpFilteredDirectoryCopy
-FSpFindFolder
-FSpGetDInfo
-FSpGetDefaultDir
-FSpGetDirAccess
-FSpGetDirectoryID
-FSpGetFInfoCompat
-FSpGetFLockCompat
-FSpGetFileLocation
-FSpGetFileSize
-FSpGetForeignPrivs
-FSpGetFullPath
-FSpGetIOACUser
-FSpLocationFromFullPath
-FSpLocationFromPath
-FSpMoveRename
-FSpMoveRenameCompat
-FSpOpenAware
-FSpOpenDFCompat
-FSpOpenRFAware
-FSpOpenRFCompat
-FSpOpenResFileCompat
-FSpPathFromLocation
-FSpRenameCompat
-FSpResolveFileIDRef
-FSpRstFLockCompat
-FSpSetDInfo
-FSpSetDefaultDir
-FSpSetDirAccess
-FSpSetFInfoCompat
-FSpSetFLockCompat
-FSpSetForeignPrivs
-FSpSetHasCustomIcon
-FSpSetIsInvisible
-FSpSetIsStationery
-FSpSetNameLocked
-FSpShare
-FSpUnshare
-FileCopy
-FilteredDirectoryCopy
-FindDrive
-FlushFile
-FreeAllMemory
-GetCPanelFolder
-GetCatInfoNoName
-GetDInfo
-GetDirItems
-GetDirName
-GetDirectoryID
-GetDiskBlocks
-GetDriverName
-GetFileLocation
-GetFileSize
-GetFilenameFromPathname
-GetForeignPrivs
-GetFullPath
-GetGlobalMouse
-GetIOACUser
-GetObjectLocation
-GetParentID
-GetSystemFolder
-GetTempBuffer
-GetTrapType
-GetUGEntries
-GetUGEntry
-GetVolMountInfo
-GetVolMountInfoSize
-GetVolumeInfoNoName
-HCopyFile
-HCreateMinimum
-HGetDirAccess
-HGetLogInInfo
-HGetVInfo
-HGetVolParms
-HInfo
-HMapID
-HMapName
-HMoveRename
-HMoveRenameCompat
-HOpenAware
-HOpenRFAware
-hypotd
-HSetDirAccess
-InstallConsole
-LocationFromFullPath
-LockRange
-MXInfo
-NumToolboxTraps
-OnLine
-OpenOurRF
-OpenResolver
-PBXGetVolInfoSync
-ReadCharsFromConsole
-RemoveConsole
-ResolveFileIDRef
-RestoreDefault
-RetrieveAFPVolMountInfo
-SIOUXBigRect
-SIOUXCantSaveAlert
-SIOUXDoAboutBox
-SIOUXDoContentClick
-SIOUXDoEditClear
-SIOUXDoEditCopy
-SIOUXDoEditCut
-SIOUXDoEditPaste
-SIOUXDoEditSelectAll
-SIOUXDoMenuChoice
-SIOUXDoPageSetup
-SIOUXDoPrintText
-SIOUXDoSaveText
-SIOUXDragRect
-SIOUXDrawGrowBox
-SIOUXHandleOneEvent
-SIOUXIsAppWindow
-SIOUXMyGrowWindow
-SIOUXQuitting
-SIOUXSetTitle
-SIOUXSettings
-SIOUXSetupMenus
-SIOUXSetupTextWindow
-SIOUXState
-SIOUXTextWindow
-SIOUXUpdateMenuItems
-SIOUXUpdateScrollbar
-SIOUXUpdateStatusLine
-SIOUXUpdateWindow
-SIOUXUseWaitNextEvent
-SIOUXYesNoCancelAlert
-SIOUXisinrange
-SIOUXselstart
-SearchFolderForDNRP
-SetDInfo
-SetDefault
-SetForeignPrivs
-SetHasCustomIcon
-SetIsInvisible
-SetIsStationery
-SetNameLocked
-Share
-StrToAddr
-TclAccess
-TclAllocateFreeObjects
-TclChdir
-TclCleanupByteCode
-TclCleanupCommand
-TclCompileBreakCmd
-TclCompileCatchCmd
-TclCompileContinueCmd
-TclCompileDollarVar
-TclCompileExpr
-TclCompileExprCmd
-TclCompileForCmd
-TclCompileForeachCmd
-TclCompileIfCmd
-TclCompileIncrCmd
-TclCompileQuotes
-TclCompileSetCmd
-TclCompileString
-TclCompileWhileCmd
-TclCopyAndCollapse
-TclCopyChannel
-TclCreateAuxData
-TclCreateExecEnv
-TclDate_TclDates
-TclDate_TclDatev
-TclDateact
-TclDatechar
-TclDatechk
-TclDatedebug
-TclDatedef
-TclDateerrflag
-TclDateexca
-TclDatelval
-TclDatenerrs
-TclDatepact
-TclDateparse
-TclDatepgo
-TclDateps
-TclDatepv
-TclDater1
-TclDater2
-TclDates
-TclDatestate
-TclDatetmp
-TclDatev
-TclDateval
-TclDeleteCompiledLocalVars
-TclDeleteExecEnv
-TclDeleteVars
-TclDoGlob
-TclEmitForwardJump
-TclExecuteByteCode
-TclExpandCodeArray
-TclExpandJumpFixupArray
-TclExprFloatError
-TclFileAttrsCmd
-TclFileCopyCmd
-TclFileDeleteCmd
-TclFileMakeDirsCmd
-TclFileRenameCmd
-TclFindElement
-TclFindProc
-TclFixupForwardJump
-TclFormatInt
-TclFreeCompileEnv
-TclFreeJumpFixupArray
-TclFreeObj
-TclFreePackageInfo
-TclGetCwd
-TclGetDate
-TclGetDefaultStdChannel
-TclGetElementOfIndexedArray
-TclGetEnv
-TclGetExceptionRangeForPc
-TclGetExtension
-TclGetFrame
-TclGetIndexedScalar
-TclGetIntForIndex
-TclGetLoadedPackages
-TclGetLong
-TclGetNamespaceForQualName
-TclGetOpenMode
-TclGetOriginalCommand
-TclGetRegError
-TclGetSrcInfoForPc
-TclGetUserHome
-TclGlobalInvoke
-TclGuessPackageName
-TclHasSockets
-TclHideUnsafeCommands
-TclInExit
-TclIncrElementOfIndexedArray
-TclIncrIndexedScalar
-TclIncrVar2
-TclInitByteCodeObj
-TclInitCompileEnv
-TclInitJumpFixupArray
-TclInitNamespaces
-TclInterpInit
-TclInvoke
-TclInvokeObjectCommand
-TclInvokeStringCommand
-TclIsProc
-TclLoadFile
-TclLooksLikeInt
-TclLookupVar
-TclpAccess
-TclMacCreateEnv
-TclMacExitHandler
-TclMacFOpenHack
-TclMacInitExitToShell
-TclMacInstallExitToShellPatch
-TclMacOSErrorToPosixError
-TclMacReadlink
-TclMacRemoveTimer
-TclMacStartTimer
-TclpStat
-TclMacTimerExpired
-TclMatchFiles
-TclNeedSpace
-TclObjIndexForString
-TclObjInterpProc
-TclObjInvoke
-TclObjInvokeGlobal
-TclPlatformExit
-TclPlatformInit
-TclPreventAliasLoop
-TclPrintByteCodeObj
-TclPrintInstruction
-TclPrintSource
-TclRegComp
-TclRegError
-TclRegExec
-TclRenameCommand
-TclResetShadowedCmdRefs
-TclServiceIdle
-TclSetElementOfIndexedArray
-TclSetEnv
-TclSetIndexedScalar
-TclSetupEnv
-TclSockGetPort
-TclStat
-TclTeardownNamespace
-TclTestChannelCmd
-TclTestChannelEventCmd
-TclUnsetEnv
-TclUpdateReturnInfo
-TclWordEnd
-Tcl_AddErrorInfo
-Tcl_AddObjErrorInfo
-Tcl_AfterCmd
-Tcl_Alloc
-Tcl_AllowExceptions
-Tcl_AppendAllObjTypes
-Tcl_AppendElement
-Tcl_AppendObjCmd
-Tcl_AppendResult
-Tcl_AppendStringsToObj
-Tcl_AppendToObj
-Tcl_ArrayObjCmd
-Tcl_AsyncCreate
-Tcl_AsyncDelete
-Tcl_AsyncInvoke
-Tcl_AsyncMark
-Tcl_AsyncReady
-Tcl_BackgroundError
-Tcl_Backslash
-Tcl_BeepObjCmd
-Tcl_BinaryObjCmd
-Tcl_BreakCmd
-Tcl_CallWhenDeleted
-Tcl_CancelIdleCall
-Tcl_CaseObjCmd
-Tcl_CatchObjCmd
-Tcl_ClockObjCmd
-Tcl_Close
-Tcl_CommandComplete
-Tcl_Concat
-Tcl_ConcatObj
-Tcl_ConcatObjCmd
-Tcl_ContinueCmd
-Tcl_ConvertCountedElement
-Tcl_ConvertElement
-Tcl_ConvertToType
-Tcl_CreateAlias
-Tcl_CreateAliasObj
-Tcl_CreateChannel
-Tcl_CreateChannelHandler
-Tcl_CreateCloseHandler
-Tcl_CreateCommand
-Tcl_CreateEventSource
-Tcl_CreateExitHandler
-Tcl_CreateInterp
-Tcl_CreateMathFunc
-Tcl_CreateNamespace
-Tcl_CreateObjCommand
-Tcl_CreateSlave
-Tcl_CreateTimerHandler
-Tcl_CreateTrace
-Tcl_DStringAppend
-Tcl_DStringAppendElement
-Tcl_DStringEndSublist
-Tcl_DStringFree
-Tcl_DStringGetResult
-Tcl_DStringInit
-Tcl_DStringResult
-Tcl_DStringSetLength
-Tcl_DStringStartSublist
-Tcl_DbCkalloc
-Tcl_DbCkfree
-Tcl_DbCkrealloc
-Tcl_DbDecrRefCount
-Tcl_DbIsShared
-Tcl_DbIncrRefCount
-Tcl_DbNewBooleanObj
-Tcl_DbNewDoubleObj
-Tcl_DbNewListObj
-Tcl_DbNewLongObj
-Tcl_DbNewObj
-Tcl_DbNewStringObj
-Tcl_DeleteAssocData
-Tcl_DeleteChannelHandler
-Tcl_DeleteCloseHandler
-Tcl_DeleteCommand
-Tcl_DeleteCommandFromToken
-Tcl_DeleteEventSource
-Tcl_DeleteEvents
-Tcl_DeleteExitHandler
-Tcl_DeleteHashEntry
-Tcl_DeleteHashTable
-Tcl_DeleteInterp
-Tcl_DeleteNamespace
-Tcl_DeleteTimerHandler
-Tcl_DeleteTrace
-Tcl_DoOneEvent
-Tcl_DoWhenIdle
-Tcl_DontCallWhenDeleted
-Tcl_DumpActiveMemory
-Tcl_DuplicateObj
-Tcl_EchoCmd
-Tcl_Eof
-Tcl_ErrnoId
-Tcl_ErrnoMsg
-Tcl_ErrorObjCmd
-Tcl_Eval
-Tcl_EvalFile
-Tcl_EvalObj
-Tcl_EvalObjCmd
-Tcl_EventuallyFree
-Tcl_ExecCmd
-Tcl_Exit
-Tcl_ExitObjCmd
-Tcl_ExposeCommand
-Tcl_ExprBoolean
-Tcl_ExprBooleanObj
-Tcl_ExprDouble
-Tcl_ExprDoubleObj
-Tcl_ExprLong
-Tcl_ExprLongObj
-Tcl_ExprObjCmd
-Tcl_ExprString
-Tcl_FconfigureCmd
-Tcl_FcopyObjCmd
-Tcl_FileEventCmd
-Tcl_FileObjCmd
-Tcl_Finalize
-Tcl_FindCommand
-Tcl_FindExecutable
-Tcl_FindNamespace
-Tcl_FindNamespaceVar
-Tcl_FirstHashEntry
-Tcl_Flush
-Tcl_FlushObjCmd
-Tcl_ForCmd
-Tcl_ForeachObjCmd
-Tcl_ForgetImport
-Tcl_FormatCmd
-Tcl_Free
-Tcl_FreeResult
-Tcl_GetAlias
-Tcl_GetAliasObj
-Tcl_GetAssocData
-Tcl_GetBoolean
-Tcl_GetBooleanFromObj
-Tcl_GetChannel
-Tcl_GetChannelBufferSize
-Tcl_GetChannelHandle
-Tcl_GetChannelInstanceData
-Tcl_GetChannelMode
-Tcl_GetChannelName
-Tcl_GetChannelOption
-Tcl_GetChannelType
-Tcl_GetCommandFromObj
-Tcl_GetCommandFullName
-Tcl_GetCommandInfo
-Tcl_GetCommandName
-Tcl_GetCurrentNamespace
-Tcl_GetDouble
-Tcl_GetDoubleFromObj
-Tcl_GetErrno
-Tcl_GetGlobalNamespace
-Tcl_GetHostName
-Tcl_GetIndexFromObj
-Tcl_GetInt
-Tcl_GetIntFromObj
-Tcl_GetInterpPath
-Tcl_GetLongFromObj
-Tcl_GetMaster
-Tcl_GetOSTypeFromObj
-Tcl_GetObjResult
-Tcl_GetObjType
-Tcl_GetPathType
-Tcl_GetServiceMode
-Tcl_GetSlave
-Tcl_GetStdChannel
-Tcl_GetStringFromObj
-Tcl_GetStringResult
-Tcl_GetVar
-Tcl_GetVar2
-Tcl_GetVariableFullName
-Tcl_Gets
-Tcl_GetsObj
-Tcl_GetsObjCmd
-Tcl_GlobCmd
-Tcl_GlobalEval
-Tcl_GlobalEvalObj
-Tcl_GlobalObjCmd
-Tcl_HashStats
-Tcl_HideCommand
-Tcl_IfCmd
-Tcl_Import
-Tcl_IncrCmd
-Tcl_InfoObjCmd
-Tcl_Init
-Tcl_InitHashTable
-Tcl_InitMemory
-Tcl_InputBlocked
-Tcl_InputBuffered
-Tcl_InterpDeleted
-Tcl_InterpObjCmd
-Tcl_IsSafe
-Tcl_JoinObjCmd
-Tcl_JoinPath
-Tcl_LappendObjCmd
-Tcl_LindexObjCmd
-Tcl_LinkVar
-Tcl_LinsertObjCmd
-Tcl_ListObjAppendElement
-Tcl_ListObjAppendList
-Tcl_ListObjCmd
-Tcl_ListObjGetElements
-Tcl_ListObjIndex
-Tcl_ListObjLength
-Tcl_ListObjReplace
-Tcl_LlengthObjCmd
-Tcl_LoadCmd
-Tcl_LrangeObjCmd
-Tcl_LreplaceObjCmd
-Tcl_LsCmd
-Tcl_LsearchObjCmd
-Tcl_LsortObjCmd
-Tcl_MacConvertTextResource
-Tcl_MacEvalResource
-Tcl_MacFindResource
-Tcl_MacSetEventProc
-Tcl_MacSourceObjCmd
-Tcl_Main
-Tcl_MakeSafe
-Tcl_MakeTcpClientChannel
-Tcl_Merge
-Tcl_NamespaceObjCmd
-Tcl_NewBooleanObj
-Tcl_NewDoubleObj
-Tcl_NewIntObj
-Tcl_NewListObj
-Tcl_NewLongObj
-Tcl_NewOSTypeObj
-Tcl_NewObj
-Tcl_NewStringObj
-Tcl_NextHashEntry
-Tcl_NotifyChannel
-Tcl_ObjGetVar2
-Tcl_ObjSetVar2
-Tcl_OpenCmd
-Tcl_OpenFileChannel
-Tcl_OpenTcpClient
-Tcl_OpenTcpServer
-Tcl_PackageCmd
-Tcl_ParseVar
-Tcl_PidObjCmd
-Tcl_PkgProvide
-Tcl_PkgRequire
-Tcl_PopCallFrame
-Tcl_PosixError
-Tcl_Preserve
-Tcl_PrintDouble
-Tcl_ProcObjCmd
-Tcl_PushCallFrame
-Tcl_PutEnv
-Tcl_PutsObjCmd
-Tcl_PwdCmd
-Tcl_QueueEvent
-Tcl_Read
-Tcl_ReadObjCmd
-Tcl_Realloc
-Tcl_RecordAndEval
-Tcl_RegExpCompile
-Tcl_RegExpExec
-Tcl_RegExpMatch
-Tcl_RegExpRange
-Tcl_RegexpCmd
-Tcl_RegisterChannel
-Tcl_RegisterObjType
-Tcl_RegsubCmd
-Tcl_Release
-Tcl_RenameObjCmd
-Tcl_ResetResult
-Tcl_ResourceObjCmd
-Tcl_ReturnObjCmd
-Tcl_ScanCmd
-Tcl_ScanCountedElement
-Tcl_ScanElement
-Tcl_Seek
-Tcl_SeekCmd
-Tcl_ServiceAll
-Tcl_ServiceEvent
-Tcl_SetAssocData
-Tcl_SetBooleanObj
-Tcl_SetChannelBufferSize
-Tcl_SetChannelOption
-Tcl_SetCmd
-Tcl_SetCommandInfo
-Tcl_SetDoubleObj
-Tcl_SetErrno
-Tcl_SetErrorCode
-Tcl_SetIntObj
-Tcl_SetListObj
-Tcl_SetLongObj
-Tcl_SetMaxBlockTime
-Tcl_SetOSTypeObj
-Tcl_SetObjErrorCode
-Tcl_SetObjLength
-Tcl_SetObjResult
-Tcl_SetPanicProc
-Tcl_SetRecursionLimit
-Tcl_SetResult
-Tcl_SetServiceMode
-Tcl_SetStdChannel
-Tcl_SetStringObj
-Tcl_SetTimer
-Tcl_SetVar
-Tcl_SetVar2
-Tcl_SignalId
-Tcl_SignalMsg
-Tcl_Sleep
-Tcl_SocketCmd
-Tcl_SourceObjCmd
-Tcl_SourceRCFile
-Tcl_SplitList
-Tcl_SplitPath
-Tcl_StaticPackage
-Tcl_StringMatch
-Tcl_StringObjCmd
-Tcl_SubstCmd
-Tcl_SwitchObjCmd
-Tcl_Tell
-Tcl_TellCmd
-Tcl_TimeObjCmd
-Tcl_TraceCmd
-Tcl_TraceVar
-Tcl_TraceVar2
-Tcl_TranslateFileName
-Tcl_Ungets
-Tcl_UnlinkVar
-Tcl_UnregisterChannel
-Tcl_UnsetObjCmd
-Tcl_UnsetVar
-Tcl_UnsetVar2
-Tcl_UntraceVar
-Tcl_UntraceVar2
-Tcl_UpVar
-Tcl_UpVar2
-Tcl_UpdateCmd
-Tcl_UpdateLinkedVar
-Tcl_UplevelObjCmd
-Tcl_UpvarObjCmd
-Tcl_ValidateAllMemory
-Tcl_VarEval
-Tcl_VarTraceInfo
-Tcl_VarTraceInfo2
-Tcl_VariableObjCmd
-Tcl_VwaitCmd
-Tcl_WaitForEvent
-Tcl_WaitPid
-Tcl_WhileCmd
-Tcl_Write
-Tcl_WrongNumArgs
-TclpAlloc
-TclpCopyDirectory
-TclpCopyFile
-TclpCreateDirectory
-TclpDeleteFile
-TclpFree
-TclpGetClicks
-TclpGetDate
-TclpGetSeconds
-TclpGetTime
-TclpGetTimeZone
-TclpListVolumes
-TclpRealloc
-TclpRemoveDirectory
-TclpRenameFile
-TrapExists
-TruncPString
-UnlockRange
-UnmountAndEject
-Unshare
-VolumeMount
-WriteCharsToConsole
-XGetVInfo
-_Ctype
-_Stderr
-_Stoul
-abort
-abs
-acosf
-appMemory
-asctime
-asinf
-atan
-atan2
-atan2_d_dd
-atan2_d_pdpd
-atan2_r_prpr
-atan2_r_rr
-atan2f
-atan_d_d
-atan_d_pd
-atan_r_pr
-atan_r_r
-atanf
-atexit
-atof
-atoi
-atol
-bsearch
-builtinFuncTable
-calloc
-ccommand
-ceilf
-chdir
-clearerr
-clock
-close
-closeUPP
-completeUPP
-cos
-cos_d_d
-cos_d_pd
-cos_r_pr
-cos_r_r
-cosf
-coshf
-creat
-ctime
-cuserid
-difftime
-div
-environ
-errno
-exec
-exit
-exp
-exp_d_d
-exp_d_pd
-exp_r_pr
-exp_r_r
-expf
-fabsf
-fclose
-fcntl
-fdopen
-feof
-ferror
-fflush
-fgetc
-fgetpos
-fgets
-fileno
-floorf
-fmodf
-fopen
-fprintf
-fputc
-fputs
-fread
-free
-freopen
-frexpf
-fscanf
-fseek
-fsetpos
-fstat
-ftell
-fwrite
-getStdChannelsProc
-getc
-getchar
-getcwd
-getenv
-getlogin
-gets
-gmtime
-instructionTable
-isalnum
-isalpha
-isatty
-iscntrl
-isdigit
-isgraph
-islower
-isprint
-ispunct
-isspace
-isupper
-isxdigit
-labs
-ldexpf
-ldiv
-localeconv
-localtime
-log
-log10
-log10_d_d
-log10_d_pd
-log10f
-log_d_d
-log_d_pd
-logf
-longjmp
-lseek
-malloc
-mblen
-mbstowcs
-mbtowc
-memchr
-memcmp
-memcpy
-memmove
-memset
-mkdir
-mktime
-open
-panic
-panicProc
-perror
-pow
-power_d_dd
-powf
-printf
-putc
-putchar
-puts
-qsort
-raise
-rand
-read
-realloc
-remove
-rename
-resultUPP
-rewind
-rmdir
-scanf
-setbuf
-setlocale
-setvbuf
-signal
-sin
-sin_d_d
-sin_d_pd
-sin_r_pr
-sin_r_r
-sinf
-sinhf
-sleep
-sprintf
-sqrt
-sqrt_d_d
-sqrt_d_pd
-sqrt_r_pr
-sqrt_r_r
-sqrtf
-srand
-sscanf
-stat
-strcasecmp
-strcat
-strchr
-strcmp
-strcoll
-strcpy
-strcspn
-strerror
-strftime
-strlen
-strncasecmp
-strncat
-strncmp
-strncpy
-strpbrk
-strrchr
-strspn
-strstr
-strtod
-strtok
-strtol
-strtoul
-strxfrm
-system
-systemMemory
-tanf
-tanhf
-tclBooleanType
-tclByteCodeType
-tclCmdNameType
-tclDoubleType
-tclDummyLinkVarPtr
-tclExecutableName
-tclFreeObjList
-tclIndexType
-tclIntType
-tclListType
-tclMemDumpFileName
-tclNsNameType
-tclPlatform
-tclStringType
-tclTraceCompile
-tclTraceExec
-tclTypeTable
-tcl_MathInProgress
-tclpFileAttrProcs
-tclpFileAttrStrings
-tell
-time
-tmpfile
-tmpnam
-tolower
-toupper
-ttyname
-uname
-ungetc
-unlink
-utime
-utimes
-vfprintf
-vprintf
-vsprintf
-wcstombs
-wctob
-wctomb
-write
-#DTGetAPPL
-#DTGetComment
-#FSpDTGetAPPL
-#FSpDTGetComment
-#TclMacInitializeFragment
-#TclMacTerminateFragment
-#_Aldata
-#_Assert
-#_Atcount
-#_Atfuns
-#_Clocale
-#_Closreg
-#_Costate
-#_Daysto
-#_Dbl
-#_Defloc
-#_Environ
-#_Environ1
-#_Fgpos
-#_Files
-#_Flt
-#_Fopen
-#_Foprep
-#_Fread
-#_Freeloc
-#_Frprep
-#_Fspos
-#_Fwprep
-#_Fwrite
-#_Genld
-#_Gentime
-#_Getdst
-#_Getfld
-#_Getfloat
-#_Getint
-#_Getloc
-#_Getmem
-#_Getstr
-#_Gettime
-#_Getzone
-#_Isdst
-#_Ldbl
-#_Ldtob
-#_Litob
-#_Locale
-#_Locsum
-#_Loctab
-#_Locterm
-#_Locvar
-#_MWERKS_Atcount
-#_MWERKS_Atfuns
-#_Makeloc
-#_Makestab
-#_Makewct
-#_Mbcurmax
-#_Mbstate
-#_Mbtowc
-#_Nnl
-#_PJP_C_Copyright
-#_Printf
-#_Putfld
-#_Putstr
-#_Puttxt
-#_Randseed
-#_Readloc
-#_Scanf
-#_Setloc
-#_Skip
-#_Stdin
-#_Stdout
-#_Stod
-#_Stof
-#_Stoflt
-#_Stold
-#_Strerror
-#_Strftime
-#_Strxfrm
-#_Times
-#_Tolower
-#_Toupper
-#_Ttotm
-#_WCostate
-#_Wcstate
-#_Wctob
-#_Wctomb
-#_Wctrans
-#_Wctype
-#__CheckForSystem7
-#__RemoveConsoleHandler__
-#__aborting
-#__ctopstring
-#__cvt_fp2unsigned
-#__getcreator
-#__gettype
-#__initialize
-#__myraise
-#__ptmf_null
-#__ptr_glue
-#__system7present
-#__terminate
-#__ttyname
-#_atexit
-#_exit
-#_fcreator
-#_ftype
diff --git a/mac/tclMacSock.c b/mac/tclMacSock.c
deleted file mode 100644
index d387cb5..0000000
--- a/mac/tclMacSock.c
+++ /dev/null
@@ -1,2637 +0,0 @@
-/* 
- * tclMacSock.c
- *
- *	Channel drivers for Macintosh sockets.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacSock.c,v 1.4 1999/04/16 00:47:21 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMacInt.h"
-#include <AddressXlation.h>
-#include <Aliases.h>
-#undef Status
-#include <Devices.h>
-#include <Errors.h>
-#include <Events.h>
-#include <Files.h>
-#include <Gestalt.h>
-#include <MacTCP.h>
-#include <Processes.h>
-#include <Strings.h>
-
-/*
- * The following variable is used to tell whether this module has been
- * initialized.
- */
-
-static int initialized = 0;
-
-/*
- * If debugging is on we may drop into the debugger to handle certain cases
- * that are not supposed to happen.  Otherwise, we change ignore the error
- * and most code should handle such errors ok.
- */
-
-#ifndef TCL_DEBUG
-    #define Debugger()
-#endif
-
-/*
- * The preferred buffer size for Macintosh channels.
- */
-
-#define CHANNEL_BUF_SIZE	8192
-
-/*
- * Port information structure.  Used to match service names
- * to a Tcp/Ip port number.
- */
-
-typedef struct {
-    char *name;			/* Name of service. */
-    int port;			/* Port number. */
-} PortInfo;
-
-/*
- * This structure describes per-instance state of a tcp based channel.
- */
-
-typedef struct TcpState {
-    TCPiopb pb;			   /* Parameter block used by this stream. 
-				    * This must be in the first position. */
-    ProcessSerialNumber	psn;	   /* PSN used to wake up process. */
-    StreamPtr tcpStream;	   /* Macintosh tcp stream pointer. */
-    int port;			   /* The port we are connected to. */
-    int flags;			   /* Bit field comprised of the flags
-				    * described below.  */
-    int checkMask;		   /* OR'ed combination of TCL_READABLE and
-				    * TCL_WRITABLE as set by an asynchronous
-				    * event handler. */
-    int watchMask;		   /* OR'ed combination of TCL_READABLE and
-				    * TCL_WRITABLE as set by Tcl_WatchFile. */
-    Tcl_TcpAcceptProc *acceptProc; /* Proc to call on accept. */
-    ClientData acceptProcData;	   /* The data for the accept proc. */
-    wdsEntry dataSegment[2];       /* List of buffers to be written async. */
-    rdsEntry rdsarray[5+1];	   /* Array used when cleaning out recieve 
-				    * buffers on a closing socket. */
-    Tcl_Channel channel;	   /* Channel associated with this socket. */
-    struct TcpState *nextPtr;	   /* The next socket on the global socket
-				    * list. */
-} TcpState;
-
-/*
- * This structure is used by domain name resolver callback.
- */
-
-typedef struct DNRState {
-    struct hostInfo hostInfo;	/* Data structure used by DNR functions. */
-    int done;			/* Flag to determine when we are done. */
-    ProcessSerialNumber psn;	/* Process to wake up when we are done. */
-} DNRState;
-
-/*
- * The following macros may be used to set the flags field of
- * a TcpState structure.
- */
-
-#define TCP_ASYNC_SOCKET	(1<<0)  /* The socket is in async mode. */
-#define TCP_ASYNC_CONNECT	(1<<1)  /* The socket is trying to connect. */
-#define TCP_CONNECTED		(1<<2)  /* The socket is connected. */
-#define TCP_PENDING		(1<<3)	/* A SocketEvent is on the queue. */
-#define TCP_LISTENING 		(1<<4)  /* This socket is listening for
-					 * a connection. */
-#define TCP_LISTEN_CONNECT 	(1<<5)  /* Someone has connect to the
-					 * listening port. */
-#define TCP_REMOTE_CLOSED 	(1<<6)  /* The remote side has closed
-					 * the connection. */
-#define TCP_RELEASE	 	(1<<7)  /* The socket may now be released. */
-#define TCP_WRITING		(1<<8)  /* A background write is in progress. */
-#define TCP_SERVER_ZOMBIE	(1<<9)  /* The server can no longer accept connects. */
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * a socket event occurs.
- */
-
-typedef struct SocketEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    TcpState *statePtr;		/* Socket descriptor that is ready. */
-    StreamPtr tcpStream;	/* Low level Macintosh stream. */
-} SocketEvent;
-
-/*
- * Static routines for this file:
- */
-
-static pascal void	CleanUpExitProc _ANSI_ARGS_((void));
-static void		ClearZombieSockets _ANSI_ARGS_((void));
-static void		CloseCompletionRoutine _ANSI_ARGS_((TCPiopb *pb));
-static TcpState *	CreateSocket _ANSI_ARGS_((Tcl_Interp *interp,
-			    int port, char *host, char *myAddr,  int myPort,
-			    int server, int async));
-static pascal void	DNRCompletionRoutine _ANSI_ARGS_((
-			    struct hostInfo *hostinfoPtr,
-			    DNRState *dnrStatePtr));
-static void		FreeSocketInfo _ANSI_ARGS_((TcpState *statePtr));
-static long		GetBufferSize _ANSI_ARGS_((void));
-static OSErr		GetHostFromString _ANSI_ARGS_((char *name,
-			    ip_addr *address));
-static OSErr		GetLocalAddress _ANSI_ARGS_((unsigned long *addr));
-static void		IOCompletionRoutine _ANSI_ARGS_((TCPiopb *pb));
-static void		InitMacTCPParamBlock _ANSI_ARGS_((TCPiopb *pBlock,
-			    int csCode));
-static void		InitSockets _ANSI_ARGS_((void));
-static TcpState *	NewSocketInfo _ANSI_ARGS_((StreamPtr stream));
-static OSErr		ResolveAddress _ANSI_ARGS_((ip_addr tcpAddress,
-			    Tcl_DString *dsPtr));
-static void		SocketCheckProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static int		SocketEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-			    int flags));
-static void		SocketExitHandler _ANSI_ARGS_((ClientData clientData));
-static void		SocketFreeProc _ANSI_ARGS_((ClientData clientData));
-static int		SocketReady _ANSI_ARGS_((TcpState *statePtr));
-static void		SocketSetupProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static void		TcpAccept _ANSI_ARGS_((TcpState *statePtr));
-static int		TcpBlockMode _ANSI_ARGS_((ClientData instanceData, int mode));
-static int		TcpClose _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static int		TcpGetHandle _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static int		TcpGetOptionProc _ANSI_ARGS_((ClientData instanceData,
-                            Tcl_Interp *interp, char *optionName,
-			    Tcl_DString *dsPtr));
-static int		TcpInput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toRead, int *errorCodePtr));
-static int		TcpOutput _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toWrite, int *errorCodePtr));
-static void		TcpWatch _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-static int		WaitForSocketEvent _ANSI_ARGS_((TcpState *infoPtr,
-		            int mask, int *errorCodePtr));
-
-/*
- * This structure describes the channel type structure for TCP socket
- * based IO:
- */
-
-static Tcl_ChannelType tcpChannelType = {
-    "tcp",			/* Type name. */
-    TcpBlockMode,		/* Set blocking or
-                                 * non-blocking mode.*/
-    TcpClose,			/* Close proc. */
-    TcpInput,			/* Input proc. */
-    TcpOutput,			/* Output proc. */
-    NULL,			/* Seek proc. */
-    NULL,			/* Set option proc. */
-    TcpGetOptionProc,		/* Get option proc. */
-    TcpWatch,			/* Initialize notifier. */
-    TcpGetHandle		/* Get handles out of channel. */
-};
-
-/*
- * Universal Procedure Pointers (UPP) for various callback
- * routines used by MacTcp code.
- */
-
-ResultUPP resultUPP = NULL;
-TCPIOCompletionUPP completeUPP = NULL;
-TCPIOCompletionUPP closeUPP = NULL;
-
-/*
- * Built-in commands, and the procedures associated with them:
- */
-
-static PortInfo portServices[] = {
-    {"echo",		7},
-    {"discard",		9},
-    {"systat",		11},
-    {"daytime",		13},
-    {"netstat",		15},
-    {"chargen",		19},
-    {"ftp-data",	20},
-    {"ftp",		21},
-    {"telnet",		23},
-    {"telneto",		24},
-    {"smtp",		25},
-    {"time",		37},
-    {"whois",		43},
-    {"domain",		53},
-    {"gopher",		70},
-    {"finger",		79},
-    {"hostnames",	101},
-    {"sunrpc",		111},
-    {"nntp",		119},
-    {"exec",		512},
-    {"login",		513},
-    {"shell",		514},
-    {"printer",		515},
-    {"courier",		530},
-    {"uucp",		540},
-    {NULL,		0},
-};
-
-typedef struct ThreadSpecificData {
-    /*
-     * Every open socket has an entry on the following list.
-     */
-    
-    TcpState *socketList;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Globals for holding information about OS support for sockets.
- */
-
-static int socketsTestInited = false;
-static int hasSockets = false;
-static short driverRefNum = 0;
-static int socketNumber = 0;
-static int socketBufferSize = CHANNEL_BUF_SIZE;
-static ProcessSerialNumber applicationPSN;
-
-/*
- *----------------------------------------------------------------------
- *
- * InitSockets --
- *
- *	Load the MacTCP driver and open the name resolver.  We also
- *	create several UPP's used by our code.  Lastly, we install
- *	a patch to ExitToShell to clean up socket connections if
- *	we are about to exit.
- *
- * Results:
- *	1 if successful, 0 on failure.
- *
- * Side effects:
- *	Creates a new event source, loads the MacTCP driver,
- *	registers an exit to shell callback.
- *
- *----------------------------------------------------------------------
- */
-
-#define gestaltMacTCPVersion 'mtcp'
-static void
-InitSockets()
-{
-    ParamBlockRec pb; 
-    OSErr err;
-    long response;
-    ThreadSpecificData *tsdPtr;
-    
-    if (! initialized) {
-	/*
-	 * Do process wide initialization.
-	 */
-
-	initialized = 1;
-	    
-	if (Gestalt(gestaltMacTCPVersion, &response) == noErr) {
-	    hasSockets = true;
-	} else {
-	    hasSockets = false;
-	}
-    
-	if (!hasSockets) {
-	    return;
-	}
-    
-	/*
-	 * Load MacTcp driver and name server resolver.
-	 */
-	    
-		    
-	pb.ioParam.ioCompletion = 0L; 
-	pb.ioParam.ioNamePtr = "\p.IPP"; 
-	pb.ioParam.ioPermssn = fsCurPerm; 
-	err = PBOpenSync(&pb); 
-	if (err != noErr) {
-	    hasSockets = 0;
-	    return;
-	}
-	driverRefNum = pb.ioParam.ioRefNum; 
-	    
-	socketBufferSize = GetBufferSize();
-	err = OpenResolver(NULL);
-	if (err != noErr) {
-	    hasSockets = 0;
-	    return;
-	}
-    
-	GetCurrentProcess(&applicationPSN);
-	/*
-	 * Create UPP's for various callback routines.
-	 */
-    
-	resultUPP = NewResultProc(DNRCompletionRoutine);
-	completeUPP = NewTCPIOCompletionProc(IOCompletionRoutine);
-	closeUPP = NewTCPIOCompletionProc(CloseCompletionRoutine);
-    
-	/*
-	 * Install an ExitToShell patch.  We use this patch instead
-	 * of the Tcl exit mechanism because we need to ensure that
-	 * these routines are cleaned up even if we crash or are forced
-	 * to quit.  There are some circumstances when the Tcl exit
-	 * handlers may not fire.
-	 */
-    
-	TclMacInstallExitToShellPatch(CleanUpExitProc);
-    }
-
-    /*
-     * Do per-thread initialization.
-     */
-
-    tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr->socketList = NULL;
-	Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(SocketExitHandler, (ClientData) NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketExitHandler --
- *
- *	Callback invoked during exit clean up to deinitialize the
- *	socket module.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SocketExitHandler(
-    ClientData clientData)              /* Not used. */
-{
-    if (hasSockets) {
-	Tcl_DeleteEventSource(SocketSetupProc, SocketCheckProc, NULL);
-	/* CleanUpExitProc();
-	TclMacDeleteExitToShellPatch(CleanUpExitProc); */
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpHasSockets --
- *
- *	This function determines whether sockets are available on the
- *	current system and returns an error in interp if they are not.
- *	Note that interp may be NULL.
- *
- * Results:
- *	Returns TCL_OK if the system supports sockets, or TCL_ERROR with
- *	an error in interp.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpHasSockets(
-    Tcl_Interp *interp)		/* Interp for error messages. */
-{
-    InitSockets();
-
-    if (hasSockets) {
-	return TCL_OK;
-    }
-    if (interp != NULL) {
-	Tcl_AppendResult(interp, "sockets are not available on this system",
-		NULL);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SocketSetupProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    TcpState *statePtr;
-    Tcl_Time blockTime = { 0, 0 };
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Check to see if there is a ready socket.  If so, poll.
-     */
-
-    for (statePtr = tsdPtr->socketList; statePtr != NULL;
-	    statePtr = statePtr->nextPtr) {
-	if (statePtr->flags & TCP_RELEASE) {
-	    continue;
-	}
-	if (SocketReady(statePtr)) {
-	    Tcl_SetMaxBlockTime(&blockTime);
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the socket
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SocketCheckProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    TcpState *statePtr;
-    SocketEvent *evPtr;
-    TcpState dummyState;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready sockets that don't already have events
-     * queued (caused by persistent states that won't generate WinSock
-     * events).
-     */
-
-    for (statePtr = tsdPtr->socketList; statePtr != NULL;
-	    statePtr = statePtr->nextPtr) {
-	/*
-	 * Check to see if this socket is dead and needs to be cleaned
-	 * up.  We use a dummy statePtr whose only valid field is the
-	 * nextPtr to allow the loop to continue even if the element
-	 * is deleted.
-	 */
-
-	if (statePtr->flags & TCP_RELEASE) {
-	    if (!(statePtr->flags & TCP_PENDING)) {
-		dummyState.nextPtr = statePtr->nextPtr;
-		SocketFreeProc(statePtr);
-		statePtr = &dummyState;
-	    }
-	    continue;
-	}
-
-	if (!(statePtr->flags & TCP_PENDING) && SocketReady(statePtr)) {
-	    statePtr->flags |= TCP_PENDING;
-	    evPtr = (SocketEvent *) ckalloc(sizeof(SocketEvent));
-	    evPtr->header.proc = SocketEventProc;
-	    evPtr->statePtr = statePtr;
-	    evPtr->tcpStream = statePtr->tcpStream;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketReady --
- *
- *	This function checks the current state of a socket to see
- *	if any interesting conditions are present.
- *
- * Results:
- *	Returns 1 if an event that someone is watching is present, else
- *	returns 0.
- *
- * Side effects:
- *	Updates the checkMask for the socket to reflect any newly
- *	detected events.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SocketReady(
-    TcpState *statePtr)
-{
-    TCPiopb statusPB;
-    int foundSomething = 0;
-    int didStatus = 0;
-    int amount;
-    OSErr err;
-
-    if (statePtr->flags & TCP_LISTEN_CONNECT) {
-	foundSomething = 1;
-	statePtr->checkMask |= TCL_READABLE;
-    }
-    if (statePtr->watchMask & TCL_READABLE) {
-	if (statePtr->checkMask & TCL_READABLE) {
-	    foundSomething = 1;
-	} else if (statePtr->flags & TCP_CONNECTED) {
-	    statusPB.ioCRefNum = driverRefNum;
-	    statusPB.tcpStream = statePtr->tcpStream;
-	    statusPB.csCode = TCPStatus;
-	    err = PBControlSync((ParmBlkPtr) &statusPB);
-	    didStatus = 1;
-
-	    /*
-	     * We make the fchannel readable if 1) we get an error,
-	     * 2) there is more data available, or 3) we detect
-	     * that a close from the remote connection has arrived.
-	     */
-
-	    if ((err != noErr) ||
-		    (statusPB.csParam.status.amtUnreadData > 0) ||
-		    (statusPB.csParam.status.connectionState == 14)) {
-		statePtr->checkMask |= TCL_READABLE;
-		foundSomething = 1;
-	    }
-	}
-    }
-    if (statePtr->watchMask & TCL_WRITABLE) {
-	if (statePtr->checkMask & TCL_WRITABLE) {
-	    foundSomething = 1;
-	} else if (statePtr->flags & TCP_CONNECTED) {
-	    if (!didStatus) {
-		statusPB.ioCRefNum = driverRefNum;
-		statusPB.tcpStream = statePtr->tcpStream;
-		statusPB.csCode = TCPStatus;
-		err = PBControlSync((ParmBlkPtr) &statusPB);
-	    }
-
-	    /*
-	     * If there is an error or there if there is room to
-	     * send more data we make the channel writeable.
-	     */
-
-	    amount = statusPB.csParam.status.sendWindow - 
-		statusPB.csParam.status.amtUnackedData;
-	    if ((err != noErr) || (amount > 0)) {
-		statePtr->checkMask |= TCL_WRITABLE;
-		foundSomething = 1;
-	    }
-	}
-    }
-    return foundSomething;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InitMacTCPParamBlock--
- *
- *	Initialize a MacTCP parameter block.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Initializes the parameter block.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-InitMacTCPParamBlock(
-    TCPiopb *pBlock,		/* Tcp parmeter block. */
-    int csCode)			/* Tcp operation code. */
-{
-    memset(pBlock, 0, sizeof(TCPiopb));
-    pBlock->ioResult = 1;
-    pBlock->ioCRefNum = driverRefNum;
-    pBlock->csCode = (short) csCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpBlockMode --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpBlockMode(
-    ClientData instanceData, 		/* Channel state. */
-    int mode)				/* The mode to set. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    
-    if (mode == TCL_MODE_BLOCKING) {
-	statePtr->flags &= ~TCP_ASYNC_SOCKET;
-    } else {
-	statePtr->flags |= TCP_ASYNC_SOCKET;
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpClose --
- *
- *	Close the socket.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the socket.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpClose(
-    ClientData instanceData,		/* The socket to close. */
-    Tcl_Interp *interp)			/* Interp for error messages. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    StreamPtr tcpStream;
-    TCPiopb closePB;
-    OSErr err;
-
-    tcpStream = statePtr->tcpStream;
-    statePtr->flags &= ~TCP_CONNECTED;
-    
-    /*
-     * If this is a server socket we can't use the statePtr
-     * param block because it is in use.  However, we can 
-     * close syncronously.
-     */
-
-    if ((statePtr->flags & TCP_LISTENING) ||
-	    (statePtr->flags & TCP_LISTEN_CONNECT)) {
-	InitMacTCPParamBlock(&closePB, TCPClose);
-    	closePB.tcpStream = tcpStream;
-    	closePB.ioCompletion = NULL; 
-    	err = PBControlSync((ParmBlkPtr) &closePB);
-    	if (err != noErr) {
-    	    Debugger();
-            panic("error closing server socket");
-    	}
-	statePtr->flags |= TCP_RELEASE;
-
-	/*
-	 * Server sockets are closed sync.  Therefor, we know it is OK to
-	 * release the socket now.
-	 */
-
-	InitMacTCPParamBlock(&statePtr->pb, TCPRelease);
-	statePtr->pb.tcpStream = statePtr->tcpStream;
-	err = PBControlSync((ParmBlkPtr) &statePtr->pb);
-	if (err != noErr) {
-            panic("error releasing server socket");
-	}
-
-	/*
-	 * Free the buffer space used by the socket and the 
-	 * actual socket state data structure.
-	 */
-
-	ckfree((char *) statePtr->pb.csParam.create.rcvBuff);
-	FreeSocketInfo(statePtr);
-	return 0;
-    }
-
-    /*
-     * If this socket is in the midddle on async connect we can just
-     * abort the connect and release the stream right now.
-     */
- 
-    if (statePtr->flags & TCP_ASYNC_CONNECT) {
-	InitMacTCPParamBlock(&closePB, TCPClose);
-    	closePB.tcpStream = tcpStream;
-    	closePB.ioCompletion = NULL; 
-    	err = PBControlSync((ParmBlkPtr) &closePB);
-    	if (err != noErr) {
-            panic("error closing async connect socket");
-    	}
-	statePtr->flags |= TCP_RELEASE;
-
-	InitMacTCPParamBlock(&statePtr->pb, TCPRelease);
-	statePtr->pb.tcpStream = statePtr->tcpStream;
-	err = PBControlSync((ParmBlkPtr) &statePtr->pb);
-	if (err != noErr) {
-            panic("error releasing async connect socket");
-	}
-
-	/*
-	 * Free the buffer space used by the socket and the 
-	 * actual socket state data structure.
-	 */
-
-	ckfree((char *) statePtr->pb.csParam.create.rcvBuff);
-	FreeSocketInfo(statePtr);
-	return 0;
-    }
-
-    /*
-     * Client sockets:
-     * If a background write is in progress, don't close
-     * the socket yet.  The completion routine for the 
-     * write will take care of it.
-     */
-    
-    if (!(statePtr->flags & TCP_WRITING)) {
-	InitMacTCPParamBlock(&statePtr->pb, TCPClose);
-    	statePtr->pb.tcpStream = tcpStream;
-    	statePtr->pb.ioCompletion = closeUPP; 
-    	statePtr->pb.csParam.close.userDataPtr = (Ptr) statePtr;
-    	err = PBControlAsync((ParmBlkPtr) &statePtr->pb);
-    	if (err != noErr) {
-	    Debugger();
-	    statePtr->flags |= TCP_RELEASE;
-            /* return 0; */
-    	}
-    }
-
-    SocketFreeProc(instanceData);
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CloseCompletionRoutine --
- *
- *	Handles the close protocol for a Tcp socket.  This will do
- *	a series of calls to release all data currently buffered for
- *	the socket.  This is important to do to as it allows the remote
- *	connection to recieve and issue it's own close on the socket.
- *	Note that this function is running at interupt time and can't
- *	allocate memory or do much else except set state.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The buffers for the socket are flushed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CloseCompletionRoutine(
-    TCPiopb *pbPtr)		/* Tcp parameter block. */
-{
-    TcpState *statePtr;
-    OSErr err;
-    
-    if (pbPtr->csCode == TCPClose) {
-	statePtr = (TcpState *) (pbPtr->csParam.close.userDataPtr);
-    } else {
-	statePtr = (TcpState *) (pbPtr->csParam.receive.userDataPtr);
-    }
-
-    /*
-     * It's very bad if the statePtr is nNULL - we should probably panic...
-     */
-
-    if (statePtr == NULL) {
-	Debugger();
-	return;
-    }
-    
-    WakeUpProcess(&statePtr->psn);
-
-    /*
-     * If there is an error we assume the remote side has already
-     * close.  We are done closing as soon as we decide that the
-     * remote connection has closed.
-     */
-    
-    if (pbPtr->ioResult != noErr) {
-	statePtr->flags |= TCP_RELEASE;
-	return;
-    }
-    if (statePtr->flags & TCP_REMOTE_CLOSED) {
-	statePtr->flags |= TCP_RELEASE;
-	return;
-    }
-    
-    /*
-     * If we just did a recieve we need to return the buffers.
-     * Otherwise, attempt to recieve more data until we recieve an
-     * error (usually because we have no more data).
-     */
-
-    if (statePtr->pb.csCode == TCPNoCopyRcv) {
-	InitMacTCPParamBlock(&statePtr->pb, TCPRcvBfrReturn);
-    	statePtr->pb.tcpStream = statePtr->tcpStream;
-	statePtr->pb.ioCompletion = closeUPP; 
-	statePtr->pb.csParam.receive.rdsPtr = (Ptr) statePtr->rdsarray;
-    	statePtr->pb.csParam.receive.userDataPtr = (Ptr) statePtr;
-	err = PBControlAsync((ParmBlkPtr) &statePtr->pb);
-    } else {
-	InitMacTCPParamBlock(&statePtr->pb, TCPNoCopyRcv);
-    	statePtr->pb.tcpStream = statePtr->tcpStream;
-	statePtr->pb.ioCompletion = closeUPP; 
-	statePtr->pb.csParam.receive.commandTimeoutValue = 1;
-	statePtr->pb.csParam.receive.rdsPtr = (Ptr) statePtr->rdsarray;
-	statePtr->pb.csParam.receive.rdsLength = 5;
-    	statePtr->pb.csParam.receive.userDataPtr = (Ptr) statePtr;
-	err = PBControlAsync((ParmBlkPtr) &statePtr->pb);
-    }
-
-    if (err != noErr) {
-	statePtr->flags |= TCP_RELEASE;
-    }
-}
-/*
- *----------------------------------------------------------------------
- *
- * SocketFreeProc --
- *
- *      This callback is invoked in order to delete
- *      the notifier data associated with a file handle.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      Removes the SocketInfo from the global socket list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SocketFreeProc(
-    ClientData clientData)      /* Channel state. */
-{
-    TcpState *statePtr = (TcpState *) clientData;
-    OSErr err;
-    TCPiopb statusPB;
-
-    /*
-     * Get the status of this connection.  We need to do a
-     * few tests to see if it's OK to release the stream now.
-     */
-
-    if (!(statePtr->flags & TCP_RELEASE)) {
-	return;
-    }
-    statusPB.ioCRefNum = driverRefNum;
-    statusPB.tcpStream = statePtr->tcpStream;
-    statusPB.csCode = TCPStatus;
-    err = PBControlSync((ParmBlkPtr) &statusPB);
-    if ((statusPB.csParam.status.connectionState == 0) ||
-	(statusPB.csParam.status.connectionState == 2)) {
-	/*
-	 * If the conection state is 0 then this was a client
-	 * connection and it's closed.  If it is 2 then this a
-	 * server client and we may release it.  If it isn't
-	 * one of those values then we return and we'll try to
-	 * clean up later.
-	 */
-
-    } else {
-	return;
-    }
-    
-    /*
-     * The Close request is made async.  We know it's
-     * OK to release the socket when the TCP_RELEASE flag
-     * gets set.
-     */
-
-    InitMacTCPParamBlock(&statePtr->pb, TCPRelease);
-    statePtr->pb.tcpStream = statePtr->tcpStream;
-    err = PBControlSync((ParmBlkPtr) &statePtr->pb);
-    if (err != noErr) {
-        Debugger(); /* Ignoreing leaves stranded stream.  Is there an
-		       alternative?  */
-    }
-
-    /*
-     * Free the buffer space used by the socket and the 
-     * actual socket state data structure.
-     */
-
-    ckfree((char *) statePtr->pb.csParam.create.rcvBuff);
-    FreeSocketInfo(statePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpInput --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error 
- *	indication.
- *
- * Results:
- *	A count of how many bytes were read is returned.  A value of -1
- *	implies an error occured.  A value of zero means we have reached
- *	the end of data (EOF).
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TcpInput(
-    ClientData instanceData,		/* Channel state. */
-    char *buf, 				/* Where to store data read. */
-    int bufSize, 			/* How much space is available
-                                         * in the buffer? */
-    int *errorCodePtr)			/* Where to store error code. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    StreamPtr tcpStream;
-    OSErr err;
-    TCPiopb statusPB;
-    int toRead, dataAvail;
-
-    *errorCodePtr = 0;
-    errno = 0;
-    tcpStream = statePtr->tcpStream;
-
-    if (bufSize == 0) {
-        return 0;
-    }
-    toRead = bufSize;
-
-    /*
-     * First check to see if EOF was already detected, to prevent
-     * calling the socket stack after the first time EOF is detected.
-     */
-
-    if (statePtr->flags & TCP_REMOTE_CLOSED) {
-	return 0;
-    }
-
-    /*
-     * If an asynchronous connect is in progress, attempt to wait for it
-     * to complete before reading.
-     */
-    
-    if ((statePtr->flags & TCP_ASYNC_CONNECT)
-	    && ! WaitForSocketEvent(statePtr, TCL_READABLE, errorCodePtr)) {
-	return -1;
-    }
-
-    /*
-     * No EOF, and it is connected, so try to read more from the socket.
-     * If the socket is blocking, we keep trying until there is data
-     * available or the socket is closed.
-     */
-
-    while (1) {
-
-	statusPB.ioCRefNum = driverRefNum;
-	statusPB.tcpStream = tcpStream;
-	statusPB.csCode = TCPStatus;
-	err = PBControlSync((ParmBlkPtr) &statusPB);
-	if (err != noErr) {
-	    Debugger();
-	    statePtr->flags |= TCP_REMOTE_CLOSED;
-	    return 0;	/* EOF */
-	}
-	dataAvail = statusPB.csParam.status.amtUnreadData;
-	if (dataAvail < bufSize) {
-	    toRead = dataAvail;
-	} else {
-	    toRead = bufSize;
-	}
-	if (toRead != 0) {
-	    /*
-	     * Try to read the data.
-	     */
-	    
-	    InitMacTCPParamBlock(&statusPB, TCPRcv);
-	    statusPB.tcpStream = tcpStream;
-	    statusPB.csParam.receive.rcvBuff = buf;
-	    statusPB.csParam.receive.rcvBuffLen = toRead;
-	    err = PBControlSync((ParmBlkPtr) &statusPB);
-
-	    statePtr->checkMask &= ~TCL_READABLE;
-	    switch (err) {
-		case noErr:
-		    /*
-		     * The channel remains readable only if this read succeds
-		     * and we had more data then the size of the buffer we were
-		     * trying to fill.  Use the info from the call to status to
-		     * determine this.
-		     */
-
-		    if (dataAvail > bufSize) {
-			statePtr->checkMask |= TCL_READABLE;
-		    }
-		    return statusPB.csParam.receive.rcvBuffLen;
-		case connectionClosing:
-		    *errorCodePtr = errno = ESHUTDOWN;
-		    statePtr->flags |= TCP_REMOTE_CLOSED;
-		    return 0;
-		case connectionDoesntExist:
-		case connectionTerminated:
-		    *errorCodePtr = errno = ENOTCONN;
-		    statePtr->flags |= TCP_REMOTE_CLOSED;
-		    return 0;
-		case invalidStreamPtr:
-		default:
-		    *errorCodePtr = EINVAL;
-		    return -1;
-	    }
-	}
-
-	/*
-	 * No data is available, so check the connection state to
-	 * see why this is the case.  
-	 */
-
-	if (statusPB.csParam.status.connectionState == 14) {
-	    statePtr->flags |= TCP_REMOTE_CLOSED;
-	    return 0;
-	}
-	if (statusPB.csParam.status.connectionState != 8) {
-	    Debugger();
-	}
-	statePtr->checkMask &= ~TCL_READABLE;
-	if (statePtr->flags & TCP_ASYNC_SOCKET) {
-	    *errorCodePtr = EWOULDBLOCK;
-	    return -1;
-	}
-
-	/*
-	 * In the blocking case, wait until the file becomes readable
-	 * or closed and try again.
-	 */
-
-	if (!WaitForSocketEvent(statePtr, TCL_READABLE, errorCodePtr)) {
-	    return -1;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetHandle --
- *
- *	Called from Tcl_GetChannelHandle to retrieve handles from inside
- *	a file based channel.
- *
- * Results:
- *	The appropriate handle or NULL if not present. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpGetHandle(
-    ClientData instanceData,		/* The file state. */
-    int direction,			/* Which handle to retrieve? */
-    ClientData *handlePtr)
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-
-    *handlePtr = (ClientData) statePtr->tcpStream;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpOutput--
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpOutput(
-    ClientData instanceData, 		/* Channel state. */
-    char *buf, 				/* The data buffer. */
-    int toWrite, 			/* How many bytes to write? */
-    int *errorCodePtr)			/* Where to store error code. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    StreamPtr tcpStream;
-    OSErr err;
-    int amount;
-    TCPiopb statusPB;
-
-    *errorCodePtr = 0;
-    tcpStream = statePtr->tcpStream;
-
-    /*
-     * If an asynchronous connect is in progress, attempt to wait for it
-     * to complete before writing.
-     */
-    
-    if ((statePtr->flags & TCP_ASYNC_CONNECT)
-	    && ! WaitForSocketEvent(statePtr, TCL_WRITABLE, errorCodePtr)) {
-	return -1;
-    }
-
-    /*
-     * Loop until we have written some data, or an error occurs.
-     */
-
-    while (1) {
-	statusPB.ioCRefNum = driverRefNum;
-	statusPB.tcpStream = tcpStream;
-	statusPB.csCode = TCPStatus;
-	err = PBControlSync((ParmBlkPtr) &statusPB);
-	if ((err == connectionDoesntExist) || ((err == noErr) && 
-		(statusPB.csParam.status.connectionState == 14))) {
-	    /*
-	     * The remote connection is gone away.  Report an error
-	     * and don't write anything.
-	     */
-
-	    *errorCodePtr = errno = EPIPE;
-	    return -1;
-	} else if (err != noErr) {
-	    return -1;
-	}
-	amount = statusPB.csParam.status.sendWindow
-	    - statusPB.csParam.status.amtUnackedData;
-
-	/*
-	 * Attempt to write the data to the socket if a background
-	 * write isn't in progress and there is room in the output buffers.
-	 */
-
-	if (!(statePtr->flags & TCP_WRITING) && amount > 0) {
-	    if (toWrite < amount) {
-		amount = toWrite;
-	    }
-	    statePtr->dataSegment[0].length = amount;
-	    statePtr->dataSegment[0].ptr = buf;
-	    statePtr->dataSegment[1].length = 0;
-	    InitMacTCPParamBlock(&statePtr->pb, TCPSend);
-	    statePtr->pb.ioCompletion = completeUPP;
-	    statePtr->pb.tcpStream = tcpStream;
-	    statePtr->pb.csParam.send.wdsPtr = (Ptr) statePtr->dataSegment;
-	    statePtr->pb.csParam.send.pushFlag = 1;
-	    statePtr->pb.csParam.send.userDataPtr = (Ptr) statePtr;
-	    statePtr->flags |= TCP_WRITING;
-	    err = PBControlAsync((ParmBlkPtr) &(statePtr->pb));
-	    switch (err) {
-		case noErr:
-		    return amount;
-		case connectionClosing:
-		    *errorCodePtr = errno = ESHUTDOWN;
-		    statePtr->flags |= TCP_REMOTE_CLOSED;
-		    return -1;
-		case connectionDoesntExist:
-		case connectionTerminated:
-		    *errorCodePtr = errno = ENOTCONN;
-		    statePtr->flags |= TCP_REMOTE_CLOSED;
-		    return -1;
-		case invalidStreamPtr:
-		default:
-		    return -1;
-	    }
-
-	}
-
-	/*
-	 * The socket wasn't writable.  In the non-blocking case, return
-	 * immediately, otherwise wait  until the file becomes writable
-	 * or closed and try again.
-	 */
-
-	if (statePtr->flags & TCP_ASYNC_SOCKET) {
-	    statePtr->checkMask &= ~TCL_WRITABLE;
-	    *errorCodePtr = EWOULDBLOCK;
-	    return -1;
-	} else if (!WaitForSocketEvent(statePtr, TCL_WRITABLE, errorCodePtr)) {
-	    return -1;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetOptionProc --
- *
- *	Computes an option value for a TCP socket based channel, or a
- *	list of all options and their values.
- *
- *	Note: This code is based on code contributed by John Haxby.
- *
- * Results:
- *	A standard Tcl result. The value of the specified option or a
- *	list of all options and	their values is returned in the
- *	supplied DString.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpGetOptionProc(
-    ClientData instanceData, 		/* Socket state. */
-    Tcl_Interp *interp,                 /* For error reporting - can be NULL.*/
-    char *optionName, 			/* Name of the option to
-                                         * retrieve the value for, or
-                                         * NULL to get all options and
-                                         * their values. */
-    Tcl_DString *dsPtr)			/* Where to store the computed
-                                         * value; initialized by caller. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    int doPeerName = false, doSockName = false, doAll = false;
-    ip_addr tcpAddress;
-    char buffer[128];
-    OSErr err;
-    Tcl_DString dString;
-    TCPiopb statusPB;
-    int errorCode;
-
-    /*
-     * If an asynchronous connect is in progress, attempt to wait for it
-     * to complete before accessing the socket state.
-     */
-    
-    if ((statePtr->flags & TCP_ASYNC_CONNECT)
-	    && ! WaitForSocketEvent(statePtr, TCL_WRITABLE, &errorCode)) {
-	if (interp) {
-	    /*
-	     * fix the error message.
-	     */
-
-	    Tcl_AppendResult(interp, "connect is in progress and can't wait",
-	    		NULL);
-	}
-	return TCL_ERROR;
-    }
-            
-    /*
-     * Determine which options we need to do.  Do all of them
-     * if optionName is NULL.
-     */
-
-    if (optionName == (char *) NULL || optionName[0] == '\0') {
-        doAll = true;
-    } else {
-	if (!strcmp(optionName, "-peername")) {
-	    doPeerName = true;
-	} else if (!strcmp(optionName, "-sockname")) {
-	    doSockName = true;
-	} else {
-	    return Tcl_BadChannelOption(interp, optionName, 
-	    		"peername sockname");
-	}
-    }
-
-    /*
-     * Get status on the stream.  Make sure to use a new pb struct because
-     * the struct in the statePtr may be part of an asyncronous call.
-     */
-
-    statusPB.ioCRefNum = driverRefNum;
-    statusPB.tcpStream = statePtr->tcpStream;
-    statusPB.csCode = TCPStatus;
-    err = PBControlSync((ParmBlkPtr) &statusPB);
-    if ((err == connectionDoesntExist) ||
-	((err == noErr) && (statusPB.csParam.status.connectionState == 14))) {
-	/*
-	 * The socket was probably closed on the other side of the connection.
-	 */
-
-	if (interp) {
-	    Tcl_AppendResult(interp, "can't access socket info: ",
-			     "connection reset by peer", NULL);
-	}
-	return TCL_ERROR;
-    } else if (err != noErr) {
-	if (interp) { 
-	    Tcl_AppendResult(interp, "unknown socket error", NULL);
-	}
-	Debugger();
-	return TCL_ERROR;
-    }
-
-
-    /*
-     * Get the sockname for the socket.
-     */
-
-    Tcl_DStringInit(&dString);
-    if (doAll || doSockName) {
-	if (doAll) {
-	    Tcl_DStringAppendElement(dsPtr, "-sockname");
-	    Tcl_DStringStartSublist(dsPtr);
-	}
-	tcpAddress = statusPB.csParam.status.localHost;
-	sprintf(buffer, "%d.%d.%d.%d", tcpAddress>>24,
-		tcpAddress>>16 & 0xff, tcpAddress>>8 & 0xff,
-		tcpAddress & 0xff);
-	Tcl_DStringAppendElement(dsPtr, buffer);
-	if (ResolveAddress(tcpAddress, &dString) == noErr) {
-	    Tcl_DStringAppendElement(dsPtr, dString.string);
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "<unknown>");
-	}
-	sprintf(buffer, "%d", statusPB.csParam.status.localPort);
-	Tcl_DStringAppendElement(dsPtr, buffer);
-	if (doAll) {
-	    Tcl_DStringEndSublist(dsPtr);
-	}
-    }
-
-    /*
-     * Get the peername for the socket.
-     */
-
-    if ((doAll || doPeerName) && (statePtr->flags & TCP_CONNECTED)) {
-	if (doAll) {
-	    Tcl_DStringAppendElement(dsPtr, "-peername");
-	    Tcl_DStringStartSublist(dsPtr);
-	}
-	tcpAddress = statusPB.csParam.status.remoteHost;
-	sprintf(buffer, "%d.%d.%d.%d", tcpAddress>>24,
-		tcpAddress>>16 & 0xff, tcpAddress>>8 & 0xff,
-		tcpAddress & 0xff);
-	Tcl_DStringAppendElement(dsPtr, buffer);
-	Tcl_DStringSetLength(&dString, 0);
-	if (ResolveAddress(tcpAddress, &dString) == noErr) {
-	    Tcl_DStringAppendElement(dsPtr, dString.string);
-	} else {
-	    Tcl_DStringAppendElement(dsPtr, "<unknown>");
-	}
-	sprintf(buffer, "%d", statusPB.csParam.status.remotePort);
-	Tcl_DStringAppendElement(dsPtr, buffer);
-	if (doAll) {
-	    Tcl_DStringEndSublist(dsPtr);
-	}
-    }
-
-    Tcl_DStringFree(&dString);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpWatch --
- *
- *	Initialize the notifier to watch this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the watchMask for the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpWatch(instanceData, mask)
-    ClientData instanceData;		/* The file state. */
-    int mask;				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-
-    statePtr->watchMask = mask;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NewSocketInfo --
- *
- *	This function allocates and initializes a new SocketInfo
- *	structure.
- *
- * Results:
- *	Returns a newly allocated SocketInfo.
- *
- * Side effects:
- *	Adds the socket to the global socket list, allocates memory.
- *
- *----------------------------------------------------------------------
- */
-
-static TcpState *
-NewSocketInfo(
-    StreamPtr tcpStream)
-{
-    TcpState *statePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    statePtr = (TcpState *) ckalloc((unsigned) sizeof(TcpState));
-    statePtr->tcpStream = tcpStream;
-    statePtr->psn = applicationPSN;
-    statePtr->flags = 0;
-    statePtr->checkMask = 0;
-    statePtr->watchMask = 0;
-    statePtr->acceptProc = (Tcl_TcpAcceptProc *) NULL;
-    statePtr->acceptProcData = (ClientData) NULL;
-    statePtr->nextPtr = tsdPtr->socketList;
-    tsdPtr->socketList = statePtr;
-    return statePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FreeSocketInfo --
- *
- *	This function deallocates a SocketInfo structure that is no
- *	longer needed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the socket from the global socket list, frees memory.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FreeSocketInfo(
-    TcpState *statePtr)		/* The state pointer to free. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (statePtr == tsdPtr->socketList) {
-	tsdPtr->socketList = statePtr->nextPtr;
-    } else {
-	TcpState *p;
-	for (p = tsdPtr->socketList; p != NULL; p = p->nextPtr) {
-	    if (p->nextPtr == statePtr) {
-		p->nextPtr = statePtr->nextPtr;
-		break;
-	    }
-	}
-    }
-    ckfree((char *) statePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeTcpClientChannel --
- *
- *	Creates a Tcl_Channel from an existing client TCP socket.
- *
- * Results:
- *	The Tcl_Channel wrapped around the preexisting TCP socket.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeTcpClientChannel(
-    ClientData sock)	/* The socket to wrap up into a channel. */
-{
-    TcpState *statePtr;
-    char channelName[20];
-
-    if (TclpHasSockets(NULL) != TCL_OK) {
-	return NULL;
-    }
-	
-    statePtr = NewSocketInfo((StreamPtr) sock);
-    /* TODO: do we need to set the port??? */
-    
-    sprintf(channelName, "sock%d", socketNumber++);
-    
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE));
-    Tcl_SetChannelBufferSize(statePtr->channel, socketBufferSize);
-    Tcl_SetChannelOption(NULL, statePtr->channel, "-translation", "auto crlf");
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateSocket --
- *
- *	This function opens a new socket and initializes the
- *	SocketInfo structure.
- *
- * Results:
- *	Returns a new SocketInfo, or NULL with an error in interp.
- *
- * Side effects:
- *	Adds a new socket to the socketList.
- *
- *----------------------------------------------------------------------
- */
-
-static TcpState *
-CreateSocket(
-    Tcl_Interp *interp,		/* For error reporting; can be NULL. */
-    int port,			/* Port number to open. */
-    char *host,			/* Name of host on which to open port. */
-    char *myaddr,		/* Optional client-side address */
-    int myport,			/* Optional client-side port */
-    int server,			/* 1 if socket should be a server socket,
-				 * else 0 for a client socket. */
-    int async)			/* 1 create async, 0 do sync. */
-{
-    ip_addr macAddr;
-    OSErr err;
-    TCPiopb pb;
-    StreamPtr tcpStream;
-    TcpState *statePtr;
-    char * buffer;
-    
-    /*
-     * Figure out the ip address from the host string.
-     */
-
-    if (host == NULL) {
-	err = GetLocalAddress(&macAddr);
-    } else {
-	err = GetHostFromString(host, &macAddr);
-    }
-    if (err != noErr) {
-	Tcl_SetErrno(EHOSTUNREACH);
-	if (interp != (Tcl_Interp *) NULL) {
-	    Tcl_AppendResult(interp, "couldn't open socket: ",
-                        Tcl_PosixError(interp), (char *) NULL);
-	}
-	return (TcpState *) NULL;
-    }
-    
-    /*
-     * Create a MacTCP stream and create the state used for socket
-     * transactions from here on out.
-     */
-
-    ClearZombieSockets();
-    buffer = ckalloc(socketBufferSize);
-    InitMacTCPParamBlock(&pb, TCPCreate);
-    pb.csParam.create.rcvBuff = buffer;
-    pb.csParam.create.rcvBuffLen = socketBufferSize;
-    err = PBControlSync((ParmBlkPtr) &pb);
-    if (err != noErr) {
-        Tcl_SetErrno(0); /* TODO: set to ENOSR - maybe?*/
-        if (interp != (Tcl_Interp *) NULL) {
-	    Tcl_AppendResult(interp, "couldn't open socket: ",
-		Tcl_PosixError(interp), (char *) NULL);
-        }
-	return (TcpState *) NULL;
-    }
-
-    tcpStream = pb.tcpStream;
-    statePtr = NewSocketInfo(tcpStream);
-    statePtr->port = port;
-    
-    if (server) {
-        /* 
-         * Set up server connection.
-         */
-
-	InitMacTCPParamBlock(&statePtr->pb, TCPPassiveOpen);
-	statePtr->pb.tcpStream = tcpStream;
-	statePtr->pb.csParam.open.localPort = statePtr->port;
-	statePtr->pb.ioCompletion = completeUPP; 
-	statePtr->pb.csParam.open.userDataPtr = (Ptr) statePtr;
-	statePtr->flags |= TCP_LISTENING;
-	err = PBControlAsync((ParmBlkPtr) &(statePtr->pb));
-
-	/*
-	 * If this is a server on port 0 then we need to wait until
-	 * the dynamic port allocation is made by the MacTcp driver.
-	 */
-
-	if (statePtr->port == 0) {
-	    EventRecord dummy;
-
-	    while (statePtr->pb.csParam.open.localPort == 0) {
-		WaitNextEvent(0, &dummy, 1, NULL);
-		if (statePtr->pb.ioResult != 0) {
-		    break;
-		}
-	    }
-	    statePtr->port = statePtr->pb.csParam.open.localPort;
-	}
-	Tcl_SetErrno(EINPROGRESS);
-    } else {
-	/*
-	 * Attempt to connect. The connect may fail at present with an
-	 * EINPROGRESS but at a later time it will complete. The caller
-	 * will set up a file handler on the socket if she is interested in
-	 * being informed when the connect completes.
-	 */
-
-	InitMacTCPParamBlock(&statePtr->pb, TCPActiveOpen);
-	statePtr->pb.tcpStream = tcpStream;
-	statePtr->pb.csParam.open.remoteHost = macAddr;
-	statePtr->pb.csParam.open.remotePort = port;
-	statePtr->pb.csParam.open.localHost = 0;
-	statePtr->pb.csParam.open.localPort = myport;
-	statePtr->pb.csParam.open.userDataPtr = (Ptr) statePtr;
-	statePtr->pb.ioCompletion = completeUPP;
-	if (async) {
-	    statePtr->flags |= TCP_ASYNC_CONNECT;
-	    err = PBControlAsync((ParmBlkPtr) &(statePtr->pb));
-	    Tcl_SetErrno(EINPROGRESS);
-	} else {
-	    err = PBControlSync((ParmBlkPtr) &(statePtr->pb));
-	}
-    }
-    
-    switch (err) {
-	case noErr:
-	    if (!async) {
-		statePtr->flags |= TCP_CONNECTED;
-	    }
-	    return statePtr;
-	case duplicateSocket:
-	    Tcl_SetErrno(EADDRINUSE);
-	    break;
-	case openFailed:
-	case connectionTerminated:
-	    Tcl_SetErrno(ECONNREFUSED);
-	    break;
-	case invalidStreamPtr:
-	case connectionExists:
-	default:
-	    /*
-	     * These cases should never occur.  However, we will fail
-	     * gracefully and hope Tcl can resume.  The alternative is to panic
-	     * which is probably a bit drastic.
-	     */
-
-	    Debugger();
-	    Tcl_SetErrno(err);
-    }
-
-    /*
-     * We had error during the connection.  Release the stream
-     * and file handle.  Also report to the interp.
-     */
-
-    pb.ioCRefNum = driverRefNum;
-    pb.csCode = TCPRelease;
-    pb.tcpStream = tcpStream;
-    pb.ioCompletion = NULL; 
-    err = PBControlSync((ParmBlkPtr) &pb);
-
-    if (interp != (Tcl_Interp *) NULL) {
-	Tcl_AppendResult(interp, "couldn't open socket: ",
-	    Tcl_PosixError(interp), (char *) NULL);
-    }
-
-    ckfree(buffer);
-    FreeSocketInfo(statePtr);
-    return (TcpState *) NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpClient --
- *
- *	Opens a TCP client socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed. On failure, the routine also
- *	sets the output argument errorCodePtr to the error code.
- *
- * Side effects:
- *	Opens a client socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpClient(
-    Tcl_Interp *interp, 		/* For error reporting; can be NULL. */
-    int port, 				/* Port number to open. */
-    char *host, 			/* Host on which to open port. */
-    char *myaddr, 			/* Client-side address */
-    int myport, 			/* Client-side port */
-    int async)				/* If nonzero, attempt to do an
-                                         * asynchronous connect. Otherwise
-                                         * we do a blocking connect. 
-                                         * - currently ignored */
-{
-    TcpState *statePtr;
-    char channelName[20];
-
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-	
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    statePtr = CreateSocket(interp, port, host, myaddr, myport, 0, async);
-    if (statePtr == NULL) {
-	return NULL;
-    }
-    
-    sprintf(channelName, "sock%d", socketNumber++);
-
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE));
-    Tcl_SetChannelBufferSize(statePtr->channel, socketBufferSize);
-    Tcl_SetChannelOption(NULL, statePtr->channel, "-translation", "auto crlf");
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpServer --
- *
- *	Opens a TCP server socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed.
- *
- * Side effects:
- *	Opens a server socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpServer(
-    Tcl_Interp *interp,			/* For error reporting - may be
-                                         * NULL. */
-    int port,				/* Port number to open. */
-    char *host,				/* Name of local host. */
-    Tcl_TcpAcceptProc *acceptProc,	/* Callback for accepting connections
-                                         * from new clients. */
-    ClientData acceptProcData)		/* Data for the callback. */
-{
-    TcpState *statePtr;
-    char channelName[20];
-
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    statePtr = CreateSocket(interp, port, host, NULL, 0, 1, 1);
-    if (statePtr == NULL) {
-	return NULL;
-    }
-
-    statePtr->acceptProc = acceptProc;
-    statePtr->acceptProcData = acceptProcData;
-
-    sprintf(channelName, "sock%d", socketNumber++);
-
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, 0);
-    Tcl_SetChannelBufferSize(statePtr->channel, socketBufferSize);
-    Tcl_SetChannelOption(NULL, statePtr->channel, "-translation", "auto crlf");
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketEventProc --
- *
- *	This procedure is called by Tcl_ServiceEvent when a socket event
- *	reaches the front of the event queue.  This procedure is
- *	responsible for notifying the generic channel code.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the channel callback procedures do.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SocketEventProc(
-    Tcl_Event *evPtr,		/* Event to service. */
-    int flags)			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    TcpState *statePtr;
-    SocketEvent *eventPtr = (SocketEvent *) evPtr;
-    int mask = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Find the specified socket on the socket list.
-     */
-
-    for (statePtr = tsdPtr->socketList; statePtr != NULL;
-	    statePtr = statePtr->nextPtr) {
-	if ((statePtr == eventPtr->statePtr) && 
-		(statePtr->tcpStream == eventPtr->tcpStream)) {
-	    break;
-	}
-    }
-
-    /*
-     * Discard events that have gone stale.
-     */
-
-    if (!statePtr) {
-	return 1;
-    }
-    statePtr->flags &= ~(TCP_PENDING);
-    if (statePtr->flags & TCP_RELEASE) {
-	SocketFreeProc(statePtr);
-	return 1;
-    }
-
-
-    /*
-     * Handle connection requests directly.
-     */
-
-    if (statePtr->flags & TCP_LISTEN_CONNECT) {
-	if (statePtr->checkMask & TCL_READABLE) {
-	    TcpAccept(statePtr);
-	}
-	return 1;
-    }
-
-    /*
-     * Mask off unwanted events then notify the channel.
-     */
-
-    mask = statePtr->checkMask & statePtr->watchMask;
-    if (mask) {
-	Tcl_NotifyChannel(statePtr->channel, mask);
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForSocketEvent --
- *
- *	Waits until one of the specified events occurs on a socket.
- *
- * Results:
- *	Returns 1 on success or 0 on failure, with an error code in
- *	errorCodePtr.
- *
- * Side effects:
- *	Processes socket events off the system queue.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForSocketEvent(
-    TcpState *statePtr,		/* Information about this socket. */
-    int mask,			/* Events to look for. */
-    int *errorCodePtr)		/* Where to store errors? */
-{
-    OSErr err;
-    TCPiopb statusPB;
-    EventRecord dummy;
-
-    /*
-     * Loop until we get the specified condition, unless the socket is
-     * asynchronous.
-     */
-    
-    do {
-	statusPB.ioCRefNum = driverRefNum;
-	statusPB.tcpStream = statePtr->tcpStream;
-	statusPB.csCode = TCPStatus;
-	err = PBControlSync((ParmBlkPtr) &statusPB);
-	if (err != noErr) {
-	    statePtr->checkMask |= (TCL_READABLE | TCL_WRITABLE);
-	    return 1;
-	}
-	statePtr->checkMask = 0;
-	if (statusPB.csParam.status.amtUnreadData > 0) {
-	    statePtr->checkMask |= TCL_READABLE;
-	}
-	if (!(statePtr->flags & TCP_WRITING)
-		&& (statusPB.csParam.status.sendWindow - 
-			statusPB.csParam.status.amtUnackedData) > 0) {
-	    statePtr->flags &= ~(TCP_ASYNC_CONNECT);
-	    statePtr->checkMask |= TCL_WRITABLE;
-	}
-	if (mask & statePtr->checkMask) {
-	    return 1;
-	}
-
-	/*
-	 * Call the system to let other applications run while we
-	 * are waiting for this event to occur.
-	 */
-	
-	WaitNextEvent(0, &dummy, 1, NULL);
-    } while (!(statePtr->flags & TCP_ASYNC_SOCKET));
-    *errorCodePtr = EWOULDBLOCK;
-    return 0;
-} 
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpAccept --
- *	Accept a TCP socket connection.  This is called by the event 
- *	loop, and it in turns calls any registered callbacks for this
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Evals the Tcl script associated with the server socket.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpAccept(
-    TcpState *statePtr)
-{
-    TcpState *newStatePtr;
-    StreamPtr tcpStream;
-    char remoteHostname[255];
-    OSErr err;
-    ip_addr remoteAddress;
-    long remotePort;
-    char channelName[20];
-    
-    statePtr->flags &= ~TCP_LISTEN_CONNECT;
-    statePtr->checkMask &= ~TCL_READABLE;
-
-    /*
-     * Transfer sever stream to new connection.
-     */
-
-    tcpStream = statePtr->tcpStream;
-    newStatePtr = NewSocketInfo(tcpStream);
-    newStatePtr->tcpStream = tcpStream;
-    sprintf(channelName, "sock%d", socketNumber++);
-
-
-    newStatePtr->flags |= TCP_CONNECTED;
-    newStatePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) newStatePtr, (TCL_READABLE | TCL_WRITABLE));
-    Tcl_SetChannelBufferSize(newStatePtr->channel, socketBufferSize);
-    Tcl_SetChannelOption(NULL, newStatePtr->channel, "-translation",
-	    "auto crlf");
-
-    remoteAddress = statePtr->pb.csParam.open.remoteHost;
-    remotePort = statePtr->pb.csParam.open.remotePort;
-
-    /*
-     * Reopen passive connect.  Make new tcpStream the server.
-     */
-
-    ClearZombieSockets();
-    InitMacTCPParamBlock(&statePtr->pb, TCPCreate);
-    statePtr->pb.csParam.create.rcvBuff = ckalloc(socketBufferSize);
-    statePtr->pb.csParam.create.rcvBuffLen = socketBufferSize;
-    err = PBControlSync((ParmBlkPtr) &statePtr->pb);
-    if (err != noErr) {
-	/* 
-	 * Hmmm...  We can't reopen the server.  We'll go ahead
-	 * an continue - but we are kind of broken now...
-	 */
-	 Debugger();
-	 statePtr->tcpStream = -1;
-	 statePtr->flags |= TCP_SERVER_ZOMBIE;
-    }
-
-    tcpStream = statePtr->tcpStream = statePtr->pb.tcpStream;
-    
-    InitMacTCPParamBlock(&statePtr->pb, TCPPassiveOpen);
-    statePtr->pb.tcpStream = tcpStream;
-    statePtr->pb.csParam.open.localHost = 0;
-    statePtr->pb.csParam.open.localPort = statePtr->port;
-    statePtr->pb.ioCompletion = completeUPP; 
-    statePtr->pb.csParam.open.userDataPtr = (Ptr) statePtr;
-    statePtr->flags |= TCP_LISTENING;
-    err = PBControlAsync((ParmBlkPtr) &(statePtr->pb));
-    /*
-     * TODO: deal with case where we can't recreate server socket...
-     */
-
-    /*
-     * Finally we run the accept procedure.  We must do this last to make
-     * sure we are in a nice clean state.  This Tcl code can do anything
-     * including closing the server or client sockets we've just delt with.
-     */
-
-    if (statePtr->acceptProc != NULL) {
-	sprintf(remoteHostname, "%d.%d.%d.%d", remoteAddress>>24,
-		remoteAddress>>16 & 0xff, remoteAddress>>8 & 0xff,
-		remoteAddress & 0xff);
-		
-	(statePtr->acceptProc)(statePtr->acceptProcData, newStatePtr->channel, 
-	    remoteHostname, remotePort);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetHostName --
- *
- *	Returns the name of the local host.
- *
- * Results:
- *	A string containing the network name for this machine, or
- *	an empty string if we can't figure out the name.  The caller 
- *	must not modify or free this string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetHostName()
-{
-    static int  hostnameInited = 0;
-    static char hostname[255];
-    ip_addr ourAddress;
-    Tcl_DString dString;
-    OSErr err;
-    
-    if (hostnameInited) {
-        return hostname;
-    }
-    
-    if (TclpHasSockets(NULL) == TCL_OK) {
-	err = GetLocalAddress(&ourAddress);
-	if (err == noErr) {
-	    /*
-	     * Search for the doman name and return it if found.  Otherwise, 
-	     * just print the IP number to a string and return that.
-	     */
-
-	    Tcl_DStringInit(&dString);
-	    err = ResolveAddress(ourAddress, &dString);
-	    if (err == noErr) {
-		strcpy(hostname, dString.string);
-	    } else {
-		sprintf(hostname, "%d.%d.%d.%d", ourAddress>>24, ourAddress>>16 & 0xff,
-		    ourAddress>>8 & 0xff, ourAddress & 0xff);
-	    }
-	    Tcl_DStringFree(&dString);
-	    
-	    hostnameInited = 1;
-	    return hostname;
-	}
-    }
-
-    hostname[0] = '\0';
-    hostnameInited = 1;
-    return hostname;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ResolveAddress --
- *
- *	This function is used to resolve an ip address to it's full 
- *	domain name address.
- *
- * Results:
- *	An os err value.
- *
- * Side effects:
- *	Treats client data as int we set to true.
- *
- *----------------------------------------------------------------------
- */
-
-static OSErr 
-ResolveAddress(
-    ip_addr tcpAddress, 	/* Address to resolve. */
-    Tcl_DString *dsPtr)		/* Returned address in string. */
-{
-    int i;
-    EventRecord dummy;
-    DNRState dnrState;
-    OSErr err;
-
-    /*
-     * Call AddrToName to resolve our ip address to our domain name.
-     * The call is async, so we must wait for a callback to tell us
-     * when to continue.
-     */
-
-     for (i = 0; i < NUM_ALT_ADDRS; i++) {
-	dnrState.hostInfo.addr[i] = 0;
-     }
-    dnrState.done = 0;
-    GetCurrentProcess(&(dnrState.psn));
-    err = AddrToName(tcpAddress, &dnrState.hostInfo, resultUPP, (Ptr) &dnrState);
-    if (err == cacheFault) {
-	while (!dnrState.done) {
-	    WaitNextEvent(0, &dummy, 1, NULL);
-	}
-    }
-    
-    /*
-     * If there is no error in finding the domain name we set the
-     * result into the dynamic string.  We also work around a bug in
-     * MacTcp where an extranious '.' may be found at the end of the name.
-     */
-
-    if (dnrState.hostInfo.rtnCode == noErr) {
-	i = strlen(dnrState.hostInfo.cname) - 1;
-	if (dnrState.hostInfo.cname[i] == '.') {
-	    dnrState.hostInfo.cname[i] = '\0';
-	}
-	Tcl_DStringAppend(dsPtr, dnrState.hostInfo.cname, -1);
-    }
-    
-    return dnrState.hostInfo.rtnCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DNRCompletionRoutine --
- *
- *	This function is called when the Domain Name Server is done
- *	seviceing our request.  It just sets a flag that we can poll
- *	in functions like Tcl_GetHostName to let them know to continue.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Treats client data as int we set to true.
- *
- *----------------------------------------------------------------------
- */
-
-static pascal void 
-DNRCompletionRoutine(
-    struct hostInfo *hostinfoPtr, 	/* Host infor struct. */
-    DNRState *dnrStatePtr)		/* Completetion state. */
-{
-    dnrStatePtr->done = true;
-    WakeUpProcess(&(dnrStatePtr->psn));
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CleanUpExitProc --
- *
- *	This procedure is invoked as an exit handler when ExitToShell
- *	is called.  It aborts any lingering socket connections.  This 
- *	must be called or the Mac OS will more than likely crash.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static pascal void
-CleanUpExitProc()
-{
-    TCPiopb exitPB;
-    TcpState *statePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    while (tsdPtr->socketList != NULL) {
-	statePtr = tsdPtr->socketList;
-	tsdPtr->socketList = statePtr->nextPtr;
-
-	/*
-	 * Close and Release the connection.
-	 */
-
-	exitPB.ioCRefNum = driverRefNum;
-	exitPB.csCode = TCPClose;
-	exitPB.tcpStream = statePtr->tcpStream;
-	exitPB.csParam.close.ulpTimeoutValue = 60 /* seconds */;
-	exitPB.csParam.close.ulpTimeoutAction = 1 /* 1:abort 0:report */;
-	exitPB.csParam.close.validityFlags = timeoutValue | timeoutAction;
-	exitPB.ioCompletion = NULL; 
-	PBControlSync((ParmBlkPtr) &exitPB);
-
-	exitPB.ioCRefNum = driverRefNum;
-	exitPB.csCode = TCPRelease;
-	exitPB.tcpStream = statePtr->tcpStream;
-	exitPB.ioCompletion = NULL; 
-	PBControlSync((ParmBlkPtr) &exitPB);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetHostFromString --
- *
- *	Looks up the passed in domain name in the domain resolver.  It
- *	can accept strings of two types: 1) the ip number in string
- *	format, or 2) the domain name.
- *
- * Results:
- *	We return a ip address or 0 if there was an error or the 
- *	domain does not exist.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static OSErr
-GetHostFromString(
-    char *name, 		/* Host in string form. */
-    ip_addr *address)		/* Returned IP address. */
-{
-    OSErr err;
-    int i;
-    EventRecord dummy;
-    DNRState dnrState;
-	
-    if (TclpHasSockets(NULL) != TCL_OK) {
-	return 0;
-    }
-
-    /*
-     * Call StrToAddr to get the ip number for the passed in domain
-     * name.  The call is async, so we must wait for a callback to 
-     * tell us when to continue.
-     */
-
-    for (i = 0; i < NUM_ALT_ADDRS; i++) {
-	dnrState.hostInfo.addr[i] = 0;
-    }
-    dnrState.done = 0;
-    GetCurrentProcess(&(dnrState.psn));
-    err = StrToAddr(name, &dnrState.hostInfo, resultUPP, (Ptr) &dnrState);
-    if (err == cacheFault) {
-	while (!dnrState.done) {
-	    WaitNextEvent(0, &dummy, 1, NULL);
-	}
-    }
-    
-    /*
-     * For some reason MacTcp may return a cachFault a second time via
-     * the hostinfo block.  This seems to be a bug in MacTcp.  In this case 
-     * we run StrToAddr again - which seems to then work just fine.
-     */
-
-    if (dnrState.hostInfo.rtnCode == cacheFault) {
-	dnrState.done = 0;
-	err = StrToAddr(name, &dnrState.hostInfo, resultUPP, (Ptr) &dnrState);
-	if (err == cacheFault) {
-	    while (!dnrState.done) {
-		WaitNextEvent(0, &dummy, 1, NULL);
-	    }
-	}
-    }
-
-    if (dnrState.hostInfo.rtnCode == noErr) {
-	*address = dnrState.hostInfo.addr[0];
-    }
-    
-    return dnrState.hostInfo.rtnCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * IOCompletionRoutine --
- *
- *	This function is called when an asynchronous socket operation
- *	completes.  Since this routine runs as an interrupt handler, 
- *	it will simply set state to tell the notifier that this socket
- *	is now ready for action.  Note that this function is running at
- *	interupt time and can't allocate memory or do much else except 
- *      set state.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets some state in the socket state.  May also wake the process
- *	if we are not currently running.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-IOCompletionRoutine(
-    TCPiopb *pbPtr)		/* Tcp parameter block. */
-{
-    TcpState *statePtr;
-    
-    if (pbPtr->csCode == TCPSend) {
-    	statePtr = (TcpState *) pbPtr->csParam.send.userDataPtr;
-    } else {
-	statePtr = (TcpState *) pbPtr->csParam.open.userDataPtr;
-    }
-    
-    /*
-     * Always wake the process in case it's in WaitNextEvent.
-     * If an error has a occured - just return.  We will deal
-     * with the problem later.
-     */
-
-    WakeUpProcess(&statePtr->psn);
-    if (pbPtr->ioResult != noErr) {
-	return;
-    }
-    
-    if (statePtr->flags & TCP_ASYNC_CONNECT) {
-	statePtr->flags &= ~TCP_ASYNC_CONNECT;
-	statePtr->flags |= TCP_CONNECTED;
-	statePtr->checkMask |= TCL_READABLE & TCL_WRITABLE;
-    } else if (statePtr->flags & TCP_LISTENING) {
-	if (statePtr->port == 0) {
-	    Debugger();
-	}
-	statePtr->flags &= ~TCP_LISTENING;
-	statePtr->flags |= TCP_LISTEN_CONNECT;
-	statePtr->checkMask |= TCL_READABLE;
-    } else if (statePtr->flags & TCP_WRITING) {
-	statePtr->flags &= ~TCP_WRITING;
-	statePtr->checkMask |= TCL_WRITABLE;
-	if (!(statePtr->flags & TCP_CONNECTED)) {
-	    InitMacTCPParamBlock(&statePtr->pb, TCPClose);
-    	    statePtr->pb.tcpStream = statePtr->tcpStream;
-    	    statePtr->pb.ioCompletion = closeUPP; 
-    	    statePtr->pb.csParam.close.userDataPtr = (Ptr) statePtr;
-    	    if (PBControlAsync((ParmBlkPtr) &statePtr->pb) != noErr) {
-	        statePtr->flags |= TCP_RELEASE;
-    	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetLocalAddress --
- *
- *	Get the IP address for this machine.  The result is cached so
- *	the result is returned quickly after the first call.
- *
- * Results:
- *	Macintosh error code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static OSErr 
-GetLocalAddress(
-    unsigned long *addr)	/* Returns host IP address. */
-{
-    struct GetAddrParamBlock pBlock;
-    OSErr err = noErr;
-    static unsigned long localAddress = 0;
-
-    if (localAddress == 0) {
-	memset(&pBlock, 0, sizeof(pBlock));
-	pBlock.ioResult = 1;
-	pBlock.csCode = ipctlGetAddr;
-	pBlock.ioCRefNum = driverRefNum;
-	err = PBControlSync((ParmBlkPtr) &pBlock);
-
-	if (err != noErr) {
-	    return err;
-	}
-	localAddress = pBlock.ourAddress;
-    }
-    
-    *addr = localAddress;
-    return noErr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetBufferSize --
- *
- *	Get the appropiate buffer size for our machine & network.  This
- *	value will be used by the rest of Tcl & the MacTcp driver for
- *	the size of its buffers.  If out method for determining the
- *	optimal buffer size fails for any reason - we return a 
- *	reasonable default.
- *
- * Results:
- *	Size of optimal buffer in bytes.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static long 
-GetBufferSize()
-{
-    UDPiopb iopb;
-    OSErr err = noErr;
-    long bufferSize;
-	
-    memset(&iopb, 0, sizeof(iopb));
-    err = GetLocalAddress(&iopb.csParam.mtu.remoteHost);
-    if (err != noErr) {
-	return CHANNEL_BUF_SIZE;
-    }
-    iopb.ioCRefNum = driverRefNum;
-    iopb.csCode = UDPMaxMTUSize;
-    err = PBControlSync((ParmBlkPtr)&iopb);
-    if (err != noErr) {
-	return CHANNEL_BUF_SIZE;
-    }
-    bufferSize = (iopb.csParam.mtu.mtuSize * 4) + 1024;
-    if (bufferSize < CHANNEL_BUF_SIZE) {
-	bufferSize = CHANNEL_BUF_SIZE;
-    }
-    return bufferSize;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSockGetPort --
- *
- *	Maps from a string, which could be a service name, to a port.
- *	Used by socket creation code to get port numbers and resolve
- *	registered service names to port numbers.
- *
- * Results:
- *	A standard Tcl result.  On success, the port number is
- *	returned in portPtr. On failure, an error message is left in
- *	the interp's result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclSockGetPort(
-    Tcl_Interp *interp, 	/* Interp for error messages. */
-    char *string, 		/* Integer or service name */
-    char *proto, 		/* "tcp" or "udp", typically - 
-    				 * ignored on Mac - assumed to be tcp */
-    int *portPtr)		/* Return port number */
-{
-    PortInfo *portInfoPtr = NULL;
-    
-    if (Tcl_GetInt(interp, string, portPtr) == TCL_OK) {
-	if (*portPtr > 0xFFFF) {
-	    Tcl_AppendResult(interp, "couldn't open socket: port number too high",
-                (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (*portPtr < 0) {
-	    Tcl_AppendResult(interp, "couldn't open socket: negative port number",
-                (char *) NULL);
-	    return TCL_ERROR;
-	}
-	return TCL_OK;
-    }
-    for (portInfoPtr = portServices; portInfoPtr->name != NULL; portInfoPtr++) {
-	if (!strcmp(portInfoPtr->name, string)) {
-	    break;
-	}
-    }
-    if (portInfoPtr != NULL && portInfoPtr->name != NULL) {
-	*portPtr = portInfoPtr->port;
-	Tcl_ResetResult(interp);
-	return TCL_OK;
-    }
-    
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ClearZombieSockets --
- *
- *	This procedure looks through the socket list and removes the
- *	first stream it finds that is ready for release. This procedure 
- *	should be called before we ever try to create new Tcp streams
- *	to ensure we can least allocate one stream.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Tcp streams may be released.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ClearZombieSockets()
-{
-    TcpState *statePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    for (statePtr = tsdPtr->socketList; statePtr != NULL;
-	    statePtr = statePtr->nextPtr) {
-	if (statePtr->flags & TCP_RELEASE) {
-	    SocketFreeProc(statePtr);
-	    return;
-	}
-    }
-}
diff --git a/mac/tclMacTclCode.r b/mac/tclMacTclCode.r
deleted file mode 100644
index 1a8f3ca..0000000
--- a/mac/tclMacTclCode.r
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * tclMacTclCode.r --
- *
- *	This file creates resources from the Tcl code that is
- *	usually stored in the TCL_LiBRARY
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tclMacTclCode.r 1.1 98/01/21 22:22:38
- */
-
-#include <Types.r>
-#include <SysTypes.r>
-
-#define TCL_LIBRARY_RESOURCES 2000
-
-/* 
- * The mechanisim below loads Tcl source into the resource fork of the
- * application.  The example below creates a TEXT resource named
- * "Init" from the file "init.tcl".  This allows applications to use
- * Tcl to define the behavior of the application without having to
- * require some predetermined file structure - all needed Tcl "files"
- * are located within the application.  To source a file for the
- * resource fork the source command has been modified to support
- * sourcing from resources.  In the below case "source -rsrc {Init}"
- * will load the TEXT resource named "Init".
- */
-
-read 'TEXT' (TCL_LIBRARY_RESOURCES, "Init", purgeable) "::library:init.tcl";
-read 'TEXT' (TCL_LIBRARY_RESOURCES + 1, "Auto", purgeable) "::library:auto.tcl";
-read 'TEXT' (TCL_LIBRARY_RESOURCES + 2, "Package", purgeable,preload) "::library:package.tcl";
-read 'TEXT' (TCL_LIBRARY_RESOURCES + 3, "History", purgeable) "::library:history.tcl";
-read 'TEXT' (TCL_LIBRARY_RESOURCES + 4, "Word", purgeable,preload) "::library:word.tcl";
diff --git a/mac/tclMacTest.c b/mac/tclMacTest.c
deleted file mode 100644
index 3c982c5..0000000
--- a/mac/tclMacTest.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/* 
- * tclMacTest.c --
- *
- *	Contains commands for platform specific tests for
- *	the Macintosh platform.
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacTest.c,v 1.3 1998/11/10 06:49:51 jingham Exp $
- */
-
-#define TCL_TEST
-
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include "tclMacPort.h"
-#include "Files.h"
-#include <Errors.h>
-#include <Resources.h>
-#include <Script.h>
-#include <Strings.h>
-#include <FSpCompat.h>
-
-/*
- * Forward declarations of procedures defined later in this file:
- */
-
-int			TclplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
-static int		DebuggerCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		WriteTextResource _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-			    
-
-/*
- *----------------------------------------------------------------------
- *
- * TclplatformtestInit --
- *
- *	Defines commands that test platform specific functionality for
- *	Unix platforms.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Defines new commands.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclplatformtestInit(
-    Tcl_Interp *interp)		/* Interpreter to add commands to. */
-{
-    /*
-     * Add commands for platform specific tests on MacOS here.
-     */
-    
-    Tcl_CreateCommand(interp, "debugger", DebuggerCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testWriteTextResource", WriteTextResource,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DebuggerCmd --
- *
- *	This procedure simply calls the low level debugger.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DebuggerCmd(
-    ClientData clientData,		/* Not used. */
-    Tcl_Interp *interp,			/* Not used. */
-    int argc,				/* Not used. */
-    char **argv)			/* Not used. */
-{
-    Debugger();
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WriteTextResource --
- *
- *	This procedure will write a text resource out to the 
- *	application or a given file.  The format for this command is
- *	textwriteresource 
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WriteTextResource(
-    ClientData clientData,		/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int argc,				/* Number of arguments. */
-    char **argv)			/* Argument strings. */
-{
-    char *errNum = "wrong # args: ";
-    char *errBad = "bad argument: ";
-    char *errStr;
-    char *fileName = NULL, *rsrcName = NULL;
-    char *data = NULL;
-    int rsrcID = -1, i, protectIt = 0;
-    short fileRef = -1;
-    OSErr err;
-    Handle dataHandle;
-    Str255 resourceName;
-    FSSpec fileSpec;
-
-    /*
-     * Process the arguments.
-     */
-    for (i = 1 ; i < argc ; i++) {
-	if (!strcmp(argv[i], "-rsrc")) {
-	    rsrcName = argv[i + 1];
-	    i++;
-	} else if (!strcmp(argv[i], "-rsrcid")) {
-	    rsrcID = atoi(argv[i + 1]);
-	    i++;
-	} else if (!strcmp(argv[i], "-file")) {
-	    fileName = argv[i + 1];
-	    i++;
-	} else if (!strcmp(argv[i], "-protected")) {
-	    protectIt = 1;
-	} else {
-	    data = argv[i];
-	}
-    }
-	
-    if ((rsrcName == NULL && rsrcID < 0) ||
-	    (fileName == NULL) || (data == NULL)) {
-    	errStr = errBad;
-    	goto sourceFmtErr;
-    }
-
-    /*
-     * Open the resource file.
-     */
-    err = FSpLocationFromPath(strlen(fileName), fileName, &fileSpec);
-    if (!(err == noErr || err == fnfErr)) {
-	Tcl_AppendResult(interp, "couldn't validate file name", (char *) NULL);
-	return TCL_ERROR;
-    }
-    
-    if (err == fnfErr) {
-	FSpCreateResFile(&fileSpec, 'WIsH', 'rsrc', smSystemScript);
-    }
-    fileRef = FSpOpenResFile(&fileSpec, fsRdWrPerm);
-    if (fileRef == -1) {
-	Tcl_AppendResult(interp, "couldn't open resource file", (char *) NULL);
-	return TCL_ERROR;
-    }
-		
-    UseResFile(fileRef);
-
-    /*
-     * Prepare data needed to create resource.
-     */
-    if (rsrcID < 0) {
-	rsrcID = UniqueID('TEXT');
-    }
-    
-    strcpy((char *) resourceName, rsrcName);
-    c2pstr((char *) resourceName);
-    
-    dataHandle = NewHandle(strlen(data));
-    HLock(dataHandle);
-    strcpy(*dataHandle, data);
-    HUnlock(dataHandle);
-     
-    /*
-     * Add the resource to the file and close it.
-     */
-    AddResource(dataHandle, 'TEXT', rsrcID, resourceName);
-    
-    UpdateResFile(fileRef);
-    if (protectIt) {
-        SetResAttrs(Get1Resource('TEXT', rsrcID), resProtected);
-    }
-    
-    CloseResFile(fileRef);
-    return TCL_OK;
-    
-    sourceFmtErr:
-    Tcl_AppendResult(interp, errStr, "error in \"", argv[0], "\"",
-	    (char *) NULL);
-    return TCL_ERROR;
-}
-
-int
-TclMacChmod(
-    char *path, 
-    int mode)
-{
-    HParamBlockRec hpb;
-    OSErr err;
-    
-    c2pstr(path);
-    hpb.fileParam.ioNamePtr = (unsigned char *) path;
-    hpb.fileParam.ioVRefNum = 0;
-    hpb.fileParam.ioDirID = 0;
-    
-    if (mode & 0200) {
-        err = PBHRstFLockSync(&hpb);
-    } else {
-        err = PBHSetFLockSync(&hpb);
-    }
-    p2cstr((unsigned char *) path);
-    
-    if (err != noErr) {
-        errno = TclMacOSErrorToPosixError(err);
-        return -1;
-    }
-    
-    return 0;
-}
-
diff --git a/mac/tclMacThrd.c b/mac/tclMacThrd.c
deleted file mode 100644
index 7790e5f..0000000
--- a/mac/tclMacThrd.c
+++ /dev/null
@@ -1,795 +0,0 @@
-/* 
- * tclMacThrd.c --
- *
- *	This file implements the Mac-specific thread support.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS:  @(#) tclMacThrd.c 1.2 98/02/23 16:48:07
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include "tclMacInt.h"
-#include <Threads.h>
-#include <Gestalt.h>
-
-#define TCL_MAC_THRD_DEFAULT_STACK (256*1024)
-
-
-typedef struct TclMacThrdData {
-    ThreadID threadID;
-    VOID *data;
-    struct TclMacThrdData *next;
-} TclMacThrdData;
-
-/*
- * This is an array of the Thread Data Keys.  It is a process-wide table.
- * Its size is originally set to 32, but it can grow if needed.
- */
- 
-static TclMacThrdData **tclMacDataKeyArray;
-#define TCL_MAC_INITIAL_KEYSIZE 32
-
-/*
- * These two bits of data store the current maximum number of keys
- * and the keyCounter (which is the number of occupied slots in the
- * KeyData array.
- * 
- */
- 
-static int maxNumKeys = 0;
-static int keyCounter = 0;
-
-/*
- * Prototypes for functions used only in this file
- */
- 
-TclMacThrdData *GetThreadDataStruct(Tcl_ThreadDataKey keyVal);
-TclMacThrdData *RemoveThreadDataStruct(Tcl_ThreadDataKey keyVal);
-
-/*
- *----------------------------------------------------------------------
- *
- * TclMacHaveThreads --
- *
- *	Do we have the Thread Manager?
- *
- * Results:
- *	1 if the ThreadManager is present, 0 otherwise.
- *
- * Side effects:
- *	If this is the first time this is called, the return is cached.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclMacHaveThreads(void)
-{
-    static initialized = false;
-    static int tclMacHaveThreads = false;
-    long response = 0;
-    OSErr err = noErr;
-    
-    if (!initialized) {
-	err = Gestalt(gestaltThreadMgrAttr, &response);
-	if (err == noErr) {
-	    tclMacHaveThreads = response | (1 << gestaltThreadMgrPresent);
-	}
-    }
-
-    return tclMacHaveThreads;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadCreate --
- *
- *	This procedure creates a new thread.
- *
- * Results:
- *	TCL_OK if the thread could be created.  The thread ID is
- *	returned in a parameter.
- *
- * Side effects:
- *	A new thread is created.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpThreadCreate(idPtr, proc, clientData)
-    Tcl_ThreadId *idPtr;		/* Return, the ID of the thread */
-    Tcl_ThreadCreateProc proc;		/* Main() function of the thread */
-    ClientData clientData;		/* The one argument to Main() */
-{
-
-    if (!TclMacHaveThreads()) {
-        return TCL_ERROR;
-    }
-    
-#if TARGET_CPU_68K && TARGET_RT_MAC_CFM
-    {
-        ThreadEntryProcPtr entryProc;
-        entryProc = NewThreadEntryProc(proc);
-        
-        NewThread(kCooperativeThread, entryProc, (void *) clientData, 
-            TCL_MAC_THRD_DEFAULT_STACK, kCreateIfNeeded, NULL, (ThreadID *) idPtr);
-    }
-#else
-    NewThread(kCooperativeThread, proc, (void *) clientData, 
-        TCL_MAC_THRD_DEFAULT_STACK, kCreateIfNeeded, NULL, (ThreadID *) idPtr);
-#endif        
-    if ((ThreadID) *idPtr == kNoThreadID) {
-        return TCL_ERROR;
-    } else {
-        return TCL_OK;
-    }
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadExit --
- *
- *	This procedure terminates the current thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This procedure terminates the current thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadExit(status)
-    int status;
-{
-    ThreadID curThread;
-    
-    if (!TclMacHaveThreads()) {
-        return;
-    }
-    
-    GetCurrentThread(&curThread);
-    DisposeThread(curThread, NULL, false);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCurrentThread --
- *
- *	This procedure returns the ID of the currently running thread.
- *
- * Results:
- *	A thread ID.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_ThreadId
-Tcl_GetCurrentThread()
-{
-#ifdef TCL_THREADS
-    ThreadID curThread;
-
-    if (!TclMacHaveThreads()) {
-        return (Tcl_ThreadId) 0;
-    } else {
-        GetCurrentThread(&curThread);
-        return (Tcl_ThreadId) curThread;
-    }
-#else
-    return (Tcl_ThreadId) 0;
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitLock
- *
- *	This procedure is used to grab a lock that serializes initialization
- *	and finalization of Tcl.  On some platforms this may also initialize
- *	the mutex used to serialize creation of more mutexes and thread
- *	local storage keys.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitLock()
-{
-#ifdef TCL_THREADS
-    /* There is nothing to do on the Mac. */;
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitUnlock
- *
- *	This procedure is used to release a lock that serializes initialization
- *	and finalization of Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitUnlock()
-{
-#ifdef TCL_THREADS
-    /* There is nothing to do on the Mac */;
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterLock
- *
- *	This procedure is used to grab a lock that serializes creation
- *	and finalization of serialization objects.  This interface is
- *	only needed in finalization; it is hidden during
- *	creation of the objects.
- *
- *	This lock must be different than the initLock because the
- *	initLock is held during creation of syncronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterLock()
-{
-#ifdef TCL_THREADS
-    /* There is nothing to do on the Mac */;
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterUnlock
- *
- *	This procedure is used to release a lock that serializes creation
- *	and finalization of synchronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterUnlock()
-{
-#ifdef TCL_THREADS
-    /* There is nothing to do on the Mac */
-#endif
-}
-
-#ifdef TCL_THREADS
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MutexLock --
- *
- *	This procedure is invoked to lock a mutex.  This procedure
- *	handles initializing the mutex, if necessary.  The caller
- *	can rely on the fact that Tcl_Mutex is an opaque pointer.
- *	This routine will change that pointer from NULL after first use.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May block the current thread.  The mutex is aquired when
- *	this returns.  Will allocate memory for a pthread_mutex_t
- *	and initialize this the first time this Tcl_Mutex is used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexLock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-{
-/* There is nothing to do on the Mac */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMutexUnlock --
- *
- *	This procedure is invoked to unlock a mutex.  The mutex must
- *	have been locked by Tcl_MutexLock.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex is released when this returns.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexUnlock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-{
-/* There is nothing to do on the Mac */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeMutex --
- *
- *	This procedure is invoked to clean up one mutex.  This is only
- *	safe to call at the end of time.
- *
- *	This assumes the Master Lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex list is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeMutex(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-/* There is nothing to do on the Mac */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyInit --
- *
- *	This procedure initializes a thread specific data block key.
- *	Each thread has table of pointers to thread specific data.
- *	all threads agree on which table entry is used by each module.
- *	this is remembered in a "data key", that is just an index into
- *	this table.  To allow self initialization, the interface
- *	passes a pointer to this key and the first thread to use
- *	the key fills in the pointer to the key.  The key should be
- *	a process-wide static.
- *
- *      There is no system-wide support for thread specific data on the 
- *	Mac.  So we implement this as an array of pointers.  The keys are
- *	allocated sequentially, and each key maps to a slot in the table.
- *      The table element points to a linked list of the instances of
- *	the data for each thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Will bump the key counter if this is the first time this key
- *      has been initialized.  May grow the DataKeyArray if that is
- *	necessary.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeyInit(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-{
-            
-    if (*keyPtr == NULL) {
-        keyCounter += 1;
-	*keyPtr = (Tcl_ThreadDataKey) keyCounter;
-	if (keyCounter > maxNumKeys) {
-	    TclMacThrdData **newArray;
-	    int i, oldMax = maxNumKeys;
-	     
-	    maxNumKeys = maxNumKeys + TCL_MAC_INITIAL_KEYSIZE;
-	     
-	    newArray = (TclMacThrdData **) 
-	            ckalloc(maxNumKeys * sizeof(TclMacThrdData *));
-	     
-	    for (i = 0; i < oldMax; i++) {
-	        newArray[i] = tclMacDataKeyArray[i];
-	    }
-	    for (i = oldMax; i < maxNumKeys; i++) {
-	        newArray[i] = NULL;
-	    }
-	     
-	    if (tclMacDataKeyArray != NULL) {
-		ckfree((char *) tclMacDataKeyArray);
-	    }
-	    tclMacDataKeyArray = newArray;
-	     
-	}             
-	/* TclRememberDataKey(keyPtr); */
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyGet --
- *
- *	This procedure returns a pointer to a block of thread local storage.
- *
- * Results:
- *	A thread-specific pointer to the data structure, or NULL
- *	if the memory has not been assigned to this key for this thread.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclpThreadDataKeyGet(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-{
-    TclMacThrdData *dataPtr;
-    
-    dataPtr = GetThreadDataStruct(*keyPtr);
-    
-    if (dataPtr == NULL) {
-        return NULL;
-    } else {
-        return dataPtr->data;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeySet --
- *
- *	This procedure sets the pointer to a block of thread local storage.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the thread so future calls to TclpThreadDataKeyGet with
- *	this key will return the data pointer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeySet(keyPtr, data)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-    VOID *data;			/* Thread local storage */
-{
-    TclMacThrdData *dataPtr;
-    ThreadID curThread;
-    
-    dataPtr = GetThreadDataStruct(*keyPtr);
-    
-    /* 
-     * Is it legal to reset the thread data like this?
-     * And if so, who owns the memory?
-     */
-     
-    if (dataPtr != NULL) {
-        dataPtr->data = data;
-    } else {
-        dataPtr = (TclMacThrdData *) ckalloc(sizeof(TclMacThrdData));
-        GetCurrentThread(&curThread);
-        dataPtr->threadID = curThread;
-        dataPtr->data = data;
-        dataPtr->next = tclMacDataKeyArray[(int) *keyPtr - 1];
-        tclMacDataKeyArray[(int) *keyPtr - 1] = dataPtr;
-   }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadData --
- *
- *	This procedure cleans up the thread-local storage.  This is
- *	called once for each thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees up all thread local storage.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadData(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    TclMacThrdData *dataPtr;
-    
-    if (*keyPtr != NULL) {
-        dataPtr = RemoveThreadDataStruct(*keyPtr);
-        
-	if ((dataPtr != NULL) && (dataPtr->data != NULL)) {
-	    ckfree((char *) dataPtr->data);
-	    ckfree((char *) dataPtr);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadDataKey --
- *
- *	This procedure is invoked to clean up one key.  This is a
- *	process-wide storage identifier.  The thread finalization code
- *	cleans up the thread local storage itself.
- *
- *      On the Mac, there is really nothing to do here, since the key
- *      is just an array index.  But we set the key to 0 just in case
- *	someone else is relying on that.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The keyPtr value is set to 0.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadDataKey(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    ckfree((char *) tclMacDataKeyArray[(int) *keyPtr - 1]);
-    tclMacDataKeyArray[(int) *keyPtr - 1] = NULL;
-    *keyPtr = NULL;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GetThreadDataStruct --
- *
- *	This procedure gets the data structure corresponding to
- *      keyVal for the current process.
- *
- * Results:
- *	The requested key data.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclMacThrdData *
-GetThreadDataStruct(keyVal)
-    Tcl_ThreadDataKey keyVal;
-{
-    ThreadID curThread;
-    TclMacThrdData *dataPtr;
-    
-    /*
-     * The keyPtr will only be greater than keyCounter is someone
-     * has passed us a key without getting the value from 
-     * TclpInitDataKey.
-     */
-     
-    if ((int) keyVal <= 0)  {
-        return NULL;
-    } else if ((int) keyVal > keyCounter) {
-        panic("illegal data key value");
-    }
-    
-    GetCurrentThread(&curThread);
-    
-    for (dataPtr = tclMacDataKeyArray[(int) keyVal - 1]; dataPtr != NULL;
-            dataPtr = dataPtr->next) {
-        if (dataPtr->threadID ==  curThread) {
-            break;
-        }
-    }
-    
-    return dataPtr;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * RemoveThreadDataStruct --
- *
- *	This procedure removes the data structure corresponding to
- *      keyVal for the current process from the list kept for keyVal.
- *
- * Results:
- *	The requested key data is removed from the list, and a pointer 
- *      to it is returned.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclMacThrdData *
-RemoveThreadDataStruct(keyVal)
-    Tcl_ThreadDataKey keyVal;
-{
-    ThreadID curThread;
-    TclMacThrdData *dataPtr, *prevPtr;
-    
-     
-    if ((int) keyVal <= 0)  {
-        return NULL;
-    } else if ((int) keyVal > keyCounter) {
-        panic("illegal data key value");
-    }
-    
-    GetCurrentThread(&curThread);
-    
-    for (dataPtr = tclMacDataKeyArray[(int) keyVal - 1], prevPtr = NULL; 
-            dataPtr != NULL;
-            prevPtr = dataPtr, dataPtr = dataPtr->next) {
-        if (dataPtr->threadID == curThread) {
-            break;
-        }
-    }
-    
-    if (dataPtr == NULL) {
-        /* No body */
-    } else if ( prevPtr == NULL) {
-        tclMacDataKeyArray[(int) keyVal - 1] = dataPtr->next;
-    } else {
-        prevPtr->next = dataPtr->next;
-    }
-    
-    return dataPtr; 
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionWait --
- *
- *	This procedure is invoked to wait on a condition variable.
- *	On the Mac, mutexes are no-ops, and we just yield.  After
- *	all, it is the application's job to loop till the condition 
- *	variable is changed...
- *
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Will block the current thread till someone else yields.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-    Tcl_Condition *condPtr;	/* Really (pthread_cond_t **) */
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-    Tcl_Time *timePtr;		/* Timeout on waiting period */
-{
-    if (TclMacHaveThreads()) {
-        YieldToAnyThread();
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionNotify --
- *
- *	This procedure is invoked to signal a condition variable.
- *
- *	The mutex must be held during this call to avoid races,
- *	but this interface does not enforce that.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May unblock another thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionNotify(condPtr)
-    Tcl_Condition *condPtr;
-{
-    if (TclMacHaveThreads()) {
-         YieldToAnyThread();
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeCondition --
- *
- *	This procedure is invoked to clean up a condition variable.
- *	This is only safe to call at the end of time.
- *
- *	This assumes the Master Lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The condition variable is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeCondition(condPtr)
-    Tcl_Condition *condPtr;
-{
-    /* Nothing to do on the Mac */
-}
-
-
-
-#endif /* TCL_THREADS */
-
diff --git a/mac/tclMacThrd.h b/mac/tclMacThrd.h
deleted file mode 100644
index 22f2c83..0000000
--- a/mac/tclMacThrd.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * tclUnixThrd.h --
- *
- *      This header file defines things for thread support.
- *
- * Copyright (c) 1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#)
- */
- 
-#ifndef _TCLMACTHRD
-#define _TCLMACTHRD
-
-#ifdef TCL_THREADS
-
-#endif /* TCL_THREADS */
-#endif /* _TCLMACTHRD */
diff --git a/mac/tclMacTime.c b/mac/tclMacTime.c
deleted file mode 100644
index 1a2d1ed..0000000
--- a/mac/tclMacTime.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/* 
- * tclMacTime.c --
- *
- *	Contains Macintosh specific versions of Tcl functions that
- *	obtain time values from the operating system.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacTime.c,v 1.3 1999/03/10 05:52:51 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include <OSUtils.h>
-#include <Timer.h>
-#include <time.h>
-
-/*
- * Static variables used by the TclpGetTime function.
- */
- 
-static int initalized = false;
-static unsigned long baseSeconds;
-static UnsignedWide microOffset;
-
-/*
- * Prototypes for procedures that are private to this file:
- */
-
-static void SubtractUnsignedWide _ANSI_ARGS_((UnsignedWide *x,
-	UnsignedWide *y, UnsignedWide *result));
-
-/*
- *-----------------------------------------------------------------------------
- *
- * TclpGetSeconds --
- *
- *	This procedure returns the number of seconds from the epoch.  On
- *	the Macintosh the epoch is Midnight Jan 1, 1904.  Unfortunatly,
- *	the Macintosh doesn't tie the epoch to a particular time zone.  For
- *	Tcl we tie the epoch to GMT.  This makes the time zone date parsing
- *	code work.  The epoch for Mac-Tcl is: Midnight Jan 1, 1904 GMT.
- *
- * Results:
- *	Number of seconds from the epoch in GMT.
- *
- * Side effects:
- *	None.
- *
- *-----------------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetSeconds()
-{
-    unsigned long seconds;
-    MachineLocation loc;
-    long int offset;
-    
-    ReadLocation(&loc);
-    offset = loc.u.gmtDelta & 0x00ffffff;
-    if (offset & 0x00800000) {
-	offset = offset | 0xff000000;
-    }
-
-    if (ReadDateTime(&seconds) == noErr) {
-	return (seconds - offset);
-    } else {
-	panic("Can't get time.");
-	return 0;
-    }
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * TclpGetClicks --
- *
- *	This procedure returns a value that represents the highest resolution
- *	clock available on the system.  There are no garantees on what the
- *	resolution will be.  In Tcl we will call this value a "click".  The
- *	start time is also system dependant.
- *
- * Results:
- *	Number of clicks from some start time.
- *
- * Side effects:
- *	None.
- *
- *-----------------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetClicks()
-{
-    UnsignedWide micros;
-
-    Microseconds(&micros);
-    return micros.lo;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTimeZone --
- *
- *	Get the current time zone.
- *
- * Results:
- *	The return value is the local time zone, measured in
- *	minutes away from GMT (-ve for east, +ve for west).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpGetTimeZone (
-    unsigned long  currentTime)		/* Ignored on Mac. */
-{
-    MachineLocation loc;
-    long int offset;
-
-    ReadLocation(&loc);
-    offset = loc.u.gmtDelta & 0x00ffffff;
-    if (offset & 0x00700000) {
-	offset |= 0xff000000;
-    }
-
-    /*
-     * Convert the Mac offset from seconds to minutes and
-     * add an hour if we have daylight savings time.
-     */
-    offset = -offset;
-    offset /= 60;
-    if (loc.u.dlsDelta < 0) {
-	offset += 60;
-    }
-    
-    return offset;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTime --
- *
- *	Gets the current system time in seconds and microseconds
- *	since the beginning of the epoch: 00:00 UCT, January 1, 1970.
- *
- * Results:
- *	Returns the current time (in the local timezone) in timePtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpGetTime(
-    Tcl_Time *timePtr)		/* Location to store time information. */
-{
-    UnsignedWide micro;
-#ifndef NO_LONG_LONG
-    long long *microPtr;
-#endif
-	
-    if (initalized == false) {
-        MachineLocation loc;
-        long int offset;
-    
-        ReadLocation(&loc);
-        offset = loc.u.gmtDelta & 0x00ffffff;
-        if (offset & 0x00800000) {
-            offset = offset | 0xff000000;
-	}
-	if (ReadDateTime(&baseSeconds) != noErr) {
-	    /*
-	     * This should never happen!
-	     */
-	    return;
-	}
-	/*
-	 * Remove the local offset that ReadDateTime() adds.
-	 */
-	baseSeconds -= offset;
-	Microseconds(&microOffset);
-	initalized = true;
-    }
-
-    Microseconds(&micro);
-
-#ifndef NO_LONG_LONG
-    microPtr = (long long *) &micro;
-    *microPtr -= *((long long *) &microOffset);
-    timePtr->sec = baseSeconds + (*microPtr / 1000000);
-    timePtr->usec = *microPtr % 1000000;
-#else
-    SubtractUnsignedWide(&micro, &microOffset, &micro);
-
-    /*
-     * This lovely computation is equal to: base + (micro / 1000000)
-     * For the .hi part the ratio of 0x100000000 / 1000000 has been
-     * reduced to avoid overflow.  This computation certainly has 
-     * problems as the .hi part gets large.  However, your application
-     * would have to run for a long time to make that happen.
-     */
-
-    timePtr->sec = baseSeconds + (micro.lo / 1000000) + 
-    	(long) (micro.hi * ((double) 33554432.0 / 15625.0));
-    timePtr->usec = micro.lo % 1000000;
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDate --
- *
- *	Converts raw seconds to a struct tm data structure.  The
- *	returned time will be for Greenwich Mean Time if the useGMT flag 
- *	is set.  Otherwise, the returned time will be for the local
- *	time zone.  This function is meant to be used as a replacement
- *	for localtime and gmtime which is broken on most ANSI libs
- *	on the Macintosh.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *  	The passed in struct tm data structure is modified.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpGetDate(
-    TclpTime_t time,	/* Time struct to fill. */
-    int useGMT)		/* True if date should reflect GNT time. */
-{
-    const time_t *tp = (const time_t *)time;
-    DateTimeRec dtr;
-    MachineLocation loc;
-    long int offset;
-    static struct tm statictime;
-    static const short monthday[12] =
-        {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-
-    ReadLocation(&loc);
-	
-    if (useGMT) {
-	SecondsToDate(*tp, &dtr);
-    } else {
-	offset = loc.u.gmtDelta & 0x00ffffff;
-	if (offset & 0x00700000) {
-	    offset |= 0xff000000;
-	}
-	
-	SecondsToDate(*tp + offset, &dtr);
-    }
-
-    statictime.tm_sec = dtr.second;
-    statictime.tm_min = dtr.minute;
-    statictime.tm_hour = dtr.hour;
-    statictime.tm_mday = dtr.day;
-    statictime.tm_mon = dtr.month - 1;
-    statictime.tm_year = dtr.year - 1900;
-    statictime.tm_wday = dtr.dayOfWeek - 1;
-    statictime.tm_yday = monthday[statictime.tm_mon]
-	+ statictime.tm_mday - 1;
-    if (1 < statictime.tm_mon && !(statictime.tm_year & 3)) {
-	++statictime.tm_yday;
-    }
-    statictime.tm_isdst = loc.u.dlsDelta;
-    return(&statictime);
-}
-
-#ifdef NO_LONG_LONG
-/*
- *----------------------------------------------------------------------
- *
- * SubtractUnsignedWide --
- *
- *	Subtracts one UnsignedWide value from another.
- *
- * Results:
- *  	The subtracted value.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SubtractUnsignedWide(
-    UnsignedWide *x,		/* Ptr to wide int. */
-    UnsignedWide *y,		/* Ptr to wide int. */
-    UnsignedWide *result)	/* Ptr to result. */
-{
-    result->hi = x->hi - y->hi;
-    if (x->lo < y->lo) {
-	result->hi--;
-    }
-    result->lo = x->lo - y->lo;
-}
-#endif
diff --git a/mac/tclMacUnix.c b/mac/tclMacUnix.c
deleted file mode 100644
index 483780c..0000000
--- a/mac/tclMacUnix.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* 
- * tclMacUnix.c --
- *
- *	This file contains routines to implement several features
- *	available to the Unix implementation, but that require
- *      extra work to do on a Macintosh.  These include routines
- *      Unix Tcl normally hands off to the Unix OS.
- *
- * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacUnix.c,v 1.3 1999/04/16 00:47:22 stanton Exp $
- */
-
-#include <Files.h>
-#include <Strings.h>
-#include <TextUtils.h>
-#include <Finder.h>
-#include <FSpCompat.h>
-#include <Aliases.h>
-#include <Errors.h>
-
-#include "tclInt.h"
-#include "tclMacInt.h"
-
-/*
- * The following two Includes are from the More Files package
- */
-#include "FileCopy.h"
-#include "MoreFiles.h"
-#include "MoreFilesExtras.h"
-
-/*
- * The following may not be defined in some versions of
- * MPW header files.
- */
-#ifndef kIsInvisible
-#define kIsInvisible 0x4000
-#endif
-#ifndef kIsAlias
-#define kIsAlias 0x8000
-#endif
-
-/*
- * Missing error codes
- */
-#define usageErr		500
-#define noSourceErr		501
-#define isDirErr		502
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_EchoCmd --
- *
- *    Implements the TCL echo command:
- *        echo ?str ...?
- *
- * Results:
- *      Always returns TCL_OK.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_EchoCmd(
-    ClientData dummy,			/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int argc,				/* Number of arguments. */
-    char **argv)			/* Argument strings. */
-{
-    Tcl_Channel chan;
-    int mode, result, i;
-
-    chan = Tcl_GetChannel(interp, "stdout", &mode);
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_ERROR;
-    }
-    for (i = 1; i < argc; i++) {
-	result = Tcl_WriteChars(chan, argv[i], -1);
-	if (result < 0) {
-	    Tcl_AppendResult(interp, "echo: ", Tcl_GetChannelName(chan),
-		    ": ", Tcl_PosixError(interp), (char *) NULL);
-	    return TCL_ERROR;
-	}
-        if (i < (argc - 1)) {
-	    Tcl_WriteChars(chan, " ", -1);
-	}
-    }
-    Tcl_WriteChars(chan, "\n", -1);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_LsObjCmd --
- *
- *	This procedure is invoked to process the "ls" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-int
-Tcl_LsObjCmd(
-    ClientData dummy,			/* Not used. */
-    Tcl_Interp *interp,			/* Current interpreter. */
-    int objc,				/* Number of arguments. */
-    Tcl_Obj *CONST objv[])		/* Argument strings. */
-{
-#define STRING_LENGTH 80
-#define CR '\n'
-    int i, j;
-    int fieldLength, len = 0, maxLen = 0, perLine;
-    OSErr err;
-    CInfoPBRec paramBlock;
-    HFileInfo *hpb = (HFileInfo *)&paramBlock;
-    DirInfo *dpb = (DirInfo *)&paramBlock;
-    char theFile[256];
-    char theLine[STRING_LENGTH + 2];
-    int fFlag = false, pFlag = false, aFlag = false, lFlag = false,
-	cFlag = false, hFlag = false;
-    char *argv;
-    Tcl_Obj *newObjv[2], *resultObjPtr;
-
-    /*
-     * Process command flags.  End if argument doesn't start
-     * with a dash or is a dash by itself.  The remaining arguments
-     * should be files.
-     */
-    for (i = 1; i < objc; i++) {
-    	argv = Tcl_GetString(objv[i]);
-	if (argv[0] != '-') {
-	    break;
-	}
-		
-	if (!strcmp(argv, "-")) {
-	    i++;
-	    break;
-	}
-		
-	for (j = 1 ; argv[j] ; ++j) {
-	    switch(argv[j]) {
-	    case 'a':
-	    case 'A':
-		aFlag = true;
-		break;
-	    case '1':
-		cFlag = false;
-		break;
-	    case 'C':
-		cFlag = true;
-		break;
-	    case 'F':
-		fFlag = true;
-		break;
-	    case 'H':
-		hFlag = true;
-		break;
-	    case 'p':
-		pFlag = true;
-		break;
-	    case 'l':
-		pFlag = false;
-		lFlag = true;
-		break;
-	    default:
-		Tcl_AppendResult(interp, "error - unknown flag ",
-			"usage: ls -apCFHl1 ?files? ", NULL);
-		return TCL_ERROR;
-	    }
-	}
-    }
-
-    objv += i;
-    objc -= i;
-
-    /*
-     * No file specifications means we search for all files.
-     * Glob will be doing most of the work.
-     */
-     if (!objc) {
-	objc = 1;
-	newObjv[0] = Tcl_NewStringObj("*", -1);
-	newObjv[1] = NULL;
-	objv = newObjv;
-    }
-
-    if (Tcl_GlobObjCmd(NULL, interp, objc + 1, objv - 1) != TCL_OK) {
-    	Tcl_ResetResult(interp);
-    	return TCL_ERROR;
-    }
-
-    resultObjPtr = Tcl_GetObjResult(interp);
-    Tcl_IncrRefCount(resultObjPtr);
-    if (Tcl_ListObjGetElements(interp, resultObjPtr, &objc, &objv) != TCL_OK) {
-    	Tcl_DecrRefCount(resultObjPtr);
-    	return TCL_ERROR;
-    }
-
-    Tcl_ResetResult(interp);
-
-    /*
-     * There are two major methods for listing files: the long
-     * method and the normal method.
-     */
-    if (lFlag) {
-	char	creator[5], type[5], time[16], date[16];
-	char	lineTag;
-	long	size;
-	unsigned short flags;
-	Tcl_Obj *objPtr;
-	char *string;
-	int length;
-
-	/*
-	 * Print the header for long listing.
-	 */
-	if (hFlag) {
-	    sprintf(theLine, "T %7s %8s %8s %4s %4s %6s %s",
-		    "Size", "ModTime", "ModDate",
-		    "CRTR", "TYPE", "Flags", "Name");
-	    Tcl_AppendResult(interp, theLine, "\n", NULL);
-	    Tcl_AppendResult(interp,
-		    "-------------------------------------------------------------\n",
-		    NULL);
-	}
-		
-	for (i = 0; i < objc; i++) {
-	    strcpy(theFile, Tcl_GetString(objv[i]));
-			
-	    c2pstr(theFile);
-	    hpb->ioCompletion = NULL;
-	    hpb->ioVRefNum = 0;
-	    hpb->ioFDirIndex = 0;
-	    hpb->ioNamePtr = (StringPtr) theFile;
-	    hpb->ioDirID = 0L;
-	    err = PBGetCatInfoSync(&paramBlock);
-	    p2cstr((StringPtr) theFile);
-
-	    if (hpb->ioFlAttrib & 16) {
-		/*
-		 * For directories use zero as the size, use no Creator
-		 * type, and use 'DIR ' as the file type.
-		 */
-		if ((aFlag == false) && (dpb->ioDrUsrWds.frFlags & 0x1000)) {
-		    continue;
-		}
-		lineTag = 'D';
-		size = 0;
-		IUTimeString(dpb->ioDrMdDat, false, (unsigned char *)time);
-		p2cstr((StringPtr)time);
-		IUDateString(dpb->ioDrMdDat, shortDate, (unsigned char *)date);
-		p2cstr((StringPtr)date);
-		strcpy(creator, "    ");
-		strcpy(type, "DIR ");
-		flags = dpb->ioDrUsrWds.frFlags;
-		if (fFlag || pFlag) {
-		    strcat(theFile, ":");
-		}
-	    } else {
-		/*
-		 * All information for files should be printed.  This
-		 * includes size, modtime, moddate, creator type, file
-		 * type, flags, anf file name.
-		 */
-		if ((aFlag == false) &&
-			(hpb->ioFlFndrInfo.fdFlags & kIsInvisible)) {
-		    continue;
-		}
-		lineTag = 'F';
-		size = hpb->ioFlLgLen + hpb->ioFlRLgLen;
-		IUTimeString(hpb->ioFlMdDat, false, (unsigned char *)time);
-		p2cstr((StringPtr)time);
-		IUDateString(hpb->ioFlMdDat, shortDate, (unsigned char *)date);
-		p2cstr((StringPtr)date);
-		strncpy(creator, (char *) &hpb->ioFlFndrInfo.fdCreator, 4);
-		creator[4] = 0;
-		strncpy(type, (char *) &hpb->ioFlFndrInfo.fdType, 4);
-		type[4] = 0;
-		flags = hpb->ioFlFndrInfo.fdFlags;
-		if (fFlag) {
-		    if (hpb->ioFlFndrInfo.fdFlags & kIsAlias) {
-			strcat(theFile, "@");
-		    } else if (hpb->ioFlFndrInfo.fdType == 'APPL') {
-			strcat(theFile, "*");
-		    }
-		}
-	    }
-			
-	    sprintf(theLine, "%c %7ld %8s %8s %-4.4s %-4.4s 0x%4.4X %s",
-		    lineTag, size, time, date, creator, type, flags, theFile);
-						 
-	    Tcl_AppendResult(interp, theLine, "\n", NULL);
-	    
-	}
-		
-	objPtr = Tcl_GetObjResult(interp);
-	string = Tcl_GetStringFromObj(objPtr, &length);
-	if ((length > 0) && (string[length - 1] == '\n')) {
-	    Tcl_SetObjLength(objPtr, length - 1);
-	}
-    } else {
-	/*
-	 * Not in long format. We only print files names.  If the
-	 * -C flag is set we need to print in multiple coloumns.
-	 */
-	int argCount, linePos;
-	Boolean needNewLine = false;
-
-	/*
-	 * Fiend the field length: the length each string printed
-	 * to the terminal will be.
-	 */
-	if (!cFlag) {
-	    perLine = 1;
-	    fieldLength = STRING_LENGTH;
-	} else {
-	    for (i = 0; i < objc; i++) {
-	    	argv = Tcl_GetString(objv[i]);
-		len = strlen(argv);
-		if (len > maxLen) {
-		    maxLen = len;
-		}
-	    }
-	    fieldLength = maxLen + 3;
-	    perLine = STRING_LENGTH / fieldLength;
-	}
-
-	argCount = 0;
-	linePos = 0;
-	memset(theLine, ' ', STRING_LENGTH);
-	while (argCount < objc) {
-	    strcpy(theFile, Tcl_GetString(objv[argCount]));
-			
-	    c2pstr(theFile);
-	    hpb->ioCompletion = NULL;
-	    hpb->ioVRefNum = 0;
-	    hpb->ioFDirIndex = 0;
-	    hpb->ioNamePtr = (StringPtr) theFile;
-	    hpb->ioDirID = 0L;
-	    err = PBGetCatInfoSync(&paramBlock);
-	    p2cstr((StringPtr) theFile);
-
-	    if (hpb->ioFlAttrib & 16) {
-		/*
-		 * Directory. If -a show hidden files.  If -f or -p
-		 * denote that this is a directory.
-		 */
-		if ((aFlag == false) && (dpb->ioDrUsrWds.frFlags & 0x1000)) {
-		    argCount++;
-		    continue;
-		}
-		if (fFlag || pFlag) {
-		    strcat(theFile, ":");
-		}
-	    } else {
-		/*
-		 * File: If -a show hidden files, if -f show links
-		 * (aliases) and executables (APPLs).
-		 */
-		if ((aFlag == false) &&
-			(hpb->ioFlFndrInfo.fdFlags & kIsInvisible)) {
-		    argCount++;
-		    continue;
-		}
-		if (fFlag) {
-		    if (hpb->ioFlFndrInfo.fdFlags & kIsAlias) {
-			strcat(theFile, "@");
-		    } else if (hpb->ioFlFndrInfo.fdType == 'APPL') {
-			strcat(theFile, "*");
-		    }
-		}
-	    }
-
-	    /*
-	     * Print the item, taking into account multi-
-	     * coloum output.
-	     */
-	    strncpy(theLine + (linePos * fieldLength), theFile,
-		    strlen(theFile));
-	    linePos++;
-			
-	    if (linePos == perLine) {
-		theLine[STRING_LENGTH] = '\0';
-		if (needNewLine) {
-		    Tcl_AppendResult(interp, "\n", theLine, NULL);
-		} else {
-		    Tcl_AppendResult(interp, theLine, NULL);
-		    needNewLine = true;
-		}
-		linePos = 0;
-		memset(theLine, ' ', STRING_LENGTH);
-	    }
-			
-	    argCount++;
-	}
-		
-	if (linePos != 0) {
-	    theLine[STRING_LENGTH] = '\0';
-	    if (needNewLine) {
-		Tcl_AppendResult(interp, "\n", theLine, NULL);
-	    } else {
-		Tcl_AppendResult(interp, theLine, NULL);
-	    }
-	}
-    }
-
-    Tcl_DecrRefCount(resultObjPtr);
-    	
-    return TCL_OK;
-}
diff --git a/mac/tclMacUtil.c b/mac/tclMacUtil.c
deleted file mode 100644
index fd981c9..0000000
--- a/mac/tclMacUtil.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* 
- * tclMacUtil.c --
- *
- *  This contains utility functions used to help with
- *  implementing Macintosh specific portions of the Tcl port.
- *
- * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMacUtil.c,v 1.3 1998/11/10 06:49:55 jingham Exp $
- */
-
-#include "tcl.h"
-#include "tclInt.h"
-#include "tclMacInt.h"
-#include "tclMath.h"
-#include "tclMacPort.h"
-
-#include <Aliases.h>
-#include <Errors.h>
-#include <Files.h>
-#include <Folders.h>
-#include <FSpCompat.h>
-#include <Strings.h>
-#include <TextUtils.h>
-#include <MoreFilesExtras.h>
-
-/* 
- * The following two Includes are from the More Files package.
- */
-#include <FileCopy.h>
-#include <MoreFiles.h>
-
-/*
- *----------------------------------------------------------------------
- *
- * hypotd --
- *
- *	The standard math function hypot is not supported by Think C.
- *	It is included here so everything works. It is supported by
- *	CodeWarrior Pro 1, but the 68K version does not support doubles.
- *	So we hack it in.
- *
- * Results:
- *	Result of computation.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
- 
-#if defined(THINK_C) || defined(__MWERKS__)
-double hypotd(double x, double y);
-
-double
-hypotd(
-    double x,		/* X value */
-    double y)		/* Y value */
-{
-    double sum;
-
-    sum = x*x + y*y;
-    return sqrt(sum);
-}
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * FSpGetDefaultDir --
- *
- *	This function gets the current default directory.
- *
- * Results:
- *	The provided FSSpec is changed to point to the "default"
- *	directory.  The function returns what ever errors
- *	FSMakeFSSpecCompat may encounter.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-FSpGetDefaultDir(
-	FSSpecPtr dirSpec)	/* On return the default directory. */
-{
-    OSErr err;
-    short vRefNum = 0;
-    long int dirID = 0;
-
-    err = HGetVol(NULL, &vRefNum, &dirID);
-	
-    if (err == noErr) {
-	err = FSMakeFSSpecCompat(vRefNum, dirID, (ConstStr255Param) NULL,
-		dirSpec);
-    }
-	
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FSpSetDefaultDir --
- *
- *	This function sets the default directory to the directory
- *	pointed to by the provided FSSpec.
- *
- * Results:
- *	The function returns what ever errors HSetVol may encounter.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-FSpSetDefaultDir(
-	FSSpecPtr dirSpec)	/* The new default directory. */
-{
-    OSErr err;
-
-    /*
-     * The following special case is needed to work around a bug
-     * in the Macintosh OS.  (Acutally PC Exchange.)
-     */
-    
-    if (dirSpec->parID == fsRtParID) {
-	err = HSetVol(NULL, dirSpec->vRefNum, fsRtDirID);
-    } else {
-	err = HSetVol(dirSpec->name, dirSpec->vRefNum, dirSpec->parID);
-    }
-    
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FSpFindFolder --
- *
- *	This function is a version of the FindFolder function that 
- *	returns the result as a FSSpec rather than a vRefNum and dirID.
- *
- * Results:
- *	Results will be simaler to that of the FindFolder function.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-OSErr
-FSpFindFolder(
-    short vRefNum,		/* Volume reference number. */
-    OSType folderType,		/* Folder type taken by FindFolder. */
-    Boolean createFolder,	/* Should we create it if non-existant. */
-    FSSpec *spec)		/* Pointer to resulting directory. */
-{
-    short foundVRefNum;
-    long foundDirID;
-    OSErr err;
-
-    err = FindFolder(vRefNum, folderType, createFolder,
-	    &foundVRefNum, &foundDirID);
-    if (err != noErr) {
-	return err;
-    }
-		
-    err = FSMakeFSSpecCompat(foundVRefNum, foundDirID, "\p", spec);
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FSpLocationFromPath --
- *
- *	This function obtains an FSSpec for a given macintosh path.
- *	Unlike the More Files function FSpLocationFromFullPath, this
- *	function will also accept partial paths and resolve any aliases
- *	along the path.  
- *
- * Results:
- *	OSErr code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-FSpLocationFromPath(
-    int length,			/* Length of path. */
-    CONST char *path,		/* The path to convert. */
-    FSSpecPtr fileSpecPtr)	/* On return the spec for the path. */
-{
-    Str255 fileName;
-    OSErr err;
-    short vRefNum;
-    long dirID;
-    int pos, cur;
-    Boolean isDirectory;
-    Boolean wasAlias;
-
-    /*
-     * Check to see if this is a full path.  If partial
-     * we assume that path starts with the current working
-     * directory.  (Ie. volume & dir = 0)
-     */
-    vRefNum = 0;
-    dirID = 0;
-    cur = 0;
-    if (length == 0) {
-        return fnfErr;
-    }
-    if (path[cur] == ':') {
-	cur++;
-	if (cur >= length) {
-	    /*
-	     * If path = ":", just return current directory.
-	     */
-	    FSMakeFSSpecCompat(0, 0, NULL, fileSpecPtr);
-	    return noErr;
-	}
-    } else {
-	while (path[cur] != ':' && cur < length) {
-	    cur++;
-	}
-	if (cur > 255) {
-	    return bdNamErr;
-	}
-	if (cur < length) {
-	    /*
-	     * This is a full path
-	     */
-	    cur++;
-	    strncpy((char *) fileName + 1, path, cur);
-	    fileName[0] = cur;
-	    err = FSMakeFSSpecCompat(0, 0, fileName, fileSpecPtr);
-	    if (err != noErr) return err;
-	    FSpGetDirectoryID(fileSpecPtr, &dirID, &isDirectory);
-	    vRefNum = fileSpecPtr->vRefNum;
-	} else {
-	    cur = 0;
-	}
-    }
-    
-    isDirectory = 1;
-    while (cur < length) {
-	if (!isDirectory) {
-	    return dirNFErr;
-	}
-	pos = cur;
-	while (path[pos] != ':' && pos < length) {
-	    pos++;
-	}
-	if (pos == cur) {
-	    /* Move up one dir */
-	    /* cur++; */
-	    strcpy((char *) fileName + 1, "::");
-	    fileName[0] = 2;
-	} else if (pos - cur > 255) {
-	    return bdNamErr;
-	} else {
-	    strncpy((char *) fileName + 1, &path[cur], pos - cur);
-	    fileName[0] = pos - cur;
-	}
-	err = FSMakeFSSpecCompat(vRefNum, dirID, fileName, fileSpecPtr);
-	if (err != noErr) return err;
-	err = ResolveAliasFile(fileSpecPtr, true, &isDirectory, &wasAlias);
-	if (err != noErr) return err;
-	FSpGetDirectoryID(fileSpecPtr, &dirID, &isDirectory);
-	vRefNum = fileSpecPtr->vRefNum;
-	cur = pos;
-	if (path[cur] == ':') {
-	    cur++;
-	}
-    }
-    
-    return noErr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FSpPathFromLocation --
- *
- *	This function obtains a full path name for a given macintosh
- *	FSSpec.  Unlike the More Files function FSpGetFullPath, this
- *	function will return a C string in the Handle.  It also will
- *	create paths for FSSpec that do not yet exist.
- *
- * Results:
- *	OSErr code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-OSErr
-FSpPathFromLocation(
-    FSSpec *spec,		/* The location we want a path for. */
-    int *length,		/* Length of the resulting path. */
-    Handle *fullPath)		/* Handle to path. */
-{
-    OSErr err;
-    FSSpec tempSpec;
-    CInfoPBRec pb;
-	
-    *fullPath = NULL;
-	
-    /* 
-     * Make a copy of the input FSSpec that can be modified.
-     */
-    BlockMoveData(spec, &tempSpec, sizeof(FSSpec));
-	
-    if (tempSpec.parID == fsRtParID) {
-	/* 
-	 * The object is a volume.  Add a colon to make it a full 
-	 * pathname.  Allocate a handle for it and we are done.
-	 */
-	tempSpec.name[0] += 2;
-	tempSpec.name[tempSpec.name[0] - 1] = ':';
-	tempSpec.name[tempSpec.name[0]] = '\0';
-		
-	err = PtrToHand(&tempSpec.name[1], fullPath, tempSpec.name[0]);
-    } else {
-	/* 
-	 * The object isn't a volume.  Is the object a file or a directory? 
-	 */
-	pb.dirInfo.ioNamePtr = tempSpec.name;
-	pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
-	pb.dirInfo.ioDrDirID = tempSpec.parID;
-	pb.dirInfo.ioFDirIndex = 0;
-	err = PBGetCatInfoSync(&pb);
-
-	if ((err == noErr) || (err == fnfErr)) {
-	    /* 
-	     * If the file doesn't currently exist we start over.  If the
-	     * directory exists everything will work just fine.  Otherwise we
-	     * will just fail later.  If the object is a directory, append a
-	     * colon so full pathname ends with colon.
-	     */
-	    if (err == fnfErr) {
-		BlockMoveData(spec, &tempSpec, sizeof(FSSpec));
-	    } else if ( (pb.hFileInfo.ioFlAttrib & ioDirMask) != 0 ) {
-		tempSpec.name[0] += 1;
-		tempSpec.name[tempSpec.name[0]] = ':';
-	    }
-			
-	    /* 
-	     * Create a new Handle for the object - make it a C string.
-	     */
-	    tempSpec.name[0] += 1;
-	    tempSpec.name[tempSpec.name[0]] = '\0';
-	    err = PtrToHand(&tempSpec.name[1], fullPath, tempSpec.name[0]);
-	    if (err == noErr) {
-		/* 
-		 * Get the ancestor directory names - loop until we have an 
-		 * error or find the root directory.
-		 */
-		pb.dirInfo.ioNamePtr = tempSpec.name;
-		pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
-		pb.dirInfo.ioDrParID = tempSpec.parID;
-		do {
-		    pb.dirInfo.ioFDirIndex = -1;
-		    pb.dirInfo.ioDrDirID = pb.dirInfo.ioDrParID;
-		    err = PBGetCatInfoSync(&pb);
-		    if (err == noErr) {
-			/* 
-			 * Append colon to directory name and add 
-			 * directory name to beginning of fullPath.
-			 */
-			++tempSpec.name[0];
-			tempSpec.name[tempSpec.name[0]] = ':';
-						
-			(void) Munger(*fullPath, 0, NULL, 0, &tempSpec.name[1],
-				tempSpec.name[0]);
-			err = MemError();
-		    }
-		} while ( (err == noErr) &&
-			(pb.dirInfo.ioDrDirID != fsRtDirID) );
-	    }
-	}
-    }
-    
-    /*
-     * On error Dispose the handle, set it to NULL & return the err.
-     * Otherwise, set the length & return.
-     */
-    if (err == noErr) {
-	*length = GetHandleSize(*fullPath) - 1;
-    } else {
-	if ( *fullPath != NULL ) {
-	    DisposeHandle(*fullPath);
-	}
-	*fullPath = NULL;
-	*length = 0;
-    }
-
-    return err;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetGlobalMouse --
- *
- *	This procedure obtains the current mouse position in global
- *	coordinates.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-GetGlobalMouse(
-    Point *mouse)		/* Mouse position. */
-{
-    EventRecord event;
-    
-    OSEventAvail(0, &event);
-    *mouse = event.where;
-}
diff --git a/tests/README b/tests/README
deleted file mode 100644
index fe4bb30..0000000
--- a/tests/README
+++ /dev/null
@@ -1,423 +0,0 @@
-README -- Tcl test suite design document.
-
-RCS: @(#) $Id: README,v 1.3 1999/04/16 00:47:22 stanton Exp $
-
-Contents:
----------
-
-    1. Introduction
-    2. Definitions file
-    3. Writing a new test
-    4. Constraints
-    5. Adding a New Test File
-    6. Test output
-    7. Selecting tests for execution within a file
-    8. Selecting files to be sourced by all.tcl
-    9. Incompatibilities with prior Tcl versions
-
-1. Introduction:
-----------------
-
-This directory contains a set of validation tests for the Tcl commands
-and C Library procedures for Tcl.  Each of the files whose name ends
-in ".test" is intended to fully exercise the functions in the C source
-file that corresponds to the file prefix.  The C functions and/or Tcl
-commands tested by a given file are listed in the first line of the
-file.
-
-You can run the tests in three ways:
-
-    (a) type "make test" in ../unix; this will run all of the tests.
-
-    (b) type "tcltest <testFile> ?<option> <value>?
-	Command line options include:
-
-	-verbose <level>     set the level of verbosity to a substring
-			     of "bps".  See the "Test output" section
-			     for an explanation of this option.
-
-	-match <matchList>   only run tests that match one or more of
-			     the glob patterns in <matchList>
-
-	-skip <skipList>     do not run tests that match one or more
-			     of the glob patterns in <skipList>
-
-	-file <globPattern>  only source test files that match
-			     <globPattern> (relative to the "tests"
-			     directory).  This option only applies
-			     when you run the test suite with the
-			     "all.tcl" file.
-
-	-constraints <list>  tests with any constraints in <list> will
-			     not be skipped.  Not that elements of
-			     <list> must exactly match the existing
-			     constraints.
-
-    (c) start up tcltest in this directory, then "source" the test
-        file (for example, type "source parse.test").  To run all
-	of the tests, type "source all.tcl".  To use the options in
-	interactive mode, you can set their corresponding tcltest
-	namespace variables after sourcing the defs.tcl file.
-		  ::tcltest::match
-		  ::tcltest::skip
-		  ::tcltest::testConfig(nonPortable)
-		  ::tcltest::testConfig(knownBug)
-		  ::tcltest::testConfig(userInteractive)
-
-In all cases, no output will be generated if all goes well, except for
-a listing of the test files and a statistical summary.  If there are
-errors, then additional messages will appear in the format described
-below.  Note that some tests will be skipped if you run as superuser.
-
-This approach to testing was designed and initially implemented by
-Mary Ann May-Pumphrey of Sun Microsystems in the early 1990's.  Many
-thanks to her for donating her work back to the public Tcl release.
-
-
-2. Definitions file:
---------------------
-
-The file "defs.tcl" defines the "tcltest" namespace which contains a
-collection of procedures and variables used to run the tests.  It is
-read in automatically by each of the .test files if needed, but once
-it has been read once it will not be read again by the .test files.
-Currently, the following procedures are exported from the "tcltest"
-namespace and automatically imported:
-
-    test	      Run a test script.
-
-    cleanupTests      Print stats and remove files created by tests.
-
-    dotests	      Source a test file and run tests of the
-		      specified pattern.
-
-    makeFile	      Create a file--the file will automatically
-		      be removed by cleanupTests.
-
-    removeFile	      Force a file to be removed.
-
-    makeDirectory     Create a directory--the directory will
-		      automatically be removed by cleanupTests.
-
-    removeDirectory   Force a directory to be removed.
-
-    viewFile	      Returns the contents of a file.
-
-    normalizeMsg      Remove extra newlines from a string.
-
-    bytestring	      Construct a string that consists of the
-		      requested sequence of bytes, as opposed to a
-		      string of properly formed UTF-8 characters.
-
-    set_iso8859_1_locale    Set the locale to iso8859_1.
-
-    restore_locale    Restore the locale to its original setting.
-
-    saveState	      Save the procedure and global variable names.
-
-    restoreState      Restore the procedure and global variable names.
-
-Please refer to the defs.tcl file for more documentation on these
-procedures.
-
-
-3. Writing a new test:
-----------------------
-
-The test procedure runs a test script and prints an error message if
-the script's result does not match the expected result.  The following
-is the spec for the "test" command:
-
-    test <name> <description> ?<constraint>? <script> <expectedAnswer>
-
-The <name> argument should follow the pattern,
-"<target>-<majorNum>.<minorNum>".  For white-box (regression) tests,
-the target should be the name of the c function or Tcl procedure being
-tested.  For black-box tests, the target should be the name of the
-feature being tested.  Related tests should share a major number.
-
-The <description> argument is a short textual description of the test,
-to help humans understand what it does.
-
-The optional <constraints> argument is list of one or more keywords,
-each of which must be the name of an element in the array
-"::tcltest::testConfig".  If any of these elements is false or does
-not exist, the test is skipped.  Add appropriate constraints (e.g.,
-unixOnly) to any tests that should not always be run.  For example, a
-test that should only be run on Unix should look like the following:
-
-    test getAttribute-1.1 {testing file permissions} {unixOnly} {
-        lindex [file attributes foo.tcl] 5
-    } {00644}
-
-See the "Constraints" section for a list of built-in
-constraints and information on how to add your own constraints.
-
-The <script> argument contains the script to run to carry out the
-test.  It must return a result that can be checked for correctness.
-If your script requires that a file be created on the fly, please use
-the ::tcltest::makeFile procedure.  If your test requires that a small
-file (<50 lines) be checked in, please consider creating the file on
-the fly using the ::tcltest::makeFile procedure.  Files created by the
-::tcltest::makeFile procedure will automatically be removed by the
-::tcltest::cleanupTests call at the end of each test file.
-
-The <expectedAnswer> argument will be compared against the result of
-evaluating the <script> argument.  If they match, the test passes,
-otherwise the test fails.
-
-
-4. Constraints:
----------------
-
-Constraints are used to determine whether a test should be skipped.
-Each constraint is stored as an index in the array
-::tcltest::testConfig.  For example, the unixOnly constraint is
-defined as the following:
-
-    set ::tcltest::testConfig(unixOnly) \
-	[expr {$tcl_platform(platform) == "unix"}]
-
-If a test is constrained by "unixOnly", then it will only be run if
-the value of ::tcltest::testConfig(unixOnly) is true.
-
-The following is a list of constraints defined in the defs.tcl file:
-
-unix            test can only be run on any UNIX platform
-pc	        test can only be run on any Windows platform
-nt	        test can only be run on any Windows NT platform
-95	        test can only be run on any Windows 95 platform
-mac	        test can only be run on any Mac platform
-unixOrPc        test can only be run on a UNIX or PC platform
-macOrPc	        test can only be run on a Mac or PC platform
-macOrUnix       test can only be run on a Mac or UNIX platform
-tempNotPc	test can not be run on Windows.  This flag is used
-		to temporarily disable a test.
-tempNotMac	test can not be run on a Mac.  This flag is used
-		to temporarily disable a test.
-unixCrash       test crashes if it's run on UNIX.  This flag is used
-		to temporarily disable a test.
-pcCrash 	test crashes if it's run on Windows.  This flag is
-		used to temporarily disable a test.
-macCrash 	test crashes if it's run on a Mac.  This flag is used
-		to temporarily disable a test.
-
-emptyTest	test is empty, and so not worth running, but
-                it remains as a place-holder for a test to be
-                written in the future.  This constraint always
-                causes tests to be skipped.
-
-knownBug	test is known to fail and the bug is not yet
-                fixed.  This constraint always causes tests to be
-                skipped unless the user specifies otherwise.  See the
-                "Introduction" section for more details.
-
-nonPortable	test can only be run in the master Tcl/Tk
-		development environment.  Some tests are inherently
-		non-portable because they depend on things like word
-		length, file system configuration, window manager,
-		etc.  These tests are only run in the main Tcl
-		development directory where the configuration is
-		well known.  This constraint always causes tests to be
-		skipped unless the user specifies otherwise.  See the
-		"Introduction" section for more details.
-
-userInteraction test requires interaction from the user.  This
-                constraint always causes tests to be skipped unless
-                the user specifies otherwise.  See the "Introduction"
-                section for more details. 
-
-interactive	test can only be run in if the interpreter is in
-		interactive mode, that is the global tcl_interactive
-		variable is set to 1.
-
-nonBlockFiles	test can only be run if platform supports setting
-		files into nonblocking mode
-
-asyncPipeClose	test can only be run if platform supports async
-		flush and async close on a pipe
-
-unixExecs	test can only be run if this machine has commands
-		such as 'cat', 'echo', etc. available.
-
-hasIsoLocale	test can only be run if can switch to an ISO locale
-
-fonts		test can only be run if the wish app's fonts can
-		be controlled by Tk.
-
-root		test can only run if Unix user is root
-
-notRoot		test can only run if Unix user is not root
-
-eformat		test can only run if app has a working version of
-		sprintf with respect to the "e" format of
-		floating-point numbers.
-
-stdio		test can only be run if the current app can be
-		spawned via a pipe
-
-
-5. Adding a new test file:
---------------------------
-
-Tests files should begin by sourcing the defs.tcl file:
-
-    if {[lsearch [namespace children] ::tcltest] == -1} {
-        source [file join [pwd] [file dirname [info script]] defs.tcl]
-    }
-
-Test files sould end by cleaning up after themselves and calling
-::tcltest::cleanupTests.  The ::tcltest::cleanupTests procedure prints
-statistics about the number of tests that passed, skipped, and failed,
-and removes all files that were created using the ::tcltest::makeFile
-and ::tcltest::makeDirectory procedures.
-
-    # Remove files created by these tests
-    # Change to original working directory
-    # Unset global arrays
-    ::tcltest::cleanupTests
-    return
-
-The all.tcl file will source your new test file if the filename
-matches the tests/*.test pattern (as it should).  The names of test
-files that contain regression (or glass-box) tests should correspond
-to the Tcl or C code file that they are testing.  For example, the
-test file for the C file "tclCmdAH.c" is "cmdAH.test".  Test files
-that contain black-box tests may not correspond to any Tcl or C code
-file so they should match the pattern "*_bb.test".
-
-Be sure your new test file can be run from any working directory.
-
-Be sure no temporary files are left behind by your test file.
-
-Be sure your tests can run cross-platform in both a build environment
-as well as an installation environment.  If your test file contains
-tests that should not be run in one or more of those cases, please use
-the constraints mechanism to skip those tests.
-
-
-6. Test output:
----------------
-
-After all specified test files are sourced, the number of tests
-passed, skipped, and failed is printed to stdout.  Aside from this
-statistical information, output can be controlled on a per-test basis
-by the ::tcltest::verbose variable.
-
-::tcltest::verbose can be set to any substring or permutation of "bps".
-In the string "bps", the 'b' stands for a test's "body", the 'p'
-stands for "passed" tests, and the 's' stands for "skipped" tests.
-The default value of ::tcltest::verbose is "b".  If 'b' is present, then
-the entire body of the test is printed for each failed test, otherwise
-only the test's name, desired output, and actual output, are printed
-for each failed test.  If 'p' is present, then a line is printed for
-each passed test, otherwise no line is printed for passed tests.  If
-'s' is present, then a line (containing the consraints that cause the
-test to be skipped) is printed for each skipped test, otherwise no
-line is printed for skipped tests.
-
-You can set ::tcltest::verbose either interactively (after the defs.tcl
-file has been sourced) or by the command line argument -verbose, for
-example:
-
-      tcltest socket.test -verbose bps
-
-
-7. Selecting tests for execution within a file:
------------------------------------------------
-
-Normally, all the tests in a file are run whenever the file is
-sourced.  An individual test will be skipped if one of the following
-conditions is met:
-
-    1) the "name" of the tests does not match (using glob style
-       matching) one or more elements in the ::tcltest::match
-       variable
-
-    2) the "name" of the tests matches (using glob style matching) one
-       or more elements in the ::tcltest::skip variable
-
-    3) the "constraints" argument to the "test" call, if given,
-       contains one or more false elements.
-
-You can set ::tcltest::match and/or ::tcltest::skip
-either interactively (after the defs.tcl file has been sourced), or by
-the command line arguments -match and -skip, for example:
-
-       tcltest info.test -match '*-5.* *-7.*' -skip '*-7.1*'
-
-Be sure to use the proper quoting convention so that your shell does
-not perform the glob substitution on the match or skip patterns you
-specify.
-
-The two predefined constraints (knownBug and nonPortable) can be
-overridden either interactively (after the defs.tcl file has been
-sourced) by setting the ::tcltest::testConfig(<constraint>) variable,
-or by using the -constraints command line option with the name of the
-constraint in the argument.  The following example shows how to run
-tests that are constrained by the knownBug and nonPortable
-restricions:
-
-	tcltest all.tcl -constraints "knownBug nonPortable"
-
-See the defs.tcl file for information about each of these constraints.
-Other constraints can be added at any time.  See the "Writing a new
-test" section below for more details about using built-in constraints
-and adding new ones.
-
-
-8. Selecting files to be sourced by all.tcl:
---------------------------------------------
-
-You can specify the files you want all.tcl to source on the command
-line with the -file options.  For example, if you call the
-following:
-
-     tcltest all.tcl -file 'unix*.test'
-
-all files in "tests" directory that match the pattern unix*.test will
-be sourced by the all.tcl file.  Another useful example is if a
-particular test hangs, say "get.test", and you just want to run the
-remaining tests, then you can call the following:
-
-     tcltest all.tcl -file '[h-z]*.test'
-
-Note that the argument to -file will be substituted relative to the
-"tests" directory.  Be sure to use the proper quoting convention so
-that your shell does not perform the glob substitution.
-
-
-9. Incompatibilities with prior Tcl versions:
----------------------------------------------
-
-1) Global variables such as VERBOSE, TESTS, and testConfig are now
-   renamed to use the new "tcltest" namespace.
-
-   old name   new name
-   --------   --------
-   VERBOSE    ::tcltest::verbose
-   TESTS      ::tcltest::match
-   testConfig ::tcltest::testConfig
-
-   The introduction of the "tcltest" namespace is a precursor to using
-   a "tcltest" package.  This next step will be part of a future Tcl
-   version.
-
-2) VERBOSE values are no longer numeric.  Please see the section above
-   on "Test output" for the new usage of the ::tcltest::verbose variable.
-
-3) When you run "make test", the working dir for the test suite is now
-   the one from which you called "make test", rather than the "tests"
-   directory.  This change allows for both unix and windows test
-   suites to be run simultaneously without interference with each
-   other or with existing files.  All tests must now run independently
-   of their working directory.
-
-4) The "all", "defs", and "visual" files are now called "all.tcl",
-   "defs.tcl", and "visual_bb.test", respectively.
-
-5) Instead of creating a doAllTests file in the tests directory, to
-   run all nonPortable tests, just use the "-constraints nonPortable"
-   command line flag.  If you are running interactively, you can set
-   the ::tcltest::testConfig(nonPortable) variable to 1 (after
-   sourcing the defs.tcl file).
diff --git a/tests/all.tcl b/tests/all.tcl
deleted file mode 100644
index a6c596a..0000000
--- a/tests/all.tcl
+++ /dev/null
@@ -1,76 +0,0 @@
-# all.tcl --
-#
-# This file contains a top-level script to run all of the Tcl
-# tests.  Execute it by invoking "source all.test" when running tcltest
-# in this directory.
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: all.tcl,v 1.2 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch ::tcltest [namespace children]] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-set ::tcltest::testSingleFile false
-
-puts stdout "Tcl $tcl_patchLevel tests running in interp:  [info nameofexecutable]"
-puts stdout "Tests running in working dir:  $::tcltest::workingDir"
-if {[llength $::tcltest::skip] > 0} {
-    puts stdout "Skipping tests that match:  $::tcltest::skip"
-}
-if {[llength $::tcltest::match] > 0} {
-    puts stdout "Only running tests that match:  $::tcltest::match"
-}
-
-# Use command line specified glob pattern (specified by -file or -f)
-# if one exists.  Otherwise use *.test.  If given, the file pattern
-# should be specified relative to the dir containing this file.  If no
-# files are found to match the pattern, print an error message and exit.
-set fileIndex [expr {[lsearch $argv "-file"] + 1}]
-set fIndex [expr {[lsearch $argv "-f"] + 1}]
-if {($fileIndex < 1) || ($fIndex > $fileIndex)} {
-    set fileIndex $fIndex
-}
-if {$fileIndex > 0} {
-    set globPattern [file join $::tcltest::testsDir [lindex $argv $fileIndex]]
-    puts stdout "Sourcing files that match:  $globPattern"
-} else {
-    set globPattern [file join $::tcltest::testsDir *.test]
-}
-set fileList [glob -nocomplain $globPattern]
-if {[llength $fileList] < 1} {
-    puts "Error: no files found matching $globPattern"
-    exit
-}
-set timeCmd {clock format [clock seconds]}
-puts stdout "Tests began at [eval $timeCmd]"
-
-# source each of the specified tests
-foreach file [lsort $fileList] {
-    set tail [file tail $file]
-    if {[string match l.*.test $tail]} {
-	# This is an SCCS lockfile; ignore it
-	continue
-    }
-    puts stdout $tail
-    if {[catch {source $file} msg]} {
-	puts stdout $msg
-    }
-}
-
-# cleanup
-puts stdout "\nTests ended at [eval $timeCmd]"
-::tcltest::cleanupTests 1
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/append.test b/tests/append.test
deleted file mode 100644
index e64df06..0000000
--- a/tests/append.test
+++ /dev/null
@@ -1,194 +0,0 @@
-# Commands covered:  append lappend
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: append.test,v 1.3 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-catch {unset x}
-
-test append-1.1 {append command} {
-    catch {unset x}
-    list [append x 1 2 abc "long string"] $x
-} {{12abclong string} {12abclong string}}
-test append-1.2 {append command} {
-    set x ""
-    list [append x first] [append x second] [append x third] $x
-} {first firstsecond firstsecondthird firstsecondthird}
-test append-1.3 {append command} {
-    set x "abcd"
-    append x
-} abcd
-
-test append-2.1 {long appends} {
-    set x ""
-    for {set i 0} {$i < 1000} {set i [expr $i+1]} {
-	append x "foobar "
-    }
-    set y "foobar"
-    set y "$y $y $y $y $y $y $y $y $y $y"
-    set y "$y $y $y $y $y $y $y $y $y $y"
-    set y "$y $y $y $y $y $y $y $y $y $y "
-    expr {$x == $y}
-} 1
-
-test append-3.1 {append errors} {
-    list [catch {append} msg] $msg
-} {1 {wrong # args: should be "append varName ?value value ...?"}}
-test append-3.2 {append errors} {
-    set x ""
-    list [catch {append x(0) 44} msg] $msg
-} {1 {can't set "x(0)": variable isn't array}}
-test append-3.3 {append errors} {
-    catch {unset x}
-    list [catch {append x} msg] $msg
-} {1 {can't read "x": no such variable}}
-
-test append-4.1 {lappend command} {
-    catch {unset x}
-    list [lappend x 1 2 abc "long string"] $x
-} {{1 2 abc {long string}} {1 2 abc {long string}}}
-test append-4.2 {lappend command} {
-    set x ""
-    list [lappend x first] [lappend x second] [lappend x third] $x
-} {first {first second} {first second third} {first second third}}
-test append-4.3 {lappend command} {
-    proc foo {} {
-	global x
-	set x old
-	unset x
-	lappend x new
-    }
-    set result [foo]
-    rename foo {}
-    set result
-} {new}
-test append-4.4 {lappend command} {
-    set x {}
-    lappend x \{\  abc
-} {\{\  abc}
-test append-4.5 {lappend command} {
-    set x {}
-    lappend x \{ abc
-} {\{ abc}
-test append-4.6 {lappend command} {
-    set x {1 2 3}
-    lappend x
-} {1 2 3}
-test append-4.7 {lappend command} {
-    set x "a\{"
-    lappend x abc
-} "a\\\{ abc"
-test append-4.8 {lappend command} {
-    set x "\\\{"
-    lappend x abc
-} "\\{ abc"
-test append-4.9 {lappend command} {
-    set x " \{"
-    list [catch {lappend x abc} msg] $msg
-} {1 {unmatched open brace in list}}
-test append-4.10 {lappend command} {
-    set x "	\{"
-    list [catch {lappend x abc} msg] $msg
-} {1 {unmatched open brace in list}}
-test append-4.11 {lappend command} {
-    set x "\{\{\{"
-    list [catch {lappend x abc} msg] $msg
-} {1 {unmatched open brace in list}}
-test append-4.12 {lappend command} {
-    set x "x \{\{\{"
-    list [catch {lappend x abc} msg] $msg
-} {1 {unmatched open brace in list}}
-test append-4.13 {lappend command} {
-    set x "x\{\{\{"
-    lappend x abc
-} "x\\\{\\\{\\\{ abc"
-test append-4.14 {lappend command} {
-    set x " "
-    lappend x abc
-} "abc"
-test append-4.15 {lappend command} {
-    set x "\\ "
-    lappend x abc
-} "{ } abc"
-test append-4.16 {lappend command} {
-    set x "x "
-    lappend x abc
-} "x abc"
-test append-4.17 {lappend command} {
-    catch {unset x}
-    lappend x
-} {}
-
-proc check {var size} {
-    set l [llength $var]
-    if {$l != $size} {
-	return "length mismatch: should have been $size, was $l"
-    }
-    for {set i 0} {$i < $size} {set i [expr $i+1]} {
-	set j [lindex $var $i]
-	if {$j != "item $i"} {
-	    return "element $i should have been \"item $i\", was \"$j\""
-	}
-    }
-    return ok
-}
-test append-5.1 {long lappends} {
-    set x ""
-    for {set i 0} {$i < 300} {set i [expr $i+1]} {
-	lappend x "item $i"
-    }
-    check $x 300
-} ok
-
-test append-6.1 {lappend errors} {
-    list [catch {lappend} msg] $msg
-} {1 {wrong # args: should be "lappend varName ?value value ...?"}}
-test append-6.2 {lappend errors} {
-    set x ""
-    list [catch {lappend x(0) 44} msg] $msg
-} {1 {can't set "x(0)": variable isn't array}}
-
-test append-7.1 {lappend-created var and error in trace on that var} {
-    catch {rename foo ""}
-    catch {unset x}
-    trace variable x w foo
-    proc foo {} {global x; unset x}
-    catch {lappend x 1}
-    proc foo {args} {global x; unset x}
-    info exists x
-    set x
-    lappend x 1
-    list [info exists x] [catch {set x} msg] $msg
-} {0 1 {can't read "x": no such variable}}
-
-catch {unset i x result y}
-catch {rename foo ""}
-catch {rename check ""}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/assocd.test b/tests/assocd.test
deleted file mode 100644
index a618606..0000000
--- a/tests/assocd.test
+++ /dev/null
@@ -1,77 +0,0 @@
-# This file tests the AssocData facility of Tcl
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: assocd.test,v 1.3 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[string compare testsetassocdata [info commands testsetassocdata]] != 0} {
-    puts "This application hasn't been compiled with the tests for assocData,"
-    puts "therefore I am skipping all of these tests."
-    ::tcltest::cleanupTests
-    return
-}
-
-test assocd-1.1 {testing setting assoc data} {
-   testsetassocdata a 1
-} ""
-test assocd-1.2 {testing setting assoc data} {
-   testsetassocdata a 2
-} ""
-test assocd-1.3 {testing setting assoc data} {
-   testsetassocdata 123 456
-} ""
-test assocd-1.4 {testing setting assoc data} {
-   testsetassocdata abc "abc d e f"
-} ""
-
-test assocd-2.1 {testing getting assoc data} {
-   testgetassocdata a
-} 2
-test assocd-2.2 {testing getting assoc data} {
-   testgetassocdata 123
-} 456
-test assocd-2.3 {testing getting assoc data} {
-   testgetassocdata abc
-} {abc d e f}
-test assocd-2.4 {testing getting assoc data} {
-   testgetassocdata xxx
-} ""
-
-test assocd-3.1 {testing deleting assoc data} {
-   testdelassocdata a
-} ""
-test assocd-3.2 {testing deleting assoc data} {
-   testdelassocdata 123
-} ""
-test assocd-3.3 {testing deleting assoc data} {
-   list [catch {testdelassocdata nonexistent} msg] $msg
-} {0 {}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/async.test b/tests/async.test
deleted file mode 100644
index 4b4d655..0000000
--- a/tests/async.test
+++ /dev/null
@@ -1,150 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for Tcl_AsyncCreate and related
-# library procedures.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: async.test,v 1.3 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testasync] == {}} {
-    puts "This application hasn't been compiled with the \"testasync\""
-    puts "command, so I can't test Tcl_AsyncCreate et al."
-    ::tcltest::cleanupTests
-    return
-}
-
-proc async1 {result code} {
-    global aresult acode
-    set aresult $result
-    set acode $code
-    return "new result"
-}
-proc async2 {result code} {
-    global aresult acode
-    set aresult $result
-    set acode $code
-    return -code error "xyzzy"
-}
-proc async3 {result code} {
-    global aresult
-    set aresult "test pattern"
-    return -code $code $result
-}
-
-set handler1 [testasync create async1]
-set handler2 [testasync create async2]
-set handler3 [testasync create async3]
-test async-1.1 {basic async handlers} {
-    set aresult xxx
-    set acode yyy
-    list [catch {testasync mark $handler1 "original" 0} msg] $msg \
-	   $acode $aresult
-} {0 {new result} 0 original}
-test async-1.2 {basic async handlers} {
-    set aresult xxx
-    set acode yyy
-    list [catch {testasync mark $handler1 "original" 1} msg] $msg \
-	   $acode $aresult
-} {0 {new result} 1 original}
-test async-1.3 {basic async handlers} {
-    set aresult xxx
-    set acode yyy
-    list [catch {testasync mark $handler2 "old" 0} msg] $msg \
-	   $acode $aresult
-} {1 xyzzy 0 old}
-test async-1.4 {basic async handlers} {
-    set aresult xxx
-    set acode yyy
-    list [catch {testasync mark $handler2 "old" 3} msg] $msg \
-	   $acode $aresult
-} {1 xyzzy 3 old}
-test async-1.5 {basic async handlers} {
-    set aresult xxx
-    list [catch {testasync mark $handler3 "foobar" 0} msg] $msg $aresult
-} {0 foobar {test pattern}}
-test async-1.6 {basic async handlers} {
-    set aresult xxx
-    list [catch {testasync mark $handler3 "foobar" 1} msg] $msg $aresult
-} {1 foobar {test pattern}}
-
-proc mult1 {result code} {
-    global x
-    lappend x mult1
-    return -code 7 mult1
-}
-set hm1 [testasync create mult1]
-proc mult2 {result code} {
-    global x
-    lappend x mult2
-    return -code 9 mult2
-}
-set hm2 [testasync create mult2]
-proc mult3 {result code} {
-    global x hm1 hm2
-    lappend x [catch {testasync mark $hm2 serial2 0}]
-    lappend x [catch {testasync mark $hm1 serial1 0}]
-    lappend x mult3
-    return -code 11 mult3
-}
-set hm3 [testasync create mult3]
-
-test async-2.1 {multiple handlers} {
-    set x {}
-    list [catch {testasync mark $hm3 "foobar" 5} msg] $msg $x
-} {9 mult2 {0 0 mult3 mult1 mult2}}
-
-proc del1 {result code} {
-    global x hm1 hm2 hm3 hm4
-    lappend x [catch {testasync mark $hm3 serial2 0}]
-    lappend x [catch {testasync mark $hm1 serial1 0}]
-    lappend x [catch {testasync mark $hm4 serial1 0}]
-    testasync delete $hm1
-    testasync delete $hm2
-    testasync delete $hm3
-    lappend x del1
-    return -code 13 del1
-}
-proc del2 {result code} {
-    global x
-    lappend x del2
-    return -code 3 del2
-}
-testasync delete $handler1
-testasync delete $hm2
-testasync delete $hm3
-set hm2 [testasync create del1]
-set hm3 [testasync create mult2]
-set hm4 [testasync create del2]
-
-test async-3.1 {deleting handlers} {
-    set x {}
-    list [catch {testasync mark $hm2 "foobar" 5} msg] $msg $x
-} {3 del2 {0 0 0 del1 del2}}
-
-# cleanup
-testasync delete
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/autoMkindex.tcl b/tests/autoMkindex.tcl
deleted file mode 100644
index 2756358..0000000
--- a/tests/autoMkindex.tcl
+++ /dev/null
@@ -1,73 +0,0 @@
-# Test file for:
-#   auto_mkindex
-#
-# This file provides example cases for testing the Tcl autoloading
-# facility.  Things are much more complicated with namespaces and classes.
-# The "auto_mkindex" facility can no longer be built on top of a simple
-# regular expression parser.  It must recognize constructs like this:
-#
-#   namespace eval foo {
-#       proc test {x y} { ... }
-#       namespace eval bar {
-#           proc another {args} { ... }
-#       }
-#   }
-#
-# Note that procedures and itcl class definitions can be nested inside
-# of namespaces.
-#
-# Copyright (c) 1993-1998  Lucent Technologies, Inc.
-
-# This shouldn't cause any problems
-namespace import -force blt::*
-
-# Should be able to handle "proc" definitions, even if they are
-# preceded by white space.
-
-proc normal {x y} {return [expr $x+$y]}
-  proc indented {x y} {return [expr $x+$y]}
-
-#
-# Should be able to handle proc declarations within namespaces,
-# even if they have explicit namespace paths.
-#
-namespace eval buried {
-    proc inside {args} {return "inside: $args"}
-
-    namespace export pub_*
-    proc pub_one {args} {return "one: $args"}
-    proc pub_two {args} {return "two: $args"}
-}
-proc buried::within {args} {return "within: $args"}
-
-namespace eval buried {
-    namespace eval under {
-        proc neath {args} {return "neath: $args"}
-    }
-    namespace eval ::buried {
-        proc relative {args} {return "relative: $args"}
-        proc ::top {args} {return "top: $args"}
-        proc ::buried::explicit {args} {return "explicit: $args"}
-    }
-}
-
-# With proper hooks, we should be able to support other commands
-# that create procedures
-
-proc buried::myproc {name body args} {
-    ::proc $name $body $args
-}
-namespace eval ::buried {
-    proc mycmd1 args {return "mycmd"}
-    myproc mycmd2 args {return "mycmd"}
-}
-::buried::myproc mycmd3 args {return "another"}
-
-proc {buried::my proc} {name body args} {
-    ::proc $name $body $args
-}
-namespace eval ::buried {
-    proc mycmd4 args {return "mycmd"}
-    {my proc} mycmd5 args {return "mycmd"}
-}
-{::buried::my proc} mycmd6 args {return "another"}
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
deleted file mode 100644
index 452eed6..0000000
--- a/tests/autoMkindex.test
+++ /dev/null
@@ -1,189 +0,0 @@
-# Commands covered:  auto_mkindex auto_import
-#
-# This file contains tests related to autoloading and generating
-# the autoloading index.
-#
-# Copyright (c) 1998  Lucent Technologies, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: autoMkindex.test,v 1.5 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# temporarily copy the autoMkindex.tcl file from testsDir to tmpDir
-set origMkindexFile [file join $::tcltest::testsDir autoMkindex.tcl]
-set newMkindexFile [file join $::tcltest::workingDir autoMkindex.tcl]
-if {![catch {file copy $origMkindexFile $newMkindexFile}]} {
-    set removeAutoMkindex 1
-}
-
-# Save initial state of auto_mkindex_parser
-
-auto_load auto_mkindex
-if {[info exist auto_mkindex_parser::initCommands]} {
-    set saveCommands $auto_mkindex_parser::initCommands
-}
-proc AutoMkindexTestReset {} {
-    global saveCommands
-    if {[info exist saveCommands]} {
-	set auto_mkindex_parser::initCommands $saveCommands
-    } elseif {[info exist auto_mkindex_parser::initCommands]} {
-	unset auto_mkindex_parser::initCommands
-    }
-}
-
-set result ""
-
-test autoMkindex-1.1 {remove any existing tclIndex file} {
-    file delete tclIndex
-    file exists tclIndex
-} {0}
-
-test autoMkindex-1.2 {build tclIndex based on a test file} {
-    auto_mkindex . autoMkindex.tcl
-    file exists tclIndex
-} {1}
-
-set element "{source [file join . autoMkindex.tcl]}"
-
-test autoMkindex-1.3 {examine tclIndex} {
-    file delete tclIndex
-    auto_mkindex . autoMkindex.tcl
-    namespace eval tcl_autoMkindex_tmp {
-        set dir "."
-        variable auto_index
-        source tclIndex
-        set ::result ""
-        foreach elem [lsort [array names auto_index]] {
-            lappend ::result [list $elem $auto_index($elem)]
-        }
-    }
-    namespace delete tcl_autoMkindex_tmp
-    set ::result
-} "{::buried::explicit $element} {::buried::inside $element} {{::buried::my proc} $element} {::buried::mycmd1 $element} {::buried::mycmd4 $element} {::buried::myproc $element} {::buried::pub_one $element} {::buried::pub_two $element} {::buried::relative $element} {::buried::under::neath $element} {::buried::within $element} {indented $element} {normal $element} {top $element}"
-
-
-test autoMkindex-2.1 {commands on the autoload path can be imported} {
-    file delete tclIndex
-    auto_mkindex . autoMkindex.tcl
-    set interp [interp create]
-    set final [$interp eval {
-        namespace eval blt {}
-        set auto_path [linsert $auto_path 0 .]
-        set info [list [catch {namespace import buried::*} result] $result]
-        foreach name [lsort [info commands pub_*]] {
-            lappend info $name [namespace origin $name]
-        }
-        set info
-    }]
-    interp delete $interp
-    set final
-} "0 {} pub_one ::buried::pub_one pub_two ::buried::pub_two"
-
-# Test auto_mkindex hooks
-
-# Slave hook executes interesting code in the interp used to watch code.
-
-test autoMkindex-3.1 {slaveHook} {
-    auto_mkindex_parser::slavehook {
-	_%@namespace eval ::blt {
-	    proc foo {} {}
-	    _%@namespace export foo
-	}
-    }
-    auto_mkindex_parser::slavehook { _%@namespace import -force ::blt::* }
-    file delete tclIndex
-    auto_mkindex . autoMkindex.tcl
-     
-    # Reset initCommands to avoid trashing other tests
-
-    AutoMkindexTestReset
-    file exists tclIndex
-} 1 
-
-# The auto_mkindex_parser::command is used to register commands
-# that create new commands.
-
-test autoMkindex-3.2 {auto_mkindex_parser::command} {
-    auto_mkindex_parser::command buried::myproc {name args} {
-	variable index
-	variable scriptFile
-	append index [list set auto_index([fullname $name])] \
-		" \[list source \[file join \$dir [list $scriptFile]\]\]\n"
-    }
-    file delete tclIndex
-    auto_mkindex . autoMkindex.tcl
-    namespace eval tcl_autoMkindex_tmp {
-        set dir "."
-        variable auto_index
-        source tclIndex
-        set ::result ""
-        foreach elem [lsort [array names auto_index]] {
-            lappend ::result [list $elem $auto_index($elem)]
-        }
-    }
-    namespace delete tcl_autoMkindex_tmp
-
-    # Reset initCommands to avoid trashing other tests
-
-    AutoMkindexTestReset
-    set ::result
-} "{::buried::explicit $element} {::buried::inside $element} {{::buried::my proc} $element} {::buried::mycmd1 $element} {::buried::mycmd2 $element} {::buried::mycmd4 $element} {::buried::myproc $element} {::buried::pub_one $element} {::buried::pub_two $element} {::buried::relative $element} {::buried::under::neath $element} {::buried::within $element} {indented $element} {mycmd3 $element} {normal $element} {top $element}"
-
-
-test autoMkindex-3.3 {auto_mkindex_parser::command} {knownBug} {
-    auto_mkindex_parser::command {buried::my proc} {name args} {
-	variable index
-	variable scriptFile
-	puts "my proc $name"
-	append index [list set auto_index([fullname $name])] \
-		" \[list source \[file join \$dir [list $scriptFile]\]\]\n"
-    }
-    file delete tclIndex
-    auto_mkindex . autoMkindex.tcl
-    namespace eval tcl_autoMkindex_tmp {
-        set dir "."
-        variable auto_index
-        source tclIndex
-        set ::result ""
-        foreach elem [lsort [array names auto_index]] {
-            lappend ::result [list $elem $auto_index($elem)]
-        }
-    }
-    namespace delete tcl_autoMkindex_tmp
-
-    # Reset initCommands to avoid trashing other tests
-
-    AutoMkindexTestReset
-    proc lvalue {list pattern} {
-	set ix [lsearch $list $pattern]
-	if {$ix >= 0} {
-	    return [lindex $list $ix]
-	} else {
-	    return {}
-	}
-    }
-    list [lvalue $::result *mycmd4*] [lvalue $::result *mycmd5*] [lvalue $::result *mycmd6*]
-} "{::buried::mycmd4 $element} {::buried::mycmd5 $element} {mycmd6 $element}"
-
-# Clean up.
-
-unset result
-AutoMkindexTestReset
-if {[info exist saveCommands]} {
-    unset saveCommands
-}
-rename AutoMkindexTestReset ""
-
-if {[info exists removeAutoMkindex]} {
-    catch {file delete $newMkindexFile}
-}
-if {[file exists tclIndex]} {
-    file delete -force tclIndex
-}
-::tcltest::cleanupTests
diff --git a/tests/basic.test b/tests/basic.test
deleted file mode 100644
index b6274bf..0000000
--- a/tests/basic.test
+++ /dev/null
@@ -1,545 +0,0 @@
-# This file contains tests for the tclBasic.c source file. Tests appear in
-# the same order as the C code that they test. The set of tests is
-# currently incomplete since it currently includes only new tests for
-# code changed for the addition of Tcl namespaces. Other variable-
-# related tests appear in several other test files including
-# assocd.test, cmdInfo.test, eval.test, expr.test, interp.test,
-# and trace.test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: basic.test,v 1.5 1999/04/16 00:47:23 stanton Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {namespace delete test_ns_basic}
-catch {interp delete test_interp}
-catch {rename p ""}
-catch {rename q ""}
-catch {rename cmd ""}
-catch {unset x}
-
-test basic-1.1 {Tcl_CreateInterp, creates interp's global namespace} {
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        namespace eval test_ns_basic {
-            proc p {} {
-                return [namespace current]
-            }
-        }
-    }
-    list [interp eval test_interp {test_ns_basic::p}] \
-         [interp delete test_interp]
-} {::test_ns_basic {}}
-
-test basic-2.1 {TclHideUnsafeCommands} {emptyTest} {
-} {}
-
-test basic-3.1 {Tcl_CallWhenDeleted: see dcall.test} {emptyTest} {
-} {}
-
-test basic-4.1 {Tcl_DontCallWhenDeleted: see dcall.test} {emptyTest} {
-} {}
-
-test basic-5.1 {Tcl_SetAssocData: see assoc.test} {emptyTest} {
-} {}
-
-test basic-6.1 {Tcl_DeleteAssocData: see assoc.test} {emptyTest} {
-} {}
-
-test basic-7.1 {Tcl_GetAssocData: see assoc.test} {emptyTest} {
-} {}
-
-test basic-8.1 {Tcl_InterpDeleted} {emptyTest} {
-} {}
-
-test basic-9.1 {Tcl_DeleteInterp: see interp.test} {emptyTest} {
-} {}
-
-test basic-10.1 {DeleteInterpProc, destroys interp's global namespace} {
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        namespace eval test_ns_basic {
-            namespace export p
-            proc p {} {
-                return [namespace current]
-            }
-        }
-        namespace eval test_ns_2 {
-            namespace import ::test_ns_basic::p
-            variable v 27
-            proc q {} {
-                variable v
-                return "[p] $v"
-            }
-        }
-    }
-    list [interp eval test_interp {test_ns_2::q}] \
-         [interp eval test_interp {namespace delete ::}] \
-         [catch {interp eval test_interp {set a 123}} msg] $msg \
-         [interp delete test_interp]
-} {{::test_ns_basic 27} {} 1 {invalid command name "set"} {}}
-
-test basic-11.1 {HiddenCmdsDeleteProc, invalidate cached refs to deleted hidden cmd} {
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        proc p {} {
-            return 27
-        }
-    }
-    interp alias {} localP test_interp p
-    list [interp eval test_interp {p}] \
-         [localP] \
-         [test_interp hide p] \
-         [catch {localP} msg] $msg \
-         [interp delete test_interp] \
-         [catch {localP} msg] $msg
-} {27 27 {} 1 {invalid command name "p"} {} 1 {invalid command name "localP"}}
-
-# NB: More tests about hide/expose are found in interp.test
-
-test basic-12.1 {Tcl_HideCommand, names of hidden cmds can't have namespace qualifiers} {
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        namespace eval test_ns_basic {
-            proc p {} {
-                return [namespace current]
-            }
-        }
-    }
-    list [catch {test_interp hide test_ns_basic::p x} msg] $msg \
-	 [catch {test_interp hide x test_ns_basic::p} msg1] $msg1 \
-         [interp delete test_interp]
-} {1 {can only hide global namespace commands (use rename then hide)} 1 {cannot use namespace qualifiers as hidden commandtoken (rename)} {}}
-
-test basic-12.2 {Tcl_HideCommand, a hidden cmd remembers its containing namespace} {
-    catch {namespace delete test_ns_basic}
-    catch {rename cmd ""}
-    proc cmd {} {   ;# note that this is global
-        return [namespace current]
-    }
-    namespace eval test_ns_basic {
-        proc hideCmd {} {
-            interp hide {} cmd
-        }
-        proc exposeCmd {} {
-            interp expose {} cmd
-        }
-        proc callCmd {} {
-            cmd
-        }
-    }
-    list [test_ns_basic::callCmd] \
-         [test_ns_basic::hideCmd] \
-         [catch {cmd} msg] $msg \
-         [test_ns_basic::exposeCmd] \
-         [test_ns_basic::callCmd] \
-         [namespace delete test_ns_basic]
-} {:: {} 1 {invalid command name "cmd"} {} :: {}}
-
-test basic-13.1 {Tcl_ExposeCommand, a command stays in the global namespace and can not go to another namespace} {
-    catch {namespace delete test_ns_basic}
-    catch {rename cmd ""}
-    proc cmd {} {   ;# note that this is global
-        return [namespace current]
-    }
-    namespace eval test_ns_basic {
-        proc hideCmd {} {
-            interp hide {} cmd
-        }
-        proc exposeCmdFailing {} {
-            interp expose {} cmd ::test_ns_basic::newCmd
-        }
-        proc exposeCmdWorkAround {} {
-            interp expose {} cmd;
-	    rename cmd ::test_ns_basic::newCmd;
-        }
-        proc callCmd {} {
-            cmd
-        }
-    }
-    list [test_ns_basic::callCmd] \
-         [test_ns_basic::hideCmd] \
-         [catch {test_ns_basic::exposeCmdFailing} msg] $msg \
-         [test_ns_basic::exposeCmdWorkAround] \
-         [test_ns_basic::newCmd] \
-         [namespace delete test_ns_basic]
-} {:: {} 1 {can not expose to a namespace (use expose to toplevel, then rename)} {} ::test_ns_basic {}}
-test basic-13.2 {Tcl_ExposeCommand, invalidate cached refs to cmd now being exposed} {
-    catch {rename p ""}
-    catch {rename cmd ""}
-    proc p {} {
-        cmd
-    }
-    proc cmd {} {
-        return 42
-    }
-    list [p] \
-         [interp hide {} cmd] \
-         [proc cmd {} {return Hello}] \
-         [cmd] \
-         [rename cmd ""] \
-         [interp expose {} cmd] \
-         [p]
-} {42 {} {} Hello {} {} 42}
-
-if {[info commands testcreatecommand] == ""} {
-    puts "This application hasn't been compiled with the testcreatecommand"
-    puts "command.  Skipping affected tests."
-} else {
-test basic-14.1 {Tcl_CreateCommand, new cmd goes into a namespace specified in its name, if any} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [testcreatecommand create] \
-	 [test_ns_basic::createdcommand] \
-	 [testcreatecommand delete]
-} {{} {CreatedCommandProc in ::test_ns_basic} {}}
-test basic-14.2 {Tcl_CreateCommand, namespace code ignore single ":"s in middle or end of names} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename value:at: ""}
-    list [testcreatecommand create2] \
-	 [value:at:] \
-	 [testcreatecommand delete2]
-} {{} {CreatedCommandProc2 in ::} {}}
-}
-
-test basic-15.1 {Tcl_CreateObjCommand, new cmd goes into a namespace specified in its name, if any} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_basic {}
-    proc test_ns_basic::cmd {} {  ;# proc requires that ns already exist
-        return [namespace current]
-    }
-    list [test_ns_basic::cmd] \
-         [namespace delete test_ns_basic]
-} {::test_ns_basic {}}
-
-test basic-16.1 {TclInvokeStringCommand} {emptyTest} {
-} {}
-
-test basic-17.1 {TclInvokeObjCommand} {emptyTest} {
-} {}
-
-test basic-18.1 {TclRenameCommand, name of existing cmd can have namespace qualifiers} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename cmd ""}
-    namespace eval test_ns_basic {
-        proc p {} {
-            return "p in [namespace current]"
-        }
-    }
-    list [test_ns_basic::p] \
-         [rename test_ns_basic::p test_ns_basic::q] \
-         [test_ns_basic::q] 
-} {{p in ::test_ns_basic} {} {p in ::test_ns_basic}}
-test basic-18.2 {TclRenameCommand, existing cmd must be found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {rename test_ns_basic::p test_ns_basic::q} msg] $msg
-} {1 {can't rename "test_ns_basic::p": command doesn't exist}}
-test basic-18.3 {TclRenameCommand, delete cmd if new name is empty} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_basic {
-        proc p {} {
-            return "p in [namespace current]"
-        }
-    }
-    list [info commands test_ns_basic::*] \
-         [rename test_ns_basic::p ""] \
-         [info commands test_ns_basic::*]
-} {::test_ns_basic::p {} {}}
-test basic-18.4 {TclRenameCommand, bad new name} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_basic {
-        proc p {} {
-            return "p in [namespace current]"
-        }
-    }
-    rename test_ns_basic::p :::george::martha
-} {}
-test basic-18.5 {TclRenameCommand, new name must not already exist} {
-    namespace eval test_ns_basic {
-        proc q {} {
-            return 42
-        }
-    }
-    list [catch {rename test_ns_basic::q :::george::martha} msg] $msg
-} {1 {can't rename to ":::george::martha": command already exists}}
-test basic-18.6 {TclRenameCommand, check for command shadowing by newly renamed cmd} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    catch {rename q ""}
-    proc p {} {
-        return "p in [namespace current]"
-    }
-    proc q {} {
-        return "q in [namespace current]"
-    }
-    namespace eval test_ns_basic {
-        proc callP {} {
-            p
-        }
-    }
-    list [test_ns_basic::callP] \
-         [rename q test_ns_basic::p] \
-         [test_ns_basic::callP]
-} {{p in ::} {} {q in ::test_ns_basic}}
-
-test basic-19.1 {Tcl_SetCommandInfo} {emptyTest} {
-} {}
-
-if {[info commands testcmdtoken] == {}} {
-    puts "This application hasn't been compiled with the \"testcmdtoken\""
-    puts "command, so I can't test Tcl_GetCommandInfo."
-} else {
-test basic-20.1 {Tcl_GetCommandInfo, names for commands created inside namespaces} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    catch {rename q ""}
-    catch {unset x}
-    set x [namespace eval test_ns_basic::test_ns_basic2 {
-        # the following creates a cmd in the global namespace
-        testcmdtoken create p
-    }]
-    list [testcmdtoken name $x] \
-         [rename ::p q] \
-         [testcmdtoken name $x]
-} {{p ::p} {} {q ::q}}
-test basic-20.2 {Tcl_GetCommandInfo, names for commands created outside namespaces} {
-    catch {rename q ""}
-    set x [testcmdtoken create test_ns_basic::test_ns_basic2::p]
-    list [testcmdtoken name $x] \
-         [rename test_ns_basic::test_ns_basic2::p q] \
-         [testcmdtoken name $x]
-} {{p ::test_ns_basic::test_ns_basic2::p} {} {q ::q}}
-}
-
-test basic-21.1 {Tcl_GetCommandName} {emptyTest} {
-} {}
-
-test basic-22.1 {Tcl_GetCommandFullName} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_basic1 {
-        namespace export cmd*
-        proc cmd1 {} {}
-        proc cmd2 {} {}
-    }
-    namespace eval test_ns_basic2 {
-        namespace export *
-        namespace import ::test_ns_basic1::*
-        proc p {} {}
-    }
-    namespace eval test_ns_basic3 {
-        namespace import ::test_ns_basic2::*
-        proc q {} {}
-        list [namespace which -command foreach] \
-             [namespace which -command q] \
-             [namespace which -command p] \
-             [namespace which -command cmd1] \
-             [namespace which -command ::test_ns_basic2::cmd2]
-    }
-} {::foreach ::test_ns_basic3::q ::test_ns_basic3::p ::test_ns_basic3::cmd1 ::test_ns_basic2::cmd2}
-
-test basic-23.1 {Tcl_DeleteCommand} {emptyTest} {
-} {}
-
-test basic-24.1 {Tcl_DeleteCommandFromToken, invalidate all compiled code if cmd has compile proc} {
-    catch {interp delete test_interp}
-    catch {unset x}
-    interp create test_interp
-    interp eval test_interp {
-        proc useSet {} {
-            return [set a 123]
-        }
-    }
-    set x [interp eval test_interp {useSet}]
-    interp eval test_interp {
-        rename set ""
-        proc set {args} {
-            return "set called with $args"
-        }
-    }
-    list $x \
-         [interp eval test_interp {useSet}] \
-         [interp delete test_interp]
-} {123 {set called with a 123} {}}
-test basic-24.2 {Tcl_DeleteCommandFromToken, deleting commands changes command epoch} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    proc p {} {
-        return "global p"
-    }
-    namespace eval test_ns_basic {
-        proc p {} {
-            return "namespace p"
-        }
-        proc callP {} {
-            p
-        }
-    }
-    list [test_ns_basic::callP] \
-         [rename test_ns_basic::p ""] \
-         [test_ns_basic::callP]
-} {{namespace p} {} {global p}}
-test basic-24.3 {Tcl_DeleteCommandFromToken, delete imported cmds that refer to a deleted cmd} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    namespace eval test_ns_basic {
-        namespace export p
-        proc p {} {return 42}
-    }
-    namespace eval test_ns_basic2 {
-        namespace import ::test_ns_basic::*
-        proc callP {} {
-            p
-        }
-    }
-    list [test_ns_basic2::callP] \
-         [info commands test_ns_basic2::*] \
-         [rename test_ns_basic::p ""] \
-         [catch {test_ns_basic2::callP} msg] $msg \
-         [info commands test_ns_basic2::*]
-} {42 {::test_ns_basic2::callP ::test_ns_basic2::p} {} 1 {invalid command name "p"} ::test_ns_basic2::callP}
-
-test basic-25.1 {TclCleanupCommand} {emptyTest} {
-} {}
-
-test basic-26.1 {Tcl_EvalObj: preserve object while evaling it} {
-    # If object isn't preserved, errorInfo would be set to
-    # "foo\n    while executing\n\"garbage bytes\"" because the object's
-    # string would have been freed, leaving garbage bytes for the error
-    # message.
-
-    proc bgerror {args} {set ::x $::errorInfo}
-    set f [open test1 w]
-    fileevent $f writable "fileevent $f writable {}; error foo"
-    set x {}
-    vwait x
-    close $f
-    file delete test1
-    rename bgerror {}
-    set x
-} "foo\n    while executing\n\"error foo\""
-
-test basic-27.1 {Tcl_ExprLong} {emptyTest} {
-} {}
-
-test basic-28.1 {Tcl_ExprDouble} {emptyTest} {
-} {}
-
-test basic-29.1 {Tcl_ExprBoolean} {emptyTest} {
-} {}
-
-test basic-30.1 {Tcl_ExprLongObj} {emptyTest} {
-} {}
-
-test basic-31.1 {Tcl_ExprDoubleObj} {emptyTest} {
-} {}
-
-test basic-32.1 {Tcl_ExprBooleanObj} {emptyTest} {
-} {}
-
-test basic-33.1 {TclInvoke} {emptyTest} {
-} {}
-
-test basic-34.1 {TclGlobalInvoke} {emptyTest} {
-} {}
-
-test basic-35.1 {TclObjInvokeGlobal} {emptyTest} {
-} {}
-
-test basic-36.1 {TclObjInvoke, lookup of "unknown" command} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        proc unknown {args} {
-            return "global unknown"
-        }
-        namespace eval test_ns_basic {
-            proc unknown {args} {
-                return "namespace unknown"
-            }
-        }
-    }
-    list [interp alias test_interp newAlias test_interp doesntExist] \
-         [catch {interp eval test_interp {newAlias}} msg] $msg \
-         [interp delete test_interp]
-} {newAlias 0 {global unknown} {}}
-
-test basic-37.1 {Tcl_ExprString: see expr.test} {emptyTest} {
-} {}
-
-test basic-38.1 {Tcl_ExprObj} {emptyTest} {
-} {}
-
-if {[info commands testcmdtrace] == {}} {
-    puts "This application hasn't been compiled with the \"testcmdtrace\""
-    puts "command, so I can't test Tcl_CreateTrace."
-} else {
-test basic-39.1 {Tcl_CreateTrace, correct command and argc/argv arguments of trace proc} {
-    testcmdtrace tracetest {set stuff [expr 14 + 16]}
-} {{expr 14 + 16} {expr 14 + 16} {set stuff [expr 14 + 16]} {set stuff 30}}
-test basic-39.2 {Tcl_CreateTrace, correct command and argc/argv arguments of trace proc} {
-    testcmdtrace tracetest {set stuff [info tclversion]}
-} {{info tclversion} {info tclversion} {set stuff [info tclversion]} {set stuff 8.1}}
-test basic-39.3 {Tcl_CreateTrace, correct command and argc/argv arguments of trace proc} {
-    testcmdtrace deletetest {set stuff [info tclversion]}
-} 8.1
-}
-
-test basic-40.1 {Tcl_DeleteTrace} {emptyTest} {
-} {}
-
-test basic-41.1 {Tcl_AddErrorInfo} {emptyTest} {
-} {}
-
-test basic-42.1 {Tcl_AddObjErrorInfo} {emptyTest} {
-} {}
-
-test basic-43.1 {Tcl_VarEval} {emptyTest} {
-} {}
-
-test basic-44.1 {Tcl_GlobalEval} {emptyTest} {
-} {}
-
-test basic-45.1 {Tcl_SetRecursionLimit: see interp.test} {emptyTest} {
-} {}
-
-test basic-46.1 {Tcl_AllowExceptions} {emptyTest} {
-} {}
-
-# cleanup
-catch {eval namespace delete [namespace children :: test_ns_*]}
-catch {namespace delete george}
-catch {interp delete test_interp}
-catch {rename p ""}
-catch {rename q ""}
-catch {rename cmd ""}
-catch {rename value:at: ""}
-catch {unset x}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/binary.test b/tests/binary.test
deleted file mode 100644
index 1399edd..0000000
--- a/tests/binary.test
+++ /dev/null
@@ -1,1462 +0,0 @@
-# This file tests the tclBinary.c file and the "binary" Tcl command. 
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: binary.test,v 1.3 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test binary-1.1 {Tcl_BinaryObjCmd: bad args} {
-    list [catch {binary} msg] $msg
-} {1 {wrong # args: should be "binary option ?arg arg ...?"}}
-test binary-1.2 {Tcl_BinaryObjCmd: bad args} {
-    list [catch {binary foo} msg] $msg
-} {1 {bad option "foo": must be format or scan}}
-
-test binary-1.3 {Tcl_BinaryObjCmd: format error} {
-    list [catch {binary f} msg] $msg
-} {1 {wrong # args: should be "binary format formatString ?arg arg ...?"}}
-test binary-1.4 {Tcl_BinaryObjCmd: format} {
-    binary format ""
-} {}
-
-
-
-test binary-2.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format a } msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-2.2 {Tcl_BinaryObjCmd: format} {
-    binary format a0 foo
-} {}
-test binary-2.3 {Tcl_BinaryObjCmd: format} {
-    binary format a f
-} {f}
-test binary-2.4 {Tcl_BinaryObjCmd: format} {
-    binary format a foo
-} {f}
-test binary-2.5 {Tcl_BinaryObjCmd: format} {
-    binary format a3 foo
-} {foo}
-test binary-2.6 {Tcl_BinaryObjCmd: format} {
-    binary format a5 foo
-} foo\x00\x00
-test binary-2.7 {Tcl_BinaryObjCmd: format} {
-    binary format a*a3 foobarbaz blat
-} foobarbazbla
-test binary-2.8 {Tcl_BinaryObjCmd: format} {
-    binary format a*X3a2 foobar x
-} foox\x00r
-
-test binary-3.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format A} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-3.2 {Tcl_BinaryObjCmd: format} {
-    binary format A0 f
-} {}
-test binary-3.3 {Tcl_BinaryObjCmd: format} {
-    binary format A f
-} {f}
-test binary-3.4 {Tcl_BinaryObjCmd: format} {
-    binary format A foo
-} {f}
-test binary-3.5 {Tcl_BinaryObjCmd: format} {
-    binary format A3 foo
-} {foo}
-test binary-3.6 {Tcl_BinaryObjCmd: format} {
-    binary format A5 foo
-} {foo  }
-test binary-3.7 {Tcl_BinaryObjCmd: format} {
-    binary format A*A3 foobarbaz blat
-} foobarbazbla
-test binary-3.8 {Tcl_BinaryObjCmd: format} {
-    binary format A*X3A2 foobar x
-} {foox r}
-
-test binary-4.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format B} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-4.2 {Tcl_BinaryObjCmd: format} {
-    binary format B0 1
-} {}
-test binary-4.3 {Tcl_BinaryObjCmd: format} {
-    binary format B 1
-} \x80
-test binary-4.4 {Tcl_BinaryObjCmd: format} {
-    binary format B* 010011
-} \x4c
-test binary-4.5 {Tcl_BinaryObjCmd: format} {
-    binary format B8 01001101
-} \x4d
-test binary-4.6 {Tcl_BinaryObjCmd: format} {
-    binary format A2X2B9 oo 01001101
-} \x4d\x00
-test binary-4.7 {Tcl_BinaryObjCmd: format} {
-    binary format B9 010011011010
-} \x4d\x80
-test binary-4.8 {Tcl_BinaryObjCmd: format} {
-    binary format B2B3 10 010
-} \x80\x40
-test binary-4.9 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format B1B5 1 foo} msg] $msg
-} {1 {expected binary string but got "foo" instead}}
-
-test binary-5.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format b} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-5.2 {Tcl_BinaryObjCmd: format} {
-    binary format b0 1
-} {}
-test binary-5.3 {Tcl_BinaryObjCmd: format} {
-    binary format b 1
-} \x01
-test binary-5.4 {Tcl_BinaryObjCmd: format} {
-    binary format b* 010011
-} 2
-test binary-5.5 {Tcl_BinaryObjCmd: format} {
-    binary format b8 01001101
-} \xb2
-test binary-5.6 {Tcl_BinaryObjCmd: format} {
-    binary format A2X2b9 oo 01001101
-} \xb2\x00
-test binary-5.7 {Tcl_BinaryObjCmd: format} {
-    binary format b9 010011011010
-} \xb2\x01
-test binary-5.8 {Tcl_BinaryObjCmd: format} {
-    binary format b17 1
-} \x01\00\00
-test binary-5.9 {Tcl_BinaryObjCmd: format} {
-    binary format b2b3 10 010
-} \x01\x02
-test binary-5.10 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format b1b5 1 foo} msg] $msg
-} {1 {expected binary string but got "foo" instead}}
-
-test binary-6.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format h} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-6.2 {Tcl_BinaryObjCmd: format} {
-    binary format h0 1
-} {}
-test binary-6.3 {Tcl_BinaryObjCmd: format} {
-    binary format h 1
-} \x01
-test binary-6.4 {Tcl_BinaryObjCmd: format} {
-    binary format h c
-} \x0c
-test binary-6.5 {Tcl_BinaryObjCmd: format} {
-    binary format h* baadf00d
-} \xab\xda\x0f\xd0
-test binary-6.6 {Tcl_BinaryObjCmd: format} {
-    binary format h4 c410
-} \x4c\x01
-test binary-6.7 {Tcl_BinaryObjCmd: format} {
-    binary format h6 c4102
-} \x4c\x01\x02
-test binary-6.8 {Tcl_BinaryObjCmd: format} {
-    binary format h5 c41020304
-} \x4c\x01\x02
-test binary-6.9 {Tcl_BinaryObjCmd: format} {
-    binary format a3X3h5 foo 2
-} \x02\x00\x00
-test binary-6.10 {Tcl_BinaryObjCmd: format} {
-    binary format h2h3 23 456
-} \x32\x54\x06
-test binary-6.11 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format h2 foo} msg] $msg
-} {1 {expected hexadecimal string but got "foo" instead}}
-
-test binary-7.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format H} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-7.2 {Tcl_BinaryObjCmd: format} {
-    binary format H0 1
-} {}
-test binary-7.3 {Tcl_BinaryObjCmd: format} {
-    binary format H 1
-} \x10
-test binary-7.4 {Tcl_BinaryObjCmd: format} {
-    binary format H c
-} \xc0
-test binary-7.5 {Tcl_BinaryObjCmd: format} {
-    binary format H* baadf00d
-} \xba\xad\xf0\x0d
-test binary-7.6 {Tcl_BinaryObjCmd: format} {
-    binary format H4 c410
-} \xc4\x10
-test binary-7.7 {Tcl_BinaryObjCmd: format} {
-    binary format H6 c4102
-} \xc4\x10\x20
-test binary-7.8 {Tcl_BinaryObjCmd: format} {
-    binary format H5 c41023304
-} \xc4\x10\x20
-test binary-7.9 {Tcl_BinaryObjCmd: format} {
-    binary format a3X3H5 foo 2
-} \x20\x00\x00
-test binary-7.10 {Tcl_BinaryObjCmd: format} {
-    binary format H2H3 23 456
-} \x23\x45\x60
-test binary-7.11 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format H2 foo} msg] $msg
-} {1 {expected hexadecimal string but got "foo" instead}}
-
-test binary-8.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format c} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-8.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format c blat} msg] $msg
-} {1 {expected integer but got "blat"}}
-test binary-8.3 {Tcl_BinaryObjCmd: format} {
-    binary format c0 0x50
-} {}
-test binary-8.4 {Tcl_BinaryObjCmd: format} {
-    binary format c 0x50
-} P
-test binary-8.5 {Tcl_BinaryObjCmd: format} {
-    binary format c 0x5052
-} R
-test binary-8.6 {Tcl_BinaryObjCmd: format} {
-    binary format c2 {0x50 0x52}
-} PR
-test binary-8.7 {Tcl_BinaryObjCmd: format} {
-    binary format c2 {0x50 0x52 0x53}
-} PR
-test binary-8.8 {Tcl_BinaryObjCmd: format} {
-    binary format c* {0x50 0x52}
-} PR
-test binary-8.9 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format c2 {0x50}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-8.10 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    list [catch {binary format c $a} msg] $msg
-} [list 1 "expected integer but got \"0x50 0x51\""]
-test binary-8.11 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    binary format c1 $a
-} P
-
-test binary-9.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format s} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-9.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format s blat} msg] $msg
-} {1 {expected integer but got "blat"}}
-test binary-9.3 {Tcl_BinaryObjCmd: format} {
-    binary format s0 0x50
-} {}
-test binary-9.4 {Tcl_BinaryObjCmd: format} {
-    binary format s 0x50
-} P\x00
-test binary-9.5 {Tcl_BinaryObjCmd: format} {
-    binary format s 0x5052
-} RP
-test binary-9.6 {Tcl_BinaryObjCmd: format} {
-    binary format s 0x505251 0x53
-} QR
-test binary-9.7 {Tcl_BinaryObjCmd: format} {
-    binary format s2 {0x50 0x52}
-} P\x00R\x00
-test binary-9.8 {Tcl_BinaryObjCmd: format} {
-    binary format s* {0x5051 0x52}
-} QPR\x00
-test binary-9.9 {Tcl_BinaryObjCmd: format} {
-    binary format s2 {0x50 0x52 0x53} 0x54
-} P\x00R\x00
-test binary-9.10 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format s2 {0x50}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-9.11 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    list [catch {binary format s $a} msg] $msg
-} [list 1 "expected integer but got \"0x50 0x51\""]
-test binary-9.12 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    binary format s1 $a
-} P\x00
-
-test binary-10.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format S} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-10.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format S blat} msg] $msg
-} {1 {expected integer but got "blat"}}
-test binary-10.3 {Tcl_BinaryObjCmd: format} {
-    binary format S0 0x50
-} {}
-test binary-10.4 {Tcl_BinaryObjCmd: format} {
-    binary format S 0x50
-} \x00P
-test binary-10.5 {Tcl_BinaryObjCmd: format} {
-    binary format S 0x5052
-} PR
-test binary-10.6 {Tcl_BinaryObjCmd: format} {
-    binary format S 0x505251 0x53
-} RQ
-test binary-10.7 {Tcl_BinaryObjCmd: format} {
-    binary format S2 {0x50 0x52}
-} \x00P\x00R
-test binary-10.8 {Tcl_BinaryObjCmd: format} {
-    binary format S* {0x5051 0x52}
-} PQ\x00R
-test binary-10.9 {Tcl_BinaryObjCmd: format} {
-    binary format S2 {0x50 0x52 0x53} 0x54
-} \x00P\x00R
-test binary-10.10 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format S2 {0x50}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-10.11 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    list [catch {binary format S $a} msg] $msg
-} [list 1 "expected integer but got \"0x50 0x51\""]
-test binary-10.12 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    binary format S1 $a
-} \x00P
-
-test binary-11.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format i} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-11.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format i blat} msg] $msg
-} {1 {expected integer but got "blat"}}
-test binary-11.3 {Tcl_BinaryObjCmd: format} {
-    binary format i0 0x50
-} {}
-test binary-11.4 {Tcl_BinaryObjCmd: format} {
-    binary format i 0x50
-} P\x00\x00\x00
-test binary-11.5 {Tcl_BinaryObjCmd: format} {
-    binary format i 0x5052
-} RP\x00\x00
-test binary-11.6 {Tcl_BinaryObjCmd: format} {
-    binary format i 0x505251 0x53
-} QRP\x00
-test binary-11.7 {Tcl_BinaryObjCmd: format} {
-    binary format i1 {0x505251 0x53}
-} QRP\x00
-test binary-11.8 {Tcl_BinaryObjCmd: format} {
-    binary format i 0x53525150
-} PQRS
-test binary-11.9 {Tcl_BinaryObjCmd: format} {
-    binary format i2 {0x50 0x52}
-} P\x00\x00\x00R\x00\x00\x00
-test binary-11.10 {Tcl_BinaryObjCmd: format} {
-    binary format i* {0x50515253 0x52}
-} SRQPR\x00\x00\x00
-test binary-11.11 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format i2 {0x50}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-11.12 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    list [catch {binary format i $a} msg] $msg
-} [list 1 "expected integer but got \"0x50 0x51\""]
-test binary-11.13 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    binary format i1 $a
-} P\x00\x00\x00
-
-test binary-12.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format I} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-12.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format I blat} msg] $msg
-} {1 {expected integer but got "blat"}}
-test binary-12.3 {Tcl_BinaryObjCmd: format} {
-    binary format I0 0x50
-} {}
-test binary-12.4 {Tcl_BinaryObjCmd: format} {
-    binary format I 0x50
-} \x00\x00\x00P
-test binary-12.5 {Tcl_BinaryObjCmd: format} {
-    binary format I 0x5052
-} \x00\x00PR
-test binary-12.6 {Tcl_BinaryObjCmd: format} {
-    binary format I 0x505251 0x53
-} \x00PRQ
-test binary-12.7 {Tcl_BinaryObjCmd: format} {
-    binary format I1 {0x505251 0x53}
-} \x00PRQ
-test binary-12.8 {Tcl_BinaryObjCmd: format} {
-    binary format I 0x53525150
-} SRQP
-test binary-12.9 {Tcl_BinaryObjCmd: format} {
-    binary format I2 {0x50 0x52}
-} \x00\x00\x00P\x00\x00\x00R
-test binary-12.10 {Tcl_BinaryObjCmd: format} {
-    binary format I* {0x50515253 0x52}
-} PQRS\x00\x00\x00R
-test binary-12.11 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format i2 {0x50}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-12.12 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    list [catch {binary format I $a} msg] $msg
-} [list 1 "expected integer but got \"0x50 0x51\""]
-test binary-12.13 {Tcl_BinaryObjCmd: format} {
-    set a {0x50 0x51}
-    binary format I1 $a
-} \x00\x00\x00P
-
-test binary-13.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format f} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-13.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format f blat} msg] $msg
-} {1 {expected floating-point number but got "blat"}}
-test binary-13.3 {Tcl_BinaryObjCmd: format} {
-    binary format f0 1.6
-} {}
-test binary-13.4 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format f 1.6
-} \x3f\xcc\xcc\xcd
-test binary-13.5 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format f 1.6
-} \xcd\xcc\xcc\x3f
-test binary-13.6 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format f* {1.6 3.4}
-} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
-test binary-13.7 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format f* {1.6 3.4}
-} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.8 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format f2 {1.6 3.4}
-} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
-test binary-13.9 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format f2 {1.6 3.4}
-} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.10 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format f2 {1.6 3.4 5.6}
-} \x3f\xcc\xcc\xcd\x40\x59\x99\x9a
-test binary-13.11 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format f2 {1.6 3.4 5.6}
-} \xcd\xcc\xcc\x3f\x9a\x99\x59\x40
-test binary-13.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable macOrUnix} {
-    binary format f -3.402825e+38
-} \xff\x7f\xff\xff
-test binary-13.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable pcOnly} {
-    binary format f -3.402825e+38
-} \xff\xff\x7f\xff
-test binary-13.14 {Tcl_BinaryObjCmd: float underflow} {nonPortable macOrUnix} {
-    binary format f -3.402825e-100
-} \x80\x00\x00\x00
-test binary-13.15 {Tcl_BinaryObjCmd: float underflow} {nonPortable pcOnly} {
-    binary format f -3.402825e-100
-} \x00\x00\x00\x80
-test binary-13.16 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format f2 {1.6}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-13.17 {Tcl_BinaryObjCmd: format} {
-    set a {1.6 3.4}
-    list [catch {binary format f $a} msg] $msg
-} [list 1 "expected floating-point number but got \"1.6 3.4\""]
-test binary-13.18 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    set a {1.6 3.4}
-    binary format f1 $a
-} \x3f\xcc\xcc\xcd
-test binary-13.19 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    set a {1.6 3.4}
-    binary format f1 $a
-} \xcd\xcc\xcc\x3f
-
-test binary-14.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format d} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-14.2 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format d blat} msg] $msg
-} {1 {expected floating-point number but got "blat"}}
-test binary-14.3 {Tcl_BinaryObjCmd: format} {
-    binary format d0 1.6
-} {}
-test binary-14.4 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format d 1.6
-} \x3f\xf9\x99\x99\x99\x99\x99\x9a
-test binary-14.5 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format d 1.6
-} \x9a\x99\x99\x99\x99\x99\xf9\x3f
-test binary-14.6 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format d* {1.6 3.4}
-} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
-test binary-14.7 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format d* {1.6 3.4}
-} \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40
-test binary-14.8 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format d2 {1.6 3.4}
-} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
-test binary-14.9 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format d2 {1.6 3.4}
-} \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40
-test binary-14.10 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    binary format d2 {1.6 3.4 5.6}
-} \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33
-test binary-14.11 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    binary format d2 {1.6 3.4 5.6}
-} \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40
-test binary-14.12 {Tcl_BinaryObjCmd: float overflow} {nonPortable unixOnly} {
-    binary format d NaN
-} \x7f\xff\xff\xff\xff\xff\xff\xff
-test binary-14.13 {Tcl_BinaryObjCmd: float overflow} {nonPortable macOnly} {
-    binary format d NaN
-} \x7f\xf8\x02\xa0\x00\x00\x00\x00
-test binary-14.14 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format d2 {1.6}} msg] $msg
-} {1 {number of elements in list does not match count}}
-test binary-14.15 {Tcl_BinaryObjCmd: format} {
-    set a {1.6 3.4}
-    list [catch {binary format d $a} msg] $msg
-} [list 1 "expected floating-point number but got \"1.6 3.4\""]
-test binary-14.16 {Tcl_BinaryObjCmd: format} {nonPortable macOrUnix} {
-    set a {1.6 3.4}
-    binary format d1 $a
-} \x3f\xf9\x99\x99\x99\x99\x99\x9a
-test binary-14.17 {Tcl_BinaryObjCmd: format} {nonPortable pcOnly} {
-    set a {1.6 3.4}
-    binary format d1 $a
-} \x9a\x99\x99\x99\x99\x99\xf9\x3f
-
-test binary-15.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format ax*a "y" "z"} msg] $msg
-} {1 {cannot use "*" in format string with "x"}}
-test binary-15.2 {Tcl_BinaryObjCmd: format} {
-    binary format axa "y" "z"
-} y\x00z
-test binary-15.3 {Tcl_BinaryObjCmd: format} {
-    binary format ax3a "y" "z"
-} y\x00\x00\x00z
-test binary-15.4 {Tcl_BinaryObjCmd: format} {
-    binary format a*X3x3a* "foo" "z"
-} \x00\x00\x00z
-
-test binary-16.1 {Tcl_BinaryObjCmd: format} {
-    binary format a*X*a "foo" "z"
-} zoo
-test binary-16.2 {Tcl_BinaryObjCmd: format} {
-    binary format aX3a "y" "z"
-} z
-test binary-16.3 {Tcl_BinaryObjCmd: format} {
-    binary format a*Xa* "foo" "zy"
-} fozy
-test binary-16.4 {Tcl_BinaryObjCmd: format} {
-    binary format a*X3a "foobar" "z"
-} foozar
-test binary-16.5 {Tcl_BinaryObjCmd: format} {
-    binary format a*X3aX2a "foobar" "z" "b"
-} fobzar
-
-test binary-17.1 {Tcl_BinaryObjCmd: format} {
-    binary format @1
-} \x00
-test binary-17.2 {Tcl_BinaryObjCmd: format} {
-    binary format @5a2 "ab"
-} \x00\x00\x00\x00\x00\x61\x62
-test binary-17.3 {Tcl_BinaryObjCmd: format} {
-    binary format {a*  @0  a2 @* a*} "foobar" "ab" "blat"
-} abobarblat
-
-test binary-18.1 {Tcl_BinaryObjCmd: format} {
-    list [catch {binary format u0a3 abc abd} msg] $msg
-} {1 {bad field specifier "u"}}
-
-
-test binary-19.1 {Tcl_BinaryObjCmd: errors} {
-    list [catch {binary s} msg] $msg
-} {1 {wrong # args: should be "binary scan value formatString ?varName varName ...?"}}
-test binary-19.2 {Tcl_BinaryObjCmd: errors} {
-    list [catch {binary scan foo} msg] $msg
-} {1 {wrong # args: should be "binary scan value formatString ?varName varName ...?"}}
-test binary-19.3 {Tcl_BinaryObjCmd: scan} {
-    binary scan {} {}
-} 0
-
-test binary-20.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc a} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-20.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan abc a arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-20.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 abc
-    list [binary scan abc a0 arg1] $arg1
-} {1 {}}
-test binary-20.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc a* arg1] $arg1
-} {1 abc}
-test binary-20.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc a5 arg1] [info exist arg1]
-} {0 0}
-test binary-20.6 {Tcl_BinaryObjCmd: scan} {
-    set arg1 foo
-    list [binary scan abc a2 arg1] $arg1
-} {1 ab}
-test binary-20.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    list [binary scan abcdef a2a2 arg1 arg2] $arg1 $arg2
-} {2 ab cd}
-test binary-20.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc a2 arg1(a)] $arg1(a)
-} {1 ab}
-test binary-20.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc a arg1(a)] $arg1(a)
-} {1 a}
-
-test binary-21.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc A} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-21.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan abc A arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-21.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 abc
-    list [binary scan abc A0 arg1] $arg1
-} {1 {}}
-test binary-21.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc A* arg1] $arg1
-} {1 abc}
-test binary-21.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc A5 arg1] [info exist arg1]
-} {0 0}
-test binary-21.6 {Tcl_BinaryObjCmd: scan} {
-    set arg1 foo
-    list [binary scan abc A2 arg1] $arg1
-} {1 ab}
-test binary-21.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    list [binary scan abcdef A2A2 arg1 arg2] $arg1 $arg2
-} {2 ab cd}
-test binary-21.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc A2 arg1(a)] $arg1(a)
-} {1 ab}
-test binary-21.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc A2 arg1(a)] $arg1(a)
-} {1 ab}
-test binary-21.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc A arg1(a)] $arg1(a)
-} {1 a}
-test binary-21.11 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan "abc def \x00  " A* arg1] $arg1
-} {1 {abc def}}
-test binary-21.12 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan "abc def \x00ghi  " A* arg1] $arg1
-} [list 1 "abc def \x00ghi"]
-
-test binary-22.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc b} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-22.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 b* arg1] $arg1
-} {1 0100101011001010}
-test binary-22.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 b arg1] $arg1
-} {1 0}
-test binary-22.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 b1 arg1] $arg1
-} {1 0}
-test binary-22.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 b0 arg1] $arg1
-} {1 {}}
-test binary-22.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 b5 arg1] $arg1
-} {1 01001}
-test binary-22.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 b8 arg1] $arg1
-} {1 01001010}
-test binary-22.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 b14 arg1] $arg1
-} {1 01001010110010}
-test binary-22.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 b14 arg1] $arg1
-} {0 foo}
-test binary-22.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 b1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-22.11 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x07\x87\x05 b5b* arg1 arg2] $arg1 $arg2
-} {2 11100 1110000110100000}
-
-
-test binary-23.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc B} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-23.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 B* arg1] $arg1
-} {1 0101001001010011}
-test binary-23.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 B arg1] $arg1
-} {1 1}
-test binary-23.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 B1 arg1] $arg1
-} {1 1}
-test binary-23.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 B0 arg1] $arg1
-} {1 {}}
-test binary-23.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 B5 arg1] $arg1
-} {1 01010}
-test binary-23.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 B8 arg1] $arg1
-} {1 01010010}
-test binary-23.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 B14 arg1] $arg1
-} {1 01010010010100}
-test binary-23.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 B14 arg1] $arg1
-} {0 foo}
-test binary-23.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 B1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-23.11 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x70\x87\x05 B5B* arg1 arg2] $arg1 $arg2
-} {2 01110 1000011100000101}
-
-test binary-24.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc h} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-24.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 h* arg1] $arg1
-} {1 253a}
-test binary-24.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \xc2\xa3 h arg1] $arg1
-} {1 2}
-test binary-24.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 h1 arg1] $arg1
-} {1 2}
-test binary-24.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 h0 arg1] $arg1
-} {1 {}}
-test binary-24.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \xf2\x53 h2 arg1] $arg1
-} {1 2f}
-test binary-24.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 h3 arg1] $arg1
-} {1 253}
-test binary-24.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 h3 arg1] $arg1
-} {0 foo}
-test binary-24.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 h1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-24.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x70\x87\x05 h2h* arg1 arg2] $arg1 $arg2
-} {2 07 7850}
-
-test binary-25.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc H} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-25.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 H* arg1] $arg1
-} {1 52a3}
-test binary-25.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \xc2\xa3 H arg1] $arg1
-} {1 c}
-test binary-25.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x82\x53 H1 arg1] $arg1
-} {1 8}
-test binary-25.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 H0 arg1] $arg1
-} {1 {}}
-test binary-25.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \xf2\x53 H2 arg1] $arg1
-} {1 f2}
-test binary-25.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\x53 H3 arg1] $arg1
-} {1 525}
-test binary-25.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 H3 arg1] $arg1
-} {0 foo}
-test binary-25.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 H1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-25.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x70\x87\x05 H2H* arg1 arg2] $arg1 $arg2
-} {2 70 8705}
-
-test binary-26.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc c} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-26.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c* arg1] $arg1
-} {1 {82 -93}}
-test binary-26.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c arg1] $arg1
-} {1 82}
-test binary-26.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c1 arg1] $arg1
-} {1 82}
-test binary-26.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c0 arg1] $arg1
-} {1 {}}
-test binary-26.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c2 arg1] $arg1
-} {1 {82 -93}}
-test binary-26.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \xff c arg1] $arg1
-} {1 -1}
-test binary-26.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 c3 arg1] $arg1
-} {0 foo}
-test binary-26.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 c1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-26.10 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x70\x87\x05 c2c* arg1 arg2] $arg1 $arg2
-} {2 {112 -121} 5}
-
-test binary-27.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc s} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-27.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 s* arg1] $arg1
-} {1 {-23726 21587}}
-test binary-27.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 s arg1] $arg1
-} {1 -23726}
-test binary-27.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 s1 arg1] $arg1
-} {1 -23726}
-test binary-27.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 s0 arg1] $arg1
-} {1 {}}
-test binary-27.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 s2 arg1] $arg1
-} {1 {-23726 21587}}
-test binary-27.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 s1 arg1] $arg1
-} {0 foo}
-test binary-27.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 s1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-27.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x52\xa3\x53\x54\x05 s2c* arg1 arg2] $arg1 $arg2
-} {2 {-23726 21587} 5}
-
-test binary-28.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc S} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-28.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 S* arg1] $arg1
-} {1 {21155 21332}}
-test binary-28.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 S arg1] $arg1
-} {1 21155}
-test binary-28.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 S1 arg1] $arg1
-} {1 21155}
-test binary-28.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 S0 arg1] $arg1
-} {1 {}}
-test binary-28.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 S2 arg1] $arg1
-} {1 {21155 21332}}
-test binary-28.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 S1 arg1] $arg1
-} {0 foo}
-test binary-28.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53 S1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-28.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x52\xa3\x53\x54\x05 S2c* arg1 arg2] $arg1 $arg2
-} {2 {21155 21332} 5}
-
-test binary-29.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc i} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-29.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 i* arg1] $arg1
-} {1 {1414767442 67305985}}
-test binary-29.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 i arg1] $arg1
-} {1 1414767442}
-test binary-29.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 i1 arg1] $arg1
-} {1 1414767442}
-test binary-29.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53 i0 arg1] $arg1
-} {1 {}}
-test binary-29.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 i2 arg1] $arg1
-} {1 {1414767442 67305985}}
-test binary-29.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 i1 arg1] $arg1
-} {0 foo}
-test binary-29.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53\x53\x54 i1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-29.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04\x05 i2c* arg1 arg2] $arg1 $arg2
-} {2 {1414767442 67305985} 5}
-
-test binary-30.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc I} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-30.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 I* arg1] $arg1
-} {1 {1386435412 16909060}}
-test binary-30.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 I arg1] $arg1
-} {1 1386435412}
-test binary-30.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54 I1 arg1] $arg1
-} {1 1386435412}
-test binary-30.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53 I0 arg1] $arg1
-} {1 {}}
-test binary-30.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04 I2 arg1] $arg1
-} {1 {1386435412 16909060}}
-test binary-30.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 I1 arg1] $arg1
-} {0 foo}
-test binary-30.8 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x52\x53\x53\x54 I1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-30.9 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x52\xa3\x53\x54\x01\x02\x03\x04\x05 I2c* arg1 arg2] $arg1 $arg2
-} {2 {1386435412 16909060} 5}
-
-test binary-31.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc f} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-31.2 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f* arg1] $arg1
-} {1 {1.60000002384 3.40000009537}}
-test binary-31.3 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40 f* arg1] $arg1
-} {1 {1.60000002384 3.40000009537}}
-test binary-31.4 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f arg1] $arg1
-} {1 1.60000002384}
-test binary-31.5 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40 f arg1] $arg1
-} {1 1.60000002384}
-test binary-31.6 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xcc\xcc\xcd f1 arg1] $arg1
-} {1 1.60000002384}
-test binary-31.7 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \xcd\xcc\xcc\x3f f1 arg1] $arg1
-} {1 1.60000002384}
-test binary-31.8 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xcc\xcc\xcd f0 arg1] $arg1
-} {1 {}}
-test binary-31.9 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \xcd\xcc\xcc\x3f f0 arg1] $arg1
-} {1 {}}
-test binary-31.10 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a f2 arg1] $arg1
-} {1 {1.60000002384 3.40000009537}}
-test binary-31.11 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40 f2 arg1] $arg1
-} {1 {1.60000002384 3.40000009537}}
-test binary-31.12 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 f1 arg1] $arg1
-} {0 foo}
-test binary-31.13 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x3f\xcc\xcc\xcd f1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-31.14 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x3f\xcc\xcc\xcd\x40\x59\x99\x9a\x05 f2c* arg1 arg2] $arg1 $arg2
-} {2 {1.60000002384 3.40000009537} 5}
-test binary-31.15 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \xcd\xcc\xcc\x3f\x9a\x99\x59\x40\x05 f2c* arg1 arg2] $arg1 $arg2
-} {2 {1.60000002384 3.40000009537} 5}
-
-test binary-32.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abc d} msg] $msg
-} {1 {not enough arguments for all format specifiers}}
-test binary-32.2 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d* arg1] $arg1
-} {1 {1.6 3.4}}
-test binary-32.3 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40 d* arg1] $arg1
-} {1 {1.6 3.4}}
-test binary-32.4 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d arg1] $arg1
-} {1 1.6}
-test binary-32.5 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40 d arg1] $arg1
-} {1 1.6}
-test binary-32.6 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d1 arg1] $arg1
-} {1 1.6}
-test binary-32.7 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f d1 arg1] $arg1
-} {1 1.6}
-test binary-32.8 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d0 arg1] $arg1
-} {1 {}}
-test binary-32.9 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f d0 arg1] $arg1
-} {1 {}}
-test binary-32.10 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1}
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33 d2 arg1] $arg1
-} {1 {1.6 3.4}}
-test binary-32.11 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1}
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40 d2 arg1] $arg1
-} {1 {1.6 3.4}}
-test binary-32.12 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan \x52 d1 arg1] $arg1
-} {0 foo}
-test binary-32.13 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    set arg1 1
-    list [catch {binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a d1 arg1(a)} msg] $msg
-} {1 {can't set "arg1(a)": variable isn't array}}
-test binary-32.14 {Tcl_BinaryObjCmd: scan} {nonPortable macOrUnix} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x3f\xf9\x99\x99\x99\x99\x99\x9a\x40\x0b\x33\x33\x33\x33\x33\x33\x05 d2c* arg1 arg2] $arg1 $arg2
-} {2 {1.6 3.4} 5}
-test binary-32.15 {Tcl_BinaryObjCmd: scan} {nonPortable pcOnly} {
-    catch {unset arg1 arg2}
-    set arg1 foo
-    set arg2 bar
-    list [binary scan \x9a\x99\x99\x99\x99\x99\xf9\x3f\x33\x33\x33\x33\x33\x33\x0b\x40\x05 d2c* arg1 arg2] $arg1 $arg2
-} {2 {1.6 3.4} 5}
-
-test binary-33.1 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    list [binary scan abcdefg a2xa3 arg1 arg2] $arg1 $arg2
-} {2 ab def}
-test binary-33.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3x*a3 arg1 arg2] $arg1 $arg2
-} {1 abc foo}
-test binary-33.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3x20a3 arg1 arg2] $arg1 $arg2
-} {1 abc foo}
-test binary-33.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abc a3x20a3 arg1 arg2] $arg1 $arg2
-} {1 abc foo}
-test binary-33.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x1a1 arg1] $arg1
-} {1 b}
-test binary-33.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x5a1 arg1] $arg1
-} {1 f}
-test binary-33.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x0a1 arg1] $arg1
-} {1 a}
-
-test binary-34.1 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    list [binary scan abcdefg a2Xa3 arg1 arg2] $arg1 $arg2
-} {2 ab bcd}
-test binary-34.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3X*a3 arg1 arg2] $arg1 $arg2
-} {2 abc abc}
-test binary-34.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3X20a3 arg1 arg2] $arg1 $arg2
-} {2 abc abc}
-test binary-34.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abc X20a3 arg1] $arg1
-} {1 abc}
-test binary-34.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x*X1a1 arg1] $arg1
-} {1 f}
-test binary-34.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x*X5a1 arg1] $arg1
-} {1 b}
-test binary-34.7 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x3X0a1 arg1] $arg1
-} {1 d}
-
-test binary-35.1 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    list [catch {binary scan abcdefg a2@a3 arg1 arg2} msg] $msg
-} {1 {missing count for "@" field specifier}}
-test binary-35.2 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3@*a3 arg1 arg2] $arg1 $arg2
-} {1 abc foo}
-test binary-35.3 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    catch {unset arg2}
-    set arg2 foo
-    list [binary scan abcdefg a3@20a3 arg1 arg2] $arg1 $arg2
-} {1 abc foo}
-test binary-35.4 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef @2a3 arg1] $arg1
-} {1 cde}
-test binary-35.5 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x*@1a1 arg1] $arg1
-} {1 b}
-test binary-35.6 {Tcl_BinaryObjCmd: scan} {
-    catch {unset arg1}
-    list [binary scan abcdef x*@0a1 arg1] $arg1
-} {1 a}
-
-test binary-36.1 {Tcl_BinaryObjCmd: scan} {
-    list [catch {binary scan abcdef u0a3} msg] $msg
-} {1 {bad field specifier "u"}}
-
-# GetFormatSpec is pretty thoroughly tested above, but there are a few
-# cases we should text explicitly
-
-test binary-37.1 {GetFormatSpec: whitespace} {
-    binary format "a3 a5     a3" foo barblat baz
-} foobarblbaz
-test binary-37.2 {GetFormatSpec: whitespace} {
-    binary format "      " foo
-} {}
-test binary-37.3 {GetFormatSpec: whitespace} {
-    binary format "     a3" foo
-} foo
-test binary-37.4 {GetFormatSpec: whitespace} {
-    binary format "" foo
-} {}
-test binary-37.5 {GetFormatSpec: whitespace} {
-    binary format "" foo
-} {}
-test binary-37.6 {GetFormatSpec: whitespace} {
-    binary format "     a3   " foo
-} foo
-test binary-37.7 {GetFormatSpec: numbers} {
-    list [catch {binary scan abcdef "x-1" foo} msg] $msg
-} {1 {bad field specifier "-"}}
-test binary-37.8 {GetFormatSpec: numbers} {
-    catch {unset arg1}
-    set arg1 foo
-    list [binary scan abcdef "a0x3" arg1] $arg1
-} {1 {}}
-test binary-37.9 {GetFormatSpec: numbers} {
-    # test format of neg numbers
-    # bug report/fix provided by Harald Kirsch
-    set x [binary format f* {1 -1 2 -2 0}]
-    binary scan $x f* bla
-    set bla
-} {1.0 -1.0 2.0 -2.0 0.0}
-
-test binary-38.1 {FormatNumber: word alignment} {
-    set x [binary format c1s1 1 1]
-} \x01\x01\x00
-test binary-38.2 {FormatNumber: word alignment} {
-    set x [binary format c1S1 1 1]
-} \x01\x00\x01
-test binary-38.3 {FormatNumber: word alignment} {
-    set x [binary format c1i1 1 1]
-} \x01\x01\x00\x00\x00
-test binary-38.4 {FormatNumber: word alignment} {
-    set x [binary format c1I1 1 1]
-} \x01\x00\x00\x00\x01
-test binary-38.5 {FormatNumber: word alignment} {nonPortable macOrUnix} {
-    set x [binary format c1d1 1 1.6]
-} \x01\x3f\xf9\x99\x99\x99\x99\x99\x9a
-test binary-38.6 {FormatNumber: word alignment} {nonPortable pcOnly} {
-    set x [binary format c1d1 1 1.6]
-} \x01\x9a\x99\x99\x99\x99\x99\xf9\x3f
-test binary-38.7 {FormatNumber: word alignment} {nonPortable macOrUnix} {
-    set x [binary format c1f1 1 1.6]
-} \x01\x3f\xcc\xcc\xcd
-test binary-38.8 {FormatNumber: word alignment} {nonPortable pcOnly} {
-    set x [binary format c1f1 1 1.6]
-} \x01\xcd\xcc\xcc\x3f
-
-test binary-39.1 {ScanNumber: sign extension} {
-    catch {unset arg1}
-    list [binary scan \x52\xa3 c2 arg1] $arg1
-} {1 {82 -93}}
-test binary-39.2 {ScanNumber: sign extension} {
-    catch {unset arg1}
-    list [binary scan \x01\x02\x01\x81\x82\x01\x81\x82 s4 arg1] $arg1
-} {1 {513 -32511 386 -32127}}
-test binary-39.3 {ScanNumber: sign extension} {
-    catch {unset arg1}
-    list [binary scan \x01\x02\x01\x81\x82\x01\x81\x82 S4 arg1] $arg1
-} {1 {258 385 -32255 -32382}}
-test binary-39.4 {ScanNumber: sign extension} {
-    catch {unset arg1}
-    list [binary scan \x01\x01\x01\x02\x81\x01\x01\x01\x01\x82\x01\x01\x01\x01\x82\x01\x01\x01\x01\x81 i5 arg1] $arg1
-} {1 {33620225 16843137 16876033 25297153 -2130640639}}
-test binary-39.5 {ScanNumber: sign extension} {
-    catch {unset arg1}
-    list [binary scan \x01\x01\x01\x02\x81\x01\x01\x01\x01\x82\x01\x01\x01\x01\x82\x01\x01\x01\x01\x81 I5 arg1] $arg1
-} {1 {16843010 -2130640639 25297153 16876033 16843137}}
-
-test binary-40.1 {ScanNumber: floating point overflow} {nonPortable unixOnly} {
-    catch {unset arg1}
-    list [binary scan \xff\xff\xff\xff f1 arg1] $arg1
-} {1 -NaN}
-test binary-40.2 {ScanNumber: floating point overflow} {nonPortable macOnly} {
-    catch {unset arg1}
-    list [binary scan \xff\xff\xff\xff f1 arg1] $arg1
-} {1 -NAN(255)}
-test binary-40.3 {ScanNumber: floating point overflow} {nonPortable pcOnly} {
-    catch {unset arg1}
-    set result [binary scan \xff\xff\xff\xff f1 arg1]
-    if {([string compare $arg1 -1.\#QNAN] == 0)
-	|| ([string compare $arg1 -NAN] == 0)} {
-	lappend result success
-    } else {
-	lappend result failure
-    }
-} {1 success}
-test binary-40.4 {ScanNumber: floating point overflow} {nonPortable unixOnly} {
-    catch {unset arg1}
-    list [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] $arg1
-} {1 -NaN}
-test binary-40.5 {ScanNumber: floating point overflow} {nonPortable macOnly} {
-    catch {unset arg1}
-    list [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1] $arg1
-} {1 -NAN(255)}
-test binary-40.6 {ScanNumber: floating point overflow} {nonPortable pcOnly} {
-    catch {unset arg1}
-    set result [binary scan \xff\xff\xff\xff\xff\xff\xff\xff d1 arg1]
-    if {([string compare $arg1 -1.\#QNAN] == 0)
-	|| ([string compare $arg1 -NAN] == 0)} {
-	lappend result success
-    } else {
-	lappend result failure
-    }
-} {1 success}
-
-test binary-41.1 {ScanNumber: word alignment} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x01\x00 c1s1 arg1 arg2] $arg1 $arg2
-} {2 1 1}
-test binary-41.2 {ScanNumber: word alignment} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x00\x01 c1S1 arg1 arg2] $arg1 $arg2
-} {2 1 1}
-test binary-41.3 {ScanNumber: word alignment} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x01\x00\x00\x00 c1i1 arg1 arg2] $arg1 $arg2
-} {2 1 1}
-test binary-41.4 {ScanNumber: word alignment} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x00\x00\x00\x01 c1I1 arg1 arg2] $arg1 $arg2
-} {2 1 1}
-test binary-41.5 {ScanNumber: word alignment} {nonPortable macOrUnix} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x3f\xcc\xcc\xcd c1f1 arg1 arg2] $arg1 $arg2
-} {2 1 1.60000002384}
-test binary-41.6 {ScanNumber: word alignment} {nonPortable pcOnly} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\xcd\xcc\xcc\x3f c1f1 arg1 arg2] $arg1 $arg2
-} {2 1 1.60000002384}
-test binary-41.7 {ScanNumber: word alignment} {nonPortable macOrUnix} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x3f\xf9\x99\x99\x99\x99\x99\x9a c1d1 arg1 arg2] $arg1 $arg2
-} {2 1 1.6}
-test binary-41.8 {ScanNumber: word alignment} {nonPortable pcOnly} {
-    catch {unset arg1; unset arg2}
-    list [binary scan \x01\x9a\x99\x99\x99\x99\x99\xf9\x3f c1d1 arg1 arg2] $arg1 $arg2
-} {2 1 1.6}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/case.test b/tests/case.test
deleted file mode 100644
index ee0b97f..0000000
--- a/tests/case.test
+++ /dev/null
@@ -1,102 +0,0 @@
-# Commands covered:  case
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: case.test,v 1.3 1999/04/16 00:47:23 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test case-1.1 {simple pattern} {
-    case a in a {format 1} b {format 2} c {format 3} default {format 4}
-} 1
-test case-1.2 {simple pattern} {
-    case b a {format 1} b {format 2} c {format 3} default {format 4}
-} 2
-test case-1.3 {simple pattern} {
-    case x in a {format 1} b {format 2} c {format 3} default {format 4}
-} 4
-test case-1.4 {simple pattern} {
-    case x a {format 1} b {format 2} c {format 3}
-} {}
-test case-1.5 {simple pattern matches many times} {
-    case b a {format 1} b {format 2} b {format 3} b {format 4}
-} 2
-test case-1.6 {fancier pattern} {
-    case cx a {format 1} *c {format 2} *x {format 3} default {format 4}
-} 3
-test case-1.7 {list of patterns} {
-    case abc in {a b c} {format 1} {def abc ghi} {format 2}
-} 2
-
-test case-2.1 {error in executed command} {
-    list [catch {case a in a {error "Just a test"} default {format 1}} msg] \
-	    $msg $errorInfo
-} {1 {Just a test} {Just a test
-    while executing
-"error "Just a test""
-    ("a" arm line 1)
-    invoked from within
-"case a in a {error "Just a test"} default {format 1}"}}
-test case-2.2 {error: not enough args} {
-    list [catch {case} msg] $msg
-} {1 {wrong # args: should be "case string ?in? patList body ... ?default body?"}}
-test case-2.3 {error: pattern with no body} {
-    list [catch {case a b} msg] $msg
-} {1 {extra case pattern with no body}}
-test case-2.4 {error: pattern with no body} {
-    list [catch {case a in b {format 1} c} msg] $msg
-} {1 {extra case pattern with no body}}
-test case-2.5 {error in default command} {
-    list [catch {case foo in a {error case1} default {error case2} \
-	    b {error case 3}} msg] $msg $errorInfo
-} {1 case2 {case2
-    while executing
-"error case2"
-    ("default" arm line 1)
-    invoked from within
-"case foo in a {error case1} default {error case2}  b {error case 3}"}}
-
-test case-3.1 {single-argument form for pattern/command pairs} {
-    case b in {
-	a {format 1}
-	b {format 2}
-	default {format 6}
-    }
-} {2}
-test case-3.2 {single-argument form for pattern/command pairs} {
-    case b {
-	a {format 1}
-	b {format 2}
-	default {format 6}
-    }
-} {2}
-test case-3.3 {single-argument form for pattern/command pairs} {
-    list [catch {case z in {a 2 b}} msg] $msg
-} {1 {extra case pattern with no body}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/clock.test b/tests/clock.test
deleted file mode 100644
index d0072ad..0000000
--- a/tests/clock.test
+++ /dev/null
@@ -1,225 +0,0 @@
-# Commands covered:  clock
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1998 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: clock.test,v 1.3 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test clock-1.1 {clock tests} {
-    list [catch {clock} msg] $msg
-} {1 {wrong # args: should be "clock option ?arg ...?"}}
-test clock-1.2 {clock tests} {
-    list [catch {clock foo} msg] $msg
-} {1 {bad option "foo": must be clicks, format, scan, or seconds}}
-
-# clock clicks
-test clock-2.1 {clock clicks tests} {
-    expr [clock clicks]+1
-    concat {}
-} {}
-test clock-2.2 {clock clicks tests} {
-    list [catch {clock clicks foo} msg] $msg
-} {1 {wrong # args: should be "clock clicks"}}
-test clock-2.3 {clock clicks tests} {
-    set start [clock clicks]
-    after 10
-    set end [clock clicks]
-    expr "$end > $start"
-} {1}
-
-# clock format
-test clock-3.1 {clock format tests} {unixOnly} {
-    set clockval 657687766
-    clock format $clockval -format {%a %b %d %I:%M:%S %p %Y} -gmt true
-} {Sun Nov 04 03:02:46 AM 1990}
-test clock-3.2 {clock format tests} {
-    # TCL_USE_TIMEZONE_VAR
-
-    catch {set oldtz $env(TZ)}
-    set env(TZ) PST
-    set x {}
-    append x [clock format 863800000 -format %Z -gmt 1]
-    append x [set env(TZ)]
-    catch {unset env(TZ); set env(TZ) $oldtz}
-    set x
-} {GMTPST}
-test clock-3.3 {clock format tests} {
-    # tzset() under Borland doesn't seem to set up tzname[] for local 
-    # timezone, which caused "clock format" to think that %Z was an invalid
-    # string.  Don't care about answer, just that test runs w/o error.
-
-    clock format 863800000 -format %Z
-    set x {}
-} {}
-test clock-3.4 {clock format tests} {
-    # tzset() under Borland doesn't seem to set up tzname[] for gmt timezone.
-    # tzset() under MSVC has the following weird observed behavior:
-    #	 First time we call "clock format [clock seconds] -format %Z -gmt 1"
-    #	 we get "GMT", but on all subsequent calls we get the current time 
-    #	 zone string, even though env(TZ) is GMT and the variable _timezone 
-    #    is 0.
-
-    set x {}
-    append x [clock format 863800000 -format %Z -gmt 1]
-    append x [clock format 863800000 -format %Z -gmt 1]
-} {GMTGMT}
-test clock-3.5 {clock format tests} {
-    list [catch {clock format} msg] $msg
-} {1 {wrong # args: should be "clock format clockval ?-format string? ?-gmt boolean?"}}
-test clock-3.6 {clock format tests} {
-    list [catch {clock format foo} msg] $msg
-} {1 {expected integer but got "foo"}}
-test clock-3.7 {clock format tests} {unixOrPc} {
-    set clockval 657687766
-    clock format $clockval -format "%a %b %d %I:%M:%S %p %Y" -gmt true
-} "Sun Nov 04 03:02:46 AM 1990"
-test clock-3.8 {clock format tests} {
-    list [catch {clock format a b c d e g} msg] $msg
-} {1 {wrong # args: should be "clock format clockval ?-format string? ?-gmt boolean?"}}
-test clock-3.9 {clock format tests} {unixOrPc nonPortable} {
-    set clockval -1
-    clock format $clockval -format "%a %b %d %I:%M:%S %p %Y" -gmt true
-} "Wed Dec 31 11:59:59 PM 1969"
-test clock-3.10 {clock format tests} {
-    list [catch {clock format 123 -bad arg} msg] $msg
-} {1 {bad switch "-bad": must be -format or -gmt}}
-test clock-3.11 {clock format tests} {
-    clock format 123 -format "x"
-} x
-test clock-3.12 {clock format tests} {
-    clock format 123 -format ""
-} ""
-
-# clock scan
-test clock-4.1 {clock scan tests} {
-    list [catch {clock scan} msg] $msg
-} {1 {wrong # args: should be "clock scan dateString ?-base clockValue? ?-gmt boolean?"}}
-test clock-4.2 {clock scan tests} {
-    list [catch {clock scan "bad-string"} msg] $msg
-} {1 {unable to convert date-time string "bad-string"}}
-test clock-4.3 {clock scan tests} {
-    clock format [clock scan "14 Feb 92" -gmt true] \
-      -format {%m/%d/%y %I:%M:%S %p} -gmt true
-} {02/14/92 12:00:00 AM}
-test clock-4.4 {clock scan tests} {
-    clock format [clock scan "Feb 14, 1992 12:20 PM" -gmt true] \
-      -format {%m/%d/%y %I:%M:%S %p} -gmt true
-} {02/14/92 12:20:00 PM}
-test clock-4.5 {clock scan tests} {
-    clock format \
-      [clock scan "Feb 14, 1992 12:20 PM" -base 319363200 -gmt true] \
-      -format {%m/%d/%y %I:%M:%S %p} -gmt true
-} {02/14/92 12:20:00 PM}
-test clock-4.6 {clock scan tests} {
-    set time [clock scan "Oct 23,1992 15:00"]
-    clock format $time -format {%b %d,%Y %H:%M}
-} {Oct 23,1992 15:00}
-test clock-4.7 {clock scan tests} {
-    set time [clock scan "Oct 23,1992 15:00 GMT"]
-    clock format $time -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Oct 23,1992 15:00 GMT}
-test clock-4.8 {clock scan tests} {
-    set time [clock scan "Oct 23,1992 15:00" -gmt true]
-    clock format $time -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Oct 23,1992 15:00 GMT}
-test clock-4.9 {clock scan tests} {
-    list [catch {clock scan "Jan 12" -bad arg} msg] $msg
-} {1 {bad switch "-bad": must be -base or -gmt}}
-# The following two two tests test the two year date policy
-test clock-4.10 {clock scan tests} {
-    set time [clock scan "1/1/71" -gmt true]
-    clock format $time -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Jan 01,1971 00:00 GMT}
-test clock-4.11 {clock scan tests} {
-    set time [clock scan "1/1/37" -gmt true]
-    clock format $time -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Jan 01,2037 00:00 GMT}
-
-# clock seconds
-test clock-5.1 {clock seconds tests} {
-    expr [clock seconds]+1
-    concat {}
-} {}
-test clock-5.2 {clock seconds tests} {
-    list [catch {clock seconds foo} msg] $msg
-} {1 {wrong # args: should be "clock seconds"}}
-test clock-5.3 {clock seconds tests} {
-    set start [clock seconds]
-    after 2000
-    set end [clock seconds]
-    expr "$end > $start"
-} {1}
-
-# The following dates check certain roll over dates
-set day [expr 24 * 60 * 60]
-test clock-6.1 {clock roll over dates} {
-    set time [clock scan "12/31/1998" -gmt true]
-    clock format [expr $time + $day] -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Jan 01,1999 00:00 GMT}
-test clock-6.2 {clock roll over dates} {
-    set time [clock scan "12/31/1999" -gmt true]
-    clock format [expr $time + $day] -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Jan 01,2000 00:00 GMT}
-test clock-6.3 {clock roll over dates} {
-    set time [clock scan "2/28/2000" -gmt true]
-    clock format [expr $time + $day] -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Feb 29,2000 00:00 GMT}
-test clock-6.4 {clock roll over dates} {
-    set time [clock scan "2/29/2000" -gmt true]
-    clock format [expr $time + $day] -format {%b %d,%Y %H:%M GMT} -gmt true
-} {Mar 01,2000 00:00 GMT}
-test clock-6.5 {clock roll over dates} {
-    set time [clock scan "January 1, 2000" -gmt true]
-    clock format $time -format %A -gmt true
-} {Saturday}
-test clock-6.6 {clock roll over dates} {
-    set time [clock scan "January 1, 2000" -gmt true]
-    clock format $time -format %j -gmt true
-} {001}
-test clock-6.7 {clock roll over dates} {
-    set time [clock scan "February 29, 2000" -gmt true]
-    clock format $time -format %A -gmt true
-} {Tuesday}
-test clock-6.8 {clock roll over dates} {
-    set time [clock scan "February 29, 2000" -gmt true]
-    clock format $time -format %j -gmt true
-} {060}
-test clock-6.9 {clock roll over dates} {
-    set time [clock scan "March 1, 2000" -gmt true]
-    clock format $time -format %A -gmt true
-} {Wednesday}
-test clock-6.10 {clock roll over dates} {
-    set time [clock scan "March 1, 2000" -gmt true]
-    clock format $time -format %j -gmt true
-} {061}
-test clock-6.11 {clock roll over dates} {
-    set time [clock scan "March 1, 2001" -gmt true]
-    clock format $time -format %j -gmt true
-} {060}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
deleted file mode 100644
index 19ef9c4..0000000
--- a/tests/cmdAH.test
+++ /dev/null
@@ -1,1484 +0,0 @@
-# The file tests the tclCmdAH.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996-1998 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: cmdAH.test,v 1.5 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-global env
-set cmdAHwd [pwd]
-catch {set platform [testgetplatform]}
-
-test cmdAH-0.1 {Tcl_BreakObjCmd, errors} {
-    list [catch {break foo} msg] $msg
-} {1 {wrong # args: should be "break"}}
-test cmdAH-0.2 {Tcl_BreakObjCmd, success} {
-    list [catch {break} msg] $msg
-} {3 {}}
-
-# Tcl_CaseObjCmd is tested in case.test
-
-test cmdAH-1.1 {Tcl_CatchObjCmd, errors} {
-    list [catch {catch} msg] $msg
-} {1 {wrong # args: should be "catch command ?varName?"}}
-test cmdAH-1.2 {Tcl_CatchObjCmd, errors} {
-    list [catch {catch foo bar baz} msg] $msg
-} {1 {wrong # args: should be "catch command ?varName?"}}
-
-test cmdAH-2.1 {Tcl_CdObjCmd} {
-    list [catch {cd foo bar} msg] $msg
-} {1 {wrong # args: should be "cd ?dirName?"}}
-test cmdAH-2.2 {Tcl_CdObjCmd} {
-    file delete -force foo
-    file mkdir foo
-    cd foo
-    set result [file tail [pwd]]
-    cd ..
-    file delete foo
-    set result
-} foo
-test cmdAH-2.3 {Tcl_CdObjCmd} {
-    global env
-    set oldpwd [pwd]
-    set temp $env(HOME)
-    set env(HOME) $oldpwd
-    file delete -force foo
-    file mkdir foo
-    cd foo
-    cd ~
-    set result [string match [pwd] $oldpwd]
-    file delete foo
-    set env(HOME) $temp
-    set result
-} 1
-test cmdAH-2.4 {Tcl_CdObjCmd} {
-    global env
-    set oldpwd [pwd]
-    set temp $env(HOME)
-    set env(HOME) $oldpwd
-    file delete -force foo
-    file mkdir foo
-    cd foo
-    cd
-    set result [string match [pwd] $oldpwd]
-    file delete foo
-    set env(HOME) $temp
-    set result
-} 1
-test cmdAH-2.5 {Tcl_CdObjCmd} {
-    list [catch {cd ~~} msg] $msg
-} {1 {user "~" doesn't exist}}
-test cmdAH-2.6 {Tcl_CdObjCmd} {
-    list [catch {cd _foobar} msg] $msg
-} {1 {couldn't change working directory to "_foobar": no such file or directory}}
-
-test cmdAH-2.7 {Tcl_ConcatObjCmd} {
-    concat
-} {}
-test cmdAH-2.8 {Tcl_ConcatObjCmd} {
-    concat a
-} a
-test cmdAH-2.9 {Tcl_ConcatObjCmd} {
-    concat a {b c}
-} {a b c}
-
-test cmdAH-3.1 {Tcl_ContinueObjCmd, errors} {
-    list [catch {continue foo} msg] $msg
-} {1 {wrong # args: should be "continue"}}
-test cmdAH-3.2 {Tcl_ContinueObjCmd, success} {
-    list [catch {continue} msg] $msg
-} {4 {}}
-
-test cmdAH-4.1 {Tcl_EncodingObjCmd} {
-    list [catch {encoding} msg] $msg
-} {1 {wrong # args: should be "encoding option ?arg ...?"}}
-test cmdAH-4.2 {Tcl_EncodingObjCmd} {
-    list [catch {encoding foo} msg] $msg
-} {1 {bad option "foo": must be convertfrom, convertto, names, or system}}
-test cmdAH-4.3 {Tcl_EncodingObjCmd} {
-    list [catch {encoding convertto} msg] $msg
-} {1 {wrong # args: should be "encoding convertto ?encoding? data"}}
-test cmdAH-4.4 {Tcl_EncodingObjCmd} {
-    list [catch {encoding convertto foo bar} msg] $msg
-} {1 {unknown encoding "foo"}}
-test cmdAH-4.5 {Tcl_EncodingObjCmd} {
-    set system [encoding system]
-    encoding system jis0208
-    set x [encoding convertto \u4e4e]
-    encoding system $system
-    set x
-} 8C
-test cmdAH-4.6 {Tcl_EncodingObjCmd} {
-    set system [encoding system]
-    encoding system identity
-    set x [encoding convertto jis0208 \u4e4e]
-    encoding system $system
-    set x
-} 8C
-test cmdAH-4.7 {Tcl_EncodingObjCmd} {
-    list [catch {encoding convertfrom} msg] $msg
-} {1 {wrong # args: should be "encoding convertfrom ?encoding? data"}}
-test cmdAH-4.8 {Tcl_EncodingObjCmd} {
-    list [catch {encoding convertfrom foo bar} msg] $msg
-} {1 {unknown encoding "foo"}}
-test cmdAH-4.9 {Tcl_EncodingObjCmd} {
-    set system [encoding system]
-    encoding system jis0208
-    set x [encoding convertfrom 8C]
-    encoding system $system
-    set x
-} \u4e4e
-test cmdAH-4.10 {Tcl_EncodingObjCmd} {
-    set system [encoding system]
-    encoding system identity
-    set x [encoding convertfrom jis0208 8C]
-    encoding system $system
-    set x
-} \u4e4e
-test cmdAH-4.11 {Tcl_EncodingObjCmd} {
-    list [catch {encoding names foo} msg] $msg
-} {1 {wrong # args: should be "encoding names"}}
-test cmdAH-4.12 {Tcl_EncodingObjCmd} {
-    list [catch {encoding system foo bar} msg] $msg
-} {1 {wrong # args: should be "encoding system ?encoding?"}}
-test cmdAH-4.13 {Tcl_EncodingObjCmd} {
-    set system [encoding system]
-    encoding system identity
-    set x [encoding system]
-    encoding system $system
-    set x
-} identity
-
-test cmdAH-5.1 {Tcl_FileObjCmd} {
-    list [catch file msg] $msg
-} {1 {wrong # args: should be "file option ?arg ...?"}}
-test cmdAH-5.2 {Tcl_FileObjCmd} {
-    list [catch {file x} msg] $msg
-} {1 {bad option "x": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-5.3 {Tcl_FileObjCmd} {
-    list [catch {file atime} msg] $msg
-} {1 {wrong # args: should be "file atime name"}}
-
-
-#volume
-
-test cmdAH-6.1 {Tcl_FileObjCmd: volumes} {
-    list [catch {file volumes x} msg] $msg	
-} {1 {wrong # args: should be "file volumes"}}
-test cmdAH-6.2 {Tcl_FileObjCmd: volumes} {
-	set volumeList [file volumes]
-	if { [llength $volumeList] == 0 } {
-		set result 0
-	} else {
-		set result 1
-	}	
-} {1}
-test cmdAH-6.3 {Tcl_FileObjCmd: volumes} {macOrUnix} {
-    set volumeList [file volumes]
-    catch [list glob -nocomplain [lindex $volumeList 0]*]
-} {0}
-test cmdAH-6.4 {Tcl_FileObjCmd: volumes} {pcOnly} {
-    set volumeList [string tolower [file volumes]]
-    list [catch {lsearch $volumeList "c:/"} element] [expr $element != -1] [catch {list glob -nocomplain [lindex $volumeList $element]*}]
-} {0 1 0}
-
-# attributes
-
-test cmdAH-7.1 {Tcl_FileObjCmd - file attrs} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file}] [file delete -force foo.file]
-} {0 {}}
-
-# dirname
-
-if {[info commands testsetplatform] == {}} {
-    puts "This application hasn't been compiled with the \"testsetplatform\""
-    puts "command, so I can't test Tcl_FileObjCmd etc."
-} else {
-test cmdAH-8.1 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname a b} msg] $msg
-} {1 {wrong # args: should be "file dirname name"}}
-test cmdAH-8.2 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname /a/b
-} /a
-test cmdAH-8.3 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname {}
-} .
-test cmdAH-8.4 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    file dirname {}
-} :
-test cmdAH-8.5 {Tcl_FileObjCmd: dirname} {
-    testsetplatform win
-    file dirname {}
-} .
-test cmdAH-8.6 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname .def
-} .
-test cmdAH-8.7 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    file dirname a
-} :
-test cmdAH-8.8 {Tcl_FileObjCmd: dirname} {
-    testsetplatform win
-    file dirname a
-} .
-test cmdAH-8.9 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname a/b/c.d
-} a/b
-test cmdAH-8.10 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname a/b.c/d
-} a/b.c
-test cmdAH-8.11 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    file dirname /.
-} /
-test cmdAH-8.12 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname /} msg] $msg
-} {0 /}
-test cmdAH-8.13 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname /foo} msg] $msg
-} {0 /}
-test cmdAH-8.14 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname //foo} msg] $msg
-} {0 /}
-test cmdAH-8.15 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname //foo/bar} msg] $msg
-} {0 /foo}
-test cmdAH-8.16 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname {//foo\/bar/baz}} msg] $msg
-} {0 {/foo\/bar}}
-test cmdAH-8.17 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname {//foo\/bar/baz/blat}} msg] $msg
-} {0 {/foo\/bar/baz}}
-test cmdAH-8.18 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname /foo//} msg] $msg
-} {0 /}
-test cmdAH-8.19 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname ./a} msg] $msg
-} {0 .}
-test cmdAH-8.20 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname a/.a} msg] $msg
-} {0 a}
-test cmdAH-8.21 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname c:foo} msg] $msg
-} {0 c:}
-test cmdAH-8.22 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname c:} msg] $msg
-} {0 c:}
-test cmdAH-8.23 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname c:/} msg] $msg
-} {0 c:/}
-test cmdAH-8.24 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname {c:\foo}} msg] $msg
-} {0 c:/}
-test cmdAH-8.25 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname {//foo/bar/baz}} msg] $msg
-} {0 //foo/bar}
-test cmdAH-8.26 {Tcl_FileObjCmd: dirname} {
-    testsetplatform windows
-    list [catch {file dirname {//foo/bar}} msg] $msg
-} {0 //foo/bar}
-test cmdAH-8.27 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname :} msg] $msg
-} {0 :}
-test cmdAH-8.28 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname :Foo} msg] $msg
-} {0 :}
-test cmdAH-8.29 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname Foo:} msg] $msg
-} {0 Foo:}
-test cmdAH-8.30 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname Foo:bar} msg] $msg
-} {0 Foo:}
-test cmdAH-8.31 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname :Foo:bar} msg] $msg
-} {0 :Foo}
-test cmdAH-8.32 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname ::} msg] $msg
-} {0 :}
-test cmdAH-8.33 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname :::} msg] $msg
-} {0 ::}
-test cmdAH-8.34 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname /foo/bar/} msg] $msg
-} {0 foo:}
-test cmdAH-8.35 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname /foo/bar} msg] $msg
-} {0 foo:}
-test cmdAH-8.36 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname /foo} msg] $msg
-} {0 foo:}
-test cmdAH-8.37 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname foo} msg] $msg
-} {0 :}
-test cmdAH-8.38 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname ~/foo} msg] $msg
-} {0 ~}
-test cmdAH-8.39 {Tcl_FileObjCmd: dirname} {
-    testsetplatform unix
-    list [catch {file dirname ~bar/foo} msg] $msg
-} {0 ~bar}
-test cmdAH-8.40 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname ~bar/foo} msg] $msg
-} {0 ~bar:}
-test cmdAH-8.41 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname ~/foo} msg] $msg
-} {0 ~:}
-test cmdAH-8.42 {Tcl_FileObjCmd: dirname} {
-    testsetplatform mac
-    list [catch {file dirname ~:baz} msg] $msg
-} {0 ~:}
-test cmdAH-8.43 {Tcl_FileObjCmd: dirname} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform unix
-    set result [list [catch {file dirname ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home}
-test cmdAH-8.44 {Tcl_FileObjCmd: dirname} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "~"
-    testsetplatform unix
-    set result [list [catch {file dirname ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 ~}
-test cmdAH-8.45 {Tcl_FileObjCmd: dirname} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform windows
-    set result [list [catch {file dirname ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home}
-test cmdAH-8.46 {Tcl_FileObjCmd: dirname} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform mac
-    set result [list [catch {file dirname ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 home:}
-
-# tail
-
-test cmdAH-9.1 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    list [catch {file tail a b} msg] $msg
-} {1 {wrong # args: should be "file tail name"}}
-test cmdAH-9.2 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail /a/b
-} b
-test cmdAH-9.3 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail {}
-} {}
-test cmdAH-9.4 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail {}
-} {}
-test cmdAH-9.5 {Tcl_FileObjCmd: tail} {
-    testsetplatform win
-    file tail {}
-} {}
-test cmdAH-9.6 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail .def
-} .def
-test cmdAH-9.7 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail a
-} a
-test cmdAH-9.8 {Tcl_FileObjCmd: tail} {
-    testsetplatform win
-    file tail a
-} a
-test cmdAH-9.9 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file ta a/b/c.d
-} c.d
-test cmdAH-9.10 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail a/b.c/d
-} d
-test cmdAH-9.11 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail /.
-} .
-test cmdAH-9.12 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail /
-} {}
-test cmdAH-9.13 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail /foo
-} foo
-test cmdAH-9.14 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail //foo
-} foo
-test cmdAH-9.15 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail //foo/bar
-} bar
-test cmdAH-9.16 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail {//foo\/bar/baz}
-} baz
-test cmdAH-9.17 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail {//foo\/bar/baz/blat}
-} blat
-test cmdAH-9.18 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail /foo//
-} foo
-test cmdAH-9.19 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail ./a
-} a
-test cmdAH-9.20 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail a/.a
-} .a
-test cmdAH-9.21 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:foo
-} foo
-test cmdAH-9.22 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:
-} {}
-test cmdAH-9.23 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:/
-} {}
-test cmdAH-9.24 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail {c:\foo}
-} foo
-test cmdAH-9.25 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail {//foo/bar/baz}
-} baz
-test cmdAH-9.26 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail {//foo/bar}
-} {}
-test cmdAH-9.27 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail :
-} :
-test cmdAH-9.28 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail :Foo
-} Foo
-test cmdAH-9.29 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail Foo:
-} {}
-test cmdAH-9.30 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail Foo:bar
-} bar
-test cmdAH-9.31 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail :Foo:bar
-} bar
-test cmdAH-9.32 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail ::
-} ::
-test cmdAH-9.33 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail :::
-} ::
-test cmdAH-9.34 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail /foo/bar/
-} bar
-test cmdAH-9.35 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail /foo/bar
-} bar
-test cmdAH-9.36 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail /foo
-} {}
-test cmdAH-9.37 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail foo
-} foo
-test cmdAH-9.38 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail ~:foo
-} foo
-test cmdAH-9.39 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail ~bar:foo
-} foo
-test cmdAH-9.40 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail ~bar/foo
-} foo
-test cmdAH-9.41 {Tcl_FileObjCmd: tail} {
-    testsetplatform mac
-    file tail ~/foo
-} foo
-test cmdAH-9.42 {Tcl_FileObjCmd: tail} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform unix
-    set result [file tail ~]
-    set env(HOME) $temp
-    set result
-} test
-test cmdAH-9.43 {Tcl_FileObjCmd: tail} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "~"
-    testsetplatform unix
-    set result [file tail ~]
-    set env(HOME) $temp
-    set result
-} {}
-test cmdAH-9.44 {Tcl_FileObjCmd: tail} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform windows
-    set result [file tail ~]
-    set env(HOME) $temp
-    set result
-} test
-test cmdAH-9.45 {Tcl_FileObjCmd: tail} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform mac
-    set result [file tail ~]
-    set env(HOME) $temp
-    set result
-} test
-test cmdAH-9.46 {Tcl_FileObjCmd: tail} {
-    testsetplatform unix
-    file tail {f.oo\bar/baz.bat}
-} baz.bat
-test cmdAH-9.47 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:foo
-} foo
-test cmdAH-9.48 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:
-} {}
-test cmdAH-9.49 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail c:/foo
-} foo
-test cmdAH-9.50 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail {c:/foo\bar}
-} bar
-test cmdAH-9.51 {Tcl_FileObjCmd: tail} {
-    testsetplatform windows
-    file tail {foo\bar}
-} bar
-
-# rootname
-
-test cmdAH-10.1 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    list [catch {file rootname a b} msg] $msg
-} {1 {wrong # args: should be "file rootname name"}}
-test cmdAH-10.2 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname {}
-} {}
-test cmdAH-10.3 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file ro foo
-} foo
-test cmdAH-10.4 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname foo.
-} foo
-test cmdAH-10.5 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname .foo
-} {}
-test cmdAH-10.6 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname abc.def
-} abc
-test cmdAH-10.7 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname abc.def.ghi
-} abc.def
-test cmdAH-10.8 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname a/b/c.d
-} a/b/c
-test cmdAH-10.9 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname a/b.c/d
-} a/b.c/d
-test cmdAH-10.10 {Tcl_FileObjCmd: rootname} {
-    testsetplatform unix
-    file rootname a/b.c/
-} a/b.c/
-test cmdAH-10.11 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file ro foo
-} foo
-test cmdAH-10.12 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname {}
-} {}
-test cmdAH-10.13 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname foo.
-} foo
-test cmdAH-10.14 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname .foo
-} {}
-test cmdAH-10.15 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname abc.def
-} abc
-test cmdAH-10.16 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname abc.def.ghi
-} abc.def
-test cmdAH-10.17 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname a:b:c.d
-} a:b:c
-test cmdAH-10.18 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname a:b.c:d
-} a:b.c:d
-test cmdAH-10.19 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname a/b/c.d
-} a/b/c
-test cmdAH-10.20 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname a/b.c/d
-} a/b.c/d
-test cmdAH-10.21 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname /a.b
-} /a
-test cmdAH-10.22 {Tcl_FileObjCmd: rootname} {
-    testsetplatform mac
-    file rootname foo.c:
-} foo.c:
-test cmdAH-10.23 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname {}
-} {}
-test cmdAH-10.24 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file ro foo
-} foo
-test cmdAH-10.25 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname foo.
-} foo
-test cmdAH-10.26 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname .foo
-} {}
-test cmdAH-10.27 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname abc.def
-} abc
-test cmdAH-10.28 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname abc.def.ghi
-} abc.def
-test cmdAH-10.29 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a/b/c.d
-} a/b/c
-test cmdAH-10.30 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a/b.c/d
-} a/b.c/d
-test cmdAH-10.31 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a\\b.c\\
-} a\\b.c\\
-test cmdAH-10.32 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a\\b\\c.d
-} a\\b\\c
-test cmdAH-10.33 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a\\b.c\\d
-} a\\b.c\\d
-test cmdAH-10.34 {Tcl_FileObjCmd: rootname} {
-    testsetplatform windows
-    file rootname a\\b.c\\
-} a\\b.c\\
-set num 35
-foreach outer { {} a .a a. a.a } {
-  foreach inner { {} a .a a. a.a } {
-    set thing [format %s/%s $outer $inner]
-;   test cmdAH-6.$num {Tcl_FileObjCmd: rootname and extension options} {
-	testsetplatform unix
-	format %s%s [file rootname $thing] [file ext $thing]
-    } $thing
-    set num [expr $num+1]
-  }
-}
-
-# extension
-
-test cmdAH-11.1 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    list [catch {file extension a b} msg] $msg
-} {1 {wrong # args: should be "file extension name"}}
-test cmdAH-11.2 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension {}
-} {}
-test cmdAH-11.3 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file ext foo
-} {}
-test cmdAH-11.4 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension foo.
-} .
-test cmdAH-11.5 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension .foo
-} .foo
-test cmdAH-11.6 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension abc.def
-} .def
-test cmdAH-11.7 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension abc.def.ghi
-} .ghi
-test cmdAH-11.8 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension a/b/c.d
-} .d
-test cmdAH-11.9 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension a/b.c/d
-} {}
-test cmdAH-11.10 {Tcl_FileObjCmd: extension} {
-    testsetplatform unix
-    file extension a/b.c/
-} {}
-test cmdAH-11.11 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file ext foo
-} {}
-test cmdAH-11.12 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension {}
-} {}
-test cmdAH-11.13 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension foo.
-} .
-test cmdAH-11.14 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension .foo
-} .foo
-test cmdAH-11.15 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension abc.def
-} .def
-test cmdAH-11.16 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension abc.def.ghi
-} .ghi
-test cmdAH-11.17 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension a:b:c.d
-} .d
-test cmdAH-11.18 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension a:b.c:d
-} {}
-test cmdAH-11.19 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension a/b/c.d
-} .d
-test cmdAH-11.20 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension a/b.c/d
-} {}
-test cmdAH-11.21 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension /a.b
-} .b
-test cmdAH-11.22 {Tcl_FileObjCmd: extension} {
-    testsetplatform mac
-    file extension foo.c:
-} {}
-test cmdAH-11.23 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension {}
-} {}
-test cmdAH-11.24 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file ext foo
-} {}
-test cmdAH-11.25 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension foo.
-} .
-test cmdAH-11.26 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension .foo
-} .foo
-test cmdAH-11.27 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension abc.def
-} .def
-test cmdAH-11.28 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension abc.def.ghi
-} .ghi
-test cmdAH-11.29 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a/b/c.d
-} .d
-test cmdAH-11.30 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a/b.c/d
-} {}
-test cmdAH-11.31 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a\\b.c\\
-} {}
-test cmdAH-11.32 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a\\b\\c.d
-} .d
-test cmdAH-11.33 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a\\b.c\\d
-} {}
-test cmdAH-11.34 {Tcl_FileObjCmd: extension} {
-    testsetplatform windows
-    file extension a\\b.c\\
-} {}
-set num 35
-foreach value {a..b a...b a.c..b ..b} result {.b .b .b .b} {
-    foreach p {unix mac windows} {
-;	test cmdAH-7.$num {Tcl_FileObjCmd: extension} "
-	    testsetplatform $p
-	    file extension $value
-	" $result
-	incr num
-    }
-}
-
-# pathtype
-
-test cmdAH-12.1 {Tcl_FileObjCmd: pathtype} {
-    testsetplatform unix
-    list [catch {file pathtype a b} msg] $msg
-} {1 {wrong # args: should be "file pathtype name"}}
-test cmdAH-12.2 {Tcl_FileObjCmd: pathtype} {
-    testsetplatform unix
-    file pathtype /a
-} absolute
-test cmdAH-12.3 {Tcl_FileObjCmd: pathtype} {
-    testsetplatform unix
-    file p a
-} relative
-test cmdAH-12.4 {Tcl_FileObjCmd: pathtype} {
-    testsetplatform windows
-    file pathtype c:a
-} volumerelative
-
-# split
-
-test cmdAH-13.1 {Tcl_FileObjCmd: split} {
-    testsetplatform unix
-    list [catch {file split a b} msg] $msg
-} {1 {wrong # args: should be "file split name"}}
-test cmdAH-13.2 {Tcl_FileObjCmd: split} {
-    testsetplatform unix
-    file split a
-} a
-test cmdAH-13.3 {Tcl_FileObjCmd: split} {
-    testsetplatform unix
-    file split a/b
-} {a b}
-
-# join
-
-test cmdAH-14.1 {Tcl_FileObjCmd: join} {
-    testsetplatform unix
-    file join a
-} a
-test cmdAH-14.2 {Tcl_FileObjCmd: join} {
-    testsetplatform unix
-    file join a b
-} a/b
-test cmdAH-14.3 {Tcl_FileObjCmd: join} {
-    testsetplatform unix
-    file join a b c d
-} a/b/c/d
-
-# error handling of Tcl_TranslateFileName
-
-test cmdAH-15.1 {Tcl_FileObjCmd} {
-    testsetplatform unix
-    list [catch {file atime ~_bad_user} msg] $msg
-} {1 {user "_bad_user" doesn't exist}}
-
-testsetplatform $platform
-}
-
-# readable
-
-if {[info commands testchmod] == {}} {
-    puts "This application hasn't been compiled with the \"testchmod\""
-    puts "command, so I can't test Tcl_FileObjCmd etc."
-} else {
-makeFile abcde gorp.file
-makeDirectory dir.file
-
-test cmdAH-16.1 {Tcl_FileObjCmd: readable} {
-    list [catch {file readable a b} msg] $msg
-} {1 {wrong # args: should be "file readable name"}}
-testchmod 444 gorp.file
-test cmdAH-16.2 {Tcl_FileObjCmd: readable} {
-    file readable gorp.file
-} 1
-testchmod 333 gorp.file
-test cmdAH-16.3 {Tcl_FileObjCmd: readable} {unixOnly notRoot} {
-    file reada gorp.file
-} 0
-
-# writable
-
-test cmdAH-17.1 {Tcl_FileObjCmd: writable} {
-    list [catch {file writable a b} msg] $msg
-} {1 {wrong # args: should be "file writable name"}}
-testchmod 555 gorp.file
-test cmdAH-17.2 {Tcl_FileObjCmd: writable} {notRoot} {
-    file writable gorp.file
-} 0
-testchmod 222 gorp.file
-test cmdAH-17.3 {Tcl_FileObjCmd: writable} {
-    file writable gorp.file
-} 1
-
-# executable
-
-file delete -force dir.file gorp.file
-file mkdir dir.file
-makeFile abcde gorp.file
-
-test cmdAH-18.1 {Tcl_FileObjCmd: executable} {
-    list [catch {file executable a b} msg] $msg
-} {1 {wrong # args: should be "file executable name"}}
-test cmdAH-18.2 {Tcl_FileObjCmd: executable} {
-    file executable gorp.file
-} 0
-test cmdAH-18.3 {Tcl_FileObjCmd: executable} {unixOnly} {
-    # Only on unix will setting the execute bit on a regular file
-    # cause that file to be executable.   
-    
-    testchmod 775 gorp.file
-    file exe gorp.file
-} 1
-
-test cmdAH-18.4 {Tcl_FileObjCmd: executable} {macOnly} {
-    # On mac, the only executable files are of type APPL.
-
-    set x [file exe gorp.file]    
-    file attrib gorp.file -type APPL
-    lappend x [file exe gorp.file]
-} {0 1}
-test cmdAH-18.5 {Tcl_FileObjCmd: executable} {pcOnly} {
-    # On pc, must be a .exe, .com, etc.
-    
-    set x [file exe gorp.file]
-    makeFile foo gorp.exe
-    lappend x [file exe gorp.exe]
-    file delete gorp.exe
-    set x
-} {0 1}
-test cmdAH-18.6 {Tcl_FileObjCmd: executable} {
-    # Directories are always executable.
-    
-    file exe dir.file
-} 1
-
-file delete -force dir.file  
-file delete gorp.file
-file delete link.file
-}
-
-# exists
-
-test cmdAH-19.1 {Tcl_FileObjCmd: exists} {
-    list [catch {file exists a b} msg] $msg
-} {1 {wrong # args: should be "file exists name"}}
-test cmdAH-19.2 {Tcl_FileObjCmd: exists} {file exists gorp.file} 0
-test cmdAH-19.3 {Tcl_FileObjCmd: exists} {
-    file exists [file join dir.file gorp.file]
-} 0
-catch {
-    makeFile abcde gorp.file
-    makeDirectory dir.file
-    makeFile 12345 [file join dir.file gorp.file]
-}
-test cmdAH-19.4 {Tcl_FileObjCmd: exists} {
-    file exists gorp.file
-} 1
-test cmdAH-19.5 {Tcl_FileObjCmd: exists} {
-    file exists [file join dir.file gorp.file]
-} 1
-
-# nativename
-if {[info commands testsetplatform] == {}} {
-    puts "This application hasn't been compiled with the \"testsetplatform\""
-    puts "command, so I can't test Tcl_FileObjCmd etc."
-} else {
-test cmdAH-19.6 {Tcl_FileObjCmd: nativename} {
-    testsetplatform unix
-    list [catch {file nativename a/b} msg] $msg [testsetplatform $platform]
-} {0 a/b {}}
-test cmdAH-19.7 {Tcl_FileObjCmd: nativename} {
-    testsetplatform windows
-    list [catch {file nativename a/b} msg] $msg [testsetplatform $platform]
-} {0 {a\b} {}}
-test cmdAH-19.8 {Tcl_FileObjCmd: nativename} {
-    testsetplatform mac
-    list [catch {file nativename a/b} msg] $msg [testsetplatform $platform]
-} {0 :a:b {}}
-}
-
-test cmdAH-19.9 {Tcl_FileObjCmd: ~ : exists} {
-    file exists ~nOsUcHuSeR
-} 0
-test cmdAH-19.10 {Tcl_FileObjCmd: ~ : nativename} {
-    # should probably be 0 in fact...
-    catch {file nativename ~nOsUcHuSeR}
-} 1
-
-# The test below has to be done in /tmp rather than the current
-# directory in order to guarantee (?) a local file system:  some
-# NFS file systems won't do the stuff below correctly.
-
-test cmdAH-19.11 {Tcl_FileObjCmd: exists} {unixOnly notRoot} {
-    removeFile /tmp/tcl.foo.dir/file
-    removeDirectory /tmp/tcl.foo.dir
-    makeDirectory /tmp/tcl.foo.dir
-    makeFile 12345 /tmp/tcl.foo.dir/file
-    exec chmod 000 /tmp/tcl.foo.dir
-
-    set result [file exists /tmp/tcl.foo.dir/file]
-
-    exec chmod 775 /tmp/tcl.foo.dir
-    removeFile /tmp/tcl.foo.dir/file
-    removeDirectory /tmp/tcl.foo.dir
-    set result
-} 0
-
-# Stat related commands
-
-catch {testsetplatform $platform}
-file delete gorp.file
-makeFile "Test string" gorp.file
-catch {exec chmod 765 gorp.file}
-
-# atime
-
-test cmdAH-20.1 {Tcl_FileObjCmd: atime} {
-    list [catch {file atime a b} msg] $msg
-} {1 {wrong # args: should be "file atime name"}}
-test cmdAH-20.2 {Tcl_FileObjCmd: atime} {
-    catch {unset stat}
-    file stat gorp.file stat
-    list [expr {[file mtime gorp.file] == $stat(mtime)}] \
-	    [expr {[file atime gorp.file] == $stat(atime)}]
-} {1 1}
-test cmdAH-20.3 {Tcl_FileObjCmd: atime} {
-    string tolower [list [catch {file atime _bogus_} msg] \
-	    $msg $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-
-# isdirectory
-
-test cmdAH-21.1 {Tcl_FileObjCmd: isdirectory} {
-    list [catch {file isdirectory a b} msg] $msg
-} {1 {wrong # args: should be "file isdirectory name"}}
-test cmdAH-21.2 {Tcl_FileObjCmd: isdirectory} {
-    file isdirectory gorp.file
-} 0
-test cmdAH-21.3 {Tcl_FileObjCmd: isdirectory} {
-    file isd dir.file
-} 1
-
-# isfile
-
-test cmdAH-22.1 {Tcl_FileObjCmd: isfile} {
-    list [catch {file isfile a b} msg] $msg
-} {1 {wrong # args: should be "file isfile name"}}
-test cmdAH-22.2 {Tcl_FileObjCmd: isfile} {file isfile gorp.file} 1
-test cmdAH-22.3 {Tcl_FileObjCmd: isfile} {file isfile dir.file} 0
-
-# lstat and readlink:  don't run these tests everywhere, since not all
-# sites will have symbolic links
-
-catch {exec ln -s gorp.file link.file}
-test cmdAH-23.1 {Tcl_FileObjCmd: lstat} {
-    list [catch {file lstat a} msg] $msg
-} {1 {wrong # args: should be "file lstat name varName"}}
-test cmdAH-23.2 {Tcl_FileObjCmd: lstat} {
-    list [catch {file lstat a b c} msg] $msg
-} {1 {wrong # args: should be "file lstat name varName"}}
-test cmdAH-23.3 {Tcl_FileObjCmd: lstat} {unixOnly nonPortable} {
-    catch {unset stat}
-    file lstat link.file stat
-    lsort [array names stat]
-} {atime ctime dev gid ino mode mtime nlink size type uid}
-test cmdAH-23.4 {Tcl_FileObjCmd: lstat} {unixOnly nonPortable} {
-    catch {unset stat}
-    file lstat link.file stat
-    list $stat(nlink) [expr $stat(mode)&0777] $stat(type)
-} {1 511 link}
-test cmdAH-23.5 {Tcl_FileObjCmd: lstat errors} {nonPortable} {
-    string tolower [list [catch {file lstat _bogus_ stat} msg] \
-	    $msg $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-23.6 {Tcl_FileObjCmd: lstat errors} {
-    catch {unset x}
-    set x 44
-    list [catch {file lstat gorp.file x} msg] $msg $errorCode
-} {1 {can't set "x(dev)": variable isn't array} NONE}
-catch {unset stat}
-
-# mtime 
-
-test cmdAH-24.1 {Tcl_FileObjCmd: mtime} {
-    list [catch {file mtime a b} msg] $msg
-} {1 {wrong # args: should be "file mtime name"}}
-test cmdAH-24.2 {Tcl_FileObjCmd: mtime} {
-    set old [file mtime gorp.file]
-    after 2000
-    set f [open gorp.file w]
-    puts $f "More text"
-    close $f
-    set new [file mtime gorp.file]
-    expr {($new > $old) && ($new <= ($old+5))}
-} {1}
-test cmdAH-24.3 {Tcl_FileObjCmd: mtime} {
-    catch {unset stat}
-    file stat gorp.file stat
-    list [expr {[file mtime gorp.file] == $stat(mtime)}] \
-	    [expr {[file atime gorp.file] == $stat(atime)}]
-} {1 1}
-test cmdAH-24.4 {Tcl_FileObjCmd: mtime} {
-    string tolower [list [catch {file mtime _bogus_} msg] $msg \
-	    $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-24.5 {Tcl_FileObjCmd: mtime} {
-    # Under Unix, use a file in /tmp to avoid clock skew due to NFS.
-    # On other platforms, just use a file in the local directory.
-
-    if {$tcl_platform(platform) == "unix"} {
-	 set name /tmp/tcl.test
-    } else {
-	set name tf
-    }
-
-    # Make sure that a new file's time is correct.  10 seconds variance 
-    # is allowed used due to slow networks or clock skew on a network drive.
-
-    file delete -force $name
-    close [open $name w]
-    set a [expr abs([clock seconds]-[file mtime $name])<10]
-    file delete $name
-    set a
-} {1}
-
-
-# owned
-
-test cmdAH-25.1 {Tcl_FileObjCmd: owned} {
-    list [catch {file owned a b} msg] $msg
-} {1 {wrong # args: should be "file owned name"}}
-test cmdAH-25.2 {Tcl_FileObjCmd: owned} {
-    file owned gorp.file
-} 1
-test cmdAH-25.3 {Tcl_FileObjCmd: owned} {unixOnly notRoot} {
-    file owned /
-} 0
-
-# readlink
-
-test cmdAH-26.1 {Tcl_FileObjCmd: readlink} {
-    list [catch {file readlink a b} msg] $msg
-} {1 {wrong # args: should be "file readlink name"}}
-test cmdAH-26.2 {Tcl_FileObjCmd: readlink} {unixOnly nonPortable} {
-    file readlink link.file
-} gorp.file
-test cmdAH-26.3 {Tcl_FileObjCmd: readlink errors} {unixOnly nonPortable} {
-    list [catch {file readlink _bogus_} msg] [string tolower $msg] \
-	    [string tolower $errorCode]
-} {1 {could not readlink "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-26.4 {Tcl_FileObjCmd: readlink errors} {macOnly nonPortable} {
-    list [catch {file readlink _bogus_} msg] [string tolower $msg] \
-	    [string tolower $errorCode]
-} {1 {could not readlink "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-26.5 {Tcl_FileObjCmd: readlink errors} {pcOnly nonPortable} {
-    list [catch {file readlink _bogus_} msg] [string tolower $msg] \
-	    [string tolower $errorCode]
-} {1 {could not readlink "_bogus_": invalid argument} {posix einval {invalid argument}}}
-
-# size
-
-test cmdAH-27.1 {Tcl_FileObjCmd: size} {
-    list [catch {file size a b} msg] $msg
-} {1 {wrong # args: should be "file size name"}}
-test cmdAH-27.2 {Tcl_FileObjCmd: size} {
-    set oldsize [file size gorp.file]
-    set f [open gorp.file a]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f "More text"
-    close $f
-    expr {[file size gorp.file] - $oldsize}
-} {10}
-test cmdAH-27.3 {Tcl_FileObjCmd: size} {
-    string tolower [list [catch {file size _bogus_} msg] $msg \
-	    $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-
-# stat
-
-catch {testsetplatform $platform}
-makeFile "Test string" gorp.file
-catch {exec chmod 765 gorp.file}
-
-test cmdAH-28.1 {Tcl_FileObjCmd: stat} {
-    list [catch {file stat _bogus_} msg] $msg $errorCode
-} {1 {wrong # args: should be "file stat name varName"} NONE}
-test cmdAH-28.2 {Tcl_FileObjCmd: stat} {
-    list [catch {file stat _bogus_ a b} msg] $msg $errorCode
-} {1 {wrong # args: should be "file stat name varName"} NONE}
-test cmdAH-28.3 {Tcl_FileObjCmd: stat} {
-    catch {unset stat}
-    file stat gorp.file stat
-    lsort [array names stat]
-} {atime ctime dev gid ino mode mtime nlink size type uid}
-test cmdAH-28.4 {Tcl_FileObjCmd: stat} {
-    catch {unset stat}
-    file stat gorp.file stat
-    list $stat(nlink) $stat(size) $stat(type)
-} {1 12 file}
-test cmdAH-28.5 {Tcl_FileObjCmd: stat} {unixOnly} {
-    catch {unset stat}
-    file stat gorp.file stat
-    expr $stat(mode)&0777
-} {501}
-test cmdAH-28.6 {Tcl_FileObjCmd: stat} {
-    string tolower [list [catch {file stat _bogus_ stat} msg] \
-	    $msg $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-test cmdAH-28.7 {Tcl_FileObjCmd: stat} {
-    catch {unset x}
-    set x 44
-    list [catch {file stat gorp.file x} msg] $msg $errorCode
-} {1 {can't set "x(dev)": variable isn't array} NONE}
-test cmdAH-28.8 {Tcl_FileObjCmd: stat} {
-    # Sign extension of purported unsigned short to int.
-
-    close [open foo.test w]
-    file stat foo.test stat
-    set x [expr {$stat(mode) > 0}]
-    file delete foo.test
-    set x
-} 1
-test cmdAH-28.9 {Tcl_FileObjCmd: stat} {pcOnly} {
-    # stat of root directory was failing.
-    # don't care about answer, just that test runs.
-
-    # relative paths that resolve to root
-    set old [pwd]
-    cd c:/
-    file stat c: stat	    
-    file stat c:. stat
-    file stat . stat
-    cd $old
-
-    file stat / stat
-    file stat c:/ stat
-    file stat c:/. stat
-} {}
-test cmdAH-28.10 {Tcl_FileObjCmd: stat} {pcOnly nonPortable} {
-    # stat of root directory was failing.
-    # don't care about answer, just that test runs.
-
-    file stat //pop/$env(USERNAME) stat
-    file stat //pop/$env(USERNAME)/ stat
-    file stat //pop/$env(USERNAME)/. stat
-} {}    
-test cmdAH-28.11 {Tcl_FileObjCmd: stat} {pcOnly nonPortable} {
-    # stat of network directory was returning id of current local drive.
-
-    set old [pwd]
-    cd c:/
-
-    file stat //pop/$env(USERNAME) stat
-    cd $old
-    expr {$stat(dev) == 2}
-} 0
-test cmdAH-28.12 {Tcl_FileObjCmd: stat} {
-    # stat(mode) with S_IFREG flag was returned as a negative number
-    # if mode_t was a short instead of an unsigned short.
-
-    close [open foo.test w]
-    file stat foo.test stat
-    file delete foo.test
-    expr {$stat(mode) > 0}
-} 1
-catch {unset stat}
-
-# type
-
-file delete link.file
-
-test cmdAH-29.1 {Tcl_FileObjCmd: type} {
-    list [catch {file size a b} msg] $msg
-} {1 {wrong # args: should be "file size name"}}
-test cmdAH-29.2 {Tcl_FileObjCmd: type} {
-    file type dir.file
-} directory
-test cmdAH-29.3 {Tcl_FileObjCmd: type} {
-    file type gorp.file
-} file
-test cmdAH-29.4 {Tcl_FileObjCmd: type} {unixOnly nonPortable} {
-    exec ln -s a/b/c link.file
-    set result [file type link.file]
-    file delete link.file
-    set result
-} link
-test cmdAH-29.5 {Tcl_FileObjCmd: type} {
-    string tolower [list [catch {file type _bogus_} msg] $msg $errorCode]
-} {1 {could not read "_bogus_": no such file or directory} {posix enoent {no such file or directory}}}
-
-# Error conditions
-
-test cmdAH-30.1 {error conditions} {
-    list [catch {file gorp x} msg] $msg
-} {1 {bad option "gorp": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.2 {error conditions} {
-    list [catch {file ex x} msg] $msg
-} {1 {ambiguous option "ex": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.3 {error conditions} {
-    list [catch {file is x} msg] $msg
-} {1 {ambiguous option "is": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.4 {error conditions} {
-    list [catch {file z x} msg] $msg
-} {1 {bad option "z": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.5 {error conditions} {
-    list [catch {file read x} msg] $msg
-} {1 {ambiguous option "read": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.6 {error conditions} {
-    list [catch {file s x} msg] $msg
-} {1 {ambiguous option "s": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.7 {error conditions} {
-    list [catch {file t x} msg] $msg
-} {1 {ambiguous option "t": must be atime, attributes, copy, delete, dirname, executable, exists, extension, isdirectory, isfile, join, lstat, mtime, mkdir, nativename, owned, pathtype, readable, readlink, rename, rootname, size, split, stat, tail, type, volumes, or writable}}
-test cmdAH-30.8 {error conditions} {
-    list [catch {file dirname ~woohgy} msg] $msg
-} {1 {user "woohgy" doesn't exist}}
-
-# cleanup
-catch {testsetplatform $platform}
-catch {unset platform}
-
-catch {exec chmod 777 dir.file}
-file delete -force dir.file
-file delete gorp.file
-file delete link.file
-
-cd $cmdAHwd
-
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
deleted file mode 100644
index ac39ec0..0000000
--- a/tests/cmdIL.test
+++ /dev/null
@@ -1,325 +0,0 @@
-# This file contains a collection of tests for the procedures in the
-# file tclCmdIL.c.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: cmdIL.test,v 1.6 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test cmdIL-1.1 {Tcl_LsortObjCmd procedure} {
-    list [catch {lsort} msg] $msg
-} {1 {wrong # args: should be "lsort ?options? list"}}
-test cmdIL-1.2 {Tcl_LsortObjCmd procedure} {
-    list [catch {lsort -foo {1 3 2 5}} msg] $msg
-} {1 {bad option "-foo": must be -ascii, -command, -decreasing, -dictionary, -increasing, -index, -integer, or -real}}
-test cmdIL-1.3 {Tcl_LsortObjCmd procedure, default options} {
-    lsort {d e c b a \{ d35 d300}
-} {a b c d d300 d35 e \{}
-test cmdIL-1.4 {Tcl_LsortObjCmd procedure, -ascii option} {
-    lsort -integer -ascii {d e c b a d35 d300}
-} {a b c d d300 d35 e}
-test cmdIL-1.5 {Tcl_LsortObjCmd procedure, -command option} {
-    list [catch {lsort -command {1 3 2 5}} msg] $msg
-} {1 {"-command" option must be followed by comparison command}}
-test cmdIL-1.6 {Tcl_LsortObjCmd procedure, -command option} {
-    proc cmp {a b} {
-	expr {[string match x* $b] - [string match x* $a]}
-    }
-    lsort -command cmp {x1 abc x2 def x3 x4}
-} {x1 x2 x3 x4 abc def}
-test cmdIL-1.7 {Tcl_LsortObjCmd procedure, -decreasing option} {
-    lsort -decreasing {d e c b a d35 d300}
-} {e d35 d300 d c b a}
-test cmdIL-1.8 {Tcl_LsortObjCmd procedure, -dictionary option} {
-    lsort -dictionary {d e c b a d35 d300}
-} {a b c d d35 d300 e}
-test cmdIL-1.9 {Tcl_LsortObjCmd procedure, -dictionary option} {
-    lsort -dictionary {1k 0k 10k}
-} {0k 1k 10k}
-test cmdIL-1.10 {Tcl_LsortObjCmd procedure, -increasing option} {
-    lsort -decreasing -increasing {d e c b a d35 d300}
-} {a b c d d300 d35 e}
-test cmdIL-1.11 {Tcl_LsortObjCmd procedure, -index option} {
-    list [catch {lsort -index {1 3 2 5}} msg] $msg
-} {1 {"-index" option must be followed by list index}}
-test cmdIL-1.12 {Tcl_LsortObjCmd procedure, -index option} {
-    list [catch {lsort -index foo {1 3 2 5}} msg] $msg
-} {1 {bad index "foo": must be integer or "end"}}
-test cmdIL-1.13 {Tcl_LsortObjCmd procedure, -index option} {
-    lsort -index end -integer {{2 25} {10 20 50 100} {3 16 42} 1}
-} {1 {2 25} {3 16 42} {10 20 50 100}}
-test cmdIL-1.14 {Tcl_LsortObjCmd procedure, -index option} {
-    lsort -index 1 -integer {{1 25 100} {3 16 42} {10 20 50}}
-} {{3 16 42} {10 20 50} {1 25 100}}
-test cmdIL-1.15 {Tcl_LsortObjCmd procedure, -integer option} {
-    lsort -integer {24 6 300 18}
-} {6 18 24 300}
-test cmdIL-1.16 {Tcl_LsortObjCmd procedure, -integer option} {
-    list [catch {lsort -integer {1 3 2.4}} msg] $msg
-} {1 {expected integer but got "2.4"}}
-test cmdIL-1.17 {Tcl_LsortObjCmd procedure, -real option} {
-    lsort -real {24.2 6e3 150e-1}
-} {150e-1 24.2 6e3}
-test cmdIL-1.18 {Tcl_LsortObjCmd procedure, bogus list} {
-    list [catch {lsort "1 2 3 \{ 4"} msg] $msg
-} {1 {unmatched open brace in list}}
-test cmdIL-1.19 {Tcl_LsortObjCmd procedure, empty list} {
-    lsort {}
-} {}
-
-# Can't think of any good tests for the MergeSort and MergeLists
-# procedures, except a bunch of random lists to sort.
-
-test cmdIL-2.1 {MergeSort and MergeLists procedures} {
-    set result {}
-    set r 1435753299
-    proc rand {} {
-	global r
-	set r [expr (16807 * $r) % (0x7fffffff)]
-    }
-    for {set i 0} {$i < 150} {incr i} {
-	set x {}
-	for {set j 0} {$j < $i} {incr j} {
-	    lappend x [expr [rand] & 0xfff]
-	}
-	set y [lsort -integer $x]
-	set old -1
-	foreach el $y {
-	    if {$el < $old} {
-		append result "list {$x} sorted to {$y}, element $el out of order\n"
-		break
-	    }
-	    set old $el
-	}
-    }
-    set result
-} {}
-
-test cmdIL-3.1 {SortCompare procedure, skip comparisons after error} {
-    set x 0
-    proc cmp {a b} {
-	global x
-	incr x
-	error "error #$x"
-    }
-    list [catch {lsort -integer -command cmp {48 6 28 190 16 2 3 6 1}} msg] \
-	    $msg $x
-} {1 {error #1} 1}
-test cmdIL-3.2 {SortCompare procedure, -index option} {
-    list [catch {lsort -integer -index 2 "\\\{ {30 40 50}"} msg] $msg
-} {1 {unmatched open brace in list}}
-test cmdIL-3.3 {SortCompare procedure, -index option} {
-    list [catch {lsort -integer -index 2 {{20 10} {15 30 40}}} msg] $msg
-} {1 {element 2 missing from sublist "20 10"}}
-test cmdIL-3.4 {SortCompare procedure, -index option} {
-    list [catch {lsort -integer -index 2 "{a b c} \\\{"} msg] $msg
-} {1 {unmatched open brace in list}}
-test cmdIL-3.5 {SortCompare procedure, -index option} {
-    list [catch {lsort -integer -index 2 {{20 10 13} {15}}} msg] $msg
-} {1 {element 2 missing from sublist "15"}}
-test cmdIL-3.6 {SortCompare procedure, -index option} {
-    lsort -integer -index 2 {{1 15 30} {2 5 25} {3 25 20}}
-} {{3 25 20} {2 5 25} {1 15 30}}
-test cmdIL-3.7 {SortCompare procedure, -ascii option} {
-    lsort -ascii {d e c b a d35 d300 100 20}
-} {100 20 a b c d d300 d35 e}
-test cmdIL-3.8 {SortCompare procedure, -dictionary option} {
-    lsort -dictionary {d e c b a d35 d300 100 20}
-} {20 100 a b c d d35 d300 e}
-test cmdIL-3.9 {SortCompare procedure, -integer option} {
-    list [catch {lsort -integer {x 3}} msg] $msg
-} {1 {expected integer but got "x"}}
-test cmdIL-3.10 {SortCompare procedure, -integer option} {
-    list [catch {lsort -integer {3 q}} msg] $msg
-} {1 {expected integer but got "q"}}
-test cmdIL-3.11 {SortCompare procedure, -integer option} {
-    lsort -integer {35 21 0x20 30 023 100 8}
-} {8 023 21 30 0x20 35 100}
-test cmdIL-3.12 {SortCompare procedure, -real option} {
-    list [catch {lsort -real {6...4 3}} msg] $msg
-} {1 {expected floating-point number but got "6...4"}}
-test cmdIL-3.13 {SortCompare procedure, -real option} {
-    list [catch {lsort -real {3 1x7}} msg] $msg
-} {1 {expected floating-point number but got "1x7"}}
-test cmdIL-3.14 {SortCompare procedure, -real option} {
-    lsort -real {24 2.5e01 16.7 85e-1 10.004}
-} {85e-1 10.004 16.7 24 2.5e01}
-test cmdIL-3.15 {SortCompare procedure, -command option} {
-    proc cmp {a b} {
-	error "comparison error"
-    }
-    list [catch {lsort -command cmp {48 6}} msg] $msg $errorInfo
-} {1 {comparison error} {comparison error
-    while executing
-"error "comparison error""
-    (procedure "cmp" line 2)
-    invoked from within
-"cmp 48 6"
-    (-compare command)
-    invoked from within
-"lsort -command cmp {48 6}"}}
-test cmdIL-3.16 {SortCompare procedure, -command option, long command} {
-    proc cmp {dummy a b} {
-	string compare $a $b
-    }
-    lsort -command {cmp {this argument is very very long in order to make the dstring overflow its statically allocated space}} {{this first element is also long in order to help expand the dstring} {the second element, last but not least, is quite long also, in order to make absolutely sure that space is allocated dynamically for the dstring}}
-} {{the second element, last but not least, is quite long also, in order to make absolutely sure that space is allocated dynamically for the dstring} {this first element is also long in order to help expand the dstring}}
-test cmdIL-3.17 {SortCompare procedure, -command option, non-integer result} {
-    proc cmp {a b} {
-	return foow
-    }
-    list [catch {lsort -command cmp {48 6}} msg] $msg
-} {1 {-compare command returned non-numeric result}}
-test cmdIL-3.18 {SortCompare procedure, -command option} {
-    proc cmp {a b} {
-	expr $b - $a
-    }
-    lsort -command cmp {48 6 18 22 21 35 36}
-} {48 36 35 22 21 18 6}
-test cmdIL-3.19 {SortCompare procedure, -decreasing option} {
-    lsort -decreasing -integer {35 21 0x20 30 023 100 8}
-} {100 35 0x20 30 21 023 8}
-
-test cmdIL-4.1 {DictionaryCompare procedure, numerics, leading zeros} {
-    lsort -dictionary {a003b a03b}
-} {a03b a003b}
-test cmdIL-4.2 {DictionaryCompare procedure, numerics, leading zeros} {
-    lsort -dictionary {a3b a03b}
-} {a3b a03b}
-test cmdIL-4.3 {DictionaryCompare procedure, numerics, leading zeros} {
-    lsort -dictionary {a3b A03b}
-} {A03b a3b}
-test cmdIL-4.4 {DictionaryCompare procedure, numerics, leading zeros} {
-    lsort -dictionary {a3b a03B}
-} {a3b a03B}
-test cmdIL-4.5 {DictionaryCompare procedure, numerics, leading zeros} {
-    lsort -dictionary {00000 000}
-} {000 00000}
-test cmdIL-4.6 {DictionaryCompare procedure, numerics, different lengths} {
-    lsort -dictionary {a321b a03210b}
-} {a321b a03210b}
-test cmdIL-4.7 {DictionaryCompare procedure, numerics, different lengths} {
-    lsort -dictionary {a03210b a321b}
-} {a321b a03210b}
-test cmdIL-4.8 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {48 6a 18b 22a 21aa 35 36}
-} {6a 18b 21aa 22a 35 36 48}
-test cmdIL-4.9 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a123x a123b}
-} {a123b a123x}
-test cmdIL-4.10 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a123b a123x}
-} {a123b a123x}
-test cmdIL-4.11 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a1b aab}
-} {a1b aab}
-test cmdIL-4.12 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a1b a!b}
-} {a!b a1b}
-test cmdIL-4.13 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a1b2c a1b1c}
-} {a1b1c a1b2c}
-test cmdIL-4.14 {DictionaryCompare procedure, numerics} {
-    lsort -dictionary {a1b2c a1b3c}
-} {a1b2c a1b3c}
-test cmdIL-4.15 {DictionaryCompare procedure, long numbers} {
-    lsort -dictionary {a7654884321988762b a7654884321988761b}
-} {a7654884321988761b a7654884321988762b}
-test cmdIL-4.16 {DictionaryCompare procedure, long numbers} {
-    lsort -dictionary {a8765488432198876b a7654884321988761b}
-} {a7654884321988761b a8765488432198876b}
-test cmdIL-4.17 {DictionaryCompare procedure, case} {
-    lsort -dictionary {aBCd abcc}
-} {abcc aBCd}
-test cmdIL-4.18 {DictionaryCompare procedure, case} {
-    lsort -dictionary {aBCd abce}
-} {aBCd abce}
-test cmdIL-4.19 {DictionaryCompare procedure, case} {
-    lsort -dictionary {abcd ABcc}
-} {ABcc abcd}
-test cmdIL-4.20 {DictionaryCompare procedure, case} {
-    lsort -dictionary {abcd ABce}
-} {abcd ABce}
-test cmdIL-4.21 {DictionaryCompare procedure, case} {
-    lsort -dictionary {abCD ABcd}
-} {ABcd abCD}
-test cmdIL-4.22 {DictionaryCompare procedure, case} {
-    lsort -dictionary {ABcd aBCd}
-} {ABcd aBCd}
-test cmdIL-4.23 {DictionaryCompare procedure, case} {
-    lsort -dictionary {ABcd AbCd}
-} {ABcd AbCd}
-test cmdIL-4.24 {DictionaryCompare procedure, international characters} {hasIsoLocale} {
-    ::tcltest::set_iso8859_1_locale
-    set result [lsort -dictionary "a b c A B C \xe3 \xc4"]
-    ::tcltest::restore_locale
-    set result
-} "A a B b C c \xe3 \xc4"
-test cmdIL-4.25 {DictionaryCompare procedure, international characters} {hasIsoLocale} {
-    ::tcltest::set_iso8859_1_locale
-    set result [lsort -dictionary "a23\xe3 a23\xc5 a23\xe4"]
-    ::tcltest::restore_locale
-    set result
-} "a23\xe3 a23\xe4 a23\xc5"
-test cmdIL-4.26 {DefaultCompare procedure, signed characters} {
-    set l [lsort [list "abc\200" "abc"]]
-    set viewlist {}
-    foreach s $l {
-	set viewelem ""
-	set len [string length $s]
-	for {set i 0} {$i < $len} {incr i} {
-	    set c [string index $s $i]
-	    scan $c %c d
-	    if {$d > 0 && $d < 128} {
-		append viewelem $c
-	    } else {
-		append viewelem "\\[format %03o $d]"
-	    }
-	}
-	lappend viewlist $viewelem
-    }
-    set viewlist
-} [list "abc" "abc\\200"]
-test cmdIL-4.27 {DictionaryCompare procedure, signed characters} {
-    set l [lsort -dictionary [list "abc\200" "abc"]]
-    set viewlist {}
-    foreach s $l {
-	set viewelem ""
-	set len [string length $s]
-	for {set i 0} {$i < $len} {incr i} {
-	    set c [string index $s $i]
-	    scan $c %c d
-	    if {$d > 0 && $d < 128} {
-		append viewelem $c
-	    } else {
-		append viewelem "\\[format %03o $d]"
-	    }
-	}
-	lappend viewlist $viewelem
-    }
-    set viewlist
-} [list "abc" "abc\\200"]
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
deleted file mode 100644
index ad18e70..0000000
--- a/tests/cmdInfo.test
+++ /dev/null
@@ -1,116 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for Tcl_GetCommandInfo,
-# Tcl_SetCommandInfo, Tcl_CreateCommand, Tcl_DeleteCommand, and
-# Tcl_NameOfCommand.  Sourcing this file into Tcl runs the tests
-# and generates output for errors.  No output means no errors were
-# found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: cmdInfo.test,v 1.3 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testcmdinfo] == {}} {
-    puts "This application hasn't been compiled with the \"testcmdinfo\""
-    puts "command, so I can't test Tcl_GetCommandInfo etc."
-    ::tcltest::cleanupTests
-    return
-}
-
-test cmdinfo-1.1 {command procedure and clientData} {
-    testcmdinfo create x1
-    testcmdinfo get x1
-} {CmdProc1 original CmdDelProc1 original :: stringProc}
-test cmdinfo-1.2 {command procedure and clientData} {
-    testcmdinfo create x1
-    x1
-} {CmdProc1 original}
-test cmdinfo-1.3 {command procedure and clientData} {
-    testcmdinfo create x1
-    testcmdinfo modify x1
-    testcmdinfo get x1
-} {CmdProc2 new_command_data CmdDelProc2 new_delete_data :: stringProc}
-test cmdinfo-1.4 {command procedure and clientData} {
-    testcmdinfo create x1
-    testcmdinfo modify x1
-    x1
-} {CmdProc2 new_command_data}
-
-test cmdinfo-2.1 {command deletion callbacks} {
-    testcmdinfo create x1
-    testcmdinfo delete x1
-} {CmdDelProc1 original}
-test cmdinfo-2.2 {command deletion callbacks} {
-    testcmdinfo create x1
-    testcmdinfo modify x1
-    testcmdinfo delete x1
-} {CmdDelProc2 new_delete_data}
-
-test cmdinfo-3.1 {Tcl_Get/SetCommandInfo return values} {
-    testcmdinfo get non_existent
-} {??}
-test cmdinfo-3.2 {Tcl_Get/SetCommandInfo return values} {
-    testcmdinfo create x1
-    testcmdinfo modify x1
-} 1
-test cmdinfo-3.3 {Tcl_Get/SetCommandInfo return values} {
-    testcmdinfo modify non_existent
-} 0
-
-test cmdinfo-4.1 {Tcl_GetCommandName/Tcl_GetCommandFullName procedures} {
-    set x [testcmdtoken create x1]
-    rename x1 newName
-    set y [testcmdtoken name $x]
-    rename newName x1
-    eval lappend y [testcmdtoken name $x]
-} {newName ::newName x1 ::x1}
-
-catch {rename newTestCmd {}}
-catch {rename newTestCmd2 {}}
-
-test cmdinfo-5.1 {Names for commands created when inside namespaces} {
-    # create namespace cmdInfoNs1
-    namespace eval cmdInfoNs1 {}   ;# creates namespace cmdInfoNs1
-    # create namespace cmdInfoNs1::cmdInfoNs2 and execute a script in it
-    set x [namespace eval cmdInfoNs1::cmdInfoNs2 {
-        # the following creates a cmd in the global namespace
-        testcmdtoken create testCmd
-    }]
-    set y [testcmdtoken name $x]
-    rename ::testCmd newTestCmd
-    eval lappend y [testcmdtoken name $x]
-} {testCmd ::testCmd newTestCmd ::newTestCmd}
-
-test cmdinfo-6.1 {Names for commands created when outside namespaces} {
-    set x [testcmdtoken create cmdInfoNs1::cmdInfoNs2::testCmd]
-    set y [testcmdtoken name $x]
-    rename cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2
-    eval lappend y [testcmdtoken name $x]
-} {testCmd ::cmdInfoNs1::cmdInfoNs2::testCmd newTestCmd2 ::newTestCmd2}
-
-# cleanup
-catch {namespace delete cmdInfoNs1::cmdInfoNs2 cmdInfoNs1}
-catch {rename x1 ""}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
deleted file mode 100644
index 4cd72d2..0000000
--- a/tests/cmdMZ.test
+++ /dev/null
@@ -1,581 +0,0 @@
-# The tests in this file cover the procedures in tclCmdMZ.c.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: cmdMZ.test,v 1.2 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Tcl_PwdObjCmd
-
-test cmdMZ-1.1 {Tcl_PwdObjCmd} {
-    list [catch {pwd a} msg] $msg
-} {1 {wrong # args: should be "pwd"}}
-test cmdMZ-1.2 {Tcl_PwdObjCmd: simple pwd} {
-    catch pwd
-} 0
-test cmdMZ-1.3 {Tcl_PwdObjCmd: simple pwd} {
-    expr [string length pwd]>0
-} 1
-test cmdMZ-1.4 {Tcl_PwdObjCmd: failure} {unixOnly} {
-    file delete -force foo
-    file mkdir foo
-    set cwd [pwd]
-    cd foo
-    file attr . -permissions 000
-    set result [list [catch {pwd} msg] $msg]
-    cd $cwd
-    file delete -force foo
-    set result
-} {1 {error getting working directory name: permission denied}}
-
-# The tests for Tcl_RegexpObjCmd, Tcl_RegsubObjCmd are in regexp.test
-
-# Tcl_RenameObjCmd
-
-test cmdMZ-2.1 {Tcl_RenameObjCmd: error conditions} {
-    list [catch {rename r1} msg] $msg $errorCode
-} {1 {wrong # args: should be "rename oldName newName"} NONE}
-test cmdMZ-2.2 {Tcl_RenameObjCmd: error conditions} {
-    list [catch {rename r1 r2 r3} msg] $msg $errorCode
-} {1 {wrong # args: should be "rename oldName newName"} NONE}
-test cmdMZ-2.3 {Tcl_RenameObjCmd: success} {
-    catch {rename r2 {}}
-    proc r1 {} {return "r1"}
-    rename r1 r2
-    r2
-} {r1}
-test cmdMZ-2.4 {Tcl_RenameObjCmd: success} {
-    proc r1 {} {return "r1"}
-    rename r1 {}
-    list [catch {r1} msg] $msg
-} {1 {invalid command name "r1"}}
-
-# The tests for Tcl_ReturnObjCmd are in proc-old.test
-# The tests for Tcl_ScanObjCmd are in scan.test
-
-# Tcl_SourceObjCmd
-
-test cmdMZ-3.1 {Tcl_SourceObjCmd: error conditions} {macOnly} {
-    list [catch {source} msg] $msg
-} {1 {wrong # args: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test cmdMZ-3.2 {Tcl_SourceObjCmd: error conditions} {macOnly} {
-    list [catch {source a b} msg] $msg
-} {1 {wrong # args: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test cmdMZ-3.3 {Tcl_SourceObjCmd: error conditions} {unixOrPc} {
-    list [catch {source} msg] $msg
-} {1 {wrong # args: should be "source fileName"}}
-test cmdMZ-3.4 {Tcl_SourceObjCmd: error conditions} {unixOrPc} {
-    list [catch {source a b} msg] $msg
-} {1 {wrong # args: should be "source fileName"}}
-test cmdMZ-3.5 {Tcl_SourceObjCmd: error in script} {
-    makeFile {
-	set x 146
-	error "error in sourced file"
-	set y $x
-    } source.file
-    list [catch {source source.file} msg] $msg $errorInfo
-} {1 {error in sourced file} {error in sourced file
-    while executing
-"error "error in sourced file""
-    (file "source.file" line 3)
-    invoked from within
-"source source.file"}}
-test cmdMZ-3.6 {Tcl_SourceObjCmd: simple script} {
-    makeFile {list result} source.file
-    source source.file
-} result
-
-# Tcl_SplitObjCmd
-
-test cmdMZ-4.1 {Tcl_SplitObjCmd: split errors} {
-    list [catch split msg] $msg $errorCode
-} {1 {wrong # args: should be "split string ?splitChars?"} NONE}
-test cmdMZ-4.2 {Tcl_SplitObjCmd: split errors} {
-    list [catch {split a b c} msg] $msg $errorCode
-} {1 {wrong # args: should be "split string ?splitChars?"} NONE}
-test cmdMZ-4.3 {Tcl_SplitObjCmd: basic split commands} {
-    split "a\n b\t\r c\n "
-} {a {} b {} {} c {} {}}
-test cmdMZ-4.4 {Tcl_SplitObjCmd: basic split commands} {
-    split "word 1xyzword 2zword 3" xyz
-} {{word 1} {} {} {word 2} {word 3}}
-test cmdMZ-4.5 {Tcl_SplitObjCmd: basic split commands} {
-    split "12345" {}
-} {1 2 3 4 5}
-test cmdMZ-4.6 {Tcl_SplitObjCmd: basic split commands} {
-    split "a\}b\[c\{\]\$"
-} "a\\}b\\\[c\\{\\\]\\\$"
-test cmdMZ-4.7 {Tcl_SplitObjCmd: basic split commands} {
-    split {} {}
-} {}
-test cmdMZ-4.8 {Tcl_SplitObjCmd: basic split commands} {
-    split {}
-} {}
-test cmdMZ-4.9 {Tcl_SplitObjCmd: basic split commands} {
-    split {   }
-} {{} {} {} {}}
-test cmdMZ-4.10 {Tcl_SplitObjCmd: basic split commands} {
-    proc foo {} {
-        set x {}
-        foreach f [split {]\n} {}] {
-            append x $f
-        }
-        return $x	
-    }
-    foo
-} {]\n}
-test cmdMZ-4.11 {Tcl_SplitObjCmd: basic split commands} {
-    proc foo {} {
-        set x ab\000c
-        set y [split $x {}]
-        return $y
-    }
-    foo
-} "a b \000 c"
-test cmdMZ-4.12 {Tcl_SplitObjCmd: basic split commands} {
-    split "a0ab1b2bbb3\000c4" ab\000c
-} {{} 0 {} 1 2 {} {} 3 {} 4}
-test cmdMZ-4.13 {Tcl_SplitObjCmd: basic split commands} {
-    # if not UTF-8 aware, result is "a {} {} b qw\xe5 {} N wq"
-    split "a\u4e4eb qw\u5e4e\x4e wq" " \u4e4e"
-} "a b qw\u5e4eN wq"
-
-# Tcl_StringObjCmd
-
-test cmdMZ-5.1 {Tcl_StringObjCmd: error conditions} {
-    list [catch {string} msg] $msg
-} {1 {wrong # args: should be "string option arg ?arg ...?"}}
-test cmdMZ-5.2 {Tcl_StringObjCmd: error conditions} {
-    list [catch {string gorp a b} msg] $msg
-} {1 {bad option "gorp": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-
-test cmdMZ-6.1 {Tcl_StringObjCmd: string compare} {
-    list [catch {string compare a} msg] $msg
-} {1 {wrong # args: should be "string compare string1 string2"}}
-test cmdMZ-6.2 {Tcl_StringObjCmd: string compare} {
-    list [catch {string compare a b c} msg] $msg
-} {1 {wrong # args: should be "string compare string1 string2"}}
-test cmdMZ-6.3 {Tcl_StringObjCmd: string compare} {
-    string compare abcde abdef
-} -1
-test cmdMZ-6.4 {Tcl_StringObjCmd: string compare} {
-    string c abcde ABCDE
-} 1
-test cmdMZ-6.5 {Tcl_StringObjCmd: string compare} {
-    string compare abcde abcde
-} 0
-test cmdMZ-6.6 {Tcl_StringObjCmd: string compare} {
-    string compare ab abcde
-} -1
-test cmdMZ-6.7 {Tcl_StringObjCmd: string compare} {
-    string compare abcde ab
-} 1
-test cmdMZ-6.8 {Tcl_StringObjCmd: string compare} {
-    string compare cde ab
-} 1
-test cmdMZ-6.9 {Tcl_StringObjCmd: string compare} {
-    string compare ab cde
-} -1
-test cmdMZ-6.10 {Tcl_StringObjCmd: string compare, unicode} {
-    string compare ab\u7266 ab\u7267
-} -1
-test cmdMZ-6.11 {Tcl_StringObjCmd: string compare, high bit} {
-    # This test will fail if the underlying comparaison
-    # is using signed chars instead of unsigned chars.
-    # (like SunOS's default memcmp thus the compat/memcmp.c)
-    string compare "\x80" "@"
-    # Nb this tests works also in utf8 space because \x80 is
-    # translated into a 2 or more bytes but whose first byte has
-    # the high bit set.
-} 1
-
-test cmdMZ-7.1 {Tcl_StringObjCmd: string first} {
-    list [catch {string first a} msg] $msg
-} {1 {wrong # args: should be "string first string1 string2"}}
-test cmdMZ-7.2 {Tcl_StringObjCmd: string first} {
-    list [catch {string first a b c} msg] $msg
-} {1 {wrong # args: should be "string first string1 string2"}}
-test cmdMZ-7.3 {Tcl_StringObjCmd: string first} {
-    string first bq abcdefgbcefgbqrs
-} 12
-test cmdMZ-7.4 {Tcl_StringObjCmd: string first} {
-    string fir bcd abcdefgbcefgbqrs
-} 1
-test cmdMZ-7.5 {Tcl_StringObjCmd: string first} {
-    string f b abcdefgbcefgbqrs
-} 1
-test cmdMZ-7.6 {Tcl_StringObjCmd: string first} {
-    string first xxx x123xx345xxx789xxx012
-} 9
-test cmdMZ-7.7 {Tcl_StringObjCmd: string first} {
-    string first "" x123xx345xxx789xxx012
-} -1
-test cmdMZ-7.8 {Tcl_StringObjCmd: string first, unicode} {
-    string first x abc\u7266x
-} 4
-test cmdMZ-7.9 {Tcl_StringObjCmd: string first, unicode} {
-    string first \u7266 abc\u7266x
-} 3
-
-test cmdMZ-8.1 {Tcl_StringObjCmd: string index} {
-    list [catch {string index} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test cmdMZ-8.2 {Tcl_StringObjCmd: string index} {
-    list [catch {string index a b c} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test cmdMZ-8.3 {Tcl_StringObjCmd: string index} {
-    list [catch {string index a xyz} msg] $msg
-} {1 {expected integer but got "xyz"}}
-test cmdMZ-8.4 {Tcl_StringObjCmd: string index} {
-    string index abcde 0
-} a
-test cmdMZ-8.5 {Tcl_StringObjCmd: string index} {
-    string i abcde 4
-} e
-test cmdMZ-8.6 {Tcl_StringObjCmd: string index} {
-    string index abcde 5
-} {}
-test cmdMZ-8.7 {Tcl_StringObjCmd: string index} {
-    list [catch {string index abcde -10} msg] $msg
-} {0 {}}
-test cmdMZ-8.8 {Tcl_StringObjCmd: string index, unicode} {
-    string index abc\u7266d 4
-} d
-test cmdMZ-8.9 {Tcl_StringObjCmd: string index, unicode} {
-    string index abc\u7266d 3
-} \u7266
-
-test cmdMZ-9.1 {Tcl_StringObjCmd: string last} {
-    list [catch {string last a} msg] $msg
-} {1 {wrong # args: should be "string last string1 string2"}}
-test cmdMZ-9.2 {Tcl_StringObjCmd: string last} {
-    list [catch {string last a b c} msg] $msg
-} {1 {wrong # args: should be "string last string1 string2"}}
-test cmdMZ-9.3 {Tcl_StringObjCmd: string last} {
-    string la xxx xxxx123xx345x678
-} 1
-test cmdMZ-9.4 {Tcl_StringObjCmd: string last} {
-    string last xx xxxx123xx345x678
-} 7
-test cmdMZ-9.5 {Tcl_StringObjCmd: string last} {
-    string las x xxxx123xx345x678
-} 12
-test cmdMZ-9.6 {Tcl_StringObjCmd: string last, unicode} {
-    string las x xxxx12\u7266xx345x678
-} 12
-test cmdMZ-9.7 {Tcl_StringObjCmd: string last, unicode} {
-    string las \u7266 xxxx12\u7266xx345x678
-} 6
-
-test cmdMZ-10.1 {Tcl_StringObjCmd: string length} {
-    list [catch {string length} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-test cmdMZ-10.2 {Tcl_StringObjCmd: string length} {
-    list [catch {string length a b} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-test cmdMZ-10.3 {Tcl_StringObjCmd: string length} {
-    string length "a little string"
-} 15
-test cmdMZ-10.4 {Tcl_StringObjCmd: string length} {
-    string le ""
-} 0
-test cmdMZ-10.5 {Tcl_StringObjCmd: string length, unicode} {
-    string le "abcd\u7266"
-} 5
-
-test cmdMZ-11.1 {Tcl_StringObjCmd: string match} {
-    list [catch {string match a} msg] $msg
-} {1 {wrong # args: should be "string match pattern string"}}
-test cmdMZ-11.2 {Tcl_StringObjCmd: string match} {
-    list [catch {string match a b c} msg] $msg
-} {1 {wrong # args: should be "string match pattern string"}}
-test cmdMZ-11.3 {Tcl_StringObjCmd: string match} {
-    string match abc abc
-} 1
-test cmdMZ-11.4 {Tcl_StringObjCmd: string match} {
-    string m abc abd
-} 0
-
-test cmdMZ-12.1 {Tcl_StringObjCmd: string range} {
-    list [catch {string range} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test cmdMZ-12.2 {Tcl_StringObjCmd: string range} {
-    list [catch {string range a 1} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test cmdMZ-12.3 {Tcl_StringObjCmd: string range} {
-    list [catch {string range a 1 2 3} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test cmdMZ-12.4 {Tcl_StringObjCmd: string range} {
-    list [catch {string range abc abc 1} msg] $msg
-} {1 {bad index "abc": must be integer or "end"}}
-test cmdMZ-12.5 {Tcl_StringObjCmd: string range} {
-    list [catch {string range abc 1 eof} msg] $msg
-} {1 {bad index "eof": must be integer or "end"}}
-test cmdMZ-12.6 {Tcl_StringObjCmd: string range, first < 0} {
-    string range abcdefghijklmnop -3 2
-} {abc}
-test cmdMZ-12.7 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop 2 14
-} {cdefghijklmno}
-test cmdMZ-12.8 {Tcl_StringObjCmd: string range, last > length} {
-    string range abcdefghijklmnop 7 1000
-} {hijklmnop}
-test cmdMZ-12.9 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop 10 e
-} {klmnop}
-test cmdMZ-12.10 {Tcl_StringObjCmd: string range, last < first} {
-    string range abcdefghijklmnop 10 9
-} {}
-test cmdMZ-12.11 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop -3 -2
-} {}
-test cmdMZ-12.12 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop 1000 1010
-} {}
-test cmdMZ-12.13 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop -100 end
-} {abcdefghijklmnop}
-test cmdMZ-12.14 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop end end
-} {p}
-test cmdMZ-12.15 {Tcl_StringObjCmd: string range} {
-    string range abcdefghijklmnop e 1000
-} {p}
-test cmdMZ-12.16 {Tcl_StringObjCmd: string range, unicode} {
-    string range ab\u7266cdefghijklmnop 5 5
-} e
-test cmdMZ-12.17 {Tcl_StringObjCmd: string range, unicode} {
-    string range ab\u7266cdefghijklmnop 2 3
-} \u7266c
-
-test cmdMZ-13.1 {Tcl_StringObjCmd: string tolower} {
-    list [catch {string tolower} msg] $msg
-} {1 {wrong # args: should be "string tolower string"}}
-test cmdMZ-13.2 {Tcl_StringObjCmd: string tolower} {
-    list [catch {string tolower a b} msg] $msg
-} {1 {wrong # args: should be "string tolower string"}}
-test cmdMZ-13.3 {Tcl_StringObjCmd: string tolower} {
-    string tolower ABCDeF
-} {abcdef}
-test cmdMZ-13.4 {Tcl_StringObjCmd: string tolower} {
-    string tolower "ABC  XyZ"
-} {abc  xyz}
-test cmdMZ-13.5 {Tcl_StringObjCmd: string tolower} {
-    string tolower {123#$&*()}
-} {123#$&*()}
-test cmdMZ-13.6 {Tcl_StringObjCmd: string tolower, unicode} {
-     string tolower ABCabc\xc7\xe7
-} "abcabc\xe7\xe7"
-
-test cmdMZ-14.1 {Tcl_StringObjCmd: string toupper} {
-    list [catch {string toupper} msg] $msg
-} {1 {wrong # args: should be "string toupper string"}}
-test cmdMZ-14.2 {Tcl_StringObjCmd: string toupper} {
-    list [catch {string toupper a b} msg] $msg
-} {1 {wrong # args: should be "string toupper string"}}
-test cmdMZ-14.3 {Tcl_StringObjCmd: string toupper} {
-    string toupper abCDEf
-} {ABCDEF}
-test cmdMZ-14.4 {Tcl_StringObjCmd: string toupper} {
-    string toupper "abc xYz"
-} {ABC XYZ}
-test cmdMZ-14.5 {Tcl_StringObjCmd: string toupper} {
-    string toupper {123#$&*()}
-} {123#$&*()}
-test cmdMZ-14.6 {Tcl_StringObjCmd: string toupper, unicode} {
-    string toupper ABCabc\xc7\xe7
-} "ABCABC\xc7\xc7"
-
-test cmdMZ-15.1 {Tcl_StringObjCmd: string totitle} {
-    list [catch {string totitle} msg] $msg
-} {1 {wrong # args: should be "string totitle string"}}
-test cmdMZ-15.2 {Tcl_StringObjCmd: string totitle} {
-    list [catch {string totitle a b} msg] $msg
-} {1 {wrong # args: should be "string totitle string"}}
-test cmdMZ-15.3 {Tcl_StringObjCmd: string totitle} {
-    string totitle abCDEf
-} {Abcdef}
-test cmdMZ-15.4 {Tcl_StringObjCmd: string totitle} {
-    string totitle "abc xYz"
-} {Abc xyz}
-test cmdMZ-15.5 {Tcl_StringObjCmd: string totitle} {
-    string totitle {123#$&*()}
-} {123#$&*()}
-test cmdMZ-15.6 {Tcl_StringObjCmd: string totitle, unicode} {
-    string totitle ABCabc\xc7\xe7
-} "Abcabc\xe7\xe7"
-test cmdMZ-15.7 {Tcl_StringObjCmd: string totitle, unicode} {
-    string totitle \u01f3BCabc\xc7\xe7
-} "\u01f2bcabc\xe7\xe7"
-
-test cmdMZ-16.1 {Tcl_StringObjCmd: string trim} {
-    list [catch {string trim} msg] $msg
-} {1 {wrong # args: should be "string trim string ?chars?"}}
-test cmdMZ-16.2 {Tcl_StringObjCmd: string trim} {
-    list [catch {string trim a b c} msg] $msg
-} {1 {wrong # args: should be "string trim string ?chars?"}}
-test cmdMZ-16.3 {Tcl_StringObjCmd: string trim} {
-    string trim "    XYZ      "
-} {XYZ}
-test cmdMZ-16.4 {Tcl_StringObjCmd: string trim} {
-    string trim "\t\nXYZ\t\n\r\n"
-} {XYZ}
-test cmdMZ-16.5 {Tcl_StringObjCmd: string trim} {
-    string trim "  A XYZ A    "
-} {A XYZ A}
-test cmdMZ-16.6 {Tcl_StringObjCmd: string trim} {
-    string trim "XXYYZZABC XXYYZZ" ZYX
-} {ABC }
-test cmdMZ-16.7 {Tcl_StringObjCmd: string trim} {
-    string trim "    \t\r      "
-} {}
-test cmdMZ-16.8 {Tcl_StringObjCmd: string trim} {
-    string trim {abcdefg} {}
-} {abcdefg}
-test cmdMZ-16.9 {Tcl_StringObjCmd: string trim} {
-    string trim {}
-} {}
-test cmdMZ-16.10 {Tcl_StringObjCmd: string trim} {
-    string trim ABC DEF
-} {ABC}
-test cmdMZ-16.11 {Tcl_StringObjCmd: string trim, unicode} {
-    string trim "\xe7\xe8 AB\xe7C \xe8\xe7" \xe7\xe8
-} " AB\xe7C "
-
-test cmdMZ-17.1 {Tcl_StringObjCmd: string trimleft} {
-    string trimleft "    XYZ      "
-} {XYZ      }
-test cmdMZ-17.2 {Tcl_StringObjCmd: string trimleft} {
-    list [catch {string trimleft} msg] $msg
-} {1 {wrong # args: should be "string trimleft string ?chars?"}}
-test cmdMZ-17.3 {Tcl_StringObjCmd: string trimleft} {
-    string length [string trimleft " "]
-} {0}
-
-test cmdMZ-18.1 {Tcl_StringObjCmd: string trimright} {
-    string trimright "    XYZ      "
-} {    XYZ}
-test cmdMZ-18.2 {Tcl_StringObjCmd: string trimright} {
-    string trimright "   "
-} {}
-test cmdMZ-18.3 {Tcl_StringObjCmd: string trimright} {
-    string trimright ""
-} {}
-test cmdMZ-18.4 {Tcl_StringObjCmd: string trimright errors} {
-    list [catch {string trimright} msg] $msg
-} {1 {wrong # args: should be "string trimright string ?chars?"}}
-test cmdMZ-18.5 {Tcl_StringObjCmd: string trimright errors} {
-    list [catch {string trimg a} msg] $msg
-} {1 {bad option "trimg": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-
-test cmdMZ-19.1 {Tcl_StringObjCmd: string wordend} {
-    list [catch {string wordend a} msg] $msg
-} {1 {wrong # args: should be "string wordend string index"}}
-test cmdMZ-19.2 {Tcl_StringObjCmd: string wordend} {
-    list [catch {string wordend a b c} msg] $msg
-} {1 {wrong # args: should be "string wordend string index"}}
-test cmdMZ-19.3 {Tcl_StringObjCmd: string wordend} {
-    list [catch {string wordend a gorp} msg] $msg
-} {1 {expected integer but got "gorp"}}
-test cmdMZ-19.4 {Tcl_StringObjCmd: string wordend} {
-    string wordend abc. -1
-} 3
-test cmdMZ-19.5 {Tcl_StringObjCmd: string wordend} {
-    string wordend abc. 100
-} 4
-test cmdMZ-19.6 {Tcl_StringObjCmd: string wordend} {
-    string wordend "word_one two three" 2
-} 8
-test cmdMZ-19.7 {Tcl_StringObjCmd: string wordend} {
-    string wordend "one .&# three" 5
-} 6
-test cmdMZ-19.8 {Tcl_StringObjCmd: string wordend} {
-    string worde "x.y" 0
-} 1
-test cmdMZ-19.9 {Tcl_StringObjCmd: string wordend, unicode} {
-    string wordend "xyz\u00c7de fg" 0
-} 6
-test cmdMZ-19.10 {Tcl_StringObjCmd: string wordend, unicode} {
-    string wordend "xyz\uc700de fg" 0
-} 6
-test cmdMZ-19.11 {Tcl_StringObjCmd: string wordend, unicode} {
-    string wordend "xyz\u203fde fg" 0
-} 6
-test cmdMZ-19.12 {Tcl_StringObjCmd: string wordend, unicode} {
-    string wordend "xyz\u2045de fg" 0
-} 3
-test cmdMZ-19.13 {Tcl_StringObjCmd: string wordend, unicode} {
-    string wordend "\uc700\uc700 abc" 8
-} 6
-
-test cmdMZ-20.1 {Tcl_StringObjCmd: string wordstart} {
-    list [catch {string word a} msg] $msg
-} {1 {ambiguous option "word": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-test cmdMZ-20.2 {Tcl_StringObjCmd: string wordstart} {
-    list [catch {string wordstart a} msg] $msg
-} {1 {wrong # args: should be "string wordstart string index"}}
-test cmdMZ-20.3 {Tcl_StringObjCmd: string wordstart} {
-    list [catch {string wordstart a b c} msg] $msg
-} {1 {wrong # args: should be "string wordstart string index"}}
-test cmdMZ-20.4 {Tcl_StringObjCmd: string wordstart} {
-    list [catch {string wordstart a gorp} msg] $msg
-} {1 {expected integer but got "gorp"}}
-test cmdMZ-20.5 {Tcl_StringObjCmd: string wordstart} {
-    string wordstart "one two three_words" 400
-} 8
-test cmdMZ-20.6 {Tcl_StringObjCmd: string wordstart} {
-    string wordstart "one two three_words" 2
-} 0
-test cmdMZ-20.7 {Tcl_StringObjCmd: string wordstart} {
-    string wordstart "one two three_words" -2
-} 0
-test cmdMZ-20.8 {Tcl_StringObjCmd: string wordstart} {
-    string wordstart "one .*&^ three" 6
-} 6
-test cmdMZ-20.9 {Tcl_StringObjCmd: string wordstart} {
-    string wordstart "one two three" 4
-} 4
-test cmdMZ-20.10 {Tcl_StringObjCmd: string wordstart, unicode} {
-    string wordstart "one tw\u00c7o three" 7
-} 4
-test cmdMZ-20.11 {Tcl_StringObjCmd: string wordstart, unicode} {
-    string wordstart "ab\uc700\uc700 cdef ghi" 12
-} 10
-test cmdMZ-20.12 {Tcl_StringObjCmd: string wordstart, unicode} {
-    string wordstart "\uc700\uc700 abc" 8
-} 3
-
-# The tests for Tcl_SubstObjCmd are in subst.test
-# The tests for Tcl_SwitchObjCmd are in switch.test
-# There are no tests for Tcl_TimeObjCmd
-# The tests for Tcl_TraceObjCmd and TraceVarProc are in trace.test
-# The tests for Tcl_WhileObjCmd are in while.test
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
deleted file mode 100644
index 5e1fa9a..0000000
--- a/tests/compExpr-old.test
+++ /dev/null
@@ -1,687 +0,0 @@
-# Commands covered: expr
-#
-# This file contains the original set of tests for the compilation (and
-# indirectly execution) of Tcl's expr command. A new set of tests covering
-# the new implementation are in the files "parseExpr.test and
-# "compExpr.test". Sourcing this file into Tcl runs the tests and generates
-# output for errors. No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: compExpr-old.test,v 1.2 1999/04/16 00:47:24 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
-    set gotT1 0
-    puts "This application hasn't been compiled with the \"T1\" and"
-    puts "\"T2\" math functions, so I'll skip some of the expr tests."
-} else {
-    set gotT1 1
-}
-
-# procedures used below
-
-proc put_hello_char {c} {
-    global a
-    append a [format %c $c]
-    return $c
-}
-proc hello_world {} {
-    global a
-    set a ""
-    set L1 [set l0 [set h_1 [set q 0]]]
-    for {put_hello_char [expr [put_hello_char [expr [set h 7]*10+2]]+29]} {$l0?[put_hello_char $l0]
-        :!$h_1} {put_hello_char $ll;expr {$L1==2?[set ll [expr 32+0-0+[set bar 0]]]:0}} {expr {[incr L1]==[expr 1+([string length "abc"]-[string length "abc"])]
-        ?[set ll [set l0 [expr 54<<1]]]:$ll==108&&$L1<3?
-        [incr ll [expr 1|1<<1]; set ll $ll; set ll $ll; set ll $ll; set ll $ll; set l0 [expr ([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])]; set l0; set l0 $l0; set l0; set l0]:$L1==4&&$ll==32?[set ll [expr 19+$h1+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+[set foo [expr ([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])]]]]
-        :[set q [expr $q-$h1+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])]]};expr {$L1==5?[incr ll -8; set ll $ll; set ll]:$q&&$h1&&1};expr {$L1==4+2
-        ?[incr ll 3]:[expr ([string length "abc"]-[string length "abc"])+1]};expr {$ll==($h<<4)+2+0&&$L1!=6?[incr ll -6]:[set h1 [expr 100+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])]]}
-        expr {$L1!=1<<3?[incr q [expr ([string length "abc"]-[string length "abc"])-1]]:[set h_1 [set ll $h1]]}
-    }
-    set a
-}
-
-proc 12days {a b c} {
-    global xxx
-    expr {1<$a?[expr {$a<3?[12days -79 -13 [string range $c [12days -87 \
-	[expr 1-$b] [string range $c [12days -86 0 [string range $c 1 end]] \
-	end]] end]]:1};expr {$a<$b?[12days [expr $a+1] $b $c]:3};expr {[12days \
-	-94 [expr $a-27] $c]&&$a==2?$b<13?[12days 2 [expr $b+1] "%s %d %d\n"]:9
-	:16}]:$a<0?$a<-72?[12days $b $a "@n'+,#'/*\{\}w+/w#cdnr/+,\{\}r/*de\}+,/*\{*+,/w\{%+,/w#q#n+,/#\{l+,/n\{n+,/+#n+,/#;#q#n+,/+k#;*+,/'r :'d*'3,\}\{w+K w'K:'+\}e#';dq#'l q#'+d'K#!/+k#;q#'r\}eKK#\}w'r\}eKK\{nl\]'/#;#q#n')\{)#\}w')\{)\{nl\]'/+#n';d\}rw' i;# )\{nl\]!/n\{n#'; r\{#w'r nc\{nl\]'/#\{l,+'K \{rw' iK\{;\[\{nl\]'/w#q#n'wk nw' iwk\{KK\{nl\]!/w\{%'l##w#' i; :\{nl\]'/*\{q#'ld;r'\}\{nlwb!/*de\}'c ;;\{nl'-\{\}rw\]'/+,\}##'*\}#nc,',#nw\]'/+kd'+e\}+;#'rdq#w! nr'/ ') \}+\}\{rl#'\{n' ')# \}'+\}##(!!/"]
-	:$a<-50?[string compare [format %c $b] [string index $c 0]]==0?[append \
-	xxx [string index $c 31];scan [string index $c 31] %c x;set x]
-	:[12days -65 $b [string range $c 1 end]]:[12days [expr ([string compare \
-	[string index $c 0] "/"]==0)+$a] $b [string range $c 1 end]]:0<$a
-	?[12days 2 2 "%s"]:[string compare [string index $c 0] "/"]==0||
-	[12days 0 [12days -61 [scan [string index $c 0] %c x; set x] \
-	"!ek;dc i@bK'(q)-\[w\]*%n+r3#l,\{\}:\nuwloca-O;m .vpbks,fxntdCeghiry"] \
-	[string range $c 1 end]]}
-}
-proc do_twelve_days {} {
-    global xxx
-    set xxx ""
-    12days 1 1 1
-    string length $xxx
-}
-
-# start of tests
-
-catch {unset a b i x}
-
-test expr-1.1 {TclCompileExprCmd: no expression} {
-    list [catch {expr  } msg] $msg
-} {1 {wrong # args: should be "expr arg ?arg ...?"}}
-test expr-1.2 {TclCompileExprCmd: one expression word} {
-    expr -25
-} -25
-test expr-1.3 {TclCompileExprCmd: two expression words} {
-    expr -8.2   -6
-} -14.2
-test expr-1.4 {TclCompileExprCmd: five expression words} {
-    expr 20 - 5 +10 -7
-} 18
-test expr-1.5 {TclCompileExprCmd: quoted expression word} {
-    expr "0005"
-} 5
-test expr-1.6 {TclCompileExprCmd: quoted expression word} {
-    catch {expr "0005"zxy} msg
-    set msg
-} {extra characters after close-quote}
-test expr-1.7 {TclCompileExprCmd: expression word in braces} {
-    expr {-0005}
-} -5
-test expr-1.8 {TclCompileExprCmd: expression word in braces} {
-    expr {{-0x1234}}
-} -4660
-test expr-1.9 {TclCompileExprCmd: expression word in braces} {
-    catch {expr {-0005}foo} msg
-    set msg
-} {extra characters after close-brace}
-test expr-1.10 {TclCompileExprCmd: other expression word in braces} {
-    expr 4*[llength "6 2"]
-} 8
-test expr-1.11 {TclCompileExprCmd: expression word terminated by ;} {
-    expr 4*[llength "6 2"];
-} 8
-test expr-1.12 {TclCompileExprCmd: inlined expr (in "catch") inside other catch} {
-    set a xxx
-    catch {
-	# Might not be a number
-	set a [expr 10*$a]
-    }
-} 1
-test expr-1.13 {TclCompileExprCmd: second level of substitutions in expr not in braces with single var reference} {
-    set a xxx
-    set x 27;  set bool {$x};  if $bool {set a foo}
-    set a
-} foo
-test expr-1.14 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
-    set a xxx
-    set x 2;  set b {$x};  set a [expr $b == 2]
-    set a
-} 1
-
-test expr-2.1 {TclCompileExpr: are builtin functions registered?} {
-    expr double(5*[llength "6 2"])
-} 10.0
-test expr-2.2 {TclCompileExpr: error in expr} {
-    catch {expr 2**3} msg
-    set msg
-} {syntax error in expression "2**3"}
-test expr-2.3 {TclCompileExpr: junk after legal expr} {
-    catch {expr 7*[llength "a b"]foo} msg
-    set msg
-} {syntax error in expression "7*2foo"}
-test expr-2.4 {TclCompileExpr: numeric expr string rep == formatted int rep} {
-    expr {0001}
-} 1
-
-test expr-3.1 {CompileCondExpr: just lor expr} {expr 3||0} 1
-test expr-3.2 {CompileCondExpr: error in lor expr} {
-    catch {expr x||3} msg
-    set msg
-} {syntax error in expression "x||3"} 
-test expr-3.3 {CompileCondExpr: test true arm} {expr 3>2?44:66} 44
-test expr-3.4 {CompileCondExpr: error compiling true arm} {
-    catch {expr 3>2?2**3:66} msg
-    set msg
-} {syntax error in expression "3>2?2**3:66"}
-test expr-3.5 {CompileCondExpr: test false arm} {expr 2>3?44:66} 66
-test expr-3.6 {CompileCondExpr: error compiling false arm} {
-    catch {expr 2>3?44:2**3} msg
-    set msg
-} {syntax error in expression "2>3?44:2**3"}
-test expr-3.7 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
-    puts "Note: doing test expr-3.7 which can take several minutes to run"
-    hello_world
-} {Hello world}
-catch {unset xxx}
-test expr-3.8 {CompileCondExpr: long arms & nested cond exprs} {nonPortable} {
-    puts "Note: doing test expr-3.8 which can take several minutes to run"
-    do_twelve_days
-} 2358
-catch {unset xxx}
-
-test expr-4.1 {CompileLorExpr: just land expr} {expr 1.3&&3.3} 1
-test expr-4.2 {CompileLorExpr: error in land expr} {
-    catch {expr x&&3} msg
-    set msg
-} {syntax error in expression "x&&3"} 
-test expr-4.3 {CompileLorExpr: simple lor exprs} {expr 0||1.0} 1
-test expr-4.4 {CompileLorExpr: simple lor exprs} {expr 3.0||0.0} 1
-test expr-4.5 {CompileLorExpr: simple lor exprs} {expr 0||0||1} 1
-test expr-4.6 {CompileLorExpr: error compiling lor arm} {
-    catch {expr 2**3||4.0} msg
-    set msg
-} {syntax error in expression "2**3||4.0"}
-test expr-4.7 {CompileLorExpr: error compiling lor arm} {
-    catch {expr 1.3||2**3} msg
-    set msg
-} {syntax error in expression "1.3||2**3"}
-test expr-4.8 {CompileLorExpr: error compiling lor arms} {
-    list [catch {expr {"a"||"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-4.9 {CompileLorExpr: long lor arm} {
-    set a "abcdefghijkl"
-    set i 7
-    expr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]}
-} 1
-
-test expr-5.1 {CompileLandExpr: just bitor expr} {expr 7|0x13} 23
-test expr-5.2 {CompileLandExpr: error in bitor expr} {
-    catch {expr x|3} msg
-    set msg
-} {syntax error in expression "x|3"} 
-test expr-5.3 {CompileLandExpr: simple land exprs} {expr 0&&1.0} 0
-test expr-5.4 {CompileLandExpr: simple land exprs} {expr 0&&0} 0
-test expr-5.5 {CompileLandExpr: simple land exprs} {expr 3.0&&1.2} 1
-test expr-5.6 {CompileLandExpr: simple land exprs} {expr 1&&1&&2} 1
-test expr-5.7 {CompileLandExpr: error compiling land arm} {
-    catch {expr 2**3&&4.0} msg
-    set msg
-} {syntax error in expression "2**3&&4.0"}
-test expr-5.8 {CompileLandExpr: error compiling land arm} {
-    catch {expr 1.3&&2**3} msg
-    set msg
-} {syntax error in expression "1.3&&2**3"}
-test expr-5.9 {CompileLandExpr: error compiling land arm} {
-    list [catch {expr {"a"&&"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-5.10 {CompileLandExpr: long land arms} {
-    set a "abcdefghijkl"
-    set i 7
-    expr {[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]}
-} 1
-
-test expr-6.1 {CompileBitXorExpr: just bitand expr} {expr 7&0x13} 3
-test expr-6.2 {CompileBitXorExpr: error in bitand expr} {
-    catch {expr x|3} msg
-    set msg
-} {syntax error in expression "x|3"} 
-test expr-6.3 {CompileBitXorExpr: simple bitxor exprs} {expr 7^0x13} 20
-test expr-6.4 {CompileBitXorExpr: simple bitxor exprs} {expr 3^0x10} 19
-test expr-6.5 {CompileBitXorExpr: simple bitxor exprs} {expr 0^7} 7
-test expr-6.6 {CompileBitXorExpr: simple bitxor exprs} {expr -1^7} -8
-test expr-6.7 {CompileBitXorExpr: error compiling bitxor arm} {
-    catch {expr 2**3|6} msg
-    set msg
-} {syntax error in expression "2**3|6"}
-test expr-6.8 {CompileBitXorExpr: error compiling bitxor arm} {
-    catch {expr 2^x} msg
-    set msg
-} {syntax error in expression "2^x"}
-test expr-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
-    list [catch {expr {24.0^3}} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
-test expr-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
-    list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
-
-test expr-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
-test expr-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
-test expr-7.3 {CompileBitAndExpr: just equality expr} {expr 3.2!=2.2} 1
-test expr-7.4 {CompileBitAndExpr: just equality expr} {expr {"abc" == "abd"}} 0
-test expr-7.5 {CompileBitAndExpr: error in equality expr} {
-    catch {expr x==3} msg
-    set msg
-} {syntax error in expression "x==3"} 
-test expr-7.6 {CompileBitAndExpr: simple bitand exprs} {expr 7&0x13} 3
-test expr-7.7 {CompileBitAndExpr: simple bitand exprs} {expr 0xf2&0x53} 82
-test expr-7.8 {CompileBitAndExpr: simple bitand exprs} {expr 3&6} 2
-test expr-7.9 {CompileBitAndExpr: simple bitand exprs} {expr -1&-7} -7
-test expr-7.10 {CompileBitAndExpr: error compiling bitand arm} {
-    catch {expr 2**3&6} msg
-    set msg
-} {syntax error in expression "2**3&6"}
-test expr-7.11 {CompileBitAndExpr: error compiling bitand arm} {
-    catch {expr 2&x} msg
-    set msg
-} {syntax error in expression "2&x"}
-test expr-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
-    list [catch {expr {24.0&3}} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
-test expr-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
-    list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
-
-test expr-8.1 {CompileEqualityExpr: just relational expr} {expr 3>=2} 1
-test expr-8.2 {CompileEqualityExpr: just relational expr} {expr 2<=2.1} 1
-test expr-8.3 {CompileEqualityExpr: just relational expr} {expr 3.2>"2.2"} 1
-test expr-8.4 {CompileEqualityExpr: just relational expr} {expr {"0y"<"0x12"}} 0
-test expr-8.5 {CompileEqualityExpr: error in relational expr} {
-    catch {expr x>3} msg
-    set msg
-} {syntax error in expression "x>3"} 
-test expr-8.6 {CompileEqualityExpr: simple equality exprs} {expr 7==0x13} 0
-test expr-8.7 {CompileEqualityExpr: simple equality exprs} {expr -0xf2!=0x53} 1
-test expr-8.8 {CompileEqualityExpr: simple equality exprs} {expr {"12398712938788234-1298379" != ""}} 1
-test expr-8.9 {CompileEqualityExpr: simple equality exprs} {expr -1!="abc"} 1
-test expr-8.10 {CompileEqualityExpr: error compiling equality arm} {
-    catch {expr 2**3==6} msg
-    set msg
-} {syntax error in expression "2**3==6"}
-test expr-8.11 {CompileEqualityExpr: error compiling equality arm} {
-    catch {expr 2!=x} msg
-    set msg
-} {syntax error in expression "2!=x"}
-
-
-test expr-9.1 {CompileRelationalExpr: just shift expr} {expr 3<<2} 12
-test expr-9.2 {CompileRelationalExpr: just shift expr} {expr 0xff>>2} 63
-test expr-9.3 {CompileRelationalExpr: just shift expr} {expr -1>>2} -1
-test expr-9.4 {CompileRelationalExpr: just shift expr} {expr {1<<3}} 8
-
-# The following test is different for 32-bit versus 64-bit
-# architectures because LONG_MIN is different
-
-if {0x80000000 > 0} {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
-	expr {1<<63}
-    } -9223372036854775808
-} else {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
-	expr {1<<31}
-    } -2147483648
-}
-test expr-9.6 {CompileRelationalExpr: error in shift expr} {
-    catch {expr x>>3} msg
-    set msg
-} {syntax error in expression "x>>3"} 
-test expr-9.7 {CompileRelationalExpr: simple relational exprs} {expr 0xff>=+0x3} 1
-test expr-9.8 {CompileRelationalExpr: simple relational exprs} {expr -0xf2<0x3} 1
-test expr-9.9 {CompileRelationalExpr: error compiling relational arm} {
-    catch {expr 2**3>6} msg
-    set msg
-} {syntax error in expression "2**3>6"}
-test expr-9.10 {CompileRelationalExpr: error compiling relational arm} {
-    catch {expr 2<x} msg
-    set msg
-} {syntax error in expression "2<x"}
-
-test expr-10.1 {CompileShiftExpr: just add expr} {expr 4+-2} 2
-test expr-10.2 {CompileShiftExpr: just add expr} {expr 0xff-2} 253
-test expr-10.3 {CompileShiftExpr: just add expr} {expr -1--2} 1
-test expr-10.4 {CompileShiftExpr: just add expr} {expr 1-0123} -82
-test expr-10.5 {CompileShiftExpr: error in add expr} {
-    catch {expr x+3} msg
-    set msg
-} {syntax error in expression "x+3"}
-test expr-10.6 {CompileShiftExpr: simple shift exprs} {expr 0xff>>0x3} 31
-test expr-10.7 {CompileShiftExpr: simple shift exprs} {expr -0xf2<<0x3} -1936
-test expr-10.8 {CompileShiftExpr: error compiling shift arm} {
-    catch {expr 2**3>>6} msg
-    set msg
-} {syntax error in expression "2**3>>6"}
-test expr-10.9 {CompileShiftExpr: error compiling shift arm} {
-    catch {expr 2<<x} msg
-    set msg
-} {syntax error in expression "2<<x"}
-test expr-10.10 {CompileShiftExpr: runtime error} {
-    list [catch {expr {24.0>>43}} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
-test expr-10.11 {CompileShiftExpr: runtime error} {
-    list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
-
-test expr-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
-test expr-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
-test expr-11.3 {CompileAddExpr: just multiply expr} {expr -1/2} -1
-test expr-11.4 {CompileAddExpr: just multiply expr} {expr 7891%0123} 6
-test expr-11.5 {CompileAddExpr: error in multiply expr} {
-    catch {expr x*3} msg
-    set msg
-} {syntax error in expression "x*3"}
-test expr-11.6 {CompileAddExpr: simple add exprs} {expr 0xff++0x3} 258
-test expr-11.7 {CompileAddExpr: simple add exprs} {expr -0xf2--0x3} -239
-test expr-11.8 {CompileAddExpr: error compiling add arm} {
-    catch {expr 2**3+6} msg
-    set msg
-} {syntax error in expression "2**3+6"}
-test expr-11.9 {CompileAddExpr: error compiling add arm} {
-    catch {expr 2-x} msg
-    set msg
-} {syntax error in expression "2-x"}
-test expr-11.10 {CompileAddExpr: runtime error} {
-    list [catch {expr {24.0+"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-11.11 {CompileAddExpr: runtime error} {
-    list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-test expr-11.12 {CompileAddExpr: runtime error} {
-    list [catch {expr {3/0}} msg] $msg
-} {1 {divide by zero}}
-test expr-11.13 {CompileAddExpr: runtime error} {
-    list [catch {expr {2.3/0.0}} msg] $msg
-} {1 {divide by zero}}
-
-test expr-12.1 {CompileMultiplyExpr: just unary expr} {expr ~4} -5
-test expr-12.2 {CompileMultiplyExpr: just unary expr} {expr --5} 5
-test expr-12.3 {CompileMultiplyExpr: just unary expr} {expr !27} 0
-test expr-12.4 {CompileMultiplyExpr: just unary expr} {expr ~0xff00ff} -16711936
-test expr-12.5 {CompileMultiplyExpr: error in unary expr} {
-    catch {expr ~x} msg
-    set msg
-} {syntax error in expression "~x"}
-test expr-12.6 {CompileMultiplyExpr: simple multiply exprs} {expr 0xff*0x3} 765
-test expr-12.7 {CompileMultiplyExpr: simple multiply exprs} {expr -0xf2%-0x3} -2
-test expr-12.8 {CompileMultiplyExpr: error compiling multiply arm} {
-    catch {expr 2*3%%6} msg
-    set msg
-} {syntax error in expression "2*3%%6"}
-test expr-12.9 {CompileMultiplyExpr: error compiling multiply arm} {
-    catch {expr 2*x} msg
-    set msg
-} {syntax error in expression "2*x"}
-test expr-12.10 {CompileMultiplyExpr: runtime error} {
-    list [catch {expr {24.0*"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
-test expr-12.11 {CompileMultiplyExpr: runtime error} {
-    list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-
-test expr-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
-test expr-13.2 {CompileUnaryExpr: unary exprs} {expr +000123} 83
-test expr-13.3 {CompileUnaryExpr: unary exprs} {expr +--++36} 36
-test expr-13.4 {CompileUnaryExpr: unary exprs} {expr !2} 0
-test expr-13.5 {CompileUnaryExpr: unary exprs} {expr +--+-62.0} -62.0
-test expr-13.6 {CompileUnaryExpr: unary exprs} {expr !0.0} 1
-test expr-13.7 {CompileUnaryExpr: unary exprs} {expr !0xef} 0
-test expr-13.8 {CompileUnaryExpr: error compiling unary expr} {
-    catch {expr ~x} msg
-    set msg
-} {syntax error in expression "~x"}
-test expr-13.9 {CompileUnaryExpr: error compiling unary expr} {
-    catch {expr !1.x} msg
-    set msg
-} {syntax error in expression "!1.x"}
-test expr-13.10 {CompileUnaryExpr: runtime error} {
-    list [catch {expr {~"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
-test expr-13.11 {CompileUnaryExpr: runtime error} {
-    list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
-test expr-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
-test expr-13.13 {CompileUnaryExpr: just primary expr} {
-    set a 27
-    expr $a
-} 27
-test expr-13.14 {CompileUnaryExpr: just primary expr} {
-    expr double(27)
-} 27.0
-test expr-13.15 {CompileUnaryExpr: just primary expr} {expr "123"} 123
-test expr-13.16 {CompileUnaryExpr: error in primary expr} {
-    catch {expr [set]} msg
-    set msg
-} {wrong # args: should be "set varName ?newValue?"}
-test expr-14.1 {CompilePrimaryExpr: literal primary} {expr 1} 1
-test expr-14.2 {CompilePrimaryExpr: literal primary} {expr 123} 123
-test expr-14.3 {CompilePrimaryExpr: literal primary} {expr 0xff} 255
-test expr-14.4 {CompilePrimaryExpr: literal primary} {expr 00010} 8
-test expr-14.5 {CompilePrimaryExpr: literal primary} {expr 62.0} 62.0
-test expr-14.6 {CompilePrimaryExpr: literal primary} {
-    expr 3.1400000
-} 3.14
-test expr-14.7 {CompilePrimaryExpr: literal primary} {expr {{abcde}<{abcdef}}} 1
-test expr-14.8 {CompilePrimaryExpr: literal primary} {expr {{abc\
-def} < {abcdef}}} 1
-test expr-14.9 {CompilePrimaryExpr: literal primary} {expr {{abc\tde} > {abc\tdef}}} 0
-test expr-14.10 {CompilePrimaryExpr: literal primary} {expr {{123}}} 123
-test expr-14.11 {CompilePrimaryExpr: var reference primary} {
-    set i 789
-    list [expr {$i}] [expr $i]
-} {789 789}
-test expr-14.12 {CompilePrimaryExpr: var reference primary} {
-    set i {789}    ;# test expr's aggressive conversion to numeric semantics
-    list [expr {$i}] [expr $i]
-} {789 789}
-test expr-14.13 {CompilePrimaryExpr: var reference primary} {
-    catch {unset a}
-    set a(foo) foo
-    set a(bar) bar
-    set a(123) 123
-    set result ""
-    lappend result [expr $a(123)] [expr {$a(bar)<$a(foo)}]
-    catch {unset a}
-    set result
-} {123 1}
-test expr-14.14 {CompilePrimaryExpr: var reference primary} {
-    set i 123    ;# test "$var.0" floating point conversion hack
-    list [expr $i] [expr $i.0] [expr $i.0/12.0]
-} {123 123.0 10.25}
-test expr-14.15 {CompilePrimaryExpr: var reference primary} {
-    set i 123
-    catch {expr $i.2} msg
-    set msg
-} 123.2
-test expr-14.16 {CompilePrimaryExpr: error compiling var reference primary} {
-    catch {expr {$a(foo}} msg
-    set errorInfo
-} {missing )
-    while compiling
-"expr {$a(foo}"}
-test expr-14.17 {CompilePrimaryExpr: string primary that looks like var ref} {
-    expr $
-} $
-test expr-14.18 {CompilePrimaryExpr: quoted string primary} {
-    expr "21"
-} 21
-test expr-14.19 {CompilePrimaryExpr: quoted string primary} {
-    set i 123
-    set x 456
-    expr "$i+$x"
-} 579
-test expr-14.20 {CompilePrimaryExpr: quoted string primary} {
-    set i 3
-    set x 6
-    expr 2+"$i.$x"
-} 5.6
-test expr-14.21 {CompilePrimaryExpr: error in quoted string primary} {
-    catch {expr "[set]"} msg
-    set msg
-} {wrong # args: should be "set varName ?newValue?"}
-test expr-14.22 {CompilePrimaryExpr: subcommand primary} {
-    expr {[set i 123; set i]}
-} 123
-test expr-14.23 {CompilePrimaryExpr: error in subcommand primary} {
-    catch {expr {[set]}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"expr {[set]}"}
-test expr-14.24 {CompilePrimaryExpr: error in subcommand primary} {
-    catch {expr {[set i}} msg
-    set errorInfo
-} {missing close-bracket
-    while compiling
-"expr {[set i}"}
-test expr-14.25 {CompilePrimaryExpr: math function primary} {
-    format %.6g [expr exp(1.0)]
-} 2.71828
-test expr-14.26 {CompilePrimaryExpr: math function primary} {
-    format %.6g [expr pow(2.0+0.1,3.0+0.1)]
-} 9.97424
-test expr-14.27 {CompilePrimaryExpr: error in math function primary} {
-    catch {expr sinh::(2.0)} msg
-    set errorInfo
-} {syntax error in expression "sinh::(2.0)"
-    while compiling
-"expr sinh::(2.0)"}
-test expr-14.28 {CompilePrimaryExpr: subexpression primary} {
-    expr 2+(3*4)
-} 14
-test expr-14.29 {CompilePrimaryExpr: error in subexpression primary} {
-    catch {expr 2+(3*[set])} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"expr 2+(3*[set])"}
-test expr-14.30 {CompilePrimaryExpr: missing paren in subexpression primary} {
-    catch {expr 2+(3*(4+5)} msg
-    set errorInfo
-} {syntax error in expression "2+(3*(4+5)"
-    while compiling
-"expr 2+(3*(4+5)"}
-test expr-14.31 {CompilePrimaryExpr: just var ref in subexpression primary} {
-    set i "5+10"
-    list "[expr $i] == 15" "[expr ($i)] == 15" "[eval expr ($i)] == 15"
-} {{15 == 15} {15 == 15} {15 == 15}}
-test expr-14.32 {CompilePrimaryExpr: unexpected token} {
-    catch {expr @} msg
-    set errorInfo
-} {syntax error in expression "@"
-    while compiling
-"expr @"}
-
-test expr-15.1 {CompileMathFuncCall: missing parenthesis} {
-    catch {expr sinh2.0)} msg
-    set errorInfo
-} {syntax error in expression "sinh2.0)"
-    while compiling
-"expr sinh2.0)"}
-test expr-15.2 {CompileMathFuncCall: unknown math function} {
-    catch {expr whazzathuh(1)} msg
-    set errorInfo
-} {unknown math function "whazzathuh"
-    while compiling
-"expr whazzathuh(1)"}
-test expr-15.3 {CompileMathFuncCall: too many arguments} {
-    catch {expr sin(1,2,3)} msg
-    set errorInfo
-} {too many arguments for math function
-    while compiling
-"expr sin(1,2,3)"}
-test expr-15.4 {CompileMathFuncCall: ')' found before last required arg} {
-    catch {expr sin()} msg
-    set errorInfo
-} {too few arguments for math function
-    while compiling
-"expr sin()"}
-test expr-15.5 {CompileMathFuncCall: too few arguments} {
-    catch {expr pow(1)} msg
-    set errorInfo
-} {too few arguments for math function
-    while compiling
-"expr pow(1)"}
-test expr-15.6 {CompileMathFuncCall: missing ')'} {
-    catch {expr sin(1} msg
-    set errorInfo
-} {syntax error in expression "sin(1"
-    while compiling
-"expr sin(1"}
-if $gotT1 {
-    test expr-15.7 {CompileMathFuncCall: call registered math function} {
-	expr 2*T1()
-    } 246
-    test expr-15.8 {CompileMathFuncCall: call registered math function} {
-	expr T2()*3
-    } 1035
-
-    test expr-15.9 {CompileMathFuncCall: call registered math function} {
-	expr T3(21, 37)
-    } 37
-    test expr-15.10 {CompileMathFuncCall: call registered math function} {
-	expr T3(21.2, 37)
-    } 37.0
-    test expr-15.11 {CompileMathFuncCall: call registered math function} {
-	expr T3(-21.2, -17.5)
-    } -17.5
-}
-
-test expr-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
-    catch {unset a}
-    set a(VALUE) ff15
-    set i 123
-    if {[expr 0x$a(VALUE)] & 16} {
-        set i {}
-    }
-    set i
-} {}
-test expr-16.2 {GetToken: check for string literal in braces} {
-    expr {{1}}
-} {1}
-
-# Check "expr" and computed command names.
-
-test expr-17.1 {expr and computed command names} {
-    set i 0
-    set z expr
-    $z 1+2
-} 3
-
-# Check correct conversion of operands to numbers: If the string looks like
-# an integer, convert to integer. Otherwise, if the string looks like a
-# double, convert to double.
-
-test expr-18.1 {expr and conversion of operands to numbers} {
-    set x [lindex 11 0]
-    catch {expr int($x)}
-    expr {$x}
-} 11
-
-# Check "expr" and interpreter result object resetting before appending
-# an error msg during evaluation of exprs not in {}s
-
-test expr-19.1 {expr and interpreter result object resetting} {
-    proc p {} {
-        set t  10.0
-        set x  2.0
-        set dx 0.2
-        set f  {$dx-$x/10}
-        set g  {-$x/5}
-        set center 1.0
-        set x  [expr $x-$center]
-        set dx [expr $dx+$g]
-        set x  [expr $x+$f+$center]
-        set x  [expr $x+$f+$center]
-        set y  [expr round($x)]
-    }
-    p
-} 3
-
-# cleanup
-unset a
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/compExpr.test b/tests/compExpr.test
deleted file mode 100644
index 17728b9..0000000
--- a/tests/compExpr.test
+++ /dev/null
@@ -1,340 +0,0 @@
-# This file contains a collection of tests for the procedures in the
-# file tclCompExpr.c.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: compExpr.test,v 1.2 1999/04/16 00:47:25 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
-    set gotT1 0
-    puts "This application hasn't been compiled with the \"T1\" and"
-    puts "\"T2\" math functions, so I'll skip some of the expr tests."
-} else {
-    set gotT1 1
-}
-
-catch {unset a}
-
-test compExpr-1.1 {TclCompileExpr procedure, successful expr parse and compile} {
-    expr 1+2
-} 3
-test compExpr-1.2 {TclCompileExpr procedure, error parsing expr} {
-    list [catch {expr 1+2+} msg] $msg
-} {1 {syntax error in expression "1+2+"}}
-test compExpr-1.3 {TclCompileExpr procedure, error compiling expr} {
-    list [catch {expr "foo(123)"} msg] $msg
-} {1 {unknown math function "foo"}}
-test compExpr-1.4 {TclCompileExpr procedure, expr has no operators} {
-    set a {000123}
-    expr {$a}
-} 83
-
-test compExpr-2.1 {CompileSubExpr procedure, TCL_TOKEN_WORD parse token} {
-    catch {unset a}
-    set a 27
-    expr {"foo$a" < "bar"}
-} 0
-test compExpr-2.2 {CompileSubExpr procedure, error compiling TCL_TOKEN_WORD parse token} {
-    list [catch {expr {"00[expr 1+]" + 17}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.3 {CompileSubExpr procedure, TCL_TOKEN_TEXT parse token} {
-    expr {{12345}}
-} 12345
-test compExpr-2.4 {CompileSubExpr procedure, empty TCL_TOKEN_TEXT parse token} {
-    expr {{}}
-} {}
-test compExpr-2.5 {CompileSubExpr procedure, TCL_TOKEN_BS parse token} {
-    expr "\{  \\
- +123 \}"
-} 123
-test compExpr-2.6 {CompileSubExpr procedure, TCL_TOKEN_COMMAND parse token} {
-    expr {[info tclversion] != ""}
-} 1
-test compExpr-2.7 {CompileSubExpr procedure, TCL_TOKEN_COMMAND parse token} {
-    expr {[]}
-} {}
-test compExpr-2.8 {CompileSubExpr procedure, error in TCL_TOKEN_COMMAND parse token} {
-    list [catch {expr {[foo "bar"xxx] + 17}} msg] $msg
-} {1 {extra characters after close-quote}}
-test compExpr-2.9 {CompileSubExpr procedure, TCL_TOKEN_VARIABLE parse token} {
-    catch {unset a}
-    set a 123
-    expr {$a*2}
-} 246
-test compExpr-2.10 {CompileSubExpr procedure, TCL_TOKEN_VARIABLE parse token} {
-    catch {unset a}
-    catch {unset b}
-    set a(george) martha
-    set b geo
-    expr {$a(${b}rge)}
-} martha
-test compExpr-2.11 {CompileSubExpr procedure, error in TCL_TOKEN_VARIABLE parse token} {
-    catch {unset a}
-    list [catch {expr {$a + 17}} msg] $msg
-} {1 {can't read "a": no such variable}}
-test compExpr-2.12 {CompileSubExpr procedure, TCL_TOKEN_SUB_EXPR parse token} {
-    expr {27||3? 3<<(1+4) : 4&&9}
-} 96
-test compExpr-2.13 {CompileSubExpr procedure, error in TCL_TOKEN_SUB_EXPR parse token} {
-    catch {unset a}
-    set a 15
-    list [catch {expr {27 || "$a[expr 1+]00"}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.14 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, op found} {
-    expr {5*6}
-} 30
-test compExpr-2.15 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, math function found} {
-    format %.6g [expr {sin(2.0)}]
-} 0.909297
-test compExpr-2.16 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, math function not found} {
-    list [catch {expr {fred(2.0)}} msg] $msg
-} {1 {unknown math function "fred"}}
-test compExpr-2.17 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4*2}
-} 8
-test compExpr-2.18 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4/2}
-} 2
-test compExpr-2.19 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4%2}
-} 0
-test compExpr-2.20 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4<<2}
-} 16
-test compExpr-2.21 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4>>2}
-} 1
-test compExpr-2.22 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4<2}
-} 0
-test compExpr-2.23 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4>2}
-} 1
-test compExpr-2.24 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4<=2}
-} 0
-test compExpr-2.25 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4>=2}
-} 1
-test compExpr-2.26 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4==2}
-} 0
-test compExpr-2.27 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4!=2}
-} 1
-test compExpr-2.28 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4&2}
-} 0
-test compExpr-2.29 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4^2}
-} 6
-test compExpr-2.30 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator} {
-    expr {4|2}
-} 6
-test compExpr-2.31 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator, 1 operand} {
-    expr {!4}
-} 0
-test compExpr-2.32 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator, 1 operand} {
-    expr {~4}
-} -5
-test compExpr-2.33 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, normal operator, comparison} {
-    catch {unset a}
-    set a 15
-    expr {$a==15}  ;# compiled out-of-line to runtime call on Tcl_ExprObjCmd
-} 1
-test compExpr-2.34 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    expr {+2}
-} 2
-test compExpr-2.35 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, error in special operator} {
-    list [catch {expr {+[expr 1+]}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.36 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    expr {4+2}
-} 6
-test compExpr-2.37 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, error in special operator} {
-    list [catch {expr {[expr 1+]+5}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.38 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, error in special operator} {
-    list [catch {expr {5+[expr 1+]}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.39 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    expr {-2}
-} -2
-test compExpr-2.40 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    expr {4-2}
-} 2
-test compExpr-2.41 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    catch {unset a}
-    set a true
-    expr {0||$a}
-} 1
-test compExpr-2.42 {CompileSubExpr procedure, error in TCL_TOKEN_SUB_EXPR parse token} {
-    catch {unset a}
-    set a 15
-    list [catch {expr {27 || "$a[expr 1+]00"}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-test compExpr-2.43 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    catch {unset a}
-    set a false
-    expr {3&&$a}
-} 0
-test compExpr-2.44 {CompileSubExpr procedure, TCL_TOKEN_OPERATOR token, special operator} {
-    catch {unset a}
-    set a false
-    expr {$a||1? 1 : 0}
-} 1
-test compExpr-2.45 {CompileSubExpr procedure, error in TCL_TOKEN_SUB_EXPR parse token} {
-    catch {unset a}
-    set a 15
-    list [catch {expr {1? 54 : "$a[expr 1+]00"}} msg] $msg
-} {1 {syntax error in expression "1+"}}
-
-test compExpr-3.1 {CompileLandOrLorExpr procedure, numeric 1st operand} {
-    catch {unset a}
-    set a 2
-    expr {[set a]||0}
-} 1
-test compExpr-3.2 {CompileLandOrLorExpr procedure, nonnumeric 1st operand} {
-    catch {unset a}
-    set a no
-    expr {$a&&1}
-} 0
-test compExpr-3.3 {CompileSubExpr procedure, error in 1st operand} {
-    list [catch {expr {[expr *2]||0}} msg] $msg
-} {1 {syntax error in expression "*2"}}
-test compExpr-3.4 {CompileLandOrLorExpr procedure, result is 1 or 0} {
-    catch {unset a}
-    catch {unset b}
-    set a no
-    set b true
-    expr {$a || $b}
-} 1
-test compExpr-3.5 {CompileLandOrLorExpr procedure, short-circuit semantics} {
-    catch {unset a}
-    set a yes
-    expr {$a || [exit]}
-} 1
-test compExpr-3.6 {CompileLandOrLorExpr procedure, short-circuit semantics} {
-    catch {unset a}
-    set a no
-    expr {$a && [exit]}
-} 0
-test compExpr-3.7 {CompileLandOrLorExpr procedure, numeric 2nd operand} {
-    catch {unset a}
-    set a 2
-    expr {0||[set a]}
-} 1
-test compExpr-3.8 {CompileLandOrLorExpr procedure, nonnumeric 2nd operand} {
-    catch {unset a}
-    set a no
-    expr {1&&$a}
-} 0
-test compExpr-3.9 {CompileLandOrLorExpr procedure, error in 2nd operand} {
-    list [catch {expr {0||[expr %2]}} msg] $msg
-} {1 {syntax error in expression "%2"}}
-test compExpr-3.10 {CompileLandOrLorExpr procedure, long lor/land arm} {
-    set a "abcdefghijkl"
-    set i 7
-    expr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]}
-} 1
-
-test compExpr-4.1 {CompileCondExpr procedure, simple test} {
-    catch {unset a}
-    set a 2
-    expr {($a > 1)? "ok" : "nope"}
-} ok
-test compExpr-4.2 {CompileCondExpr procedure, complex test, convert to numeric} {
-    catch {unset a}
-    set a no
-    expr {[set a]? 27 : -54}
-} -54
-test compExpr-4.3 {CompileCondExpr procedure, error in test} {
-    list [catch {expr {[expr *2]? +1 : -1}} msg] $msg
-} {1 {syntax error in expression "*2"}}
-test compExpr-4.4 {CompileCondExpr procedure, simple "true" clause} {
-    catch {unset a}
-    set a no
-    expr {1? (27-2) : -54}
-} 25
-test compExpr-4.5 {CompileCondExpr procedure, convert "true" clause to numeric} {
-    catch {unset a}
-    set a no
-    expr {1? $a : -54}
-} no
-test compExpr-4.6 {CompileCondExpr procedure, error in "true" clause} {
-    list [catch {expr {1? [expr *2] : -127}} msg] $msg
-} {1 {syntax error in expression "*2"}}
-test compExpr-4.7 {CompileCondExpr procedure, simple "false" clause} {
-    catch {unset a}
-    set a no
-    expr {(2-2)? -3.14159 : "nope"}
-} nope
-test compExpr-4.8 {CompileCondExpr procedure, convert "false" clause to numeric} {
-    catch {unset a}
-    set a 00123
-    expr {0? 42 : $a}
-} 83
-test compExpr-4.9 {CompileCondExpr procedure, error in "false" clause} {
-    list [catch {expr {1? 15 : [expr *2]}} msg] $msg
-} {1 {syntax error in expression "*2"}}
-
-test compExpr-5.1 {CompileMathFuncCall procedure, math function found} {
-    format %.6g [expr atan2(1.0, 2.0)]
-} 0.463648
-test compExpr-5.2 {CompileMathFuncCall procedure, math function not found} {
-    list [catch {expr {do_it()}} msg] $msg
-} {1 {unknown math function "do_it"}}
-if $gotT1 {
-    test compExpr-5.3 {CompileMathFuncCall: call registered math function} {
-	expr 3*T1()-1
-    } 368
-    test compExpr-5.4 {CompileMathFuncCall: call registered math function} {
-	expr T2()*3
-    } 1035
-}
-test compExpr-5.5 {CompileMathFuncCall procedure, too few arguments} {
-    list [catch {expr {atan2(1.0)}} msg] $msg
-} {1 {too few arguments for math function}}
-test compExpr-5.6 {CompileMathFuncCall procedure, complex argument} {
-    format %.6g [expr pow(2.1, 27.5-(24.4*(5%2)))]
-} 9.97424
-test compExpr-5.7 {CompileMathFuncCall procedure, error in argument} {
-    list [catch {expr {sinh(2.*)}} msg] $msg
-} {1 {syntax error in expression "sinh(2.*)"}}
-test compExpr-5.8 {CompileMathFuncCall procedure, too many arguments} {
-    list [catch {expr {sinh(2.0, 3.0)}} msg] $msg
-} {1 {too many arguments for math function}}
-test compExpr-5.9 {CompileMathFuncCall procedure, too many arguments} {
-    list [catch {expr {0 <= rand(5.2)}} msg] $msg
-} {1 {too many arguments for math function}}
-
-test compExpr-6.1 {LogSyntaxError procedure, error in expr longer than 60 chars} {
-    list [catch {expr {(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)/} -1 foo 3} msg] $msg
-} {1 {syntax error in expression "(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+012"}}
-
-# cleanup
-catch {unset a}
-catch {unset b}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/compile.test b/tests/compile.test
deleted file mode 100644
index 382e85e..0000000
--- a/tests/compile.test
+++ /dev/null
@@ -1,214 +0,0 @@
-# This file contains tests for the file tclCompile.c.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: compile.test,v 1.6 1999/04/16 00:47:25 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# The following tests are very incomplete, although the rest of the
-# test suite covers this file fairly well.
-
-catch {rename p ""}
-catch {namespace delete test_ns_compile}
-catch {unset x}
-catch {unset y}
-catch {unset a}
-
-test compile-1.1 {TclCompileString: look up cmds in proc ns, not current ns} {
-    catch {namespace delete test_ns_compile}
-    catch {unset x}
-    set x 123
-    namespace eval test_ns_compile {
-        proc set {args} {
-            global x
-            lappend x test_ns_compile::set
-        }
-        proc p {} {
-            set 0
-        }
-    }
-    list [test_ns_compile::p] [set x]
-} {{123 test_ns_compile::set} {123 test_ns_compile::set}}
-test compile-1.2 {TclCompileString, error result is reset if TclGetLong determines word isn't an integer} {
-    proc p {x} {info commands 3m}
-    list [catch {p} msg] $msg
-} {1 {no value given for parameter "x" to "p"}}
-
-test compile-2.1 {TclCompileDollarVar: global scalar name with ::s} {
-    catch {unset x}
-    set x 123
-    list $::x [expr {[lsearch -exact [info globals] x] != 0}]
-} {123 1}
-test compile-2.2 {TclCompileDollarVar: global scalar name with ::s} {
-    catch {unset y}
-    proc p {} {
-        set ::y 789
-        return $::y
-    }
-    list [p] $::y [expr {[lsearch -exact [info globals] y] != 0}]
-} {789 789 1}
-test compile-2.3 {TclCompileDollarVar: global array name with ::s} {
-    catch {unset a}
-    set ::a(1) 2
-    list $::a(1) [set ::a($::a(1)) 3] $::a(2) [expr {[lsearch -exact [info globals] a] != 0}]
-} {2 3 3 1}
-test compile-2.4 {TclCompileDollarVar: global scalar name with ::s} {
-    catch {unset a}
-    proc p {} {
-        set ::a(1) 1
-        return $::a($::a(1))
-    }
-    list [p] $::a(1) [expr {[lsearch -exact [info globals] a] != 0}]
-} {1 1 1}
-
-test compile-3.1 {TclCompileCatchCmd: only catch cmds with scalar vars are compiled inline} {
-    catch {unset a}
-    set a(1) xyzzyx
-    proc p {} {
-        global a
-        catch {set x 123} a(1)
-    }
-    list [p] $a(1)
-} {0 123}
-test compile-3.2 {TclCompileCatchCmd: non-local variables} {
-    set ::foo 1
-    proc catch-test {} {
-	catch {set x 3} ::foo
-    }
-    catch-test
-    set ::foo
-} 3
-
-test compile-4.1 {TclCompileForCmd: command substituted test expression} {
-    set i 0
-    set j 0
-    # Should be "forever"
-    for {} [expr $i < 3] {} {
-	set j [incr i]
-	if {$j > 3} break
-    }
-    set j
-} {4}
-
-test compile-5.1 {TclCompileForeachCmd: exception stack} {
-    proc foreach-exception-test {} {
-	foreach array(index) [list 1 2 3] break
-	foreach array(index) [list 1 2 3] break
-	foreach scalar [list 1 2 3] break
-    }
-    list [catch foreach-exception-test result] $result
-} {0 {}}
-test compile-5.2 {TclCompileForeachCmd: non-local variables} {
-    set ::foo 1
-    proc foreach-test {} {
-	foreach ::foo {1 2 3} {}
-    }
-    foreach-test
-    set ::foo
-} 3
-
-test compile-6.1 {TclCompileSetCmd: global scalar names with ::s} {
-    catch {unset x}
-    catch {unset y}
-    set x 123
-    proc p {} {
-        set ::y 789
-        return $::y
-    }
-    list $::x [expr {[lsearch -exact [info globals] x] != 0}] \
-         [p] $::y [expr {[lsearch -exact [info globals] y] != 0}]
-} {123 1 789 789 1}
-test compile-6.2 {TclCompileSetCmd: global array names with ::s} {
-    catch {unset a}
-    set ::a(1) 2
-    proc p {} {
-        set ::a(1) 1
-        return $::a($::a(1))
-    }
-    list $::a(1) [p] [set ::a($::a(1)) 3] $::a(1) [expr {[lsearch -exact [info globals] a] != 0}]
-} {2 1 3 3 1}
-test compile-6.3 {TclCompileSetCmd: namespace var names with ::s} {
-    catch {namespace delete test_ns_compile}
-    catch {unset x}
-    namespace eval test_ns_compile {
-        variable v hello
-        variable arr
-        set ::x $::test_ns_compile::v
-	set ::test_ns_compile::arr(1) 123
-    }
-    list $::x $::test_ns_compile::arr(1)
-} {hello 123}
-
-test compile-7.1 {TclCompileWhileCmd: command substituted test expression} {
-    set i 0
-    set j 0
-    # Should be "forever"
-    while [expr $i < 3] {
-	set j [incr i]
-	if {$j > 3} break
-    }
-    set j
-} {4}
-
-test compile-8.1 {CollectArgInfo: binary data} {
-    list [catch "string length \000foo" msg] $msg
-} {0 4}
-test compile-8.2 {CollectArgInfo: binary data} {
-    list [catch "string length foo\000" msg] $msg
-} {0 4}
-test compile-8.3 {CollectArgInfo: handle "]" at end of command properly} {
-    set x ]
-} {]}
-
-test compile-9.1 {UpdateStringOfByteCode: called for duplicate of compiled empty object} {
-    proc p {} {
-        set x {}
-        eval $x
-        append x { }
-        eval $x
-    }
-    p
-} {}
-
-test compile-10.1 {BLACKBOX: exception stack overflow} {
-    set x {{0}}
-    set y 0
-    while {$y < 100} {
-	if !$x {incr y}
-    }
-} {}
-
-
-
-# cleanup
-catch {rename p ""}
-catch {namespace delete test_ns_compile}
-catch {unset x}
-catch {unset y}
-catch {unset a}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/concat.test b/tests/concat.test
deleted file mode 100644
index 69a4f21..0000000
--- a/tests/concat.test
+++ /dev/null
@@ -1,65 +0,0 @@
-# Commands covered:  concat
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: concat.test,v 1.3 1999/04/16 00:47:25 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test concat-1.1 {simple concatenation} {
-    concat a b c d e f g
-} {a b c d e f g}
-test concat-1.2 {merging lists together} {
-    concat a {b c d} {e f g h}
-} {a b c d e f g h}
-test concat-1.3 {merge lists, retain sub-lists} {
-    concat a {b {c d}} {{e f}} g h
-} {a b {c d} {e f} g h}
-test concat-1.4 {special characters} {
-    concat a\{ {b \{c d} \{d
-} "a{ b \\{c d {d"
-
-test concat-2.1 {error: one empty argument} {
-    concat {}
-} {}
-
-test concat-3.1 {error: no arguments} {
-    list [catch concat msg] $msg
-} {0 {}}
-
-test concat-4.1 {pruning off extra white space} {
-    concat {} {a b c}
-} {a b c}
-test concat-4.2 {pruning off extra white space} {
-    concat x y "  a b c	\n\t  " "   "  " def "
-} {x y a b c def}
-test concat-4.3 {pruning off extra white space sets length correctly} {
-    llength [concat { {{a}} }]
-} 1
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/dcall.test b/tests/dcall.test
deleted file mode 100644
index 2114071..0000000
--- a/tests/dcall.test
+++ /dev/null
@@ -1,60 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for Tcl_CallWhenDeleted.
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: dcall.test,v 1.3 1999/04/16 00:47:25 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testdcall] == {}} {
-    puts "This application hasn't been compiled with the \"testdcall\""
-    puts "command, so I can't test Tcl_CallWhenDeleted."
-    ::tcltest::cleanupTests
-    return
-}
-
-test dcall-1.1 {deletion callbacks} {
-    lsort -increasing [testdcall 1 2 3]
-} {1 2 3}
-test dcall-1.2 {deletion callbacks} {
-    testdcall
-} {}
-test dcall-1.3 {deletion callbacks} {
-    lsort -increasing [testdcall 20 21 22 -22]
-} {20 21}
-test dcall-1.4 {deletion callbacks} {
-    lsort -increasing [testdcall 20 21 22 -20]
-} {21 22}
-test dcall-1.5 {deletion callbacks} {
-    lsort -increasing [testdcall 20 21 22 -21]
-} {20 22}
-test dcall-1.6 {deletion callbacks} {
-    lsort -increasing [testdcall 20 21 22 -21 -22 -20]
-} {}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/defs.tcl b/tests/defs.tcl
deleted file mode 100644
index 1e7d8fc..0000000
--- a/tests/defs.tcl
+++ /dev/null
@@ -1,990 +0,0 @@
-# defs.tcl --
-#
-#	This file contains support code for the Tcl/Tk test suite.It is
-#	It is normally sourced by the individual files in the test suite
-#	before they run their tests.  This improved approach to testing
-#	was designed and initially implemented by Mary Ann May-Pumphrey
-#	of Sun Microsystems.
-#
-# Copyright (c) 1990-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: defs.tcl,v 1.2 1999/04/16 00:47:26 stanton Exp $
-
-# Initialize wish shell
-if {[info exists tk_version]} {
-    tk appname tktest
-    wm title . tktest
-} else {
-    # Ensure that we have a minimal auto_path so we don't pick up extra junk.
-    set auto_path [list [info library]]
-}
-
-# create the "tcltest" namespace for all testing variables and procedures
-namespace eval tcltest {
-    set procList [list test cleanupTests dotests saveState restoreState \
-	    normalizeMsg makeFile removeFile makeDirectory removeDirectory \
-	    viewFile bytestring set_iso8859_1_locale restore_locale \
-	    safeFetch]
-    if {[info exists tk_version]} {
-	lappend procList setupbg dobg bgReady cleanupbg fixfocus
-    }
-    foreach proc $procList {
-	namespace export $proc
-    }
-
-    # ::tcltest::verbose defaults to "b"
-    variable verbose "b"
-
-    # match defaults to the empty list
-    variable match {}
-
-    # skip defaults to the empty list
-    variable skip {}
-
-    # Tests should not rely on the current working directory.
-    # Files that are part of the test suite should be accessed relative to
-    # ::tcltest::testsDir.
-
-    set originalDir [pwd]
-    set tDir [file join $originalDir [file dirname [info script]]]
-    cd $tDir
-    variable testsDir [pwd]
-    cd $originalDir
-
-    # Count the number of files tested (0 if all.tcl wasn't called).
-    # The all.tcl file will set testSingleFile to false, so stats will
-    # not be printed until all.tcl calls the cleanupTests proc.
-    # The currentFailure var stores the boolean value of whether the
-    # current test file has had any failures.  The failFiles list
-    # stores the names of test files that had failures.
-
-    variable numTestFiles 0
-    variable testSingleFile true
-    variable currentFailure false
-    variable failFiles {}
-
-    # Tests should remove all files they create.  The test suite will
-    # check the current working dir for files created by the tests.
-    # ::tcltest::filesMade keeps track of such files created using the
-    # ::tcltest::makeFile and ::tcltest::makeDirectory procedures.
-    # ::tcltest::filesExisted stores the names of pre-existing files.
-
-    variable filesMade {}
-    variable filesExisted {}
-
-    # ::tcltest::numTests will store test files as indices and the list
-    # of files (that should not have been) left behind by the test files.
-    array set ::tcltest::createdNewFiles {}
-
-    # initialize ::tcltest::numTests array to keep track fo the number of
-    # tests that pass, fial, and are skipped.
-    array set numTests [list Total 0 Passed 0 Skipped 0 Failed 0]
-
-    # initialize ::tcltest::skippedBecause array to keep track of
-    # constraints that kept tests from running
-    array set ::tcltest::skippedBecause {}
-}
-
-# If there is no "memory" command (because memory debugging isn't
-# enabled), generate a dummy command that does nothing.
-
-if {[info commands memory] == ""} {
-    proc memory args {}
-}
-
-# ::tcltest::initConfig --
-#
-# Check configuration information that will determine which tests
-# to run.  To do this, create an array ::tcltest::testConfig.  Each
-# element has a 0 or 1 value.  If the element is "true" then tests
-# with that constraint will be run, otherwise tests with that constraint
-# will be skipped.  See the README file for the list of built-in
-# constraints defined in this procedure.
-#
-# Arguments:
-#	none
-#
-# Results:
-#	The ::tcltest::testConfig array is reset to have an index for
-#	each built-in test constraint.
-
-proc ::tcltest::initConfig {} {
-
-    global tcl_platform tcl_interactive tk_version
-
-    catch {unset ::tcltest::testConfig}
-
-    # The following trace procedure makes it so that we can safely refer to
-    # non-existent members of the ::tcltest::testConfig array without causing an
-    # error.  Instead, reading a non-existent member will return 0.  This is
-    # necessary because tests are allowed to use constraint "X" without ensuring
-    # that ::tcltest::testConfig("X") is defined.
-
-    trace variable ::tcltest::testConfig r ::tcltest::safeFetch
-
-    proc ::tcltest::safeFetch {n1 n2 op} {
-	if {($n2 != {}) && ([info exists ::tcltest::testConfig($n2)] == 0)} {
-	    set ::tcltest::testConfig($n2) 0
-	}
-    }
-
-    set ::tcltest::testConfig(unixOnly) \
-	    [expr {$tcl_platform(platform) == "unix"}]
-    set ::tcltest::testConfig(macOnly) \
-	    [expr {$tcl_platform(platform) == "macintosh"}]
-    set ::tcltest::testConfig(pcOnly) \
-	    [expr {$tcl_platform(platform) == "windows"}]
-
-    set ::tcltest::testConfig(unix) $::tcltest::testConfig(unixOnly)
-    set ::tcltest::testConfig(mac) $::tcltest::testConfig(macOnly)
-    set ::tcltest::testConfig(pc) $::tcltest::testConfig(pcOnly)
-
-    set ::tcltest::testConfig(unixOrPc) \
-	    [expr {$::tcltest::testConfig(unix) || $::tcltest::testConfig(pc)}]
-    set ::tcltest::testConfig(macOrPc) \
-	    [expr {$::tcltest::testConfig(mac) || $::tcltest::testConfig(pc)}]
-    set ::tcltest::testConfig(macOrUnix) \
-	    [expr {$::tcltest::testConfig(mac) || $::tcltest::testConfig(unix)}]
-
-    set ::tcltest::testConfig(nt) [expr {$tcl_platform(os) == "Windows NT"}]
-    set ::tcltest::testConfig(95) [expr {$tcl_platform(os) == "Windows 95"}]
-
-    # The following config switches are used to mark tests that should work,
-    # but have been temporarily disabled on certain platforms because they don't
-    # and we haven't gotten around to fixing the underlying problem.
-
-    set ::tcltest::testConfig(tempNotPc) [expr {!$::tcltest::testConfig(pc)}]
-    set ::tcltest::testConfig(tempNotMac) [expr {!$::tcltest::testConfig(mac)}]
-    set ::tcltest::testConfig(tempNotUnix) [expr {!$::tcltest::testConfig(unix)}]
-
-    # The following config switches are used to mark tests that crash on
-    # certain platforms, so that they can be reactivated again when the
-    # underlying problem is fixed.
-
-    set ::tcltest::testConfig(pcCrash) [expr {!$::tcltest::testConfig(pc)}]
-    set ::tcltest::testConfig(macCrash) [expr {!$::tcltest::testConfig(mac)}]
-    set ::tcltest::testConfig(unixCrash) [expr {!$::tcltest::testConfig(unix)}]
-
-    # Set the "fonts" constraint for wish apps
-    if {[info exists tk_version]} {
-	set ::tcltest::testConfig(fonts) 1
-	catch {destroy .e}
-	entry .e -width 0 -font {Helvetica -12} -bd 1
-	.e insert end "a.bcd"
-	if {([winfo reqwidth .e] != 37) || ([winfo reqheight .e] != 20)} {
-	    set ::tcltest::testConfig(fonts) 0
-	}
-	destroy .e
-	catch {destroy .t}
-	text .t -width 80 -height 20 -font {Times -14} -bd 1
-	pack .t
-	.t insert end "This is\na dot."
-	update
-	set x [list [.t bbox 1.3] [.t bbox 2.5]]
-	destroy .t
-	if {[string match {{22 3 6 15} {31 18 [34] 15}} $x] == 0} {
-	    set ::tcltest::testConfig(fonts) 0
-	}
-    }
-
-    # Skip empty tests
-    set ::tcltest::testConfig(emptyTest) 0
-
-    # By default, tests that expost known bugs are skipped.
-    set ::tcltest::testConfig(knownBug) 0
-
-    # By default, non-portable tests are skipped.
-    set ::tcltest::testConfig(nonPortable) 0
-
-    # Some tests require user interaction.
-    set ::tcltest::testConfig(userInteraction) 0
-
-    # Some tests must be skipped if the interpreter is not in interactive mode
-    set ::tcltest::testConfig(interactive) $tcl_interactive
-
-    # Some tests must be skipped if you are running as root on Unix.
-    # Other tests can only be run if you are running as root on Unix.
-    set ::tcltest::testConfig(root) 0
-    set ::tcltest::testConfig(notRoot) 1
-    set user {}
-    if {$tcl_platform(platform) == "unix"} {
-	catch {set user [exec whoami]}
-	if {$user == ""} {
-	    catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-	}
-	if {($user == "root") || ($user == "")} {
-	    set ::tcltest::testConfig(root) 1
-	    set ::tcltest::testConfig(notRoot) 0
-	}
-    }
-
-    # Set nonBlockFiles constraint: 1 means this platform supports
-    # setting files into nonblocking mode.
-    if {[catch {set f [open defs r]}]} {
-	set ::tcltest::testConfig(nonBlockFiles) 1
-    } else {
-	if {[catch {fconfigure $f -blocking off}] == 0} {
-	    set ::tcltest::testConfig(nonBlockFiles) 1
-	} else {
-	    set ::tcltest::testConfig(nonBlockFiles) 0
-	}
-	close $f
-    }
-
-    # Set asyncPipeClose constraint: 1 means this platform supports
-    # async flush and async close on a pipe.
-    #
-    # Test for SCO Unix - cannot run async flushing tests because a
-    # potential problem with select is apparently interfering.
-    # (Mark Diekhans).
-    if {$tcl_platform(platform) == "unix"} {
-	if {[catch {exec uname -X | fgrep {Release = 3.2v}}] == 0} {
-	    set ::tcltest::testConfig(asyncPipeClose) 0
-	} else {
-	    set ::tcltest::testConfig(asyncPipeClose) 1
-	}
-    } else {
-	set ::tcltest::testConfig(asyncPipeClose) 1
-    }
-
-    # Test to see if we have a broken version of sprintf with respect
-    # to the "e" format of floating-point numbers.
-    set ::tcltest::testConfig(eformat) 1
-    if {[string compare "[format %g 5e-5]" "5e-05"] != 0} {
-	set ::tcltest::testConfig(eformat) 0
-    }
-
-    # Test to see if execed commands such as cat, echo, rm and so forth are
-    # present on this machine.
-    set ::tcltest::testConfig(unixExecs) 1
-    if {$tcl_platform(platform) == "macintosh"} {
-	set ::tcltest::testConfig(unixExecs) 0
-    }
-    if {($::tcltest::testConfig(unixExecs) == 1) && \
-	    ($tcl_platform(platform) == "windows")} {
-	if {[catch {exec cat defs}] == 1} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec echo hello}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec sh -c echo hello}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec wc defs}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {$::tcltest::testConfig(unixExecs) == 1} {
-	    exec echo hello > removeMe
-	    if {[catch {exec rm removeMe}] == 1} {
-		set ::tcltest::testConfig(unixExecs) 0
-	    }
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec sleep 1}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec fgrep unixExecs defs}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec ps}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec echo abc > removeMe}] == 0) && \
-		([catch {exec chmod 644 removeMe}] == 1) && \
-		([catch {exec rm removeMe}] == 0)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	} else {
-	    catch {exec rm -f removeMe}
-	}
-	if {($::tcltest::testConfig(unixExecs) == 1) && \
-		([catch {exec mkdir removeMe}] == 1)} {
-	    set ::tcltest::testConfig(unixExecs) 0
-	} else {
-	    catch {exec rm -r removeMe}
-	}
-    }
-}
-
-::tcltest::initConfig
-
-
-# ::tcltest::processCmdLineArgs --
-#
-#	Use command line args to set the verbose, skip, and
-#	match variables.  This procedure must be run after
-#	constraints are initialized, because some constraints can be
-#	overridden.
-#
-# Arguments:
-#	none
-#
-# Results:
-#	::tcltest::verbose is set to <value>
-
-proc ::tcltest::processCmdLineArgs {} {
-    global argv
-
-    # The "argv" var doesn't exist in some cases, so use {}
-    # The "argv" var doesn't exist in some cases.
-    if {(![info exists argv]) || ([llength $argv] < 2)} {
-	set flagArray {}
-    } else {
-	set flagArray $argv
-    }
-
-    if {[catch {array set flag $flagArray}]} {
-	puts stderr "Error:  odd number of command line args specified:"
-	puts stderr "        $argv"
-	exit
-    }
-    
-    # Allow for 1-char abbreviations, where applicable (e.g., -match == -m).
-    # Note that -verbose cannot be abbreviated to -v in wish because it
-    # conflicts with the wish option -visual.
-    foreach arg {-verbose -match -skip -constraints} {
-	set abbrev [string range $arg 0 1]
-	if {([info exists flag($abbrev)]) && \
-		([lsearch -exact $flagArray $arg] < \
-		[lsearch -exact $flagArray $abbrev])} {
-	    set flag($arg) $flag($abbrev)
-	}
-    }
-
-    # Set ::tcltest::workingDir to [pwd].
-    # Save the names of files that already exist in ::tcltest::workingDir.
-    set ::tcltest::workingDir [pwd]
-    foreach file [glob -nocomplain [file join $::tcltest::workingDir *]] {
-	lappend ::tcltest::filesExisted [file tail $file]
-    }
-
-    # Set ::tcltest::verbose to the arg of the -verbose flag, if given
-    if {[info exists flag(-verbose)]} {
-	set ::tcltest::verbose $flag(-verbose)
-    }
-
-    # Set ::tcltest::match to the arg of the -match flag, if given
-    if {[info exists flag(-match)]} {
-	set ::tcltest::match $flag(-match)
-    }
-
-    # Set ::tcltest::skip to the arg of the -skip flag, if given
-    if {[info exists flag(-skip)]} {
-	set ::tcltest::skip $flag(-skip)
-    }
-
-    # Use the -constraints flag, if given, to turn on constraints that are
-    # turned off by default: userInteractive knownBug nonPortable.  This
-    # code fragment must be run after constraints are initialized.
-    if {[info exists flag(-constraints)]} {
-	foreach elt $flag(-constraints) {
-	    set ::tcltest::testConfig($elt) 1
-	}
-    }
-}
-
-::tcltest::processCmdLineArgs
-
-
-# ::tcltest::cleanupTests --
-#
-# Remove files and dirs created using the makeFile and makeDirectory
-# commands since the last time this proc was invoked.
-#
-# Print the names of the files created without the makeFile command
-# since the tests were invoked.
-#
-# Print the number tests (total, passed, failed, and skipped) since the
-# tests were invoked.
-#
-
-proc ::tcltest::cleanupTests {{calledFromAllFile 0}} {
-    set tail [file tail [info script]]
-
-    # Remove files and directories created by the :tcltest::makeFile and
-    # ::tcltest::makeDirectory procedures.
-    # Record the names of files in ::tcltest::workingDir that were not
-    # pre-existing, and associate them with the test file that created them.
-    if {!$calledFromAllFile} {
-
-	foreach file $::tcltest::filesMade {
-	    if {[file exists $file]} {
-		catch {file delete -force $file}
-	    }
-	}
-	set currentFiles {}
-	foreach file [glob -nocomplain [file join $::tcltest::workingDir *]] {
-	    lappend currentFiles [file tail $file]
-	}
-	set newFiles {}
-	foreach file $currentFiles {
-	    if {[lsearch -exact $::tcltest::filesExisted $file] == -1} {
-		lappend newFiles $file
-	    }
-	}
-	set ::tcltest::filesExisted $currentFiles
-	if {[llength $newFiles] > 0} {
-	    set ::tcltest::createdNewFiles($tail) $newFiles
-	}
-    }
-
-    if {$calledFromAllFile || $::tcltest::testSingleFile} {
-	# print stats
-	puts -nonewline stdout "$tail:"
-	foreach index [list "Total" "Passed" "Skipped" "Failed"] {
-	    puts -nonewline stdout "\t$index\t$::tcltest::numTests($index)"
-	}
-	puts stdout ""
-
-	# print number test files sourced
-	# print names of files that ran tests which failed
-	if {$calledFromAllFile} {
-	    puts stdout "Sourced $::tcltest::numTestFiles Test Files."
-	    set ::tcltest::numTestFiles 0
-	    if {[llength $::tcltest::failFiles] > 0} {
-		puts stdout "Files with failing tests: $::tcltest::failFiles"
-		set ::tcltest::failFiles {}
-	    }
-	}
-
-	# if any tests were skipped, print the constraints that kept them
-	# from running.
-	set constraintList [array names ::tcltest::skippedBecause]
-	if {[llength $constraintList] > 0} {
-	    puts stdout "Number of tests skipped for each constraint:"
-	    foreach constraint [lsort $constraintList] {
-		puts stdout \
-			"\t$::tcltest::skippedBecause($constraint)\t$constraint"
-		unset ::tcltest::skippedBecause($constraint)
-	    }
-	}
-
-	# report the names of test files in ::tcltest::createdNewFiles, and
-	# reset the array to be empty.
-	set testFilesThatTurded [lsort [array names ::tcltest::createdNewFiles]]
-	if {[llength $testFilesThatTurded] > 0} {
-	    puts stdout "Warning: test files left files behind:"
-	    foreach testFile $testFilesThatTurded {
-		puts "\t$testFile:\t$::tcltest::createdNewFiles($testFile)"
-		unset ::tcltest::createdNewFiles($testFile)
-	    }
-	}
-
-	# reset filesMade, filesExisted, and numTests
-	set ::tcltest::filesMade {}
-	foreach index [list "Total" "Passed" "Skipped" "Failed"] {
-	    set ::tcltest::numTests($index) 0
-	}
-
-	# exit only if running Tk in non-interactive mode
-	global tk_version tcl_interactive
-	if {[info exists tk_version] && !$tcl_interactive} {
-	    exit
-	}
-    } else {
-	# if we're deferring stat-reporting until all files are sourced,
-	# then add current file to failFile list if any tests in this file
-	# failed
-	incr ::tcltest::numTestFiles
-	if {($::tcltest::currentFailure) && \
-		([lsearch -exact $::tcltest::failFiles $tail] == -1)} {
-	    lappend ::tcltest::failFiles $tail
-	}
-	set ::tcltest::currentFailure false
-    }
-}
-
-
-# test --
-#
-# This procedure runs a test and prints an error message if the test fails.
-# If ::tcltest::verbose has been set, it also prints a message even if the
-# test succeeds.  The test will be skipped if it doesn't match the
-# ::tcltest::match variable, if it matches an element in
-# ::tcltest::skip, or if one of the elements of "constraints" turns
-# out not to be true.
-#
-# Arguments:
-# name -		Name of test, in the form foo-1.2.
-# description -		Short textual description of the test, to
-#			help humans understand what it does.
-# constraints -		A list of one or more keywords, each of
-#			which must be the name of an element in
-#			the array "::tcltest::testConfig".  If any of these
-#			elements is zero, the test is skipped.
-#			This argument may be omitted.
-# script -		Script to run to carry out the test.  It must
-#			return a result that can be checked for
-#			correctness.
-# expectedAnswer -	Expected result from script.
-
-proc ::tcltest::test {name description script expectedAnswer args} {
-    incr ::tcltest::numTests(Total)
-
-    # skip the test if it's name matches an element of skip
-    foreach pattern $::tcltest::skip {
-	if {[string match $pattern $name]} {
-	    incr ::tcltest::numTests(Skipped)
-	    return
-	}
-    }
-    # skip the test if it's name doesn't match any element of match
-    if {[llength $::tcltest::match] > 0} {
-	set ok 0
-	foreach pattern $::tcltest::match {
-	    if {[string match $pattern $name]} {
-		set ok 1
-		break
-	    }
-        }
-	if {!$ok} {
-	    incr ::tcltest::numTests(Skipped)
-	    return
-	}
-    }
-    set i [llength $args]
-    if {$i == 0} {
-	set constraints {}
-    } elseif {$i == 1} {
-	# "constraints" argument exists;  shuffle arguments down, then
-	# make sure that the constraints are satisfied.
-
-	set constraints $script
-	set script $expectedAnswer
-	set expectedAnswer [lindex $args 0]
-	set doTest 0
-	if {[string match {*[$\[]*} $constraints] != 0} {
-	    # full expression, e.g. {$foo > [info tclversion]}
-
-	    catch {set doTest [uplevel #0 expr $constraints]}
-	} elseif {[regexp {[^.a-zA-Z0-9 ]+} $constraints] != 0} {
-	    # something like {a || b} should be turned into 
-	    # $::tcltest::testConfig(a) || $::tcltest::testConfig(b).
-
- 	    regsub -all {[.a-zA-Z0-9]+} $constraints \
-		    {$::tcltest::testConfig(&)} c
-	    catch {set doTest [eval expr $c]}
-	} else {
-	    # just simple constraints such as {unixOnly fonts}.
-
-	    set doTest 1
-	    foreach constraint $constraints {
-		if {![info exists ::tcltest::testConfig($constraint)]
-			|| !$::tcltest::testConfig($constraint)} {
-		    set doTest 0
-		    # store the constraint that kept the test from running
-		    set constraints $constraint
-		    break
-		}
-	    }
-	}
-	if {$doTest == 0} {
-	    incr ::tcltest::numTests(Skipped)
-	    if {[string first s $::tcltest::verbose] != -1} {
-		puts stdout "++++ $name SKIPPED: $constraints"
-	    }
-	    # add the constraint to the list of constraints the kept tests
-	    # from running
-	    if {[info exists ::tcltest::skippedBecause($constraints)]} {
-		incr ::tcltest::skippedBecause($constraints)
-	    } else {
-		set ::tcltest::skippedBecause($constraints) 1
-	    }
-	    return	
-	}
-    } else {
-	error "wrong # args: must be \"test name description ?constraints? script expectedAnswer\""
-    }
-    memory tag $name
-    set code [catch {uplevel $script} actualAnswer]
-    if {$code != 0 || [string compare $actualAnswer $expectedAnswer] != 0} {
-	incr ::tcltest::numTests(Failed)
-	set ::tcltest::currentFailure true
-	if {[string first b $::tcltest::verbose] == -1} {
-	    set script ""
-	}
-	puts stdout "\n==== $name $description FAILED"
-	if {$script != ""} {
-	    puts stdout "==== Contents of test case:"
-	    puts stdout $script
-	}
-	if {$code != 0} {
-	    if {$code == 1} {
-		puts stdout "==== Test generated error:"
-		puts stdout $actualAnswer
-	    } elseif {$code == 2} {
-		puts stdout "==== Test generated return exception;  result was:"
-		puts stdout $actualAnswer
-	    } elseif {$code == 3} {
-		puts stdout "==== Test generated break exception"
-	    } elseif {$code == 4} {
-		puts stdout "==== Test generated continue exception"
-	    } else {
-		puts stdout "==== Test generated exception $code;  message was:"
-		puts stdout $actualAnswer
-	    }
-	} else {
-	    puts stdout "---- Result was:\n$actualAnswer"
-	}
-	puts stdout "---- Result should have been:\n$expectedAnswer"
-	puts stdout "==== $name FAILED\n" 
-    } else { 
-	incr ::tcltest::numTests(Passed)
-	if {[string first p $::tcltest::verbose] != -1} {
-	    puts stdout "++++ $name PASSED"
-	}
-    }
-}
-
-# ::tcltest::dotests --
-#
-#	takes two arguments--the name of the test file (such
-#	as "parse.test"), and a pattern selecting the tests you want to
-#	execute.  It sets ::tcltest::matching to the second argument, calls
-#	"source" on the file specified in the first argument, and restores
-#	::tcltest::matching to its pre-call value at the end.
-#
-# Arguments:
-#	file    name of tests file to source
-#	args    pattern selecting the tests you want to execute
-#
-# Results:
-#	none
-
-proc ::tcltest::dotests {file args} {
-    set savedTests $::tcltest::match
-    set ::tcltest::match $args
-    source $file
-    set ::tcltest::match $savedTests
-}
-
-proc ::tcltest::openfiles {} {
-    if {[catch {testchannel open} result]} {
-	return {}
-    }
-    return $result
-}
-
-proc ::tcltest::leakfiles {old} {
-    if {[catch {testchannel open} new]} {
-        return {}
-    }
-    set leak {}
-    foreach p $new {
-    	if {[lsearch $old $p] < 0} {
-	    lappend leak $p
-	}
-    }
-    return $leak
-}
-
-set ::tcltest::saveState {}
-
-proc ::tcltest::saveState {} {
-    uplevel #0 {set ::tcltest::saveState [list [info procs] [info vars]]}
-}
-
-proc ::tcltest::restoreState {} {
-    foreach p [info procs] {
-	if {[lsearch [lindex $::tcltest::saveState 0] $p] < 0} {
-	    rename $p {}
-	}
-    }
-    foreach p [uplevel #0 {info vars}] {
-	if {[lsearch [lindex $::tcltest::saveState 1] $p] < 0} {
-	    uplevel #0 "unset $p"
-	}
-    }
-}
-
-proc ::tcltest::normalizeMsg {msg} {
-    regsub "\n$" [string tolower $msg] "" msg
-    regsub -all "\n\n" $msg "\n" msg
-    regsub -all "\n\}" $msg "\}" msg
-    return $msg
-}
-
-# makeFile --
-#
-# Create a new file with the name <name>, and write <contents> to it.
-#
-# If this file hasn't been created via makeFile since the last time
-# cleanupTests was called, add it to the $filesMade list, so it will
-# be removed by the next call to cleanupTests.
-#
-proc ::tcltest::makeFile {contents name} {
-    set fd [open $name w]
-    fconfigure $fd -translation lf
-    if {[string index $contents [expr {[string length $contents] - 1}]] == "\n"} {
-	puts -nonewline $fd $contents
-    } else {
-	puts $fd $contents
-    }
-    close $fd
-
-    set fullName [file join [pwd] $name]
-    if {[lsearch -exact $::tcltest::filesMade $fullName] == -1} {
-	lappend ::tcltest::filesMade $fullName
-    }
-}
-
-proc ::tcltest::removeFile {name} {
-    file delete $name
-}
-
-# makeDirectory --
-#
-# Create a new dir with the name <name>.
-#
-# If this dir hasn't been created via makeDirectory since the last time
-# cleanupTests was called, add it to the $directoriesMade list, so it will
-# be removed by the next call to cleanupTests.
-#
-proc ::tcltest::makeDirectory {name} {
-    file mkdir $name
-
-    set fullName [file join [pwd] $name]
-    if {[lsearch -exact $::tcltest::filesMade $fullName] == -1} {
-	lappend ::tcltest::filesMade $fullName
-    }
-}
-
-proc ::tcltest::removeDirectory {name} {
-    file delete -force $name
-}
-
-proc ::tcltest::viewFile {name} {
-    global tcl_platform
-    if {($tcl_platform(platform) == "macintosh") || \
-		($::tcltest::testConfig(unixExecs) == 0)} {
-	set f [open $name]
-	set data [read -nonewline $f]
-	close $f
-	return $data
-    } else {
-	exec cat $name
-    }
-}
-
-#
-# Construct a string that consists of the requested sequence of bytes,
-# as opposed to a string of properly formed UTF-8 characters.  
-# This allows the tester to 
-# 1. Create denormalized or improperly formed strings to pass to C procedures 
-#    that are supposed to accept strings with embedded NULL bytes.
-# 2. Confirm that a string result has a certain pattern of bytes, for instance
-#    to confirm that "\xe0\0" in a Tcl script is stored internally in 
-#    UTF-8 as the sequence of bytes "\xc3\xa0\xc0\x80".
-#
-# Generally, it's a bad idea to examine the bytes in a Tcl string or to
-# construct improperly formed strings in this manner, because it involves
-# exposing that Tcl uses UTF-8 internally.
-
-proc ::tcltest::bytestring {string} {
-    encoding convertfrom identity $string
-}
-
-# Locate tcltest executable
-
-if {![info exists tk_version]} {
-    set tcltest [info nameofexecutable]
-
-    if {$tcltest == "{}"} {
-	set tcltest {}
-    }
-}
-
-set ::tcltest::testConfig(stdio) 0
-catch {
-    catch {file delete -force tmp}
-    set f [open tmp w]
-    puts $f {
-	exit
-    }
-    close $f
-
-    set f [open "|[list $tcltest tmp]" r]
-    close $f
-    
-    set ::tcltest::testConfig(stdio) 1
-}
-catch {file delete -force tmp}
-
-# Deliberately call the socket with the wrong number of arguments.  The error
-# message you get will indicate whether sockets are available on this system.
-catch {socket} msg
-set ::tcltest::testConfig(socket) \
-	[expr {$msg != "sockets are not available on this system"}]
-
-#
-# Internationalization / ISO support procs     -- dl
-#
-if {[info commands testlocale]==""} {
-    # No testlocale command, no tests...
-    # (it could be that we are a sub interp and we could just load
-    # the Tcltest package but that would interfere with tests
-    # that tests packages/loading in slaves...)
-    set ::tcltest::testConfig(hasIsoLocale) 0
-} else {
-    proc ::tcltest::set_iso8859_1_locale {} {
-	set ::tcltest::previousLocale [testlocale ctype]
-	testlocale ctype $::tcltest::isoLocale
-    }
-
-    proc ::tcltest::restore_locale {} {
-	testlocale ctype $::tcltest::previousLocale
-    }
-
-    if {![info exists ::tcltest::isoLocale]} {
-	set ::tcltest::isoLocale fr
-        switch $tcl_platform(platform) {
-	    "unix" {
-		# Try some 'known' values for some platforms:
-		switch -exact -- $tcl_platform(os) {
-		    "FreeBSD" {
-			set ::tcltest::isoLocale fr_FR.ISO_8859-1
-		    }
-		    HP-UX {
-			set ::tcltest::isoLocale fr_FR.iso88591
-		    }
-		    Linux -
-		    IRIX {
-			set ::tcltest::isoLocale fr
-		    }
-		    default {
-			# Works on SunOS 4 and Solaris, and maybe others...
-			# define it to something else on your system
-			#if you want to test those.
-			set ::tcltest::isoLocale iso_8859_1
-		    }
-		}
-	    }
-	    "windows" {
-		set ::tcltest::isoLocale French
-	    }
-	}
-    }
-
-    set ::tcltest::testConfig(hasIsoLocale) \
-	    [string length [::tcltest::set_iso8859_1_locale]]
-    ::tcltest::restore_locale
-} 
-
-#
-# procedures that are Tk specific
-#
-if {[info exists tk_version]} {
-    # If the main window isn't already mapped (e.g. because the tests are
-    # being run automatically) , specify a precise size for it so that the
-    # user won't have to position it manually.
-
-    if {![winfo ismapped .]} {
-	wm geometry . +0+0
-	update
-    }
-
-    # The following code can be used to perform tests involving a second
-    # process running in the background.
-    
-    # Locate the tktest executable
-
-    set ::tcltest::tktest [info nameofexecutable]
-    if {$::tcltest::tktest == "{}"} {
-	set ::tcltest::tktest {}
-	puts stdout \
-		"Unable to find tktest executable, skipping multiple process tests."
-    }
-
-    # Create background process
-    
-    proc ::tcltest::setupbg args {
-	if {$::tcltest::tktest == ""} {
-	    error "you're not running tktest so setupbg should not have been called"
-	}
-	if {[info exists ::tcltest::fd] && ($::tcltest::fd != "")} {
-	    cleanupbg
-	}
-	
-	# The following code segment cannot be run on Windows in Tk8.1b2
-	# This bug is logged as a pipe bug (bugID 1495).
-
-	global tcl_platform
-	if {$tcl_platform(platform) != "windows"} {
-	    set ::tcltest::fd [open "|[list $::tcltest::tktest -geometry +0+0 -name tktest] $args" r+]
-	    puts $::tcltest::fd "puts foo; flush stdout"
-	    flush $::tcltest::fd
-	    if {[gets $::tcltest::fd data] < 0} {
-		error "unexpected EOF from \"$::tcltest::tktest\""
-	    }
-	    if {[string compare $data foo]} {
-		error "unexpected output from background process \"$data\""
-	    }
-	    fileevent $::tcltest::fd readable bgReady
-	}
-    }
-    
-    # Send a command to the background process, catching errors and
-    # flushing I/O channels
-    proc ::tcltest::dobg {command} {
-	puts $::tcltest::fd "catch [list $command] msg; update; puts \$msg; puts **DONE**; flush stdout"
-	flush $::tcltest::fd
-	set ::tcltest::bgDone 0
-	set ::tcltest::bgData {}
-	tkwait variable ::tcltest::bgDone
-	set ::tcltest::bgData
-    }
-
-    # Data arrived from background process.  Check for special marker
-    # indicating end of data for this command, and make data available
-    # to dobg procedure.
-    proc ::tcltest::bgReady {} {
-	set x [gets $::tcltest::fd]
-	if {[eof $::tcltest::fd]} {
-	    fileevent $::tcltest::fd readable {}
-	    set ::tcltest::bgDone 1
-	} elseif {$x == "**DONE**"} {
-	    set ::tcltest::bgDone 1
-	} else {
-	    append ::tcltest::bgData $x
-	}
-    }
-
-    # Exit the background process, and close the pipes
-    proc ::tcltest::cleanupbg {} {
-	catch {
-	    puts $::tcltest::fd "exit"
-	    close $::tcltest::fd
-	}
-	set ::tcltest::fd ""
-    }
-
-    # Clean up focus after using generate event, which
-    # can leave the window manager with the wrong impression
-    # about who thinks they have the focus. (BW)
-    
-    proc ::tcltest::fixfocus {} {
-	catch {destroy .focus}
-	toplevel .focus
-	wm geometry .focus +0+0
-	entry .focus.e
-	.focus.e insert 0 "fixfocus"
-	pack .focus.e
-	update
-	focus -force .focus.e
-	destroy .focus
-    }
-}
-
-# Need to catch the import because it fails if defs.tcl is sourced
-# more than once.
-catch {namespace import ::tcltest::*}
-return
diff --git a/tests/dstring.test b/tests/dstring.test
deleted file mode 100644
index e614b97..0000000
--- a/tests/dstring.test
+++ /dev/null
@@ -1,267 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for Tcl's dynamic string
-# library procedures.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: dstring.test,v 1.3 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testdstring] == {}} {
-    puts "This application hasn't been compiled with the \"testdstring\""
-    puts "command, so I can't test Tcl_DStringAppend et al."
-    ::tcltest::cleanupTests
-    return
-}
-
-test dstring-1.1 {appending and retrieving} {
-    testdstring free
-    testdstring append "abc" -1
-    list [testdstring get] [testdstring length]
-} {abc 3}
-test dstring-1.2 {appending and retrieving} {
-    testdstring free
-    testdstring append "abc" -1
-    testdstring append " xyzzy" 3
-    testdstring append " 12345" -1
-    list [testdstring get] [testdstring length]
-} {{abc xy 12345} 12}
-test dstring-1.3 {appending and retrieving} {
-    testdstring free
-    foreach l {a b c d e f g h i j k l m n o p} {
-	testdstring append $l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l\n -1
-    }
-    list [testdstring get] [testdstring length]
-} {{aaaaaaaaaaaaaaaaaaaaa
-bbbbbbbbbbbbbbbbbbbbb
-ccccccccccccccccccccc
-ddddddddddddddddddddd
-eeeeeeeeeeeeeeeeeeeee
-fffffffffffffffffffff
-ggggggggggggggggggggg
-hhhhhhhhhhhhhhhhhhhhh
-iiiiiiiiiiiiiiiiiiiii
-jjjjjjjjjjjjjjjjjjjjj
-kkkkkkkkkkkkkkkkkkkkk
-lllllllllllllllllllll
-mmmmmmmmmmmmmmmmmmmmm
-nnnnnnnnnnnnnnnnnnnnn
-ooooooooooooooooooooo
-ppppppppppppppppppppp
-} 352}
-
-test dstring-2.1 {appending list elements} {
-    testdstring free
-    testdstring element "abc"
-    testdstring element "d e f"
-    list [testdstring get] [testdstring length]
-} {{abc {d e f}} 11}
-test dstring-2.2 {appending list elements} {
-    testdstring free
-    testdstring element "x"
-    testdstring element "\{"
-    testdstring element "ab\}"
-    testdstring get
-} {x \{ ab\}}
-test dstring-2.3 {appending list elements} {
-    testdstring free
-    foreach l {a b c d e f g h i j k l m n o p} {
-	testdstring element $l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l
-    }
-    testdstring get
-} {aaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbb ccccccccccccccccccccc ddddddddddddddddddddd eeeeeeeeeeeeeeeeeeeee fffffffffffffffffffff ggggggggggggggggggggg hhhhhhhhhhhhhhhhhhhhh iiiiiiiiiiiiiiiiiiiii jjjjjjjjjjjjjjjjjjjjj kkkkkkkkkkkkkkkkkkkkk lllllllllllllllllllll mmmmmmmmmmmmmmmmmmmmm nnnnnnnnnnnnnnnnnnnnn ooooooooooooooooooooo ppppppppppppppppppppp}
-test dstring-2.4 {appending list elements} {
-    testdstring free
-    testdstring append "a\{" -1
-    testdstring element abc
-    testdstring append "	\{" -1
-    testdstring element xyzzy
-    testdstring get
-} "a{ abc	{xyzzy"
-test dstring-2.5 {appending list elements} {
-    testdstring free
-    testdstring append " \{" -1
-    testdstring element abc
-    testdstring get
-} " {abc"
-test dstring-2.6 {appending list elements} {
-    testdstring free
-    testdstring append " " -1
-    testdstring element abc
-    testdstring get
-} { abc}
-test dstring-2.7 {appending list elements} {
-    testdstring free
-    testdstring append "\\ " -1
-    testdstring element abc
-    testdstring get
-} "\\  abc"
-test dstring-2.8 {appending list elements} {
-    testdstring free
-    testdstring append "x " -1
-    testdstring element abc
-    testdstring get
-} {x abc}
-
-test dstring-3.1 {nested sublists} {
-    testdstring free
-    testdstring start
-    testdstring element foo
-    testdstring element bar
-    testdstring end
-    testdstring element another
-    testdstring get
-} {{foo bar} another}
-test dstring-3.2 {nested sublists} {
-    testdstring free
-    testdstring start
-    testdstring start
-    testdstring element abc
-    testdstring element def
-    testdstring end
-    testdstring end
-    testdstring element ghi
-    testdstring get
-} {{{abc def}} ghi}
-test dstring-3.3 {nested sublists} {
-    testdstring free
-    testdstring start
-    testdstring start
-    testdstring start
-    testdstring element foo
-    testdstring element foo2
-    testdstring end
-    testdstring end
-    testdstring element foo3
-    testdstring end
-    testdstring element foo4
-    testdstring get
-} {{{{foo foo2}} foo3} foo4}
-test dstring-3.4 {nested sublists} {
-    testdstring free
-    testdstring element before
-    testdstring start
-    testdstring element during
-    testdstring element more
-    testdstring end
-    testdstring element last
-    testdstring get
-} {before {during more} last}
-test dstring-3.5 {nested sublists} {
-    testdstring free
-    testdstring element "\{"
-    testdstring start
-    testdstring element first
-    testdstring element second
-    testdstring end
-    testdstring get
-} {\{ {first second}}
-
-test dstring-4.1 {truncation} {
-    testdstring free
-    testdstring append "abcdefg" -1
-    testdstring trunc 3
-    list [testdstring get] [testdstring length]
-} {abc 3}
-test dstring-4.2 {truncation} {
-    testdstring free
-    testdstring append "xyzzy" -1
-    testdstring trunc 0
-    list [testdstring get] [testdstring length]
-} {{} 0}
-
-test dstring-5.1 {copying to result} {
-    testdstring free
-    testdstring append xyz -1
-    testdstring result
-} xyz
-test dstring-5.2 {copying to result} {
-    testdstring free
-    catch {unset a}
-    foreach l {a b c d e f g h i j k l m n o p} {
-	testdstring append $l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l\n -1
-    }
-    set a [testdstring result]
-    testdstring append abc -1
-    list $a [testdstring get]
-} {{aaaaaaaaaaaaaaaaaaaaa
-bbbbbbbbbbbbbbbbbbbbb
-ccccccccccccccccccccc
-ddddddddddddddddddddd
-eeeeeeeeeeeeeeeeeeeee
-fffffffffffffffffffff
-ggggggggggggggggggggg
-hhhhhhhhhhhhhhhhhhhhh
-iiiiiiiiiiiiiiiiiiiii
-jjjjjjjjjjjjjjjjjjjjj
-kkkkkkkkkkkkkkkkkkkkk
-lllllllllllllllllllll
-mmmmmmmmmmmmmmmmmmmmm
-nnnnnnnnnnnnnnnnnnnnn
-ooooooooooooooooooooo
-ppppppppppppppppppppp
-} abc}
-
-test dstring-6.1 {Tcl_DStringGetResult} {
-    testdstring free
-    list [testdstring gresult staticsmall] [testdstring get]
-} {{} short}
-test dstring-6.2 {Tcl_DStringGetResult} {
-    testdstring free
-    foreach l {a b c d e f g h i j k l m n o p} {
-	testdstring append $l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l$l\n -1
-    }
-    list [testdstring gresult staticsmall] [testdstring get]
-} {{} short}
-test dstring-6.3 {Tcl_DStringGetResult} {
-    set result {}
-    lappend result [testdstring gresult staticlarge]
-    testdstring append x 1
-    lappend result [testdstring get]
-} {{} {first0 first1 first2 first3 first4 first5 first6 first7 first8 first9
-second0 second1 second2 second3 second4 second5 second6 second7 second8 second9
-third0 third1 third2 third3 third4 third5 third6 third7 third8 third9
-fourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9
-fifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9
-sixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9
-seventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9
-x}}
-test dstring-6.4 {Tcl_DStringGetResult} {
-    set result {}
-    lappend result [testdstring gresult free]
-    testdstring append y 1
-    lappend result [testdstring get]
-} {{} {This is a malloc-ed stringy}}
-test dstring-6.5 {Tcl_DStringGetResult} {
-    set result {}
-    lappend result [testdstring gresult special]
-    testdstring append z 1
-    lappend result [testdstring get]
-} {{} {This is a specially-allocated stringz}}
-
-# cleanup
-testdstring free
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/encoding.test b/tests/encoding.test
deleted file mode 100644
index 3852749..0000000
--- a/tests/encoding.test
+++ /dev/null
@@ -1,316 +0,0 @@
-# This file contains a collection of tests for tclEncoding.c
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: encoding.test,v 1.2 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc toutf {args} {
-    global x
-    lappend x "toutf $args"
-}
-proc fromutf {args} {
-    global x
-    lappend x "fromutf $args"
-}
-
-# Some tests require the testencoding command
-
-set ::tcltest::testConfig(testencoding) \
-	[expr {[info commands testencoding] != {}}]
-
-
-# TclInitEncodingSubsystem is tested by the rest of this file
-# TclFinalizeEncodingSubsystem is not currently tested
-
-test encoding-1.1 {Tcl_GetEncoding: system encoding} {testencoding} {
-    testencoding create foo toutf fromutf
-    set old [encoding system]
-    encoding system foo
-    set x {}
-    encoding convertto abcd
-    encoding system $old
-    testencoding delete foo
-    set x
-} {{fromutf }}
-test encoding-1.2 {Tcl_GetEncoding: existing encoding} {testencoding} {
-    testencoding create foo toutf fromutf
-    set x {}
-    encoding convertto foo abcd
-    testencoding delete foo
-    set x
-} {{fromutf }}
-test encoding-1.3 {Tcl_GetEncoding: load encoding} {
-    list [encoding convertto jis0208 \u4e4e] \
-	[encoding convertfrom jis0208 8C]
-} "8C \u4e4e"
-
-test encoding-2.1 {Tcl_FreeEncoding: refcount == 0} {
-    encoding convertto jis0208 \u4e4e
-} {8C}
-test encoding-2.2 {Tcl_FreeEncoding: refcount != 0} {testencoding} {
-    set system [encoding system]
-    set path [testencoding path]
-    encoding system jis0208		;# incr ref count
-    testencoding path .
-    set x [encoding convertto jis0208 \u4e4e]	;# old one found   
-    encoding system identity
-    lappend x [catch {encoding convertto jis0208 \u4e4e} msg] $msg
-    encoding system identity
-    testencoding path $path
-    encoding system $system
-    set x
-} {8C 1 {unknown encoding "jis0208"}}
-
-test encoding-3.1 {Tcl_GetEncodingName, NULL} {
-    set old [encoding system]
-    encoding system jis0208
-    set x [encoding system]
-    encoding system $old
-    set x
-} {jis0208}
-test encoding-3.2 {Tcl_GetEncodingName, non-null} {
-    set old [fconfigure stdout -encoding]
-    fconfigure stdout -encoding jis0208
-    set x [fconfigure stdout -encoding]
-    fconfigure stdout -encoding $old
-    set x
-} {jis0208}
-
-test encoding-4.1 {Tcl_GetEncodingNames} {testencoding} {
-    file mkdir tmp/encoding
-    close [open tmp/encoding/junk.enc w]
-    close [open tmp/encoding/junk2.enc w]
-    cd tmp
-    set path [testencoding path]
-    testencoding path {}
-    catch {unset encodings}
-    catch {unset x}
-    foreach encoding [encoding names] {
-	set encodings($encoding) 1
-    }
-    testencoding path .
-    foreach encoding [encoding names] {
-	if {![info exists encodings($encoding)]} {
-	    lappend x $encoding
-	}
-    }
-    testencoding path $path
-    cd ..
-    file delete -force tmp
-    lsort $x
-} {junk junk2}
-
-test encoding-5.1 {Tcl_SetSystemEncoding} {
-    set old [encoding system]
-    encoding system jis0208
-    set x [encoding convertto \u4e4e]
-    encoding system identity
-    encoding system $old
-    set x
-} {8C}
-test encoding-5.2 {Tcl_SetSystemEncoding: test ref count} {
-    set old [encoding system]
-    encoding system $old
-    string compare $old [encoding system]
-} {0}
-
-test encoding-6.1 {Tcl_CreateEncoding: new} {testencoding} {
-    testencoding create foo {toutf 1} {fromutf 2}
-    set x {}
-    encoding convertfrom foo abcd
-    encoding convertto foo abcd
-    testencoding delete foo
-    set x
-} {{toutf 1} {fromutf 2}}
-test encoding-6.2 {Tcl_CreateEncoding: replace encoding} {testencoding} {
-    testencoding create foo {toutf a} {fromutf b}
-    set x {}
-    encoding convertfrom foo abcd
-    encoding convertto foo abcd
-    testencoding delete foo
-    set x
-} {{toutf a} {fromutf b}}
-
-test encoding-7.1 {Tcl_ExternalToUtfDString: small buffer} {
-    encoding convertfrom jis0208 8c8c8c8c
-} "\u543e\u543e\u543e\u543e"
-test encoding-7.2 {Tcl_UtfToExternalDString: big buffer} {
-    set a 8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C8C
-    append a $a
-    append a $a
-    append a $a
-    append a $a
-    set x [encoding convertfrom jis0208 $a]
-    list [string length $x] [string index $x 0]
-} "512 \u4e4e"
-
-test encoding-8.1 {Tcl_ExternalToUtf} {
-    set f [open dummy w]
-    fconfigure $f -translation binary -encoding iso8859-1
-    puts -nonewline $f "ab\x8c\xc1g"
-    close $f
-    set f [open dummy r]
-    fconfigure $f -translation binary -encoding shiftjis    
-    set x [read $f]
-    close $f
-    file delete dummy
-    set x
-} "ab\u4e4eg"
-
-test encoding-9.1 {Tcl_UtfToExternalDString: small buffer} {
-    encoding convertto jis0208 "\u543e\u543e\u543e\u543e"
-} {8c8c8c8c}
-test encoding-9.2 {Tcl_UtfToExternalDString: big buffer} {
-    set a \u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e\u4e4e
-    append a $a
-    append a $a
-    append a $a
-    append a $a
-    append a $a
-    append a $a
-    set x [encoding convertto jis0208 $a]
-    list [string length $x] [string range $x 0 1]
-} "1024 8C"
-
-test encoding-10.1 {Tcl_UtfToExternal} {
-    set f [open dummy w]
-    fconfigure $f -translation binary -encoding shiftjis
-    puts -nonewline $f "ab\u4e4eg"
-    close $f
-    set f [open dummy r]
-    fconfigure $f -translation binary -encoding iso8859-1
-    set x [read $f]
-    close $f
-    file delete dummy
-    set x
-} "ab\x8c\xc1g"
-
-test encoding-11.1 {LoadEncodingFile: unknown encoding} {testencoding} {
-    set system [encoding system]
-    set path [testencoding path]
-    encoding system iso8859-1
-    testencoding path {}
-    set x [list [catch {encoding convertto jis0208 \u4e4e} msg] $msg]
-    testencoding path $path
-    encoding system $system
-    lappend x [encoding convertto jis0208 \u4e4e]
-} {1 {unknown encoding "jis0208"} 8C}
-test encoding-11.2 {LoadEncodingFile: single-byte} {
-    encoding convertfrom jis0201 \xa1
-} "\uff61"
-test encoding-11.3 {LoadEncodingFile: double-byte} {
-    encoding convertfrom jis0208 8C
-} "\u4e4e"
-test encoding-11.4 {LoadEncodingFile: multi-byte} {
-    encoding convertfrom shiftjis \x8c\xc1
-} "\u4e4e"
-test encoding-11.5 {LoadEncodingFile: escape file} {
-    encoding convertto iso2022 \u4e4e
-} "\x1b(B\x1b$@8C"
-test encoding-11.6 {LoadEncodingFile: invalid file} {testencoding} {
-    set system [encoding system]
-    set path [testencoding path]
-    encoding system identity
-    testencoding path tmp
-    file mkdir tmp/encoding
-    set f [open tmp/encoding/splat.enc w]
-    fconfigure $f -translation binary 
-    puts $f "abcdefghijklmnop"
-    close $f
-    set x [list [catch {encoding convertto splat \u4e4e} msg] $msg]
-    file delete -force tmp
-    catch {file delete encoding}
-    testencoding path $path
-    encoding system $system
-    set x
-} {1 {invalid encoding file "splat"}}
-
-# OpenEncodingFile is fully tested by the rest of the tests in this file.
-
-test encoding-12.1 {LoadTableEncoding: normal encoding} {
-    set x [encoding convertto iso8859-3 \u120]
-    append x [encoding convertto iso8859-3 \ud5]
-    append x [encoding convertfrom iso8859-3 \xd5]
-} "\xd5?\u120"
-test encoding-12.2 {LoadTableEncoding: single-byte encoding} {
-    set x [encoding convertto iso8859-3 ab\u0120g] 
-    append x [encoding convertfrom iso8859-3 ab\xd5g]
-} "ab\xd5gab\u120g"
-test encoding-12.3 {LoadTableEncoding: multi-byte encoding} {
-    set x [encoding convertto shiftjis ab\u4e4eg] 
-    append x [encoding convertfrom shiftjis ab\x8c\xc1g]
-} "ab\x8c\xc1gab\u4e4eg"
-test encoding-12.4 {LoadTableEncoding: double-byte encoding} {
-    set x [encoding convertto jis0208 \u4e4e\u3b1]
-    append x [encoding convertfrom jis0208 8C&A]
-} "8C&A\u4e4e\u3b1"
-test encoding-12.5 {LoadTableEncoding: symbol encoding} {
-    set x [encoding convertto symbol \u3b3]
-    append x [encoding convertto symbol \u67]
-    append x [encoding convertfrom symbol \x67]
-} "\x67\x67\u3b3"
-
-test encoding-13.1 {LoadEscapeTable} {
-    set x [encoding convertto iso2022 ab\u4e4e\u68d9g]
-} "\x1b(Bab\x1b$@8C\x1b$(DD%\x1b(Bg"
-
-test encoding-14.1 {BinaryProc} {
-    encoding convertto identity \x12\x34\x56\xff\x69
-} "\x12\x34\x56\xc3\xbf\x69"
-
-test encoding-15.1 {UtfToUtfProc} {
-    encoding convertto utf-8 \xa3
-} "\xc2\xa3"
-
-test encoding-16.1 {UnicodeToUtfProc} {
-    encoding convertfrom unicode NN
-} "\u4e4e"
-
-test encoding-17.1 {UtfToUnicodeProc} {
-} {}
-
-test encoding-18.1 {TableToUtfProc} {
-} {}
-
-test encoding-19.1 {TableFromUtfProc} {
-} {}
-
-test encoding-20.1 {TableFreefProc} {
-} {}
-
-test encoding-21.1 {EscapeToUtfProc} {
-} {}
-
-test encoding-22.1 {EscapeFromUtfProc} {
-} {}
-
-# EscapeFreeProc, GetTableEncoding, unilen
-# are fully tested by the rest of this file
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/env.test b/tests/env.test
deleted file mode 100644
index 27656e4..0000000
--- a/tests/env.test
+++ /dev/null
@@ -1,261 +0,0 @@
-# Commands covered:  none (tests environment variable implementation)
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: env.test,v 1.4 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-#
-# These tests will run on any platform (and indeed crashed
-# on the Mac).  So put them before you test for the existance
-# of exec.
-#
-test env-1.1 {propagation of env values to child interpreters} {
-    catch {interp delete child}
-    catch {unset env(test)}
-    interp create child
-    set env(test) garbage
-    set return [child eval {set env(test)}]
-    interp delete child
-    unset env(test)
-    set return
-} {garbage}
-#
-# This one crashed on Solaris under Tcl8.0, so we only
-# want to make sure it runs.
-#
-test env-1.2 {lappend to env value} {
-    catch {unset env(test)}
-    set env(test) aaaaaaaaaaaaaaaa
-    append env(test) bbbbbbbbbbbbbb
-    unset env(test)
-} {}
-test env-1.3 {reflection of env by "array names"} {
-    catch {interp delete child}
-    catch {unset env(test)}
-    interp create child
-    child eval {set env(test) garbage}
-    set names [array names env]
-    interp delete child
-    set ix [lsearch $names test]
-    catch {unset env(test)}
-    expr {$ix >= 0}
-} {1}
-
-
-# Some tests require the "exec" command.
-# Skip them if exec is not defined.
-set ::tcltest::testConfig(execCommandExists) [expr {[info commands exec] != ""}]
-
-set f [open printenv w]
-puts $f {
-    proc lrem {listname name} {
-	upvar $listname list
-	set i [lsearch $list $name]
-	if {$i >= 0} {
-	    set list [lreplace $list $i $i]
-	}
-	return $list
-    }
-	
-    set names [lsort [array names env]]
-    if {$tcl_platform(platform) == "windows"} {
-	lrem names HOME
-        lrem names COMSPEC
-	lrem names ComSpec
-	lrem names ""
-    }	
-    foreach name {TCL_LIBRARY PATH LD_LIBRARY_PATH PURE_PROG_NAME DISPLAY SHLIB_PATH } {
-	lrem names $name
-    }
-    foreach p $names {
-	puts "$p=$env($p)"
-    }
-}
-close $f
-	
-proc getenv {} {
-    global printenv tcltest
-    catch {exec $tcltest printenv} out
-    if {$out == "child process exited abnormally"} {
-	set out {}
-    }
-    return $out
-}
-
-# Save the current environment variables at the start of the test.
-
-foreach name [array names env] {
-    set env2($name) $env($name)
-    unset env($name)
-}
-
-# Added the following lines so that child tcltest can actually find its
-# library if the initial tcltest is run from a non-standard place.
-# ('saved' env vars)
-foreach name {TCL_LIBRARY PATH LD_LIBRARY_PATH DISPLAY SHLIB_PATH} {
-  if {[info exists env2($name)]} {
-     set env($name) $env2($name);
-  }
-}
-
-test env-2.1 {adding environment variables} {execCommandExists} {
-    getenv
-} {}
-
-set env(NAME1) "test string"
-test env-2.2 {adding environment variables} {execCommandExists} {
-    getenv
-} {NAME1=test string}
-
-set env(NAME2) "more"
-test env-2.3 {adding environment variables} {execCommandExists} {
-    getenv
-} {NAME1=test string
-NAME2=more}
-
-set env(XYZZY) "garbage"
-test env-2.4 {adding environment variables} {execCommandExists} {
-    getenv
-} {NAME1=test string
-NAME2=more
-XYZZY=garbage}
-
-set env(NAME2) "new value"
-test env-3.1 {changing environment variables} {execCommandExists} {
-    set result [getenv]
-    unset env(NAME2)
-    set result
-} {NAME1=test string
-NAME2=new value
-XYZZY=garbage}
-
-test env-4.1 {unsetting environment variables} {execCommandExists} {
-    set result [getenv]
-    unset env(NAME1)
-    set result
-} {NAME1=test string
-XYZZY=garbage}
-
-test env-4.2 {unsetting environment variables} {execCommandExists} {
-    set result [getenv]
-    unset env(XYZZY)
-    set result
-} {XYZZY=garbage}
-
-test env-4.3 {setting international environment variables} {execCommandExists} {
-    set env(\ua7) \ub6
-    getenv
-} "\ua7=\ub6"
-test env-4.4 {changing international environment variables} {execCommandExists} {
-    set env(\ua7) \ua7
-    getenv
-} "\ua7=\ua7"
-test env-4.5 {unsetting international environment variables} {execCommandExists} {
-    set env(\ub6) \ua7
-    unset env(\ua7)
-    set result [getenv]
-    unset env(\ub6)
-    set result
-} "\ub6=\ua7"
-
-test env-5.0 {corner cases - set a value, it should exist} {} {
-    set temp [lindex [array names env] end]
-    set x env($temp)
-    set env($temp) a
-    set result [set env($temp)]
-    set env($temp) $x
-    set result
-} {a}
-test env-5.1 {corner cases - remove one elem at a time} {} {
-    # When no environment variables exist, the env var will
-    # contain no entries.  The "array names" call synchs up
-    # the C-level environ array with the Tcl level env array.
-    # Make sure an empty Tcl array is created.
-
-    set x [array get env]
-    foreach e [array names env] {
-	unset env($e)
-    }
-    set result [catch {array names env}]
-    array set env $x
-    set result
-} {0}
-test env-5.2 {corner cases - unset the env array} {} {
-    # Unsetting a variable in an interp detaches the C-level
-    # traces from the Tcl "env" variable.
-
-    interp create i 
-    i eval { unset env }
-    i eval { set env(THIS_SHOULDNT_EXIST) a}
-    set result [info exist env(THIS_SHOULDNT_EXIST)]
-    interp delete i
-    set result
-} {0}
-test env-5.3 {corner cases - unset the env in master should unset child} {} {
-    # Variables deleted in a master interp should be deleted in
-    # child interp too.
-
-    interp create i 
-    i eval { set env(THIS_SHOULD_EXIST) a}
-    set result [set env(THIS_SHOULD_EXIST)]
-    unset env(THIS_SHOULD_EXIST)
-    lappend result [i eval {catch {set env(THIS_SHOULD_EXIST)}}]
-    interp delete i
-    set result
-} {a 1}
-test env-5.4 {corner cases - unset the env array} {knownBug} {
-    # The info exist command should be in synch with the env array.
-    # Know Bug: 1737
-
-    interp create i 
-    i eval { set env(THIS_SHOULD_EXIST) a}
-    set     result [info exists env(THIS_SHOULD_EXIST)]
-    lappend result [set env(THIS_SHOULD_EXIST)]
-    lappend result [info exists env(THIS_SHOULD_EXIST)]
-    interp delete i
-    set result
-} {1 a 1}
-test env-5.5 {corner cases - cannot have null entries on Windows} {pcOnly} {
-    set env() a
-    catch {set env()}
-} {1}
-
-
-# Restore the environment variables at the end of the test.
-
-foreach name [array names env] {
-    unset env($name)
-}
-foreach name [array names env2] {
-    set env($name) $env2($name)
-}
-
-# cleanup
-file delete printenv
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/error.test b/tests/error.test
deleted file mode 100644
index 45e8f1d..0000000
--- a/tests/error.test
+++ /dev/null
@@ -1,192 +0,0 @@
-# Commands covered:  error, catch
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: error.test,v 1.3 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc foo {} {
-    global errorInfo
-    set a [catch {format [error glorp2]} b]
-    error {Human-generated}
-}
-
-proc foo2 {} {
-    global errorInfo
-    set a [catch {format [error glorp2]} b]
-    error {Human-generated} $errorInfo
-}
-
-# Catch errors occurring in commands and errors from "error" command
-
-test error-1.1 {simple errors from commands} {
-    catch {format [string compare]} b
-} 1
-
-test error-1.2 {simple errors from commands} {
-    catch {format [string compare]} b
-    set b
-} {wrong # args: should be "string compare string1 string2"}
-
-test error-1.3 {simple errors from commands} {
-    catch {format [string compare]} b
-    set errorInfo
-} {wrong # args: should be "string compare string1 string2"
-    while executing
-"string compare"}
-
-test error-1.4 {simple errors from commands} {
-    catch {error glorp} b
-} 1
-
-test error-1.5 {simple errors from commands} {
-    catch {error glorp} b
-    set b
-} glorp
-
-test error-1.6 {simple errors from commands} {
-    catch {catch a b c} b
-} 1
-
-test error-1.7 {simple errors from commands} {
-    catch {catch a b c} b
-    set b
-} {wrong # args: should be "catch command ?varName?"}
-
-test error-1.8 {simple errors from commands} {nonPortable} {
-    # This test is non-portable: it generates a memory fault on
-    # machines like DEC Alphas (infinite recursion overflows
-    # stack?)
-
-    proc p {} {
-        uplevel 1 catch p error
-    }
-    p
-} 0
-
-# Check errors nested in procedures.  Also check the optional argument
-# to "error" to generate a new error trace.
-
-test error-2.1 {errors in nested procedures} {
-    catch foo b
-} 1
-
-test error-2.2 {errors in nested procedures} {
-    catch foo b
-    set b
-} {Human-generated}
-
-test error-2.3 {errors in nested procedures} {
-    catch foo b
-    set errorInfo
-} {Human-generated
-    while executing
-"error {Human-generated}"
-    (procedure "foo" line 4)
-    invoked from within
-"foo"}
-
-test error-2.4 {errors in nested procedures} {
-    catch foo2 b
-} 1
-
-test error-2.5 {errors in nested procedures} {
-    catch foo2 b
-    set b
-} {Human-generated}
-
-test error-2.6 {errors in nested procedures} {
-    catch foo2 b
-    set errorInfo
-} {glorp2
-    while executing
-"error glorp2"
-    (procedure "foo2" line 3)
-    invoked from within
-"foo2"}
-
-# Error conditions related to "catch".
-
-test error-3.1 {errors in catch command} {
-    list [catch {catch} msg] $msg
-} {1 {wrong # args: should be "catch command ?varName?"}}
-test error-3.2 {errors in catch command} {
-    list [catch {catch a b c} msg] $msg
-} {1 {wrong # args: should be "catch command ?varName?"}}
-test error-3.3 {errors in catch command} {
-    catch {unset a}
-    set a(0) 22
-    list [catch {catch {format 44} a} msg] $msg
-} {1 {couldn't save command result in variable}}
-catch {unset a}
-
-# More tests related to errorInfo and errorCode
-
-test error-4.1 {errorInfo and errorCode variables} {
-    list [catch {error msg1 msg2 msg3} msg] $msg $errorInfo $errorCode
-} {1 msg1 msg2 msg3}
-test error-4.2 {errorInfo and errorCode variables} {
-    list [catch {error msg1 {} msg3} msg] $msg $errorInfo $errorCode
-} {1 msg1 {msg1
-    while executing
-"error msg1 {} msg3"} msg3}
-test error-4.3 {errorInfo and errorCode variables} {
-    list [catch {error msg1 {}} msg] $msg $errorInfo $errorCode
-} {1 msg1 {msg1
-    while executing
-"error msg1 {}"} NONE}
-test error-4.4 {errorInfo and errorCode variables} {
-    set errorCode bogus
-    list [catch {error msg1} msg] $msg $errorInfo $errorCode
-} {1 msg1 {msg1
-    while executing
-"error msg1"} NONE}
-test error-4.5 {errorInfo and errorCode variables} {
-    set errorCode bogus
-    list [catch {error msg1 msg2 {}} msg] $msg $errorInfo $errorCode
-} {1 msg1 msg2 {}}
-
-# Errors in error command itself
-
-test error-5.1 {errors in error command} {
-    list [catch {error} msg] $msg
-} {1 {wrong # args: should be "error message ?errorInfo? ?errorCode?"}}
-test error-5.2 {errors in error command} {
-    list [catch {error a b c d} msg] $msg
-} {1 {wrong # args: should be "error message ?errorInfo? ?errorCode?"}}
-
-# Make sure that catch resets error information
-
-test error-6.1 {catch must reset error state} {
-    catch {error outer [catch {error inner inner.errorInfo inner.errorCode}]}
-    list $errorCode $errorInfo
-} {NONE 1}
-
-# cleanup
-catch {rename p ""}
-::tcltest::cleanupTests
-return 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/eval.test b/tests/eval.test
deleted file mode 100644
index 6c53bb8..0000000
--- a/tests/eval.test
+++ /dev/null
@@ -1,74 +0,0 @@
-# Commands covered:  eval
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: eval.test,v 1.3 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test eval-1.1 {single argument} {
-    eval {format 22}
-} 22
-test eval-1.2 {multiple arguments} {
-    set a {$b}
-    set b xyzzy
-    eval format $a
-} xyzzy
-test eval-1.3 {single argument} {
-    eval concat a b c d e f g
-} {a b c d e f g}
-
-test eval-2.1 {error: not enough arguments} {catch eval} 1
-test eval-2.2 {error: not enough arguments} {
-    catch eval msg
-    set msg
-} {wrong # args: should be "eval arg ?arg ...?"}
-test eval-2.3 {error in eval'ed command} {
-    catch {eval {error "test error"}}
-} 1
-test eval-2.4 {error in eval'ed command} {
-    catch {eval {error "test error"}} msg
-    set msg
-} {test error}
-test eval-2.5 {error in eval'ed command: setting errorInfo} {
-    catch {eval {
-	set a 1
-	error "test error"
-    }} msg
-    set errorInfo
-} "test error
-    while executing
-\"error \"test error\"\"
-    (\"eval\" body line 3)
-    invoked from within
-\"eval {
-	set a 1
-	error \"test error\"
-    }\""
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/event.test b/tests/event.test
deleted file mode 100644
index d75c959..0000000
--- a/tests/event.test
+++ /dev/null
@@ -1,589 +0,0 @@
-# This file contains a collection of tests for the procedures in the file
-# tclEvent.c, which includes the "update", and "vwait" Tcl
-# commands.  Sourcing this file into Tcl runs the tests and generates
-# output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: event.test,v 1.4 1999/04/16 00:47:26 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set ::tcltest::testConfig(testfilehandler) \
-	[expr {[info commands testfilehandler] != {}}]
-set ::tcltest::testConfig(testexithandler) \
-	[expr {[info commands testexithandler] != {}}]
-set ::tcltest::testConfig(testfilewait) \
-	[expr {[info commands testfilewait] != {}}]
-
-
-test event-1.1 {Tcl_CreateFileHandler, reading} {testfilehandler} {
-    testfilehandler close
-    testfilehandler create 0 readable off
-    testfilehandler clear 0
-    testfilehandler oneevent
-    set result ""
-    lappend result [testfilehandler counts 0]
-    testfilehandler fillpartial 0
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler close
-    set result
-} {{0 0} {1 0} {2 0}}
-test event-1.2 {Tcl_CreateFileHandler, writing} {testfilehandler nonPortable} {
-    # This test is non-portable because on some systems (e.g.
-    # SunOS 4.1.3) pipes seem to be writable always.
-    testfilehandler close
-    testfilehandler create 0 off writable
-    testfilehandler clear 0
-    testfilehandler oneevent
-    set result ""
-    lappend result [testfilehandler counts 0]
-    testfilehandler fillpartial 0
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler fill 0
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler close
-    set result
-} {{0 1} {0 2} {0 2}}
-test event-1.3 {Tcl_DeleteFileHandler} {testfilehandler nonPortable} {
-    testfilehandler close
-    testfilehandler create 2 disabled disabled
-    testfilehandler create 1 readable writable
-    testfilehandler create 0 disabled disabled
-    testfilehandler fillpartial 1
-    set result ""
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler create 1 off off
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler close
-    set result
-} {{0 1} {1 1} {1 2} {0 0}}
-
-test event-2.1 {Tcl_DeleteFileHandler} {testfilehandler nonPortable} {
-    testfilehandler close
-    testfilehandler create 2 disabled disabled
-    testfilehandler create 1 readable writable
-    testfilehandler fillpartial 1
-    set result ""
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler create 1 off off
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler close
-    set result
-} {{0 1} {1 1} {1 2} {0 0}}
-test event-2.2 {Tcl_DeleteFileHandler, fd reused & events still pending} \
-	{testfilehandler nonPortable} {
-    testfilehandler close
-    testfilehandler create 0 readable writable
-    testfilehandler fillpartial 0
-    set result ""
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler close
-    testfilehandler create 0 readable writable
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 0]
-    testfilehandler close
-    set result
-} {{0 1} {0 0}}
-
-test event-3.1 {FileHandlerCheckProc, TCL_FILE_EVENTS off } {testfilehandler} {
-    testfilehandler close
-    testfilehandler create 1 readable writable
-    testfilehandler fillpartial 1
-    testfilehandler windowevent
-    set result [testfilehandler counts 1]
-    testfilehandler close
-    set result
-} {0 0}
-
-test event-4.1 {FileHandlerEventProc, race between event and disabling} \
-	{testfilehandler nonPortable} {
-    update
-    testfilehandler close
-    testfilehandler create 2 disabled disabled
-    testfilehandler create 1 readable writable
-    testfilehandler fillpartial 1
-    set result ""
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler create 1 disabled disabled
-    testfilehandler oneevent
-    lappend result [testfilehandler counts 1]
-    testfilehandler close
-    set result
-} {{0 1} {1 1} {1 2} {0 0}}
-test event-4.2 {FileHandlerEventProc, TCL_FILE_EVENTS off} \
-	{testfilehandler nonPortable} {
-    update
-    testfilehandler close
-    testfilehandler create 1 readable writable
-    testfilehandler create 2 readable writable
-    testfilehandler fillpartial 1
-    testfilehandler fillpartial 2
-    testfilehandler oneevent
-    set result ""
-    lappend result [testfilehandler counts 1] [testfilehandler counts 2]
-    testfilehandler windowevent
-    lappend result [testfilehandler counts 1] [testfilehandler counts 2]
-    testfilehandler close
-    set result
-} {{0 0} {0 1} {0 0} {0 1}}
-update
-
-test event-5.1 {Tcl_BackgroundError, HandleBgErrors procedures} {
-    catch {rename bgerror {}}
-    proc bgerror msg {
-	global errorInfo errorCode x
-	lappend x [list $msg $errorInfo $errorCode]
-    }
-    after idle {error "a simple error"}
-    after idle {open non_existent}
-    after idle {set errorInfo foobar; set errorCode xyzzy}
-    set x {}
-    update idletasks
-    rename bgerror {}
-    set x
-} {{{a simple error} {a simple error
-    while executing
-"error "a simple error""
-    ("after" script)} NONE} {{couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
-    while executing
-"open non_existent"
-    ("after" script)} {POSIX ENOENT {no such file or directory}}}}
-test event-5.2 {Tcl_BackgroundError, HandleBgErrors procedures} {
-    catch {rename bgerror {}}
-    proc bgerror msg {
-	global x
-	lappend x $msg
-	return -code break
-    }
-    after idle {error "a simple error"}
-    after idle {open non_existent}
-    set x {}
-    update idletasks
-    rename bgerror {}
-    set x
-} {{a simple error}}
-
-test event-6.1 {BgErrorDeleteProc procedure} {
-    catch {interp delete foo}
-    interp create foo
-    foo eval {
-	proc bgerror args {
-	    global errorInfo
-	    set f [open err.out r+]
-	    seek $f 0 end
-	    puts $f "$args $errorInfo"
-	    close $f
-	}
-	after 100 {error "first error"}
-	after 100 {error "second error"}
-    }
-    makeFile Unmodified err.out
-    after 100 {interp delete foo}
-    after 200
-    update
-    set f [open err.out r]
-    set result [read $f]
-    close $f
-    removeFile err.out
-    set result
-} {Unmodified
-}
-
-test event-7.1 {bgerror / regular} {
-    set errRes {}
-    proc bgerror {err} {
-	global errRes;
-	set errRes $err;
-    }
-    after 0 {error err1}
-    vwait errRes;
-    set errRes;
-} err1
-
-test event-7.2 {bgerror / accumulation} {
-    set errRes {}
-    proc bgerror {err} {
-	global errRes;
-	lappend errRes $err;
-    }
-    after 0 {error err1}
-    after 0 {error err2}
-    after 0 {error err3}
-    update
-    set errRes;
-} {err1 err2 err3}
-
-test event-7.3 {bgerror / accumulation / break} {
-    set errRes {}
-    proc bgerror {err} {
-	global errRes;
-	lappend errRes $err;
-	return -code break "skip!";
-    }
-    after 0 {error err1}
-    after 0 {error err2}
-    after 0 {error err3}
-    update
-    set errRes;
-} err1
-
-test event-7.4 {tkerror is nothing special anymore to tcl} {
-    set errRes {}
-    # we don't just rename bgerror to empty because it could then
-    # be autoloaded...
-    proc bgerror {err} {
-	global errRes;
-	lappend errRes "bg:$err";
-    }
-    proc tkerror {err} {
-	global errRes;
-	lappend errRes "tk:$err";
-    }
-    after 0 {error err1}
-    update
-    rename tkerror {}
-    set errRes
-} bg:err1
-
-# someday : add a test checking that 
-# when there is no bgerror, an error msg goes to stderr
-# ideally one would use sub interp and transfer a fake stderr
-# to it, unfortunatly the current interp tcl API does not allow
-# that. the other option would be to use fork a test but it
-# then becomes more a file/exec test than a bgerror test.
-
-# end of bgerror tests
-catch {rename bgerror {}}
-
-
-test event-8.1 {Tcl_CreateExitHandler procedure} {stdio testexithandler} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "testexithandler create 41; testexithandler create 4"
-    puts $child "testexithandler create 6; exit"
-    flush $child
-    set result [read $child]
-    close $child
-    set result
-} {even 6
-even 4
-odd 41
-}
-
-test event-9.1 {Tcl_DeleteExitHandler procedure} {stdio testexithandler} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "testexithandler create 41; testexithandler create 4"
-    puts $child "testexithandler create 6; testexithandler delete 41"
-    puts $child "testexithandler create 16; exit"
-    flush $child
-    set result [read $child]
-    close $child
-    set result
-} {even 16
-even 6
-even 4
-}
-test event-9.2 {Tcl_DeleteExitHandler procedure} {stdio testexithandler} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "testexithandler create 41; testexithandler create 4"
-    puts $child "testexithandler create 6; testexithandler delete 4"
-    puts $child "testexithandler create 16; exit"
-    flush $child
-    set result [read $child]
-    close $child
-    set result
-    } {even 16
-even 6
-odd 41
-}
-test event-9.3 {Tcl_DeleteExitHandler procedure} {stdio testexithandler} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "testexithandler create 41; testexithandler create 4"
-    puts $child "testexithandler create 6; testexithandler delete 6"
-    puts $child "testexithandler create 16; exit"
-    flush $child
-    set result [read $child]
-    close $child
-    set result
-} {even 16
-even 4
-odd 41
-}
-test event-9.4 {Tcl_DeleteExitHandler procedure} {stdio testexithandler} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "testexithandler create 41; testexithandler delete 41"
-    puts $child "testexithandler create 16; exit"
-    flush $child
-    set result [read $child]
-    close $child
-    set result
-} {even 16
-}
-
-test event-10.1 {Tcl_Exit procedure} {stdio} {
-    set child [open |[list [info nameofexecutable]] r+]
-    puts $child "exit 3"
-    list [catch {close $child} msg] $msg [lindex $errorCode 0] \
-        [lindex $errorCode 2]
-} {1 {child process exited abnormally} CHILDSTATUS 3}
-
-test event-11.1 {Tcl_VwaitCmd procedure} {
-    list [catch {vwait} msg] $msg
-} {1 {wrong # args: should be "vwait name"}}
-test event-11.2 {Tcl_VwaitCmd procedure} {
-    list [catch {vwait a b} msg] $msg
-} {1 {wrong # args: should be "vwait name"}}
-test event-11.3 {Tcl_VwaitCmd procedure} {
-    catch {unset x}
-    set x 1
-    list [catch {vwait x(1)} msg] $msg
-} {1 {can't trace "x(1)": variable isn't array}}
-test event-11.4 {Tcl_VwaitCmd procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 10; update; # On Mac make sure update won't take long
-    after 100 {set x x-done}
-    after 200 {set y y-done}
-    after 300 {set z z-done}
-    after idle {set q q-done}
-    set x before
-    set y before
-    set z before
-    set q before
-    list [vwait y] $x $y $z $q
-} {{} x-done y-done before q-done}
-
-foreach i [after info] {
-    after cancel $i
-}
-
-test event-11.5 {Tcl_VwaitCmd procedure: round robin scheduling, 2 sources} {socket} {
-    set f1 [open test1 w]
-    proc accept {s args} {
-	puts $s foobar
-	close $s
-    }
-    set s1 [socket -server accept 5001]
-    set s2 [socket 127.0.0.1 5001]
-    close $s1
-    set x 0
-    set y 0
-    set z 0
-    fileevent $s2 readable { incr z }
-    vwait z
-    fileevent $f1 writable { incr x; if { $y == 3 } { set z done } }
-    fileevent $s2 readable { incr y; if { $x == 3 } { set z done } }
-    vwait z
-    close $f1
-    close $s2
-    file delete test1 test2
-    list $x $y $z
-} {3 3 done}
-test event-11.6 {Tcl_VwaitCmd procedure: round robin scheduling, same source} {
-    file delete test1 test2
-    set f1 [open test1 w]
-    set f2 [open test2 w]
-    set x 0
-    set y 0
-    set z 0
-    update
-    fileevent $f1 writable { incr x; if { $y == 3 } { set z done } }
-    fileevent $f2 writable { incr y; if { $x == 3 } { set z done } }
-    vwait z
-    close $f1
-    close $f2
-    file delete test1 test2
-    list $x $y $z
-} {3 3 done}
-
-
-test event-12.1 {Tcl_UpdateCmd procedure} {
-    list [catch {update a b} msg] $msg
-} {1 {wrong # args: should be "update ?idletasks?"}}
-test event-12.2 {Tcl_UpdateCmd procedure} {
-    list [catch {update bogus} msg] $msg
-} {1 {bad option "bogus": must be idletasks}}
-test event-12.3 {Tcl_UpdateCmd procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 500 {set x after}
-    after idle {set y after}
-    after idle {set z "after, y = $y"}
-    set x before
-    set y before
-    set z before
-    update idletasks
-    list $x $y $z
-} {before after {after, y = after}}
-test event-12.4 {Tcl_UpdateCmd procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 10; update; # On Mac make sure update won't take long
-    after 200 {set x x-done}
-    after 600 {set y y-done}
-    after idle {set z z-done}
-    set x before
-    set y before
-    set z before
-    after 300
-    update
-    list $x $y $z
-} {x-done before z-done}
-
-test event-13.1 {Tcl_WaitForFile procedure, readable} {testfilehandler} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    set x "no timeout"
-    set result [testfilehandler wait 1 readable 0]
-    update
-    testfilehandler close
-    list $result $x
-} {{} {no timeout}}
-test event-13.2 {Tcl_WaitForFile procedure, readable} testfilehandler {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    set x "no timeout"
-    set result [testfilehandler wait 1 readable 100]
-    update
-    testfilehandler close
-    list $result $x
-} {{} timeout}
-test event-13.3 {Tcl_WaitForFile procedure, readable} testfilehandler {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    testfilehandler fillpartial 1
-    set x "no timeout"
-    set result [testfilehandler wait 1 readable 100]
-    update
-    testfilehandler close
-    list $result $x
-} {readable {no timeout}}
-test event-13.4 {Tcl_WaitForFile procedure, writable} \
-	{testfilehandler nonPortable} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    testfilehandler fill 1
-    set x "no timeout"
-    set result [testfilehandler wait 1 writable 0]
-    update
-    testfilehandler close
-    list $result $x
-} {{} {no timeout}}
-test event-13.5 {Tcl_WaitForFile procedure, writable} \
-	{testfilehandler nonPortable} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    testfilehandler fill 1
-    set x "no timeout"
-    set result [testfilehandler wait 1 writable 100]
-    update
-    testfilehandler close
-    list $result $x
-} {{} timeout}
-test event-13.6 {Tcl_WaitForFile procedure, writable} testfilehandler {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 set x timeout
-    testfilehandler close
-    testfilehandler create 1 off off
-    set x "no timeout"
-    set result [testfilehandler wait 1 writable 100]
-    update
-    testfilehandler close
-    list $result $x
-} {writable {no timeout}}
-test event-13.7 {Tcl_WaitForFile procedure, don't call other event handlers} testfilehandler {
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 100 lappend x timeout
-    after idle lappend x idle
-    testfilehandler close
-    testfilehandler create 1 off off
-    set x ""
-    set result [list [testfilehandler wait 1 readable 200] $x]
-    update
-    testfilehandler close
-    lappend result $x
-} {{} {} {timeout idle}}
-
-test event-13.8 {Tcl_WaitForFile procedure, waiting indefinitely} testfilewait {
-    set f [open "|sleep 2" r]
-    set result ""
-    lappend result [testfilewait $f readable 100]
-    lappend result [testfilewait $f readable -1]
-    close $f
-    set result
-} {{} readable}
-
-# cleanup
-foreach i [after info] {
-    after cancel $i
-}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/exec.test b/tests/exec.test
deleted file mode 100644
index ceb677b..0000000
--- a/tests/exec.test
+++ /dev/null
@@ -1,589 +0,0 @@
-# Commands covered:  exec
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: exec.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# All tests require the "exec" command.
-# Skip them if exec is not defined.
-set ::tcltest::testConfig(execCommandExists) [expr {[info commands exec] != ""}]
-
-set f [open echo w]
-puts $f {
-    puts -nonewline [lindex $argv 0]
-    foreach str [lrange $argv 1 end] {
-	puts -nonewline " $str"
-    }
-    puts {}
-}
-close $f
-
-set f [open cat w]
-puts $f {
-    if {$argv == {}} {
-	set argv -
-    }
-    foreach name $argv {
-	if {$name == "-"} {
-	    set f stdin
-	} elseif {[catch {open $name r} f] != 0} {
-	    puts stderr $f
-	    continue
-	}
-	while {[eof $f] == 0} {
-	    puts -nonewline [read $f]
-	}
-	if {$f != "stdin"} {
-	    close $f
-	}
-    }
-}
-close $f
-
-set f [open wc w]
-puts $f {
-    set data [read stdin]
-    set lines [regsub -all "\n" $data {} dummy]
-    set words [regsub -all "\[^ \t\n]+" $data {} dummy]
-    set chars [string length $data]
-    puts [format "%8.d%8.d%8.d" $lines $words $chars]
-}
-close $f
-
-set f [open sh w]
-puts $f {
-    if {[lindex $argv 0] != "-c"} {
-	error "sh: unexpected arguments $argv"
-    }
-    set cmd [lindex $argv 1]
-    lappend cmd ";"
-
-    set newcmd {}
-    
-    foreach arg $cmd {
-	if {$arg == ";"} {
-	    eval exec >@stdout 2>@stderr [list [info nameofexecutable]] $newcmd
-	    set newcmd {}
-	    continue
-	}
-	if {$arg == "1>&2"} {
-	    set arg >@stderr
-	}
-	lappend newcmd $arg
-    }
-}
-close $f
-
-set f [open sleep w]
-puts $f {
-    after [expr $argv*1000]
-}
-close $f
-
-set f [open exit w]
-puts $f {
-    exit $argv
-}
-close $f
-
-# Basic operations.
-
-test exec-1.1 {basic exec operation} {execCommandExists stdio} {
-    exec $tcltest echo a b c
-} "a b c"
-test exec-1.2 {pipelining} {execCommandExists stdio} {
-    exec $tcltest echo a b c d | $tcltest cat | $tcltest cat
-} "a b c d"
-test exec-1.3 {pipelining} {execCommandExists stdio} {
-    set a [exec $tcltest echo a b c d | $tcltest cat | $tcltest wc]
-    list [scan $a "%d %d %d" b c d] $b $c
-} {3 1 4}
-set arg {12345678901234567890123456789012345678901234567890}
-set arg "$arg$arg$arg$arg$arg$arg"
-test exec-1.4 {long command lines} {execCommandExists stdio} {
-    exec $tcltest echo $arg
-} $arg
-set arg {}
-
-# I/O redirection: input from Tcl command.
-
-test exec-2.1 {redirecting input from immediate source} {execCommandExists stdio} {
-    exec $tcltest cat << "Sample text"
-} {Sample text}
-test exec-2.2 {redirecting input from immediate source} {execCommandExists stdio} {
-    exec << "Sample text" $tcltest cat | $tcltest cat
-} {Sample text}
-test exec-2.3 {redirecting input from immediate source} {execCommandExists stdio} {
-    exec $tcltest cat << "Sample text" | $tcltest cat
-} {Sample text}
-test exec-2.4 {redirecting input from immediate source} {execCommandExists stdio} {
-    exec $tcltest cat | $tcltest cat << "Sample text"
-} {Sample text}
-test exec-2.5 {redirecting input from immediate source} {execCommandExists stdio} {
-    exec $tcltest cat "<<Joined to arrows"
-} {Joined to arrows}
-
-# I/O redirection: output to file.
-
-file delete gorp.file
-test exec-3.1 {redirecting output to file} {execCommandExists stdio} {
-    exec $tcltest echo "Some simple words" > gorp.file
-    exec $tcltest cat gorp.file
-} "Some simple words"
-test exec-3.2 {redirecting output to file} {execCommandExists stdio} {
-    exec $tcltest echo "More simple words" | >gorp.file $tcltest cat | $tcltest cat
-    exec $tcltest cat gorp.file
-} "More simple words"
-test exec-3.3 {redirecting output to file} {execCommandExists stdio} {
-    exec > gorp.file $tcltest echo "Different simple words" | $tcltest cat | $tcltest cat
-    exec $tcltest cat gorp.file
-} "Different simple words"
-test exec-3.4 {redirecting output to file} {execCommandExists stdio} {
-    exec $tcltest echo "Some simple words" >gorp.file
-    exec $tcltest cat gorp.file
-} "Some simple words"
-test exec-3.5 {redirecting output to file} {execCommandExists stdio} {
-    exec $tcltest echo "First line" >gorp.file
-    exec $tcltest echo "Second line" >> gorp.file
-    exec $tcltest cat gorp.file
-} "First line\nSecond line"
-test exec-3.6 {redirecting output to file} {execCommandExists stdio} {
-    exec $tcltest echo "First line" >gorp.file
-    exec $tcltest echo "Second line" >>gorp.file
-    exec $tcltest cat gorp.file
-} "First line\nSecond line"
-test exec-3.7 {redirecting output to file} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "Line 1"
-    flush $f
-    exec $tcltest echo "More text" >@ $f
-    exec $tcltest echo >@$f "Even more"
-    puts $f "Line 3"
-    close $f
-    exec $tcltest cat gorp.file
-} "Line 1\nMore text\nEven more\nLine 3"
-
-# I/O redirection: output and stderr to file.
-
-file delete gorp.file
-test exec-4.1 {redirecting output and stderr to file} {execCommandExists stdio} {
-    exec $tcltest echo "test output" >& gorp.file
-    exec $tcltest cat gorp.file
-} "test output"
-test exec-4.2 {redirecting output and stderr to file} {execCommandExists stdio} {
-    list [exec $tcltest sh -c "echo foo bar 1>&2" >&gorp.file] \
-	    [exec $tcltest cat gorp.file]
-} {{} {foo bar}}
-test exec-4.3 {redirecting output and stderr to file} {execCommandExists stdio} {
-    exec $tcltest echo "first line" > gorp.file
-    list [exec $tcltest sh -c "echo foo bar 1>&2" >>&gorp.file] \
-	    [exec $tcltest cat gorp.file]
-} "{} {first line\nfoo bar}"
-test exec-4.4 {redirecting output and stderr to file} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "Line 1"
-    flush $f
-    exec $tcltest echo "More text" >&@ $f
-    exec $tcltest echo >&@$f "Even more"
-    puts $f "Line 3"
-    close $f
-    exec $tcltest cat gorp.file
-} "Line 1\nMore text\nEven more\nLine 3"
-test exec-4.5 {redirecting output and stderr to file} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "Line 1"
-    flush $f
-    exec >&@ $f $tcltest sh -c "echo foo bar 1>&2"
-    exec >&@$f $tcltest sh -c "echo xyzzy 1>&2"
-    puts $f "Line 3"
-    close $f
-    exec $tcltest cat gorp.file
-} "Line 1\nfoo bar\nxyzzy\nLine 3"
-
-# I/O redirection: input from file.
-
-exec $tcltest echo "Just a few thoughts" > gorp.file
-test exec-5.1 {redirecting input from file} {execCommandExists stdio} {
-    exec $tcltest cat < gorp.file
-} {Just a few thoughts}
-test exec-5.2 {redirecting input from file} {execCommandExists stdio} {
-    exec $tcltest cat | $tcltest cat < gorp.file
-} {Just a few thoughts}
-test exec-5.3 {redirecting input from file} {execCommandExists stdio} {
-    exec $tcltest cat < gorp.file | $tcltest cat
-} {Just a few thoughts}
-test exec-5.4 {redirecting input from file} {execCommandExists stdio} {
-    exec < gorp.file $tcltest cat | $tcltest cat
-} {Just a few thoughts}
-test exec-5.5 {redirecting input from file} {execCommandExists stdio} {
-    exec $tcltest cat <gorp.file
-} {Just a few thoughts}
-test exec-5.6 {redirecting input from file} {execCommandExists stdio} {
-    set f [open gorp.file r]
-    set result [exec $tcltest cat <@ $f]
-    close $f
-    set result
-} {Just a few thoughts}
-test exec-5.7 {redirecting input from file} {execCommandExists stdio} {
-    set f [open gorp.file r]
-    set result [exec <@$f $tcltest cat]
-    close $f
-    set result
-} {Just a few thoughts}
-
-# I/O redirection: standard error through a pipeline.
-
-test exec-6.1 {redirecting stderr through a pipeline} {execCommandExists stdio} {
-    exec $tcltest sh -c "echo foo bar" |& $tcltest cat
-} "foo bar"
-test exec-6.2 {redirecting stderr through a pipeline} {execCommandExists stdio} {
-    exec $tcltest sh -c "echo foo bar 1>&2" |& $tcltest cat
-} "foo bar"
-test exec-6.3 {redirecting stderr through a pipeline} {execCommandExists stdio} {
-    exec $tcltest sh -c "echo foo bar 1>&2" \
-	|& $tcltest sh -c "echo second msg 1>&2 ; cat" |& $tcltest cat
-} "second msg\nfoo bar"
-
-# I/O redirection: combinations.
-
-file delete gorp.file2
-test exec-7.1 {multiple I/O redirections} {execCommandExists stdio} {
-    exec << "command input" > gorp.file2 $tcltest cat < gorp.file
-    exec $tcltest cat gorp.file2
-} {Just a few thoughts}
-test exec-7.2 {multiple I/O redirections} {execCommandExists stdio} {
-    exec < gorp.file << "command input" $tcltest cat
-} {command input}
-
-# Long input to command and output from command.
-
-set a "0123456789 xxxxxxxxx abcdefghi ABCDEFGHIJK\n"
-set a [concat $a $a $a $a]
-set a [concat $a $a $a $a]
-set a [concat $a $a $a $a]
-set a [concat $a $a $a $a]
-test exec-8.1 {long input and output} {execCommandExists stdio} {
-    exec $tcltest cat << $a
-} $a
-
-# More than 20 arguments to exec.
-
-test exec-8.1 {long input and output} {execCommandExists stdio} {
-    exec $tcltest echo 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-} {1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23}
-
-# Commands that return errors.
-
-test exec-9.1 {commands returning errors} {execCommandExists stdio} {
-    set x [catch {exec gorp456} msg]
-    list $x [string tolower $msg] [string tolower $errorCode]
-} {1 {couldn't execute "gorp456": no such file or directory} {posix enoent {no such file or directory}}}
-test exec-9.2 {commands returning errors} {execCommandExists stdio} {
-    string tolower [list [catch {exec $tcltest echo foo | foo123} msg] $msg $errorCode]
-} {1 {couldn't execute "foo123": no such file or directory} {posix enoent {no such file or directory}}}
-test exec-9.3 {commands returning errors} {execCommandExists stdio} {
-    list [catch {exec $tcltest sleep 1 | $tcltest exit 43 | $tcltest sleep 1} msg] $msg
-} {1 {child process exited abnormally}}
-test exec-9.4 {commands returning errors} {execCommandExists stdio} {
-    list [catch {exec $tcltest exit 43 | $tcltest echo "foo bar"} msg] $msg
-} {1 {foo bar
-child process exited abnormally}}
-test exec-9.5 {commands returning errors} {execCommandExists stdio} {
-    list [catch {exec gorp456 | $tcltest echo a b c} msg] [string tolower $msg]
-} {1 {couldn't execute "gorp456": no such file or directory}}
-test exec-9.6 {commands returning errors} {execCommandExists stdio} {
-    list [catch {exec $tcltest sh -c "echo error msg 1>&2"} msg] $msg
-} {1 {error msg}}
-test exec-9.7 {commands returning errors} {execCommandExists stdio} {
-    list [catch {exec $tcltest sh -c "echo error msg 1>&2" \
-		     | $tcltest sh -c "echo error msg 1>&2"} msg] $msg
-} {1 {error msg
-error msg}}
-test exec-9.8 {commands returning errors} {execCommandExists stdio} {
-    set f [open err w]
-    puts $f {
-	puts stdout out
-	puts stderr err
-    }
-    close $f
-    list [catch {exec $tcltest err} msg] $msg
-} {1 {out
-err}}
-
-# Errors in executing the Tcl command, as opposed to errors in the
-# processes that are invoked.
-
-test exec-10.1 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec} msg] $msg
-} {1 {wrong # args: should be "exec ?switches? arg ?arg ...?"}}
-test exec-10.2 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec | cat} msg] $msg
-} {1 {illegal use of | or |& in command}}
-test exec-10.3 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat |} msg] $msg
-} {1 {illegal use of | or |& in command}}
-test exec-10.4 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat | | cat} msg] $msg
-} {1 {illegal use of | or |& in command}}
-test exec-10.5 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat | |& cat} msg] $msg
-} {1 {illegal use of | or |& in command}}
-test exec-10.6 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat |&} msg] $msg
-} {1 {illegal use of | or |& in command}}
-test exec-10.7 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat <} msg] $msg
-} {1 {can't specify "<" as last word in command}}
-test exec-10.8 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >} msg] $msg
-} {1 {can't specify ">" as last word in command}}
-test exec-10.9 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat <<} msg] $msg
-} {1 {can't specify "<<" as last word in command}}
-test exec-10.10 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >>} msg] $msg
-} {1 {can't specify ">>" as last word in command}}
-test exec-10.11 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >&} msg] $msg
-} {1 {can't specify ">&" as last word in command}}
-test exec-10.12 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >>&} msg] $msg
-} {1 {can't specify ">>&" as last word in command}}
-test exec-10.13 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >@} msg] $msg
-} {1 {can't specify ">@" as last word in command}}
-test exec-10.14 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat <@} msg] $msg
-} {1 {can't specify "<@" as last word in command}}
-test exec-10.15 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat < a/b/c} msg] [string tolower $msg]
-} {1 {couldn't read file "a/b/c": no such file or directory}}
-test exec-10.16 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat << foo > a/b/c} msg] [string tolower $msg]
-} {1 {couldn't write file "a/b/c": no such file or directory}}
-test exec-10.17 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat << foo > a/b/c} msg] [string tolower $msg]
-} {1 {couldn't write file "a/b/c": no such file or directory}}
-set f [open gorp.file w]
-test exec-10.18 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat <@ $f} msg] $msg
-} "1 {channel \"$f\" wasn't opened for reading}"
-close $f
-set f [open gorp.file r]
-test exec-10.19 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec cat >@ $f} msg] $msg
-} "1 {channel \"$f\" wasn't opened for writing}"
-close $f
-test exec-10.20 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec ~non_existent_user/foo/bar} msg] $msg
-} {1 {user "non_existent_user" doesn't exist}}
-test exec-10.21 {errors in exec invocation} {execCommandExists stdio} {
-    list [catch {exec $tcltest true | ~xyzzy_bad_user/x | false} msg] $msg
-} {1 {user "xyzzy_bad_user" doesn't exist}}
-
-# Commands in background.
-
-test exec-11.1 {commands in background} {execCommandExists stdio} {
-    set x [lindex [time {exec $tcltest sleep 2 &}] 0]
-    expr $x<1000000
-} 1
-test exec-11.2 {commands in background} {execCommandExists stdio} {
-    list [catch {exec $tcltest echo a &b} msg] $msg
-} {0 {a &b}}
-test exec-11.3 {commands in background} {execCommandExists stdio} {
-    llength [exec $tcltest sleep 1 &]
-} 1
-test exec-11.4 {commands in background} {execCommandExists stdio} {
-    llength [exec $tcltest sleep 1 | $tcltest sleep 1 | $tcltest sleep 1 &]
-} 3
-test exec-11.5 {commands in background} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f { catch { exec [info nameofexecutable] echo foo & } }
-    close $f
-    string compare "foo" [exec $tcltest gorp.file]
-} 0
-
-# Make sure that background commands are properly reaped when
-# they eventually die.
-
-exec $tcltest sleep 3
-test exec-12.1 {reaping background processes} \
-	{execCommandExists stdio unixOnly nonPortable} {
-    for {set i 0} {$i < 20} {incr i} {
-	exec echo foo > /dev/null &
-    }
-    exec sleep 1
-    catch {exec ps | fgrep "echo foo" | fgrep -v fgrep | wc} msg
-    lindex $msg 0
-} 0
-test exec-12.2 {reaping background processes} \
-	{execCommandExists stdio unixOnly nonPortable} {
-    exec sleep 2 | sleep 2 | sleep 2 &
-    catch {exec ps | fgrep -i "sleep" | fgrep -i -v fgrep | wc} msg
-    set x [lindex $msg 0]
-    exec sleep 3
-    catch {exec ps | fgrep -i "sleep" | fgrep -i -v fgrep | wc} msg
-    list $x [lindex $msg 0]
-} {3 0}
-test exec-12.3 {reaping background processes} \
-	{execCommandExists stdio unixOnly nonPortable} {
-    exec sleep 1000 &
-    exec sleep 1000 &
-    set x [exec ps | fgrep "sleep" | fgrep -v fgrep]
-    set pids {}
-    foreach i [split $x \n] {
-	lappend pids [lindex $i 0]
-    }
-    foreach i $pids {
-	catch {exec kill -STOP $i}
-    }
-    catch {exec ps | fgrep "sleep" | fgrep -v fgrep | wc} msg
-    set x [lindex $msg 0]
-
-    foreach i $pids {
-	catch {exec kill -KILL $i}
-    }
-    catch {exec ps | fgrep "sleep" | fgrep -v fgrep | wc} msg
-    list $x [lindex $msg 0]
-} {2 0}
-
-# Make sure "errorCode" is set correctly.
-
-test exec-13.1 {setting errorCode variable} {execCommandExists stdio} {
-    list [catch {exec $tcltest cat < a/b/c} msg] [string tolower $errorCode]
-} {1 {posix enoent {no such file or directory}}}
-test exec-13.2 {setting errorCode variable} {execCommandExists stdio} {
-    list [catch {exec $tcltest cat > a/b/c} msg] [string tolower $errorCode]
-} {1 {posix enoent {no such file or directory}}}
-test exec-13.3 {setting errorCode variable} {execCommandExists stdio} {
-    set x [catch {exec _weird_cmd_} msg]
-    list $x [string tolower $msg] [lindex $errorCode 0] \
-	    [string tolower [lrange $errorCode 2 end]]
-} {1 {couldn't execute "_weird_cmd_": no such file or directory} POSIX {{no such file or directory}}}
-
-# Switches before the first argument
-
-test exec-14.1 {-keepnewline switch} {execCommandExists stdio} {
-    exec -keepnewline $tcltest echo foo
-} "foo\n"
-test exec-14.2 {-keepnewline switch} {execCommandExists stdio} {
-    list [catch {exec -keepnewline} msg] $msg
-} {1 {wrong # args: should be "exec ?switches? arg ?arg ...?"}}
-test exec-14.3 {unknown switch} {execCommandExists stdio} {
-    list [catch {exec -gorp} msg] $msg
-} {1 {bad switch "-gorp": must be -keepnewline or --}}
-test exec-14.4 {-- switch} {execCommandExists stdio} {
-    list [catch {exec -- -gorp} msg] [string tolower $msg]
-} {1 {couldn't execute "-gorp": no such file or directory}}
-
-# Redirecting standard error separately from standard output
-
-test exec-15.1 {standard error redirection} {execCommandExists stdio} {
-    exec $tcltest echo "First line" > gorp.file
-    list [exec $tcltest sh -c "echo foo bar 1>&2" 2> gorp.file] \
-	    [exec $tcltest cat gorp.file]
-} {{} {foo bar}}
-test exec-15.2 {standard error redirection} {execCommandExists stdio} {
-    list [exec $tcltest sh -c "echo foo bar 1>&2" \
-		| $tcltest echo biz baz >gorp.file 2> gorp.file2] \
-	    [exec $tcltest cat gorp.file] \
-	    [exec $tcltest cat gorp.file2]
-} {{} {biz baz} {foo bar}}
-test exec-15.3 {standard error redirection} {execCommandExists stdio} {
-    list [exec $tcltest sh -c "echo foo bar 1>&2" \
-	        | $tcltest echo biz baz 2>gorp.file > gorp.file2] \
-	    [exec $tcltest cat gorp.file] \
-	    [exec $tcltest cat gorp.file2]
-} {{} {foo bar} {biz baz}}
-test exec-15.4 {standard error redirection} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "Line 1"
-    flush $f
-    exec $tcltest sh -c "echo foo bar 1>&2" 2>@ $f
-    puts $f "Line 3"
-    close $f
-    exec $tcltest cat gorp.file
-} {Line 1
-foo bar
-Line 3}
-test exec-15.5 {standard error redirection} {execCommandExists stdio} {
-    exec $tcltest echo "First line" > gorp.file
-    exec $tcltest sh -c "echo foo bar 1>&2" 2>> gorp.file
-    exec $tcltest cat gorp.file
-} {First line
-foo bar}
-test exec-15.6 {standard error redirection} {execCommandExists stdio} {
-    exec $tcltest sh -c "echo foo bar 1>&2" > gorp.file2 2> gorp.file \
-	    >& gorp.file 2> gorp.file2 | $tcltest echo biz baz
-    list [exec $tcltest cat gorp.file] [exec $tcltest cat gorp.file2]
-} {{biz baz} {foo bar}}
-
-test exec-16.1 {flush output before exec} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "First line"
-    exec $tcltest echo "Second line" >@ $f
-    puts $f "Third line"
-    close $f
-    exec $tcltest cat gorp.file
-} {First line
-Second line
-Third line}
-test exec-16.2 {flush output before exec} {execCommandExists stdio} {
-    set f [open gorp.file w]
-    puts $f "First line"
-    exec $tcltest << {puts stderr {Second line}} >&@ $f > gorp.file2
-    puts $f "Third line"
-    close $f
-    exec $tcltest cat gorp.file
-} {First line
-Second line
-Third line}
-
-test exec-17.1 { inheriting standard I/O } {execCommandExists stdio} {
-    set f [open script w]
-    puts $f {close stdout
-	set f [open gorp.file w]
-	catch {exec [info nameofexecutable] echo foobar &}
-	exec [info nameofexecutable] sleep 2
-	close $f
-    }
-    close $f
-    catch {exec $tcltest script} result
-    set f [open gorp.file r]
-    lappend result [read $f]
-    close $f
-    set result
-} {{foobar
-}}
-
-# cleanup
-file delete script gorp.file gorp.file2
-file delete echo cat wc sh sleep exit
-file delete err
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/execute.test b/tests/execute.test
deleted file mode 100644
index aebe67b..0000000
--- a/tests/execute.test
+++ /dev/null
@@ -1,548 +0,0 @@
-# This file contains tests for the tclExecute.c source file. Tests appear
-# in the same order as the C code that they test. The set of tests is
-# currently incomplete since it currently includes only new tests for
-# code changed for the addition of Tcl namespaces. Other execution-
-# related tests appear in several other test files including
-# namespace.test, basic.test, eval.test, for.test, etc.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: execute.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {eval namespace delete [namespace children :: test_ns_*]}
-catch {rename foo ""}
-catch {unset x}
-catch {unset y}
-catch {unset msg}
-
-set ::tcltest::testConfig(testobj) \
-	[expr {[info commands testobj] != {} \
-	&& [info commands testdoubleobj] != {} \
-	&& [info commands teststringobj] != {} \
-	&& [info commands testobj] != {}}]
-
-# Tests for the omnibus TclExecuteByteCode function:
-
-# INST_DONE not tested
-# INST_PUSH1 not tested
-# INST_PUSH4 not tested
-# INST_POP not tested
-# INST_DUP not tested
-# INST_CONCAT1 not tested
-# INST_INVOKE_STK4 not tested
-# INST_INVOKE_STK1 not tested
-# INST_EVAL_STK not tested
-# INST_EXPR_STK not tested
-# INST_LOAD_SCALAR1 not tested
-# INST_LOAD_SCALAR4 not tested
-# INST_LOAD_SCALAR_STK not tested
-# INST_LOAD_ARRAY4 not tested
-# INST_LOAD_ARRAY1 not tested
-# INST_LOAD_ARRAY_STK not tested
-# INST_LOAD_STK not tested
-# INST_STORE_SCALAR4 not tested
-# INST_STORE_SCALAR1 not tested
-# INST_STORE_SCALAR_STK not tested
-# INST_STORE_ARRAY4 not tested
-# INST_STORE_ARRAY1 not tested
-# INST_STORE_ARRAY_STK not tested
-# INST_STORE_STK not tested
-# INST_INCR_SCALAR1 not tested
-# INST_INCR_SCALAR_STK not tested
-# INST_INCR_STK not tested
-# INST_INCR_ARRAY1 not tested
-# INST_INCR_ARRAY_STK not tested
-# INST_INCR_SCALAR1_IMM not tested
-# INST_INCR_SCALAR_STK_IMM not tested
-# INST_INCR_STK_IMM not tested
-# INST_INCR_ARRAY1_IMM not tested
-# INST_INCR_ARRAY_STK_IMM not tested
-# INST_JUMP1 not tested
-# INST_JUMP4 not tested
-# INST_JUMP_TRUE4 not tested
-# INST_JUMP_TRUE1 not tested
-# INST_JUMP_FALSE4 not tested
-# INST_JUMP_FALSE1 not tested
-# INST_LOR not tested
-# INST_LAND not tested
-# INST_EQ not tested
-# INST_NEQ not tested
-# INST_LT not tested
-# INST_GT not tested
-# INST_LE not tested
-# INST_GE not tested
-# INST_MOD not tested
-# INST_LSHIFT not tested
-# INST_RSHIFT not tested
-# INST_BITOR not tested
-# INST_BITXOR not tested
-# INST_BITAND not tested
-
-# INST_ADD is partially tested:
-test execute-1.1 {TclExecuteByteCode, INST_ADD, op1 is int} {testobj} {
-    set x [testintobj set 0 1]
-    expr {$x + 1}
-} 2
-test execute-1.2 {TclExecuteByteCode, INST_ADD, op1 is double} {testobj} {
-    set x [testdoubleobj set 0 1]
-    expr {$x + 1}
-} 2.0
-test execute-1.3 {TclExecuteByteCode, INST_ADD, op1 is double with string} {testobj} {
-    set x [testintobj set 0 1]
-    testobj convert 0 double
-    expr {$x + 1}
-} 2
-test execute-1.4 {TclExecuteByteCode, INST_ADD, op1 is string int} {testobj} {
-    set x [teststringobj set 0 1]
-    expr {$x + 1}
-} 2
-test execute-1.5 {TclExecuteByteCode, INST_ADD, op1 is string double} {testobj} {
-    set x [teststringobj set 0 1.0]
-    expr {$x + 1}
-} 2.0
-test execute-1.6 {TclExecuteByteCode, INST_ADD, op1 is non-numeric} {testobj} {
-    set x [teststringobj set 0 foo]
-    list [catch {expr {$x + 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test execute-1.7 {TclExecuteByteCode, INST_ADD, op2 is int} {testobj} {
-    set x [testintobj set 0 1]
-    expr {1 + $x}
-} 2
-test execute-1.8 {TclExecuteByteCode, INST_ADD, op2 is double} {testobj} {
-    set x [testdoubleobj set 0 1]
-    expr {1 + $x}
-} 2.0
-test execute-1.9 {TclExecuteByteCode, INST_ADD, op2 is double with string} {testobj} {
-    set x [testintobj set 0 1]
-    testobj convert 0 double
-    expr {1 + $x}
-} 2
-test execute-1.10 {TclExecuteByteCode, INST_ADD, op2 is string int} {testobj} {
-    set x [teststringobj set 0 1]
-    expr {1 + $x}
-} 2
-test execute-1.11 {TclExecuteByteCode, INST_ADD, op2 is string double} {testobj} {
-    set x [teststringobj set 0 1.0]
-    expr {1 + $x}
-} 2.0
-test execute-1.12 {TclExecuteByteCode, INST_ADD, op2 is non-numeric} {testobj} {
-    set x [teststringobj set 0 foo]
-    list [catch {expr {1 + $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-
-# INST_SUB is partially tested:
-test execute-1.13 {TclExecuteByteCode, INST_SUB, op1 is int} {testobj} {
-    set x [testintobj set 0 1]
-    expr {$x - 1}
-} 0
-test execute-1.14 {TclExecuteByteCode, INST_SUB, op1 is double} {testobj} {
-    set x [testdoubleobj set 0 1]
-    expr {$x - 1}
-} 0.0
-test execute-1.15 {TclExecuteByteCode, INST_SUB, op1 is double with string} {testobj} {
-    set x [testintobj set 0 1]
-    testobj convert 0 double
-    expr {$x - 1}
-} 0
-test execute-1.16 {TclExecuteByteCode, INST_SUB, op1 is string int} {testobj} {
-    set x [teststringobj set 0 1]
-    expr {$x - 1}
-} 0
-test execute-1.17 {TclExecuteByteCode, INST_SUB, op1 is string double} {testobj} {
-    set x [teststringobj set 0 1.0]
-    expr {$x - 1}
-} 0.0
-test execute-1.18 {TclExecuteByteCode, INST_SUB, op1 is non-numeric} {testobj} {
-    set x [teststringobj set 0 foo]
-    list [catch {expr {$x - 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-test execute-1.19 {TclExecuteByteCode, INST_SUB, op2 is int} {testobj} {
-    set x [testintobj set 0 1]
-    expr {1 - $x}
-} 0
-test execute-1.20 {TclExecuteByteCode, INST_SUB, op2 is double} {testobj} {
-    set x [testdoubleobj set 0 1]
-    expr {1 - $x}
-} 0.0
-test execute-1.21 {TclExecuteByteCode, INST_SUB, op2 is double with string} {testobj} {
-    set x [testintobj set 0 1]
-    testobj convert 0 double
-    expr {1 - $x}
-} 0
-test execute-1.22 {TclExecuteByteCode, INST_SUB, op2 is string int} {testobj} {
-    set x [teststringobj set 0 1]
-    expr {1 - $x}
-} 0
-test execute-1.23 {TclExecuteByteCode, INST_SUB, op2 is string double} {testobj} {
-    set x [teststringobj set 0 1.0]
-    expr {1 - $x}
-} 0.0
-test execute-1.24 {TclExecuteByteCode, INST_SUB, op2 is non-numeric} {testobj} {
-    set x [teststringobj set 0 foo]
-    list [catch {expr {1 - $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-
-# INST_MULT is partially tested:
-test execute-1.25 {TclExecuteByteCode, INST_MULT, op1 is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {$x * 1}
-} 1
-test execute-1.26 {TclExecuteByteCode, INST_MULT, op1 is double} {testobj} {
-    set x [testdoubleobj set 1 2.0]
-    expr {$x * 1}
-} 2.0
-test execute-1.27 {TclExecuteByteCode, INST_MULT, op1 is double with string} {testobj} {
-    set x [testintobj set 1 2]
-    testobj convert 1 double
-    expr {$x * 1}
-} 2
-test execute-1.28 {TclExecuteByteCode, INST_MULT, op1 is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {$x * 1}
-} 1
-test execute-1.29 {TclExecuteByteCode, INST_MULT, op1 is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {$x * 1}
-} 1.0
-test execute-1.30 {TclExecuteByteCode, INST_MULT, op1 is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {$x * 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
-test execute-1.31 {TclExecuteByteCode, INST_MULT, op2 is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {1 * $x}
-} 1
-test execute-1.32 {TclExecuteByteCode, INST_MULT, op2 is double} {testobj} {
-    set x [testdoubleobj set 1 2.0]
-    expr {1 * $x}
-} 2.0
-test execute-1.33 {TclExecuteByteCode, INST_MULT, op2 is double with string} {testobj} {
-    set x [testintobj set 1 2]
-    testobj convert 1 double
-    expr {1 * $x}
-} 2
-test execute-1.34 {TclExecuteByteCode, INST_MULT, op2 is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {1 * $x}
-} 1
-test execute-1.35 {TclExecuteByteCode, INST_MULT, op2 is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {1 * $x}
-} 1.0
-test execute-1.36 {TclExecuteByteCode, INST_MULT, op2 is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {1 * $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
-
-# INST_DIV is partially tested:
-test execute-1.37 {TclExecuteByteCode, INST_DIV, op1 is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {$x / 1}
-} 1
-test execute-1.38 {TclExecuteByteCode, INST_DIV, op1 is double} {testobj} {
-    set x [testdoubleobj set 1 2.0]
-    expr {$x / 1}
-} 2.0
-test execute-1.39 {TclExecuteByteCode, INST_DIV, op1 is double with string} {testobj} {
-    set x [testintobj set 1 2]
-    testobj convert 1 double
-    expr {$x / 1}
-} 2
-test execute-1.40 {TclExecuteByteCode, INST_DIV, op1 is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {$x / 1}
-} 1
-test execute-1.41 {TclExecuteByteCode, INST_DIV, op1 is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {$x / 1}
-} 1.0
-test execute-1.42 {TclExecuteByteCode, INST_DIV, op1 is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {$x / 1}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-test execute-1.43 {TclExecuteByteCode, INST_DIV, op2 is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {2 / $x}
-} 2
-test execute-1.44 {TclExecuteByteCode, INST_DIV, op2 is double} {testobj} {
-    set x [testdoubleobj set 1 1.0]
-    expr {2 / $x}
-} 2.0
-test execute-1.45 {TclExecuteByteCode, INST_DIV, op2 is double with string} {testobj} {
-    set x [testintobj set 1 1]
-    testobj convert 1 double
-    expr {2 / $x}
-} 2
-test execute-1.46 {TclExecuteByteCode, INST_DIV, op2 is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {2 / $x}
-} 2
-test execute-1.47 {TclExecuteByteCode, INST_DIV, op2 is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {2 / $x}
-} 2.0
-test execute-1.48 {TclExecuteByteCode, INST_DIV, op2 is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {1 / $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-
-# INST_UPLUS is partially tested:
-test execute-1.49 {TclExecuteByteCode, INST_UPLUS, op is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {+ $x}
-} 1
-test execute-1.50 {TclExecuteByteCode, INST_UPLUS, op is double} {testobj} {
-    set x [testdoubleobj set 1 1.0]
-    expr {+ $x}
-} 1.0
-test execute-1.51 {TclExecuteByteCode, INST_UPLUS, op is double with string} {testobj} {
-    set x [testintobj set 1 1]
-    testobj convert 1 double
-    expr {+ $x}
-} 1
-test execute-1.52 {TclExecuteByteCode, INST_UPLUS, op is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {+ $x}
-} 1
-test execute-1.53 {TclExecuteByteCode, INST_UPLUS, op is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {+ $x}
-} 1.0
-test execute-1.54 {TclExecuteByteCode, INST_UPLUS, op is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {+ $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-
-# INST_UMINUS is partially tested:
-test execute-1.55 {TclExecuteByteCode, INST_UMINUS, op is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {- $x}
-} -1
-test execute-1.56 {TclExecuteByteCode, INST_UMINUS, op is double} {testobj} {
-    set x [testdoubleobj set 1 1.0]
-    expr {- $x}
-} -1.0
-test execute-1.57 {TclExecuteByteCode, INST_UMINUS, op is double with string} {testobj} {
-    set x [testintobj set 1 1]
-    testobj convert 1 double
-    expr {- $x}
-} -1
-test execute-1.58 {TclExecuteByteCode, INST_UMINUS, op is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {- $x}
-} -1
-test execute-1.59 {TclExecuteByteCode, INST_UMINUS, op is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {- $x}
-} -1.0
-test execute-1.60 {TclExecuteByteCode, INST_UMINUS, op is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {- $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-
-# INST_LNOT is partially tested:
-test execute-1.61 {TclExecuteByteCode, INST_LNOT, op is int} {testobj} {
-    set x [testintobj set 1 2]
-    expr {! $x}
-} 0
-test execute-1.62 {TclExecuteByteCode, INST_LNOT, op is int} {testobj} {
-    set x [testintobj set 1 0]
-    expr {! $x}
-} 1
-test execute-1.63 {TclExecuteByteCode, INST_LNOT, op is double} {testobj} {
-    set x [testdoubleobj set 1 1.0]
-    expr {! $x}
-} 0
-test execute-1.64 {TclExecuteByteCode, INST_LNOT, op is double} {testobj} {
-    set x [testdoubleobj set 1 0.0]
-    expr {! $x}
-} 1
-test execute-1.65 {TclExecuteByteCode, INST_LNOT, op is double with string} {testobj} {
-    set x [testintobj set 1 1]
-    testobj convert 1 double
-    expr {! $x}
-} 0
-test execute-1.66 {TclExecuteByteCode, INST_LNOT, op is double with string} {testobj} {
-    set x [testintobj set 1 0]
-    testobj convert 1 double
-    expr {! $x}
-} 1
-test execute-1.67 {TclExecuteByteCode, INST_LNOT, op is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {! $x}
-} 0
-test execute-1.68 {TclExecuteByteCode, INST_LNOT, op is string int} {testobj} {
-    set x [teststringobj set 1 0]
-    expr {! $x}
-} 1
-test execute-1.69 {TclExecuteByteCode, INST_LNOT, op is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {! $x}
-} 0
-test execute-1.70 {TclExecuteByteCode, INST_LNOT, op is string double} {testobj} {
-    set x [teststringobj set 1 0.0]
-    expr {! $x}
-} 1
-test execute-1.71 {TclExecuteByteCode, INST_LNOT, op is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    list [catch {expr {! $x}} msg] $msg
-} {1 {can't use non-numeric string as operand of "!"}}
-
-# INST_BITNOT not tested
-# INST_CALL_BUILTIN_FUNC1 not tested
-# INST_CALL_FUNC1 not tested
-
-# INST_TRY_CVT_TO_NUMERIC is partially tested:
-test execute-1.72 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is int} {testobj} {
-    set x [testintobj set 1 1]
-    expr {$x}
-} 1
-test execute-1.73 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is double} {testobj} {
-    set x [testdoubleobj set 1 1.0]
-    expr {$x}
-} 1.0
-test execute-1.74 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is double with string} {testobj} {
-    set x [testintobj set 1 1]
-    testobj convert 1 double
-    expr {$x}
-} 1
-test execute-1.75 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is string int} {testobj} {
-    set x [teststringobj set 1 1]
-    expr {$x}
-} 1
-test execute-1.76 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is string double} {testobj} {
-    set x [teststringobj set 1 1.0]
-    expr {$x}
-} 1.0
-test execute-1.77 {TclExecuteByteCode, INST_TRY_CVT_TO_NUMERIC, op is non-numeric} {testobj} {
-    set x [teststringobj set 1 foo]
-    expr {$x}
-} foo
-
-# INST_BREAK not tested
-# INST_CONTINUE not tested
-# INST_FOREACH_START4 not tested
-# INST_FOREACH_STEP4 not tested
-# INST_BEGIN_CATCH4 not tested
-# INST_END_CATCH not tested
-# INST_PUSH_RESULT not tested
-# INST_PUSH_RETURN_CODE not tested
-
-test execute-2.1 {Tcl_GetCommandFromObj, convert to tclCmdNameType} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {unset x}
-    catch {unset y}
-    namespace eval test_ns_1 {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_1::test_ns_2 {
-        namespace import ::test_ns_1::*
-    }
-    set x "test_ns_1::"
-    set y "test_ns_2::"
-    list [namespace which -command ${x}${y}cmd1] \
-         [catch {namespace which -command ${x}${y}cmd2} msg] $msg \
-         [catch {namespace which -command ${x}${y}:cmd2} msg] $msg
-} {::test_ns_1::test_ns_2::cmd1 0 {} 0 {}}
-test execute-2.2 {Tcl_GetCommandFromObj, check if cached tclCmdNameType is invalid} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename foo ""}
-    catch {unset l}
-    proc foo {} {
-        return "global foo"
-    }
-    namespace eval test_ns_1 {
-        proc whichFoo {} {
-            return [namespace which -command foo]
-        }
-    }
-    set l ""
-    lappend l [test_ns_1::whichFoo]
-    namespace eval test_ns_1 {
-        proc foo {} {
-            return "namespace foo"
-        }
-    }
-    lappend l [test_ns_1::whichFoo]
-    set l
-} {::foo ::test_ns_1::foo}
-test execute-2.3 {Tcl_GetCommandFromObj, command never found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename foo ""}
-    namespace eval test_ns_1 {
-        proc foo {} {
-            return "namespace foo"
-        }
-    }
-    namespace eval test_ns_1 {
-        proc foo {} {
-            return "namespace foo"
-        }
-    }
-    list [namespace eval test_ns_1 {namespace which -command foo}] \
-         [rename test_ns_1::foo ""] \
-         [catch {namespace eval test_ns_1 {namespace which -command foo}} msg] $msg
-} {::test_ns_1::foo {} 0 {}}
-
-test execute-3.1 {SetCmdNameFromAny, set cmd name to empty heap string if NULL} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {unset l}
-    proc {} {} {return {}}
-    {}
-    set l {}
-    lindex {} 0
-    {}
-} {}
-
-test execute-4.1 {UpdateStringOfCmdName: called for duplicate of empty cmdName object} {
-    proc {} {} {}
-    proc { } {} {}
-    proc p {} {
-        set x {}
-        $x
-        append x { }
-        $x
-    }
-    p
-} {}
-
-# cleanup
-catch {eval namespace delete [namespace children :: test_ns_*]}
-catch {rename foo ""}
-catch {rename p ""}
-catch {rename {} ""}
-catch {rename { } ""}
-catch {unset x}
-catch {unset y}
-catch {unset msg}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/expr-old.test b/tests/expr-old.test
deleted file mode 100644
index aa5e035..0000000
--- a/tests/expr-old.test
+++ /dev/null
@@ -1,948 +0,0 @@
-# Commands covered: expr
-#
-# This file contains the original set of tests for Tcl's expr command.
-# Since the expr command is now compiled, a new set of tests covering
-# the new implementation are in the files "parseExpr.test and
-# "compExpr.test". Sourcing this file into Tcl runs the tests and generates
-# output for errors. No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: expr-old.test,v 1.5 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
-    set gotT1 0
-    puts "This application hasn't been compiled with the \"T1\" and"
-    puts "\"T2\" math functions, so I'll skip some of the expr tests."
-} else {
-    set gotT1 1
-}
-
-# First, test all of the integer operators individually.
-
-test expr-old-1.1 {integer operators} {expr -4} -4
-test expr-old-1.2 {integer operators} {expr -(1+4)} -5
-test expr-old-1.3 {integer operators} {expr ~3} -4
-test expr-old-1.4 {integer operators} {expr !2} 0
-test expr-old-1.5 {integer operators} {expr !0} 1
-test expr-old-1.6 {integer operators} {expr 4*6} 24
-test expr-old-1.7 {integer operators} {expr 36/12} 3
-test expr-old-1.8 {integer operators} {expr 27/4} 6
-test expr-old-1.9 {integer operators} {expr 27%4} 3
-test expr-old-1.10 {integer operators} {expr 2+2} 4
-test expr-old-1.11 {integer operators} {expr 2-6} -4
-test expr-old-1.12 {integer operators} {expr 1<<3} 8
-test expr-old-1.13 {integer operators} {expr 0xff>>2} 63
-test expr-old-1.14 {integer operators} {expr -1>>2} -1
-test expr-old-1.15 {integer operators} {expr 3>2} 1
-test expr-old-1.16 {integer operators} {expr 2>2} 0
-test expr-old-1.17 {integer operators} {expr 1>2} 0
-test expr-old-1.18 {integer operators} {expr 3<2} 0
-test expr-old-1.19 {integer operators} {expr 2<2} 0
-test expr-old-1.20 {integer operators} {expr 1<2} 1
-test expr-old-1.21 {integer operators} {expr 3>=2} 1
-test expr-old-1.22 {integer operators} {expr 2>=2} 1
-test expr-old-1.23 {integer operators} {expr 1>=2} 0
-test expr-old-1.24 {integer operators} {expr 3<=2} 0
-test expr-old-1.25 {integer operators} {expr 2<=2} 1
-test expr-old-1.26 {integer operators} {expr 1<=2} 1
-test expr-old-1.27 {integer operators} {expr 3==2} 0
-test expr-old-1.28 {integer operators} {expr 2==2} 1
-test expr-old-1.29 {integer operators} {expr 3!=2} 1
-test expr-old-1.30 {integer operators} {expr 2!=2} 0
-test expr-old-1.31 {integer operators} {expr 7&0x13} 3
-test expr-old-1.32 {integer operators} {expr 7^0x13} 20
-test expr-old-1.33 {integer operators} {expr 7|0x13} 23
-test expr-old-1.34 {integer operators} {expr 0&&1} 0
-test expr-old-1.35 {integer operators} {expr 0&&0} 0
-test expr-old-1.36 {integer operators} {expr 1&&3} 1
-test expr-old-1.37 {integer operators} {expr 0||1} 1
-test expr-old-1.38 {integer operators} {expr 3||0} 1
-test expr-old-1.39 {integer operators} {expr 0||0} 0
-test expr-old-1.40 {integer operators} {expr 3>2?44:66} 44
-test expr-old-1.41 {integer operators} {expr 2>3?44:66} 66
-test expr-old-1.42 {integer operators} {expr 36/5} 7
-test expr-old-1.43 {integer operators} {expr 36%5} 1
-test expr-old-1.44 {integer operators} {expr -36/5} -8
-test expr-old-1.45 {integer operators} {expr -36%5} 4
-test expr-old-1.46 {integer operators} {expr 36/-5} -8
-test expr-old-1.47 {integer operators} {expr 36%-5} -4
-test expr-old-1.48 {integer operators} {expr -36/-5} 7
-test expr-old-1.49 {integer operators} {expr -36%-5} -1
-test expr-old-1.50 {integer operators} {expr +36} 36
-test expr-old-1.51 {integer operators} {expr +--++36} 36
-test expr-old-1.52 {integer operators} {expr +36%+5} 1
-test expr-old-1.53 {integer operators} {
-    catch {unset x}
-    set x yes
-    list [expr {1 && $x}] [expr {$x && 1}] \
-         [expr {0 || $x}] [expr {$x || 0}]
-} {1 1 1 1}
-
-# Check the floating-point operators individually, along with
-# automatic conversion to integers where needed.
-
-test expr-old-2.1 {floating-point operators} {expr -4.2} -4.2
-test expr-old-2.2 {floating-point operators} {expr -(1.1+4.2)} -5.3
-test expr-old-2.3 {floating-point operators} {expr +5.7} 5.7
-test expr-old-2.4 {floating-point operators} {expr +--+-62.0} -62.0
-test expr-old-2.5 {floating-point operators} {expr !2.1} 0
-test expr-old-2.6 {floating-point operators} {expr !0.0} 1
-test expr-old-2.7 {floating-point operators} {expr 4.2*6.3} 26.46
-test expr-old-2.8 {floating-point operators} {expr 36.0/12.0} 3.0
-test expr-old-2.9 {floating-point operators} {expr 27/4.0} 6.75
-test expr-old-2.10 {floating-point operators} {expr 2.3+2.1} 4.4
-test expr-old-2.11 {floating-point operators} {expr 2.3-6.5} -4.2
-test expr-old-2.12 {floating-point operators} {expr 3.1>2.1} 1
-test expr-old-2.13 {floating-point operators} {expr {2.1 > 2.1}} 0
-test expr-old-2.14 {floating-point operators} {expr 1.23>2.34e+1} 0
-test expr-old-2.15 {floating-point operators} {expr 3.45<2.34} 0
-test expr-old-2.16 {floating-point operators} {expr 0.002e3<--200e-2} 0
-test expr-old-2.17 {floating-point operators} {expr 1.1<2.1} 1
-test expr-old-2.18 {floating-point operators} {expr 3.1>=2.2} 1
-test expr-old-2.19 {floating-point operators} {expr 2.345>=2.345} 1
-test expr-old-2.20 {floating-point operators} {expr 1.1>=2.2} 0
-test expr-old-2.21 {floating-point operators} {expr 3.0<=2.0} 0
-test expr-old-2.22 {floating-point operators} {expr 2.2<=2.2} 1
-test expr-old-2.23 {floating-point operators} {expr 2.2<=2.2001} 1
-test expr-old-2.24 {floating-point operators} {expr 3.2==2.2} 0
-test expr-old-2.25 {floating-point operators} {expr 2.2==2.2} 1
-test expr-old-2.26 {floating-point operators} {expr 3.2!=2.2} 1
-test expr-old-2.27 {floating-point operators} {expr 2.2!=2.2} 0
-test expr-old-2.28 {floating-point operators} {expr 0.0&&0.0} 0
-test expr-old-2.29 {floating-point operators} {expr 0.0&&1.3} 0
-test expr-old-2.30 {floating-point operators} {expr 1.3&&0.0} 0
-test expr-old-2.31 {floating-point operators} {expr 1.3&&3.3} 1
-test expr-old-2.32 {floating-point operators} {expr 0.0||0.0} 0
-test expr-old-2.33 {floating-point operators} {expr 0.0||1.3} 1
-test expr-old-2.34 {floating-point operators} {expr 1.3||0.0} 1
-test expr-old-2.35 {floating-point operators} {expr 3.3||0.0} 1
-test expr-old-2.36 {floating-point operators} {expr 3.3>2.3?44.3:66.3} 44.3
-test expr-old-2.37 {floating-point operators} {expr 2.3>3.3?44.3:66.3} 66.3
-test expr-old-2.38 {floating-point operators} {
-    list [catch {expr 028.1 + 09.2} msg] $msg
-} {0 37.3}
-
-# Operators that aren't legal on floating-point numbers
-
-test expr-old-3.1 {illegal floating-point operations} {
-    list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
-test expr-old-3.2 {illegal floating-point operations} {
-    list [catch {expr 27%4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "%"}}
-test expr-old-3.3 {illegal floating-point operations} {
-    list [catch {expr 27.0%4} msg] $msg
-} {1 {can't use floating-point value as operand of "%"}}
-test expr-old-3.4 {illegal floating-point operations} {
-    list [catch {expr 1.0<<3} msg] $msg
-} {1 {can't use floating-point value as operand of "<<"}}
-test expr-old-3.5 {illegal floating-point operations} {
-    list [catch {expr 3<<1.0} msg] $msg
-} {1 {can't use floating-point value as operand of "<<"}}
-test expr-old-3.6 {illegal floating-point operations} {
-    list [catch {expr 24.0>>3} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
-test expr-old-3.7 {illegal floating-point operations} {
-    list [catch {expr 24>>3.0} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
-test expr-old-3.8 {illegal floating-point operations} {
-    list [catch {expr 24&3.0} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
-test expr-old-3.9 {illegal floating-point operations} {
-    list [catch {expr 24.0|3} msg] $msg
-} {1 {can't use floating-point value as operand of "|"}}
-test expr-old-3.10 {illegal floating-point operations} {
-    list [catch {expr 24.0^3} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
-
-# Check the string operators individually.
-
-test expr-old-4.1 {string operators} {expr {"abc" > "def"}} 0
-test expr-old-4.2 {string operators} {expr {"def" > "def"}} 0
-test expr-old-4.3 {string operators} {expr {"g" > "def"}} 1
-test expr-old-4.4 {string operators} {expr {"abc" < "abd"}} 1
-test expr-old-4.5 {string operators} {expr {"abd" < "abd"}} 0
-test expr-old-4.6 {string operators} {expr {"abe" < "abd"}} 0
-test expr-old-4.7 {string operators} {expr {"abc" >= "def"}} 0
-test expr-old-4.8 {string operators} {expr {"def" >= "def"}} 1
-test expr-old-4.9 {string operators} {expr {"g" >= "def"}} 1
-test expr-old-4.10 {string operators} {expr {"abc" <= "abd"}} 1
-test expr-old-4.11 {string operators} {expr {"abd" <= "abd"}} 1
-test expr-old-4.12 {string operators} {expr {"abe" <= "abd"}} 0
-test expr-old-4.13 {string operators} {expr {"abc" == "abd"}} 0
-test expr-old-4.14 {string operators} {expr {"abd" == "abd"}} 1
-test expr-old-4.15 {string operators} {expr {"abc" != "abd"}} 1
-test expr-old-4.16 {string operators} {expr {"abd" != "abd"}} 0
-test expr-old-4.17 {string operators} {expr {"0y" < "0x12"}} 0
-test expr-old-4.18 {string operators} {expr {"." < " "}} 0
-
-# The following tests are non-portable because on some systems "+"
-# and "-" can be parsed as numbers.
-
-test expr-old-4.19 {string operators} {nonPortable} {expr {"0" == "+"}} 0
-test expr-old-4.20 {string operators} {nonPortable} {expr {"0" == "-"}} 0
-test expr-old-4.21 {string operators} {expr {1?"foo":"bar"}} foo
-test expr-old-4.22 {string operators} {expr {0?"foo":"bar"}} bar
-
-# Operators that aren't legal on string operands.
-
-test expr-old-5.1 {illegal string operations} {
-    list [catch {expr {-"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-test expr-old-5.2 {illegal string operations} {
-    list [catch {expr {+"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-old-5.3 {illegal string operations} {
-    list [catch {expr {~"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
-test expr-old-5.4 {illegal string operations} {
-    list [catch {expr {!"a"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "!"}}
-test expr-old-5.5 {illegal string operations} {
-    list [catch {expr {"a"*"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
-test expr-old-5.6 {illegal string operations} {
-    list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-test expr-old-5.7 {illegal string operations} {
-    list [catch {expr {"a"%"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "%"}}
-test expr-old-5.8 {illegal string operations} {
-    list [catch {expr {"a"+"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-old-5.9 {illegal string operations} {
-    list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-test expr-old-5.10 {illegal string operations} {
-    list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
-test expr-old-5.11 {illegal string operations} {
-    list [catch {expr {"a">>"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of ">>"}}
-test expr-old-5.12 {illegal string operations} {
-    list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
-test expr-old-5.13 {illegal string operations} {
-    list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
-test expr-old-5.14 {illegal string operations} {
-    list [catch {expr {"a"|"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "|"}}
-test expr-old-5.15 {illegal string operations} {
-    list [catch {expr {"a"&&"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-old-5.16 {illegal string operations} {
-    list [catch {expr {"a"||"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-old-5.17 {illegal string operations} {
-    list [catch {expr {"a"?4:2}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-
-# Check precedence pairwise.
-
-test expr-old-6.1 {precedence checks} {expr -~3} 4
-test expr-old-6.2 {precedence checks} {expr -!3} 0
-test expr-old-6.3 {precedence checks} {expr -~0} 1
-
-test expr-old-7.1 {precedence checks} {expr 2*4/6} 1
-test expr-old-7.2 {precedence checks} {expr 24/6*3} 12
-test expr-old-7.3 {precedence checks} {expr 24/6/2} 2
-
-test expr-old-8.1 {precedence checks} {expr -2+4} 2
-test expr-old-8.2 {precedence checks} {expr -2-4} -6
-test expr-old-8.3 {precedence checks} {expr +2-4} -2
-
-test expr-old-9.1 {precedence checks} {expr 2*3+4} 10
-test expr-old-9.2 {precedence checks} {expr 8/2+4} 8
-test expr-old-9.3 {precedence checks} {expr 8%3+4} 6
-test expr-old-9.4 {precedence checks} {expr 2*3-1} 5
-test expr-old-9.5 {precedence checks} {expr 8/2-1} 3
-test expr-old-9.6 {precedence checks} {expr 8%3-1} 1
-
-test expr-old-10.1 {precedence checks} {expr 6-3-2} 1
-
-test expr-old-11.1 {precedence checks} {expr 7+1>>2} 2
-test expr-old-11.2 {precedence checks} {expr 7+1<<2} 32
-test expr-old-11.3 {precedence checks} {expr 7>>3-2} 3
-test expr-old-11.4 {precedence checks} {expr 7<<3-2} 14
-
-test expr-old-12.1 {precedence checks} {expr 6>>1>4} 0
-test expr-old-12.2 {precedence checks} {expr 6>>1<2} 0
-test expr-old-12.3 {precedence checks} {expr 6>>1>=3} 1
-test expr-old-12.4 {precedence checks} {expr 6>>1<=2} 0
-test expr-old-12.5 {precedence checks} {expr 6<<1>5} 1
-test expr-old-12.6 {precedence checks} {expr 6<<1<5} 0
-test expr-old-12.7 {precedence checks} {expr 5<=6<<1} 1
-test expr-old-12.8 {precedence checks} {expr 5>=6<<1} 0
-
-test expr-old-13.1 {precedence checks} {expr 2<3<4} 1
-test expr-old-13.2 {precedence checks} {expr 0<4>2} 0
-test expr-old-13.3 {precedence checks} {expr 4>2<1} 0
-test expr-old-13.4 {precedence checks} {expr 4>3>2} 0
-test expr-old-13.5 {precedence checks} {expr 4>3>=2} 0
-test expr-old-13.6 {precedence checks} {expr 4>=3>2} 0
-test expr-old-13.7 {precedence checks} {expr 4>=3>=2} 0
-test expr-old-13.8 {precedence checks} {expr 0<=4>=2} 0
-test expr-old-13.9 {precedence checks} {expr 4>=2<=0} 0
-test expr-old-13.10 {precedence checks} {expr 2<=3<=4} 1
-
-test expr-old-14.1 {precedence checks} {expr 1==4>3} 1
-test expr-old-14.2 {precedence checks} {expr 0!=4>3} 1
-test expr-old-14.3 {precedence checks} {expr 1==3<4} 1
-test expr-old-14.4 {precedence checks} {expr 0!=3<4} 1
-test expr-old-14.5 {precedence checks} {expr 1==4>=3} 1
-test expr-old-14.6 {precedence checks} {expr 0!=4>=3} 1
-test expr-old-14.7 {precedence checks} {expr 1==3<=4} 1
-test expr-old-14.8 {precedence checks} {expr 0!=3<=4} 1
-
-test expr-old-15.1 {precedence checks} {expr 1==3==3} 0
-test expr-old-15.2 {precedence checks} {expr 3==3!=2} 1
-test expr-old-15.3 {precedence checks} {expr 2!=3==3} 0
-test expr-old-15.4 {precedence checks} {expr 2!=1!=1} 0
-
-test expr-old-16.1 {precedence checks} {expr 2&3==2} 0
-test expr-old-16.2 {precedence checks} {expr 1&3!=3} 0
-
-test expr-old-17.1 {precedence checks} {expr 7&3^0x10} 19
-test expr-old-17.2 {precedence checks} {expr 7^0x10&3} 7
-
-test expr-old-18.1 {precedence checks} {expr 7^0x10|3} 23
-test expr-old-18.2 {precedence checks} {expr 7|0x10^3} 23
-
-test expr-old-19.1 {precedence checks} {expr 7|3&&1} 1
-test expr-old-19.2 {precedence checks} {expr 1&&3|7} 1
-test expr-old-19.3 {precedence checks} {expr 0&&1||1} 1
-test expr-old-19.4 {precedence checks} {expr 1||1&&0} 1
-
-test expr-old-20.1 {precedence checks} {expr 1||0?3:4} 3
-test expr-old-20.2 {precedence checks} {expr 1?0:4||1} 0
-test expr-old-20.3 {precedence checks} {expr 1?2:0?3:4} 2
-test expr-old-20.4 {precedence checks} {expr 0?2:0?3:4} 4
-test expr-old-20.5 {precedence checks} {expr 1?2?3:4:0} 3
-test expr-old-20.6 {precedence checks} {expr 0?2?3:4:0} 0
-
-# Parentheses.
-
-test expr-old-21.1 {parenthesization} {expr (2+4)*6} 36
-test expr-old-21.2 {parenthesization} {expr (1?0:4)||1} 1
-test expr-old-21.3 {parenthesization} {expr +(3-4)} -1
-
-# Embedded commands and variable names.
-
-set a 16 
-test expr-old-22.1 {embedded variables} {expr {2*$a}} 32 
-test expr-old-22.2 {embedded variables} {
-    set x -5
-    set y 10
-    expr {$x + $y}
-} {5} 
-test expr-old-22.3 {embedded variables} {
-    set x "  -5"
-    set y "  +10"
-    expr {$x + $y}
-} {5}
-test expr-old-22.4 {embedded commands and variables} {expr {[set a] - 14}} 2
-test expr-old-22.5 {embedded commands and variables} {
-    list [catch {expr {12 - [bad_command_name]}} msg] $msg
-} {1 {invalid command name "bad_command_name"}}
-
-# Double-quotes and things inside them.
-
-test expr-old-23.1 {double quotes} {expr {"abc"}} abc
-test expr-old-23.2 {double quotes} {
-    set a 189
-    expr {"$a.bc"}
-} 189.bc
-test expr-old-23.3 {double quotes} {
-    set b2 xyx
-    expr {"$b2$b2$b2.[set b2].[set b2]"}
-} xyxxyxxyx.xyx.xyx
-test expr-old-23.4 {double quotes} {expr {"11\}\}22"}} 11}}22
-test expr-old-23.5 {double quotes} {expr {"\*bc"}} {*bc}
-test expr-old-23.6 {double quotes} {
-    catch {unset bogus__}
-    list [catch {expr {"$bogus__"}} msg] $msg
-} {1 {can't read "bogus__": no such variable}}
-test expr-old-23.7 {double quotes} {
-    list [catch {expr {"a[error Testing]bc"}} msg] $msg
-} {1 Testing}
-test expr-old-23.8 {double quotes} {
-    list [catch {expr {"12398712938788234-1298379" != ""}} msg] $msg
-} {0 1}
-
-# Numbers in various bases.
-
-test expr-old-24.1 {numbers in different bases} {expr 0x20} 32
-test expr-old-24.2 {numbers in different bases} {expr 015} 13
-
-# Conversions between various data types.
-
-test expr-old-25.1 {type conversions} {expr 2+2.5} 4.5
-test expr-old-25.2 {type conversions} {expr 2.5+2} 4.5
-test expr-old-25.3 {type conversions} {expr 2-2.5} -0.5
-test expr-old-25.4 {type conversions} {expr 2/2.5} 0.8
-test expr-old-25.5 {type conversions} {expr 2>2.5} 0
-test expr-old-25.6 {type conversions} {expr 2.5>2} 1
-test expr-old-25.7 {type conversions} {expr 2<2.5} 1
-test expr-old-25.8 {type conversions} {expr 2>=2.5} 0
-test expr-old-25.9 {type conversions} {expr 2<=2.5} 1
-test expr-old-25.10 {type conversions} {expr 2==2.5} 0
-test expr-old-25.11 {type conversions} {expr 2!=2.5} 1
-test expr-old-25.12 {type conversions} {expr 2>"ab"} 0
-test expr-old-25.13 {type conversions} {expr {2>" "}} 1
-test expr-old-25.14 {type conversions} {expr {"24.1a" > 24.1}} 1
-test expr-old-25.15 {type conversions} {expr {24.1 > "24.1a"}} 0
-test expr-old-25.16 {type conversions} {expr 2+2.5} 4.5
-test expr-old-25.17 {type conversions} {expr 2+2.5} 4.5
-test expr-old-25.18 {type conversions} {expr 2.0e2} 200.0
-test expr-old-25.19 {type conversions} {eformat} {expr 2.0e15} 2e+15
-test expr-old-25.20 {type conversions} {expr 10.0} 10.0
-
-# Various error conditions.
-
-test expr-old-26.1 {error conditions} {
-    list [catch {expr 2+"a"} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-old-26.2 {error conditions} {
-    list [catch {expr 2+4*} msg] $msg
-} {1 {syntax error in expression "2+4*"}}
-test expr-old-26.3 {error conditions} {
-    list [catch {expr 2+4*(} msg] $msg
-} {1 {syntax error in expression "2+4*("}}
-catch {unset _non_existent_}
-test expr-old-26.4 {error conditions} {
-    list [catch {expr 2+$_non_existent_} msg] $msg
-} {1 {can't read "_non_existent_": no such variable}}
-set a xx
-test expr-old-26.5 {error conditions} {
-    list [catch {expr {2+$a}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-old-26.6 {error conditions} {
-    list [catch {expr {2+[set a]}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-old-26.7 {error conditions} {
-    list [catch {expr {2+(4}} msg] $msg
-} {1 {syntax error in expression "2+(4"}}
-test expr-old-26.8 {error conditions} {
-    list [catch {expr 2/0} msg] $msg $errorCode
-} {1 {divide by zero} {ARITH DIVZERO {divide by zero}}}
-test expr-old-26.9 {error conditions} {
-    list [catch {expr 2%0} msg] $msg $errorCode
-} {1 {divide by zero} {ARITH DIVZERO {divide by zero}}}
-test expr-old-26.10 {error conditions} {
-    list [catch {expr 2.0/0.0} msg] $msg $errorCode
-} {1 {divide by zero} {ARITH DIVZERO {divide by zero}}}
-test expr-old-26.11 {error conditions} {
-    list [catch {expr 2#} msg] $msg
-} {1 {syntax error in expression "2#"}}
-test expr-old-26.12 {error conditions} {
-    list [catch {expr a.b} msg] $msg
-} {1 {syntax error in expression "a.b"}}
-test expr-old-26.13 {error conditions} {
-    list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-test expr-old-26.14 {error conditions} {
-    list [catch {expr 2:3} msg] $msg
-} {1 {syntax error in expression "2:3"}}
-test expr-old-26.15 {error conditions} {
-    list [catch {expr a@b} msg] $msg
-} {1 {syntax error in expression "a@b"}}
-test expr-old-26.16 {error conditions} {
-    list [catch {expr a[b} msg] $msg
-} {1 {missing close-bracket}}
-test expr-old-26.17 {error conditions} {
-    list [catch {expr a`b} msg] $msg
-} {1 {syntax error in expression "a`b"}}
-test expr-old-26.18 {error conditions} {
-    list [catch {expr \"a\"\{b} msg] $msg
-} {1 syntax\ error\ in\ expression\ \"\"a\"\{b\"}
-test expr-old-26.19 {error conditions} {
-    list [catch {expr a} msg] $msg
-} {1 {syntax error in expression "a"}}
-test expr-old-26.20 {error conditions} {
-    list [catch expr msg] $msg
-} {1 {wrong # args: should be "expr arg ?arg ...?"}}
-
-# Cancelled evaluation.
-
-test expr-old-27.1 {cancelled evaluation} {
-    set a 1
-    expr {0&&[set a 2]}
-    set a
-} 1
-test expr-old-27.2 {cancelled evaluation} {
-    set a 1
-    expr {1||[set a 2]}
-    set a
-} 1
-test expr-old-27.3 {cancelled evaluation} {
-    set a 1
-    expr {0?[set a 2]:1}
-    set a
-} 1
-test expr-old-27.4 {cancelled evaluation} {
-    set a 1
-    expr {1?2:[set a 2]}
-    set a
-} 1
-catch {unset x}
-test expr-old-27.5 {cancelled evaluation} {
-    list [catch {expr {[info exists x] && $x}} msg] $msg
-} {0 0}
-test expr-old-27.6 {cancelled evaluation} {
-    list [catch {expr {0 && [concat $x]}} msg] $msg
-} {0 0}
-test expr-old-27.7 {cancelled evaluation} {
-    set one 1
-    list [catch {expr {1 || 1/$one}} msg] $msg
-} {0 1}
-test expr-old-27.8 {cancelled evaluation} {
-    list [catch {expr {1 || -"string"}} msg] $msg
-} {0 1}
-test expr-old-27.9 {cancelled evaluation} {
-    list [catch {expr {1 || ("string" * ("x" && "y"))}} msg] $msg
-} {0 1}
-test expr-old-27.10 {cancelled evaluation} {
-    set x -1.0
-    list [catch {expr {($x > 0) ? round(log($x)) : 0}} msg] $msg
-} {0 0}
-test expr-old-27.11 {cancelled evaluation} {
-    list [catch {expr {0 && foo}} msg] $msg
-} {1 {syntax error in expression "0 && foo"}}
-test expr-old-27.12 {cancelled evaluation} {
-    list [catch {expr {0 ? 1 : foo}} msg] $msg
-} {1 {syntax error in expression "0 ? 1 : foo"}}
-
-# Tcl_ExprBool as used in "if" statements
-
-test expr-old-28.1 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {2} {set a 2}
-    set a
-} 2
-test expr-old-28.2 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {0} {set a 2}
-    set a
-} 1
-test expr-old-28.3 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {1.2} {set a 2}
-    set a
-} 2
-test expr-old-28.4 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {-1.1} {set a 2}
-    set a
-} 2
-test expr-old-28.5 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {0.0} {set a 2}
-    set a
-} 1
-test expr-old-28.6 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"YES"} {set a 2}
-    set a
-} 2
-test expr-old-28.7 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"no"} {set a 2}
-    set a
-} 1
-test expr-old-28.8 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"true"} {set a 2}
-    set a
-} 2
-test expr-old-28.9 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"fAlse"} {set a 2}
-    set a
-} 1
-test expr-old-28.10 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"on"} {set a 2}
-    set a
-} 2
-test expr-old-28.11 {Tcl_ExprBoolean usage} {
-    set a 1
-    if {"Off"} {set a 2}
-    set a
-} 1
-test expr-old-28.12 {Tcl_ExprBool usage} {
-    list [catch {if {"abc"} {}} msg] $msg
-} {1 {expected boolean value but got "abc"}}
-test expr-old-28.13 {Tcl_ExprBool usage} {
-    list [catch {if {"ogle"} {}} msg] $msg
-} {1 {expected boolean value but got "ogle"}}
-test expr-old-28.14 {Tcl_ExprBool usage} {
-    list [catch {if {"o"} {}} msg] $msg
-} {1 {expected boolean value but got "o"}}
-
-# Operands enclosed in braces
-
-test expr-old-29.1 {braces} {expr {{abc}}} abc
-test expr-old-29.2 {braces} {expr {{00010}}} 8
-test expr-old-29.3 {braces} {expr {{3.1200000}}} 3.12
-test expr-old-29.4 {braces} {expr {{a{b}{1 {2 3}}c}}} "a{b}{1 {2 3}}c"
-test expr-old-29.5 {braces} {
-    list [catch {expr "\{abc"} msg] $msg
-} {1 {missing close-brace}}
-
-# Very long values
-
-test expr-old-30.1 {long values} {
-    set a "0000 1111 2222 3333 4444"
-    set a "$a | $a | $a | $a | $a"
-    set a "$a || $a || $a || $a || $a"
-    expr {$a}
-} {0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 || 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 || 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 || 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 || 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444 | 0000 1111 2222 3333 4444}
-test expr-old-30.2 {long values} {
-    set a "000000000000000000000000000000"
-    set a "$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a${a}5"
-    expr $a
-} 5
-
-# Expressions spanning multiple arguments
-
-test expr-old-31.1 {multiple arguments to expr command} {
-    expr 4 + ( 6 *12) -3
-} 73
-test expr-old-31.2 {multiple arguments to expr command} {
-    list [catch {expr 2 + (3 + 4} msg] $msg
-} {1 {syntax error in expression "2 + (3 + 4"}}
-test expr-old-31.3 {multiple arguments to expr command} {
-    list [catch {expr 2 + 3 +} msg] $msg
-} {1 {syntax error in expression "2 + 3 +"}}
-test expr-old-31.4 {multiple arguments to expr command} {
-    list [catch {expr 2 + 3 )} msg] $msg
-} {1 {syntax error in expression "2 + 3 )"}}
-
-# Math functions
-
-test expr-old-32.1 {math functions in expressions} {
-    format %.6g [expr acos(0.5)]
-} {1.0472}
-test expr-old-32.2 {math functions in expressions} {
-    format %.6g [expr asin(0.5)]
-} {0.523599}
-test expr-old-32.3 {math functions in expressions} {
-    format %.6g [expr atan(1.0)]
-} {0.785398}
-test expr-old-32.4 {math functions in expressions} {
-    format %.6g [expr atan2(2.0, 2.0)]
-} {0.785398}
-test expr-old-32.5 {math functions in expressions} {
-    format %.6g [expr ceil(1.999)]
-} {2}
-test expr-old-32.6 {math functions in expressions} {
-    format %.6g [expr cos(.1)]
-} {0.995004}
-test expr-old-32.7 {math functions in expressions} {
-    format %.6g [expr cosh(.1)]
-} {1.005}
-test expr-old-32.8 {math functions in expressions} {
-    format %.6g [expr exp(1.0)]
-} {2.71828}
-test expr-old-32.9 {math functions in expressions} {
-    format %.6g [expr floor(2.000)]
-} {2}
-test expr-old-32.10 {math functions in expressions} {
-    format %.6g [expr floor(2.001)]
-} {2}
-test expr-old-32.11 {math functions in expressions} {
-    format %.6g [expr fmod(7.3, 3.2)]
-} {0.9}
-test expr-old-32.12 {math functions in expressions} {
-    format %.6g [expr hypot(3.0, 4.0)]
-} {5}
-test expr-old-32.13 {math functions in expressions} {
-    format %.6g [expr log(2.8)]
-} {1.02962}
-test expr-old-32.14 {math functions in expressions} {
-    format %.6g [expr log10(2.8)]
-} {0.447158}
-test expr-old-32.15 {math functions in expressions} {
-    format %.6g [expr pow(2.1, 3.1)]
-} {9.97424}
-test expr-old-32.16 {math functions in expressions} {
-    format %.6g [expr sin(.1)]
-} {0.0998334}
-test expr-old-32.17 {math functions in expressions} {
-    format %.6g [expr sinh(.1)]
-} {0.100167}
-test expr-old-32.18 {math functions in expressions} {
-    format %.6g [expr sqrt(2.0)]
-} {1.41421}
-test expr-old-32.19 {math functions in expressions} {
-    format %.6g [expr tan(0.8)]
-} {1.02964}
-test expr-old-32.20 {math functions in expressions} {
-    format %.6g [expr tanh(0.8)]
-} {0.664037}
-test expr-old-32.21 {math functions in expressions} {
-    format %.6g [expr abs(-1.8)]
-} {1.8}
-test expr-old-32.22 {math functions in expressions} {
-    expr abs(10.0)
-} {10.0}
-test expr-old-32.23 {math functions in expressions} {
-    format %.6g [expr abs(-4)]
-} {4}
-test expr-old-32.24 {math functions in expressions} {
-    format %.6g [expr abs(66)]
-} {66}
-
-# The following test is different for 32-bit versus 64-bit architectures.
-
-if {0x80000000 > 0} {
-    test expr-old-32.25 {math functions in expressions} {nonPortable} {
-	list [catch {expr abs(0x8000000000000000)} msg] $msg
-    } {1 {integer value too large to represent}}
-} else {
-    test expr-old-32.25 {math functions in expressions} {nonPortable} {
-	list [catch {expr abs(0x80000000)} msg] $msg
-    } {1 {integer value too large to represent}}
-}
-
-test expr-old-32.26 {math functions in expressions} {
-    expr double(1)
-} {1.0}
-test expr-old-32.27 {math functions in expressions} {
-    expr double(1.1)
-} {1.1}
-test expr-old-32.28 {math functions in expressions} {
-    expr int(1)
-} {1}
-test expr-old-32.29 {math functions in expressions} {
-    expr int(1.4)
-} {1}
-test expr-old-32.30 {math functions in expressions} {
-    expr int(1.6)
-} {1}
-test expr-old-32.31 {math functions in expressions} {
-    expr int(-1.4)
-} {-1}
-test expr-old-32.32 {math functions in expressions} {
-    expr int(-1.6)
-} {-1}
-test expr-old-32.33 {math functions in expressions} {
-    list [catch {expr int(1e60)} msg] $msg
-} {1 {integer value too large to represent}}
-test expr-old-32.34 {math functions in expressions} {
-    list [catch {expr int(-1e60)} msg] $msg
-} {1 {integer value too large to represent}}
-test expr-old-32.35 {math functions in expressions} {
-    expr round(1.49)
-} {1}
-test expr-old-32.36 {math functions in expressions} {
-    expr round(1.51)
-} {2}
-test expr-old-32.37 {math functions in expressions} {
-    expr round(-1.49)
-} {-1}
-test expr-old-32.38 {math functions in expressions} {
-    expr round(-1.51)
-} {-2}
-test expr-old-32.39 {math functions in expressions} {
-    list [catch {expr round(1e60)} msg] $msg
-} {1 {integer value too large to represent}}
-test expr-old-32.40 {math functions in expressions} {
-    list [catch {expr round(-1e60)} msg] $msg
-} {1 {integer value too large to represent}}
-test expr-old-32.41 {math functions in expressions} {
-    list [catch {expr pow(1.0 + 3.0 - 2, .8 * 5)} msg] $msg
-} {0 16.0}
-test expr-old-32.42 {math functions in expressions} {
-    list [catch {expr hypot(5*.8,3)} msg] $msg
-} {0 5.0}
-if $gotT1 {
-    test expr-old-32.43 {math functions in expressions} {
-	expr 2*T1()
-    } 246
-    test expr-old-32.44 {math functions in expressions} {
-	expr T2()*3
-    } 1035
-}
-test expr-old-32.45 {math functions in expressions} {
-    expr (0 <= rand()) && (rand() < 1)
-} {1}
-test expr-old-32.46 {math functions in expressions} {
-    list [catch {expr rand(24)} msg] $msg
-} {1 {too many arguments for math function}}
-test expr-old-32.47 {math functions in expressions} {
-    list [catch {expr srand()} msg] $msg
-} {1 {too few arguments for math function}}
-test expr-old-32.48 {math functions in expressions} {
-    list [catch {expr srand(3.79)} msg] $msg
-} {1 {can't use floating-point value as argument to srand}}
-test expr-old-32.49 {math functions in expressions} {
-    list [catch {expr srand("")} msg] $msg
-} {1 {can't use non-numeric string as argument to srand}}
-test expr-old-32.50 {math functions in expressions} {
-    set result [expr round(srand(12345) * 1000)]
-    for {set i 0} {$i < 10} {incr i} {
-	lappend result [expr round(rand() * 1000)]
-    }
-    set result
-} {97 834 948 36 12 51 766 585 914 784 333}
-test expr-old-32.51 {math functions in expressions} {
-    list [catch {expr {srand([lindex "6ty" 0])}} msg] $msg
-} {1 {can't use non-numeric string as argument to srand}}
-
-test expr-old-33.1 {conversions and fancy args to math functions} {
-    expr hypot ( 3 , 4 )
-} 5.0
-test expr-old-33.2 {conversions and fancy args to math functions} {
-    expr hypot ( (2.0+1.0) , 4 )
-} 5.0
-test expr-old-33.3 {conversions and fancy args to math functions} {
-    expr hypot ( 3 , (3.0 + 1.0) )
-} 5.0
-test expr-old-33.4 {conversions and fancy args to math functions} {
-    format %.6g [expr cos(acos(0.1))]
-} 0.1
-
-test expr-old-34.1 {errors in math functions} {
-    list [catch {expr func_2(1.0)} msg] $msg
-} {1 {unknown math function "func_2"}}
-test expr-old-34.2 {errors in math functions} {
-    list [catch {expr func|(1.0)} msg] $msg
-} {1 {syntax error in expression "func|(1.0)"}}
-test expr-old-34.3 {errors in math functions} {
-    list [catch {expr {hypot("a b", 2.0)}} msg] $msg
-} {1 {argument to math function didn't have numeric value}}
-test expr-old-34.4 {errors in math functions} {
-    list [catch {expr hypot(1.0 2.0)} msg] $msg
-} {1 {syntax error in expression "hypot(1.0 2.0)"}}
-test expr-old-34.5 {errors in math functions} {
-    list [catch {expr hypot(1.0, 2.0} msg] $msg
-} {1 {syntax error in expression "hypot(1.0, 2.0"}}
-test expr-old-34.6 {errors in math functions} {
-    list [catch {expr hypot(1.0 ,} msg] $msg
-} {1 {syntax error in expression "hypot(1.0 ,"}}
-test expr-old-34.7 {errors in math functions} {
-    list [catch {expr hypot(1.0)} msg] $msg
-} {1 {too few arguments for math function}}
-test expr-old-34.8 {errors in math functions} {
-    list [catch {expr hypot(1.0, 2.0, 3.0)} msg] $msg
-} {1 {too many arguments for math function}}
-test expr-old-34.9 {errors in math functions} {
-    list [catch {expr acos(-2.0)} msg] $msg $errorCode
-} {1 {domain error: argument not in valid range} {ARITH DOMAIN {domain error: argument not in valid range}}}
-test expr-old-34.10 {errors in math functions} {nonPortable} {
-    list [catch {expr pow(-3, 1000001)} msg] $msg $errorCode
-} {1 {floating-point value too large to represent} {ARITH OVERFLOW {floating-point value too large to represent}}}
-test expr-old-34.11 {errors in math functions} {
-    list [catch {expr pow(3, 1000001)} msg] $msg $errorCode
-} {1 {floating-point value too large to represent} {ARITH OVERFLOW {floating-point value too large to represent}}}
-test expr-old-34.12 {errors in math functions} {
-    list [catch {expr -14.0*exp(100000)} msg] $msg $errorCode
-} {1 {floating-point value too large to represent} {ARITH OVERFLOW {floating-point value too large to represent}}}
-test expr-old-34.13 {errors in math functions} {
-    list [catch {expr int(1.0e30)} msg] $msg $errorCode
-} {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-test expr-old-34.14 {errors in math functions} {
-    list [catch {expr int(-1.0e30)} msg] $msg $errorCode
-} {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-test expr-old-34.15 {errors in math functions} {
-    list [catch {expr round(1.0e30)} msg] $msg $errorCode
-} {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-test expr-old-34.16 {errors in math functions} {
-    list [catch {expr round(-1.0e30)} msg] $msg $errorCode
-} {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-if $gotT1 {
-    test expr-old-34.17 {errors in math functions} {
-	list [catch {expr T1(4)} msg] $msg
-    } {1 {too many arguments for math function}}
-}
-
-test expr-old-36.1 {ExprLooksLikeInt procedure} {
-    list [catch {expr 0289} msg] $msg
-} {1 {syntax error in expression "0289"}}
-test expr-old-36.2 {ExprLooksLikeInt procedure} {
-    set x 0289
-    list [catch {expr {$x+1}} msg] $msg
-} {1 {can't use floating-point value as operand of "+"}}
-test expr-old-36.3 {ExprLooksLikeInt procedure} {
-    list [catch {expr 0289.1} msg] $msg
-} {0 289.1}
-test expr-old-36.4 {ExprLooksLikeInt procedure} {
-    set x 0289.1
-    list [catch {expr {$x+1}} msg] $msg
-} {0 290.1}
-test expr-old-36.5 {ExprLooksLikeInt procedure} {
-    set x {  +22}
-    list [catch {expr {$x+1}} msg] $msg
-} {0 23}
-test expr-old-36.6 {ExprLooksLikeInt procedure} {
-    set x {	-22}
-    list [catch {expr {$x+1}} msg] $msg
-} {0 -21}
-test expr-old-36.7 {ExprLooksLikeInt procedure} {nonPortable unixOnly} {
-    list [catch {expr nan} msg] $msg
-} {1 {domain error: argument not in valid range}}
-test expr-old-36.8 {ExprLooksLikeInt procedure} {
-    list [catch {expr 78e1} msg] $msg
-} {0 780.0}
-test expr-old-36.9 {ExprLooksLikeInt procedure} {
-    list [catch {expr 24E1} msg] $msg
-} {0 240.0}
-test expr-old-36.10 {ExprLooksLikeInt procedure} {nonPortable unixOnly} {
-    list [catch {expr 78e} msg] $msg
-} {1 {syntax error in expression "78e"}}
-
-if {[info commands testexprlong] == {}} {
-    puts "This application hasn't been compiled with the \"testexprlong\""
-    puts "command, so I can't test Tcl_ExprLong etc."
-} else {
-test expr-old-37.1 {Check that Tcl_ExprLong doesn't modify interpreter result if no error} {
-    testexprlong
-} {This is a result: 5}
-}
-
-if {[info commands testexprstring] == {}} {
-    puts "This application hasn't been compiled with the \"testexprstring\""
-    puts "command, so I can't test Tcl_ExprString etc."
-} else {
-test expr-old-38.1 {Verify Tcl_ExprString's basic operation} {
-    list [testexprstring "1+4"] [testexprstring "2*3+4.2"] \
-        [catch {testexprstring "1+"} msg] $msg
-} {5 10.2 1 {syntax error in expression "1+"}}
-}
-
-# Special test for Pentium arithmetic bug of 1994:
-
-if {(4195835.0 - (4195835.0/3145727.0)*3145727.0) == 256.0} {
-    puts "Warning: this machine contains a defective Pentium processor"
-    puts "that performs arithmetic incorrectly.  I recommend that you"
-    puts "call Intel customer service immediately at 1-800-628-8686"
-    puts "to request a replacement processor."
-}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/expr.test b/tests/expr.test
deleted file mode 100644
index 7b0135a..0000000
--- a/tests/expr.test
+++ /dev/null
@@ -1,709 +0,0 @@
-# Commands covered: expr
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands. Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: expr.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {([catch {expr T1()} msg] == 1) && ($msg == {unknown math function "T1"})} {
-    set gotT1 0
-    puts "This application hasn't been compiled with the \"T1\" and"
-    puts "\"T2\" math functions, so I'll skip some of the expr tests."
-} else {
-    set gotT1 1
-}
-
-# procedures used below
-
-proc put_hello_char {c} {
-    global a
-    append a [format %c $c]
-    return $c
-}
-proc hello_world {} {
-    global a
-    set a ""
-    set L1 [set l0 [set h_1 [set q 0]]]
-    for {put_hello_char [expr [put_hello_char [expr [set h 7]*10+2]]+29]} {$l0?[put_hello_char $l0]
-        :!$h_1} {put_hello_char $ll;expr {$L1==2?[set ll [expr 32+0-0+[set bar 0]]]:0}} {expr {[incr L1]==[expr 1+([string length "abc"]-[string length "abc"])]
-        ?[set ll [set l0 [expr 54<<1]]]:$ll==108&&$L1<3?
-        [incr ll [expr 1|1<<1]; set ll $ll; set ll $ll; set ll $ll; set ll $ll; set l0 [expr ([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])]; set l0; set l0 $l0; set l0; set l0]:$L1==4&&$ll==32?[set ll [expr 19+$h1+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])+[set foo [expr ([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])+([string length "abc"]-[string length "abc"])]]]]
-        :[set q [expr $q-$h1+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])]]};expr {$L1==5?[incr ll -8; set ll $ll; set ll]:$q&&$h1&&1};expr {$L1==4+2
-        ?[incr ll 3]:[expr ([string length "abc"]-[string length "abc"])+1]};expr {$ll==($h<<4)+2+0&&$L1!=6?[incr ll -6]:[set h1 [expr 100+([string length "abc"]-[string length "abc"])-([string length "abc"]-[string length "abc"])]]}
-        expr {$L1!=1<<3?[incr q [expr ([string length "abc"]-[string length "abc"])-1]]:[set h_1 [set ll $h1]]}
-    }
-    set a
-}
-
-proc 12days {a b c} {
-    global xxx
-    expr {1<$a?[expr {$a<3?[12days -79 -13 [string range $c [12days -87 \
-	[expr 1-$b] [string range $c [12days -86 0 [string range $c 1 end]] \
-	end]] end]]:1};expr {$a<$b?[12days [expr $a+1] $b $c]:3};expr {[12days \
-	-94 [expr $a-27] $c]&&$a==2?$b<13?[12days 2 [expr $b+1] "%s %d %d\n"]:9
-	:16}]:$a<0?$a<-72?[12days $b $a "@n'+,#'/*\{\}w+/w#cdnr/+,\{\}r/*de\}+,/*\{*+,/w\{%+,/w#q#n+,/#\{l+,/n\{n+,/+#n+,/#;#q#n+,/+k#;*+,/'r :'d*'3,\}\{w+K w'K:'+\}e#';dq#'l q#'+d'K#!/+k#;q#'r\}eKK#\}w'r\}eKK\{nl\]'/#;#q#n')\{)#\}w')\{)\{nl\]'/+#n';d\}rw' i;# )\{nl\]!/n\{n#'; r\{#w'r nc\{nl\]'/#\{l,+'K \{rw' iK\{;\[\{nl\]'/w#q#n'wk nw' iwk\{KK\{nl\]!/w\{%'l##w#' i; :\{nl\]'/*\{q#'ld;r'\}\{nlwb!/*de\}'c ;;\{nl'-\{\}rw\]'/+,\}##'*\}#nc,',#nw\]'/+kd'+e\}+;#'rdq#w! nr'/ ') \}+\}\{rl#'\{n' ')# \}'+\}##(!!/"]
-	:$a<-50?[string compare [format %c $b] [string index $c 0]]==0?[append \
-	xxx [string index $c 31];scan [string index $c 31] %c x;set x]
-	:[12days -65 $b [string range $c 1 end]]:[12days [expr ([string compare \
-	[string index $c 0] "/"]==0)+$a] $b [string range $c 1 end]]:0<$a
-	?[12days 2 2 "%s"]:[string compare [string index $c 0] "/"]==0||
-	[12days 0 [12days -61 [scan [string index $c 0] %c x; set x] \
-	"!ek;dc i@bK'(q)-\[w\]*%n+r3#l,\{\}:\nuwloca-O;m .vpbks,fxntdCeghiry"] \
-	[string range $c 1 end]]}
-}
-proc do_twelve_days {} {
-    global xxx
-    set xxx ""
-    12days 1 1 1
-    string length $xxx
-}
-
-# start of tests
-
-catch {unset a b i x}
-
-test expr-1.1 {TclCompileExprCmd: no expression} {
-    list [catch {expr  } msg] $msg
-} {1 {wrong # args: should be "expr arg ?arg ...?"}}
-test expr-1.2 {TclCompileExprCmd: one expression word} {
-    expr -25
-} -25
-test expr-1.3 {TclCompileExprCmd: two expression words} {
-    expr -8.2   -6
-} -14.2
-test expr-1.4 {TclCompileExprCmd: five expression words} {
-    expr 20 - 5 +10 -7
-} 18
-test expr-1.5 {TclCompileExprCmd: quoted expression word} {
-    expr "0005"
-} 5
-test expr-1.6 {TclCompileExprCmd: quoted expression word} {
-    catch {expr "0005"zxy} msg
-    set msg
-} {extra characters after close-quote}
-test expr-1.7 {TclCompileExprCmd: expression word in braces} {
-    expr {-0005}
-} -5
-test expr-1.8 {TclCompileExprCmd: expression word in braces} {
-    expr {{-0x1234}}
-} -4660
-test expr-1.9 {TclCompileExprCmd: expression word in braces} {
-    catch {expr {-0005}foo} msg
-    set msg
-} {extra characters after close-brace}
-test expr-1.10 {TclCompileExprCmd: other expression word in braces} {
-    expr 4*[llength "6 2"]
-} 8
-test expr-1.11 {TclCompileExprCmd: expression word terminated by ;} {
-    expr 4*[llength "6 2"];
-} 8
-test expr-1.12 {TclCompileExprCmd: inlined expr (in "catch") inside other catch} {
-    set a xxx
-    catch {
-	# Might not be a number
-	set a [expr 10*$a]
-    }
-} 1
-test expr-1.13 {TclCompileExprCmd: second level of substitutions in expr not in braces with single var reference} {
-    set a xxx
-    set x 27;  set bool {$x};  if $bool {set a foo}
-    set a
-} foo
-test expr-1.14 {TclCompileExprCmd: second level of substitutions in expr with comparison as top-level operator} {
-    set a xxx
-    set x 2;  set b {$x};  set a [expr $b == 2]
-    set a
-} 1
-
-test expr-2.1 {TclCompileExpr: are builtin functions registered?} {
-    expr double(5*[llength "6 2"])
-} 10.0
-test expr-2.2 {TclCompileExpr: error in expr} {
-    catch {expr 2**3} msg
-    set msg
-} {syntax error in expression "2**3"}
-test expr-2.3 {TclCompileExpr: junk after legal expr} {
-    catch {expr 7*[llength "a b"]foo} msg
-    set msg
-} {syntax error in expression "7*2foo"}
-test expr-2.4 {TclCompileExpr: numeric expr string rep == formatted int rep} {
-    expr {0001}
-} 1
-
-test expr-3.1 {CompileCondExpr: just lor expr} {expr 3||0} 1
-test expr-3.2 {CompileCondExpr: error in lor expr} {
-    catch {expr x||3} msg
-    set msg
-} {syntax error in expression "x||3"} 
-test expr-3.3 {CompileCondExpr: test true arm} {expr 3>2?44:66} 44
-test expr-3.4 {CompileCondExpr: error compiling true arm} {
-    catch {expr 3>2?2**3:66} msg
-    set msg
-} {syntax error in expression "3>2?2**3:66"}
-test expr-3.5 {CompileCondExpr: test false arm} {expr 2>3?44:66} 66
-test expr-3.6 {CompileCondExpr: error compiling false arm} {
-    catch {expr 2>3?44:2**3} msg
-    set msg
-} {syntax error in expression "2>3?44:2**3"}
-test expr-3.7 {CompileCondExpr: long arms & nested cond exprs} {unixOnly nonPortable} {
-    puts "Note: doing test expr-3.7 which can take several minutes to run"
-    hello_world
-} {Hello world}
-catch {unset xxx}
-test expr-3.8 {CompileCondExpr: long arms & nested cond exprs} {unixOnly nonPortable} {
-    puts "Note: doing test expr-3.8 which can take several minutes to run"
-    do_twelve_days
-} 2358
-catch {unset xxx}
-
-test expr-4.1 {CompileLorExpr: just land expr} {expr 1.3&&3.3} 1
-test expr-4.2 {CompileLorExpr: error in land expr} {
-    catch {expr x&&3} msg
-    set msg
-} {syntax error in expression "x&&3"} 
-test expr-4.3 {CompileLorExpr: simple lor exprs} {expr 0||1.0} 1
-test expr-4.4 {CompileLorExpr: simple lor exprs} {expr 3.0||0.0} 1
-test expr-4.5 {CompileLorExpr: simple lor exprs} {expr 0||0||1} 1
-test expr-4.6 {CompileLorExpr: error compiling lor arm} {
-    catch {expr 2**3||4.0} msg
-    set msg
-} {syntax error in expression "2**3||4.0"}
-test expr-4.7 {CompileLorExpr: error compiling lor arm} {
-    catch {expr 1.3||2**3} msg
-    set msg
-} {syntax error in expression "1.3||2**3"}
-test expr-4.8 {CompileLorExpr: error compiling lor arms} {
-    list [catch {expr {"a"||"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-4.9 {CompileLorExpr: long lor arm} {
-    set a "abcdefghijkl"
-    set i 7
-    expr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]] || [string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]}
-} 1
-
-test expr-5.1 {CompileLandExpr: just bitor expr} {expr 7|0x13} 23
-test expr-5.2 {CompileLandExpr: error in bitor expr} {
-    catch {expr x|3} msg
-    set msg
-} {syntax error in expression "x|3"} 
-test expr-5.3 {CompileLandExpr: simple land exprs} {expr 0&&1.0} 0
-test expr-5.4 {CompileLandExpr: simple land exprs} {expr 0&&0} 0
-test expr-5.5 {CompileLandExpr: simple land exprs} {expr 3.0&&1.2} 1
-test expr-5.6 {CompileLandExpr: simple land exprs} {expr 1&&1&&2} 1
-test expr-5.7 {CompileLandExpr: error compiling land arm} {
-    catch {expr 2**3&&4.0} msg
-    set msg
-} {syntax error in expression "2**3&&4.0"}
-test expr-5.8 {CompileLandExpr: error compiling land arm} {
-    catch {expr 1.3&&2**3} msg
-    set msg
-} {syntax error in expression "1.3&&2**3"}
-test expr-5.9 {CompileLandExpr: error compiling land arm} {
-    list [catch {expr {"a"&&"b"}} msg] $msg
-} {1 {expected boolean value but got "a"}}
-test expr-5.10 {CompileLandExpr: long land arms} {
-    set a "abcdefghijkl"
-    set i 7
-    expr {[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]] && [string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]^[string compare [format %c 103] [string index $a $i]]^[string compare [format %c 105] [string index $a $i]]}
-} 1
-
-test expr-6.1 {CompileBitXorExpr: just bitand expr} {expr 7&0x13} 3
-test expr-6.2 {CompileBitXorExpr: error in bitand expr} {
-    catch {expr x|3} msg
-    set msg
-} {syntax error in expression "x|3"} 
-test expr-6.3 {CompileBitXorExpr: simple bitxor exprs} {expr 7^0x13} 20
-test expr-6.4 {CompileBitXorExpr: simple bitxor exprs} {expr 3^0x10} 19
-test expr-6.5 {CompileBitXorExpr: simple bitxor exprs} {expr 0^7} 7
-test expr-6.6 {CompileBitXorExpr: simple bitxor exprs} {expr -1^7} -8
-test expr-6.7 {CompileBitXorExpr: error compiling bitxor arm} {
-    catch {expr 2**3|6} msg
-    set msg
-} {syntax error in expression "2**3|6"}
-test expr-6.8 {CompileBitXorExpr: error compiling bitxor arm} {
-    catch {expr 2^x} msg
-    set msg
-} {syntax error in expression "2^x"}
-test expr-6.9 {CompileBitXorExpr: runtime error in bitxor arm} {
-    list [catch {expr {24.0^3}} msg] $msg
-} {1 {can't use floating-point value as operand of "^"}}
-test expr-6.10 {CompileBitXorExpr: runtime error in bitxor arm} {
-    list [catch {expr {"a"^"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "^"}}
-
-test expr-7.1 {CompileBitAndExpr: just equality expr} {expr 3==2} 0
-test expr-7.2 {CompileBitAndExpr: just equality expr} {expr 2.0==2} 1
-test expr-7.3 {CompileBitAndExpr: just equality expr} {expr 3.2!=2.2} 1
-test expr-7.4 {CompileBitAndExpr: just equality expr} {expr {"abc" == "abd"}} 0
-test expr-7.5 {CompileBitAndExpr: error in equality expr} {
-    catch {expr x==3} msg
-    set msg
-} {syntax error in expression "x==3"} 
-test expr-7.6 {CompileBitAndExpr: simple bitand exprs} {expr 7&0x13} 3
-test expr-7.7 {CompileBitAndExpr: simple bitand exprs} {expr 0xf2&0x53} 82
-test expr-7.8 {CompileBitAndExpr: simple bitand exprs} {expr 3&6} 2
-test expr-7.9 {CompileBitAndExpr: simple bitand exprs} {expr -1&-7} -7
-test expr-7.10 {CompileBitAndExpr: error compiling bitand arm} {
-    catch {expr 2**3&6} msg
-    set msg
-} {syntax error in expression "2**3&6"}
-test expr-7.11 {CompileBitAndExpr: error compiling bitand arm} {
-    catch {expr 2&x} msg
-    set msg
-} {syntax error in expression "2&x"}
-test expr-7.12 {CompileBitAndExpr: runtime error in bitand arm} {
-    list [catch {expr {24.0&3}} msg] $msg
-} {1 {can't use floating-point value as operand of "&"}}
-test expr-7.13 {CompileBitAndExpr: runtime error in bitand arm} {
-    list [catch {expr {"a"&"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "&"}}
-
-test expr-8.1 {CompileEqualityExpr: just relational expr} {expr 3>=2} 1
-test expr-8.2 {CompileEqualityExpr: just relational expr} {expr 2<=2.1} 1
-test expr-8.3 {CompileEqualityExpr: just relational expr} {expr 3.2>"2.2"} 1
-test expr-8.4 {CompileEqualityExpr: just relational expr} {expr {"0y"<"0x12"}} 0
-test expr-8.5 {CompileEqualityExpr: error in relational expr} {
-    catch {expr x>3} msg
-    set msg
-} {syntax error in expression "x>3"} 
-test expr-8.6 {CompileEqualityExpr: simple equality exprs} {expr 7==0x13} 0
-test expr-8.7 {CompileEqualityExpr: simple equality exprs} {expr -0xf2!=0x53} 1
-test expr-8.8 {CompileEqualityExpr: simple equality exprs} {expr {"12398712938788234-1298379" != ""}} 1
-test expr-8.9 {CompileEqualityExpr: simple equality exprs} {expr -1!="abc"} 1
-test expr-8.10 {CompileEqualityExpr: error compiling equality arm} {
-    catch {expr 2**3==6} msg
-    set msg
-} {syntax error in expression "2**3==6"}
-test expr-8.11 {CompileEqualityExpr: error compiling equality arm} {
-    catch {expr 2!=x} msg
-    set msg
-} {syntax error in expression "2!=x"}
-
-
-test expr-9.1 {CompileRelationalExpr: just shift expr} {expr 3<<2} 12
-test expr-9.2 {CompileRelationalExpr: just shift expr} {expr 0xff>>2} 63
-test expr-9.3 {CompileRelationalExpr: just shift expr} {expr -1>>2} -1
-test expr-9.4 {CompileRelationalExpr: just shift expr} {expr {1<<3}} 8
-
-# The following test is different for 32-bit versus 64-bit
-# architectures because LONG_MIN is different
-
-if {0x80000000 > 0} {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
-	expr {1<<63}
-    } -9223372036854775808
-} else {
-    test expr-9.5 {CompileRelationalExpr: shift expr producing LONG_MIN} {nonPortable} {
-	expr {1<<31}
-    } -2147483648
-}
-test expr-9.6 {CompileRelationalExpr: error in shift expr} {
-    catch {expr x>>3} msg
-    set msg
-} {syntax error in expression "x>>3"} 
-test expr-9.7 {CompileRelationalExpr: simple relational exprs} {expr 0xff>=+0x3} 1
-test expr-9.8 {CompileRelationalExpr: simple relational exprs} {expr -0xf2<0x3} 1
-test expr-9.9 {CompileRelationalExpr: error compiling relational arm} {
-    catch {expr 2**3>6} msg
-    set msg
-} {syntax error in expression "2**3>6"}
-test expr-9.10 {CompileRelationalExpr: error compiling relational arm} {
-    catch {expr 2<x} msg
-    set msg
-} {syntax error in expression "2<x"}
-
-test expr-10.1 {CompileShiftExpr: just add expr} {expr 4+-2} 2
-test expr-10.2 {CompileShiftExpr: just add expr} {expr 0xff-2} 253
-test expr-10.3 {CompileShiftExpr: just add expr} {expr -1--2} 1
-test expr-10.4 {CompileShiftExpr: just add expr} {expr 1-0123} -82
-test expr-10.5 {CompileShiftExpr: error in add expr} {
-    catch {expr x+3} msg
-    set msg
-} {syntax error in expression "x+3"}
-test expr-10.6 {CompileShiftExpr: simple shift exprs} {expr 0xff>>0x3} 31
-test expr-10.7 {CompileShiftExpr: simple shift exprs} {expr -0xf2<<0x3} -1936
-test expr-10.8 {CompileShiftExpr: error compiling shift arm} {
-    catch {expr 2**3>>6} msg
-    set msg
-} {syntax error in expression "2**3>>6"}
-test expr-10.9 {CompileShiftExpr: error compiling shift arm} {
-    catch {expr 2<<x} msg
-    set msg
-} {syntax error in expression "2<<x"}
-test expr-10.10 {CompileShiftExpr: runtime error} {
-    list [catch {expr {24.0>>43}} msg] $msg
-} {1 {can't use floating-point value as operand of ">>"}}
-test expr-10.11 {CompileShiftExpr: runtime error} {
-    list [catch {expr {"a"<<"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "<<"}}
-
-test expr-11.1 {CompileAddExpr: just multiply expr} {expr 4*-2} -8
-test expr-11.2 {CompileAddExpr: just multiply expr} {expr 0xff%2} 1
-test expr-11.3 {CompileAddExpr: just multiply expr} {expr -1/2} -1
-test expr-11.4 {CompileAddExpr: just multiply expr} {expr 7891%0123} 6
-test expr-11.5 {CompileAddExpr: error in multiply expr} {
-    catch {expr x*3} msg
-    set msg
-} {syntax error in expression "x*3"}
-test expr-11.6 {CompileAddExpr: simple add exprs} {expr 0xff++0x3} 258
-test expr-11.7 {CompileAddExpr: simple add exprs} {expr -0xf2--0x3} -239
-test expr-11.8 {CompileAddExpr: error compiling add arm} {
-    catch {expr 2**3+6} msg
-    set msg
-} {syntax error in expression "2**3+6"}
-test expr-11.9 {CompileAddExpr: error compiling add arm} {
-    catch {expr 2-x} msg
-    set msg
-} {syntax error in expression "2-x"}
-test expr-11.10 {CompileAddExpr: runtime error} {
-    list [catch {expr {24.0+"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test expr-11.11 {CompileAddExpr: runtime error} {
-    list [catch {expr {"a"-"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "-"}}
-test expr-11.12 {CompileAddExpr: runtime error} {
-    list [catch {expr {3/0}} msg] $msg
-} {1 {divide by zero}}
-test expr-11.13 {CompileAddExpr: runtime error} {
-    list [catch {expr {2.3/0.0}} msg] $msg
-} {1 {divide by zero}}
-
-test expr-12.1 {CompileMultiplyExpr: just unary expr} {expr ~4} -5
-test expr-12.2 {CompileMultiplyExpr: just unary expr} {expr --5} 5
-test expr-12.3 {CompileMultiplyExpr: just unary expr} {expr !27} 0
-test expr-12.4 {CompileMultiplyExpr: just unary expr} {expr ~0xff00ff} -16711936
-test expr-12.5 {CompileMultiplyExpr: error in unary expr} {
-    catch {expr ~x} msg
-    set msg
-} {syntax error in expression "~x"}
-test expr-12.6 {CompileMultiplyExpr: simple multiply exprs} {expr 0xff*0x3} 765
-test expr-12.7 {CompileMultiplyExpr: simple multiply exprs} {expr -0xf2%-0x3} -2
-test expr-12.8 {CompileMultiplyExpr: error compiling multiply arm} {
-    catch {expr 2*3%%6} msg
-    set msg
-} {syntax error in expression "2*3%%6"}
-test expr-12.9 {CompileMultiplyExpr: error compiling multiply arm} {
-    catch {expr 2*x} msg
-    set msg
-} {syntax error in expression "2*x"}
-test expr-12.10 {CompileMultiplyExpr: runtime error} {
-    list [catch {expr {24.0*"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "*"}}
-test expr-12.11 {CompileMultiplyExpr: runtime error} {
-    list [catch {expr {"a"/"b"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "/"}}
-
-test expr-13.1 {CompileUnaryExpr: unary exprs} {expr -0xff} -255
-test expr-13.2 {CompileUnaryExpr: unary exprs} {expr +000123} 83
-test expr-13.3 {CompileUnaryExpr: unary exprs} {expr +--++36} 36
-test expr-13.4 {CompileUnaryExpr: unary exprs} {expr !2} 0
-test expr-13.5 {CompileUnaryExpr: unary exprs} {expr +--+-62.0} -62.0
-test expr-13.6 {CompileUnaryExpr: unary exprs} {expr !0.0} 1
-test expr-13.7 {CompileUnaryExpr: unary exprs} {expr !0xef} 0
-test expr-13.8 {CompileUnaryExpr: error compiling unary expr} {
-    catch {expr ~x} msg
-    set msg
-} {syntax error in expression "~x"}
-test expr-13.9 {CompileUnaryExpr: error compiling unary expr} {
-    catch {expr !1.x} msg
-    set msg
-} {syntax error in expression "!1.x"}
-test expr-13.10 {CompileUnaryExpr: runtime error} {
-    list [catch {expr {~"xx"}} msg] $msg
-} {1 {can't use non-numeric string as operand of "~"}}
-test expr-13.11 {CompileUnaryExpr: runtime error} {
-    list [catch {expr ~4.0} msg] $msg
-} {1 {can't use floating-point value as operand of "~"}}
-test expr-13.12 {CompileUnaryExpr: just primary expr} {expr 0x123} 291
-test expr-13.13 {CompileUnaryExpr: just primary expr} {
-    set a 27
-    expr $a
-} 27
-test expr-13.14 {CompileUnaryExpr: just primary expr} {
-    expr double(27)
-} 27.0
-test expr-13.15 {CompileUnaryExpr: just primary expr} {expr "123"} 123
-test expr-13.16 {CompileUnaryExpr: error in primary expr} {
-    catch {expr [set]} msg
-    set msg
-} {wrong # args: should be "set varName ?newValue?"}
-test expr-14.1 {CompilePrimaryExpr: literal primary} {expr 1} 1
-test expr-14.2 {CompilePrimaryExpr: literal primary} {expr 123} 123
-test expr-14.3 {CompilePrimaryExpr: literal primary} {expr 0xff} 255
-test expr-14.4 {CompilePrimaryExpr: literal primary} {expr 00010} 8
-test expr-14.5 {CompilePrimaryExpr: literal primary} {expr 62.0} 62.0
-test expr-14.6 {CompilePrimaryExpr: literal primary} {
-    expr 3.1400000
-} 3.14
-test expr-14.7 {CompilePrimaryExpr: literal primary} {expr {{abcde}<{abcdef}}} 1
-test expr-14.8 {CompilePrimaryExpr: literal primary} {expr {{abc\
-def} < {abcdef}}} 1
-test expr-14.9 {CompilePrimaryExpr: literal primary} {expr {{abc\tde} > {abc\tdef}}} 0
-test expr-14.10 {CompilePrimaryExpr: literal primary} {expr {{123}}} 123
-test expr-14.11 {CompilePrimaryExpr: var reference primary} {
-    set i 789
-    list [expr {$i}] [expr $i]
-} {789 789}
-test expr-14.12 {CompilePrimaryExpr: var reference primary} {
-    set i {789}    ;# test expr's aggressive conversion to numeric semantics
-    list [expr {$i}] [expr $i]
-} {789 789}
-test expr-14.13 {CompilePrimaryExpr: var reference primary} {
-    catch {unset a}
-    set a(foo) foo
-    set a(bar) bar
-    set a(123) 123
-    set result ""
-    lappend result [expr $a(123)] [expr {$a(bar)<$a(foo)}]
-    catch {unset a}
-    set result
-} {123 1}
-test expr-14.14 {CompilePrimaryExpr: var reference primary} {
-    set i 123    ;# test "$var.0" floating point conversion hack
-    list [expr $i] [expr $i.0] [expr $i.0/12.0]
-} {123 123.0 10.25}
-test expr-14.15 {CompilePrimaryExpr: var reference primary} {
-    set i 123
-    catch {expr $i.2} msg
-    set msg
-} 123.2
-test expr-14.16 {CompilePrimaryExpr: error compiling var reference primary} {
-    catch {expr {$a(foo}} msg
-    set errorInfo
-} {missing )
-    while compiling
-"expr {$a(foo}"}
-test expr-14.17 {CompilePrimaryExpr: string primary that looks like var ref} {
-    expr $
-} $
-test expr-14.18 {CompilePrimaryExpr: quoted string primary} {
-    expr "21"
-} 21
-test expr-14.19 {CompilePrimaryExpr: quoted string primary} {
-    set i 123
-    set x 456
-    expr "$i+$x"
-} 579
-test expr-14.20 {CompilePrimaryExpr: quoted string primary} {
-    set i 3
-    set x 6
-    expr 2+"$i.$x"
-} 5.6
-test expr-14.21 {CompilePrimaryExpr: error in quoted string primary} {
-    catch {expr "[set]"} msg
-    set msg
-} {wrong # args: should be "set varName ?newValue?"}
-test expr-14.22 {CompilePrimaryExpr: subcommand primary} {
-    expr {[set i 123; set i]}
-} 123
-test expr-14.23 {CompilePrimaryExpr: error in subcommand primary} {
-    catch {expr {[set]}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"expr {[set]}"}
-test expr-14.24 {CompilePrimaryExpr: error in subcommand primary} {
-    catch {expr {[set i}} msg
-    set errorInfo
-} {missing close-bracket
-    while compiling
-"expr {[set i}"}
-test expr-14.25 {CompilePrimaryExpr: math function primary} {
-    format %.6g [expr exp(1.0)]
-} 2.71828
-test expr-14.26 {CompilePrimaryExpr: math function primary} {
-    format %.6g [expr pow(2.0+0.1,3.0+0.1)]
-} 9.97424
-test expr-14.27 {CompilePrimaryExpr: error in math function primary} {
-    catch {expr sinh::(2.0)} msg
-    set errorInfo
-} {syntax error in expression "sinh::(2.0)"
-    while compiling
-"expr sinh::(2.0)"}
-test expr-14.28 {CompilePrimaryExpr: subexpression primary} {
-    expr 2+(3*4)
-} 14
-test expr-14.29 {CompilePrimaryExpr: error in subexpression primary} {
-    catch {expr 2+(3*[set])} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"expr 2+(3*[set])"}
-test expr-14.30 {CompilePrimaryExpr: missing paren in subexpression primary} {
-    catch {expr 2+(3*(4+5)} msg
-    set errorInfo
-} {syntax error in expression "2+(3*(4+5)"
-    while compiling
-"expr 2+(3*(4+5)"}
-test expr-14.31 {CompilePrimaryExpr: just var ref in subexpression primary} {
-    set i "5+10"
-    list "[expr $i] == 15" "[expr ($i)] == 15" "[eval expr ($i)] == 15"
-} {{15 == 15} {15 == 15} {15 == 15}}
-test expr-14.32 {CompilePrimaryExpr: unexpected token} {
-    catch {expr @} msg
-    set errorInfo
-} {syntax error in expression "@"
-    while compiling
-"expr @"}
-
-test expr-15.1 {CompileMathFuncCall: missing parenthesis} {
-    catch {expr sinh2.0)} msg
-    set errorInfo
-} {syntax error in expression "sinh2.0)"
-    while compiling
-"expr sinh2.0)"}
-test expr-15.2 {CompileMathFuncCall: unknown math function} {
-    catch {expr whazzathuh(1)} msg
-    set errorInfo
-} {unknown math function "whazzathuh"
-    while compiling
-"expr whazzathuh(1)"}
-test expr-15.3 {CompileMathFuncCall: too many arguments} {
-    catch {expr sin(1,2,3)} msg
-    set errorInfo
-} {too many arguments for math function
-    while compiling
-"expr sin(1,2,3)"}
-test expr-15.4 {CompileMathFuncCall: ')' found before last required arg} {
-    catch {expr sin()} msg
-    set errorInfo
-} {too few arguments for math function
-    while compiling
-"expr sin()"}
-test expr-15.5 {CompileMathFuncCall: too few arguments} {
-    catch {expr pow(1)} msg
-    set errorInfo
-} {too few arguments for math function
-    while compiling
-"expr pow(1)"}
-test expr-15.6 {CompileMathFuncCall: missing ')'} {
-    catch {expr sin(1} msg
-    set errorInfo
-} {syntax error in expression "sin(1"
-    while compiling
-"expr sin(1"}
-if $gotT1 {
-    test expr-15.7 {CompileMathFuncCall: call registered math function} {
-	expr 2*T1()
-    } 246
-    test expr-15.8 {CompileMathFuncCall: call registered math function} {
-	expr T2()*3
-    } 1035
-
-    test expr-15.9 {CompileMathFuncCall: call registered math function} {
-	expr T3(21, 37)
-    } 37
-    test expr-15.10 {CompileMathFuncCall: call registered math function} {
-	expr T3(21.2, 37)
-    } 37.0
-    test expr-15.11 {CompileMathFuncCall: call registered math function} {
-	expr T3(-21.2, -17.5)
-    } -17.5
-}
-
-test expr-16.1 {GetToken: checks whether integer token starting with "0x" (e.g., "0x$") is invalid} {
-    catch {unset a}
-    set a(VALUE) ff15
-    set i 123
-    if {[expr 0x$a(VALUE)] & 16} {
-        set i {}
-    }
-    set i
-} {}
-test expr-16.2 {GetToken: check for string literal in braces} {
-    expr {{1}}
-} {1}
-
-# Check "expr" and computed command names.
-
-test expr-17.1 {expr and computed command names} {
-    set i 0
-    set z expr
-    $z 1+2
-} 3
-
-# Check correct conversion of operands to numbers: If the string looks like
-# an integer, convert to integer. Otherwise, if the string looks like a
-# double, convert to double.
-
-test expr-18.1 {expr and conversion of operands to numbers} {
-    set x [lindex 11 0]
-    catch {expr int($x)}
-    expr {$x}
-} 11
-
-# Check "expr" and interpreter result object resetting before appending
-# an error msg during evaluation of exprs not in {}s
-
-test expr-19.1 {expr and interpreter result object resetting} {
-    proc p {} {
-        set t  10.0
-        set x  2.0
-        set dx 0.2
-        set f  {$dx-$x/10}
-        set g  {-$x/5}
-        set center 1.0
-        set x  [expr $x-$center]
-        set dx [expr $dx+$g]
-        set x  [expr $x+$f+$center]
-        set x  [expr $x+$f+$center]
-        set y  [expr round($x)]
-    }
-    p
-} 3
-
-# Test for incorrect "double evaluation" semantics
-
-test expr-20.1 {wrong brace matching} {
-    catch {unset l}
-    catch {unset r}
-    catch {unset q}
-    catch {unset cmd}
-    catch {unset a}
-    set l "\{"; set r "\}"; set q "\""
-    set cmd "expr $l$q|$q == $q$r$q$r"
-    list [catch $cmd a] $a
-} {1 {extra characters after close-brace}}
-test expr-20.2 {double invocation of variable traces} {knownBug} {
-    set exprtracecounter 0
-    proc exprtraceproc {args} {
-       upvar #0 exprtracecounter counter
-       set argc [llength $args]
-       set extraargs [lrange $args 0 [expr {$argc - 4}]]
-       set name [lindex $args [expr {$argc - 3}]]
-       upvar 1 $name var
-       if {[incr counter] % 2 == 1} {
-           set var "$counter oops [concat $extraargs]"
-       } else {
-           set var "$counter + [concat $extraargs]"
-       }
-    }
-    trace variable exprtracevar r [list exprtraceproc 10]
-    list [catch {expr "$exprtracevar + 20"} a] $a \
-        [catch {expr "$exprtracevar + 20"} b] $b \
-        [unset exprtracevar exprtracecounter]
-} {1 {syntax error in expression "1 oops 10 + 20"} 0 32 {}}
-test expr-20.3 {broken substitution of integer digits} {
-    # fails with 8.0.x, but not 8.1b2
-    list [set a 000; expr 0x1$a] [set a 1; expr ${a}000]
-} {4096 1000}
-
-# cleanup
-unset a
-::tcltest::cleanupTests
-return
diff --git a/tests/fCmd.test b/tests/fCmd.test
deleted file mode 100644
index e1fc391..0000000
--- a/tests/fCmd.test
+++ /dev/null
@@ -1,2164 +0,0 @@
-# This file tests the tclFCmd.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: fCmd.test,v 1.4 1999/04/16 00:47:27 stanton Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[string compare testgetplatform [info commands testgetplatform]] != 0} {
-    puts "This application hasn't been compiled with the \"testgetplatform\""
-    puts "command, therefore I am skipping all of these tests."
-    ::tcltest::cleanupTests
-    return
-}
-
-set platform [testgetplatform]
-
-if {"[info commands testchmod]" != "testchmod"} {
-    puts "Skipping fCmd tests. This application does not seem to have the"
-    puts "testchmod command that is needed to run these tests."
-    ::tcltest::cleanupTests
-    return
-}
-
-# Several tests require need to match results against the unix username
-set user {}
-if {$tcl_platform(platform) == "unix"} {
-    catch {set user [exec whoami]}
-    if {$user == ""} {
-	catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-    }
-    if {$user == ""} {
-	set user "root"
-    }
-}
-
-proc createfile {file {string a}} {
-    set f [open $file w]
-    puts -nonewline $f $string
-    close $f
-    return $string
-}
-
-# 
-# checkcontent --
-#
-#  Ensures that file "file" contains only the string "matchString"
-#  returns 0 if the file does not exist, or has a different content
-#
-proc checkcontent {file matchString} {
-    if {[catch {
-	set f [open $file]
-	set fileString [read $f]
-	close $f 
-    }]} {
-	return 0
-    }
-    return [string match $matchString $fileString]
-}
-
-proc openup {path} {
-    testchmod 777 $path
-    if {[file isdirectory $path]} {
-	catch {
-	    foreach p [glob [file join $path *]] {
-		openup $p
-	    }
-	}
-    }
-}
-
-proc cleanup {args} {
-    foreach p ". $args" {
-	set x ""
-	catch {
-	    set x [glob [file join $p tf*] [file join $p td*]]
-	}
-	foreach file $x {
-	    if {[catch {file delete -force -- $file}]} {
-		catch {openup $file}
-		catch {file delete -force -- $file}
-	    }
-	}
-    }
-}
-
-proc contents {file} {
-    set f [open $file r]
-    set r [read $f]
-    close $f
-    set r
-}
-
-set ::tcltest::testConfig(fileSharing) 0
-set ::tcltest::testConfig(notFileSharing) 1
-
-if {$tcl_platform(platform) == "macintosh"} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    if {[catch {file attributes foo.dir -readonly 1}] == 0} {
-    	set ::tcltest::testConfig(fileSharing) 1
-    	set ::tcltest::testConfig(notFileSharing) 0
-    }
-    file delete -force foo.dir
-}
-
-set ::tcltest::testConfig(xdev) 0
-
-if {$tcl_platform(platform) == "unix"} {
-    if {[catch {set m1 [exec df .]; set m2 [exec df /tmp]}] == 0} {
-	set m1 [string range $m1 0 [expr [string first " " $m1]-1]]
-	set m2 [string range $m2 0 [expr [string first " " $m2]-1]]
-	if {$m1 != "" && $m2 != "" && $m1 != $m2 && [file exists $m1] && [file exists $m2]} {
-	    set ::tcltest::testConfig(xdev) 1
-	}
-    }
-}
-
-set root [lindex [file split [pwd]] 0]
-
-# A really long file name
-# length of long is 1216 chars, which should be greater than any static
-# buffer or allowable filename.
-
-set long "abcdefghihjllmnopqrstuvwxyz01234567890"
-append long $long
-append long $long
-append long $long
-append long $long
-append long $long
-
-test fCmd-1.1 {TclFileRenameCmd} {notRoot} {
-    cleanup
-    createfile tf1
-    file rename tf1 tf2
-    glob tf*
-} {tf2}
-
-test fCmd-2.1 {TclFileCopyCmd} {notRoot} {
-    cleanup
-    createfile tf1
-    file copy tf1 tf2
-    lsort [glob tf*]
-} {tf1 tf2}
-
-test fCmd-3.1 {FileCopyRename: FileForceOption fails} {notRoot} {
-    list [catch {file rename -xyz} msg] $msg
-} {1 {bad option "-xyz": should be -force or --}}
-test fCmd-3.2 {FileCopyRename: not enough args} {notRoot} {
-    list [catch {file rename xyz} msg] $msg
-} {1 {wrong # args: should be "file rename ?options? source ?source ...? target"}}
-test fCmd-3.3 {FileCopyRename: Tcl_TranslateFileName fails} {notRoot} {
-    list [catch {file rename xyz ~nonexistantuser} msg] $msg
-} {1 {user "nonexistantuser" doesn't exist}}
-test fCmd-3.4 {FileCopyRename: Tcl_TranslateFileName passes} {notRoot} {
-    cleanup
-    list [catch {file copy tf1 ~} msg] $msg
-} {1 {error copying "tf1": no such file or directory}}
-test fCmd-3.5 {FileCopyRename: target doesn't exist: stat(target) != 0} {notRoot} {
-    cleanup
-    list [catch {file rename tf1 tf2 tf3} msg] $msg
-} {1 {error renaming: target "tf3" is not a directory}}
-test fCmd-3.6 {FileCopyRename: target tf3 is not a dir: !S_ISDIR(target)} \
-	{notRoot} {
-    cleanup
-    createfile tf3
-    list [catch {file rename tf1 tf2 tf3} msg] $msg
-} {1 {error renaming: target "tf3" is not a directory}}
-test fCmd-3.7 {FileCopyRename: target exists & is directory} {notRoot} {
-    cleanup
-    file mkdir td1
-    createfile tf1 tf1
-    file rename tf1 td1
-    contents [file join td1 tf1]
-} {tf1}
-test fCmd-3.8 {FileCopyRename: too many arguments: argc - i > 2} {notRoot} {
-    cleanup
-    list [catch {file rename tf1 tf2 tf3} msg] $msg
-} {1 {error renaming: target "tf3" is not a directory}}
-test fCmd-3.9 {FileCopyRename: too many arguments: argc - i > 2} {notRoot} {
-    cleanup
-    list [catch {file copy -force -- tf1 tf2 tf3} msg] $msg
-} {1 {error copying: target "tf3" is not a directory}}
-test fCmd-3.10 {FileCopyRename: just 2 arguments} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    file rename tf1 tf2
-    contents tf2
-} {tf1}
-test fCmd-3.11 {FileCopyRename: just 2 arguments} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    file rename -force -force -- tf1 tf2
-    contents tf2
-} {tf1}
-test fCmd-3.12 {FileCopyRename: move each source: 1 source} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    file mkdir td1
-    file rename tf1 td1
-    contents [file join td1 tf1]
-} {tf1}
-test fCmd-3.13 {FileCopyRename: move each source: multiple sources} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    createfile tf2 tf2
-    createfile tf3 tf3
-    createfile tf4 tf4
-    file mkdir td1
-    file rename tf1 tf2 tf3 tf4 td1
-    list [contents [file join td1 tf1]] [contents [file join td1 tf2]] \
-	[contents [file join td1 tf3]] [contents [file join td1 tf4]]
-} {tf1 tf2 tf3 tf4}
-test fCmd-3.14 {FileCopyRename: FileBasename fails} {notRoot} {
-    cleanup
-    file mkdir td1
-    list [catch {file rename ~nonexistantuser td1} msg] $msg
-} {1 {user "nonexistantuser" doesn't exist}}
-test fCmd-3.15 {FileCopyRename: source[0] == '\0'} {notRoot unixOrPc} {
-    cleanup
-    file mkdir td1
-    list [catch {file rename / td1} msg] $msg
-} {1 {error renaming "/" to "td1": file already exists}}
-test fCmd-3.16 {FileCopyRename: break on first error} {notRoot} {
-    cleanup
-    createfile tf1 
-    createfile tf2 
-    createfile tf3 
-    createfile tf4 
-    file mkdir td1
-    createfile [file join td1 tf3]
-    list [catch {file rename tf1 tf2 tf3 tf4 td1} msg] $msg
-} [subst {1 {error renaming "tf3" to "[file join td1 tf3]": file already exists}}]
-
-test fCmd-4.1 {TclFileMakeDirsCmd: make each dir: 1 dir} {notRoot} {
-    cleanup
-    file mkdir td1
-    glob td*
-} {td1}
-test fCmd-4.2 {TclFileMakeDirsCmd: make each dir: multiple dirs} {notRoot} {
-    cleanup
-    file mkdir td1 td2 td3
-    lsort [glob td*]
-} {td1 td2 td3}
-test fCmd-4.3 {TclFileMakeDirsCmd: stops on first error} {notRoot} {
-    cleanup
-    createfile tf1
-    catch {file mkdir td1 td2 tf1 td3 td4}
-    glob td1 td2 tf1 td3 td4
-} {td1 td2 tf1}
-test fCmd-4.4 {TclFileMakeDirsCmd: Tcl_TranslateFileName fails} {notRoot} {
-    cleanup
-    list [catch {file mkdir ~nonexistantuser} msg] $msg
-} {1 {user "nonexistantuser" doesn't exist}}
-test fCmd-4.5 {TclFileMakeDirsCmd: Tcl_SplitPath returns 0: *name == '\0'} \
-	{notRoot} {
-    cleanup
-    list [catch {file mkdir ""} msg] $msg
-} {1 {can't create directory "": no such file or directory}}
-test fCmd-4.6 {TclFileMakeDirsCmd: one level deep} {notRoot} {
-    cleanup
-    file mkdir td1
-    glob td1
-} {td1}
-test fCmd-4.7 {TclFileMakeDirsCmd: multi levels deep} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2 td3 td4]
-    glob td1 [file join td1 td2]
-} "td1 [file join td1 td2]"
-test fCmd-4.8 {TclFileMakeDirsCmd: already exist: lstat(target) == 0} {notRoot} {
-    cleanup
-    file mkdir td1
-    set x [file exist td1]
-    file mkdir td1
-    list $x [file exist td1]
-} {1 1}
-test fCmd-4.9 {TclFileMakeDirsCmd: exists, not dir} {notRoot} {
-    cleanup
-    createfile tf1
-    list [catch {file mkdir tf1} msg] $msg
-} [subst {1 {can't create directory "[file join tf1]": file already exists}}]
-test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} {notRoot} {
-    cleanup
-    file mkdir td1
-    set x [file exist td1]
-    file mkdir td1
-    list $x [file exist td1]
-} {1 1}
-test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} \
-	{unixOnly notRoot} {
-    cleanup
-    file mkdir td1/td2/td3
-    testchmod 000 td1/td2
-    set msg [list [catch {file mkdir td1/td2/td3/td4} msg] $msg]
-    testchmod 755 td1/td2
-    set msg
-} {1 {can't create directory "td1/td2/td3": permission denied}}
-test fCmd-4.12 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} {macOnly} {
-    cleanup
-    list [catch {file mkdir nonexistantvolume:} msg] $msg
-} {1 {can't create directory "nonexistantvolume:": invalid argument}}
-test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} {notRoot} {
-    cleanup
-    set x [file exist td1]
-    file mkdir td1
-    list $x [file exist td1]
-} {0 1}
-test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} \
-	{unixOnly notRoot} {
-    cleanup
-    file delete -force foo
-    file mkdir foo
-    file attr foo -perm 040000
-    set result [list [catch {file mkdir foo/tf1} msg] $msg]
-    file delete -force foo
-    set result
-} {1 {can't create directory "foo/tf1": permission denied}}
-test fCmd-4.15 {TclFileMakeDirsCmd: TclpCreateDirectory fails} {macOnly} {
-    list [catch {file mkdir ${root}:} msg] $msg
-} [subst {1 {can't create directory "${root}:": no such file or directory}}]
-test fCmd-4.16 {TclFileMakeDirsCmd: TclpCreateDirectory succeeds} {notRoot} {
-    cleanup
-    file mkdir tf1
-    file exists tf1
-} {1}
-
-test fCmd-5.1 {TclFileDeleteCmd: FileForceOption fails} {notRoot} {
-    list [catch {file delete -xyz} msg] $msg
-} {1 {bad option "-xyz": should be -force or --}}
-test fCmd-5.2 {TclFileDeleteCmd: not enough args} {notRoot} {
-    list [catch {file delete -force -force} msg] $msg
-} {1 {wrong # args: should be "file delete ?options? file ?file ...?"}}
-test fCmd-5.3 {TclFileDeleteCmd: 1 file} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file mkdir td1
-    file delete tf2
-    glob tf* td*
-} {tf1 td1}
-test fCmd-5.4 {TclFileDeleteCmd: multiple files} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file mkdir td1
-    set x [list [file exist tf1] [file exist tf2] [file exist td1]]
-    file delete tf1 td1 tf2
-    lappend x [file exist tf1] [file exist tf2] [file exist tf3]
-} {1 1 1 0 0 0}
-test fCmd-5.5 {TclFileDeleteCmd: stop at first error} {notRoot unixOrPc} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file mkdir td1
-    catch {file delete tf1 td1 $root tf2}
-    list [file exist tf1] [file exist tf2] [file exist td1]
-} {0 1 0}
-test fCmd-5.6 {TclFileDeleteCmd: Tcl_TranslateFileName fails} {notRoot} {
-    list [catch {file delete ~nonexistantuser} msg] $msg
-} {1 {user "nonexistantuser" doesn't exist}}
-test fCmd-5.7 {TclFileDeleteCmd: Tcl_TranslateFileName succeeds} {notRoot} {
-    catch {file delete ~/tf1}
-    createfile ~/tf1
-    file delete ~/tf1
-} {}
-test fCmd-5.8 {TclFileDeleteCmd: file doesn't exist: lstat(name) != 0} {notRoot} {
-    cleanup
-    set x [file exist tf1]
-    file delete tf1
-    list $x [file exist tf1]
-} {0 0}    
-test fCmd-5.9 {TclFileDeleteCmd: is directory} {notRoot} {
-    cleanup
-    file mkdir td1
-    file delete td1
-    file exist td1
-} {0}
-test fCmd-5.10 {TclFileDeleteCmd: TclpRemoveDirectory fails} {notRoot} {
-    cleanup
-    file mkdir td1/td2
-    list [catch {file delete td1} msg] $msg
-} {1 {error deleting "td1": directory not empty}}
-
-test fCmd-6.1 {CopyRenameOneFile: bad source} {notRoot} {
-    # can't test this, because it's caught by FileCopyRename
-} {}
-test fCmd-6.2 {CopyRenameOneFile: bad target} {notRoot} {
-    # can't test this, because it's caught by FileCopyRename
-} {}
-test fCmd-6.3 {CopyRenameOneFile: lstat(source) != 0} {notRoot} {
-    cleanup
-    list [catch {file rename tf1 tf2} msg] $msg
-} {1 {error renaming "tf1": no such file or directory}}
-test fCmd-6.4 {CopyRenameOneFile: lstat(source) == 0} {notRoot} {
-    cleanup
-    createfile tf1
-    file rename tf1 tf2
-    glob tf*
-} {tf2}
-test fCmd-6.5 {CopyRenameOneFile: lstat(target) != 0} {notRoot} {
-    cleanup
-    createfile tf1
-    file rename tf1 tf2
-    glob tf*
-} {tf2}
-test fCmd-6.6 {CopyRenameOneFile: errno != ENOENT} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    createfile tf1
-    set msg [list [catch {file rename tf1 td1} msg] $msg]
-    testchmod 755 td1
-    set msg
-} {1 {error renaming "tf1" to "td1/tf1": permission denied}}
-test fCmd-6.7 {CopyRenameOneFile: errno != ENOENT} {95} {
-    cleanup
-    createfile tf1
-    list [catch {file rename tf1 $long} msg] $msg
-} [subst {1 {error renaming "tf1" to "$long": file name too long}}]
-test fCmd-6.8 {CopyRenameOneFile: errno != ENOENT} {macOnly} {
-    cleanup
-    createfile tf1
-    list [catch {file rename tf1 $long} msg] $msg
-} [subst {1 {error renaming "tf1" to "$long": file name too long}}]
-test fCmd-6.9 {CopyRenameOneFile: errno == ENOENT} {unixOnly notRoot} {
-    cleanup
-    createfile tf1
-    file rename tf1 tf2
-    glob tf*
-} {tf2}
-test fCmd-6.10 {CopyRenameOneFile: lstat(target) == 0} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    list [catch {file rename tf1 tf2} msg] $msg
-} {1 {error renaming "tf1" to "tf2": file already exists}}
-test fCmd-6.11 {CopyRenameOneFile: force == 0} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    list [catch {file rename tf1 tf2} msg] $msg
-} {1 {error renaming "tf1" to "tf2": file already exists}}
-test fCmd-6.12 {CopyRenameOneFile: force != 0} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file rename -force tf1 tf2
-    glob tf*
-} {tf2}
-test fCmd-6.13 {CopyRenameOneFile: source is dir, target is file} {notRoot} {
-    cleanup
-    file mkdir td1
-    file mkdir td2
-    createfile [file join td2 td1]
-    list [catch {file rename -force td1 td2} msg] $msg
-} [subst {1 {can't overwrite file "[file join td2 td1]" with directory "td1"}}]
-test fCmd-6.14 {CopyRenameOneFile: source is file, target is dir} {notRoot} {
-    cleanup
-    createfile tf1
-    file mkdir [file join td1 tf1]
-    list [catch {file rename -force tf1 td1} msg] $msg
-} [subst {1 {can't overwrite directory "[file join td1 tf1]" with file "tf1"}}]
-test fCmd-6.15 {CopyRenameOneFile: TclpRenameFile succeeds} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2]
-    file mkdir td2
-    createfile [file join td2 tf1]
-    file rename -force td2 td1
-    file exists [file join td1 td2 tf1]
-} {1}
-test fCmd-6.16 {CopyRenameOneFile: TclpCopyRenameOneFile fails} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2]
-    createfile [file join td1 td2 tf1]
-    file mkdir td2
-    list [catch {file rename -force td2 td1} msg] $msg
-} [subst {1 {error renaming "td2" to "[file join td1 td2]": file already exists}}]
-
-test fCmd-6.17 {CopyRenameOneFile: errno == EINVAL} {notRoot} {
-    cleanup
-    list [catch {file rename -force $root tf1} msg] $msg
-} [subst {1 {error renaming "$root" to "tf1": trying to rename a volume or move a directory into itself}}]
-test fCmd-6.18 {CopyRenameOneFile: errno != EXDEV} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2]
-    createfile [file join td1 td2 tf1]
-    file mkdir td2
-    list [catch {file rename -force td2 td1} msg] $msg
-} [subst {1 {error renaming "td2" to "[file join td1 td2]": file already exists}}]
-test fCmd-6.19 {CopyRenameOneFile: errno == EXDEV} {unixOnly notRoot} {
-    cleanup /tmp
-    createfile tf1
-    file rename tf1 /tmp
-    glob tf* /tmp/tf1
-} {/tmp/tf1}
-test fCmd-6.20 {CopyRenameOneFile: errno == EXDEV} {pcOnly} {
-    catch {file delete -force c:/tcl8975@ d:/tcl8975@}
-    file mkdir c:/tcl8975@
-    if [catch {file rename c:/tcl8975@ d:/}] {
-	list d:/tcl8975@
-    } else {
-	set msg [glob c:/tcl8975@ d:/tcl8975@]
-	file delete -force d:/tcl8975@
-	set msg
-    }
-} {d:/tcl8975@}
-test fCmd-6.21 {CopyRenameOneFile: copy/rename: S_ISDIR(source)} \
-	{unixOnly notRoot} {
-    cleanup /tmp
-    file mkdir td1
-    file rename td1 /tmp
-    glob td* /tmp/td*
-} {/tmp/td1}
-test fCmd-6.22 {CopyRenameOneFile: copy/rename: !S_ISDIR(source)} \
-	{unixOnly notRoot} {
-    cleanup /tmp
-    createfile tf1
-    file rename tf1 /tmp
-    glob tf* /tmp/tf*
-} {/tmp/tf1}
-test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} \
-	{unixOnly notRoot xdev} {
-    cleanup /tmp
-    file mkdir td1/td2/td3
-    exec chmod 000 td1
-    set msg [list [catch {file rename td1 /tmp} msg] $msg]
-    exec chmod 755 td1
-    set msg 
-} {1 {error renaming "td1": permission denied}}
-test fCmd-6.24 {CopyRenameOneFile: error uses original name} \
-	{unixOnly notRoot} {
-    cleanup
-    file mkdir ~/td1/td2
-    exec chmod 000 [file join [file dirname ~] [file tail ~] td1]
-    set msg [list [catch {file copy ~/td1 td1} msg] $msg]
-    exec chmod 755 [file join [file dirname ~] [file tail ~] td1]
-    file delete -force ~/td1
-    set msg
-} {1 {error copying "~/td1": permission denied}}
-test fCmd-6.25 {CopyRenameOneFile: error uses original name} \
-	{unixOnly notRoot} {
-    cleanup
-    file mkdir td2
-    file mkdir ~/td1
-    exec chmod 000 [file join [file dirname ~] [file tail ~] td1]
-    set msg [list [catch {file copy td2 ~/td1} msg] $msg]
-    exec chmod 755 [file join [file dirname ~] [file tail ~] td1]
-    file delete -force ~/td1
-    set msg
-} {1 {error copying "td2" to "~/td1/td2": permission denied}}
-test fCmd-6.26 {CopyRenameOneFile: doesn't use original name} \
-	{unixOnly notRoot} {
-    cleanup
-    file mkdir ~/td1/td2
-    exec chmod 000 [file join [file dirname ~] [file tail ~] td1 td2]
-    set msg [list [catch {file copy ~/td1 td1} msg] $msg]
-    exec chmod 755 [file join [file dirname ~] [file tail ~] td1 td2]
-    file delete -force ~/td1
-    set msg
-} "1 {error copying \"~/td1\" to \"td1\": \"[file join [file dirname ~] [file tail ~] td1 td2]\": permission denied}"
-test fCmd-6.27 {CopyRenameOneFile: TclpCopyDirectory failed} \
-	{unixOnly notRoot xdev} {
-    cleanup /tmp
-    file mkdir td1/td2/td3
-    file mkdir /tmp/td1
-    createfile /tmp/td1/tf1
-    list [catch {file rename -force td1 /tmp} msg] $msg
-} {1 {error renaming "td1" to "/tmp/td1": file already exists}}
-test fCmd-6.28 {CopyRenameOneFile: TclpCopyDirectory failed} \
-	{unixOnly notRoot xdev} {
-    cleanup /tmp
-    file mkdir td1/td2/td3
-    exec chmod 000 td1/td2/td3 
-    set msg [list [catch {file rename td1 /tmp} msg] $msg]
-    exec chmod 755 td1/td2/td3 
-    set msg
-} {1 {error renaming "td1" to "/tmp/td1": "td1/td2/td3": permission denied}}
-test fCmd-6.29 {CopyRenameOneFile: TclpCopyDirectory passed} \
-	{unixOnly notRoot xdev} {
-    cleanup /tmp
-    file mkdir td1/td2/td3
-    file rename td1 /tmp
-    glob td* /tmp/td1/t*
-} {/tmp/td1/td2}
-test fCmd-6.30 {CopyRenameOneFile: TclpRemoveDirectory failed} \
-	{unixOnly notRoot} {
-    cleanup
-    file mkdir foo/bar
-    file attr foo -perm 040555
-    set catchResult [catch {file rename foo/bar /tmp} msg]
-    set msg [lindex [split $msg :] end]
-    catch {file delete /tmp/bar}
-    catch {file attr foo -perm 040777}
-    catch {file delete -force foo}
-    list $catchResult $msg
-} {1 { permission denied}}
-test fCmd-6.31 {CopyRenameOneFile: TclpDeleteFile passed} \
-	{unixOnly notRoot xdev} {
-    catch {cleanup /tmp}
-    file mkdir /tmp/td1
-    createfile /tmp/td1/tf1
-    file rename /tmp/td1/tf1 tf1
-    list [file exists /tmp/td1/tf1] [file exists tf1]
-} {0 1}
-test fCmd-6.32 {CopyRenameOneFile: copy} {notRoot} {
-    cleanup
-    list [catch {file copy tf1 tf2} msg] $msg
-} {1 {error copying "tf1": no such file or directory}}
-catch {cleanup /tmp}
-
-test fCmd-7.1 {FileForceOption: none} {notRoot} {
-    cleanup
-    file mkdir [file join tf1 tf2]
-    list [catch {file delete tf1} msg] $msg
-} {1 {error deleting "tf1": directory not empty}}
-test fCmd-7.2 {FileForceOption: -force} {notRoot} {
-    cleanup
-    file mkdir [file join tf1 tf2]
-    file delete -force tf1
-} {}
-test fCmd-7.3 {FileForceOption: --} {notRoot} {
-    createfile -tf1
-    file delete -- -tf1
-} {}
-test fCmd-7.4 {FileForceOption: bad option} {notRoot} {
-    createfile -tf1
-    set msg [list [catch {file delete -tf1} msg] $msg]
-    file delete -- -tf1
-    set msg
-} {1 {bad option "-tf1": should be -force or --}}
-test fCmd-7.5 {FileForceOption: multiple times through loop} {notRoot} {
-    createfile --
-    createfile -force
-    file delete -force -force -- -- -force
-    list [catch {glob -- -- -force} msg] $msg
-} {1 {no files matched glob patterns "-- -force"}}
-
-test fCmd-8.1 {FileBasename: basename of ~user: argc == 1 && *path == ~} \
-	{unixOnly notRoot} {
-    file mkdir td1
-    file attr td1 -perm 040000
-    set result [list [catch {file rename ~$user td1} msg] $msg]
-    file delete -force td1
-    set result
-} "1 {error renaming \"~$user\" to \"td1/[file tail ~$user]\": permission denied}"
-
-test fCmd-9.1 {file rename: comprehensive: EACCES} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1
-    file mkdir td2
-    file attr td2 -perm 040000
-    set result [list [catch {file rename td1 td2/} msg] $msg]
-    file delete -force td2
-    file delete -force td1
-    set result
-} {1 {error renaming "td1" to "td2/td1": permission denied}}
-test fCmd-9.2 {file rename: comprehensive: source doesn't exist} {notRoot} {
-    cleanup
-    list [catch {file rename tf1 tf2} msg] $msg
-} {1 {error renaming "tf1": no such file or directory}}
-test fCmd-9.3 {file rename: comprehensive: file to new name} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    testchmod 444 tf2
-    file rename tf1 tf3
-    file rename tf2 tf4
-    list [lsort [glob tf*]] [file writable tf3] [file writable tf4]
-} {{tf3 tf4} 1 0}    
-test fCmd-9.4 {file rename: comprehensive: dir to new name} {unixOrPc notRoot} {
-    cleanup
-    file mkdir td1 td2
-    testchmod 555 td2
-    file rename td1 td3
-    file rename td2 td4
-    list [lsort [glob td*]] [file writable td3] [file writable td4]
-} {{td3 td4} 1 0}    
-test fCmd-9.5 {file rename: comprehensive: file to self} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    createfile tf2 tf2
-    testchmod 444 tf2
-    file rename -force tf1 tf1
-    file rename -force tf2 tf2
-    list [contents tf1] [contents tf2] [file writable tf1] [file writable tf2]
-} {tf1 tf2 1 0}    
-test fCmd-9.6 {file rename: comprehensive: dir to self} {notRoot unixOrPc} {
-    cleanup
-    file mkdir td1
-    file mkdir td2
-    testchmod 555 td2
-    file rename -force td1 .
-    file rename -force td2 .
-    list [lsort [glob td*]] [file writable td1] [file writable td2]
-} {{td1 td2} 1 0}    
-test fCmd-9.7 {file rename: comprehensive: file to existing file} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    createfile tfs1
-    createfile tfs2
-    createfile tfs3
-    createfile tfs4
-    createfile tfd1
-    createfile tfd2
-    createfile tfd3
-    createfile tfd4
-    testchmod 444 tfs3
-    testchmod 444 tfs4
-    testchmod 444 tfd2
-    testchmod 444 tfd4
-    set msg [list [catch {file rename tf1 tf2} msg] $msg]
-    file rename -force tfs1 tfd1
-    file rename -force tfs2 tfd2
-    file rename -force tfs3 tfd3
-    file rename -force tfs4 tfd4
-    list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4] 
-} {{tf1 tf2 tfd1 tfd2 tfd3 tfd4} {1 {error renaming "tf1" to "tf2": file already exists}} 1 1 0 0}
-test fCmd-9.8 {file rename: comprehensive: dir to empty dir} {notRoot} {
-    # Under unix, you can rename a read-only directory, but you can't
-    # move it into another directory.
-
-    cleanup
-    file mkdir td1
-    file mkdir [file join td2 td1]
-    file mkdir tds1
-    file mkdir tds2
-    file mkdir tds3
-    file mkdir tds4
-    file mkdir [file join tdd1 tds1]
-    file mkdir [file join tdd2 tds2]
-    file mkdir [file join tdd3 tds3]
-    file mkdir [file join tdd4 tds4]
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	testchmod 555 tds3
-	testchmod 555 tds4
-    }
-    if {$tcl_platform(platform) != "macintosh"} {
-    	testchmod 555 [file join tdd2 tds2]
-    	testchmod 555 [file join tdd4 tds4]
-    }
-    set msg [list [catch {file rename td1 td2} msg] $msg]
-    file rename -force tds1 tdd1
-    file rename -force tds2 tdd2
-    file rename -force tds3 tdd3
-    file rename -force tds4 tdd4
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	set w3 [file writable [file join tdd3 tds3]]
-	set w4 [file writable [file join tdd4 tds4]]
-    } else {
-	set w3 0
-	set w4 0
-    }
-    list [lsort [glob td*]] $msg [file writable [file join tdd1 tds1]] \
-    [file writable [file join tdd2 tds2]] $w3 $w4
-} [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4} {1 {error renaming "td1" to "[file join td2 td1]": file already exists}} 1 1 0 0}]
-test fCmd-9.9 {file rename: comprehensive: dir to non-empty dir} {notRoot} {
-    cleanup
-    file mkdir tds1
-    file mkdir tds2
-    file mkdir [file join tdd1 tds1 xxx]
-    file mkdir [file join tdd2 tds2 xxx]
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	testchmod 555 tds2
-    }
-    set a1 [list [catch {file rename -force tds1 tdd1} msg] $msg]
-    set a2 [list [catch {file rename -force tds2 tdd2} msg] $msg]
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	set w2 [file writable tds2]
-    } else {
-	set w2 0
-    }
-    list [lsort [glob td*]] $a1 $a2 [file writable tds1] $w2
-} [subst {{tdd1 tdd2 tds1 tds2} {1 {error renaming "tds1" to "[file join tdd1 tds1]": file already exists}} {1 {error renaming "tds2" to "[file join tdd2 tds2]": file already exists}} 1 0}]
-test fCmd-9.10 {file rename: comprehensive: file to new name and dir} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file mkdir td1
-    testchmod 444 tf2
-    file rename tf1 [file join td1 tf3]
-    file rename tf2 [file join td1 tf4]
-    list [catch {glob tf*}] [lsort [glob [file join td1 t*]]] \
-    [file writable [file join td1 tf3]] [file writable [file join td1 tf4]]
-} [subst {1 {[file join td1 tf3] [file join td1 tf4]} 1 0}]
-test fCmd-9.11 {file rename: comprehensive: dir to new name and dir} {notRoot} {
-    cleanup
-    file mkdir td1
-    file mkdir td2
-    file mkdir td3
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	testchmod 555 td2
-    }
-    file rename td1 [file join td3 td3]
-    file rename td2 [file join td3 td4]
-    if {$tcl_platform(platform) != "unix" && $tcl_platform(platform) != "macintosh"} {
-	set w4 [file writable [file join td3 td4]]
-    } else {
-        set w4 0
-    }
-    list [lsort [glob td*]] [lsort [glob [file join td3 t*]]] \
-    [file writable [file join td3 td3]] $w4
-} [subst {td3 {[file join td3 td3] [file join td3 td4]} 1 0}]
-test fCmd-9.12 {file rename: comprehensive: target exists} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2] [file join td2 td1]
-    if {$tcl_platform(platform) != "macintosh"} {
-    	testchmod 555 [file join td2 td1]
-    }
-    file mkdir [file join td3 td4] [file join td4 td3]
-    file rename -force td3 td4
-    set msg [list [file exists td3] [file exists [file join td4 td3 td4]] \
-    [catch {file rename td1 td2} msg] $msg]
-    if {$tcl_platform(platform) != "macintosh"} {
-    	testchmod 755 [file join td2 td1]
-    }
-    set msg
-} [subst {0 1 1 {error renaming "td1" to "[file join td2 td1]": file already exists}}]
-test fCmd-9.13 {file rename: comprehensive: can't overwrite target} {notRoot} {
-    cleanup
-    file mkdir [file join td1 td2] [file join td2 td1 td4]
-    list [catch {file rename -force td1 td2} msg] $msg
-} [subst {1 {error renaming "td1" to "[file join td2 td1]": file already exists}}]
-test fCmd-9.14 {file rename: comprehensive: dir into self} {notRoot} {
-    cleanup
-    file mkdir td1
-    list [glob td*] [list [catch {file rename td1 td1} msg] $msg]
-} [subst {td1 {1 {error renaming "td1" to "[file join td1 td1]": trying to rename a volume or move a directory into itself}}}]
-test fCmd-9.15 {file rename: comprehensive: source and target incompatible} \
-	{notRoot} {
-    cleanup
-    file mkdir td1
-    createfile tf1
-    list [catch {file rename -force td1 tf1} msg] $msg
-} {1 {can't overwrite file "tf1" with directory "td1"}}
-test fCmd-9.16 {file rename: comprehensive: source and target incompatible} \
-	{notRoot} {
-    cleanup
-    file mkdir td1/tf1
-    createfile tf1
-    list [catch {file rename -force tf1 td1} msg] $msg
-} [subst {1 {can't overwrite directory "[file join td1 tf1]" with file "tf1"}}]
-
-test fCmd-10.1 {file copy: comprehensive: source doesn't exist} {notRoot} {
-    cleanup
-    list [catch {file copy tf1 tf2} msg] $msg
-} {1 {error copying "tf1": no such file or directory}}
-test fCmd-10.2 {file copy: comprehensive: file to new name} {notRoot} {
-    cleanup
-    createfile tf1 tf1
-    createfile tf2 tf2
-    testchmod 444 tf2
-    file copy tf1 tf3
-    file copy tf2 tf4
-    list [lsort [glob tf*]] [contents tf3] [contents tf4] [file writable tf3] [file writable tf4]
-} {{tf1 tf2 tf3 tf4} tf1 tf2 1 0}
-test fCmd-10.3 {file copy: comprehensive: dir to new name} {notRoot unixOrPc} {
-    cleanup
-    file mkdir [file join td1 tdx]
-    file mkdir [file join td2 tdy]
-    testchmod 555 td2
-    file copy td1 td3
-    file copy td2 td4
-    set msg [list [lsort [glob td*]] [glob [file join td3 t*]] \
-	    [glob [file join td4 t*]] [file writable td3] [file writable td4]]
-    if {$tcl_platform(platform) != "macintosh"} {
-    	testchmod 755 td2
-    	testchmod 755 td4
-    }
-    set msg
-} [subst {{td1 td2 td3 td4} [file join td3 tdx] [file join td4 tdy] 1 0}]
-test fCmd-10.4 {file copy: comprehensive: file to existing file} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    createfile tfs1
-    createfile tfs2
-    createfile tfs3
-    createfile tfs4
-    createfile tfd1
-    createfile tfd2
-    createfile tfd3
-    createfile tfd4
-    testchmod 444 tfs3
-    testchmod 444 tfs4
-    testchmod 444 tfd2
-    testchmod 444 tfd4
-    set msg [list [catch {file copy tf1 tf2} msg] $msg]
-    file copy -force tfs1 tfd1
-    file copy -force tfs2 tfd2
-    file copy -force tfs3 tfd3
-    file copy -force tfs4 tfd4
-    list [lsort [glob tf*]] $msg [file writable tfd1] [file writable tfd2] [file writable tfd3] [file writable tfd4] 
-} {{tf1 tf2 tfd1 tfd2 tfd3 tfd4 tfs1 tfs2 tfs3 tfs4} {1 {error copying "tf1" to "tf2": file already exists}} 1 1 0 0}
-test fCmd-10.5 {file copy: comprehensive: dir to empty dir} {notRoot} {
-    cleanup
-    file mkdir td1
-    file mkdir [file join td2 td1]
-    file mkdir tds1
-    file mkdir tds2
-    file mkdir tds3
-    file mkdir tds4
-    file mkdir [file join tdd1 tds1]
-    file mkdir [file join tdd2 tds2]
-    file mkdir [file join tdd3 tds3]
-    file mkdir [file join tdd4 tds4]
-    if {$tcl_platform(platform) != "macintosh"} {
-	testchmod 555 tds3
-	testchmod 555 tds4
-	testchmod 555 [file join tdd2 tds2]
-	testchmod 555 [file join tdd4 tds4]
-    }
-    set a1 [list [catch {file copy td1 td2} msg] $msg]
-    set a2 [list [catch {file copy -force tds1 tdd1} msg] $msg]
-    set a3 [catch {file copy -force tds2 tdd2}]
-    set a4 [catch {file copy -force tds3 tdd3}]
-    set a5 [catch {file copy -force tds4 tdd4}]
-    list [lsort [glob td*]] $a1 $a2 $a3 $a4 $a5 
-} [subst {{td1 td2 tdd1 tdd2 tdd3 tdd4 tds1 tds2 tds3 tds4} {1 {error copying "td1" to "[file join td2 td1]": file already exists}} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} 1 1 1}]
-test fCmd-10.6 {file copy: comprehensive: dir to non-empty dir} \
-	{notRoot unixOrPc} {
-    cleanup
-    file mkdir tds1
-    file mkdir tds2
-    file mkdir [file join tdd1 tds1 xxx]
-    file mkdir [file join tdd2 tds2 xxx]
-    testchmod 555 tds2
-    set a1 [list [catch {file copy -force tds1 tdd1} msg] $msg]
-    set a2 [list [catch {file copy -force tds2 tdd2} msg] $msg]
-    list [lsort [glob td*]] $a1 $a2 [file writable tds1] [file writable tds2]
-} [subst {{tdd1 tdd2 tds1 tds2} {1 {error copying "tds1" to "[file join tdd1 tds1]": file already exists}} {1 {error copying "tds2" to "[file join tdd2 tds2]": file already exists}} 1 0}]
-test fCmd-10.7 {file rename: comprehensive: file to new name and dir} {notRoot} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    file mkdir td1
-    testchmod 444 tf2
-    file copy tf1 [file join td1 tf3]
-    file copy tf2 [file join td1 tf4]
-    list [lsort [glob tf*]] [lsort [glob [file join td1 t*]]] \
-    [file writable [file join td1 tf3]] [file writable [file join td1 tf4]]
-} [subst {{tf1 tf2} {[file join td1 tf3] [file join td1 tf4]} 1 0}]
-test fCmd-10.8 {file rename: comprehensive: dir to new name and dir} \
-	{notRoot unixOrPc} {
-    cleanup
-    file mkdir td1
-    file mkdir td2
-    file mkdir td3
-    testchmod 555 td2
-    file copy td1 [file join td3 td3]
-    file copy td2 [file join td3 td4]
-    list [lsort [glob td*]] [lsort [glob [file join td3 t*]]] \
-    [file writable [file join td3 td3]] [file writable [file join td3 td4]]
-} [subst {{td1 td2 td3} {[file join td3 td3] [file join td3 td4]} 1 0}]
-test fCmd-10.9 {file copy: comprehensive: source and target incompatible} \
-	{notRoot} {
-    cleanup
-    file mkdir td1
-    createfile tf1
-    list [catch {file copy -force td1 tf1} msg] $msg
-} {1 {can't overwrite file "tf1" with directory "td1"}}
-test fCmd-10.10 {file copy: comprehensive: source and target incompatible} \
-	{notRoot} {
-    cleanup
-    file mkdir [file join td1 tf1]
-    createfile tf1
-    list [catch {file copy -force tf1 td1} msg] $msg
-} [subst {1 {can't overwrite directory "[file join td1 tf1]" with file "tf1"}}]
-cleanup    
-
-# old tests    
-
-test fCmd-11.1 {TclFileRenameCmd: -- option } {notRoot} {
-    catch {file delete -force -- -tfa1}
-    set s [createfile -tfa1]
-    file rename -- -tfa1 tfa2
-    set result [expr [checkcontent tfa2 $s] && ![file exists -tfa1]]
-    file delete tfa2
-    set result
-} {1}
-
-test fCmd-11.2 {TclFileRenameCmd: bad option } {notRoot} {
-    catch {file delete -force -- tfa1}
-    set s [createfile tfa1]
-    set r1 [catch {file rename -x tfa1 tfa2}]
-    set result [expr $r1 && [checkcontent tfa1 $s] && ![file exists tfa2]]
-    file delete tfa1
-    set result
-} {1}
-
-test fCmd-11.3 {TclFileRenameCmd: bad \# args} {
-    catch {file rename -- }
-} {1}
-
-test fCmd-11.4 {TclFileRenameCmd: target filename translation failing} {notRoot} {
-     global env
-     set temp $env(HOME)
-     unset env(HOME)
-     set result [catch {file rename tfa ~/foobar }]
-     set env(HOME) $temp
-     set result
- } {1}
-
-test fCmd-11.5 {TclFileRenameCmd: > 1 source & target is not a dir} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-    createfile tfa1 
-    createfile tfa2 
-    createfile tfa3 
-    set result [catch {file rename tfa1 tfa2 tfa3}]
-    file delete tfa1 tfa2 tfa3
-    set result
-} {1}
-
-test fCmd-11.6 {TclFileRenameCmd: : single file into directory} {notRoot} {
-    catch {file delete -force -- tfa1 tfad}
-    set s [createfile tfa1]
-    file mkdir tfad
-    file rename tfa1 tfad
-    set result [expr [checkcontent tfad/tfa1 $s] && ![file exists tfa1]]
-    file delete -force tfad
-    set result
-} {1}
-
-test fCmd-11.7 {TclFileRenameCmd: : multiple files into directory} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfad}
-    set s1 [createfile tfa1 ]
-    set s2 [createfile tfa2 ]
-    file mkdir tfad
-    file rename tfa1 tfa2 tfad
-    set r1 [checkcontent tfad/tfa1 $s1]
-    set r2 [checkcontent tfad/tfa2 $s2]
-    
-    set result [expr $r1 && $r2 && ![file exists tfa1] && ![file exists tfa2]]
-	    
-    file delete -force tfad
-    set result
-} {1}
-
-test fCmd-11.8 {TclFileRenameCmd: error renaming file to directory} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s [createfile tfa ]
-    file mkdir tfad
-    file mkdir tfad/tfa
-    set r1 [catch {file rename tfa tfad}]
-    set r2 [checkcontent tfa $s]
-    set r3 [file isdir tfad]
-    set result [expr $r1 && $r2 && $r3 ]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-#
-# Coverage tests for renamefile() ;
-#
-test fCmd-12.1 {renamefile: source filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    set result [catch {file rename ~/tfa1 tfa2}]
-    set env(HOME) $temp
-    set result
-} {1}
-
-test fCmd-12.2 {renamefile: src filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    set s [createfile tfa1]
-    file mkdir tfad
-    set result [catch {file rename tfa1 ~/tfa2 tfad}]
-    set env(HOME) $temp
-    file delete -force tfad
-    set result
-} {1}
-
-test fCmd-12.3 {renamefile: stat failing on source} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set r1 [catch {file rename tfa1 tfa2}]
-    expr {$r1 && ![file exists tfa1] && ![file exists tfa2]}
-} {1}
-
-test fCmd-12.4 {renamefile: error renaming file to directory} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s1 [createfile tfa ]
-    file mkdir tfad
-    file mkdir tfad/tfa
-    set r1 [catch {file rename tfa tfad}]
-    set r2 [checkcontent tfa $s1]
-    set r3 [file isdir tfad/tfa]
-    set result [expr $r1 && $r2 && $r3]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-12.5 {renamefile: error renaming directory to file} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa
-    file mkdir tfad
-    set s [createfile tfad/tfa]
-    set r1 [catch {file rename tfa tfad}]
-    set r2 [checkcontent tfad/tfa $s]
-    set r3 [file isdir tfad]
-    set r4 [file isdir tfa]
-    set result [expr $r1 && $r2 && $r3 && $r4 ]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-12.6 {renamefile: TclRenameFile succeeding} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set s [createfile tfa1]
-    file rename tfa1 tfa2
-    set result [expr [checkcontent tfa2 $s] && ![file exists tfa1]]
-    file delete tfa2
-    set result
-} {1}
-
-test fCmd-12.7 {renamefile: renaming directory into offspring} {notRoot} {
-    catch {file delete -force -- tfad}
-    file mkdir tfad
-    file mkdir tfad/dir
-    set result [catch {file rename tfad tfad/dir}]
-    file delete -force tfad 
-    set result
-} {1}
-
-test fCmd-12.8 {renamefile: generic error} {unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    file mkdir tfa/dir
-    exec chmod 555 tfa
-    set result [catch {file rename tfa/dir tfa2}]
-    exec chmod 777 tfa
-    file delete -force tfa
-    set result
-} {1}
-
-
-test fCmd-12.9 {renamefile: moving a file across volumes} {unixOnly notRoot} {
-    catch {file delete -force -- tfa /tmp/tfa}
-    set s [createfile tfa ]
-    file rename tfa /tmp
-    set result [expr [checkcontent /tmp/tfa $s] && ![file exists tfa]]
-    file delete /tmp/tfa
-    set result
-} {1}
-
-test fCmd-12.10 {renamefile: moving a directory across volumes } \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfad /tmp/tfad}
-    file mkdir tfad
-    set s [createfile tfad/a ]
-    file rename tfad /tmp
-    set restul [expr [checkcontent /tmp/tfad/a $s] && ![file exists tfad]]
-    file delete -force /tmp/tfad
-    set result
-} {1}
-
-#
-# Coverage tests for TclCopyFilesCmd()
-#
-test fCmd-13.1 {TclCopyFilesCmd: -force option} {notRoot} {
-    catch {file delete -force -- tfa1}
-    set s [createfile tfa1]
-    file copy -force  tfa1 tfa2
-    set result [expr [checkcontent tfa2 $s] && [checkcontent tfa1 $s]]
-    file delete tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-13.2 {TclCopyFilesCmd: -- option} {notRoot} {
-    catch {file delete -force -- tfa1}
-    set s [createfile -tfa1]
-    file copy --  -tfa1 tfa2
-    set result [expr [checkcontent tfa2 $s] &&  [checkcontent -tfa1 $s]]
-    file delete -- -tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-13.3 {TclCopyFilesCmd: bad option} {notRoot} {
-    catch {file delete -force -- tfa1}
-    set s [createfile tfa1]
-    set r1 [catch {file copy -x tfa1 tfa2}]
-    set result [expr $r1 && [checkcontent tfa1 $s] && ![file exists tfa2]]
-    file delete tfa1
-    set result
-} {1}
-
-test fCmd-13.4 {TclCopyFilesCmd: bad \# args} {notRoot} {
-    catch {file copy -- }
-} {1}
-
-test fCmd-13.5 {TclCopyFilesCmd: target filename translation failing} {
-     global env
-     set temp $env(HOME)
-    unset env(HOME)
-     set result [catch {file copy tfa ~/foobar }]
-     set env(HOME) $temp
-     set result
- } {1}
-
-test fCmd-13.6 {TclCopyFilesCmd: > 1 source & target is not a dir} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-    createfile tfa1 
-    createfile tfa2 
-    createfile tfa3 
-    set result [catch {file copy tfa1 tfa2 tfa3}]
-    file delete tfa1 tfa2 tfa3
-    set result
-} {1}
-
-test fCmd-13.7 {TclCopyFilesCmd: single file into directory} {notRoot} {
-    catch {file delete -force -- tfa1 tfad}
-    set s [createfile tfa1]
-    file mkdir tfad
-    file copy tfa1 tfad
-    set result [expr [checkcontent tfad/tfa1 $s] &&  [checkcontent tfa1 $s]]
-    file delete -force tfad tfa1
-    set result
-} {1}
-
-test fCmd-13.8 {TclCopyFilesCmd: multiple files into directory} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfad}
-    set s1 [createfile tfa1 ]
-    set s2 [createfile tfa2 ]
-    file mkdir tfad
-    file copy tfa1 tfa2 tfad
-    set r1 [checkcontent tfad/tfa1 $s1]
-    set r2 [checkcontent tfad/tfa2 $s2]
-    set r3 [checkcontent tfa1 $s1]
-    set r4 [checkcontent tfa2 $s2]
-    set result [expr $r1 && $r2 && $r3 && $r4 ]
-	    
-    file delete -force tfad tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-13.9 {TclCopyFilesCmd: error copying file to directory} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s [createfile tfa ]
-    file mkdir tfad
-    file mkdir tfad/tfa
-    set r1 [catch {file copy tfa tfad}]
-    set r2 [expr [checkcontent tfa $s] && [file isdir tfad/tfa]]
-    set r3 [file isdir tfad]
-    set result [expr $r1 && $r2 && $r3 ]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-#
-# Coverage tests for copyfile()
-# 
-test fCmd-14.1 {copyfile: source filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    set result [catch {file copy ~/tfa1 tfa2}]
-    set env(HOME) $temp
-    set result
-} {1}
-
-test fCmd-14.2 {copyfile: dst filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    set s [createfile tfa1]
-    file mkdir tfad
-    set r1 [catch {file copy tfa1 ~/tfa2 tfad}]
-    set result [expr $r1 && [checkcontent tfad/tfa1 $s]]
-    set env(HOME) $temp
-    file delete -force tfa1 tfad
-    set result
-} {1}
-
-test fCmd-14.3 {copyfile: stat failing on source} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set r1 [catch {file copy tfa1 tfa2}]
-    expr $r1 && ![file exists tfa1] && ![file exists tfa2]
-} {1}
-
-test fCmd-14.4 {copyfile: error copying file to directory} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s1 [createfile tfa ]
-    file mkdir tfad
-    file mkdir tfad/tfa
-    set r1 [catch {file copy tfa tfad}]
-    set r2 [checkcontent tfa $s1]
-    set r3 [file isdir tfad]
-    set r4 [file isdir tfad/tfa]
-    set result [expr $r1 && $r2 && $r3 && $r4 ]
-    file delete -force tfa tfad
-    set result
-} {1}
-
- test fCmd-14.5 {copyfile: error copying directory to file} {notRoot} {
-     catch {file delete -force -- tfa tfad}
-     file mkdir tfa
-     file mkdir tfad
-     set s [createfile tfad/tfa]
-     set r1 [catch {file copy tfa tfad}]
-     set r2 [checkcontent tfad/tfa $s]
-     set r3 [file isdir tfad]
-     set r4 [file isdir tfa]
-     set result [expr $r1 && $r2 && $r3 && $r4 ]
-     file delete -force tfa tfad
-     set result
-} {1}
-
-test fCmd-14.6 {copyfile: copy file succeeding} {notRoot} {
-    catch {file delete -force -- tfa tfa2}
-    set s [createfile tfa]
-    file copy tfa tfa2
-    set result [expr  [checkcontent tfa $s] && [checkcontent tfa2 $s]]
-    file delete tfa tfa2
-    set result
-} {1}
-
-test fCmd-14.7 {copyfile: copy directory succeeding} {notRoot} {
-    catch {file delete -force -- tfa tfa2}
-    file mkdir tfa
-    set s [createfile tfa/file]
-    file copy tfa tfa2
-    set result [expr [checkcontent tfa/file $s] && [checkcontent tfa2/file $s]]
-    file delete -force tfa tfa2
-    set result
-} {1}
-
-test fCmd-14.8 {copyfile: copy directory failing} {unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa/dir/a/b/c
-    exec chmod 000 tfa/dir
-    set r1 [catch {file copy tfa tfa2}]
-    exec chmod 777 tfa/dir
-    set result $r1
-    file delete -force tfa tfa2
-    set result
-} {1}
-
-#
-# Coverage tests for TclMkdirCmd()
-#
-test fCmd-15.1 {TclMakeDirsCmd: target filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME) 
-    set result [catch {file mkdir ~/tfa}]
-    set env(HOME) $temp
-    set result
-} {1}
-#
-# Can Tcl_SplitPath return argc == 0? If so them we need a
-# test for that code.
-#
-test fCmd-15.2 {TclMakeDirsCmd - one directory } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    set result [file isdirectory tfa]
-    file delete tfa
-    set result
-} {1}
-
-test fCmd-15.3 {TclMakeDirsCmd: - two directories} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    file mkdir tfa1 tfa2
-    set result [expr [file isdirectory tfa1] && [file isdirectory tfa2]]
-    file delete tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-15.4 {TclMakeDirsCmd - stat failing} {unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    createfile tfa/file
-    exec chmod 000 tfa
-    set result [catch {file mkdir tfa/file}]
-    exec chmod 777 tfa
-    file delete -force tfa
-    set result
-} {1}
-
-test fCmd-15.5 {TclMakeDirsCmd: - making a directory several levels deep} \
-	{notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa/a/b/c
-    set result [file isdir tfa/a/b/c]
-    file delete -force tfa
-    set result
-} {1}
-
-    
-test fCmd-15.6 {TclMakeDirsCmd: - trying to overwrite a file} {notRoot} {
-    catch {file delete -force -- tfa}
-    set s [createfile tfa]
-    set r1 [catch {file mkdir tfa}]
-    set r2 [file isdir tfa]
-    set r3 [file exists tfa]
-    set result [expr $r1 && !$r2 && $r3 && [checkcontent tfa $s]]
-    file delete tfa
-    set result
-} {1}
-
-test fCmd-15.7 {TclMakeDirsCmd - making several directories} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    file mkdir tfa1 tfa2/a/b/c
-    set result [expr [file isdir tfa1] && [file isdir tfa2/a/b/c]]
-    file delete -force tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-15.8 {TclFileMakeDirsCmd: trying to create an existing dir} {notRoot} {
-    file mkdir tfa
-    file mkdir tfa
-    set result [file isdir tfa]
-    file delete tfa
-    set result
-} {1}
-
-
-# Coverage tests for TclDeleteFilesCommand()
-test fCmd-16.1 { test the -- argument } {notRoot} {
-    catch {file delete -force -- tfa}
-    createfile tfa
-    file delete -- tfa
-    file exists tfa
-} {0}
-
-test fCmd-16.2 { test the -force and -- arguments } {notRoot} {
-    catch {file delete -force -- tfa}
-    createfile tfa
-    file delete -force -- tfa
-    file exists tfa
-} {0}
-
-test fCmd-16.3 { test bad option } {notRoot} {
-    catch {file delete -force -- tfa}
-    createfile tfa
-    set result [catch {file delete -dog tfa}]
-    file delete tfa
-    set result
-} {1}
-
-test fCmd-16.4 { test not enough args } {notRoot} {
-    catch {file delete}
-} {1}
-
-test fCmd-16.5 { test not enough args with options } {notRoot} {
-    catch {file delete --}
-} {1}
-
-test fCmd-16.6 {delete: source filename translation failing} {notRoot} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    set result [catch {file delete ~/tfa}]
-    set env(HOME) $temp
-    set result
-} {1}
-
-test fCmd-16.7 {remove a non-empty directory without -force } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    createfile tfa/a
-    set result [catch  {file delete tfa }]
-    file delete -force tfa
-    set result
-} {1}
-
-test fCmd-16.8 {remove a normal file } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    createfile tfa/a
-    set result [catch  {file delete tfa }]
-    file delete -force tfa
-    set result
-} {1}
-
-test fCmd-16.9 {error while deleting file } {unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    createfile tfa/a
-    exec chmod 555 tfa
-    set result [catch  {file delete tfa/a }]
-    #######
-    #######  If any directory in a tree that is being removed does not 
-    #######  have write permission, the process will fail!
-    #######  This is also the case with "rm -rf"
-    #######
-    exec chmod 777 tfa
-    file delete -force tfa
-    set result
-} {1}
-
-test fCmd-16.10 {deleting multiple files} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    createfile tfa1
-    createfile tfa2
-    file delete tfa1 tfa2
-    expr ![file exists tfa1] && ![file exists tfa2]
-} {1}
-
-test fCmd-16.11 { TclFileDeleteCmd: removing a nonexistant file} {notRoot} {
-    catch {file delete -force -- tfa}
-    file delete tfa
-    set result 1
-} {1}
-
-# More coverage tests for mkpath()
- test fCmd-17.1 {mkdir stat failing on target but not ENOENT} {unixOnly notRoot} {
-     catch {file delete -force -- tfa1}
-     file mkdir tfa1
-     exec chmod 555 tfa1
-     set result [catch {file mkdir tfa1/tfa2}]
-     exec chmod 777 tfa1
-     file delete -force tfa1
-     set result
-} {1}
-
-test fCmd-17.2 {mkdir several levels deep - relative } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa/a/b
-    set result [file isdir tfa/a/b ]
-    file delete tfa/a/b tfa/a tfa
-    set result
-} {1}
-
-test fCmd-17.3 {mkdir several levels deep - absolute } {notRoot} {
-    catch {file delete -force -- tfa}
-    set f [file join [pwd] tfa a ]
-    file mkdir $f
-    set result [file isdir $f ]
-    file delete $f [file join [pwd] tfa]
-    set result
-} {1}
-
-#
-# Functionality tests for TclFileRenameCmd()
-#
-
-test fCmd-18.1 {TclFileRenameCmd: rename (first form) in the same directory} \
-	{notRoot} {
-    catch {file delete -force -- tfad}
-    file mkdir tfad/dir
-    cd tfad/dir
-    set s [createfile foo ]
-    file rename  foo bar
-    file rename bar ./foo
-    file rename ./foo bar
-    file rename ./bar ./foo
-    file rename foo ../dir/bar
-    file rename ../dir/bar ./foo
-    file rename ../../tfad/dir/foo ../../tfad/dir/bar
-    file rename [file join [pwd] bar] foo
-    file rename foo [file join [pwd] bar]
-    set result [expr [checkcontent bar $s] && ![file exists foo]]
-    cd ../..
-    file delete -force tfad
-    set result
-} {1}
-
-test fCmd-18.2 {TclFileRenameCmd: single dir to nonexistant} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    file mkdir tfa1
-    file rename tfa1 tfa2
-    set result [expr [file exists tfa2] && ![file exists tfa1]]
-    file delete tfa2
-    set result
-} {1}
-
-test fCmd-18.3 {TclFileRenameCmd: mixed dirs and files into directory} {notRoot} {
-    catch {file delete -force -- tfa1 tfad1 tfad2}
-    set s [createfile tfa1 ]
-    file mkdir tfad1 tfad2
-    file rename tfa1 tfad1 tfad2
-    set r1 [checkcontent  tfad2/tfa1 $s]
-    set r2 [file isdir tfad2/tfad1]
-    set result [expr $r1 && $r2 && ![file exists tfa1] && ![file exists tfad1]]
-    file delete tfad2/tfa1
-    file delete -force tfad2
-    set result
-} {1}
-
-test fCmd-18.4 {TclFileRenameCmd: attempt to replace non-dir with dir} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s [createfile tfa ]
-    file mkdir tfad
-    set r1 [catch {file rename tfad tfa}]
-    set r2 [checkcontent tfa $s]
-    set r3 [file isdir tfad]
-    set result [expr $r1 && $r2 && $r3 ]
-    file delete tfa tfad
-    set result
-} {1}
-
-test fCmd-18.5 {TclFileRenameCmd: attempt to replace dir with non-dir} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    set s [createfile tfa ]
-    file mkdir tfad/tfa
-    set r1 [catch {file rename tfa tfad}]
-    set r2 [checkcontent tfa $s]
-    set r3 [file isdir tfad/tfa]
-    set result [expr $r1 && $r2 && $r3 ]
-    file delete -force  tfa tfad
-    set result
-} {1}
-
-#
-# On Windows there is no easy way to determine if two files are the same
-#
-test fCmd-18.6 {TclFileRenameCmd: rename a file to itself} {macOrUnix notRoot} {
-    catch {file delete -force -- tfa}
-    set s [createfile tfa]
-    set r1 [catch {file rename tfa tfa}]
-    set result [expr $r1 && [checkcontent tfa $s]]
-    file delete tfa
-    set result
-} {1}
-
-test fCmd-18.7 {TclFileRenameCmd: rename dir on top of another empty dir w/o -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa tfad/tfa
-    set r1 [catch {file rename tfa tfad}]
-    set result [expr $r1 && [file isdir tfa]]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-18.8 {TclFileRenameCmd: rename dir on top of another empty dir w/ -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa tfad/tfa
-    file rename -force tfa tfad
-    set result [expr ![file isdir tfa]]
-    file delete -force tfad
-    set result
-} {1}
-
-test fCmd-18.9 {TclFileRenameCmd: rename dir on top of a non-empty dir w/o -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa tfad/tfa/file
-    set r1 [catch {file rename tfa tfad}]
-    set result [expr $r1 && [file isdir tfa] && [file isdir tfad/tfa/file]]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-18.10 {TclFileRenameCmd: rename dir on top of a non-empty dir w/ -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa tfad/tfa/file
-    set r1 [catch {file rename -force tfa tfad}]
-    set result [expr $r1 && [file isdir tfa] && [file isdir tfad/tfa/file]]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-18.11 {TclFileRenameCmd: rename a non-existant file} {notRoot} {
-    catch {file delete -force -- tfa1}
-    set r1 [catch {file rename tfa1 tfa2}]
-    set result [expr $r1 && ![file exists tfa1] && ![file exists tfa2]]
-} {1}
-
-test fCmd-18.12 {TclFileRenameCmd : rename a symbolic link to file} \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-	
-    set s [createfile tfa1]
-    exec ln -s tfa1 tfa2
-    file rename tfa2 tfa3
-    set t [file type tfa3]
-    set result [expr { $t == "link" }]
-    file delete tfa1 tfa3
-    set result
-} {1}
-
-test fCmd-18.13 {TclFileRenameCmd : rename a symbolic link to dir} \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-	
-    file mkdir tfa1
-    exec ln -s tfa1 tfa2
-    file rename tfa2 tfa3
-    set t [file type tfa3]
-    set result [expr { $t == "link" }]
-    file delete tfa1 tfa3
-    set result
-} {1}
-
-test fCmd-18.14 {TclFileRenameCmd : rename a path with sym link} \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-	
-    file mkdir tfa1/a/b/c/d
-    file mkdir tfa2
-    set f [file join [pwd] tfa1/a/b] 
-    set f2 [file join [pwd] {tfa2/b alias}]
-    exec ln -s $f $f2
-    file rename {tfa2/b alias/c} tfa3
-    set r1 [file isdir tfa3]
-    set r2 [file exists tfa1/a/b/c]
-    set result [expr $r1 && !$r2]
-    file delete -force tfa1 tfa2 tfa3
-    set result
-} {1}
-
-test fCmd-18.15 {TclFileRenameCmd : rename a file to a symlink dir} \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfalink}
-	
-    file mkdir tfa1
-    set s [createfile tfa2]
-    exec ln -s tfa1 tfalink
-
-    file rename tfa2 tfalink
-    set result [checkcontent tfa1/tfa2 $s ]
-    file delete -force tfa1 tfalink
-    set result
-} {1}
-
-test fCmd-18.16 {TclFileRenameCmd: rename a dangling symlink} {unixOnly notRoot} {
-    catch {file delete -force -- tfa1 tfalink}
-	
-    file mkdir tfa1
-    exec ln -s tfa1 tfalink
-    file delete tfa1 
-    file rename tfalink tfa2
-    set result [expr [string compare [file type tfa2] "link"] == 0]
-    file delete tfa2
-    set result
-} {1}
-
-
-#
-# Coverage tests for TclUnixRmdir
-#
-test fCmd-19.1 { remove empty directory } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    file delete tfa
-    file exists tfa
-} {0}
-
-test fCmd-19.2 { rmdir error besides EEXIST} {unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    file mkdir tfa/a
-    exec chmod 555 tfa
-    set result [catch {file delete tfa/a}]
-    exec chmod 777 tfa
-    file delete -force tfa
-    set result
-} {1}
-
-test fCmd-19.3 { recursive remove } {notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    file mkdir tfa/a
-    file delete -force tfa
-    file exists tfa
-} {0}
-
-#
-# TclUnixDeleteFile and TraversalDelete are covered by tests from the 
-# TclDeleteFilesCmd suite
-#
-#
-
-#
-# Coverage tests for TraverseUnixTree(), called from TclDeleteFilesCmd
-#
-
-test fCmd-20.1 {TraverseUnixTree : failure opening a subdirectory directory } \
-	{unixOnly notRoot} {
-    catch {file delete -force -- tfa}
-    file mkdir tfa
-    file mkdir tfa/a
-    exec chmod 000 tfa/a
-    set result [catch {file delete -force tfa}]
-    exec chmod 777 tfa/a
-    file delete -force tfa
-    set result
-} {1}
-
-
-#
-# Feature testing for TclCopyFilesCmd
-# 
-test fCmd-21.1 {copy : single file to nonexistant } {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set s [createfile tfa1]
-    file copy tfa1 tfa2
-    set result [expr [checkcontent tfa2 $s] && [checkcontent tfa1 $s]]
-    file delete tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-21.2 {copy : single dir to nonexistant } {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    file mkdir tfa1
-    file copy tfa1 tfa2
-    set result [expr [file isdir tfa2] && [file isdir tfa1]]
-    file delete tfa1 tfa2
-    set result
-} {1}
-
-test fCmd-21.3 {copy : single file into directory  } {notRoot} {
-    catch {file delete -force -- tfa1 tfad}
-    set s [createfile tfa1]
-    file mkdir tfad
-    file copy tfa1 tfad
-    set result [expr [checkcontent tfad/tfa1 $s] && [checkcontent tfa1 $s]]
-    file delete -force tfa1 tfad
-    set result
-} {1}
-
-test fCmd-21.4 {copy : more than one source and target is not a directory} \
-	{notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfa3}
-    createfile tfa1 
-    createfile tfa2 
-    createfile tfa3 
-    set result [catch {file copy tfa1 tfa2 tfa3}]
-    file delete tfa1 tfa2 tfa3
-    set result
-} {1}
-
-test fCmd-21.5 {copy : multiple files into directory  } {notRoot} {
-    catch {file delete -force -- tfa1 tfa2 tfad}
-    set s1 [createfile tfa1 ]
-    set s2 [createfile tfa2 ]
-    file mkdir tfad
-    file copy tfa1 tfa2 tfad
-    set r1 [checkcontent tfad/tfa1 $s1]
-    set r2 [checkcontent tfad/tfa2 $s2]
-    set r3 [checkcontent tfa1 $s1]
-    set r4 [checkcontent tfa2 $s2]
-    set result [expr $r1 && $r2 && $r3 && $r4]
-    file delete -force tfa1 tfa2 tfad
-    set result
-} {1}
-
-test fCmd-21.6 {copy: mixed dirs and files into directory} \
-	{notRoot notFileSharing} {
-    catch {file delete -force -- tfa1 tfad1 tfad2}
-    set s [createfile tfa1 ]
-    file mkdir tfad1 tfad2
-    file copy tfa1 tfad1 tfad2
-    set r1 [checkcontent [file join tfad2 tfa1] $s]
-    set r2 [file isdir [file join tfad2 tfad1]]
-    set r3 [checkcontent tfa1 $s]
-    set result [expr $r1 && $r2 && $r3 && [file isdir tfad1]]
-    file delete -force tfa1 tfad1 tfad2
-    set result
-} {1}
-
-test fCmd-21.7 {TclCopyFilesCmd: copy a dangling link} {unixOnly notRoot} {
-    file mkdir tfad1
-    exec ln -s tfad1 tfalink
-    file delete tfad1
-    file copy tfalink tfalink2
-    set result [string match [file type tfalink2] link]
-    file delete tfalink tfalink2 
-    set result
-} {1}
-
-test fCmd-21.8 {TclCopyFilesCmd : copy a link } {unixOnly notRoot} {
-    file mkdir tfad1
-    exec ln -s tfad1 tfalink
-    file copy tfalink tfalink2
-    set r1 [file type tfalink]
-    set r2 [file type tfalink2]
-    set r3 [file isdir tfad1]
-    set result [expr {("$r1" == "link" ) && ("$r2" == "link" ) && $r3}]
-    file delete tfad1 tfalink tfalink2
-    set result
-} {1}
-
-test fCmd-21.9 {TclCopyFilesCmd: copy dir with a link in it} {unixOnly notRoot} {
-    file mkdir tfad1
-    exec ln -s "[pwd]/tfad1" tfad1/tfalink
-    file copy tfad1 tfad2
-    set result [string match [file type tfad2/tfalink] link]
-    file delete -force tfad1 tfad2
-    set result
-} {1}
-
-test fCmd-21.10 {TclFileCopyCmd: copy dir on top of another empty dir w/o -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa [file join tfad tfa]
-    set r1 [catch {file copy tfa tfad}]
-    set result [expr $r1 && [file isdir tfa]]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-21.11 {TclFileCopyCmd: copy dir on top of a dir w/o -force} {notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa [file join tfad tfa file]
-    set r1 [catch {file copy tfa tfad}]
-    set result [expr $r1 && [file isdir tfa] && [file isdir [file join tfad tfa file]]]
-    file delete -force tfa tfad
-    set result
-} {1}
-
-test fCmd-21.12 {TclFileCopyCmd: copy dir on top of a non-empty dir w/ -force} \
-	{notRoot} {
-    catch {file delete -force -- tfa tfad}
-    file mkdir tfa [file join tfad tfa file]
-    set r1 [catch {file copy -force tfa tfad}]
-    set result [expr $r1 && [file isdir tfa] && [file isdir [file join tfad tfa file]]]
-    file delete -force tfa tfad
-    set result
-} {1}
-   
-#
-# Coverage testing for TclpRenameFile
-#
-test fCmd-22.1 {TclpRenameFile: rename and overwrite in a single dir} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set s [createfile tfa1]
-    set s2 [createfile tfa2 q]
-	
-    set r1 [catch {rename tfa1 tfa2}]
-    file rename -force tfa1 tfa2
-    set result [expr $r1 && [checkcontent tfa2 $s]]
-    file delete [glob tfa1 tfa2]
-    set result
-} {1}
-
-test fCmd-22.2 {TclpRenameFile: attempt to overwrite itself} {macOrUnix notRoot} {
-    catch {file delete -force -- tfa1}
-    set s [createfile tfa1]	
-    file rename -force tfa1 tfa1
-    set result [checkcontent tfa1 $s]
-    file delete tfa1 
-    set result
-} {1}
-
-test fCmd-22.3 { TclpRenameFile : rename dir to existing dir } {notRoot} {
-    catch {file delete -force -- d1 tfad}
-    file mkdir d1 [file join tfad d1]
-    set r1 [catch {file rename d1 tfad}]
-    set result [expr $r1 && [file isdir d1] && [file isdir [file join tfad d1]]]
-    file delete -force d1 tfad
-    set result
-} {1}
-
-test fCmd-22.4 {TclpRenameFile: rename dir to dir several levels deep} {notRoot} {
-    catch {file delete -force -- d1 tfad}
-    file mkdir d1 [file join tfad a b c]
-    file rename d1 [file join tfad a b c d1]
-    set result [expr ![file isdir d1] && [file isdir [file join tfad a b c d1]]]
-    file delete -force [glob d1 tfad]
-    set result
-} {1}
-
-
-#
-# TclMacCopyFile needs to be redone.
-#
-test fCmd-22.5 {TclMacCopyFile: copy and overwrite in a single dir} {notRoot} {
-    catch {file delete -force -- tfa1 tfa2}
-    set s [createfile tfa1]
-    set s2 [createfile tfa2 q]
-
-    set r1 [catch {file copy tfa1 tfa2}]
-    file copy -force tfa1 tfa2
-    set result [expr $r1 && [checkcontent tfa2 $s] && [checkcontent tfa1 $s]]
-    file delete tfa1 tfa2
-    set result
-} {1}
-
-#
-# TclMacMkdir - basic cases are covered elsewhere.
-# Error cases are not covered.
-#
-
-#
-# TclMacRmdir
-# Error cases are not covered.
-#
-
-test fCmd-23.1 {TclMacRmdir: trying to remove a nonempty directory} {notRoot} {
-    catch {file delete -force -- tfad}
-	
-    file mkdir [file join tfad dir]
-	
-    set result [catch {file delete tfad}]
-    file delete -force tfad 
-    set result
-} {1}
-
-#
-# TclMacDeleteFile	
-# Error cases are not covered.
-#
-test fCmd-24.1 {TclMacDeleteFile: deleting a normal file} {notRoot} {
-    catch {file delete -force -- tfa1}
-	
-    createfile tfa1
-    file delete tfa1
-    file exists tfa1
-} {0}
-
-#
-# TclMacCopyDirectory
-# Error cases are not covered.
-#
-test fCmd-25.1 { TclMacCopyDirectory : copying a normal directory} \
-	{notRoot notFileSharing} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir [file join tfad1 a b c]
-    file copy tfad1 tfad2
-    set result [expr [file isdir [file join tfad1 a b c]] && [file isdir [file join tfad2 a b c]]]
-    file delete -force tfad1 tfad2
-    set result
-} {1}
-
-test fCmd-25.2 { TclMacCopyDirectory : copying a short path normal directory} \
-	{notRoot notFileSharing} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir tfad1
-    file copy tfad1 tfad2
-    set result [expr [file isdir tfad1] && [file isdir tfad2]]
-    file delete tfad1 tfad2
-    set result
-} {1}
-
-test fCmd-25.3 { TclMacCopyDirectory : copying dirs between different dirs} \
-	{notRoot notFileSharing} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir [file join tfad1 x y z]
-    file mkdir [file join tfad2 dir]
-    file copy tfad1 [file join tfad2 dir]
-    set result [expr [file isdir [file join tfad1 x y z]] && [file isdir [file join tfad2 dir tfad1 x y z]]]
-    file delete -force tfad1 tfad2
-    set result
-} {1}
-
-#
-# Functionality tests for TclDeleteFilesCmd
-#
-
-test fCmd-26.1 { TclDeleteFilesCmd : delete symlink} {unixOnly notRoot} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir tfad1
-    exec ln -s tfad1 tfalink
-    file delete tfalink
-
-    set r1 [file isdir tfad1]
-    set r2 [file exists tfalink]
-    
-    set result [expr $r1 && !$r2]
-    file delete tfad1
-    set result
-} {1}
-
-test fCmd-26.2 { TclDeleteFilesCmd : delete dir with symlink} {unixOnly notRoot} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir tfad1
-    file mkdir tfad2
-    exec ln -s tfad1 [file join tfad2 link]
-    file delete -force tfad2
-
-    set r1 [file isdir tfad1]
-    set r2 [file exists tfad2]
-    
-    set result [expr $r1 && !$r2]
-    file delete tfad1
-    set result
-} {1}
-
-test fCmd-26.3 { TclDeleteFilesCmd : delete dangling symlink} {unixOnly notRoot} {
-    catch {file delete -force -- tfad1 tfad2}
-		
-    file mkdir tfad1
-    exec ln -s tfad1 tfad2
-    file delete tfad1
-    file delete tfad2
-
-    set r1 [file exists tfad1]
-    set r2 [file exists tfad2]
-    
-    set result [expr !$r1 && !$r2]
-    set result
-} {1}
-
-test fCmd-27.2 {TclFileAttrsCmd - Tcl_TranslateFileName fails} {
-    testsetplatform unix
-    list [catch {file attributes ~_bad_user} msg] $msg [testsetplatform $platform]
-} {1 {user "_bad_user" doesn't exist} {}}
-test fCmd-27.3 {TclFileAttrsCmd - all attributes} {
-    catch {file delete -force -- foo.tmp}
-    createfile foo.tmp
-    list [catch {file attributes foo.tmp} msg] [expr {[llength $msg] > 0}] [file delete -force -- foo.tmp]
-} {0 1 {}}
-test fCmd-27.4 {TclFileAttrsCmd - getting one option} {
-    catch {file delete -force -- foo.tmp}
-    createfile foo.tmp
-    set attrs [file attributes foo.tmp]
-    list [catch {eval file attributes foo.tmp [lindex $attrs 0]}] [file delete -force -- foo.tmp]
-} {0 {}}
-
-# Find a group that exists on this Unix system, or else skip tests that
-# require Unix groups.
-if {$tcl_platform(platform) == "unix"} {
-    set ::tcltest::testConfig(foundGroup) 0
-    catch {
-	set groupList [exec groups]
-	set group [lindex $groupList 0]
-	set ::tcltest::testConfig(foundGroup) 1
-    }
-} else {
-    set ::tcltest::testConfig(foundGroup) 1
-}
-
-test fCmd-27.5 {TclFileAttrsCmd - setting one option} {foundGroup} {
-    catch {file delete -force -- foo.tmp}
-    createfile foo.tmp
-    set attrs [file attributes foo.tmp]
-    list [catch {eval file attributes foo.tmp [lrange $attrs 0 1]} msg] $msg [file delete -force -- foo.tmp]
-} {0 {} {}}
-test fCmd-27.6 {TclFileAttrsCmd - setting more than one option} {foundGroup} {
-    catch {file delete -force -- foo.tmp}
-    createfile foo.tmp
-    set attrs [file attributes foo.tmp]
-    list [catch {eval file attributes foo.tmp [lrange $attrs 0 3]} msg] $msg [file delete -force -- foo.tmp]
-} {0 {} {}}
-
-# cleanup
-cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/fileName.test b/tests/fileName.test
deleted file mode 100644
index 426fd10..0000000
--- a/tests/fileName.test
+++ /dev/null
@@ -1,1429 +0,0 @@
-# This file tests the filename manipulation routines.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: fileName.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testsetplatform] == {}} {
-    puts "This application hasn't been compiled with the \"testsetplatform\""
-    puts "command, so I can't test the filename conversion procedures."
-    ::tcltest::cleanupTests
-    return 
-} 
-
-global env
-set platform [testgetplatform]
-
-test filename-1.1 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype /
-} absolute
-test filename-1.2 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype /foo
-} absolute
-test filename-1.3 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype foo
-} relative
-test filename-1.4 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype c:/foo
-} relative
-test filename-1.5 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype ~
-} absolute
-test filename-1.6 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype ~/foo
-} absolute
-test filename-1.7 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype ~foo
-} absolute
-test filename-1.8 {Tcl_GetPathType: unix} {
-    testsetplatform unix
-    file pathtype ./~foo
-} relative
-
-test filename-2.1 {Tcl_GetPathType: mac, denerate names} {
-    testsetplatform mac
-    file pathtype /
-} relative
-test filename-2.2 {Tcl_GetPathType: mac, denerate names} {
-    testsetplatform mac
-    file pathtype /.
-} relative
-test filename-2.3 {Tcl_GetPathType: mac, denerate names} {
-    testsetplatform mac
-    file pathtype /..
-} relative
-test filename-2.4 {Tcl_GetPathType: mac, denerate names} {
-    testsetplatform mac
-    file pathtype //.//
-} relative
-test filename-2.5 {Tcl_GetPathType: mac, denerate names} {
-    testsetplatform mac
-    file pathtype //.//../.
-} relative
-test filename-2.6 {Tcl_GetPathType: mac, tilde names} {
-    testsetplatform mac
-    file pathtype ~
-} absolute
-test filename-2.7 {Tcl_GetPathType: mac, tilde names} {
-    testsetplatform mac
-    file pathtype ~:
-} absolute
-test filename-2.8 {Tcl_GetPathType: mac, tilde names} {
-    testsetplatform mac
-    file pathtype ~:foo
-} absolute
-test filename-2.9 {Tcl_GetPathType: mac, tilde names} {
-    testsetplatform mac
-    file pathtype ~/
-} absolute
-test filename-2.10 {Tcl_GetPathType: mac, tilde names} {
-    testsetplatform mac
-    file pathtype ~/foo
-} absolute
-test filename-2.11 {Tcl_GetPathType: mac, unix-style names} {
-    testsetplatform mac
-    file pathtype /foo
-} absolute
-test filename-2.12 {Tcl_GetPathType: mac, unix-style names} {
-    testsetplatform mac
-    file pathtype /./foo
-} absolute
-test filename-2.13 {Tcl_GetPathType: mac, unix-style names} {
-    testsetplatform mac
-    file pathtype /..//./foo
-} absolute
-test filename-2.14 {Tcl_GetPathType: mac, unix-style names} {
-    testsetplatform mac
-    file pathtype /foo/bar
-} absolute
-test filename-2.15 {Tcl_GetPathType: mac, unix-style names} {
-    testsetplatform mac
-    file pathtype foo/bar
-} relative
-test filename-2.16 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype :
-} relative
-test filename-2.17 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype :foo
-} relative
-test filename-2.18 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype foo:
-} absolute
-test filename-2.19 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype foo:bar
-} absolute
-test filename-2.20 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype :foo:bar
-} relative
-test filename-2.21 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype ::foo:bar
-} relative
-test filename-2.22 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype ~foo
-} absolute
-test filename-2.23 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype :~foo
-} relative
-test filename-2.24 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype ~foo:
-} absolute
-test filename-2.25 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype foo/bar:
-} absolute
-test filename-2.26 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype /foo:
-} absolute
-test filename-2.27 {Tcl_GetPathType: mac, mac-style names} {
-    testsetplatform mac
-    file pathtype foo
-} relative
-
-test filename-3.1 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype /
-} volumerelative
-test filename-3.2 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype \\
-} volumerelative
-test filename-3.3 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype /foo
-} volumerelative
-test filename-3.4 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype \\foo
-} volumerelative
-test filename-3.5 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:/
-} absolute
-test filename-3.6 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:\\
-} absolute
-test filename-3.7 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:/foo
-} absolute
-test filename-3.8 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:\\foo
-} absolute
-test filename-3.9 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:
-} volumerelative
-test filename-3.10 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype c:foo
-} volumerelative
-test filename-3.11 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype foo
-} relative
-test filename-3.12 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype //foo/bar
-} absolute
-test filename-3.13 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype ~foo
-} absolute
-test filename-3.14 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype ~
-} absolute
-test filename-3.15 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype ~/foo
-} absolute
-test filename-3.16 {Tcl_GetPathType: windows} {
-    testsetplatform windows
-    file pathtype ./~foo
-} relative
-
-test filename-4.1 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split /
-} {/}
-test filename-4.2 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split /foo
-} {/ foo}
-test filename-4.3 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split /foo/bar
-} {/ foo bar}
-test filename-4.4 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split /foo/bar/baz
-} {/ foo bar baz}
-test filename-4.5 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split foo/bar
-} {foo bar}
-test filename-4.6 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ./foo/bar
-} {. foo bar}
-test filename-4.7 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split /foo/../././foo/bar
-} {/ foo .. . . foo bar}
-test filename-4.8 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ../foo/bar
-} {.. foo bar}
-test filename-4.9 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split {}
-} {}
-test filename-4.10 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split .
-} {.}
-test filename-4.11 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ../
-} {..}
-test filename-4.12 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ../..
-} {.. ..}
-test filename-4.13 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split //foo
-} {/ foo}
-test filename-4.14 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split foo//bar
-} {foo bar}
-test filename-4.15 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ~foo
-} {~foo}
-test filename-4.16 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ~foo/~bar
-} {~foo ./~bar}
-test filename-4.17 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split ~foo/~bar/~baz
-} {~foo ./~bar ./~baz}
-test filename-4.18 {Tcl_SplitPath: unix} {
-    testsetplatform unix
-    file split foo/bar~/baz
-} {foo bar~ baz}
-
-test filename-5.1 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:b
-} {a: b}
-test filename-5.2 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:b:c
-} {a: b c}
-test filename-5.3 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:b:c:
-} {a: b c}
-test filename-5.4 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:
-} {a:}
-test filename-5.5 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a::
-} {a: ::}
-test filename-5.6 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:::
-} {a: :: ::}
-test filename-5.7 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split :a
-} {a}
-test filename-5.8 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split :a::
-} {a ::}
-test filename-5.9 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split :
-} {:}
-test filename-5.10 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ::
-} {::}
-test filename-5.11 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split :::
-} {:: ::}
-test filename-5.12 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:::b
-} {a: :: :: b}
-test filename-5.13 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /a:b
-} {/a: b}
-test filename-5.14 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~:
-} {~:}
-test filename-5.15 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~/:
-} {~/:}
-test filename-5.16 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~:foo
-} {~: foo}
-test filename-5.17 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~/foo
-} {~: foo}
-test filename-5.18 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~foo:
-} {~foo:}
-test filename-5.19 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:~foo
-} {a: :~foo}
-test filename-5.20 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /
-} {:/}
-test filename-5.21 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a:b/c
-} {a: :b/c}
-test filename-5.22 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /foo
-} {foo:}
-test filename-5.23 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /a/b
-} {a: b}
-test filename-5.24 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /a/b/foo
-} {a: b foo}
-test filename-5.25 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a/b
-} {a b}
-test filename-5.26 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ./foo/bar
-} {: foo bar}
-test filename-5.27 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ../foo/bar
-} {:: foo bar}
-test filename-5.28 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split {}
-} {}
-test filename-5.29 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split .
-} {:}
-test filename-5.30 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ././
-} {: :}
-test filename-5.31 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ././.
-} {: : :}
-test filename-5.32 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ../
-} {::}
-test filename-5.33 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ..
-} {::}
-test filename-5.34 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ../..
-} {:: ::}
-test filename-5.35 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split //foo
-} {foo:}
-test filename-5.36 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split foo//bar
-} {foo bar}
-test filename-5.37 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~foo
-} {~foo:}
-test filename-5.38 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~
-} {~:}
-test filename-5.39 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split foo
-} {foo}
-test filename-5.40 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~/
-} {~:}
-test filename-5.41 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~foo/~bar
-} {~foo: :~bar}
-test filename-5.42 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split ~foo/~bar/~baz
-} {~foo: :~bar :~baz}
-test filename-5.43 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split foo/bar~/baz
-} {foo bar~ baz}
-test filename-5.44 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a/../b
-} {a :: b}
-test filename-5.45 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a/../../b
-} {a :: :: b}
-test filename-5.46 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split a/.././../b
-} {a :: : :: b}
-test filename-5.47 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /../bar
-} {bar:}
-test filename-5.48 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /./bar
-} {bar:}
-test filename-5.49 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split //.//.././bar
-} {bar:}
-test filename-5.50 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split /..
-} {:/..}
-test filename-5.51 {Tcl_SplitPath: mac} {
-    testsetplatform mac
-    file split //.//.././
-} {://.//.././}
-
-test filename-6.1 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /
-} {/}
-test filename-6.2 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /foo
-} {/ foo}
-test filename-6.3 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /foo/bar
-} {/ foo bar}
-test filename-6.4 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /foo/bar/baz
-} {/ foo bar baz}
-test filename-6.5 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split foo/bar
-} {foo bar}
-test filename-6.6 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ./foo/bar
-} {. foo bar}
-test filename-6.7 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /foo/../././foo/bar
-} {/ foo .. . . foo bar}
-test filename-6.8 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ../foo/bar
-} {.. foo bar}
-test filename-6.9 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split {}
-} {}
-test filename-6.10 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split .
-} {.}
-test filename-6.11 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ../
-} {..}
-test filename-6.12 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ../..
-} {.. ..}
-test filename-6.13 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split //foo
-} {/ foo}
-test filename-6.14 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split foo//bar
-} {foo bar}
-test filename-6.15 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /\\/foo//bar
-} {//foo/bar}
-test filename-6.16 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /\\/foo//bar
-} {//foo/bar}
-test filename-6.17 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split /\\/foo//bar
-} {//foo/bar}
-test filename-6.18 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split \\\\foo\\bar
-} {//foo/bar}
-test filename-6.19 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split \\\\foo\\bar/baz
-} {//foo/bar baz}
-test filename-6.20 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:/foo
-} {c:/ foo}
-test filename-6.21 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:foo
-} {c: foo}
-test filename-6.22 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:
-} {c:}
-test filename-6.23 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:\\
-} {c:/}
-test filename-6.24 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:/
-} {c:/}
-test filename-6.25 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:/./..
-} {c:/ . ..}
-test filename-6.26 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ~foo
-} {~foo}
-test filename-6.27 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ~foo/~bar
-} {~foo ./~bar}
-test filename-6.28 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split ~foo/~bar/~baz
-} {~foo ./~bar ./~baz}
-test filename-6.29 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split foo/bar~/baz
-} {foo bar~ baz}
-test filename-6.30 {Tcl_SplitPath: win} {
-    testsetplatform win
-    file split c:~foo
-} {c: ./~foo}
-
-test filename-7.1 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join / a
-} {/a}
-test filename-7.2 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join a b
-} {a/b}
-test filename-7.3 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /a c /b d
-} {/b/d}
-test filename-7.4 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /
-} {/}
-test filename-7.5 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join a
-} {a}
-test filename-7.6 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join {}
-} {}
-test filename-7.7 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /a/ b
-} {/a/b}
-test filename-7.8 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /a// b
-} {/a/b}
-test filename-7.9 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /a/./../. b
-} {/a/./.././b}
-test filename-7.10 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join ~ a
-} {~/a}
-test filename-7.11 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join ~a ~b
-} {~b}
-test filename-7.12 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join ./~a b
-} {./~a/b}
-test filename-7.13 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join ./~a ~b
-} {~b}
-test filename-7.14 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join ./~a ./~b
-} {./~a/~b}
-test filename-7.15 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join a . b
-} {a/./b}
-test filename-7.16 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join a . ./~b
-} {a/./~b}
-test filename-7.17 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join //a b
-} {/a/b}
-test filename-7.18 {Tcl_JoinPath: unix} {
-    testsetplatform unix
-    file join /// a b
-} {/a/b}
-
-test filename-8.1 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a b
-} {:a:b}
-test filename-8.2 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join :a b
-} {:a:b}
-test filename-8.3 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a b:
-} {b:}
-test filename-8.4 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a: :b
-} {a:b}
-test filename-8.5 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a: :b:
-} {a:b}
-test filename-8.6 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a :: b
-} {:a::b}
-test filename-8.7 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a :: :: b
-} {:a:::b}
-test filename-8.8 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a ::: b
-} {:a:::b}
-test filename-8.9 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a: b:
-} {b:}
-test filename-8.10 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join /a/b
-} {a:b}
-test filename-8.11 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join /a/b c/d
-} {a:b:c:d}
-test filename-8.12 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join /a/b :c:d
-} {a:b:c:d}
-test filename-8.13 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join ~ foo
-} {~:foo}
-test filename-8.14 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join :: ::
-} {:::}
-test filename-8.15 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a: ::
-} {a::}
-test filename-8.16 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a {} b
-} {:a:b}
-test filename-8.17 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a::: b
-} {a:::b}
-test filename-8.18 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a : : :
-} {:a}
-test filename-8.19 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join :
-} {:}
-test filename-8.20 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join : a
-} {:a}
-test filename-8.21 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join a: :b/c
-} {a:b/c}
-test filename-8.22 {Tcl_JoinPath: mac} {
-    testsetplatform mac
-    file join :a :b/c
-} {:a:b/c}
-
-test filename-9.1 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join a b
-} {a/b}
-test filename-9.2 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join /a b
-} {/a/b}
-test filename-9.3 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join /a /b
-} {/b}
-test filename-9.4 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join c: foo
-} {c:foo}
-test filename-9.5 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join c:/ foo
-} {c:/foo}
-test filename-9.6 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join c:\\bar foo
-} {c:/bar/foo}
-test filename-9.7 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join /foo c:bar
-} {c:bar}
-test filename-9.8 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ///host//share dir
-} {//host/share/dir}
-test filename-9.9 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ~ foo
-} {~/foo}
-test filename-9.10 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ~/~foo
-} {~/~foo}
-test filename-9.11 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ~ ./~foo
-} {~/~foo}
-test filename-9.12 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join / ~foo
-} {~foo}
-test filename-9.13 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ./a/ b c
-} {./a/b/c}
-test filename-9.14 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join ./~a/ b c
-} {./~a/b/c}
-test filename-9.15 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join // host share path
-} {/host/share/path}
-test filename-9.16 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join foo . bar
-} {foo/./bar}
-test filename-9.17 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join foo .. bar
-} {foo/../bar}
-test filename-9.18 {Tcl_JoinPath: win} {
-    testsetplatform win
-    file join foo/./bar
-} {foo/./bar}
-
-test filename-10.1 {Tcl_TranslateFileName} {
-    testsetplatform unix
-    list [catch {testtranslatefilename foo} msg] $msg
-} {0 foo}
-test filename-10.2 {Tcl_TranslateFileName} {
-    testsetplatform windows
-    list [catch {testtranslatefilename {c:/foo}} msg] $msg
-} {0 {c:\foo}}
-test filename-10.3 {Tcl_TranslateFileName} {
-    testsetplatform windows
-    list [catch {testtranslatefilename {c:/\\foo/}} msg] $msg
-} {0 {c:\foo}}
-test filename-10.4 {Tcl_TranslateFileName} {
-    testsetplatform mac
-    list [catch {testtranslatefilename foo} msg] $msg
-} {0 :foo}
-test filename-10.5 {Tcl_TranslateFileName} {
-    testsetplatform mac
-    list [catch {testtranslatefilename :~foo} msg] $msg
-} {0 :~foo}
-test filename-10.6 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform unix
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home/test/foo}
-test filename-10.7 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    unset env(HOME)
-    testsetplatform unix
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {1 {couldn't find HOME environment variable to expand path}}
-test filename-10.8 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test"
-    testsetplatform unix
-    set result [list [catch {testtranslatefilename ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home/test}
-test filename-10.9 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test/"
-    testsetplatform unix
-    set result [list [catch {testtranslatefilename ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home/test}
-test filename-10.10 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "/home/test/"
-    testsetplatform unix
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 /home/test/foo}
-test filename-10.11 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:foo}
-test filename-10.12 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:home"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:home:foo}
-test filename-10.13 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:home"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:home::foo}
-test filename-10.14 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:home"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:home}
-test filename-10.15 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:home:"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:home::foo}
-test filename-10.16 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "Root:home::"
-    testsetplatform mac
-    set result [list [catch {testtranslatefilename ~::foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 Root:home:::foo}
-test filename-10.17 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "\\home\\"
-    testsetplatform windows
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 {\home\foo}}
-test filename-10.18 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "\\home\\"
-    testsetplatform windows
-    set result [list [catch {testtranslatefilename ~/foo\\bar} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 {\home\foo\bar}}
-test filename-10.19 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "c:"
-    testsetplatform windows
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 c:foo}
-test filename-10.20 {Tcl_TranslateFileName} {
-    list [catch {testtranslatefilename ~blorp/foo} msg] $msg
-} {1 {user "blorp" doesn't exist}}
-test filename-10.21 {Tcl_TranslateFileName} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) "c:\\"
-    testsetplatform windows
-    set result [list [catch {testtranslatefilename ~/foo} msg] $msg]
-    set env(HOME) $temp
-    set result
-} {0 {c:\foo}}
-test filename-10.22 {Tcl_TranslateFileName} {
-    testsetplatform windows
-    list [catch {testtranslatefilename foo//bar} msg] $msg
-} {0 {foo\bar}}
-
-testsetplatform $platform
-
-test filename-10.23 {Tcl_TranslateFileName} {unixOnly nonPortable} {
-    # this test fails if ~ouster is not /home/ouster
-    list [catch {testtranslatefilename ~ouster} msg] $msg
-} {0 /home/ouster}
-test filename-10.24 {Tcl_TranslateFileName} {unixOnly nonPortable} {
-    # this test fails if ~ouster is not /home/ouster
-    list [catch {testtranslatefilename ~ouster/foo} msg] $msg
-} {0 /home/ouster/foo}
-
-
-test filename-11.1 {Tcl_GlobCmd} {
-    list [catch {glob} msg] $msg
-} {1 {wrong # args: should be "glob ?switches? name ?name ...?"}}
-test filename-11.2 {Tcl_GlobCmd} {
-    list [catch {glob -gorp} msg] $msg
-} {1 {bad switch "-gorp": must be -nocomplain or --}}
-test filename-11.3 {Tcl_GlobCmd} {
-    list [catch {glob -nocomplai} msg] $msg
-} {1 {bad switch "-nocomplai": must be -nocomplain or --}}
-test filename-11.4 {Tcl_GlobCmd} {
-    list [catch {glob -nocomplain} msg] $msg
-} {1 {wrong # args: should be "glob ?switches? name ?name ...?"}}
-test filename-11.5 {Tcl_GlobCmd} {
-    list [catch {glob -nocomplain ~xyqrszzz} msg] $msg
-} {0 {}}
-test filename-11.6 {Tcl_GlobCmd} {
-    list [catch {glob ~xyqrszzz} msg] $msg
-} {1 {user "xyqrszzz" doesn't exist}}
-test filename-11.7 {Tcl_GlobCmd} {
-    list [catch {glob -- -nocomplain} msg] $msg
-} {1 {no files matched glob patterns "-nocomplain"}}
-test filename-11.8 {Tcl_GlobCmd} {
-    list [catch {glob -nocomplain -- -nocomplain} msg] $msg
-} {0 {}}
-test filename-11.9 {Tcl_GlobCmd} {
-    testsetplatform unix
-    list [catch {glob ~\\xyqrszzz/bar} msg] $msg
-} {1 {globbing characters not supported in user names}}
-test filename-11.10 {Tcl_GlobCmd} {
-    testsetplatform unix
-    list [catch {glob -nocomplain ~\\xyqrszzz/bar} msg] $msg
-} {0 {}}
-test filename-11.11 {Tcl_GlobCmd} {
-    testsetplatform unix
-    list [catch {glob ~xyqrszzz\\/\\bar} msg] $msg
-} {1 {user "xyqrszzz" doesn't exist}}
-test filename-11.12 {Tcl_GlobCmd} {
-    testsetplatform unix
-    set home $env(HOME)
-    unset env(HOME)
-    set x [list [catch {glob ~/*} msg] $msg]
-    set env(HOME) $home
-    set x
-} {1 {couldn't find HOME environment variable to expand path}}
-
-testsetplatform $platform
-
-test filename-11.13 {Tcl_GlobCmd} {
-    list [catch {file join [lindex [glob ~] 0]} msg] $msg
-} [list 0 [file join $env(HOME)]]
-
-set oldhome $env(HOME)
-set env(HOME) [pwd]
-file delete -force globTest
-file mkdir globTest/a1/b1
-file mkdir globTest/a1/b2
-file mkdir globTest/a2/b3
-file mkdir globTest/a3
-close [open globTest/x1.c w]
-close [open globTest/y1.c w]
-close [open globTest/z1.c w]
-close [open "globTest/weird name.c" w]
-close [open globTest/a1/b1/x2.c w]
-close [open globTest/a1/b2/y2.c w]
-
-catch {close [open globTest/.1 w]}
-catch {close [open globTest/x,z1.c w]}
-
-test filename-11.14 {Tcl_GlobCmd} {
-    list [catch {glob ~/globTest} msg] $msg
-} [list 0 [list [file join $env(HOME) globTest]]]
-test filename-11.15 {Tcl_GlobCmd} {
-    list [catch {glob ~\\/globTest} msg] $msg
-} [list 0 [list [file join $env(HOME) globTest]]]
-test filename-11.16 {Tcl_GlobCmd} {
-    list [catch {glob globTest} msg] $msg
-} {0 globTest}
-
-test filename-12.1 {simple globbing} {unixOrPc} {
-    list [catch {glob {}} msg] $msg
-} {0 .}
-test filename-12.2 {simple globbing} {macOnly} {
-    list [catch {glob {}} msg] $msg
-} {0 :}
-test filename-12.3 {simple globbing} {
-    list [catch {glob -nocomplain \{a1,a2\}} msg] $msg
-} {0 {}}
-
-if {$tcl_platform(platform) == "macintosh"} {
-  set globPreResult :globTest:
-} else {
-  set globPreResult globTest/
-}
-set x1 x1.c
-set y1 y1.c
-test filename-12.4 {simple globbing} {unixOrPc} {
-    lsort [glob globTest/x1.c globTest/y1.c globTest/foo]
-} "$globPreResult$x1 $globPreResult$y1"
-test filename-12.5 {simple globbing} {
-    list [catch {glob globTest\\/x1.c} msg] $msg
-} "0 $globPreResult$x1"
-test filename-12.6 {simple globbing} {
-    list [catch {glob globTest\\/\\x1.c} msg] $msg
-} "0 $globPreResult$x1"
-
-test filename-13.1 {globbing with brace substitution} {
-    list [catch {glob globTest/\{\}} msg] $msg
-} "0 $globPreResult"
-test filename-13.2 {globbing with brace substitution} {
-    list [catch {glob globTest/\{} msg] $msg
-} {1 {unmatched open-brace in file name}}
-test filename-13.3 {globbing with brace substitution} {
-    list [catch {glob globTest/\{\\\}} msg] $msg
-} {1 {unmatched open-brace in file name}}
-test filename-13.4 {globbing with brace substitution} {
-    list [catch {glob globTest/\{\\} msg] $msg
-} {1 {unmatched open-brace in file name}}
-test filename-13.5 {globbing with brace substitution} {
-    list [catch {glob globTest/\}} msg] $msg
-} {1 {unmatched close-brace in file name}}
-test filename-13.6 {globbing with brace substitution} {
-    list [catch {glob globTest/\{\}x1.c} msg] $msg
-} "0 $globPreResult$x1"
-test filename-13.7 {globbing with brace substitution} {
-    list [catch {glob globTest/\{x\}1.c} msg] $msg
-} "0 $globPreResult$x1"
-test filename-13.8 {globbing with brace substitution} {
-    list [catch {glob globTest/\{x\{\}\}1.c} msg] $msg
-} "0 $globPreResult$x1"
-test filename-13.9 {globbing with brace substitution} {
-    list [lsort [catch {glob globTest/\{x,y\}1.c} msg]] $msg
-} [list 0 [list $globPreResult$x1 $globPreResult$y1]]
-test filename-13.10 {globbing with brace substitution} {
-    list [lsort [catch {glob globTest/\{x,,y\}1.c} msg]] $msg
-} [list 0 [list $globPreResult$x1 $globPreResult$y1]]
-test filename-13.11 {globbing with brace substitution} {unixOrPc} {
-    list [lsort [catch {glob globTest/\{x,x\\,z,z\}1.c} msg]] $msg
-} {0 {globTest/x1.c globTest/x,z1.c globTest/z1.c}}
-test filename-13.12 {globbing with brace substitution} {macOnly} {
-    list [lsort [catch {glob globTest/\{x,x\\,z,z\}1.c} msg]] $msg
-} {0 {:globTest:x1.c :globTest:x,z1.c :globTest:z1.c}}
-test filename-13.13 {globbing with brace substitution} {
-    lsort [glob globTest/{a,b,x,y}1.c]
-} [list $globPreResult$x1 $globPreResult$y1]
-test filename-13.14 {globbing with brace substitution} {unixOrPc} {
-    lsort [glob {globTest/{x1,y2,weird name}.c}]
-} {{globTest/weird name.c} globTest/x1.c}
-test filename-13.15 {globbing with brace substitution} {macOnly} {
-    lsort [glob {globTest/{x1,y2,weird name}.c}]
-} {{:globTest:weird name.c} :globTest:x1.c}
-test filename-13.16 {globbing with brace substitution} {unixOrPc} {
-    lsort [glob globTest/{x1.c,a1/*}]
-} {globTest/a1/b1 globTest/a1/b2 globTest/x1.c}
-test filename-13.17 {globbing with brace substitution} {macOnly} {
-    lsort [glob globTest/{x1.c,a1/*}]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:x1.c}
-test filename-13.18 {globbing with brace substitution} {unixOrPc} {
-    lsort [glob globTest/{x1.c,{a},a1/*}]
-} {globTest/a1/b1 globTest/a1/b2 globTest/x1.c}
-test filename-13.19 {globbing with brace substitution} {macOnly} {
-    lsort [glob globTest/{x1.c,{a},a1/*}]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:x1.c}
-test filename-13.20 {globbing with brace substitution} {unixOrPc} {
-    lsort [glob globTest/{a,x}1/*/{x,y}*]
-} {globTest/a1/b1/x2.c globTest/a1/b2/y2.c}
-test filename-13.21 {globbing with brace substitution} {macOnly} {
-    lsort [glob globTest/{a,x}1/*/{x,y}*]
-} {:globTest:a1:b1:x2.c :globTest:a1:b2:y2.c}
-test filename-13.22 {globbing with brace substitution} {
-    list [catch {glob globTest/\{a,x\}1/*/\{} msg] $msg
-} {1 {unmatched open-brace in file name}}
-
-test filename-14.1 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob g*/*.c]
-} {{globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.2 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob g*/*.c]
-} {{:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}
-test filename-14.3 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob globTest/?1.c]
-} {globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.4 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob globTest/?1.c]
-} {:globTest:x1.c :globTest:y1.c :globTest:z1.c}
-test filename-14.5 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob */*/*/*.c]
-} {globTest/a1/b1/x2.c globTest/a1/b2/y2.c}
-test filename-14.6 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob */*/*/*.c]
-} {:globTest:a1:b1:x2.c :globTest:a1:b2:y2.c}
-test filename-14.7 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob globTest/*]
-} {globTest/a1 globTest/a2 globTest/a3 {globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}
-test filename-14.8 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob globTest/*]
-} {:globTest:.1 :globTest:a1 :globTest:a2 :globTest:a3 {:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}
-test filename-14.9 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob globTest/.*]
-} {globTest/. globTest/.. globTest/.1}
-test filename-14.10 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob globTest/.*]
-} {:globTest:.1}
-test filename-14.11 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob globTest/*/*]
-} {globTest/a1/b1 globTest/a1/b2 globTest/a2/b3}
-test filename-14.12 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob globTest/*/*]
-} {:globTest:a1:b1 :globTest:a1:b2 :globTest:a2:b3}
-test filename-14.13 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob {globTest/[xyab]1.*}]
-} {globTest/x1.c globTest/y1.c}
-test filename-14.14 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob {globTest/[xyab]1.*}]
-} {:globTest:x1.c :globTest:y1.c}
-test filename-14.15 {asterisks, question marks, and brackets} {unixOrPc} {
-    lsort [glob globTest/*/]
-} {globTest/a1/ globTest/a2/ globTest/a3/}
-test filename-14.16 {asterisks, question marks, and brackets} {macOnly} {
-    lsort [glob globTest/*/]
-} {:globTest:a1: :globTest:a2: :globTest:a3:}
-test filename-14.17 {asterisks, question marks, and brackets} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) [file join $env(HOME) globTest]
-    set result [list [catch {glob ~/z*} msg] $msg]
-    set env(HOME) $temp
-    set result
-} [list 0 [list [file join $env(HOME) globTest z1.c]]]
-test filename-14.18 {asterisks, question marks, and brackets} {unixOrPc} {
-    list [catch {lsort [glob globTest/*.c goo/*]} msg] $msg
-} {0 {{globTest/weird name.c} globTest/x,z1.c globTest/x1.c globTest/y1.c globTest/z1.c}}
-test filename-14.19 {asterisks, question marks, and brackets} {macOnly} {
-    list [catch {lsort [glob globTest/*.c goo/*]} msg] $msg
-} {0 {{:globTest:weird name.c} :globTest:x,z1.c :globTest:x1.c :globTest:y1.c :globTest:z1.c}}
-test filename-14.20 {asterisks, question marks, and brackets} {
-    list [catch {glob -nocomplain goo/*} msg] $msg
-} {0 {}}
-test filename-14.21 {asterisks, question marks, and brackets} {
-    list [catch {glob globTest/*/gorp} msg] $msg
-} {1 {no files matched glob pattern "globTest/*/gorp"}}
-test filename-14.22 {asterisks, question marks, and brackets} {
-    list [catch {glob goo/* x*z foo?q} msg] $msg
-} {1 {no files matched glob patterns "goo/* x*z foo?q"}}
-test filename-14.23 {slash globbing} {unixOrPc} {
-    glob /
-} /
-test filename-14.24 {slash globbing} {pcOnly} {
-    glob {\\}
-} /
-
-# The following tests are only valid for Unix systems.
-# On some systems, like AFS, "000" protection doesn't prevent
-# access by owner, so the following test is not portable.
-
-catch {exec chmod 000 globTest/a1}
-test filename-15.1 {unix specific globbing} {unixOnly nonPortable} {
-    string tolower [list [catch {glob globTest/a1/*} msg]  $msg $errorCode]
-} {1 {couldn't read directory "globtest/a1": permission denied} {posix eacces {permission denied}}}
-test filename-15.2 {unix specific no complain: no errors} {unixOnly nonPortable} {
-    glob -nocomplain globTest/a1/*
-} {}
-test filename-15.3 {unix specific no complain: no errors, good result} \
-	{unixOnly nonPortable knownBug} {
-    # test fails because if an error occur , the interp's result
-    # is reset...
-    glob -nocomplain globTest/a2 globTest/a1/* globTest/a3
-} {globTest/a2 globTest/a3}
-
-catch {exec chmod 755 globTest/a1}
-test filename-15.4 {unix specific no complain: no errors, good result} \
-	{unixOnly nonPortable knownBug} {
-    # test fails because if an error occurs, the interp's result
-    # is reset... or you don't run at scriptics where the
-    # outser and welch users exists
-    glob -nocomplain ~ouster ~foo ~welch
-} {/home/ouster /home/welch}
-test filename-15.5 {unix specific globbing} {unixOnly nonPortable} {
-    glob ~ouster/.csh*
-} "/home/ouster/.cshrc"
-catch {close [open globTest/odd\\\[\]*?\{\}name w]}
-test filename-15.6 {unix specific globbing} {unixOnly} {
-    global env
-    set temp $env(HOME)
-    set env(HOME) $env(HOME)/globTest/odd\\\[\]*?\{\}name
-    set result [list [catch {glob ~} msg] $msg]
-    set env(HOME) $temp
-    set result
-} [list 0 [list [glob ~]/globTest/odd\\\[\]*?\{\}name]]
-catch {exec rm -f globTest/odd\\\[\]*?\{\}name}
-
-
-# The following tests are only valid for Windows systems.
-set temp [pwd]
-catch {cd c:/}
-catch {
-    cd c:/
-    removeDirectory globTest
-    makeDirectory globTest
-    close [open globTest/x1.BAT w]
-    close [open globTest/y1.Bat w]
-    close [open globTest/z1.bat w]
-}
-
-test filename-16.1 {windows specific globbing} {pcOnly} {
-    lsort [glob globTest/*.bat]
-} {globTest/x1.BAT globTest/y1.Bat globTest/z1.bat}
-test filename-16.2 {windows specific globbing} {pcOnly} {
-    glob c:
-} c:
-test filename-16.3 {windows specific globbing} {pcOnly} {
-    glob c:\\\\
-} c:/
-test filename-16.4 {windows specific globbing} {pcOnly} {
-    glob c:/
-} c:/
-test filename-16.5 {windows specific globbing} {pcOnly} {
-    glob c:*Test
-} c:globTest
-test filename-16.6 {windows specific globbing} {pcOnly} {
-    glob c:\\\\*Test
-} c:/globTest
-test filename-16.7 {windows specific globbing} {pcOnly} {
-    glob c:/*Test
-} c:/globTest
-test filename-16.8 {windows specific globbing} {pcOnly} {
-    lsort [glob c:globTest/*.bat]
-} {c:globTest/x1.BAT c:globTest/y1.Bat c:globTest/z1.bat}
-test filename-16.9 {windows specific globbing} {pcOnly} {
-    lsort [glob c:/globTest/*.bat]
-} {c:/globTest/x1.BAT c:/globTest/y1.Bat c:/globTest/z1.bat}
-test filename-16.10 {windows specific globbing} {pcOnly} {
-    lsort [glob c:globTest\\\\*.bat]
-} {c:globTest/x1.BAT c:globTest/y1.Bat c:globTest/z1.bat}
-test filename-16.11 {windows specific globbing} {pcOnly} {
-    lsort [glob c:\\\\globTest\\\\*.bat]
-} {c:/globTest/x1.BAT c:/globTest/y1.Bat c:/globTest/z1.bat}
-
-# some tests require a shared C drive
-
-if {[catch {cd //[info hostname]/c}]} {
-    set ::tcltest::testConfig(sharedCdrive) 0
-} else {
-    set ::tcltest::testConfig(sharedCdrive) 1
-}
-
-test filename-16.12 {windows specific globbing} {pcOnly sharedCdrive} {
-    cd //[info hostname]/c
-    removeDirectory globTest
-    makeDirectory globTest
-    close [open globTest/x1.BAT w]
-    close [open globTest/y1.Bat w]
-    close [open globTest/z1.bat w]
-    glob //[info hostname]/c/*Test
-} //[info hostname]/c/globTest
-test filename-16.13 {windows specific globbing} {pcOnly sharedCdrive} {
-    cd //[info hostname]/c
-    removeDirectory globTest
-    makeDirectory globTest
-    close [open globTest/x1.BAT w]
-    close [open globTest/y1.Bat w]
-    close [open globTest/z1.bat w]
-    glob "\\\\\\\\[info hostname]\\\\c\\\\*Test"
-} //[info hostname]/c/globTest
-
-# cleanup
-file delete -force //[info hostname]/c/globTest
-cd $temp
-file delete -force globTest
-set env(HOME) $oldhome
-testsetplatform $platform
-catch {unset oldhome platform temp result}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/for-old.test b/tests/for-old.test
deleted file mode 100644
index b2e2d39..0000000
--- a/tests/for-old.test
+++ /dev/null
@@ -1,84 +0,0 @@
-# Commands covered:  for, continue, break
-#
-# This file contains the original set of tests for Tcl's for command.
-# Since the for command is now compiled, a new set of tests covering
-# the new implementation is in the file "for.test". Sourcing this file
-# into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: for-old.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Check "for" and its use of continue and break.
-
-catch {unset a i}
-test for-old-1.1 {for tests} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3 4 5}
-test for-old-1.2 {for tests} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 continue
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3 5}
-test for-old-1.3 {for tests} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 break
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-test for-old-1.4 {for tests} {catch {for 1 2 3} msg} 1
-test for-old-1.5 {for tests} {
-    catch {for 1 2 3} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-old-1.6 {for tests} {catch {for 1 2 3 4 5} msg} 1
-test for-old-1.7 {for tests} {
-    catch {for 1 2 3 4 5} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-old-1.8 {for tests} {
-    set a {xyz}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {}
-    set a
-} xyz
-test for-old-1.9 {for tests} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]; if $i==4 break} {
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/for.test b/tests/for.test
deleted file mode 100644
index 4503c0b..0000000
--- a/tests/for.test
+++ /dev/null
@@ -1,752 +0,0 @@
-# Commands covered:  for, continue, break
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: for.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Basic "for" operation.
-
-test for-1.1 {TclCompileForCmd: missing initial command} {
-    list [catch {for} msg] $msg
-} {1 {wrong # args: should be "for start test next command"}}
-test for-1.2 {TclCompileForCmd: error in initial command} {
-    list [catch {for {set}} msg] $msg $errorInfo
-} {1 {wrong # args: should be "for start test next command"} {wrong # args: should be "for start test next command"
-    while compiling
-"for {set}"}}
-catch {unset i}
-test for-1.3 {TclCompileForCmd: missing test expression} {
-    catch {for {set i 0}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-1.4 {TclCompileForCmd: error in test expression} {
-    catch {for {set i 0} {$i<}} msg
-    set errorInfo
-} {wrong # args: should be "for start test next command"
-    while compiling
-"for {set i 0} {$i<}"}
-test for-1.5 {TclCompileForCmd: test expression is enclosed in quotes} {
-    set i 0
-    for {} "$i > 5" {incr i} {}
-} {}
-test for-1.6 {TclCompileForCmd: missing "next" command} {
-    catch {for {set i 0} {$i < 5}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-1.7 {TclCompileForCmd: missing command body} {
-    catch {for {set i 0} {$i < 5} {incr i}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-1.8 {TclCompileForCmd: error compiling command body} {
-    catch {for {set i 0} {$i < 5} {incr i} {set}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("for" body line 1)
-    while compiling
-"for {set i 0} {$i < 5} {incr i} {set}"}
-catch {unset a}
-test for-1.9 {TclCompileForCmd: simple command body} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 break
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-test for-1.10 {TclCompileForCmd: command body in quotes} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} "append a x"
-    set a
-} {xxxxx}
-test for-1.11 {TclCompileForCmd: computed command body} {
-    catch {unset x1}
-    catch {unset bb}
-    catch {unset x2}
-    set x1 {append a x1; }
-    set bb {break}
-    set x2 {; append a x2}
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} $x1$bb$x2
-    set a
-} {x1}
-test for-1.12 {TclCompileForCmd: error in "next" command} {
-    catch {for {set i 0} {$i < 5} {set} {puts $i}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("for" loop-end command)
-    while compiling
-"for {set i 0} {$i < 5} {set} {puts $i}"}
-test for-1.13 {TclCompileForCmd: long command body} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-test for-1.14 {TclCompileForCmd: for command result} {
-    set a [for {set i 0} {$i < 5} {incr i} {}]
-    set a
-} {}
-test for-1.15 {TclCompileForCmd: for command result} {
-    set a [for {set i 0} {$i < 5} {incr i} {if $i==3 break}]
-    set a
-} {}
-
-# Check "for" and "continue".
-
-test for-2.1 {TclCompileContinueCmd: arguments after "continue"} {
-    catch {continue foo} msg
-    set msg
-} {wrong # args: should be "continue"}
-test for-2.2 {TclCompileContinueCmd: continue result} {
-    catch continue
-} 4
-test for-2.3 {continue tests} {
-    set a {}
-    for {set i 1} {$i <= 4} {set i [expr $i+1]} {
-	if {$i == 2} continue
-	set a [concat $a $i]
-    }
-    set a
-} {1 3 4}
-test for-2.4 {continue tests} {
-    set a {}
-    for {set i 1} {$i <= 4} {set i [expr $i+1]} {
-	if {$i != 2} continue
-	set a [concat $a $i]
-    }
-    set a
-} {2}
-test for-2.5 {continue tests, nested loops} {
-    set msg {}
-    for {set i 1} {$i <= 4} {incr i} {
-	for {set a 1} {$a <= 2} {incr a} {
-            if {$i>=2 && $a>=2} continue
-            set msg [concat $msg "$i.$a"]
-        }
-    }
-    set msg
-} {1.1 1.2 2.1 3.1 4.1}
-test for-2.6 {continue tests, long command body} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==2 continue
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-    }
-    set a
-} {1 3}
-
-# Check "for" and "break".
-
-test for-3.1 {TclCompileBreakCmd: arguments after "break"} {
-    catch {break foo} msg
-    set msg
-} {wrong # args: should be "break"}
-test for-3.2 {TclCompileBreakCmd: break result} {
-    catch break
-} 3
-test for-3.3 {break tests} {
-    set a {}
-    for {set i 1} {$i <= 4} {incr i} {
-	if {$i == 3} break
-	set a [concat $a $i]
-    }
-    set a
-} {1 2}
-test for-3.4 {break tests, nested loops} {
-    set msg {}
-    for {set i 1} {$i <= 4} {incr i} {
-	for {set a 1} {$a <= 2} {incr a} {
-            if {$i>=2 && $a>=2} break
-            set msg [concat $msg "$i.$a"]
-        }
-    }
-    set msg
-} {1.1 1.2 2.1 3.1 4.1}
-test for-3.5 {break tests, long command body} {
-    set a {}
-    for {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==2 continue
-	if $i==5 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if $i==4 break
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-    }
-    set a
-} {1 3}
-# A simplified version of exmh's mail formatting routine to stress "for",
-# "break", "while", and "if".
-proc formatMail {} {
-    array set lines {
-        0 {Return-path: george@tcl} \
-        1 {Return-path: <george@tcl>} \
-        2 {Received: from tcl by tcl.Somewhere.COM (SMI-8.6/SMI-SVR4)} \
-        3 {	id LAA10027; Wed, 11 Sep 1996 11:14:53 -0700} \
-        4 {Message-id: <199609111814.LAA10027@tcl.Somewhere.COM>} \
-        5 {X-mailer: exmh version 1.6.9 8/22/96} \
-        6 {Mime-version: 1.0} \
-        7 {Content-type: text/plain; charset=iso-8859-1} \
-        8 {Content-transfer-encoding: quoted-printable} \
-        9 {Content-length: 2162} \
-        10 {To: fred} \
-        11 {Subject: tcl7.6} \
-        12 {Date: Wed, 11 Sep 1996 11:14:53 -0700} \
-        13 {From: George <george@tcl>} \
-        14 {The Tcl 7.6 and Tk 4.2 releases} \
-        15 {} \
-        16 {This page contains information about Tcl 7.6 and Tk4.2, which are the most recent} \
-        17 {releases of the Tcl scripting language and the Tk toolkit. The first beta versions of these} \
-        18 {releases were released on August 30, 1996. These releases contain only minor changes,} \
-        19 {so we hope to have only a single beta release and to go final in early October, 1996. } \
-        20 {} \
-        21 {} \
-        22 {What's new } \
-        23 {} \
-        24 {The most important changes in the releases are summarized below. See the README} \
-        25 {and changes files in the distributions for more complete information on what has} \
-        26 {changed, including both feature changes and bug fixes. } \
-        27 {} \
-        28 {     There are new options to the file command for copying files (file copy),} \
-        29 {     deleting files and directories (file delete), creating directories (file} \
-        30 {     mkdir), and renaming files (file rename). } \
-        31 {     The implementation of exec has been improved greatly for Windows 95 and} \
-        32 {     Windows NT. } \
-        33 {     There is a new memory allocator for the Macintosh version, which should be} \
-        34 {     more efficient than the old one. } \
-        35 {     Tk's grid geometry manager has been completely rewritten. The layout} \
-        36 {     algorithm produces much better layouts than before, especially where rows or} \
-        37 {     columns were stretchable. } \
-        38 {     There are new commands for creating common dialog boxes:} \
-        39 {     tk_chooseColor, tk_getOpenFile, tk_getSaveFile and} \
-        40 {     tk_messageBox. These use native dialog boxes if they are available. } \
-        41 {     There is a new virtual event mechanism for handling events in a more portable} \
-        42 {     way. See the new command event. It also allows events (both physical and} \
-        43 {     virtual) to be generated dynamically. } \
-        44 {} \
-        45 {Tcl 7.6 and Tk 4.2 are backwards-compatible with Tcl 7.5 and Tk 4.1 except for} \
-        46 {changes in the C APIs for custom channel drivers. Scripts written for earlier releases} \
-        47 {should work on these new releases as well. } \
-        48 {} \
-        49 {Obtaining The Releases} \
-        50 {} \
-        51 {Binary Releases} \
-        52 {} \
-        53 {Pre-compiled releases are available for the following platforms: } \
-        54 {} \
-        55 {     Windows 3.1, Windows 95, and Windows NT: Fetch} \
-        56 {     ftp://ftp.sunlabs.com/pub/tcl/win42b1.exe, then execute it. The file is a} \
-        57 {     self-extracting executable. It will install the Tcl and Tk libraries, the wish and} \
-        58 {     tclsh programs, and documentation. } \
-        59 {     Macintosh (both 68K and PowerPC): Fetch} \
-        60 {     ftp://ftp.sunlabs.com/pub/tcl/mactk4.2b1.sea.hqx. The file is in binhex format,} \
-        61 {     which is understood by Fetch, StuffIt, and many other Mac utilities. The} \
-        62 {     unpacked file is a self-installing executable: double-click on it and it will create a} \
-        63 {     folder containing all that you need to run Tcl and Tk. } \
-        64 {        UNIX (Solaris 2.* and SunOS, other systems soon to follow). Easy to install} \
-        65 {     binary packages are now for sale at the Sun Labs Tcl/Tk Shop. Check it out!} \
-    }
-
-    set result ""
-    set NL "
-"
-    set tag {level= type=text/plain part=0 sel Charset}
-    set ix [lsearch -regexp $tag text/enriched]
-    if {$ix < 0} {
-	set ranges {}
-	set quote 0
-    }
-    set breakrange {6.42 78.0}
-    set F1 [lindex $breakrange 0]
-    set F2 [lindex $breakrange 1]
-    set breakrange [lrange $breakrange 2 end]
-    if {[string length $F1] == 0} {
-	set F1 -1
-	set break 0
-    } else {
-	set break 1
-    }
-
-    set xmailer 0
-    set inheaders 1
-    set last [array size lines]
-    set plen 2
-    for {set L 1} {$L < $last} {incr L} {
-	set line $lines($L)
-	if {$inheaders} {
-	    # Blank or empty line terminates headers
-	    # Leading --- terminates headers
-	    if {[regexp {^[ 	]*$} $line] || [regexp {^--+} $line]} {
-		set inheaders 0
-	    }
-	    if {[regexp -nocase {^x-mailer:} $line]} {
-		continue
-	    }
-	}
-	if $inheaders {
-	    set limit 55
-	} else {
-	    set limit 55
-
-	    # Decide whether or not to break the body line
-
-	    if {$plen > 0} {
-		if {[string first {> } $line] == 0} {
-		    # This is quoted text from previous message, don't reformat
-		    append result $line $NL
-		    if {$quote && !$inheaders} {
-			# Fix from <sarr@umich.edu> to handle text/enriched
-			if {$L > $L1 && $L < $L2 && $line != {}} {
-			    # enriched requires two newlines for each one.
-			    append result $NL
-			} elseif {$L > $L2} {
-			    set L1 [lindex $ranges 0]
-			    set L2 [lindex $ranges 1]
-			    set ranges [lrange $ranges 2 end]
-			    set quote [llength $L1]
-			}
-		    }
-		    continue
-		}
-	    }
-	    if {$F1 < 0} {
-		# Nothing left to format
-		append result $line $NL
-		continue
-	    } elseif {$L < $F1} {
-		# Not yet to formatted block
-		append result $line $NL
-		continue
-	    } elseif {$L > $F2} {
-		# Past formatted block
-		set F1 [lindex $breakrange 0]
-		set F2 [lindex $breakrange 1]
-		set breakrange [lrange $breakrange 2 end]
-		append result $line $NL
-		if {[string length $F1] == 0} {
-		    set F1 -1
-		}
-		continue
-	    }
-	}
-	set climit [expr $limit-1]
-	set cutoff 50
-	set continuation 0
-	
-	while {[string length $line] > $limit} {
-	    for {set c [expr $limit-1]} {$c >= $cutoff} {incr c -1} {
-		set char [string index $line $c]
-		if {$char == " " || $char == "\t"} {
-		    break
-		}
-		if {$char == ">"} {	;# Hack for enriched formatting
-		    break
-		}
-	    }
-	    if {$c < $cutoff} {
-		if {! $inheaders} {
-		    set c [expr $limit-1]
-		} else {
-		    set c [string length $line]
-		}
-	    }
-	    set newline [string range $line 0 $c]
-	    if {! $continuation} {
-		append result $newline $NL
-	    } else {
-		append result \ $newline $NL
-	    }
-	    incr c
-	    set line [string trimright [string range $line $c end]]
-	    if {$inheaders} {
-		set continuation 1
-		set limit $climit
-	    }
-	}
-	if {$continuation} {
-	    if {[string length $line] != 0} {
-		append result \ $line $NL
-	    }
-	} else {
-	    append result $line $NL
-	    if {$quote && !$inheaders} {
-		if {$L > $L1 && $L < $L2 && $line != {}} {
-		    # enriched requires two newlines for each one.
-		    append result "" $NL
-		} elseif {$L > $L2} {
-		    set L1 [lindex $ranges 0]
-		    set L2 [lindex $ranges 1]
-		    set ranges [lrange $ranges 2 end]
-		    set quote [llength $L1]
-		}
-	    }
-	}
-    }
-    return $result
-}
-test for-3.6 {break tests} {
-    formatMail
-} {Return-path: <george@tcl>
-Received: from tcl by tcl.Somewhere.COM (SMI-8.6/SMI-SVR4)
-	id LAA10027; Wed, 11 Sep 1996 11:14:53 -0700
-Message-id: <199609111814.LAA10027@tcl.Somewhere.COM>
-Mime-version: 1.0
-Content-type: text/plain; charset=iso-8859-1
-Content-transfer-encoding: quoted-printable
-Content-length: 2162
-To: fred
-Subject: tcl7.6
-Date: Wed, 11 Sep 1996 11:14:53 -0700
-From: George <george@tcl>
-The Tcl 7.6 and Tk 4.2 releases
-
-This page contains information about Tcl 7.6 and Tk4.2,
- which are the most recent
-releases of the Tcl scripting language and the Tk toolk
-it. The first beta versions of these
-releases were released on August 30, 1996. These releas
-es contain only minor changes,
-so we hope to have only a single beta release and to 
-go final in early October, 1996.
-
-
-What's new 
-
-The most important changes in the releases are summariz
-ed below. See the README
-and changes files in the distributions for more complet
-e information on what has
-changed, including both feature changes and bug fixes. 
-
-     There are new options to the file command for 
-copying files (file copy),
-     deleting files and directories (file delete), 
-creating directories (file
-     mkdir), and renaming files (file rename). 
-     The implementation of exec has been improved great
-ly for Windows 95 and
-     Windows NT. 
-     There is a new memory allocator for the Macintosh 
-version, which should be
-     more efficient than the old one. 
-     Tk's grid geometry manager has been completely 
-rewritten. The layout
-     algorithm produces much better layouts than before
-, especially where rows or
-     columns were stretchable. 
-     There are new commands for creating common dialog 
-boxes:
-     tk_chooseColor, tk_getOpenFile, tk_getSaveFile and
-     tk_messageBox. These use native dialog boxes if 
-they are available.
-     There is a new virtual event mechanism for handlin
-g events in a more portable
-     way. See the new command event. It also allows 
-events (both physical and
-     virtual) to be generated dynamically. 
-
-Tcl 7.6 and Tk 4.2 are backwards-compatible with Tcl 
-7.5 and Tk 4.1 except for
-changes in the C APIs for custom channel drivers. Scrip
-ts written for earlier releases
-should work on these new releases as well. 
-
-Obtaining The Releases
-
-Binary Releases
-
-Pre-compiled releases are available for the following 
-platforms:
-
-     Windows 3.1, Windows 95, and Windows NT: Fetch
-     ftp://ftp.sunlabs.com/pub/tcl/win42b1.exe, then 
-execute it. The file is a
-     self-extracting executable. It will install the 
-Tcl and Tk libraries, the wish and
-     tclsh programs, and documentation. 
-     Macintosh (both 68K and PowerPC): Fetch
-     ftp://ftp.sunlabs.com/pub/tcl/mactk4.2b1.sea.hqx. 
-The file is in binhex format,
-     which is understood by Fetch, StuffIt, and many 
-other Mac utilities. The
-     unpacked file is a self-installing executable: 
-double-click on it and it will create a
-     folder containing all that you need to run Tcl 
-and Tk.
-        UNIX (Solaris 2.* and SunOS, other systems 
-soon to follow). Easy to install
-     binary packages are now for sale at the Sun Labs 
-Tcl/Tk Shop. Check it out!
-}
-
-# Check that "break" resets the interpreter's result
-
-test for-4.1 {break must reset the interp result} {
-    catch {
-        set z GLOBTESTDIR/dir2/file2.c
-        if [string match GLOBTESTDIR/dir2/* $z] {
-            break
-        }
-    } j
-    set j
-} {}
-
-# Basic "for" operation with computed command names.
-test for-5.1 {for cmd with computed command names: missing initial command} {
-    set z for
-    list [catch {$z} msg] $msg
-} {1 {wrong # args: should be "for start test next command"}}
-test for-5.2 {for cmd with computed command names: error in initial command} {
-    set z for
-    list [catch {$z {set}} msg] $msg $errorInfo
-} {1 {wrong # args: should be "for start test next command"} {wrong # args: should be "for start test next command"
-    while executing
-"$z {set}"}}
-test for-5.3 {for cmd with computed command names: missing test expression} {
-    set z for
-    catch {$z {set i 0}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-5.4 {for cmd with computed command names: error in test expression} {
-    set z for
-    catch {$z {set i 0} {$i<}} msg
-    set errorInfo
-} {wrong # args: should be "for start test next command"
-    while executing
-"$z {set i 0} {$i<}"}
-test for-5.5 {for cmd with computed command names: test expression is enclosed in quotes} {
-    set z for
-    set i 0
-    $z {} "$i > 5" {incr i} {}
-} {}
-test for-5.6 {for cmd with computed command names: missing "next" command} {
-    set z for
-    catch {$z {set i 0} {$i < 5}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-5.7 {for cmd with computed command names: missing command body} {
-    set z for
-    catch {$z {set i 0} {$i < 5} {incr i}} msg
-    set msg
-} {wrong # args: should be "for start test next command"}
-test for-5.8 {for cmd with computed command names: error executing command body} {
-    set z for
-    catch {$z {set i 0} {$i < 5} {incr i} {set}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("for" body line 1)
-    invoked from within
-"$z {set i 0} {$i < 5} {incr i} {set}"}
-test for-5.9 {for cmd with computed command names: simple command body} {
-    set z for
-    set a {}
-    $z {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 break
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-test for-5.10 {for cmd with computed command names: command body in quotes} {
-    set z for
-    set a {}
-    $z {set i 1} {$i<6} {set i [expr $i+1]} "append a x"
-    set a
-} {xxxxx}
-test for-5.11 {for cmd with computed command names: computed command body} {
-    set z for
-    catch {unset x1}
-    catch {unset bb}
-    catch {unset x2}
-    set x1 {append a x1; }
-    set bb {break}
-    set x2 {; append a x2}
-    set a {}
-    $z {set i 1} {$i<6} {set i [expr $i+1]} $x1$bb$x2
-    set a
-} {x1}
-test for-5.12 {for cmd with computed command names: error in "next" command} {
-    set z for
-    catch {$z {set i 0} {$i < 5} {set} {set j 4}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("for" loop-end command)
-    invoked from within
-"$z {set i 0} {$i < 5} {set} {set j 4}"}
-test for-5.13 {for cmd with computed command names: long command body} {
-    set z for
-    set a {}
-    $z {set i 1} {$i<6} {set i [expr $i+1]} {
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-    }
-    set a
-} {1 2 3}
-test for-5.14 {for cmd with computed command names: for command result} {
-    set z for
-    set a [$z {set i 0} {$i < 5} {incr i} {}]
-    set a
-} {}
-test for-5.15 {for cmd with computed command names: for command result} {
-    set z for
-    set a [$z {set i 0} {$i < 5} {incr i} {if $i==3 break}]
-    set a
-} {}
-
-# Test for incorrect "double evaluation" semantics
-
-test for-6.1 {possible delayed substitution of increment command} {knownBug} {
-    # Increment should be 5, and lappend should always append 5
-    catch {unset a}
-    catch {unset i}
-    set a 5
-    set i {}
-    for {set a 1} {$a < 12} "incr a $a" {lappend i $a}
-    set i
-} {1 6 11}
-
-test for-6.2 {possible delayed substitution of body command} {knownBug} {
-    # Increment should be 5, and lappend should always append 5
-    set a 5
-    set i {}
-    for {set a 1} {$a < 12} {incr a $a} "lappend i $a"
-    set i
-} {5 5 5 5}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/foreach.test b/tests/foreach.test
deleted file mode 100644
index 66e626e..0000000
--- a/tests/foreach.test
+++ /dev/null
@@ -1,242 +0,0 @@
-# Commands covered:  foreach, continue, break
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: foreach.test,v 1.3 1999/04/16 00:47:27 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset a}
-catch {unset x}
-
-# Basic "foreach" operation.
-
-test foreach-1.1 {basic foreach tests} {
-    set a {}
-    foreach i {a b c d} {
-	set a [concat $a $i]
-    }
-    set a
-} {a b c d}
-test foreach-1.2 {basic foreach tests} {
-    set a {}
-    foreach i {a b {{c d} e} {123 {{x}}}} {
-	set a [concat $a $i]
-    }
-    set a
-} {a b {c d} e 123 {{x}}}
-test foreach-1.3 {basic foreach tests} {catch {foreach} msg} 1
-test foreach-1.4 {basic foreach tests} {
-    catch {foreach} msg
-    set msg
-} {wrong # args: should be "foreach varList list ?varList list ...? command"}
-test foreach-1.5 {basic foreach tests} {catch {foreach i} msg} 1
-test foreach-1.6 {basic foreach tests} {
-    catch {foreach i} msg
-    set msg
-} {wrong # args: should be "foreach varList list ?varList list ...? command"}
-test foreach-1.7 {basic foreach tests} {catch {foreach i j} msg} 1
-test foreach-1.8 {basic foreach tests} {
-    catch {foreach i j} msg
-    set msg
-} {wrong # args: should be "foreach varList list ?varList list ...? command"}
-test foreach-1.9 {basic foreach tests} {catch {foreach i j k l} msg} 1
-test foreach-1.10 {basic foreach tests} {
-    catch {foreach i j k l} msg
-    set msg
-} {wrong # args: should be "foreach varList list ?varList list ...? command"}
-test foreach-1.11 {basic foreach tests} {
-    set a {}
-    foreach i {} {
-	set a [concat $a $i]
-    }
-    set a
-} {}
-test foreach-1.12 {foreach errors} {
-    list [catch {foreach {{a}{b}} {1 2 3} {}} msg] $msg
-} {1 {list element in braces followed by "{b}" instead of space}}
-test foreach-1.13 {foreach errors} {
-    list [catch {foreach a {{1 2}3} {}} msg] $msg
-} {1 {list element in braces followed by "3" instead of space}}
-catch {unset a}
-test foreach-1.14 {foreach errors} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {foreach a {1 2 3} {}} msg] $msg
-} {1 {couldn't set loop variable: "a"}}
-test foreach-1.15 {foreach errors} {
-    list [catch {foreach {} {} {}} msg] $msg
-} {1 {foreach varlist is empty}}
-catch {unset a}
-
-test foreach-2.1 {parallel foreach tests} {
-    set x {}
-    foreach {a b} {1 2 3 4} {
-	append x $b $a
-    }
-    set x
-} {2143}
-test foreach-2.2 {parallel foreach tests} {
-    set x {}
-    foreach {a b} {1 2 3 4 5} {
-	append x $b $a
-    }
-    set x
-} {21435}
-test foreach-2.3 {parallel foreach tests} {
-    set x {}
-    foreach a {1 2 3} b {4 5 6} {
-	append x $b $a
-    }
-    set x
-} {415263}
-test foreach-2.4 {parallel foreach tests} {
-    set x {}
-    foreach a {1 2 3} b {4 5 6 7 8} {
-	append x $b $a
-    }
-    set x
-} {41526378}
-test foreach-2.5 {parallel foreach tests} {
-    set x {}
-    foreach {a b} {a b A B aa bb} c {c C cc CC} {
-	append x $a $b $c
-    }
-    set x
-} {abcABCaabbccCC}
-test foreach-2.6 {parallel foreach tests} {
-    set x {}
-    foreach a {1 2 3} b {1 2 3} c {1 2 3} d {1 2 3} e {1 2 3} {
-	append x $a $b $c $d $e
-    }
-    set x
-} {111112222233333}
-test foreach-2.7 {parallel foreach tests} {
-    set x {}
-    foreach a {} b {1 2 3} c {1 2} d {1 2 3 4} e {{1 2}} {
-	append x $a $b $c $d $e
-    }
-    set x
-} {1111 2222334}
-test foreach-2.8 {foreach only sets vars if repeating loop} {
-    proc foo {} {
-        set rgb {65535 0 0}
-        foreach {r g b} [set rgb] {}
-        return "r=$r, g=$g, b=$b"
-    }
-    foo
-} {r=65535, g=0, b=0}
-test foreach-2.9 {foreach only supports local scalar variables} {
-    proc foo {} {
-        set x {}
-        foreach {a(3)} {1 2 3 4} {lappend x [set {a(3)}]}
-        set x
-    }
-    foo
-} {1 2 3 4}
-
-test foreach-3.1 {compiled foreach backward jump works correctly} {
-    catch {unset x}
-    proc foo {arrayName} {
-        upvar 1 $arrayName a
-        set l {}
-        foreach member [array names a] {
-            lappend l [list $member [set a($member)]]
-        }
-        return $l
-    }
-    array set x {0 zero 1 one 2 two 3 three}
-    foo x
-} {{0 zero} {1 one} {2 two} {3 three}}
-
-test foreach-4.1 {noncompiled foreach and shared variable or value list objects that are converted to another type} {
-    catch {unset x}
-    foreach {12.0} {a b c} {
-        set x 12.0  
-        set x [expr $x + 1]
-    }
-    set x
-} 13.0
-
-# Check "continue".
-
-test foreach-4.1 {continue tests} {catch continue} 4
-test foreach-4.2 {continue tests} {
-    set a {}
-    foreach i {a b c d} {
-	if {[string compare $i "b"] == 0} continue
-	set a [concat $a $i]
-    }
-    set a
-} {a c d}
-test foreach-4.3 {continue tests} {
-    set a {}
-    foreach i {a b c d} {
-	if {[string compare $i "b"] != 0} continue
-	set a [concat $a $i]
-    }
-    set a
-} {b}
-test foreach-4.4 {continue tests} {catch {continue foo} msg} 1
-test foreach-4.5 {continue tests} {
-    catch {continue foo} msg
-    set msg
-} {wrong # args: should be "continue"}
-
-# Check "break".
-
-test foreach-5.1 {break tests} {catch break} 3
-test foreach-5.2 {break tests} {
-    set a {}
-    foreach i {a b c d} {
-	if {[string compare $i "c"] == 0} break
-	set a [concat $a $i]
-    }
-    set a
-} {a b}
-test foreach-5.3 {break tests} {catch {break foo} msg} 1
-test foreach-5.4 {break tests} {
-    catch {break foo} msg
-    set msg
-} {wrong # args: should be "break"}
-
-# Test for incorrect "double evaluation" semantics
-
-test foreach-6.1 {delayed substitution of body} {knownBug} {
-    proc foo {} {
-       set a 0
-       foreach a [list 1 2 3] "
-           set x $a
-       "
-       set x
-    }
-    foo
-} {0}
-
-# cleanup
-catch {unset a}
-catch {unset x}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/format.test b/tests/format.test
deleted file mode 100644
index 2b52187..0000000
--- a/tests/format.test
+++ /dev/null
@@ -1,499 +0,0 @@
-# Commands covered:  format
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: format.test,v 1.4 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# The following code is needed because some versions of SCO Unix have
-# a round-off error in sprintf which would cause some of the tests to
-# fail.  Someday I hope this code shouldn't be necessary (code added
-# 9/9/91).
-
-set roundOffBug 0
-if {"[format %7.1e  68.514]" == "6.8e+01"} {
-    puts stdout "Note: this system has a sprintf round-off bug, some tests skipped\n"
-    set roundOffBug 1
-}
-
-test format-1.1 {integer formatting} {
-    format "%*d %d %d %d" 6 34 16923 -12 -1
-} {    34 16923 -12 -1}
-test format-1.2 {integer formatting} {nonPortable} {
-    format "%4d %4d %4d %4d %d %#x %#X" 6 34 16923 -12 -1 14 12
-} {   6   34 16923  -12 -1 0xe 0XC}
-
-# %u output depends on word length, so this test is not portable.
-
-test format-1.3 {integer formatting} {nonPortable} {
-    format "%4u %4u %4u %4u %d %#o" 6 34 16923 -12 -1 0
-} {   6   34 16923 4294967284 -1 0}
-test format-1.4 {integer formatting} {
-    format "%-4d %-4i %-4d %-4ld" 6 34 16923 -12 -1
-} {6    34   16923 -12 }
-test format-1.5 {integer formatting} {
-    format "%04d %04d %04d %04i" 6 34 16923 -12 -1
-} {0006 0034 16923 -012}
-test format-1.6 {integer formatting} {
-    format "%00*d" 6 34
-} {000034}
-
-# Printing negative numbers in hex or octal format depends on word
-# length, so these tests are not portable.
-
-test format-1.7 {integer formatting} {nonPortable} {
-    format "%4x %4x %4x %4x" 6 34 16923 -12 -1
-} {   6   22 421b fffffff4}
-test format-1.8 {integer formatting} {nonPortable} {
-    format "%#x %#X %#X %#x" 6 34 16923 -12 -1
-} {0x6 0X22 0X421B 0xfffffff4}
-test format-1.9 {integer formatting} {nonPortable} {
-    format "%#20x %#20x %#20x %#20x" 6 34 16923 -12 -1
-} {                 0x6                 0x22               0x421b           0xfffffff4}
-test format-1.10 {integer formatting} {nonPortable} {
-    format "%-#20x %-#20x %-#20x %-#20x" 6 34 16923 -12 -1
-} {0x6                  0x22                 0x421b               0xfffffff4          }
-test format-1.11 {integer formatting} {nonPortable} {
-    format "%-#20o %#-20o %#-20o %#-20o" 6 34 16923 -12 -1
-} {06                   042                  041033               037777777764        }
-
-test format-2.1 {string formatting} {
-    format "%s %s %c %s" abcd {This is a very long test string.} 120 x
-} {abcd This is a very long test string. x x}
-test format-2.2 {string formatting} {
-    format "%20s %20s %20c %20s" abcd {This is a very long test string.} 120 x
-} {                abcd This is a very long test string.                    x                    x}
-test format-2.3 {string formatting} {
-    format "%.10s %.10s %c %.10s" abcd {This is a very long test string.} 120 x
-} {abcd This is a  x x}
-test format-2.4 {string formatting} {
-    format "%s %s %% %c %s" abcd {This is a very long test string.} 120 x
-} {abcd This is a very long test string. % x x}
-test format-2.5 {string formatting, embedded nulls} {
-    format "%10s" abc\0def
-} "   abc\0def"
-test format-2.6 {string formatting, international chars} {
-    format "%10s" abc\ufeffdef
-} "   abc\ufeffdef"
-test format-2.6 {string formatting, international chars} {
-    format "%.5s" abc\ufeffdef
-} "abc\ufeffd"
-test format-2.7 {string formatting, international chars} {
-    format "foo\ufeffbar%s" baz
-} "foo\ufeffbarbaz"
-test format-2.8 {string formatting, width} {
-    format "a%5sa" f
-} "a    fa"
-test format-2.8 {string formatting, width} {
-    format "a%-5sa" f
-} "af    a"
-test format-2.8 {string formatting, width} {
-    format "a%2sa" foo
-} "afooa"
-test format-2.8 {string formatting, width} {
-    format "a%0sa" foo
-} "afooa"
-test format-2.8 {string formatting, precision} {
-    format "a%.2sa" foobarbaz
-} "afoa"
-test format-2.8 {string formatting, precision} {
-    format "a%.sa" foobarbaz
-} "aa"
-test format-2.8 {string formatting, precision} {
-    list [catch {format "a%.-2sa" foobarbaz} msg] $msg
-} {1 {bad field specifier "-"}}
-test format-2.8 {string formatting, width and precision} {
-    format "a%5.2sa" foobarbaz
-} "a   foa"
-test format-2.8 {string formatting, width and precision} {
-    format "a%5.7sa" foobarbaz
-} "afoobarba"
-
-test format-3.1 {Tcl_FormatObjCmd: character formatting} {
-    format "|%c|%0c|%-1c|%1c|%-6c|%6c|%*c|%*c|" 65 65 65 65 65 65 3 65 -4 65
-} "|A|A|A|A|A     |     A|  A|A   |"
-test format-3.2 {Tcl_FormatObjCmd: international character formatting} {
-    format "|%c|%0c|%-1c|%1c|%-6c|%6c|%*c|%*c|" 0xa2 0x4e4e 0x25a 0xc3 0xff08 0 3 0x6575 -4 0x4e4f
-} "|\ua2|\u4e4e|\u25a|\uc3|\uff08     |     \0|  \u6575|\u4e4f   |"
-
-test format-4.1 {e and f formats} {eformat} {
-    format "%e %e %e %e" 34.2e12 68.514 -.125 -16000. .000053
-} {3.420000e+13 6.851400e+01 -1.250000e-01 -1.600000e+04}
-test format-4.2 {e and f formats} {eformat} {
-    format "%20e %20e %20e %20e" 34.2e12 68.514 -.125 -16000. .000053
-} {        3.420000e+13         6.851400e+01        -1.250000e-01        -1.600000e+04}
-if {!$roundOffBug} {
-    test format-4.3 {e and f formats} {eformat} {
-	format "%.1e %.1e %.1e %.1e" 34.2e12 68.514 -.126 -16000. .000053
-    } {3.4e+13 6.9e+01 -1.3e-01 -1.6e+04}
-    test format-4.4 {e and f formats} {eformat} {
-	format "%020e %020e %020e %020e" 34.2e12 68.514 -.126 -16000. .000053
-    } {000000003.420000e+13 000000006.851400e+01 -00000001.260000e-01 -00000001.600000e+04}
-    test format-4.5 {e and f formats} {eformat} {
-	format "%7.1e %7.1e %7.1e %7.1e" 34.2e12 68.514 -.126 -16000. .000053
-    } {3.4e+13 6.9e+01 -1.3e-01 -1.6e+04}
-    test format-4.6 {e and f formats} {
-	format "%f %f %f %f" 34.2e12 68.514 -.125 -16000. .000053
-    } {34200000000000.000000 68.514000 -0.125000 -16000.000000}
-}
-test format-4.7 {e and f formats} {nonPortable} {
-    format "%.4f %.4f %.4f %.4f %.4f" 34.2e12 68.514 -.125 -16000. .000053
-} {34200000000000.0000 68.5140 -0.1250 -16000.0000 0.0001}
-test format-4.8 {e and f formats} {eformat} {
-    format "%.4e %.5e %.6e" -9.99996 -9.99996 9.99996
-} {-1.0000e+01 -9.99996e+00 9.999960e+00}
-test format-4.9 {e and f formats} {
-    format "%.4f %.5f %.6f" -9.99996 -9.99996 9.99996
-} {-10.0000 -9.99996 9.999960}
-test format-4.10 {e and f formats} {
-    format "%20f %-20f %020f" -9.99996 -9.99996 9.99996
-} {           -9.999960 -9.999960            0000000000009.999960}
-test format-4.11 {e and f formats} {
-    format "%-020f %020f" -9.99996 -9.99996 9.99996
-} {-9.999960            -000000000009.999960}
-test format-4.12 {e and f formats} {eformat} {
-    format "%.0e %#.0e" -9.99996 -9.99996 9.99996
-} {-1e+01 -1.e+01}
-test format-4.13 {e and f formats} {
-    format "%.0f %#.0f" -9.99996 -9.99996 9.99996
-} {-10 -10.}
-test format-4.14 {e and f formats} {
-    format "%.4f %.5f %.6f" -9.99996 -9.99996 9.99996
-} {-10.0000 -9.99996 9.999960}
-test format-4.15 {e and f formats} {
-    format "%3.0f %3.0f %3.0f %3.0f" 1.0 1.1 1.01 1.001
-} {  1   1   1   1}
-test format-4.16 {e and f formats} {
-    format "%3.1f %3.1f %3.1f %3.1f" 0.0 0.1 0.01 0.001
-} {0.0 0.1 0.0 0.0}
-
-test format-5.1 {g-format} {eformat} {
-    format "%.3g" 12341.0
-} {1.23e+04}
-test format-5.2 {g-format} {eformat} {
-    format "%.3G" 1234.12345
-} {1.23E+03}
-test format-5.3 {g-format} {
-    format "%.3g" 123.412345
-} {123}
-test format-5.4 {g-format} {
-    format "%.3g" 12.3412345
-} {12.3}
-test format-5.5 {g-format} {
-    format "%.3g" 1.23412345
-} {1.23}
-test format-5.6 {g-format} {
-    format "%.3g" 1.23412345
-} {1.23}
-test format-5.7 {g-format} {
-    format "%.3g" .123412345
-} {0.123}
-test format-5.8 {g-format} {
-    format "%.3g" .012341
-} {0.0123}
-test format-5.9 {g-format} {
-    format "%.3g" .0012341
-} {0.00123}
-test format-5.10 {g-format} {
-    format "%.3g" .00012341
-} {0.000123}
-test format-5.11 {g-format} {eformat} {
-    format "%.3g" .00001234
-} {1.23e-05}
-test format-5.12 {g-format} {eformat} {
-    format "%.4g" 9999.6
-} {1e+04}
-test format-5.13 {g-format} {
-    format "%.4g" 999.96
-} {1000}
-test format-5.14 {g-format} {
-    format "%.3g" 1.0
-} {1}
-test format-5.15 {g-format} {
-    format "%.3g" .1
-} {0.1}
-test format-5.16 {g-format} {
-    format "%.3g" .01
-} {0.01}
-test format-5.17 {g-format} {
-    format "%.3g" .001
-} {0.001}
-test format-5.18 {g-format} {eformat} {
-    format "%.3g" .00001
-} {1e-05}
-test format-5.19 {g-format} {eformat} {
-    format "%#.3g" 1234.0
-} {1.23e+03}
-test format-5.20 {g-format} {eformat} {
-    format "%#.3G" 9999.5
-} {1.00E+04}
-
-test format-6.1 {floating-point zeroes} {eformat} {
-    format "%e %f %g" 0.0 0.0 0.0 0.0
-} {0.000000e+00 0.000000 0}
-test format-6.2 {floating-point zeroes} {eformat} {
-    format "%.4e %.4f %.4g" 0.0 0.0 0.0 0.0
-} {0.0000e+00 0.0000 0}
-test format-6.3 {floating-point zeroes} {eformat} {
-    format "%#.4e %#.4f %#.4g" 0.0 0.0 0.0 0.0
-} {0.0000e+00 0.0000 0.000}
-test format-6.4 {floating-point zeroes} {eformat} {
-    format "%.0e %.0f %.0g" 0.0 0.0 0.0 0.0
-} {0e+00 0 0}
-test format-6.5 {floating-point zeroes} {eformat} {
-    format "%#.0e %#.0f %#.0g" 0.0 0.0 0.0 0.0
-} {0.e+00 0. 0.}
-test format-6.6 {floating-point zeroes} {
-    format "%3.0f %3.0f %3.0f %3.0f" 0.0 0.0 0.0 0.0
-} {  0   0   0   0}
-test format-6.7 {floating-point zeroes} {
-    format "%3.0f %3.0f %3.0f %3.0f" 1.0 1.1 1.01 1.001
-} {  1   1   1   1}
-test format-6.8 {floating-point zeroes} {
-    format "%3.1f %3.1f %3.1f %3.1f" 0.0 0.1 0.01 0.001
-} {0.0 0.1 0.0 0.0}
-
-test format-7.1 {various syntax features} {
-    format "%*.*f" 12 3 12.345678901
-} {      12.346}
-test format-7.2 {various syntax features} {
-    format "%0*.*f" 12 3 12.345678901
-} {00000012.346}
-test format-7.3 {various syntax features} {
-    format "\*\t\\n"
-} {*	\n}
-
-test format-8.1 {error conditions} {
-    catch format
-} 1
-test format-8.2 {error conditions} {
-    catch format msg
-    set msg
-} {wrong # args: should be "format formatString ?arg arg ...?"}
-test format-8.3 {error conditions} {
-    catch {format %*d}
-} 1
-test format-8.4 {error conditions} {
-    catch {format %*d} msg
-    set msg
-} {not enough arguments for all format specifiers}
-test format-8.5 {error conditions} {
-    catch {format %*.*f 12}
-} 1
-test format-8.6 {error conditions} {
-    catch {format %*.*f 12} msg
-    set msg
-} {not enough arguments for all format specifiers}
-test format-8.7 {error conditions} {
-    catch {format %*.*f 12 3}
-} 1
-test format-8.8 {error conditions} {
-    catch {format %*.*f 12 3} msg
-    set msg
-} {not enough arguments for all format specifiers}
-test format-8.9 {error conditions} {
-    list [catch {format %*d x 3} msg] $msg
-} {1 {expected integer but got "x"}}
-test format-8.10 {error conditions} {
-    list [catch {format %*.*f 2 xyz 3} msg] $msg
-} {1 {expected integer but got "xyz"}}
-test format-8.11 {error conditions} {
-    catch {format %d 2a}
-} 1
-test format-8.12 {error conditions} {
-    catch {format %d 2a} msg
-    set msg
-} {expected integer but got "2a"}
-test format-8.13 {error conditions} {
-    catch {format %c 2x}
-} 1
-test format-8.14 {error conditions} {
-    catch {format %c 2x} msg
-    set msg
-} {expected integer but got "2x"}
-test format-8.15 {error conditions} {
-    catch {format %f 2.1z}
-} 1
-test format-8.16 {error conditions} {
-    catch {format %f 2.1z} msg
-    set msg
-} {expected floating-point number but got "2.1z"}
-test format-8.17 {error conditions} {
-    catch {format ab%}
-} 1
-test format-8.18 {error conditions} {
-    catch {format ab% 12} msg
-    set msg
-} {format string ended in middle of field specifier}
-test format-8.19 {error conditions} {
-    catch {format %q x}
-} 1
-test format-8.20 {error conditions} {
-    catch {format %q x} msg
-    set msg
-} {bad field specifier "q"}
-test format-8.21 {error conditions} {
-    catch {format %d}
-} 1
-test format-8.22 {error conditions} {
-    catch {format %d} msg
-    set msg
-} {not enough arguments for all format specifiers}
-test format-8.23 {error conditions} {
-    catch {format "%d %d" 24 xyz} msg
-    set msg
-} {expected integer but got "xyz"}
-
-test format-9.1 {long result} {
-    set a {1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
-    format {1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG %s %s} $a $a
-} {1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG 1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u v w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
-
-test format-10.1 {"h" format specifier} {nonPortable} {
-    format %hd 0xffff
-} -1
-test format-10.2 {"h" format specifier} {nonPortable} {
-    format %hx 0x10fff
-} fff
-test format-10.3 {"h" format specifier} {nonPortable} {
-    format %hd 0x10000
-} 0
-
-test format-11.1 {XPG3 %$n specifiers} {
-    format {%2$d %1$d} 4 5
-} {5 4}
-test format-11.2 {XPG3 %$n specifiers} {
-    format {%2$d %1$d %1$d %3$d} 4 5 6
-} {5 4 4 6}
-test format-11.3 {XPG3 %$n specifiers} {
-    list [catch {format {%2$d %3$d} 4 5} msg] $msg
-} {1 {"%n$" argument index out of range}}
-test format-11.4 {XPG3 %$n specifiers} {
-    list [catch {format {%2$d %0$d} 4 5 6} msg] $msg
-} {1 {"%n$" argument index out of range}}
-test format-11.5 {XPG3 %$n specifiers} {
-    list [catch {format {%d %1$d} 4 5 6} msg] $msg
-} {1 {cannot mix "%" and "%n$" conversion specifiers}}
-test format-11.6 {XPG3 %$n specifiers} {
-    list [catch {format {%2$d %d} 4 5 6} msg] $msg
-} {1 {cannot mix "%" and "%n$" conversion specifiers}}
-test format-11.7 {XPG3 %$n specifiers} {
-    list [catch {format {%2$d %3d} 4 5 6} msg] $msg
-} {1 {cannot mix "%" and "%n$" conversion specifiers}}
-test format-11.8 {XPG3 %$n specifiers} {
-    format {%2$*d %3$d} 1 10 4
-} {         4 4}
-test format-11.9 {XPG3 %$n specifiers} {
-    format {%2$.*s %4$d} 1 5 abcdefghijklmnop 44
-} {abcde 44}
-test format-11.10 {XPG3 %$n specifiers} {
-    list [catch {format {%2$*d} 4} msg] $msg
-} {1 {"%n$" argument index out of range}}
-test format-11.11 {XPG3 %$n specifiers} {
-    list [catch {format {%2$*d} 4 5} msg] $msg
-} {1 {"%n$" argument index out of range}}
-test format-11.12 {XPG3 %$n specifiers} {
-    list [catch {format {%2$*d} 4 5 6} msg] $msg
-} {0 {    6}}
-
-test format-12.1 {negative width specifiers} {
-    format "%*d" -47 25
-} {25                                             }
-test format-13.1 {tcl_precision fuzzy comparison} {
-    catch {unset a}
-    catch {unset b}
-    catch {unset c}
-    catch {unset d}
-    set a 0.0000000000001
-    set b 0.00000000000001
-    set c 0.00000000000000001
-    set d [expr $a + $b + $c]
-    format {%0.10f %0.12f %0.15f %0.17f} $d $d $d $d
-} {0.0000000000 0.000000000000 0.000000000000110 0.00000000000011001}
-test format-13.2 {tcl_precision fuzzy comparison} {
-    catch {unset a}
-    catch {unset b}
-    catch {unset c}
-    catch {unset d}
-    set a 0.000000000001
-    set b 0.000000000000005
-    set c 0.0000000000000008
-    set d [expr $a + $b + $c]
-    format {%0.10f %0.12f %0.15f %0.17f} $d $d $d $d
-} {0.0000000000 0.000000000001 0.000000000001006 0.00000000000100580}
-test format-13.3 {tcl_precision fuzzy comparison} {
-    catch {unset a}
-    catch {unset b}
-    catch {unset c}
-    set a 0.00000000000099
-    set b 0.000000000000011
-    set c [expr $a + $b]
-    format {%0.10f %0.12f %0.15f %0.17f} $c $c $c $c
-} {0.0000000000 0.000000000001 0.000000000001001 0.00000000000100100}
-test format-13.4 {tcl_precision fuzzy comparison} {
-    catch {unset a}
-    catch {unset b}
-    catch {unset c}
-    set a 0.444444444444
-    set b 0.33333333333333
-    set c [expr $a + $b]
-    format {%0.10f %0.12f %0.15f %0.16f} $c $c $c $c
-} {0.7777777778 0.777777777777 0.777777777777330 0.7777777777773300}
-test format-13.5 {tcl_precision fuzzy comparison} {
-    catch {unset a}
-    catch {unset b}
-    catch {unset c}
-    set a 0.444444444444
-    set b 0.99999999999999
-    set c [expr $a + $b]
-    format {%0.10f %0.12f %0.15f} $c $c $c
-} {1.4444444444 1.444444444444 1.444444444443990}
-test format-14.1 {testing MAX_FLOAT_SIZE for 0 and 1} {
-    format {%s} ""
-} {}
-test format-14.2 {testing MAX_FLOAT_SIZE for 0 and 1} {
-    format {%s} "a"
-} {a}
-
-set a "0123456789"
-set b ""
-for {set i 0} {$i < 290} {incr i} {
-    append b $a
-}
-for {set i 290} {$i < 400} {incr i} {
-    test format-15.[expr $i -290] {testing MAX_FLOAT_SIZE} {
-        format {%s} $b    
-    } $b
-    append b "x"
-}
-
-# cleanup
-catch {unset a}
-catch {unset b}
-catch {unset c}
-catch {unset d}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/get.test b/tests/get.test
deleted file mode 100644
index 261cf19..0000000
--- a/tests/get.test
+++ /dev/null
@@ -1,110 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for the procedures in the
-# file tclGet.c.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: get.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test get-1.1 {Tcl_GetInt procedure} {
-    set x 44
-    incr x { 	  22}
-} {66}
-test get-1.2 {Tcl_GetInt procedure} {
-    set x 44
-    incr x -3
-} {41}
-test get-1.3 {Tcl_GetInt procedure} {
-    set x 44
-    incr x +8
-} {52}
-test get-1.4 {Tcl_GetInt procedure} {
-    set x 44
-    list [catch {incr x foo} msg] $msg
-} {1 {expected integer but got "foo"}}
-test get-1.5 {Tcl_GetInt procedure} {
-    set x 44
-    list [catch {incr x {16	 }} msg] $msg
-} {0 60}
-test get-1.6 {Tcl_GetInt procedure} {
-    set x 44
-    list [catch {incr x {16	 x}} msg] $msg
-} {1 {expected integer but got "16	 x"}}
-
-# The following tests are non-portable because they depend on
-# word size.
-
-if {0x80000000 > 0} {
-    test get-1.7 {Tcl_GetInt procedure} {
-	set x 44
-	list [catch {incr x 18446744073709551616} msg] $msg $errorCode
-    } {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-    test get-1.8 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x 18446744073709551614} msg] $msg
-    } {0 -2}
-    test get-1.9 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x +18446744073709551614} msg] $msg
-    } {0 -2}
-    test get-1.10 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x -18446744073709551614} msg] $msg
-    } {0 2}
-} else {
-    test get-1.7 {Tcl_GetInt procedure} {
-	set x 44
-	list [catch {incr x 4294967296} msg] $msg $errorCode
-    } {1 {integer value too large to represent} {ARITH IOVERFLOW {integer value too large to represent}}}
-    test get-1.8 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x 4294967294} msg] $msg
-    } {0 -2}
-    test get-1.9 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x +4294967294} msg] $msg
-    } {0 -2}
-    test get-1.10 {Tcl_GetInt procedure} {
-	set x 0
-	list [catch {incr x -4294967294} msg] $msg
-    } {0 2}
-}
-
-test get-2.1 {Tcl_GetInt procedure} {
-    format %g 1.23
-} {1.23}
-test get-2.2 {Tcl_GetInt procedure} {
-    format %g { 	 1.23 	}
-} {1.23}
-test get-2.3 {Tcl_GetInt procedure} {
-    list [catch {format %g clip} msg] $msg
-} {1 {expected floating-point number but got "clip"}}
-test get-2.4 {Tcl_GetInt procedure} {nonPortable} {
-    list [catch {format %g .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001} msg] $msg $errorCode
-} {1 {floating-point value too small to represent} {ARITH UNDERFLOW {floating-point value too small to represent}}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/history.test b/tests/history.test
deleted file mode 100644
index c7f7d20..0000000
--- a/tests/history.test
+++ /dev/null
@@ -1,230 +0,0 @@
-# Commands covered:  history
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: history.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-  
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[catch {history}]} {
-    puts stdout "This version of Tcl was built without the history command;\n"
-    puts stdout "history tests will be skipped.\n"
-    ::tcltest::cleanupTests
-    return
-}
-
-set num [history nextid]
-history keep 3
-history add {set a 12345}
-history add {set b [format {A test %s} string]}
-history add {Another test}
-
-# "history event"
-
-test history-1.1 {event option} {history event -1} \
-	{set b [format {A test %s} string]}
-test history-1.2 {event option} {history event $num} \
-	{set a 12345}
-test history-1.3 {event option} {history event [expr $num+2]} \
-	{Another test}
-test history-1.4 {event option} {history event set} \
-	{set b [format {A test %s} string]}
-test history-1.5 {event option} {history e "* a*"} \
-	{set a 12345}
-test history-1.6 {event option} {catch {history event *gorp} msg} 1
-test history-1.7 {event option} {
-    catch {history event *gorp} msg
-    set msg
-} {no event matches "*gorp"}
-test history-1.8 {event option} {history event} \
-	{set b [format {A test %s} string]}
-test history-1.9 {event option} {catch {history event 123 456} msg} 1
-test history-1.10 {event option} {
-    catch {history event 123 456} msg
-    set msg
-} {wrong # args: should be "history event ?event?"}
-
-# "history redo"
-
-set a 0
-history redo -2
-test history-2.1 {redo option} {set a} 12345
-set b 0
-history redo
-test history-2.2 {redo option} {set b} {A test string}
-test history-2.3 {redo option} {catch {history redo -3 -4}} 1
-test history-2.4 {redo option} {
-    catch {history redo -3 -4} msg
-    set msg
-} {wrong # args: should be "history redo ?event?"}
-
-# "history add"
-
-history add "set a 444" exec
-test history-3.1 {add option} {set a} 444
-test history-3.2 {add option} {catch {history add "set a 444" execGorp}} 1
-test history-3.3 {add option} {
-    catch {history add "set a 444" execGorp} msg
-    set msg
-} {bad argument "execGorp": should be "exec"}
-test history-3.4 {add option} {catch {history add "set a 444" a} msg} 1
-test history-3.5 {add option} {
-    catch {history add "set a 444" a} msg
-    set msg
-} {bad argument "a": should be "exec"}
-history add "set a 555" e
-test history-3.6 {add option} {set a} 555
-history add "set a 666"
-test history-3.7 {add option} {set a} 555
-test history-3.8 {add option} {catch {history add "set a 666" e f} msg} 1
-test history-3.9 {add option} {
-    catch {history add "set a 666" e f} msg
-    set msg
-} {wrong # args: should be "history add event ?exec?"}
-
-# "history change"
-
-history change "A test value"
-test history-4.1 {change option} {history event [expr {[history n]-1}]} \
-	"A test value"
-history ch "Another test" -1
-test history-4.2 {change option} {history e} "Another test"
-test history-4.3 {change option} {history event [expr {[history n]-1}]} \
-	"A test value"
-test history-4.4 {change option} {catch {history change Foo 4 10}} 1
-test history-4.5 {change option} {
-    catch {history change Foo 4 10} msg
-    set msg
-} {wrong # args: should be "history change newValue ?event?"}
-test history-4.6 {change option} {
-    catch {history change Foo [expr {[history n]-4}]}
-} 1
-set num [expr {[history n]-4}]
-test history-4.7 {change option} {
-    catch {history change Foo $num} msg
-    set msg
-} "event \"$num\" is too far in the past"
-
-# "history info"
-
-set num [history n]
-history add set\ a\ {b\nc\ d\ e}
-history add {set b 1234}
-history add set\ c\ {a\nb\nc}
-test history-5.1 {info option} {history info} [format {%6d  set a {b
-	c d e}
-%6d  set b 1234
-%6d  set c {a
-	b
-	c}} $num [expr $num+1] [expr $num+2]]
-test history-5.2 {info option} {history i 2} [format {%6d  set b 1234
-%6d  set c {a
-	b
-	c}} [expr $num+1] [expr $num+2]]
-test history-5.3 {info option} {catch {history i 2 3}} 1
-test history-5.4 {info option} {
-    catch {history i 2 3} msg
-    set msg
-} {wrong # args: should be "history info ?count?"}
-test history-5.5 {info option} {history} [format {%6d  set a {b
-	c d e}
-%6d  set b 1234
-%6d  set c {a
-	b
-	c}} $num [expr $num+1] [expr $num+2]]
-
-# "history keep"
-
-history add "foo1"
-history add "foo2"
-history add "foo3"
-history keep 2
-test history-6.1 {keep option} {history event [expr [history n]-1]} foo3
-test history-6.2 {keep option} {history event -1} foo2
-test history-6.3 {keep option} {catch {history event -3}} 1
-test history-6.4 {keep option} {
-    catch {history event -3} msg
-    set msg
-} {event "-3" is too far in the past}
-history k 5
-test history-6.5 {keep option} {history event -1} foo2
-test history-6.6 {keep option} {history event -2} {}
-test history-6.7 {keep option} {history event -3} {}
-test history-6.8 {keep option} {history event -4} {}
-test history-6.9 {keep option} {catch {history event -5}} 1
-test history-6.10 {keep option} {catch {history keep 4 6}} 1
-test history-6.11 {keep option} {
-    catch {history keep 4 6} msg
-    set msg
-} {wrong # args: should be "history keep ?count?"}
-test history-6.12 {keep option} {catch {history keep}} 0
-test history-6.13 {keep option} {
-    history keep
-} {5}
-test history-6.14 {keep option} {catch {history keep -3}} 1
-test history-6.15 {keep option} {
-    catch {history keep -3} msg
-    set msg
-} {illegal keep count "-3"}
-test history-6.16 {keep option} {
-    catch {history keep butter} msg
-    set msg
-} {illegal keep count "butter"}
-
-# "history nextid"
-
-set num [history n]
-history add "Testing"
-history add "Testing2"
-test history-7.1 {nextid option} {history event} "Testing"
-test history-7.2 {nextid option} {history next} [expr $num+2]
-test history-7.3 {nextid option} {catch {history nextid garbage}} 1
-test history-7.4 {nextid option} {
-    catch {history nextid garbage} msg
-    set msg
-} {wrong # args: should be "history nextid"}
-
-# "history clear"
-
-set num [history n]
-history add "Testing"
-history add "Testing2"
-test history-8.1 {clear option} {catch {history clear junk}} 1
-test history-8.2 {clear option} {history clear} {}
-history add "Testing"
-test history-8.3 {clear option} {history} {     1  Testing}
-
-# miscellaneous
-
-test history-9.1 {miscellaneous} {catch {history gorp} msg} 1
-test history-9.2 {miscellaneous} {
-    catch {history gorp} msg
-    set msg
-} {bad option "gorp": must be add, change, clear, event, info, keep, nextid, or redo}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/http.test b/tests/http.test
deleted file mode 100644
index 752e3a2..0000000
--- a/tests/http.test
+++ /dev/null
@@ -1,315 +0,0 @@
-# Commands covered:  http::config, http::geturl, http::wait, http::reset
-#
-# This file contains a collection of tests for the http script library.
-# Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-#
-# RCS: @(#) $Id: http.test,v 1.4 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[catch {package require http 2.0}]} {
-    if {[info exist http2]} {
-	catch {puts "Cannot load http 2.0 package"}
-	return
-    } else {
-	catch {puts "Running http 2.0 tests in slave interp"}
-	set interp [interp create http2]
-	$interp eval [list set http2 "running"]
-	$interp eval [list source [info script]]
-	interp delete $interp
-	return
-    }
-}
-
-
-set port 8010
-set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
-
-set httpdFile [file join $::tcltest::testsDir httpd]
-if {[info commands testthread] == "testthread" && [file exists $httpdFile]} {
-    set httpthread [testthread create "
-	source $httpdFile
-	testthread wait
-    "]
-    testthread send $httpthread [list set port $port]
-    testthread send $httpthread [list set bindata $bindata]
-    testthread send $httpthread {httpd_init $port}
-    puts "Running httpd in thread $httpthread"
-} else {
-    if ![file exists $httpdFile] {
-	puts "Cannot read $httpdFile script, http test skipped"
-	unset port
-	return
-    }
-    source $httpdFile
-    if [catch {httpd_init $port} listen] {
-	puts "Cannot start http server, http test skipped"
-	unset port
-	return
-    }
-}
-
-
-test http-1.1 {http::config} {
-    http::config
-} {-accept */* -proxyfilter http::ProxyRequired -proxyhost {} -proxyport {} -useragent {Tcl http client package 2.0}}
-
-test http-1.2 {http::config} {
-    http::config -proxyfilter
-} http::ProxyRequired
-
-test http-1.3 {http::config} {
-    catch {http::config -junk}
-} 1
-
-test http-1.4 {http::config} {
-    set savedconf [http::config]
-    http::config -proxyhost nowhere.come -proxyport 8080 -proxyfilter myFilter -useragent "Tcl Test Suite"
-    set x [http::config]
-    eval http::config $savedconf
-    set x
-} {-accept */* -proxyfilter myFilter -proxyhost nowhere.come -proxyport 8080 -useragent {Tcl Test Suite}}
-
-test http-1.5 {http::config} {
-    catch {http::config -proxyhost {} -junk 8080}
-} 1
-
-test http-2.1 {http::reset} {
-    catch {http::reset http#1}
-} 0
-
-test http-3.1 {http::geturl} {
-    catch {http::geturl -bogus flag}
-} 1
-test http-3.2 {http::geturl} {
-    catch {http::geturl http:junk} err
-    set err
-} {Unsupported URL: http:junk}
-
-set url [info hostname]:$port
-test http-3.3 {http::geturl} {
-    set token [http::geturl $url]
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET /</h2>
-</body></html>"
-
-set tail /a/b/c
-set url [info hostname]:$port/a/b/c
-set binurl [info hostname]:$port/binary
-
-test http-3.4 {http::geturl} {
-    set token [http::geturl $url]
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-proc selfproxy {host} {
-    global port
-    return [list [info hostname] $port]
-}
-test http-3.5 {http::geturl} {
-    http::config -proxyfilter selfproxy
-    set token [http::geturl $url]
-    http::config -proxyfilter http::ProxyRequired
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET http://$url</h2>
-</body></html>"
-
-test http-3.6 {http::geturl} {
-    http::config -proxyfilter bogus
-    set token [http::geturl $url]
-    http::config -proxyfilter http::ProxyRequired
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-3.7 {http::geturl} {
-    set token [http::geturl $url -headers {Pragma no-cache}]
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-3.8 {http::geturl} {
-    set token [http::geturl $url -query Name=Value&Foo=Bar]
-    http::data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>POST $tail</h2>
-<h2>Query</h2>
-<dl>
-<dt>Name<dd>Value
-<dt>Foo<dd>Bar
-</dl>
-</body></html>"
-
-test http-3.9 {http::geturl} {
-    set token [http::geturl $url -validate 1]
-    http::code $token
-} "HTTP/1.0 200 OK"
-
-
-test http-4.1 {http::Event} {
-    set token [http::geturl $url]
-    upvar #0 $token data
-    array set meta $data(meta)
-    expr ($data(totalsize) == $meta(Content-Length))
-} 1
-
-test http-4.2 {http::Event} {
-    set token [http::geturl $url]
-    upvar #0 $token data
-    array set meta $data(meta)
-    string compare $data(type) [string trim $meta(Content-Type)]
-} 0
-
-test http-4.3 {http::Event} {
-    set token [http::geturl $url]
-    http::code $token
-} {HTTP/1.0 200 Data follows}
-
-test http-4.4 {http::Event} {
-    set out [open testfile w]
-    set token [http::geturl $url -channel $out]
-    close $out
-    set in [open testfile]
-    set x [read $in]
-    close $in
-    file delete testfile
-    set x
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-4.5 {http::Event} {
-    set out [open testfile w]
-    set token [http::geturl $url -channel $out]
-    close $out
-    upvar #0 $token data
-    file delete testfile
-    expr $data(currentsize) == $data(totalsize)
-} 1
-
-test http-4.6 {http::Event} {
-    set out [open testfile w]
-    set token [http::geturl $binurl -channel $out]
-    close $out
-    set in [open testfile]
-    fconfigure $in -translation binary
-    set x [read $in]
-    close $in
-    file delete testfile
-    set x
-} "$bindata$binurl"
-
-proc myProgress {token total current} {
-    global progress httpLog
-    if {[info exists httpLog] && $httpLog} {
-	puts "progress $total $current"
-    }
-    set progress [list $total $current]
-}
-if 0 {
-    # This test hangs on Windows95 because the client never gets EOF
-    set httpLog 1
-    test http-4.6 {http::Event} {
-	set token [http::geturl $url -blocksize 50 -progress myProgress]
-	set progress
-    } {111 111}
-}
-test http-4.7 {http::Event} {
-    set token [http::geturl $url -progress myProgress]
-    set progress
-} {111 111}
-test http-4.8 {http::Event} {
-    set token [http::geturl $url]
-    http::status $token
-} {ok}
-test http-4.9 {http::Event} {
-    set token [http::geturl $url -progress myProgress]
-    http::code $token
-} {HTTP/1.0 200 Data follows}
-test http-4.10 {http::Event} {
-    set token [http::geturl $url -progress myProgress]
-    http::size $token
-} {111}
-test http-4.11 {http::Event} {
-    set token [http::geturl $url -timeout 1 -command {#}]
-    http::reset $token
-    http::status $token
-} {reset}
-test http-4.12 {http::Event} {
-    set token [http::geturl $url?timeout=10 -timeout 1 -command {#}]
-    http::wait $token
-    http::status $token
-} {timeout}
-
-test http-5.1 {http::formatQuery} {
-    http::formatQuery name1 value1 name2 "value two"
-} {name1=value1&name2=value+two}
-
-test http-5.2 {http::formatQuery} {
-    http::formatQuery name1 ~bwelch name2 \xa1\xa2\xa2
-} {name1=%7ebwelch&name2=%a1%a2%a2}
-
-test http-5.3 {http::formatQuery} {
-    http::formatQuery lines "line1\nline2\nline3"
-} {lines=line1%0d%0aline2%0d%0aline3}
-
-test http-6.1 {http::ProxyRequired} {
-    http::config -proxyhost [info hostname] -proxyport $port
-    set token [http::geturl $url]
-    http::wait $token
-    http::config -proxyhost {} -proxyport {}
-    upvar #0 $token data
-    set data(body)
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET http://$url</h2>
-</body></html>"
-
-# cleanup
-unset url
-unset port
-if {[info exists httpthread]} {
-    testthread send -async $httpthread {
-	testthread exit
-    }
-} else {
-    close $listen
-}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/httpd b/tests/httpd
deleted file mode 100644
index 1531964..0000000
--- a/tests/httpd
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# The httpd_ procedures implement a stub http server.
-#
-# Copyright (c) 1997-1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# SCCS: @(#) httpd 1.2 98/02/20 14:51:59
-
-proc httpd_init {{port 8015}} {
-    socket -server httpdAccept $port
-}
-proc httpd_log {args} {
-    global httpLog
-    if {[info exists httpLog] && $httpLog} {
-	puts stderr "httpd: [join $args { }]"
-    }
-}
-array set httpdErrors {
-    204 {No Content}
-    400 {Bad Request}
-    404 {Not Found}
-    503 {Service Unavailable}
-    504 {Service Temporarily Unavailable}
-    }
-
-proc httpdError {sock code args} {
-    global httpdErrors
-    puts $sock "$code $httpdErrors($code)"
-    httpd_log "error: [join $args { }]"
-}
-proc httpdAccept {newsock ipaddr port} {
-    global httpd
-    upvar #0 httpd$newsock data
-
-    fconfigure $newsock -blocking 0 -translation {auto crlf}
-    httpd_log $newsock Connect $ipaddr $port
-    set data(ipaddr) $ipaddr
-    fileevent $newsock readable [list httpdRead $newsock]
-}
-
-# read data from a client request
-
-proc httpdRead { sock } {
-    upvar #0 httpd$sock data
-
-    set readCount [gets $sock line]
-    if {![info exists data(state)]} {
-	if [regexp {(POST|GET|HEAD) ([^?]+)\??([^ ]*) HTTP/1.0} \
-		$line x data(proto) data(url) data(query)] {
-	    set data(state) mime
-	    httpd_log $sock Query $line
-	} else {
-	    httpdError $sock 400
-	    httpd_log $sock Error "bad first line:$line"
-	    httpdSockDone $sock
-	}
-	return
-    }
-
-    # string compare $readCount 0 maps -1 to -1, 0 to 0, and > 0 to 1
-
-    set state [string compare $readCount 0],$data(state),$data(proto)
-    httpd_log $sock $state
-    switch -- $state {
-	-1,mime,HEAD	-
-	-1,mime,GET	-
-	-1,mime,POST	{
-	    # gets would block
-	    return
-	}
-	0,mime,HEAD	-
-	0,mime,GET	-
-	0,query,POST	{ httpdRespond $sock }
-	0,mime,POST	{ set data(state) query }
-	1,mime,HEAD	-
-	1,mime,POST	-
-	1,mime,GET	{
-	    if [regexp {([^:]+):[ 	]*(.*)}  $line dummy key value] {
-		set data(mime,[string tolower $key]) $value
-	    }
-	}
-	1,query,POST	{
-	    append data(query) $line
-	    httpdRespond $sock
-	}
-	default {
-	    if [eof $sock] {
-		httpd_log $sock Error "unexpected eof on <$data(url)> request"
-	    } else {
-		httpd_log $sock Error "unhandled state <$state> fetching <$data(url)>"
-	    }
-	    httpdError $sock 404
-	    httpdSockDone $sock
-	}
-    }
-}
-proc httpdSockDone { sock } {
-upvar #0 httpd$sock data
-    unset data
-    close $sock
-}
-
-# Respond to the query.
-
-proc httpdRespond { sock } {
-    global httpd bindata port
-    upvar #0 httpd$sock data
-
-    if {[string match *binary* $data(url)]} {
-	set html "$bindata[info hostname]:$port$data(url)"
-	set type application/octet-stream
-    } else {
-	set type text/html
-
-	set html "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>$data(proto) $data(url)</h2>
-"
-	if {[info exists data(query)] && [string length $data(query)]} {
-	    append html "<h2>Query</h2>\n<dl>\n"
-	    foreach {key value} [split $data(query) &=] {
-		append html "<dt>$key<dd>$value\n"
-	    }
-	    append html </dl>\n
-	}
-	append html </body></html>
-    }
-
-    if {$data(proto) == "HEAD"} {
-	puts $sock "HTTP/1.0 200 OK"
-    } else {
-	puts $sock "HTTP/1.0 200 Data follows"
-    }
-    puts $sock "Date: [clock format [clock clicks]]"
-    puts $sock "Content-Type: $type"
-    puts $sock "Content-Length: [string length $html]"
-    puts $sock ""
-    if {$data(proto) != "HEAD"} {
-	fconfigure $sock -translation binary
-	puts -nonewline $sock $html
-    }
-    httpd_log $sock Done ""
-    httpdSockDone $sock
-}
-
-
diff --git a/tests/httpold.test b/tests/httpold.test
deleted file mode 100644
index 5d874f6..0000000
--- a/tests/httpold.test
+++ /dev/null
@@ -1,441 +0,0 @@
-# Commands covered:  http_config, http_get, http_wait, http_reset
-#
-# This file contains a collection of tests for the http script library.
-# Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: httpold.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[catch {package require http 1.0}]} {
-    if {[info exist httpold]} {
-	catch {puts "Cannot load http 1.0 package"}
-	::tcltest::cleanupTests
-	return
-    } else {
-	catch {puts "Running http 1.0 tests in slave interp"}
-	set interp [interp create httpold]
-	$interp eval [list set httpold "running"]
-	$interp eval [list source [info script]]
-	interp delete $interp
-	::tcltest::cleanupTests
-	return
-    }
-}
-
-############### The httpd_ procedures implement a stub http server. ########
-proc httpd_init {{port 8015}} {
-    socket -server httpdAccept $port
-}
-proc httpd_log {args} {
-    global httpLog
-    if {[info exists httpLog] && $httpLog} {
-	puts "httpd: [join $args { }]"
-    }
-}
-array set httpdErrors {
-    204 {No Content}
-    400 {Bad Request}
-    404 {Not Found}
-    503 {Service Unavailable}
-    504 {Service Temporarily Unavailable}
-    }
-
-proc httpdError {sock code args} {
-    global httpdErrors
-    puts $sock "$code $httpdErrors($code)"
-    httpd_log "error: [join $args { }]"
-}
-proc httpdAccept {newsock ipaddr port} {
-    global httpd
-    upvar #0 httpd$newsock data
-
-    fconfigure $newsock -blocking 0 -translation {auto crlf}
-    httpd_log $newsock Connect $ipaddr $port
-    set data(ipaddr) $ipaddr
-    fileevent $newsock readable [list httpdRead $newsock]
-}
-
-# read data from a client request
-
-proc httpdRead { sock } {
-    upvar #0 httpd$sock data
-
-    set readCount [gets $sock line]
-    if {![info exists data(state)]} {
-	if [regexp {(POST|GET|HEAD) ([^?]+)\??([^ ]*) HTTP/1.0} \
-		$line x data(proto) data(url) data(query)] {
-	    set data(state) mime
-	    httpd_log $sock Query $line
-	} else {
-	    httpdError $sock 400
-	    httpd_log $sock Error "bad first line:$line"
-	    httpdSockDone $sock
-	}
-	return
-    }
-
-    # string compare $readCount 0 maps -1 to -1, 0 to 0, and > 0 to 1
-
-    set state [string compare $readCount 0],$data(state),$data(proto)
-    httpd_log $sock $state
-    switch -- $state {
-	-1,mime,HEAD	-
-	-1,mime,GET	-
-	-1,mime,POST	{
-	    # gets would block
-	    return
-	}
-	0,mime,HEAD	-
-	0,mime,GET	-
-	0,query,POST	{ httpdRespond $sock }
-	0,mime,POST	{ set data(state) query }
-	1,mime,HEAD	-
-	1,mime,POST	-
-	1,mime,GET	{
-	    if [regexp {([^:]+):[ 	]*(.*)}  $line dummy key value] {
-		set data(mime,[string tolower $key]) $value
-	    }
-	}
-	1,query,POST	{
-	    append data(query) $line
-	    httpdRespond $sock
-	}
-	default {
-	    if [eof $sock] {
-		httpd_log $sock Error "unexpected eof on <$data(url)> request"
-	    } else {
-		httpd_log $sock Error "unhandled state <$state> fetching <$data(url)>"
-	    }
-	    httpdError $sock 404
-	    httpdSockDone $sock
-	}
-    }
-}
-proc httpdSockDone { sock } {
-upvar #0 httpd$sock data
-    unset data
-    catch {close $sock}
-}
-
-# Respond to the query.
-
-set bindata "This is binary data\x0d\x0amore\x0dmore\x0amore\x00null"
-proc httpdRespond { sock } {
-    global httpd bindata port
-    upvar #0 httpd$sock data
-
-    if {[string match *binary* $data(url)]} {
-	set html "$bindata[info hostname]:$port$data(url)"
-	set type application/octet-stream
-    } else {
-	set type text/html
-
-	set html "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>$data(proto) $data(url)</h2>
-"
-	if {[info exists data(query)] && [string length $data(query)]} {
-	    append html "<h2>Query</h2>\n<dl>\n"
-	    foreach {key value} [split $data(query) &=] {
-		append html "<dt>$key<dd>$value\n"
-		if {[string compare $key timeout] == 0} {
-		    # Simulate a timeout by not responding,
-		    # but clean up our socket later.
-
-		    after 50 [list httpdSockDone $sock]
-		    httpd_log $sock Noresponse ""
-		    return
-		}
-	    }
-	    append html </dl>\n
-	}
-	append html </body></html>
-    }
-
-    if {$data(proto) == "HEAD"} {
-	puts $sock "HTTP/1.0 200 OK"
-    } else {
-	puts $sock "HTTP/1.0 200 Data follows"
-    }
-    puts $sock "Date: [clock format [clock clicks]]"
-    puts $sock "Content-Type: $type"
-    puts $sock "Content-Length: [string length $html]"
-    puts $sock ""
-    if {$data(proto) != "HEAD"} {
-	fconfigure $sock -translation binary
-	puts -nonewline $sock $html
-    }
-    httpd_log $sock Done ""
-    httpdSockDone $sock
-}
-##################### end server ###########################
-
-set port 8010
-if [catch {httpd_init $port} listen] {
-    puts "Cannot start http server, http test skipped"
-    unset port
-    ::tcltest::cleanupTests
-    return
-}
-
-test http-1.1 {http_config} {
-    http_config
-} {-accept */* -proxyfilter httpProxyRequired -proxyhost {} -proxyport {} -useragent {Tcl http client package 1.0}}
-
-test http-1.2 {http_config} {
-    http_config -proxyfilter
-} httpProxyRequired
-
-test http-1.3 {http_config} {
-    catch {http_config -junk}
-} 1
-
-test http-1.4 {http_config} {
-    http_config -proxyhost nowhere.come -proxyport 8080 -proxyfilter myFilter -useragent "Tcl Test Suite"
-    set x [http_config]
-    http_config -proxyhost {} -proxyport {} -proxyfilter httpProxyRequired \
-	-useragent "Tcl http client package 1.0"
-    set x
-} {-accept */* -proxyfilter myFilter -proxyhost nowhere.come -proxyport 8080 -useragent {Tcl Test Suite}}
-
-test http-1.5 {http_config} {
-    catch {http_config -proxyhost {} -junk 8080}
-} 1
-
-test http-2.1 {http_reset} {
-    catch {http_reset http#1}
-} 0
-
-test http-3.1 {http_get} {
-    catch {http_get -bogus flag}
-} 1
-test http-3.2 {http_get} {
-    catch {http_get http:junk} err
-    set err
-} {Unsupported URL: http:junk}
-
-set url [info hostname]:$port
-test http-3.3 {http_get} {
-    set token [http_get $url]
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET /</h2>
-</body></html>"
-
-set tail /a/b/c
-set url [info hostname]:$port/a/b/c
-set binurl [info hostname]:$port/binary
-
-test http-3.4 {http_get} {
-    set token [http_get $url]
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-proc selfproxy {host} {
-    global port
-    return [list [info hostname] $port]
-}
-test http-3.5 {http_get} {
-    http_config -proxyfilter selfproxy
-    set token [http_get $url]
-    http_config -proxyfilter httpProxyRequired
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET http://$url</h2>
-</body></html>"
-
-test http-3.6 {http_get} {
-    http_config -proxyfilter bogus
-    set token [http_get $url]
-    http_config -proxyfilter httpProxyRequired
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-3.7 {http_get} {
-    set token [http_get $url -headers {Pragma no-cache}]
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-3.8 {http_get} {
-    set token [http_get $url -query Name=Value&Foo=Bar]
-    http_data $token
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>POST $tail</h2>
-<h2>Query</h2>
-<dl>
-<dt>Name<dd>Value
-<dt>Foo<dd>Bar
-</dl>
-</body></html>"
-
-test http-3.9 {http_get} {
-    set token [http_get $url -validate 1]
-    http_code $token
-} "HTTP/1.0 200 OK"
-
-
-test http-4.1 {httpEvent} {
-    set token [http_get $url]
-    upvar #0 $token data
-    array set meta $data(meta)
-    expr ($data(totalsize) == $meta(Content-Length))
-} 1
-
-test http-4.2 {httpEvent} {
-    set token [http_get $url]
-    upvar #0 $token data
-    array set meta $data(meta)
-    string compare $data(type) [string trim $meta(Content-Type)]
-} 0
-
-test http-4.3 {httpEvent} {
-    set token [http_get $url]
-    http_code $token
-} {HTTP/1.0 200 Data follows}
-
-test http-4.4 {httpEvent} {
-    set out [open testfile w]
-    set token [http_get $url -channel $out]
-    close $out
-    set in [open testfile]
-    set x [read $in]
-    close $in
-    file delete testfile
-    set x
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET $tail</h2>
-</body></html>"
-
-test http-4.5 {httpEvent} {
-    set out [open testfile w]
-    set token [http_get $url -channel $out]
-    close $out
-    upvar #0 $token data
-    file delete testfile
-    expr $data(currentsize) == $data(totalsize)
-} 1
-
-test http-4.6 {httpEvent} {
-    set out [open testfile w]
-    set token [http_get $binurl -channel $out]
-    close $out
-    set in [open testfile]
-    fconfigure $in -translation binary
-    set x [read $in]
-    close $in
-    file delete testfile
-    set x
-} "$bindata$binurl"
-
-proc myProgress {token total current} {
-    global progress httpLog
-    if {[info exists httpLog] && $httpLog} {
-	puts "progress $total $current"
-    }
-    set progress [list $total $current]
-}
-if 0 {
-    # This test hangs on Windows95 because the client never gets EOF
-    set httpLog 1
-    test http-4.6 {httpEvent} {
-	set token [http_get $url -blocksize 50 -progress myProgress]
-	set progress
-    } {111 111}
-}
-test http-4.7 {httpEvent} {
-    set token [http_get $url -progress myProgress]
-    set progress
-} {111 111}
-test http-4.8 {httpEvent} {
-    set token [http_get $url]
-    http_status $token
-} {ok}
-test http-4.9 {httpEvent} {
-    set token [http_get $url -progress myProgress]
-    http_code $token
-} {HTTP/1.0 200 Data follows}
-test http-4.10 {httpEvent} {
-    set token [http_get $url -progress myProgress]
-    http_size $token
-} {111}
-test http-4.11 {httpEvent} {
-    set token [http_get $url -timeout 1 -command {#}]
-    http_reset $token
-    http_status $token
-} {reset}
-test http-4.12 {httpEvent} {
-    update
-    set x {}
-    after 500 {lappend x ok}
-    set token [http_get $url -timeout 1 -command {lappend x fail}]
-    vwait x
-    list [http_status $token] $x
-} {timeout ok}
-
-test http-5.1 {http_formatQuery} {
-    http_formatQuery name1 value1 name2 "value two"
-} {name1=value1&name2=value+two}
-
-test http-5.2 {http_formatQuery} {
-    http_formatQuery name1 ~bwelch name2 \xa1\xa2\xa2
-} {name1=%7ebwelch&name2=%a1%a2%a2}
-
-test http-5.3 {http_formatQuery} {
-    http_formatQuery lines "line1\nline2\nline3"
-} {lines=line1%0d%0aline2%0d%0aline3}
-
-test http-6.1 {httpProxyRequired} {
-    update
-    http_config -proxyhost [info hostname] -proxyport $port
-    set token [http_get $url]
-    http_wait $token
-    http_config -proxyhost {} -proxyport {}
-    upvar #0 $token data
-    set data(body)
-} "<html><head><title>HTTP/1.0 TEST</title></head><body>
-<h1>Hello, World!</h1>
-<h2>GET http://$url</h2>
-</body></html>"
-
-# cleanup
-unset url
-unset port
-close $listen
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/if-old.test b/tests/if-old.test
deleted file mode 100644
index d21b568..0000000
--- a/tests/if-old.test
+++ /dev/null
@@ -1,175 +0,0 @@
-# Commands covered:  if
-#
-# This file contains the original set of tests for Tcl's if command.
-# Since the if command is now compiled, a new set of tests covering
-# the new implementation is in the file "if.test". Sourcing this file
-# into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: if-old.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test if-old-1.1 {taking proper branch} {
-    set a {}
-    if 0 {set a 1} else {set a 2}
-    set a
-} 2
-test if-old-1.2 {taking proper branch} {
-    set a {}
-    if 1 {set a 1} else {set a 2}
-    set a
-} 1
-test if-old-1.3 {taking proper branch} {
-    set a {}
-    if 1<2 {set a 1}
-    set a
-} 1
-test if-old-1.4 {taking proper branch} {
-    set a {}
-    if 1>2 {set a 1}
-    set a
-} {}
-test if-old-1.5 {taking proper branch} {
-    set a {}
-    if 0 {set a 1} else {}
-    set a
-} {}
-test if-old-1.5 {taking proper branch} {
-    set a {}
-    if 0 {set a 1} elseif 1 {set a 2} elseif 1 {set a 3} else {set a 4}
-    set a
-} {2}
-test if-old-1.6 {taking proper branch} {
-    set a {}
-    if 0 {set a 1} elseif 0 {set a 2} elseif 1 {set a 3} else {set a 4}
-    set a
-} {3}
-test if-old-1.7 {taking proper branch} {
-    set a {}
-    if 0 {set a 1} elseif 0 {set a 2} elseif 0 {set a 3} else {set a 4}
-    set a
-} {4}
-test if-old-1.8 {taking proper branch, multiline test expr} {
-    set a {}
-    if {($tcl_platform(platform) != "foobar1") && \
-	($tcl_platform(platform) != "foobar2")} {set a 3} else {set a 4}
-    set a
-} {3}
-
-
-test if-old-2.1 {optional then-else args} {
-    set a 44
-    if 0 then {set a 1} elseif 0 then {set a 3} else {set a 2}
-    set a
-} 2
-test if-old-2.2 {optional then-else args} {
-    set a 44
-    if 1 then {set a 1} else {set a 2}
-    set a
-} 1
-test if-old-2.3 {optional then-else args} {
-    set a 44
-    if 0 {set a 1} else {set a 2}
-    set a
-} 2
-test if-old-2.4 {optional then-else args} {
-    set a 44
-    if 1 {set a 1} else {set a 2}
-    set a
-} 1
-test if-old-2.5 {optional then-else args} {
-    set a 44
-    if 0 then {set a 1} {set a 2}
-    set a
-} 2
-test if-old-2.6 {optional then-else args} {
-    set a 44
-    if 1 then {set a 1} {set a 2}
-    set a
-} 1
-test if-old-2.7 {optional then-else args} {
-    set a 44
-    if 0 then {set a 1} else {set a 2}
-    set a
-} 2
-test if-old-2.8 {optional then-else args} {
-    set a 44
-    if 0 then {set a 1} elseif 0 {set a 2} elseif 0 {set a 3} {set a 4}
-    set a
-} 4
-
-test if-old-3.1 {return value} {
-    if 1 then {set a 22; concat abc}
-} abc
-test if-old-3.2 {return value} {
-    if 0 then {set a 22; concat abc} elseif 1 {concat def} {concat ghi}
-} def
-test if-old-3.3 {return value} {
-    if 0 then {set a 22; concat abc} else {concat def}
-} def
-test if-old-3.4 {return value} {
-    if 0 then {set a 22; concat abc}
-} {}
-test if-old-3.5 {return value} {
-    if 0 then {set a 22; concat abc} elseif 0 {concat def}
-} {}
-
-test if-old-4.1 {error conditions} {
-    list [catch {if} msg] $msg
-} {1 {wrong # args: no expression after "if" argument}}
-test if-old-4.2 {error conditions} {
-    list [catch {if {[error "error in condition"]} foo} msg] $msg
-} {1 {error in condition}}
-test if-old-4.3 {error conditions} {
-    list [catch {if 2} msg] $msg
-} {1 {wrong # args: no script following "2" argument}}
-test if-old-4.4 {error conditions} {
-    list [catch {if 2 then} msg] $msg
-} {1 {wrong # args: no script following "then" argument}}
-test if-old-4.5 {error conditions} {
-    list [catch {if 2 the} msg] $msg
-} {1 {invalid command name "the"}}
-test if-old-4.6 {error conditions} {
-    list [catch {if 2 then {[error "error in then clause"]}} msg] $msg
-} {1 {error in then clause}}
-test if-old-4.7 {error conditions} {
-    list [catch {if 0 then foo elseif} msg] $msg
-} {1 {wrong # args: no expression after "elseif" argument}}
-test if-old-4.8 {error conditions} {
-    list [catch {if 0 then foo elsei} msg] $msg
-} {1 {invalid command name "elsei"}}
-test if-old-4.9 {error conditions} {
-    list [catch {if 0 then foo elseif 0 bar else} msg] $msg
-} {1 {wrong # args: no script following "else" argument}}
-test if-old-4.10 {error conditions} {
-    list [catch {if 0 then foo elseif 0 bar els} msg] $msg
-} {1 {invalid command name "els"}}
-test if-old-4.11 {error conditions} {
-    list [catch {if 0 then foo elseif 0 bar else {[error "error in else clause"]}} msg] $msg
-} {1 {error in else clause}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/if.test b/tests/if.test
deleted file mode 100644
index 99e7c37..0000000
--- a/tests/if.test
+++ /dev/null
@@ -1,1091 +0,0 @@
-# Commands covered:  if
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: if.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Basic "if" operation.
-
-catch {unset a}
-test if-1.1 {TclCompileIfCmd: missing if/elseif test} {
-    list [catch {if} msg] $msg
-} {1 {wrong # args: no expression after "if" argument}}
-test if-1.2 {TclCompileIfCmd: error in if/elseif test} {
-    list [catch {if {[error "error in condition"]} foo} msg] $msg
-} {1 {error in condition}}
-test if-1.3 {TclCompileIfCmd: error in if/elseif test} {
-    list [catch {if {1+}} msg] $msg $errorInfo
-} {1 {syntax error in expression "1+"} {syntax error in expression "1+"
-    ("if" test expression)
-    while compiling
-"if {1+}"}}
-test if-1.4 {TclCompileIfCmd: if/elseif test in braces} {
-    set a {}
-    if {1<2} {set a 1}
-    set a
-} {1}
-test if-1.5 {TclCompileIfCmd: if/elseif test not in braces} {
-    set a {}
-    if 1<2 {set a 1}
-    set a
-} {1}
-test if-1.6 {TclCompileIfCmd: multiline test expr} {
-    set a {}
-    if {($tcl_platform(platform) != "foobar1") && \
-	($tcl_platform(platform) != "foobar2")} {set a 3} else {set a 4}
-    set a
-} 3
-test if-1.7 {TclCompileIfCmd: "then" after if/elseif test} {
-    set a {}
-    if 4>3 then {set a 1}
-    set a
-} {1}
-test if-1.8 {TclCompileIfCmd: keyword other than "then" after if/elseif test} {
-    set a {}
-    catch {if 1<2 therefore {set a 1}} msg 
-    set msg
-} {invalid command name "therefore"}
-test if-1.9 {TclCompileIfCmd: missing "then" body} {
-    set a {}
-    catch {if 1<2 then} msg 
-    set msg
-} {wrong # args: no script following "then" argument}
-test if-1.10 {TclCompileIfCmd: error in "then" body} {
-    set a {}
-    list [catch {if {$a!="xxx"} then {set}} msg] $msg $errorInfo
-} {1 {wrong # args: should be "set varName ?newValue?"} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("if" then script line 1)
-    while compiling
-"if {$a!="xxx"} then {set}"}}
-test if-1.11 {TclCompileIfCmd: error in "then" body} {
-    list [catch {if 2 then {[error "error in then clause"]}} msg] $msg
-} {1 {error in then clause}}
-test if-1.12 {TclCompileIfCmd: "then" body in quotes} {
-    set a {}
-    if 27>17 "append a x"
-    set a
-} {x}
-test if-1.13 {TclCompileIfCmd: computed "then" body} {
-    catch {unset x1}
-    catch {unset x2}
-    set a {}
-    set x1 {append a x1}
-    set x2 {; append a x2}
-    set a {}
-    if 1 $x1$x2
-    set a
-} {x1x2}
-test if-1.14 {TclCompileIfCmd: taking proper branch} {
-    set a {}
-    if 1<2 {set a 1}
-    set a
-} 1
-test if-1.15 {TclCompileIfCmd: taking proper branch} {
-    set a {}
-    if 1>2 {set a 1}
-    set a
-} {}
-test if-1.16 {TclCompileIfCmd: test jumpFalse instruction replacement after long "then" body} {
-    catch {unset i}
-    set a {}
-    if 1<2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    }
-    set a
-} 3
-test if-1.17 {TclCompileIfCmd: if/elseif test in quotes} {
-    set a {}
-    list [catch {if {"0 < 3"} {set a 1}} msg] $msg
-} {1 {expected boolean value but got "0 < 3"}}
-
-
-test if-2.1 {TclCompileIfCmd: "elseif" after if/elseif test} {
-    set a {}
-    if 3>4 {set a 1} elseif 1 {set a 2}
-    set a
-} {2}
-# Since "else" is optional, the "elwood" below is treated as a command.
-# But then there shouldn't be any additional argument words for the "if".
-test if-2.2 {TclCompileIfCmd: keyword other than "elseif"} {
-    set a {}
-    catch {if 1<2 {set a 1} elwood {set a 2}} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-test if-2.3 {TclCompileIfCmd: missing expression after "elseif"} {
-    set a {}
-    catch {if 1<2 {set a 1} elseif} msg 
-    set msg
-} {wrong # args: no expression after "elseif" argument}
-test if-2.4 {TclCompileIfCmd: error in expression after "elseif"} {
-    set a {}
-    list [catch {if 3>4 {set a 1} elseif {1>}} msg] $msg $errorInfo
-} {1 {syntax error in expression "1>"} {syntax error in expression "1>"
-    ("if" test expression)
-    while compiling
-"if 3>4 {set a 1} elseif {1>}"}}
-test if-2.5 {TclCompileIfCmd: test jumpFalse instruction replacement after long "elseif" body} {
-    catch {unset i}
-    set a {}
-    if 1>2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    } elseif 1<2 then { #; this if arm should be taken
-	set a 4
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 5
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 6
-    }
-    set a
-} 6
-
-test if-3.1 {TclCompileIfCmd: "else" clause} {
-    set a {}
-    if 3>4 {set a 1} elseif {$a == "foo"} {set a 2} else {set a 3}
-    set a
-} 3
-# Since "else" is optional, the "elsex" below is treated as a command.
-# But then there shouldn't be any additional argument words for the "if".
-test if-3.2 {TclCompileIfCmd: keyword other than "else"} {
-    set a {}
-    catch {if 1<2 then {set a 1} elsex {set a 2}} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-test if-3.3 {TclCompileIfCmd: missing body after "else"} {
-    set a {}
-    catch {if 2<1 {set a 1} else} msg 
-    set msg
-} {wrong # args: no script following "else" argument}
-test if-3.4 {TclCompileIfCmd: error compiling body after "else"} {
-    set a {}
-    catch {if 2<1 {set a 1} else {set}} msg 
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("if" else script line 1)
-    while compiling
-"if 2<1 {set a 1} else {set}"}
-test if-3.5 {TclCompileIfCmd: extra arguments after "else" argument} {
-    set a {}
-    catch {if 2<1 {set a 1} else {set a 2} or something} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-# The following test also checks whether contained loops and other
-# commands are properly relocated because a short jump must be replaced
-# by a "long distance" one.
-test if-3.6 {TclCompileIfCmd: test jumpFalse instruction replacement after long "else" clause} {
-    catch {unset i}
-    set a {}
-    if 1>2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    } elseif 1==2 then { #; this if arm should be taken
-	set a 4
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 5
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 6
-    } else {
-	set a 7
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 8
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		if {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 9
-    }
-    set a
-} 9
-
-test if-4.1 {TclCompileIfCmd: "if" command result} {
-    set a {}
-    set a [if 3<4 {set i 27}]
-    set a
-} 27
-test if-4.2 {TclCompileIfCmd: "if" command result} {
-    set a {}
-    set a [if 3>4 {set i 27}]
-    set a
-} {}
-test if-4.3 {TclCompileIfCmd: "if" command result} {
-    set a {}
-    set a [if 0 {set i 1} elseif 1 {set i 2}]
-    set a
-} 2
-test if-4.4 {TclCompileIfCmd: "if" command result} {
-    set a {}
-    set a [if 0 {set i 1} elseif 0 {set i 2} elseif 2>5 {set i 3} else {set i 4}]
-    set a
-} 4
-test if-4.5 {TclCompileIfCmd: return value} {
-    if 0 then {set a 22; concat abc} elseif 1 {concat def} {concat ghi}
-} def
-
-# Check "if" and computed command names.
-
-catch {unset a}
-test if-5.1 {if cmd with computed command names: missing if/elseif test} {
-    set z if
-    list [catch {$z} msg] $msg
-} {1 {wrong # args: no expression after "if" argument}}
-
-test if-5.2 {if cmd with computed command names: error in if/elseif test} {
-    set z if
-    list [catch {$z {[error "error in condition"]} foo} msg] $msg
-} {1 {error in condition}}
-test if-5.3 {if cmd with computed command names: error in if/elseif test} {
-    set z if
-    list [catch {$z {1+}} msg] $msg $errorInfo
-} {1 {syntax error in expression "1+"} {syntax error in expression "1+"
-    while executing
-"$z {1+}"}}
-test if-5.4 {if cmd with computed command names: if/elseif test in braces} {
-    set z if
-    set a {}
-    $z {1<2} {set a 1}
-    set a
-} {1}
-test if-5.5 {if cmd with computed command names: if/elseif test not in braces} {
-    set z if
-    set a {}
-    $z 1<2 {set a 1}
-    set a
-} {1}
-test if-5.6 {if cmd with computed command names: multiline test expr} {
-    set z if
-    set a {}
-    $z {($tcl_platform(platform) != "foobar1") && \
-	($tcl_platform(platform) != "foobar2")} {set a 3} else {set a 4}
-    set a
-} 3
-test if-5.7 {if cmd with computed command names: "then" after if/elseif test} {
-    set z if
-    set a {}
-    $z 4>3 then {set a 1}
-    set a
-} {1}
-test if-5.8 {if cmd with computed command names: keyword other than "then" after if/elseif test} {
-    set z if
-    set a {}
-    catch {$z 1<2 therefore {set a 1}} msg 
-    set msg
-} {invalid command name "therefore"}
-test if-5.9 {if cmd with computed command names: missing "then" body} {
-    set z if
-    set a {}
-    catch {$z 1<2 then} msg 
-    set msg
-} {wrong # args: no script following "then" argument}
-test if-5.10 {if cmd with computed command names: error in "then" body} {
-    set z if
-    set a {}
-    list [catch {$z {$a!="xxx"} then {set}} msg] $msg $errorInfo
-} {1 {wrong # args: should be "set varName ?newValue?"} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    invoked from within
-"$z {$a!="xxx"} then {set}"}}
-test if-5.11 {if cmd with computed command names: error in "then" body} {
-    set z if
-    list [catch {$z 2 then {[error "error in then clause"]}} msg] $msg
-} {1 {error in then clause}}
-test if-5.12 {if cmd with computed command names: "then" body in quotes} {
-    set z if
-    set a {}
-    $z 27>17 "append a x"
-    set a
-} {x}
-test if-5.13 {if cmd with computed command names: computed "then" body} {
-    set z if
-    catch {unset x1}
-    catch {unset x2}
-    set a {}
-    set x1 {append a x1}
-    set x2 {; append a x2}
-    set a {}
-    $z 1 $x1$x2
-    set a
-} {x1x2}
-test if-5.14 {if cmd with computed command names: taking proper branch} {
-    set z if
-    set a {}
-    $z 1<2 {set a 1}
-    set a
-} 1
-test if-5.15 {if cmd with computed command names: taking proper branch} {
-    set z if
-    set a {}
-    $z 1>2 {set a 1}
-    set a
-} {}
-test if-5.16 {if cmd with computed command names: test jumpFalse instruction replacement after long "then" body} {
-    set z if
-    catch {unset i}
-    set a {}
-    $z 1<2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    }
-    set a
-} 3
-test if-5.17 {if cmd with computed command names: if/elseif test in quotes} {
-    set z if
-    set a {}
-    list [catch {$z {"0 < 3"} {set a 1}} msg] $msg
-} {1 {expected boolean value but got "0 < 3"}}
-
-
-test if-6.1 {if cmd with computed command names: "elseif" after if/elseif test} {
-    set z if
-    set a {}
-    $z 3>4 {set a 1} elseif 1 {set a 2}
-    set a
-} {2}
-# Since "else" is optional, the "elwood" below is treated as a command.
-# But then there shouldn't be any additional argument words for the "if".
-test if-6.2 {if cmd with computed command names: keyword other than "elseif"} {
-    set z if
-    set a {}
-    catch {$z 1<2 {set a 1} elwood {set a 2}} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-test if-6.3 {if cmd with computed command names: missing expression after "elseif"} {
-    set z if
-    set a {}
-    catch {$z 1<2 {set a 1} elseif} msg 
-    set msg
-} {wrong # args: no expression after "elseif" argument}
-test if-6.4 {if cmd with computed command names: error in expression after "elseif"} {
-    set z if
-    set a {}
-    list [catch {$z 3>4 {set a 1} elseif {1>}} msg] $msg $errorInfo
-} {1 {syntax error in expression "1>"} {syntax error in expression "1>"
-    while executing
-"$z 3>4 {set a 1} elseif {1>}"}}
-test if-6.5 {if cmd with computed command names: test jumpFalse instruction replacement after long "elseif" body} {
-    set z if
-    catch {unset i}
-    set a {}
-    $z 1>2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    } elseif 1<2 then { #; this if arm should be taken
-	set a 4
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 5
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 6
-    }
-    set a
-} 6
-
-test if-7.1 {if cmd with computed command names: "else" clause} {
-    set z if
-    set a {}
-    $z 3>4 {set a 1} elseif {$a == "foo"} {set a 2} else {set a 3}
-    set a
-} 3
-# Since "else" is optional, the "elsex" below is treated as a command.
-# But then there shouldn't be any additional argument words for the "if".
-test if-7.2 {if cmd with computed command names: keyword other than "else"} {
-    set z if
-    set a {}
-    catch {$z 1<2 then {set a 1} elsex {set a 2}} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-test if-7.3 {if cmd with computed command names: missing body after "else"} {
-    set z if
-    set a {}
-    catch {$z 2<1 {set a 1} else} msg 
-    set msg
-} {wrong # args: no script following "else" argument}
-test if-7.4 {if cmd with computed command names: error compiling body after "else"} {
-    set z if
-    set a {}
-    catch {$z 2<1 {set a 1} else {set}} msg 
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    invoked from within
-"$z 2<1 {set a 1} else {set}"}
-test if-7.5 {if cmd with computed command names: extra arguments after "else" argument} {
-    set z if
-    set a {}
-    catch {$z 2<1 {set a 1} else {set a 2} or something} msg 
-    set msg
-} {wrong # args: extra words after "else" clause in "if" command}
-# The following test also checks whether contained loops and other
-# commands are properly relocated because a short jump must be replaced
-# by a "long distance" one.
-test if-7.6 {if cmd with computed command names: test jumpFalse instruction replacement after long "else" clause} {
-    set z if
-    catch {unset i}
-    set a {}
-    $z 1>2 {
-	set a 1
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 2
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 3
-    } elseif 1==2 then { #; this if arm should be taken
-	set a 4
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 5
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 6
-    } else {
-	set a 7
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 8
-	while {$a != "xxx"} {
-	    break;
-	    while {$i >= 0} {
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		$z {[string compare $a "bar"] < 0} {
-		    set i $i
-		    set i [lindex $s $i]
-		}
-		set i [expr $i-1]
-	    }
-	}
-	set a 9
-    }
-    set a
-} 9
-
-test if-8.1 {if cmd with computed command names: "if" command result} {
-    set z if
-    set a {}
-    set a [$z 3<4 {set i 27}]
-    set a
-} 27
-test if-8.2 {if cmd with computed command names: "if" command result} {
-    set z if
-    set a {}
-    set a [$z 3>4 {set i 27}]
-    set a
-} {}
-test if-8.3 {if cmd with computed command names: "if" command result} {
-    set z if
-    set a {}
-    set a [$z 0 {set i 1} elseif 1 {set i 2}]
-    set a
-} 2
-test if-8.4 {if cmd with computed command names: "if" command result} {
-    set z if
-    set a {}
-    set a [$z 0 {set i 1} elseif 0 {set i 2} elseif 2>5 {set i 3} else {set i 4}]
-    set a
-} 4
-test if-8.5 {if cmd with computed command names: return value} {
-    set z if
-    $z 0 then {set a 22; concat abc} elseif 1 {concat def} {concat ghi}
-} def
-
-test if-9.1 {if cmd with namespace qualifiers} {
-    ::if {1} {set x 4}
-} 4
-
-# Test for incorrect "double evaluation semantics"
-
-test if-10.1 {delayed substitution of then body} {knownBug} {
-    set j 0
-    if {[incr j] == 1} "
-       set result $j
-    "
-    set result
-} {0}
-test if-10.2 {delayed substitution of elseif expression} {knownBug} {
-    set j 0
-    if {[incr j] == 0} {
-       set result badthen
-    } elseif "$j == 1" {
-       set result badelseif
-    } else {
-       set result ok
-    }
-    set result
-} {ok}
-test if-10.3 {delayed substitution of elseif body} {knownBug} {
-    set j 0
-    if {[incr j] == 0} {
-       set result badthen
-    } elseif {1} "
-       set result $j
-    "
-    set result
-} {0}
-test if-10.4 {delayed substitution of else body} {knownBug} {
-    set j 0
-    if {[incr j] == 0} {
-       set result badthen
-    } else "
-       set result $j
-    "
-    set result
-} {0}
-test if-10.5 {substituted control words} {knownBug} {
-    set then then; proc then {} {return badthen}
-    set else else; proc else {} {return badelse}
-    set elseif elseif; proc elseif {} {return badelseif}
-    list [catch {if 1 $then {if 0 {} $elseif 1 {if 0 {} $else {list ok}}}} a] $a
-} {0 ok}
-test if-10.6 {double invocation of variable traces} {knownBug} {
-    set iftracecounter 0
-    proc iftraceproc {args} {
-       upvar #0 iftracecounter counter
-       set argc [llength $args]
-       set extraargs [lrange $args 0 [expr {$argc - 4}]]
-       set name [lindex $args [expr {$argc - 3}]]
-       upvar 1 $name var
-       if {[incr counter] % 2 == 1} {
-           set var "$counter oops [concat $extraargs]"
-       } else {
-           set var "$counter + [concat $extraargs]"
-       }
-    }
-    trace variable iftracevar r [list iftraceproc 10]
-    list [catch {if "$iftracevar + 20" {}} a] $a \
-        [catch {if "$iftracevar + 20" {}} b] $b \
-        [unset iftracevar iftracecounter]
-} {1 {syntax error in expression "1 oops 10 + 20"} 0 {} {}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/incr-old.test b/tests/incr-old.test
deleted file mode 100644
index 64b2012..0000000
--- a/tests/incr-old.test
+++ /dev/null
@@ -1,106 +0,0 @@
-# Commands covered:  incr
-#
-# This file contains the original set of tests for Tcl's incr command.
-# Since the incr command is now compiled, a new set of tests covering
-# the new implementation is in the file "incr.test". Sourcing this file
-# into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: incr-old.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset x}
-
-test incr-old-1.1 {basic incr operation} {
-    set x 23
-    list [incr x] $x
-} {24 24}
-test incr-old-1.2 {basic incr operation} {
-    set x 106
-    list [incr x -5] $x
-} {101 101}
-test incr-old-1.3 {basic incr operation} {
-    set x "  -106"
-    list [incr x 1] $x
-} {-105 -105}
-test incr-old-1.3 {basic incr operation} {
-    set x "  +106"
-    list [incr x 1] $x
-} {107 107}
-
-test incr-old-2.1 {incr errors} {
-    list [catch incr msg] $msg
-} {1 {wrong # args: should be "incr varName ?increment?"}}
-test incr-old-2.2 {incr errors} {
-    list [catch {incr a b c} msg] $msg
-} {1 {wrong # args: should be "incr varName ?increment?"}}
-test incr-old-2.3 {incr errors} {
-    catch {unset x}
-    list [catch {incr x} msg] $msg $errorInfo
-} {1 {can't read "x": no such variable} {can't read "x": no such variable
-    (reading value of variable to increment)
-    invoked from within
-"incr x"}}
-test incr-old-2.4 {incr errors} {
-    set x abc
-    list [catch {incr x} msg] $msg $errorInfo
-} {1 {expected integer but got "abc"} {expected integer but got "abc"
-    while executing
-"incr x"}}
-test incr-old-2.5 {incr errors} {
-    set x 123
-    list [catch {incr x 1a} msg] $msg $errorInfo
-} {1 {expected integer but got "1a"} {expected integer but got "1a"
-    while executing
-"incr x 1a"}}
-test incr-old-2.6 {incr errors} {
-    proc readonly args {error "variable is read-only"}
-    set x 123
-    trace var x w readonly
-    list [catch {incr x 1} msg] $msg $errorInfo
-} {1 {can't set "x": variable is read-only} {can't set "x": variable is read-only
-    while executing
-"incr x 1"}}
-catch {unset x}
-test incr-old-2.7 {incr errors} {
-    set x -
-    list [catch {incr x 1} msg] $msg
-} {1 {expected integer but got "-"}}
-test incr-old-2.8 {incr errors} {
-    set x {  -  }
-    list [catch {incr x 1} msg] $msg
-} {1 {expected integer but got "  -  "}}
-test incr-old-2.9 {incr errors} {
-    set x +
-    list [catch {incr x 1} msg] $msg
-} {1 {expected integer but got "+"}}
-test incr-old-2.10 {incr errors} {
-    set x {20 x}
-    list [catch {incr x 1} msg] $msg
-} {1 {expected integer but got "20 x"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/incr.test b/tests/incr.test
deleted file mode 100644
index 02ccf37..0000000
--- a/tests/incr.test
+++ /dev/null
@@ -1,513 +0,0 @@
-# Commands covered:  incr
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: incr.test,v 1.3 1999/04/16 00:47:28 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Basic "incr" operation.
-
-catch {unset x}
-catch {unset i}
-
-test incr-1.1 {TclCompileIncrCmd: missing variable name} {
-    list [catch {incr} msg] $msg
-} {1 {wrong # args: should be "incr varName ?increment?"}}
-test incr-1.2 {TclCompileIncrCmd: simple variable name} {
-    set i 10
-    list [incr i] $i
-} {11 11}
-test incr-1.3 {TclCompileIncrCmd: error compiling variable name} {
-    set i 10
-    catch {incr "i"xxx} msg
-    set msg
-} {extra characters after close-quote}
-test incr-1.4 {TclCompileIncrCmd: simple variable name in quotes} {
-    set i 17
-    list [incr "i"] $i
-} {18 18}
-test incr-1.5 {TclCompileIncrCmd: simple variable name in braces} {
-    catch {unset {a simple var}}
-    set {a simple var} 27
-    list [incr {a simple var}] ${a simple var}
-} {28 28}
-test incr-1.6 {TclCompileIncrCmd: simple array variable name} {
-    catch {unset a}
-    set a(foo) 37
-    list [incr a(foo)] $a(foo)
-} {38 38}
-test incr-1.7 {TclCompileIncrCmd: non-simple (computed) variable name} {
-    set x "i"
-    set i 77
-    list [incr $x 2] $i
-} {79 79}
-test incr-1.8 {TclCompileIncrCmd: non-simple (computed) variable name} {
-    set x "i"
-    set i 77
-    list [incr [set x] +2] $i
-} {79 79}
-
-test incr-1.9 {TclCompileIncrCmd: increment given} {
-    set i 10
-    list [incr i +07] $i
-} {17 17}
-test incr-1.10 {TclCompileIncrCmd: no increment given} {
-    set i 10
-    list [incr i] $i
-} {11 11}
-
-test incr-1.11 {TclCompileIncrCmd: simple global name} {
-    proc p {} {
-        global i
-        set i 54
-        incr i
-    }
-    p
-} {55}
-test incr-1.12 {TclCompileIncrCmd: simple local name} {
-    proc p {} {
-        set foo 100
-        incr foo
-    }
-    p
-} {101}
-test incr-1.13 {TclCompileIncrCmd: simple but new (unknown) local name} {
-    proc p {} {
-        incr bar
-    }
-    catch {p} msg
-    set msg
-} {can't read "bar": no such variable}
-test incr-1.14 {TclCompileIncrCmd: simple local name, >255 locals} {
-    proc 260locals {} {
-        # create 260 locals
-        set a0 0; set a1 0; set a2 0; set a3 0; set a4 0
-        set a5 0; set a6 0; set a7 0; set a8 0; set a9 0
-        set b0 0; set b1 0; set b2 0; set b3 0; set b4 0
-        set b5 0; set b6 0; set b7 0; set b8 0; set b9 0
-        set c0 0; set c1 0; set c2 0; set c3 0; set c4 0
-        set c5 0; set c6 0; set c7 0; set c8 0; set c9 0
-        set d0 0; set d1 0; set d2 0; set d3 0; set d4 0
-        set d5 0; set d6 0; set d7 0; set d8 0; set d9 0
-        set e0 0; set e1 0; set e2 0; set e3 0; set e4 0
-        set e5 0; set e6 0; set e7 0; set e8 0; set e9 0
-        set f0 0; set f1 0; set f2 0; set f3 0; set f4 0
-        set f5 0; set f6 0; set f7 0; set f8 0; set f9 0
-        set g0 0; set g1 0; set g2 0; set g3 0; set g4 0
-        set g5 0; set g6 0; set g7 0; set g8 0; set g9 0
-        set h0 0; set h1 0; set h2 0; set h3 0; set h4 0
-        set h5 0; set h6 0; set h7 0; set h8 0; set h9 0
-        set i0 0; set i1 0; set i2 0; set i3 0; set i4 0
-        set i5 0; set i6 0; set i7 0; set i8 0; set i9 0
-        set j0 0; set j1 0; set j2 0; set j3 0; set j4 0
-        set j5 0; set j6 0; set j7 0; set j8 0; set j9 0
-        set k0 0; set k1 0; set k2 0; set k3 0; set k4 0
-        set k5 0; set k6 0; set k7 0; set k8 0; set k9 0
-        set l0 0; set l1 0; set l2 0; set l3 0; set l4 0
-        set l5 0; set l6 0; set l7 0; set l8 0; set l9 0
-        set m0 0; set m1 0; set m2 0; set m3 0; set m4 0
-        set m5 0; set m6 0; set m7 0; set m8 0; set m9 0
-        set n0 0; set n1 0; set n2 0; set n3 0; set n4 0
-        set n5 0; set n6 0; set n7 0; set n8 0; set n9 0
-        set o0 0; set o1 0; set o2 0; set o3 0; set o4 0
-        set o5 0; set o6 0; set o7 0; set o8 0; set o9 0
-        set p0 0; set p1 0; set p2 0; set p3 0; set p4 0
-        set p5 0; set p6 0; set p7 0; set p8 0; set p9 0
-        set q0 0; set q1 0; set q2 0; set q3 0; set q4 0
-        set q5 0; set q6 0; set q7 0; set q8 0; set q9 0
-        set r0 0; set r1 0; set r2 0; set r3 0; set r4 0
-        set r5 0; set r6 0; set r7 0; set r8 0; set r9 0
-        set s0 0; set s1 0; set s2 0; set s3 0; set s4 0
-        set s5 0; set s6 0; set s7 0; set s8 0; set s9 0
-        set t0 0; set t1 0; set t2 0; set t3 0; set t4 0
-        set t5 0; set t6 0; set t7 0; set t8 0; set t9 0
-        set u0 0; set u1 0; set u2 0; set u3 0; set u4 0
-        set u5 0; set u6 0; set u7 0; set u8 0; set u9 0
-        set v0 0; set v1 0; set v2 0; set v3 0; set v4 0
-        set v5 0; set v6 0; set v7 0; set v8 0; set v9 0
-        set w0 0; set w1 0; set w2 0; set w3 0; set w4 0
-        set w5 0; set w6 0; set w7 0; set w8 0; set w9 0
-        set x0 0; set x1 0; set x2 0; set x3 0; set x4 0
-        set x5 0; set x6 0; set x7 0; set x8 0; set x9 0
-        set y0 0; set y1 0; set y2 0; set y3 0; set y4 0
-        set y5 0; set y6 0; set y7 0; set y8 0; set y9 0
-        set z0 0; set z1 0; set z2 0; set z3 0; set z4 0
-        set z5 0; set z6 0; set z7 0; set z8 0; set z9 0
-        # now increment the last one (local var index > 255)
-        incr z9
-    }
-    260locals
-} {1}
-test incr-1.15 {TclCompileIncrCmd: variable is array} {
-    catch {unset a}
-    set a(foo) 27
-    set x [incr a(foo) 11]
-    catch {unset a}
-    set x
-} 38
-test incr-1.16 {TclCompileIncrCmd: variable is array, elem substitutions} {
-    catch {unset a}
-    set i 5
-    set a(foo5) 27
-    set x [incr a(foo$i) 11]
-    catch {unset a}
-    set x
-} 38
-
-test incr-1.17 {TclCompileIncrCmd: increment given, simple int} {
-    set i 5
-    incr i 123
-} 128
-test incr-1.18 {TclCompileIncrCmd: increment given, simple int} {
-    set i 5
-    incr i -100
-} -95
-test incr-1.19 {TclCompileIncrCmd: increment given, but erroneous} {
-    set i 5
-    catch {incr i [set]} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    (increment expression)
-    while compiling
-"incr i [set]"}
-test incr-1.20 {TclCompileIncrCmd: increment given, in quotes} {
-    set i 25
-    incr i "-100"
-} -75
-test incr-1.21 {TclCompileIncrCmd: increment given, in braces} {
-    set i 24
-    incr i {126}
-} 150
-test incr-1.22 {TclCompileIncrCmd: increment given, large int} {
-    set i 5
-    incr i 200000
-} 200005
-test incr-1.23 {TclCompileIncrCmd: increment given, formatted int != int} {
-    set i 25
-    incr i 000012345     ;# an octal literal
-} 5374
-test incr-1.24 {TclCompileIncrCmd: increment given, formatted int != int} {
-    set i 25
-    catch {incr i 1a} msg
-    set msg
-} {expected integer but got "1a"}
-
-test incr-1.25 {TclCompileIncrCmd: too many arguments} {
-    set i 10
-    catch {incr i 10 20} msg
-    set msg
-} {wrong # args: should be "incr varName ?increment?"}
-
-
-test incr-1.26 {TclCompileIncrCmd: runtime error, bad variable name} {
-    list [catch {incr {"foo}} msg] $msg $errorInfo
-} {1 {can't read ""foo": no such variable} {can't read ""foo": no such variable
-    (reading value of variable to increment)
-    invoked from within
-"incr {"foo}"}}
-test incr-1.27 {TclCompileIncrCmd: runtime error, bad variable name} {
-    list [catch {incr [set]} msg] $msg $errorInfo
-} {1 {wrong # args: should be "set varName ?newValue?"} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"incr [set]"}}
-test incr-1.28 {TclCompileIncrCmd: runtime error, readonly variable} {
-    proc readonly args {error "variable is read-only"}
-    set x 123
-    trace var x w readonly
-    list [catch {incr x 1} msg] $msg $errorInfo
-} {1 {can't set "x": variable is read-only} {can't set "x": variable is read-only
-    while executing
-"incr x 1"}}
-catch {unset x}
-test incr-1.29 {TclCompileIncrCmd: runtime error, bad variable value} {
-    set x "  -  "
-    list [catch {incr x 1} msg] $msg
-} {1 {expected integer but got "  -  "}}
-    
-# Check "incr" and computed command names.
-
-test incr-2.0 {incr and computed command names} {
-    set i 5
-    set z incr
-    $z i -1
-    set i
-} 4
-catch {unset x}
-catch {unset i}
-
-test incr-2.1 {incr command (not compiled): missing variable name} {
-    set z incr
-    list [catch {$z} msg] $msg
-} {1 {wrong # args: should be "incr varName ?increment?"}}
-test incr-2.2 {incr command (not compiled): simple variable name} {
-    set z incr
-    set i 10
-    list [$z i] $i
-} {11 11}
-test incr-2.3 {incr command (not compiled): error compiling variable name} {
-    set z incr
-    set i 10
-    catch {$z "i"xxx} msg
-    set msg
-} {extra characters after close-quote}
-test incr-2.4 {incr command (not compiled): simple variable name in quotes} {
-    set z incr
-    set i 17
-    list [$z "i"] $i
-} {18 18}
-test incr-2.5 {incr command (not compiled): simple variable name in braces} {
-    set z incr
-    catch {unset {a simple var}}
-    set {a simple var} 27
-    list [$z {a simple var}] ${a simple var}
-} {28 28}
-test incr-2.6 {incr command (not compiled): simple array variable name} {
-    set z incr
-    catch {unset a}
-    set a(foo) 37
-    list [$z a(foo)] $a(foo)
-} {38 38}
-test incr-2.7 {incr command (not compiled): non-simple (computed) variable name} {
-    set z incr
-    set x "i"
-    set i 77
-    list [$z $x 2] $i
-} {79 79}
-test incr-2.8 {incr command (not compiled): non-simple (computed) variable name} {
-    set z incr
-    set x "i"
-    set i 77
-    list [$z [set x] +2] $i
-} {79 79}
-
-test incr-2.9 {incr command (not compiled): increment given} {
-    set z incr
-    set i 10
-    list [$z i +07] $i
-} {17 17}
-test incr-2.10 {incr command (not compiled): no increment given} {
-    set z incr
-    set i 10
-    list [$z i] $i
-} {11 11}
-
-test incr-2.11 {incr command (not compiled): simple global name} {
-    proc p {} {
-	set z incr
-        global i
-        set i 54
-        $z i
-    }
-    p
-} {55}
-test incr-2.12 {incr command (not compiled): simple local name} {
-    proc p {} {
-	set z incr
-        set foo 100
-        $z foo
-    }
-    p
-} {101}
-test incr-2.13 {incr command (not compiled): simple but new (unknown) local name} {
-    proc p {} {
-	set z incr
-        $z bar
-    }
-    catch {p} msg
-    set msg
-} {can't read "bar": no such variable}
-test incr-2.14 {incr command (not compiled): simple local name, >255 locals} {
-   proc 260locals {} {
-        set z incr
-        # create 260 locals
-        set a0 0; set a1 0; set a2 0; set a3 0; set a4 0
-        set a5 0; set a6 0; set a7 0; set a8 0; set a9 0
-        set b0 0; set b1 0; set b2 0; set b3 0; set b4 0
-        set b5 0; set b6 0; set b7 0; set b8 0; set b9 0
-        set c0 0; set c1 0; set c2 0; set c3 0; set c4 0
-        set c5 0; set c6 0; set c7 0; set c8 0; set c9 0
-        set d0 0; set d1 0; set d2 0; set d3 0; set d4 0
-        set d5 0; set d6 0; set d7 0; set d8 0; set d9 0
-        set e0 0; set e1 0; set e2 0; set e3 0; set e4 0
-        set e5 0; set e6 0; set e7 0; set e8 0; set e9 0
-        set f0 0; set f1 0; set f2 0; set f3 0; set f4 0
-        set f5 0; set f6 0; set f7 0; set f8 0; set f9 0
-        set g0 0; set g1 0; set g2 0; set g3 0; set g4 0
-        set g5 0; set g6 0; set g7 0; set g8 0; set g9 0
-        set h0 0; set h1 0; set h2 0; set h3 0; set h4 0
-        set h5 0; set h6 0; set h7 0; set h8 0; set h9 0
-        set i0 0; set i1 0; set i2 0; set i3 0; set i4 0
-        set i5 0; set i6 0; set i7 0; set i8 0; set i9 0
-        set j0 0; set j1 0; set j2 0; set j3 0; set j4 0
-        set j5 0; set j6 0; set j7 0; set j8 0; set j9 0
-        set k0 0; set k1 0; set k2 0; set k3 0; set k4 0
-        set k5 0; set k6 0; set k7 0; set k8 0; set k9 0
-        set l0 0; set l1 0; set l2 0; set l3 0; set l4 0
-        set l5 0; set l6 0; set l7 0; set l8 0; set l9 0
-        set m0 0; set m1 0; set m2 0; set m3 0; set m4 0
-        set m5 0; set m6 0; set m7 0; set m8 0; set m9 0
-        set n0 0; set n1 0; set n2 0; set n3 0; set n4 0
-        set n5 0; set n6 0; set n7 0; set n8 0; set n9 0
-        set o0 0; set o1 0; set o2 0; set o3 0; set o4 0
-        set o5 0; set o6 0; set o7 0; set o8 0; set o9 0
-        set p0 0; set p1 0; set p2 0; set p3 0; set p4 0
-        set p5 0; set p6 0; set p7 0; set p8 0; set p9 0
-        set q0 0; set q1 0; set q2 0; set q3 0; set q4 0
-        set q5 0; set q6 0; set q7 0; set q8 0; set q9 0
-        set r0 0; set r1 0; set r2 0; set r3 0; set r4 0
-        set r5 0; set r6 0; set r7 0; set r8 0; set r9 0
-        set s0 0; set s1 0; set s2 0; set s3 0; set s4 0
-        set s5 0; set s6 0; set s7 0; set s8 0; set s9 0
-        set t0 0; set t1 0; set t2 0; set t3 0; set t4 0
-        set t5 0; set t6 0; set t7 0; set t8 0; set t9 0
-        set u0 0; set u1 0; set u2 0; set u3 0; set u4 0
-        set u5 0; set u6 0; set u7 0; set u8 0; set u9 0
-        set v0 0; set v1 0; set v2 0; set v3 0; set v4 0
-        set v5 0; set v6 0; set v7 0; set v8 0; set v9 0
-        set w0 0; set w1 0; set w2 0; set w3 0; set w4 0
-        set w5 0; set w6 0; set w7 0; set w8 0; set w9 0
-        set x0 0; set x1 0; set x2 0; set x3 0; set x4 0
-        set x5 0; set x6 0; set x7 0; set x8 0; set x9 0
-        set y0 0; set y1 0; set y2 0; set y3 0; set y4 0
-        set y5 0; set y6 0; set y7 0; set y8 0; set y9 0
-        set z0 0; set z1 0; set z2 0; set z3 0; set z4 0
-        set z5 0; set z6 0; set z7 0; set z8 0; set z9 0
-        # now increment the last one (local var index > 255)
-        $z z9
-    }
-    260locals
-} {1}
-test incr-2.15 {incr command (not compiled): variable is array} {
-    set z incr
-    catch {unset a}
-    set a(foo) 27
-    set x [$z a(foo) 11]
-    catch {unset a}
-    set x
-} 38
-test incr-2.16 {incr command (not compiled): variable is array, elem substitutions} {
-    set z incr
-    catch {unset a}
-    set i 5
-    set a(foo5) 27
-    set x [$z a(foo$i) 11]
-    catch {unset a}
-    set x
-} 38
-
-test incr-2.17 {incr command (not compiled): increment given, simple int} {
-    set z incr
-    set i 5
-    $z i 123
-} 128
-test incr-2.18 {incr command (not compiled): increment given, simple int} {
-    set z incr
-    set i 5
-    $z i -100
-} -95
-test incr-2.19 {incr command (not compiled): increment given, but erroneous} {
-    set z incr
-    set i 5
-    catch {$z i [set]} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"$z i [set]"}
-test incr-2.20 {incr command (not compiled): increment given, in quotes} {
-    set z incr
-    set i 25
-    $z i "-100"
-} -75
-test incr-2.21 {incr command (not compiled): increment given, in braces} {
-    set z incr
-    set i 24
-    $z i {126}
-} 150
-test incr-2.22 {incr command (not compiled): increment given, large int} {
-    set z incr
-    set i 5
-    $z i 200000
-} 200005
-test incr-2.23 {incr command (not compiled): increment given, formatted int != int} {
-    set z incr
-    set i 25
-    $z i 000012345     ;# an octal literal
-} 5374
-test incr-2.24 {incr command (not compiled): increment given, formatted int != int} {
-    set z incr
-    set i 25
-    catch {$z i 1a} msg
-    set msg
-} {expected integer but got "1a"}
-
-test incr-2.25 {incr command (not compiled): too many arguments} {
-    set z incr
-    set i 10
-    catch {$z i 10 20} msg
-    set msg
-} {wrong # args: should be "incr varName ?increment?"}
-
-
-test incr-2.26 {incr command (not compiled): runtime error, bad variable name} {
-    set z incr
-    list [catch {$z {"foo}} msg] $msg $errorInfo
-} {1 {can't read ""foo": no such variable} {can't read ""foo": no such variable
-    (reading value of variable to increment)
-    invoked from within
-"$z {"foo}"}}
-test incr-2.27 {incr command (not compiled): runtime error, bad variable name} {
-    set z incr
-    list [catch {$z [set]} msg] $msg $errorInfo
-} {1 {wrong # args: should be "set varName ?newValue?"} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    while compiling
-"$z [set]"}}
-test incr-2.28 {incr command (not compiled): runtime error, readonly variable} {
-    set z incr
-    proc readonly args {error "variable is read-only"}
-    set x 123
-    trace var x w readonly
-    list [catch {$z x 1} msg] $msg $errorInfo
-} {1 {can't set "x": variable is read-only} {can't set "x": variable is read-only
-    while executing
-"$z x 1"}}
-catch {unset x}
-test incr-2.29 {incr command (not compiled): runtime error, bad variable value} {
-    set z incr
-    set x "  -  "
-    list [catch {$z x 1} msg] $msg
-} {1 {expected integer but got "  -  "}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/indexObj.test b/tests/indexObj.test
deleted file mode 100644
index 979e5a8..0000000
--- a/tests/indexObj.test
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file is a Tcl script to test out the the procedures in file
-# tkIndexObj.c, which implement indexed table lookups.  The tests here
-# are organized in the standard fashion for Tcl tests.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: indexObj.test,v 1.3 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testindexobj] == {}} {
-    puts "This application hasn't been compiled with the \"testindexobj\""
-    puts "command, so I can't test Tcl_GetIndexFromObj etc."
-    ::tcltest::cleanupTests
-    return 
-}
-
-test indexObj-1.1 {exact match} {
-    testindexobj 1 1 xyz abc def xyz alm
-} {2}
-test indexObj-1.2 {exact match} {
-    testindexobj 1 1 abc abc def xyz alm
-} {0}
-test indexObj-1.3 {exact match} {
-    testindexobj 1 1 alm abc def xyz alm
-} {3}
-test indexObj-1.4 {unique abbreviation} {
-    testindexobj 1 1 xy abc def xalb xyz alm
-} {3}
-test indexObj-1.5 {multiple abbreviations and exact match} {
-    testindexobj 1 1 x abc def xalb xyz alm x
-} {5}
-test indexObj-1.6 {forced exact match} {
-    testindexobj 1 0 xy abc def xalb xy alm
-} {3}
-test indexObj-1.7 {forced exact match} {
-    testindexobj 1 0 x abc def xalb xyz alm x
-} {5}
-
-test indexObj-2.1 {no match} {
-    list [catch {testindexobj 1 1 dddd abc def xalb xyz alm x} msg] $msg
-} {1 {bad token "dddd": must be abc, def, xalb, xyz, alm, or x}}
-test indexObj-2.2 {no match} {
-    list [catch {testindexobj 1 1 dddd abc} msg] $msg
-} {1 {bad token "dddd": must be abc}}
-test indexObj-2.3 {no match: no abbreviations} {
-    list [catch {testindexobj 1 0 xy abc def xalb xyz alm} msg] $msg
-} {1 {bad token "xy": must be abc, def, xalb, xyz, or alm}}
-test indexObj-2.4 {ambiguous value} {
-    list [catch {testindexobj 1 1 d dumb daughter a c} msg] $msg
-} {1 {ambiguous token "d": must be dumb, daughter, a, or c}}
-test indexObj-2.5 {omit error message} {
-    list [catch {testindexobj 0 1 d x} msg] $msg
-} {1 {}}
-
-test indexObj-3.1 {cache result to skip next lookup} {
-    testindexobj check 42
-} {42}
-
-test indexObj-4.1 {free old internal representation} {
-    set x {a b}
-    lindex $x 1
-    testindexobj 1 1 $x abc def {a b} zzz
-} {2}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/info.test b/tests/info.test
deleted file mode 100644
index 4522520..0000000
--- a/tests/info.test
+++ /dev/null
@@ -1,517 +0,0 @@
-# Commands covered:  info
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: info.test,v 1.6 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Set up namespaces needed to test operation of "info args", "info body",
-# "info default", and "info procs" with imported procedures.
-
-catch {namespace delete test_ns_info1 test_ns_info2}
-
-namespace eval test_ns_info1 {
-    namespace export *
-    proc p {x} {return "x=$x"}
-    proc q {{y 27} z} {return "y=$y"}
-}
-
-
-test info-1.1 {info args option} {
-    proc t1 {a bbb c} {return foo}
-    info args t1
-} {a bbb c}
-test info-1.2 {info args option} {
-    proc t1 {{a default1} {bbb default2} {c default3} args} {return foo}
-    info a t1
-} {a bbb c args}
-test info-1.3 {info args option} {
-    proc t1 "" {return foo}
-    info args t1
-} {}
-test info-1.4 {info args option} {
-    catch {rename t1 {}}
-    list [catch {info args t1} msg] $msg
-} {1 {"t1" isn't a procedure}}
-test info-1.5 {info args option} {
-    list [catch {info args set} msg] $msg
-} {1 {"set" isn't a procedure}}
-test info-1.6 {info args option} {
-    proc t1 {a b} {set c 123; set d $c}
-    t1 1 2
-    info args t1
-} {a b}
-test info-1.7 {info args option} {
-    catch {namespace delete test_ns_info2}
-    namespace eval test_ns_info2 {
-        namespace import ::test_ns_info1::*
-        list [info args p] [info args q]
-    }
-} {x {y z}}
-
-test info-2.1 {info body option} {
-    proc t1 {} {body of t1}
-    info body t1
-} {body of t1}
-test info-2.2 {info body option} {
-    list [catch {info body set} msg] $msg
-} {1 {"set" isn't a procedure}}
-test info-2.3 {info body option} {
-    list [catch {info args set 1} msg] $msg
-} {1 {wrong # args: should be "info args procname"}}
-test info-2.4 {info body option} {
-    catch {namespace delete test_ns_info2}
-    namespace eval test_ns_info2 {
-        namespace import ::test_ns_info1::*
-        list [info body p] [info body q]
-    }
-} {{return "x=$x"} {return "y=$y"}}
-
-# "info cmdcount" is no longer accurate for compiled commands! The expected
-# result for info-3.1 used to be "3" and is now "1" since the "set"s have
-# been compiled away.
-test info-3.1 {info cmdcount option} {
-    set x [info cmdcount]
-    set y 12345
-    set z [info cm]
-    expr $z-$x
-} 1
-test info-3.2 {info cmdcount option} {
-    list [catch {info cmdcount 1} msg] $msg
-} {1 {wrong # args: should be "info cmdcount"}}
-
-test info-4.1 {info commands option} {
-    proc t1 {} {}
-    proc t2 {} {}
-    set x " [info commands] "
-    list [string match {* t1 *} $x] [string match {* t2 *} $x] \
-            [string match {* set *} $x] [string match {* list *} $x]
-} {1 1 1 1}
-test info-4.2 {info commands option} {
-    proc t1 {} {}
-    rename t1 {}
-    set x [info comm]
-    string match {* t1 *} $x
-} 0
-test info-4.3 {info commands option} {
-    proc _t1_ {} {}
-    proc _t2_ {} {}
-    info commands _t1_
-} _t1_
-test info-4.4 {info commands option} {
-    proc _t1_ {} {}
-    proc _t2_ {} {}
-    lsort [info commands _t*]
-} {_t1_ _t2_}
-catch {rename _t1_ {}}
-catch {rename _t2_ {}}
-test info-4.5 {info commands option} {
-    list [catch {info commands a b} msg] $msg
-} {1 {wrong # args: should be "info commands ?pattern?"}}
-
-test info-5.1 {info complete option} {
-    list [catch {info complete} msg] $msg
-} {1 {wrong # args: should be "info complete command"}}
-test info-5.2 {info complete option} {
-    info complete abc
-} 1
-test info-5.2 {info complete option} {
-    info complete "\{abcd "
-} 0
-test info-5.3 {info complete option} {
-    info complete {# Comment should be complete command}
-} 1
-
-test info-6.1 {info default option} {
-    proc t1 {a b {c d} {e "long default value"}} {}
-    info default t1 a value
-} 0
-test info-6.2 {info default option} {
-    proc t1 {a b {c d} {e "long default value"}} {}
-    set value 12345
-    info d t1 a value
-    set value
-} {}
-test info-6.3 {info default option} {
-    proc t1 {a b {c d} {e "long default value"}} {}
-    info default t1 c value
-} 1
-test info-6.4 {info default option} {
-    proc t1 {a b {c d} {e "long default value"}} {}
-    set value 12345
-    info default t1 c value
-    set value
-} d
-test info-6.5 {info default option} {
-    proc t1 {a b {c d} {e "long default value"}} {}
-    set value 12345
-    set x [info default t1 e value]
-    list $x $value
-} {1 {long default value}}
-test info-6.6 {info default option} {
-    list [catch {info default a b} msg] $msg
-} {1 {wrong # args: should be "info default procname arg varname"}}
-test info-6.7 {info default option} {
-    list [catch {info default _nonexistent_ a b} msg] $msg
-} {1 {"_nonexistent_" isn't a procedure}}
-test info-6.8 {info default option} {
-    proc t1 {a b} {}
-    list [catch {info default t1 x value} msg] $msg
-} {1 {procedure "t1" doesn't have an argument "x"}}
-test info-6.9 {info default option} {
-    catch {unset a}
-    set a(0) 88
-    proc t1 {a b} {}
-    list [catch {info default t1 a a} msg] $msg
-} {1 {couldn't store default value in variable "a"}}
-test info-6.10 {info default option} {
-    catch {unset a}
-    set a(0) 88
-    proc t1 {{a 18} b} {}
-    list [catch {info default t1 a a} msg] $msg
-} {1 {couldn't store default value in variable "a"}}
-test info-6.11 {info default option} {
-    catch {namespace delete test_ns_info2}
-    namespace eval test_ns_info2 {
-        namespace import ::test_ns_info1::*
-        list [info default p x foo] $foo [info default q y bar] $bar
-    }
-} {0 {} 1 27}
-catch {unset a}
-
-test info-7.1 {info exists option} {
-    set value foo
-    info exists value
-} 1
-catch {unset _nonexistent_}
-test info-7.2 {info exists option} {
-    info exists _nonexistent_
-} 0
-test info-7.3 {info exists option} {
-    proc t1 {x} {return [info exists x]}
-    t1 2
-} 1
-test info-7.4 {info exists option} {
-    proc t1 {x} {
-        global _nonexistent_
-        return [info exists _nonexistent_]
-    }
-    t1 2
-} 0
-test info-7.5 {info exists option} {
-    proc t1 {x} {
-        set y 47
-        return [info exists y]
-    }
-    t1 2
-} 1
-test info-7.6 {info exists option} {
-    proc t1 {x} {return [info exists value]}
-    t1 2
-} 0
-test info-7.7 {info exists option} {
-    catch {unset x}
-    set x(2) 44
-    list [info exists x] [info exists x(1)] [info exists x(2)]
-} {1 0 1}
-catch {unset x}
-test info-7.8 {info exists option} {
-    list [catch {info exists} msg] $msg
-} {1 {wrong # args: should be "info exists varName"}}
-test info-7.9 {info exists option} {
-    list [catch {info exists 1 2} msg] $msg
-} {1 {wrong # args: should be "info exists varName"}}
-
-test info-8.1 {info globals option} {
-    set x 1
-    set y 2
-    set value 23
-    set a " [info globals] "
-    list [string match {* x *} $a] [string match {* y *} $a] \
-            [string match {* value *} $a] [string match {* _foobar_ *} $a]
-} {1 1 1 0}
-test info-8.2 {info globals option} {
-    set _xxx1 1
-    set _xxx2 2
-    lsort [info g _xxx*]
-} {_xxx1 _xxx2}
-test info-8.3 {info globals option} {
-    list [catch {info globals 1 2} msg] $msg
-} {1 {wrong # args: should be "info globals ?pattern?"}}
-
-test info-9.1 {info level option} {
-    info level
-} 0
-test info-9.2 {info level option} {
-    proc t1 {a b} {
-        set x [info le]
-        set y [info level 1]
-        list $x $y
-    }
-    t1 146 testString
-} {1 {t1 146 testString}}
-test info-9.3 {info level option} {
-    proc t1 {a b} {
-        t2 [expr $a*2] $b
-    }
-    proc t2 {x y} {
-        list [info level] [info level 1] [info level 2] [info level -1] \
-                [info level 0]
-    }
-    t1 146 {a {b c} {{{c}}}}
-} {2 {t1 146 {a {b c} {{{c}}}}} {t2 292 {a {b c} {{{c}}}}} {t1 146 {a {b c} {{{c}}}}} {t2 292 {a {b c} {{{c}}}}}}
-test info-9.4 {info level option} {
-    proc t1 {} {
-        set x [info level]
-        set y [info level 1]
-        list $x $y
-    }
-    t1
-} {1 t1}
-test info-9.5 {info level option} {
-    list [catch {info level 1 2} msg] $msg
-} {1 {wrong # args: should be "info level ?number?"}}
-test info-9.6 {info level option} {
-    list [catch {info level 123a} msg] $msg
-} {1 {expected integer but got "123a"}}
-test info-9.7 {info level option} {
-    list [catch {info level 0} msg] $msg
-} {1 {bad level "0"}}
-test info-9.8 {info level option} {
-    proc t1 {} {info level -1}
-    list [catch {t1} msg] $msg
-} {1 {bad level "-1"}}
-test info-9.9 {info level option} {
-    proc t1 {x} {info level $x}
-    list [catch {t1 -3} msg] $msg
-} {1 {bad level "-3"}}
-
-set savedLibrary $tcl_library
-test info-10.1 {info library option} {
-    list [catch {info library x} msg] $msg
-} {1 {wrong # args: should be "info library"}}
-test info-10.2 {info library option} {
-    set tcl_library 12345
-    info library
-} {12345}
-test info-10.3 {info library option} {
-    unset tcl_library
-    list [catch {info library} msg] $msg
-} {1 {no library has been specified for Tcl}}
-set tcl_library $savedLibrary
-
-test info-11.1 {info loaded option} {
-    list [catch {info loaded a b} msg] $msg
-} {1 {wrong # args: should be "info loaded ?interp?"}}
-test info-11.2 {info loaded option} {
-    list [catch {info loaded {}}] [catch {info loaded gorp} msg] $msg
-} {0 1 {could not find interpreter "gorp"}}
-
-test info-12.1 {info locals option} {
-    set a 22
-    proc t1 {x y} {
-        set b 13
-        set c testing
-        global a
-        return [info locals]
-    }
-    lsort [t1 23 24]
-} {b c x y}
-test info-12.2 {info locals option} {
-    proc t1 {x y} {
-        set xx1 2
-        set xx2 3
-        set y 4
-        return [info loc x*]
-    }
-    lsort [t1 2 3]
-} {x xx1 xx2}
-test info-12.3 {info locals option} {
-    list [catch {info locals 1 2} msg] $msg
-} {1 {wrong # args: should be "info locals ?pattern?"}}
-test info-12.4 {info locals option} {
-    info locals
-} {}
-test info-12.5 {info locals option} {
-    proc t1 {} {return [info locals]}
-    t1
-} {}
-test info-12.6 {info locals vs unset compiled locals} {
-    proc t1 {lst} {
-        foreach $lst $lst {}
-        unset lst
-        return [info locals]
-    }
-    lsort [t1 {a b c c d e f}]
-} {a b c d e f}
-test info-12.7 {info locals with temporary variables} {
-    proc t1 {} {
-        foreach a {b c} {}
-        info locals
-    }
-    t1
-} {a}
-
-test info-13.1 {info nameofexecutable option} {
-    list [catch {info nameofexecutable foo} msg] $msg
-} {1 {wrong # args: should be "info nameofexecutable"}}
-
-test info-14.1 {info patchlevel option} {
-    set a [info patchlevel]
-    regexp {[0-9]+\.[0-9]+([p[0-9]+)?} $a
-} 1
-test info-14.2 {info patchlevel option} {
-    list [catch {info patchlevel a} msg] $msg
-} {1 {wrong # args: should be "info patchlevel"}}
-test info-14.3 {info patchlevel option} {
-    set t $tcl_patchLevel
-    unset tcl_patchLevel
-    set result [list [catch {info patchlevel} msg] $msg]
-    set tcl_patchLevel $t
-    set result
-} {1 {can't read "tcl_patchLevel": no such variable}}
-
-test info-15.1 {info procs option} {
-    proc t1 {} {}
-    proc t2 {} {}
-    set x " [info procs] "
-    list [string match {* t1 *} $x] [string match {* t2 *} $x] \
-            [string match {* _undefined_ *} $x]
-} {1 1 0}
-test info-15.2 {info procs option} {
-    proc _tt1 {} {}
-    proc _tt2 {} {}
-    lsort [info pr _tt*]
-} {_tt1 _tt2}
-catch {rename _tt1 {}}
-catch {rename _tt2 {}}
-test info-15.3 {info procs option} {
-    list [catch {info procs 2 3} msg] $msg
-} {1 {wrong # args: should be "info procs ?pattern?"}}
-test info-15.4 {info procs option} {
-    catch {namespace delete test_ns_info2}
-    namespace eval test_ns_info2 {
-        namespace import ::test_ns_info1::*
-        proc r {} {}
-        list [info procs] [info procs p*]
-    }
-} {{p q r} p}
-
-test info-16.1 {info script option} {
-    list [catch {info script x} msg] $msg
-} {1 {wrong # args: should be "info script"}}
-test info-16.2 {info script option} {
-    file tail [info sc]
-} "info.test"
-removeFile gorp.info
-makeFile "info script\n" gorp.info
-test info-16.3 {info script option} {
-    list [source gorp.info] [file tail [info script]]
-} [list gorp.info info.test]
-test info-16.4 {resetting "info script" after errors} {
-    catch {source ~_nobody_/foo}
-    file tail [info script]
-} "info.test"
-test info-16.5 {resetting "info script" after errors} {
-    catch {source _nonexistent_}
-    file tail [info script]
-} "info.test"
-removeFile gorp.info
-
-test info-17.1 {info sharedlibextension option} {
-    list [catch {info sharedlibextension foo} msg] $msg
-} {1 {wrong # args: should be "info sharedlibextension"}}
-
-test info-18.1 {info tclversion option} {
-    set x [info tclversion]
-    scan $x "%d.%d%c" a b c
-} 2
-test info-18.2 {info tclversion option} {
-    list [catch {info t 2} msg] $msg
-} {1 {wrong # args: should be "info tclversion"}}
-test info-18.3 {info tclversion option} {
-    set t $tcl_version
-    unset tcl_version
-    set result [list [catch {info tclversion} msg] $msg]
-    set tcl_version $t
-    set result
-} {1 {can't read "tcl_version": no such variable}}
-
-test info-19.1 {info vars option} {
-    set a 1
-    set b 2
-    proc t1 {x y} {
-        global a b
-        set c 33
-        return [info vars]
-    }
-    lsort [t1 18 19]
-} {a b c x y}
-test info-19.2 {info vars option} {
-    set xxx1 1
-    set xxx2 2
-    proc t1 {xxa y} {
-        global xxx1 xxx2
-        set c 33
-        return [info vars x*]
-    }
-    lsort [t1 18 19]
-} {xxa xxx1 xxx2}
-test info-19.3 {info vars option} {
-    lsort [info vars]
-} [lsort [info globals]]
-test info-19.4 {info vars option} {
-    list [catch {info vars a b} msg] $msg
-} {1 {wrong # args: should be "info vars ?pattern?"}}
-test info-19.5 {info vars with temporary variables} {
-    proc t1 {} {
-        foreach a {b c} {}
-        info vars
-    }
-    t1
-} {a}
-
-test info-20.1 {miscellaneous error conditions} {
-    list [catch {info} msg] $msg
-} {1 {wrong # args: should be "info option ?arg arg ...?"}}
-test info-20.2 {miscellaneous error conditions} {
-    list [catch {info gorp} msg] $msg
-} {1 {bad option "gorp": must be args, body, cmdcount, commands, complete, default, exists, globals, hostname, level, library, loaded, locals, nameofexecutable, patchlevel, procs, script, sharedlibextension, tclversion, or vars}}
-test info-20.3 {miscellaneous error conditions} {
-    list [catch {info c} msg] $msg
-} {1 {ambiguous option "c": must be args, body, cmdcount, commands, complete, default, exists, globals, hostname, level, library, loaded, locals, nameofexecutable, patchlevel, procs, script, sharedlibextension, tclversion, or vars}}
-test info-20.4 {miscellaneous error conditions} {
-    list [catch {info l} msg] $msg
-} {1 {ambiguous option "l": must be args, body, cmdcount, commands, complete, default, exists, globals, hostname, level, library, loaded, locals, nameofexecutable, patchlevel, procs, script, sharedlibextension, tclversion, or vars}}
-test info-20.5 {miscellaneous error conditions} {
-    list [catch {info s} msg] $msg
-} {1 {ambiguous option "s": must be args, body, cmdcount, commands, complete, default, exists, globals, hostname, level, library, loaded, locals, nameofexecutable, patchlevel, procs, script, sharedlibextension, tclversion, or vars}}
-
-# cleanup
-catch {namespace delete test_ns_info1 test_ns_info2}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/init.test b/tests/init.test
deleted file mode 100644
index 4172606..0000000
--- a/tests/init.test
+++ /dev/null
@@ -1,167 +0,0 @@
-# Functionality covered: this file contains a collection of tests for the
-# auto loading and namespaces.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: init.test,v 1.3 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Clear out any namespaces called test_ns_*
-catch {eval namespace delete [namespace children :: test_ns_*]}
-
-# Six cases - white box testing
-
-test init-1.1 {auto_qualify - absolute cmd - namespace} {
-    auto_qualify ::foo::bar ::blue
-} ::foo::bar
-
-test init-1.2 {auto_qualify - absolute cmd - global} {
-    auto_qualify ::global ::sub
-} global
-
-test init-1.3 {auto_qualify - no colons cmd - global} {
-    auto_qualify nocolons ::
-} nocolons 
-
-test init-1.4 {auto_qualify - no colons cmd - namespace} {
-    auto_qualify nocolons ::sub
-} {::sub::nocolons nocolons}
-
-test init-1.5 {auto_qualify - colons in cmd - global} {
-    auto_qualify foo::bar ::
-} ::foo::bar
-
-test init-1.6 {auto_qualify - colons in cmd - namespace} {
-    auto_qualify foo::bar ::sub
-} {::sub::foo::bar ::foo::bar}
-
-# Some additional tests
-
-test init-1.7 {auto_qualify - multiples colons 1} {
-    auto_qualify :::foo::::bar ::blue
-} ::foo::bar
-
-test init-1.8 {auto_qualify - multiple colons 2} {
-    auto_qualify :::foo ::bar
-} foo
-
-
-# we use a sub interp and auto_reset and double the tests because there is 2
-# places where auto_loading occur (before loading the indexes files and after)
-
-set testInterp [interp create]
-interp eval $testInterp [list set argv $argv]
-interp eval $testInterp [list source [file join $::tcltest::testsDir defs.tcl]]
-
-interp eval $testInterp {
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-auto_reset
-catch {rename parray {}}
-
-test init-2.0 {load parray - stage 1} {
-    set ret [catch {namespace eval ::tcltest {parray}} error]
-    rename parray {} ; # remove it, for the next test - that should not fail.
-    list $ret $error
-} {1 {no value given for parameter "a" to "parray"}}
-
-
-test init-2.1 {load parray - stage 2} {
-    set ret [catch {namespace eval ::tcltest {parray}} error]
-    list $ret $error
-} {1 {no value given for parameter "a" to "parray"}}
-
-
-auto_reset
-catch {rename ::safe::setLogCmd {}}
-#unset auto_index(::safe::setLogCmd)
-#unset auto_oldpath
-
-test init-2.2 {load ::safe::setLogCmd - stage 1} {
-    ::safe::setLogCmd
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-test init-2.3 {load ::safe::setLogCmd - stage 2} {
-    ::safe::setLogCmd
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-auto_reset
-catch {rename ::safe::setLogCmd {}}
-
-test init-2.4 {load safe:::setLogCmd - stage 1} {
-    safe:::setLogCmd ; # intentionally 3 :
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-test init-2.5 {load safe:::setLogCmd - stage 2} {
-    safe:::setLogCmd ; # intentionally 3 :
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-auto_reset
-catch {rename ::safe::setLogCmd {}}
-
-test init-2.6 {load setLogCmd from safe:: - stage 1} {
-    namespace eval safe setLogCmd 
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-test init-2.7 {oad setLogCmd from safe::  - stage 2} {
-    namespace eval safe setLogCmd 
-    rename ::safe::setLogCmd {} ; # should not fail
-} {}
-
-
-auto_reset
-package require http 2.0
-catch {rename ::http::geturl {}}
-
-test init-2.8 {load http::geturl (package)} {
-    # 3 ':' on purpose
-    set ret [catch {namespace eval ::tcltest {http:::geturl}} error]
-    # removing it, for the next test. should not fail.
-    rename ::http::geturl {} ; 
-    list $ret $error
-} {1 {no value given for parameter "url" to "http:::geturl"}}
-
-
-test init-3.0 {random stuff in the auto_index, should still work} {
-    set auto_index(foo:::bar::blah) {
-	namespace eval foo {namespace eval bar {proc blah {} {return 1}}}
-    }
-    foo:::bar::blah
-} 1
-
-}
-
-# cleanup
-interp delete $testInterp
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/interp.test b/tests/interp.test
deleted file mode 100644
index 817ef99..0000000
--- a/tests/interp.test
+++ /dev/null
@@ -1,2360 +0,0 @@
-# This file tests the multiple interpreter facility of Tcl
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: interp.test,v 1.7 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# The set of hidden commands is platform dependent:
-
-if {"$tcl_platform(platform)" == "macintosh"} {
-    set hidden_cmds {beep cd echo encoding exit fconfigure file glob load ls open pwd socket source}
-} else {
-    set hidden_cmds {cd encoding exec exit fconfigure file glob load open pwd socket source}
-}
-
-foreach i [interp slaves] {
-  interp delete $i
-}
-
-proc equiv {x} {return $x}
-
-# Part 0: Check out options for interp command
-test interp-1.1 {options for interp command} {
-    list [catch {interp} msg] $msg
-} {1 {wrong # args: should be "interp cmd ?arg ...?"}}
-test interp-1.2 {options for interp command} {
-    list [catch {interp frobox} msg] $msg
-} {1 {bad option "frobox": must be alias, aliases, create, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, marktrusted, slaves, share, target, or transfer}}
-test interp-1.3 {options for interp command} {
-    interp delete
-} ""
-test interp-1.4 {options for interp command} {
-    list [catch {interp delete foo bar} msg] $msg
-} {1 {could not find interpreter "foo"}}
-test interp-1.5 {options for interp command} {
-    list [catch {interp exists foo bar} msg] $msg
-} {1 {wrong # args: should be "interp exists ?path?"}}
-#
-# test interp-0.6 was removed
-#
-test interp-1.6 {options for interp command} {
-    list [catch {interp slaves foo bar zop} msg] $msg
-} {1 {wrong # args: should be "interp slaves ?path?"}}
-test interp-1.7 {options for interp command} {
-    list [catch {interp hello} msg] $msg
-} {1 {bad option "hello": must be alias, aliases, create, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, marktrusted, slaves, share, target, or transfer}}
-test interp-1.8 {options for interp command} {
-    list [catch {interp -froboz} msg] $msg
-} {1 {bad option "-froboz": must be alias, aliases, create, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, marktrusted, slaves, share, target, or transfer}}
-test interp-1.9 {options for interp command} {
-    list [catch {interp -froboz -safe} msg] $msg
-} {1 {bad option "-froboz": must be alias, aliases, create, delete, eval, exists, expose, hide, hidden, issafe, invokehidden, marktrusted, slaves, share, target, or transfer}} 
-test interp-1.10 {options for interp command} {
-    list [catch {interp target} msg] $msg
-} {1 {wrong # args: should be "interp target path alias"}}
-
-# Part 1: Basic interpreter creation tests:
-test interp-2.1 {basic interpreter creation} {
-    interp create a
-} a
-test interp-2.2 {basic interpreter creation} {
-    catch {interp create}
-} 0
-test interp-2.3 {basic interpreter creation} {
-    catch {interp create -safe}
-} 0 
-test interp-2.4 {basic interpreter creation} {
-    list [catch {interp create a} msg] $msg
-} {1 {interpreter named "a" already exists, cannot create}}
-test interp-2.5 {basic interpreter creation} {
-    interp create b -safe
-} b
-test interp-2.6 {basic interpreter creation} {
-    interp create d -safe
-} d
-test interp-2.7 {basic interpreter creation} {
-    list [catch {interp create -froboz} msg] $msg
-} {1 {bad option "-froboz": must be -safe or --}}
-test interp-2.8 {basic interpreter creation} {
-    interp create -- -froboz
-} -froboz
-test interp-2.9 {basic interpreter creation} {
-    interp create -safe -- -froboz1
-} -froboz1
-test interp-2.10 {basic interpreter creation} {
-    interp create {a x1}
-    interp create {a x2}
-    interp create {a x3} -safe
-} {a x3}
-test interp-2.11 {anonymous interps vs existing procs} {
-    set x [interp create]
-    regexp "interp(\[0-9]+)" $x dummy thenum
-    interp delete $x
-    proc interp$thenum {} {}
-    set x [interp create]
-    regexp "interp(\[0-9]+)" $x dummy anothernum
-    expr $anothernum > $thenum
-} 1    
-test interp-2.12 {anonymous interps vs existing procs} {
-    set x [interp create -safe]
-    regexp "interp(\[0-9]+)" $x dummy thenum
-    interp delete $x
-    proc interp$thenum {} {}
-    set x [interp create -safe]
-    regexp "interp(\[0-9]+)" $x dummy anothernum
-    expr $anothernum - $thenum
-} 1    
-    
-foreach i [interp slaves] {
-    interp delete $i
-}
-
-# Part 2: Testing "interp slaves" and "interp exists"
-test interp-3.1 {testing interp exists and interp slaves} {
-    interp slaves
-} ""
-test interp-3.2 {testing interp exists and interp slaves} {
-    interp create a
-    interp exists a
-} 1
-test interp-3.3 {testing interp exists and interp slaves} {
-    interp exists nonexistent
-} 0
-test interp-3.4 {testing interp exists and interp slaves} {
-    list [catch {interp slaves a b c} msg] $msg
-} {1 {wrong # args: should be "interp slaves ?path?"}}
-test interp-3.5 {testing interp exists and interp slaves} {
-    list [catch {interp exists a b c} msg] $msg
-} {1 {wrong # args: should be "interp exists ?path?"}}
-test interp-3.6 {testing interp exists and interp slaves} {
-    interp exists
-} 1
-test interp-3.7 {testing interp exists and interp slaves} {
-    interp slaves
-} a
-test interp-3.8 {testing interp exists and interp slaves} {
-    list [catch {interp slaves a b c} msg] $msg
-} {1 {wrong # args: should be "interp slaves ?path?"}}
-test interp-3.9 {testing interp exists and interp slaves} {
-    interp create {a a2} -safe
-    expr {[lsearch [interp slaves a] a2] >= 0}
-} 1
-test interp-3.10 {testing interp exists and interp slaves} {
-    interp exists {a a2}
-} 1
-
-# Part 3: Testing "interp delete"
-test interp-3.11 {testing interp delete} {
-    interp delete
-} ""
-test interp-4.1 {testing interp delete} {
-    catch {interp create a}
-    interp delete a
-} ""
-test interp-4.2 {testing interp delete} {
-    list [catch {interp delete nonexistent} msg] $msg
-} {1 {could not find interpreter "nonexistent"}}
-test interp-4.3 {testing interp delete} {
-    list [catch {interp delete x y z} msg] $msg
-} {1 {could not find interpreter "x"}}
-test interp-4.4 {testing interp delete} {
-    interp delete
-} ""
-test interp-4.5 {testing interp delete} {
-    interp create a
-    interp create {a x1}
-    interp delete {a x1}
-    expr {[lsearch [interp slaves a] x1] >= 0}
-} 0
-test interp-4.6 {testing interp delete} {
-    interp create c1
-    interp create c2
-    interp create c3
-    interp delete c1 c2 c3
-} ""
-test interp-4.7 {testing interp delete} {
-    interp create c1
-    interp create c2
-    list [catch {interp delete c1 c2 c3} msg] $msg
-} {1 {could not find interpreter "c3"}}
-test interp-4.8 {testing interp delete} {
-    list [catch {interp delete {}} msg] $msg
-} {1 {cannot delete the current interpreter}}
-
-foreach i [interp slaves] {
-    interp delete $i
-}
-
-# Part 4: Consistency checking - all nondeleted interpreters should be
-# there:
-test interp-5.1 {testing consistency} {
-    interp slaves
-} ""
-test interp-5.2 {testing consistency} {
-    interp exists a
-} 0
-test interp-5.3 {testing consistency} {
-    interp exists nonexistent
-} 0
-
-# Recreate interpreter "a"
-interp create a
-
-# Part 5: Testing eval in interpreter object command and with interp command
-test interp-6.1 {testing eval} {
-    a eval expr 3 + 5
-} 8
-test interp-6.2 {testing eval} {
-    list [catch {a eval foo} msg] $msg
-} {1 {invalid command name "foo"}}
-test interp-6.3 {testing eval} {
-    a eval {proc foo {} {expr 3 + 5}}
-    a eval foo
-} 8
-test interp-6.4 {testing eval} {
-    interp eval a foo
-} 8
-
-test interp-6.5 {testing eval} {
-    interp create {a x2}
-    interp eval {a x2} {proc frob {} {expr 4 * 9}}
-    interp eval {a x2} frob
-} 36
-test interp-6.6 {testing eval} {
-    list [catch {interp eval {a x2} foo} msg] $msg
-} {1 {invalid command name "foo"}}
-
-# UTILITY PROCEDURE RUNNING IN MASTER INTERPRETER:
-proc in_master {args} {
-     return [list seen in master: $args]
-}
-
-# Part 6: Testing basic alias creation
-test interp-7.1 {testing basic alias creation} {
-    a alias foo in_master
-} foo
-test interp-7.2 {testing basic alias creation} {
-    a alias bar in_master a1 a2 a3
-} bar
-# Test 6.3 has been deleted.
-test interp-7.3 {testing basic alias creation} {
-    a alias foo
-} in_master
-test interp-7.4 {testing basic alias creation} {
-    a alias bar
-} {in_master a1 a2 a3}
-test interp-7.5 {testing basic alias creation} {
-    a aliases
-} {foo bar}
-
-# Part 7: testing basic alias invocation
-test interp-8.1 {testing basic alias invocation} {
-    catch {interp create a}
-    a alias foo in_master
-    a eval foo s1 s2 s3
-} {seen in master: {s1 s2 s3}}
-test interp-8.2 {testing basic alias invocation} {
-    catch {interp create a}
-    a alias bar in_master a1 a2 a3
-    a eval bar s1 s2 s3
-} {seen in master: {a1 a2 a3 s1 s2 s3}}
-
-# Part 8: Testing aliases for non-existent targets
-test interp-9.1 {testing aliases for non-existent targets} {
-    catch {interp create a}
-    a alias zop nonexistent-command-in-master
-    list [catch {a eval zop} msg] $msg
-} {1 {invalid command name "nonexistent-command-in-master"}}
-test interp-9.2 {testing aliases for non-existent targets} {
-    catch {interp create a}
-    a alias zop nonexistent-command-in-master
-    proc nonexistent-command-in-master {} {return i_exist!}
-    a eval zop
-} i_exist!
-
-if {[info command nonexistent-command-in-master] != ""} {
-    rename nonexistent-command-in-master {}
-}
-
-# Part 9: Aliasing between interpreters
-test interp-10.1 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    interp alias a a_alias b b_alias 1 2 3
-} a_alias
-test interp-10.2 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    b eval {proc b_alias {args} {return [list got $args]}}
-    interp alias a a_alias b b_alias 1 2 3
-    a eval a_alias a b c
-} {got {1 2 3 a b c}}
-test interp-10.3 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    interp alias a a_alias b b_alias 1 2 3
-    list [catch {a eval a_alias a b c} msg] $msg
-} {1 {invalid command name "b_alias"}}
-test interp-10.4 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    interp create a
-    a alias a_alias puts
-    a aliases
-} a_alias
-test interp-10.5 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    a alias a_alias puts
-    interp alias a a_del b b_del
-    interp delete b
-    a aliases
-} a_alias
-test interp-10.6 {testing aliasing between interpreters} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    interp alias a a_command b b_command a1 a2 a3
-    b alias b_command in_master b1 b2 b3
-    a eval a_command m1 m2 m3
-} {seen in master: {b1 b2 b3 a1 a2 a3 m1 m2 m3}}
-test interp-10.7 {testing aliases between interpreters} {
-    catch {interp delete a}
-    interp create a
-    interp alias "" foo a zoppo
-    a eval {proc zoppo {x} {list $x $x $x}}
-    set x [foo 33]
-    a eval {rename zoppo {}}
-    interp alias "" foo a {}
-    equiv $x
-} {33 33 33}
-
-# Part 10: Testing "interp target"
-test interp-11.1 {testing interp target} {
-    list [catch {interp target} msg] $msg
-} {1 {wrong # args: should be "interp target path alias"}}
-test interp-11.2 {testing interp target} {
-    list [catch {interp target nosuchinterpreter foo} msg] $msg
-} {1 {could not find interpreter "nosuchinterpreter"}}
-test interp-11.3 {testing interp target} {
-    catch {interp delete a}
-    interp create a
-    a alias boo no_command
-    interp target a boo
-} ""
-test interp-11.4 {testing interp target} {
-    catch {interp delete x1}
-    interp create x1
-    x1 eval interp create x2
-    x1 eval x2 eval interp create x3
-    catch {interp delete y1}
-    interp create y1
-    y1 eval interp create y2
-    y1 eval y2 eval interp create y3
-    interp alias {x1 x2 x3} xcommand {y1 y2 y3} ycommand
-    interp target {x1 x2 x3} xcommand
-} {y1 y2 y3}
-test interp-11.5 {testing interp target} {
-    catch {interp delete x1}
-    interp create x1
-    interp create {x1 x2}
-    interp create {x1 x2 x3}
-    catch {interp delete y1}
-    interp create y1
-    interp create {y1 y2}
-    interp create {y1 y2 y3}
-    interp alias {x1 x2 x3} xcommand {y1 y2 y3} ycommand
-    list [catch {x1 eval {interp target {x2 x3} xcommand}} msg] $msg
-} {1 {target interpreter for alias "xcommand" in path "x2 x3" is not my descendant}}
-test interp-11.6 {testing interp target} {
-    foreach a [interp aliases] {
-	rename $a {}
-    }
-    list [catch {interp target {} foo} msg] $msg
-} {1 {alias "foo" in path "" not found}}
-test interp-11.7 {testing interp target} {
-    catch {interp delete a}
-    interp create a
-    list [catch {interp target a foo} msg] $msg
-} {1 {alias "foo" in path "a" not found}}
-
-# Part 11: testing "interp issafe"
-test interp-12.1 {testing interp issafe} {
-    interp issafe
-} 0
-test interp-12.2 {testing interp issafe} {
-    catch {interp delete a}
-    interp create a
-    interp issafe a
-} 0
-test interp-12.3 {testing interp issafe} {
-    catch {interp delete a}
-    interp create a
-    interp create {a x3} -safe
-    interp issafe {a x3}
-} 1
-test interp-12.4 {testing interp issafe} {
-    catch {interp delete a}
-    interp create a
-    interp create {a x3} -safe
-    interp create {a x3 foo}
-    interp issafe {a x3 foo}
-} 1
-
-# Part 12: testing interpreter object command "issafe" sub-command
-test interp-13.1 {testing foo issafe} {
-    catch {interp delete a}
-    interp create a
-    a issafe
-} 0
-test interp-13.2 {testing foo issafe} {
-    catch {interp delete a}
-    interp create a
-    interp create {a x3} -safe
-    a eval x3 issafe
-} 1
-test interp-13.3 {testing foo issafe} {
-    catch {interp delete a}
-    interp create a
-    interp create {a x3} -safe
-    interp create {a x3 foo}
-    a eval x3 eval foo issafe
-} 1
-
-# part 14: testing interp aliases
-test interp-14.1 {testing interp aliases} {
-    interp aliases
-} ""
-test interp-14.2 {testing interp aliases} {
-    catch {interp delete a}
-    interp create a
-    a alias a1 puts
-    a alias a2 puts
-    a alias a3 puts
-    lsort [interp aliases a]
-} {a1 a2 a3}
-test interp-14.3 {testing interp aliases} {
-    catch {interp delete a}
-    interp create a
-    interp create {a x3}
-    interp alias {a x3} froboz "" puts
-    interp aliases {a x3}
-} froboz
-
-# part 15: testing file sharing
-test interp-15.1 {testing file sharing} {
-    catch {interp delete z}
-    interp create z
-    z eval close stdout
-    list [catch {z eval puts hello} msg] $msg
-} {1 {can not find channel named "stdout"}}
-catch {removeFile file-15.2}
-test interp-15.2 {testing file sharing} {
-    catch {interp delete z}
-    interp create z
-    set f [open file-15.2 w]
-    interp share "" $f z
-    z eval puts $f hello
-    z eval close $f
-    close $f
-} ""
-catch {removeFile file-15.2}
-test interp-15.3 {testing file sharing} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    list [catch {xsafe eval puts hello} msg] $msg
-} {1 {can not find channel named "stdout"}}
-catch {removeFile file-15.4}
-test interp-15.4 {testing file sharing} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    set f [open file-15.4 w]
-    interp share "" $f xsafe
-    xsafe eval puts $f hello
-    xsafe eval close $f
-    close $f
-} ""
-catch {removeFile file-15.4}
-test interp-15.5 {testing file sharing} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    interp share "" stdout xsafe
-    list [catch {xsafe eval gets stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-catch {removeFile file-15.6}
-test interp-15.6 {testing file sharing} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    set f [open file-15.6 w]
-    interp share "" $f xsafe
-    set x [list [catch [list xsafe eval gets $f] msg] $msg]
-    xsafe eval close $f
-    close $f
-    string compare [string tolower $x] \
-		[list 1 [format "channel \"%s\" wasn't opened for reading" $f]]
-} 0
-catch {removeFile file-15.6}
-catch {removeFile file-15.7}
-test interp-15.7 {testing file transferring} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    set f [open file-15.7 w]
-    interp transfer "" $f xsafe
-    xsafe eval puts $f hello
-    xsafe eval close $f
-} ""
-catch {removeFile file-15.7}
-catch {removeFile file-15.8}
-test interp-15.8 {testing file transferring} {
-    catch {interp delete xsafe}
-    interp create xsafe -safe
-    set f [open file-15.8 w]
-    interp transfer "" $f xsafe
-    xsafe eval close $f
-    set x [list [catch {close $f} msg] $msg]
-    string compare [string tolower $x] \
-		[list 1 [format "can not find channel named \"%s\"" $f]]
-} 0
-catch {removeFile file-15.8}
-
-#
-# Torture tests for interpreter deletion order
-#
-proc kill {} {interp delete xxx}
-
-test interp-15.9 {testing deletion order} {
-    catch {interp delete xxx}
-    interp create xxx
-    xxx alias kill kill
-    list [catch {xxx eval kill} msg] $msg
-} {0 {}}
-test interp-16.1 {testing deletion order} {
-    catch {interp delete xxx}
-    interp create xxx
-    interp create {xxx yyy}
-    interp alias {xxx yyy} kill "" kill
-    list [catch {interp eval {xxx yyy} kill} msg] $msg
-} {0 {}}
-test interp-16.2 {testing deletion order} {
-    catch {interp delete xxx}
-    interp create xxx
-    interp create {xxx yyy}
-    interp alias {xxx yyy} kill "" kill
-    list [catch {xxx eval yyy eval kill} msg] $msg
-} {0 {}}
-test interp-16.3 {testing deletion order} {
-    catch {interp delete xxx}
-    interp create xxx
-    interp create ddd
-    xxx alias kill kill
-    interp alias ddd kill xxx kill
-    set x [ddd eval kill]
-    interp delete ddd
-    set x
-} ""
-test interp-16.4 {testing deletion order} {
-    catch {interp delete xxx}
-    interp create xxx
-    interp create {xxx yyy}
-    interp alias {xxx yyy} kill "" kill
-    interp create ddd
-    interp alias ddd kill {xxx yyy} kill
-    set x [ddd eval kill]
-    interp delete ddd
-    set x
-} ""
-test interp-16.5 {testing deletion order, bgerror} {
-    catch {interp delete xxx}
-    interp create xxx
-    xxx eval {proc bgerror {args} {exit}}
-    xxx alias exit kill xxx
-    proc kill {i} {interp delete $i}
-    xxx eval after 100 expr a + b
-    after 200
-    update
-    interp exists xxx
-} 0
-
-#
-# Alias loop prevention testing.
-#
-
-test interp-17.1 {alias loop prevention} {
-    list [catch {interp alias {} a {} a} msg] $msg
-} {1 {cannot define or rename alias "a": would create a loop}}
-test interp-17.2 {alias loop prevention} {
-    catch {interp delete x}
-    interp create x
-    x alias a loop
-    list [catch {interp alias {} loop x a} msg] $msg
-} {1 {cannot define or rename alias "loop": would create a loop}}
-test interp-17.3 {alias loop prevention} {
-    catch {interp delete x}
-    interp create x
-    interp alias x a x b
-    list [catch {interp alias x b x a} msg] $msg
-} {1 {cannot define or rename alias "b": would create a loop}}
-test interp-17.4 {alias loop prevention} {
-    catch {interp delete x}
-    interp create x
-    interp alias x b x a
-    list [catch {x eval rename b a} msg] $msg
-} {1 {cannot define or rename alias "b": would create a loop}}
-test interp-17.5 {alias loop prevention} {
-    catch {interp delete x}
-    interp create x
-    x alias z l1
-    interp alias {} l2 x z
-    list [catch {rename l2 l1} msg] $msg
-} {1 {cannot define or rename alias "l2": would create a loop}}
-
-#
-# Test robustness of Tcl_DeleteInterp when applied to a slave interpreter.
-# If there are bugs in the implementation these tests are likely to expose
-# the bugs as a core dump.
-#
-
-if {[info commands testinterpdelete] != ""} {
-    test interp-18.1 {testing Tcl_DeleteInterp vs slaves} {
-	list [catch {testinterpdelete} msg] $msg
-    } {1 {wrong # args: should be "testinterpdelete path"}}
-    test interp-18.2 {testing Tcl_DeleteInterp vs slaves} {
-	catch {interp delete a}
-	interp create a
-	testinterpdelete a
-    } ""
-    test interp-18.3 {testing Tcl_DeleteInterp vs slaves} {
-	catch {interp delete a}
-	interp create a
-	interp create {a b}
-	testinterpdelete {a b}
-    } ""
-    test interp-18.4 {testing Tcl_DeleteInterp vs slaves} {
-	catch {interp delete a}
-	interp create a
-	interp create {a b}
-	testinterpdelete a
-    } ""
-    test interp-18.5 {testing Tcl_DeleteInterp vs slaves} {
-	catch {interp delete a}
-	interp create a
-	interp create {a b}
-	interp alias {a b} dodel {} dodel
-	proc dodel {x} {testinterpdelete $x}
-	list [catch {interp eval {a b} {dodel {a b}}} msg] $msg
-    } {0 {}}
-    test interp-18.6 {testing Tcl_DeleteInterp vs slaves} {
-	catch {interp delete a}
-	interp create a
-	interp create {a b}
-	interp alias {a b} dodel {} dodel
-	proc dodel {x} {testinterpdelete $x}
-	list [catch {interp eval {a b} {dodel a}} msg] $msg
-    } {0 {}}
-    test interp-18.7 {eval in deleted interp} {
-	catch {interp delete a}
-	interp create a
-	a eval {
-	    proc dodel {} {
-		delme
-		dosomething else
-	    }
-	    proc dosomething args {
-		puts "I should not have been called!!"
-	    }
-	}
-	a alias delme dela
-	proc dela {} {interp delete a}
-	list [catch {a eval dodel} msg] $msg
-    } {1 {attempt to call eval in deleted interpreter}}
-    test interp-18.8 {eval in deleted interp} {
-	catch {interp delete a}
-	interp create a
-	a eval {
-	    interp create b
-	    b eval {
-		proc dodel {} {
-		    dela
-		}
-	    }
-	    proc foo {} {
-		b eval dela
-		dosomething else
-	    }
-	    proc dosomething args {
-		puts "I should not have been called!!"
-	    }
-	}
-	interp alias {a b} dela {} dela
-	proc dela {} {interp delete a}
-	list [catch {a eval foo} msg] $msg
-    } {1 {attempt to call eval in deleted interpreter}}
-}
-
-# Test alias deletion
-
-test interp-19.1 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    set s [interp alias a foo {}]
-    interp delete a
-    set s
-} {}
-test interp-19.2 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    catch {interp alias a foo {}} msg
-    interp delete a
-    set msg
-} {alias "foo" not found}
-test interp-19.3 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a {rename foo zop}
-    interp alias a foo a zop
-    catch {interp eval a foo} msg
-    interp delete a
-    set msg
-} {invalid command name "zop"}
-test interp-19.4 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a {rename foo zop}
-    catch {interp eval a foo} msg
-    interp delete a
-    set msg
-} {invalid command name "foo"}
-test interp-19.5 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    interp eval a {proc bar {} {return 1}}
-    interp alias a foo a bar
-    interp eval a {rename foo zop}
-    catch {interp eval a zop} msg
-    interp delete a
-    set msg
-} 1
-test interp-19.6 {alias deletion} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a {rename foo zop}
-    interp alias a foo a zop
-    set s [interp aliases a]
-    interp delete a
-    set s
-} foo
-test interp-19.7 {alias deletion, renaming} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a rename foo blotz
-    interp alias a foo {}
-    set s [interp aliases a]
-    interp delete a
-    set s
-} {}
-test interp-19.8 {alias deletion, renaming} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a rename foo blotz
-    set l ""
-    lappend l [interp aliases a]
-    interp alias a foo {}
-    lappend l [interp aliases a]
-    interp delete a
-    set l
-} {foo {}}
-test interp-19.9 {alias deletion, renaming} {
-    catch {interp delete a}
-    interp create a
-    interp alias a foo a bar
-    interp eval a rename foo blotz
-    interp eval a {proc foo {} {expr 34 * 34}}
-    interp alias a foo {}
-    set l [interp eval a foo]
-    interp delete a
-    set l
-} 1156    
-
-test interp-20.1 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a eval {proc foo {} {}}
-    a hide foo
-    catch {a eval foo something} msg
-    interp delete a
-    set msg
-} {invalid command name "foo"}
-test interp-20.2 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a hide list
-    set l ""
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {1 2 3}}
-test interp-20.3 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a hide list
-    set l ""
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {a invokehidden list 1 2 3} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {1 2 3} 0 {1 2 3}}
-test interp-20.4 {interp hide, interp expose and interp invokehidden -- passing {}} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a hide list
-    set l ""
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {a invokehidden list {"" 1 2 3}} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {{"" 1 2 3}} 0 {1 2 3}}
-test interp-20.5 {interp hide, interp expose and interp invokehidden -- passing {}} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a hide list
-    set l ""
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {a invokehidden list {{} 1 2 3}} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {{{} 1 2 3}} 0 {1 2 3}}
-test interp-20.6 {interp invokehidden -- eval args} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    set l ""
-    set z 45
-    lappend l [catch {a invokehidden list $z 1 2 3} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {a eval list $z 1 2 3} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {45 1 2 3} 0 {45 1 2 3}}
-test interp-20.7 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    set z 45
-    set l ""
-    lappend l [catch {a invokehidden list {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {{$z a b c}}}
-test interp-20.8 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    a eval set z 89
-    set z 45
-    set l ""
-    lappend l [catch {a invokehidden list {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {{$z a b c}}}
-test interp-20.9 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    a eval set z 89
-    set z 45
-    set l ""
-    lappend l [catch {a invokehidden list $z {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {45 {$z a b c}}}
-test interp-20.10 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    a eval {proc foo {} {}}
-    interp hide a foo
-    catch {interp eval a foo something} msg
-    interp delete a
-    set msg
-} {invalid command name "foo"}
-test interp-20.11 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    interp hide a list
-    set l ""
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    interp expose a list
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {1 2 3}}
-test interp-20.12 {interp hide, interp expose and interp invokehidden} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    interp hide a list
-    set l ""
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {interp invokehidden a list 1 2 3} msg]
-    lappend l $msg
-    interp expose a list
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {1 2 3} 0 {1 2 3}}
-test interp-20.13 {interp hide, interp expose, interp invokehidden -- passing {}} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    interp hide a list
-    set l ""
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {interp invokehidden a list {"" 1 2 3}} msg]
-    lappend l $msg
-    interp expose a list
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {{"" 1 2 3}} 0 {1 2 3}}
-test interp-20.14 {interp hide, interp expose, interp invokehidden -- passing {}} {
-    catch {interp delete a}
-    interp create a
-    a eval {proc unknown {x args} {error "invalid command name \"$x\""}}
-    interp hide a list
-    set l ""
-    lappend l [catch {interp eval a {list 1 2 3}} msg]
-    lappend l $msg
-    lappend l [catch {interp invokehidden a list {{} 1 2 3}} msg]
-    lappend l $msg
-    interp expose a list
-    lappend l [catch {a eval {list 1 2 3}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {invalid command name "list"} 0 {{{} 1 2 3}} 0 {1 2 3}}
-test interp-20.15 {interp invokehidden -- eval args} {
-    catch {interp delete a}
-    interp create a
-    interp hide a list
-    set l ""
-    set z 45
-    lappend l [catch {interp invokehidden a list $z 1 2 3} msg]
-    lappend l $msg
-    a expose list
-    lappend l [catch {interp eval a list $z 1 2 3} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {45 1 2 3} 0 {45 1 2 3}}
-test interp-20.16 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    interp hide a list
-    set z 45
-    set l ""
-    lappend l [catch {interp invokehidden a list {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {{$z a b c}}}
-test interp-20.17 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    interp hide a list
-    a eval set z 89
-    set z 45
-    set l ""
-    lappend l [catch {interp invokehidden a list {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {{$z a b c}}}
-test interp-20.18 {interp invokehidden vs variable eval} {
-    catch {interp delete a}
-    interp create a
-    interp hide a list
-    a eval set z 89
-    set z 45
-    set l ""
-    lappend l [catch {interp invokehidden a list $z {$z a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {45 {$z a b c}}}
-test interp-20.19 {interp invokehidden vs nested commands} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    set l [a invokehidden list {[list x y z] f g h} z]
-    interp delete a
-    set l
-} {{[list x y z] f g h} z}
-test interp-20.20 {interp invokehidden vs nested commands} {
-    catch {interp delete a}
-    interp create a
-    a hide list
-    set l [interp invokehidden a list {[list x y z] f g h} z]
-    interp delete a
-    set l
-} {{[list x y z] f g h} z}
-test interp-20.21 {interp hide vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {a hide list} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {}}
-test interp-20.22 {interp hide vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {interp hide a list} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {}}
-test interp-20.23 {interp hide vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {a eval {interp hide {} list}} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {permission denied: safe interpreter cannot hide commands}}
-test interp-20.24 {interp hide vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    set l ""
-    lappend l [catch {a eval {interp hide b list}} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {permission denied: safe interpreter cannot hide commands}}
-test interp-20.25 {interp hide vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    set l ""
-    lappend l [catch {interp hide {a b} list} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {}}
-test interp-20.26 {interp expoose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {a hide list} msg]    
-    lappend l $msg
-    lappend l [catch {a expose list} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 0 {}}
-test interp-20.27 {interp expose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {interp hide a list} msg]    
-    lappend l $msg
-    lappend l [catch {interp expose a list} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 0 {}}
-test interp-20.28 {interp expose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {a hide list} msg]    
-    lappend l $msg
-    lappend l [catch {a eval {interp expose {} list}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
-test interp-20.29 {interp expose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [catch {interp hide a list} msg]    
-    lappend l $msg
-    lappend l [catch {a eval {interp expose {} list}} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
-test interp-20.30 {interp expose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    set l ""
-    lappend l [catch {interp hide {a b} list} msg]    
-    lappend l $msg
-    lappend l [catch {a eval {interp expose b list}} msg]    
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
-test interp-20.31 {interp expose vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    set l ""
-    lappend l [catch {interp hide {a b} list} msg]    
-    lappend l $msg
-    lappend l [catch {interp expose {a b} list} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {0 {} 0 {}}
-test interp-20.32 {interp invokehidden vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp hide a list
-    set l ""
-    lappend l [catch {a eval {interp invokehidden {} list a b c}} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {not allowed to invoke hidden commands from safe interpreter}}
-test interp-20.33 {interp invokehidden vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp hide a list
-    set l ""
-    lappend l [catch {a eval {interp invokehidden {} list a b c}} msg]
-    lappend l $msg
-    lappend l [catch {a invokehidden list a b c} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {not allowed to invoke hidden commands from safe interpreter}\
-0 {a b c}}
-test interp-20.34 {interp invokehidden vs safety} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    interp hide {a b} list
-    set l ""
-    lappend l [catch {a eval {interp invokehidden b list a b c}} msg]
-    lappend l $msg
-    lappend l [catch {interp invokehidden {a b} list a b c} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {not allowed to invoke hidden commands from safe interpreter}\
-0 {a b c}}
-test interp-20.35 {invokehidden at local level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    set z 90
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.36 {invokehidden at local level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	set z 90
-	proc p1 {} {
-	    global z
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.37 {invokehidden at local level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.38 {invokehidden at global level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a -global h1
-    }
-    set r [catch {interp eval a p1} msg]
-    interp delete a
-    list $r $msg
-} {1 {can't read "z": no such variable}}
-test interp-20.39 {invokehidden at global level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    global z
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a -global h1
-    }
-    set r [catch {interp eval a p1} msg]
-    interp delete a
-    list $r $msg
-} {0 91}
-test interp-20.40 {safe, invokehidden at local level} {
-    catch {interp delete a}
-    interp create a -safe
-    a eval {
-	proc p1 {} {
-	    set z 90
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.41 {safe, invokehidden at local level} {
-    catch {interp delete a}
-    interp create a -safe
-    a eval {
-	set z 90
-	proc p1 {} {
-	    global z
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.42 {safe, invokehidden at local level} {
-    catch {interp delete a}
-    interp create a -safe
-    a eval {
-	proc p1 {} {
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a h1
-    }
-    set r [interp eval a p1]
-    interp delete a
-    set r
-} 91
-test interp-20.43 {invokehidden at global level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a -global h1
-    }
-    set r [catch {interp eval a p1} msg]
-    interp delete a
-    list $r $msg
-} {1 {can't read "z": no such variable}}
-test interp-20.44 {invokehidden at global level} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc p1 {} {
-	    global z
-	    a1
-	    set z
-	}
-	proc h1 {} {
-	    upvar z z
-	    set z 91
-	}
-    }
-    a hide h1
-    a alias a1 a1
-    proc a1 {} {
-	interp invokehidden a -global h1
-    }
-    set r [catch {interp eval a p1} msg]
-    interp delete a
-    list $r $msg
-} {0 91}
-test interp-20.45 {interp hide vs namespaces} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	namespace eval foo {}
-	proc foo::x {} {}
-    }
-    set l [list [catch {interp hide a foo::x} msg] $msg]
-    interp delete a
-    set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
-test interp-20.46 {interp hide vs namespaces} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	namespace eval foo {}
-	proc foo::x {} {}
-    }
-    set l [list [catch {interp hide a foo::x x} msg] $msg]
-    interp delete a
-    set l
-} {1 {can only hide global namespace commands (use rename then hide)}}
-test interp-20.47 {interp hide vs namespaces} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	proc x {} {}
-    }
-    set l [list [catch {interp hide a x foo::x} msg] $msg]
-    interp delete a
-    set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
-test interp-20.48 {interp hide vs namespaces} {
-    catch {interp delete a}
-    interp create a
-    a eval {
-	namespace eval foo {}
-	proc foo::x {} {}
-    }
-    set l [list [catch {interp hide a foo::x bar::x} msg] $msg]
-    interp delete a
-    set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
-
-test interp-21.1 {interp hidden} {
-    interp hidden {}
-} ""
-test interp-21.2 {interp hidden} {
-    interp hidden
-} ""
-test interp-21.3 {interp hidden vs interp hide, interp expose} {
-    set l ""
-    lappend l [interp hidden]
-    interp hide {} pwd
-    lappend l [interp hidden]
-    interp expose {} pwd
-    lappend l [interp hidden]
-    set l
-} {{} pwd {}}
-test interp-21.4 {interp hidden} {
-    catch {interp delete a}
-    interp create a
-    set l [interp hidden a]
-    interp delete a
-    set l
-} ""
-test interp-21.5 {interp hidden} {
-    catch {interp delete a}
-    interp create -safe a
-    set l [lsort [interp hidden a]]
-    interp delete a
-    set l
-} $hidden_cmds 
-test interp-21.6 {interp hidden vs interp hide, interp expose} {
-    catch {interp delete a}
-    interp create a
-    set l ""
-    lappend l [interp hidden a]
-    interp hide a pwd
-    lappend l [interp hidden a]
-    interp expose a pwd
-    lappend l [interp hidden a]
-    interp delete a
-    set l
-} {{} pwd {}}
-test interp-21.7 {interp hidden} {
-    catch {interp delete a}
-    interp create a
-    set l [a hidden]
-    interp delete a
-    set l
-} ""
-test interp-21.8 {interp hidden} {
-    catch {interp delete a}
-    interp create a -safe
-    set l [lsort [a hidden]]
-    interp delete a
-    set l
-} $hidden_cmds
-test interp-21.9 {interp hidden vs interp hide, interp expose} {
-    catch {interp delete a}
-    interp create a
-    set l ""
-    lappend l [a hidden]
-    a hide pwd
-    lappend l [a hidden]
-    a expose pwd
-    lappend l [a hidden]
-    interp delete a
-    set l
-} {{} pwd {}}
-
-test interp-22.1 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a
-    set l ""
-    lappend l [a issafe]
-    lappend l [a marktrusted]
-    lappend l [a issafe]
-    interp delete a
-    set l
-} {0 {} 0}
-test interp-22.2 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a
-    set l ""
-    lappend l [interp issafe a]
-    lappend l [interp marktrusted a]
-    lappend l [interp issafe a]
-    interp delete a
-    set l
-} {0 {} 0}
-test interp-22.3 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [a issafe]
-    lappend l [a marktrusted]
-    lappend l [a issafe]
-    interp delete a
-    set l
-} {1 {} 0}
-test interp-22.4 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [interp issafe a]
-    lappend l [interp marktrusted a]
-    lappend l [interp issafe a]
-    interp delete a
-    set l
-} {1 {} 0}
-test interp-22.5 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    catch {a eval {interp marktrusted b}} msg
-    interp delete a
-    set msg
-} {permission denied: safe interpreter cannot mark trusted}
-test interp-22.6 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    catch {a eval {b marktrusted}} msg
-    interp delete a
-    set msg
-} {permission denied: safe interpreter cannot mark trusted}
-test interp-22.7 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [interp issafe a]
-    interp marktrusted a
-    interp create {a b}
-    lappend l [interp issafe a]
-    lappend l [interp issafe {a b}]
-    interp delete a
-    set l
-} {1 0 0}
-test interp-22.8 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [interp issafe a]
-    interp create {a b}
-    lappend l [interp issafe {a b}]
-    interp marktrusted a
-    interp create {a c}
-    lappend l [interp issafe a]
-    lappend l [interp issafe {a c}]
-    interp delete a
-    set l
-} {1 1 0 0}
-test interp-22.9 {testing interp marktrusted} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [interp issafe a]
-    interp create {a b}
-    lappend l [interp issafe {a b}]
-    interp marktrusted {a b}
-    lappend l [interp issafe a]
-    lappend l [interp issafe {a b}]
-    interp create {a b c}
-    lappend l [interp issafe {a b c}]
-    interp delete a
-    set l
-} {1 1 1 0 0}
-
-test interp-23.1 {testing hiding vs aliases} {
-    catch {interp delete a}
-    interp create a
-    set l ""
-    lappend l [interp hidden a]
-    a alias bar bar
-    lappend l [interp aliases a]
-    lappend l [interp hidden a]
-    a hide bar
-    lappend l [interp aliases a]
-    lappend l [interp hidden a]
-    a alias bar {}
-    lappend l [interp aliases a]
-    lappend l [interp hidden a]
-    interp delete a
-    set l
-} {{} bar {} bar bar {} {}}
-test interp-23.2 {testing hiding vs aliases} {unixOrPc} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [lsort [interp hidden a]]
-    a alias bar bar
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    a hide bar
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    a alias bar {}
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    interp delete a
-    set l
-} {{cd encoding exec exit fconfigure file glob load open pwd socket source} bar {cd encoding exec exit fconfigure file glob load open pwd socket source} bar {bar cd encoding exec exit fconfigure file glob load open pwd socket source} {} {cd encoding exec exit fconfigure file glob load open pwd socket source}} 
-
-test interp-23.3 {testing hiding vs aliases} {macOnly} {
-    catch {interp delete a}
-    interp create a -safe
-    set l ""
-    lappend l [lsort [interp hidden a]]
-    a alias bar bar
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    a hide bar
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    a alias bar {}
-    lappend l [interp aliases a]
-    lappend l [lsort [interp hidden a]]
-    interp delete a
-    set l
-} {{beep cd echo exit fconfigure file glob load ls open pwd socket source} bar {beep cd echo exit fconfigure file glob load ls open pwd socket source} bar {bar beep cd echo exit fconfigure file glob load ls open pwd socket source} {} {beep cd echo exit fconfigure file glob load ls open pwd socket source}} 
-
-test interp-24.1 {result resetting on error} {
-    catch {interp delete a}
-    interp create a
-    proc foo args {error $args}
-    interp alias a foo {} foo
-    set l [interp eval a {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.2 {result resetting on error} {
-    catch {interp delete a}
-    interp create a -safe
-    proc foo args {error $args}
-    interp alias a foo {} foo
-    set l [interp eval a {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.3 {result resetting on error} {
-    catch {interp delete a}
-    interp create a
-    interp create {a b}
-    interp eval a {
-	proc foo args {error $args}
-    }
-    interp alias {a b} foo a foo
-    set l [interp eval {a b} {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.4 {result resetting on error} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    interp eval a {
-	proc foo args {error $args}
-    }
-    interp alias {a b} foo a foo
-    set l [interp eval {a b} {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.5 {result resetting on error} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a
-    interp create b
-    interp eval a {
-	proc foo args {error $args}
-    }
-    interp alias b foo a foo
-    set l [interp eval b {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.6 {result resetting on error} {
-    catch {interp delete a}
-    catch {interp delete b}
-    interp create a -safe
-    interp create b -safe
-    interp eval a {
-	proc foo args {error $args}
-    }
-    interp alias b foo a foo
-    set l [interp eval b {
-	set l {}
-	lappend l [catch {foo 1 2 3} msg]
-	lappend l $msg
-	lappend l [catch {foo 3 4 5} msg]
-	lappend l $msg
-	set l
-    }]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.7 {result resetting on error} {
-    catch {interp delete a}
-    interp create a
-    interp eval a {
-	proc foo args {error $args}
-    }
-    set l {}
-    lappend l [catch {interp eval a foo 1 2 3} msg]
-    lappend l $msg
-    lappend l [catch {interp eval a foo 3 4 5} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.8 {result resetting on error} {
-    catch {interp delete a}
-    interp create a -safe
-    interp eval a {
-	proc foo args {error $args}
-    }
-    set l {}
-    lappend l [catch {interp eval a foo 1 2 3} msg]
-    lappend l $msg
-    lappend l [catch {interp eval a foo 3 4 5} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.9 {result resetting on error} {
-    catch {interp delete a}
-    interp create a
-    interp create {a b}
-    interp eval {a b} {
-	proc foo args {error $args}
-    }
-    interp eval a {
-	proc foo args {
-	    eval interp eval b foo $args
-	}
-    }
-    set l {}
-    lappend l [catch {interp eval a foo 1 2 3} msg]
-    lappend l $msg
-    lappend l [catch {interp eval a foo 3 4 5} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.10 {result resetting on error} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    interp eval {a b} {
-	proc foo args {error $args}
-    }
-    interp eval a {
-	proc foo args {
-	    eval interp eval b foo $args
-	}
-    }
-    set l {}
-    lappend l [catch {interp eval a foo 1 2 3} msg]
-    lappend l $msg
-    lappend l [catch {interp eval a foo 3 4 5} msg]
-    lappend l $msg
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {3 4 5}}
-test interp-24.11 {result resetting on error} {
-    catch {interp delete a}
-    interp create a
-    interp create {a b}
-    interp eval {a b} {
-	proc foo args {error $args}
-    }
-    interp eval a {
-	proc foo args {
-	    set l {}
-	    lappend l [catch {eval interp eval b foo $args} msg]
-	    lappend l $msg
-	    lappend l [catch {eval interp eval b foo $args} msg]
-	    lappend l $msg
-	    set l
-	}
-    }
-    set l [interp eval a foo 1 2 3]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {1 2 3}}
-test interp-24.12 {result resetting on error} {
-    catch {interp delete a}
-    interp create a -safe
-    interp create {a b}
-    interp eval {a b} {
-	proc foo args {error $args}
-    }
-    interp eval a {
-	proc foo args {
-	    set l {}
-	    lappend l [catch {eval interp eval b foo $args} msg]
-	    lappend l $msg
-	    lappend l [catch {eval interp eval b foo $args} msg]
-	    lappend l $msg
-	    set l
-	}
-    }
-    set l [interp eval a foo 1 2 3]
-    interp delete a
-    set l
-} {1 {1 2 3} 1 {1 2 3}}
-
-unset hidden_cmds
-
-test interp-25.1 {testing aliasing of string commands} {
-    catch {interp delete a}
-    interp create a
-    a alias exec foo		;# Relies on exec being a string command!
-    interp delete a
-} ""
-
-
-#
-# Interps result transmission
-#
-
-test interp-26.1 {result code transmission : interp eval direct} {
-    # Test that all the possibles error codes from Tcl get passed up
-    # from the slave interp's context to the master, even though the
-    # slave nominally thinks the command is running at the root level.
-    
-    catch {interp delete a}
-    interp create a
-    set res {}
-    # use a for so if a return -code break 'escapes' we would notice
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [catch {interp eval a return -code $code} msg]
-    }
-    interp delete a
-    set res
-} {-1 0 1 2 3 4 5}
-
-
-test interp-26.2 {result code transmission : interp eval indirect} {
-    # retcode == 2 == return is special
-    catch {interp delete a}
-    interp create a
-    interp eval a {proc retcode {code} {return -code $code ret$code}}
-    set res {}
-    # use a for so if a return -code break 'escapes' we would notice
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [catch {interp eval a retcode $code} msg] $msg
-    }
-    interp delete a
-    set res
-} {-1 ret-1 0 ret0 1 ret1 0 ret2 3 ret3 4 ret4 5 ret5}
-
-test interp-26.3 {result code transmission : aliases} {
-    # Test that all the possibles error codes from Tcl get passed up
-    # from the slave interp's context to the master, even though the
-    # slave nominally thinks the command is running at the root level.
-    
-    catch {interp delete a}
-    interp create a
-    set res {}
-    proc MyTestAlias {code} {
-	return -code $code ret$code
-    }
-    interp alias a Test {} MyTestAlias
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [interp eval a [list catch [list Test $code] msg]]
-    }
-    interp delete a
-    set res
-} {-1 0 1 2 3 4 5}
-
-test interp-26.4 {result code transmission: invoke hidden direct--bug 1637} \
-	{knownBug} {
-    # The known bug is that code 2 is returned, not the -code argument
-    catch {interp delete a}
-    interp create a
-    set res {}
-    interp hide a return
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [catch {interp invokehidden a return -code $code ret$code}]
-    }
-    interp delete a
-    set res
-} {-1 0 1 2 3 4 5}
-
-test interp-26.5 {result code transmission: invoke hidden indirect--bug 1637} \
-	{knownBug} {
-    # The known bug is that the break and continue should raise errors
-    # that they are used outside a loop.
-    catch {interp delete a}
-    interp create a
-    set res {}
-    interp eval a {proc retcode {code} {return -code $code ret$code}}
-    interp hide a retcode
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [catch {interp invokehidden a retcode $code} msg] $msg
-    }
-    interp delete a
-    set res
-} {-1 ret-1 0 ret0 1 ret1 0 ret2 3 ret3 4 ret4 5 ret5}
-
-test interp-26.6 {result code transmission: all combined--bug 1637} \
-	{knownBug} {
-    # Test that all the possibles error codes from Tcl get passed
-    # In both directions.  This doesn't work.
-    set interp [interp create];
-    proc MyTestAlias {interp args} {
-	global aliasTrace;
-	lappend aliasTrace $args;
-	eval interp invokehidden [list $interp] $args
-    }
-    foreach c {return} {
-	interp hide $interp  $c;
-        interp alias $interp $c {} MyTestAlias $interp $c;
-    }
-    interp eval $interp {proc ret {code} {return -code $code ret$code}}
-    set res {}
-    set aliasTrace {}
-    for {set code -1} {$code<=5} {incr code} {
-	lappend res [catch {interp eval $interp ret $code} msg] $msg
-    }
-    interp delete $interp;
-    set res
-} {-1 ret-1 0 ret0 1 ret1 0 ret2 3 ret3 4 ret4 5 ret5}
-
-# Some tests might need to be added to check for difference between
-# toplevel and non toplevel evals.
-
-# End of return code transmission section
-
-test interp-26.7 {errorInfo transmission: regular interps} {
-    set interp [interp create];
-    proc MyError {secret} {
-	return -code error "msg"
-    }
-    proc MyTestAlias {interp args} {
-	MyError "some secret"
-    }
-    interp alias $interp test {} MyTestAlias $interp;
-    set res [interp eval $interp {catch test;set errorInfo}]
-    interp delete $interp;
-    set res
-} {msg
-    while executing
-"MyError "some secret""
-    (procedure "MyTestAlias" line 2)
-    invoked from within
-"test"}
-
-test interp-26.8 {errorInfo transmission: safe interps--bug 1637} {knownBug} {
-    # this test fails because the errorInfo is fully transmitted
-    # whether the interp is safe or not.  The errorInfo should never
-    # report data from the master interpreter because it could
-    # contain sensitive information.
-    set interp [interp create -safe];
-    proc MyError {secret} {
-	return -code error "msg"
-    }
-    proc MyTestAlias {interp args} {
-	MyError "some secret"
-    }
-    interp alias $interp test {} MyTestAlias $interp;
-    set res [interp eval $interp {catch test;set errorInfo}]
-    interp delete $interp;
-    set res
-} {msg
-    while executing
-"test"}
-
-# Interps & Namespaces
-test interp-27.1 {interp aliases & namespaces} {
-    set i [interp create];
-    set aliasTrace {};
-    proc tstAlias {args} { 
-	global aliasTrace;
-	lappend aliasTrace [list [namespace current] $args];
-    }
-    $i alias foo::bar tstAlias foo::bar;
-    $i eval foo::bar test
-    interp delete $i
-    set aliasTrace;
-} {{:: {foo::bar test}}}
-
-test interp-27.2 {interp aliases & namespaces} {
-    set i [interp create];
-    set aliasTrace {};
-    proc tstAlias {args} { 
-	global aliasTrace;
-	lappend aliasTrace [list [namespace current] $args];
-    }
-    $i alias foo::bar tstAlias foo::bar;
-    $i eval namespace eval foo {bar test}
-    interp delete $i
-    set aliasTrace;
-} {{:: {foo::bar test}}}
-
-test interp-27.3 {interp aliases & namespaces} {
-    set i [interp create];
-    set aliasTrace {};
-    proc tstAlias {args} { 
-	global aliasTrace;
-	lappend aliasTrace [list [namespace current] $args];
-    }
-    interp eval $i {namespace eval foo {proc bar {} {error "bar called"}}}
-    interp alias $i foo::bar {} tstAlias foo::bar;
-    interp eval $i {namespace eval foo {bar test}}
-    interp delete $i
-    set aliasTrace;
-} {{:: {foo::bar test}}}
-
-test interp-27.4 {interp aliases & namespaces} {
-    set i [interp create];
-    namespace eval foo2 {
-	variable aliasTrace {};
-	proc bar {args} { 
-	    variable aliasTrace;
-	    lappend aliasTrace [list [namespace current] $args];
-	}
-    }
-    $i alias foo::bar foo2::bar foo::bar;
-    $i eval namespace eval foo {bar test}
-    set r $foo2::aliasTrace;
-    namespace delete foo2;
-    set r
-} {{::foo2 {foo::bar test}}}
-
-# the following tests are commented out while we don't support
-# hiding in namespaces
-
-# test interp-27.5 {interp hidden & namespaces} {
-#    set i [interp create];
-#    interp eval $i {
-#	namespace eval foo {
-#	    proc bar {args} {
-#		return "bar called ([namespace current]) ($args)"
-#	    }
-#	}
-#    }
-#    set res [list [interp eval $i {namespace eval foo {bar test1}}]]
-#    interp hide $i foo::bar;
-#    lappend res [list [catch {interp eval $i {namespace eval foo {bar test2}}} msg] $msg]
-#    interp delete $i;
-#    set res;
-#} {{bar called (::foo) (test1)} {1 {invalid command name "bar"}}}
-
-# test interp-27.6 {interp hidden & aliases & namespaces} {
-#     set i [interp create];
-#     set v root-master;
-#     namespace eval foo {
-# 	variable v foo-master;
-# 	proc bar {interp args} {
-# 	    variable v;
-# 	    list "master bar called ($v) ([namespace current]) ($args)"\
-# 		    [interp invokehidden $interp foo::bar $args];
-# 	}
-#     }
-#     interp eval $i {
-# 	namespace eval foo {
-# 	    namespace export *
-# 	    variable v foo-slave;
-# 	    proc bar {args} {
-# 		variable v;
-# 		return "slave bar called ($v) ([namespace current]) ($args)"
-# 	    }
-# 	}
-#     }
-#     set res [list [interp eval $i {namespace eval foo {bar test1}}]]
-#     $i hide foo::bar;
-#     $i alias foo::bar foo::bar $i;
-#     set res [concat $res [interp eval $i {
-# 	set v root-slave;
-# 	namespace eval test {
-# 	    variable v foo-test;
-# 	    namespace import ::foo::*;
-# 	    bar test2
-#         }
-#     }]]
-#     namespace delete foo;
-#     interp delete $i;
-#     set res
-# } {{slave bar called (foo-slave) (::foo) (test1)} {master bar called (foo-master) (::foo) (test2)} {slave bar called (foo-slave) (::foo) (test2)}}
-
-
-# test interp-27.7 {interp hidden & aliases & imports & namespaces} {
-#     set i [interp create];
-#     set v root-master;
-#     namespace eval mfoo {
-# 	variable v foo-master;
-# 	proc bar {interp args} {
-# 	    variable v;
-# 	    list "master bar called ($v) ([namespace current]) ($args)"\
-# 		    [interp invokehidden $interp test::bar $args];
-# 	}
-#     }
-#     interp eval $i {
-# 	namespace eval foo {
-# 	    namespace export *
-# 	    variable v foo-slave;
-# 	    proc bar {args} {
-# 		variable v;
-# 		return "slave bar called ($v) ([info level 0]) ([uplevel namespace current]) ([namespace current]) ($args)"
-# 	    }
-# 	}
-# 	set v root-slave;
-# 	namespace eval test {
-# 	    variable v foo-test;
-# 	    namespace import ::foo::*;
-#         }
-#     }
-#     set res [list [interp eval $i {namespace eval test {bar test1}}]]
-#     $i hide test::bar;
-#     $i alias test::bar mfoo::bar $i;
-#     set res [concat $res [interp eval $i {test::bar test2}]];
-#     namespace delete mfoo;
-#     interp delete $i;
-#     set res
-# } {{slave bar called (foo-slave) (bar test1) (::tcltest) (::foo) (test1)} {master bar called (foo-master) (::mfoo) (test2)} {slave bar called (foo-slave) (test::bar test2) (::) (::foo) (test2)}}
-
-#test interp-27.8 {hiding, namespaces and integrity} {
-#    namespace eval foo {
-#	variable v 3;
-#	proc bar {} {variable v; set v}
-#	# next command would currently generate an unknown command "bar" error.
-#	interp hide {} bar;
-#    }
-#    namespace delete foo;
-#    list [catch {interp invokehidden {} foo} msg] $msg;
-#} {1 {invalid hidden command name "foo"}}
-
-
-test interp-28.1 {getting fooled by slave's namespace ?} {
-    set i [interp create -safe];
-    proc master {interp args} {interp hide $interp list}
-    $i alias master master $i;
-    set r [interp eval $i {
-	namespace eval foo {
-	    proc list {args} {
-		return "dummy foo::list";
-	    }
-	    master;
-	}
-	info commands list
-    }]
-    interp delete $i;
-    set r
-} {}
-
-# Tests of recursionlimit
-# We need testsetrecursionlimit so we need Tcltest package
-if {[catch {package require Tcltest} msg]} {
-    puts "This application hasn't been compiled with Tcltest"
-    puts "skipping remining interp tests that relies on it."
-} else {
-    # 
-test interp-29.1 {recursion limit} {
-    set i [interp create]
-    load {} Tcltest $i
-    set r [interp eval $i {
-	testsetrecursionlimit 50
-	proc p {} {incr ::i; p}
-	set i 0
-	catch p
-	set i
-    }]
-   interp delete $i
-   set r
-} 49
-
-test interp-29.2 {recursion limit inheritance} {
-    set i [interp create]
-    load {} Tcltest $i
-    set ii [interp eval $i {
-	testsetrecursionlimit 50
-	interp create
-    }]
-    set r [interp eval [list $i $ii] {
-	proc p {} {incr ::i; p}
-	set i 0
-	catch p
-	set i
-    }]
-   interp delete $i
-   set r
-} 49
-
-#    # Deep recursion (into interps when the regular one fails):
-#    # still crashes...
-#    proc p {} {
-#	if {[catch p ret]} {
-#	    catch {
-#		set i [interp create]
-#		interp eval $i [list proc p {} [info body p]]
-#		interp eval $i p
-#	    }
-#	    interp delete $i
-#	    return ok
-#	}
-#	return $ret
-#    }
-#    p
-
-# more tests needed...
-
-# Interp & stack
-#test interp-29.1 {interp and stack (info level)} {
-#} {}
-
-# End of stack-recursion tests
-}
-
-# This test dumps core in Tcl 8.0.3!
-test interp-30.1 {deletion of aliases inside namespaces} {
-    set i [interp create]
-    $i alias ns::cmd list
-    $i alias ns::cmd {}
-} {}
-
-test interp-31.1 {alias invocation scope} {
-    proc mySet {varName value} {
-	upvar 1 $varName localVar
-	set localVar $value
-    }
-
-    interp alias {} myNewSet {} mySet
-    proc testMyNewSet {value} {
-	myNewSet a $value
-	return $a
-    }
-    catch {unset a}
-    set result [testMyNewSet "ok"]
-    rename testMyNewSet {}
-    rename mySet {}
-    rename myNewSet {}
-    set result
-} ok
-
-# cleanup
-foreach i [interp slaves] {
-  interp delete $i
-}
-::tcltest::cleanupTests
-return
diff --git a/tests/io.test b/tests/io.test
deleted file mode 100644
index 620bc48..0000000
--- a/tests/io.test
+++ /dev/null
@@ -1,6809 +0,0 @@
-# Functionality covered: operation of all IO commands, and all procedures
-# defined in generic/tclIO.c.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: io.test,v 1.7 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {"[info commands testchannel]" != "testchannel"} {
-    puts "Skipping io tests. This application does not seem to have the"
-    puts "testchannel command that is needed to run these tests."
-    return
-}
-
-::tcltest::saveState
-
-removeFile test1
-removeFile pipe
-
-# set up a long data file for some of the following tests
-
-set f [open longfile w]
-fconfigure $f -eofchar {} -translation lf
-for { set i 0 } { $i < 100 } { incr i} {
-    puts $f "#123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
-\#123456789abcdef01
-\#"
-    }
-close $f
-
-makeFile {
-    set f stdin
-    if {$argv != ""} {
-	set f [open $argv]
-    }
-    fconfigure $f -encoding binary -translation lf -blocking 0 -eofchar \x1a
-    fconfigure stdout -encoding binary -translation lf -buffering none
-    fileevent $f readable "foo $f"
-    proc foo {f} {
-	set x [read $f]
-	catch {puts -nonewline $x}
-	if {[eof $f]} {
-	    close $f
-	    exit 0
-	}
-    }
-    vwait forever
-} cat
-
-set thisScript [file join [pwd] [info script]]
-
-# These tests are disabled until we decide what to do with "unsupported0".
-#
-test io-1.1 {unsupported0 command} {knownBug} {
-    removeFile test1
-    set f1 [open iocmd.test]
-    set f2 [open test1 w]
-    unsupported0 $f1 $f2
-    close $f1
-    catch {close $f2}
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    set x ok
-    if {"$s1" != "$s2"} {
-        set x broken
-    }
-    set x
-} ok
-test io-1.2 {unsupported0 command} {knownBug} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    unsupported0 $f1 $f2 40
-    close $f1
-    close $f2
-    file size test1
-} 40
-test io-1.3 {unsupported0 command} {knownBug} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    unsupported0 $f1 $f2 -1
-    close $f1
-    close $f2
-    set x ok
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    if {$s1 != $s2} {
-        set x broken
-    }
-    set x
-} ok
-test io-1.4 {unsupported0 command} {knownBug unixOrPc} {
-    removeFile pipe
-    removeFile test1
-    set f1 [open pipe w]
-    puts $f1 {puts ready}
-    puts $f1 {gets stdin}
-    puts $f1 {set f1 [open $thisScript r]}
-    puts $f1 {puts [read $f1 100]}
-    puts $f1 {close $f1}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    gets $f1
-    puts $f1 ready
-    flush $f1
-    set f2 [open test1 w]
-    set c [unsupported0 $f1 $f2 40]
-    catch {close $f1}
-    close $f2
-    set s1 [file size test1]
-    set x ok
-    if {$s1 != "40"} {
-        set x broken
-    }
-    list $c $x
-} {40 ok}
-
-proc contents {file} {
-    set f [open $file]
-    fconfigure $f -translation binary
-    set a [read $f]
-    close $f
-    return $a
-}
-
-test io-1.5 {Tcl_WriteChars: CheckChannelErrors} {emptyTest} {
-    # no test, need to cause an async error.
-} {}
-test io-1.6 {Tcl_WriteChars: WriteBytes} {
-    set f [open test1 w]
-    fconfigure $f -encoding binary
-    puts -nonewline $f "a\u4e4d\0"
-    close $f
-    contents test1
-} "a\x4d\x00"
-test io-1.7 {Tcl_WriteChars: WriteChars} {
-    set f [open test1 w]
-    fconfigure $f -encoding shiftjis
-    puts -nonewline $f "a\u4e4d\0"
-    close $f
-    contents test1
-} "a\x93\xe1\x00"
-
-test io-2.1 {WriteBytes} {
-    # loop until all bytes are written
-    
-    set f [open test1 w]
-    fconfigure $f  -encoding binary -buffersize 16 -translation crlf
-    puts $f "abcdefghijklmnopqrstuvwxyz"
-    close $f
-    contents test1
-} "abcdefghijklmnopqrstuvwxyz\r\n"
-test io-2.2 {WriteBytes: savedLF > 0} {
-    # After flushing buffer, there was a \n left over from the last
-    # \n -> \r\n expansion.  It gets stuck at beginning of this buffer.
-
-    set f [open test1 w]
-    fconfigure $f -encoding binary -buffersize 16 -translation crlf
-    puts -nonewline $f "123456789012345\n12"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "123456789012345\r" "123456789012345\r\n12"]
-test io-2.3 {WriteBytes: flush on line} {
-    # Tcl "line" buffering has weird behavior: if current buffer contains
-    # a \n, entire buffer gets flushed.  Logical behavior would be to flush
-    # only up to the \n.
-    
-    set f [open test1 w]
-    fconfigure $f -encoding binary -buffering line -translation crlf
-    puts -nonewline $f "\n12"
-    set x [contents test1]
-    close $f
-    set x
-} "\r\n12"
-test io-2.4 {WriteBytes: reset sawLF after each buffer} {
-    set f [open test1 w]
-     fconfigure $f -encoding binary -buffering line -translation lf \
-	     -buffersize 16
-    puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
-
-test io-3.1 {WriteChars: compatibility with WriteBytes} {
-    # loop until all bytes are written
-    
-    set f [open test1 w]
-    fconfigure $f -encoding ascii -buffersize 16 -translation crlf
-    puts $f "abcdefghijklmnopqrstuvwxyz"
-    close $f
-    contents test1
-} "abcdefghijklmnopqrstuvwxyz\r\n"
-test io-3.2 {WriteChars: compatibility with WriteBytes: savedLF > 0} {
-    # After flushing buffer, there was a \n left over from the last
-    # \n -> \r\n expansion.  It gets stuck at beginning of this buffer.
-
-    set f [open test1 w]
-    fconfigure $f -encoding ascii -buffersize 16 -translation crlf
-    puts -nonewline $f "123456789012345\n12"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "123456789012345\r" "123456789012345\r\n12"]
-test io-3.3 {WriteChars: compatibility with WriteBytes: flush on line} {
-    # Tcl "line" buffering has weird behavior: if current buffer contains
-    # a \n, entire buffer gets flushed.  Logical behavior would be to flush
-    # only up to the \n.
-    
-    set f [open test1 w]
-    fconfigure $f -encoding ascii -buffering line -translation crlf
-    puts -nonewline $f "\n12"
-    set x [contents test1]
-    close $f
-    set x
-} "\r\n12"
-test io-3.4 {WriteChars: loop over stage buffer} {
-    # stage buffer maps to more than can be queued at once.
-
-    set f [open test1 w]
-    fconfigure $f -encoding jis0208 -buffersize 16 
-    puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "!)!)!)!)!)!)!)!)" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test io-3.5 {WriteChars: saved != 0} {
-    # Bytes produced by UtfToExternal from end of last channel buffer
-    # had to be moved to beginning of next channel buffer to preserve
-    # requested buffersize.
-
-    set f [open test1 w]
-    fconfigure $f -encoding jis0208 -buffersize 17 
-    puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test io-3.6 {WriteChars: (stageRead + dstWrote == 0)} {
-    # One incomplete UTF-8 character at end of staging buffer.  Backup
-    # in src to the beginning of that UTF-8 character and try again.
-    #
-    # Translate the first 16 bytes, produce 14 bytes of output, 2 left over
-    # (first two bytes of \uff21 in UTF-8).  Given those two bytes try
-    # translating them again, find that no bytes are read produced, and break
-    # to outer loop where those two bytes will have the remaining 4 bytes
-    # (the last byte of \uff21 plus the all of \uff22) appended.
-
-    set f [open test1 w]
-    fconfigure $f -encoding shiftjis -buffersize 16
-    puts -nonewline $f "12345678901234\uff21\uff22"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "12345678901234\x82\x60" "12345678901234\x82\x60\x82\x61"]
-test io-3.7 {WriteChars: (bufPtr->nextAdded > bufPtr->length)} {
-    # When translating UTF-8 to external, the produced bytes went past end
-    # of the channel buffer.  This is done purpose -- we then truncate the
-    # bytes at the end of the partial character to preserve the requested
-    # blocksize on flush.  The truncated bytes are moved to the beginning
-    # of the next channel buffer.
-
-    set f [open test1 w]
-    fconfigure $f -encoding jis0208 -buffersize 17 
-    puts -nonewline $f "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "!)!)!)!)!)!)!)!)!" "!)!)!)!)!)!)!)!)!)!)!)!)!)!)!)"]
-test io-3.8 {WriteChars: reset sawLF after each buffer} {
-    set f [open test1 w]
-    fconfigure $f -encoding ascii -buffering line -translation lf \
-	     -buffersize 16
-    puts -nonewline $f "abcdefg\nhijklmnopqrstuvwxyz"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "abcdefg\nhijklmno" "abcdefg\nhijklmnopqrstuvwxyz"]
-
-test io-4.1 {TranslateOutputEOL: lf} {
-    # search for \n
-
-    set f [open test1 w]
-    fconfigure $f -buffering line -translation lf
-    puts $f "abcde"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "abcde\n" "abcde\n"]
-test io-4.2 {TranslateOutputEOL: cr} {
-    # search for \n, replace with \r
-
-    set f [open test1 w]
-    fconfigure $f -buffering line -translation cr
-    puts $f "abcde"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "abcde\r" "abcde\r"]
-test io-4.3 {TranslateOutputEOL: crlf} {
-    # simple case: search for \n, replace with \r
-
-    set f [open test1 w]
-    fconfigure $f -buffering line -translation crlf
-    puts $f "abcde"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "abcde\r\n" "abcde\r\n"]
-test io-4.4 {TranslateOutputEOL: crlf} {
-    # keep storing more bytes in output buffer until output buffer is full.
-    # We have 13 bytes initially that would turn into 18 bytes.  Fill
-    # dest buffer while (dstEnd < dstMax).
-
-    set f [open test1 w]
-    fconfigure $f -translation crlf -buffersize 16
-    puts -nonewline $f "1234567\n\n\n\n\nA"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "1234567\r\n\r\n\r\n\r\n\r" "1234567\r\n\r\n\r\n\r\n\r\nA"]
-test io-4.5 {TranslateOutputEOL: crlf} {
-    # Check for overflow of the destination buffer
-
-    set f [open test1 w]
-    fconfigure $f -translation crlf -buffersize 12
-    puts -nonewline $f "12345678901\n456789012345678901234"
-    close $f
-    set x [contents test1]
-} "12345678901\r\n456789012345678901234"
-
-test io-5.1 {CheckFlush: not full} {
-    set f [open test1 w]
-    fconfigure $f 
-    puts -nonewline $f "12345678901234567890"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "" "12345678901234567890"]
-test io-5.2 {CheckFlush: full} {
-    set f [open test1 w]
-    fconfigure $f -buffersize 16
-    puts -nonewline $f "12345678901234567890"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "1234567890123456" "12345678901234567890"]
-test io-5.3 {CheckFlush: not line} {
-    set f [open test1 w]
-    fconfigure $f -buffering line
-    puts -nonewline $f "12345678901234567890"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "" "12345678901234567890"]
-test io-5.4 {CheckFlush: line} {
-    set f [open test1 w]
-    fconfigure $f -buffering line -translation lf -encoding ascii
-    puts -nonewline $f "1234567890\n1234567890"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "1234567890\n1234567890" "1234567890\n1234567890"]
-test io-5.5 {CheckFlush: none} {
-    set f [open test1 w]
-    fconfigure $f -buffering none
-    puts -nonewline $f "1234567890"
-    set x [list [contents test1]]
-    close $f
-    lappend x [contents test1]
-} [list "1234567890" "1234567890"]
-
-test io-6.1 {Tcl_GetsObj: working} {
-    set f [open test1 w]
-    puts $f "foo\nboo"
-    close $f
-    set f [open test1]
-    set x [gets $f]
-    close $f
-    set x
-} {foo}
-test io-6.2 {Tcl_GetsObj: CheckChannelErrors() != 0} {
-    # no test, need to cause an async error.
-} {}
-test io-6.3 {Tcl_GetsObj: how many have we used?} {
-    # if (bufPtr != NULL) {oldRemoved = bufPtr->nextRemoved}
-
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f "abc\ndefg"
-    close $f
-    set f [open test1]
-    set x [list [tell $f] [gets $f line] [tell $f] [gets $f line] $line]
-    close $f
-    set x
-} {0 3 5 4 defg}
-test io-6.4 {Tcl_GetsObj: encoding == NULL} {
-    set f [open test1 w]
-    fconfigure $f -translation binary
-    puts $f "\x81\u1234\0"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation binary
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} [list 3 "\x81\x34\x00"]
-test io-6.5 {Tcl_GetsObj: encoding != NULL} {
-    set f [open test1 w]
-    fconfigure $f -translation binary
-    puts $f "\x88\xea\x92\x9a"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding shiftjis
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} [list 2 "\u4e00\u4e01"]
-set a "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-append a $a
-append a $a
-test io-6.6 {Tcl_GetsObj: loop test} {
-    # if (dst >= dstEnd) 
-
-    set f [open test1 w]
-    puts $f $a
-    puts $f hi
-    close $f
-    set f [open test1]
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} [list 256 $a]
-test io-6.7 {Tcl_GetsObj: error in input} {stdio} {
-    # if (FilterInputBytes(chanPtr, &gs) != 0)
-
-    set f [open "|[list $tcltest cat]" w+]
-    puts -nonewline $f "hi\nwould"
-    flush $f
-    gets $f
-    fconfigure $f -blocking 0
-    set x [gets $f line]
-    close $f
-    set x
-} {-1}
-test io-6.8 {Tcl_GetsObj: remember if EOF is seen} {
-    set f [open test1 w]
-    puts $f "abcdef\x1aghijk\nwombat"
-    close $f
-    set f [open test1]
-    fconfigure $f -eofchar \x1a
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {6 abcdef -1 {}}
-test io-6.9 {Tcl_GetsObj: remember if EOF is seen} {
-    set f [open test1 w]
-    puts $f "abcdefghijk\nwom\u001abat"
-    close $f
-    set f [open test1]
-    fconfigure $f -eofchar \x1a
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {11 abcdefghijk 3 wom}
-
-# Comprehensive tests
-
-test io-6.10 {Tcl_GetsObj: lf mode: no chars} {
-    set f [open test1 w]
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} {-1 {}}
-test io-6.11 {Tcl_GetsObj: lf mode: lone \n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {0 {} -1 {}}
-test io-6.12 {Tcl_GetsObj: lf mode: lone \r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 1 "\r" -1 ""]
-test io-6.13 {Tcl_GetsObj: lf mode: 1 char} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f a
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.14 {Tcl_GetsObj: lf mode: 1 char followed by EOL} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.15 {Tcl_GetsObj: lf mode: several chars} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation lf
-    set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 4 "abcd" 10 "efgh\rijkl\r" 4 "mnop" -1 ""]
-test io-6.16 {Tcl_GetsObj: cr mode: no chars} {
-    set f [open test1 w]
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} {-1 {}}
-test io-6.17 {Tcl_GetsObj: cr mode: lone \n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 1 "\n" -1 ""]
-test io-6.18 {Tcl_GetsObj: cr mode: lone \r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {0 {} -1 {}}
-test io-6.19 {Tcl_GetsObj: cr mode: 1 char} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f a
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.20 {Tcl_GetsObj: cr mode: 1 char followed by EOL} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.21 {Tcl_GetsObj: cr mode: several chars} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 9 "abcd\nefgh" 4 "ijkl" 5 "\nmnop" -1 ""]
-test io-6.22 {Tcl_GetsObj: crlf mode: no chars} {
-    set f [open test1 w]
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} {-1 {}}
-test io-6.23 {Tcl_GetsObj: crlf mode: lone \n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 1 "\n" -1 ""]
-test io-6.24 {Tcl_GetsObj: crlf mode: lone \r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 1 "\r" -1 ""]
-test io-6.25 {Tcl_GetsObj: crlf mode: \r\r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 2 "\r\r" -1 ""]
-test io-6.26 {Tcl_GetsObj: crlf mode: \r\n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 0 "" -1 ""]
-test io-6.27 {Tcl_GetsObj: crlf mode: 1 char} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f a
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.28 {Tcl_GetsObj: crlf mode: 1 char followed by EOL} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.29 {Tcl_GetsObj: crlf mode: several chars} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 14 "abcd\nefgh\rijkl" 4 "mnop" -1 ""]
-test io-6.30 {Tcl_GetsObj: crlf mode: buffer exhausted} {
-    # if (eol >= dstEnd)
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\r\nabcdefghijklmnoprstuvwxyz"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf -buffersize 16
-    set x [list [gets $f line] $line [testchannel inputbuffered $f]]
-    close $f
-    set x
-} [list 15 "123456789012345" 15]
-test io-6.31 {Tcl_GetsObj: crlf mode: buffer exhausted, blocked} {stdio} {
-    # (FilterInputBytes() != 0)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {crlf lf} -buffering none
-    puts -nonewline $f "bbbbbbbbbbbbbb\r\n123456789012345\r"
-    fconfigure $f -buffersize 16
-    set x [gets $f]
-    fconfigure $f -blocking 0
-    lappend x [gets $f line] $line [fblocked $f] [testchannel inputbuffered $f]
-    close $f
-    set x
-} [list "bbbbbbbbbbbbbb" -1 "" 1 16]
-test io-6.32 {Tcl_GetsObj: crlf mode: buffer exhausted, more data} {
-    # not (FilterInputBytes() != 0)
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\r\n123"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf -buffersize 16
-    set x [list [gets $f line] $line [tell $f] [testchannel inputbuffered $f]]
-    close $f
-    set x
-} [list 15 "123456789012345" 17 3]
-test io-6.33 {Tcl_GetsObj: crlf mode: buffer exhausted, at eof} {
-    # eol still equals dstEnd
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf -buffersize 16
-    set x [list [gets $f line] $line [eof $f]]
-    close $f
-    set x
-} [list 16 "123456789012345\r" 1]
-test io-6.34 {Tcl_GetsObj: crlf mode: buffer exhausted, not followed by \n} {
-    # not (*eol == '\n') 
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\rabcd\r\nefg"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf -buffersize 16
-    set x [list [gets $f line] $line [tell $f]]
-    close $f
-    set x
-} [list 20 "123456789012345\rabcd" 22]
-test io-6.35 {Tcl_GetsObj: auto mode: no chars} {
-    set f [open test1 w]
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line]
-    close $f
-    set x
-} {-1 {}}
-test io-6.36 {Tcl_GetsObj: auto mode: lone \n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 0 "" -1 ""]
-test io-6.37 {Tcl_GetsObj: auto mode: lone \r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 0 "" -1 ""]
-test io-6.38 {Tcl_GetsObj: auto mode: \r\r} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 0 "" 0 "" -1 ""]
-test io-6.39 {Tcl_GetsObj: auto mode: \r\n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 0 "" -1 ""]
-test io-6.40 {Tcl_GetsObj: auto mode: 1 char} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f a
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.41 {Tcl_GetsObj: auto mode: 1 char followed by EOL} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} {1 a -1 {}}
-test io-6.42 {Tcl_GetsObj: auto mode: several chars} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\nefgh\rijkl\r\nmnop"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [gets $f line] $line [gets $f line] $line]
-    lappend x [gets $f line] $line [gets $f line] $line [gets $f line] $line
-    close $f
-    set x
-} [list 4 "abcd" 4 "efgh" 4 "ijkl" 4 "mnop" -1 ""]
-test io-6.43 {Tcl_GetsObj: input saw cr} {stdio} {
-    # if (chanPtr->flags & INPUT_SAW_CR)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto lf} -buffering none
-    puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r"
-    fconfigure $f -buffersize 16
-    set x [list [gets $f]]
-    fconfigure $f -blocking 0
-    lappend x [gets $f line] $line [testchannel queuedcr $f] 
-    fconfigure $f -blocking 1
-    puts -nonewline $f "\nabcd\refg\x1a"
-    lappend x [gets $f line] $line [testchannel queuedcr $f]
-    lappend x [gets $f line] $line
-    close $f
-    set x
-} [list "bbbbbbbbbbbbbbb" 15 "123456789abcdef" 1 4 "abcd" 0 3 "efg"]
-test io-6.44 {Tcl_GetsObj: input saw cr, not followed by cr} {stdio} {
-    # not (*eol == '\n') 
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto lf} -buffering none
-    puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r"
-    fconfigure $f -buffersize 16
-    set x [list [gets $f]]
-    fconfigure $f -blocking 0
-    lappend x [gets $f line] $line [testchannel queuedcr $f] 
-    fconfigure $f -blocking 1
-    puts -nonewline $f "abcd\refg\x1a"
-    lappend x [gets $f line] $line [testchannel queuedcr $f]
-    lappend x [gets $f line] $line
-    close $f
-    set x
-} [list "bbbbbbbbbbbbbbb" 15 "123456789abcdef" 1 4 "abcd" 0 3 "efg"]
-test io-6.45 {Tcl_GetsObj: input saw cr, skip right number of bytes} {stdio} {
-    # Tcl_ExternalToUtf()
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto lf} -buffering none
-    fconfigure $f -encoding unicode
-    puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r"
-    fconfigure $f -buffersize 16
-    gets $f
-    fconfigure $f -blocking 0
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    fconfigure $f -blocking 1
-    puts -nonewline $f "\nabcd\refg"
-    lappend x [gets $f line] $line [testchannel queuedcr $f]
-    close $f
-    set x
-} [list 15 "123456789abcdef" 1 4 "abcd" 0]
-test io-6.46 {Tcl_GetsObj: input saw cr, followed by just \n should give eof} {stdio} {
-    # memmove()
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto lf} -buffering none
-    puts -nonewline $f "bbbbbbbbbbbbbbb\n123456789abcdef\r"
-    fconfigure $f -buffersize 16
-    gets $f
-    fconfigure $f -blocking 0
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    fconfigure $f -blocking 1
-    puts -nonewline $f "\n\x1a"
-    lappend x [gets $f line] $line [testchannel queuedcr $f]
-    close $f
-    set x
-} [list 15 "123456789abcdef" 1 -1 "" 0]
-test io-6.47 {Tcl_GetsObj: auto mode: \r at end of buffer, peek for \n} {
-    # (eol == dstEnd)
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\r\nabcdefghijklmnopq"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto -buffersize 16
-    set x [list [gets $f] [testchannel inputbuffered $f]]
-    close $f
-    set x
-} [list "123456789012345" 15]    
-test io-6.48 {Tcl_GetsObj: auto mode: \r at end of buffer, no more avail} {
-    # PeekAhead() did not get any, so (eol >= dstEnd)
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456789012345\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto -buffersize 16
-    set x [list [gets $f] [testchannel queuedcr $f]]
-    close $f
-    set x
-} [list "123456789012345" 1]
-test io-6.49 {Tcl_GetsObj: auto mode: \r followed by \n} {
-    # if (*eol == '\n') {skip++}
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456\r\n78901"
-    close $f
-    set f [open test1]
-    set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
-    close $f
-    set x
-} [list "123456" 0 8 "78901"]
-test io-6.50 {Tcl_GetsObj: auto mode: \r not followed by \n} {
-    # not (*eol == '\n') 
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456\r78901"
-    close $f
-    set f [open test1]
-    set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
-    close $f
-    set x
-} [list "123456" 0 7 "78901"]
-test io-6.51 {Tcl_GetsObj: auto mode: \n} {
-    # else if (*eol == '\n') {goto gotoeol;}
-    
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456\n78901"
-    close $f
-    set f [open test1]
-    set x [list [gets $f] [tell $f] [gets $f]]
-    close $f
-    set x
-} [list "123456" 7 "78901"]
-test io-6.52 {Tcl_GetsObj: saw EOF character} {
-    # if (eof != NULL)
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "123456\x1ak9012345\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -eofchar \x1a
-    set x [list [gets $f] [testchannel queuedcr $f] [tell $f] [gets $f]]
-    close $f
-    set x
-} [list "123456" 0 6 ""]
-test io-6.53 {Tcl_GetsObj: device EOF} {
-    # didn't produce any bytes
-
-    set f [open test1 w]
-    close $f
-    set f [open test1]
-    set x [list [gets $f line] $line [eof $f]]
-    close $f
-    set x
-} {-1 {} 1}
-test io-6.54 {Tcl_GetsObj: device EOF} {
-    # got some bytes before EOF.
-
-    set f [open test1 w]
-    puts -nonewline $f abc
-    close $f
-    set f [open test1]
-    set x [list [gets $f line] $line [eof $f]]
-    close $f
-    set x
-} {3 abc 1}
-test io-6.55 {Tcl_GetsObj: overconverted} {
-    # Tcl_ExternalToUtf(), make sure state updated
-
-    set f [open test1 w]
-    fconfigure $f -encoding iso2022-jp
-    puts $f "there\u4e00ok\n\u4e01more bytes\nhere"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding iso2022-jp
-    set x [list [gets $f line] $line [gets $f line] $line [gets $f line] $line]
-    close $f
-    set x
-} [list 8 "there\u4e00ok" 11 "\u4e01more bytes" 4 "here"]
-test io-6.56 {Tcl_GetsObj: incomplete lines should disable file events} {stdio} {
-    update
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -buffering none
-    puts -nonewline $f "foobar"
-    fconfigure $f -blocking 0
-    set x {}
-    after 500 { lappend x timeout }
-    fileevent $f readable { lappend x [gets $f] }
-    vwait x
-    vwait x
-    fconfigure $f -blocking 1
-    puts -nonewline $f "baz\n"
-    after 500 { lappend x timeout }
-    fconfigure $f -blocking 0
-    vwait x
-    vwait x
-    close $f
-    set x
-} {{} timeout foobarbaz timeout}
-
-test io-7.1 {FilterInputBytes: split up character at end of buffer} {
-    # (result == TCL_CONVERT_MULTIBYTE)
-
-    set f [open test1 w]
-    fconfigure $f -encoding shiftjis
-    puts $f "1234567890123\uff10\uff11\uff12\uff13\uff14\nend"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding shiftjis -buffersize 16
-    set x [gets $f]
-    close $f
-    set x
-} "1234567890123\uff10\uff11\uff12\uff13\uff14"
-test io-7.2 {FilterInputBytes: split up character in middle of buffer} {
-    # (bufPtr->nextAdded < bufPtr->bufLength)
-    
-    set f [open test1 w]
-    fconfigure $f -encoding binary
-    puts -nonewline $f "1234567890\n123\x82\x4f\x82\x50\x82"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding shiftjis
-    set x [list [gets $f line] $line [eof $f]]
-    close $f
-    set x
-} [list 10 "1234567890" 0]
-test io-7.3 {FilterInputBytes: split up character at EOF} {
-    set f [open test1 w]
-    fconfigure $f -encoding binary
-    puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding shiftjis
-    set x [list [gets $f line] $line]
-    lappend x [tell $f] [testchannel inputbuffered $f] [eof $f]
-    lappend x [gets $f line] $line
-    close $f
-    set x
-} [list 15 "1234567890123\uff10\uff11" 18 0 1 -1 ""]
-test io-7.4 {FilterInputBytes: recover from split up character} {stdio} {
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -encoding binary -buffering none
-    puts -nonewline $f "1234567890123\x82\x4f\x82\x50\x82"
-    fconfigure $f -encoding shiftjis -blocking 0
-    fileevent $f read "ready $f"
-    set x {}
-    proc ready {f} {
-	lappend ::x [gets $f line] $line [fblocked $f]
-    }
-    vwait x
-    fconfigure $f -encoding binary -blocking 1
-    puts $f "\x51\x82\x52"
-    fconfigure $f -encoding shiftjis
-    vwait x
-    close $f
-    set x
-} [list -1 "" 1 17 "1234567890123\uff10\uff11\uff12\uff13" 0]
-
-test io-8.1 {PeekAhead: only go to device if no more cached data} {
-    # (bufPtr->nextPtr == NULL)
-
-    set f [open "test1" w]
-    fconfigure $f -encoding ascii -translation lf
-    puts -nonewline $f "123456789012345\r\n2345678"
-    close $f
-    set f [open "test1"]
-    fconfigure $f -encoding ascii -translation auto -buffersize 16
-    # here
-    gets $f
-    set x [testchannel inputbuffered $f]
-    close $f
-    set x
-} "7"
-test io-8.2 {PeekAhead: only go to device if no more cached data} {stdio} {
-    # not (bufPtr->nextPtr == NULL)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation lf -encoding ascii -buffering none
-    puts -nonewline $f "123456789012345\r\nbcdefghijklmnopqrstuvwxyz"
-    set x {}
-    fileevent $f read "ready $f"
-    proc ready {f} {
-	lappend ::x [gets $f line] $line [testchannel inputbuffered $f]
-    }
-    fconfigure $f -encoding unicode -buffersize 16 -blocking 0
-    vwait x
-    fconfigure $f -translation auto -encoding ascii -blocking 1
-    # here
-    vwait x
-    close $f
-    set x
-} [list -1 "" 42 15 "123456789012345" 25]
-test io-8.3 {PeekAhead: no cached data available} {stdio} {
-    # (bytesLeft == 0)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto binary}
-    puts -nonewline $f "abcdefghijklmno\r"
-    flush $f
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    close $f
-    set x
-} [list 15 "abcdefghijklmno" 1]
-set a "123456789012345678901234567890"
-append a "123456789012345678901234567890"
-append a "1234567890123456789012345678901"
-test io-8.4 {PeekAhead: cached data available in this buffer} {
-    # not (bytesLeft == 0)
-
-    set f [open test1 w+]
-    fconfigure $f -translation binary
-    puts $f "${a}\r\nabcdef"
-    close $f
-    set f [open test1]
-    fconfigure $f -encoding binary -translation auto
-
-    # "${a}\r" was converted in one operation (because ENCODING_LINESIZE
-    # is 30).  To check if "\n" follows, calls PeekAhead and determines
-    # that cached data is available in buffer w/o having to call driver.
-
-    set x [gets $f]
-    close $f
-    set x    
-} $a
-unset a
-test io-8.5 {PeekAhead: don't peek if last read was short} {stdio} {
-    # (bufPtr->nextAdded < bufPtr->length)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto binary}
-    puts -nonewline $f "abcdefghijklmno\r"
-    flush $f
-    # here
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    close $f
-    set x
-} {15 abcdefghijklmno 1}
-test io-8.6 {PeekAhead: change to non-blocking mode} {stdio} {
-    # ((chanPtr->flags & CHANNEL_NONBLOCKING) == 0) 
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto binary} -buffersize 16
-    puts -nonewline $f "abcdefghijklmno\r"
-    flush $f
-    # here
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    close $f
-    set x
-} {15 abcdefghijklmno 1}
-test io-8.7 {PeekAhead: cleanup} {stdio} {
-    # Make sure bytes are removed from buffer.
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -translation {auto binary} -buffering none
-    puts -nonewline $f "abcdefghijklmno\r"
-    # here
-    set x [list [gets $f line] $line [testchannel queuedcr $f]]
-    puts -nonewline $f "\x1a"
-    lappend x [gets $f line] $line
-    close $f
-    set x
-} {15 abcdefghijklmno 1 -1 {}}
-    
-
-test io-9.1 {CommonGetsCleanup} {
-} {}
-
-test io-10.1 {Tcl_ReadChars: CheckChannelErrors} {
-    # no test, need to cause an async error.
-} {}
-test io-10.2 {Tcl_ReadChars: loop until enough copied} {
-    # one time
-    # for (copied = 0; (unsigned) toRead > 0; )
-
-    set f [open "test1" w]
-    puts $f abcdefghijklmnop
-    close $f
-
-    set f [open "test1"]
-    set x [read $f 5]
-    close $f
-    set x
-} {abcde}
-test io-10.3 {Tcl_ReadChars: loop until enough copied} {
-    # multiple times
-    # for (copied = 0; (unsigned) toRead > 0; )
-
-    set f [open "test1" w]
-    puts $f abcdefghijklmnopqrstuvwxyz
-    close $f
-
-    set f [open "test1"]
-    fconfigure $f -buffersize 16
-    # here
-    set x [read $f 19]
-    close $f
-    set x
-} {abcdefghijklmnopqrs}
-test io-10.4 {Tcl_ReadChars: no more in channel buffer} {
-    # (copiedNow < 0)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-
-    set f [open "test1"]
-    # here
-    set x [read $f 1000]
-    close $f
-    set x
-} {abcdefghijkl}
-test io-10.5 {Tcl_ReadChars: stop on EOF} {
-    # (chanPtr->flags & CHANNEL_EOF)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-
-    set f [open "test1"]
-    # here
-    set x [read $f 1000]
-    close $f
-    set x
-} {abcdefghijkl}
-
-test io-11.1 {ReadBytes: want to read a lot} {
-    # ((unsigned) toRead > (unsigned) srcLen)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-    set f [open "test1"]
-    fconfigure $f -encoding binary
-    # here
-    set x [read $f 1000]
-    close $f
-    set x
-} {abcdefghijkl}
-test io-11.2 {ReadBytes: want to read all} {
-    # ((unsigned) toRead > (unsigned) srcLen)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-    set f [open "test1"]
-    fconfigure $f -encoding binary
-    # here
-    set x [read $f]
-    close $f
-    set x
-} {abcdefghijkl}
-test io-11.3 {ReadBytes: allocate more space} {
-    # (toRead > length - offset - 1)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijklmnopqrstuvwxyz
-    close $f
-    set f [open "test1"]
-    fconfigure $f -buffersize 16 -encoding binary
-    # here
-    set x [read $f]
-    close $f
-    set x
-} {abcdefghijklmnopqrstuvwxyz}
-test io-11.4 {ReadBytes: EOF char found} {
-    # (TranslateInputEOL() != 0)
-
-    set f [open "test1" w]
-    puts $f abcdefghijklmnopqrstuvwxyz
-    close $f
-    set f [open "test1"]
-    fconfigure $f -eofchar m -encoding binary
-    # here
-    set x [list [read $f] [eof $f] [read $f] [eof $f]]
-    close $f
-    set x
-} [list "abcdefghijkl" 1 "" 1]
-    
-test io-12.1 {ReadChars: want to read a lot} {
-    # ((unsigned) toRead > (unsigned) srcLen)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-    set f [open "test1"]
-    # here
-    set x [read $f 1000]
-    close $f
-    set x
-} {abcdefghijkl}
-test io-12.2 {ReadChars: want to read all} {
-    # ((unsigned) toRead > (unsigned) srcLen)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijkl
-    close $f
-    set f [open "test1"]
-    # here
-    set x [read $f]
-    close $f
-    set x
-} {abcdefghijkl}
-test io-12.3 {ReadChars: allocate more space} {
-    # (toRead > length - offset - 1)
-
-    set f [open "test1" w]
-    puts -nonewline $f abcdefghijklmnopqrstuvwxyz
-    close $f
-    set f [open "test1"]
-    fconfigure $f -buffersize 16
-    # here
-    set x [read $f]
-    close $f
-    set x
-} {abcdefghijklmnopqrstuvwxyz}
-test io-12.4 {ReadChars: split-up char} {stdio} {
-    # (srcRead == 0)
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -encoding binary -buffering none -buffersize 16
-    puts -nonewline $f "123456789012345\x96"
-    fconfigure $f -encoding shiftjis -blocking 0
-
-    fileevent $f read "ready $f"
-    proc ready {f} {
-	lappend ::x [read $f] [testchannel inputbuffered $f]
-    }
-    set x {}
-
-    fconfigure $f -encoding shiftjis
-    vwait x
-    fconfigure $f -encoding binary -blocking 1
-    puts -nonewline $f "\x7b"
-    after 500			;# Give the cat process time to catch up
-    fconfigure $f -encoding shiftjis -blocking 0
-    vwait x
-    close $f
-    set x
-} [list "123456789012345" 1 "\u672c" 0]
-test io-12.5 {ReadChars: fileevents on partial characters} {stdio} {
-    makeFile {
-	fconfigure stdout -encoding binary -buffering none
-	gets stdin; puts -nonewline "\xe7"
-	gets stdin; puts -nonewline "\x89"
-	gets stdin; puts -nonewline "\xa6"
-    } test1
-    set f [open "|[list $tcltest test1]" r+]
-    fileevent $f readable {
-	lappend x [read $f]
-	if {[eof $f]} {
-	    lappend x eof
-	}
-    }
-    puts $f "go1"
-    flush $f
-    fconfigure $f -blocking 0 -encoding utf-8
-    set x {}
-    vwait x
-    after 500 { lappend x timeout }
-    vwait x
-    puts $f "go2"
-    flush $f
-    vwait x
-    after 500 { lappend x timeout }
-    vwait x
-    puts $f "go3"
-    flush $f
-    vwait x
-    vwait x
-    lappend x [catch {close $f} msg] $msg
-    set x
-} "{} timeout {} timeout \u7266 {} eof 0 {}"
-
-test io-13.1 {TranslateInputEOL: cr mode} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\rdef\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation cr
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef\n"
-test io-13.2 {TranslateInputEOL: crlf mode} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r\ndef\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef\n"
-test io-13.3 {TranslateInputEOL: crlf mode: naked cr} {
-    # (src >= srcMax) 
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r\ndef\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef\r"
-test io-13.4 {TranslateInputEOL: crlf mode: cr followed by not \n} {
-    # (src >= srcMax) 
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r\ndef\rfgh"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef\rfgh"
-test io-13.5 {TranslateInputEOL: crlf mode: naked lf} {
-    # (src >= srcMax) 
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r\ndef\nfgh"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef\nfgh"
-test io-13.6 {TranslateInputEOL: auto mode: saw cr in last segment} {stdio} {
-    # (chanPtr->flags & INPUT_SAW_CR)
-    # This test may fail on slower machines.
-
-    set f [open "|[list $tcltest cat]" w+]
-    fconfigure $f -blocking 0 -buffering none -translation {auto lf}
-
-    fileevent $f read "ready $f"
-    proc ready {f} {
-	lappend ::x [read $f] [testchannel queuedcr $f]
-    }
-    set x {}
-
-    puts -nonewline $f "abcdefghj\r"
-    after 500 {set y ok}
-    vwait y
-
-    puts -nonewline $f "\n01234"
-    after 500 {set y ok}
-    vwait y
-
-    close $f
-    set x
-} [list "abcdefghj\n" 1 "01234" 0]
-test io-13.7 {TranslateInputEOL: auto mode: naked \r} {
-    # (src >= srcMax)
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [list [read $f] [testchannel queuedcr $f]]
-    close $f
-    set x
-} [list "abcd\n" 1]
-test io-13.8 {TranslateInputEOL: auto mode: \r\n} {
-    # (*src == '\n')
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\r\ndef"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef"
-test io-13.9 {TranslateInputEOL: auto mode: \r followed by not \n} {
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\rdef"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef"
-test io-13.10 {TranslateInputEOL: auto mode: \n} {
-    # not (*src == '\r') 
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\ndef"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto
-    set x [read $f]
-    close $f
-    set x
-} "abcd\ndef"
-test io-13.11 {TranslateInputEOL: EOF char} {
-    # (*chanPtr->inEofChar != '\0')
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "abcd\ndefgh"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto -eofchar e
-    set x [read $f]
-    close $f
-    set x
-} "abcd\nd"
-test io-13.12 {TranslateInputEOL: find EOF char in src} {
-    # (*chanPtr->inEofChar != '\0')
-
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "\r\n\r\n\r\nab\r\n\r\ndef\r\n\r\n\r\n"
-    close $f
-    set f [open test1]
-    fconfigure $f -translation auto -eofchar e
-    set x [read $f]
-    close $f
-    set x
-} "\n\n\nab\n\nd"
-    
-# Test standard handle management. The functions tested are
-# Tcl_SetStdChannel and Tcl_GetStdChannel. Incidentally we are
-# also testing channel table management.
-
-if {$tcl_platform(platform) == "macintosh"} {
-    set consoleFileNames [list console0 console1 console2]
-} else {
-    set consoleFileNames [lsort [testchannel open]]
-}
-test io-14.1 {Tcl_SetStdChannel and Tcl_GetStdChannel} {
-    set l ""
-    lappend l [fconfigure stdin -buffering]
-    lappend l [fconfigure stdout -buffering]
-    lappend l [fconfigure stderr -buffering]
-    lappend l [lsort [testchannel open]]
-    set l
-} [list line line none $consoleFileNames]
-test io-14.2 {Tcl_SetStdChannel and Tcl_GetStdChannel} {
-    interp create x
-    set l ""
-    lappend l [x eval {fconfigure stdin -buffering}]
-    lappend l [x eval {fconfigure stdout -buffering}]
-    lappend l [x eval {fconfigure stderr -buffering}]
-    interp delete x
-    set l
-} {line line none}
-test io-14.3 {Tcl_SetStdChannel & Tcl_GetStdChannel} {stdio} {
-    set f [open test1 w]
-    puts $f {
-	close stdin
-	close stdout
-	close stderr
-	set f [open test1 r]
-	set f2 [open test2 w]
-	set f3 [open test3 w]
-	puts stdout [gets stdin]
-	puts stdout out
-	puts stderr err
-	close $f
-	close $f2
-	close $f3
-    }
-    close $f
-    set result [exec $tcltest test1]
-    set f [open test2 r]
-    set f2 [open test3 r]
-    lappend result [read $f] [read $f2]
-    close $f
-    close $f2
-    set result
-} {{
-out
-} {err
-}}
-# This test relies on the fact that the smallest available fd is used first.
-test io-14.4 {Tcl_SetStdChannel & Tcl_GetStdChannel} {unixOnly} {
-    set f [open test1 w]
-    puts $f { close stdin
-	close stdout
-	close stderr
-	set f [open test1 r]
-	set f2 [open test2 w]
-	set f3 [open test3 w]
-	puts stdout [gets stdin]
-	puts stdout $f2
-	puts stderr $f3
-	close $f
-	close $f2
-	close $f3
-    }
-    close $f
-    set result [exec $tcltest test1]
-    set f [open test2 r]
-    set f2 [open test3 r]
-    lappend result [read $f] [read $f2]
-    close $f
-    close $f2
-    set result
-} {{ close stdin
-file1
-} {file2
-}}
-catch {interp delete z}
-test io-14.5 {Tcl_GetChannel: stdio name translation} {
-    interp create z
-    eof stdin
-    catch {z eval flush stdin} msg1
-    catch {z eval close stdin} msg2
-    catch {z eval flush stdin} msg3
-    set result [list $msg1 $msg2 $msg3]
-    interp delete z
-    set result
-} {{channel "stdin" wasn't opened for writing} {} {can not find channel named "stdin"}}
-test io-14.6 {Tcl_GetChannel: stdio name translation} {
-    interp create z
-    eof stdout
-    catch {z eval flush stdout} msg1
-    catch {z eval close stdout} msg2
-    catch {z eval flush stdout} msg3
-    set result [list $msg1 $msg2 $msg3]
-    interp delete z
-    set result
-} {{} {} {can not find channel named "stdout"}}
-test io-14.7 {Tcl_GetChannel: stdio name translation} {
-    interp create z
-    eof stderr
-    catch {z eval flush stderr} msg1
-    catch {z eval close stderr} msg2
-    catch {z eval flush stderr} msg3
-    set result [list $msg1 $msg2 $msg3]
-    interp delete z
-    set result
-} {{} {} {can not find channel named "stderr"}}
-test io-14.8 {reuse of stdio special channels} {stdio} {
-    removeFile script
-    removeFile test1
-    set f [open script w]
-    puts $f {
-	close stderr
-	set f [open test1 w]
-	puts stderr hello
-	close $f
-	set f [open test1 r]
-	puts [gets $f]
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    set c [gets $f]
-    close $f
-    set c
-} hello
-test io-14.9 {reuse of stdio special channels} {stdio} {
-    removeFile script
-    removeFile test1
-    set f [open script w]
-    puts $f {
-	set f [open test1 w]
-	puts $f hello
-	close $f
-	close stderr
-	set f [open "|[list [info nameofexecutable] cat test1]" r]
-	puts [gets $f]
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    set c [gets $f]
-    close $f
-    set c
-} hello
-
-test io-15.1 {Tcl_CreateCloseHandler} {
-} {}
-
-test io-16.1 {Tcl_DeleteCloseHandler} {
-} {}
-
-# Test channel table management. The functions tested are
-# GetChannelTable, DeleteChannelTable, Tcl_RegisterChannel,
-# Tcl_UnregisterChannel, Tcl_GetChannel and Tcl_CreateChannel.
-#
-# These functions use "eof stdin" to ensure that the standard
-# channels are added to the channel table of the interpreter.
-
-test io-17.1 {GetChannelTable, DeleteChannelTable on std handles} {
-    set l1 [testchannel refcount stdin]
-    eof stdin
-    interp create x
-    set l ""
-    lappend l [expr [testchannel refcount stdin] - $l1]
-    x eval {eof stdin}
-    lappend l [expr [testchannel refcount stdin] - $l1]
-    interp delete x
-    lappend l [expr [testchannel refcount stdin] - $l1]
-    set l
-} {0 1 0}
-test io-17.2 {GetChannelTable, DeleteChannelTable on std handles} {
-    set l1 [testchannel refcount stdout]
-    eof stdin
-    interp create x
-    set l ""
-    lappend l [expr [testchannel refcount stdout] - $l1]
-    x eval {eof stdout}
-    lappend l [expr [testchannel refcount stdout] - $l1]
-    interp delete x
-    lappend l [expr [testchannel refcount stdout] - $l1]
-    set l
-} {0 1 0}
-test io-17.3 {GetChannelTable, DeleteChannelTable on std handles} {
-    set l1 [testchannel refcount stderr]
-    eof stdin
-    interp create x
-    set l ""
-    lappend l [expr [testchannel refcount stderr] - $l1]
-    x eval {eof stderr}
-    lappend l [expr [testchannel refcount stderr] - $l1]
-    interp delete x
-    lappend l [expr [testchannel refcount stderr] - $l1]
-    set l
-} {0 1 0}
-
-test io-18.1 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {
-    removeFile test1
-    set l ""
-    set f [open test1 w]
-    lappend l [lindex [testchannel info $f] 15]
-    close $f
-    if {[catch {lindex [testchannel info $f] 15} msg]} {
-	lappend l $msg
-    } else {
-	lappend l "very broken: $f found after being closed"
-    }
-    string compare [string tolower $l] \
-	[list 1 [format "can not find channel named \"%s\"" $f]]
-} 0
-test io-18.2 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {
-    removeFile test1
-    set l ""
-    set f [open test1 w]
-    lappend l [lindex [testchannel info $f] 15]
-    interp create x
-    interp share "" $f x
-    lappend l [lindex [testchannel info $f] 15]
-    x eval close $f
-    lappend l [lindex [testchannel info $f] 15]
-    interp delete x
-    lappend l [lindex [testchannel info $f] 15]
-    close $f
-    if {[catch {lindex [testchannel info $f] 15} msg]} {
-	lappend l $msg
-    } else {
-	lappend l "very broken: $f found after being closed"
-    }
-    string compare [string tolower $l] \
-	[list 1 2 1 1 [format "can not find channel named \"%s\"" $f]]
-} 0
-test io-18.3 {Tcl_RegisterChannel, Tcl_UnregisterChannel} {
-    removeFile test1
-    set l ""
-    set f [open test1 w]
-    lappend l [lindex [testchannel info $f] 15]
-    interp create x
-    interp share "" $f x
-    lappend l [lindex [testchannel info $f] 15]
-    interp delete x
-    lappend l [lindex [testchannel info $f] 15]
-    close $f
-    if {[catch {lindex [testchannel info $f] 15} msg]} {
-	lappend l $msg
-    } else {
-	lappend l "very broken: $f found after being closed"
-    }
-    string compare [string tolower $l] \
-	[list 1 2 1 [format "can not find channel named \"%s\"" $f]]
-} 0
-
-test io-19.1 {Tcl_GetChannel->Tcl_GetStdChannel, standard handles} {
-    eof stdin
-} 0
-test io-19.2 {testing Tcl_GetChannel, user opened handle} {
-    removeFile test1
-    set f [open test1 w]
-    set x [eof $f]
-    close $f
-    set x
-} 0
-test io-19.3 {Tcl_GetChannel, channel not found} {
-    list [catch {eof file34} msg] $msg
-} {1 {can not find channel named "file34"}}
-test io-19.4 {Tcl_CreateChannel, insertion into channel table} {
-    removeFile test1
-    set f [open test1 w]
-    set l ""
-    lappend l [eof $f]
-    close $f
-    if {[catch {lindex [testchannel info $f] 15} msg]} {
-	lappend l $msg
-    } else {
-	lappend l "very broken: $f found after being closed"
-    }
-    string compare [string tolower $l] \
-	[list 0 [format "can not find channel named \"%s\"" $f]]
-} 0
-
-test io-20.1 {Tcl_CreateChannel: initial settings} {
-	set a [open test2 w]
-    set old [encoding system]
-    encoding system ascii
-    set f [open test1 w]
-    set x [fconfigure $f -encoding]
-    close $f
-    encoding system $old
-	close $a
-    set x
-} {ascii}    
-test io-20.2 {Tcl_CreateChannel: initial settings} {pcOnly} {
-    set f [open test1 w+]
-    set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
-    close $f
-    set x
-} [list [list \x1a ""] {auto crlf}]
-test io-20.3 {Tcl_CreateChannel: initial settings} {unixOnly} {
-    set f [open test1 w+]
-    set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
-    close $f
-    set x
-} {{{} {}} {auto lf}}
-test io-20.4 {Tcl_CreateChannel: initial settings} {macOnly} {
-    set f [open test1 w+]
-    set x [list [fconfigure $f -eofchar] [fconfigure $f -translation]]
-    close $f
-    set x
-} {{{} {}} {auto cr}}
-test io-20.5 {Tcl_CreateChannel: install channel in empty slot} {stdio} {
-    set f [open script w]
-    puts $f {
-	close stdout
-	set f1 [open stdout w]
-	fconfigure $f1 -buffersize 777
-	puts stderr [fconfigure stdout -buffersize]
-    }
-    close $f
-    set f [open "|[list $tcltest script]"]
-    catch {close $f} msg
-    set msg
-} {777}
-	
-test io-21.1 {CloseChannelsOnExit} {
-} {}
-    
-# Test management of attributes associated with a channel, such as
-# its default translation, its name and type, etc. The functions
-# tested in this group are Tcl_GetChannelName,
-# Tcl_GetChannelType and Tcl_GetChannelFile. Tcl_GetChannelInstanceData
-# not tested because files do not use the instance data.
-
-test io-22.1 {Tcl_GetChannelMode} {
-    # Not used anywhere in Tcl.
-} {}
-
-test io-23.1 {Tcl_GetChannelName} {
-    removeFile test1
-    set f [open test1 w]
-    set n [testchannel name $f]
-    close $f
-    string compare $n $f
-} 0
-
-test io-24.1 {Tcl_GetChannelType} {
-    removeFile test1
-    set f [open test1 w]
-    set t [testchannel type $f]
-    close $f
-    string compare $t file
-} 0
-
-test io-25.1 {Tcl_GetChannelHandle, input} {
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f "1234567890\n098765432"
-    close $f
-    set f [open test1 r]
-    gets $f
-    set l ""
-    lappend l [testchannel inputbuffered $f]
-    lappend l [tell $f]
-    close $f
-    set l
-} {10 11}
-test io-25.2 {Tcl_GetChannelHandle, output} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [tell $f]
-    flush $f
-    lappend l [testchannel outputbuffered $f]
-    lappend l [tell $f]
-    close $f
-    removeFile test1
-    set l
-} {6 6 0 6}
-
-test io-26.1 {Tcl_GetChannelInstanceData} {stdio} {
-    # "pid" command uses Tcl_GetChannelInstanceData
-    # Don't care what pid is (but must be a number), just want to exercise it.
-
-    set f [open "|[list $tcltest << exit]"]
-    expr [pid $f]
-    close $f
-} {}    
-
-# Test flushing. The functions tested here are FlushChannel.
-
-test io-27.1 {FlushChannel, no output buffered} {
-    removeFile test1
-    set f [open test1 w]
-    flush $f
-    set s [file size test1]
-    close $f
-    set s
-} 0
-test io-27.2 {FlushChannel, some output buffered} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set l ""
-    puts $f hello
-    lappend l [file size test1]
-    flush $f
-    lappend l [file size test1]
-    close $f
-    lappend l [file size test1]
-    set l
-} {0 6 6}
-test io-27.3 {FlushChannel, implicit flush on close} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set l ""
-    puts $f hello
-    lappend l [file size test1]
-    close $f
-    lappend l [file size test1]
-    set l
-} {0 6}
-test io-27.4 {FlushChannel, implicit flush when buffer fills} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    fconfigure $f -buffersize 60
-    set l ""
-    lappend l [file size test1]
-    for {set i 0} {$i < 12} {incr i} {
-	puts $f hello
-    }
-    lappend l [file size test1]
-    flush $f
-    lappend l [file size test1]
-    close $f
-    set l
-} {0 60 72}
-test io-27.5 {FlushChannel, implicit flush when buffer fills and on close} \
-	{unixOrPc} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffersize 60 -eofchar {}
-    set l ""
-    lappend l [file size test1]
-    for {set i 0} {$i < 12} {incr i} {
-	puts $f hello
-    }
-    lappend l [file size test1]
-    close $f
-    lappend l [file size test1]
-    set l
-} {0 60 72}
-test io-27.6 {FlushChannel, async flushing, async close} \
-	{stdio asyncPipeClose} {
-    removeFile pipe
-    removeFile output
-    set f [open pipe w]
-    puts $f {
-	set f [open output w]
-	fconfigure $f -translation lf -buffering none -eofchar {}
-	while {![eof stdin]} {
-	    after 20
-	    puts -nonewline $f [read stdin 1024]
-	}
-	close $f
-    }
-    close $f
-    set x 01234567890123456789012345678901
-    for {set i 0} {$i < 11} {incr i} {
-        set x "$x$x"
-    }
-    set f [open output w]
-    close $f
-    set f [open "|[list $tcltest pipe]" w]
-    fconfigure $f -blocking off
-    puts -nonewline $f $x
-    close $f
-    set counter 0
-    while {([file size output] < 65536) && ($counter < 1000)} {
-        incr counter
-        after 20
-        update
-    }
-    if {$counter == 1000} {
-        set result "file size only [file size output]"
-    } else {
-        set result ok
-    }
-} ok
-
-# Tests closing a channel. The functions tested are CloseChannel and Tcl_Close.
-
-test io-28.1 {CloseChannel called when all references are dropped} {
-    removeFile test1
-    set f [open test1 w]
-    interp create x
-    interp share "" $f x
-    set l ""
-    lappend l [testchannel refcount $f]
-    x eval close $f
-    interp delete x
-    lappend l [testchannel refcount $f]
-    close $f
-    set l
-} {2 1}
-test io-28.2 {CloseChannel called when all references are dropped} {
-    removeFile test1
-    set f [open test1 w]
-    interp create x
-    interp share "" $f x
-    puts -nonewline $f abc
-    close $f
-    x eval puts $f def
-    x eval close $f
-    interp delete x
-    set f [open test1 r]
-    set l [gets $f]
-    close $f
-    set l
-} abcdef
-test io-28.3 {CloseChannel, not called before output queue is empty} \
-	{stdio asyncPipeClose nonPortable} {
-    removeFile pipe
-    removeFile output
-    set f [open pipe w]
-    puts $f {
-
-	# Need to not have eof char appended on close, because the other
-	# side of the pipe already closed, so that writing would cause an
-	# error "invalid file".
-
-	fconfigure stdout -eofchar {}
-	fconfigure stderr -eofchar {}
-
-	set f [open output w]
-	fconfigure $f -translation lf -buffering none
-	for {set x 0} {$x < 20} {incr x} {
-	    after 20
-	    puts -nonewline $f [read stdin 1024]
-	}
-	close $f
-    }
-    close $f
-    set x 01234567890123456789012345678901
-    for {set i 0} {$i < 11} {incr i} {
-        set x "$x$x"
-    }
-    set f [open output w]
-    close $f
-    set f [open "|[list $tcltest pipe]" r+]
-    fconfigure $f -blocking off -eofchar {}
-
-    puts -nonewline $f $x
-    close $f
-    set counter 0
-    while {([file size output] < 20480) && ($counter < 1000)} {
-        incr counter
-        after 20
-        update
-    }
-    if {$counter == 1000} {
-        set result probably_broken
-    } else {
-        set result ok
-    }
-} ok
-test io-28.4 {Tcl_Close} {
-    removeFile test1
-    set l ""
-    lappend l [lsort [testchannel open]]
-    set f [open test1 w]
-    lappend l [lsort [testchannel open]]
-    close $f
-    lappend l [lsort [testchannel open]]
-    set x [list $consoleFileNames \
-		[lsort [eval list $consoleFileNames $f]] \
-		$consoleFileNames]
-    string compare $l $x
-} 0
-test io-28.5 {Tcl_Close vs standard handles} {stdio unixOnly} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	close stdin
-	puts [testchannel open]
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    set l [gets $f]
-    close $f
-    set l
-} {file1 file2}
-
-test io-29.1 {Tcl_WriteChars, channel not writable} {
-    list [catch {puts stdin hello} msg] $msg
-} {1 {channel "stdin" wasn't opened for writing}}
-test io-29.2 {Tcl_WriteChars, empty string} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f ""
-    close $f
-    file size test1
-} 0
-test io-29.3 {Tcl_WriteChars, nonempty string} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f hello
-    close $f
-    file size test1
-} 5
-test io-29.4 {Tcl_WriteChars, buffering in full buffering mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffering full -eofchar {}
-    puts $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    flush $f
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    close $f
-    set l
-} {6 0 0 6}
-test io-29.5 {Tcl_WriteChars, buffering in line buffering mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffering line -eofchar {}
-    puts -nonewline $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    puts $f hello
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    close $f
-    set l
-} {5 0 0 11}
-test io-29.6 {Tcl_WriteChars, buffering in no buffering mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffering none -eofchar {}
-    puts -nonewline $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    puts $f hello
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    close $f
-    set l
-} {0 5 0 11}
-
-test io-29.7 {Tcl_Flush, full buffering} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffering full -eofchar {}
-    puts -nonewline $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    puts $f hello
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    flush $f
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    close $f
-    set l
-} {5 0 11 0 0 11}
-test io-29.8 {Tcl_Flush, full buffering} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -buffering line
-    puts -nonewline $f hello
-    set l ""
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    flush $f
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    puts $f hello
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    flush $f
-    lappend l [testchannel outputbuffered $f]
-    lappend l [file size test1]
-    close $f
-    set l
-} {5 0 0 5 0 11 0 11}
-test io-29.9 {Tcl_Flush, channel not writable} {
-    list [catch {flush stdin} msg] $msg
-} {1 {channel "stdin" wasn't opened for writing}}
-test io-29.10 {Tcl_WriteChars, looping and buffering} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    set f2 [open longfile r]
-    for {set x 0} {$x < 10} {incr x} {
-	puts $f1 [gets $f2]
-    }
-    close $f2
-    close $f1
-    file size test1
-} 387
-test io-29.11 {Tcl_WriteChars, no newline, implicit flush} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -eofchar {}
-    set f2 [open longfile r]
-    for {set x 0} {$x < 10} {incr x} {
-	puts -nonewline $f1 [gets $f2]
-    }
-    close $f1
-    close $f2
-    file size test1
-} 377
-test io-29.12 {Tcl_WriteChars on a pipe} {stdio} {
-    removeFile test1
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	set f1 [open longfile r]
-	for {set x 0} {$x < 10} {incr x} {
-	    puts [gets $f1]
-	}
-    }
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r]
-    set f2 [open longfile r]
-    set y ok
-    for {set x 0} {$x < 10} {incr x} {
-	set l1 [gets $f1]
-	set l2 [gets $f2]
-	if {"$l1" != "$l2"} {
-	    set y broken
-	}
-    }
-    close $f1
-    close $f2
-    set y
-} ok
-test io-29.13 {Tcl_WriteChars to a pipe, line buffered} {stdio} {
-    removeFile test1
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	puts [gets stdin]
-	puts [gets stdin]
-    }
-    close $f1
-    set y ok
-    set f1 [open "|[list $tcltest pipe]" r+]
-    fconfigure $f1 -buffering line
-    set f2 [open longfile r]
-    set line [gets $f2]
-    puts $f1 $line
-    set backline [gets $f1]
-    if {"$line" != "$backline"} {
-	set y broken
-    }
-    set line [gets $f2]
-    puts $f1 $line
-    set backline [gets $f1]
-    if {"$line" != "$backline"} {
-	set y broken
-    }
-    close $f1
-    close $f2
-    set y
-} ok
-test io-29.14 {Tcl_WriteChars, buffering and implicit flush at close} {
-    removeFile test3
-    set f [open test3 w]
-    puts -nonewline $f "Text1"
-    puts -nonewline $f " Text 2"
-    puts $f " Text 3"
-    close $f
-    set f [open test3 r]
-    set x [gets $f]
-    close $f
-    set x
-} {Text1 Text 2 Text 3}
-test io-29.15 {Tcl_Flush, channel not open for writing} {
-    removeFile test1
-    set fd [open test1 w]
-    close $fd
-    set fd [open test1 r]
-    set x [list [catch {flush $fd} msg] $msg]
-    close $fd
-    string compare $x \
-	[list 1 "channel \"$fd\" wasn't opened for writing"]
-} 0
-test io-29.16 {Tcl_Flush on pipe opened only for reading} {stdio} {
-    set fd [open "|[list $tcltest cat longfile]" r]
-    set x [list [catch {flush $fd} msg] $msg]
-    catch {close $fd}
-    string compare $x \
-	[list 1 "channel \"$fd\" wasn't opened for writing"]
-} 0
-test io-29.17 {Tcl_WriteChars buffers, then Tcl_Flush flushes} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf
-    puts $f1 hello
-    puts $f1 hello
-    puts $f1 hello
-    flush $f1
-    set x [file size test1]
-    close $f1
-    set x
-} 18
-test io-29.18 {Tcl_WriteChars and Tcl_Flush intermixed} {
-    removeFile test1
-    set x ""
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf
-    puts $f1 hello
-    puts $f1 hello
-    puts $f1 hello
-    flush $f1
-    lappend x [file size test1]
-    puts $f1 hello
-    flush $f1
-    lappend x [file size test1]
-    puts $f1 hello
-    flush $f1
-    lappend x [file size test1]
-    close $f1
-    set x
-} {18 24 30}
-test io-29.19 {Explicit and implicit flushes} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    set x ""
-    puts $f1 hello
-    puts $f1 hello
-    puts $f1 hello
-    flush $f1
-    lappend x [file size test1]
-    puts $f1 hello
-    flush $f1
-    lappend x [file size test1]
-    puts $f1 hello
-    close $f1
-    lappend x [file size test1]
-    set x
-} {18 24 30}
-test io-29.20 {Implicit flush when buffer is full} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    set line "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-    for {set x 0} {$x < 100} {incr x} {
-      puts $f1 $line
-    }
-    set z ""
-    lappend z [file size test1]
-    for {set x 0} {$x < 100} {incr x} {
-	puts $f1 $line
-    }
-    lappend z [file size test1]
-    close $f1
-    lappend z [file size test1]
-    set z
-} {4096 12288 12600}
-test io-29.21 {Tcl_Flush to pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {set x [read stdin 6]}
-    puts $f1 {set cnt [string length $x]}
-    puts $f1 {puts "read $cnt characters"}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    flush $f1
-    set x [gets $f1]
-    catch {close $f1}
-    set x
-} "read 6 characters"
-test io-29.22 {Tcl_Flush called at other end of pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	fconfigure stdout -buffering full
-	puts hello
-	puts hello
-	flush stdout
-	gets stdin
-	puts bye
-	flush stdout
-    }
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    set x ""
-    lappend x [gets $f1]
-    lappend x [gets $f1]
-    puts $f1 hello
-    flush $f1
-    lappend x [gets $f1]
-    close $f1
-    set x
-} {hello hello bye}
-test io-29.23 {Tcl_Flush and line buffering at end of pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	puts hello
-	puts hello
-	gets stdin
-	puts bye
-    }
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    set x ""
-    lappend x [gets $f1]
-    lappend x [gets $f1]
-    puts $f1 hello
-    flush $f1
-    lappend x [gets $f1]
-    close $f1
-    set x
-} {hello hello bye}
-test io-29.24 {Tcl_WriteChars and Tcl_Flush move end of file} {
-    set f [open test3 w]
-    puts $f "Line 1"
-    puts $f "Line 2"
-    set f2 [open test3]
-    set x {}
-    lappend x [read -nonewline $f2]
-    close $f2
-    flush $f
-    set f2 [open test3]
-    lappend x [read -nonewline $f2]
-    close $f2
-    close $f
-    set x
-} "{} {Line 1\nLine 2}"
-test io-29.25 {Implicit flush with Tcl_Flush to command pipelines} {stdio} {
-    removeFile test3
-    set f [open "|[list $tcltest cat | $tcltest cat > test3]" w]
-    puts $f "Line 1"
-    puts $f "Line 2"
-    close $f
-    after 100
-    set f [open test3 r]
-    set x [read $f]
-    close $f
-    set x
-} "Line 1\nLine 2\n"
-test io-29.26 {Tcl_Flush, Tcl_Write on bidirectional pipelines} {stdio unixExecs} {
-    set f [open "|[list cat -u]" r+]
-    puts $f "Line1"
-    flush $f
-    set x [gets $f]
-    close $f
-    set x
-} {Line1}
-test io-29.27 {Tcl_Flush on closed pipeline} {stdio} {
-    removeFile pipe
-    set f [open pipe w]
-    puts $f {exit}
-    close $f
-    set f [open "|[list $tcltest pipe]" r+]
-    gets $f
-    puts $f output
-    after 50
-    #
-    # The flush below will get a SIGPIPE. This is an expected part of
-    # test and indicates that the test operates correctly. If you run
-    # this test under a debugger, the signal will by intercepted unless
-    # you disable the debugger's signal interception.
-    #
-    if {[catch {flush $f} msg]} {
-	set x [list 1 $msg $errorCode]
-	catch {close $f}
-    } else {
-	if {[catch {close $f} msg]} {
-	    set x [list 1 $msg $errorCode]
-	} else {
-	    set x {this was supposed to fail and did not}
-	}
-    }
-    regsub {".*":} $x {"":} x
-    string tolower $x
-} {1 {error flushing "": broken pipe} {posix epipe {broken pipe}}}
-test io-29.28 {Tcl_WriteChars, lf mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f hello\nthere\nand\nhere
-    flush $f
-    set s [file size test1]
-    close $f
-    set s
-} 21
-test io-29.29 {Tcl_WriteChars, cr mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    puts $f hello\nthere\nand\nhere
-    close $f
-    file size test1
-} 21
-test io-29.30 {Tcl_WriteChars, crlf mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    puts $f hello\nthere\nand\nhere
-    close $f
-    file size test1
-} 25
-test io-29.31 {Tcl_WriteChars, background flush} {stdio} {
-    removeFile pipe
-    removeFile output
-    set f [open pipe w]
-    puts $f {set f [open output w]}
-    puts $f {fconfigure $f -translation lf}
-    set x [list while {![eof stdin]}]
-    set x "$x {"
-    puts $f $x
-    puts $f {  puts -nonewline $f [read stdin 4096]}
-    puts $f {  flush $f}
-    puts $f "}"
-    puts $f {close $f}
-    close $f
-    set x 01234567890123456789012345678901
-    for {set i 0} {$i < 11} {incr i} {
-	set x "$x$x"
-    }
-    set f [open output w]
-    close $f
-    set f [open "|[list $tcltest pipe]" r+]
-    fconfigure $f -blocking off
-    puts -nonewline $f $x
-    close $f
-    set counter 0
-    while {([file size output] < 65536) && ($counter < 1000)} {
-	incr counter
-	after 5
-	update
-    }
-    if {$counter == 1000} {
-	set result "file size only [file size output]"
-    } else {
-	set result ok
-    }
-} ok
-test io-29.32 {Tcl_WriteChars, background flush to slow reader} \
-	{stdio asyncPipeClose} {
-    removeFile pipe
-    removeFile output
-    set f [open pipe w]
-    puts $f {set f [open output w]}
-    puts $f {fconfigure $f -translation lf}
-    set x [list while {![eof stdin]}]
-    set x "$x {"
-    puts $f $x
-    puts $f {  after 20}
-    puts $f {  puts -nonewline $f [read stdin 1024]}
-    puts $f {  flush $f}
-    puts $f "}"
-    puts $f {close $f}
-    close $f
-    set x 01234567890123456789012345678901
-    for {set i 0} {$i < 11} {incr i} {
-	set x "$x$x"
-    }
-    set f [open output w]
-    close $f
-    set f [open "|[list $tcltest pipe]" r+]
-    fconfigure $f -blocking off
-    puts -nonewline $f $x
-    close $f
-    set counter 0
-    while {([file size output] < 65536) && ($counter < 1000)} {
-	incr counter
-	after 20
-	update
-    }
-    if {$counter == 1000} {
-	set result "file size only [file size output]"
-    } else {
-	set result ok
-    }
-} ok
-test io-29.33 {Tcl_Flush, implicit flush on exit} {stdio} {
-    set f [open script w]
-    puts $f {
-	set f [open test1 w]
-	fconfigure $f -translation lf
-	puts $f hello
-	puts $f bye
-	puts $f strange
-    }
-    close $f
-    exec $tcltest script
-    set f [open test1 r]
-    set r [read $f]
-    close $f
-    set r
-} "hello\nbye\nstrange\n"
-test io-29.34 {Tcl_Close, async flush on close, using sockets} {socket tempNotMac} {
-    set c 0
-    set x running
-    set l abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-    proc writelots {s l} {
-	for {set i 0} {$i < 2000} {incr i} {
-	    puts $s $l
-	}
-    }
-    proc accept {s a p} {
-	global x
-	fileevent $s readable [list readit $s]
-	fconfigure $s -blocking off
-	set x accepted
-    }
-    proc readit {s} {
-	global c x
-	set l [gets $s]
-	
-	if {[eof $s]} {
-	    close $s
-	    set x done
-	} elseif {([string length $l] > 0) || ![fblocked $s]} {
-	    incr c
-	}
-    }
-    set ss [socket -server accept 2828]
-    set cs [socket [info hostname] 2828]
-    vwait x
-    fconfigure $cs -blocking off
-    writelots $cs $l
-    close $cs
-    close $ss
-    vwait x
-    set c
-} 2000
-test io-29.35 {Tcl_Close vs fileevent vs multiple interpreters} {socket tempNotMac} {
-    # On Mac, this test screws up sockets such that subsequent tests using port 2828 
-    # either cause errors or panic().
-     
-    catch {interp delete x}
-    catch {interp delete y}
-    interp create x
-    interp create y
-    set s [socket -server accept 2828]
-    proc accept {s a p} {
-	puts $s hello
-	close $s
-    }
-    set c [socket [info hostname] 2828]
-    interp share {} $c x
-    interp share {} $c y
-    close $c
-    x eval {
-	proc readit {s} {
-	    gets $s
-	    if {[eof $s]} {
-		close $s
-	    }
-	}
-    }
-    y eval {
-	proc readit {s} {
-	    gets $s
-	    if {[eof $s]} {
-		close $s
-	    }
-	}
-    }
-    x eval "fileevent $c readable \{readit $c\}"
-    y eval "fileevent $c readable \{readit $c\}"
-    y eval [list close $c]
-    update
-    close $s
-    interp delete x
-    interp delete y
-} ""
-
-# Test end of line translations. Procedures tested are Tcl_Write, Tcl_Read.
-
-test io-30.1 {Tcl_Write lf, Tcl_Read lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set x [read $f]
-    close $f
-    set x
-} "hello\nthere\nand\nhere\n"
-test io-30.2 {Tcl_Write lf, Tcl_Read cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set x [read $f]
-    close $f
-    set x
-} "hello\nthere\nand\nhere\n"
-test io-30.3 {Tcl_Write lf, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "hello\nthere\nand\nhere\n"
-test io-30.4 {Tcl_Write cr, Tcl_Read cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set x [read $f]
-    close $f
-    set x
-} "hello\nthere\nand\nhere\n"
-test io-30.5 {Tcl_Write cr, Tcl_Read lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set x [read $f]
-    close $f
-    set x
-} "hello\rthere\rand\rhere\r"
-test io-30.6 {Tcl_Write cr, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x 
-} "hello\rthere\rand\rhere\r"
-test io-30.7 {Tcl_Write crlf, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set x [read $f]
-    close $f
-    set x
-} "hello\nthere\nand\nhere\n"
-test io-30.8 {Tcl_Write crlf, Tcl_Read lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set x [read $f]
-    close $f
-    set x
-} "hello\r\nthere\r\nand\r\nhere\r\n"
-test io-30.9 {Tcl_Write crlf, Tcl_Read cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set x [read $f]
-    close $f
-    set x
-} "hello\n\nthere\n\nand\n\nhere\n\n"
-test io-30.10 {Tcl_Write lf, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set c [read $f]
-    set x [fconfigure $f -translation]
-    close $f
-    list $c $x
-} {{hello
-there
-and
-here
-} auto}
-test io-30.11 {Tcl_Write cr, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set c [read $f]
-    set x [fconfigure $f -translation]
-    close $f
-    list $c $x
-} {{hello
-there
-and
-here
-} auto}
-test io-30.12 {Tcl_Write crlf, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set c [read $f]
-    set x [fconfigure $f -translation]
-    close $f
-    list $c $x
-} {{hello
-there
-and
-here
-} auto}
-
-test io-30.13 {Tcl_Write crlf on block boundary, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set line "123456789ABCDE"	;# 14 char plus crlf
-    puts -nonewline $f x	;# shift crlf across block boundary
-    for {set i 0} {$i < 700} {incr i} {
-	puts $f $line
-    }
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set c [read $f]
-    close $f
-    string length $c
-} [expr 700*15+1]
-
-test io-30.14 {Tcl_Write crlf on block boundary, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set line "123456789ABCDE"	;# 14 char plus crlf
-    puts -nonewline $f x	;# shift crlf across block boundary
-    for {set i 0} {$i < 700} {incr i} {
-	puts $f $line
-    }
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set c [read $f]
-    close $f
-    string length $c
-} [expr 700*15+1]
-
-test io-30.15 {Tcl_Write mixed, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\rhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set c [read $f]
-    close $f
-    set c
-} {hello
-there
-and
-here
-}
-test io-30.16 {Tcl_Write ^Z at end, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f hello\nthere\nand\rhere\n\x1a
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set c [read $f]
-    close $f
-    set c
-} {hello
-there
-and
-here
-}
-test io-30.17 {Tcl_Write, implicit ^Z at end, Tcl_Read auto} {pcOnly} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -eofchar \x1a -translation lf
-    puts $f hello\nthere\nand\rhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set c [read $f]
-    close $f
-    set c
-} {hello
-there
-and
-here
-}
-test io-30.18 {Tcl_Write, ^Z in middle, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cghi\nqrs" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1 {} 1}
-test io-30.19 {Tcl_Write, ^Z no newline in middle, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cghi\nqrs" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1 {} 1}
-test io-30.20 {Tcl_Write, ^Z in middle ignored, Tcl_Read lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set s [format "abc\ndef\n%cghi\nqrs" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar {}
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "abc def 0 \x1aghi 0 qrs 0 {} 1"
-test io-30.21 {Tcl_Write, ^Z in middle ignored, Tcl_Read cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set s [format "abc\ndef\n%cghi\nqrs" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar {}
-    set l ""
-    set x [gets $f]
-    lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs\n"]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {0 1 {} 1}
-test io-30.22 {Tcl_Write, ^Z in middle ignored, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set s [format "abc\ndef\n%cghi\nqrs" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar {}
-    set l ""
-    set x [gets $f]
-    lappend l [string compare $x "abc\ndef\n\x1aghi\nqrs\n"]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {0 1 {} 1}
-test io-30.23 {Tcl_Write lf, ^Z in middle, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-test io-30.24 {Tcl_Write lf, ^Z in middle, Tcl_Read lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-test io-30.25 {Tcl_Write cr, ^Z in middle, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-test io-30.26 {Tcl_Write cr, ^Z in middle, Tcl_Read cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-test io-30.27 {Tcl_Write crlf, ^Z in middle, Tcl_Read auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-test io-30.28 {Tcl_Write crlf, ^Z in middle, Tcl_Read crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format abc\ndef\n%cqrs\ntuv 26]
-    puts $f $c
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar \x1a
-    set c [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $e
-} {8 1}
-
-# Test end of line translations. Functions tested are Tcl_Write and Tcl_Gets.
-
-test io-31.1 {Tcl_Write lf, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    close $f
-    set l
-} {hello 6 auto there 12 auto}
-test io-31.2 {Tcl_Write cr, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    close $f
-    set l
-} {hello 6 auto there 12 auto}
-test io-31.3 {Tcl_Write crlf, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    close $f
-    set l
-} {hello 7 auto there 14 auto}
-test io-31.4 {Tcl_Write lf, Tcl_Gets lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    close $f
-    set l
-} {hello 6 lf there 12 lf}
-test io-31.5 {Tcl_Write lf, Tcl_Gets cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set l ""
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {21 21 cr 1 {} 21 cr 1}
-test io-31.6 {Tcl_Write lf, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set l ""
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {21 21 crlf 1 {} 21 crlf 1}
-test io-31.7 {Tcl_Write cr, Tcl_Gets cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello 6 cr 0 there 12 cr 0}
-test io-31.8 {Tcl_Write cr, Tcl_Gets lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set l ""
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {21 21 lf 1 {} 21 lf 1}
-test io-31.9 {Tcl_Write cr, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set l ""
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {21 21 crlf 1 {} 21 crlf 1}
-test io-31.10 {Tcl_Write crlf, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello 7 crlf 0 there 14 crlf 0}
-test io-31.11 {Tcl_Write crlf, Tcl_Gets cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr
-    set l ""
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello 6 cr 0 6 13 cr 0}
-test io-31.12 {Tcl_Write crlf, Tcl_Gets lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    puts $f hello\nthere\nand\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf
-    set l ""
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    lappend l [string length [gets $f]]
-    lappend l [tell $f]
-    lappend l [fconfigure $f -translation]
-    lappend l [eof $f]
-    close $f
-    set l
-} {6 7 lf 0 6 14 lf 0}
-test io-31.13 {binary mode is synonym of lf mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation binary
-    set x [fconfigure $f -translation]
-    close $f
-    set x
-} lf
-#
-# Test io-9.14 has been removed because "auto" output translation mode is
-# not supoprted.
-#
-test io-31.14 {Tcl_Write mixed, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts $f hello\nthere\rand\r\nhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.15 {Tcl_Write mixed, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f hello\nthere\rand\r\nhere\r
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.16 {Tcl_Write mixed, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f hello\nthere\rand\r\nhere\n
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.17 {Tcl_Write mixed, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f hello\nthere\rand\r\nhere\r\n
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.18 {Tcl_Write ^Z at end, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "hello\nthere\nand\rhere\n\%c" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.19 {Tcl_Write, implicit ^Z at end, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -eofchar \x1a -translation lf
-    puts $f hello\nthere\nand\rhere
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {hello there and here 0 {} 1}
-test io-31.20 {Tcl_Write, ^Z in middle, Tcl_Gets auto, eofChar} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a
-    fconfigure $f -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.21 {Tcl_Write, no newline ^Z in middle, Tcl_Gets auto, eofChar} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.22 {Tcl_Write, ^Z in middle ignored, Tcl_Gets lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar {}
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "abc def 0 \x1aqrs 0 tuv 0 {} 1"
-test io-31.23 {Tcl_Write, ^Z in middle ignored, Tcl_Gets cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar {}
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "abc def 0 \x1aqrs 0 tuv 0 {} 1"
-test io-31.24 {Tcl_Write, ^Z in middle ignored, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar {}
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "abc def 0 \x1aqrs 0 tuv 0 {} 1"
-test io-31.25 {Tcl_Write lf, ^Z in middle, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.26 {Tcl_Write lf, ^Z in middle, Tcl_Gets lf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.27 {Tcl_Write cr, ^Z in middle, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.28 {Tcl_Write cr, ^Z in middle, Tcl_Gets cr} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.29 {Tcl_Write crlf, ^Z in middle, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.30 {Tcl_Write crlf, ^Z in middle, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    set s [format "abc\ndef\n%cqrs\ntuv" 26]
-    puts $f $s
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar \x1a
-    set l ""
-    lappend l [gets $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {abc def 0 {} 1}
-test io-31.31 {Tcl_Write crlf on block boundary, Tcl_Gets crlf} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set line "123456789ABCDE"	;# 14 char plus crlf
-    puts -nonewline $f x	;# shift crlf across block boundary
-    for {set i 0} {$i < 700} {incr i} {
-	puts $f $line
-    }
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation crlf 
-    set c ""
-    while {[gets $f line] >= 0} {
-	append c $line\n
-    }
-    close $f
-    string length $c
-} [expr 700*15+1]
-test io-31.32 {Tcl_Write crlf on block boundary, Tcl_Gets auto} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set line "123456789ABCDE"	;# 14 char plus crlf
-    puts -nonewline $f x	;# shift crlf across block boundary
-    for {set i 0} {$i < 700} {incr i} {
-	puts $f $line
-    }
-    close $f
-    set f [open test1 r]
-    fconfigure $f -translation auto
-    set c ""
-    while {[gets $f line] >= 0} {
-	append c $line\n
-    }
-    close $f
-    string length $c
-} [expr 700*15+1]
-
-
-# Test Tcl_Read and buffering.
-
-test io-32.1 {Tcl_Read, channel not readable} {
-    list [catch {read stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-test io-32.2 {Tcl_Read, zero byte count} {
-    read stdin 0
-} ""
-test io-32.3 {Tcl_Read, negative byte count} {
-    set f [open longfile r]
-    set l [list [catch {read $f -1} msg] $msg]
-    close $f
-    set l
-} {1 {bad argument "-1": should be "nonewline"}}
-test io-32.4 {Tcl_Read, positive byte count} {
-    set f [open longfile r]
-    set x [read $f 1024]
-    set s [string length $x]
-    unset x
-    close $f
-    set s
-} 1024
-test io-32.5 {Tcl_Read, multiple buffers} {
-    set f [open longfile r]
-    fconfigure $f -buffersize 100
-    set x [read $f 1024]
-    set s [string length $x]
-    unset x
-    close $f
-    set s
-} 1024
-test io-32.6 {Tcl_Read, very large read} {
-    set f1 [open longfile r]
-    set z [read $f1 1000000]
-    close $f1
-    set l [string length $z]
-    set x ok
-    set z [file size longfile]
-    if {$z != $l} {
-	set x broken
-    }
-    set x
-} ok
-test io-32.7 {Tcl_Read, nonblocking, file} {nonBlockFiles} {
-    set f1 [open longfile r]
-    fconfigure $f1 -blocking off
-    set z [read $f1 20]
-    close $f1
-    set l [string length $z]
-    set x ok
-    if {$l != 20} {
-	set x broken
-    }
-    set x
-} ok
-test io-32.8 {Tcl_Read, nonblocking, file} {nonBlockFiles} {
-    set f1 [open longfile r]
-    fconfigure $f1 -blocking off
-    set z [read $f1 1000000]
-    close $f1
-    set x ok
-    set l [string length $z]]
-    set z [file size longfile]]
-    if {$z != $l} {
-	set x broken
-    }
-  set x
-} ok
-test io-32.9 {Tcl_Read, read to end of file} {
-    set f1 [open longfile r]
-    set z [read $f1]
-    close $f1
-    set l [string length $z]
-    set x ok
-    set z [file size longfile]
-    if {$z != $l} {
-	set x broken
-    }
-    set x
-} ok
-test io-32.10 {Tcl_Read from a pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {puts [gets stdin]}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    flush $f1
-    set x [read $f1]
-    close $f1
-    set x
-} "hello\n"
-test io-32.11 {Tcl_Read from a pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {puts [gets stdin]}
-    puts $f1 {puts [gets stdin]}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    flush $f1
-    set x ""
-    lappend x [read $f1 6]
-    puts $f1 hello
-    flush $f1
-    lappend x [read $f1]
-    close $f1
-    set x
-} {{hello
-} {hello
-}}
-test io-32.12 {Tcl_Read, -nonewline} {
-    removeFile test1
-    set f1 [open test1 w]
-    puts $f1 hello
-    puts $f1 bye
-    close $f1
-    set f1 [open test1 r]
-    set c [read -nonewline $f1]
-    close $f1
-    set c
-} {hello
-bye}
-test io-32.13 {Tcl_Read, -nonewline} {
-    removeFile test1
-    set f1 [open test1 w]
-    puts $f1 hello
-    puts $f1 bye
-    close $f1
-    set f1 [open test1 r]
-    set c [read -nonewline $f1]
-    close $f1
-    list [string length $c] $c
-} {9 {hello
-bye}}
-test io-32.14 {Tcl_Read, reading in small chunks} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f "Two lines: this one"
-    puts $f "and this one"
-    close $f
-    set f [open test1]
-    set x [list [read $f 1] [read $f 2] [read $f]]
-    close $f
-    set x
-} {T wo { lines: this one
-and this one
-}}
-test io-32.15 {Tcl_Read, asking for more input than available} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f "Two lines: this one"
-    puts $f "and this one"
-    close $f
-    set f [open test1]
-    set x [read $f 100]
-    close $f
-    set x
-} {Two lines: this one
-and this one
-}
-test io-32.16 {Tcl_Read, read to end of file with -nonewline} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f "Two lines: this one"
-    puts $f "and this one"
-    close $f
-    set f [open test1]
-    set x [read -nonewline $f]
-    close $f
-    set x
-} {Two lines: this one
-and this one}
-
-# Test Tcl_Gets.
-
-test io-33.1 {Tcl_Gets, reading what was written} {
-    removeFile test1
-    set f1 [open test1 w]
-    set y "first line"
-    puts $f1 $y
-    close $f1
-    set f1 [open test1 r]
-    set x [gets $f1]
-    set z ok
-    if {"$x" != "$y"} {
-	set z broken
-    }
-    close $f1
-    set z
-} ok
-test io-33.2 {Tcl_Gets into variable} {
-    set f1 [open longfile r]
-    set c [gets $f1 x]
-    set l [string length x]
-    set z ok
-    if {$l != $l} {
-	set z broken
-    }
-    close $f1
-    set z
-} ok
-test io-33.3 {Tcl_Gets from pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {puts [gets stdin]}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    flush $f1
-    set x [gets $f1]
-    close $f1
-    set z ok
-    if {"$x" != "hello"} {
-	set z broken
-    }
-    set z
-} ok
-test io-33.4 {Tcl_Gets with long line} {
-    removeFile test3
-    set f [open test3 w]
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    puts $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    close $f
-    set f [open test3]
-    set x [gets $f]
-    close $f
-    set x
-} {abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}
-test io-33.5 {Tcl_Gets with long line} {
-    set f [open test3]
-    set x [gets $f y]
-    close $f
-    list $x $y
-} {260 abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ}
-test io-33.6 {Tcl_Gets and end of file} {
-    removeFile test3
-    set f [open test3 w]
-    puts -nonewline $f "Test1\nTest2"
-    close $f
-    set f [open test3]
-    set x {}
-    set y {}
-    lappend x [gets $f y] $y
-    set y {}
-    lappend x [gets $f y] $y
-    set y {}
-    lappend x [gets $f y] $y
-    close $f
-    set x
-} {5 Test1 5 Test2 -1 {}}
-test io-33.7 {Tcl_Gets and bad variable} {
-    set f [open test3 w]
-    puts $f "Line 1"
-    puts $f "Line 2"
-    close $f
-    catch {unset x}
-    set x 24
-    set f [open test3 r]
-    set result [list [catch {gets $f x(0)} msg] $msg]
-    close $f
-    set result
-} {1 {can't set "x(0)": variable isn't array}}
-test io-33.8 {Tcl_Gets, exercising double buffering} {
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    set x ""
-    for {set y 0} {$y < 99} {incr y} {set x "a$x"}
-    for {set y 0} {$y < 100} {incr y} {puts $f $x}
-    close $f
-    set f [open test3 r]
-    fconfigure $f -translation lf
-    for {set y 0} {$y < 100} {incr y} {gets $f}
-    close $f
-    set y
-} 100
-test io-33.9 {Tcl_Gets, exercising double buffering} {
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    set x ""
-    for {set y 0} {$y < 99} {incr y} {set x "a$x"}
-    for {set y 0} {$y < 200} {incr y} {puts $f $x}
-    close $f
-    set f [open test3 r]
-    fconfigure $f -translation lf
-    for {set y 0} {$y < 200} {incr y} {gets $f}
-    close $f
-    set y
-} 200
-test io-33.10 {Tcl_Gets, exercising double buffering} {
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    set x ""
-    for {set y 0} {$y < 99} {incr y} {set x "a$x"}
-    for {set y 0} {$y < 300} {incr y} {puts $f $x}
-    close $f
-    set f [open test3 r]
-    fconfigure $f -translation lf
-    for {set y 0} {$y < 300} {incr y} {gets $f}
-    close $f
-    set y
-} 300
-
-# Test Tcl_Seek and Tcl_Tell.
-
-test io-34.1 {Tcl_Seek to current position at start of file} {
-    set f1 [open longfile r]
-    seek $f1 0 current
-    set c [tell $f1]
-    close $f1
-    set c
-} 0
-test io-34.2 {Tcl_Seek to offset from start} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 10 start
-    set c [tell $f1]
-    close $f1
-    set c
-} 10
-test io-34.3 {Tcl_Seek to end of file} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 0 end
-    set c [tell $f1]
-    close $f1
-    set c
-} 54
-test io-34.4 {Tcl_Seek to offset from end of file} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 -10 end
-    set c [tell $f1]
-    close $f1
-    set c
-} 44
-test io-34.5 {Tcl_Seek to offset from current position} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 10 current
-    seek $f1 10 current
-    set c [tell $f1]
-    close $f1
-    set c
-} 20
-test io-34.6 {Tcl_Seek to offset from end of file} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 -10 end
-    set c [tell $f1]
-    set r [read $f1]
-    close $f1
-    list $c $r
-} {44 {rstuvwxyz
-}}
-test io-34.7 {Tcl_Seek to offset from end of file, then to current position} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 -10 end
-    set c1 [tell $f1]
-    set r1 [read $f1 5]
-    seek $f1 0 current
-    set c2 [tell $f1]
-    close $f1
-    list $c1 $r1 $c2
-} {44 rstuv 49}
-test io-34.8 {Tcl_Seek on pipes: not supported} {stdio} {
-    set f1 [open "|[list $tcltest]" r+]
-    set x [list [catch {seek $f1 0 current} msg] $msg]
-    close $f1
-    regsub {".*":} $x {"":} x
-    string tolower $x
-} {1 {error during seek on "": invalid argument}}
-test io-34.9 {Tcl_Seek, testing buffered input flushing} {
-    removeFile test3
-    set f [open test3 w]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    close $f
-    set f [open test3 RDWR]
-    set x [read $f 1]
-    seek $f 3
-    lappend x [read $f 1]
-    seek $f 0 start
-    lappend x [read $f 1]
-    seek $f 10 current
-    lappend x [read $f 1]
-    seek $f -2 end
-    lappend x [read $f 1]
-    seek $f 50 end
-    lappend x [read $f 1]
-    seek $f 1
-    lappend x [read $f 1]
-    close $f
-    set x
-} {a d a l Y {} b}
-test io-34.10 {Tcl_Seek testing flushing of buffered input} {
-    set f [open test3 w]
-    fconfigure $f -translation lf
-    puts $f xyz\n123
-    close $f
-    set f [open test3 r+]
-    fconfigure $f -translation lf
-    set x [gets $f]
-    seek $f 0 current
-    puts $f 456
-    close $f
-    list $x [viewFile test3]
-} "xyz {xyz
-456}"
-test io-34.11 {Tcl_Seek testing flushing of buffered output} {
-    set f [open test3 w]
-    puts $f xyz\n123
-    close $f
-    set f [open test3 w+]
-    puts $f xyzzy
-    seek $f 2
-    set x [gets $f]
-    close $f
-    list $x [viewFile test3]
-} "zzy xyzzy"
-test io-34.12 {Tcl_Seek testing combination of write, seek back and read} {
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f xyz\n123
-    close $f
-    set f [open test3 a+]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f xyzzy
-    flush $f
-    set x [tell $f]
-    seek $f -4 cur
-    set y [gets $f]
-    close $f
-    list $x [viewFile test3] $y
-} {14 {xyz
-123
-xyzzy} zzy}
-test io-34.13 {Tcl_Tell at start of file} {
-    removeFile test1
-    set f1 [open test1 w]
-    set p [tell $f1]
-    close $f1
-    set p
-} 0
-test io-34.14 {Tcl_Tell after seek to end of file} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 0 end
-    set c1 [tell $f1]
-    close $f1
-    set c1
-} 54
-test io-34.15 {Tcl_Tell combined with seeking} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {}
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    puts $f1 "abcdefghijklmnopqrstuvwxyz"
-    close $f1
-    set f1 [open test1 r]
-    seek $f1 10 start
-    set c1 [tell $f1]
-    seek $f1 10 current
-    set c2 [tell $f1]
-    close $f1
-    list $c1 $c2
-} {10 20}
-test io-34.16 {Tcl_tell on pipe: always -1} {stdio} {
-    set f1 [open "|[list $tcltest]" r+]
-    set c [tell $f1]
-    close $f1
-    set c
-} -1
-test io-34.17 {Tcl_Tell on pipe: always -1} {stdio} {
-    set f1 [open "|[list $tcltest]" r+]
-    puts $f1 {puts hello}
-    flush $f1
-    set c [tell $f1]
-    gets $f1
-    close $f1
-    set c
-} -1
-test io-34.18 {Tcl_Tell combined with seeking and reading} {
-    removeFile test2
-    set f [open test2 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts -nonewline $f "line1\nline2\nline3\nline4\nline5\n"
-    close $f
-    set f [open test2]
-    fconfigure $f -translation lf
-    set x [tell $f]
-    read $f 3
-    lappend x [tell $f]
-    seek $f 2
-    lappend x [tell $f]
-    seek $f 10 current
-    lappend x [tell $f]
-    seek $f 0 end
-    lappend x [tell $f]
-    close $f
-    set x
-} {0 3 2 12 30}
-test io-34.19 {Tcl_Tell combined with opening in append mode} {
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f "abcdefghijklmnopqrstuvwxyz"
-    puts $f "abcdefghijklmnopqrstuvwxyz"
-    close $f
-    set f [open test3 a]
-    set c [tell $f]
-    close $f
-    set c
-} 54
-test io-34.20 {Tcl_Tell combined with writing} {
-    set f [open test3 w]
-    set l ""
-    seek $f 29 start
-    lappend l [tell $f]
-    puts -nonewline $f a
-    seek $f 39 start
-    lappend l [tell $f]
-    puts -nonewline $f a
-    lappend l [tell $f]
-    seek $f 407 end
-    lappend l [tell $f]
-    close $f
-    set l
-} {29 39 40 447}
-
-# Test Tcl_Eof
-
-test io-35.1 {Tcl_Eof} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f hello
-    puts $f hello
-    close $f
-    set f [open test1]
-    set x [eof $f]
-    lappend x [eof $f]
-    gets $f
-    lappend x [eof $f]
-    gets $f
-    lappend x [eof $f]
-    gets $f
-    lappend x [eof $f]
-    lappend x [eof $f]
-    close $f
-    set x
-} {0 0 0 0 1 1}
-test io-35.2 {Tcl_Eof with pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {gets stdin}
-    puts $f1 {puts hello}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    set x [eof $f1]
-    flush $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    close $f1
-    set x
-} {0 0 0 1}
-test io-35.3 {Tcl_Eof with pipe} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {gets stdin}
-    puts $f1 {puts hello}
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    puts $f1 hello
-    set x [eof $f1]
-    flush $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    gets $f1
-    lappend x [eof $f1]
-    close $f1
-    set x
-} {0 0 0 1 1 1}
-test io-35.4 {Tcl_Eof, eof detection on nonblocking file} {nonBlockFiles} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    fconfigure $f -blocking off
-    set l ""
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {{} 1}
-test io-35.5 {Tcl_Eof, eof detection on nonblocking pipe} {stdio} {
-    removeFile pipe
-    set f [open pipe w]
-    puts $f {
-	exit
-    }
-    close $f
-    set f [open "|[list $tcltest pipe]" r]
-    set l ""
-    lappend l [gets $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {{} 1}
-test io-35.6 {Tcl_Eof, eof char, lf write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {9 8 1}
-test io-35.7 {Tcl_Eof, eof char, lf write, lf read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {9 8 1}
-test io-35.8 {Tcl_Eof, eof char, cr write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {9 8 1}
-test io-35.9 {Tcl_Eof, eof char, cr write, cr read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {9 8 1}
-test io-35.10 {Tcl_Eof, eof char, crlf write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {11 8 1}
-test io-35.11 {Tcl_Eof, eof char, crlf write, crlf read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar \x1a
-    puts $f abc\ndef
-    close $f
-    set s [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $s $l $e
-} {11 8 1}
-test io-35.12 {Tcl_Eof, eof char in middle, lf write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {17 8 1}
-test io-35.13 {Tcl_Eof, eof char in middle, lf write, lf read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {17 8 1}
-test io-35.14 {Tcl_Eof, eof char in middle, cr write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {17 8 1}
-test io-35.15 {Tcl_Eof, eof char in middle, cr write, cr read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {17 8 1}
-test io-35.16 {Tcl_Eof, eof char in middle, crlf write, auto read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {21 8 1}
-test io-35.17 {Tcl_Eof, eof char in middle, crlf write, crlf read} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf -eofchar {}
-    set i [format abc\ndef\n%cqrs\nuvw 26]
-    puts $f $i
-    close $f
-    set c [file size test1]
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar \x1a
-    set l [string length [read $f]]
-    set e [eof $f]
-    close $f
-    list $c $l $e
-} {21 8 1}
-
-# Test Tcl_InputBlocked
-
-test io-36.1 {Tcl_InputBlocked on nonblocking pipe} {stdio} {
-    set f1 [open "|[list $tcltest]" r+]
-    puts $f1 {puts hello_from_pipe}
-    flush $f1
-    gets $f1
-    fconfigure $f1 -blocking off -buffering full
-    puts $f1 {puts hello}
-    set x ""
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    flush $f1
-    after 200
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    close $f1
-    set x
-} {{} 1 hello 0 {} 1}
-test io-36.2 {Tcl_InputBlocked on blocking pipe} {stdio} {
-    set f1 [open "|[list $tcltest]" r+]
-    fconfigure $f1 -buffering line
-    puts $f1 {puts hello_from_pipe}
-    set x ""
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    puts $f1 {exit}
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    lappend x [eof $f1]
-    close $f1
-    set x
-} {hello_from_pipe 0 {} 0 1}
-test io-36.3 {Tcl_InputBlocked vs files, short read} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f abcdefghijklmnop
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [fblocked $f]
-    lappend l [read $f 3]
-    lappend l [fblocked $f]
-    lappend l [read -nonewline $f]
-    lappend l [fblocked $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {0 abc 0 defghijklmnop 0 1}
-test io-36.4 {Tcl_InputBlocked vs files, event driven read} {
-    proc in {f} {
-        global l x
-	lappend l [read $f 3]
-	if {[eof $f]} {lappend l eof; close $f; set x done}
-    }
-    removeFile test1
-    set f [open test1 w]
-    puts $f abcdefghijklmnop
-    close $f
-    set f [open test1 r]
-    set l ""
-    fileevent $f readable [list in $f]
-    vwait x
-    set l
-} {abc def ghi jkl mno {p
-} eof}
-test io-36.5 {Tcl_InputBlocked vs files, short read, nonblocking} {nonBlockFiles} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f abcdefghijklmnop
-    close $f
-    set f [open test1 r]
-    fconfigure $f -blocking off
-    set l ""
-    lappend l [fblocked $f]
-    lappend l [read $f 3]
-    lappend l [fblocked $f]
-    lappend l [read -nonewline $f]
-    lappend l [fblocked $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} {0 abc 0 defghijklmnop 0 1}
-test io-36.6 {Tcl_InputBlocked vs files, event driven read} {nonBlockFiles} {
-    proc in {f} {
-        global l x
-	lappend l [read $f 3]
-	if {[eof $f]} {lappend l eof; close $f; set x done}
-    }
-    removeFile test1
-    set f [open test1 w]
-    puts $f abcdefghijklmnop
-    close $f
-    set f [open test1 r]
-    fconfigure $f -blocking off
-    set l ""
-    fileevent $f readable [list in $f]
-    vwait x
-    set l
-} {abc def ghi jkl mno {p
-} eof}
-
-# Test Tcl_InputBuffered
-
-test io-37.1 {Tcl_InputBuffered} {
-    set f [open longfile r]
-    fconfigure $f -buffersize 4096
-    read $f 3
-    set l ""
-    lappend l [testchannel inputbuffered $f]
-    lappend l [tell $f]
-    close $f
-    set l
-} {4093 3}
-test io-37.2 {Tcl_InputBuffered, test input flushing on seek} {
-    set f [open longfile r]
-    fconfigure $f -buffersize 4096
-    read $f 3
-    set l ""
-    lappend l [testchannel inputbuffered $f]
-    lappend l [tell $f]
-    seek $f 0 current
-    lappend l [testchannel inputbuffered $f]
-    lappend l [tell $f]
-    close $f
-    set l
-} {4093 3 0 3}
-
-# Test Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize
-
-test io-38.1 {Tcl_GetChannelBufferSize, default buffer size} {
-    set f [open longfile r]
-    set s [fconfigure $f -buffersize]
-    close $f
-    set s
-} 4096
-test io-38.2 {Tcl_SetChannelBufferSize, Tcl_GetChannelBufferSize} {
-    set f [open longfile r]
-    set l ""
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize 10000
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize 1
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize -1
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize 0
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize 100000
-    lappend l [fconfigure $f -buffersize]
-    fconfigure $f -buffersize 10000000
-    lappend l [fconfigure $f -buffersize]
-    close $f
-    set l
-} {4096 10000 4096 4096 4096 100000 4096}
-
-# Test Tcl_SetChannelOption, Tcl_GetChannelOption
-
-test io-39.1 {Tcl_GetChannelOption} {
-    removeFile test1
-    set f1 [open test1 w]
-    set x [fconfigure $f1 -blocking]
-    close $f1
-    set x
-} 1
-#
-# Test 17.2 was removed.
-#
-test io-39.2 {Tcl_GetChannelOption} {
-    removeFile test1
-    set f1 [open test1 w]
-    set x [fconfigure $f1 -buffering]
-    close $f1
-    set x
-} full
-test io-39.3 {Tcl_GetChannelOption} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -buffering line
-    set x [fconfigure $f1 -buffering]
-    close $f1
-    set x
-} line
-test io-39.4 {Tcl_GetChannelOption, Tcl_SetChannelOption} {
-    removeFile test1
-    set f1 [open test1 w]
-    set l ""
-    lappend l [fconfigure $f1 -buffering]
-    fconfigure $f1 -buffering line
-    lappend l [fconfigure $f1 -buffering]
-    fconfigure $f1 -buffering none
-    lappend l [fconfigure $f1 -buffering]
-    fconfigure $f1 -buffering line
-    lappend l [fconfigure $f1 -buffering]
-    fconfigure $f1 -buffering full
-    lappend l [fconfigure $f1 -buffering]
-    close $f1
-    set l
-} {full line none line full}
-test io-39.5 {Tcl_GetChannelOption, invariance} {
-    removeFile test1
-    set f1 [open test1 w]
-    set l ""
-    lappend l [fconfigure $f1 -buffering]
-    lappend l [list [catch {fconfigure $f1 -buffering green} msg] $msg]
-    lappend l [fconfigure $f1 -buffering]
-    close $f1
-    set l
-} {full {1 {bad value for -buffering: must be one of full, line, or none}} full}
-test io-39.6 {Tcl_SetChannelOption, multiple options} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -buffering line
-    puts $f1 hello
-    puts $f1 bye
-    set x [file size test1]
-    close $f1
-    set x
-} 10
-test io-39.7 {Tcl_SetChannelOption, buffering, translation} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf
-    puts $f1 hello
-    puts $f1 bye
-    set x ""
-    fconfigure $f1 -buffering line
-    lappend x [file size test1]
-    puts $f1 really_bye
-    lappend x [file size test1]
-    close $f1
-    set x
-} {0 21}
-test io-39.8 {Tcl_SetChannelOption, different buffering options} {
-    removeFile test1
-    set f1 [open test1 w]
-    set l ""
-    fconfigure $f1 -translation lf -buffering none -eofchar {}
-    puts -nonewline $f1 hello
-    lappend l [file size test1]
-    puts -nonewline $f1 hello
-    lappend l [file size test1]
-    fconfigure $f1 -buffering full
-    puts -nonewline $f1 hello
-    lappend l [file size test1]
-    fconfigure $f1 -buffering none
-    lappend l [file size test1]
-    puts -nonewline $f1 hello
-    lappend l [file size test1]
-    close $f1
-    lappend l [file size test1]
-    set l
-} {5 10 10 10 20 20}
-test io-39.9 {Tcl_SetChannelOption, blocking mode} {nonBlockFiles} {
-    removeFile test1
-    set f1 [open test1 w]
-    close $f1
-    set f1 [open test1 r]
-    set x ""
-    lappend x [fconfigure $f1 -blocking]
-    fconfigure $f1 -blocking off
-    lappend x [fconfigure $f1 -blocking]
-    lappend x [gets $f1]
-    lappend x [read $f1 1000]
-    lappend x [fblocked $f1]
-    lappend x [eof $f1]
-    close $f1
-    set x
-} {1 0 {} {} 0 1}
-test io-39.10 {Tcl_SetChannelOption, blocking mode} {stdio} {
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	gets stdin
-	after 100
-	puts hi
-	gets stdin
-    }
-    close $f1
-    set x ""
-    set f1 [open "|[list $tcltest pipe]" r+]
-    fconfigure $f1 -blocking off -buffering line
-    lappend x [fconfigure $f1 -blocking]
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    fconfigure $f1 -blocking on
-    puts $f1 hello
-    fconfigure $f1 -blocking off
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    fconfigure $f1 -blocking on
-    puts $f1 bye
-    fconfigure $f1 -blocking off
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    fconfigure $f1 -blocking on
-    lappend x [fconfigure $f1 -blocking]
-    lappend x [gets $f1]
-    lappend x [fblocked $f1]
-    lappend x [eof $f1]
-    lappend x [gets $f1]
-    lappend x [eof $f1]
-    close $f1
-    set x
-} {0 {} 1 {} 1 {} 1 1 hi 0 0 {} 1}
-test io-39.11 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -buffersize -10
-    set x [fconfigure $f -buffersize]
-    close $f
-    set x
-} 4096
-test io-39.12 {Tcl_SetChannelOption, Tcl_GetChannelOption buffer size} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -buffersize 10000000
-    set x [fconfigure $f -buffersize]
-    close $f
-    set x
-} 4096
-test io-39.13 {Tcl_SetChannelOption, Tcl_GetChannelOption, buffer size} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -buffersize 40000
-    set x [fconfigure $f -buffersize]
-    close $f
-    set x
-} 40000
-test io-39.14 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -encoding {} 
-    puts -nonewline $f \xe7\x89\xa6
-    close $f
-    set f [open test1 r]
-    fconfigure $f -encoding utf-8
-    set x [read $f]
-    close $f
-    set x
-} \u7266
-test io-39.15 {Tcl_SetChannelOption: -encoding, binary & utf-8} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -encoding binary
-    puts -nonewline $f \xe7\x89\xa6
-    close $f
-    set f [open test1 r]
-    fconfigure $f -encoding utf-8
-    set x [read $f]
-    close $f
-    set x
-} \u7266
-test io-39.16 {Tcl_SetChannelOption: -encoding, errors} {
-    removeFile test1
-    set f [open test1 w]
-    set result [list [catch {fconfigure $f -encoding foobar} msg] $msg]
-    close $f
-    set result
-} {1 {unknown encoding "foobar"}}
-test io-39.17 {Tcl_SetChannelOption: -encoding, clearing CHANNEL_NEED_MORE_DATA} {stdio} {
-    set f [open "|[list $tcltest cat]" r+]
-    fconfigure $f -encoding binary
-    puts -nonewline $f "\xe7"
-    flush $f
-    fconfigure $f -encoding utf-8 -blocking 0
-    set x {}
-    fileevent $f readable { lappend x [read $f] }
-    vwait x
-    after 300 { lappend x timeout }
-    vwait x
-    fconfigure $f -encoding utf-8
-    vwait x
-    after 300 { lappend x timeout }
-    vwait x
-    fconfigure $f -encoding binary
-    vwait x
-    after 300 { lappend x timeout }
-    vwait x
-    close $f
-    set x
-} "{} timeout {} timeout \xe7 timeout"
-
-test io-39.18 {Tcl_SetChannelOption, setting read mode independently} \
-	{socket} {
-    proc accept {s a p} {close $s}
-    set s1 [socket -server accept 0]
-    set port [lindex [fconfigure $s1 -sockname] 2]
-    set s2 [socket 127.0.0.1 $port]
-    update
-    fconfigure $s2 -translation {auto lf}
-    set modes [fconfigure $s2 -translation]
-    close $s1
-    close $s2
-    set modes
-} {auto lf}
-test io-39.19 {Tcl_SetChannelOption, setting read mode independently} \
-	{socket} {
-    proc accept {s a p} {close $s}
-    set s1 [socket -server accept 0]
-    set port [lindex [fconfigure $s1 -sockname] 2]
-    set s2 [socket 127.0.0.1 $port]
-    update
-    fconfigure $s2 -translation {auto crlf}
-    set modes [fconfigure $s2 -translation]
-    close $s1
-    close $s2
-    set modes
-} {auto crlf}
-test io-39.20 {Tcl_SetChannelOption, setting read mode independently} \
-	{socket} {
-    proc accept {s a p} {close $s}
-    set s1 [socket -server accept 0]
-    set port [lindex [fconfigure $s1 -sockname] 2]
-    set s2 [socket 127.0.0.1 $port]
-    update
-    fconfigure $s2 -translation {auto cr}
-    set modes [fconfigure $s2 -translation]
-    close $s1
-    close $s2
-    set modes
-} {auto cr}
-test io-39.21 {Tcl_SetChannelOption, setting read mode independently} \
-	{socket} {
-    proc accept {s a p} {close $s}
-    set s1 [socket -server accept 0]
-    set port [lindex [fconfigure $s1 -sockname] 2]
-    set s2 [socket 127.0.0.1 $port]
-    update
-    fconfigure $s2 -translation {auto auto}
-    set modes [fconfigure $s2 -translation]
-    close $s1
-    close $s2
-    set modes
-} {auto crlf}
-
-test io-40.1 {POSIX open access modes: RDWR} {
-    removeFile test3
-    set f [open test3 w]
-    puts $f xyzzy
-    close $f
-    set f [open test3 RDWR]
-    puts -nonewline $f "ab"
-    seek $f 0 current
-    set x [gets $f]
-    close $f
-    set f [open test3 r]
-    lappend x [gets $f]
-    close $f
-    set x
-} {zzy abzzy}
-test io-40.2 {POSIX open access modes: CREAT} {unixOnly} {
-    removeFile test3
-    set f [open test3 {WRONLY CREAT} 0600]
-    file stat test3 stats
-    set x [format "0%o" [expr $stats(mode)&0777]]
-    puts $f "line 1"
-    close $f
-    set f [open test3 r]
-    lappend x [gets $f]
-    close $f
-    set x
-} {0600 {line 1}}
-
-# some tests can only be run is umask is 2
-# if "umask" cannot be run, the tests will be skipped.
-catch {set ::tcltest::testConfig(umask2) [expr {[exec umask] == 2}]}
-
-test io-40.3 {POSIX open access modes: CREAT} {unixOnly umask2} {
-    # This test only works if your umask is 2, like ouster's.
-    removeFile test3
-    set f [open test3 {WRONLY CREAT}]
-    close $f
-    file stat test3 stats
-    format "0%o" [expr $stats(mode)&0777]
-} 0664
-test io-40.4 {POSIX open access modes: CREAT} {
-    removeFile test3
-    set f [open test3 w]
-    fconfigure $f -eofchar {}
-    puts $f xyzzy
-    close $f
-    set f [open test3 {WRONLY CREAT}]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f "ab"
-    close $f
-    set f [open test3 r]
-    set x [gets $f]
-    close $f
-    set x
-} abzzy
-test io-40.5 {POSIX open access modes: APPEND} {
-    removeFile test3
-    set f [open test3 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f xyzzy
-    close $f
-    set f [open test3 {WRONLY APPEND}]
-    fconfigure $f -translation lf
-    puts $f "new line"
-    seek $f 0
-    puts $f "abc"
-    close $f
-    set f [open test3 r]
-    fconfigure $f -translation lf
-    set x ""
-    seek $f 6 current
-    lappend x [gets $f]
-    lappend x [gets $f]
-    close $f
-    set x
-} {{new line} abc}
-test io-40.6 {POSIX open access modes: EXCL} {
-    removeFile test3
-    set f [open test3 w]
-    puts $f xyzzy
-    close $f
-    set msg [list [catch {open test3 {WRONLY CREAT EXCL}} msg] $msg]
-    regsub " already " $msg " " msg
-    string tolower $msg
-} {1 {couldn't open "test3": file exists}}
-test io-40.7 {POSIX open access modes: EXCL} {
-    removeFile test3
-    set f [open test3 {WRONLY CREAT EXCL}]
-    fconfigure $f -eofchar {}
-    puts $f "A test line"
-    close $f
-    viewFile test3
-} {A test line}
-test io-40.8 {POSIX open access modes: TRUNC} {
-    removeFile test3
-    set f [open test3 w]
-    puts $f xyzzy
-    close $f
-    set f [open test3 {WRONLY TRUNC}]
-    puts $f abc
-    close $f
-    set f [open test3 r]
-    set x [gets $f]
-    close $f
-    set x
-} abc
-test io-40.9 {POSIX open access modes: NONBLOCK} {nonPortable macOrUnix} {
-    removeFile test3
-    set f [open test3 {WRONLY NONBLOCK CREAT}]
-    puts $f "NONBLOCK test"
-    close $f
-    set f [open test3 r]
-    set x [gets $f]
-    close $f
-    set x
-} {NONBLOCK test}
-test io-40.10 {POSIX open access modes: RDONLY} {
-    set f [open test1 w]
-    puts $f "two lines: this one"
-    puts $f "and this"
-    close $f
-    set f [open test1 RDONLY]
-    set x [list [gets $f] [catch {puts $f Test} msg] $msg]
-    close $f
-    string compare [string tolower $x] \
-	[list {two lines: this one} 1 \
-		[format "channel \"%s\" wasn't opened for writing" $f]]
-} 0
-test io-40.11 {POSIX open access modes: RDONLY} {
-    removeFile test3
-    string tolower [list [catch {open test3 RDONLY} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-test io-40.12 {POSIX open access modes: WRONLY} {
-    removeFile test3
-    string tolower [list [catch {open test3 WRONLY} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-test io-40.13 {POSIX open access modes: WRONLY} {
-    makeFile xyzzy test3
-    set f [open test3 WRONLY]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f "ab"
-    seek $f 0 current
-    set x [list [catch {gets $f} msg] $msg]
-    close $f
-    lappend x [viewFile test3]
-    string compare [string tolower $x] \
-	[list 1 "channel \"$f\" wasn't opened for reading" abzzy]
-} 0
-test io-40.14 {POSIX open access modes: RDWR} {
-    removeFile test3
-    string tolower [list [catch {open test3 RDWR} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-test io-40.15 {POSIX open access modes: RDWR} {
-    makeFile xyzzy test3
-    set f [open test3 RDWR]
-    puts -nonewline $f "ab"
-    seek $f 0 current
-    set x [gets $f]
-    close $f
-    lappend x [viewFile test3]
-} {zzy abzzy}
-if {![file exists ~/_test_] && [file writable ~]} {
-    test io-40.16 {tilde substitution in open} {
-	set f [open ~/_test_ w]
-	puts $f "Some text"
-	close $f
-	set x [file exists [file join $env(HOME) _test_]]
-	removeFile [file join $env(HOME) _test_]
-	set x
-    } 1
-}
-test io-40.17 {tilde substitution in open} {
-    set home $env(HOME)
-    unset env(HOME)
-    set x [list [catch {open ~/foo} msg] $msg]
-    set env(HOME) $home
-    set x
-} {1 {couldn't find HOME environment variable to expand path}}
-
-test io-41.1 {Tcl_FileeventCmd: errors} {
-    list [catch {fileevent foo} msg] $msg
-} {1 {wrong # args: should be "fileevent channelId event ?script?"}}
-test io-41.2 {Tcl_FileeventCmd: errors} {
-    list [catch {fileevent foo bar baz q} msg] $msg
-} {1 {wrong # args: should be "fileevent channelId event ?script?"}}
-test io-41.3 {Tcl_FileeventCmd: errors} {
-    list [catch {fileevent gorp readable} msg] $msg
-} {1 {can not find channel named "gorp"}}
-test io-41.4 {Tcl_FileeventCmd: errors} {
-    list [catch {fileevent gorp writable} msg] $msg
-} {1 {can not find channel named "gorp"}}
-test io-41.5 {Tcl_FileeventCmd: errors} {
-    list [catch {fileevent gorp who-knows} msg] $msg
-} {1 {bad event name "who-knows": must be readable or writable}}
-
-#
-# Test fileevent on a file
-#
-
-set f [open foo w+]
-
-test io-42.1 {Tcl_FileeventCmd: creating, deleting, querying} {
-    list [fileevent $f readable] [fileevent $f writable]
-} {{} {}}
-test io-42.2 {Tcl_FileeventCmd: replacing} {
-    set result {}
-    fileevent $f r "first script"
-    lappend result [fileevent $f readable]
-    fileevent $f r "new script"
-    lappend result [fileevent $f readable]
-    fileevent $f r "yet another"
-    lappend result [fileevent $f readable]
-    fileevent $f r ""
-    lappend result [fileevent $f readable]
-} {{first script} {new script} {yet another} {}}
-test io-42.3 {Tcl_FileeventCmd: replacing, with NULL chars in script} {
-    set result {}
-    fileevent $f r "first scr\0ipt"
-    lappend result [string length [fileevent $f readable]]
-    fileevent $f r "new scr\0ipt"
-    lappend result [string length [fileevent $f readable]]
-    fileevent $f r "yet ano\0ther"
-    lappend result [string length [fileevent $f readable]]
-    fileevent $f r ""
-    lappend result [fileevent $f readable]
-} {13 11 12 {}}
-
-#
-# Test fileevent on a pipe
-#
-
-catch {set f2 [open "|[list cat -u]" r+]}
-catch {set f3 [open "|[list cat -u]" r+]}
-
-test io-43.1 {Tcl_FileeventCmd: creating, deleting, querying} {stdio unixExecs} {
-    set result {}
-    fileevent $f readable "script 1"
-    lappend result [fileevent $f readable] [fileevent $f writable]
-    fileevent $f writable "write script"
-    lappend result [fileevent $f readable] [fileevent $f writable]
-    fileevent $f readable {}
-    lappend result [fileevent $f readable] [fileevent $f writable]
-    fileevent $f writable {}
-    lappend result [fileevent $f readable] [fileevent $f writable]
-} {{script 1} {} {script 1} {write script} {} {write script} {} {}}
-test io-43.2 {Tcl_FileeventCmd: deleting when many present} {stdio unixExecs} {
-    set result {}
-    lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r]
-    fileevent $f r "read f"
-    fileevent $f2 r "read f2"
-    fileevent $f3 r "read f3"
-    lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r]
-    fileevent $f2 r {}
-    lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r]
-    fileevent $f3 r {}
-    lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r]
-    fileevent $f r {}
-    lappend result [fileevent $f r] [fileevent $f2 r] [fileevent $f3 r]
-} {{} {} {} {read f} {read f2} {read f3} {read f} {} {read f3} {read f} {} {} {} {} {}}
-
-test io-44.1 {FileEventProc procedure: normal read event} {stdio unixExecs} {
-    fileevent $f2 readable {
-	set x [gets $f2]; fileevent $f2 readable {}
-    }
-    puts $f2 text; flush $f2
-    set x initial
-    vwait x
-    set x
-} {text}
-test io-44.2 {FileEventProc procedure: error in read event} {stdio unixExecs} {
-    proc bgerror args {
-	global x
-	set x $args
-    }
-    fileevent $f2 readable {error bogus}
-    puts $f2 text; flush $f2
-    set x initial
-    vwait x
-    rename bgerror {}
-    list $x [fileevent $f2 readable]
-} {bogus {}}
-test io-44.3 {FileEventProc procedure: normal write event} {stdio unixExecs} {
-    fileevent $f2 writable {
-	lappend x "triggered"
-	incr count -1
-	if {$count <= 0} {
-	    fileevent $f2 writable {}
-	}
-    }
-    set x initial
-    set count 3
-    vwait x
-    vwait x
-    vwait x
-    set x
-} {initial triggered triggered triggered}
-test io-44.4 {FileEventProc procedure: eror in write event} {stdio unixExecs} {
-    proc bgerror args {
-	global x
-	set x $args
-    }
-    fileevent $f2 writable {error bad-write}
-    set x initial
-    vwait x
-    rename bgerror {}
-    list $x [fileevent $f2 writable]
-} {bad-write {}}
-test io-44.5 {FileEventProc procedure: end of file} {stdio unixExecs} {
-    set f4 [open "|[list $tcltest cat << foo]" r]
-    fileevent $f4 readable {
-	if {[gets $f4 line] < 0} {
-	    lappend x eof
-	    fileevent $f4 readable {}
-	} else {
-	    lappend x $line
-	}
-    }
-    set x initial
-    vwait x
-    vwait x
-    close $f4
-    set x
-} {initial foo eof}
-
-catch {close $f2}
-catch {close $f3}
-
-
-close $f
-makeFile "foo bar" foo
-test io-45.1 {DeleteFileEvent, cleanup on close} {
-    set f [open foo r]
-    fileevent $f readable {
-	lappend x "binding triggered: \"[gets $f]\""
-	fileevent $f readable {}
-    }
-    close $f
-    set x initial
-    after 100 { set y done }
-    vwait y
-    set x
-} {initial}
-test io-45.2 {DeleteFileEvent, cleanup on close} {
-    set f [open foo r]
-    set f2 [open foo r]
-    fileevent $f readable {
-	    lappend x "f triggered: \"[gets $f]\""
-	    fileevent $f readable {}
-	}
-    fileevent $f2 readable {
-	lappend x "f2 triggered: \"[gets $f2]\""
-	fileevent $f2 readable {}
-    }
-    close $f
-    set x initial
-    vwait x
-    close $f2
-    set x
-} {initial {f2 triggered: "foo bar"}}
-test io-45.3 {DeleteFileEvent, cleanup on close} {
-    set f [open foo r]
-    set f2 [open foo r]
-    set f3 [open foo r]
-    fileevent $f readable {f script}
-    fileevent $f2 readable {f2 script}
-    fileevent $f3 readable {f3 script}
-    set x {}
-    close $f2
-    lappend x [catch {fileevent $f readable} msg] $msg \
-	    [catch {fileevent $f2 readable}] \
-	    [catch {fileevent $f3 readable} msg] $msg
-    close $f3
-    lappend x [catch {fileevent $f readable} msg] $msg \
-	    [catch {fileevent $f2 readable}] \
-	    [catch {fileevent $f3 readable}]
-    close $f
-    lappend x [catch {fileevent $f readable}] \
-	    [catch {fileevent $f2 readable}] \
-	    [catch {fileevent $f3 readable}]
-} {0 {f script} 1 0 {f3 script} 0 {f script} 1 1 1 1 1}
-
-# Execute these tests only if the "testfevent" command is present.
-
-if {[info commands testfevent] == "testfevent"} {
-
-test io-46.1 {Tcl event loop vs multiple interpreters} {
-    testfevent create
-    testfevent cmd {
-        set f [open foo r]
-        set x "no event"
-        fileevent $f readable {
-            set x "f triggered: [gets $f]"
-            fileevent $f readable {}
-        }
-    } 
-    after 1	;# We must delay because Windows takes a little time to notice
-    update
-    testfevent cmd {close $f}
-    list [testfevent cmd {set x}] [testfevent cmd {info commands after}]
-} {{f triggered: foo bar} after}
-test io-46.2 {Tcl event loop vs multiple interpreters} {
-    testfevent create
-    testfevent cmd {
-        set x 0
-        after 100 {set x triggered}
-        vwait x
-        set x
-    }
-} {triggered}
-test io-46.3 {Tcl event loop vs multiple interpreters} {
-    testfevent create
-    testfevent cmd {
-        set x 0
-        after 10 {lappend x timer}
-        after 30
-        set result $x
-        update idletasks
-        lappend result $x
-        update
-        lappend result $x
-    }
-} {0 0 {0 timer}}
-
-test io-47.1 {fileevent vs multiple interpreters} {
-    set f [open foo r]
-    set f2 [open foo r]
-    set f3 [open foo r]
-    fileevent $f readable {script 1}
-    testfevent create
-    testfevent share $f2
-    testfevent cmd "fileevent $f2 readable {script 2}"
-    fileevent $f3 readable {sript 3}
-    set x {}
-    lappend x [fileevent $f2 readable]
-    testfevent delete
-    lappend x [fileevent $f readable] [fileevent $f2 readable] \
-        [fileevent $f3 readable]
-    close $f
-    close $f2
-    close $f3
-    set x
-} {{} {script 1} {} {sript 3}}
-test io-47.2 {deleting fileevent on interpreter delete} {
-    set f [open foo r]
-    set f2 [open foo r]
-    set f3 [open foo r]
-    set f4 [open foo r]
-    fileevent $f readable {script 1}
-    testfevent create
-    testfevent share $f2
-    testfevent share $f3
-    testfevent cmd "fileevent $f2 readable {script 2}
-        fileevent $f3 readable {script 3}"
-    fileevent $f4 readable {script 4}
-    testfevent delete
-    set x [list [fileevent $f readable] [fileevent $f2 readable] \
-                [fileevent $f3 readable] [fileevent $f4 readable]]
-    close $f
-    close $f2
-    close $f3
-    close $f4
-    set x
-} {{script 1} {} {} {script 4}}
-test io-47.3 {deleting fileevent on interpreter delete} {
-    set f [open foo r]
-    set f2 [open foo r]
-    set f3 [open foo r]
-    set f4 [open foo r]
-    testfevent create
-    testfevent share $f3
-    testfevent share $f4
-    fileevent $f readable {script 1}
-    fileevent $f2 readable {script 2}
-    testfevent cmd "fileevent $f3 readable {script 3}
-      fileevent $f4 readable {script 4}"
-    testfevent delete
-    set x [list [fileevent $f readable] [fileevent $f2 readable] \
-                [fileevent $f3 readable] [fileevent $f4 readable]]
-    close $f
-    close $f2
-    close $f3
-    close $f4
-    set x
-} {{script 1} {script 2} {} {}}
-test io-47.4 {file events on shared files and multiple interpreters} {
-    set f [open foo r]
-    set f2 [open foo r]
-    testfevent create
-    testfevent share $f
-    testfevent cmd "fileevent $f readable {script 1}"
-    fileevent $f readable {script 2}
-    fileevent $f2 readable {script 3}
-    set x [list [fileevent $f2 readable] \
-                [testfevent cmd "fileevent $f readable"] \
-                [fileevent $f readable]]
-    testfevent delete
-    close $f
-    close $f2
-    set x
-} {{script 3} {script 1} {script 2}}
-test io-47.5 {file events on shared files, deleting file events} {
-    set f [open foo r]
-    testfevent create
-    testfevent share $f
-    testfevent cmd "fileevent $f readable {script 1}"
-    fileevent $f readable {script 2}
-    testfevent cmd "fileevent $f readable {}"
-    set x [list [testfevent cmd "fileevent $f readable"] \
-                [fileevent $f readable]]
-    testfevent delete
-    close $f
-    set x
-} {{} {script 2}}
-test io-47.6 {file events on shared files, deleting file events} {
-    set f [open foo r]
-    testfevent create
-    testfevent share $f
-    testfevent cmd "fileevent $f readable {script 1}"
-    fileevent $f readable {script 2}
-    fileevent $f readable {}
-    set x [list [testfevent cmd "fileevent $f readable"] \
-                [fileevent $f readable]]
-    testfevent delete
-    close $f
-    set x
-} {{script 1} {}}
-
-}
-
-# The above curly closes the test for presence of the "testfevent" command.
-
-test io-48.1 {testing readability conditions} {
-    set f [open bar w]
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    close $f
-    set f [open bar r]
-    fileevent $f readable [list consume $f]
-    proc consume {f} {
-	global x l
-	lappend l called
-	if {[eof $f]} {
-	    close $f
-	    set x done
-	} else {
-	    gets $f
-	}
-    }
-    set l ""
-    set x not_done
-    vwait x
-    list $x $l
-} {done {called called called called called called called}}
-test io-48.2 {testing readability conditions} {nonBlockFiles} {
-    set f [open bar w]
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    close $f
-    set f [open bar r]
-    fileevent $f readable [list consume $f]
-    fconfigure $f -blocking off
-    proc consume {f} {
-	global x l
-	lappend l called
-	if {[eof $f]} {
-	    close $f
-	    set x done
-	} else {
-	    gets $f
-	}
-    }
-    set l ""
-    set x not_done
-    vwait x
-    list $x $l
-} {done {called called called called called called called}}
-test io-48.3 {testing readability conditions} {unixOnly nonBlockFiles} {
-    set f [open bar w]
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    puts $f abcdefg
-    close $f
-    set f [open my_script w]
-    puts $f {
-	proc copy_slowly {f} {
-	    while {![eof $f]} {
-		puts [gets $f]
-		after 200
-	    }
-	    close $f
-	}
-    }
-    close $f
-    set f [open "|[list $tcltest]" r+]
-    fileevent $f readable [list consume $f]
-    fconfigure $f -buffering line
-    fconfigure $f -blocking off
-    proc consume {f} {
-	global x l
-	if {[eof $f]} {
-	    set x done
-	} else {
-	    gets $f
-	    lappend l [fblocked $f]
-	    gets $f
-	    lappend l [fblocked $f]
-	}
-    }
-    set l ""
-    set x not_done
-    puts $f {source my_script}
-    puts $f {set f [open bar r]}
-    puts $f {copy_slowly $f}
-    puts $f {exit}
-    vwait x
-    close $f
-    list $x $l
-} {done {0 1 0 1 0 1 0 1 0 1 0 1 0 0}}
-test io-48.4 {lf write, testing readability, ^Z termination, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.5 {lf write, testing readability, ^Z in middle, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.6 {cr write, testing readability, ^Z termination, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.7 {cr write, testing readability, ^Z in middle, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.8 {crlf write, testing readability, ^Z termination, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation auto -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.9 {crlf write, testing readability, ^Z in middle, auto read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation auto
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.10 {lf write, testing readability, ^Z in middle, lf read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation lf
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.11 {lf write, testing readability, ^Z termination, lf read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation lf -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.12 {cr write, testing readability, ^Z in middle, cr read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation cr
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.13 {cr write, testing readability, ^Z termination, cr read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation cr
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation cr -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.14 {crlf write, testing readability, ^Z in middle, crlf read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format "abc\ndef\n%cfoo\nbar\n" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -eofchar \x1a -translation crlf
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-test io-48.15 {crlf write, testing readability, ^Z termi, crlf read mode} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation crlf
-    set c [format "abc\ndef\n%c" 26]
-    puts -nonewline $f $c
-    close $f
-    proc consume {f} {
-	global c x l
-	if {[eof $f]} {
-	   set x done
-	   close $f
-	} else {
-	   lappend l [gets $f]
-	   incr c
-	}
-    }
-    set c 0
-    set l ""
-    set f [open test1 r]
-    fconfigure $f -translation crlf -eofchar \x1a
-    fileevent $f readable [list consume $f]
-    vwait x
-    list $c $l
-} {3 {abc def {}}}
-
-test io-49.1 {testing crlf reading, leftover cr disgorgment} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\rb\rc\r\n"
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [file size test1]
-    fconfigure $f -translation crlf
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [read $f 1]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    lappend l [read $f 1]
-    lappend l [eof $f]
-    close $f
-    set l
-} "7 a 1 [list \r] 2 b 3 [list \r] 4 c 5 {
-} 7 0 {} 1"
-test io-49.2 {testing crlf reading, leftover cr disgorgment} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\rb\rc\r\n"
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [file size test1]
-    fconfigure $f -translation crlf
-    lappend l [read $f 2]
-    lappend l [tell $f]
-    lappend l [read $f 2]
-    lappend l [tell $f]
-    lappend l [read $f 2]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    lappend l [read $f 2]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "7 [list a\r] 2 [list b\r] 4 [list c\n] 7 0 {} 7 1"
-test io-49.3 {testing crlf reading, leftover cr disgorgment} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\rb\rc\r\n"
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [file size test1]
-    fconfigure $f -translation crlf
-    lappend l [read $f 3]
-    lappend l [tell $f]
-    lappend l [read $f 3]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    lappend l [read $f 3]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "7 [list a\rb] 3 [list \rc\n] 7 0 {} 7 1"
-test io-49.4 {testing crlf reading, leftover cr disgorgment} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\rb\rc\r\n"
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [file size test1]
-    fconfigure $f -translation crlf
-    lappend l [read $f 3]
-    lappend l [tell $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} "7 [list a\rb] 3 [list \rc] 7 0 {} 7 1"
-test io-49.5 {testing crlf reading, leftover cr disgorgment} {
-    removeFile test1
-    set f [open test1 w]
-    fconfigure $f -translation lf
-    puts -nonewline $f "a\rb\rc\r\n"
-    close $f
-    set f [open test1 r]
-    set l ""
-    lappend l [file size test1]
-    fconfigure $f -translation crlf
-    lappend l [set x [gets $f]]
-    lappend l [tell $f]
-    lappend l [gets $f]
-    lappend l [tell $f]
-    lappend l [eof $f]
-    close $f
-    set l
-} [list 7 a\rb\rc 7 {} 7 1]
-    
-test io-50.1 {testing handler deletion} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list delhandler $f]
-    proc delhandler {f} {
-	global z
-	set z called
-	testchannelevent $f delete 0
-    }
-    set z not_called
-    update
-    close $f
-    set z
-} called
-test io-50.2 {testing handler deletion with multiple handlers} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list delhandler $f 1]
-    testchannelevent $f add readable [list delhandler $f 0]
-    proc delhandler {f i} {
-	global z
-	lappend z "called delhandler $f $i"
-	testchannelevent $f delete 0
-    }
-    set z ""
-    update
-    close $f
-    string compare [string tolower $z] \
-	[list [list called delhandler $f 0] [list called delhandler $f 1]]
-} 0
-test io-50.3 {testing handler deletion with multiple handlers} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list notcalled $f 1]
-    testchannelevent $f add readable [list delhandler $f 0]
-    set z ""
-    proc notcalled {f i} {
-	global z
-	lappend z "notcalled was called!! $f $i"
-    }
-    proc delhandler {f i} {
-	global z
-	testchannelevent $f delete 1
-	lappend z "delhandler $f $i called"
-	testchannelevent $f delete 0
-	lappend z "delhandler $f $i deleted myself"
-    }
-    set z ""
-    update
-    close $f
-    string compare [string tolower $z] \
-	[list [list delhandler $f 0 called] \
-	      [list delhandler $f 0 deleted myself]]
-} 0
-test io-50.4 {testing handler deletion vs reentrant calls} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list delrecursive $f]
-    proc delrecursive {f} {
-	global z u
-	if {"$u" == "recursive"} {
-	    testchannelevent $f delete 0
-	    lappend z "delrecursive deleting recursive"
-	} else {
-	    lappend z "delrecursive calling recursive"
-	    set u recursive
-	    update
-	}
-    }
-    set u toplevel
-    set z ""
-    update
-    close $f
-    string compare [string tolower $z] \
-	{{delrecursive calling recursive} {delrecursive deleting recursive}}
-} 0
-test io-50.5 {testing handler deletion vs reentrant calls} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list notcalled $f]
-    testchannelevent $f add readable [list del $f]
-    proc notcalled {f} {
-	global z
-	lappend z "notcalled was called!! $f"
-    }
-    proc del {f} {
-	global z u
-	if {"$u" == "recursive"} {
-	    testchannelevent $f delete 1
-	    testchannelevent $f delete 0
-	    lappend z "del deleted notcalled"
-	    lappend z "del deleted myself"
-	} else {
-	    set u recursive
-	    lappend z "del calling recursive"
-	    update
-	    lappend z "del after update"
-	}
-    }
-    set z ""
-    set u toplevel
-    update
-    close $f
-    string compare [string tolower $z] \
-	[list {del calling recursive} {del deleted notcalled} \
-	      {del deleted myself} {del after update}]
-} 0
-test io-50.6 {testing handler deletion vs reentrant calls} {
-    removeFile test1
-    set f [open test1 w]
-    close $f
-    set f [open test1 r]
-    testchannelevent $f add readable [list second $f]
-    testchannelevent $f add readable [list first $f]
-    proc first {f} {
-	global u z
-	if {"$u" == "toplevel"} {
-	    lappend z "first called"
-	    set u first
-	    update
-	    lappend z "first after update"
-	} else {
-	    lappend z "first called not toplevel"
-	}
-    }
-    proc second {f} {
-	global u z
-	if {"$u" == "first"} {
-	    lappend z "second called, first time"
-	    set u second
-	    testchannelevent $f delete 0
-	} elseif {"$u" == "second"} {
-	    lappend z "second called, second time"
-	    testchannelevent $f delete 0
-	} else {
-	    lappend z "second called, cannot happen!"
-	    testchannelevent $f removeall
-	}
-    }
-    set z ""
-    set u toplevel
-    update
-    close $f
-    string compare [string tolower $z] \
-	[list {first called} {first called not toplevel} \
-	      {second called, first time} {second called, second time} \
-	      {first after update}]
-} 0
-
-test io-51.1 {Test old socket deletion on Macintosh} {socket} {
-    set x 0
-    set result ""
-    proc accept {s a p} {
-	global x wait
-	fconfigure $s -blocking off
-	puts $s "sock[incr x]"
-	close $s
-	set wait done
-    }
-    set ss [socket -server accept 2831]
-    set wait ""
-    set cs [socket [info hostname] 2831]
-    vwait wait
-    lappend result [gets $cs]
-    close $cs
-
-    set wait ""
-    set cs [socket [info hostname] 2831]
-    vwait wait
-    lappend result [gets $cs]
-    close $cs
-
-    set wait ""
-    set cs [socket [info hostname] 2831]
-    vwait wait
-    lappend result [gets $cs]
-    close $cs
-
-    set wait ""
-    set cs [socket [info hostname] 2831]
-    vwait wait
-    lappend result [gets $cs]
-    close $cs
-    close $ss
-    set result
-} {sock1 sock2 sock3 sock4}
-
-test io-52.1 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fcopy $f1 $f2 -command { # }
-    catch { fcopy $f1 $f2 } msg
-    close $f1
-    close $f2
-    string compare $msg "channel \"$f1\" is busy"
-} {0}
-test io-52.2 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    set f3 [open $thisScript]
-    fcopy $f1 $f2 -command { # }
-    catch { fcopy $f3 $f2 } msg
-    close $f1
-    close $f2
-    close $f3
-    string compare $msg "channel \"$f2\" is busy"
-} {0}
-test io-52.3 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation cr -blocking 0
-    set s0 [fcopy $f1 $f2]
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    close $f1
-    close $f2
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    if {("$s1" == "$s2") && ($s0 == $s1)} {
-        lappend result ok
-    }
-    set result
-} {0 0 ok}
-test io-52.4 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation cr -blocking 0
-    fcopy $f1 $f2 -size 40
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    close $f1
-    close $f2
-    lappend result [file size test1]
-} {0 0 40}
-test io-52.5 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
-    fcopy $f1 $f2 -size -1
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    close $f1
-    close $f2
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    if {"$s1" == "$s2"} {
-        lappend result ok
-    }
-    set result
-} {0 0 ok}
-test io-52.6 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
-    set s0 [fcopy $f1 $f2 -size [expr [file size $thisScript] + 5]]
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    close $f1
-    close $f2
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    if {("$s1" == "$s2") && ($s0 == $s1)} {
-        lappend result ok
-    }
-    set result
-} {0 0 ok}
-test io-52.7 {TclCopyChannel} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation lf -blocking 0
-    fcopy $f1 $f2
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    close $f1
-    close $f2
-    if {"$s1" == "$s2"} {
-        lappend result ok
-    }
-    set result
-} {0 0 ok}
-test io-52.8 {TclCopyChannel} {stdio} {
-    removeFile test1
-    removeFile pipe
-    set f1 [open pipe w]
-    fconfigure $f1 -translation lf
-    puts $f1 "
-	puts ready
-	gets stdin
-	set f1 \[open [list $thisScript] r\]
-	fconfigure \$f1 -translation lf
-	puts \[read \$f1 100\]
-	close \$f1
-    "
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    fconfigure $f1 -translation lf
-    gets $f1
-    puts $f1 ready
-    flush $f1
-    set f2 [open test1 w]
-    fconfigure $f2 -translation lf
-    set s0 [fcopy $f1 $f2 -size 40]
-    catch {close $f1}
-    close $f2
-    list $s0 [file size test1]
-} {40 40}
-
-test io-53.1 {CopyData} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation cr -blocking 0
-    fcopy $f1 $f2 -size 0
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    close $f1
-    close $f2
-    lappend result [file size test1]
-} {0 0 0}
-test io-53.2 {CopyData} {
-    removeFile test1
-    set f1 [open $thisScript]
-    set f2 [open test1 w]
-    fconfigure $f1 -translation lf -blocking 0
-    fconfigure $f2 -translation cr -blocking 0
-    fcopy $f1 $f2 -command {set s0}
-    set result [list [fconfigure $f1 -blocking] [fconfigure $f2 -blocking]]
-    vwait s0
-    close $f1
-    close $f2
-    set s1 [file size $thisScript]
-    set s2 [file size test1]
-    if {("$s1" == "$s2") && ($s0 == $s1)} {
-        lappend result ok
-    }
-    set result
-} {0 0 ok}
-test io-53.3 {CopyData: background read underflow} {unixOnly} {
-    removeFile test1
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	puts ready
-	flush stdout				;# Don't assume line buffered!
-	fcopy stdin stdout -command { set x }
-	vwait x
-	set f [open test1 w]
-	fconfigure $f -translation lf
-	puts $f "done"
-	close $f
-    }
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    set result [gets $f1]
-    puts $f1 line1
-    flush $f1
-    lappend result [gets $f1]
-    puts $f1 line2
-    flush $f1
-    lappend result [gets $f1]
-    close $f1
-    after 500
-    set f [open test1]
-    lappend result [read $f]
-    close $f
-    set result
-} "ready line1 line2 {done\n}"
-test io-53.4 {CopyData: background write overflow} {unixOnly} {
-    set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n
-    for {set x 0} {$x < 12} {incr x} {
-	append big $big
-    }
-    removeFile test1
-    removeFile pipe
-    set f1 [open pipe w]
-    puts $f1 {
-	puts ready
-	fcopy stdin stdout -command { set x }
-	vwait x
-	set f [open test1 w]
-	fconfigure $f -translation lf
-	puts $f "done"
-	close $f
-    }
-    close $f1
-    set f1 [open "|[list $tcltest pipe]" r+]
-    set result [gets $f1]
-    fconfigure $f1 -blocking 0
-    puts $f1 $big
-    flush $f1
-    after 500
-    set result ""
-    fileevent $f1 read {
-	append result [read $f1 1024]
-	if {[string length $result] >= [string length $big]} {
-	    set x done
-	}
-    }
-    vwait x
-    close $f1
-    set big {}
-    set x
-} done
-set result {}
-
-proc FcopyTestAccept {sock args} {
-    after 1000 "close $sock"
-}
-proc FcopyTestDone {bytes {error {}}} {
-    global fcopyTestDone
-    if {[string length $error]} {
-	set fcopyTestDone 1
-    } else {
-	set fcopyTestDone 0
-    }
-}
-
-test io-53.5 {CopyData: error during fcopy} {socket} {
-    set listen [socket -server FcopyTestAccept 2828]
-    set in [open $thisScript]	;# 126 K
-    set out [socket 127.0.0.1 2828]
-    catch {unset fcopyTestDone}
-    close $listen	;# This means the socket open never really succeeds
-    fcopy $in $out -command FcopyTestDone
-    if ![info exists fcopyTestDone] {
-	vwait fcopyTestDone		;# The error occurs here in the b.g.
-    }
-    close $in
-    close $out
-    set fcopyTestDone	;# 1 for error condition
-} 1
-test io-53.6 {CopyData: error during fcopy} {stdio} {
-    removeFile pipe
-    removeFile test1
-    catch {unset fcopyTestDone}
-    set f1 [open pipe w]
-    puts $f1 "exit 1"
-    close $f1
-    set in [open "|[list $tcltest pipe]" r+]
-    set out [open test1 w]
-    fcopy $in $out -command [list FcopyTestDone]
-    if ![info exists fcopyTestDone] {
-	vwait fcopyTestDone
-    }
-    catch {close $in}
-    close $out
-    set fcopyTestDone	;# 0 for plain end of file
-} {0}
-
-test io-54.1 {Recursive channel events} {socket} {
-    # This test checks to see if file events are delivered during recursive
-    # event loops when there is buffered data on the channel.
-
-    proc accept {s a p} {
-	global as
-	fconfigure $s -translation lf
-	puts $s "line 1\nline2\nline3"
-	flush $s
-	set as $s
-    }
-    proc readit {s next} {
-	global result x
-	lappend result $next
-	if {$next == 1} {
-	    fileevent $s readable [list readit $s 2]
-	    vwait x
-	}
-	incr x
-    }
-    set ss [socket -server accept 2828]
-
-    # We need to delay on some systems until the creation of the
-    # server socket completes.
-
-    set done 0
-    for {set i 0} {$i < 10} {incr i} {
-	if {![catch {set cs [socket [info hostname] 2828]}]} {
-	    set done 1
-	    break
-	}
-	after 100
-    }
-    if {$done == 0} {
-	close $ss
-	error "failed to connect to server"
-    }
-    set result {}
-    set x 0
-    vwait as
-    fconfigure $cs -translation lf
-    lappend result [gets $cs]
-    fconfigure $cs -blocking off
-    fileevent $cs readable [list readit $cs 1]
-    set a [after 2000 { set x failure }]
-    vwait x
-    after cancel $a
-    close $as
-    close $ss
-    close $cs
-    list $result $x
-} {{{line 1} 1 2} 2}
-test io-54.2 {Testing for busy-wait in recursive channel events} {socket} {
-    set accept {}
-    set after {}
-    set s [socket -server accept 3939]
-    proc accept {s a p} {
-	global counter accept
-
-	set accept $s
-	set counter 0
-	fconfigure $s -blocking off -buffering line -translation lf
-	fileevent $s readable "doit $s"
-    }
-    proc doit {s} {
-	global counter after
-
-	incr counter
-	set l [gets $s]
-	if {"$l" == ""} {
-	    fileevent $s readable "doit1 $s"
-	    set after [after 1000 newline]
-	}
-    }
-    proc doit1 {s} {
-	global counter accept
-
-	incr counter
-	set l [gets $s]
-	close $s
-	set accept {}
-    }
-    proc producer {} {
-	global writer
-
-	set writer [socket 127.0.0.1 3939]
-	fconfigure $writer -buffering line
-	puts -nonewline $writer hello
-	flush $writer
-    }
-    proc newline {} {
-	global writer done
-
-	puts $writer hello
-	flush $writer
-	set done 1
-    }
-    producer
-    vwait done
-    close $writer
-    close $s
-    after cancel $after
-    if {$accept != {}} {close $accept}
-    set counter
-} 1
-
-test io-55.1 {ChannelEventScriptInvoker: deletion} {
-    proc eventScript {fd} {
-	close $fd
-	error "planned error"
-	set ::x whoops
-    }
-    proc bgerror {args} {
-	set ::x got_error
-    }
-    set f [open fooBar w]
-    fileevent $f writable [list eventScript $f]
-    set x not_done
-    vwait x
-    set x
-} {got_error}
-
-test io-56.1 {ChannelTimerProc} {
-    set f [open fooBar w]
-    puts $f "this is a test"
-    close $f
-    set f [open fooBar r]
-    testchannelevent $f add readable {
-	read $f 1
-	incr x
-    }
-    set x 0
-    vwait x
-    vwait x
-    set result $x
-    testchannelevent $f set 0 none
-    after idle {set y done}
-    vwait y
-    close $f
-    lappend result $y
-} {2 done}
-
-test io-57.1 {buffered data and file events, gets} {
-    proc accept {sock args} {
-	set ::s2 $sock
-    }
-    set server [socket -server accept 4040]
-    set s [socket 127.0.0.1 4040]
-    vwait s2
-    update
-    fileevent $s2 readable {lappend result readable}
-    puts $s "12\n34567890"
-    flush $s
-    set result [gets $s2]
-    after 1000 {lappend result timer}
-    vwait result
-    lappend result [gets $s2]
-    vwait result
-    close $s
-    close $s2
-    close $server
-    set result
-} {12 readable 34567890 timer}
-test io-57.2 {buffered data and file events, read} {
-    proc accept {sock args} {
-	set ::s2 $sock
-    }
-    set server [socket -server accept 4041]
-    set s [socket 127.0.0.1 4041]
-    vwait s2
-    update
-    fileevent $s2 readable {lappend result readable}
-    puts -nonewline $s "1234567890"
-    flush $s
-    set result [read $s2 1]
-    after 1000 {lappend result timer}
-    vwait result
-    lappend result [read $s2 9]
-    vwait result
-    close $s
-    close $s2
-    close $server
-    set result
-} {1 readable 234567890 timer}
-        
-test io-58.1 {Tcl_NotifyChannel and error when closing} {unixOrPc} {
-    set out [open script w]
-    puts $out {
-	puts "normal message from pipe"
-	puts stderr "error message from pipe"
-	exit 1
-    }
-    proc readit {pipe} {
-	global x result
-	if {[eof $pipe]} {
-	    set x [catch {close $pipe} line]
-	    lappend result catch $line
-	} else {
-	    gets $pipe line
-	    lappend result gets $line
-	}
-    }
-    close $out
-    set pipe [open "|[list $tcltest] script" r]
-    fileevent $pipe readable [list readit $pipe]
-    set x ""
-    set result ""
-    vwait x
-    list $x $result
-} {1 {gets {normal message from pipe} gets {} catch {error message from pipe}}}
-
-# cleanup
-foreach file [list fooBar longfile script output test1 pipe my_script foo \
-	bar test2 test3 cat stdout] {
-    ::tcltest::removeFile $file
-}
-restoreState
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
deleted file mode 100644
index 1937c5d..0000000
--- a/tests/ioCmd.test
+++ /dev/null
@@ -1,528 +0,0 @@
-# Commands covered: open, close, gets, read, puts, seek, tell, eof, flush,
-#		    fblocked, fconfigure, open, channel, fcopy
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: ioCmd.test,v 1.3 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-removeFile test1
-removeFile pipe
-
-set executable [list [info nameofexecutable]]
-
-test iocmd-1.1 {puts command} {
-   list [catch {puts} msg] $msg
-} {1 {wrong # args: should be "puts ?-nonewline? ?channelId? string"}}
-test iocmd-1.2 {puts command} {
-   list [catch {puts a b c d e f g} msg] $msg
-} {1 {wrong # args: should be "puts ?-nonewline? ?channelId? string"}}
-test iocmd-1.3 {puts command} {
-   list [catch {puts froboz -nonewline kablooie} msg] $msg
-} {1 {bad argument "kablooie": should be "nonewline"}}
-test iocmd-1.4 {puts command} {
-   list [catch {puts froboz hello} msg] $msg
-} {1 {can not find channel named "froboz"}}
-test iocmd-1.5 {puts command} {
-   list [catch {puts stdin hello} msg] $msg
-} {1 {channel "stdin" wasn't opened for writing}}
-test iocmd-1.6 {puts command} {
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts -nonewline $f foobar
-    close $f
-    file size test1
-} 6
-test iocmd-1.7 {puts command} {
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts $f foobar
-    close $f
-    file size test1
-} 7
-test iocmd-1.8 {puts command} {
-    set f [open test1 w]
-    fconfigure $f -translation lf -eofchar {}
-    puts -nonewline $f [binary format a4a5 foo bar]
-    close $f
-    file size test1
-} 9
-
-
-test iocmd-2.1 {flush command} {
-   list [catch {flush} msg] $msg
-} {1 {wrong # args: should be "flush channelId"}}
-test iocmd-2.2 {flush command} {
-   list [catch {flush a b c d e} msg] $msg
-} {1 {wrong # args: should be "flush channelId"}}
-test iocmd-2.3 {flush command} {
-   list [catch {flush foo} msg] $msg
-} {1 {can not find channel named "foo"}}
-test iocmd-2.4 {flush command} {
-   list [catch {flush stdin} msg] $msg
-} {1 {channel "stdin" wasn't opened for writing}}
-
-test iocmd-3.1 {gets command} {
-   list [catch {gets} msg] $msg
-} {1 {wrong # args: should be "gets channelId ?varName?"}}
-test iocmd-3.2 {gets command} {
-   list [catch {gets a b c d e f g} msg] $msg
-} {1 {wrong # args: should be "gets channelId ?varName?"}}
-test iocmd-3.3 {gets command} {
-   list [catch {gets aaa} msg] $msg
-} {1 {can not find channel named "aaa"}}
-test iocmd-3.4 {gets command} {
-   list [catch {gets stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-test iocmd-3.5 {gets command} {
-    set f [open test1 w]
-    puts $f [binary format a4a5 foo bar]
-    close $f
-    set f [open test1 r]
-    set result [gets $f]
-    close $f
-    set x foo\x00
-    set x "${x}bar\x00\x00"
-    string compare $x $result
-} 0
-
-test iocmd-4.1 {read command} {
-   list [catch {read} msg] $msg
-} {1 {wrong # args: should be "read channelId ?numBytes?" or "read ?-nonewline? channelId"}}
-test iocmd-4.2 {read command} {
-   list [catch {read a b c d e f g h} msg] $msg
-} {1 {wrong # args: should be "read channelId ?numBytes?" or "read ?-nonewline? channelId"}}
-test iocmd-4.3 {read command} {
-   list [catch {read aaa} msg] $msg
-} {1 {can not find channel named "aaa"}}
-test iocmd-4.4 {read command} {
-   list [catch {read -nonewline} msg] $msg
-} {1 {wrong # args: should be "read channelId ?numBytes?" or "read ?-nonewline? channelId"}}
-test iocmd-4.5 {read command} {
-   list [catch {read -nonew file4} msg] $msg $errorCode
-} {1 {can not find channel named "-nonew"} NONE}
-test iocmd-4.6 {read command} {
-   list [catch {read stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-test iocmd-4.7 {read command} {
-   list [catch {read -nonewline stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-test iocmd-4.8 {read command with incorrect combination of arguments} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f "Two lines: this one"
-    puts $f "and this one"
-    close $f
-    set f [open test1]
-    set x [list [catch {read -nonewline $f 20 z} msg] $msg $errorCode]
-    close $f
-    set x
-} {1 {wrong # args: should be "read channelId ?numBytes?" or "read ?-nonewline? channelId"} NONE}
-test iocmd-4.9 {read command} {
-    list [catch {read stdin foo} msg] $msg $errorCode
-} {1 {bad argument "foo": should be "nonewline"} NONE}
-test iocmd-4.10 {read command} {
-    list [catch {read file107} msg] $msg $errorCode
-} {1 {can not find channel named "file107"} NONE}
-test iocmd-4.11 {read command} {
-    set f [open test3 w]
-    set x [list [catch {read $f} msg] $msg $errorCode]
-    close $f
-    string compare [string tolower $x] \
-	[list 1 [format "channel \"%s\" wasn't opened for reading" $f] none]
-} 0
-test iocmd-4.12 {read command} {
-    set f [open test1]
-    set x [list [catch {read $f 12z} msg] $msg $errorCode]
-    close $f
-    set x
-} {1 {expected integer but got "12z"} NONE}
-
-test iocmd-5.1 {seek command} {
-    list [catch {seek} msg] $msg
-} {1 {wrong # args: should be "seek channelId offset ?origin?"}}
-test iocmd-5.2 {seek command} {
-    list [catch {seek a b c d e f g} msg] $msg
-} {1 {wrong # args: should be "seek channelId offset ?origin?"}}
-test iocmd-5.3 {seek command} {
-    list [catch {seek stdin gugu} msg] $msg
-} {1 {expected integer but got "gugu"}}
-test iocmd-5.4 {seek command} {
-    list [catch {seek stdin 100 gugu} msg] $msg
-} {1 {bad origin "gugu": must be start, current, or end}}
-
-test iocmd-6.1 {tell command} {
-    list [catch {tell} msg] $msg
-} {1 {wrong # args: should be "tell channelId"}}
-test iocmd-6.2 {tell command} {
-    list [catch {tell a b c d e} msg] $msg
-} {1 {wrong # args: should be "tell channelId"}}
-test iocmd-6.3 {tell command} {
-    list [catch {tell aaa} msg] $msg
-} {1 {can not find channel named "aaa"}}
-
-test iocmd-7.1 {close command} {
-    list [catch {close} msg] $msg
-} {1 {wrong # args: should be "close channelId"}}
-test iocmd-7.2 {close command} {
-    list [catch {close a b c d e} msg] $msg
-} {1 {wrong # args: should be "close channelId"}}
-test iocmd-7.3 {close command} {
-    list [catch {close aaa} msg] $msg
-} {1 {can not find channel named "aaa"}}
-
-test iocmd-8.1 {fconfigure command} {
-    list [catch {fconfigure} msg] $msg
-} {1 {wrong # args: should be "fconfigure channelId ?optionName? ?value? ?optionName value?..."}}
-test iocmd-8.2 {fconfigure command} {
-    list [catch {fconfigure a b c d e f} msg] $msg
-} {1 {wrong # args: should be "fconfigure channelId ?optionName? ?value? ?optionName value?..."}}
-test iocmd-8.3 {fconfigure command} {
-    list [catch {fconfigure a b} msg] $msg
-} {1 {can not find channel named "a"}}
-test iocmd-8.4 {fconfigure command} {
-    removeFile test1
-    set f1 [open test1 w]
-    set x [list [catch {fconfigure $f1 froboz} msg] $msg]
-    close $f1
-    set x
-} {1 {bad option "froboz": should be one of -blocking, -buffering, -buffersize, -eofchar, or -translation}}
-test iocmd-8.5 {fconfigure command} {
-    list [catch {fconfigure stdin -buffering froboz} msg] $msg
-} {1 {bad value for -buffering: must be one of full, line, or none}}
-test iocmd-8.6 {fconfigure command} {
-    list [catch {fconfigure stdin -translation froboz} msg] $msg
-} {1 {bad value for -translation: must be one of auto, binary, cr, lf, crlf, or platform}}
-test iocmd-8.7 {fconfigure command} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -eofchar {} -encoding unicode
-    set x [fconfigure $f1]
-    close $f1
-    set x
-} {-blocking 1 -buffering full -buffersize 4096 -encoding unicode -eofchar {} -translation lf}
-test iocmd-8.8 {fconfigure command} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation lf -buffering line -buffersize 3030 \
-		-eofchar {} -encoding unicode
-    set x ""
-    lappend x [fconfigure $f1 -buffering]
-    lappend x [fconfigure $f1]
-    close $f1
-    set x
-} {line {-blocking 1 -buffering line -buffersize 3030 -encoding unicode -eofchar {} -translation lf}}
-test iocmd-8.9 {fconfigure command} {
-    removeFile test1
-    set f1 [open test1 w]
-    fconfigure $f1 -translation binary -buffering none -buffersize 4040 \
-		-eofchar {} -encoding binary
-    set x [fconfigure $f1]
-    close $f1
-    set x
-} {-blocking 1 -buffering none -buffersize 4040 -encoding binary -eofchar {} -translation lf}
-test iocmd-8.10 {fconfigure command} {
-    list [catch {fconfigure a b} msg] $msg
-} {1 {can not find channel named "a"}}
-test iocmd-8.11 {fconfigure command} {
-    list [catch {fconfigure stdout -froboz blarfo} msg] $msg
-} {1 {bad option "-froboz": should be one of -blocking, -buffering, -buffersize, -eofchar, or -translation}}
-test iocmd-8.12 {fconfigure command} {
-    list [catch {fconfigure stdout -b blarfo} msg] $msg
-} {1 {bad option "-b": should be one of -blocking, -buffering, -buffersize, -eofchar, or -translation}}
-test iocmd-8.13 {fconfigure command} {
-    list [catch {fconfigure stdout -buffer blarfo} msg] $msg
-} {1 {bad option "-buffer": should be one of -blocking, -buffering, -buffersize, -eofchar, or -translation}}
-test iocmd-8.14 {fconfigure command} {
-    fconfigure stdin -buffers
-} 4096
-proc iocmdSSETUP {} {
-  uplevel {
-	set srv [socket -server iocmdSRV 0];
-	set port [lindex [fconfigure $srv -sockname] 2];
-	proc iocmdSRV {sock ip port} {close $sock}
-	set cli [socket 127.0.0.1 $port];
-  }
-}
-proc iocmdSSHTDWN {} {
-  uplevel {
-	close $cli;
-	close $srv;
-	unset cli srv port
-	rename iocmdSRV {}
-  }
-}
-
-test iocmd-8.15 {fconfigure command / tcp channel} {socket} {
-	iocmdSSETUP
-	set r [list [catch {fconfigure $cli -blah} msg] $msg];
-	iocmdSSHTDWN
-	set r;
-} {1 {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -eofchar, -translation, -peername, or -sockname}}
-test iocmd-8.16 {fconfigure command / tcp channel} {socket} {
-	iocmdSSETUP
-	set r [expr [lindex [fconfigure $cli -peername] 2]==$port];
-	iocmdSSHTDWN
-	set r
-} 1
-test iocmd-8.17 {fconfigure command / tcp channel} {nonPortable} {
-	# It is possible that you don't get the connection reset by peer
-        # error but rather a valid answer. depends of the tcp implementation
-	iocmdSSETUP
-	update;
-	puts $cli "blah"; flush $cli; # that flush could/should fail too
-	update;
-	set r [catch {fconfigure $cli -peername} msg]
-	iocmdSSHTDWN
-	regsub -all {can([^:])+: } $r {} r;
-	set r
-} 1
-test iocmd-8.18 {fconfigure command / unix tty channel} {nonPortable unixOnly} {
-	# might fail if /dev/ttya is unavailable
-	set tty [open /dev/ttya]
-	set r [list [catch {fconfigure $tty -blah blih} msg] $msg];
-	close $tty;
-	set r;
-} {1 {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -eofchar, -translation, or -mode}}
-test iocmd-8.19 {fconfigure command / win tty channel} {nonPortable pcOnly} {
-	# might fail if com1 is unavailable
-	set tty [open com1]
-	set r [list [catch {fconfigure $tty -blah blih} msg] $msg];
-	close $tty;
-	set r;
-} {1 {bad option "-blah": should be one of -blocking, -buffering, -buffersize, -eofchar, -translation, or -mode}}
-
-test iocmd-9.1 {eof command} {
-    list [catch {eof} msg] $msg $errorCode
-} {1 {wrong # args: should be "eof channelId"} NONE}
-test iocmd-9.2 {eof command} {
-    list [catch {eof a b} msg] $msg $errorCode
-} {1 {wrong # args: should be "eof channelId"} NONE}
-test iocmd-9.3 {eof command} {
-    catch {close file100}
-    list [catch {eof file100} msg] $msg $errorCode
-} {1 {can not find channel named "file100"} NONE}
-
-# The tests for Tcl_ExecObjCmd are in exec.test
-
-test iocmd-10.1 {fblocked command} {
-    list [catch {fblocked} msg] $msg
-} {1 {wrong # args: should be "fblocked channelId"}}
-test iocmd-10.2 {fblocked command} {
-    list [catch {fblocked a b c d e f g} msg] $msg
-} {1 {wrong # args: should be "fblocked channelId"}}
-test iocmd-10.3 {fblocked command} {
-    list [catch {fblocked file1000} msg] $msg
-} {1 {can not find channel named "file1000"}}
-test iocmd-10.4 {fblocked command} {
-    list [catch {fblocked stdout} msg] $msg
-} {1 {channel "stdout" wasn't opened for reading}}
-test iocmd-10.5 {fblocked command} {
-    fblocked stdin
-} 0
-
-removeFile test5
-test iocmd-11.1 {I/O to command pipelines} {unixOrPc unixExecs} {
-    set f [open test4 w]
-    close $f
-    list [catch {open "| cat < test4 > test5" w} msg] $msg $errorCode
-} {1 {can't write input to command: standard input was redirected} NONE}
-test iocmd-11.2 {I/O to command pipelines} {unixOrPc unixExecs} {
-    list [catch {open "| echo > test5" r} msg] $msg $errorCode
-} {1 {can't read output from command: standard output was redirected} NONE}
-test iocmd-11.3 {I/O to command pipelines} {unixOrPc unixExecs} {
-    list [catch {open "| echo > test5" r+} msg] $msg $errorCode
-} {1 {can't read output from command: standard output was redirected} NONE}
-
-test iocmd-12.1 {POSIX open access modes: RDONLY} {
-    removeFile test1
-    set f [open test1 w]
-    puts $f "Two lines: this one"
-    puts $f "and this one"
-    close $f
-    set f [open test1 RDONLY]
-    set x [list [gets $f] [catch {puts $f Test} msg] $msg]
-    close $f
-    string compare $x \
-	"{Two lines: this one} 1 [list [format "channel \"%s\" wasn't opened for writing" $f]]"
-} 0
-test iocmd-12.2 {POSIX open access modes: RDONLY} {
-    removeFile test3
-    string tolower [list [catch {open test3 RDONLY} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-test iocmd-12.3 {POSIX open access modes: WRONLY} {
-    removeFile test3
-    string tolower [list [catch {open test3 WRONLY} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-#
-# Test 13.4 relies on assigning the same channel name twice.
-#
-test iocmd-12.4 {POSIX open access modes: WRONLY} {unixOnly} {
-    removeFile test3
-    set f [open test3 w]
-    fconfigure $f -eofchar {}
-    puts $f xyzzy
-    close $f
-    set f [open test3 WRONLY]
-    fconfigure $f -eofchar {}
-    puts -nonewline $f "ab"
-    seek $f 0 current
-    set x [list [catch {gets $f} msg] $msg]
-    close $f
-    set f [open test3 r]
-    fconfigure $f -eofchar {}
-    lappend x [gets $f]
-    close $f
-    set y [list 1 [format "channel \"%s\" wasn't opened for reading" $f] abzzy]
-    string compare $x $y
-} 0
-test iocmd-12.5 {POSIX open access modes: RDWR} {
-    removeFile test3
-    string tolower [list [catch {open test3 RDWR} msg] $msg]
-} {1 {couldn't open "test3": no such file or directory}}
-test iocmd-12.6 {POSIX open access modes: errors} {
-    concat [catch {open test3 "FOO \{BAR BAZ"} msg] $msg\n$errorInfo
-} "1 unmatched open brace in list
-unmatched open brace in list
-    while processing open access modes \"FOO {BAR BAZ\"
-    invoked from within
-\"open test3 \"FOO \\{BAR BAZ\"\""
-test iocmd-12.7 {POSIX open access modes: errors} {
-  list [catch {open test3 {FOO BAR BAZ}} msg] $msg
-} {1 {invalid access mode "FOO": must be RDONLY, WRONLY, RDWR, APPEND, CREAT EXCL, NOCTTY, NONBLOCK, or TRUNC}}
-test iocmd-12.8 {POSIX open access modes: errors} {
-    list [catch {open test3 {TRUNC CREAT}} msg] $msg
-} {1 {access mode must include either RDONLY, WRONLY, or RDWR}}
-
-test iocmd-13.1 {errors in open command} {
-    list [catch {open} msg] $msg
-} {1 {wrong # args: should be "open fileName ?access? ?permissions?"}}
-test iocmd-13.2 {errors in open command} {
-    list [catch {open a b c d} msg] $msg
-} {1 {wrong # args: should be "open fileName ?access? ?permissions?"}}
-test iocmd-13.3 {errors in open command} {
-    list [catch {open test1 x} msg] $msg
-} {1 {illegal access mode "x"}}
-test iocmd-13.4 {errors in open command} {
-    list [catch {open test1 rw} msg] $msg
-} {1 {illegal access mode "rw"}}
-test iocmd-13.5 {errors in open command} {
-    list [catch {open test1 r+1} msg] $msg
-} {1 {illegal access mode "r+1"}}
-test iocmd-13.6 {errors in open command} {
-    string tolower [list [catch {open _non_existent_} msg] $msg $errorCode]
-} {1 {couldn't open "_non_existent_": no such file or directory} {posix enoent {no such file or directory}}}
-
-test iocmd-14.1 {file id parsing errors} {
-    list [catch {eof gorp} msg] $msg $errorCode
-} {1 {can not find channel named "gorp"} NONE}
-test iocmd-14.2 {file id parsing errors} {
-    list [catch {eof filex} msg] $msg
-} {1 {can not find channel named "filex"}}
-test iocmd-14.3 {file id parsing errors} {
-    list [catch {eof file12a} msg] $msg
-} {1 {can not find channel named "file12a"}}
-test iocmd-14.4 {file id parsing errors} {
-    list [catch {eof file123} msg] $msg
-} {1 {can not find channel named "file123"}}
-test iocmd-14.5 {file id parsing errors} {
-    list [catch {eof stdout} msg] $msg
-} {0 0}
-test iocmd-14.6 {file id parsing errors} {
-    list [catch {eof stdin} msg] $msg
-} {0 0}
-test iocmd-14.7 {file id parsing errors} {
-    list [catch {eof stdout} msg] $msg
-} {0 0}
-test iocmd-14.8 {file id parsing errors} {
-    list [catch {eof stderr} msg] $msg
-} {0 0}
-test iocmd-14.9 {file id parsing errors} {
-    list [catch {eof stderr1} msg] $msg
-} {1 {can not find channel named "stderr1"}}
-set f [open test1 w]
-close $f
-set expect "1 {can not find channel named \"$f\"}"
-test iocmd-14.10 {file id parsing errors} {
-    list [catch {eof $f} msg] $msg
-} $expect
-
-test iocmd-15.1 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy} msg] $msg
-} {1 {wrong # args: should be "fcopy input output ?-size size? ?-command callback?"}}
-test iocmd-15.2 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy 1} msg] $msg
-} {1 {wrong # args: should be "fcopy input output ?-size size? ?-command callback?"}}
-test iocmd-15.3 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy 1 2 3 4 5 6 7} msg] $msg
-} {1 {wrong # args: should be "fcopy input output ?-size size? ?-command callback?"}}
-test iocmd-15.4 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy 1 2 3} msg] $msg
-} {1 {wrong # args: should be "fcopy input output ?-size size? ?-command callback?"}}
-test iocmd-15.5 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy 1 2 3 4 5} msg] $msg
-} {1 {wrong # args: should be "fcopy input output ?-size size? ?-command callback?"}}
-set f [open test1 w]
-close $f
-set rfile [open test1 r]
-set wfile [open test2 w]
-test iocmd-15.6 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy foo $wfile} msg] $msg
-} {1 {can not find channel named "foo"}}
-test iocmd-15.7 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $rfile foo} msg] $msg
-} {1 {can not find channel named "foo"}}
-test iocmd-15.8 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $wfile $wfile} msg] $msg
-} "1 {channel \"$wfile\" wasn't opened for reading}"
-test iocmd-15.9 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $rfile $rfile} msg] $msg
-} "1 {channel \"$rfile\" wasn't opened for writing}"
-test iocmd-15.10 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $rfile $wfile foo bar} msg] $msg
-} {1 {bad switch "foo": must be -size or -command}}
-test iocmd-15.11 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $rfile $wfile -size foo} msg] $msg
-} {1 {expected integer but got "foo"}}
-test iocmd-15.12 {Tcl_FcopyObjCmd} {
-    list [catch {fcopy $rfile $wfile -command bar -size foo} msg] $msg
-} {1 {expected integer but got "foo"}}
-
-close $rfile
-close $wfile
-
-# cleanup
-foreach file [list test1 test2 test3 test4] {
-    ::tcltest::removeFile $file
-}
-# delay long enough for background processes to finish
-after 500
-foreach file [list test5 pipe output] {
-    ::tcltest::removeFile $file
-}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/ioUtil.test b/tests/ioUtil.test
deleted file mode 100644
index 5bb8c35..0000000
--- a/tests/ioUtil.test
+++ /dev/null
@@ -1,318 +0,0 @@
-# This file (ioUtil.test) tests the hookable TclStat(), TclAccess(),
-# and Tcl_OpenFileChannel, routines in the file generic/tclIOUtils.c.
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found. 
-# 
-# Copyright (c) 1998-1999 by Scriptics Corporation. 
-# 
-# See the file "license.terms" for information on usage and redistribution 
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES. 
-# 
-# RCS: @(#) $Id: ioUtil.test,v 1.6 1999/04/16 00:47:29 stanton Exp $
- 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set unsetScript {
-    catch {unset testStat1(size)}
-    catch {unset testStat2(size)}
-    catch {unset testStat3(size)}
-}
-
-test ioUtil-1.1 {TclStat: Check that none of the test procs are there.} {knownBug} {
-    catch {file stat testStat1%.fil testStat1} err1
-    catch {file stat testStat2%.fil testStat2} err2
-    catch {file stat testStat3%.fil testStat3} err3
-    list $err1 $err2 $err3
-} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} {couldn't stat "testStat3%.fil": no such file or directory}}
-
-if {[info commands teststatproc] == {}} {
-    puts "This application hasn't been compiled with the \"teststatproc\""
-    puts "command, so I can't test Tcl_Stat_* etc."
-} else {
-test ioUtil-1.2 {TclStatInsertProc: Insert the 3 test TclStat_ procedures.} {
-    catch {teststatproc insert TclpStat} err1
-    teststatproc insert TestStatProc1
-    teststatproc insert TestStatProc2
-    teststatproc insert TestStatProc3
-    set err1
-} {bad arg "insert": must be TestStatProc1, TestStatProc2, or TestStatProc3}
-
-test ioUtil-1.3 {TclStat: Use "file stat ?" to invoke each procedure.} {knownBug} {
-    file stat testStat2%.fil testStat2
-    file stat testStat1%.fil testStat1
-    file stat testStat3%.fil testStat3
-
-    list $testStat2(size) $testStat1(size) $testStat3(size)
-} {2345 1234 3456}
-
-eval $unsetScript
-
-test ioUtil-1.4 {TclStatDeleteProc: "TclpStat" function should not be deletedable.} {
-    catch {teststatproc delete TclpStat} err2
-    set err2
-} {"TclpStat": could not be deleteed}
-
-test ioUtil-1.5 {TclStatDeleteProc: Delete the 2nd TclStat procedure.} {knownBug} {
-    # Delete the 2nd procedure and test that it longer exists but that
-    #   the others do actually return a result.
-
-    teststatproc delete TestStatProc2
-    file stat testStat1%.fil testStat1
-    catch {file stat testStat2%.fil testStat2} err3
-    file stat testStat3%.fil testStat3
-
-    list $testStat1(size) $err3 $testStat3(size)
-} {1234 {couldn't stat "testStat2%.fil": no such file or directory} 3456}
-
-eval $unsetScript
-
-test ioUtil-1.6 {TclStatDeleteProc: Delete the 1st TclStat procedure.} {knownBug} {
-    # Next delete the 1st procedure and test that only the 3rd procedure
-    #   is the only one that exists.
-
-    teststatproc delete TestStatProc1
-    catch {file stat testStat1%.fil testStat1} err4
-    catch {file stat testStat2%.fil testStat2} err5
-    file stat testStat3%.fil testStat3
-
-    list $err4 $err5 $testStat3(size)
-} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} 3456}
-
-eval $unsetScript
-
-test ioUtil-1.7 {TclStatDeleteProc: Delete the 3rd procedure & verify all are gone.} {knownBug} {
-    # Finally delete the 3rd procedure and check that none of the
-    #   procedures exist.
-
-    teststatproc delete TestStatProc3
-    catch {file stat testStat1%.fil testStat1} err6
-    catch {file stat testStat2%.fil testStat2} err7
-    catch {file stat testStat3%.fil testStat3} err8
-
-    list $err6 $err7 $err8
-} {{couldn't stat "testStat1%.fil": no such file or directory} {couldn't stat "testStat2%.fil": no such file or directory} {couldn't stat "testStat3%.fil": no such file or directory}}
-
-eval $unsetScript
-
-test ioUtil-1.8 {TclStatDeleteProc: Verify that all procs have been deleted.} {knownBug} {
-    # Attempt to delete all the Stat procs. again to ensure they no longer
-    #   exist and an error is returned.
-
-    catch {teststatproc delete TestStatProc1} err9
-    catch {teststatproc delete TestStatProc2} err10
-    catch {teststatproc delete TestStatProc3} err11
-
-    list $err9 $err10 $err11
-} {{"TestStatProc1": could not be deleteed} {"TestStatProc2": could not be deleteed} {"TestStatProc3": could not be deleteed}}
-}
-
-eval $unsetScript
-
-
-test access-1.1 {TclAccess: Check that none of the test procs are there.} {
-    catch {file exists testAccess1%.fil} err1
-    catch {file exists testAccess2%.fil} err2
-    catch {file exists testAccess3%.fil} err3
-    list $err1 $err2 $err3
-} {0 0 0}
-
-if {[info commands testaccessproc] == {}} {
-    puts "This application hasn't been compiled with the \"testaccessproc\""
-    puts "command, so I can't test Tcl_Access_* etc."
-} else {
-test ioUtil-1.2 {TclAccessInsertProc: Insert the 3 test TclAccess_ procedures.} {
-    catch {testaccessproc insert TclpAccess} err1
-    testaccessproc insert TestAccessProc1
-    testaccessproc insert TestAccessProc2
-    testaccessproc insert TestAccessProc3
-    set err1
-} {bad arg "insert": must be TestAccessProc1, TestAccessProc2, or TestAccessProc3}
-
-test ioUtil-2.3 {TclAccess: Use "file access ?" to invoke each procedure.} {
-    list \
-    	[file exists testAccess2%.fil] \
-   		[file exists testAccess1%.fil] \
-		[file exists testAccess3%.fil]
-} {1 1 1}
-
-test ioUtil-2.4 {TclAccessDeleteProc: "TclpAccess" function should not be deletedable.} {
-    catch {testaccessproc delete TclpAccess} err2
-    set err2
-} {"TclpAccess": could not be deleteed}
-
-test accesst-1.5 {TclAccessDeleteProc: Delete the 2nd TclAccess procedure.} {
-    # Delete the 2nd procedure and test that it longer exists but that
-    #   the others do actually return a result.
-
-    testaccessproc delete TestAccessProc2
-    set res1 [file exists testAccess1%.fil]
-    catch {file exists testAccess2%.fil} err3
-    set res2 [file exists testAccess3%.fil]
-
-    list $res1 $err3 $res2
-} {1 0 1}
-
-test ioUtil-2.6 {TclAccessDeleteProc: Delete the 1st TclAccess procedure.} {
-    # Next delete the 1st procedure and test that only the 3rd procedure
-    #   is the only one that exists.
-
-    testaccessproc delete TestAccessProc1
-    catch {file exists testAccess1%.fil} err4
-    catch {file exists testAccess2%.fil} err5
-    set res3 [file exists testAccess3%.fil]
-
-    list $err4 $err5 $res3
-} {0 0 1}
-
-test ioUtil-2.7 {TclAccessDeleteProc: Delete the 3rd procedure & verify all are gone.} {
-    # Finally delete the 3rd procedure and check that none of the
-    #   procedures exist.
-
-    testaccessproc delete TestAccessProc3
-    catch {file exists testAccess1%.fil} err6
-    catch {file exists testAccess2%.fil} err7
-    catch {file exists testAccess3%.fil} err8
-
-    list $err6 $err7 $err8
-} {0 0 0}
-
-test ioUtil-2.8 {TclAccessDeleteProc: Verify that all procs have been deleted.} {
-    # Attempt to delete all the Access procs. again to ensure they no longer
-    #   exist and an error is returned.
-
-    catch {testaccessproc delete TestAccessProc1} err9
-    catch {testaccessproc delete TestAccessProc2} err10
-    catch {testaccessproc delete TestAccessProc3} err11
-
-    list $err9 $err10 $err11
-} {{"TestAccessProc1": could not be deleteed} {"TestAccessProc2": could not be deleteed} {"TestAccessProc3": could not be deleteed}}
-}
-
-test ioUtil-3.1 {TclOpenFileChannel: Check that none of the test procs are there.} {
-    catch {file exists __testOpenFileChannel1%__.fil} err1
-    catch {file exists __testOpenFileChannel2%__.fil} err2
-    catch {file exists __testOpenFileChannel3%__.fil} err3
-    catch {file exists __testOpenFileChannel1%__.fil} err4
-    catch {file exists __testOpenFileChannel2%__.fil} err5
-    catch {file exists __testOpenFileChannel3%__.fil} err6
-    list $err1 $err2 $err3 $err4 $err5 $err6
-} {0 0 0 0 0 0}
-
-if {[info commands testopenfilechannelproc] == {}} {
-    puts "This application hasn't been compiled with the \"testopenfilechannelproc\""
-    puts "command, so I can't test Tcl_OpenFileChannelInsert"
-} else {
-test ioUtil-3.2 {TclOpenFileChannelInsertProc: Insert the 3 test TclOpenFileChannel_ procedures.} {
-    catch {testopenfilechannelproc insert TclpOpenFileChannel} err1
-    testopenfilechannelproc insert TestOpenFileChannelProc1
-    testopenfilechannelproc insert TestOpenFileChannelProc2
-    testopenfilechannelproc insert TestOpenFileChannelProc3
-    set err1
-} {bad arg "insert": must be TestOpenFileChannelProc1, TestOpenFileChannelProc2, or TestOpenFileChannelProc3}
-
-test ioUtil-3.3 {TclOpenFileChannel: Use "file openfilechannel ?" to invoke each procedure.} {
-	close [open __testOpenFileChannel1%__.fil w]
-	close [open __testOpenFileChannel2%__.fil w]
-	close [open __testOpenFileChannel3%__.fil w]
-
-	catch {
-		close [open testOpenFileChannel1%.fil r]
-		close [open testOpenFileChannel2%.fil r]
-		close [open testOpenFileChannel3%.fil r]
-	} err
-
-	file delete __testOpenFileChannel1%__.fil
-	file delete __testOpenFileChannel2%__.fil
-	file delete __testOpenFileChannel3%__.fil
-
-	set err
-} {}
-
-test ioUtil-3.4 {TclOpenFileChannelDeleteProc: "TclpOpenFileChannel" function should not be deletedable.} {
-    catch {testopenfilechannelproc delete TclpOpenFileChannel} err2
-    set err2
-} {"TclpOpenFileChannel": could not be deleteed}
-
-test openfilechannelt-1.5 {TclOpenFileChannelDeleteProc: Delete the 2nd TclOpenFileChannel procedure.} {
-    # Delete the 2nd procedure and test that it longer exists but that
-    #   the others do actually return a result.
-
-    testopenfilechannelproc delete TestOpenFileChannelProc2
-
-	close [open __testOpenFileChannel1%__.fil w]
-	close [open __testOpenFileChannel3%__.fil w]
-
-	catch {
-		close [open testOpenFileChannel1%.fil r]
-		catch {close [open testOpenFileChannel2%.fil r]}
-		close [open testOpenFileChannel3%.fil r]
-	} err3
-
-	file delete __testOpenFileChannel1%__.fil
-	file delete __testOpenFileChannel3%__.fil
-
-    set err3
-} {}
-
-test ioUtil-3.6 {TclOpenFileChannelDeleteProc: Delete the 1st TclOpenFileChannel procedure.} {
-    # Next delete the 1st procedure and test that only the 3rd procedure
-    #   is the only one that exists.
-
-    testopenfilechannelproc delete TestOpenFileChannelProc1
-
-	close [open __testOpenFileChannel3%__.fil w]
-
-	catch {
-		catch {close [open testOpenFileChannel1%.fil r]}
-		catch {close [open testOpenFileChannel2%.fil r]}
-		close [open testOpenFileChannel3%.fil r]
-	} err4
-
-	file delete __testOpenFileChannel3%__.fil
-
-    set err4
-} {}
-
-test ioUtil-3.7 {TclOpenFileChannelDeleteProc: Delete the 3rd procedure & verify all are gone.} {
-    # Finally delete the 3rd procedure and check that none of the
-    #   procedures exist.
-
-    testopenfilechannelproc delete TestOpenFileChannelProc3
-	catch {
-		catch [open testOpenFileChannel1%.fil r]
-		catch [open testOpenFileChannel2%.fil r]
-		catch [open testOpenFileChannel3%.fil r]
-	} err5
-
-    set err5
-} {1}
-
-test ioUtil-3.8 {TclOpenFileChannelDeleteProc: Verify that all procs have been deleted.} {
-    # Attempt to delete all the OpenFileChannel procs. again to ensure they no longer
-    #   exist and an error is returned.
-
-    catch {testopenfilechannelproc delete TestOpenFileChannelProc1} err9
-    catch {testopenfilechannelproc delete TestOpenFileChannelProc2} err10
-    catch {testopenfilechannelproc delete TestOpenFileChannelProc3} err11
-
-    list $err9 $err10 $err11
-} {{"TestOpenFileChannelProc1": could not be deleteed} {"TestOpenFileChannelProc2": could not be deleteed} {"TestOpenFileChannelProc3": could not be deleteed}}
-}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/join.test b/tests/join.test
deleted file mode 100644
index 6194c7d..0000000
--- a/tests/join.test
+++ /dev/null
@@ -1,65 +0,0 @@
-# Commands covered:  join
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: join.test,v 1.3 1999/04/16 00:47:29 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test join-1.1 {basic join commands} {
-    join {a b c} xyz
-} axyzbxyzc
-test join-1.2 {basic join commands} {
-    join {a b c} {}
-} abc
-test join-1.3 {basic join commands} {
-    join {} xyz
-} {}
-test join-1.4 {basic join commands} {
-    join {12 34 56}
-} {12 34 56}
-
-test join-2.1 {join errors} {
-    list [catch join msg] $msg $errorCode
-} {1 {wrong # args: should be "join list ?joinString?"} NONE}
-test join-2.2 {join errors} {
-    list [catch {join a b c} msg] $msg $errorCode
-} {1 {wrong # args: should be "join list ?joinString?"} NONE}
-test join-2.3 {join errors} {
-    list [catch {join "a \{ c" 111} msg] $msg $errorCode
-} {1 {unmatched open brace in list} NONE}
-
-test join-3.1 {joinString is binary ok} {
-  string length [join {a b c} a\0b]
-} 9
-
-test join-3.2 {join is binary ok} {
-  string length [join "a\0b a\0b a\0b"]
-} 11
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/lindex.test b/tests/lindex.test
deleted file mode 100644
index c7e5fb8..0000000
--- a/tests/lindex.test
+++ /dev/null
@@ -1,93 +0,0 @@
-# Commands covered:  lindex
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: lindex.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test lindex-1.1 {basic tests} {
-    lindex {a b c} 0} a
-test lindex-1.2 {basic tests} {
-    lindex {a {b c d} x} 1} {b c d}
-test lindex-1.3 {basic tests} {
-    lindex {a b\ c\ d x} 1} {b c d}
-test lindex-1.4 {basic tests} {
-    lindex {a b c} 3} {}
-test lindex-1.5 {basic tests} {
-    list [catch {lindex {a b c} -1} msg] $msg
-} {0 {}}
-test lindex-1.6 {basic tests} {
-    lindex {a b c d} end
-} d
-test lindex-1.7 {basic tests} {
-    lindex {a b c d} 100
-} {}
-test lindex-1.8 {basic tests} {
-    lindex {a} e
-} a
-test lindex-1.9 {basic tests} {
-    lindex {} end
-} {}
-test lindex-1.10 {basic tests} {
-    lindex {a b c d} 3
-} d
-
-test lindex-2.1 {error conditions} {
-    list [catch {lindex msg} msg] $msg
-} {1 {wrong # args: should be "lindex list index"}}
-test lindex-2.2 {error conditions} {
-    list [catch {lindex 1 2 3 4} msg] $msg
-} {1 {wrong # args: should be "lindex list index"}}
-test lindex-2.3 {error conditions} {
-    list [catch {lindex 1 2a2} msg] $msg
-} {1 {bad index "2a2": must be integer or "end"}}
-test lindex-2.4 {error conditions} {
-    list [catch {lindex "a \{" 2} msg] $msg
-} {1 {unmatched open brace in list}}
-test lindex-2.5 {error conditions} {
-    list [catch {lindex {a {b c}d e} 2} msg] $msg
-} {1 {list element in braces followed by "d" instead of space}}
-test lindex-2.6 {error conditions} {
-    list [catch {lindex {a "b c"def ghi} 2} msg] $msg
-} {1 {list element in quotes followed by "def" instead of space}}
-
-test lindex-3.1 {quoted elements} {
-    lindex {a "b c" d} 1
-} {b c}
-test lindex-3.2 {quoted elements} {
-    lindex {"{}" b c} 0
-} {{}}
-test lindex-3.3 {quoted elements} {
-    lindex {ab "c d \" x" y} 1
-} {c d " x}
-test lindex-3.4 {quoted elements} {
-    lindex {a b {c d "e} {f g"}} 2
-} {c d "e}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/link.test b/tests/link.test
deleted file mode 100644
index 4ea079c..0000000
--- a/tests/link.test
+++ /dev/null
@@ -1,255 +0,0 @@
-# Commands covered:  none
-#
-# This file contains a collection of tests for Tcl_LinkVar and related
-# library procedures.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: link.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testlink] == {}} {
-    puts "This application hasn't been compiled with the \"testlink\""
-    puts "command, so I can't test Tcl_LinkVar et al."
-    ::tcltest::cleanupTests
-    return
-}
-
-foreach i {int real bool string} {
-    catch {unset $i}
-}
-test link-1.1 {reading C variables from Tcl} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 1 1 1 1
-    list $int $real $bool $string
-} {43 1.23 1 NULL}
-test link-1.2 {reading C variables from Tcl} {
-    testlink delete
-    testlink create 1 1 1 1
-    testlink set -3 2 0 "A long string with spaces"
-    list $int $real $bool $string $int $real $bool $string
-} {-3 2.0 0 {A long string with spaces} -3 2.0 0 {A long string with spaces}}
-
-test link-2.1 {writing C variables from Tcl} {
-    testlink delete
-    testlink set 43 1.21 4 -
-    testlink create 1 1 1 1
-    set int "00721"
-    set real -10.5
-    set bool true
-    set string abcdef
-    concat [testlink get] $int $real $bool $string
-} {465 -10.5 1 abcdef 00721 -10.5 true abcdef}
-test link-2.2 {writing bad values into variables} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 1 1 1 1
-    list [catch {set int 09a} msg] $msg $int
-} {1 {can't set "int": variable must have integer value} 43}
-test link-2.3 {writing bad values into variables} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 1 1 1 1
-    list [catch {set real 1.x3} msg] $msg $real
-} {1 {can't set "real": variable must have real value} 1.23}
-test link-2.4 {writing bad values into variables} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 1 1 1 1
-    list [catch {set bool gorp} msg] $msg $bool
-} {1 {can't set "bool": variable must have boolean value} 1}
-
-test link-3.1 {read-only variables} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 0 1 1 0
-    list [catch {set int 4} msg] $msg $int \
-	[catch {set real 10.6} msg] $msg $real \
-	[catch {set bool no} msg] $msg $bool \
-	[catch {set string "new value"} msg] $msg $string
-} {1 {can't set "int": linked variable is read-only} 43 0 10.6 10.6 0 no no 1 {can't set "string": linked variable is read-only} NULL}
-test link-3.2 {read-only variables} {
-    testlink delete
-    testlink set 43 1.23 4 -
-    testlink create 1 0 0 1
-    list [catch {set int 4} msg] $msg $int \
-	[catch {set real 10.6} msg] $msg $real \
-	[catch {set bool no} msg] $msg $bool \
-	[catch {set string "new value"} msg] $msg $string
-} {0 4 4 1 {can't set "real": linked variable is read-only} 1.23 1 {can't set "bool": linked variable is read-only} 1 0 {new value} {new value}}
-
-test link-4.1 {unsetting linked variables} {
-    testlink delete
-    testlink set -6 -2.5 0 stringValue
-    testlink create 1 1 1 1
-    unset int real bool string
-    list [catch {set int} msg] $msg [catch {set real} msg] $msg \
-	    [catch {set bool} msg] $msg [catch {set string} msg] $msg
-} {0 -6 0 -2.5 0 0 0 stringValue}
-test link-4.2 {unsetting linked variables} {
-    testlink delete
-    testlink set -6 -2.1 0 stringValue
-    testlink create 1 1 1 1
-    unset int real bool string
-    set int 102
-    set real 16
-    set bool true
-    set string newValue
-    testlink get
-} {102 16.0 1 newValue}
-
-test link-5.1 {unlinking variables} {
-    testlink delete
-    testlink set -6 -2.25 0 stringValue
-    testlink delete
-    set int xx1
-    set real qrst
-    set bool bogus
-    set string 12345
-    testlink get
-} {-6 -2.25 0 stringValue}
-test link-5.2 {unlinking variables} {
-    testlink delete
-    testlink set -6 -2.25 0 stringValue
-    testlink create 1 1 1 1
-    testlink delete
-    testlink set 25 14.7 7 -
-    list $int $real $bool $string
-} {-6 -2.25 0 stringValue}
-
-test link-6.1 {errors in setting up link} {
-    testlink delete
-    catch {unset int}
-    set int(44) 1
-    list [catch {testlink create 1 1 1 1} msg] $msg
-} {1 {can't set "int": variable is array}}
-catch {unset int}
-
-test link-7.1 {access to linked variables via upvar} {
-    proc x {} {
-	upvar int y
-	unset y
-    }
-    testlink delete
-    testlink create 1 0 0 0
-    testlink set 14 {} {} {}
-    x
-    list [catch {set int} msg] $msg
-} {0 14}
-test link-7.2 {access to linked variables via upvar} {
-    proc x {} {
-	upvar int y
-	return [set y]
-    }
-    testlink delete
-    testlink create 1 0 0 0
-    testlink set 0 {} {} {}
-    set int
-    testlink set 23 {} {} {}
-    x
-    list [x] $int
-} {23 23}
-test link-7.3 {access to linked variables via upvar} {
-    proc x {} {
-	upvar int y
-	set y 44
-    }
-    testlink delete
-    testlink create 0 0 0 0
-    testlink set 11 {} {} {}
-    list [catch x msg] $msg $int
-} {1 {can't set "y": linked variable is read-only} 11}
-test link-7.4 {access to linked variables via upvar} {
-    proc x {} {
-	upvar int y
-	set y abc
-    }
-    testlink delete
-    testlink create 1 1 1 1
-    testlink set -4 {} {} {}
-    list [catch x msg] $msg $int
-} {1 {can't set "y": variable must have integer value} -4}
-test link-7.5 {access to linked variables via upvar} {
-    proc x {} {
-	upvar real y
-	set y abc
-    }
-    testlink delete
-    testlink create 1 1 1 1
-    testlink set -4 16.75 {} {}
-    list [catch x msg] $msg $real
-} {1 {can't set "y": variable must have real value} 16.75}
-test link-7.6 {access to linked variables via upvar} {
-    proc x {} {
-	upvar bool y
-	set y abc
-    }
-    testlink delete
-    testlink create 1 1 1 1
-    testlink set -4 16.3 1 {}
-    list [catch x msg] $msg $bool
-} {1 {can't set "y": variable must have boolean value} 1}
-
-test link-8.1 {Tcl_UpdateLinkedVar procedure} {
-    proc x args {
-	global x int real bool string
-	lappend x $args $int $real $bool $string
-    }
-    set x {}
-    testlink create 1 1 1 1
-    testlink set 14 -2.0 0 xyzzy
-    trace var int w x
-    testlink update 32 4.0 3 abcd
-    trace vdelete int w x
-    set x
-} {{int {} w} 32 -2.0 0 xyzzy}
-test link-8.2 {Tcl_UpdateLinkedVar procedure} {
-    proc x args {
-	global x int real bool string
-	lappend x $args $int $real $bool $string
-    }
-    set x {}
-    testlink create 1 1 1 1
-    testlink set 14 -2.0 0 xyzzy
-    testlink delete
-    trace var int w x
-    testlink update 32 4.0 6 abcd
-    trace vdelete int w x
-    set x
-} {}
-test link-8.3 {Tcl_UpdateLinkedVar procedure, read-only variable} {
-    testlink create 0 0 0 0
-    list [catch {testlink update 47 {} {} {}} msg] $msg $int
-} {0 {} 47}
-
-testlink set 0 0 0 -
-testlink delete
-foreach i {int real bool string} {
-    catch {unset $i}
-}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/linsert.test b/tests/linsert.test
deleted file mode 100644
index 5c54d92..0000000
--- a/tests/linsert.test
+++ /dev/null
@@ -1,123 +0,0 @@
-# Commands covered:  linsert
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: linsert.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset lis}
-catch {rename p ""}
-
-test linsert-1.1 {linsert command} {
-    linsert {1 2 3 4 5} 0 a
-} {a 1 2 3 4 5}
-test linsert-1.2 {linsert command} {
-    linsert {1 2 3 4 5} 1 a
-} {1 a 2 3 4 5}
-test linsert-1.3 {linsert command} {
-    linsert {1 2 3 4 5} 2 a
-} {1 2 a 3 4 5}
-test linsert-1.4 {linsert command} {
-    linsert {1 2 3 4 5} 3 a
-} {1 2 3 a 4 5}
-test linsert-1.5 {linsert command} {
-    linsert {1 2 3 4 5} 4 a
-} {1 2 3 4 a 5}
-test linsert-1.6 {linsert command} {
-    linsert {1 2 3 4 5} 5 a
-} {1 2 3 4 5 a}
-test linsert-1.7 {linsert command} {
-    linsert {1 2 3 4 5} 2 one two \{three \$four
-} {1 2 one two \{three {$four} 3 4 5}
-test linsert-1.8 {linsert command} {
-    linsert {\{one \$two \{three \ four \ five} 2 a b c
-} {\{one {$two} a b c \{three { four} { five}}
-test linsert-1.9 {linsert command} {
-    linsert {{1 2} {3 4} {5 6} {7 8}} 2 {x y} {a b}
-} {{1 2} {3 4} {x y} {a b} {5 6} {7 8}}
-test linsert-1.10 {linsert command} {
-    linsert {} 2 a b c
-} {a b c}
-test linsert-1.11 {linsert command} {
-    linsert {} 2 {}
-} {{}}
-test linsert-1.12 {linsert command} {
-    linsert {a b "c c" d e} 3 1
-} {a b {c c} 1 d e}
-test linsert-1.13 {linsert command} {
-    linsert { a b c d} 0 1 2
-} {1 2 a b c d}
-test linsert-1.14 {linsert command} {
-    linsert {a b c {d e f}} 4 1 2
-} {a b c {d e f} 1 2}
-test linsert-1.15 {linsert command} {
-    linsert {a b c \{\  abc} 4 q r
-} {a b c \{\  q r abc}
-test linsert-1.16 {linsert command} {
-    linsert {a b c \{ abc} 4 q r
-} {a b c \{ q r abc}
-test linsert-1.17 {linsert command} {
-    linsert {a b c} end q r
-} {a b c q r}
-test linsert-1.18 {linsert command} {
-    linsert {a} end q r
-} {a q r}
-test linsert-1.19 {linsert command} {
-    linsert {} end q r
-} {q r}
-
-test linsert-2.1 {linsert errors} {
-    list [catch linsert msg] $msg
-} {1 {wrong # args: should be "linsert list index element ?element ...?"}}
-test linsert-2.2 {linsert errors} {
-    list [catch {linsert a b} msg] $msg
-} {1 {wrong # args: should be "linsert list index element ?element ...?"}}
-test linsert-2.3 {linsert errors} {
-    list [catch {linsert a 12x 2} msg] $msg
-} {1 {bad index "12x": must be integer or "end"}}
-test linsert-2.4 {linsert errors} {
-    list [catch {linsert \{ 12 2} msg] $msg
-} {1 {unmatched open brace in list}}
-
-test linsert-3.1 {linsert won't modify shared argument objects} {
-    proc p {} {
-        linsert "a b c" 1 "x y"
-        return "a b c"
-    }
-    p
-} "a b c"
-test linsert-3.2 {linsert won't modify shared argument objects} {
-    catch {unset lis}
-    set lis [format "a \"%s\" c" "b"]
-    linsert $lis 0 [string length $lis]
-} "7 a b c"
-
-# cleanup
-catch {unset lis}
-catch {rename p ""}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/list.test b/tests/list.test
deleted file mode 100644
index fa83038..0000000
--- a/tests/list.test
+++ /dev/null
@@ -1,126 +0,0 @@
-# Commands covered:  list
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: list.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# First, a bunch of individual tests
-
-test list-1.1 {basic tests} {list a b c} {a b c}
-test list-1.2 {basic tests} {list {a b} c} {{a b} c}
-test list-1.3 {basic tests} {list \{a b c} {\{a b c}
-test list-1.4 {basic tests} "list a{}} b{} c}" "a\\{\\}\\} b{} c\\}"
-test list-1.5 {basic tests} {list a\[ b\] } "{a\[} b\\]"
-test list-1.6 {basic tests} {list c\  d\t } "{c } {d\t}"
-test list-1.7 {basic tests} {list e\n f\$ } "{e\n} {f\$}"
-test list-1.8 {basic tests} {list g\; h\\} {{g;} h\\}
-test list-1.9 {basic tests} "list a\\\[} b\\\]} " "a\\\[\\\} b\\\]\\\}"
-test list-1.10 {basic tests} "list c\\\} d\\t} " "c\\} d\\t\\}"
-test list-1.11 {basic tests} "list e\\n} f\\$} " "e\\n\\} f\\$\\}"
-test list-1.12 {basic tests} "list g\\;} h\\\\} " "g\\;\\} {h\\}}"
-test list-1.13 {basic tests} {list a {{}} b} {a {{}} b}
-test list-1.14 {basic tests} {list a b xy\\} "a b xy\\\\"
-test list-1.15 {basic tests} "list a b\} e\\" "a b\\} e\\\\"
-test list-1.16 {basic tests} "list a b\}\\\$ e\\\$\\" "a b\\}\\\$ e\\\$\\\\"
-test list-1.17 {basic tests} {list a\f \{\f} "{a\f} \\\{\\f"
-test list-1.18 {basic tests} {list a\r \{\r} "{a\r} \\\{\\r"
-test list-1.19 {basic tests} {list a\v \{\v} "{a\v} \\\{\\v"
-test list-1.20 {basic tests} {list \"\}\{} "\\\"\\}\\{"
-test list-1.21 {basic tests} {list a b c\\\nd} "a b c\\\\\\nd"
-test list-1.22 {basic tests} {list "{ab}\\"} \\{ab\\}\\\\
-test list-1.23 {basic tests} {list \{} "\\{"
-test list-1.24 {basic tests} {list} {}
-
-# For the next round of tests create a list and then pick it apart
-# with "index" to make sure that we get back exactly what went in.
-
-test list-2.1 {placeholder} {
-} {}
-set num 1
-proc lcheck {a b c} {
-    global num d
-    set d [list $a $b $c]
-;   test list-2.$num {what goes in must come out} {lindex $d 0} $a
-    set num [expr $num+1]
-;   test list-2.$num {what goes in must come out} {lindex $d 1} $b
-    set num [expr $num+1]
-;   test list-2.$num {what goes in must come out} {lindex $d 2} $c
-    set num [expr $num+1]
-}
-lcheck a b c
-lcheck "a b" c\td e\nf
-lcheck {{a b}} {} {  }
-lcheck \$ \$ab ab\$
-lcheck \; \;ab ab\;
-lcheck \[ \[ab ab\[
-lcheck \\ \\ab ab\\
-lcheck {"} {"ab} {ab"}
-lcheck {a b} { ab} {ab }
-lcheck a{ a{b \{ab
-lcheck a} a}b }ab
-lcheck a\\} {a \}b} {a \{c}
-lcheck xyz \\ 1\\\n2
-lcheck "{ab}\\" "{ab}xy" abc
-
-concat {}
-
-# Check that tclListObj.c's SetListFromAny handles possible overlarge
-# string rep lengths in the source object.
-
-proc slowsort list {
-    set result {}
-    set last [expr [llength $list] - 1]
-    while {$last > 0} {
-	set minIndex [expr [llength $list] - 1]
-	set min [lindex $list $last]
-	set i [expr $minIndex-1]
-	while {$i >= 0} {
-	    if {[string compare [lindex $list $i] $min] < 0} {
-		set minIndex $i
-		set min [lindex $list $i]
-	    }
-	    set i [expr $i-1]
-	}
-	set result [concat $result [list $min]]
-	if {$minIndex == 0} {
-	    set list [lrange $list 1 end]
-	} else {
-	    set list [concat [lrange $list 0 [expr $minIndex-1]] \
-			  [lrange $list [expr $minIndex+1] end]]
-	}
-	set last [expr $last-1]
-    }
-    return [concat $result $list]
-}
-test list-3.1 {SetListFromAny and lrange/concat results} {
-    slowsort {fred julie alex carol bill annie}
-} {alex annie bill carol fred julie}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/listObj.test b/tests/listObj.test
deleted file mode 100644
index 2c9e58e..0000000
--- a/tests/listObj.test
+++ /dev/null
@@ -1,199 +0,0 @@
-# Functionality covered: operation of the procedures in tclListObj.c that
-# implement the Tcl type manager for the list object type.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands. Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: listObj.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testobj\""
-    puts "command, so I can't test the Tcl type and object support."
-    ::tcltest::cleanupTests
-    return
-}
-
-catch {unset x}
-test listobj-1.1 {Tcl_GetListObjType} {
-    set t [testobj types]
-    set first [string first "list" $t]
-    set result [expr {$first != -1}]
-} {1}
-
-test listobj-2.1 {Tcl_SetListObj, use in lappend} {
-    catch {unset x}
-    list [lappend x 1 abc def] [lappend x 1 ghi jkl] $x
-} {{1 abc def} {1 abc def 1 ghi jkl} {1 abc def 1 ghi jkl}}
-test listobj-2.2 {Tcl_SetListObj, use in ObjInterpProc} {
-    proc return_args {args} {
-        return $args
-    }
-    list [return_args] [return_args x] [return_args x y]
-} {{} x {x y}}
-test listobj-2.3 {Tcl_SetListObj, zero element count} {
-    list
-} {}
-
-test listobj-3.1 {Tcl_ListObjAppend, list conversion} {
-    catch {unset x}
-    list [lappend x 1 2 abc "long string"] $x
-} {{1 2 abc {long string}} {1 2 abc {long string}}}
-test listobj-3.2 {Tcl_ListObjAppend, list conversion} {
-    set x ""
-    list [lappend x first second] [lappend x third fourth] $x
-} {{first second} {first second third fourth} {first second third fourth}}
-test listobj-3.3 {Tcl_ListObjAppend, list conversion} {
-    set x "abc def"
-    list [lappend x first second] $x
-} {{abc def first second} {abc def first second}}
-test listobj-3.4 {Tcl_ListObjAppend, error in conversion} {
-    set x " \{"
-    list [catch {lappend x abc def} msg] $msg
-} {1 {unmatched open brace in list}}
-test listobj-3.5 {Tcl_ListObjAppend, force internal rep array to grow} {
-    set x ""
-    list [lappend x 1 1] [lappend x 2 2] [lappend x 3 3] [lappend x 4 4] \
-        [lappend x 5 5] [lappend x 6 6] [lappend x 7 7] [lappend x 8 8] $x
-} {{1 1} {1 1 2 2} {1 1 2 2 3 3} {1 1 2 2 3 3 4 4} {1 1 2 2 3 3 4 4 5 5} {1 1 2 2 3 3 4 4 5 5 6 6} {1 1 2 2 3 3 4 4 5 5 6 6 7 7} {1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8} {1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8}}
-
-test listobj-4.1 {Tcl_ListObjAppendElement, list conversion} {
-    catch {unset x}
-    list [lappend x 1] $x
-} {1 1}
-test listobj-4.2 {Tcl_ListObjAppendElement, list conversion} {
-    set x ""
-    list [lappend x first] [lappend x second] $x
-} {first {first second} {first second}}
-test listobj-4.3 {Tcl_ListObjAppendElement, list conversion} {
-    set x "abc def"
-    list [lappend x first] $x
-} {{abc def first} {abc def first}}
-test listobj-4.4 {Tcl_ListObjAppendElement, error in conversion} {
-    set x " \{"
-    list [catch {lappend x abc} msg] $msg
-} {1 {unmatched open brace in list}}
-test listobj-4.5 {Tcl_ListObjAppendElement, force internal rep array to grow} {
-    set x ""
-    list [lappend x 1] [lappend x 2] [lappend x 3] [lappend x 4] \
-        [lappend x 5] [lappend x 6] [lappend x 7] [lappend x 8] $x
-} {1 {1 2} {1 2 3} {1 2 3 4} {1 2 3 4 5} {1 2 3 4 5 6} {1 2 3 4 5 6 7} {1 2 3 4 5 6 7 8} {1 2 3 4 5 6 7 8}}
-
-test listobj-5.1 {Tcl_ListObjIndex, basic tests} {
-    lindex {a b c} 0
-} a
-test listobj-5.2 {Tcl_ListObjIndex, basic tests} {
-    lindex a 0
-} a
-test listobj-5.3 {Tcl_ListObjIndex, basic tests} {
-    lindex {a {b c d} x} 1
-} {b c d}
-test listobj-5.4 {Tcl_ListObjIndex, basic tests} {
-    lindex {a b c} 3
-} {}
-test listobj-5.5 {Tcl_ListObjIndex, basic tests} {
-    lindex {a b c} 100
-} {}
-test listobj-5.6 {Tcl_ListObjIndex, basic tests} {
-    lindex a 100
-} {}
-test listobj-5.7 {Tcl_ListObjIndex, basic tests} {
-    lindex {} -1
-} {}
-test listobj-5.8 {Tcl_ListObjIndex, error in conversion} {
-    set x " \{"
-    list [catch {lindex $x 0} msg] $msg
-} {1 {unmatched open brace in list}}
-
-test listobj-6.1 {Tcl_ListObjLength} {
-    llength {a b c d}
-} 4
-test listobj-6.2 {Tcl_ListObjLength} {
-    llength {a b c {a b {c d}} d}
-} 5
-test listobj-6.3 {Tcl_ListObjLength} {
-    llength {}
-} 0
-test listobj-6.4 {Tcl_ListObjLength, convert from non-list} {
-    llength 123
-} 1
-test listobj-6.5 {Tcl_ListObjLength, error converting from non-list} {
-    list [catch {llength "a b c \{"} msg] $msg
-} {1 {unmatched open brace in list}}
-test listobj-6.6 {Tcl_ListObjLength, error converting from non-list} {
-    list [catch {llength "a {b}c"} msg] $msg
-} {1 {list element in braces followed by "c" instead of space}}
-
-test listobj-7.1 {Tcl_ListObjReplace, conversion from non-list} {
-    lreplace 123 0 0 x
-} {x}
-test listobj-7.2 {Tcl_ListObjReplace, error converting from non-list} {
-    list [catch {lreplace "a b c \{" 1 1 x} msg] $msg
-} {1 {unmatched open brace in list}}
-test listobj-7.3 {Tcl_ListObjReplace, error converting from non-list} {
-    list [catch {lreplace "a {b}c" 1 2 x} msg] $msg
-} {1 {list element in braces followed by "c" instead of space}}
-test listobj-7.4 {Tcl_ListObjReplace, negative first element index} {
-    lreplace {1 2 3 4 5} -1 1 a
-} {a 3 4 5}
-test listobj-7.5 {Tcl_ListObjReplace, last element index >= num elems} {
-    lreplace {1 2 3 4 5} 3 7 a b c
-} {1 2 3 a b c}
-test listobj-7.6 {Tcl_ListObjReplace, first element index > last index} {
-    lreplace {1 2 3 4 5} 3 1 a b c
-} {1 2 3 a b c 4 5}
-test listobj-7.7 {Tcl_ListObjReplace, no new elements} {
-    lreplace {1 2 3 4 5} 1 1
-} {1 3 4 5}
-test listobj-7.8 {Tcl_ListObjReplace, shrink array in place} {
-    lreplace {1 2 3 4 5 6 7} 4 5
-} {1 2 3 4 7}
-test listobj-7.9 {Tcl_ListObjReplace, grow array in place} {
-    lreplace {1 2 3 4 5 6 7} 1 3 a b c d e
-} {1 a b c d e 5 6 7}
-test listobj-7.10 {Tcl_ListObjReplace, replace tail of array} {
-    lreplace {1 2 3 4 5 6 7} 3 6 a
-} {1 2 3 a}
-test listobj-7.11 {Tcl_ListObjReplace, must grow internal array} {
-    lreplace {1 2 3 4 5} 2 3 a b c d e f g h i j k l
-} {1 2 a b c d e f g h i j k l 5}
-test listobj-7.12 {Tcl_ListObjReplace, grow array, insert at start} {
-    lreplace {1 2 3 4 5} -1 -1 a b c d e f g h i j k l
-} {a b c d e f g h i j k l 1 2 3 4 5}
-test listobj-7.13 {Tcl_ListObjReplace, grow array, insert at end} {
-    lreplace {1 2 3 4 5} 4 1 a b c d e f g h i j k l
-} {1 2 3 4 a b c d e f g h i j k l 5}
-
-test listobj-8.1 {SetListFromAny} {
-    lindex {0 foo\x00help 2} 1
-} "foo\x00help"
-
-test listobj-9.1 {UpdateStringOfList} {
-    string length [list foo\x00help]
-} 8
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/llength.test b/tests/llength.test
deleted file mode 100644
index 40c0d73..0000000
--- a/tests/llength.test
+++ /dev/null
@@ -1,54 +0,0 @@
-# Commands covered:  llength
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: llength.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test llength-1.1 {length of list} {
-    llength {a b c d}
-} 4
-test llength-1.2 {length of list} {
-    llength {a b c {a b {c d}} d}
-} 5
-test llength-1.3 {length of list} {
-    llength {}
-} 0
-
-test llength-2.1 {error conditions} {
-    list [catch {llength} msg] $msg
-} {1 {wrong # args: should be "llength list"}}
-test llength-2.2 {error conditions} {
-    list [catch {llength 123 2} msg] $msg
-} {1 {wrong # args: should be "llength list"}}
-test llength-2.3 {error conditions} {
-    list [catch {llength "a b c \{"} msg] $msg
-} {1 {unmatched open brace in list}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/load.test b/tests/load.test
deleted file mode 100644
index 8bbfb98..0000000
--- a/tests/load.test
+++ /dev/null
@@ -1,194 +0,0 @@
-# Commands covered:  load
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: load.test,v 1.4 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Figure out what extension is used for shared libraries on this
-# platform.
-
-if {$tcl_platform(platform) == "macintosh"} {
-    puts "can't run dynamic library tests on macintosh machines"
-    ::tcltest::cleanupTests
-    return
-}
-
-# Tests require the existence of one of the DLLs in the dltest directory.
-set ext [info sharedlibextension]
-set testDir [file join [file dirname [info nameofexecutable]] dltest]
-set x [file join $testDir pkga$ext]
-set dll "[file tail $x]Required"
-set ::tcltest::testConfig($dll) [file readable $x]
-
-# Tests also require that this DLL has not already been loaded.
-set loaded "[file tail $x]Loaded"
-set alreadyLoaded [info loaded]
-set ::tcltest::testConfig($loaded) \
-	[expr {![string match *pkga* $alreadyLoaded]}]
-
-set alreadyTotalLoaded [info loaded]
-
-test load-1.1 {basic errors} [list $dll $loaded] {
-    list [catch {load} msg] $msg
-} {1 {wrong # args: should be "load fileName ?packageName? ?interp?"}}
-test load-1.2 {basic errors} [list $dll $loaded] {
-    list [catch {load a b c d} msg] $msg
-} {1 {wrong # args: should be "load fileName ?packageName? ?interp?"}}
-test load-1.3 {basic errors} [list $dll $loaded] {
-    list [catch {load a b foobar} msg] $msg
-} {1 {could not find interpreter "foobar"}}
-test load-1.4 {basic errors} [list $dll $loaded] {
-    list [catch {load {}} msg] $msg
-} {1 {must specify either file name or package name}}
-test load-1.5 {basic errors} [list $dll $loaded] {
-    list [catch {load {} {}} msg] $msg
-} {1 {must specify either file name or package name}}
-test load-1.6 {basic errors} [list $dll $loaded] {
-    list [catch {load {} Unknown} msg] $msg
-} {1 {package "Unknown" isn't loaded statically}}
-
-test load-2.1 {basic loading, with guess for package name} \
-	[list $dll $loaded] {
-    load [file join $testDir pkga$ext]
-    list [pkga_eq abc def] [info commands pkga_*]
-} {0 {pkga_eq pkga_quote}}
-interp create -safe child
-test load-2.2 {loading into a safe interpreter, with package name conversion} \
-	[list $dll $loaded] {
-    load [file join $testDir pkgb$ext] pKgB child
-    list [child eval pkgb_sub 44 13] [catch {child eval pkgb_unsafe} msg] $msg \
-	    [catch {pkgb_sub 12 10} msg2] $msg2
-} {31 1 {invalid command name "pkgb_unsafe"} 1 {invalid command name "pkgb_sub"}}
-test load-2.3 {loading with no _Init procedure} [list $dll $loaded] {
-    list [catch {load [file join $testDir pkgc$ext] foo} msg] $msg
-} {1 {couldn't find procedure Foo_Init}}
-test load-2.4 {loading with no _SafeInit procedure} [list $dll $loaded] {
-    list [catch {load [file join $testDir pkga$ext] {} child} msg] $msg
-} {1 {can't use package in a safe interpreter: no Pkga_SafeInit procedure}}
-
-test load-3.1 {error in _Init procedure, same interpreter} \
-	[list $dll $loaded] {
-    list [catch {load [file join $testDir pkge$ext] pkge} msg] \
-	    $msg $errorInfo $errorCode
-} {1 {couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
-    while executing
-"open non_existent"
-    invoked from within
-"if 44 {open non_existent}"
-    invoked from within
-"load [file join $testDir pkge$ext] pkge"} {POSIX ENOENT {no such file or directory}}}
-test load-3.2 {error in _Init procedure, slave interpreter} \
-	[list $dll $loaded] {
-    catch {interp delete x}
-    interp create x
-    set errorCode foo
-    set errorInfo bar
-    set result [list [catch {load [file join $testDir pkge$ext] pkge x} msg] \
-	    $msg $errorInfo $errorCode]
-    interp delete x
-    set result
-} {1 {couldn't open "non_existent": no such file or directory} {couldn't open "non_existent": no such file or directory
-    while executing
-"open non_existent"
-    invoked from within
-"if 44 {open non_existent}"
-    invoked from within
-"load [file join $testDir pkge$ext] pkge x"} {POSIX ENOENT {no such file or directory}}}
-
-test load-4.1 {reloading package into same interpreter} [list $dll $loaded] {
-    list [catch {load [file join $testDir pkga$ext] pkga} msg] $msg
-} {0 {}}
-test load-4.2 {reloading package into same interpreter} [list $dll $loaded] {
-    list [catch {load [file join $testDir pkga$ext] pkgb} msg] $msg
-} "1 {file \"[file join $testDir pkga$ext\"] is already loaded for package \"Pkga\"}"
-
-test load-5.1 {file name not specified and no static package: pick default} \
-	[list $dll $loaded] {
-    catch {interp delete x}
-    interp create x
-    load [file join $testDir pkga$ext] pkga
-    load {} pkga x
-    set result [info loaded x]
-    interp delete x
-    set result
-} "{[file join $testDir pkga$ext] Pkga}"
-
-# On some platforms, like SunOS 4.1.3, these tests can't be run because
-# they cause the process to exit.
-
-test load-6.1 {errors loading file} [list $dll $loaded nonPortable] {
-    catch {load foo foo}
-} {1}
-
-if {[info command teststaticpkg] != ""} {
-    test load-7.1 {Tcl_StaticPackage procedure} [list $dll $loaded] {
-	set x "not loaded"
-	teststaticpkg Test 1 0
-	load {} Test
-	load {} Test child
-	list [set x] [child eval set x]
-    } {loaded loaded}
-    test load-7.2 {Tcl_StaticPackage procedure} [list $dll $loaded] {
-	set x "not loaded"
-	teststaticpkg Another 0 0
-	load {} Another
-	child eval {set x "not loaded"}
-	list [catch {load {} Another child} msg] $msg \
-		[child eval set x] [set x]
-    } {1 {can't use package in a safe interpreter: no Another_SafeInit procedure} {not loaded} loaded}
-    test load-7.3 {Tcl_StaticPackage procedure} [list $dll $loaded] {
-	set x "not loaded"
-	teststaticpkg More 0 1
-	load {} More
-	set x
-    } {not loaded}
-    test load-7.4 {Tcl_StaticPackage procedure, redundant calls} \
-	    [list $dll $loaded] {
-	teststaticpkg Double 0 1
-	teststaticpkg Double 0 1
-	info loaded
-    } "{{} Double} {{} More} {{} Another} {{} Test} {[file join $testDir pkge$ext] Pkge} {[file join $testDir pkgb$ext] Pkgb} {[file join $testDir pkga$ext] Pkga} $alreadyTotalLoaded"
-
-    test load-8.1 {TclGetLoadedPackages procedure} [list $dll $loaded] {
-	info loaded
-    } "{{} Double} {{} More} {{} Another} {{} Test} {[file join $testDir pkge$ext] Pkge} {[file join $testDir pkgb$ext] Pkgb} {[file join $testDir pkga$ext] Pkga} $alreadyTotalLoaded"
-    test load-8.2 {TclGetLoadedPackages procedure} [list $dll $loaded] {
-	list [catch {info loaded gorp} msg] $msg
-    } {1 {could not find interpreter "gorp"}}
-    test load-8.3 {TclGetLoadedPackages procedure} [list $dll $loaded] {
-	list [info loaded {}] [info loaded child]
-    } "{{{} Double} {{} More} {{} Another} {{} Test} {[file join $testDir pkga$ext] Pkga} $alreadyLoaded} {{{} Test} {[file join $testDir pkgb$ext] Pkgb}}"
-    test load-8.4 {TclGetLoadedPackages procedure} [list $dll $loaded] {
-	load [file join $testDir pkgb$ext] pkgb
-	list [info loaded {}] [lsort [info commands pkgb_*]]
-    } "{{[file join $testDir pkgb$ext] Pkgb} {{} Double} {{} More} {{} Another} {{} Test} {[file join $testDir pkga$ext] Pkga} $alreadyLoaded} {pkgb_sub pkgb_unsafe}"
-    interp delete child
-}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/lrange.test b/tests/lrange.test
deleted file mode 100644
index 4132969..0000000
--- a/tests/lrange.test
+++ /dev/null
@@ -1,102 +0,0 @@
-# Commands covered:  lrange
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: lrange.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test lrange-1.1 {range of list elements} {
-    lrange {a b c d} 1 2
-} {b c}
-test lrange-1.2 {range of list elements} {
-    lrange {a {bcd e {f g {}}} l14 l15 d} 1 1
-} {{bcd e {f g {}}}}
-test lrange-1.3 {range of list elements} {
-    lrange {a {bcd e {f g {}}} l14 l15 d} 3 end
-} {l15 d}
-test lrange-1.4 {range of list elements} {
-    lrange {a {bcd e {f g {}}} l14 l15 d} 4 10000
-} {d}
-test lrange-1.5 {range of list elements} {
-    lrange {a {bcd e {f g {}}} l14 l15 d} 4 3
-} {}
-test lrange-1.6 {range of list elements} {
-    lrange {a {bcd e {f g {}}} l14 l15 d} 10 11
-} {}
-test lrange-1.7 {range of list elements} {
-    lrange {a b c d e} -1 2
-} {a b c}
-test lrange-1.8 {range of list elements} {
-    lrange {a b c d e} -2 -1
-} {}
-test lrange-1.9 {range of list elements} {
-    lrange {a b c d e} -2 e
-} {a b c d e}
-test lrange-1.10 {range of list elements} {
-    lrange "a b\{c d" 1 2
-} "b\\{c d"
-test lrange-1.11 {range of list elements} {
-    lrange "a b c d" end end
-} d
-test lrange-1.12 {range of list elements} {
-    lrange "a b c d" end 100000
-} d
-test lrange-1.13 {range of list elements} {
-    lrange "a b c d" e 3
-} d
-test lrange-1.14 {range of list elements} {
-    lrange "a b c d" end 2
-} {}
-test lrange-1.15 {range of list elements} {
-    concat \"[lrange {a b \{\   	} 0 2]"
-} {"a b \{\ "}
-test lrange-1.16 {list element quoting} {
-    lrange {[append a .b]} 0 end    
-} {{[append} a .b\]}
-
-test lrange-2.1 {error conditions} {
-    list [catch {lrange a b} msg] $msg
-} {1 {wrong # args: should be "lrange list first last"}}
-test lrange-2.2 {error conditions} {
-    list [catch {lrange a b 6 7} msg] $msg
-} {1 {wrong # args: should be "lrange list first last"}}
-test lrange-2.3 {error conditions} {
-    list [catch {lrange a b 6} msg] $msg
-} {1 {bad index "b": must be integer or "end"}}
-test lrange-2.4 {error conditions} {
-    list [catch {lrange a 0 enigma} msg] $msg
-} {1 {bad index "enigma": must be integer or "end"}}
-test lrange-2.5 {error conditions} {
-    list [catch {lrange "a \{b c" 3 4} msg] $msg
-} {1 {unmatched open brace in list}}
-test lrange-2.6 {error conditions} {
-    list [catch {lrange "a b c \{ d e" 1 4} msg] $msg
-} {1 {unmatched open brace in list}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/lreplace.test b/tests/lreplace.test
deleted file mode 100644
index d0743eb..0000000
--- a/tests/lreplace.test
+++ /dev/null
@@ -1,149 +0,0 @@
-# Commands covered:  lreplace
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: lreplace.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test lreplace-1.1 {lreplace command} {
-    lreplace {1 2 3 4 5} 0 0 a
-} {a 2 3 4 5}
-test lreplace-1.2 {lreplace command} {
-    lreplace {1 2 3 4 5} 1 1 a
-} {1 a 3 4 5}
-test lreplace-1.3 {lreplace command} {
-    lreplace {1 2 3 4 5} 2 2 a
-} {1 2 a 4 5}
-test lreplace-1.4 {lreplace command} {
-    lreplace {1 2 3 4 5} 3 3 a
-} {1 2 3 a 5}
-test lreplace-1.5 {lreplace command} {
-    lreplace {1 2 3 4 5} 4 4 a
-} {1 2 3 4 a}
-test lreplace-1.6 {lreplace command} {
-    lreplace {1 2 3 4 5} 4 5 a
-} {1 2 3 4 a}
-test lreplace-1.7 {lreplace command} {
-    lreplace {1 2 3 4 5} -1 -1 a
-} {a 1 2 3 4 5}
-test lreplace-1.8 {lreplace command} {
-    lreplace {1 2 3 4 5} 2 end a b c d
-} {1 2 a b c d}
-test lreplace-1.9 {lreplace command} {
-    lreplace {1 2 3 4 5} 0 3
-} {5}
-test lreplace-1.10 {lreplace command} {
-    lreplace {1 2 3 4 5} 0 4
-} {}
-test lreplace-1.11 {lreplace command} {
-    lreplace {1 2 3 4 5} 0 1
-} {3 4 5}
-test lreplace-1.12 {lreplace command} {
-    lreplace {1 2 3 4 5} 2 3
-} {1 2 5}
-test lreplace-1.13 {lreplace command} {
-    lreplace {1 2 3 4 5} 3 end
-} {1 2 3}
-test lreplace-1.14 {lreplace command} {
-    lreplace {1 2 3 4 5} -1 4 a b c
-} {a b c}
-test lreplace-1.15 {lreplace command} {
-    lreplace {a b "c c" d e f} 3 3
-} {a b {c c} e f}
-test lreplace-1.16 {lreplace command} {
-    lreplace { 1 2 3 4 5} 0 0 a
-} {a 2 3 4 5}
-test lreplace-1.17 {lreplace command} {
-    lreplace {1 2 3 4 "5 6"} 4 4 a
-} {1 2 3 4 a}
-test lreplace-1.18 {lreplace command} {
-    lreplace {1 2 3 4 {5 6}} 4 4 a
-} {1 2 3 4 a}
-test lreplace-1.19 {lreplace command} {
-    lreplace {1 2 3 4} 2 end x y z
-} {1 2 x y z}
-test lreplace-1.20 {lreplace command} {
-    lreplace {1 2 3 4} end end a
-} {1 2 3 a}
-test lreplace-1.21 {lreplace command} {
-    lreplace {1 2 3 4} end 3 a
-} {1 2 3 a}
-test lreplace-1.22 {lreplace command} {
-    lreplace {1 2 3 4} end end
-} {1 2 3}
-test lreplace-1.23 {lreplace command} {
-    lreplace {1 2 3 4} 2 -1 xy
-} {1 2 xy 3 4}
-test lreplace-1.24 {lreplace command} {
-    lreplace {1 2 3 4} end -1 z
-} {1 2 3 z 4}
-test lreplace-1.25 {lreplace command} {
-    concat \"[lreplace {\}\     hello} end end]\"
-} {"\}\ "}
-test lreplace-1.26 {lreplace command} {
-    catch {unset foo}
-    set foo {a b}
-    list [set foo [lreplace $foo end end]] \
-        [set foo [lreplace $foo end end]] \
-        [set foo [lreplace $foo end end]]
-} {a {} {}}
-
-
-test lreplace-2.1 {lreplace errors} {
-    list [catch lreplace msg] $msg
-} {1 {wrong # args: should be "lreplace list first last ?element element ...?"}}
-test lreplace-2.2 {lreplace errors} {
-    list [catch {lreplace a b} msg] $msg
-} {1 {wrong # args: should be "lreplace list first last ?element element ...?"}}
-test lreplace-2.3 {lreplace errors} {
-    list [catch {lreplace x a 10} msg] $msg
-} {1 {bad index "a": must be integer or "end"}}
-test lreplace-2.4 {lreplace errors} {
-    list [catch {lreplace x 10 x} msg] $msg
-} {1 {bad index "x": must be integer or "end"}}
-test lreplace-2.5 {lreplace errors} {
-    list [catch {lreplace x 10 1x} msg] $msg
-} {1 {bad index "1x": must be integer or "end"}}
-test lreplace-2.6 {lreplace errors} {
-    list [catch {lreplace x 3 2} msg] $msg
-} {1 {list doesn't contain element 3}}
-test lreplace-2.7 {lreplace errors} {
-    list [catch {lreplace x 1 1} msg] $msg
-} {1 {list doesn't contain element 1}}
-
-test lreplace-3.1 {lreplace won't modify shared argument objects} {
-    proc p {} {
-        lreplace "a b c" 1 1 "x y"
-        return "a b c"
-    }
-    p
-} "a b c"
-
-# cleanup
-catch {unset foo}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/lsearch.test b/tests/lsearch.test
deleted file mode 100644
index 498607b..0000000
--- a/tests/lsearch.test
+++ /dev/null
@@ -1,105 +0,0 @@
-# Commands covered:  lsearch
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: lsearch.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set x {abcd bbcd 123 234 345}
-test lsearch-1.1 {lsearch command} {
-    lsearch $x 123
-} 2
-test lsearch-1.2 {lsearch command} {
-    lsearch $x 3456
-} -1
-test lsearch-1.3 {lsearch command} {
-    lsearch $x *5
-} 4
-test lsearch-1.4 {lsearch command} {
-    lsearch $x *bc*
-} 0
-
-test lsearch-2.1 {search modes} {
-    lsearch -exact {xyz bbcc *bc*} *bc*
-} 2
-test lsearch-2.2 {search modes} {
-    lsearch -exact {b.x ^bc xy bcx} ^bc
-} 1
-test lsearch-2.3 {search modes} {
-    lsearch -exact {foo bar cat} ba
-} -1
-test lsearch-2.4 {search modes} {
-    lsearch -exact {foo bar cat} bart
-} -1
-test lsearch-2.5 {search modes} {
-    lsearch -exact {foo bar cat} bar
-} 1
-test lsearch-2.6 {search modes} {
-    list [catch {lsearch -regexp {xyz bbcc *bc*} *bc*} msg] $msg
-} {1 {couldn't compile regular expression pattern: quantifier operand invalid}}
-test lsearch-2.7 {search modes} {
-    lsearch -regexp {b.x ^bc xy bcx} ^bc
-} 3
-test lsearch-2.8 {search modes} {
-    lsearch -glob {xyz bbcc *bc*} *bc*
-} 1
-test lsearch-2.9 {search modes} {
-    lsearch -glob {b.x ^bc xy bcx} ^bc
-} 1
-test lsearch-2.10 {search modes} {
-    list [catch {lsearch -glib {b.x bx xy bcx} b.x} msg] $msg
-} {1 {bad search mode "-glib": must be -exact, -glob, or -regexp}}
-
-test lsearch-3.1 {lsearch errors} {
-    list [catch lsearch msg] $msg
-} {1 {wrong # args: should be "lsearch ?mode? list pattern"}}
-test lsearch-3.2 {lsearch errors} {
-    list [catch {lsearch a} msg] $msg
-} {1 {wrong # args: should be "lsearch ?mode? list pattern"}}
-test lsearch-3.3 {lsearch errors} {
-    list [catch {lsearch a b c} msg] $msg
-} {1 {bad search mode "a": must be -exact, -glob, or -regexp}}
-test lsearch-3.4 {lsearch errors} {
-    list [catch {lsearch a b c d} msg] $msg
-} {1 {wrong # args: should be "lsearch ?mode? list pattern"}}
-test lsearch-3.5 {lsearch errors} {
-    list [catch {lsearch "\{" b} msg] $msg
-} {1 {unmatched open brace in list}}
-
-test lsearch-4.1 {binary data} {
-    lsearch -exact [list foo one\000two bar] bar
-} 2
-test lsearch-4.2 {binary data} {
-    set x one
-    append x \x00
-    append x two
-    lsearch -exact [list foo one\000two bar] $x
-} 1
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/macFCmd.test b/tests/macFCmd.test
deleted file mode 100644
index bbb5df8..0000000
--- a/tests/macFCmd.test
+++ /dev/null
@@ -1,208 +0,0 @@
-# This file tests the tclfCmd.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: macFCmd.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {file delete -force foo.dir}
-file mkdir foo.dir
-if {[catch {file attributes foo.dir -readonly 1}]} {
-    set ::tcltest::testConfig(fileSharing) 0
-    set ::tcltest::testConfig(notFileSharing) 1
-} else {
-    set ::tcltest::testConfig(fileSharing) 1
-    set ::tcltest::testConfig(notFileSharing) 0
-}
-file delete -force foo.dir
-
-test macFCmd-1.1 {GetFileFinderAttributes - no file} {macOnly} {
-    catch {file delete -force foo.file}
-    list [catch {file attributes foo.file -creator} msg] $msg
-} {1 {couldn't get attributes for file ":foo.file": no such file or directory}}
-test macFCmd-1.2 {GetFileFinderAttributes - creator} {macOnly} {
-    catch {file delete -force foo.file}
-    catch {close [open foo.file w]}
-    list [catch {file attributes foo.file -creator} msg] $msg \
-	    [file delete -force foo.file]
-} {0 {MPW } {}}
-test macFCmd-1.3 {GetFileFinderAttributes - type} {macOnly} {
-    catch {file delete -force foo.file}
-    catch {close [open foo.file w]}
-    list [catch {file attributes foo.file -type} msg] $msg \
-	    [file delete -force foo.file]
-} {0 TEXT {}}
-test macFCmd-1.4 {GetFileFinderAttributes - not hidden} {macOnly} {
-    catch {file delete -force foo.file}
-    catch {close [open foo.file w]}
-    list [catch {file attributes foo.file -hidden} msg] $msg \
-	    [file delete -force foo.file]
-} {0 0 {}}
-test macFCmd-1.5 {GetFileFinderAttributes - hidden} {macOnly} {
-    catch {file delete -force foo.file}
-    catch {close [open foo.file w]}
-    file attributes foo.file -hidden 1
-    list [catch {file attributes foo.file -hidden} msg] $msg \
-	    [file delete -force foo.file]
-} {0 1 {}}
-test macFCmd-1.6 {GetFileFinderAttributes - folder creator} {macOnly} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -creator} msg] $msg \
-	    [file delete -force foo.dir]
-} {0 Fldr {}}
-test macFCmd-1.7 {GetFileFinderAttributes - folder type} {macOnly} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -type} msg] $msg \
-	    [file delete -force foo.dir]
-} {0 Fldr {}}
-test macFCmd-1.8 {GetFileFinderAttributes - folder hidden} {macOnly} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -hidden} msg] $msg \
-	    [file delete -force foo.dir]
-} {0 0 {}}
-
-test macFCmd-2.1 {GetFileReadOnly - bad file} {macOnly} {
-    catch {file delete -force foo.file}
-    list [catch {file attributes foo.file -readonly} msg] $msg
-} {1 {couldn't get attributes for file ":foo.file": no such file or directory}}
-test macFCmd-2.2 {GetFileReadOnly - file not read only} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -readonly} msg] $msg \
-	    [file delete -force foo.file]
-} {0 0 {}}
-test macFCmd-2.3 {GetFileReadOnly - file read only} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    file attributes foo.file -readonly 1
-    list [catch {file attributes foo.file -readonly} msg] $msg \
-	    [file delete -force foo.file]
-} {0 1 {}}
-test macFCmd-2.4 {GetFileReadOnly - directory not read only} {macOnly} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -readonly} msg] $msg \
-	    [file delete -force foo.dir]
-} {0 0 {}}
-test macFCmd-2.5 {GetFileReadOnly - directory read only} {macOnly fileSharing} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    file attributes foo.dir -readonly 1
-    list [catch {file attributes foo.dir -readonly} msg] $msg \
-	    [file delete -force foo.dir]
-} {0 1 {}}
-
-test macFCmd-3.1 {SetFileFinderAttributes - bad file} {macOnly} {
-    catch {file delete -force foo.file}
-    list [catch {file attributes foo.file -creator FOOO} msg] $msg
-} {1 {couldn't set attributes for file ":foo.file": no such file or directory}}
-test macFCmd-3.2 {SetFileFinderAttributes - creator} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -creator FOOO} msg] $msg \
-	    [file attributes foo.file -creator] [file delete -force foo.file]
-} {0 {} FOOO {}}
-test macFCmd-3.3 {SetFileFinderAttributes - bad creator} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -creator 0} msg] $msg \
-	    [file delete -force foo.file]
-} {1 {expected Macintosh OS type but got "0"} {}}
-test macFCmd-3.4 {SetFileFinderAttributes - hidden} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -hidden 1} msg] $msg \
-	    [file attributes foo.file -hidden] [file delete -force foo.file]
-} {0 {} 1 {}}
-test macFCmd-3.5 {SetFileFinderAttributes - type} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -type FOOO} msg] $msg \
-	    [file attributes foo.file -type] [file delete -force foo.file]
-} {0 {} FOOO {}}
-test macFCmd-3.6 {SetFileFinderAttributes - bad type} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -type 0} msg] $msg \
-	    [file delete -force foo.file]
-} {1 {expected Macintosh OS type but got "0"} {}}
-test macFCmd-3.7 {SetFileFinderAttributes - directory} {macOnly} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -creator FOOO} msg] \
-	    $msg [file delete -force foo.dir]
-} {1 {cannot set -creator: ":foo.dir" is a directory} {}}
-
-test macFCmd-4.1 {SetFileReadOnly - bad file} {macOnly} {
-    catch {file delete -force foo.file}
-    list [catch {file attributes foo.file -readonly 1} msg] $msg
-} {1 {couldn't set attributes for file ":foo.file": no such file or directory}}
-test macFCmd-4.2 {SetFileReadOnly - file not readonly} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -readonly 0} msg] \
-	    $msg [file attributes foo.file -readonly] [file delete -force foo.file]
-} {0 {} 0 {}}
-test macFCmd-4.3 {SetFileReadOnly - file readonly} {macOnly} {
-    catch {file delete -force foo.file}
-    close [open foo.file w]
-    list [catch {file attributes foo.file -readonly 1} msg] \
-	    $msg [file attributes foo.file -readonly] [file delete -force foo.file]
-} {0 {} 1 {}}
-test macFCmd-4.4 {SetFileReadOnly - directory not readonly} \
-	{macOnly fileSharing} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -readonly 0} msg] \
-	    $msg [file attributes foo.dir -readonly] [file delete -force foo.dir]
-} {0 {} 0 {}}
-test macFCmd-4.5 {SetFileReadOnly - directory not readonly} \
-	{macOnly notFileSharing} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -readonly 0} msg] $msg \
-	    [file delete -force foo.dir]
-} {1 {cannot set a directory to read-only when File Sharing is turned off} {}}
-test macFCmd-4.6 {SetFileReadOnly - directory readonly} {macOnly fileSharing} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -readonly 1} msg] $msg \
-	    [file attributes foo.dir -readonly] [file delete -force foo.dir]
-} {0 {} 1 {}}
-test macFCmd-4.7 {SetFileReadOnly - directory readonly} {macOnly notFileSharing} {
-    catch {file delete -force foo.dir}
-    file mkdir foo.dir
-    list [catch {file attributes foo.dir -readonly 1} msg] $msg \
-	    [file delete -force foo.dir]
-} {1 {cannot set a directory to read-only when File Sharing is turned off} {}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/misc.test b/tests/misc.test
deleted file mode 100644
index 67c2216..0000000
--- a/tests/misc.test
+++ /dev/null
@@ -1,75 +0,0 @@
-# Commands covered:  various
-#
-# This file contains a collection of miscellaneous Tcl tests that
-# don't fit naturally in any of the other test files.  Many of these
-# tests are pathological cases that caused bugs in earlier Tcl
-# releases.
-#
-# Copyright (c) 1992-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: misc.test,v 1.3 1999/04/16 00:47:30 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test misc-1.1 {error in variable ref. in command in array reference} {
-    proc tstProc {} {
-	global a
-    
-	set tst $a([winfo name $zz])
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-    }
-    set msg {}
-    list [catch tstProc msg] $msg
-} {1 {can't read "zz": no such variable}}
-test misc-1.2 {error in variable ref. in command in array reference} {
-    proc tstProc {} "
-	global a
-    
-	set tst \$a(\[winfo name \$\{zz)
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-	# this is a bogus comment
-    "
-    set msg {}
-    list [catch tstProc msg] $msg $errorInfo
-} {1 {missing close-brace for variable name} {missing close-brace for variable name
-    while compiling
-"set tst $a([winfo name "
-    (compiling body of proc "tstProc", line 4)
-    invoked from within
-"tstProc"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/msgcat.test b/tests/msgcat.test
deleted file mode 100644
index b9410e2..0000000
--- a/tests/msgcat.test
+++ /dev/null
@@ -1,318 +0,0 @@
-# Commands covered: ::msgcat::mc ::msgcat::mclocale
-#                   ::msgcat::mcpreferences ::msgcat::mcload
-#                   ::msgcat::mcset ::msgcat::mcunknown
-#
-# This file contains a collection of tests for the msgcat script library.
-# Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1998 Mark Harrison.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: msgcat.test,v 1.2 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[catch {package require msgcat 1.0}]} {
-    if {[info exist msgcat1]} {
-	catch {puts "Cannot load msgcat 1.0 package"}
-	return
-    } else {
-	catch {puts "Running msgcat 1.0 tests in slave interp"}
-	set interp [interp create msgcat1]
-	$interp eval [list set msgcat1 "running"]
-	$interp eval [list source [info script]]
-	interp delete $interp
-	return
-    }
-}
-
-set oldlocale [::msgcat::mclocale]
-
-#
-# Test the various permutations of mclocale
-# and mcpreferences.
-#
-
-test msgcat-1.1 {::msgcat::mclocale default} {
-    ::msgcat::mclocale
-} {c}
-test msgcat-1.2 {::msgcat::mcpreferences, single element} {
-    ::msgcat::mcpreferences
-} {c}
-test msgcat-1.3 {::msgcat::mclocale, single element} {
-    ::msgcat::mclocale en
-} {en}
-test msgcat-1.4 {::msgcat::mclocale, single element} {
-    ::msgcat::mclocale
-} {en}
-test msgcat-1.5 {::msgcat::mcpreferences, single element} {
-    ::msgcat::mcpreferences
-} {en}
-test msgcat-1.6 {::msgcat::mclocale, two elements} {
-    ::msgcat::mclocale en_US
-} {en_us}
-test msgcat-1.7 {::msgcat::mclocale, two elements} {
-    ::msgcat::mclocale en_US
-    ::msgcat::mclocale
-} {en_us}
-test msgcat-1.8 {::msgcat::mcpreferences, two elements} {
-    ::msgcat::mcpreferences
-} {en_us en}
-test msgcat-1.9 {::msgcat::mclocale, three elements} {
-    ::msgcat::mclocale en_US_funky
-} {en_us_funky}
-test msgcat-1.10 {::msgcat::mclocale, three elements} {
-    ::msgcat::mclocale
-} {en_us_funky}
-test msgcat-1.11 {::msgcat::mcpreferences, three elements} {
-    ::msgcat::mcpreferences
-} {en_us_funky en_us en}
-
-#
-# Test mcset and mcc, ensuring that namespace partitioning
-# is working.
-#
-
-test msgcat-2.1 {::msgcat::mcset, global scope} {
-    ::msgcat::mcset  foo_BAR text1 text2
-} {text2}
-test msgcat-2.2 {::msgcat::mcset, global scope, default} {
-    ::msgcat::mcset  foo_BAR text3
-} {text3}
-test msgcat-2.2 {::msgcat::mcset, namespace overlap} {
-    namespace eval bar {::msgcat::mcset  foo_BAR con1 con1bar}
-    namespace eval baz {::msgcat::mcset  foo_BAR con1 con1baz}
-} {con1baz}
-test msgcat-2.3 {::msgcat::mcset, namespace overlap} {
-    ::msgcat::mclocale foo_BAR
-    namespace eval bar {::msgcat::mc con1}
-} {con1bar}
-test msgcat-2.4 {::msgcat::mcset, namespace overlap} {
-    ::msgcat::mclocale foo_BAR
-    namespace eval baz {::msgcat::mc con1}
-} {con1baz}
-
-#
-# Test mcset and mc, ensuring that more specific locales
-# (e.g. "en_UK") will search less specific locales
-# (e.g. "en") for translation strings.
-#
-# Do this for the 12 permutations of
-#     locales: {foo foo_BAR foo_BAR_baz}
-#     strings: {ov1 ov2 ov3 ov4}
-#     locale foo         defines ov1, ov2, ov3
-#     locale foo_BAR     defines      ov2, ov3
-#     locale foo_BAR_BAZ defines           ov3
-#     (ov4 is defined in none)
-# So,
-#     ov3 should be resolved in foo, foo_BAR, foo_BAR_baz
-#     ov2 should be resolved in foo, foo_BAR
-#     ov2 should resolve to foo_BAR in foo_BAR_baz
-#     ov1 should be resolved in foo
-#     ov1 should resolve to foo in foo_BAR, foo_BAR_baz
-#     ov4 should be resolved in none, and call mcunknown
-#
-
-test msgcat-3.1 {::msgcat::mcset, overlap} {
-    ::msgcat::mcset foo ov1 ov1_foo
-    ::msgcat::mcset foo ov2 ov2_foo
-    ::msgcat::mcset foo ov3 ov3_foo
-    ::msgcat::mcset foo_BAR ov2 ov2_foo_BAR
-    ::msgcat::mcset foo_BAR ov3 ov3_foo_BAR
-    ::msgcat::mcset foo_BAR_baz ov3 ov3_foo_BAR_baz
-} {ov3_foo_BAR_baz}
-# top level, locale foo
-test msgcat-3.2 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc ov1
-} {ov1_foo}
-test msgcat-3.3 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc ov2
-} {ov2_foo}
-test msgcat-3.4 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc ov3
-} {ov3_foo}
-test msgcat-3.5 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc ov4
-} {ov4}
-# second level, locale foo_BAR
-test msgcat-3.6 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR
-    ::msgcat::mc ov1
-} {ov1_foo}
-test msgcat-3.7 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR
-    ::msgcat::mc ov2
-} {ov2_foo_BAR}
-test msgcat-3.8 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR
-    ::msgcat::mc ov3
-} {ov3_foo_BAR}
-test msgcat-3.9 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR
-    ::msgcat::mc ov4
-} {ov4}
-# third level, locale foo_BAR_baz
-test msgcat-3.10 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR_baz
-    ::msgcat::mc ov1
-} {ov1_foo}
-test msgcat-3.11 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR_baz
-    ::msgcat::mc ov2
-} {ov2_foo_BAR}
-test msgcat-3.12 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR_baz
-    ::msgcat::mc ov3
-} {ov3_foo_BAR_baz}
-test msgcat-3.13 {::msgcat::mcset, overlap} {
-    ::msgcat::mclocale foo_BAR_baz
-    ::msgcat::mc ov4
-} {ov4}
-
-#
-# Test mcunknown, first the default operation
-# and then with an overridden definition.
-#
-
-test msgcat-4.1 {::msgcat::mcunknown, default} {
-    ::msgcat::mcset foo unk1 "unknown 1"
-} {unknown 1}
-test msgcat-4.2 {::msgcat::mcunknown, default} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc unk1
-} {unknown 1}
-test msgcat-4.3 {::msgcat::mcunknown, default} {
-    ::msgcat::mclocale foo
-    ::msgcat::mc unk2
-} {unk2}
-test msgcat-4.4 {::msgcat::mcunknown, overridden} {
-    rename ::msgcat::mcunknown oldproc
-    proc ::msgcat::mcunknown {dom s} {
-        return "unknown:$dom:$s"
-    }
-    ::msgcat::mclocale foo
-    set result [::msgcat::mc unk1]
-    rename ::msgcat::mcunknown {}
-    rename oldproc ::msgcat::mcunknown
-    set result
-} {unknown 1}
-test msgcat-4.5 {::msgcat::mcunknown, overridden} {
-    rename ::msgcat::mcunknown oldproc
-    proc ::msgcat::mcunknown {dom s} {
-        return "unknown:$dom:$s"
-    }
-    ::msgcat::mclocale foo
-    set result [::msgcat::mc unk2]
-    rename ::msgcat::mcunknown {}
-    rename oldproc ::msgcat::mcunknown
-    set result
-} {unknown:foo:unk2}
-test msgcat-4.6 {::msgcat::mcunknown, uplevel context} {
-    rename ::msgcat::mcunknown oldproc
-    proc ::msgcat::mcunknown {dom s} {
-        return "unknown:$dom:$s:[info level]"
-    }
-    ::msgcat::mclocale foo
-    set result [::msgcat::mc unk2]
-    rename ::msgcat::mcunknown {}
-    rename oldproc ::msgcat::mcunknown
-    set result
-} {unknown:foo:unk2:1}
-    
-
-#
-# Test mcload.  Need to set up an environment for
-# these tests by creating a temporary directory and
-# message files.
-#
-
-set locales {en en_US en_US_funky}
-
-catch {file mkdir msgdir}
-foreach l $locales {
-    set fd [open [string tolower [file join msgdir $l.msg]] w]
-    puts $fd "::msgcat::mcset $l abc abc-$l"
-    close $fd
-}
-
-test msgcat-5.1 {::msgcat::mcload} {
-    ::msgcat::mclocale en
-    ::msgcat::mcload msgdir
-} {1}
-test msgcat-5.2 {::msgcat::mcload} {
-    ::msgcat::mclocale en_US
-    ::msgcat::mcload msgdir
-} {2}
-test msgcat-5.3 {::msgcat::mcload} {
-    ::msgcat::mclocale en_US_funky
-    ::msgcat::mcload msgdir
-} {3}
-
-# Even though en_US_notexist does not exist,
-# en_US and en should be loaded.
-
-test msgcat-5.4 {::msgcat::mcload} {
-    ::msgcat::mclocale en_US_notexist
-    ::msgcat::mcload msgdir
-} {2}
-test msgcat-5.5 {::msgcat::mcload} {
-    ::msgcat::mclocale no_FI_notexist
-    ::msgcat::mcload msgdir
-} {0}
-test msgcat-5.6 {::msgcat::mcload} {
-    ::msgcat::mclocale en
-    ::msgcat::mc abc
-} {abc-en}
-test msgcat-5.7 {::msgcat::mcload} {
-    ::msgcat::mclocale en_US
-    ::msgcat::mc abc
-} {abc-en_US}
-test msgcat-5.8 {::msgcat::mcload} {
-    ::msgcat::mclocale en_US_funky
-    ::msgcat::mc abc
-} {abc-en_US_funky}
-test msgcat-5.9 {::msgcat::mcload} {
-    rename ::msgcat::mcunknown oldproc
-    proc ::msgcat::mcunknown {dom s} {
-        return "unknown:$dom:$s"
-    }
-    ::msgcat::mclocale no_FI_notexist
-    set result [::msgcat::mc abc]
-    rename ::msgcat::mcunknown {}
-    rename oldproc ::msgcat::mcunknown
-    set result
-} {unknown:no_fi_notexist:abc}
-
-# cleanup
-foreach l $locales {
-    file delete [string tolower [file join msgdir $l.msg]]
-}
-
-# Clean out the msg catalogs
-::msgcat::mclocale $oldlocale
-file delete msgdir
-
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/namespace-old.test b/tests/namespace-old.test
deleted file mode 100644
index d8a736e..0000000
--- a/tests/namespace-old.test
+++ /dev/null
@@ -1,863 +0,0 @@
-# Functionality covered: this file contains slightly modified versions of
-# the original tests written by Mike McLennan of Lucent Technologies for
-# the procedures in tclNamesp.c that implement Tcl's basic support for
-# namespaces. Other namespace-related tests appear in namespace.test
-# and variable.test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1997 Lucent Technologies
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: namespace-old.test,v 1.3 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Clear out any namespaces called test_ns_*
-catch {eval namespace delete [namespace children :: test_ns_*]}
-
-test namespace-old-1.1 {usage for "namespace" command} {
-    list [catch {namespace} msg] $msg
-} {1 {wrong # args: should be "namespace subcommand ?arg ...?"}}
-
-test namespace-old-1.2 {global namespace's name is "::" or {}} {
-    list [namespace current] [namespace eval {} {namespace current}]
-} {:: ::}
-
-test namespace-old-1.3 {usage for "namespace eval"} {
-    list [catch {namespace eval} msg] $msg
-} {1 {wrong # args: should be "namespace eval name arg ?arg...?"}}
-
-test namespace-old-1.4 {create new namespaces} {
-    list [lsort [namespace children :: test_ns_simple*]] \
-	 [namespace eval test_ns_simple {}] \
-	 [namespace eval test_ns_simple2 {}] \
-         [lsort [namespace children :: test_ns_simple*]]
-} {{} {} {} {::test_ns_simple ::test_ns_simple2}}
-
-test namespace-old-1.5 {access a new namespace} {
-    namespace eval test_ns_simple { namespace current }
-} {::test_ns_simple}
-
-test namespace-old-1.6 {usage for "namespace eval"} {
-    list [catch {namespace eval} msg] $msg
-} {1 {wrong # args: should be "namespace eval name arg ?arg...?"}}
-
-test namespace-old-1.7 {usage for "namespace eval"} {
-    list [catch {namespace eval test_ns_xyzzy} msg] $msg
-} {1 {wrong # args: should be "namespace eval name arg ?arg...?"}}
-
-test namespace-old-1.8 {command "namespace eval" concatenates args} {
-    namespace eval test_ns_simple namespace current
-} {::test_ns_simple}
-
-test namespace-old-1.9 {add elements to a namespace} {
-    namespace eval test_ns_simple {
-        variable test_ns_x 0
-        proc test {test_ns_x} {
-            return "test: $test_ns_x"
-        }
-    }
-} {}
-
-test namespace-old-1.10 {commands in a namespace} {
-    namespace eval test_ns_simple { info commands [namespace current]::*}
-} {::test_ns_simple::test}
-
-test namespace-old-1.11 {variables in a namespace} {
-    namespace eval test_ns_simple { info vars [namespace current]::* }
-} {::test_ns_simple::test_ns_x}
-
-test namespace-old-1.12 {global vars are separate from locals vars} {
-    list [test_ns_simple::test 123] [set test_ns_simple::test_ns_x]
-} {{test: 123} 0}
-
-test namespace-old-1.13 {add to an existing namespace} {
-    namespace eval test_ns_simple {
-        variable test_ns_y 123
-        proc _backdoor {cmd} {
-            eval $cmd
-        }
-    }
-} ""
-
-test namespace-old-1.14 {commands in a namespace} {
-    lsort [namespace eval test_ns_simple {info commands [namespace current]::*}]
-} {::test_ns_simple::_backdoor ::test_ns_simple::test}
-
-test namespace-old-1.15 {variables in a namespace} {
-    lsort [namespace eval test_ns_simple {info vars [namespace current]::*}]
-} {::test_ns_simple::test_ns_x ::test_ns_simple::test_ns_y}
-test namespace-old-1.16 {variables in a namespace} {
-    lsort [info vars test_ns_simple::*]
-} {::test_ns_simple::test_ns_x ::test_ns_simple::test_ns_y}
-
-test namespace-old-1.17 {commands in a namespace are hidden} {
-    list [catch "_backdoor {return yes!}" msg] $msg
-} {1 {invalid command name "_backdoor"}}
-test namespace-old-1.18 {using namespace qualifiers} {
-    list [catch "test_ns_simple::_backdoor {return yes!}" msg] $msg
-} {0 yes!}
-test namespace-old-1.19 {using absolute namespace qualifiers} {
-    list [catch "::test_ns_simple::_backdoor {return yes!}" msg] $msg
-} {0 yes!}
-
-test namespace-old-1.20 {variables in a namespace are hidden} {
-    list [catch "set test_ns_x" msg] $msg [catch "set test_ns_y" msg] $msg
-} {1 {can't read "test_ns_x": no such variable} 1 {can't read "test_ns_y": no such variable}}
-test namespace-old-1.21 {using namespace qualifiers} {
-    list [catch "set test_ns_simple::test_ns_x" msg] $msg \
-         [catch "set test_ns_simple::test_ns_y" msg] $msg
-} {0 0 0 123}
-test namespace-old-1.22 {using absolute namespace qualifiers} {
-    list [catch "set ::test_ns_simple::test_ns_x" msg] $msg \
-         [catch "set ::test_ns_simple::test_ns_y" msg] $msg
-} {0 0 0 123}
-test namespace-old-1.23 {variables can be accessed within a namespace} {
-    test_ns_simple::_backdoor {
-        variable test_ns_x
-        variable test_ns_y
-        return "$test_ns_x $test_ns_y"
-    }
-} {0 123}
-
-test namespace-old-1.24 {setting global variables} {
-    test_ns_simple::_backdoor {variable test_ns_x;  set test_ns_x "new val"}
-    namespace eval test_ns_simple {set test_ns_x}
-} {new val}
-
-test namespace-old-1.25 {qualified variables don't need a global declaration} {
-    namespace eval test_ns_another { variable test_ns_x 456 }
-    set cmd {set ::test_ns_another::test_ns_x}
-    list [catch {test_ns_simple::_backdoor "$cmd some-value"} msg] $msg \
-         [eval $cmd]
-} {0 some-value some-value}
-
-test namespace-old-1.26 {namespace qualifiers are okay after $'s} {
-    namespace eval test_ns_simple { set test_ns_x 12; set test_ns_y 34 }
-    set cmd {list $::test_ns_simple::test_ns_x $::test_ns_simple::test_ns_y}
-    list [test_ns_simple::_backdoor $cmd] [eval $cmd]
-} {{12 34} {12 34}}
-
-test namespace-old-1.27 {can create commands with null names} {
-    proc test_ns_simple:: {args} {return $args}
-} {}
-
-# -----------------------------------------------------------------------
-# TEST: using "info" in namespace contexts
-# -----------------------------------------------------------------------
-test namespace-old-2.1 {querying:  info commands} {
-    lsort [test_ns_simple::_backdoor {info commands [namespace current]::*}]
-} {::test_ns_simple:: ::test_ns_simple::_backdoor ::test_ns_simple::test}
-
-test namespace-old-2.2 {querying:  info procs} {
-    lsort [test_ns_simple::_backdoor {info procs}]
-} {{} _backdoor test}
-
-test namespace-old-2.3 {querying:  info vars} {
-    lsort [info vars test_ns_simple::*]
-} {::test_ns_simple::test_ns_x ::test_ns_simple::test_ns_y}
-
-test namespace-old-2.4 {querying:  info vars} {
-    lsort [test_ns_simple::_backdoor {info vars [namespace current]::*}]
-} {::test_ns_simple::test_ns_x ::test_ns_simple::test_ns_y}
-
-test namespace-old-2.5 {querying:  info locals} {
-    lsort [test_ns_simple::_backdoor {info locals}]
-} {cmd}
-
-test namespace-old-2.6 {querying:  info exists} {
-    test_ns_simple::_backdoor {info exists test_ns_x}
-} {0}
-
-test namespace-old-2.7 {querying:  info exists} {
-    test_ns_simple::_backdoor {info exists cmd}
-} {1}
-
-test namespace-old-2.8 {querying:  info args} {
-    info args test_ns_simple::_backdoor
-} {cmd}
-
-test namespace-old-2.9 {querying:  info body} {
-    string trim [info body test_ns_simple::test]
-} {return "test: $test_ns_x"}
-
-# -----------------------------------------------------------------------
-# TEST: namespace qualifiers, namespace tail
-# -----------------------------------------------------------------------
-test namespace-old-3.1 {usage for "namespace qualifiers"} {
-    list [catch "namespace qualifiers" msg] $msg
-} {1 {wrong # args: should be "namespace qualifiers string"}}
-
-test namespace-old-3.2 {querying:  namespace qualifiers} {
-    list [namespace qualifiers ""] \
-         [namespace qualifiers ::] \
-         [namespace qualifiers x] \
-         [namespace qualifiers ::x] \
-         [namespace qualifiers foo::x] \
-         [namespace qualifiers ::foo::bar::xyz]
-} {{} {} {} {} foo ::foo::bar}
-
-test namespace-old-3.3 {usage for "namespace tail"} {
-    list [catch "namespace tail" msg] $msg
-} {1 {wrong # args: should be "namespace tail string"}}
-
-test namespace-old-3.4 {querying:  namespace tail} {
-    list [namespace tail ""] \
-         [namespace tail ::] \
-         [namespace tail x] \
-         [namespace tail ::x] \
-         [namespace tail foo::x] \
-         [namespace tail ::foo::bar::xyz]
-} {{} {} x x x xyz}
-
-# -----------------------------------------------------------------------
-# TEST: delete commands and namespaces
-# -----------------------------------------------------------------------
-test namespace-old-4.1 {define test namespaces} {
-    namespace eval test_ns_delete {
-        namespace eval ns1 {
-            variable var1 1
-            proc cmd1 {} {return "cmd1"}
-        }
-        namespace eval ns2 {
-            variable var2 2
-            proc cmd2 {} {return "cmd2"}
-        }
-        namespace eval another {}
-        lsort [namespace children]
-    }
-} {::test_ns_delete::another ::test_ns_delete::ns1 ::test_ns_delete::ns2}
-
-test namespace-old-4.2 {it's okay to invoke "namespace delete" with no args} {
-    list [catch {namespace delete} msg] $msg
-} {0 {}}
-
-test namespace-old-4.3 {command "namespace delete" doesn't support patterns} {
-    set cmd {
-        namespace eval test_ns_delete {namespace delete ns*}
-    }
-    list [catch $cmd msg] $msg
-} {1 {unknown namespace "ns*" in namespace delete command}}
-
-test namespace-old-4.4 {command "namespace delete" handles multiple args} {
-    set cmd {
-        namespace eval test_ns_delete {
-            eval namespace delete \
-                [namespace children [namespace current] ns?]
-        }
-    }
-    list [catch $cmd msg] $msg [namespace children test_ns_delete]
-} {0 {} ::test_ns_delete::another}
-
-# -----------------------------------------------------------------------
-# TEST: namespace hierarchy
-# -----------------------------------------------------------------------
-test namespace-old-5.1 {define nested namespaces} {
-    set test_ns_var_global "var in ::"
-    proc test_ns_cmd_global {} {return "cmd in ::"}
-
-    namespace eval test_ns_hier1 {
-        set test_ns_var_hier1 "particular to hier1"
-        proc test_ns_cmd_hier1 {} {return "particular to hier1"}
-
-        set test_ns_level 1
-        proc test_ns_show {} {return "[namespace current]: 1"}
-
-        namespace eval test_ns_hier2 {
-            set test_ns_var_hier2 "particular to hier2"
-            proc test_ns_cmd_hier2 {} {return "particular to hier2"}
-
-            set test_ns_level 2
-            proc test_ns_show {} {return "[namespace current]: 2"}
-
-            namespace eval test_ns_hier3a {}
-            namespace eval test_ns_hier3b {}
-        }
-
-        namespace eval test_ns_hier2a {}
-        namespace eval test_ns_hier2b {}
-    }
-} {}
-
-test namespace-old-5.2 {namespaces can be nested} {
-    list [namespace eval test_ns_hier1 {namespace current}] \
-         [namespace eval test_ns_hier1 {
-              namespace eval test_ns_hier2 {namespace current}
-          }]
-} {::test_ns_hier1 ::test_ns_hier1::test_ns_hier2}
-
-test namespace-old-5.3 {namespace qualifiers work in namespace command} {
-    list [namespace eval ::test_ns_hier1 {namespace current}] \
-         [namespace eval test_ns_hier1::test_ns_hier2 {namespace current}] \
-         [namespace eval ::test_ns_hier1::test_ns_hier2 {namespace current}]
-} {::test_ns_hier1 ::test_ns_hier1::test_ns_hier2 ::test_ns_hier1::test_ns_hier2}
-
-test namespace-old-5.4 {nested namespaces can access global namespace} {
-    list [namespace eval test_ns_hier1 {set test_ns_var_global}] \
-         [namespace eval test_ns_hier1 {test_ns_cmd_global}] \
-         [namespace eval test_ns_hier1::test_ns_hier2 {set test_ns_var_global}] \
-         [namespace eval test_ns_hier1::test_ns_hier2 {test_ns_cmd_global}]
-} {{var in ::} {cmd in ::} {var in ::} {cmd in ::}}
-
-test namespace-old-5.5 {variables in different namespaces don't conflict} {
-    list [set test_ns_hier1::test_ns_level] \
-         [set test_ns_hier1::test_ns_hier2::test_ns_level]
-} {1 2}
-
-test namespace-old-5.6 {commands in different namespaces don't conflict} {
-    list [test_ns_hier1::test_ns_show] \
-         [test_ns_hier1::test_ns_hier2::test_ns_show]
-} {{::test_ns_hier1: 1} {::test_ns_hier1::test_ns_hier2: 2}}
-
-test namespace-old-5.7 {nested namespaces don't see variables in parent} {
-    set cmd {
-        namespace eval test_ns_hier1::test_ns_hier2 {set test_ns_var_hier1}
-    }
-    list [catch $cmd msg] $msg
-} {1 {can't read "test_ns_var_hier1": no such variable}}
-
-test namespace-old-5.8 {nested namespaces don't see commands in parent} {
-    set cmd {
-        namespace eval test_ns_hier1::test_ns_hier2 {test_ns_cmd_hier1}
-    }
-    list [catch $cmd msg] $msg
-} {1 {invalid command name "test_ns_cmd_hier1"}}
-
-test namespace-old-5.9 {usage for "namespace children"} {
-    list [catch {namespace children test_ns_hier1 y z} msg] $msg
-} {1 {wrong # args: should be "namespace children ?name? ?pattern?"}}
-
-test namespace-old-5.10 {command "namespace children" must get valid namespace} {
-    list [catch {namespace children xyzzy} msg] $msg
-} {1 {unknown namespace "xyzzy" in namespace children command}}
-
-test namespace-old-5.11 {querying namespace children} {
-    lsort [namespace children :: test_ns_hier*]
-} {::test_ns_hier1}
-
-test namespace-old-5.12 {querying namespace children} {
-    lsort [namespace children test_ns_hier1]
-} {::test_ns_hier1::test_ns_hier2 ::test_ns_hier1::test_ns_hier2a ::test_ns_hier1::test_ns_hier2b}
-
-test namespace-old-5.13 {querying namespace children} {
-    lsort [namespace eval test_ns_hier1 {namespace children}]
-} {::test_ns_hier1::test_ns_hier2 ::test_ns_hier1::test_ns_hier2a ::test_ns_hier1::test_ns_hier2b}
-
-test namespace-old-5.14 {querying namespace children} {
-    lsort [namespace children test_ns_hier1::test_ns_hier2]
-} {::test_ns_hier1::test_ns_hier2::test_ns_hier3a ::test_ns_hier1::test_ns_hier2::test_ns_hier3b}
-
-test namespace-old-5.15 {querying namespace children} {
-    lsort [namespace eval test_ns_hier1::test_ns_hier2 {namespace children}]
-} {::test_ns_hier1::test_ns_hier2::test_ns_hier3a ::test_ns_hier1::test_ns_hier2::test_ns_hier3b}
-
-test namespace-old-5.16 {querying namespace children with patterns} {
-    lsort [namespace children test_ns_hier1::test_ns_hier2 test_ns_*]
-} {::test_ns_hier1::test_ns_hier2::test_ns_hier3a ::test_ns_hier1::test_ns_hier2::test_ns_hier3b}
-
-test namespace-old-5.17 {querying namespace children with patterns} {
-    lsort [namespace children test_ns_hier1::test_ns_hier2 *b]
-} {::test_ns_hier1::test_ns_hier2::test_ns_hier3b}
-
-test namespace-old-5.18 {usage for "namespace parent"} {
-    list [catch {namespace parent x y} msg] $msg
-} {1 {wrong # args: should be "namespace parent ?name?"}}
-
-test namespace-old-5.19 {command "namespace parent" must get valid namespace} {
-    list [catch {namespace parent xyzzy} msg] $msg
-} {1 {unknown namespace "xyzzy" in namespace parent command}}
-
-test namespace-old-5.20 {querying namespace parent} {
-    list [namespace eval :: {namespace parent}] \
-        [namespace eval test_ns_hier1 {namespace parent}] \
-        [namespace eval test_ns_hier1::test_ns_hier2 {namespace parent}] \
-        [namespace eval test_ns_hier1::test_ns_hier2::test_ns_hier3a {namespace parent}] \
-} {{} :: ::test_ns_hier1 ::test_ns_hier1::test_ns_hier2}
-
-test namespace-old-5.21 {querying namespace parent for explicit namespace} {
-    list [namespace parent ::] \
-         [namespace parent test_ns_hier1] \
-         [namespace parent test_ns_hier1::test_ns_hier2] \
-         [namespace parent test_ns_hier1::test_ns_hier2::test_ns_hier3a]
-} {{} :: ::test_ns_hier1 ::test_ns_hier1::test_ns_hier2}
-
-# -----------------------------------------------------------------------
-# TEST: name resolution and caching
-# -----------------------------------------------------------------------
-test namespace-old-6.1 {relative ns names only looked up in current ns} {
-    namespace eval test_ns_cache1 {}
-    namespace eval test_ns_cache2 {}
-    namespace eval test_ns_cache2::test_ns_cache3 {}
-    set trigger {
-        namespace eval test_ns_cache2 {namespace current}
-    }
-    set trigger2 {
-        namespace eval test_ns_cache2::test_ns_cache3 {namespace current}
-    }
-    list [namespace eval test_ns_cache1 $trigger] \
-         [namespace eval test_ns_cache1 $trigger2]
-} {::test_ns_cache1::test_ns_cache2 ::test_ns_cache1::test_ns_cache2::test_ns_cache3}
-
-test namespace-old-6.2 {relative ns names only looked up in current ns} {
-    namespace eval test_ns_cache1::test_ns_cache2 {}
-    list [namespace eval test_ns_cache1 $trigger] \
-         [namespace eval test_ns_cache1 $trigger2]
-} {::test_ns_cache1::test_ns_cache2 ::test_ns_cache1::test_ns_cache2::test_ns_cache3}
-
-test namespace-old-6.3 {relative ns names only looked up in current ns} {
-    namespace eval test_ns_cache1::test_ns_cache2::test_ns_cache3 {}
-    list [namespace eval test_ns_cache1 $trigger] \
-         [namespace eval test_ns_cache1 $trigger2]
-} {::test_ns_cache1::test_ns_cache2 ::test_ns_cache1::test_ns_cache2::test_ns_cache3}
-
-test namespace-old-6.4 {relative ns names only looked up in current ns} {
-    namespace delete test_ns_cache1::test_ns_cache2
-    list [namespace eval test_ns_cache1 $trigger] \
-         [namespace eval test_ns_cache1 $trigger2]
-} {::test_ns_cache1::test_ns_cache2 ::test_ns_cache1::test_ns_cache2::test_ns_cache3}
-
-test namespace-old-6.5 {define test commands} {
-    proc test_ns_cache_cmd {} {
-        return "global version"
-    }
-    namespace eval test_ns_cache1 {
-        proc trigger {} {
-            test_ns_cache_cmd
-        }
-    }
-    test_ns_cache1::trigger
-} {global version}
-
-test namespace-old-6.6 {one-level check for command shadowing} {
-    proc test_ns_cache1::test_ns_cache_cmd {} {
-        return "cache1 version"
-    }
-    test_ns_cache1::trigger
-} {cache1 version}
-
-test namespace-old-6.7 {renaming commands changes command epoch} {
-    namespace eval test_ns_cache1 {
-        rename test_ns_cache_cmd test_ns_new
-    }
-    test_ns_cache1::trigger
-} {global version}
-
-test namespace-old-6.8 {renaming back handles shadowing} {
-    namespace eval test_ns_cache1 {
-        rename test_ns_new test_ns_cache_cmd
-    }
-    test_ns_cache1::trigger
-} {cache1 version}
-
-test namespace-old-6.9 {deleting commands changes command epoch} {
-    namespace eval test_ns_cache1 {
-        rename test_ns_cache_cmd ""
-    }
-    test_ns_cache1::trigger
-} {global version}
-
-test namespace-old-6.10 {define test namespaces} {
-    namespace eval test_ns_cache2 {
-        proc test_ns_cache_cmd {} {
-            return "global cache2 version"
-        }
-    }
-    namespace eval test_ns_cache1 {
-        proc trigger {} {
-            test_ns_cache2::test_ns_cache_cmd
-        }
-    }
-    namespace eval test_ns_cache1::test_ns_cache2 {
-        proc trigger {} {
-            test_ns_cache_cmd
-        }
-    }
-    list [test_ns_cache1::trigger] [test_ns_cache1::test_ns_cache2::trigger]
-} {{global cache2 version} {global version}}
-
-test namespace-old-6.11 {commands affect all parent namespaces} {
-    proc test_ns_cache1::test_ns_cache2::test_ns_cache_cmd {} {
-        return "cache2 version"
-    }
-    list [test_ns_cache1::trigger] [test_ns_cache1::test_ns_cache2::trigger]
-} {{cache2 version} {cache2 version}}
-
-test namespace-old-6.12 {define test variables} {
-    variable test_ns_cache_var "global version"
-    set trigger {set test_ns_cache_var}
-    namespace eval test_ns_cache1 $trigger
-} {global version}
-
-test namespace-old-6.13 {one-level check for variable shadowing} {
-    namespace eval test_ns_cache1 {
-        variable test_ns_cache_var "cache1 version"
-    }
-    namespace eval test_ns_cache1 $trigger
-} {cache1 version}
-
-test namespace-old-6.14 {deleting variables changes variable epoch} {
-    namespace eval test_ns_cache1 {
-        unset test_ns_cache_var
-    }
-    namespace eval test_ns_cache1 $trigger
-} {global version}
-
-test namespace-old-6.15 {define test namespaces} {
-    namespace eval test_ns_cache2 {
-        variable test_ns_cache_var "global cache2 version"
-    }
-    set trigger2 {set test_ns_cache2::test_ns_cache_var}
-    list [namespace eval test_ns_cache1 $trigger2] \
-         [namespace eval test_ns_cache1::test_ns_cache2 $trigger]
-} {{global cache2 version} {global version}}
-
-test namespace-old-6.16 {public variables affect all parent namespaces} {
-    variable test_ns_cache1::test_ns_cache2::test_ns_cache_var "cache2 version"
-    list [namespace eval test_ns_cache1 $trigger2] \
-         [namespace eval test_ns_cache1::test_ns_cache2 $trigger]
-} {{cache2 version} {cache2 version}}
-
-test namespace-old-6.17 {usage for "namespace which"} {
-    list [catch "namespace which -baz" msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-test namespace-old-6.18 {usage for "namespace which"} {
-    list [catch "namespace which -command" msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-
-test namespace-old-6.19 {querying:  namespace which -command} {
-    proc test_ns_cache1::test_ns_cache_cmd {} {
-        return "cache1 version"
-    }
-    list [namespace eval :: {namespace which test_ns_cache_cmd}] \
-         [namespace eval test_ns_cache1 {namespace which test_ns_cache_cmd}] \
-         [namespace eval :: {namespace which -command test_ns_cache_cmd}] \
-         [namespace eval test_ns_cache1 {namespace which -command test_ns_cache_cmd}]
-} {::test_ns_cache_cmd ::test_ns_cache1::test_ns_cache_cmd ::test_ns_cache_cmd ::test_ns_cache1::test_ns_cache_cmd}
-
-test namespace-old-6.20 {command "namespace which" may not find commands} {
-    namespace eval test_ns_cache1 {namespace which -command xyzzy}
-} {}
-
-test namespace-old-6.21 {querying:  namespace which -variable} {
-    namespace eval test_ns_cache1::test_ns_cache2 {
-        namespace which -variable test_ns_cache_var
-    }
-} {::test_ns_cache1::test_ns_cache2::test_ns_cache_var}
-
-test namespace-old-6.22 {command "namespace which" may not find variables} {
-    namespace eval test_ns_cache1 {namespace which -variable xyzzy}
-} {}
-
-# -----------------------------------------------------------------------
-# TEST: uplevel/upvar across namespace boundaries
-# -----------------------------------------------------------------------
-test namespace-old-7.1 {define test namespace} {
-    namespace eval test_ns_uplevel {
-        variable x 0
-        variable y 1
-
-        proc show_vars {num} {
-            return [uplevel $num {info vars}]
-        }
-        proc test_uplevel {num} {
-            set a 0
-            set b 1
-            namespace eval ::test_ns_uplevel " return \[show_vars $num\] "
-        }
-    }
-} {}
-test namespace-old-7.2 {uplevel can access namespace call frame} {
-    list [expr {[lsearch -exact [test_ns_uplevel::test_uplevel 1] x]>=0}] \
-         [expr {[lsearch -exact [test_ns_uplevel::test_uplevel 1] y]>=0}]
-} {1 1}
-test namespace-old-7.3 {uplevel can go beyond namespace call frame} {
-    lsort [test_ns_uplevel::test_uplevel 2]
-} {a b num}
-test namespace-old-7.4 {uplevel can go up to global context} {
-    expr {[test_ns_uplevel::test_uplevel 3] == [info globals]}
-} {1}
-
-test namespace-old-7.5 {absolute call frame references work too} {
-    list [expr {[lsearch -exact [test_ns_uplevel::test_uplevel #2] x]>=0}] \
-         [expr {[lsearch -exact [test_ns_uplevel::test_uplevel #2] y]>=0}]
-} {1 1}
-test namespace-old-7.6 {absolute call frame references work too} {
-    lsort [test_ns_uplevel::test_uplevel #1]
-} {a b num}
-test namespace-old-7.7 {absolute call frame references work too} {
-    expr {[test_ns_uplevel::test_uplevel #0] == [info globals]}
-} {1}
-
-test namespace-old-7.8 {namespaces are included in the call stack} {
-    namespace eval test_ns_upvar {
-        variable scope "test_ns_upvar"
-
-        proc show_val {var num} {
-            upvar $num $var x
-            return $x
-        }
-        proc test_upvar {num} {
-            set scope "test_ns_upvar::test_upvar"
-            namespace eval ::test_ns_upvar " return \[show_val scope $num\] "
-        }
-    }
-} {}
-test namespace-old-7.9 {upvar can access namespace call frame} {
-    test_ns_upvar::test_upvar 1
-} {test_ns_upvar}
-test namespace-old-7.10 {upvar can go beyond namespace call frame} {
-    test_ns_upvar::test_upvar 2
-} {test_ns_upvar::test_upvar}
-test namespace-old-7.11 {absolute call frame references work too} {
-    test_ns_upvar::test_upvar #2
-} {test_ns_upvar}
-test namespace-old-7.12 {absolute call frame references work too} {
-    test_ns_upvar::test_upvar #1
-} {test_ns_upvar::test_upvar}
-
-# -----------------------------------------------------------------------
-# TEST: variable traces across namespace boundaries
-# -----------------------------------------------------------------------
-test namespace-old-8.1 {traces work across namespace boundaries} {
-    namespace eval test_ns_trace {
-        namespace eval foo {
-            variable x ""
-        }
-
-        variable status ""
-        proc monitor {name1 name2 op} {
-            variable status
-            lappend status "$op: $name1"
-        }
-        trace variable foo::x rwu [namespace code monitor]
-    }
-    set test_ns_trace::foo::x "yes!"
-    set test_ns_trace::foo::x
-    unset test_ns_trace::foo::x
-
-    namespace eval test_ns_trace { set status }
-} {{w: test_ns_trace::foo::x} {r: test_ns_trace::foo::x} {u: test_ns_trace::foo::x}}
-
-# -----------------------------------------------------------------------
-# TEST: imported commands
-# -----------------------------------------------------------------------
-test namespace-old-9.1 {empty "namespace export" list} {
-    list [catch "namespace export" msg] $msg
-} {0 {}}
-test namespace-old-9.2 {usage for "namespace export" command} {
-    list [catch "namespace export test_ns_trace::zzz" msg] $msg
-} {1 {invalid export pattern "test_ns_trace::zzz": pattern can't specify a namespace}}
-
-test namespace-old-9.3 {define test namespaces for import} {
-    namespace eval test_ns_export {
-        namespace export cmd1 cmd2 cmd3
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-        proc cmd3 {args} {return "cmd3: $args"}
-        proc cmd4 {args} {return "cmd4: $args"}
-        proc cmd5 {args} {return "cmd5: $args"}
-        proc cmd6 {args} {return "cmd6: $args"}
-    }
-    lsort [info commands test_ns_export::*]
-} {::test_ns_export::cmd1 ::test_ns_export::cmd2 ::test_ns_export::cmd3 ::test_ns_export::cmd4 ::test_ns_export::cmd5 ::test_ns_export::cmd6}
-
-test namespace-old-9.4 {check export status} {
-    set x ""
-    namespace eval test_ns_import {
-        namespace export cmd1 cmd2
-        namespace import ::test_ns_export::*
-    }
-    foreach cmd [lsort [info commands test_ns_import::*]] {
-        lappend x $cmd
-    }
-    set x
-} {::test_ns_import::cmd1 ::test_ns_import::cmd2 ::test_ns_import::cmd3}
-
-test namespace-old-9.5 {empty import list in "namespace import" command} {
-    namespace import
-} {}
-
-test namespace-old-9.6 {empty import list for "namespace import" command} {
-    namespace import
-} {}
-
-test namespace-old-9.7 {empty forget list for "namespace forget" command} {
-    namespace forget
-} {}
-
-catch {rename cmd1 {}}
-catch {rename cmd2 {}}
-catch {rename ncmd {}}
-catch {rename ncmd1 {}}
-catch {rename ncmd2 {}}
-test namespace-old-9.8 {only exported commands are imported} {
-    namespace import test_ns_import::cmd*
-    set x [lsort [info commands cmd*]]
-} {cmd1 cmd2}
-
-test namespace-old-9.9 {imported commands work just the same as original} {
-    list [cmd1 test 1 2 3] [test_ns_import::cmd1 test 4 5 6]
-} {{cmd1: test 1 2 3} {cmd1: test 4 5 6}}
-
-test namespace-old-9.10 {commands can be imported from many namespaces} {
-    namespace eval test_ns_import2 {
-        namespace export ncmd ncmd1 ncmd2
-        proc ncmd  {args} {return "ncmd: $args"}
-        proc ncmd1 {args} {return "ncmd1: $args"}
-        proc ncmd2 {args} {return "ncmd2: $args"}
-        proc ncmd3 {args} {return "ncmd3: $args"}
-    }
-    namespace import test_ns_import2::*
-    lsort [concat [info commands cmd*] [info commands ncmd*]]
-} {cmd1 cmd2 ncmd ncmd1 ncmd2}
-
-test namespace-old-9.11 {imported commands can be removed by deleting them} {
-    rename cmd1 ""
-    lsort [concat [info commands cmd*] [info commands ncmd*]]
-} {cmd2 ncmd ncmd1 ncmd2}
-
-test namespace-old-9.12 {command "namespace forget" checks for valid namespaces} {
-    list [catch {namespace forget xyzzy::*} msg] $msg
-} {1 {unknown namespace in namespace forget pattern "xyzzy::*"}}
-
-test namespace-old-9.13 {command "namespace forget" ignores patterns that don't match} {
-    list [catch {namespace forget test_ns_import::xy*zzy} msg] $msg \
-         [lsort [info commands cmd?]]
-} {0 {} cmd2}
-
-test namespace-old-9.14 {imported commands can be removed} {
-    namespace forget test_ns_import::cmd?
-    list [lsort [info commands cmd?]] \
-         [catch {cmd1 another test} msg] $msg
-} {{} 1 {invalid command name "cmd1"}}
-
-test namespace-old-9.15 {existing commands can't be overwritten} {
-    proc cmd1 {x y} {
-        return [expr $x+$y]
-    }
-    list [catch {namespace import test_ns_import::cmd?} msg] $msg \
-         [cmd1 3 5]
-} {1 {can't import command "cmd1": already exists} 8}
-
-test namespace-old-9.16 {use "-force" option to override existing commands} {
-    list [cmd1 3 5] \
-         [namespace import -force test_ns_import::cmd?] \
-         [cmd1 3 5]
-} {8 {} {cmd1: 3 5}}
-
-test namespace-old-9.17 {commands can be imported into many namespaces} {
-    namespace eval test_ns_import_use {
-        namespace import ::test_ns_import::* ::test_ns_import2::ncmd?
-        lsort [concat [info commands ::test_ns_import_use::cmd*] \
-                      [info commands ::test_ns_import_use::ncmd*]]
-    }
-} {::test_ns_import_use::cmd1 ::test_ns_import_use::cmd2 ::test_ns_import_use::ncmd1 ::test_ns_import_use::ncmd2}
-
-test namespace-old-9.18 {when command is deleted, imported commands go away} {
-    namespace eval test_ns_import { rename cmd1 "" }
-    list [info commands cmd1] \
-         [namespace eval test_ns_import_use {info commands cmd1}]
-} {{} {}}
-
-test namespace-old-9.19 {when namesp is deleted, all imported commands go away} {
-    namespace delete test_ns_import test_ns_import2
-    list [info commands cmd*] \
-         [info commands ncmd*] \
-         [namespace eval test_ns_import_use {info commands cmd*}] \
-         [namespace eval test_ns_import_use {info commands ncmd*}] \
-} {{} {} {} {}}
-
-# -----------------------------------------------------------------------
-# TEST: scoped values
-# -----------------------------------------------------------------------
-test namespace-old-10.1 {define namespace for scope test} {
-    namespace eval test_ns_inscope {
-        variable x "x-value"
-        proc show {args} {
-            return "show: $args"
-        }
-        proc do {args} {
-            return [eval $args]
-        }
-        list [set x] [show test]
-    }
-} {x-value {show: test}}
-
-test namespace-old-10.2 {command "namespace code" requires one argument} {
-    list [catch {namespace code} msg] $msg
-} {1 {wrong # args: should be "namespace code arg"}}
-
-test namespace-old-10.3 {command "namespace code" requires one argument} {
-    list [catch {namespace code first "second arg" third} msg] $msg
-} {1 {wrong # args: should be "namespace code arg"}}
-
-test namespace-old-10.4 {command "namespace code" gets current namesp context} {
-    namespace eval test_ns_inscope {
-        namespace code {"1 2 3" "4 5" 6}
-    }
-} {namespace inscope ::test_ns_inscope {"1 2 3" "4 5" 6}}
-
-test namespace-old-10.5 {with one arg, first "scope" sticks} {
-    set sval [namespace eval test_ns_inscope {namespace code {one two}}]
-    namespace code $sval
-} {namespace inscope ::test_ns_inscope {one two}}
-
-test namespace-old-10.6 {with many args, each "scope" adds new args} {
-    set sval [namespace eval test_ns_inscope {namespace code {one two}}]
-    namespace code "$sval three"
-} {namespace inscope ::test_ns_inscope {one two} three}
-
-test namespace-old-10.7 {scoped commands work with eval} {
-    set cref [namespace eval test_ns_inscope {namespace code show}]
-    list [eval $cref "a" "b c" "d e f"]
-} {{show: a b c d e f}}
-
-test namespace-old-10.8 {scoped commands execute in namespace context} {
-    set cref [namespace eval test_ns_inscope {
-        namespace code {set x "some new value"}
-    }]
-    list [set test_ns_inscope::x] [eval $cref] [set test_ns_inscope::x]
-} {x-value {some new value} {some new value}}
-
-foreach cmd [info commands test_ns_*] {
-    rename $cmd ""
-}
-catch {rename cmd {}}
-catch {rename cmd1 {}}
-catch {rename cmd2 {}}
-catch {rename ncmd {}}
-catch {rename ncmd1 {}}
-catch {rename ncmd2 {}}
-catch {unset cref}
-catch {unset trigger}
-catch {unset trigger2}
-catch {unset sval}
-catch {unset msg}
-catch {unset x}
-catch {unset test_ns_var_global}
-catch {unset cmd}
-eval namespace delete [namespace children :: test_ns_*]
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/namespace.test b/tests/namespace.test
deleted file mode 100644
index 54f1149..0000000
--- a/tests/namespace.test
+++ /dev/null
@@ -1,1115 +0,0 @@
-# Functionality covered: this file contains a collection of tests for the
-# procedures in tclNamesp.c that implement Tcl's basic support for
-# namespaces. Other namespace-related tests appear in variable.test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: namespace.test,v 1.4 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Clear out any namespaces called test_ns_*
-catch {eval namespace delete [namespace children :: test_ns_*]}
-
-test namespace-1.1 {TclInitNamespaces, GetNamespaceFromObj, NamespaceChildrenCmd} {
-    namespace children :: test_ns_*
-} {}
-
-catch {unset l}
-test namespace-2.1 {Tcl_GetCurrentNamespace} {
-    list [namespace current] [namespace eval {} {namespace current}] \
-        [namespace eval {} {namespace current}]
-} {:: :: ::}
-test namespace-2.2 {Tcl_GetCurrentNamespace} {
-    set l {}
-    lappend l [namespace current]
-    namespace eval test_ns_1 {
-        lappend l [namespace current]
-        namespace eval foo {
-            lappend l [namespace current]
-        }
-    }
-    lappend l [namespace current]
-    set l
-} {:: ::test_ns_1 ::test_ns_1::foo ::}
-
-test namespace-3.1 {Tcl_GetGlobalNamespace} {
-    namespace eval test_ns_1 {namespace eval foo {namespace eval bar {} } }
-    # namespace children uses Tcl_GetGlobalNamespace 
-    namespace eval test_ns_1 {namespace children foo b*}
-} {::test_ns_1::foo::bar}
-
-test namespace-4.1 {Tcl_PushCallFrame with isProcCallFrame=1} {
-    namespace eval test_ns_1 {
-        variable v 123
-        proc p {} {
-            variable v
-            return $v
-        }
-    }
-    test_ns_1::p    ;# does Tcl_PushCallFrame to push p's namespace
-} {123}
-test namespace-4.2 {Tcl_PushCallFrame with isProcCallFrame=0} {
-    namespace eval test_ns_1::baz {}  ;# does Tcl_PushCallFrame to create baz
-    proc test_ns_1::baz::p {} {
-        variable v
-        set v 789
-        set v}
-    test_ns_1::baz::p
-} {789}
-
-test namespace-5.1 {Tcl_PopCallFrame, no vars} {
-    namespace eval test_ns_1::blodge {}  ;# pushes then pops frame
-} {}
-test namespace-5.2 {Tcl_PopCallFrame, local vars must be deleted} {
-    proc test_ns_1::r {} {
-        set a 123
-    }
-    test_ns_1::r   ;# pushes then pop's r's frame
-} {123}
-
-test namespace-6.1 {Tcl_CreateNamespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [lsort [namespace children :: test_ns_*]] \
-	 [namespace eval test_ns_1 {namespace current}] \
-	 [namespace eval test_ns_2 {namespace current}] \
-	 [namespace eval ::test_ns_3 {namespace current}] \
-	 [namespace eval ::test_ns_4 \
-             {namespace eval foo {namespace current}}] \
-	 [namespace eval ::test_ns_5 \
-             {namespace eval ::test_ns_6 {namespace current}}] \
-         [lsort [namespace children :: test_ns_*]]
-} {{} ::test_ns_1 ::test_ns_2 ::test_ns_3 ::test_ns_4::foo ::test_ns_6 {::test_ns_1 ::test_ns_2 ::test_ns_3 ::test_ns_4 ::test_ns_5 ::test_ns_6}}
-test namespace-6.2 {Tcl_CreateNamespace, odd number of :'s in name is okay} {
-    list [namespace eval :::test_ns_1::::foo {namespace current}] \
-         [namespace eval test_ns_2:::::foo {namespace current}]
-} {::test_ns_1::foo ::test_ns_2::foo}
-test namespace-6.3 {Tcl_CreateNamespace, trailing ::s in ns name are ignored} {
-    list [catch {namespace eval test_ns_7::: {namespace current}} msg] $msg 
-} {0 ::test_ns_7}
-test namespace-6.4 {Tcl_CreateNamespace, trailing ::s in ns name are ignored} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1:: {
-        namespace eval test_ns_2:: {}
-        namespace eval test_ns_3:: {}
-    }
-    namespace children ::test_ns_1
-} {::test_ns_1::test_ns_2 ::test_ns_1::test_ns_3}
-test namespace-6.5 {Tcl_CreateNamespace, relative ns names now only looked up in current ns} {
-    set trigger {
-        namespace eval test_ns_2 {namespace current}
-    }
-    set l {}
-    lappend l [namespace eval test_ns_1 $trigger]
-    namespace eval test_ns_1::test_ns_2 {}
-    lappend l [namespace eval test_ns_1 $trigger]
-} {::test_ns_1::test_ns_2 ::test_ns_1::test_ns_2}
-
-test namespace-7.1 {Tcl_DeleteNamespace, active call frames in ns} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        proc p {} {
-            namespace delete [namespace current]
-            return [namespace current]
-        }
-    }
-    list [test_ns_1::p] [catch {test_ns_1::p} msg] $msg
-} {::test_ns_1 1 {invalid command name "test_ns_1::p"}}
-test namespace-7.2 {Tcl_DeleteNamespace, no active call frames in ns} {
-    namespace eval test_ns_2 {
-        proc p {} {
-            return [namespace current]
-        }
-    }
-    list [test_ns_2::p] [namespace delete test_ns_2]
-} {::test_ns_2 {}}
-
-test namespace-8.1 {TclTeardownNamespace, delete global namespace} {
-    catch {interp delete test_interp}
-    interp create test_interp
-    interp eval test_interp {
-        namespace eval test_ns_1 {
-            namespace export p
-            proc p {} {
-                return [namespace current]
-            }
-        }
-        namespace eval test_ns_2 {
-            namespace import ::test_ns_1::p
-            variable v 27
-            proc q {} {
-                variable v
-                return "[p] $v"
-            }
-        }
-        set x [test_ns_2::q]
-        catch {set xxxx}
-    }
-    list [interp eval test_interp {test_ns_2::q}] \
-         [interp eval test_interp {namespace delete ::}] \
-         [catch {interp eval test_interp {set a 123}} msg] $msg \
-         [interp delete test_interp]
-} {{::test_ns_1 27} {} 1 {invalid command name "set"} {}}
-test namespace-8.2 {TclTeardownNamespace, remove deleted ns from parent} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::test_ns_2::test_ns_3a {proc p {} {}}
-    namespace eval test_ns_1::test_ns_2::test_ns_3b {proc q {} {}}
-    list [namespace children test_ns_1] \
-         [namespace delete test_ns_1::test_ns_2] \
-         [namespace children test_ns_1]
-} {::test_ns_1::test_ns_2 {} {}}
-test namespace-8.3 {TclTeardownNamespace, delete child namespaces} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::test_ns_2::test_ns_3a {proc p {} {}}
-    namespace eval test_ns_1::test_ns_2::test_ns_3b {proc q {} {}}
-    list [namespace children test_ns_1] \
-         [namespace delete test_ns_1::test_ns_2] \
-         [namespace children test_ns_1] \
-         [catch {namespace children test_ns_1::test_ns_2} msg] $msg \
-         [info commands test_ns_1::test_ns_2::test_ns_3a::*]
-} {::test_ns_1::test_ns_2 {} {} 1 {unknown namespace "test_ns_1::test_ns_2" in namespace children command} {}}
-test namespace-8.4 {TclTeardownNamespace, cmds imported from deleted ns go away} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_export {
-        namespace export cmd1 cmd2
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_import {
-        namespace import ::test_ns_export::*
-        proc p {} {return foo}
-    }
-    list [info commands test_ns_import::*] \
-         [namespace delete test_ns_export] \
-         [info commands test_ns_import::*]
-} {{::test_ns_import::p ::test_ns_import::cmd1 ::test_ns_import::cmd2} {} ::test_ns_import::p}
-
-test namespace-9.1 {Tcl_Import, empty import pattern} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace eval test_ns_import {namespace import {}}} msg] $msg
-} {1 {empty import pattern}}
-test namespace-9.2 {Tcl_Import, unknown namespace in import pattern} {
-    list [catch {namespace eval test_ns_import {namespace import fred::x}} msg] $msg
-} {1 {unknown namespace in import pattern "fred::x"}}
-test namespace-9.3 {Tcl_Import, import ns == export ns} {
-    list [catch {namespace eval test_ns_import {namespace import ::test_ns_import::puts}} msg] $msg
-} {1 {import pattern "::test_ns_import::puts" tries to import from namespace "test_ns_import" into itself}}
-test namespace-9.4 {Tcl_Import, simple import} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_export {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_import {
-        namespace import ::test_ns_export::*
-        proc p {} {return [cmd1 123]}
-    }
-    test_ns_import::p
-} {cmd1: 123}
-test namespace-9.5 {Tcl_Import, can't redefine cmd unless allowOverwrite!=0} {
-    list [catch {namespace eval test_ns_import {namespace import ::test_ns_export::*}} msg] $msg
-} {1 {can't import command "cmd1": already exists}}
-test namespace-9.6 {Tcl_Import, cmd redefinition ok if allowOverwrite!=0} {
-    namespace eval test_ns_import {
-        namespace import -force ::test_ns_export::*
-        cmd1 555
-    }
-} {cmd1: 555}
-test namespace-9.7 {Tcl_Import, links are preserved if cmd is redefined} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_export {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-    }
-    namespace eval test_ns_import {
-        namespace import -force ::test_ns_export::*
-    }
-    list [test_ns_import::cmd1 a b c] \
-         [test_ns_export::cmd1 d e f] \
-         [proc test_ns_export::cmd1 {args} {return "new1: $args"}] \
-         [namespace origin test_ns_import::cmd1] \
-         [namespace origin test_ns_export::cmd1] \
-         [test_ns_import::cmd1 g h i] \
-         [test_ns_export::cmd1 j k l]
-} {{cmd1: a b c} {cmd1: d e f} {} ::test_ns_export::cmd1 ::test_ns_export::cmd1 {new1: g h i} {new1: j k l}}
-
-test namespace-10.1 {Tcl_ForgetImport, check for valid namespaces} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace forget xyzzy::*} msg] $msg
-} {1 {unknown namespace in namespace forget pattern "xyzzy::*"}}
-test namespace-10.2 {Tcl_ForgetImport, ignores patterns that don't match} {
-    namespace eval test_ns_export {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_import {
-        namespace forget ::test_ns_export::wombat
-    }
-} {}
-test namespace-10.3 {Tcl_ForgetImport, deletes matching imported cmds} {
-    namespace eval test_ns_import {
-        namespace import ::test_ns_export::*
-        proc p {} {return [cmd1 123]}
-        set l {}
-        lappend l [info commands ::test_ns_import::*]
-        namespace forget ::test_ns_export::cmd1
-        lappend l [info commands ::test_ns_import::*]
-        lappend l [catch {cmd1 777} msg] $msg
-    }
-} {{::test_ns_import::p ::test_ns_import::cmd1} ::test_ns_import::p 1 {invalid command name "cmd1"}}
-
-test namespace-11.1 {TclGetOriginalCommand, check if not imported cmd} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_export {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-    }
-    list [namespace origin set] [namespace origin test_ns_export::cmd1]
-} {::set ::test_ns_export::cmd1}
-test namespace-11.2 {TclGetOriginalCommand, directly imported cmd} {
-    namespace eval test_ns_import1 {
-        namespace import ::test_ns_export::*
-        namespace export *
-        proc p {} {namespace origin cmd1}
-    }
-    list [test_ns_import1::p] [namespace origin test_ns_import1::cmd1]
-} {::test_ns_export::cmd1 ::test_ns_export::cmd1}
-test namespace-11.3 {TclGetOriginalCommand, indirectly imported cmd} {
-    namespace eval test_ns_import2 {
-        namespace import ::test_ns_import1::*
-        proc q {} {return [cmd1 123]}
-    }
-    list [test_ns_import2::q] [namespace origin test_ns_import2::cmd1]
-} {{cmd1: 123} ::test_ns_export::cmd1}
-
-test namespace-12.1 {InvokeImportedCmd} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_export {
-        namespace export cmd1
-        proc cmd1 {args} {namespace current}
-    }
-    namespace eval test_ns_import {
-        namespace import ::test_ns_export::*
-    }
-    list [test_ns_import::cmd1]
-} {::test_ns_export}
-
-test namespace-13.1 {DeleteImportedCmd, deletes imported cmds} {
-    namespace eval test_ns_import {
-        set l {}
-        lappend l [info commands ::test_ns_import::*]
-        namespace forget ::test_ns_export::cmd1
-        lappend l [info commands ::test_ns_import::*]
-    }
-} {::test_ns_import::cmd1 {}}
-
-test namespace-14.1 {TclGetNamespaceForQualName, absolute names} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    variable v 10
-    namespace eval test_ns_1::test_ns_2 {
-        variable v 20
-    }
-    namespace eval test_ns_2 {
-        variable v 30
-    }
-    namespace eval test_ns_1 {
-        list $::v $::test_ns_2::v $::test_ns_1::test_ns_2::v \
-             [namespace children :: test_ns_*]
-    }
-} {10 30 20 {::test_ns_1 ::test_ns_2}}
-test namespace-14.2 {TclGetNamespaceForQualName, invalid absolute names} {
-    namespace eval test_ns_1 {
-        list [catch {set ::test_ns_777::v} msg] $msg \
-             [catch {namespace children test_ns_777} msg] $msg
-    }
-} {1 {can't read "::test_ns_777::v": no such variable} 1 {unknown namespace "test_ns_777" in namespace children command}}
-test namespace-14.3 {TclGetNamespaceForQualName, relative names} {
-    namespace eval test_ns_1 {
-        list $v $test_ns_2::v
-    }
-} {10 20}
-test namespace-14.4 {TclGetNamespaceForQualName, relative ns names looked up only in current ns} {
-    namespace eval test_ns_1::test_ns_2 {
-        namespace eval foo {}
-    }
-    namespace eval test_ns_1 {
-        list [namespace children test_ns_2] \
-             [catch {namespace children test_ns_1} msg] $msg
-    }
-} {::test_ns_1::test_ns_2::foo 1 {unknown namespace "test_ns_1" in namespace children command}}
-test namespace-14.5 {TclGetNamespaceForQualName, relative ns names looked up only in current ns} {
-    namespace eval ::test_ns_2 {
-        namespace eval bar {}
-    }
-    namespace eval test_ns_1 {
-        set l [list [catch {namespace delete test_ns_2::bar} msg] $msg]
-    }
-    set l
-} {1 {unknown namespace "test_ns_2::bar" in namespace delete command}}
-test namespace-14.6 {TclGetNamespaceForQualName, relative ns names looked up only in current ns} {
-    namespace eval test_ns_1::test_ns_2 {
-        namespace eval foo {}
-    }
-    namespace eval test_ns_1 {
-        list [namespace children test_ns_2] \
-             [catch {namespace children test_ns_1} msg] $msg
-    }
-} {::test_ns_1::test_ns_2::foo 1 {unknown namespace "test_ns_1" in namespace children command}}
-test namespace-14.7 {TclGetNamespaceForQualName, ignore extra :s if ns} {
-    namespace children test_ns_1:::
-} {::test_ns_1::test_ns_2}
-test namespace-14.8 {TclGetNamespaceForQualName, ignore extra :s if ns} {
-    namespace children :::test_ns_1:::::test_ns_2:::
-} {::test_ns_1::test_ns_2::foo}
-test namespace-14.9 {TclGetNamespaceForQualName, extra ::s are significant for vars} {
-    set l {}
-    lappend l [catch {set test_ns_1::test_ns_2::} msg] $msg
-    namespace eval test_ns_1::test_ns_2 {variable {} 2525}
-    lappend l [set test_ns_1::test_ns_2::]
-} {1 {can't read "test_ns_1::test_ns_2::": no such variable} 2525}
-test namespace-14.10 {TclGetNamespaceForQualName, extra ::s are significant for vars} {
-    catch {unset test_ns_1::test_ns_2::}
-    set l {}
-    lappend l [catch {set test_ns_1::test_ns_2::} msg] $msg
-    set test_ns_1::test_ns_2:: 314159
-    lappend l [set test_ns_1::test_ns_2::]
-} {1 {can't read "test_ns_1::test_ns_2::": no such variable} 314159}
-test namespace-14.11 {TclGetNamespaceForQualName, extra ::s are significant for commands} {
-    catch {rename test_ns_1::test_ns_2:: {}}
-    set l {}
-    lappend l [catch {test_ns_1::test_ns_2:: hello} msg] $msg
-    proc test_ns_1::test_ns_2:: {args} {return "\{\}: $args"}
-    lappend l [test_ns_1::test_ns_2:: hello]
-} {1 {invalid command name "test_ns_1::test_ns_2::"} {{}: hello}}
-test namespace-14.12 {TclGetNamespaceForQualName, extra ::s are significant for vars} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        variable {}
-        set test_ns_1::(x) y
-    }
-    set test_ns_1::(x)
-} y
-test namespace-14.13 {TclGetNamespaceForQualName, namespace other than global ns can't have empty name} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace eval test_ns_1 {proc {} {} {}; namespace eval {} {}; {}}} msg] $msg
-} {1 {can't create namespace "": only global namespace can have empty name}}
-
-test namespace-15.1 {Tcl_FindNamespace, absolute name found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_delete {
-        namespace eval test_ns_delete2 {}
-        proc cmd {args} {namespace current}
-    }
-    list [namespace delete ::test_ns_delete::test_ns_delete2] \
-         [namespace children ::test_ns_delete]
-} {{} {}}
-test namespace-15.2 {Tcl_FindNamespace, absolute name not found} {
-    list [catch {namespace delete ::test_ns_delete::test_ns_delete2} msg] $msg
-} {1 {unknown namespace "::test_ns_delete::test_ns_delete2" in namespace delete command}}
-test namespace-15.3 {Tcl_FindNamespace, relative name found} {
-    namespace eval test_ns_delete {
-        namespace eval test_ns_delete2 {}
-        namespace eval test_ns_delete3 {}
-        list [namespace delete test_ns_delete2] \
-             [namespace children [namespace current]]
-    }
-} {{} ::test_ns_delete::test_ns_delete3}
-test namespace-15.4 {Tcl_FindNamespace, relative name not found} {
-    namespace eval test_ns_delete2 {}
-    namespace eval test_ns_delete {
-        list [catch {namespace delete test_ns_delete2} msg] $msg
-    }
-} {1 {unknown namespace "test_ns_delete2" in namespace delete command}}
-
-test namespace-16.1 {Tcl_FindCommand, absolute name found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        proc cmd {args} {return "[namespace current]::cmd: $args"}
-        variable v "::test_ns_1::cmd"
-        eval $v one
-    }
-} {::test_ns_1::cmd: one}
-test namespace-16.2 {Tcl_FindCommand, absolute name found} {
-    eval $test_ns_1::v two
-} {::test_ns_1::cmd: two}
-test namespace-16.3 {Tcl_FindCommand, absolute name not found} {
-    namespace eval test_ns_1 {
-        variable v2 "::test_ns_1::ladidah"
-        list [catch {eval $v2} msg] $msg
-    }
-} {1 {invalid command name "::test_ns_1::ladidah"}}
-
-# save the "unknown" proc, which is redefined by the following two tests
-catch {rename unknown unknown.old}
-proc unknown {args} {
-    return "unknown: $args"
-}
-test namespace-16.4 {Tcl_FindCommand, absolute name and TCL_GLOBAL_ONLY} {
-    ::test_ns_1::foobar x y z
-} {unknown: ::test_ns_1::foobar x y z}
-test namespace-16.5 {Tcl_FindCommand, absolute name and TCL_GLOBAL_ONLY} {
-    ::foobar 1 2 3 4 5
-} {unknown: ::foobar 1 2 3 4 5}
-test namespace-16.6 {Tcl_FindCommand, relative name and TCL_GLOBAL_ONLY} {
-    test_ns_1::foobar x y z
-} {unknown: test_ns_1::foobar x y z}
-test namespace-16.7 {Tcl_FindCommand, relative name and TCL_GLOBAL_ONLY} {
-    foobar 1 2 3 4 5
-} {unknown: foobar 1 2 3 4 5}
-# restore the "unknown" proc saved previously
-catch {rename unknown {}}
-catch {rename unknown.old unknown}
-
-test namespace-16.8 {Tcl_FindCommand, relative name found} {
-    namespace eval test_ns_1 {
-        cmd a b c
-    }
-} {::test_ns_1::cmd: a b c}
-test namespace-16.9 {Tcl_FindCommand, relative name found} {
-    catch {rename cmd2 {}}
-    proc cmd2 {args} {return "[namespace current]::cmd2: $args"}
-    namespace eval test_ns_1 {
-       cmd2 a b c
-    }
-} {::::cmd2: a b c}
-test namespace-16.10 {Tcl_FindCommand, relative name found, only look in current then global ns} {
-    namespace eval test_ns_1 {
-        proc cmd2 {args} {
-            return "[namespace current]::cmd2 in test_ns_1: $args"
-        }
-        namespace eval test_ns_12 {
-            cmd2 a b c
-        }
-    }
-} {::::cmd2: a b c}
-test namespace-16.11 {Tcl_FindCommand, relative name not found} {
-    namespace eval test_ns_1 {
-       list [catch {cmd3 a b c} msg] $msg
-    }
-} {1 {invalid command name "cmd3"}}
-
-catch {unset x}
-test namespace-17.1 {Tcl_FindNamespaceVar, absolute name found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    set x 314159
-    namespace eval test_ns_1 {
-        set ::x
-    }
-} {314159}
-test namespace-17.2 {Tcl_FindNamespaceVar, absolute name found} {
-    namespace eval test_ns_1 {
-        variable x 777
-        set ::test_ns_1::x
-    }
-} {777}
-test namespace-17.3 {Tcl_FindNamespaceVar, absolute name found} {
-    namespace eval test_ns_1 {
-        namespace eval test_ns_2 {
-            variable x 1111
-        }
-        set ::test_ns_1::test_ns_2::x
-    }
-} {1111}
-test namespace-17.4 {Tcl_FindNamespaceVar, absolute name not found} {
-    namespace eval test_ns_1 {
-        namespace eval test_ns_2 {
-            variable x 1111
-        }
-        list [catch {set ::test_ns_1::test_ns_2::y} msg] $msg
-    }
-} {1 {can't read "::test_ns_1::test_ns_2::y": no such variable}}
-test namespace-17.5 {Tcl_FindNamespaceVar, absolute name and TCL_GLOBAL_ONLY} {
-    namespace eval test_ns_1 {
-        namespace eval test_ns_3 {
-            variable ::test_ns_1::test_ns_2::x 2222
-        }
-    }
-    set ::test_ns_1::test_ns_2::x
-} {2222}
-test namespace-17.6 {Tcl_FindNamespaceVar, relative name found} {
-    namespace eval test_ns_1 {
-        set x
-    }
-} {777}
-test namespace-17.7 {Tcl_FindNamespaceVar, relative name found} {
-    namespace eval test_ns_1 {
-        unset x
-        set x  ;# must be global x now
-    }
-} {314159}
-test namespace-17.8 {Tcl_FindNamespaceVar, relative name not found} {
-    namespace eval test_ns_1 {
-        list [catch {set wuzzat} msg] $msg
-    }
-} {1 {can't read "wuzzat": no such variable}}
-test namespace-17.9 {Tcl_FindNamespaceVar, relative name and TCL_GLOBAL_ONLY} {
-    namespace eval test_ns_1 {
-        variable a hello
-    }
-    set test_ns_1::a
-} {hello}
-catch {unset x}
-
-catch {unset l}
-catch {rename foo {}}
-test namespace-18.1 {TclResetShadowedCmdRefs, one-level check for command shadowing} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    proc foo {} {return "global foo"}
-    namespace eval test_ns_1 {
-        proc trigger {} {
-            return [foo]
-        }
-    }
-    set l ""
-    lappend l [test_ns_1::trigger]
-    namespace eval test_ns_1 {
-        # force invalidation of cached ref to "foo" in proc trigger
-        proc foo {} {return "foo in test_ns_1"}
-    }
-    lappend l [test_ns_1::trigger]
-    set l
-} {{global foo} {foo in test_ns_1}}
-test namespace-18.2 {TclResetShadowedCmdRefs, multilevel check for command shadowing} {
-    namespace eval test_ns_2 {
-        proc foo {} {return "foo in ::test_ns_2"}
-    }
-    namespace eval test_ns_1 {
-        namespace eval test_ns_2 {}
-        proc trigger {} {
-            return [test_ns_2::foo]
-        }
-    }
-    set l ""
-    lappend l [test_ns_1::trigger]
-    namespace eval test_ns_1 {
-        namespace eval test_ns_2 {
-            # force invalidation of cached ref to "foo" in proc trigger
-            proc foo {} {return "foo in ::test_ns_1::test_ns_2"}
-        }
-    }
-    lappend l [test_ns_1::trigger]
-    set l
-} {{foo in ::test_ns_2} {foo in ::test_ns_1::test_ns_2}}
-catch {unset l}
-catch {rename foo {}}
-
-test namespace-19.1 {GetNamespaceFromObj, global name found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::test_ns_2 {}
-    namespace children ::test_ns_1
-} {::test_ns_1::test_ns_2}
-test namespace-19.2 {GetNamespaceFromObj, relative name found} {
-    namespace eval test_ns_1 {
-        namespace children test_ns_2
-    }
-} {}
-test namespace-19.3 {GetNamespaceFromObj, name not found} {
-    namespace eval test_ns_1 {
-        list [catch {namespace children test_ns_99} msg] $msg
-    }
-} {1 {unknown namespace "test_ns_99" in namespace children command}}
-test namespace-19.4 {GetNamespaceFromObj, invalidation of cached ns refs} {
-    namespace eval test_ns_1 {
-        proc foo {} {
-            return [namespace children test_ns_2]
-        }
-        list [catch {namespace children test_ns_99} msg] $msg
-    }
-    set l {}
-    lappend l [test_ns_1::foo]
-    namespace delete test_ns_1::test_ns_2
-    namespace eval test_ns_1::test_ns_2::test_ns_3 {}
-    lappend l [test_ns_1::foo]
-    set l
-} {{} ::test_ns_1::test_ns_2::test_ns_3}
-
-test namespace-20.1 {Tcl_NamespaceObjCmd, bad subcommand} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace} msg] $msg
-} {1 {wrong # args: should be "namespace subcommand ?arg ...?"}}
-test namespace-20.2 {Tcl_NamespaceObjCmd, bad subcommand} {
-    list [catch {namespace wombat {}} msg] $msg
-} {1 {bad option "wombat": must be children, code, current, delete, eval, export, forget, import, inscope, origin, parent, qualifiers, tail, or which}}
-test namespace-20.3 {Tcl_NamespaceObjCmd, abbreviations are okay} {
-    namespace ch :: test_ns_*
-} {}
-
-test namespace-21.1 {NamespaceChildrenCmd, no args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::test_ns_2 {}
-    expr {[string first ::test_ns_1 [namespace children]] != -1}
-} {1}
-test namespace-21.2 {NamespaceChildrenCmd, no args} {
-    namespace eval test_ns_1 {
-        namespace children
-    }
-} {::test_ns_1::test_ns_2}
-test namespace-21.3 {NamespaceChildrenCmd, ns name given} {
-    namespace children ::test_ns_1
-} {::test_ns_1::test_ns_2}
-test namespace-21.4 {NamespaceChildrenCmd, ns name given} {
-    namespace eval test_ns_1 {
-        namespace children test_ns_2
-    }
-} {}
-test namespace-21.5 {NamespaceChildrenCmd, too many args} {
-    namespace eval test_ns_1 {
-        list [catch {namespace children test_ns_2 xxx yyy} msg] $msg
-    }
-} {1 {wrong # args: should be "namespace children ?name? ?pattern?"}}
-test namespace-21.6 {NamespaceChildrenCmd, glob-style pattern given} {
-    namespace eval test_ns_1::test_ns_foo {}
-    namespace children test_ns_1 *f*
-} {::test_ns_1::test_ns_foo}
-test namespace-21.7 {NamespaceChildrenCmd, glob-style pattern given} {
-    namespace eval test_ns_1::test_ns_foo {}
-    namespace children test_ns_1 test*
-} {::test_ns_1::test_ns_2 ::test_ns_1::test_ns_foo}
-
-test namespace-22.1 {NamespaceCodeCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace code} msg] $msg \
-         [catch {namespace code xxx yyy} msg] $msg
-} {1 {wrong # args: should be "namespace code arg"} 1 {wrong # args: should be "namespace code arg"}}
-test namespace-22.2 {NamespaceCodeCmd, arg is already scoped value} {
-    namespace eval test_ns_1 {
-        proc cmd {} {return "test_ns_1::cmd"}
-    }
-    namespace code {namespace inscope ::test_ns_1 cmd}
-} {namespace inscope ::test_ns_1 cmd}
-test namespace-22.3 {NamespaceCodeCmd, arg is already scoped value} {
-    namespace code {namespace     inscope     ::test_ns_1 cmd}
-} {namespace     inscope     ::test_ns_1 cmd}
-test namespace-22.4 {NamespaceCodeCmd, in :: namespace} {
-    namespace code unknown
-} {namespace inscope :: unknown}
-test namespace-22.5 {NamespaceCodeCmd, in other namespace} {
-    namespace eval test_ns_1 {
-        namespace code cmd
-    }
-} {namespace inscope ::test_ns_1 cmd}
-
-test namespace-23.1 {NamespaceCurrentCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace current xxx} msg] $msg \
-         [catch {namespace current xxx yyy} msg] $msg
-} {1 {wrong # args: should be "namespace current"} 1 {wrong # args: should be "namespace current"}}
-test namespace-23.2 {NamespaceCurrentCmd, at global level} {
-    namespace current
-} {::}
-test namespace-23.3 {NamespaceCurrentCmd, in nested ns} {
-    namespace eval test_ns_1::test_ns_2 {
-        namespace current
-    }
-} {::test_ns_1::test_ns_2}
-
-test namespace-24.1 {NamespaceDeleteCmd, no args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace delete
-} {}
-test namespace-24.2 {NamespaceDeleteCmd, one arg} {
-    namespace eval test_ns_1::test_ns_2 {}
-    namespace delete ::test_ns_1
-} {}
-test namespace-24.3 {NamespaceDeleteCmd, two args} {
-    namespace eval test_ns_1::test_ns_2 {}
-    list [namespace delete ::test_ns_1::test_ns_2] [namespace delete ::test_ns_1]
-} {{} {}}
-test namespace-24.4 {NamespaceDeleteCmd, unknown ns} {
-    list [catch {namespace delete ::test_ns_foo} msg] $msg
-} {1 {unknown namespace "::test_ns_foo" in namespace delete command}}
-
-test namespace-25.1 {NamespaceEvalCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace eval} msg] $msg
-} {1 {wrong # args: should be "namespace eval name arg ?arg...?"}}
-test namespace-25.2 {NamespaceEvalCmd, bad args} {
-    list [catch {namespace test_ns_1} msg] $msg
-} {1 {bad option "test_ns_1": must be children, code, current, delete, eval, export, forget, import, inscope, origin, parent, qualifiers, tail, or which}}
-catch {unset v}
-test namespace-25.3 {NamespaceEvalCmd, new namespace} {
-    set v 123
-    namespace eval test_ns_1 {
-        variable v 314159
-        proc p {} {
-            variable v
-            return $v
-        }
-    }
-    test_ns_1::p
-} {314159}
-test namespace-25.4 {NamespaceEvalCmd, existing namespace} {
-    namespace eval test_ns_1 {
-        proc q {} {return [expr {[p]+1}]}
-    }
-    test_ns_1::q
-} {314160}
-test namespace-25.5 {NamespaceEvalCmd, multiple args} {
-    namespace eval test_ns_1 "set" "v"
-} {314159}
-test namespace-25.6 {NamespaceEvalCmd, error in eval'd script} {
-    list [catch {namespace eval test_ns_1 {xxxx}} msg] $msg $errorInfo
-} {1 {invalid command name "xxxx"} {invalid command name "xxxx"
-    while executing
-"xxxx"
-    (in namespace eval "::test_ns_1" script line 1)
-    invoked from within
-"namespace eval test_ns_1 {xxxx}"}}
-catch {unset v}
-
-test namespace-26.1 {NamespaceExportCmd, no args and new ns} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace export
-} {}
-test namespace-26.2 {NamespaceExportCmd, just -clear arg} {
-    namespace export -clear
-} {}
-test namespace-26.3 {NamespaceExportCmd, pattern can't specify a namespace} {
-    namespace eval test_ns_1 {
-        list [catch {namespace export ::zzz} msg] $msg
-    }
-} {1 {invalid export pattern "::zzz": pattern can't specify a namespace}}
-test namespace-26.4 {NamespaceExportCmd, one pattern} {
-    namespace eval test_ns_1 {
-        namespace export cmd1
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-        proc cmd3 {args} {return "cmd3: $args"}
-        proc cmd4 {args} {return "cmd4: $args"}
-    }
-    namespace eval test_ns_2 {
-        namespace import ::test_ns_1::*
-    }
-    list [info commands test_ns_2::*] [test_ns_2::cmd1 hello]
-} {::test_ns_2::cmd1 {cmd1: hello}}
-test namespace-26.5 {NamespaceExportCmd, sequence of patterns, patterns accumulate} {
-    namespace eval test_ns_1 {
-        namespace export cmd1 cmd3
-    }
-    namespace eval test_ns_2 {
-        namespace import -force ::test_ns_1::*
-    }
-    list [info commands test_ns_2::*] [test_ns_2::cmd3 hello]
-} {{::test_ns_2::cmd1 ::test_ns_2::cmd3} {cmd3: hello}}
-test namespace-26.6 {NamespaceExportCmd, no patterns means return export list} {
-    namespace eval test_ns_1 {
-        namespace export
-    }
-} {cmd1 cmd1 cmd3}
-test namespace-26.7 {NamespaceExportCmd, -clear resets export list} {
-    namespace eval test_ns_1 {
-        namespace export -clear cmd4
-    }
-    namespace eval test_ns_2 {
-        namespace import ::test_ns_1::*
-    }
-    list [info commands test_ns_2::*] [test_ns_2::cmd4 hello]
-} {{::test_ns_2::cmd4 ::test_ns_2::cmd1 ::test_ns_2::cmd3} {cmd4: hello}}
-
-test namespace-27.1 {NamespaceForgetCmd, no args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace forget
-} {}
-test namespace-27.2 {NamespaceForgetCmd, args must be valid namespaces} {
-    list [catch {namespace forget ::test_ns_1::xxx} msg] $msg
-} {1 {unknown namespace in namespace forget pattern "::test_ns_1::xxx"}}
-test namespace-27.3 {NamespaceForgetCmd, arg is forgotten} {
-    namespace eval test_ns_1 {
-        namespace export cmd*
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_2 {
-        namespace import ::test_ns_1::*
-        namespace forget ::test_ns_1::cmd1
-    }
-    info commands ::test_ns_2::*
-} {::test_ns_2::cmd2}
-
-test namespace-28.1 {NamespaceImportCmd, no args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace import
-} {}
-test namespace-28.2 {NamespaceImportCmd, no args and just "-force"} {
-    namespace import -force
-} {}
-test namespace-28.3 {NamespaceImportCmd, arg is imported} {
-    namespace eval test_ns_1 {
-        namespace export cmd2
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_2 {
-        namespace import ::test_ns_1::*
-        namespace forget ::test_ns_1::cmd1
-    }
-    info commands test_ns_2::*
-} {::test_ns_2::cmd2}
-
-test namespace-29.1 {NamespaceInscopeCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace inscope} msg] $msg
-} {1 {wrong # args: should be "namespace inscope name arg ?arg...?"}}
-test namespace-29.2 {NamespaceInscopeCmd, bad args} {
-    list [catch {namespace inscope ::} msg] $msg
-} {1 {wrong # args: should be "namespace inscope name arg ?arg...?"}}
-test namespace-29.3 {NamespaceInscopeCmd, specified ns must exist} {
-    list [catch {namespace inscope test_ns_1 {set v}} msg] $msg
-} {1 {unknown namespace "test_ns_1" in inscope namespace command}}
-test namespace-29.4 {NamespaceInscopeCmd, simple case} {
-    namespace eval test_ns_1 {
-        variable v 747
-        proc cmd {args} {
-            variable v
-            return "[namespace current]::cmd: v=$v, args=$args"
-        }
-    }
-    namespace inscope test_ns_1 cmd
-} {::test_ns_1::cmd: v=747, args=}
-test namespace-29.5 {NamespaceInscopeCmd, has lappend semantics} {
-    list [namespace inscope test_ns_1 cmd x y z] \
-         [namespace eval test_ns_1 [concat cmd [list x y z]]]
-} {{::test_ns_1::cmd: v=747, args=x y z} {::test_ns_1::cmd: v=747, args=x y z}}
-
-test namespace-30.1 {NamespaceOriginCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace origin} msg] $msg
-} {1 {wrong # args: should be "namespace origin name"}}
-test namespace-30.2 {NamespaceOriginCmd, bad args} {
-    list [catch {namespace origin x y} msg] $msg
-} {1 {wrong # args: should be "namespace origin name"}}
-test namespace-30.3 {NamespaceOriginCmd, command not found} {
-    list [catch {namespace origin fred} msg] $msg
-} {1 {invalid command name "fred"}}
-test namespace-30.4 {NamespaceOriginCmd, command isn't imported} {
-    namespace origin set
-} {::set}
-test namespace-30.5 {NamespaceOriginCmd, imported command} {
-    namespace eval test_ns_1 {
-        namespace export cmd*
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_2 {
-        namespace export *
-        namespace import ::test_ns_1::*
-        proc p {} {}
-    }
-    namespace eval test_ns_3 {
-        namespace import ::test_ns_2::*
-        list [namespace origin foreach] \
-             [namespace origin p] \
-             [namespace origin cmd1] \
-             [namespace origin ::test_ns_2::cmd2]
-    }
-} {::foreach ::test_ns_2::p ::test_ns_1::cmd1 ::test_ns_1::cmd2}
-
-test namespace-31.1 {NamespaceParentCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace parent a b} msg] $msg
-} {1 {wrong # args: should be "namespace parent ?name?"}}
-test namespace-31.2 {NamespaceParentCmd, no args} {
-    namespace parent
-} {}
-test namespace-31.3 {NamespaceParentCmd, namespace specified} {
-    namespace eval test_ns_1 {
-        namespace eval test_ns_2 {
-            namespace eval test_ns_3 {}
-        }
-    }
-    list [namespace parent ::] \
-         [namespace parent test_ns_1::test_ns_2] \
-         [namespace eval test_ns_1::test_ns_2::test_ns_3 {namespace parent ::test_ns_1::test_ns_2}]
-} {{} ::test_ns_1 ::test_ns_1}
-test namespace-31.4 {NamespaceParentCmd, bad namespace specified} {
-    list [catch {namespace parent test_ns_1::test_ns_foo} msg] $msg
-} {1 {unknown namespace "test_ns_1::test_ns_foo" in namespace parent command}}
-
-test namespace-32.1 {NamespaceQualifiersCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace qualifiers} msg] $msg
-} {1 {wrong # args: should be "namespace qualifiers string"}}
-test namespace-32.2 {NamespaceQualifiersCmd, bad args} {
-    list [catch {namespace qualifiers x y} msg] $msg
-} {1 {wrong # args: should be "namespace qualifiers string"}}
-test namespace-32.3 {NamespaceQualifiersCmd, simple name} {
-    namespace qualifiers foo
-} {}
-test namespace-32.4 {NamespaceQualifiersCmd, leading ::} {
-    namespace qualifiers ::x::y::z
-} {::x::y}
-test namespace-32.5 {NamespaceQualifiersCmd, no leading ::} {
-    namespace qualifiers a::b
-} {a}
-test namespace-32.6 {NamespaceQualifiersCmd, :: argument} {
-    namespace qualifiers ::
-} {}
-test namespace-32.7 {NamespaceQualifiersCmd, odd number of :s} {
-    namespace qualifiers :::::
-} {}
-test namespace-32.8 {NamespaceQualifiersCmd, odd number of :s} {
-    namespace qualifiers foo:::
-} {foo}
-
-test namespace-33.1 {NamespaceTailCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace tail} msg] $msg
-} {1 {wrong # args: should be "namespace tail string"}}
-test namespace-33.2 {NamespaceTailCmd, bad args} {
-    list [catch {namespace tail x y} msg] $msg
-} {1 {wrong # args: should be "namespace tail string"}}
-test namespace-33.3 {NamespaceTailCmd, simple name} {
-    namespace tail foo
-} {foo}
-test namespace-33.4 {NamespaceTailCmd, leading ::} {
-    namespace tail ::x::y::z
-} {z}
-test namespace-33.5 {NamespaceTailCmd, no leading ::} {
-    namespace tail a::b
-} {b}
-test namespace-33.6 {NamespaceTailCmd, :: argument} {
-    namespace tail ::
-} {}
-test namespace-33.7 {NamespaceTailCmd, odd number of :s} {
-    namespace tail :::::
-} {}
-test namespace-33.8 {NamespaceTailCmd, odd number of :s} {
-    namespace tail foo:::
-} {}
-
-test namespace-34.1 {NamespaceWhichCmd, bad args} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {namespace which} msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-test namespace-34.2 {NamespaceWhichCmd, bad args} {
-    list [catch {namespace which -fred} msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-test namespace-34.3 {NamespaceWhichCmd, bad args} {
-    list [catch {namespace which -command} msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-test namespace-34.4 {NamespaceWhichCmd, bad args} {
-    list [catch {namespace which a b} msg] $msg
-} {1 {wrong # args: should be "namespace which ?-command? ?-variable? name"}}
-test namespace-34.5 {NamespaceWhichCmd, command lookup} {
-    namespace eval test_ns_1 {
-        namespace export cmd*
-        variable v1 111
-        proc cmd1 {args} {return "cmd1: $args"}
-        proc cmd2 {args} {return "cmd2: $args"}
-    }
-    namespace eval test_ns_2 {
-        namespace export *
-        namespace import ::test_ns_1::*
-        variable v2 222
-        proc p {} {}
-    }
-    namespace eval test_ns_3 {
-        namespace import ::test_ns_2::*
-        variable v3 333
-        list [namespace which -command foreach] \
-             [namespace which -command p] \
-             [namespace which -command cmd1] \
-             [namespace which -command ::test_ns_2::cmd2] \
-             [catch {namespace which -command ::test_ns_2::noSuchCmd} msg] $msg
-    }
-} {::foreach ::test_ns_3::p ::test_ns_3::cmd1 ::test_ns_2::cmd2 0 {}}
-test namespace-34.6 {NamespaceWhichCmd, -command is default} {
-    namespace eval test_ns_3 {
-        list [namespace which foreach] \
-             [namespace which p] \
-             [namespace which cmd1] \
-             [namespace which ::test_ns_2::cmd2]
-    }
-} {::foreach ::test_ns_3::p ::test_ns_3::cmd1 ::test_ns_2::cmd2}
-test namespace-34.7 {NamespaceWhichCmd, variable lookup} {
-    namespace eval test_ns_3 {
-        list [namespace which -variable env] \
-             [namespace which -variable v3] \
-             [namespace which -variable ::test_ns_2::v2] \
-             [catch {namespace which -variable ::test_ns_2::noSuchVar} msg] $msg
-    }
-} {::env ::test_ns_3::v3 ::test_ns_2::v2 0 {}}
-
-test namespace-35.1 {FreeNsNameInternalRep, resulting ref count > 0} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        proc p {} {
-            namespace delete [namespace current]
-            return [namespace current]
-        }
-    }
-    test_ns_1::p
-} {::test_ns_1}
-test namespace-35.2 {FreeNsNameInternalRep, resulting ref count == 0} {
-    namespace eval test_ns_1 {
-        proc q {} {
-            return [namespace current]
-        }
-    }
-    list [test_ns_1::q] \
-         [namespace delete test_ns_1] \
-         [catch {test_ns_1::q} msg] $msg
-} {::test_ns_1 {} 1 {invalid command name "test_ns_1::q"}}
-
-catch {unset x}
-catch {unset y}
-test namespace-36.1 {DupNsNameInternalRep} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {}
-    set x "::test_ns_1"
-    list [namespace parent $x] [set y $x] [namespace parent $y]
-} {:: ::test_ns_1 ::}
-catch {unset x}
-catch {unset y}
-
-test namespace-37.1 {SetNsNameFromAny, ns name found} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::test_ns_2 {}
-    namespace eval test_ns_1 {
-        namespace children ::test_ns_1
-    }
-} {::test_ns_1::test_ns_2}
-test namespace-37.2 {SetNsNameFromAny, ns name not found} {
-    namespace eval test_ns_1 {
-        list [catch {namespace children ::test_ns_1::test_ns_foo} msg] $msg
-    }
-} {1 {unknown namespace "::test_ns_1::test_ns_foo" in namespace children command}}
-
-test namespace-38.1 {UpdateStringOfNsName} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    ;# Tcl_NamespaceObjCmd calls UpdateStringOfNsName to get subcmd name
-    list [namespace eval {} {namespace current}] \
-         [namespace eval {} {namespace current}]
-} {:: ::}
-
-# cleanup
-catch {rename cmd1 {}}
-catch {unset l}
-catch {unset msg}
-catch {unset trigger}
-eval namespace delete [namespace children :: test_ns_*]
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/obj.test b/tests/obj.test
deleted file mode 100644
index ce7738d..0000000
--- a/tests/obj.test
+++ /dev/null
@@ -1,546 +0,0 @@
-# Functionality covered: this file contains a collection of tests for the
-# procedures in tclObj.c that implement Tcl's basic type support and the
-# type managers for the types boolean, double, and integer.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: obj.test,v 1.3 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testobj\""
-    puts "command, so I can't test the Tcl type and object support."
-    ::tcltest::cleanupTests
-    return
-}
-
-test obj-1.1 {Tcl_AppendAllObjTypes, and InitTypeTable, Tcl_RegisterObjType} {
-    set r 1
-    foreach {t} {list boolean cmdName bytecode string int double} {
-        set first [string first $t [testobj types]]
-        set r [expr {$r && ($first != -1)}]
-    }
-    set result $r
-} {1}
-
-test obj-2.1 {Tcl_GetObjType error} {
-    list [testintobj set 1 0] [catch {testobj convert 1 foo} msg] $msg
-} {0 1 {no type foo found}}
-test obj-2.2 {Tcl_GetObjType and Tcl_ConvertToType} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 12]
-    lappend result [testobj convert 1 double]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 12 12 double 3}
-
-test obj-3.1 {Tcl_ConvertToType error} {
-    list [testdoubleobj set 1 12.34] [catch {testobj convert 1 int} msg] $msg
-} {12.34 1 {expected integer but got "12.34"}}
-test obj-3.2 {Tcl_ConvertToType error, "empty string" object} {
-    list [testobj newobj 1] [catch {testobj convert 1 int} msg] $msg
-} {{} 1 {expected integer but got ""}}
-
-test obj-4.1 {Tcl_NewObj and AllocateFreeObjects} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} string 2}
-
-test obj-5.1 {Tcl_FreeObj} {
-    set result ""
-    lappend result [testintobj set 1 12345]
-    lappend result [testobj freeallvars]
-    lappend result [catch {testintobj get 1} msg]
-    lappend result $msg
-} {12345 {} 1 {variable 1 is unset (NULL)}}
-
-test obj-6.1 {Tcl_DuplicateObj, object has internal rep} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 47]
-    lappend result [testobj duplicate 1 2]    
-    lappend result [testintobj get 2]
-    lappend result [testobj refcount 1]
-    lappend result [testobj refcount 2]
-} {{} 47 47 47 2 3}
-test obj-6.2 {Tcl_DuplicateObj, "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testobj duplicate 1 2]    
-    lappend result [testintobj get 2]
-    lappend result [testobj refcount 1]
-    lappend result [testobj refcount 2]
-} {{} {} {} {} 2 3}
-
-test obj-7.1 {Tcl_GetString, return existing string rep} {
-    set result ""
-    lappend result [testintobj set 1 47]
-    lappend result [testintobj get2 1]
-} {47 47}
-test obj-7.2 {Tcl_GetString, "empty string" object} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [teststringobj append 1 abc -1]
-    lappend result [teststringobj get2 1]
-} {{} abc abc}
-test obj-7.3 {Tcl_GetString, returns string internal rep (DString)} {
-    set result ""
-    lappend result [teststringobj set 1 xyz]
-    lappend result [teststringobj append 1 abc -1]
-    lappend result [teststringobj get2 1]
-} {xyz xyzabc xyzabc}
-test obj-7.4 {Tcl_GetString, recompute string rep from internal rep} {
-    set result ""
-    lappend result [testintobj set 1 77]
-    lappend result [testintobj mult10 1]
-    lappend result [teststringobj get2 1]
-} {77 770 770}
-
-test obj-8.1 {Tcl_GetStringFromObj, return existing string rep} {
-    set result ""
-    lappend result [testintobj set 1 47]
-    lappend result [testintobj get 1]
-} {47 47}
-test obj-8.2 {Tcl_GetStringFromObj, "empty string" object} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [teststringobj append 1 abc -1]
-    lappend result [teststringobj get 1]
-} {{} abc abc}
-test obj-8.3 {Tcl_GetStringFromObj, returns string internal rep (DString)} {
-    set result ""
-    lappend result [teststringobj set 1 xyz]
-    lappend result [teststringobj append 1 abc -1]
-    lappend result [teststringobj get 1]
-} {xyz xyzabc xyzabc}
-test obj-8.4 {Tcl_GetStringFromObj, recompute string rep from internal rep} {
-    set result ""
-    lappend result [testintobj set 1 77]
-    lappend result [testintobj mult10 1]
-    lappend result [teststringobj get 1]
-} {77 770 770}
-
-test obj-9.1 {Tcl_NewBooleanObj} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testbooleanobj set 1 0]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 0 boolean 2}
-
-test obj-10.1 {Tcl_SetBooleanObj, existing "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testbooleanobj set 1 0]  ;# makes existing obj boolean
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} 0 boolean 2}
-test obj-10.2 {Tcl_SetBooleanObj, existing non-"empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 98765]
-    lappend result [testbooleanobj set 1 1]  ;# makes existing obj boolean
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 98765 1 boolean 2}
-
-test obj-11.1 {Tcl_GetBooleanFromObj, existing boolean object} {
-    set result ""
-    lappend result [testbooleanobj set 1 1]
-    lappend result [testbooleanobj not 1]    ;# gets existing boolean rep
-} {1 0}
-test obj-11.2 {Tcl_GetBooleanFromObj, convert to boolean} {
-    set result ""
-    lappend result [testintobj set 1 47]
-    lappend result [testbooleanobj not 1]    ;# must convert to bool
-    lappend result [testobj type 1]
-} {47 0 boolean}
-test obj-11.3 {Tcl_GetBooleanFromObj, error converting to boolean} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} {abc 1 {expected boolean value but got "abc"}}
-test obj-11.4 {Tcl_GetBooleanFromObj, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} {{} 1 {expected boolean value but got ""}}
-
-test obj-12.1 {DupBooleanInternalRep} {
-    set result ""
-    lappend result [testbooleanobj set 1 1]
-    lappend result [testobj duplicate 1 2]   ;# uses DupBooleanInternalRep
-    lappend result [testbooleanobj get 2]
-} {1 1 1}
-
-test obj-13.1 {SetBooleanFromAny, int to boolean special case} {
-    set result ""
-    lappend result [testintobj set 1 1234]
-    lappend result [testbooleanobj not 1]    ;# converts with SetBooleanFromAny
-    lappend result [testobj type 1]
-} {1234 0 boolean}
-test obj-13.2 {SetBooleanFromAny, double to boolean special case} {
-    set result ""
-    lappend result [testdoubleobj set 1 3.14159]
-    lappend result [testbooleanobj not 1]    ;# converts with SetBooleanFromAny
-    lappend result [testobj type 1]
-} {3.14159 0 boolean}
-test obj-13.3 {SetBooleanFromAny, special case strings representing booleans} {
-    set result ""
-    foreach s {yes no true false on off} {
-        teststringobj set 1 $s
-        lappend result [testbooleanobj not 1]
-    }
-    lappend result [testobj type 1]
-} {0 1 0 1 0 1 boolean}
-test obj-13.4 {SetBooleanFromAny, recompute string rep then parse it} {
-    set result ""
-    lappend result [testintobj set 1 456]
-    lappend result [testintobj div10 1]
-    lappend result [testbooleanobj not 1]    ;# converts with SetBooleanFromAny
-    lappend result [testobj type 1]
-} {456 45 0 boolean}
-test obj-13.5 {SetBooleanFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} {abc 1 {expected boolean value but got "abc"}}
-test obj-13.6 {SetBooleanFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 x1.0]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} {x1.0 1 {expected boolean value but got "x1.0"}}
-test obj-13.7 {SetBooleanFromAny, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} {{} 1 {expected boolean value but got ""}}
-test obj-13.8 {SetBooleanFromAny, unicode strings} {
-    set result ""
-    lappend result [teststringobj set 1 1\u7777]
-    lappend result [catch {testbooleanobj not 1} msg]
-    lappend result $msg
-} "1\u7777 1 {expected boolean value but got \"1\u7777\"}"
-
-test obj-14.1 {UpdateStringOfBoolean} {
-    set result ""
-    lappend result [testbooleanobj set 1 0]
-    lappend result [testbooleanobj not 1]
-    lappend result [testbooleanobj get 1]    ;# must update string rep
-} {0 1 1}
-
-test obj-15.1 {Tcl_NewDoubleObj} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testdoubleobj set 1 3.1459]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 3.1459 double 2}
-
-test obj-16.1 {Tcl_SetDoubleObj, existing "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testdoubleobj set 1 0.123]  ;# makes existing obj boolean
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} 0.123 double 2}
-test obj-16.2 {Tcl_SetDoubleObj, existing non-"empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 98765]
-    lappend result [testdoubleobj set 1 27.56]  ;# makes existing obj double
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 98765 27.56 double 2}
-
-test obj-17.1 {Tcl_GetDoubleFromObj, existing double object} {
-    set result ""
-    lappend result [testdoubleobj set 1 16.1]
-    lappend result [testdoubleobj mult10 1]   ;# gets existing double rep
-} {16.1 161.0}
-test obj-17.2 {Tcl_GetDoubleFromObj, convert to double} {
-    set result ""
-    lappend result [testintobj set 1 477]
-    lappend result [testdoubleobj div10 1]    ;# must convert to bool
-    lappend result [testobj type 1]
-} {477 47.7 double}
-test obj-17.3 {Tcl_GetDoubleFromObj, error converting to double} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testdoubleobj mult10 1} msg]
-    lappend result $msg
-} {abc 1 {expected floating-point number but got "abc"}}
-test obj-17.4 {Tcl_GetDoubleFromObj, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testdoubleobj div10 1} msg]
-    lappend result $msg
-} {{} 1 {expected floating-point number but got ""}}
-
-test obj-18.1 {DupDoubleInternalRep} {
-    set result ""
-    lappend result [testdoubleobj set 1 17.1]
-    lappend result [testobj duplicate 1 2]      ;# uses DupDoubleInternalRep
-    lappend result [testdoubleobj get 2]
-} {17.1 17.1 17.1}
-
-test obj-19.1 {SetDoubleFromAny, int to double special case} {
-    set result ""
-    lappend result [testintobj set 1 1234]
-    lappend result [testdoubleobj mult10 1] ;# converts with SetDoubleFromAny
-    lappend result [testobj type 1]
-} {1234 12340.0 double}
-test obj-19.2 {SetDoubleFromAny, boolean to double special case} {
-    set result ""
-    lappend result [testbooleanobj set 1 1]
-    lappend result [testdoubleobj mult10 1] ;# converts with SetDoubleFromAny
-    lappend result [testobj type 1]
-} {1 10.0 double}
-test obj-19.3 {SetDoubleFromAny, recompute string rep then parse it} {
-    set result ""
-    lappend result [testintobj set 1 456]
-    lappend result [testintobj div10 1]
-    lappend result [testdoubleobj mult10 1] ;# converts with SetDoubleFromAny
-    lappend result [testobj type 1]
-} {456 45 450.0 double}
-test obj-19.4 {SetDoubleFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testdoubleobj mult10 1} msg]
-    lappend result $msg
-} {abc 1 {expected floating-point number but got "abc"}}
-test obj-19.5 {SetDoubleFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 x1.0]
-    lappend result [catch {testdoubleobj mult10 1} msg]
-    lappend result $msg
-} {x1.0 1 {expected floating-point number but got "x1.0"}}
-test obj-19.6 {SetDoubleFromAny, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testdoubleobj div10 1} msg]
-    lappend result $msg
-} {{} 1 {expected floating-point number but got ""}}
-
-test obj-20.1 {UpdateStringOfDouble} {
-    set result ""
-    lappend result [testdoubleobj set 1 3.14159]
-    lappend result [testdoubleobj mult10 1]
-    lappend result [testdoubleobj get 1]   ;# must update string rep
-} {3.14159 31.4159 31.4159}
-
-test obj-21.1 {Tcl_NewIntObj} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 55]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 55 int 2}
-
-test obj-22.1 {Tcl_SetIntObj, existing "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testintobj set 1 77]  ;# makes existing obj int
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} 77 int 2}
-test obj-22.2 {Tcl_SetIntObj, existing non-"empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testdoubleobj set 1 12.34]
-    lappend result [testintobj set 1 77]  ;# makes existing obj int
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 12.34 77 int 2}
-
-test obj-23.1 {Tcl_GetIntFromObj, existing int object} {
-    set result ""
-    lappend result [testintobj set 1 22]
-    lappend result [testintobj mult10 1]   ;# gets existing int rep
-} {22 220}
-test obj-23.2 {Tcl_GetIntFromObj, convert to int} {
-    set result ""
-    lappend result [testintobj set 1 477]
-    lappend result [testintobj div10 1]    ;# must convert to bool
-    lappend result [testobj type 1]
-} {477 47 int}
-test obj-23.3 {Tcl_GetIntFromObj, error converting to int} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testintobj mult10 1} msg]
-    lappend result $msg
-} {abc 1 {expected integer but got "abc"}}
-test obj-23.4 {Tcl_GetIntFromObj, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testintobj div10 1} msg]
-    lappend result $msg
-} {{} 1 {expected integer but got ""}}
-test obj-23.5 {Tcl_GetIntFromObj, integer too large to represent as non-long error} {nonPortable} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [testintobj inttoobigtest 1]
-} {{} 1}
-
-test obj-24.1 {DupIntInternalRep} {
-    set result ""
-    lappend result [testintobj set 1 23]
-    lappend result [testobj duplicate 1 2]    ;# uses DupIntInternalRep
-    lappend result [testintobj get 2]
-} {23 23 23}
-
-test obj-25.1 {SetIntFromAny, int to int special case} {
-    set result ""
-    lappend result [testintobj set 1 1234]
-    lappend result [testintobj mult10 1]  ;# converts with SetIntFromAny
-    lappend result [testobj type 1]
-} {1234 12340 int}
-test obj-25.2 {SetIntFromAny, boolean to int special case} {
-    set result ""
-    lappend result [testbooleanobj set 1 1]
-    lappend result [testintobj mult10 1]  ;# converts with SetIntFromAny
-    lappend result [testobj type 1]
-} {1 10 int}
-test obj-25.3 {SetIntFromAny, recompute string rep then parse it} {
-    set result ""
-    lappend result [testintobj set 1 456]
-    lappend result [testintobj div10 1]
-    lappend result [testintobj mult10 1]  ;# converts with SetIntFromAny
-    lappend result [testobj type 1]
-} {456 45 450 int}
-test obj-25.4 {SetIntFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testintobj mult10 1} msg]
-    lappend result $msg
-} {abc 1 {expected integer but got "abc"}}
-test obj-25.5 {SetIntFromAny, error parsing string} {
-    set result ""
-    lappend result [teststringobj set 1 x17]
-    lappend result [catch {testintobj mult10 1} msg]
-    lappend result $msg
-} {x17 1 {expected integer but got "x17"}}
-test obj-25.6 {SetIntFromAny, integer too large} {nonPortable} {
-    set result ""
-    lappend result [teststringobj set 1 123456789012345678901]
-    lappend result [catch {testintobj mult10 1} msg]
-    lappend result $msg
-} {123456789012345678901 1 {integer value too large to represent}}
-test obj-25.7 {SetIntFromAny, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testintobj div10 1} msg]
-    lappend result $msg
-} {{} 1 {expected integer but got ""}}
-
-test obj-26.1 {UpdateStringOfInt} {
-    set result ""
-    lappend result [testintobj set 1 512]
-    lappend result [testintobj mult10 1]
-    lappend result [testintobj get 1]       ;# must update string rep
-} {512 5120 5120}
-
-test obj-27.1 {Tcl_NewLongObj} {
-    set result ""
-    lappend result [testobj freeallvars]
-    testintobj setmaxlong 1
-    lappend result [testintobj ismaxlong 1]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 1 int 1}
-
-test obj-28.1 {Tcl_SetLongObj, existing "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [testintobj setlong 1 77]  ;# makes existing obj long int
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} 77 int 2}
-test obj-28.2 {Tcl_SetLongObj, existing non-"empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testdoubleobj set 1 12.34]
-    lappend result [testintobj setlong 1 77]  ;# makes existing obj long int
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 12.34 77 int 2}
-
-test obj-29.1 {Tcl_GetLongFromObj, existing long integer object} {
-    set result ""
-    lappend result [testintobj setlong 1 22]
-    lappend result [testintobj mult10 1]   ;# gets existing long int rep
-} {22 220}
-test obj-29.2 {Tcl_GetLongFromObj, convert to long} {
-    set result ""
-    lappend result [testintobj setlong 1 477]
-    lappend result [testintobj div10 1]    ;# must convert to bool
-    lappend result [testobj type 1]
-} {477 47 int}
-test obj-29.3 {Tcl_GetLongFromObj, error converting to long integer} {
-    set result ""
-    lappend result [teststringobj set 1 abc]
-    lappend result [catch {testintobj ismaxlong 1} msg] ;# cvts to long int
-    lappend result $msg
-} {abc 1 {expected integer but got "abc"}}
-test obj-29.4 {Tcl_GetLongFromObj, error converting from "empty string"} {
-    set result ""
-    lappend result [testobj newobj 1]
-    lappend result [catch {testintobj ismaxlong 1} msg] ;# cvts to long int
-    lappend result $msg
-} {{} 1 {expected integer but got ""}}
-
-test obj-30.1 {Ref counting and object deletion, simple types} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 1024]
-    lappend result [testobj assign 1 2]     ;# vars 1 and 2 share the int obj
-    lappend result [testobj type 2]
-    lappend result [testobj refcount 1]
-    lappend result [testobj refcount 2]
-    lappend result [testbooleanobj set 2 0] ;# must copy on write, now 2 objs
-    lappend result [testobj type 2]
-    lappend result [testobj refcount 1]
-    lappend result [testobj refcount 2]
-} {{} 1024 1024 int 4 4 0 boolean 3 2}
-
-testobj freeallvars
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/opt.test b/tests/opt.test
deleted file mode 100644
index 3ca62f2..0000000
--- a/tests/opt.test
+++ /dev/null
@@ -1,290 +0,0 @@
-# Package covered:  opt1.0/optparse.tcl
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: opt.test,v 1.4 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# the package we are going to test
-package require opt 0.4.1
-
-# we are using implementation specifics to test the package
-
-
-#### functions tests #####
-
-set n $::tcl::OptDescN
-
-test opt-1.1 {OptKeyRegister / check that auto allocation is skipping existing keys} {
-    list [::tcl::OptKeyRegister {} $n] [::tcl::OptKeyRegister {} [expr $n+1]] [::tcl::OptKeyRegister {}]
-} "$n [expr $n+1] [expr $n+2]"
-
-test opt-2.1 {OptKeyDelete} {
-    list [::tcl::OptKeyRegister {} testkey] [::tcl::OptKeyDelete testkey] \
-	    [catch {::tcl::OptKeyDelete testkey} msg] $msg;
-} {testkey {} 1 {can't unset "OptDesc(testkey)": no such element in array}}
-
-
-test opt-3.1 {OptParse / temp key is removed} {
-    set n $::tcl::OptDescN
-    set prev [array names ::tcl::OptDesc]
-    ::tcl::OptKeyRegister {} $n
-    list [info exists ::tcl::OptDesc($n)]\
-	    [::tcl::OptKeyDelete $n]\
-	    [::tcl::OptParse {{-foo}} {}]\
-	    [info exists ::tcl::OptDesc($n)]\
-	    [expr {"[lsort $prev]"=="[lsort [array names ::tcl::OptDesc]]"}]
-} {1 {} {} 0 1}
-
-
-test opt-3.2 {OptParse / temp key is removed even on errors} {
-    set n $::tcl::OptDescN
-    catch {::tcl::OptKeyDelete $n}
-    list [catch {::tcl::OptParse {{-foo}} {-blah}}] \
-	    [info exists ::tcl::OptDesc($n)]
-} {1 0}
-
-test opt-4.1 {OptProc} {
-    ::tcl::OptProc optTest {} {}
-    optTest ;
-    ::tcl::OptKeyDelete optTest
-} {}
-
-
-test opt-5.1 {OptProcArgGiven} {
-    ::tcl::OptProc optTest {{-foo}} {
-	if {[::tcl::OptProcArgGiven "-foo"]} {
-	    return 1
-	} else {
-	    return 0
-	}
-    }
-    list [optTest] [optTest -f] [optTest -F] [optTest -fOO]
-} {0 1 1 1}
-
-test opt-6.1 {OptKeyParse} {
-    ::tcl::OptKeyRegister {} test;
-    list [catch {::tcl::OptKeyParse test {-help}} msg] $msg
-} {1 {Usage information:
-    Var/FlagName Type Value Help
-    ------------ ---- ----- ----
-    ( -help                 gives this help )}}
-
-
-test opt-7.1 {OptCheckType} {
-    list \
-	    [::tcl::OptCheckType 23 int] \
-	    [::tcl::OptCheckType 23 float] \
-	    [::tcl::OptCheckType true boolean] \
-	    [::tcl::OptCheckType "-blah" any] \
-	    [::tcl::OptCheckType {a b c} list] \
-	    [::tcl::OptCheckType maYbe choice {yes maYbe no}] \
-	    [catch {::tcl::OptCheckType "-blah" string}] \
-	    [catch {::tcl::OptCheckType 6 boolean}] \
-	    [catch {::tcl::OptCheckType x float}] \
-	    [catch {::tcl::OptCheckType "a \{ c" list}] \
-	    [catch {::tcl::OptCheckType 2.3 int}] \
-	    [catch {::tcl::OptCheckType foo choice {x y Foo z}}]
-} {23 23.0 1 -blah {a b c} maYbe 1 1 1 1 1 1}
-
-
-test opt-8.1 {List utilities} {
-    ::tcl::Lempty {}
-} 1
-test opt-8.2 {List utilities} {
-    ::tcl::Lempty {a b c}
-} 0
-test opt-8.3 {List utilities} {
-    ::tcl::Lget {a {b c d} e} {1 2}
-} d
-
-test opt-8.4 {List utilities} {
-    set l {a {b c d e} f}
-    ::tcl::Lvarset l {1 2} D
-    set l
-} {a {b c D e} f}
-
-test opt-8.5 {List utilities} {
-    set l {a b c}
-    ::tcl::Lvarset1 l 6 X
-    set l
-} {a b c {} {} {} X}
-
-test opt-8.6 {List utilities} {
-    set l {a {b c 7 e} f}
-    ::tcl::Lvarincr l {1 2}
-    set l
-} {a {b c 8 e} f}
-
-test opt-8.7 {List utilities} {
-    set l {a {b c 7 e} f}
-    ::tcl::Lvarincr l {1 2} -9
-    set l
-} {a {b c -2 e} f}
-
-test opt-8.8 {List utilities} {
-    set l {{b c 7 e} f}
-    ::tcl::Lfirst $l
-} {b c 7 e}
-
-
-test opt-8.9 {List utilities} {
-    set l {a {b c 7 e} f}
-    ::tcl::Lrest $l
-} {{b c 7 e} f}
-
-test opt-8.10 {List utilities} {
-    set l {a {b c 7 e} f}
-    ::tcl::Lvarpop l
-    set l
-} {{b c 7 e} f}
-
-test opt-8.11 {List utilities} {
-    catch {unset x}
-    set l {a {b c 7 e} f}
-    list [::tcl::Lassign $l u v w x] \
-	    $u $v $w [info exists x]
-} {3 a {b c 7 e} f 0}
-
-test opt-9.1 {Misc utilities} {
-    catch {unset v}
-    ::tcl::SetMax v 3
-    ::tcl::SetMax v 7
-    ::tcl::SetMax v 6
-    set v
-} 7
-
-test opt-9.2 {Misc utilities} {
-    catch {unset v}
-    ::tcl::SetMin v 3
-    ::tcl::SetMin v -7
-    ::tcl::SetMin v 1
-    set v
-} -7
-
-#### behaviour tests #####
-
-test opt-10.1 {ambigous flags} {
-    ::tcl::OptProc optTest {{-fla} {-other} {-flag2xyz} {-flag3xyz}} {}
-    catch {optTest -fL} msg
-    set msg
-} {ambigous option "-fL", choose from:
-    -fla      boolflag (false) 
-    -flag2xyz boolflag (false) 
-    -flag3xyz boolflag (false) }
-
-test opt-10.2 {non ambigous flags} {
-    ::tcl::OptProc optTest {{-flag1xyz} {-other} {-flag2xyz} {-flag3xyz}} {
-	return $flag2xyz
-    }
-    optTest -fLaG2
-} 1
-
-test opt-10.3 {non ambigous flags because of exact match} {
-    ::tcl::OptProc optTest {{-flag1x} {-other} {-flag1} {-flag1xy}} {
-	return $flag1
-    }
-    optTest -flAg1
-} 1
-
-test opt-10.4 {ambigous flags, not exact match} {
-    ::tcl::OptProc optTest {{-flag1xy} {-other} {-flag1} {-flag1xyz}} {
-	return $flag1
-    }
-    catch {optTest -fLag1X} msg
-    set msg
-} {ambigous option "-fLag1X", choose from:
-    -flag1xy  boolflag (false) 
-    -flag1xyz boolflag (false) }
-
-
-
-# medium size overall test example: (defined once)
-::tcl::OptProc optTest {
-    {cmd -choice {print save delete} "sub command to choose"}
-    {-allowBoing -boolean true}
-    {arg2 -string "this is help"}
-    {?arg3? 7 "optional number"}
-    {-moreflags}
-} {
-    list $cmd $allowBoing $arg2 $arg3 $moreflags
-}
-
-test opt-10.5 {medium size overall test} {
-    list [catch {optTest} msg] $msg
-} {1 {no value given for parameter "cmd" (use -help for full usage) :
-    cmd choice (print save delete) sub command to choose}}
-
-
-test opt-10.6 {medium size overall test} {
-    list [catch {optTest -help} msg] $msg
-} {1 {Usage information:
-    Var/FlagName Type     Value   Help
-    ------------ ----     -----   ----
-    ( -help                       gives this help )
-    cmd          choice   (print save delete) sub command to choose
-    -allowBoing  boolean  (true)  
-    arg2         string   ()      this is help
-    ?arg3?       int      (7)     optional number
-    -moreflags   boolflag (false) }}
-
-test opt-10.7 {medium size overall test} {
-    optTest save tst
-} {save 1 tst 7 0}
-
-test opt-10.8 {medium size overall test} {
-    optTest save -allowBoing false -- 8
-} {save 0 8 7 0}
-
-test opt-10.9 {medium size overall test} {
-    optTest save tst -m --
-} {save 1 tst 7 1}
-
-test opt-10.10 {medium size overall test} {
-    list [catch {optTest save tst foo} msg] [lindex [split $msg "\n"] 0]
-} {1 {too many arguments (unexpected argument(s): foo), usage:}}
-
-test opt-11.1 {too many args test 2} {
-    set key [::tcl::OptKeyRegister {-foo}]
-    list [catch {::tcl::OptKeyParse $key {-foo blah}} msg] $msg\
-	    [::tcl::OptKeyDelete $key]
-} {1 {too many arguments (unexpected argument(s): blah), usage:
-    Var/FlagName Type     Value   Help
-    ------------ ----     -----   ----
-    ( -help                       gives this help )
-    -foo         boolflag (false) } {}}
-test opt-11.2 {default value for args} {
-    set args {}
-    set key [::tcl::OptKeyRegister {{args -list {a b c} "args..."}}]
-    ::tcl::OptKeyParse $key {}
-    ::tcl::OptKeyDelete $key
-    set args
-} {a b c}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/osa.test b/tests/osa.test
deleted file mode 100644
index 4b061cf..0000000
--- a/tests/osa.test
+++ /dev/null
@@ -1,47 +0,0 @@
-# Commands covered:  AppleScript
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: osa.test,v 1.3 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Only run the test if we can load the AppleScript command
-set ::tcltest::testConfig(appleScript) [expr {[info commands AppleScript] != ""}]
-
-test osa-1.1 {Tcl_OSAComponentCmd} {macOnly appleScript} {
-    list [catch AppleScript msg] $msg
-} {1 {wrong # args: should be "AppleScript option ?arg ...?"}}
-test osa-1.2 {Tcl_OSAComponentCmd} {macOnly appleScript} {
-    list [catch {AppleScript x} msg] $msg
-} {1 {bad option "x": should be compile, decompile, delete, execute, info, load, run or store}}
-
-test osa-1.3 {TclOSACompileCmd} {macOnly appleScript} {
-    list [catch {AppleScript compile} msg] $msg
-} {1 {wrong # args: should be "AppleScript compile ?options? code"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/parse.test b/tests/parse.test
deleted file mode 100644
index 1f36063..0000000
--- a/tests/parse.test
+++ /dev/null
@@ -1,743 +0,0 @@
-# This file contains a collection of tests for the procedures in the
-# file tclParse.c.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: parse.test,v 1.3 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testparser] == {}} {
-    puts "This application hasn't been compiled with the \"testparser\""
-    puts "command, so I can't test the Tcl parser."
-    ::tcltest::cleanupTests
-    return 
-}
-
-test parse-1.1 {Tcl_ParseCommand procedure, computing string length} {
-    testparser [bytestring "foo\0 bar"] -1
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-1.2 {Tcl_ParseCommand procedure, computing string length} {
-    testparser "foo bar" -1
-} {- {foo bar} 2 simple foo 1 text foo 0 simple bar 1 text bar 0 {}}
-test parse-1.3 {Tcl_ParseCommand procedure, leading space} {
-    testparser "  \n\t   foo" 0
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-1.4 {Tcl_ParseCommand procedure, leading space} {
-    testparser "\f\r\vfoo" 0
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-1.5 {Tcl_ParseCommand procedure, backslash-newline in leading space} {
-    testparser "  \\\n foo" 0
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-1.6 {Tcl_ParseCommand procedure, backslash-newline in leading space} {
-    testparser {  \a foo} 0
-} {- {\a foo} 2 word {\a} 1 backslash {\a} 0 simple foo 1 text foo 0 {}}
-test parse-1.7 {Tcl_ParseCommand procedure, missing continuation line in leading space} {
-    testparser "   \\\n" 0
-} {- {} 0 {}}
-test parse-1.8 {Tcl_ParseCommand procedure, eof in leading space} {
-    testparser "      foo" 3
-} {- {} 0 {   foo}}
-
-test parse-2.1 {Tcl_ParseCommand procedure, comments} {
-    testparser "# foo bar\n foo" 0
-} {{# foo bar
-} foo 1 simple foo 1 text foo 0 {}}
-test parse-2.2 {Tcl_ParseCommand procedure, several comments} {
-    testparser " # foo bar\n # another comment\n\n   foo" 0
-} {{# foo bar
- # another comment
-} foo 1 simple foo 1 text foo 0 {}}
-test parse-2.3 {Tcl_ParseCommand procedure, backslash-newline in comments} {
-    testparser " # foo bar\\\ncomment on continuation line\nfoo" 0
-} {#\ foo\ bar\\\ncomment\ on\ continuation\ line\n foo 1 simple foo 1 text foo 0 {}}
-test parse-2.4 {Tcl_ParseCommand procedure, missing continuation line in comment} {
-    testparser "#   \\\n" 0
-} {#\ \ \ \\\n {} 0 {}}
-test parse-2.5 {Tcl_ParseCommand procedure, eof in comment} {
-    testparser " # foo bar\nfoo" 8
-} {{# foo b} {} 0 {ar
-foo}}
-
-test parse-3.1 {Tcl_ParseCommand procedure, parsing words, skipping space} {
-    testparser "foo  bar\t\tx" 0
-} {- {foo  bar		x} 3 simple foo 1 text foo 0 simple bar 1 text bar 0 simple x 1 text x 0 {}}
-test parse-3.2 {Tcl_ParseCommand procedure, missing continuation line in leading space} {
-    testparser "abc  \\\n" 0
-} {- abc\ \ \\\n 1 simple abc 1 text abc 0 {}}
-test parse-3.3 {Tcl_ParseCommand procedure, parsing words, command ends in space} {
-    testparser "foo  ;  bar x" 0
-} {- {foo  ;} 1 simple foo 1 text foo 0 {  bar x}}
-test parse-3.4 {Tcl_ParseCommand procedure, parsing words, command ends in space} {
-    testparser "foo       " 5
-} {- {foo  } 1 simple foo 1 text foo 0 {     }}
-test parse-3.5 {Tcl_ParseCommand procedure, quoted words} {
-    testparser {foo "a b c" d "efg";} 0
-} {- {foo "a b c" d "efg";} 4 simple foo 1 text foo 0 simple {"a b c"} 1 text {a b c} 0 simple d 1 text d 0 simple {"efg"} 1 text efg 0 {}}
-test parse-3.6 {Tcl_ParseCommand procedure, words in braces} {
-    testparser {foo {a $b [concat foo]} {c d}} 0
-} {- {foo {a $b [concat foo]} {c d}} 3 simple foo 1 text foo 0 simple {{a $b [concat foo]}} 1 text {a $b [concat foo]} 0 simple {{c d}} 1 text {c d} 0 {}}
-test parse-3.7 {Tcl_ParseCommand procedure, error in unquoted word} {
-    list [catch {testparser "foo \$\{abc" 0} msg] $msg $errorInfo
-} {1 {missing close-brace for variable name} missing\ close-brace\ for\ variable\ name\n\ \ \ \ (remainder\ of\ script:\ \"\{abc\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"foo\ \\\$\\\{abc\"\ 0\"}
-
-test parse-4.1 {Tcl_ParseCommand procedure, simple words} {
-    testparser {foo} 0
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-4.2 {Tcl_ParseCommand procedure, simple words} {
-    testparser {{abc}} 0
-} {- {{abc}} 1 simple {{abc}} 1 text abc 0 {}}
-test parse-4.3 {Tcl_ParseCommand procedure, simple words} {
-    testparser {"c d"} 0
-} {- {"c d"} 1 simple {"c d"} 1 text {c d} 0 {}}
-test parse-4.4 {Tcl_ParseCommand procedure, simple words} {
-    testparser {x$d} 0
-} {- {x$d} 1 word {x$d} 3 text x 0 variable {$d} 1 text d 0 {}}
-test parse-4.5 {Tcl_ParseCommand procedure, simple words} {
-    testparser {"a [foo] b"} 0
-} {- {"a [foo] b"} 1 word {"a [foo] b"} 3 text {a } 0 command {[foo]} 0 text { b} 0 {}}
-test parse-4.6 {Tcl_ParseCommand procedure, simple words} {
-    testparser {$x} 0
-} {- {$x} 1 word {$x} 2 variable {$x} 1 text x 0 {}}
-
-test parse-5.1 {Tcl_ParseCommand procedure, backslash-newline terminates word} {
-    testparser "{abc}\\\n" 0
-} {- \{abc\}\\\n 1 simple {{abc}} 1 text abc 0 {}}
-test parse-5.2 {Tcl_ParseCommand procedure, backslash-newline terminates word} {
-    testparser "foo\\\nbar" 0
-} {- foo\\\nbar 2 simple foo 1 text foo 0 simple bar 1 text bar 0 {}}
-test parse-5.3 {Tcl_ParseCommand procedure, word terminator is command terminator} {
-    testparser "foo\n bar" 0
-} {- {foo
-} 1 simple foo 1 text foo 0 { bar}}
-test parse-5.4 {Tcl_ParseCommand procedure, word terminator is command terminator} {
-    testparser "foo; bar" 0
-} {- {foo;} 1 simple foo 1 text foo 0 { bar}}
-test parse-5.5 {Tcl_ParseCommand procedure, word terminator is end of string} {
-    testparser "\"foo\" bar" 5
-} {- {"foo"} 1 simple {"foo"} 1 text foo 0 { bar}}
-test parse-5.6 {Tcl_ParseCommand procedure, junk after close quote} {
-    list [catch {testparser {foo "bar"x} 0} msg] $msg $errorInfo
-} {1 {extra characters after close-quote} {extra characters after close-quote
-    (remainder of script: "x")
-    invoked from within
-"testparser {foo "bar"x} 0"}}
-test parse-5.7 {Tcl_ParseCommand procedure, backslash-newline after close quote} {
-    testparser "foo \"bar\"\\\nx" 0
-} {- foo\ \"bar\"\\\nx 3 simple foo 1 text foo 0 simple {"bar"} 1 text bar 0 simple x 1 text x 0 {}}
-test parse-5.8 {Tcl_ParseCommand procedure, junk after close brace} {
-    list [catch {testparser {foo {bar}x} 0} msg] $msg $errorInfo
-} {1 {extra characters after close-brace} {extra characters after close-brace
-    (remainder of script: "x")
-    invoked from within
-"testparser {foo {bar}x} 0"}}
-test parse-5.9 {Tcl_ParseCommand procedure, backslash-newline after close brace} {
-    testparser "foo {bar}\\\nx" 0
-} {- foo\ \{bar\}\\\nx 3 simple foo 1 text foo 0 simple {{bar}} 1 text bar 0 simple x 1 text x 0 {}}
-test parse-5.10 {Tcl_ParseCommand procedure, multiple deletion of non-static buffer} {
-    # This test is designed to catch bug 1681.
-    list [catch {testparser "a \"\\1\\2\\3\\4\\5\\6\\7\\8\\9\\1\\2\\3\\4\\5\\6\\7\\8" 0} msg] $msg $errorInfo
-} "1 {missing \"} {missing \"
-    (remainder of script: \"\"\\1\\2\\3\\4\\5\\6\\7\\8\\9\\1\\2\\3\\4\\5\\6\\7\\8\")
-    invoked from within
-\"testparser \"a \\\"\\\\1\\\\2\\\\3\\\\4\\\\5\\\\6\\\\7\\\\8\\\\9\\\\1\\\\2\\\\3\\\\4\\\\5\\\\6\\\\7\\\\8\" 0\"}"
-
-test parse-6.1 {ParseTokens procedure, empty word} {
-    testparser {""} 0
-} {- {""} 1 simple {""} 1 text {} 0 {}}
-test parse-6.2 {ParseTokens procedure, simple range} {
-    testparser {"abc$x.e"} 0
-} {- {"abc$x.e"} 1 word {"abc$x.e"} 4 text abc 0 variable {$x} 1 text x 0 text .e 0 {}}
-test parse-6.3 {ParseTokens procedure, variable reference} {
-    testparser {abc$x.e $y(z)} 0
-} {- {abc$x.e $y(z)} 2 word {abc$x.e} 4 text abc 0 variable {$x} 1 text x 0 text .e 0 word {$y(z)} 3 variable {$y(z)} 2 text y 0 text z 0 {}}
-test parse-6.4 {ParseTokens procedure, variable reference} {
-    list [catch {testparser {$x([a )} 0} msg] $msg
-} {1 {missing close-bracket}}
-test parse-6.5 {ParseTokens procedure, command substitution} {
-    testparser {[foo $x bar]z} 0
-} {- {[foo $x bar]z} 1 word {[foo $x bar]z} 2 command {[foo $x bar]} 0 text z 0 {}}
-test parse-6.6 {ParseTokens procedure, command substitution} {
-    testparser {[foo \] [a b]]} 0
-} {- {[foo \] [a b]]} 1 word {[foo \] [a b]]} 1 command {[foo \] [a b]]} 0 {}}
-test parse-6.7 {ParseTokens procedure, error in command substitution} {
-    list [catch {testparser {a [b {}c d] e} 0} msg] $msg $errorInfo
-} {1 {extra characters after close-brace} {extra characters after close-brace
-    (remainder of script: "c d] e")
-    invoked from within
-"testparser {a [b {}c d] e} 0"}}
-test parse-6.8 {ParseTokens procedure, error in command substitution} {
-    info complete {a [b {}c d]}
-} {1}
-test parse-6.9 {ParseTokens procedure, error in command substitution} {
-    info complete {a [b "c d}
-} {0}
-test parse-6.10 {ParseTokens procedure, incomplete sub-command} {
-    info complete {puts [
-	expr 1+1
-	#this is a comment ]}
-} {0}
-test parse-6.11 {ParseTokens procedure, memory allocation for big nested command} {
-    testparser {[$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b)]} 0
-} {- {[$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b)]} 1 word {[$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b)]} 1 command {[$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b)]} 0 {}}
-test parse-6.12 {ParseTokens procedure, missing close bracket} {
-    list [catch {testparser {[foo $x bar} 0} msg] $msg $errorInfo
-} {1 {missing close-bracket} {missing close-bracket
-    (remainder of script: "[foo $x bar")
-    invoked from within
-"testparser {[foo $x bar} 0"}}
-test parse-6.13 {ParseTokens procedure, backslash-newline without continuation line} {
-    list [catch {testparser "\"a b\\\n" 0} msg] $msg $errorInfo
-} {1 {missing "} missing\ \"\n\ \ \ \ (remainder\ of\ script:\ \"\"a\ b\\\n\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"\\\"a\ b\\\\\\n\"\ 0\"}
-test parse-6.14 {ParseTokens procedure, backslash-newline} {
-    testparser "b\\\nc" 0
-} {- b\\\nc 2 simple b 1 text b 0 simple c 1 text c 0 {}}
-test parse-6.15 {ParseTokens procedure, backslash-newline} {
-    testparser "\"b\\\nc\"" 0
-} {- \"b\\\nc\" 1 word \"b\\\nc\" 3 text b 0 backslash \\\n 0 text c 0 {}}
-test parse-6.16 {ParseTokens procedure, backslash substitution} {
-    testparser {\n\a\x7f} 0
-} {- {\n\a\x7f} 1 word {\n\a\x7f} 3 backslash {\n} 0 backslash {\a} 0 backslash {\x7f} 0 {}}
-test parse-6.17 {ParseTokens procedure, null characters} {
-    testparser [bytestring "foo\0zz"] 0
-} "- [bytestring foo\0zz] 1 word [bytestring foo\0zz] 3 text foo 0 text [bytestring \0] 0 text zz 0 {}"
-
-test parse-7.1 {Tcl_FreeParse and ExpandTokenArray procedures} {
-    testparser {$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) } 0
-} {- {$a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) $a(b) } 16 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 word {$a(b)} 3 variable {$a(b)} 2 text a 0 text b 0 {}}
-
-test parse-8.1 {Tcl_EvalObjv procedure} {
-    testevalobjv 0 concat this is a test
-} {this is a test}
-test parse-8.2 {Tcl_EvalObjv procedure, unknown commands} {
-    rename unknown unknown.old
-    set x [catch {testevalobjv 10 asdf poiu} msg]
-    rename unknown.old unknown
-    list $x $msg
-} {1 {invalid command name "asdf"}}
-test parse-8.3 {Tcl_EvalObjv procedure, unknown commands} {
-    rename unknown unknown.old
-    proc unknown args {
-	return "unknown $args"
-    }
-    set x [catch {testevalobjv 0 asdf poiu} msg]
-    rename unknown {}
-    rename unknown.old unknown
-    list $x $msg
-} {0 {unknown asdf poiu}}
-test parse-8.4 {Tcl_EvalObjv procedure, unknown commands} {
-    rename unknown unknown.old
-    proc unknown args {
-	error "I don't like that command"
-    }
-    set x [catch {testevalobjv 0 asdf poiu} msg]
-    rename unknown {}
-    rename unknown.old unknown
-    list $x $msg
-} {1 {I don't like that command}}
-test parse-8.5 {Tcl_EvalObjv procedure, command traces} {
-    testevalobjv 0 set x 123
-    testcmdtrace tracetest {testevalobjv 0 set x $x}
-} {{testevalobjv 0 set x $x} {testevalobjv 0 set x 123} {set x 123} {set x 123}}
-test parse-8.7 {Tcl_EvalObjv procedure, TCL_EVAL_GLOBAL flag} {
-    proc x {} {
-	set y 23
-	set z [testevalobjv 1 set y]
-	return [list $z $y]
-    }
-    catch {unset y}
-    set y 16
-    x
-} {16 23}
-test parse-8.8 {Tcl_EvalObjv procedure, async handlers} {
-    proc async1 {result code} {
-	global aresult acode
-	set aresult $result
-	set acode $code
-	return "new result"
-    }
-    set handler1 [testasync create async1]
-    set aresult xxx
-    set acode yyy
-    set x [list [catch [list testevalobjv 0 testasync mark $handler1 original 0] msg] $msg $acode $aresult]
-    testasync delete
-    set x
-} {0 {new result} 0 original}
-test parse-8.9 {Tcl_EvalObjv procedure, exceptional return} {
-    list [catch {testevalobjv 0 error message} msg] $msg
-} {1 message}
-
-test parse-9.1 {Tcl_LogCommandInfo, line numbers} {
-    catch {unset x}
-    list [catch {testevalex {for {} 1 {} {
-
-
-	# asdf
-	set x
-    }}}] $errorInfo
-} {1 {can't read "x": no such variable
-    while executing
-"set x"
-    ("for" body line 5)
-    invoked from within
-"for {} 1 {} {
-
-
-	# asdf
-	set x
-    }"
-    invoked from within
-"testevalex {for {} 1 {} {
-
-
-	# asdf
-	set x
-    }}"}}
-test parse-9.2 {Tcl_LogCommandInfo, truncating long commands} {
-    list [testevalex {catch {set a b 111111111 222222222 333333333 444444444 555555555 666666666 777777777 888888888 999999999 000000000 aaaaaaaaa bbbbbbbbb ccccccccc ddddddddd eeeeeeeee fffffffff ggggggggg}}] $errorInfo
-} {1 {wrong # args: should be "set varName ?newValue?"
-    while executing
-"set a b 111111111 222222222 333333333 444444444 555555555 666666666 777777777 888888888 999999999 000000000 aaaaaaaaa bbbbbbbbb ccccccccc ddddddddd ee..."}}
-
-test parse-10.1 {Tcl_EvalTokens, simple text} {
-    testevalex {concat test}
-} {test}
-test parse-10.2 {Tcl_EvalTokens, backslash sequences} {
-    testevalex {concat test\063\062test}
-} {test32test}
-test parse-10.3 {Tcl_EvalTokens, nested commands} {
-    testevalex {concat [expr 2 + 6]}
-} {8}
-test parse-10.4 {Tcl_EvalTokens, nested commands} {
-    catch {unset a}
-    list [catch {testevalex {concat xxx[expr $a]}} msg] $msg
-} {1 {can't read "a": no such variable}}
-test parse-10.5 {Tcl_EvalTokens, simple variables} {
-    set a hello
-    testevalex {concat $a}
-} {hello}
-test parse-10.6 {Tcl_EvalTokens, array variables} {
-    catch {unset a}
-    set a(12) 46
-    testevalex {concat $a(12)}
-} {46}
-test parse-10.7 {Tcl_EvalTokens, array variables} {
-    catch {unset a}
-    set a(12) 46
-    testevalex {concat $a(1[expr 3 - 1])}
-} {46}
-test parse-10.8 {Tcl_EvalTokens, array variables} {
-    catch {unset a}
-    list [catch {testevalex {concat $x($a)}} msg] $msg
-} {1 {can't read "a": no such variable}}
-test parse-10.9 {Tcl_EvalTokens, array variables} {
-    catch {unset a}
-    list [catch {testevalex {concat xyz$a(1)}} msg] $msg
-} {1 {can't read "a(1)": no such variable}}
-test parse-10.10 {Tcl_EvalTokens, object values} {
-    set a 123
-    testevalex {concat $a}
-} {123}
-test parse-10.11 {Tcl_EvalTokens, object values} {
-    set a 123
-    testevalex {concat $a$a$a}
-} {123123123}
-test parse-10.12 {Tcl_EvalTokens, object values} {
-    testevalex {concat [expr 2][expr 4][expr 6]}
-} {246}
-test parse-10.13 {Tcl_EvalTokens, string values} {
-    testevalex {concat {a" b"}}
-} {a" b"}
-test parse-10.14 {Tcl_EvalTokens, string values} {
-    set a 111
-    testevalex {concat x$a.$a.$a}
-} {x111.111.111}
-
-test parse-11.1 {Tcl_Eval2, TCL_EVAL_GLOBAL flag} {
-    proc x {} {
-	set y 777
-	set z [testevalex "set y" global]
-	return [list $z $y]
-    }
-    catch {unset y}
-    set y 321
-    x
-} {321 777}
-test parse-11.2 {Tcl_Eval2, error while parsing} {
-    list [catch {testevalex {concat "abc}} msg] $msg
-} {1 {missing "}}
-test parse-11.3 {Tcl_Eval2, error while collecting words} {
-    catch {unset a}
-    list [catch {testevalex {concat xyz $a}} msg] $msg
-} {1 {can't read "a": no such variable}}
-test parse-11.4 {Tcl_Eval2, error in Tcl_EvalObjv call} {
-    catch {unset a}
-    list [catch {testevalex {_bogus_ a b c d}} msg] $msg
-} {1 {invalid command name "_bogus_"}}
-test parse-11.5 {Tcl_Eval2, exceptional return} {
-    list [catch {testevalex {break}} msg] $msg
-} {3 {}}
-test parse-11.6 {Tcl_Eval2, freeing memory} {
-    testevalex {concat a b c d e f g h i j k l m n o p q r s t u v w x y z}
-} {a b c d e f g h i j k l m n o p q r s t u v w x y z}
-test parse-11.7 {Tcl_Eval2, multiple commands in script} {
-    list [testevalex {set a b; set c d}] $a $c
-} {d b d}
-test parse-11.8 {Tcl_Eval2, multiple commands in script} {
-    list [testevalex {
-	set a b
-	set c d
-    }] $a $c
-} {d b d}
-test parse-11.9 {Tcl_Eval2, freeing memory after error} {
-    catch {unset a}
-    list [catch {testevalex {concat a b c d e f g h i j k l m n o p q r s t u v w x y z $a}} msg] $msg
-} {1 {can't read "a": no such variable}}
-test parse-11.10 {Tcl_EvalTokens, empty commands} {
-    testevalex {concat xyz;   }
-} {xyz}
-test parse-11.11 {Tcl_EvalTokens, empty commands} {
-    testevalex "concat abc; ; # this is a comment\n"
-} {abc}
-test parse-11.12 {Tcl_EvalTokens, empty commands} {
-    testevalex {}
-} {}
-
-test parse-12.1 {Tcl_ParseVarName procedure, initialization} {
-    list [catch {testparsevarname {$a([first second])} 8 0} msg] $msg
-} {1 {missing close-bracket}}
-test parse-12.2 {Tcl_ParseVarName procedure, initialization} {
-    testparsevarname {$a([first second])} 0 0
-} {- {} 0 variable {$a([first second])} 2 text a 0 command {[first second]} 0 {}}
-test parse-12.3 {Tcl_ParseVarName procedure, initialization} {
-    list [catch {testparsevarname {$abcd} 3 0} msg] $msg
-} {0 {- {} 0 variable {$ab} 1 text ab 0 cd}}
-test parse-12.4 {Tcl_ParseVarName procedure, initialization} {
-    testparsevarname {$abcd} 0 0
-} {- {} 0 variable {$abcd} 1 text abcd 0 {}}
-test parse-12.5 {Tcl_ParseVarName procedure, just a dollar sign} {
-    testparsevarname {$abcd} 1 0
-} {- {} 0 text {$} 0 abcd}
-test parse-12.6 {Tcl_ParseVarName procedure, braced variable name} {
-    testparser {${..[]b}cd} 0
-} {- {${..[]b}cd} 1 word {${..[]b}cd} 3 variable {${..[]b}} 1 text {..[]b} 0 text cd 0 {}}
-test parse-12.7 {Tcl_ParseVarName procedure, braced variable name} {
-    testparser "\$\{\{\} " 0
-} {- \$\{\{\}\  1 word \$\{\{\} 2 variable \$\{\{\} 1 text \{ 0 {}}
-test parse-12.8 {Tcl_ParseVarName procedure, missing close brace} {
-    list [catch {testparser "$\{abc" 0} msg] $msg $errorInfo
-} {1 {missing close-brace for variable name} missing\ close-brace\ for\ variable\ name\n\ \ \ \ (remainder\ of\ script:\ \"\{abc\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"\$\\\{abc\"\ 0\"}
-test parse-12.9 {Tcl_ParseVarName procedure, missing close brace} {
-    list [catch {testparsevarname {${bcd}} 4 0} msg] $msg
-} {1 {missing close-brace for variable name}}
-test parse-12.10 {Tcl_ParseVarName procedure, missing close brace} {
-    list [catch {testparsevarname {${bc}} 4 0} msg] $msg
-} {1 {missing close-brace for variable name}}
-test parse-12.11 {Tcl_ParseVarName procedure, simple variable name} {
-    testparser {$az_AZ.} 0
-} {- {$az_AZ.} 1 word {$az_AZ.} 3 variable {$az_AZ} 1 text az_AZ 0 text . 0 {}}
-test parse-12.12 {Tcl_ParseVarName procedure, simple variable name} {
-    testparser {$abcdefg} 4
-} {- {$abc} 1 word {$abc} 2 variable {$abc} 1 text abc 0 defg}
-test parse-12.13 {Tcl_ParseVarName procedure, simple variable name with ::} {
-    testparser {$xyz::ab:c} 0
-} {- {$xyz::ab:c} 1 word {$xyz::ab:c} 3 variable {$xyz::ab} 1 text xyz::ab 0 text :c 0 {}}
-test parse-12.14 {Tcl_ParseVarName procedure, variable names with many colons} {
-    testparser {$xyz:::::c} 0
-} {- {$xyz:::::c} 1 word {$xyz:::::c} 2 variable {$xyz:::::c} 1 text xyz:::::c 0 {}}
-test parse-12.15 {Tcl_ParseVarName procedure, : vs. ::} {
-    testparsevarname {$ab:cd} 0 0
-} {- {} 0 variable {$ab} 1 text ab 0 :cd}
-test parse-12.16 {Tcl_ParseVarName procedure, eof in ::} {
-    testparsevarname {$ab::cd} 4 0
-} {- {} 0 variable {$ab} 1 text ab 0 ::cd}
-test parse-12.17 {Tcl_ParseVarName procedure, eof in ::} {
-    testparsevarname {$ab:::cd} 5 0
-} {- {} 0 variable {$ab::} 1 text ab:: 0 :cd}
-test parse-12.18 {Tcl_ParseVarName procedure, no variable name} {
-    testparser {$$ $.} 0
-} {- {$$ $.} 2 word {$$} 2 text {$} 0 text {$} 0 word {$.} 2 text {$} 0 text . 0 {}}
-test parse-12.19 {Tcl_ParseVarName procedure, EOF before (} {
-    testparsevarname {$ab(cd)} 3 0
-} {- {} 0 variable {$ab} 1 text ab 0 (cd)}
-test parse-12.20 {Tcl_ParseVarName procedure, array reference} {
-    testparser {$x(abc)} 0
-} {- {$x(abc)} 1 word {$x(abc)} 3 variable {$x(abc)} 2 text x 0 text abc 0 {}}
-test parse-12.21 {Tcl_ParseVarName procedure, array reference} {
-    testparser {$x(ab$cde[foo bar])} 0
-} {- {$x(ab$cde[foo bar])} 1 word {$x(ab$cde[foo bar])} 6 variable {$x(ab$cde[foo bar])} 5 text x 0 text ab 0 variable {$cde} 1 text cde 0 command {[foo bar]} 0 {}}
-test parse-12.22 {Tcl_ParseVarName procedure, array reference} {
-    testparser {$x([cmd arg]zz)} 0
-} {- {$x([cmd arg]zz)} 1 word {$x([cmd arg]zz)} 4 variable {$x([cmd arg]zz)} 3 text x 0 command {[cmd arg]} 0 text zz 0 {}}
-test parse-12.23 {Tcl_ParseVarName procedure, missing close paren in array reference} {
-    list [catch {testparser {$x(poiu} 0} msg] $msg $errorInfo
-} {1 {missing )} {missing )
-    (remainder of script: "(poiu")
-    invoked from within
-"testparser {$x(poiu} 0"}}
-test parse-12.24 {Tcl_ParseVarName procedure, missing close paren in array reference} {
-    list [catch {testparsevarname {$ab(cd)} 6 0} msg] $msg $errorInfo
-} {1 {missing )} {missing )
-    (remainder of script: "(cd)")
-    invoked from within
-"testparsevarname {$ab(cd)} 6 0"}}
-test parse-12.25 {Tcl_ParseVarName procedure, nested array reference} {
-    testparser {$x(a$y(b$z))} 0
-} {- {$x(a$y(b$z))} 1 word {$x(a$y(b$z))} 8 variable {$x(a$y(b$z))} 7 text x 0 text a 0 variable {$y(b$z)} 4 text y 0 text b 0 variable {$z} 1 text z 0 {}}
-
-test parse-13.1 {Tcl_ParseVar procedure} {
-    set abc 24
-    testparsevar {$abc.fg}
-} {24 .fg}
-test parse-13.2 {Tcl_ParseVar procedure, no variable name} {
-    testparsevar {$}
-} {{$} {}}
-test parse-13.3 {Tcl_ParseVar procedure, no variable name} {
-    testparsevar {$.123}
-} {{$} .123}
-test parse-13.4 {Tcl_ParseVar procedure, error looking up variable} {
-    catch {unset abc}
-    list [catch {testparsevar {$abc}} msg] $msg
-} {1 {can't read "abc": no such variable}}
-test parse-13.5 {Tcl_ParseVar procedure, error looking up variable} {
-    catch {unset abc}
-    list [catch {testparsevar {$abc([bogus x y z])}} msg] $msg
-} {1 {invalid command name "bogus"}}
-
-test parse-14.1 {Tcl_ParseBraces procedure, computing string length} {
-    testparser [bytestring "foo\0 bar"] -1
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-14.2 {Tcl_ParseBraces procedure, computing string length} {
-    testparser "foo bar" -1
-} {- {foo bar} 2 simple foo 1 text foo 0 simple bar 1 text bar 0 {}}
-test parse-14.3 {Tcl_ParseBraces procedure, words in braces} {
-    testparser {foo {a $b [concat foo]} {c d}} 0
-} {- {foo {a $b [concat foo]} {c d}} 3 simple foo 1 text foo 0 simple {{a $b [concat foo]}} 1 text {a $b [concat foo]} 0 simple {{c d}} 1 text {c d} 0 {}}
-test parse-14.4 {Tcl_ParseBraces procedure, empty nested braces} {
-    testparser {foo {{}}} 0
-} {- {foo {{}}} 2 simple foo 1 text foo 0 simple {{{}}} 1 text {{}} 0 {}}
-test parse-14.5 {Tcl_ParseBraces procedure, nested braces} {
-    testparser {foo {{a {b} c} {} {d e}}} 0
-} {- {foo {{a {b} c} {} {d e}}} 2 simple foo 1 text foo 0 simple {{{a {b} c} {} {d e}}} 1 text {{a {b} c} {} {d e}} 0 {}}
-test parse-14.6 {Tcl_ParseBraces procedure, backslashes in words in braces} {
-    testparser "foo {a \\n\\\{}" 0
-} {- {foo {a \n\{}} 2 simple foo 1 text foo 0 simple {{a \n\{}} 1 text {a \n\{} 0 {}}
-test parse-14.7 {Tcl_ParseBraces procedure, missing continuation line in braces} {
-    list [catch {testparser "\{abc\\\n" 0} msg] $msg $errorInfo
-} {1 {missing close-brace} missing\ close-brace\n\ \ \ \ (remainder\ of\ script:\ \"\{abc\\\n\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"\\\{abc\\\\\\n\"\ 0\"}
-test parse-14.8 {Tcl_ParseBraces procedure, backslash-newline in braces} {
-    testparser "foo {\\\nx}" 0
-} {- foo\ \{\\\nx\} 2 simple foo 1 text foo 0 word \{\\\nx\} 2 backslash \\\n 0 text x 0 {}}
-test parse-14.9 {Tcl_ParseBraces procedure, backslash-newline in braces} {
-    testparser "foo {a \\\n   b}" 0
-} {- foo\ \{a\ \\\n\ \ \ b\} 2 simple foo 1 text foo 0 word \{a\ \\\n\ \ \ b\} 3 text {a } 0 backslash \\\n\ \ \  0 text b 0 {}}
-test parse-14.10 {Tcl_ParseBraces procedure, backslash-newline in braces} {
-    testparser "foo {xyz\\\n }" 0
-} {- foo\ \{xyz\\\n\ \} 2 simple foo 1 text foo 0 word \{xyz\\\n\ \} 2 text xyz 0 backslash \\\n\  0 {}}
-test parse-14.11 {Tcl_ParseBraces procedure, empty braced string} {
-    testparser {foo {}} 0
-} {- {foo {}} 2 simple foo 1 text foo 0 simple {{}} 1 text {} 0 {}}
-test parse-14.12 {Tcl_ParseBraces procedure, missing close brace} {
-    list [catch {testparser "foo \{xy\\\nz" 0} msg] $msg $errorInfo
-} {1 {missing close-brace} missing\ close-brace\n\ \ \ \ (remainder\ of\ script:\ \"\{xy\\\nz\")\n\ \ \ \ invoked\ from\ within\n\"testparser\ \"foo\ \\\{xy\\\\\\nz\"\ 0\"}
-
-test parse-15.1 {Tcl_ParseQuotedString procedure, computing string length} {
-    testparser [bytestring "foo\0 bar"] -1
-} {- foo 1 simple foo 1 text foo 0 {}}
-test parse-15.2 {Tcl_ParseQuotedString procedure, computing string length} {
-    testparser "foo bar" -1
-} {- {foo bar} 2 simple foo 1 text foo 0 simple bar 1 text bar 0 {}}
-test parse-15.3 {Tcl_ParseQuotedString procedure, word is quoted string} {
-    testparser {foo "a b c" d "efg";} 0
-} {- {foo "a b c" d "efg";} 4 simple foo 1 text foo 0 simple {"a b c"} 1 text {a b c} 0 simple d 1 text d 0 simple {"efg"} 1 text efg 0 {}}
-test parse-15.4 {Tcl_ParseQuotedString procedure, garbage after quoted string} {
-    list [catch {testparser {foo "a b c"d} 0} msg] $msg $errorInfo
-} {1 {extra characters after close-quote} {extra characters after close-quote
-    (remainder of script: "d")
-    invoked from within
-"testparser {foo "a b c"d} 0"}}
-
-test parse-15.5 {CommandComplete procedure} {
-    info complete ""
-} 1
-test parse-15.6 {CommandComplete procedure} {
-    info complete "  \n"
-} 1
-test parse-15.7 {CommandComplete procedure} {
-    info complete "abc def"
-} 1
-test parse-15.8 {CommandComplete procedure} {
-    info complete "a b c d e f \t\n"
-} 1
-test parse-15.9 {CommandComplete procedure} {
-    info complete {a b c"d}
-} 1
-test parse-15.10 {CommandComplete procedure} {
-    info complete {a b "c d" e}
-} 1
-test parse-15.11 {CommandComplete procedure} {
-    info complete {a b "c d"}
-} 1
-test parse-15.12 {CommandComplete procedure} {
-    info complete {a b "c d"}
-} 1
-test parse-15.13 {CommandComplete procedure} {
-    info complete {a b "c d}
-} 0
-test parse-15.14 {CommandComplete procedure} {
-    info complete {a b "}
-} 0
-test parse-15.15 {CommandComplete procedure} {
-    info complete {a b "cd"xyz}
-} 1
-test parse-15.16 {CommandComplete procedure} {
-    info complete {a b "c $d() d"}
-} 1
-test parse-15.17 {CommandComplete procedure} {
-    info complete {a b "c $dd("}
-} 0
-test parse-15.18 {CommandComplete procedure} {
-    info complete {a b "c \"}
-} 0
-test parse-15.19 {CommandComplete procedure} {
-    info complete {a b "c [d e f]"}
-} 1
-test parse-15.20 {CommandComplete procedure} {
-    info complete {a b "c [d e f] g"}
-} 1
-test parse-15.21 {CommandComplete procedure} {
-    info complete {a b "c [d e f"}
-} 0
-test parse-15.22 {CommandComplete procedure} {
-    info complete {a {b c d} e}
-} 1
-test parse-15.23 {CommandComplete procedure} {
-    info complete {a {b c d}}
-} 1
-test parse-15.24 {CommandComplete procedure} {
-    info complete "a b\{c d"
-} 1
-test parse-15.25 {CommandComplete procedure} {
-    info complete "a b \{c"
-} 0
-test parse-15.26 {CommandComplete procedure} {
-    info complete "a b \{c{ }"
-} 0
-test parse-15.27 {CommandComplete procedure} {
-    info complete "a b {c d e}xxx"
-} 1
-test parse-15.28 {CommandComplete procedure} {
-    info complete "a b {c \\\{d e}xxx"
-} 1
-test parse-15.29 {CommandComplete procedure} {
-    info complete {a b [ab cd ef]}
-} 1
-test parse-15.30 {CommandComplete procedure} {
-    info complete {a b x[ab][cd][ef] gh}
-} 1
-test parse-15.31 {CommandComplete procedure} {
-    info complete {a b x[ab][cd[ef] gh}
-} 0
-test parse-15.32 {CommandComplete procedure} {
-    info complete {a b x[ gh}
-} 0
-test parse-15.33 {CommandComplete procedure} {
-    info complete {[]]]}
-} 1
-test parse-15.34 {CommandComplete procedure} {
-    info complete {abc x$yyy}
-} 1
-test parse-15.35 {CommandComplete procedure} {
-    info complete "abc x\${abc\[\\d} xyz"
-} 1
-test parse-15.36 {CommandComplete procedure} {
-    info complete "abc x\$\{ xyz"
-} 0
-test parse-15.37 {CommandComplete procedure} {
-    info complete {word $a(xyz)}
-} 1
-test parse-15.38 {CommandComplete procedure} {
-    info complete {word $a(}
-} 0
-test parse-15.39 {CommandComplete procedure} {
-    info complete "set a \\\n"
-} 0
-test parse-15.40 {CommandComplete procedure} {
-    info complete "set a \\\\\n"
-} 1
-test parse-15.41 {CommandComplete procedure} {
-    info complete "set a \\n "
-} 1
-test parse-15.42 {CommandComplete procedure} {
-    info complete "set a \\"
-} 1
-test parse-15.43 {CommandComplete procedure} {
-    info complete "foo \\\n\{"
-} 0
-test parse-15.44 {CommandComplete procedure} {
-    info complete "a\nb\n# \{\n# \{\nc\n"
-} 1
-test parse-15.45 {CommandComplete procedure} {
-    info complete "#Incomplete comment\\\n"
-} 0
-test parse-15.46 {CommandComplete procedure} {
-    info complete "#Incomplete comment\\\nBut now it's complete.\n"
-} 1
-test parse-15.47 {CommandComplete procedure} {
-    info complete "# Complete comment\\\\\n"
-} 1
-test parse-15.48 {CommandComplete procedure} {
-    info complete "abc\\\n def"
-} 1
-test parse-15.49 {CommandComplete procedure} {
-    info complete "abc\\\n "
-} 1
-test parse-15.50 {CommandComplete procedure} {
-    info complete "abc\\\n"
-} 0
-test parse-15.51 {CommandComplete procedure} "
-    info complete \"\\{abc\\}\\{\"
-" 1
-test parse-15.52 {CommandComplete procedure} {
-    info complete "\"abc\"("
-} 1
-test parse-15.53 {CommandComplete procedure} "
-    info complete \" # {\"
-" 1
-test parse-15.54 {CommandComplete procedure} "
-    info complete \"foo bar;# {\"
-" 1
-test parse-15.55 {CommandComplete procedure} {
-    info complete "set x [bytestring \0]; puts hi"
-} 1
-test parse-15.56 {CommandComplete procedure} {
-    info complete "set x [bytestring \0]; \{"
-} 0
-test parse-15.57 {CommandComplete procedure} {
-    info complete "# Comment should be complete command"
-} 1
-
-# cleanup
-catch {unset a}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
deleted file mode 100644
index e454321..0000000
--- a/tests/parseExpr.test
+++ /dev/null
@@ -1,637 +0,0 @@
-# This file contains a collection of tests for the procedures in the
-# file tclParseExpr.c.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: parseExpr.test,v 1.2 1999/04/16 00:47:31 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Note that the Tcl expression parser (tclParseExpr.c) does not check
-# the semantic validity of the expressions it parses. It does not check,
-# for example, that a math function actually exists, or that the operands
-# of "<<" are integers.
-
-if {[info commands testexprparser] == {}} {
-    puts "This application hasn't been compiled with the \"testexprparser\""
-    puts "command, so I can't test the Tcl expression parser."
-    ::tcltest::cleanupTests
-    return 
-}
-
-test parseExpr-1.1 {Tcl_ParseExpr procedure, computing string length} {
-    testexprparser [bytestring "1+2\0 +3"] -1
-} {- {} 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-1.2 {Tcl_ParseExpr procedure, computing string length} {
-    testexprparser "1  + 2" -1
-} {- {} 0 subexpr {1  + 2} 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-1.3 {Tcl_ParseExpr procedure, error getting initial lexeme} {nonPortable} {
-    list [catch {testexprparser {12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-1.4 {Tcl_ParseExpr procedure, error in conditional expression} {
-    list [catch {testexprparser {foo+} -1} msg] $msg
-} {1 {syntax error in expression "foo+"}}
-test parseExpr-1.5 {Tcl_ParseExpr procedure, lexemes after the expression} {
-    list [catch {testexprparser {1+2 345} -1} msg] $msg
-} {1 {syntax error in expression "1+2 345"}}
-
-test parseExpr-2.1 {ParseCondExpr procedure, valid test subexpr} {
-    testexprparser {2>3? 1 : 0} -1
-} {- {} 0 subexpr {2>3? 1 : 0} 11 operator ? 0 subexpr 2>3 5 operator > 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-2.2 {ParseCondExpr procedure, error in test subexpr} {
-    list [catch {testexprparser {0 || foo} -1} msg] $msg
-} {1 {syntax error in expression "0 || foo"}}
-test parseExpr-2.3 {ParseCondExpr procedure, next lexeme isn't "?"} {
-    testexprparser {1+2} -1
-} {- {} 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-2.4 {ParseCondExpr procedure, next lexeme is "?"} {
-    testexprparser {1+2 ? 3 : 4} -1
-} {- {} 0 subexpr {1+2 ? 3 : 4} 11 operator ? 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-2.5 {ParseCondExpr procedure, bad lexeme after "?"} {nonPortable} {
-    list [catch {testexprparser {1+2 ? 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-2.6 {ParseCondExpr procedure, valid "then" subexpression} {
-    testexprparser {1? 3 : 4} -1
-} {- {} 0 subexpr {1? 3 : 4} 7 operator ? 0 subexpr 1 1 text 1 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-2.7 {ParseCondExpr procedure, error in "then" subexpression} {
-    list [catch {testexprparser {1? fred : martha} -1} msg] $msg
-} {1 {syntax error in expression "1? fred : martha"}}
-test parseExpr-2.8 {ParseCondExpr procedure, lexeme after "then" subexpr isn't ":"} {
-    list [catch {testexprparser {1? 2 martha 3} -1} msg] $msg
-} {1 {syntax error in expression "1? 2 martha 3"}}
-test parseExpr-2.9 {ParseCondExpr procedure, valid "else" subexpression} {
-    testexprparser {27||3? 3 : 4&&9} -1
-} {- {} 0 subexpr {27||3? 3 : 4&&9} 15 operator ? 0 subexpr 27||3 5 operator || 0 subexpr 27 1 text 27 0 subexpr 3 1 text 3 0 subexpr 3 1 text 3 0 subexpr 4&&9 5 operator && 0 subexpr 4 1 text 4 0 subexpr 9 1 text 9 0 {}}
-test parseExpr-2.10 {ParseCondExpr procedure, error in "else" subexpression} {
-    list [catch {testexprparser {1? 2 : martha} -1} msg] $msg
-} {1 {syntax error in expression "1? 2 : martha"}}
-
-test parseExpr-3.1 {ParseLorExpr procedure, valid logical and subexpr} {
-    testexprparser {1&&2 || 3} -1
-} {- {} 0 subexpr {1&&2 || 3} 9 operator || 0 subexpr 1&&2 5 operator && 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-3.2 {ParseLorExpr procedure, error in logical and subexpr} {
-    list [catch {testexprparser {1&&foo || 3} -1} msg] $msg
-} {1 {syntax error in expression "1&&foo || 3"}}
-test parseExpr-3.3 {ParseLorExpr procedure, next lexeme isn't "||"} {
-    testexprparser {1&&2? 1 : 0} -1
-} {- {} 0 subexpr {1&&2? 1 : 0} 11 operator ? 0 subexpr 1&&2 5 operator && 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-3.4 {ParseLorExpr procedure, next lexeme is "||"} {
-    testexprparser {1&&2 || 3} -1
-} {- {} 0 subexpr {1&&2 || 3} 9 operator || 0 subexpr 1&&2 5 operator && 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-3.5 {ParseLorExpr procedure, bad lexeme after "||"} {nonPortable} {
-    list [catch {testexprparser {1&&2 || 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-3.6 {ParseLorExpr procedure, valid RHS subexpression} {
-    testexprparser {1&&2 || 3 || 4} -1
-} {- {} 0 subexpr {1&&2 || 3 || 4} 13 operator || 0 subexpr {1&&2 || 3} 9 operator || 0 subexpr 1&&2 5 operator && 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-3.7 {ParseLorExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1&&2 || 3 || martha} -1} msg] $msg
-} {1 {syntax error in expression "1&&2 || 3 || martha"}}
-
-test parseExpr-4.1 {ParseLandExpr procedure, valid LHS "|" subexpr} {
-    testexprparser {1|2 && 3} -1
-} {- {} 0 subexpr {1|2 && 3} 9 operator && 0 subexpr 1|2 5 operator | 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-4.2 {ParseLandExpr procedure, error in LHS "|" subexpr} {
-    list [catch {testexprparser {1&&foo && 3} -1} msg] $msg
-} {1 {syntax error in expression "1&&foo && 3"}}
-test parseExpr-4.3 {ParseLandExpr procedure, next lexeme isn't "&&"} {
-    testexprparser {1|2? 1 : 0} -1
-} {- {} 0 subexpr {1|2? 1 : 0} 11 operator ? 0 subexpr 1|2 5 operator | 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-4.4 {ParseLandExpr procedure, next lexeme is "&&"} {
-    testexprparser {1|2 && 3} -1
-} {- {} 0 subexpr {1|2 && 3} 9 operator && 0 subexpr 1|2 5 operator | 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-4.5 {ParseLandExpr procedure, bad lexeme after "&&"} {nonPortable} {
-    list [catch {testexprparser {1|2 && 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-4.6 {ParseLandExpr procedure, valid RHS subexpression} {
-    testexprparser {1|2 && 3 && 4} -1
-} {- {} 0 subexpr {1|2 && 3 && 4} 13 operator && 0 subexpr {1|2 && 3} 9 operator && 0 subexpr 1|2 5 operator | 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-4.7 {ParseLandExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1|2 && 3 && martha} -1} msg] $msg
-} {1 {syntax error in expression "1|2 && 3 && martha"}}
-
-test parseExpr-5.1 {ParseBitOrExpr procedure, valid LHS "^" subexpr} {
-    testexprparser {1^2 | 3} -1
-} {- {} 0 subexpr {1^2 | 3} 9 operator | 0 subexpr 1^2 5 operator ^ 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-5.2 {ParseBitOrExpr procedure, error in LHS "^" subexpr} {
-    list [catch {testexprparser {1|foo | 3} -1} msg] $msg
-} {1 {syntax error in expression "1|foo | 3"}}
-test parseExpr-5.3 {ParseBitOrExpr procedure, next lexeme isn't "|"} {
-    testexprparser {1^2? 1 : 0} -1
-} {- {} 0 subexpr {1^2? 1 : 0} 11 operator ? 0 subexpr 1^2 5 operator ^ 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-5.4 {ParseBitOrExpr procedure, next lexeme is "|"} {
-    testexprparser {1^2 | 3} -1
-} {- {} 0 subexpr {1^2 | 3} 9 operator | 0 subexpr 1^2 5 operator ^ 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-5.5 {ParseBitOrExpr procedure, bad lexeme after "|"} {nonPortable} {
-    list [catch {testexprparser {1^2 | 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-5.6 {ParseBitOrExpr procedure, valid RHS subexpression} {
-    testexprparser {1^2 | 3 | 4} -1
-} {- {} 0 subexpr {1^2 | 3 | 4} 13 operator | 0 subexpr {1^2 | 3} 9 operator | 0 subexpr 1^2 5 operator ^ 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-5.7 {ParseBitOrExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1^2 | 3 | martha} -1} msg] $msg
-} {1 {syntax error in expression "1^2 | 3 | martha"}}
-
-test parseExpr-6.1 {ParseBitXorExpr procedure, valid LHS "&" subexpr} {
-    testexprparser {1&2 ^ 3} -1
-} {- {} 0 subexpr {1&2 ^ 3} 9 operator ^ 0 subexpr 1&2 5 operator & 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-6.2 {ParseBitXorExpr procedure, error in LHS "&" subexpr} {
-    list [catch {testexprparser {1^foo ^ 3} -1} msg] $msg
-} {1 {syntax error in expression "1^foo ^ 3"}}
-test parseExpr-6.3 {ParseBitXorExpr procedure, next lexeme isn't "^"} {
-    testexprparser {1&2? 1 : 0} -1
-} {- {} 0 subexpr {1&2? 1 : 0} 11 operator ? 0 subexpr 1&2 5 operator & 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-6.4 {ParseBitXorExpr procedure, next lexeme is "^"} {
-    testexprparser {1&2 ^ 3} -1
-} {- {} 0 subexpr {1&2 ^ 3} 9 operator ^ 0 subexpr 1&2 5 operator & 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-6.5 {ParseBitXorExpr procedure, bad lexeme after "^"} {nonPortable} {
-    list [catch {testexprparser {1&2 ^ 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-6.6 {ParseBitXorExpr procedure, valid RHS subexpression} {
-    testexprparser {1&2 ^ 3 ^ 4} -1
-} {- {} 0 subexpr {1&2 ^ 3 ^ 4} 13 operator ^ 0 subexpr {1&2 ^ 3} 9 operator ^ 0 subexpr 1&2 5 operator & 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-6.7 {ParseBitXorExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1&2 ^ 3 ^ martha} -1} msg] $msg
-} {1 {syntax error in expression "1&2 ^ 3 ^ martha"}}
-
-test parseExpr-7.1 {ParseBitAndExpr procedure, valid LHS equality subexpr} {
-    testexprparser {1==2 & 3} -1
-} {- {} 0 subexpr {1==2 & 3} 9 operator & 0 subexpr 1==2 5 operator == 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-7.2 {ParseBitAndExpr procedure, error in LHS equality subexpr} {
-    list [catch {testexprparser {1!=foo & 3} -1} msg] $msg
-} {1 {syntax error in expression "1!=foo & 3"}}
-test parseExpr-7.3 {ParseBitAndExpr procedure, next lexeme isn't "&"} {
-    testexprparser {1==2? 1 : 0} -1
-} {- {} 0 subexpr {1==2? 1 : 0} 11 operator ? 0 subexpr 1==2 5 operator == 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-7.4 {ParseBitAndExpr procedure, next lexeme is "&"} {
-    testexprparser {1>2 & 3} -1
-} {- {} 0 subexpr {1>2 & 3} 9 operator & 0 subexpr 1>2 5 operator > 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-7.5 {ParseBitAndExpr procedure, bad lexeme after "&"} {nonPortable} {
-    list [catch {testexprparser {1==2 & 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-7.6 {ParseBitAndExpr procedure, valid RHS subexpression} {
-    testexprparser {1<2 & 3 & 4} -1
-} {- {} 0 subexpr {1<2 & 3 & 4} 13 operator & 0 subexpr {1<2 & 3} 9 operator & 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-7.7 {ParseBitAndExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1==2 & 3>2 & martha} -1} msg] $msg
-} {1 {syntax error in expression "1==2 & 3>2 & martha"}}
-
-test parseExpr-7.1 {ParseEqualityExpr procedure, valid LHS relational subexpr} {
-    testexprparser {1<2 == 3} -1
-} {- {} 0 subexpr {1<2 == 3} 9 operator == 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-7.2 {ParseEqualityExpr procedure, error in LHS relational subexpr} {
-    list [catch {testexprparser {1>=foo == 3} -1} msg] $msg
-} {1 {syntax error in expression "1>=foo == 3"}}
-test parseExpr-7.3 {ParseEqualityExpr procedure, next lexeme isn't "==" or "!="} {
-    testexprparser {1<2? 1 : 0} -1
-} {- {} 0 subexpr {1<2? 1 : 0} 11 operator ? 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-7.4 {ParseEqualityExpr procedure, next lexeme is "==" or "!=} {
-    testexprparser {1<2 == 3} -1
-} {- {} 0 subexpr {1<2 == 3} 9 operator == 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-7.5 {ParseEqualityExpr procedure, next lexeme is "==" or "!="} {
-    testexprparser {1<2 != 3} -1
-} {- {} 0 subexpr {1<2 != 3} 9 operator != 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-7.6 {ParseEqualityExpr procedure, bad lexeme after "==" or "!="} {nonPortable} {
-    list [catch {testexprparser {1<2 == 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-7.7 {ParseEqualityExpr procedure, valid RHS subexpression} {
-    testexprparser {1<2 == 3 == 4} -1
-} {- {} 0 subexpr {1<2 == 3 == 4} 13 operator == 0 subexpr {1<2 == 3} 9 operator == 0 subexpr 1<2 5 operator < 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-7.8 {ParseEqualityExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1<2 == 3 != martha} -1} msg] $msg
-} {1 {syntax error in expression "1<2 == 3 != martha"}}
-
-test parseExpr-8.1 {ParseRelationalExpr procedure, valid LHS shift subexpr} {
-    testexprparser {1<<2 < 3} -1
-} {- {} 0 subexpr {1<<2 < 3} 9 operator < 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-8.2 {ParseRelationalExpr procedure, error in LHS shift subexpr} {
-    list [catch {testexprparser {1>=foo < 3} -1} msg] $msg
-} {1 {syntax error in expression "1>=foo < 3"}}
-test parseExpr-8.3 {ParseRelationalExpr procedure, next lexeme isn't relational op} {
-    testexprparser {1<<2? 1 : 0} -1
-} {- {} 0 subexpr {1<<2? 1 : 0} 11 operator ? 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-8.4 {ParseRelationalExpr procedure, next lexeme is relational op} {
-    testexprparser {1<<2 < 3} -1
-} {- {} 0 subexpr {1<<2 < 3} 9 operator < 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-8.5 {ParseRelationalExpr procedure, next lexeme is relational op} {
-    testexprparser {1>>2 > 3} -1
-} {- {} 0 subexpr {1>>2 > 3} 9 operator > 0 subexpr 1>>2 5 operator >> 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-8.6 {ParseRelationalExpr procedure, next lexeme is relational op} {
-    testexprparser {1<<2 <= 3} -1
-} {- {} 0 subexpr {1<<2 <= 3} 9 operator <= 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-8.7 {ParseRelationalExpr procedure, next lexeme is relational op} {
-    testexprparser {1<<2 >= 3} -1
-} {- {} 0 subexpr {1<<2 >= 3} 9 operator >= 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-8.8 {ParseRelationalExpr procedure, bad lexeme after relational op} {nonPortable} {
-    list [catch {testexprparser {1<<2 < 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-8.9 {ParseRelationalExpr procedure, valid RHS subexpression} {
-    testexprparser {1<<2 < 3 < 4} -1
-} {- {} 0 subexpr {1<<2 < 3 < 4} 13 operator < 0 subexpr {1<<2 < 3} 9 operator < 0 subexpr 1<<2 5 operator << 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-8.8 {ParseRelationalExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1<<2 < 3 > martha} -1} msg] $msg
-} {1 {syntax error in expression "1<<2 < 3 > martha"}}
-
-test parseExpr-9.1 {ParseShiftExpr procedure, valid LHS add subexpr} {
-    testexprparser {1+2 << 3} -1
-} {- {} 0 subexpr {1+2 << 3} 9 operator << 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-9.2 {ParseShiftExpr procedure, error in LHS add subexpr} {
-    list [catch {testexprparser {1-foo << 3} -1} msg] $msg
-} {1 {syntax error in expression "1-foo << 3"}}
-test parseExpr-9.3 {ParseShiftExpr procedure, next lexeme isn't "<<" or ">>"} {
-    testexprparser {1+2? 1 : 0} -1
-} {- {} 0 subexpr {1+2? 1 : 0} 11 operator ? 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-9.4 {ParseShiftExpr procedure, next lexeme is "<<" or ">>} {
-    testexprparser {1+2 << 3} -1
-} {- {} 0 subexpr {1+2 << 3} 9 operator << 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-9.5 {ParseShiftExpr procedure, next lexeme is "<<" or ">>"} {
-    testexprparser {1+2 >> 3} -1
-} {- {} 0 subexpr {1+2 >> 3} 9 operator >> 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-9.6 {ParseShiftExpr procedure, bad lexeme after "<<" or ">>"} {nonPortable} {
-    list [catch {testexprparser {1+2 << 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-9.7 {ParseShiftExpr procedure, valid RHS subexpression} {
-    testexprparser {1+2 << 3 << 4} -1
-} {- {} 0 subexpr {1+2 << 3 << 4} 13 operator << 0 subexpr {1+2 << 3} 9 operator << 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-9.8 {ParseShiftExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1+2 << 3 >> martha} -1} msg] $msg
-} {1 {syntax error in expression "1+2 << 3 >> martha"}}
-
-test parseExpr-10.1 {ParseAddExpr procedure, valid LHS multiply subexpr} {
-    testexprparser {1*2 + 3} -1
-} {- {} 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.2 {ParseAddExpr procedure, error in LHS multiply subexpr} {
-    list [catch {testexprparser {1/foo + 3} -1} msg] $msg
-} {1 {syntax error in expression "1/foo + 3"}}
-test parseExpr-10.3 {ParseAddExpr procedure, next lexeme isn't "+" or "-"} {
-    testexprparser {1*2? 1 : 0} -1
-} {- {} 0 subexpr {1*2? 1 : 0} 11 operator ? 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-10.4 {ParseAddExpr procedure, next lexeme is "+" or "-} {
-    testexprparser {1*2 + 3} -1
-} {- {} 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.5 {ParseAddExpr procedure, next lexeme is "+" or "-"} {
-    testexprparser {1*2 - 3} -1
-} {- {} 0 subexpr {1*2 - 3} 9 operator - 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.6 {ParseAddExpr procedure, bad lexeme after "+" or "-"} {nonPortable} {
-    list [catch {testexprparser {1*2 + 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-10.7 {ParseAddExpr procedure, valid RHS subexpression} {
-    testexprparser {1*2 + 3 + 4} -1
-} {- {} 0 subexpr {1*2 + 3 + 4} 13 operator + 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-10.8 {ParseAddExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1*2 + 3 - martha} -1} msg] $msg
-} {1 {syntax error in expression "1*2 + 3 - martha"}}
-
-test parseExpr-10.1 {ParseAddExpr procedure, valid LHS multiply subexpr} {
-    testexprparser {1*2 + 3} -1
-} {- {} 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.2 {ParseAddExpr procedure, error in LHS multiply subexpr} {
-    list [catch {testexprparser {1/foo + 3} -1} msg] $msg
-} {1 {syntax error in expression "1/foo + 3"}}
-test parseExpr-10.3 {ParseAddExpr procedure, next lexeme isn't "+" or "-"} {
-    testexprparser {1*2? 1 : 0} -1
-} {- {} 0 subexpr {1*2? 1 : 0} 11 operator ? 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-10.4 {ParseAddExpr procedure, next lexeme is "+" or "-} {
-    testexprparser {1*2 + 3} -1
-} {- {} 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.5 {ParseAddExpr procedure, next lexeme is "+" or "-"} {
-    testexprparser {1*2 - 3} -1
-} {- {} 0 subexpr {1*2 - 3} 9 operator - 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-10.6 {ParseAddExpr procedure, bad lexeme after "+" or "-"} {nonPortable} {
-    list [catch {testexprparser {1*2 + 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-10.7 {ParseAddExpr procedure, valid RHS subexpression} {
-    testexprparser {1*2 + 3 + 4} -1
-} {- {} 0 subexpr {1*2 + 3 + 4} 13 operator + 0 subexpr {1*2 + 3} 9 operator + 0 subexpr 1*2 5 operator * 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-10.8 {ParseAddExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {1*2 + 3 - martha} -1} msg] $msg
-} {1 {syntax error in expression "1*2 + 3 - martha"}}
-
-test parseExpr-11.1 {ParseMultiplyExpr procedure, valid LHS unary subexpr} {
-    testexprparser {+2 * 3} -1
-} {- {} 0 subexpr {+2 * 3} 7 operator * 0 subexpr +2 3 operator + 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-11.2 {ParseMultiplyExpr procedure, error in LHS unary subexpr} {nonPortable} {
-    list [catch {testexprparser {-12345678901234567890 * 3} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-11.3 {ParseMultiplyExpr procedure, next lexeme isn't "*", "/", or "%"} {
-    testexprparser {+2? 1 : 0} -1
-} {- {} 0 subexpr {+2? 1 : 0} 9 operator ? 0 subexpr +2 3 operator + 0 subexpr 2 1 text 2 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-11.4 {ParseMultiplyExpr procedure, next lexeme is "*", "/", or "%"} {
-    testexprparser {-123 * 3} -1
-} {- {} 0 subexpr {-123 * 3} 7 operator * 0 subexpr -123 3 operator - 0 subexpr 123 1 text 123 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-11.5 {ParseMultiplyExpr procedure, next lexeme is "*", "/", or "%"} {
-    testexprparser {+-456 / 3} -1
-} {- {} 0 subexpr {+-456 / 3} 9 operator / 0 subexpr +-456 5 operator + 0 subexpr -456 3 operator - 0 subexpr 456 1 text 456 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-11.6 {ParseMultiplyExpr procedure, next lexeme is "*", "/", or "%"} {
-    testexprparser {+-456 % 3} -1
-} {- {} 0 subexpr {+-456 % 3} 9 operator % 0 subexpr +-456 5 operator + 0 subexpr -456 3 operator - 0 subexpr 456 1 text 456 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-11.7 {ParseMultiplyExpr procedure, bad lexeme after "*", "/", or "%"} {nonPortable} {
-    list [catch {testexprparser {--++5 / 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-11.8 {ParseMultiplyExpr procedure, valid RHS subexpression} {
-    testexprparser {-2 / 3 % 4} -1
-} {- {} 0 subexpr {-2 / 3 % 4} 11 operator % 0 subexpr {-2 / 3} 7 operator / 0 subexpr -2 3 operator - 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-11.9 {ParseMultiplyExpr procedure, error in RHS subexpression} {
-    list [catch {testexprparser {++2 / 3 * martha} -1} msg] $msg
-} {1 {syntax error in expression "++2 / 3 * martha"}}
-
-test parseExpr-12.1 {ParseUnaryExpr procedure, first token is unary operator} {
-    testexprparser {+2} -1
-} {- {} 0 subexpr +2 3 operator + 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-12.2 {ParseUnaryExpr procedure, first token is unary operator} {
-    testexprparser {-2} -1
-} {- {} 0 subexpr -2 3 operator - 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-12.3 {ParseUnaryExpr procedure, first token is unary operator} {
-    testexprparser {~2} -1
-} {- {} 0 subexpr ~2 3 operator ~ 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-12.4 {ParseUnaryExpr procedure, first token is unary operator} {
-    testexprparser {!2} -1
-} {- {} 0 subexpr !2 3 operator ! 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-12.5 {ParseUnaryExpr procedure, error in lexeme after unary op} {nonPortable} {
-    list [catch {testexprparser {-12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-12.6 {ParseUnaryExpr procedure, simple unary expr after unary op} {
-    testexprparser {+"1234"} -1
-} {- {} 0 subexpr +\"1234\" 3 operator + 0 subexpr {"1234"} 1 text 1234 0 {}}
-test parseExpr-12.7 {ParseUnaryExpr procedure, another unary expr after unary op} {
-    testexprparser {~!{fred}} -1
-} {- {} 0 subexpr ~!{fred} 5 operator ~ 0 subexpr !{fred} 3 operator ! 0 subexpr {{fred}} 1 text fred 0 {}}
-test parseExpr-12.8 {ParseUnaryExpr procedure, error in unary expr after unary op} {
-    list [catch {testexprparser {+-||27} -1} msg] $msg
-} {1 {syntax error in expression "+-||27"}}
-test parseExpr-12.9 {ParseUnaryExpr procedure, error in unary expr after unary op} {
-    list [catch {testexprparser {+-||27} -1} msg] $msg
-} {1 {syntax error in expression "+-||27"}}
-test parseExpr-12.10 {ParseUnaryExpr procedure, first token is not unary op} {
-    testexprparser {123} -1
-} {- {} 0 subexpr 123 1 text 123 0 {}}
-test parseExpr-12.11 {ParseUnaryExpr procedure, not unary expr, complex primary expr} {
-    testexprparser {(1+2)} -1
-} {- {} 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-12.12 {ParseUnaryExpr procedure, not unary expr, error in primary expr} {nonPortable} {
-    list [catch {testexprparser {(12345678901234567890)} -1} msg] $msg
-} {1 {integer value too large to represent}}
-
-test parseExpr-13.1 {ParsePrimaryExpr procedure, just parenthesized subexpr} {
-    testexprparser {({abc}/{def})} -1
-} {- {} 0 subexpr {{abc}/{def}} 5 operator / 0 subexpr {{abc}} 1 text abc 0 subexpr {{def}} 1 text def 0 {}}
-test parseExpr-13.2 {ParsePrimaryExpr procedure, bad lexeme after "("} {nonPortable} {
-    list [catch {testexprparser {(12345678901234567890)} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-13.3 {ParsePrimaryExpr procedure, valid parenthesized subexpr} {
-    testexprparser {({abc}? 2*4 : -6)} -1
-} {- {} 0 subexpr {{abc}? 2*4 : -6} 13 operator ? 0 subexpr {{abc}} 1 text abc 0 subexpr 2*4 5 operator * 0 subexpr 2 1 text 2 0 subexpr 4 1 text 4 0 subexpr -6 3 operator - 0 subexpr 6 1 text 6 0 {}}
-test parseExpr-13.4 {ParsePrimaryExpr procedure, error in parenthesized subexpr} {
-    list [catch {testexprparser {(? 123 : 456)} -1} msg] $msg
-} {1 {syntax error in expression "(? 123 : 456)"}}
-test parseExpr-13.5 {ParsePrimaryExpr procedure, missing ")" after in parenthesized subexpr} {
-    list [catch {testexprparser {({abc}/{def}} -1} msg] $msg
-} {1 {syntax error in expression "({abc}/{def}"}}
-test parseExpr-13.6 {ParsePrimaryExpr procedure, primary is literal} {
-    testexprparser {12345} -1
-} {- {} 0 subexpr 12345 1 text 12345 0 {}}
-test parseExpr-13.7 {ParsePrimaryExpr procedure, primary is literal} {
-    testexprparser {12345.6789} -1
-} {- {} 0 subexpr 12345.6789 1 text 12345.6789 0 {}}
-test parseExpr-13.8 {ParsePrimaryExpr procedure, primary is var reference} {
-    testexprparser {$a} -1
-} {- {} 0 subexpr {$a} 2 variable {$a} 1 text a 0 {}}
-test parseExpr-13.9 {ParsePrimaryExpr procedure, primary is var reference} {
-    testexprparser {$a(hello$there)} -1
-} {- {} 0 subexpr {$a(hello$there)} 5 variable {$a(hello$there)} 4 text a 0 text hello 0 variable {$there} 1 text there 0 {}}
-test parseExpr-13.10 {ParsePrimaryExpr procedure, primary is var reference} {
-    testexprparser {$a()} -1
-} {- {} 0 subexpr {$a()} 3 variable {$a()} 2 text a 0 text {} 0 {}}
-test parseExpr-13.11 {ParsePrimaryExpr procedure, error in var reference} {
-    list [catch {testexprparser {$a(} -1} msg] $msg
-} {1 {missing )}}
-test parseExpr-13.12 {ParsePrimaryExpr procedure, primary is quoted string} {
-    testexprparser {"abc $xyz def"} -1
-} {- {} 0 subexpr {"abc $xyz def"} 5 word {"abc $xyz def"} 4 text {abc } 0 variable {$xyz} 1 text xyz 0 text { def} 0 {}}
-test parseExpr-13.13 {ParsePrimaryExpr procedure, error in quoted string} {
-    list [catch {testexprparser {"$a(12"} -1} msg] $msg
-} {1 {missing )}}
-test parseExpr-13.14 {ParsePrimaryExpr procedure, quoted string has multiple tokens} {
-    testexprparser {"abc [xyz] $def"} -1
-} {- {} 0 subexpr {"abc [xyz] $def"} 6 word {"abc [xyz] $def"} 5 text {abc } 0 command {[xyz]} 0 text { } 0 variable {$def} 1 text def 0 {}}
-test parseExpr-13.15 {ParsePrimaryExpr procedure, primary is command} {
-    testexprparser {[def]} -1
-} {- {} 0 subexpr {[def]} 1 command {[def]} 0 {}}
-test parseExpr-13.16 {ParsePrimaryExpr procedure, primary is multiple commands} {
-    testexprparser {[one; two; three; four;]} -1
-} {- {} 0 subexpr {[one; two; three; four;]} 1 command {[one; two; three; four;]} 0 {}}
-test parseExpr-13.17 {ParsePrimaryExpr procedure, primary is multiple commands} {
-    testexprparser {[one; two; three; four;]} -1
-} {- {} 0 subexpr {[one; two; three; four;]} 1 command {[one; two; three; four;]} 0 {}}
-test parseExpr-13.18 {ParsePrimaryExpr procedure, missing close bracket} {
-    list [catch {testexprparser {[one} -1} msg] $msg
-} {1 {missing close-bracket}}
-test parseExpr-13.19 {ParsePrimaryExpr procedure, primary is braced string} {
-    testexprparser {{hello world}} -1
-} {- {} 0 subexpr {{hello world}} 1 text {hello world} 0 {}}
-test parseExpr-13.20 {ParsePrimaryExpr procedure, error in primary, which is braced string} {
-    list [catch {testexprparser "\{abc\\\n" -1} msg] $msg
-} {1 {missing close-brace}}
-test parseExpr-13.21 {ParsePrimaryExpr procedure, primary is braced string with multiple tokens} {
-    testexprparser "\{  \\
- +123 \}" -1
-} {- {} 0 subexpr \{\ \ \\\n\ +123\ \} 4 word \{\ \ \\\n\ +123\ \} 3 text {  } 0 backslash \\\n\  0 text {+123 } 0 {}}
-test parseExpr-13.22 {ParsePrimaryExpr procedure, primary is function call} {
-    testexprparser {foo(123)} -1
-} {- {} 0 subexpr foo(123) 3 operator foo 0 subexpr 123 1 text 123 0 {}}
-test parseExpr-13.23 {ParsePrimaryExpr procedure, bad lexeme after function name} {nonPortable} {
-    list [catch {testexprparser {foo 12345678901234567890 123)} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-13.24 {ParsePrimaryExpr procedure, lexeme after function name isn't "("} {
-    list [catch {testexprparser {foo 27.4 123)} -1} msg] $msg
-} {1 {syntax error in expression "foo 27.4 123)"}}
-test parseExpr-13.25 {ParsePrimaryExpr procedure, bad lexeme after "("} {nonPortable} {
-    list [catch {testexprparser {foo(12345678901234567890)} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-13.26 {ParsePrimaryExpr procedure, function call, one arg} {
-    testexprparser {foo(27*4)} -1
-} {- {} 0 subexpr foo(27*4) 7 operator foo 0 subexpr 27*4 5 operator * 0 subexpr 27 1 text 27 0 subexpr 4 1 text 4 0 {}}
-test parseExpr-13.27 {ParsePrimaryExpr procedure, error in function arg} {
-    list [catch {testexprparser {foo(*1-2)} -1} msg] $msg
-} {1 {syntax error in expression "foo(*1-2)"}}
-test parseExpr-13.28 {ParsePrimaryExpr procedure, error in function arg} {
-    list [catch {testexprparser {foo(*1-2)} -1} msg] $msg
-} {1 {syntax error in expression "foo(*1-2)"}}
-test parseExpr-13.29 {ParsePrimaryExpr procedure, function call, comma after arg} {
-    testexprparser {foo(27-2, (-2*[foo]))} -1
-} {- {} 0 subexpr {foo(27-2, (-2*[foo]))} 15 operator foo 0 subexpr 27-2 5 operator - 0 subexpr 27 1 text 27 0 subexpr 2 1 text 2 0 subexpr {-2*[foo]} 7 operator * 0 subexpr -2 3 operator - 0 subexpr 2 1 text 2 0 subexpr {[foo]} 1 command {[foo]} 0 {}}
-test parseExpr-13.30 {ParsePrimaryExpr procedure, bad lexeme after comma} {nonPortable} {
-    list [catch {testexprparser {foo(123, 12345678901234567890)} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-13.31 {ParsePrimaryExpr procedure, lexeme not "," or ")" after arg} {
-    list [catch {testexprparser {foo(123 [foo])} -1} msg] $msg
-} {1 {syntax error in expression "foo(123 [foo])"}}
-test parseExpr-13.32 {ParsePrimaryExpr procedure, bad lexeme after primary} {nonPortable} {
-    list [catch {testexprparser {123 12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-
-test parseExpr-14.1 {GetLexeme procedure, whitespace before lexeme} {
-    testexprparser {   123} -1
-} {- {} 0 subexpr 123 1 text 123 0 {}}
-test parseExpr-14.2 {GetLexeme procedure, whitespace before lexeme} {
-    testexprparser {  \
-456} -1
-} {- {} 0 subexpr 456 1 text 456 0 {}}
-test parseExpr-14.3 {GetLexeme procedure, no lexeme after whitespace} {
-    testexprparser { 123 \
-   } -1
-} {- {} 0 subexpr 123 1 text 123 0 {}}
-test parseExpr-14.4 {GetLexeme procedure, integer lexeme} {
-    testexprparser {000} -1
-} {- {} 0 subexpr 000 1 text 000 0 {}}
-test parseExpr-14.5 {GetLexeme procedure, integer lexeme too big} {nonPortable} {
-    list [catch {testexprparser {12345678901234567890} -1} msg] $msg
-} {1 {integer value too large to represent}}
-test parseExpr-14.6 {GetLexeme procedure, bad integer lexeme} {
-    list [catch {testexprparser {0999} -1} msg] $msg
-} {1 {syntax error in expression "0999"}}
-test parseExpr-14.7 {GetLexeme procedure, double lexeme} {
-    testexprparser {0.999} -1
-} {- {} 0 subexpr 0.999 1 text 0.999 0 {}}
-test parseExpr-14.8 {GetLexeme procedure, double lexeme} {
-    testexprparser {.123} -1
-} {- {} 0 subexpr .123 1 text .123 0 {}}
-test parseExpr-14.9 {GetLexeme procedure, double lexeme} {nonPortable unixOnly} {
-    testexprparser {nan} -1
-} {- {} 0 subexpr nan 1 text nan 0 {}}
-test parseExpr-14.10 {GetLexeme procedure, double lexeme} {nonPortable unixOnly} {
-    testexprparser {NaN} -1
-} {- {} 0 subexpr NaN 1 text NaN 0 {}}
-test parseExpr-14.11 {GetLexeme procedure, bad double lexeme too big} {
-    list [catch {testexprparser {123.e+99999999999999} -1} msg] $msg
-} {1 {floating-point value too large to represent}}
-test parseExpr-14.12 {GetLexeme procedure, bad double lexeme} {
-    list [catch {testexprparser {123.4x56} -1} msg] $msg
-} {1 {syntax error in expression "123.4x56"}}
-test parseExpr-14.13 {GetLexeme procedure, lexeme is "["} {
-    testexprparser {[foo]} -1
-} {- {} 0 subexpr {[foo]} 1 command {[foo]} 0 {}}
-test parseExpr-14.14 {GetLexeme procedure, lexeme is open brace} {
-    testexprparser {{bar}} -1
-} {- {} 0 subexpr {{bar}} 1 text bar 0 {}}
-test parseExpr-14.15 {GetLexeme procedure, lexeme is "("} {
-    testexprparser {(123)} -1
-} {- {} 0 subexpr 123 1 text 123 0 {}}
-test parseExpr-14.16 {GetLexeme procedure, lexeme is ")"} {
-    testexprparser {(2*3)} -1
-} {- {} 0 subexpr 2*3 5 operator * 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.17 {GetLexeme procedure, lexeme is "$"} {
-    testexprparser {$wombat} -1
-} {- {} 0 subexpr {$wombat} 2 variable {$wombat} 1 text wombat 0 {}}
-test parseExpr-14.18 {GetLexeme procedure, lexeme is '"'} {
-    testexprparser {"fred"} -1
-} {- {} 0 subexpr {"fred"} 1 text fred 0 {}}
-test parseExpr-14.19 {GetLexeme procedure, lexeme is ","} {
-    testexprparser {foo(1,2)} -1
-} {- {} 0 subexpr foo(1,2) 5 operator foo 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.20 {GetLexeme procedure, lexeme is "*"} {
-    testexprparser {$a*$b} -1
-} {- {} 0 subexpr {$a*$b} 7 operator * 0 subexpr {$a} 2 variable {$a} 1 text a 0 subexpr {$b} 2 variable {$b} 1 text b 0 {}}
-test parseExpr-14.21 {GetLexeme procedure, lexeme is "/"} {
-    testexprparser {5/6} -1
-} {- {} 0 subexpr 5/6 5 operator / 0 subexpr 5 1 text 5 0 subexpr 6 1 text 6 0 {}}
-test parseExpr-14.22 {GetLexeme procedure, lexeme is "%"} {
-    testexprparser {5%[xxx]} -1
-} {- {} 0 subexpr {5%[xxx]} 5 operator % 0 subexpr 5 1 text 5 0 subexpr {[xxx]} 1 command {[xxx]} 0 {}}
-test parseExpr-14.23 {GetLexeme procedure, lexeme is "+"} {
-    testexprparser {1+2} -1
-} {- {} 0 subexpr 1+2 5 operator + 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.24 {GetLexeme procedure, lexeme is "-"} {
-    testexprparser {.12-0e27} -1
-} {- {} 0 subexpr .12-0e27 5 operator - 0 subexpr .12 1 text .12 0 subexpr 0e27 1 text 0e27 0 {}}
-test parseExpr-14.25 {GetLexeme procedure, lexeme is "?" or ":"} {
-    testexprparser {$b? 1 : 0} -1
-} {- {} 0 subexpr {$b? 1 : 0} 8 operator ? 0 subexpr {$b} 2 variable {$b} 1 text b 0 subexpr 1 1 text 1 0 subexpr 0 1 text 0 0 {}}
-test parseExpr-14.26 {GetLexeme procedure, lexeme is "<"} {
-    testexprparser {2<3} -1
-} {- {} 0 subexpr 2<3 5 operator < 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.27 {GetLexeme procedure, lexeme is "<<"} {
-    testexprparser {2<<3} -1
-} {- {} 0 subexpr 2<<3 5 operator << 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.28 {GetLexeme procedure, lexeme is "<="} {
-    testexprparser {2<=3} -1
-} {- {} 0 subexpr 2<=3 5 operator <= 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.29 {GetLexeme procedure, lexeme is ">"} {
-    testexprparser {2>3} -1
-} {- {} 0 subexpr 2>3 5 operator > 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.30 {GetLexeme procedure, lexeme is ">>"} {
-    testexprparser {2>>3} -1
-} {- {} 0 subexpr 2>>3 5 operator >> 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.31 {GetLexeme procedure, lexeme is ">="} {
-    testexprparser {2>=3} -1
-} {- {} 0 subexpr 2>=3 5 operator >= 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.32 {GetLexeme procedure, lexeme is "=="} {
-    testexprparser {2==3} -1
-} {- {} 0 subexpr 2==3 5 operator == 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.33 {GetLexeme procedure, bad lexeme starting with "="} {
-    list [catch {testexprparser {2=+3} -1} msg] $msg
-} {1 {syntax error in expression "2=+3"}}
-test parseExpr-14.34 {GetLexeme procedure, lexeme is "!="} {
-    testexprparser {2!=3} -1
-} {- {} 0 subexpr 2!=3 5 operator != 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.35 {GetLexeme procedure, lexeme is "!"} {
-    testexprparser {!2} -1
-} {- {} 0 subexpr !2 3 operator ! 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.36 {GetLexeme procedure, lexeme is "&&"} {
-    testexprparser {2&&3} -1
-} {- {} 0 subexpr 2&&3 5 operator && 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.37 {GetLexeme procedure, lexeme is "&"} {
-    testexprparser {1&2} -1
-} {- {} 0 subexpr 1&2 5 operator & 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.38 {GetLexeme procedure, lexeme is "^"} {
-    testexprparser {1^2} -1
-} {- {} 0 subexpr 1^2 5 operator ^ 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.39 {GetLexeme procedure, lexeme is "||"} {
-    testexprparser {2||3} -1
-} {- {} 0 subexpr 2||3 5 operator || 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.40 {GetLexeme procedure, lexeme is "|"} {
-    testexprparser {1|2} -1
-} {- {} 0 subexpr 1|2 5 operator | 0 subexpr 1 1 text 1 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.41 {GetLexeme procedure, lexeme is "~"} {
-    testexprparser {~2} -1
-} {- {} 0 subexpr ~2 3 operator ~ 0 subexpr 2 1 text 2 0 {}}
-test parseExpr-14.42 {GetLexeme procedure, lexeme is func name} {
-    testexprparser {george()} -1
-} {- {} 0 subexpr george() 1 operator george 0 {}}
-test parseExpr-14.43 {GetLexeme procedure, lexeme is func name} {
-    testexprparser {harmonic_ratio(2,3)} -1
-} {- {} 0 subexpr harmonic_ratio(2,3) 5 operator harmonic_ratio 0 subexpr 2 1 text 2 0 subexpr 3 1 text 3 0 {}}
-test parseExpr-14.44 {GetLexeme procedure, unknown lexeme} {
-    list [catch {testexprparser {@27} -1} msg] $msg
-} {1 {syntax error in expression "@27"}}
-
-test parseExpr-15.1 {PrependSubExprTokens procedure, expand token array} {
-    testexprparser {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]} -1
-} {- {} 0 subexpr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]} 13 operator && 0 subexpr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]} 9 operator && 0 subexpr {[string compare [format %c $i] [string index $a $i]]&&[string compare [format %c $i] [string index $a $i]]} 5 operator && 0 subexpr {[string compare [format %c $i] [string index $a $i]]} 1 command {[string compare [format %c $i] [string index $a $i]]} 0 subexpr {[string compare [format %c $i] [string index $a $i]]} 1 command {[string compare [format %c $i] [string index $a $i]]} 0 subexpr {[string compare [format %c $i] [string index $a $i]]} 1 command {[string compare [format %c $i] [string index $a $i]]} 0 subexpr {[string compare [format %c $i] [string index $a $i]]} 1 command {[string compare [format %c $i] [string index $a $i]]} 0 {}}
-
-test parse-16.1 {LogSyntaxError procedure, error in expr longer than 60 chars} {
-    list [catch {testexprparser {(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)/} -1} msg] $msg
-} {1 {syntax error in expression "(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+0123456)*(+012"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/parseOld.test b/tests/parseOld.test
deleted file mode 100644
index 3f799d6..0000000
--- a/tests/parseOld.test
+++ /dev/null
@@ -1,546 +0,0 @@
-# Commands covered:  set (plus basic command syntax).  Also tests the
-# procedures in the file tclOldParse.c.  This set of tests is an old
-# one that predates the new parser in Tcl 8.1.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: parseOld.test,v 1.2 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc fourArgs {a b c d} {
-    global arg1 arg2 arg3 arg4
-    set arg1 $a
-    set arg2 $b
-    set arg3 $c
-    set arg4 $d
-}
-
-proc getArgs args {
-    global argv
-    set argv $args
-}
-
-# Basic argument parsing.
-
-test parseOld-1.1 {basic argument parsing} {
-    set arg1 {}
-    fourArgs a b	c 		 d
-    list $arg1 $arg2 $arg3 $arg4
-} {a b c d}
-test parseOld-1.2 {basic argument parsing} {
-    set arg1 {}
-    eval "fourArgs 123\v4\f56\r7890"
-    list $arg1 $arg2 $arg3 $arg4
-} {123 4 56 7890}
-
-# Quotes.
-
-test parseOld-2.1 {quotes and variable-substitution} {
-    getArgs "a b c" d
-    set argv
-} {{a b c} d}
-test parseOld-2.2 {quotes and variable-substitution} {
-    set a 101
-    getArgs "a$a b c"
-    set argv
-} {{a101 b c}}
-test parseOld-2.3 {quotes and variable-substitution} {
-    set argv "xy[format xabc]"
-    set argv
-} {xyxabc}
-test parseOld-2.4 {quotes and variable-substitution} {
-    set argv "xy\t"
-    set argv
-} xy\t
-test parseOld-2.5 {quotes and variable-substitution} {
-    set argv "a b	c
-d e f"
-    set argv
-} a\ b\tc\nd\ e\ f
-test parseOld-2.6 {quotes and variable-substitution} {
-    set argv a"bcd"e
-    set argv
-} {a"bcd"e}
-
-# Braces.
-
-test parseOld-3.1 {braces} {
-    getArgs {a b c} d
-    set argv
-} "{a b c} d"
-test parseOld-3.2 {braces} {
-    set a 101
-    set argv {a$a b c}
-    set b [string index $argv 1]
-    set b
-} {$}
-test parseOld-3.3 {braces} {
-    set argv {a[format xyz] b}
-    string length $argv
-} 15
-test parseOld-3.4 {braces} {
-    set argv {a\nb\}}
-    string length $argv
-} 6
-test parseOld-3.5 {braces} {
-    set argv {{{{}}}}
-    set argv
-} "{{{}}}"
-test parseOld-3.6 {braces} {
-    set argv a{{}}b
-    set argv
-} "a{{}}b"
-test parseOld-3.7 {braces} {
-    set a [format "last]"]
-    set a
-} {last]}
-
-# Command substitution.
-
-test parseOld-4.1 {command substitution} {
-    set a [format xyz]
-    set a
-} xyz
-test parseOld-4.2 {command substitution} {
-    set a a[format xyz]b[format q]
-    set a
-} axyzbq
-test parseOld-4.3 {command substitution} {
-    set a a[
-set b 22;
-format %s $b
-
-]b
-    set a
-} a22b
-test parseOld-4.4 {command substitution} {
-    set a 7.7
-    if [catch {expr int($a)}] {set a foo}
-    set a
-} 7.7
-
-# Variable substitution.
-
-test parseOld-5.1 {variable substitution} {
-    set a 123
-    set b $a
-    set b
-} 123
-test parseOld-5.2 {variable substitution} {
-    set a 345
-    set b x$a.b
-    set b
-} x345.b
-test parseOld-5.3 {variable substitution} {
-    set _123z xx
-    set b $_123z^
-    set b
-} xx^
-test parseOld-5.4 {variable substitution} {
-    set a 78
-    set b a${a}b
-    set b
-} a78b
-test parseOld-5.5 {variable substitution} {catch {$_non_existent_} msg} 1
-test parseOld-5.6 {variable substitution} {
-    catch {$_non_existent_} msg
-    set msg
-} {can't read "_non_existent_": no such variable}
-test parseOld-5.7 {array variable substitution} {
-    catch {unset a}
-    set a(xyz) 123
-    set b $a(xyz)foo
-    set b
-} 123foo
-test parseOld-5.8 {array variable substitution} {
-    catch {unset a}
-    set "a(x y z)" 123
-    set b $a(x y z)foo
-    set b
-} 123foo
-test parseOld-5.9 {array variable substitution} {
-    catch {unset a}; catch {unset qqq}
-    set "a(x y z)" qqq
-    set $a([format x]\ y [format z]) foo
-    set qqq
-} foo
-test parseOld-5.10 {array variable substitution} {
-    catch {unset a}
-    list [catch {set b $a(22)} msg] $msg
-} {1 {can't read "a(22)": no such variable}}
-test parseOld-5.11 {array variable substitution} {
-    set b a$!
-    set b
-} {a$!}
-test parseOld-5.12 {array variable substitution} {
-    set b a$()
-    set b
-} {a$()}
-catch {unset a}
-test parseOld-5.13 {array variable substitution} {
-    catch {unset a}
-    set long {This is a very long variable, long enough to cause storage \
-	allocation to occur in Tcl_ParseVar.  If that storage isn't getting \
-	freed up correctly, then a core leak will occur when this test is \
-	run.  This text is probably beginning to sound like drivel, but I've \
-	run out of things to say and I need more characters still.}
-    set a($long) 777
-    set b $a($long)
-    list $b [array names a]
-} {777 {{This is a very long variable, long enough to cause storage \
-	allocation to occur in Tcl_ParseVar.  If that storage isn't getting \
-	freed up correctly, then a core leak will occur when this test is \
-	run.  This text is probably beginning to sound like drivel, but I've \
-	run out of things to say and I need more characters still.}}}
-test parseOld-5.14 {array variable substitution} {
-    catch {unset a}; catch {unset b}; catch {unset a1}
-    set a1(22) foo
-    set a(foo) bar
-    set b $a($a1(22))
-    set b
-} bar
-catch {unset a}; catch {unset a1}
-
-test parseOld-7.1 {backslash substitution} {
-    set a "\a\c\n\]\}"
-    string length $a
-} 5
-test parseOld-7.2 {backslash substitution} {
-    set a {\a\c\n\]\}}
-    string length $a
-} 10
-test parseOld-7.3 {backslash substitution} {
-    set a "abc\
-def"
-    set a
-} {abc def}
-test parseOld-7.4 {backslash substitution} {
-    set a {abc\
-def}
-    set a
-} {abc def}
-test parseOld-7.5 {backslash substitution} {
-    set msg {}
-    set a xxx
-    set error [catch {if {24 < \
-	35} {set a 22} {set \
-	    a 33}} msg]
-    list $error $msg $a
-} {0 22 22}
-test parseOld-7.6 {backslash substitution} {
-    eval "concat abc\\"
-} "abc\\"
-test parseOld-7.7 {backslash substitution} {
-    eval "concat \\\na"
-} "a"
-test parseOld-7.8 {backslash substitution} {
-    eval "concat x\\\n   	a"
-} "x a"
-test parseOld-7.9 {backslash substitution} {
-    eval "concat \\x"
-} "x"
-test parseOld-7.10 {backslash substitution} {
-    eval "list a b\\\nc d"
-} {a b c d}
-test parseOld-7.11 {backslash substitution} {
-    eval "list a \"b c\"\\\nd e"
-} {a {b c} d e}
-test parseOld-7.12 {backslash substitution} {
-    list \ua2
-} [bytestring "\xc2\xa2"]
-test parseOld-7.13 {backslash substitution} {
-    list \u4e21
-} [bytestring "\xe4\xb8\xa1"]
-test parseOld-7.14 {backslash substitution} {
-    list \u4e2k
-} [bytestring "\xd3\xa2k"]
-
-# Semi-colon.
-
-test parseOld-8.1 {semi-colons} {
-    set b 0
-    getArgs a;set b 2
-    set argv
-} a
-test parseOld-8.2 {semi-colons} {
-    set b 0
-    getArgs a;set b 2
-    set b
-} 2
-test parseOld-8.3 {semi-colons} {
-    getArgs a b ; set b 1
-    set argv
-} {a b}
-test parseOld-8.4 {semi-colons} {
-    getArgs a b ; set b 1
-    set b
-} 1
-
-# The following checks are to ensure that the interpreter's result
-# gets re-initialized by Tcl_Eval in all the right places.
-
-test parseOld-9.1 {result initialization} {concat abc} abc
-test parseOld-9.2 {result initialization} {concat abc; proc foo {} {}} {}
-test parseOld-9.3 {result initialization} {concat abc; proc foo {} $a} {}
-test parseOld-9.4 {result initialization} {proc foo {} [concat abc]} {}
-test parseOld-9.5 {result initialization} {concat abc; } abc
-test parseOld-9.6 {result initialization} {
-    eval {
-    concat abc
-}} abc
-test parseOld-9.7 {result initialization} {} {}
-test parseOld-9.8 {result initialization} {concat abc; ; ;} abc
-
-# Syntax errors.
-
-test parseOld-10.1 {syntax errors} {catch "set a \{bcd" msg} 1
-test parseOld-10.2 {syntax errors} {
-	catch "set a \{bcd" msg
-	set msg
-} {missing close-brace}
-test parseOld-10.3 {syntax errors} {catch {set a "bcd} msg} 1
-test parseOld-10.4 {syntax errors} {
-	catch {set a "bcd} msg
-	set msg
-} {missing "}
-test parseOld-10.5 {syntax errors} {catch {set a "bcd"xy} msg} 1
-test parseOld-10.6 {syntax errors} {
-	catch {set a "bcd"xy} msg
-	set msg
-} {extra characters after close-quote}
-test parseOld-10.7 {syntax errors} {catch "set a {bcd}xy" msg} 1
-test parseOld-10.8 {syntax errors} {
-	catch "set a {bcd}xy" msg
-	set msg
-} {extra characters after close-brace}
-test parseOld-10.9 {syntax errors} {catch {set a [format abc} msg} 1
-test parseOld-10.10 {syntax errors} {
-	catch {set a [format abc} msg
-	set msg
-} {missing close-bracket}
-test parseOld-10.11 {syntax errors} {catch gorp-a-lot msg} 1
-test parseOld-10.12 {syntax errors} {
-	catch gorp-a-lot msg
-	set msg
-} {invalid command name "gorp-a-lot"}
-test parseOld-10.13 {syntax errors} {
-    set a [concat {a}\
- {b}]
-    set a
-} {a b}
-test parseOld-10.14 {syntax errors} {
-    list [catch {eval \$x[format "%01000d" 0](} msg] $msg $errorInfo
-} {1 {missing )} {missing )
-    while compiling
-"$x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000..."
-    ("eval" body line 1)
-    invoked from within
-"eval \$x[format "%01000d" 0]("}}
-test parseOld-10.15 {syntax errors, missplaced braces} {
-    catch {
-        proc misplaced_end_brace {} {
-            set what foo
-            set when [expr ${what}size - [set off$what]}]
-    } msg
-    set msg
-} {extra characters after close-brace}
-test parseOld-10.16 {syntax errors, missplaced braces} {
-    catch {
-        set a {
-            set what foo
-            set when [expr ${what}size - [set off$what]}]
-    } msg
-    set msg
-} {extra characters after close-brace}
-test parseOld-10.17 {syntax errors, unusual spacing} {
-    list [catch {return [ [1]]} msg] $msg
-} {1 {invalid command name "1"}}
-# Long values (stressing storage management)
-
-set a {1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH}
-
-test parseOld-11.1 {long values} {
-    string length $a
-} 214
-test parseOld-11.2 {long values} {
-    llength $a
-} 43
-test parseOld-11.3 {long values} {
-    set b "1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH"
-    set b
-} $a
-test parseOld-11.4 {long values} {
-    set b "$a"
-    set b
-} $a
-test parseOld-11.5 {long values} {
-    set b [set a]
-    set b
-} $a
-test parseOld-11.6 {long values} {
-    set b [concat 1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH]
-    string length $b
-} 214
-test parseOld-11.7 {long values} {
-    set b [concat 1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH]
-    llength $b
-} 43
-test parseOld-11.8 {long values} {
-    set b
-} $a
-test parseOld-11.9 {long values} {
-    set a [concat 0000 1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH IIII JJJJ KKKK LLLL MMMM NNNN OOOO PPPP QQQQ RRRR SSSS TTTT UUUU VVVV WWWW XXXX YYYY ZZZZ]
-    llength $a
-} 62
-set i 0
-foreach j [concat 0000 1111 2222 3333 4444 5555 6666 7777 8888 9999 aaaa bbbb cccc dddd eeee ffff gggg hhhh iiii jjjj kkkk llll mmmm nnnn oooo pppp qqqq rrrr ssss tttt uuuu vvvv wwww xxxx yyyy zzzz AAAA BBBB CCCC DDDD EEEE FFFF GGGG HHHH IIII JJJJ KKKK LLLL MMMM NNNN OOOO PPPP QQQQ RRRR SSSS TTTT UUUU VVVV WWWW XXXX YYYY ZZZZ] {
-    set test [string index 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ $i]
-    set test $test$test$test$test
-    set i [expr $i+1]
-    test parseOld-11.10 {long values} {
-	set j
-    } $test
-}
-test parseOld-11.11 {test buffer overflow in backslashes in braces} {
-    expr {"a" == {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101\101}}
-} 0
-
-test parseOld-12.1 {comments} {
-    set a old
-    eval {  # set a new}
-    set a
-} {old}
-test parseOld-12.2 {comments} {
-    set a old
-    eval "  # set a new\nset a new"
-    set a
-} {new}
-test parseOld-12.3 {comments} {
-    set a old
-    eval "  # set a new\\\nset a new"
-    set a
-} {old}
-test parseOld-12.4 {comments} {
-    set a old
-    eval "  # set a new\\\\\nset a new"
-    set a
-} {new}
-
-test parseOld-13.1 {comments at the end of a bracketed script} {
-    set x "[
-expr 1+1
-# skip this!
-]"
-} {2}
-
-if {[info command testwordend] == "testwordend"} {
-    test parseOld-14.1 {TclWordEnd procedure} {
-	testwordend " 	\n abc"
-    } {c}
-    test parseOld-14.2 {TclWordEnd procedure} {
-	testwordend "   \\\n"
-    } {}
-    test parseOld-14.3 {TclWordEnd procedure} {
-	testwordend "   \\\n "
-    } { }
-    test parseOld-14.4 {TclWordEnd procedure} {
-	testwordend {"abc"}
-    } {"}
-    test parseOld-14.5 {TclWordEnd procedure} {
-	testwordend {{xyz}}
-    } \}
-    test parseOld-14.6 {TclWordEnd procedure} {
-	testwordend {{a{}b{}\}} xyz}
-    } "\} xyz"
-    test parseOld-14.7 {TclWordEnd procedure} {
-	testwordend {abc[this is a]def ghi}
-    } {f ghi}
-    test parseOld-14.8 {TclWordEnd procedure} {
-	testwordend "puts\\\n\n  "
-    } "s\\\n\n  "
-    test parseOld-14.9 {TclWordEnd procedure} {
-	testwordend "puts\\\n   	"
-    } "s\\\n   	"
-    test parseOld-14.10 {TclWordEnd procedure} {
-	testwordend "puts\\\n   	xyz"
-    } "s\\\n   	xyz"
-    test parseOld-14.11 {TclWordEnd procedure} {
-	testwordend {a$x.$y(a long index) foo}
-    } ") foo"
-    test parseOld-14.12 {TclWordEnd procedure} {
-	testwordend {abc; def}
-    } {; def}
-    test parseOld-14.13 {TclWordEnd procedure} {
-	testwordend {abc def}
-    } {c def}
-    test parseOld-14.14 {TclWordEnd procedure} {
-	testwordend {abc	def}
-    } {c	def}
-    test parseOld-14.15 {TclWordEnd procedure} {
-	testwordend "abc\ndef"
-    } "c\ndef"
-    test parseOld-14.16 {TclWordEnd procedure} {
-	testwordend "abc"
-    } {c}
-    test parseOld-14.17 {TclWordEnd procedure} {
-	testwordend "a\000bc"
-    } {c}
-    test parseOld-14.18 {TclWordEnd procedure} {
-	testwordend \[a\000\]
-    } {]}
-    test parseOld-14.19 {TclWordEnd procedure} {
-	testwordend \"a\000\"
-    } {"}
-    test parseOld-14.20 {TclWordEnd procedure} {
-	testwordend a{\000}b
-    } {b}
-    test parseOld-14.21 {TclWordEnd procedure} {
-	testwordend "   \000b"
-    } {b}
-}
-
-test parseOld-15.1 {TclScriptEnd procedure} {
-    info complete {puts [
-	expr 1+1
-	#this is a comment ]}
-} {0}
-test parseOld-15.2 {TclScriptEnd procedure} {
-    info complete "abc\\\n"
-} {0}
-test parseOld-15.3 {TclScriptEnd procedure} {
-    info complete "abc\\\\\n"
-} {1}
-test parseOld-15.4 {TclScriptEnd procedure} {
-    info complete "xyz \[abc \{abc\]"
-} {0}
-test parseOld-15.5 {TclScriptEnd procedure} {
-    info complete "xyz \[abc"
-} {0}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/pid.test b/tests/pid.test
deleted file mode 100644
index 3f8275b..0000000
--- a/tests/pid.test
+++ /dev/null
@@ -1,70 +0,0 @@
-# Commands covered:  pid
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1995 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: pid.test,v 1.3 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# If pid is not defined just return with no error
-# Some platforms may not have the pid command implemented
-if {[info commands pid] == ""} {
-    puts "pid is not implemented for this machine"
-    ::tcltest::cleanupTests
-    return
-}
-
-catch {removeFile test1}
-
-test pid-1.1 {pid command} {
-    regexp {(^[0-9]+$)|(^0x[0-9a-fA-F]+$)} [pid]
-} 1
-test pid-1.2 {pid command} {unixOrPc unixExecs} {
-    set f [open {| echo foo | cat >test1} w]
-    set pids [pid $f]
-    close $f
-    catch {removeFile test1}
-    list [llength $pids] [regexp {^[0-9]+$} [lindex $pids 0]] \
-       [regexp {^[0-9]+$} [lindex $pids 1]] \
-       [expr {[lindex $pids 0] == [lindex $pids 1]}]
-} {2 1 1 0}
-test pid-1.3 {pid command} {
-    set f [open test1 w]
-    set pids [pid $f]
-    close $f
-    set pids
-} {}
-test pid-1.4 {pid command} {
-    list [catch {pid a b} msg] $msg
-} {1 {wrong # args: should be "pid ?channelId?"}}
-test pid-1.5 {pid command} {
-    list [catch {pid gorp} msg] $msg
-} {1 {can not find channel named "gorp"}}
-
-# cleanup
-catch {::tcltest::removeFile test1}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/pkg.test b/tests/pkg.test
deleted file mode 100644
index 02ffc14..0000000
--- a/tests/pkg.test
+++ /dev/null
@@ -1,652 +0,0 @@
-# Commands covered:  pkg
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: pkg.test,v 1.4 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Do all this in a slave interp to avoid garbaging the
-# package list
-set i [interp create]
-interp eval $i [list set argv $argv]
-interp eval $i [list source [file join $::tcltest::testsDir defs.tcl]]
-interp eval $i {
-
-eval package forget [package names]
-set oldPkgUnknown [package unknown]
-package unknown {}
-set oldPath $auto_path
-set auto_path ""
-
-test pkg-1.1 {Tcl_PkgProvide procedure} {
-    package forget t
-    package provide t 2.3
-} {}
-test pkg-1.2 {Tcl_PkgProvide procedure} {
-    package forget t
-    package provide t 2.3
-    list [catch {package provide t 2.2} msg] $msg
-} {1 {conflicting versions provided for package "t": 2.3, then 2.2}}
-test pkg-1.3 {Tcl_PkgProvide procedure} {
-    package forget t
-    package provide t 2.3
-    list [catch {package provide t 2.4} msg] $msg
-} {1 {conflicting versions provided for package "t": 2.3, then 2.4}}
-test pkg-1.4 {Tcl_PkgProvide procedure} {
-    package forget t
-    package provide t 2.3
-    list [catch {package provide t 3.3} msg] $msg
-} {1 {conflicting versions provided for package "t": 2.3, then 3.3}}
-test pkg-1.5 {Tcl_PkgProvide procedure} {
-    package forget t
-    package provide t 2.3
-    package provide t 2.3
-} {}
-
-test pkg-2.1 {Tcl_PkgRequire procedure, picking best version} {
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i; package provide t $i"
-    }
-    set x xxx
-    package require t
-    set x
-} {3.4}
-test pkg-2.2 {Tcl_PkgRequire procedure, picking best version} {
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2 3.5 3.2} {
-	package ifneeded t $i "set x $i; package provide t $i"
-    }
-    set x xxx
-    package require t
-    set x
-} {3.5}
-test pkg-2.3 {Tcl_PkgRequire procedure, picking best version} {
-    package forget t
-    foreach i {3.5 2.1 2.3} {
-	package ifneeded t $i "set x $i; package provide t $i"
-    }
-    set x xxx
-    package require t 2.2
-    set x
-} {2.3}
-test pkg-2.4 {Tcl_PkgRequire procedure, picking best version} {
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i; package provide t $i"
-    }
-    set x xxx
-    package require -exact t 2.3
-    set x
-} {2.3}
-test pkg-2.5 {Tcl_PkgRequire procedure, picking best version} {
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i; package provide t $i"
-    }
-    set x xxx
-    package require t 2.1
-    set x
-} {2.4}
-test pkg-2.6 {Tcl_PkgRequire procedure, can't find suitable version} {
-    package forget t
-    package unknown {}
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i"
-    }
-    list [catch {package require t 2.5} msg] $msg
-} {1 {can't find package t 2.5}}
-test pkg-2.7 {Tcl_PkgRequire procedure, can't find suitable version} {
-    package forget t
-    package unknown {}
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i"
-    }
-    list [catch {package require t 4.1} msg] $msg
-} {1 {can't find package t 4.1}}
-test pkg-2.8 {Tcl_PkgRequire procedure, can't find suitable version} {
-    package forget t
-    package unknown {}
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i"
-    }
-    list [catch {package require -exact t 1.3} msg] $msg
-} {1 {can't find package t 1.3}}
-test pkg-2.9 {Tcl_PkgRequire procedure, can't find suitable version} {
-    package forget t
-    package unknown {}
-    list [catch {package require t} msg] $msg
-} {1 {can't find package t}}
-test pkg-2.10 {Tcl_PkgRequire procedure, error in ifneeded script} {
-    package forget t
-    package ifneeded t 2.1 {package provide t 2.1; error "ifneeded test"}
-    list [catch {package require t 2.1} msg] $msg $errorInfo
-} {1 {ifneeded test} {ifneeded test
-    while executing
-"error "ifneeded test""
-    ("package ifneeded" script)
-    invoked from within
-"package require t 2.1"}}
-test pkg-2.11 {Tcl_PkgRequire procedure, ifneeded script doesn't provide package} {
-    package forget t
-    package ifneeded t 2.1 "set x invoked"
-    set x xxx
-    list [catch {package require t 2.1} msg] $msg $x
-} {1 {can't find package t 2.1} invoked}
-test pkg-2.12 {Tcl_PkgRequire procedure, self-deleting script} {
-    package forget t
-    package ifneeded t 1.2 "package forget t; set x 1.2; package provide t 1.2"
-    set x xxx
-    package require t 1.2
-    set x
-} {1.2}
-test pkg-2.13 {Tcl_PkgRequire procedure, "package unknown" support} {
-    proc pkgUnknown args {
-	global x
-	set x $args
-	package provide [lindex $args 0] [lindex $args 1]
-    }
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i"
-    }
-    package unknown pkgUnknown
-    set x xxx
-    package require -exact t 1.5
-    package unknown {}
-    set x
-} {t 1.5 -exact}
-test pkg-2.14 {Tcl_PkgRequire procedure, "package unknown" support} {
-    proc pkgUnknown args {
-	package ifneeded t 1.2 "set x loaded; package provide t 1.2"
-    }
-    package forget t
-    package unknown pkgUnknown
-    set x xxx
-    set result [list [package require t] $x]
-    package unknown {}
-    set result
-} {1.2 loaded}
-test pkg-2.15 {Tcl_PkgRequire procedure, "package unknown" support} {
-    proc pkgUnknown args {
-	global x
-	set x $args
-	package provide [lindex $args 0] 2.0
-    }
-    package forget {a b}
-    package unknown pkgUnknown
-    set x xxx
-    package require {a b}
-    package unknown {}
-    set x
-} {{a b} {}}
-test pkg-2.16 {Tcl_PkgRequire procedure, "package unknown" error} {
-    proc pkgUnknown args {
-	error "testing package unknown"
-    }
-    package forget t 
-    package unknown pkgUnknown
-    set result [list [catch {package require t} msg] $msg $errorInfo]
-    package unknown {}
-    set result
-} {1 {testing package unknown} {testing package unknown
-    while executing
-"error "testing package unknown""
-    (procedure "pkgUnknown" line 2)
-    invoked from within
-"pkgUnknown t {}"
-    ("package unknown" script)
-    invoked from within
-"package require t"}}
-test pkg-2.17 {Tcl_PkgRequire procedure, "package unknown" doesn't load package} {
-    proc pkgUnknown args {
-	global x
-	set x $args
-    }
-    package forget t
-    foreach i {1.4 3.4 2.3 2.4 2.2} {
-	package ifneeded t $i "set x $i"
-    }
-    package unknown pkgUnknown
-    set x xxx
-    set result [list [catch {package require -exact t 1.5} msg] $msg $x]
-    package unknown {}
-    set result
-} {1 {can't find package t 1.5} {t 1.5 -exact}}
-test pkg-2.18 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    package require t
-} {2.3}
-test pkg-2.19 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    package require t 2.1
-} {2.3}
-test pkg-2.20 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    package require t 2.3
-} {2.3}
-test pkg-2.21 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    list [catch {package require t 2.4} msg] $msg
-} {1 {version conflict for package "t": have 2.3, need 2.4}}
-test pkg-2.22 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    list [catch {package require t 1.2} msg] $msg
-} {1 {version conflict for package "t": have 2.3, need 1.2}}
-test pkg-2.23 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    package require -exact t 2.3
-} {2.3}
-test pkg-2.24 {Tcl_PkgRequire procedure, version checks} {
-    package forget t
-    package provide t 2.3
-    list [catch {package require -exact t 2.2} msg] $msg
-} {1 {version conflict for package "t": have 2.3, need 2.2}}
-
-test pkg-3.1 {Tcl_PackageCmd procedure} {
-    list [catch {package} msg] $msg
-} {1 {wrong # args: should be "package option ?arg arg ...?"}}
-test pkg-3.2 {Tcl_PackageCmd procedure, "forget" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package names
-} {}
-test pkg-3.3 {Tcl_PackageCmd procedure, "forget" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package forget foo
-} {}
-test pkg-3.4 {Tcl_PackageCmd procedure, "forget" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package ifneeded t 1.1 {first script}
-    package ifneeded t 2.3 {second script}
-    package ifneeded x 1.4 {x's script}
-    set result {}
-    lappend result [lsort [package names]] [package versions t]
-    package forget t
-    lappend result [lsort [package names]] [package versions t]
-} {{t x} {1.1 2.3} x {}}
-test pkg-3.5 {Tcl_PackageCmd procedure, "forget" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package ifneeded a 1.1 {first script}
-    package ifneeded b 2.3 {second script}
-    package ifneeded c 1.4 {third script}
-    package forget
-    set result [list [lsort [package names]]]
-    package forget a c
-    lappend result [lsort [package names]]
-} {{a b c} b}
-test pkg-3.6 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    list [catch {package ifneeded a} msg] $msg
-} {1 {wrong # args: should be "package ifneeded package version ?script?"}}
-test pkg-3.7 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    list [catch {package ifneeded a b c d} msg] $msg
-} {1 {wrong # args: should be "package ifneeded package version ?script?"}}
-test pkg-3.8 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    list [catch {package ifneeded t xyz} msg] $msg
-} {1 {expected version number but got "xyz"}}
-test pkg-3.9 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    list [package ifneeded foo 1.1] [package names]
-} {{} {}}
-test pkg-3.10 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    package forget t
-    package ifneeded t 1.4 "script for t 1.4"
-    list [package names] [package ifneeded t 1.4] [package versions t]
-} {t {script for t 1.4} 1.4}
-test pkg-3.11 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    package forget t
-    package ifneeded t 1.4 "script for t 1.4"
-    list [package ifneeded t 1.5] [package names] [package versions t]
-} {{} t 1.4}
-test pkg-3.12 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    package forget t
-    package ifneeded t 1.4 "script for t 1.4"
-    package ifneeded t 1.4 "second script for t 1.4"
-    list [package ifneeded t 1.4] [package names] [package versions t]
-} {{second script for t 1.4} t 1.4}
-test pkg-3.13 {Tcl_PackageCmd procedure, "ifneeded" option} {
-    package forget t
-    package ifneeded t 1.4 "script for t 1.4"
-    package ifneeded t 1.2 "second script"
-    package ifneeded t 3.1 "last script"
-    list [package ifneeded t 1.2] [package versions t]
-} {{second script} {1.4 1.2 3.1}}
-test pkg-3.14 {Tcl_PackageCmd procedure, "names" option} {
-    list [catch {package names a} msg] $msg
-} {1 {wrong # args: should be "package names"}}
-test pkg-3.15 {Tcl_PackageCmd procedure, "names" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package names
-} {}
-test pkg-3.16 {Tcl_PackageCmd procedure, "names" option} {
-    foreach i [package names] {
-	package forget $i
-    }
-    package ifneeded x 1.2 {dummy}
-    package provide x 1.3
-    package provide y 2.4
-    catch {package require z 47.16}
-    lsort [package names]
-} {x y}
-test pkg-3.17 {Tcl_PackageCmd procedure, "provide" option} {
-    list [catch {package provide} msg] $msg
-} {1 {wrong # args: should be "package provide package ?version?"}}
-test pkg-3.18 {Tcl_PackageCmd procedure, "provide" option} {
-    list [catch {package provide a b c} msg] $msg
-} {1 {wrong # args: should be "package provide package ?version?"}}
-test pkg-3.19 {Tcl_PackageCmd procedure, "provide" option} {
-    package forget t
-    package provide t
-} {}
-test pkg-3.20 {Tcl_PackageCmd procedure, "provide" option} {
-    package forget t
-    package provide t 2.3
-    package provide t
-} {2.3}
-test pkg-3.21 {Tcl_PackageCmd procedure, "provide" option} {
-    package forget t
-    list [catch {package provide t a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-3.22 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.23 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require a b c} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.24 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require -exact a b c} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.25 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require -bs a b} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.26 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require x a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-3.27 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require -exact x a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-3.28 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require -exact x} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.29 {Tcl_PackageCmd procedure, "require" option} {
-    list [catch {package require -exact} msg] $msg
-} {1 {wrong # args: should be "package require ?-exact? package ?version?"}}
-test pkg-3.30 {Tcl_PackageCmd procedure, "require" option} {
-    package forget t
-    package provide t 2.3
-    package require t 2.1
-} {2.3}
-test pkg-3.31 {Tcl_PackageCmd procedure, "require" option} {
-    package forget t
-    list [catch {package require t} msg] $msg
-} {1 {can't find package t}}
-test pkg-3.32 {Tcl_PackageCmd procedure, "require" option} {
-    package forget t
-    package ifneeded t 2.3 "error {synthetic error}"
-    list [catch {package require t 2.3} msg] $msg
-} {1 {synthetic error}}
-test pkg-3.33 {Tcl_PackageCmd procedure, "unknown" option} {
-    list [catch {package unknown a b} msg] $msg
-} {1 {wrong # args: should be "package unknown ?command?"}}
-test pkg-3.34 {Tcl_PackageCmd procedure, "unknown" option} {
-    package unknown "test script"
-    package unknown
-} {test script}
-test pkg-3.35 {Tcl_PackageCmd procedure, "unknown" option} {
-    package unknown "test script"
-    package unknown {}
-    package unknown
-} {}
-test pkg-3.36 {Tcl_PackageCmd procedure, "vcompare" option} {
-    list [catch {package vcompare a} msg] $msg
-} {1 {wrong # args: should be "package vcompare version1 version2"}}
-test pkg-3.37 {Tcl_PackageCmd procedure, "vcompare" option} {
-    list [catch {package vcompare a b c} msg] $msg
-} {1 {wrong # args: should be "package vcompare version1 version2"}}
-test pkg-3.38 {Tcl_PackageCmd procedure, "vcompare" option} {
-    list [catch {package vcompare x.y 3.4} msg] $msg
-} {1 {expected version number but got "x.y"}}
-test pkg-3.39 {Tcl_PackageCmd procedure, "vcompare" option} {
-    list [catch {package vcompare 2.1 a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-3.40 {Tcl_PackageCmd procedure, "vcompare" option} {
-    package vc 2.1 2.3
-} {-1}
-test pkg-3.41 {Tcl_PackageCmd procedure, "vcompare" option} {
-    package vc 2.2.4 2.2.4
-} {0}
-test pkg-3.42 {Tcl_PackageCmd procedure, "versions" option} {
-    list [catch {package versions} msg] $msg
-} {1 {wrong # args: should be "package versions package"}}
-test pkg-3.43 {Tcl_PackageCmd procedure, "versions" option} {
-    list [catch {package versions a b} msg] $msg
-} {1 {wrong # args: should be "package versions package"}}
-test pkg-3.44 {Tcl_PackageCmd procedure, "versions" option} {
-    package forget t
-    package versions t
-} {}
-test pkg-3.45 {Tcl_PackageCmd procedure, "versions" option} {
-    package forget t
-    package provide t 2.3
-    package versions t
-} {}
-test pkg-3.46 {Tcl_PackageCmd procedure, "versions" option} {
-    package forget t
-    package ifneeded t 2.3 x
-    package ifneeded t 2.4 y
-    package versions t
-} {2.3 2.4}
-test pkg-3.47 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    list [catch {package vsatisfies a} msg] $msg
-} {1 {wrong # args: should be "package vsatisfies version1 version2"}}
-test pkg-3.48 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    list [catch {package vsatisfies a b c} msg] $msg
-} {1 {wrong # args: should be "package vsatisfies version1 version2"}}
-test pkg-3.49 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    list [catch {package vsatisfies x.y 3.4} msg] $msg
-} {1 {expected version number but got "x.y"}}
-test pkg-3.50 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    list [catch {package vcompare 2.1 a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-3.51 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    package vs 2.3 2.1
-} {1}
-test pkg-3.52 {Tcl_PackageCmd procedure, "vsatisfies" option} {
-    package vs 2.3 1.2
-} {0}
-test pkg-3.53 {Tcl_PackageCmd procedure, "versions" option} {
-    list [catch {package foo} msg] $msg
-} {1 {bad option "foo": must be forget, ifneeded, names, present, provide, require, unknown, vcompare, versions, or vsatisfies}}
-
-# No tests for FindPackage;  can't think up anything detectable
-# errors.
-
-test pkg-4.1 {TclFreePackageInfo procedure} {
-    interp create foo
-    foo eval {
-	package ifneeded t 2.3 x
-	package ifneeded t 2.4 y
-	package ifneeded x 3.1 z
-	package provide q 4.3
-	package unknown "will this get freed?"
-    }
-    interp delete foo
-} {}
-test pkg-4.2 {TclFreePackageInfo procedure} {
-    interp create foo
-    foo eval {
-	package ifneeded t 2.3 x
-	package ifneeded t 2.4 y
-	package ifneeded x 3.1 z
-	package provide q 4.3
-    }
-    foo alias z kill
-    proc kill {} {
-	interp delete foo
-    }
-    list [catch {foo eval package require x 3.1} msg] $msg
-} {1 {can't find package x 3.1}}
-
-test pkg-5.1 {CheckVersion procedure} {
-    list [catch {package vcompare 1 2.1} msg] $msg
-} {0 -1}
-test pkg-5.2 {CheckVersion procedure} {
-    list [catch {package vcompare .1 2.1} msg] $msg
-} {1 {expected version number but got ".1"}}
-test pkg-5.3 {CheckVersion procedure} {
-    list [catch {package vcompare 111.2a.3 2.1} msg] $msg
-} {1 {expected version number but got "111.2a.3"}}
-test pkg-5.4 {CheckVersion procedure} {
-    list [catch {package vcompare 1.2.3. 2.1} msg] $msg
-} {1 {expected version number but got "1.2.3."}}
-
-test pkg-6.1 {ComparePkgVersions procedure} {
-    package vcompare 1.23 1.22
-} {1}
-test pkg-6.2 {ComparePkgVersions procedure} {
-    package vcompare 1.22.1.2.3 1.22.1.2.3
-} {0}
-test pkg-6.3 {ComparePkgVersions procedure} {
-    package vcompare 1.21 1.22
-} {-1}
-test pkg-6.4 {ComparePkgVersions procedure} {
-    package vcompare 1.21 1.21.2
-} {-1}
-test pkg-6.5 {ComparePkgVersions procedure} {
-    package vcompare 1.21.1 1.21
-} {1}
-test pkg-6.6 {ComparePkgVersions procedure} {
-    package vsatisfies 1.21.1 1.21
-} {1}
-test pkg-6.7 {ComparePkgVersions procedure} {
-    package vsatisfies 2.22.3 1.21
-} {0}
-test pkg-6.8 {ComparePkgVersions procedure} {
-    package vsatisfies 1 1
-} {1}
-test pkg-6.9 {ComparePkgVersions procedure} {
-    package vsatisfies 2 1
-} {0}
-
-test pkg-7.1 {Tcl_PkgPresent procedure, any version} {
-    package forget t
-    package provide t 2.4
-    package present t
-} {2.4}
-test pkg-7.2 {Tcl_PkgPresent procedure, correct version} {
-    package forget t
-    package provide t 2.4
-    package present t 2.4
-} {2.4}
-test pkg-7.3 {Tcl_PkgPresent procedure, satisfying version} {
-    package forget t
-    package provide t 2.4
-    package present t 2.0
-} {2.4}
-test pkg-7.4 {Tcl_PkgPresent procedure, not satisfying version} {
-    package forget t
-    package provide t 2.4
-    list [catch {package present t 2.6} msg] $msg
-} {1 {version conflict for package "t": have 2.4, need 2.6}}
-test pkg-7.5 {Tcl_PkgPresent procedure, not satisfying version} {
-    package forget t
-    package provide t 2.4
-    list [catch {package present t 1.0} msg] $msg
-} {1 {version conflict for package "t": have 2.4, need 1.0}}
-test pkg-7.6 {Tcl_PkgPresent procedure, exact version} {
-    package forget t
-    package provide t 2.4
-    package present -exact t 2.4
-} {2.4}
-test pkg-7.7 {Tcl_PkgPresent procedure, not exact version} {
-    package forget t
-    package provide t 2.4
-    list [catch {package present -exact t 2.3} msg] $msg
-} {1 {version conflict for package "t": have 2.4, need 2.3}}
-test pkg-7.8 {Tcl_PkgPresent procedure, unknown package} {
-    package forget t
-    list [catch {package present t} msg] $msg
-} {1 {package t is not present}}
-test pkg-7.9 {Tcl_PkgPresent procedure, unknown package} {
-    package forget t
-    list [catch {package present t 2.4} msg] $msg
-} {1 {package t 2.4 is not present}}
-test pkg-7.10 {Tcl_PkgPresent procedure, unknown package} {
-    package forget t
-    list [catch {package present -exact t 2.4} msg] $msg
-} {1 {package t 2.4 is not present}}
-test pkg-7.11 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.12 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present a b c} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.13 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present -exact a b c} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.14 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present -bs a b} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.15 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present x a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-7.16 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present -exact x a.b} msg] $msg
-} {1 {expected version number but got "a.b"}}
-test pkg-7.17 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present -exact x} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-test pkg-7.18 {Tcl_PackageCmd procedure, "present" option} {
-    list [catch {package present -exact} msg] $msg
-} {1 {wrong # args: should be "package present ?-exact? package ?version?"}}
-
-set auto_path $oldPath
-package unknown $oldPkgUnknown
-concat
-
-}
-
-# cleanup
-interp delete $i
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/pkg/circ1.tcl b/tests/pkg/circ1.tcl
deleted file mode 100644
index 3616621..0000000
--- a/tests/pkg/circ1.tcl
+++ /dev/null
@@ -1,34 +0,0 @@
-# circ1.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires circ2, and circ2
-#  requires circ3, which in turn requires circ1.
-#  In case of cirularities, pkg_mkIndex should give up when it gets stuck.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: circ1.tcl,v 1.1 1998/10/17 00:21:39 escoffon Exp $
-
-package require circ2 1.0
-
-package provide circ1 1.0
-
-namespace eval circ1 {
-    namespace export c1-1 c1-2 c1-3 c1-4
-}
-
-proc circ1::c1-1 { num } {
-    return [circ2::c2-1 $num]
-}
-
-proc circ1::c1-2 { num } {
-    return [circ2::c2-2 $num]
-}
-
-proc circ1::c1-3 {} {
-    return 10
-}
-
-proc circ1::c1-4 {} {
-    return 20
-}
diff --git a/tests/pkg/circ2.tcl b/tests/pkg/circ2.tcl
deleted file mode 100644
index 66a20a3..0000000
--- a/tests/pkg/circ2.tcl
+++ /dev/null
@@ -1,25 +0,0 @@
-# circ2.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by circ1, and
-#  requires circ3. Circ3, in turn, requires circ1 to give us a circularity.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: circ2.tcl,v 1.1 1998/10/17 00:21:39 escoffon Exp $
-
-package require circ3 1.0
-
-package provide circ2 1.0
-
-namespace eval circ2 {
-    namespace export c2-1 c2-2
-}
-
-proc circ2::c2-1 { num } {
-    return [expr $num * [circ3::c3-1]]
-}
-
-proc circ2::c2-2 { num } {
-    return [expr $num * [circ3::c3-2]]
-}
diff --git a/tests/pkg/circ3.tcl b/tests/pkg/circ3.tcl
deleted file mode 100644
index ddcb691..0000000
--- a/tests/pkg/circ3.tcl
+++ /dev/null
@@ -1,25 +0,0 @@
-# circ3.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by circ2, and in
-#  turn requires circ1. This closes the circularity.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: circ3.tcl,v 1.1 1998/10/17 00:21:40 escoffon Exp $
-
-package require circ1 1.0
-
-package provide circ3 1.0
-
-namespace eval circ3 {
-    namespace export c3-1 c3-4
-}
-
-proc circ3::c3-1 {} {
-    return [circ1::c1-3]
-}
-
-proc circ3::c3-2 {} {
-    return [circ1::c1-4]
-}
diff --git a/tests/pkg/global.tcl b/tests/pkg/global.tcl
deleted file mode 100644
index 38925c5..0000000
--- a/tests/pkg/global.tcl
+++ /dev/null
@@ -1,19 +0,0 @@
-# global.tcl --
-#
-#  Test package for pkg_mkIndex.
-#  Contains global symbols, used to check that they don't have a leading ::
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: global.tcl,v 1.1 1998/10/17 00:21:40 escoffon Exp $
-
-package provide global 1.0
-
-proc global_lower { stg } {
-    return [string tolower $stg]
-}
-
-proc global_upper { stg } {
-    return [string toupper $stg]
-}
diff --git a/tests/pkg/import.tcl b/tests/pkg/import.tcl
deleted file mode 100644
index e7196f5..0000000
--- a/tests/pkg/import.tcl
+++ /dev/null
@@ -1,16 +0,0 @@
-package provide fubar 1.0
-    
-namespace eval ::fubar:: {
-    #
-    # export only public functions.
-    #
-    namespace export {[a-z]*}
-}
-
-proc ::fubar::foo {bar} {
-    puts "$bar"
-    return true
-}
-
-namespace import ::fubar::foo
-
diff --git a/tests/pkg/pkg1.tcl b/tests/pkg/pkg1.tcl
deleted file mode 100644
index e2cf960..0000000
--- a/tests/pkg/pkg1.tcl
+++ /dev/null
@@ -1,26 +0,0 @@
-# pkg1.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg3, but it does
-#  not use any of pkg3's procs in the code that is executed by the file
-#  (i.e. references to pkg3's procs are in the proc bodies only).
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkg1.tcl,v 1.1 1998/10/17 00:21:40 escoffon Exp $
-
-package require pkg3 1.0
-
-package provide pkg1 1.0
-
-namespace eval pkg1 {
-    namespace export p1-1 p1-2
-}
-
-proc pkg1::p1-1 { num } {
-    return [pkg3::p3-1 $num]
-}
-
-proc pkg1::p1-2 { num } {
-    return [pkg3::p3-2 $num]
-}
diff --git a/tests/pkg/pkg2_a.tcl b/tests/pkg/pkg2_a.tcl
deleted file mode 100644
index 85e16c4..0000000
--- a/tests/pkg/pkg2_a.tcl
+++ /dev/null
@@ -1,22 +0,0 @@
-# pkg2_a.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by pkg1.
-#  This package is split into two files, to test packages that are split
-#  over multiple files.
-#
-# Copyright (c) 2998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# SCCS: %Z% %M% %I% %E% %U%
-
-package provide pkg2 1.0
-
-namespace eval pkg2 {
-    namespace export p2-1
-}
-
-proc pkg2::p2-1 { num } {
-    return [expr $num * 2]
-}
diff --git a/tests/pkg/pkg2_b.tcl b/tests/pkg/pkg2_b.tcl
deleted file mode 100644
index 15fb1a8..0000000
--- a/tests/pkg/pkg2_b.tcl
+++ /dev/null
@@ -1,22 +0,0 @@
-# pkg2_b.tcl --
-#
-#  Test package for pkg_mkIndex. This package is required by pkg1.
-#  This package is split into two files, to test packages that are split
-#  over multiple files.
-#
-# Copyright (c) 2998 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# SCCS: %Z% %M% %I% %E% %U%
-
-package provide pkg2 1.0
-
-namespace eval pkg2 {
-    namespace export p2-2
-}
-
-proc pkg2::p2-2 { num } {
-    return [expr $num * 3]
-}
diff --git a/tests/pkg/pkg3.tcl b/tests/pkg/pkg3.tcl
deleted file mode 100644
index fd769c4..0000000
--- a/tests/pkg/pkg3.tcl
+++ /dev/null
@@ -1,22 +0,0 @@
-# pkg3.tcl --
-#
-#  Test package for pkg_mkIndex.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkg3.tcl,v 1.1 1998/10/17 00:21:42 escoffon Exp $
-
-package provide pkg3 1.0
-
-namespace eval pkg3 {
-    namespace export p3-1 p3-2
-}
-
-proc pkg3::p3-1 { num } {
-    return {[expr $num * 2]}
-}
-
-proc pkg3::p3-2 { num } {
-    return {[expr $num * 3]}
-}
diff --git a/tests/pkg/pkg4.tcl b/tests/pkg/pkg4.tcl
deleted file mode 100644
index ccb9291..0000000
--- a/tests/pkg/pkg4.tcl
+++ /dev/null
@@ -1,27 +0,0 @@
-# pkg4.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg3, and it calls
-#  a pkg3 proc in the code that is executed by the file
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkg4.tcl,v 1.1 1998/10/17 00:21:42 escoffon Exp $
-
-package require pkg3 1.0
-
-package provide pkg4 1.0
-
-namespace eval pkg4 {
-    namespace export p4-1 p4-2
-    variable m2 [pkg3::p3-1 10]
-}
-
-proc pkg4::p4-1 { num } {
-    variable m2
-    return [expr {$m2 * $num}]
-}
-
-proc pkg4::p4-2 { num } {
-    return [pkg3::p3-2 $num]
-}
diff --git a/tests/pkg/pkg5.tcl b/tests/pkg/pkg5.tcl
deleted file mode 100644
index 5e25e6d..0000000
--- a/tests/pkg/pkg5.tcl
+++ /dev/null
@@ -1,30 +0,0 @@
-# pkg5.tcl --
-#
-#  Test package for pkg_mkIndex. This package requires pkg2, and it calls
-#  a pkg2 proc in the code that is executed by the file.
-#  Pkg2 is a split package.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkg5.tcl,v 1.1 1998/10/17 00:21:42 escoffon Exp $
-
-package require pkg2 1.0
-
-package provide pkg5 1.0
-
-namespace eval pkg5 {
-    namespace export p5-1 p5-2
-    variable m2 [pkg2::p2-1 10]
-    variable m3 [pkg2::p2-2 10]
-}
-
-proc pkg5::p5-1 { num } {
-    variable m2
-    return [expr {$m2 * $num}]
-}
-
-proc pkg5::p5-2 { num } {
-    variable m2
-    return [expr {$m2 * $num}]
-}
diff --git a/tests/pkg/pkga.tcl b/tests/pkg/pkga.tcl
deleted file mode 100644
index e964f51..0000000
--- a/tests/pkg/pkga.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# pkga.tcl --
-#
-#  Test package for pkg_mkIndex. This package provides Pkga,
-#  which is also provided by a DLL.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: pkga.tcl,v 1.1 1998/12/04 06:28:11 welch Exp $
-
-package provide Pkga 1.0
-
-proc pkga_neq { x } {
-    return [expr {! [pkgq_eq $x]}]
-}
diff --git a/tests/pkg/simple.tcl b/tests/pkg/simple.tcl
deleted file mode 100644
index a2cf121..0000000
--- a/tests/pkg/simple.tcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# simple.tcl --
-#
-#  Test package for pkg_mkIndex. This is a simple package, just to check
-#  basic functionality.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: simple.tcl,v 1.1 1998/10/17 00:21:43 escoffon Exp $
-
-package provide simple 1.0
-
-namespace eval simple {
-    namespace export lower upper
-}
-
-proc simple::lower { stg } {
-    return [string tolower $stg]
-}
-
-proc simple::upper { stg } {
-    return [string toupper $stg]
-}
diff --git a/tests/pkg/std.tcl b/tests/pkg/std.tcl
deleted file mode 100644
index 48c4048..0000000
--- a/tests/pkg/std.tcl
+++ /dev/null
@@ -1,28 +0,0 @@
-# std.tcl --
-#
-#  Test package for pkg_mkIndex.
-#  Does a package require of direct1, whose pkgIndex.tcl entry (in pkg1)
-#  should be a -direct entry.
-#  This tests that pkg_mkIndex can handle code that is sourced in pkgIndex.tcl
-#  files.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: std.tcl,v 1.1 1998/10/17 00:21:43 escoffon Exp $
-
-package require direct1
-
-package provide std 1.0
-
-namespace eval std {
-    namespace export p1 p2
-}
-
-proc std::p1 { stg } {
-    return [string tolower $stg]
-}
-
-proc std::p2 { stg } {
-    return [string toupper $stg]
-}
diff --git a/tests/pkg1/direct1.tcl b/tests/pkg1/direct1.tcl
deleted file mode 100644
index cc10330..0000000
--- a/tests/pkg1/direct1.tcl
+++ /dev/null
@@ -1,23 +0,0 @@
-# std.tcl --
-#
-#  Test support package for pkg_mkIndex.
-#  This is referenced by pkgIndex.tcl as a -direct script.
-#
-# Copyright (c) 1998 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: direct1.tcl,v 1.1 1998/10/17 00:21:44 escoffon Exp $
-
-package provide direct1 1.0
-
-namespace eval direct1 {
-    namespace export pd1 pd2
-}
-
-proc direct1::pd1 { stg } {
-    return [string tolower $stg]
-}
-
-proc direct1::pd2 { stg } {
-    return [string toupper $stg]
-}
diff --git a/tests/pkg1/pkgIndex.tcl b/tests/pkg1/pkgIndex.tcl
deleted file mode 100644
index 5dc1d5e..0000000
--- a/tests/pkg1/pkgIndex.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
-# Tcl package index file, version 1.1
-# This file is generated by the "pkg_mkIndex -direct" command
-# and sourced either when an application starts up or
-# by a "package unknown" script.  It invokes the
-# "package ifneeded" command to set up package-related
-# information so that packages will be loaded automatically
-# in response to "package require" commands.  When this
-# script is sourced, the variable $dir must contain the
-# full path name of this file's directory.
-
-package ifneeded direct1 1.0 [list source [file join $dir direct1.tcl]]
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
deleted file mode 100644
index e49cf25..0000000
--- a/tests/pkgMkIndex.test
+++ /dev/null
@@ -1,375 +0,0 @@
-# This file contains tests for the pkg_mkIndex command.
-# Note that the tests are limited to Tcl scripts only, there are no shared
-# libraries against which to test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-#
-# RCS: @(#) $Id: pkgMkIndex.test,v 1.6 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# temporarily copy the pkg and pkg1 dirs from testsDir to tmpDir
-if {"$::tcltest::testsDir" != "$::tcltest::workingDir"} {
-    set origPkgDir [file join $::tcltest::testsDir pkg]
-    set newPkgDir [file join $::tcltest::workingDir pkg]
-    if {![catch {file copy $origPkgDir $newPkgDir}]} {
-	set removePkgDir 1
-    }
-    if {![catch {file copy "${origPkgDir}1" "${newPkgDir}1"}]} {
-	set removePkg1Dir 1
-    }
-}
-
-# Add the pkg1 directory to auto_path, so that its packages can be found.
-# packages in pkg1 are used to test indexing of packages in pkg.
-# Make sure that the path to pkg1 is absolute.
-
-set oldDir [pwd]
-lappend auto_path [file join $::tcltest::workingDir pkg1]
-
-namespace eval pkgtest {
-    # Namespace for procs we can discard
-}
-
-# pkgtest::parseArgs --
-#
-#  Parse an argument list.
-#
-# Arguments:
-#  <flags>	(optional) arguments starting with a dash are collected
-#		as options to pkg_mkIndex and passed to pkg_mkIndex.
-#  dirPath	the directory to index
-#  pattern0	pattern to index
-#  ...		pattern to index
-#  patternN	pattern to index
-#
-# Results:
-#  Returns a three element list:
-#    0: the options
-#    1: the directory to index
-#    2: the patterns list
-
-proc pkgtest::parseArgs { args } {
-    set options ""
-
-    set argc [llength $args]
-    for {set iarg 0} {$iarg < $argc} {incr iarg} {
-	set a [lindex $args $iarg]
-	if {[regexp {^-} $a]} {
-	    lappend options $a
-	    if {[string compare -load $a] == 0} {
-		incr iarg
-		lappend options [lindex $args $iarg]
-	    }
-	} else {
-	    break
-	}
-    }
-
-    set dirPath [lindex $args $iarg]
-    incr iarg
-    set patternList [lrange $args $iarg end]
-
-    return [list $options $dirPath $patternList]
-}
-
-# pkgtest::parseIndex --
-#
-#  Loads a pkgIndex.tcl file, records all the calls to "package ifneeded".
-#
-# Arguments:
-#  filePath	path to the pkgIndex.tcl file.
-#
-# Results:
-#  Returns a list, in "array set/get" format, where the keys are the package
-#  name and version (in the form "$name:$version"), and the values the rest
-#  of the command line.
-
-proc pkgtest::parseIndex { filePath } {
-    # create a slave interpreter, where we override "package ifneeded"
-
-    set slave [interp create]
-    if {[catch {
-	$slave eval {
-	    rename package package_original
-	    proc package { args } {
-		if {[string compare [lindex $args 0] ifneeded] == 0} {
-		    set pkg [lindex $args 1]
-		    set ver [lindex $args 2]
-		    set ::PKGS($pkg:$ver) [lindex $args 3]
-		} else {
-		    return [eval package_original $args]
-		}
-	    }
-	    array set ::PKGS {}
-	}
-
-	set dir [file dirname $filePath]
-	$slave eval {set curdir [pwd]}
-	$slave eval [list cd $dir]
-	$slave eval [list set dir $dir]
-	$slave eval [list source [file tail $filePath]]
-	$slave eval {cd $curdir}
-
-	# Create the list in sorted order, so that we don't get spurious
-	# errors because the order has changed.
-
-	array set P {}
-	foreach {k v} [$slave eval {array get ::PKGS}] {
-	    set P($k) $v
-	}
-
-	set PKGS ""
-	foreach k [lsort [array names P]] {
-	    lappend PKGS $k $P($k)
-	}
-    } err]} {
-	set ei $::errorInfo
-	set ec $::errorCode
-
-	catch {interp delete $slave}
-
-	error $ei $ec
-    }
-
-    interp delete $slave
-
-    return $PKGS
-}
-
-# pkgtest::createIndex --
-#
-#  Runs pkg_mkIndex for the given directory and set of patterns.
-#  This procedure deletes any pkgIndex.tcl file in the target directory,
-#  then runs pkg_mkIndex.
-#
-# Arguments:
-#  <flags>	(optional) arguments starting with a dash are collected
-#		as options to pkg_mkIndex and passed to pkg_mkIndex.
-#  dirPath	the directory to index
-#  pattern0	pattern to index
-#  ...		pattern to index
-#  patternN	pattern to index
-#
-# Results:
-#  Returns a two element list:
-#    0: 1 if the procedure encountered an error, 0 otherwise.
-#    1: the error result if element 0 was 1
-
-proc pkgtest::createIndex { args } {
-    set parsed [eval parseArgs $args]
-    set options [lindex $parsed 0]
-    set dirPath [lindex $parsed 1]
-    set patternList [lindex $parsed 2]
-
-    if {[catch {
-	file delete [file join $dirPath pkgIndex.tcl]
-	eval pkg_mkIndex $options $dirPath $patternList
-    } err]} {
-	return [list 1 $err]
-    }
-
-    return [list 0 {}]
-}
-
-# makePkgList --
-#
-#  Takes the output of a pkgtest::parseIndex call, filters it and returns a
-#  cleaned up list of packages and their actions.
-#
-# Arguments:
-#  inList	output from a pkgtest::parseIndex.
-#
-# Results:
-#  Returns a list of two element lists:
-#    0: the name:version
-#    1: a list describing the package.
-#	For tclPkgSetup packages it consists of:
-#	 0: the keyword tclPkgSetup
-#	 1: the first file to source, with its exported procedures
-#	 2: the second file ...
-#	 N: the N-1st file ...
-
-proc makePkgList { inList } {
-    set pkgList ""
-
-    foreach {k v} $inList {
-	switch [lindex $v 0] {
-	    tclPkgSetup {
-		set l tclPkgSetup
-		foreach s [lindex $v 4] {
-		    lappend l $s
-		}
-	    }
-
-	    source {
-		set l $v
-	    }
-
-	    default {
-		error "can't handle $k $v"
-	    }
-	}
-
-	lappend pkgList [list $k $l]
-    }
-
-    return $pkgList
-}
-
-# pkgtest::runIndex --
-#
-#  Runs pkg_mkIndex, parses the generated index file.
-#
-# Arguments:
-#  <flags>	(optional) arguments starting with a dash are collected
-#		as options to pkg_mkIndex and passed to pkg_mkIndex.
-#  dirPath	the directory to index
-#  pattern0	pattern to index
-#  ...		pattern to index
-#  patternN	pattern to index
-#
-# Results:
-#  Returns a two element list:
-#    0: 1 if the procedure encountered an error, 0 otherwise.
-#    1: if no error, this is the parsed generated index file, in the format
-#	returned by pkgtest::parseIndex.
-#	If error, this is the error result.
-
-proc pkgtest::runIndex { args } {
-    set rv [eval createIndex $args]
-    if {[lindex $rv 0] == 0} {
-	set parsed [eval parseArgs $args]
-	set dirPath [lindex $parsed 1]
-	set idxFile [file join $dirPath pkgIndex.tcl]
-
-	if {[catch {
-	    set result [list 0 [makePkgList [parseIndex $idxFile]]]
-	} err]} {
-	    set result [list 1 $err]
-	}
-	file delete $idxFile
-    } else {
-	set result $rv
-    }
-
-    return $result
-}
-
-# If there is no match to the patterns, make sure the directory hasn't
-# changed on us
-
-test pkgMkIndex-1.1 {nothing matches pattern - current dir is the same} {
-    list [pkgtest::runIndex pkg nomatch.tcl] [pwd]
-} [list {1 {no files matched glob pattern "nomatch.tcl"}} [pwd]]
-cd $oldDir	;# 'cause 8.0.3 is left in the wrong place
-test pkgMkIndex-2.1 {simple package} {
-    pkgtest::runIndex pkg simple.tcl
-} {0 {{simple:1.0 {tclPkgSetup {simple.tcl source {::simple::lower ::simple::upper}}}}}}
-
-test pkgMkIndex-2.2 {simple package - use -direct} {
-    pkgtest::runIndex -direct pkg simple.tcl
-} "0 {{simple:1.0 {source [file join pkg simple.tcl]}}}"
-
-test pkgMkIndex-3.1 {simple package with global symbols} {
-    pkgtest::runIndex pkg global.tcl
-} {0 {{global:1.0 {tclPkgSetup {global.tcl source {global_lower global_upper}}}}}}
-
-test pkgMkIndex-4.1 {split package} {
-    pkgtest::runIndex pkg pkg2_a.tcl pkg2_b.tcl
-} {0 {{pkg2:1.0 {tclPkgSetup {pkg2_a.tcl source ::pkg2::p2-1} {pkg2_b.tcl source ::pkg2::p2-2}}}}}
-
-test pkgMkIndex-4.2 {split package - direct loading} {
-    pkgtest::runIndex -direct pkg pkg2_a.tcl pkg2_b.tcl
-} "0 {{pkg2:1.0 {source [file join pkg pkg2_a.tcl]
-source [file join pkg pkg2_b.tcl]}}}"
-
-# This will fail, with "direct1" procedures in the list of procedures
-# provided by std.
-# It may also fail, if tclblend is in the auto_path, with an additional
-# command "loadJava" which comes from the tclblend pkgIndex.tcl file.
-# Both failures are caused by Tcl code executed in pkgIndex.tcl.
-
-test pkgMkIndex-5.1 {requires -direct package} {
-    pkgtest::runIndex pkg std.tcl
-} {0 {{std:1.0 {tclPkgSetup {std.tcl source {::std::p1 ::std::p2}}}}}}
-
-test pkgMkIndex-6.1 {pkg1 requires pkg3} {
-    pkgtest::runIndex pkg pkg1.tcl pkg3.tcl
-} {0 {{pkg1:1.0 {tclPkgSetup {pkg1.tcl source {::pkg1::p1-1 ::pkg1::p1-2}}}} {pkg3:1.0 {tclPkgSetup {pkg3.tcl source {::pkg3::p3-1 ::pkg3::p3-2}}}}}}
-
-test pkgMkIndex-6.2 {pkg1 requires pkg3 - use -direct} {
-    pkgtest::runIndex -direct pkg pkg1.tcl pkg3.tcl
-} "0 {{pkg1:1.0 {source [file join pkg pkg1.tcl]}} {pkg3:1.0 {source [file join pkg pkg3.tcl]}}}"
-
-test pkgMkIndex-7.1 {pkg4 uses pkg3} {
-    pkgtest::runIndex pkg pkg4.tcl pkg3.tcl
-} {0 {{pkg3:1.0 {tclPkgSetup {pkg3.tcl source {::pkg3::p3-1 ::pkg3::p3-2}}}} {pkg4:1.0 {tclPkgSetup {pkg4.tcl source {::pkg4::p4-1 ::pkg4::p4-2}}}}}}
-
-test pkgMkIndex-7.2 {pkg4 uses pkg3 - use -direct} {
-    pkgtest::runIndex -direct pkg pkg4.tcl pkg3.tcl
-} "0 {{pkg3:1.0 {source [file join pkg pkg3.tcl]}} {pkg4:1.0 {source [file join pkg pkg4.tcl]}}}"
-
-test pkgMkIndex-8.1 {pkg5 uses pkg2} {
-    pkgtest::runIndex pkg pkg5.tcl pkg2_a.tcl pkg2_b.tcl
-} {0 {{pkg2:1.0 {tclPkgSetup {pkg2_a.tcl source ::pkg2::p2-1} {pkg2_b.tcl source ::pkg2::p2-2}}} {pkg5:1.0 {tclPkgSetup {pkg5.tcl source {::pkg5::p5-1 ::pkg5::p5-2}}}}}}
-
-test pkgMkIndex-8.2 {pkg5 uses pkg2 - use -direct} {
-    pkgtest::runIndex -direct pkg pkg5.tcl pkg2_a.tcl pkg2_b.tcl
-} "0 {{pkg2:1.0 {source [file join pkg pkg2_a.tcl]
-source [file join pkg pkg2_b.tcl]}} {pkg5:1.0 {source [file join pkg pkg5.tcl]}}}"
-
-test pkgMkIndex-9.1 {circular packages} {
-    pkgtest::runIndex pkg circ1.tcl circ2.tcl circ3.tcl
-} {0 {{circ1:1.0 {tclPkgSetup {circ1.tcl source {::circ1::c1-1 ::circ1::c1-2 ::circ1::c1-3 ::circ1::c1-4}}}} {circ2:1.0 {tclPkgSetup {circ2.tcl source {::circ2::c2-1 ::circ2::c2-2}}}} {circ3:1.0 {tclPkgSetup {circ3.tcl source ::circ3::c3-1}}}}}
-
-# Some tests require the existence of one of the DLLs in the dltest directory
-set x [file join [file dirname [info nameofexecutable]] dltest \
-	pkga[info sharedlibextension]]
-set dll "[file tail $x]Required"
-set ::tcltest::testConfig($dll) [file exists $x]
-
-test pkgMkIndex-10.1 {package in DLL and script} $dll {
-    file copy -force $x pkg
-    pkgtest::runIndex pkg pkga[info sharedlibextension] pkga.tcl
-} "0 {{Pkga:1.0 {tclPkgSetup {pkga[info sharedlibextension] load {pkga_eq pkga_quote}} {pkga.tcl source pkga_neq}}}}"
-test pkgMkIndex-10.2 {package in DLL hidden by -load} $dll {
-    pkgtest::runIndex -load Pkg* -- pkg pkga[info sharedlibextension]
-} {0 {}}
-
-# Tolerate "namespace import" at the global scope
-
-test pkgMkIndex-11.1 {conflicting namespace imports} {
-    pkgtest::runIndex pkg import.tcl
-} {0 {{fubar:1.0 {tclPkgSetup {import.tcl source ::fubar::foo}}}}}
-
-# cleanup
-namespace delete pkgtest
-cd $::tcltest::workingDir
-if {[info exists removePkgDir]} {
-    # strange error deleting the pkg dir only once--needs be done twice!
-    catch {file delete -force $newPkgDir}
-    catch {file delete -force $newPkgDir}
-}
-if {[info exists removePkg1Dir]} {
-    catch {file delete -force "${newPkgDir}1"}
-}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/platform.test b/tests/platform.test
deleted file mode 100644
index b81103c..0000000
--- a/tests/platform.test
+++ /dev/null
@@ -1,39 +0,0 @@
-# The file tests the tcl_platform variable
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1999 by Scriptics Corporation
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) 
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test platform-1.1 {TclpSetVariables: tcl_platform} {
-    interp create i
-    i eval {catch {unset tcl_platform(debug)}}
-    set result [i eval {lsort [array names tcl_platform]}]
-    interp delete i
-    set result
-} {byteOrder machine os osVersion platform user}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/proc-old.test b/tests/proc-old.test
deleted file mode 100644
index a57e147..0000000
--- a/tests/proc-old.test
+++ /dev/null
@@ -1,523 +0,0 @@
-# Commands covered:  proc, return, global
-#
-# This file, proc-old.test, includes the original set of tests for Tcl's
-# proc, return, and global commands. There is now a new file proc.test
-# that contains tests for the tclProc.c source file.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: proc-old.test,v 1.3 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {rename t1 ""}
-catch {rename foo ""}
-
-proc tproc {} {return a; return b}
-test proc-old-1.1 {simple procedure call and return} {tproc} a
-proc tproc x {
-    set x [expr $x+1]
-    return $x
-}
-test proc-old-1.2 {simple procedure call and return} {tproc 2} 3
-test proc-old-1.3 {simple procedure call and return} {
-    proc tproc {} {return foo}
-} {}
-test proc-old-1.4 {simple procedure call and return} {
-    proc tproc {} {return}
-    tproc
-} {}
-proc tproc1 {a}   {incr a; return $a}
-proc tproc2 {a b} {incr a; return $a}
-test proc-old-1.5 {simple procedure call and return (2 procs with same body but different parameters)} {
-    list [tproc1 123] [tproc2 456 789]
-} {124 457}
-test proc-old-1.6 {simple procedure call and return (shared proc body string)} {
-    set x {}
-    proc tproc {} {}   ;# body is shared with x
-    list [tproc] [append x foo]
-} {{} foo}
-
-test proc-old-2.1 {local and global variables} {
-    proc tproc x {
-	set x [expr $x+1]
-	return $x
-    }
-    set x 42
-    list [tproc 6] $x
-} {7 42}
-test proc-old-2.2 {local and global variables} {
-    proc tproc x {
-	set y [expr $x+1]
-	return $y
-    }
-    set y 18
-    list [tproc 6] $y
-} {7 18}
-test proc-old-2.3 {local and global variables} {
-    proc tproc x {
-	global y
-	set y [expr $x+1]
-	return $y
-    }
-    set y 189
-    list [tproc 6] $y
-} {7 7}
-test proc-old-2.4 {local and global variables} {
-    proc tproc x {
-	global y
-	return [expr $x+$y]
-    }
-    set y 189
-    list [tproc 6] $y
-} {195 189}
-catch {unset _undefined_}
-test proc-old-2.5 {local and global variables} {
-    proc tproc x {
-	global _undefined_
-	return $_undefined_
-    }
-    list [catch {tproc xxx} msg] $msg
-} {1 {can't read "_undefined_": no such variable}}
-test proc-old-2.6 {local and global variables} {
-    set a 114
-    set b 115
-    global a b
-    list $a $b
-} {114 115}
-
-proc do {cmd} {eval $cmd}
-test proc-old-3.1 {local and global arrays} {
-    catch {unset a}
-    set a(0) 22
-    list [catch {do {global a; set a(0)}} msg] $msg
-} {0 22}
-test proc-old-3.2 {local and global arrays} {
-    catch {unset a}
-    set a(x) 22
-    list [catch {do {global a; set a(x) newValue}} msg] $msg $a(x)
-} {0 newValue newValue}
-test proc-old-3.3 {local and global arrays} {
-    catch {unset a}
-    set a(x) 22
-    set a(y) 33
-    list [catch {do {global a; unset a(y)}; array names a} msg] $msg
-} {0 x}
-test proc-old-3.4 {local and global arrays} {
-    catch {unset a}
-    set a(x) 22
-    set a(y) 33
-    list [catch {do {global a; unset a; info exists a}} msg] $msg \
-	    [info exists a]
-} {0 0 0}
-test proc-old-3.5 {local and global arrays} {
-    catch {unset a}
-    set a(x) 22
-    set a(y) 33
-    list [catch {do {global a; unset a(y); array names a}} msg] $msg
-} {0 x}
-catch {unset a}
-test proc-old-3.6 {local and global arrays} {
-    catch {unset a}
-    set a(x) 22
-    set a(y) 33
-    do {global a; do {global a; unset a}; set a(z) 22}
-    list [catch {array names a} msg] $msg
-} {0 z}
-test proc-old-3.7 {local and global arrays} {
-    proc t1 {args} {global info; set info 1}
-    catch {unset a}
-    set info {}
-    do {global a; trace var a(1) w t1}
-    set a(1) 44
-    set info
-} 1
-test proc-old-3.8 {local and global arrays} {
-    proc t1 {args} {global info; set info 1}
-    catch {unset a}
-    trace var a(1) w t1
-    set info {}
-    do {global a; trace vdelete a(1) w t1}
-    set a(1) 44
-    set info
-} {}
-test proc-old-3.9 {local and global arrays} {
-    proc t1 {args} {global info; set info 1}
-    catch {unset a}
-    trace var a(1) w t1
-    do {global a; trace vinfo a(1)}
-} {{w t1}}
-catch {unset a}
-
-test proc-old-3.1 {arguments and defaults} {
-    proc tproc {x y z} {
-	return [list $x $y $z]
-    }
-    tproc 11 12 13
-} {11 12 13}
-test proc-old-3.2 {arguments and defaults} {
-    proc tproc {x y z} {
-	return [list $x $y $z]
-    }
-    list [catch {tproc 11 12} msg] $msg
-} {1 {no value given for parameter "z" to "tproc"}}
-test proc-old-3.3 {arguments and defaults} {
-    proc tproc {x y z} {
-	return [list $x $y $z]
-    }
-    list [catch {tproc 11 12 13 14} msg] $msg
-} {1 {called "tproc" with too many arguments}}
-test proc-old-3.4 {arguments and defaults} {
-    proc tproc {x {y y-default} {z z-default}} {
-	return [list $x $y $z]
-    }
-    tproc 11 12 13
-} {11 12 13}
-test proc-old-3.5 {arguments and defaults} {
-    proc tproc {x {y y-default} {z z-default}} {
-	return [list $x $y $z]
-    }
-    tproc 11 12
-} {11 12 z-default}
-test proc-old-3.6 {arguments and defaults} {
-    proc tproc {x {y y-default} {z z-default}} {
-	return [list $x $y $z]
-    }
-    tproc 11
-} {11 y-default z-default}
-test proc-old-3.7 {arguments and defaults} {
-    proc tproc {x {y y-default} {z z-default}} {
-	return [list $x $y $z]
-    }
-    list [catch {tproc} msg] $msg
-} {1 {no value given for parameter "x" to "tproc"}}
-test proc-old-3.8 {arguments and defaults} {
-    list [catch {
-	proc tproc {x {y y-default} z} {
-	    return [list $x $y $z]
-	}
-	tproc 2 3
-    } msg] $msg
-} {1 {no value given for parameter "z" to "tproc"}}
-test proc-old-3.9 {arguments and defaults} {
-    proc tproc {x {y y-default} args} {
-	return [list $x $y $args]
-    }
-    tproc 2 3 4 5
-} {2 3 {4 5}}
-test proc-old-3.10 {arguments and defaults} {
-    proc tproc {x {y y-default} args} {
-	return [list $x $y $args]
-    }
-    tproc 2 3
-} {2 3 {}}
-test proc-old-3.11 {arguments and defaults} {
-    proc tproc {x {y y-default} args} {
-	return [list $x $y $args]
-    }
-    tproc 2
-} {2 y-default {}}
-test proc-old-3.12 {arguments and defaults} {
-    proc tproc {x {y y-default} args} {
-	return [list $x $y $args]
-    }
-    list [catch {tproc} msg] $msg
-} {1 {no value given for parameter "x" to "tproc"}}
-
-test proc-old-4.1 {variable numbers of arguments} {
-    proc tproc args {return $args}
-    tproc
-} {}
-test proc-old-4.2 {variable numbers of arguments} {
-    proc tproc args {return $args}
-    tproc 1 2 3 4 5 6 7 8
-} {1 2 3 4 5 6 7 8}
-test proc-old-4.3 {variable numbers of arguments} {
-    proc tproc args {return $args}
-    tproc 1 {2 3} {4 {5 6} {{{7}}}} 8
-} {1 {2 3} {4 {5 6} {{{7}}}} 8}
-test proc-old-4.4 {variable numbers of arguments} {
-    proc tproc {x y args} {return $args}
-    tproc 1 2 3 4 5 6 7
-} {3 4 5 6 7}
-test proc-old-4.5 {variable numbers of arguments} {
-    proc tproc {x y args} {return $args}
-    tproc 1 2
-} {}
-test proc-old-4.6 {variable numbers of arguments} {
-    proc tproc {x missing args} {return $args}
-    list [catch {tproc 1} msg] $msg
-} {1 {no value given for parameter "missing" to "tproc"}}
-
-test proc-old-5.1 {error conditions} {
-    list [catch {proc} msg] $msg
-} {1 {wrong # args: should be "proc name args body"}}
-test proc-old-5.2 {error conditions} {
-    list [catch {proc tproc b} msg] $msg
-} {1 {wrong # args: should be "proc name args body"}}
-test proc-old-5.3 {error conditions} {
-    list [catch {proc tproc b c d e} msg] $msg
-} {1 {wrong # args: should be "proc name args body"}}
-test proc-old-5.4 {error conditions} {
-    list [catch {proc tproc \{xyz {return foo}} msg] $msg
-} {1 {unmatched open brace in list}}
-test proc-old-5.5 {error conditions} {
-    list [catch {proc tproc {{} y} {return foo}} msg] $msg
-} {1 {procedure "tproc" has argument with no name}}
-test proc-old-5.6 {error conditions} {
-    list [catch {proc tproc {{} y} {return foo}} msg] $msg
-} {1 {procedure "tproc" has argument with no name}}
-test proc-old-5.7 {error conditions} {
-    list [catch {proc tproc {{x 1 2} y} {return foo}} msg] $msg
-} {1 {too many fields in argument specifier "x 1 2"}}
-test proc-old-5.8 {error conditions} {
-    catch {return}
-} 2
-test proc-old-5.9 {error conditions} {
-    list [catch {global} msg] $msg
-} {1 {wrong # args: should be "global varName ?varName ...?"}}
-proc tproc {} {
-    set a 22
-    global a
-}
-test proc-old-5.10 {error conditions} {
-    list [catch {tproc} msg] $msg
-} {1 {variable "a" already exists}}
-test proc-old-5.11 {error conditions} {
-    catch {rename tproc {}}
-    catch {
-	proc tproc {x {} z} {return foo}
-    }
-    list [catch {tproc 1} msg] $msg
-} {1 {invalid command name "tproc"}}
-test proc-old-5.12 {error conditions} {
-    proc tproc {} {
-	set a 22
-	error "error in procedure"
-	return
-    }
-    list [catch tproc msg] $msg
-} {1 {error in procedure}}
-test proc-old-5.13 {error conditions} {
-    proc tproc {} {
-	set a 22
-	error "error in procedure"
-	return
-    }
-    catch tproc msg
-    set errorInfo
-} {error in procedure
-    while executing
-"error "error in procedure""
-    (procedure "tproc" line 3)
-    invoked from within
-"tproc"}
-test proc-old-5.14 {error conditions} {
-    proc tproc {} {
-	set a 22
-	break
-	return
-    }
-    catch tproc msg
-    set errorInfo
-} {invoked "break" outside of a loop
-    while executing
-"tproc"}
-test proc-old-5.15 {error conditions} {
-    proc tproc {} {
-	set a 22
-	continue
-	return
-    }
-    catch tproc msg
-    set errorInfo
-} {invoked "continue" outside of a loop
-    while executing
-"tproc"}
-test proc-old-5.16 {error conditions} {
-    proc foo args {
-	global fooMsg
-	set fooMsg "foo was called: $args"
-    }
-    proc tproc {} {
-	set x 44
-	trace var x u foo
-	while {$x < 100} {
-	    error "Nested error"
-	}
-    }
-    set fooMsg "foo not called"
-    list [catch tproc msg] $msg $errorInfo $fooMsg
-} {1 {Nested error} {Nested error
-    while executing
-"error "Nested error""
-    (procedure "tproc" line 5)
-    invoked from within
-"tproc"} {foo was called: x {} u}}
-
-# The tests below will really only be useful when run under Purify or
-# some other system that can detect accesses to freed memory...
-
-test proc-old-6.1 {procedure that redefines itself} {
-    proc tproc {} {
-	proc tproc {} {
-	    return 44
-	}
-	return 45
-    }
-    tproc
-} 45
-test proc-old-6.2 {procedure that deletes itself} {
-    proc tproc {} {
-	rename tproc {}
-	return 45
-    }
-    tproc
-} 45
-
-proc tproc code {
-    return -code $code abc
-}
-test proc-old-7.1 {return with special completion code} {
-    list [catch {tproc ok} msg] $msg
-} {0 abc}
-test proc-old-7.2 {return with special completion code} {
-    list [catch {tproc error} msg] $msg $errorInfo $errorCode
-} {1 abc {abc
-    while executing
-"tproc error"} NONE}
-test proc-old-7.3 {return with special completion code} {
-    list [catch {tproc return} msg] $msg
-} {2 abc}
-test proc-old-7.4 {return with special completion code} {
-    list [catch {tproc break} msg] $msg
-} {3 abc}
-test proc-old-7.5 {return with special completion code} {
-    list [catch {tproc continue} msg] $msg
-} {4 abc}
-test proc-old-7.6 {return with special completion code} {
-    list [catch {tproc -14} msg] $msg
-} {-14 abc}
-test proc-old-7.7 {return with special completion code} {
-    list [catch {tproc gorp} msg] $msg
-} {1 {bad completion code "gorp": must be ok, error, return, break, continue, or an integer}}
-test proc-old-7.8 {return with special completion code} {
-    list [catch {tproc 10b} msg] $msg
-} {1 {bad completion code "10b": must be ok, error, return, break, continue, or an integer}}
-test proc-old-7.9 {return with special completion code} {
-    proc tproc2 {} {
-	tproc return
-    }
-    list [catch tproc2 msg] $msg
-} {0 abc}
-test proc-old-7.10 {return with special completion code} {
-    proc tproc2 {} {
-	return -code error
-    }
-    list [catch tproc2 msg] $msg
-} {1 {}}
-test proc-old-7.11 {return with special completion code} {
-    proc tproc2 {} {
-	global errorCode errorInfo
-	catch {open _bad_file_name r} msg
-	return -code error -errorinfo $errorInfo -errorcode $errorCode $msg
-    }
-    normalizeMsg [list [catch tproc2 msg] $msg $errorInfo $errorCode]
-} {1 {couldn't open "_bad_file_name": no such file or directory} {couldn't open "_bad_file_name": no such file or directory
-    while executing
-"open _bad_file_name r"
-    invoked from within
-"tproc2"} {posix enoent {no such file or directory}}}
-test proc-old-7.12 {return with special completion code} {
-    proc tproc2 {} {
-	global errorCode errorInfo
-	catch {open _bad_file_name r} msg
-	return -code error -errorcode $errorCode $msg
-    }
-    normalizeMsg [list [catch tproc2 msg] $msg $errorInfo $errorCode]
-} {1 {couldn't open "_bad_file_name": no such file or directory} {couldn't open "_bad_file_name": no such file or directory
-    while executing
-"tproc2"} {posix enoent {no such file or directory}}}
-test proc-old-7.13 {return with special completion code} {
-    proc tproc2 {} {
-	global errorCode errorInfo
-	catch {open _bad_file_name r} msg
-	return -code error -errorinfo $errorInfo $msg
-    }
-    normalizeMsg [list [catch tproc2 msg] $msg $errorInfo $errorCode]
-} {1 {couldn't open "_bad_file_name": no such file or directory} {couldn't open "_bad_file_name": no such file or directory
-    while executing
-"open _bad_file_name r"
-    invoked from within
-"tproc2"} none}
-test proc-old-7.14 {return with special completion code} {
-    proc tproc2 {} {
-	global errorCode errorInfo
-	catch {open _bad_file_name r} msg
-	return -code error $msg
-    }
-    normalizeMsg [list [catch tproc2 msg] $msg $errorInfo $errorCode]
-} {1 {couldn't open "_bad_file_name": no such file or directory} {couldn't open "_bad_file_name": no such file or directory
-    while executing
-"tproc2"} none}
-test proc-old-7.14 {return with special completion code} {
-    list [catch {return -badOption foo message} msg] $msg
-} {1 {bad option "-badOption": must be -code, -errorcode, or -errorinfo}}
-
-test proc-old-8.1 {unset and undefined local arrays} {
-    proc t1 {} {
-        foreach v {xxx, yyy} {
-            catch {unset $v}
-        }
-        set yyy(foo) bar
-    }
-    t1
-} bar
-
-test proc-old-9.1 {empty command name} {
-    catch {rename {} ""}
-    proc t1 {args} {
-        return
-    }
-    set v [t1]
-    catch {$v}
-} 1
-
-test proc-old-10.1 {ByteCode epoch change during recursive proc execution} {
-    proc t1 x {
-        set y 20
-        rename expr expr.old
-        rename expr.old expr
-        if $x then {t1 0} ;# recursive call after foo's code is invalidated
-        return 20
-    }
-    t1 1
-} 20
-
-# cleanup
-catch {rename t1 ""}
-catch {rename foo ""}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/proc.test b/tests/proc.test
deleted file mode 100644
index 60f5d8e..0000000
--- a/tests/proc.test
+++ /dev/null
@@ -1,312 +0,0 @@
-# This file contains tests for the tclProc.c source file. Tests appear in
-# the same order as the C code that they test. The set of tests is
-# currently incomplete since it includes only new tests, in particular
-# tests for code changed for the addition of Tcl namespaces. Other
-# procedure-related tests appear in other test files such as proc-old.test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: proc.test,v 1.4 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {eval namespace delete [namespace children :: test_ns_*]}
-catch {rename p ""}
-catch {rename {} ""}
-catch {unset msg}
-
-test proc-1.1 {Tcl_ProcObjCmd, put proc in namespace specified in name, if any} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        namespace eval baz {}
-    }
-    proc test_ns_1::baz::p {} {
-        return "p in [namespace current]"
-    }
-    list [test_ns_1::baz::p] \
-         [namespace eval test_ns_1 {baz::p}] \
-         [info commands test_ns_1::baz::*]
-} {{p in ::test_ns_1::baz} {p in ::test_ns_1::baz} ::test_ns_1::baz::p}
-test proc-1.2 {Tcl_ProcObjCmd, namespace specified in proc name must exist} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    list [catch {proc test_ns_1::baz::p {} {}} msg] $msg
-} {1 {can't create procedure "test_ns_1::baz::p": unknown namespace}}
-test proc-1.3 {Tcl_ProcObjCmd, empty proc name} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    proc :: {} {
-        return "empty called"
-    }
-    list [::] \
-         [info body {}]
-} {{empty called} {
-        return "empty called"
-    }}
-test proc-1.4 {Tcl_ProcObjCmd, simple proc name and proc defined in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        namespace eval baz {
-            proc p {} {
-                return "p in [namespace current]"
-            }
-        }
-    }
-    list [test_ns_1::baz::p] \
-         [info commands test_ns_1::baz::*]
-} {{p in ::test_ns_1::baz} ::test_ns_1::baz::p}
-test proc-1.5 {Tcl_ProcObjCmd, qualified proc name and proc defined in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::baz {}
-    namespace eval test_ns_1 {
-        proc baz::p {} {
-            return "p in [namespace current]"
-        }
-    }
-    list [test_ns_1::baz::p] \
-         [info commands test_ns_1::baz::*] \
-         [namespace eval test_ns_1::baz {namespace which p}]
-} {{p in ::test_ns_1::baz} ::test_ns_1::baz::p ::test_ns_1::baz::p}
-test proc-1.6 {Tcl_ProcObjCmd, namespace code ignores single ":"s in middle or end of command names} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        proc q: {} {return "q:"}
-        proc value:at: {} {return "value:at:"}
-    }
-    list [namespace eval test_ns_1 {q:}] \
-         [namespace eval test_ns_1 {value:at:}] \
-         [test_ns_1::q:] \
-         [test_ns_1::value:at:] \
-         [lsort [info commands test_ns_1::*]] \
-         [namespace eval test_ns_1 {namespace which q:}] \
-         [namespace eval test_ns_1 {namespace which value:at:}]
-} {q: value:at: q: value:at: {::test_ns_1::q: ::test_ns_1::value:at:} ::test_ns_1::q: ::test_ns_1::value:at:}
-test proc-1.7 {Tcl_ProcObjCmd, check that formal parameter names are not array elements} {
-    catch {rename p ""}
-    list [catch {proc p {a(1) a(2)} { 
-            set z [expr $a(1)+$a(2)]
-            puts "$z=z, $a(1)=$a(1)"
-        }} msg] $msg
-} {1 {procedure "p" has formal parameter "a(1)" that is an array element}}
-
-test proc-2.1 {TclFindProc, simple proc name and proc not in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    proc p {} {return "p in [namespace current]"}
-    info body p
-} {return "p in [namespace current]"}
-test proc-2.2 {TclFindProc, simple proc name and proc defined in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1 {
-        namespace eval baz {
-            proc p {} {return "p in [namespace current]"}
-        }
-    }
-    namespace eval test_ns_1::baz {info body p}
-} {return "p in [namespace current]"}
-test proc-2.3 {TclFindProc, qualified proc name and proc defined in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::baz {}
-    namespace eval test_ns_1 {
-        proc baz::p {} {return "p in [namespace current]"}
-    }
-    namespace eval test_ns_1 {info body baz::p}
-} {return "p in [namespace current]"}
-test proc-2.4 {TclFindProc, global proc and executing in namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    proc p {} {return "global p"}
-    namespace eval test_ns_1::baz {info body p}
-} {return "global p"}
-
-test proc-3.1 {TclObjInterpProc, proc defined and executing in same namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    proc p {} {return "p in [namespace current]"}
-    p
-} {p in ::}
-test proc-3.2 {TclObjInterpProc, proc defined and executing in same namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    namespace eval test_ns_1::baz {
-        proc p {} {return "p in [namespace current]"}
-        p
-    }
-} {p in ::test_ns_1::baz}
-test proc-3.3 {TclObjInterpProc, proc defined and executing in different namespaces} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    proc p {} {return "p in [namespace current]"}
-    namespace eval test_ns_1::baz {
-        p
-    }
-} {p in ::}
-test proc-3.4 {TclObjInterpProc, procs execute in the namespace in which they were defined unless renamed into new namespace} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename p ""}
-    namespace eval test_ns_1::baz {
-        proc p {} {return "p in [namespace current]"}
-        rename ::test_ns_1::baz::p ::p
-        list [p] [namespace which p]
-    }
-} {{p in ::} ::p}
-test proc-3.5 {TclObjInterpProc, any old result is reset before appending error msg about missing arguments} {
-    proc p {x} {info commands 3m}
-    list [catch {p} msg] $msg
-} {1 {no value given for parameter "x" to "p"}}
-
-catch {eval namespace delete [namespace children :: test_ns_*]}
-catch {rename p ""}
-catch {rename {} ""}
-catch {unset msg}
-
-if {[catch {package require procbodytest}]} {
-    puts "This application couldn't load the \"procbodytest\" package, so I"
-    puts "can't test creation of procs whose bodies have type \"procbody\"."
-    ::tcltest::cleanupTests
-    return
-}
-
-catch {rename p ""}
-catch {rename t ""}
-
-# Note that the test require that procedures whose body is used to create
-# procbody objects must be executed before the procbodytest::proc command
-# is executed, so that the Proc struct is populated correctly (CompiledLocals
-# are added at compile time).
-
-test proc-4.1 {TclCreateProc, procbody obj} {
-    catch {
-	proc p x {return "$x:$x"}
-	set rv [p P]
-	procbodytest::proc t x p
-	lappend rv [t T]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {P:P T:T}
-
-test proc-4.2 {TclCreateProc, procbody obj, use compiled locals} {
-    catch {
-	proc p x {
-	    set y [string tolower $x]
-	    return "$x:$y"
-	}
-	set rv [p P]
-	procbodytest::proc t x p
-	lappend rv [t T]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {P:p T:t}
-
-test proc-4.3 {TclCreateProc, procbody obj, too many args} {
-    catch {
-	proc p x {
-	    set y [string tolower $x]
-	    return "$x:$y"
-	}
-	set rv [p P]
-	procbodytest::proc t {x x1 x2} p
-	lappend rv [t T]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {procedure "t": arg list contains 3 entries, precompiled header expects 1}
-
-test proc-4.4 {TclCreateProc, procbody obj, inconsitent arg name} {
-    catch {
-	proc p {x y z} {
-	    set v [join [list $x $y $z]]
-	    set w [string tolower $v]
-	    return "$v:$w"
-	}
-	set rv [p P Q R]
-	procbodytest::proc t {x x1 z} p
-	lappend rv [t S T U]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {procedure "t": formal parameter 1 is inconsistent with precompiled body}
-
-test proc-4.5 {TclCreateProc, procbody obj, inconsitent arg default type} {
-    catch {
-	proc p {x y {z Z}} {
-	    set v [join [list $x $y $z]]
-	    set w [string tolower $v]
-	    return "$v:$w"
-	}
-	set rv [p P Q R]
-	procbodytest::proc t {x y z} p
-	lappend rv [t S T U]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {procedure "t": formal parameter 2 is inconsistent with precompiled body}
-
-test proc-4.6 {TclCreateProc, procbody obj, inconsitent arg default type} {
-    catch {
-	proc p {x y z} {
-	    set v [join [list $x $y $z]]
-	    set w [string tolower $v]
-	    return "$v:$w"
-	}
-	set rv [p P Q R]
-	procbodytest::proc t {x y {z Z}} p
-	lappend rv [t S T U]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {procedure "t": formal parameter 2 is inconsistent with precompiled body}
-
-test proc-4.7 {TclCreateProc, procbody obj, inconsitent arg default value} {
-    catch {
-	proc p {x y {z Z}} {
-	    set v [join [list $x $y $z]]
-	    set w [string tolower $v]
-	    return "$v:$w"
-	}
-	set rv [p P Q R]
-	procbodytest::proc t {x y {z ZZ}} p
-	lappend rv [t S T U]
-	set rv
-    } result
-    catch {rename p ""}
-    catch {rename t ""}
-    set result
-} {procedure "t": formal parameter "z" has default value inconsistent with precompiled body}
-
-# cleanup
-catch {rename p ""}
-catch {rename t ""}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/pwd.test b/tests/pwd.test
deleted file mode 100644
index 0656b63..0000000
--- a/tests/pwd.test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Commands covered:  pwd
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: pwd.test,v 1.3 1999/04/16 00:47:32 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test pwd-1.1 {simple pwd} {
-	catch pwd
-} 0
-test pwd-1.2 {simple pwd} {
-	expr [string length pwd]>0
-} 1
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/reg.test b/tests/reg.test
deleted file mode 100644
index de20e33..0000000
--- a/tests/reg.test
+++ /dev/null
@@ -1,905 +0,0 @@
-# reg.test --
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-#
-# RCS: @(#) $Id: reg.test,v 1.2 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# All tests require the testregexp command, return if this
-# command doesn't exist
-
-set ::tcltest::testConfig(testregexp) \
-	[expr {[info commands testregexp] != {}}]
-
-# This file uses some custom procedures, defined below, for regexp regression
-# testing.  The name of the procedure indicates the general nature of the
-# test:  e for compile error expected, f for match failure expected, m
-# for a successful match, and i for a successful match with -indices (used
-# in checking things like nonparticipating subexpressions).  There is also
-# a "doing" procedure which sets up title and major test number for each
-# block of tests, and an "xx" procedure which ignores its arguments and
-# arranges for the next invocation of "doing" to announce that some tests
-# were bypassed (which is better than just commenting them out).
-
-# The first 3 arguments are constant:  a minor number (which often gets
-# a letter or two suffixed to it internally), some flags, and the RE itself.
-# For e, the remaining argument is the name of the compile error expected,
-# less the leading "REG_".  For the rest, the next argument is the string
-# to try the match against.  Remaining arguments are the substring expected
-# to be matched, and any substrings expected to be matched by subexpressions.
-# (For f, these arguments are optional, and if present are ignored except
-# that they indicate how many subexpressions should be presents in the RE.)
-# It is an error for the number of subexpression arguments to be wrong.
-# Cases involving nonparticipating subexpressions, checking where empty
-# substrings are located, etc. should be done using i.
-
-# The flag characters are complex and a bit eclectic.  Generally speaking, 
-# lowercase letters are compile options, uppercase are expected re_info
-# bits, and nonalphabetics are match options, controls for how the test is 
-# run, or testing options.  The one small surprise is that AREs are the
-# default, and you must explicitly request lesser flavors of RE.  The flags
-# are as follows.  It is admitted that some are not very mnemonic.
-# There are some others which are purely debugging tools and are not
-# useful in this file.
-#
-#	-	no-op (placeholder)
-#	+	provide fake xy equivalence class
-#	%	force small state-set cache in matcher (to test cache replace)
-#	^	beginning of string is not beginning of line
-#	$	end of string is not end of line
-#
-#	&	test as both ARE and BRE
-#	b	BRE
-#	e	ERE
-#	a	turn advanced-features bit on (error unless ERE already)
-#	q	literal string, no metacharacters at all
-#
-#	i	case-independent matching
-#	o	("opaque") no subexpression capture
-#	p	newlines are half-magic, excluded from . and [^ only
-#	w	newlines are half-magic, significant to ^ and $ only
-#	n	newlines are fully magic, both effects
-#	x	expanded RE syntax
-#
-#	A	backslash-_a_lphanumeric seen
-#	B	ERE/ARE literal-_b_race heuristic used
-#	E	backslash (_e_scape) seen within []
-#	H	looka_h_ead constraint seen
-#	I	_i_mpossible to match
-#	L	_l_ocale-specific construct seen
-#	M	unportable (_m_achine-specific) construct seen
-#	N	RE can match empty (_n_ull) string
-#	P	non-_P_OSIX construct seen
-#	Q	{} _q_uantifier seen
-#	R	back _r_eference seen
-#	S	POSIX-un_s_pecified syntax seen
-#	U	saw original-POSIX botch:  unmatched right paren in ERE (_u_gh)
-
-# The one area we can't easily test is memory-allocation failures (which
-# are hard to provoke on command).  Embedded NULs also are not tested at
-# the moment, but this is a historical accident which should be fixed.
-
-
-
-# test procedures and related
-
-set ask "about"
-set xflags "xflags"
-set testbypassed 0
-
-# re_info abbreviation mapping table
-set infonames(A) "REG_UBSALNUM"
-set infonames(B) "REG_UBRACES"
-set infonames(E) "REG_UBBS"
-set infonames(H) "REG_ULOOKAHEAD"
-set infonames(I) "REG_UIMPOSSIBLE"
-set infonames(L) "REG_ULOCALE"
-set infonames(M) "REG_UUNPORT"
-set infonames(N) "REG_UEMPTYMATCH"
-set infonames(P) "REG_UNONPOSIX"
-set infonames(Q) "REG_UBOUNDS"
-set infonames(R) "REG_UBACKREF"
-set infonames(S) "REG_UUNSPEC"
-set infonames(U) "REG_UPBOTCH"
-set infonameorder "RHQBAUEPSMLNI"	;# must match bit order, lsb first
-
-# set major test number and description
-proc doing {major desc} {
-	global prefix description testbypassed
-
-	if {$testbypassed != 0} {
-		puts stdout "!!! bypassed $testbypassed tests in\
-					 $major, `$description'"
-	}
-
-	set prefix reg-$major
-	set description "reg $desc"
-	set testbypassed 0
-}
-
-# build test number (internal)
-proc tno {testid} {
-	return [lindex $testid 0]
-}
-
-# build description, with possible modifiers (internal)
-proc desc {testid} {
-	global description
-
-	set d $description
-	if {[llength $testid] > 1} {
-		set d "([lreplace $testid 0 0]) $d"
-	}
-	return $d
-}
-
-# build trailing options and flags argument from a flags string (internal)
-proc flags {fl} {
-	global xflags
-
-	set args [list]
-	set flags ""
-	foreach f [split $fl ""] {
-		switch -exact -- $f {
-		"i" { lappend args "-nocase" }
-		"x" { lappend args "-expanded" }
-		"n" { lappend args "-line" }
-		"p" { lappend args "-linestop" }
-		"w" { lappend args "-lineanchor" }
-		"-" { }
-		default { append flags $f }
-		}
-	}
-	if {[string compare $flags ""] != 0} {
-		lappend args -$xflags $flags
-	}
-	return $args
-}
-
-# build info-flags list from a flags string (internal)
-proc infoflags {fl} {
-	global infonames infonameorder
-
-	set ret [list]
-	foreach f [split $infonameorder ""] {
-		if {[string first $f $fl] >= 0} {
-			lappend ret $infonames($f)
-		}
-	}
-	return $ret
-}
-
-# compilation error expected
-proc e {testid flags re err} {
-	global prefix ask errorCode
-
-	# if &, test as both ARE and BRE
-	set amp [string first "&" $flags]
-	if {$amp >= 0} {
-		set f [string range $flags 0 [expr $amp - 1]]
-		append f [string range $flags [expr $amp + 1] end]
-		e [linsert $testid end ARE] ${f} $re $err
-		e [linsert $testid end BRE] ${f}b $re $err
-		return
-	}
-
-	set cmd [concat [list testregexp -$ask] [flags $flags] [list $re]]
-	set run "list \[catch \{$cmd\}\] \[lindex \$errorCode 1\]"
-	test $prefix.[tno $testid] [desc $testid] {testregexp} $run [list 1 REG_$err]
-}
-
-# match failure expected
-proc f {testid flags re target args} {
-	global prefix description ask
-
-	# if &, test as both ARE and BRE
-	set amp [string first "&" $flags]
-	if {$amp >= 0} {
-		set f [string range $flags 0 [expr $amp - 1]]
-		append f [string range $flags [expr $amp + 1] end]
-		eval [linsert $args 0 f [linsert $testid end ARE] ${f} $re \
-								$target]
-		eval [linsert $args 0 f [linsert $testid end BRE] ${f}b $re \
-								$target]
-		return
-	}
-
-	set f [flags $flags]
-	set infoflags [infoflags $flags]
-	set ccmd [concat [list testregexp -$ask] $f [list $re]]
-	set nsub [expr [llength $args] - 1]
-	if {$nsub == -1} {
-		# didn't tell us number of subexps
-		set ccmd "lreplace \[$ccmd\] 0 0"
-		set info [list $infoflags]
-	} else {
-		set info [list $nsub $infoflags]
-	}
-	lappend testid "compile"
-	test $prefix.[tno $testid] [desc $testid] {testregexp} $ccmd $info
-
-	set testid [lreplace $testid end end "execute"]
-	set ecmd [concat [list testregexp] $f [list $re $target]]
-	test $prefix.[tno $testid] [desc $testid] {testregexp} $ecmd 0
-}
-
-# match expected, internal routine that does the work
-# parameters like the "real" routines except they don't have "opts",
-#  which is a possibly-empty list of switches for the regexp match attempt
-proc matchexpected {opts testid flags re target args} {
-	global prefix description ask
-
-	# if &, test as both BRE and ARE
-	set amp [string first "&" $flags]
-	if {$amp >= 0} {
-		set f [string range $flags 0 [expr $amp - 1]]
-		append f [string range $flags [expr $amp + 1] end]
-		eval [concat [list matchexpected $opts \
-			[linsert $testid end ARE] ${f} $re $target] $args]
-		eval [concat [list matchexpected $opts \
-			[linsert $testid end BRE] ${f}b $re $target] $args]
-		return
-	}
-
-	set f [flags $flags]
-	set infoflags [infoflags $flags]
-	set ccmd [concat [list testregexp -$ask] $f [list $re]]
-	set ecmd [concat [list testregexp] $opts $f [list $re $target]]
-
-	set nsub [expr [llength $args] - 1]
-	set names [list]
-	set refs ""
-	for {set i 0} {$i <= $nsub} {incr i} {
-		if {$i == 0} {
-			set name match
-		} else {
-			set name sub$i
-		}
-		lappend names $name
-		append refs " \$$name"
-		set $name ""
-	}
-	if {[string first "o" $flags] >= 0} {	;# REG_NOSUB
-		set nsub 0		;# unsigned value cannot be -1
-	}
-	set ecmd [concat $ecmd $names]
-	set erun "list \[$ecmd\] $refs"
-	set result [concat [list 1] $args]
-
-	set info [list $nsub $infoflags]
-	lappend testid "compile"
-	test $prefix.[tno $testid] [desc $testid] {testregexp} $ccmd $info
-	set testid [lreplace $testid end end "execute"]
-	test $prefix.[tno $testid] [desc $testid] {testregexp} $erun $result
-}
-
-# match expected (no missing, empty, or ambiguous submatches)
-# m testno flags re target mat submat ...
-proc m {args} {
-	eval matchexpected [linsert $args 0 [list]]
-}
-
-# match expected (full fanciness)
-# i testno flags re target mat submat ...
-proc i {args} {
-	eval matchexpected [linsert $args 0 [list "-indices"]]
-}
-
-# test temporarily unimplemented
-proc xx {args} {
-	global testbypassed
-
-	incr testbypassed
-}
-
-
-
-# the tests themselves
-
-
-
-# support functions and preliminary misc.
-# This is sensitive to changes in message wording, but we really have to
-# test the code->message expansion at least once.
-test regexp-0.1 "regexp error reporting" {
-	list [catch {regexp (*) ign} msg] $msg
-} {1 {couldn't compile regular expression pattern: quantifier operand invalid}}
-
-
-
-doing 1 "basic sanity checks"
-m  1	&	abc		abc	abc
-f  2	&	abc		def
-m  3	&	abc		xyabxabce	abc
-
-
-
-doing 2 "invalid option combinations"
-e  1	qe	a		INVARG
-e  2	qa	a		INVARG
-e  3	qx	a		INVARG
-e  4	qn	a		INVARG
-e  5	ba	a		INVARG
-
-
-
-doing 3 "basic syntax"
-i  1	&NS	""		a	{0 -1}
-m  2	NS	a|		a	a
-m  3	-	a|b		a	a
-m  4	-	a|b		b	b
-m  5	NS	a||b		b	b
-m  6	&	ab		ab	ab
-
-
-
-doing 4 "parentheses"
-m  1	-	(a)e		ae	ae	a
-m  2	o	(a)e		ae
-m  3	b	{\(a\)b}	ab	ab	a
-m  4	-	a((b)c)		abc	abc	bc	b
-m  5	-	a(b)(c)		abc	abc	b	c
-e  6	-	a(b		EPAREN
-e  7	b	{a\(b}		EPAREN
-# sigh, we blew it on the specs here... someday this will be fixed in POSIX,
-#  but meanwhile, it's fixed in AREs
-m  8	eU	a)b		a)b	a)b
-e  9	-	a)b		EPAREN
-e 10	b	{a\)b}		EPAREN
-m 11	P	a(?:b)c		abc	abc
-e 12	e	a(?:b)c		BADRPT
-i 13	S	a()b		ab	{0 1}	{1 0}
-m 14	SP	a(?:)b		ab	ab
-i 15	S	a(|b)c		ac	{0 1}	{1 0}
-m 16	S	a(b|)c		abc	abc	b
-
-
-
-doing 5 "simple one-char matching"
-# general case of brackets done later
-m  1	&	a.b		axb	axb
-f  2	&n	"a.b"		"a\nb"
-m  3	&	{a[bc]d}	abd	abd
-m  4	&	{a[bc]d}	acd	acd
-f  5	&	{a[bc]d}	aed
-f  6	&	{a[^bc]d}	abd
-m  7	&	{a[^bc]d}	aed	aed
-f  8	&p	"a\[^bc]d"	"a\nd"
-
-
-
-doing 6 "context-dependent syntax"
-# plus odds and ends
-e  1	-	*		BADRPT
-m  2	b	*		*	*
-m  3	b	{\(*\)}		*	*	*
-e  4	-	(*)		BADRPT
-m  5	b	^*		*	*
-e  6	-	^*		BADRPT
-f  7	&	^b		^b
-m  8	b	x^		x^	x^
-f  9	I	x^		x
-m 10	n	"\n^"		"x\nb"	"\n"
-f 11	bS	{\(^b\)}	^b
-m 12	-	(^b)		b	b	b
-m 13	&	{x$}		x	x
-m 14	bS	{\(x$\)}	x	x	x
-m 15	-	{(x$)}		x	x	x
-m 16	b	{x$y}		"x\$y"	"x\$y"
-f 17	I	{x$y}		xy
-m 18	n	"x\$\n"		"x\n"	"x\n"
-e 19	-	+		BADRPT
-e 20	-	?		BADRPT
-
-
-
-doing 7 "simple quantifiers"
-m  1	&N	a*		aa	aa
-i  2	&N	a*		b	{0 -1}
-m  3	-	a+		aa	aa
-m  4	-	a?b		ab	ab
-m  5	-	a?b		b	b
-e  6	-	**		BADRPT
-m  7	bN	**		***	***
-e  8	&	a**		BADRPT
-e  9	&	a**b		BADRPT
-e 10	&	***		BADRPT
-e 11	*	a++		BADRPT
-e 12	*	a?+		BADRPT
-e 13	*	a?*		BADRPT
-e 14	*	a+*		BADRPT
-e 15	*	a*+		BADRPT
-
-
-
-doing 8 "braces"
-m  1	NQ	"a{0,1}"	""	""
-m  2	NQ	"a{0,1}"	ac	a
-e  3	-	"a{1,0}"	BADBR
-e  4	-	"a{1,2,3}"	BADBR
-e  5	-	"a{257}"	BADBR
-e  6	-	"a{1000}"	BADBR
-e  7	-	"a{1"		EBRACE
-e  8	-	"a{1n}"		BADBR
-m  9	BS	"a{b"		"a\{b"	"a\{b"
-m 10	BS	"a{"		"a\{"	"a\{"
-m 11	bQ	{a\{0,1\}b}	cb	b
-e 12	b	{a\{0,1}	EBRACE
-e 13	-	"a{0,1\\"	BADBR
-m 14	Q	"a{0}b"		ab	b
-m 15	Q	"a{0,0}b"	ab	b
-m 16	Q	"a{0,1}b"	ab	ab
-m 17	Q	"a{0,2}b"	b	b
-m 18	Q	"a{0,2}b"	aab	aab
-m 19	Q	"a{0,}b"	aab	aab
-m 20	Q	"a{1,1}b"	aab	ab
-m 21	Q	"a{1,3}b"	aaaab	aaab
-f 22	Q	"a{1,3}b"	b
-m 23	Q	"a{1,}b"	aab	aab
-f 24	Q	"a{2,3}b"	ab
-m 25	Q	"a{2,3}b"	aaaab	aaab
-f 26	Q	"a{2,}b"	ab
-m 27	Q	"a{2,}b"	aaaab	aaaab
-
-
-
-doing 9 "brackets"
-m  1	&	{a[bc]}		ac	ac
-m  2	&	{a[-]}		a-	a-
-m  3	&	{a[[.-.]]}	a-	a-
-m  4	&L	{a[[.zero.]]}	a0	a0
-m  5	&LM	{a[[.zero.]-9]}	a2	a2
-m  6	&M	{a[0-[.9.]]}	a2	a2
-m  7	&+L	{a[[=x=]]}	ax	ax
-m  8	&+L	{a[[=x=]]}	ay	ay
-f  9	&+L	{a[[=x=]]}	az
-e 10	&	{a[0-[=x=]]}	ERANGE
-m 11	&L	{a[[:digit:]]}	a0	a0
-e 12	&	{a[[:woopsie:]]}	ECTYPE
-f 13	&L	{a[[:digit:]]}	ab
-e 14	&	{a[0-[:digit:]]}	ERANGE
-m 15	&LP	{[[:<:]]a}	a	a
-m 16	&LP	{a[[:>:]]}	a	a
-e 17	&	{a[[..]]b}	ECOLLATE
-e 18	&	{a[[==]]b}	ECOLLATE
-e 19	&	{a[[::]]b}	ECTYPE
-e 20	&	{a[[.a}		EBRACK
-e 21	&	{a[[=a}		EBRACK
-e 22	&	{a[[:a}		EBRACK
-e 23	&	{a[}		EBRACK
-e 24	&	{a[b}		EBRACK
-e 25	&	{a[b-}		EBRACK
-e 26	&	{a[b-c}		EBRACK
-m 27	&M	{a[b-c]}	ab	ab
-m 28	&	{a[b-b]}	ab	ab
-m 29	&M	{a[1-2]}	a2	a2
-e 30	&	{a[c-b]}	ERANGE
-e 31	&	{a[a-b-c]}	ERANGE
-m 32	&M	{a[--?]b}	a?b	a?b
-m 33	&	{a[---]b}	a-b	a-b
-m 34	&	{a[]b]c}	a]c	a]c
-m 35	EP	{a[\]]b}	a]b	a]b
-f 36	bE	{a[\]]b}	a]b
-m 37	bE	{a[\]]b}	"a\\]b"	"a\\]b"
-m 38	eE	{a[\]]b}	"a\\]b"	"a\\]b"
-m 39	EP	{a[\\]b}	"a\\b"	"a\\b"
-m 40	eE	{a[\\]b}	"a\\b"	"a\\b"
-m 41	bE	{a[\\]b}	"a\\b"	"a\\b"
-e 42	-	{a[\Z]b}	EESCAPE
-m 43	&	{a[[b]c}	"a\[c"	"a\[c"
-m 44	EMP	{a[\u00fe-\u0507][\u00ff-\u0300]b} \
-			"a\u0102\u02ffb"	"a\u0102\u02ffb"
-
-
-
-doing 10 "anchors and newlines"
-m  1	&	^a		a	a
-f  2	&^	^a		a
-i  3	&N	^		a	{0 -1}
-i  4	&	{a$}		aba	{2 2}
-f  5	{&$}	{a$}		a
-i  6	&N	{$}		ab	{2 1}
-m  7	&n	^a		a	a
-m  8	&n	"^a"		"b\na"	"a"
-i  9	&w	"^a"		"a\na"	{0 0}
-i 10	&n^	"^a"		"a\na"	{2 2}
-m 11	&n	{a$}		a	a
-m 12	&n	"a\$"		"a\nb"	"a"
-i 13	&n	"a\$"		"a\na"	{0 0}
-i 14	N	^^		a	{0 -1}
-m 15	b	^^		^	^
-i 16	N	{$$}		a	{1 0}
-m 17	b	{$$}		"\$"	"\$"
-m 18	&N	{^$}		""	""
-f 19	&N	{^$}		a
-i 20	&nN	"^\$"		"a\n\nb"	{2 1}
-m 21	N	{$^}		""	""
-m 22	b	{$^}		"\$^"	"\$^"
-m 23	P	{\Aa}		a	a
-m 24	^P	{\Aa}		a	a
-f 25	^nP	{\Aa}		"b\na"
-m 26	P	{a\Z}		a	a
-m 27	{$P}	{a\Z}		a	a
-f 28	{$nP}	{a\Z}		"a\nb"
-e 29	-	^*		BADRPT
-e 30	-	{$*}		BADRPT
-e 31	-	{\A*}		BADRPT
-e 32	-	{\Z*}		BADRPT
-
-
-
-doing 11 "boundary constraints"
-m  1	&LP	{[[:<:]]a}	a	a
-m  2	&LP	{[[:<:]]a}	-a	a
-f  3	&LP	{[[:<:]]a}	ba
-m  4	&LP	{a[[:>:]]}	a	a
-m  5	&LP	{a[[:>:]]}	a-	a
-f  6	&LP	{a[[:>:]]}	ab
-m  7	bLP	{\<a}		a	a
-f  8	bLP	{\<a}		ba
-m  9	bLP	{a\>}		a	a
-f 10	bLP	{a\>}		ab
-m 11	LP	{\ya}		a	a
-f 12	LP	{\ya}		ba
-m 13	LP	{a\y}		a	a
-f 14	LP	{a\y}		ab
-m 15	LP	{a\Y}		ab	a
-f 16	LP	{a\Y}		a-
-f 17	LP	{a\Y}		a
-f 18	LP	{-\Y}		-a
-m 19	LP	{-\Y}		-%	-
-f 20	LP	{\Y-}		a-
-e 21	-	{[[:<:]]*}	BADRPT
-e 22	-	{[[:>:]]*}	BADRPT
-e 23	b	{\<*}		BADRPT
-e 24	b	{\>*}		BADRPT
-e 25	-	{\y*}		BADRPT
-e 26	-	{\Y*}		BADRPT
-m 27	LP	{\ma}		a	a
-f 28	LP	{\ma}		ba
-m 29	LP	{a\M}		a	a
-f 30	LP	{a\M}		ab
-f 31	ILP	{\Ma}		a
-f 32	ILP	{a\m}		a
-
-
-
-doing 12 "character classes"
-m  1	LP	{a\db}		a0b	a0b
-f  2	LP	{a\db}		axb
-f  3	LP	{a\Db}		a0b
-m  4	LP	{a\Db}		axb	axb
-m  5	LP	"a\\sb"		"a b"	"a b"
-m  6	LP	"a\\sb"		"a\tb"	"a\tb"
-m  7	LP	"a\\sb"		"a\nb"	"a\nb"
-f  8	LP	{a\sb}		axb
-m  9	LP	{a\Sb}		axb	axb
-f 10	LP	"a\\Sb"		"a b"
-m 11	LP	{a\wb}		axb	axb
-f 12	LP	{a\wb}		a-b
-f 13	LP	{a\Wb}		axb
-m 14	LP	{a\Wb}		a-b	a-b
-m 15	LP	{\y\w+z\y}	adze-guz	guz
-m 16	LPE	{a[\d]b}	a1b	a1b
-m 17	LPE	"a\[\\s]b"	"a b"	"a b"
-m 18	LPE	{a[\w]b}	axb	axb
-
-
-
-doing 13 "escapes"
-e  1	&	"a\\"		EESCAPE
-m  2	-	{a\<b}		a<b	a<b
-m  3	e	{a\<b}		a<b	a<b
-m  4	bAS	{a\wb}		awb	awb
-m  5	eAS	{a\wb}		awb	awb
-m  6	PL	"a\\ab"		"a\007b"	"a\007b"
-m  7	P	"a\\bb"		"a\bb"	"a\bb"
-m  8	P	{a\Bb}		"a\\b"	"a\\b"
-m  9	MP	"a\\chb"	"a\bb"	"a\bb"
-m 10	MP	"a\\cHb"	"a\bb"	"a\bb"
-m 11	LMP	"a\\e"		"a\033"	"a\033"
-m 12	P	"a\\fb"		"a\fb"	"a\fb"
-m 13	P	"a\\nb"		"a\nb"	"a\nb"
-m 14	P	"a\\rb"		"a\rb"	"a\rb"
-m 15	P	"a\\tb"		"a\tb"	"a\tb"
-m 16	P	"a\\u0008x"	"a\bx"	"a\bx"
-e 17	-	{a\u008x}	EESCAPE
-m 18	P	"a\\u00088x"	"a\b8x"	"a\b8x"
-m 19	P	"a\\U00000008x"	"a\bx"	"a\bx"
-e 20	-	{a\U0000008x}	EESCAPE
-m 21	P	"a\\vb"		"a\vb"	"a\vb"
-m 22	MP	"a\\x08x"	"a\bx"	"a\bx"
-e 23	-	{a\xq}		EESCAPE
-m 24	MP	"a\\x0008x"	"a\bx"	"a\bx"
-e 25	-	{a\z}		EESCAPE
-m 26	MP	"a\\010b"	"a\bb"	"a\bb"
-
-
-
-doing 14 "back references"
-# ugh
-m  1	{R[1P}	{a(b*)c\1}	abbcbb	abbcbb	bb
-m  2	{R[1P}	{a(b*)c\1}	ac	ac	""
-f  3	{R[1P}	{a(b*)c\1}	abbcb
-m  4	{R[1P}	{a(b*)\1}	abbcbb	abb	b
-m  5	{R[1P}	{a(b|bb)\1}	abbcbb	abb	b
-m  6	{R[1P}	{a([bc])\1}	abb	abb	b
-f  7	{R[1P}	{a([bc])\1}	abc
-m  8	{R[1P}	{a([bc])\1}	abcabb	abb	b
-f  9	{R[1P}	{a([bc])*\1}	abc
-f 10	{R[1P}	{a([bc])\1}	abB
-m 11	{iR[1P}	{a([bc])\1}	abB	abB	b
-m 12	{R[1P}	{a([bc])\1+}	abbb	abbb	b
-m 13	{QR[1P}	"a(\[bc])\\1{3,4}"	abbbb	abbbb	b
-f 14	{QR[1P}	"a(\[bc])\\1{3,4}"	abbb
-m 15	{R[1P}	{a([bc])\1*}	abbb	abbb	b
-m 16	{R[1P}	{a([bc])\1*}	ab	ab	b
-m 17	{R[2P}	{a([bc])(\1*)}	ab	ab	b	""
-e 18	-	{a((b)\1)}	ESUBREG
-e 19	-	{a(b)c\2}	ESUBREG
-m 20	{bR[1}	{a\(b*\)c\1}	abbcbb	abbcbb	bb
-
-
-
-doing 15 "octal escapes vs back references"
-# initial zero is always octal
-m  1	MP	"a\\010b"	"a\bb"	"a\bb"
-m  2	MP	"a\\0070b"	"a\0070b"	"a\0070b"
-m  3	MP	"a\\07b"	"a\007b"	"a\007b"
-m  4	MP	"a(b)(b)(b)(b)(b)(b)(b)(b)(b)(b)\\07c"	"abbbbbbbbbb\007c" \
-	"abbbbbbbbbb\007c"	"b"	"b"	"b"	"b"	"b"	"b" \
-	"b"	"b"	"b"	"b"
-# a single digit is always a backref
-e  5	-	{a\7b}		ESUBREG
-# otherwise it's a backref only if within range (barf!)
-m  6	MP	"a\\10b"	"a\bb"	"a\bb"
-m  7	MP	{a\101b}	aAb	aAb
-m  8	RP	{a(b)(b)(b)(b)(b)(b)(b)(b)(b)(b)\10c}	abbbbbbbbbbbc \
-	abbbbbbbbbbbc	b	b	b	b	b	b	b \
-	b	b	b
-# but we're fussy about border cases -- guys who want octal should use the zero
-e  9	-	{a((((((((((b\10))))))))))c}	ESUBREG
-# BREs don't have octal, EREs don't have backrefs
-m 10	MP	"a\\12b"	"a\nb"	"a\nb"
-e 11	b	{a\12b}		ESUBREG
-m 12	eAS	{a\12b}		a12b	a12b
-
-
-
-doing 16 "expanded syntax"
-m  1	xP	"a b c"		"abc"	"abc"
-m  2	xP	"a b #oops\nc\td"	"abcd"	"abcd"
-m  3	x	"a\\ b\\\tc"	"a b\tc"	"a b\tc"
-m  4	xP	"a b\\#c"	"ab#c"	"ab#c"
-m  5	xP	"a b\[c d]e"	"ab e"	"ab e"
-m  6	xP	"a b\[c#d]e"	"ab#e"	"ab#e"
-m  7	xP	"a b\[c#d]e"	"abde"	"abde"
-m  8	xSPB	"ab{ d"		"ab\{d"	"ab\{d"
-m  9	xPQ	"ab{ 1 , 2 }c"	"abc"	"abc"
-
-
-
-doing 17 "misc syntax"
-m  1	P	a(?#comment)b	ab	ab
-
-
-
-doing 18 "unmatchable REs"
-f  1	I	a^b		ab
-
-
-
-doing 19 "case independence"
-m  1	&i	ab		Ab	Ab
-m  2	&i	{a[bc]}		aC	aC
-f  3	&i	{a[^bc]}	aB
-m  4	&iM	{a[b-d]}	aC	aC
-f  5	&iM	{a[^b-d]}	aC
-
-
-
-doing 20 "directors and embedded options"
-e  1	&	***?		BADPAT
-m  2	q	***?		***?	***?
-m  3	&P	***=a*b		a*b	a*b
-m  4	q	***=a*b		***=a*b	***=a*b
-m  5	bLP	{***:\w+}	ab	ab
-m  6	eLP	{***:\w+}	ab	ab
-e  7	&	***:***=a*b	BADRPT
-m  8	&P	***:(?b)a+b	a+b	a+b
-m  9	P	(?b)a+b		a+b	a+b
-e 10	e	{(?b)\w+}	BADRPT
-m 11	bAS	{(?b)\w+}	(?b)w+	(?b)w+
-m 12	iP	(?c)a		a	a
-f 13	iP	(?c)a		A
-m 14	APS	{(?e)\W+}	WW	WW
-m 15	P	(?i)a+		Aa	Aa
-f 16	P	"(?m)a.b"	"a\nb"
-m 17	P	"(?m)^b"	"a\nb"	"b"
-f 18	P	"(?n)a.b"	"a\nb"
-m 19	P	"(?n)^b"	"a\nb"	"b"
-f 20	P	"(?p)a.b"	"a\nb"
-f 21	P	"(?p)^b"	"a\nb"
-m 22	P	(?q)a+b		a+b	a+b
-m 23	nP	"(?s)a.b"	"a\nb"	"a\nb"
-m 24	xP	"(?t)a b"	"a b"	"a b"
-m 25	P	"(?w)a.b"	"a\nb"	"a\nb"
-m 26	P	"(?w)^b"	"a\nb"	"b"
-m 27	P	"(?x)a b"	"ab"	"ab"
-e 28	-	(?z)ab		BADOPT
-m 29	P	(?ici)a+	Aa	Aa
-e 30	P	(?i)(?q)a+	BADRPT
-m 31	P	(?q)(?i)a+	(?i)a+	(?i)a+
-m 32	P	(?qe)a+		a	a
-m 33	xP	"(?q)a b"	"a b"	"a b"
-m 34	P	"(?qx)a b"	"a b"	"a b"
-m 35	P	(?qi)ab		Ab	Ab
-
-
-
-doing 21 "capturing"
-m  1	-	a(b)c		abc	abc	b
-m  2	P	a(?:b)c		xabc	abc
-m  3	-	a((b))c		xabcy	abc	b	b
-m  4	P	a(?:(b))c	abcy	abc	b
-m  5	P	a((?:b))c	abc	abc	b
-m  6	P	a(?:(?:b))c	abc	abc
-i  7	Q	"a(b){0}c"	ac	{0 1}	{-1 -1}
-m  8	-	a(b)c(d)e	abcde	abcde	b	d
-m  9	-	(b)c(d)e	bcde	bcde	b	d
-m 10	-	a(b)(d)e	abde	abde	b	d
-m 11	-	a(b)c(d)	abcd	abcd	b	d
-m 12	-	(ab)(cd)	xabcdy	abcd	ab	cd
-m 13	-	a(b)?c		xabcy	abc	b
-i 14	-	a(b)?c		xacy	{1 2}	{-1 -1}
-m 15	-	a(b)?c(d)?e	xabcdey	abcde	b	d
-i 16	-	a(b)?c(d)?e	xacdey	{1 4}	{-1 -1}	{3 3}
-i 17	-	a(b)?c(d)?e	xabcey	{1 4}	{2 2}	{-1 -1}
-i 18	-	a(b)?c(d)?e	xacey	{1 3}	{-1 -1}	{-1 -1}
-m 19	-	a(b)*c		xabcy	abc	b
-i 20	-	a(b)*c		xabbbcy	{1 5}	{4 4}
-i 21	-	a(b)*c		xacy	{1 2}	{-1 -1}
-m 22	-	a(b*)c		xabbbcy	abbbc	bbb
-m 23	-	a(b*)c		xacy	ac	""
-f 24	-	a(b)+c		xacy
-m 25	-	a(b)+c		xabcy	abc	b
-i 26	-	a(b)+c		xabbbcy	{1 5}	{4 4}
-m 27	-	a(b+)c		xabbbcy	abbbc	bbb
-i 28	Q	"a(b){2,3}c"	xabbbcy	{1 5}	{4 4}
-i 29	Q	"a(b){2,3}c"	xabbcy	{1 4}	{3 3}
-f 30	Q	"a(b){2,3}c"	xabcy
-m 31	LP	"\\y(\\w+)\\y"	"-- abc-"	"abc"	"abc"
-m 32	-	a((b|c)d+)+	abacdbd	acdbd	bd	b
-m 33	N	(.*).*		abc	abc	abc
-m 34	N	(a*)*		bc	""	""
-
-
-
-doing 22 "multicharacter collating elements"
-# again ugh
-# currently disabled because the fake MCCE we use for testing is unavailable
-xx m  1	&+L	{a[c]e}		ace	ace
-xx f  2	&+I	{a[c]h}		ach
-xx m  3	&+L	{a[[.ch.]]}	ach	ach
-xx f  4	&+L	{a[[.ch.]]}	ace
-xx m  5	&+L	{a[c[.ch.]]}	ac	ac
-xx m  6	&+L	{a[c[.ch.]]}	ace	ac
-xx m  7	&+L	{a[c[.ch.]]}	ache	ach
-xx f  8	&+L	{a[^c]e}	ace
-xx m  9	&+L	{a[^c]e}	abe	abe
-xx m 10	&+L	{a[^c]e}	ache	ache
-xx f 11	&+L	{a[^[.ch.]]}	ach
-xx m 12	&+L	{a[^[.ch.]]}	ace	ac
-xx m 13	&+L	{a[^[.ch.]]}	ac	ac
-xx m 14	&+L	{a[^[.ch.]]}	abe	ab
-xx f 15	&+L	{a[^c[.ch.]]}	ach
-xx f 16	&+L	{a[^c[.ch.]]}	ace
-xx f 17	&+L	{a[^c[.ch.]]}	ac
-xx m 18	&+L	{a[^c[.ch.]]}	abe	ab
-xx m 19	&+L	{a[^b]}		ac	ac
-xx m 20	&+L	{a[^b]}		ace	ac
-xx m 21	&+L	{a[^b]}		ach	ach
-xx f 22	&+L	{a[^b]}		abe
-
-
-
-doing 23 "lookahead constraints"
-m  1	HP	a(?=b)b*	ab	ab
-f  2	HP	a(?=b)b*	a
-m  3	HP	a(?=b)b*(?=c)c*	abc	abc
-f  4	HP	a(?=b)b*(?=c)c*	ab
-f  5	HP	a(?!b)b*	ab
-m  6	HP	a(?!b)b*	a	a
-m  7	HP	(?=b)b		b	b
-f  8	HP	(?=b)b		a
-
-
-
-doing 24 "non-greedy quantifiers"
-m  1	P	ab+?		abb	ab
-m  2	P	ab+?c		abbc	abbc
-m  3	P	ab*?		abb	a
-m  4	P	ab*?c		abbc	abbc
-m  5	P	ab??		ab	a
-m  6	P	ab??c		abc	abc
-m  7	PQ	"ab{2,4}?"	abbbb	abb
-m  8	PQ	"ab{2,4}?c"	abbbbc	abbbbc
-
-
-
-doing 25 "mixed quantifiers"
-xx to be done, actually
-xx should include |
-
-
-
-doing 26 "tricky cases"
-# attempts to trick the matcher into accepting a short match
-m  1	-	(week|wee)(night|knights)	weeknights	weeknights \
-	wee	knights
-m  2	RP	{a(bc*).*\1}	abccbccb	abccbccb	b
-m  3	-	{a(b.[bc]*)+}	abcbd	abcbd	bd
-
-
-
-doing 27 "implementation misc."
-# duplicate arcs are suppressed
-m  1	P	a(?:b|b)c	abc	abc
-# make color/subcolor relationship go back and forth
-m  2	&	{[ab][ab][ab]}	aba	aba
-m  3	&	{[ab][ab][ab][ab][ab][ab][ab]}	abababa	abababa
-
-
-
-doing 28 "boundary busters etc."
-# color-descriptor allocation changes at 10
-m  1	&	abcdefghijkl	abcdefghijkl	abcdefghijkl
-# so does arc allocation
-m  2	P	a(?:b|c|d|e|f|g|h|i|j|k|l|m)n	agn	agn
-# subexpression tracking also at 10
-m  3	-	a(((((((((((((b)))))))))))))c	abc	abc	b	b	b	b	b	b	b	b	b	b	b	b	b
-# state-set handling changes slightly at unsigned size (might be 64...)
-# (also stresses arc allocation)
-m  4	Q	"ab{1,100}c"	abbc	abbc
-m  5	Q	"ab{1,100}c"	abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc \
-	abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc
-m  6	Q	"ab{1,100}c" \
-	abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc \
-	abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbc
-# force small cache and bust it, several ways
-m  7	LP	{\w+abcdefgh}	xyzabcdefgh	xyzabcdefgh
-m  8	%LP	{\w+abcdefgh}	xyzabcdefgh	xyzabcdefgh
-m  9	%LP	{\w+abcdefghijklmnopqrst}	xyzabcdefghijklmnopqrst \
-	xyzabcdefghijklmnopqrst
-i 10	%LP	{\w+(abcdefgh)?}	xyz	{0 2}	{-1 -1}
-i 11	%LP	{\w+(abcdefgh)?}	xyzabcdefg	{0 9}	{-1 -1}
-i 12	%LP	{\w+(abcdefghijklmnopqrst)?}	xyzabcdefghijklmnopqrs \
-	{0 21}	{-1 -1}
-
-
-
-doing 29 "misc. oddities and old bugs"
-e  1	&	***		BADRPT
-m  2	N	a?b*		abb	abb
-m  3	N	a?b*		bb	bb
-m  4	&	a*b		aab	aab
-m  5	&	^a*b		aaaab aaaab
-m  6	&M	 {[0-6][1-2][0-3][0-6][1-6][0-6]}	010010	010010
-
-
-
-doing 0 "flush"			;# to flush any leftover complaints
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
diff --git a/tests/regexp.test b/tests/regexp.test
deleted file mode 100644
index 611a780..0000000
--- a/tests/regexp.test
+++ /dev/null
@@ -1,378 +0,0 @@
-# Commands covered:  regexp, regsub
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1998 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: regexp.test,v 1.3 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset foo}
-test regexp-1.1 {basic regexp operation} {
-    regexp ab*c abbbc
-} 1
-test regexp-1.2 {basic regexp operation} {
-    regexp ab*c ac
-} 1
-test regexp-1.3 {basic regexp operation} {
-    regexp ab*c ab
-} 0
-test regexp-1.4 {basic regexp operation} {
-    regexp -- -gorp abc-gorpxxx
-} 1
-test regexp-1.5 {basic regexp operation} {
-    regexp {^([^ ]*)[ ]*([^ ]*)} "" a
-} 1
-test regexp-1.6 {basic regexp operation} {
-    list [catch {regexp {} abc} msg] $msg
-} {0 1}
-test regexp-1.7 {regexp utf compliance} {
-    # if not UTF-8 aware, result is "0 1"
-    set foo "\u4e4eb q"
-    regexp "\u4e4eb q" "a\u4e4eb qw\u5e4e\x4e wq" bar
-    list [string compare $foo $bar] [regexp 4 $bar]
-} {0 0}
-
-test regexp-2.1 {getting substrings back from regexp} {
-    set foo {}
-    list [regexp ab*c abbbbc foo] $foo
-} {1 abbbbc}
-test regexp-2.2 {getting substrings back from regexp} {
-    set foo {}
-    set f2 {}
-    list [regexp a(b*)c abbbbc foo f2] $foo $f2
-} {1 abbbbc bbbb}
-test regexp-2.3 {getting substrings back from regexp} {
-    set foo {}
-    set f2 {}
-    list [regexp a(b*)(c) abbbbc foo f2] $foo $f2
-} {1 abbbbc bbbb}
-test regexp-2.4 {getting substrings back from regexp} {
-    set foo {}
-    set f2 {}
-    set f3 {}
-    list [regexp a(b*)(c) abbbbc foo f2 f3] $foo $f2 $f3
-} {1 abbbbc bbbb c}
-test regexp-2.5 {getting substrings back from regexp} {
-    set foo {}; set f1 {}; set f2 {}; set f3 {}; set f4 {}; set f5 {};
-    set f6 {}; set f7 {}; set f8 {}; set f9 {}; set fa {}; set fb {};
-    list [regexp (1*)(2*)(3*)(4*)(5*)(6*)(7*)(8*)(9*)(a*)(b*) \
-	      12223345556789999aabbb \
-	    foo f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb] $foo $f1 $f2 $f3 $f4 $f5 \
-	    $f6 $f7 $f8 $f9 $fa $fb
-} {1 12223345556789999aabbb 1 222 33 4 555 6 7 8 9999 aa bbb}
-test regexp-2.6 {getting substrings back from regexp} {
-    set foo 2; set f2 2; set f3 2; set f4 2
-    list [regexp (a)(b)? xay foo f2 f3 f4] $foo $f2 $f3 $f4
-} {1 a a {} {}}
-test regexp-2.7 {getting substrings back from regexp} {
-    set foo 1; set f2 1; set f3 1; set f4 1
-    list [regexp (a)(b)?(c) xacy foo f2 f3 f4] $foo $f2 $f3 $f4
-} {1 ac a {} c}
-test regexp-2.8 {getting substrings back from regexp} {
-    set match {}
-    list [regexp {^a*b} aaaab match] $match
-} {1 aaaab}
-
-test regexp-3.1 {-indices option to regexp} {
-    set foo {}
-    list [regexp -indices ab*c abbbbc foo] $foo
-} {1 {0 5}}
-test regexp-3.2 {-indices option to regexp} {
-    set foo {}
-    set f2 {}
-    list [regexp -indices a(b*)c abbbbc foo f2] $foo $f2
-} {1 {0 5} {1 4}}
-test regexp-3.3 {-indices option to regexp} {
-    set foo {}
-    set f2 {}
-    list [regexp -indices a(b*)(c) abbbbc foo f2] $foo $f2
-} {1 {0 5} {1 4}}
-test regexp-3.4 {-indices option to regexp} {
-    set foo {}
-    set f2 {}
-    set f3 {}
-    list [regexp -indices a(b*)(c) abbbbc foo f2 f3] $foo $f2 $f3
-} {1 {0 5} {1 4} {5 5}}
-test regexp-3.5 {-indices option to regexp} {
-    set foo {}; set f1 {}; set f2 {}; set f3 {}; set f4 {}; set f5 {};
-    set f6 {}; set f7 {}; set f8 {}; set f9 {}
-    list [regexp -indices (1*)(2*)(3*)(4*)(5*)(6*)(7*)(8*)(9*) \
-	    12223345556789999 \
-	    foo f1 f2 f3 f4 f5 f6 f7 f8 f9] $foo $f1 $f2 $f3 $f4 $f5 \
-	    $f6 $f7 $f8 $f9
-} {1 {0 16} {0 0} {1 3} {4 5} {6 6} {7 9} {10 10} {11 11} {12 12} {13 16}}
-test regexp-3.6 {getting substrings back from regexp} {
-    set foo 2; set f2 2; set f3 2; set f4 2
-    list [regexp -indices (a)(b)? xay foo f2 f3 f4] $foo $f2 $f3 $f4
-} {1 {1 1} {1 1} {-1 -1} {-1 -1}}
-test regexp-3.7 {getting substrings back from regexp} {
-    set foo 1; set f2 1; set f3 1; set f4 1
-    list [regexp -indices (a)(b)?(c) xacy foo f2 f3 f4] $foo $f2 $f3 $f4
-} {1 {1 2} {1 1} {-1 -1} {2 2}}
-
-test regexp-4.1 {-nocase option to regexp} {
-    regexp -nocase foo abcFOo
-} 1
-test regexp-4.2 {-nocase option to regexp} {
-    set f1 22
-    set f2 33
-    set f3 44
-    list [regexp -nocase {a(b*)([xy]*)z} aBbbxYXxxZ22 f1 f2 f3] $f1 $f2 $f3
-} {1 aBbbxYXxxZ Bbb xYXxx}
-test regexp-4.3 {-nocase option to regexp} {
-    regexp -nocase FOo abcFOo
-} 1
-set x abcdefghijklmnopqrstuvwxyz1234567890
-set x $x$x$x$x$x$x$x$x$x$x$x$x
-test regexp-4.4 {case conversion in regexp} {
-    list [regexp -nocase $x $x foo] $foo
-} "1 $x"
-catch {unset x}
-
-test regexp-5.1 {exercise cache of compiled expressions} {
-    regexp .*a b
-    regexp .*b c
-    regexp .*c d
-    regexp .*d e
-    regexp .*e f
-    regexp .*a bbba
-} 1
-test regexp-5.2 {exercise cache of compiled expressions} {
-    regexp .*a b
-    regexp .*b c
-    regexp .*c d
-    regexp .*d e
-    regexp .*e f
-    regexp .*b xxxb
-} 1
-test regexp-5.3 {exercise cache of compiled expressions} {
-    regexp .*a b
-    regexp .*b c
-    regexp .*c d
-    regexp .*d e
-    regexp .*e f
-    regexp .*c yyyc
-} 1
-test regexp-5.4 {exercise cache of compiled expressions} {
-    regexp .*a b
-    regexp .*b c
-    regexp .*c d
-    regexp .*d e
-    regexp .*e f
-    regexp .*d 1d
-} 1
-test regexp-5.5 {exercise cache of compiled expressions} {
-    regexp .*a b
-    regexp .*b c
-    regexp .*c d
-    regexp .*d e
-    regexp .*e f
-    regexp .*e xe
-} 1
-
-test regexp-6.1 {regexp errors} {
-    list [catch {regexp a} msg] $msg
-} {1 {wrong # args: should be "regexp ?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?"}}
-test regexp-6.2 {regexp errors} {
-    list [catch {regexp -nocase a} msg] $msg
-} {1 {wrong # args: should be "regexp ?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?"}}
-test regexp-6.3 {regexp errors} {
-    list [catch {regexp -gorp a} msg] $msg
-} {1 {bad switch "-gorp": must be -indices, -nocase, -about, -expanded, -line, -linestop, -lineanchor, or --}}
-test regexp-6.4 {regexp errors} {
-    list [catch {regexp a( b} msg] $msg
-} {1 {couldn't compile regular expression pattern: parentheses () not balanced}}
-test regexp-6.5 {regexp errors} {
-    list [catch {regexp a( b} msg] $msg
-} {1 {couldn't compile regular expression pattern: parentheses () not balanced}}
-test regexp-6.6 {regexp errors} {
-    list [catch {regexp a a f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1 f1} msg] $msg
-} {0 1}
-test regexp-6.7 {regexp errors} {
-    list [catch {regexp (x)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.) xyzzy} msg] $msg
-} {0 0}
-test regexp-6.8 {regexp errors} {
-    catch {unset f1}
-    set f1 44
-    list [catch {regexp abc abc f1(f2)} msg] $msg
-} {1 {couldn't set variable "f1(f2)"}}
-
-test regexp-7.1 {basic regsub operation} {
-    list [regsub aa+ xaxaaaxaa 111&222 foo] $foo
-} {1 xax111aaa222xaa}
-test regexp-7.2 {basic regsub operation} {
-    list [regsub aa+ aaaxaa &111 foo] $foo
-} {1 aaa111xaa}
-test regexp-7.3 {basic regsub operation} {
-    list [regsub aa+ xaxaaa 111& foo] $foo
-} {1 xax111aaa}
-test regexp-7.4 {basic regsub operation} {
-    list [regsub aa+ aaa 11&2&333 foo] $foo
-} {1 11aaa2aaa333}
-test regexp-7.5 {basic regsub operation} {
-    list [regsub aa+ xaxaaaxaa &2&333 foo] $foo
-} {1 xaxaaa2aaa333xaa}
-test regexp-7.6 {basic regsub operation} {
-    list [regsub aa+ xaxaaaxaa 1&22& foo] $foo
-} {1 xax1aaa22aaaxaa}
-test regexp-7.7 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {1\122\1} foo] $foo
-} {1 xax1aa22aaxaa}
-test regexp-7.8 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {1\\\122\1} foo] $foo
-} "1 {xax1\\aa22aaxaa}"
-test regexp-7.9 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {1\\122\1} foo] $foo
-} "1 {xax1\\122aaxaa}"
-test regexp-7.10 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {1\\&\1} foo] $foo
-} "1 {xax1\\aaaaaxaa}"
-test regexp-7.11 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {1\&\1} foo] $foo
-} {1 xax1&aaxaa}
-test regexp-7.12 {basic regsub operation} {
-    list [regsub a(a+) xaxaaaxaa {\1\1\1\1&&} foo] $foo
-} {1 xaxaaaaaaaaaaaaaaxaa}
-test regexp-7.13 {basic regsub operation} {
-    set foo xxx
-    list [regsub abc xyz 111 foo] $foo
-} {0 xyz}
-test regexp-7.14 {basic regsub operation} {
-    set foo xxx
-    list [regsub ^ xyz "111 " foo] $foo
-} {1 {111 xyz}}
-test regexp-7.15 {basic regsub operation} {
-    set foo xxx
-    list [regsub -- -foo abc-foodef "111 " foo] $foo
-} {1 {abc111 def}}
-test regexp-7.16 {basic regsub operation} {
-    set foo xxx
-    list [regsub x "" y foo] $foo
-} {0 {}}
-test regexp-7.17 {regsub utf compliance} {
-    # if not UTF-8 aware, result is "0 1"
-    set foo "xyz555ijka\u4e4ebpqr"
-    regsub a\u4e4eb xyza\u4e4ebijka\u4e4ebpqr 555 bar
-    list [string compare $foo $bar] [regexp 4 $bar]
-} {0 0}
-
-test regexp-8.1 {case conversion in regsub} {
-    list [regsub -nocase a(a+) xaAAaAAay & foo] $foo
-} {1 xaAAaAAay}
-test regexp-8.2 {case conversion in regsub} {
-    list [regsub -nocase a(a+) xaAAaAAay & foo] $foo
-} {1 xaAAaAAay}
-test regexp-8.3 {case conversion in regsub} {
-    set foo 123
-    list [regsub a(a+) xaAAaAAay & foo] $foo
-} {0 xaAAaAAay}
-test regexp-8.4 {case conversion in regsub} {
-    set foo 123
-    list [regsub -nocase a CaDE b foo] $foo
-} {1 CbDE}
-test regexp-8.5 {case conversion in regsub} {
-    set foo 123
-    list [regsub -nocase XYZ CxYzD b foo] $foo
-} {1 CbD}
-test regexp-8.6 {case conversion in regsub} {
-    set x abcdefghijklmnopqrstuvwxyz1234567890
-    set x $x$x$x$x$x$x$x$x$x$x$x$x
-    set foo 123
-    list [regsub -nocase $x $x b foo] $foo
-} {1 b}
-
-test regexp-9.1 {-all option to regsub} {
-    set foo 86
-    list [regsub -all x+ axxxbxxcxdx |&| foo] $foo
-} {4 a|xxx|b|xx|c|x|d|x|}
-test regexp-9.2 {-all option to regsub} {
-    set foo 86
-    list [regsub -nocase -all x+ aXxXbxxcXdx |&| foo] $foo
-} {4 a|XxX|b|xx|c|X|d|x|}
-test regexp-9.3 {-all option to regsub} {
-    set foo 86
-    list [regsub x+ axxxbxxcxdx |&| foo] $foo
-} {1 a|xxx|bxxcxdx}
-test regexp-9.4 {-all option to regsub} {
-    set foo 86
-    list [regsub -all bc axxxbxxcxdx |&| foo] $foo
-} {0 axxxbxxcxdx}
-test regexp-9.5 {-all option to regsub} {
-    set foo xxx
-    list [regsub -all node "node node more" yy foo] $foo
-} {2 {yy yy more}}
-test regexp-9.6 {-all option to regsub} {
-    set foo xxx
-    list [regsub -all ^ xxx 123 foo] $foo
-} {1 123xxx}
-
-test regexp-10.1 {regsub errors} {
-    list [catch {regsub a b c} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec varName"}}
-test regexp-10.2 {regsub errors} {
-    list [catch {regsub -nocase a b c} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec varName"}}
-test regexp-10.3 {regsub errors} {
-    list [catch {regsub -nocase -all a b c} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec varName"}}
-test regexp-10.4 {regsub errors} {
-    list [catch {regsub a b c d e f} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec varName"}}
-test regexp-10.5 {regsub errors} {
-    list [catch {regsub -gorp a b c} msg] $msg
-} {1 {bad switch "-gorp": must be -all, -nocase, or --}}
-test regexp-10.6 {regsub errors} {
-    list [catch {regsub -nocase a( b c d} msg] $msg
-} {1 {couldn't compile regular expression pattern: parentheses () not balanced}}
-test regexp-10.7 {regsub errors} {
-    catch {unset f1}
-    set f1 44
-    list [catch {regsub -nocase aaa aaa xxx f1(f2)} msg] $msg
-} {1 {couldn't set variable "f1(f2)"}}
-
-test regexp-11.1 {Tcl_RegExpExec: large number of subexpressions} {
-    list [regexp (.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.) abcdefghijklmnopqrstuvwxyz all a b c d e f g h i j k l m n o p q r s t u v w x y z] $all $a $b $c $d $e $f $g $h $i $j $k $l $m $n $o $p $q $r $s $t $u $v $w $x $y $z
-} {1 abcdefghijklmnopqrstuvwxyz a b c d e f g h i j k l m n o p q r s t u v w x y z}
-
-test regexp-12.1 {regsub of a very large string} {
-    # This test is designed to stress the memory subsystem in order
-    # to catch Bug #933.  It only fails if the Tcl memory allocator
-    # is in use.
-
-    set line {BEGIN_TABLE ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; END_TABLE}
-    set filedata ""
-    for {set i 1} {$i<200} {incr i} {
-	append filedata $line
-    }
-    for {set i 1} {$i<10} {incr i} {
-	regsub -all "BEGIN_TABLE " $filedata "" newfiledata
-    }
-    set x done
-} {done}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/registry.test b/tests/registry.test
deleted file mode 100644
index 773f964..0000000
--- a/tests/registry.test
+++ /dev/null
@@ -1,601 +0,0 @@
-# registry.test --
-#
-# This file contains a collection of tests for the registry command.
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# In order for these tests to run, the registry package must be on the
-# auto_path or the registry package must have been loaded already.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.  All rights reserved.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# RCS: @(#) $Id: registry.test,v 1.5 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {$tcl_platform(platform) == "windows"} {
-    if [catch {
-	set lib [lindex [glob [file join [pwd] [file dirname \
-		[info nameofexecutable]] tclreg*.dll]] 0]
-	load $lib registry
-    }] {
-	puts "Unable to find the registry package. Skipping registry tests."
-	return
-    }
-}
-
-# determine the current locale
-set old [testlocale all]
-if {![string compare [testlocale all ""] "English_United States.1252"]} {
-	# error messages from registry package are already localized.
-    set ::tcltest::testConfig(english) 1
-}
-testlocale all $old
-unset old
-
-set hostname [info hostname]
-
-test registry-1.1 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry} msg] $msg
-} {1 {wrong # args: should be "registry option ?arg arg ...?"}}
-test registry-1.2 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry foo} msg] $msg
-} {1 {bad option "foo": must be delete, get, keys, set, type, or values}}
-
-test registry-1.3 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry d} msg] $msg
-} {1 {wrong # args: should be "registry delete keyName ?valueName?"}}
-test registry-1.4 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry delete} msg] $msg
-} {1 {wrong # args: should be "registry delete keyName ?valueName?"}}
-test registry-1.5 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry delete foo bar baz} msg] $msg
-} {1 {wrong # args: should be "registry delete keyName ?valueName?"}}
-
-test registry-1.6 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry g} msg] $msg
-} {1 {wrong # args: should be "registry get keyName valueName"}}
-test registry-1.7 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry get} msg] $msg
-} {1 {wrong # args: should be "registry get keyName valueName"}}
-test registry-1.8 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry get foo} msg] $msg
-} {1 {wrong # args: should be "registry get keyName valueName"}}
-test registry-1.9 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry get foo bar baz} msg] $msg
-} {1 {wrong # args: should be "registry get keyName valueName"}}
-
-test registry-1.10 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry k} msg] $msg
-} {1 {wrong # args: should be "registry keys keyName ?pattern?"}}
-test registry-1.11 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry keys} msg] $msg
-} {1 {wrong # args: should be "registry keys keyName ?pattern?"}}
-test registry-1.12 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry keys foo bar baz} msg] $msg
-} {1 {wrong # args: should be "registry keys keyName ?pattern?"}}
-
-test registry-1.13 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry s} msg] $msg
-} {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}}
-test registry-1.14 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry set} msg] $msg
-} {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}}
-test registry-1.15 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry set foo bar} msg] $msg
-} {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}}
-test registry-1.16 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry set foo bar baz blat gorp} msg] $msg
-} {1 {wrong # args: should be "registry set keyName ?valueName data ?type??"}}
-
-test registry-1.17 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry t} msg] $msg
-} {1 {wrong # args: should be "registry type keyName valueName"}}
-test registry-1.18 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry type} msg] $msg
-} {1 {wrong # args: should be "registry type keyName valueName"}}
-test registry-1.19 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry type foo} msg] $msg
-} {1 {wrong # args: should be "registry type keyName valueName"}}
-test registry-1.20 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry type foo bar baz} msg] $msg
-} {1 {wrong # args: should be "registry type keyName valueName"}}
-
-test registry-1.21 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry v} msg] $msg
-} {1 {wrong # args: should be "registry values keyName ?pattern?"}}
-test registry-1.22 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry values} msg] $msg
-} {1 {wrong # args: should be "registry values keyName ?pattern?"}}
-test registry-1.23 {argument parsing for registry command} {pcOnly} {
-    list [catch {registry values foo bar baz} msg] $msg
-} {1 {wrong # args: should be "registry values keyName ?pattern?"}}
-
-test registry-2.1 {DeleteKey: bad key} {pcOnly} {
-    list [catch {registry delete foo} msg] $msg
-} {1 {bad root name "foo": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-2.2 {DeleteKey: bad key} {pcOnly} {
-    list [catch {registry delete HKEY_CLASSES_ROOT} msg] $msg
-} {1 {bad key: cannot delete root keys}}
-test registry-2.3 {DeleteKey: bad key} {pcOnly} {
-    list [catch {registry delete HKEY_CLASSES_ROOT\\} msg] $msg
-} {1 {bad key: cannot delete root keys}}
-test registry-2.4 {DeleteKey: subkey at root level} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry keys HKEY_CLASSES_ROOT TclFoobar
-} {}
-test registry-2.5 {DeleteKey: subkey below root level} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar\\test
-    set result [registry keys HKEY_CLASSES_ROOT TclFoobar\\test]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-test registry-2.6 {DeleteKey: recursive delete} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result [registry keys HKEY_CLASSES_ROOT TclFoobar]
-    set result
-} {}
-test registry-2.7 {DeleteKey: trailing backslashes} {pcOnly english} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz
-    list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar\\} msg] $msg
-} {1 {unable to delete key: The configuration registry key is invalid.}}
-test registry-2.8 {DeleteKey: failure} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-} {}
-test registry-2.9 {DeleteKey: unicode} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test\u00c7bar\\a
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test\u00c7bar\\b
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar\\test\u00c7bar
-    set result [registry keys HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-
-test registry-3.1 {DeleteValue} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test1 blort
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test2 blat
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar\\baz test1
-    set result [registry values HKEY_CLASSES_ROOT\\TclFoobar\\baz]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} test2
-test registry-3.2 {DeleteValue: bad key} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar test} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-test registry-3.3 {DeleteValue: bad value} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz test2 blort
-    set result [list [catch {registry delete HKEY_CLASSES_ROOT\\TclFoobar test1} msg] $msg]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {1 {unable to delete value "test1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}}
-test registry-3.4 {DeleteValue: Unicode} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz \u00c7test1 blort
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz test2 blat
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz \u00c7test1
-    set result [registry values HKEY_CLASSES_ROOT\\TclFoobar\\\u00c7baz]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} test2
-
-test registry-4.1 {GetKeyNames: bad key} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-test registry-4.2 {GetKeyNames} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz
-    set result [registry keys HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {baz}
-test registry-4.3 {GetKeyNames: remote key} {pcOnly nonPortable english} {
-    registry set \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar\\baz
-    set result [registry keys \\\\gaspode\\HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {baz}
-test registry-4.4 {GetKeyNames: empty key} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    set result [registry keys HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-test registry-4.5 {GetKeyNames: patterns} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\foo
-    set result [lsort [registry keys HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {baz blat}
-test registry-4.6 {GetKeyNames: names with spaces} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\ bar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\foo
-    set result [lsort [registry keys HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {{baz bar} blat}
-test registry-4.7 {GetKeyNames: Unicode} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\u00c7bar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\foo
-    set result [lsort [registry keys HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} "baz\u00c7bar blat"
-test registry-4.8 {GetKeyNames: Unicode} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz\u30b7bar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\blat
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\foo
-    set result [lsort [registry keys HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} "baz\u30b7bar blat"
-
-test registry-5.1 {GetType} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry type HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-test registry-5.2 {GetType} {pcOnly english} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry type HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg
-} {1 {unable to get type of value "val1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}}
-test registry-5.3 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar none
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} none
-test registry-5.4 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} sz
-test registry-5.5 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar sz
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} sz
-test registry-5.6 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar expand_sz
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} expand_sz
-test registry-5.7 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 binary
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} binary
-test registry-5.8 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 dword
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} dword
-test registry-5.9 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 dword_big_endian
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} dword_big_endian
-test registry-5.10 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 link
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} link
-test registry-5.11 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar multi_sz
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} multi_sz
-test registry-5.12 {GetType} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 resource_list
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} resource_list
-test registry-5.13 {GetType: unknown types} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 24
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 24
-test registry-5.14 {GetType: Unicode} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar va\u00c7l1 1 24
-    set result [registry type HKEY_CLASSES_ROOT\\TclFoobar va\u00c7l1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 24
-
-test registry-6.1 {GetValue} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry get HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-test registry-6.2 {GetValue} {pcOnly english} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry get HKEY_CLASSES_ROOT\\TclFoobar val1} msg] $msg
-} {1 {unable to get value "val1" from key "HKEY_CLASSES_ROOT\TclFoobar": The system cannot find the file specified.}}
-test registry-6.3 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar none
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.4 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.5 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.6 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar expand_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.7 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 binary
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 1
-test registry-6.8 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 0x20 dword
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 32
-test registry-6.9 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 0x20 dword_big_endian
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 32
-test registry-6.10 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 link
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 1
-test registry-6.11 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 foobar multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.12 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo\ bar baz} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {{foo bar} baz}
-test registry-6.13 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-test registry-6.14 {GetValue: truncation of multivalues with null elements} \
-	{pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {a {} b} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} a
-test registry-6.15 {GetValue} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 resource_list
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 1
-test registry-6.16 {GetValue: unknown types} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 1 24
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} 1
-test registry-6.17 {GetValue: Unicode value names} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val\u00c71 foobar multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val\u00c71]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} foobar
-test registry-6.18 {GetValue: values with Unicode strings} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u30b7r baz} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} "foo ba\u30b7r baz"
-test registry-6.19 {GetValue: values with Unicode strings} {pcOnly english} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u00c7r baz} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} "foo ba\u00c7r baz"
-test registry-6.20 {GetValue: values with Unicode strings with embedded nulls} {pcOnly} {
-    registry set HKEY_CLASSES_ROOT\\TclFoobar val1 {foo ba\u0000r baz} multi_sz
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar val1]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} "foo ba r baz"
-
-test registry-7.1 {GetValueNames: bad key} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry values HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-test registry-7.2 {GetValueNames} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar
-    set result [registry values HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} baz
-test registry-7.3 {GetValueNames} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2
-    registry set HKEY_CLASSES_ROOT\\TclFoobar {} foobar3
-    set result [lsort [registry values HKEY_CLASSES_ROOT\\TclFoobar]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {{} baz blat}
-test registry-7.4 {GetValueNames: remote key} {pcOnly nonPortable english} {
-    registry set \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar baz blat
-    set result [registry values \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete \\\\$hostname\\HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} baz
-test registry-7.5 {GetValueNames: empty key} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    set result [registry values HKEY_CLASSES_ROOT\\TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-test registry-7.6 {GetValueNames: patterns} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar baz foobar1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2
-    registry set HKEY_CLASSES_ROOT\\TclFoobar foo foobar3
-    set result [lsort [registry values HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {baz blat}
-test registry-7.7 {GetValueNames: names with spaces} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar baz\ bar foobar1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar blat foobar2
-    registry set HKEY_CLASSES_ROOT\\TclFoobar foo foobar3
-    set result [lsort [registry values HKEY_CLASSES_ROOT\\TclFoobar b*]]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {{baz bar} blat}
-
-test registry-8.1 {OpenSubKey} {pcOnly nonPortable english} {
-    # This test will only succeed if the current user does not have registry
-    # access on the specified machine.
-    list [catch {registry keys {\\mom\HKEY_LOCAL_MACHINE}} msg] $msg
-} {1 {unable to open key: Access is denied.}}
-test registry-8.2 {OpenSubKey} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar
-    set result [registry keys HKEY_CLASSES_ROOT TclFoobar]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} TclFoobar
-test registry-8.3 {OpenSubKey} {pcOnly english} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-
-test registry-9.1 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values \\} msg] $msg
-} "1 {bad key \"\\\": must start with a valid root}"
-test registry-9.2 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values \\foobar} msg] $msg
-} {1 {bad key "\foobar": must start with a valid root}}
-test registry-9.3 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values \\\\} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-9.4 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values \\\\\\} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-9.5 {ParseKeyName: bad keys} {pcOnly english} {
-    list [catch {registry values \\\\\\HKEY_CLASSES_ROOT} msg] $msg
-} {1 {unable to open key: The network address is invalid.}}
-test registry-9.6 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values \\\\gaspode} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-9.7 {ParseKeyName: bad keys} {pcOnly} {
-    list [catch {registry values foobar} msg] $msg
-} {1 {bad root name "foobar": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
-test registry-9.8 {ParseKeyName: null keys} {pcOnly} {
-    list [catch {registry delete HKEY_CLASSES_ROOT\\} msg] $msg
-} {1 {bad key: cannot delete root keys}}
-test registry-9.9 {ParseKeyName: null keys} {pcOnly english} {
-    list [catch {registry keys HKEY_CLASSES_ROOT\\TclFoobar\\baz} msg] $msg
-} {1 {unable to open key: The system cannot find the file specified.}}
-
-test registry-10.1 {RecursiveDeleteKey} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result [registry keys HKEY_CLASSES_ROOT TclFoobar]
-    set result
-} {}
-test registry-10.2 {RecursiveDeleteKey} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test1
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test3
-    set result [registry delete HKEY_CLASSES_ROOT\\TclFoobar\\test2\\test4]
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    set result
-} {}
-
-test registry-11.1 {SetValue: recursive creation} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat foobar
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar\\baz blat]
-} foobar
-test registry-11.2 {SetValue: modification} {pcOnly} {
-    registry delete HKEY_CLASSES_ROOT\\TclFoobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat foobar
-    registry set HKEY_CLASSES_ROOT\\TclFoobar\\baz blat frob
-    set result [registry get HKEY_CLASSES_ROOT\\TclFoobar\\baz blat]
-} frob
-test registry-11.3 {SetValue: failure} {pcOnly nonPortable english} {
-    # This test will only succeed if the current user does not have registry
-    # access on the specified machine.
-    list [catch {registry set {\\mom\HKEY_CLASSES_ROOT\TclFoobar} bar foobar} msg] $msg
-} {1 {unable to open key: Access is denied.}}
-
-
-# cleanup
-unset hostname
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/remote.tcl b/tests/remote.tcl
deleted file mode 100644
index 005f2df..0000000
--- a/tests/remote.tcl
+++ /dev/null
@@ -1,172 +0,0 @@
-# This file contains Tcl code to implement a remote server that can be
-# used during testing of Tcl socket code. This server is used by some
-# of the tests in socket.test.
-#
-# Source this file in the remote server you are using to test Tcl against.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: remote.tcl,v 1.3 1999/04/16 00:47:33 stanton Exp $
-
-# Initialize message delimitor
-
-# Initialize command array
-catch {unset command}
-set command(0) ""
-set callerSocket ""
-
-# Detect whether we should print out connection messages etc.
-if {![info exists VERBOSE]} {
-    set VERBOSE 0
-}
-
-proc __doCommands__ {l s} {
-    global callerSocket VERBOSE
-
-    if {$VERBOSE} {
-	puts "--- Server executing the following for socket $s:"
-	puts $l
-	puts "---"
-    }
-    set callerSocket $s
-    if {[catch {uplevel #0 $l} msg]} {
-	list error $msg
-    } else {
-	list success $msg
-    }
-}
-
-proc __readAndExecute__ {s} {
-    global command VERBOSE
-
-    set l [gets $s]
-    if {[string compare $l "--Marker--Marker--Marker--"] == 0} {
-	if {[info exists command($s)]} {
-	    puts $s [list error incomplete_command]
-	}
-	puts $s "--Marker--Marker--Marker--"
-	return
-    }
-    if {[string compare $l ""] == 0} {
-	if {[eof $s]} {
-	    if {$VERBOSE} {
-		puts "Server closing $s, eof from client"
-	    }
-	    close $s
-	}
-	return
-    }
-    append command($s) $l "\n"
-    if {[info complete $command($s)]} {
-	set cmds $command($s)
-	unset command($s)
-	puts $s [__doCommands__ $cmds $s]
-    }
-    if {[eof $s]} {
-	if {$VERBOSE} {
-	    puts "Server closing $s, eof from client"
-	}
-	close $s
-    }
-}
-
-proc __accept__ {s a p} {
-    global VERBOSE
-
-    if {$VERBOSE} {
-	puts "Server accepts new connection from $a:$p on $s"
-    }
-    fileevent $s readable [list __readAndExecute__ $s]
-    fconfigure $s -buffering line -translation crlf
-}
-
-set serverIsSilent 0
-for {set i 0} {$i < $argc} {incr i} {
-    if {[string compare -serverIsSilent [lindex $argv $i]] == 0} {
-	set serverIsSilent 1
-	break
-    }
-}
-if {![info exists serverPort]} {
-    if {[info exists env(serverPort)]} {
-	set serverPort $env(serverPort)
-    }
-}
-if {![info exists serverPort]} {
-    for {set i 0} {$i < $argc} {incr i} {
-	if {[string compare -port [lindex $argv $i]] == 0} {
-	    if {$i < [expr $argc - 1]} {
-		set serverPort [lindex $argv [expr $i + 1]]
-	    }
-	    break
-	}
-    }
-}
-if {![info exists serverPort]} {
-    set serverPort 2048
-}
-
-if {![info exists serverAddress]} {
-    if {[info exists env(serverAddress)]} {
-	set serverAddress $env(serverAddress)
-    }
-}
-if {![info exists serverAddress]} {
-    for {set i 0} {$i < $argc} {incr i} {
-	if {[string compare -address [lindex $argv $i]] == 0} {
-	    if {$i < [expr $argc - 1]} {
-		set serverAddress [lindex $argv [expr $i + 1]]
-	    }
-	    break
-	}
-    }
-}
-if {![info exists serverAddress]} {
-    set serverAddress 0.0.0.0
-}
-
-if {$serverIsSilent == 0} {
-    set l "Remote server listening on port $serverPort, IP $serverAddress."
-    puts ""
-    puts $l
-    for {set c [string length $l]} {$c > 0} {incr c -1} {puts -nonewline "-"}
-    puts ""
-    puts ""
-    puts "You have set the Tcl variables serverAddress to $serverAddress and"
-    puts "serverPort to $serverPort. You can set these with the -address and"
-    puts "-port command line options, or as environment variables in your"
-    puts "shell."
-    puts ""
-    puts "NOTE: The tests will not work properly if serverAddress is set to"
-    puts "\"localhost\" or 127.0.0.1."
-    puts ""
-    puts "When you invoke tcltest to run the tests, set the variables"
-    puts "remoteServerPort to $serverPort and remoteServerIP to"
-    puts "[info hostname]. You can set these as environment variables"
-    puts "from the shell. The tests will not work properly if you set"
-    puts "remoteServerIP to \"localhost\" or 127.0.0.1."
-    puts ""
-    puts -nonewline "Type Ctrl-C to terminate--> "
-    flush stdout
-}
-
-if {[catch {set serverSocket \
-	[socket -myaddr $serverAddress -server __accept__ $serverPort]} msg]} {
-    puts "Server on $serverAddress:$serverPort cannot start: $msg"
-} else {
-    vwait __server_wait_variable__
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/rename.test b/tests/rename.test
deleted file mode 100644
index 14cdf05..0000000
--- a/tests/rename.test
+++ /dev/null
@@ -1,186 +0,0 @@
-# Commands covered:  rename
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: rename.test,v 1.3 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Must eliminate the "unknown" command while the test is running,
-# especially if the test is being run in a program with its
-# own special-purpose unknown command.
-
-catch {rename unknown unknown.old}
-
-catch {rename r2 {}}
-proc r1 {} {return "procedure r1"}
-rename r1 r2
-test rename-1.1 {simple renaming} {
-    r2
-} {procedure r1}
-test rename-1.2 {simple renaming} {
-    list [catch r1 msg] $msg
-} {1 {invalid command name "r1"}}
-rename r2 {}
-test rename-1.3 {simple renaming} {
-    list [catch r2 msg] $msg
-} {1 {invalid command name "r2"}}
-
-# The test below is tricky because it renames a built-in command.
-# It's possible that the test procedure uses this command, so must
-# restore the command before calling test again.
-
-rename list l.new
-set a [catch list msg1]
-set b [l.new a b c]
-rename l.new list
-set c [catch l.new msg2]
-set d [list 111 222]
-test rename-2.1 {renaming built-in command} {
-    list $a $msg1 $b $c $msg2 $d
-} {1 {invalid command name "list"} {a b c} 1 {invalid command name "l.new"} {111 222}}
-
-test rename-3.1 {error conditions} {
-    list [catch {rename r1} msg] $msg $errorCode
-} {1 {wrong # args: should be "rename oldName newName"} NONE}
-test rename-3.2 {error conditions} {
-    list [catch {rename r1 r2 r3} msg] $msg $errorCode
-} {1 {wrong # args: should be "rename oldName newName"} NONE}
-test rename-3.3 {error conditions} {
-    proc r1 {} {}
-    proc r2 {} {}
-    list [catch {rename r1 r2} msg] $msg
-} {1 {can't rename to "r2": command already exists}}
-test rename-3.4 {error conditions} {
-    catch {rename r1 {}}
-    catch {rename r2 {}}
-    list [catch {rename r1 r2} msg] $msg
-} {1 {can't rename "r1": command doesn't exist}}
-test rename-3.5 {error conditions} {
-    catch {rename _non_existent_command {}}
-    list [catch {rename _non_existent_command {}} msg] $msg
-} {1 {can't delete "_non_existent_command": command doesn't exist}}
-
-catch {rename unknown {}}
-catch {rename unknown.old unknown}
-
-if {[info command testdel] == "testdel"} {
-    test rename-4.1 {reentrancy issues with command deletion and renaming} {
-	set x {}
-	testdel {} foo {lappend x deleted; rename bar {}; lappend x [info command bar]}
-	rename foo bar
-	lappend x |
-	rename bar {}
-	set x
-    } {| deleted {}}
-    test rename-4.2 {reentrancy issues with command deletion and renaming} {
-	set x {}
-	testdel {} foo {lappend x deleted; rename foo bar}
-	rename foo {}
-	set x
-    } {deleted}
-    test rename-4.3 {reentrancy issues with command deletion and renaming} {
-	set x {}
-	testdel {} foo {lappend x deleted; testdel {} foo {lappend x deleted2}}
-	rename foo {}
-	lappend x |
-	rename foo {}
-	set x
-    } {deleted | deleted2}
-    test rename-4.4 {reentrancy issues with command deletion and renaming} {
-	set x {}
-	testdel {} foo {lappend x deleted; rename foo bar}
-	rename foo {}
-	lappend x | [info command bar]
-    } {deleted | {}}
-    test rename-4.5 {reentrancy issues with command deletion and renaming} {
-	set env(value) before
-	interp create foo
-	testdel foo cmd {set env(value) deleted}
-	interp delete foo
-	set env(value)
-    } {deleted}
-    test rename-4.6 {reentrancy issues with command deletion and renaming} {
-	proc kill args {
-	    interp delete foo
-	}
-	set env(value) before
-	interp create foo
-	foo alias kill kill
-	testdel foo cmd {set env(value) deleted; kill}
-	list [catch {foo eval {rename cmd {}}} msg] $msg $env(value)
-    } {0 {} deleted}
-    test rename-4.7 {reentrancy issues with command deletion and renaming} {
-	proc kill args {
-	    interp delete foo
-	}
-	set env(value) before
-	interp create foo
-	foo alias kill kill
-	testdel foo cmd {set env(value) deleted; kill}
-	list [catch {interp delete foo} msg] $msg $env(value)
-    } {0 {} deleted}
-}
-
-# Save the unknown procedure which is modified by the following test.
-
-catch {rename unknown unknown.old}
-
-test rename-5.1 {repeated rename deletion and redefinition of same command} {
-    set SAVED_UNKNOWN "proc unknown "
-    append SAVED_UNKNOWN "\{[info args unknown.old]\} "
-    append SAVED_UNKNOWN "\{[info body unknown.old]\}"
-
-    for {set i 0} {$i < 10} {incr i} {
-        eval $SAVED_UNKNOWN
-        tcl_wordBreakBefore "" 0
-        rename tcl_wordBreakBefore {}
-        rename unknown {}
-    }
-} {}
-
-catch {rename unknown {}}
-catch {rename unknown.old unknown}
-
-
-test rename-6.1 {old code invalidated (epoch incremented) when cmd with compile proc is renamed } {
-    proc x {} {
-        set a 123
-        set b [incr a]
-    }
-    x
-    rename incr incr.old
-    proc incr {} {puts "new incr called!"}
-    catch {x} msg
-    set msg
-} {called "incr" with too many arguments}
-
-# cleanup
-catch {rename incr {}}
-catch {rename incr.old incr}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/resource.test b/tests/resource.test
deleted file mode 100644
index b5f341a..0000000
--- a/tests/resource.test
+++ /dev/null
@@ -1,364 +0,0 @@
-# Commands covered:  resource
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: resource.test,v 1.4 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test resource-1.1 {resource tests} {macOnly} {
-    list [catch {resource} msg] $msg
-} {1 {wrong # args: should be "resource option ?arg ...?"}}
-test resource-1.2 {resource tests} {macOnly} {
-    list [catch {resource _bad_} msg] $msg
-} {1 {bad option "_bad_": must be close, delete, files, list, open, read, types, or write}}
-
-# resource open & close tests
-test resource-2.1 {resource open & close tests} {macOnly} {
-    list [catch {resource open} msg] $msg
-} {1 {wrong # args: should be "resource open fileName ?permissions?"}}
-test resource-2.2 {resource open & close tests} {macOnly} {
-    list [catch {resource open resource.test r extraArg} msg] $msg
-} {1 {wrong # args: should be "resource open fileName ?permissions?"}}
-test resource-2.3 {resource open & close tests} {macOnly} {
-    list [catch {resource open resource.test bad_perms} msg] $msg
-} {1 {illegal access mode "bad_perms"}}
-test resource-2.4 {resource open & close tests} {macOnly} {
-    list [catch {resource open _bad_file_} msg] $msg
-} {1 {file does not exist}}
-test resource-2.5 {resource open & close tests} {macOnly} {
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
-    set id [resource open rsrc.file]
-    resource close $id
-    file delete rsrc.file
-} {}
-test resource-2.6 {resource open & close tests} {macOnly} {
-    catch {file delete rsrc.file}
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {A test string}
-    set id [resource open rsrc.file]
-    set result [string compare [resource open rsrc.file] $id]
-    lappend result [resource read TEXT fileRsrcName $id]
-    resource close $id
-    file delete rsrc.file
-    set result
-} {0 {A test string}}
-test resource-2.7 {resource open & close tests} {macOnly} {
-    catch {file delete rsrc.file}
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
-    set id [resource open rsrc.file r]
-    set result [catch {resource open rsrc.file w} mssg]
-    resource close $id
-    file delete rsrc.file
-    lappend result $mssg
-    set result
-} {1 {Resource already open with different permissions.}}
-test resource-2.8 {resource open & close tests} {macOnly} {
-    list [catch {resource close} msg] $msg
-} {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.9 {resource open & close tests} {macOnly} {
-    list [catch {resource close foo bar} msg] $msg
-} {1 {wrong # args: should be "resource close resourceRef"}}
-test resource-2.10 {resource open & close tests} {macOnly} {
-    list [catch {resource close _bad_resource_} msg] $msg
-} {1 {invalid resource file reference "_bad_resource_"}}
-test resource-2.11 {resource open & close tests} {macOnly} {
-    set result [catch {resource close System} mssg]
-    lappend result $mssg
-} {1 {can't close "System" resource file}}
-test resource-2.12 {resource open & close tests} {macOnly} {
-    set result [catch {resource close application} mssg]
-    lappend result $mssg
-} {1 {can't close "application" resource file}}
-
-# Tests for listing resources
-test resource-3.1 {resource list tests} {macOnly} {
-    list [catch {resource list} msg] $msg
-} {1 {wrong # args: should be "resource list resourceType ?resourceRef?"}}
-test resource-3.2 {resource list tests} {macOnly} {
-    list [catch {resource list _bad_type_} msg] $msg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-3.3 {resource list tests} {macOnly} {
-    list [catch {resource list TEXT _bad_ref_} msg] $msg
-} {1 {invalid resource file reference "_bad_ref_"}}
-test resource-3.4 {resource list tests} {macOnly} {
-    list [catch {resource list TEXT _bad_ref_ extraArg} msg] $msg
-} {1 {wrong # args: should be "resource list resourceType ?resourceRef?"}}
-test resource-3.5 {resource list tests} {macOnly} {
-    catch {file delete rsrc.file}
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
-    set id [resource open rsrc.file]
-    catch "resource list TEXT $id" result
-    resource close $id
-    set result
-} {fileRsrcName}
-test resource-3.6 {resource list tests} {macOnly} {
-    # There should not be any resource of this type
-    resource list XXXX
-} {}
-test resource-3.7 {resource list tests} {macOnly} {
-    set resourceList [resource list STR#]
-    if {[lsearch $resourceList {Tcl Environment Variables}] == -1} {
-        set result {couldn't find resource that should exist}
-    } else {
-        set result ok
-    }
-} {ok}
-
-# Tests for reading resources
-test resource-4.1 {resource read tests} {macOnly} {
-    list [catch {resource read} msg] $msg
-} {1 {wrong # args: should be "resource read resourceType resourceId ?resourceRef?"}}
-test resource-4.2 {resource read tests} {macOnly} {
-    list [catch {resource read TEXT} msg] $msg
-} {1 {wrong # args: should be "resource read resourceType resourceId ?resourceRef?"}}
-test resource-4.3 {resource read tests} {macOnly} {
-    list [catch {resource read STR# {_non_existant_resource_}} msg] $msg
-} {1 {could not load resource}}
-test resource-4.4 {resource read tests} {macOnly} {
-    # The following resource should exist and load OK without error
-    catch {resource read STR# {Tcl Environment Variables}}
-} {0}
-
-# Tests for getting resource types
-test resource-5.1 {resource types tests} {macOnly} {
-    list [catch {resource types _bad_ref_} msg] $msg
-} {1 {invalid resource file reference "_bad_ref_"}}
-test resource-5.2 {resource types tests} {macOnly} {
-    list [catch {resource types _bad_ref_ extraArg} msg] $msg
-} {1 {wrong # args: should be "resource types ?resourceRef?"}}
-test resource-5.3 {resource types tests} {macOnly} {
-    # This should never cause an error
-    catch {resource types}
-} {0}
-test resource-5.4 {resource types tests} {macOnly} {
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file  {error "don't source me"}
-    set id [resource open rsrc.file]
-    set result [resource types $id]
-    resource close $id
-    set result
-} {TEXT}
-
-# resource write tests
-test resource-6.1 {resource write tests} {macOnly} {
-    list [catch {resource write} msg] $msg
-} {1 {wrong # args: should be "resource write ?-id resourceId? ?-name resourceName? ?-file resourceRef? ?-force? resourceType data"}}
-test resource-6.2 {resource write tests} {macOnly} {
-    list [catch {resource write _bad_type_ data} msg] $msg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-6.3 {resource write tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    resource close $id
-    set id [resource open rsrc2.file r]
-    set result [catch {resource write -file $id -name Hello TEXT foo} errMsg]
-    lappend result [string compare $errMsg "cannot write to resource file \"$id\", it was opened read only"]
-    lappend result [lsearch [resource list TEXT $id] Hello]
-    resource close $id
-    file delete rsrc2.file
-    set result   
-} {1 0 -1}
-test resource-6.4 {resource write tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    resource write -file $id -name Hello TEXT {set x "our test data"}
-    source -rsrc Hello rsrc2.file
-    resource close $id
-    file delete rsrc2.file
-    set x
-} {our test data}
-test resource-6.5 {resource write tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    resource write -file $id -id 256 TEXT {HAHAHAHAHAHAHA}
-    set result [catch {resource write -file $id -id 256 TEXT {HOHOHOHOHOHO}} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {the resource 256 already exists, use "-force" to overwrite it.}}
-test resource-6.6 {resource write tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 256  -file rsrc2.file  -protected {error "don't tread on me"}
-    set id [resource open rsrc2.file w]
-    set result [catch {resource write -id 256 -force -file $id TEXT {NAHNAHNANAHNAH}} mssg] 
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {could not write resource id 256 of type TEXT, it was protected.}}
-test resource-6.7 {resource write tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    resource write -file $id -id 256 -name FOO TEXT {set x [list "our first test data"]}
-    resource write -file $id -id 256 -name BAR -force TEXT {set x [list "our second test data"]}
-    source -rsrcid 256 rsrc2.file
-    lappend x [resource list TEXT $id]
-    resource close $id
-    file delete rsrc2.file
-    set x
-} {{our second test data} BAR}
-
-#Tests for listing open resource files
-test resource-7.1 {resource file tests} {macOnly} {
-    catch {resource files foo bar} mssg
-    set mssg
-} {wrong # args: should be "resource files ?resourceId?"}
-test resource-7.2 {resource file tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set rsrcFiles [resource files]
-    set id [resource open rsrc2.file w]
-    set result [string compare $rsrcFiles [lrange [resource files] 1 end]]
-    lappend result [string compare $id [lrange [resource files] 0 0]]
-    resource close $id
-    file delete rsrc2.file
-    set result
-} {0 0}
-test resource-7.3 {resource file tests} {macOnly} {
-    set result 0
-    foreach file [resource files] {
-        if {[catch {resource types $file}] != 0} {
-            set result 1
-        }
-    }
-    set result
-} {0}
-test resource-7.4 {resource file tests} {macOnly} {
-    catch {resource files __NO_SUCH_RESOURCE__} mssg
-    set mssg
-} {invalid resource file reference "__NO_SUCH_RESOURCE__"}
-test resource-7.5 {resource file tests} {macOnly} {
-    set sys [resource files System]
-    string compare $sys [file join $env(SYS_FOLDER) System]
-} {0}
-test resource-7.6 {resource file tests} {macOnly} {
-    set app [resource files application]
-    string compare $app [info nameofexecutable]
-} {0}
-
-#Tests for the resource delete command
-test resource-8.1 {resource delete tests} {macOnly} {
-    list [catch {resource delete} msg] $msg
-} {1 {wrong # args: should be "resource delete ?-id resourceId? ?-name resourceName? ?-file resourceRef? resourceType"}}
-test resource-8.2 {resource delete tests} {macOnly} {
-    list [catch {resource delete TEXT} msg] $msg
-} {1 {you must specify either "-id" or "-name" or both to "resource delete"}}
-test resource-8.3 {resource delete tests} {macOnly} {
-    set result [catch {resource delete -file ffffff -id 128 TEXT} mssg]
-    lappend result $mssg    
-} {1 {invalid resource file reference "ffffff"}}    
-test resource-8.4 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
-    set id [resource open rsrc2.file r]
-    set result [catch {resource delete -id 128 -file $id TEXT} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result [string compare $mssg "cannot delete from resource file \"$id\", it was opened read only"]   
-} {1 0}
-test resource-8.5 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
-    set id [resource open rsrc2.file w]
-    set result [catch {resource delete -id 128 -file $id _bad_type_} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {expected Macintosh OS type but got "_bad_type_"}}
-test resource-8.5 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    set result [catch {resource delete -id 128 -file $id TEXT} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {resource not found}}
-test resource-8.6 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    set result [catch {resource delete -name foo -file $id TEXT} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {resource not found}}
-test resource-8.7 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    set id [resource open rsrc2.file w]
-    resource write -file $id -name foo -id 128 TEXT {some stuff}
-    resource write -file $id -name bar -id 129 TEXT {some stuff}
-    set result [catch {resource delete -name foo -id 129 -file $id TEXT} mssg]
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {"-id" and "-name" values do not point to the same resource}}
-test resource-8.8 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 256  -file rsrc2.file  -protected {error "don't tread on me"}
-    set id [resource open rsrc2.file w]
-    set result [catch {resource delete -id 256 -file $id TEXT } mssg] 
-    resource close $id
-    file delete rsrc2.file
-    lappend result $mssg
-} {1 {resource cannot be deleted: it is protected.}}
-test resource-8.9 {resource delete tests} {macOnly} {
-    catch {file delete rsrc2.file}
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 128 -file rsrc2.file {Some stuff}
-    set id [resource open rsrc2.file w]
-    set result [resource list TEXT $id]
-    resource delete -id 128 -file $id TEXT
-    lappend result [resource list TEXT $id]
-    resource close $id
-    file delete rsrc2.file
-    set result
-} {fileRsrcName {}}
-    
-# Tests for the Mac version of the source command
-catch {file delete rsrc.file}
-test resource-9.1 {source command} {macOnly} {
-    testWriteTextResource -rsrc fileRsrcName -rsrcid 128 \
-	    -file rsrc.file  {set rsrc_foo 1}
-    catch {unset rsrc_foo}
-    source -rsrc fileRsrcName rsrc.file
-    list [catch {set rsrc_foo} msg] $msg
-} {0 1}
-test resource-9.2 {source command} {macOnly} {
-    catch {unset rsrc_foo}
-    list [catch {source -rsrc no_resource rsrc.file} msg] $msg
-} {1 {The resource "no_resource" could not be loaded from rsrc.file.}}
-test resource-9.3 {source command} {macOnly} {
-    catch {unset rsrc_foo}
-    source -rsrcid 128 rsrc.file
-    list [catch {set rsrc_foo} msg] $msg
-} {0 1}
-test resource-9.4 {source command} {macOnly} {
-    catch {unset rsrc_foo}
-    list [catch {source -rsrcid bad_int rsrc.file} msg] $msg
-} {1 {expected integer but got "bad_int"}}
-test resource-9.5 {source command} {macOnly} {
-    catch {unset rsrc_foo}
-    list [catch {source -rsrcid 100 rsrc.file} msg] $msg
-} {1 {The resource "ID=100" could not be loaded from rsrc.file.}}
-
-# cleanup
-catch {file delete rsrc.file}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/result.test b/tests/result.test
deleted file mode 100644
index 3f77fdc..0000000
--- a/tests/result.test
+++ /dev/null
@@ -1,102 +0,0 @@
-# This file tests the routines in tclResult.c.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# SCCS: @(#) result.test 1.4 97/12/08 15:07:49
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Some tests require the testsaveresult command
-
-set ::tcltest::testConfig(testsaveresult) \
-	[expr {[info commands testsaveresult] != {}}]
-
-test result-1.1 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult small {set x 42} 0
-} {small result}
-test result-1.2 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult append {set x 42} 0
-} {append result}
-test result-1.3 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult dynamic {set x 42} 0
-} {dynamic result notCalled present}
-test result-1.4 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult object {set x 42} 0
-} {object result same}
-test result-1.5 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult small {set x 42} 1
-} {42}
-test result-1.6 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult append {set x 42} 1
-} {42}
-test result-1.7 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult dynamic {set x 42} 1
-} {42 called missing}
-test result-1.8 {Tcl_SaveInterpResult} {testsaveresult} {
-    testsaveresult object {set x 42} 1
-} {42 different}
-
-
-# Tcl_RestoreInterpResult is mostly tested by the previous tests except
-# for the following case
-
-test result-2.1 {Tcl_RestoreInterpResult} {testsaveresult} {
-    testsaveresult append {cd _foobar} 0
-} {append result}
-
-# Tcl_DiscardInterpResult is mostly tested by the previous tests except
-# for the following cases
-
-test result-3.1 {Tcl_DiscardInterpResult} {testsaveresult} {
-    list [catch {testsaveresult append {cd _foobar} 1} msg] $msg
-} {1 {couldn't change working directory to "_foobar": no such file or directory}}
-test result-3.2 {Tcl_DiscardInterpResult} {testsaveresult} {
-    testsaveresult free {set x 42} 1
-} {42}
-
-test result-4.1 {Tcl_SetObjErrorCode - one arg} {testsaveresult} {
-    catch {testsetobjerrorcode 1}
-    list [set errorCode]
-} {1}
-test result-4.2 {Tcl_SetObjErrorCode - two args} {testsaveresult} {
-    catch {testsetobjerrorcode 1 2}
-    list [set errorCode]
-} {{1 2}}
-test result-4.3 {Tcl_SetObjErrorCode - three args} {testsaveresult} {
-    catch {testsetobjerrorcode 1 2 3}
-    list [set errorCode]
-} {{1 2 3}}
-test result-4.4 {Tcl_SetObjErrorCode - four args} {testsaveresult} {
-    catch {testsetobjerrorcode 1 2 3 4}
-    list [set errorCode]
-} {{1 2 3 4}}
-test result-4.5 {Tcl_SetObjErrorCode - five args} {testsaveresult} {
-    catch {testsetobjerrorcode 1 2 3 4 5}
-    list [set errorCode]
-} {{1 2 3 4 5}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/safe.test b/tests/safe.test
deleted file mode 100644
index 5149c59..0000000
--- a/tests/safe.test
+++ /dev/null
@@ -1,527 +0,0 @@
-# safe.test --
-#
-# This file contains a collection of tests for safe Tcl, packages loading,
-# and using safe interpreters. Sourcing this file into tcl runs the tests
-# and generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: safe.test,v 1.5 1999/04/16 00:47:33 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-foreach i [interp slaves] {
-  interp delete $i
-}
-
-# Force actual loading of the safe package 
-# because we use un exported (and thus un-autoindexed) APIs
-# in this test result arguments:
-catch {safe::interpConfigure}
-
-proc equiv {x} {return $x}
-
-test safe-1.1 {safe::interpConfigure syntax} {
-    list [catch {safe::interpConfigure} msg] $msg;
-} {1 {no value given for parameter "slave" (use -help for full usage) :
-    slave name () name of the slave}}
-
-test safe-1.2 {safe::interpCreate syntax} {
-    list [catch {safe::interpCreate -help} msg] $msg;
-} {1 {Usage information:
-    Var/FlagName  Type     Value   Help
-    ------------  ----     -----   ----
-    ( -help                        gives this help )
-    ?slave?       name     ()      name of the slave (optional)
-    -accessPath   list     ()      access path for the slave
-    -noStatics    boolflag (false) prevent loading of statically linked pkgs
-    -statics      boolean  (true)  loading of statically linked pkgs
-    -nestedLoadOk boolflag (false) allow nested loading
-    -nested       boolean  (false) nested loading
-    -deleteHook   script   ()      delete hook}}
-
-test safe-1.3 {safe::interpInit syntax} {
-    list [catch {safe::interpInit -noStatics} msg] $msg;
-} {1 {bad value "-noStatics" for parameter
-    slave name () name of the slave}}
-
-
-test safe-2.1 {creating interpreters, should have no aliases} {
-    interp aliases
-} ""
-test safe-2.2 {creating interpreters, should have no aliases} {
-    catch {safe::interpDelete a}
-    interp create a
-    set l [a aliases]
-    safe::interpDelete a
-    set l
-} ""
-test safe-2.3 {creating safe interpreters, should have no aliases} {
-    catch {safe::interpDelete a}
-    interp create a -safe
-    set l [a aliases]
-    interp delete a
-    set l
-} ""
-
-test safe-3.1 {calling safe::interpInit is safe} {
-    catch {safe::interpDelete a}
-    interp create a -safe 
-    safe::interpInit a
-    catch {interp eval a exec ls} msg
-    safe::interpDelete a
-    set msg
-} {invalid command name "exec"}
-test safe-3.2 {calling safe::interpCreate on trusted interp} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    set l [lsort [a aliases]]
-    safe::interpDelete a
-    set l
-} {encoding exit file load source}
-test safe-3.3 {calling safe::interpCreate on trusted interp} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    set x [interp eval a {source [file join $tcl_library init.tcl]}]
-    safe::interpDelete a
-    set x
-} ""
-test safe-3.4 {calling safe::interpCreate on trusted interp} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    catch {set x \
-		[interp eval a {source [file join $tcl_library init.tcl]}]} msg
-    safe::interpDelete a
-    list $x $msg
-} {{} {}}
-
-test safe-4.1 {safe::interpDelete} {
-    catch {safe::interpDelete a}
-    interp create a
-    safe::interpDelete a
-} ""
-test safe-4.2 {safe::interpDelete, indirectly} {
-    catch {safe::interpDelete a}
-    interp create a
-    a alias exit safe::interpDelete a
-    a eval exit
-} ""
-test safe-4.3 {safe::interpDelete, state array (not a public api)} {
-    catch {safe::interpDelete a}
-    namespace eval safe {set [InterpStateName a](foo) 33}
-    # not an error anymore to call it if interp is already
-    # deleted, to make trhings smooth if it's called twice...
-    catch {safe::interpDelete a} m1
-    catch {namespace eval safe {set [InterpStateName a](foo)}} m2
-    list $m1 $m2
-} "{}\
-   {can't read \"[safe::InterpStateName a]\": no such variable}"
-
-
-test safe-4.4 {safe::interpDelete, state array, indirectly (not a public api)} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    namespace eval safe {set [InterpStateName a](foo) 33}
-    a eval exit
-    catch {namespace eval safe {set [InterpStateName a](foo)}} msg
-} 1
-
-test safe-4.5 {safe::interpDelete} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    catch {safe::interpCreate a} msg
-    set msg
-} {interpreter named "a" already exists, cannot create}
-test safe-4.6 {safe::interpDelete, indirectly} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    a eval exit
-} ""
-
-# The following test checks whether the definition of tcl_endOfWord can be
-# obtained from auto_loading.
-
-test safe-5.1 {test auto-loading in safe interpreters} {
-    catch {safe::interpDelete a}
-    safe::interpCreate a
-    set r [catch {interp eval a {tcl_endOfWord "" 0}} msg]
-    safe::interpDelete a
-    list $r $msg
-} {0 -1}
-
-# test safe interps 'information leak'
-proc SI {} {
-    global I
-    set I [interp create -safe];
-}
-proc DI {} {
-    global I;
-    interp delete $I;
-}
-test safe-6.1 {test safe interpreters knowledge of the world} {
-    SI; set r [lsort [$I eval {info globals}]]; DI; set r
-} {tcl_interactive tcl_patchLevel tcl_platform tcl_version}
-test safe-6.2 {test safe interpreters knowledge of the world} {
-    SI; set r [$I eval {info script}]; DI; set r
-} {}
-test safe-6.3 {test safe interpreters knowledge of the world} {
-    SI
-    set r [lsort [$I eval {array names tcl_platform}]]
-    DI
-    # If running a windows-debug shell, remove the "debug" element from r.
-    if {$tcl_platform(platform) == "windows" && \
-	    [lsearch $r "debug"] != -1} {
-	set r [lreplace $r 1 1]
-    }
-    set r
-} {byteOrder platform}
-
-# more test should be added to check that hostname, nameofexecutable,
-# aren't leaking infos, but they still do...
-
-# high level general test
-test safe-7.1 {tests that everything works at high level} {
-    set i [safe::interpCreate];
-    # no error shall occur:
-    # (because the default access_path shall include 1st level sub dirs
-    #  so package require in a slave works like in the master)
-    set v [interp eval $i {package require http 1}]
-    # no error shall occur:
-    interp eval $i {http_config};
-    safe::interpDelete $i
-    set v
-} 1.0
-
-test safe-7.2 {tests specific path and interpFind/AddToAccessPath} {
-    set i [safe::interpCreate -nostat -nested 1 -accessPath [list [info library]]];
-    # should not add anything (p0)
-    set token1 [safe::interpAddToAccessPath $i [info library]]
-    # should add as p1
-    set token2 [safe::interpAddToAccessPath $i "/dummy/unixlike/test/path"];
-    # an error shall occur (http is not anymore in the secure 0-level
-    # provided deep path)
-    list $token1 $token2 \
-	    [catch {interp eval $i {package require http 1}} msg] $msg \
-	    [safe::interpConfigure $i]\
-	    [safe::interpDelete $i]
-} "{\$p(:0:)} {\$p(:1:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library /dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}"
-
-
-# test source control on file name
-test safe-8.1 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    list  [catch {$i eval {source}} msg] \
-	    $msg \
-	    [safe::interpDelete $i] ;
-} {1 {wrong # args: should be "source fileName"} {}}
-
-# test source control on file name
-test safe-8.2 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    list  [catch {$i eval {source}} msg] \
-	    $msg \
-	    [safe::interpDelete $i] ;
-} {1 {wrong # args: should be "source fileName"} {}}
-
-test safe-8.3 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [catch {$i eval {source .}} msg] \
-	    $msg \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log] \
-	    [safe::interpDelete $i] ;
-} {1 {permission denied} {{ERROR for slave a : ".": is a directory}} {} {}}
-
-
-test safe-8.4 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [catch {$i eval {source /abc/def}} msg] \
-	    $msg \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log] \
-	    [safe::interpDelete $i] ;
-} {1 {permission denied} {{ERROR for slave a : "/abc/def": not in access_path}} {} {}}
-
-
-test safe-8.5 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [catch {$i eval {source [file join [info lib] blah]}} msg] \
-	    $msg \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log] \
-	    [safe::interpDelete $i] ;
-} "1 {blah: must be a *.tcl or tclIndex} {{ERROR for slave a : [file join [info library] blah]:blah: must be a *.tcl or tclIndex}} {} {}"
-
-
-test safe-8.6 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [catch {$i eval {source [file join [info lib] blah.tcl]}} msg] \
-	    $msg \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log] \
-	    [safe::interpDelete $i] ;
-} "1 {no such file or directory} {{ERROR for slave a : [file join [info library] blah.tcl]:no such file or directory}} {} {}"
-
-
-test safe-8.7 {safe source control on file} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [catch {$i eval {source [file join [info lib] xxxxxxxxxxx.tcl]}}\
-		 msg] \
-	    $msg \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log] \
-	    [safe::interpDelete $i] ;
-} "1 {xxxxxxxxxxx.tcl: filename too long} {{ERROR for slave a : [file join [info library] xxxxxxxxxxx.tcl]:xxxxxxxxxxx.tcl: filename too long}} {} {}"
-
-test safe-8.8 {safe source forbids -rsrc} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    safe::interpCreate $i;
-    list  [catch {$i eval {source -rsrc Init}} msg] \
-	    $msg \
-	    [safe::interpDelete $i] ;
-} {1 {wrong # args: should be "source fileName"} {}}
-
-
-test safe-9.1 {safe interps' deleteHook} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    set res {}
-    proc testDelHook {args} {
-	global res;
-	# the interp still exists at that point
-	interp eval a {set delete 1}
-	# mark that we've been here (successfully)
-	set res $args;
-    }
-    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2";
-    list [interp eval $i exit] $res
-} {{} {arg1 arg2 a}}
-
-test safe-9.2 {safe interps' error in deleteHook} {
-    set i "a";
-    catch {safe::interpDelete $i}
-    set res {}
-    proc testDelHook {args} {
-	global res;
-	# the interp still exists at that point
-	interp eval a {set delete 1}
-	# mark that we've been here (successfully)
-	set res $args;
-	# create an exception
-	error "being catched";
-    }
-    set log {};
-    proc safe-test-log {str} {global log; lappend log $str}
-    safe::interpCreate $i -deleteHook "testDelHook arg1 arg2";
-    set prevlog [safe::setLogCmd];
-    safe::setLogCmd safe-test-log;
-    list  [safe::interpDelete $i] $res \
-	    $log \
-	    [safe::setLogCmd $prevlog; unset log];
-} {{} {arg1 arg2 a} {{NOTICE for slave a : About to delete} {ERROR for slave a : Delete hook error (being catched)} {NOTICE for slave a : Deleted}} {}}
-
-
-test safe-9.3 {dual specification of statics} {
-    list [catch {safe::interpCreate -stat true -nostat} msg] $msg
-} {1 {conflicting values given for -statics and -noStatics}}
-
-test safe-9.4 {dual specification of statics} {
-    # no error shall occur
-    safe::interpDelete [safe::interpCreate -stat false -nostat]
-} {}
-
-test safe-9.5 {dual specification of nested} {
-    list [catch {safe::interpCreate -nested 0 -nestedload} msg] $msg
-} {1 {conflicting values given for -nested and -nestedLoadOk}}
-
-test safe-9.6 {interpConfigure widget like behaviour} {
-   # this test shall work, don't try to "fix it" unless
-   # you *really* know what you are doing (ie you are me :p) -- dl
-   list [set i [safe::interpCreate \
-	                           -noStatics \
-                                   -nestedLoadOk \
-	                           -deleteHook {foo bar}];
-         safe::interpConfigure $i -accessPath /foo/bar ;
-         safe::interpConfigure $i]\
-	[safe::interpConfigure $i -aCCess]\
-	[safe::interpConfigure $i -nested]\
-	[safe::interpConfigure $i -statics]\
-	[safe::interpConfigure $i -DEL]\
-	[safe::interpConfigure $i -accessPath /blah -statics 1;
-	 safe::interpConfigure $i]\
-	[safe::interpConfigure $i -deleteHook toto -nosta -nested 0;
-	 safe::interpConfigure $i]
-} {{-accessPath /foo/bar -statics 0 -nested 1 -deleteHook {foo bar}} {-accessPath /foo/bar} {-nested 1} {-statics 0} {-deleteHook {foo bar}} {-accessPath /blah -statics 1 -nested 1 -deleteHook {foo bar}} {-accessPath /blah -statics 0 -nested 0 -deleteHook toto}}
-
-
-# testing that nested and statics do what is advertised
-# (we use a static package : Tcltest)
-
-if {[catch {package require Tcltest} msg]} {
-    puts "This application hasn't been compiled with Tcltest"
-    puts "skipping remining safe test that relies on it."
-} else {
-
-    # we use the Tcltest package , which has no Safe_Init
-
-test safe-10.1 {testing statics loading} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i {load {} Tcltest}} msg] \
-	    $msg \
-            [safe::interpDelete $i];
-} {1 {can't use package in a safe interpreter: no Tcltest_SafeInit procedure} {}}
-
-test safe-10.2 {testing statics loading / -nostatics} {
-    set i [safe::interpCreate -nostatics]
-    list \
-	    [catch {interp eval $i {load {} Tcltest}} msg] \
-	    $msg \
-            [safe::interpDelete $i];
-} {1 {permission denied (static package)} {}}
-
-
-
-test safe-10.3 {testing nested statics loading / no nested by default} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i {interp create x; load {} Tcltest x}} msg] \
-	    $msg \
-            [safe::interpDelete $i];
-} {1 {permission denied (nested load)} {}}
-
-
-test safe-10.4 {testing nested statics loading / -nestedloadok} {
-    set i [safe::interpCreate -nestedloadok]
-    list \
-	    [catch {interp eval $i {interp create x; load {} Tcltest x}} msg] \
-	    $msg \
-            [safe::interpDelete $i];
-} {1 {can't use package in a safe interpreter: no Tcltest_SafeInit procedure} {}}
-
-
-}
-
-test safe-11.1 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {1 {wrong # args: should be "encoding option ?arg ...?"} {}}
-
-test safe-11.2 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding system cp775} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {1 {wrong # args: should be "encoding system"} {}}
-
-test safe-11.3 {testing safe encoding} {
-    set i [safe::interpCreate]
-    set result [catch {
-	string match [encoding system] [interp eval $i encoding system]
-    } msg]
-    list $result $msg [safe::interpDelete $i]
-} {0 1 {}}
-
-test safe-11.4 {testing safe encoding} {
-    set i [safe::interpCreate]
-    set result [catch {
-	string match [encoding names] [interp eval $i encoding names]
-    } msg]
-    list $result $msg  [safe::interpDelete $i]
-} {0 1 {}}
-
-test safe-11.5 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding convertfrom cp1258 foobar} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {0 foobar {}}
-
-
-test safe-11.6 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding convertto cp1258 foobar} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {0 foobar {}}
-
-test safe-11.7 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding convertfrom} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {1 {wrong # args: should be "encoding convertfrom ?encoding? data"} {}}
-
-
-test safe-11.8 {testing safe encoding} {
-    set i [safe::interpCreate]
-    list \
-	    [catch {interp eval $i encoding convertto} msg] \
-	    $msg \
-	    [safe::interpDelete $i];
-} {1 {wrong # args: should be "encoding convertto ?encoding? data"} {}}
-
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/scan.test b/tests/scan.test
deleted file mode 100644
index aa86a4d..0000000
--- a/tests/scan.test
+++ /dev/null
@@ -1,586 +0,0 @@
-# Commands covered:  scan
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1994 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: scan.test,v 1.4 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test scan-1.1 {BuildCharSet, CharInSet} {
-    list [scan foo {%[^o]} x] $x
-} {1 f}
-test scan-1.2 {BuildCharSet, CharInSet} {
-    list [scan \]foo {%[]f]} x] $x
-} {1 \]f}
-test scan-1.3 {BuildCharSet, CharInSet} {
-    list [scan abc-def {%[a-c]} x] $x
-} {1 abc}
-test scan-1.4 {BuildCharSet, CharInSet} {
-    list [scan abc-def {%[a-c]} x] $x
-} {1 abc}
-test scan-1.5 {BuildCharSet, CharInSet} {
-    list [scan -abc-def {%[-ac]} x] $x
-} {1 -a}
-test scan-1.6 {BuildCharSet, CharInSet} {
-    list [scan -abc-def {%[ac-]} x] $x
-} {1 -a}
-test scan-1.7 {BuildCharSet, CharInSet} {
-    list [scan abc-def {%[c-a]} x] $x
-} {1 abc}
-test scan-1.8 {BuildCharSet, CharInSet} {
-    list [scan def-abc {%[^c-a]} x] $x
-} {1 def-}
-
-test scan-2.1 {ReleaseCharSet} {
-    list [scan abcde {%[abc]} x] $x
-} {1 abc}
-test scan-2.2 {ReleaseCharSet} {
-    list [scan abcde {%[a-c]} x] $x
-} {1 abc}
-
-test scan-3.1 {ValidateFormat} {
-    list [catch {scan {} {%d%1$d} x} msg] $msg
-} {1 {cannot mix "%" and "%n$" conversion specifiers}}
-test scan-3.2 {ValidateFormat} {
-    list [catch {scan {} {%d%1$d} x} msg] $msg
-} {1 {cannot mix "%" and "%n$" conversion specifiers}}
-test scan-3.3 {ValidateFormat} {
-    list [catch {scan {} {%2$d%d} x} msg] $msg
-} {1 {"%n$" argument index out of range}}
-test scan-3.4 {ValidateFormat} {
-    list [catch {scan {} %d} msg] $msg
-} {1 {different numbers of variable names and field specifiers}}
-test scan-3.5 {ValidateFormat} {
-    list [catch {scan {} {%10c} a} msg] $msg
-} {1 {field width may not be specified in %c conversion}}
-test scan-3.6 {ValidateFormat} {
-    list [catch {scan {} {%*1$d} a} msg] $msg
-} {1 {bad scan conversion character "$"}}
-test scan-3.7 {ValidateFormat} {
-    list [catch {scan {} {%1$d%1$d} a} msg] $msg
-} {1 {variable is assigned by multiple "%n$" conversion specifiers}}
-test scan-3.8 {ValidateFormat} {
-    list [catch {scan {} a x} msg] $msg
-} {1 {variable is not assigend by any conversion specifiers}}
-test scan-3.9 {ValidateFormat} {
-    list [catch {scan {} {%2$s} x y} msg] $msg
-} {1 {variable is not assigend by any conversion specifiers}}
-test scan-3.10 {ValidateFormat} {
-    list [catch {scan {} {%[a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-3.11 {ValidateFormat} {
-    list [catch {scan {} {%[^a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-3.12 {ValidateFormat} {
-    list [catch {scan {} {%[]a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-3.13 {ValidateFormat} {
-    list [catch {scan {} {%[^]a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-
-test scan-4.1 {Tcl_ScanObjCmd, argument checks} {
-    list [catch {scan} msg] $msg
-} {1 {wrong # args: should be "scan string format ?varName varName ...?"}}
-test scan-4.2 {Tcl_ScanObjCmd, argument checks} {
-    list [catch {scan string} msg] $msg
-} {1 {wrong # args: should be "scan string format ?varName varName ...?"}}
-test scan-4.3 {Tcl_ScanObjCmd, argument checks} {
-    list [catch {scan string format} msg] $msg
-} {0 0}
-test scan-4.4 {Tcl_ScanObjCmd, whitespace} {
-    list [scan {   abc   def   } {%s%s} x y] $x $y
-} {2 abc def}
-test scan-4.5 {Tcl_ScanObjCmd, whitespace} {
-    list [scan {   abc   def   } { %s %s } x y] $x $y
-} {2 abc def}
-test scan-4.6 {Tcl_ScanObjCmd, whitespace} {
-    list [scan {   abc   def   } { %s %s } x y] $x $y
-} {2 abc def}
-test scan-4.7 {Tcl_ScanObjCmd, literals} {
-    scan {   abc   def   } { abc def }
-} 0
-test scan-4.8 {Tcl_ScanObjCmd, literals} {
-    set x {}
-    list [scan {   abcg} { abc def %1s} x] $x
-} {0 {}}
-test scan-4.9 {Tcl_ScanObjCmd, literals} {
-    list [scan {   abc%defghi} { abc %% def%n } x] $x
-} {1 10}
-test scan-4.10 {Tcl_ScanObjCmd, assignment suppression} {
-    list [scan {   abc   def   } { %*c%s def } x] $x
-} {1 bc}
-test scan-4.11 {Tcl_ScanObjCmd, XPG3-style} {
-    list [scan {   abc   def   } {%2$s %1$s} x y] $x $y
-} {2 def abc}
-test scan-4.12 {Tcl_ScanObjCmd, width specifiers} {
-    list [scan {abc123456789012} {%3s%3d%3f%3[0-9]%s} a b c d e] $a $b $c $d $e
-} {5 abc 123 456.0 789 012}
-test scan-4.13 {Tcl_ScanObjCmd, width specifiers} {
-    list [scan {abc123456789012} {%3s%3d%3f%3[0-9]%s} a b c d e] $a $b $c $d $e
-} {5 abc 123 456.0 789 012}
-test scan-4.14 {Tcl_ScanObjCmd, underflow} {
-    set x {}
-    list [scan {a} {a%d} x] $x
-} {-1 {}}
-test scan-4.15 {Tcl_ScanObjCmd, underflow} {
-    set x {}
-    list [scan {} {a%d} x] $x
-} {-1 {}}
-test scan-4.16 {Tcl_ScanObjCmd, underflow} {
-    set x {}
-    list [scan {ab} {a%d} x] $x
-} {0 {}}
-test scan-4.17 {Tcl_ScanObjCmd, underflow} {
-    set x {}
-    list [scan {a   } {a%d} x] $x
-} {-1 {}}
-test scan-4.18 {Tcl_ScanObjCmd, skipping whitespace} {
-    list [scan {  b} {%c%s} x y] $x $y
-} {2 32 b}
-test scan-4.19 {Tcl_ScanObjCmd, skipping whitespace} {
-    list [scan {  b} {%[^b]%s} x y] $x $y
-} {2 {  } b}
-test scan-4.20 {Tcl_ScanObjCmd, string scanning} {
-    list [scan {abc def} {%s} x] $x
-} {1 abc}
-test scan-4.21 {Tcl_ScanObjCmd, string scanning} {
-    list [scan {abc def} {%0s} x] $x
-} {1 abc}
-test scan-4.22 {Tcl_ScanObjCmd, string scanning} {
-    list [scan {abc def} {%2s} x] $x
-} {1 ab}
-test scan-4.23 {Tcl_ScanObjCmd, string scanning} {
-    list [scan {abc def} {%*s%n} x] $x
-} {1 3}
-test scan-4.24 {Tcl_ScanObjCmd, charset scanning} {
-    list [scan {abcdef} {%[a-c]} x] $x
-} {1 abc}
-test scan-4.25 {Tcl_ScanObjCmd, charset scanning} {
-    list [scan {abcdef} {%0[a-c]} x] $x
-} {1 abc}
-test scan-4.26 {Tcl_ScanObjCmd, charset scanning} {
-    list [scan {abcdef} {%2[a-c]} x] $x
-} {1 ab}
-test scan-4.27 {Tcl_ScanObjCmd, charset scanning} {
-    list [scan {abcdef} {%*[a-c]%n} x] $x
-} {1 3}
-test scan-4.28 {Tcl_ScanObjCmd, character scanning} {
-    list [scan {abcdef} {%c} x] $x
-} {1 97}
-test scan-4.29 {Tcl_ScanObjCmd, character scanning} {
-    list [scan {abcdef} {%*c%n} x] $x
-} {1 1}
-
-test scan-4.30 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {1234567890a} {%3d} x] $x
-} {1 123}
-test scan-4.31 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {1234567890a} {%d} x] $x
-} {1 1234567890}
-test scan-4.32 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {01234567890a} {%d} x] $x
-} {1 1234567890}
-test scan-4.33 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {+01234} {%d} x] $x
-} {1 1234}
-test scan-4.34 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {-01234} {%d} x] $x
-} {1 -1234}
-test scan-4.35 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {a01234} {%d} x] $x
-} {0 {}}
-test scan-4.36 {Tcl_ScanObjCmd, base-10 integer scanning} {
-    set x {}
-    list [scan {0x10} {%d} x] $x
-} {1 0}
-test scan-4.37 {Tcl_ScanObjCmd, base-8 integer scanning} {
-    set x {}
-    list [scan {012345678} {%o} x] $x
-} {1 342391}
-test scan-4.38 {Tcl_ScanObjCmd, base-8 integer scanning} {
-    set x {}
-    list [scan {+1238 -1239 123a} {%o%*s%o%*s%o} x y z] $x $y $z
-} {3 83 -83 83}
-test scan-4.39 {Tcl_ScanObjCmd, base-16 integer scanning} {
-    set x {}
-    list [scan {+1238 -123a 0123} {%x%x%x} x y z] $x $y $z
-} {3 4664 -4666 291}
-test scan-4.40 {Tcl_ScanObjCmd, base-16 integer scanning} {
-    set x {}
-    list [scan {aBcDeF AbCdEf 0x1} {%x%x%x} x y z] $x $y $z
-} {3 11259375 11259375 0}
-test scan-4.41 {Tcl_ScanObjCmd, base-unknown integer scanning} {
-    set x {}
-    list [scan {10 010 0x10} {%i%i%i} x y z] $x $y $z
-} {3 10 8 16}
-test scan-4.42 {Tcl_ScanObjCmd, base-unknown integer scanning} {
-    set x {}
-    list [scan {10 010 0X10} {%i%i%i} x y z] $x $y $z
-} {3 10 8 16}
-test scan-4.43 {Tcl_ScanObjCmd, integer scanning, odd cases} {
-    set x {}
-    list [scan {+ } {%i} x] $x
-} {0 {}}
-test scan-4.44 {Tcl_ScanObjCmd, integer scanning, odd cases} {
-    set x {}
-    list [scan {+} {%i} x] $x
-} {-1 {}}
-test scan-4.45 {Tcl_ScanObjCmd, integer scanning, odd cases} {
-    set x {}
-    list [scan {0x} {%i%s} x y] $x $y
-} {2 0 x}
-test scan-4.46 {Tcl_ScanObjCmd, integer scanning, odd cases} {
-    set x {}
-    list [scan {0X} {%i%s} x y] $x $y
-} {2 0 X}
-test scan-4.47 {Tcl_ScanObjCmd, integer scanning, suppressed} {
-    set x {}
-    list [scan {123def} {%*i%s} x] $x
-} {1 def}
-test scan-4.48 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {1 2 3} {%e %f %g} x y z] $x $y $z
-} {3 1.0 2.0 3.0}
-test scan-4.49 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {.1 0.2 3.} {%e %f %g} x y z] $x $y $z
-} {3 0.1 0.2 3.0}
-test scan-4.50 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {1234567890a} %f x] $x
-} {1 1234567890.0}
-test scan-4.51 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {+123+45} %f x] $x
-} {1 123.0}
-test scan-4.52 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {-123+45} %f x] $x
-} {1 -123.0}
-test scan-4.53 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {1.0e1} %f x] $x
-} {1 10.0}
-test scan-4.54 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {1.0e-1} %f x] $x
-} {1 0.1}
-test scan-4.55 {Tcl_ScanObjCmd, odd cases} {
-    set x {}
-    list [scan {+} %f x] $x
-} {-1 {}}
-test scan-4.56 {Tcl_ScanObjCmd, odd cases} {
-    set x {}
-    list [scan {1.0e} %f%s x y] $x $y
-} {2 1.0 e}
-test scan-4.57 {Tcl_ScanObjCmd, odd cases} {
-    set x {}
-    list [scan {1.0e+} %f%s x y] $x $y
-} {2 1.0 e+}
-test scan-4.58 {Tcl_ScanObjCmd, odd cases} {
-    set x {}
-    set y {}
-    list [scan {e1} %f%s x y] $x $y
-} {0 {} {}}
-test scan-4.59 {Tcl_ScanObjCmd, float scanning} {
-    list [scan {1.0e-1x} %*f%n x] $x
-} {1 6}
-
-test scan-4.60 {Tcl_ScanObjCmd, set errors} {
-    set x {}
-    set y {}
-    catch {unset z}; array set z {}
-    set result [list [catch {scan {abc def ghi} {%s%s%s} x z y} msg] \
-	    $msg $x $y]
-    unset z
-    set result
-} {1 {couldn't set variable "z"} abc ghi}
-test scan-4.61 {Tcl_ScanObjCmd, set errors} {
-    set x {}
-    catch {unset y}; array set y {}
-    catch {unset z}; array set z {}
-    set result [list [catch {scan {abc def ghi} {%s%s%s} x z y} msg] \
-	    $msg $x]
-    unset y
-    unset z
-    set result
-} {1 {couldn't set variable "z"couldn't set variable "y"} abc}
-
-test scan-5.1 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "-20 1476 \n33 0" "%d %d %d %d" a b c d] $a $b $c $d
-} {4 -20 1476 33 0}
-test scan-5.2 {integer scanning} {
-    set a {}; set b {}; set c {}
-    list [scan "-45 16 7890 +10" "%2d %*d %10d %d" a b c] $a $b $c
-} {3 -4 16 7890}
-test scan-5.3 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "-45 16 +10 987" "%ld %d %ld %d" a b c d] $a $b $c $d
-} {4 -45 16 10 987}
-test scan-5.4 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "14 1ab 62 10" "%d %x %lo %x" a b c d] $a $b $c $d
-} {4 14 427 50 16}
-test scan-5.5 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "12345670 1234567890ab cdefg" "%o	 %o %x %lx" a b c d] \
-	    $a $b $c $d
-} {4 2739128 342391 561323 52719}
-test scan-5.6 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "ab123-24642" "%2x %3x %3o %2o" a b c d] $a $b $c $d
-} {4 171 291 -20 52}
-test scan-5.7 {integer scanning} {
-    set a {}; set b {}
-    list [scan "1234567 234 567  " "%*3x %x %*o %4o" a b] $a $b
-} {2 17767 375}
-test scan-5.8 {integer scanning} {
-    set a {}; set b {}
-    list [scan "a	1234" "%d %d" a b] $a $b
-} {0 {} {}}
-test scan-5.9 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {};
-    list [scan "12345678" "%2d %2d %2ld %2d" a b c d] $a $b $c $d
-} {4 12 34 56 78}
-test scan-5.10 {integer scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "1 2 " "%hd %d %d %d" a b c d] $a $b $c $d
-} {2 1 2 {} {}}
-#
-# The behavior for scaning intergers larger than MAX_INT is
-# not defined by the ANSI spec.  Some implementations wrap the
-# input (-16) some return MAX_INT.
-#
-test scan-5.11 {integer scanning} {nonPortable} {
-    set a {}; set b {};
-    list [scan "4294967280 4294967280" "%u %d" a b] $a \
-	    [expr {$b == -16 || $b == 0x7fffffff}]
-} {2 4294967280 1}
-
-test scan-6.1 {floating-point scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "2.1 -3.0e8 .99962 a" "%f%g%e%f" a b c d] $a $b $c $d
-} {3 2.1 -300000000.0 0.99962 {}}
-test scan-6.2 {floating-point scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "-1.2345 +8.2 9" "%3e %3lf %f %f" a b c d] $a $b $c $d
-} {4 -1.0 234.0 5.0 8.2}
-test scan-6.3 {floating-point scanning} {
-    set a {}; set b {}; set c {}
-    list [scan "1e00004 332E-4 3e+4" "%Lf %*2e %f %f" a b c] $a $c
-} {3 10000.0 30000.0}
-#
-# Some libc implementations consider 3.e- bad input.  The ANSI
-# spec states that digits must follow the - sign.
-#
-test scan-6.4 {floating-point scanning} {
-    set a {}; set b {}; set c {}
-    list [scan "1. 47.6 2.e2 3.e-" "%f %*f %f %f" a b c] $a $b $c
-} {3 1.0 200.0 3.0}
-test scan-6.5 {floating-point scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "4.6 99999.7 876.43e-1 118" "%f %f %f %e" a b c d] $a $b $c $d
-} {4 4.6 99999.7 87.643 118.0}
-test scan-6.6 {floating-point scanning} {eformat} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "1.2345 697.0e-3 124 .00005" "%f %e %f %e" a b c d] $a $b $c $d
-} {4 1.2345 0.697 124.0 5e-05}
-test scan-6.7 {floating-point scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "4.6abc" "%f %f %f %f" a b c d] $a $b $c $d
-} {1 4.6 {} {} {}}
-test scan-6.8 {floating-point scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "4.6 5.2" "%f %f %f %f" a b c d] $a $b $c $d
-} {2 4.6 5.2 {} {}}
-
-test scan-7.1 {string and character scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "abc defghijk dum " "%s %3s %20s %s" a b c d] $a $b $c $d
-} {4 abc def ghijk dum}
-test scan-7.2 {string and character scanning} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "a       bcdef" "%c%c%1s %s" a b c d] $a $b $c $d
-} {4 97 32 b cdef}
-test scan-7.3 {string and character scanning} {
-    set a {}; set b {}; set c {}
-    list [scan "123456 test " "%*c%*s %s %s %s" a b c] $a $b $c
-} {1 test {} {}}
-test scan-7.4 {string and character scanning} {
-    set a {}; set b {}; set c {}; set d
-    list [scan "ababcd01234  f 123450" {%4[abcd] %4[abcd] %[^abcdef] %[^0]} a b c d] $a $b $c $d
-} {4 abab cd {01234  } {f 12345}}
-test scan-7.5 {string and character scanning} {
-    set a {}; set b {}; set c {}
-    list [scan "aaaaaabc aaabcdefg  + +  XYZQR" {%*4[a] %s %*4[a]%s%*4[ +]%c} a b c] $a $b $c
-} {3 aabc bcdefg 43}
-test scan-7.6 {string and character scanning, unicode} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "abc d\u00c7fghijk dum " "%s %3s %20s %s" a b c d] $a $b $c $d
-} "4 abc d\u00c7f ghijk dum"
-test scan-7.7 {string and character scanning, unicode} {
-    set a {}; set b {}
-    list [scan "ab\u00c7cdef" "ab%c%c" a b] $a $b
-} "2 199 99"
-test scan-7.8 {string and character scanning, unicode} {
-    set a {}; set b {}
-    list [scan "ab\ufeffdef" "%\[ab\ufeff\]" a] $a
-} "1 ab\ufeff"
-
-test scan-8.1 {error conditions} {
-    catch {scan a}
-} 1
-test scan-8.2 {error conditions} {
-    catch {scan a} msg
-    set msg
-} {wrong # args: should be "scan string format ?varName varName ...?"}
-test scan-8.3 {error conditions} {
-    list [catch {scan a %D x} msg] $msg
-} {1 {bad scan conversion character "D"}}
-test scan-8.4 {error conditions} {
-    list [catch {scan a %O x} msg] $msg
-} {1 {bad scan conversion character "O"}}
-test scan-8.5 {error conditions} {
-    list [catch {scan a %X x} msg] $msg
-} {1 {bad scan conversion character "X"}}
-test scan-8.6 {error conditions} {
-    list [catch {scan a %F x} msg] $msg
-} {1 {bad scan conversion character "F"}}
-test scan-8.7 {error conditions} {
-    list [catch {scan a %E x} msg] $msg
-} {1 {bad scan conversion character "E"}}
-test scan-8.8 {error conditions} {
-    list [catch {scan a "%d %d" a} msg] $msg
-} {1 {different numbers of variable names and field specifiers}}
-test scan-8.9 {error conditions} {
-    list [catch {scan a "%d %d" a b c} msg] $msg
-} {1 {variable is not assigend by any conversion specifiers}}
-test scan-8.10 {error conditions} {
-    set a {}; set b {}; set c {}; set d {}
-    list [expr {[scan "  a" " a %d %d %d %d" a b c d] <= 0}] $a $b $c $d
-} {1 {} {} {} {}}
-test scan-8.11 {error conditions} {
-    set a {}; set b {}; set c {}; set d {}
-    list [scan "1 2" "%d %d %d %d" a b c d] $a $b $c $d
-} {2 1 2 {} {}}
-test scan-8.12 {error conditions} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {scan 44 %d a} msg] $msg
-} {1 {couldn't set variable "a"}}
-test scan-8.13 {error conditions} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {scan 44 %c a} msg] $msg
-} {1 {couldn't set variable "a"}}
-test scan-8.14 {error conditions} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {scan 44 %s a} msg] $msg
-} {1 {couldn't set variable "a"}}
-test scan-8.15 {error conditions} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {scan 44 %f a} msg] $msg
-} {1 {couldn't set variable "a"}}
-test scan-8.16 {error conditions} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {scan 44 %f a} msg] $msg
-} {1 {couldn't set variable "a"}}
-catch {unset a}
-test scan-8.17 {error conditions} {
-    list [catch {scan 44 %2c a} msg] $msg
-} {1 {field width may not be specified in %c conversion}}
-test scan-8.18 {error conditions} {
-    list [catch {scan abc {%[} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-8.19 {error conditions} {
-    list [catch {scan abc {%[^a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-8.20 {error conditions} {
-    list [catch {scan abc {%[^]a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-test scan-8.21 {error conditions} {
-    list [catch {scan abc {%[]a} x} msg] $msg
-} {1 {unmatched [ in format string}}
-
-test scan-9.1 {lots of arguments} {
-    scan "10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200" "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d" a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20
-} 20
-test scan-9.2 {lots of arguments} {
-    scan "10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200" "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d" a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 a16 a17 a18 a19 a20
-    set a20
-} 200
-
-test scan-10.1 {miscellaneous tests} {
-    set a {}
-    list [scan ab16c ab%dc a] $a
-} {1 16}
-test scan-10.2 {miscellaneous tests} {
-    set a {}
-    list [scan ax16c ab%dc a] $a
-} {0 {}}
-test scan-10.3 {miscellaneous tests} {
-    set a {}
-    list [catch {scan ab%c114 ab%%c%d a} msg] $msg $a
-} {0 1 114}
-test scan-10.4 {miscellaneous tests} {
-    set a {}
-    list [catch {scan ab%c14 ab%%c%d a} msg] $msg $a
-} {0 1 14}
-test scan-10.5 {miscellaneous tests} {
-    catch {unset arr}
-    set arr(2) {}
-    list [catch {scan ab%c14 ab%%c%d arr(2)} msg] $msg $arr(2)
-} {0 1 14}
-
-test scan-11.1 {alignment in results array (TCL_ALIGN)} {
-    scan "123 13.6" "%s %f" a b
-    set b
-} 13.6
-test scan-11.2 {alignment in results array (TCL_ALIGN)} {
-    scan "1234567 13.6" "%s %f" a b
-    set b
-} 13.6
-test scan-11.3 {alignment in results array (TCL_ALIGN)} {
-    scan "12345678901 13.6" "%s %f" a b
-    set b
-} 13.6
-test scan-11.4 {alignment in results array (TCL_ALIGN)} {
-    scan "123456789012345 13.6" "%s %f" a b
-    set b
-} 13.6
-test scan-11.5 {alignment in results array (TCL_ALIGN)} {
-    scan "1234567890123456789 13.6" "%s %f" a b
-    set b
-} 13.6
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/security.test b/tests/security.test
deleted file mode 100644
index d75696a..0000000
--- a/tests/security.test
+++ /dev/null
@@ -1,53 +0,0 @@
-# security.test --
-#
-# Functionality covered: this file contains a collection of tests for the
-# auto loading and namespaces.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-#
-# RCS: @(#) $Id: security.test,v 1.2 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# If this proc becomes invoked, then there is a bug
-
-proc BUG {args} {
-  set ::BUG 1
-}
-
-# Check and Clear the bug flag (to do before each test)
-set ::BUG 0
-
-proc CB {} {
-    set ret $::BUG
-    set ::BUG 0
-    return $ret
-}
-
-
-test sec-1.1 {tcl_endOfPreviousWord} {
-    catch {tcl_startOfPreviousWord x {[BUG]}}
-    CB
-} 0
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/set-old.test b/tests/set-old.test
deleted file mode 100644
index 08e2cd1..0000000
--- a/tests/set-old.test
+++ /dev/null
@@ -1,811 +0,0 @@
-# Commands covered:  set, unset, array
-#
-# This file includes the original set of tests for Tcl's set command.
-# Since the set command is now compiled, a new set of tests covering
-# the new implementation is in the file "set.test". Sourcing this file
-# into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: set-old.test,v 1.4 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc ignore args {}
-
-# Simple variable operations.
-
-catch {unset a}
-test set-old-1.1 {basic variable setting and unsetting} {
-    set a 22
-} 22
-test set-old-1.2 {basic variable setting and unsetting} {
-    set a 123
-    set a
-} 123
-test set-old-1.3 {basic variable setting and unsetting} {
-    set a xxx
-    format %s $a
-} xxx
-test set-old-1.4 {basic variable setting and unsetting} {
-    set a 44
-    unset a
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": no such variable}}
-
-# Basic array operations.
-
-catch {unset a}
-set a(xyz) 2
-set a(44) 3
-set {a(a long name)} test
-test set-old-2.1 {basic array operations} {
-    lsort [array names a]
-} {44 {a long name} xyz}
-test set-old-2.2 {basic array operations} {
-    set a(44)
-} 3
-test set-old-2.3 {basic array operations} {
-    set a(xyz)
-} 2
-test set-old-2.4 {basic array operations} {
-    set "a(a long name)"
-} test
-test set-old-2.5 {basic array operations} {
-    list [catch {set a(other)} msg] $msg
-} {1 {can't read "a(other)": no such element in array}}
-test set-old-2.6 {basic array operations} {
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": variable is array}}
-test set-old-2.7 {basic array operations} {
-    format %s $a(44)
-} 3
-test set-old-2.8 {basic array operations} {
-    format %s $a(a long name)
-} test
-unset a(44)
-test set-old-2.9 {basic array operations} {
-    lsort [array names a]
-} {{a long name} xyz}
-test set-old-2.10 {basic array operations} {
-    catch {unset b}
-    list [catch {set b(123)} msg] $msg
-} {1 {can't read "b(123)": no such variable}}
-test set-old-2.11 {basic array operations} {
-    catch {unset b}
-    set b 44
-    list [catch {set b(123)} msg] $msg
-} {1 {can't read "b(123)": variable isn't array}}
-test set-old-2.12 {basic array operations} {
-    list [catch {set a 14} msg] $msg
-} {1 {can't set "a": variable is array}}
-unset a
-test set-old-2.13 {basic array operations} {
-    list [catch {set a(xyz)} msg] $msg
-} {1 {can't read "a(xyz)": no such variable}}
-
-# Test the set commands, and exercise the corner cases of the code
-# that parses array references into two parts.
-
-test set-old-3.1 {set command} {
-    list [catch {set} msg] $msg
-} {1 {wrong # args: should be "set varName ?newValue?"}}
-test set-old-3.2 {set command} {
-    list [catch {set x y z} msg] $msg
-} {1 {wrong # args: should be "set varName ?newValue?"}}
-test set-old-3.3 {set command} {
-    catch {unset a}
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": no such variable}}
-test set-old-3.4 {set command} {
-    catch {unset a}
-    set a(14) 83
-    list [catch {set a 22} msg] $msg
-} {1 {can't set "a": variable is array}}
-
-# Test the corner-cases of parsing array names, using set and unset.
-
-test set-old-4.1 {parsing array names} {
-    catch {unset a}
-    set a(()) 44
-    list [catch {array names a} msg] $msg
-} {0 ()}
-test set-old-4.2 {parsing array names} {
-    catch {unset a a(abcd}
-    set a(abcd 33
-    info exists a(abcd
-} 1
-test set-old-4.3 {parsing array names} {
-    catch {unset a a(abcd}
-    set a(abcd 33
-    list [catch {array names a} msg] $msg
-} {0 {}}
-test set-old-4.4 {parsing array names} {
-    catch {unset a abcd)}
-    set abcd) 33
-    info exists abcd)
-} 1
-test set-old-4.5 {parsing array names} {
-    set a(bcd yyy
-    catch {unset a}
-    list [catch {set a(bcd} msg] $msg
-} {0 yyy}
-test set-old-4.6 {parsing array names} {
-    catch {unset a}
-    set a 44
-    list [catch {set a(bcd test} msg] $msg
-} {0 test}
-
-# Errors in reading variables
-
-test set-old-5.1 {errors in reading variables} {
-    catch {unset a}
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": no such variable}}
-test set-old-5.2 {errors in reading variables} {
-    catch {unset a}
-    set a 44
-    list [catch {set a(18)} msg] $msg
-} {1 {can't read "a(18)": variable isn't array}}
-test set-old-5.3 {errors in reading variables} {
-    catch {unset a}
-    set a(6) 44
-    list [catch {set a(18)} msg] $msg
-} {1 {can't read "a(18)": no such element in array}}
-test set-old-5.4 {errors in reading variables} {
-    catch {unset a}
-    set a(6) 44
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": variable is array}}
-
-# Errors and other special cases in writing variables
-
-test set-old-6.1 {creating array during write} {
-    catch {unset a}
-    trace var a rwu ignore
-    list [catch {set a(14) 186} msg] $msg [array names a]
-} {0 186 14}
-test set-old-6.2 {errors in writing variables} {
-    catch {unset a}
-    set a xxx
-    list [catch {set a(14) 186} msg] $msg
-} {1 {can't set "a(14)": variable isn't array}}
-test set-old-6.3 {errors in writing variables} {
-    catch {unset a}
-    set a(100) yyy
-    list [catch {set a 2} msg] $msg
-} {1 {can't set "a": variable is array}}
-test set-old-6.4 {expanding variable size} {
-    catch {unset a}
-    list [set a short] [set a "longer name"] [set a "even longer name"] \
-	    [set a "a much much truly longer name"]
-} {short {longer name} {even longer name} {a much much truly longer name}}
-
-# Unset command, Tcl_UnsetVar procedures
-
-test set-old-7.1 {unset command} {
-    catch {unset a}; catch {unset b}; catch {unset c}; catch {unset d}
-    set a 44
-    set b 55
-    set c 66
-    set d 77
-    unset a b c
-    list [catch {set a(0) 0}] [catch {set b(0) 0}] [catch {set c(0) 0}] \
-	    [catch {set d(0) 0}]
-} {0 0 0 1}
-test set-old-7.2 {unset command} {
-    list [catch {unset} msg] $msg
-} {1 {wrong # args: should be "unset varName ?varName ...?"}}
-test set-old-7.3 {unset command} {
-    catch {unset a}
-    list [catch {unset a} msg] $msg
-} {1 {can't unset "a": no such variable}}
-test set-old-7.4 {unset command} {
-    catch {unset a}
-    set a 44
-    list [catch {unset a(14)} msg] $msg
-} {1 {can't unset "a(14)": variable isn't array}}
-test set-old-7.5 {unset command} {
-    catch {unset a}
-    set a(0) xx
-    list [catch {unset a(14)} msg] $msg
-} {1 {can't unset "a(14)": no such element in array}}
-test set-old-7.6 {unset command} {
-    catch {unset a}; catch {unset b}; catch {unset c}
-    set a foo
-    set c gorp
-    list [catch {unset a a a(14)} msg] $msg [info exists c]
-} {1 {can't unset "a": no such variable} 1}
-test set-old-7.7 {unsetting globals from within procedures} {
-    set y 0
-    proc p1 {} {
-	global y
-	set z [p2]
-	return [list $z [catch {set y} msg] $msg]
-    }
-    proc p2 {} {global y; unset y; list [catch {set y} msg] $msg}
-    p1
-} {{1 {can't read "y": no such variable}} 1 {can't read "y": no such variable}}
-test set-old-7.8 {unsetting globals from within procedures} {
-    set y 0
-    proc p1 {} {
-	global y
-	p2
-	return [list [catch {set y 44} msg] $msg]
-    }
-    proc p2 {} {global y; unset y}
-    concat [p1] [list [catch {set y} msg] $msg]
-} {0 44 0 44}
-test set-old-7.9 {unsetting globals from within procedures} {
-    set y 0
-    proc p1 {} {
-	global y
-	unset y
-	return [list [catch {set y 55} msg] $msg]
-    }
-    concat [p1] [list [catch {set y} msg] $msg]
-} {0 55 0 55}
-test set-old-7.10 {unset command} {
-    catch {unset a}
-    set a(14) 22
-    unset a(14)
-    list [catch {set a(14)} msg] $msg [catch {array names a} msg2] $msg2
-} {1 {can't read "a(14)": no such element in array} 0 {}}
-test set-old-7.11 {unset command} {
-    catch {unset a}
-    set a(14) 22
-    unset a
-    list [catch {set a(14)} msg] $msg [catch {array names a} msg2] $msg2
-} {1 {can't read "a(14)": no such variable} 0 {}}
-
-# Array command.
-
-test set-old-8.1 {array command} {
-    list [catch {array} msg] $msg
-} {1 {wrong # args: should be "array option arrayName ?arg ...?"}}
-test set-old-8.2 {array command} {
-    list [catch {array a} msg] $msg
-} {1 {wrong # args: should be "array option arrayName ?arg ...?"}}
-test set-old-8.3 {array command} {
-    catch {unset a}
-    list [catch {array anymore a b} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.4 {array command} {
-    catch {unset a}
-    set a 44
-    list [catch {array anymore a b} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.5 {array command} {
-    proc foo {} {
-	set a 44
-	upvar 0 a x
-	list [catch {array anymore x b} msg] $msg
-    }
-    foo
-} {1 {"x" isn't an array}}
-test set-old-8.6 {array command} {
-    catch {unset a}
-    set a(22) 3
-    list [catch {array gorp a} msg] $msg
-} {1 {bad option "gorp": must be anymore, donesearch, exists, get, names, nextelement, set, size, or startsearch}}
-test set-old-8.7 {array command, anymore option} {
-    catch {unset a}
-    list [catch {array anymore a x} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.8 {array command, anymore option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array anymore a x]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.9 {array command, donesearch option} {
-    catch {unset a}
-    list [catch {array donesearch a x} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.10 {array command, donesearch option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array donesearch a x]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.11 {array command, exists option} {
-    list [catch {array exists a b} msg] $msg
-} {1 {wrong # args: should be "array exists arrayName"}}
-test set-old-8.12 {array command, exists option} {
-    catch {unset a}
-    array exists a
-} {0}
-test set-old-8.13 {array command, exists option} {
-    catch {unset a}
-    set a(0) 1
-    array exists a
-} {1}
-test set-old-8.14 {array command, exists option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array exists a]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {0 0}
-test set-old-8.15 {array command, get option} {
-    list [catch {array get} msg] $msg
-} {1 {wrong # args: should be "array option arrayName ?arg ...?"}}
-test set-old-8.16 {array command, get option} {
-    list [catch {array get a b c} msg] $msg
-} {1 {wrong # args: should be "array get arrayName ?pattern?"}}
-test set-old-8.17 {array command, get option} {
-    catch {unset a}
-    array get a
-} {}
-test set-old-8.18 {array command, get option} {
-    catch {unset a}
-    set a(22) 3
-    set {a(long name)} {}
-    array get a
-} {22 3 {long name} {}}
-test set-old-8.19 {array command, get option (unset variable)} {
-    catch {unset a}
-    set a(x) 3
-    trace var a(y) w ignore
-    array get a
-} {x 3}
-test set-old-8.20 {array command, get option, with pattern} {
-    catch {unset a}
-    set a(x1) 3
-    set a(x2) 4
-    set a(x3) 5
-    set a(b1) 24
-    set a(b2) 25
-    array get a x*
-} {x1 3 x2 4 x3 5}
-test set-old-8.21 {array command, get option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array get a]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {0 {}}
-test set-old-8.22 {array command, names option} {
-    catch {unset a}
-    set a(22) 3
-    list [catch {array names a 4 5} msg] $msg
-} {1 {wrong # args: should be "array names arrayName ?pattern?"}}
-test set-old-8.19 {array command, names option} {
-    catch {unset a}
-    array names a
-} {}
-test set-old-8.23 {array command, names option} {
-    catch {unset a}
-    set a(22) 3; set a(Textual_name) 44; set "a(name with spaces)" xxx
-    list [catch {lsort [array names a]} msg] $msg
-} {0 {22 Textual_name {name with spaces}}}
-test set-old-8.24 {array command, names option} {
-    catch {unset a}
-    set a(22) 3; set a(33) 44;
-    trace var a(xxx) w ignore
-    list [catch {lsort [array names a]} msg] $msg
-} {0 {22 33}}
-test set-old-8.25 {array command, names option} {
-    catch {unset a}
-    set a(22) 3; set a(33) 44;
-    trace var a(xxx) w ignore
-    set a(xxx) value
-    list [catch {lsort [array names a]} msg] $msg
-} {0 {22 33 xxx}}
-test set-old-8.26 {array command, names option} {
-    catch {unset a}
-    set a(axy) 3
-    set a(bxy) 44
-    set a(no) yes
-    set a(xxx) value
-    list [lsort [array names a *xy]] [lsort [array names a]]
-} {{axy bxy} {axy bxy no xxx}}
-test set-old-8.27 {array command, names option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array names a]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {0 {}}
-test set-old-8.28 {array command, nextelement option} {
-    list [catch {array nextelement a} msg] $msg
-} {1 {wrong # args: should be "array nextelement arrayName searchId"}}
-test set-old-8.29 {array command, nextelement option} {
-    catch {unset a}
-    list [catch {array nextelement a b} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.30 {array command, nextelement option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array nextelement a b]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.31 {array command, set option} {
-    list [catch {array set a} msg] $msg
-} {1 {wrong # args: should be "array set arrayName list"}}
-test set-old-8.32 {array command, set option} {
-    list [catch {array set a 1 2} msg] $msg
-} {1 {wrong # args: should be "array set arrayName list"}}
-test set-old-8.33 {array command, set option} {
-    list [catch {array set a "a \{ c"} msg] $msg
-} {1 {unmatched open brace in list}}
-test set-old-8.34 {array command, set option} {
-    catch {unset a}
-    set a 44
-    list [catch {array set a {a b c d}} msg] $msg
-} {1 {can't set "a(a)": variable isn't array}}
-test set-old-8.35 {array command, set option} {
-    catch {unset a}
-    set a(xx) yy
-    array set a {b c d e}
-    array get a
-} {d e xx yy b c}
-test set-old-8.36 {array command, set option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array set a {x 0}]
-        }
-        set a(x)
-    }
-    list [catch {foo 1} msg] $msg
-} {0 {}}
-test set-old-8.37 {array command, set option} {
-    catch {unset aVaRnAmE}
-    array set aVaRnAmE {}
-    list [info exists aVaRnAmE] [catch {set aVaRnAmE} msg] $msg
-} {1 1 {can't read "aVaRnAmE": variable is array}}
-test set-old-8.37.1 {array command, set scalar} {
-    catch {unset aVaRnAmE}
-    set aVaRnAmE 1
-    list [catch {array set aVaRnAmE {}} msg] $msg
-} {1 {can't array set "aVaRnAmE": variable isn't array}}
-test set-old-8.37.2 {array command, set alias} {
-    catch {unset aVaRnAmE}
-    upvar 0 aVaRnAmE anAliAs
-    array set anAliAs {}
-    list [array exists aVaRnAmE] [catch {set anAliAs} msg] $msg
-} {1 1 {can't read "anAliAs": variable is array}}
-test set-old-8.37.3 {array command, set element alias} {
-    catch {unset aVaRnAmE}
-    list [catch {upvar 0 aVaRnAmE(elem) elemAliAs}] \
-	    [catch {array set elemAliAs {}} msg] $msg
-} {0 1 {can't array set "elemAliAs": variable isn't array}}
-test set-old-8.37.4 {array command, empty set with populated array} {
-    catch {unset aVaRnAmE}
-    array set aVaRnAmE [list e1 v1 e2 v2]
-    array set aVaRnAmE {}
-    array set aVaRnAmE [list e3 v3]
-    list [lsort [array names aVaRnAmE]] [catch {set aVaRnAmE(e2)} msg] $msg
-} {{e1 e2 e3} 0 v2}
-test set-old-8.38 {array command, size option} {
-    catch {unset a}
-    array size a
-} {0}
-test set-old-8.39 {array command, size option} {
-    list [catch {array size a 4} msg] $msg
-} {1 {wrong # args: should be "array size arrayName"}}
-test set-old-8.40 {array command, size option} {
-    catch {unset a}
-    array size a
-} {0}
-test set-old-8.41 {array command, size option} {
-    catch {unset a}
-    set a(22) 3; set a(Textual_name) 44; set "a(name with spaces)" xxx
-    list [catch {array size a} msg] $msg
-} {0 3}
-test set-old-8.42 {array command, size option} {
-    catch {unset a}
-    set a(22) 3; set a(xx) 44; set a(y) xxx
-    unset a(22) a(y) a(xx)
-    list [catch {array size a} msg] $msg
-} {0 0}
-test set-old-8.43 {array command, size option} {
-    catch {unset a}
-    set a(22) 3;
-    trace var a(33) rwu ignore
-    list [catch {array size a} msg] $msg
-} {0 1}
-test set-old-8.44 {array command, size option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    proc foo {x} {
-        if {$x==1} {
-            return [array size a]
-        }
-        set a(x) 123
-    }
-    list [catch {foo 1} msg] $msg
-} {0 0}
-test set-old-8.45 {array command, startsearch option} {
-    list [catch {array startsearch a b} msg] $msg
-} {1 {wrong # args: should be "array startsearch arrayName"}}
-test set-old-8.46 {array command, startsearch option} {
-    catch {unset a}
-    list [catch {array startsearch a} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-8.47 {array command, startsearch option, array doesn't exist yet but has compiler-allocated procedure slot} {
-    catch {rename p ""}
-    proc p {x} {
-        if {$x==1} {
-            return [array startsearch a]
-        }
-        set a(x) 123
-    }
-    list [catch {p 1} msg] $msg
-} {1 {"a" isn't an array}}
-
-test set-old-9.1 {ids for array enumeration} {
-    catch {unset a}
-    set a(a) 1
-    list [array st a] [array st a] [array done a s-1-a; array st a] \
-	    [array done a s-2-a; array d a s-3-a; array start a]
-} {s-1-a s-2-a s-3-a s-1-a}
-test set-old-9.2 {array enumeration} {
-    catch {unset a}
-    set a(a) 1
-    set a(b) 1
-    set a(c) 1
-    set x [array startsearch a]
-    list [array nextelement a $x] [array ne a $x] [array next a $x] \
-	    [array next a $x] [array next a $x]
-} {a b c {} {}}
-test set-old-9.3 {array enumeration} {
-    catch {unset a}
-    set a(a) 1
-    set a(b) 1
-    set a(c) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    set z [array startsearch a]
-    list [array nextelement a $x] [array ne a $x] \
-	    [array next a $y] [array next a $z] [array next a $y] \
-	    [array next a $z] [array next a $y] [array next a $z] \
-	    [array next a $y] [array next a $z] [array next a $x] \
-	    [array next a $x]
-} {a b a a b b c c {} {} c {}}
-test set-old-9.4 {array enumeration: stopping searches} {
-    catch {unset a}
-    set a(a) 1
-    set a(b) 1
-    set a(c) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    set z [array startsearch a]
-    list [array next a $x] [array next a $x] [array next a $y] \
-	    [array done a $z; array next a $x] \
-	    [array done a $x; array next a $y] [array next a $y]
-} {a b a c b c}
-test set-old-9.5 {array enumeration: stopping searches} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    array done a $x
-    list [catch {array next a $x} msg] $msg
-} {1 {couldn't find search "s-1-a"}}
-test set-old-9.6 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    set a(b) 1
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {1 {couldn't find search "s-1-a"} 1 {couldn't find search "s-2-a"}}
-test set-old-9.7 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    set a(a) 2
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {0 a 0 a}
-test set-old-9.8 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set a(c) 2
-    set x [array startsearch a]
-    set y [array startsearch a]
-    catch {unset a(c)}
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {1 {couldn't find search "s-1-a"} 1 {couldn't find search "s-2-a"}}
-test set-old-9.9 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    catch {unset a(c)}
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {0 a 0 a}
-test set-old-9.10 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    trace var a(b) r {}
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {1 {couldn't find search "s-1-a"} 1 {couldn't find search "s-2-a"}}
-test set-old-9.11 {array enumeration: searches automatically stopped} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    set y [array startsearch a]
-    trace var a(a) r {}
-    list [catch {array next a $x} msg] $msg \
-	    [catch {array next a $y} msg2] $msg2
-} {0 a 0 a}
-test set-old-9.12 {array enumeration with traced undefined elements} {
-    catch {unset a}
-    set a(a) 1
-    trace var a(b) r {}
-    set x [array startsearch a]
-    list [array next a $x] [array next a $x]
-} {a {}}
-
-test set-old-10.1 {array enumeration errors} {
-    list [catch {array start} msg] $msg
-} {1 {wrong # args: should be "array option arrayName ?arg ...?"}}
-test set-old-10.2 {array enumeration errors} {
-    list [catch {array start a b} msg] $msg
-} {1 {wrong # args: should be "array startsearch arrayName"}}
-test set-old-10.3 {array enumeration errors} {
-    catch {unset a}
-    list [catch {array start a} msg] $msg
-} {1 {"a" isn't an array}}
-test set-old-10.4 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a} msg] $msg
-} {1 {wrong # args: should be "array nextelement arrayName searchId"}}
-test set-old-10.5 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a b c} msg] $msg
-} {1 {wrong # args: should be "array nextelement arrayName searchId"}}
-test set-old-10.6 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a a-1-a} msg] $msg
-} {1 {illegal search identifier "a-1-a"}}
-test set-old-10.7 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a sx1-a} msg] $msg
-} {1 {illegal search identifier "sx1-a"}}
-test set-old-10.8 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a s--a} msg] $msg
-} {1 {illegal search identifier "s--a"}}
-test set-old-10.9 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a s-1-b} msg] $msg
-} {1 {search identifier "s-1-b" isn't for variable "a"}}
-test set-old-10.10 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a s-1ba} msg] $msg
-} {1 {illegal search identifier "s-1ba"}}
-test set-old-10.11 {array enumeration errors} {
-    catch {unset a}
-    set a(a) 1
-    set x [array startsearch a]
-    list [catch {array next a s-2-a} msg] $msg
-} {1 {couldn't find search "s-2-a"}}
-test set-old-10.12 {array enumeration errors} {
-    list [catch {array done a} msg] $msg
-} {1 {wrong # args: should be "array donesearch arrayName searchId"}}
-test set-old-10.13 {array enumeration errors} {
-    list [catch {array done a b c} msg] $msg
-} {1 {wrong # args: should be "array donesearch arrayName searchId"}}
-test set-old-10.14 {array enumeration errors} {
-    list [catch {array done a b} msg] $msg
-} {1 {illegal search identifier "b"}}
-test set-old-10.15 {array enumeration errors} {
-    list [catch {array anymore a} msg] $msg
-} {1 {wrong # args: should be "array anymore arrayName searchId"}}
-test set-old-10.16 {array enumeration errors} {
-    list [catch {array any a b c} msg] $msg
-} {1 {wrong # args: should be "array anymore arrayName searchId"}}
-test set-old-10.17 {array enumeration errors} {
-    catch {unset a}
-    set a(0) 44
-    list [catch {array any a bogus} msg] $msg
-} {1 {illegal search identifier "bogus"}}
-
-# Array enumeration with "anymore" option
-
-test set-old-11.1 {array anymore option} {
-    catch {unset a}
-    set a(a) 1
-    set a(b) 2
-    set a(c) 3
-    array startsearch a
-    list [array anymore a s-1-a] [array next a s-1-a] \
-	    [array anymore a s-1-a] [array next a s-1-a] \
-	    [array anymore a s-1-a] [array next a s-1-a] \
-	    [array anymore a s-1-a] [array next a s-1-a] 
-} {1 a 1 b 1 c 0 {}}
-test set-old-11.2 {array anymore option} {
-    catch {unset a}
-    set a(a) 1
-    set a(b) 2
-    set a(c) 3
-    array startsearch a
-    list [array next a s-1-a] [array next a s-1-a] \
-	    [array anymore a s-1-a] [array next a s-1-a] \
-	    [array next a s-1-a] [array anymore a s-1-a] 
-} {a b 1 c {} 0}
-
-# Special check to see that the value of a variable is handled correctly
-# if it is returned as the result of a procedure (must not free the variable
-# string while deleting the call frame).  Errors will only be detected if
-# a memory consistency checker such as Purify is being used.
-
-test set-old-12.1 {cleanup on procedure return} {
-    proc foo {} {
-	set x 12345
-    }
-    foo
-} 12345
-test set-old-12.2 {cleanup on procedure return} {
-    proc foo {} {
-	set x(1) 23456
-    }
-    foo
-} 23456
-
-# Must delete variables when done, since these arrays get used as
-# scalars by other tests.
-catch {unset a}
-catch {unset b}
-catch {unset c}
-catch {unset aVaRnAmE}
-
-# cleanup
-::tcltest::cleanupTests
-return 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/set.test b/tests/set.test
deleted file mode 100644
index 7ffeb75..0000000
--- a/tests/set.test
+++ /dev/null
@@ -1,499 +0,0 @@
-# Commands covered:  set
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: set.test,v 1.3 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset x}
-catch {unset i}
-
-test set-1.1 {TclCompileSetCmd: missing variable name} {
-    list [catch {set} msg] $msg
-} {1 {wrong # args: should be "set varName ?newValue?"}}
-test set-1.2 {TclCompileSetCmd: simple variable name} {
-    set i 10
-    list [set i] $i
-} {10 10}
-test set-1.3 {TclCompileSetCmd: error compiling variable name} {
-    set i 10
-    catch {set "i"xxx} msg
-    set msg
-} {extra characters after close-quote}
-test set-1.4 {TclCompileSetCmd: simple variable name in quotes} {
-    set i 17
-    list [set "i"] $i
-} {17 17}
-test set-1.5 {TclCompileSetCmd: simple variable name in braces} {
-    catch {unset {a simple var}}
-    set {a simple var} 27
-    list [set {a simple var}] ${a simple var}
-} {27 27}
-test set-1.6 {TclCompileSetCmd: simple array variable name} {
-    catch {unset a}
-    set a(foo) 37
-    list [set a(foo)] $a(foo)
-} {37 37}
-test set-1.7 {TclCompileSetCmd: non-simple (computed) variable name} {
-    set x "i"
-    set i 77
-    list [set $x] $i
-} {77 77}
-test set-1.8 {TclCompileSetCmd: non-simple (computed) variable name} {
-    set x "i"
-    set i 77
-    list [set [set x] 2] $i
-} {2 2}
-
-test set-1.9 {TclCompileSetCmd: 3rd arg => assignment} {
-    set i "abcdef"
-    list [set i] $i
-} {abcdef abcdef}
-test set-1.10 {TclCompileSetCmd: only two args => just getting value} {
-    set i {one two}
-    set i
-} {one two}
-
-test set-1.11 {TclCompileSetCmd: simple global name} {
-    proc p {} {
-        global i
-        set i 54
-        set i
-    }
-    p
-} {54}
-test set-1.12 {TclCompileSetCmd: simple local name} {
-    proc p {bar} {
-        set foo $bar
-        set foo
-    }
-    p 999
-} {999}
-test set-1.13 {TclCompileSetCmd: simple but new (unknown) local name} {
-    proc p {} {
-        set bar
-    }
-    catch {p} msg
-    set msg
-} {can't read "bar": no such variable}
-test set-1.14 {TclCompileSetCmd: simple local name, >255 locals} {
-    proc 260locals {} {
-        # create 260 locals (the last ones with index > 255)
-        set a0 0; set a1 0; set a2 0; set a3 0; set a4 0
-        set a5 0; set a6 0; set a7 0; set a8 0; set a9 0
-        set b0 0; set b1 0; set b2 0; set b3 0; set b4 0
-        set b5 0; set b6 0; set b7 0; set b8 0; set b9 0
-        set c0 0; set c1 0; set c2 0; set c3 0; set c4 0
-        set c5 0; set c6 0; set c7 0; set c8 0; set c9 0
-        set d0 0; set d1 0; set d2 0; set d3 0; set d4 0
-        set d5 0; set d6 0; set d7 0; set d8 0; set d9 0
-        set e0 0; set e1 0; set e2 0; set e3 0; set e4 0
-        set e5 0; set e6 0; set e7 0; set e8 0; set e9 0
-        set f0 0; set f1 0; set f2 0; set f3 0; set f4 0
-        set f5 0; set f6 0; set f7 0; set f8 0; set f9 0
-        set g0 0; set g1 0; set g2 0; set g3 0; set g4 0
-        set g5 0; set g6 0; set g7 0; set g8 0; set g9 0
-        set h0 0; set h1 0; set h2 0; set h3 0; set h4 0
-        set h5 0; set h6 0; set h7 0; set h8 0; set h9 0
-        set i0 0; set i1 0; set i2 0; set i3 0; set i4 0
-        set i5 0; set i6 0; set i7 0; set i8 0; set i9 0
-        set j0 0; set j1 0; set j2 0; set j3 0; set j4 0
-        set j5 0; set j6 0; set j7 0; set j8 0; set j9 0
-        set k0 0; set k1 0; set k2 0; set k3 0; set k4 0
-        set k5 0; set k6 0; set k7 0; set k8 0; set k9 0
-        set l0 0; set l1 0; set l2 0; set l3 0; set l4 0
-        set l5 0; set l6 0; set l7 0; set l8 0; set l9 0
-        set m0 0; set m1 0; set m2 0; set m3 0; set m4 0
-        set m5 0; set m6 0; set m7 0; set m8 0; set m9 0
-        set n0 0; set n1 0; set n2 0; set n3 0; set n4 0
-        set n5 0; set n6 0; set n7 0; set n8 0; set n9 0
-        set o0 0; set o1 0; set o2 0; set o3 0; set o4 0
-        set o5 0; set o6 0; set o7 0; set o8 0; set o9 0
-        set p0 0; set p1 0; set p2 0; set p3 0; set p4 0
-        set p5 0; set p6 0; set p7 0; set p8 0; set p9 0
-        set q0 0; set q1 0; set q2 0; set q3 0; set q4 0
-        set q5 0; set q6 0; set q7 0; set q8 0; set q9 0
-        set r0 0; set r1 0; set r2 0; set r3 0; set r4 0
-        set r5 0; set r6 0; set r7 0; set r8 0; set r9 0
-        set s0 0; set s1 0; set s2 0; set s3 0; set s4 0
-        set s5 0; set s6 0; set s7 0; set s8 0; set s9 0
-        set t0 0; set t1 0; set t2 0; set t3 0; set t4 0
-        set t5 0; set t6 0; set t7 0; set t8 0; set t9 0
-        set u0 0; set u1 0; set u2 0; set u3 0; set u4 0
-        set u5 0; set u6 0; set u7 0; set u8 0; set u9 0
-        set v0 0; set v1 0; set v2 0; set v3 0; set v4 0
-        set v5 0; set v6 0; set v7 0; set v8 0; set v9 0
-        set w0 0; set w1 0; set w2 0; set w3 0; set w4 0
-        set w5 0; set w6 0; set w7 0; set w8 0; set w9 0
-        set x0 0; set x1 0; set x2 0; set x3 0; set x4 0
-        set x5 0; set x6 0; set x7 0; set x8 0; set x9 0
-        set y0 0; set y1 0; set y2 0; set y3 0; set y4 0
-        set y5 0; set y6 0; set y7 0; set y8 0; set y9 0
-        set z0 0; set z1 0; set z2 0; set z3 0; set z4 0
-        set z5 0; set z6 0; set z7 0; set z8 0; set z9 1234
-    }
-    260locals
-} {1234}
-test set-1.15 {TclCompileSetCmd: variable is array} {
-    catch {unset a}
-    set x 27
-    set x [set a(foo) 11]
-    catch {unset a}
-    set x
-} 11
-test set-1.16 {TclCompileSetCmd: variable is array, elem substitutions} {
-    catch {unset a}
-    set i 5
-    set x 789
-    set a(foo5) 27
-    set x [set a(foo$i)]
-    catch {unset a}
-    set x
-} 27
-
-test set-1.17 {TclCompileSetCmd: doing assignment, simple int} {
-    set i 5
-    set i 123
-} 123
-test set-1.18 {TclCompileSetCmd: doing assignment, simple int} {
-    set i 5
-    set i -100
-} -100
-test set-1.19 {TclCompileSetCmd: doing assignment, simple but not int} {
-    set i 5
-    set i 0x12MNOP
-    set i
-} {0x12MNOP}
-test set-1.20 {TclCompileSetCmd: doing assignment, in quotes} {
-    set i 25
-    set i "-100"
-} -100
-test set-1.21 {TclCompileSetCmd: doing assignment, in braces} {
-    set i 24
-    set i {126}
-} 126
-test set-1.22 {TclCompileSetCmd: doing assignment, large int} {
-    set i 5
-    set i 200000
-} 200000
-test set-1.23 {TclCompileSetCmd: doing assignment, formatted int != int} {
-    set i 25
-    set i 000012345     ;# an octal literal == 5349 decimal
-    list $i [incr i]
-} {000012345 5350}
-
-test set-1.24 {TclCompileSetCmd: too many arguments} {
-    set i 10
-    catch {set i 20 30} msg
-    set msg
-} {wrong # args: should be "set varName ?newValue?"}
-
-test set-2.1 {set command: runtime error, bad variable name} {
-    list [catch {set {"foo}} msg] $msg $errorInfo
-} {1 {can't read ""foo": no such variable} {can't read ""foo": no such variable
-    while executing
-"set {"foo}"}}
-test set-2.2 {set command: runtime error, not array variable} {
-    catch {unset b}
-    set b 44
-    list [catch {set b(123)} msg] $msg
-} {1 {can't read "b(123)": variable isn't array}}
-test set-2.3 {set command: runtime error, errors in reading variables} {
-    catch {unset a}
-    set a(6) 44
-    list [catch {set a(18)} msg] $msg
-} {1 {can't read "a(18)": no such element in array}}
-test set-2.4 {set command: runtime error, readonly variable} {
-    proc readonly args {error "variable is read-only"}
-    set x 123
-    trace var x w readonly
-    list [catch {set x 1} msg] $msg $errorInfo
-} {1 {can't set "x": variable is read-only} {can't set "x": variable is read-only
-    while executing
-"set x 1"}}
-test set-2.5 {set command: runtime error, basic array operations} {
-    list [catch {set a(other)} msg] $msg
-} {1 {can't read "a(other)": no such element in array}}
-test set-2.6 {set command: runtime error, basic array operations} {
-    list [catch {set a} msg] $msg
-} {1 {can't read "a": variable is array}}
-
-# Test the uncompiled version of set
-
-catch {unset a}
-catch {unset b}
-catch {unset i}
-catch {unset x}
-
-test set-3.1 {uncompiled set command: missing variable name} {
-    set z set
-    list [catch {$z} msg] $msg
-} {1 {wrong # args: should be "set varName ?newValue?"}}
-test set-3.2 {uncompiled set command: simple variable name} {
-    set z set
-    $z i 10
-    list [$z i] $i
-} {10 10}
-test set-3.3 {uncompiled set command: error compiling variable name} {
-    set z set
-    $z i 10
-    catch {$z "i"xxx} msg
-    $z msg
-} {extra characters after close-quote}
-test set-3.4 {uncompiled set command: simple variable name in quotes} {
-    set z set
-    $z i 17
-    list [$z "i"] $i
-} {17 17}
-test set-3.5 {uncompiled set command: simple variable name in braces} {
-    set z set
-    catch {unset {a simple var}}
-    $z {a simple var} 27
-    list [$z {a simple var}] ${a simple var}
-} {27 27}
-test set-3.6 {uncompiled set command: simple array variable name} {
-    set z set
-    catch {unset a}
-    $z a(foo) 37
-    list [$z a(foo)] $a(foo)
-} {37 37}
-test set-3.7 {uncompiled set command: non-simple (computed) variable name} {
-    set z set
-    $z x "i"
-    $z i 77
-    list [$z $x] $i
-} {77 77}
-test set-3.8 {uncompiled set command: non-simple (computed) variable name} {
-    set z set
-    $z x "i"
-    $z i 77
-    list [$z [$z x] 2] $i
-} {2 2}
-
-test set-3.9 {uncompiled set command: 3rd arg => assignment} {
-    set z set
-    $z i "abcdef"
-    list [$z i] $i
-} {abcdef abcdef}
-test set-3.10 {uncompiled set command: only two args => just getting value} {
-    set z set
-    $z i {one two}
-    $z i
-} {one two}
-
-test set-3.11 {uncompiled set command: simple global name} {
-    proc p {} {
-	set z set
-        global i
-        $z i 54
-        $z i
-    }
-    p
-} {54}
-test set-3.12 {uncompiled set command: simple local name} {
-    proc p {bar} {
-	set z set
-        $z foo $bar
-        $z foo
-    }
-    p 999
-} {999}
-test set-3.13 {uncompiled set command: simple but new (unknown) local name} {
-    set z set
-    proc p {} {
-	set z set
-        $z bar
-    }
-    catch {p} msg
-    $z msg
-} {can't read "bar": no such variable}
-test set-3.14 {uncompiled set command: simple local name, >255 locals} {
-    proc 260locals {} {
-	set z set
-        # create 260 locals (the last ones with index > 255)
-        $z a0 0; $z a1 0; $z a2 0; $z a3 0; $z a4 0
-        $z a5 0; $z a6 0; $z a7 0; $z a8 0; $z a9 0
-        $z b0 0; $z b1 0; $z b2 0; $z b3 0; $z b4 0
-        $z b5 0; $z b6 0; $z b7 0; $z b8 0; $z b9 0
-        $z c0 0; $z c1 0; $z c2 0; $z c3 0; $z c4 0
-        $z c5 0; $z c6 0; $z c7 0; $z c8 0; $z c9 0
-        $z d0 0; $z d1 0; $z d2 0; $z d3 0; $z d4 0
-        $z d5 0; $z d6 0; $z d7 0; $z d8 0; $z d9 0
-        $z e0 0; $z e1 0; $z e2 0; $z e3 0; $z e4 0
-        $z e5 0; $z e6 0; $z e7 0; $z e8 0; $z e9 0
-        $z f0 0; $z f1 0; $z f2 0; $z f3 0; $z f4 0
-        $z f5 0; $z f6 0; $z f7 0; $z f8 0; $z f9 0
-        $z g0 0; $z g1 0; $z g2 0; $z g3 0; $z g4 0
-        $z g5 0; $z g6 0; $z g7 0; $z g8 0; $z g9 0
-        $z h0 0; $z h1 0; $z h2 0; $z h3 0; $z h4 0
-        $z h5 0; $z h6 0; $z h7 0; $z h8 0; $z h9 0
-        $z i0 0; $z i1 0; $z i2 0; $z i3 0; $z i4 0
-        $z i5 0; $z i6 0; $z i7 0; $z i8 0; $z i9 0
-        $z j0 0; $z j1 0; $z j2 0; $z j3 0; $z j4 0
-        $z j5 0; $z j6 0; $z j7 0; $z j8 0; $z j9 0
-        $z k0 0; $z k1 0; $z k2 0; $z k3 0; $z k4 0
-        $z k5 0; $z k6 0; $z k7 0; $z k8 0; $z k9 0
-        $z l0 0; $z l1 0; $z l2 0; $z l3 0; $z l4 0
-        $z l5 0; $z l6 0; $z l7 0; $z l8 0; $z l9 0
-        $z m0 0; $z m1 0; $z m2 0; $z m3 0; $z m4 0
-        $z m5 0; $z m6 0; $z m7 0; $z m8 0; $z m9 0
-        $z n0 0; $z n1 0; $z n2 0; $z n3 0; $z n4 0
-        $z n5 0; $z n6 0; $z n7 0; $z n8 0; $z n9 0
-        $z o0 0; $z o1 0; $z o2 0; $z o3 0; $z o4 0
-        $z o5 0; $z o6 0; $z o7 0; $z o8 0; $z o9 0
-        $z p0 0; $z p1 0; $z p2 0; $z p3 0; $z p4 0
-        $z p5 0; $z p6 0; $z p7 0; $z p8 0; $z p9 0
-        $z q0 0; $z q1 0; $z q2 0; $z q3 0; $z q4 0
-        $z q5 0; $z q6 0; $z q7 0; $z q8 0; $z q9 0
-        $z r0 0; $z r1 0; $z r2 0; $z r3 0; $z r4 0
-        $z r5 0; $z r6 0; $z r7 0; $z r8 0; $z r9 0
-        $z s0 0; $z s1 0; $z s2 0; $z s3 0; $z s4 0
-        $z s5 0; $z s6 0; $z s7 0; $z s8 0; $z s9 0
-        $z t0 0; $z t1 0; $z t2 0; $z t3 0; $z t4 0
-        $z t5 0; $z t6 0; $z t7 0; $z t8 0; $z t9 0
-        $z u0 0; $z u1 0; $z u2 0; $z u3 0; $z u4 0
-        $z u5 0; $z u6 0; $z u7 0; $z u8 0; $z u9 0
-        $z v0 0; $z v1 0; $z v2 0; $z v3 0; $z v4 0
-        $z v5 0; $z v6 0; $z v7 0; $z v8 0; $z v9 0
-        $z w0 0; $z w1 0; $z w2 0; $z w3 0; $z w4 0
-        $z w5 0; $z w6 0; $z w7 0; $z w8 0; $z w9 0
-        $z x0 0; $z x1 0; $z x2 0; $z x3 0; $z x4 0
-        $z x5 0; $z x6 0; $z x7 0; $z x8 0; $z x9 0
-        $z y0 0; $z y1 0; $z y2 0; $z y3 0; $z y4 0
-        $z y5 0; $z y6 0; $z y7 0; $z y8 0; $z y9 0
-        $z z0 0; $z z1 0; $z z2 0; $z z3 0; $z z4 0
-        $z z5 0; $z z6 0; $z z7 0; $z z8 0; $z z9 1234
-    }
-    260locals
-} {1234}
-test set-3.15 {uncompiled set command: variable is array} {
-    set z set
-    catch {unset a}
-    $z x 27
-    $z x [$z a(foo) 11]
-    catch {unset a}
-    $z x
-} 11
-test set-3.16 {uncompiled set command: variable is array, elem substitutions} {
-    set z set
-    catch {unset a}
-    $z i 5
-    $z x 789
-    $z a(foo5) 27
-    $z x [$z a(foo$i)]
-    catch {unset a}
-    $z x
-} 27
-
-test set-3.17 {uncompiled set command: doing assignment, simple int} {
-    set z set
-    $z i 5
-    $z i 123
-} 123
-test set-3.18 {uncompiled set command: doing assignment, simple int} {
-    set z set
-    $z i 5
-    $z i -100
-} -100
-test set-3.19 {uncompiled set command: doing assignment, simple but not int} {
-    set z set
-    $z i 5
-    $z i 0x12MNOP
-    $z i
-} {0x12MNOP}
-test set-3.20 {uncompiled set command: doing assignment, in quotes} {
-    set z set
-    $z i 25
-    $z i "-100"
-} -100
-test set-3.21 {uncompiled set command: doing assignment, in braces} {
-    set z set
-    $z i 24
-    $z i {126}
-} 126
-test set-3.22 {uncompiled set command: doing assignment, large int} {
-    set z set
-    $z i 5
-    $z i 200000
-} 200000
-test set-3.23 {uncompiled set command: doing assignment, formatted int != int} {
-    set z set
-    $z i 25
-    $z i 000012345     ;# an octal literal == 5349 decimal
-    list $i [incr i]
-} {000012345 5350}
-
-test set-3.24 {uncompiled set command: too many arguments} {
-    set z set
-    $z i 10
-    catch {$z i 20 30} msg
-    $z msg
-} {wrong # args: should be "set varName ?newValue?"}
-
-test set-4.1 {uncompiled set command: runtime error, bad variable name} {
-    set z set
-    list [catch {$z {"foo}} msg] $msg $errorInfo
-} {1 {can't read ""foo": no such variable} {can't read ""foo": no such variable
-    while executing
-"$z {"foo}"}}
-test set-4.2 {uncompiled set command: runtime error, not array variable} {
-    set z set
-    catch {unset b}
-    $z b 44
-    list [catch {$z b(123)} msg] $msg
-} {1 {can't read "b(123)": variable isn't array}}
-test set-4.3 {uncompiled set command: runtime error, errors in reading variables} {
-     set z set
-   catch {unset a}
-    $z a(6) 44
-    list [catch {$z a(18)} msg] $msg
-} {1 {can't read "a(18)": no such element in array}}
-test set-4.4 {uncompiled set command: runtime error, readonly variable} {
-    set z set
-    proc readonly args {error "variable is read-only"}
-    $z x 123
-    trace var x w readonly
-    list [catch {$z x 1} msg] $msg $errorInfo
-} {1 {can't set "x": variable is read-only} {can't set "x": variable is read-only
-    while executing
-"$z x 1"}}
-test set-4.5 {uncompiled set command: runtime error, basic array operations} {
-    set z set
-    list [catch {$z a(other)} msg] $msg
-} {1 {can't read "a(other)": no such element in array}}
-test set-4.6 {set command: runtime error, basic array operations} {
-    set z set
-    list [catch {$z a} msg] $msg
-} {1 {can't read "a": variable is array}}
-
-# cleanup
-catch {unset a}
-catch {unset b}
-catch {unset i}
-catch {unset x}
-catch {unset z}
-::tcltest::cleanupTests
-return 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/socket.test b/tests/socket.test
deleted file mode 100644
index 249dc5e..0000000
--- a/tests/socket.test
+++ /dev/null
@@ -1,1669 +0,0 @@
-# Commands tested in this file: socket.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: socket.test,v 1.7 1999/04/16 00:47:34 stanton Exp $
-
-# Running socket tests with a remote server:
-# ------------------------------------------
-# 
-# Some tests in socket.test depend on the existence of a remote server to
-# which they connect. The remote server must be an instance of tcltest and it
-# must run the script found in the file "remote.tcl" in this directory. You
-# can start the remote server on any machine reachable from the machine on
-# which you want to run the socket tests, by issuing:
-# 
-#     tcltest remote.tcl -port 2048	# Or choose another port number.
-# 
-# If the machine you are running the remote server on has several IP
-# interfaces, you can choose which interface the server listens on for
-# connections by specifying the -address command line flag, so:
-# 
-#     tcltest remote.tcl -address your.machine.com
-# 
-# These options can also be set by environment variables. On Unix, you can
-# type these commands to the shell from which the remote server is started:
-# 
-#     shell% setenv serverPort 2048
-#     shell% setenv serverAddress your.machine.com
-# 
-# and subsequently you can start the remote server with:
-# 
-#     tcltest remote.tcl
-# 
-# to have it listen on port 2048 on the interface your.machine.com.
-#     
-# When the server starts, it prints out a detailed message containing its
-# configuration information, and it will block until killed with a Ctrl-C.
-# Once the remote server exists, you can run the tests in socket.test with
-# the server by setting two Tcl variables:
-# 
-#     % set remoteServerIP <name or address of machine on which server runs>
-#     % set remoteServerPort 2048
-# 
-# These variables are also settable from the environment. On Unix, you can:
-# 
-#     shell% setenv remoteServerIP machine.where.server.runs
-#     shell% senetv remoteServerPort 2048
-# 
-# The preamble of the socket.test file checks to see if the variables are set
-# either in Tcl or in the environment; if they are, it attempts to connect to
-# the server. If the connection is successful, the tests using the remote
-# server will be performed; otherwise, it will attempt to start the remote
-# server (via exec) on platforms that support this, on the local host,
-# listening at port 2048. If all fails, a message is printed and the tests
-# using the remote server are not performed.
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Some tests require the testthread command
-
-set ::tcltest::testConfig(testthread) \
-	[expr {[info commands testthread] != {}}]
-
-#
-# If remoteServerIP or remoteServerPort are not set, check in the
-# environment variables for externally set values.
-#
-
-if {![info exists remoteServerIP]} {
-    if {[info exists env(remoteServerIP)]} {
-	set remoteServerIP $env(remoteServerIP)
-    }
-}
-if {![info exists remoteServerPort]} {
-    if {[info exists env(remoteServerIP)]} {
-	set remoteServerPort $env(remoteServerPort)
-    } else {
-        if {[info exists remoteServerIP]} {
-	    set remoteServerPort 2048
-        }
-    }
-}
-
-#
-# Check if we're supposed to do tests against the remote server
-#
-
-set doTestsWithRemoteServer 1
-if {![info exists remoteServerIP] && ($tcl_platform(platform) != "macintosh")} {
-    set remoteServerIP 127.0.0.1
-}
-if {($doTestsWithRemoteServer == 1) && (![info exists remoteServerPort])} {
-    set remoteServerPort 2048
-}
-
-# Attempt to connect to a remote server if one is already running. If it
-# is not running or for some other reason the connect fails, attempt to
-# start the remote server on the local host listening on port 2048. This
-# is only done on platforms that support exec (i.e. not on the Mac). On
-# platforms that do not support exec, the remote server must be started
-# by the user before running the tests.
-
-set remoteProcChan ""
-set commandSocket ""
-if {$doTestsWithRemoteServer} {
-    catch {close $commandSocket}
-    if {[catch {set commandSocket [socket $remoteServerIP \
-						$remoteServerPort]}] != 0} {
-	if {[info commands exec] == ""} {
-	    set noRemoteTestReason "can't exec"
-	    set doTestsWithRemoteServer 0
-	} else {
-	    set remoteServerIP 127.0.0.1
-	    set remoteFile [file join [pwd] remote.tcl]
-	    if {[catch {set remoteProcChan \
-				[open "|[list $tcltest $remoteFile \
-					-serverIsSilent \
-					-port $remoteServerPort \
-					-address $remoteServerIP]" \
-					w+]} \
-		   msg] == 0} {
-		after 1000
-		if {[catch {set commandSocket [socket $remoteServerIP \
-				$remoteServerPort]} msg] == 0} {
-		    fconfigure $commandSocket -translation crlf -buffering line
-		} else {
-		    set noRemoteTestReason $msg
-		    set doTestsWithRemoteServer 0
-		}
-	    } else {
-		set noRemoteTestReason "$msg $tcltest"
-		set doTestsWithRemoteServer 0
-	    }
-	}
-    } else {
-	fconfigure $commandSocket -translation crlf -buffering line
-    }
-}
-
-# Some tests are run only if we are doing testing against a remote server.
-set ::tcltest::testConfig(doTestsWithRemoteServer) $doTestsWithRemoteServer
-if {$doTestsWithRemoteServer == 0} {
-    if {[string first s $::tcltest::verbose] != -1} {
-    	puts "Skipping tests with remote server. See tests/socket.test for"
-	puts "information on how to run remote server."
-	puts "Reason for not doing remote tests: $noRemoteTestReason"
-    }
-}
-
-#
-# If we do the tests, define a command to send a command to the
-# remote server.
-#
-
-if {$doTestsWithRemoteServer == 1} {
-    proc sendCommand {c} {
-	global commandSocket
-
-	if {[eof $commandSocket]} {
-	    error "remote server disappeared"
-	}
-
-	if {[catch {puts $commandSocket $c} msg]} {
-	    error "remote server disappaered: $msg"
-	}
-	if {[catch {puts $commandSocket "--Marker--Marker--Marker--"} msg]} {
-	    error "remote server disappeared: $msg"
-	}
-
-	set resp ""
-	while {1} {
-	    set line [gets $commandSocket]
-	    if {[eof $commandSocket]} {
-		error "remote server disappaered"
-	    }
-	    if {[string compare $line "--Marker--Marker--Marker--"] == 0} {
-		if {[string compare [lindex $resp 0] error] == 0} {
-		    error [lindex $resp 1]
-		} else {
-		    return [lindex $resp 1]
-		}
-	    } else {
-		append resp $line "\n"
-	    }
-	}
-    }
-}
-
-test socket-1.1 {arg parsing for socket command} {socket} {
-    list [catch {socket -server} msg] $msg
-} {1 {no argument given for -server option}}
-test socket-1.2 {arg parsing for socket command} {socket} {
-    list [catch {socket -server foo} msg] $msg
-} {1 {wrong # args: should be either:
-socket ?-myaddr addr? ?-myport myport? ?-async? host port
-socket -server command ?-myaddr addr? port}}
-test socket-1.3 {arg parsing for socket command} {socket} {
-    list [catch {socket -myaddr} msg] $msg
-} {1 {no argument given for -myaddr option}}
-test socket-1.4 {arg parsing for socket command} {socket} {
-    list [catch {socket -myaddr 127.0.0.1} msg] $msg
-} {1 {wrong # args: should be either:
-socket ?-myaddr addr? ?-myport myport? ?-async? host port
-socket -server command ?-myaddr addr? port}}
-test socket-1.5 {arg parsing for socket command} {socket} {
-    list [catch {socket -myport} msg] $msg
-} {1 {no argument given for -myport option}}
-test socket-1.6 {arg parsing for socket command} {socket} {
-    list [catch {socket -myport xxxx} msg] $msg
-} {1 {expected integer but got "xxxx"}}
-test socket-1.7 {arg parsing for socket command} {socket} {
-    list [catch {socket -myport 2522} msg] $msg
-} {1 {wrong # args: should be either:
-socket ?-myaddr addr? ?-myport myport? ?-async? host port
-socket -server command ?-myaddr addr? port}}
-test socket-1.8 {arg parsing for socket command} {socket} {
-    list [catch {socket -froboz} msg] $msg
-} {1 {bad option "-froboz": must be -async, -myaddr, -myport, or -server}}
-test socket-1.9 {arg parsing for socket command} {socket} {
-    list [catch {socket -server foo -myport 2521 3333} msg] $msg
-} {1 {Option -myport is not valid for servers}}
-test socket-1.10 {arg parsing for socket command} {socket} {
-    list [catch {socket host 2528 -junk} msg] $msg
-} {1 {wrong # args: should be either:
-socket ?-myaddr addr? ?-myport myport? ?-async? host port
-socket -server command ?-myaddr addr? port}}
-test socket-1.11 {arg parsing for socket command} {socket} {
-    list [catch {socket -server callback 2520 --} msg] $msg
-} {1 {wrong # args: should be either:
-socket ?-myaddr addr? ?-myport myport? ?-async? host port
-socket -server command ?-myaddr addr? port}}
-test socket-1.12 {arg parsing for socket command} {socket} {
-    list [catch {socket foo badport} msg] $msg
-} {1 {expected integer but got "badport"}}
-
-test socket-2.1 {tcp connection} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x timed_out"]
-	set f [socket -server accept 2828]
-	proc accept {file addr port} {
-	    global x
-	    set x done
-            close $file
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-	puts $x
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f x
-    if {[catch {socket 127.0.0.1 2828} msg]} {
-        set x $msg
-    } else {
-        lappend x [gets $f]
-        close $msg
-    }
-    lappend x [gets $f]
-    close $f
-    set x
-} {ready done {}}
-
-if [info exists port] {
-    incr port
-} else { 
-    set port [expr 2048 + [pid]%1024]
-}
-test socket-2.2 {tcp connection with client port specified} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x done"]
-        set f [socket -server accept 2829]
-	proc accept {file addr port} {
-            global x
-            puts "[gets $file] $port"
-            close $file
-            set x done
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f x
-    global port
-    if {[catch {socket -myport $port 127.0.0.1 2829} sock]} {
-        set x $sock
-	close [socket 127.0.0.1 2829]
-	puts stderr $sock
-    } else {
-        puts $sock hello
-	flush $sock
-        lappend x [gets $f]
-        close $sock
-    }
-    close $f
-    set x
-} [list ready "hello $port"]
-test socket-2.3 {tcp connection with client interface specified} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x done"]
-        set f [socket  -server accept 2830]
-	proc accept {file addr port} {
-            global x
-            puts "[gets $file] $addr"
-            close $file
-            set x done
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f x
-    if {[catch {socket -myaddr 127.0.0.1 127.0.0.1 2830} sock]} {
-        set x $sock
-    } else {
-        puts $sock hello
-	flush $sock
-        lappend x [gets $f]
-        close $sock
-    }
-    close $f
-    set x
-} {ready {hello 127.0.0.1}}
-test socket-2.4 {tcp connection with server interface specified} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x done"]
-        set f [socket -server accept -myaddr [info hostname] 2831]
-	proc accept {file addr port} {
-            global x
-            puts "[gets $file]"
-            close $file
-            set x done
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f x
-    if {[catch {socket [info hostname] 2831} sock]} {
-        set x $sock
-    } else {
-        puts $sock hello
-	flush $sock
-        lappend x [gets $f]
-        close $sock
-    }
-    close $f
-    set x
-} {ready hello}
-test socket-2.5 {tcp connection with redundant server port} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x done"]
-        set f [socket -server accept 2832]
-	proc accept {file addr port} {
-            global x
-            puts "[gets $file]"
-            close $file
-            set x done
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f x
-    if {[catch {socket 127.0.0.1 2832} sock]} {
-        set x $sock
-    } else {
-        puts $sock hello
-	flush $sock
-        lappend x [gets $f]
-        close $sock
-    }
-    close $f
-    set x
-} {ready hello}
-test socket-2.6 {tcp connection} {socket} {
-    set status ok
-    if {![catch {set sock [socket 127.0.0.1 2833]}]} {
-	if {![catch {gets $sock}]} {
-	    set status broken
-	}
-	close $sock
-    }
-    set status
-} ok
-test socket-2.7 {echo server, one line} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set timer [after 2000 "set x done"]
-	set f [socket -server accept 2834]
-	proc accept {s a p} {
-            fileevent $s readable [list echo $s]
-	    fconfigure $s -translation lf -buffering line
-        }
-	proc echo {s} {
-	     set l [gets $s]
-             if {[eof $s]} {
-                 global x
-                 close $s
-                 set x done
-             } else {
-                 puts $s $l
-             }
-	}
-	puts ready
-	vwait x
-	after cancel $timer
-	close $f
-	puts done
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f
-    set s [socket 127.0.0.1 2834]
-    fconfigure $s -buffering line -translation lf
-    puts $s "hello abcdefghijklmnop"
-    after 1000
-    set x [gets $s]
-    close $s
-    set y [gets $f]
-    close $f
-    list $x $y
-} {{hello abcdefghijklmnop} done}
-test socket-2.8 {echo server, loop 50 times, single connection} {socket stdio} {
-    makeFile {
-	set f [socket -server accept 2835]
-	proc accept {s a p} {
-            fileevent $s readable [list echo $s]
-            fconfigure $s -buffering line
-        }
-	proc echo {s} {
-	     global i
-             set l [gets $s]
-             if {[eof $s]} {
-                 global x
-                 close $s
-                 set x done
-             } else { 
-	         incr i
-                 puts $s $l
-             }
-	}
-	set i 0
-	puts ready
-	set timer [after 20000 "set x done"]
-	vwait x
-	after cancel $timer
-	close $f
-	puts "done $i"
-    } script
-    set f [open "|[list $tcltest script]" r]
-    gets $f
-    set s [socket 127.0.0.1 2835]
-    fconfigure $s -buffering line
-    catch {
-	for {set x 0} {$x < 50} {incr x} {
-	    puts $s "hello abcdefghijklmnop"
-	    gets $s
-	}
-    }
-    close $s
-    catch {set x [gets $f]}
-    close $f
-    set x
-} {done 50}
-test socket-2.9 {socket conflict} {socket stdio} {
-    set s [socket -server accept 2828]
-    removeFile script
-    set f [open script w]
-    puts -nonewline $f {socket -server accept 2828}
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f
-    after 100
-    set x [list [catch {close $f} msg] $msg]
-    close $s
-    set x
-} {1 {couldn't open socket: address already in use
-    while executing
-"socket -server accept 2828"
-    (file "script" line 1)}}
-test socket-2.10 {close on accept, accepted socket lives} {socket} {
-    set done 0
-    set timer [after 20000 "set done timed_out"]
-    set ss [socket -server accept 2830]
-    proc accept {s a p} {
-	global ss
-	close $ss
-	fileevent $s readable "readit $s"
-	fconfigure $s -trans lf
-    }
-    proc readit {s} {
-	global done
-	gets $s
-	close $s
-	set done 1
-    }
-    set cs [socket [info hostname] 2830]
-    puts $cs hello
-    close $cs
-    vwait done
-    after cancel $timer
-    set done
-} 1
-test socket-2.11 {detecting new data} {socket} {
-    proc accept {s a p} {
-	global sock
-	set sock $s
-    }
-
-    set s [socket -server accept 2400]
-    set sock ""
-    set s2 [socket 127.0.0.1 2400]
-    vwait sock
-    puts $s2 one
-    flush $s2
-    after 500
-    fconfigure $sock -blocking 0
-    set result [gets $sock]
-    lappend result [gets $sock]
-    fconfigure $sock -blocking 1
-    puts $s2 two
-    flush $s2
-    fconfigure $sock -blocking 0
-    lappend result [gets $sock]
-    fconfigure $sock -blocking 1
-    close $s2
-    close $s
-    close $sock
-    set result
-} {one {} two}
-
-
-test socket-3.1 {socket conflict} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set f [socket -server accept 2828]
-	puts ready
-	gets stdin
-	close $f
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r+]
-    gets $f
-    set x [list [catch {socket -server accept 2828} msg] \
-		$msg]
-    puts $f bye
-    close $f
-    set x
-} {1 {couldn't open socket: address already in use}}
-test socket-3.2 {server with several clients} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	set t1 [after 30000 "set x timed_out"]
-	set t2 [after 31000 "set x timed_out"]
-	set t3 [after 32000 "set x timed_out"]
-	set counter 0
-	set s [socket -server accept 2828]
-	proc accept {s a p} {
-	    fileevent $s readable [list echo $s]
-	    fconfigure $s -buffering line
-	}
-	proc echo {s} {
-	     global x
-             set l [gets $s]
-             if {[eof $s]} {
-                 close $s
-                 set x done
-             } else {
-                 puts $s $l
-             }
-	}
-	puts ready
-	vwait x
-	after cancel $t1
-	vwait x
-	after cancel $t2
-	vwait x
-	after cancel $t3
-	close $s
-	puts $x
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r+]
-    set x [gets $f]
-    set s1 [socket 127.0.0.1 2828]
-    fconfigure $s1 -buffering line
-    set s2 [socket 127.0.0.1 2828]
-    fconfigure $s2 -buffering line
-    set s3 [socket 127.0.0.1 2828]
-    fconfigure $s3 -buffering line
-    for {set i 0} {$i < 100} {incr i} {
-	puts $s1 hello,s1
-	gets $s1
-	puts $s2 hello,s2
-	gets $s2
-	puts $s3 hello,s3
-	gets $s3
-    }
-    close $s1
-    close $s2
-    close $s3
-    lappend x [gets $f]
-    close $f
-    set x
-} {ready done}
-
-test socket-4.1 {server with several clients} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	gets stdin
-	set s [socket 127.0.0.1 2828]
-	fconfigure $s -buffering line
-	for {set i 0} {$i < 100} {incr i} {
-	    puts $s hello
-	    gets $s
-	}
-	close $s
-	puts bye
-	gets stdin
-    }
-    close $f
-    set p1 [open "|[list $tcltest script]" r+]
-    fconfigure $p1 -buffering line
-    set p2 [open "|[list $tcltest script]" r+]
-    fconfigure $p2 -buffering line
-    set p3 [open "|[list $tcltest script]" r+]
-    fconfigure $p3 -buffering line
-    proc accept {s a p} {
-	fconfigure $s -buffering line
-	fileevent $s readable [list echo $s]
-    }
-    proc echo {s} {
-	global x
-        set l [gets $s]
-        if {[eof $s]} {
-            close $s
-            set x done
-        } else {
-            puts $s $l
-        }
-    }
-    set t1 [after 30000 "set x timed_out"]
-    set t2 [after 31000 "set x timed_out"]
-    set t3 [after 32000 "set x timed_out"]
-    set s [socket -server accept 2828]
-    puts $p1 open
-    puts $p2 open
-    puts $p3 open
-    vwait x
-    vwait x
-    vwait x
-    after cancel $t1
-    after cancel $t2
-    after cancel $t3
-    close $s
-    set l ""
-    lappend l [list p1 [gets $p1] $x]
-    lappend l [list p2 [gets $p2] $x]
-    lappend l [list p3 [gets $p3] $x]
-    puts $p1 bye
-    puts $p2 bye
-    puts $p3 bye
-    close $p1
-    close $p2
-    close $p3
-    set l
-} {{p1 bye done} {p2 bye done} {p3 bye done}}
-test socket-4.2 {byte order problems, socket numbers, htons} {socket} {
-    set x ok
-    if {[catch {socket -server dodo 0x3000} msg]} {
-	set x $msg
-    } else {
-	close $msg
-    }
-    set x
-} ok
-
-test socket-5.1 {byte order problems, socket numbers, htons} \
-	{socket unixOnly notRoot} {
-    set x {couldn't open socket: not owner}
-    if {![catch {socket -server dodo 0x1} msg]} {
-        set x {htons problem, should be disallowed, are you running as SU?}
-	close $msg
-    }
-    set x
-} {couldn't open socket: not owner}
-test socket-5.2 {byte order problems, socket numbers, htons} {socket} {
-    set x {couldn't open socket: port number too high}
-    if {![catch {socket -server dodo 0x10000} msg]} {
-	set x {port resolution problem, should be disallowed}
-	close $msg
-    }
-    set x
-} {couldn't open socket: port number too high}
-test socket-5.3 {byte order problems, socket numbers, htons} \
-	{socket unixOnly notRoot} {
-    set x {couldn't open socket: not owner}
-    if {![catch {socket -server dodo 21} msg]} {
-	set x {htons problem, should be disallowed, are you running as SU?}
-	close $msg
-    }
-    set x
-} {couldn't open socket: not owner}
-
-test socket-6.1 {accept callback error} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	gets stdin
-	socket 127.0.0.1 2848
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r+]
-    proc bgerror args {
-	global x
-	set x $args
-    }
-    proc accept {s a p} {expr 10 / 0}
-    set s [socket -server accept 2848]
-    puts $f hello
-    close $f
-    set timer [after 10000 "set x timed_out"]
-    vwait x
-    after cancel $timer
-    close $s
-    rename bgerror {}
-    set x
-} {{divide by zero}}
-
-test socket-7.1 {testing socket specific options} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	socket -server accept 2820
-	proc accept args {
-	    global x
-	    set x done
-	}
-	puts ready
-	set timer [after 10000 "set x timed_out"]
-	vwait x
-	after cancel $timer
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f
-    set s [socket 127.0.0.1 2820]
-    set p [fconfigure $s -peername]
-    close $s
-    close $f
-    set l ""
-    lappend l [string compare [lindex $p 0] 127.0.0.1]
-    lappend l [string compare [lindex $p 2] 2820]
-    lappend l [llength $p]
-} {0 0 3}
-test socket-7.2 {testing socket specific options} {socket stdio} {
-    removeFile script
-    set f [open script w]
-    puts $f {
-	socket -server accept 2821
-	proc accept args {
-	    global x
-	    set x done
-	}
-	puts ready
-	set timer [after 10000 "set x timed_out"]
-	vwait x
-	after cancel $timer
-    }
-    close $f
-    set f [open "|[list $tcltest script]" r]
-    gets $f
-    set s [socket 127.0.0.1 2821]
-    set p [fconfigure $s -sockname]
-    close $s
-    close $f
-    set l ""
-    lappend l [llength $p]
-    lappend l [lindex $p 0]
-    lappend l [expr [lindex $p 2] == 2821]
-} {3 127.0.0.1 0}
-test socket-7.3 {testing socket specific options} {socket} {
-    set s [socket -server accept 2822]
-    set l [fconfigure $s]
-    close $s
-    update
-    llength $l
-} 12
-test socket-7.4 {testing socket specific options} {socket} {
-    set s [socket -server accept 2823]
-    proc accept {s a p} {
-	global x
-	set x [fconfigure $s -sockname]
-	close $s
-    }
-    set s1 [socket [info hostname] 2823]
-    set timer [after 10000 "set x timed_out"]
-    vwait x
-    after cancel $timer
-    close $s
-    close $s1
-    set l ""
-    lappend l [lindex $x 2] [llength $x]
-} {2823 3}
-test socket-7.5 {testing socket specific options} {socket unixOrPc} {
-    set s [socket -server accept 2829]
-    proc accept {s a p} {
-	global x
-	set x [fconfigure $s -sockname]
-	close $s
-    }
-    set s1 [socket 127.0.0.1 2829]
-    set timer [after 10000 "set x timed_out"]
-    vwait x
-    after cancel $timer
-    close $s
-    close $s1
-    set l ""
-    lappend l [lindex $x 0] [lindex $x 2] [llength $x]
-} {127.0.0.1 2829 3}
-
-test socket-8.1 {testing -async flag on sockets} {socket} {
-    # NOTE: This test may fail on some Solaris 2.4 systems. If it does,
-    # check that you have these patches installed (using showrev -p):
-    #
-    # 101907-05, 101925-02, 101945-14, 101959-03, 101969-05, 101973-03,
-    # 101977-03, 101981-02, 101985-01, 102001-03, 102003-01, 102007-01,
-    # 102011-02, 102024-01, 102039-01, 102044-01, 102048-01, 102062-03,
-    # 102066-04, 102070-01, 102105-01, 102153-03, 102216-01, 102232-01,
-    # 101878-03, 101879-01, 101880-03, 101933-01, 101950-01, 102030-01,
-    # 102057-08, 102140-01, 101920-02, 101921-09, 101922-07, 101923-03
-    #
-    # If after installing these patches you are still experiencing a
-    # problem, please email jyl@eng.sun.com. We have not observed this
-    # failure on Solaris 2.5, so another option (instead of installing
-    # these patches) is to upgrade to Solaris 2.5.
-    set s [socket -server accept 2830]
-    proc accept {s a p} {
-	global x
-	puts $s bye
-	close $s
-	set x done
-    }
-    set s1 [socket -async [info hostname] 2830]
-    vwait x
-    set z [gets $s1]
-    close $s
-    close $s1
-    set z
-} bye
-
-test socket-9.1 {testing spurious events} {socket} {
-    set len 0
-    set spurious 0
-    set done 0
-    proc readlittle {s} {
-	global spurious done len
-	set l [read $s 1]
-	if {[string length $l] == 0} {
-	    if {![eof $s]} {
-		incr spurious
-	    } else {
-		close $s
-		set done 1
-	    }
-	} else {
-	    incr len [string length $l]
-	}
-    }
-    proc accept {s a p} {
-	fconfigure $s -buffering none -blocking off
-	fileevent $s readable [list readlittle $s]
-    }
-    set s [socket -server accept 2831]
-    set c [socket [info hostname] 2831]
-    puts -nonewline $c 01234567890123456789012345678901234567890123456789
-    close $c
-    set timer [after 10000 "set done timed_out"]
-    vwait done
-    after cancel $timer
-    close $s
-    list $spurious $len
-} {0 50}
-test socket-9.2 {testing async write, fileevents, flush on close} {socket} {
-    set firstblock ""
-    for {set i 0} {$i < 5} {incr i} {set firstblock "a$firstblock$firstblock"}
-    set secondblock ""
-    for {set i 0} {$i < 16} {incr i} {
-	set secondblock "b$secondblock$secondblock"
-    }
-    set l [socket -server accept 2832]
-    proc accept {s a p} {
-	fconfigure $s -blocking 0 -translation lf -buffersize 16384 \
-		-buffering line
-	fileevent $s readable "readable $s"
-    }
-    proc readable {s} {
-	set l [gets $s]
-	fileevent $s readable {}
-	after 1000 respond $s
-    }
-    proc respond {s} {
-	global firstblock
-	puts -nonewline $s $firstblock
-	after 1000 writedata $s
-    }
-    proc writedata {s} {
-	global secondblock
-	puts -nonewline $s $secondblock
-	close $s
-    }
-    set s [socket [info hostname] 2832]
-    fconfigure $s -blocking 0 -trans lf -buffering line
-    set count 0
-    puts $s hello
-    proc readit {s} {
-	global count done
-	set l [read $s]
-	incr count [string length $l]
-	if {[eof $s]} {
-	    close $s
-	    set done 1
-	}
-    }
-    fileevent $s readable "readit $s"
-    set timer [after 10000 "set done timed_out"]
-    vwait done
-    after cancel $timer
-    close $l
-    set count
-} 65566
-test socket-9.3 {testing EOF stickyness} {socket} {
-    proc count_to_eof {s} {
-	global count done timer
-	set l [gets $s]
-	if {[eof $s]} {
-	    incr count
-	    if {$count > 9} {
-		close $s
-		set done true
-		set count {eof is sticky}
-		after cancel $timer
-	    }
-	}
-    }
-    proc timerproc {} {
-	global done count c
-	set done true
-	set count {timer went off, eof is not sticky}
-	close $c
-    }	
-    set count 0
-    set done false
-    proc write_then_close {s} {
-	puts $s bye
-	close $s
-    }
-    proc accept {s a p} {
-	fconfigure $s -buffering line -translation lf
-	fileevent $s writable "write_then_close $s"
-    }
-    set s [socket -server accept 2833]
-    set c [socket [info hostname] 2833]
-    fconfigure $c -blocking off -buffering line -translation lf
-    fileevent $c readable "count_to_eof $c"
-    set timer [after 1000 timerproc]
-    vwait done
-    close $s
-    set count
-} {eof is sticky}
-
-removeFile script
-
-test socket-10.1 {testing socket accept callback error handling} {socket} {
-    set goterror 0
-    proc bgerror args {global goterror; set goterror 1}
-    set s [socket -server accept 2898]
-    proc accept {s a p} {close $s; error}
-    set c [socket 127.0.0.1 2898]
-    vwait goterror
-    close $s
-    close $c
-    set goterror
-} 1
-
-test socket-11.1 {tcp connection} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket9_1_test_server [socket -server accept 2834]
-	proc accept {s a p} {
-	    puts $s done
-	    close $s
-	}
-    }
-    set s [socket $remoteServerIP 2834]
-    set r [gets $s]
-    close $s
-    sendCommand {close $socket9_1_test_server}
-    set r
-} done
-test socket-11.2 {client specifies its port} {socket doTestsWithRemoteServer} {
-    if {[info exists port]} {
-	incr port
-    } else {
-	set port [expr 2048 + [pid]%1024]
-    }
-    sendCommand {
-	set socket9_2_test_server [socket -server accept 2835]
-	proc accept {s a p} {
-	    puts $s $p
-	    close $s
-	}
-    }
-    set s [socket -myport $port $remoteServerIP 2835]
-    set r [gets $s]
-    close $s
-    sendCommand {close $socket9_2_test_server}
-    if {$r == $port} {
-	set result ok
-    } else {
-	set result broken
-    }
-    set result
-} ok
-test socket-11.3 {trying to connect, no server} {socket doTestsWithRemoteServer} {
-    set status ok
-    if {![catch {set s [socket $remoteServerIp 2836]}]} {
-	if {![catch {gets $s}]} {
-	    set status broken
-	}
-	close $s
-    }
-    set status
-} ok
-test socket-11.4 {remote echo, one line} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket10_6_test_server [socket -server accept 2836]
-	proc accept {s a p} {
-	    fileevent $s readable [list echo $s]
-	    fconfigure $s -buffering line -translation crlf
-	}
-	proc echo {s} {
-	    set l [gets $s]
-	    if {[eof $s]} {
-		close $s
-	    } else {
-		puts $s $l
-	    }
-	}
-    }
-    set f [socket $remoteServerIP 2836]
-    fconfigure $f -translation crlf -buffering line
-    puts $f hello
-    set r [gets $f]
-    close $f
-    sendCommand {close $socket10_6_test_server}
-    set r
-} hello
-test socket-11.5 {remote echo, 50 lines} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket10_7_test_server [socket -server accept 2836]
-	proc accept {s a p} {
-	    fileevent $s readable [list echo $s]
-	    fconfigure $s -buffering line -translation crlf
-	}
-	proc echo {s} {
-	    set l [gets $s]
-	    if {[eof $s]} {
-		close $s
-	    } else {
-		puts $s $l
-	    }
-	}
-    }
-    set f [socket $remoteServerIP 2836]
-    fconfigure $f -translation crlf -buffering line
-    for {set cnt 0} {$cnt < 50} {incr cnt} {
-	puts $f "hello, $cnt"
-	if {[string compare [gets $f] "hello, $cnt"] != 0} {
-	    break
-	}
-    }
-    close $f
-    sendCommand {close $socket10_7_test_server}
-    set cnt
-} 50
-# Macintosh sockets can have more than one server per port
-if {$tcl_platform(platform) == "macintosh"} {
-    set conflictResult {0 2836}
-} else {
-    set conflictResult {1 {couldn't open socket: address already in use}}
-}
-test socket-11.6 {socket conflict} {socket doTestsWithRemoteServer} {
-    set s1 [socket -server accept 2836]
-    if {[catch {set s2 [socket -server accept 2836]} msg]} {
-	set result [list 1 $msg]
-    } else {
-	set result [list 0 [lindex [fconfigure $s2 -sockname] 2]]
-	close $s2
-    }
-    close $s1
-    set result
-} $conflictResult
-test socket-11.7 {server with several clients} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket10_9_test_server [socket -server accept 2836]
-	proc accept {s a p} {
-	    fconfigure $s -buffering line
-	    fileevent $s readable [list echo $s]
-	}
-	proc echo {s} {
-	    set l [gets $s]
-	    if {[eof $s]} {
-		close $s
-	    } else {
-		puts $s $l
-	    }
-	}
-    }
-    set s1 [socket $remoteServerIP 2836]
-    fconfigure $s1 -buffering line
-    set s2 [socket $remoteServerIP 2836]
-    fconfigure $s2 -buffering line
-    set s3 [socket $remoteServerIP 2836]
-    fconfigure $s3 -buffering line
-    for {set i 0} {$i < 100} {incr i} {
-	puts $s1 hello,s1
-	gets $s1
-	puts $s2 hello,s2
-	gets $s2
-	puts $s3 hello,s3
-	gets $s3
-    }
-    close $s1
-    close $s2
-    close $s3
-    sendCommand {close $socket10_9_test_server}
-    set i
-} 100    
-test socket-11.8 {client with several servers} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set s1 [socket -server "accept 4003" 4003]
-	set s2 [socket -server "accept 4004" 4004]
-	set s3 [socket -server "accept 4005" 4005]
-	proc accept {mp s a p} {
-	    puts $s $mp
-	    close $s
-	}
-    }
-    set s1 [socket $remoteServerIP 4003]
-    set s2 [socket $remoteServerIP 4004]
-    set s3 [socket $remoteServerIP 4005]
-    set l ""
-    lappend l [gets $s1] [gets $s1] [eof $s1] [gets $s2] [gets $s2] [eof $s2] \
-	[gets $s3] [gets $s3] [eof $s3]
-    close $s1
-    close $s2
-    close $s3
-    sendCommand {
-	close $s1
-	close $s2
-	close $s3
-    }
-    set l
-} {4003 {} 1 4004 {} 1 4005 {} 1}
-test socket-11.9 {accept callback error} {socket doTestsWithRemoteServer} {
-    set s [socket -server accept 2836]
-    proc accept {s a p} {expr 10 / 0}
-    proc bgerror args {
-	global x
-	set x $args
-    }
-    if {[catch {sendCommand {
-	    set peername [fconfigure $callerSocket -peername]
-	    set s [socket [lindex $peername 0] 2836]
-	    close $s
-    	 }} msg]} {
-	close $s
-	error $msg
-    }
-    set timer [after 10000 "set x timed_out"]
-    vwait x
-    after cancel $timer
-    close $s
-    rename bgerror {}
-    set x
-} {{divide by zero}}
-test socket-11.10 {testing socket specific options} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket10_12_test_server [socket -server accept 2836]
-	proc accept {s a p} {close $s}
-    }
-    set s [socket $remoteServerIP 2836]
-    set p [fconfigure $s -peername]
-    set n [fconfigure $s -sockname]
-    set l ""
-    lappend l [lindex $p 2] [llength $p] [llength $p]
-    close $s
-    sendCommand {close $socket10_12_test_server}
-    set l
-} {2836 3 3}
-test socket-11.11 {testing spurious events} {socket doTestsWithRemoteServer} {
-    sendCommand {
-	set socket10_13_test_server [socket -server accept 2836]
-	proc accept {s a p} {
-	    fconfigure $s -translation "auto lf"
-	    after 100 writesome $s
-	}
-	proc writesome {s} {
-	    for {set i 0} {$i < 100} {incr i} {
-		puts $s "line $i from remote server"
-	    }
-	    close $s
-	}
-    }
-    set len 0
-    set spurious 0
-    set done 0
-    proc readlittle {s} {
-	global spurious done len
-	set l [read $s 1]
-	if {[string length $l] == 0} {
-	    if {![eof $s]} {
-		incr spurious
-	    } else {
-		close $s
-		set done 1
-	    }
-	} else {
-	    incr len [string length $l]
-	}
-    }
-    set c [socket $remoteServerIP 2836]
-    fileevent $c readable "readlittle $c"
-    set timer [after 10000 "set done timed_out"]
-    vwait done
-    after cancel $timer
-    sendCommand {close $socket10_13_test_server}
-    list $spurious $len
-} {0 2690}
-test socket-11.12 {testing EOF stickyness} {socket doTestsWithRemoteServer} {
-    set counter 0
-    set done 0
-    proc count_up {s} {
-	global counter done after_id
-	set l [gets $s]
-	if {[eof $s]} {
-	    incr counter
-	    if {$counter > 9} {
-		set done {EOF is sticky}
-		after cancel $after_id
-		close $s
-	    }
-	}
-    }
-    proc timed_out {} {
-	global c done
-	set done {timed_out, EOF is not sticky}
-	close $c
-    }
-    sendCommand {
-	set socket10_14_test_server [socket -server accept 2836]
-	proc accept {s a p} {
-	    after 100 close $s
-	}
-    }
-    set c [socket $remoteServerIP 2836]
-    fileevent $c readable "count_up $c"
-    set after_id [after 1000 timed_out]
-    vwait done
-    sendCommand {close $socket10_14_test_server}
-    set done
-} {EOF is sticky}
-test socket-11.13 {testing async write, async flush, async close} \
-	{socket doTestsWithRemoteServer} {
-    proc readit {s} {
-	global count done
-	set l [read $s]
-	incr count [string length $l]
-	if {[eof $s]} {
-	    close $s
-	    set done 1
-	}
-    }
-    sendCommand {
-	set firstblock ""
-	for {set i 0} {$i < 5} {incr i} {
-		set firstblock "a$firstblock$firstblock"
-	}
-	set secondblock ""
-	for {set i 0} {$i < 16} {incr i} {
-	    set secondblock "b$secondblock$secondblock"
-	}
-	set l [socket -server accept 2845]
-	proc accept {s a p} {
-	    fconfigure $s -blocking 0 -translation lf -buffersize 16384 \
-		-buffering line
-	    fileevent $s readable "readable $s"
-	}
-	proc readable {s} {
-	    set l [gets $s]
-	    fileevent $s readable {}
-	    after 1000 respond $s
-	}
-	proc respond {s} {
-	    global firstblock
-	    puts -nonewline $s $firstblock
-	    after 1000 writedata $s
-	}
-	proc writedata {s} {
-	    global secondblock
-	    puts -nonewline $s $secondblock
-	    close $s
-	}
-    }
-    set s [socket $remoteServerIP 2845]
-    fconfigure $s -blocking 0 -trans lf -buffering line
-    set count 0
-    puts $s hello
-    fileevent $s readable "readit $s"
-    set timer [after 10000 "set done timed_out"]
-    vwait done
-    after cancel $timer
-    sendCommand {close $l}
-    set count
-} 65566
-
-test socket-12.1 {testing inheritance of server sockets} \
-	{socket doTestsWithRemoteServer} {
-    removeFile script1
-    removeFile script2
-
-    # Script1 is just a 10 second delay.  If the server socket
-    # is inherited, it will be held open for 10 seconds
-
-    set f [open script1 w]
-    puts $f {
-	after 10000 exit
-	vwait forever
-    }
-    close $f
-
-    # Script2 creates the server socket, launches script1,
-    # waits a second, and exits.  The server socket will now
-    # be closed unless script1 inherited it.
-
-    set f [open script2 w]
-    puts $f [list set tcltest $tcltest]
-    puts $f {
-	set f [socket -server accept 2828]
-	proc accept { file addr port } {
-	    close $file
-	}
-	exec $tcltest script1 &
-	close $f
-	after 1000 exit
-	vwait forever
-    }
-    close $f
-	
-    # Launch script2 and wait 5 seconds
-
-    exec $tcltest script2 &
-    after 5000 { set ok_to_proceed 1 }
-    vwait ok_to_proceed
-
-    # If we can still connect to the server, the socket got inherited.
-
-    if {[catch {socket 127.0.0.1 2828} msg]} {
-	set x {server socket was not inherited}
-    } else {
-	close $msg
-	set x {server socket was inherited}
-    }
-
-    removeFile script1
-    removeFile script2
-    set x
-} {server socket was not inherited}
-test socket-12.2 {testing inheritance of client sockets} \
-	{socket doTestsWithRemoteServer} {
-    removeFile script1
-    removeFile script2
-
-    # Script1 is just a 10 second delay.  If the server socket
-    # is inherited, it will be held open for 10 seconds
-
-    set f [open script1 w]
-    puts $f {
-	after 10000 exit
-	vwait forever
-    }
-    close $f
-
-    # Script2 opens the client socket and writes to it.  It then
-    # launches script1 and exits.  If the child process inherited the
-    # client socket, the socket will still be open.
-
-    set f [open script2 w]
-    puts $f [list set tcltest $tcltest]
-    puts $f {
-	set f [socket 127.0.0.1 2829]
-	exec $tcltest script1 &
-	puts $f testing
-	flush $f
-	after 1000 exit
-	vwait forever
-    }
-    close $f
-
-    # Create the server socket
-
-    set server [socket -server accept 2829]
-    proc accept { file host port } {
-
-	# When the client connects, establish the read handler
-	global server
-	close $server
-	fileevent $file readable [list getdata $file]
-	fconfigure $file -buffering line -blocking 0
-	return
-    }
-    proc getdata { file } {
-
-	# Read handler on the accepted socket.
-	global x
-	global failed
-	set status [catch {read $file} data]
-	if {$status != 0} {
-	    set x {read failed, error was $data}
-	    catch { close $file }
-	} elseif {[string compare {} $data]} {
-	} elseif {[fblocked $file]} {
-	} elseif {[eof $file]} {
-	    if {$failed} {
-		set x {client socket was inherited}
-	    } else {
-		set x {client socket was not inherited}
-	    }
-	    catch { close $file }
-	} else {
-	    set x {impossible case}
-	    catch { close $file }
-	}
-	return
-    }
-
-    # If the socket doesn't hit end-of-file in 5 seconds, the
-    # script1 process must have inherited the client.
-
-    set failed 0
-    after 5000 [list set failed 1]
-
-    # Launch the script2 process
-
-    exec $tcltest script2 &
-
-    vwait x
-    if {!$failed} {
-	vwait failed
-    }
-    removeFile script1
-    removeFile script2
-    set x
-} {client socket was not inherited}
-test socket-12.3 {testing inheritance of accepted sockets} \
-	{socket doTestsWithRemoteServer} {
-    removeFile script1
-    removeFile script2
-
-    set f [open script1 w]
-    puts $f {
-	after 10000 exit
-	vwait forever
-    }
-    close $f
-
-    set f [open script2 w]
-    puts $f [list set tcltest $tcltest]
-    puts $f {
-	set server [socket -server accept 2930]
-	proc accept { file host port } {
-	    global tcltest
-	    puts $file {test data on socket}
-	    exec $tcltest script1 &
-	    after 1000 exit
-	}
-	vwait forever
-    }
-    close $f
-
-    # Launch the script2 process and connect to it.  See how long
-    # the socket stays open
-
-    exec $tcltest script2 &
-
-    after 1000 set ok_to_proceed 1
-    vwait ok_to_proceed
-
-    set f [socket 127.0.0.1 2930]
-    fconfigure $f -buffering full -blocking 0
-    fileevent $f readable [list getdata $f]
-
-    # If the socket is still open after 5 seconds, the script1 process
-    # must have inherited the accepted socket.
-
-    set failed 0
-    after 5000 set failed 1
-
-    proc getdata { file } {
-
-	# Read handler on the client socket.
-	global x
-	global failed
-	set status [catch {read $file} data]
-	if {$status != 0} {
-	    set x {read failed, error was $data}
-	    catch { close $file }
-	} elseif {[string compare {} $data]} {
-	} elseif {[fblocked $file]} {
-	} elseif {[eof $file]} {
-	    if {$failed} {
-		set x {accepted socket was inherited}
-	    } else {
-		set x {accepted socket was not inherited}
-	    }
-	    catch { close $file }
-	} else {
-	    set x {impossible case}
-	    catch { close $file }
-	}
-	return
-    }
-    
-    vwait x
-
-    removeFile script1
-    removeFile script2
-    set x
-} {accepted socket was not inherited}
-
-test socket-13.1 {Testing use of shared socket between two threads} \
-	{socket testthread} {
-
-    set mainthread [testthread names]
-    proc ThreadReap {} {
-	global mainthread
-	testthread errorproc ThreadNullError
-	while {[llength [testthread names]] > 1} {
-	    foreach tid [testthread names] {
-		if {$tid != $mainthread} {
-		    catch {testthread send -async $tid {testthread exit}}
-		    update
-		}
-	    }
-	}
-	testthread errorproc ThreadError
-	return [llength [testthread names]]
-    }
-
-    removeFile script
-
-    set f [open script w]
-    puts $f {
-	set f [socket -server accept 2828]
-	proc accept {s a p} {
-            fileevent $s readable [list echo $s]
-            fconfigure $s -buffering line
-        }
-	proc echo {s} {
-	     global i
-             set l [gets $s]
-             if {[eof $s]} {
-                 global x
-                 close $s
-                 set x done
-             } else { 
-	         incr i
-                 puts $s $l
-             }
-	}
-	set i 0
-	vwait x
-	close $f
-
-	# thread cleans itself up.
-	testthread exit
-    }
-    close $f
-    
-    # create a thread
-    set serverthread [testthread create { source script } ]
-    update
-    
-
-    set s [socket 127.0.0.1 2828]
-    fconfigure $s -buffering line
-    catch {
-	puts $s "hello"
-	gets $s result
-    }
-    close $s
-    update
-
-    after 2000
-    ThreadReap
-    
-    set result
-
-} hello
-
-# cleanup
-if {[string match sock* $commandSocket] == 1} {
-   puts $commandSocket exit
-   flush $commandSocket
-}
-catch {close $commandSocket}
-catch {close $remoteProcChan}
-::tcltest::cleanupTests
-flush stdout
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/source.test b/tests/source.test
deleted file mode 100644
index 74a3589..0000000
--- a/tests/source.test
+++ /dev/null
@@ -1,197 +0,0 @@
-# Commands covered:  source
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: source.test,v 1.3 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test source-1.1 {source command} {
-    set x "old x value"
-    set y "old y value"
-    set z "old z value"
-    makeFile {
-	set x 22
-	set y 33
-	set z 44
-    } source.file
-    source source.file
-    list $x $y $z
-} {22 33 44}
-test source-1.2 {source command} {
-    makeFile {list result} source.file
-    source source.file
-} result
-test source-1.3 {source command} {
-    set y {\ }
-
-    set fd [open source.file w]
-    fconfigure $fd -translation lf
-    puts -nonewline $fd "list a b c "
-    puts $fd [string index $y 0]
-    puts $fd "d e f"
-    close $fd
-
-    source source.file
-} {a b c d e f}
-
-test source-2.3 {source error conditions} {
-    makeFile {
-	set x 146
-	error "error in sourced file"
-	set y $x
-    } source.file
-    list [catch {source source.file} msg] $msg $errorInfo
-} {1 {error in sourced file} {error in sourced file
-    while executing
-"error "error in sourced file""
-    (file "source.file" line 3)
-    invoked from within
-"source source.file"}}
-test source-2.4 {source error conditions} {
-    makeFile {break} source.file
-    catch {source source.file}
-} 3
-test source-2.5 {source error conditions} {
-    makeFile {continue} source.file
-    catch {source source.file}
-} 4
-test source-2.6 {source error conditions} {
-    normalizeMsg [list [catch {source _non_existent_} msg] $msg $errorCode]
-} {1 {couldn't read file "_non_existent_": no such file or directory} {posix enoent {no such file or directory}}}
-
-test source-3.1 {return in middle of source file} {
-    makeFile {
-	set x new-x
-	return allDone
-	set y new-y
-    } source.file
-    set x old-x
-    set y old-y
-    set z [source source.file]
-    list $x $y $z
-} {new-x old-y allDone}
-test source-3.2 {return with special code etc.} {
-    makeFile {
-	set x new-x
-	return -code break "Silly result"
-	set y new-y
-    } source.file
-    list [catch {source source.file} msg] $msg
-} {3 {Silly result}}
-test source-3.3 {return with special code etc.} {
-    makeFile {
-	set x new-x
-	return -code error "Simulated error"
-	set y new-y
-    } source.file
-    list [catch {source source.file} msg] $msg $errorInfo $errorCode
-} {1 {Simulated error} {Simulated error
-    while executing
-"source source.file"} NONE}
-test source-3.4 {return with special code etc.} {
-    makeFile {
-	set x new-x
-	return -code error -errorinfo "Simulated errorInfo stuff"
-	set y new-y
-    } source.file
-    list [catch {source source.file} msg] $msg $errorInfo $errorCode
-} {1 {} {Simulated errorInfo stuff
-    invoked from within
-"source source.file"} NONE}
-test source-3.5 {return with special code etc.} {
-    makeFile {
-	set x new-x
-	return -code error -errorinfo "Simulated errorInfo stuff" \
-		-errorcode {a b c}
-	set y new-y
-    } source.file
-    list [catch {source source.file} msg] $msg $errorInfo $errorCode
-} {1 {} {Simulated errorInfo stuff
-    invoked from within
-"source source.file"} {a b c}}
-
-# Test for the Macintosh specfic features of the source command
-test source-4.1 {source error conditions} {macOnly} {
-    list [catch {source -rsrc _no_exist_} msg] $msg
-} [list 1 "The resource \"_no_exist_\" could not be loaded from application."]
-test source-4.2 {source error conditions} {macOnly} {
-    list [catch {source -rsrcid bad_id} msg] $msg
-} [list 1 "expected integer but got \"bad_id\""]
-test source-4.3 {source error conditions} {macOnly} {
-    list [catch {source -rsrc rsrcName fileName extra} msg] $msg
-} {1 {wrong # args: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test source-4.4 {source error conditions} {macOnly} {
-    list [catch {source non_switch rsrcName} msg] $msg
-} {1 {bad argument: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test source-4.5 {source error conditions} {macOnly} {
-    list [catch {source -bad_switch argument} msg] $msg
-} {1 {bad argument: should be "source fileName" or "source -rsrc name ?fileName?" or "source -rsrcid id ?fileName?"}}
-test source-5.1 {source resource files} {macOnly} {
-    list [catch {source -rsrc rsrcName bad_file} msg] $msg
-} [list 1 "Error finding the file: \"bad_file\"."]
-test source-5.2 {source resource files} {macOnly} {
-    makeFile {return} source.file
-    list [catch {source -rsrc rsrcName source.file} msg] $msg
-} [list 1 "Error reading the file: \"source.file\"."]
-test source-5.3 {source resource files} {macOnly} {
-    testWriteTextResource -rsrc rsrcName -file rsrc.file {set msg2 ok; return}
-    set result [catch {source -rsrc rsrcName rsrc.file} msg]
-    removeFile rsrc.file
-    list $msg2 $result $msg
-} [list ok 0 {}]
-test source-5.4 {source resource files} {macOnly} {
-    catch {unset msg2}
-    testWriteTextResource -rsrc fileRsrcName -file rsrc.file {set msg2 ok; return}
-    source -rsrc fileRsrcName rsrc.file
-    set result [catch {source -rsrc fileRsrcName} msg]    
-    removeFile rsrc.file
-    list $msg2 $result $msg
-} [list ok 1 {The resource "fileRsrcName" could not be loaded from application.}]
-test source-5.5 {source resource files} {macOnly} {
-    testWriteTextResource -rsrcid 200 -file rsrc.file {set msg2 hello; set msg3 bye}
-    set result [catch {source -rsrcid 200 rsrc.file} msg]
-    removeFile rsrc.file
-    list $msg2 $result $msg
-} [list hello 0 bye]
-test source-5.6 {source resource files} {macOnly} {
-    testWriteTextResource -rsrcid 200 -file rsrc.file {set msg2 hello; error bad; set msg3 bye}
-    set result [catch {source -rsrcid 200 rsrc.file} msg]
-    removeFile rsrc.file
-    list $msg2 $result $msg
-} [list hello 1 bad]
-
-test source-6.1 {source is binary ok} {
-    set x {}
-    makeFile [list set x "a b\0c"] source.file
-    source source.file
-    string length $x
-} 5
-
-# cleanup
-catch {::tcltest::removeFile source.file}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/split.test b/tests/split.test
deleted file mode 100644
index fc78e84..0000000
--- a/tests/split.test
+++ /dev/null
@@ -1,84 +0,0 @@
-# Commands covered:  split
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: split.test,v 1.3 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test split-1.1 {basic split commands} {
-    split "a\n b\t\r c\n "
-} {a {} b {} {} c {} {}}
-test split-1.2 {basic split commands} {
-    split "word 1xyzword 2zword 3" xyz
-} {{word 1} {} {} {word 2} {word 3}}
-test split-1.3 {basic split commands} {
-    split "12345" {}
-} {1 2 3 4 5}
-test split-1.4 {basic split commands} {
-    split "a\}b\[c\{\]\$"
-} "a\\}b\\\[c\\{\\\]\\\$"
-test split-1.5 {basic split commands} {
-    split {} {}
-} {}
-test split-1.6 {basic split commands} {
-    split {}
-} {}
-test split-1.7 {basic split commands} {
-    split {   }
-} {{} {} {} {}}
-test split-1.8 {basic split commands} {
-    proc foo {} {
-        set x {}
-        foreach f [split {]\n} {}] {
-            append x $f
-        }
-        return $x	
-    }
-    foo
-} {]\n}
-test split-1.9 {basic split commands} {
-    proc foo {} {
-        set x ab\000c
-        set y [split $x {}]
-        return $y
-    }
-    foo
-} "a b \000 c"
-test split-1.10 {basic split commands} {
-    split "a0ab1b2bbb3\000c4" ab\000c
-} {{} 0 {} 1 2 {} {} 3 {} 4}
-
-test split-2.1 {split errors} {
-    list [catch split msg] $msg $errorCode
-} {1 {wrong # args: should be "split string ?splitChars?"} NONE}
-test split-2.2 {split errors} {
-    list [catch {split a b c} msg] $msg $errorCode
-} {1 {wrong # args: should be "split string ?splitChars?"} NONE}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/stack.test b/tests/stack.test
deleted file mode 100644
index 1e62788..0000000
--- a/tests/stack.test
+++ /dev/null
@@ -1,41 +0,0 @@
-# Tests that the stack size is big enough for the application.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: stack.test,v 1.2 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Note that a failure in this test results in a crash of the executable.
-
-test stack-1.1 {maxNestingDepth reached on infinite recursion} {
-    proc recurse {} { return [recurse] }
-    catch {recurse} rv
-    rename recurse {}
-    set rv
-} {too many nested calls to Tcl_EvalObj (infinite loop?)}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/string.test b/tests/string.test
deleted file mode 100644
index 641b8c2..0000000
--- a/tests/string.test
+++ /dev/null
@@ -1,403 +0,0 @@
-# Commands covered:  string
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: string.test,v 1.3 1999/04/16 00:47:34 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test string-1.1 {string compare} {
-    string compare abcde abdef
-} -1
-test string-1.2 {string compare} {
-    string c abcde ABCDE
-} 1
-test string-1.3 {string compare} {
-    string compare abcde abcde
-} 0
-test string-1.4 {string compare} {
-    list [catch {string compare a} msg] $msg
-} {1 {wrong # args: should be "string compare string1 string2"}}
-test string-1.5 {string compare} {
-    list [catch {string compare a b c} msg] $msg
-} {1 {wrong # args: should be "string compare string1 string2"}}
-
-test string-2.1 {string first} {
-    string first bq abcdefgbcefgbqrs
-} 12
-test string-2.2 {string first} {
-    string fir bcd abcdefgbcefgbqrs
-} 1
-test string-2.3 {string first} {
-    string f b abcdefgbcefgbqrs
-} 1
-test string-2.4 {string first} {
-    string first xxx x123xx345xxx789xxx012
-} 9
-test string-2.5 {string first} {
-    string first "" x123xx345xxx789xxx012
-} -1
-test string-2.6 {string first} {
-    list [catch {string first a} msg] $msg
-} {1 {wrong # args: should be "string first string1 string2"}}
-test string-2.7 {string first} {
-    list [catch {string first a b c} msg] $msg
-} {1 {wrong # args: should be "string first string1 string2"}}
-
-test string-3.1 {string index} {
-    string index abcde 0
-} a
-test string-3.2 {string index} {
-    string i abcde 4
-} e
-test string-3.3 {string index} {
-    string index abcde 5
-} {}
-test string-3.4 {string index} {
-    list [catch {string index abcde -10} msg] $msg
-} {0 {}}
-test string-3.5 {string index} {
-    list [catch {string index} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test string-3.6 {string index} {
-    list [catch {string index a b c} msg] $msg
-} {1 {wrong # args: should be "string index string charIndex"}}
-test string-3.7 {string index} {
-    list [catch {string index a xyz} msg] $msg
-} {1 {expected integer but got "xyz"}}
-
-test string-4.1 {string last} {
-    string la xxx xxxx123xx345x678
-} 1
-test string-4.2 {string last} {
-    string last xx xxxx123xx345x678
-} 7
-test string-4.3 {string last} {
-    string las x xxxx123xx345x678
-} 12
-test string-4.4 {string last} {
-    list [catch {string last a} msg] $msg
-} {1 {wrong # args: should be "string last string1 string2"}}
-test string-4.5 {string last} {
-    list [catch {string last a b c} msg] $msg
-} {1 {wrong # args: should be "string last string1 string2"}}
-
-test string-5.1 {string length} {
-    string length "a little string"
-} 15
-test string-5.2 {string length} {
-    string le ""
-} 0
-test string-5.3 {string length} {
-    list [catch {string length} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-test string-5.4 {string length} {
-    list [catch {string length a b} msg] $msg
-} {1 {wrong # args: should be "string length string"}}
-
-test string-6.1 {string match} {
-    string match abc abc
-} 1
-test string-6.2 {string match} {
-    string m abc abd
-} 0
-test string-6.3 {string match} {
-    string match ab*c abc
-} 1
-test string-6.4 {string match} {
-    string match ab**c abc
-} 1
-test string-6.5 {string match} {
-    string match ab* abcdef
-} 1
-test string-6.6 {string match} {
-    string match *c abc
-} 1
-test string-6.7 {string match} {
-    string match *3*6*9 0123456789
-} 1
-test string-6.8 {string match} {
-    string match *3*6*9 01234567890
-} 0
-test string-6.9 {string match} {
-    string match a?c abc
-} 1
-test string-6.10 {string match} {
-    string match a??c abc
-} 0
-test string-6.11 {string match} {
-    string match ?1??4???8? 0123456789
-} 1
-test string-6.12 {string match} {
-    string match {[abc]bc} abc
-} 1
-test string-6.13 {string match} {
-    string match {a[abc]c} abc
-} 1
-test string-6.14 {string match} {
-    string match {a[xyz]c} abc
-} 0
-test string-6.15 {string match} {
-    string match {12[2-7]45} 12345
-} 1
-test string-6.16 {string match} {
-    string match {12[ab2-4cd]45} 12345
-} 1
-test string-6.17 {string match} {
-    string match {12[ab2-4cd]45} 12b45
-} 1
-test string-6.18 {string match} {
-    string match {12[ab2-4cd]45} 12d45
-} 1
-test string-6.19 {string match} {
-    string match {12[ab2-4cd]45} 12145
-} 0
-test string-6.20 {string match} {
-    string match {12[ab2-4cd]45} 12545
-} 0
-test string-6.21 {string match} {
-    string match {a\*b} a*b
-} 1
-test string-6.22 {string match} {
-    string match {a\*b} ab
-} 0
-test string-6.23 {string match} {
-    string match {a\*\?\[\]\\\x} "a*?\[\]\\x"
-} 1
-test string-6.24 {string match} {
-    string match ** ""
-} 1
-test string-6.25 {string match} {
-    string match *. ""
-} 0
-test string-6.26 {string match} {
-    string match "" ""
-} 1
-test string-6.27 {string match} {
-    string match \[a a
-} 1
-test string-6.28 {string match} {
-    list [catch {string match a} msg] $msg
-} {1 {wrong # args: should be "string match pattern string"}}
-test string-6.29 {string match} {
-    list [catch {string match a b c} msg] $msg
-} {1 {wrong # args: should be "string match pattern string"}}
-
-test string-7.1 {string range} {
-    string range abcdefghijklmnop 2 14
-} {cdefghijklmno}
-test string-7.2 {string range} {
-    string range abcdefghijklmnop 7 1000
-} {hijklmnop}
-test string-7.3 {string range} {
-    string range abcdefghijklmnop 10 e
-} {klmnop}
-test string-7.4 {string range} {
-    string range abcdefghijklmnop 10 9
-} {}
-test string-7.5 {string range} {
-    string range abcdefghijklmnop -3 2
-} {abc}
-test string-7.6 {string range} {
-    string range abcdefghijklmnop -3 -2
-} {}
-test string-7.7 {string range} {
-    string range abcdefghijklmnop 1000 1010
-} {}
-test string-7.8 {string range} {
-    string range abcdefghijklmnop -100 end
-} {abcdefghijklmnop}
-test string-7.9 {string range} {
-    list [catch {string range} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test string-7.10 {string range} {
-    list [catch {string range a 1} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test string-7.11 {string range} {
-    list [catch {string range a 1 2 3} msg] $msg
-} {1 {wrong # args: should be "string range string first last"}}
-test string-7.12 {string range} {
-    list [catch {string range abc abc 1} msg] $msg
-} {1 {bad index "abc": must be integer or "end"}}
-test string-7.13 {string range} {
-    list [catch {string range abc 1 eof} msg] $msg
-} {1 {bad index "eof": must be integer or "end"}}
-test string-7.14 {string range} {
-    string range abcdefghijklmnop end end
-} {p}
-test string-7.15 {string range} {
-    string range abcdefghijklmnop e 1000
-} {p}
-
-test string-8.1 {string trim} {
-    string trim "    XYZ      "
-} {XYZ}
-test string-8.2 {string trim} {
-    string trim "\t\nXYZ\t\n\r\n"
-} {XYZ}
-test string-8.3 {string trim} {
-    string trim "  A XYZ A    "
-} {A XYZ A}
-test string-8.4 {string trim} {
-    string trim "XXYYZZABC XXYYZZ" ZYX
-} {ABC }
-test string-8.5 {string trim} {
-    string trim "    \t\r      "
-} {}
-test string-8.6 {string trim} {
-    string trim {abcdefg} {}
-} {abcdefg}
-test string-8.7 {string trim} {
-    string trim {}
-} {}
-test string-8.8 {string trim} {
-    string trim ABC DEF
-} {ABC}
-test string-8.9 {string trim} {
-    list [catch {string trim} msg] $msg
-} {1 {wrong # args: should be "string trim string ?chars?"}}
-test string-8.10 {string trim} {
-    list [catch {string trim a b c} msg] $msg
-} {1 {wrong # args: should be "string trim string ?chars?"}}
-
-test string-9.1 {string trimleft} {
-    string trimleft "    XYZ      "
-} {XYZ      }
-test string-9.2 {string trimleft} {
-    list [catch {string trimleft} msg] $msg
-} {1 {wrong # args: should be "string trimleft string ?chars?"}}
-
-test string-10.1 {string trimright} {
-    string trimright "    XYZ      "
-} {    XYZ}
-test string-10.2 {string trimright} {
-    string trimright "   "
-} {}
-test string-10.3 {string trimright} {
-    string trimright ""
-} {}
-test string-10.4 {string trimright errors} {
-    list [catch {string trimright} msg] $msg
-} {1 {wrong # args: should be "string trimright string ?chars?"}}
-test string-10.5 {string trimright errors} {
-    list [catch {string trimg a} msg] $msg
-} {1 {bad option "trimg": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-
-test string-11.1 {string tolower} {
-    string tolower ABCDeF
-} {abcdef}
-test string-11.2 {string tolower} {
-    string tolower "ABC  XyZ"
-} {abc  xyz}
-test string-11.3 {string tolower} {
-    string tolower {123#$&*()}
-} {123#$&*()}
-test string-11.4 {string tolower} {
-    list [catch {string tolower} msg] $msg
-} {1 {wrong # args: should be "string tolower string"}}
-test string-11.5 {string tolower} {
-    list [catch {string tolower a b} msg] $msg
-} {1 {wrong # args: should be "string tolower string"}}
-
-test string-12.1 {string toupper} {
-    string toupper abCDEf
-} {ABCDEF}
-test string-12.2 {string toupper} {
-    string toupper "abc xYz"
-} {ABC XYZ}
-test string-12.3 {string toupper} {
-    string toupper {123#$&*()}
-} {123#$&*()}
-test string-12.4 {string toupper} {
-    list [catch {string toupper} msg] $msg
-} {1 {wrong # args: should be "string toupper string"}}
-test string-12.5 {string toupper} {
-    list [catch {string toupper a b} msg] $msg
-} {1 {wrong # args: should be "string toupper string"}}
-
-test string-13.1 {string wordend} {
-    list [catch {string wordend a} msg] $msg
-} {1 {wrong # args: should be "string wordend string index"}}
-test string-13.2 {string wordend} {
-    list [catch {string wordend a b c} msg] $msg
-} {1 {wrong # args: should be "string wordend string index"}}
-test string-13.3 {string wordend} {
-    list [catch {string wordend a gorp} msg] $msg
-} {1 {expected integer but got "gorp"}}
-test string-13.4 {string wordend} {
-    string wordend abc. -1
-} 3
-test string-13.5 {string wordend} {
-    string wordend abc. 100
-} 4
-test string-13.6 {string wordend} {
-    string wordend "word_one two three" 2
-} 8
-test string-13.7 {string wordend} {
-    string wordend "one .&# three" 5
-} 6
-test string-13.8 {string wordend} {
-    string worde "x.y" 0
-} 1
-
-test string-14.1 {string wordstart} {
-    list [catch {string word a} msg] $msg
-} {1 {ambiguous option "word": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-test string-14.2 {string wordstart} {
-    list [catch {string wordstart a} msg] $msg
-} {1 {wrong # args: should be "string wordstart string index"}}
-test string-14.3 {string wordstart} {
-    list [catch {string wordstart a b c} msg] $msg
-} {1 {wrong # args: should be "string wordstart string index"}}
-test string-14.4 {string wordstart} {
-    list [catch {string wordstart a gorp} msg] $msg
-} {1 {expected integer but got "gorp"}}
-test string-14.5 {string wordstart} {
-    string wordstart "one two three_words" 400
-} 8
-test string-14.6 {string wordstart} {
-    string wordstart "one two three_words" 2
-} 0
-test string-14.7 {string wordend} {
-    string wordstart "one two three_words" -2
-} 0
-test string-14.8 {string wordend} {
-    string wordstart "one .*&^ three" 6
-} 6
-test string-14.9 {string wordend} {
-    string wordstart "one two three" 4
-} 4
-
-test string-15.1 {error conditions} {
-    list [catch {string gorp a b} msg] $msg
-} {1 {bad option "gorp": must be compare, first, index, last, length, match, range, tolower, toupper, totitle, trim, trimleft, trimright, wordend, or wordstart}}
-test string-15.2 {error conditions} {
-    list [catch {string} msg] $msg
-} {1 {wrong # args: should be "string option arg ?arg ...?"}}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/stringObj.test b/tests/stringObj.test
deleted file mode 100644
index 33100e5..0000000
--- a/tests/stringObj.test
+++ /dev/null
@@ -1,209 +0,0 @@
-# Commands covered: none
-#
-# This file contains tests for the procedures in tclStringObj.c
-# that implement the Tcl type manager for the string type.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: stringObj.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testobj\""
-    puts "command, so I can't test the Tcl type and object support."
-    ::tcltest::cleanupTests
-    return
-}
-
-test stringObj-1.1 {string type registration} {
-    set t [testobj types]
-    set first [string first "string" $t]
-    set result [expr {$first != -1}]
-} {1}
-
-test stringObj-2.1 {Tcl_NewStringObj} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [teststringobj set 1 abcd]
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} abcd string 2}
-
-test stringObj-3.1 {Tcl_SetStringObj, existing "empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testobj newobj 1]
-    lappend result [teststringobj set 1 xyz] ;# makes existing obj a string
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} {} xyz string 2}
-test stringObj-3.2 {Tcl_SetStringObj, existing non-"empty string" object} {
-    set result ""
-    lappend result [testobj freeallvars]
-    lappend result [testintobj set 1 512]
-    lappend result [teststringobj set 1 foo]  ;# makes existing obj a string
-    lappend result [testobj type 1]
-    lappend result [testobj refcount 1]
-} {{} 512 foo string 2}
-
-test stringObj-4.1 {Tcl_SetObjLength procedure, string gets shorter} {
-    testobj freeallvars
-    teststringobj set 1 test
-    teststringobj setlength 1 3
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {3 4 tes}
-test stringObj-4.2 {Tcl_SetObjLength procedure, string gets longer} {
-    testobj freeallvars
-    teststringobj set 1 abcdef
-    teststringobj setlength 1 10
-    list [teststringobj length 1] [teststringobj length2 1]
-} {10 10}
-test stringObj-4.3 {Tcl_SetObjLength procedure, string gets longer} {
-    testobj freeallvars
-    teststringobj set 1 abcdef
-    teststringobj append 1 xyzq -1
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {10 20 abcdefxyzq}
-test stringObj-4.4 {Tcl_SetObjLength procedure, "expty string", length 0} {
-    testobj freeallvars
-    testobj newobj 1
-    teststringobj setlength 1 0
-    list [teststringobj length2 1] [teststringobj get 1]
-} {0 {}}
-
-test stringObj-5.1 {Tcl_AppendToObj procedure, type conversion} {
-    testobj freeallvars
-    testintobj set2 1 43
-    teststringobj append 1 xyz -1
-    teststringobj get 1
-} {43xyz}
-test stringObj-5.2 {Tcl_AppendToObj procedure, length calculation} {
-    testobj freeallvars
-    teststringobj set 1 {x y }
-    teststringobj append 1 bbCCddEE 4
-    teststringobj append 1 123 -1
-    teststringobj get 1
-} {x y bbCC123}
-test stringObj-5.3 {Tcl_AppendToObj procedure, reallocating space} {
-    testobj freeallvars
-    teststringobj set 1 xyz
-    teststringobj setlength 1 15
-    teststringobj setlength 1 2
-    set result {}
-    teststringobj append 1 1234567890123 -1
-    lappend result [teststringobj length 1] [teststringobj length2 1]
-    teststringobj setlength 1 10
-    teststringobj append 1 abcdef -1
-    lappend result [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {15 15 16 32 xy12345678abcdef}
-
-test stringObj-6.1 {Tcl_AppendStringsToObj procedure, type conversion} {
-    testobj freeallvars
-    teststringobj set2 1 [list a b]
-    teststringobj appendstrings 1 xyz { 1234 } foo
-    teststringobj get 1
-} {a bxyz 1234 foo}
-test stringObj-6.2 {Tcl_AppendStringsToObj procedure, counting space} {
-    testobj freeallvars
-    teststringobj set 1 abc
-    teststringobj appendstrings 1
-    list [teststringobj length 1] [teststringobj get 1]
-} {3 abc}
-test stringObj-6.3 {Tcl_AppendStringsToObj procedure, counting space} {
-    testobj freeallvars
-    teststringobj set 1 abc
-    teststringobj appendstrings 1 {} {} {} {}
-    list [teststringobj length 1] [teststringobj get 1]
-} {3 abc}
-test stringObj-6.4 {Tcl_AppendStringsToObj procedure, counting space} {
-    testobj freeallvars
-    teststringobj set 1 abc
-    teststringobj appendstrings 1 { 123 } abcdefg
-    list [teststringobj length 1] [teststringobj get 1]
-} {15 {abc 123 abcdefg}}
-test stringObj-6.5 {Tcl_AppendStringsToObj procedure, don't double space if initial string empty} {
-    testobj freeallvars
-    testobj newobj 1
-    teststringobj appendstrings 1 123 abcdefg
-    list [teststringobj length 1] [teststringobj length2 1] [teststringobj get 1]
-} {10 10 123abcdefg}
-test stringObj-6.6 {Tcl_AppendStringsToObj procedure, space reallocation} {
-    testobj freeallvars
-    teststringobj set 1 abc
-    teststringobj setlength 1 10
-    teststringobj setlength 1 2
-    teststringobj appendstrings 1 34567890
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {10 10 ab34567890}
-test stringObj-6.7 {Tcl_AppendStringsToObj procedure, space reallocation} {
-    testobj freeallvars
-    teststringobj set 1 abc
-    teststringobj setlength 1 10
-    teststringobj setlength 1 2
-    teststringobj appendstrings 1 34567890x
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {11 22 ab34567890x}
-test stringObj-6.8 {Tcl_AppendStringsToObj procedure, object totally empty} {
-    testobj freeallvars
-    testobj newobj 1
-    teststringobj appendstrings 1 {}
-    list [teststringobj length2 1] [teststringobj get 1]
-} {0 {}}
-
-test stringObj-7.1 {ConvertToStringType procedure} {
-    testobj freeallvars
-    teststringobj set2 1 [list a b]
-    teststringobj append 1 x -1
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {4 8 {a bx}}
-test stringObj-7.2 {ConvertToStringType procedure, null object} {
-    testobj freeallvars
-    testobj newobj 1
-    teststringobj appendstrings 1 {}
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj get 1]
-} {0 0 {}}
-
-test stringObj-8.1 {DupStringInternalRep procedure} {
-    testobj freeallvars
-    teststringobj set 1 {}
-    teststringobj append 1 abcde -1
-    testobj duplicate 1 2
-    list [teststringobj length 1] [teststringobj length2 1] \
-	    [teststringobj length 2] [teststringobj length2 2] \
-	    [teststringobj get 2]
-} {5 10 5 5 abcde}
-
-testobj freeallvars
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/subst.test b/tests/subst.test
deleted file mode 100644
index 51546d2..0000000
--- a/tests/subst.test
+++ /dev/null
@@ -1,125 +0,0 @@
-# Commands covered:  subst
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1994 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: subst.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test subst-1.1 {basics} {
-    list [catch {subst} msg] $msg
-} {1 {wrong # args: should be "subst ?-nobackslashes? ?-nocommands? ?-novariables? string"}}
-test subst-1.2 {basics} {
-    list [catch {subst a b c} msg] $msg
-} {1 {wrong # args: should be "subst ?-nobackslashes? ?-nocommands? ?-novariables? string"}}
-
-test subst-2.1 {simple strings} {
-    subst {}
-} {}
-test subst-2.2 {simple strings} {
-    subst a
-} a
-test subst-2.3 {simple strings} {
-    subst abcdefg
-} abcdefg
-
-test subst-3.1 {backslash substitutions} {
-    subst {\x\$x\[foo bar]\\}
-} "x\$x\[foo bar]\\"
-
-test subst-4.1 {variable substitutions} {
-    set a 44
-    subst {$a}
-} {44}
-test subst-4.2 {variable substitutions} {
-    set a 44
-    subst {x$a.y{$a}.z}
-} {x44.y{44}.z}
-test subst-4.3 {variable substitutions} {
-    catch {unset a}
-    set a(13) 82
-    set i 13
-    subst {x.$a($i)}
-} {x.82}
-catch {unset a}
-set long {This is a very long string, intentionally made so long that it
-	will overflow the static character size for dstrings, so that
-	additional memory will have to be allocated by subst.  That way,
-	if the subst procedure forgets to free up memory while returning
-	an error, there will be memory that isn't freed (this will be
-	detected when the tests are run under a checking memory allocator
-	such as Purify).}
-test subst-4.4 {variable substitutions} {
-    list [catch {subst {$long $a}} msg] $msg
-} {1 {can't read "a": no such variable}}
-
-test subst-5.1 {command substitutions} {
-    subst {[concat {}]}
-} {}
-test subst-5.2 {command substitutions} {
-    subst {[concat A test string]}
-} {A test string}
-test subst-5.3 {command substitutions} {
-    subst {x.[concat foo].y.[concat bar].z}
-} {x.foo.y.bar.z}
-test subst-5.4 {command substitutions} {
-    list [catch {subst {$long [set long] [bogus_command]}} msg] $msg
-} {1 {invalid command name "bogus_command"}}
-
-test subst-6.1 {clear the result after command substitution} {
-    catch {unset a}
-    list [catch {subst {[concat foo] $a}} msg] $msg
-} {1 {can't read "a": no such variable}}
-
-test subst-7.1 {switches} {
-    list [catch {subst foo bar} msg] $msg
-} {1 {wrong # args: should be "subst ?-nobackslashes? ?-nocommands? ?-novariables? string"}}
-test subst-7.2 {switches} {
-    list [catch {subst -no bar} msg] $msg
-} {1 {ambiguous switch "-no": must be -nobackslashes, -nocommands, or -novariables}}
-test subst-7.3 {switches} {
-    list [catch {subst -bogus bar} msg] $msg
-} {1 {bad switch "-bogus": must be -nobackslashes, -nocommands, or -novariables}}
-test subst-7.4 {switches} {
-    set x 123
-    subst -nobackslashes {abc $x [expr 1+2] \\\x41}
-} {abc 123 3 \\\x41}
-test subst-7.5 {switches} {
-    set x 123
-    subst -nocommands {abc $x [expr 1+2] \\\x41}
-} {abc 123 [expr 1+2] \A}
-test subst-7.6 {switches} {
-    set x 123
-    subst -novariables {abc $x [expr 1+2] \\\x41}
-} {abc $x 3 \A}
-test subst-7.7 {switches} {
-    set x 123
-    subst -nov -nob -noc {abc $x [expr 1+2] \\\x41}
-} {abc $x [expr 1+2] \\\x41}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/switch.test b/tests/switch.test
deleted file mode 100644
index cdbfc61..0000000
--- a/tests/switch.test
+++ /dev/null
@@ -1,198 +0,0 @@
-# Commands covered:  switch
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: switch.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test switch-1.1 {simple patterns} {
-    switch a a {format 1} b {format 2} c {format 3} default {format 4}
-} 1
-test switch-1.2 {simple patterns} {
-    switch b a {format 1} b {format 2} c {format 3} default {format 4}
-} 2
-test switch-1.3 {simple patterns} {
-    switch x a {format 1} b {format 2} c {format 3} default {format 4}
-} 4
-test switch-1.4 {simple patterns} {
-    switch x a {format 1} b {format 2} c {format 3}
-} {}
-test switch-1.5 {simple pattern matches many times} {
-    switch b a {format 1} b {format 2} b {format 3} b {format 4}
-} 2
-test switch-1.6 {simple patterns} {
-    switch default a {format 1} default {format 2} c {format 3} default {format 4}
-} 2
-test switch-1.7 {simple patterns} {
-    switch x a {format 1} default {format 2} c {format 3} default {format 4}
-} 4
-
-test switch-2.1 {single-argument form for pattern/command pairs} {
-    switch b {
-	a {format 1}
-	b {format 2}
-	default {format 6}
-    }
-} {2}
-test switch-2.2 {single-argument form for pattern/command pairs} {
-    list [catch {switch z {a 2 b}} msg] $msg
-} {1 {extra switch pattern with no body}}
-
-test switch-3.1 {-exact vs. -glob vs. -regexp} {
-    switch -exact aaaab {
-	^a*b$	{concat regexp}
-	*b	{concat glob}
-	aaaab	{concat exact}
-	default	{concat none}
-    }
-} exact
-test switch-3.2 {-exact vs. -glob vs. -regexp} {
-    switch -regexp aaaab {
-	^a*b$	{concat regexp}
-	*b	{concat glob}
-	aaaab	{concat exact}
-	default	{concat none}
-    }
-} regexp
-test switch-3.3 {-exact vs. -glob vs. -regexp} {
-    switch -glob aaaab {
-	^a*b$	{concat regexp}
-	*b	{concat glob}
-	aaaab	{concat exact}
-	default	{concat none}
-    }
-} glob
-test switch-3.4 {-exact vs. -glob vs. -regexp} {
-    switch aaaab {^a*b$} {concat regexp} *b {concat glob} \
-	    aaaab {concat exact} default {concat none}
-} exact
-test switch-3.5 {-exact vs. -glob vs. -regexp} {
-    switch -- -glob {
-	^g.*b$	{concat regexp}
-	-*	{concat glob}
-	-glob	{concat exact}
-	default {concat none}
-    }
-} exact
-test switch-3.6 {-exact vs. -glob vs. -regexp} {
-    list [catch {switch -foo a b c} msg] $msg
-} {1 {bad option "-foo": must be -exact, -glob, -regexp, or --}}
-
-test switch-4.1 {error in executed command} {
-    list [catch {switch a a {error "Just a test"} default {format 1}} msg] \
-	    $msg $errorInfo
-} {1 {Just a test} {Just a test
-    while executing
-"error "Just a test""
-    ("a" arm line 1)
-    invoked from within
-"switch a a {error "Just a test"} default {format 1}"}}
-test switch-4.2 {error: not enough args} {
-    list [catch {switch} msg] $msg
-} {1 {wrong # args: should be "switch ?switches? string pattern body ... ?default body?"}}
-test switch-4.3 {error: pattern with no body} {
-    list [catch {switch a b} msg] $msg
-} {1 {extra switch pattern with no body}}
-test switch-4.4 {error: pattern with no body} {
-    list [catch {switch a b {format 1} c} msg] $msg
-} {1 {extra switch pattern with no body}}
-test switch-4.5 {error in default command} {
-    list [catch {switch foo a {error switch1} b {error switch 3} \
-	    default {error switch2}} msg] $msg $errorInfo
-} {1 switch2 {switch2
-    while executing
-"error switch2"
-    ("default" arm line 1)
-    invoked from within
-"switch foo a {error switch1} b {error switch 3}  default {error switch2}"}}
-
-test switch-5.1 {errors in -regexp matching} {
-    list [catch {switch -regexp aaaab {
-	*b	{concat glob}
-	aaaab	{concat exact}
-	default	{concat none}
-    }} msg] $msg
-} {1 {couldn't compile regular expression pattern: quantifier operand invalid}}
-
-test switch-6.1 {backslashes in patterns} {
-    switch -exact {\a\$\.\[} {
-	\a\$\.\[	{concat first}
-	\a\\$\.\\[	{concat second}
-	\\a\\$\\.\\[	{concat third}
-	{\a\\$\.\\[}	{concat fourth}
-	{\\a\\$\\.\\[}	{concat fifth}
-	default		{concat none}
-    }
-} third
-test switch-6.2 {backslashes in patterns} {
-    switch -exact {\a\$\.\[} {
-	\a\$\.\[	{concat first}
-	{\a\$\.\[}	{concat second}
-	{{\a\$\.\[}}	{concat third}
-	default		{concat none}
-    }
-} second
-
-test switch-7.1 {"-" bodies} {
-    switch a {
-	a -
-	b -
-	c {concat 1}
-	default {concat 2}
-    }
-} 1
-test switch-7.2 {"-" bodies} {
-    list [catch {
-	switch a {
-	    a -
-	    b -
-	    c -
-	}
-    } msg] $msg
-} {1 {no body specified for pattern "a"}}
-test switch-7.3 {"-" bodies} {
-    list [catch {
-	switch a {
-	    a -
-	    b -foo
-	    c -
-	}
-    } msg] $msg
-} {1 {invalid command name "-foo"}}
-
-test switch-8.1 {empty body} {
-    set msg {}
-    switch {2} {
-    	1 {set msg 1}
-        2 {}
-        default {set msg 2}
-    }
-} {}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/thread.test b/tests/thread.test
deleted file mode 100644
index b3051ed..0000000
--- a/tests/thread.test
+++ /dev/null
@@ -1,240 +0,0 @@
-# Commands covered:  (test)thread
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: thread.test,v 1.2 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info command testthread] == ""} {
-    puts "skipping: tests require the testthread command"
-    ::tcltest::cleanupTests
-    return
-}
-
-set mainthread [testthread names]
-proc ThreadReap {} {
-    global mainthread
-    testthread errorproc ThreadNullError
-    while {[llength [testthread names]] > 1} {
-	foreach tid [testthread names] {
-	    if {$tid != $mainthread} {
-		catch {testthread send -async $tid {testthread exit}}
-		update
-	    }
-	}
-    }
-    testthread errorproc ThreadError
-    return [llength [testthread names]]
-}
-testthread errorproc ThreadError
-proc ThreadError {id info} {
-    global threadError
-    set threadError $info
-}
-proc ThreadNullError {id info} {
-    # ignore
-}
-
-test thread-1.1 {Tcl_ThreadObjCmd: no args} {
-    list [catch {testthread} msg] $msg
-} {1 {wrong # args: should be "testthread option ?args?"}}
-
-test thread-1.2 {Tcl_ThreadObjCmd: bad option} {
-    list [catch {testthread foo} msg] $msg
-} {1 {bad option "foo": must be create, exit, id, names, send, wait, or errorproc}}
-
-test thread-1.3 {Tcl_ThreadObjCmd: initial thread list} {
-    list [catch {testthread names} mainthread] [llength $mainthread]
-} {0 1}
-
-test thread-1.4 {Tcl_ThreadObjCmd: thread create } {
-    set serverthread [testthread create]
-    update
-    set numthreads [llength [testthread names]]
-} {2}
-ThreadReap
-
-test thread-1.5 {Tcl_ThreadObjCmd: thread create one shot} {
-    testthread create {set x 5}
-    foreach try {0 1 2 4 5 6} {
-	# Try various ways to yeild
-	update
-	after 10
-	set l [llength [testthread names]]
-	if {$l == 1} {
-	    break
-	}
-    }
-    set l
-} {1}
-ThreadReap
-
-test thread-1.6 {Tcl_ThreadObjCmd: thread exit} {
-    testthread create {testthread exit}
-    update
-    after 10
-    llength [testthread names]
-} {1}
-ThreadReap
-
-test thread-1.7 {Tcl_ThreadObjCmd: thread id args} {
-    set x [catch {testthread id x} msg]
-    list $x $msg
-} {1 {wrong # args: should be "testthread id"}}
-
-test thread-1.8 {Tcl_ThreadObjCmd: thread id} {
-    string compare [testthread id] $mainthread
-} {0}
-
-test thread-1.9 {Tcl_ThreadObjCmd: thread names args} {
-    set x [catch {testthread names x} msg]
-    list $x $msg
-} {1 {wrong # args: should be "testthread names"}}
-
-test thread-1.10 {Tcl_ThreadObjCmd: thread id} {
-    string compare [testthread names] $mainthread
-} {0}
-
-test thread-1.11 {Tcl_ThreadObjCmd: send args} {
-    set x [catch {testthread send} msg]
-    list $x $msg
-} {1 {wrong # args: should be "testthread send ?-async? id script"}}
-
-test thread-1.12 {Tcl_ThreadObjCmd: send nonint} {
-    set x [catch {testthread send abc command} msg]
-    list $x $msg
-} {1 {expected integer but got "abc"}}
-
-test thread-1.13 {Tcl_ThreadObjCmd: send args} {
-    set serverthread [testthread create]
-    set five [testthread send $serverthread {set x 5}]
-    ThreadReap
-    set five
-} 5
-
-test thread-1.14 {Tcl_ThreadObjCmd: send bad id} {
-    set tid [expr $mainthread + 10]
-    set x [catch {testthread send $tid {set x 5}} msg]
-    list $x $msg
-} {1 {invalid thread id}}
-
-test thread-1.15 {Tcl_ThreadObjCmd: wait} {
-    set serverthread [testthread create {set z 5 ; testthread wait}]
-    set five [testthread send $serverthread {set z}]
-    ThreadReap
-    set five
-} 5
-
-test thread-1.16 {Tcl_ThreadObjCmd: errorproc args} {
-    set x [catch {testthread errorproc foo bar} msg]
-    list $x $msg
-} {1 {wrong # args: should be "testthread errorproc proc"}}
-
-test thread-1.17 {Tcl_ThreadObjCmd: errorproc change} {
-    testthread errorproc foo
-    testthread errorproc ThreadError
-} {}
-
-# The tests above also cover:
-# TclCreateThread, except when pthread_create fails
-# NewThread, safe and regular
-# ThreadErrorProc, except for printing to standard error
-
-test thread-2.1 {ListUpdateInner and ListRemove} {
-    catch {unset tid}
-    foreach t {0 1 2} {
-	upvar #0 t$t tid
-	set tid [testthread create]
-    }
-    ThreadReap
-} 1
-
-test thread-3.1 {TclThreadList} {
-    catch {unset tid}
-    set mainthread [testthread names]
-    set l1  {}
-    foreach t {0 1 2} {
-	lappend l1 [testthread create]
-    }
-    set l2 [testthread names]
-    list $l1 $l2
-    set c [string compare [lsort -integer [concat $mainthread $l1]] [lsort -integer $l2]]
-    ThreadReap
-    set c
-} 0
-
-test thread-4.1 {TclThreadSend to self} {
-    catch {unset x}
-    testthread send [testthread id] {
-	set x 4
-    }
-    set x
-} {4}
-
-test thread-4.1 {TclThreadSend -async} {
-    set mainthread [testthread names]
-    set serverthread [testthread create]
-    testthread send -async $serverthread {
-	after 1000
-	testthread exit
-    }
-    set two [llength [testthread names]]
-    after 1500 {set done 1}
-    vwait done
-    list [llength [testthread names]] $two
-} {1 2}
-
-test thread-4.2 {TclThreadSend preserve errorInfo} {
-    set mainthread [testthread names]
-    set serverthread [testthread create]
-    set x [catch {testthread send $serverthread {set undef}} msg]
-    list $x $msg $errorInfo
-} {1 {can't read "undef": no such variable} {can't read "undef": no such variable
-    while executing
-"set undef"
-    invoked from within
-"testthread send $serverthread {set undef}"}}
-ThreadReap
-
-test thread-4.3 {TclThreadSend preserve code} {
-    set mainthread [testthread names]
-    set serverthread [testthread create]
-    set x [catch {testthread send $serverthread {break}} msg]
-    list $x $msg $errorInfo
-} {3 {} {}}
-ThreadReap
-
-test thread-4.4 {TclThreadSend preserve errorCode} {
-    set mainthread [testthread names]
-    set serverthread [testthread create]
-    set x [catch {testthread send $serverthread {error ERR INFO CODE}} msg]
-    list $x $msg $errorCode
-} {1 ERR CODE}
-ThreadReap
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/timer.test b/tests/timer.test
deleted file mode 100644
index 0e6f4e6..0000000
--- a/tests/timer.test
+++ /dev/null
@@ -1,554 +0,0 @@
-# This file contains a collection of tests for the procedures in the
-# file tclTimer.c, which includes the "after" Tcl command.  Sourcing
-# this file into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: timer.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test timer-1.1 {Tcl_CreateTimerHandler procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x ""
-    foreach i {100 200 1000 50 150} {
-	after $i lappend x $i
-    }
-    after 200
-    update
-    set x
-} {50 100 150 200}
-
-test timer-2.1 {Tcl_DeleteTimerHandler procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x ""
-    foreach i {100 200 300 50 150} {
-	after $i lappend x $i
-    }
-    after cancel lappend x 150
-    after cancel lappend x 50
-    after 200
-    update
-    set x
-} {100 200}
-
-# No tests for Tcl_ServiceTimer or ResetTimer, since it is already tested
-# above.
-
-test timer-3.1 {TimerHandlerEventProc procedure: event masks} {
-    set x start
-    after 100 { set x fired }
-    update idletasks
-    set result $x
-    after 200
-    update
-    lappend result $x
-} {start fired}
-test timer-3.2 {TimerHandlerEventProc procedure: multiple timers} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    foreach i {200 600 1000} {
-	after $i lappend x $i
-    }
-    after 200
-    set result ""
-    set x ""
-    update
-    lappend result $x
-    after 400
-    update
-    lappend result $x
-    after 400
-    update
-    lappend result $x
-} {200 {200 600} {200 600 1000}}
-test timer-3.3 {TimerHandlerEventProc procedure: reentrant timer deletion} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x {}
-    after 100 lappend x 100
-    set i [after 300 lappend x 300]
-    after 200 after cancel $i
-    after 400
-    update
-    set x
-} 100
-test timer-3.4 {TimerHandlerEventProc procedure: all expired timers fire} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x {}
-    after 100 lappend x a
-    after 200 lappend x b
-    after 300 lappend x c
-    after 300
-    vwait x
-    set x
-} {a b c}
-test timer-3.5 {TimerHandlerEventProc procedure: reentrantly added timers don't fire} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x {}
-    after 100 {lappend x a; after 0 lappend x b}
-    after 100
-    vwait x
-    set x
-} a
-test timer-3.6 {TimerHandlerEventProc procedure: reentrantly added timers don't fire} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x {}
-    after 100 {lappend x a; after 100 lappend x b; after 100}
-    after 100
-    vwait x
-    set result $x
-    vwait x
-    lappend result $x
-} {a {a b}}
-
-# No tests for Tcl_DoWhenIdle:  it's already tested by other tests
-# below.
-
-test timer-4.1 {Tcl_CancelIdleCall procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x before
-    set y before
-    set z before
-    after idle set x after1
-    after idle set y after2
-    after idle set z after3
-    after cancel set y after2
-    update idletasks
-    concat $x $y $z
-} {after1 before after3}
-test timer-4.2 {Tcl_CancelIdleCall procedure} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x before
-    set y before
-    set z before
-    after idle set x after1
-    after idle set y after2
-    after idle set z after3
-    after cancel set x after1
-    update idletasks
-    concat $x $y $z
-} {before after2 after3}
-
-test timer-5.1 {Tcl_ServiceIdle, self-rescheduling handlers} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x 1
-    set y 23
-    after idle {incr x; after idle {incr x; after idle {incr x}}}
-    after idle {incr y}
-    vwait x
-    set result "$x $y"
-    update idletasks
-    lappend result $x
-} {2 24 4}
-
-test timer-6.1 {Tcl_AfterCmd procedure, basics} {
-    list [catch {after} msg] $msg
-} {1 {wrong # args: should be "after option ?arg arg ...?"}}
-test timer-6.2 {Tcl_AfterCmd procedure, basics} {
-    list [catch {after 2x} msg] $msg
-} {1 {expected integer but got "2x"}}
-test timer-6.3 {Tcl_AfterCmd procedure, basics} {
-    list [catch {after gorp} msg] $msg
-} {1 {bad argument "gorp": must be cancel, idle, info, or a number}}
-test timer-6.4 {Tcl_AfterCmd procedure, ms argument} {
-    set x before
-    after 400 {set x after}
-    after 200
-    update
-    set y $x
-    after 400
-    update
-    list $y $x
-} {before after}
-test timer-6.5 {Tcl_AfterCmd procedure, ms argument} {
-    set x before
-    after 300 set x after
-    after 200
-    update
-    set y $x
-    after 200
-    update
-    list $y $x
-} {before after}
-test timer-6.6 {Tcl_AfterCmd procedure, cancel option} {
-    list [catch {after cancel} msg] $msg
-} {1 {wrong # args: should be "after cancel id|command"}}
-test timer-6.7 {Tcl_AfterCmd procedure, cancel option} {
-    after cancel after#1
-} {}
-test timer-6.8 {Tcl_AfterCmd procedure, cancel option} {
-    after cancel {foo bar}
-} {}
-test timer-6.9 {Tcl_AfterCmd procedure, cancel option} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x before
-    set y [after 100 set x after]
-    after cancel $y
-    after 200
-    update
-    set x
-} {before}
-test timer-6.10 {Tcl_AfterCmd procedure, cancel option} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x before
-    after 100 set x after
-    after cancel {set x after}
-    after 200
-    update
-    set x
-} {before}
-test timer-6.11 {Tcl_AfterCmd procedure, cancel option} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x before
-    after 100 set x after
-    set id [after 300 set x after]
-    after cancel $id
-    after 200
-    update
-    set y $x
-    set x cleared
-    after 200
-    update
-    list $y $x
-} {after cleared}
-test timer-6.12 {Tcl_AfterCmd procedure, cancel option} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x first
-    after idle lappend x second
-    after idle lappend x third
-    set i [after idle lappend x fourth]
-    after cancel {lappend x second}
-    after cancel $i
-    update idletasks
-    set x
-} {first third}
-test timer-6.13 {Tcl_AfterCmd procedure, cancel option, multiple arguments for command} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x first
-    after idle lappend x second
-    after idle lappend x third
-    set i [after idle lappend x fourth]
-    after cancel lappend x second
-    after cancel $i
-    update idletasks
-    set x
-} {first third}
-test timer-6.14 {Tcl_AfterCmd procedure, cancel option, cancel during handler, used to dump core} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set id [
-	after 100 {
-	    set x done
-	    after cancel $id
-	}
-    ]
-    vwait x
-} {}
-test timer-6.15 {Tcl_AfterCmd procedure, cancel option, multiple interps} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    interp create x
-    x eval {set a before; set b before; after idle {set a a-after};
-	    after idle {set b b-after}}
-    set result [llength [x eval after info]]
-    lappend result [llength [after info]]
-    after cancel {set b b-after}
-    set a aaa
-    set b bbb
-    x eval {after cancel set a a-after}
-    update idletasks
-    lappend result $a $b [x eval {list $a $b}]
-    interp delete x
-    set result
-} {2 0 aaa bbb {before b-after}}
-test timer-6.16 {Tcl_AfterCmd procedure, idle option} {
-    list [catch {after idle} msg] $msg
-} {1 {wrong # args: should be "after idle script script ..."}}
-test timer-6.17 {Tcl_AfterCmd procedure, idle option} {
-    set x before
-    after idle {set x after}
-    set y $x
-    update idletasks
-    list $y $x
-} {before after}
-test timer-6.18 {Tcl_AfterCmd procedure, idle option} {
-    set x before
-    after idle set x after
-    set y $x
-    update idletasks
-    list $y $x
-} {before after}
-set event1 [after idle event 1]
-set event2 [after 1000 event 2]
-interp create x
-set childEvent [x eval {after idle event in child}]
-test timer-6.19 {Tcl_AfterCmd, info option} {
-    lsort [after info]
-} [lsort "$event1 $event2"]
-test timer-6.20 {Tcl_AfterCmd, info option} {
-    list [catch {after info a b} msg] $msg
-} {1 {wrong # args: should be "after info ?id?"}}
-test timer-6.21 {Tcl_AfterCmd, info option} {
-    list [catch {after info $childEvent} msg] $msg
-} "1 {event \"$childEvent\" doesn't exist}"
-test timer-6.22 {Tcl_AfterCmd, info option} {
-    list [after info $event1] [after info $event2]
-} {{{event 1} idle} {{event 2} timer}}
-
-after cancel $event1
-after cancel $event2
-interp delete x
-
-test timer-6.23 {Tcl_AfterCmd procedure, no option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after 1 "set x ab\0cd"
-    after 10
-    update
-    string length $x
-} {5}
-test timer-6.24 {Tcl_AfterCmd procedure, no option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after 1 set x ab\0cd
-    after 10
-    update
-    string length $x
-} {5}
-test timer-6.25 {Tcl_AfterCmd procedure, cancel option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after 1 set x ab\0cd
-    after cancel "set x ab\0ef"
-    set x [llength [after info]]
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x
-} {1}
-test timer-6.26 {Tcl_AfterCmd procedure, cancel option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after 1 set x ab\0cd
-    after cancel set x ab\0ef
-    set y [llength [after info]]
-    foreach i [after info] {
-	after cancel $i
-    }
-    set y
-} {1}
-test timer-6.27 {Tcl_AfterCmd procedure, idle option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after idle "set x ab\0cd"
-    update
-    string length $x
-} {5}
-test timer-6.28 {Tcl_AfterCmd procedure, idle option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    after idle set x ab\0cd
-    update
-    string length $x
-} {5}
-test timer-6.29 {Tcl_AfterCmd procedure, info option, script with NULL} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    set x "hello world"
-    set id junk
-    set id [after 1 set x ab\0cd]
-    update
-    set y [string length [lindex [lindex [after info $id] 0] 2]]
-    foreach i [after info] {
-	after cancel $i
-    }
-    set y
-} {5}
-
-set event [after idle foo bar]
-scan $event after#%d id
-
-test timer-7.1 {GetAfterEvent procedure} {
-    list [catch {after info xfter#$id} msg] $msg
-} "1 {event \"xfter#$id\" doesn't exist}"
-test timer-7.2 {GetAfterEvent procedure} {
-    list [catch {after info afterx$id} msg] $msg
-} "1 {event \"afterx$id\" doesn't exist}"
-test timer-7.3 {GetAfterEvent procedure} {
-    list [catch {after info after#ab} msg] $msg
-} {1 {event "after#ab" doesn't exist}}
-test timer-7.4 {GetAfterEvent procedure} {
-    list [catch {after info after#} msg] $msg
-} {1 {event "after#" doesn't exist}}
-test timer-7.5 {GetAfterEvent procedure} {
-    list [catch {after info after#${id}x} msg] $msg
-} "1 {event \"after#${id}x\" doesn't exist}"
-test timer-7.6 {GetAfterEvent procedure} {
-    list [catch {after info afterx[expr $id+1]} msg] $msg
-} "1 {event \"afterx[expr $id+1]\" doesn't exist}"
-after cancel $event
-
-test timer-8.1 {AfterProc procedure} {
-    set x before
-    proc foo {} {
-	set x untouched
-	after 100 {set x after}
-	after 200
-	update
-	return $x
-    }
-    list [foo] $x
-} {untouched after}
-test timer-8.2 {AfterProc procedure} {
-    catch {rename bgerror {}}
-    proc bgerror msg {
-	global x errorInfo
-	set x [list $msg $errorInfo]
-    }
-    set x empty
-    after 100 {error "After error"}
-    after 200
-    set y $x
-    update
-    catch {rename bgerror {}}
-    list $y $x
-} {empty {{After error} {After error
-    while executing
-"error "After error""
-    ("after" script)}}}
-test timer-8.3 {AfterProc procedure, deleting handler from itself} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    proc foo {} {
-	global x
-	set x {}
-	foreach i [after info] {
-	    lappend x [after info $i]
-	}
-	after cancel foo
-    }
-    after idle foo
-    after 1000 {error "I shouldn't ever have executed"}
-    update idletasks
-    set x
-} {{{error "I shouldn't ever have executed"} timer}}
-test timer-8.4 {AfterProc procedure, deleting handler from itself} {
-    foreach i [after info] {
-	after cancel $i
-    }
-    proc foo {} {
-	global x
-	set x {}
-	foreach i [after info] {
-	    lappend x [after info $i]
-	}
-	after cancel foo
-    }
-    after 1000 {error "I shouldn't ever have executed"}
-    after idle foo
-    update idletasks
-    set x
-} {{{error "I shouldn't ever have executed"} timer}}
-
-foreach i [after info] {
-    after cancel $i
-}
-
-# No test for FreeAfterPtr, since it is already tested above.
-
-
-test timer-9.1 {AfterCleanupProc procedure} {
-    catch {interp delete x}
-    interp create x
-    x eval {after 200 {
-	lappend x after
-	puts "part 1: this message should not appear"
-    }}
-    after 200 {lappend x after2}
-    x eval {after 200 {
-	lappend x after3
-	puts "part 2: this message should not appear"
-    }}
-    after 200 {lappend x after4}
-    x eval {after 200 {
-	lappend x after5
-	puts "part 3: this message should not appear"
-    }}
-    interp delete x
-    set x before
-    after 300
-    update
-    set x
-} {before after2 after4}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/trace.test b/tests/trace.test
deleted file mode 100644
index a2dd45e..0000000
--- a/tests/trace.test
+++ /dev/null
@@ -1,984 +0,0 @@
-# Commands covered:  trace
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: trace.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc traceScalar {name1 name2 op} {
-    global info
-    set info [list $name1 $name2 $op [catch {uplevel set $name1} msg] $msg]
-}
-proc traceScalarAppend {name1 name2 op} {
-    global info
-    lappend info $name1 $name2 $op [catch {uplevel set $name1} msg] $msg
-}
-proc traceArray {name1 name2 op} {
-    global info
-    set info [list $name1 $name2 $op [catch {uplevel set [set name1]($name2)} msg] $msg]
-}
-proc traceArray2 {name1 name2 op} {
-    global info
-    set info [list $name1 $name2 $op]
-}
-proc traceProc {name1 name2 op} {
-    global info
-    set info [concat $info [list $name1 $name2 $op]]
-}
-proc traceTag {tag args} {
-    global info
-    set info [concat $info $tag]
-}
-proc traceError {args} {
-    error "trace returned error"
-}
-proc traceCheck {cmd args} {
-    global info
-    set info [list [catch $cmd msg] $msg]
-}
-proc traceCrtElement {value name1 name2 op} {
-    uplevel set ${name1}($name2) $value
-}
-
-# Read-tracing on variables
-
-test trace-1.1 {trace variable reads} {
-    catch {unset x}
-    set info {}
-    trace var x r traceScalar
-    list [catch {set x} msg] $msg $info
-} {1 {can't read "x": no such variable} {x {} r 1 {can't read "x": no such variable}}}
-test trace-1.2 {trace variable reads} {
-    catch {unset x}
-    set x 123
-    set info {}
-    trace var x r traceScalar
-    list [catch {set x} msg] $msg $info
-} {0 123 {x {} r 0 123}}
-test trace-1.3 {trace variable reads} {
-    catch {unset x}
-    set info {}
-    trace var x r traceScalar
-    set x 123
-    set info
-} {}
-test trace-1.4 {trace array element reads} {
-    catch {unset x}
-    set info {}
-    trace var x(2) r traceArray
-    list [catch {set x(2)} msg] $msg $info
-} {1 {can't read "x(2)": no such element in array} {x 2 r 1 {can't read "x(2)": no such element in array}}}
-test trace-1.5 {trace array element reads} {
-    catch {unset x}
-    set x(2) zzz
-    set info {}
-    trace var x(2) r traceArray
-    list [catch {set x(2)} msg] $msg $info
-} {0 zzz {x 2 r 0 zzz}}
-test trace-1.6 {trace array element reads} {
-    catch {unset x}
-    set info {}
-    trace variable x r traceArray2
-    proc p {} {
-        global x
-        set x(2) willi
-        return $x(2)
-    }
-    list [catch {p} msg] $msg $info
-} {0 willi {x 2 r}}
-test trace-1.7 {trace array element reads, create element undefined if nonexistant} {
-    catch {unset x}
-    set info {}
-    trace variable x r q
-    proc q {name1 name2 op} {
-        global info
-        set info [list $name1 $name2 $op]
-        global $name1
-        set ${name1}($name2) wolf
-    }
-    proc p {} {
-        global x
-        set x(X) willi
-        return $x(Y)
-    }
-    list [catch {p} msg] $msg $info
-} {0 wolf {x Y r}}
-test trace-1.8 {trace reads on whole arrays} {
-    catch {unset x}
-    set info {}
-    trace var x r traceArray
-    list [catch {set x(2)} msg] $msg $info
-} {1 {can't read "x(2)": no such variable} {}}
-test trace-1.9 {trace reads on whole arrays} {
-    catch {unset x}
-    set x(2) zzz
-    set info {}
-    trace var x r traceArray
-    list [catch {set x(2)} msg] $msg $info
-} {0 zzz {x 2 r 0 zzz}}
-test trace-1.10 {trace variable reads} {
-    catch {unset x}
-    set x 444
-    set info {}
-    trace var x r traceScalar
-    unset x
-    set info
-} {}
-
-# Basic write-tracing on variables
-
-test trace-2.1 {trace variable writes} {
-    catch {unset x}
-    set info {}
-    trace var x w traceScalar
-    set x 123
-    set info
-} {x {} w 0 123}
-test trace-2.2 {trace writes to array elements} {
-    catch {unset x}
-    set info {}
-    trace var x(33) w traceArray
-    set x(33) 444
-    set info
-} {x 33 w 0 444}
-test trace-2.3 {trace writes on whole arrays} {
-    catch {unset x}
-    set info {}
-    trace var x w traceArray
-    set x(abc) qq
-    set info
-} {x abc w 0 qq}
-test trace-2.4 {trace variable writes} {
-    catch {unset x}
-    set x 1234
-    set info {}
-    trace var x w traceScalar
-    set x
-    set info
-} {}
-test trace-2.5 {trace variable writes} {
-    catch {unset x}
-    set x 1234
-    set info {}
-    trace var x w traceScalar
-    unset x
-    set info
-} {}
-
-# append no longer triggers read traces when fetching the old values of
-# variables before doing the append operation. However, lappend _does_
-# still trigger these read traces. Also lappend triggers only one write
-# trace: after appending all arguments to the list.
-
-test trace-3.1 {trace variable read-modify-writes} {
-    catch {unset x}
-    set info {}
-    trace var x r traceScalarAppend
-    append x 123
-    append x 456
-    lappend x 789
-    set info
-} {x {} r 0 123456}
-test trace-3.2 {trace variable read-modify-writes} {
-    catch {unset x}
-    set info {}
-    trace var x rw traceScalarAppend
-    append x 123
-    lappend x 456
-    set info
-} {x {} w 0 123 x {} r 0 123 x {} w 0 {123 456}}
-
-# Basic unset-tracing on variables
-
-test trace-4.1 {trace variable unsets} {
-    catch {unset x}
-    set info {}
-    trace var x u traceScalar
-    catch {unset x}
-    set info
-} {x {} u 1 {can't read "x": no such variable}}
-test trace-4.2 {variable mustn't exist during unset trace} {
-    catch {unset x}
-    set x 1234
-    set info {}
-    trace var x u traceScalar
-    unset x
-    set info
-} {x {} u 1 {can't read "x": no such variable}}
-test trace-4.3 {unset traces mustn't be called during reads and writes} {
-    catch {unset x}
-    set info {}
-    trace var x u traceScalar
-    set x 44
-    set x
-    set info
-} {}
-test trace-4.4 {trace unsets on array elements} {
-    catch {unset x}
-    set x(0) 18
-    set info {}
-    trace var x(1) u traceArray
-    catch {unset x(1)}
-    set info
-} {x 1 u 1 {can't read "x(1)": no such element in array}}
-test trace-4.5 {trace unsets on array elements} {
-    catch {unset x}
-    set x(1) 18
-    set info {}
-    trace var x(1) u traceArray
-    unset x(1)
-    set info
-} {x 1 u 1 {can't read "x(1)": no such element in array}}
-test trace-4.6 {trace unsets on array elements} {
-    catch {unset x}
-    set x(1) 18
-    set info {}
-    trace var x(1) u traceArray
-    unset x
-    set info
-} {x 1 u 1 {can't read "x(1)": no such variable}}
-test trace-4.7 {trace unsets on whole arrays} {
-    catch {unset x}
-    set x(1) 18
-    set info {}
-    trace var x u traceProc
-    catch {unset x(0)}
-    set info
-} {}
-test trace-4.8 {trace unsets on whole arrays} {
-    catch {unset x}
-    set x(1) 18
-    set x(2) 144
-    set x(3) 14
-    set info {}
-    trace var x u traceProc
-    unset x(1)
-    set info
-} {x 1 u}
-test trace-4.9 {trace unsets on whole arrays} {
-    catch {unset x}
-    set x(1) 18
-    set x(2) 144
-    set x(3) 14
-    set info {}
-    trace var x u traceProc
-    unset x
-    set info
-} {x {} u}
-
-# Trace multiple trace types at once.
-
-test trace-5.1 {multiple ops traced at once} {
-    catch {unset x}
-    set info {}
-    trace var x rwu traceProc
-    catch {set x}
-    set x 22
-    set x
-    set x 33
-    unset x
-    set info
-} {x {} r x {} w x {} r x {} w x {} u}
-test trace-5.2 {multiple ops traced on array element} {
-    catch {unset x}
-    set info {}
-    trace var x(0) rwu traceProc
-    catch {set x(0)}
-    set x(0) 22
-    set x(0)
-    set x(0) 33
-    unset x(0)
-    unset x
-    set info
-} {x 0 r x 0 w x 0 r x 0 w x 0 u}
-test trace-5.3 {multiple ops traced on whole array} {
-    catch {unset x}
-    set info {}
-    trace var x rwu traceProc
-    catch {set x(0)}
-    set x(0) 22
-    set x(0)
-    set x(0) 33
-    unset x(0)
-    unset x
-    set info
-} {x 0 w x 0 r x 0 w x 0 u x {} u}
-
-# Check order of invocation of traces
-
-test trace-6.1 {order of invocation of traces} {
-    catch {unset x}
-    set info {}
-    trace var x r "traceTag 1"
-    trace var x r "traceTag 2"
-    trace var x r "traceTag 3"
-    catch {set x}
-    set x 22
-    set x
-    set info
-} {3 2 1 3 2 1}
-test trace-6.2 {order of invocation of traces} {
-    catch {unset x}
-    set x(0) 44
-    set info {}
-    trace var x(0) r "traceTag 1"
-    trace var x(0) r "traceTag 2"
-    trace var x(0) r "traceTag 3"
-    set x(0)
-    set info
-} {3 2 1}
-test trace-6.3 {order of invocation of traces} {
-    catch {unset x}
-    set x(0) 44
-    set info {}
-    trace var x(0) r "traceTag 1"
-    trace var x r "traceTag A1"
-    trace var x(0) r "traceTag 2"
-    trace var x r "traceTag A2"
-    trace var x(0) r "traceTag 3"
-    trace var x r "traceTag A3"
-    set x(0)
-    set info
-} {A3 A2 A1 3 2 1}
-
-# Check effects of errors in trace procedures
-
-test trace-7.1 {error returns from traces} {
-    catch {unset x}
-    set x 123
-    set info {}
-    trace var x r "traceTag 1"
-    trace var x r traceError
-    list [catch {set x} msg] $msg $info
-} {1 {can't read "x": trace returned error} {}}
-test trace-7.2 {error returns from traces} {
-    catch {unset x}
-    set x 123
-    set info {}
-    trace var x w "traceTag 1"
-    trace var x w traceError
-    list [catch {set x 44} msg] $msg $info
-} {1 {can't set "x": trace returned error} {}}
-test trace-7.3 {error returns from traces} {
-    catch {unset x}
-    set x 123
-    set info {}
-    trace var x w traceError
-    list [catch {append x 44} msg] $msg $info
-} {1 {can't set "x": trace returned error} {}}
-test trace-7.4 {error returns from traces} {
-    catch {unset x}
-    set x 123
-    set info {}
-    trace var x u "traceTag 1"
-    trace var x u traceError
-    list [catch {unset x} msg] $msg $info
-} {0 {} 1}
-test trace-7.5 {error returns from traces} {
-    catch {unset x}
-    set x(0) 123
-    set info {}
-    trace var x(0) r "traceTag 1"
-    trace var x r "traceTag 2"
-    trace var x r traceError
-    trace var x r "traceTag 3"
-    list [catch {set x(0)} msg] $msg $info
-} {1 {can't read "x(0)": trace returned error} 3}
-test trace-7.6 {error returns from traces} {
-    catch {unset x}
-    set x 123
-    trace var x u traceError
-    list [catch {unset x} msg] $msg
-} {0 {}}
-test trace-7.7 {error returns from traces} {
-    # This test just makes sure that the memory for the error message
-    # gets deallocated correctly when the trace is invoked again or
-    # when the trace is deleted.
-    catch {unset x}
-    set x 123
-    trace var x r traceError
-    catch {set x}
-    catch {set x}
-    trace vdelete x r traceError
-} {}
-
-# Check to see that variables are expunged before trace
-# procedures are invoked, so trace procedure can even manipulate
-# a new copy of the variables.
-
-test trace-8.1 {be sure variable is unset before trace is called} {
-    catch {unset x}
-    set x 33
-    set info {}
-    trace var x u {traceCheck {uplevel set x}}
-    unset x
-    set info
-} {1 {can't read "x": no such variable}}
-test trace-8.2 {be sure variable is unset before trace is called} {
-    catch {unset x}
-    set x 33
-    set info {}
-    trace var x u {traceCheck {uplevel set x 22}}
-    unset x
-    concat $info [list [catch {set x} msg] $msg]
-} {0 22 0 22}
-test trace-8.3 {be sure traces are cleared before unset trace called} {
-    catch {unset x}
-    set x 33
-    set info {}
-    trace var x u {traceCheck {uplevel trace vinfo x}}
-    unset x
-    set info
-} {0 {}}
-test trace-8.4 {set new trace during unset trace} {
-    catch {unset x}
-    set x 33
-    set info {}
-    trace var x u {traceCheck {global x; trace var x u traceProc}}
-    unset x
-    concat $info [trace vinfo x]
-} {0 {} {u traceProc}}
-
-test trace-9.1 {make sure array elements are unset before traces are called} {
-    catch {unset x}
-    set x(0) 33
-    set info {}
-    trace var x(0) u {traceCheck {uplevel set x(0)}}
-    unset x(0)
-    set info
-} {1 {can't read "x(0)": no such element in array}}
-test trace-9.2 {make sure array elements are unset before traces are called} {
-    catch {unset x}
-    set x(0) 33
-    set info {}
-    trace var x(0) u {traceCheck {uplevel set x(0) zzz}}
-    unset x(0)
-    concat $info [list [catch {set x(0)} msg] $msg]
-} {0 zzz 0 zzz}
-test trace-9.3 {array elements are unset before traces are called} {
-    catch {unset x}
-    set x(0) 33
-    set info {}
-    trace var x(0) u {traceCheck {global x; trace vinfo x(0)}}
-    unset x(0)
-    set info
-} {0 {}}
-test trace-9.4 {set new array element trace during unset trace} {
-    catch {unset x}
-    set x(0) 33
-    set info {}
-    trace var x(0) u {traceCheck {uplevel {trace variable x(0) r {}}}}
-    catch {unset x(0)}
-    concat $info [trace vinfo x(0)]
-} {0 {} {r {}}}
-
-test trace-10.1 {make sure arrays are unset before traces are called} {
-    catch {unset x}
-    set x(0) 33
-    set info {}
-    trace var x u {traceCheck {uplevel set x(0)}}
-    unset x
-    set info
-} {1 {can't read "x(0)": no such variable}}
-test trace-10.2 {make sure arrays are unset before traces are called} {
-    catch {unset x}
-    set x(y) 33
-    set info {}
-    trace var x u {traceCheck {uplevel set x(y) 22}}
-    unset x
-    concat $info [list [catch {set x(y)} msg] $msg]
-} {0 22 0 22}
-test trace-10.3 {make sure arrays are unset before traces are called} {
-    catch {unset x}
-    set x(y) 33
-    set info {}
-    trace var x u {traceCheck {uplevel array exists x}}
-    unset x
-    set info
-} {0 0}
-test trace-10.4 {make sure arrays are unset before traces are called} {
-    catch {unset x}
-    set x(y) 33
-    set info {}
-    set cmd {traceCheck {uplevel {trace vinfo x}}}
-    trace var x u $cmd
-    unset x
-    set info
-} {0 {}}
-test trace-10.5 {set new array trace during unset trace} {
-    catch {unset x}
-    set x(y) 33
-    set info {}
-    trace var x u {traceCheck {global x; trace var x r {}}}
-    unset x
-    concat $info [trace vinfo x]
-} {0 {} {r {}}}
-test trace-10.6 {create scalar during array unset trace} {
-    catch {unset x}
-    set x(y) 33
-    set info {}
-    trace var x u {traceCheck {global x; set x 44}}
-    unset x
-    concat $info [list [catch {set x} msg] $msg]
-} {0 44 0 44}
-
-# Check special conditions (e.g. errors) in Tcl_TraceVar2.
-
-test trace-11.1 {creating array when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x(0) w traceProc
-    list [catch {set x 22} msg] $msg
-} {1 {can't set "x": variable is array}}
-test trace-11.2 {creating array when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x(0) w traceProc
-    list [catch {set x(0)} msg] $msg
-} {1 {can't read "x(0)": no such element in array}}
-test trace-11.3 {creating array when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x(0) w traceProc
-    set x(0) 22
-    set info
-} {x 0 w}
-test trace-11.4 {creating variable when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x w traceProc
-    list [catch {set x} msg] $msg
-} {1 {can't read "x": no such variable}}
-test trace-11.5 {creating variable when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x w traceProc
-    set x 22
-    set info
-} {x {} w}
-test trace-11.6 {creating variable when setting variable traces} {
-    catch {unset x}
-    set info {}
-    trace var x w traceProc
-    set x(0) 22
-    set info
-} {x 0 w}
-test trace-11.7 {create array element during read trace} {
-    catch {unset x}
-    set x(2) zzz
-    trace var x r {traceCrtElement xyzzy}
-    list [catch {set x(3)} msg] $msg
-} {0 xyzzy}
-test trace-11.8 {errors when setting variable traces} {
-    catch {unset x}
-    set x 44
-    list [catch {trace var x(0) w traceProc} msg] $msg
-} {1 {can't trace "x(0)": variable isn't array}}
-
-# Check deleting one trace from another.
-
-test trace-12.1 {delete one trace from another} {
-    proc delTraces {args} {
-	global x
-	trace vdel x r {traceTag 2}
-	trace vdel x r {traceTag 3}
-	trace vdel x r {traceTag 4}
-    }
-    catch {unset x}
-    set x 44
-    set info {}
-    trace var x r {traceTag 1}
-    trace var x r {traceTag 2}
-    trace var x r {traceTag 3}
-    trace var x r {traceTag 4}
-    trace var x r delTraces 
-    trace var x r {traceTag 5}
-    set x
-    set info
-} {5 1}
-
-# Check operation and syntax of "trace" command.
-
-test trace-13.1 {trace command (overall)} {
-    list [catch {trace} msg] $msg
-} {1 {wrong # args: should be "trace option [arg arg ...]"}}
-test trace-13.2 {trace command (overall)} {
-    list [catch {trace gorp} msg] $msg
-} {1 {bad option "gorp": must be variable, vdelete, or vinfo}}
-test trace-13.3 {trace command ("variable" option)} {
-    list [catch {trace variable x y} msg] $msg
-} {1 {wrong # args: should be "trace variable name ops command"}}
-test trace-13.4 {trace command ("variable" option)} {
-    list [catch {trace var x y z z2} msg] $msg
-} {1 {wrong # args: should be "trace variable name ops command"}}
-test trace-13.5 {trace command ("variable" option)} {
-    list [catch {trace var x y z} msg] $msg
-} {1 {bad operations "y": should be one or more of rwu}}
-test trace-13.6 {trace command ("vdelete" option)} {
-    list [catch {trace vdelete x y} msg] $msg
-} {1 {wrong # args: should be "trace vdelete name ops command"}}
-test trace-13.7 {trace command ("vdelete" option)} {
-    list [catch {trace vdelete x y z foo} msg] $msg
-} {1 {wrong # args: should be "trace vdelete name ops command"}}
-test trace-13.8 {trace command ("vdelete" option)} {
-    list [catch {trace vdelete x y z} msg] $msg
-} {1 {bad operations "y": should be one or more of rwu}}
-test trace-13.9 {trace command ("vdelete" option)} {
-    catch {unset x}
-    set info {}
-    trace var x w traceProc
-    trace vdelete x w traceProc
-} {}
-test trace-13.10 {trace command ("vdelete" option)} {
-    catch {unset x}
-    set info {}
-    trace var x w traceProc
-    trace vdelete x w traceProc
-    set x 12345
-    set info
-} {}
-test trace-13.11 {trace command ("vdelete" option)} {
-    catch {unset x}
-    set info {}
-    trace var x w {traceTag 1}
-    trace var x w traceProc
-    trace var x w {traceTag 2}
-    set x yy
-    trace vdelete x w traceProc
-    set x 12345
-    trace vdelete x w {traceTag 1}
-    set x foo
-    trace vdelete x w {traceTag 2}
-    set x gorp
-    set info
-} {2 x {} w 1 2 1 2}
-test trace-13.12 {trace command ("vdelete" option)} {
-    catch {unset x}
-    set info {}
-    trace var x w {traceTag 1}
-    trace vdelete x w non_existent
-    set x 12345
-    set info
-} {1}
-test trace-13.13 {trace command ("vinfo" option)} {
-    list [catch {trace vinfo} msg] $msg]
-} {1 {wrong # args: should be "trace vinfo name"]}}
-test trace-13.14 {trace command ("vinfo" option)} {
-    list [catch {trace vinfo x y} msg] $msg]
-} {1 {wrong # args: should be "trace vinfo name"]}}
-test trace-13.15 {trace command ("vinfo" option)} {
-    catch {unset x}
-    trace var x w {traceTag 1}
-    trace var x w traceProc
-    trace var x w {traceTag 2}
-    trace vinfo x
-} {{w {traceTag 2}} {w traceProc} {w {traceTag 1}}}
-test trace-13.16 {trace command ("vinfo" option)} {
-    catch {unset x}
-    trace vinfo x
-} {}
-test trace-13.17 {trace command ("vinfo" option)} {
-    catch {unset x}
-    trace vinfo x(0)
-} {}
-test trace-13.18 {trace command ("vinfo" option)} {
-    catch {unset x}
-    set x 44
-    trace vinfo x(0)
-} {}
-test trace-13.19 {trace command ("vinfo" option)} {
-    catch {unset x}
-    set x 44
-    trace var x w {traceTag 1}
-    proc check {} {global x; trace vinfo x}
-    check
-} {{w {traceTag 1}}}
-
-# Check fancy trace commands (long ones, weird arguments, etc.)
-
-test trace-14.1 {long trace command} {
-    catch {unset x}
-    set info {}
-    trace var x w {traceTag {This is a very very long argument.  It's \
-	designed to test out the facilities of TraceVarProc for dealing \
-	with such long arguments by malloc-ing space.  One possibility \
-	is that space doesn't get freed properly.  If this happens, then \
-	invoking this test over and over again will eventually leak memory.}}
-    set x 44
-    set info
-} {This is a very very long argument.  It's \
-	designed to test out the facilities of TraceVarProc for dealing \
-	with such long arguments by malloc-ing space.  One possibility \
-	is that space doesn't get freed properly.  If this happens, then \
-	invoking this test over and over again will eventually leak memory.}
-test trace-14.2 {long trace command result to ignore} {
-    proc longResult {args} {return "quite a bit of text, designed to
-	generate a core leak if this command file is invoked over and over again
-	and memory isn't being recycled correctly"}
-    catch {unset x}
-    trace var x w longResult
-    set x 44
-    set x 5
-    set x abcde
-} abcde
-test trace-14.3 {special list-handling in trace commands} {
-    catch {unset "x y z"}
-    set "x y z(a\n\{)" 44
-    set info {}
-    trace var "x y z(a\n\{)" w traceProc
-    set "x y z(a\n\{)" 33
-    set info
-} "{x y z} a\\n\\{ w"
-
-# Check for proper handling of unsets during traces.
-
-proc traceUnset {unsetName args} {
-    global info
-    upvar $unsetName x
-    lappend info [catch {unset x} msg] $msg [catch {set x} msg] $msg
-}
-proc traceReset {unsetName resetName args} {
-    global info
-    upvar $unsetName x $resetName y
-    lappend info [catch {unset x} msg] $msg [catch {set y xyzzy} msg] $msg
-}
-proc traceReset2 {unsetName resetName args} {
-    global info
-    lappend info [catch {uplevel unset $unsetName} msg] $msg \
-	    [catch {uplevel set $resetName xyzzy} msg] $msg
-}
-proc traceAppend {string name1 name2 op} {
-    global info
-    lappend info $string
-}
-
-test trace-15.1 {unsets during read traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y r {traceUnset y}
-    trace var y u {traceAppend unset}
-    lappend info [catch {set y} msg] $msg
-} {unset 0 {} 1 {can't read "x": no such variable} 1 {can't read "y": no such variable}}
-test trace-15.2 {unsets during read traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceUnset y(0)}
-    lappend info [catch {set y(0)} msg] $msg
-} {0 {} 1 {can't read "x": no such variable} 1 {can't read "y(0)": no such element in array}}
-test trace-15.3 {unsets during read traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceUnset y}
-    lappend info [catch {set y(0)} msg] $msg
-} {0 {} 1 {can't read "x": no such variable} 1 {can't read "y(0)": no such variable}}
-test trace-15.4 {unsets during read traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y r {traceReset y y}
-    lappend info [catch {set y} msg] $msg
-} {0 {} 0 xyzzy 0 xyzzy}
-test trace-15.5 {unsets during read traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceReset y(0) y(0)}
-    lappend info [catch {set y(0)} msg] $msg
-} {0 {} 0 xyzzy 0 xyzzy}
-test trace-15.6 {unsets during read traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceReset y y(0)}
-    lappend info [catch {set y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 1 {can't set "y": upvar refers to element in deleted array} 1 {can't read "y(0)": no such variable} 1 {can't read "y(0)": no such variable}}
-test trace-15.7 {unsets during read traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceReset2 y y(0)}
-    lappend info [catch {set y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 0 xyzzy 1 {can't read "y(0)": no such element in array} 0 xyzzy}
-test trace-15.8 {unsets during write traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y w {traceUnset y}
-    trace var y u {traceAppend unset}
-    lappend info [catch {set y xxx} msg] $msg
-} {unset 0 {} 1 {can't read "x": no such variable} 0 {}}
-test trace-15.9 {unsets during write traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) w {traceUnset y(0)}
-    lappend info [catch {set y(0) xxx} msg] $msg
-} {0 {} 1 {can't read "x": no such variable} 0 {}}
-test trace-15.10 {unsets during write traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) w {traceUnset y}
-    lappend info [catch {set y(0) xxx} msg] $msg
-} {0 {} 1 {can't read "x": no such variable} 0 {}}
-test trace-15.11 {unsets during write traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y w {traceReset y y}
-    lappend info [catch {set y xxx} msg] $msg
-} {0 {} 0 xyzzy 0 xyzzy}
-test trace-15.12 {unsets during write traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) w {traceReset y(0) y(0)}
-    lappend info [catch {set y(0) xxx} msg] $msg
-} {0 {} 0 xyzzy 0 xyzzy}
-test trace-15.13 {unsets during write traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) w {traceReset y y(0)}
-    lappend info [catch {set y(0) xxx} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 1 {can't set "y": upvar refers to element in deleted array} 0 {} 1 {can't read "y(0)": no such variable}}
-test trace-15.14 {unsets during write traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) w {traceReset2 y y(0)}
-    lappend info [catch {set y(0) xxx} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 0 xyzzy 0 {} 0 xyzzy}
-test trace-15.15 {unsets during unset traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y u {traceUnset y}
-    lappend info [catch {unset y} msg] $msg [catch {set y} msg] $msg
-} {1 {can't unset "x": no such variable} 1 {can't read "x": no such variable} 0 {} 1 {can't read "y": no such variable}}
-test trace-15.16 {unsets during unset traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) u {traceUnset y(0)}
-    lappend info [catch {unset y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {1 {can't unset "x": no such variable} 1 {can't read "x": no such variable} 0 {} 1 {can't read "y(0)": no such element in array}}
-test trace-15.17 {unsets during unset traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) u {traceUnset y}
-    lappend info [catch {unset y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 1 {can't read "x": no such variable} 0 {} 1 {can't read "y(0)": no such variable}}
-test trace-15.18 {unsets during unset traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y u {traceReset2 y y}
-    lappend info [catch {unset y} msg] $msg [catch {set y} msg] $msg
-} {1 {can't unset "y": no such variable} 0 xyzzy 0 {} 0 xyzzy}
-test trace-15.19 {unsets during unset traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) u {traceReset2 y(0) y(0)}
-    lappend info [catch {unset y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {1 {can't unset "y(0)": no such element in array} 0 xyzzy 0 {} 0 xyzzy}
-test trace-15.20 {unsets during unset traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) u {traceReset2 y y(0)}
-    lappend info [catch {unset y(0)} msg] $msg [catch {set y(0)} msg] $msg
-} {0 {} 0 xyzzy 0 {} 0 xyzzy}
-test trace-15.21 {unsets cancelling traces} {
-    catch {unset y}
-    set y 1234
-    set info {}
-    trace var y r {traceAppend first}
-    trace var y r {traceUnset y}
-    trace var y r {traceAppend third}
-    trace var y u {traceAppend unset}
-    lappend info [catch {set y} msg] $msg
-} {third unset 0 {} 1 {can't read "x": no such variable} 1 {can't read "y": no such variable}}
-test trace-15.22 {unsets cancelling traces} {
-    catch {unset y}
-    set y(0) 1234
-    set info {}
-    trace var y(0) r {traceAppend first}
-    trace var y(0) r {traceUnset y}
-    trace var y(0) r {traceAppend third}
-    trace var y(0) u {traceAppend unset}
-    lappend info [catch {set y(0)} msg] $msg
-} {third unset 0 {} 1 {can't read "x": no such variable} 1 {can't read "y(0)": no such variable}}
-
-# Check various non-interference between traces and other things.
-
-test trace-16.1 {trace doesn't prevent unset errors} {
-    catch {unset x}
-    set info {}
-    trace var x u {traceProc}
-    list [catch {unset x} msg] $msg $info
-} {1 {can't unset "x": no such variable} {x {} u}}
-test trace-16.2 {traced variables must survive procedure exits} {
-    catch {unset x}
-    proc p1 {} {global x; trace var x w traceProc}
-    p1
-    trace vinfo x
-} {{w traceProc}}
-test trace-16.3 {traced variables must survive procedure exits} {
-    catch {unset x}
-    set info {}
-    proc p1 {} {global x; trace var x w traceProc}
-    p1
-    set x 44
-    set info
-} {x {} w}
-
-# Be sure that procedure frames are released before unset traces
-# are invoked.
-
-test trace-17.1 {unset traces on procedure returns} {
-    proc p1 {x y} {set a 44; p2 14}
-    proc p2 {z} {trace var z u {traceCheck {lsort [uplevel {info vars}]}}}
-    set info {}
-    p1 foo bar
-    set info
-} {0 {a x y}}
-
-# Delete arrays when done, so they can be re-used as scalars
-# elsewhere.
-
-catch {unset x}
-catch {unset y}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/unixFCmd.test b/tests/unixFCmd.test
deleted file mode 100644
index d026aa3..0000000
--- a/tests/unixFCmd.test
+++ /dev/null
@@ -1,300 +0,0 @@
-# This file tests the tclUnixFCmd.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: unixFCmd.test,v 1.6 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Several tests require need to match results against the unix username
-set user {}
-if {$tcl_platform(platform) == "unix"} {
-    catch {set user [exec whoami]}
-    if {$user == ""} {
-	catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-    }
-    if {$user == ""} {
-	set user "root"
-    }
-}
-
-proc openup {path} {
-    testchmod 777 $path
-    if {[file isdirectory $path]} {
-	catch {
-	    foreach p [glob [file join $path *]] {
-		openup $p
-	    }
-	}
-    }
-}
-
-proc cleanup {args} {
-    foreach p ". $args" {
-	set x ""
-	catch {
-	    set x [glob [file join $p tf*] [file join $p td*]]
-	}
-	foreach file $x {
-	    if {[catch {file delete -force -- $file}]} {
-		openup $file
-		file delete -force -- $file
-	    }
-	}
-    }
-}
-
-test unixFCmd-1.1 {TclpRenameFile: EACCES} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1/td2/td3
-    exec chmod 000 td1/td2
-    set msg [list [catch {file rename td1/td2/td3 td2} msg] $msg]
-    exec chmod 755 td1/td2
-    set msg
-} {1 {error renaming "td1/td2/td3": permission denied}}
-test unixFCmd-1.2 {TclpRenameFile: EEXIST} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1/td2
-    file mkdir td2
-    list [catch {file rename td2 td1} msg] $msg
-} {1 {error renaming "td2" to "td1/td2": file already exists}}
-test unixFCmd-1.3 {TclpRenameFile: EINVAL} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1
-    list [catch {file rename td1 td1} msg] $msg
-} {1 {error renaming "td1" to "td1/td1": trying to rename a volume or move a directory into itself}}
-test unixFCmd-1.4 {TclpRenameFile: EISDIR} {emptyTest unixOnly notRoot} {
-    # can't make it happen
-} {}
-test unixFCmd-1.5 {TclpRenameFile: ENOENT} {unixOnly notRoot} {
-    cleanup
-    file mkdir td1
-    list [catch {file rename td2 td1} msg] $msg
-} {1 {error renaming "td2": no such file or directory}}
-test unixFCmd-1.6 {TclpRenameFile: ENOTDIR} {emptyTest unixOnly notRoot} {
-    # can't make it happen
-} {}
-test unixFCmd-1.7 {TclpRenameFile: EXDEV} {unixOnly notRoot} {
-    cleanup
-    file mkdir foo/bar
-    file attr foo -perm 040555
-    set catchResult [catch {file rename foo/bar /tmp} msg]
-    set msg [lindex [split $msg :] end]
-    catch {file delete /tmp/bar}
-    catch {file attr foo -perm 040777}
-    catch {file delete -force foo}
-    list $catchResult $msg
-} {1 { permission denied}}
-test unixFCmd-1.8 {Checking EINTR Bug} {unixOnly notRoot nonPortable} {
-    testalarm 
-    after 2000
-    list [testgotsig] [testgotsig]
-} {1 0}
-test unixFCmd-1.9 {Checking EINTR Bug} {unixOnly notRoot nonPortable} {
-    cleanup
-    set f [open tfalarm w]
-    puts $f {
-	after 2000
-	puts "hello world"
-	exit 0
-    }
-    close $f
-    testalarm 
-    set pipe [open "|[info nameofexecutable] tfalarm" r+]
-    set line [read $pipe 1]
-    catch {close $pipe}
-    list $line [testgotsig]
-} {h 1}
-test unixFCmd-2.1 {TclpCopyFile: target exists: lstat(dst) == 0} \
-	{unixOnly notRoot} {
-    cleanup
-    exec touch tf1
-    exec touch tf2
-    file copy -force tf1 tf2
-} {}
-test unixFCmd-2.2 {TclpCopyFile: src is symlink} {unixOnly notRoot} {
-    cleanup
-    exec ln -s tf1 tf2
-    file copy tf2 tf3
-    file type tf3
-} {link}
-test unixFCmd-2.3 {TclpCopyFile: src is block} {unixOnly notRoot} {
-    cleanup
-    set null "/dev/null"
-    while {[file type $null] != "characterSpecial"} {
-	set null [file join [file dirname $null] [file readlink $null]]
-    }
-    # file copy $null tf1
-} {}
-test unixFCmd-2.4 {TclpCopyFile: src is fifo} {unixOnly notRoot} {
-    cleanup
-    if [catch {exec mknod tf1 p}] {
-	list 1
-    } else {
-	file copy tf1 tf2
-	expr {"[file type tf1]" == "[file type tf2]"}
-    }
-} {1}
-test unixFCmd-2.5 {TclpCopyFile: copy attributes} {unixOnly notRoot} {
-    cleanup
-    exec touch tf1
-    exec chmod 472 tf1
-    file copy tf1 tf2
-    string range [exec ls -l tf2] 0 9
-} {-r--rwx-w-}
-
-test unixFCmd-3.1 {CopyFile not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-4.1 {TclpDeleteFile not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-5.1 {TclpCreateDirectory not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-6.1 {TclpCopyDirectory not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-7.1 {TclpRemoveDirectory not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-8.1 {TraverseUnixTree not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-9.1 {TraversalCopy not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-10.1 {TraversalDelete not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-11.1 {CopyFileAttrs not done} {emptyTest unixOnly notRoot} {
-} {}
-
-test unixFCmd-12.1 {GetGroupAttribute - file not found} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -group} msg] $msg
-} {1 {could not read "foo.test": no such file or directory}}
-test unixFCmd-12.2 {GetGroupAttribute - file found} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attributes foo.test -group}] [file delete -force -- foo.test]
-} {0 {}}
-
-test unixFCmd-13.1 {GetOwnerAttribute - file not found} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -group} msg] $msg
-} {1 {could not read "foo.test": no such file or directory}}
-test unixFCmd-13.2 {GetOwnerAttribute} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attributes foo.test -owner} msg] \
-	    [string compare $msg $user] [file delete -force -- foo.test]
-} {0 0 {}}
-
-test unixFCmd-14.1 {GetPermissionsAttribute - file not found} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -permissions} msg] $msg
-} {1 {could not read "foo.test": no such file or directory}}
-test unixFCmd-14.2 {GetPermissionsAttribute} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attribute foo.test -permissions}] \
-	    [file delete -force -- foo.test]
-} {0 {}}
-
-# Find a group that exists on this system, or else skip tests that require
-# groups
-set ::tcltest::testConfig(foundGroup) 0
-catch {
-    set groupList [exec groups]
-    set group [lindex $groupList 0]
-    set ::tcltest::testConfig(foundGroup) 1
-}
-
-#groups hard to test
-test unixFCmd-15.1 {SetGroupAttribute - invalid group} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -group foozzz} msg] \
-	    $msg [file delete -force -- foo.test]
-} {1 {could not set group for file "foo.test": group "foozzz" does not exist} {}}
-test unixFCmd-15.2 {SetGroupAttribute - invalid file} \
-	{unixOnly notRoot foundGroup} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -group $group} msg] $msg
-} {1 {could not set group for file "foo.test": no such file or directory}}
-
-#changing owners hard to do
-test unixFCmd-16.1 {SetOwnerAttribute - current owner} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attributes foo.test -owner $user} msg] \
-	    $msg [string compare [file attributes foo.test -owner] $user] \
-	    [file delete -force -- foo.test]
-} {0 {} 0 {}}
-test unixFCmd-16.2 {SetOwnerAttribute - invalid file} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -owner $user} msg] $msg
-} {1 {could not set owner for file "foo.test": no such file or directory}}
-test unixFCmd-16.3 {SetOwnerAttribute - invalid owner} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -owner foozzz} msg] $msg
-} {1 {could not set owner for file "foo.test": user "foozzz" does not exist}}
-
-
-test unixFCmd-17.1 {SetPermissionsAttribute} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attributes foo.test -permissions 0000} msg] \
-	    $msg [file attributes foo.test -permissions] \
-	    [file delete -force -- foo.test]
-} {0 {} 00000 {}}
-test unixFCmd-17.2 {SetPermissionsAttribute} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    list [catch {file attributes foo.test -permissions 0000} msg] $msg
-} {1 {could not set permissions for file "foo.test": no such file or directory}}
-test unixFCmd-17.3 {SetPermissionsAttribute} {unixOnly notRoot} {
-    catch {file delete -force -- foo.test}
-    close [open foo.test w]
-    list [catch {file attributes foo.test -permissions foo} msg] $msg \
-	    [file delete -force -- foo.test]
-} {1 {expected integer but got "foo"} {}}
-test unixFCmd-18.1 {Unix pwd} {nonPortable unixOnly notRoot} {
-    # This test is nonportable because SunOS generates a weird error
-    # message when the current directory isn't readable.
-    set cd [pwd]
-    set nd $cd/tstdir
-    file mkdir $nd
-    cd $nd
-    exec chmod 000 $nd
-    set r [list [catch {pwd} res] [string range $res 0 36]];
-    cd $cd;
-    exec chmod 755 $nd
-    file delete $nd
-    set r
-} {1 {error getting working directory name:}}
-
-# cleanup
-cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/unixFile.test b/tests/unixFile.test
deleted file mode 100644
index c18ac20..0000000
--- a/tests/unixFile.test
+++ /dev/null
@@ -1,77 +0,0 @@
-# This file contains tests for the routines in the file tclUnixFile.c
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: unixFile.test,v 1.3 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testfindexecutable\""
-    puts "command, so I can't test the Tcl_FindExecutable function"
-    ::tcltest::cleanupTests
-    return
-}
-
-catch {
-    set oldPath $env(PATH)
-    close [open junk w]
-    file attributes junk -perm 0777
-}
-set absPath [file join [pwd] junk]
-
-test unixFile-1.1 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) ""
-    testfindexecutable junk
-} $absPath
-test unixFile-1.2 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) "/dummy"
-    testfindexecutable junk
-} {}
-test unixFile-1.3 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) "/dummy:[pwd]"
-    testfindexecutable junk
-} $absPath
-test unixFile-1.4 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) "/dummy:"
-    testfindexecutable junk
-} $absPath
-test unixFile-1.5 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) "/dummy:/dummy"
-    testfindexecutable junk
-} {}
-test unixFile-1.6 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) "/dummy::/dummy"
-    testfindexecutable junk
-} $absPath
-test unixFile-1.7 {Tcl_FindExecutable} {unixOnly} {
-    set env(PATH) ":/dummy"
-    testfindexecutable junk
-} $absPath
-
-# cleanup
-catch {set env(PATH) $oldPath}
-file delete junk
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/unixInit.test b/tests/unixInit.test
deleted file mode 100644
index 313f3c1..0000000
--- a/tests/unixInit.test
+++ /dev/null
@@ -1,205 +0,0 @@
-# The file tests the functions in the tclUnixInit.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: unixInit.test,v 1.2 1999/04/16 00:47:35 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {set oldlibrary $env(TCL_LIBRARY); unset env(TCL_LIBRARY)}
-catch {set oldlang $env(LANG)}
-set env(LANG) C
-
-# Some tests will fail if they are run on a machine that doesn't have
-# this Tcl version installed (as opposed to built) on it.
-if {[catch {
-    set f [open "|[list $tcltest]" w+]
-    exec kill -PIPE [pid $f]
-    close $f
-}]} {
-    set ::tcltest::testConfig(installedTcl) 0
-} else {
-    set ::tcltest::testConfig(installedTcl) 1
-}
-
-test unixInit-1.1 {TclpInitPlatform: ignore SIGPIPE} {unixOnly installedTcl} {
-    set x {}
-
-    # Watch out for a race condition here.  If tcltest is too slow to start
-    # then we'll kill it before it has a chance to set up its signal handler.
-    
-    set f [open "|[list $tcltest]" w+]
-    puts $f "puts hi"
-    flush $f
-    gets $f
-    exec kill -PIPE [pid $f]
-    lappend x [catch {close $f}]
-
-    set f [open "|[list $tcltest]" w+]
-    puts $f "puts hi"
-    flush $f
-    gets $f
-    exec kill [pid $f]
-    lappend x [catch {close $f}]
-
-    set x
-} {0 1}
-
-proc getlibpath "{program [list $tcltest]}" {
-    set f [open "|$program" w+]
-    fconfigure $f -buffering none
-    puts $f {puts $tcl_libPath; exit}
-    set path [gets $f]
-    close $f
-    return $path
-}
-
-# Some tests require the testgetdefenc command
-
-set ::tcltest::testConfig(testgetdefenc) \
-	[expr {[info commands testgetdefenc] != {}}]
-
-test unixInit-2.0 {TclpInitLibraryPath: setting tclDefaultEncodingDir} \
-	{unixOnly testgetdefenc} {
-    set origDir [testgetdefenc]
-    testsetdefenc slappy
-    set path [testgetdefenc]
-    testsetdefenc $origDir
-    set path
-} {slappy}
-test unixInit-2.1 {TclpInitLibraryPath: value of installLib, developLib} \
-	{unixOnly installedTcl} {
-    set path [getlibpath]
-
-    set installLib lib/tcl[info tclversion]
-    if {[string match {*[ab]*} [info patchlevel]]} {
-	set developLib tcl[info patchlevel]/library
-    } else {
-        set developLib tcl[info tclversion]/library
-    }
-    set prefix [file dirname [file dirname $tcltest]]
-
-    set x {}
-    lappend x [string compare [lindex $path 0] $prefix/$installLib]
-    lappend x [string compare [lindex $path 1] [file dirname $prefix]/$developLib]
-    set x
-} {0 0}
-test unixInit-2.2 {TclpInitLibraryPath: TCL_LIBRARY} {unixOnly installedTcl} {
-    # ((str != NULL) && (str[0] != '\0')) 
-
-    set env(TCL_LIBRARY) sparkly
-    set path [getlibpath]
-    unset env(TCL_LIBRARY)
-
-    lindex $path 0
-} "sparkly"
-test unixInit-2.3 {TclpInitLibraryPath: TCL_LIBRARY wrong version} \
-	{unixOnly installedTcl} {
-    # ((pathc > 0) && (strcasecmp(installLib + 4, pathv[pathc - 1]) != 0))
-
-    set env(TCL_LIBRARY) /a/b/tcl1.7
-    set path [getlibpath]
-    unset env(TCL_LIBRARY)
-
-    lrange $path 0 1
-} [list /a/b/tcl1.7 /a/b/tcl[info tclversion]]
-test unixInit-2.4 {TclpInitLibraryPath: TCL_LIBRARY: INTL} \
-	{unixOnly installedTcl} {
-    # Child process translates env variable from native encoding.
-
-    set env(TCL_LIBRARY) "\xa7"
-    set x [lindex [getlibpath] 0]
-    unset env(TCL_LIBRARY)
-    unset env(LANG)
-
-    set x
-} "\xa7"
-test unixInit-2.5 {TclpInitLibraryPath: compiled-in library path} \
-	{emptyTest unixOnly} {
-    # cannot test
-} {}
-test unixInit-2.6 {TclpInitLibraryPath: executable relative} \
-	{unixOnly installedTcl} {
-    file delete -force /tmp/sparkly
-    file mkdir /tmp/sparkly/bin
-    file copy $tcltest /tmp/sparkly/bin/tcltest
-
-    file mkdir /tmp/sparkly/lib/tcl[info tclversion]
-    close [open /tmp/sparkly/lib/tcl[info tclversion]/init.tcl w]
-
-    set x [lrange [getlibpath /tmp/sparkly/bin/tcltest] 0 1]
-    file delete -force /tmp/sparkly
-    set x
-} [list /tmp/sparkly/lib/tcl[info tclversion] /tmp/tcl[info patchlevel]/library]
-test unixInit-2.7 {TclpInitLibraryPath: compiled-in library path} \
-	{emptyTest unixOnly} {
-    # would need test command to get defaultLibDir and compare it to
-    # [lindex $auto_path end]
-} {}
-test unixInit-3.1 {TclpSetInitialEncodings} {unixOnly installedTcl} {
-    set env(LANG) C
-
-    set f [open "|[list $tcltest]" w+]
-    fconfigure $f -buffering none
-    puts $f {puts [encoding system]; exit}
-    set enc [gets $f]
-    close $f
-    unset env(LANG)
-
-    set enc
-} {iso8859-1}
-test unixInit-3.2 {TclpSetInitialEncodings} {unixOnly installedTcl} {
-    set env(LANG) japanese
-
-    set f [open "|[list $tcltest]" w+]
-    fconfigure $f -buffering none
-    puts $f {puts [encoding system]; exit}
-    set enc [gets $f]
-    close $f
-    unset env(LANG)
-
-    set enc
-} {euc-jp}
-    
-test unixInit-4.1 {TclpSetVariables} {unixOnly} {
-    # just make sure they exist
-
-    set a [list $tcl_library $tcl_pkgPath $tcl_platform(os)]
-    set a [list $tcl_platform(osVersion) $tcl_platform(machine)]
-    set tcl_platform(platform)
-} "unix"
-
-test unixInit-5.1 {Tcl_Init} {emptyTest unixOnly} {
-    # test initScript
-} {}
-
-test unixInit-6.1 {Tcl_SourceRCFile} {emptyTest unixOnly} {
-} {}
-    
-# cleanup
-catch {unset env(TCL_LIBRARY); set env(TCL_LIBRARY) $oldlibrary}
-catch {unset env(LANG); set env(LANG) $oldlang}
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/unixNotfy.test b/tests/unixNotfy.test
deleted file mode 100644
index 2775597..0000000
--- a/tests/unixNotfy.test
+++ /dev/null
@@ -1,99 +0,0 @@
-# This file contains tests for tclUnixNotfy.c.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: unixNotfy.test,v 1.4 1999/04/16 00:47:36 stanton Exp $
-
-# The tests should not be run if you have a notifier which is unable to
-# detect infinite vwaits, as the tests below will hang. The presence of
-# the "testthread" command indicates that this is the case.
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set ::tcltest::testConfig(testthread) \
-	[expr {[info commands testthread] != {}}]
-
-# The next two tests will hang if threads are enabled because the notifier
-# will not necessarily wait for ever in this case, so it does not generate
-# an error.
-
-test unixNotfy-1.1 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
-    catch {vwait x}
-    set f [open foo w]
-    fileevent $f writable {set x 1}
-    vwait x
-    close $f
-    list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x":  would wait forever}}
-test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly && !testthread} {
-    catch {vwait x}
-    set f1 [open foo w]
-    set f2 [open foo2 w]
-    fileevent $f1 writable {set x 1}
-    fileevent $f2 writable {set y 1}
-    vwait x
-    close $f1
-    vwait y
-    close $f2
-    list [catch {vwait x} msg] $msg
-} {1 {can't wait for variable "x":  would wait forever}}
-
-
-test unixNotfy-2.1 {Tcl_DeleteFileHandler} {unixOnly testthread} {
-    update
-    set f [open foo w]
-    fileevent $f writable {set x 1}
-    vwait x
-    close $f
-    testthread create "after 500
-    testthread send [testthread id] {set x ok}
-    testthread exit"
-    vwait x
-    set x
-} {ok}
-test unixNotfy-1.2 {Tcl_DeleteFileHandler} {unixOnly testthread} {
-    update
-    set f1 [open foo w]
-    set f2 [open foo2 w]
-    fileevent $f1 writable {set x 1}
-    fileevent $f2 writable {set y 1}
-    vwait x
-    close $f1
-    vwait y
-    close $f2
-    testthread create "after 500
-    testthread send [testthread id] {set x ok}
-    testthread exit"
-    vwait x
-    set x
-} {ok}
-
-
-
-# cleanup
-file delete foo
-file delete foo2
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/unknown.test b/tests/unknown.test
deleted file mode 100644
index 791a9d1..0000000
--- a/tests/unknown.test
+++ /dev/null
@@ -1,78 +0,0 @@
-# Commands covered:  unknown
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: unknown.test,v 1.3 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset x}
-catch {rename unknown unknown.old}
-
-test unknown-1.1 {non-existent "unknown" command} {
-    list [catch {_non-existent_ foo bar} msg] $msg
-} {1 {invalid command name "_non-existent_"}}
-
-proc unknown {args} {
-    global x
-    set x $args
-}
-
-test unknown-2.1 {calling "unknown" command} {
-    foobar x y z
-    set x
-} {foobar x y z}
-test unknown-2.2 {calling "unknown" command with lots of args} {
-    foobar 1 2 3 4 5 6 7
-    set x
-} {foobar 1 2 3 4 5 6 7}
-test unknown-2.3 {calling "unknown" command with lots of args} {
-    foobar 1 2 3 4 5 6 7 8
-    set x
-} {foobar 1 2 3 4 5 6 7 8}
-test unknown-2.4 {calling "unknown" command with lots of args} {
-    foobar 1 2 3 4 5 6 7 8 9
-    set x
-} {foobar 1 2 3 4 5 6 7 8 9}
-
-test unknown-3.1 {argument quoting in calls to "unknown"} {
-    foobar \{ \} a\{b \; "\\" \$a a\[b \]
-    set x
-} "foobar \\{ \\} a\\{b {;} \\\\ {\$a} {a\[b} \\]"
-
-proc unknown args {
-    error "unknown failed"
-}
-
-test unknown-4.1 {errors in "unknown" procedure} {
-    list [catch {non-existent a b} msg] $msg $errorCode
-} {1 {unknown failed} NONE}
-
-# cleanup
-catch {rename unknown {}}
-catch {rename unknown.old unknown}
-::tcltest::cleanupTests
-return 
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/uplevel.test b/tests/uplevel.test
deleted file mode 100644
index 857c8e1..0000000
--- a/tests/uplevel.test
+++ /dev/null
@@ -1,128 +0,0 @@
-# Commands covered:  uplevel
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: uplevel.test,v 1.3 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc a {x y} {
-    newset z [expr $x+$y]
-    return $z
-}
-proc newset {name value} {
-    uplevel set $name $value
-    uplevel 1 {uplevel 1 {set xyz 22}}
-}
-
-test uplevel-1.1 {simple operation} {
-    set xyz 0
-    a 22 33
-} 55
-test uplevel-1.2 {command is another uplevel command} {
-    set xyz 0
-    a 22 33
-    set xyz
-} 22
-
-proc a1 {} {
-    b1
-    global a a1
-    set a $x
-    set a1 $y
-}
-proc b1 {} {
-    c1
-    global b b1
-    set b $x
-    set b1 $y
-}
-proc c1 {} {
-    uplevel 1 set x 111
-    uplevel #2 set y 222
-    uplevel 2 set x 333
-    uplevel #1 set y 444
-    uplevel 3 set x 555
-    uplevel #0 set y 666
-}
-a1
-test uplevel-2.1 {relative and absolute uplevel} {set a} 333
-test uplevel-2.2 {relative and absolute uplevel} {set a1} 444
-test uplevel-2.3 {relative and absolute uplevel} {set b} 111
-test uplevel-2.4 {relative and absolute uplevel} {set b1} 222
-test uplevel-2.5 {relative and absolute uplevel} {set x} 555
-test uplevel-2.6 {relative and absolute uplevel} {set y} 666
-
-test uplevel-3.1 {uplevel to same level} {
-    set x 33
-    uplevel #0 set x 44
-    set x
-} 44
-test uplevel-3.2 {uplevel to same level} {
-    set x 33
-    uplevel 0 set x
-} 33
-test uplevel-3.3 {uplevel to same level} {
-    set y xxx
-    proc a1 {} {set y 55; uplevel 0 set y 66; return $y}
-    a1
-} 66
-test uplevel-3.4 {uplevel to same level} {
-    set y zzz
-    proc a1 {} {set y 55; uplevel #1 set y}
-    a1
-} 55
-
-test uplevel-4.1 {error: non-existent level} {
-    list [catch c1 msg] $msg
-} {1 {bad level "#2"}}
-test uplevel-4.2 {error: non-existent level} {
-    proc c2 {} {uplevel 3 {set a b}}
-    list [catch c2 msg] $msg
-} {1 {bad level "3"}}
-test uplevel-4.3 {error: not enough args} {
-    list [catch uplevel msg] $msg
-} {1 {wrong # args: should be "uplevel ?level? command ?arg ...?"}}
-test uplevel-4.4 {error: not enough args} {
-    proc upBug {} {uplevel 1}
-    list [catch upBug msg] $msg
-} {1 {wrong # args: should be "uplevel ?level? command ?arg ...?"}}
-
-proc a2 {} {
-    uplevel a3
-}
-proc a3 {} {
-    global x y
-    set x [info level]
-    set y [info level 1]
-}
-a2
-test uplevel-5.1 {info level} {set x} 1
-test uplevel-5.2 {info level} {set y} a3
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/upvar.test b/tests/upvar.test
deleted file mode 100644
index 2fe81c9..0000000
--- a/tests/upvar.test
+++ /dev/null
@@ -1,416 +0,0 @@
-# Commands covered:  upvar
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: upvar.test,v 1.4 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test upvar-1.1 {reading variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2}
-    proc p2 {} {upvar a x1 b x2 c x3 d x4; set a abc; list $x1 $x2 $x3 $x4 $a}
-    p1 foo bar
-} {foo bar 22 33 abc}
-test upvar-1.2 {reading variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2}
-    proc p2 {} {p3}
-    proc p3 {} {upvar 2 a x1 b x2 c x3 d x4; set a abc; list $x1 $x2 $x3 $x4 $a}
-    p1 foo bar
-} {foo bar 22 33 abc}
-test upvar-1.3 {reading variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2}
-    proc p2 {} {p3}
-    proc p3 {} {
-	upvar #1 a x1 b x2 c x3 d x4
-	set a abc
-	list $x1 $x2 $x3 $x4 $a
-    }
-    p1 foo bar
-} {foo bar 22 33 abc}
-test upvar-1.4 {reading variables with upvar} {
-    set x1 44
-    set x2 55
-    proc p1 {} {p2}
-    proc p2 {} {
-	upvar 2 x1 x1 x2 a
-	upvar #0 x1 b
-	set c $b
-	incr b 3
-	list $x1 $a $b
-    }
-    p1
-} {47 55 47}
-test upvar-1.5 {reading array elements with upvar} {
-    proc p1 {} {set a(0) zeroth; set a(1) first; p2}
-    proc p2 {} {upvar a(0) x; set x}
-    p1
-} {zeroth}
-
-test upvar-2.1 {writing variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2; list $a $b $c $d}
-    proc p2 {} {
-	upvar a x1 b x2 c x3 d x4
-	set x1 14
-	set x4 88
-    }
-    p1 foo bar
-} {14 bar 22 88}
-test upvar-2.2 {writing variables with upvar} {
-    set x1 44
-    set x2 55
-    proc p1 {x1 x2} {
-	upvar #0 x1 a
-	upvar x2 b
-	set a $x1
-	set b $x2
-    }
-    p1 newbits morebits
-    list $x1 $x2
-} {newbits morebits}
-test upvar-2.3 {writing variables with upvar} {
-    catch {unset x1}
-    catch {unset x2}
-    proc p1 {x1 x2} {
-	upvar #0 x1 a
-	upvar x2 b
-	set a $x1
-	set b $x2
-    }
-    p1 newbits morebits
-    list [catch {set x1} msg] $msg [catch {set x2} msg] $msg
-} {0 newbits 0 morebits}
-test upvar-2.4 {writing array elements with upvar} {
-    proc p1 {} {set a(0) zeroth; set a(1) first; list [p2] $a(0)}
-    proc p2 {} {upvar a(0) x; set x xyzzy}
-    p1
-} {xyzzy xyzzy}
-
-test upvar-3.1 {unsetting variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2; lsort [info vars]}
-    proc p2 {} {
-	upvar 1 a x1 d x2
-	unset x1 x2
-    }
-    p1 foo bar
-} {b c}
-test upvar-3.2 {unsetting variables with upvar} {
-    proc p1 {a b} {set c 22; set d 33; p2; lsort [info vars]}
-    proc p2 {} {
-	upvar 1 a x1 d x2
-	unset x1 x2
-	set x2 28
-    }
-    p1 foo bar
-} {b c d}
-test upvar-3.3 {unsetting variables with upvar} {
-    set x1 44
-    set x2 55
-    proc p1 {} {p2}
-    proc p2 {} {
-	upvar 2 x1 a
-	upvar #0 x2 b
-	unset a b
-    }
-    p1
-    list [info exists x1] [info exists x2]
-} {0 0}
-test upvar-3.4 {unsetting variables with upvar} {
-    set x1 44
-    set x2 55
-    proc p1 {} {
-	upvar x1 a x2 b
-	unset a b
-	set b 118
-    }
-    p1
-    list [info exists x1] [catch {set x2} msg] $msg
-} {0 0 118}
-test upvar-3.5 {unsetting array elements with upvar} {
-    proc p1 {} {
-	set a(0) zeroth
-	set a(1) first
-	set a(2) second
-	p2
-	array names a
-    }
-    proc p2 {} {upvar a(0) x; unset x}
-    p1
-} {1 2}
-test upvar-3.6 {unsetting then resetting array elements with upvar} {
-    proc p1 {} {
-	set a(0) zeroth
-	set a(1) first
-	set a(2) second
-	p2
-	list [array names a] [catch {set a(0)} msg] $msg
-    }
-    proc p2 {} {upvar a(0) x; unset x; set x 12345}
-    p1
-} {{0 1 2} 0 12345}
-
-test upvar-4.1 {nested upvars} {
-    set x1 88
-    proc p1 {a b} {set c 22; set d 33; p2}
-    proc p2 {} {global x1; upvar c x2; p3}
-    proc p3 {} {
-	upvar x1 a x2 b
-	list $a $b
-    }
-    p1 14 15
-} {88 22}
-test upvar-4.2 {nested upvars} {
-    set x1 88
-    proc p1 {a b} {set c 22; set d 33; p2; list $a $b $c $d}
-    proc p2 {} {global x1; upvar c x2; p3}
-    proc p3 {} {
-	upvar x1 a x2 b
-	set a foo
-	set b bar
-    }
-    list [p1 14 15] $x1
-} {{14 15 bar 33} foo}
-
-proc tproc {args} {global x; set x [list $args [uplevel info vars]]}
-test upvar-5.1 {traces involving upvars} {
-    proc p1 {a b} {set c 22; set d 33; trace var c rw tproc; p2}
-    proc p2 {} {upvar c x1; set x1 22}
-    set x ---
-    p1 foo bar
-    set x
-} {{x1 {} w} x1}
-test upvar-5.2 {traces involving upvars} {
-    proc p1 {a b} {set c 22; set d 33; trace var c rw tproc; p2}
-    proc p2 {} {upvar c x1; set x1}
-    set x ---
-    p1 foo bar
-    set x
-} {{x1 {} r} x1}
-test upvar-5.3 {traces involving upvars} {
-    proc p1 {a b} {set c 22; set d 33; trace var c rwu tproc; p2}
-    proc p2 {} {upvar c x1; unset x1}
-    set x ---
-    p1 foo bar
-    set x
-} {{x1 {} u} x1}
-
-test upvar-6.1 {retargeting an upvar} {
-    proc p1 {} {
-	set a(0) zeroth
-	set a(1) first
-	set a(2) second
-	p2
-    }
-    proc p2 {} {
-	upvar a x
-	set result {}
-	foreach i [array names x] {
-	    upvar a($i) x
-	    lappend result $x
-	}
-	lsort $result
-    }
-    p1
-} {first second zeroth}
-test upvar-6.2 {retargeting an upvar} {
-    set x 44
-    set y abcde
-    proc p1 {} {
-	global x
-	set result $x
-	upvar y x
-	lappend result $x
-    }
-    p1
-} {44 abcde}
-test upvar-6.3 {retargeting an upvar} {
-    set x 44
-    set y abcde
-    proc p1 {} {
-	upvar y x
-	lappend result $x
-	global x
-	lappend result $x
-    }
-    p1
-} {abcde 44}
-
-test upvar-7.1 {upvar to same level} {
-    set x 44
-    set y 55
-    catch {unset uv}
-    upvar #0 x uv
-    set uv abc
-    upvar 0 y uv
-    set uv xyzzy
-    list $x $y
-} {abc xyzzy}
-test upvar-7.2 {upvar to same level} {
-    set x 1234
-    set y 4567
-    proc p1 {x y} {
-	upvar 0 x uv
-	set uv $y
-	return "$x $y"
-    }
-    p1 44 89
-} {89 89}
-test upvar-7.3 {upvar to same level} {
-    set x 1234
-    set y 4567
-    proc p1 {x y} {
-	upvar #1 x uv
-	set uv $y
-	return "$x $y"
-    }
-    p1 xyz abc
-} {abc abc}
-test upvar-7.4 {upvar to same level: tricky problems when deleting variable table} {
-    proc tt {} {upvar #1 toto loc;  return $loc}
-    list [catch tt msg] $msg
-} {1 {can't read "loc": no such variable}}
-test upvar-7.5 {potential memory leak when deleting variable table} {
-    proc leak {} {
-	array set foo {1 2 3 4}
-	upvar 0 foo(1) bar
-    }
-    leak
-} {}
-
-test upvar-8.1 {errors in upvar command} {
-    list [catch upvar msg] $msg
-} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
-test upvar-8.2 {errors in upvar command} {
-    list [catch {upvar 1} msg] $msg
-} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
-test upvar-8.3 {errors in upvar command} {
-    proc p1 {} {upvar a b c}
-    list [catch p1 msg] $msg
-} {1 {wrong # args: should be "upvar ?level? otherVar localVar ?otherVar localVar ...?"}}
-test upvar-8.4 {errors in upvar command} {
-    proc p1 {} {upvar 0 b b}
-    list [catch p1 msg] $msg
-} {1 {can't upvar from variable to itself}}
-test upvar-8.5 {errors in upvar command} {
-    proc p1 {} {upvar 0 a b; upvar 0 b a}
-    list [catch p1 msg] $msg
-} {1 {can't upvar from variable to itself}}
-test upvar-8.6 {errors in upvar command} {
-    proc p1 {} {set a 33; upvar b a}
-    list [catch p1 msg] $msg
-} {1 {variable "a" already exists}}
-test upvar-8.7 {errors in upvar command} {
-    proc p1 {} {trace variable a w foo; upvar b a}
-    list [catch p1 msg] $msg
-} {1 {variable "a" has traces: can't use for upvar}}
-test upvar-8.8 {create nested array with upvar} {
-    proc p1 {} {upvar x(a) b; set b(2) 44}
-    catch {unset x}
-    list [catch p1 msg] $msg
-} {1 {can't set "b(2)": variable isn't array}}
-test upvar-8.9 {upvar won't create namespace variable that refers to procedure variable} {
-    catch {eval namespace delete [namespace children :: test_ns_*]}
-    catch {rename MakeLink ""}
-    namespace eval ::test_ns_1 {}
-    proc MakeLink {a} {
-        namespace eval ::test_ns_1 {
-	    upvar a a
-        }
-        unset ::test_ns_1::a
-    }
-    list [catch {MakeLink 1} msg] $msg
-} {1 {bad variable name "a": upvar won't create namespace variable that refers to procedure variable}}
-test upvar-8.10 {upvar will create element alias for new array element} {
-    catch {unset upvarArray}
-    array set upvarArray {}
-    catch {upvar 0 upvarArray(elem) upvarArrayElemAlias}
-} {0}
-
-if {[info commands testupvar] != {}} {
-    test upvar-9.1 {Tcl_UpVar2 procedure} {
-	list [catch {testupvar xyz a {} x global} msg] $msg
-    } {1 {bad level "xyz"}}
-    test upvar-9.2 {Tcl_UpVar2 procedure} {
-	catch {unset a}
-	catch {unset x}
-	set a 44
-	list [catch {testupvar #0 a 1 x global} msg] $msg
-    } {1 {can't access "a(1)": variable isn't array}}
-    test upvar-9.3 {Tcl_UpVar2 procedure} {
-	proc foo {} {
-	    testupvar 1 a {} x local
-	    set x
-	}
-	catch {unset a}
-	catch {unset x}
-	set a 44
-	foo
-    } {44}
-    test upvar-9.4 {Tcl_UpVar2 procedure} {
-	proc foo {} {
-	    testupvar 1 a {} _up_ global
-	    list [catch {set x} msg] $msg
-	}
-	catch {unset a}
-	catch {unset _up_}
-	set a 44
-	concat [foo] $_up_
-    } {1 {can't read "x": no such variable} 44}
-    test upvar-9.5 {Tcl_UpVar2 procedure} {
-	proc foo {} {
-	    testupvar 1 a b x local
-	    set x
-	}
-	catch {unset a}
-	catch {unset x}
-	set a(b) 1234
-	foo
-    } {1234}
-    test upvar-9.6 {Tcl_UpVar procedure} {
-	proc foo {} {
-	    testupvar 1 a x local
-	    set x
-	}
-	catch {unset a}
-	catch {unset x}
-	set a xyzzy
-	foo
-    } {xyzzy}
-    test upvar-9.7 {Tcl_UpVar procedure} {
-	proc foo {} {
-	    testupvar #0 a(b) x local
-	    set x
-	}
-	catch {unset a}
-	catch {unset x}
-	set a(b) 1234
-	foo
-    } {1234}
-}
-catch {unset a}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/utf.test b/tests/utf.test
deleted file mode 100644
index eb9952f..0000000
--- a/tests/utf.test
+++ /dev/null
@@ -1,276 +0,0 @@
-# This file contains a collection of tests for tclUtf.c
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: utf.test,v 1.2 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {unset x}
-
-test utf-1.1 {Tcl_UniCharToUtf: 1 byte sequences} {
-    set x \x01
-} [bytestring "\x01"]
-test utf-1.2 {Tcl_UniCharToUtf: 2 byte sequences} {
-    set x "\x00"
-} [bytestring "\xc0\x80"]
-test utf-1.3 {Tcl_UniCharToUtf: 2 byte sequences} {
-    set x "\xe0"
-} [bytestring "\xc3\xa0"]
-test utf-1.4 {Tcl_UniCharToUtf: 3 byte sequences} {
-    set x "\u4e4e"
-} [bytestring "\xe4\xb9\x8e"]
-
-test utf-2.1 {Tcl_UtfToUniChar: low ascii} {
-    string length "abc"
-} {3}
-test utf-2.2 {Tcl_UtfToUniChar: naked trail bytes} {
-    string length [bytestring "\x82\x83\x84"]
-} {3}
-test utf-2.3 {Tcl_UtfToUniChar: lead (2-byte) followed by non-trail} {
-    string length [bytestring "\xC2"]
-} {1}
-test utf-2.4 {Tcl_UtfToUniChar: lead (2-byte) followed by trail} {
-    string length [bytestring "\xC2\xa2"]
-} {1}
-test utf-2.5 {Tcl_UtfToUniChar: lead (3-byte) followed by non-trail} {
-    string length [bytestring "\xE2"]
-} {1}
-test utf-2.6 {Tcl_UtfToUniChar: lead (3-byte) followed by 1 trail} {
-    string length [bytestring "\xE2\xA2"]
-} {2}
-test utf-2.7 {Tcl_UtfToUniChar: lead (3-byte) followed by 2 trail} {
-    string length [bytestring "\xE4\xb9\x8e"]
-} {1}
-test utf-2.8 {Tcl_UtfToUniChar: longer UTF sequences not supported} {
-    string length [bytestring "\xF4\xA2\xA2\xA2"]
-} {4}
-
-test utf-3.1 {Tcl_UtfCharComplete} {
-} {}
-
-test utf-4.1 {Tcl_NumUtfChars: zero length} {
-    string length ""
-} {0}
-test utf-4.2 {Tcl_NumUtfChars: length 1} {
-    string length [bytestring "\xC2\xA2"]
-} {1}
-test utf-4.3 {Tcl_NumUtfChars: long string} {
-    string length [bytestring "abc\xC2\xA2\xe4\xb9\x8e\uA2\u4e4e"]
-} {7}
-
-test utf-5.1 {Tcl_UtfFindFirsts} {
-} {}
-
-test utf-6.1 {Tcl_UtfNext} {
-} {}
-
-test utf-7.1 {Tcl_UtfPrev} {
-} {}
-
-test utf-8.1 {Tcl_UniCharAtIndex: index = 0} {
-    string index abcd 0
-} {a}
-test utf-8.2 {Tcl_UniCharAtIndex: index = 0} {
-    string index \u4e4e\u25a 0
-} "\u4e4e"
-test utf-8.3 {Tcl_UniCharAtIndex: index > 0} {
-    string index abcd 2
-} {c}
-test utf-8.4 {Tcl_UniCharAtIndex: index > 0} {
-    string index \u4e4e\u25a\xff\u543 2
-} "\uff"
-
-test utf-9.1 {Tcl_UtfAtIndex: index = 0} {
-    string range abcd 0 2
-} {abc}
-test utf-9.2 {Tcl_UtfAtIndex: index > 0} {
-    string range \u4e4e\u25a\xff\u543klmnop 1 5
-} "\u25a\xff\u543kl"
-
-
-test utf-10.1 {Tcl_UtfBackslash: dst == NULL} {
-    set x \n
-} {
-}
-test utf-10.2 {Tcl_UtfBackslash: \u subst} {
-    set x \ua2
-} [bytestring "\xc2\xa2"]
-test utf-10.3 {Tcl_UtfBackslash: longer \u subst} {
-    set x \u4e21
-} [bytestring "\xe4\xb8\xa1"]
-test utf-10.4 {Tcl_UtfBackslash: stops at first non-hex} {
-    set x \u4e2k
-} "[bytestring \xd3\xa2]k"
-test utf-10.5 {Tcl_UtfBackslash: stops after 4 hex chars} {
-    set x \u4e216
-} "[bytestring \xe4\xb8\xa1]6"
-proc bsCheck {char num} {
-    global errNum
-    test utf-10.$errNum {backslash substitution} {
-	scan $char %c value
-	set value
-    } $num
-    incr errNum
-}
-set errNum 6
-bsCheck \b	8
-bsCheck \e	101
-bsCheck \f	12
-bsCheck \n	10
-bsCheck \r	13
-bsCheck \t	9
-bsCheck \v	11
-bsCheck \{	123
-bsCheck \}	125
-bsCheck \[	91
-bsCheck \]	93
-bsCheck \$	36
-bsCheck \ 	32
-bsCheck \;	59
-bsCheck \\	92
-bsCheck \Ca	67
-bsCheck \Ma	77
-bsCheck \CMa	67
-bsCheck \8a	8
-bsCheck \14	12
-bsCheck \141	97
-bsCheck b\0	98
-bsCheck \x	120
-bsCheck \xa	10
-bsCheck \xA	10
-bsCheck \x41	65
-bsCheck \x541	65
-bsCheck \u	117
-bsCheck \uk	117
-bsCheck \u41	65
-bsCheck \ua	10
-bsCheck \uA	10
-bsCheck \340	224
-bsCheck \ua1	161
-bsCheck \u4e21	20001
-
-test utf-11.1 {Tcl_UtfToUpper} {
-    string toupper {}
-} {}
-test utf-11.2 {Tcl_UtfToUpper} {
-    string toupper abc
-} ABC
-test utf-11.3 {Tcl_UtfToUpper} {
-    string toupper \u00e3ab
-} \u00c3AB
-test utf-11.4 {Tcl_UtfToUpper} {
-    string toupper \u01e3ab
-} \u01e2AB
-
-test utf-12.1 {Tcl_UtfToLower} {
-    string tolower {}
-} {}
-test utf-12.2 {Tcl_UtfToLower} {
-    string tolower ABC
-} abc
-test utf-12.3 {Tcl_UtfToLower} {
-    string tolower \u00c3AB
-} \u00e3ab
-test utf-12.4 {Tcl_UtfToLower} {
-    string tolower \u01e2AB
-} \u01e3ab
-
-test utf-13.1 {Tcl_UtfToTitle} {
-    string totitle {}
-} {}
-test utf-13.2 {Tcl_UtfToTitle} {
-    string totitle abc
-} Abc
-test utf-13.3 {Tcl_UtfToTitle} {
-    string totitle \u00e3ab
-} \u00c3ab
-test utf-13.4 {Tcl_UtfToTitle} {
-    string totitle \u01f3ab
-} \u01f2ab
-
-test utf-14.1 {Tcl_UniCharToUpper, negative delta} {
-    string toupper aA
-} AA
-test utf-14.2 {Tcl_UniCharToUpper, positive delta} {
-    string toupper \u0178\u00ff
-} \u0178\u0178
-test utf-14.3 {Tcl_UniCharToUpper, no delta} {
-    string toupper !
-} !
-
-test utf-15.1 {Tcl_UniCharToLower, negative delta} {
-    string tolower aA
-} aa
-test utf-15.2 {Tcl_UniCharToLower, positive delta} {
-    string tolower \u0178\u00ff
-} \u00ff\u00ff
-test utf-16.1 {Tcl_UniCharToLower, no delta} {
-    string tolower !
-} !
-
-test utf-17.1 {Tcl_UniCharToTitle, add one for title} {
-    string totitle \u01c4
-} \u01c5
-test utf-17.2 {Tcl_UniCharToTitle, subtract one for title} {
-    string totitle \u01c6
-} \u01c5
-test utf-17.3 {Tcl_UniCharToTitle, subtract delta for title (positive)} {
-    string totitle \u017f
-} \u0053
-test utf-17.4 {Tcl_UniCharToTitle, subtract delta for title (negative)} {
-    string totitle \u00ff
-} \u0178
-test utf-17.5 {Tcl_UniCharToTitle, no delta} {
-    string totitle !
-} !
-
-test utf-18.1 {TclUniCharLen} {
-    list [regexp \\d abc456def foo] $foo
-} {1 4}
-
-test utf-19.1 {TclUniCharNcmp} {
-} {}
-
-test utf-20.1 {TclUniCharIsAlnum} {
-} {}
-
-test utf-21.1 {TclUniCharIsWordChar} {
-    string wordend "xyz123_bar fg" 0
-} 10
-test utf-21.1 {TclUniCharIsWordChar} {
-    string wordend "x\u5080z123_bar\u203c fg" 0
-} 10
-    
-test utf-22.1 {TclUniCharIsAlpha} {
-} {}
-
-test utf-23.1 {TclUniCharIsDigit} {
-} {}
-
-test utf-23.1 {TclUniCharIsSpace} {
-} {}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/util.test b/tests/util.test
deleted file mode 100644
index 3c8b7b0..0000000
--- a/tests/util.test
+++ /dev/null
@@ -1,306 +0,0 @@
-# This file is a Tcl script to test the code in the file tclUtil.c.
-# This file is organized in the standard fashion for Tcl tests.
-#
-# Copyright (c) 1995-1998 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: util.test,v 1.4 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[info commands testobj] == {}} {
-    puts "This application hasn't been compiled with the \"testobj\""
-    puts "command, so I can't test the Tcl type and object support."
-    ::tcltest::cleanupTests
-    return
-}
-
-test util-1.1 {TclFindElement procedure - binary element in middle of list} {
-    lindex {0 foo\x00help 1} 1
-} "foo\x00help"
-test util-1.2 {TclFindElement procedure - binary element at end of list} {
-    lindex {0 foo\x00help} 1
-} "foo\x00help"
-
-test util-2.1 {TclCopyAndCollapse procedure - normal string} {
-    lindex {0 foo} 1
-} {foo}
-test util-2.2 {TclCopyAndCollapse procedure - string with backslashes} {
-    lindex {0 foo\n\x00help 1} 1
-} "foo\n\x00help"
-
-test util-3.1 {Tcl_ScanCountedElement procedure - don't leave unmatched braces} {
-    # This test checks for a very tricky feature.  Any list element
-    # generated with Tcl_ScanCountedElement and Tcl_ConvertElement must
-    # have the property that it can be enclosing in curly braces to make
-    # an embedded sub-list.  If this property doesn't hold, then
-    # Tcl_DStringStartSublist doesn't work.
-
-    set x {}
-    lappend x " \\\{ \\"
-    concat $x [llength "{$x}"]
-} {\ \\\{\ \\ 1}
-
-test util-4.1 {Tcl_ConcatObj - backslash-space at end of argument} {
-    concat a {b\ } c
-} {a b\  c}
-test util-4.2 {Tcl_ConcatObj - backslash-space at end of argument} {
-    concat a {b\   } c
-} {a b\  c}
-test util-4.3 {Tcl_ConcatObj - backslash-space at end of argument} {
-    concat a {b\\   } c
-} {a b\\  c}
-test util-4.4 {Tcl_ConcatObj - backslash-space at end of argument} {
-    concat a {b } c
-} {a b c}
-test util-4.5 {Tcl_ConcatObj - backslash-space at end of argument} {
-    concat a { } c
-} {a c}
-
-test util-5.1 {Tcl_StringMatch} {
-    string match ab*c abc
-} 1
-test util-5.2 {Tcl_StringMatch} {
-    string match ab**c abc
-} 1
-test util-5.3 {Tcl_StringMatch} {
-    string match ab* abcdef
-} 1
-test util-5.4 {Tcl_StringMatch} {
-    string match *c abc
-} 1
-test util-5.5 {Tcl_StringMatch} {
-    string match *3*6*9 0123456789
-} 1
-test util-5.6 {Tcl_StringMatch} {
-    string match *3*6*9 01234567890
-} 0
-test util-5.7 {Tcl_StringMatch: UTF-8} {
-    string match *u \u4e4fu
-} 1
-test util-5.8 {Tcl_StringMatch} {
-    string match a?c abc
-} 1
-test util-5.9 {Tcl_StringMatch: UTF-8} {
-    # skip one character in string
-
-    string match a?c a\u4e4fc
-} 1
-test util-5.10 {Tcl_StringMatch} {
-    string match a??c abc
-} 0
-test util-5.11 {Tcl_StringMatch} {
-    string match ?1??4???8? 0123456789
-} 1
-test util-5.12 {Tcl_StringMatch} {
-    string match {[abc]bc} abc
-} 1
-test util-5.13 {Tcl_StringMatch: UTF-8} {
-    # string += Tcl_UtfToUniChar(string, &ch);
-
-    string match "\[\u4e4fxy\]bc" "\u4e4fbc"
-} 1
-test util-5.14 {Tcl_StringMatch} {
-    # if ((*pattern == ']') || (*pattern == '\0'))
-    # badly formed pattern
-
-    string match {[]} {[]}
-} 0
-test util-5.15 {Tcl_StringMatch} {
-    # if ((*pattern == ']') || (*pattern == '\0'))
-    # badly formed pattern
-
-    string match {[} {[}
-} 0
-test util-5.16 {Tcl_StringMatch} {
-    string match {a[abc]c} abc
-} 1
-test util-5.17 {Tcl_StringMatch: UTF-8} {
-    # pattern += Tcl_UtfToUniChar(pattern, &endChar);
-    # get 1 UTF-8 character
-
-    string match "a\[a\u4e4fc]c" "a\u4e4fc"
-} 1
-test util-5.18 {Tcl_StringMatch: UTF-8} {
-    # pattern += Tcl_UtfToUniChar(pattern, &endChar);
-    # proper advance: wrong answer would match on UTF trail byte of \u4e4f
-
-    string match {a[a\u4e4fc]c} [bytestring a\u008fc]
-} 0
-test util-5.19 {Tcl_StringMatch: UTF-8} {
-    # pattern += Tcl_UtfToUniChar(pattern, &endChar);
-    # proper advance.
-
-    string match {a[a\u4e4fc]c} "acc"
-} 1
-test util-5.20 {Tcl_StringMatch} {
-    string match {a[xyz]c} abc
-} 0
-test util-5.21 {Tcl_StringMatch} {
-    string match {12[2-7]45} 12345
-} 1
-test util-5.22 {Tcl_StringMatch: UTF-8 range} {
-    string match "\[\u4e00-\u4e4f]" "0"
-} 0
-test util-5.23 {Tcl_StringMatch: UTF-8 range} {
-    string match "\[\u4e00-\u4e4f]" "\u4e33"
-} 1
-test util-5.24 {Tcl_StringMatch: UTF-8 range} {
-    string match "\[\u4e00-\u4e4f]" "\uff08"
-} 0
-test util-5.25 {Tcl_StringMatch} {
-    string match {12[ab2-4cd]45} 12345
-} 1
-test util-5.26 {Tcl_StringMatch} {
-    string match {12[ab2-4cd]45} 12b45
-} 1
-test util-5.27 {Tcl_StringMatch} {
-    string match {12[ab2-4cd]45} 12d45
-} 1
-test util-5.28 {Tcl_StringMatch} {
-    string match {12[ab2-4cd]45} 12145
-} 0
-test util-5.29 {Tcl_StringMatch} {
-    string match {12[ab2-4cd]45} 12545
-} 0
-test util-5.30 {Tcl_StringMatch: forwards range} {
-    string match {[k-w]} "z"
-} 0
-test util-5.31 {Tcl_StringMatch: forwards range} {
-    string match {[k-w]} "w"
-} 1
-test util-5.32 {Tcl_StringMatch: forwards range} {
-    string match {[k-w]} "r"
-} 1
-test util-5.33 {Tcl_StringMatch: forwards range} {
-    string match {[k-w]} "k"
-} 1
-test util-5.34 {Tcl_StringMatch: forwards range} {
-    string match {[k-w]} "a"
-} 0
-test util-5.35 {Tcl_StringMatch: reverse range} {
-    string match {[w-k]} "z"
-} 0
-test util-5.36 {Tcl_StringMatch: reverse range} {
-    string match {[w-k]} "w"
-} 1
-test util-5.37 {Tcl_StringMatch: reverse range} {
-    string match {[w-k]} "r"
-} 1
-test util-5.38 {Tcl_StringMatch: reverse range} {
-    string match {[w-k]} "k"
-} 1
-test util-5.39 {Tcl_StringMatch: reverse range} {
-    string match {[w-k]} "a"
-} 0
-test util-5.40 {Tcl_StringMatch: skip correct number of ']'} {
-    string match {[A-]x} Ax
-} 0
-test util-5.41 {Tcl_StringMatch: skip correct number of ']'} {
-    string match {[A-]]x} Ax
-} 1
-test util-5.42 {Tcl_StringMatch: skip correct number of ']'} {
-    string match {[A-]]x} \ue1x
-} 0
-test util-5.43 {Tcl_StringMatch: skip correct number of ']'} {
-    string match \[A-]\ue1]x \ue1x
-} 1
-test util-5.44 {Tcl_StringMatch: skip correct number of ']'} {
-    string match {[A-]h]x} hx
-} 1
-test util-5.45 {Tcl_StringMatch} {
-    # if (*pattern == '\0')
-    # badly formed pattern, still treats as a set
-
-    string match {[a} a
-} 1
-test util-5.46 {Tcl_StringMatch} {
-    string match {a\*b} a*b
-} 1
-test util-5.47 {Tcl_StringMatch} {
-    string match {a\*b} ab
-} 0
-test util-5.48 {Tcl_StringMatch} {
-    string match {a\*\?\[\]\\\x} "a*?\[\]\\x"
-} 1
-test util-5.49 {Tcl_StringMatch} {
-    string match ** ""
-} 1
-test util-5.50 {Tcl_StringMatch} {
-    string match *. ""
-} 0
-test util-5.51 {Tcl_StringMatch} {
-    string match "" ""
-} 1
-
-test util-6.1 {Tcl_PrintDouble - using tcl_precision} {
-    concat x[expr 1.4]
-} {x1.4}
-test util-6.2 {Tcl_PrintDouble - using tcl_precision} {
-    concat x[expr 1.39999999999]
-} {x1.39999999999}
-test util-6.3 {Tcl_PrintDouble - using tcl_precision} {
-    concat x[expr 1.399999999999]
-} {x1.4}
-test util-6.4 {Tcl_PrintDouble - using tcl_precision} {
-    set tcl_precision 5
-    concat x[expr 1.123412341234]
-} {x1.1234}
-set tcl_precision 12
-test util-6.5 {Tcl_PrintDouble - make sure there's a decimal point} {
-    concat x[expr 2.0]
-} {x2.0}
-test util-6.6 {Tcl_PrintDouble - make sure there's a decimal point} {eformat} {
-    concat x[expr 3.0e98]
-} {x3e+98}
-
-test util-7.1 {TclPrecTraceProc - unset callbacks} {
-    set tcl_precision 7
-    set x $tcl_precision
-    unset tcl_precision
-    list $x $tcl_precision
-} {7 7}
-test util-7.2 {TclPrecTraceProc - read traces, sharing among interpreters} {
-    set tcl_precision 12
-    interp create child
-    set x [child eval set tcl_precision]
-    child eval {set tcl_precision 6}
-    interp delete child
-    list $x $tcl_precision
-} {12 6}
-test util-7.3 {TclPrecTraceProc - write traces, safe interpreters} {
-    set tcl_precision 12
-    interp create -safe child
-    set x [child eval {
-	list [catch {set tcl_precision 8} msg] $msg
-    }]
-    interp delete child
-    list $x $tcl_precision
-} {{1 {can't set "tcl_precision": can't modify precision from a safe interpreter}} 12}
-test util-7.4 {TclPrecTraceProc - write traces, bogus values} {
-    set tcl_precision 12
-    list [catch {set tcl_precision abc} msg] $msg $tcl_precision
-} {1 {can't set "tcl_precision": improper value for precision} 12}
-
-set tcl_precision 12
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/var.test b/tests/var.test
deleted file mode 100644
index 9145fc5..0000000
--- a/tests/var.test
+++ /dev/null
@@ -1,610 +0,0 @@
-# This file contains tests for the tclVar.c source file. Tests appear in
-# the same order as the C code that they test. The set of tests is
-# currently incomplete since it currently includes only new tests for
-# code changed for the addition of Tcl namespaces. Other variable-
-# related tests appear in several other test files including
-# namespace.test, set.test, trace.test, and upvar.test.
-#
-# Sourcing this file into Tcl runs the tests and generates output for
-# errors. No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: var.test,v 1.5 1999/04/16 00:47:36 stanton Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-catch {rename p ""}
-catch {namespace delete test_ns_var}
-catch {unset xx}
-catch {unset x}
-catch {unset y}
-catch {unset i}
-catch {unset a}
-catch {unset arr}
-
-test var-1.1 {TclLookupVar, Array handling} {
-    catch {unset a}
-    set x "incr"  ;# force no compilation and runtime call to Tcl_IncrCmd 
-    set i 10
-    set arr(foo) 37
-    list [$x i] $i [$x arr(foo)] $arr(foo)
-} {11 11 38 38}
-test var-1.2 {TclLookupVar, TCL_GLOBAL_ONLY implies global namespace var} {
-    set x "global value"
-    namespace eval test_ns_var {
-        variable x "namespace value"
-        proc p {} {
-            global x  ;# specifies TCL_GLOBAL_ONLY to get global x
-            return $x
-        }
-    }
-    test_ns_var::p
-} {global value}
-test var-1.3 {TclLookupVar, TCL_NAMESPACE_ONLY implies namespace var} {
-    namespace eval test_ns_var {
-        proc q {} {
-            variable x  ;# specifies TCL_NAMESPACE_ONLY to get namespace x
-            return $x
-        }
-    }
-    test_ns_var::q
-} {namespace value}
-test var-1.4 {TclLookupVar, no active call frame implies global namespace var} {
-    set x
-} {global value}
-test var-1.5 {TclLookupVar, active call frame pushed for namespace eval implies namespace var} {
-    namespace eval test_ns_var {set x}
-} {namespace value}
-test var-1.6 {TclLookupVar, name starts with :: implies some namespace var} {
-    namespace eval test_ns_var {set ::x}
-} {global value}
-test var-1.7 {TclLookupVar, error finding namespace var} {
-    list [catch {set a:::b} msg] $msg
-} {1 {can't read "a:::b": no such variable}}
-test var-1.8 {TclLookupVar, error finding namespace var} {
-    list [catch {set ::foobarfoo} msg] $msg
-} {1 {can't read "::foobarfoo": no such variable}}
-test var-1.9 {TclLookupVar, create new namespace var} {
-    namespace eval test_ns_var {
-        set v hello
-    }
-} {hello}
-test var-1.10 {TclLookupVar, create new namespace var} {
-    catch {unset y}
-    namespace eval test_ns_var {
-        set ::y 789
-    }
-    set y
-} {789}
-test var-1.11 {TclLookupVar, error creating new namespace var} {
-    namespace eval test_ns_var {
-        list [catch {set ::test_ns_var::foo::bar 314159} msg] $msg
-    }
-} {1 {can't set "::test_ns_var::foo::bar": parent namespace doesn't exist}}
-test var-1.12 {TclLookupVar, error creating new namespace var} {
-    namespace eval test_ns_var {
-        list [catch {set ::test_ns_var::foo:: 1997} msg] $msg
-    }
-} {1 {can't set "::test_ns_var::foo::": parent namespace doesn't exist}}
-test var-1.13 {TclLookupVar, new namespace var is created in a particular namespace} {
-    catch {unset aNeWnAmEiNnS}
-    namespace eval test_ns_var {
-        namespace eval test_ns_var2::test_ns_var3 {
-            set aNeWnAmEiNnS 77777
-        }
-        # namespace which builds a name by traversing nsPtr chain to ::
-        namespace which -variable test_ns_var2::test_ns_var3::aNeWnAmEiNnS
-    }
-} {::test_ns_var::test_ns_var2::test_ns_var3::aNeWnAmEiNnS}
-test var-1.14 {TclLookupVar, namespace code ignores ":"s in middle and end of var names} {
-    namespace eval test_ns_var {
-        set : 123
-        set v: 456
-        set x:y: 789
-        list [set :] [set v:] [set x:y:] \
-             ${:} ${v:} ${x:y:} \
-             [expr {[lsearch [info vars] :] != -1}] \
-             [expr {[lsearch [info vars] v:] != -1}] \
-             [expr {[lsearch [info vars] x:y:] != -1}]
-    }
-} {123 456 789 123 456 789 1 1 1}
-test var-1.15 {TclLookupVar, resurrect variable via upvar to deleted namespace: compiled code path} {
-    namespace eval test_ns_var {
-	variable foo 2
-    }
-    proc p {} {
-	variable ::test_ns_var::foo
-	lappend result [catch {set foo} msg] $msg
-	namespace delete ::test_ns_var
-	lappend result [catch {set foo 3} msg] $msg
-	lappend result [catch {set foo(3) 3} msg] $msg
-    }
-    p
-} {0 2 1 {can't set "foo": upvar refers to variable in deleted namespace} 1 {can't set "foo(3)": upvar refers to variable in deleted namespace}}
-test var-1.16 {TclLookupVar, resurrect variable via upvar to deleted namespace: uncompiled code path} {
-    namespace eval test_ns_var {
-	variable result
-	namespace eval subns {
-	    variable foo 2
-	}
-	upvar 0 subns::foo foo
-	lappend result [catch {set foo} msg] $msg
-	namespace delete subns
-	lappend result [catch {set foo 3} msg] $msg
-	lappend result [catch {set foo(3) 3} msg] $msg
-	namespace delete [namespace current]
-	set result
-    }
-} {0 2 1 {can't set "foo": upvar refers to variable in deleted namespace} 1 {can't set "foo(3)": upvar refers to variable in deleted namespace}}
-test var-1.17 {TclLookupVar, resurrect array element via upvar to deleted array: compiled code path} {
-    namespace eval test_ns_var {
-	variable result
-	proc p {} {
-	    array set x {1 2 3 4}
-	    upvar 0 x(1) foo
-	    lappend result [catch {set foo} msg] $msg
-	    unset x
-	    lappend result [catch {set foo 3} msg] $msg
-	}
-	set result [p]
-	namespace delete [namespace current]
-	set result
-    }
-} {0 2 1 {can't set "foo": upvar refers to element in deleted array}}
-test var-1.18 {TclLookupVar, resurrect array element via upvar to deleted array: uncompiled code path} {
-    namespace eval test_ns_var {
-	variable result {}
-	variable x
-	array set x {1 2 3 4}
-	upvar 0 x(1) foo
-	lappend result [catch {set foo} msg] $msg
-	unset x
-	lappend result [catch {set foo 3} msg] $msg
-	namespace delete [namespace current]
-	set result
-    }
-} {0 2 1 {can't set "foo": upvar refers to element in deleted array}}
-
-test var-2.1 {Tcl_LappendObjCmd, create var if new} {
-    catch {unset x}
-    lappend x 1 2
-} {1 2}
-
-test var-3.1 {MakeUpvar, TCL_NAMESPACE_ONLY not specified for other var} {
-    catch {unset x}
-    set x 1997
-    proc p {} {
-        global x  ;# calls MakeUpvar with TCL_NAMESPACE_ONLY for other var x
-        return $x
-    }
-    p
-} {1997}
-test var-3.2 {MakeUpvar, other var has TCL_NAMESPACE_ONLY specified} {
-    namespace eval test_ns_var {
-        catch {unset v}
-        variable v 1998
-        proc p {} {
-            variable v  ;# TCL_NAMESPACE_ONLY specified for other var x
-            return $v
-        }
-        p
-    }
-} {1998}
-if {[info commands testupvar] != {}} {
-    test var-3.3 {MakeUpvar, my var has TCL_GLOBAL_ONLY specified} {
-        catch {unset a}
-        set a 123321
-        proc p {} {
-            # create global xx linked to global a
-	    testupvar 1 a {} xx global 
-	}
-        list [p] $xx [set xx 789] $a
-    } {{} 123321 789 789}
-    test var-3.4 {MakeUpvar, my var has TCL_NAMESPACE_ONLY specified} {
-        catch {unset a}
-        set a 456
-        namespace eval test_ns_var {
-            catch {unset ::test_ns_var::vv}
-            proc p {} {
-                # create namespace var vv linked to global a
-	        testupvar 1 a {} vv namespace 
-	    }
-            p
-        }
-        list $test_ns_var::vv [set test_ns_var::vv 123] $a
-    } {456 123 123}
-}
-test var-3.5 {MakeUpvar, no call frame so my var will be in global :: ns} {
-    catch {unset aaaaa}
-    catch {unset xxxxx}
-    set aaaaa 77777
-    upvar #0 aaaaa xxxxx
-    list [set xxxxx] [set aaaaa]
-} {77777 77777}
-test var-3.6 {MakeUpvar, active call frame pushed for namespace eval} {
-    catch {unset a}
-    set a 121212
-    namespace eval test_ns_var {
-        upvar ::a vvv
-        set vvv
-    }
-} {121212}
-test var-3.7 {MakeUpvar, my var has ::s} {
-    catch {unset a}
-    set a 789789
-    upvar #0 a test_ns_var::lnk
-    namespace eval test_ns_var {
-        set lnk
-    }
-} {789789}
-test var-3.8 {MakeUpvar, my var already exists in global ns} {
-    catch {unset aaaaa}
-    catch {unset xxxxx}
-    set aaaaa 456654
-    set xxxxx hello
-    upvar #0 aaaaa xxxxx
-    set xxxxx
-} {hello}
-test var-3.9 {MakeUpvar, my var has invalid ns name} {
-    catch {unset aaaaa}
-    set aaaaa 789789
-    list [catch {upvar #0 aaaaa test_ns_fred::lnk} msg] $msg
-} {1 {bad variable name "test_ns_fred::lnk": unknown namespace}}
-
-if {[info commands testgetvarfullname] != {}} {
-    test var-4.1 {Tcl_GetVariableName, global variable} {
-        catch {unset a}
-        set a 123
-        testgetvarfullname a global
-    } ::a
-    test var-4.2 {Tcl_GetVariableName, namespace variable} {
-        namespace eval test_ns_var {
-            variable george
-            testgetvarfullname george namespace
-        }
-    } ::test_ns_var::george
-    test var-4.3 {Tcl_GetVariableName, variable can't be array element} {
-        catch {unset a}
-        set a(1) foo
-        list [catch {testgetvarfullname a(1) global} msg] $msg
-    } {1 {unknown variable "a(1)"}}
-}
-
-test var-5.1 {Tcl_GetVariableFullName, global variable} {
-    catch {unset a}
-    set a bar
-    namespace which -variable a
-} {::a}
-test var-5.2 {Tcl_GetVariableFullName, namespace variable} {
-    namespace eval test_ns_var {
-        variable martha
-        namespace which -variable martha
-    }
-} {::test_ns_var::martha}
-test var-5.3 {Tcl_GetVariableFullName, namespace variable} {
-    namespace which -variable test_ns_var::martha
-} {::test_ns_var::martha}
-
-test var-6.1 {Tcl_GlobalObjCmd, variable is qualified by a namespace name} {
-    namespace eval test_ns_var {
-        variable boeing 777
-    }
-    proc p {} {
-        global ::test_ns_var::boeing
-        set boeing
-    }
-    p
-} {777}
-test var-6.2 {Tcl_GlobalObjCmd, variable is qualified by a namespace name} {
-    namespace eval test_ns_var {
-        namespace eval test_ns_nested {
-            variable java java
-        }
-        proc p {} {
-            global ::test_ns_var::test_ns_nested::java
-            set java
-        }
-    }
-    test_ns_var::p
-} {java}
-test var-6.3 {Tcl_GlobalObjCmd, variable named {} qualified by a namespace name} {
-    set ::test_ns_var::test_ns_nested:: 24
-    proc p {} {
-        global ::test_ns_var::test_ns_nested::
-        set {}
-    }
-    p
-} {24}
-
-test var-7.1 {Tcl_VariableObjCmd, create and initialize one new ns variable} {
-    catch {namespace delete test_ns_var}
-    namespace eval test_ns_var {
-        variable one 1
-    }
-    list [info vars test_ns_var::*] [set test_ns_var::one]
-} {::test_ns_var::one 1}
-test var-7.2 {Tcl_VariableObjCmd, if new and no value, leave undefined} {
-    set two 2222222
-    namespace eval test_ns_var {
-        variable two
-    }
-    list [info exists test_ns_var::two] [catch {set test_ns_var::two} msg] $msg
-} {0 1 {can't read "test_ns_var::two": no such variable}}
-test var-7.3 {Tcl_VariableObjCmd, "define" var already created above} {
-    namespace eval test_ns_var {
-        variable two 2
-    }
-    list [info vars test_ns_var::*] \
-         [namespace eval test_ns_var {set two}]
-} {{::test_ns_var::two ::test_ns_var::one} 2}
-test var-7.4 {Tcl_VariableObjCmd, list of vars} {
-    namespace eval test_ns_var {
-        variable three 3 four 4
-    }
-    list [info vars test_ns_var::*] \
-         [namespace eval test_ns_var {expr $three+$four}]
-} {{::test_ns_var::four ::test_ns_var::three ::test_ns_var::two ::test_ns_var::one} 7}
-test var-7.5 {Tcl_VariableObjCmd, value for last var is optional} {
-    catch {unset a}
-    catch {unset five}
-    catch {unset six}
-    set a ""
-    set five 555
-    set six  666
-    namespace eval test_ns_var {
-        variable five 5 six
-        lappend a $five
-    }
-    lappend a $test_ns_var::five \
-        [set test_ns_var::six 6] [set test_ns_var::six] $six
-    catch {unset five}
-    catch {unset six}
-    set a
-} {5 5 6 6 666}
-catch {unset newvar}
-test var-7.6 {Tcl_VariableObjCmd, variable name can be qualified} {
-    namespace eval test_ns_var {
-        variable ::newvar cheers!
-    }
-    set newvar
-} {cheers!}
-catch {unset newvar}
-test var-7.7 {Tcl_VariableObjCmd, bad var name} {
-    namespace eval test_ns_var {
-        list [catch {variable sev:::en 7} msg] $msg
-    }
-} {1 {can't define "sev:::en": parent namespace doesn't exist}}
-test var-7.8 {Tcl_VariableObjCmd, if var already exists and no value is given, leave value unchanged} {
-    set a ""
-    namespace eval test_ns_var {
-        variable eight 8
-        lappend a $eight
-        variable eight
-        lappend a $eight
-    }
-    set a
-} {8 8}
-test var-7.9 {Tcl_VariableObjCmd, mark as namespace var so var persists until namespace is destroyed or var is unset} {
-    catch {namespace delete test_ns_var2}
-    set a ""
-    namespace eval test_ns_var2 {
-        variable x 123
-        variable y
-        variable z
-    }
-    lappend a [info vars test_ns_var2::*]
-    lappend a [info exists test_ns_var2::x] [info exists test_ns_var2::y] \
-        [info exists test_ns_var2::z]
-    lappend a [list [catch {set test_ns_var2::y} msg] $msg]
-    lappend a [info vars test_ns_var2::*]
-    lappend a [info exists test_ns_var2::y] [info exists test_ns_var2::z]
-    lappend a [set test_ns_var2::y hello]
-    lappend a [info exists test_ns_var2::y] [info exists test_ns_var2::z]
-    lappend a [list [catch {unset test_ns_var2::y} msg] $msg]
-    lappend a [info vars test_ns_var2::*]
-    lappend a [info exists test_ns_var2::y] [info exists test_ns_var2::z]
-    lappend a [list [catch {unset test_ns_var2::z} msg] $msg]
-    lappend a [namespace delete test_ns_var2]
-    set a
-} {{::test_ns_var2::x ::test_ns_var2::y ::test_ns_var2::z} 1 0 0\
-{1 {can't read "test_ns_var2::y": no such variable}}\
-{::test_ns_var2::x ::test_ns_var2::y ::test_ns_var2::z} 0 0\
-hello 1 0\
-{0 {}}\
-{::test_ns_var2::x ::test_ns_var2::z} 0 0\
-{1 {can't unset "test_ns_var2::z": no such variable}}\
-{}}
-test var-7.10 {Tcl_VariableObjCmd, variable cmd inside proc creates local link var} {
-    namespace eval test_ns_var {
-        proc p {} {
-            variable eight
-            list [set eight] [info vars]
-        }
-        p
-    }
-} {8 eight}
-test var-7.11 {Tcl_VariableObjCmd, variable cmd inside proc creates local link var} {
-    proc p {} {   ;# note this proc is at global :: scope
-        variable test_ns_var::eight
-        list [set eight] [info vars]
-    }
-    p
-} {8 eight}
-test var-7.12 {Tcl_VariableObjCmd, variable cmd inside proc creates local link var} {
-    namespace eval test_ns_var {
-        variable {} {My name is empty}
-    }
-    proc p {} {   ;# note this proc is at global :: scope
-        variable test_ns_var::
-        list [set {}] [info vars]
-    }
-    p
-} {{My name is empty} {{}}}
-test var-7.13 {Tcl_VariableObjCmd, variable named ":"} {
-    namespace eval test_ns_var {
-        variable : {My name is ":"}
-	proc p {} {
-	    variable :
-	    list [set :] [info vars]
-	}
-	p
-    }
-} {{My name is ":"} :}
-
-test var-8.1 {TclDeleteVars, "unset" traces are called with fully-qualified var names} {
-    catch {namespace delete test_ns_var}
-    catch {unset a}
-    namespace eval test_ns_var {
-        variable v 123
-        variable info ""
-
-        proc traceUnset {name1 name2 op} {
-            variable info
-            set info [concat $info [list $name1 $name2 $op]]
-        }
-
-        trace var v u [namespace code traceUnset]
-    }
-    list [unset test_ns_var::v] $test_ns_var::info
-} {{} {test_ns_var::v {} u}}
-
-if {[info commands testsetnoerr] == {}} {
-    puts "This application hasn't been compiled with the \"testsetnoerr\""
-    puts "command, so I can't test TclSetVar etc."
-} else {
-test var-9.1 {behaviour of TclGet/SetVar simple get/set} {
-    catch {unset u}; catch {unset v}
-    list \
-       [set u a; testsetnoerr u] \
-       [testsetnoerr v b] \
-       [testseterr u] \
-       [unset v; testseterr v b]
-} [list {before get a} {before set b} {before get a} {before set b}]
-test var-9.2 {behaviour of TclGet/SetVar namespace get/set} {
-    catch {namespace delete ns}
-    namespace eval ns {variable u a; variable v}
-    list \
-       [testsetnoerr ns::u] \
-       [testsetnoerr ns::v b] \
-       [testseterr ns::u] \
-       [unset ns::v; testseterr ns::v b]
-} [list {before get a} {before set b} {before get a} {before set b}]
-test var-9.3 {behaviour of TclGetVar no variable} {
-    catch {unset u}
-    list \
-       [catch {testsetnoerr u} res] $res \
-       [catch {testseterr u} res] $res
-} {1 {before get} 1 {can't read "u": no such variable}}
-test var-9.4 {behaviour of TclGetVar no namespace variable} {
-    catch {namespace delete ns}
-    namespace eval ns {}
-    list \
-       [catch {testsetnoerr ns::w} res] $res \
-       [catch {testseterr ns::w} res] $res
-} {1 {before get} 1 {can't read "ns::w": no such variable}}
-test var-9.5 {behaviour of TclGetVar no namespace} {
-    catch {namespace delete ns}
-    list \
-       [catch {testsetnoerr ns::u} res] $res \
-       [catch {testseterr ns::v} res] $res
-} {1 {before get} 1 {can't read "ns::v": no such variable}}
-test var-9.6 {behaviour of TclSetVar no namespace} {
-    catch {namespace delete ns}
-    list \
-       [catch {testsetnoerr ns::v 1} res] $res \
-       [catch {testseterr ns::v 1} res] $res
-} {1 {before set} 1 {can't set "ns::v": parent namespace doesn't exist}}
-test var-9.7 {behaviour of TclGetVar array variable} {
-    catch {unset arr}
-    set arr(1) 1;
-    list \
-       [catch {testsetnoerr arr} res] $res \
-       [catch {testseterr arr} res] $res
-} {1 {before get} 1 {can't read "arr": variable is array}}
-test var-9.8 {behaviour of TclSetVar array variable} {
-    catch {unset arr}
-    set arr(1) 1
-    list \
-       [catch {testsetnoerr arr 2} res] $res \
-       [catch {testseterr arr 2} res] $res
-} {1 {before set} 1 {can't set "arr": variable is array}}
-test var-9.9 {behaviour of TclGetVar read trace success} {
-    proc resetvar {val name elem op} {upvar 1 $name v; set v $val}
-    catch {unset u}; catch {unset v}
-    set u 10
-    trace var u r [list resetvar 1]
-    trace var v r [list resetvar 2]
-    list \
-       [testsetnoerr u] \
-       [testseterr v]
-} {{before get 1} {before get 2}}
-test var-9.10 {behaviour of TclGetVar read trace error} {
-    proc writeonly args {error "write-only"}
-    set v 456
-    trace var v r writeonly
-    list \
-       [catch {testsetnoerr v} msg] $msg \
-       [catch {testseterr v} msg] $msg
-} {1 {before get} 1 {can't read "v": write-only}}
-test var-9.11 {behaviour of TclSetVar write trace success} {
-    proc doubleval {name elem op} {upvar 1 $name v; set v [expr {2 * $v}]}
-    catch {unset u}; catch {unset v}
-    set v 1
-    trace var v w doubleval
-    trace var u w doubleval
-    list \
-       [testsetnoerr u 2] \
-       [testseterr v 3]
-} {{before set 4} {before set 6}}
-test var-9.12 {behaviour of TclSetVar write trace error} {
-    proc readonly args {error "read-only"}
-    set v 456
-    trace var v w readonly
-    list \
-       [catch {testsetnoerr v 2} msg] $msg $v \
-       [catch {testseterr v 3} msg] $msg $v
-} {1 {before set} 2 1 {can't set "v": read-only} 3}
-}
-test var-10.1 {can't nest arrays with array set} {
-   catch {unset arr}
-   list [catch {array set arr(x) {a 1 b 2}} res] $res
-} {1 {can't set "arr(x)(a)": variable isn't array}}
-
-catch {namespace delete ns}
-catch {unset arr}
-catch {unset v}
-
-catch {rename p ""}
-catch {namespace delete test_ns_var}
-catch {namespace delete test_ns_var2}
-catch {unset xx}
-catch {unset x}
-catch {unset y}
-catch {unset i}
-catch {unset a}
-catch {unset xxxxx}
-catch {unset aaaaa}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/while-old.test b/tests/while-old.test
deleted file mode 100644
index f0d55ab..0000000
--- a/tests/while-old.test
+++ /dev/null
@@ -1,132 +0,0 @@
-# Commands covered:  while
-#
-# This file contains the original set of tests for Tcl's while command.
-# Since the while command is now compiled, a new set of tests covering
-# the new implementation is in the file "while.test". Sourcing this file
-# into Tcl runs the tests and generates output for errors.
-# No output means no errors were found.
-#
-# Copyright (c) 1991-1993 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: while-old.test,v 1.3 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test while-old-1.1 {basic while loops} {
-    set count 0
-    while {$count < 10} {set count [expr $count+1]}
-    set count
-} 10
-test while-old-1.2 {basic while loops} {
-    set value xxx
-    while {2 > 3} {set value yyy}
-    set value
-} xxx
-test while-old-1.3 {basic while loops} {
-    set value 1
-    while {"true"} {
-	incr value;
-	if {$value > 5} {
-	    break;
-	}
-    }
-    set value
-} 6
-test while-old-1.4 {basic while loops, multiline test expr} {
-    set value 1
-    while {($tcl_platform(platform) != "foobar1") && \
-	    ($tcl_platform(platform) != "foobar2")} {
-        incr value
-        break
-    }
-    set value
-} {2}
-test while-old-1.5 {basic while loops, test expr in quotes} {
-    set value 1
-    while "0 < 3" {set value 2; break}
-    set value
-} {2}
-
-test while-old-2.1 {continue in while loop} {
-    set list {1 2 3 4 5}
-    set index 0
-    set result {}
-    while {$index < 5} {
-	if {$index == 2} {set index [expr $index+1]; continue}
-	set result [concat $result [lindex $list $index]]
-	set index [expr $index+1]
-    }
-    set result
-} {1 2 4 5}
-
-test while-old-3.1 {break in while loop} {
-    set list {1 2 3 4 5}
-    set index 0
-    set result {}
-    while {$index < 5} {
-	if {$index == 3} break
-	set result [concat $result [lindex $list $index]]
-	set index [expr $index+1]
-    }
-    set result
-} {1 2 3}
-
-test while-old-4.1 {errors in while loops} {
-    set err [catch {while} msg]
-    list $err $msg
-} {1 {wrong # args: should be "while test command"}}
-test while-old-4.2 {errors in while loops} {
-    set err [catch {while 1} msg]
-    list $err $msg
-} {1 {wrong # args: should be "while test command"}}
-test while-old-4.3 {errors in while loops} {
-    set err [catch {while 1 2 3} msg]
-    list $err $msg
-} {1 {wrong # args: should be "while test command"}}
-test while-old-4.4 {errors in while loops} {
-    set err [catch {while {"a"+"b"} {error "loop aborted"}} msg]
-    list $err $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test while-old-4.5 {errors in while loops} {
-    catch {unset x}
-    set x 1
-    set err [catch {while {$x} {set x foo}} msg]
-    list $err $msg
-} {1 {expected boolean value but got "foo"}}
-test while-old-4.6 {errors in while loops} {
-    set err [catch {while {1} {error "loop aborted"}} msg]
-    list $err $msg $errorInfo
-} {1 {loop aborted} {loop aborted
-    while executing
-"error "loop aborted""}}
-
-test while-old-5.1 {while return result} {
-    while {0} {set a 400}
-} {}
-test while-old-5.2 {while return result} {
-    set x 1
-    while {$x} {set x 0}
-} {}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/while.test b/tests/while.test
deleted file mode 100644
index f4c7581..0000000
--- a/tests/while.test
+++ /dev/null
@@ -1,633 +0,0 @@
-# Commands covered:  while
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: while.test,v 1.3 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# Basic "while" operation.
-
-catch {unset i}
-catch {unset a}
-
-test while-1.1 {TclCompileWhileCmd: missing test expression} {
-    catch {while } msg
-    set msg
-} {wrong # args: should be "while test command"}
-test while-1.2 {TclCompileWhileCmd: error in test expression} {
-    set i 0
-    catch {while {$i<} break} msg
-    set errorInfo
-} {syntax error in expression "$i<"
-    ("while" test expression)
-    while compiling
-"while {$i<} break"}
-test while-1.3 {TclCompileWhileCmd: error in test expression} {
-    set err [catch {while {"a"+"b"} {error "loop aborted"}} msg]
-    list $err $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test while-1.4 {TclCompileWhileCmd: multiline test expr} {
-    set value 1
-    while {($tcl_platform(platform) != "foobar1") && \
-	    ($tcl_platform(platform) != "foobar2")} {
-        incr value
-        break
-    }
-    set value
-} {2}
-test while-1.5 {TclCompileWhileCmd: non-numeric boolean test expr} {
-    set value 1
-    while {"true"} {
-	incr value;
-	if {$value > 5} {
-	    break;
-	}
-    }
-    set value
-} 6
-test while-1.6 {TclCompileWhileCmd: test expr is enclosed in quotes} {
-    set i 0
-    while "$i > 5" {}
-} {}
-test while-1.7 {TclCompileWhileCmd: missing command body} {
-    set i 0
-    catch {while {$i < 5} } msg
-    set msg
-} {wrong # args: should be "while test command"}
-test while-1.8 {TclCompileWhileCmd: error compiling command body} {
-    set i 0
-    catch {while {$i < 5} {set}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("while" body line 1)
-    while compiling
-"while {$i < 5} {set}"}
-test while-1.9 {TclCompileWhileCmd: simple command body} {
-    set a {}
-    set i 1
-    while {$i<6} {
-	if $i==4 break
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2 3}
-test while-1.10 {TclCompileWhileCmd: command body in quotes} {
-    set a {}
-    set i 1
-    while {$i<6} "append a x; incr i"
-    set a
-} {xxxxx}
-test while-1.11 {TclCompileWhileCmd: computed command body} {
-    catch {unset x1}
-    catch {unset bb}
-    catch {unset x2}
-    set x1 {append a x1; }
-    set bb {break}
-    set x2 {; append a x2; incr i}
-    set a {}
-    set i 1
-    while {$i<6} $x1$bb$x2
-    set a
-} {x1}
-test while-1.12 {TclCompileWhileCmd: long command body} {
-    set a {}
-    set i 1
-    while {$i<6} {
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2 3}
-test while-1.13 {TclCompileWhileCmd: while command result} {
-    set i 0
-    set a [while {$i < 5} {incr i}]
-    set a
-} {}
-test while-1.14 {TclCompileWhileCmd: while command result} {
-    set i 0
-    set a [while {$i < 5} {if $i==3 break; incr i}]
-    set a
-} {}
-
-# Check "while" and "continue".
-
-test while-2.1 {continue tests} {
-    set a {}
-    set i 1
-    while {$i <= 4} {
-        incr i
-	if {$i == 3} continue
-	set a [concat $a $i]
-    }
-    set a
-} {2 4 5}
-test while-2.2 {continue tests} {
-    set a {}
-    set i 1
-    while {$i <= 4} {
-        incr i
-	if {$i != 2} continue
-	set a [concat $a $i]
-    }
-    set a
-} {2}
-test while-2.3 {continue tests, nested loops} {
-    set msg {}
-    set i 1
-    while {$i <= 4} {
-        incr i
-        set a 1
-	while {$a <= 2} {
-            incr a
-            if {$i>=3 && $a>=3} continue
-            set msg [concat $msg "$i.$a"]
-        }
-    }
-    set msg
-} {2.2 2.3 3.2 4.2 5.2}
-test while-2.4 {continue tests, long command body} {
-    set a {}
-    set i 1
-    while {$i<6} {
-	if $i==2 {incr i; continue}
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 3}
-
-# Check "while" and "break".
-
-test while-3.1 {break tests} {
-    set a {}
-    set i 1
-    while {$i <= 4} {
-	if {$i == 3} break
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2}
-test while-3.2 {break tests, nested loops} {
-    set msg {}
-    set i 1
-    while {$i <= 4} {
-        set a 1
-	while {$a <= 2} {
-            if {$i>=2 && $a>=2} break
-            set msg [concat $msg "$i.$a"]
-            incr a
-        }
-        incr i
-    }
-    set msg
-} {1.1 1.2 2.1 3.1 4.1}
-test while-3.3 {break tests, long command body} {
-    set a {}
-    set i 1
-    while {$i<6} {
-	if $i==2 {incr i; continue}
-	if $i==5 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if $i==4 break
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 3}
-
-# Check "while" with computed command names.
-
-test while-4.1 {while and computed command names} {
-    set i 0
-    set z while
-    $z {$i < 10} {
-        incr i
-    }
-    set i
-} 10
-test while-4.2 {while (not compiled): missing test expression} {
-    set z while
-    catch {$z } msg
-    set msg
-} {wrong # args: should be "while test command"}
-test while-4.3 {while (not compiled): error in test expression} {
-    set i 0
-    set z while
-    catch {$z {$i<} {set x 1}} msg
-    set errorInfo
-} {syntax error in expression "$i<"
-    while executing
-"$z {$i<} {set x 1}"}
-test while-4.4 {while (not compiled): error in test expression} {
-    set z while
-    set err [catch {$z {"a"+"b"} {error "loop aborted"}} msg]
-    list $err $msg
-} {1 {can't use non-numeric string as operand of "+"}}
-test while-4.5 {while (not compiled): multiline test expr} {
-    set value 1
-    set z while
-    $z {($tcl_platform(platform) != "foobar1") && \
-	    ($tcl_platform(platform) != "foobar2")} {
-        incr value
-        break
-    }
-    set value
-} {2}
-test while-4.6 {while (not compiled): non-numeric boolean test expr} {
-    set value 1
-    set z while
-    $z {"true"} {
-	incr value;
-	if {$value > 5} {
-	    break;
-	}
-    }
-    set value
-} 6
-test while-4.7 {while (not compiled): test expr is enclosed in quotes} {
-    set i 0
-    set z while
-    $z "$i > 5" {}
-} {}
-test while-4.8 {while (not compiled): missing command body} {
-    set i 0
-    set z while
-    catch {$z {$i < 5} } msg
-    set msg
-} {wrong # args: should be "while test command"}
-test while-4.9 {while (not compiled): error compiling command body} {
-    set i 0
-    set z while
-    catch {$z {$i < 5} {set}} msg
-    set errorInfo
-} {wrong # args: should be "set varName ?newValue?"
-    while compiling
-"set"
-    ("while" body line 1)
-    invoked from within
-"$z {$i < 5} {set}"}
-test while-4.10 {while (not compiled): simple command body} {
-    set a {}
-    set i 1
-    set z while
-    $z {$i<6} {
-	if $i==4 break
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2 3}
-test while-4.11 {while (not compiled): command body in quotes} {
-    set a {}
-    set i 1
-    set z while
-    $z {$i<6} "append a x; incr i"
-    set a
-} {xxxxx}
-test while-4.12 {while (not compiled): computed command body} {
-    set z while
-    catch {unset x1}
-    catch {unset bb}
-    catch {unset x2}
-    set x1 {append a x1; }
-    set bb {break}
-    set x2 {; append a x2; incr i}
-    set a {}
-    set i 1
-    $z {$i<6} $x1$bb$x2
-    set a
-} {x1}
-test while-4.13 {while (not compiled): long command body} {
-    set a {}
-    set z while
-    set i 1
-    $z {$i<6} {
-	if $i==4 break
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2 3}
-test while-4.14 {while (not compiled): while command result} {
-    set i 0
-    set z while
-    set a [$z {$i < 5} {incr i}]
-    set a
-} {}
-test while-4.15 {while (not compiled): while command result} {
-    set i 0
-    set z while
-    set a [$z {$i < 5} {if $i==3 break; incr i}]
-    set a
-} {}
-
-# Check "break" with computed command names.
-
-test while-5.1 {break and computed command names} {
-    set i 0
-    set z break
-    while 1 {
-        if {$i > 10} $z
-        incr i
-    }
-    set i
-} 11
-test while-5.2 {break tests with computed command names} {
-    set a {}
-    set i 1
-    set z break
-    while {$i <= 4} {
-	if {$i == 3} $z
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 2}
-test while-5.3 {break tests, nested loops with computed command names} {
-    set msg {}
-    set i 1
-    set z break
-    while {$i <= 4} {
-        set a 1
-	while {$a <= 2} {
-            if {$i>=2 && $a>=2} $z
-            set msg [concat $msg "$i.$a"]
-            incr a
-        }
-        incr i
-    }
-    set msg
-} {1.1 1.2 2.1 3.1 4.1}
-test while-5.4 {break tests, long command body with computed command names} {
-    set a {}
-    set i 1
-    set z break
-    while {$i<6} {
-	if $i==2 {incr i; continue}
-	if $i==5 $z
-	if $i>5 continue
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if $i==4 $z
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 3}
-
-# Check "continue" with computed command names.
-
-test while-6.1 {continue and computed command names} {
-    set i 0
-    set z continue
-    while 1 {
-        incr i
-        if {$i < 10} $z
-        break
-    }
-    set i
-} 10
-test while-6.2 {continue tests} {
-    set a {}
-    set i 1
-    set z continue
-    while {$i <= 4} {
-        incr i
-	if {$i == 3} $z
-	set a [concat $a $i]
-    }
-    set a
-} {2 4 5}
-test while-6.3 {continue tests with computed command names} {
-    set a {}
-    set i 1
-    set z continue
-    while {$i <= 4} {
-        incr i
-	if {$i != 2} $z
-	set a [concat $a $i]
-    }
-    set a
-} {2}
-test while-6.4 {continue tests, nested loops with computed command names} {
-    set msg {}
-    set i 1
-    set z continue
-    while {$i <= 4} {
-        incr i
-        set a 1
-	while {$a <= 2} {
-            incr a
-            if {$i>=3 && $a>=3} $z
-            set msg [concat $msg "$i.$a"]
-        }
-    }
-    set msg
-} {2.2 2.3 3.2 4.2 5.2}
-test while-6.5 {continue tests, long command body with computed command names} {
-    set a {}
-    set i 1
-    set z continue
-    while {$i<6} {
-	if $i==2 {incr i; continue}
-	if $i==4 break
-	if $i>5 $z
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	if {$i>6 && $tcl_platform(machine)=="xxx"} {
-	    catch {set a $a} msg
-	    catch {incr i 5} msg
-	    catch {incr i -5} msg
-	}
-	set a [concat $a $i]
-        incr i
-    }
-    set a
-} {1 3}
-
-# Test for incorrect "double evaluation" semantics
-
-test while-7.1 {delayed substitution of body} {knownBug} {
-    set i 0
-    while {[incr i] < 10} "
-       set result $i
-    "
-    set result
-} {0}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/winConsole.test b/tests/winConsole.test
deleted file mode 100644
index 8a18b2c..0000000
--- a/tests/winConsole.test
+++ /dev/null
@@ -1,51 +0,0 @@
-# This file tests the tclWinConsole.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winConsole.test,v 1.2 1999/04/16 00:47:36 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-
-test winConsole-1.1 {Console file channel: non-blocking gets} \
-	{pcOnly interactive} {
-    
-    set oldmode [fconfigure stdin]
-
-    puts stdout "Enter abcdef<return> now: " nonewline
-    flush stdout
-    fileevent stdin readable {
-	if {[gets stdin line] >= 0} {
-	    set result $line
-	} else {
-	    set result "gets failed"
-	}
-    }
-
-    fconfigure stdin -blocking 0 -buffering line
-
-    set result {}
-    vwait result
-
-    #cleanup the fileevent
-    fileevent stdin readable {}
-    eval fconfigure stdin $oldmode
-
-    set result
-
-}  "abcdef"
-
-#cleanup
-
-::tcltest::cleanupTests
-return
-
diff --git a/tests/winDde.test b/tests/winDde.test
deleted file mode 100644
index e9b65d8..0000000
--- a/tests/winDde.test
+++ /dev/null
@@ -1,152 +0,0 @@
-# This file tests the tclWinDde.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winDde.test,v 1.2 1999/04/16 00:47:37 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {$tcl_platform(platform) == "windows"} {
-    if [catch {
-	set lib [lindex [glob [file join [pwd] [file dirname \
-		[info nameofexecutable]] tcldde*.dll]] 0]
-	load $lib dde
-    }] {
-	puts "Unable to find the dde package. Skipping registry tests."
-	::tcltest::cleanupTests
-	return
-    }
-}
-
-set scriptName script1.tcl
-
-
-proc createChildProcess { ddeServerName } {
-    
-    file delete -force $::scriptName
-    
-    set f [open $::scriptName w+]
-    puts $f {
-	if [catch {
-	    set lib [lindex [glob [file join [pwd] [file dirname \
-		    [info nameofexecutable]] tcldde*.dll]] 0]
-	    load $lib dde
-	}] {
-	    puts "Unable to find the dde package. Skipping registry tests."
-	    ::tcltest::cleanupTests
-	    return
-	}
-    }
-    puts $f "dde servername $ddeServerName"
-    puts $f {
-	puts ready
-	vwait done
-	update
-	exit
-    }
-    close $f
-    
-    set f [open "|$::tcltest $::scriptName" r]
-    gets $f
-    return $f
-}
-
-test winDde-1.1 {Settings the server's topic name} {pcOnly} {
-    list [dde servername foobar] [dde servername] [dde servername self]
-}  {foobar foobar self}
-
-test winDde-2.1 {Checking for other services} {pcOnly} {
-    expr [llength [dde services {} {}]] >= 0
-} 1
-
-test winDde-2.2 {Checking for existence, with service and topic specified} \
-	{pcOnly} {
-    llength [dde services TclEval self]
-} 1
-
-test winDde-2.3 {Checking for existence, with only the service specified} \
-	{pcOnly} {
-    expr [llength [dde services TclEval {}]] >= 1
-} 1
-
-test winDde-3.1 {DDE execute locally} {pcOnly} {
-    set a ""
-    dde execute TclEval self {set a "foo"}
-    set a
-} foo
-
-test winDde-3.2 {DDE execute -async locally} {pcOnly} {
-    set a ""
-    dde execute -async TclEval self {set a "foo"}
-    update
-    set a
-} foo
-
-test winDde-3.3 {DDE request locally} {pcOnly} {
-    set a ""
-    dde execute TclEval self {set a "foo"}
-    dde request TclEval self a
-} foo
-
-test winDde-3.4 {DDE eval locally} {pcOnly} {
-    set a ""
-    dde eval self set a "foo"
-} foo
-
-test winDde-4.1 {DDE execute remotely} {pcOnly} {
-    set a ""
-    set child [createChildProcess child]
-    dde execute TclEval child {set a "foo"}
-
-    dde execute TclEval child {set done 1}
-
-    set a
-} ""
-
-test winDde-4.2 {DDE execute remotely} {pcOnly} {
-    set a ""
-    set child [createChildProcess child]
-    dde execute -async TclEval child {set a "foo"}
-
-    dde execute TclEval child {set done 1}
-
-    set a
-} ""
-
-test winDde-4.3 {DDE request locally} {pcOnly} {
-    set a ""
-    set child [createChildProcess child]
-    dde execute TclEval child {set a "foo"}
-    set a [dde request TclEval child a]
-
-    
-    dde execute TclEval child {set done 1}
-
-    set a
-} foo
-
-test winDde-4.4 {DDE eval locally} {pcOnly} {
-    set a ""
-    set child [createChildProcess child]
-    set a [dde eval child set a "foo"]
-
-    dde execute TclEval child {set done 1}
-
-    set a
-} foo
-
-
-#cleanup
-file delete -force $::scriptName
-::tcltest::cleanupTests
-return
-
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
deleted file mode 100644
index 935198e..0000000
--- a/tests/winFCmd.test
+++ /dev/null
@@ -1,978 +0,0 @@
-# This file tests the tclWinFCmd.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1996-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winFCmd.test,v 1.4 1999/04/16 00:47:37 stanton Exp $
-#
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-proc createfile {file {string a}} {
-    set f [open $file w]
-    puts -nonewline $f $string
-    close $f
-    return $string
-}
-
-proc contents {file} {
-    set f [open $file r]
-    set r [read $f]
-    close $f
-    set r
-}
-
-proc cleanup {args} {
-    foreach p ". $args" {
-	set x ""
-	catch {
-	    set x [glob [file join $p tf*] [file join $p td*]]
-	}
-	if {$x != ""} {
-	    catch {eval file delete -force -- $x}
-	}
-    }
-}
-
-set ::tcltest::testConfig(cdrom) 0
-set ::tcltest::testConfig(exdev) 0
-
-# find a CD-ROM so we can test read-only filesystems.
-
-set cdrom {}
-set nodrive x:
-foreach p {d e f g h i j k l m n o p q r s t u v w x y z} {
-    set name ${p}:/dummy~~.fil
-    if [catch {set fd [open $name w]}] {
-	set err [lindex $errorCode 1]
-        if {$cdrom == "" && $err == "EACCES"} {
-	    set cdrom ${p}:
-	}
-	if {$err == "ENOENT"} {
-	    set nodrive ${p}:
-	}
-    } else {
-        close $fd
-	file delete $name
-    }
-}
-
-proc findfile {dir} {
-    foreach p [glob $dir/*] {
-        if {[file type $p] == "file"} {
-	    return $p
-	}
-    }
-    foreach p [glob $dir/*] {
-        if {[file type $p] == "directory"} {
-	    set f [findfile $p]
-	    if {$f != ""} {
-	        return $f
-	    }
-	}
-    }
-    return ""
-}
-
-if {$cdrom != ""} {
-    set ::tcltest::testConfig(cdrom) 1
-    set cdfile [findfile $cdrom]
-}
-
-if {[file exists c:/] && [file exists d:/]} {
-    catch {file delete d:/tf1}
-    if {[catch {close [open d:/tf1 w]}] == 0} {
-	file delete d:/tf1
-	set ::tcltest::testConfig(exdev) 1
-    }
-}
-
-file delete -force -- td1
-set foo [catch {open td1 w} testfile]
-if {$foo} {
-    set ::tcltest::testConfig(longFileNames) 0
-} else {
-    close $testfile
-    set ::tcltest::testConfig(longFileNames) 1
-    file delete -force -- td1
-}
-
-# A really long file name
-# length of longname is 1216 chars, which should be greater than any static
-# buffer or allowable filename.
-
-set longname "abcdefghihjllmnopqrstuvwxyz01234567890"
-append longname $longname
-append longname $longname
-append longname $longname
-append longname $longname
-append longname $longname
-
-# Uses the "testfile" command instead of the "file" command.  The "file"
-# command provides several layers of sanity checks on the arguments and
-# it can be difficult to actually forward "insane" arguments to the
-# low-level posix emulation layer.
-
-test winFCmd-1.1 {TclpRenameFile: errno: EACCES} {pcOnly cdrom} {
-    list [catch {testfile mv $cdfile $cdrom/dummy~~.fil} msg] $msg
-} {1 EACCES}
-test winFCmd-1.2 {TclpRenameFile: errno: EEXIST} {pcOnly} {
-    cleanup
-    file mkdir td1/td2/td3
-    file mkdir td2
-    list [catch {testfile mv td2 td1/td2} msg] $msg
-} {1 EEXIST} 
-test winFCmd-1.3 {TclpRenameFile: errno: EINVAL} {pcOnly} {
-    cleanup
-    list [catch {testfile mv / td1} msg] $msg
-} {1 EINVAL}
-test winFCmd-1.4 {TclpRenameFile: errno: EINVAL} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile mv td1 td1/td2} msg] $msg
-} {1 EINVAL}
-test winFCmd-1.5 {TclpRenameFile: errno: EISDIR} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile tf1
-    list [catch {testfile mv tf1 td1} msg] $msg
-} {1 EISDIR}
-test winFCmd-1.6 {TclpRenameFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile mv tf1 tf2} msg] $msg
-} {1 ENOENT}
-test winFCmd-1.7 {TclpRenameFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile mv "" tf2} msg] $msg
-} {1 ENOENT}
-test winFCmd-1.8 {TclpRenameFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile mv tf1 ""} msg] $msg
-} {1 ENOENT}
-test winFCmd-1.9 {TclpRenameFile: errno: ENOTDIR} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile tf1
-    list [catch {testfile mv td1 tf1} msg] $msg
-} {1 ENOTDIR}
-test winFCmd-1.10 {TclpRenameFile: errno: EXDEV} {pcOnly exdev} {
-    file delete -force d:/tf1
-    file mkdir c:/tf1
-    set msg [list [catch {testfile mv c:/tf1 d:/tf1} msg] $msg]
-    file delete -force c:/tf1
-    set msg
-} {1 EXDEV}
-test winFCmd-1.11 {TclpRenameFile: errno: EACCES} {pcOnly} {
-    cleanup
-    set fd [open tf1 w]
-    set msg [list [catch {testfile mv tf1 tf2} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-test winFCmd-1.12 {TclpRenameFile: errno: EACCES} {pcOnly} {
-    cleanup
-    createfile tf1
-    set fd [open tf2 w]
-    set msg [list [catch {testfile mv tf1 tf2} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-test winFCmd-1.13 {TclpRenameFile: errno: EACCES} {pcOnly} {
-    cleanup
-    list [catch {testfile mv nul tf1} msg] $msg
-} {1 EACCES}
-test winFCmd-1.14 {TclpRenameFile: errno: EACCES} {95} {
-    cleanup
-    createfile tf1
-    list [catch {testfile mv tf1 nul} msg] $msg
-} {1 EACCES}
-test winFCmd-1.15 {TclpRenameFile: errno: EEXIST} {nt} {
-    cleanup
-    createfile tf1
-    list [catch {testfile mv tf1 nul} msg] $msg
-} {1 EEXIST}
-test winFCmd-1.16 {TclpRenameFile: MoveFile() != FALSE} {pcOnly} {
-    cleanup
-    createfile tf1 tf1
-    testfile mv tf1 tf2
-    list [file exists tf1] [contents tf2]
-} {0 tf1}
-test winFCmd-1.17 {TclpRenameFile: MoveFile() == FALSE} {pcOnly} {
-    cleanup
-    list [catch {testfile mv tf1 tf2} msg] $msg
-} {1 ENOENT} 
-test winFCmd-1.18 {TclpRenameFile: srcAttr == -1} {pcOnly} {
-    cleanup
-    list [catch {testfile mv tf1 tf2} msg] $msg
-} {1 ENOENT} 
-test winFCmd-1.19 {TclpRenameFile: errno == EACCES} {pcOnly} {
-    cleanup
-    list [catch {testfile mv nul tf1} msg] $msg
-} {1 EACCES}
-test winFCmd-1.20 {TclpRenameFile: src is dir} {nt} {
-    # under 95, this would actually succeed and move the current dir out from 
-    # under the current process!
-    cleanup
-    file delete /tf1
-    list [catch {testfile mv [pwd] /tf1} msg] $msg
-} {1 EACCES}
-test winFCmd-1.21 {TclpRenameFile: long src} {pcOnly} {
-    cleanup
-    list [catch {testfile mv $longname tf1} msg] $msg
-} {1 ENAMETOOLONG}
-test winFCmd-1.22 {TclpRenameFile: long dst} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile mv tf1 $longname} msg] $msg
-} {1 ENAMETOOLONG}
-test winFCmd-1.23 {TclpRenameFile: move dir into self} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile mv [pwd]/td1 td1/td2} msg] $msg
-} {1 EINVAL}
-test winFCmd-1.24 {TclpRenameFile: move a root dir} {pcOnly} {
-    cleanup
-    list [catch {testfile mv / c:/} msg] $msg
-} {1 EINVAL}
-test winFCmd-1.25 {TclpRenameFile: cross file systems} {pcOnly cdrom} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile mv td1 $cdrom/td1} msg] $msg
-} {1 EXDEV} 
-test winFCmd-1.26 {TclpRenameFile: readonly fs} {pcOnly cdrom} {
-    cleanup
-    list [catch {testfile mv $cdfile $cdrom/dummy~~.fil} msg] $msg
-} {1 EACCES}
-test winFCmd-1.27 {TclpRenameFile: open file} {pcOnly} {
-    cleanup
-    set fd [open tf1 w]
-    set msg [list [catch {testfile mv tf1 tf2} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}    
-test winFCmd-1.28 {TclpRenameFile: errno == EEXIST} {pcOnly} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    testfile mv tf1 tf2
-    list [file exist tf1] [file exist tf2]
-} {0 1}
-test winFCmd-1.29 {TclpRenameFile: src is dir} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile tf1
-    list [catch {testfile mv td1 tf1} msg] $msg
-} {1 ENOTDIR} 
-test winFCmd-1.30 {TclpRenameFile: dst is dir} {pcOnly} {
-    cleanup
-    file mkdir td1
-    file mkdir td2/td2
-    list [catch {testfile mv td1 td2} msg] $msg
-} {1 EEXIST}
-test winFCmd-1.31 {TclpRenameFile: TclpRemoveDirectory fails} {pcOnly} {
-    cleanup
-    file mkdir td1
-    file mkdir td2/td2
-    list [catch {testfile mv td1 td2} msg] $msg
-} {1 EEXIST}
-test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    file mkdir td2
-    testfile mv td1 td2
-    list [file exist td1] [file exist td2] [file exist td2/td2]
-} {0 1 1}
-test winFCmd-1.33 {TclpRenameFile: After removing dst dir, MoveFile fails} \
-	{pcOnly exdev} {
-    file mkdir d:/td1
-    testchmod 000 d:/td1
-    set msg [list [catch {testfile mv c:/windows d:/td1} msg] $msg]
-    set msg "$msg [file writable d:/td1]"
-    file delete d:/td1
-    set msg
-} {1 EXDEV 0}
-test winFCmd-1.34 {TclpRenameFile: src is dir, dst is not} {pcOnly} {
-    file mkdir td1
-    createfile tf1
-    list [catch {testfile mv td1 tf1} msg] $msg
-} {1 ENOTDIR}
-test winFCmd-1.35 {TclpRenameFile: src is not dir, dst is} {pcOnly} {
-    file mkdir td1
-    createfile tf1
-    list [catch {testfile mv tf1 td1} msg] $msg
-} {1 EISDIR}
-test winFCmd-1.36 {TclpRenameFile: src and dst not dir} {pcOnly} {
-    createfile tf1 tf1
-    createfile tf2 tf2
-    testfile mv tf1 tf2
-    contents tf2
-} {tf1}
-test winFCmd-1.37 {TclpRenameFile: need to restore temp file} {pcOnly} {
-    # Can't figure out how to cause this. 
-    # Need a file that can't be copied.
-} {}
-
-test winFCmd-2.1 {TclpCopyFile: errno: EACCES} {pcOnly cdrom} {
-    cleanup
-    list [catch {testfile cp $cdfile $cdrom/dummy~~.fil} msg] $msg
-} {1 EACCES}
-test winFCmd-2.2 {TclpCopyFile: errno: EISDIR} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cp td1 tf1} msg] $msg
-} {1 EISDIR}
-test winFCmd-2.3 {TclpCopyFile: errno: EISDIR} {pcOnly} {
-    cleanup
-    createfile tf1
-    file mkdir td1
-    list [catch {testfile cp tf1 td1} msg] $msg
-} {1 EISDIR}
-test winFCmd-2.4 {TclpCopyFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile cp tf1 tf2} msg] $msg
-} {1 ENOENT}
-test winFCmd-2.5 {TclpCopyFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile cp "" tf2} msg] $msg
-} {1 ENOENT}
-test winFCmd-2.6 {TclpCopyFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile cp tf1 ""} msg] $msg
-} {1 ENOENT}
-test winFCmd-2.7 {TclpCopyFile: errno: EACCES} {95} {
-    cleanup
-    createfile tf1
-    set fd [open tf2 w]
-    set msg [list [catch {testfile cp tf1 tf2} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-test winFCmd-2.8 {TclpCopyFile: errno: EACCES} {nt} {
-    cleanup
-    list [catch {testfile cp nul tf1} msg] $msg
-} {1 EACCES}
-test winFCmd-2.9 {TclpCopyFile: errno: ENOENT} {95} {
-    cleanup
-    list [catch {testfile cp nul tf1} msg] $msg
-} {1 ENOENT}
-test winFCmd-2.10 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
-    cleanup
-    createfile tf1 tf1
-    testfile cp tf1 tf2
-    list [contents tf1] [contents tf2]
-} {tf1 tf1}
-test winFCmd-2.11 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
-    cleanup
-    createfile tf1 tf1
-    createfile tf2 tf2
-    testfile cp tf1 tf2
-    list [contents tf1] [contents tf2]
-} {tf1 tf1}
-test winFCmd-2.12 {TclpCopyFile: CopyFile succeeds} {pcOnly} {
-    cleanup
-    createfile tf1 tf1
-    testchmod 000 tf1
-    testfile cp tf1 tf2
-    list [contents tf2] [file writable tf2]
-} {tf1 0}
-test winFCmd-2.13 {TclpCopyFile: CopyFile fails} {pcOnly} {
-    cleanup
-    createfile tf1
-    file mkdir td1
-    list [catch {testfile cp tf1 td1} msg] $msg
-} {1 EISDIR} 
-test winFCmd-2.14 {TclpCopyFile: errno == EACCES} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cp td1 tf1} msg] $msg
-} {1 EISDIR}
-test winFCmd-2.15 {TclpCopyFile: src is directory} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cp td1 tf1} msg] $msg
-} {1 EISDIR}
-test winFCmd-2.16 {TclpCopyFile: dst is directory} {pcOnly} {
-    cleanup
-    createfile tf1
-    file mkdir td1
-    list [catch {testfile cp tf1 td1} msg] $msg
-} {1 EISDIR}
-test winFCmd-2.17 {TclpCopyFile: dst is readonly} {pcOnly} {
-    cleanup
-    createfile tf1 tf1
-    createfile tf2 tf2
-    testchmod 000 tf2
-    testfile cp tf1 tf2
-    list [file writable tf2] [contents tf2]
-} {1 tf1}
-test winFCmd-2.18 {TclpCopyFile: still can't copy onto dst} {95} {
-    cleanup
-    createfile tf1
-    createfile tf2
-    testchmod 000 tf2
-    set fd [open tf2]
-    set msg [list [catch {testfile cp tf1 tf2} msg] $msg]
-    close $fd
-    set msg "$msg [file writable tf2]"
-} {1 EACCES 0}    
-
-test winFCmd-3.1 {TclpDeleteFile: errno: EACCES} {pcOnly cdrom} {
-    list [catch {testfile rm $cdfile $cdrom/dummy~~.fil} msg] $msg
-} {1 EACCES}
-test winFCmd-3.2 {TclpDeleteFile: errno: EISDIR} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile rm td1} msg] $msg
-} {1 EISDIR} 
-test winFCmd-3.3 {TclpDeleteFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile rm tf1} msg] $msg
-} {1 ENOENT}
-test winFCmd-3.4 {TclpDeleteFile: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile rm ""} msg] $msg
-} {1 ENOENT}
-test winFCmd-3.5 {TclpDeleteFile: errno: EACCES} {pcOnly} {
-    cleanup
-    set fd [open tf1 w]
-    set msg [list [catch {testfile rm tf1} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-test winFCmd-3.6 {TclpDeleteFile: errno: EACCES} {pcOnly} {
-    cleanup
-    list [catch {testfile rm nul} msg] $msg
-} {1 EACCES}
-test winFCmd-3.7 {TclpDeleteFile: DeleteFile succeeds} {pcOnly} {
-    cleanup
-    createfile tf1
-    testfile rm tf1
-    file exist tf1
-} {0}
-test winFCmd-3.8 {TclpDeleteFile: DeleteFile fails} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile rm td1} msg] $msg
-} {1 EISDIR}
-test winFCmd-3.9 {TclpDeleteFile: errno == EACCES} {pcOnly} {
-    cleanup
-    set fd [open tf1 w]
-    set msg [list [catch {testfile rm tf1} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-test winFCmd-3.10 {TclpDeleteFile: path is readonly} {pcOnly} {
-    cleanup
-    createfile tf1
-    testchmod 000 tf1
-    testfile rm tf1
-    file exists tf1
-} {0}
-test winFCmd-3.11 {TclpDeleteFile: still can't remove path} {pcOnly} {
-    cleanup
-    set fd [open tf1 w]
-    testchmod 000 tf1
-    set msg [list [catch {testfile rm tf1} msg] $msg]
-    close $fd
-    set msg
-} {1 EACCES}
-
-test winFCmd-4.1 {TclpCreateDirectory: errno: EACCES} {nt cdrom} {
-    list [catch {testfile mkdir $cdrom/dummy~~.dir} msg] $msg
-} {1 EACCES}
-test winFCmd-4.2 {TclpCreateDirectory: errno: EACCES} {95 cdrom} {
-    list [catch {testfile mkdir $cdrom/dummy~~.dir} msg] $msg
-} {1 ENOSPC}
-test winFCmd-4.3 {TclpCreateDirectory: errno: EEXIST} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile mkdir td1} msg] $msg
-} {1 EEXIST}
-test winFCmd-4.4 {TclpCreateDirectory: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile mkdir td1/td2} msg] $msg
-} {1 ENOENT}
-test winFCmd-4.5 {TclpCreateDirectory: CreateDirectory succeeds} {pcOnly} {
-    cleanup
-    testfile mkdir td1
-    file type td1
-} {directory}
-
-test winFCmd-5.1 {TclpCopyDirectory: calls TraverseWinTree} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testfile cpdir td1 td2
-    list [file type td1] [file type td2]
-} {directory directory}
-
-test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    testfile rmdir td1
-    file exist td1
-} {0}
-test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    list [catch {testfile rmdir td1} msg] $msg
-} {1 {td1 EEXIST}}
-test winFCmd-6.3 {TclpRemoveDirectory: errno: EACCES} {pcOnly} {
-    # can't test this w/o removing everything on your hard disk first!
-    # testfile rmdir /
-} {}
-test winFCmd-6.4 {TclpRemoveDirectory: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile rmdir td1} msg] $msg
-} {1 {td1 ENOENT}}
-test winFCmd-6.5 {TclpRemoveDirectory: errno: ENOENT} {pcOnly} {
-    cleanup
-    list [catch {testfile rmdir ""} msg] $msg
-} {1 ENOENT}
-test winFCmd-6.6 {TclpRemoveDirectory: errno: ENOTDIR} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile rmdir tf1} msg] $msg
-} {1 {tf1 ENOTDIR}}
-test winFCmd-6.7 {TclpRemoveDirectory: RemoveDirectory succeeds} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testfile rmdir td1
-    file exists td1
-} {0}
-test winFCmd-6.8 {TclpRemoveDirectory: RemoveDirectory fails} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile rmdir tf1} msg] $msg
-} {1 {tf1 ENOTDIR}}
-test winFCmd-6.9 {TclpRemoveDirectory: errno == EACCES} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    testfile rmdir td1
-    file exists td1
-} {0}
-test winFCmd-6.10 {TclpRemoveDirectory: attr == -1} {95} {
-    cleanup
-    list [catch {testfile rmdir nul} msg] $msg
-} {1 {nul EACCES}}
-test winFCmd-6.11 {TclpRemoveDirectory: attr == -1} {nt} {
-    cleanup
-    list [catch {testfile rmdir /} msg] $msg
-} {1 {\ EACCES}}
-test winFCmd-6.12 {TclpRemoveDirectory: errno == EACCES} {95} {
-    cleanup
-    createfile tf1
-    list [catch {testfile rmdir tf1} msg] $msg
-} {1 {tf1 ENOTDIR}}
-test winFCmd-6.13 {TclpRemoveDirectory: write-protected} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    testfile rmdir td1
-    file exists td1
-} {0}
-test winFCmd-6.14 {TclpRemoveDirectory: check if empty dir} {95} {
-    cleanup
-    file mkdir td1/td2
-    list [catch {testfile rmdir td1} msg] $msg
-} {1 {td1 EEXIST}}
-test winFCmd-6.15 {TclpRemoveDirectory: !recursive} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    list [catch {testfile rmdir td1} msg] $msg
-} {1 {td1 EEXIST}}
-test winFCmd-6.16 {TclpRemoveDirectory: recursive, but errno != EEXIST} {pcOnly} {
-    cleanup
-    createfile tf1
-    list [catch {testfile rmdir -force tf1} msg] $msg
-} {1 {tf1 ENOTDIR}}
-test winFCmd-6.17 {TclpRemoveDirectory: calls TraverseWinTree} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-
-test winFCmd-7.1 {TraverseWinTree: targetPtr == NULL} {pcOnly} {
-    cleanup
-    file mkdir td1/td2/td3
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-test winFCmd-7.2 {TraverseWinTree: targetPtr != NULL} {pcOnly} {
-    cleanup
-    file mkdir td1/td2/td3
-    testfile cpdir td1 td2
-    list [file exists td1] [file exists td2]
-} {1 1}
-test winFCmd-7.3 {TraverseWinTree: sourceAttr == -1} {pcOnly} {
-    cleanup
-    list [catch {testfile cpdir td1 td2} msg] $msg
-} {1 {td1 ENOENT}}
-test winFCmd-7.4 {TraverseWinTree: source isn't directory} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    contents td2/tf1
-} {tf1}
-test winFCmd-7.5 {TraverseWinTree: call TraversalCopy: DOTREE_F} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    contents td2/tf1
-} {tf1}
-test winFCmd-7.6 {TraverseWinTree: call TraversalDelete: DOTREE_F} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-test winFCmd-7.7 {TraverseWinTree: append \ to source if necessary} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    contents td2/tf1
-} {tf1}    
-test winFCmd-7.8 {TraverseWinTree: append \ to source if necessary} {95 cdrom} {
-    list [catch {testfile rmdir $cdrom/} msg] $msg
-} "1 {$cdrom\\ EEXIST}"
-test winFCmd-7.9 {TraverseWinTree: append \ to source if necessary} {nt cdrom} {
-    list [catch {testfile rmdir $cdrom/} msg] $msg
-} "1 {$cdrom\\ EACCES}"
-test winFCmd-7.10 {TraverseWinTree: can't read directory: handle == INVALID} \
-	{pcOnly} {
-    # can't make it happen
-} {}
-test winFCmd-7.11 {TraverseWinTree: call TraversalCopy: DOTREE_PRED} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    list [file exists td2] [file writable td2]
-} {1 0}
-test winFCmd-7.12 {TraverseWinTree: call TraversalDelete: DOTREE_PRED} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-test winFCmd-7.13 {TraverseWinTree: append \ to target if necessary} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    contents td2/tf1
-} {tf1}    
-test winFCmd-7.14 {TraverseWinTree: append \ to target if necessary} {95} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cpdir td1 /} msg] $msg
-} {1 {\ EEXIST}}
-test winFCmd-7.15 {TraverseWinTree: append \ to target if necessary} {nt} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cpdir td1 /} msg] $msg
-} {1 {\ EACCES}}
-test winFCmd-7.16 {TraverseWinTree: recurse on files: no files} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testfile cpdir td1 td2
-} {}
-test winFCmd-7.17 {TraverseWinTree: recurse on files: one file} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/td2
-    testfile cpdir td1 td2
-    glob td2/*
-} {td2/td2}
-test winFCmd-7.18 {TraverseWinTree: recurse on files: several files and dir} \
-	{pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1
-    createfile td1/tf2
-    file mkdir td1/td2/td3
-    createfile td1/tf3
-    createfile td1/tf4
-    testfile cpdir td1 td2
-    lsort [glob td2/*]
-} {td2/td2 td2/tf1 td2/tf2 td2/tf3 td2/tf4}
-test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testchmod 000 td1
-    createfile td1/tf1 tf1
-    testfile cpdir td1 td2
-    list [file exists td2] [file writable td2]
-} {1 0}
-test winFCmd-7.20 {TraverseWinTree: call TraversalDelete: DOTREE_POSTD} \
-	{pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1 tf1
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-test winFCmd-7.21 {TraverseWinTree: fill errorPtr} {pcOnly} {
-    cleanup
-    list [catch {testfile cpdir td1 td2} msg] $msg
-} {1 {td1 ENOENT}}
-
-test winFCmd-8.1 {TraversalCopy: DOTREE_F} {pcOnly} {
-    cleanup
-    file mkdir td1
-    list [catch {testfile cpdir td1 td1} msg] $msg
-} {1 {td1 EEXIST}}
-test winFCmd-8.2 {TraversalCopy: DOTREE_PRED} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    testchmod 000 td1
-    testfile cpdir td1 td2
-    list [file writable td1] [file writable td1/td2]
-} {0 1}
-test winFCmd-8.3 {TraversalCopy: DOTREE_POSTD} {pcOnly} {
-    cleanup
-    file mkdir td1
-    testfile cpdir td1 td2
-} {}
-
-test winFCmd-9.1 {TraversalDelete: DOTREE_F} {pcOnly} {
-    cleanup
-    file mkdir td1
-    createfile td1/tf1
-    testfile rmdir -force td1
-} {}
-test winFCmd-9.2 {TraversalDelete: DOTREE_F} {95} {
-    cleanup
-    file mkdir td1
-    set fd [open td1/tf1 w]
-    set msg [list [catch {testfile rmdir -force td1} msg] $msg]
-    close $fd
-    set msg
-} {1 {td1\tf1 EACCES}}
-test winFCmd-9.3 {TraversalDelete: DOTREE_PRED} {pcOnly} {
-    cleanup
-    file mkdir td1/td2
-    testchmod 000 td1
-    testfile rmdir -force td1
-    file exists td1
-} {0}
-test winFCmd-9.4 {TraversalDelete: DOTREE_POSTD} {pcOnly} {
-    cleanup
-    file mkdir td1/td1/td3/td4/td5
-    testfile rmdir -force td1
-} {}
-
-test winFCmd-10.1 {AttributesPosixError - get} {pcOnly} {
-    cleanup
-    list [catch {file attributes td1 -archive} msg] $msg
-} {1 {could not read "td1": no such file or directory}}
-test winFCmd-10.2 {AttributesPosixError - set} {pcOnly} {
-    cleanup
-    list [catch {file attributes td1 -archive 0} msg] $msg
-} {1 {could not read "td1": no such file or directory}}
-
-test winFCmd-11.1 {GetWinFileAttributes} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -archive} msg] $msg [cleanup]
-} {0 1 {}}
-test winFCmd-11.2 {GetWinFileAttributes} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -readonly} msg] $msg [cleanup]
-} {0 0 {}}
-test winFCmd-11.3 {GetWinFileAttributes} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -hidden} msg] $msg [cleanup]
-} {0 0 {}}
-test winFCmd-11.4 {GetWinFileAttributes} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -system} msg] $msg [cleanup]
-} {0 0 {}}
-test winfcmd-11.5 {GetWinFileAttributes} {pcOnly} {
-    # attr of relative paths that resolve to root was failing
-    # don't care about answer, just that test runs.
-
-    set old [pwd]
-    cd c:/
-    file attr c:	    
-    file attr c:.
-    file attr . 
-    cd $old
-} {}
-
-test winFCmd-12.1 {ConvertFileNameFormat} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
-} {0 td1 {}}
-test winFCmd-12.2 {ConvertFileNameFormat} {pcOnly} {
-    cleanup
-    file mkdir td1
-    close [open td1/td1 w]
-    list [catch {string tolower [file attributes td1/td1 -longname]} msg] $msg [cleanup]
-} {0 td1/td1 {}}
-test winFCmd-12.3 {ConvertFileNameFormat} {pcOnly} {
-    cleanup
-    file mkdir td1
-    file mkdir td1/td2
-    close [open td1/td3 w]
-    list [catch {string tolower [file attributes td1/td2/../td3 -longname]} msg] $msg [cleanup]
-} {0 td1/td2/../td3 {}}
-test winFCmd-12.4 {ConvertFileNameFormat} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes ./td1 -longname]} msg] $msg [cleanup]
-} {0 ./td1 {}}
-test winFCmd-12.5 {ConvertFileNameFormat: absolute path} {pcOnly} {
-    list [file attributes / -longname] [file attributes \\ -longname]
-} {/ /}
-test winFCmd-12.6 {ConvertFileNameFormat: absolute path with drive} {pcOnly} {
-    catch {file delete -force -- c:/td1}
-    close [open c:/td1 w]
-    list [catch {string tolower [file attributes c:/td1 -longname]} msg] $msg [file delete -force -- c:/td1]
-} {0 c:/td1 {}}
-test winFCmd-12.7 {ConvertFileNameFormat} {nonPortable pcOnly} {
-    string tolower [file attributes //bisque/tcl/ws -longname]
-} {//bisque/tcl/ws}
-test winFCmd-12.8 {ConvertFileNameFormat} {pcOnly longFileNames} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
-} {0 td1 {}}
-test winFCmd-12.10 {ConvertFileNameFormat} {longFileNames pcOnly} {
-    cleanup
-    close [open td1td1td1 w]
-    list [catch {file attributes td1td1td1 -shortname}] [cleanup]
-} {0 {}}
-test winFCmd-12.11 {ConvertFileNameFormat} {longFileNames pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes td1 -shortname]} msg] $msg [cleanup]
-} {0 td1 {}}
-
-test winFCmd-13.1 {GetWinFileLongName} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes td1 -longname]} msg] $msg [cleanup]
-} {0 td1 {}}
-
-test winFCmd-14.1 {GetWinFileShortName} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {string tolower [file attributes td1 -shortname]} msg] $msg [cleanup]
-} {0 td1 {}}
-
-test winFCmd-15.1 {SetWinFileAttributes} {pcOnly} {
-    cleanup
-    list [catch {file attributes td1 -archive 0} msg] $msg
-} {1 {could not read "td1": no such file or directory}}
-test winFCmd-15.2 {SetWinFileAttributes - archive} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -archive 1} msg] $msg [file attributes td1 -archive] [cleanup]
-} {0 {} 1 {}}
-test winFCmd-15.3 {SetWinFileAttributes - archive} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -archive 0} msg] $msg [file attributes td1 -archive] [cleanup]
-} {0 {} 0 {}}
-test winFCmd-15.4 {SetWinFileAttributes - hidden} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -hidden 1} msg] $msg [file attributes td1 -hidden] [file attributes td1 -hidden 0] [cleanup]
-} {0 {} 1 {} {}}
-test winFCmd-15.5 {SetWinFileAttributes - hidden} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -hidden 0} msg] $msg [file attributes td1 -hidden] [cleanup]
-} {0 {} 0 {}}
-test winFCmd-15.6 {SetWinFileAttributes - readonly} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -readonly 1} msg] $msg [file attributes td1 -readonly] [cleanup]
-} {0 {} 1 {}}
-test winFCmd-15.7 {SetWinFileAttributes - readonly} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -readonly 0} msg] $msg [file attributes td1 -readonly] [cleanup]
-} {0 {} 0 {}}
-test winFCmd-15.8 {SetWinFileAttributes - system} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -system 1} msg] $msg [file attributes td1 -system] [cleanup]
-} {0 {} 1 {}}
-test winFCmd-15.9 {SetWinFileAttributes - system} {pcOnly} {
-    cleanup
-    close [open td1 w]
-    list [catch {file attributes td1 -system 0} msg] $msg [file attributes td1 -system] [cleanup]
-} {0 {} 0 {}}
-test winFCmd-15.10 {SetWinFileAttributes - failing} {pcOnly cdrom} {
-    cleanup
-    catch {file attributes $cdfile -archive 1}
-} {1}
-
-# This block of code used to occur after the "return" call, so I'm
-# commenting it out and assuming that this code is still under construction.
-#foreach source {tef ted tnf tnd "" nul com1} {
-#    foreach chmodsrc {000 755} {
-#        foreach dest "tfn tfe tdn tdempty tdfull td1/td2 $p $p/td1 {} nul" {
-#	    foreach chmoddst {000 755} {
-#		puts hi
-#		cleanup
-#		file delete -force ted tef
-#		file mkdir ted
-#		createfile tef
-#		createfile tfe
-#		file mkdir tdempty
-#		file mkdir tdfull/td1/td2
-#
-#		catch {testchmod $chmodsrc $source}
-#		catch {testchmod $chmoddst $dest}
-#
-#		if [catch {file rename $source $dest} msg] {
-#		    puts "file rename $source ($chmodsrc) $dest ($chmoddst)"
-#		    puts $msg
-#		}
-#	    }
-#	}
-#    }
-#}
-
-# cleanup
-cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/winFile.test b/tests/winFile.test
deleted file mode 100644
index 677150d..0000000
--- a/tests/winFile.test
+++ /dev/null
@@ -1,64 +0,0 @@
-# This file tests the tclWinFile.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winFile.test,v 1.2 1999/04/16 00:47:37 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-test winFile-1.1 {TclpGetUserHome} {pcOnly} {
-    list [catch {glob ~nosuchuser} msg] $msg
-} {1 {user "nosuchuser" doesn't exist}}
-test winFile-1.2 {TclpGetUserHome} {nt nonPortable} {
-    # The administrator account should always exist.
-
-    catch {glob ~administrator}
-} {0}
-test winFile-1.2 {TclpGetUserHome} {95} {
-    # Find some user in system.ini and then see if they have a home.
-
-    set f [open $::env(windir)/system.ini]
-    set x 0
-    while {![eof $f]} {
-	set line [gets $f]
-	if {$line == "\[Password Lists]"} {
-	    gets $f
-	    set name [lindex [split [gets $f] =] 0]
-	    if {$name != ""} {
-		set x [catch {glob ~$name}]
-		break
-	    }
-	}
-    }
-    close $f
-    set x
-} {0}
-test winFile-1.3 {TclpGetUserHome} {nt nonPortable} {
-    catch {glob ~stanton@workgroup}
-} {0}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/winNotify.test b/tests/winNotify.test
deleted file mode 100644
index c8c3d9e..0000000
--- a/tests/winNotify.test
+++ /dev/null
@@ -1,173 +0,0 @@
-# This file tests the tclWinNotify.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winNotify.test,v 1.3 1999/04/16 00:47:37 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set ::tcltest::testConfig(testeventloop) \
-	[expr {[info commands testeventloop] != {}}]
-
-# There is no explicit test for InitNotifier or NotifierExitHandler
-
-test winNotify-1.1 {Tcl_SetTimer: positive timeout} {pcOnly} {
-    set done 0
-    after 1000 { set done 1 }
-    vwait done
-    set done
-} 1
-test winNotify-1.2 {Tcl_SetTimer: positive timeout, message pending} {pcOnly} {
-    set x 0
-    set y 1
-    set a1 [after 0 { incr y }]
-    after cancel $a1
-    after 500 { incr x }
-    vwait x
-    list $x $y
-} {1 1}
-test winNotify-1.3 {Tcl_SetTimer: cancelling positive timeout} {pcOnly} {
-    set x 0
-    set y 1
-    set id [after 10000 { incr y }]
-    after 0 { incr x }
-    vwait x
-    after cancel $id
-    list $x $y
-} {1 1}
-test winNotify-1.4 {Tcl_SetTimer: null timeout, message pending} {pcOnly} {
-    set x 0
-    set y 1
-    after 0 { incr x }
-    after 0 { incr y }
-    vwait x
-    list $x $y
-} {1 2}
-
-test winNotify-2.1 {Tcl_ResetIdleTimer} {pcOnly} {
-    set x 0
-    update
-    after idle { incr x }
-    vwait x
-    set x
-} 1
-test winNotify-2.2 {Tcl_ResetIdleTimer: message pending} {pcOnly} {
-    set x 0
-    set y 1
-    update
-    after idle { incr x }
-    after idle { incr y }
-    update
-    list $x $y
-} {1 2}
-
-test winNotify-3.1 {NotifierProc: non-modal normal timer} {pcOnly testeventloop} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 500 { incr x; testeventloop done }
-    testeventloop wait
-    set x
-} 1
-test winNotify-3.2 {NotifierProc: non-modal normal timer, rescheduled} {pcOnly testeventloop} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 500 { incr x; after 100 {incr x; testeventloop done }}
-    testeventloop wait
-    set x
-} 2
-test winNotify-3.3 {NotifierProc: modal normal timer} {pcOnly} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after 500 { incr x }
-    vwait x
-    set x
-} 1
-test winNotify-3.4 {NotifierProc: modal normal timer, rescheduled} {pcOnly} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    set y 0
-    after 500 { incr y; after 100 {incr x}}
-    vwait x
-    list $x $y
-} {1 1}
-test winNotify-3.5 {NotifierProc: non-modal idle timer} {pcOnly testeventloop} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after idle { incr x; testeventloop done }
-    testeventloop wait
-    set x
-} 1
-test winNotify-3.6 {NotifierProc: non-modal idle timer, rescheduled} {pcOnly testeventloop} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after idle { incr x; after idle {incr x; testeventloop done }}
-    testeventloop wait
-    set x
-} 2
-test winNotify-3.7 {NotifierProc: modal idle timer} {pcOnly} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    after idle { incr x }
-    vwait x
-    set x
-} 1
-test winNotify-3.8 {NotifierProc: modal idle timer, rescheduled} {pcOnly} {
-    update
-    set x 0
-    foreach i [after info] {
-	after cancel $i
-    }
-    set y 0
-    after idle { incr y; after idle {incr x}}
-    vwait x
-    list $x $y
-} {1 1}
-
-# Tcl_DoOneEvent is tested by the timer.test, io.test, and event.test files
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/winPipe.test b/tests/winPipe.test
deleted file mode 100644
index 2d23544..0000000
--- a/tests/winPipe.test
+++ /dev/null
@@ -1,413 +0,0 @@
-# 
-# winPipe.test --
-#
-# This file contains a collection of tests for tclWinPipe.c
-#
-# Sourcing this file into Tcl runs the tests and generates output for 
-# errors.  No output means no errors were found.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winPipe.test,v 1.6 1999/04/16 00:47:37 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-set bindir [file join [pwd] [file dirname [info nameofexecutable]]]
-set cat16 [file join  $bindir cat16.exe]
-set cat32 [file join $bindir cat32.exe]
-
-set ::tcltest::testConfig(cat32) [file exists $cat32]
-set ::tcltest::testConfig(cat16) [file exists $cat16]
-
-if {[catch {puts console1 ""}]} {
-    set ::tcltest::testConfig(AllocConsole) 1
-} else {
-    set ::tcltest::testConfig(.console) 1
-}
-
-set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n
-append big $big
-append big $big	
-append big $big
-append big $big
-append big $big
-append big $big
-
-set f [open "little" w] 
-puts -nonewline $f "little"
-close $f
-
-set f [open "big" w]
-puts -nonewline $f $big
-close $f
-
-proc contents {file} {
-    set f [open $file r]
-    set r [read $f]
-    close $f
-    set r
-}
-
-set f [open more w]
-puts $f {
-    while {[eof stdin] == 0} {
-	puts -nonewline [read stdin]
-    }
-}
-close $f
-
-test winpipe-1.1 {32 bit comprehensive tests: from little file} {pcOnly stdio cat32} {
-    exec $cat32 < little > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.2 {32 bit comprehensive tests: from big file} {pcOnly stdio cat32} {
-    exec $cat32 < big > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr32"
-test winpipe-1.3 {32 bit comprehensive tests: a little from pipe} {nt stdio cat32} {
-    exec $tcltest more < little | $cat32 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.4 {32 bit comprehensive tests: a lot from pipe} {nt stdio cat32} {
-    exec $tcltest more < big | $cat32 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr32"
-test winpipe-1.5 {32 bit comprehensive tests: a lot from pipe} {95 stdio cat32} {
-    exec command /c type big |& $cat32 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr32"
-test winpipe-1.6 {32 bit comprehensive tests: from console} \
-	{pcOnly stdio cat32 AllocConsole} {
-    # would block waiting for human input
-} {}
-test winpipe-1.7 {32 bit comprehensive tests: from NUL} {pcOnly stdio cat32} {
-    exec $cat32 < nul > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {{} stderr32}
-test winpipe-1.8 {32 bit comprehensive tests: from socket} {pcOnly stdio cat32} {
-    # doesn't work
-} {}
-test winpipe-1.9 {32 bit comprehensive tests: from nowhere} \
-	{pcOnly stdio cat32 .console} {
-    exec $cat32 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {{} stderr32}
-test winpipe-1.10 {32 bit comprehensive tests: from file handle} \
-	{pcOnly stdio cat32} {
-    set f [open "little" r]
-    exec $cat32 <@$f > stdout 2> stderr
-    close $f
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.11 {32 bit comprehensive tests: read from application} \
-	{pcOnly stdio cat32} {
-    set f [open "|$cat32 < little" r]
-    gets $f line
-    catch {close $f} msg
-    list $line $msg
-} {little stderr32}
-test winpipe-1.12 {32 bit comprehensive tests: a little to file} \
-	{pcOnly stdio cat32} {
-    exec $cat32 < little > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.13 {32 bit comprehensive tests: a lot to file} \
-	{pcOnly stdio cat32} {
-    exec $cat32 < big > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr32"
-test winpipe-1.14 {32 bit comprehensive tests: a little to pipe} \
-	{pcOnly stdio cat32} {
-    exec $cat32 < little | $tcltest more > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.15 {32 bit comprehensive tests: a lot to pipe} \
-	{pcOnly stdio cat32} {
-    exec $cat32 < big | $tcltest more > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr32"
-test winpipe-1.16 {32 bit comprehensive tests: to console} {pcOnly stdio cat32} {
-    catch {exec $cat32 << "You should see this\n" >@stdout} msg
-    set msg
-} stderr32
-test winpipe-1.17 {32 bit comprehensive tests: to NUL} {pcOnly stdio cat32} {
-    # some apps hang when sending a large amount to NUL.  $cat32 isn't one.
-    catch {exec $cat32 < big > nul} msg
-    set msg
-} stderr32
-test winpipe-1.18 {32 bit comprehensive tests: to nowhere} \
-	{pcOnly stdio cat32 .console} {
-    exec $cat32 < big >&@stdout 
-} {}
-test winpipe-1.19 {32 bit comprehensive tests: to file handle} {pcOnly stdio cat32} {
-    set f1 [open "stdout" w]
-    set f2 [open "stderr" w]
-    exec $cat32 < little >@$f1 2>@$f2
-    close $f1
-    close $f2
-    list [contents stdout] [contents stderr]
-} {little stderr32}
-test winpipe-1.20 {32 bit comprehensive tests: write to application} \
-	{pcOnly stdio cat32} {
-    set f [open "|$cat32 > stdout" w]
-    puts -nonewline $f "foo"
-    catch {close $f} msg
-    list [contents stdout] $msg
-} {foo stderr32}
-test winpipe-1.21 {32 bit comprehensive tests: read/write application} \
-	{pcOnly stdio cat32} {
-    set f [open "|$cat32" r+]
-    puts $f $big
-    puts $f \032
-    flush $f
-    set r [read $f 64]
-    catch {close $f}
-    set r
-} "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-
-
-test winpipe-2.1 {16 bit comprehensive tests: from little file} {pcOnly stdio cat16} {
-    exec $cat16 < little > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "little stderr16"
-test winpipe-2.2 {16 bit comprehensive tests: from big file} {pcOnly stdio cat16} {
-    exec $cat16 < big > stdout 2> stderr
-    list [contents stdout] [contents stderr] 
-} "{$big} stderr16"
-test winpipe-2.3 {16 bit comprehensive tests: a little from pipe} {pcOnly stdio cat16} {
-    exec $tcltest more < little | $cat16 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr16}
-test winpipe-2.4 {16 bit comprehensive tests: a lot from pipe} {nt stdio cat16} {
-    exec $cat16 < big | $cat16 > stdout 2> stderr
-    list [contents stdout] [contents stderr] 
-} "{$big} stderr16stderr16"
-test winpipe-2.5 {16 bit comprehensive tests: a lot from pipe} {95 stdio cat16} {
-    exec $tcltest more < big | $cat16 > stdout 2> stderr
-    list [contents stdout] [contents stderr] 
-} "{$big} stderr16"
-test winpipe-2.6 {16 bit comprehensive tests: from console} \
-	{pcOnly stdio cat16 AllocConsole} {
-    # would block waiting for human input
-} {}		     
-test winpipe-2.7 {16 bit comprehensive tests: from NUL} {nt stdio cat16} {
-    exec $cat16 < nul > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{} stderr16"
-test winpipe-2.8 {16 bit comprehensive tests: from socket} {pcOnly stdio cat16} {
-    # doesn't work
-} {}
-test winpipe-2.9 {16 bit comprehensive tests: from nowhere} {pcOnly stdio cat16 .console} {
-    exec $cat16 > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{} stderr16"
-test winpipe-2.10 {16 bit comprehensive tests: from file handle} {pcOnly stdio cat16} {
-    set f [open "little" r]
-    exec $cat16 <@$f > stdout 2> stderr
-    close $f
-    list [contents stdout] [contents stderr]
-} "little stderr16"
-test winpipe-2.11 {16 bit comprehensive tests: read from application} {pcOnly stdio cat16} {
-    set f [open "|$cat16 < little" r]
-    gets $f line
-    catch {close $f} msg
-    list $line $msg
-} "little stderr16"
-test winpipe-2.12 {16 bit comprehensive tests: a little to file} {pcOnly stdio cat16} {
-    exec $cat16 < little > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "little stderr16"
-test winpipe-2.13 {16 bit comprehensive tests: a lot to file} {pcOnly stdio cat16} {
-    exec $cat16 < big > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr16"
-test winpipe-2.14 {16 bit comprehensive tests: a little to pipe} {pcOnly stdio cat16} {
-    exec $cat16 < little | $tcltest more > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} {little stderr16}
-test winpipe-2.15 {16 bit comprehensive tests: a lot to pipe} {pcOnly stdio cat16} {
-    exec $cat16 < big | $tcltest more > stdout 2> stderr
-    list [contents stdout] [contents stderr]
-} "{$big} stderr16"
-test winpipe-2.16 {16 bit comprehensive tests: to console} {pcOnly stdio cat16} {
-    catch {exec $cat16 << "You should see this\n" >@stdout} msg
-    set msg
-} [lindex stderr16 0]
-test winpipe-2.17 {16 bit comprehensive tests: to NUL} {nt stdio cat16} {
-    # some apps hang when sending a large amount to NUL.  cat16 isn't one.
-    catch {exec $cat16 < big > nul} msg
-    set msg
-} stderr16
-test winpipe-2.18 {16 bit comprehensive tests: to nowhere} {pcOnly stdio cat16 .console} {
-    exec $cat16 < big >&@stdout 
-} {}
-test winpipe-2.19 {16 bit comprehensive tests: to file handle} {pcOnly stdio cat16} {
-    set f1 [open "stdout" w]
-    set f2 [open "stderr" w]
-    exec $cat16 < little >@$f1 2>@$f2
-    close $f1
-    close $f2
-    list [contents stdout] [contents stderr]
-} "little stderr16"
-test winpipe-2.20 {16 bit comprehensive tests: write to application} {pcOnly stdio cat16} {
-    set f [open "|$cat16 > stdout" w]
-    puts -nonewline $f "foo"
-    catch {close $f} msg
-    list [contents stdout] $msg
-} "foo stderr16"
-test winpipe-2.21 {16 bit comprehensive tests: read/write application} {nt stdio cat16} {
-    set f [open "|$cat16" r+]
-    puts $f $big
-    puts $f \032
-    flush $f
-    set r [read $f 64]
-    catch {close $f}
-    set r
-} "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-file delete more
-
-test winpipe-4.1 {Tcl_WaitPid} {nt stdio} {
-    proc readResults {f} {
-	global x result
-	if { [eof $f] } {
-	    close $f
-	    set x 1
-	} else {
-	    set line [read $f ]
-	    set result "$result$line"
-	}
-    }
-
-    set f [open "|$cat32 < big 2> stderr" r]
-    fconfigure $f  -buffering none -blocking 0
-    fileevent $f readable "readResults $f"
-    set x 0
-    set result ""
-    vwait x
-    list $result $x [contents stderr]
-} "{$big} 1 stderr32"
-
-close [open nothing w]
-
-catch {set env_tmp $env(TMP)}
-catch {set env_temp $env(TEMP)}
-
-set env(TMP) c:/
-set env(TEMP) c:/
-
-test winpipe-4.1 {TclpCreateTempFile: cleanup temp files} {pcOnly stdio} {
-    set x {}
-    set existing [glob -nocomplain c:/tcl*.tmp]
-    exec $tcltest < nothing 
-    foreach p [glob -nocomplain c:/tcl*.tmp] {
-	if {[lsearch $existing $p] == -1} {
-	    lappend x $p
-	}
-    }
-    set x
-} {}
-test winpipe-4.2 {TclpCreateTempFile: TMP and TEMP not defined} {pcOnly stdio} {
-    set tmp $env(TMP)
-    set temp $env(TEMP)
-    unset env(TMP)
-    unset env(TEMP)
-    exec $tcltest < nothing
-    set env(TMP) $tmp
-    set env(TEMP) $temp
-    set x {}
-} {}
-test winpipe-4.3 {TclpCreateTempFile: TMP specifies non-existent directory} \
-	{pcOnly stdio} {
-    set tmp $env(TMP)
-    set env(TMP) snarky
-    exec $tcltest < nothing
-    set env(TMP) $tmp
-    set x {}
-} {}
-test winpipe-4.4 {TclpCreateTempFile: TEMP specifies non-existent directory} \
-	{pcOnly stdio} {
-    set tmp $env(TMP)
-    set temp $env(TEMP)
-    unset env(TMP)
-    set env(TEMP) snarky
-    exec $tcltest < nothing
-    set env(TMP) $tmp
-    set env(TEMP) $temp
-    set x {}
-} {}
-
-test winpipe-5.1 {PipeSetupProc & PipeCheckProc: read threads} \
-	{pcOnly stdio cat32} {
-    set f [open "|$cat32" r+]
-    fconfigure $f -blocking 0
-    fileevent $f writable { set x writable }
-    set x {}
-    vwait x
-    fileevent $f writable {}
-    fileevent $f readable { lappend x readable }
-    after 100 { lappend x timeout }
-    vwait x
-    puts $f foobar
-    flush $f
-    vwait x
-    lappend x [read $f]
-    after 100 { lappend x timeout }
-    vwait x
-    lappend x [catch {close $f} msg] $msg
-} {writable timeout readable {foobar
-} timeout 1 stderr32}
-test winpipe-5.2 {PipeSetupProc & PipeCheckProc: write threads} \
-	{pcOnly stdio cat32} {
-    set f [open "|$cat32" r+]
-    fconfigure $f -blocking 0
-    fileevent $f writable { set x writable }
-    set x {}
-    vwait x
-    puts -nonewline $f $big$big$big$big
-    flush $f
-    after 100 { lappend x timeout }
-    vwait x
-    lappend x [catch {close $f} msg] $msg
-} {writable timeout 0 {}}
-
-makeFile {
-    puts "[list $argv0 $argv]"
-} echoArgs.tcl
-
-test winpipe-4.1 {BuildCommandLine: null arguments} {pcOnly stdio} {
-    exec $tcltest echoArgs.tcl foo "" bar
-} {echoArgs.tcl {foo {} bar}}
-test winpipe-4.1 {BuildCommandLine: null arguments} {pcOnly stdio} {
-    exec $tcltest echoArgs.tcl foo \" bar
-} {echoArgs.tcl {foo {"} bar}}
-
-# restore old values for env(TMP) and env(TEMP)
-
-if {[catch {set env(TMP) $env_tmp}]} {
-    unset env(TMP)
-}
-if {[catch {set env(TEMP) $env_temp}]} {
-    unset env(TEMP)
-}
-
-# cleanup
-file delete big little stdout stderr nothing echoArgs.tcl
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/winTime.test b/tests/winTime.test
deleted file mode 100644
index 417f4bc..0000000
--- a/tests/winTime.test
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file tests the tclWinTime.c file.
-#
-# This file contains a collection of tests for one or more of the Tcl
-# built-in commands.  Sourcing this file into Tcl runs the tests and
-# generates output for errors.  No output means no errors were found.
-#
-# Copyright (c) 1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: winTime.test,v 1.2 1999/04/16 00:47:37 stanton Exp $
-
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-# The next two tests will crash on Windows if the check for negative
-# clock values is not done properly.
-
-test winTime-1.1 {TclpGetDate} {pcOnly} {
-    set ::env(TZ) JST-9
-    set result [clock format -1 -format %Y]
-    unset ::env(TZ)
-    set result
-} {1970}
-test winTime-1.2 {TclpGetDate} {pcOnly} {
-    set ::env(TZ) PST8
-    set result [clock format 1 -format %Y]
-    unset ::env(TZ)
-    set result
-} {1969}
-
-# cleanup
-::tcltest::cleanupTests
-return
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tools/Makefile.in b/tools/Makefile.in
deleted file mode 100644
index b44ace0..0000000
--- a/tools/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# This makefile is used to convert Tcl manual pages into various
-# alternate formats:
-#
-#    Windows help file:  1. Build the winhelp target on Unix
-#			 2. Build the helpfile target on Windows
-#
-#    HTML:		 1. Build the html target on Unix
-
-# RCS: @(#) $Id: Makefile.in,v 1.7 1999/02/19 02:14:56 stanton Exp $
-
-TCL = tcl@TCL_VERSION@
-TK = tk@TCL_VERSION@
-VER=@TCL_WIN_VERSION@
-
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_SOURCE = @TCL_SRC_DIR@
-TK_SOURCE = $(TCL_SOURCE)/../$(TK)
-PRO_SOURCE = $(TCL_SOURCE)/../pro
-ITCL_SOURCE = $(TCL_SOURCE)/../itcl3.0.1
-
-TCL_DOCS = \
-	$(TCL_SOURCE)/doc/*.[13n]
-
-TK_DOCS = \
-	$(TK_SOURCE)/doc/*.[13n]
-
-PRO_DOCS = \
-	$(PRO_SOURCE)/doc/man/*.[13n]
-
-ITCL_DOCS = \
-	$(ITCL_SOURCE)/itcl/doc/*.[13n] \
-	$(ITCL_SOURCE)/itk/doc/*.[13n]
-
-#	$(ITCL_SOURCE)/iwidgets3.0.0/doc/*.[13n]
-
-COREDOCS = $(TCL_DOCS) $(TK_DOCS) 
-PRODOCS = $(COREDOCS) $(PRO_DOCS) $(ITCL_DOCS)
-TCLSH = $(TCL_BIN_DIR)/tclsh
-CC=@CC@
-
-all: core
-
-pro:
-	$(MAKE) DOCS="$(PRODOCS)" VER="" rtf
-
-core:
-	$(MAKE) DOCS="$(COREDOCS)" rtf
-
-rtf: $(TCL_SOURCE)/tools/man2help.tcl man2tcl $(DOCS)
-	LD_LIBRARY_PATH=$(TCL_BIN_DIR) \
-	TCL_LIBRARY=$(TCL_SOURCE)/library \
-	$(TCLSH) $(TCL_SOURCE)/tools/man2help.tcl tcl "$(VER)" $(DOCS)
-
-winhelp: tcl.rtf
-
-man2tcl: $(TCL_SOURCE)/tools/man2tcl.c
-	$(CC) $(CFLAGS) -o man2tcl $(TCL_SOURCE)/tools/man2tcl.c
-
-clean:
-	-rm -f man2tcl *.o *.cnt *.rtf
-
-helpfile:
-	hcw /c /e tcl.hpj
diff --git a/tools/README b/tools/README
deleted file mode 100644
index 67cac12..0000000
--- a/tools/README
+++ /dev/null
@@ -1,4 +0,0 @@
-
- This directory contains unsupported tools that are used
- during the release engineering process.
-
diff --git a/tools/checkLibraryDoc.tcl b/tools/checkLibraryDoc.tcl
deleted file mode 100755
index ad0d1c7..0000000
--- a/tools/checkLibraryDoc.tcl
+++ /dev/null
@@ -1,242 +0,0 @@
-# checkLibraryDoc.tcl --
-#
-# This script attempts to determine what APIs exist in the source base that 
-# have not been documented.  By grepping through all of the doc/*.3 man 
-# pages, looking for "Pkg_*" (e.g., Tcl_ or Tk_), and comparing this list
-# against the list of Pkg_ APIs found in the source (e.g., tcl8.1/*/*.[ch])
-# we create six lists:
-#      1) APIs in Source not in Docs.
-#      2) APIs in Docs not in Source.
-#      3) Internal APIs and structs.
-#      4) Misc APIs and structs that we are not documenting.
-#      5) Command APIs (e.g., Tcl_ArrayObjCmd.)
-#      6) Proc pointers (e.g., Tcl_CloseProc.)
-# 
-# Note: Each list is "a best guess" approximation.  If developers write
-# non-standard code, this script will produce erroneous results.  Each
-# list should be carefully checked for accuracy. 
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: checkLibraryDoc.tcl,v 1.2 1999/04/16 00:47:38 stanton Exp $
-
-
-#lappend auto_path "c:/program\ files/tclpro1.2/win32-ix86/bin"
-if {[catch {package require Tclx}]} {
-    puts "error: could not load TclX.  Please set TCL_LIBRARY."
-    exit 1
-}
-
-# A list of structs that are known to be undocumented.
-
-set StructList {
-    Tcl_AsyncHandler \
-    Tcl_CallFrame \
-    Tcl_Condition \
-    Tcl_Encoding \
-    Tcl_EncodingState \
-    Tcl_EncodingType \
-    Tcl_EolTranslation \
-    Tcl_HashEntry \
-    Tcl_HashSearch \
-    Tcl_HashTable \
-    Tcl_Mutex \
-    Tcl_Pid \
-    Tcl_QueuePosition \
-    Tcl_ResolvedVarInfo \
-    Tcl_SavedResult \
-    Tcl_ThreadDataKey \
-    Tcl_ThreadId \
-    Tcl_Time \
-    Tcl_TimerToken \
-    Tcl_Token \
-    Tcl_Trace \
-    Tcl_Value \
-    Tcl_ValueType \
-    Tcl_Var \
-}
-
-# Misc junk that appears in the comments of the source.  This just 
-# allows us to filter comments that "fool" the script.
-
-set CommentList {
-    Tcl_Create\[Obj\]Command \
-    Tcl_DecrRefCount\\n \
-    Tcl_NewObj\\n \
-}
-
-# Main entry point to this script.
-
-proc main {} {
-    global argv0 
-    global argv 
-
-    set len [llength $argv]
-    if {($len != 2) && ($len != 3)} {
-	puts "usage: $argv0 pkgName pkgDir \[outFile\]"
-	puts "   pkgName == Tcl,Tk"
-	puts "   pkgDir  == /home/surles/cvs/tcl8.1"
-	exit 1
-    }
-
-    set pkg [lindex $argv 0]
-    set dir [lindex $argv 1]
-    if {[llength $argv] == 3} {
-	set file [open [lindex $argv 2] w]
-    } else {
-	set file stdout
-    }
-
-    foreach {c d} [compare [grepCode $dir $pkg] [grepDocs $dir $pkg]] {}
-    filter $c $d $dir $pkg $file
-
-    if {$file != "stdout"} {
-	close $file
-    }
-    return
-}
-    
-# Intersect the two list and write out the sets of APIs in one
-# list that is not in the other.
-
-proc compare {list1 list2} {
-    set inter [intersect3 $list1 $list2]
-    return [list [lindex $inter 0] [lindex $inter 2]]
-}
-
-# Filter the lists into the six lists we report on.  Then write
-# the results to the file.
-
-proc filter {code docs dir pkg {outFile stdout}} {
-    # A list of Tcl command APIs.  These are not documented.
-    # This list should just be verified for accuracy.
-
-    set cmds  {}
-    
-    # A list of proc pointer structs.  These are not documented.
-    # This list should just be verified for accuracy.
-
-    set procs {}
-
-    # A list of internal declarations.  These are not documented.
-    # This list should just be verified for accuracy.
-
-    set decls [grepDecl $dir $pkg]
-
-    # A list of misc. procedure declarations that are not documented.
-    # This list should just be verified for accuracy.
-
-    set misc [grepMisc $dir $pkg]
-
-    # A list of APIs in the source, not in the docs.
-    # This list should just be verified for accuracy.
-
-    foreach x $code {
-	if {[string match *Cmd $x]} {
-	    lappend cmds $x
-	} elseif {[string match *Proc $x]} {
-	    lappend procs $x
-	} elseif {[lsearch -exact $decls $x] >= 0} {
-	    # No Op.
-	} elseif {[lsearch -exact $misc $x] >= 0} {
-	    # No Op.
-	} else {
-	    lappend apis $x
-	}
-    }
-
-    dump $apis  "APIs in Source not in Docs." $outFile
-    dump $docs  "APIs in Docs not in Source." $outFile
-    dump $decls "Internal APIs and structs."  $outFile
-    dump $misc  "Misc APIs and structs that we are not documenting." $outFile
-    dump $cmds  "Command APIs."  $outFile
-    dump $procs "Proc pointers." $outFile
-    return
-}
-
-# Print the list of APIs if the list is not null.
-
-proc dump {list title file} {
-    if {$list != {}} {
-	puts $file ""
-	puts $file $title
-	puts $file "---------------------------------------------------------"
-	foreach x $list {
-	    puts $file $x
-	}
-    }
-}
-
-# Grep into "dir/*/*.[ch]" looking for APIs that match $pkg_*.
-# (e.g., Tcl_Exit).  Return a list of APIs.
-
-proc grepCode {dir pkg} {
-    set apis [exec grep "${pkg}_\.\*" "${dir}/\*/\*\.\[ch\]" | cat]
-    set pat1 ".*(Tcl_\[A-z0-9]+).*$"
- 
-    foreach a [split $apis "\n"] {
-	if {[regexp --  $pat1 $a main n1]} {
-	    set result([string trim $n1]) 1
-	}
-    }
-    return [lsort [array names result]]
-}
-
-# Grep into "dir/doc/*.3" looking for APIs that match $pkg_*.
-# (e.g., Tcl_Exit).  Return a list of APIs.
-
-proc grepDocs {dir pkg} {
-    set apis [exec grep "\\fB${pkg}_\.\*\\fR" "${dir}/doc/\*\.3" | cat]
-    set pat1 ".*(Tcl_\[A-z0-9]+).*$"
-
-    foreach a $apis {
-	if {[regexp -- $pat1 $a main n1]} {
-	    set result([string trim $n1]) 1
-	}
-    }
-    return [lsort [array names result]]
-}
-
-# Grep into "generic/pkgIntDecls.h" looking for APIs that match $pkg_*.
-# (e.g., Tcl_Export).  Return a list of APIs.
-
-proc grepDecl {dir pkg} {
-    set file [file join $dir generic "[string tolower $pkg]IntDecls.h"] 
-    set apis [exec grep "^EXTERN.*\[ \t\]Tcl_.*" $file | cat]
-    set pat1 ".*(Tcl_\[A-z0-9]+).*$"
-
-    foreach a $apis {
-	if {[regexp -- $pat1 $a main n1]} {
-	    set result([string trim $n1]) 1
-	}
-    }
-    return [lsort [array names result]]
-}
-
-# Grep into "*/*.[ch]" looking for APIs that match $pkg_Db*.
-# (e.g., Tcl_DbCkalloc).  Return a list of APIs.
-
-proc grepMisc {dir pkg} {
-    global CommentList
-    global StructList
-    
-    set apis [exec grep "^EXTERN.*\[ \t\]Tcl_Db.*" "${dir}/\*/\*\.\[ch\]" \
-	    | cat]
-    set pat1 ".*(Tcl_\[A-z0-9]+).*$"
-
-    foreach a $apis {
-	if {[regexp -- $pat1 $a main n1]} {
-	    set dbg([string trim $n1]) 1
-	}
-    }
-
-    set result {}
-    eval {lappend result} $StructList
-    eval {lappend result} [lsort [array names dbg]]
-    eval {lappend result} $CommentList
-    return $result
-}
-
-main
-
diff --git a/tools/configure.in b/tools/configure.in
deleted file mode 100644
index 147b99e..0000000
--- a/tools/configure.in
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl	This file is an input file used by the GNU "autoconf" program to
-dnl	generate the file "configure", which is run to configure the
-dnl	Makefile in this directory.
-AC_INIT(man2tcl.c)
-# RCS: @(#) $Id: configure.in,v 1.5 1999/04/16 00:47:38 stanton Exp $
-
-# Recover information that Tcl computed with its configure script.
-
-#--------------------------------------------------------------------
-#       See if there was a command-line option for where Tcl is;  if
-#       not, assume that its top-level directory is a sibling of ours.
-#--------------------------------------------------------------------
-
-AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.1 binaries from DIR], TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl8.1$TCL_PATCH_LEVEL/unix; pwd`)
-if test ! -d $TCL_BIN_DIR; then
-    AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
-fi
-if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
-    AC_MSG_ERROR(There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?)
-fi
-
-. $TCL_BIN_DIR/tclConfig.sh
-
-TCL_WIN_VERSION=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
-AC_SUBST(TCL_WIN_VERSION)
-CC=$TCL_CC
-AC_SUBST(CC)
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_PATCH_LEVEL)
-AC_SUBST(TCL_SRC_DIR)
-AC_SUBST(TCL_BIN_DIR)
-
-AC_OUTPUT(Makefile)
-AC_OUTPUT(tcl.hpj)
diff --git a/tools/cvtEOL.tcl b/tools/cvtEOL.tcl
deleted file mode 100644
index e2df341..0000000
--- a/tools/cvtEOL.tcl
+++ /dev/null
@@ -1,35 +0,0 @@
-# cvtEOL.tcl --
-#
-# This file contains a script to parse a Tcl/Tk distribution and
-# convert the EOL from \n to \r on all text files.
-#
-# Copyright (c) 1996-1997 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) cvtEOL.tcl 1.1 97/01/30 11:33:33
-#
-
-#
-# Convert files in the distribution to Mac style
-#
-
-set distDir [lindex $argv 0]
-
-set dirs {unix mac generic win library compat tests unix/dltest \
-	  library/demos library/demos/images bitmaps xlib xlib/X11 .}
-set files {*.c *.y *.h *.r *.tcl *.test *.rc *.bc *.vc *.bmp *.html \
-	   *.in *.notes *.terms all defs \
-	   README ToDo changes tclIndex configure install-sh mkLinks \
-	   square widget rmt ixset hello browse rolodex tcolor timer}
-
-foreach x $dirs {
-  if [catch {cd $distDir/$x}] continue
-  puts "Working on $x..."
-  foreach y [eval glob $files] {
-    exec chmod 666 $y
-    exec cp $y $y.tmp
-    exec tr \012 \015 < $y.tmp > $y
-    exec chmod 444 $y
-    exec rm $y.tmp
-  }
-}
-
diff --git a/tools/encoding/Makefile b/tools/encoding/Makefile
deleted file mode 100644
index 4c10673..0000000
--- a/tools/encoding/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# This file is a Makefile to compile all the encoding files.  
-#
-# Run "make" to compile all the encoding files (*.txt,*.esc) into the
-# format that Tcl can use (*.enc).  It is your responsibility to move the
-# encoding files to the appropriate place ($TCL_ROOT/library/encoding
-#
-# The .txt files in this directory come from the Unicode CD and are covered
-# by the following copyright notice:
-#
-#---------------------------------------------------------------------------
-#
-# Copyright (c) 1996 Unicode, Inc.  All Rights reserved.
-#
-# This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-# No claims are made as to fitness for any particular purpose.  No
-# warranties of any kind are expressed or implied.  The recipient
-# agrees to determine applicability of information provided.  If this
-# file has been provided on magnetic media by Unicode, Inc., the sole
-# remedy for any claim will be exchange of defective media within 90
-# days of receipt.
-#
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode.  Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
-#
-# In other words:  Don't put this file on the Internet.  People who want to 
-# get it over the Internet should do so directly from ftp://unicode.org.  They
-# can therefore be assured of getting the most recent and accurate version.
-#
-#----------------------------------------------------------------------------
-#
-# The txt2enc program built by this makefile is used to compile individual
-# .txt files into .enc files, the format that Tcl understands for encoding 
-# files.  This compilation to a different format is allowed by the above
-# restriction. 
-#
-# The files shiftjis.txt and jis0208.txt were modified from the original
-# ones provided on the Unicode CD.  The double-width backslash character
-# 0x815F in these two Japanese encodings was being mapped to Unicode 005C
-# (REVERSE SOLIDUS), the normal backslash character.  They have been
-# changed to map 0x815F to Unicode FF3C (FULLWIDTH REVERSE SOLIDUS) and let
-# the regular backslash character map to itself.  This follows how cp932
-# behaves.
-#
-# Copyright (c) 1998 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# SCCS: @(#) Makefile 1.1 98/01/28 11:41:36
-#
-
-EUC_ENCODINGS = euc-cn.txt euc-kr.txt euc-jp.txt 
-
-encodings: clean txt2enc $(EUC_ENCODINGS)
-	@echo Compiling encoding files.
-	@for p in *.esc; do \
-	    base=`echo $$p | sed 's/\..*$$//'`; \
-	    echo $$base.enc; \
-	    echo "# Encoding file: $$base, escape-driven" > $$base.enc; \
-	    echo "E" >> $$base.enc; \
-	    cat $$p >> $$base.enc; \
-	done
-	@for p in *.txt; do \
-	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
-	    echo $$enc; \
-	    ./txt2enc -e 0 -u 1 $$p > $$enc; \
-	done
-	@echo 
-	@echo Compiling special versions of encoding files.
-	@for p in ascii.txt; do \
-	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
-	    echo $$enc; \
-	    ./txt2enc -m $$p > $$enc; \
-	done
-	@for p in jis0208.txt; do \
-	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
-	    echo $$enc; \
-	    ./txt2enc -e 1 -u 2 $$p > $$enc; \
-	done
-	@for p in symbol.txt dingbats.txt macDingbats.txt; do \
-	    enc=`echo $$p | sed 's/\..*$$/\.enc/'`; \
-	    echo $$enc; \
-	    ./txt2enc -e 0 -u 1 -s $$p > $$enc; \
-	done
-
-clean:
-	@rm -f txt2enc *.enc $(EUC_ENCODINGS)
-
-txt2enc: txt2enc.c
-	@gcc -o txt2enc txt2enc.c
-
-euc-jp.txt: ascii.txt jis0208.txt Makefile
-	@echo Building euc-jp.txt from components.
-	@cat ascii.txt > euc-jp.txt
-	@grep '^0x[A-F]' jis0201.txt | sed 's/0x/0x8E/' >> euc-jp.txt
-	@cat jis0208.txt | awk 'BEGIN {print "ibase=16"} index($$1,"#") != 1 {print substr($$2,3) "+" 8080; print substr($$3,3)}' | bc | awk '{ str = $$1; getline; printf "0x%04x 0x%04x\n", str, $$0}' >> euc-jp.txt
-
-euc-kr.txt: ascii.txt ksc5601.txt Makefile
-	@echo Building euc-kr.txt from components.
-	@cat ascii.txt > euc-kr.txt
-	@cat ksc5601.txt | awk 'BEGIN {print "ibase=16"} index($$1,"#") != 1 {print substr($$1,3) "+" 8080; print substr($$2,3)}' | bc | awk '{ str = $$1; getline; printf "0x%04x 0x%04x\n", str, $$0}' >> euc-kr.txt
-
-euc-cn.txt: ascii.txt gb2312.txt Makefile
-	@echo Building euc-cn.txt from components.
-	@cat ascii.txt > euc-cn.txt
-	@cat gb2312.txt | awk 'BEGIN {print "ibase=16"} index($$1,"#") != 1 {print substr($$1,3) "+" 8080; print substr($$2,3)}' | bc | awk '{ str = $$1; getline; printf "0x%04x 0x%04x\n", str, $$0}' >> euc-cn.txt
diff --git a/tools/encoding/README b/tools/encoding/README
deleted file mode 100644
index 65b0a91..0000000
--- a/tools/encoding/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Use "make" to compile all the encoding files (*.txt,*.esc) into the format
-that Tcl can use (*.enc).  It is the caller's responsibility to move the
-generated .enc files to the appropriate place (the $TCL_LIBRARY/encoding
-directory).
-
diff --git a/tools/encoding/ascii.txt b/tools/encoding/ascii.txt
deleted file mode 100644
index 66ba6f3..0000000
--- a/tools/encoding/ascii.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
diff --git a/tools/encoding/big5.txt b/tools/encoding/big5.txt
deleted file mode 100644
index 33e5226..0000000
--- a/tools/encoding/big5.txt
+++ /dev/null
@@ -1,13906 +0,0 @@
-# big5.txt --
-#
-#	BIG5 to Unicode table (modified)
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: big5.txt,v 1.2 1999/04/16 00:47:43 stanton Exp $
-#
-# NOTE: this table has been modified to include the 7-bit ASCII
-# characters that are allowed in BIG5 files.
-#
-#
-#	Name:             BIG5 to Unicode table (complete)
-#	Unicode version:  1.1
-#	Table version:    0.0d3
-#	Table format:     Format A
-#	Date:             11 February 1994
-#	Authors:          Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       BIG5 characters map into Unicode.
-#
-#	WARNING!  It is currently impossible to provide round-trip compatibility
-#		between BIG5 and Unicode.  
-#
-#	A number of characters are not currently mapped because
-#		of conflicts with other mappings.  They are as follows:
-#
-#       BIG5        Description                    Comments
-#
-#       0xA15A      SPACING UNDERSCORE             duplicates A1C4
-#       0xA1C3      SPACING HEAVY OVERSCORE        not in Unicode
-#       0xA1C5      SPACING HEAVY UNDERSCORE       not in Unicode
-#       0xA1FE      LT DIAG UP RIGHT TO LOW LEFT   duplicates A2AC
-#       0xA240      LT DIAG UP LEFT TO LOW RIGHT   duplicates A2AD
-#       0xA2CC      HANGZHOU NUMERAL TEN           conflicts with A451 mapping
-#       0xA2CE      HANGZHOU NUMERAL THIRTY        conflicts with A4CA mapping
-#
-#	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
-#		It is also possible to map these characters to their duplicates, or to
-#		the user zone.  
-#	
-#	Notes:
-#
-#	1. In addition to the above, there is some uncertainty about the
-#       mappings in the range C6A1 - C8FE, and F9DD - F9FE.  The ETEN
-#		version of BIG5 organizes the former range differently, and adds
-#		additional characters in the latter range.  The correct mappings
-#		these ranges need to be determined.
-#
-#	2.  There is an uncertainty in the mapping of the Big Five character
-#		0xA3BC.  This character occurs within the Big Five block of tone marks
-#		for bopomofo and is intended to be the tone mark for the first tone in
-#		Mandarin Chinese.  We have selected the mapping U+02C9 MODIFIER LETTER
-#		MACRON (Mandarin Chinese first tone) to reflect this semantic.  
-#		However, because bopomofo uses the absense of a tone mark to indicate
-#		the first Mandarin tone, most implementations of Big Five represent
-#		this character with a blank space, and so a mapping such as U+2003 EM SPACE
-#		might be preferred.  
-#		
-#			
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the BIG5 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3  is the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in BIG5 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS (rendered as Halfwidth Yen Sign)
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-0xA140	0x3000	# IDEOGRAPHIC SPACE
-0xA141	0xFF0C	# FULLWIDTH COMMA
-0xA142	0x3001	# IDEOGRAPHIC COMMA
-0xA143	0x3002	# IDEOGRAPHIC FULL STOP
-0xA144	0xFF0E	# FULLWIDTH FULL STOP
-0xA145	0x2022	# BULLET
-0xA146	0xFF1B	# FULLWIDTH SEMICOLON
-0xA147	0xFF1A	# FULLWIDTH COLON
-0xA148	0xFF1F	# FULLWIDTH QUESTION MARK
-0xA149	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0xA14A	0xFE30	# PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
-0xA14B	0x2026	# HORIZONTAL ELLIPSIS
-0xA14C	0x2025	# TWO DOT LEADER
-0xA14D	0xFE50	# SMALL COMMA
-0xA14E	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
-0xA14F	0xFE52	# SMALL FULL STOP
-0xA150	0x00B7	# MIDDLE DOT
-0xA151	0xFE54	# SMALL SEMICOLON
-0xA152	0xFE55	# SMALL COLON
-0xA153	0xFE56	# SMALL QUESTION MARK
-0xA154	0xFE57	# SMALL EXCLAMATION MARK
-0xA155	0xFF5C	# FULLWIDTH VERTICAL BAR
-0xA156	0x2013	# EN DASH
-0xA157	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH
-0xA158	0x2014	# EM DASH
-0xA159	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE
-0xA15A	0xFFFD	# *** NO MAPPING ***
-0xA15B	0xFE34	# PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
-0xA15C	0xFE4F	# WAVY LOW LINE
-0xA15D	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0xA15E	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0xA15F	0xFE35	# PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
-0xA160	0xFE36	# PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
-0xA161	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0xA162	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0xA163	0xFE37	# PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
-0xA164	0xFE38	# PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
-0xA165	0x3014	# LEFT TORTOISE SHELL BRACKET
-0xA166	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0xA167	0xFE39	# PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
-0xA168	0xFE3A	# PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
-0xA169	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0xA16A	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0xA16B	0xFE3B	# PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
-0xA16C	0xFE3C	# PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
-0xA16D	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0xA16E	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0xA16F	0xFE3D	# PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
-0xA170	0xFE3E	# PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
-0xA171	0x3008	# LEFT ANGLE BRACKET
-0xA172	0x3009	# RIGHT ANGLE BRACKET
-0xA173	0xFE3F	# PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
-0xA174	0xFE40	# PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
-0xA175	0x300C	# LEFT CORNER BRACKET
-0xA176	0x300D	# RIGHT CORNER BRACKET
-0xA177	0xFE41	# PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
-0xA178	0xFE42	# PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
-0xA179	0x300E	# LEFT WHITE CORNER BRACKET
-0xA17A	0x300F	# RIGHT WHITE CORNER BRACKET
-0xA17B	0xFE43	# PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
-0xA17C	0xFE44	# PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
-0xA17D	0xFE59	# SMALL LEFT PARENTHESIS
-0xA17E	0xFE5A	# SMALL RIGHT PARENTHESIS
-0xA1A1	0xFE5B	# SMALL LEFT CURLY BRACKET
-0xA1A2	0xFE5C	# SMALL RIGHT CURLY BRACKET
-0xA1A3	0xFE5D	# SMALL LEFT TORTOISE SHELL BRACKET
-0xA1A4	0xFE5E	# SMALL RIGHT TORTOISE SHELL BRACKET
-0xA1A5	0x2018	# LEFT SINGLE QUOTATION MARK
-0xA1A6	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xA1A7	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xA1A8	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xA1A9	0x301D	# REVERSED DOUBLE PRIME QUOTATION MARK
-0xA1AA	0x301E	# DOUBLE PRIME QUOTATION MARK
-0xA1AB	0x2035	# REVERSED PRIME
-0xA1AC	0x2032	# PRIME
-0xA1AD	0xFF03	# FULLWIDTH NUMBER SIGN
-0xA1AE	0xFF06	# FULLWIDTH AMPERSAND
-0xA1AF	0xFF0A	# FULLWIDTH ASTERISK
-0xA1B0	0x203B	# REFERENCE MARK
-0xA1B1	0x00A7	# SECTION SIGN
-0xA1B2	0x3003	# DITTO MARK
-0xA1B3	0x25CB	# WHITE CIRCLE
-0xA1B4	0x25CF	# BLACK CIRCLE
-0xA1B5	0x25B3	# WHITE UP-POINTING TRIANGLE
-0xA1B6	0x25B2	# BLACK UP-POINTING TRIANGLE
-0xA1B7	0x25CE	# BULLSEYE
-0xA1B8	0x2606	# WHITE STAR
-0xA1B9	0x2605	# BLACK STAR
-0xA1BA	0x25C7	# WHITE DIAMOND
-0xA1BB	0x25C6	# BLACK DIAMOND
-0xA1BC	0x25A1	# WHITE SQUARE
-0xA1BD	0x25A0	# BLACK SQUARE
-0xA1BE	0x25BD	# WHITE DOWN-POINTING TRIANGLE
-0xA1BF	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0xA1C0	0x32A3	# CIRCLED IDEOGRAPH CORRECT
-0xA1C1	0x2105	# CARE OF
-0xA1C2	0x203E	# OVERLINE
-0xA1C3	0xFFFD	# *** NO MAPPING ***
-0xA1C4	0xFF3F	# FULLWIDTH LOW LINE
-0xA1C5	0xFFFD	# *** NO MAPPING ***
-0xA1C6	0xFE49	# DASHED OVERLINE
-0xA1C7	0xFE4A	# CENTRELINE OVERLINE
-0xA1C8	0xFE4D	# DASHED LOW LINE
-0xA1C9	0xFE4E	# CENTRELINE LOW LINE
-0xA1CA	0xFE4B	# WAVY OVERLINE
-0xA1CB	0xFE4C	# DOUBLE WAVY OVERLINE
-0xA1CC	0xFE5F	# SMALL NUMBER SIGN
-0xA1CD	0xFE60	# SMALL AMPERSAND
-0xA1CE	0xFE61	# SMALL ASTERISK
-0xA1CF	0xFF0B	# FULLWIDTH PLUS SIGN
-0xA1D0	0xFF0D	# FULLWIDTH HYPHEN-MINUS
-0xA1D1	0x00D7	# MULTIPLICATION SIGN
-0xA1D2	0x00F7	# DIVISION SIGN
-0xA1D3	0x00B1	# PLUS-MINUS SIGN
-0xA1D4	0x221A	# SQUARE ROOT
-0xA1D5	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0xA1D6	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0xA1D7	0xFF1D	# FULLWIDTH EQUALS SIGN
-0xA1D8	0x2266	# LESS THAN OVER EQUAL TO
-0xA1D9	0x2267	# GREATER THAN OVER EQUAL TO
-0xA1DA	0x2260	# NOT EQUAL TO
-0xA1DB	0x221E	# INFINITY
-0xA1DC	0x2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0xA1DD	0x2261	# IDENTICAL TO
-0xA1DE	0xFE62	# SMALL PLUS SIGN
-0xA1DF	0xFE63	# SMALL HYPHEN-MINUS
-0xA1E0	0xFE64	# SMALL LESS-THAN SIGN
-0xA1E1	0xFE65	# SMALL GREATER-THAN SIGN
-0xA1E2	0xFE66	# SMALL EQUALS SIGN
-0xA1E3	0x223C	# TILDE OPERATOR
-0xA1E4	0x2229	# INTERSECTION
-0xA1E5	0x222A	# UNION
-0xA1E6	0x22A5	# UP TACK
-0xA1E7	0x2220	# ANGLE
-0xA1E8	0x221F	# RIGHT ANGLE
-0xA1E9	0x22BF	# RIGHT TRIANGLE
-0xA1EA	0x33D2	# SQUARE LOG
-0xA1EB	0x33D1	# SQUARE LN
-0xA1EC	0x222B	# INTEGRAL
-0xA1ED	0x222E	# CONTOUR INTEGRAL
-0xA1EE	0x2235	# BECAUSE
-0xA1EF	0x2234	# THEREFORE
-0xA1F0	0x2640	# FEMALE SIGN
-0xA1F1	0x2642	# MALE SIGN
-0xA1F2	0x2641	# EARTH
-0xA1F3	0x2609	# SUN
-0xA1F4	0x2191	# UPWARDS ARROW
-0xA1F5	0x2193	# DOWNWARDS ARROW
-0xA1F6	0x2190	# LEFTWARDS ARROW
-0xA1F7	0x2192	# RIGHTWARDS ARROW
-0xA1F8	0x2196	# NORTH WEST ARROW
-0xA1F9	0x2197	# NORTH EAST ARROW
-0xA1FA	0x2199	# SOUTH WEST ARROW
-0xA1FB	0x2198	# SOUTH EAST ARROW
-0xA1FC	0x2225	# PARALLEL TO
-0xA1FD	0x2223	# DIVIDES
-0xA1FE	0xFFFD	# *** NO MAPPING ***
-0xA240	0xFFFD	# *** NO MAPPING ***
-0xA241	0xFF0F	# FULLWIDTH SOLIDUS
-0xA242	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
-0xA243	0xFF04	# FULLWIDTH DOLLAR SIGN
-0xA244	0x00A5	# YEN SIGN
-0xA245	0x3012	# POSTAL MARK
-0xA246	0x00A2	# CENT SIGN
-0xA247	0x00A3	# POUND SIGN
-0xA248	0xFF05	# FULLWIDTH PERCENT SIGN
-0xA249	0xFF20	# FULLWIDTH COMMERCIAL AT
-0xA24A	0x2103	# DEGREE CELSIUS
-0xA24B	0x2109	# DEGREE FAHRENHEIT
-0xA24C	0xFE69	# SMALL DOLLAR SIGN
-0xA24D	0xFE6A	# SMALL PERCENT SIGN
-0xA24E	0xFE6B	# SMALL COMMERCIAL AT
-0xA24F	0x33D5	# SQUARE MIL
-0xA250	0x339C	# SQUARE MM
-0xA251	0x339D	# SQUARE CM
-0xA252	0x339E	# SQUARE KM
-0xA253	0x33CE	# SQUARE KM CAPITAL
-0xA254	0x33A1	# SQUARE M SQUARED
-0xA255	0x338E	# SQUARE MG
-0xA256	0x338F	# SQUARE KG
-0xA257	0x33C4	# SQUARE CC
-0xA258	0x00B0	# DEGREE SIGN
-0xA259	0x5159	# <CJK>
-0xA25A	0x515B	# <CJK>
-0xA25B	0x515E	# <CJK>
-0xA25C	0x515D	# <CJK>
-0xA25D	0x5161	# <CJK>
-0xA25E	0x5163	# <CJK>
-0xA25F	0x55E7	# <CJK>
-0xA260	0x74E9	# <CJK>
-0xA261	0x7CCE	# <CJK>
-0xA262	0x2581	# LOWER ONE EIGHTH BLOCK
-0xA263	0x2582	# LOWER ONE QUARTER BLOCK
-0xA264	0x2583	# LOWER THREE EIGHTHS BLOCK
-0xA265	0x2584	# LOWER HALF BLOCK
-0xA266	0x2585	# LOWER FIVE EIGHTHS BLOCK
-0xA267	0x2586	# LOWER THREE QUARTERS BLOCK
-0xA268	0x2587	# LOWER SEVEN EIGHTHS BLOCK
-0xA269	0x2588	# FULL BLOCK
-0xA26A	0x258F	# LEFT ONE EIGHTH BLOCK
-0xA26B	0x258E	# LEFT ONE QUARTER BLOCK
-0xA26C	0x258D	# LEFT THREE EIGHTHS BLOCK
-0xA26D	0x258C	# LEFT HALF BLOCK
-0xA26E	0x258B	# LEFT FIVE EIGHTHS BLOCK
-0xA26F	0x258A	# LEFT THREE QUARTERS BLOCK
-0xA270	0x2589	# LEFT SEVEN EIGHTHS BLOCK
-0xA271	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0xA272	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0xA273	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0xA274	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0xA275	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0xA276	0x2594	# UPPER ONE EIGHTH BLOCK
-0xA277	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0xA278	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0xA279	0x2595	# RIGHT ONE EIGHTH BLOCK
-0xA27A	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0xA27B	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0xA27C	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0xA27D	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0xA27E	0x256D	# BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
-0xA2A1	0x256E	# BOX DRAWINGS LIGHT ARC DOWN AND LEFT
-0xA2A2	0x2570	# BOX DRAWINGS LIGHT ARC UP AND RIGHT
-0xA2A3	0x256F	# BOX DRAWINGS LIGHT ARC UP AND LEFT
-0xA2A4	0x2550	# BOX DRAWINGS DOUBLE HORIZONTAL
-0xA2A5	0x255E	# BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xA2A6	0x256A	# BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xA2A7	0x2561	# BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xA2A8	0x25E2	# BLACK LOWER RIGHT TRIANGLE
-0xA2A9	0x25E3	# BLACK LOWER LEFT TRIANGLE
-0xA2AA	0x25E5	# BLACK UPPER RIGHT TRIANGLE
-0xA2AB	0x25E4	# BLACK UPPER LEFT TRIANGLE
-0xA2AC	0x2571	# BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
-0xA2AD	0x2572	# BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
-0xA2AE	0x2573	# BOX DRAWINGS LIGHT DIAGONAL CROSS
-0xA2AF	0xFF10	# FULLWIDTH DIGIT ZERO
-0xA2B0	0xFF11	# FULLWIDTH DIGIT ONE
-0xA2B1	0xFF12	# FULLWIDTH DIGIT TWO
-0xA2B2	0xFF13	# FULLWIDTH DIGIT THREE
-0xA2B3	0xFF14	# FULLWIDTH DIGIT FOUR
-0xA2B4	0xFF15	# FULLWIDTH DIGIT FIVE
-0xA2B5	0xFF16	# FULLWIDTH DIGIT SIX
-0xA2B6	0xFF17	# FULLWIDTH DIGIT SEVEN
-0xA2B7	0xFF18	# FULLWIDTH DIGIT EIGHT
-0xA2B8	0xFF19	# FULLWIDTH DIGIT NINE
-0xA2B9	0x2160	# ROMAN NUMERAL ONE
-0xA2BA	0x2161	# ROMAN NUMERAL TWO
-0xA2BB	0x2162	# ROMAN NUMERAL THREE
-0xA2BC	0x2163	# ROMAN NUMERAL FOUR
-0xA2BD	0x2164	# ROMAN NUMERAL FIVE
-0xA2BE	0x2165	# ROMAN NUMERAL SIX
-0xA2BF	0x2166	# ROMAN NUMERAL SEVEN
-0xA2C0	0x2167	# ROMAN NUMERAL EIGHT
-0xA2C1	0x2168	# ROMAN NUMERAL NINE
-0xA2C2	0x2169	# ROMAN NUMERAL TEN
-0xA2C3	0x3021	# HANGZHOU NUMERAL ONE
-0xA2C4	0x3022	# HANGZHOU NUMERAL TWO
-0xA2C5	0x3023	# HANGZHOU NUMERAL THREE
-0xA2C6	0x3024	# HANGZHOU NUMERAL FOUR
-0xA2C7	0x3025	# HANGZHOU NUMERAL FIVE
-0xA2C8	0x3026	# HANGZHOU NUMERAL SIX
-0xA2C9	0x3027	# HANGZHOU NUMERAL SEVEN
-0xA2CA	0x3028	# HANGZHOU NUMERAL EIGHT
-0xA2CB	0x3029	# HANGZHOU NUMERAL NINE
-0xA2CC	0xFFFD	# *** NO MAPPING ***
-0xA2CD	0x5344	# <CJK>
-0xA2CE	0xFFFD	# *** NO MAPPING ***
-0xA2CF	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0xA2D0	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0xA2D1	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0xA2D2	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0xA2D3	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0xA2D4	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0xA2D5	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0xA2D6	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0xA2D7	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0xA2D8	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0xA2D9	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0xA2DA	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0xA2DB	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0xA2DC	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0xA2DD	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0xA2DE	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0xA2DF	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0xA2E0	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0xA2E1	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0xA2E2	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0xA2E3	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0xA2E4	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0xA2E5	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0xA2E6	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0xA2E7	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0xA2E8	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0xA2E9	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0xA2EA	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0xA2EB	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0xA2EC	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0xA2ED	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0xA2EE	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0xA2EF	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0xA2F0	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0xA2F1	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0xA2F2	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0xA2F3	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0xA2F4	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0xA2F5	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0xA2F6	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0xA2F7	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0xA2F8	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0xA2F9	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0xA2FA	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0xA2FB	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0xA2FC	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0xA2FD	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0xA2FE	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0xA340	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0xA341	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0xA342	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0xA343	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0xA344	0x0391	# GREEK CAPITAL LETTER ALPHA
-0xA345	0x0392	# GREEK CAPITAL LETTER BETA
-0xA346	0x0393	# GREEK CAPITAL LETTER GAMMA
-0xA347	0x0394	# GREEK CAPITAL LETTER DELTA
-0xA348	0x0395	# GREEK CAPITAL LETTER EPSILON
-0xA349	0x0396	# GREEK CAPITAL LETTER ZETA
-0xA34A	0x0397	# GREEK CAPITAL LETTER ETA
-0xA34B	0x0398	# GREEK CAPITAL LETTER THETA
-0xA34C	0x0399	# GREEK CAPITAL LETTER IOTA
-0xA34D	0x039A	# GREEK CAPITAL LETTER KAPPA
-0xA34E	0x039B	# GREEK CAPITAL LETTER LAMDA
-0xA34F	0x039C	# GREEK CAPITAL LETTER MU
-0xA350	0x039D	# GREEK CAPITAL LETTER NU
-0xA351	0x039E	# GREEK CAPITAL LETTER XI
-0xA352	0x039F	# GREEK CAPITAL LETTER OMICRON
-0xA353	0x03A0	# GREEK CAPITAL LETTER PI
-0xA354	0x03A1	# GREEK CAPITAL LETTER RHO
-0xA355	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0xA356	0x03A4	# GREEK CAPITAL LETTER TAU
-0xA357	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0xA358	0x03A6	# GREEK CAPITAL LETTER PHI
-0xA359	0x03A7	# GREEK CAPITAL LETTER CHI
-0xA35A	0x03A8	# GREEK CAPITAL LETTER PSI
-0xA35B	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0xA35C	0x03B1	# GREEK SMALL LETTER ALPHA
-0xA35D	0x03B2	# GREEK SMALL LETTER BETA
-0xA35E	0x03B3	# GREEK SMALL LETTER GAMMA
-0xA35F	0x03B4	# GREEK SMALL LETTER DELTA
-0xA360	0x03B5	# GREEK SMALL LETTER EPSILON
-0xA361	0x03B6	# GREEK SMALL LETTER ZETA
-0xA362	0x03B7	# GREEK SMALL LETTER ETA
-0xA363	0x03B8	# GREEK SMALL LETTER THETA
-0xA364	0x03B9	# GREEK SMALL LETTER IOTA
-0xA365	0x03BA	# GREEK SMALL LETTER KAPPA
-0xA366	0x03BB	# GREEK SMALL LETTER LAMDA
-0xA367	0x03BC	# GREEK SMALL LETTER MU
-0xA368	0x03BD	# GREEK SMALL LETTER NU
-0xA369	0x03BE	# GREEK SMALL LETTER XI
-0xA36A	0x03BF	# GREEK SMALL LETTER OMICRON
-0xA36B	0x03C0	# GREEK SMALL LETTER PI
-0xA36C	0x03C1	# GREEK SMALL LETTER RHO
-0xA36D	0x03C3	# GREEK SMALL LETTER SIGMA
-0xA36E	0x03C4	# GREEK SMALL LETTER TAU
-0xA36F	0x03C5	# GREEK SMALL LETTER UPSILON
-0xA370	0x03C6	# GREEK SMALL LETTER PHI
-0xA371	0x03C7	# GREEK SMALL LETTER CHI
-0xA372	0x03C8	# GREEK SMALL LETTER PSI
-0xA373	0x03C9	# GREEK SMALL LETTER OMEGA
-0xA374	0x3105	# BOPOMOFO LETTER B
-0xA375	0x3106	# BOPOMOFO LETTER P
-0xA376	0x3107	# BOPOMOFO LETTER M
-0xA377	0x3108	# BOPOMOFO LETTER F
-0xA378	0x3109	# BOPOMOFO LETTER D
-0xA379	0x310A	# BOPOMOFO LETTER T
-0xA37A	0x310B	# BOPOMOFO LETTER N
-0xA37B	0x310C	# BOPOMOFO LETTER L
-0xA37C	0x310D	# BOPOMOFO LETTER G
-0xA37D	0x310E	# BOPOMOFO LETTER K
-0xA37E	0x310F	# BOPOMOFO LETTER H
-0xA3A1	0x3110	# BOPOMOFO LETTER J
-0xA3A2	0x3111	# BOPOMOFO LETTER Q
-0xA3A3	0x3112	# BOPOMOFO LETTER X
-0xA3A4	0x3113	# BOPOMOFO LETTER ZH
-0xA3A5	0x3114	# BOPOMOFO LETTER CH
-0xA3A6	0x3115	# BOPOMOFO LETTER SH
-0xA3A7	0x3116	# BOPOMOFO LETTER R
-0xA3A8	0x3117	# BOPOMOFO LETTER Z
-0xA3A9	0x3118	# BOPOMOFO LETTER C
-0xA3AA	0x3119	# BOPOMOFO LETTER S
-0xA3AB	0x311A	# BOPOMOFO LETTER A
-0xA3AC	0x311B	# BOPOMOFO LETTER O
-0xA3AD	0x311C	# BOPOMOFO LETTER E
-0xA3AE	0x311D	# BOPOMOFO LETTER EH
-0xA3AF	0x311E	# BOPOMOFO LETTER AI
-0xA3B0	0x311F	# BOPOMOFO LETTER EI
-0xA3B1	0x3120	# BOPOMOFO LETTER AU
-0xA3B2	0x3121	# BOPOMOFO LETTER OU
-0xA3B3	0x3122	# BOPOMOFO LETTER AN
-0xA3B4	0x3123	# BOPOMOFO LETTER EN
-0xA3B5	0x3124	# BOPOMOFO LETTER ANG
-0xA3B6	0x3125	# BOPOMOFO LETTER ENG
-0xA3B7	0x3126	# BOPOMOFO LETTER ER
-0xA3B8	0x3127	# BOPOMOFO LETTER I
-0xA3B9	0x3128	# BOPOMOFO LETTER U
-0xA3BA	0x3129	# BOPOMOFO LETTER IU
-0xA3BB	0x02D9	# DOT ABOVE (Mandarin Chinese light tone)
-0xA3BC	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
-0xA3BD	0x02CA	# MODIFIER LETTER ACUTE ACCENT (Mandarin Chinese second tone)
-0xA3BE	0x02C7	# CARON (Mandarin Chinese third tone)
-0xA3BF	0x02CB	# MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone)
-0xA440	0x4E00	# <CJK>
-0xA441	0x4E59	# <CJK>
-0xA442	0x4E01	# <CJK>
-0xA443	0x4E03	# <CJK>
-0xA444	0x4E43	# <CJK>
-0xA445	0x4E5D	# <CJK>
-0xA446	0x4E86	# <CJK>
-0xA447	0x4E8C	# <CJK>
-0xA448	0x4EBA	# <CJK>
-0xA449	0x513F	# <CJK>
-0xA44A	0x5165	# <CJK>
-0xA44B	0x516B	# <CJK>
-0xA44C	0x51E0	# <CJK>
-0xA44D	0x5200	# <CJK>
-0xA44E	0x5201	# <CJK>
-0xA44F	0x529B	# <CJK>
-0xA450	0x5315	# <CJK>
-0xA451	0x5341	# <CJK>
-0xA452	0x535C	# <CJK>
-0xA453	0x53C8	# <CJK>
-0xA454	0x4E09	# <CJK>
-0xA455	0x4E0B	# <CJK>
-0xA456	0x4E08	# <CJK>
-0xA457	0x4E0A	# <CJK>
-0xA458	0x4E2B	# <CJK>
-0xA459	0x4E38	# <CJK>
-0xA45A	0x51E1	# <CJK>
-0xA45B	0x4E45	# <CJK>
-0xA45C	0x4E48	# <CJK>
-0xA45D	0x4E5F	# <CJK>
-0xA45E	0x4E5E	# <CJK>
-0xA45F	0x4E8E	# <CJK>
-0xA460	0x4EA1	# <CJK>
-0xA461	0x5140	# <CJK>
-0xA462	0x5203	# <CJK>
-0xA463	0x52FA	# <CJK>
-0xA464	0x5343	# <CJK>
-0xA465	0x53C9	# <CJK>
-0xA466	0x53E3	# <CJK>
-0xA467	0x571F	# <CJK>
-0xA468	0x58EB	# <CJK>
-0xA469	0x5915	# <CJK>
-0xA46A	0x5927	# <CJK>
-0xA46B	0x5973	# <CJK>
-0xA46C	0x5B50	# <CJK>
-0xA46D	0x5B51	# <CJK>
-0xA46E	0x5B53	# <CJK>
-0xA46F	0x5BF8	# <CJK>
-0xA470	0x5C0F	# <CJK>
-0xA471	0x5C22	# <CJK>
-0xA472	0x5C38	# <CJK>
-0xA473	0x5C71	# <CJK>
-0xA474	0x5DDD	# <CJK>
-0xA475	0x5DE5	# <CJK>
-0xA476	0x5DF1	# <CJK>
-0xA477	0x5DF2	# <CJK>
-0xA478	0x5DF3	# <CJK>
-0xA479	0x5DFE	# <CJK>
-0xA47A	0x5E72	# <CJK>
-0xA47B	0x5EFE	# <CJK>
-0xA47C	0x5F0B	# <CJK>
-0xA47D	0x5F13	# <CJK>
-0xA47E	0x624D	# <CJK>
-0xA4A1	0x4E11	# <CJK>
-0xA4A2	0x4E10	# <CJK>
-0xA4A3	0x4E0D	# <CJK>
-0xA4A4	0x4E2D	# <CJK>
-0xA4A5	0x4E30	# <CJK>
-0xA4A6	0x4E39	# <CJK>
-0xA4A7	0x4E4B	# <CJK>
-0xA4A8	0x5C39	# <CJK>
-0xA4A9	0x4E88	# <CJK>
-0xA4AA	0x4E91	# <CJK>
-0xA4AB	0x4E95	# <CJK>
-0xA4AC	0x4E92	# <CJK>
-0xA4AD	0x4E94	# <CJK>
-0xA4AE	0x4EA2	# <CJK>
-0xA4AF	0x4EC1	# <CJK>
-0xA4B0	0x4EC0	# <CJK>
-0xA4B1	0x4EC3	# <CJK>
-0xA4B2	0x4EC6	# <CJK>
-0xA4B3	0x4EC7	# <CJK>
-0xA4B4	0x4ECD	# <CJK>
-0xA4B5	0x4ECA	# <CJK>
-0xA4B6	0x4ECB	# <CJK>
-0xA4B7	0x4EC4	# <CJK>
-0xA4B8	0x5143	# <CJK>
-0xA4B9	0x5141	# <CJK>
-0xA4BA	0x5167	# <CJK>
-0xA4BB	0x516D	# <CJK>
-0xA4BC	0x516E	# <CJK>
-0xA4BD	0x516C	# <CJK>
-0xA4BE	0x5197	# <CJK>
-0xA4BF	0x51F6	# <CJK>
-0xA4C0	0x5206	# <CJK>
-0xA4C1	0x5207	# <CJK>
-0xA4C2	0x5208	# <CJK>
-0xA4C3	0x52FB	# <CJK>
-0xA4C4	0x52FE	# <CJK>
-0xA4C5	0x52FF	# <CJK>
-0xA4C6	0x5316	# <CJK>
-0xA4C7	0x5339	# <CJK>
-0xA4C8	0x5348	# <CJK>
-0xA4C9	0x5347	# <CJK>
-0xA4CA	0x5345	# <CJK>
-0xA4CB	0x535E	# <CJK>
-0xA4CC	0x5384	# <CJK>
-0xA4CD	0x53CB	# <CJK>
-0xA4CE	0x53CA	# <CJK>
-0xA4CF	0x53CD	# <CJK>
-0xA4D0	0x58EC	# <CJK>
-0xA4D1	0x5929	# <CJK>
-0xA4D2	0x592B	# <CJK>
-0xA4D3	0x592A	# <CJK>
-0xA4D4	0x592D	# <CJK>
-0xA4D5	0x5B54	# <CJK>
-0xA4D6	0x5C11	# <CJK>
-0xA4D7	0x5C24	# <CJK>
-0xA4D8	0x5C3A	# <CJK>
-0xA4D9	0x5C6F	# <CJK>
-0xA4DA	0x5DF4	# <CJK>
-0xA4DB	0x5E7B	# <CJK>
-0xA4DC	0x5EFF	# <CJK>
-0xA4DD	0x5F14	# <CJK>
-0xA4DE	0x5F15	# <CJK>
-0xA4DF	0x5FC3	# <CJK>
-0xA4E0	0x6208	# <CJK>
-0xA4E1	0x6236	# <CJK>
-0xA4E2	0x624B	# <CJK>
-0xA4E3	0x624E	# <CJK>
-0xA4E4	0x652F	# <CJK>
-0xA4E5	0x6587	# <CJK>
-0xA4E6	0x6597	# <CJK>
-0xA4E7	0x65A4	# <CJK>
-0xA4E8	0x65B9	# <CJK>
-0xA4E9	0x65E5	# <CJK>
-0xA4EA	0x66F0	# <CJK>
-0xA4EB	0x6708	# <CJK>
-0xA4EC	0x6728	# <CJK>
-0xA4ED	0x6B20	# <CJK>
-0xA4EE	0x6B62	# <CJK>
-0xA4EF	0x6B79	# <CJK>
-0xA4F0	0x6BCB	# <CJK>
-0xA4F1	0x6BD4	# <CJK>
-0xA4F2	0x6BDB	# <CJK>
-0xA4F3	0x6C0F	# <CJK>
-0xA4F4	0x6C34	# <CJK>
-0xA4F5	0x706B	# <CJK>
-0xA4F6	0x722A	# <CJK>
-0xA4F7	0x7236	# <CJK>
-0xA4F8	0x723B	# <CJK>
-0xA4F9	0x7247	# <CJK>
-0xA4FA	0x7259	# <CJK>
-0xA4FB	0x725B	# <CJK>
-0xA4FC	0x72AC	# <CJK>
-0xA4FD	0x738B	# <CJK>
-0xA4FE	0x4E19	# <CJK>
-0xA540	0x4E16	# <CJK>
-0xA541	0x4E15	# <CJK>
-0xA542	0x4E14	# <CJK>
-0xA543	0x4E18	# <CJK>
-0xA544	0x4E3B	# <CJK>
-0xA545	0x4E4D	# <CJK>
-0xA546	0x4E4F	# <CJK>
-0xA547	0x4E4E	# <CJK>
-0xA548	0x4EE5	# <CJK>
-0xA549	0x4ED8	# <CJK>
-0xA54A	0x4ED4	# <CJK>
-0xA54B	0x4ED5	# <CJK>
-0xA54C	0x4ED6	# <CJK>
-0xA54D	0x4ED7	# <CJK>
-0xA54E	0x4EE3	# <CJK>
-0xA54F	0x4EE4	# <CJK>
-0xA550	0x4ED9	# <CJK>
-0xA551	0x4EDE	# <CJK>
-0xA552	0x5145	# <CJK>
-0xA553	0x5144	# <CJK>
-0xA554	0x5189	# <CJK>
-0xA555	0x518A	# <CJK>
-0xA556	0x51AC	# <CJK>
-0xA557	0x51F9	# <CJK>
-0xA558	0x51FA	# <CJK>
-0xA559	0x51F8	# <CJK>
-0xA55A	0x520A	# <CJK>
-0xA55B	0x52A0	# <CJK>
-0xA55C	0x529F	# <CJK>
-0xA55D	0x5305	# <CJK>
-0xA55E	0x5306	# <CJK>
-0xA55F	0x5317	# <CJK>
-0xA560	0x531D	# <CJK>
-0xA561	0x4EDF	# <CJK>
-0xA562	0x534A	# <CJK>
-0xA563	0x5349	# <CJK>
-0xA564	0x5361	# <CJK>
-0xA565	0x5360	# <CJK>
-0xA566	0x536F	# <CJK>
-0xA567	0x536E	# <CJK>
-0xA568	0x53BB	# <CJK>
-0xA569	0x53EF	# <CJK>
-0xA56A	0x53E4	# <CJK>
-0xA56B	0x53F3	# <CJK>
-0xA56C	0x53EC	# <CJK>
-0xA56D	0x53EE	# <CJK>
-0xA56E	0x53E9	# <CJK>
-0xA56F	0x53E8	# <CJK>
-0xA570	0x53FC	# <CJK>
-0xA571	0x53F8	# <CJK>
-0xA572	0x53F5	# <CJK>
-0xA573	0x53EB	# <CJK>
-0xA574	0x53E6	# <CJK>
-0xA575	0x53EA	# <CJK>
-0xA576	0x53F2	# <CJK>
-0xA577	0x53F1	# <CJK>
-0xA578	0x53F0	# <CJK>
-0xA579	0x53E5	# <CJK>
-0xA57A	0x53ED	# <CJK>
-0xA57B	0x53FB	# <CJK>
-0xA57C	0x56DB	# <CJK>
-0xA57D	0x56DA	# <CJK>
-0xA57E	0x5916	# <CJK>
-0xA5A1	0x592E	# <CJK>
-0xA5A2	0x5931	# <CJK>
-0xA5A3	0x5974	# <CJK>
-0xA5A4	0x5976	# <CJK>
-0xA5A5	0x5B55	# <CJK>
-0xA5A6	0x5B83	# <CJK>
-0xA5A7	0x5C3C	# <CJK>
-0xA5A8	0x5DE8	# <CJK>
-0xA5A9	0x5DE7	# <CJK>
-0xA5AA	0x5DE6	# <CJK>
-0xA5AB	0x5E02	# <CJK>
-0xA5AC	0x5E03	# <CJK>
-0xA5AD	0x5E73	# <CJK>
-0xA5AE	0x5E7C	# <CJK>
-0xA5AF	0x5F01	# <CJK>
-0xA5B0	0x5F18	# <CJK>
-0xA5B1	0x5F17	# <CJK>
-0xA5B2	0x5FC5	# <CJK>
-0xA5B3	0x620A	# <CJK>
-0xA5B4	0x6253	# <CJK>
-0xA5B5	0x6254	# <CJK>
-0xA5B6	0x6252	# <CJK>
-0xA5B7	0x6251	# <CJK>
-0xA5B8	0x65A5	# <CJK>
-0xA5B9	0x65E6	# <CJK>
-0xA5BA	0x672E	# <CJK>
-0xA5BB	0x672C	# <CJK>
-0xA5BC	0x672A	# <CJK>
-0xA5BD	0x672B	# <CJK>
-0xA5BE	0x672D	# <CJK>
-0xA5BF	0x6B63	# <CJK>
-0xA5C0	0x6BCD	# <CJK>
-0xA5C1	0x6C11	# <CJK>
-0xA5C2	0x6C10	# <CJK>
-0xA5C3	0x6C38	# <CJK>
-0xA5C4	0x6C41	# <CJK>
-0xA5C5	0x6C40	# <CJK>
-0xA5C6	0x6C3E	# <CJK>
-0xA5C7	0x72AF	# <CJK>
-0xA5C8	0x7384	# <CJK>
-0xA5C9	0x7389	# <CJK>
-0xA5CA	0x74DC	# <CJK>
-0xA5CB	0x74E6	# <CJK>
-0xA5CC	0x7518	# <CJK>
-0xA5CD	0x751F	# <CJK>
-0xA5CE	0x7528	# <CJK>
-0xA5CF	0x7529	# <CJK>
-0xA5D0	0x7530	# <CJK>
-0xA5D1	0x7531	# <CJK>
-0xA5D2	0x7532	# <CJK>
-0xA5D3	0x7533	# <CJK>
-0xA5D4	0x758B	# <CJK>
-0xA5D5	0x767D	# <CJK>
-0xA5D6	0x76AE	# <CJK>
-0xA5D7	0x76BF	# <CJK>
-0xA5D8	0x76EE	# <CJK>
-0xA5D9	0x77DB	# <CJK>
-0xA5DA	0x77E2	# <CJK>
-0xA5DB	0x77F3	# <CJK>
-0xA5DC	0x793A	# <CJK>
-0xA5DD	0x79BE	# <CJK>
-0xA5DE	0x7A74	# <CJK>
-0xA5DF	0x7ACB	# <CJK>
-0xA5E0	0x4E1E	# <CJK>
-0xA5E1	0x4E1F	# <CJK>
-0xA5E2	0x4E52	# <CJK>
-0xA5E3	0x4E53	# <CJK>
-0xA5E4	0x4E69	# <CJK>
-0xA5E5	0x4E99	# <CJK>
-0xA5E6	0x4EA4	# <CJK>
-0xA5E7	0x4EA6	# <CJK>
-0xA5E8	0x4EA5	# <CJK>
-0xA5E9	0x4EFF	# <CJK>
-0xA5EA	0x4F09	# <CJK>
-0xA5EB	0x4F19	# <CJK>
-0xA5EC	0x4F0A	# <CJK>
-0xA5ED	0x4F15	# <CJK>
-0xA5EE	0x4F0D	# <CJK>
-0xA5EF	0x4F10	# <CJK>
-0xA5F0	0x4F11	# <CJK>
-0xA5F1	0x4F0F	# <CJK>
-0xA5F2	0x4EF2	# <CJK>
-0xA5F3	0x4EF6	# <CJK>
-0xA5F4	0x4EFB	# <CJK>
-0xA5F5	0x4EF0	# <CJK>
-0xA5F6	0x4EF3	# <CJK>
-0xA5F7	0x4EFD	# <CJK>
-0xA5F8	0x4F01	# <CJK>
-0xA5F9	0x4F0B	# <CJK>
-0xA5FA	0x5149	# <CJK>
-0xA5FB	0x5147	# <CJK>
-0xA5FC	0x5146	# <CJK>
-0xA5FD	0x5148	# <CJK>
-0xA5FE	0x5168	# <CJK>
-0xA640	0x5171	# <CJK>
-0xA641	0x518D	# <CJK>
-0xA642	0x51B0	# <CJK>
-0xA643	0x5217	# <CJK>
-0xA644	0x5211	# <CJK>
-0xA645	0x5212	# <CJK>
-0xA646	0x520E	# <CJK>
-0xA647	0x5216	# <CJK>
-0xA648	0x52A3	# <CJK>
-0xA649	0x5308	# <CJK>
-0xA64A	0x5321	# <CJK>
-0xA64B	0x5320	# <CJK>
-0xA64C	0x5370	# <CJK>
-0xA64D	0x5371	# <CJK>
-0xA64E	0x5409	# <CJK>
-0xA64F	0x540F	# <CJK>
-0xA650	0x540C	# <CJK>
-0xA651	0x540A	# <CJK>
-0xA652	0x5410	# <CJK>
-0xA653	0x5401	# <CJK>
-0xA654	0x540B	# <CJK>
-0xA655	0x5404	# <CJK>
-0xA656	0x5411	# <CJK>
-0xA657	0x540D	# <CJK>
-0xA658	0x5408	# <CJK>
-0xA659	0x5403	# <CJK>
-0xA65A	0x540E	# <CJK>
-0xA65B	0x5406	# <CJK>
-0xA65C	0x5412	# <CJK>
-0xA65D	0x56E0	# <CJK>
-0xA65E	0x56DE	# <CJK>
-0xA65F	0x56DD	# <CJK>
-0xA660	0x5733	# <CJK>
-0xA661	0x5730	# <CJK>
-0xA662	0x5728	# <CJK>
-0xA663	0x572D	# <CJK>
-0xA664	0x572C	# <CJK>
-0xA665	0x572F	# <CJK>
-0xA666	0x5729	# <CJK>
-0xA667	0x5919	# <CJK>
-0xA668	0x591A	# <CJK>
-0xA669	0x5937	# <CJK>
-0xA66A	0x5938	# <CJK>
-0xA66B	0x5984	# <CJK>
-0xA66C	0x5978	# <CJK>
-0xA66D	0x5983	# <CJK>
-0xA66E	0x597D	# <CJK>
-0xA66F	0x5979	# <CJK>
-0xA670	0x5982	# <CJK>
-0xA671	0x5981	# <CJK>
-0xA672	0x5B57	# <CJK>
-0xA673	0x5B58	# <CJK>
-0xA674	0x5B87	# <CJK>
-0xA675	0x5B88	# <CJK>
-0xA676	0x5B85	# <CJK>
-0xA677	0x5B89	# <CJK>
-0xA678	0x5BFA	# <CJK>
-0xA679	0x5C16	# <CJK>
-0xA67A	0x5C79	# <CJK>
-0xA67B	0x5DDE	# <CJK>
-0xA67C	0x5E06	# <CJK>
-0xA67D	0x5E76	# <CJK>
-0xA67E	0x5E74	# <CJK>
-0xA6A1	0x5F0F	# <CJK>
-0xA6A2	0x5F1B	# <CJK>
-0xA6A3	0x5FD9	# <CJK>
-0xA6A4	0x5FD6	# <CJK>
-0xA6A5	0x620E	# <CJK>
-0xA6A6	0x620C	# <CJK>
-0xA6A7	0x620D	# <CJK>
-0xA6A8	0x6210	# <CJK>
-0xA6A9	0x6263	# <CJK>
-0xA6AA	0x625B	# <CJK>
-0xA6AB	0x6258	# <CJK>
-0xA6AC	0x6536	# <CJK>
-0xA6AD	0x65E9	# <CJK>
-0xA6AE	0x65E8	# <CJK>
-0xA6AF	0x65EC	# <CJK>
-0xA6B0	0x65ED	# <CJK>
-0xA6B1	0x66F2	# <CJK>
-0xA6B2	0x66F3	# <CJK>
-0xA6B3	0x6709	# <CJK>
-0xA6B4	0x673D	# <CJK>
-0xA6B5	0x6734	# <CJK>
-0xA6B6	0x6731	# <CJK>
-0xA6B7	0x6735	# <CJK>
-0xA6B8	0x6B21	# <CJK>
-0xA6B9	0x6B64	# <CJK>
-0xA6BA	0x6B7B	# <CJK>
-0xA6BB	0x6C16	# <CJK>
-0xA6BC	0x6C5D	# <CJK>
-0xA6BD	0x6C57	# <CJK>
-0xA6BE	0x6C59	# <CJK>
-0xA6BF	0x6C5F	# <CJK>
-0xA6C0	0x6C60	# <CJK>
-0xA6C1	0x6C50	# <CJK>
-0xA6C2	0x6C55	# <CJK>
-0xA6C3	0x6C61	# <CJK>
-0xA6C4	0x6C5B	# <CJK>
-0xA6C5	0x6C4D	# <CJK>
-0xA6C6	0x6C4E	# <CJK>
-0xA6C7	0x7070	# <CJK>
-0xA6C8	0x725F	# <CJK>
-0xA6C9	0x725D	# <CJK>
-0xA6CA	0x767E	# <CJK>
-0xA6CB	0x7AF9	# <CJK>
-0xA6CC	0x7C73	# <CJK>
-0xA6CD	0x7CF8	# <CJK>
-0xA6CE	0x7F36	# <CJK>
-0xA6CF	0x7F8A	# <CJK>
-0xA6D0	0x7FBD	# <CJK>
-0xA6D1	0x8001	# <CJK>
-0xA6D2	0x8003	# <CJK>
-0xA6D3	0x800C	# <CJK>
-0xA6D4	0x8012	# <CJK>
-0xA6D5	0x8033	# <CJK>
-0xA6D6	0x807F	# <CJK>
-0xA6D7	0x8089	# <CJK>
-0xA6D8	0x808B	# <CJK>
-0xA6D9	0x808C	# <CJK>
-0xA6DA	0x81E3	# <CJK>
-0xA6DB	0x81EA	# <CJK>
-0xA6DC	0x81F3	# <CJK>
-0xA6DD	0x81FC	# <CJK>
-0xA6DE	0x820C	# <CJK>
-0xA6DF	0x821B	# <CJK>
-0xA6E0	0x821F	# <CJK>
-0xA6E1	0x826E	# <CJK>
-0xA6E2	0x8272	# <CJK>
-0xA6E3	0x827E	# <CJK>
-0xA6E4	0x866B	# <CJK>
-0xA6E5	0x8840	# <CJK>
-0xA6E6	0x884C	# <CJK>
-0xA6E7	0x8863	# <CJK>
-0xA6E8	0x897F	# <CJK>
-0xA6E9	0x9621	# <CJK>
-0xA6EA	0x4E32	# <CJK>
-0xA6EB	0x4EA8	# <CJK>
-0xA6EC	0x4F4D	# <CJK>
-0xA6ED	0x4F4F	# <CJK>
-0xA6EE	0x4F47	# <CJK>
-0xA6EF	0x4F57	# <CJK>
-0xA6F0	0x4F5E	# <CJK>
-0xA6F1	0x4F34	# <CJK>
-0xA6F2	0x4F5B	# <CJK>
-0xA6F3	0x4F55	# <CJK>
-0xA6F4	0x4F30	# <CJK>
-0xA6F5	0x4F50	# <CJK>
-0xA6F6	0x4F51	# <CJK>
-0xA6F7	0x4F3D	# <CJK>
-0xA6F8	0x4F3A	# <CJK>
-0xA6F9	0x4F38	# <CJK>
-0xA6FA	0x4F43	# <CJK>
-0xA6FB	0x4F54	# <CJK>
-0xA6FC	0x4F3C	# <CJK>
-0xA6FD	0x4F46	# <CJK>
-0xA6FE	0x4F63	# <CJK>
-0xA740	0x4F5C	# <CJK>
-0xA741	0x4F60	# <CJK>
-0xA742	0x4F2F	# <CJK>
-0xA743	0x4F4E	# <CJK>
-0xA744	0x4F36	# <CJK>
-0xA745	0x4F59	# <CJK>
-0xA746	0x4F5D	# <CJK>
-0xA747	0x4F48	# <CJK>
-0xA748	0x4F5A	# <CJK>
-0xA749	0x514C	# <CJK>
-0xA74A	0x514B	# <CJK>
-0xA74B	0x514D	# <CJK>
-0xA74C	0x5175	# <CJK>
-0xA74D	0x51B6	# <CJK>
-0xA74E	0x51B7	# <CJK>
-0xA74F	0x5225	# <CJK>
-0xA750	0x5224	# <CJK>
-0xA751	0x5229	# <CJK>
-0xA752	0x522A	# <CJK>
-0xA753	0x5228	# <CJK>
-0xA754	0x52AB	# <CJK>
-0xA755	0x52A9	# <CJK>
-0xA756	0x52AA	# <CJK>
-0xA757	0x52AC	# <CJK>
-0xA758	0x5323	# <CJK>
-0xA759	0x5373	# <CJK>
-0xA75A	0x5375	# <CJK>
-0xA75B	0x541D	# <CJK>
-0xA75C	0x542D	# <CJK>
-0xA75D	0x541E	# <CJK>
-0xA75E	0x543E	# <CJK>
-0xA75F	0x5426	# <CJK>
-0xA760	0x544E	# <CJK>
-0xA761	0x5427	# <CJK>
-0xA762	0x5446	# <CJK>
-0xA763	0x5443	# <CJK>
-0xA764	0x5433	# <CJK>
-0xA765	0x5448	# <CJK>
-0xA766	0x5442	# <CJK>
-0xA767	0x541B	# <CJK>
-0xA768	0x5429	# <CJK>
-0xA769	0x544A	# <CJK>
-0xA76A	0x5439	# <CJK>
-0xA76B	0x543B	# <CJK>
-0xA76C	0x5438	# <CJK>
-0xA76D	0x542E	# <CJK>
-0xA76E	0x5435	# <CJK>
-0xA76F	0x5436	# <CJK>
-0xA770	0x5420	# <CJK>
-0xA771	0x543C	# <CJK>
-0xA772	0x5440	# <CJK>
-0xA773	0x5431	# <CJK>
-0xA774	0x542B	# <CJK>
-0xA775	0x541F	# <CJK>
-0xA776	0x542C	# <CJK>
-0xA777	0x56EA	# <CJK>
-0xA778	0x56F0	# <CJK>
-0xA779	0x56E4	# <CJK>
-0xA77A	0x56EB	# <CJK>
-0xA77B	0x574A	# <CJK>
-0xA77C	0x5751	# <CJK>
-0xA77D	0x5740	# <CJK>
-0xA77E	0x574D	# <CJK>
-0xA7A1	0x5747	# <CJK>
-0xA7A2	0x574E	# <CJK>
-0xA7A3	0x573E	# <CJK>
-0xA7A4	0x5750	# <CJK>
-0xA7A5	0x574F	# <CJK>
-0xA7A6	0x573B	# <CJK>
-0xA7A7	0x58EF	# <CJK>
-0xA7A8	0x593E	# <CJK>
-0xA7A9	0x599D	# <CJK>
-0xA7AA	0x5992	# <CJK>
-0xA7AB	0x59A8	# <CJK>
-0xA7AC	0x599E	# <CJK>
-0xA7AD	0x59A3	# <CJK>
-0xA7AE	0x5999	# <CJK>
-0xA7AF	0x5996	# <CJK>
-0xA7B0	0x598D	# <CJK>
-0xA7B1	0x59A4	# <CJK>
-0xA7B2	0x5993	# <CJK>
-0xA7B3	0x598A	# <CJK>
-0xA7B4	0x59A5	# <CJK>
-0xA7B5	0x5B5D	# <CJK>
-0xA7B6	0x5B5C	# <CJK>
-0xA7B7	0x5B5A	# <CJK>
-0xA7B8	0x5B5B	# <CJK>
-0xA7B9	0x5B8C	# <CJK>
-0xA7BA	0x5B8B	# <CJK>
-0xA7BB	0x5B8F	# <CJK>
-0xA7BC	0x5C2C	# <CJK>
-0xA7BD	0x5C40	# <CJK>
-0xA7BE	0x5C41	# <CJK>
-0xA7BF	0x5C3F	# <CJK>
-0xA7C0	0x5C3E	# <CJK>
-0xA7C1	0x5C90	# <CJK>
-0xA7C2	0x5C91	# <CJK>
-0xA7C3	0x5C94	# <CJK>
-0xA7C4	0x5C8C	# <CJK>
-0xA7C5	0x5DEB	# <CJK>
-0xA7C6	0x5E0C	# <CJK>
-0xA7C7	0x5E8F	# <CJK>
-0xA7C8	0x5E87	# <CJK>
-0xA7C9	0x5E8A	# <CJK>
-0xA7CA	0x5EF7	# <CJK>
-0xA7CB	0x5F04	# <CJK>
-0xA7CC	0x5F1F	# <CJK>
-0xA7CD	0x5F64	# <CJK>
-0xA7CE	0x5F62	# <CJK>
-0xA7CF	0x5F77	# <CJK>
-0xA7D0	0x5F79	# <CJK>
-0xA7D1	0x5FD8	# <CJK>
-0xA7D2	0x5FCC	# <CJK>
-0xA7D3	0x5FD7	# <CJK>
-0xA7D4	0x5FCD	# <CJK>
-0xA7D5	0x5FF1	# <CJK>
-0xA7D6	0x5FEB	# <CJK>
-0xA7D7	0x5FF8	# <CJK>
-0xA7D8	0x5FEA	# <CJK>
-0xA7D9	0x6212	# <CJK>
-0xA7DA	0x6211	# <CJK>
-0xA7DB	0x6284	# <CJK>
-0xA7DC	0x6297	# <CJK>
-0xA7DD	0x6296	# <CJK>
-0xA7DE	0x6280	# <CJK>
-0xA7DF	0x6276	# <CJK>
-0xA7E0	0x6289	# <CJK>
-0xA7E1	0x626D	# <CJK>
-0xA7E2	0x628A	# <CJK>
-0xA7E3	0x627C	# <CJK>
-0xA7E4	0x627E	# <CJK>
-0xA7E5	0x6279	# <CJK>
-0xA7E6	0x6273	# <CJK>
-0xA7E7	0x6292	# <CJK>
-0xA7E8	0x626F	# <CJK>
-0xA7E9	0x6298	# <CJK>
-0xA7EA	0x626E	# <CJK>
-0xA7EB	0x6295	# <CJK>
-0xA7EC	0x6293	# <CJK>
-0xA7ED	0x6291	# <CJK>
-0xA7EE	0x6286	# <CJK>
-0xA7EF	0x6539	# <CJK>
-0xA7F0	0x653B	# <CJK>
-0xA7F1	0x6538	# <CJK>
-0xA7F2	0x65F1	# <CJK>
-0xA7F3	0x66F4	# <CJK>
-0xA7F4	0x675F	# <CJK>
-0xA7F5	0x674E	# <CJK>
-0xA7F6	0x674F	# <CJK>
-0xA7F7	0x6750	# <CJK>
-0xA7F8	0x6751	# <CJK>
-0xA7F9	0x675C	# <CJK>
-0xA7FA	0x6756	# <CJK>
-0xA7FB	0x675E	# <CJK>
-0xA7FC	0x6749	# <CJK>
-0xA7FD	0x6746	# <CJK>
-0xA7FE	0x6760	# <CJK>
-0xA840	0x6753	# <CJK>
-0xA841	0x6757	# <CJK>
-0xA842	0x6B65	# <CJK>
-0xA843	0x6BCF	# <CJK>
-0xA844	0x6C42	# <CJK>
-0xA845	0x6C5E	# <CJK>
-0xA846	0x6C99	# <CJK>
-0xA847	0x6C81	# <CJK>
-0xA848	0x6C88	# <CJK>
-0xA849	0x6C89	# <CJK>
-0xA84A	0x6C85	# <CJK>
-0xA84B	0x6C9B	# <CJK>
-0xA84C	0x6C6A	# <CJK>
-0xA84D	0x6C7A	# <CJK>
-0xA84E	0x6C90	# <CJK>
-0xA84F	0x6C70	# <CJK>
-0xA850	0x6C8C	# <CJK>
-0xA851	0x6C68	# <CJK>
-0xA852	0x6C96	# <CJK>
-0xA853	0x6C92	# <CJK>
-0xA854	0x6C7D	# <CJK>
-0xA855	0x6C83	# <CJK>
-0xA856	0x6C72	# <CJK>
-0xA857	0x6C7E	# <CJK>
-0xA858	0x6C74	# <CJK>
-0xA859	0x6C86	# <CJK>
-0xA85A	0x6C76	# <CJK>
-0xA85B	0x6C8D	# <CJK>
-0xA85C	0x6C94	# <CJK>
-0xA85D	0x6C98	# <CJK>
-0xA85E	0x6C82	# <CJK>
-0xA85F	0x7076	# <CJK>
-0xA860	0x707C	# <CJK>
-0xA861	0x707D	# <CJK>
-0xA862	0x7078	# <CJK>
-0xA863	0x7262	# <CJK>
-0xA864	0x7261	# <CJK>
-0xA865	0x7260	# <CJK>
-0xA866	0x72C4	# <CJK>
-0xA867	0x72C2	# <CJK>
-0xA868	0x7396	# <CJK>
-0xA869	0x752C	# <CJK>
-0xA86A	0x752B	# <CJK>
-0xA86B	0x7537	# <CJK>
-0xA86C	0x7538	# <CJK>
-0xA86D	0x7682	# <CJK>
-0xA86E	0x76EF	# <CJK>
-0xA86F	0x77E3	# <CJK>
-0xA870	0x79C1	# <CJK>
-0xA871	0x79C0	# <CJK>
-0xA872	0x79BF	# <CJK>
-0xA873	0x7A76	# <CJK>
-0xA874	0x7CFB	# <CJK>
-0xA875	0x7F55	# <CJK>
-0xA876	0x8096	# <CJK>
-0xA877	0x8093	# <CJK>
-0xA878	0x809D	# <CJK>
-0xA879	0x8098	# <CJK>
-0xA87A	0x809B	# <CJK>
-0xA87B	0x809A	# <CJK>
-0xA87C	0x80B2	# <CJK>
-0xA87D	0x826F	# <CJK>
-0xA87E	0x8292	# <CJK>
-0xA8A1	0x828B	# <CJK>
-0xA8A2	0x828D	# <CJK>
-0xA8A3	0x898B	# <CJK>
-0xA8A4	0x89D2	# <CJK>
-0xA8A5	0x8A00	# <CJK>
-0xA8A6	0x8C37	# <CJK>
-0xA8A7	0x8C46	# <CJK>
-0xA8A8	0x8C55	# <CJK>
-0xA8A9	0x8C9D	# <CJK>
-0xA8AA	0x8D64	# <CJK>
-0xA8AB	0x8D70	# <CJK>
-0xA8AC	0x8DB3	# <CJK>
-0xA8AD	0x8EAB	# <CJK>
-0xA8AE	0x8ECA	# <CJK>
-0xA8AF	0x8F9B	# <CJK>
-0xA8B0	0x8FB0	# <CJK>
-0xA8B1	0x8FC2	# <CJK>
-0xA8B2	0x8FC6	# <CJK>
-0xA8B3	0x8FC5	# <CJK>
-0xA8B4	0x8FC4	# <CJK>
-0xA8B5	0x5DE1	# <CJK>
-0xA8B6	0x9091	# <CJK>
-0xA8B7	0x90A2	# <CJK>
-0xA8B8	0x90AA	# <CJK>
-0xA8B9	0x90A6	# <CJK>
-0xA8BA	0x90A3	# <CJK>
-0xA8BB	0x9149	# <CJK>
-0xA8BC	0x91C6	# <CJK>
-0xA8BD	0x91CC	# <CJK>
-0xA8BE	0x9632	# <CJK>
-0xA8BF	0x962E	# <CJK>
-0xA8C0	0x9631	# <CJK>
-0xA8C1	0x962A	# <CJK>
-0xA8C2	0x962C	# <CJK>
-0xA8C3	0x4E26	# <CJK>
-0xA8C4	0x4E56	# <CJK>
-0xA8C5	0x4E73	# <CJK>
-0xA8C6	0x4E8B	# <CJK>
-0xA8C7	0x4E9B	# <CJK>
-0xA8C8	0x4E9E	# <CJK>
-0xA8C9	0x4EAB	# <CJK>
-0xA8CA	0x4EAC	# <CJK>
-0xA8CB	0x4F6F	# <CJK>
-0xA8CC	0x4F9D	# <CJK>
-0xA8CD	0x4F8D	# <CJK>
-0xA8CE	0x4F73	# <CJK>
-0xA8CF	0x4F7F	# <CJK>
-0xA8D0	0x4F6C	# <CJK>
-0xA8D1	0x4F9B	# <CJK>
-0xA8D2	0x4F8B	# <CJK>
-0xA8D3	0x4F86	# <CJK>
-0xA8D4	0x4F83	# <CJK>
-0xA8D5	0x4F70	# <CJK>
-0xA8D6	0x4F75	# <CJK>
-0xA8D7	0x4F88	# <CJK>
-0xA8D8	0x4F69	# <CJK>
-0xA8D9	0x4F7B	# <CJK>
-0xA8DA	0x4F96	# <CJK>
-0xA8DB	0x4F7E	# <CJK>
-0xA8DC	0x4F8F	# <CJK>
-0xA8DD	0x4F91	# <CJK>
-0xA8DE	0x4F7A	# <CJK>
-0xA8DF	0x5154	# <CJK>
-0xA8E0	0x5152	# <CJK>
-0xA8E1	0x5155	# <CJK>
-0xA8E2	0x5169	# <CJK>
-0xA8E3	0x5177	# <CJK>
-0xA8E4	0x5176	# <CJK>
-0xA8E5	0x5178	# <CJK>
-0xA8E6	0x51BD	# <CJK>
-0xA8E7	0x51FD	# <CJK>
-0xA8E8	0x523B	# <CJK>
-0xA8E9	0x5238	# <CJK>
-0xA8EA	0x5237	# <CJK>
-0xA8EB	0x523A	# <CJK>
-0xA8EC	0x5230	# <CJK>
-0xA8ED	0x522E	# <CJK>
-0xA8EE	0x5236	# <CJK>
-0xA8EF	0x5241	# <CJK>
-0xA8F0	0x52BE	# <CJK>
-0xA8F1	0x52BB	# <CJK>
-0xA8F2	0x5352	# <CJK>
-0xA8F3	0x5354	# <CJK>
-0xA8F4	0x5353	# <CJK>
-0xA8F5	0x5351	# <CJK>
-0xA8F6	0x5366	# <CJK>
-0xA8F7	0x5377	# <CJK>
-0xA8F8	0x5378	# <CJK>
-0xA8F9	0x5379	# <CJK>
-0xA8FA	0x53D6	# <CJK>
-0xA8FB	0x53D4	# <CJK>
-0xA8FC	0x53D7	# <CJK>
-0xA8FD	0x5473	# <CJK>
-0xA8FE	0x5475	# <CJK>
-0xA940	0x5496	# <CJK>
-0xA941	0x5478	# <CJK>
-0xA942	0x5495	# <CJK>
-0xA943	0x5480	# <CJK>
-0xA944	0x547B	# <CJK>
-0xA945	0x5477	# <CJK>
-0xA946	0x5484	# <CJK>
-0xA947	0x5492	# <CJK>
-0xA948	0x5486	# <CJK>
-0xA949	0x547C	# <CJK>
-0xA94A	0x5490	# <CJK>
-0xA94B	0x5471	# <CJK>
-0xA94C	0x5476	# <CJK>
-0xA94D	0x548C	# <CJK>
-0xA94E	0x549A	# <CJK>
-0xA94F	0x5462	# <CJK>
-0xA950	0x5468	# <CJK>
-0xA951	0x548B	# <CJK>
-0xA952	0x547D	# <CJK>
-0xA953	0x548E	# <CJK>
-0xA954	0x56FA	# <CJK>
-0xA955	0x5783	# <CJK>
-0xA956	0x5777	# <CJK>
-0xA957	0x576A	# <CJK>
-0xA958	0x5769	# <CJK>
-0xA959	0x5761	# <CJK>
-0xA95A	0x5766	# <CJK>
-0xA95B	0x5764	# <CJK>
-0xA95C	0x577C	# <CJK>
-0xA95D	0x591C	# <CJK>
-0xA95E	0x5949	# <CJK>
-0xA95F	0x5947	# <CJK>
-0xA960	0x5948	# <CJK>
-0xA961	0x5944	# <CJK>
-0xA962	0x5954	# <CJK>
-0xA963	0x59BE	# <CJK>
-0xA964	0x59BB	# <CJK>
-0xA965	0x59D4	# <CJK>
-0xA966	0x59B9	# <CJK>
-0xA967	0x59AE	# <CJK>
-0xA968	0x59D1	# <CJK>
-0xA969	0x59C6	# <CJK>
-0xA96A	0x59D0	# <CJK>
-0xA96B	0x59CD	# <CJK>
-0xA96C	0x59CB	# <CJK>
-0xA96D	0x59D3	# <CJK>
-0xA96E	0x59CA	# <CJK>
-0xA96F	0x59AF	# <CJK>
-0xA970	0x59B3	# <CJK>
-0xA971	0x59D2	# <CJK>
-0xA972	0x59C5	# <CJK>
-0xA973	0x5B5F	# <CJK>
-0xA974	0x5B64	# <CJK>
-0xA975	0x5B63	# <CJK>
-0xA976	0x5B97	# <CJK>
-0xA977	0x5B9A	# <CJK>
-0xA978	0x5B98	# <CJK>
-0xA979	0x5B9C	# <CJK>
-0xA97A	0x5B99	# <CJK>
-0xA97B	0x5B9B	# <CJK>
-0xA97C	0x5C1A	# <CJK>
-0xA97D	0x5C48	# <CJK>
-0xA97E	0x5C45	# <CJK>
-0xA9A1	0x5C46	# <CJK>
-0xA9A2	0x5CB7	# <CJK>
-0xA9A3	0x5CA1	# <CJK>
-0xA9A4	0x5CB8	# <CJK>
-0xA9A5	0x5CA9	# <CJK>
-0xA9A6	0x5CAB	# <CJK>
-0xA9A7	0x5CB1	# <CJK>
-0xA9A8	0x5CB3	# <CJK>
-0xA9A9	0x5E18	# <CJK>
-0xA9AA	0x5E1A	# <CJK>
-0xA9AB	0x5E16	# <CJK>
-0xA9AC	0x5E15	# <CJK>
-0xA9AD	0x5E1B	# <CJK>
-0xA9AE	0x5E11	# <CJK>
-0xA9AF	0x5E78	# <CJK>
-0xA9B0	0x5E9A	# <CJK>
-0xA9B1	0x5E97	# <CJK>
-0xA9B2	0x5E9C	# <CJK>
-0xA9B3	0x5E95	# <CJK>
-0xA9B4	0x5E96	# <CJK>
-0xA9B5	0x5EF6	# <CJK>
-0xA9B6	0x5F26	# <CJK>
-0xA9B7	0x5F27	# <CJK>
-0xA9B8	0x5F29	# <CJK>
-0xA9B9	0x5F80	# <CJK>
-0xA9BA	0x5F81	# <CJK>
-0xA9BB	0x5F7F	# <CJK>
-0xA9BC	0x5F7C	# <CJK>
-0xA9BD	0x5FDD	# <CJK>
-0xA9BE	0x5FE0	# <CJK>
-0xA9BF	0x5FFD	# <CJK>
-0xA9C0	0x5FF5	# <CJK>
-0xA9C1	0x5FFF	# <CJK>
-0xA9C2	0x600F	# <CJK>
-0xA9C3	0x6014	# <CJK>
-0xA9C4	0x602F	# <CJK>
-0xA9C5	0x6035	# <CJK>
-0xA9C6	0x6016	# <CJK>
-0xA9C7	0x602A	# <CJK>
-0xA9C8	0x6015	# <CJK>
-0xA9C9	0x6021	# <CJK>
-0xA9CA	0x6027	# <CJK>
-0xA9CB	0x6029	# <CJK>
-0xA9CC	0x602B	# <CJK>
-0xA9CD	0x601B	# <CJK>
-0xA9CE	0x6216	# <CJK>
-0xA9CF	0x6215	# <CJK>
-0xA9D0	0x623F	# <CJK>
-0xA9D1	0x623E	# <CJK>
-0xA9D2	0x6240	# <CJK>
-0xA9D3	0x627F	# <CJK>
-0xA9D4	0x62C9	# <CJK>
-0xA9D5	0x62CC	# <CJK>
-0xA9D6	0x62C4	# <CJK>
-0xA9D7	0x62BF	# <CJK>
-0xA9D8	0x62C2	# <CJK>
-0xA9D9	0x62B9	# <CJK>
-0xA9DA	0x62D2	# <CJK>
-0xA9DB	0x62DB	# <CJK>
-0xA9DC	0x62AB	# <CJK>
-0xA9DD	0x62D3	# <CJK>
-0xA9DE	0x62D4	# <CJK>
-0xA9DF	0x62CB	# <CJK>
-0xA9E0	0x62C8	# <CJK>
-0xA9E1	0x62A8	# <CJK>
-0xA9E2	0x62BD	# <CJK>
-0xA9E3	0x62BC	# <CJK>
-0xA9E4	0x62D0	# <CJK>
-0xA9E5	0x62D9	# <CJK>
-0xA9E6	0x62C7	# <CJK>
-0xA9E7	0x62CD	# <CJK>
-0xA9E8	0x62B5	# <CJK>
-0xA9E9	0x62DA	# <CJK>
-0xA9EA	0x62B1	# <CJK>
-0xA9EB	0x62D8	# <CJK>
-0xA9EC	0x62D6	# <CJK>
-0xA9ED	0x62D7	# <CJK>
-0xA9EE	0x62C6	# <CJK>
-0xA9EF	0x62AC	# <CJK>
-0xA9F0	0x62CE	# <CJK>
-0xA9F1	0x653E	# <CJK>
-0xA9F2	0x65A7	# <CJK>
-0xA9F3	0x65BC	# <CJK>
-0xA9F4	0x65FA	# <CJK>
-0xA9F5	0x6614	# <CJK>
-0xA9F6	0x6613	# <CJK>
-0xA9F7	0x660C	# <CJK>
-0xA9F8	0x6606	# <CJK>
-0xA9F9	0x6602	# <CJK>
-0xA9FA	0x660E	# <CJK>
-0xA9FB	0x6600	# <CJK>
-0xA9FC	0x660F	# <CJK>
-0xA9FD	0x6615	# <CJK>
-0xA9FE	0x660A	# <CJK>
-0xAA40	0x6607	# <CJK>
-0xAA41	0x670D	# <CJK>
-0xAA42	0x670B	# <CJK>
-0xAA43	0x676D	# <CJK>
-0xAA44	0x678B	# <CJK>
-0xAA45	0x6795	# <CJK>
-0xAA46	0x6771	# <CJK>
-0xAA47	0x679C	# <CJK>
-0xAA48	0x6773	# <CJK>
-0xAA49	0x6777	# <CJK>
-0xAA4A	0x6787	# <CJK>
-0xAA4B	0x679D	# <CJK>
-0xAA4C	0x6797	# <CJK>
-0xAA4D	0x676F	# <CJK>
-0xAA4E	0x6770	# <CJK>
-0xAA4F	0x677F	# <CJK>
-0xAA50	0x6789	# <CJK>
-0xAA51	0x677E	# <CJK>
-0xAA52	0x6790	# <CJK>
-0xAA53	0x6775	# <CJK>
-0xAA54	0x679A	# <CJK>
-0xAA55	0x6793	# <CJK>
-0xAA56	0x677C	# <CJK>
-0xAA57	0x676A	# <CJK>
-0xAA58	0x6772	# <CJK>
-0xAA59	0x6B23	# <CJK>
-0xAA5A	0x6B66	# <CJK>
-0xAA5B	0x6B67	# <CJK>
-0xAA5C	0x6B7F	# <CJK>
-0xAA5D	0x6C13	# <CJK>
-0xAA5E	0x6C1B	# <CJK>
-0xAA5F	0x6CE3	# <CJK>
-0xAA60	0x6CE8	# <CJK>
-0xAA61	0x6CF3	# <CJK>
-0xAA62	0x6CB1	# <CJK>
-0xAA63	0x6CCC	# <CJK>
-0xAA64	0x6CE5	# <CJK>
-0xAA65	0x6CB3	# <CJK>
-0xAA66	0x6CBD	# <CJK>
-0xAA67	0x6CBE	# <CJK>
-0xAA68	0x6CBC	# <CJK>
-0xAA69	0x6CE2	# <CJK>
-0xAA6A	0x6CAB	# <CJK>
-0xAA6B	0x6CD5	# <CJK>
-0xAA6C	0x6CD3	# <CJK>
-0xAA6D	0x6CB8	# <CJK>
-0xAA6E	0x6CC4	# <CJK>
-0xAA6F	0x6CB9	# <CJK>
-0xAA70	0x6CC1	# <CJK>
-0xAA71	0x6CAE	# <CJK>
-0xAA72	0x6CD7	# <CJK>
-0xAA73	0x6CC5	# <CJK>
-0xAA74	0x6CF1	# <CJK>
-0xAA75	0x6CBF	# <CJK>
-0xAA76	0x6CBB	# <CJK>
-0xAA77	0x6CE1	# <CJK>
-0xAA78	0x6CDB	# <CJK>
-0xAA79	0x6CCA	# <CJK>
-0xAA7A	0x6CAC	# <CJK>
-0xAA7B	0x6CEF	# <CJK>
-0xAA7C	0x6CDC	# <CJK>
-0xAA7D	0x6CD6	# <CJK>
-0xAA7E	0x6CE0	# <CJK>
-0xAAA1	0x7095	# <CJK>
-0xAAA2	0x708E	# <CJK>
-0xAAA3	0x7092	# <CJK>
-0xAAA4	0x708A	# <CJK>
-0xAAA5	0x7099	# <CJK>
-0xAAA6	0x722C	# <CJK>
-0xAAA7	0x722D	# <CJK>
-0xAAA8	0x7238	# <CJK>
-0xAAA9	0x7248	# <CJK>
-0xAAAA	0x7267	# <CJK>
-0xAAAB	0x7269	# <CJK>
-0xAAAC	0x72C0	# <CJK>
-0xAAAD	0x72CE	# <CJK>
-0xAAAE	0x72D9	# <CJK>
-0xAAAF	0x72D7	# <CJK>
-0xAAB0	0x72D0	# <CJK>
-0xAAB1	0x73A9	# <CJK>
-0xAAB2	0x73A8	# <CJK>
-0xAAB3	0x739F	# <CJK>
-0xAAB4	0x73AB	# <CJK>
-0xAAB5	0x73A5	# <CJK>
-0xAAB6	0x753D	# <CJK>
-0xAAB7	0x759D	# <CJK>
-0xAAB8	0x7599	# <CJK>
-0xAAB9	0x759A	# <CJK>
-0xAABA	0x7684	# <CJK>
-0xAABB	0x76C2	# <CJK>
-0xAABC	0x76F2	# <CJK>
-0xAABD	0x76F4	# <CJK>
-0xAABE	0x77E5	# <CJK>
-0xAABF	0x77FD	# <CJK>
-0xAAC0	0x793E	# <CJK>
-0xAAC1	0x7940	# <CJK>
-0xAAC2	0x7941	# <CJK>
-0xAAC3	0x79C9	# <CJK>
-0xAAC4	0x79C8	# <CJK>
-0xAAC5	0x7A7A	# <CJK>
-0xAAC6	0x7A79	# <CJK>
-0xAAC7	0x7AFA	# <CJK>
-0xAAC8	0x7CFE	# <CJK>
-0xAAC9	0x7F54	# <CJK>
-0xAACA	0x7F8C	# <CJK>
-0xAACB	0x7F8B	# <CJK>
-0xAACC	0x8005	# <CJK>
-0xAACD	0x80BA	# <CJK>
-0xAACE	0x80A5	# <CJK>
-0xAACF	0x80A2	# <CJK>
-0xAAD0	0x80B1	# <CJK>
-0xAAD1	0x80A1	# <CJK>
-0xAAD2	0x80AB	# <CJK>
-0xAAD3	0x80A9	# <CJK>
-0xAAD4	0x80B4	# <CJK>
-0xAAD5	0x80AA	# <CJK>
-0xAAD6	0x80AF	# <CJK>
-0xAAD7	0x81E5	# <CJK>
-0xAAD8	0x81FE	# <CJK>
-0xAAD9	0x820D	# <CJK>
-0xAADA	0x82B3	# <CJK>
-0xAADB	0x829D	# <CJK>
-0xAADC	0x8299	# <CJK>
-0xAADD	0x82AD	# <CJK>
-0xAADE	0x82BD	# <CJK>
-0xAADF	0x829F	# <CJK>
-0xAAE0	0x82B9	# <CJK>
-0xAAE1	0x82B1	# <CJK>
-0xAAE2	0x82AC	# <CJK>
-0xAAE3	0x82A5	# <CJK>
-0xAAE4	0x82AF	# <CJK>
-0xAAE5	0x82B8	# <CJK>
-0xAAE6	0x82A3	# <CJK>
-0xAAE7	0x82B0	# <CJK>
-0xAAE8	0x82BE	# <CJK>
-0xAAE9	0x82B7	# <CJK>
-0xAAEA	0x864E	# <CJK>
-0xAAEB	0x8671	# <CJK>
-0xAAEC	0x521D	# <CJK>
-0xAAED	0x8868	# <CJK>
-0xAAEE	0x8ECB	# <CJK>
-0xAAEF	0x8FCE	# <CJK>
-0xAAF0	0x8FD4	# <CJK>
-0xAAF1	0x8FD1	# <CJK>
-0xAAF2	0x90B5	# <CJK>
-0xAAF3	0x90B8	# <CJK>
-0xAAF4	0x90B1	# <CJK>
-0xAAF5	0x90B6	# <CJK>
-0xAAF6	0x91C7	# <CJK>
-0xAAF7	0x91D1	# <CJK>
-0xAAF8	0x9577	# <CJK>
-0xAAF9	0x9580	# <CJK>
-0xAAFA	0x961C	# <CJK>
-0xAAFB	0x9640	# <CJK>
-0xAAFC	0x963F	# <CJK>
-0xAAFD	0x963B	# <CJK>
-0xAAFE	0x9644	# <CJK>
-0xAB40	0x9642	# <CJK>
-0xAB41	0x96B9	# <CJK>
-0xAB42	0x96E8	# <CJK>
-0xAB43	0x9752	# <CJK>
-0xAB44	0x975E	# <CJK>
-0xAB45	0x4E9F	# <CJK>
-0xAB46	0x4EAD	# <CJK>
-0xAB47	0x4EAE	# <CJK>
-0xAB48	0x4FE1	# <CJK>
-0xAB49	0x4FB5	# <CJK>
-0xAB4A	0x4FAF	# <CJK>
-0xAB4B	0x4FBF	# <CJK>
-0xAB4C	0x4FE0	# <CJK>
-0xAB4D	0x4FD1	# <CJK>
-0xAB4E	0x4FCF	# <CJK>
-0xAB4F	0x4FDD	# <CJK>
-0xAB50	0x4FC3	# <CJK>
-0xAB51	0x4FB6	# <CJK>
-0xAB52	0x4FD8	# <CJK>
-0xAB53	0x4FDF	# <CJK>
-0xAB54	0x4FCA	# <CJK>
-0xAB55	0x4FD7	# <CJK>
-0xAB56	0x4FAE	# <CJK>
-0xAB57	0x4FD0	# <CJK>
-0xAB58	0x4FC4	# <CJK>
-0xAB59	0x4FC2	# <CJK>
-0xAB5A	0x4FDA	# <CJK>
-0xAB5B	0x4FCE	# <CJK>
-0xAB5C	0x4FDE	# <CJK>
-0xAB5D	0x4FB7	# <CJK>
-0xAB5E	0x5157	# <CJK>
-0xAB5F	0x5192	# <CJK>
-0xAB60	0x5191	# <CJK>
-0xAB61	0x51A0	# <CJK>
-0xAB62	0x524E	# <CJK>
-0xAB63	0x5243	# <CJK>
-0xAB64	0x524A	# <CJK>
-0xAB65	0x524D	# <CJK>
-0xAB66	0x524C	# <CJK>
-0xAB67	0x524B	# <CJK>
-0xAB68	0x5247	# <CJK>
-0xAB69	0x52C7	# <CJK>
-0xAB6A	0x52C9	# <CJK>
-0xAB6B	0x52C3	# <CJK>
-0xAB6C	0x52C1	# <CJK>
-0xAB6D	0x530D	# <CJK>
-0xAB6E	0x5357	# <CJK>
-0xAB6F	0x537B	# <CJK>
-0xAB70	0x539A	# <CJK>
-0xAB71	0x53DB	# <CJK>
-0xAB72	0x54AC	# <CJK>
-0xAB73	0x54C0	# <CJK>
-0xAB74	0x54A8	# <CJK>
-0xAB75	0x54CE	# <CJK>
-0xAB76	0x54C9	# <CJK>
-0xAB77	0x54B8	# <CJK>
-0xAB78	0x54A6	# <CJK>
-0xAB79	0x54B3	# <CJK>
-0xAB7A	0x54C7	# <CJK>
-0xAB7B	0x54C2	# <CJK>
-0xAB7C	0x54BD	# <CJK>
-0xAB7D	0x54AA	# <CJK>
-0xAB7E	0x54C1	# <CJK>
-0xABA1	0x54C4	# <CJK>
-0xABA2	0x54C8	# <CJK>
-0xABA3	0x54AF	# <CJK>
-0xABA4	0x54AB	# <CJK>
-0xABA5	0x54B1	# <CJK>
-0xABA6	0x54BB	# <CJK>
-0xABA7	0x54A9	# <CJK>
-0xABA8	0x54A7	# <CJK>
-0xABA9	0x54BF	# <CJK>
-0xABAA	0x56FF	# <CJK>
-0xABAB	0x5782	# <CJK>
-0xABAC	0x578B	# <CJK>
-0xABAD	0x57A0	# <CJK>
-0xABAE	0x57A3	# <CJK>
-0xABAF	0x57A2	# <CJK>
-0xABB0	0x57CE	# <CJK>
-0xABB1	0x57AE	# <CJK>
-0xABB2	0x5793	# <CJK>
-0xABB3	0x5955	# <CJK>
-0xABB4	0x5951	# <CJK>
-0xABB5	0x594F	# <CJK>
-0xABB6	0x594E	# <CJK>
-0xABB7	0x5950	# <CJK>
-0xABB8	0x59DC	# <CJK>
-0xABB9	0x59D8	# <CJK>
-0xABBA	0x59FF	# <CJK>
-0xABBB	0x59E3	# <CJK>
-0xABBC	0x59E8	# <CJK>
-0xABBD	0x5A03	# <CJK>
-0xABBE	0x59E5	# <CJK>
-0xABBF	0x59EA	# <CJK>
-0xABC0	0x59DA	# <CJK>
-0xABC1	0x59E6	# <CJK>
-0xABC2	0x5A01	# <CJK>
-0xABC3	0x59FB	# <CJK>
-0xABC4	0x5B69	# <CJK>
-0xABC5	0x5BA3	# <CJK>
-0xABC6	0x5BA6	# <CJK>
-0xABC7	0x5BA4	# <CJK>
-0xABC8	0x5BA2	# <CJK>
-0xABC9	0x5BA5	# <CJK>
-0xABCA	0x5C01	# <CJK>
-0xABCB	0x5C4E	# <CJK>
-0xABCC	0x5C4F	# <CJK>
-0xABCD	0x5C4D	# <CJK>
-0xABCE	0x5C4B	# <CJK>
-0xABCF	0x5CD9	# <CJK>
-0xABD0	0x5CD2	# <CJK>
-0xABD1	0x5DF7	# <CJK>
-0xABD2	0x5E1D	# <CJK>
-0xABD3	0x5E25	# <CJK>
-0xABD4	0x5E1F	# <CJK>
-0xABD5	0x5E7D	# <CJK>
-0xABD6	0x5EA0	# <CJK>
-0xABD7	0x5EA6	# <CJK>
-0xABD8	0x5EFA	# <CJK>
-0xABD9	0x5F08	# <CJK>
-0xABDA	0x5F2D	# <CJK>
-0xABDB	0x5F65	# <CJK>
-0xABDC	0x5F88	# <CJK>
-0xABDD	0x5F85	# <CJK>
-0xABDE	0x5F8A	# <CJK>
-0xABDF	0x5F8B	# <CJK>
-0xABE0	0x5F87	# <CJK>
-0xABE1	0x5F8C	# <CJK>
-0xABE2	0x5F89	# <CJK>
-0xABE3	0x6012	# <CJK>
-0xABE4	0x601D	# <CJK>
-0xABE5	0x6020	# <CJK>
-0xABE6	0x6025	# <CJK>
-0xABE7	0x600E	# <CJK>
-0xABE8	0x6028	# <CJK>
-0xABE9	0x604D	# <CJK>
-0xABEA	0x6070	# <CJK>
-0xABEB	0x6068	# <CJK>
-0xABEC	0x6062	# <CJK>
-0xABED	0x6046	# <CJK>
-0xABEE	0x6043	# <CJK>
-0xABEF	0x606C	# <CJK>
-0xABF0	0x606B	# <CJK>
-0xABF1	0x606A	# <CJK>
-0xABF2	0x6064	# <CJK>
-0xABF3	0x6241	# <CJK>
-0xABF4	0x62DC	# <CJK>
-0xABF5	0x6316	# <CJK>
-0xABF6	0x6309	# <CJK>
-0xABF7	0x62FC	# <CJK>
-0xABF8	0x62ED	# <CJK>
-0xABF9	0x6301	# <CJK>
-0xABFA	0x62EE	# <CJK>
-0xABFB	0x62FD	# <CJK>
-0xABFC	0x6307	# <CJK>
-0xABFD	0x62F1	# <CJK>
-0xABFE	0x62F7	# <CJK>
-0xAC40	0x62EF	# <CJK>
-0xAC41	0x62EC	# <CJK>
-0xAC42	0x62FE	# <CJK>
-0xAC43	0x62F4	# <CJK>
-0xAC44	0x6311	# <CJK>
-0xAC45	0x6302	# <CJK>
-0xAC46	0x653F	# <CJK>
-0xAC47	0x6545	# <CJK>
-0xAC48	0x65AB	# <CJK>
-0xAC49	0x65BD	# <CJK>
-0xAC4A	0x65E2	# <CJK>
-0xAC4B	0x6625	# <CJK>
-0xAC4C	0x662D	# <CJK>
-0xAC4D	0x6620	# <CJK>
-0xAC4E	0x6627	# <CJK>
-0xAC4F	0x662F	# <CJK>
-0xAC50	0x661F	# <CJK>
-0xAC51	0x6628	# <CJK>
-0xAC52	0x6631	# <CJK>
-0xAC53	0x6624	# <CJK>
-0xAC54	0x66F7	# <CJK>
-0xAC55	0x67FF	# <CJK>
-0xAC56	0x67D3	# <CJK>
-0xAC57	0x67F1	# <CJK>
-0xAC58	0x67D4	# <CJK>
-0xAC59	0x67D0	# <CJK>
-0xAC5A	0x67EC	# <CJK>
-0xAC5B	0x67B6	# <CJK>
-0xAC5C	0x67AF	# <CJK>
-0xAC5D	0x67F5	# <CJK>
-0xAC5E	0x67E9	# <CJK>
-0xAC5F	0x67EF	# <CJK>
-0xAC60	0x67C4	# <CJK>
-0xAC61	0x67D1	# <CJK>
-0xAC62	0x67B4	# <CJK>
-0xAC63	0x67DA	# <CJK>
-0xAC64	0x67E5	# <CJK>
-0xAC65	0x67B8	# <CJK>
-0xAC66	0x67CF	# <CJK>
-0xAC67	0x67DE	# <CJK>
-0xAC68	0x67F3	# <CJK>
-0xAC69	0x67B0	# <CJK>
-0xAC6A	0x67D9	# <CJK>
-0xAC6B	0x67E2	# <CJK>
-0xAC6C	0x67DD	# <CJK>
-0xAC6D	0x67D2	# <CJK>
-0xAC6E	0x6B6A	# <CJK>
-0xAC6F	0x6B83	# <CJK>
-0xAC70	0x6B86	# <CJK>
-0xAC71	0x6BB5	# <CJK>
-0xAC72	0x6BD2	# <CJK>
-0xAC73	0x6BD7	# <CJK>
-0xAC74	0x6C1F	# <CJK>
-0xAC75	0x6CC9	# <CJK>
-0xAC76	0x6D0B	# <CJK>
-0xAC77	0x6D32	# <CJK>
-0xAC78	0x6D2A	# <CJK>
-0xAC79	0x6D41	# <CJK>
-0xAC7A	0x6D25	# <CJK>
-0xAC7B	0x6D0C	# <CJK>
-0xAC7C	0x6D31	# <CJK>
-0xAC7D	0x6D1E	# <CJK>
-0xAC7E	0x6D17	# <CJK>
-0xACA1	0x6D3B	# <CJK>
-0xACA2	0x6D3D	# <CJK>
-0xACA3	0x6D3E	# <CJK>
-0xACA4	0x6D36	# <CJK>
-0xACA5	0x6D1B	# <CJK>
-0xACA6	0x6CF5	# <CJK>
-0xACA7	0x6D39	# <CJK>
-0xACA8	0x6D27	# <CJK>
-0xACA9	0x6D38	# <CJK>
-0xACAA	0x6D29	# <CJK>
-0xACAB	0x6D2E	# <CJK>
-0xACAC	0x6D35	# <CJK>
-0xACAD	0x6D0E	# <CJK>
-0xACAE	0x6D2B	# <CJK>
-0xACAF	0x70AB	# <CJK>
-0xACB0	0x70BA	# <CJK>
-0xACB1	0x70B3	# <CJK>
-0xACB2	0x70AC	# <CJK>
-0xACB3	0x70AF	# <CJK>
-0xACB4	0x70AD	# <CJK>
-0xACB5	0x70B8	# <CJK>
-0xACB6	0x70AE	# <CJK>
-0xACB7	0x70A4	# <CJK>
-0xACB8	0x7230	# <CJK>
-0xACB9	0x7272	# <CJK>
-0xACBA	0x726F	# <CJK>
-0xACBB	0x7274	# <CJK>
-0xACBC	0x72E9	# <CJK>
-0xACBD	0x72E0	# <CJK>
-0xACBE	0x72E1	# <CJK>
-0xACBF	0x73B7	# <CJK>
-0xACC0	0x73CA	# <CJK>
-0xACC1	0x73BB	# <CJK>
-0xACC2	0x73B2	# <CJK>
-0xACC3	0x73CD	# <CJK>
-0xACC4	0x73C0	# <CJK>
-0xACC5	0x73B3	# <CJK>
-0xACC6	0x751A	# <CJK>
-0xACC7	0x752D	# <CJK>
-0xACC8	0x754F	# <CJK>
-0xACC9	0x754C	# <CJK>
-0xACCA	0x754E	# <CJK>
-0xACCB	0x754B	# <CJK>
-0xACCC	0x75AB	# <CJK>
-0xACCD	0x75A4	# <CJK>
-0xACCE	0x75A5	# <CJK>
-0xACCF	0x75A2	# <CJK>
-0xACD0	0x75A3	# <CJK>
-0xACD1	0x7678	# <CJK>
-0xACD2	0x7686	# <CJK>
-0xACD3	0x7687	# <CJK>
-0xACD4	0x7688	# <CJK>
-0xACD5	0x76C8	# <CJK>
-0xACD6	0x76C6	# <CJK>
-0xACD7	0x76C3	# <CJK>
-0xACD8	0x76C5	# <CJK>
-0xACD9	0x7701	# <CJK>
-0xACDA	0x76F9	# <CJK>
-0xACDB	0x76F8	# <CJK>
-0xACDC	0x7709	# <CJK>
-0xACDD	0x770B	# <CJK>
-0xACDE	0x76FE	# <CJK>
-0xACDF	0x76FC	# <CJK>
-0xACE0	0x7707	# <CJK>
-0xACE1	0x77DC	# <CJK>
-0xACE2	0x7802	# <CJK>
-0xACE3	0x7814	# <CJK>
-0xACE4	0x780C	# <CJK>
-0xACE5	0x780D	# <CJK>
-0xACE6	0x7946	# <CJK>
-0xACE7	0x7949	# <CJK>
-0xACE8	0x7948	# <CJK>
-0xACE9	0x7947	# <CJK>
-0xACEA	0x79B9	# <CJK>
-0xACEB	0x79BA	# <CJK>
-0xACEC	0x79D1	# <CJK>
-0xACED	0x79D2	# <CJK>
-0xACEE	0x79CB	# <CJK>
-0xACEF	0x7A7F	# <CJK>
-0xACF0	0x7A81	# <CJK>
-0xACF1	0x7AFF	# <CJK>
-0xACF2	0x7AFD	# <CJK>
-0xACF3	0x7C7D	# <CJK>
-0xACF4	0x7D02	# <CJK>
-0xACF5	0x7D05	# <CJK>
-0xACF6	0x7D00	# <CJK>
-0xACF7	0x7D09	# <CJK>
-0xACF8	0x7D07	# <CJK>
-0xACF9	0x7D04	# <CJK>
-0xACFA	0x7D06	# <CJK>
-0xACFB	0x7F38	# <CJK>
-0xACFC	0x7F8E	# <CJK>
-0xACFD	0x7FBF	# <CJK>
-0xACFE	0x8004	# <CJK>
-0xAD40	0x8010	# <CJK>
-0xAD41	0x800D	# <CJK>
-0xAD42	0x8011	# <CJK>
-0xAD43	0x8036	# <CJK>
-0xAD44	0x80D6	# <CJK>
-0xAD45	0x80E5	# <CJK>
-0xAD46	0x80DA	# <CJK>
-0xAD47	0x80C3	# <CJK>
-0xAD48	0x80C4	# <CJK>
-0xAD49	0x80CC	# <CJK>
-0xAD4A	0x80E1	# <CJK>
-0xAD4B	0x80DB	# <CJK>
-0xAD4C	0x80CE	# <CJK>
-0xAD4D	0x80DE	# <CJK>
-0xAD4E	0x80E4	# <CJK>
-0xAD4F	0x80DD	# <CJK>
-0xAD50	0x81F4	# <CJK>
-0xAD51	0x8222	# <CJK>
-0xAD52	0x82E7	# <CJK>
-0xAD53	0x8303	# <CJK>
-0xAD54	0x8305	# <CJK>
-0xAD55	0x82E3	# <CJK>
-0xAD56	0x82DB	# <CJK>
-0xAD57	0x82E6	# <CJK>
-0xAD58	0x8304	# <CJK>
-0xAD59	0x82E5	# <CJK>
-0xAD5A	0x8302	# <CJK>
-0xAD5B	0x8309	# <CJK>
-0xAD5C	0x82D2	# <CJK>
-0xAD5D	0x82D7	# <CJK>
-0xAD5E	0x82F1	# <CJK>
-0xAD5F	0x8301	# <CJK>
-0xAD60	0x82DC	# <CJK>
-0xAD61	0x82D4	# <CJK>
-0xAD62	0x82D1	# <CJK>
-0xAD63	0x82DE	# <CJK>
-0xAD64	0x82D3	# <CJK>
-0xAD65	0x82DF	# <CJK>
-0xAD66	0x82EF	# <CJK>
-0xAD67	0x8306	# <CJK>
-0xAD68	0x8650	# <CJK>
-0xAD69	0x8679	# <CJK>
-0xAD6A	0x867B	# <CJK>
-0xAD6B	0x867A	# <CJK>
-0xAD6C	0x884D	# <CJK>
-0xAD6D	0x886B	# <CJK>
-0xAD6E	0x8981	# <CJK>
-0xAD6F	0x89D4	# <CJK>
-0xAD70	0x8A08	# <CJK>
-0xAD71	0x8A02	# <CJK>
-0xAD72	0x8A03	# <CJK>
-0xAD73	0x8C9E	# <CJK>
-0xAD74	0x8CA0	# <CJK>
-0xAD75	0x8D74	# <CJK>
-0xAD76	0x8D73	# <CJK>
-0xAD77	0x8DB4	# <CJK>
-0xAD78	0x8ECD	# <CJK>
-0xAD79	0x8ECC	# <CJK>
-0xAD7A	0x8FF0	# <CJK>
-0xAD7B	0x8FE6	# <CJK>
-0xAD7C	0x8FE2	# <CJK>
-0xAD7D	0x8FEA	# <CJK>
-0xAD7E	0x8FE5	# <CJK>
-0xADA1	0x8FED	# <CJK>
-0xADA2	0x8FEB	# <CJK>
-0xADA3	0x8FE4	# <CJK>
-0xADA4	0x8FE8	# <CJK>
-0xADA5	0x90CA	# <CJK>
-0xADA6	0x90CE	# <CJK>
-0xADA7	0x90C1	# <CJK>
-0xADA8	0x90C3	# <CJK>
-0xADA9	0x914B	# <CJK>
-0xADAA	0x914A	# <CJK>
-0xADAB	0x91CD	# <CJK>
-0xADAC	0x9582	# <CJK>
-0xADAD	0x9650	# <CJK>
-0xADAE	0x964B	# <CJK>
-0xADAF	0x964C	# <CJK>
-0xADB0	0x964D	# <CJK>
-0xADB1	0x9762	# <CJK>
-0xADB2	0x9769	# <CJK>
-0xADB3	0x97CB	# <CJK>
-0xADB4	0x97ED	# <CJK>
-0xADB5	0x97F3	# <CJK>
-0xADB6	0x9801	# <CJK>
-0xADB7	0x98A8	# <CJK>
-0xADB8	0x98DB	# <CJK>
-0xADB9	0x98DF	# <CJK>
-0xADBA	0x9996	# <CJK>
-0xADBB	0x9999	# <CJK>
-0xADBC	0x4E58	# <CJK>
-0xADBD	0x4EB3	# <CJK>
-0xADBE	0x500C	# <CJK>
-0xADBF	0x500D	# <CJK>
-0xADC0	0x5023	# <CJK>
-0xADC1	0x4FEF	# <CJK>
-0xADC2	0x5026	# <CJK>
-0xADC3	0x5025	# <CJK>
-0xADC4	0x4FF8	# <CJK>
-0xADC5	0x5029	# <CJK>
-0xADC6	0x5016	# <CJK>
-0xADC7	0x5006	# <CJK>
-0xADC8	0x503C	# <CJK>
-0xADC9	0x501F	# <CJK>
-0xADCA	0x501A	# <CJK>
-0xADCB	0x5012	# <CJK>
-0xADCC	0x5011	# <CJK>
-0xADCD	0x4FFA	# <CJK>
-0xADCE	0x5000	# <CJK>
-0xADCF	0x5014	# <CJK>
-0xADD0	0x5028	# <CJK>
-0xADD1	0x4FF1	# <CJK>
-0xADD2	0x5021	# <CJK>
-0xADD3	0x500B	# <CJK>
-0xADD4	0x5019	# <CJK>
-0xADD5	0x5018	# <CJK>
-0xADD6	0x4FF3	# <CJK>
-0xADD7	0x4FEE	# <CJK>
-0xADD8	0x502D	# <CJK>
-0xADD9	0x502A	# <CJK>
-0xADDA	0x4FFE	# <CJK>
-0xADDB	0x502B	# <CJK>
-0xADDC	0x5009	# <CJK>
-0xADDD	0x517C	# <CJK>
-0xADDE	0x51A4	# <CJK>
-0xADDF	0x51A5	# <CJK>
-0xADE0	0x51A2	# <CJK>
-0xADE1	0x51CD	# <CJK>
-0xADE2	0x51CC	# <CJK>
-0xADE3	0x51C6	# <CJK>
-0xADE4	0x51CB	# <CJK>
-0xADE5	0x5256	# <CJK>
-0xADE6	0x525C	# <CJK>
-0xADE7	0x5254	# <CJK>
-0xADE8	0x525B	# <CJK>
-0xADE9	0x525D	# <CJK>
-0xADEA	0x532A	# <CJK>
-0xADEB	0x537F	# <CJK>
-0xADEC	0x539F	# <CJK>
-0xADED	0x539D	# <CJK>
-0xADEE	0x53DF	# <CJK>
-0xADEF	0x54E8	# <CJK>
-0xADF0	0x5510	# <CJK>
-0xADF1	0x5501	# <CJK>
-0xADF2	0x5537	# <CJK>
-0xADF3	0x54FC	# <CJK>
-0xADF4	0x54E5	# <CJK>
-0xADF5	0x54F2	# <CJK>
-0xADF6	0x5506	# <CJK>
-0xADF7	0x54FA	# <CJK>
-0xADF8	0x5514	# <CJK>
-0xADF9	0x54E9	# <CJK>
-0xADFA	0x54ED	# <CJK>
-0xADFB	0x54E1	# <CJK>
-0xADFC	0x5509	# <CJK>
-0xADFD	0x54EE	# <CJK>
-0xADFE	0x54EA	# <CJK>
-0xAE40	0x54E6	# <CJK>
-0xAE41	0x5527	# <CJK>
-0xAE42	0x5507	# <CJK>
-0xAE43	0x54FD	# <CJK>
-0xAE44	0x550F	# <CJK>
-0xAE45	0x5703	# <CJK>
-0xAE46	0x5704	# <CJK>
-0xAE47	0x57C2	# <CJK>
-0xAE48	0x57D4	# <CJK>
-0xAE49	0x57CB	# <CJK>
-0xAE4A	0x57C3	# <CJK>
-0xAE4B	0x5809	# <CJK>
-0xAE4C	0x590F	# <CJK>
-0xAE4D	0x5957	# <CJK>
-0xAE4E	0x5958	# <CJK>
-0xAE4F	0x595A	# <CJK>
-0xAE50	0x5A11	# <CJK>
-0xAE51	0x5A18	# <CJK>
-0xAE52	0x5A1C	# <CJK>
-0xAE53	0x5A1F	# <CJK>
-0xAE54	0x5A1B	# <CJK>
-0xAE55	0x5A13	# <CJK>
-0xAE56	0x59EC	# <CJK>
-0xAE57	0x5A20	# <CJK>
-0xAE58	0x5A23	# <CJK>
-0xAE59	0x5A29	# <CJK>
-0xAE5A	0x5A25	# <CJK>
-0xAE5B	0x5A0C	# <CJK>
-0xAE5C	0x5A09	# <CJK>
-0xAE5D	0x5B6B	# <CJK>
-0xAE5E	0x5C58	# <CJK>
-0xAE5F	0x5BB0	# <CJK>
-0xAE60	0x5BB3	# <CJK>
-0xAE61	0x5BB6	# <CJK>
-0xAE62	0x5BB4	# <CJK>
-0xAE63	0x5BAE	# <CJK>
-0xAE64	0x5BB5	# <CJK>
-0xAE65	0x5BB9	# <CJK>
-0xAE66	0x5BB8	# <CJK>
-0xAE67	0x5C04	# <CJK>
-0xAE68	0x5C51	# <CJK>
-0xAE69	0x5C55	# <CJK>
-0xAE6A	0x5C50	# <CJK>
-0xAE6B	0x5CED	# <CJK>
-0xAE6C	0x5CFD	# <CJK>
-0xAE6D	0x5CFB	# <CJK>
-0xAE6E	0x5CEA	# <CJK>
-0xAE6F	0x5CE8	# <CJK>
-0xAE70	0x5CF0	# <CJK>
-0xAE71	0x5CF6	# <CJK>
-0xAE72	0x5D01	# <CJK>
-0xAE73	0x5CF4	# <CJK>
-0xAE74	0x5DEE	# <CJK>
-0xAE75	0x5E2D	# <CJK>
-0xAE76	0x5E2B	# <CJK>
-0xAE77	0x5EAB	# <CJK>
-0xAE78	0x5EAD	# <CJK>
-0xAE79	0x5EA7	# <CJK>
-0xAE7A	0x5F31	# <CJK>
-0xAE7B	0x5F92	# <CJK>
-0xAE7C	0x5F91	# <CJK>
-0xAE7D	0x5F90	# <CJK>
-0xAE7E	0x6059	# <CJK>
-0xAEA1	0x6063	# <CJK>
-0xAEA2	0x6065	# <CJK>
-0xAEA3	0x6050	# <CJK>
-0xAEA4	0x6055	# <CJK>
-0xAEA5	0x606D	# <CJK>
-0xAEA6	0x6069	# <CJK>
-0xAEA7	0x606F	# <CJK>
-0xAEA8	0x6084	# <CJK>
-0xAEA9	0x609F	# <CJK>
-0xAEAA	0x609A	# <CJK>
-0xAEAB	0x608D	# <CJK>
-0xAEAC	0x6094	# <CJK>
-0xAEAD	0x608C	# <CJK>
-0xAEAE	0x6085	# <CJK>
-0xAEAF	0x6096	# <CJK>
-0xAEB0	0x6247	# <CJK>
-0xAEB1	0x62F3	# <CJK>
-0xAEB2	0x6308	# <CJK>
-0xAEB3	0x62FF	# <CJK>
-0xAEB4	0x634E	# <CJK>
-0xAEB5	0x633E	# <CJK>
-0xAEB6	0x632F	# <CJK>
-0xAEB7	0x6355	# <CJK>
-0xAEB8	0x6342	# <CJK>
-0xAEB9	0x6346	# <CJK>
-0xAEBA	0x634F	# <CJK>
-0xAEBB	0x6349	# <CJK>
-0xAEBC	0x633A	# <CJK>
-0xAEBD	0x6350	# <CJK>
-0xAEBE	0x633D	# <CJK>
-0xAEBF	0x632A	# <CJK>
-0xAEC0	0x632B	# <CJK>
-0xAEC1	0x6328	# <CJK>
-0xAEC2	0x634D	# <CJK>
-0xAEC3	0x634C	# <CJK>
-0xAEC4	0x6548	# <CJK>
-0xAEC5	0x6549	# <CJK>
-0xAEC6	0x6599	# <CJK>
-0xAEC7	0x65C1	# <CJK>
-0xAEC8	0x65C5	# <CJK>
-0xAEC9	0x6642	# <CJK>
-0xAECA	0x6649	# <CJK>
-0xAECB	0x664F	# <CJK>
-0xAECC	0x6643	# <CJK>
-0xAECD	0x6652	# <CJK>
-0xAECE	0x664C	# <CJK>
-0xAECF	0x6645	# <CJK>
-0xAED0	0x6641	# <CJK>
-0xAED1	0x66F8	# <CJK>
-0xAED2	0x6714	# <CJK>
-0xAED3	0x6715	# <CJK>
-0xAED4	0x6717	# <CJK>
-0xAED5	0x6821	# <CJK>
-0xAED6	0x6838	# <CJK>
-0xAED7	0x6848	# <CJK>
-0xAED8	0x6846	# <CJK>
-0xAED9	0x6853	# <CJK>
-0xAEDA	0x6839	# <CJK>
-0xAEDB	0x6842	# <CJK>
-0xAEDC	0x6854	# <CJK>
-0xAEDD	0x6829	# <CJK>
-0xAEDE	0x68B3	# <CJK>
-0xAEDF	0x6817	# <CJK>
-0xAEE0	0x684C	# <CJK>
-0xAEE1	0x6851	# <CJK>
-0xAEE2	0x683D	# <CJK>
-0xAEE3	0x67F4	# <CJK>
-0xAEE4	0x6850	# <CJK>
-0xAEE5	0x6840	# <CJK>
-0xAEE6	0x683C	# <CJK>
-0xAEE7	0x6843	# <CJK>
-0xAEE8	0x682A	# <CJK>
-0xAEE9	0x6845	# <CJK>
-0xAEEA	0x6813	# <CJK>
-0xAEEB	0x6818	# <CJK>
-0xAEEC	0x6841	# <CJK>
-0xAEED	0x6B8A	# <CJK>
-0xAEEE	0x6B89	# <CJK>
-0xAEEF	0x6BB7	# <CJK>
-0xAEF0	0x6C23	# <CJK>
-0xAEF1	0x6C27	# <CJK>
-0xAEF2	0x6C28	# <CJK>
-0xAEF3	0x6C26	# <CJK>
-0xAEF4	0x6C24	# <CJK>
-0xAEF5	0x6CF0	# <CJK>
-0xAEF6	0x6D6A	# <CJK>
-0xAEF7	0x6D95	# <CJK>
-0xAEF8	0x6D88	# <CJK>
-0xAEF9	0x6D87	# <CJK>
-0xAEFA	0x6D66	# <CJK>
-0xAEFB	0x6D78	# <CJK>
-0xAEFC	0x6D77	# <CJK>
-0xAEFD	0x6D59	# <CJK>
-0xAEFE	0x6D93	# <CJK>
-0xAF40	0x6D6C	# <CJK>
-0xAF41	0x6D89	# <CJK>
-0xAF42	0x6D6E	# <CJK>
-0xAF43	0x6D5A	# <CJK>
-0xAF44	0x6D74	# <CJK>
-0xAF45	0x6D69	# <CJK>
-0xAF46	0x6D8C	# <CJK>
-0xAF47	0x6D8A	# <CJK>
-0xAF48	0x6D79	# <CJK>
-0xAF49	0x6D85	# <CJK>
-0xAF4A	0x6D65	# <CJK>
-0xAF4B	0x6D94	# <CJK>
-0xAF4C	0x70CA	# <CJK>
-0xAF4D	0x70D8	# <CJK>
-0xAF4E	0x70E4	# <CJK>
-0xAF4F	0x70D9	# <CJK>
-0xAF50	0x70C8	# <CJK>
-0xAF51	0x70CF	# <CJK>
-0xAF52	0x7239	# <CJK>
-0xAF53	0x7279	# <CJK>
-0xAF54	0x72FC	# <CJK>
-0xAF55	0x72F9	# <CJK>
-0xAF56	0x72FD	# <CJK>
-0xAF57	0x72F8	# <CJK>
-0xAF58	0x72F7	# <CJK>
-0xAF59	0x7386	# <CJK>
-0xAF5A	0x73ED	# <CJK>
-0xAF5B	0x7409	# <CJK>
-0xAF5C	0x73EE	# <CJK>
-0xAF5D	0x73E0	# <CJK>
-0xAF5E	0x73EA	# <CJK>
-0xAF5F	0x73DE	# <CJK>
-0xAF60	0x7554	# <CJK>
-0xAF61	0x755D	# <CJK>
-0xAF62	0x755C	# <CJK>
-0xAF63	0x755A	# <CJK>
-0xAF64	0x7559	# <CJK>
-0xAF65	0x75BE	# <CJK>
-0xAF66	0x75C5	# <CJK>
-0xAF67	0x75C7	# <CJK>
-0xAF68	0x75B2	# <CJK>
-0xAF69	0x75B3	# <CJK>
-0xAF6A	0x75BD	# <CJK>
-0xAF6B	0x75BC	# <CJK>
-0xAF6C	0x75B9	# <CJK>
-0xAF6D	0x75C2	# <CJK>
-0xAF6E	0x75B8	# <CJK>
-0xAF6F	0x768B	# <CJK>
-0xAF70	0x76B0	# <CJK>
-0xAF71	0x76CA	# <CJK>
-0xAF72	0x76CD	# <CJK>
-0xAF73	0x76CE	# <CJK>
-0xAF74	0x7729	# <CJK>
-0xAF75	0x771F	# <CJK>
-0xAF76	0x7720	# <CJK>
-0xAF77	0x7728	# <CJK>
-0xAF78	0x77E9	# <CJK>
-0xAF79	0x7830	# <CJK>
-0xAF7A	0x7827	# <CJK>
-0xAF7B	0x7838	# <CJK>
-0xAF7C	0x781D	# <CJK>
-0xAF7D	0x7834	# <CJK>
-0xAF7E	0x7837	# <CJK>
-0xAFA1	0x7825	# <CJK>
-0xAFA2	0x782D	# <CJK>
-0xAFA3	0x7820	# <CJK>
-0xAFA4	0x781F	# <CJK>
-0xAFA5	0x7832	# <CJK>
-0xAFA6	0x7955	# <CJK>
-0xAFA7	0x7950	# <CJK>
-0xAFA8	0x7960	# <CJK>
-0xAFA9	0x795F	# <CJK>
-0xAFAA	0x7956	# <CJK>
-0xAFAB	0x795E	# <CJK>
-0xAFAC	0x795D	# <CJK>
-0xAFAD	0x7957	# <CJK>
-0xAFAE	0x795A	# <CJK>
-0xAFAF	0x79E4	# <CJK>
-0xAFB0	0x79E3	# <CJK>
-0xAFB1	0x79E7	# <CJK>
-0xAFB2	0x79DF	# <CJK>
-0xAFB3	0x79E6	# <CJK>
-0xAFB4	0x79E9	# <CJK>
-0xAFB5	0x79D8	# <CJK>
-0xAFB6	0x7A84	# <CJK>
-0xAFB7	0x7A88	# <CJK>
-0xAFB8	0x7AD9	# <CJK>
-0xAFB9	0x7B06	# <CJK>
-0xAFBA	0x7B11	# <CJK>
-0xAFBB	0x7C89	# <CJK>
-0xAFBC	0x7D21	# <CJK>
-0xAFBD	0x7D17	# <CJK>
-0xAFBE	0x7D0B	# <CJK>
-0xAFBF	0x7D0A	# <CJK>
-0xAFC0	0x7D20	# <CJK>
-0xAFC1	0x7D22	# <CJK>
-0xAFC2	0x7D14	# <CJK>
-0xAFC3	0x7D10	# <CJK>
-0xAFC4	0x7D15	# <CJK>
-0xAFC5	0x7D1A	# <CJK>
-0xAFC6	0x7D1C	# <CJK>
-0xAFC7	0x7D0D	# <CJK>
-0xAFC8	0x7D19	# <CJK>
-0xAFC9	0x7D1B	# <CJK>
-0xAFCA	0x7F3A	# <CJK>
-0xAFCB	0x7F5F	# <CJK>
-0xAFCC	0x7F94	# <CJK>
-0xAFCD	0x7FC5	# <CJK>
-0xAFCE	0x7FC1	# <CJK>
-0xAFCF	0x8006	# <CJK>
-0xAFD0	0x8018	# <CJK>
-0xAFD1	0x8015	# <CJK>
-0xAFD2	0x8019	# <CJK>
-0xAFD3	0x8017	# <CJK>
-0xAFD4	0x803D	# <CJK>
-0xAFD5	0x803F	# <CJK>
-0xAFD6	0x80F1	# <CJK>
-0xAFD7	0x8102	# <CJK>
-0xAFD8	0x80F0	# <CJK>
-0xAFD9	0x8105	# <CJK>
-0xAFDA	0x80ED	# <CJK>
-0xAFDB	0x80F4	# <CJK>
-0xAFDC	0x8106	# <CJK>
-0xAFDD	0x80F8	# <CJK>
-0xAFDE	0x80F3	# <CJK>
-0xAFDF	0x8108	# <CJK>
-0xAFE0	0x80FD	# <CJK>
-0xAFE1	0x810A	# <CJK>
-0xAFE2	0x80FC	# <CJK>
-0xAFE3	0x80EF	# <CJK>
-0xAFE4	0x81ED	# <CJK>
-0xAFE5	0x81EC	# <CJK>
-0xAFE6	0x8200	# <CJK>
-0xAFE7	0x8210	# <CJK>
-0xAFE8	0x822A	# <CJK>
-0xAFE9	0x822B	# <CJK>
-0xAFEA	0x8228	# <CJK>
-0xAFEB	0x822C	# <CJK>
-0xAFEC	0x82BB	# <CJK>
-0xAFED	0x832B	# <CJK>
-0xAFEE	0x8352	# <CJK>
-0xAFEF	0x8354	# <CJK>
-0xAFF0	0x834A	# <CJK>
-0xAFF1	0x8338	# <CJK>
-0xAFF2	0x8350	# <CJK>
-0xAFF3	0x8349	# <CJK>
-0xAFF4	0x8335	# <CJK>
-0xAFF5	0x8334	# <CJK>
-0xAFF6	0x834F	# <CJK>
-0xAFF7	0x8332	# <CJK>
-0xAFF8	0x8339	# <CJK>
-0xAFF9	0x8336	# <CJK>
-0xAFFA	0x8317	# <CJK>
-0xAFFB	0x8340	# <CJK>
-0xAFFC	0x8331	# <CJK>
-0xAFFD	0x8328	# <CJK>
-0xAFFE	0x8343	# <CJK>
-0xB040	0x8654	# <CJK>
-0xB041	0x868A	# <CJK>
-0xB042	0x86AA	# <CJK>
-0xB043	0x8693	# <CJK>
-0xB044	0x86A4	# <CJK>
-0xB045	0x86A9	# <CJK>
-0xB046	0x868C	# <CJK>
-0xB047	0x86A3	# <CJK>
-0xB048	0x869C	# <CJK>
-0xB049	0x8870	# <CJK>
-0xB04A	0x8877	# <CJK>
-0xB04B	0x8881	# <CJK>
-0xB04C	0x8882	# <CJK>
-0xB04D	0x887D	# <CJK>
-0xB04E	0x8879	# <CJK>
-0xB04F	0x8A18	# <CJK>
-0xB050	0x8A10	# <CJK>
-0xB051	0x8A0E	# <CJK>
-0xB052	0x8A0C	# <CJK>
-0xB053	0x8A15	# <CJK>
-0xB054	0x8A0A	# <CJK>
-0xB055	0x8A17	# <CJK>
-0xB056	0x8A13	# <CJK>
-0xB057	0x8A16	# <CJK>
-0xB058	0x8A0F	# <CJK>
-0xB059	0x8A11	# <CJK>
-0xB05A	0x8C48	# <CJK>
-0xB05B	0x8C7A	# <CJK>
-0xB05C	0x8C79	# <CJK>
-0xB05D	0x8CA1	# <CJK>
-0xB05E	0x8CA2	# <CJK>
-0xB05F	0x8D77	# <CJK>
-0xB060	0x8EAC	# <CJK>
-0xB061	0x8ED2	# <CJK>
-0xB062	0x8ED4	# <CJK>
-0xB063	0x8ECF	# <CJK>
-0xB064	0x8FB1	# <CJK>
-0xB065	0x9001	# <CJK>
-0xB066	0x9006	# <CJK>
-0xB067	0x8FF7	# <CJK>
-0xB068	0x9000	# <CJK>
-0xB069	0x8FFA	# <CJK>
-0xB06A	0x8FF4	# <CJK>
-0xB06B	0x9003	# <CJK>
-0xB06C	0x8FFD	# <CJK>
-0xB06D	0x9005	# <CJK>
-0xB06E	0x8FF8	# <CJK>
-0xB06F	0x9095	# <CJK>
-0xB070	0x90E1	# <CJK>
-0xB071	0x90DD	# <CJK>
-0xB072	0x90E2	# <CJK>
-0xB073	0x9152	# <CJK>
-0xB074	0x914D	# <CJK>
-0xB075	0x914C	# <CJK>
-0xB076	0x91D8	# <CJK>
-0xB077	0x91DD	# <CJK>
-0xB078	0x91D7	# <CJK>
-0xB079	0x91DC	# <CJK>
-0xB07A	0x91D9	# <CJK>
-0xB07B	0x9583	# <CJK>
-0xB07C	0x9662	# <CJK>
-0xB07D	0x9663	# <CJK>
-0xB07E	0x9661	# <CJK>
-0xB0A1	0x965B	# <CJK>
-0xB0A2	0x965D	# <CJK>
-0xB0A3	0x9664	# <CJK>
-0xB0A4	0x9658	# <CJK>
-0xB0A5	0x965E	# <CJK>
-0xB0A6	0x96BB	# <CJK>
-0xB0A7	0x98E2	# <CJK>
-0xB0A8	0x99AC	# <CJK>
-0xB0A9	0x9AA8	# <CJK>
-0xB0AA	0x9AD8	# <CJK>
-0xB0AB	0x9B25	# <CJK>
-0xB0AC	0x9B32	# <CJK>
-0xB0AD	0x9B3C	# <CJK>
-0xB0AE	0x4E7E	# <CJK>
-0xB0AF	0x507A	# <CJK>
-0xB0B0	0x507D	# <CJK>
-0xB0B1	0x505C	# <CJK>
-0xB0B2	0x5047	# <CJK>
-0xB0B3	0x5043	# <CJK>
-0xB0B4	0x504C	# <CJK>
-0xB0B5	0x505A	# <CJK>
-0xB0B6	0x5049	# <CJK>
-0xB0B7	0x5065	# <CJK>
-0xB0B8	0x5076	# <CJK>
-0xB0B9	0x504E	# <CJK>
-0xB0BA	0x5055	# <CJK>
-0xB0BB	0x5075	# <CJK>
-0xB0BC	0x5074	# <CJK>
-0xB0BD	0x5077	# <CJK>
-0xB0BE	0x504F	# <CJK>
-0xB0BF	0x500F	# <CJK>
-0xB0C0	0x506F	# <CJK>
-0xB0C1	0x506D	# <CJK>
-0xB0C2	0x515C	# <CJK>
-0xB0C3	0x5195	# <CJK>
-0xB0C4	0x51F0	# <CJK>
-0xB0C5	0x526A	# <CJK>
-0xB0C6	0x526F	# <CJK>
-0xB0C7	0x52D2	# <CJK>
-0xB0C8	0x52D9	# <CJK>
-0xB0C9	0x52D8	# <CJK>
-0xB0CA	0x52D5	# <CJK>
-0xB0CB	0x5310	# <CJK>
-0xB0CC	0x530F	# <CJK>
-0xB0CD	0x5319	# <CJK>
-0xB0CE	0x533F	# <CJK>
-0xB0CF	0x5340	# <CJK>
-0xB0D0	0x533E	# <CJK>
-0xB0D1	0x53C3	# <CJK>
-0xB0D2	0x66FC	# <CJK>
-0xB0D3	0x5546	# <CJK>
-0xB0D4	0x556A	# <CJK>
-0xB0D5	0x5566	# <CJK>
-0xB0D6	0x5544	# <CJK>
-0xB0D7	0x555E	# <CJK>
-0xB0D8	0x5561	# <CJK>
-0xB0D9	0x5543	# <CJK>
-0xB0DA	0x554A	# <CJK>
-0xB0DB	0x5531	# <CJK>
-0xB0DC	0x5556	# <CJK>
-0xB0DD	0x554F	# <CJK>
-0xB0DE	0x5555	# <CJK>
-0xB0DF	0x552F	# <CJK>
-0xB0E0	0x5564	# <CJK>
-0xB0E1	0x5538	# <CJK>
-0xB0E2	0x552E	# <CJK>
-0xB0E3	0x555C	# <CJK>
-0xB0E4	0x552C	# <CJK>
-0xB0E5	0x5563	# <CJK>
-0xB0E6	0x5533	# <CJK>
-0xB0E7	0x5541	# <CJK>
-0xB0E8	0x5557	# <CJK>
-0xB0E9	0x5708	# <CJK>
-0xB0EA	0x570B	# <CJK>
-0xB0EB	0x5709	# <CJK>
-0xB0EC	0x57DF	# <CJK>
-0xB0ED	0x5805	# <CJK>
-0xB0EE	0x580A	# <CJK>
-0xB0EF	0x5806	# <CJK>
-0xB0F0	0x57E0	# <CJK>
-0xB0F1	0x57E4	# <CJK>
-0xB0F2	0x57FA	# <CJK>
-0xB0F3	0x5802	# <CJK>
-0xB0F4	0x5835	# <CJK>
-0xB0F5	0x57F7	# <CJK>
-0xB0F6	0x57F9	# <CJK>
-0xB0F7	0x5920	# <CJK>
-0xB0F8	0x5962	# <CJK>
-0xB0F9	0x5A36	# <CJK>
-0xB0FA	0x5A41	# <CJK>
-0xB0FB	0x5A49	# <CJK>
-0xB0FC	0x5A66	# <CJK>
-0xB0FD	0x5A6A	# <CJK>
-0xB0FE	0x5A40	# <CJK>
-0xB140	0x5A3C	# <CJK>
-0xB141	0x5A62	# <CJK>
-0xB142	0x5A5A	# <CJK>
-0xB143	0x5A46	# <CJK>
-0xB144	0x5A4A	# <CJK>
-0xB145	0x5B70	# <CJK>
-0xB146	0x5BC7	# <CJK>
-0xB147	0x5BC5	# <CJK>
-0xB148	0x5BC4	# <CJK>
-0xB149	0x5BC2	# <CJK>
-0xB14A	0x5BBF	# <CJK>
-0xB14B	0x5BC6	# <CJK>
-0xB14C	0x5C09	# <CJK>
-0xB14D	0x5C08	# <CJK>
-0xB14E	0x5C07	# <CJK>
-0xB14F	0x5C60	# <CJK>
-0xB150	0x5C5C	# <CJK>
-0xB151	0x5C5D	# <CJK>
-0xB152	0x5D07	# <CJK>
-0xB153	0x5D06	# <CJK>
-0xB154	0x5D0E	# <CJK>
-0xB155	0x5D1B	# <CJK>
-0xB156	0x5D16	# <CJK>
-0xB157	0x5D22	# <CJK>
-0xB158	0x5D11	# <CJK>
-0xB159	0x5D29	# <CJK>
-0xB15A	0x5D14	# <CJK>
-0xB15B	0x5D19	# <CJK>
-0xB15C	0x5D24	# <CJK>
-0xB15D	0x5D27	# <CJK>
-0xB15E	0x5D17	# <CJK>
-0xB15F	0x5DE2	# <CJK>
-0xB160	0x5E38	# <CJK>
-0xB161	0x5E36	# <CJK>
-0xB162	0x5E33	# <CJK>
-0xB163	0x5E37	# <CJK>
-0xB164	0x5EB7	# <CJK>
-0xB165	0x5EB8	# <CJK>
-0xB166	0x5EB6	# <CJK>
-0xB167	0x5EB5	# <CJK>
-0xB168	0x5EBE	# <CJK>
-0xB169	0x5F35	# <CJK>
-0xB16A	0x5F37	# <CJK>
-0xB16B	0x5F57	# <CJK>
-0xB16C	0x5F6C	# <CJK>
-0xB16D	0x5F69	# <CJK>
-0xB16E	0x5F6B	# <CJK>
-0xB16F	0x5F97	# <CJK>
-0xB170	0x5F99	# <CJK>
-0xB171	0x5F9E	# <CJK>
-0xB172	0x5F98	# <CJK>
-0xB173	0x5FA1	# <CJK>
-0xB174	0x5FA0	# <CJK>
-0xB175	0x5F9C	# <CJK>
-0xB176	0x607F	# <CJK>
-0xB177	0x60A3	# <CJK>
-0xB178	0x6089	# <CJK>
-0xB179	0x60A0	# <CJK>
-0xB17A	0x60A8	# <CJK>
-0xB17B	0x60CB	# <CJK>
-0xB17C	0x60B4	# <CJK>
-0xB17D	0x60E6	# <CJK>
-0xB17E	0x60BD	# <CJK>
-0xB1A1	0x60C5	# <CJK>
-0xB1A2	0x60BB	# <CJK>
-0xB1A3	0x60B5	# <CJK>
-0xB1A4	0x60DC	# <CJK>
-0xB1A5	0x60BC	# <CJK>
-0xB1A6	0x60D8	# <CJK>
-0xB1A7	0x60D5	# <CJK>
-0xB1A8	0x60C6	# <CJK>
-0xB1A9	0x60DF	# <CJK>
-0xB1AA	0x60B8	# <CJK>
-0xB1AB	0x60DA	# <CJK>
-0xB1AC	0x60C7	# <CJK>
-0xB1AD	0x621A	# <CJK>
-0xB1AE	0x621B	# <CJK>
-0xB1AF	0x6248	# <CJK>
-0xB1B0	0x63A0	# <CJK>
-0xB1B1	0x63A7	# <CJK>
-0xB1B2	0x6372	# <CJK>
-0xB1B3	0x6396	# <CJK>
-0xB1B4	0x63A2	# <CJK>
-0xB1B5	0x63A5	# <CJK>
-0xB1B6	0x6377	# <CJK>
-0xB1B7	0x6367	# <CJK>
-0xB1B8	0x6398	# <CJK>
-0xB1B9	0x63AA	# <CJK>
-0xB1BA	0x6371	# <CJK>
-0xB1BB	0x63A9	# <CJK>
-0xB1BC	0x6389	# <CJK>
-0xB1BD	0x6383	# <CJK>
-0xB1BE	0x639B	# <CJK>
-0xB1BF	0x636B	# <CJK>
-0xB1C0	0x63A8	# <CJK>
-0xB1C1	0x6384	# <CJK>
-0xB1C2	0x6388	# <CJK>
-0xB1C3	0x6399	# <CJK>
-0xB1C4	0x63A1	# <CJK>
-0xB1C5	0x63AC	# <CJK>
-0xB1C6	0x6392	# <CJK>
-0xB1C7	0x638F	# <CJK>
-0xB1C8	0x6380	# <CJK>
-0xB1C9	0x637B	# <CJK>
-0xB1CA	0x6369	# <CJK>
-0xB1CB	0x6368	# <CJK>
-0xB1CC	0x637A	# <CJK>
-0xB1CD	0x655D	# <CJK>
-0xB1CE	0x6556	# <CJK>
-0xB1CF	0x6551	# <CJK>
-0xB1D0	0x6559	# <CJK>
-0xB1D1	0x6557	# <CJK>
-0xB1D2	0x555F	# <CJK>
-0xB1D3	0x654F	# <CJK>
-0xB1D4	0x6558	# <CJK>
-0xB1D5	0x6555	# <CJK>
-0xB1D6	0x6554	# <CJK>
-0xB1D7	0x659C	# <CJK>
-0xB1D8	0x659B	# <CJK>
-0xB1D9	0x65AC	# <CJK>
-0xB1DA	0x65CF	# <CJK>
-0xB1DB	0x65CB	# <CJK>
-0xB1DC	0x65CC	# <CJK>
-0xB1DD	0x65CE	# <CJK>
-0xB1DE	0x665D	# <CJK>
-0xB1DF	0x665A	# <CJK>
-0xB1E0	0x6664	# <CJK>
-0xB1E1	0x6668	# <CJK>
-0xB1E2	0x6666	# <CJK>
-0xB1E3	0x665E	# <CJK>
-0xB1E4	0x66F9	# <CJK>
-0xB1E5	0x52D7	# <CJK>
-0xB1E6	0x671B	# <CJK>
-0xB1E7	0x6881	# <CJK>
-0xB1E8	0x68AF	# <CJK>
-0xB1E9	0x68A2	# <CJK>
-0xB1EA	0x6893	# <CJK>
-0xB1EB	0x68B5	# <CJK>
-0xB1EC	0x687F	# <CJK>
-0xB1ED	0x6876	# <CJK>
-0xB1EE	0x68B1	# <CJK>
-0xB1EF	0x68A7	# <CJK>
-0xB1F0	0x6897	# <CJK>
-0xB1F1	0x68B0	# <CJK>
-0xB1F2	0x6883	# <CJK>
-0xB1F3	0x68C4	# <CJK>
-0xB1F4	0x68AD	# <CJK>
-0xB1F5	0x6886	# <CJK>
-0xB1F6	0x6885	# <CJK>
-0xB1F7	0x6894	# <CJK>
-0xB1F8	0x689D	# <CJK>
-0xB1F9	0x68A8	# <CJK>
-0xB1FA	0x689F	# <CJK>
-0xB1FB	0x68A1	# <CJK>
-0xB1FC	0x6882	# <CJK>
-0xB1FD	0x6B32	# <CJK>
-0xB1FE	0x6BBA	# <CJK>
-0xB240	0x6BEB	# <CJK>
-0xB241	0x6BEC	# <CJK>
-0xB242	0x6C2B	# <CJK>
-0xB243	0x6D8E	# <CJK>
-0xB244	0x6DBC	# <CJK>
-0xB245	0x6DF3	# <CJK>
-0xB246	0x6DD9	# <CJK>
-0xB247	0x6DB2	# <CJK>
-0xB248	0x6DE1	# <CJK>
-0xB249	0x6DCC	# <CJK>
-0xB24A	0x6DE4	# <CJK>
-0xB24B	0x6DFB	# <CJK>
-0xB24C	0x6DFA	# <CJK>
-0xB24D	0x6E05	# <CJK>
-0xB24E	0x6DC7	# <CJK>
-0xB24F	0x6DCB	# <CJK>
-0xB250	0x6DAF	# <CJK>
-0xB251	0x6DD1	# <CJK>
-0xB252	0x6DAE	# <CJK>
-0xB253	0x6DDE	# <CJK>
-0xB254	0x6DF9	# <CJK>
-0xB255	0x6DB8	# <CJK>
-0xB256	0x6DF7	# <CJK>
-0xB257	0x6DF5	# <CJK>
-0xB258	0x6DC5	# <CJK>
-0xB259	0x6DD2	# <CJK>
-0xB25A	0x6E1A	# <CJK>
-0xB25B	0x6DB5	# <CJK>
-0xB25C	0x6DDA	# <CJK>
-0xB25D	0x6DEB	# <CJK>
-0xB25E	0x6DD8	# <CJK>
-0xB25F	0x6DEA	# <CJK>
-0xB260	0x6DF1	# <CJK>
-0xB261	0x6DEE	# <CJK>
-0xB262	0x6DE8	# <CJK>
-0xB263	0x6DC6	# <CJK>
-0xB264	0x6DC4	# <CJK>
-0xB265	0x6DAA	# <CJK>
-0xB266	0x6DEC	# <CJK>
-0xB267	0x6DBF	# <CJK>
-0xB268	0x6DE6	# <CJK>
-0xB269	0x70F9	# <CJK>
-0xB26A	0x7109	# <CJK>
-0xB26B	0x710A	# <CJK>
-0xB26C	0x70FD	# <CJK>
-0xB26D	0x70EF	# <CJK>
-0xB26E	0x723D	# <CJK>
-0xB26F	0x727D	# <CJK>
-0xB270	0x7281	# <CJK>
-0xB271	0x731C	# <CJK>
-0xB272	0x731B	# <CJK>
-0xB273	0x7316	# <CJK>
-0xB274	0x7313	# <CJK>
-0xB275	0x7319	# <CJK>
-0xB276	0x7387	# <CJK>
-0xB277	0x7405	# <CJK>
-0xB278	0x740A	# <CJK>
-0xB279	0x7403	# <CJK>
-0xB27A	0x7406	# <CJK>
-0xB27B	0x73FE	# <CJK>
-0xB27C	0x740D	# <CJK>
-0xB27D	0x74E0	# <CJK>
-0xB27E	0x74F6	# <CJK>
-0xB2A1	0x74F7	# <CJK>
-0xB2A2	0x751C	# <CJK>
-0xB2A3	0x7522	# <CJK>
-0xB2A4	0x7565	# <CJK>
-0xB2A5	0x7566	# <CJK>
-0xB2A6	0x7562	# <CJK>
-0xB2A7	0x7570	# <CJK>
-0xB2A8	0x758F	# <CJK>
-0xB2A9	0x75D4	# <CJK>
-0xB2AA	0x75D5	# <CJK>
-0xB2AB	0x75B5	# <CJK>
-0xB2AC	0x75CA	# <CJK>
-0xB2AD	0x75CD	# <CJK>
-0xB2AE	0x768E	# <CJK>
-0xB2AF	0x76D4	# <CJK>
-0xB2B0	0x76D2	# <CJK>
-0xB2B1	0x76DB	# <CJK>
-0xB2B2	0x7737	# <CJK>
-0xB2B3	0x773E	# <CJK>
-0xB2B4	0x773C	# <CJK>
-0xB2B5	0x7736	# <CJK>
-0xB2B6	0x7738	# <CJK>
-0xB2B7	0x773A	# <CJK>
-0xB2B8	0x786B	# <CJK>
-0xB2B9	0x7843	# <CJK>
-0xB2BA	0x784E	# <CJK>
-0xB2BB	0x7965	# <CJK>
-0xB2BC	0x7968	# <CJK>
-0xB2BD	0x796D	# <CJK>
-0xB2BE	0x79FB	# <CJK>
-0xB2BF	0x7A92	# <CJK>
-0xB2C0	0x7A95	# <CJK>
-0xB2C1	0x7B20	# <CJK>
-0xB2C2	0x7B28	# <CJK>
-0xB2C3	0x7B1B	# <CJK>
-0xB2C4	0x7B2C	# <CJK>
-0xB2C5	0x7B26	# <CJK>
-0xB2C6	0x7B19	# <CJK>
-0xB2C7	0x7B1E	# <CJK>
-0xB2C8	0x7B2E	# <CJK>
-0xB2C9	0x7C92	# <CJK>
-0xB2CA	0x7C97	# <CJK>
-0xB2CB	0x7C95	# <CJK>
-0xB2CC	0x7D46	# <CJK>
-0xB2CD	0x7D43	# <CJK>
-0xB2CE	0x7D71	# <CJK>
-0xB2CF	0x7D2E	# <CJK>
-0xB2D0	0x7D39	# <CJK>
-0xB2D1	0x7D3C	# <CJK>
-0xB2D2	0x7D40	# <CJK>
-0xB2D3	0x7D30	# <CJK>
-0xB2D4	0x7D33	# <CJK>
-0xB2D5	0x7D44	# <CJK>
-0xB2D6	0x7D2F	# <CJK>
-0xB2D7	0x7D42	# <CJK>
-0xB2D8	0x7D32	# <CJK>
-0xB2D9	0x7D31	# <CJK>
-0xB2DA	0x7F3D	# <CJK>
-0xB2DB	0x7F9E	# <CJK>
-0xB2DC	0x7F9A	# <CJK>
-0xB2DD	0x7FCC	# <CJK>
-0xB2DE	0x7FCE	# <CJK>
-0xB2DF	0x7FD2	# <CJK>
-0xB2E0	0x801C	# <CJK>
-0xB2E1	0x804A	# <CJK>
-0xB2E2	0x8046	# <CJK>
-0xB2E3	0x812F	# <CJK>
-0xB2E4	0x8116	# <CJK>
-0xB2E5	0x8123	# <CJK>
-0xB2E6	0x812B	# <CJK>
-0xB2E7	0x8129	# <CJK>
-0xB2E8	0x8130	# <CJK>
-0xB2E9	0x8124	# <CJK>
-0xB2EA	0x8202	# <CJK>
-0xB2EB	0x8235	# <CJK>
-0xB2EC	0x8237	# <CJK>
-0xB2ED	0x8236	# <CJK>
-0xB2EE	0x8239	# <CJK>
-0xB2EF	0x838E	# <CJK>
-0xB2F0	0x839E	# <CJK>
-0xB2F1	0x8398	# <CJK>
-0xB2F2	0x8378	# <CJK>
-0xB2F3	0x83A2	# <CJK>
-0xB2F4	0x8396	# <CJK>
-0xB2F5	0x83BD	# <CJK>
-0xB2F6	0x83AB	# <CJK>
-0xB2F7	0x8392	# <CJK>
-0xB2F8	0x838A	# <CJK>
-0xB2F9	0x8393	# <CJK>
-0xB2FA	0x8389	# <CJK>
-0xB2FB	0x83A0	# <CJK>
-0xB2FC	0x8377	# <CJK>
-0xB2FD	0x837B	# <CJK>
-0xB2FE	0x837C	# <CJK>
-0xB340	0x8386	# <CJK>
-0xB341	0x83A7	# <CJK>
-0xB342	0x8655	# <CJK>
-0xB343	0x5F6A	# <CJK>
-0xB344	0x86C7	# <CJK>
-0xB345	0x86C0	# <CJK>
-0xB346	0x86B6	# <CJK>
-0xB347	0x86C4	# <CJK>
-0xB348	0x86B5	# <CJK>
-0xB349	0x86C6	# <CJK>
-0xB34A	0x86CB	# <CJK>
-0xB34B	0x86B1	# <CJK>
-0xB34C	0x86AF	# <CJK>
-0xB34D	0x86C9	# <CJK>
-0xB34E	0x8853	# <CJK>
-0xB34F	0x889E	# <CJK>
-0xB350	0x8888	# <CJK>
-0xB351	0x88AB	# <CJK>
-0xB352	0x8892	# <CJK>
-0xB353	0x8896	# <CJK>
-0xB354	0x888D	# <CJK>
-0xB355	0x888B	# <CJK>
-0xB356	0x8993	# <CJK>
-0xB357	0x898F	# <CJK>
-0xB358	0x8A2A	# <CJK>
-0xB359	0x8A1D	# <CJK>
-0xB35A	0x8A23	# <CJK>
-0xB35B	0x8A25	# <CJK>
-0xB35C	0x8A31	# <CJK>
-0xB35D	0x8A2D	# <CJK>
-0xB35E	0x8A1F	# <CJK>
-0xB35F	0x8A1B	# <CJK>
-0xB360	0x8A22	# <CJK>
-0xB361	0x8C49	# <CJK>
-0xB362	0x8C5A	# <CJK>
-0xB363	0x8CA9	# <CJK>
-0xB364	0x8CAC	# <CJK>
-0xB365	0x8CAB	# <CJK>
-0xB366	0x8CA8	# <CJK>
-0xB367	0x8CAA	# <CJK>
-0xB368	0x8CA7	# <CJK>
-0xB369	0x8D67	# <CJK>
-0xB36A	0x8D66	# <CJK>
-0xB36B	0x8DBE	# <CJK>
-0xB36C	0x8DBA	# <CJK>
-0xB36D	0x8EDB	# <CJK>
-0xB36E	0x8EDF	# <CJK>
-0xB36F	0x9019	# <CJK>
-0xB370	0x900D	# <CJK>
-0xB371	0x901A	# <CJK>
-0xB372	0x9017	# <CJK>
-0xB373	0x9023	# <CJK>
-0xB374	0x901F	# <CJK>
-0xB375	0x901D	# <CJK>
-0xB376	0x9010	# <CJK>
-0xB377	0x9015	# <CJK>
-0xB378	0x901E	# <CJK>
-0xB379	0x9020	# <CJK>
-0xB37A	0x900F	# <CJK>
-0xB37B	0x9022	# <CJK>
-0xB37C	0x9016	# <CJK>
-0xB37D	0x901B	# <CJK>
-0xB37E	0x9014	# <CJK>
-0xB3A1	0x90E8	# <CJK>
-0xB3A2	0x90ED	# <CJK>
-0xB3A3	0x90FD	# <CJK>
-0xB3A4	0x9157	# <CJK>
-0xB3A5	0x91CE	# <CJK>
-0xB3A6	0x91F5	# <CJK>
-0xB3A7	0x91E6	# <CJK>
-0xB3A8	0x91E3	# <CJK>
-0xB3A9	0x91E7	# <CJK>
-0xB3AA	0x91ED	# <CJK>
-0xB3AB	0x91E9	# <CJK>
-0xB3AC	0x9589	# <CJK>
-0xB3AD	0x966A	# <CJK>
-0xB3AE	0x9675	# <CJK>
-0xB3AF	0x9673	# <CJK>
-0xB3B0	0x9678	# <CJK>
-0xB3B1	0x9670	# <CJK>
-0xB3B2	0x9674	# <CJK>
-0xB3B3	0x9676	# <CJK>
-0xB3B4	0x9677	# <CJK>
-0xB3B5	0x966C	# <CJK>
-0xB3B6	0x96C0	# <CJK>
-0xB3B7	0x96EA	# <CJK>
-0xB3B8	0x96E9	# <CJK>
-0xB3B9	0x7AE0	# <CJK>
-0xB3BA	0x7ADF	# <CJK>
-0xB3BB	0x9802	# <CJK>
-0xB3BC	0x9803	# <CJK>
-0xB3BD	0x9B5A	# <CJK>
-0xB3BE	0x9CE5	# <CJK>
-0xB3BF	0x9E75	# <CJK>
-0xB3C0	0x9E7F	# <CJK>
-0xB3C1	0x9EA5	# <CJK>
-0xB3C2	0x9EBB	# <CJK>
-0xB3C3	0x50A2	# <CJK>
-0xB3C4	0x508D	# <CJK>
-0xB3C5	0x5085	# <CJK>
-0xB3C6	0x5099	# <CJK>
-0xB3C7	0x5091	# <CJK>
-0xB3C8	0x5080	# <CJK>
-0xB3C9	0x5096	# <CJK>
-0xB3CA	0x5098	# <CJK>
-0xB3CB	0x509A	# <CJK>
-0xB3CC	0x6700	# <CJK>
-0xB3CD	0x51F1	# <CJK>
-0xB3CE	0x5272	# <CJK>
-0xB3CF	0x5274	# <CJK>
-0xB3D0	0x5275	# <CJK>
-0xB3D1	0x5269	# <CJK>
-0xB3D2	0x52DE	# <CJK>
-0xB3D3	0x52DD	# <CJK>
-0xB3D4	0x52DB	# <CJK>
-0xB3D5	0x535A	# <CJK>
-0xB3D6	0x53A5	# <CJK>
-0xB3D7	0x557B	# <CJK>
-0xB3D8	0x5580	# <CJK>
-0xB3D9	0x55A7	# <CJK>
-0xB3DA	0x557C	# <CJK>
-0xB3DB	0x558A	# <CJK>
-0xB3DC	0x559D	# <CJK>
-0xB3DD	0x5598	# <CJK>
-0xB3DE	0x5582	# <CJK>
-0xB3DF	0x559C	# <CJK>
-0xB3E0	0x55AA	# <CJK>
-0xB3E1	0x5594	# <CJK>
-0xB3E2	0x5587	# <CJK>
-0xB3E3	0x558B	# <CJK>
-0xB3E4	0x5583	# <CJK>
-0xB3E5	0x55B3	# <CJK>
-0xB3E6	0x55AE	# <CJK>
-0xB3E7	0x559F	# <CJK>
-0xB3E8	0x553E	# <CJK>
-0xB3E9	0x55B2	# <CJK>
-0xB3EA	0x559A	# <CJK>
-0xB3EB	0x55BB	# <CJK>
-0xB3EC	0x55AC	# <CJK>
-0xB3ED	0x55B1	# <CJK>
-0xB3EE	0x557E	# <CJK>
-0xB3EF	0x5589	# <CJK>
-0xB3F0	0x55AB	# <CJK>
-0xB3F1	0x5599	# <CJK>
-0xB3F2	0x570D	# <CJK>
-0xB3F3	0x582F	# <CJK>
-0xB3F4	0x582A	# <CJK>
-0xB3F5	0x5834	# <CJK>
-0xB3F6	0x5824	# <CJK>
-0xB3F7	0x5830	# <CJK>
-0xB3F8	0x5831	# <CJK>
-0xB3F9	0x5821	# <CJK>
-0xB3FA	0x581D	# <CJK>
-0xB3FB	0x5820	# <CJK>
-0xB3FC	0x58F9	# <CJK>
-0xB3FD	0x58FA	# <CJK>
-0xB3FE	0x5960	# <CJK>
-0xB440	0x5A77	# <CJK>
-0xB441	0x5A9A	# <CJK>
-0xB442	0x5A7F	# <CJK>
-0xB443	0x5A92	# <CJK>
-0xB444	0x5A9B	# <CJK>
-0xB445	0x5AA7	# <CJK>
-0xB446	0x5B73	# <CJK>
-0xB447	0x5B71	# <CJK>
-0xB448	0x5BD2	# <CJK>
-0xB449	0x5BCC	# <CJK>
-0xB44A	0x5BD3	# <CJK>
-0xB44B	0x5BD0	# <CJK>
-0xB44C	0x5C0A	# <CJK>
-0xB44D	0x5C0B	# <CJK>
-0xB44E	0x5C31	# <CJK>
-0xB44F	0x5D4C	# <CJK>
-0xB450	0x5D50	# <CJK>
-0xB451	0x5D34	# <CJK>
-0xB452	0x5D47	# <CJK>
-0xB453	0x5DFD	# <CJK>
-0xB454	0x5E45	# <CJK>
-0xB455	0x5E3D	# <CJK>
-0xB456	0x5E40	# <CJK>
-0xB457	0x5E43	# <CJK>
-0xB458	0x5E7E	# <CJK>
-0xB459	0x5ECA	# <CJK>
-0xB45A	0x5EC1	# <CJK>
-0xB45B	0x5EC2	# <CJK>
-0xB45C	0x5EC4	# <CJK>
-0xB45D	0x5F3C	# <CJK>
-0xB45E	0x5F6D	# <CJK>
-0xB45F	0x5FA9	# <CJK>
-0xB460	0x5FAA	# <CJK>
-0xB461	0x5FA8	# <CJK>
-0xB462	0x60D1	# <CJK>
-0xB463	0x60E1	# <CJK>
-0xB464	0x60B2	# <CJK>
-0xB465	0x60B6	# <CJK>
-0xB466	0x60E0	# <CJK>
-0xB467	0x611C	# <CJK>
-0xB468	0x6123	# <CJK>
-0xB469	0x60FA	# <CJK>
-0xB46A	0x6115	# <CJK>
-0xB46B	0x60F0	# <CJK>
-0xB46C	0x60FB	# <CJK>
-0xB46D	0x60F4	# <CJK>
-0xB46E	0x6168	# <CJK>
-0xB46F	0x60F1	# <CJK>
-0xB470	0x610E	# <CJK>
-0xB471	0x60F6	# <CJK>
-0xB472	0x6109	# <CJK>
-0xB473	0x6100	# <CJK>
-0xB474	0x6112	# <CJK>
-0xB475	0x621F	# <CJK>
-0xB476	0x6249	# <CJK>
-0xB477	0x63A3	# <CJK>
-0xB478	0x638C	# <CJK>
-0xB479	0x63CF	# <CJK>
-0xB47A	0x63C0	# <CJK>
-0xB47B	0x63E9	# <CJK>
-0xB47C	0x63C9	# <CJK>
-0xB47D	0x63C6	# <CJK>
-0xB47E	0x63CD	# <CJK>
-0xB4A1	0x63D2	# <CJK>
-0xB4A2	0x63E3	# <CJK>
-0xB4A3	0x63D0	# <CJK>
-0xB4A4	0x63E1	# <CJK>
-0xB4A5	0x63D6	# <CJK>
-0xB4A6	0x63ED	# <CJK>
-0xB4A7	0x63EE	# <CJK>
-0xB4A8	0x6376	# <CJK>
-0xB4A9	0x63F4	# <CJK>
-0xB4AA	0x63EA	# <CJK>
-0xB4AB	0x63DB	# <CJK>
-0xB4AC	0x6452	# <CJK>
-0xB4AD	0x63DA	# <CJK>
-0xB4AE	0x63F9	# <CJK>
-0xB4AF	0x655E	# <CJK>
-0xB4B0	0x6566	# <CJK>
-0xB4B1	0x6562	# <CJK>
-0xB4B2	0x6563	# <CJK>
-0xB4B3	0x6591	# <CJK>
-0xB4B4	0x6590	# <CJK>
-0xB4B5	0x65AF	# <CJK>
-0xB4B6	0x666E	# <CJK>
-0xB4B7	0x6670	# <CJK>
-0xB4B8	0x6674	# <CJK>
-0xB4B9	0x6676	# <CJK>
-0xB4BA	0x666F	# <CJK>
-0xB4BB	0x6691	# <CJK>
-0xB4BC	0x667A	# <CJK>
-0xB4BD	0x667E	# <CJK>
-0xB4BE	0x6677	# <CJK>
-0xB4BF	0x66FE	# <CJK>
-0xB4C0	0x66FF	# <CJK>
-0xB4C1	0x671F	# <CJK>
-0xB4C2	0x671D	# <CJK>
-0xB4C3	0x68FA	# <CJK>
-0xB4C4	0x68D5	# <CJK>
-0xB4C5	0x68E0	# <CJK>
-0xB4C6	0x68D8	# <CJK>
-0xB4C7	0x68D7	# <CJK>
-0xB4C8	0x6905	# <CJK>
-0xB4C9	0x68DF	# <CJK>
-0xB4CA	0x68F5	# <CJK>
-0xB4CB	0x68EE	# <CJK>
-0xB4CC	0x68E7	# <CJK>
-0xB4CD	0x68F9	# <CJK>
-0xB4CE	0x68D2	# <CJK>
-0xB4CF	0x68F2	# <CJK>
-0xB4D0	0x68E3	# <CJK>
-0xB4D1	0x68CB	# <CJK>
-0xB4D2	0x68CD	# <CJK>
-0xB4D3	0x690D	# <CJK>
-0xB4D4	0x6912	# <CJK>
-0xB4D5	0x690E	# <CJK>
-0xB4D6	0x68C9	# <CJK>
-0xB4D7	0x68DA	# <CJK>
-0xB4D8	0x696E	# <CJK>
-0xB4D9	0x68FB	# <CJK>
-0xB4DA	0x6B3E	# <CJK>
-0xB4DB	0x6B3A	# <CJK>
-0xB4DC	0x6B3D	# <CJK>
-0xB4DD	0x6B98	# <CJK>
-0xB4DE	0x6B96	# <CJK>
-0xB4DF	0x6BBC	# <CJK>
-0xB4E0	0x6BEF	# <CJK>
-0xB4E1	0x6C2E	# <CJK>
-0xB4E2	0x6C2F	# <CJK>
-0xB4E3	0x6C2C	# <CJK>
-0xB4E4	0x6E2F	# <CJK>
-0xB4E5	0x6E38	# <CJK>
-0xB4E6	0x6E54	# <CJK>
-0xB4E7	0x6E21	# <CJK>
-0xB4E8	0x6E32	# <CJK>
-0xB4E9	0x6E67	# <CJK>
-0xB4EA	0x6E4A	# <CJK>
-0xB4EB	0x6E20	# <CJK>
-0xB4EC	0x6E25	# <CJK>
-0xB4ED	0x6E23	# <CJK>
-0xB4EE	0x6E1B	# <CJK>
-0xB4EF	0x6E5B	# <CJK>
-0xB4F0	0x6E58	# <CJK>
-0xB4F1	0x6E24	# <CJK>
-0xB4F2	0x6E56	# <CJK>
-0xB4F3	0x6E6E	# <CJK>
-0xB4F4	0x6E2D	# <CJK>
-0xB4F5	0x6E26	# <CJK>
-0xB4F6	0x6E6F	# <CJK>
-0xB4F7	0x6E34	# <CJK>
-0xB4F8	0x6E4D	# <CJK>
-0xB4F9	0x6E3A	# <CJK>
-0xB4FA	0x6E2C	# <CJK>
-0xB4FB	0x6E43	# <CJK>
-0xB4FC	0x6E1D	# <CJK>
-0xB4FD	0x6E3E	# <CJK>
-0xB4FE	0x6ECB	# <CJK>
-0xB540	0x6E89	# <CJK>
-0xB541	0x6E19	# <CJK>
-0xB542	0x6E4E	# <CJK>
-0xB543	0x6E63	# <CJK>
-0xB544	0x6E44	# <CJK>
-0xB545	0x6E72	# <CJK>
-0xB546	0x6E69	# <CJK>
-0xB547	0x6E5F	# <CJK>
-0xB548	0x7119	# <CJK>
-0xB549	0x711A	# <CJK>
-0xB54A	0x7126	# <CJK>
-0xB54B	0x7130	# <CJK>
-0xB54C	0x7121	# <CJK>
-0xB54D	0x7136	# <CJK>
-0xB54E	0x716E	# <CJK>
-0xB54F	0x711C	# <CJK>
-0xB550	0x724C	# <CJK>
-0xB551	0x7284	# <CJK>
-0xB552	0x7280	# <CJK>
-0xB553	0x7336	# <CJK>
-0xB554	0x7325	# <CJK>
-0xB555	0x7334	# <CJK>
-0xB556	0x7329	# <CJK>
-0xB557	0x743A	# <CJK>
-0xB558	0x742A	# <CJK>
-0xB559	0x7433	# <CJK>
-0xB55A	0x7422	# <CJK>
-0xB55B	0x7425	# <CJK>
-0xB55C	0x7435	# <CJK>
-0xB55D	0x7436	# <CJK>
-0xB55E	0x7434	# <CJK>
-0xB55F	0x742F	# <CJK>
-0xB560	0x741B	# <CJK>
-0xB561	0x7426	# <CJK>
-0xB562	0x7428	# <CJK>
-0xB563	0x7525	# <CJK>
-0xB564	0x7526	# <CJK>
-0xB565	0x756B	# <CJK>
-0xB566	0x756A	# <CJK>
-0xB567	0x75E2	# <CJK>
-0xB568	0x75DB	# <CJK>
-0xB569	0x75E3	# <CJK>
-0xB56A	0x75D9	# <CJK>
-0xB56B	0x75D8	# <CJK>
-0xB56C	0x75DE	# <CJK>
-0xB56D	0x75E0	# <CJK>
-0xB56E	0x767B	# <CJK>
-0xB56F	0x767C	# <CJK>
-0xB570	0x7696	# <CJK>
-0xB571	0x7693	# <CJK>
-0xB572	0x76B4	# <CJK>
-0xB573	0x76DC	# <CJK>
-0xB574	0x774F	# <CJK>
-0xB575	0x77ED	# <CJK>
-0xB576	0x785D	# <CJK>
-0xB577	0x786C	# <CJK>
-0xB578	0x786F	# <CJK>
-0xB579	0x7A0D	# <CJK>
-0xB57A	0x7A08	# <CJK>
-0xB57B	0x7A0B	# <CJK>
-0xB57C	0x7A05	# <CJK>
-0xB57D	0x7A00	# <CJK>
-0xB57E	0x7A98	# <CJK>
-0xB5A1	0x7A97	# <CJK>
-0xB5A2	0x7A96	# <CJK>
-0xB5A3	0x7AE5	# <CJK>
-0xB5A4	0x7AE3	# <CJK>
-0xB5A5	0x7B49	# <CJK>
-0xB5A6	0x7B56	# <CJK>
-0xB5A7	0x7B46	# <CJK>
-0xB5A8	0x7B50	# <CJK>
-0xB5A9	0x7B52	# <CJK>
-0xB5AA	0x7B54	# <CJK>
-0xB5AB	0x7B4D	# <CJK>
-0xB5AC	0x7B4B	# <CJK>
-0xB5AD	0x7B4F	# <CJK>
-0xB5AE	0x7B51	# <CJK>
-0xB5AF	0x7C9F	# <CJK>
-0xB5B0	0x7CA5	# <CJK>
-0xB5B1	0x7D5E	# <CJK>
-0xB5B2	0x7D50	# <CJK>
-0xB5B3	0x7D68	# <CJK>
-0xB5B4	0x7D55	# <CJK>
-0xB5B5	0x7D2B	# <CJK>
-0xB5B6	0x7D6E	# <CJK>
-0xB5B7	0x7D72	# <CJK>
-0xB5B8	0x7D61	# <CJK>
-0xB5B9	0x7D66	# <CJK>
-0xB5BA	0x7D62	# <CJK>
-0xB5BB	0x7D70	# <CJK>
-0xB5BC	0x7D73	# <CJK>
-0xB5BD	0x5584	# <CJK>
-0xB5BE	0x7FD4	# <CJK>
-0xB5BF	0x7FD5	# <CJK>
-0xB5C0	0x800B	# <CJK>
-0xB5C1	0x8052	# <CJK>
-0xB5C2	0x8085	# <CJK>
-0xB5C3	0x8155	# <CJK>
-0xB5C4	0x8154	# <CJK>
-0xB5C5	0x814B	# <CJK>
-0xB5C6	0x8151	# <CJK>
-0xB5C7	0x814E	# <CJK>
-0xB5C8	0x8139	# <CJK>
-0xB5C9	0x8146	# <CJK>
-0xB5CA	0x813E	# <CJK>
-0xB5CB	0x814C	# <CJK>
-0xB5CC	0x8153	# <CJK>
-0xB5CD	0x8174	# <CJK>
-0xB5CE	0x8212	# <CJK>
-0xB5CF	0x821C	# <CJK>
-0xB5D0	0x83E9	# <CJK>
-0xB5D1	0x8403	# <CJK>
-0xB5D2	0x83F8	# <CJK>
-0xB5D3	0x840D	# <CJK>
-0xB5D4	0x83E0	# <CJK>
-0xB5D5	0x83C5	# <CJK>
-0xB5D6	0x840B	# <CJK>
-0xB5D7	0x83C1	# <CJK>
-0xB5D8	0x83EF	# <CJK>
-0xB5D9	0x83F1	# <CJK>
-0xB5DA	0x83F4	# <CJK>
-0xB5DB	0x8457	# <CJK>
-0xB5DC	0x840A	# <CJK>
-0xB5DD	0x83F0	# <CJK>
-0xB5DE	0x840C	# <CJK>
-0xB5DF	0x83CC	# <CJK>
-0xB5E0	0x83FD	# <CJK>
-0xB5E1	0x83F2	# <CJK>
-0xB5E2	0x83CA	# <CJK>
-0xB5E3	0x8438	# <CJK>
-0xB5E4	0x840E	# <CJK>
-0xB5E5	0x8404	# <CJK>
-0xB5E6	0x83DC	# <CJK>
-0xB5E7	0x8407	# <CJK>
-0xB5E8	0x83D4	# <CJK>
-0xB5E9	0x83DF	# <CJK>
-0xB5EA	0x865B	# <CJK>
-0xB5EB	0x86DF	# <CJK>
-0xB5EC	0x86D9	# <CJK>
-0xB5ED	0x86ED	# <CJK>
-0xB5EE	0x86D4	# <CJK>
-0xB5EF	0x86DB	# <CJK>
-0xB5F0	0x86E4	# <CJK>
-0xB5F1	0x86D0	# <CJK>
-0xB5F2	0x86DE	# <CJK>
-0xB5F3	0x8857	# <CJK>
-0xB5F4	0x88C1	# <CJK>
-0xB5F5	0x88C2	# <CJK>
-0xB5F6	0x88B1	# <CJK>
-0xB5F7	0x8983	# <CJK>
-0xB5F8	0x8996	# <CJK>
-0xB5F9	0x8A3B	# <CJK>
-0xB5FA	0x8A60	# <CJK>
-0xB5FB	0x8A55	# <CJK>
-0xB5FC	0x8A5E	# <CJK>
-0xB5FD	0x8A3C	# <CJK>
-0xB5FE	0x8A41	# <CJK>
-0xB640	0x8A54	# <CJK>
-0xB641	0x8A5B	# <CJK>
-0xB642	0x8A50	# <CJK>
-0xB643	0x8A46	# <CJK>
-0xB644	0x8A34	# <CJK>
-0xB645	0x8A3A	# <CJK>
-0xB646	0x8A36	# <CJK>
-0xB647	0x8A56	# <CJK>
-0xB648	0x8C61	# <CJK>
-0xB649	0x8C82	# <CJK>
-0xB64A	0x8CAF	# <CJK>
-0xB64B	0x8CBC	# <CJK>
-0xB64C	0x8CB3	# <CJK>
-0xB64D	0x8CBD	# <CJK>
-0xB64E	0x8CC1	# <CJK>
-0xB64F	0x8CBB	# <CJK>
-0xB650	0x8CC0	# <CJK>
-0xB651	0x8CB4	# <CJK>
-0xB652	0x8CB7	# <CJK>
-0xB653	0x8CB6	# <CJK>
-0xB654	0x8CBF	# <CJK>
-0xB655	0x8CB8	# <CJK>
-0xB656	0x8D8A	# <CJK>
-0xB657	0x8D85	# <CJK>
-0xB658	0x8D81	# <CJK>
-0xB659	0x8DCE	# <CJK>
-0xB65A	0x8DDD	# <CJK>
-0xB65B	0x8DCB	# <CJK>
-0xB65C	0x8DDA	# <CJK>
-0xB65D	0x8DD1	# <CJK>
-0xB65E	0x8DCC	# <CJK>
-0xB65F	0x8DDB	# <CJK>
-0xB660	0x8DC6	# <CJK>
-0xB661	0x8EFB	# <CJK>
-0xB662	0x8EF8	# <CJK>
-0xB663	0x8EFC	# <CJK>
-0xB664	0x8F9C	# <CJK>
-0xB665	0x902E	# <CJK>
-0xB666	0x9035	# <CJK>
-0xB667	0x9031	# <CJK>
-0xB668	0x9038	# <CJK>
-0xB669	0x9032	# <CJK>
-0xB66A	0x9036	# <CJK>
-0xB66B	0x9102	# <CJK>
-0xB66C	0x90F5	# <CJK>
-0xB66D	0x9109	# <CJK>
-0xB66E	0x90FE	# <CJK>
-0xB66F	0x9163	# <CJK>
-0xB670	0x9165	# <CJK>
-0xB671	0x91CF	# <CJK>
-0xB672	0x9214	# <CJK>
-0xB673	0x9215	# <CJK>
-0xB674	0x9223	# <CJK>
-0xB675	0x9209	# <CJK>
-0xB676	0x921E	# <CJK>
-0xB677	0x920D	# <CJK>
-0xB678	0x9210	# <CJK>
-0xB679	0x9207	# <CJK>
-0xB67A	0x9211	# <CJK>
-0xB67B	0x9594	# <CJK>
-0xB67C	0x958F	# <CJK>
-0xB67D	0x958B	# <CJK>
-0xB67E	0x9591	# <CJK>
-0xB6A1	0x9593	# <CJK>
-0xB6A2	0x9592	# <CJK>
-0xB6A3	0x958E	# <CJK>
-0xB6A4	0x968A	# <CJK>
-0xB6A5	0x968E	# <CJK>
-0xB6A6	0x968B	# <CJK>
-0xB6A7	0x967D	# <CJK>
-0xB6A8	0x9685	# <CJK>
-0xB6A9	0x9686	# <CJK>
-0xB6AA	0x968D	# <CJK>
-0xB6AB	0x9672	# <CJK>
-0xB6AC	0x9684	# <CJK>
-0xB6AD	0x96C1	# <CJK>
-0xB6AE	0x96C5	# <CJK>
-0xB6AF	0x96C4	# <CJK>
-0xB6B0	0x96C6	# <CJK>
-0xB6B1	0x96C7	# <CJK>
-0xB6B2	0x96EF	# <CJK>
-0xB6B3	0x96F2	# <CJK>
-0xB6B4	0x97CC	# <CJK>
-0xB6B5	0x9805	# <CJK>
-0xB6B6	0x9806	# <CJK>
-0xB6B7	0x9808	# <CJK>
-0xB6B8	0x98E7	# <CJK>
-0xB6B9	0x98EA	# <CJK>
-0xB6BA	0x98EF	# <CJK>
-0xB6BB	0x98E9	# <CJK>
-0xB6BC	0x98F2	# <CJK>
-0xB6BD	0x98ED	# <CJK>
-0xB6BE	0x99AE	# <CJK>
-0xB6BF	0x99AD	# <CJK>
-0xB6C0	0x9EC3	# <CJK>
-0xB6C1	0x9ECD	# <CJK>
-0xB6C2	0x9ED1	# <CJK>
-0xB6C3	0x4E82	# <CJK>
-0xB6C4	0x50AD	# <CJK>
-0xB6C5	0x50B5	# <CJK>
-0xB6C6	0x50B2	# <CJK>
-0xB6C7	0x50B3	# <CJK>
-0xB6C8	0x50C5	# <CJK>
-0xB6C9	0x50BE	# <CJK>
-0xB6CA	0x50AC	# <CJK>
-0xB6CB	0x50B7	# <CJK>
-0xB6CC	0x50BB	# <CJK>
-0xB6CD	0x50AF	# <CJK>
-0xB6CE	0x50C7	# <CJK>
-0xB6CF	0x527F	# <CJK>
-0xB6D0	0x5277	# <CJK>
-0xB6D1	0x527D	# <CJK>
-0xB6D2	0x52DF	# <CJK>
-0xB6D3	0x52E6	# <CJK>
-0xB6D4	0x52E4	# <CJK>
-0xB6D5	0x52E2	# <CJK>
-0xB6D6	0x52E3	# <CJK>
-0xB6D7	0x532F	# <CJK>
-0xB6D8	0x55DF	# <CJK>
-0xB6D9	0x55E8	# <CJK>
-0xB6DA	0x55D3	# <CJK>
-0xB6DB	0x55E6	# <CJK>
-0xB6DC	0x55CE	# <CJK>
-0xB6DD	0x55DC	# <CJK>
-0xB6DE	0x55C7	# <CJK>
-0xB6DF	0x55D1	# <CJK>
-0xB6E0	0x55E3	# <CJK>
-0xB6E1	0x55E4	# <CJK>
-0xB6E2	0x55EF	# <CJK>
-0xB6E3	0x55DA	# <CJK>
-0xB6E4	0x55E1	# <CJK>
-0xB6E5	0x55C5	# <CJK>
-0xB6E6	0x55C6	# <CJK>
-0xB6E7	0x55E5	# <CJK>
-0xB6E8	0x55C9	# <CJK>
-0xB6E9	0x5712	# <CJK>
-0xB6EA	0x5713	# <CJK>
-0xB6EB	0x585E	# <CJK>
-0xB6EC	0x5851	# <CJK>
-0xB6ED	0x5858	# <CJK>
-0xB6EE	0x5857	# <CJK>
-0xB6EF	0x585A	# <CJK>
-0xB6F0	0x5854	# <CJK>
-0xB6F1	0x586B	# <CJK>
-0xB6F2	0x584C	# <CJK>
-0xB6F3	0x586D	# <CJK>
-0xB6F4	0x584A	# <CJK>
-0xB6F5	0x5862	# <CJK>
-0xB6F6	0x5852	# <CJK>
-0xB6F7	0x584B	# <CJK>
-0xB6F8	0x5967	# <CJK>
-0xB6F9	0x5AC1	# <CJK>
-0xB6FA	0x5AC9	# <CJK>
-0xB6FB	0x5ACC	# <CJK>
-0xB6FC	0x5ABE	# <CJK>
-0xB6FD	0x5ABD	# <CJK>
-0xB6FE	0x5ABC	# <CJK>
-0xB740	0x5AB3	# <CJK>
-0xB741	0x5AC2	# <CJK>
-0xB742	0x5AB2	# <CJK>
-0xB743	0x5D69	# <CJK>
-0xB744	0x5D6F	# <CJK>
-0xB745	0x5E4C	# <CJK>
-0xB746	0x5E79	# <CJK>
-0xB747	0x5EC9	# <CJK>
-0xB748	0x5EC8	# <CJK>
-0xB749	0x5F12	# <CJK>
-0xB74A	0x5F59	# <CJK>
-0xB74B	0x5FAC	# <CJK>
-0xB74C	0x5FAE	# <CJK>
-0xB74D	0x611A	# <CJK>
-0xB74E	0x610F	# <CJK>
-0xB74F	0x6148	# <CJK>
-0xB750	0x611F	# <CJK>
-0xB751	0x60F3	# <CJK>
-0xB752	0x611B	# <CJK>
-0xB753	0x60F9	# <CJK>
-0xB754	0x6101	# <CJK>
-0xB755	0x6108	# <CJK>
-0xB756	0x614E	# <CJK>
-0xB757	0x614C	# <CJK>
-0xB758	0x6144	# <CJK>
-0xB759	0x614D	# <CJK>
-0xB75A	0x613E	# <CJK>
-0xB75B	0x6134	# <CJK>
-0xB75C	0x6127	# <CJK>
-0xB75D	0x610D	# <CJK>
-0xB75E	0x6106	# <CJK>
-0xB75F	0x6137	# <CJK>
-0xB760	0x6221	# <CJK>
-0xB761	0x6222	# <CJK>
-0xB762	0x6413	# <CJK>
-0xB763	0x643E	# <CJK>
-0xB764	0x641E	# <CJK>
-0xB765	0x642A	# <CJK>
-0xB766	0x642D	# <CJK>
-0xB767	0x643D	# <CJK>
-0xB768	0x642C	# <CJK>
-0xB769	0x640F	# <CJK>
-0xB76A	0x641C	# <CJK>
-0xB76B	0x6414	# <CJK>
-0xB76C	0x640D	# <CJK>
-0xB76D	0x6436	# <CJK>
-0xB76E	0x6416	# <CJK>
-0xB76F	0x6417	# <CJK>
-0xB770	0x6406	# <CJK>
-0xB771	0x656C	# <CJK>
-0xB772	0x659F	# <CJK>
-0xB773	0x65B0	# <CJK>
-0xB774	0x6697	# <CJK>
-0xB775	0x6689	# <CJK>
-0xB776	0x6687	# <CJK>
-0xB777	0x6688	# <CJK>
-0xB778	0x6696	# <CJK>
-0xB779	0x6684	# <CJK>
-0xB77A	0x6698	# <CJK>
-0xB77B	0x668D	# <CJK>
-0xB77C	0x6703	# <CJK>
-0xB77D	0x6994	# <CJK>
-0xB77E	0x696D	# <CJK>
-0xB7A1	0x695A	# <CJK>
-0xB7A2	0x6977	# <CJK>
-0xB7A3	0x6960	# <CJK>
-0xB7A4	0x6954	# <CJK>
-0xB7A5	0x6975	# <CJK>
-0xB7A6	0x6930	# <CJK>
-0xB7A7	0x6982	# <CJK>
-0xB7A8	0x694A	# <CJK>
-0xB7A9	0x6968	# <CJK>
-0xB7AA	0x696B	# <CJK>
-0xB7AB	0x695E	# <CJK>
-0xB7AC	0x6953	# <CJK>
-0xB7AD	0x6979	# <CJK>
-0xB7AE	0x6986	# <CJK>
-0xB7AF	0x695D	# <CJK>
-0xB7B0	0x6963	# <CJK>
-0xB7B1	0x695B	# <CJK>
-0xB7B2	0x6B47	# <CJK>
-0xB7B3	0x6B72	# <CJK>
-0xB7B4	0x6BC0	# <CJK>
-0xB7B5	0x6BBF	# <CJK>
-0xB7B6	0x6BD3	# <CJK>
-0xB7B7	0x6BFD	# <CJK>
-0xB7B8	0x6EA2	# <CJK>
-0xB7B9	0x6EAF	# <CJK>
-0xB7BA	0x6ED3	# <CJK>
-0xB7BB	0x6EB6	# <CJK>
-0xB7BC	0x6EC2	# <CJK>
-0xB7BD	0x6E90	# <CJK>
-0xB7BE	0x6E9D	# <CJK>
-0xB7BF	0x6EC7	# <CJK>
-0xB7C0	0x6EC5	# <CJK>
-0xB7C1	0x6EA5	# <CJK>
-0xB7C2	0x6E98	# <CJK>
-0xB7C3	0x6EBC	# <CJK>
-0xB7C4	0x6EBA	# <CJK>
-0xB7C5	0x6EAB	# <CJK>
-0xB7C6	0x6ED1	# <CJK>
-0xB7C7	0x6E96	# <CJK>
-0xB7C8	0x6E9C	# <CJK>
-0xB7C9	0x6EC4	# <CJK>
-0xB7CA	0x6ED4	# <CJK>
-0xB7CB	0x6EAA	# <CJK>
-0xB7CC	0x6EA7	# <CJK>
-0xB7CD	0x6EB4	# <CJK>
-0xB7CE	0x714E	# <CJK>
-0xB7CF	0x7159	# <CJK>
-0xB7D0	0x7169	# <CJK>
-0xB7D1	0x7164	# <CJK>
-0xB7D2	0x7149	# <CJK>
-0xB7D3	0x7167	# <CJK>
-0xB7D4	0x715C	# <CJK>
-0xB7D5	0x716C	# <CJK>
-0xB7D6	0x7166	# <CJK>
-0xB7D7	0x714C	# <CJK>
-0xB7D8	0x7165	# <CJK>
-0xB7D9	0x715E	# <CJK>
-0xB7DA	0x7146	# <CJK>
-0xB7DB	0x7168	# <CJK>
-0xB7DC	0x7156	# <CJK>
-0xB7DD	0x723A	# <CJK>
-0xB7DE	0x7252	# <CJK>
-0xB7DF	0x7337	# <CJK>
-0xB7E0	0x7345	# <CJK>
-0xB7E1	0x733F	# <CJK>
-0xB7E2	0x733E	# <CJK>
-0xB7E3	0x746F	# <CJK>
-0xB7E4	0x745A	# <CJK>
-0xB7E5	0x7455	# <CJK>
-0xB7E6	0x745F	# <CJK>
-0xB7E7	0x745E	# <CJK>
-0xB7E8	0x7441	# <CJK>
-0xB7E9	0x743F	# <CJK>
-0xB7EA	0x7459	# <CJK>
-0xB7EB	0x745B	# <CJK>
-0xB7EC	0x745C	# <CJK>
-0xB7ED	0x7576	# <CJK>
-0xB7EE	0x7578	# <CJK>
-0xB7EF	0x7600	# <CJK>
-0xB7F0	0x75F0	# <CJK>
-0xB7F1	0x7601	# <CJK>
-0xB7F2	0x75F2	# <CJK>
-0xB7F3	0x75F1	# <CJK>
-0xB7F4	0x75FA	# <CJK>
-0xB7F5	0x75FF	# <CJK>
-0xB7F6	0x75F4	# <CJK>
-0xB7F7	0x75F3	# <CJK>
-0xB7F8	0x76DE	# <CJK>
-0xB7F9	0x76DF	# <CJK>
-0xB7FA	0x775B	# <CJK>
-0xB7FB	0x776B	# <CJK>
-0xB7FC	0x7766	# <CJK>
-0xB7FD	0x775E	# <CJK>
-0xB7FE	0x7763	# <CJK>
-0xB840	0x7779	# <CJK>
-0xB841	0x776A	# <CJK>
-0xB842	0x776C	# <CJK>
-0xB843	0x775C	# <CJK>
-0xB844	0x7765	# <CJK>
-0xB845	0x7768	# <CJK>
-0xB846	0x7762	# <CJK>
-0xB847	0x77EE	# <CJK>
-0xB848	0x788E	# <CJK>
-0xB849	0x78B0	# <CJK>
-0xB84A	0x7897	# <CJK>
-0xB84B	0x7898	# <CJK>
-0xB84C	0x788C	# <CJK>
-0xB84D	0x7889	# <CJK>
-0xB84E	0x787C	# <CJK>
-0xB84F	0x7891	# <CJK>
-0xB850	0x7893	# <CJK>
-0xB851	0x787F	# <CJK>
-0xB852	0x797A	# <CJK>
-0xB853	0x797F	# <CJK>
-0xB854	0x7981	# <CJK>
-0xB855	0x842C	# <CJK>
-0xB856	0x79BD	# <CJK>
-0xB857	0x7A1C	# <CJK>
-0xB858	0x7A1A	# <CJK>
-0xB859	0x7A20	# <CJK>
-0xB85A	0x7A14	# <CJK>
-0xB85B	0x7A1F	# <CJK>
-0xB85C	0x7A1E	# <CJK>
-0xB85D	0x7A9F	# <CJK>
-0xB85E	0x7AA0	# <CJK>
-0xB85F	0x7B77	# <CJK>
-0xB860	0x7BC0	# <CJK>
-0xB861	0x7B60	# <CJK>
-0xB862	0x7B6E	# <CJK>
-0xB863	0x7B67	# <CJK>
-0xB864	0x7CB1	# <CJK>
-0xB865	0x7CB3	# <CJK>
-0xB866	0x7CB5	# <CJK>
-0xB867	0x7D93	# <CJK>
-0xB868	0x7D79	# <CJK>
-0xB869	0x7D91	# <CJK>
-0xB86A	0x7D81	# <CJK>
-0xB86B	0x7D8F	# <CJK>
-0xB86C	0x7D5B	# <CJK>
-0xB86D	0x7F6E	# <CJK>
-0xB86E	0x7F69	# <CJK>
-0xB86F	0x7F6A	# <CJK>
-0xB870	0x7F72	# <CJK>
-0xB871	0x7FA9	# <CJK>
-0xB872	0x7FA8	# <CJK>
-0xB873	0x7FA4	# <CJK>
-0xB874	0x8056	# <CJK>
-0xB875	0x8058	# <CJK>
-0xB876	0x8086	# <CJK>
-0xB877	0x8084	# <CJK>
-0xB878	0x8171	# <CJK>
-0xB879	0x8170	# <CJK>
-0xB87A	0x8178	# <CJK>
-0xB87B	0x8165	# <CJK>
-0xB87C	0x816E	# <CJK>
-0xB87D	0x8173	# <CJK>
-0xB87E	0x816B	# <CJK>
-0xB8A1	0x8179	# <CJK>
-0xB8A2	0x817A	# <CJK>
-0xB8A3	0x8166	# <CJK>
-0xB8A4	0x8205	# <CJK>
-0xB8A5	0x8247	# <CJK>
-0xB8A6	0x8482	# <CJK>
-0xB8A7	0x8477	# <CJK>
-0xB8A8	0x843D	# <CJK>
-0xB8A9	0x8431	# <CJK>
-0xB8AA	0x8475	# <CJK>
-0xB8AB	0x8466	# <CJK>
-0xB8AC	0x846B	# <CJK>
-0xB8AD	0x8449	# <CJK>
-0xB8AE	0x846C	# <CJK>
-0xB8AF	0x845B	# <CJK>
-0xB8B0	0x843C	# <CJK>
-0xB8B1	0x8435	# <CJK>
-0xB8B2	0x8461	# <CJK>
-0xB8B3	0x8463	# <CJK>
-0xB8B4	0x8469	# <CJK>
-0xB8B5	0x846D	# <CJK>
-0xB8B6	0x8446	# <CJK>
-0xB8B7	0x865E	# <CJK>
-0xB8B8	0x865C	# <CJK>
-0xB8B9	0x865F	# <CJK>
-0xB8BA	0x86F9	# <CJK>
-0xB8BB	0x8713	# <CJK>
-0xB8BC	0x8708	# <CJK>
-0xB8BD	0x8707	# <CJK>
-0xB8BE	0x8700	# <CJK>
-0xB8BF	0x86FE	# <CJK>
-0xB8C0	0x86FB	# <CJK>
-0xB8C1	0x8702	# <CJK>
-0xB8C2	0x8703	# <CJK>
-0xB8C3	0x8706	# <CJK>
-0xB8C4	0x870A	# <CJK>
-0xB8C5	0x8859	# <CJK>
-0xB8C6	0x88DF	# <CJK>
-0xB8C7	0x88D4	# <CJK>
-0xB8C8	0x88D9	# <CJK>
-0xB8C9	0x88DC	# <CJK>
-0xB8CA	0x88D8	# <CJK>
-0xB8CB	0x88DD	# <CJK>
-0xB8CC	0x88E1	# <CJK>
-0xB8CD	0x88CA	# <CJK>
-0xB8CE	0x88D5	# <CJK>
-0xB8CF	0x88D2	# <CJK>
-0xB8D0	0x899C	# <CJK>
-0xB8D1	0x89E3	# <CJK>
-0xB8D2	0x8A6B	# <CJK>
-0xB8D3	0x8A72	# <CJK>
-0xB8D4	0x8A73	# <CJK>
-0xB8D5	0x8A66	# <CJK>
-0xB8D6	0x8A69	# <CJK>
-0xB8D7	0x8A70	# <CJK>
-0xB8D8	0x8A87	# <CJK>
-0xB8D9	0x8A7C	# <CJK>
-0xB8DA	0x8A63	# <CJK>
-0xB8DB	0x8AA0	# <CJK>
-0xB8DC	0x8A71	# <CJK>
-0xB8DD	0x8A85	# <CJK>
-0xB8DE	0x8A6D	# <CJK>
-0xB8DF	0x8A62	# <CJK>
-0xB8E0	0x8A6E	# <CJK>
-0xB8E1	0x8A6C	# <CJK>
-0xB8E2	0x8A79	# <CJK>
-0xB8E3	0x8A7B	# <CJK>
-0xB8E4	0x8A3E	# <CJK>
-0xB8E5	0x8A68	# <CJK>
-0xB8E6	0x8C62	# <CJK>
-0xB8E7	0x8C8A	# <CJK>
-0xB8E8	0x8C89	# <CJK>
-0xB8E9	0x8CCA	# <CJK>
-0xB8EA	0x8CC7	# <CJK>
-0xB8EB	0x8CC8	# <CJK>
-0xB8EC	0x8CC4	# <CJK>
-0xB8ED	0x8CB2	# <CJK>
-0xB8EE	0x8CC3	# <CJK>
-0xB8EF	0x8CC2	# <CJK>
-0xB8F0	0x8CC5	# <CJK>
-0xB8F1	0x8DE1	# <CJK>
-0xB8F2	0x8DDF	# <CJK>
-0xB8F3	0x8DE8	# <CJK>
-0xB8F4	0x8DEF	# <CJK>
-0xB8F5	0x8DF3	# <CJK>
-0xB8F6	0x8DFA	# <CJK>
-0xB8F7	0x8DEA	# <CJK>
-0xB8F8	0x8DE4	# <CJK>
-0xB8F9	0x8DE6	# <CJK>
-0xB8FA	0x8EB2	# <CJK>
-0xB8FB	0x8F03	# <CJK>
-0xB8FC	0x8F09	# <CJK>
-0xB8FD	0x8EFE	# <CJK>
-0xB8FE	0x8F0A	# <CJK>
-0xB940	0x8F9F	# <CJK>
-0xB941	0x8FB2	# <CJK>
-0xB942	0x904B	# <CJK>
-0xB943	0x904A	# <CJK>
-0xB944	0x9053	# <CJK>
-0xB945	0x9042	# <CJK>
-0xB946	0x9054	# <CJK>
-0xB947	0x903C	# <CJK>
-0xB948	0x9055	# <CJK>
-0xB949	0x9050	# <CJK>
-0xB94A	0x9047	# <CJK>
-0xB94B	0x904F	# <CJK>
-0xB94C	0x904E	# <CJK>
-0xB94D	0x904D	# <CJK>
-0xB94E	0x9051	# <CJK>
-0xB94F	0x903E	# <CJK>
-0xB950	0x9041	# <CJK>
-0xB951	0x9112	# <CJK>
-0xB952	0x9117	# <CJK>
-0xB953	0x916C	# <CJK>
-0xB954	0x916A	# <CJK>
-0xB955	0x9169	# <CJK>
-0xB956	0x91C9	# <CJK>
-0xB957	0x9237	# <CJK>
-0xB958	0x9257	# <CJK>
-0xB959	0x9238	# <CJK>
-0xB95A	0x923D	# <CJK>
-0xB95B	0x9240	# <CJK>
-0xB95C	0x923E	# <CJK>
-0xB95D	0x925B	# <CJK>
-0xB95E	0x924B	# <CJK>
-0xB95F	0x9264	# <CJK>
-0xB960	0x9251	# <CJK>
-0xB961	0x9234	# <CJK>
-0xB962	0x9249	# <CJK>
-0xB963	0x924D	# <CJK>
-0xB964	0x9245	# <CJK>
-0xB965	0x9239	# <CJK>
-0xB966	0x923F	# <CJK>
-0xB967	0x925A	# <CJK>
-0xB968	0x9598	# <CJK>
-0xB969	0x9698	# <CJK>
-0xB96A	0x9694	# <CJK>
-0xB96B	0x9695	# <CJK>
-0xB96C	0x96CD	# <CJK>
-0xB96D	0x96CB	# <CJK>
-0xB96E	0x96C9	# <CJK>
-0xB96F	0x96CA	# <CJK>
-0xB970	0x96F7	# <CJK>
-0xB971	0x96FB	# <CJK>
-0xB972	0x96F9	# <CJK>
-0xB973	0x96F6	# <CJK>
-0xB974	0x9756	# <CJK>
-0xB975	0x9774	# <CJK>
-0xB976	0x9776	# <CJK>
-0xB977	0x9810	# <CJK>
-0xB978	0x9811	# <CJK>
-0xB979	0x9813	# <CJK>
-0xB97A	0x980A	# <CJK>
-0xB97B	0x9812	# <CJK>
-0xB97C	0x980C	# <CJK>
-0xB97D	0x98FC	# <CJK>
-0xB97E	0x98F4	# <CJK>
-0xB9A1	0x98FD	# <CJK>
-0xB9A2	0x98FE	# <CJK>
-0xB9A3	0x99B3	# <CJK>
-0xB9A4	0x99B1	# <CJK>
-0xB9A5	0x99B4	# <CJK>
-0xB9A6	0x9AE1	# <CJK>
-0xB9A7	0x9CE9	# <CJK>
-0xB9A8	0x9E82	# <CJK>
-0xB9A9	0x9F0E	# <CJK>
-0xB9AA	0x9F13	# <CJK>
-0xB9AB	0x9F20	# <CJK>
-0xB9AC	0x50E7	# <CJK>
-0xB9AD	0x50EE	# <CJK>
-0xB9AE	0x50E5	# <CJK>
-0xB9AF	0x50D6	# <CJK>
-0xB9B0	0x50ED	# <CJK>
-0xB9B1	0x50DA	# <CJK>
-0xB9B2	0x50D5	# <CJK>
-0xB9B3	0x50CF	# <CJK>
-0xB9B4	0x50D1	# <CJK>
-0xB9B5	0x50F1	# <CJK>
-0xB9B6	0x50CE	# <CJK>
-0xB9B7	0x50E9	# <CJK>
-0xB9B8	0x5162	# <CJK>
-0xB9B9	0x51F3	# <CJK>
-0xB9BA	0x5283	# <CJK>
-0xB9BB	0x5282	# <CJK>
-0xB9BC	0x5331	# <CJK>
-0xB9BD	0x53AD	# <CJK>
-0xB9BE	0x55FE	# <CJK>
-0xB9BF	0x5600	# <CJK>
-0xB9C0	0x561B	# <CJK>
-0xB9C1	0x5617	# <CJK>
-0xB9C2	0x55FD	# <CJK>
-0xB9C3	0x5614	# <CJK>
-0xB9C4	0x5606	# <CJK>
-0xB9C5	0x5609	# <CJK>
-0xB9C6	0x560D	# <CJK>
-0xB9C7	0x560E	# <CJK>
-0xB9C8	0x55F7	# <CJK>
-0xB9C9	0x5616	# <CJK>
-0xB9CA	0x561F	# <CJK>
-0xB9CB	0x5608	# <CJK>
-0xB9CC	0x5610	# <CJK>
-0xB9CD	0x55F6	# <CJK>
-0xB9CE	0x5718	# <CJK>
-0xB9CF	0x5716	# <CJK>
-0xB9D0	0x5875	# <CJK>
-0xB9D1	0x587E	# <CJK>
-0xB9D2	0x5883	# <CJK>
-0xB9D3	0x5893	# <CJK>
-0xB9D4	0x588A	# <CJK>
-0xB9D5	0x5879	# <CJK>
-0xB9D6	0x5885	# <CJK>
-0xB9D7	0x587D	# <CJK>
-0xB9D8	0x58FD	# <CJK>
-0xB9D9	0x5925	# <CJK>
-0xB9DA	0x5922	# <CJK>
-0xB9DB	0x5924	# <CJK>
-0xB9DC	0x596A	# <CJK>
-0xB9DD	0x5969	# <CJK>
-0xB9DE	0x5AE1	# <CJK>
-0xB9DF	0x5AE6	# <CJK>
-0xB9E0	0x5AE9	# <CJK>
-0xB9E1	0x5AD7	# <CJK>
-0xB9E2	0x5AD6	# <CJK>
-0xB9E3	0x5AD8	# <CJK>
-0xB9E4	0x5AE3	# <CJK>
-0xB9E5	0x5B75	# <CJK>
-0xB9E6	0x5BDE	# <CJK>
-0xB9E7	0x5BE7	# <CJK>
-0xB9E8	0x5BE1	# <CJK>
-0xB9E9	0x5BE5	# <CJK>
-0xB9EA	0x5BE6	# <CJK>
-0xB9EB	0x5BE8	# <CJK>
-0xB9EC	0x5BE2	# <CJK>
-0xB9ED	0x5BE4	# <CJK>
-0xB9EE	0x5BDF	# <CJK>
-0xB9EF	0x5C0D	# <CJK>
-0xB9F0	0x5C62	# <CJK>
-0xB9F1	0x5D84	# <CJK>
-0xB9F2	0x5D87	# <CJK>
-0xB9F3	0x5E5B	# <CJK>
-0xB9F4	0x5E63	# <CJK>
-0xB9F5	0x5E55	# <CJK>
-0xB9F6	0x5E57	# <CJK>
-0xB9F7	0x5E54	# <CJK>
-0xB9F8	0x5ED3	# <CJK>
-0xB9F9	0x5ED6	# <CJK>
-0xB9FA	0x5F0A	# <CJK>
-0xB9FB	0x5F46	# <CJK>
-0xB9FC	0x5F70	# <CJK>
-0xB9FD	0x5FB9	# <CJK>
-0xB9FE	0x6147	# <CJK>
-0xBA40	0x613F	# <CJK>
-0xBA41	0x614B	# <CJK>
-0xBA42	0x6177	# <CJK>
-0xBA43	0x6162	# <CJK>
-0xBA44	0x6163	# <CJK>
-0xBA45	0x615F	# <CJK>
-0xBA46	0x615A	# <CJK>
-0xBA47	0x6158	# <CJK>
-0xBA48	0x6175	# <CJK>
-0xBA49	0x622A	# <CJK>
-0xBA4A	0x6487	# <CJK>
-0xBA4B	0x6458	# <CJK>
-0xBA4C	0x6454	# <CJK>
-0xBA4D	0x64A4	# <CJK>
-0xBA4E	0x6478	# <CJK>
-0xBA4F	0x645F	# <CJK>
-0xBA50	0x647A	# <CJK>
-0xBA51	0x6451	# <CJK>
-0xBA52	0x6467	# <CJK>
-0xBA53	0x6434	# <CJK>
-0xBA54	0x646D	# <CJK>
-0xBA55	0x647B	# <CJK>
-0xBA56	0x6572	# <CJK>
-0xBA57	0x65A1	# <CJK>
-0xBA58	0x65D7	# <CJK>
-0xBA59	0x65D6	# <CJK>
-0xBA5A	0x66A2	# <CJK>
-0xBA5B	0x66A8	# <CJK>
-0xBA5C	0x669D	# <CJK>
-0xBA5D	0x699C	# <CJK>
-0xBA5E	0x69A8	# <CJK>
-0xBA5F	0x6995	# <CJK>
-0xBA60	0x69C1	# <CJK>
-0xBA61	0x69AE	# <CJK>
-0xBA62	0x69D3	# <CJK>
-0xBA63	0x69CB	# <CJK>
-0xBA64	0x699B	# <CJK>
-0xBA65	0x69B7	# <CJK>
-0xBA66	0x69BB	# <CJK>
-0xBA67	0x69AB	# <CJK>
-0xBA68	0x69B4	# <CJK>
-0xBA69	0x69D0	# <CJK>
-0xBA6A	0x69CD	# <CJK>
-0xBA6B	0x69AD	# <CJK>
-0xBA6C	0x69CC	# <CJK>
-0xBA6D	0x69A6	# <CJK>
-0xBA6E	0x69C3	# <CJK>
-0xBA6F	0x69A3	# <CJK>
-0xBA70	0x6B49	# <CJK>
-0xBA71	0x6B4C	# <CJK>
-0xBA72	0x6C33	# <CJK>
-0xBA73	0x6F33	# <CJK>
-0xBA74	0x6F14	# <CJK>
-0xBA75	0x6EFE	# <CJK>
-0xBA76	0x6F13	# <CJK>
-0xBA77	0x6EF4	# <CJK>
-0xBA78	0x6F29	# <CJK>
-0xBA79	0x6F3E	# <CJK>
-0xBA7A	0x6F20	# <CJK>
-0xBA7B	0x6F2C	# <CJK>
-0xBA7C	0x6F0F	# <CJK>
-0xBA7D	0x6F02	# <CJK>
-0xBA7E	0x6F22	# <CJK>
-0xBAA1	0x6EFF	# <CJK>
-0xBAA2	0x6EEF	# <CJK>
-0xBAA3	0x6F06	# <CJK>
-0xBAA4	0x6F31	# <CJK>
-0xBAA5	0x6F38	# <CJK>
-0xBAA6	0x6F32	# <CJK>
-0xBAA7	0x6F23	# <CJK>
-0xBAA8	0x6F15	# <CJK>
-0xBAA9	0x6F2B	# <CJK>
-0xBAAA	0x6F2F	# <CJK>
-0xBAAB	0x6F88	# <CJK>
-0xBAAC	0x6F2A	# <CJK>
-0xBAAD	0x6EEC	# <CJK>
-0xBAAE	0x6F01	# <CJK>
-0xBAAF	0x6EF2	# <CJK>
-0xBAB0	0x6ECC	# <CJK>
-0xBAB1	0x6EF7	# <CJK>
-0xBAB2	0x7194	# <CJK>
-0xBAB3	0x7199	# <CJK>
-0xBAB4	0x717D	# <CJK>
-0xBAB5	0x718A	# <CJK>
-0xBAB6	0x7184	# <CJK>
-0xBAB7	0x7192	# <CJK>
-0xBAB8	0x723E	# <CJK>
-0xBAB9	0x7292	# <CJK>
-0xBABA	0x7296	# <CJK>
-0xBABB	0x7344	# <CJK>
-0xBABC	0x7350	# <CJK>
-0xBABD	0x7464	# <CJK>
-0xBABE	0x7463	# <CJK>
-0xBABF	0x746A	# <CJK>
-0xBAC0	0x7470	# <CJK>
-0xBAC1	0x746D	# <CJK>
-0xBAC2	0x7504	# <CJK>
-0xBAC3	0x7591	# <CJK>
-0xBAC4	0x7627	# <CJK>
-0xBAC5	0x760D	# <CJK>
-0xBAC6	0x760B	# <CJK>
-0xBAC7	0x7609	# <CJK>
-0xBAC8	0x7613	# <CJK>
-0xBAC9	0x76E1	# <CJK>
-0xBACA	0x76E3	# <CJK>
-0xBACB	0x7784	# <CJK>
-0xBACC	0x777D	# <CJK>
-0xBACD	0x777F	# <CJK>
-0xBACE	0x7761	# <CJK>
-0xBACF	0x78C1	# <CJK>
-0xBAD0	0x789F	# <CJK>
-0xBAD1	0x78A7	# <CJK>
-0xBAD2	0x78B3	# <CJK>
-0xBAD3	0x78A9	# <CJK>
-0xBAD4	0x78A3	# <CJK>
-0xBAD5	0x798E	# <CJK>
-0xBAD6	0x798F	# <CJK>
-0xBAD7	0x798D	# <CJK>
-0xBAD8	0x7A2E	# <CJK>
-0xBAD9	0x7A31	# <CJK>
-0xBADA	0x7AAA	# <CJK>
-0xBADB	0x7AA9	# <CJK>
-0xBADC	0x7AED	# <CJK>
-0xBADD	0x7AEF	# <CJK>
-0xBADE	0x7BA1	# <CJK>
-0xBADF	0x7B95	# <CJK>
-0xBAE0	0x7B8B	# <CJK>
-0xBAE1	0x7B75	# <CJK>
-0xBAE2	0x7B97	# <CJK>
-0xBAE3	0x7B9D	# <CJK>
-0xBAE4	0x7B94	# <CJK>
-0xBAE5	0x7B8F	# <CJK>
-0xBAE6	0x7BB8	# <CJK>
-0xBAE7	0x7B87	# <CJK>
-0xBAE8	0x7B84	# <CJK>
-0xBAE9	0x7CB9	# <CJK>
-0xBAEA	0x7CBD	# <CJK>
-0xBAEB	0x7CBE	# <CJK>
-0xBAEC	0x7DBB	# <CJK>
-0xBAED	0x7DB0	# <CJK>
-0xBAEE	0x7D9C	# <CJK>
-0xBAEF	0x7DBD	# <CJK>
-0xBAF0	0x7DBE	# <CJK>
-0xBAF1	0x7DA0	# <CJK>
-0xBAF2	0x7DCA	# <CJK>
-0xBAF3	0x7DB4	# <CJK>
-0xBAF4	0x7DB2	# <CJK>
-0xBAF5	0x7DB1	# <CJK>
-0xBAF6	0x7DBA	# <CJK>
-0xBAF7	0x7DA2	# <CJK>
-0xBAF8	0x7DBF	# <CJK>
-0xBAF9	0x7DB5	# <CJK>
-0xBAFA	0x7DB8	# <CJK>
-0xBAFB	0x7DAD	# <CJK>
-0xBAFC	0x7DD2	# <CJK>
-0xBAFD	0x7DC7	# <CJK>
-0xBAFE	0x7DAC	# <CJK>
-0xBB40	0x7F70	# <CJK>
-0xBB41	0x7FE0	# <CJK>
-0xBB42	0x7FE1	# <CJK>
-0xBB43	0x7FDF	# <CJK>
-0xBB44	0x805E	# <CJK>
-0xBB45	0x805A	# <CJK>
-0xBB46	0x8087	# <CJK>
-0xBB47	0x8150	# <CJK>
-0xBB48	0x8180	# <CJK>
-0xBB49	0x818F	# <CJK>
-0xBB4A	0x8188	# <CJK>
-0xBB4B	0x818A	# <CJK>
-0xBB4C	0x817F	# <CJK>
-0xBB4D	0x8182	# <CJK>
-0xBB4E	0x81E7	# <CJK>
-0xBB4F	0x81FA	# <CJK>
-0xBB50	0x8207	# <CJK>
-0xBB51	0x8214	# <CJK>
-0xBB52	0x821E	# <CJK>
-0xBB53	0x824B	# <CJK>
-0xBB54	0x84C9	# <CJK>
-0xBB55	0x84BF	# <CJK>
-0xBB56	0x84C6	# <CJK>
-0xBB57	0x84C4	# <CJK>
-0xBB58	0x8499	# <CJK>
-0xBB59	0x849E	# <CJK>
-0xBB5A	0x84B2	# <CJK>
-0xBB5B	0x849C	# <CJK>
-0xBB5C	0x84CB	# <CJK>
-0xBB5D	0x84B8	# <CJK>
-0xBB5E	0x84C0	# <CJK>
-0xBB5F	0x84D3	# <CJK>
-0xBB60	0x8490	# <CJK>
-0xBB61	0x84BC	# <CJK>
-0xBB62	0x84D1	# <CJK>
-0xBB63	0x84CA	# <CJK>
-0xBB64	0x873F	# <CJK>
-0xBB65	0x871C	# <CJK>
-0xBB66	0x873B	# <CJK>
-0xBB67	0x8722	# <CJK>
-0xBB68	0x8725	# <CJK>
-0xBB69	0x8734	# <CJK>
-0xBB6A	0x8718	# <CJK>
-0xBB6B	0x8755	# <CJK>
-0xBB6C	0x8737	# <CJK>
-0xBB6D	0x8729	# <CJK>
-0xBB6E	0x88F3	# <CJK>
-0xBB6F	0x8902	# <CJK>
-0xBB70	0x88F4	# <CJK>
-0xBB71	0x88F9	# <CJK>
-0xBB72	0x88F8	# <CJK>
-0xBB73	0x88FD	# <CJK>
-0xBB74	0x88E8	# <CJK>
-0xBB75	0x891A	# <CJK>
-0xBB76	0x88EF	# <CJK>
-0xBB77	0x8AA6	# <CJK>
-0xBB78	0x8A8C	# <CJK>
-0xBB79	0x8A9E	# <CJK>
-0xBB7A	0x8AA3	# <CJK>
-0xBB7B	0x8A8D	# <CJK>
-0xBB7C	0x8AA1	# <CJK>
-0xBB7D	0x8A93	# <CJK>
-0xBB7E	0x8AA4	# <CJK>
-0xBBA1	0x8AAA	# <CJK>
-0xBBA2	0x8AA5	# <CJK>
-0xBBA3	0x8AA8	# <CJK>
-0xBBA4	0x8A98	# <CJK>
-0xBBA5	0x8A91	# <CJK>
-0xBBA6	0x8A9A	# <CJK>
-0xBBA7	0x8AA7	# <CJK>
-0xBBA8	0x8C6A	# <CJK>
-0xBBA9	0x8C8D	# <CJK>
-0xBBAA	0x8C8C	# <CJK>
-0xBBAB	0x8CD3	# <CJK>
-0xBBAC	0x8CD1	# <CJK>
-0xBBAD	0x8CD2	# <CJK>
-0xBBAE	0x8D6B	# <CJK>
-0xBBAF	0x8D99	# <CJK>
-0xBBB0	0x8D95	# <CJK>
-0xBBB1	0x8DFC	# <CJK>
-0xBBB2	0x8F14	# <CJK>
-0xBBB3	0x8F12	# <CJK>
-0xBBB4	0x8F15	# <CJK>
-0xBBB5	0x8F13	# <CJK>
-0xBBB6	0x8FA3	# <CJK>
-0xBBB7	0x9060	# <CJK>
-0xBBB8	0x9058	# <CJK>
-0xBBB9	0x905C	# <CJK>
-0xBBBA	0x9063	# <CJK>
-0xBBBB	0x9059	# <CJK>
-0xBBBC	0x905E	# <CJK>
-0xBBBD	0x9062	# <CJK>
-0xBBBE	0x905D	# <CJK>
-0xBBBF	0x905B	# <CJK>
-0xBBC0	0x9119	# <CJK>
-0xBBC1	0x9118	# <CJK>
-0xBBC2	0x911E	# <CJK>
-0xBBC3	0x9175	# <CJK>
-0xBBC4	0x9178	# <CJK>
-0xBBC5	0x9177	# <CJK>
-0xBBC6	0x9174	# <CJK>
-0xBBC7	0x9278	# <CJK>
-0xBBC8	0x9280	# <CJK>
-0xBBC9	0x9285	# <CJK>
-0xBBCA	0x9298	# <CJK>
-0xBBCB	0x9296	# <CJK>
-0xBBCC	0x927B	# <CJK>
-0xBBCD	0x9293	# <CJK>
-0xBBCE	0x929C	# <CJK>
-0xBBCF	0x92A8	# <CJK>
-0xBBD0	0x927C	# <CJK>
-0xBBD1	0x9291	# <CJK>
-0xBBD2	0x95A1	# <CJK>
-0xBBD3	0x95A8	# <CJK>
-0xBBD4	0x95A9	# <CJK>
-0xBBD5	0x95A3	# <CJK>
-0xBBD6	0x95A5	# <CJK>
-0xBBD7	0x95A4	# <CJK>
-0xBBD8	0x9699	# <CJK>
-0xBBD9	0x969C	# <CJK>
-0xBBDA	0x969B	# <CJK>
-0xBBDB	0x96CC	# <CJK>
-0xBBDC	0x96D2	# <CJK>
-0xBBDD	0x9700	# <CJK>
-0xBBDE	0x977C	# <CJK>
-0xBBDF	0x9785	# <CJK>
-0xBBE0	0x97F6	# <CJK>
-0xBBE1	0x9817	# <CJK>
-0xBBE2	0x9818	# <CJK>
-0xBBE3	0x98AF	# <CJK>
-0xBBE4	0x98B1	# <CJK>
-0xBBE5	0x9903	# <CJK>
-0xBBE6	0x9905	# <CJK>
-0xBBE7	0x990C	# <CJK>
-0xBBE8	0x9909	# <CJK>
-0xBBE9	0x99C1	# <CJK>
-0xBBEA	0x9AAF	# <CJK>
-0xBBEB	0x9AB0	# <CJK>
-0xBBEC	0x9AE6	# <CJK>
-0xBBED	0x9B41	# <CJK>
-0xBBEE	0x9B42	# <CJK>
-0xBBEF	0x9CF4	# <CJK>
-0xBBF0	0x9CF6	# <CJK>
-0xBBF1	0x9CF3	# <CJK>
-0xBBF2	0x9EBC	# <CJK>
-0xBBF3	0x9F3B	# <CJK>
-0xBBF4	0x9F4A	# <CJK>
-0xBBF5	0x5104	# <CJK>
-0xBBF6	0x5100	# <CJK>
-0xBBF7	0x50FB	# <CJK>
-0xBBF8	0x50F5	# <CJK>
-0xBBF9	0x50F9	# <CJK>
-0xBBFA	0x5102	# <CJK>
-0xBBFB	0x5108	# <CJK>
-0xBBFC	0x5109	# <CJK>
-0xBBFD	0x5105	# <CJK>
-0xBBFE	0x51DC	# <CJK>
-0xBC40	0x5287	# <CJK>
-0xBC41	0x5288	# <CJK>
-0xBC42	0x5289	# <CJK>
-0xBC43	0x528D	# <CJK>
-0xBC44	0x528A	# <CJK>
-0xBC45	0x52F0	# <CJK>
-0xBC46	0x53B2	# <CJK>
-0xBC47	0x562E	# <CJK>
-0xBC48	0x563B	# <CJK>
-0xBC49	0x5639	# <CJK>
-0xBC4A	0x5632	# <CJK>
-0xBC4B	0x563F	# <CJK>
-0xBC4C	0x5634	# <CJK>
-0xBC4D	0x5629	# <CJK>
-0xBC4E	0x5653	# <CJK>
-0xBC4F	0x564E	# <CJK>
-0xBC50	0x5657	# <CJK>
-0xBC51	0x5674	# <CJK>
-0xBC52	0x5636	# <CJK>
-0xBC53	0x562F	# <CJK>
-0xBC54	0x5630	# <CJK>
-0xBC55	0x5880	# <CJK>
-0xBC56	0x589F	# <CJK>
-0xBC57	0x589E	# <CJK>
-0xBC58	0x58B3	# <CJK>
-0xBC59	0x589C	# <CJK>
-0xBC5A	0x58AE	# <CJK>
-0xBC5B	0x58A9	# <CJK>
-0xBC5C	0x58A6	# <CJK>
-0xBC5D	0x596D	# <CJK>
-0xBC5E	0x5B09	# <CJK>
-0xBC5F	0x5AFB	# <CJK>
-0xBC60	0x5B0B	# <CJK>
-0xBC61	0x5AF5	# <CJK>
-0xBC62	0x5B0C	# <CJK>
-0xBC63	0x5B08	# <CJK>
-0xBC64	0x5BEE	# <CJK>
-0xBC65	0x5BEC	# <CJK>
-0xBC66	0x5BE9	# <CJK>
-0xBC67	0x5BEB	# <CJK>
-0xBC68	0x5C64	# <CJK>
-0xBC69	0x5C65	# <CJK>
-0xBC6A	0x5D9D	# <CJK>
-0xBC6B	0x5D94	# <CJK>
-0xBC6C	0x5E62	# <CJK>
-0xBC6D	0x5E5F	# <CJK>
-0xBC6E	0x5E61	# <CJK>
-0xBC6F	0x5EE2	# <CJK>
-0xBC70	0x5EDA	# <CJK>
-0xBC71	0x5EDF	# <CJK>
-0xBC72	0x5EDD	# <CJK>
-0xBC73	0x5EE3	# <CJK>
-0xBC74	0x5EE0	# <CJK>
-0xBC75	0x5F48	# <CJK>
-0xBC76	0x5F71	# <CJK>
-0xBC77	0x5FB7	# <CJK>
-0xBC78	0x5FB5	# <CJK>
-0xBC79	0x6176	# <CJK>
-0xBC7A	0x6167	# <CJK>
-0xBC7B	0x616E	# <CJK>
-0xBC7C	0x615D	# <CJK>
-0xBC7D	0x6155	# <CJK>
-0xBC7E	0x6182	# <CJK>
-0xBCA1	0x617C	# <CJK>
-0xBCA2	0x6170	# <CJK>
-0xBCA3	0x616B	# <CJK>
-0xBCA4	0x617E	# <CJK>
-0xBCA5	0x61A7	# <CJK>
-0xBCA6	0x6190	# <CJK>
-0xBCA7	0x61AB	# <CJK>
-0xBCA8	0x618E	# <CJK>
-0xBCA9	0x61AC	# <CJK>
-0xBCAA	0x619A	# <CJK>
-0xBCAB	0x61A4	# <CJK>
-0xBCAC	0x6194	# <CJK>
-0xBCAD	0x61AE	# <CJK>
-0xBCAE	0x622E	# <CJK>
-0xBCAF	0x6469	# <CJK>
-0xBCB0	0x646F	# <CJK>
-0xBCB1	0x6479	# <CJK>
-0xBCB2	0x649E	# <CJK>
-0xBCB3	0x64B2	# <CJK>
-0xBCB4	0x6488	# <CJK>
-0xBCB5	0x6490	# <CJK>
-0xBCB6	0x64B0	# <CJK>
-0xBCB7	0x64A5	# <CJK>
-0xBCB8	0x6493	# <CJK>
-0xBCB9	0x6495	# <CJK>
-0xBCBA	0x64A9	# <CJK>
-0xBCBB	0x6492	# <CJK>
-0xBCBC	0x64AE	# <CJK>
-0xBCBD	0x64AD	# <CJK>
-0xBCBE	0x64AB	# <CJK>
-0xBCBF	0x649A	# <CJK>
-0xBCC0	0x64AC	# <CJK>
-0xBCC1	0x6499	# <CJK>
-0xBCC2	0x64A2	# <CJK>
-0xBCC3	0x64B3	# <CJK>
-0xBCC4	0x6575	# <CJK>
-0xBCC5	0x6577	# <CJK>
-0xBCC6	0x6578	# <CJK>
-0xBCC7	0x66AE	# <CJK>
-0xBCC8	0x66AB	# <CJK>
-0xBCC9	0x66B4	# <CJK>
-0xBCCA	0x66B1	# <CJK>
-0xBCCB	0x6A23	# <CJK>
-0xBCCC	0x6A1F	# <CJK>
-0xBCCD	0x69E8	# <CJK>
-0xBCCE	0x6A01	# <CJK>
-0xBCCF	0x6A1E	# <CJK>
-0xBCD0	0x6A19	# <CJK>
-0xBCD1	0x69FD	# <CJK>
-0xBCD2	0x6A21	# <CJK>
-0xBCD3	0x6A13	# <CJK>
-0xBCD4	0x6A0A	# <CJK>
-0xBCD5	0x69F3	# <CJK>
-0xBCD6	0x6A02	# <CJK>
-0xBCD7	0x6A05	# <CJK>
-0xBCD8	0x69ED	# <CJK>
-0xBCD9	0x6A11	# <CJK>
-0xBCDA	0x6B50	# <CJK>
-0xBCDB	0x6B4E	# <CJK>
-0xBCDC	0x6BA4	# <CJK>
-0xBCDD	0x6BC5	# <CJK>
-0xBCDE	0x6BC6	# <CJK>
-0xBCDF	0x6F3F	# <CJK>
-0xBCE0	0x6F7C	# <CJK>
-0xBCE1	0x6F84	# <CJK>
-0xBCE2	0x6F51	# <CJK>
-0xBCE3	0x6F66	# <CJK>
-0xBCE4	0x6F54	# <CJK>
-0xBCE5	0x6F86	# <CJK>
-0xBCE6	0x6F6D	# <CJK>
-0xBCE7	0x6F5B	# <CJK>
-0xBCE8	0x6F78	# <CJK>
-0xBCE9	0x6F6E	# <CJK>
-0xBCEA	0x6F8E	# <CJK>
-0xBCEB	0x6F7A	# <CJK>
-0xBCEC	0x6F70	# <CJK>
-0xBCED	0x6F64	# <CJK>
-0xBCEE	0x6F97	# <CJK>
-0xBCEF	0x6F58	# <CJK>
-0xBCF0	0x6ED5	# <CJK>
-0xBCF1	0x6F6F	# <CJK>
-0xBCF2	0x6F60	# <CJK>
-0xBCF3	0x6F5F	# <CJK>
-0xBCF4	0x719F	# <CJK>
-0xBCF5	0x71AC	# <CJK>
-0xBCF6	0x71B1	# <CJK>
-0xBCF7	0x71A8	# <CJK>
-0xBCF8	0x7256	# <CJK>
-0xBCF9	0x729B	# <CJK>
-0xBCFA	0x734E	# <CJK>
-0xBCFB	0x7357	# <CJK>
-0xBCFC	0x7469	# <CJK>
-0xBCFD	0x748B	# <CJK>
-0xBCFE	0x7483	# <CJK>
-0xBD40	0x747E	# <CJK>
-0xBD41	0x7480	# <CJK>
-0xBD42	0x757F	# <CJK>
-0xBD43	0x7620	# <CJK>
-0xBD44	0x7629	# <CJK>
-0xBD45	0x761F	# <CJK>
-0xBD46	0x7624	# <CJK>
-0xBD47	0x7626	# <CJK>
-0xBD48	0x7621	# <CJK>
-0xBD49	0x7622	# <CJK>
-0xBD4A	0x769A	# <CJK>
-0xBD4B	0x76BA	# <CJK>
-0xBD4C	0x76E4	# <CJK>
-0xBD4D	0x778E	# <CJK>
-0xBD4E	0x7787	# <CJK>
-0xBD4F	0x778C	# <CJK>
-0xBD50	0x7791	# <CJK>
-0xBD51	0x778B	# <CJK>
-0xBD52	0x78CB	# <CJK>
-0xBD53	0x78C5	# <CJK>
-0xBD54	0x78BA	# <CJK>
-0xBD55	0x78CA	# <CJK>
-0xBD56	0x78BE	# <CJK>
-0xBD57	0x78D5	# <CJK>
-0xBD58	0x78BC	# <CJK>
-0xBD59	0x78D0	# <CJK>
-0xBD5A	0x7A3F	# <CJK>
-0xBD5B	0x7A3C	# <CJK>
-0xBD5C	0x7A40	# <CJK>
-0xBD5D	0x7A3D	# <CJK>
-0xBD5E	0x7A37	# <CJK>
-0xBD5F	0x7A3B	# <CJK>
-0xBD60	0x7AAF	# <CJK>
-0xBD61	0x7AAE	# <CJK>
-0xBD62	0x7BAD	# <CJK>
-0xBD63	0x7BB1	# <CJK>
-0xBD64	0x7BC4	# <CJK>
-0xBD65	0x7BB4	# <CJK>
-0xBD66	0x7BC6	# <CJK>
-0xBD67	0x7BC7	# <CJK>
-0xBD68	0x7BC1	# <CJK>
-0xBD69	0x7BA0	# <CJK>
-0xBD6A	0x7BCC	# <CJK>
-0xBD6B	0x7CCA	# <CJK>
-0xBD6C	0x7DE0	# <CJK>
-0xBD6D	0x7DF4	# <CJK>
-0xBD6E	0x7DEF	# <CJK>
-0xBD6F	0x7DFB	# <CJK>
-0xBD70	0x7DD8	# <CJK>
-0xBD71	0x7DEC	# <CJK>
-0xBD72	0x7DDD	# <CJK>
-0xBD73	0x7DE8	# <CJK>
-0xBD74	0x7DE3	# <CJK>
-0xBD75	0x7DDA	# <CJK>
-0xBD76	0x7DDE	# <CJK>
-0xBD77	0x7DE9	# <CJK>
-0xBD78	0x7D9E	# <CJK>
-0xBD79	0x7DD9	# <CJK>
-0xBD7A	0x7DF2	# <CJK>
-0xBD7B	0x7DF9	# <CJK>
-0xBD7C	0x7F75	# <CJK>
-0xBD7D	0x7F77	# <CJK>
-0xBD7E	0x7FAF	# <CJK>
-0xBDA1	0x7FE9	# <CJK>
-0xBDA2	0x8026	# <CJK>
-0xBDA3	0x819B	# <CJK>
-0xBDA4	0x819C	# <CJK>
-0xBDA5	0x819D	# <CJK>
-0xBDA6	0x81A0	# <CJK>
-0xBDA7	0x819A	# <CJK>
-0xBDA8	0x8198	# <CJK>
-0xBDA9	0x8517	# <CJK>
-0xBDAA	0x853D	# <CJK>
-0xBDAB	0x851A	# <CJK>
-0xBDAC	0x84EE	# <CJK>
-0xBDAD	0x852C	# <CJK>
-0xBDAE	0x852D	# <CJK>
-0xBDAF	0x8513	# <CJK>
-0xBDB0	0x8511	# <CJK>
-0xBDB1	0x8523	# <CJK>
-0xBDB2	0x8521	# <CJK>
-0xBDB3	0x8514	# <CJK>
-0xBDB4	0x84EC	# <CJK>
-0xBDB5	0x8525	# <CJK>
-0xBDB6	0x84FF	# <CJK>
-0xBDB7	0x8506	# <CJK>
-0xBDB8	0x8782	# <CJK>
-0xBDB9	0x8774	# <CJK>
-0xBDBA	0x8776	# <CJK>
-0xBDBB	0x8760	# <CJK>
-0xBDBC	0x8766	# <CJK>
-0xBDBD	0x8778	# <CJK>
-0xBDBE	0x8768	# <CJK>
-0xBDBF	0x8759	# <CJK>
-0xBDC0	0x8757	# <CJK>
-0xBDC1	0x874C	# <CJK>
-0xBDC2	0x8753	# <CJK>
-0xBDC3	0x885B	# <CJK>
-0xBDC4	0x885D	# <CJK>
-0xBDC5	0x8910	# <CJK>
-0xBDC6	0x8907	# <CJK>
-0xBDC7	0x8912	# <CJK>
-0xBDC8	0x8913	# <CJK>
-0xBDC9	0x8915	# <CJK>
-0xBDCA	0x890A	# <CJK>
-0xBDCB	0x8ABC	# <CJK>
-0xBDCC	0x8AD2	# <CJK>
-0xBDCD	0x8AC7	# <CJK>
-0xBDCE	0x8AC4	# <CJK>
-0xBDCF	0x8A95	# <CJK>
-0xBDD0	0x8ACB	# <CJK>
-0xBDD1	0x8AF8	# <CJK>
-0xBDD2	0x8AB2	# <CJK>
-0xBDD3	0x8AC9	# <CJK>
-0xBDD4	0x8AC2	# <CJK>
-0xBDD5	0x8ABF	# <CJK>
-0xBDD6	0x8AB0	# <CJK>
-0xBDD7	0x8AD6	# <CJK>
-0xBDD8	0x8ACD	# <CJK>
-0xBDD9	0x8AB6	# <CJK>
-0xBDDA	0x8AB9	# <CJK>
-0xBDDB	0x8ADB	# <CJK>
-0xBDDC	0x8C4C	# <CJK>
-0xBDDD	0x8C4E	# <CJK>
-0xBDDE	0x8C6C	# <CJK>
-0xBDDF	0x8CE0	# <CJK>
-0xBDE0	0x8CDE	# <CJK>
-0xBDE1	0x8CE6	# <CJK>
-0xBDE2	0x8CE4	# <CJK>
-0xBDE3	0x8CEC	# <CJK>
-0xBDE4	0x8CED	# <CJK>
-0xBDE5	0x8CE2	# <CJK>
-0xBDE6	0x8CE3	# <CJK>
-0xBDE7	0x8CDC	# <CJK>
-0xBDE8	0x8CEA	# <CJK>
-0xBDE9	0x8CE1	# <CJK>
-0xBDEA	0x8D6D	# <CJK>
-0xBDEB	0x8D9F	# <CJK>
-0xBDEC	0x8DA3	# <CJK>
-0xBDED	0x8E2B	# <CJK>
-0xBDEE	0x8E10	# <CJK>
-0xBDEF	0x8E1D	# <CJK>
-0xBDF0	0x8E22	# <CJK>
-0xBDF1	0x8E0F	# <CJK>
-0xBDF2	0x8E29	# <CJK>
-0xBDF3	0x8E1F	# <CJK>
-0xBDF4	0x8E21	# <CJK>
-0xBDF5	0x8E1E	# <CJK>
-0xBDF6	0x8EBA	# <CJK>
-0xBDF7	0x8F1D	# <CJK>
-0xBDF8	0x8F1B	# <CJK>
-0xBDF9	0x8F1F	# <CJK>
-0xBDFA	0x8F29	# <CJK>
-0xBDFB	0x8F26	# <CJK>
-0xBDFC	0x8F2A	# <CJK>
-0xBDFD	0x8F1C	# <CJK>
-0xBDFE	0x8F1E	# <CJK>
-0xBE40	0x8F25	# <CJK>
-0xBE41	0x9069	# <CJK>
-0xBE42	0x906E	# <CJK>
-0xBE43	0x9068	# <CJK>
-0xBE44	0x906D	# <CJK>
-0xBE45	0x9077	# <CJK>
-0xBE46	0x9130	# <CJK>
-0xBE47	0x912D	# <CJK>
-0xBE48	0x9127	# <CJK>
-0xBE49	0x9131	# <CJK>
-0xBE4A	0x9187	# <CJK>
-0xBE4B	0x9189	# <CJK>
-0xBE4C	0x918B	# <CJK>
-0xBE4D	0x9183	# <CJK>
-0xBE4E	0x92C5	# <CJK>
-0xBE4F	0x92BB	# <CJK>
-0xBE50	0x92B7	# <CJK>
-0xBE51	0x92EA	# <CJK>
-0xBE52	0x92AC	# <CJK>
-0xBE53	0x92E4	# <CJK>
-0xBE54	0x92C1	# <CJK>
-0xBE55	0x92B3	# <CJK>
-0xBE56	0x92BC	# <CJK>
-0xBE57	0x92D2	# <CJK>
-0xBE58	0x92C7	# <CJK>
-0xBE59	0x92F0	# <CJK>
-0xBE5A	0x92B2	# <CJK>
-0xBE5B	0x95AD	# <CJK>
-0xBE5C	0x95B1	# <CJK>
-0xBE5D	0x9704	# <CJK>
-0xBE5E	0x9706	# <CJK>
-0xBE5F	0x9707	# <CJK>
-0xBE60	0x9709	# <CJK>
-0xBE61	0x9760	# <CJK>
-0xBE62	0x978D	# <CJK>
-0xBE63	0x978B	# <CJK>
-0xBE64	0x978F	# <CJK>
-0xBE65	0x9821	# <CJK>
-0xBE66	0x982B	# <CJK>
-0xBE67	0x981C	# <CJK>
-0xBE68	0x98B3	# <CJK>
-0xBE69	0x990A	# <CJK>
-0xBE6A	0x9913	# <CJK>
-0xBE6B	0x9912	# <CJK>
-0xBE6C	0x9918	# <CJK>
-0xBE6D	0x99DD	# <CJK>
-0xBE6E	0x99D0	# <CJK>
-0xBE6F	0x99DF	# <CJK>
-0xBE70	0x99DB	# <CJK>
-0xBE71	0x99D1	# <CJK>
-0xBE72	0x99D5	# <CJK>
-0xBE73	0x99D2	# <CJK>
-0xBE74	0x99D9	# <CJK>
-0xBE75	0x9AB7	# <CJK>
-0xBE76	0x9AEE	# <CJK>
-0xBE77	0x9AEF	# <CJK>
-0xBE78	0x9B27	# <CJK>
-0xBE79	0x9B45	# <CJK>
-0xBE7A	0x9B44	# <CJK>
-0xBE7B	0x9B77	# <CJK>
-0xBE7C	0x9B6F	# <CJK>
-0xBE7D	0x9D06	# <CJK>
-0xBE7E	0x9D09	# <CJK>
-0xBEA1	0x9D03	# <CJK>
-0xBEA2	0x9EA9	# <CJK>
-0xBEA3	0x9EBE	# <CJK>
-0xBEA4	0x9ECE	# <CJK>
-0xBEA5	0x58A8	# <CJK>
-0xBEA6	0x9F52	# <CJK>
-0xBEA7	0x5112	# <CJK>
-0xBEA8	0x5118	# <CJK>
-0xBEA9	0x5114	# <CJK>
-0xBEAA	0x5110	# <CJK>
-0xBEAB	0x5115	# <CJK>
-0xBEAC	0x5180	# <CJK>
-0xBEAD	0x51AA	# <CJK>
-0xBEAE	0x51DD	# <CJK>
-0xBEAF	0x5291	# <CJK>
-0xBEB0	0x5293	# <CJK>
-0xBEB1	0x52F3	# <CJK>
-0xBEB2	0x5659	# <CJK>
-0xBEB3	0x566B	# <CJK>
-0xBEB4	0x5679	# <CJK>
-0xBEB5	0x5669	# <CJK>
-0xBEB6	0x5664	# <CJK>
-0xBEB7	0x5678	# <CJK>
-0xBEB8	0x566A	# <CJK>
-0xBEB9	0x5668	# <CJK>
-0xBEBA	0x5665	# <CJK>
-0xBEBB	0x5671	# <CJK>
-0xBEBC	0x566F	# <CJK>
-0xBEBD	0x566C	# <CJK>
-0xBEBE	0x5662	# <CJK>
-0xBEBF	0x5676	# <CJK>
-0xBEC0	0x58C1	# <CJK>
-0xBEC1	0x58BE	# <CJK>
-0xBEC2	0x58C7	# <CJK>
-0xBEC3	0x58C5	# <CJK>
-0xBEC4	0x596E	# <CJK>
-0xBEC5	0x5B1D	# <CJK>
-0xBEC6	0x5B34	# <CJK>
-0xBEC7	0x5B78	# <CJK>
-0xBEC8	0x5BF0	# <CJK>
-0xBEC9	0x5C0E	# <CJK>
-0xBECA	0x5F4A	# <CJK>
-0xBECB	0x61B2	# <CJK>
-0xBECC	0x6191	# <CJK>
-0xBECD	0x61A9	# <CJK>
-0xBECE	0x618A	# <CJK>
-0xBECF	0x61CD	# <CJK>
-0xBED0	0x61B6	# <CJK>
-0xBED1	0x61BE	# <CJK>
-0xBED2	0x61CA	# <CJK>
-0xBED3	0x61C8	# <CJK>
-0xBED4	0x6230	# <CJK>
-0xBED5	0x64C5	# <CJK>
-0xBED6	0x64C1	# <CJK>
-0xBED7	0x64CB	# <CJK>
-0xBED8	0x64BB	# <CJK>
-0xBED9	0x64BC	# <CJK>
-0xBEDA	0x64DA	# <CJK>
-0xBEDB	0x64C4	# <CJK>
-0xBEDC	0x64C7	# <CJK>
-0xBEDD	0x64C2	# <CJK>
-0xBEDE	0x64CD	# <CJK>
-0xBEDF	0x64BF	# <CJK>
-0xBEE0	0x64D2	# <CJK>
-0xBEE1	0x64D4	# <CJK>
-0xBEE2	0x64BE	# <CJK>
-0xBEE3	0x6574	# <CJK>
-0xBEE4	0x66C6	# <CJK>
-0xBEE5	0x66C9	# <CJK>
-0xBEE6	0x66B9	# <CJK>
-0xBEE7	0x66C4	# <CJK>
-0xBEE8	0x66C7	# <CJK>
-0xBEE9	0x66B8	# <CJK>
-0xBEEA	0x6A3D	# <CJK>
-0xBEEB	0x6A38	# <CJK>
-0xBEEC	0x6A3A	# <CJK>
-0xBEED	0x6A59	# <CJK>
-0xBEEE	0x6A6B	# <CJK>
-0xBEEF	0x6A58	# <CJK>
-0xBEF0	0x6A39	# <CJK>
-0xBEF1	0x6A44	# <CJK>
-0xBEF2	0x6A62	# <CJK>
-0xBEF3	0x6A61	# <CJK>
-0xBEF4	0x6A4B	# <CJK>
-0xBEF5	0x6A47	# <CJK>
-0xBEF6	0x6A35	# <CJK>
-0xBEF7	0x6A5F	# <CJK>
-0xBEF8	0x6A48	# <CJK>
-0xBEF9	0x6B59	# <CJK>
-0xBEFA	0x6B77	# <CJK>
-0xBEFB	0x6C05	# <CJK>
-0xBEFC	0x6FC2	# <CJK>
-0xBEFD	0x6FB1	# <CJK>
-0xBEFE	0x6FA1	# <CJK>
-0xBF40	0x6FC3	# <CJK>
-0xBF41	0x6FA4	# <CJK>
-0xBF42	0x6FC1	# <CJK>
-0xBF43	0x6FA7	# <CJK>
-0xBF44	0x6FB3	# <CJK>
-0xBF45	0x6FC0	# <CJK>
-0xBF46	0x6FB9	# <CJK>
-0xBF47	0x6FB6	# <CJK>
-0xBF48	0x6FA6	# <CJK>
-0xBF49	0x6FA0	# <CJK>
-0xBF4A	0x6FB4	# <CJK>
-0xBF4B	0x71BE	# <CJK>
-0xBF4C	0x71C9	# <CJK>
-0xBF4D	0x71D0	# <CJK>
-0xBF4E	0x71D2	# <CJK>
-0xBF4F	0x71C8	# <CJK>
-0xBF50	0x71D5	# <CJK>
-0xBF51	0x71B9	# <CJK>
-0xBF52	0x71CE	# <CJK>
-0xBF53	0x71D9	# <CJK>
-0xBF54	0x71DC	# <CJK>
-0xBF55	0x71C3	# <CJK>
-0xBF56	0x71C4	# <CJK>
-0xBF57	0x7368	# <CJK>
-0xBF58	0x749C	# <CJK>
-0xBF59	0x74A3	# <CJK>
-0xBF5A	0x7498	# <CJK>
-0xBF5B	0x749F	# <CJK>
-0xBF5C	0x749E	# <CJK>
-0xBF5D	0x74E2	# <CJK>
-0xBF5E	0x750C	# <CJK>
-0xBF5F	0x750D	# <CJK>
-0xBF60	0x7634	# <CJK>
-0xBF61	0x7638	# <CJK>
-0xBF62	0x763A	# <CJK>
-0xBF63	0x76E7	# <CJK>
-0xBF64	0x76E5	# <CJK>
-0xBF65	0x77A0	# <CJK>
-0xBF66	0x779E	# <CJK>
-0xBF67	0x779F	# <CJK>
-0xBF68	0x77A5	# <CJK>
-0xBF69	0x78E8	# <CJK>
-0xBF6A	0x78DA	# <CJK>
-0xBF6B	0x78EC	# <CJK>
-0xBF6C	0x78E7	# <CJK>
-0xBF6D	0x79A6	# <CJK>
-0xBF6E	0x7A4D	# <CJK>
-0xBF6F	0x7A4E	# <CJK>
-0xBF70	0x7A46	# <CJK>
-0xBF71	0x7A4C	# <CJK>
-0xBF72	0x7A4B	# <CJK>
-0xBF73	0x7ABA	# <CJK>
-0xBF74	0x7BD9	# <CJK>
-0xBF75	0x7C11	# <CJK>
-0xBF76	0x7BC9	# <CJK>
-0xBF77	0x7BE4	# <CJK>
-0xBF78	0x7BDB	# <CJK>
-0xBF79	0x7BE1	# <CJK>
-0xBF7A	0x7BE9	# <CJK>
-0xBF7B	0x7BE6	# <CJK>
-0xBF7C	0x7CD5	# <CJK>
-0xBF7D	0x7CD6	# <CJK>
-0xBF7E	0x7E0A	# <CJK>
-0xBFA1	0x7E11	# <CJK>
-0xBFA2	0x7E08	# <CJK>
-0xBFA3	0x7E1B	# <CJK>
-0xBFA4	0x7E23	# <CJK>
-0xBFA5	0x7E1E	# <CJK>
-0xBFA6	0x7E1D	# <CJK>
-0xBFA7	0x7E09	# <CJK>
-0xBFA8	0x7E10	# <CJK>
-0xBFA9	0x7F79	# <CJK>
-0xBFAA	0x7FB2	# <CJK>
-0xBFAB	0x7FF0	# <CJK>
-0xBFAC	0x7FF1	# <CJK>
-0xBFAD	0x7FEE	# <CJK>
-0xBFAE	0x8028	# <CJK>
-0xBFAF	0x81B3	# <CJK>
-0xBFB0	0x81A9	# <CJK>
-0xBFB1	0x81A8	# <CJK>
-0xBFB2	0x81FB	# <CJK>
-0xBFB3	0x8208	# <CJK>
-0xBFB4	0x8258	# <CJK>
-0xBFB5	0x8259	# <CJK>
-0xBFB6	0x854A	# <CJK>
-0xBFB7	0x8559	# <CJK>
-0xBFB8	0x8548	# <CJK>
-0xBFB9	0x8568	# <CJK>
-0xBFBA	0x8569	# <CJK>
-0xBFBB	0x8543	# <CJK>
-0xBFBC	0x8549	# <CJK>
-0xBFBD	0x856D	# <CJK>
-0xBFBE	0x856A	# <CJK>
-0xBFBF	0x855E	# <CJK>
-0xBFC0	0x8783	# <CJK>
-0xBFC1	0x879F	# <CJK>
-0xBFC2	0x879E	# <CJK>
-0xBFC3	0x87A2	# <CJK>
-0xBFC4	0x878D	# <CJK>
-0xBFC5	0x8861	# <CJK>
-0xBFC6	0x892A	# <CJK>
-0xBFC7	0x8932	# <CJK>
-0xBFC8	0x8925	# <CJK>
-0xBFC9	0x892B	# <CJK>
-0xBFCA	0x8921	# <CJK>
-0xBFCB	0x89AA	# <CJK>
-0xBFCC	0x89A6	# <CJK>
-0xBFCD	0x8AE6	# <CJK>
-0xBFCE	0x8AFA	# <CJK>
-0xBFCF	0x8AEB	# <CJK>
-0xBFD0	0x8AF1	# <CJK>
-0xBFD1	0x8B00	# <CJK>
-0xBFD2	0x8ADC	# <CJK>
-0xBFD3	0x8AE7	# <CJK>
-0xBFD4	0x8AEE	# <CJK>
-0xBFD5	0x8AFE	# <CJK>
-0xBFD6	0x8B01	# <CJK>
-0xBFD7	0x8B02	# <CJK>
-0xBFD8	0x8AF7	# <CJK>
-0xBFD9	0x8AED	# <CJK>
-0xBFDA	0x8AF3	# <CJK>
-0xBFDB	0x8AF6	# <CJK>
-0xBFDC	0x8AFC	# <CJK>
-0xBFDD	0x8C6B	# <CJK>
-0xBFDE	0x8C6D	# <CJK>
-0xBFDF	0x8C93	# <CJK>
-0xBFE0	0x8CF4	# <CJK>
-0xBFE1	0x8E44	# <CJK>
-0xBFE2	0x8E31	# <CJK>
-0xBFE3	0x8E34	# <CJK>
-0xBFE4	0x8E42	# <CJK>
-0xBFE5	0x8E39	# <CJK>
-0xBFE6	0x8E35	# <CJK>
-0xBFE7	0x8F3B	# <CJK>
-0xBFE8	0x8F2F	# <CJK>
-0xBFE9	0x8F38	# <CJK>
-0xBFEA	0x8F33	# <CJK>
-0xBFEB	0x8FA8	# <CJK>
-0xBFEC	0x8FA6	# <CJK>
-0xBFED	0x9075	# <CJK>
-0xBFEE	0x9074	# <CJK>
-0xBFEF	0x9078	# <CJK>
-0xBFF0	0x9072	# <CJK>
-0xBFF1	0x907C	# <CJK>
-0xBFF2	0x907A	# <CJK>
-0xBFF3	0x9134	# <CJK>
-0xBFF4	0x9192	# <CJK>
-0xBFF5	0x9320	# <CJK>
-0xBFF6	0x9336	# <CJK>
-0xBFF7	0x92F8	# <CJK>
-0xBFF8	0x9333	# <CJK>
-0xBFF9	0x932F	# <CJK>
-0xBFFA	0x9322	# <CJK>
-0xBFFB	0x92FC	# <CJK>
-0xBFFC	0x932B	# <CJK>
-0xBFFD	0x9304	# <CJK>
-0xBFFE	0x931A	# <CJK>
-0xC040	0x9310	# <CJK>
-0xC041	0x9326	# <CJK>
-0xC042	0x9321	# <CJK>
-0xC043	0x9315	# <CJK>
-0xC044	0x932E	# <CJK>
-0xC045	0x9319	# <CJK>
-0xC046	0x95BB	# <CJK>
-0xC047	0x96A7	# <CJK>
-0xC048	0x96A8	# <CJK>
-0xC049	0x96AA	# <CJK>
-0xC04A	0x96D5	# <CJK>
-0xC04B	0x970E	# <CJK>
-0xC04C	0x9711	# <CJK>
-0xC04D	0x9716	# <CJK>
-0xC04E	0x970D	# <CJK>
-0xC04F	0x9713	# <CJK>
-0xC050	0x970F	# <CJK>
-0xC051	0x975B	# <CJK>
-0xC052	0x975C	# <CJK>
-0xC053	0x9766	# <CJK>
-0xC054	0x9798	# <CJK>
-0xC055	0x9830	# <CJK>
-0xC056	0x9838	# <CJK>
-0xC057	0x983B	# <CJK>
-0xC058	0x9837	# <CJK>
-0xC059	0x982D	# <CJK>
-0xC05A	0x9839	# <CJK>
-0xC05B	0x9824	# <CJK>
-0xC05C	0x9910	# <CJK>
-0xC05D	0x9928	# <CJK>
-0xC05E	0x991E	# <CJK>
-0xC05F	0x991B	# <CJK>
-0xC060	0x9921	# <CJK>
-0xC061	0x991A	# <CJK>
-0xC062	0x99ED	# <CJK>
-0xC063	0x99E2	# <CJK>
-0xC064	0x99F1	# <CJK>
-0xC065	0x9AB8	# <CJK>
-0xC066	0x9ABC	# <CJK>
-0xC067	0x9AFB	# <CJK>
-0xC068	0x9AED	# <CJK>
-0xC069	0x9B28	# <CJK>
-0xC06A	0x9B91	# <CJK>
-0xC06B	0x9D15	# <CJK>
-0xC06C	0x9D23	# <CJK>
-0xC06D	0x9D26	# <CJK>
-0xC06E	0x9D28	# <CJK>
-0xC06F	0x9D12	# <CJK>
-0xC070	0x9D1B	# <CJK>
-0xC071	0x9ED8	# <CJK>
-0xC072	0x9ED4	# <CJK>
-0xC073	0x9F8D	# <CJK>
-0xC074	0x9F9C	# <CJK>
-0xC075	0x512A	# <CJK>
-0xC076	0x511F	# <CJK>
-0xC077	0x5121	# <CJK>
-0xC078	0x5132	# <CJK>
-0xC079	0x52F5	# <CJK>
-0xC07A	0x568E	# <CJK>
-0xC07B	0x5680	# <CJK>
-0xC07C	0x5690	# <CJK>
-0xC07D	0x5685	# <CJK>
-0xC07E	0x5687	# <CJK>
-0xC0A1	0x568F	# <CJK>
-0xC0A2	0x58D5	# <CJK>
-0xC0A3	0x58D3	# <CJK>
-0xC0A4	0x58D1	# <CJK>
-0xC0A5	0x58CE	# <CJK>
-0xC0A6	0x5B30	# <CJK>
-0xC0A7	0x5B2A	# <CJK>
-0xC0A8	0x5B24	# <CJK>
-0xC0A9	0x5B7A	# <CJK>
-0xC0AA	0x5C37	# <CJK>
-0xC0AB	0x5C68	# <CJK>
-0xC0AC	0x5DBC	# <CJK>
-0xC0AD	0x5DBA	# <CJK>
-0xC0AE	0x5DBD	# <CJK>
-0xC0AF	0x5DB8	# <CJK>
-0xC0B0	0x5E6B	# <CJK>
-0xC0B1	0x5F4C	# <CJK>
-0xC0B2	0x5FBD	# <CJK>
-0xC0B3	0x61C9	# <CJK>
-0xC0B4	0x61C2	# <CJK>
-0xC0B5	0x61C7	# <CJK>
-0xC0B6	0x61E6	# <CJK>
-0xC0B7	0x61CB	# <CJK>
-0xC0B8	0x6232	# <CJK>
-0xC0B9	0x6234	# <CJK>
-0xC0BA	0x64CE	# <CJK>
-0xC0BB	0x64CA	# <CJK>
-0xC0BC	0x64D8	# <CJK>
-0xC0BD	0x64E0	# <CJK>
-0xC0BE	0x64F0	# <CJK>
-0xC0BF	0x64E6	# <CJK>
-0xC0C0	0x64EC	# <CJK>
-0xC0C1	0x64F1	# <CJK>
-0xC0C2	0x64E2	# <CJK>
-0xC0C3	0x64ED	# <CJK>
-0xC0C4	0x6582	# <CJK>
-0xC0C5	0x6583	# <CJK>
-0xC0C6	0x66D9	# <CJK>
-0xC0C7	0x66D6	# <CJK>
-0xC0C8	0x6A80	# <CJK>
-0xC0C9	0x6A94	# <CJK>
-0xC0CA	0x6A84	# <CJK>
-0xC0CB	0x6AA2	# <CJK>
-0xC0CC	0x6A9C	# <CJK>
-0xC0CD	0x6ADB	# <CJK>
-0xC0CE	0x6AA3	# <CJK>
-0xC0CF	0x6A7E	# <CJK>
-0xC0D0	0x6A97	# <CJK>
-0xC0D1	0x6A90	# <CJK>
-0xC0D2	0x6AA0	# <CJK>
-0xC0D3	0x6B5C	# <CJK>
-0xC0D4	0x6BAE	# <CJK>
-0xC0D5	0x6BDA	# <CJK>
-0xC0D6	0x6C08	# <CJK>
-0xC0D7	0x6FD8	# <CJK>
-0xC0D8	0x6FF1	# <CJK>
-0xC0D9	0x6FDF	# <CJK>
-0xC0DA	0x6FE0	# <CJK>
-0xC0DB	0x6FDB	# <CJK>
-0xC0DC	0x6FE4	# <CJK>
-0xC0DD	0x6FEB	# <CJK>
-0xC0DE	0x6FEF	# <CJK>
-0xC0DF	0x6F80	# <CJK>
-0xC0E0	0x6FEC	# <CJK>
-0xC0E1	0x6FE1	# <CJK>
-0xC0E2	0x6FE9	# <CJK>
-0xC0E3	0x6FD5	# <CJK>
-0xC0E4	0x6FEE	# <CJK>
-0xC0E5	0x6FF0	# <CJK>
-0xC0E6	0x71E7	# <CJK>
-0xC0E7	0x71DF	# <CJK>
-0xC0E8	0x71EE	# <CJK>
-0xC0E9	0x71E6	# <CJK>
-0xC0EA	0x71E5	# <CJK>
-0xC0EB	0x71ED	# <CJK>
-0xC0EC	0x71EC	# <CJK>
-0xC0ED	0x71F4	# <CJK>
-0xC0EE	0x71E0	# <CJK>
-0xC0EF	0x7235	# <CJK>
-0xC0F0	0x7246	# <CJK>
-0xC0F1	0x7370	# <CJK>
-0xC0F2	0x7372	# <CJK>
-0xC0F3	0x74A9	# <CJK>
-0xC0F4	0x74B0	# <CJK>
-0xC0F5	0x74A6	# <CJK>
-0xC0F6	0x74A8	# <CJK>
-0xC0F7	0x7646	# <CJK>
-0xC0F8	0x7642	# <CJK>
-0xC0F9	0x764C	# <CJK>
-0xC0FA	0x76EA	# <CJK>
-0xC0FB	0x77B3	# <CJK>
-0xC0FC	0x77AA	# <CJK>
-0xC0FD	0x77B0	# <CJK>
-0xC0FE	0x77AC	# <CJK>
-0xC140	0x77A7	# <CJK>
-0xC141	0x77AD	# <CJK>
-0xC142	0x77EF	# <CJK>
-0xC143	0x78F7	# <CJK>
-0xC144	0x78FA	# <CJK>
-0xC145	0x78F4	# <CJK>
-0xC146	0x78EF	# <CJK>
-0xC147	0x7901	# <CJK>
-0xC148	0x79A7	# <CJK>
-0xC149	0x79AA	# <CJK>
-0xC14A	0x7A57	# <CJK>
-0xC14B	0x7ABF	# <CJK>
-0xC14C	0x7C07	# <CJK>
-0xC14D	0x7C0D	# <CJK>
-0xC14E	0x7BFE	# <CJK>
-0xC14F	0x7BF7	# <CJK>
-0xC150	0x7C0C	# <CJK>
-0xC151	0x7BE0	# <CJK>
-0xC152	0x7CE0	# <CJK>
-0xC153	0x7CDC	# <CJK>
-0xC154	0x7CDE	# <CJK>
-0xC155	0x7CE2	# <CJK>
-0xC156	0x7CDF	# <CJK>
-0xC157	0x7CD9	# <CJK>
-0xC158	0x7CDD	# <CJK>
-0xC159	0x7E2E	# <CJK>
-0xC15A	0x7E3E	# <CJK>
-0xC15B	0x7E46	# <CJK>
-0xC15C	0x7E37	# <CJK>
-0xC15D	0x7E32	# <CJK>
-0xC15E	0x7E43	# <CJK>
-0xC15F	0x7E2B	# <CJK>
-0xC160	0x7E3D	# <CJK>
-0xC161	0x7E31	# <CJK>
-0xC162	0x7E45	# <CJK>
-0xC163	0x7E41	# <CJK>
-0xC164	0x7E34	# <CJK>
-0xC165	0x7E39	# <CJK>
-0xC166	0x7E48	# <CJK>
-0xC167	0x7E35	# <CJK>
-0xC168	0x7E3F	# <CJK>
-0xC169	0x7E2F	# <CJK>
-0xC16A	0x7F44	# <CJK>
-0xC16B	0x7FF3	# <CJK>
-0xC16C	0x7FFC	# <CJK>
-0xC16D	0x8071	# <CJK>
-0xC16E	0x8072	# <CJK>
-0xC16F	0x8070	# <CJK>
-0xC170	0x806F	# <CJK>
-0xC171	0x8073	# <CJK>
-0xC172	0x81C6	# <CJK>
-0xC173	0x81C3	# <CJK>
-0xC174	0x81BA	# <CJK>
-0xC175	0x81C2	# <CJK>
-0xC176	0x81C0	# <CJK>
-0xC177	0x81BF	# <CJK>
-0xC178	0x81BD	# <CJK>
-0xC179	0x81C9	# <CJK>
-0xC17A	0x81BE	# <CJK>
-0xC17B	0x81E8	# <CJK>
-0xC17C	0x8209	# <CJK>
-0xC17D	0x8271	# <CJK>
-0xC17E	0x85AA	# <CJK>
-0xC1A1	0x8584	# <CJK>
-0xC1A2	0x857E	# <CJK>
-0xC1A3	0x859C	# <CJK>
-0xC1A4	0x8591	# <CJK>
-0xC1A5	0x8594	# <CJK>
-0xC1A6	0x85AF	# <CJK>
-0xC1A7	0x859B	# <CJK>
-0xC1A8	0x8587	# <CJK>
-0xC1A9	0x85A8	# <CJK>
-0xC1AA	0x858A	# <CJK>
-0xC1AB	0x8667	# <CJK>
-0xC1AC	0x87C0	# <CJK>
-0xC1AD	0x87D1	# <CJK>
-0xC1AE	0x87B3	# <CJK>
-0xC1AF	0x87D2	# <CJK>
-0xC1B0	0x87C6	# <CJK>
-0xC1B1	0x87AB	# <CJK>
-0xC1B2	0x87BB	# <CJK>
-0xC1B3	0x87BA	# <CJK>
-0xC1B4	0x87C8	# <CJK>
-0xC1B5	0x87CB	# <CJK>
-0xC1B6	0x893B	# <CJK>
-0xC1B7	0x8936	# <CJK>
-0xC1B8	0x8944	# <CJK>
-0xC1B9	0x8938	# <CJK>
-0xC1BA	0x893D	# <CJK>
-0xC1BB	0x89AC	# <CJK>
-0xC1BC	0x8B0E	# <CJK>
-0xC1BD	0x8B17	# <CJK>
-0xC1BE	0x8B19	# <CJK>
-0xC1BF	0x8B1B	# <CJK>
-0xC1C0	0x8B0A	# <CJK>
-0xC1C1	0x8B20	# <CJK>
-0xC1C2	0x8B1D	# <CJK>
-0xC1C3	0x8B04	# <CJK>
-0xC1C4	0x8B10	# <CJK>
-0xC1C5	0x8C41	# <CJK>
-0xC1C6	0x8C3F	# <CJK>
-0xC1C7	0x8C73	# <CJK>
-0xC1C8	0x8CFA	# <CJK>
-0xC1C9	0x8CFD	# <CJK>
-0xC1CA	0x8CFC	# <CJK>
-0xC1CB	0x8CF8	# <CJK>
-0xC1CC	0x8CFB	# <CJK>
-0xC1CD	0x8DA8	# <CJK>
-0xC1CE	0x8E49	# <CJK>
-0xC1CF	0x8E4B	# <CJK>
-0xC1D0	0x8E48	# <CJK>
-0xC1D1	0x8E4A	# <CJK>
-0xC1D2	0x8F44	# <CJK>
-0xC1D3	0x8F3E	# <CJK>
-0xC1D4	0x8F42	# <CJK>
-0xC1D5	0x8F45	# <CJK>
-0xC1D6	0x8F3F	# <CJK>
-0xC1D7	0x907F	# <CJK>
-0xC1D8	0x907D	# <CJK>
-0xC1D9	0x9084	# <CJK>
-0xC1DA	0x9081	# <CJK>
-0xC1DB	0x9082	# <CJK>
-0xC1DC	0x9080	# <CJK>
-0xC1DD	0x9139	# <CJK>
-0xC1DE	0x91A3	# <CJK>
-0xC1DF	0x919E	# <CJK>
-0xC1E0	0x919C	# <CJK>
-0xC1E1	0x934D	# <CJK>
-0xC1E2	0x9382	# <CJK>
-0xC1E3	0x9328	# <CJK>
-0xC1E4	0x9375	# <CJK>
-0xC1E5	0x934A	# <CJK>
-0xC1E6	0x9365	# <CJK>
-0xC1E7	0x934B	# <CJK>
-0xC1E8	0x9318	# <CJK>
-0xC1E9	0x937E	# <CJK>
-0xC1EA	0x936C	# <CJK>
-0xC1EB	0x935B	# <CJK>
-0xC1EC	0x9370	# <CJK>
-0xC1ED	0x935A	# <CJK>
-0xC1EE	0x9354	# <CJK>
-0xC1EF	0x95CA	# <CJK>
-0xC1F0	0x95CB	# <CJK>
-0xC1F1	0x95CC	# <CJK>
-0xC1F2	0x95C8	# <CJK>
-0xC1F3	0x95C6	# <CJK>
-0xC1F4	0x96B1	# <CJK>
-0xC1F5	0x96B8	# <CJK>
-0xC1F6	0x96D6	# <CJK>
-0xC1F7	0x971C	# <CJK>
-0xC1F8	0x971E	# <CJK>
-0xC1F9	0x97A0	# <CJK>
-0xC1FA	0x97D3	# <CJK>
-0xC1FB	0x9846	# <CJK>
-0xC1FC	0x98B6	# <CJK>
-0xC1FD	0x9935	# <CJK>
-0xC1FE	0x9A01	# <CJK>
-0xC240	0x99FF	# <CJK>
-0xC241	0x9BAE	# <CJK>
-0xC242	0x9BAB	# <CJK>
-0xC243	0x9BAA	# <CJK>
-0xC244	0x9BAD	# <CJK>
-0xC245	0x9D3B	# <CJK>
-0xC246	0x9D3F	# <CJK>
-0xC247	0x9E8B	# <CJK>
-0xC248	0x9ECF	# <CJK>
-0xC249	0x9EDE	# <CJK>
-0xC24A	0x9EDC	# <CJK>
-0xC24B	0x9EDD	# <CJK>
-0xC24C	0x9EDB	# <CJK>
-0xC24D	0x9F3E	# <CJK>
-0xC24E	0x9F4B	# <CJK>
-0xC24F	0x53E2	# <CJK>
-0xC250	0x5695	# <CJK>
-0xC251	0x56AE	# <CJK>
-0xC252	0x58D9	# <CJK>
-0xC253	0x58D8	# <CJK>
-0xC254	0x5B38	# <CJK>
-0xC255	0x5F5D	# <CJK>
-0xC256	0x61E3	# <CJK>
-0xC257	0x6233	# <CJK>
-0xC258	0x64F4	# <CJK>
-0xC259	0x64F2	# <CJK>
-0xC25A	0x64FE	# <CJK>
-0xC25B	0x6506	# <CJK>
-0xC25C	0x64FA	# <CJK>
-0xC25D	0x64FB	# <CJK>
-0xC25E	0x64F7	# <CJK>
-0xC25F	0x65B7	# <CJK>
-0xC260	0x66DC	# <CJK>
-0xC261	0x6726	# <CJK>
-0xC262	0x6AB3	# <CJK>
-0xC263	0x6AAC	# <CJK>
-0xC264	0x6AC3	# <CJK>
-0xC265	0x6ABB	# <CJK>
-0xC266	0x6AB8	# <CJK>
-0xC267	0x6AC2	# <CJK>
-0xC268	0x6AAE	# <CJK>
-0xC269	0x6AAF	# <CJK>
-0xC26A	0x6B5F	# <CJK>
-0xC26B	0x6B78	# <CJK>
-0xC26C	0x6BAF	# <CJK>
-0xC26D	0x7009	# <CJK>
-0xC26E	0x700B	# <CJK>
-0xC26F	0x6FFE	# <CJK>
-0xC270	0x7006	# <CJK>
-0xC271	0x6FFA	# <CJK>
-0xC272	0x7011	# <CJK>
-0xC273	0x700F	# <CJK>
-0xC274	0x71FB	# <CJK>
-0xC275	0x71FC	# <CJK>
-0xC276	0x71FE	# <CJK>
-0xC277	0x71F8	# <CJK>
-0xC278	0x7377	# <CJK>
-0xC279	0x7375	# <CJK>
-0xC27A	0x74A7	# <CJK>
-0xC27B	0x74BF	# <CJK>
-0xC27C	0x7515	# <CJK>
-0xC27D	0x7656	# <CJK>
-0xC27E	0x7658	# <CJK>
-0xC2A1	0x7652	# <CJK>
-0xC2A2	0x77BD	# <CJK>
-0xC2A3	0x77BF	# <CJK>
-0xC2A4	0x77BB	# <CJK>
-0xC2A5	0x77BC	# <CJK>
-0xC2A6	0x790E	# <CJK>
-0xC2A7	0x79AE	# <CJK>
-0xC2A8	0x7A61	# <CJK>
-0xC2A9	0x7A62	# <CJK>
-0xC2AA	0x7A60	# <CJK>
-0xC2AB	0x7AC4	# <CJK>
-0xC2AC	0x7AC5	# <CJK>
-0xC2AD	0x7C2B	# <CJK>
-0xC2AE	0x7C27	# <CJK>
-0xC2AF	0x7C2A	# <CJK>
-0xC2B0	0x7C1E	# <CJK>
-0xC2B1	0x7C23	# <CJK>
-0xC2B2	0x7C21	# <CJK>
-0xC2B3	0x7CE7	# <CJK>
-0xC2B4	0x7E54	# <CJK>
-0xC2B5	0x7E55	# <CJK>
-0xC2B6	0x7E5E	# <CJK>
-0xC2B7	0x7E5A	# <CJK>
-0xC2B8	0x7E61	# <CJK>
-0xC2B9	0x7E52	# <CJK>
-0xC2BA	0x7E59	# <CJK>
-0xC2BB	0x7F48	# <CJK>
-0xC2BC	0x7FF9	# <CJK>
-0xC2BD	0x7FFB	# <CJK>
-0xC2BE	0x8077	# <CJK>
-0xC2BF	0x8076	# <CJK>
-0xC2C0	0x81CD	# <CJK>
-0xC2C1	0x81CF	# <CJK>
-0xC2C2	0x820A	# <CJK>
-0xC2C3	0x85CF	# <CJK>
-0xC2C4	0x85A9	# <CJK>
-0xC2C5	0x85CD	# <CJK>
-0xC2C6	0x85D0	# <CJK>
-0xC2C7	0x85C9	# <CJK>
-0xC2C8	0x85B0	# <CJK>
-0xC2C9	0x85BA	# <CJK>
-0xC2CA	0x85B9	# <CJK>
-0xC2CB	0x85A6	# <CJK>
-0xC2CC	0x87EF	# <CJK>
-0xC2CD	0x87EC	# <CJK>
-0xC2CE	0x87F2	# <CJK>
-0xC2CF	0x87E0	# <CJK>
-0xC2D0	0x8986	# <CJK>
-0xC2D1	0x89B2	# <CJK>
-0xC2D2	0x89F4	# <CJK>
-0xC2D3	0x8B28	# <CJK>
-0xC2D4	0x8B39	# <CJK>
-0xC2D5	0x8B2C	# <CJK>
-0xC2D6	0x8B2B	# <CJK>
-0xC2D7	0x8C50	# <CJK>
-0xC2D8	0x8D05	# <CJK>
-0xC2D9	0x8E59	# <CJK>
-0xC2DA	0x8E63	# <CJK>
-0xC2DB	0x8E66	# <CJK>
-0xC2DC	0x8E64	# <CJK>
-0xC2DD	0x8E5F	# <CJK>
-0xC2DE	0x8E55	# <CJK>
-0xC2DF	0x8EC0	# <CJK>
-0xC2E0	0x8F49	# <CJK>
-0xC2E1	0x8F4D	# <CJK>
-0xC2E2	0x9087	# <CJK>
-0xC2E3	0x9083	# <CJK>
-0xC2E4	0x9088	# <CJK>
-0xC2E5	0x91AB	# <CJK>
-0xC2E6	0x91AC	# <CJK>
-0xC2E7	0x91D0	# <CJK>
-0xC2E8	0x9394	# <CJK>
-0xC2E9	0x938A	# <CJK>
-0xC2EA	0x9396	# <CJK>
-0xC2EB	0x93A2	# <CJK>
-0xC2EC	0x93B3	# <CJK>
-0xC2ED	0x93AE	# <CJK>
-0xC2EE	0x93AC	# <CJK>
-0xC2EF	0x93B0	# <CJK>
-0xC2F0	0x9398	# <CJK>
-0xC2F1	0x939A	# <CJK>
-0xC2F2	0x9397	# <CJK>
-0xC2F3	0x95D4	# <CJK>
-0xC2F4	0x95D6	# <CJK>
-0xC2F5	0x95D0	# <CJK>
-0xC2F6	0x95D5	# <CJK>
-0xC2F7	0x96E2	# <CJK>
-0xC2F8	0x96DC	# <CJK>
-0xC2F9	0x96D9	# <CJK>
-0xC2FA	0x96DB	# <CJK>
-0xC2FB	0x96DE	# <CJK>
-0xC2FC	0x9724	# <CJK>
-0xC2FD	0x97A3	# <CJK>
-0xC2FE	0x97A6	# <CJK>
-0xC340	0x97AD	# <CJK>
-0xC341	0x97F9	# <CJK>
-0xC342	0x984D	# <CJK>
-0xC343	0x984F	# <CJK>
-0xC344	0x984C	# <CJK>
-0xC345	0x984E	# <CJK>
-0xC346	0x9853	# <CJK>
-0xC347	0x98BA	# <CJK>
-0xC348	0x993E	# <CJK>
-0xC349	0x993F	# <CJK>
-0xC34A	0x993D	# <CJK>
-0xC34B	0x992E	# <CJK>
-0xC34C	0x99A5	# <CJK>
-0xC34D	0x9A0E	# <CJK>
-0xC34E	0x9AC1	# <CJK>
-0xC34F	0x9B03	# <CJK>
-0xC350	0x9B06	# <CJK>
-0xC351	0x9B4F	# <CJK>
-0xC352	0x9B4E	# <CJK>
-0xC353	0x9B4D	# <CJK>
-0xC354	0x9BCA	# <CJK>
-0xC355	0x9BC9	# <CJK>
-0xC356	0x9BFD	# <CJK>
-0xC357	0x9BC8	# <CJK>
-0xC358	0x9BC0	# <CJK>
-0xC359	0x9D51	# <CJK>
-0xC35A	0x9D5D	# <CJK>
-0xC35B	0x9D60	# <CJK>
-0xC35C	0x9EE0	# <CJK>
-0xC35D	0x9F15	# <CJK>
-0xC35E	0x9F2C	# <CJK>
-0xC35F	0x5133	# <CJK>
-0xC360	0x56A5	# <CJK>
-0xC361	0x58DE	# <CJK>
-0xC362	0x58DF	# <CJK>
-0xC363	0x58E2	# <CJK>
-0xC364	0x5BF5	# <CJK>
-0xC365	0x9F90	# <CJK>
-0xC366	0x5EEC	# <CJK>
-0xC367	0x61F2	# <CJK>
-0xC368	0x61F7	# <CJK>
-0xC369	0x61F6	# <CJK>
-0xC36A	0x61F5	# <CJK>
-0xC36B	0x6500	# <CJK>
-0xC36C	0x650F	# <CJK>
-0xC36D	0x66E0	# <CJK>
-0xC36E	0x66DD	# <CJK>
-0xC36F	0x6AE5	# <CJK>
-0xC370	0x6ADD	# <CJK>
-0xC371	0x6ADA	# <CJK>
-0xC372	0x6AD3	# <CJK>
-0xC373	0x701B	# <CJK>
-0xC374	0x701F	# <CJK>
-0xC375	0x7028	# <CJK>
-0xC376	0x701A	# <CJK>
-0xC377	0x701D	# <CJK>
-0xC378	0x7015	# <CJK>
-0xC379	0x7018	# <CJK>
-0xC37A	0x7206	# <CJK>
-0xC37B	0x720D	# <CJK>
-0xC37C	0x7258	# <CJK>
-0xC37D	0x72A2	# <CJK>
-0xC37E	0x7378	# <CJK>
-0xC3A1	0x737A	# <CJK>
-0xC3A2	0x74BD	# <CJK>
-0xC3A3	0x74CA	# <CJK>
-0xC3A4	0x74E3	# <CJK>
-0xC3A5	0x7587	# <CJK>
-0xC3A6	0x7586	# <CJK>
-0xC3A7	0x765F	# <CJK>
-0xC3A8	0x7661	# <CJK>
-0xC3A9	0x77C7	# <CJK>
-0xC3AA	0x7919	# <CJK>
-0xC3AB	0x79B1	# <CJK>
-0xC3AC	0x7A6B	# <CJK>
-0xC3AD	0x7A69	# <CJK>
-0xC3AE	0x7C3E	# <CJK>
-0xC3AF	0x7C3F	# <CJK>
-0xC3B0	0x7C38	# <CJK>
-0xC3B1	0x7C3D	# <CJK>
-0xC3B2	0x7C37	# <CJK>
-0xC3B3	0x7C40	# <CJK>
-0xC3B4	0x7E6B	# <CJK>
-0xC3B5	0x7E6D	# <CJK>
-0xC3B6	0x7E79	# <CJK>
-0xC3B7	0x7E69	# <CJK>
-0xC3B8	0x7E6A	# <CJK>
-0xC3B9	0x7F85	# <CJK>
-0xC3BA	0x7E73	# <CJK>
-0xC3BB	0x7FB6	# <CJK>
-0xC3BC	0x7FB9	# <CJK>
-0xC3BD	0x7FB8	# <CJK>
-0xC3BE	0x81D8	# <CJK>
-0xC3BF	0x85E9	# <CJK>
-0xC3C0	0x85DD	# <CJK>
-0xC3C1	0x85EA	# <CJK>
-0xC3C2	0x85D5	# <CJK>
-0xC3C3	0x85E4	# <CJK>
-0xC3C4	0x85E5	# <CJK>
-0xC3C5	0x85F7	# <CJK>
-0xC3C6	0x87FB	# <CJK>
-0xC3C7	0x8805	# <CJK>
-0xC3C8	0x880D	# <CJK>
-0xC3C9	0x87F9	# <CJK>
-0xC3CA	0x87FE	# <CJK>
-0xC3CB	0x8960	# <CJK>
-0xC3CC	0x895F	# <CJK>
-0xC3CD	0x8956	# <CJK>
-0xC3CE	0x895E	# <CJK>
-0xC3CF	0x8B41	# <CJK>
-0xC3D0	0x8B5C	# <CJK>
-0xC3D1	0x8B58	# <CJK>
-0xC3D2	0x8B49	# <CJK>
-0xC3D3	0x8B5A	# <CJK>
-0xC3D4	0x8B4E	# <CJK>
-0xC3D5	0x8B4F	# <CJK>
-0xC3D6	0x8B46	# <CJK>
-0xC3D7	0x8B59	# <CJK>
-0xC3D8	0x8D08	# <CJK>
-0xC3D9	0x8D0A	# <CJK>
-0xC3DA	0x8E7C	# <CJK>
-0xC3DB	0x8E72	# <CJK>
-0xC3DC	0x8E87	# <CJK>
-0xC3DD	0x8E76	# <CJK>
-0xC3DE	0x8E6C	# <CJK>
-0xC3DF	0x8E7A	# <CJK>
-0xC3E0	0x8E74	# <CJK>
-0xC3E1	0x8F54	# <CJK>
-0xC3E2	0x8F4E	# <CJK>
-0xC3E3	0x8FAD	# <CJK>
-0xC3E4	0x908A	# <CJK>
-0xC3E5	0x908B	# <CJK>
-0xC3E6	0x91B1	# <CJK>
-0xC3E7	0x91AE	# <CJK>
-0xC3E8	0x93E1	# <CJK>
-0xC3E9	0x93D1	# <CJK>
-0xC3EA	0x93DF	# <CJK>
-0xC3EB	0x93C3	# <CJK>
-0xC3EC	0x93C8	# <CJK>
-0xC3ED	0x93DC	# <CJK>
-0xC3EE	0x93DD	# <CJK>
-0xC3EF	0x93D6	# <CJK>
-0xC3F0	0x93E2	# <CJK>
-0xC3F1	0x93CD	# <CJK>
-0xC3F2	0x93D8	# <CJK>
-0xC3F3	0x93E4	# <CJK>
-0xC3F4	0x93D7	# <CJK>
-0xC3F5	0x93E8	# <CJK>
-0xC3F6	0x95DC	# <CJK>
-0xC3F7	0x96B4	# <CJK>
-0xC3F8	0x96E3	# <CJK>
-0xC3F9	0x972A	# <CJK>
-0xC3FA	0x9727	# <CJK>
-0xC3FB	0x9761	# <CJK>
-0xC3FC	0x97DC	# <CJK>
-0xC3FD	0x97FB	# <CJK>
-0xC3FE	0x985E	# <CJK>
-0xC440	0x9858	# <CJK>
-0xC441	0x985B	# <CJK>
-0xC442	0x98BC	# <CJK>
-0xC443	0x9945	# <CJK>
-0xC444	0x9949	# <CJK>
-0xC445	0x9A16	# <CJK>
-0xC446	0x9A19	# <CJK>
-0xC447	0x9B0D	# <CJK>
-0xC448	0x9BE8	# <CJK>
-0xC449	0x9BE7	# <CJK>
-0xC44A	0x9BD6	# <CJK>
-0xC44B	0x9BDB	# <CJK>
-0xC44C	0x9D89	# <CJK>
-0xC44D	0x9D61	# <CJK>
-0xC44E	0x9D72	# <CJK>
-0xC44F	0x9D6A	# <CJK>
-0xC450	0x9D6C	# <CJK>
-0xC451	0x9E92	# <CJK>
-0xC452	0x9E97	# <CJK>
-0xC453	0x9E93	# <CJK>
-0xC454	0x9EB4	# <CJK>
-0xC455	0x52F8	# <CJK>
-0xC456	0x56A8	# <CJK>
-0xC457	0x56B7	# <CJK>
-0xC458	0x56B6	# <CJK>
-0xC459	0x56B4	# <CJK>
-0xC45A	0x56BC	# <CJK>
-0xC45B	0x58E4	# <CJK>
-0xC45C	0x5B40	# <CJK>
-0xC45D	0x5B43	# <CJK>
-0xC45E	0x5B7D	# <CJK>
-0xC45F	0x5BF6	# <CJK>
-0xC460	0x5DC9	# <CJK>
-0xC461	0x61F8	# <CJK>
-0xC462	0x61FA	# <CJK>
-0xC463	0x6518	# <CJK>
-0xC464	0x6514	# <CJK>
-0xC465	0x6519	# <CJK>
-0xC466	0x66E6	# <CJK>
-0xC467	0x6727	# <CJK>
-0xC468	0x6AEC	# <CJK>
-0xC469	0x703E	# <CJK>
-0xC46A	0x7030	# <CJK>
-0xC46B	0x7032	# <CJK>
-0xC46C	0x7210	# <CJK>
-0xC46D	0x737B	# <CJK>
-0xC46E	0x74CF	# <CJK>
-0xC46F	0x7662	# <CJK>
-0xC470	0x7665	# <CJK>
-0xC471	0x7926	# <CJK>
-0xC472	0x792A	# <CJK>
-0xC473	0x792C	# <CJK>
-0xC474	0x792B	# <CJK>
-0xC475	0x7AC7	# <CJK>
-0xC476	0x7AF6	# <CJK>
-0xC477	0x7C4C	# <CJK>
-0xC478	0x7C43	# <CJK>
-0xC479	0x7C4D	# <CJK>
-0xC47A	0x7CEF	# <CJK>
-0xC47B	0x7CF0	# <CJK>
-0xC47C	0x8FAE	# <CJK>
-0xC47D	0x7E7D	# <CJK>
-0xC47E	0x7E7C	# <CJK>
-0xC4A1	0x7E82	# <CJK>
-0xC4A2	0x7F4C	# <CJK>
-0xC4A3	0x8000	# <CJK>
-0xC4A4	0x81DA	# <CJK>
-0xC4A5	0x8266	# <CJK>
-0xC4A6	0x85FB	# <CJK>
-0xC4A7	0x85F9	# <CJK>
-0xC4A8	0x8611	# <CJK>
-0xC4A9	0x85FA	# <CJK>
-0xC4AA	0x8606	# <CJK>
-0xC4AB	0x860B	# <CJK>
-0xC4AC	0x8607	# <CJK>
-0xC4AD	0x860A	# <CJK>
-0xC4AE	0x8814	# <CJK>
-0xC4AF	0x8815	# <CJK>
-0xC4B0	0x8964	# <CJK>
-0xC4B1	0x89BA	# <CJK>
-0xC4B2	0x89F8	# <CJK>
-0xC4B3	0x8B70	# <CJK>
-0xC4B4	0x8B6C	# <CJK>
-0xC4B5	0x8B66	# <CJK>
-0xC4B6	0x8B6F	# <CJK>
-0xC4B7	0x8B5F	# <CJK>
-0xC4B8	0x8B6B	# <CJK>
-0xC4B9	0x8D0F	# <CJK>
-0xC4BA	0x8D0D	# <CJK>
-0xC4BB	0x8E89	# <CJK>
-0xC4BC	0x8E81	# <CJK>
-0xC4BD	0x8E85	# <CJK>
-0xC4BE	0x8E82	# <CJK>
-0xC4BF	0x91B4	# <CJK>
-0xC4C0	0x91CB	# <CJK>
-0xC4C1	0x9418	# <CJK>
-0xC4C2	0x9403	# <CJK>
-0xC4C3	0x93FD	# <CJK>
-0xC4C4	0x95E1	# <CJK>
-0xC4C5	0x9730	# <CJK>
-0xC4C6	0x98C4	# <CJK>
-0xC4C7	0x9952	# <CJK>
-0xC4C8	0x9951	# <CJK>
-0xC4C9	0x99A8	# <CJK>
-0xC4CA	0x9A2B	# <CJK>
-0xC4CB	0x9A30	# <CJK>
-0xC4CC	0x9A37	# <CJK>
-0xC4CD	0x9A35	# <CJK>
-0xC4CE	0x9C13	# <CJK>
-0xC4CF	0x9C0D	# <CJK>
-0xC4D0	0x9E79	# <CJK>
-0xC4D1	0x9EB5	# <CJK>
-0xC4D2	0x9EE8	# <CJK>
-0xC4D3	0x9F2F	# <CJK>
-0xC4D4	0x9F5F	# <CJK>
-0xC4D5	0x9F63	# <CJK>
-0xC4D6	0x9F61	# <CJK>
-0xC4D7	0x5137	# <CJK>
-0xC4D8	0x5138	# <CJK>
-0xC4D9	0x56C1	# <CJK>
-0xC4DA	0x56C0	# <CJK>
-0xC4DB	0x56C2	# <CJK>
-0xC4DC	0x5914	# <CJK>
-0xC4DD	0x5C6C	# <CJK>
-0xC4DE	0x5DCD	# <CJK>
-0xC4DF	0x61FC	# <CJK>
-0xC4E0	0x61FE	# <CJK>
-0xC4E1	0x651D	# <CJK>
-0xC4E2	0x651C	# <CJK>
-0xC4E3	0x6595	# <CJK>
-0xC4E4	0x66E9	# <CJK>
-0xC4E5	0x6AFB	# <CJK>
-0xC4E6	0x6B04	# <CJK>
-0xC4E7	0x6AFA	# <CJK>
-0xC4E8	0x6BB2	# <CJK>
-0xC4E9	0x704C	# <CJK>
-0xC4EA	0x721B	# <CJK>
-0xC4EB	0x72A7	# <CJK>
-0xC4EC	0x74D6	# <CJK>
-0xC4ED	0x74D4	# <CJK>
-0xC4EE	0x7669	# <CJK>
-0xC4EF	0x77D3	# <CJK>
-0xC4F0	0x7C50	# <CJK>
-0xC4F1	0x7E8F	# <CJK>
-0xC4F2	0x7E8C	# <CJK>
-0xC4F3	0x7FBC	# <CJK>
-0xC4F4	0x8617	# <CJK>
-0xC4F5	0x862D	# <CJK>
-0xC4F6	0x861A	# <CJK>
-0xC4F7	0x8823	# <CJK>
-0xC4F8	0x8822	# <CJK>
-0xC4F9	0x8821	# <CJK>
-0xC4FA	0x881F	# <CJK>
-0xC4FB	0x896A	# <CJK>
-0xC4FC	0x896C	# <CJK>
-0xC4FD	0x89BD	# <CJK>
-0xC4FE	0x8B74	# <CJK>
-0xC540	0x8B77	# <CJK>
-0xC541	0x8B7D	# <CJK>
-0xC542	0x8D13	# <CJK>
-0xC543	0x8E8A	# <CJK>
-0xC544	0x8E8D	# <CJK>
-0xC545	0x8E8B	# <CJK>
-0xC546	0x8F5F	# <CJK>
-0xC547	0x8FAF	# <CJK>
-0xC548	0x91BA	# <CJK>
-0xC549	0x942E	# <CJK>
-0xC54A	0x9433	# <CJK>
-0xC54B	0x9435	# <CJK>
-0xC54C	0x943A	# <CJK>
-0xC54D	0x9438	# <CJK>
-0xC54E	0x9432	# <CJK>
-0xC54F	0x942B	# <CJK>
-0xC550	0x95E2	# <CJK>
-0xC551	0x9738	# <CJK>
-0xC552	0x9739	# <CJK>
-0xC553	0x9732	# <CJK>
-0xC554	0x97FF	# <CJK>
-0xC555	0x9867	# <CJK>
-0xC556	0x9865	# <CJK>
-0xC557	0x9957	# <CJK>
-0xC558	0x9A45	# <CJK>
-0xC559	0x9A43	# <CJK>
-0xC55A	0x9A40	# <CJK>
-0xC55B	0x9A3E	# <CJK>
-0xC55C	0x9ACF	# <CJK>
-0xC55D	0x9B54	# <CJK>
-0xC55E	0x9B51	# <CJK>
-0xC55F	0x9C2D	# <CJK>
-0xC560	0x9C25	# <CJK>
-0xC561	0x9DAF	# <CJK>
-0xC562	0x9DB4	# <CJK>
-0xC563	0x9DC2	# <CJK>
-0xC564	0x9DB8	# <CJK>
-0xC565	0x9E9D	# <CJK>
-0xC566	0x9EEF	# <CJK>
-0xC567	0x9F19	# <CJK>
-0xC568	0x9F5C	# <CJK>
-0xC569	0x9F66	# <CJK>
-0xC56A	0x9F67	# <CJK>
-0xC56B	0x513C	# <CJK>
-0xC56C	0x513B	# <CJK>
-0xC56D	0x56C8	# <CJK>
-0xC56E	0x56CA	# <CJK>
-0xC56F	0x56C9	# <CJK>
-0xC570	0x5B7F	# <CJK>
-0xC571	0x5DD4	# <CJK>
-0xC572	0x5DD2	# <CJK>
-0xC573	0x5F4E	# <CJK>
-0xC574	0x61FF	# <CJK>
-0xC575	0x6524	# <CJK>
-0xC576	0x6B0A	# <CJK>
-0xC577	0x6B61	# <CJK>
-0xC578	0x7051	# <CJK>
-0xC579	0x7058	# <CJK>
-0xC57A	0x7380	# <CJK>
-0xC57B	0x74E4	# <CJK>
-0xC57C	0x758A	# <CJK>
-0xC57D	0x766E	# <CJK>
-0xC57E	0x766C	# <CJK>
-0xC5A1	0x79B3	# <CJK>
-0xC5A2	0x7C60	# <CJK>
-0xC5A3	0x7C5F	# <CJK>
-0xC5A4	0x807E	# <CJK>
-0xC5A5	0x807D	# <CJK>
-0xC5A6	0x81DF	# <CJK>
-0xC5A7	0x8972	# <CJK>
-0xC5A8	0x896F	# <CJK>
-0xC5A9	0x89FC	# <CJK>
-0xC5AA	0x8B80	# <CJK>
-0xC5AB	0x8D16	# <CJK>
-0xC5AC	0x8D17	# <CJK>
-0xC5AD	0x8E91	# <CJK>
-0xC5AE	0x8E93	# <CJK>
-0xC5AF	0x8F61	# <CJK>
-0xC5B0	0x9148	# <CJK>
-0xC5B1	0x9444	# <CJK>
-0xC5B2	0x9451	# <CJK>
-0xC5B3	0x9452	# <CJK>
-0xC5B4	0x973D	# <CJK>
-0xC5B5	0x973E	# <CJK>
-0xC5B6	0x97C3	# <CJK>
-0xC5B7	0x97C1	# <CJK>
-0xC5B8	0x986B	# <CJK>
-0xC5B9	0x9955	# <CJK>
-0xC5BA	0x9A55	# <CJK>
-0xC5BB	0x9A4D	# <CJK>
-0xC5BC	0x9AD2	# <CJK>
-0xC5BD	0x9B1A	# <CJK>
-0xC5BE	0x9C49	# <CJK>
-0xC5BF	0x9C31	# <CJK>
-0xC5C0	0x9C3E	# <CJK>
-0xC5C1	0x9C3B	# <CJK>
-0xC5C2	0x9DD3	# <CJK>
-0xC5C3	0x9DD7	# <CJK>
-0xC5C4	0x9F34	# <CJK>
-0xC5C5	0x9F6C	# <CJK>
-0xC5C6	0x9F6A	# <CJK>
-0xC5C7	0x9F94	# <CJK>
-0xC5C8	0x56CC	# <CJK>
-0xC5C9	0x5DD6	# <CJK>
-0xC5CA	0x6200	# <CJK>
-0xC5CB	0x6523	# <CJK>
-0xC5CC	0x652B	# <CJK>
-0xC5CD	0x652A	# <CJK>
-0xC5CE	0x66EC	# <CJK>
-0xC5CF	0x6B10	# <CJK>
-0xC5D0	0x74DA	# <CJK>
-0xC5D1	0x7ACA	# <CJK>
-0xC5D2	0x7C64	# <CJK>
-0xC5D3	0x7C63	# <CJK>
-0xC5D4	0x7C65	# <CJK>
-0xC5D5	0x7E93	# <CJK>
-0xC5D6	0x7E96	# <CJK>
-0xC5D7	0x7E94	# <CJK>
-0xC5D8	0x81E2	# <CJK>
-0xC5D9	0x8638	# <CJK>
-0xC5DA	0x863F	# <CJK>
-0xC5DB	0x8831	# <CJK>
-0xC5DC	0x8B8A	# <CJK>
-0xC5DD	0x9090	# <CJK>
-0xC5DE	0x908F	# <CJK>
-0xC5DF	0x9463	# <CJK>
-0xC5E0	0x9460	# <CJK>
-0xC5E1	0x9464	# <CJK>
-0xC5E2	0x9768	# <CJK>
-0xC5E3	0x986F	# <CJK>
-0xC5E4	0x995C	# <CJK>
-0xC5E5	0x9A5A	# <CJK>
-0xC5E6	0x9A5B	# <CJK>
-0xC5E7	0x9A57	# <CJK>
-0xC5E8	0x9AD3	# <CJK>
-0xC5E9	0x9AD4	# <CJK>
-0xC5EA	0x9AD1	# <CJK>
-0xC5EB	0x9C54	# <CJK>
-0xC5EC	0x9C57	# <CJK>
-0xC5ED	0x9C56	# <CJK>
-0xC5EE	0x9DE5	# <CJK>
-0xC5EF	0x9E9F	# <CJK>
-0xC5F0	0x9EF4	# <CJK>
-0xC5F1	0x56D1	# <CJK>
-0xC5F2	0x58E9	# <CJK>
-0xC5F3	0x652C	# <CJK>
-0xC5F4	0x705E	# <CJK>
-0xC5F5	0x7671	# <CJK>
-0xC5F6	0x7672	# <CJK>
-0xC5F7	0x77D7	# <CJK>
-0xC5F8	0x7F50	# <CJK>
-0xC5F9	0x7F88	# <CJK>
-0xC5FA	0x8836	# <CJK>
-0xC5FB	0x8839	# <CJK>
-0xC5FC	0x8862	# <CJK>
-0xC5FD	0x8B93	# <CJK>
-0xC5FE	0x8B92	# <CJK>
-0xC640	0x8B96	# <CJK>
-0xC641	0x8277	# <CJK>
-0xC642	0x8D1B	# <CJK>
-0xC643	0x91C0	# <CJK>
-0xC644	0x946A	# <CJK>
-0xC645	0x9742	# <CJK>
-0xC646	0x9748	# <CJK>
-0xC647	0x9744	# <CJK>
-0xC648	0x97C6	# <CJK>
-0xC649	0x9870	# <CJK>
-0xC64A	0x9A5F	# <CJK>
-0xC64B	0x9B22	# <CJK>
-0xC64C	0x9B58	# <CJK>
-0xC64D	0x9C5F	# <CJK>
-0xC64E	0x9DF9	# <CJK>
-0xC64F	0x9DFA	# <CJK>
-0xC650	0x9E7C	# <CJK>
-0xC651	0x9E7D	# <CJK>
-0xC652	0x9F07	# <CJK>
-0xC653	0x9F77	# <CJK>
-0xC654	0x9F72	# <CJK>
-0xC655	0x5EF3	# <CJK>
-0xC656	0x6B16	# <CJK>
-0xC657	0x7063	# <CJK>
-0xC658	0x7C6C	# <CJK>
-0xC659	0x7C6E	# <CJK>
-0xC65A	0x883B	# <CJK>
-0xC65B	0x89C0	# <CJK>
-0xC65C	0x8EA1	# <CJK>
-0xC65D	0x91C1	# <CJK>
-0xC65E	0x9472	# <CJK>
-0xC65F	0x9470	# <CJK>
-0xC660	0x9871	# <CJK>
-0xC661	0x995E	# <CJK>
-0xC662	0x9AD6	# <CJK>
-0xC663	0x9B23	# <CJK>
-0xC664	0x9ECC	# <CJK>
-0xC665	0x7064	# <CJK>
-0xC666	0x77DA	# <CJK>
-0xC667	0x8B9A	# <CJK>
-0xC668	0x9477	# <CJK>
-0xC669	0x97C9	# <CJK>
-0xC66A	0x9A62	# <CJK>
-0xC66B	0x9A65	# <CJK>
-0xC66C	0x7E9C	# <CJK>
-0xC66D	0x8B9C	# <CJK>
-0xC66E	0x8EAA	# <CJK>
-0xC66F	0x91C5	# <CJK>
-0xC670	0x947D	# <CJK>
-0xC671	0x947E	# <CJK>
-0xC672	0x947C	# <CJK>
-0xC673	0x9C77	# <CJK>
-0xC674	0x9C78	# <CJK>
-0xC675	0x9EF7	# <CJK>
-0xC676	0x8C54	# <CJK>
-0xC677	0x947F	# <CJK>
-0xC678	0x9E1A	# <CJK>
-0xC679	0x7228	# <CJK>
-0xC67A	0x9A6A	# <CJK>
-0xC67B	0x9B31	# <CJK>
-0xC67C	0x9E1B	# <CJK>
-0xC67D	0x9E1E	# <CJK>
-0xC67E	0x7C72	# <CJK>
-0xC6A1	0x30FE	# KATAKANA VOICED ITERATION MARK
-0xC6A2	0x309D	# HIRAGANA ITERATION MARK
-0xC6A3	0x309E	# HIRAGANA VOICED ITERATION MARK
-0xC6A4	0x3005	# IDEOGRAPHIC ITERATION MARK
-0xC6A5	0x3041	# HIRAGANA LETTER SMALL A
-0xC6A6	0x3042	# HIRAGANA LETTER A
-0xC6A7	0x3043	# HIRAGANA LETTER SMALL I
-0xC6A8	0x3044	# HIRAGANA LETTER I
-0xC6A9	0x3045	# HIRAGANA LETTER SMALL U
-0xC6AA	0x3046	# HIRAGANA LETTER U
-0xC6AB	0x3047	# HIRAGANA LETTER SMALL E
-0xC6AC	0x3048	# HIRAGANA LETTER E
-0xC6AD	0x3049	# HIRAGANA LETTER SMALL O
-0xC6AE	0x304A	# HIRAGANA LETTER O
-0xC6AF	0x304B	# HIRAGANA LETTER KA
-0xC6B0	0x304C	# HIRAGANA LETTER GA
-0xC6B1	0x304D	# HIRAGANA LETTER KI
-0xC6B2	0x304E	# HIRAGANA LETTER GI
-0xC6B3	0x304F	# HIRAGANA LETTER KU
-0xC6B4	0x3050	# HIRAGANA LETTER GU
-0xC6B5	0x3051	# HIRAGANA LETTER KE
-0xC6B6	0x3052	# HIRAGANA LETTER GE
-0xC6B7	0x3053	# HIRAGANA LETTER KO
-0xC6B8	0x3054	# HIRAGANA LETTER GO
-0xC6B9	0x3055	# HIRAGANA LETTER SA
-0xC6BA	0x3056	# HIRAGANA LETTER ZA
-0xC6BB	0x3057	# HIRAGANA LETTER SI
-0xC6BC	0x3058	# HIRAGANA LETTER ZI
-0xC6BD	0x3059	# HIRAGANA LETTER SU
-0xC6BE	0x305A	# HIRAGANA LETTER ZU
-0xC6BF	0x305B	# HIRAGANA LETTER SE
-0xC6C0	0x305C	# HIRAGANA LETTER ZE
-0xC6C1	0x305D	# HIRAGANA LETTER SO
-0xC6C2	0x305E	# HIRAGANA LETTER ZO
-0xC6C3	0x305F	# HIRAGANA LETTER TA
-0xC6C4	0x3060	# HIRAGANA LETTER DA
-0xC6C5	0x3061	# HIRAGANA LETTER TI
-0xC6C6	0x3062	# HIRAGANA LETTER DI
-0xC6C7	0x3063	# HIRAGANA LETTER SMALL TU
-0xC6C8	0x3064	# HIRAGANA LETTER TU
-0xC6C9	0x3065	# HIRAGANA LETTER DU
-0xC6CA	0x3066	# HIRAGANA LETTER TE
-0xC6CB	0x3067	# HIRAGANA LETTER DE
-0xC6CC	0x3068	# HIRAGANA LETTER TO
-0xC6CD	0x3069	# HIRAGANA LETTER DO
-0xC6CE	0x306A	# HIRAGANA LETTER NA
-0xC6CF	0x306B	# HIRAGANA LETTER NI
-0xC6D0	0x306C	# HIRAGANA LETTER NU
-0xC6D1	0x306D	# HIRAGANA LETTER NE
-0xC6D2	0x306E	# HIRAGANA LETTER NO
-0xC6D3	0x306F	# HIRAGANA LETTER HA
-0xC6D4	0x3070	# HIRAGANA LETTER BA
-0xC6D5	0x3071	# HIRAGANA LETTER PA
-0xC6D6	0x3072	# HIRAGANA LETTER HI
-0xC6D7	0x3073	# HIRAGANA LETTER BI
-0xC6D8	0x3074	# HIRAGANA LETTER PI
-0xC6D9	0x3075	# HIRAGANA LETTER HU
-0xC6DA	0x3076	# HIRAGANA LETTER BU
-0xC6DB	0x3077	# HIRAGANA LETTER PU
-0xC6DC	0x3078	# HIRAGANA LETTER HE
-0xC6DD	0x3079	# HIRAGANA LETTER BE
-0xC6DE	0x307A	# HIRAGANA LETTER PE
-0xC6DF	0x307B	# HIRAGANA LETTER HO
-0xC6E0	0x307C	# HIRAGANA LETTER BO
-0xC6E1	0x307D	# HIRAGANA LETTER PO
-0xC6E2	0x307E	# HIRAGANA LETTER MA
-0xC6E3	0x307F	# HIRAGANA LETTER MI
-0xC6E4	0x3080	# HIRAGANA LETTER MU
-0xC6E5	0x3081	# HIRAGANA LETTER ME
-0xC6E6	0x3082	# HIRAGANA LETTER MO
-0xC6E7	0x3083	# HIRAGANA LETTER SMALL YA
-0xC6E8	0x3084	# HIRAGANA LETTER YA
-0xC6E9	0x3085	# HIRAGANA LETTER SMALL YU
-0xC6EA	0x3086	# HIRAGANA LETTER YU
-0xC6EB	0x3087	# HIRAGANA LETTER SMALL YO
-0xC6EC	0x3088	# HIRAGANA LETTER YO
-0xC6ED	0x3089	# HIRAGANA LETTER RA
-0xC6EE	0x308A	# HIRAGANA LETTER RI
-0xC6EF	0x308B	# HIRAGANA LETTER RU
-0xC6F0	0x308C	# HIRAGANA LETTER RE
-0xC6F1	0x308D	# HIRAGANA LETTER RO
-0xC6F2	0x308E	# HIRAGANA LETTER SMALL WA
-0xC6F3	0x308F	# HIRAGANA LETTER WA
-0xC6F4	0x3090	# HIRAGANA LETTER WI
-0xC6F5	0x3091	# HIRAGANA LETTER WE
-0xC6F6	0x3092	# HIRAGANA LETTER WO
-0xC6F7	0x3093	# HIRAGANA LETTER N
-0xC6F8	0x30A1	# KATAKANA LETTER SMALL A
-0xC6F9	0x30A2	# KATAKANA LETTER A
-0xC6FA	0x30A3	# KATAKANA LETTER SMALL I
-0xC6FB	0x30A4	# KATAKANA LETTER I
-0xC6FC	0x30A5	# KATAKANA LETTER SMALL U
-0xC6FD	0x30A6	# KATAKANA LETTER U
-0xC6FE	0x30A7	# KATAKANA LETTER SMALL E
-0xC740	0x30A8	# KATAKANA LETTER E
-0xC741	0x30A9	# KATAKANA LETTER SMALL O
-0xC742	0x30AA	# KATAKANA LETTER O
-0xC743	0x30AB	# KATAKANA LETTER KA
-0xC744	0x30AC	# KATAKANA LETTER GA
-0xC745	0x30AD	# KATAKANA LETTER KI
-0xC746	0x30AE	# KATAKANA LETTER GI
-0xC747	0x30AF	# KATAKANA LETTER KU
-0xC748	0x30B0	# KATAKANA LETTER GU
-0xC749	0x30B1	# KATAKANA LETTER KE
-0xC74A	0x30B2	# KATAKANA LETTER GE
-0xC74B	0x30B3	# KATAKANA LETTER KO
-0xC74C	0x30B4	# KATAKANA LETTER GO
-0xC74D	0x30B5	# KATAKANA LETTER SA
-0xC74E	0x30B6	# KATAKANA LETTER ZA
-0xC74F	0x30B7	# KATAKANA LETTER SI
-0xC750	0x30B8	# KATAKANA LETTER ZI
-0xC751	0x30B9	# KATAKANA LETTER SU
-0xC752	0x30BA	# KATAKANA LETTER ZU
-0xC753	0x30BB	# KATAKANA LETTER SE
-0xC754	0x30BC	# KATAKANA LETTER ZE
-0xC755	0x30BD	# KATAKANA LETTER SO
-0xC756	0x30BE	# KATAKANA LETTER ZO
-0xC757	0x30BF	# KATAKANA LETTER TA
-0xC758	0x30C0	# KATAKANA LETTER DA
-0xC759	0x30C1	# KATAKANA LETTER TI
-0xC75A	0x30C2	# KATAKANA LETTER DI
-0xC75B	0x30C3	# KATAKANA LETTER SMALL TU
-0xC75C	0x30C4	# KATAKANA LETTER TU
-0xC75D	0x30C5	# KATAKANA LETTER DU
-0xC75E	0x30C6	# KATAKANA LETTER TE
-0xC75F	0x30C7	# KATAKANA LETTER DE
-0xC760	0x30C8	# KATAKANA LETTER TO
-0xC761	0x30C9	# KATAKANA LETTER DO
-0xC762	0x30CA	# KATAKANA LETTER NA
-0xC763	0x30CB	# KATAKANA LETTER NI
-0xC764	0x30CC	# KATAKANA LETTER NU
-0xC765	0x30CD	# KATAKANA LETTER NE
-0xC766	0x30CE	# KATAKANA LETTER NO
-0xC767	0x30CF	# KATAKANA LETTER HA
-0xC768	0x30D0	# KATAKANA LETTER BA
-0xC769	0x30D1	# KATAKANA LETTER PA
-0xC76A	0x30D2	# KATAKANA LETTER HI
-0xC76B	0x30D3	# KATAKANA LETTER BI
-0xC76C	0x30D4	# KATAKANA LETTER PI
-0xC76D	0x30D5	# KATAKANA LETTER HU
-0xC76E	0x30D6	# KATAKANA LETTER BU
-0xC76F	0x30D7	# KATAKANA LETTER PU
-0xC770	0x30D8	# KATAKANA LETTER HE
-0xC771	0x30D9	# KATAKANA LETTER BE
-0xC772	0x30DA	# KATAKANA LETTER PE
-0xC773	0x30DB	# KATAKANA LETTER HO
-0xC774	0x30DC	# KATAKANA LETTER BO
-0xC775	0x30DD	# KATAKANA LETTER PO
-0xC776	0x30DE	# KATAKANA LETTER MA
-0xC777	0x30DF	# KATAKANA LETTER MI
-0xC778	0x30E0	# KATAKANA LETTER MU
-0xC779	0x30E1	# KATAKANA LETTER ME
-0xC77A	0x30E2	# KATAKANA LETTER MO
-0xC77B	0x30E3	# KATAKANA LETTER SMALL YA
-0xC77C	0x30E4	# KATAKANA LETTER YA
-0xC77D	0x30E5	# KATAKANA LETTER SMALL YU
-0xC77E	0x30E6	# KATAKANA LETTER YU
-0xC7A1	0x30E7	# KATAKANA LETTER SMALL YO
-0xC7A2	0x30E8	# KATAKANA LETTER YO
-0xC7A3	0x30E9	# KATAKANA LETTER RA
-0xC7A4	0x30EA	# KATAKANA LETTER RI
-0xC7A5	0x30EB	# KATAKANA LETTER RU
-0xC7A6	0x30EC	# KATAKANA LETTER RE
-0xC7A7	0x30ED	# KATAKANA LETTER RO
-0xC7A8	0x30EE	# KATAKANA LETTER SMALL WA
-0xC7A9	0x30EF	# KATAKANA LETTER WA
-0xC7AA	0x30F0	# KATAKANA LETTER WI
-0xC7AB	0x30F1	# KATAKANA LETTER WE
-0xC7AC	0x30F2	# KATAKANA LETTER WO
-0xC7AD	0x30F3	# KATAKANA LETTER N
-0xC7AE	0x30F4	# KATAKANA LETTER VU
-0xC7AF	0x30F5	# KATAKANA LETTER SMALL KA
-0xC7B0	0x30F6	# KATAKANA LETTER SMALL KE
-0xC7B1	0x0414	# CYRILLIC CAPITAL LETTER DE
-0xC7B2	0x0415	# CYRILLIC CAPITAL LETTER IE
-0xC7B3	0x0401	# CYRILLIC CAPITAL LETTER IO
-0xC7B4	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0xC7B5	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0xC7B6	0x0418	# CYRILLIC CAPITAL LETTER I
-0xC7B7	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0xC7B8	0x041A	# CYRILLIC CAPITAL LETTER KA
-0xC7B9	0x041B	# CYRILLIC CAPITAL LETTER EL
-0xC7BA	0x041C	# CYRILLIC CAPITAL LETTER EM
-0xC7BB	0x0423	# CYRILLIC CAPITAL LETTER U
-0xC7BC	0x0424	# CYRILLIC CAPITAL LETTER EF
-0xC7BD	0x0425	# CYRILLIC CAPITAL LETTER HA
-0xC7BE	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0xC7BF	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0xC7C0	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0xC7C1	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0xC7C2	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0xC7C3	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0xC7C4	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0xC7C5	0x042D	# CYRILLIC CAPITAL LETTER E
-0xC7C6	0x042E	# CYRILLIC CAPITAL LETTER YU
-0xC7C7	0x042F	# CYRILLIC CAPITAL LETTER YA
-0xC7C8	0x0430	# CYRILLIC SMALL LETTER A
-0xC7C9	0x0431	# CYRILLIC SMALL LETTER BE
-0xC7CA	0x0432	# CYRILLIC SMALL LETTER VE
-0xC7CB	0x0433	# CYRILLIC SMALL LETTER GHE
-0xC7CC	0x0434	# CYRILLIC SMALL LETTER DE
-0xC7CD	0x0435	# CYRILLIC SMALL LETTER IE
-0xC7CE	0x0451	# CYRILLIC SMALL LETTER IO
-0xC7CF	0x0436	# CYRILLIC SMALL LETTER ZHE
-0xC7D0	0x0437	# CYRILLIC SMALL LETTER ZE
-0xC7D1	0x0438	# CYRILLIC SMALL LETTER I
-0xC7D2	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0xC7D3	0x043A	# CYRILLIC SMALL LETTER KA
-0xC7D4	0x043B	# CYRILLIC SMALL LETTER EL
-0xC7D5	0x043C	# CYRILLIC SMALL LETTER EM
-0xC7D6	0x043D	# CYRILLIC SMALL LETTER EN
-0xC7D7	0x043E	# CYRILLIC SMALL LETTER O
-0xC7D8	0x043F	# CYRILLIC SMALL LETTER PE
-0xC7D9	0x0440	# CYRILLIC SMALL LETTER ER
-0xC7DA	0x0441	# CYRILLIC SMALL LETTER ES
-0xC7DB	0x0442	# CYRILLIC SMALL LETTER TE
-0xC7DC	0x0443	# CYRILLIC SMALL LETTER U
-0xC7DD	0x0444	# CYRILLIC SMALL LETTER EF
-0xC7DE	0x0445	# CYRILLIC SMALL LETTER HA
-0xC7DF	0x0446	# CYRILLIC SMALL LETTER TSE
-0xC7E0	0x0447	# CYRILLIC SMALL LETTER CHE
-0xC7E1	0x0448	# CYRILLIC SMALL LETTER SHA
-0xC7E2	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0xC7E3	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0xC7E4	0x044B	# CYRILLIC SMALL LETTER YERU
-0xC7E5	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0xC7E6	0x044D	# CYRILLIC SMALL LETTER E
-0xC7E7	0x044E	# CYRILLIC SMALL LETTER YU
-0xC7E8	0x044F	# CYRILLIC SMALL LETTER YA
-0xC7E9	0x2460	# CIRCLED DIGIT ONE
-0xC7EA	0x2461	# CIRCLED DIGIT TWO
-0xC7EB	0x2462	# CIRCLED DIGIT THREE
-0xC7EC	0x2463	# CIRCLED DIGIT FOUR
-0xC7ED	0x2464	# CIRCLED DIGIT FIVE
-0xC7EE	0x2465	# CIRCLED DIGIT SIX
-0xC7EF	0x2466	# CIRCLED DIGIT SEVEN
-0xC7F0	0x2467	# CIRCLED DIGIT EIGHT
-0xC7F1	0x2468	# CIRCLED DIGIT NINE
-0xC7F2	0x2469	# CIRCLED NUMBER TEN
-0xC7F3	0x2474	# PARENTHESIZED DIGIT ONE
-0xC7F4	0x2475	# PARENTHESIZED DIGIT TWO
-0xC7F5	0x2476	# PARENTHESIZED DIGIT THREE
-0xC7F6	0x2477	# PARENTHESIZED DIGIT FOUR
-0xC7F7	0x2478	# PARENTHESIZED DIGIT FIVE
-0xC7F8	0x2479	# PARENTHESIZED DIGIT SIX
-0xC7F9	0x247A	# PARENTHESIZED DIGIT SEVEN
-0xC7FA	0x247B	# PARENTHESIZED DIGIT EIGHT
-0xC7FB	0x247C	# PARENTHESIZED DIGIT NINE
-0xC7FC	0x247D	# PARENTHESIZED NUMBER TEN
-0xC940	0x4E42	# <CJK>
-0xC941	0x4E5C	# <CJK>
-0xC942	0x51F5	# <CJK>
-0xC943	0x531A	# <CJK>
-0xC944	0x5382	# <CJK>
-0xC945	0x4E07	# <CJK>
-0xC946	0x4E0C	# <CJK>
-0xC947	0x4E47	# <CJK>
-0xC948	0x4E8D	# <CJK>
-0xC949	0x56D7	# <CJK>
-0xC94A	0xFA0C	# CJK COMPATIBILITY IDEOGRAPH-FA0C
-0xC94B	0x5C6E	# <CJK>
-0xC94C	0x5F73	# <CJK>
-0xC94D	0x4E0F	# <CJK>
-0xC94E	0x5187	# <CJK>
-0xC94F	0x4E0E	# <CJK>
-0xC950	0x4E2E	# <CJK>
-0xC951	0x4E93	# <CJK>
-0xC952	0x4EC2	# <CJK>
-0xC953	0x4EC9	# <CJK>
-0xC954	0x4EC8	# <CJK>
-0xC955	0x5198	# <CJK>
-0xC956	0x52FC	# <CJK>
-0xC957	0x536C	# <CJK>
-0xC958	0x53B9	# <CJK>
-0xC959	0x5720	# <CJK>
-0xC95A	0x5903	# <CJK>
-0xC95B	0x592C	# <CJK>
-0xC95C	0x5C10	# <CJK>
-0xC95D	0x5DFF	# <CJK>
-0xC95E	0x65E1	# <CJK>
-0xC95F	0x6BB3	# <CJK>
-0xC960	0x6BCC	# <CJK>
-0xC961	0x6C14	# <CJK>
-0xC962	0x723F	# <CJK>
-0xC963	0x4E31	# <CJK>
-0xC964	0x4E3C	# <CJK>
-0xC965	0x4EE8	# <CJK>
-0xC966	0x4EDC	# <CJK>
-0xC967	0x4EE9	# <CJK>
-0xC968	0x4EE1	# <CJK>
-0xC969	0x4EDD	# <CJK>
-0xC96A	0x4EDA	# <CJK>
-0xC96B	0x520C	# <CJK>
-0xC96C	0x531C	# <CJK>
-0xC96D	0x534C	# <CJK>
-0xC96E	0x5722	# <CJK>
-0xC96F	0x5723	# <CJK>
-0xC970	0x5917	# <CJK>
-0xC971	0x592F	# <CJK>
-0xC972	0x5B81	# <CJK>
-0xC973	0x5B84	# <CJK>
-0xC974	0x5C12	# <CJK>
-0xC975	0x5C3B	# <CJK>
-0xC976	0x5C74	# <CJK>
-0xC977	0x5C73	# <CJK>
-0xC978	0x5E04	# <CJK>
-0xC979	0x5E80	# <CJK>
-0xC97A	0x5E82	# <CJK>
-0xC97B	0x5FC9	# <CJK>
-0xC97C	0x6209	# <CJK>
-0xC97D	0x6250	# <CJK>
-0xC97E	0x6C15	# <CJK>
-0xC9A1	0x6C36	# <CJK>
-0xC9A2	0x6C43	# <CJK>
-0xC9A3	0x6C3F	# <CJK>
-0xC9A4	0x6C3B	# <CJK>
-0xC9A5	0x72AE	# <CJK>
-0xC9A6	0x72B0	# <CJK>
-0xC9A7	0x738A	# <CJK>
-0xC9A8	0x79B8	# <CJK>
-0xC9A9	0x808A	# <CJK>
-0xC9AA	0x961E	# <CJK>
-0xC9AB	0x4F0E	# <CJK>
-0xC9AC	0x4F18	# <CJK>
-0xC9AD	0x4F2C	# <CJK>
-0xC9AE	0x4EF5	# <CJK>
-0xC9AF	0x4F14	# <CJK>
-0xC9B0	0x4EF1	# <CJK>
-0xC9B1	0x4F00	# <CJK>
-0xC9B2	0x4EF7	# <CJK>
-0xC9B3	0x4F08	# <CJK>
-0xC9B4	0x4F1D	# <CJK>
-0xC9B5	0x4F02	# <CJK>
-0xC9B6	0x4F05	# <CJK>
-0xC9B7	0x4F22	# <CJK>
-0xC9B8	0x4F13	# <CJK>
-0xC9B9	0x4F04	# <CJK>
-0xC9BA	0x4EF4	# <CJK>
-0xC9BB	0x4F12	# <CJK>
-0xC9BC	0x51B1	# <CJK>
-0xC9BD	0x5213	# <CJK>
-0xC9BE	0x5209	# <CJK>
-0xC9BF	0x5210	# <CJK>
-0xC9C0	0x52A6	# <CJK>
-0xC9C1	0x5322	# <CJK>
-0xC9C2	0x531F	# <CJK>
-0xC9C3	0x534D	# <CJK>
-0xC9C4	0x538A	# <CJK>
-0xC9C5	0x5407	# <CJK>
-0xC9C6	0x56E1	# <CJK>
-0xC9C7	0x56DF	# <CJK>
-0xC9C8	0x572E	# <CJK>
-0xC9C9	0x572A	# <CJK>
-0xC9CA	0x5734	# <CJK>
-0xC9CB	0x593C	# <CJK>
-0xC9CC	0x5980	# <CJK>
-0xC9CD	0x597C	# <CJK>
-0xC9CE	0x5985	# <CJK>
-0xC9CF	0x597B	# <CJK>
-0xC9D0	0x597E	# <CJK>
-0xC9D1	0x5977	# <CJK>
-0xC9D2	0x597F	# <CJK>
-0xC9D3	0x5B56	# <CJK>
-0xC9D4	0x5C15	# <CJK>
-0xC9D5	0x5C25	# <CJK>
-0xC9D6	0x5C7C	# <CJK>
-0xC9D7	0x5C7A	# <CJK>
-0xC9D8	0x5C7B	# <CJK>
-0xC9D9	0x5C7E	# <CJK>
-0xC9DA	0x5DDF	# <CJK>
-0xC9DB	0x5E75	# <CJK>
-0xC9DC	0x5E84	# <CJK>
-0xC9DD	0x5F02	# <CJK>
-0xC9DE	0x5F1A	# <CJK>
-0xC9DF	0x5F74	# <CJK>
-0xC9E0	0x5FD5	# <CJK>
-0xC9E1	0x5FD4	# <CJK>
-0xC9E2	0x5FCF	# <CJK>
-0xC9E3	0x625C	# <CJK>
-0xC9E4	0x625E	# <CJK>
-0xC9E5	0x6264	# <CJK>
-0xC9E6	0x6261	# <CJK>
-0xC9E7	0x6266	# <CJK>
-0xC9E8	0x6262	# <CJK>
-0xC9E9	0x6259	# <CJK>
-0xC9EA	0x6260	# <CJK>
-0xC9EB	0x625A	# <CJK>
-0xC9EC	0x6265	# <CJK>
-0xC9ED	0x65EF	# <CJK>
-0xC9EE	0x65EE	# <CJK>
-0xC9EF	0x673E	# <CJK>
-0xC9F0	0x6739	# <CJK>
-0xC9F1	0x6738	# <CJK>
-0xC9F2	0x673B	# <CJK>
-0xC9F3	0x673A	# <CJK>
-0xC9F4	0x673F	# <CJK>
-0xC9F5	0x673C	# <CJK>
-0xC9F6	0x6733	# <CJK>
-0xC9F7	0x6C18	# <CJK>
-0xC9F8	0x6C46	# <CJK>
-0xC9F9	0x6C52	# <CJK>
-0xC9FA	0x6C5C	# <CJK>
-0xC9FB	0x6C4F	# <CJK>
-0xC9FC	0x6C4A	# <CJK>
-0xC9FD	0x6C54	# <CJK>
-0xC9FE	0x6C4B	# <CJK>
-0xCA40	0x6C4C	# <CJK>
-0xCA41	0x7071	# <CJK>
-0xCA42	0x725E	# <CJK>
-0xCA43	0x72B4	# <CJK>
-0xCA44	0x72B5	# <CJK>
-0xCA45	0x738E	# <CJK>
-0xCA46	0x752A	# <CJK>
-0xCA47	0x767F	# <CJK>
-0xCA48	0x7A75	# <CJK>
-0xCA49	0x7F51	# <CJK>
-0xCA4A	0x8278	# <CJK>
-0xCA4B	0x827C	# <CJK>
-0xCA4C	0x8280	# <CJK>
-0xCA4D	0x827D	# <CJK>
-0xCA4E	0x827F	# <CJK>
-0xCA4F	0x864D	# <CJK>
-0xCA50	0x897E	# <CJK>
-0xCA51	0x9099	# <CJK>
-0xCA52	0x9097	# <CJK>
-0xCA53	0x9098	# <CJK>
-0xCA54	0x909B	# <CJK>
-0xCA55	0x9094	# <CJK>
-0xCA56	0x9622	# <CJK>
-0xCA57	0x9624	# <CJK>
-0xCA58	0x9620	# <CJK>
-0xCA59	0x9623	# <CJK>
-0xCA5A	0x4F56	# <CJK>
-0xCA5B	0x4F3B	# <CJK>
-0xCA5C	0x4F62	# <CJK>
-0xCA5D	0x4F49	# <CJK>
-0xCA5E	0x4F53	# <CJK>
-0xCA5F	0x4F64	# <CJK>
-0xCA60	0x4F3E	# <CJK>
-0xCA61	0x4F67	# <CJK>
-0xCA62	0x4F52	# <CJK>
-0xCA63	0x4F5F	# <CJK>
-0xCA64	0x4F41	# <CJK>
-0xCA65	0x4F58	# <CJK>
-0xCA66	0x4F2D	# <CJK>
-0xCA67	0x4F33	# <CJK>
-0xCA68	0x4F3F	# <CJK>
-0xCA69	0x4F61	# <CJK>
-0xCA6A	0x518F	# <CJK>
-0xCA6B	0x51B9	# <CJK>
-0xCA6C	0x521C	# <CJK>
-0xCA6D	0x521E	# <CJK>
-0xCA6E	0x5221	# <CJK>
-0xCA6F	0x52AD	# <CJK>
-0xCA70	0x52AE	# <CJK>
-0xCA71	0x5309	# <CJK>
-0xCA72	0x5363	# <CJK>
-0xCA73	0x5372	# <CJK>
-0xCA74	0x538E	# <CJK>
-0xCA75	0x538F	# <CJK>
-0xCA76	0x5430	# <CJK>
-0xCA77	0x5437	# <CJK>
-0xCA78	0x542A	# <CJK>
-0xCA79	0x5454	# <CJK>
-0xCA7A	0x5445	# <CJK>
-0xCA7B	0x5419	# <CJK>
-0xCA7C	0x541C	# <CJK>
-0xCA7D	0x5425	# <CJK>
-0xCA7E	0x5418	# <CJK>
-0xCAA1	0x543D	# <CJK>
-0xCAA2	0x544F	# <CJK>
-0xCAA3	0x5441	# <CJK>
-0xCAA4	0x5428	# <CJK>
-0xCAA5	0x5424	# <CJK>
-0xCAA6	0x5447	# <CJK>
-0xCAA7	0x56EE	# <CJK>
-0xCAA8	0x56E7	# <CJK>
-0xCAA9	0x56E5	# <CJK>
-0xCAAA	0x5741	# <CJK>
-0xCAAB	0x5745	# <CJK>
-0xCAAC	0x574C	# <CJK>
-0xCAAD	0x5749	# <CJK>
-0xCAAE	0x574B	# <CJK>
-0xCAAF	0x5752	# <CJK>
-0xCAB0	0x5906	# <CJK>
-0xCAB1	0x5940	# <CJK>
-0xCAB2	0x59A6	# <CJK>
-0xCAB3	0x5998	# <CJK>
-0xCAB4	0x59A0	# <CJK>
-0xCAB5	0x5997	# <CJK>
-0xCAB6	0x598E	# <CJK>
-0xCAB7	0x59A2	# <CJK>
-0xCAB8	0x5990	# <CJK>
-0xCAB9	0x598F	# <CJK>
-0xCABA	0x59A7	# <CJK>
-0xCABB	0x59A1	# <CJK>
-0xCABC	0x5B8E	# <CJK>
-0xCABD	0x5B92	# <CJK>
-0xCABE	0x5C28	# <CJK>
-0xCABF	0x5C2A	# <CJK>
-0xCAC0	0x5C8D	# <CJK>
-0xCAC1	0x5C8F	# <CJK>
-0xCAC2	0x5C88	# <CJK>
-0xCAC3	0x5C8B	# <CJK>
-0xCAC4	0x5C89	# <CJK>
-0xCAC5	0x5C92	# <CJK>
-0xCAC6	0x5C8A	# <CJK>
-0xCAC7	0x5C86	# <CJK>
-0xCAC8	0x5C93	# <CJK>
-0xCAC9	0x5C95	# <CJK>
-0xCACA	0x5DE0	# <CJK>
-0xCACB	0x5E0A	# <CJK>
-0xCACC	0x5E0E	# <CJK>
-0xCACD	0x5E8B	# <CJK>
-0xCACE	0x5E89	# <CJK>
-0xCACF	0x5E8C	# <CJK>
-0xCAD0	0x5E88	# <CJK>
-0xCAD1	0x5E8D	# <CJK>
-0xCAD2	0x5F05	# <CJK>
-0xCAD3	0x5F1D	# <CJK>
-0xCAD4	0x5F78	# <CJK>
-0xCAD5	0x5F76	# <CJK>
-0xCAD6	0x5FD2	# <CJK>
-0xCAD7	0x5FD1	# <CJK>
-0xCAD8	0x5FD0	# <CJK>
-0xCAD9	0x5FED	# <CJK>
-0xCADA	0x5FE8	# <CJK>
-0xCADB	0x5FEE	# <CJK>
-0xCADC	0x5FF3	# <CJK>
-0xCADD	0x5FE1	# <CJK>
-0xCADE	0x5FE4	# <CJK>
-0xCADF	0x5FE3	# <CJK>
-0xCAE0	0x5FFA	# <CJK>
-0xCAE1	0x5FEF	# <CJK>
-0xCAE2	0x5FF7	# <CJK>
-0xCAE3	0x5FFB	# <CJK>
-0xCAE4	0x6000	# <CJK>
-0xCAE5	0x5FF4	# <CJK>
-0xCAE6	0x623A	# <CJK>
-0xCAE7	0x6283	# <CJK>
-0xCAE8	0x628C	# <CJK>
-0xCAE9	0x628E	# <CJK>
-0xCAEA	0x628F	# <CJK>
-0xCAEB	0x6294	# <CJK>
-0xCAEC	0x6287	# <CJK>
-0xCAED	0x6271	# <CJK>
-0xCAEE	0x627B	# <CJK>
-0xCAEF	0x627A	# <CJK>
-0xCAF0	0x6270	# <CJK>
-0xCAF1	0x6281	# <CJK>
-0xCAF2	0x6288	# <CJK>
-0xCAF3	0x6277	# <CJK>
-0xCAF4	0x627D	# <CJK>
-0xCAF5	0x6272	# <CJK>
-0xCAF6	0x6274	# <CJK>
-0xCAF7	0x6537	# <CJK>
-0xCAF8	0x65F0	# <CJK>
-0xCAF9	0x65F4	# <CJK>
-0xCAFA	0x65F3	# <CJK>
-0xCAFB	0x65F2	# <CJK>
-0xCAFC	0x65F5	# <CJK>
-0xCAFD	0x6745	# <CJK>
-0xCAFE	0x6747	# <CJK>
-0xCB40	0x6759	# <CJK>
-0xCB41	0x6755	# <CJK>
-0xCB42	0x674C	# <CJK>
-0xCB43	0x6748	# <CJK>
-0xCB44	0x675D	# <CJK>
-0xCB45	0x674D	# <CJK>
-0xCB46	0x675A	# <CJK>
-0xCB47	0x674B	# <CJK>
-0xCB48	0x6BD0	# <CJK>
-0xCB49	0x6C19	# <CJK>
-0xCB4A	0x6C1A	# <CJK>
-0xCB4B	0x6C78	# <CJK>
-0xCB4C	0x6C67	# <CJK>
-0xCB4D	0x6C6B	# <CJK>
-0xCB4E	0x6C84	# <CJK>
-0xCB4F	0x6C8B	# <CJK>
-0xCB50	0x6C8F	# <CJK>
-0xCB51	0x6C71	# <CJK>
-0xCB52	0x6C6F	# <CJK>
-0xCB53	0x6C69	# <CJK>
-0xCB54	0x6C9A	# <CJK>
-0xCB55	0x6C6D	# <CJK>
-0xCB56	0x6C87	# <CJK>
-0xCB57	0x6C95	# <CJK>
-0xCB58	0x6C9C	# <CJK>
-0xCB59	0x6C66	# <CJK>
-0xCB5A	0x6C73	# <CJK>
-0xCB5B	0x6C65	# <CJK>
-0xCB5C	0x6C7B	# <CJK>
-0xCB5D	0x6C8E	# <CJK>
-0xCB5E	0x7074	# <CJK>
-0xCB5F	0x707A	# <CJK>
-0xCB60	0x7263	# <CJK>
-0xCB61	0x72BF	# <CJK>
-0xCB62	0x72BD	# <CJK>
-0xCB63	0x72C3	# <CJK>
-0xCB64	0x72C6	# <CJK>
-0xCB65	0x72C1	# <CJK>
-0xCB66	0x72BA	# <CJK>
-0xCB67	0x72C5	# <CJK>
-0xCB68	0x7395	# <CJK>
-0xCB69	0x7397	# <CJK>
-0xCB6A	0x7393	# <CJK>
-0xCB6B	0x7394	# <CJK>
-0xCB6C	0x7392	# <CJK>
-0xCB6D	0x753A	# <CJK>
-0xCB6E	0x7539	# <CJK>
-0xCB6F	0x7594	# <CJK>
-0xCB70	0x7595	# <CJK>
-0xCB71	0x7681	# <CJK>
-0xCB72	0x793D	# <CJK>
-0xCB73	0x8034	# <CJK>
-0xCB74	0x8095	# <CJK>
-0xCB75	0x8099	# <CJK>
-0xCB76	0x8090	# <CJK>
-0xCB77	0x8092	# <CJK>
-0xCB78	0x809C	# <CJK>
-0xCB79	0x8290	# <CJK>
-0xCB7A	0x828F	# <CJK>
-0xCB7B	0x8285	# <CJK>
-0xCB7C	0x828E	# <CJK>
-0xCB7D	0x8291	# <CJK>
-0xCB7E	0x8293	# <CJK>
-0xCBA1	0x828A	# <CJK>
-0xCBA2	0x8283	# <CJK>
-0xCBA3	0x8284	# <CJK>
-0xCBA4	0x8C78	# <CJK>
-0xCBA5	0x8FC9	# <CJK>
-0xCBA6	0x8FBF	# <CJK>
-0xCBA7	0x909F	# <CJK>
-0xCBA8	0x90A1	# <CJK>
-0xCBA9	0x90A5	# <CJK>
-0xCBAA	0x909E	# <CJK>
-0xCBAB	0x90A7	# <CJK>
-0xCBAC	0x90A0	# <CJK>
-0xCBAD	0x9630	# <CJK>
-0xCBAE	0x9628	# <CJK>
-0xCBAF	0x962F	# <CJK>
-0xCBB0	0x962D	# <CJK>
-0xCBB1	0x4E33	# <CJK>
-0xCBB2	0x4F98	# <CJK>
-0xCBB3	0x4F7C	# <CJK>
-0xCBB4	0x4F85	# <CJK>
-0xCBB5	0x4F7D	# <CJK>
-0xCBB6	0x4F80	# <CJK>
-0xCBB7	0x4F87	# <CJK>
-0xCBB8	0x4F76	# <CJK>
-0xCBB9	0x4F74	# <CJK>
-0xCBBA	0x4F89	# <CJK>
-0xCBBB	0x4F84	# <CJK>
-0xCBBC	0x4F77	# <CJK>
-0xCBBD	0x4F4C	# <CJK>
-0xCBBE	0x4F97	# <CJK>
-0xCBBF	0x4F6A	# <CJK>
-0xCBC0	0x4F9A	# <CJK>
-0xCBC1	0x4F79	# <CJK>
-0xCBC2	0x4F81	# <CJK>
-0xCBC3	0x4F78	# <CJK>
-0xCBC4	0x4F90	# <CJK>
-0xCBC5	0x4F9C	# <CJK>
-0xCBC6	0x4F94	# <CJK>
-0xCBC7	0x4F9E	# <CJK>
-0xCBC8	0x4F92	# <CJK>
-0xCBC9	0x4F82	# <CJK>
-0xCBCA	0x4F95	# <CJK>
-0xCBCB	0x4F6B	# <CJK>
-0xCBCC	0x4F6E	# <CJK>
-0xCBCD	0x519E	# <CJK>
-0xCBCE	0x51BC	# <CJK>
-0xCBCF	0x51BE	# <CJK>
-0xCBD0	0x5235	# <CJK>
-0xCBD1	0x5232	# <CJK>
-0xCBD2	0x5233	# <CJK>
-0xCBD3	0x5246	# <CJK>
-0xCBD4	0x5231	# <CJK>
-0xCBD5	0x52BC	# <CJK>
-0xCBD6	0x530A	# <CJK>
-0xCBD7	0x530B	# <CJK>
-0xCBD8	0x533C	# <CJK>
-0xCBD9	0x5392	# <CJK>
-0xCBDA	0x5394	# <CJK>
-0xCBDB	0x5487	# <CJK>
-0xCBDC	0x547F	# <CJK>
-0xCBDD	0x5481	# <CJK>
-0xCBDE	0x5491	# <CJK>
-0xCBDF	0x5482	# <CJK>
-0xCBE0	0x5488	# <CJK>
-0xCBE1	0x546B	# <CJK>
-0xCBE2	0x547A	# <CJK>
-0xCBE3	0x547E	# <CJK>
-0xCBE4	0x5465	# <CJK>
-0xCBE5	0x546C	# <CJK>
-0xCBE6	0x5474	# <CJK>
-0xCBE7	0x5466	# <CJK>
-0xCBE8	0x548D	# <CJK>
-0xCBE9	0x546F	# <CJK>
-0xCBEA	0x5461	# <CJK>
-0xCBEB	0x5460	# <CJK>
-0xCBEC	0x5498	# <CJK>
-0xCBED	0x5463	# <CJK>
-0xCBEE	0x5467	# <CJK>
-0xCBEF	0x5464	# <CJK>
-0xCBF0	0x56F7	# <CJK>
-0xCBF1	0x56F9	# <CJK>
-0xCBF2	0x576F	# <CJK>
-0xCBF3	0x5772	# <CJK>
-0xCBF4	0x576D	# <CJK>
-0xCBF5	0x576B	# <CJK>
-0xCBF6	0x5771	# <CJK>
-0xCBF7	0x5770	# <CJK>
-0xCBF8	0x5776	# <CJK>
-0xCBF9	0x5780	# <CJK>
-0xCBFA	0x5775	# <CJK>
-0xCBFB	0x577B	# <CJK>
-0xCBFC	0x5773	# <CJK>
-0xCBFD	0x5774	# <CJK>
-0xCBFE	0x5762	# <CJK>
-0xCC40	0x5768	# <CJK>
-0xCC41	0x577D	# <CJK>
-0xCC42	0x590C	# <CJK>
-0xCC43	0x5945	# <CJK>
-0xCC44	0x59B5	# <CJK>
-0xCC45	0x59BA	# <CJK>
-0xCC46	0x59CF	# <CJK>
-0xCC47	0x59CE	# <CJK>
-0xCC48	0x59B2	# <CJK>
-0xCC49	0x59CC	# <CJK>
-0xCC4A	0x59C1	# <CJK>
-0xCC4B	0x59B6	# <CJK>
-0xCC4C	0x59BC	# <CJK>
-0xCC4D	0x59C3	# <CJK>
-0xCC4E	0x59D6	# <CJK>
-0xCC4F	0x59B1	# <CJK>
-0xCC50	0x59BD	# <CJK>
-0xCC51	0x59C0	# <CJK>
-0xCC52	0x59C8	# <CJK>
-0xCC53	0x59B4	# <CJK>
-0xCC54	0x59C7	# <CJK>
-0xCC55	0x5B62	# <CJK>
-0xCC56	0x5B65	# <CJK>
-0xCC57	0x5B93	# <CJK>
-0xCC58	0x5B95	# <CJK>
-0xCC59	0x5C44	# <CJK>
-0xCC5A	0x5C47	# <CJK>
-0xCC5B	0x5CAE	# <CJK>
-0xCC5C	0x5CA4	# <CJK>
-0xCC5D	0x5CA0	# <CJK>
-0xCC5E	0x5CB5	# <CJK>
-0xCC5F	0x5CAF	# <CJK>
-0xCC60	0x5CA8	# <CJK>
-0xCC61	0x5CAC	# <CJK>
-0xCC62	0x5C9F	# <CJK>
-0xCC63	0x5CA3	# <CJK>
-0xCC64	0x5CAD	# <CJK>
-0xCC65	0x5CA2	# <CJK>
-0xCC66	0x5CAA	# <CJK>
-0xCC67	0x5CA7	# <CJK>
-0xCC68	0x5C9D	# <CJK>
-0xCC69	0x5CA5	# <CJK>
-0xCC6A	0x5CB6	# <CJK>
-0xCC6B	0x5CB0	# <CJK>
-0xCC6C	0x5CA6	# <CJK>
-0xCC6D	0x5E17	# <CJK>
-0xCC6E	0x5E14	# <CJK>
-0xCC6F	0x5E19	# <CJK>
-0xCC70	0x5F28	# <CJK>
-0xCC71	0x5F22	# <CJK>
-0xCC72	0x5F23	# <CJK>
-0xCC73	0x5F24	# <CJK>
-0xCC74	0x5F54	# <CJK>
-0xCC75	0x5F82	# <CJK>
-0xCC76	0x5F7E	# <CJK>
-0xCC77	0x5F7D	# <CJK>
-0xCC78	0x5FDE	# <CJK>
-0xCC79	0x5FE5	# <CJK>
-0xCC7A	0x602D	# <CJK>
-0xCC7B	0x6026	# <CJK>
-0xCC7C	0x6019	# <CJK>
-0xCC7D	0x6032	# <CJK>
-0xCC7E	0x600B	# <CJK>
-0xCCA1	0x6034	# <CJK>
-0xCCA2	0x600A	# <CJK>
-0xCCA3	0x6017	# <CJK>
-0xCCA4	0x6033	# <CJK>
-0xCCA5	0x601A	# <CJK>
-0xCCA6	0x601E	# <CJK>
-0xCCA7	0x602C	# <CJK>
-0xCCA8	0x6022	# <CJK>
-0xCCA9	0x600D	# <CJK>
-0xCCAA	0x6010	# <CJK>
-0xCCAB	0x602E	# <CJK>
-0xCCAC	0x6013	# <CJK>
-0xCCAD	0x6011	# <CJK>
-0xCCAE	0x600C	# <CJK>
-0xCCAF	0x6009	# <CJK>
-0xCCB0	0x601C	# <CJK>
-0xCCB1	0x6214	# <CJK>
-0xCCB2	0x623D	# <CJK>
-0xCCB3	0x62AD	# <CJK>
-0xCCB4	0x62B4	# <CJK>
-0xCCB5	0x62D1	# <CJK>
-0xCCB6	0x62BE	# <CJK>
-0xCCB7	0x62AA	# <CJK>
-0xCCB8	0x62B6	# <CJK>
-0xCCB9	0x62CA	# <CJK>
-0xCCBA	0x62AE	# <CJK>
-0xCCBB	0x62B3	# <CJK>
-0xCCBC	0x62AF	# <CJK>
-0xCCBD	0x62BB	# <CJK>
-0xCCBE	0x62A9	# <CJK>
-0xCCBF	0x62B0	# <CJK>
-0xCCC0	0x62B8	# <CJK>
-0xCCC1	0x653D	# <CJK>
-0xCCC2	0x65A8	# <CJK>
-0xCCC3	0x65BB	# <CJK>
-0xCCC4	0x6609	# <CJK>
-0xCCC5	0x65FC	# <CJK>
-0xCCC6	0x6604	# <CJK>
-0xCCC7	0x6612	# <CJK>
-0xCCC8	0x6608	# <CJK>
-0xCCC9	0x65FB	# <CJK>
-0xCCCA	0x6603	# <CJK>
-0xCCCB	0x660B	# <CJK>
-0xCCCC	0x660D	# <CJK>
-0xCCCD	0x6605	# <CJK>
-0xCCCE	0x65FD	# <CJK>
-0xCCCF	0x6611	# <CJK>
-0xCCD0	0x6610	# <CJK>
-0xCCD1	0x66F6	# <CJK>
-0xCCD2	0x670A	# <CJK>
-0xCCD3	0x6785	# <CJK>
-0xCCD4	0x676C	# <CJK>
-0xCCD5	0x678E	# <CJK>
-0xCCD6	0x6792	# <CJK>
-0xCCD7	0x6776	# <CJK>
-0xCCD8	0x677B	# <CJK>
-0xCCD9	0x6798	# <CJK>
-0xCCDA	0x6786	# <CJK>
-0xCCDB	0x6784	# <CJK>
-0xCCDC	0x6774	# <CJK>
-0xCCDD	0x678D	# <CJK>
-0xCCDE	0x678C	# <CJK>
-0xCCDF	0x677A	# <CJK>
-0xCCE0	0x679F	# <CJK>
-0xCCE1	0x6791	# <CJK>
-0xCCE2	0x6799	# <CJK>
-0xCCE3	0x6783	# <CJK>
-0xCCE4	0x677D	# <CJK>
-0xCCE5	0x6781	# <CJK>
-0xCCE6	0x6778	# <CJK>
-0xCCE7	0x6779	# <CJK>
-0xCCE8	0x6794	# <CJK>
-0xCCE9	0x6B25	# <CJK>
-0xCCEA	0x6B80	# <CJK>
-0xCCEB	0x6B7E	# <CJK>
-0xCCEC	0x6BDE	# <CJK>
-0xCCED	0x6C1D	# <CJK>
-0xCCEE	0x6C93	# <CJK>
-0xCCEF	0x6CEC	# <CJK>
-0xCCF0	0x6CEB	# <CJK>
-0xCCF1	0x6CEE	# <CJK>
-0xCCF2	0x6CD9	# <CJK>
-0xCCF3	0x6CB6	# <CJK>
-0xCCF4	0x6CD4	# <CJK>
-0xCCF5	0x6CAD	# <CJK>
-0xCCF6	0x6CE7	# <CJK>
-0xCCF7	0x6CB7	# <CJK>
-0xCCF8	0x6CD0	# <CJK>
-0xCCF9	0x6CC2	# <CJK>
-0xCCFA	0x6CBA	# <CJK>
-0xCCFB	0x6CC3	# <CJK>
-0xCCFC	0x6CC6	# <CJK>
-0xCCFD	0x6CED	# <CJK>
-0xCCFE	0x6CF2	# <CJK>
-0xCD40	0x6CD2	# <CJK>
-0xCD41	0x6CDD	# <CJK>
-0xCD42	0x6CB4	# <CJK>
-0xCD43	0x6C8A	# <CJK>
-0xCD44	0x6C9D	# <CJK>
-0xCD45	0x6C80	# <CJK>
-0xCD46	0x6CDE	# <CJK>
-0xCD47	0x6CC0	# <CJK>
-0xCD48	0x6D30	# <CJK>
-0xCD49	0x6CCD	# <CJK>
-0xCD4A	0x6CC7	# <CJK>
-0xCD4B	0x6CB0	# <CJK>
-0xCD4C	0x6CF9	# <CJK>
-0xCD4D	0x6CCF	# <CJK>
-0xCD4E	0x6CE9	# <CJK>
-0xCD4F	0x6CD1	# <CJK>
-0xCD50	0x7094	# <CJK>
-0xCD51	0x7098	# <CJK>
-0xCD52	0x7085	# <CJK>
-0xCD53	0x7093	# <CJK>
-0xCD54	0x7086	# <CJK>
-0xCD55	0x7084	# <CJK>
-0xCD56	0x7091	# <CJK>
-0xCD57	0x7096	# <CJK>
-0xCD58	0x7082	# <CJK>
-0xCD59	0x709A	# <CJK>
-0xCD5A	0x7083	# <CJK>
-0xCD5B	0x726A	# <CJK>
-0xCD5C	0x72D6	# <CJK>
-0xCD5D	0x72CB	# <CJK>
-0xCD5E	0x72D8	# <CJK>
-0xCD5F	0x72C9	# <CJK>
-0xCD60	0x72DC	# <CJK>
-0xCD61	0x72D2	# <CJK>
-0xCD62	0x72D4	# <CJK>
-0xCD63	0x72DA	# <CJK>
-0xCD64	0x72CC	# <CJK>
-0xCD65	0x72D1	# <CJK>
-0xCD66	0x73A4	# <CJK>
-0xCD67	0x73A1	# <CJK>
-0xCD68	0x73AD	# <CJK>
-0xCD69	0x73A6	# <CJK>
-0xCD6A	0x73A2	# <CJK>
-0xCD6B	0x73A0	# <CJK>
-0xCD6C	0x73AC	# <CJK>
-0xCD6D	0x739D	# <CJK>
-0xCD6E	0x74DD	# <CJK>
-0xCD6F	0x74E8	# <CJK>
-0xCD70	0x753F	# <CJK>
-0xCD71	0x7540	# <CJK>
-0xCD72	0x753E	# <CJK>
-0xCD73	0x758C	# <CJK>
-0xCD74	0x7598	# <CJK>
-0xCD75	0x76AF	# <CJK>
-0xCD76	0x76F3	# <CJK>
-0xCD77	0x76F1	# <CJK>
-0xCD78	0x76F0	# <CJK>
-0xCD79	0x76F5	# <CJK>
-0xCD7A	0x77F8	# <CJK>
-0xCD7B	0x77FC	# <CJK>
-0xCD7C	0x77F9	# <CJK>
-0xCD7D	0x77FB	# <CJK>
-0xCD7E	0x77FA	# <CJK>
-0xCDA1	0x77F7	# <CJK>
-0xCDA2	0x7942	# <CJK>
-0xCDA3	0x793F	# <CJK>
-0xCDA4	0x79C5	# <CJK>
-0xCDA5	0x7A78	# <CJK>
-0xCDA6	0x7A7B	# <CJK>
-0xCDA7	0x7AFB	# <CJK>
-0xCDA8	0x7C75	# <CJK>
-0xCDA9	0x7CFD	# <CJK>
-0xCDAA	0x8035	# <CJK>
-0xCDAB	0x808F	# <CJK>
-0xCDAC	0x80AE	# <CJK>
-0xCDAD	0x80A3	# <CJK>
-0xCDAE	0x80B8	# <CJK>
-0xCDAF	0x80B5	# <CJK>
-0xCDB0	0x80AD	# <CJK>
-0xCDB1	0x8220	# <CJK>
-0xCDB2	0x82A0	# <CJK>
-0xCDB3	0x82C0	# <CJK>
-0xCDB4	0x82AB	# <CJK>
-0xCDB5	0x829A	# <CJK>
-0xCDB6	0x8298	# <CJK>
-0xCDB7	0x829B	# <CJK>
-0xCDB8	0x82B5	# <CJK>
-0xCDB9	0x82A7	# <CJK>
-0xCDBA	0x82AE	# <CJK>
-0xCDBB	0x82BC	# <CJK>
-0xCDBC	0x829E	# <CJK>
-0xCDBD	0x82BA	# <CJK>
-0xCDBE	0x82B4	# <CJK>
-0xCDBF	0x82A8	# <CJK>
-0xCDC0	0x82A1	# <CJK>
-0xCDC1	0x82A9	# <CJK>
-0xCDC2	0x82C2	# <CJK>
-0xCDC3	0x82A4	# <CJK>
-0xCDC4	0x82C3	# <CJK>
-0xCDC5	0x82B6	# <CJK>
-0xCDC6	0x82A2	# <CJK>
-0xCDC7	0x8670	# <CJK>
-0xCDC8	0x866F	# <CJK>
-0xCDC9	0x866D	# <CJK>
-0xCDCA	0x866E	# <CJK>
-0xCDCB	0x8C56	# <CJK>
-0xCDCC	0x8FD2	# <CJK>
-0xCDCD	0x8FCB	# <CJK>
-0xCDCE	0x8FD3	# <CJK>
-0xCDCF	0x8FCD	# <CJK>
-0xCDD0	0x8FD6	# <CJK>
-0xCDD1	0x8FD5	# <CJK>
-0xCDD2	0x8FD7	# <CJK>
-0xCDD3	0x90B2	# <CJK>
-0xCDD4	0x90B4	# <CJK>
-0xCDD5	0x90AF	# <CJK>
-0xCDD6	0x90B3	# <CJK>
-0xCDD7	0x90B0	# <CJK>
-0xCDD8	0x9639	# <CJK>
-0xCDD9	0x963D	# <CJK>
-0xCDDA	0x963C	# <CJK>
-0xCDDB	0x963A	# <CJK>
-0xCDDC	0x9643	# <CJK>
-0xCDDD	0x4FCD	# <CJK>
-0xCDDE	0x4FC5	# <CJK>
-0xCDDF	0x4FD3	# <CJK>
-0xCDE0	0x4FB2	# <CJK>
-0xCDE1	0x4FC9	# <CJK>
-0xCDE2	0x4FCB	# <CJK>
-0xCDE3	0x4FC1	# <CJK>
-0xCDE4	0x4FD4	# <CJK>
-0xCDE5	0x4FDC	# <CJK>
-0xCDE6	0x4FD9	# <CJK>
-0xCDE7	0x4FBB	# <CJK>
-0xCDE8	0x4FB3	# <CJK>
-0xCDE9	0x4FDB	# <CJK>
-0xCDEA	0x4FC7	# <CJK>
-0xCDEB	0x4FD6	# <CJK>
-0xCDEC	0x4FBA	# <CJK>
-0xCDED	0x4FC0	# <CJK>
-0xCDEE	0x4FB9	# <CJK>
-0xCDEF	0x4FEC	# <CJK>
-0xCDF0	0x5244	# <CJK>
-0xCDF1	0x5249	# <CJK>
-0xCDF2	0x52C0	# <CJK>
-0xCDF3	0x52C2	# <CJK>
-0xCDF4	0x533D	# <CJK>
-0xCDF5	0x537C	# <CJK>
-0xCDF6	0x5397	# <CJK>
-0xCDF7	0x5396	# <CJK>
-0xCDF8	0x5399	# <CJK>
-0xCDF9	0x5398	# <CJK>
-0xCDFA	0x54BA	# <CJK>
-0xCDFB	0x54A1	# <CJK>
-0xCDFC	0x54AD	# <CJK>
-0xCDFD	0x54A5	# <CJK>
-0xCDFE	0x54CF	# <CJK>
-0xCE40	0x54C3	# <CJK>
-0xCE41	0x830D	# <CJK>
-0xCE42	0x54B7	# <CJK>
-0xCE43	0x54AE	# <CJK>
-0xCE44	0x54D6	# <CJK>
-0xCE45	0x54B6	# <CJK>
-0xCE46	0x54C5	# <CJK>
-0xCE47	0x54C6	# <CJK>
-0xCE48	0x54A0	# <CJK>
-0xCE49	0x5470	# <CJK>
-0xCE4A	0x54BC	# <CJK>
-0xCE4B	0x54A2	# <CJK>
-0xCE4C	0x54BE	# <CJK>
-0xCE4D	0x5472	# <CJK>
-0xCE4E	0x54DE	# <CJK>
-0xCE4F	0x54B0	# <CJK>
-0xCE50	0x57B5	# <CJK>
-0xCE51	0x579E	# <CJK>
-0xCE52	0x579F	# <CJK>
-0xCE53	0x57A4	# <CJK>
-0xCE54	0x578C	# <CJK>
-0xCE55	0x5797	# <CJK>
-0xCE56	0x579D	# <CJK>
-0xCE57	0x579B	# <CJK>
-0xCE58	0x5794	# <CJK>
-0xCE59	0x5798	# <CJK>
-0xCE5A	0x578F	# <CJK>
-0xCE5B	0x5799	# <CJK>
-0xCE5C	0x57A5	# <CJK>
-0xCE5D	0x579A	# <CJK>
-0xCE5E	0x5795	# <CJK>
-0xCE5F	0x58F4	# <CJK>
-0xCE60	0x590D	# <CJK>
-0xCE61	0x5953	# <CJK>
-0xCE62	0x59E1	# <CJK>
-0xCE63	0x59DE	# <CJK>
-0xCE64	0x59EE	# <CJK>
-0xCE65	0x5A00	# <CJK>
-0xCE66	0x59F1	# <CJK>
-0xCE67	0x59DD	# <CJK>
-0xCE68	0x59FA	# <CJK>
-0xCE69	0x59FD	# <CJK>
-0xCE6A	0x59FC	# <CJK>
-0xCE6B	0x59F6	# <CJK>
-0xCE6C	0x59E4	# <CJK>
-0xCE6D	0x59F2	# <CJK>
-0xCE6E	0x59F7	# <CJK>
-0xCE6F	0x59DB	# <CJK>
-0xCE70	0x59E9	# <CJK>
-0xCE71	0x59F3	# <CJK>
-0xCE72	0x59F5	# <CJK>
-0xCE73	0x59E0	# <CJK>
-0xCE74	0x59FE	# <CJK>
-0xCE75	0x59F4	# <CJK>
-0xCE76	0x59ED	# <CJK>
-0xCE77	0x5BA8	# <CJK>
-0xCE78	0x5C4C	# <CJK>
-0xCE79	0x5CD0	# <CJK>
-0xCE7A	0x5CD8	# <CJK>
-0xCE7B	0x5CCC	# <CJK>
-0xCE7C	0x5CD7	# <CJK>
-0xCE7D	0x5CCB	# <CJK>
-0xCE7E	0x5CDB	# <CJK>
-0xCEA1	0x5CDE	# <CJK>
-0xCEA2	0x5CDA	# <CJK>
-0xCEA3	0x5CC9	# <CJK>
-0xCEA4	0x5CC7	# <CJK>
-0xCEA5	0x5CCA	# <CJK>
-0xCEA6	0x5CD6	# <CJK>
-0xCEA7	0x5CD3	# <CJK>
-0xCEA8	0x5CD4	# <CJK>
-0xCEA9	0x5CCF	# <CJK>
-0xCEAA	0x5CC8	# <CJK>
-0xCEAB	0x5CC6	# <CJK>
-0xCEAC	0x5CCE	# <CJK>
-0xCEAD	0x5CDF	# <CJK>
-0xCEAE	0x5CF8	# <CJK>
-0xCEAF	0x5DF9	# <CJK>
-0xCEB0	0x5E21	# <CJK>
-0xCEB1	0x5E22	# <CJK>
-0xCEB2	0x5E23	# <CJK>
-0xCEB3	0x5E20	# <CJK>
-0xCEB4	0x5E24	# <CJK>
-0xCEB5	0x5EB0	# <CJK>
-0xCEB6	0x5EA4	# <CJK>
-0xCEB7	0x5EA2	# <CJK>
-0xCEB8	0x5E9B	# <CJK>
-0xCEB9	0x5EA3	# <CJK>
-0xCEBA	0x5EA5	# <CJK>
-0xCEBB	0x5F07	# <CJK>
-0xCEBC	0x5F2E	# <CJK>
-0xCEBD	0x5F56	# <CJK>
-0xCEBE	0x5F86	# <CJK>
-0xCEBF	0x6037	# <CJK>
-0xCEC0	0x6039	# <CJK>
-0xCEC1	0x6054	# <CJK>
-0xCEC2	0x6072	# <CJK>
-0xCEC3	0x605E	# <CJK>
-0xCEC4	0x6045	# <CJK>
-0xCEC5	0x6053	# <CJK>
-0xCEC6	0x6047	# <CJK>
-0xCEC7	0x6049	# <CJK>
-0xCEC8	0x605B	# <CJK>
-0xCEC9	0x604C	# <CJK>
-0xCECA	0x6040	# <CJK>
-0xCECB	0x6042	# <CJK>
-0xCECC	0x605F	# <CJK>
-0xCECD	0x6024	# <CJK>
-0xCECE	0x6044	# <CJK>
-0xCECF	0x6058	# <CJK>
-0xCED0	0x6066	# <CJK>
-0xCED1	0x606E	# <CJK>
-0xCED2	0x6242	# <CJK>
-0xCED3	0x6243	# <CJK>
-0xCED4	0x62CF	# <CJK>
-0xCED5	0x630D	# <CJK>
-0xCED6	0x630B	# <CJK>
-0xCED7	0x62F5	# <CJK>
-0xCED8	0x630E	# <CJK>
-0xCED9	0x6303	# <CJK>
-0xCEDA	0x62EB	# <CJK>
-0xCEDB	0x62F9	# <CJK>
-0xCEDC	0x630F	# <CJK>
-0xCEDD	0x630C	# <CJK>
-0xCEDE	0x62F8	# <CJK>
-0xCEDF	0x62F6	# <CJK>
-0xCEE0	0x6300	# <CJK>
-0xCEE1	0x6313	# <CJK>
-0xCEE2	0x6314	# <CJK>
-0xCEE3	0x62FA	# <CJK>
-0xCEE4	0x6315	# <CJK>
-0xCEE5	0x62FB	# <CJK>
-0xCEE6	0x62F0	# <CJK>
-0xCEE7	0x6541	# <CJK>
-0xCEE8	0x6543	# <CJK>
-0xCEE9	0x65AA	# <CJK>
-0xCEEA	0x65BF	# <CJK>
-0xCEEB	0x6636	# <CJK>
-0xCEEC	0x6621	# <CJK>
-0xCEED	0x6632	# <CJK>
-0xCEEE	0x6635	# <CJK>
-0xCEEF	0x661C	# <CJK>
-0xCEF0	0x6626	# <CJK>
-0xCEF1	0x6622	# <CJK>
-0xCEF2	0x6633	# <CJK>
-0xCEF3	0x662B	# <CJK>
-0xCEF4	0x663A	# <CJK>
-0xCEF5	0x661D	# <CJK>
-0xCEF6	0x6634	# <CJK>
-0xCEF7	0x6639	# <CJK>
-0xCEF8	0x662E	# <CJK>
-0xCEF9	0x670F	# <CJK>
-0xCEFA	0x6710	# <CJK>
-0xCEFB	0x67C1	# <CJK>
-0xCEFC	0x67F2	# <CJK>
-0xCEFD	0x67C8	# <CJK>
-0xCEFE	0x67BA	# <CJK>
-0xCF40	0x67DC	# <CJK>
-0xCF41	0x67BB	# <CJK>
-0xCF42	0x67F8	# <CJK>
-0xCF43	0x67D8	# <CJK>
-0xCF44	0x67C0	# <CJK>
-0xCF45	0x67B7	# <CJK>
-0xCF46	0x67C5	# <CJK>
-0xCF47	0x67EB	# <CJK>
-0xCF48	0x67E4	# <CJK>
-0xCF49	0x67DF	# <CJK>
-0xCF4A	0x67B5	# <CJK>
-0xCF4B	0x67CD	# <CJK>
-0xCF4C	0x67B3	# <CJK>
-0xCF4D	0x67F7	# <CJK>
-0xCF4E	0x67F6	# <CJK>
-0xCF4F	0x67EE	# <CJK>
-0xCF50	0x67E3	# <CJK>
-0xCF51	0x67C2	# <CJK>
-0xCF52	0x67B9	# <CJK>
-0xCF53	0x67CE	# <CJK>
-0xCF54	0x67E7	# <CJK>
-0xCF55	0x67F0	# <CJK>
-0xCF56	0x67B2	# <CJK>
-0xCF57	0x67FC	# <CJK>
-0xCF58	0x67C6	# <CJK>
-0xCF59	0x67ED	# <CJK>
-0xCF5A	0x67CC	# <CJK>
-0xCF5B	0x67AE	# <CJK>
-0xCF5C	0x67E6	# <CJK>
-0xCF5D	0x67DB	# <CJK>
-0xCF5E	0x67FA	# <CJK>
-0xCF5F	0x67C9	# <CJK>
-0xCF60	0x67CA	# <CJK>
-0xCF61	0x67C3	# <CJK>
-0xCF62	0x67EA	# <CJK>
-0xCF63	0x67CB	# <CJK>
-0xCF64	0x6B28	# <CJK>
-0xCF65	0x6B82	# <CJK>
-0xCF66	0x6B84	# <CJK>
-0xCF67	0x6BB6	# <CJK>
-0xCF68	0x6BD6	# <CJK>
-0xCF69	0x6BD8	# <CJK>
-0xCF6A	0x6BE0	# <CJK>
-0xCF6B	0x6C20	# <CJK>
-0xCF6C	0x6C21	# <CJK>
-0xCF6D	0x6D28	# <CJK>
-0xCF6E	0x6D34	# <CJK>
-0xCF6F	0x6D2D	# <CJK>
-0xCF70	0x6D1F	# <CJK>
-0xCF71	0x6D3C	# <CJK>
-0xCF72	0x6D3F	# <CJK>
-0xCF73	0x6D12	# <CJK>
-0xCF74	0x6D0A	# <CJK>
-0xCF75	0x6CDA	# <CJK>
-0xCF76	0x6D33	# <CJK>
-0xCF77	0x6D04	# <CJK>
-0xCF78	0x6D19	# <CJK>
-0xCF79	0x6D3A	# <CJK>
-0xCF7A	0x6D1A	# <CJK>
-0xCF7B	0x6D11	# <CJK>
-0xCF7C	0x6D00	# <CJK>
-0xCF7D	0x6D1D	# <CJK>
-0xCF7E	0x6D42	# <CJK>
-0xCFA1	0x6D01	# <CJK>
-0xCFA2	0x6D18	# <CJK>
-0xCFA3	0x6D37	# <CJK>
-0xCFA4	0x6D03	# <CJK>
-0xCFA5	0x6D0F	# <CJK>
-0xCFA6	0x6D40	# <CJK>
-0xCFA7	0x6D07	# <CJK>
-0xCFA8	0x6D20	# <CJK>
-0xCFA9	0x6D2C	# <CJK>
-0xCFAA	0x6D08	# <CJK>
-0xCFAB	0x6D22	# <CJK>
-0xCFAC	0x6D09	# <CJK>
-0xCFAD	0x6D10	# <CJK>
-0xCFAE	0x70B7	# <CJK>
-0xCFAF	0x709F	# <CJK>
-0xCFB0	0x70BE	# <CJK>
-0xCFB1	0x70B1	# <CJK>
-0xCFB2	0x70B0	# <CJK>
-0xCFB3	0x70A1	# <CJK>
-0xCFB4	0x70B4	# <CJK>
-0xCFB5	0x70B5	# <CJK>
-0xCFB6	0x70A9	# <CJK>
-0xCFB7	0x7241	# <CJK>
-0xCFB8	0x7249	# <CJK>
-0xCFB9	0x724A	# <CJK>
-0xCFBA	0x726C	# <CJK>
-0xCFBB	0x7270	# <CJK>
-0xCFBC	0x7273	# <CJK>
-0xCFBD	0x726E	# <CJK>
-0xCFBE	0x72CA	# <CJK>
-0xCFBF	0x72E4	# <CJK>
-0xCFC0	0x72E8	# <CJK>
-0xCFC1	0x72EB	# <CJK>
-0xCFC2	0x72DF	# <CJK>
-0xCFC3	0x72EA	# <CJK>
-0xCFC4	0x72E6	# <CJK>
-0xCFC5	0x72E3	# <CJK>
-0xCFC6	0x7385	# <CJK>
-0xCFC7	0x73CC	# <CJK>
-0xCFC8	0x73C2	# <CJK>
-0xCFC9	0x73C8	# <CJK>
-0xCFCA	0x73C5	# <CJK>
-0xCFCB	0x73B9	# <CJK>
-0xCFCC	0x73B6	# <CJK>
-0xCFCD	0x73B5	# <CJK>
-0xCFCE	0x73B4	# <CJK>
-0xCFCF	0x73EB	# <CJK>
-0xCFD0	0x73BF	# <CJK>
-0xCFD1	0x73C7	# <CJK>
-0xCFD2	0x73BE	# <CJK>
-0xCFD3	0x73C3	# <CJK>
-0xCFD4	0x73C6	# <CJK>
-0xCFD5	0x73B8	# <CJK>
-0xCFD6	0x73CB	# <CJK>
-0xCFD7	0x74EC	# <CJK>
-0xCFD8	0x74EE	# <CJK>
-0xCFD9	0x752E	# <CJK>
-0xCFDA	0x7547	# <CJK>
-0xCFDB	0x7548	# <CJK>
-0xCFDC	0x75A7	# <CJK>
-0xCFDD	0x75AA	# <CJK>
-0xCFDE	0x7679	# <CJK>
-0xCFDF	0x76C4	# <CJK>
-0xCFE0	0x7708	# <CJK>
-0xCFE1	0x7703	# <CJK>
-0xCFE2	0x7704	# <CJK>
-0xCFE3	0x7705	# <CJK>
-0xCFE4	0x770A	# <CJK>
-0xCFE5	0x76F7	# <CJK>
-0xCFE6	0x76FB	# <CJK>
-0xCFE7	0x76FA	# <CJK>
-0xCFE8	0x77E7	# <CJK>
-0xCFE9	0x77E8	# <CJK>
-0xCFEA	0x7806	# <CJK>
-0xCFEB	0x7811	# <CJK>
-0xCFEC	0x7812	# <CJK>
-0xCFED	0x7805	# <CJK>
-0xCFEE	0x7810	# <CJK>
-0xCFEF	0x780F	# <CJK>
-0xCFF0	0x780E	# <CJK>
-0xCFF1	0x7809	# <CJK>
-0xCFF2	0x7803	# <CJK>
-0xCFF3	0x7813	# <CJK>
-0xCFF4	0x794A	# <CJK>
-0xCFF5	0x794C	# <CJK>
-0xCFF6	0x794B	# <CJK>
-0xCFF7	0x7945	# <CJK>
-0xCFF8	0x7944	# <CJK>
-0xCFF9	0x79D5	# <CJK>
-0xCFFA	0x79CD	# <CJK>
-0xCFFB	0x79CF	# <CJK>
-0xCFFC	0x79D6	# <CJK>
-0xCFFD	0x79CE	# <CJK>
-0xCFFE	0x7A80	# <CJK>
-0xD040	0x7A7E	# <CJK>
-0xD041	0x7AD1	# <CJK>
-0xD042	0x7B00	# <CJK>
-0xD043	0x7B01	# <CJK>
-0xD044	0x7C7A	# <CJK>
-0xD045	0x7C78	# <CJK>
-0xD046	0x7C79	# <CJK>
-0xD047	0x7C7F	# <CJK>
-0xD048	0x7C80	# <CJK>
-0xD049	0x7C81	# <CJK>
-0xD04A	0x7D03	# <CJK>
-0xD04B	0x7D08	# <CJK>
-0xD04C	0x7D01	# <CJK>
-0xD04D	0x7F58	# <CJK>
-0xD04E	0x7F91	# <CJK>
-0xD04F	0x7F8D	# <CJK>
-0xD050	0x7FBE	# <CJK>
-0xD051	0x8007	# <CJK>
-0xD052	0x800E	# <CJK>
-0xD053	0x800F	# <CJK>
-0xD054	0x8014	# <CJK>
-0xD055	0x8037	# <CJK>
-0xD056	0x80D8	# <CJK>
-0xD057	0x80C7	# <CJK>
-0xD058	0x80E0	# <CJK>
-0xD059	0x80D1	# <CJK>
-0xD05A	0x80C8	# <CJK>
-0xD05B	0x80C2	# <CJK>
-0xD05C	0x80D0	# <CJK>
-0xD05D	0x80C5	# <CJK>
-0xD05E	0x80E3	# <CJK>
-0xD05F	0x80D9	# <CJK>
-0xD060	0x80DC	# <CJK>
-0xD061	0x80CA	# <CJK>
-0xD062	0x80D5	# <CJK>
-0xD063	0x80C9	# <CJK>
-0xD064	0x80CF	# <CJK>
-0xD065	0x80D7	# <CJK>
-0xD066	0x80E6	# <CJK>
-0xD067	0x80CD	# <CJK>
-0xD068	0x81FF	# <CJK>
-0xD069	0x8221	# <CJK>
-0xD06A	0x8294	# <CJK>
-0xD06B	0x82D9	# <CJK>
-0xD06C	0x82FE	# <CJK>
-0xD06D	0x82F9	# <CJK>
-0xD06E	0x8307	# <CJK>
-0xD06F	0x82E8	# <CJK>
-0xD070	0x8300	# <CJK>
-0xD071	0x82D5	# <CJK>
-0xD072	0x833A	# <CJK>
-0xD073	0x82EB	# <CJK>
-0xD074	0x82D6	# <CJK>
-0xD075	0x82F4	# <CJK>
-0xD076	0x82EC	# <CJK>
-0xD077	0x82E1	# <CJK>
-0xD078	0x82F2	# <CJK>
-0xD079	0x82F5	# <CJK>
-0xD07A	0x830C	# <CJK>
-0xD07B	0x82FB	# <CJK>
-0xD07C	0x82F6	# <CJK>
-0xD07D	0x82F0	# <CJK>
-0xD07E	0x82EA	# <CJK>
-0xD0A1	0x82E4	# <CJK>
-0xD0A2	0x82E0	# <CJK>
-0xD0A3	0x82FA	# <CJK>
-0xD0A4	0x82F3	# <CJK>
-0xD0A5	0x82ED	# <CJK>
-0xD0A6	0x8677	# <CJK>
-0xD0A7	0x8674	# <CJK>
-0xD0A8	0x867C	# <CJK>
-0xD0A9	0x8673	# <CJK>
-0xD0AA	0x8841	# <CJK>
-0xD0AB	0x884E	# <CJK>
-0xD0AC	0x8867	# <CJK>
-0xD0AD	0x886A	# <CJK>
-0xD0AE	0x8869	# <CJK>
-0xD0AF	0x89D3	# <CJK>
-0xD0B0	0x8A04	# <CJK>
-0xD0B1	0x8A07	# <CJK>
-0xD0B2	0x8D72	# <CJK>
-0xD0B3	0x8FE3	# <CJK>
-0xD0B4	0x8FE1	# <CJK>
-0xD0B5	0x8FEE	# <CJK>
-0xD0B6	0x8FE0	# <CJK>
-0xD0B7	0x90F1	# <CJK>
-0xD0B8	0x90BD	# <CJK>
-0xD0B9	0x90BF	# <CJK>
-0xD0BA	0x90D5	# <CJK>
-0xD0BB	0x90C5	# <CJK>
-0xD0BC	0x90BE	# <CJK>
-0xD0BD	0x90C7	# <CJK>
-0xD0BE	0x90CB	# <CJK>
-0xD0BF	0x90C8	# <CJK>
-0xD0C0	0x91D4	# <CJK>
-0xD0C1	0x91D3	# <CJK>
-0xD0C2	0x9654	# <CJK>
-0xD0C3	0x964F	# <CJK>
-0xD0C4	0x9651	# <CJK>
-0xD0C5	0x9653	# <CJK>
-0xD0C6	0x964A	# <CJK>
-0xD0C7	0x964E	# <CJK>
-0xD0C8	0x501E	# <CJK>
-0xD0C9	0x5005	# <CJK>
-0xD0CA	0x5007	# <CJK>
-0xD0CB	0x5013	# <CJK>
-0xD0CC	0x5022	# <CJK>
-0xD0CD	0x5030	# <CJK>
-0xD0CE	0x501B	# <CJK>
-0xD0CF	0x4FF5	# <CJK>
-0xD0D0	0x4FF4	# <CJK>
-0xD0D1	0x5033	# <CJK>
-0xD0D2	0x5037	# <CJK>
-0xD0D3	0x502C	# <CJK>
-0xD0D4	0x4FF6	# <CJK>
-0xD0D5	0x4FF7	# <CJK>
-0xD0D6	0x5017	# <CJK>
-0xD0D7	0x501C	# <CJK>
-0xD0D8	0x5020	# <CJK>
-0xD0D9	0x5027	# <CJK>
-0xD0DA	0x5035	# <CJK>
-0xD0DB	0x502F	# <CJK>
-0xD0DC	0x5031	# <CJK>
-0xD0DD	0x500E	# <CJK>
-0xD0DE	0x515A	# <CJK>
-0xD0DF	0x5194	# <CJK>
-0xD0E0	0x5193	# <CJK>
-0xD0E1	0x51CA	# <CJK>
-0xD0E2	0x51C4	# <CJK>
-0xD0E3	0x51C5	# <CJK>
-0xD0E4	0x51C8	# <CJK>
-0xD0E5	0x51CE	# <CJK>
-0xD0E6	0x5261	# <CJK>
-0xD0E7	0x525A	# <CJK>
-0xD0E8	0x5252	# <CJK>
-0xD0E9	0x525E	# <CJK>
-0xD0EA	0x525F	# <CJK>
-0xD0EB	0x5255	# <CJK>
-0xD0EC	0x5262	# <CJK>
-0xD0ED	0x52CD	# <CJK>
-0xD0EE	0x530E	# <CJK>
-0xD0EF	0x539E	# <CJK>
-0xD0F0	0x5526	# <CJK>
-0xD0F1	0x54E2	# <CJK>
-0xD0F2	0x5517	# <CJK>
-0xD0F3	0x5512	# <CJK>
-0xD0F4	0x54E7	# <CJK>
-0xD0F5	0x54F3	# <CJK>
-0xD0F6	0x54E4	# <CJK>
-0xD0F7	0x551A	# <CJK>
-0xD0F8	0x54FF	# <CJK>
-0xD0F9	0x5504	# <CJK>
-0xD0FA	0x5508	# <CJK>
-0xD0FB	0x54EB	# <CJK>
-0xD0FC	0x5511	# <CJK>
-0xD0FD	0x5505	# <CJK>
-0xD0FE	0x54F1	# <CJK>
-0xD140	0x550A	# <CJK>
-0xD141	0x54FB	# <CJK>
-0xD142	0x54F7	# <CJK>
-0xD143	0x54F8	# <CJK>
-0xD144	0x54E0	# <CJK>
-0xD145	0x550E	# <CJK>
-0xD146	0x5503	# <CJK>
-0xD147	0x550B	# <CJK>
-0xD148	0x5701	# <CJK>
-0xD149	0x5702	# <CJK>
-0xD14A	0x57CC	# <CJK>
-0xD14B	0x5832	# <CJK>
-0xD14C	0x57D5	# <CJK>
-0xD14D	0x57D2	# <CJK>
-0xD14E	0x57BA	# <CJK>
-0xD14F	0x57C6	# <CJK>
-0xD150	0x57BD	# <CJK>
-0xD151	0x57BC	# <CJK>
-0xD152	0x57B8	# <CJK>
-0xD153	0x57B6	# <CJK>
-0xD154	0x57BF	# <CJK>
-0xD155	0x57C7	# <CJK>
-0xD156	0x57D0	# <CJK>
-0xD157	0x57B9	# <CJK>
-0xD158	0x57C1	# <CJK>
-0xD159	0x590E	# <CJK>
-0xD15A	0x594A	# <CJK>
-0xD15B	0x5A19	# <CJK>
-0xD15C	0x5A16	# <CJK>
-0xD15D	0x5A2D	# <CJK>
-0xD15E	0x5A2E	# <CJK>
-0xD15F	0x5A15	# <CJK>
-0xD160	0x5A0F	# <CJK>
-0xD161	0x5A17	# <CJK>
-0xD162	0x5A0A	# <CJK>
-0xD163	0x5A1E	# <CJK>
-0xD164	0x5A33	# <CJK>
-0xD165	0x5B6C	# <CJK>
-0xD166	0x5BA7	# <CJK>
-0xD167	0x5BAD	# <CJK>
-0xD168	0x5BAC	# <CJK>
-0xD169	0x5C03	# <CJK>
-0xD16A	0x5C56	# <CJK>
-0xD16B	0x5C54	# <CJK>
-0xD16C	0x5CEC	# <CJK>
-0xD16D	0x5CFF	# <CJK>
-0xD16E	0x5CEE	# <CJK>
-0xD16F	0x5CF1	# <CJK>
-0xD170	0x5CF7	# <CJK>
-0xD171	0x5D00	# <CJK>
-0xD172	0x5CF9	# <CJK>
-0xD173	0x5E29	# <CJK>
-0xD174	0x5E28	# <CJK>
-0xD175	0x5EA8	# <CJK>
-0xD176	0x5EAE	# <CJK>
-0xD177	0x5EAA	# <CJK>
-0xD178	0x5EAC	# <CJK>
-0xD179	0x5F33	# <CJK>
-0xD17A	0x5F30	# <CJK>
-0xD17B	0x5F67	# <CJK>
-0xD17C	0x605D	# <CJK>
-0xD17D	0x605A	# <CJK>
-0xD17E	0x6067	# <CJK>
-0xD1A1	0x6041	# <CJK>
-0xD1A2	0x60A2	# <CJK>
-0xD1A3	0x6088	# <CJK>
-0xD1A4	0x6080	# <CJK>
-0xD1A5	0x6092	# <CJK>
-0xD1A6	0x6081	# <CJK>
-0xD1A7	0x609D	# <CJK>
-0xD1A8	0x6083	# <CJK>
-0xD1A9	0x6095	# <CJK>
-0xD1AA	0x609B	# <CJK>
-0xD1AB	0x6097	# <CJK>
-0xD1AC	0x6087	# <CJK>
-0xD1AD	0x609C	# <CJK>
-0xD1AE	0x608E	# <CJK>
-0xD1AF	0x6219	# <CJK>
-0xD1B0	0x6246	# <CJK>
-0xD1B1	0x62F2	# <CJK>
-0xD1B2	0x6310	# <CJK>
-0xD1B3	0x6356	# <CJK>
-0xD1B4	0x632C	# <CJK>
-0xD1B5	0x6344	# <CJK>
-0xD1B6	0x6345	# <CJK>
-0xD1B7	0x6336	# <CJK>
-0xD1B8	0x6343	# <CJK>
-0xD1B9	0x63E4	# <CJK>
-0xD1BA	0x6339	# <CJK>
-0xD1BB	0x634B	# <CJK>
-0xD1BC	0x634A	# <CJK>
-0xD1BD	0x633C	# <CJK>
-0xD1BE	0x6329	# <CJK>
-0xD1BF	0x6341	# <CJK>
-0xD1C0	0x6334	# <CJK>
-0xD1C1	0x6358	# <CJK>
-0xD1C2	0x6354	# <CJK>
-0xD1C3	0x6359	# <CJK>
-0xD1C4	0x632D	# <CJK>
-0xD1C5	0x6347	# <CJK>
-0xD1C6	0x6333	# <CJK>
-0xD1C7	0x635A	# <CJK>
-0xD1C8	0x6351	# <CJK>
-0xD1C9	0x6338	# <CJK>
-0xD1CA	0x6357	# <CJK>
-0xD1CB	0x6340	# <CJK>
-0xD1CC	0x6348	# <CJK>
-0xD1CD	0x654A	# <CJK>
-0xD1CE	0x6546	# <CJK>
-0xD1CF	0x65C6	# <CJK>
-0xD1D0	0x65C3	# <CJK>
-0xD1D1	0x65C4	# <CJK>
-0xD1D2	0x65C2	# <CJK>
-0xD1D3	0x664A	# <CJK>
-0xD1D4	0x665F	# <CJK>
-0xD1D5	0x6647	# <CJK>
-0xD1D6	0x6651	# <CJK>
-0xD1D7	0x6712	# <CJK>
-0xD1D8	0x6713	# <CJK>
-0xD1D9	0x681F	# <CJK>
-0xD1DA	0x681A	# <CJK>
-0xD1DB	0x6849	# <CJK>
-0xD1DC	0x6832	# <CJK>
-0xD1DD	0x6833	# <CJK>
-0xD1DE	0x683B	# <CJK>
-0xD1DF	0x684B	# <CJK>
-0xD1E0	0x684F	# <CJK>
-0xD1E1	0x6816	# <CJK>
-0xD1E2	0x6831	# <CJK>
-0xD1E3	0x681C	# <CJK>
-0xD1E4	0x6835	# <CJK>
-0xD1E5	0x682B	# <CJK>
-0xD1E6	0x682D	# <CJK>
-0xD1E7	0x682F	# <CJK>
-0xD1E8	0x684E	# <CJK>
-0xD1E9	0x6844	# <CJK>
-0xD1EA	0x6834	# <CJK>
-0xD1EB	0x681D	# <CJK>
-0xD1EC	0x6812	# <CJK>
-0xD1ED	0x6814	# <CJK>
-0xD1EE	0x6826	# <CJK>
-0xD1EF	0x6828	# <CJK>
-0xD1F0	0x682E	# <CJK>
-0xD1F1	0x684D	# <CJK>
-0xD1F2	0x683A	# <CJK>
-0xD1F3	0x6825	# <CJK>
-0xD1F4	0x6820	# <CJK>
-0xD1F5	0x6B2C	# <CJK>
-0xD1F6	0x6B2F	# <CJK>
-0xD1F7	0x6B2D	# <CJK>
-0xD1F8	0x6B31	# <CJK>
-0xD1F9	0x6B34	# <CJK>
-0xD1FA	0x6B6D	# <CJK>
-0xD1FB	0x8082	# <CJK>
-0xD1FC	0x6B88	# <CJK>
-0xD1FD	0x6BE6	# <CJK>
-0xD1FE	0x6BE4	# <CJK>
-0xD240	0x6BE8	# <CJK>
-0xD241	0x6BE3	# <CJK>
-0xD242	0x6BE2	# <CJK>
-0xD243	0x6BE7	# <CJK>
-0xD244	0x6C25	# <CJK>
-0xD245	0x6D7A	# <CJK>
-0xD246	0x6D63	# <CJK>
-0xD247	0x6D64	# <CJK>
-0xD248	0x6D76	# <CJK>
-0xD249	0x6D0D	# <CJK>
-0xD24A	0x6D61	# <CJK>
-0xD24B	0x6D92	# <CJK>
-0xD24C	0x6D58	# <CJK>
-0xD24D	0x6D62	# <CJK>
-0xD24E	0x6D6D	# <CJK>
-0xD24F	0x6D6F	# <CJK>
-0xD250	0x6D91	# <CJK>
-0xD251	0x6D8D	# <CJK>
-0xD252	0x6DEF	# <CJK>
-0xD253	0x6D7F	# <CJK>
-0xD254	0x6D86	# <CJK>
-0xD255	0x6D5E	# <CJK>
-0xD256	0x6D67	# <CJK>
-0xD257	0x6D60	# <CJK>
-0xD258	0x6D97	# <CJK>
-0xD259	0x6D70	# <CJK>
-0xD25A	0x6D7C	# <CJK>
-0xD25B	0x6D5F	# <CJK>
-0xD25C	0x6D82	# <CJK>
-0xD25D	0x6D98	# <CJK>
-0xD25E	0x6D2F	# <CJK>
-0xD25F	0x6D68	# <CJK>
-0xD260	0x6D8B	# <CJK>
-0xD261	0x6D7E	# <CJK>
-0xD262	0x6D80	# <CJK>
-0xD263	0x6D84	# <CJK>
-0xD264	0x6D16	# <CJK>
-0xD265	0x6D83	# <CJK>
-0xD266	0x6D7B	# <CJK>
-0xD267	0x6D7D	# <CJK>
-0xD268	0x6D75	# <CJK>
-0xD269	0x6D90	# <CJK>
-0xD26A	0x70DC	# <CJK>
-0xD26B	0x70D3	# <CJK>
-0xD26C	0x70D1	# <CJK>
-0xD26D	0x70DD	# <CJK>
-0xD26E	0x70CB	# <CJK>
-0xD26F	0x7F39	# <CJK>
-0xD270	0x70E2	# <CJK>
-0xD271	0x70D7	# <CJK>
-0xD272	0x70D2	# <CJK>
-0xD273	0x70DE	# <CJK>
-0xD274	0x70E0	# <CJK>
-0xD275	0x70D4	# <CJK>
-0xD276	0x70CD	# <CJK>
-0xD277	0x70C5	# <CJK>
-0xD278	0x70C6	# <CJK>
-0xD279	0x70C7	# <CJK>
-0xD27A	0x70DA	# <CJK>
-0xD27B	0x70CE	# <CJK>
-0xD27C	0x70E1	# <CJK>
-0xD27D	0x7242	# <CJK>
-0xD27E	0x7278	# <CJK>
-0xD2A1	0x7277	# <CJK>
-0xD2A2	0x7276	# <CJK>
-0xD2A3	0x7300	# <CJK>
-0xD2A4	0x72FA	# <CJK>
-0xD2A5	0x72F4	# <CJK>
-0xD2A6	0x72FE	# <CJK>
-0xD2A7	0x72F6	# <CJK>
-0xD2A8	0x72F3	# <CJK>
-0xD2A9	0x72FB	# <CJK>
-0xD2AA	0x7301	# <CJK>
-0xD2AB	0x73D3	# <CJK>
-0xD2AC	0x73D9	# <CJK>
-0xD2AD	0x73E5	# <CJK>
-0xD2AE	0x73D6	# <CJK>
-0xD2AF	0x73BC	# <CJK>
-0xD2B0	0x73E7	# <CJK>
-0xD2B1	0x73E3	# <CJK>
-0xD2B2	0x73E9	# <CJK>
-0xD2B3	0x73DC	# <CJK>
-0xD2B4	0x73D2	# <CJK>
-0xD2B5	0x73DB	# <CJK>
-0xD2B6	0x73D4	# <CJK>
-0xD2B7	0x73DD	# <CJK>
-0xD2B8	0x73DA	# <CJK>
-0xD2B9	0x73D7	# <CJK>
-0xD2BA	0x73D8	# <CJK>
-0xD2BB	0x73E8	# <CJK>
-0xD2BC	0x74DE	# <CJK>
-0xD2BD	0x74DF	# <CJK>
-0xD2BE	0x74F4	# <CJK>
-0xD2BF	0x74F5	# <CJK>
-0xD2C0	0x7521	# <CJK>
-0xD2C1	0x755B	# <CJK>
-0xD2C2	0x755F	# <CJK>
-0xD2C3	0x75B0	# <CJK>
-0xD2C4	0x75C1	# <CJK>
-0xD2C5	0x75BB	# <CJK>
-0xD2C6	0x75C4	# <CJK>
-0xD2C7	0x75C0	# <CJK>
-0xD2C8	0x75BF	# <CJK>
-0xD2C9	0x75B6	# <CJK>
-0xD2CA	0x75BA	# <CJK>
-0xD2CB	0x768A	# <CJK>
-0xD2CC	0x76C9	# <CJK>
-0xD2CD	0x771D	# <CJK>
-0xD2CE	0x771B	# <CJK>
-0xD2CF	0x7710	# <CJK>
-0xD2D0	0x7713	# <CJK>
-0xD2D1	0x7712	# <CJK>
-0xD2D2	0x7723	# <CJK>
-0xD2D3	0x7711	# <CJK>
-0xD2D4	0x7715	# <CJK>
-0xD2D5	0x7719	# <CJK>
-0xD2D6	0x771A	# <CJK>
-0xD2D7	0x7722	# <CJK>
-0xD2D8	0x7727	# <CJK>
-0xD2D9	0x7823	# <CJK>
-0xD2DA	0x782C	# <CJK>
-0xD2DB	0x7822	# <CJK>
-0xD2DC	0x7835	# <CJK>
-0xD2DD	0x782F	# <CJK>
-0xD2DE	0x7828	# <CJK>
-0xD2DF	0x782E	# <CJK>
-0xD2E0	0x782B	# <CJK>
-0xD2E1	0x7821	# <CJK>
-0xD2E2	0x7829	# <CJK>
-0xD2E3	0x7833	# <CJK>
-0xD2E4	0x782A	# <CJK>
-0xD2E5	0x7831	# <CJK>
-0xD2E6	0x7954	# <CJK>
-0xD2E7	0x795B	# <CJK>
-0xD2E8	0x794F	# <CJK>
-0xD2E9	0x795C	# <CJK>
-0xD2EA	0x7953	# <CJK>
-0xD2EB	0x7952	# <CJK>
-0xD2EC	0x7951	# <CJK>
-0xD2ED	0x79EB	# <CJK>
-0xD2EE	0x79EC	# <CJK>
-0xD2EF	0x79E0	# <CJK>
-0xD2F0	0x79EE	# <CJK>
-0xD2F1	0x79ED	# <CJK>
-0xD2F2	0x79EA	# <CJK>
-0xD2F3	0x79DC	# <CJK>
-0xD2F4	0x79DE	# <CJK>
-0xD2F5	0x79DD	# <CJK>
-0xD2F6	0x7A86	# <CJK>
-0xD2F7	0x7A89	# <CJK>
-0xD2F8	0x7A85	# <CJK>
-0xD2F9	0x7A8B	# <CJK>
-0xD2FA	0x7A8C	# <CJK>
-0xD2FB	0x7A8A	# <CJK>
-0xD2FC	0x7A87	# <CJK>
-0xD2FD	0x7AD8	# <CJK>
-0xD2FE	0x7B10	# <CJK>
-0xD340	0x7B04	# <CJK>
-0xD341	0x7B13	# <CJK>
-0xD342	0x7B05	# <CJK>
-0xD343	0x7B0F	# <CJK>
-0xD344	0x7B08	# <CJK>
-0xD345	0x7B0A	# <CJK>
-0xD346	0x7B0E	# <CJK>
-0xD347	0x7B09	# <CJK>
-0xD348	0x7B12	# <CJK>
-0xD349	0x7C84	# <CJK>
-0xD34A	0x7C91	# <CJK>
-0xD34B	0x7C8A	# <CJK>
-0xD34C	0x7C8C	# <CJK>
-0xD34D	0x7C88	# <CJK>
-0xD34E	0x7C8D	# <CJK>
-0xD34F	0x7C85	# <CJK>
-0xD350	0x7D1E	# <CJK>
-0xD351	0x7D1D	# <CJK>
-0xD352	0x7D11	# <CJK>
-0xD353	0x7D0E	# <CJK>
-0xD354	0x7D18	# <CJK>
-0xD355	0x7D16	# <CJK>
-0xD356	0x7D13	# <CJK>
-0xD357	0x7D1F	# <CJK>
-0xD358	0x7D12	# <CJK>
-0xD359	0x7D0F	# <CJK>
-0xD35A	0x7D0C	# <CJK>
-0xD35B	0x7F5C	# <CJK>
-0xD35C	0x7F61	# <CJK>
-0xD35D	0x7F5E	# <CJK>
-0xD35E	0x7F60	# <CJK>
-0xD35F	0x7F5D	# <CJK>
-0xD360	0x7F5B	# <CJK>
-0xD361	0x7F96	# <CJK>
-0xD362	0x7F92	# <CJK>
-0xD363	0x7FC3	# <CJK>
-0xD364	0x7FC2	# <CJK>
-0xD365	0x7FC0	# <CJK>
-0xD366	0x8016	# <CJK>
-0xD367	0x803E	# <CJK>
-0xD368	0x8039	# <CJK>
-0xD369	0x80FA	# <CJK>
-0xD36A	0x80F2	# <CJK>
-0xD36B	0x80F9	# <CJK>
-0xD36C	0x80F5	# <CJK>
-0xD36D	0x8101	# <CJK>
-0xD36E	0x80FB	# <CJK>
-0xD36F	0x8100	# <CJK>
-0xD370	0x8201	# <CJK>
-0xD371	0x822F	# <CJK>
-0xD372	0x8225	# <CJK>
-0xD373	0x8333	# <CJK>
-0xD374	0x832D	# <CJK>
-0xD375	0x8344	# <CJK>
-0xD376	0x8319	# <CJK>
-0xD377	0x8351	# <CJK>
-0xD378	0x8325	# <CJK>
-0xD379	0x8356	# <CJK>
-0xD37A	0x833F	# <CJK>
-0xD37B	0x8341	# <CJK>
-0xD37C	0x8326	# <CJK>
-0xD37D	0x831C	# <CJK>
-0xD37E	0x8322	# <CJK>
-0xD3A1	0x8342	# <CJK>
-0xD3A2	0x834E	# <CJK>
-0xD3A3	0x831B	# <CJK>
-0xD3A4	0x832A	# <CJK>
-0xD3A5	0x8308	# <CJK>
-0xD3A6	0x833C	# <CJK>
-0xD3A7	0x834D	# <CJK>
-0xD3A8	0x8316	# <CJK>
-0xD3A9	0x8324	# <CJK>
-0xD3AA	0x8320	# <CJK>
-0xD3AB	0x8337	# <CJK>
-0xD3AC	0x832F	# <CJK>
-0xD3AD	0x8329	# <CJK>
-0xD3AE	0x8347	# <CJK>
-0xD3AF	0x8345	# <CJK>
-0xD3B0	0x834C	# <CJK>
-0xD3B1	0x8353	# <CJK>
-0xD3B2	0x831E	# <CJK>
-0xD3B3	0x832C	# <CJK>
-0xD3B4	0x834B	# <CJK>
-0xD3B5	0x8327	# <CJK>
-0xD3B6	0x8348	# <CJK>
-0xD3B7	0x8653	# <CJK>
-0xD3B8	0x8652	# <CJK>
-0xD3B9	0x86A2	# <CJK>
-0xD3BA	0x86A8	# <CJK>
-0xD3BB	0x8696	# <CJK>
-0xD3BC	0x868D	# <CJK>
-0xD3BD	0x8691	# <CJK>
-0xD3BE	0x869E	# <CJK>
-0xD3BF	0x8687	# <CJK>
-0xD3C0	0x8697	# <CJK>
-0xD3C1	0x8686	# <CJK>
-0xD3C2	0x868B	# <CJK>
-0xD3C3	0x869A	# <CJK>
-0xD3C4	0x8685	# <CJK>
-0xD3C5	0x86A5	# <CJK>
-0xD3C6	0x8699	# <CJK>
-0xD3C7	0x86A1	# <CJK>
-0xD3C8	0x86A7	# <CJK>
-0xD3C9	0x8695	# <CJK>
-0xD3CA	0x8698	# <CJK>
-0xD3CB	0x868E	# <CJK>
-0xD3CC	0x869D	# <CJK>
-0xD3CD	0x8690	# <CJK>
-0xD3CE	0x8694	# <CJK>
-0xD3CF	0x8843	# <CJK>
-0xD3D0	0x8844	# <CJK>
-0xD3D1	0x886D	# <CJK>
-0xD3D2	0x8875	# <CJK>
-0xD3D3	0x8876	# <CJK>
-0xD3D4	0x8872	# <CJK>
-0xD3D5	0x8880	# <CJK>
-0xD3D6	0x8871	# <CJK>
-0xD3D7	0x887F	# <CJK>
-0xD3D8	0x886F	# <CJK>
-0xD3D9	0x8883	# <CJK>
-0xD3DA	0x887E	# <CJK>
-0xD3DB	0x8874	# <CJK>
-0xD3DC	0x887C	# <CJK>
-0xD3DD	0x8A12	# <CJK>
-0xD3DE	0x8C47	# <CJK>
-0xD3DF	0x8C57	# <CJK>
-0xD3E0	0x8C7B	# <CJK>
-0xD3E1	0x8CA4	# <CJK>
-0xD3E2	0x8CA3	# <CJK>
-0xD3E3	0x8D76	# <CJK>
-0xD3E4	0x8D78	# <CJK>
-0xD3E5	0x8DB5	# <CJK>
-0xD3E6	0x8DB7	# <CJK>
-0xD3E7	0x8DB6	# <CJK>
-0xD3E8	0x8ED1	# <CJK>
-0xD3E9	0x8ED3	# <CJK>
-0xD3EA	0x8FFE	# <CJK>
-0xD3EB	0x8FF5	# <CJK>
-0xD3EC	0x9002	# <CJK>
-0xD3ED	0x8FFF	# <CJK>
-0xD3EE	0x8FFB	# <CJK>
-0xD3EF	0x9004	# <CJK>
-0xD3F0	0x8FFC	# <CJK>
-0xD3F1	0x8FF6	# <CJK>
-0xD3F2	0x90D6	# <CJK>
-0xD3F3	0x90E0	# <CJK>
-0xD3F4	0x90D9	# <CJK>
-0xD3F5	0x90DA	# <CJK>
-0xD3F6	0x90E3	# <CJK>
-0xD3F7	0x90DF	# <CJK>
-0xD3F8	0x90E5	# <CJK>
-0xD3F9	0x90D8	# <CJK>
-0xD3FA	0x90DB	# <CJK>
-0xD3FB	0x90D7	# <CJK>
-0xD3FC	0x90DC	# <CJK>
-0xD3FD	0x90E4	# <CJK>
-0xD3FE	0x9150	# <CJK>
-0xD440	0x914E	# <CJK>
-0xD441	0x914F	# <CJK>
-0xD442	0x91D5	# <CJK>
-0xD443	0x91E2	# <CJK>
-0xD444	0x91DA	# <CJK>
-0xD445	0x965C	# <CJK>
-0xD446	0x965F	# <CJK>
-0xD447	0x96BC	# <CJK>
-0xD448	0x98E3	# <CJK>
-0xD449	0x9ADF	# <CJK>
-0xD44A	0x9B2F	# <CJK>
-0xD44B	0x4E7F	# <CJK>
-0xD44C	0x5070	# <CJK>
-0xD44D	0x506A	# <CJK>
-0xD44E	0x5061	# <CJK>
-0xD44F	0x505E	# <CJK>
-0xD450	0x5060	# <CJK>
-0xD451	0x5053	# <CJK>
-0xD452	0x504B	# <CJK>
-0xD453	0x505D	# <CJK>
-0xD454	0x5072	# <CJK>
-0xD455	0x5048	# <CJK>
-0xD456	0x504D	# <CJK>
-0xD457	0x5041	# <CJK>
-0xD458	0x505B	# <CJK>
-0xD459	0x504A	# <CJK>
-0xD45A	0x5062	# <CJK>
-0xD45B	0x5015	# <CJK>
-0xD45C	0x5045	# <CJK>
-0xD45D	0x505F	# <CJK>
-0xD45E	0x5069	# <CJK>
-0xD45F	0x506B	# <CJK>
-0xD460	0x5063	# <CJK>
-0xD461	0x5064	# <CJK>
-0xD462	0x5046	# <CJK>
-0xD463	0x5040	# <CJK>
-0xD464	0x506E	# <CJK>
-0xD465	0x5073	# <CJK>
-0xD466	0x5057	# <CJK>
-0xD467	0x5051	# <CJK>
-0xD468	0x51D0	# <CJK>
-0xD469	0x526B	# <CJK>
-0xD46A	0x526D	# <CJK>
-0xD46B	0x526C	# <CJK>
-0xD46C	0x526E	# <CJK>
-0xD46D	0x52D6	# <CJK>
-0xD46E	0x52D3	# <CJK>
-0xD46F	0x532D	# <CJK>
-0xD470	0x539C	# <CJK>
-0xD471	0x5575	# <CJK>
-0xD472	0x5576	# <CJK>
-0xD473	0x553C	# <CJK>
-0xD474	0x554D	# <CJK>
-0xD475	0x5550	# <CJK>
-0xD476	0x5534	# <CJK>
-0xD477	0x552A	# <CJK>
-0xD478	0x5551	# <CJK>
-0xD479	0x5562	# <CJK>
-0xD47A	0x5536	# <CJK>
-0xD47B	0x5535	# <CJK>
-0xD47C	0x5530	# <CJK>
-0xD47D	0x5552	# <CJK>
-0xD47E	0x5545	# <CJK>
-0xD4A1	0x550C	# <CJK>
-0xD4A2	0x5532	# <CJK>
-0xD4A3	0x5565	# <CJK>
-0xD4A4	0x554E	# <CJK>
-0xD4A5	0x5539	# <CJK>
-0xD4A6	0x5548	# <CJK>
-0xD4A7	0x552D	# <CJK>
-0xD4A8	0x553B	# <CJK>
-0xD4A9	0x5540	# <CJK>
-0xD4AA	0x554B	# <CJK>
-0xD4AB	0x570A	# <CJK>
-0xD4AC	0x5707	# <CJK>
-0xD4AD	0x57FB	# <CJK>
-0xD4AE	0x5814	# <CJK>
-0xD4AF	0x57E2	# <CJK>
-0xD4B0	0x57F6	# <CJK>
-0xD4B1	0x57DC	# <CJK>
-0xD4B2	0x57F4	# <CJK>
-0xD4B3	0x5800	# <CJK>
-0xD4B4	0x57ED	# <CJK>
-0xD4B5	0x57FD	# <CJK>
-0xD4B6	0x5808	# <CJK>
-0xD4B7	0x57F8	# <CJK>
-0xD4B8	0x580B	# <CJK>
-0xD4B9	0x57F3	# <CJK>
-0xD4BA	0x57CF	# <CJK>
-0xD4BB	0x5807	# <CJK>
-0xD4BC	0x57EE	# <CJK>
-0xD4BD	0x57E3	# <CJK>
-0xD4BE	0x57F2	# <CJK>
-0xD4BF	0x57E5	# <CJK>
-0xD4C0	0x57EC	# <CJK>
-0xD4C1	0x57E1	# <CJK>
-0xD4C2	0x580E	# <CJK>
-0xD4C3	0x57FC	# <CJK>
-0xD4C4	0x5810	# <CJK>
-0xD4C5	0x57E7	# <CJK>
-0xD4C6	0x5801	# <CJK>
-0xD4C7	0x580C	# <CJK>
-0xD4C8	0x57F1	# <CJK>
-0xD4C9	0x57E9	# <CJK>
-0xD4CA	0x57F0	# <CJK>
-0xD4CB	0x580D	# <CJK>
-0xD4CC	0x5804	# <CJK>
-0xD4CD	0x595C	# <CJK>
-0xD4CE	0x5A60	# <CJK>
-0xD4CF	0x5A58	# <CJK>
-0xD4D0	0x5A55	# <CJK>
-0xD4D1	0x5A67	# <CJK>
-0xD4D2	0x5A5E	# <CJK>
-0xD4D3	0x5A38	# <CJK>
-0xD4D4	0x5A35	# <CJK>
-0xD4D5	0x5A6D	# <CJK>
-0xD4D6	0x5A50	# <CJK>
-0xD4D7	0x5A5F	# <CJK>
-0xD4D8	0x5A65	# <CJK>
-0xD4D9	0x5A6C	# <CJK>
-0xD4DA	0x5A53	# <CJK>
-0xD4DB	0x5A64	# <CJK>
-0xD4DC	0x5A57	# <CJK>
-0xD4DD	0x5A43	# <CJK>
-0xD4DE	0x5A5D	# <CJK>
-0xD4DF	0x5A52	# <CJK>
-0xD4E0	0x5A44	# <CJK>
-0xD4E1	0x5A5B	# <CJK>
-0xD4E2	0x5A48	# <CJK>
-0xD4E3	0x5A8E	# <CJK>
-0xD4E4	0x5A3E	# <CJK>
-0xD4E5	0x5A4D	# <CJK>
-0xD4E6	0x5A39	# <CJK>
-0xD4E7	0x5A4C	# <CJK>
-0xD4E8	0x5A70	# <CJK>
-0xD4E9	0x5A69	# <CJK>
-0xD4EA	0x5A47	# <CJK>
-0xD4EB	0x5A51	# <CJK>
-0xD4EC	0x5A56	# <CJK>
-0xD4ED	0x5A42	# <CJK>
-0xD4EE	0x5A5C	# <CJK>
-0xD4EF	0x5B72	# <CJK>
-0xD4F0	0x5B6E	# <CJK>
-0xD4F1	0x5BC1	# <CJK>
-0xD4F2	0x5BC0	# <CJK>
-0xD4F3	0x5C59	# <CJK>
-0xD4F4	0x5D1E	# <CJK>
-0xD4F5	0x5D0B	# <CJK>
-0xD4F6	0x5D1D	# <CJK>
-0xD4F7	0x5D1A	# <CJK>
-0xD4F8	0x5D20	# <CJK>
-0xD4F9	0x5D0C	# <CJK>
-0xD4FA	0x5D28	# <CJK>
-0xD4FB	0x5D0D	# <CJK>
-0xD4FC	0x5D26	# <CJK>
-0xD4FD	0x5D25	# <CJK>
-0xD4FE	0x5D0F	# <CJK>
-0xD540	0x5D30	# <CJK>
-0xD541	0x5D12	# <CJK>
-0xD542	0x5D23	# <CJK>
-0xD543	0x5D1F	# <CJK>
-0xD544	0x5D2E	# <CJK>
-0xD545	0x5E3E	# <CJK>
-0xD546	0x5E34	# <CJK>
-0xD547	0x5EB1	# <CJK>
-0xD548	0x5EB4	# <CJK>
-0xD549	0x5EB9	# <CJK>
-0xD54A	0x5EB2	# <CJK>
-0xD54B	0x5EB3	# <CJK>
-0xD54C	0x5F36	# <CJK>
-0xD54D	0x5F38	# <CJK>
-0xD54E	0x5F9B	# <CJK>
-0xD54F	0x5F96	# <CJK>
-0xD550	0x5F9F	# <CJK>
-0xD551	0x608A	# <CJK>
-0xD552	0x6090	# <CJK>
-0xD553	0x6086	# <CJK>
-0xD554	0x60BE	# <CJK>
-0xD555	0x60B0	# <CJK>
-0xD556	0x60BA	# <CJK>
-0xD557	0x60D3	# <CJK>
-0xD558	0x60D4	# <CJK>
-0xD559	0x60CF	# <CJK>
-0xD55A	0x60E4	# <CJK>
-0xD55B	0x60D9	# <CJK>
-0xD55C	0x60DD	# <CJK>
-0xD55D	0x60C8	# <CJK>
-0xD55E	0x60B1	# <CJK>
-0xD55F	0x60DB	# <CJK>
-0xD560	0x60B7	# <CJK>
-0xD561	0x60CA	# <CJK>
-0xD562	0x60BF	# <CJK>
-0xD563	0x60C3	# <CJK>
-0xD564	0x60CD	# <CJK>
-0xD565	0x60C0	# <CJK>
-0xD566	0x6332	# <CJK>
-0xD567	0x6365	# <CJK>
-0xD568	0x638A	# <CJK>
-0xD569	0x6382	# <CJK>
-0xD56A	0x637D	# <CJK>
-0xD56B	0x63BD	# <CJK>
-0xD56C	0x639E	# <CJK>
-0xD56D	0x63AD	# <CJK>
-0xD56E	0x639D	# <CJK>
-0xD56F	0x6397	# <CJK>
-0xD570	0x63AB	# <CJK>
-0xD571	0x638E	# <CJK>
-0xD572	0x636F	# <CJK>
-0xD573	0x6387	# <CJK>
-0xD574	0x6390	# <CJK>
-0xD575	0x636E	# <CJK>
-0xD576	0x63AF	# <CJK>
-0xD577	0x6375	# <CJK>
-0xD578	0x639C	# <CJK>
-0xD579	0x636D	# <CJK>
-0xD57A	0x63AE	# <CJK>
-0xD57B	0x637C	# <CJK>
-0xD57C	0x63A4	# <CJK>
-0xD57D	0x633B	# <CJK>
-0xD57E	0x639F	# <CJK>
-0xD5A1	0x6378	# <CJK>
-0xD5A2	0x6385	# <CJK>
-0xD5A3	0x6381	# <CJK>
-0xD5A4	0x6391	# <CJK>
-0xD5A5	0x638D	# <CJK>
-0xD5A6	0x6370	# <CJK>
-0xD5A7	0x6553	# <CJK>
-0xD5A8	0x65CD	# <CJK>
-0xD5A9	0x6665	# <CJK>
-0xD5AA	0x6661	# <CJK>
-0xD5AB	0x665B	# <CJK>
-0xD5AC	0x6659	# <CJK>
-0xD5AD	0x665C	# <CJK>
-0xD5AE	0x6662	# <CJK>
-0xD5AF	0x6718	# <CJK>
-0xD5B0	0x6879	# <CJK>
-0xD5B1	0x6887	# <CJK>
-0xD5B2	0x6890	# <CJK>
-0xD5B3	0x689C	# <CJK>
-0xD5B4	0x686D	# <CJK>
-0xD5B5	0x686E	# <CJK>
-0xD5B6	0x68AE	# <CJK>
-0xD5B7	0x68AB	# <CJK>
-0xD5B8	0x6956	# <CJK>
-0xD5B9	0x686F	# <CJK>
-0xD5BA	0x68A3	# <CJK>
-0xD5BB	0x68AC	# <CJK>
-0xD5BC	0x68A9	# <CJK>
-0xD5BD	0x6875	# <CJK>
-0xD5BE	0x6874	# <CJK>
-0xD5BF	0x68B2	# <CJK>
-0xD5C0	0x688F	# <CJK>
-0xD5C1	0x6877	# <CJK>
-0xD5C2	0x6892	# <CJK>
-0xD5C3	0x687C	# <CJK>
-0xD5C4	0x686B	# <CJK>
-0xD5C5	0x6872	# <CJK>
-0xD5C6	0x68AA	# <CJK>
-0xD5C7	0x6880	# <CJK>
-0xD5C8	0x6871	# <CJK>
-0xD5C9	0x687E	# <CJK>
-0xD5CA	0x689B	# <CJK>
-0xD5CB	0x6896	# <CJK>
-0xD5CC	0x688B	# <CJK>
-0xD5CD	0x68A0	# <CJK>
-0xD5CE	0x6889	# <CJK>
-0xD5CF	0x68A4	# <CJK>
-0xD5D0	0x6878	# <CJK>
-0xD5D1	0x687B	# <CJK>
-0xD5D2	0x6891	# <CJK>
-0xD5D3	0x688C	# <CJK>
-0xD5D4	0x688A	# <CJK>
-0xD5D5	0x687D	# <CJK>
-0xD5D6	0x6B36	# <CJK>
-0xD5D7	0x6B33	# <CJK>
-0xD5D8	0x6B37	# <CJK>
-0xD5D9	0x6B38	# <CJK>
-0xD5DA	0x6B91	# <CJK>
-0xD5DB	0x6B8F	# <CJK>
-0xD5DC	0x6B8D	# <CJK>
-0xD5DD	0x6B8E	# <CJK>
-0xD5DE	0x6B8C	# <CJK>
-0xD5DF	0x6C2A	# <CJK>
-0xD5E0	0x6DC0	# <CJK>
-0xD5E1	0x6DAB	# <CJK>
-0xD5E2	0x6DB4	# <CJK>
-0xD5E3	0x6DB3	# <CJK>
-0xD5E4	0x6E74	# <CJK>
-0xD5E5	0x6DAC	# <CJK>
-0xD5E6	0x6DE9	# <CJK>
-0xD5E7	0x6DE2	# <CJK>
-0xD5E8	0x6DB7	# <CJK>
-0xD5E9	0x6DF6	# <CJK>
-0xD5EA	0x6DD4	# <CJK>
-0xD5EB	0x6E00	# <CJK>
-0xD5EC	0x6DC8	# <CJK>
-0xD5ED	0x6DE0	# <CJK>
-0xD5EE	0x6DDF	# <CJK>
-0xD5EF	0x6DD6	# <CJK>
-0xD5F0	0x6DBE	# <CJK>
-0xD5F1	0x6DE5	# <CJK>
-0xD5F2	0x6DDC	# <CJK>
-0xD5F3	0x6DDD	# <CJK>
-0xD5F4	0x6DDB	# <CJK>
-0xD5F5	0x6DF4	# <CJK>
-0xD5F6	0x6DCA	# <CJK>
-0xD5F7	0x6DBD	# <CJK>
-0xD5F8	0x6DED	# <CJK>
-0xD5F9	0x6DF0	# <CJK>
-0xD5FA	0x6DBA	# <CJK>
-0xD5FB	0x6DD5	# <CJK>
-0xD5FC	0x6DC2	# <CJK>
-0xD5FD	0x6DCF	# <CJK>
-0xD5FE	0x6DC9	# <CJK>
-0xD640	0x6DD0	# <CJK>
-0xD641	0x6DF2	# <CJK>
-0xD642	0x6DD3	# <CJK>
-0xD643	0x6DFD	# <CJK>
-0xD644	0x6DD7	# <CJK>
-0xD645	0x6DCD	# <CJK>
-0xD646	0x6DE3	# <CJK>
-0xD647	0x6DBB	# <CJK>
-0xD648	0x70FA	# <CJK>
-0xD649	0x710D	# <CJK>
-0xD64A	0x70F7	# <CJK>
-0xD64B	0x7117	# <CJK>
-0xD64C	0x70F4	# <CJK>
-0xD64D	0x710C	# <CJK>
-0xD64E	0x70F0	# <CJK>
-0xD64F	0x7104	# <CJK>
-0xD650	0x70F3	# <CJK>
-0xD651	0x7110	# <CJK>
-0xD652	0x70FC	# <CJK>
-0xD653	0x70FF	# <CJK>
-0xD654	0x7106	# <CJK>
-0xD655	0x7113	# <CJK>
-0xD656	0x7100	# <CJK>
-0xD657	0x70F8	# <CJK>
-0xD658	0x70F6	# <CJK>
-0xD659	0x710B	# <CJK>
-0xD65A	0x7102	# <CJK>
-0xD65B	0x710E	# <CJK>
-0xD65C	0x727E	# <CJK>
-0xD65D	0x727B	# <CJK>
-0xD65E	0x727C	# <CJK>
-0xD65F	0x727F	# <CJK>
-0xD660	0x731D	# <CJK>
-0xD661	0x7317	# <CJK>
-0xD662	0x7307	# <CJK>
-0xD663	0x7311	# <CJK>
-0xD664	0x7318	# <CJK>
-0xD665	0x730A	# <CJK>
-0xD666	0x7308	# <CJK>
-0xD667	0x72FF	# <CJK>
-0xD668	0x730F	# <CJK>
-0xD669	0x731E	# <CJK>
-0xD66A	0x7388	# <CJK>
-0xD66B	0x73F6	# <CJK>
-0xD66C	0x73F8	# <CJK>
-0xD66D	0x73F5	# <CJK>
-0xD66E	0x7404	# <CJK>
-0xD66F	0x7401	# <CJK>
-0xD670	0x73FD	# <CJK>
-0xD671	0x7407	# <CJK>
-0xD672	0x7400	# <CJK>
-0xD673	0x73FA	# <CJK>
-0xD674	0x73FC	# <CJK>
-0xD675	0x73FF	# <CJK>
-0xD676	0x740C	# <CJK>
-0xD677	0x740B	# <CJK>
-0xD678	0x73F4	# <CJK>
-0xD679	0x7408	# <CJK>
-0xD67A	0x7564	# <CJK>
-0xD67B	0x7563	# <CJK>
-0xD67C	0x75CE	# <CJK>
-0xD67D	0x75D2	# <CJK>
-0xD67E	0x75CF	# <CJK>
-0xD6A1	0x75CB	# <CJK>
-0xD6A2	0x75CC	# <CJK>
-0xD6A3	0x75D1	# <CJK>
-0xD6A4	0x75D0	# <CJK>
-0xD6A5	0x768F	# <CJK>
-0xD6A6	0x7689	# <CJK>
-0xD6A7	0x76D3	# <CJK>
-0xD6A8	0x7739	# <CJK>
-0xD6A9	0x772F	# <CJK>
-0xD6AA	0x772D	# <CJK>
-0xD6AB	0x7731	# <CJK>
-0xD6AC	0x7732	# <CJK>
-0xD6AD	0x7734	# <CJK>
-0xD6AE	0x7733	# <CJK>
-0xD6AF	0x773D	# <CJK>
-0xD6B0	0x7725	# <CJK>
-0xD6B1	0x773B	# <CJK>
-0xD6B2	0x7735	# <CJK>
-0xD6B3	0x7848	# <CJK>
-0xD6B4	0x7852	# <CJK>
-0xD6B5	0x7849	# <CJK>
-0xD6B6	0x784D	# <CJK>
-0xD6B7	0x784A	# <CJK>
-0xD6B8	0x784C	# <CJK>
-0xD6B9	0x7826	# <CJK>
-0xD6BA	0x7845	# <CJK>
-0xD6BB	0x7850	# <CJK>
-0xD6BC	0x7964	# <CJK>
-0xD6BD	0x7967	# <CJK>
-0xD6BE	0x7969	# <CJK>
-0xD6BF	0x796A	# <CJK>
-0xD6C0	0x7963	# <CJK>
-0xD6C1	0x796B	# <CJK>
-0xD6C2	0x7961	# <CJK>
-0xD6C3	0x79BB	# <CJK>
-0xD6C4	0x79FA	# <CJK>
-0xD6C5	0x79F8	# <CJK>
-0xD6C6	0x79F6	# <CJK>
-0xD6C7	0x79F7	# <CJK>
-0xD6C8	0x7A8F	# <CJK>
-0xD6C9	0x7A94	# <CJK>
-0xD6CA	0x7A90	# <CJK>
-0xD6CB	0x7B35	# <CJK>
-0xD6CC	0x7B47	# <CJK>
-0xD6CD	0x7B34	# <CJK>
-0xD6CE	0x7B25	# <CJK>
-0xD6CF	0x7B30	# <CJK>
-0xD6D0	0x7B22	# <CJK>
-0xD6D1	0x7B24	# <CJK>
-0xD6D2	0x7B33	# <CJK>
-0xD6D3	0x7B18	# <CJK>
-0xD6D4	0x7B2A	# <CJK>
-0xD6D5	0x7B1D	# <CJK>
-0xD6D6	0x7B31	# <CJK>
-0xD6D7	0x7B2B	# <CJK>
-0xD6D8	0x7B2D	# <CJK>
-0xD6D9	0x7B2F	# <CJK>
-0xD6DA	0x7B32	# <CJK>
-0xD6DB	0x7B38	# <CJK>
-0xD6DC	0x7B1A	# <CJK>
-0xD6DD	0x7B23	# <CJK>
-0xD6DE	0x7C94	# <CJK>
-0xD6DF	0x7C98	# <CJK>
-0xD6E0	0x7C96	# <CJK>
-0xD6E1	0x7CA3	# <CJK>
-0xD6E2	0x7D35	# <CJK>
-0xD6E3	0x7D3D	# <CJK>
-0xD6E4	0x7D38	# <CJK>
-0xD6E5	0x7D36	# <CJK>
-0xD6E6	0x7D3A	# <CJK>
-0xD6E7	0x7D45	# <CJK>
-0xD6E8	0x7D2C	# <CJK>
-0xD6E9	0x7D29	# <CJK>
-0xD6EA	0x7D41	# <CJK>
-0xD6EB	0x7D47	# <CJK>
-0xD6EC	0x7D3E	# <CJK>
-0xD6ED	0x7D3F	# <CJK>
-0xD6EE	0x7D4A	# <CJK>
-0xD6EF	0x7D3B	# <CJK>
-0xD6F0	0x7D28	# <CJK>
-0xD6F1	0x7F63	# <CJK>
-0xD6F2	0x7F95	# <CJK>
-0xD6F3	0x7F9C	# <CJK>
-0xD6F4	0x7F9D	# <CJK>
-0xD6F5	0x7F9B	# <CJK>
-0xD6F6	0x7FCA	# <CJK>
-0xD6F7	0x7FCB	# <CJK>
-0xD6F8	0x7FCD	# <CJK>
-0xD6F9	0x7FD0	# <CJK>
-0xD6FA	0x7FD1	# <CJK>
-0xD6FB	0x7FC7	# <CJK>
-0xD6FC	0x7FCF	# <CJK>
-0xD6FD	0x7FC9	# <CJK>
-0xD6FE	0x801F	# <CJK>
-0xD740	0x801E	# <CJK>
-0xD741	0x801B	# <CJK>
-0xD742	0x8047	# <CJK>
-0xD743	0x8043	# <CJK>
-0xD744	0x8048	# <CJK>
-0xD745	0x8118	# <CJK>
-0xD746	0x8125	# <CJK>
-0xD747	0x8119	# <CJK>
-0xD748	0x811B	# <CJK>
-0xD749	0x812D	# <CJK>
-0xD74A	0x811F	# <CJK>
-0xD74B	0x812C	# <CJK>
-0xD74C	0x811E	# <CJK>
-0xD74D	0x8121	# <CJK>
-0xD74E	0x8115	# <CJK>
-0xD74F	0x8127	# <CJK>
-0xD750	0x811D	# <CJK>
-0xD751	0x8122	# <CJK>
-0xD752	0x8211	# <CJK>
-0xD753	0x8238	# <CJK>
-0xD754	0x8233	# <CJK>
-0xD755	0x823A	# <CJK>
-0xD756	0x8234	# <CJK>
-0xD757	0x8232	# <CJK>
-0xD758	0x8274	# <CJK>
-0xD759	0x8390	# <CJK>
-0xD75A	0x83A3	# <CJK>
-0xD75B	0x83A8	# <CJK>
-0xD75C	0x838D	# <CJK>
-0xD75D	0x837A	# <CJK>
-0xD75E	0x8373	# <CJK>
-0xD75F	0x83A4	# <CJK>
-0xD760	0x8374	# <CJK>
-0xD761	0x838F	# <CJK>
-0xD762	0x8381	# <CJK>
-0xD763	0x8395	# <CJK>
-0xD764	0x8399	# <CJK>
-0xD765	0x8375	# <CJK>
-0xD766	0x8394	# <CJK>
-0xD767	0x83A9	# <CJK>
-0xD768	0x837D	# <CJK>
-0xD769	0x8383	# <CJK>
-0xD76A	0x838C	# <CJK>
-0xD76B	0x839D	# <CJK>
-0xD76C	0x839B	# <CJK>
-0xD76D	0x83AA	# <CJK>
-0xD76E	0x838B	# <CJK>
-0xD76F	0x837E	# <CJK>
-0xD770	0x83A5	# <CJK>
-0xD771	0x83AF	# <CJK>
-0xD772	0x8388	# <CJK>
-0xD773	0x8397	# <CJK>
-0xD774	0x83B0	# <CJK>
-0xD775	0x837F	# <CJK>
-0xD776	0x83A6	# <CJK>
-0xD777	0x8387	# <CJK>
-0xD778	0x83AE	# <CJK>
-0xD779	0x8376	# <CJK>
-0xD77A	0x839A	# <CJK>
-0xD77B	0x8659	# <CJK>
-0xD77C	0x8656	# <CJK>
-0xD77D	0x86BF	# <CJK>
-0xD77E	0x86B7	# <CJK>
-0xD7A1	0x86C2	# <CJK>
-0xD7A2	0x86C1	# <CJK>
-0xD7A3	0x86C5	# <CJK>
-0xD7A4	0x86BA	# <CJK>
-0xD7A5	0x86B0	# <CJK>
-0xD7A6	0x86C8	# <CJK>
-0xD7A7	0x86B9	# <CJK>
-0xD7A8	0x86B3	# <CJK>
-0xD7A9	0x86B8	# <CJK>
-0xD7AA	0x86CC	# <CJK>
-0xD7AB	0x86B4	# <CJK>
-0xD7AC	0x86BB	# <CJK>
-0xD7AD	0x86BC	# <CJK>
-0xD7AE	0x86C3	# <CJK>
-0xD7AF	0x86BD	# <CJK>
-0xD7B0	0x86BE	# <CJK>
-0xD7B1	0x8852	# <CJK>
-0xD7B2	0x8889	# <CJK>
-0xD7B3	0x8895	# <CJK>
-0xD7B4	0x88A8	# <CJK>
-0xD7B5	0x88A2	# <CJK>
-0xD7B6	0x88AA	# <CJK>
-0xD7B7	0x889A	# <CJK>
-0xD7B8	0x8891	# <CJK>
-0xD7B9	0x88A1	# <CJK>
-0xD7BA	0x889F	# <CJK>
-0xD7BB	0x8898	# <CJK>
-0xD7BC	0x88A7	# <CJK>
-0xD7BD	0x8899	# <CJK>
-0xD7BE	0x889B	# <CJK>
-0xD7BF	0x8897	# <CJK>
-0xD7C0	0x88A4	# <CJK>
-0xD7C1	0x88AC	# <CJK>
-0xD7C2	0x888C	# <CJK>
-0xD7C3	0x8893	# <CJK>
-0xD7C4	0x888E	# <CJK>
-0xD7C5	0x8982	# <CJK>
-0xD7C6	0x89D6	# <CJK>
-0xD7C7	0x89D9	# <CJK>
-0xD7C8	0x89D5	# <CJK>
-0xD7C9	0x8A30	# <CJK>
-0xD7CA	0x8A27	# <CJK>
-0xD7CB	0x8A2C	# <CJK>
-0xD7CC	0x8A1E	# <CJK>
-0xD7CD	0x8C39	# <CJK>
-0xD7CE	0x8C3B	# <CJK>
-0xD7CF	0x8C5C	# <CJK>
-0xD7D0	0x8C5D	# <CJK>
-0xD7D1	0x8C7D	# <CJK>
-0xD7D2	0x8CA5	# <CJK>
-0xD7D3	0x8D7D	# <CJK>
-0xD7D4	0x8D7B	# <CJK>
-0xD7D5	0x8D79	# <CJK>
-0xD7D6	0x8DBC	# <CJK>
-0xD7D7	0x8DC2	# <CJK>
-0xD7D8	0x8DB9	# <CJK>
-0xD7D9	0x8DBF	# <CJK>
-0xD7DA	0x8DC1	# <CJK>
-0xD7DB	0x8ED8	# <CJK>
-0xD7DC	0x8EDE	# <CJK>
-0xD7DD	0x8EDD	# <CJK>
-0xD7DE	0x8EDC	# <CJK>
-0xD7DF	0x8ED7	# <CJK>
-0xD7E0	0x8EE0	# <CJK>
-0xD7E1	0x8EE1	# <CJK>
-0xD7E2	0x9024	# <CJK>
-0xD7E3	0x900B	# <CJK>
-0xD7E4	0x9011	# <CJK>
-0xD7E5	0x901C	# <CJK>
-0xD7E6	0x900C	# <CJK>
-0xD7E7	0x9021	# <CJK>
-0xD7E8	0x90EF	# <CJK>
-0xD7E9	0x90EA	# <CJK>
-0xD7EA	0x90F0	# <CJK>
-0xD7EB	0x90F4	# <CJK>
-0xD7EC	0x90F2	# <CJK>
-0xD7ED	0x90F3	# <CJK>
-0xD7EE	0x90D4	# <CJK>
-0xD7EF	0x90EB	# <CJK>
-0xD7F0	0x90EC	# <CJK>
-0xD7F1	0x90E9	# <CJK>
-0xD7F2	0x9156	# <CJK>
-0xD7F3	0x9158	# <CJK>
-0xD7F4	0x915A	# <CJK>
-0xD7F5	0x9153	# <CJK>
-0xD7F6	0x9155	# <CJK>
-0xD7F7	0x91EC	# <CJK>
-0xD7F8	0x91F4	# <CJK>
-0xD7F9	0x91F1	# <CJK>
-0xD7FA	0x91F3	# <CJK>
-0xD7FB	0x91F8	# <CJK>
-0xD7FC	0x91E4	# <CJK>
-0xD7FD	0x91F9	# <CJK>
-0xD7FE	0x91EA	# <CJK>
-0xD840	0x91EB	# <CJK>
-0xD841	0x91F7	# <CJK>
-0xD842	0x91E8	# <CJK>
-0xD843	0x91EE	# <CJK>
-0xD844	0x957A	# <CJK>
-0xD845	0x9586	# <CJK>
-0xD846	0x9588	# <CJK>
-0xD847	0x967C	# <CJK>
-0xD848	0x966D	# <CJK>
-0xD849	0x966B	# <CJK>
-0xD84A	0x9671	# <CJK>
-0xD84B	0x966F	# <CJK>
-0xD84C	0x96BF	# <CJK>
-0xD84D	0x976A	# <CJK>
-0xD84E	0x9804	# <CJK>
-0xD84F	0x98E5	# <CJK>
-0xD850	0x9997	# <CJK>
-0xD851	0x509B	# <CJK>
-0xD852	0x5095	# <CJK>
-0xD853	0x5094	# <CJK>
-0xD854	0x509E	# <CJK>
-0xD855	0x508B	# <CJK>
-0xD856	0x50A3	# <CJK>
-0xD857	0x5083	# <CJK>
-0xD858	0x508C	# <CJK>
-0xD859	0x508E	# <CJK>
-0xD85A	0x509D	# <CJK>
-0xD85B	0x5068	# <CJK>
-0xD85C	0x509C	# <CJK>
-0xD85D	0x5092	# <CJK>
-0xD85E	0x5082	# <CJK>
-0xD85F	0x5087	# <CJK>
-0xD860	0x515F	# <CJK>
-0xD861	0x51D4	# <CJK>
-0xD862	0x5312	# <CJK>
-0xD863	0x5311	# <CJK>
-0xD864	0x53A4	# <CJK>
-0xD865	0x53A7	# <CJK>
-0xD866	0x5591	# <CJK>
-0xD867	0x55A8	# <CJK>
-0xD868	0x55A5	# <CJK>
-0xD869	0x55AD	# <CJK>
-0xD86A	0x5577	# <CJK>
-0xD86B	0x5645	# <CJK>
-0xD86C	0x55A2	# <CJK>
-0xD86D	0x5593	# <CJK>
-0xD86E	0x5588	# <CJK>
-0xD86F	0x558F	# <CJK>
-0xD870	0x55B5	# <CJK>
-0xD871	0x5581	# <CJK>
-0xD872	0x55A3	# <CJK>
-0xD873	0x5592	# <CJK>
-0xD874	0x55A4	# <CJK>
-0xD875	0x557D	# <CJK>
-0xD876	0x558C	# <CJK>
-0xD877	0x55A6	# <CJK>
-0xD878	0x557F	# <CJK>
-0xD879	0x5595	# <CJK>
-0xD87A	0x55A1	# <CJK>
-0xD87B	0x558E	# <CJK>
-0xD87C	0x570C	# <CJK>
-0xD87D	0x5829	# <CJK>
-0xD87E	0x5837	# <CJK>
-0xD8A1	0x5819	# <CJK>
-0xD8A2	0x581E	# <CJK>
-0xD8A3	0x5827	# <CJK>
-0xD8A4	0x5823	# <CJK>
-0xD8A5	0x5828	# <CJK>
-0xD8A6	0x57F5	# <CJK>
-0xD8A7	0x5848	# <CJK>
-0xD8A8	0x5825	# <CJK>
-0xD8A9	0x581C	# <CJK>
-0xD8AA	0x581B	# <CJK>
-0xD8AB	0x5833	# <CJK>
-0xD8AC	0x583F	# <CJK>
-0xD8AD	0x5836	# <CJK>
-0xD8AE	0x582E	# <CJK>
-0xD8AF	0x5839	# <CJK>
-0xD8B0	0x5838	# <CJK>
-0xD8B1	0x582D	# <CJK>
-0xD8B2	0x582C	# <CJK>
-0xD8B3	0x583B	# <CJK>
-0xD8B4	0x5961	# <CJK>
-0xD8B5	0x5AAF	# <CJK>
-0xD8B6	0x5A94	# <CJK>
-0xD8B7	0x5A9F	# <CJK>
-0xD8B8	0x5A7A	# <CJK>
-0xD8B9	0x5AA2	# <CJK>
-0xD8BA	0x5A9E	# <CJK>
-0xD8BB	0x5A78	# <CJK>
-0xD8BC	0x5AA6	# <CJK>
-0xD8BD	0x5A7C	# <CJK>
-0xD8BE	0x5AA5	# <CJK>
-0xD8BF	0x5AAC	# <CJK>
-0xD8C0	0x5A95	# <CJK>
-0xD8C1	0x5AAE	# <CJK>
-0xD8C2	0x5A37	# <CJK>
-0xD8C3	0x5A84	# <CJK>
-0xD8C4	0x5A8A	# <CJK>
-0xD8C5	0x5A97	# <CJK>
-0xD8C6	0x5A83	# <CJK>
-0xD8C7	0x5A8B	# <CJK>
-0xD8C8	0x5AA9	# <CJK>
-0xD8C9	0x5A7B	# <CJK>
-0xD8CA	0x5A7D	# <CJK>
-0xD8CB	0x5A8C	# <CJK>
-0xD8CC	0x5A9C	# <CJK>
-0xD8CD	0x5A8F	# <CJK>
-0xD8CE	0x5A93	# <CJK>
-0xD8CF	0x5A9D	# <CJK>
-0xD8D0	0x5BEA	# <CJK>
-0xD8D1	0x5BCD	# <CJK>
-0xD8D2	0x5BCB	# <CJK>
-0xD8D3	0x5BD4	# <CJK>
-0xD8D4	0x5BD1	# <CJK>
-0xD8D5	0x5BCA	# <CJK>
-0xD8D6	0x5BCE	# <CJK>
-0xD8D7	0x5C0C	# <CJK>
-0xD8D8	0x5C30	# <CJK>
-0xD8D9	0x5D37	# <CJK>
-0xD8DA	0x5D43	# <CJK>
-0xD8DB	0x5D6B	# <CJK>
-0xD8DC	0x5D41	# <CJK>
-0xD8DD	0x5D4B	# <CJK>
-0xD8DE	0x5D3F	# <CJK>
-0xD8DF	0x5D35	# <CJK>
-0xD8E0	0x5D51	# <CJK>
-0xD8E1	0x5D4E	# <CJK>
-0xD8E2	0x5D55	# <CJK>
-0xD8E3	0x5D33	# <CJK>
-0xD8E4	0x5D3A	# <CJK>
-0xD8E5	0x5D52	# <CJK>
-0xD8E6	0x5D3D	# <CJK>
-0xD8E7	0x5D31	# <CJK>
-0xD8E8	0x5D59	# <CJK>
-0xD8E9	0x5D42	# <CJK>
-0xD8EA	0x5D39	# <CJK>
-0xD8EB	0x5D49	# <CJK>
-0xD8EC	0x5D38	# <CJK>
-0xD8ED	0x5D3C	# <CJK>
-0xD8EE	0x5D32	# <CJK>
-0xD8EF	0x5D36	# <CJK>
-0xD8F0	0x5D40	# <CJK>
-0xD8F1	0x5D45	# <CJK>
-0xD8F2	0x5E44	# <CJK>
-0xD8F3	0x5E41	# <CJK>
-0xD8F4	0x5F58	# <CJK>
-0xD8F5	0x5FA6	# <CJK>
-0xD8F6	0x5FA5	# <CJK>
-0xD8F7	0x5FAB	# <CJK>
-0xD8F8	0x60C9	# <CJK>
-0xD8F9	0x60B9	# <CJK>
-0xD8FA	0x60CC	# <CJK>
-0xD8FB	0x60E2	# <CJK>
-0xD8FC	0x60CE	# <CJK>
-0xD8FD	0x60C4	# <CJK>
-0xD8FE	0x6114	# <CJK>
-0xD940	0x60F2	# <CJK>
-0xD941	0x610A	# <CJK>
-0xD942	0x6116	# <CJK>
-0xD943	0x6105	# <CJK>
-0xD944	0x60F5	# <CJK>
-0xD945	0x6113	# <CJK>
-0xD946	0x60F8	# <CJK>
-0xD947	0x60FC	# <CJK>
-0xD948	0x60FE	# <CJK>
-0xD949	0x60C1	# <CJK>
-0xD94A	0x6103	# <CJK>
-0xD94B	0x6118	# <CJK>
-0xD94C	0x611D	# <CJK>
-0xD94D	0x6110	# <CJK>
-0xD94E	0x60FF	# <CJK>
-0xD94F	0x6104	# <CJK>
-0xD950	0x610B	# <CJK>
-0xD951	0x624A	# <CJK>
-0xD952	0x6394	# <CJK>
-0xD953	0x63B1	# <CJK>
-0xD954	0x63B0	# <CJK>
-0xD955	0x63CE	# <CJK>
-0xD956	0x63E5	# <CJK>
-0xD957	0x63E8	# <CJK>
-0xD958	0x63EF	# <CJK>
-0xD959	0x63C3	# <CJK>
-0xD95A	0x649D	# <CJK>
-0xD95B	0x63F3	# <CJK>
-0xD95C	0x63CA	# <CJK>
-0xD95D	0x63E0	# <CJK>
-0xD95E	0x63F6	# <CJK>
-0xD95F	0x63D5	# <CJK>
-0xD960	0x63F2	# <CJK>
-0xD961	0x63F5	# <CJK>
-0xD962	0x6461	# <CJK>
-0xD963	0x63DF	# <CJK>
-0xD964	0x63BE	# <CJK>
-0xD965	0x63DD	# <CJK>
-0xD966	0x63DC	# <CJK>
-0xD967	0x63C4	# <CJK>
-0xD968	0x63D8	# <CJK>
-0xD969	0x63D3	# <CJK>
-0xD96A	0x63C2	# <CJK>
-0xD96B	0x63C7	# <CJK>
-0xD96C	0x63CC	# <CJK>
-0xD96D	0x63CB	# <CJK>
-0xD96E	0x63C8	# <CJK>
-0xD96F	0x63F0	# <CJK>
-0xD970	0x63D7	# <CJK>
-0xD971	0x63D9	# <CJK>
-0xD972	0x6532	# <CJK>
-0xD973	0x6567	# <CJK>
-0xD974	0x656A	# <CJK>
-0xD975	0x6564	# <CJK>
-0xD976	0x655C	# <CJK>
-0xD977	0x6568	# <CJK>
-0xD978	0x6565	# <CJK>
-0xD979	0x658C	# <CJK>
-0xD97A	0x659D	# <CJK>
-0xD97B	0x659E	# <CJK>
-0xD97C	0x65AE	# <CJK>
-0xD97D	0x65D0	# <CJK>
-0xD97E	0x65D2	# <CJK>
-0xD9A1	0x667C	# <CJK>
-0xD9A2	0x666C	# <CJK>
-0xD9A3	0x667B	# <CJK>
-0xD9A4	0x6680	# <CJK>
-0xD9A5	0x6671	# <CJK>
-0xD9A6	0x6679	# <CJK>
-0xD9A7	0x666A	# <CJK>
-0xD9A8	0x6672	# <CJK>
-0xD9A9	0x6701	# <CJK>
-0xD9AA	0x690C	# <CJK>
-0xD9AB	0x68D3	# <CJK>
-0xD9AC	0x6904	# <CJK>
-0xD9AD	0x68DC	# <CJK>
-0xD9AE	0x692A	# <CJK>
-0xD9AF	0x68EC	# <CJK>
-0xD9B0	0x68EA	# <CJK>
-0xD9B1	0x68F1	# <CJK>
-0xD9B2	0x690F	# <CJK>
-0xD9B3	0x68D6	# <CJK>
-0xD9B4	0x68F7	# <CJK>
-0xD9B5	0x68EB	# <CJK>
-0xD9B6	0x68E4	# <CJK>
-0xD9B7	0x68F6	# <CJK>
-0xD9B8	0x6913	# <CJK>
-0xD9B9	0x6910	# <CJK>
-0xD9BA	0x68F3	# <CJK>
-0xD9BB	0x68E1	# <CJK>
-0xD9BC	0x6907	# <CJK>
-0xD9BD	0x68CC	# <CJK>
-0xD9BE	0x6908	# <CJK>
-0xD9BF	0x6970	# <CJK>
-0xD9C0	0x68B4	# <CJK>
-0xD9C1	0x6911	# <CJK>
-0xD9C2	0x68EF	# <CJK>
-0xD9C3	0x68C6	# <CJK>
-0xD9C4	0x6914	# <CJK>
-0xD9C5	0x68F8	# <CJK>
-0xD9C6	0x68D0	# <CJK>
-0xD9C7	0x68FD	# <CJK>
-0xD9C8	0x68FC	# <CJK>
-0xD9C9	0x68E8	# <CJK>
-0xD9CA	0x690B	# <CJK>
-0xD9CB	0x690A	# <CJK>
-0xD9CC	0x6917	# <CJK>
-0xD9CD	0x68CE	# <CJK>
-0xD9CE	0x68C8	# <CJK>
-0xD9CF	0x68DD	# <CJK>
-0xD9D0	0x68DE	# <CJK>
-0xD9D1	0x68E6	# <CJK>
-0xD9D2	0x68F4	# <CJK>
-0xD9D3	0x68D1	# <CJK>
-0xD9D4	0x6906	# <CJK>
-0xD9D5	0x68D4	# <CJK>
-0xD9D6	0x68E9	# <CJK>
-0xD9D7	0x6915	# <CJK>
-0xD9D8	0x6925	# <CJK>
-0xD9D9	0x68C7	# <CJK>
-0xD9DA	0x6B39	# <CJK>
-0xD9DB	0x6B3B	# <CJK>
-0xD9DC	0x6B3F	# <CJK>
-0xD9DD	0x6B3C	# <CJK>
-0xD9DE	0x6B94	# <CJK>
-0xD9DF	0x6B97	# <CJK>
-0xD9E0	0x6B99	# <CJK>
-0xD9E1	0x6B95	# <CJK>
-0xD9E2	0x6BBD	# <CJK>
-0xD9E3	0x6BF0	# <CJK>
-0xD9E4	0x6BF2	# <CJK>
-0xD9E5	0x6BF3	# <CJK>
-0xD9E6	0x6C30	# <CJK>
-0xD9E7	0x6DFC	# <CJK>
-0xD9E8	0x6E46	# <CJK>
-0xD9E9	0x6E47	# <CJK>
-0xD9EA	0x6E1F	# <CJK>
-0xD9EB	0x6E49	# <CJK>
-0xD9EC	0x6E88	# <CJK>
-0xD9ED	0x6E3C	# <CJK>
-0xD9EE	0x6E3D	# <CJK>
-0xD9EF	0x6E45	# <CJK>
-0xD9F0	0x6E62	# <CJK>
-0xD9F1	0x6E2B	# <CJK>
-0xD9F2	0x6E3F	# <CJK>
-0xD9F3	0x6E41	# <CJK>
-0xD9F4	0x6E5D	# <CJK>
-0xD9F5	0x6E73	# <CJK>
-0xD9F6	0x6E1C	# <CJK>
-0xD9F7	0x6E33	# <CJK>
-0xD9F8	0x6E4B	# <CJK>
-0xD9F9	0x6E40	# <CJK>
-0xD9FA	0x6E51	# <CJK>
-0xD9FB	0x6E3B	# <CJK>
-0xD9FC	0x6E03	# <CJK>
-0xD9FD	0x6E2E	# <CJK>
-0xD9FE	0x6E5E	# <CJK>
-0xDA40	0x6E68	# <CJK>
-0xDA41	0x6E5C	# <CJK>
-0xDA42	0x6E61	# <CJK>
-0xDA43	0x6E31	# <CJK>
-0xDA44	0x6E28	# <CJK>
-0xDA45	0x6E60	# <CJK>
-0xDA46	0x6E71	# <CJK>
-0xDA47	0x6E6B	# <CJK>
-0xDA48	0x6E39	# <CJK>
-0xDA49	0x6E22	# <CJK>
-0xDA4A	0x6E30	# <CJK>
-0xDA4B	0x6E53	# <CJK>
-0xDA4C	0x6E65	# <CJK>
-0xDA4D	0x6E27	# <CJK>
-0xDA4E	0x6E78	# <CJK>
-0xDA4F	0x6E64	# <CJK>
-0xDA50	0x6E77	# <CJK>
-0xDA51	0x6E55	# <CJK>
-0xDA52	0x6E79	# <CJK>
-0xDA53	0x6E52	# <CJK>
-0xDA54	0x6E66	# <CJK>
-0xDA55	0x6E35	# <CJK>
-0xDA56	0x6E36	# <CJK>
-0xDA57	0x6E5A	# <CJK>
-0xDA58	0x7120	# <CJK>
-0xDA59	0x711E	# <CJK>
-0xDA5A	0x712F	# <CJK>
-0xDA5B	0x70FB	# <CJK>
-0xDA5C	0x712E	# <CJK>
-0xDA5D	0x7131	# <CJK>
-0xDA5E	0x7123	# <CJK>
-0xDA5F	0x7125	# <CJK>
-0xDA60	0x7122	# <CJK>
-0xDA61	0x7132	# <CJK>
-0xDA62	0x711F	# <CJK>
-0xDA63	0x7128	# <CJK>
-0xDA64	0x713A	# <CJK>
-0xDA65	0x711B	# <CJK>
-0xDA66	0x724B	# <CJK>
-0xDA67	0x725A	# <CJK>
-0xDA68	0x7288	# <CJK>
-0xDA69	0x7289	# <CJK>
-0xDA6A	0x7286	# <CJK>
-0xDA6B	0x7285	# <CJK>
-0xDA6C	0x728B	# <CJK>
-0xDA6D	0x7312	# <CJK>
-0xDA6E	0x730B	# <CJK>
-0xDA6F	0x7330	# <CJK>
-0xDA70	0x7322	# <CJK>
-0xDA71	0x7331	# <CJK>
-0xDA72	0x7333	# <CJK>
-0xDA73	0x7327	# <CJK>
-0xDA74	0x7332	# <CJK>
-0xDA75	0x732D	# <CJK>
-0xDA76	0x7326	# <CJK>
-0xDA77	0x7323	# <CJK>
-0xDA78	0x7335	# <CJK>
-0xDA79	0x730C	# <CJK>
-0xDA7A	0x742E	# <CJK>
-0xDA7B	0x742C	# <CJK>
-0xDA7C	0x7430	# <CJK>
-0xDA7D	0x742B	# <CJK>
-0xDA7E	0x7416	# <CJK>
-0xDAA1	0x741A	# <CJK>
-0xDAA2	0x7421	# <CJK>
-0xDAA3	0x742D	# <CJK>
-0xDAA4	0x7431	# <CJK>
-0xDAA5	0x7424	# <CJK>
-0xDAA6	0x7423	# <CJK>
-0xDAA7	0x741D	# <CJK>
-0xDAA8	0x7429	# <CJK>
-0xDAA9	0x7420	# <CJK>
-0xDAAA	0x7432	# <CJK>
-0xDAAB	0x74FB	# <CJK>
-0xDAAC	0x752F	# <CJK>
-0xDAAD	0x756F	# <CJK>
-0xDAAE	0x756C	# <CJK>
-0xDAAF	0x75E7	# <CJK>
-0xDAB0	0x75DA	# <CJK>
-0xDAB1	0x75E1	# <CJK>
-0xDAB2	0x75E6	# <CJK>
-0xDAB3	0x75DD	# <CJK>
-0xDAB4	0x75DF	# <CJK>
-0xDAB5	0x75E4	# <CJK>
-0xDAB6	0x75D7	# <CJK>
-0xDAB7	0x7695	# <CJK>
-0xDAB8	0x7692	# <CJK>
-0xDAB9	0x76DA	# <CJK>
-0xDABA	0x7746	# <CJK>
-0xDABB	0x7747	# <CJK>
-0xDABC	0x7744	# <CJK>
-0xDABD	0x774D	# <CJK>
-0xDABE	0x7745	# <CJK>
-0xDABF	0x774A	# <CJK>
-0xDAC0	0x774E	# <CJK>
-0xDAC1	0x774B	# <CJK>
-0xDAC2	0x774C	# <CJK>
-0xDAC3	0x77DE	# <CJK>
-0xDAC4	0x77EC	# <CJK>
-0xDAC5	0x7860	# <CJK>
-0xDAC6	0x7864	# <CJK>
-0xDAC7	0x7865	# <CJK>
-0xDAC8	0x785C	# <CJK>
-0xDAC9	0x786D	# <CJK>
-0xDACA	0x7871	# <CJK>
-0xDACB	0x786A	# <CJK>
-0xDACC	0x786E	# <CJK>
-0xDACD	0x7870	# <CJK>
-0xDACE	0x7869	# <CJK>
-0xDACF	0x7868	# <CJK>
-0xDAD0	0x785E	# <CJK>
-0xDAD1	0x7862	# <CJK>
-0xDAD2	0x7974	# <CJK>
-0xDAD3	0x7973	# <CJK>
-0xDAD4	0x7972	# <CJK>
-0xDAD5	0x7970	# <CJK>
-0xDAD6	0x7A02	# <CJK>
-0xDAD7	0x7A0A	# <CJK>
-0xDAD8	0x7A03	# <CJK>
-0xDAD9	0x7A0C	# <CJK>
-0xDADA	0x7A04	# <CJK>
-0xDADB	0x7A99	# <CJK>
-0xDADC	0x7AE6	# <CJK>
-0xDADD	0x7AE4	# <CJK>
-0xDADE	0x7B4A	# <CJK>
-0xDADF	0x7B3B	# <CJK>
-0xDAE0	0x7B44	# <CJK>
-0xDAE1	0x7B48	# <CJK>
-0xDAE2	0x7B4C	# <CJK>
-0xDAE3	0x7B4E	# <CJK>
-0xDAE4	0x7B40	# <CJK>
-0xDAE5	0x7B58	# <CJK>
-0xDAE6	0x7B45	# <CJK>
-0xDAE7	0x7CA2	# <CJK>
-0xDAE8	0x7C9E	# <CJK>
-0xDAE9	0x7CA8	# <CJK>
-0xDAEA	0x7CA1	# <CJK>
-0xDAEB	0x7D58	# <CJK>
-0xDAEC	0x7D6F	# <CJK>
-0xDAED	0x7D63	# <CJK>
-0xDAEE	0x7D53	# <CJK>
-0xDAEF	0x7D56	# <CJK>
-0xDAF0	0x7D67	# <CJK>
-0xDAF1	0x7D6A	# <CJK>
-0xDAF2	0x7D4F	# <CJK>
-0xDAF3	0x7D6D	# <CJK>
-0xDAF4	0x7D5C	# <CJK>
-0xDAF5	0x7D6B	# <CJK>
-0xDAF6	0x7D52	# <CJK>
-0xDAF7	0x7D54	# <CJK>
-0xDAF8	0x7D69	# <CJK>
-0xDAF9	0x7D51	# <CJK>
-0xDAFA	0x7D5F	# <CJK>
-0xDAFB	0x7D4E	# <CJK>
-0xDAFC	0x7F3E	# <CJK>
-0xDAFD	0x7F3F	# <CJK>
-0xDAFE	0x7F65	# <CJK>
-0xDB40	0x7F66	# <CJK>
-0xDB41	0x7FA2	# <CJK>
-0xDB42	0x7FA0	# <CJK>
-0xDB43	0x7FA1	# <CJK>
-0xDB44	0x7FD7	# <CJK>
-0xDB45	0x8051	# <CJK>
-0xDB46	0x804F	# <CJK>
-0xDB47	0x8050	# <CJK>
-0xDB48	0x80FE	# <CJK>
-0xDB49	0x80D4	# <CJK>
-0xDB4A	0x8143	# <CJK>
-0xDB4B	0x814A	# <CJK>
-0xDB4C	0x8152	# <CJK>
-0xDB4D	0x814F	# <CJK>
-0xDB4E	0x8147	# <CJK>
-0xDB4F	0x813D	# <CJK>
-0xDB50	0x814D	# <CJK>
-0xDB51	0x813A	# <CJK>
-0xDB52	0x81E6	# <CJK>
-0xDB53	0x81EE	# <CJK>
-0xDB54	0x81F7	# <CJK>
-0xDB55	0x81F8	# <CJK>
-0xDB56	0x81F9	# <CJK>
-0xDB57	0x8204	# <CJK>
-0xDB58	0x823C	# <CJK>
-0xDB59	0x823D	# <CJK>
-0xDB5A	0x823F	# <CJK>
-0xDB5B	0x8275	# <CJK>
-0xDB5C	0x833B	# <CJK>
-0xDB5D	0x83CF	# <CJK>
-0xDB5E	0x83F9	# <CJK>
-0xDB5F	0x8423	# <CJK>
-0xDB60	0x83C0	# <CJK>
-0xDB61	0x83E8	# <CJK>
-0xDB62	0x8412	# <CJK>
-0xDB63	0x83E7	# <CJK>
-0xDB64	0x83E4	# <CJK>
-0xDB65	0x83FC	# <CJK>
-0xDB66	0x83F6	# <CJK>
-0xDB67	0x8410	# <CJK>
-0xDB68	0x83C6	# <CJK>
-0xDB69	0x83C8	# <CJK>
-0xDB6A	0x83EB	# <CJK>
-0xDB6B	0x83E3	# <CJK>
-0xDB6C	0x83BF	# <CJK>
-0xDB6D	0x8401	# <CJK>
-0xDB6E	0x83DD	# <CJK>
-0xDB6F	0x83E5	# <CJK>
-0xDB70	0x83D8	# <CJK>
-0xDB71	0x83FF	# <CJK>
-0xDB72	0x83E1	# <CJK>
-0xDB73	0x83CB	# <CJK>
-0xDB74	0x83CE	# <CJK>
-0xDB75	0x83D6	# <CJK>
-0xDB76	0x83F5	# <CJK>
-0xDB77	0x83C9	# <CJK>
-0xDB78	0x8409	# <CJK>
-0xDB79	0x840F	# <CJK>
-0xDB7A	0x83DE	# <CJK>
-0xDB7B	0x8411	# <CJK>
-0xDB7C	0x8406	# <CJK>
-0xDB7D	0x83C2	# <CJK>
-0xDB7E	0x83F3	# <CJK>
-0xDBA1	0x83D5	# <CJK>
-0xDBA2	0x83FA	# <CJK>
-0xDBA3	0x83C7	# <CJK>
-0xDBA4	0x83D1	# <CJK>
-0xDBA5	0x83EA	# <CJK>
-0xDBA6	0x8413	# <CJK>
-0xDBA7	0x83C3	# <CJK>
-0xDBA8	0x83EC	# <CJK>
-0xDBA9	0x83EE	# <CJK>
-0xDBAA	0x83C4	# <CJK>
-0xDBAB	0x83FB	# <CJK>
-0xDBAC	0x83D7	# <CJK>
-0xDBAD	0x83E2	# <CJK>
-0xDBAE	0x841B	# <CJK>
-0xDBAF	0x83DB	# <CJK>
-0xDBB0	0x83FE	# <CJK>
-0xDBB1	0x86D8	# <CJK>
-0xDBB2	0x86E2	# <CJK>
-0xDBB3	0x86E6	# <CJK>
-0xDBB4	0x86D3	# <CJK>
-0xDBB5	0x86E3	# <CJK>
-0xDBB6	0x86DA	# <CJK>
-0xDBB7	0x86EA	# <CJK>
-0xDBB8	0x86DD	# <CJK>
-0xDBB9	0x86EB	# <CJK>
-0xDBBA	0x86DC	# <CJK>
-0xDBBB	0x86EC	# <CJK>
-0xDBBC	0x86E9	# <CJK>
-0xDBBD	0x86D7	# <CJK>
-0xDBBE	0x86E8	# <CJK>
-0xDBBF	0x86D1	# <CJK>
-0xDBC0	0x8848	# <CJK>
-0xDBC1	0x8856	# <CJK>
-0xDBC2	0x8855	# <CJK>
-0xDBC3	0x88BA	# <CJK>
-0xDBC4	0x88D7	# <CJK>
-0xDBC5	0x88B9	# <CJK>
-0xDBC6	0x88B8	# <CJK>
-0xDBC7	0x88C0	# <CJK>
-0xDBC8	0x88BE	# <CJK>
-0xDBC9	0x88B6	# <CJK>
-0xDBCA	0x88BC	# <CJK>
-0xDBCB	0x88B7	# <CJK>
-0xDBCC	0x88BD	# <CJK>
-0xDBCD	0x88B2	# <CJK>
-0xDBCE	0x8901	# <CJK>
-0xDBCF	0x88C9	# <CJK>
-0xDBD0	0x8995	# <CJK>
-0xDBD1	0x8998	# <CJK>
-0xDBD2	0x8997	# <CJK>
-0xDBD3	0x89DD	# <CJK>
-0xDBD4	0x89DA	# <CJK>
-0xDBD5	0x89DB	# <CJK>
-0xDBD6	0x8A4E	# <CJK>
-0xDBD7	0x8A4D	# <CJK>
-0xDBD8	0x8A39	# <CJK>
-0xDBD9	0x8A59	# <CJK>
-0xDBDA	0x8A40	# <CJK>
-0xDBDB	0x8A57	# <CJK>
-0xDBDC	0x8A58	# <CJK>
-0xDBDD	0x8A44	# <CJK>
-0xDBDE	0x8A45	# <CJK>
-0xDBDF	0x8A52	# <CJK>
-0xDBE0	0x8A48	# <CJK>
-0xDBE1	0x8A51	# <CJK>
-0xDBE2	0x8A4A	# <CJK>
-0xDBE3	0x8A4C	# <CJK>
-0xDBE4	0x8A4F	# <CJK>
-0xDBE5	0x8C5F	# <CJK>
-0xDBE6	0x8C81	# <CJK>
-0xDBE7	0x8C80	# <CJK>
-0xDBE8	0x8CBA	# <CJK>
-0xDBE9	0x8CBE	# <CJK>
-0xDBEA	0x8CB0	# <CJK>
-0xDBEB	0x8CB9	# <CJK>
-0xDBEC	0x8CB5	# <CJK>
-0xDBED	0x8D84	# <CJK>
-0xDBEE	0x8D80	# <CJK>
-0xDBEF	0x8D89	# <CJK>
-0xDBF0	0x8DD8	# <CJK>
-0xDBF1	0x8DD3	# <CJK>
-0xDBF2	0x8DCD	# <CJK>
-0xDBF3	0x8DC7	# <CJK>
-0xDBF4	0x8DD6	# <CJK>
-0xDBF5	0x8DDC	# <CJK>
-0xDBF6	0x8DCF	# <CJK>
-0xDBF7	0x8DD5	# <CJK>
-0xDBF8	0x8DD9	# <CJK>
-0xDBF9	0x8DC8	# <CJK>
-0xDBFA	0x8DD7	# <CJK>
-0xDBFB	0x8DC5	# <CJK>
-0xDBFC	0x8EEF	# <CJK>
-0xDBFD	0x8EF7	# <CJK>
-0xDBFE	0x8EFA	# <CJK>
-0xDC40	0x8EF9	# <CJK>
-0xDC41	0x8EE6	# <CJK>
-0xDC42	0x8EEE	# <CJK>
-0xDC43	0x8EE5	# <CJK>
-0xDC44	0x8EF5	# <CJK>
-0xDC45	0x8EE7	# <CJK>
-0xDC46	0x8EE8	# <CJK>
-0xDC47	0x8EF6	# <CJK>
-0xDC48	0x8EEB	# <CJK>
-0xDC49	0x8EF1	# <CJK>
-0xDC4A	0x8EEC	# <CJK>
-0xDC4B	0x8EF4	# <CJK>
-0xDC4C	0x8EE9	# <CJK>
-0xDC4D	0x902D	# <CJK>
-0xDC4E	0x9034	# <CJK>
-0xDC4F	0x902F	# <CJK>
-0xDC50	0x9106	# <CJK>
-0xDC51	0x912C	# <CJK>
-0xDC52	0x9104	# <CJK>
-0xDC53	0x90FF	# <CJK>
-0xDC54	0x90FC	# <CJK>
-0xDC55	0x9108	# <CJK>
-0xDC56	0x90F9	# <CJK>
-0xDC57	0x90FB	# <CJK>
-0xDC58	0x9101	# <CJK>
-0xDC59	0x9100	# <CJK>
-0xDC5A	0x9107	# <CJK>
-0xDC5B	0x9105	# <CJK>
-0xDC5C	0x9103	# <CJK>
-0xDC5D	0x9161	# <CJK>
-0xDC5E	0x9164	# <CJK>
-0xDC5F	0x915F	# <CJK>
-0xDC60	0x9162	# <CJK>
-0xDC61	0x9160	# <CJK>
-0xDC62	0x9201	# <CJK>
-0xDC63	0x920A	# <CJK>
-0xDC64	0x9225	# <CJK>
-0xDC65	0x9203	# <CJK>
-0xDC66	0x921A	# <CJK>
-0xDC67	0x9226	# <CJK>
-0xDC68	0x920F	# <CJK>
-0xDC69	0x920C	# <CJK>
-0xDC6A	0x9200	# <CJK>
-0xDC6B	0x9212	# <CJK>
-0xDC6C	0x91FF	# <CJK>
-0xDC6D	0x91FD	# <CJK>
-0xDC6E	0x9206	# <CJK>
-0xDC6F	0x9204	# <CJK>
-0xDC70	0x9227	# <CJK>
-0xDC71	0x9202	# <CJK>
-0xDC72	0x921C	# <CJK>
-0xDC73	0x9224	# <CJK>
-0xDC74	0x9219	# <CJK>
-0xDC75	0x9217	# <CJK>
-0xDC76	0x9205	# <CJK>
-0xDC77	0x9216	# <CJK>
-0xDC78	0x957B	# <CJK>
-0xDC79	0x958D	# <CJK>
-0xDC7A	0x958C	# <CJK>
-0xDC7B	0x9590	# <CJK>
-0xDC7C	0x9687	# <CJK>
-0xDC7D	0x967E	# <CJK>
-0xDC7E	0x9688	# <CJK>
-0xDCA1	0x9689	# <CJK>
-0xDCA2	0x9683	# <CJK>
-0xDCA3	0x9680	# <CJK>
-0xDCA4	0x96C2	# <CJK>
-0xDCA5	0x96C8	# <CJK>
-0xDCA6	0x96C3	# <CJK>
-0xDCA7	0x96F1	# <CJK>
-0xDCA8	0x96F0	# <CJK>
-0xDCA9	0x976C	# <CJK>
-0xDCAA	0x9770	# <CJK>
-0xDCAB	0x976E	# <CJK>
-0xDCAC	0x9807	# <CJK>
-0xDCAD	0x98A9	# <CJK>
-0xDCAE	0x98EB	# <CJK>
-0xDCAF	0x9CE6	# <CJK>
-0xDCB0	0x9EF9	# <CJK>
-0xDCB1	0x4E83	# <CJK>
-0xDCB2	0x4E84	# <CJK>
-0xDCB3	0x4EB6	# <CJK>
-0xDCB4	0x50BD	# <CJK>
-0xDCB5	0x50BF	# <CJK>
-0xDCB6	0x50C6	# <CJK>
-0xDCB7	0x50AE	# <CJK>
-0xDCB8	0x50C4	# <CJK>
-0xDCB9	0x50CA	# <CJK>
-0xDCBA	0x50B4	# <CJK>
-0xDCBB	0x50C8	# <CJK>
-0xDCBC	0x50C2	# <CJK>
-0xDCBD	0x50B0	# <CJK>
-0xDCBE	0x50C1	# <CJK>
-0xDCBF	0x50BA	# <CJK>
-0xDCC0	0x50B1	# <CJK>
-0xDCC1	0x50CB	# <CJK>
-0xDCC2	0x50C9	# <CJK>
-0xDCC3	0x50B6	# <CJK>
-0xDCC4	0x50B8	# <CJK>
-0xDCC5	0x51D7	# <CJK>
-0xDCC6	0x527A	# <CJK>
-0xDCC7	0x5278	# <CJK>
-0xDCC8	0x527B	# <CJK>
-0xDCC9	0x527C	# <CJK>
-0xDCCA	0x55C3	# <CJK>
-0xDCCB	0x55DB	# <CJK>
-0xDCCC	0x55CC	# <CJK>
-0xDCCD	0x55D0	# <CJK>
-0xDCCE	0x55CB	# <CJK>
-0xDCCF	0x55CA	# <CJK>
-0xDCD0	0x55DD	# <CJK>
-0xDCD1	0x55C0	# <CJK>
-0xDCD2	0x55D4	# <CJK>
-0xDCD3	0x55C4	# <CJK>
-0xDCD4	0x55E9	# <CJK>
-0xDCD5	0x55BF	# <CJK>
-0xDCD6	0x55D2	# <CJK>
-0xDCD7	0x558D	# <CJK>
-0xDCD8	0x55CF	# <CJK>
-0xDCD9	0x55D5	# <CJK>
-0xDCDA	0x55E2	# <CJK>
-0xDCDB	0x55D6	# <CJK>
-0xDCDC	0x55C8	# <CJK>
-0xDCDD	0x55F2	# <CJK>
-0xDCDE	0x55CD	# <CJK>
-0xDCDF	0x55D9	# <CJK>
-0xDCE0	0x55C2	# <CJK>
-0xDCE1	0x5714	# <CJK>
-0xDCE2	0x5853	# <CJK>
-0xDCE3	0x5868	# <CJK>
-0xDCE4	0x5864	# <CJK>
-0xDCE5	0x584F	# <CJK>
-0xDCE6	0x584D	# <CJK>
-0xDCE7	0x5849	# <CJK>
-0xDCE8	0x586F	# <CJK>
-0xDCE9	0x5855	# <CJK>
-0xDCEA	0x584E	# <CJK>
-0xDCEB	0x585D	# <CJK>
-0xDCEC	0x5859	# <CJK>
-0xDCED	0x5865	# <CJK>
-0xDCEE	0x585B	# <CJK>
-0xDCEF	0x583D	# <CJK>
-0xDCF0	0x5863	# <CJK>
-0xDCF1	0x5871	# <CJK>
-0xDCF2	0x58FC	# <CJK>
-0xDCF3	0x5AC7	# <CJK>
-0xDCF4	0x5AC4	# <CJK>
-0xDCF5	0x5ACB	# <CJK>
-0xDCF6	0x5ABA	# <CJK>
-0xDCF7	0x5AB8	# <CJK>
-0xDCF8	0x5AB1	# <CJK>
-0xDCF9	0x5AB5	# <CJK>
-0xDCFA	0x5AB0	# <CJK>
-0xDCFB	0x5ABF	# <CJK>
-0xDCFC	0x5AC8	# <CJK>
-0xDCFD	0x5ABB	# <CJK>
-0xDCFE	0x5AC6	# <CJK>
-0xDD40	0x5AB7	# <CJK>
-0xDD41	0x5AC0	# <CJK>
-0xDD42	0x5ACA	# <CJK>
-0xDD43	0x5AB4	# <CJK>
-0xDD44	0x5AB6	# <CJK>
-0xDD45	0x5ACD	# <CJK>
-0xDD46	0x5AB9	# <CJK>
-0xDD47	0x5A90	# <CJK>
-0xDD48	0x5BD6	# <CJK>
-0xDD49	0x5BD8	# <CJK>
-0xDD4A	0x5BD9	# <CJK>
-0xDD4B	0x5C1F	# <CJK>
-0xDD4C	0x5C33	# <CJK>
-0xDD4D	0x5D71	# <CJK>
-0xDD4E	0x5D63	# <CJK>
-0xDD4F	0x5D4A	# <CJK>
-0xDD50	0x5D65	# <CJK>
-0xDD51	0x5D72	# <CJK>
-0xDD52	0x5D6C	# <CJK>
-0xDD53	0x5D5E	# <CJK>
-0xDD54	0x5D68	# <CJK>
-0xDD55	0x5D67	# <CJK>
-0xDD56	0x5D62	# <CJK>
-0xDD57	0x5DF0	# <CJK>
-0xDD58	0x5E4F	# <CJK>
-0xDD59	0x5E4E	# <CJK>
-0xDD5A	0x5E4A	# <CJK>
-0xDD5B	0x5E4D	# <CJK>
-0xDD5C	0x5E4B	# <CJK>
-0xDD5D	0x5EC5	# <CJK>
-0xDD5E	0x5ECC	# <CJK>
-0xDD5F	0x5EC6	# <CJK>
-0xDD60	0x5ECB	# <CJK>
-0xDD61	0x5EC7	# <CJK>
-0xDD62	0x5F40	# <CJK>
-0xDD63	0x5FAF	# <CJK>
-0xDD64	0x5FAD	# <CJK>
-0xDD65	0x60F7	# <CJK>
-0xDD66	0x6149	# <CJK>
-0xDD67	0x614A	# <CJK>
-0xDD68	0x612B	# <CJK>
-0xDD69	0x6145	# <CJK>
-0xDD6A	0x6136	# <CJK>
-0xDD6B	0x6132	# <CJK>
-0xDD6C	0x612E	# <CJK>
-0xDD6D	0x6146	# <CJK>
-0xDD6E	0x612F	# <CJK>
-0xDD6F	0x614F	# <CJK>
-0xDD70	0x6129	# <CJK>
-0xDD71	0x6140	# <CJK>
-0xDD72	0x6220	# <CJK>
-0xDD73	0x9168	# <CJK>
-0xDD74	0x6223	# <CJK>
-0xDD75	0x6225	# <CJK>
-0xDD76	0x6224	# <CJK>
-0xDD77	0x63C5	# <CJK>
-0xDD78	0x63F1	# <CJK>
-0xDD79	0x63EB	# <CJK>
-0xDD7A	0x6410	# <CJK>
-0xDD7B	0x6412	# <CJK>
-0xDD7C	0x6409	# <CJK>
-0xDD7D	0x6420	# <CJK>
-0xDD7E	0x6424	# <CJK>
-0xDDA1	0x6433	# <CJK>
-0xDDA2	0x6443	# <CJK>
-0xDDA3	0x641F	# <CJK>
-0xDDA4	0x6415	# <CJK>
-0xDDA5	0x6418	# <CJK>
-0xDDA6	0x6439	# <CJK>
-0xDDA7	0x6437	# <CJK>
-0xDDA8	0x6422	# <CJK>
-0xDDA9	0x6423	# <CJK>
-0xDDAA	0x640C	# <CJK>
-0xDDAB	0x6426	# <CJK>
-0xDDAC	0x6430	# <CJK>
-0xDDAD	0x6428	# <CJK>
-0xDDAE	0x6441	# <CJK>
-0xDDAF	0x6435	# <CJK>
-0xDDB0	0x642F	# <CJK>
-0xDDB1	0x640A	# <CJK>
-0xDDB2	0x641A	# <CJK>
-0xDDB3	0x6440	# <CJK>
-0xDDB4	0x6425	# <CJK>
-0xDDB5	0x6427	# <CJK>
-0xDDB6	0x640B	# <CJK>
-0xDDB7	0x63E7	# <CJK>
-0xDDB8	0x641B	# <CJK>
-0xDDB9	0x642E	# <CJK>
-0xDDBA	0x6421	# <CJK>
-0xDDBB	0x640E	# <CJK>
-0xDDBC	0x656F	# <CJK>
-0xDDBD	0x6592	# <CJK>
-0xDDBE	0x65D3	# <CJK>
-0xDDBF	0x6686	# <CJK>
-0xDDC0	0x668C	# <CJK>
-0xDDC1	0x6695	# <CJK>
-0xDDC2	0x6690	# <CJK>
-0xDDC3	0x668B	# <CJK>
-0xDDC4	0x668A	# <CJK>
-0xDDC5	0x6699	# <CJK>
-0xDDC6	0x6694	# <CJK>
-0xDDC7	0x6678	# <CJK>
-0xDDC8	0x6720	# <CJK>
-0xDDC9	0x6966	# <CJK>
-0xDDCA	0x695F	# <CJK>
-0xDDCB	0x6938	# <CJK>
-0xDDCC	0x694E	# <CJK>
-0xDDCD	0x6962	# <CJK>
-0xDDCE	0x6971	# <CJK>
-0xDDCF	0x693F	# <CJK>
-0xDDD0	0x6945	# <CJK>
-0xDDD1	0x696A	# <CJK>
-0xDDD2	0x6939	# <CJK>
-0xDDD3	0x6942	# <CJK>
-0xDDD4	0x6957	# <CJK>
-0xDDD5	0x6959	# <CJK>
-0xDDD6	0x697A	# <CJK>
-0xDDD7	0x6948	# <CJK>
-0xDDD8	0x6949	# <CJK>
-0xDDD9	0x6935	# <CJK>
-0xDDDA	0x696C	# <CJK>
-0xDDDB	0x6933	# <CJK>
-0xDDDC	0x693D	# <CJK>
-0xDDDD	0x6965	# <CJK>
-0xDDDE	0x68F0	# <CJK>
-0xDDDF	0x6978	# <CJK>
-0xDDE0	0x6934	# <CJK>
-0xDDE1	0x6969	# <CJK>
-0xDDE2	0x6940	# <CJK>
-0xDDE3	0x696F	# <CJK>
-0xDDE4	0x6944	# <CJK>
-0xDDE5	0x6976	# <CJK>
-0xDDE6	0x6958	# <CJK>
-0xDDE7	0x6941	# <CJK>
-0xDDE8	0x6974	# <CJK>
-0xDDE9	0x694C	# <CJK>
-0xDDEA	0x693B	# <CJK>
-0xDDEB	0x694B	# <CJK>
-0xDDEC	0x6937	# <CJK>
-0xDDED	0x695C	# <CJK>
-0xDDEE	0x694F	# <CJK>
-0xDDEF	0x6951	# <CJK>
-0xDDF0	0x6932	# <CJK>
-0xDDF1	0x6952	# <CJK>
-0xDDF2	0x692F	# <CJK>
-0xDDF3	0x697B	# <CJK>
-0xDDF4	0x693C	# <CJK>
-0xDDF5	0x6B46	# <CJK>
-0xDDF6	0x6B45	# <CJK>
-0xDDF7	0x6B43	# <CJK>
-0xDDF8	0x6B42	# <CJK>
-0xDDF9	0x6B48	# <CJK>
-0xDDFA	0x6B41	# <CJK>
-0xDDFB	0x6B9B	# <CJK>
-0xDDFC	0xFA0D	# CJK COMPATIBILITY IDEOGRAPH-FA0D
-0xDDFD	0x6BFB	# <CJK>
-0xDDFE	0x6BFC	# <CJK>
-0xDE40	0x6BF9	# <CJK>
-0xDE41	0x6BF7	# <CJK>
-0xDE42	0x6BF8	# <CJK>
-0xDE43	0x6E9B	# <CJK>
-0xDE44	0x6ED6	# <CJK>
-0xDE45	0x6EC8	# <CJK>
-0xDE46	0x6E8F	# <CJK>
-0xDE47	0x6EC0	# <CJK>
-0xDE48	0x6E9F	# <CJK>
-0xDE49	0x6E93	# <CJK>
-0xDE4A	0x6E94	# <CJK>
-0xDE4B	0x6EA0	# <CJK>
-0xDE4C	0x6EB1	# <CJK>
-0xDE4D	0x6EB9	# <CJK>
-0xDE4E	0x6EC6	# <CJK>
-0xDE4F	0x6ED2	# <CJK>
-0xDE50	0x6EBD	# <CJK>
-0xDE51	0x6EC1	# <CJK>
-0xDE52	0x6E9E	# <CJK>
-0xDE53	0x6EC9	# <CJK>
-0xDE54	0x6EB7	# <CJK>
-0xDE55	0x6EB0	# <CJK>
-0xDE56	0x6ECD	# <CJK>
-0xDE57	0x6EA6	# <CJK>
-0xDE58	0x6ECF	# <CJK>
-0xDE59	0x6EB2	# <CJK>
-0xDE5A	0x6EBE	# <CJK>
-0xDE5B	0x6EC3	# <CJK>
-0xDE5C	0x6EDC	# <CJK>
-0xDE5D	0x6ED8	# <CJK>
-0xDE5E	0x6E99	# <CJK>
-0xDE5F	0x6E92	# <CJK>
-0xDE60	0x6E8E	# <CJK>
-0xDE61	0x6E8D	# <CJK>
-0xDE62	0x6EA4	# <CJK>
-0xDE63	0x6EA1	# <CJK>
-0xDE64	0x6EBF	# <CJK>
-0xDE65	0x6EB3	# <CJK>
-0xDE66	0x6ED0	# <CJK>
-0xDE67	0x6ECA	# <CJK>
-0xDE68	0x6E97	# <CJK>
-0xDE69	0x6EAE	# <CJK>
-0xDE6A	0x6EA3	# <CJK>
-0xDE6B	0x7147	# <CJK>
-0xDE6C	0x7154	# <CJK>
-0xDE6D	0x7152	# <CJK>
-0xDE6E	0x7163	# <CJK>
-0xDE6F	0x7160	# <CJK>
-0xDE70	0x7141	# <CJK>
-0xDE71	0x715D	# <CJK>
-0xDE72	0x7162	# <CJK>
-0xDE73	0x7172	# <CJK>
-0xDE74	0x7178	# <CJK>
-0xDE75	0x716A	# <CJK>
-0xDE76	0x7161	# <CJK>
-0xDE77	0x7142	# <CJK>
-0xDE78	0x7158	# <CJK>
-0xDE79	0x7143	# <CJK>
-0xDE7A	0x714B	# <CJK>
-0xDE7B	0x7170	# <CJK>
-0xDE7C	0x715F	# <CJK>
-0xDE7D	0x7150	# <CJK>
-0xDE7E	0x7153	# <CJK>
-0xDEA1	0x7144	# <CJK>
-0xDEA2	0x714D	# <CJK>
-0xDEA3	0x715A	# <CJK>
-0xDEA4	0x724F	# <CJK>
-0xDEA5	0x728D	# <CJK>
-0xDEA6	0x728C	# <CJK>
-0xDEA7	0x7291	# <CJK>
-0xDEA8	0x7290	# <CJK>
-0xDEA9	0x728E	# <CJK>
-0xDEAA	0x733C	# <CJK>
-0xDEAB	0x7342	# <CJK>
-0xDEAC	0x733B	# <CJK>
-0xDEAD	0x733A	# <CJK>
-0xDEAE	0x7340	# <CJK>
-0xDEAF	0x734A	# <CJK>
-0xDEB0	0x7349	# <CJK>
-0xDEB1	0x7444	# <CJK>
-0xDEB2	0x744A	# <CJK>
-0xDEB3	0x744B	# <CJK>
-0xDEB4	0x7452	# <CJK>
-0xDEB5	0x7451	# <CJK>
-0xDEB6	0x7457	# <CJK>
-0xDEB7	0x7440	# <CJK>
-0xDEB8	0x744F	# <CJK>
-0xDEB9	0x7450	# <CJK>
-0xDEBA	0x744E	# <CJK>
-0xDEBB	0x7442	# <CJK>
-0xDEBC	0x7446	# <CJK>
-0xDEBD	0x744D	# <CJK>
-0xDEBE	0x7454	# <CJK>
-0xDEBF	0x74E1	# <CJK>
-0xDEC0	0x74FF	# <CJK>
-0xDEC1	0x74FE	# <CJK>
-0xDEC2	0x74FD	# <CJK>
-0xDEC3	0x751D	# <CJK>
-0xDEC4	0x7579	# <CJK>
-0xDEC5	0x7577	# <CJK>
-0xDEC6	0x6983	# <CJK>
-0xDEC7	0x75EF	# <CJK>
-0xDEC8	0x760F	# <CJK>
-0xDEC9	0x7603	# <CJK>
-0xDECA	0x75F7	# <CJK>
-0xDECB	0x75FE	# <CJK>
-0xDECC	0x75FC	# <CJK>
-0xDECD	0x75F9	# <CJK>
-0xDECE	0x75F8	# <CJK>
-0xDECF	0x7610	# <CJK>
-0xDED0	0x75FB	# <CJK>
-0xDED1	0x75F6	# <CJK>
-0xDED2	0x75ED	# <CJK>
-0xDED3	0x75F5	# <CJK>
-0xDED4	0x75FD	# <CJK>
-0xDED5	0x7699	# <CJK>
-0xDED6	0x76B5	# <CJK>
-0xDED7	0x76DD	# <CJK>
-0xDED8	0x7755	# <CJK>
-0xDED9	0x775F	# <CJK>
-0xDEDA	0x7760	# <CJK>
-0xDEDB	0x7752	# <CJK>
-0xDEDC	0x7756	# <CJK>
-0xDEDD	0x775A	# <CJK>
-0xDEDE	0x7769	# <CJK>
-0xDEDF	0x7767	# <CJK>
-0xDEE0	0x7754	# <CJK>
-0xDEE1	0x7759	# <CJK>
-0xDEE2	0x776D	# <CJK>
-0xDEE3	0x77E0	# <CJK>
-0xDEE4	0x7887	# <CJK>
-0xDEE5	0x789A	# <CJK>
-0xDEE6	0x7894	# <CJK>
-0xDEE7	0x788F	# <CJK>
-0xDEE8	0x7884	# <CJK>
-0xDEE9	0x7895	# <CJK>
-0xDEEA	0x7885	# <CJK>
-0xDEEB	0x7886	# <CJK>
-0xDEEC	0x78A1	# <CJK>
-0xDEED	0x7883	# <CJK>
-0xDEEE	0x7879	# <CJK>
-0xDEEF	0x7899	# <CJK>
-0xDEF0	0x7880	# <CJK>
-0xDEF1	0x7896	# <CJK>
-0xDEF2	0x787B	# <CJK>
-0xDEF3	0x797C	# <CJK>
-0xDEF4	0x7982	# <CJK>
-0xDEF5	0x797D	# <CJK>
-0xDEF6	0x7979	# <CJK>
-0xDEF7	0x7A11	# <CJK>
-0xDEF8	0x7A18	# <CJK>
-0xDEF9	0x7A19	# <CJK>
-0xDEFA	0x7A12	# <CJK>
-0xDEFB	0x7A17	# <CJK>
-0xDEFC	0x7A15	# <CJK>
-0xDEFD	0x7A22	# <CJK>
-0xDEFE	0x7A13	# <CJK>
-0xDF40	0x7A1B	# <CJK>
-0xDF41	0x7A10	# <CJK>
-0xDF42	0x7AA3	# <CJK>
-0xDF43	0x7AA2	# <CJK>
-0xDF44	0x7A9E	# <CJK>
-0xDF45	0x7AEB	# <CJK>
-0xDF46	0x7B66	# <CJK>
-0xDF47	0x7B64	# <CJK>
-0xDF48	0x7B6D	# <CJK>
-0xDF49	0x7B74	# <CJK>
-0xDF4A	0x7B69	# <CJK>
-0xDF4B	0x7B72	# <CJK>
-0xDF4C	0x7B65	# <CJK>
-0xDF4D	0x7B73	# <CJK>
-0xDF4E	0x7B71	# <CJK>
-0xDF4F	0x7B70	# <CJK>
-0xDF50	0x7B61	# <CJK>
-0xDF51	0x7B78	# <CJK>
-0xDF52	0x7B76	# <CJK>
-0xDF53	0x7B63	# <CJK>
-0xDF54	0x7CB2	# <CJK>
-0xDF55	0x7CB4	# <CJK>
-0xDF56	0x7CAF	# <CJK>
-0xDF57	0x7D88	# <CJK>
-0xDF58	0x7D86	# <CJK>
-0xDF59	0x7D80	# <CJK>
-0xDF5A	0x7D8D	# <CJK>
-0xDF5B	0x7D7F	# <CJK>
-0xDF5C	0x7D85	# <CJK>
-0xDF5D	0x7D7A	# <CJK>
-0xDF5E	0x7D8E	# <CJK>
-0xDF5F	0x7D7B	# <CJK>
-0xDF60	0x7D83	# <CJK>
-0xDF61	0x7D7C	# <CJK>
-0xDF62	0x7D8C	# <CJK>
-0xDF63	0x7D94	# <CJK>
-0xDF64	0x7D84	# <CJK>
-0xDF65	0x7D7D	# <CJK>
-0xDF66	0x7D92	# <CJK>
-0xDF67	0x7F6D	# <CJK>
-0xDF68	0x7F6B	# <CJK>
-0xDF69	0x7F67	# <CJK>
-0xDF6A	0x7F68	# <CJK>
-0xDF6B	0x7F6C	# <CJK>
-0xDF6C	0x7FA6	# <CJK>
-0xDF6D	0x7FA5	# <CJK>
-0xDF6E	0x7FA7	# <CJK>
-0xDF6F	0x7FDB	# <CJK>
-0xDF70	0x7FDC	# <CJK>
-0xDF71	0x8021	# <CJK>
-0xDF72	0x8164	# <CJK>
-0xDF73	0x8160	# <CJK>
-0xDF74	0x8177	# <CJK>
-0xDF75	0x815C	# <CJK>
-0xDF76	0x8169	# <CJK>
-0xDF77	0x815B	# <CJK>
-0xDF78	0x8162	# <CJK>
-0xDF79	0x8172	# <CJK>
-0xDF7A	0x6721	# <CJK>
-0xDF7B	0x815E	# <CJK>
-0xDF7C	0x8176	# <CJK>
-0xDF7D	0x8167	# <CJK>
-0xDF7E	0x816F	# <CJK>
-0xDFA1	0x8144	# <CJK>
-0xDFA2	0x8161	# <CJK>
-0xDFA3	0x821D	# <CJK>
-0xDFA4	0x8249	# <CJK>
-0xDFA5	0x8244	# <CJK>
-0xDFA6	0x8240	# <CJK>
-0xDFA7	0x8242	# <CJK>
-0xDFA8	0x8245	# <CJK>
-0xDFA9	0x84F1	# <CJK>
-0xDFAA	0x843F	# <CJK>
-0xDFAB	0x8456	# <CJK>
-0xDFAC	0x8476	# <CJK>
-0xDFAD	0x8479	# <CJK>
-0xDFAE	0x848F	# <CJK>
-0xDFAF	0x848D	# <CJK>
-0xDFB0	0x8465	# <CJK>
-0xDFB1	0x8451	# <CJK>
-0xDFB2	0x8440	# <CJK>
-0xDFB3	0x8486	# <CJK>
-0xDFB4	0x8467	# <CJK>
-0xDFB5	0x8430	# <CJK>
-0xDFB6	0x844D	# <CJK>
-0xDFB7	0x847D	# <CJK>
-0xDFB8	0x845A	# <CJK>
-0xDFB9	0x8459	# <CJK>
-0xDFBA	0x8474	# <CJK>
-0xDFBB	0x8473	# <CJK>
-0xDFBC	0x845D	# <CJK>
-0xDFBD	0x8507	# <CJK>
-0xDFBE	0x845E	# <CJK>
-0xDFBF	0x8437	# <CJK>
-0xDFC0	0x843A	# <CJK>
-0xDFC1	0x8434	# <CJK>
-0xDFC2	0x847A	# <CJK>
-0xDFC3	0x8443	# <CJK>
-0xDFC4	0x8478	# <CJK>
-0xDFC5	0x8432	# <CJK>
-0xDFC6	0x8445	# <CJK>
-0xDFC7	0x8429	# <CJK>
-0xDFC8	0x83D9	# <CJK>
-0xDFC9	0x844B	# <CJK>
-0xDFCA	0x842F	# <CJK>
-0xDFCB	0x8442	# <CJK>
-0xDFCC	0x842D	# <CJK>
-0xDFCD	0x845F	# <CJK>
-0xDFCE	0x8470	# <CJK>
-0xDFCF	0x8439	# <CJK>
-0xDFD0	0x844E	# <CJK>
-0xDFD1	0x844C	# <CJK>
-0xDFD2	0x8452	# <CJK>
-0xDFD3	0x846F	# <CJK>
-0xDFD4	0x84C5	# <CJK>
-0xDFD5	0x848E	# <CJK>
-0xDFD6	0x843B	# <CJK>
-0xDFD7	0x8447	# <CJK>
-0xDFD8	0x8436	# <CJK>
-0xDFD9	0x8433	# <CJK>
-0xDFDA	0x8468	# <CJK>
-0xDFDB	0x847E	# <CJK>
-0xDFDC	0x8444	# <CJK>
-0xDFDD	0x842B	# <CJK>
-0xDFDE	0x8460	# <CJK>
-0xDFDF	0x8454	# <CJK>
-0xDFE0	0x846E	# <CJK>
-0xDFE1	0x8450	# <CJK>
-0xDFE2	0x870B	# <CJK>
-0xDFE3	0x8704	# <CJK>
-0xDFE4	0x86F7	# <CJK>
-0xDFE5	0x870C	# <CJK>
-0xDFE6	0x86FA	# <CJK>
-0xDFE7	0x86D6	# <CJK>
-0xDFE8	0x86F5	# <CJK>
-0xDFE9	0x874D	# <CJK>
-0xDFEA	0x86F8	# <CJK>
-0xDFEB	0x870E	# <CJK>
-0xDFEC	0x8709	# <CJK>
-0xDFED	0x8701	# <CJK>
-0xDFEE	0x86F6	# <CJK>
-0xDFEF	0x870D	# <CJK>
-0xDFF0	0x8705	# <CJK>
-0xDFF1	0x88D6	# <CJK>
-0xDFF2	0x88CB	# <CJK>
-0xDFF3	0x88CD	# <CJK>
-0xDFF4	0x88CE	# <CJK>
-0xDFF5	0x88DE	# <CJK>
-0xDFF6	0x88DB	# <CJK>
-0xDFF7	0x88DA	# <CJK>
-0xDFF8	0x88CC	# <CJK>
-0xDFF9	0x88D0	# <CJK>
-0xDFFA	0x8985	# <CJK>
-0xDFFB	0x899B	# <CJK>
-0xDFFC	0x89DF	# <CJK>
-0xDFFD	0x89E5	# <CJK>
-0xDFFE	0x89E4	# <CJK>
-0xE040	0x89E1	# <CJK>
-0xE041	0x89E0	# <CJK>
-0xE042	0x89E2	# <CJK>
-0xE043	0x89DC	# <CJK>
-0xE044	0x89E6	# <CJK>
-0xE045	0x8A76	# <CJK>
-0xE046	0x8A86	# <CJK>
-0xE047	0x8A7F	# <CJK>
-0xE048	0x8A61	# <CJK>
-0xE049	0x8A3F	# <CJK>
-0xE04A	0x8A77	# <CJK>
-0xE04B	0x8A82	# <CJK>
-0xE04C	0x8A84	# <CJK>
-0xE04D	0x8A75	# <CJK>
-0xE04E	0x8A83	# <CJK>
-0xE04F	0x8A81	# <CJK>
-0xE050	0x8A74	# <CJK>
-0xE051	0x8A7A	# <CJK>
-0xE052	0x8C3C	# <CJK>
-0xE053	0x8C4B	# <CJK>
-0xE054	0x8C4A	# <CJK>
-0xE055	0x8C65	# <CJK>
-0xE056	0x8C64	# <CJK>
-0xE057	0x8C66	# <CJK>
-0xE058	0x8C86	# <CJK>
-0xE059	0x8C84	# <CJK>
-0xE05A	0x8C85	# <CJK>
-0xE05B	0x8CCC	# <CJK>
-0xE05C	0x8D68	# <CJK>
-0xE05D	0x8D69	# <CJK>
-0xE05E	0x8D91	# <CJK>
-0xE05F	0x8D8C	# <CJK>
-0xE060	0x8D8E	# <CJK>
-0xE061	0x8D8F	# <CJK>
-0xE062	0x8D8D	# <CJK>
-0xE063	0x8D93	# <CJK>
-0xE064	0x8D94	# <CJK>
-0xE065	0x8D90	# <CJK>
-0xE066	0x8D92	# <CJK>
-0xE067	0x8DF0	# <CJK>
-0xE068	0x8DE0	# <CJK>
-0xE069	0x8DEC	# <CJK>
-0xE06A	0x8DF1	# <CJK>
-0xE06B	0x8DEE	# <CJK>
-0xE06C	0x8DD0	# <CJK>
-0xE06D	0x8DE9	# <CJK>
-0xE06E	0x8DE3	# <CJK>
-0xE06F	0x8DE2	# <CJK>
-0xE070	0x8DE7	# <CJK>
-0xE071	0x8DF2	# <CJK>
-0xE072	0x8DEB	# <CJK>
-0xE073	0x8DF4	# <CJK>
-0xE074	0x8F06	# <CJK>
-0xE075	0x8EFF	# <CJK>
-0xE076	0x8F01	# <CJK>
-0xE077	0x8F00	# <CJK>
-0xE078	0x8F05	# <CJK>
-0xE079	0x8F07	# <CJK>
-0xE07A	0x8F08	# <CJK>
-0xE07B	0x8F02	# <CJK>
-0xE07C	0x8F0B	# <CJK>
-0xE07D	0x9052	# <CJK>
-0xE07E	0x903F	# <CJK>
-0xE0A1	0x9044	# <CJK>
-0xE0A2	0x9049	# <CJK>
-0xE0A3	0x903D	# <CJK>
-0xE0A4	0x9110	# <CJK>
-0xE0A5	0x910D	# <CJK>
-0xE0A6	0x910F	# <CJK>
-0xE0A7	0x9111	# <CJK>
-0xE0A8	0x9116	# <CJK>
-0xE0A9	0x9114	# <CJK>
-0xE0AA	0x910B	# <CJK>
-0xE0AB	0x910E	# <CJK>
-0xE0AC	0x916E	# <CJK>
-0xE0AD	0x916F	# <CJK>
-0xE0AE	0x9248	# <CJK>
-0xE0AF	0x9252	# <CJK>
-0xE0B0	0x9230	# <CJK>
-0xE0B1	0x923A	# <CJK>
-0xE0B2	0x9266	# <CJK>
-0xE0B3	0x9233	# <CJK>
-0xE0B4	0x9265	# <CJK>
-0xE0B5	0x925E	# <CJK>
-0xE0B6	0x9283	# <CJK>
-0xE0B7	0x922E	# <CJK>
-0xE0B8	0x924A	# <CJK>
-0xE0B9	0x9246	# <CJK>
-0xE0BA	0x926D	# <CJK>
-0xE0BB	0x926C	# <CJK>
-0xE0BC	0x924F	# <CJK>
-0xE0BD	0x9260	# <CJK>
-0xE0BE	0x9267	# <CJK>
-0xE0BF	0x926F	# <CJK>
-0xE0C0	0x9236	# <CJK>
-0xE0C1	0x9261	# <CJK>
-0xE0C2	0x9270	# <CJK>
-0xE0C3	0x9231	# <CJK>
-0xE0C4	0x9254	# <CJK>
-0xE0C5	0x9263	# <CJK>
-0xE0C6	0x9250	# <CJK>
-0xE0C7	0x9272	# <CJK>
-0xE0C8	0x924E	# <CJK>
-0xE0C9	0x9253	# <CJK>
-0xE0CA	0x924C	# <CJK>
-0xE0CB	0x9256	# <CJK>
-0xE0CC	0x9232	# <CJK>
-0xE0CD	0x959F	# <CJK>
-0xE0CE	0x959C	# <CJK>
-0xE0CF	0x959E	# <CJK>
-0xE0D0	0x959B	# <CJK>
-0xE0D1	0x9692	# <CJK>
-0xE0D2	0x9693	# <CJK>
-0xE0D3	0x9691	# <CJK>
-0xE0D4	0x9697	# <CJK>
-0xE0D5	0x96CE	# <CJK>
-0xE0D6	0x96FA	# <CJK>
-0xE0D7	0x96FD	# <CJK>
-0xE0D8	0x96F8	# <CJK>
-0xE0D9	0x96F5	# <CJK>
-0xE0DA	0x9773	# <CJK>
-0xE0DB	0x9777	# <CJK>
-0xE0DC	0x9778	# <CJK>
-0xE0DD	0x9772	# <CJK>
-0xE0DE	0x980F	# <CJK>
-0xE0DF	0x980D	# <CJK>
-0xE0E0	0x980E	# <CJK>
-0xE0E1	0x98AC	# <CJK>
-0xE0E2	0x98F6	# <CJK>
-0xE0E3	0x98F9	# <CJK>
-0xE0E4	0x99AF	# <CJK>
-0xE0E5	0x99B2	# <CJK>
-0xE0E6	0x99B0	# <CJK>
-0xE0E7	0x99B5	# <CJK>
-0xE0E8	0x9AAD	# <CJK>
-0xE0E9	0x9AAB	# <CJK>
-0xE0EA	0x9B5B	# <CJK>
-0xE0EB	0x9CEA	# <CJK>
-0xE0EC	0x9CED	# <CJK>
-0xE0ED	0x9CE7	# <CJK>
-0xE0EE	0x9E80	# <CJK>
-0xE0EF	0x9EFD	# <CJK>
-0xE0F0	0x50E6	# <CJK>
-0xE0F1	0x50D4	# <CJK>
-0xE0F2	0x50D7	# <CJK>
-0xE0F3	0x50E8	# <CJK>
-0xE0F4	0x50F3	# <CJK>
-0xE0F5	0x50DB	# <CJK>
-0xE0F6	0x50EA	# <CJK>
-0xE0F7	0x50DD	# <CJK>
-0xE0F8	0x50E4	# <CJK>
-0xE0F9	0x50D3	# <CJK>
-0xE0FA	0x50EC	# <CJK>
-0xE0FB	0x50F0	# <CJK>
-0xE0FC	0x50EF	# <CJK>
-0xE0FD	0x50E3	# <CJK>
-0xE0FE	0x50E0	# <CJK>
-0xE140	0x51D8	# <CJK>
-0xE141	0x5280	# <CJK>
-0xE142	0x5281	# <CJK>
-0xE143	0x52E9	# <CJK>
-0xE144	0x52EB	# <CJK>
-0xE145	0x5330	# <CJK>
-0xE146	0x53AC	# <CJK>
-0xE147	0x5627	# <CJK>
-0xE148	0x5615	# <CJK>
-0xE149	0x560C	# <CJK>
-0xE14A	0x5612	# <CJK>
-0xE14B	0x55FC	# <CJK>
-0xE14C	0x560F	# <CJK>
-0xE14D	0x561C	# <CJK>
-0xE14E	0x5601	# <CJK>
-0xE14F	0x5613	# <CJK>
-0xE150	0x5602	# <CJK>
-0xE151	0x55FA	# <CJK>
-0xE152	0x561D	# <CJK>
-0xE153	0x5604	# <CJK>
-0xE154	0x55FF	# <CJK>
-0xE155	0x55F9	# <CJK>
-0xE156	0x5889	# <CJK>
-0xE157	0x587C	# <CJK>
-0xE158	0x5890	# <CJK>
-0xE159	0x5898	# <CJK>
-0xE15A	0x5886	# <CJK>
-0xE15B	0x5881	# <CJK>
-0xE15C	0x587F	# <CJK>
-0xE15D	0x5874	# <CJK>
-0xE15E	0x588B	# <CJK>
-0xE15F	0x587A	# <CJK>
-0xE160	0x5887	# <CJK>
-0xE161	0x5891	# <CJK>
-0xE162	0x588E	# <CJK>
-0xE163	0x5876	# <CJK>
-0xE164	0x5882	# <CJK>
-0xE165	0x5888	# <CJK>
-0xE166	0x587B	# <CJK>
-0xE167	0x5894	# <CJK>
-0xE168	0x588F	# <CJK>
-0xE169	0x58FE	# <CJK>
-0xE16A	0x596B	# <CJK>
-0xE16B	0x5ADC	# <CJK>
-0xE16C	0x5AEE	# <CJK>
-0xE16D	0x5AE5	# <CJK>
-0xE16E	0x5AD5	# <CJK>
-0xE16F	0x5AEA	# <CJK>
-0xE170	0x5ADA	# <CJK>
-0xE171	0x5AED	# <CJK>
-0xE172	0x5AEB	# <CJK>
-0xE173	0x5AF3	# <CJK>
-0xE174	0x5AE2	# <CJK>
-0xE175	0x5AE0	# <CJK>
-0xE176	0x5ADB	# <CJK>
-0xE177	0x5AEC	# <CJK>
-0xE178	0x5ADE	# <CJK>
-0xE179	0x5ADD	# <CJK>
-0xE17A	0x5AD9	# <CJK>
-0xE17B	0x5AE8	# <CJK>
-0xE17C	0x5ADF	# <CJK>
-0xE17D	0x5B77	# <CJK>
-0xE17E	0x5BE0	# <CJK>
-0xE1A1	0x5BE3	# <CJK>
-0xE1A2	0x5C63	# <CJK>
-0xE1A3	0x5D82	# <CJK>
-0xE1A4	0x5D80	# <CJK>
-0xE1A5	0x5D7D	# <CJK>
-0xE1A6	0x5D86	# <CJK>
-0xE1A7	0x5D7A	# <CJK>
-0xE1A8	0x5D81	# <CJK>
-0xE1A9	0x5D77	# <CJK>
-0xE1AA	0x5D8A	# <CJK>
-0xE1AB	0x5D89	# <CJK>
-0xE1AC	0x5D88	# <CJK>
-0xE1AD	0x5D7E	# <CJK>
-0xE1AE	0x5D7C	# <CJK>
-0xE1AF	0x5D8D	# <CJK>
-0xE1B0	0x5D79	# <CJK>
-0xE1B1	0x5D7F	# <CJK>
-0xE1B2	0x5E58	# <CJK>
-0xE1B3	0x5E59	# <CJK>
-0xE1B4	0x5E53	# <CJK>
-0xE1B5	0x5ED8	# <CJK>
-0xE1B6	0x5ED1	# <CJK>
-0xE1B7	0x5ED7	# <CJK>
-0xE1B8	0x5ECE	# <CJK>
-0xE1B9	0x5EDC	# <CJK>
-0xE1BA	0x5ED5	# <CJK>
-0xE1BB	0x5ED9	# <CJK>
-0xE1BC	0x5ED2	# <CJK>
-0xE1BD	0x5ED4	# <CJK>
-0xE1BE	0x5F44	# <CJK>
-0xE1BF	0x5F43	# <CJK>
-0xE1C0	0x5F6F	# <CJK>
-0xE1C1	0x5FB6	# <CJK>
-0xE1C2	0x612C	# <CJK>
-0xE1C3	0x6128	# <CJK>
-0xE1C4	0x6141	# <CJK>
-0xE1C5	0x615E	# <CJK>
-0xE1C6	0x6171	# <CJK>
-0xE1C7	0x6173	# <CJK>
-0xE1C8	0x6152	# <CJK>
-0xE1C9	0x6153	# <CJK>
-0xE1CA	0x6172	# <CJK>
-0xE1CB	0x616C	# <CJK>
-0xE1CC	0x6180	# <CJK>
-0xE1CD	0x6174	# <CJK>
-0xE1CE	0x6154	# <CJK>
-0xE1CF	0x617A	# <CJK>
-0xE1D0	0x615B	# <CJK>
-0xE1D1	0x6165	# <CJK>
-0xE1D2	0x613B	# <CJK>
-0xE1D3	0x616A	# <CJK>
-0xE1D4	0x6161	# <CJK>
-0xE1D5	0x6156	# <CJK>
-0xE1D6	0x6229	# <CJK>
-0xE1D7	0x6227	# <CJK>
-0xE1D8	0x622B	# <CJK>
-0xE1D9	0x642B	# <CJK>
-0xE1DA	0x644D	# <CJK>
-0xE1DB	0x645B	# <CJK>
-0xE1DC	0x645D	# <CJK>
-0xE1DD	0x6474	# <CJK>
-0xE1DE	0x6476	# <CJK>
-0xE1DF	0x6472	# <CJK>
-0xE1E0	0x6473	# <CJK>
-0xE1E1	0x647D	# <CJK>
-0xE1E2	0x6475	# <CJK>
-0xE1E3	0x6466	# <CJK>
-0xE1E4	0x64A6	# <CJK>
-0xE1E5	0x644E	# <CJK>
-0xE1E6	0x6482	# <CJK>
-0xE1E7	0x645E	# <CJK>
-0xE1E8	0x645C	# <CJK>
-0xE1E9	0x644B	# <CJK>
-0xE1EA	0x6453	# <CJK>
-0xE1EB	0x6460	# <CJK>
-0xE1EC	0x6450	# <CJK>
-0xE1ED	0x647F	# <CJK>
-0xE1EE	0x643F	# <CJK>
-0xE1EF	0x646C	# <CJK>
-0xE1F0	0x646B	# <CJK>
-0xE1F1	0x6459	# <CJK>
-0xE1F2	0x6465	# <CJK>
-0xE1F3	0x6477	# <CJK>
-0xE1F4	0x6573	# <CJK>
-0xE1F5	0x65A0	# <CJK>
-0xE1F6	0x66A1	# <CJK>
-0xE1F7	0x66A0	# <CJK>
-0xE1F8	0x669F	# <CJK>
-0xE1F9	0x6705	# <CJK>
-0xE1FA	0x6704	# <CJK>
-0xE1FB	0x6722	# <CJK>
-0xE1FC	0x69B1	# <CJK>
-0xE1FD	0x69B6	# <CJK>
-0xE1FE	0x69C9	# <CJK>
-0xE240	0x69A0	# <CJK>
-0xE241	0x69CE	# <CJK>
-0xE242	0x6996	# <CJK>
-0xE243	0x69B0	# <CJK>
-0xE244	0x69AC	# <CJK>
-0xE245	0x69BC	# <CJK>
-0xE246	0x6991	# <CJK>
-0xE247	0x6999	# <CJK>
-0xE248	0x698E	# <CJK>
-0xE249	0x69A7	# <CJK>
-0xE24A	0x698D	# <CJK>
-0xE24B	0x69A9	# <CJK>
-0xE24C	0x69BE	# <CJK>
-0xE24D	0x69AF	# <CJK>
-0xE24E	0x69BF	# <CJK>
-0xE24F	0x69C4	# <CJK>
-0xE250	0x69BD	# <CJK>
-0xE251	0x69A4	# <CJK>
-0xE252	0x69D4	# <CJK>
-0xE253	0x69B9	# <CJK>
-0xE254	0x69CA	# <CJK>
-0xE255	0x699A	# <CJK>
-0xE256	0x69CF	# <CJK>
-0xE257	0x69B3	# <CJK>
-0xE258	0x6993	# <CJK>
-0xE259	0x69AA	# <CJK>
-0xE25A	0x69A1	# <CJK>
-0xE25B	0x699E	# <CJK>
-0xE25C	0x69D9	# <CJK>
-0xE25D	0x6997	# <CJK>
-0xE25E	0x6990	# <CJK>
-0xE25F	0x69C2	# <CJK>
-0xE260	0x69B5	# <CJK>
-0xE261	0x69A5	# <CJK>
-0xE262	0x69C6	# <CJK>
-0xE263	0x6B4A	# <CJK>
-0xE264	0x6B4D	# <CJK>
-0xE265	0x6B4B	# <CJK>
-0xE266	0x6B9E	# <CJK>
-0xE267	0x6B9F	# <CJK>
-0xE268	0x6BA0	# <CJK>
-0xE269	0x6BC3	# <CJK>
-0xE26A	0x6BC4	# <CJK>
-0xE26B	0x6BFE	# <CJK>
-0xE26C	0x6ECE	# <CJK>
-0xE26D	0x6EF5	# <CJK>
-0xE26E	0x6EF1	# <CJK>
-0xE26F	0x6F03	# <CJK>
-0xE270	0x6F25	# <CJK>
-0xE271	0x6EF8	# <CJK>
-0xE272	0x6F37	# <CJK>
-0xE273	0x6EFB	# <CJK>
-0xE274	0x6F2E	# <CJK>
-0xE275	0x6F09	# <CJK>
-0xE276	0x6F4E	# <CJK>
-0xE277	0x6F19	# <CJK>
-0xE278	0x6F1A	# <CJK>
-0xE279	0x6F27	# <CJK>
-0xE27A	0x6F18	# <CJK>
-0xE27B	0x6F3B	# <CJK>
-0xE27C	0x6F12	# <CJK>
-0xE27D	0x6EED	# <CJK>
-0xE27E	0x6F0A	# <CJK>
-0xE2A1	0x6F36	# <CJK>
-0xE2A2	0x6F73	# <CJK>
-0xE2A3	0x6EF9	# <CJK>
-0xE2A4	0x6EEE	# <CJK>
-0xE2A5	0x6F2D	# <CJK>
-0xE2A6	0x6F40	# <CJK>
-0xE2A7	0x6F30	# <CJK>
-0xE2A8	0x6F3C	# <CJK>
-0xE2A9	0x6F35	# <CJK>
-0xE2AA	0x6EEB	# <CJK>
-0xE2AB	0x6F07	# <CJK>
-0xE2AC	0x6F0E	# <CJK>
-0xE2AD	0x6F43	# <CJK>
-0xE2AE	0x6F05	# <CJK>
-0xE2AF	0x6EFD	# <CJK>
-0xE2B0	0x6EF6	# <CJK>
-0xE2B1	0x6F39	# <CJK>
-0xE2B2	0x6F1C	# <CJK>
-0xE2B3	0x6EFC	# <CJK>
-0xE2B4	0x6F3A	# <CJK>
-0xE2B5	0x6F1F	# <CJK>
-0xE2B6	0x6F0D	# <CJK>
-0xE2B7	0x6F1E	# <CJK>
-0xE2B8	0x6F08	# <CJK>
-0xE2B9	0x6F21	# <CJK>
-0xE2BA	0x7187	# <CJK>
-0xE2BB	0x7190	# <CJK>
-0xE2BC	0x7189	# <CJK>
-0xE2BD	0x7180	# <CJK>
-0xE2BE	0x7185	# <CJK>
-0xE2BF	0x7182	# <CJK>
-0xE2C0	0x718F	# <CJK>
-0xE2C1	0x717B	# <CJK>
-0xE2C2	0x7186	# <CJK>
-0xE2C3	0x7181	# <CJK>
-0xE2C4	0x7197	# <CJK>
-0xE2C5	0x7244	# <CJK>
-0xE2C6	0x7253	# <CJK>
-0xE2C7	0x7297	# <CJK>
-0xE2C8	0x7295	# <CJK>
-0xE2C9	0x7293	# <CJK>
-0xE2CA	0x7343	# <CJK>
-0xE2CB	0x734D	# <CJK>
-0xE2CC	0x7351	# <CJK>
-0xE2CD	0x734C	# <CJK>
-0xE2CE	0x7462	# <CJK>
-0xE2CF	0x7473	# <CJK>
-0xE2D0	0x7471	# <CJK>
-0xE2D1	0x7475	# <CJK>
-0xE2D2	0x7472	# <CJK>
-0xE2D3	0x7467	# <CJK>
-0xE2D4	0x746E	# <CJK>
-0xE2D5	0x7500	# <CJK>
-0xE2D6	0x7502	# <CJK>
-0xE2D7	0x7503	# <CJK>
-0xE2D8	0x757D	# <CJK>
-0xE2D9	0x7590	# <CJK>
-0xE2DA	0x7616	# <CJK>
-0xE2DB	0x7608	# <CJK>
-0xE2DC	0x760C	# <CJK>
-0xE2DD	0x7615	# <CJK>
-0xE2DE	0x7611	# <CJK>
-0xE2DF	0x760A	# <CJK>
-0xE2E0	0x7614	# <CJK>
-0xE2E1	0x76B8	# <CJK>
-0xE2E2	0x7781	# <CJK>
-0xE2E3	0x777C	# <CJK>
-0xE2E4	0x7785	# <CJK>
-0xE2E5	0x7782	# <CJK>
-0xE2E6	0x776E	# <CJK>
-0xE2E7	0x7780	# <CJK>
-0xE2E8	0x776F	# <CJK>
-0xE2E9	0x777E	# <CJK>
-0xE2EA	0x7783	# <CJK>
-0xE2EB	0x78B2	# <CJK>
-0xE2EC	0x78AA	# <CJK>
-0xE2ED	0x78B4	# <CJK>
-0xE2EE	0x78AD	# <CJK>
-0xE2EF	0x78A8	# <CJK>
-0xE2F0	0x787E	# <CJK>
-0xE2F1	0x78AB	# <CJK>
-0xE2F2	0x789E	# <CJK>
-0xE2F3	0x78A5	# <CJK>
-0xE2F4	0x78A0	# <CJK>
-0xE2F5	0x78AC	# <CJK>
-0xE2F6	0x78A2	# <CJK>
-0xE2F7	0x78A4	# <CJK>
-0xE2F8	0x7998	# <CJK>
-0xE2F9	0x798A	# <CJK>
-0xE2FA	0x798B	# <CJK>
-0xE2FB	0x7996	# <CJK>
-0xE2FC	0x7995	# <CJK>
-0xE2FD	0x7994	# <CJK>
-0xE2FE	0x7993	# <CJK>
-0xE340	0x7997	# <CJK>
-0xE341	0x7988	# <CJK>
-0xE342	0x7992	# <CJK>
-0xE343	0x7990	# <CJK>
-0xE344	0x7A2B	# <CJK>
-0xE345	0x7A4A	# <CJK>
-0xE346	0x7A30	# <CJK>
-0xE347	0x7A2F	# <CJK>
-0xE348	0x7A28	# <CJK>
-0xE349	0x7A26	# <CJK>
-0xE34A	0x7AA8	# <CJK>
-0xE34B	0x7AAB	# <CJK>
-0xE34C	0x7AAC	# <CJK>
-0xE34D	0x7AEE	# <CJK>
-0xE34E	0x7B88	# <CJK>
-0xE34F	0x7B9C	# <CJK>
-0xE350	0x7B8A	# <CJK>
-0xE351	0x7B91	# <CJK>
-0xE352	0x7B90	# <CJK>
-0xE353	0x7B96	# <CJK>
-0xE354	0x7B8D	# <CJK>
-0xE355	0x7B8C	# <CJK>
-0xE356	0x7B9B	# <CJK>
-0xE357	0x7B8E	# <CJK>
-0xE358	0x7B85	# <CJK>
-0xE359	0x7B98	# <CJK>
-0xE35A	0x5284	# <CJK>
-0xE35B	0x7B99	# <CJK>
-0xE35C	0x7BA4	# <CJK>
-0xE35D	0x7B82	# <CJK>
-0xE35E	0x7CBB	# <CJK>
-0xE35F	0x7CBF	# <CJK>
-0xE360	0x7CBC	# <CJK>
-0xE361	0x7CBA	# <CJK>
-0xE362	0x7DA7	# <CJK>
-0xE363	0x7DB7	# <CJK>
-0xE364	0x7DC2	# <CJK>
-0xE365	0x7DA3	# <CJK>
-0xE366	0x7DAA	# <CJK>
-0xE367	0x7DC1	# <CJK>
-0xE368	0x7DC0	# <CJK>
-0xE369	0x7DC5	# <CJK>
-0xE36A	0x7D9D	# <CJK>
-0xE36B	0x7DCE	# <CJK>
-0xE36C	0x7DC4	# <CJK>
-0xE36D	0x7DC6	# <CJK>
-0xE36E	0x7DCB	# <CJK>
-0xE36F	0x7DCC	# <CJK>
-0xE370	0x7DAF	# <CJK>
-0xE371	0x7DB9	# <CJK>
-0xE372	0x7D96	# <CJK>
-0xE373	0x7DBC	# <CJK>
-0xE374	0x7D9F	# <CJK>
-0xE375	0x7DA6	# <CJK>
-0xE376	0x7DAE	# <CJK>
-0xE377	0x7DA9	# <CJK>
-0xE378	0x7DA1	# <CJK>
-0xE379	0x7DC9	# <CJK>
-0xE37A	0x7F73	# <CJK>
-0xE37B	0x7FE2	# <CJK>
-0xE37C	0x7FE3	# <CJK>
-0xE37D	0x7FE5	# <CJK>
-0xE37E	0x7FDE	# <CJK>
-0xE3A1	0x8024	# <CJK>
-0xE3A2	0x805D	# <CJK>
-0xE3A3	0x805C	# <CJK>
-0xE3A4	0x8189	# <CJK>
-0xE3A5	0x8186	# <CJK>
-0xE3A6	0x8183	# <CJK>
-0xE3A7	0x8187	# <CJK>
-0xE3A8	0x818D	# <CJK>
-0xE3A9	0x818C	# <CJK>
-0xE3AA	0x818B	# <CJK>
-0xE3AB	0x8215	# <CJK>
-0xE3AC	0x8497	# <CJK>
-0xE3AD	0x84A4	# <CJK>
-0xE3AE	0x84A1	# <CJK>
-0xE3AF	0x849F	# <CJK>
-0xE3B0	0x84BA	# <CJK>
-0xE3B1	0x84CE	# <CJK>
-0xE3B2	0x84C2	# <CJK>
-0xE3B3	0x84AC	# <CJK>
-0xE3B4	0x84AE	# <CJK>
-0xE3B5	0x84AB	# <CJK>
-0xE3B6	0x84B9	# <CJK>
-0xE3B7	0x84B4	# <CJK>
-0xE3B8	0x84C1	# <CJK>
-0xE3B9	0x84CD	# <CJK>
-0xE3BA	0x84AA	# <CJK>
-0xE3BB	0x849A	# <CJK>
-0xE3BC	0x84B1	# <CJK>
-0xE3BD	0x84D0	# <CJK>
-0xE3BE	0x849D	# <CJK>
-0xE3BF	0x84A7	# <CJK>
-0xE3C0	0x84BB	# <CJK>
-0xE3C1	0x84A2	# <CJK>
-0xE3C2	0x8494	# <CJK>
-0xE3C3	0x84C7	# <CJK>
-0xE3C4	0x84CC	# <CJK>
-0xE3C5	0x849B	# <CJK>
-0xE3C6	0x84A9	# <CJK>
-0xE3C7	0x84AF	# <CJK>
-0xE3C8	0x84A8	# <CJK>
-0xE3C9	0x84D6	# <CJK>
-0xE3CA	0x8498	# <CJK>
-0xE3CB	0x84B6	# <CJK>
-0xE3CC	0x84CF	# <CJK>
-0xE3CD	0x84A0	# <CJK>
-0xE3CE	0x84D7	# <CJK>
-0xE3CF	0x84D4	# <CJK>
-0xE3D0	0x84D2	# <CJK>
-0xE3D1	0x84DB	# <CJK>
-0xE3D2	0x84B0	# <CJK>
-0xE3D3	0x8491	# <CJK>
-0xE3D4	0x8661	# <CJK>
-0xE3D5	0x8733	# <CJK>
-0xE3D6	0x8723	# <CJK>
-0xE3D7	0x8728	# <CJK>
-0xE3D8	0x876B	# <CJK>
-0xE3D9	0x8740	# <CJK>
-0xE3DA	0x872E	# <CJK>
-0xE3DB	0x871E	# <CJK>
-0xE3DC	0x8721	# <CJK>
-0xE3DD	0x8719	# <CJK>
-0xE3DE	0x871B	# <CJK>
-0xE3DF	0x8743	# <CJK>
-0xE3E0	0x872C	# <CJK>
-0xE3E1	0x8741	# <CJK>
-0xE3E2	0x873E	# <CJK>
-0xE3E3	0x8746	# <CJK>
-0xE3E4	0x8720	# <CJK>
-0xE3E5	0x8732	# <CJK>
-0xE3E6	0x872A	# <CJK>
-0xE3E7	0x872D	# <CJK>
-0xE3E8	0x873C	# <CJK>
-0xE3E9	0x8712	# <CJK>
-0xE3EA	0x873A	# <CJK>
-0xE3EB	0x8731	# <CJK>
-0xE3EC	0x8735	# <CJK>
-0xE3ED	0x8742	# <CJK>
-0xE3EE	0x8726	# <CJK>
-0xE3EF	0x8727	# <CJK>
-0xE3F0	0x8738	# <CJK>
-0xE3F1	0x8724	# <CJK>
-0xE3F2	0x871A	# <CJK>
-0xE3F3	0x8730	# <CJK>
-0xE3F4	0x8711	# <CJK>
-0xE3F5	0x88F7	# <CJK>
-0xE3F6	0x88E7	# <CJK>
-0xE3F7	0x88F1	# <CJK>
-0xE3F8	0x88F2	# <CJK>
-0xE3F9	0x88FA	# <CJK>
-0xE3FA	0x88FE	# <CJK>
-0xE3FB	0x88EE	# <CJK>
-0xE3FC	0x88FC	# <CJK>
-0xE3FD	0x88F6	# <CJK>
-0xE3FE	0x88FB	# <CJK>
-0xE440	0x88F0	# <CJK>
-0xE441	0x88EC	# <CJK>
-0xE442	0x88EB	# <CJK>
-0xE443	0x899D	# <CJK>
-0xE444	0x89A1	# <CJK>
-0xE445	0x899F	# <CJK>
-0xE446	0x899E	# <CJK>
-0xE447	0x89E9	# <CJK>
-0xE448	0x89EB	# <CJK>
-0xE449	0x89E8	# <CJK>
-0xE44A	0x8AAB	# <CJK>
-0xE44B	0x8A99	# <CJK>
-0xE44C	0x8A8B	# <CJK>
-0xE44D	0x8A92	# <CJK>
-0xE44E	0x8A8F	# <CJK>
-0xE44F	0x8A96	# <CJK>
-0xE450	0x8C3D	# <CJK>
-0xE451	0x8C68	# <CJK>
-0xE452	0x8C69	# <CJK>
-0xE453	0x8CD5	# <CJK>
-0xE454	0x8CCF	# <CJK>
-0xE455	0x8CD7	# <CJK>
-0xE456	0x8D96	# <CJK>
-0xE457	0x8E09	# <CJK>
-0xE458	0x8E02	# <CJK>
-0xE459	0x8DFF	# <CJK>
-0xE45A	0x8E0D	# <CJK>
-0xE45B	0x8DFD	# <CJK>
-0xE45C	0x8E0A	# <CJK>
-0xE45D	0x8E03	# <CJK>
-0xE45E	0x8E07	# <CJK>
-0xE45F	0x8E06	# <CJK>
-0xE460	0x8E05	# <CJK>
-0xE461	0x8DFE	# <CJK>
-0xE462	0x8E00	# <CJK>
-0xE463	0x8E04	# <CJK>
-0xE464	0x8F10	# <CJK>
-0xE465	0x8F11	# <CJK>
-0xE466	0x8F0E	# <CJK>
-0xE467	0x8F0D	# <CJK>
-0xE468	0x9123	# <CJK>
-0xE469	0x911C	# <CJK>
-0xE46A	0x9120	# <CJK>
-0xE46B	0x9122	# <CJK>
-0xE46C	0x911F	# <CJK>
-0xE46D	0x911D	# <CJK>
-0xE46E	0x911A	# <CJK>
-0xE46F	0x9124	# <CJK>
-0xE470	0x9121	# <CJK>
-0xE471	0x911B	# <CJK>
-0xE472	0x917A	# <CJK>
-0xE473	0x9172	# <CJK>
-0xE474	0x9179	# <CJK>
-0xE475	0x9173	# <CJK>
-0xE476	0x92A5	# <CJK>
-0xE477	0x92A4	# <CJK>
-0xE478	0x9276	# <CJK>
-0xE479	0x929B	# <CJK>
-0xE47A	0x927A	# <CJK>
-0xE47B	0x92A0	# <CJK>
-0xE47C	0x9294	# <CJK>
-0xE47D	0x92AA	# <CJK>
-0xE47E	0x928D	# <CJK>
-0xE4A1	0x92A6	# <CJK>
-0xE4A2	0x929A	# <CJK>
-0xE4A3	0x92AB	# <CJK>
-0xE4A4	0x9279	# <CJK>
-0xE4A5	0x9297	# <CJK>
-0xE4A6	0x927F	# <CJK>
-0xE4A7	0x92A3	# <CJK>
-0xE4A8	0x92EE	# <CJK>
-0xE4A9	0x928E	# <CJK>
-0xE4AA	0x9282	# <CJK>
-0xE4AB	0x9295	# <CJK>
-0xE4AC	0x92A2	# <CJK>
-0xE4AD	0x927D	# <CJK>
-0xE4AE	0x9288	# <CJK>
-0xE4AF	0x92A1	# <CJK>
-0xE4B0	0x928A	# <CJK>
-0xE4B1	0x9286	# <CJK>
-0xE4B2	0x928C	# <CJK>
-0xE4B3	0x9299	# <CJK>
-0xE4B4	0x92A7	# <CJK>
-0xE4B5	0x927E	# <CJK>
-0xE4B6	0x9287	# <CJK>
-0xE4B7	0x92A9	# <CJK>
-0xE4B8	0x929D	# <CJK>
-0xE4B9	0x928B	# <CJK>
-0xE4BA	0x922D	# <CJK>
-0xE4BB	0x969E	# <CJK>
-0xE4BC	0x96A1	# <CJK>
-0xE4BD	0x96FF	# <CJK>
-0xE4BE	0x9758	# <CJK>
-0xE4BF	0x977D	# <CJK>
-0xE4C0	0x977A	# <CJK>
-0xE4C1	0x977E	# <CJK>
-0xE4C2	0x9783	# <CJK>
-0xE4C3	0x9780	# <CJK>
-0xE4C4	0x9782	# <CJK>
-0xE4C5	0x977B	# <CJK>
-0xE4C6	0x9784	# <CJK>
-0xE4C7	0x9781	# <CJK>
-0xE4C8	0x977F	# <CJK>
-0xE4C9	0x97CE	# <CJK>
-0xE4CA	0x97CD	# <CJK>
-0xE4CB	0x9816	# <CJK>
-0xE4CC	0x98AD	# <CJK>
-0xE4CD	0x98AE	# <CJK>
-0xE4CE	0x9902	# <CJK>
-0xE4CF	0x9900	# <CJK>
-0xE4D0	0x9907	# <CJK>
-0xE4D1	0x999D	# <CJK>
-0xE4D2	0x999C	# <CJK>
-0xE4D3	0x99C3	# <CJK>
-0xE4D4	0x99B9	# <CJK>
-0xE4D5	0x99BB	# <CJK>
-0xE4D6	0x99BA	# <CJK>
-0xE4D7	0x99C2	# <CJK>
-0xE4D8	0x99BD	# <CJK>
-0xE4D9	0x99C7	# <CJK>
-0xE4DA	0x9AB1	# <CJK>
-0xE4DB	0x9AE3	# <CJK>
-0xE4DC	0x9AE7	# <CJK>
-0xE4DD	0x9B3E	# <CJK>
-0xE4DE	0x9B3F	# <CJK>
-0xE4DF	0x9B60	# <CJK>
-0xE4E0	0x9B61	# <CJK>
-0xE4E1	0x9B5F	# <CJK>
-0xE4E2	0x9CF1	# <CJK>
-0xE4E3	0x9CF2	# <CJK>
-0xE4E4	0x9CF5	# <CJK>
-0xE4E5	0x9EA7	# <CJK>
-0xE4E6	0x50FF	# <CJK>
-0xE4E7	0x5103	# <CJK>
-0xE4E8	0x5130	# <CJK>
-0xE4E9	0x50F8	# <CJK>
-0xE4EA	0x5106	# <CJK>
-0xE4EB	0x5107	# <CJK>
-0xE4EC	0x50F6	# <CJK>
-0xE4ED	0x50FE	# <CJK>
-0xE4EE	0x510B	# <CJK>
-0xE4EF	0x510C	# <CJK>
-0xE4F0	0x50FD	# <CJK>
-0xE4F1	0x510A	# <CJK>
-0xE4F2	0x528B	# <CJK>
-0xE4F3	0x528C	# <CJK>
-0xE4F4	0x52F1	# <CJK>
-0xE4F5	0x52EF	# <CJK>
-0xE4F6	0x5648	# <CJK>
-0xE4F7	0x5642	# <CJK>
-0xE4F8	0x564C	# <CJK>
-0xE4F9	0x5635	# <CJK>
-0xE4FA	0x5641	# <CJK>
-0xE4FB	0x564A	# <CJK>
-0xE4FC	0x5649	# <CJK>
-0xE4FD	0x5646	# <CJK>
-0xE4FE	0x5658	# <CJK>
-0xE540	0x565A	# <CJK>
-0xE541	0x5640	# <CJK>
-0xE542	0x5633	# <CJK>
-0xE543	0x563D	# <CJK>
-0xE544	0x562C	# <CJK>
-0xE545	0x563E	# <CJK>
-0xE546	0x5638	# <CJK>
-0xE547	0x562A	# <CJK>
-0xE548	0x563A	# <CJK>
-0xE549	0x571A	# <CJK>
-0xE54A	0x58AB	# <CJK>
-0xE54B	0x589D	# <CJK>
-0xE54C	0x58B1	# <CJK>
-0xE54D	0x58A0	# <CJK>
-0xE54E	0x58A3	# <CJK>
-0xE54F	0x58AF	# <CJK>
-0xE550	0x58AC	# <CJK>
-0xE551	0x58A5	# <CJK>
-0xE552	0x58A1	# <CJK>
-0xE553	0x58FF	# <CJK>
-0xE554	0x5AFF	# <CJK>
-0xE555	0x5AF4	# <CJK>
-0xE556	0x5AFD	# <CJK>
-0xE557	0x5AF7	# <CJK>
-0xE558	0x5AF6	# <CJK>
-0xE559	0x5B03	# <CJK>
-0xE55A	0x5AF8	# <CJK>
-0xE55B	0x5B02	# <CJK>
-0xE55C	0x5AF9	# <CJK>
-0xE55D	0x5B01	# <CJK>
-0xE55E	0x5B07	# <CJK>
-0xE55F	0x5B05	# <CJK>
-0xE560	0x5B0F	# <CJK>
-0xE561	0x5C67	# <CJK>
-0xE562	0x5D99	# <CJK>
-0xE563	0x5D97	# <CJK>
-0xE564	0x5D9F	# <CJK>
-0xE565	0x5D92	# <CJK>
-0xE566	0x5DA2	# <CJK>
-0xE567	0x5D93	# <CJK>
-0xE568	0x5D95	# <CJK>
-0xE569	0x5DA0	# <CJK>
-0xE56A	0x5D9C	# <CJK>
-0xE56B	0x5DA1	# <CJK>
-0xE56C	0x5D9A	# <CJK>
-0xE56D	0x5D9E	# <CJK>
-0xE56E	0x5E69	# <CJK>
-0xE56F	0x5E5D	# <CJK>
-0xE570	0x5E60	# <CJK>
-0xE571	0x5E5C	# <CJK>
-0xE572	0x7DF3	# <CJK>
-0xE573	0x5EDB	# <CJK>
-0xE574	0x5EDE	# <CJK>
-0xE575	0x5EE1	# <CJK>
-0xE576	0x5F49	# <CJK>
-0xE577	0x5FB2	# <CJK>
-0xE578	0x618B	# <CJK>
-0xE579	0x6183	# <CJK>
-0xE57A	0x6179	# <CJK>
-0xE57B	0x61B1	# <CJK>
-0xE57C	0x61B0	# <CJK>
-0xE57D	0x61A2	# <CJK>
-0xE57E	0x6189	# <CJK>
-0xE5A1	0x619B	# <CJK>
-0xE5A2	0x6193	# <CJK>
-0xE5A3	0x61AF	# <CJK>
-0xE5A4	0x61AD	# <CJK>
-0xE5A5	0x619F	# <CJK>
-0xE5A6	0x6192	# <CJK>
-0xE5A7	0x61AA	# <CJK>
-0xE5A8	0x61A1	# <CJK>
-0xE5A9	0x618D	# <CJK>
-0xE5AA	0x6166	# <CJK>
-0xE5AB	0x61B3	# <CJK>
-0xE5AC	0x622D	# <CJK>
-0xE5AD	0x646E	# <CJK>
-0xE5AE	0x6470	# <CJK>
-0xE5AF	0x6496	# <CJK>
-0xE5B0	0x64A0	# <CJK>
-0xE5B1	0x6485	# <CJK>
-0xE5B2	0x6497	# <CJK>
-0xE5B3	0x649C	# <CJK>
-0xE5B4	0x648F	# <CJK>
-0xE5B5	0x648B	# <CJK>
-0xE5B6	0x648A	# <CJK>
-0xE5B7	0x648C	# <CJK>
-0xE5B8	0x64A3	# <CJK>
-0xE5B9	0x649F	# <CJK>
-0xE5BA	0x6468	# <CJK>
-0xE5BB	0x64B1	# <CJK>
-0xE5BC	0x6498	# <CJK>
-0xE5BD	0x6576	# <CJK>
-0xE5BE	0x657A	# <CJK>
-0xE5BF	0x6579	# <CJK>
-0xE5C0	0x657B	# <CJK>
-0xE5C1	0x65B2	# <CJK>
-0xE5C2	0x65B3	# <CJK>
-0xE5C3	0x66B5	# <CJK>
-0xE5C4	0x66B0	# <CJK>
-0xE5C5	0x66A9	# <CJK>
-0xE5C6	0x66B2	# <CJK>
-0xE5C7	0x66B7	# <CJK>
-0xE5C8	0x66AA	# <CJK>
-0xE5C9	0x66AF	# <CJK>
-0xE5CA	0x6A00	# <CJK>
-0xE5CB	0x6A06	# <CJK>
-0xE5CC	0x6A17	# <CJK>
-0xE5CD	0x69E5	# <CJK>
-0xE5CE	0x69F8	# <CJK>
-0xE5CF	0x6A15	# <CJK>
-0xE5D0	0x69F1	# <CJK>
-0xE5D1	0x69E4	# <CJK>
-0xE5D2	0x6A20	# <CJK>
-0xE5D3	0x69FF	# <CJK>
-0xE5D4	0x69EC	# <CJK>
-0xE5D5	0x69E2	# <CJK>
-0xE5D6	0x6A1B	# <CJK>
-0xE5D7	0x6A1D	# <CJK>
-0xE5D8	0x69FE	# <CJK>
-0xE5D9	0x6A27	# <CJK>
-0xE5DA	0x69F2	# <CJK>
-0xE5DB	0x69EE	# <CJK>
-0xE5DC	0x6A14	# <CJK>
-0xE5DD	0x69F7	# <CJK>
-0xE5DE	0x69E7	# <CJK>
-0xE5DF	0x6A40	# <CJK>
-0xE5E0	0x6A08	# <CJK>
-0xE5E1	0x69E6	# <CJK>
-0xE5E2	0x69FB	# <CJK>
-0xE5E3	0x6A0D	# <CJK>
-0xE5E4	0x69FC	# <CJK>
-0xE5E5	0x69EB	# <CJK>
-0xE5E6	0x6A09	# <CJK>
-0xE5E7	0x6A04	# <CJK>
-0xE5E8	0x6A18	# <CJK>
-0xE5E9	0x6A25	# <CJK>
-0xE5EA	0x6A0F	# <CJK>
-0xE5EB	0x69F6	# <CJK>
-0xE5EC	0x6A26	# <CJK>
-0xE5ED	0x6A07	# <CJK>
-0xE5EE	0x69F4	# <CJK>
-0xE5EF	0x6A16	# <CJK>
-0xE5F0	0x6B51	# <CJK>
-0xE5F1	0x6BA5	# <CJK>
-0xE5F2	0x6BA3	# <CJK>
-0xE5F3	0x6BA2	# <CJK>
-0xE5F4	0x6BA6	# <CJK>
-0xE5F5	0x6C01	# <CJK>
-0xE5F6	0x6C00	# <CJK>
-0xE5F7	0x6BFF	# <CJK>
-0xE5F8	0x6C02	# <CJK>
-0xE5F9	0x6F41	# <CJK>
-0xE5FA	0x6F26	# <CJK>
-0xE5FB	0x6F7E	# <CJK>
-0xE5FC	0x6F87	# <CJK>
-0xE5FD	0x6FC6	# <CJK>
-0xE5FE	0x6F92	# <CJK>
-0xE640	0x6F8D	# <CJK>
-0xE641	0x6F89	# <CJK>
-0xE642	0x6F8C	# <CJK>
-0xE643	0x6F62	# <CJK>
-0xE644	0x6F4F	# <CJK>
-0xE645	0x6F85	# <CJK>
-0xE646	0x6F5A	# <CJK>
-0xE647	0x6F96	# <CJK>
-0xE648	0x6F76	# <CJK>
-0xE649	0x6F6C	# <CJK>
-0xE64A	0x6F82	# <CJK>
-0xE64B	0x6F55	# <CJK>
-0xE64C	0x6F72	# <CJK>
-0xE64D	0x6F52	# <CJK>
-0xE64E	0x6F50	# <CJK>
-0xE64F	0x6F57	# <CJK>
-0xE650	0x6F94	# <CJK>
-0xE651	0x6F93	# <CJK>
-0xE652	0x6F5D	# <CJK>
-0xE653	0x6F00	# <CJK>
-0xE654	0x6F61	# <CJK>
-0xE655	0x6F6B	# <CJK>
-0xE656	0x6F7D	# <CJK>
-0xE657	0x6F67	# <CJK>
-0xE658	0x6F90	# <CJK>
-0xE659	0x6F53	# <CJK>
-0xE65A	0x6F8B	# <CJK>
-0xE65B	0x6F69	# <CJK>
-0xE65C	0x6F7F	# <CJK>
-0xE65D	0x6F95	# <CJK>
-0xE65E	0x6F63	# <CJK>
-0xE65F	0x6F77	# <CJK>
-0xE660	0x6F6A	# <CJK>
-0xE661	0x6F7B	# <CJK>
-0xE662	0x71B2	# <CJK>
-0xE663	0x71AF	# <CJK>
-0xE664	0x719B	# <CJK>
-0xE665	0x71B0	# <CJK>
-0xE666	0x71A0	# <CJK>
-0xE667	0x719A	# <CJK>
-0xE668	0x71A9	# <CJK>
-0xE669	0x71B5	# <CJK>
-0xE66A	0x719D	# <CJK>
-0xE66B	0x71A5	# <CJK>
-0xE66C	0x719E	# <CJK>
-0xE66D	0x71A4	# <CJK>
-0xE66E	0x71A1	# <CJK>
-0xE66F	0x71AA	# <CJK>
-0xE670	0x719C	# <CJK>
-0xE671	0x71A7	# <CJK>
-0xE672	0x71B3	# <CJK>
-0xE673	0x7298	# <CJK>
-0xE674	0x729A	# <CJK>
-0xE675	0x7358	# <CJK>
-0xE676	0x7352	# <CJK>
-0xE677	0x735E	# <CJK>
-0xE678	0x735F	# <CJK>
-0xE679	0x7360	# <CJK>
-0xE67A	0x735D	# <CJK>
-0xE67B	0x735B	# <CJK>
-0xE67C	0x7361	# <CJK>
-0xE67D	0x735A	# <CJK>
-0xE67E	0x7359	# <CJK>
-0xE6A1	0x7362	# <CJK>
-0xE6A2	0x7487	# <CJK>
-0xE6A3	0x7489	# <CJK>
-0xE6A4	0x748A	# <CJK>
-0xE6A5	0x7486	# <CJK>
-0xE6A6	0x7481	# <CJK>
-0xE6A7	0x747D	# <CJK>
-0xE6A8	0x7485	# <CJK>
-0xE6A9	0x7488	# <CJK>
-0xE6AA	0x747C	# <CJK>
-0xE6AB	0x7479	# <CJK>
-0xE6AC	0x7508	# <CJK>
-0xE6AD	0x7507	# <CJK>
-0xE6AE	0x757E	# <CJK>
-0xE6AF	0x7625	# <CJK>
-0xE6B0	0x761E	# <CJK>
-0xE6B1	0x7619	# <CJK>
-0xE6B2	0x761D	# <CJK>
-0xE6B3	0x761C	# <CJK>
-0xE6B4	0x7623	# <CJK>
-0xE6B5	0x761A	# <CJK>
-0xE6B6	0x7628	# <CJK>
-0xE6B7	0x761B	# <CJK>
-0xE6B8	0x769C	# <CJK>
-0xE6B9	0x769D	# <CJK>
-0xE6BA	0x769E	# <CJK>
-0xE6BB	0x769B	# <CJK>
-0xE6BC	0x778D	# <CJK>
-0xE6BD	0x778F	# <CJK>
-0xE6BE	0x7789	# <CJK>
-0xE6BF	0x7788	# <CJK>
-0xE6C0	0x78CD	# <CJK>
-0xE6C1	0x78BB	# <CJK>
-0xE6C2	0x78CF	# <CJK>
-0xE6C3	0x78CC	# <CJK>
-0xE6C4	0x78D1	# <CJK>
-0xE6C5	0x78CE	# <CJK>
-0xE6C6	0x78D4	# <CJK>
-0xE6C7	0x78C8	# <CJK>
-0xE6C8	0x78C3	# <CJK>
-0xE6C9	0x78C4	# <CJK>
-0xE6CA	0x78C9	# <CJK>
-0xE6CB	0x799A	# <CJK>
-0xE6CC	0x79A1	# <CJK>
-0xE6CD	0x79A0	# <CJK>
-0xE6CE	0x799C	# <CJK>
-0xE6CF	0x79A2	# <CJK>
-0xE6D0	0x799B	# <CJK>
-0xE6D1	0x6B76	# <CJK>
-0xE6D2	0x7A39	# <CJK>
-0xE6D3	0x7AB2	# <CJK>
-0xE6D4	0x7AB4	# <CJK>
-0xE6D5	0x7AB3	# <CJK>
-0xE6D6	0x7BB7	# <CJK>
-0xE6D7	0x7BCB	# <CJK>
-0xE6D8	0x7BBE	# <CJK>
-0xE6D9	0x7BAC	# <CJK>
-0xE6DA	0x7BCE	# <CJK>
-0xE6DB	0x7BAF	# <CJK>
-0xE6DC	0x7BB9	# <CJK>
-0xE6DD	0x7BCA	# <CJK>
-0xE6DE	0x7BB5	# <CJK>
-0xE6DF	0x7CC5	# <CJK>
-0xE6E0	0x7CC8	# <CJK>
-0xE6E1	0x7CCC	# <CJK>
-0xE6E2	0x7CCB	# <CJK>
-0xE6E3	0x7DF7	# <CJK>
-0xE6E4	0x7DDB	# <CJK>
-0xE6E5	0x7DEA	# <CJK>
-0xE6E6	0x7DE7	# <CJK>
-0xE6E7	0x7DD7	# <CJK>
-0xE6E8	0x7DE1	# <CJK>
-0xE6E9	0x7E03	# <CJK>
-0xE6EA	0x7DFA	# <CJK>
-0xE6EB	0x7DE6	# <CJK>
-0xE6EC	0x7DF6	# <CJK>
-0xE6ED	0x7DF1	# <CJK>
-0xE6EE	0x7DF0	# <CJK>
-0xE6EF	0x7DEE	# <CJK>
-0xE6F0	0x7DDF	# <CJK>
-0xE6F1	0x7F76	# <CJK>
-0xE6F2	0x7FAC	# <CJK>
-0xE6F3	0x7FB0	# <CJK>
-0xE6F4	0x7FAD	# <CJK>
-0xE6F5	0x7FED	# <CJK>
-0xE6F6	0x7FEB	# <CJK>
-0xE6F7	0x7FEA	# <CJK>
-0xE6F8	0x7FEC	# <CJK>
-0xE6F9	0x7FE6	# <CJK>
-0xE6FA	0x7FE8	# <CJK>
-0xE6FB	0x8064	# <CJK>
-0xE6FC	0x8067	# <CJK>
-0xE6FD	0x81A3	# <CJK>
-0xE6FE	0x819F	# <CJK>
-0xE740	0x819E	# <CJK>
-0xE741	0x8195	# <CJK>
-0xE742	0x81A2	# <CJK>
-0xE743	0x8199	# <CJK>
-0xE744	0x8197	# <CJK>
-0xE745	0x8216	# <CJK>
-0xE746	0x824F	# <CJK>
-0xE747	0x8253	# <CJK>
-0xE748	0x8252	# <CJK>
-0xE749	0x8250	# <CJK>
-0xE74A	0x824E	# <CJK>
-0xE74B	0x8251	# <CJK>
-0xE74C	0x8524	# <CJK>
-0xE74D	0x853B	# <CJK>
-0xE74E	0x850F	# <CJK>
-0xE74F	0x8500	# <CJK>
-0xE750	0x8529	# <CJK>
-0xE751	0x850E	# <CJK>
-0xE752	0x8509	# <CJK>
-0xE753	0x850D	# <CJK>
-0xE754	0x851F	# <CJK>
-0xE755	0x850A	# <CJK>
-0xE756	0x8527	# <CJK>
-0xE757	0x851C	# <CJK>
-0xE758	0x84FB	# <CJK>
-0xE759	0x852B	# <CJK>
-0xE75A	0x84FA	# <CJK>
-0xE75B	0x8508	# <CJK>
-0xE75C	0x850C	# <CJK>
-0xE75D	0x84F4	# <CJK>
-0xE75E	0x852A	# <CJK>
-0xE75F	0x84F2	# <CJK>
-0xE760	0x8515	# <CJK>
-0xE761	0x84F7	# <CJK>
-0xE762	0x84EB	# <CJK>
-0xE763	0x84F3	# <CJK>
-0xE764	0x84FC	# <CJK>
-0xE765	0x8512	# <CJK>
-0xE766	0x84EA	# <CJK>
-0xE767	0x84E9	# <CJK>
-0xE768	0x8516	# <CJK>
-0xE769	0x84FE	# <CJK>
-0xE76A	0x8528	# <CJK>
-0xE76B	0x851D	# <CJK>
-0xE76C	0x852E	# <CJK>
-0xE76D	0x8502	# <CJK>
-0xE76E	0x84FD	# <CJK>
-0xE76F	0x851E	# <CJK>
-0xE770	0x84F6	# <CJK>
-0xE771	0x8531	# <CJK>
-0xE772	0x8526	# <CJK>
-0xE773	0x84E7	# <CJK>
-0xE774	0x84E8	# <CJK>
-0xE775	0x84F0	# <CJK>
-0xE776	0x84EF	# <CJK>
-0xE777	0x84F9	# <CJK>
-0xE778	0x8518	# <CJK>
-0xE779	0x8520	# <CJK>
-0xE77A	0x8530	# <CJK>
-0xE77B	0x850B	# <CJK>
-0xE77C	0x8519	# <CJK>
-0xE77D	0x852F	# <CJK>
-0xE77E	0x8662	# <CJK>
-0xE7A1	0x8756	# <CJK>
-0xE7A2	0x8763	# <CJK>
-0xE7A3	0x8764	# <CJK>
-0xE7A4	0x8777	# <CJK>
-0xE7A5	0x87E1	# <CJK>
-0xE7A6	0x8773	# <CJK>
-0xE7A7	0x8758	# <CJK>
-0xE7A8	0x8754	# <CJK>
-0xE7A9	0x875B	# <CJK>
-0xE7AA	0x8752	# <CJK>
-0xE7AB	0x8761	# <CJK>
-0xE7AC	0x875A	# <CJK>
-0xE7AD	0x8751	# <CJK>
-0xE7AE	0x875E	# <CJK>
-0xE7AF	0x876D	# <CJK>
-0xE7B0	0x876A	# <CJK>
-0xE7B1	0x8750	# <CJK>
-0xE7B2	0x874E	# <CJK>
-0xE7B3	0x875F	# <CJK>
-0xE7B4	0x875D	# <CJK>
-0xE7B5	0x876F	# <CJK>
-0xE7B6	0x876C	# <CJK>
-0xE7B7	0x877A	# <CJK>
-0xE7B8	0x876E	# <CJK>
-0xE7B9	0x875C	# <CJK>
-0xE7BA	0x8765	# <CJK>
-0xE7BB	0x874F	# <CJK>
-0xE7BC	0x877B	# <CJK>
-0xE7BD	0x8775	# <CJK>
-0xE7BE	0x8762	# <CJK>
-0xE7BF	0x8767	# <CJK>
-0xE7C0	0x8769	# <CJK>
-0xE7C1	0x885A	# <CJK>
-0xE7C2	0x8905	# <CJK>
-0xE7C3	0x890C	# <CJK>
-0xE7C4	0x8914	# <CJK>
-0xE7C5	0x890B	# <CJK>
-0xE7C6	0x8917	# <CJK>
-0xE7C7	0x8918	# <CJK>
-0xE7C8	0x8919	# <CJK>
-0xE7C9	0x8906	# <CJK>
-0xE7CA	0x8916	# <CJK>
-0xE7CB	0x8911	# <CJK>
-0xE7CC	0x890E	# <CJK>
-0xE7CD	0x8909	# <CJK>
-0xE7CE	0x89A2	# <CJK>
-0xE7CF	0x89A4	# <CJK>
-0xE7D0	0x89A3	# <CJK>
-0xE7D1	0x89ED	# <CJK>
-0xE7D2	0x89F0	# <CJK>
-0xE7D3	0x89EC	# <CJK>
-0xE7D4	0x8ACF	# <CJK>
-0xE7D5	0x8AC6	# <CJK>
-0xE7D6	0x8AB8	# <CJK>
-0xE7D7	0x8AD3	# <CJK>
-0xE7D8	0x8AD1	# <CJK>
-0xE7D9	0x8AD4	# <CJK>
-0xE7DA	0x8AD5	# <CJK>
-0xE7DB	0x8ABB	# <CJK>
-0xE7DC	0x8AD7	# <CJK>
-0xE7DD	0x8ABE	# <CJK>
-0xE7DE	0x8AC0	# <CJK>
-0xE7DF	0x8AC5	# <CJK>
-0xE7E0	0x8AD8	# <CJK>
-0xE7E1	0x8AC3	# <CJK>
-0xE7E2	0x8ABA	# <CJK>
-0xE7E3	0x8ABD	# <CJK>
-0xE7E4	0x8AD9	# <CJK>
-0xE7E5	0x8C3E	# <CJK>
-0xE7E6	0x8C4D	# <CJK>
-0xE7E7	0x8C8F	# <CJK>
-0xE7E8	0x8CE5	# <CJK>
-0xE7E9	0x8CDF	# <CJK>
-0xE7EA	0x8CD9	# <CJK>
-0xE7EB	0x8CE8	# <CJK>
-0xE7EC	0x8CDA	# <CJK>
-0xE7ED	0x8CDD	# <CJK>
-0xE7EE	0x8CE7	# <CJK>
-0xE7EF	0x8DA0	# <CJK>
-0xE7F0	0x8D9C	# <CJK>
-0xE7F1	0x8DA1	# <CJK>
-0xE7F2	0x8D9B	# <CJK>
-0xE7F3	0x8E20	# <CJK>
-0xE7F4	0x8E23	# <CJK>
-0xE7F5	0x8E25	# <CJK>
-0xE7F6	0x8E24	# <CJK>
-0xE7F7	0x8E2E	# <CJK>
-0xE7F8	0x8E15	# <CJK>
-0xE7F9	0x8E1B	# <CJK>
-0xE7FA	0x8E16	# <CJK>
-0xE7FB	0x8E11	# <CJK>
-0xE7FC	0x8E19	# <CJK>
-0xE7FD	0x8E26	# <CJK>
-0xE7FE	0x8E27	# <CJK>
-0xE840	0x8E14	# <CJK>
-0xE841	0x8E12	# <CJK>
-0xE842	0x8E18	# <CJK>
-0xE843	0x8E13	# <CJK>
-0xE844	0x8E1C	# <CJK>
-0xE845	0x8E17	# <CJK>
-0xE846	0x8E1A	# <CJK>
-0xE847	0x8F2C	# <CJK>
-0xE848	0x8F24	# <CJK>
-0xE849	0x8F18	# <CJK>
-0xE84A	0x8F1A	# <CJK>
-0xE84B	0x8F20	# <CJK>
-0xE84C	0x8F23	# <CJK>
-0xE84D	0x8F16	# <CJK>
-0xE84E	0x8F17	# <CJK>
-0xE84F	0x9073	# <CJK>
-0xE850	0x9070	# <CJK>
-0xE851	0x906F	# <CJK>
-0xE852	0x9067	# <CJK>
-0xE853	0x906B	# <CJK>
-0xE854	0x912F	# <CJK>
-0xE855	0x912B	# <CJK>
-0xE856	0x9129	# <CJK>
-0xE857	0x912A	# <CJK>
-0xE858	0x9132	# <CJK>
-0xE859	0x9126	# <CJK>
-0xE85A	0x912E	# <CJK>
-0xE85B	0x9185	# <CJK>
-0xE85C	0x9186	# <CJK>
-0xE85D	0x918A	# <CJK>
-0xE85E	0x9181	# <CJK>
-0xE85F	0x9182	# <CJK>
-0xE860	0x9184	# <CJK>
-0xE861	0x9180	# <CJK>
-0xE862	0x92D0	# <CJK>
-0xE863	0x92C3	# <CJK>
-0xE864	0x92C4	# <CJK>
-0xE865	0x92C0	# <CJK>
-0xE866	0x92D9	# <CJK>
-0xE867	0x92B6	# <CJK>
-0xE868	0x92CF	# <CJK>
-0xE869	0x92F1	# <CJK>
-0xE86A	0x92DF	# <CJK>
-0xE86B	0x92D8	# <CJK>
-0xE86C	0x92E9	# <CJK>
-0xE86D	0x92D7	# <CJK>
-0xE86E	0x92DD	# <CJK>
-0xE86F	0x92CC	# <CJK>
-0xE870	0x92EF	# <CJK>
-0xE871	0x92C2	# <CJK>
-0xE872	0x92E8	# <CJK>
-0xE873	0x92CA	# <CJK>
-0xE874	0x92C8	# <CJK>
-0xE875	0x92CE	# <CJK>
-0xE876	0x92E6	# <CJK>
-0xE877	0x92CD	# <CJK>
-0xE878	0x92D5	# <CJK>
-0xE879	0x92C9	# <CJK>
-0xE87A	0x92E0	# <CJK>
-0xE87B	0x92DE	# <CJK>
-0xE87C	0x92E7	# <CJK>
-0xE87D	0x92D1	# <CJK>
-0xE87E	0x92D3	# <CJK>
-0xE8A1	0x92B5	# <CJK>
-0xE8A2	0x92E1	# <CJK>
-0xE8A3	0x92C6	# <CJK>
-0xE8A4	0x92B4	# <CJK>
-0xE8A5	0x957C	# <CJK>
-0xE8A6	0x95AC	# <CJK>
-0xE8A7	0x95AB	# <CJK>
-0xE8A8	0x95AE	# <CJK>
-0xE8A9	0x95B0	# <CJK>
-0xE8AA	0x96A4	# <CJK>
-0xE8AB	0x96A2	# <CJK>
-0xE8AC	0x96D3	# <CJK>
-0xE8AD	0x9705	# <CJK>
-0xE8AE	0x9708	# <CJK>
-0xE8AF	0x9702	# <CJK>
-0xE8B0	0x975A	# <CJK>
-0xE8B1	0x978A	# <CJK>
-0xE8B2	0x978E	# <CJK>
-0xE8B3	0x9788	# <CJK>
-0xE8B4	0x97D0	# <CJK>
-0xE8B5	0x97CF	# <CJK>
-0xE8B6	0x981E	# <CJK>
-0xE8B7	0x981D	# <CJK>
-0xE8B8	0x9826	# <CJK>
-0xE8B9	0x9829	# <CJK>
-0xE8BA	0x9828	# <CJK>
-0xE8BB	0x9820	# <CJK>
-0xE8BC	0x981B	# <CJK>
-0xE8BD	0x9827	# <CJK>
-0xE8BE	0x98B2	# <CJK>
-0xE8BF	0x9908	# <CJK>
-0xE8C0	0x98FA	# <CJK>
-0xE8C1	0x9911	# <CJK>
-0xE8C2	0x9914	# <CJK>
-0xE8C3	0x9916	# <CJK>
-0xE8C4	0x9917	# <CJK>
-0xE8C5	0x9915	# <CJK>
-0xE8C6	0x99DC	# <CJK>
-0xE8C7	0x99CD	# <CJK>
-0xE8C8	0x99CF	# <CJK>
-0xE8C9	0x99D3	# <CJK>
-0xE8CA	0x99D4	# <CJK>
-0xE8CB	0x99CE	# <CJK>
-0xE8CC	0x99C9	# <CJK>
-0xE8CD	0x99D6	# <CJK>
-0xE8CE	0x99D8	# <CJK>
-0xE8CF	0x99CB	# <CJK>
-0xE8D0	0x99D7	# <CJK>
-0xE8D1	0x99CC	# <CJK>
-0xE8D2	0x9AB3	# <CJK>
-0xE8D3	0x9AEC	# <CJK>
-0xE8D4	0x9AEB	# <CJK>
-0xE8D5	0x9AF3	# <CJK>
-0xE8D6	0x9AF2	# <CJK>
-0xE8D7	0x9AF1	# <CJK>
-0xE8D8	0x9B46	# <CJK>
-0xE8D9	0x9B43	# <CJK>
-0xE8DA	0x9B67	# <CJK>
-0xE8DB	0x9B74	# <CJK>
-0xE8DC	0x9B71	# <CJK>
-0xE8DD	0x9B66	# <CJK>
-0xE8DE	0x9B76	# <CJK>
-0xE8DF	0x9B75	# <CJK>
-0xE8E0	0x9B70	# <CJK>
-0xE8E1	0x9B68	# <CJK>
-0xE8E2	0x9B64	# <CJK>
-0xE8E3	0x9B6C	# <CJK>
-0xE8E4	0x9CFC	# <CJK>
-0xE8E5	0x9CFA	# <CJK>
-0xE8E6	0x9CFD	# <CJK>
-0xE8E7	0x9CFF	# <CJK>
-0xE8E8	0x9CF7	# <CJK>
-0xE8E9	0x9D07	# <CJK>
-0xE8EA	0x9D00	# <CJK>
-0xE8EB	0x9CF9	# <CJK>
-0xE8EC	0x9CFB	# <CJK>
-0xE8ED	0x9D08	# <CJK>
-0xE8EE	0x9D05	# <CJK>
-0xE8EF	0x9D04	# <CJK>
-0xE8F0	0x9E83	# <CJK>
-0xE8F1	0x9ED3	# <CJK>
-0xE8F2	0x9F0F	# <CJK>
-0xE8F3	0x9F10	# <CJK>
-0xE8F4	0x511C	# <CJK>
-0xE8F5	0x5113	# <CJK>
-0xE8F6	0x5117	# <CJK>
-0xE8F7	0x511A	# <CJK>
-0xE8F8	0x5111	# <CJK>
-0xE8F9	0x51DE	# <CJK>
-0xE8FA	0x5334	# <CJK>
-0xE8FB	0x53E1	# <CJK>
-0xE8FC	0x5670	# <CJK>
-0xE8FD	0x5660	# <CJK>
-0xE8FE	0x566E	# <CJK>
-0xE940	0x5673	# <CJK>
-0xE941	0x5666	# <CJK>
-0xE942	0x5663	# <CJK>
-0xE943	0x566D	# <CJK>
-0xE944	0x5672	# <CJK>
-0xE945	0x565E	# <CJK>
-0xE946	0x5677	# <CJK>
-0xE947	0x571C	# <CJK>
-0xE948	0x571B	# <CJK>
-0xE949	0x58C8	# <CJK>
-0xE94A	0x58BD	# <CJK>
-0xE94B	0x58C9	# <CJK>
-0xE94C	0x58BF	# <CJK>
-0xE94D	0x58BA	# <CJK>
-0xE94E	0x58C2	# <CJK>
-0xE94F	0x58BC	# <CJK>
-0xE950	0x58C6	# <CJK>
-0xE951	0x5B17	# <CJK>
-0xE952	0x5B19	# <CJK>
-0xE953	0x5B1B	# <CJK>
-0xE954	0x5B21	# <CJK>
-0xE955	0x5B14	# <CJK>
-0xE956	0x5B13	# <CJK>
-0xE957	0x5B10	# <CJK>
-0xE958	0x5B16	# <CJK>
-0xE959	0x5B28	# <CJK>
-0xE95A	0x5B1A	# <CJK>
-0xE95B	0x5B20	# <CJK>
-0xE95C	0x5B1E	# <CJK>
-0xE95D	0x5BEF	# <CJK>
-0xE95E	0x5DAC	# <CJK>
-0xE95F	0x5DB1	# <CJK>
-0xE960	0x5DA9	# <CJK>
-0xE961	0x5DA7	# <CJK>
-0xE962	0x5DB5	# <CJK>
-0xE963	0x5DB0	# <CJK>
-0xE964	0x5DAE	# <CJK>
-0xE965	0x5DAA	# <CJK>
-0xE966	0x5DA8	# <CJK>
-0xE967	0x5DB2	# <CJK>
-0xE968	0x5DAD	# <CJK>
-0xE969	0x5DAF	# <CJK>
-0xE96A	0x5DB4	# <CJK>
-0xE96B	0x5E67	# <CJK>
-0xE96C	0x5E68	# <CJK>
-0xE96D	0x5E66	# <CJK>
-0xE96E	0x5E6F	# <CJK>
-0xE96F	0x5EE9	# <CJK>
-0xE970	0x5EE7	# <CJK>
-0xE971	0x5EE6	# <CJK>
-0xE972	0x5EE8	# <CJK>
-0xE973	0x5EE5	# <CJK>
-0xE974	0x5F4B	# <CJK>
-0xE975	0x5FBC	# <CJK>
-0xE976	0x619D	# <CJK>
-0xE977	0x61A8	# <CJK>
-0xE978	0x6196	# <CJK>
-0xE979	0x61C5	# <CJK>
-0xE97A	0x61B4	# <CJK>
-0xE97B	0x61C6	# <CJK>
-0xE97C	0x61C1	# <CJK>
-0xE97D	0x61CC	# <CJK>
-0xE97E	0x61BA	# <CJK>
-0xE9A1	0x61BF	# <CJK>
-0xE9A2	0x61B8	# <CJK>
-0xE9A3	0x618C	# <CJK>
-0xE9A4	0x64D7	# <CJK>
-0xE9A5	0x64D6	# <CJK>
-0xE9A6	0x64D0	# <CJK>
-0xE9A7	0x64CF	# <CJK>
-0xE9A8	0x64C9	# <CJK>
-0xE9A9	0x64BD	# <CJK>
-0xE9AA	0x6489	# <CJK>
-0xE9AB	0x64C3	# <CJK>
-0xE9AC	0x64DB	# <CJK>
-0xE9AD	0x64F3	# <CJK>
-0xE9AE	0x64D9	# <CJK>
-0xE9AF	0x6533	# <CJK>
-0xE9B0	0x657F	# <CJK>
-0xE9B1	0x657C	# <CJK>
-0xE9B2	0x65A2	# <CJK>
-0xE9B3	0x66C8	# <CJK>
-0xE9B4	0x66BE	# <CJK>
-0xE9B5	0x66C0	# <CJK>
-0xE9B6	0x66CA	# <CJK>
-0xE9B7	0x66CB	# <CJK>
-0xE9B8	0x66CF	# <CJK>
-0xE9B9	0x66BD	# <CJK>
-0xE9BA	0x66BB	# <CJK>
-0xE9BB	0x66BA	# <CJK>
-0xE9BC	0x66CC	# <CJK>
-0xE9BD	0x6723	# <CJK>
-0xE9BE	0x6A34	# <CJK>
-0xE9BF	0x6A66	# <CJK>
-0xE9C0	0x6A49	# <CJK>
-0xE9C1	0x6A67	# <CJK>
-0xE9C2	0x6A32	# <CJK>
-0xE9C3	0x6A68	# <CJK>
-0xE9C4	0x6A3E	# <CJK>
-0xE9C5	0x6A5D	# <CJK>
-0xE9C6	0x6A6D	# <CJK>
-0xE9C7	0x6A76	# <CJK>
-0xE9C8	0x6A5B	# <CJK>
-0xE9C9	0x6A51	# <CJK>
-0xE9CA	0x6A28	# <CJK>
-0xE9CB	0x6A5A	# <CJK>
-0xE9CC	0x6A3B	# <CJK>
-0xE9CD	0x6A3F	# <CJK>
-0xE9CE	0x6A41	# <CJK>
-0xE9CF	0x6A6A	# <CJK>
-0xE9D0	0x6A64	# <CJK>
-0xE9D1	0x6A50	# <CJK>
-0xE9D2	0x6A4F	# <CJK>
-0xE9D3	0x6A54	# <CJK>
-0xE9D4	0x6A6F	# <CJK>
-0xE9D5	0x6A69	# <CJK>
-0xE9D6	0x6A60	# <CJK>
-0xE9D7	0x6A3C	# <CJK>
-0xE9D8	0x6A5E	# <CJK>
-0xE9D9	0x6A56	# <CJK>
-0xE9DA	0x6A55	# <CJK>
-0xE9DB	0x6A4D	# <CJK>
-0xE9DC	0x6A4E	# <CJK>
-0xE9DD	0x6A46	# <CJK>
-0xE9DE	0x6B55	# <CJK>
-0xE9DF	0x6B54	# <CJK>
-0xE9E0	0x6B56	# <CJK>
-0xE9E1	0x6BA7	# <CJK>
-0xE9E2	0x6BAA	# <CJK>
-0xE9E3	0x6BAB	# <CJK>
-0xE9E4	0x6BC8	# <CJK>
-0xE9E5	0x6BC7	# <CJK>
-0xE9E6	0x6C04	# <CJK>
-0xE9E7	0x6C03	# <CJK>
-0xE9E8	0x6C06	# <CJK>
-0xE9E9	0x6FAD	# <CJK>
-0xE9EA	0x6FCB	# <CJK>
-0xE9EB	0x6FA3	# <CJK>
-0xE9EC	0x6FC7	# <CJK>
-0xE9ED	0x6FBC	# <CJK>
-0xE9EE	0x6FCE	# <CJK>
-0xE9EF	0x6FC8	# <CJK>
-0xE9F0	0x6F5E	# <CJK>
-0xE9F1	0x6FC4	# <CJK>
-0xE9F2	0x6FBD	# <CJK>
-0xE9F3	0x6F9E	# <CJK>
-0xE9F4	0x6FCA	# <CJK>
-0xE9F5	0x6FA8	# <CJK>
-0xE9F6	0x7004	# <CJK>
-0xE9F7	0x6FA5	# <CJK>
-0xE9F8	0x6FAE	# <CJK>
-0xE9F9	0x6FBA	# <CJK>
-0xE9FA	0x6FAC	# <CJK>
-0xE9FB	0x6FAA	# <CJK>
-0xE9FC	0x6FCF	# <CJK>
-0xE9FD	0x6FBF	# <CJK>
-0xE9FE	0x6FB8	# <CJK>
-0xEA40	0x6FA2	# <CJK>
-0xEA41	0x6FC9	# <CJK>
-0xEA42	0x6FAB	# <CJK>
-0xEA43	0x6FCD	# <CJK>
-0xEA44	0x6FAF	# <CJK>
-0xEA45	0x6FB2	# <CJK>
-0xEA46	0x6FB0	# <CJK>
-0xEA47	0x71C5	# <CJK>
-0xEA48	0x71C2	# <CJK>
-0xEA49	0x71BF	# <CJK>
-0xEA4A	0x71B8	# <CJK>
-0xEA4B	0x71D6	# <CJK>
-0xEA4C	0x71C0	# <CJK>
-0xEA4D	0x71C1	# <CJK>
-0xEA4E	0x71CB	# <CJK>
-0xEA4F	0x71D4	# <CJK>
-0xEA50	0x71CA	# <CJK>
-0xEA51	0x71C7	# <CJK>
-0xEA52	0x71CF	# <CJK>
-0xEA53	0x71BD	# <CJK>
-0xEA54	0x71D8	# <CJK>
-0xEA55	0x71BC	# <CJK>
-0xEA56	0x71C6	# <CJK>
-0xEA57	0x71DA	# <CJK>
-0xEA58	0x71DB	# <CJK>
-0xEA59	0x729D	# <CJK>
-0xEA5A	0x729E	# <CJK>
-0xEA5B	0x7369	# <CJK>
-0xEA5C	0x7366	# <CJK>
-0xEA5D	0x7367	# <CJK>
-0xEA5E	0x736C	# <CJK>
-0xEA5F	0x7365	# <CJK>
-0xEA60	0x736B	# <CJK>
-0xEA61	0x736A	# <CJK>
-0xEA62	0x747F	# <CJK>
-0xEA63	0x749A	# <CJK>
-0xEA64	0x74A0	# <CJK>
-0xEA65	0x7494	# <CJK>
-0xEA66	0x7492	# <CJK>
-0xEA67	0x7495	# <CJK>
-0xEA68	0x74A1	# <CJK>
-0xEA69	0x750B	# <CJK>
-0xEA6A	0x7580	# <CJK>
-0xEA6B	0x762F	# <CJK>
-0xEA6C	0x762D	# <CJK>
-0xEA6D	0x7631	# <CJK>
-0xEA6E	0x763D	# <CJK>
-0xEA6F	0x7633	# <CJK>
-0xEA70	0x763C	# <CJK>
-0xEA71	0x7635	# <CJK>
-0xEA72	0x7632	# <CJK>
-0xEA73	0x7630	# <CJK>
-0xEA74	0x76BB	# <CJK>
-0xEA75	0x76E6	# <CJK>
-0xEA76	0x779A	# <CJK>
-0xEA77	0x779D	# <CJK>
-0xEA78	0x77A1	# <CJK>
-0xEA79	0x779C	# <CJK>
-0xEA7A	0x779B	# <CJK>
-0xEA7B	0x77A2	# <CJK>
-0xEA7C	0x77A3	# <CJK>
-0xEA7D	0x7795	# <CJK>
-0xEA7E	0x7799	# <CJK>
-0xEAA1	0x7797	# <CJK>
-0xEAA2	0x78DD	# <CJK>
-0xEAA3	0x78E9	# <CJK>
-0xEAA4	0x78E5	# <CJK>
-0xEAA5	0x78EA	# <CJK>
-0xEAA6	0x78DE	# <CJK>
-0xEAA7	0x78E3	# <CJK>
-0xEAA8	0x78DB	# <CJK>
-0xEAA9	0x78E1	# <CJK>
-0xEAAA	0x78E2	# <CJK>
-0xEAAB	0x78ED	# <CJK>
-0xEAAC	0x78DF	# <CJK>
-0xEAAD	0x78E0	# <CJK>
-0xEAAE	0x79A4	# <CJK>
-0xEAAF	0x7A44	# <CJK>
-0xEAB0	0x7A48	# <CJK>
-0xEAB1	0x7A47	# <CJK>
-0xEAB2	0x7AB6	# <CJK>
-0xEAB3	0x7AB8	# <CJK>
-0xEAB4	0x7AB5	# <CJK>
-0xEAB5	0x7AB1	# <CJK>
-0xEAB6	0x7AB7	# <CJK>
-0xEAB7	0x7BDE	# <CJK>
-0xEAB8	0x7BE3	# <CJK>
-0xEAB9	0x7BE7	# <CJK>
-0xEABA	0x7BDD	# <CJK>
-0xEABB	0x7BD5	# <CJK>
-0xEABC	0x7BE5	# <CJK>
-0xEABD	0x7BDA	# <CJK>
-0xEABE	0x7BE8	# <CJK>
-0xEABF	0x7BF9	# <CJK>
-0xEAC0	0x7BD4	# <CJK>
-0xEAC1	0x7BEA	# <CJK>
-0xEAC2	0x7BE2	# <CJK>
-0xEAC3	0x7BDC	# <CJK>
-0xEAC4	0x7BEB	# <CJK>
-0xEAC5	0x7BD8	# <CJK>
-0xEAC6	0x7BDF	# <CJK>
-0xEAC7	0x7CD2	# <CJK>
-0xEAC8	0x7CD4	# <CJK>
-0xEAC9	0x7CD7	# <CJK>
-0xEACA	0x7CD0	# <CJK>
-0xEACB	0x7CD1	# <CJK>
-0xEACC	0x7E12	# <CJK>
-0xEACD	0x7E21	# <CJK>
-0xEACE	0x7E17	# <CJK>
-0xEACF	0x7E0C	# <CJK>
-0xEAD0	0x7E1F	# <CJK>
-0xEAD1	0x7E20	# <CJK>
-0xEAD2	0x7E13	# <CJK>
-0xEAD3	0x7E0E	# <CJK>
-0xEAD4	0x7E1C	# <CJK>
-0xEAD5	0x7E15	# <CJK>
-0xEAD6	0x7E1A	# <CJK>
-0xEAD7	0x7E22	# <CJK>
-0xEAD8	0x7E0B	# <CJK>
-0xEAD9	0x7E0F	# <CJK>
-0xEADA	0x7E16	# <CJK>
-0xEADB	0x7E0D	# <CJK>
-0xEADC	0x7E14	# <CJK>
-0xEADD	0x7E25	# <CJK>
-0xEADE	0x7E24	# <CJK>
-0xEADF	0x7F43	# <CJK>
-0xEAE0	0x7F7B	# <CJK>
-0xEAE1	0x7F7C	# <CJK>
-0xEAE2	0x7F7A	# <CJK>
-0xEAE3	0x7FB1	# <CJK>
-0xEAE4	0x7FEF	# <CJK>
-0xEAE5	0x802A	# <CJK>
-0xEAE6	0x8029	# <CJK>
-0xEAE7	0x806C	# <CJK>
-0xEAE8	0x81B1	# <CJK>
-0xEAE9	0x81A6	# <CJK>
-0xEAEA	0x81AE	# <CJK>
-0xEAEB	0x81B9	# <CJK>
-0xEAEC	0x81B5	# <CJK>
-0xEAED	0x81AB	# <CJK>
-0xEAEE	0x81B0	# <CJK>
-0xEAEF	0x81AC	# <CJK>
-0xEAF0	0x81B4	# <CJK>
-0xEAF1	0x81B2	# <CJK>
-0xEAF2	0x81B7	# <CJK>
-0xEAF3	0x81A7	# <CJK>
-0xEAF4	0x81F2	# <CJK>
-0xEAF5	0x8255	# <CJK>
-0xEAF6	0x8256	# <CJK>
-0xEAF7	0x8257	# <CJK>
-0xEAF8	0x8556	# <CJK>
-0xEAF9	0x8545	# <CJK>
-0xEAFA	0x856B	# <CJK>
-0xEAFB	0x854D	# <CJK>
-0xEAFC	0x8553	# <CJK>
-0xEAFD	0x8561	# <CJK>
-0xEAFE	0x8558	# <CJK>
-0xEB40	0x8540	# <CJK>
-0xEB41	0x8546	# <CJK>
-0xEB42	0x8564	# <CJK>
-0xEB43	0x8541	# <CJK>
-0xEB44	0x8562	# <CJK>
-0xEB45	0x8544	# <CJK>
-0xEB46	0x8551	# <CJK>
-0xEB47	0x8547	# <CJK>
-0xEB48	0x8563	# <CJK>
-0xEB49	0x853E	# <CJK>
-0xEB4A	0x855B	# <CJK>
-0xEB4B	0x8571	# <CJK>
-0xEB4C	0x854E	# <CJK>
-0xEB4D	0x856E	# <CJK>
-0xEB4E	0x8575	# <CJK>
-0xEB4F	0x8555	# <CJK>
-0xEB50	0x8567	# <CJK>
-0xEB51	0x8560	# <CJK>
-0xEB52	0x858C	# <CJK>
-0xEB53	0x8566	# <CJK>
-0xEB54	0x855D	# <CJK>
-0xEB55	0x8554	# <CJK>
-0xEB56	0x8565	# <CJK>
-0xEB57	0x856C	# <CJK>
-0xEB58	0x8663	# <CJK>
-0xEB59	0x8665	# <CJK>
-0xEB5A	0x8664	# <CJK>
-0xEB5B	0x879B	# <CJK>
-0xEB5C	0x878F	# <CJK>
-0xEB5D	0x8797	# <CJK>
-0xEB5E	0x8793	# <CJK>
-0xEB5F	0x8792	# <CJK>
-0xEB60	0x8788	# <CJK>
-0xEB61	0x8781	# <CJK>
-0xEB62	0x8796	# <CJK>
-0xEB63	0x8798	# <CJK>
-0xEB64	0x8779	# <CJK>
-0xEB65	0x8787	# <CJK>
-0xEB66	0x87A3	# <CJK>
-0xEB67	0x8785	# <CJK>
-0xEB68	0x8790	# <CJK>
-0xEB69	0x8791	# <CJK>
-0xEB6A	0x879D	# <CJK>
-0xEB6B	0x8784	# <CJK>
-0xEB6C	0x8794	# <CJK>
-0xEB6D	0x879C	# <CJK>
-0xEB6E	0x879A	# <CJK>
-0xEB6F	0x8789	# <CJK>
-0xEB70	0x891E	# <CJK>
-0xEB71	0x8926	# <CJK>
-0xEB72	0x8930	# <CJK>
-0xEB73	0x892D	# <CJK>
-0xEB74	0x892E	# <CJK>
-0xEB75	0x8927	# <CJK>
-0xEB76	0x8931	# <CJK>
-0xEB77	0x8922	# <CJK>
-0xEB78	0x8929	# <CJK>
-0xEB79	0x8923	# <CJK>
-0xEB7A	0x892F	# <CJK>
-0xEB7B	0x892C	# <CJK>
-0xEB7C	0x891F	# <CJK>
-0xEB7D	0x89F1	# <CJK>
-0xEB7E	0x8AE0	# <CJK>
-0xEBA1	0x8AE2	# <CJK>
-0xEBA2	0x8AF2	# <CJK>
-0xEBA3	0x8AF4	# <CJK>
-0xEBA4	0x8AF5	# <CJK>
-0xEBA5	0x8ADD	# <CJK>
-0xEBA6	0x8B14	# <CJK>
-0xEBA7	0x8AE4	# <CJK>
-0xEBA8	0x8ADF	# <CJK>
-0xEBA9	0x8AF0	# <CJK>
-0xEBAA	0x8AC8	# <CJK>
-0xEBAB	0x8ADE	# <CJK>
-0xEBAC	0x8AE1	# <CJK>
-0xEBAD	0x8AE8	# <CJK>
-0xEBAE	0x8AFF	# <CJK>
-0xEBAF	0x8AEF	# <CJK>
-0xEBB0	0x8AFB	# <CJK>
-0xEBB1	0x8C91	# <CJK>
-0xEBB2	0x8C92	# <CJK>
-0xEBB3	0x8C90	# <CJK>
-0xEBB4	0x8CF5	# <CJK>
-0xEBB5	0x8CEE	# <CJK>
-0xEBB6	0x8CF1	# <CJK>
-0xEBB7	0x8CF0	# <CJK>
-0xEBB8	0x8CF3	# <CJK>
-0xEBB9	0x8D6C	# <CJK>
-0xEBBA	0x8D6E	# <CJK>
-0xEBBB	0x8DA5	# <CJK>
-0xEBBC	0x8DA7	# <CJK>
-0xEBBD	0x8E33	# <CJK>
-0xEBBE	0x8E3E	# <CJK>
-0xEBBF	0x8E38	# <CJK>
-0xEBC0	0x8E40	# <CJK>
-0xEBC1	0x8E45	# <CJK>
-0xEBC2	0x8E36	# <CJK>
-0xEBC3	0x8E3C	# <CJK>
-0xEBC4	0x8E3D	# <CJK>
-0xEBC5	0x8E41	# <CJK>
-0xEBC6	0x8E30	# <CJK>
-0xEBC7	0x8E3F	# <CJK>
-0xEBC8	0x8EBD	# <CJK>
-0xEBC9	0x8F36	# <CJK>
-0xEBCA	0x8F2E	# <CJK>
-0xEBCB	0x8F35	# <CJK>
-0xEBCC	0x8F32	# <CJK>
-0xEBCD	0x8F39	# <CJK>
-0xEBCE	0x8F37	# <CJK>
-0xEBCF	0x8F34	# <CJK>
-0xEBD0	0x9076	# <CJK>
-0xEBD1	0x9079	# <CJK>
-0xEBD2	0x907B	# <CJK>
-0xEBD3	0x9086	# <CJK>
-0xEBD4	0x90FA	# <CJK>
-0xEBD5	0x9133	# <CJK>
-0xEBD6	0x9135	# <CJK>
-0xEBD7	0x9136	# <CJK>
-0xEBD8	0x9193	# <CJK>
-0xEBD9	0x9190	# <CJK>
-0xEBDA	0x9191	# <CJK>
-0xEBDB	0x918D	# <CJK>
-0xEBDC	0x918F	# <CJK>
-0xEBDD	0x9327	# <CJK>
-0xEBDE	0x931E	# <CJK>
-0xEBDF	0x9308	# <CJK>
-0xEBE0	0x931F	# <CJK>
-0xEBE1	0x9306	# <CJK>
-0xEBE2	0x930F	# <CJK>
-0xEBE3	0x937A	# <CJK>
-0xEBE4	0x9338	# <CJK>
-0xEBE5	0x933C	# <CJK>
-0xEBE6	0x931B	# <CJK>
-0xEBE7	0x9323	# <CJK>
-0xEBE8	0x9312	# <CJK>
-0xEBE9	0x9301	# <CJK>
-0xEBEA	0x9346	# <CJK>
-0xEBEB	0x932D	# <CJK>
-0xEBEC	0x930E	# <CJK>
-0xEBED	0x930D	# <CJK>
-0xEBEE	0x92CB	# <CJK>
-0xEBEF	0x931D	# <CJK>
-0xEBF0	0x92FA	# <CJK>
-0xEBF1	0x9325	# <CJK>
-0xEBF2	0x9313	# <CJK>
-0xEBF3	0x92F9	# <CJK>
-0xEBF4	0x92F7	# <CJK>
-0xEBF5	0x9334	# <CJK>
-0xEBF6	0x9302	# <CJK>
-0xEBF7	0x9324	# <CJK>
-0xEBF8	0x92FF	# <CJK>
-0xEBF9	0x9329	# <CJK>
-0xEBFA	0x9339	# <CJK>
-0xEBFB	0x9335	# <CJK>
-0xEBFC	0x932A	# <CJK>
-0xEBFD	0x9314	# <CJK>
-0xEBFE	0x930C	# <CJK>
-0xEC40	0x930B	# <CJK>
-0xEC41	0x92FE	# <CJK>
-0xEC42	0x9309	# <CJK>
-0xEC43	0x9300	# <CJK>
-0xEC44	0x92FB	# <CJK>
-0xEC45	0x9316	# <CJK>
-0xEC46	0x95BC	# <CJK>
-0xEC47	0x95CD	# <CJK>
-0xEC48	0x95BE	# <CJK>
-0xEC49	0x95B9	# <CJK>
-0xEC4A	0x95BA	# <CJK>
-0xEC4B	0x95B6	# <CJK>
-0xEC4C	0x95BF	# <CJK>
-0xEC4D	0x95B5	# <CJK>
-0xEC4E	0x95BD	# <CJK>
-0xEC4F	0x96A9	# <CJK>
-0xEC50	0x96D4	# <CJK>
-0xEC51	0x970B	# <CJK>
-0xEC52	0x9712	# <CJK>
-0xEC53	0x9710	# <CJK>
-0xEC54	0x9799	# <CJK>
-0xEC55	0x9797	# <CJK>
-0xEC56	0x9794	# <CJK>
-0xEC57	0x97F0	# <CJK>
-0xEC58	0x97F8	# <CJK>
-0xEC59	0x9835	# <CJK>
-0xEC5A	0x982F	# <CJK>
-0xEC5B	0x9832	# <CJK>
-0xEC5C	0x9924	# <CJK>
-0xEC5D	0x991F	# <CJK>
-0xEC5E	0x9927	# <CJK>
-0xEC5F	0x9929	# <CJK>
-0xEC60	0x999E	# <CJK>
-0xEC61	0x99EE	# <CJK>
-0xEC62	0x99EC	# <CJK>
-0xEC63	0x99E5	# <CJK>
-0xEC64	0x99E4	# <CJK>
-0xEC65	0x99F0	# <CJK>
-0xEC66	0x99E3	# <CJK>
-0xEC67	0x99EA	# <CJK>
-0xEC68	0x99E9	# <CJK>
-0xEC69	0x99E7	# <CJK>
-0xEC6A	0x9AB9	# <CJK>
-0xEC6B	0x9ABF	# <CJK>
-0xEC6C	0x9AB4	# <CJK>
-0xEC6D	0x9ABB	# <CJK>
-0xEC6E	0x9AF6	# <CJK>
-0xEC6F	0x9AFA	# <CJK>
-0xEC70	0x9AF9	# <CJK>
-0xEC71	0x9AF7	# <CJK>
-0xEC72	0x9B33	# <CJK>
-0xEC73	0x9B80	# <CJK>
-0xEC74	0x9B85	# <CJK>
-0xEC75	0x9B87	# <CJK>
-0xEC76	0x9B7C	# <CJK>
-0xEC77	0x9B7E	# <CJK>
-0xEC78	0x9B7B	# <CJK>
-0xEC79	0x9B82	# <CJK>
-0xEC7A	0x9B93	# <CJK>
-0xEC7B	0x9B92	# <CJK>
-0xEC7C	0x9B90	# <CJK>
-0xEC7D	0x9B7A	# <CJK>
-0xEC7E	0x9B95	# <CJK>
-0xECA1	0x9B7D	# <CJK>
-0xECA2	0x9B88	# <CJK>
-0xECA3	0x9D25	# <CJK>
-0xECA4	0x9D17	# <CJK>
-0xECA5	0x9D20	# <CJK>
-0xECA6	0x9D1E	# <CJK>
-0xECA7	0x9D14	# <CJK>
-0xECA8	0x9D29	# <CJK>
-0xECA9	0x9D1D	# <CJK>
-0xECAA	0x9D18	# <CJK>
-0xECAB	0x9D22	# <CJK>
-0xECAC	0x9D10	# <CJK>
-0xECAD	0x9D19	# <CJK>
-0xECAE	0x9D1F	# <CJK>
-0xECAF	0x9E88	# <CJK>
-0xECB0	0x9E86	# <CJK>
-0xECB1	0x9E87	# <CJK>
-0xECB2	0x9EAE	# <CJK>
-0xECB3	0x9EAD	# <CJK>
-0xECB4	0x9ED5	# <CJK>
-0xECB5	0x9ED6	# <CJK>
-0xECB6	0x9EFA	# <CJK>
-0xECB7	0x9F12	# <CJK>
-0xECB8	0x9F3D	# <CJK>
-0xECB9	0x5126	# <CJK>
-0xECBA	0x5125	# <CJK>
-0xECBB	0x5122	# <CJK>
-0xECBC	0x5124	# <CJK>
-0xECBD	0x5120	# <CJK>
-0xECBE	0x5129	# <CJK>
-0xECBF	0x52F4	# <CJK>
-0xECC0	0x5693	# <CJK>
-0xECC1	0x568C	# <CJK>
-0xECC2	0x568D	# <CJK>
-0xECC3	0x5686	# <CJK>
-0xECC4	0x5684	# <CJK>
-0xECC5	0x5683	# <CJK>
-0xECC6	0x567E	# <CJK>
-0xECC7	0x5682	# <CJK>
-0xECC8	0x567F	# <CJK>
-0xECC9	0x5681	# <CJK>
-0xECCA	0x58D6	# <CJK>
-0xECCB	0x58D4	# <CJK>
-0xECCC	0x58CF	# <CJK>
-0xECCD	0x58D2	# <CJK>
-0xECCE	0x5B2D	# <CJK>
-0xECCF	0x5B25	# <CJK>
-0xECD0	0x5B32	# <CJK>
-0xECD1	0x5B23	# <CJK>
-0xECD2	0x5B2C	# <CJK>
-0xECD3	0x5B27	# <CJK>
-0xECD4	0x5B26	# <CJK>
-0xECD5	0x5B2F	# <CJK>
-0xECD6	0x5B2E	# <CJK>
-0xECD7	0x5B7B	# <CJK>
-0xECD8	0x5BF1	# <CJK>
-0xECD9	0x5BF2	# <CJK>
-0xECDA	0x5DB7	# <CJK>
-0xECDB	0x5E6C	# <CJK>
-0xECDC	0x5E6A	# <CJK>
-0xECDD	0x5FBE	# <CJK>
-0xECDE	0x5FBB	# <CJK>
-0xECDF	0x61C3	# <CJK>
-0xECE0	0x61B5	# <CJK>
-0xECE1	0x61BC	# <CJK>
-0xECE2	0x61E7	# <CJK>
-0xECE3	0x61E0	# <CJK>
-0xECE4	0x61E5	# <CJK>
-0xECE5	0x61E4	# <CJK>
-0xECE6	0x61E8	# <CJK>
-0xECE7	0x61DE	# <CJK>
-0xECE8	0x64EF	# <CJK>
-0xECE9	0x64E9	# <CJK>
-0xECEA	0x64E3	# <CJK>
-0xECEB	0x64EB	# <CJK>
-0xECEC	0x64E4	# <CJK>
-0xECED	0x64E8	# <CJK>
-0xECEE	0x6581	# <CJK>
-0xECEF	0x6580	# <CJK>
-0xECF0	0x65B6	# <CJK>
-0xECF1	0x65DA	# <CJK>
-0xECF2	0x66D2	# <CJK>
-0xECF3	0x6A8D	# <CJK>
-0xECF4	0x6A96	# <CJK>
-0xECF5	0x6A81	# <CJK>
-0xECF6	0x6AA5	# <CJK>
-0xECF7	0x6A89	# <CJK>
-0xECF8	0x6A9F	# <CJK>
-0xECF9	0x6A9B	# <CJK>
-0xECFA	0x6AA1	# <CJK>
-0xECFB	0x6A9E	# <CJK>
-0xECFC	0x6A87	# <CJK>
-0xECFD	0x6A93	# <CJK>
-0xECFE	0x6A8E	# <CJK>
-0xED40	0x6A95	# <CJK>
-0xED41	0x6A83	# <CJK>
-0xED42	0x6AA8	# <CJK>
-0xED43	0x6AA4	# <CJK>
-0xED44	0x6A91	# <CJK>
-0xED45	0x6A7F	# <CJK>
-0xED46	0x6AA6	# <CJK>
-0xED47	0x6A9A	# <CJK>
-0xED48	0x6A85	# <CJK>
-0xED49	0x6A8C	# <CJK>
-0xED4A	0x6A92	# <CJK>
-0xED4B	0x6B5B	# <CJK>
-0xED4C	0x6BAD	# <CJK>
-0xED4D	0x6C09	# <CJK>
-0xED4E	0x6FCC	# <CJK>
-0xED4F	0x6FA9	# <CJK>
-0xED50	0x6FF4	# <CJK>
-0xED51	0x6FD4	# <CJK>
-0xED52	0x6FE3	# <CJK>
-0xED53	0x6FDC	# <CJK>
-0xED54	0x6FED	# <CJK>
-0xED55	0x6FE7	# <CJK>
-0xED56	0x6FE6	# <CJK>
-0xED57	0x6FDE	# <CJK>
-0xED58	0x6FF2	# <CJK>
-0xED59	0x6FDD	# <CJK>
-0xED5A	0x6FE2	# <CJK>
-0xED5B	0x6FE8	# <CJK>
-0xED5C	0x71E1	# <CJK>
-0xED5D	0x71F1	# <CJK>
-0xED5E	0x71E8	# <CJK>
-0xED5F	0x71F2	# <CJK>
-0xED60	0x71E4	# <CJK>
-0xED61	0x71F0	# <CJK>
-0xED62	0x71E2	# <CJK>
-0xED63	0x7373	# <CJK>
-0xED64	0x736E	# <CJK>
-0xED65	0x736F	# <CJK>
-0xED66	0x7497	# <CJK>
-0xED67	0x74B2	# <CJK>
-0xED68	0x74AB	# <CJK>
-0xED69	0x7490	# <CJK>
-0xED6A	0x74AA	# <CJK>
-0xED6B	0x74AD	# <CJK>
-0xED6C	0x74B1	# <CJK>
-0xED6D	0x74A5	# <CJK>
-0xED6E	0x74AF	# <CJK>
-0xED6F	0x7510	# <CJK>
-0xED70	0x7511	# <CJK>
-0xED71	0x7512	# <CJK>
-0xED72	0x750F	# <CJK>
-0xED73	0x7584	# <CJK>
-0xED74	0x7643	# <CJK>
-0xED75	0x7648	# <CJK>
-0xED76	0x7649	# <CJK>
-0xED77	0x7647	# <CJK>
-0xED78	0x76A4	# <CJK>
-0xED79	0x76E9	# <CJK>
-0xED7A	0x77B5	# <CJK>
-0xED7B	0x77AB	# <CJK>
-0xED7C	0x77B2	# <CJK>
-0xED7D	0x77B7	# <CJK>
-0xED7E	0x77B6	# <CJK>
-0xEDA1	0x77B4	# <CJK>
-0xEDA2	0x77B1	# <CJK>
-0xEDA3	0x77A8	# <CJK>
-0xEDA4	0x77F0	# <CJK>
-0xEDA5	0x78F3	# <CJK>
-0xEDA6	0x78FD	# <CJK>
-0xEDA7	0x7902	# <CJK>
-0xEDA8	0x78FB	# <CJK>
-0xEDA9	0x78FC	# <CJK>
-0xEDAA	0x78F2	# <CJK>
-0xEDAB	0x7905	# <CJK>
-0xEDAC	0x78F9	# <CJK>
-0xEDAD	0x78FE	# <CJK>
-0xEDAE	0x7904	# <CJK>
-0xEDAF	0x79AB	# <CJK>
-0xEDB0	0x79A8	# <CJK>
-0xEDB1	0x7A5C	# <CJK>
-0xEDB2	0x7A5B	# <CJK>
-0xEDB3	0x7A56	# <CJK>
-0xEDB4	0x7A58	# <CJK>
-0xEDB5	0x7A54	# <CJK>
-0xEDB6	0x7A5A	# <CJK>
-0xEDB7	0x7ABE	# <CJK>
-0xEDB8	0x7AC0	# <CJK>
-0xEDB9	0x7AC1	# <CJK>
-0xEDBA	0x7C05	# <CJK>
-0xEDBB	0x7C0F	# <CJK>
-0xEDBC	0x7BF2	# <CJK>
-0xEDBD	0x7C00	# <CJK>
-0xEDBE	0x7BFF	# <CJK>
-0xEDBF	0x7BFB	# <CJK>
-0xEDC0	0x7C0E	# <CJK>
-0xEDC1	0x7BF4	# <CJK>
-0xEDC2	0x7C0B	# <CJK>
-0xEDC3	0x7BF3	# <CJK>
-0xEDC4	0x7C02	# <CJK>
-0xEDC5	0x7C09	# <CJK>
-0xEDC6	0x7C03	# <CJK>
-0xEDC7	0x7C01	# <CJK>
-0xEDC8	0x7BF8	# <CJK>
-0xEDC9	0x7BFD	# <CJK>
-0xEDCA	0x7C06	# <CJK>
-0xEDCB	0x7BF0	# <CJK>
-0xEDCC	0x7BF1	# <CJK>
-0xEDCD	0x7C10	# <CJK>
-0xEDCE	0x7C0A	# <CJK>
-0xEDCF	0x7CE8	# <CJK>
-0xEDD0	0x7E2D	# <CJK>
-0xEDD1	0x7E3C	# <CJK>
-0xEDD2	0x7E42	# <CJK>
-0xEDD3	0x7E33	# <CJK>
-0xEDD4	0x9848	# <CJK>
-0xEDD5	0x7E38	# <CJK>
-0xEDD6	0x7E2A	# <CJK>
-0xEDD7	0x7E49	# <CJK>
-0xEDD8	0x7E40	# <CJK>
-0xEDD9	0x7E47	# <CJK>
-0xEDDA	0x7E29	# <CJK>
-0xEDDB	0x7E4C	# <CJK>
-0xEDDC	0x7E30	# <CJK>
-0xEDDD	0x7E3B	# <CJK>
-0xEDDE	0x7E36	# <CJK>
-0xEDDF	0x7E44	# <CJK>
-0xEDE0	0x7E3A	# <CJK>
-0xEDE1	0x7F45	# <CJK>
-0xEDE2	0x7F7F	# <CJK>
-0xEDE3	0x7F7E	# <CJK>
-0xEDE4	0x7F7D	# <CJK>
-0xEDE5	0x7FF4	# <CJK>
-0xEDE6	0x7FF2	# <CJK>
-0xEDE7	0x802C	# <CJK>
-0xEDE8	0x81BB	# <CJK>
-0xEDE9	0x81C4	# <CJK>
-0xEDEA	0x81CC	# <CJK>
-0xEDEB	0x81CA	# <CJK>
-0xEDEC	0x81C5	# <CJK>
-0xEDED	0x81C7	# <CJK>
-0xEDEE	0x81BC	# <CJK>
-0xEDEF	0x81E9	# <CJK>
-0xEDF0	0x825B	# <CJK>
-0xEDF1	0x825A	# <CJK>
-0xEDF2	0x825C	# <CJK>
-0xEDF3	0x8583	# <CJK>
-0xEDF4	0x8580	# <CJK>
-0xEDF5	0x858F	# <CJK>
-0xEDF6	0x85A7	# <CJK>
-0xEDF7	0x8595	# <CJK>
-0xEDF8	0x85A0	# <CJK>
-0xEDF9	0x858B	# <CJK>
-0xEDFA	0x85A3	# <CJK>
-0xEDFB	0x857B	# <CJK>
-0xEDFC	0x85A4	# <CJK>
-0xEDFD	0x859A	# <CJK>
-0xEDFE	0x859E	# <CJK>
-0xEE40	0x8577	# <CJK>
-0xEE41	0x857C	# <CJK>
-0xEE42	0x8589	# <CJK>
-0xEE43	0x85A1	# <CJK>
-0xEE44	0x857A	# <CJK>
-0xEE45	0x8578	# <CJK>
-0xEE46	0x8557	# <CJK>
-0xEE47	0x858E	# <CJK>
-0xEE48	0x8596	# <CJK>
-0xEE49	0x8586	# <CJK>
-0xEE4A	0x858D	# <CJK>
-0xEE4B	0x8599	# <CJK>
-0xEE4C	0x859D	# <CJK>
-0xEE4D	0x8581	# <CJK>
-0xEE4E	0x85A2	# <CJK>
-0xEE4F	0x8582	# <CJK>
-0xEE50	0x8588	# <CJK>
-0xEE51	0x8585	# <CJK>
-0xEE52	0x8579	# <CJK>
-0xEE53	0x8576	# <CJK>
-0xEE54	0x8598	# <CJK>
-0xEE55	0x8590	# <CJK>
-0xEE56	0x859F	# <CJK>
-0xEE57	0x8668	# <CJK>
-0xEE58	0x87BE	# <CJK>
-0xEE59	0x87AA	# <CJK>
-0xEE5A	0x87AD	# <CJK>
-0xEE5B	0x87C5	# <CJK>
-0xEE5C	0x87B0	# <CJK>
-0xEE5D	0x87AC	# <CJK>
-0xEE5E	0x87B9	# <CJK>
-0xEE5F	0x87B5	# <CJK>
-0xEE60	0x87BC	# <CJK>
-0xEE61	0x87AE	# <CJK>
-0xEE62	0x87C9	# <CJK>
-0xEE63	0x87C3	# <CJK>
-0xEE64	0x87C2	# <CJK>
-0xEE65	0x87CC	# <CJK>
-0xEE66	0x87B7	# <CJK>
-0xEE67	0x87AF	# <CJK>
-0xEE68	0x87C4	# <CJK>
-0xEE69	0x87CA	# <CJK>
-0xEE6A	0x87B4	# <CJK>
-0xEE6B	0x87B6	# <CJK>
-0xEE6C	0x87BF	# <CJK>
-0xEE6D	0x87B8	# <CJK>
-0xEE6E	0x87BD	# <CJK>
-0xEE6F	0x87DE	# <CJK>
-0xEE70	0x87B2	# <CJK>
-0xEE71	0x8935	# <CJK>
-0xEE72	0x8933	# <CJK>
-0xEE73	0x893C	# <CJK>
-0xEE74	0x893E	# <CJK>
-0xEE75	0x8941	# <CJK>
-0xEE76	0x8952	# <CJK>
-0xEE77	0x8937	# <CJK>
-0xEE78	0x8942	# <CJK>
-0xEE79	0x89AD	# <CJK>
-0xEE7A	0x89AF	# <CJK>
-0xEE7B	0x89AE	# <CJK>
-0xEE7C	0x89F2	# <CJK>
-0xEE7D	0x89F3	# <CJK>
-0xEE7E	0x8B1E	# <CJK>
-0xEEA1	0x8B18	# <CJK>
-0xEEA2	0x8B16	# <CJK>
-0xEEA3	0x8B11	# <CJK>
-0xEEA4	0x8B05	# <CJK>
-0xEEA5	0x8B0B	# <CJK>
-0xEEA6	0x8B22	# <CJK>
-0xEEA7	0x8B0F	# <CJK>
-0xEEA8	0x8B12	# <CJK>
-0xEEA9	0x8B15	# <CJK>
-0xEEAA	0x8B07	# <CJK>
-0xEEAB	0x8B0D	# <CJK>
-0xEEAC	0x8B08	# <CJK>
-0xEEAD	0x8B06	# <CJK>
-0xEEAE	0x8B1C	# <CJK>
-0xEEAF	0x8B13	# <CJK>
-0xEEB0	0x8B1A	# <CJK>
-0xEEB1	0x8C4F	# <CJK>
-0xEEB2	0x8C70	# <CJK>
-0xEEB3	0x8C72	# <CJK>
-0xEEB4	0x8C71	# <CJK>
-0xEEB5	0x8C6F	# <CJK>
-0xEEB6	0x8C95	# <CJK>
-0xEEB7	0x8C94	# <CJK>
-0xEEB8	0x8CF9	# <CJK>
-0xEEB9	0x8D6F	# <CJK>
-0xEEBA	0x8E4E	# <CJK>
-0xEEBB	0x8E4D	# <CJK>
-0xEEBC	0x8E53	# <CJK>
-0xEEBD	0x8E50	# <CJK>
-0xEEBE	0x8E4C	# <CJK>
-0xEEBF	0x8E47	# <CJK>
-0xEEC0	0x8F43	# <CJK>
-0xEEC1	0x8F40	# <CJK>
-0xEEC2	0x9085	# <CJK>
-0xEEC3	0x907E	# <CJK>
-0xEEC4	0x9138	# <CJK>
-0xEEC5	0x919A	# <CJK>
-0xEEC6	0x91A2	# <CJK>
-0xEEC7	0x919B	# <CJK>
-0xEEC8	0x9199	# <CJK>
-0xEEC9	0x919F	# <CJK>
-0xEECA	0x91A1	# <CJK>
-0xEECB	0x919D	# <CJK>
-0xEECC	0x91A0	# <CJK>
-0xEECD	0x93A1	# <CJK>
-0xEECE	0x9383	# <CJK>
-0xEECF	0x93AF	# <CJK>
-0xEED0	0x9364	# <CJK>
-0xEED1	0x9356	# <CJK>
-0xEED2	0x9347	# <CJK>
-0xEED3	0x937C	# <CJK>
-0xEED4	0x9358	# <CJK>
-0xEED5	0x935C	# <CJK>
-0xEED6	0x9376	# <CJK>
-0xEED7	0x9349	# <CJK>
-0xEED8	0x9350	# <CJK>
-0xEED9	0x9351	# <CJK>
-0xEEDA	0x9360	# <CJK>
-0xEEDB	0x936D	# <CJK>
-0xEEDC	0x938F	# <CJK>
-0xEEDD	0x934C	# <CJK>
-0xEEDE	0x936A	# <CJK>
-0xEEDF	0x9379	# <CJK>
-0xEEE0	0x9357	# <CJK>
-0xEEE1	0x9355	# <CJK>
-0xEEE2	0x9352	# <CJK>
-0xEEE3	0x934F	# <CJK>
-0xEEE4	0x9371	# <CJK>
-0xEEE5	0x9377	# <CJK>
-0xEEE6	0x937B	# <CJK>
-0xEEE7	0x9361	# <CJK>
-0xEEE8	0x935E	# <CJK>
-0xEEE9	0x9363	# <CJK>
-0xEEEA	0x9367	# <CJK>
-0xEEEB	0x9380	# <CJK>
-0xEEEC	0x934E	# <CJK>
-0xEEED	0x9359	# <CJK>
-0xEEEE	0x95C7	# <CJK>
-0xEEEF	0x95C0	# <CJK>
-0xEEF0	0x95C9	# <CJK>
-0xEEF1	0x95C3	# <CJK>
-0xEEF2	0x95C5	# <CJK>
-0xEEF3	0x95B7	# <CJK>
-0xEEF4	0x96AE	# <CJK>
-0xEEF5	0x96B0	# <CJK>
-0xEEF6	0x96AC	# <CJK>
-0xEEF7	0x9720	# <CJK>
-0xEEF8	0x971F	# <CJK>
-0xEEF9	0x9718	# <CJK>
-0xEEFA	0x971D	# <CJK>
-0xEEFB	0x9719	# <CJK>
-0xEEFC	0x979A	# <CJK>
-0xEEFD	0x97A1	# <CJK>
-0xEEFE	0x979C	# <CJK>
-0xEF40	0x979E	# <CJK>
-0xEF41	0x979D	# <CJK>
-0xEF42	0x97D5	# <CJK>
-0xEF43	0x97D4	# <CJK>
-0xEF44	0x97F1	# <CJK>
-0xEF45	0x9841	# <CJK>
-0xEF46	0x9844	# <CJK>
-0xEF47	0x984A	# <CJK>
-0xEF48	0x9849	# <CJK>
-0xEF49	0x9845	# <CJK>
-0xEF4A	0x9843	# <CJK>
-0xEF4B	0x9925	# <CJK>
-0xEF4C	0x992B	# <CJK>
-0xEF4D	0x992C	# <CJK>
-0xEF4E	0x992A	# <CJK>
-0xEF4F	0x9933	# <CJK>
-0xEF50	0x9932	# <CJK>
-0xEF51	0x992F	# <CJK>
-0xEF52	0x992D	# <CJK>
-0xEF53	0x9931	# <CJK>
-0xEF54	0x9930	# <CJK>
-0xEF55	0x9998	# <CJK>
-0xEF56	0x99A3	# <CJK>
-0xEF57	0x99A1	# <CJK>
-0xEF58	0x9A02	# <CJK>
-0xEF59	0x99FA	# <CJK>
-0xEF5A	0x99F4	# <CJK>
-0xEF5B	0x99F7	# <CJK>
-0xEF5C	0x99F9	# <CJK>
-0xEF5D	0x99F8	# <CJK>
-0xEF5E	0x99F6	# <CJK>
-0xEF5F	0x99FB	# <CJK>
-0xEF60	0x99FD	# <CJK>
-0xEF61	0x99FE	# <CJK>
-0xEF62	0x99FC	# <CJK>
-0xEF63	0x9A03	# <CJK>
-0xEF64	0x9ABE	# <CJK>
-0xEF65	0x9AFE	# <CJK>
-0xEF66	0x9AFD	# <CJK>
-0xEF67	0x9B01	# <CJK>
-0xEF68	0x9AFC	# <CJK>
-0xEF69	0x9B48	# <CJK>
-0xEF6A	0x9B9A	# <CJK>
-0xEF6B	0x9BA8	# <CJK>
-0xEF6C	0x9B9E	# <CJK>
-0xEF6D	0x9B9B	# <CJK>
-0xEF6E	0x9BA6	# <CJK>
-0xEF6F	0x9BA1	# <CJK>
-0xEF70	0x9BA5	# <CJK>
-0xEF71	0x9BA4	# <CJK>
-0xEF72	0x9B86	# <CJK>
-0xEF73	0x9BA2	# <CJK>
-0xEF74	0x9BA0	# <CJK>
-0xEF75	0x9BAF	# <CJK>
-0xEF76	0x9D33	# <CJK>
-0xEF77	0x9D41	# <CJK>
-0xEF78	0x9D67	# <CJK>
-0xEF79	0x9D36	# <CJK>
-0xEF7A	0x9D2E	# <CJK>
-0xEF7B	0x9D2F	# <CJK>
-0xEF7C	0x9D31	# <CJK>
-0xEF7D	0x9D38	# <CJK>
-0xEF7E	0x9D30	# <CJK>
-0xEFA1	0x9D45	# <CJK>
-0xEFA2	0x9D42	# <CJK>
-0xEFA3	0x9D43	# <CJK>
-0xEFA4	0x9D3E	# <CJK>
-0xEFA5	0x9D37	# <CJK>
-0xEFA6	0x9D40	# <CJK>
-0xEFA7	0x9D3D	# <CJK>
-0xEFA8	0x7FF5	# <CJK>
-0xEFA9	0x9D2D	# <CJK>
-0xEFAA	0x9E8A	# <CJK>
-0xEFAB	0x9E89	# <CJK>
-0xEFAC	0x9E8D	# <CJK>
-0xEFAD	0x9EB0	# <CJK>
-0xEFAE	0x9EC8	# <CJK>
-0xEFAF	0x9EDA	# <CJK>
-0xEFB0	0x9EFB	# <CJK>
-0xEFB1	0x9EFF	# <CJK>
-0xEFB2	0x9F24	# <CJK>
-0xEFB3	0x9F23	# <CJK>
-0xEFB4	0x9F22	# <CJK>
-0xEFB5	0x9F54	# <CJK>
-0xEFB6	0x9FA0	# <CJK>
-0xEFB7	0x5131	# <CJK>
-0xEFB8	0x512D	# <CJK>
-0xEFB9	0x512E	# <CJK>
-0xEFBA	0x5698	# <CJK>
-0xEFBB	0x569C	# <CJK>
-0xEFBC	0x5697	# <CJK>
-0xEFBD	0x569A	# <CJK>
-0xEFBE	0x569D	# <CJK>
-0xEFBF	0x5699	# <CJK>
-0xEFC0	0x5970	# <CJK>
-0xEFC1	0x5B3C	# <CJK>
-0xEFC2	0x5C69	# <CJK>
-0xEFC3	0x5C6A	# <CJK>
-0xEFC4	0x5DC0	# <CJK>
-0xEFC5	0x5E6D	# <CJK>
-0xEFC6	0x5E6E	# <CJK>
-0xEFC7	0x61D8	# <CJK>
-0xEFC8	0x61DF	# <CJK>
-0xEFC9	0x61ED	# <CJK>
-0xEFCA	0x61EE	# <CJK>
-0xEFCB	0x61F1	# <CJK>
-0xEFCC	0x61EA	# <CJK>
-0xEFCD	0x61F0	# <CJK>
-0xEFCE	0x61EB	# <CJK>
-0xEFCF	0x61D6	# <CJK>
-0xEFD0	0x61E9	# <CJK>
-0xEFD1	0x64FF	# <CJK>
-0xEFD2	0x6504	# <CJK>
-0xEFD3	0x64FD	# <CJK>
-0xEFD4	0x64F8	# <CJK>
-0xEFD5	0x6501	# <CJK>
-0xEFD6	0x6503	# <CJK>
-0xEFD7	0x64FC	# <CJK>
-0xEFD8	0x6594	# <CJK>
-0xEFD9	0x65DB	# <CJK>
-0xEFDA	0x66DA	# <CJK>
-0xEFDB	0x66DB	# <CJK>
-0xEFDC	0x66D8	# <CJK>
-0xEFDD	0x6AC5	# <CJK>
-0xEFDE	0x6AB9	# <CJK>
-0xEFDF	0x6ABD	# <CJK>
-0xEFE0	0x6AE1	# <CJK>
-0xEFE1	0x6AC6	# <CJK>
-0xEFE2	0x6ABA	# <CJK>
-0xEFE3	0x6AB6	# <CJK>
-0xEFE4	0x6AB7	# <CJK>
-0xEFE5	0x6AC7	# <CJK>
-0xEFE6	0x6AB4	# <CJK>
-0xEFE7	0x6AAD	# <CJK>
-0xEFE8	0x6B5E	# <CJK>
-0xEFE9	0x6BC9	# <CJK>
-0xEFEA	0x6C0B	# <CJK>
-0xEFEB	0x7007	# <CJK>
-0xEFEC	0x700C	# <CJK>
-0xEFED	0x700D	# <CJK>
-0xEFEE	0x7001	# <CJK>
-0xEFEF	0x7005	# <CJK>
-0xEFF0	0x7014	# <CJK>
-0xEFF1	0x700E	# <CJK>
-0xEFF2	0x6FFF	# <CJK>
-0xEFF3	0x7000	# <CJK>
-0xEFF4	0x6FFB	# <CJK>
-0xEFF5	0x7026	# <CJK>
-0xEFF6	0x6FFC	# <CJK>
-0xEFF7	0x6FF7	# <CJK>
-0xEFF8	0x700A	# <CJK>
-0xEFF9	0x7201	# <CJK>
-0xEFFA	0x71FF	# <CJK>
-0xEFFB	0x71F9	# <CJK>
-0xEFFC	0x7203	# <CJK>
-0xEFFD	0x71FD	# <CJK>
-0xEFFE	0x7376	# <CJK>
-0xF040	0x74B8	# <CJK>
-0xF041	0x74C0	# <CJK>
-0xF042	0x74B5	# <CJK>
-0xF043	0x74C1	# <CJK>
-0xF044	0x74BE	# <CJK>
-0xF045	0x74B6	# <CJK>
-0xF046	0x74BB	# <CJK>
-0xF047	0x74C2	# <CJK>
-0xF048	0x7514	# <CJK>
-0xF049	0x7513	# <CJK>
-0xF04A	0x765C	# <CJK>
-0xF04B	0x7664	# <CJK>
-0xF04C	0x7659	# <CJK>
-0xF04D	0x7650	# <CJK>
-0xF04E	0x7653	# <CJK>
-0xF04F	0x7657	# <CJK>
-0xF050	0x765A	# <CJK>
-0xF051	0x76A6	# <CJK>
-0xF052	0x76BD	# <CJK>
-0xF053	0x76EC	# <CJK>
-0xF054	0x77C2	# <CJK>
-0xF055	0x77BA	# <CJK>
-0xF056	0x78FF	# <CJK>
-0xF057	0x790C	# <CJK>
-0xF058	0x7913	# <CJK>
-0xF059	0x7914	# <CJK>
-0xF05A	0x7909	# <CJK>
-0xF05B	0x7910	# <CJK>
-0xF05C	0x7912	# <CJK>
-0xF05D	0x7911	# <CJK>
-0xF05E	0x79AD	# <CJK>
-0xF05F	0x79AC	# <CJK>
-0xF060	0x7A5F	# <CJK>
-0xF061	0x7C1C	# <CJK>
-0xF062	0x7C29	# <CJK>
-0xF063	0x7C19	# <CJK>
-0xF064	0x7C20	# <CJK>
-0xF065	0x7C1F	# <CJK>
-0xF066	0x7C2D	# <CJK>
-0xF067	0x7C1D	# <CJK>
-0xF068	0x7C26	# <CJK>
-0xF069	0x7C28	# <CJK>
-0xF06A	0x7C22	# <CJK>
-0xF06B	0x7C25	# <CJK>
-0xF06C	0x7C30	# <CJK>
-0xF06D	0x7E5C	# <CJK>
-0xF06E	0x7E50	# <CJK>
-0xF06F	0x7E56	# <CJK>
-0xF070	0x7E63	# <CJK>
-0xF071	0x7E58	# <CJK>
-0xF072	0x7E62	# <CJK>
-0xF073	0x7E5F	# <CJK>
-0xF074	0x7E51	# <CJK>
-0xF075	0x7E60	# <CJK>
-0xF076	0x7E57	# <CJK>
-0xF077	0x7E53	# <CJK>
-0xF078	0x7FB5	# <CJK>
-0xF079	0x7FB3	# <CJK>
-0xF07A	0x7FF7	# <CJK>
-0xF07B	0x7FF8	# <CJK>
-0xF07C	0x8075	# <CJK>
-0xF07D	0x81D1	# <CJK>
-0xF07E	0x81D2	# <CJK>
-0xF0A1	0x81D0	# <CJK>
-0xF0A2	0x825F	# <CJK>
-0xF0A3	0x825E	# <CJK>
-0xF0A4	0x85B4	# <CJK>
-0xF0A5	0x85C6	# <CJK>
-0xF0A6	0x85C0	# <CJK>
-0xF0A7	0x85C3	# <CJK>
-0xF0A8	0x85C2	# <CJK>
-0xF0A9	0x85B3	# <CJK>
-0xF0AA	0x85B5	# <CJK>
-0xF0AB	0x85BD	# <CJK>
-0xF0AC	0x85C7	# <CJK>
-0xF0AD	0x85C4	# <CJK>
-0xF0AE	0x85BF	# <CJK>
-0xF0AF	0x85CB	# <CJK>
-0xF0B0	0x85CE	# <CJK>
-0xF0B1	0x85C8	# <CJK>
-0xF0B2	0x85C5	# <CJK>
-0xF0B3	0x85B1	# <CJK>
-0xF0B4	0x85B6	# <CJK>
-0xF0B5	0x85D2	# <CJK>
-0xF0B6	0x8624	# <CJK>
-0xF0B7	0x85B8	# <CJK>
-0xF0B8	0x85B7	# <CJK>
-0xF0B9	0x85BE	# <CJK>
-0xF0BA	0x8669	# <CJK>
-0xF0BB	0x87E7	# <CJK>
-0xF0BC	0x87E6	# <CJK>
-0xF0BD	0x87E2	# <CJK>
-0xF0BE	0x87DB	# <CJK>
-0xF0BF	0x87EB	# <CJK>
-0xF0C0	0x87EA	# <CJK>
-0xF0C1	0x87E5	# <CJK>
-0xF0C2	0x87DF	# <CJK>
-0xF0C3	0x87F3	# <CJK>
-0xF0C4	0x87E4	# <CJK>
-0xF0C5	0x87D4	# <CJK>
-0xF0C6	0x87DC	# <CJK>
-0xF0C7	0x87D3	# <CJK>
-0xF0C8	0x87ED	# <CJK>
-0xF0C9	0x87D8	# <CJK>
-0xF0CA	0x87E3	# <CJK>
-0xF0CB	0x87A4	# <CJK>
-0xF0CC	0x87D7	# <CJK>
-0xF0CD	0x87D9	# <CJK>
-0xF0CE	0x8801	# <CJK>
-0xF0CF	0x87F4	# <CJK>
-0xF0D0	0x87E8	# <CJK>
-0xF0D1	0x87DD	# <CJK>
-0xF0D2	0x8953	# <CJK>
-0xF0D3	0x894B	# <CJK>
-0xF0D4	0x894F	# <CJK>
-0xF0D5	0x894C	# <CJK>
-0xF0D6	0x8946	# <CJK>
-0xF0D7	0x8950	# <CJK>
-0xF0D8	0x8951	# <CJK>
-0xF0D9	0x8949	# <CJK>
-0xF0DA	0x8B2A	# <CJK>
-0xF0DB	0x8B27	# <CJK>
-0xF0DC	0x8B23	# <CJK>
-0xF0DD	0x8B33	# <CJK>
-0xF0DE	0x8B30	# <CJK>
-0xF0DF	0x8B35	# <CJK>
-0xF0E0	0x8B47	# <CJK>
-0xF0E1	0x8B2F	# <CJK>
-0xF0E2	0x8B3C	# <CJK>
-0xF0E3	0x8B3E	# <CJK>
-0xF0E4	0x8B31	# <CJK>
-0xF0E5	0x8B25	# <CJK>
-0xF0E6	0x8B37	# <CJK>
-0xF0E7	0x8B26	# <CJK>
-0xF0E8	0x8B36	# <CJK>
-0xF0E9	0x8B2E	# <CJK>
-0xF0EA	0x8B24	# <CJK>
-0xF0EB	0x8B3B	# <CJK>
-0xF0EC	0x8B3D	# <CJK>
-0xF0ED	0x8B3A	# <CJK>
-0xF0EE	0x8C42	# <CJK>
-0xF0EF	0x8C75	# <CJK>
-0xF0F0	0x8C99	# <CJK>
-0xF0F1	0x8C98	# <CJK>
-0xF0F2	0x8C97	# <CJK>
-0xF0F3	0x8CFE	# <CJK>
-0xF0F4	0x8D04	# <CJK>
-0xF0F5	0x8D02	# <CJK>
-0xF0F6	0x8D00	# <CJK>
-0xF0F7	0x8E5C	# <CJK>
-0xF0F8	0x8E62	# <CJK>
-0xF0F9	0x8E60	# <CJK>
-0xF0FA	0x8E57	# <CJK>
-0xF0FB	0x8E56	# <CJK>
-0xF0FC	0x8E5E	# <CJK>
-0xF0FD	0x8E65	# <CJK>
-0xF0FE	0x8E67	# <CJK>
-0xF140	0x8E5B	# <CJK>
-0xF141	0x8E5A	# <CJK>
-0xF142	0x8E61	# <CJK>
-0xF143	0x8E5D	# <CJK>
-0xF144	0x8E69	# <CJK>
-0xF145	0x8E54	# <CJK>
-0xF146	0x8F46	# <CJK>
-0xF147	0x8F47	# <CJK>
-0xF148	0x8F48	# <CJK>
-0xF149	0x8F4B	# <CJK>
-0xF14A	0x9128	# <CJK>
-0xF14B	0x913A	# <CJK>
-0xF14C	0x913B	# <CJK>
-0xF14D	0x913E	# <CJK>
-0xF14E	0x91A8	# <CJK>
-0xF14F	0x91A5	# <CJK>
-0xF150	0x91A7	# <CJK>
-0xF151	0x91AF	# <CJK>
-0xF152	0x91AA	# <CJK>
-0xF153	0x93B5	# <CJK>
-0xF154	0x938C	# <CJK>
-0xF155	0x9392	# <CJK>
-0xF156	0x93B7	# <CJK>
-0xF157	0x939B	# <CJK>
-0xF158	0x939D	# <CJK>
-0xF159	0x9389	# <CJK>
-0xF15A	0x93A7	# <CJK>
-0xF15B	0x938E	# <CJK>
-0xF15C	0x93AA	# <CJK>
-0xF15D	0x939E	# <CJK>
-0xF15E	0x93A6	# <CJK>
-0xF15F	0x9395	# <CJK>
-0xF160	0x9388	# <CJK>
-0xF161	0x9399	# <CJK>
-0xF162	0x939F	# <CJK>
-0xF163	0x938D	# <CJK>
-0xF164	0x93B1	# <CJK>
-0xF165	0x9391	# <CJK>
-0xF166	0x93B2	# <CJK>
-0xF167	0x93A4	# <CJK>
-0xF168	0x93A8	# <CJK>
-0xF169	0x93B4	# <CJK>
-0xF16A	0x93A3	# <CJK>
-0xF16B	0x93A5	# <CJK>
-0xF16C	0x95D2	# <CJK>
-0xF16D	0x95D3	# <CJK>
-0xF16E	0x95D1	# <CJK>
-0xF16F	0x96B3	# <CJK>
-0xF170	0x96D7	# <CJK>
-0xF171	0x96DA	# <CJK>
-0xF172	0x5DC2	# <CJK>
-0xF173	0x96DF	# <CJK>
-0xF174	0x96D8	# <CJK>
-0xF175	0x96DD	# <CJK>
-0xF176	0x9723	# <CJK>
-0xF177	0x9722	# <CJK>
-0xF178	0x9725	# <CJK>
-0xF179	0x97AC	# <CJK>
-0xF17A	0x97AE	# <CJK>
-0xF17B	0x97A8	# <CJK>
-0xF17C	0x97AB	# <CJK>
-0xF17D	0x97A4	# <CJK>
-0xF17E	0x97AA	# <CJK>
-0xF1A1	0x97A2	# <CJK>
-0xF1A2	0x97A5	# <CJK>
-0xF1A3	0x97D7	# <CJK>
-0xF1A4	0x97D9	# <CJK>
-0xF1A5	0x97D6	# <CJK>
-0xF1A6	0x97D8	# <CJK>
-0xF1A7	0x97FA	# <CJK>
-0xF1A8	0x9850	# <CJK>
-0xF1A9	0x9851	# <CJK>
-0xF1AA	0x9852	# <CJK>
-0xF1AB	0x98B8	# <CJK>
-0xF1AC	0x9941	# <CJK>
-0xF1AD	0x993C	# <CJK>
-0xF1AE	0x993A	# <CJK>
-0xF1AF	0x9A0F	# <CJK>
-0xF1B0	0x9A0B	# <CJK>
-0xF1B1	0x9A09	# <CJK>
-0xF1B2	0x9A0D	# <CJK>
-0xF1B3	0x9A04	# <CJK>
-0xF1B4	0x9A11	# <CJK>
-0xF1B5	0x9A0A	# <CJK>
-0xF1B6	0x9A05	# <CJK>
-0xF1B7	0x9A07	# <CJK>
-0xF1B8	0x9A06	# <CJK>
-0xF1B9	0x9AC0	# <CJK>
-0xF1BA	0x9ADC	# <CJK>
-0xF1BB	0x9B08	# <CJK>
-0xF1BC	0x9B04	# <CJK>
-0xF1BD	0x9B05	# <CJK>
-0xF1BE	0x9B29	# <CJK>
-0xF1BF	0x9B35	# <CJK>
-0xF1C0	0x9B4A	# <CJK>
-0xF1C1	0x9B4C	# <CJK>
-0xF1C2	0x9B4B	# <CJK>
-0xF1C3	0x9BC7	# <CJK>
-0xF1C4	0x9BC6	# <CJK>
-0xF1C5	0x9BC3	# <CJK>
-0xF1C6	0x9BBF	# <CJK>
-0xF1C7	0x9BC1	# <CJK>
-0xF1C8	0x9BB5	# <CJK>
-0xF1C9	0x9BB8	# <CJK>
-0xF1CA	0x9BD3	# <CJK>
-0xF1CB	0x9BB6	# <CJK>
-0xF1CC	0x9BC4	# <CJK>
-0xF1CD	0x9BB9	# <CJK>
-0xF1CE	0x9BBD	# <CJK>
-0xF1CF	0x9D5C	# <CJK>
-0xF1D0	0x9D53	# <CJK>
-0xF1D1	0x9D4F	# <CJK>
-0xF1D2	0x9D4A	# <CJK>
-0xF1D3	0x9D5B	# <CJK>
-0xF1D4	0x9D4B	# <CJK>
-0xF1D5	0x9D59	# <CJK>
-0xF1D6	0x9D56	# <CJK>
-0xF1D7	0x9D4C	# <CJK>
-0xF1D8	0x9D57	# <CJK>
-0xF1D9	0x9D52	# <CJK>
-0xF1DA	0x9D54	# <CJK>
-0xF1DB	0x9D5F	# <CJK>
-0xF1DC	0x9D58	# <CJK>
-0xF1DD	0x9D5A	# <CJK>
-0xF1DE	0x9E8E	# <CJK>
-0xF1DF	0x9E8C	# <CJK>
-0xF1E0	0x9EDF	# <CJK>
-0xF1E1	0x9F01	# <CJK>
-0xF1E2	0x9F00	# <CJK>
-0xF1E3	0x9F16	# <CJK>
-0xF1E4	0x9F25	# <CJK>
-0xF1E5	0x9F2B	# <CJK>
-0xF1E6	0x9F2A	# <CJK>
-0xF1E7	0x9F29	# <CJK>
-0xF1E8	0x9F28	# <CJK>
-0xF1E9	0x9F4C	# <CJK>
-0xF1EA	0x9F55	# <CJK>
-0xF1EB	0x5134	# <CJK>
-0xF1EC	0x5135	# <CJK>
-0xF1ED	0x5296	# <CJK>
-0xF1EE	0x52F7	# <CJK>
-0xF1EF	0x53B4	# <CJK>
-0xF1F0	0x56AB	# <CJK>
-0xF1F1	0x56AD	# <CJK>
-0xF1F2	0x56A6	# <CJK>
-0xF1F3	0x56A7	# <CJK>
-0xF1F4	0x56AA	# <CJK>
-0xF1F5	0x56AC	# <CJK>
-0xF1F6	0x58DA	# <CJK>
-0xF1F7	0x58DD	# <CJK>
-0xF1F8	0x58DB	# <CJK>
-0xF1F9	0x5912	# <CJK>
-0xF1FA	0x5B3D	# <CJK>
-0xF1FB	0x5B3E	# <CJK>
-0xF1FC	0x5B3F	# <CJK>
-0xF1FD	0x5DC3	# <CJK>
-0xF1FE	0x5E70	# <CJK>
-0xF240	0x5FBF	# <CJK>
-0xF241	0x61FB	# <CJK>
-0xF242	0x6507	# <CJK>
-0xF243	0x6510	# <CJK>
-0xF244	0x650D	# <CJK>
-0xF245	0x6509	# <CJK>
-0xF246	0x650C	# <CJK>
-0xF247	0x650E	# <CJK>
-0xF248	0x6584	# <CJK>
-0xF249	0x65DE	# <CJK>
-0xF24A	0x65DD	# <CJK>
-0xF24B	0x66DE	# <CJK>
-0xF24C	0x6AE7	# <CJK>
-0xF24D	0x6AE0	# <CJK>
-0xF24E	0x6ACC	# <CJK>
-0xF24F	0x6AD1	# <CJK>
-0xF250	0x6AD9	# <CJK>
-0xF251	0x6ACB	# <CJK>
-0xF252	0x6ADF	# <CJK>
-0xF253	0x6ADC	# <CJK>
-0xF254	0x6AD0	# <CJK>
-0xF255	0x6AEB	# <CJK>
-0xF256	0x6ACF	# <CJK>
-0xF257	0x6ACD	# <CJK>
-0xF258	0x6ADE	# <CJK>
-0xF259	0x6B60	# <CJK>
-0xF25A	0x6BB0	# <CJK>
-0xF25B	0x6C0C	# <CJK>
-0xF25C	0x7019	# <CJK>
-0xF25D	0x7027	# <CJK>
-0xF25E	0x7020	# <CJK>
-0xF25F	0x7016	# <CJK>
-0xF260	0x702B	# <CJK>
-0xF261	0x7021	# <CJK>
-0xF262	0x7022	# <CJK>
-0xF263	0x7023	# <CJK>
-0xF264	0x7029	# <CJK>
-0xF265	0x7017	# <CJK>
-0xF266	0x7024	# <CJK>
-0xF267	0x701C	# <CJK>
-0xF268	0x702A	# <CJK>
-0xF269	0x720C	# <CJK>
-0xF26A	0x720A	# <CJK>
-0xF26B	0x7207	# <CJK>
-0xF26C	0x7202	# <CJK>
-0xF26D	0x7205	# <CJK>
-0xF26E	0x72A5	# <CJK>
-0xF26F	0x72A6	# <CJK>
-0xF270	0x72A4	# <CJK>
-0xF271	0x72A3	# <CJK>
-0xF272	0x72A1	# <CJK>
-0xF273	0x74CB	# <CJK>
-0xF274	0x74C5	# <CJK>
-0xF275	0x74B7	# <CJK>
-0xF276	0x74C3	# <CJK>
-0xF277	0x7516	# <CJK>
-0xF278	0x7660	# <CJK>
-0xF279	0x77C9	# <CJK>
-0xF27A	0x77CA	# <CJK>
-0xF27B	0x77C4	# <CJK>
-0xF27C	0x77F1	# <CJK>
-0xF27D	0x791D	# <CJK>
-0xF27E	0x791B	# <CJK>
-0xF2A1	0x7921	# <CJK>
-0xF2A2	0x791C	# <CJK>
-0xF2A3	0x7917	# <CJK>
-0xF2A4	0x791E	# <CJK>
-0xF2A5	0x79B0	# <CJK>
-0xF2A6	0x7A67	# <CJK>
-0xF2A7	0x7A68	# <CJK>
-0xF2A8	0x7C33	# <CJK>
-0xF2A9	0x7C3C	# <CJK>
-0xF2AA	0x7C39	# <CJK>
-0xF2AB	0x7C2C	# <CJK>
-0xF2AC	0x7C3B	# <CJK>
-0xF2AD	0x7CEC	# <CJK>
-0xF2AE	0x7CEA	# <CJK>
-0xF2AF	0x7E76	# <CJK>
-0xF2B0	0x7E75	# <CJK>
-0xF2B1	0x7E78	# <CJK>
-0xF2B2	0x7E70	# <CJK>
-0xF2B3	0x7E77	# <CJK>
-0xF2B4	0x7E6F	# <CJK>
-0xF2B5	0x7E7A	# <CJK>
-0xF2B6	0x7E72	# <CJK>
-0xF2B7	0x7E74	# <CJK>
-0xF2B8	0x7E68	# <CJK>
-0xF2B9	0x7F4B	# <CJK>
-0xF2BA	0x7F4A	# <CJK>
-0xF2BB	0x7F83	# <CJK>
-0xF2BC	0x7F86	# <CJK>
-0xF2BD	0x7FB7	# <CJK>
-0xF2BE	0x7FFD	# <CJK>
-0xF2BF	0x7FFE	# <CJK>
-0xF2C0	0x8078	# <CJK>
-0xF2C1	0x81D7	# <CJK>
-0xF2C2	0x81D5	# <CJK>
-0xF2C3	0x8264	# <CJK>
-0xF2C4	0x8261	# <CJK>
-0xF2C5	0x8263	# <CJK>
-0xF2C6	0x85EB	# <CJK>
-0xF2C7	0x85F1	# <CJK>
-0xF2C8	0x85ED	# <CJK>
-0xF2C9	0x85D9	# <CJK>
-0xF2CA	0x85E1	# <CJK>
-0xF2CB	0x85E8	# <CJK>
-0xF2CC	0x85DA	# <CJK>
-0xF2CD	0x85D7	# <CJK>
-0xF2CE	0x85EC	# <CJK>
-0xF2CF	0x85F2	# <CJK>
-0xF2D0	0x85F8	# <CJK>
-0xF2D1	0x85D8	# <CJK>
-0xF2D2	0x85DF	# <CJK>
-0xF2D3	0x85E3	# <CJK>
-0xF2D4	0x85DC	# <CJK>
-0xF2D5	0x85D1	# <CJK>
-0xF2D6	0x85F0	# <CJK>
-0xF2D7	0x85E6	# <CJK>
-0xF2D8	0x85EF	# <CJK>
-0xF2D9	0x85DE	# <CJK>
-0xF2DA	0x85E2	# <CJK>
-0xF2DB	0x8800	# <CJK>
-0xF2DC	0x87FA	# <CJK>
-0xF2DD	0x8803	# <CJK>
-0xF2DE	0x87F6	# <CJK>
-0xF2DF	0x87F7	# <CJK>
-0xF2E0	0x8809	# <CJK>
-0xF2E1	0x880C	# <CJK>
-0xF2E2	0x880B	# <CJK>
-0xF2E3	0x8806	# <CJK>
-0xF2E4	0x87FC	# <CJK>
-0xF2E5	0x8808	# <CJK>
-0xF2E6	0x87FF	# <CJK>
-0xF2E7	0x880A	# <CJK>
-0xF2E8	0x8802	# <CJK>
-0xF2E9	0x8962	# <CJK>
-0xF2EA	0x895A	# <CJK>
-0xF2EB	0x895B	# <CJK>
-0xF2EC	0x8957	# <CJK>
-0xF2ED	0x8961	# <CJK>
-0xF2EE	0x895C	# <CJK>
-0xF2EF	0x8958	# <CJK>
-0xF2F0	0x895D	# <CJK>
-0xF2F1	0x8959	# <CJK>
-0xF2F2	0x8988	# <CJK>
-0xF2F3	0x89B7	# <CJK>
-0xF2F4	0x89B6	# <CJK>
-0xF2F5	0x89F6	# <CJK>
-0xF2F6	0x8B50	# <CJK>
-0xF2F7	0x8B48	# <CJK>
-0xF2F8	0x8B4A	# <CJK>
-0xF2F9	0x8B40	# <CJK>
-0xF2FA	0x8B53	# <CJK>
-0xF2FB	0x8B56	# <CJK>
-0xF2FC	0x8B54	# <CJK>
-0xF2FD	0x8B4B	# <CJK>
-0xF2FE	0x8B55	# <CJK>
-0xF340	0x8B51	# <CJK>
-0xF341	0x8B42	# <CJK>
-0xF342	0x8B52	# <CJK>
-0xF343	0x8B57	# <CJK>
-0xF344	0x8C43	# <CJK>
-0xF345	0x8C77	# <CJK>
-0xF346	0x8C76	# <CJK>
-0xF347	0x8C9A	# <CJK>
-0xF348	0x8D06	# <CJK>
-0xF349	0x8D07	# <CJK>
-0xF34A	0x8D09	# <CJK>
-0xF34B	0x8DAC	# <CJK>
-0xF34C	0x8DAA	# <CJK>
-0xF34D	0x8DAD	# <CJK>
-0xF34E	0x8DAB	# <CJK>
-0xF34F	0x8E6D	# <CJK>
-0xF350	0x8E78	# <CJK>
-0xF351	0x8E73	# <CJK>
-0xF352	0x8E6A	# <CJK>
-0xF353	0x8E6F	# <CJK>
-0xF354	0x8E7B	# <CJK>
-0xF355	0x8EC2	# <CJK>
-0xF356	0x8F52	# <CJK>
-0xF357	0x8F51	# <CJK>
-0xF358	0x8F4F	# <CJK>
-0xF359	0x8F50	# <CJK>
-0xF35A	0x8F53	# <CJK>
-0xF35B	0x8FB4	# <CJK>
-0xF35C	0x9140	# <CJK>
-0xF35D	0x913F	# <CJK>
-0xF35E	0x91B0	# <CJK>
-0xF35F	0x91AD	# <CJK>
-0xF360	0x93DE	# <CJK>
-0xF361	0x93C7	# <CJK>
-0xF362	0x93CF	# <CJK>
-0xF363	0x93C2	# <CJK>
-0xF364	0x93DA	# <CJK>
-0xF365	0x93D0	# <CJK>
-0xF366	0x93F9	# <CJK>
-0xF367	0x93EC	# <CJK>
-0xF368	0x93CC	# <CJK>
-0xF369	0x93D9	# <CJK>
-0xF36A	0x93A9	# <CJK>
-0xF36B	0x93E6	# <CJK>
-0xF36C	0x93CA	# <CJK>
-0xF36D	0x93D4	# <CJK>
-0xF36E	0x93EE	# <CJK>
-0xF36F	0x93E3	# <CJK>
-0xF370	0x93D5	# <CJK>
-0xF371	0x93C4	# <CJK>
-0xF372	0x93CE	# <CJK>
-0xF373	0x93C0	# <CJK>
-0xF374	0x93D2	# <CJK>
-0xF375	0x93E7	# <CJK>
-0xF376	0x957D	# <CJK>
-0xF377	0x95DA	# <CJK>
-0xF378	0x95DB	# <CJK>
-0xF379	0x96E1	# <CJK>
-0xF37A	0x9729	# <CJK>
-0xF37B	0x972B	# <CJK>
-0xF37C	0x972C	# <CJK>
-0xF37D	0x9728	# <CJK>
-0xF37E	0x9726	# <CJK>
-0xF3A1	0x97B3	# <CJK>
-0xF3A2	0x97B7	# <CJK>
-0xF3A3	0x97B6	# <CJK>
-0xF3A4	0x97DD	# <CJK>
-0xF3A5	0x97DE	# <CJK>
-0xF3A6	0x97DF	# <CJK>
-0xF3A7	0x985C	# <CJK>
-0xF3A8	0x9859	# <CJK>
-0xF3A9	0x985D	# <CJK>
-0xF3AA	0x9857	# <CJK>
-0xF3AB	0x98BF	# <CJK>
-0xF3AC	0x98BD	# <CJK>
-0xF3AD	0x98BB	# <CJK>
-0xF3AE	0x98BE	# <CJK>
-0xF3AF	0x9948	# <CJK>
-0xF3B0	0x9947	# <CJK>
-0xF3B1	0x9943	# <CJK>
-0xF3B2	0x99A6	# <CJK>
-0xF3B3	0x99A7	# <CJK>
-0xF3B4	0x9A1A	# <CJK>
-0xF3B5	0x9A15	# <CJK>
-0xF3B6	0x9A25	# <CJK>
-0xF3B7	0x9A1D	# <CJK>
-0xF3B8	0x9A24	# <CJK>
-0xF3B9	0x9A1B	# <CJK>
-0xF3BA	0x9A22	# <CJK>
-0xF3BB	0x9A20	# <CJK>
-0xF3BC	0x9A27	# <CJK>
-0xF3BD	0x9A23	# <CJK>
-0xF3BE	0x9A1E	# <CJK>
-0xF3BF	0x9A1C	# <CJK>
-0xF3C0	0x9A14	# <CJK>
-0xF3C1	0x9AC2	# <CJK>
-0xF3C2	0x9B0B	# <CJK>
-0xF3C3	0x9B0A	# <CJK>
-0xF3C4	0x9B0E	# <CJK>
-0xF3C5	0x9B0C	# <CJK>
-0xF3C6	0x9B37	# <CJK>
-0xF3C7	0x9BEA	# <CJK>
-0xF3C8	0x9BEB	# <CJK>
-0xF3C9	0x9BE0	# <CJK>
-0xF3CA	0x9BDE	# <CJK>
-0xF3CB	0x9BE4	# <CJK>
-0xF3CC	0x9BE6	# <CJK>
-0xF3CD	0x9BE2	# <CJK>
-0xF3CE	0x9BF0	# <CJK>
-0xF3CF	0x9BD4	# <CJK>
-0xF3D0	0x9BD7	# <CJK>
-0xF3D1	0x9BEC	# <CJK>
-0xF3D2	0x9BDC	# <CJK>
-0xF3D3	0x9BD9	# <CJK>
-0xF3D4	0x9BE5	# <CJK>
-0xF3D5	0x9BD5	# <CJK>
-0xF3D6	0x9BE1	# <CJK>
-0xF3D7	0x9BDA	# <CJK>
-0xF3D8	0x9D77	# <CJK>
-0xF3D9	0x9D81	# <CJK>
-0xF3DA	0x9D8A	# <CJK>
-0xF3DB	0x9D84	# <CJK>
-0xF3DC	0x9D88	# <CJK>
-0xF3DD	0x9D71	# <CJK>
-0xF3DE	0x9D80	# <CJK>
-0xF3DF	0x9D78	# <CJK>
-0xF3E0	0x9D86	# <CJK>
-0xF3E1	0x9D8B	# <CJK>
-0xF3E2	0x9D8C	# <CJK>
-0xF3E3	0x9D7D	# <CJK>
-0xF3E4	0x9D6B	# <CJK>
-0xF3E5	0x9D74	# <CJK>
-0xF3E6	0x9D75	# <CJK>
-0xF3E7	0x9D70	# <CJK>
-0xF3E8	0x9D69	# <CJK>
-0xF3E9	0x9D85	# <CJK>
-0xF3EA	0x9D73	# <CJK>
-0xF3EB	0x9D7B	# <CJK>
-0xF3EC	0x9D82	# <CJK>
-0xF3ED	0x9D6F	# <CJK>
-0xF3EE	0x9D79	# <CJK>
-0xF3EF	0x9D7F	# <CJK>
-0xF3F0	0x9D87	# <CJK>
-0xF3F1	0x9D68	# <CJK>
-0xF3F2	0x9E94	# <CJK>
-0xF3F3	0x9E91	# <CJK>
-0xF3F4	0x9EC0	# <CJK>
-0xF3F5	0x9EFC	# <CJK>
-0xF3F6	0x9F2D	# <CJK>
-0xF3F7	0x9F40	# <CJK>
-0xF3F8	0x9F41	# <CJK>
-0xF3F9	0x9F4D	# <CJK>
-0xF3FA	0x9F56	# <CJK>
-0xF3FB	0x9F57	# <CJK>
-0xF3FC	0x9F58	# <CJK>
-0xF3FD	0x5337	# <CJK>
-0xF3FE	0x56B2	# <CJK>
-0xF440	0x56B5	# <CJK>
-0xF441	0x56B3	# <CJK>
-0xF442	0x58E3	# <CJK>
-0xF443	0x5B45	# <CJK>
-0xF444	0x5DC6	# <CJK>
-0xF445	0x5DC7	# <CJK>
-0xF446	0x5EEE	# <CJK>
-0xF447	0x5EEF	# <CJK>
-0xF448	0x5FC0	# <CJK>
-0xF449	0x5FC1	# <CJK>
-0xF44A	0x61F9	# <CJK>
-0xF44B	0x6517	# <CJK>
-0xF44C	0x6516	# <CJK>
-0xF44D	0x6515	# <CJK>
-0xF44E	0x6513	# <CJK>
-0xF44F	0x65DF	# <CJK>
-0xF450	0x66E8	# <CJK>
-0xF451	0x66E3	# <CJK>
-0xF452	0x66E4	# <CJK>
-0xF453	0x6AF3	# <CJK>
-0xF454	0x6AF0	# <CJK>
-0xF455	0x6AEA	# <CJK>
-0xF456	0x6AE8	# <CJK>
-0xF457	0x6AF9	# <CJK>
-0xF458	0x6AF1	# <CJK>
-0xF459	0x6AEE	# <CJK>
-0xF45A	0x6AEF	# <CJK>
-0xF45B	0x703C	# <CJK>
-0xF45C	0x7035	# <CJK>
-0xF45D	0x702F	# <CJK>
-0xF45E	0x7037	# <CJK>
-0xF45F	0x7034	# <CJK>
-0xF460	0x7031	# <CJK>
-0xF461	0x7042	# <CJK>
-0xF462	0x7038	# <CJK>
-0xF463	0x703F	# <CJK>
-0xF464	0x703A	# <CJK>
-0xF465	0x7039	# <CJK>
-0xF466	0x7040	# <CJK>
-0xF467	0x703B	# <CJK>
-0xF468	0x7033	# <CJK>
-0xF469	0x7041	# <CJK>
-0xF46A	0x7213	# <CJK>
-0xF46B	0x7214	# <CJK>
-0xF46C	0x72A8	# <CJK>
-0xF46D	0x737D	# <CJK>
-0xF46E	0x737C	# <CJK>
-0xF46F	0x74BA	# <CJK>
-0xF470	0x76AB	# <CJK>
-0xF471	0x76AA	# <CJK>
-0xF472	0x76BE	# <CJK>
-0xF473	0x76ED	# <CJK>
-0xF474	0x77CC	# <CJK>
-0xF475	0x77CE	# <CJK>
-0xF476	0x77CF	# <CJK>
-0xF477	0x77CD	# <CJK>
-0xF478	0x77F2	# <CJK>
-0xF479	0x7925	# <CJK>
-0xF47A	0x7923	# <CJK>
-0xF47B	0x7927	# <CJK>
-0xF47C	0x7928	# <CJK>
-0xF47D	0x7924	# <CJK>
-0xF47E	0x7929	# <CJK>
-0xF4A1	0x79B2	# <CJK>
-0xF4A2	0x7A6E	# <CJK>
-0xF4A3	0x7A6C	# <CJK>
-0xF4A4	0x7A6D	# <CJK>
-0xF4A5	0x7AF7	# <CJK>
-0xF4A6	0x7C49	# <CJK>
-0xF4A7	0x7C48	# <CJK>
-0xF4A8	0x7C4A	# <CJK>
-0xF4A9	0x7C47	# <CJK>
-0xF4AA	0x7C45	# <CJK>
-0xF4AB	0x7CEE	# <CJK>
-0xF4AC	0x7E7B	# <CJK>
-0xF4AD	0x7E7E	# <CJK>
-0xF4AE	0x7E81	# <CJK>
-0xF4AF	0x7E80	# <CJK>
-0xF4B0	0x7FBA	# <CJK>
-0xF4B1	0x7FFF	# <CJK>
-0xF4B2	0x8079	# <CJK>
-0xF4B3	0x81DB	# <CJK>
-0xF4B4	0x81D9	# <CJK>
-0xF4B5	0x820B	# <CJK>
-0xF4B6	0x8268	# <CJK>
-0xF4B7	0x8269	# <CJK>
-0xF4B8	0x8622	# <CJK>
-0xF4B9	0x85FF	# <CJK>
-0xF4BA	0x8601	# <CJK>
-0xF4BB	0x85FE	# <CJK>
-0xF4BC	0x861B	# <CJK>
-0xF4BD	0x8600	# <CJK>
-0xF4BE	0x85F6	# <CJK>
-0xF4BF	0x8604	# <CJK>
-0xF4C0	0x8609	# <CJK>
-0xF4C1	0x8605	# <CJK>
-0xF4C2	0x860C	# <CJK>
-0xF4C3	0x85FD	# <CJK>
-0xF4C4	0x8819	# <CJK>
-0xF4C5	0x8810	# <CJK>
-0xF4C6	0x8811	# <CJK>
-0xF4C7	0x8817	# <CJK>
-0xF4C8	0x8813	# <CJK>
-0xF4C9	0x8816	# <CJK>
-0xF4CA	0x8963	# <CJK>
-0xF4CB	0x8966	# <CJK>
-0xF4CC	0x89B9	# <CJK>
-0xF4CD	0x89F7	# <CJK>
-0xF4CE	0x8B60	# <CJK>
-0xF4CF	0x8B6A	# <CJK>
-0xF4D0	0x8B5D	# <CJK>
-0xF4D1	0x8B68	# <CJK>
-0xF4D2	0x8B63	# <CJK>
-0xF4D3	0x8B65	# <CJK>
-0xF4D4	0x8B67	# <CJK>
-0xF4D5	0x8B6D	# <CJK>
-0xF4D6	0x8DAE	# <CJK>
-0xF4D7	0x8E86	# <CJK>
-0xF4D8	0x8E88	# <CJK>
-0xF4D9	0x8E84	# <CJK>
-0xF4DA	0x8F59	# <CJK>
-0xF4DB	0x8F56	# <CJK>
-0xF4DC	0x8F57	# <CJK>
-0xF4DD	0x8F55	# <CJK>
-0xF4DE	0x8F58	# <CJK>
-0xF4DF	0x8F5A	# <CJK>
-0xF4E0	0x908D	# <CJK>
-0xF4E1	0x9143	# <CJK>
-0xF4E2	0x9141	# <CJK>
-0xF4E3	0x91B7	# <CJK>
-0xF4E4	0x91B5	# <CJK>
-0xF4E5	0x91B2	# <CJK>
-0xF4E6	0x91B3	# <CJK>
-0xF4E7	0x940B	# <CJK>
-0xF4E8	0x9413	# <CJK>
-0xF4E9	0x93FB	# <CJK>
-0xF4EA	0x9420	# <CJK>
-0xF4EB	0x940F	# <CJK>
-0xF4EC	0x9414	# <CJK>
-0xF4ED	0x93FE	# <CJK>
-0xF4EE	0x9415	# <CJK>
-0xF4EF	0x9410	# <CJK>
-0xF4F0	0x9428	# <CJK>
-0xF4F1	0x9419	# <CJK>
-0xF4F2	0x940D	# <CJK>
-0xF4F3	0x93F5	# <CJK>
-0xF4F4	0x9400	# <CJK>
-0xF4F5	0x93F7	# <CJK>
-0xF4F6	0x9407	# <CJK>
-0xF4F7	0x940E	# <CJK>
-0xF4F8	0x9416	# <CJK>
-0xF4F9	0x9412	# <CJK>
-0xF4FA	0x93FA	# <CJK>
-0xF4FB	0x9409	# <CJK>
-0xF4FC	0x93F8	# <CJK>
-0xF4FD	0x940A	# <CJK>
-0xF4FE	0x93FF	# <CJK>
-0xF540	0x93FC	# <CJK>
-0xF541	0x940C	# <CJK>
-0xF542	0x93F6	# <CJK>
-0xF543	0x9411	# <CJK>
-0xF544	0x9406	# <CJK>
-0xF545	0x95DE	# <CJK>
-0xF546	0x95E0	# <CJK>
-0xF547	0x95DF	# <CJK>
-0xF548	0x972E	# <CJK>
-0xF549	0x972F	# <CJK>
-0xF54A	0x97B9	# <CJK>
-0xF54B	0x97BB	# <CJK>
-0xF54C	0x97FD	# <CJK>
-0xF54D	0x97FE	# <CJK>
-0xF54E	0x9860	# <CJK>
-0xF54F	0x9862	# <CJK>
-0xF550	0x9863	# <CJK>
-0xF551	0x985F	# <CJK>
-0xF552	0x98C1	# <CJK>
-0xF553	0x98C2	# <CJK>
-0xF554	0x9950	# <CJK>
-0xF555	0x994E	# <CJK>
-0xF556	0x9959	# <CJK>
-0xF557	0x994C	# <CJK>
-0xF558	0x994B	# <CJK>
-0xF559	0x9953	# <CJK>
-0xF55A	0x9A32	# <CJK>
-0xF55B	0x9A34	# <CJK>
-0xF55C	0x9A31	# <CJK>
-0xF55D	0x9A2C	# <CJK>
-0xF55E	0x9A2A	# <CJK>
-0xF55F	0x9A36	# <CJK>
-0xF560	0x9A29	# <CJK>
-0xF561	0x9A2E	# <CJK>
-0xF562	0x9A38	# <CJK>
-0xF563	0x9A2D	# <CJK>
-0xF564	0x9AC7	# <CJK>
-0xF565	0x9ACA	# <CJK>
-0xF566	0x9AC6	# <CJK>
-0xF567	0x9B10	# <CJK>
-0xF568	0x9B12	# <CJK>
-0xF569	0x9B11	# <CJK>
-0xF56A	0x9C0B	# <CJK>
-0xF56B	0x9C08	# <CJK>
-0xF56C	0x9BF7	# <CJK>
-0xF56D	0x9C05	# <CJK>
-0xF56E	0x9C12	# <CJK>
-0xF56F	0x9BF8	# <CJK>
-0xF570	0x9C40	# <CJK>
-0xF571	0x9C07	# <CJK>
-0xF572	0x9C0E	# <CJK>
-0xF573	0x9C06	# <CJK>
-0xF574	0x9C17	# <CJK>
-0xF575	0x9C14	# <CJK>
-0xF576	0x9C09	# <CJK>
-0xF577	0x9D9F	# <CJK>
-0xF578	0x9D99	# <CJK>
-0xF579	0x9DA4	# <CJK>
-0xF57A	0x9D9D	# <CJK>
-0xF57B	0x9D92	# <CJK>
-0xF57C	0x9D98	# <CJK>
-0xF57D	0x9D90	# <CJK>
-0xF57E	0x9D9B	# <CJK>
-0xF5A1	0x9DA0	# <CJK>
-0xF5A2	0x9D94	# <CJK>
-0xF5A3	0x9D9C	# <CJK>
-0xF5A4	0x9DAA	# <CJK>
-0xF5A5	0x9D97	# <CJK>
-0xF5A6	0x9DA1	# <CJK>
-0xF5A7	0x9D9A	# <CJK>
-0xF5A8	0x9DA2	# <CJK>
-0xF5A9	0x9DA8	# <CJK>
-0xF5AA	0x9D9E	# <CJK>
-0xF5AB	0x9DA3	# <CJK>
-0xF5AC	0x9DBF	# <CJK>
-0xF5AD	0x9DA9	# <CJK>
-0xF5AE	0x9D96	# <CJK>
-0xF5AF	0x9DA6	# <CJK>
-0xF5B0	0x9DA7	# <CJK>
-0xF5B1	0x9E99	# <CJK>
-0xF5B2	0x9E9B	# <CJK>
-0xF5B3	0x9E9A	# <CJK>
-0xF5B4	0x9EE5	# <CJK>
-0xF5B5	0x9EE4	# <CJK>
-0xF5B6	0x9EE7	# <CJK>
-0xF5B7	0x9EE6	# <CJK>
-0xF5B8	0x9F30	# <CJK>
-0xF5B9	0x9F2E	# <CJK>
-0xF5BA	0x9F5B	# <CJK>
-0xF5BB	0x9F60	# <CJK>
-0xF5BC	0x9F5E	# <CJK>
-0xF5BD	0x9F5D	# <CJK>
-0xF5BE	0x9F59	# <CJK>
-0xF5BF	0x9F91	# <CJK>
-0xF5C0	0x513A	# <CJK>
-0xF5C1	0x5139	# <CJK>
-0xF5C2	0x5298	# <CJK>
-0xF5C3	0x5297	# <CJK>
-0xF5C4	0x56C3	# <CJK>
-0xF5C5	0x56BD	# <CJK>
-0xF5C6	0x56BE	# <CJK>
-0xF5C7	0x5B48	# <CJK>
-0xF5C8	0x5B47	# <CJK>
-0xF5C9	0x5DCB	# <CJK>
-0xF5CA	0x5DCF	# <CJK>
-0xF5CB	0x5EF1	# <CJK>
-0xF5CC	0x61FD	# <CJK>
-0xF5CD	0x651B	# <CJK>
-0xF5CE	0x6B02	# <CJK>
-0xF5CF	0x6AFC	# <CJK>
-0xF5D0	0x6B03	# <CJK>
-0xF5D1	0x6AF8	# <CJK>
-0xF5D2	0x6B00	# <CJK>
-0xF5D3	0x7043	# <CJK>
-0xF5D4	0x7044	# <CJK>
-0xF5D5	0x704A	# <CJK>
-0xF5D6	0x7048	# <CJK>
-0xF5D7	0x7049	# <CJK>
-0xF5D8	0x7045	# <CJK>
-0xF5D9	0x7046	# <CJK>
-0xF5DA	0x721D	# <CJK>
-0xF5DB	0x721A	# <CJK>
-0xF5DC	0x7219	# <CJK>
-0xF5DD	0x737E	# <CJK>
-0xF5DE	0x7517	# <CJK>
-0xF5DF	0x766A	# <CJK>
-0xF5E0	0x77D0	# <CJK>
-0xF5E1	0x792D	# <CJK>
-0xF5E2	0x7931	# <CJK>
-0xF5E3	0x792F	# <CJK>
-0xF5E4	0x7C54	# <CJK>
-0xF5E5	0x7C53	# <CJK>
-0xF5E6	0x7CF2	# <CJK>
-0xF5E7	0x7E8A	# <CJK>
-0xF5E8	0x7E87	# <CJK>
-0xF5E9	0x7E88	# <CJK>
-0xF5EA	0x7E8B	# <CJK>
-0xF5EB	0x7E86	# <CJK>
-0xF5EC	0x7E8D	# <CJK>
-0xF5ED	0x7F4D	# <CJK>
-0xF5EE	0x7FBB	# <CJK>
-0xF5EF	0x8030	# <CJK>
-0xF5F0	0x81DD	# <CJK>
-0xF5F1	0x8618	# <CJK>
-0xF5F2	0x862A	# <CJK>
-0xF5F3	0x8626	# <CJK>
-0xF5F4	0x861F	# <CJK>
-0xF5F5	0x8623	# <CJK>
-0xF5F6	0x861C	# <CJK>
-0xF5F7	0x8619	# <CJK>
-0xF5F8	0x8627	# <CJK>
-0xF5F9	0x862E	# <CJK>
-0xF5FA	0x8621	# <CJK>
-0xF5FB	0x8620	# <CJK>
-0xF5FC	0x8629	# <CJK>
-0xF5FD	0x861E	# <CJK>
-0xF5FE	0x8625	# <CJK>
-0xF640	0x8829	# <CJK>
-0xF641	0x881D	# <CJK>
-0xF642	0x881B	# <CJK>
-0xF643	0x8820	# <CJK>
-0xF644	0x8824	# <CJK>
-0xF645	0x881C	# <CJK>
-0xF646	0x882B	# <CJK>
-0xF647	0x884A	# <CJK>
-0xF648	0x896D	# <CJK>
-0xF649	0x8969	# <CJK>
-0xF64A	0x896E	# <CJK>
-0xF64B	0x896B	# <CJK>
-0xF64C	0x89FA	# <CJK>
-0xF64D	0x8B79	# <CJK>
-0xF64E	0x8B78	# <CJK>
-0xF64F	0x8B45	# <CJK>
-0xF650	0x8B7A	# <CJK>
-0xF651	0x8B7B	# <CJK>
-0xF652	0x8D10	# <CJK>
-0xF653	0x8D14	# <CJK>
-0xF654	0x8DAF	# <CJK>
-0xF655	0x8E8E	# <CJK>
-0xF656	0x8E8C	# <CJK>
-0xF657	0x8F5E	# <CJK>
-0xF658	0x8F5B	# <CJK>
-0xF659	0x8F5D	# <CJK>
-0xF65A	0x9146	# <CJK>
-0xF65B	0x9144	# <CJK>
-0xF65C	0x9145	# <CJK>
-0xF65D	0x91B9	# <CJK>
-0xF65E	0x943F	# <CJK>
-0xF65F	0x943B	# <CJK>
-0xF660	0x9436	# <CJK>
-0xF661	0x9429	# <CJK>
-0xF662	0x943D	# <CJK>
-0xF663	0x943C	# <CJK>
-0xF664	0x9430	# <CJK>
-0xF665	0x9439	# <CJK>
-0xF666	0x942A	# <CJK>
-0xF667	0x9437	# <CJK>
-0xF668	0x942C	# <CJK>
-0xF669	0x9440	# <CJK>
-0xF66A	0x9431	# <CJK>
-0xF66B	0x95E5	# <CJK>
-0xF66C	0x95E4	# <CJK>
-0xF66D	0x95E3	# <CJK>
-0xF66E	0x9735	# <CJK>
-0xF66F	0x973A	# <CJK>
-0xF670	0x97BF	# <CJK>
-0xF671	0x97E1	# <CJK>
-0xF672	0x9864	# <CJK>
-0xF673	0x98C9	# <CJK>
-0xF674	0x98C6	# <CJK>
-0xF675	0x98C0	# <CJK>
-0xF676	0x9958	# <CJK>
-0xF677	0x9956	# <CJK>
-0xF678	0x9A39	# <CJK>
-0xF679	0x9A3D	# <CJK>
-0xF67A	0x9A46	# <CJK>
-0xF67B	0x9A44	# <CJK>
-0xF67C	0x9A42	# <CJK>
-0xF67D	0x9A41	# <CJK>
-0xF67E	0x9A3A	# <CJK>
-0xF6A1	0x9A3F	# <CJK>
-0xF6A2	0x9ACD	# <CJK>
-0xF6A3	0x9B15	# <CJK>
-0xF6A4	0x9B17	# <CJK>
-0xF6A5	0x9B18	# <CJK>
-0xF6A6	0x9B16	# <CJK>
-0xF6A7	0x9B3A	# <CJK>
-0xF6A8	0x9B52	# <CJK>
-0xF6A9	0x9C2B	# <CJK>
-0xF6AA	0x9C1D	# <CJK>
-0xF6AB	0x9C1C	# <CJK>
-0xF6AC	0x9C2C	# <CJK>
-0xF6AD	0x9C23	# <CJK>
-0xF6AE	0x9C28	# <CJK>
-0xF6AF	0x9C29	# <CJK>
-0xF6B0	0x9C24	# <CJK>
-0xF6B1	0x9C21	# <CJK>
-0xF6B2	0x9DB7	# <CJK>
-0xF6B3	0x9DB6	# <CJK>
-0xF6B4	0x9DBC	# <CJK>
-0xF6B5	0x9DC1	# <CJK>
-0xF6B6	0x9DC7	# <CJK>
-0xF6B7	0x9DCA	# <CJK>
-0xF6B8	0x9DCF	# <CJK>
-0xF6B9	0x9DBE	# <CJK>
-0xF6BA	0x9DC5	# <CJK>
-0xF6BB	0x9DC3	# <CJK>
-0xF6BC	0x9DBB	# <CJK>
-0xF6BD	0x9DB5	# <CJK>
-0xF6BE	0x9DCE	# <CJK>
-0xF6BF	0x9DB9	# <CJK>
-0xF6C0	0x9DBA	# <CJK>
-0xF6C1	0x9DAC	# <CJK>
-0xF6C2	0x9DC8	# <CJK>
-0xF6C3	0x9DB1	# <CJK>
-0xF6C4	0x9DAD	# <CJK>
-0xF6C5	0x9DCC	# <CJK>
-0xF6C6	0x9DB3	# <CJK>
-0xF6C7	0x9DCD	# <CJK>
-0xF6C8	0x9DB2	# <CJK>
-0xF6C9	0x9E7A	# <CJK>
-0xF6CA	0x9E9C	# <CJK>
-0xF6CB	0x9EEB	# <CJK>
-0xF6CC	0x9EEE	# <CJK>
-0xF6CD	0x9EED	# <CJK>
-0xF6CE	0x9F1B	# <CJK>
-0xF6CF	0x9F18	# <CJK>
-0xF6D0	0x9F1A	# <CJK>
-0xF6D1	0x9F31	# <CJK>
-0xF6D2	0x9F4E	# <CJK>
-0xF6D3	0x9F65	# <CJK>
-0xF6D4	0x9F64	# <CJK>
-0xF6D5	0x9F92	# <CJK>
-0xF6D6	0x4EB9	# <CJK>
-0xF6D7	0x56C6	# <CJK>
-0xF6D8	0x56C5	# <CJK>
-0xF6D9	0x56CB	# <CJK>
-0xF6DA	0x5971	# <CJK>
-0xF6DB	0x5B4B	# <CJK>
-0xF6DC	0x5B4C	# <CJK>
-0xF6DD	0x5DD5	# <CJK>
-0xF6DE	0x5DD1	# <CJK>
-0xF6DF	0x5EF2	# <CJK>
-0xF6E0	0x6521	# <CJK>
-0xF6E1	0x6520	# <CJK>
-0xF6E2	0x6526	# <CJK>
-0xF6E3	0x6522	# <CJK>
-0xF6E4	0x6B0B	# <CJK>
-0xF6E5	0x6B08	# <CJK>
-0xF6E6	0x6B09	# <CJK>
-0xF6E7	0x6C0D	# <CJK>
-0xF6E8	0x7055	# <CJK>
-0xF6E9	0x7056	# <CJK>
-0xF6EA	0x7057	# <CJK>
-0xF6EB	0x7052	# <CJK>
-0xF6EC	0x721E	# <CJK>
-0xF6ED	0x721F	# <CJK>
-0xF6EE	0x72A9	# <CJK>
-0xF6EF	0x737F	# <CJK>
-0xF6F0	0x74D8	# <CJK>
-0xF6F1	0x74D5	# <CJK>
-0xF6F2	0x74D9	# <CJK>
-0xF6F3	0x74D7	# <CJK>
-0xF6F4	0x766D	# <CJK>
-0xF6F5	0x76AD	# <CJK>
-0xF6F6	0x7935	# <CJK>
-0xF6F7	0x79B4	# <CJK>
-0xF6F8	0x7A70	# <CJK>
-0xF6F9	0x7A71	# <CJK>
-0xF6FA	0x7C57	# <CJK>
-0xF6FB	0x7C5C	# <CJK>
-0xF6FC	0x7C59	# <CJK>
-0xF6FD	0x7C5B	# <CJK>
-0xF6FE	0x7C5A	# <CJK>
-0xF740	0x7CF4	# <CJK>
-0xF741	0x7CF1	# <CJK>
-0xF742	0x7E91	# <CJK>
-0xF743	0x7F4F	# <CJK>
-0xF744	0x7F87	# <CJK>
-0xF745	0x81DE	# <CJK>
-0xF746	0x826B	# <CJK>
-0xF747	0x8634	# <CJK>
-0xF748	0x8635	# <CJK>
-0xF749	0x8633	# <CJK>
-0xF74A	0x862C	# <CJK>
-0xF74B	0x8632	# <CJK>
-0xF74C	0x8636	# <CJK>
-0xF74D	0x882C	# <CJK>
-0xF74E	0x8828	# <CJK>
-0xF74F	0x8826	# <CJK>
-0xF750	0x882A	# <CJK>
-0xF751	0x8825	# <CJK>
-0xF752	0x8971	# <CJK>
-0xF753	0x89BF	# <CJK>
-0xF754	0x89BE	# <CJK>
-0xF755	0x89FB	# <CJK>
-0xF756	0x8B7E	# <CJK>
-0xF757	0x8B84	# <CJK>
-0xF758	0x8B82	# <CJK>
-0xF759	0x8B86	# <CJK>
-0xF75A	0x8B85	# <CJK>
-0xF75B	0x8B7F	# <CJK>
-0xF75C	0x8D15	# <CJK>
-0xF75D	0x8E95	# <CJK>
-0xF75E	0x8E94	# <CJK>
-0xF75F	0x8E9A	# <CJK>
-0xF760	0x8E92	# <CJK>
-0xF761	0x8E90	# <CJK>
-0xF762	0x8E96	# <CJK>
-0xF763	0x8E97	# <CJK>
-0xF764	0x8F60	# <CJK>
-0xF765	0x8F62	# <CJK>
-0xF766	0x9147	# <CJK>
-0xF767	0x944C	# <CJK>
-0xF768	0x9450	# <CJK>
-0xF769	0x944A	# <CJK>
-0xF76A	0x944B	# <CJK>
-0xF76B	0x944F	# <CJK>
-0xF76C	0x9447	# <CJK>
-0xF76D	0x9445	# <CJK>
-0xF76E	0x9448	# <CJK>
-0xF76F	0x9449	# <CJK>
-0xF770	0x9446	# <CJK>
-0xF771	0x973F	# <CJK>
-0xF772	0x97E3	# <CJK>
-0xF773	0x986A	# <CJK>
-0xF774	0x9869	# <CJK>
-0xF775	0x98CB	# <CJK>
-0xF776	0x9954	# <CJK>
-0xF777	0x995B	# <CJK>
-0xF778	0x9A4E	# <CJK>
-0xF779	0x9A53	# <CJK>
-0xF77A	0x9A54	# <CJK>
-0xF77B	0x9A4C	# <CJK>
-0xF77C	0x9A4F	# <CJK>
-0xF77D	0x9A48	# <CJK>
-0xF77E	0x9A4A	# <CJK>
-0xF7A1	0x9A49	# <CJK>
-0xF7A2	0x9A52	# <CJK>
-0xF7A3	0x9A50	# <CJK>
-0xF7A4	0x9AD0	# <CJK>
-0xF7A5	0x9B19	# <CJK>
-0xF7A6	0x9B2B	# <CJK>
-0xF7A7	0x9B3B	# <CJK>
-0xF7A8	0x9B56	# <CJK>
-0xF7A9	0x9B55	# <CJK>
-0xF7AA	0x9C46	# <CJK>
-0xF7AB	0x9C48	# <CJK>
-0xF7AC	0x9C3F	# <CJK>
-0xF7AD	0x9C44	# <CJK>
-0xF7AE	0x9C39	# <CJK>
-0xF7AF	0x9C33	# <CJK>
-0xF7B0	0x9C41	# <CJK>
-0xF7B1	0x9C3C	# <CJK>
-0xF7B2	0x9C37	# <CJK>
-0xF7B3	0x9C34	# <CJK>
-0xF7B4	0x9C32	# <CJK>
-0xF7B5	0x9C3D	# <CJK>
-0xF7B6	0x9C36	# <CJK>
-0xF7B7	0x9DDB	# <CJK>
-0xF7B8	0x9DD2	# <CJK>
-0xF7B9	0x9DDE	# <CJK>
-0xF7BA	0x9DDA	# <CJK>
-0xF7BB	0x9DCB	# <CJK>
-0xF7BC	0x9DD0	# <CJK>
-0xF7BD	0x9DDC	# <CJK>
-0xF7BE	0x9DD1	# <CJK>
-0xF7BF	0x9DDF	# <CJK>
-0xF7C0	0x9DE9	# <CJK>
-0xF7C1	0x9DD9	# <CJK>
-0xF7C2	0x9DD8	# <CJK>
-0xF7C3	0x9DD6	# <CJK>
-0xF7C4	0x9DF5	# <CJK>
-0xF7C5	0x9DD5	# <CJK>
-0xF7C6	0x9DDD	# <CJK>
-0xF7C7	0x9EB6	# <CJK>
-0xF7C8	0x9EF0	# <CJK>
-0xF7C9	0x9F35	# <CJK>
-0xF7CA	0x9F33	# <CJK>
-0xF7CB	0x9F32	# <CJK>
-0xF7CC	0x9F42	# <CJK>
-0xF7CD	0x9F6B	# <CJK>
-0xF7CE	0x9F95	# <CJK>
-0xF7CF	0x9FA2	# <CJK>
-0xF7D0	0x513D	# <CJK>
-0xF7D1	0x5299	# <CJK>
-0xF7D2	0x58E8	# <CJK>
-0xF7D3	0x58E7	# <CJK>
-0xF7D4	0x5972	# <CJK>
-0xF7D5	0x5B4D	# <CJK>
-0xF7D6	0x5DD8	# <CJK>
-0xF7D7	0x882F	# <CJK>
-0xF7D8	0x5F4F	# <CJK>
-0xF7D9	0x6201	# <CJK>
-0xF7DA	0x6203	# <CJK>
-0xF7DB	0x6204	# <CJK>
-0xF7DC	0x6529	# <CJK>
-0xF7DD	0x6525	# <CJK>
-0xF7DE	0x6596	# <CJK>
-0xF7DF	0x66EB	# <CJK>
-0xF7E0	0x6B11	# <CJK>
-0xF7E1	0x6B12	# <CJK>
-0xF7E2	0x6B0F	# <CJK>
-0xF7E3	0x6BCA	# <CJK>
-0xF7E4	0x705B	# <CJK>
-0xF7E5	0x705A	# <CJK>
-0xF7E6	0x7222	# <CJK>
-0xF7E7	0x7382	# <CJK>
-0xF7E8	0x7381	# <CJK>
-0xF7E9	0x7383	# <CJK>
-0xF7EA	0x7670	# <CJK>
-0xF7EB	0x77D4	# <CJK>
-0xF7EC	0x7C67	# <CJK>
-0xF7ED	0x7C66	# <CJK>
-0xF7EE	0x7E95	# <CJK>
-0xF7EF	0x826C	# <CJK>
-0xF7F0	0x863A	# <CJK>
-0xF7F1	0x8640	# <CJK>
-0xF7F2	0x8639	# <CJK>
-0xF7F3	0x863C	# <CJK>
-0xF7F4	0x8631	# <CJK>
-0xF7F5	0x863B	# <CJK>
-0xF7F6	0x863E	# <CJK>
-0xF7F7	0x8830	# <CJK>
-0xF7F8	0x8832	# <CJK>
-0xF7F9	0x882E	# <CJK>
-0xF7FA	0x8833	# <CJK>
-0xF7FB	0x8976	# <CJK>
-0xF7FC	0x8974	# <CJK>
-0xF7FD	0x8973	# <CJK>
-0xF7FE	0x89FE	# <CJK>
-0xF840	0x8B8C	# <CJK>
-0xF841	0x8B8E	# <CJK>
-0xF842	0x8B8B	# <CJK>
-0xF843	0x8B88	# <CJK>
-0xF844	0x8C45	# <CJK>
-0xF845	0x8D19	# <CJK>
-0xF846	0x8E98	# <CJK>
-0xF847	0x8F64	# <CJK>
-0xF848	0x8F63	# <CJK>
-0xF849	0x91BC	# <CJK>
-0xF84A	0x9462	# <CJK>
-0xF84B	0x9455	# <CJK>
-0xF84C	0x945D	# <CJK>
-0xF84D	0x9457	# <CJK>
-0xF84E	0x945E	# <CJK>
-0xF84F	0x97C4	# <CJK>
-0xF850	0x97C5	# <CJK>
-0xF851	0x9800	# <CJK>
-0xF852	0x9A56	# <CJK>
-0xF853	0x9A59	# <CJK>
-0xF854	0x9B1E	# <CJK>
-0xF855	0x9B1F	# <CJK>
-0xF856	0x9B20	# <CJK>
-0xF857	0x9C52	# <CJK>
-0xF858	0x9C58	# <CJK>
-0xF859	0x9C50	# <CJK>
-0xF85A	0x9C4A	# <CJK>
-0xF85B	0x9C4D	# <CJK>
-0xF85C	0x9C4B	# <CJK>
-0xF85D	0x9C55	# <CJK>
-0xF85E	0x9C59	# <CJK>
-0xF85F	0x9C4C	# <CJK>
-0xF860	0x9C4E	# <CJK>
-0xF861	0x9DFB	# <CJK>
-0xF862	0x9DF7	# <CJK>
-0xF863	0x9DEF	# <CJK>
-0xF864	0x9DE3	# <CJK>
-0xF865	0x9DEB	# <CJK>
-0xF866	0x9DF8	# <CJK>
-0xF867	0x9DE4	# <CJK>
-0xF868	0x9DF6	# <CJK>
-0xF869	0x9DE1	# <CJK>
-0xF86A	0x9DEE	# <CJK>
-0xF86B	0x9DE6	# <CJK>
-0xF86C	0x9DF2	# <CJK>
-0xF86D	0x9DF0	# <CJK>
-0xF86E	0x9DE2	# <CJK>
-0xF86F	0x9DEC	# <CJK>
-0xF870	0x9DF4	# <CJK>
-0xF871	0x9DF3	# <CJK>
-0xF872	0x9DE8	# <CJK>
-0xF873	0x9DED	# <CJK>
-0xF874	0x9EC2	# <CJK>
-0xF875	0x9ED0	# <CJK>
-0xF876	0x9EF2	# <CJK>
-0xF877	0x9EF3	# <CJK>
-0xF878	0x9F06	# <CJK>
-0xF879	0x9F1C	# <CJK>
-0xF87A	0x9F38	# <CJK>
-0xF87B	0x9F37	# <CJK>
-0xF87C	0x9F36	# <CJK>
-0xF87D	0x9F43	# <CJK>
-0xF87E	0x9F4F	# <CJK>
-0xF8A1	0x9F71	# <CJK>
-0xF8A2	0x9F70	# <CJK>
-0xF8A3	0x9F6E	# <CJK>
-0xF8A4	0x9F6F	# <CJK>
-0xF8A5	0x56D3	# <CJK>
-0xF8A6	0x56CD	# <CJK>
-0xF8A7	0x5B4E	# <CJK>
-0xF8A8	0x5C6D	# <CJK>
-0xF8A9	0x652D	# <CJK>
-0xF8AA	0x66ED	# <CJK>
-0xF8AB	0x66EE	# <CJK>
-0xF8AC	0x6B13	# <CJK>
-0xF8AD	0x705F	# <CJK>
-0xF8AE	0x7061	# <CJK>
-0xF8AF	0x705D	# <CJK>
-0xF8B0	0x7060	# <CJK>
-0xF8B1	0x7223	# <CJK>
-0xF8B2	0x74DB	# <CJK>
-0xF8B3	0x74E5	# <CJK>
-0xF8B4	0x77D5	# <CJK>
-0xF8B5	0x7938	# <CJK>
-0xF8B6	0x79B7	# <CJK>
-0xF8B7	0x79B6	# <CJK>
-0xF8B8	0x7C6A	# <CJK>
-0xF8B9	0x7E97	# <CJK>
-0xF8BA	0x7F89	# <CJK>
-0xF8BB	0x826D	# <CJK>
-0xF8BC	0x8643	# <CJK>
-0xF8BD	0x8838	# <CJK>
-0xF8BE	0x8837	# <CJK>
-0xF8BF	0x8835	# <CJK>
-0xF8C0	0x884B	# <CJK>
-0xF8C1	0x8B94	# <CJK>
-0xF8C2	0x8B95	# <CJK>
-0xF8C3	0x8E9E	# <CJK>
-0xF8C4	0x8E9F	# <CJK>
-0xF8C5	0x8EA0	# <CJK>
-0xF8C6	0x8E9D	# <CJK>
-0xF8C7	0x91BE	# <CJK>
-0xF8C8	0x91BD	# <CJK>
-0xF8C9	0x91C2	# <CJK>
-0xF8CA	0x946B	# <CJK>
-0xF8CB	0x9468	# <CJK>
-0xF8CC	0x9469	# <CJK>
-0xF8CD	0x96E5	# <CJK>
-0xF8CE	0x9746	# <CJK>
-0xF8CF	0x9743	# <CJK>
-0xF8D0	0x9747	# <CJK>
-0xF8D1	0x97C7	# <CJK>
-0xF8D2	0x97E5	# <CJK>
-0xF8D3	0x9A5E	# <CJK>
-0xF8D4	0x9AD5	# <CJK>
-0xF8D5	0x9B59	# <CJK>
-0xF8D6	0x9C63	# <CJK>
-0xF8D7	0x9C67	# <CJK>
-0xF8D8	0x9C66	# <CJK>
-0xF8D9	0x9C62	# <CJK>
-0xF8DA	0x9C5E	# <CJK>
-0xF8DB	0x9C60	# <CJK>
-0xF8DC	0x9E02	# <CJK>
-0xF8DD	0x9DFE	# <CJK>
-0xF8DE	0x9E07	# <CJK>
-0xF8DF	0x9E03	# <CJK>
-0xF8E0	0x9E06	# <CJK>
-0xF8E1	0x9E05	# <CJK>
-0xF8E2	0x9E00	# <CJK>
-0xF8E3	0x9E01	# <CJK>
-0xF8E4	0x9E09	# <CJK>
-0xF8E5	0x9DFF	# <CJK>
-0xF8E6	0x9DFD	# <CJK>
-0xF8E7	0x9E04	# <CJK>
-0xF8E8	0x9EA0	# <CJK>
-0xF8E9	0x9F1E	# <CJK>
-0xF8EA	0x9F46	# <CJK>
-0xF8EB	0x9F74	# <CJK>
-0xF8EC	0x9F75	# <CJK>
-0xF8ED	0x9F76	# <CJK>
-0xF8EE	0x56D4	# <CJK>
-0xF8EF	0x652E	# <CJK>
-0xF8F0	0x65B8	# <CJK>
-0xF8F1	0x6B18	# <CJK>
-0xF8F2	0x6B19	# <CJK>
-0xF8F3	0x6B17	# <CJK>
-0xF8F4	0x6B1A	# <CJK>
-0xF8F5	0x7062	# <CJK>
-0xF8F6	0x7226	# <CJK>
-0xF8F7	0x72AA	# <CJK>
-0xF8F8	0x77D8	# <CJK>
-0xF8F9	0x77D9	# <CJK>
-0xF8FA	0x7939	# <CJK>
-0xF8FB	0x7C69	# <CJK>
-0xF8FC	0x7C6B	# <CJK>
-0xF8FD	0x7CF6	# <CJK>
-0xF8FE	0x7E9A	# <CJK>
-0xF940	0x7E98	# <CJK>
-0xF941	0x7E9B	# <CJK>
-0xF942	0x7E99	# <CJK>
-0xF943	0x81E0	# <CJK>
-0xF944	0x81E1	# <CJK>
-0xF945	0x8646	# <CJK>
-0xF946	0x8647	# <CJK>
-0xF947	0x8648	# <CJK>
-0xF948	0x8979	# <CJK>
-0xF949	0x897A	# <CJK>
-0xF94A	0x897C	# <CJK>
-0xF94B	0x897B	# <CJK>
-0xF94C	0x89FF	# <CJK>
-0xF94D	0x8B98	# <CJK>
-0xF94E	0x8B99	# <CJK>
-0xF94F	0x8EA5	# <CJK>
-0xF950	0x8EA4	# <CJK>
-0xF951	0x8EA3	# <CJK>
-0xF952	0x946E	# <CJK>
-0xF953	0x946D	# <CJK>
-0xF954	0x946F	# <CJK>
-0xF955	0x9471	# <CJK>
-0xF956	0x9473	# <CJK>
-0xF957	0x9749	# <CJK>
-0xF958	0x9872	# <CJK>
-0xF959	0x995F	# <CJK>
-0xF95A	0x9C68	# <CJK>
-0xF95B	0x9C6E	# <CJK>
-0xF95C	0x9C6D	# <CJK>
-0xF95D	0x9E0B	# <CJK>
-0xF95E	0x9E0D	# <CJK>
-0xF95F	0x9E10	# <CJK>
-0xF960	0x9E0F	# <CJK>
-0xF961	0x9E12	# <CJK>
-0xF962	0x9E11	# <CJK>
-0xF963	0x9EA1	# <CJK>
-0xF964	0x9EF5	# <CJK>
-0xF965	0x9F09	# <CJK>
-0xF966	0x9F47	# <CJK>
-0xF967	0x9F78	# <CJK>
-0xF968	0x9F7B	# <CJK>
-0xF969	0x9F7A	# <CJK>
-0xF96A	0x9F79	# <CJK>
-0xF96B	0x571E	# <CJK>
-0xF96C	0x7066	# <CJK>
-0xF96D	0x7C6F	# <CJK>
-0xF96E	0x883C	# <CJK>
-0xF96F	0x8DB2	# <CJK>
-0xF970	0x8EA6	# <CJK>
-0xF971	0x91C3	# <CJK>
-0xF972	0x9474	# <CJK>
-0xF973	0x9478	# <CJK>
-0xF974	0x9476	# <CJK>
-0xF975	0x9475	# <CJK>
-0xF976	0x9A60	# <CJK>
-0xF977	0x9C74	# <CJK>
-0xF978	0x9C73	# <CJK>
-0xF979	0x9C71	# <CJK>
-0xF97A	0x9C75	# <CJK>
-0xF97B	0x9E14	# <CJK>
-0xF97C	0x9E13	# <CJK>
-0xF97D	0x9EF6	# <CJK>
-0xF97E	0x9F0A	# <CJK>
-0xF9A1	0x9FA4	# <CJK>
-0xF9A2	0x7068	# <CJK>
-0xF9A3	0x7065	# <CJK>
-0xF9A4	0x7CF7	# <CJK>
-0xF9A5	0x866A	# <CJK>
-0xF9A6	0x883E	# <CJK>
-0xF9A7	0x883D	# <CJK>
-0xF9A8	0x883F	# <CJK>
-0xF9A9	0x8B9E	# <CJK>
-0xF9AA	0x8C9C	# <CJK>
-0xF9AB	0x8EA9	# <CJK>
-0xF9AC	0x8EC9	# <CJK>
-0xF9AD	0x974B	# <CJK>
-0xF9AE	0x9873	# <CJK>
-0xF9AF	0x9874	# <CJK>
-0xF9B0	0x98CC	# <CJK>
-0xF9B1	0x9961	# <CJK>
-0xF9B2	0x99AB	# <CJK>
-0xF9B3	0x9A64	# <CJK>
-0xF9B4	0x9A66	# <CJK>
-0xF9B5	0x9A67	# <CJK>
-0xF9B6	0x9B24	# <CJK>
-0xF9B7	0x9E15	# <CJK>
-0xF9B8	0x9E17	# <CJK>
-0xF9B9	0x9F48	# <CJK>
-0xF9BA	0x6207	# <CJK>
-0xF9BB	0x6B1E	# <CJK>
-0xF9BC	0x7227	# <CJK>
-0xF9BD	0x864C	# <CJK>
-0xF9BE	0x8EA8	# <CJK>
-0xF9BF	0x9482	# <CJK>
-0xF9C0	0x9480	# <CJK>
-0xF9C1	0x9481	# <CJK>
-0xF9C2	0x9A69	# <CJK>
-0xF9C3	0x9A68	# <CJK>
-0xF9C4	0x9B2E	# <CJK>
-0xF9C5	0x9E19	# <CJK>
-0xF9C6	0x7229	# <CJK>
-0xF9C7	0x864B	# <CJK>
-0xF9C8	0x8B9F	# <CJK>
-0xF9C9	0x9483	# <CJK>
-0xF9CA	0x9C79	# <CJK>
-0xF9CB	0x9EB7	# <CJK>
-0xF9CC	0x7675	# <CJK>
-0xF9CD	0x9A6B	# <CJK>
-0xF9CE	0x9C7A	# <CJK>
-0xF9CF	0x9E1D	# <CJK>
-0xF9D0	0x7069	# <CJK>
-0xF9D1	0x706A	# <CJK>
-0xF9D2	0x9EA4	# <CJK>
-0xF9D3	0x9F7E	# <CJK>
-0xF9D4	0x9F49	# <CJK>
-0xF9D5	0x9F98	# <CJK>
diff --git a/tools/encoding/cjk.inf b/tools/encoding/cjk.inf
deleted file mode 100644
index 9fbe527..0000000
--- a/tools/encoding/cjk.inf
+++ /dev/null
@@ -1,4467 +0,0 @@
---- BEGIN (CJK.INF VERSION 2.1 07/12/96) 185553 BYTES ---
-CJK.INF Version 2.1 (July 12, 1996)
-
-Copyright (C) 1995-1996 Ken Lunde. All Rights Reserved.
-
-CJK is a registered trademark and service mark of The Research
-  Libraries Group, Inc.
-
-Online Companion to "Understanding Japanese Information Processing"
-- ENGLISH: 1993, O'Reilly & Associates, Inc., ISBN 1-56592-043-0
-- JAPANESE: 1995, SOFTBANK Corporation, ISBN 4-89052-708-7
-
-
-	This online document provides information on CJK (that is,
-Chinese, Japanese, and Korean) character set standards and encoding
-systems. In short, it provides detailed information on how CJK text is
-handled electronically. I am happy to share this information with
-others, and I would appreciate any comments/feedback on its content.
-The current version (master copy) of this document is maintained at:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/cjk.inf
-
-This file may also be obtained by contacting me directly using one of
-the e-mail addresses listed in the CONTACT INFORMATION section.
-
-
-TABLE OF CONTENTS
-
-  VERSION HISTORY
-  RESTRICTIONS
-  CONTACT INFORMATION
-  WHAT HAPPENED TO JAPAN.INF?
-  DISCLAIMER
-  CONVENTIONS
-  INTRODUCTION
-  PART 1: WHAT'S UP WITH UJIP?
-  PART 2: CJK CHARACTER SET STANDARDS
-    2.1: JAPANESE
-      2.1.1: JIS X 0201-1976
-      2.1.2: JIS X 0208-1990
-      2.1.3: JIS X 0212-1990
-      2.1.4: JIS X 0221-1995
-      2.1.5: JIS X 0213-199X
-      2.1.6: OBSOLETE STANDARDS
-    2.2: CHINESE (PRC)
-      2.2.1: GB 1988-89
-      2.2.2: GB 2312-80
-      2.2.3: GB 6345.1-86
-      2.2.4: GB 7589-87
-      2.2.5: GB 7590-87
-      2.2.6: GB 8565.2-88
-      2.2.7: GB/T 12345-90
-      2.2.8: GB/T 13131-9X
-      2.2.9: GB/T 13132-9X
-      2.2.10: GB 13000.1-93
-      2.2.11: ISO-IR-165:1992
-      2.2.12: OBSOLETE STANDARDS
-    2.3: CHINESE (TAIWAN)
-      2.3.1: BIG FIVE
-      2.3.2: CNS 11643-1992
-      2.3.3: CNS 5205
-      2.3.4: OBSOLETE STANDARDS
-    2.4: KOREAN
-      2.4.1: KS C 5636-1993
-      2.4.2: KS C 5601-1992
-      2.4.3: KS C 5657-1991
-      2.4.4: GB 12052-89
-      2.4.5: KS C 5700-1995
-      2.4.6: OBSOLETE STANDARDS
-    2.5: CJK
-      2.5.1: ISO 10646-1:1993
-      2.5.2: CCCII
-      2.5.3: ANSI Z39.64-1989
-    2.6: OTHER
-      2.6.1: GB 8045-87
-      2.6.2: TCVN-5773:1993
-  PART 3: CJK ENCODING SYSTEMS
-    3.1: 7-BIT ISO 2022 ENCODING
-      3.1.1: CODE SPACE
-      3.1.2: ISO-REGISTERED ESCAPE SEQUENCES
-      3.1.3: ISO-2022-JP AND ISO-2022-JP-2
-      3.1.4: ISO-2022-KR
-      3.1.5: ISO-2022-CN AND ISO-2022-CN-EXT
-    3.2: EUC ENCODING
-      3.2.1: JAPANESE REPRESENTATION
-      3.2.2: CHINESE (PRC) REPRESENTATION
-      3.2.3: CHINESE (TAIWAN) REPRESENTATION
-      3.2.4: KOREAN REPRESENTATION
-    3.3: LOCALE-SPECIFIC ENCODINGS
-      3.3.1: SHIFT-JIS
-      3.3.2: HZ (HZ-GB-2312)
-      3.3.3: zW
-      3.3.4: BIG FIVE
-      3.3.5: JOHAB
-      3.3.6: N-BYTE HANGUL
-      3.3.7: UCS-2
-      3.3.8: UCS-4
-      3.3.9: UTF-7
-      3.3.10: UTF-8
-      3.3.11: UTF-16
-      3.3.12: ANSI Z39.64-1989
-      3.3.13: BASE64
-      3.3.14: IBM DBCS-HOST
-      3.3.15: IBM DBCS-PC
-      3.3.16: IBM DBCS-/TBCS-EUC
-      3.3.17: UNIFIED HANGUL CODE
-      3.3.18: TRON CODE
-      3.3.19: GBK
-    3.4: CJK CODE PAGES
-  PART 4: CJK CHARACTER SET COMPATIBILITY ISSUES
-    4.1: JAPANESE
-    4.2: CHINESE (PRC)
-    4.3: CHINESE (TAIWAN)
-    4.4: KOREAN
-    4.5: ISO 10646-1:1993
-    4.6: UNICODE
-    4.7: CODE CONVERSION TIPS
-  PART 5: CJK-CAPABLE OPERATING SYSTEMS
-    5.1: MS-DOS
-    5.2: WINDOWS
-    5.3: MACINTOSH
-    5.4: UNIX AND X WINDOWS
-    5.5: OTHERS
-  PART 6: CJK TEXT AND INTERNET SERVICES
-    6.1: ELECTRONIC MAIL
-    6.2: USENET NEWS
-    6.3: GOPHER
-    6.4: WORLD-WIDE WEB
-    6.5: FILE TRANSFER TIPS
-  PART 7: CJK TEXT HANDLING SOFTWARE
-    7.1: MULE
-    7.2: CNPRINT
-    7.3: MASS
-    7.4: ADOBE TYPE MANAGER (ATM)
-    7.5: MACINTOSH SOFTWARE
-    7.6: MACBLUE TELNET
-    7.7: CXTERM
-    7.8: UW-DBM
-    7.9: POSTSCRIPT
-    7.10: NJWIN
-  PART 8: CJK PROGRAMMING ISSUES
-    8.1: C AND C++
-    8.2: PERL
-    8.3: JAVA
-  A FINAL NOTE
-  ACKNOWLEDGMENTS
-  APPENDIX A: INFORMATION SOURCES
-    A.1: USENET NEWSGROUPS AND MAILING LISTS
-      A.1.1: USENET NEWSGROUPS
-      A.1.2: MAILING LISTS
-    A.2: INTERNET RESOURCES
-      A.2.1: USEFUL FTP SITES
-      A.2.2: USEFUL TELNET SITES
-      A.2.3: USEFUL GOPHER SITES
-      A.2.4: USEFUL WWW SITES
-      A.2.5: USEFUL MAIL SERVERS
-    A.3: OTHER RESOURCES
-      A.3.1: BOOKS
-      A.3.2: MAGAZINES
-      A.3.3: JOURNALS
-      A.3.4: RFCs
-      A.3.5: FAQs
-
-
-VERSION HISTORY
-
-	The following is a complete listing of the earlier versions of
-this document along with their release dates and sizes (in bytes):
-
-  Document   Version  Release Date  Size
-  ^^^^^^^^   ^^^^^^^  ^^^^^^^^^^^^  ^^^^
-  JAPAN.INF  1.0      Unknown       Unknown
-  JAPAN.INF  1.1      08/19/91      101,784
-  JAPAN.INF  1.2      03/20/92      166,929 (JIS) or 165,639 (Shift-JIS/EUC)
-  CJK.INF    1.0      06/09/95      103,985
-  CJK.INF    1.1      06/12/95      112,771
-  CJK.INF    1.2      06/14/95      125,275
-  CJK.INF    1.3      06/16/95      130,069
-  CJK.INF    1.4      06/19/95      142,543
-  CJK.INF    1.5      06/22/95      146,064
-  CJK.INF    1.6      06/29/95      150,882
-  CJK.INF    1.7      08/15/95      153,772
-  CJK.INF    1.8      09/11/95      157,295
-  CJK.INF    1.9      12/18/95      170,698
-  CJK.INF    2.0      03/12/96      175,973
-
-With the release of this version, all of the above are now considered
-obsolete. Also, note the three-year gap between the last installment
-of JAPAN.INF and the first installment of CJK.INF -- I was writing
-UJIP and my PhD dissertation during those three years. Ah, so much for
-excuses...
-
-
-RESTRICTIONS
-
-	This document is provided free-of-charge to *anyone*, but no
-person or company is permitted to modify, sell, or otherwise
-distribute it for profit or other purposes. This document may be
-bundled with commercial products only with the prior consent from the
-author, and provided that it is not modified in any way whatsoever.
-The point here is that I worked long and hard on this document so that
-lots of fine folks and companies can benefit from its contents -- not
-profit from it.
-
-
-CONTACT INFORMATION
-
-	I would enjoy hearing from readers of this document, even if
-it is just to say "hello" or whatever. I can be contacted as follows:
-
-  Ken Lunde
-  Adobe Systems Incorporated
-  1585 Charleston Road
-  P.O. Box 7900
-  Mountain View, CA 94039-7900 USA
-  415-962-3866 (office phone)
-  415-960-0886 (facsimile)
-  lunde@adobe.com (preferred)
-  lunde@ora.com or ujip@ora.com
-  WWW Home Page: http://jasper.ora.com/lunde/
-
-If you wonder what I do for my day job, read on.
-	I have been working for Adobe Systems for over four years now
-(before that I was a graduate student at UW-Madison), and my current
-position is Project Manager, CJK Type Development.
-
-
-WHAT HAPPENED TO JAPAN.INF?
-
-	Put bluntly, JAPAN.INF died. It first evolved into my first
-book entitled "Understanding Japanese Information Processing" (this
-book is now into its second printing, and the Japanese translation was
-just published). After my book came out, I did attempt to update
-JAPAN.INF, but the effort felt a bit futile. I decided that something
-fresh was necessary.
-	JAPAN.INF also evolved into this document, which breaks the
-Japanese barrier by providing similar information on Chinese and
-Korean character sets and encodings. It fills the Chinese and Korean
-gap, so to speak. My specialty (and hobby, believe it or not) is the
-field of CJK character sets and encoding systems, so I felt that
-shifting this document more towards those lines was appropriate use of
-my (copious) free time (I wish there were more than 24 hours in a
-day!). Besides, this document now becomes useful to a much broader
-audience.
-
-
-DISCLAIMER
-
-	Ah yes, the ever popular disclaimer! Here's mine. Although I
-list my address here at Adobe Systems Incorporated for contact
-purposes, Adobe Systems does not endorse this document which I have
-created, and have continued (and will continue) to update on a regular
-basis (uh, yeah, I promise this time!). This document is a personal
-endeavor to inform people of how CJK text can be handled on a variety
-of platforms.
-
-
-CONVENTIONS
-
-	The notation that is used for detailing Internet resource
-information, such as the Internet protocol type, site name, path, and
-file follows the URL (Uniform Resource Locator) notation, namely:
-
-  protocol://site-name/path/file
-
-An example URL is as follows:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/00README
-
-The protocol is FTP, the site-name is ftp.ora.com, the path is pub/
-examples/nutshell/ujip/, and the file is 00README. Also note that this
-same notation is used for invoking FTP on WWW (World Wide Web)
-browsing software, such as Mosaic, Netscape, or Lynx.
-	Note that most references to HTTP documents use the four-
-letter file extension ".html". However, some HTTP documents are on
-file systems that support only three-letter file extensions (can you
-say "MS-DOS"?), so you may encounter just ".htm". This is just to let
-you know that what you see is not a typo.
-	References to my book "Understanding Japanese Information
-Processing" are (affectionately) abbreviated as UJIP. These references
-also apply to the Japanese translation (UJIP-J).
-	Hexadecimal values are prefixed with 0x, and every two
-hexadecimal digits represent a one-byte value. Other values can be
-assumed to be in decimal notation.
-	Chinese characters are referred to as kanji (Japanese), hanzi
-(Chinese), or hanja (Korean), depending on context.
-	References to ISO 10646-1:1993 also refer to Unicode
-(usually). I have done this so that I do not have to repeat "Unicode"
-in the same context as ISO 10646-1:1993. There are times, however,
-when I need to distinguish ISO 10646-1:1993 from Unicode.
-
-
-INTRODUCTION
-
-	Electronic mail (e-mail), just one of the many Internet
-resources, has become a very efficient means of communicating both
-locally and world-wide. While it is very simple to send text which
-uses only the 94 printable ASCII characters, character sets that
-contain more than these ASCII characters pose special problems.
-	This document is primarily concerned with CJK character set
-and encoding issues. Much of this sort of information is not easily
-obtained. This represents one person's attempt at making such
-information more widely available.
-
-
-PART 1: WHAT'S UP WITH UJIP?
-
-	UJIP (First Edition) was published in September 1993 by
-O'Reilly & Associates, Incorporated. The second printing (*not* the
-Second Edition) was subsequently published in March 1994. The page
-count for both printings is unchanged at 470.
-	The following files contain the latest information about
-changes (additions and corrections) made to UJIP and UJIP-J for
-various printings, both for those that have taken place (such as for
-the second printing of the English edition) and for those that are
-planned (the first digit is the edition, and the second is the
-printing):
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/errata/ujip-errata-1-2.txt
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/errata/ujip-errata-1-3.txt
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/errata/ujip-j-errata-1-2.txt
-
-I *highly* recommend that all readers of UJIP obtain these errata
-files. Those without FTP access can request copies directly from me.
-	The Japanese translation of UJIP (UJIP-J), co-published by
-O'Reilly & Associates, Incorporated and SOFTBANK Corporation, was just
-released. The translation was done by my good friend Jack Halpern,
-along with one of his colleagues, Takeo Suzuki. The Japanese edition
-incorporates corrections and updates not yet found in the English
-edition. The page count is 535.
-	Late-breaking news! I am currently working on UJIP Second
-Edition (to be retitled as "Understanding CJK Information Processing"
-and abbreviated UCJKIP). If all goes well, it should be available by
-January 1997, and will be well over 700 pages. If there was something
-you wanted to see in UJIP, now's your chance to send me a request...
-
-
-PART 2: CJK CHARACTER SET STANDARDS
-
-	These sections describe the character sets used in Japan,
-China (PRC and Taiwan), and Korea. Exact numbers of characters are
-provided for each character set standard (when known), as well as
-tidbits of information not otherwise available. This provides the
-basic foundations for understanding how CJK scripts are handled on
-computer systems.
-	The two basic types of characters enumerated by CJK character
-set standards are Chinese characters (kanji, hanzi, or hanja), which
-number in the thousands (and, in some cases, tens of thousands), and
-characters other than Chinese characters (symbols, numerals, kana
-hangul, alphabets, and so on), which usually number in the hundreds
-(there are thousands of pre-combined hangul, though).
-	If you happen to be running X Windows, it is very easy to
-display these CJK character sets (if a bitmapped font for the
-character set exists, that is). Here is what I usually do:
-
-o Obtain a BDF (Bitmap Distribution Format) font for the target
-  character set. Try the following URLs for starters:
-
-  ftp://cair-archive.kaist.ac.kr/pub/hangul/fonts/
-  ftp://etlport.etl.go.jp/pub/mule/fonts/
-  ftp://ftp.ifcss.org/pub/software/fonts/{big5,cns,gb,misc,unicode}/bdf/
-  ftp://ftp.kuis.kyoto-u.ac.jp/misc/fonts/jisksp-fonts/
-  ftp://ftp.net.tsinghua.edu.cn/pub/Chinese/fonts/
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/unix/
-  ftp://ftp.technet.sg:/pub/chinese/fonts/
-  http://ccic.ifcss.org/www/pub/software/fonts/
-
-  BDF files usually have the string "bdf" somewhere in their file
-  name, usually at the end. If the file is compressed (noticing that
-  it ends in .gz or .Z is a good indication), decompress it. BDF files
-  are text files.
-
-o Convert the BDF file to SNF (Server Natural Format) or PCF (Portable
-  Compiled Format) using the programs "bdftosnf" or "bdftopcf,"
-  respectively. Example command lines are as follows:
-
-  % bdftopcf jiskan16-1990.bdf > k16-90.pcf
-  % bdftosnf jiskan16-1990.bdf > k16-90.snf
-
-  SNF files (and the "bdftosnf" program) are used on X11R4 and
-  earlier, and PCF files (and the "bdftopcf" program) are used on
-  X11R5 and later.
-
-o Copy the SNF or PCF file to a directory in the font search path (or
-  make a new path). Supposing I made a new directory called "fonts" in
-  my home directory, I then run "mkfontdir" on the directory
-  containing the SNF or PCF files as follows:
-
-  % mkfontdir ~/fonts
-
-  This creates a fonts.dir file in ~/fonts. I can now add this
-  directory to my font search path with the following command:
-
-  % xset +fp ~/fonts
-
-o The command "xfd" (X Font Displayer) with the "-fn" switch followed
-  by a font name then invokes a window that displays all the
-  characters of the font. In the case of two-byte (CJK) fonts, one row
-  is displayed at a time. The following is an example command line:
-
-  % xfd -fn -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1990-0
-
-  You can create a "fonts.alias" file in the same directory as the
-  "fonts.dir" file in order to shorten the name when accessing the
-  font. The alias "k16-90" could be used instead if the content of the
-  fonts.alias file is as follows:
-
-  k16-90  -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1990-0
-
-  Don't forget to execute the following command in order to make the
-  X Font Server aware of the new alias:
-
-  % xset fp rehash
-
-  Now you can use a simpler command line for "xfd" as follows:
-
-  % xfd -fn k16-90
-
-	The "X Window System User's Guide" (Volume 3 of the X Window
-System series by O'Reilly & Associates, Inc.) provides detailed
-information on managing fonts under X Windows (pp 123-160). The
-article entitled "The X Administrator: Font Formats and Utilities" (pp
-14-34 in "The X Resource," Issue 2), describes the BDF, SNF, and PCF
-formats in great detail.
-	There is another bitmap format called HBF (Hanzi Bitmap
-Format), which is similar to BDF, but optimized for fixed-width
-(monospaced) fonts. It is described in the article entitled "The HBF
-Font Format: Optimizing Fixed-pitch Font Support" (pp 113-123 in "The
-X Resource," Issue 10), and also at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/fonts/hbf-discussion/
-
-HBF fonts can be found at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/fonts/{big5,cns,gb,misc,unicode}/hbf/
-
-	Lastly, you may wish to check out my newly-developed CJK
-Character Set Server, which generates various CJK character sets with
-proper encoding applied. It is written in Perl, and accessed through
-an HTML form. This server can be considered an upgrade to my JChar
-tool (written in C). The URL is:
-
-  http://jasper.ora.com/lunde/cjk-char.html
-
-
-2.1: JAPANESE
-
-	All (national) character set standards that originate in Japan
-have names that begin with the three letters JIS. JIS is short for
-"Japanese Industrial Standard." But it is JSA (Japanese Standards
-Association) who publishes the corresponding manuals. Chapter 3 and
-Appendixes H and J of UJIP provide more detailed information on
-Japanese character set standards.
-
-
-2.1.1: JIS X 0201-1976
-
-	JIS X 0201-1976 (formerly JIS C 6220-1969; reaffirmed in 1989;
-and its revision [with no character set changes] is currently under
-public review) enumerates two sets of characters: JIS-Roman and
-half-width katakana.
-	JIS-Roman is the Japanese equivalent of the ASCII character
-set, namely 128 characters consisting of the following:
-
-o 10 numerals
-o 52 uppercase and lowercase characters of the Latin alphabet
-o 32 symbols (punctuation and so on)
-o 34 non-printing characters (white space and control characters)
-
-The term "white space" refers to characters that occupy space, but
-have no appearance, such as tabs, spaces, and termination characters
-(line feed, carriage return, and form feed).
-	So, how are JIS-Roman and ASCII different? The following
-three codes are (usually) different:
-
-  Code   ASCII        JIS-Roman
-  ^^^^   ^^^^^        ^^^^^^^^^
-  0x5C   backslash    yen symbol
-  0x7C   broken bar   bar
-  0x7E   tilde        overbar
-
-	Half-width katakana consists of 63 characters that provide a
-minimal set of characters necessary for expressing Japanese. The
-shapes are compressed, and visually occupy a space half that of
-*normal* Japanese characters.
-
-
-2.1.2: JIS X 0208-1990
-
-	This basic Japanese character set standard enumerates 6,879
-characters, 6,355 of which are kanji separated into two levels. Kanji
-in the first level are arranged by (most frequent) reading, and those
-in the second level are arranged by radical then total number of
-(remaining) strokes.
-
-o Row 1: 94 symbols
-o Row 2: 53 symbols
-o Row 3: 10 numerals and 52 uppercase and lowercase Latin alphabet
-o Row 4: 83 hiragana
-o Row 5: 86 katakana
-o Row 6: 48 uppercase and lowercase Greek alphabet
-o Row 7: 66 uppercase and lowercase Cyrillic (Russian) alphabet
-o Row 8: 32 line-drawing elements
-o Rows 16 through 47: 2,965 kanji (JIS Level 1 Kanji; last is 47-51)
-o Rows 48 through 84: 3,390 kanji (JIS Level 2 Kanji; last is 84-06)
-
-Appendix B of UJIP provides a complete illustration of the JIS X
-0208-1990 character set standard by KUTEN (row-cell) code. Appendix G
-(pp 294-317) of "Developing International Software for Windows 95 and
-Windows NT" by Nadine Kano illustrates the JIS X 0208-1990 character
-set standard plus the Microsoft extensions by Shift-JIS code
-(Microsoft calls this Code Page 932).
-	Earlier versions of this standard were dated 1978 (JIS C
-6226-1978) and 1983 (JIS X 0208-1983, formerly JIS C 6226-1983).
-	JIS X 0208 went through a revision (from November 1995 until
-February 1996), and is slated for publication sometime in 1996 (to
-become JIS X 0208-1996). More information on this revision is
-available at the following URL:
-
-  ftp://ftp.tiu.ac.jp/jis/jisx0208/
-
-
-2.1.3: JIS X 0212-1990
-
-	This supplemental Japanese character set standard enumerates
-6,067 characters, 5,801 of which are kanji ordered by radical then
-total number of (remaining) strokes. All 5,801 kanji are unique when
-compared to those in JIS X 0208-1990 (see Section 2.1.2). The
-remaining 266 characters are categorized as non-kanji.
-
-o Row 2: 21 diacritics and symbols
-o Row 6: 21 Greek characters with diacritics
-o Row 7: 26 Eastern European characters
-o Rows 9 through 11: 198 alphabetic characters
-o Rows 16 through 77: 5,801 kanji (last is 77-67)
-
-Appendix C of UJIP provides a complete illustration of the JIS X
-0212-1990 character set standard by KUTEN (row-cell) code.
-	The only commercial operating system that provides JIS X
-0212-1990 support is BTRON by Personal Media Corporation:
-
-  http://www.personal-media.co.jp/
-
-Section 3.3.18 provides information about TRON Code (used by BTRON),
-and details how it encodes the JIS X 0212-1990 character set.
-
-
-2.1.4: JIS X 0221-1995
-
-	This document is, for all practical purposes, the Japanese
-translation of ISO 10646-1:1993 (see Section 2.5.1). Like ISO
-10646-1:1993, it is based on Unicode Version 1.1.
-	It is noteworthy that JIS X 0221-1995 enumerates subsets that
-are applicable for Japanese use (a brief description of their contents
-in parentheses):
-
-o BASIC JAPANESE (JIS X 0208-1990 and JIS X 0201-1976 -- characters
-  that can be created by means of combining are not included -- 6,884
-  characters)
-o JAPANESE NON IDEOGRAPHICS SUPPLEMENT (1,913 characters: all non-
-  kanji of JIS X 0212-1990 plus hundreds of non-JIS characters)
-o JAPANESE IDEOGRAPHICS SUPPLEMENT 1 (918 frequently-used kanji from
-  JIS X 0212-1990, including 28 that are identical to kanji forms in
-  JIS C 6226-1978)
-o JAPANESE IDEOGRAPHICS SUPPLEMENT 2 (the remainder of JIS X 0212-
-  1990, namely 4,883 kanji)
-o JAPANESE IDEOGRAPHICS SUPPLEMENT 3 (the remaining kanji of ISO
-  10646-1:1993, namely 8,746 characters)
-o FULLWIDTH ALPHANUMERICS (94 characters; for compatibility)
-o HALFWIDTH KATAKANA (63 characters; for compatibility)
-
-	Pages 893 through 993 provide Kangxi Zidian (a classic
-300-year-old Chinese character dictionary containing approximately
-50,000 characters) and Dai Kanwa Jiten (also known as Morohashi)
-indexes for the entire Chinese character block, namely from 0x4E00
-through 0x9FA5.
-	At 25,750 Yen, it is actually cheaper than ISO 10646-1:1993!
-
-
-2.1.5: JIS X 0213-199X
-
-	I recently became aware that JSA plans to publish an extension
-to JIS X 0208, containing approximately 2,000 characters (kanji and
-non-kanji). A public review of this new standard is planned for Summer
-1996. I would expect that its information will eventually be available
-at the following URL:
-
-    ftp://ftp.tiu.ac.jp/jis/
-
-
-2.1.6: OBSOLETE STANDARDS
-
-	JIS C 6226-1978 and JIS X 0208-1983 (formerly JIS C 6226-1983)
-have been superseded by JIS X 0208-1990. Section 4.1 provides details
-on the changes made between these earlier versions of JIS X 0208.
-	JIS X 0221-1995 does not mean the end of JIS X 0201-1976, JIS
-X 0208-1990, and JIS X 0212-1990. Instead, it will co-exist with those
-standards.
-
-
-2.2: CHINESE (PRC)
-
-	All character set standards that originate in PRC have
-designations that begin with "GB." "GB" is short for "Guo Biao" (which
-is, in turn, short for "Guojia Biaojun") and means "National
-Standard." A select few also have "/T" attached. The "T" presumably is
-short for "Traditional." Section 2.2.11 describes ISO-IR-165:1992,
-which is a variant of GB 2312-80. It is included here because of this
-relationship.
-	Most people correlate GB character set standards with
-simplified Chinese, but as you will see below, that is not always the
-case.
-	There are three basic character sets, each one having a
-simplified and traditional version.
-
-  Character Set  Set Number  Character Forms
-  ^^^^^^^^^^^^^  ^^^^^^^^^^  ^^^^^^^^^^^^^^^
-  GB 2312-80     0           Simplified
-  GB/T 12345-90  1           Traditional of GB 2312-80
-  GB 7589-87     2           Simplified
-  GB/T 13131-9X  3           Traditional of GB 7589-87
-  GB 7590-87     4           Simplified
-  GB/T 13132-9X  5           Traditional of GB 7590-87
-
-
-2.2.1: GB 1988-89
-
-	This character set, formerly GB 1988-80 and sometimes referred
-to as GB-Roman, is the Chinese analog to ASCII and ISO 646. The main
-difference is that the currency symbol (0x24), which is represented as
-a dollar sign ($) in ASCII, is represented as a Chinese Yuan
-(currency) symbol instead. GB 1988-89 is sometimes referred to as
-GB-Roman.
-
-
-2.2.2: GB 2312-80
-
-	This basic (simplified) Chinese character set standard
-enumerates 7,445 characters, 6,763 of which are hanzi separated into
-two levels. Hanzi in the first level are arranged by reading, and
-those in the second level are arranges by radical then total number of
-(remaining) strokes. GB 2312-80 is also known as the "Primary Set,"
-GB0 (zero), or just GB.
-
-o Row 1: 94 symbols
-o Row 2: 72 numerals
-o Row 3: 94 full-width GB 1988-89 characters (see Section 2.2.1)
-o Row 4: 83 hiragana
-o Row 5: 86 katakana
-o Row 6: 48 uppercase and lowercase Greek alphabet
-o Row 7: 66 uppercase and lowercase Cyrillic (Russian) alphabet
-o Row 8: 26 Pinyin and 37 Bopomofo characters
-o Row 9: 76 line-drawing elements (09-04 through 09-79)
-o Rows 16 through 55: 3,755 hanzi (Level 1 Hanzi; last is 55-89)
-o Rows 56 through 87: 3,008 hanzi (Level 2 Hanzi; last is 87-94)
-
-Compare some of the structure with JIS X 0208-1990, and you will find
-many similarities, such as:
-
-o Hiragana, katakana, Greek, and Cyrillic characters are in Rows 4, 5,
-  6, and 7, respectively
-o Chinese characters begin at Row 16
-o Chinese characters are separated into two levels
-o Level 1 arranged by reading
-o Level 2 arranged by radical then total number of strokes
-
-The Japanese standard, JIS C 6226-1978, came out in 1978, which means
-that it pre-dates GB 2312-80. The above similarities could not be by
-coincidence, but rather by design.
-	Appendix G (pp 318-344) of "Developing International Software
-for Windows 95 and Windows NT" by Nadine Kano illustrates the GB 2312-
-80 character set standard by EUC code (Microsoft calls this Code Page
-936). Code Page 936 incorporates the correction of the hanzi at 79-81,
-and the correction of the order of 07-22 and 07-23 (see Section 2.2.3
-for more details).
-
-
-2.2.3: GB 6345.1-86
-
-	This document specifies corrections and additions to GB
-2312-80 (see Section 2.2.2). The following is a detailed enumeration
-of the changes:
-
-o The form of "g" in Row 3 (position 71) was altered
-o Row 8 has six additional Pinyin characters (08-27 through 08-32)
-o Row 10 contains half-width versions of Row 3 (94 characters)
-o Row 11 contains half-width versions of the Pinyin characters from
-  Row 8 (32 characters; 11-01 through 11-32)
-o The hanzi at 79-81 was corrected to have a simplified left-side
-  radical (this was an error in GB 2312-80)
-
-Note that these changes affect the total number of characters in GB
-2312-80 -- an increase of 132 characters. This now makes 7,577 as
-the total number of characters in GB 2312-80 (7,445 plus 132).
-	There was, however, an undocumented correction made in GB
-6345.1-86. The order of characters 07-22 and 07-23 (uppercase
-Cyrillic) were reversed. This error is apparently in the first and
-perhaps second printing of the GB 2312-80 manual, because the copy I
-have is from the third printing, and this has been corrected. Page 145
-(Figure 113) of John Clews' "Language Automation Worldwide: The
-Development of Character Set Standards" illustrates this error.
-Developers should take special note of this -- I have seen GB 2312-80
-based font products that propagate this ordering error.
-
-
-2.2.4: GB 7589-87
-
-	This character set enumerates 7,237 hanzi in Rows 16 through
-92 (last is 92-93), and they are ordered by radical then total number
-of (remaining) strokes. GB 7589-87 is also known as the "Second
-Supplementary Set" or GB2.
-
-
-2.2.5: GB 7590-87
-
-	This character set enumerates 7,039 hanzi in Rows 16 through
-90 (last is 90-83), and they are ordered by radical then total number
-of (remaining) strokes. GB 7590-87 is also known as the "Fourth
-Supplementary Set" or GB4.
-
-
-2.2.6: GB 8565.2-88
-
-	This standard makes additions to GB 2312-80 (these additions
-are separate from those made in GB 6345.1-86 described in Section
-2.2.3). GB 8565.2-88 is also known as GB8. In this case there are 705
-additions, indicated as follows:
-
-o Row 13 contains 50 hanzi from GB 7589-87 (last is 13-50)
-o Row 14 contains 92 hanzi from GB 7590-87 (last is 14-92)
-o Row 15 contains 69 non-hanzi indicating dates and times, plus 24
-  miscellaneous hanzi (for personal/place names and radicals; last is
-  15-93).
-o Rows 90 through 94 contain 470 hanzi from GB 7589-87 (94 each)
-
-GB 8565.2-88 therefore provides a total of 8,150 characters (7,445
-plus 705).
-
-
-2.2.7: GB/T 12345-90
-
-	This character set is nearly identical to GB 2312-80 (see
-Section 2.2.2) in terms of the number and arrangement of characters,
-but simplified hanzi are replaced by their traditional versions. GB/T
-12345-90 is also known as the "Supplementary Set" or GB1.
-	The following are some interesting facts about this character
-set (some instances of simplified/traditional pairs that appear below
-are actually character form differences):
-
-o 29 vertical-use characters (punctuation and parentheses) included in
-  Row 6 (06-57 through 06-85).
-
-o 2,118 traditional hanzi replace simplified hanzi in Rows 16 through
-  87. The "G1-Unique" appendix of the unofficial version (supplied to
-  the CJK-JRG for Han Unification purposes) is missing the following
-  four (specifies only 2,114):
-
-  0x5B3B    0x6D2F
-  0x5E7C    0x6F71
-
-  But, ISO 10646-1:1993 ended up getting these hanzi included anyway,
-  with correct mappings.
-
-o Four simplified/traditional hanzi pairs (eight affected code points)
-  in rows 16 through 87 are swapped:
-
-  0x3A73 <-> 0x6161
-  0x5577 <-> 0x6167
-  0x5360 <-> 0x6245 (see the next bullet)
-  0x4334 <-> 0x7761
-
-o One hanzi (0x6245), after being swapped, had its left-side radical
-  unsimplified (this character, now at 0x5360, is considered part of
-  the 2,118 traditional hanzi from the second bullet):
-
-  0x6245 -> 0x5360
-
-o 103 hanzi included in Rows 88 (94 characters) and 89 (9 characters;
-  89-01 through 89-09). These are all related to characters between
-  Rows 16 and 87.
-
-  - 41 simplified hanzi from Rows 16 through 87 moved to Rows 88 and
-    89 (traditional hanzi are now at the original code points):
-
-    0x3327 -> 0x7827  0x3E5D -> 0x7846  0x4B49 -> 0x7869
-    0x3365 -> 0x7828  0x3F64 -> 0x7849  0x4C28 -> 0x786B
-    0x3373 -> 0x7829  0x402F -> 0x784B  0x4D3F -> 0x786F
-    0x3533 -> 0x782C  0x4030 -> 0x784C  0x4D72 -> 0x7871
-    0x356D -> 0x782D  0x406F -> 0x784E  0x5236 -> 0x7878
-    0x3637 -> 0x782F  0x4131 -> 0x7850  0x5374 -> 0x7879
-    0x3736 -> 0x7832  0x463B -> 0x785C  0x5438 -> 0x787C
-    0x3761 -> 0x7833  0x463E -> 0x785D  0x5446 -> 0x787D
-    0x3849 -> 0x7835  0x464B -> 0x785E  0x5622 -> 0x7921
-    0x3963 -> 0x7838  0x464D -> 0x785F  0x563B -> 0x7923
-    0x3B2E -> 0x783B  0x4653 -> 0x7860  0x5656 -> 0x7926
-    0x3C38 -> 0x7840  0x4837 -> 0x7866  0x567E -> 0x7928
-    0x3C5B -> 0x7842  0x4961 -> 0x7867  0x573C -> 0x7929
-    0x3C76 -> 0x7843  0x4A75 -> 0x7868
-
-  - 62 hanzi added to Rows 88 and 89 (the gaps from the above are
-    filled in). These were mostly to account for multiple traditional
-    hanzi collapsing into a single simplified form.
-
-  - The following code point mappings illustrate how all of these 103
-    hanzi are related to hanzi between Rows 16 and 87 (note how many
-    of these 103 hanzi map to a single code point):
-
-    0x7821 -> 0x305A  0x7844 -> 0x3D2A  0x7867 -> 0x4961
-    0x7822 -> 0x3065  0x7845 -> 0x3E21  0x7868 -> 0x4A75
-    0x7823 -> 0x316D  0x7846 -> 0x3E5D  0x7869 -> 0x4B49
-    0x7824 -> 0x3170  0x7847 -> 0x3E6D  0x786A -> 0x4B55
-    0x7825 -> 0x3237  0x7848 -> 0x3F4B  0x786B -> 0x4C28
-    0x7826 -> 0x3245  0x7849 -> 0x3F64  0x786C -> 0x4C28
-    0x7827 -> 0x3327  0x784A -> 0x4027  0x786D -> 0x4C28
-    0x7828 -> 0x3365  0x784B -> 0x402F  0x786E -> 0x4C33
-    0x7829 -> 0x3373  0x784C -> 0x4030  0x786F -> 0x4D3F
-    0x782A -> 0x3376  0x784D -> 0x405B  0x7870 -> 0x4D45
-    0x782B -> 0x3531  0x784E -> 0x406F  0x7871 -> 0x4D72
-    0x782C -> 0x3533  0x784F -> 0x407A  0x7872 -> 0x4F35
-    0x782D -> 0x356D  0x7850 -> 0x4131  0x7873 -> 0x4F35
-    0x782E -> 0x362C  0x7851 -> 0x414B  0x7874 -> 0x4F4C
-    0x782F -> 0x3637  0x7852 -> 0x4231  0x7875 -> 0x4F72
-    0x7830 -> 0x3671  0x7853 -> 0x425E  0x7876 -> 0x506B
-    0x7831 -> 0x3722  0x7854 -> 0x4339  0x7877 -> 0x5229
-    0x7832 -> 0x3736  0x7855 -> 0x4349  0x7878 -> 0x5236
-    0x7833 -> 0x3761  0x7856 -> 0x4349  0x7879 -> 0x5374
-    0x7834 -> 0x3834  0x7857 -> 0x4349  0x787A -> 0x5379
-    0x7835 -> 0x3849  0x7858 -> 0x4356  0x787B -> 0x5375
-    0x7836 -> 0x3948  0x7859 -> 0x4366  0x787C -> 0x5438
-    0x7837 -> 0x394E  0x785A -> 0x436F  0x787D -> 0x5446
-    0x7838 -> 0x3963  0x785B -> 0x3159  0x787E -> 0x5460
-    0x7839 -> 0x6358  0x785C -> 0x463B  0x7921 -> 0x5622
-    0x783A -> 0x3A7A  0x785D -> 0x463E  0x7922 -> 0x563B
-    0x783B -> 0x3B2E  0x785E -> 0x464B  0x7923 -> 0x563B
-    0x783C -> 0x3B58  0x785F -> 0x464D  0x7924 -> 0x5642
-    0x783D -> 0x3B63  0x7860 -> 0x4653  0x7925 -> 0x5646
-    0x783E -> 0x3B71  0x7861 -> 0x4727  0x7926 -> 0x5656
-    0x783F -> 0x3C22  0x7862 -> 0x4729  0x7927 -> 0x566C
-    0x7840 -> 0x3C38  0x7863 -> 0x4F4B  0x7928 -> 0x567E
-    0x7841 -> 0x3C52  0x7864 -> 0x476F  0x7929 -> 0x573C
-    0x7842 -> 0x3C5B  0x7865 -> 0x477A
-    0x7843 -> 0x3C76  0x7866 -> 0x4837
-
-So, if we total everything up, we see that GB/T 12345-90 has 2,180
-hanzi (2,118 are replacements for GB 2312-80 code points, and 62 are
-additional) and 29 non-hanzi not found in GB 2312-80.
-	Note that the printing of the GB/T 12345-90 has some
-character-form errors. The errors I am aware of are as follows:
-
-  Code Point  Description of Error
-  ^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^
-  0x4125      The upper-left element should be "tree" instead of
-              "warrior"
-  0x596C      The "bird" radical should not include the "fire" element
-
-
-2.2.8: GB/T 13131-9X
-
-	This character set is identical to GB 7589-87 (see Section
-2.2.4) in terms of number of characters, but simplified hanzi are
-replaced by their traditional versions. The exact number of such
-substitutions is currently unknown to this author. GB/T 13131-9X is
-also known as the "Third Supplementary Set" or GB3.
-
-
-2.2.9: GB/T 13132-9X
-
-	This character set is identical to GB 7590-87 (see Section
-2.2.5) in terms of number of characters, but simplified hanzi are
-replaced by their traditional versions. The exact number of such
-substitutions is currently unknown to this author. GB/T 13132-9X is
-also known as the "Fifth Supplementary Set" or GB5.
-
-
-2.2.10: GB 13000.1-93
-
-	This document is, for all practical purposes, the Chinese
-translation of ISO 10646-1:1993 (see Section 2.5.1).
-
-
-2.2.11: ISO-IR-165:1992
-
-	This standard, also known as the CCITT Chinese Set, is a
-variant of GB 2312-80 with the following characteristics:
-
-o GB 6345.1-86 modifications (including the undocumented one) and
-  additions, namely 132 characters (see Section 2.2.3)
-o GB 8565.2-88 additions, namely 705 characters (see Section 2.2.6)
-o Row 6 contains 22 background (shading) characters (06-60 through
-  06-81)
-o Row 12 contains 94 hanzi
-o Row 13 contains 44 additional hanzi (13-51 through 13-94; fills the
-  row)
-o Row 15 contains 1 additional hanzi (15-94)
-
-ISO-IR-165:1992 can therefore be considered a superset of GB 2312-80,
-GB 6345.1-86, and GB 8565.2-88. This means 8,443 total characters
-compared to the 7,445 in GB 2312-80, 7,577 in GB 6345.1-86, and the
-8,150 in GB 8565.2-88.
-
-
-2.2.12: OBSOLETE STANDARDS
-
-	Most GB standards seem to be revised through other documents,
-so it is hard to point to a standard and claim that it is obsolete.
-The only revision I am aware of is the GB 1988-89 (the original was
-named GB 1988-80).
-
-
-2.3: CHINESE (TAIWAN)
-
-	The sections below describe two major Taiwanese character
-sets, namely Big Five and CNS 11643-1992. As you will learn they are
-somewhat compatible. CCCII, also developed in Taiwan, is described in
-Section 2.5.2.
-
-
-2.3.1: BIG FIVE
-
-	The Big Five character set is composed of 94 rows of 157
-characters each (the 157 characters of each row are encoded in an
-initial group of 63 codes followed by the remaining 94 codes). The
-following is a break-down of its contents:
-
-o Row 1: 157 symbols
-o Row 2: 157 symbols
-o Row 3: 94 symbols
-o Rows 4 through 38: 5,401 hanzi (Level 1 Hanzi; last is 38-63)
-o Rows 41 through 89: 7,652 hanzi (Level 2 Hanzi; last is 89-116)
-
-This forms what I consider to be the basic Big Five set. Actually, two
-of the hanzi in Level 2 are duplicates, so there are actually only
-7,650 unique hanzi in Level 2.
-	There are two major extensions to Big Five. The first really
-has no name, and can be considered part of the basic Big Five set as
-specified above. It adds the following characters:
-
-o Rows 38-39: 4 Japanese iteration marks, 83 hiragana, 86 katakana, 66
-  uppercase and lowercase Cyrillic (Russian) alphabet, 10 circled
-  digits, and 10 parenthesized digits
-
-	The other extension was developed by a company called ETen
-Information System in Taiwan, and is actually considered to be the
-most widely used version of Big Five. It provides the following
-extensions to Big Five (different from the above extension):
-
-o Rows 38-40: 10 circled digits, 10 parenthesized digits, 10 lowercase
-  Roman numerals, 25 classical radicals, 15 Japanese-specific symbols,
-  83 hiragana, 86 katakana, 66 uppercase and lowercase Cyrillic
-  (Russian) alphabet, 3 arrows, 10 radical-like hanzi elements, 40
-  fraction-like digits, and 7 symbols
-o Row 89: 7 hanzi, 33 double-lined line-drawing elements, and a black
-  box
-
-	It is *very* important to note that while these two extensions
-have many common portions (in particular, hiragana, katakana, the
-Cyrillic alphabet, and so on), they do not share the same code points
-for such characters.
-	Appendix G (pp 407-450) of "Developing International Software
-for Windows 95 and Windows NT" by Nadine Kano illustrates the Big Five
-character set standard by Big Five code (Microsoft calls this Code
-Page 950). Code Page 950 incorporates some of the ETen extensions,
-namely those in Row 89.
-
-
-2.3.2: CNS 11643-1992
-
-	CNS 11643-1992 (also known as CNS 11643 X 5012), by
-definition, consists of 16 planes of characters, seven of which have
-character assignments. Each plane is a 94-row-by-94-cell matrix
-capable of holding a total of 8,836 characters. CNS stands for
-"Chinese National Standard."
-	CNS 11643-1992 specifies characters only in the first seven
-planes. A break-down of characters, by plane, is as follows:
-
-o Plane 1:
-  - 438 symbols in Rows 1 through 6
-  - 213 classical radicals in Rows 7 through 9
-  - 33 graphic representations of control characters in Row 34
-  - 5,401 hanzi in Rows 36 through 93 (last is 93-43)
-o Plane 2: 7,650 hanzi in Rows 1 through 82 (last is 82-36)
-o Plane 3: 6,148 hanzi in Rows 1 through 66 (last is 66-38)
-o Plane 4: 7,298 hanzi in Rows 1 through 78 (last is 78-60)
-o Plane 5: 8,603 hanzi in Rows 1 through 92 (last is 92-49)
-o Plane 6: 6,388 hanzi in Rows 1 through 68 (last is 68-90)
-o Plane 7: 6,539 hanzi in Rows 1 through 70 (last is 70-53)
-
-The total number of characters in CNS 11643-1992 is a staggering
-48,711 characters, 48,027 of which are hanzi. Also note that number of
-hanzi in Plane 1 is identical to Level 1 hanzi of Big Five (see
-Section 2.3.1). The 2 extra hanzi in Level 2 hanzi of Big Five are
-actually redundant, and are therefore not in CNS 11643-1992 Plane 2.
-	It is rumored that Plane 8 is currently being defined, and
-will add yet more hanzi to this standard.
-
-
-2.3.3: CNS 5205
-
-	This character set is Taiwan's analog to ASCII and ISO 646,
-and is reportedly rarely used. How it differs from ASCII, if at all,
-is unknown to this author.
-
-
-2.3.4: OBSOLETE STANDARDS
-
-	CNS 11643-1986 specified characters only in the first three
-planes, as described in Section 2.3.2. Also, Plane 3 of CNS 11643-1992
-was called Plane 14 of CNS 11643-1986.
-
-
-2.4: KOREAN
-
-	The sections below describe the most current Korean character
-sets, namely KS C 5636-1993, KS C 5601-1992, KS C 5657-1991, and KS C
-5700-1995. "KS" stands for "Korean Standard."
-
-
-2.4.1: KS C 5636-1993
-
-	This character set (published on January 6, 1993), formerly KS
-C 5636-1989 (published on April 22, 1989) and sometimes referred to as
-KS-Roman, is the Korean analog to ASCII and ISO 646-1991. The primary
-difference is that the ASCII backslash (0x5C) is represented as a Won
-symbol.
-
-
-2.4.2: KS C 5601-1992
-
-	This basic Korean character set standard enumerates 8,224
-characters, 4,888 of which are hanja, and 2,350 of which are pre-
-combined hangul. The hanja and hangul blocks are arranged by reading.
-The following is a break-down of its contents:
-
-o Row 1: 94 symbols
-o Row 2: 69 abbreviations and symbols
-o Row 3: 94 full-width KS C 5636-1993 characters (see Section 2.4.1)
-o Row 4: 94 hangul elements
-o Row 5: 68 lowercase and uppercase Roman numerals and lowercase and
-  uppercase Greek alphabet
-o Row 6: 68 line-drawing elements
-o Row 7: 79 abbreviations
-o Row 8: 91 phonetic symbols, circled characters, and fractions
-o Row 9: 94 phonetic symbols, parenthesized characters, subscripts,
-  and superscripts
-o Row 10: 83 hiragana
-o Row 11: 86 katakana
-o Row 12: 66 lowercase and uppercase Cyrillic (Russian) alphabet
-o Rows 16 through 40: 2,350 pre-combined hangul (last is 40-94)
-o Rows 42 through 93: 4,888 hanja (last is 93-94)
-
-Rows 41 and 94 are designated for user-defined characters.
-	There are many similarities with JIS X 0208-1990 and GB
-2312-80, such as hiragana, katakana, Greek, and Cyrillic characters,
-but they are assigned to different rows.
-	There is an interesting note about the hanja block (Rows 42
-through 93). Although there are 4,888 hanja, not all are unique. The
-hanja block is arranged by reading, and in those cases when a hanja
-has more than one reading, that hanja is duplicated (sometimes more
-than once) in the same character set. There are 268 such cases of
-duplicate hanja in KS C 5601-1992, meaning that it contains 4,620
-unique hanja. If you have a copy of the KS C 5601-1992 manual handy,
-you can compare the following four code points:
-
-  0x6445
-  0x5162
-  0x5525
-  0x6879
-
-While most of these cases involve two hanja instances, there are four
-hanja that have three instances, and one (listed above) that has four!
-This is the only CJK character set that has this property of
-intentionally duplicating Chinese characters. See Section 4.4 for more
-details.
-	Annex 3 of this standard defines the complete set of 11,172
-pre-combined hangul characters, also known as Johab. Johab refers to
-the encoding method, and is almost like encoding all possible three-
-letter words (meaning that most are nonsense). See Section 3.3.5 for
-more details on Johab encoding.
-
-
-2.4.3: KS C 5657-1991
-
-	This character set standard provides supplemental characters
-for Korean writing, to include symbols, pre-combined hangul, and
-hanja. The following is a break-down of its contents:
-
-o Rows 1 through 7: 613 lowercase and uppercase Latin characters with
-  diacritics (see note below)
-o Rows 8 through 10: 273 lowercase and uppercase Greek characters with
-  diacritics
-o Rows 11 through 13: 275 symbols
-o Row 14: 27 compound hangul elements
-o Rows 16 through 36: 1,930 pre-combined hangul (last is 36-50)
-o Rows 37 through 54: 1,675 pre-combined hangul (last is 54-77; see
-  note below)
-o Rows 55 through 85: 2,856 hanja (last is 85-36)
-
-The KS C 5657-1991 manual has a possible error (or at least an
-inconsistency) for Rows 1 through 7. The manual says that there are
-615 characters in that range, but I only counted 613. The difference
-can be found on page 19 as the following two characters:
-
-  Character Code  Character
-  ^^^^^^^^^^^^^^  ^^^^^^^^^
-  0x2137          X
-  0x217A          TM
-
-An "X" doesn't belong there (it is already in KS C 5601-1992 at code
-point 0x2358), and the trademark symbol is also part of KS C 5601-1992
-at code point 0x2262. This is why I feel that my count of 613 is more
-accurate than what is explicitly stated in the manual on page 2.
-	Also, page 2 of the manual says that Rows 37 through 54
-contains 1,677 pre-combined hangul, but I only counted 1,675 (17 rows
-of 94 characters plus a final row with 77 characters -- do the math
-for yourself).
-	Here's another interesting note. My official copy of this
-standard has all of its 2,856 hanja hand-written.
-
-
-2.4.4: GB 12052-89
-
-	You may be asking yourself why a GB standard is listed under
-the Korean section of this document. Well, there is a rather large
-Korean population in China (Korea was considered part of China before
-the 1890s), and they need a character set standard for communicating
-using hangul. GB 12052-89 is a Korean character set standard
-established by China (PRC), and enumerates a total of 5,979
-characters.
-	The following is the arrangement of this character set:
-
-o Row 1: 94 symbols
-o Row 2: 72 numerals
-o Row 3: 94 full-width ASCII characters
-o Row 4: 83 hiragana
-o Row 5: 86 katakana
-o Row 6: 48 uppercase and lowercase Greek alphabet
-o Row 7: 66 uppercase and lowercase Cyrillic (Russian) alphabet
-o Row 8: 26 Pinyin and 37 Bopomofo characters
-o Row 9: 76 line-drawing elements (09-04 through 09-79)
-o Rows 16 through 37: 2,068 pre-combined hangul (Level 1 Hangul, Part
-  1; last is 37-94)
-o Rows 38 through 52: 1,356 pre-combined hangul (Level 1 Hangul, Part
-  2; last is 52-40)
-o Rows 53 through 71: 1,779 pre-combined hangul (Level 2 Hangul; last
-  is 71-87)
-o Rows 71 through 72: 94 "Idu" hanja (71-89 through 72-88)
-
-	There are a few interesting notes I can make about this
-character set:
-
-o Rows 1 through 9 are identical to the same rows in GB 2312-80,
-  except that 03-04 is a dollar sign, not a Chinese Yuan (currency)
-  symbol.
-
-o The GB 12052-89 manual states on pp 1 and 3 that Rows 53 through 72
-  contain 1,876 characters, but I only counted 1,873 (1,779 hangul
-  plus 94 hanja).
-
-o The total number of characters, 5,979, is correctly stated in the
-  manual although the hangul count is incorrect.
-
-o The arrangement and ordering of these hangul bear no relationship to
-  that of KS C 5601-1992. Both standards order by reading, which is
-  the only way in which they are similar.
-
-	I am not aware to what extent this character set is being
-used (and who might be using it).
-
-
-2.4.5: KS C 5700-1995
-
-	Korea has developed a new character set standard called KS C
-5700-1995. It is equivalent to ISO 10646-1:1993, but have pre-combined
-hangul as provided (and ordered) in Unicode Version 2.0 (meaning that
-all 11,172 hangul are in a contiguous block).
-
-
-2.4.6: OBSOLETE STANDARDS
-
-	KS C 5601-1986, KS C 5601-1987, and KS C 5601-1989 are the
-same, character-set wise, to KS C 5601-1992. The 1992 edition provides
-more material in the form of annexes. KS C 5601-1982, the original
-version, enumerated only the 51 basic hangul elements in a one-byte 7-
-and 8-bit encoding. This information is still part of KS C 5601-1992,
-but in Annex 4.
-	There were two earlier multiple-byte standards called KS C
-5619-1982 and KIPS. KS C 5619-1982 enumerated 51 hangul elements,
-1,316 pre-combined hangul, and 1,672 hanja. KIPS (Korean Information
-Processing System) enumerated 2,058 pre-combined hangul and 2,392
-hanja. Both have been rendered obsolete by KS C 5601-1987.
-
-
-2.5: CJK
-
-	The only true CJK character sets available today are CCCII,
-ANSI Z39.64-1989 (also known as EACC or REACC), and ISO 10646-1:1993.
-ISO 10646-1:1993 is unique in that it goes beyond CJK (Chinese
-characters) to provide virtually all commonly-used alphabetic scripts.
-	Of these three, only ISO 10646-1:1993 is expected to gain
-wide-spread acceptance. CCCII and ANSI Z39.64-1989 are still used
-today, but primarily for bibliographic purposes.
-
-
-2.5.1: ISO 10646-1:1993
-
-	Published by ISO (International Organization for
-Standardization) in Switzerland, this character set enumerates over
-34,000 characters. Its I-zone ("I" stands for "Ideograph") enumerates
-approximately 21,000 Chinese characters, which is the result of a
-massive effort by the CJK-JRG (CJK Joint Research Group) called "Han
-Unification." The CJK-JRG is now called the IRG (Ideographic
-Rapporteur Group), and is off doing additional research for future
-Chinese character allocations to ISO 10646-1:1993.
-	The Basic Multilingual Plane (BMP) of ISO 10646-1:1993 is
-equivalent to Unicode. While Unicode is comprised of a single plane of
-characters (which doesn't allow much room for future expansion), ISO
-10646-1:1993 contains hundreds of such planes.
-	One very nice feature of this standard's manual are the CJK
-code correspondence tables in Section 26 (pp 262-698). Four columns
-are provided for each ISO 10646-1:1993 I-zone code point -- simplified
-Chinese, traditional Chinese, Japanese, and Korean. If the ISO
-10646-1:1993 Chinese character maps to one of these locales, the
-hexadecimal character code, (decimal) row-cell value, and glyph for
-that locale is provided. The corresponding tables in Volume 2 of "The
-Unicode Standard" provide character codes (sometimes the hexadecimal
-character code, and sometimes the row-cell value) and a single
-glyph. Quite unfortunate. I hear that a new edition of "The Unicode
-Standard" is about to be released. I hope that this problem has been
-addressed.
-	ISO 10646-1:1993 does not replace existing national character
-set standards. It simply provides a single character set that is a
-superset of *most* national character sets. For example, only a
-fraction of the 48,027 hanzi in CNS 11643-1992 are included in ISO
-10646-1:1993. I feel that it is best to think of ISO 10646-1:1993 as
-"just another character set." My philosophy is to support the maximum
-number of character sets and encodings as possible.
-	A note about ordering this standard. If you order through ANSI
-in the United States, try to get an original manual. It is not easy,
-though. You see, ANSI has duplication rights for ISO documents.
-Photocopying Section 26 (pp 262-698) doesn't do the Chinese characters
-much justice, and some characters become hard-to-read. Unfortunately,
-there is no way to indicate that you want an original ISO document
-through ANSI's ordering process, so some post-ordering haggling may
-become necessary.
-	More information on ISO 10646-1:1993 can be found at the
-following URL:
-
-  http://www.unicode.org/
-
-	Japan, China (PRC), and Korea have developed their own
-national standards that are based on ISO 10646-1:1993. They are
-designated as JIS X 0221-1995 (see Section 2.1.4), GB 13000.1-93 (see
-Section 2.2.10), and KS C 5700-1995 (see Section 2.4.5), respectively.
-	Note that these national-standard versions of Unicode are
-aligned differently with its three versions:
-
-  Unicode Version 1.0
-  Unicode Version 1.1 <-> ISO 10646-1:1993, JIS X 0221-1995, GB 13000.1-93
-  Unicode Version 2.0 <-> KS C 5700-1995
-
-One of the major changes made for Unicode Version 2.0 is the inclusion
-of all 11,172 hangul. Versions 1.1 has 6,656 hangul.
-
-
-2.5.2: CCCII
-
-	The Chinese Character Analysis Group in Taiwan developed CCCII
-(Chinese Character Code for Information Interchange) in the 1980s.
-This character set is composed of 94 planes that have 94 rows and 94
-cells (94 x 94 x 94 = 830,584 characters). Furthermore, every six
-planes constitute a "layer" (6 x 94 x 94 = 53,016 characters). The
-following is the contents of each of the 16 layers (the 16th layer
-contains only four planes):
-
-o Layer 1: Symbols and Traditional Chinese characters
-o Layer 2: Simplified Chinese characters from PRC
-o Layers 3 through 12: Variant Chinese character forms
-o Layer 13: Japanese kana and kokuji (Japanese-made kanji)
-o Layer 14: Korean hangul
-o Layer 15: Reserved
-o Layer 16: Miscellaneous characters (Japanese and Korean)
-
-	Layers 1 through 12 have a special meaning and relationship.
-The same code point in these layers is designed to hold the same
-character, but with different forms. Layer 1 code points contain the
-traditional character forms, Layer 2 code points contain the
-simplified character forms (if any), and Layers 3 through 12 contain
-variant character forms (if any). For example, given a Chinese
-character with three forms, its encoding and arrangement may be as
-follows:
-
-  Character Form  Code Point  Layer
-  ^^^^^^^^^^^^^^  ^^^^^^^^^^  ^^^^^
-  Traditional     0x224E41    1
-  Simplified      0x284E41    2
-  Variant         0x2E4E41    3
-
-Note how the second and third bytes (0x4E41) are identical in all
-three instances -- only the first byte's value, which indicates the
-layer, differs. Needless to say, this method of arrangement provides
-easy access to related Chinese character forms. No wonder it is used
-for bibliographic purposes.
-	The first layer is composed as follows:
-
-o Plane 1/Row 2: 56 mathematical symbols
-o Plane 1/Row 3: The ASCII character set
-o Plane 1/Row 11: 35 Chinese punctuation marks
-o Plane 1/Rows 12 through 14: 214 classical radicals
-o Plane 1/Row 15: 41 Chinese numerical symbols, 37 phonetic symbols,
-  and 4 tone marks
-o Plane 1/Rows 16 through 67: 4,808 common Chinese characters
-o Plane 1/Row 68 through Plane 3/Row 64: 17,032 less common Chinese
-  characters
-o Plane 3/Row 65 through Plane 6/Row 5: 20,583 rare Chinese characters
-
-Note that Row 1 of all planes is reserved, and never assigned
-characters. Take this into account when studying the above table
-ranges that span planes (that is, skip Row 1).
-	In addition to the above, there are 11,517 simplified Chinese
-characters in Layer 2 (3,625 are considered PRC simplified forms, and
-the remaining 7,892 are regular simplified forms). This provides a
-total of 53,940 Chinese characters.
-	Further information on CCCII (to include very interesting
-historical notes) can be found on pp 146-149 of John Clews' "Language
-Automation Worldwide: The Development of Character Set Standards" and
-Chapter 6 of Huang & Huang's "An Introduction to Chinese, Japanese,
-and Korean Computing."
-
-
-2.5.3: ANSI Z39.64-1989
-
-	This national standard is designated as ANSI Z39.64-1989 and
-named "East Asian Character Code" (EACC), but was originally known as
-REACC (RLIN East Asian Character Code), that is, before it became a
-national standard. RLIN stands for "Research Libraries Information
-Network," which was developed by the Research Libraries Group (RLG)
-located in Mountain View, California.
-	RLG's Home Page is at the following URL:
-
-  http://www.rlg.org/
-
-	The structure of ANSI Z39.64-1989 is based on CCCII, but with
-a few differences. Many consider it to be superior to and a
-replacement for CCCII (see Section 2.5.2).
-	The ANSI Z39.64-1989 standard is available through ANSI, but
-you should be aware that it is distributed in the form of several
-microfiche. Not a terribly useful storage medium these days. I had my
-set tranformed into tangible printed pages. You can also obtain this
-standard through NISO (National Information Standards Organization)
-Press Fulfillment. Their URL is:
-
-  http://www.niso.org/
-
-	EACC has been designated by the Library of Congress as a
-character set for use in USMARC (United States MAchine-Readable
-Cataloging) records, and is used extensively by East Asian libraries
-across North America.
-	EACC is also being used in Australia for the National CJK
-Project. Check out the following URL for more details:
-
-  http://www.nla.gov.au/1/asian/ncjk/cjkhome.html
-
-	Further information on ANSI Z39.64-1989 (to include very
-interesting historical notes) can be found on pp 150-156 of John
-Clews' "Language Automation Worldwide: The Development of Character
-Set Standards" (although a source at RLG tells me that some of Clews'
-facts are wrong) and Chapter 6 of Huang & Huang's "An Introduction to
-Chinese, Japanese, and Korean Computing."
-	The authoritative paper on EACC is "RLIN East Asian Character
-Code and the RLIN CJK Thesaurus" by Karen Smith Yoshimura and Alan
-Tucker, published in "Proceedings of the Second Asian-Pacific
-Conference on Library Science," May 20-24,1985, Seoul, Korea.
-
-
-2.6: OTHER
-
-	This section includes character set standards that don't
-properly fall under the above sections.
-
-
-2.6.1: GB 8045-87
-
-	GB 8045-87 is a Mongolian character set standard established
-by China (PRC). This standard enumerates 94 Mongolian characters. Of
-these 94 characters, 12 are punctuation (vertically-oriented), and the
-remaining 82 are characters specific to the Mongolian script.
-Mongolian is written vertically like Chinese.
-	I do not discuss the encoding for GB 8045-87 in Part 3, so
-will do it here. The GB 8045-87 manual describes a 7- and 8-bit
-encoding. The 7-bit encoding puts these 94 characters in the standard
-ASCII printable range, namely 0x21 through 0x7E. Code point 0x20 is
-marked as "MSP" which stands for "Mongolian space." The 8-bit encoding
-puts these 94 characters in the range 0xA1 through 0xFE, with the
-"MSP" character at code point 0xA0. The GB 1988-89 set is then encoded
-in the range 0x21 through 0x7E.
-
-
-2.6.2: TCVN-5773:1993
-
-	TCVN-5773:1993 (also called NSCII, which is short for Nom
-Standard Code for Information Interchange) is the Vietnamese analog to
-ISO 10646-1:1993, but adds 1,775 Vietnamese-specific Chinese
-characters. These 1,775 characters are encoded in the range 0xA000
-through 0xA6EE.
-	More information on TCVN-5773:1993 can be found at the
-following URL:
-
-  ftp://unicode.org/pub/MappingTables/EastAsiaMaps/
-
-There are two files at the above URL that pertain to this standard.
-The first is a README, and the second is a Macintosh HyperCard stack
-(requires HyperCard):
-
-  TCVN-NSCII.README
-  TCVN-NSCIIstack_1.0.sea.hqx
-
-
-PART 3: CJK ENCODING SYSTEMS
-
-	These sections describe the various systems for encoding the
-character set standards listed in Part 2. The first two described,
-7-bit ISO 2022 and EUC, are not specific to a locale, and in some
-cases not specific to CJK.
-	The CJK Character Set Server at the following URL can generate
-character sets based on encodings described in this section:
-
-  http://jasper.ora.com/lunde/cjk-char.html
-
-I suggest that you use this as a way to obtain files that illustrate
-these encodings in action.
-	But first, please take a peek at the following table, which is
-an attempt to illustrate how two Chinese characters (that stand for
-"kanji/hanzi/hanja") are encoded using the various methods presented
-in the following sections (character codes as hexadecimal digits, and
-escape sequences or shift sequences as printable characters):
-
-o Japanese (JIS X 0208-1990 & JIS X 0201-1976):
-  - 7-bit ISO 2022        <ESC> & @ <ESC> $ B 0x3441 0x3B7A <ESC> ( J
-  - ISO-2022-JP           <ESC> $ B 0x3441 0x3B7A <ESC> ( J
-  - EUC                   0xB4C1 0xBBFA
-  - Shift-JIS             0x8ABF 0x8E9A
-
-o Simplified Chinese (GB 2312-80 & GB 1988-89 or ASCII):
-  - 7-bit ISO 2022        <ESC> $ A 0x3A3A 0x5756 <ESC> ( T
-  - ISO-2022-CN           <ESC> $ ) A <SO> 0x3A3A 0x5756 <SI>
-  - EUC                   0xBABA 0xD7D6
-  - HZ (HZ-GB-2312)       ~{ 0x3A3A 0x5756 ~}
-  - zW                    zW 0x3A3A 0x5756
-
-o Traditional Chinese (CNS 11643-1992):
-  - 7-bit ISO 2022        <ESC> $ ( G 0x6947 0x4773 <ESC> ( B
-  - ISO-2022-CN           <ESC> $ ) G <SO> 0x6947 0x4773 <SI>
-  - EUC                   0xE9C7 0xC7F3 or 0x8EA1E9C7 0x8EA1C7F3
-
-o Traditional Chinese (Big Five):
-  - Big Five              0xBA7E 0xA672
-
-o Korean (KS C 5601-1992 & ASCII):
-  - 7-bit ISO 2022        <ESC> $ ( C 0x7953 0x6D2E <ESC> ( B
-  - ISO-2022-KR           <ESC> $ ) C <SO> 0x7953 0x6D2E <SI>
-  - EUC                   0xF9D3 0xEDAE
-  - Johab                 0xF7D3 0xF1AE
-
-o CJK (ISO 10646-1:1993, JIS X 0221-1995, GB 13000.1-93, or KS C
-  5700-1995):
-  - UCS-2                 0x6F22 0x5B57
-  - UCS-4                 0x00006F22 0x00005B57
-
-The above should have given you a taste of what information the
-following sections provide.
-
-
-3.1: 7-BIT ISO 2022 ENCODING
-
-	7-bit ISO 2022 is the name commonly given to the encoding
-system that uses escape sequences to shift between character sets.
-(ISO 2022 encoded Japanese text is also known as "JIS" encoding, but
-is different from ISO-2022-JP and ISO-2022-JP-2, and will be explained
-in Section 3.1.3.) This encoding comes from the ISO 2022-1993
-standard.
-	An escape sequence, as the name implies, consists of an escape
-character followed by a sequence of one or more characters. These
-escape sequences are used to change character set of the text
-stream. This may also mean a shift from one- to two-byte-per-character
-mode (or vice versa).
-	7-bit ISO 2022 Character sets fall into two types: one-byte
-and two-byte. CJK character sets, for obvious reasons, fall into the
-latter group.
-	One advantage that 7-bit ISO 2022 encoding has over other
-encoding systems is that its escape sequences specify the character
-set, thus specify the locale. 7-bit ISO 2022 encoding also encodes
-text using only seven-bit bytes, which has the benefit of being able
-to survive Internet travel (e-mail).
-
-
-3.1.1: CODE SPACE
-
-	Each byte in the representation of graphic (printable)
-characters fall into the range 0x21 (decimal 33) through 0x7E (decimal
-126). For one-byte character sets, this means a maximum of 94
-characters. For two-byte character sets, this means a maximum of 8,836
-characters (94 x 94 = 8,836).
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  first byte range                              0x21-0x7E
-
-  Two-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  first byte range                              0x21-0x7E
-  second byte range                             0x21-0x7E
-
-White space and control characters (of which the "escape" character is
-one) are still found in 0x00-0x20 and 0x7F.
-
-
-3.1.2: ISO-REGISTERED ESCAPE SEQUENCES
-
-	The following is a table that provides the ISO-registered
-escape sequences for various one- and two-byte character sets
-mentioned in Part 2 of this document (ISO registration numbers
-provided in the fourth column):
-
-  One-byte Character Set  Escape Sequence      Hexadecimal     ISO Reg
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^     ^^^^^^^
-  ASCII (ANSI X3.4-1986)  <ESC> ( B            0x1B2842        6
-  Half-width katakana     <ESC> ( I            0x1B2849        13
-  JIS X 0201-1976 Roman   <ESC> ( J            0x1B284A        14
-  GB 1988-89 Roman        <ESC> ( T            0x1B2854        57
-
-  Two-byte Character Set  Escape Sequence      Hexadecimal     ISO Reg
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^     ^^^^^^^
-  JIS C 6226-1978         <ESC> $ @            0x1B2440        42
-  GB 2312-80              <ESC> $ A            0x1B2441        58
-  JIS X 0208-1983         <ESC> $ B            0x1B2442        87
-  KS C 5601-1992          <ESC> $ ( C          0x1B242843      149
-  JIS X 0212-1990         <ESC> $ ( D          0x1B242844      159
-  ISO-IR-165:1992         <ESC> $ ( E          0x1B242845      165
-  JIS X 0208-1990         <ESC> & @ <ESC> $ B  0x1B26401B2442  168
-  CNS 11643-1992 Plane 1  <ESC> $ ( G          0x1B242847      171
-  CNS 11643-1992 Plane 2  <ESC> $ ( H          0x1B242848      172
-  CNS 11643-1992 Plane 3  <ESC> $ ( I          0x1B242849      183
-  CNS 11643-1992 Plane 4  <ESC> $ ( J          0x1B24284A      184
-  CNS 11643-1992 Plane 5  <ESC> $ ( K          0x1B24284B      185
-  CNS 11643-1992 Plane 6  <ESC> $ ( L          0x1B24284C      186
-  CNS 11643-1992 Plane 7  <ESC> $ ( M          0x1B24284D      187
-
-Note that the first four two-byte character sets do not use an opening
-parenthesis (0x28 or "(") in their escape sequences, which means that
-they don't follow the 7-bit ISO 2022 rules precisely. They are shorter
-for historical reasons, and are retained for backwards compatibility.
-Also note that not all of the CJK character set standards described in
-Part 2 have ISO-registered escape sequences.
-	There are other encoding methods that are similar to 7-bit ISO
-2022 in that they are suitable for Internet use, but are locale-
-specific. These include HZ and zW encoding, both of which are specific
-to the GB 2312-80 character set (see Sections 3.3.2 and 3.3.3).
-ISO-2022-JP, ISO-2022-KR, ISO-2022-CN, and ISO-2022-CN-EXT are
-described below.
-
-
-3.1.3: ISO-2022-JP AND ISO-2022-JP-2
-
-	ISO-2022-JP is best described as a subset of 7-bit ISO 2022
-encoding for Japanese, and reflects how Japanese text is encoded for
-e-mail messages. ISO-2022-JP-2 is an extension that supports
-additional character sets.
-	There are only four escape sequences permitted in ISO-2022-JP,
-indicated as follows:
-
-  One-byte Character Set  Escape Sequence      Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^
-  ASCII (ANSI X3.4-1986)  <ESC> ( B            0x1B2842
-  JIS X 0201-1976 Roman   <ESC> ( J            0x1B284A
-
-  Two-byte Character Set  Escape Sequence      Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^
-  JIS C 6226-1978         <ESC> $ @            0x1B2440
-  JIS X 0208-1983         <ESC> $ B            0x1B2442
-
-Note the lack of JIS X 0208-1990, JIS X 0212-1990, and half-width
-katakana escape sequences. The JIS X 0208-1983 escape sequence is used
-to indicate both JIS X 0208-1983 and JIS X 0208-1990 (for practical
-reasons).
-	ISO-2022-JP-2 permits additional escape sequences, indicated
-as follows:
-
-  One-byte Character Set  Escape Sequence      Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^
-  ASCII (ANSI X3.4-1986)  <ESC> ( B            0x1B2842
-  JIS X 0201-1976 Roman   <ESC> ( J            0x1B284A
-
-  Two-byte Character Set  Escape Sequence      Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^      ^^^^^^^^^^^
-  JIS C 6226-1978         <ESC> $ @            0x1B2440
-  JIS X 0208-1983         <ESC> $ B            0x1B2442
-  JIS X 0212-1990         <ESC> $ ( D          0x1B242844
-  GB 2312-80              <ESC> $ A            0x1B2441
-  KS C 5601-1992          <ESC> $ ( C          0x1B242843
-
-With the introduction of ISO-2022-KR (see Section 3.1.4), ISO-2022-CN
-(see Section 3.1.5), and ISO-2022-CN-EXT (see Section 3.1.5), the
-usefulness of supporting GB 2312-80 and KS C 5601-1992 can be
-questioned. However, ISO-2022-JP-2 provides support for JIS X
-0212-1990.
-	More detailed information on ISO-2022-JP encoding can be found
-in RFC 1468. And, more detailed information on ISO-2022-JP-2 encoding
-can be found in RFC 1554.
-
-
-3.1.4: ISO-2022-KR
-
-	ISO-2022-KR is similar to ISO-2022-JP (see Section 3.1.3) in
-that it reflects how Korean text is encoded for e-mail messages.
-However, its actual implementation is a bit different. Below is a
-summary.
-	There are only two shift sequences used in ISO-2022-KR,
-indicated as follows:
-
-  One-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  ASCII (ANSI X3.4-1986)  <SI>                 0x0F
-
-  Two-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  KS C 5601-1992          <SO>                 0x0E
-
-Furthermore, the following designator sequence must appear only once,
-at the beginning of a line, before any KS C 5601-1992 characters (this
-usually means that it appears by itself on the first line of the
-file):
-
-  <ESC> $ ) C             0x1B242943
-
-It almost looks the same as the KS C 5601-1992 escape sequence in
-7-bit ISO 2022, but look again. The opening parenthesis (0x28 or "(")
-is replaced by a closing parenthesis (0x29 or ")"). This designator
-sequence serves a different purpose than an escape sequence. It is
-like a flag indicating that "this document contains KS C 5601-1992
-characters." The <SO> and <SI> control characters actually perform the
-switching between one- (ASCII) and two-byte (KS C 5601-1992) codes.
-	More detailed information on ISO-2022-KR encoding can be found
-in RFC 1557.
-
-
-3.1.5: ISO-2022-CN AND ISO-2022-CN-EXT
-
-	ISO-2022-CN and ISO-2022-CN-EXT are similar to ISO-2022-JP
-(see Section 3.1.3) and ISO-2022-KR (see Section 3.1.4) in that they
-reflect how Chinese text is encoded for e-mail messages.
-	Like with ISO-2022-KR, there are only two shift sequences,
-indicated as follows:
-
-  One-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  ASCII (ANSI X3.4-1986)  <SI>                 0x0F
-
-  Two-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  <Too Many to List>      <SO>                 0x0E
-
-But, unlike ISO-2022-KR, there are single shift sequences. Single
-shift means that they are used before every (single) character, not
-before sequences of characters.
-
-  Single Shift Type       Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^       ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  SS2                     <ESC> N              0x1B4E
-  SS3                     <ESC> O (not zero!)  0x1B4F
-
-	ISO-2022-CN supports the following character sets using SO and
-SS2 designations:
-
-  Character Set           Type   Designation Sequence  Hexadecimal
-  ^^^^^^^^^^^^^           ^^^^   ^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^
-  GB 2312-80              SO     <ESC> $ ) A           0x1B242941
-  CNS 11643-1992 Plane 1  SO     <ESC> $ ) G           0x1B242947
-  CNS 11643-1992 Plane 2  SS2    <ESC> $ * H           0x1B242A48
-
-The designator sequences must appear once on a line before any
-instance of the character set it designates. If two lines contain
-characters from the same character set, both lines must include the
-designator sequence (this is so the text can be displayed correctly
-when scroll back in a window). This is different behavior from
-ISO-2022-KR where the designator sequence appears once in the entire
-file (this is because ISO-2022-KR supports a single two-byte character
-set).
-	ISO-2022-CN-EXT supports the following character sets using
-SO, SS2, and SS3 designations (notice how ISO-2022-CN is still
-supported in the same manner):
-
-  Character Set           Type   Designation Sequence  Hexadecimal
-  ^^^^^^^^^^^^^           ^^^^   ^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^
-  GB 2312-80              SO     <ESC> $ ) A           0x1B242941
-  GB/T 12345-90           SO     NOT REGISTERED
-  ISO-IR-165              SO     <ESC> $ ) E           0x1B242945
-  CNS 11643-1992 Plane 1  SO     <ESC> $ ) G           0x1B242947
-  CNS 11643-1992 Plane 2  SS2    <ESC> $ * H           0x1B242A48
-  GB 7589-87              SS2    NOT REGISTERED
-  GB/T 13131-9X           SS2    NOT REGISTERED
-  CNS 11643-1992 Plane 3  SS3    <ESC> $ + I           0x1B242B49
-  CNS 11643-1992 Plane 4  SS3    <ESC> $ + J           0x1B242B4A
-  CNS 11643-1992 Plane 5  SS3    <ESC> $ + K           0x1B242B4B
-  CNS 11643-1992 Plane 6  SS3    <ESC> $ + L           0x1B242B4C
-  CNS 11643-1992 Plane 7  SS3    <ESC> $ + M           0x1B242B4D
-  GB 7590-87              SS3    NOT REGISTERED
-  GB/T 13132-9X           SS3    NOT REGISTERED
-
-Support for character sets indicated as NOT REGISTERED will be added
-once they are ISO-registered.
-	More detailed information on ISO-2022-CN and ISO-2022-CN-EXT
-encodings can be found in RFC 1922.
-
-
-3.2: EUC ENCODING
-
-	EUC stands for "Extended UNIX Code," and is a rich encoding
-system from ISO 2022-1993 that is designed to handle large or multiple
-character sets. It is primarily used on UNIX systems, such as Sun's
-Solaris.
-	EUC consists of four codes sets, numbered 0 through 3. The
-only code set that is more or less fixed by definition is code set 0,
-which is specified to contain ASCII or a locale's equivalent (such as
-JIS X 0201-1976 for Japanese or GB 1988-89 for PRC Chinese).
-	It is quite common to append the locale name to "EUC" when
-designating a specific instance of EUC encoding. Common designations
-include EUC-JP, EUC-CN, EUC-KR, and EUC-TW.
-
-
-3.2.1: JAPANESE REPRESENTATION
-
-	The following table illustrates the Japanese representation of
-EUC packed format:
-
-  EUC Code Sets                                 Encoding Range
-  ^^^^^^^^^^^^^                                 ^^^^^^^^^^^^^^
-  Code set 0 (ASCII or JIS X 0201-1976 Roman):  0x21-0x7E
-  Code set 1 (JIS X 0208):                      0xA1A1-0xFEFE
-  Code set 2 (half-width katakana):             0x8EA1-0x8EDF
-  Code set 3 (JIS X 0212-1990):                 0x8FA1A1-0x8FFEFE
-
-An earlier version of EUC for Japanese used code set 3 as the user-
-defined range.
-
-
-3.2.2: CHINESE (PRC) REPRESENTATION
-
-	The following table illustrates the Chinese (PRC)
-representation of EUC packed format:
-
-  EUC Code Sets                                 Encoding Range
-  ^^^^^^^^^^^^^                                 ^^^^^^^^^^^^^^
-  Code set 0 (ASCII or GB 1988-89):             0x21-0x7E
-  Code set 1 (GB 2312-80):                      0xA1A1-0xFEFE
-  Code set 2:                                   unused
-  Code set 3:                                   unused
-
-Note how code sets 2 and 3 are unused.
-	The encoding used on Macintosh is quite similar, but has a
-shortened two-byte range (0xA1A1 through 0xFCFE) plus additional
-one-byte code points, namely 0x80 ("u" with dieresis), 0xFD
-("copyright" symbol: "c" in a circle), 0xFE ("trademark" symbol: "TM"
-as a superscript), and 0xFF ("ellipsis" symbol: three dots).
-
-
-3.2.3: CHINESE (TAIWAN) REPRESENTATION
-
-	The following table illustrates the Chinese (Taiwan)
-representation of EUC packed format:
-
-  EUC Code Sets                                 Encoding Range
-  ^^^^^^^^^^^^^                                 ^^^^^^^^^^^^^^
-  Code set 0 (ASCII):                           0x21-0x7E
-  Code set 1 (CNS 11643-1992 Plane 1):          0xA1A1-0xFEFE
-  Code set 2 (CNS 11643-1992 Planes 1-16):      0x8EA1A1A1-0x8EB0FEFE
-  Code set 3:                                   unused
-
-Note how CNS 11643-1992 Plane 1 is redundantly encoded in code set 1
-(two-byte) and code set 2 (four-byte). The second byte of code set 2
-indicates the plane number. For example, 0xA1 is Plane 1 and so on up
-until 0xB0, which is Plane 16.
-
-
-3.2.4: KOREAN REPRESENTATION
-
-	The following table illustrates the Korean representation of
-EUC packed format (this is also known as "Wansung" encoding -- the
-Korean word "wansung" means "pre-compose"):
-
-  EUC Code Sets                                 Encoding Range
-  ^^^^^^^^^^^^^                                 ^^^^^^^^^^^^^^
-  Code set 0 (ASCII or KS C 5636-1993):         0x21-0x7E
-  Code set 1 (KS C 5601-1992):                  0xA1A1-0xFEFE
-  Code set 2:                                   unused
-  Code set 3:                                   unused
-
-Note how code sets 2 and 3 are unused.
-	The encoding used on Macintosh is quite similar, but has a
-shortened two-byte range (0xA1A1 through 0xFDFE) plus additional
-one-byte code points, namely 0x81 ("won" symbol), 0x82 (hyphen), 0x83
-("copyright" symbol: "c" in a circle), 0xFE ("trademark" symbol: "TM"
-as a superscript), and 0xFF ("ellipsis" symbol: three dots).
-	See Section 3.3.17 for a description of Microsoft's extension
-to this encoding, called Unified Hangul Code.
-
-
-3.3: LOCALE-SPECIFIC ENCODINGS
-
-	The encoding systems described in the following sections are
-considered to be locale-specific, namely that are used to encode a
-specific character set standard. This is not to say that they are not
-widely used (actually, some of these are among the most widely used
-encoding systems!), but rather that they are tied to a specific
-character set.
-
-
-3.3.1: SHIFT-JIS
-
-	Shift-JIS (also known as MS Kanji, SJIS, or DBCS-PC) is the
-encoding system used on machines that support MS-DOS or Windows, and
-also for Macintosh (KanjiTalk or Japanese Language Kit). It was
-originally developed by Microsoft Corporation as a way to support the
-Japanese character set on MS-DOS. The following tables provide the
-Shift-JIS encoding ranges:
-
-  Two-byte Standard Characters                  Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte ranges                             0x81-0x9F, 0xE0-0xEF
-  second byte ranges                            0x40-0x7E, 0x80-0xFC
-
-  Two-byte User-defined Characters              Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^^^^^^^^^^^^^
-  first byte range                              0xF0-0xFC
-  second byte ranges                            0x40-0x7E, 0x80-0xFC
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  Half-width katakana                           0xA1-0xDF
-  ASCII/JIS-Roman                               0x21-0x7E
-
-It is important to note that the user-defined range does not
-correspond to code points in other encodings that support Japanese,
-such as 7-bit ISO 2022 or EUC. This is a portability problem. It is
-also unique in that it does not support the JIS X 0212-1990 character
-set standard.
-	The encoding used on Macintosh is quite similar to the above
-table, but has additional one-byte code points, namely 0x80
-(backslash), 0xFD ("copyright" symbol: "c" in a circle), 0xFE
-("trademark" symbol: "TM" as a superscript), and 0xFF ("ellipsis"
-symbol: three dots).
-
-
-3.3.2: HZ (HZ-GB-2312)
-
-	HZ is a simple yet very powerful and reliable system for
-encoding GB 2312-80 text which was developed by Fung Fung Lee
-(lee@umunhum.stanford.edu). HZ encoding is commonly used when
-exchanging e-mail or posting messages to Usenet News (specifically, to
-alt.chinese.text).
-	The actual encoding ranges used for one- and two-byte
-characters is almost identical to 7-bit ISO 2022 encoding (see Section
-3.1.1). The first-byte range is limited to 0x21 through 0x77. But,
-instead of using an escape sequence to shift between one- and two-byte
-character modes, a simple string of two printable characters is used.
-
-  One-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  ASCII                   ~}                   0x7E7D
-
-  Two-byte Character Set  Shift Sequence       Hexadecimal
-  ^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^       ^^^^^^^^^^^
-  GB 2312-80              ~{                   0x7E7B
-
-The tilde character (0x7E) is interpreted as an escape character in HZ
-encoding, so it has special meaning. If a tilde character is to appear
-in one-byte-per-character mode, it must be doubled (so ~~ would appear
-as just ~). This means that there are three escape sequences used in
-HZ encoding:
-
-  Escape Sequence  Meaning
-  ^^^^^^^^^^^^^^^  ^^^^^^^
-  ~~               ~ in one-byte-per-character mode
-  ~}               Shift into one-byte-per-character mode
-  ~{               Shift into two-byte-per-character mode
-
-There is also a fourth escape sequence, namely ~ plus a newline
-character (~\n). This escape sequence is a line-continuation marker to
-be consumed with no output produced.
-	This method works without problems because the shift sequences
-represent empty positions in the very last row of the GB 2312-80 table
-(actually, the second- and third-from-last code points). HZ encoding
-makes 77 of the 94 rows accessible, and because there are no defined
-characters beyond row 77, this causes no problems.
-	The complete HZ specification is part of the HZ package,
-described in RFC 1843, and available in HTML format. These are
-available at the following URLs:
-
-  ftp://ftp.ifcss.org/pub/software/unix/convert/HZ-2.0.tar.gz
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/Ch9/rfc-1843.txt
-  http://umunhum.stanford.edu/~lee/chicomp/HZ_spec.html
-
-In addition, RFC 1842 establishes "HZ-GB-2312" as the "charset"
-parameter in MIME-encoded e-mail headers. Its properties are identical
-to HZ encoding as described in RFC 1843.
-
-
-3.3.3: zW
-
-	zW encoding, developed by Ya-Gui Wei and Edmund Lai, is older
-than and somewhat similar to HZ encoding (HZ is considered to be a
-better encoding system, and users are encouraged to switch over to HZ
-encoding).
-	zW encoding is named by how it encodes each line of GB 2312-80
-text, namely lines that contain Chinese text must begin with the two
-characters "z" and "W" ("zW"). This encoding method does not permit
-the mixture of one- (ASCII) and two-byte (GB 2312-80) characters on a
-per-character basis, but rather on a per-line basis. That is, each
-line can contain only Chinese or ASCII text, but not both.
-	More information on zW encoding can be found as part of the
-ZWDOS package available at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/dos/ZWDOS/
-
-
-3.3.4: BIG FIVE
-
-	Big Five is the encoding system used on machines that support
-MS-DOS or Windows, and also for Macintosh (such as the Chinese
-Language Kit or the fully-localized operating system).
-
-  Two-byte Standard Characters                  Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte range                              0xA1-0xFE
-  second byte ranges                            0x40-0x7E, 0xA1-0xFE
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  ASCII                                         0x21-0x7E
-
-	The encoding used on Macintosh is quite similar to the above,
-but has a slightly shortened two-byte range (second byte range up to
-0xFC only) plus additional one-byte code points, namely 0x80
-(backslash), 0xFD ("copyright" symbol: "c" in a circle), 0xFE
-("trademark" symbol: "TM" as a superscript), and 0xFF ("ellipsis"
-symbol: three dots).
-
-
-3.3.5: JOHAB
-
-	Korean hangul characters are typically encoded in what is
-known as pre-combined form, namely 2 or 3 hangul elements bound into a
-single character. KS C 5601-1992 enumerates 2,350 such pre-combined
-forms. While this number is felt to be sufficient for most purposes,
-it does not account for the total number of possible permutations. The
-encoding system that encodes all possible pre-combined hangul is known
-as Johab encoding (also known as "two-byte combination code" -- the
-Korean word "johab" means "combine"), and is described in Annex 3 of
-the KS C 5601-1992 standard. This encoding is almost like encoding all
-possible three-letter words in English -- while all combinations are
-possible, only a fraction represent *real* words.
-	Pre-combined hangul can be composed of 19 different initial,
-21 different medial, and 27 different final hangul elements (28,
-actually, if you count the placeholder). This provides a maximum of
-11,172 pre-combined hangul. Of these 67 hangul elements, 51 are unique
-(some can occur in different positions). Each of these positions are
-encoded using five bits each (five bits can encode up to 32 unique
-objects). The encoding array looks as follows:
-
-o Bit 1: always on
-o Bits 2-6: initial hangul element
-o Bits 7-11: medial hangul element
-o Bits 12-16: final hangul element
-
-Initial and final elements are consonants, and the medial elements are
-vowels. This encoding must be treated as a 16-bite entity because the
-bit array of the medial hangul element spans the first and second byte.
-	Johab encoding also provides the complete set of KS C 5601-
-1992 symbols and hanja, but in different code points. Annex 3 of the
-KS C 5601-1992 manual (pp 33-34) contains a complete symbol and hanja
-mapping table between EUC and Johab code points. (The KS C 5601-1989
-manual did not have this.) The code space ranges for Johab encoding
-are as follows:
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  ASCII or KS C 5636-1993                       0x21-0x7E
-
-  Two-byte Pre-combined Hangul                  Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte range                              0x84-0xD3
-  second byte ranges                            0x41-0x7E, 0x81-0xFE
-
-  Two-byte Symbols and Hanja                    Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte ranges                             0xD8-0xDE, 0xE0-0xF9
-  second byte ranges                            0x31-0x7E, 0x91-0xFE
-
-Note that the second byte ranges encode a total of 188 characters, and
-that the second byte ranges for hangul and symbols/hanja are slightly
-different (yet the same size, namely 188 characters).
-	Here is a summary of the above table, which better describes
-what is encoded where. Rows 0x84 through 0xD3 provide 80 rows of 188
-characters each (15,040 code points, which is more than enough for the
-11,172 pre-combined hangul). Row 0xD8 provides 188 user-defined
-positions, the same as Rows 41 and 94 in the standard KS C 5601-1992
-table. Rows 0xD9 through 0xDE encode Rows 1 through 12 of the standard
-KS C 5601-1992 table (symbols). Rows 0xE0 through 0xF9 encode Rows 42
-through 94 of the KS C 5601-1992 table (hanja). The following URL
-provides a complete mapping table for the KS C 5601-1992 symbols and
-hanja:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/non-hangul-codes.txt
-
-The following URLs provides similar information (they are the same
-file), but only for the 11,172 pre-combined hangul:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/hangul-codes.txt
-  ftp://unicode.org/pub/MappingTables/EastAsiaMaps/hangul-codes.txt
-
-	Of further interest may be that Microsoft designates Johab
-encoding as its Code Page 1361. Microsoft if planning to support Johab
-encoding for Korean Windows NT.
-
-
-3.3.6: N-BYTE HANGUL
-
-	In the days before full two-byte capable operating systems,
-each of the 51 basic hangul elements were encoding using a single
-(7-bit) byte. The encoding range spans 0x40 through 0x7C, but there
-are several unassigned gaps. This is known as the "N-byte Hangul"
-code, and is described in Annex 4 (page 35) of the KS C 5601-1992
-manual.
-	The following table illustrates these 51 one-byte code points
-(the pronunciation or meaning of the hangul element is provided in
-parentheses) and how they map to the three 5-bit arrays in Johab
-encoding (expressed as binary patterns):
-
-  Element        Initial  Medial   Final
-  ^^^^^^^        ^^^^^^^  ^^^^^^   ^^^^^
-  0x40 ("fill")  00001    00010    00001
-  0x41 (g)       00010    *****    00010
-  0x42 (gg)      00011    *****    00011
-  0x43 (gs)      *****    *****    00100
-  0x44 (n)       00100    *****    00101
-  0x45 (nj)      *****    *****    00110
-  0x46 (nh)      *****    *****    00111
-  0x47 (d)       00101    *****    01000
-  0x48 (dd)      00110    *****    *****
-  0x49 (r)       00111    *****    01001
-  0x4A (rg)      *****    *****    01010
-  0x4B (rm)      *****    *****    01011
-  0x4C (rb)      *****    *****    01100
-  0x4D (rs)      *****    *****    01101
-  0x4E (rt)      *****    *****    01110
-  0x4F (rp)      *****    *****    01111
-  0x50 (rh)      *****    *****    10000
-  0x51 (m)       01000    *****    10001
-  0x52 (b)       01001    *****    10011
-  0x53 (bb)      01010    *****    *****
-  0x54 (bs)      *****    *****    10100
-  0x55 (s)       01011    *****    10101
-  0x56 (ss)      01100    *****    10110
-  0x57 (ng)      01101    *****    10111
-  0x58 (j)       01110    *****    11000
-  0x59 (jj)      01111    *****    *****
-  0x5A (c)       10000    *****    11001
-  0x5B (k)       10001    *****    11010
-  0x5C (t)       10010    *****    11011
-  0x5D (p)       10011    *****    11100
-  0x5E (h)       10100    *****    11101
-  0x5F UNASSIGNED
-  0x60 UNASSIGNED
-  0x61 UNASSIGNED
-  0x62 (a)       *****    00011    *****
-  0x63 (ae)      *****    00100    *****
-  0x64 (ya)      *****    00101    *****
-  0x65 (yae)     *****    00110    *****
-  0x66 (eo)      *****    00111    *****
-  0x67 (e)       *****    01010    *****
-  0x68 UNASSIGNED
-  0x69 UNASSIGNED
-  0x6A (yeo)     *****    01011    *****
-  0x6B (ye)      *****    01100    *****
-  0x6C (o)       *****    01101    *****
-  0x6D (wa)      *****    01110    *****
-  0x6E (wae)     *****    01111    *****
-  0x6F (oe)      *****    10010    *****
-  0x70 UNASSIGNED
-  0x71 UNASSIGNED
-  0x72 (yo)      *****    10011    *****
-  0x73 (u)       *****    10100    *****
-  0x74 (weo)     *****    10101    *****
-  0x75 (we)      *****    10110    *****
-  0x76 (wi)      *****    10111    *****
-  0x77 (yu)      *****    11010    *****
-  0x78 UNASSIGNED
-  0x79 UNASSIGNED
-  0x7A (eu)      *****    11011    *****
-  0x7B (yi)      *****    11100    *****
-  0x7C (i)       *****    11101    *****
-
-	There are utilities to convert N-byte Hangul code to other,
-more widely-used, encoding methods. Pointers to these and other code
-conversion utilities can be found in Section 4.7.
-
-
-3.3.7: UCS-2
-
-	UCS-2 (Universal Character Set containing 2 bytes) encoding is
-one way to encode ISO 10646-1:1993 text, and is considered identical
-to Unicode encoding. Its encoding range, which is quite simple, is as
-follows:
-
-  ISO 10646-1:1993 Characters                   Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^
-  first byte range                              0x00-0xFF
-  second byte range                             0x00-0xFF
-
-Yes, folks, the whole range of 65,536 possible code points are
-available for encoding characters. The "signature" that indicates a
-file using UCS-2 is as follows:
-
-  0xFEFF
-
-	Escape sequences for UCS-2 have already been registered with
-ISO, and are as follows:
-
-  ISO 10646-1:1993        Escape Sequence      Hexadecimal     ISO Reg
-  ^^^^^^^^^^^^^^^^        ^^^^^^^^^^^^^^^      ^^^^^^^^^^^     ^^^^^^^
-  UCS-2 Level 1           <ESC> % / @          0x1B252F40      162
-  UCS-2 Level 2           <ESC> % / C          0x1B252F43      174
-  UCS-2 Level 3           <ESC> % / E          0x1B252F45      176
-
-So what do these three levels mean? Level 3 means all characters in
-ISO 10646-1:1993 with no restrictions (0x0000 through 0xFFFF).
-	Level 2 begins to restrict the character set by not including
-the following characters or character ranges:
-
-  0x0300-0x0345  0x09D7         0x0BD7         0x11A8-0x11F9
-  0x0360-0x0361  0x0A3C         0x0C55-0x0C56  0x20D0-0x20E1
-  0x0483-0x0486  0x0A70-0x0A71  0x0CD5-0x0CD6  0x302A-0x302F
-  0x093C         0x0ABC         0x0D57         0x3099-0x309A
-  0x0953-0x0954  0x0B3C         0x1100-0x1159  0xFE20-0xFE23
-  0x09BC         0x0B56-0x0B57  0x115F-0x11A2
-
-These are all combining characters, and represent 364 code points.
-	Level 1 further restricts the character set by not including
-the following characters or character ranges:
-
-  0x05B0-0x05B9  0x09BE-0x09C4  0x0B47-0x0B48  0x0D02-0x0D03
-  0x05BB-0x05BD  0x09C7-0x09C8  0x0B4B-0x0B4D  0x0D3E-0x0D43
-  0x05BF         0x09CB-0x09CD  0x0B82-0x0B83  0x0D46-0x0D48
-  0x05C1-0x05C2  0x09E2-0x09E3  0x0BBE-0x0BC2  0x0D4A-0x0D4D
-  0x064B-0x0652  0x0A02         0x0BC6-0x0BC8  0x0E31
-  0x0670         0x0A3E-0x0A42  0x0BCA-0x0BCD  0x0E34-0x0E3A
-  0x06D6-0x06E4  0x0A47-0x0A48  0x0C01-0x0C03  0x0E47-0x0E4E
-  0x06E7-0x06E8  0x0A4B-0x0A4D  0x0C3E-0x0C44  0x0EB1
-  0x06EA-0x06ED  0x0A81-0x0A83  0x0C46-0x0C48  0x0EB4-0x0EB9
-  0x0901-0x0903  0x0ABE-0x0AC5  0x0C4A-0x0C4D  0x0EBB-0x0EBC
-  0x093E-0x094D  0x0AC7-0x0AC9  0x0C82-0x0C83  0x0EC8-0x0ECD
-  0x0951-0x0952  0x0ACB-0x0ACD  0x0CBE-0x0CC4  0xFB1E
-  0x0962-0x0963  0x0B01-0x0B03  0x0CC6-0x0CC8
-  0x0981-0x0983  0x0B3E-0x0B43  0x0CCA-0x0CCD
-
-These, too, are all combining characters, and represent 586 code
-points (222 above plus the 364 characters from the Level 2
-restriction).
-
-
-3.3.8: UCS-4
-
-	UCS-4 (Universal Character Set containing 4 bytes) encoding is
-another way to encode ISO 10646-1:1993 text, and is used for future
-expansion of the character set. Its encoding range is as follows:
-
-  ISO 10646-1:1993 Characters                   Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^
-  first byte range                              0x00-0x7F
-  second byte range                             0x00-0xFF
-  third byte range                              0x00-0xFF
-  fourth byte range                             0x00-0xFF
-
-Note that the first byte range only goes up to 0x7F. This means that
-UCS-4 is a 31-bit encoding. And, in case you're wondering, 31 bits
-provide 2,147,483,648 code points. The "signature" that indicates a
-file using UCS-4 is as follows:
-
-  0x0000 0xFEFF
-
-	Escape sequences for UCS-4 have already been registered with
-ISO, and are as follows:
-
-  ISO 10646-1:1993        Escape Sequence      Hexadecimal     ISO Reg
-  ^^^^^^^^^^^^^^^^        ^^^^^^^^^^^^^^^      ^^^^^^^^^^^     ^^^^^^^
-  UCS-4 Level 1           <ESC> % / A          0x1B252F41      163
-  UCS-4 Level 2           <ESC> % / D          0x1B252F44      175
-  UCS-4 Level 3           <ESC> % / F          0x1B252F46      177
-
-See the end of Section 3.3.7 for a description of these three levels.
-But, in the case of UCS-4, simply prepend "0000" to all the values.
-
-
-3.3.9: UTF-7
-
-	It turns out that *raw* ISO 10646-1:1993 encoding (that is,
-UCS-2 or UCS-4) can cause problems because null bytes (0x00) are
-possible (and frequent). Several UTFs (UCS Transformation Formats)
-have been developed to deal with this and other problems. I must admit
-that I don't know too much about UTFs, and what I provide below is
-minimal, but does include pointers to more complete descriptions.
-	UTF-7 is a mail-safe 7-bit transformation format for UCS-2
-(including UTF-16). It uses straight ASCII for many ASCII characters,
-and switches into a Base64 encoding of UCS-2 or UTF-16 for everything
-else. It was designed to be usable in MIME-compliant e-mail headers as
-well as message bodies, and to pass through gateways to non-ASCII mail
-systems (like Bitnet). More detailed information on UTF-7 can be found
-in RFC 1642, and a UTF-7 converter is available. The following URLs
-provide this information:
-
-  http://www.stonehand.com/unicode/standard/utf7.html
-  ftp://unicode.org/pub/Programs/ConvertUTF/
-
-
-3.3.10: UTF-8
-
-	UTF-8 (also known as UTF-2 or FSS-UTF -- FSS stands for "file
-system safe") can represent any character in UCS-2 and UCS-4, and is
-officially an annex to ISO 10646-1:1993. It is different from UTF-7 in
-that it encodes character sets into 8-bit bytes. UCS-2 and UCS-4 have
-problems with some file systems and utilities, so this UTF was
-developed.
-	More detailed information on UTF-8 and its relationship with
-ISO 10646-1:1993 can be found at the following URLs:
-
-  http://www.stonehand.com/unicode/standard/utf8.html
-  ftp://unicode.org/pub/Programs/ConvertUTF/
-
-	X/Open Company Limited also published a document that
-describes UTF-8 in detail (they call it FSS-UTF), and you can find
-information about it at the following URL:
-
-  http://www.xopen.co.uk/public/pubs/catalog/c501.htm
-
-The new programming language called Java supports Unicode through
-UTF-8. More information on Java is at the following URL:
-
-  http://www.javasoft.com/
-
-
-3.3.11: UTF-16
-
-	UTF-16 (formerly UCS-2E), like UTF-8, is now officially an
-annex to ISO 10646-1:1993. From what I've read, UTF-16 transforms
-UCS-4 into a 16-bit form. UTF-16 can then be further encoded in UTF-7
-or UTF-8 (but doing this is not according to the standard -- there is
-little to gain by doing so).
-	More detailed information on UTF-16 and its relationship with
-ISO 10646-1:1993 can be found at the following URLs:
-
-  http://www.stonehand.com/unicode/standard/utf16.html
-  ftp://unicode.org/pub/Programs/ConvertUTF/
-
-
-3.3.12: ANSI Z39.64-1989
-
-	The encoding used for ANSI Z39.64-1989 (and CCCII) is three-
-byte 7-bit ISO 2022, namely the following code space:
-
-  Three-byte ANSI Z39.64-1989                   Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^                   ^^^^^^^^^^^^^^
-  first byte range                              0x21-0x7E
-  second byte range                             0x21-0x7E
-  third byte range                              0x21-0x7E
-
-
-3.3.13: BASE64
-
-	Base64 encoding is mentioned here only because of its common
-usage in e-mail headers, and relationship with MIME (Multi-purpose
-Internet Mail Extensions). It is also a source of confusion. Base64 is
-a method of encoding arbitrary bytes into the safest 64-character
-ASCII subset, and is defined in RFC 1341 (which adapted it from RFC
-1113). RFC 1341 was made obsolete by RFC 1521. RFC 1522 also provides
-useful information, particularly for handling non-ASCII text, and
-obsoletes RFC 1342.
-	Here is how it works. Every three bytes are encoded as a
-four-byte sequence. That is, the 24 bits that make up the three bytes
-are split into four 6-bit segments (6 bits can encode up to 64
-characters). Each 6-bit segment is then converted into a character in
-the Base64 Alphabet (see below). There is a 65th character, "=", which
-has a special purpose (it functions as a "pad" if a full three-byte
-sequence is not found). This all may sound a bit like uuencoding, but
-it is different. The Base64 Alphabet is as follows:
-
-  ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/
-
-	My name, written in Japanese kanji, is as follows when it is
-EUC-encoded (six bytes, expressed as three groups of hexadecimal
-values, one group for each character):
-
-  0xBEAE 0xCED3 0xB7F5
-
-When these three EUC-encoded characters are converted to Base64
-encoding, they appear as follows (eight bytes):
-
-  vq7O07f1
-
-	Base64 encoding is most commonly used for encoding non-ASCII
-text that appears in e-mail headers. Of all the portions of an e-mail
-message, its header gets manipulated the most during transmission, and
-Base64 encoding offers a safe way to further encode non-ASCII text so
-that it is not altered by mail-routing software. This is where Base64
-encoding can cause confusion. For example, what goes through your mind
-when you see the following chunk o' text?
-
-  From: lunde@adobe.com (=?ISO-2022-JP?B?vq7O07f1?=)
-
-Many folks think that they are seeing ISO-2022-JP encoding. Not
-true. The "ISO-2022-JP" portion is just a flag that indicates the
-original encoding before Base64 encoding was applied. The actual
-Base64-encoded portion is enclosed between question marks (?) as
-follows:
-
-  From: lunde@adobe.com (=?ISO-2022-JP?B?vq7O07f1?=)
-                                        >^^^^^^^^<
-
-The whole string enclosed in parentheses has several components, and
-the following explains their purpose and relationships (using the
-above string as an example):
-
-  Component      Explanation
-  ^^^^^^^^^      ^^^^^^^^^^^
-  =?             Signals start of encoded string
-  ISO-2022-JP    Charset name ("ISO-2022-JP" is for Japanese)
-  ?              Delimiter
-  B              Encoding ("B" is for Base64)
-  ?              Delimiter
-  vq7O07f1       Example string of type "charset" encoded by "encoding"
-  ?=             Signals end of encoded string
-
-	One typically does not need to worry about encoding text as
-Base64 (MIME-compliant mailing software usually performs this task for
-you). The problem is usually trying to decode Base64-encoded text. A
-Base64 decoder is available in Perl at the following URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/perl/b64decode.pl
-
-Note that this program takes "raw" Base64 data as input. Any non-
-Base64 stuff must be stripped. I usually run this from within Mule
-("C-u M-| b64decode.pl") after defining a region around the Base64-
-encoded material. I hope to replace this program soon with one that
-automatically recognizes the Base64-encoded portions.
-	Most MIME-compliant e-mail software can decode Base64-encoded
-text.
-
-
-3.3.14: IBM DBCS-HOST
-
-	The oldest two-byte encoding system is IBM's DBCS-Host. DBCS
-stands for Double-Byte Character Set. DBCS-Host is still in use on
-IBM's mainframe computer systems (hence the use of "Host").
-	DBCS-Host encoding is EBCDIC-based, and uses Shift characters,
-0x0E and 0x0F, to switch between one- and two-byte mode. Its encoding
-specifications are as follows:
-
-  Two-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  first byte range                              0x41-0xFE
-  second byte range                             0x41-0xFE
-
-  Two-byte "Space" Character                    Code Point
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^                    ^^^^^^^^^^
-  first- and second byte                        0x4040
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  EBCDIC                                        0x41-0xF9
-
-  Shifting Characters                           Code Point
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  Two-byte                                      0x0E
-  One-byte                                      0x0F
-
-This same encoding specification is shared by all of IBM's CJK
-character sets, namely for Japanese, Simplified Chinese, Traditional
-Chinese, and Korean.
-
-
-3.3.15: IBM DBCS-PC
-
-	IBM's DBCS-PC encoding is used on IBM personal computers (that
-is where the "PC" comes from). DBCS-PC encoding is ASCII-based, and
-uses the values of characters' bytes themselves to switch between one-
-and two-byte mode. Its encoding specifications are as follows:
-
-  Two-byte Characters                           Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^^
-  first byte range                              0x81-0xFE
-  second byte range                             0x40-0x7E, 0x80-0xFE
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  ASCII                                         0x21-0x7E
-
-This same encoding specification is shared by all of IBM's CJK
-character sets, namely for Japanese, Simplified Chinese, Traditional
-Chinese, and Korean.
-	DBCS-PC encoding for Japanese, although conforming to the
-above encoding specifications, actually uses the same encoding
-specifications for Shift-JIS, to include the full user-defined range
-(see Section 3.3.1 for more details on Shift-JIS encoding). One big
-accommodation is the half-width katakana range, namely 0xA1 through
-0xDF. Further, the DBCS-PC code space that is outside the Shift-JIS
-specification is unused.
-	DBCS-PC encoding for Korean uses the equivalent of EUC code
-set 1 code points (0xA1A1 through 0xFEFE) for those characters that
-are common with KS C 5601-1992. Those characters that are not common
-with KS C 5601-1992, namely IBM's extensions, are within the DBCS-PC
-encoding space, but outside EUC encoding space (0x9A through 0xA0).
-Many hanja and pre-combined hangul are part of IBM's Korean extension.
-	Note that DBCS-PC is sort of useless without a corresponding
-SBCS (Single-Byte Character Set) for the one-byte range. Mixing DBCS
-and SBCS results in a MBCS (Multiple-Byte Character Set). How these
-are mixed to form MBCSs is detailed in Section 3.4.
-
-
-3.3.16: IBM DBCS-/TBCS-EUC
-
-	IBM has also developed DBCS-EUC and TBCS-EUC encodings. TBCS
-stands for Triple-Byte Character Set. These essentially follow the EUC
-encoding specifications, and were developed for use with IBM's AIX
-(Advanced Interactive Executive) operating system, which is
-UNIX-based.
-	Refer to Section 3.2 for all the details on EUC encoding.
-
-
-3.3.17: UNIFIED HANGUL CODE
-
-	Microsoft has developed what is called "Unified Hangul Code"
-(UHC) for its Windows 95 operating system (this was also known as
-"Extended Wansung"). It is the optional, not standard, character set
-of Win95K.
-	UHC provides full compatibility with KS C 5601-1992 EUC
-encoding (see Section 3.2.4), but adds additional encoding ranges for
-holding additional pre-combined hangul (more precisely, the 8,822 that
-are needed to fully support the Johab character set). The following is
-a table that provides the encoding ranges for UHC encoding:
-
-  Two-byte Standard Characters                  Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte range                              0x81-0xFE
-  second byte ranges                            0x41-0x5A, 0x61-0x7A,
-                                                and 0x81-0xFE
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  ASCII                                         0x21-0x7E
-
-Note that 0xA1A1 through 0xFEFE in the above encoding is still
-identical, in terms of character-to-code allocation, with KS C 5601-
-1992 in EUC encoding.
-	Appendix G (pp 345-406) of "Developing International Software
-for Windows 95 and Windows NT" by Nadine Kano illustrates the KS C
-5601-1992 character set standard plus these Microsoft extensions
-(8,822 pre-combined hangul) by UHC code (Microsoft calls this Code
-Page 949).
-
-
-3.3.18: TRON CODE
-
-	TRON (The Real-time Operating system Nucleus) is an OS
-developed in Japan some time ago. Personal Media Corporation has done
-work to develop BTRON (Business TRON), which is unique in that it is
-the only commercially-available OS that supports JIS X 0212-1990.
-	TRON Code provides a one- and two-byte encoding space and a
-method for switching between them.
-	The following is how the two-byte space in TRON Code is
-allocated:
-
-  A-Zone (8,836 characters; JIS X 0208-1990)    Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^
-  first byte range                              0x21-0x7E
-  second byte range                             0x21-0x7E
-
-  B-Zone (11,844 characters; JIS X 0212-1990)   Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^^^^^^^
-  first byte range                              0x80-0xFD
-  second byte range                             0x21-0x7E
-
-  C-Zone (11,844 characters; unassigned)        Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^^^^^
-  first byte range                              0x21-0x7E
-  second byte range                             0x80-0xFD
-
-  D-Zone (15,876 characters; unassigned)        Encoding Range
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^^^^^
-  first byte range                              0x80-0xFD
-  second byte range                             0x80-0xFD
-
-Note how the B-Zone is larger that the conventional 94-by-94
-matrix. In fact, the JIS X 0212-1990 portion of the B-Zone is
-restricted to 0xA121-0xFD7E (93-by-94 matrix -- 0xFE as a first-byte
-value is unavailable, and you will see why in a minute).
-	TRON Code implements "language specifying codes" consisting of
-two bytes as follows:
-
-  Two-byte Japanese                             0xFE21
-  One-byte English                              0xFE80
-
-0xFE21 in a one-byte stream invokes two-byte Japanese mode, and 0xFE80
-in a two-byte stream invokes one-byte English mode.
-	The following is the one-byte encoding range for TRON Code:
-
-  One-byte Characters                           0x21-0x7E and 0x80-0xFD
-
-Control codes are in 0x00-0x20 and 0x7F (the usual ASCII control code
-range). Also, 0xA0 is reserved as a fixed-width space character.
-
-
-3.3.19: GBK
-
-	GBK is an extension to GB 2312-80 that adds all ISO 10646-
-1:1993 (GB 13000.1-93) hanzi not already in GB 2312-80. GBK is defined
-as a normative annex of GB 13000.1-93 (see Section 2.2.10). The "K" in
-"GBK" is the first sound in the Chinese word meaning "extension" (read
-"Kuo Zhan").
-	GBK is divided into five levels as follows:
-
-  Level  Encoded Range  Total Code Points  Total Encoded Characters
-  ^^^^^  ^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^
-  GBK/1  0xA1A1-0xA9FE    846                717
-  GBK/2  0xB0A1-0xF7FE  6,768              6,763
-  GBK/3  0x8140-0xA0FE  6,080              6,080
-  GBK/4  0xAA40-0xFEA0  8,160              8,160
-  GBK/5  0xA840-0xA9A0    192                166
-
-	There are also 1,894 user-defined code points as follows:
-
-  Encoded Range  Total Code Points
-  ^^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^
-  0xAAA1-0xAFFE  564
-  0xF8A1-0xFEFE  658
-  0xA140-0xA7A0  672
-
-	GBK thus provides a total of 23,940 code points, 21,886 of
-which are assigned.
-	Each "row" in the GBK code table consists of 190 characters.
-The following describes the encoding ranges of GBK in detail:
-
-  Two-byte Standard Characters                  Encoding Ranges
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^
-  first byte range                              0x81-0xFE
-  second byte ranges                            0x40-0x7E and 0x80-0xFE
-
-  One-byte Characters                           Encoding Range
-  ^^^^^^^^^^^^^^^^^^^                           ^^^^^^^^^^^^^^
-  ASCII                                         0x21-0x7E
-
-Note that the sub-range 0xA1A1-0xFEFE in the above encoding is still
-identical, in terms of character-to-code allocation, with GB 2312-80
-in EUC encoding. GBK is therefore backward-compatible with GB 2312-80
-and forward-compatible with ISO 10646-1:1993.
-	GBK is the standard character set and encoding for the
-Simplified Chinese version of Windows 95.
-
-
-3.4: CJK CODE PAGES
-
-	Many times one reads about references to "Code Pages" in
-material about CJK (and other) character sets and encodings. These are
-not literal pages, but rather references to a character set and
-encoding combination. In the case of CJK Code Pages, they definitely
-comprise more than one page!
-	Microsoft refers to its supported CJK character sets and
-encodings through such Code Page designations. The following is a
-listing of several Microsoft CJK Code Pages along with their
-characteristics:
-
-  Code Page  Characteristics
-  ^^^^^^^^^  ^^^^^^^^^^^^^^^
-  932        JIS X 0208-1990 base, Shift-JIS encoding, Microsoft
-             extensions (NEC Row 13 and IBM select characters in
-             redundantly encoded in Rows 89 through 92 and Rows 115
-             through 119)
-  936        GB 2312-80 base, EUC encoding
-  949        KS C 5601-1992 base, Unified Hangul Code encoding,
-             remaining 8,822 pre-combined hangul as extension (all of
-             this is referred to as Unified Hangul Code)
-  950        Big Five base, Big Five encoding, Microsoft extensions
-             (actually, the ETen extensions of Row 89)
-  1361       Johab base, Johab encoding
-
-	IBM also uses Code Page designations, and, in fact, some
-designations (and associated characteristics) are nearly identical to
-those in the above table, most notably, Code Pages 932 and 936. IBM's
-Code Page 932 does not include NEC Row 13 or IBM select characters in
-Rows 89 through 92.
-	The best way to describe IBM Code Page designations is by
-first listing the SBCS (Single-Byte Character Set) and DBCS (Double-
-Byte Character Set) Code Page designations (those designated by "Host"
-use EBCDIC-based encodings):
-
-  IBM SBCS Code Page          Characteristics
-  ^^^^^^^^^^^^^^^^^^          ^^^^^^^^^^^^^^^
-  37 (US)                     SBCS-Host
-  290 (Japanese)              SBCS-Host
-  833 (Korean)                SBCS-Host
-  836 (Simplified Chinese)    SBCS-Host
-  891 (Korean)                SBCS-PC
-  897 (Japanese)              SBCS-PC
-  903 (Simplified Chinese)    SBCS-PC
-  904 (Traditional Chinese)   SBCS-PC
-
-  IBM DBCS Code Page          Characteristics
-  ^^^^^^^^^^^^^^^^^^          ^^^^^^^^^^^^^^^
-  300 (Japanese)              DBCS-Host
-  301 (Japanese)              DBCS-PC
-  834 (Korean)                DBCS-Host
-  835 (Traditional Chinese)   DBCS-Host
-  837 (Simplified Chinese)    DBCS-Host
-  926 (Korean)                DBCS-PC
-  927 (Traditional Chinese)   DBCS-PC
-  928 (Simplified Chinese)    DBCS-PC
-
-So far there appears to be no relationship with Microsoft's CJK Code
-Pages, but when we combine the above SBCS and DBCS Code Pages into
-MBCS (Multiple-Byte Character Set) Code Pages, things become a bit
-more revealing:
-
-  IBM MBCS Code Page          Characteristics
-  ^^^^^^^^^^^^^^^^^^          ^^^^^^^^^^^^^^^
-  930 (Japanese)              MBCS-Host (Code Pages 300 and 290)
-  932 (Japanese)              MBCS-PC (Code Pages 301 and 897)
-  933 (Korean)                MBCS-Host (Code Pages 834 and 833)
-  934 (Korean)                MBCS-PC (Code Pages 926 and 891)
-  938 (Traditional Chinese)   MBCS-PC (Code Pages 927 and 904)
-  936 (Simplified Chinese)    MBCS-PC (Code Pages 928 and 903)
-  5031 (Simplified Chinese)   MBCS-Host (Code Pages 837 and 836)
-  5033 (Traditional Chinese)  MBCS-Host (Code Pages 835 and 37)
-
-So, you can now see that many of Microsoft's CJK Code Pages are
-derived from those established by IBM.
-	More detailed information on the encoding specifications for
-DBCS-Host and DBCS-PC can be found in Sections 3.3.14 and 3.3.15,
-respectively.
-
-
-PART 4: CJK CHARACTER SET COMPATIBILITY ISSUES
-
-	The sections below provide detailed information about
-compatibility issues between CJK character sets, to include tidbits of
-useful information.
-	One thing to mention first is that conversion to and from
-IBM's DBCS-Host (Section 3.3.14) and DBCS-PC (Section 3.3.15)
-encodings is table-driven, and fully documented in the following IBM
-publication:
-
-o IBM Corporation. "Character Data Representation Architecture - Level
-  2, Registry." 1993. IBM order number SC09-1391-01.
-
-Unfortunately, the CJK-related tables are not supplied in machine-
-readable format, and must be obtained from IBM directly. The only real
-compatibility issue is trying to obtain the conversion tables from
-IBM.
-
-
-4.1: JAPANESE
-
-	In general, when a Japanese character set was revised,
-characters were simply added (usually appended at the end). However,
-when JIS C 6226-1978 was revised in 1983 (to become JIS X 0208-1983),
-a bit more happened (this is still a controversy).
-	A detailed treatment of the two main transitions, JIS C 6226-
-1978 to JIS X 0208-1983 and JIS X 0208-1983 to JIS X 0208-1990, is
-covered in Appendix J of UJIP. I provide machine-readable files that
-detail these transitions at the following URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/AppJ/
-
-	An interesting side note here is that there is a reason why
-there are many lists that illustrate JIS C 6226-1978 and JIS X 0208-
-1983 kanji form differences. While most share the same basic set of
-changes, there are some inconsistencies. Well, it turns out that JIS C
-6226-1978 had ten printings, and not all of them shared the same kanji
-forms. If comparisons between JIS C 6226-1978 and JIS X 0208-1983 were
-made using different printings of the JIS C 6226-1978 manual, the
-results can differ slightly.
-	There are also interesting correspondences between JIS X
-0208-1990 and JIS X 0212-1990. 28 kanji that vanished during the JIS C
-6226-1978 to JIS X 0208-1983 transition (they were replaced by
-simplified versions) were restored in JIS X 0212-1990 (at totally
-different code points). Appendix J of UJIP discusses this, and a file
-at the following URL details the 28 mappings:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/AppJ/TJ2.jis
-
-
-4.2: CHINESE (PRC)
-
-	The basic PRC standard, GB 2312-80, has been revised, but not
-through a later version of the standard. Instead, the revisions were
-carried out in the form of three other documents. Specifically, they
-are (in order of publication):
-
-o GB 6345.1-86 (see Section 2.2.3)
-o GB 8565.2-88 (see Section 2.2.6)
-o GB/T 12345-90 (see Section 2.2.7)
-
-Unless you are aware of these documents, figuring out what has been
-corrected or added to GB 2312-80 is nearly impossible.
-
-
-4.3: CHINESE (TAIWAN)
-
-	The first question people think of with regard to Big Five and
-CNS 11643-1992 is compatibility. It turns out that Planes 1 and 2 of
-CNS 11643-1992 are more or less equivalent to Big Five, but a handful
-of hanzi are in a different order. The following tables detail the
-mapping from Big Five (with the ETen extension) to CNS 11643-1992
-(when using this conversion table, keep in mind the encoding space
-ranges for both Big Five and CNS 11643-1992):
-
-Big Five Level 1 Correspondence to CNS 11643-1992 Plane 1:
-
-  0xA140-0xA1F5 <-> 0x2121-0x2256
-         0xA1F6 <-> 0x2258
-         0xA1F7 <-> 0x2257
-  0xA1F8-0xA2AE <-> 0x2259-0x234E
-  0xA2AF-0xA3BF <-> 0x2421-0x2570
-  0xA3C0-0xA3E0 <-> 0x4221-0x4241  # Symbols for control characters
-  0xA440-0xACFD <-> 0x4421-0x5322  # Level 1 Hanzi BEGIN
-         0xACFE <-> 0x5753
-  0xAD40-0xAFCF <-> 0x5323-0x5752
-  0xAFD0-0xBBC7 <-> 0x5754-0x6B4F
-  0xBBC8-0xBE51 <-> 0x6B51-0x6F5B
-         0xBE52 <-> 0x6B50
-  0xBE53-0xC1AA <-> 0x6F5C-0x7534
-  0xC1AB-0xC2CA <-> 0x7536-0x7736
-         0xC2CB <-> 0x7535
-  0xC2CC-0xC360 <-> 0x7737-0x782C
-  0xC361-0xC3B8 <-> 0x782E-0x7863
-         0xC3B9 <-> 0x7865
-         0xC3BA <-> 0x7864
-  0xC3BB-0xC455 <-> 0x7866-0x7961
-         0xC456 <-> 0x782D
-  0xC457-0xC67E <-> 0x7962-0x7D4B  # Level 1 Hanzi END
-  0xC6A1-0xC6AA <-> 0x2621-0x262A  # Circled numerals
-  0xC6AB-0xC6B4 <-> 0x262B-0x2634  # Parenthesized numerals
-  0xC6B5-0xC6BE <-> 0x2635-0x263E  # Lowercase Roman numerals
-  0xC6BF-0xC6C0 <-> 0x2723-0x2724  # 213 radicals BEGIN
-  0xC6C1-0xC6C2 <-> 0x2726, 0x2728
-  0xC6C3-0xC6C5 <-> 0x272D-0x272F
-  0xC6C6-0xC6C7 <-> 0x2734, 0x2737
-  0xC6C8-0xC6C9 <-> 0x273A, 0x273C
-  0xC6CA-0xC6CB <-> 0x2742, 0x2747
-  0xC6CC-0xC6CD <-> 0x274E, 0x2753
-  0xC6CE-0xC6CF <-> 0x2754-0x2755
-  0xC6D0-0xC6D1 <-> 0x2759-0x275A
-  0xC6D2-0xC6D3 <-> 0x2761, 0x2766
-  0xC6D4-0xC6D5 <-> 0x2829-0x282A
-  0xC6D6-0xC6D7 <-> 0x2863, 0x286C # 213 radicals END
-  0xC6D8-0xC6E6  -> ******         # Japanese symbols
-  0xC6E7-0xC77A  -> ******         # Hiragana
-  0xC77B-0xC7F2  -> ******         # Katakana
-  0xC7F3-0xC875  -> ******         # Cyrillic alphabet
-  0xC876-0xC878  -> ******         # Symbols
-         0xC87A  -> ******         # Hanzi element
-         0xC87C  -> ******         # Hanzi element
-  0xC87E-0xC8A1  -> ******         # Hanzi elements
-  0xC8A3-0xC8A4  -> ******         # Hanzi elements
-  0xC8A5-0xC8CC  -> ******         # Combined numerals
-  0xC8CD-0xC8D3  -> ******         # Japanese symbols
-
-Big Five Level 1 Correspondences to CNS 11643-1992 Plane 4:
-
-         0xC879 <-> 0x2123         # Hanzi element
-         0xC87B <-> 0x2124         # Hanzi element
-         0xC87D <-> 0x212A         # Hanzi element
-         0xC8A2 <-> 0x2152         # Hanzi element
-
-Big Five Level 2 Correspondence to CNS 11643-1992 Plane 1:
-
-         0xC94A  -> 0x4442         # duplicate of 0xA461
-
-Big Five Level 2 Correspondences to CNS 11643-1992 Plane 2:
-
-  0xC940-0xC949 <-> 0x2121-0x212A  # Level 2 Hanzi BEGIN
-  0xC94B-0xC96B <-> 0x212B-0x214B
-  0xC96C-0xC9BD <-> 0x214D-0x217C
-         0xC9BE <-> 0x214C
-  0xC9BF-0xC9EC <-> 0x217D-0x224C
-  0xC9ED-0xCAF6 <-> 0x224E-0x2438
-         0xCAF7 <-> 0x224D
-  0xCAF8-0xD6CB <-> 0x2439-0x376E
-         0xD6CC <-> 0x3E63
-  0xD6CD-0xD779 <-> 0x3770-0x387D
-         0xD77A <-> 0x3F6A
-  0xD77B-0xDADE <-> 0x387E-0x3E62
-         0xDADF <-> 0x376F
-  0xDAE0-0xDBA6 <-> 0x3E64-0x3F69
-  0xDBA7-0xDDFB <-> 0x3F6B-0x4423
-         0xDDFC  -> 0x4176         # duplicate of 0xDCD1
-  0xDDFD-0xE8A2 <-> 0x4424-0x554A
-  0xE8A3-0xE975 <-> 0x554C-0x5721
-  0xE976-0xEB5A <-> 0x5723-0x5A27
-  0xEB5B-0xEBF0 <-> 0x5A29-0x5B3E
-         0xEBF1 <-> 0x554B
-  0xEBF2-0xECDD <-> 0x5B3F-0x5C69
-         0xECDE <-> 0x5722
-  0xECDF-0xEDA9 <-> 0x5C6A-0x5D73
-  0xEDAA-0xEEEA <-> 0x5D75-0x6038
-         0xEEEB <-> 0x642F
-  0xEEEC-0xF055 <-> 0x6039-0x6242
-         0xF056 <-> 0x5D74
-  0xF057-0xF0CA <-> 0x6243-0x6336
-         0xF0CB <-> 0x5A28
-  0xF0CC-0xF162 <-> 0x6337-0x642E
-  0xF163-0xF16A <-> 0x6430-0x6437
-         0xF16B <-> 0x6761
-  0xF16C-0xF267 <-> 0x6438-0x6572
-         0xF268 <-> 0x6934
-  0xF269-0xF2C2 <-> 0x6573-0x664C
-  0xF2C3-0xF374 <-> 0x664E-0x6760
-  0xF375-0xF465 <-> 0x6762-0x6933
-  0xF466-0xF4B4 <-> 0x6935-0x6961
-         0xF4B5 <-> 0x664D
-  0xF4B6-0xF4FC <-> 0x6962-0x6A4A
-  0xF4FD-0xF662 <-> 0x6A4C-0x6C51
-         0xF663 <-> 0x6A4B
-  0xF664-0xF976 <-> 0x6C52-0x7165
-  0xF977-0xF9C3 <-> 0x7167-0x7233
-         0xF9C4 <-> 0x7166
-         0xF9C5 <-> 0x7234
-         0xF9C6 <-> 0x7240
-  0xF9C7-0xF9D1 <-> 0x7235-0x723F
-  0xF9D2-0xF9D5 <-> 0x7241-0x7244  # Level 2 Hanzi END
-  0xF9DD-0xF9FE  -> ******         # Symbols
-
-Big Five Level 2 Correspondence to CNS 11643-1992 Plane 3:
-
-         0xF9D6 <-> 0x4337         # ETen-specific hanzi
-         0xF9D7 <-> 0x4F50         # ETen-specific hanzi
-         0xF9D8 <-> 0x444E         # ETen-specific hanzi
-         0xF9D9 <-> 0x504A         # ETen-specific hanzi
-         0xF9DA <-> 0x2C5D         # ETen-specific hanzi
-         0xF9DB <-> 0x3D7E         # ETen-specific hanzi
-         0xF9DC <-> 0x4B5C         # ETen-specific hanzi
-
-I adapted the above from material Ross Paterson (rap@doc.ic.ac.uk)
-kindly made available at the following URL:
-
-  http://www.ifcss.org:8001/www/pub/software/info/cjk-codes/
-
-Check it out. Basically, I just changed the CNS 11643-1992 codes from
-decimal row-cell values to hexadecimal codes, and corrected the
-mappings to correspond to ETen's Big Five (which is considered to be
-the most standard).
-	It turns out that corrections were made to Big Five (at least
-in the ETen and Microsoft implementations thereof) which made it a bit
-closer to CNS 11643-1992 as far as character ordering is concerned.
-The following six lines of code correspondences:
-
-  0xCAF8-0xD6CB <-> 0x2439-0x376E
-         0xD6CC <-> 0x3E63
-  0xD6CD-0xD779 <-> 0x3770-0x387D
-         0xD77A <-> 0x3F6A
-  0xD77B-0xDADE <-> 0x387E-0x3E62
-         0xDADF <-> 0x376F
-
-can now be expressed as the following three lines:
-
-  0xCAF8-0xD779 <-> 0x2439-0x387D
-         0xD77A <-> 0x3F6A
-  0xD77B-0xDBA6 <-> 0x387E-0x3F69
-
-In essence, the ordering of Big Five characters 0xD6CC and 0xDADF were
-reversed. This resulted in the same order as found in CNS 11643-1992
-Plane 2.
-	As for the two duplicate hanzi in Big Five (as indicated in
-the above tables), they have been placed into a compatibility zone in
-ISO 10646-1:1993 (this allows for round-trip conversion). The mapping
-is as follows:
-
-  Big Five  ISO 10646-1:1993
-  ^^^^^^^^  ^^^^^^^^^^^^^^^^
-  0xC94A -> 0xFA0C
-  0xDDFC -> 0xFA0D
-
-	Speaking of duplicate hanzi, Plane 1 of CNS 11643-1992
-contains 213 classical radicals in rows 27 through 29. However, 187 of
-them map directly to hanzi code points in Planes 1, 2, and 3 (and
-naturally to Big Five). Below is a detailed mapping of these 213
-radicals:
-
-  Radical   CNS 11643   Big Five    Radical   CNS 11643   Big Five
-  ^^^^^^^   ^^^^^^^^^   ^^^^^^^^    ^^^^^^^   ^^^^^^^^^   ^^^^^^^^
-  0x2721 -> 0x4421      0xA440      0x282E -> 0x4678      0xA5D8
-  0x2722 -> 0x2121 (3)  ******      0x282F -> 0x4679      0xA5D9
-  0x2723 -> 0x2122 (3)  0xC6BF      0x2830 -> 0x467A      0xA5DA
-  0x2724 -> 0x2123 (3)	0xC6C0      0x2831 -> 0x467B      0xA5DB
-  0x2725 -> 0x4422      0xA441      0x2832 -> 0x467C      0xA5DC
-  0x2726 -> 0x2124 (3)	0xC6C1      0x2833 -> 0x2167 (2)  0xC9A8
-  0x2727 -> 0x4428      0xA447      0x2834 -> 0x467D      0xA5DD
-  0x2728 -> ******	0xC6C2      0x2835 -> 0x467E      0xA5DE
-  0x2729 -> 0x4429      0xA448      0x2836 -> 0x4721      0xA5DF
-  0x272A -> 0x442A      0xA449      0x2837 -> 0x484C      0xA6CB
-  0x272B -> 0x442B      0xA44A      0x2838 -> 0x484D      0xA6CC
-  0x272C -> 0x442C      0xA44B      0x2839 -> 0x484E      0xA6CD
-  0x272D -> 0x2127 (3)	0xC6C3      0x283A -> 0x484F      0xA6CE
-  0x272E -> 0x2128 (3)	0xC6C4      0x283B -> 0x2269 (2)  0xCA49
-  0x272F -> ******	0xC6C5      0x283C -> 0x4850      0xA6CF
-  0x2730 -> 0x442D      0xA44C      0x283D -> 0x4851      0xA6D0
-  0x2731 -> 0x2123 (2)  0xC942      0x283E -> 0x4852      0xA6D1
-  0x2732 -> 0x442E      0xA44D      0x283F -> 0x4854      0xA6D3
-  0x2733 -> 0x4430      0xA44F      0x2840 -> 0x4855      0xA6D4
-  0x2734 -> ******      0xC6C6      0x2841 -> 0x4856      0xA6D5
-  0x2735 -> 0x4431      0xA450      0x2842 -> 0x4857      0xA6D6
-  0x2736 -> 0x2124 (2)  0xC943      0x2843 -> 0x4858      0xA6D7
-  0x2737 -> 0x2129 (3)  0xC6C7      0x2844 -> 0x485B      0xA6DA
-  0x2738 -> 0x4432      0xA451      0x2845 -> 0x485C      0xA6DB
-  0x2739 -> 0x4433      0xA452      0x2846 -> 0x485D      0xA6DC
-  0x273A -> 0x212A (3)  0xC6C8      0x2847 -> 0x485E      0xA6DD
-  0x273B -> 0x2125 (2)  0xC944      0x2848 -> 0x485F      0xA6DE
-  0x273C -> 0x212B (3)  0xC6C9      0x2849 -> 0x4860      0xA6DF
-  0x273D -> 0x4434      0xA453      0x284A -> 0x4861      0xA6E0
-  0x273E -> 0x4447      0xA466      0x284B -> 0x4862      0xA6E1
-  0x273F -> 0x212A (2)  0xC949      0x284C -> 0x4863      0xA6E2
-  0x2740 -> 0x4448      0xA467      0x284D -> 0x226A (2)  0xCA4A
-  0x2741 -> 0x4449      0xA468      0x284E -> 0x226F (2)  0xCA4F
-  0x2742 -> 0x213A (3)  0xC6CA      0x284F -> 0x4865      0xA6E4
-  0x2743 -> 0x444A      0xA469      0x2850 -> 0x4866      0xA6E5
-  0x2744 -> 0x444B      0xA46A      0x2851 -> 0x4867      0xA6E6
-  0x2745 -> 0x444C      0xA46B      0x2852 -> 0x4868      0xA6E7
-  0x2746 -> 0x444D      0xA46C      0x2853 -> 0x2270 (2)  0xCA50
-  0x2747 -> 0x213B (3)  0xC6CB      0x2854 -> 0x4B44      0xA8A3
-  0x2748 -> 0x4450      0xA46F      0x2855 -> 0x4B45      0xA8A4
-  0x2749 -> 0x4451      0xA470      0x2856 -> 0x4B46      0xA8A5
-  0x274A -> 0x4452      0xA471      0x2857 -> 0x4B47      0xA8A6
-  0x274B -> 0x4453      0xA472      0x2858 -> 0x4B48      0xA8A7
-  0x274C -> 0x212B (2)  0xC94B      0x2859 -> 0x4B49      0xA8A8
-  0x274D -> 0x4454      0xA473      0x285A -> 0x2524 (2)  0xCBA4
-  0x274E -> 0x213C (3)  0xC6CC      0x285B -> 0x4B4A      0xA8A9
-  0x274F -> 0x4456      0xA475      0x285C -> 0x4B4B      0xA8AA
-  0x2750 -> 0x4457      0xA476      0x285D -> 0x4B4C      0xA8AB
-  0x2751 -> 0x445A      0xA479      0x285E -> 0x4B4D      0xA8AC
-  0x2752 -> 0x445B      0xA47A      0x285F -> 0x4B4E      0xA8AD
-  0x2753 -> 0x213D (3)  0xC6CD      0x2860 -> 0x4B4F      0xA8AE
-  0x2754 -> 0x213E (3)  0xC6CE      0x2861 -> 0x4B50      0xA8AF
-  0x2755 -> 0x213F (3)  0xC6CF      0x2862 -> 0x4B51      0xA8B0
-  0x2756 -> 0x445C      0xA47B      0x2863 -> 0x272F (3)  0xC6D6
-  0x2757 -> 0x445D      0xA47C      0x2864 -> 0x4B57      0xA8B6
-  0x2758 -> 0x445E      0xA47D      0x2865 -> 0x4B5C      0xA8BB
-  0x2759 -> 0x2140 (3)  0xC6D0      0x2866 -> 0x4B5D      0xA8BC
-  0x275A -> 0x2142 (3)  0xC6D1      0x2867 -> 0x4B5E      0xA8BD
-  0x275B -> 0x212C (2)  0xC94C      0x2868 -> 0x4F5A      0xAAF7
-  0x275C -> 0x4540      0xA4DF      0x2869 -> 0x4F5B      0xAAF8
-  0x275D -> 0x4541      0xA4E0      0x286A -> 0x4F5C      0xAAF9
-  0x275E -> 0x4542      0xA4E1      0x286B -> 0x4F5D      0xAAFA
-  0x275F -> 0x4543      0xA4E2      0x286C -> 0x2A7D (3)  0xC6D7
-  0x2760 -> 0x4545      0xA4E4      0x286D -> 0x4F63      0xAB41
-  0x2761 -> 0x2167 (3)  0xC6D2      0x286E -> 0x4F64      0xAB42
-  0x2762 -> 0x4546      0xA4E5      0x286F -> 0x4F65      0xAB43
-  0x2763 -> 0x4547      0xA4E6      0x2870 -> 0x4F66      0xAB44
-  0x2764 -> 0x4548      0xA4E7      0x2871 -> 0x5372      0xADB1
-  0x2765 -> 0x4549      0xA4E8      0x2872 -> 0x5373      0xADB2
-  0x2766 -> 0x2169 (3)  0xC6D3      0x2873 -> 0x5374      0xADB3
-  0x2767 -> 0x454A      0xA4E9      0x2874 -> 0x5375      0xADB4
-  0x2768 -> 0x454B      0xA4EA      0x2875 -> 0x5376      0xADB5
-  0x2769 -> 0x454C      0xA4EB      0x2876 -> 0x5377      0xADB6
-  0x276A -> 0x454D      0xA4EC      0x2877 -> 0x5378      0xADB7
-  0x276B -> 0x454E      0xA4ED      0x2878 -> 0x5379      0xADB8
-  0x276C -> 0x454F      0xA4EE      0x2879 -> 0x537A      0xADB9
-  0x276D -> 0x4550      0xA4EF      0x287A -> 0x537B      0xADBA
-  0x276E -> 0x213F (2)  0xC95F      0x287B -> 0x537C      0xADBB
-  0x276F -> 0x4551      0xA4F0      0x287C -> 0x586B      0xB0A8
-  0x2770 -> 0x4552      0xA4F1      0x287D -> 0x586C      0xB0A9
-  0x2771 -> 0x4553      0xA4F2      0x287E -> 0x586D      0xB0AA
-  0x2772 -> 0x4554      0xA4F3      0x2921 -> 0x334C (2)  0xD449
-  0x2773 -> 0x2141 (2)  0xC961      0x2922 -> 0x586E      0xB0AB
-  0x2774 -> 0x4555      0xA4F4      0x2923 -> 0x334D (2)  0xD44A
-  0x2775 -> 0x4556      0xA4F5      0x2924 -> 0x586F      0xB0AC
-  0x2776 -> 0x4557      0xA4F6      0x2925 -> 0x5870      0xB0AD
-  0x2777 -> 0x4558      0xA4F7      0x2926 -> 0x5E23      0xB3BD
-  0x2778 -> 0x4559      0xA4F8      0x2927 -> 0x5E24      0xB3BE
-  0x2779 -> 0x2142 (2)  0xC962      0x2928 -> 0x5E25      0xB3BF
-  0x277A -> 0x455A      0xA4F9      0x2929 -> 0x5E26      0xB3C0
-  0x277B -> 0x455B      0xA4FA      0x292A -> 0x5E27      0xB3C1
-  0x277C -> 0x455C      0xA4FB      0x292B -> 0x5E28      0xB3C2
-  0x277D -> 0x455D      0xA4FC      0x292C -> 0x6327      0xB6C0
-  0x277E -> 0x4668      0xA5C8      0x292D -> 0x6328      0xB6C1
-  0x2821 -> 0x4669      0xA5C9      0x292E -> 0x6329      0xB6C2
-  0x2822 -> 0x466A      0xA5CA      0x292F -> 0x4155 (2)  0xDCB0
-  0x2823 -> 0x466B      0xA5CB      0x2930 -> 0x4875 (2)  0xE0EF
-  0x2824 -> 0x466C      0xA5CC      0x2931 -> 0x676F      0xB9A9
-  0x2825 -> 0x466D      0xA5CD      0x2932 -> 0x6770      0xB9AA
-  0x2826 -> 0x466E      0xA5CE      0x2933 -> 0x6771      0xB9AB
-  0x2827 -> 0x4670      0xA5D0      0x2934 -> 0x6B7C      0xBBF3
-  0x2828 -> 0x4674      0xA5D4      0x2935 -> 0x6B7D      0xBBF4
-  0x2829 -> 0x225B (3)  0xC6D4      0x2936 -> 0x702F      0xBEA6
-  0x282A -> 0x225C (3)  0xC6D5      0x2937 -> 0x733E      0xC073
-  0x282B -> 0x4675      0xA5D5      0x2938 -> 0x733F      0xC074
-  0x282C -> 0x4676      0xA5D6      0x2939 -> 0x6142 (2)  0xEFB6
-  0x282D -> 0x4677      0xA5D7
-
-
-4.4: KOREAN
-
-	The 268 duplicate hanja in KS C 5601-1992 can cause problems
-when converting to and from other CJK character sets. When converting
-from KS C 5601-1992, two or more hanja can collapse into a single code
-point. When converting these 268 hanja to KS C 5601-1992, a decision
-about which KS C 5601-1992 code point to map to must be made. The only
-exception to this is mapping to and from ISO 10646-1:1993. That
-standard encodes these 268 duplicate hanja in a compatibility zone,
-namely from 0xF900 through 0xFA0B.
-	The following is a listing of 262 hanja that map to two or
-more code points (four map to three code points, and one maps to four:
-a total of 268 redundantly-encoded hanja) in KS C 5601-1992:
-
-  Standard  Extra     Standard  Extra     Standard  Extra
-  ^^^^^^^^  ^^^^^     ^^^^^^^^  ^^^^^     ^^^^^^^^  ^^^^^
-  0x4A39 -> 0x4D4F    0x5573 -> 0x6631    0x573C -> 0x6B29
-  0x4B3D -> 0x7A22    0x5574 -> 0x6633    0x573E -> 0x6B3A
-  0x4C38 -> 0x7A66    0x5575 -> 0x6637    0x573F -> 0x6B3B
-  0x4C5A -> 0x4B56    0x5576 -> 0x6638    0x5740 -> 0x6B3D
-  0x4C78 -> 0x5050    0x5579 -> 0x663C    0x5741 -> 0x6B41
-  0x4D7A -> 0x4E2D    0x557B -> 0x6646    0x5743 -> 0x6B42
-  0x4E29 -> 0x7C29    0x557C -> 0x6647    0x5744 -> 0x6B46
-  0x4F23 -> 0x4F7B    0x557E -> 0x6652    0x5745 -> 0x6B47
-  0x4F4F -> 0x5022    0x5621 -> 0x6656    0x5747 -> 0x6B4C
-            0x5038    0x5622 -> 0x6659    0x5748 -> 0x6B4F
-  0x5142 -> 0x4B50    0x5623 -> 0x665F    0x5749 -> 0x6B50
-  0x5151 -> 0x505D    0x5624 -> 0x6661    0x574A -> 0x6B51
-  0x5159 -> 0x547C    0x5625 -> 0x6665    0x574C -> 0x6B58
-  0x5167 -> 0x552B    0x5626 -> 0x6664    0x574D -> 0x5270
-  0x522F -> 0x5155    0x5627 -> 0x6666    0x574E -> 0x5271
-  0x5233 -> 0x657C    0x5628 -> 0x6668    0x574F -> 0x5272
-  0x5234 -> 0x6644    0x562A -> 0x666A    0x5750 -> 0x5273
-  0x5235 -> 0x664A    0x562B -> 0x666B    0x5752 -> 0x5274
-  0x5236 -> 0x665C    0x562D -> 0x666F    0x5753 -> 0x5275
-  0x5237 -> 0x6676    0x562E -> 0x6671    0x5754 -> 0x5277
-  0x523A -> 0x6677    0x562F -> 0x6675    0x5755 -> 0x5278
-  0x523B -> 0x5638    0x5631 -> 0x6679    0x5757 -> 0x6C26
-            0x672C    0x5633 -> 0x6721    0x5759 -> 0x6C27
-  0x5241 -> 0x564D    0x5634 -> 0x6726    0x575B -> 0x6C2A
-  0x5263 -> 0x6871    0x5635 -> 0x6729    0x575D -> 0x6C30
-  0x526E -> 0x6A74    0x5637 -> 0x672A    0x575E -> 0x6C31
-  0x526F -> 0x6B2A    0x563A -> 0x672D    0x5762 -> 0x6C35
-  0x527A -> 0x6C32    0x563B -> 0x6730    0x5765 -> 0x6C38
-  0x527B -> 0x6C49    0x563C -> 0x673F    0x5767 -> 0x6C3A
-  0x527C -> 0x6C4A    0x563E -> 0x6746    0x576A -> 0x6C40
-  0x527E -> 0x7331    0x5640 -> 0x6747    0x576B -> 0x6C41
-  0x5321 -> 0x552E    0x5642 -> 0x674B    0x576C -> 0x6C45
-  0x5358 -> 0x7738    0x5643 -> 0x674D    0x576E -> 0x6C46
-  0x536B -> 0x7748    0x5644 -> 0x674F    0x5770 -> 0x6C55
-  0x5378 -> 0x7674    0x5645 -> 0x6750    0x5772 -> 0x6C5D
-  0x5441 -> 0x5466    0x5647 -> 0x6753    0x5773 -> 0x6C5E
-  0x5457 -> 0x7753    0x5649 -> 0x675F    0x5774 -> 0x6C61
-  0x547A -> 0x5154    0x564A -> 0x6764    0x5776 -> 0x6C64
-  0x547B -> 0x5158    0x564B -> 0x6766    0x5777 -> 0x6C67
-  0x547D -> 0x515B    0x564C -> 0x523E    0x5778 -> 0x6C68
-  0x547E -> 0x515C    0x564F -> 0x5242    0x5779 -> 0x6C77
-  0x5521 -> 0x515D    0x5650 -> 0x5243    0x577A -> 0x6C78
-  0x5522 -> 0x515E    0x5653 -> 0x5244    0x577C -> 0x6C7A
-  0x5523 -> 0x515F    0x5654 -> 0x5246    0x5821 -> 0x6D21
-  0x5524 -> 0x5160    0x5655 -> 0x5247    0x5822 -> 0x6D22
-  0x5526 -> 0x5163    0x5656 -> 0x5248    0x5823 -> 0x6D23
-  0x5527 -> 0x5164    0x5657 -> 0x5249    0x5A72 -> 0x5B64
-  0x5528 -> 0x5165    0x5658 -> 0x524A    0x5C56 -> 0x5D25
-  0x552A -> 0x5166    0x565A -> 0x524B    0x5C5F -> 0x7870
-  0x552C -> 0x5168    0x565B -> 0x524D    0x5C74 -> 0x5D55
-  0x552D -> 0x5169    0x565C -> 0x524E    0x5D41 -> 0x5B45
-  0x552F -> 0x516A    0x565E -> 0x524F    0x5F2F -> 0x616D
-  0x5530 -> 0x516B    0x565F -> 0x5250    0x5F52 -> 0x6D6E
-  0x5531 -> 0x516D    0x5660 -> 0x5251    0x5F5D -> 0x5F61
-  0x5534 -> 0x516F    0x5661 -> 0x5252    0x5F63 -> 0x5E7E
-  0x5535 -> 0x5170    0x5662 -> 0x5253    0x6063 -> 0x612D
-  0x5536 -> 0x5172    0x5663 -> 0x5254              0x6672
-  0x5539 -> 0x5176    0x5665 -> 0x5255    0x607D -> 0x5F68
-  0x553D -> 0x517A    0x5666 -> 0x5256    0x6163 -> 0x574B
-  0x5540 -> 0x517C    0x5667 -> 0x5257              0x6B52
-  0x5541 -> 0x517D    0x566B -> 0x5259    0x6226 -> 0x5E7C
-  0x5543 -> 0x517E    0x566C -> 0x525A    0x6326 -> 0x6429
-  0x5544 -> 0x5222    0x566F -> 0x525E    0x635B -> 0x723D
-  0x5545 -> 0x5223    0x5670 -> 0x525F    0x6427 -> 0x727A
-  0x5546 -> 0x5227    0x5671 -> 0x5261    0x6442 -> 0x6777
-  0x5547 -> 0x5228    0x5674 -> 0x5262    0x6445 -> 0x5162
-  0x5548 -> 0x5229    0x5675 -> 0x6867              0x5525
-  0x5549 -> 0x522A    0x5676 -> 0x6868              0x6879
-  0x554D -> 0x522B    0x5677 -> 0x6870    0x6534 -> 0x652E
-  0x554E -> 0x522D    0x5679 -> 0x6877    0x6636 -> 0x6C2F
-  0x5552 -> 0x5232    0x567A -> 0x687B    0x6728 -> 0x6071
-  0x5553 -> 0x6531    0x567B -> 0x687E    0x6856 -> 0x6A41
-  0x5554 -> 0x6532    0x567E -> 0x6927    0x6C36 -> 0x5764
-  0x5555 -> 0x6539    0x5721 -> 0x692C    0x6C56 -> 0x666C
-  0x5557 -> 0x653B    0x5723 -> 0x694C    0x6D29 -> 0x7427
-  0x5558 -> 0x653C    0x5724 -> 0x5264    0x6D33 -> 0x6E5B
-  0x5559 -> 0x6544    0x5726 -> 0x5265    0x6F37 -> 0x746E
-  0x555D -> 0x654E    0x5727 -> 0x5266    0x7263 -> 0x6375
-  0x555E -> 0x6550    0x5728 -> 0x5267    0x7333 -> 0x4B67
-  0x555F -> 0x6552    0x5729 -> 0x5268    0x7351 -> 0x5F33
-  0x5561 -> 0x6556    0x572B -> 0x5269    0x742C -> 0x7676
-  0x5564 -> 0x657A    0x572C -> 0x526A    0x7658 -> 0x6421
-  0x5565 -> 0x657B    0x5730 -> 0x526B    0x7835 -> 0x5C25
-  0x5566 -> 0x657E    0x5731 -> 0x6A65    0x786C -> 0x785B
-  0x5569 -> 0x6621    0x5733 -> 0x6A77    0x7932 -> 0x5D74
-  0x556B -> 0x6624    0x5735 -> 0x6A7C    0x7A3C -> 0x7A21
-  0x556C -> 0x6627    0x5736 -> 0x6A7E    0x7B29 -> 0x6741
-  0x556F -> 0x662D    0x5738 -> 0x6B24    0x7C41 -> 0x4D68
-  0x5571 -> 0x662F    0x573A -> 0x6B27    0x7D3B -> 0x6977
-  0x5572 -> 0x6630
-
-The above table represents a weekend of my time (but time well spent,
-in my opinion).
-
-
-4.5: ISO 10646-1:1993
-
-	The Chinese character subset of ISO 10646-1:1993
-has excellent round-trip conversion capability with the various
-national character sets. Those national character sets with duplicate
-characters, such as KS C 5601-1992 (268 hanja) and Big Five (2 hanzi),
-have corresponding code points in ISO 10646-1:1993 within
-a compatibility zone. See Sections 4.3 and 4.4 for more details.
-	Other issues regarding ISO 10646-1:1993 have to do with proper
-character rendering (that is, how characters are displayed, printed,
-or otherwise imaged). Many (sometimes) subtle character form
-differences have been collapsed under ISO 10646-1:1993. Language or
-locale was not one of the factors used in performing Han Unification.
-This means that it is nearly impossible to create a single ISO 10646-1:
-1993 font that meets the character form criteria of each of the four
-CJK locales. An ISO 10646-1:1993 code point is not enough information
-to render a Chinese character. If the font was specifically designed
-for a single locale, it is a non-problem, but if there is any CJK
-intent, text must be flagged for language or locale.
-
-
-4.6: UNICODE
-
-	One of the most interesting (and major) differences between
-the current three flavors of Unicode are the number and arrangement of
-pre-combined hangul. The following table provides a summary of the
-differences:
-
-  Unicode       Number of Pre-combined Hangul   UCS-2 Ranges
-  ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^   ^^^^^^^^^^^^
-  Version 1.0   2,350 Basic Hangul              0x3400-0x3D3D
-
-  Version 1.1   2,350 Basic Hangul              0x3400-0x3D3D
-                1,930 Supplemental Hangul A     0x3D2E-0x44B7
-                2,376 Supplemental Hangul B     0x44BE-0x4DFF
-
-  Version 2.0  11,172 Hangul                    0xAC00-0xD7A3
-
-Of the above three versions, the most controversial is Version 2.0.
-Why? Because it is located in the user-defined range of Unicode
-(O-Zone: 16,384 code points in 0xA000-0xDFFF), and occupies
-approximately two-thirds of its space.
-	The information in the above table is courtesy of the
-following useful document:
-
-  ftp://unicode.org/pub/MappingTables/EastAsiaMaps/Hangul-Codes.txt
-
-The same file is also mirrored at the following URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/hangul-codes.txt
-
-
-4.7: CODE CONVERSION TIPS
-
-	There are two types of conversions that can be performed. The
-first type is converting between different encodings for the same
-character set. This is usually without problems (but not always). The
-second type is converting from one character set to another (it is not
-usually relevant whether the underlying encoding has changed or not).
-This usually involves the handling of characters that are in one
-character set, but not the other. So, what to do?
-	I suggest JConv for handling Japanese code conversion (this
-means converting between JIS, Shift-JIS, and EUC encodings). This is
-in the category of different encodings for the same character set. The
-following URLs provide executables or source code:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/mac/jconv-30.hqx
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/mac/jconv-dd-181.hqx
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/dos/jconv.exe
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/src/jconv.c
-
-There are other programs available that do the same basic thing as
-JConv, such as kc and nkf. They are available at the following URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/unix/
-
-	For software and tables that handles Chinese code conversion
-(this includes conversion to and from Japanese), I suggest browsing at
-the following URLs:
-
-  ftp://etlport.etl.go.jp/pub/iso-2022-cn/convert/
-  ftp://ftp.ifcss.org/pub/software/dos/convert/
-  ftp://ftp.ifcss.org/pub/software/mac/convert/
-  ftp://ftp.ifcss.org/pub/software/ms-win/convert/
-  ftp://ftp.ifcss.org/pub/software/unix/convert/
-  ftp://ftp.ifcss.org/pub/software/vms/convert/
-  ftp://ftp.net.tsinghua.edu.cn/pub/Chinese/convert/
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/
-  ftp://ftp.seed.net.tw/Pub/Chinese/DOS/code-convert/
-  http://www.yajima.kuis.kyoto-u.ac.jp/staffs/yasuoka/CJK.html
-
-The latter URL has FTP links to tables created by Koichi Yasuoka
-(yasuoka@kudpc.kyoto-u.ac.jp).
-	The following URLs provide utilities or tables for converting
-between various Korean encodings (the last represent the same file):
-
-  ftp://cair-archive.kaist.ac.kr/pub/hangul/code/
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/non-hangul-codes.txt
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/hangul-codes.txt
-  ftp://unicode.org/pub/MappingTables/EastAsiaMaps/Hangul-Codes.txt
-
-A popular Korean code conversion utility seems to be "hcode" by
-June-Yub Lee (jylee@cims.nyu.edu).
-	Finally, the following URLs provide many Unicode- and CJK-
-related mapping tables:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/map/
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/unicode/
-  ftp://unicode.org/pub/MappingTables/
-  http://www.yajima.kuis.kyoto-u.ac.jp/staffs/yasuoka/CJK.html
-
-Note that the official and authoritative Unicode mapping tables (from
-Unicode values to various international, national and vendor
-standards) are maintained by the Unicode Consortium at the following
-URL:
-
-  ftp://unicode.org/pub/MappingTables/
-
-Version 2.0 of "The Unicode Standard" (to be published by Addison-
-Wesley shortly) will include these mapping tables on CD-ROM.
-
-
-PART 5: CJK-CAPABLE OPERATING SYSTEMS
-
-	The first step in being able to display CJK text is to obtain
-an operating system that handles such text (or an application that
-sets up its own CJK-capable environment). Below I describe how
-different types of machines can handle CJK text.
-	Actually, for the first few releases of CJK.INF, these
-subsections will be far from complete (some may even be empty!). The
-purpose of CJK.INF is to provide detailed information on character set
-standards and encoding systems, so I therefore consider this sort of
-information secondary.
-
-
-5.1: MS-DOS
-
-	I am not aware of any CJK-capable MS-DOS operating system, but
-localized versions do exist. CJK support has been introduced with
-Microsoft's Windows operating system (see Section 5.2).
-
-
-5.2: WINDOWS
-
-	Microsoft has CJK versions of its Windows operating system
-available. The latest versions of their Windows operating system are
-called Windows 95 and Windows NT. Windows 95 supports the same
-character sets and encodings as in Windows Version 3.1 -- Windows NT
-supports Unicode (ISO 10646-1:1993). Contact Microsoft Corporation for
-more details. The URL of their WWW Home Page is:
-
-  http://www.microsoft.com/
-
-Nadine Kano's "Developing International Software for Windows 95 and
-Windows NT" provides abundant reference material for how CJK is
-supported in Windows 95 and Windows NT. Check it out.
-	TwinBridge is a package that adds CJK functionality to non-CJK
-Windows. Demo versions of TwinBridge for Japanese and Chinese are at
-the following URLs:
-
-  ftp://ftp.netcom.com/pub/tw/twinbrg/Japanese/demo/tbjdemo.zip
-  ftp://ftp.netcom.com/pub/tw/twinbrg/Chinese/demo/tbcdemo.zip
-
-	Another useful CJK add-on for Windows 95 is NJWIN (see Section
-7.10) by Hongbo Data Systems.
-
-
-5.3: MACINTOSH
-
-	Macintosh is well-known as a computer that was designed to
-handle multilingual texts. There are currently fully-localized
-operating systems available for Japanese (KanjiTalk), Chinese
-(simplified and traditional available), and Korean (HangulTalk). In
-addition, Apple has developed "Language Kits" (*LK) for Chinese (CLK)
-and Japanese (JLK). A Korean Language Kit (KLK) will be released
-shortly.
-	These localized operating systems can usually be installed
-together in order to make your system CJK-capable.
-	The common portion of these CJK-capable operating systems is a
-technology Apple calls "WorldScript II" ("WorldScript I" is for one-
-byte scripts). It provides the basic one- and two-byte functionality.
-
-
-5.4: UNIX AND X WINDOWS
-
-	The typical encoding system used on UNIX and X Windows is EUC
-(see Section 3.2). Many systems, such as IBM's AIX, can be configured
-to handle both EUC and Shift-JIS (for Japanese). In addition, X11R6 (X
-Window System, Version 11, Release 6) has many CJK-capable features.
-	If you have a fast PC and a good amount of RAM (more than
-4MB), you should consider replacing MS-DOS (and Microsoft Windows,
-too, if you have it) with Linux, which is a full-blown UNIX operating
-system that runs on Intel processors. You can even run X Windows
-(X11R6). "Running Linux" by Matt Welsh and Lar Kaufman is an excellent
-guide to installing and using Linux. The companion volume, "Linux
-Network Administrator's Guide" by Olaf Kirch is also useful. Because
-there is a fine line -- or no line at all -- between a user and System
-Administrator when using Linux, "Essential System Administration"
-Second Edition by AEleen Frisch is a must-have.
-	Linux and Linux information are available at the following
-URLs:
-
-  ftp://sunsite.unc.edu/pub/Linux/
-  http://sunsite.unc.edu/mdw/linux.html
-
-I personally use Linux, and find it quite useful and powerful. My bias
-comes from being a UNIX user. But, you can't beat the price (free),
-and all of my favorite text-manipulation tools (such as Perl) are
-readily available.
-
-
-5.5: OTHERS
-
-	No information yet.
-
-
-PART 6: CJK TEXT AND INTERNET SERVICES
-
-	Part 5 described how CJK text is handled on a machine
-internally, but this part goes into the implications of handling such
-text externally, namely for information interchange purposes. This
-boils down to handling CJK text on Internet services.
-	For more detailed information on how these and other Internet
-services are used, I suggest "The Whole Internet User's Guide &
-Catalog" by Ed Krol. For more information on setting up and
-maintaining these and other Internet services, I suggest "Managing
-Internet Information Services" by Cricket Liu et al.
-
-
-6.1: ELECTRONIC MAIL
-
-	The most basic Internet service is electronic mail (henceforth
-to be called "e-mail"), which is virtually guaranteed to be available
-to all users regardless of their system.
-	Several Internet standards (called RFCs, short for Request For
-Comments) have been developed to describe how CJK text is to be handled
-over e-mail systems (see Section A.3.4).
-	The bottom-line is that most e-mail systems do not support
-8-bit characters (that is, bytes that have their 8th bit set). Some do
-offer 8-bit support, but you can never know what path your e-mail
-might take while on route to its recipient. This means that 7-bit ISO
-2022 (or equivalent) is the ideal encoding to use when sending CJK
-text through e-mail. If your operating system processes another
-encoding system, you must convert from that encoding to one that is
-compatible with 7-bit ISO 2022.
-	However, even 7-bit ISO 2022 encoding can get mangled by
-mail-routing software -- the escape character, sometimes even part of
-the escape sequence (meaning more than just the escape character), is
-stripped. The JConv tool described in Section 4.7 restores stripped
-escape sequences for Japanese 7-bit ISO 2022.
-	If your mailing software is MIME-compliant, there is a means
-to identify the character set and encoding of the message using the
-"charset" parameter. Some valid "charset" values include the
-following:
-
-o iso-2022-jp     (see Section 3.1.3)
-o iso-2022-jp-2   (see Section 3.1.3)
-o iso-2022-kr     (see Section 3.1.4)
-o iso-2022-cn     (see Section 3.1.5)
-o iso-2022-cn-ext (see Section 3.1.5)
-o iso-8859-1
-
-Insertion of these values should happen automatically.
-	A last-ditch effort to send CJK text through e-mail is to use
-uuencode or Base64 encoding (see Section 3.3.13). Base64 is something
-that is usually done automatically by mailing software -- explicit
-Base64 encoding is not common. The recipient must then run uudecode or
-a Base64 decoder to get the original file (if such utilities are
-available).
-
-
-6.2: USENET NEWS
-
-	Usenet News follows many of the same requirements as e-mail,
-namely that 7-bit ISO 2022 encoding is ideal. However, some newsgroups
-use specific encoding methods, such as:
-
-  alt.chinese.text             (HZ encoding used for Chinese text)
-  alt.chinese.text.big5        (Big Five encoding used for Chinese text)
-  chinese.flame                (UTF-7)
-  chinese.text.unicode         (UTF-8)
-
-Also, the newsgroups in Korean (all begin with "han.*") use EUC (EUC-
-KR) because the news-handling software in Korea has been designed to
-handle eight-bit characters correctly. Mailing list versions of Korean
-newsgroups are likely to use ISO-2022-KR encoding.
-	One common problem with Usenet News is that the escape
-characters used in 7-bit ISO 2022 encoding are sometimes stripped,
-usually by the software used to post the article. This can be quite
-annoying. There are programs available, such as JConv, that repair
-such files by restoring the escape characters.
-	Another common problem are news readers that do not allow
-escape characters to function. One simple solution is to "pipe" the
-article through a display command, such as "more," "page," "less," or
-"cat." This is done by typing a "pipe" character (|) followed by the
-command name anywhere within the article being displayed.
-
-
-6.3: GOPHER
-
-	The World-Wide Web (WWW) has almost eliminated the need for
-using Gopher, so I won't discuss it here. Not that I don't appreciate
-Gopher servers, but what I mean is that WWW browsing software permits
-access to Gopher sites.
-
-
-6.4: WORLD-WIDE WEB
-
-	First, there are two types of WWW browsers available. The most
-common type is the graphics-based browser (examples include Mosaic and
-Netscape). Graphics-based browsers have the unfortunate requirement of
-a TCP/IP (SLIP and PPP support these protocols) connection. Lynx and
-the W3 client for Emacs, which are text-based browsers, can be run
-from the host computer through a standard terminal connection. They
-don't display all the pretty pictures that folks put into their WWW
-documents, but you get all the text (this is, in many ways, a blessing
-in disguise -- transferring graphics is what slows down graphics-based
-browsers the most). When the W3 client is run using Mule, it becomes a
-fully CJK-capable WWW browser. Both Lynx and the W3 client for Emacs
-are freely available. A Japanese-capable Lynx is available at the
-following URL:
-
-  ftp://ftp.ipc.chiba-u.ac.jp/pub.asada/www/lynx/
-
-There is also a WWW page that provides information on Japanese-capable
-Lynx. Its URL is as follows:
-
-  http://www.icsd6.tj.chiba-u.ac.jp/lynx/
-
-	When WWW documents first came online, there was no method for
-handling CJK character sets. This has, fortunately, changed. As of
-this writing, two commercial WWW browsers support Japanese. They are
-Infomosaic by Fujitsu Limited, and Netscape Navigator by Netscape
-Communications Corporation (Version 1.1 added Japanese support). Both
-are graphics-based browsers. The former can be ordered at the
-following URL:
-
-  http://www.fujitsu.co.jp/
-
-The latter can be found at the following URLs:
-
-  http://www.netscape.com/
-  ftp://ftp.netscape.com/
-
-	One can also use a delegate server to *filter* Japanese codes
-to the one supported by your browser. It is also possible to
-"Japanize" existing WWW browsers using assorted tools and patches.
-Katsuhiko Momoi (momoi@tigger.stcloud.msus.edu) has authored an
-excellent guide to Japanizing WWW browsers. Its URL is:
-
-  http://condor.stcloud.msus.edu:20020/netscape.html
-
-I *highly* suggest reading it.
-	Japanese-capable WWW browsers support automatic detection of
-the three Japanese encoding methods (JIS, Shift-JIS, and EUC). Hey,
-but, what about support for the "C" and "K" of CJK? Attempting to
-answer this question provides us an answer to another question: "What
-is the best encoding method to use for CJK WWW documents?"
-	Encoding methods such as EUC and Shift-JIS provide for mixing
-only two character sets. This is because they provide no way to *flag*
-or *tag* text for locale (character set) information. Without flagging
-information, it is impossible to distinguish Japanese EUC from Chinese
-or Korean EUC. However, the escape sequences used in 7-bit ISO 2022
-encoding explicitly provide locale information. 7-bit ISO 2022 is
-ideal for static documents, which is exactly what one finds on WWW.
-	My personal recommendation (for the short-term) is to compose
-WWW documents (also called HTML documents; HTML stands for Hyper Text
-Markup Language) using 7-bit ISO 2022 encoding. The escape sequences
-themselves act as explicit flags that indicate locale. However, some
-WWW clients are confused by 7-bit ISO 2022 encoding, but the products
-by Netscape Communications and Fujitsu Limited prove that this can
-work. See the following URL for a description of this problem:
-
-  http://www.ntt.jp/japan/note-on-JP/LibWWW-patch.html
-
-	Check out the following URLs for information on and proposals
-for international support for WWW:
-
-  http://www.ebt.com:8080/docs/multilingual-www.html
-  http://www.w3.org/hypertext/WWW/International/Overview/
-
-	There is currently an RFC in the works (called an Internet
-Draft) to address the problem of internationalizing HTML by using
-Unicode. It is very promising. The latest draft is available at the
-following URLs:
-
-  ftp://ds.internic.net/internet-drafts/draft-ietf-html-i18n-04.txt.Z
-  ftp://ftp.isi.edu/internet-drafts/draft-ietf-html-i18n-04.txt
-  ftp://munnari.oz.au/internet-drafts/draft-ietf-html-i18n-04.txt.Z
-  ftp://nic.nordu.net/internet-drafts/draft-ietf-html-i18n-04.txt
-
-Note that some have been compressed.
-
-
-6.5: FILE TRANSFER TIPS
-
-	Although CJK encoding systems such as Shift-JIS and EUC make
-extensive use of 8-bit bytes, that does not mean that you need to
-treat the data as binary. Such files are simply to be treated as text,
-and should be transferred in text mode (for example, FTP's ASCII mode,
-which is also called "Type A Transfer").
-	When text files are transferred in binary mode (such as FTP's
-BINARY mode, which is also called Type I Transfer"), line termination
-characters are left unaltered. For example, when transferring a text
-file from UNIX to Macintosh, a text transfer will translate the UNIX
-newline (0x0A) characters to Macintosh carriage return (0x0D)
-characters, but a binary transfer will make no such modifications.
-Text-style conversion is typically desired.
-	The most common types of files that need to be handled as
-binary include tar archives (*.tar), compressed files (*.Z, *.gz,
-*.zip, *.zoo, *.lzh, and so on), and executables (*.exe, *.bin, and so
-on).
-
-
-PART 7: CJK TEXT HANDLING SOFTWARE
-
-	This section describes various CJK-capable software packages.
-I expect this section to grow with future versions of this document. I
-define "CJK-capable" as being able to support Chinese, Japanese, and
-Korean text.
-	The descriptions I provide below are intentionally short. You
-are encouraged to use the information pointers to obtain further
-information or the software itself.
-
-
-7.1: MULE
-
-	Mule (multilingual enhancement to GNU Emacs), written by
-Kenichi Handa (handa@etl.go.jp), is the first (and only?) CJK-capable
-editor for UNIX systems, and is freely available under the terms of
-the GNU General Public License. Mule was developed from Nemacs
-(Nihongo Emacs).
-	Mule is available at the following URL:
-
-  ftp://etlport.etl.go.jp/pub/mule/
-
-	Mule, beginning with Version 2.2, includes handy utilities
-(any2ps and m2ps) for printing files in any of the encodings supported
-by Mule (which is a lot of encodings, by the way). These programs use
-BDF fonts. See the beginning of Part 2 for a list of URLs that have
-CJK BDF fonts.
-	GNU Emacs is a fine editor, and Mule takes it several steps
-further by providing multilingual support. I personally use Mule
-together with SKK (for Japanese input) -- it is a superb combination.
-
-
-7.2: CNPRINT
-
-	CNPRINT, developed by Yidao Cai (cai@neurophys.wisc.edu), is a
-utility to print CJK text (or convert it to a PostScript file), and is
-available for MS-DOS, VMS, and UNIX systems. A wide range of encoding
-methods are supported by CNPRINT.
-	CNPRINT is available at the following URLs:
-
-  ftp://ftp.ifcss.org/pub/software/{dos,unix,vms}/print/
-  ftp://neurophys.wisc.edu/[public.cn]/
-
-
-7.3: MASS
-
-	MASS (Multilingual Application Support Service), developed at
-the National University of Singapore, is a suite of software tools
-that speed and ease the development of UNIX-based CJK (actually, more
-than just CJK) applications. It supports a wide variety of character
-sets and encodings, including ISO 10646-1:1993 (UCS-2, UTF-7, and
-UTF-8), EACC, and CCCII.
-	More information on MASS, to include contact information for
-its developers, can be found at the following URL:
-
-  http://www.iss.nus.sg/RND/MLP/Projects/MASS/MASS.html
-
-
-7.4: ADOBE TYPE MANAGER (ATM)
-
-	Adobe Type Manager for Macintosh, beginning with Version 3.8,
-is CJK-capable (as long as the underlying operating system is CJK-
-capable). Actually, ATM generically supports CID-keyed fonts, which
-are based on a newly-developed file specification for fonts with large
-numbers of characters (like CJK fonts). See Section 7.9 for more
-details.
-	ATM is very easy to obtain. It is bundled with fonts and
-applications from Adobe Systems (chances are you have ATM if you
-recently purchased an Adobe product). But what about Windows? The
-Windows version of ATM should soon follow with identical
-functionality.
-
-
-7.5: MACINTOSH SOFTWARE
-
-	WorldScript II, a System Extension introduced with System 7,
-provides multi-byte script handling, namely CJK support. If a
-Macintosh product claims to support WorldScript II, chances are it is
-CJK-capable (provided that your operating system has the necessary
-extensions loaded).
-	The CJK encodings that are supported by WorldScript II capable
-applications are the same as made available by the underlying
-Macintosh operating system. No import/export of other encodings is
-supported at the operating system level. You must run separate
-conversion utilities for both import and export. Anyway, below are
-some products that are known to be CJK capable.
-	Nisus Writer, written by Nisus Software, is fully CJK-capable
-as long as you have the appropriate scripts installed (such as CLK for
-Chinese or JLK for Japanese). A "Language Key" (read "dongle") is also
-required for Chinese and Korean (and some one-byte scripts such as
-Arabic and Hebrew). A demo version of Nisus Writer is available at the
-following URL:
-
-  ftp://ftp.nisus-soft.com/pub/nisus/demos/
-
-Give it a try! Updates are also available at the same FTP site. Nisus
-Software can be contacted using the following e-mail address or
-through their WWW page:
-
-  info@nisus-soft.com
-  http://www.nisus-soft.com/
-
-I also suggest reading "The Nisus Way" by Joe Kissell. Chapter 13
-provides detailed information about using Nisus Writer with
-WorldScript, and includes a CD-ROM containing among other things a
-trial (expires after 90 days) version of Nisus Writer and a
-non-expiring version of Nisus Compact.
-	ClarisWorks by Claris Corporation, beginning with Version 4.0,
-is compatible with WorldScript II and all Apple language kits. This
-translates into full CJK support. The following URL provides a trial
-version of ClarisWorks:
-
-  ftp://ftp.claris.com/pub/USA-Macintosh/Trial_Software/
-
-The following URL has detailed information on this and other Claris
-products:
-
-  http://www.claris.com/
-
-	The latest version of WordPerfect by Novell Incorporated is
-also compatible with WorldScript II. The following URL has detailed
-information:
-
-  http://wp.novell.com/tree.htm
-
-
-7.6: MACBLUE TELNET
-
-	Although MacBlue Telnet (a modified version of NCSA Telnet) is
-Macintosh software, I describe it separately because it does not
-require the various Apple Language Kits or localized operating
-systems. There are also input methods, adapted from cxterm (see
-Section 7.7), available that cover the CJK spectrum (Japanese,
-Simplified Chinese, Traditional Chinese, and Korean).
-	MacBlue Telnet is available at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/mac/networking/MacBlueTelnet/
-
-Its associated CJK input methods are at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/mac/input/
-
-
-7.7: CXTERM
-
-	This program, cxterm, is a CJK-capable xterm for X Windows
-(works with X11R4, X11R5, and X11R6). It is based on the X11R6 xterm.
-It is available at the following URL:
-
-  ftp://ftp.ifcss.org/pub/software/x-win/cxterm/
-
-	The following URL is for a program that adds Unicode
-capability to cxterm:
-
-  ftp://ftp.ifcss.org/pub/software/unix/convert/hztty-2.0.tar.gz
-
-The following URL adds support for other encodings to cxterm:
-
-  ftp://ftp.ifcss.org/pub/software/unix/convert/BeTTY-1.534.tar.gz
-
-
-7.8: UW-DBM
-
-	UW-DBM, for Windows 3.1, Windows 95, and Windows NT, is a
-program that allows users to handle Chinese (Big Five, GB-2312-80, or
-HZ code), Japanese (Shift-JIS), and Korean (KS C 5601-1992)
-simultaneously. More information on UW-DBM is available at the
-following URL:
-
-  http://www.gy.com/ccd/win95/cjkw95.htm
-
-	A demo version of UW-DBM is available at the following URL:
-
-  ftp://ftp.aimnet.com/pub/users/chinabus/uwdbm40.zip
-
-
-7.9: POSTSCRIPT
-
-	With the introduction of CID-keyed Font Technology, PostScript
-has become fully CJK capable.
-	Adobe Systems has developed the following CJK character
-collection for CID-keyed fonts (font developers are encouraged to
-conform to these specifications):
-
-  Character Collection  CIDs   Supported Character Sets & Encodings
-  ^^^^^^^^^^^^^^^^^^^^  ^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  Adobe-GB1-1           9,897  GB 2312-80 and GB/T 12345-90; 7-bit ISO
-                               2022 and EUC
-  Adobe-CNS1-0         14,099  Big Five (ETen extensions) and CNS
-                               11643-1992 Planes 1 and 2; Big Five,
-                               7-bit ISO 2022, and EUC
-  Adobe-Japan1-2        8,720  JIS X 0208-1990; Shift-JIS, 7-bit ISO
-                               2022, and EUC
-  Adobe-Japan2-0        6,068  JIS X 0212-1990; 7-bit ISO 2022 and EUC
-  Adobe-Korea1-1       18,155  KS C 5601-1992 (Macintosh extensions
-                               plus Johab); 7-bit ISO 2022, EUC, UHC,
-                               and Johab
-
-Note that Macintosh and Windows do not support any of the encodings
-for Adobe-Japan2-0, thus fonts based on that specification are
-unusable for those platforms.
-	Adobe Systems also have a few things in the works (that is,
-they are either proposed or in draft form), all of which are
-supplements to above character collections (that is, they add CIDs):
-
-  Character Collection  CIDs   Supported Character Sets & Encodings
-  ^^^^^^^^^^^^^^^^^^^^  ^^^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  Adobe-CNS1-1         +6,018  Add CNS 11643-1992 Plane 3 support (30
-                               of the 6,148 hanzi are in Adobe-CNS1-0)
-
-	To find out more about these CJK character collections or
-CID-keyed font technology, contact the Adobe Developers Association.
-Several CID-related documents have been published. ADA's contact
-information is as follows:
-
-  Adobe Developers Association
-  Adobe Systems Incorporated
-  1585 Charleston Road
-  P.O. Box 7900
-  Mountain View, CA 94039-7900
-  USA
-  +1-415-961-4111 (phone)
-  +1-415-967-9231 (facsimile)
-  devsupp-person@adobe.com
-  http://www.adobe.com/Support/
-
-Adobe Systems has recently developed the CID SDK (CID Software
-Developers Kit), which is on a single CD-ROM. Contact the Adobe
-Developers Association for information on obtaining a copy.
-	The complete CID-keyed font file specification and an overview
-document are available at the following URLs (as a PostScript or PDF
-[Adobe Acrobat] file, respectively):
-
-  ftp://ftp.adobe.com/pub/adobe/DeveloperSupport/TechNotes/PSfiles/
-  ftp://ftp.adobe.com/pub/adobe/DeveloperSupport/TechNotes/PDFfiles/
-
-The file names (not provided above due to URL length) are:
-
-  5014.CMap_CIDFont_Spec.ps    (complete CID engineering specification)
-  5014.CMap_CIDFont_Spec.pdf
-  5092.CID_Overview.ps         (CID technology overview)
-  5092.CID_Overview.pdf
-
-Other related files, most character collection specifications, are
-available only in PDF format at the latter URL indicated above:
-
-  5004.AFM_Spec.pdf            (Includes CID-keyed AFM specification)
-  5078b.pdf                    (Adobe-Japan1-2 character collection)
-  5079b.pdf                    (Adobe-GB1-0 character collection)
-  5080b.pdf                    (Adobe-CNS1-0 character collection)
-  5093b.pdf                    (Adobe-Korea1-0 character collection)
-  5094.pdf                     (Adobe CJK CMap file descriptions)
-  5097b.pdf                    (Adobe-Japan2-0 character collection)
-
-If you do not have Adobe Acrobat, there is a freely-available Acrobat
-Reader (for Macintosh, Windows, MS-DOS, and UNIX) at the following
-URL:
-
-  ftp://ftp.adobe.com/pub/adobe/Applications/Acrobat/
-
-	I have also placed some CJK character collection materials,
-including prototype Unicode (UCS-2 and UTF-8) CMap files, at the
-following URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/adobe/
-
-A sample (Adobe-Korea1-0) CIDFont is also available at the above URL.
-	There is also a somewhat brief description of CID-keyed fonts
-at the end of Chapter 6 in UJIP.
-
-
-7.10: NJWIN
-
-	Hongbo Data Systems has recently release a ShareWare ($49 USD)
-product called NJWIN whose purpose is to force the display of CJK text
-in non-CJK applications running under US Windows 95. Actually, there
-are two versions: full CJK and Japanese only.
-	NJWIN and its full description are available at the following
-URL:
-
-  http://www.njstar.com.au/njstar/njwin.htm
-
-Other (popular) URLs that carry NJWIN are as follows:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/windows/
-  ftp://ftp.cc.monash.edu.au/pub/nihongo/
-
-	Hongbo Data Systems' e-mail address is:
-
-  hongbo@njstar.com.au
-
-Their WWW Home Page is at the following URL:
-
-  http://www.njstar.com.au/
-
-
-PART 8: CJK PROGRAMMING ISSUES
-
-	This new section describes issues related to using specific
-programming languages to process CJK text.
-
-
-8.1: C AND C++
-
-	At one time I used C on a regular basis for my CJK programming
-needs, and released three tools for others to use: JConv, JChar, and
-JCode. While these tools are specific to Japanese, they can be easily
-adapted for CJK use. Their source code is available at the following
-URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/src/
-
-	I also provided several C code snippets in Chapter 7 of
-UJIP. These are available in machine-readable form at the following
-URL:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/Ch7/
-
-
-8.2: PERL
-
-	Although Perl does not have any special CJK facilities (note
-that most implementations of C and C++ do not either), it provides a
-powerful programming environment that is useful for many CJK-related
-tasks.
-	The noteworthy features of Perl are associative arrays and
-regular expressions. These are features not found in C or C++, and
-allow one to write meaningful code in little time.
-	JPerl is an implementation of Perl that provides two-byte
-support for Japanese (EUC or Shift-JIS encoding). It is not ideal
-because JPerl scripts often cannot run under (non-Japanese) Perl.
-	If you often write programs for internal use, I suggest that
-you check out Perl to see if it can offer you something. Chances are
-that it can. A good place to start looking at Perl are through books
-on the subject (see Section A.3.1) and at the following URL:
-
-  http://www.perl.com/
-
-	For those who like additional reading, "The Perl Journal" is
-starting up, and information is at the following URL:
-
-  http://work.media.mit.edu/the_perl_journal/
-
-
-8.3: JAVA
-
-	I am just starting to learn about the Java programming
-language (and rightly so since my wife is Javanese!). It seems to have
-a lot to offer.
-	The most interesting aspects of Java are:
-
-o Built-in support for Unicode and UTF-8.
-o The programmer must write code in the object-oriented paradigm.
-o Provides a portable way to supply compiled code.
-o Security features for Internet use.
-
-More information on Java are at the following URLs:
-
-  http://www.gamelan.com/
-  http://www.javasoft.com/
-
-Oh, Gamelan is the name of Javanese music.
-	Of the books about Java published thus far, the one I consider
-to be the best is "Java in a Nutshell" by David Flanagan.
-	One programming feature of Perl that I dearly miss in Java are
-regexes (regular expressions). Luckily, some kind person wrote a regex
-package for Java based on Perl regexes. Information on this Java regex
-package is available at the following URL:
-
-  http://www.win.net/~stevesoft/pat/
-
-
-A FINAL NOTE
-
-	I hope that the information presented here will prove
-useful. I would like to keep the electronic version of this document
-as up-to-date as possible, and through readers' input, I am able to
-do so.
-	Many readers will notice that I am very heavy into UNIX and
-Macintosh (well, I recently got my first PC). If anyone has any
-information on CJK-capable interfaces for other platforms, please feel
-free to send it to me, and I will be sure to include it in the next
-version of CJK.INF. Please include sources for the software or
-documentation by providing addresses, phone numbers, FTP sites, and so
-on.
-	Please do not hesitate to ask me further question concerning
-any subject presented in this document.
-
-
-ACKNOWLEDGMENTS
-
-	I would like to express my deepest thanks to Kazumasa Utashiro
-of Internet Initiative Japan (IIJ). He taught to me how to send and
-receive Japanese text using the 7-bit ISO 2022 codes back in 1989.
-With his help I was able to write JAPAN.INF, my book, and this
-document in order to inform others about what he has taught me plus
-more.
-	Next, I thank all the folks at O'Reilly & Associates for
-publishing UJIP. Special thanks to Tim O'Reilly for accepting the book
-proposal, and to Peter Mui for guiding me through the process. I have
-had nothing but good experiences with "them there fine folks."
-	I got to know Jack Halpern through UJIP, and he subsequently
-translated it into Japanese. Many thanks to him.
-	I am also grateful to my employer, Adobe Systems, for letting
-me work on interesting CJK-related projects. I really like what I do
-here. In particular, I want to thank Dan Mills, my manager, for
-putting up with me for these past four years.
-	Lastly, I would also like to thank the countless people who
-provided comments on JAPAN.INF, UJIP, and CJK.INF. I hope that this
-new document lives up to the spirit of my previous efforts.
-
-
-APPENDIX A: OTHER INFORMATION SOURCES
-
-	One of the most useful types of information are pointers to
-other information sources. This appendix provides just that.
-
-
-A.1: USENET NEWSGROUPS AND MAILING LISTS
-
-	Appendix L of UJIP provided information on a number of mailing
-lists. This section supplements that appendix with information on
-other useful mailing lists, and points out which ones in UJIP are
-relevant to readers of CJK.INF.
-
-
-A.1.1: USENET NEWSGROUPS
-
-	The following Usenet Newsgroups typically have postings with
-information relevant to issues discussed in CJK.INF (in alphabetical
-order):
-
-  alt.chinese.computing
-  alt.chinese.text                (HZ encoding used for Chinese text)
-  alt.chinese.text.big5           (Big Five encoding used for Chinese text)
-  alt.japanese.text               (JIS encoding used for Japanese text)
-  chinese.flame                   (UTF-7)
-  chinese.text.unicode            (UTF-8)
-  comp.lang.c
-  comp.lang.c++
-  comp.lang.java
-  comp.lang.perl.misc
-  comp.software.international
-  comp.std.internat
-  fj.editor.mule                  (JIS encoding used for Japanese text)
-  fj.kanji                        (JIS encoding used for Japanese text)
-  fj.net.infosystems.www.browsers (JIS encoding used for Japanese text)
-  fj.news.reader                  (JIS encoding used for Japanese text)
-  han.comp.hangul
-  han.sys.mac
-  sci.lang.japan                  (JIS encoding used for Japanese text)
-
-	If your local news host does not provide a feed of the fj.*
-newsgroups (shame on them!), or if you do not have access to Usenet
-News, you can alternatively fetch them from the following URL:
-
-  ftp://kuso.shef.ac.uk/pub/News/
-
-The subdirectories correspond to the newsgroup name, but with the
-"dots" being replaced by "slashes." For example, the "fj.binaries.mac"
-newsgroup is archived in the "fj/binaries/mac" subdirectory. Many
-thanks to Earl Kinmonth (jp1ek@sunc.shef.uc.uk) for this service.
-	There are some sites that carry full feeds of the fj.*
-newsgroups, and permit public access (meaning that you can configure
-your news reader to point to it). The only one I know of thus far is
-as follows:
-
-  ume.cc.tsukuba.ac.jp
-
-
-A.1.2: MAILING LISTS
-
-	The following are mailing lists that should interest readers
-of this document (some are more active than others). The first line
-after each entry indicates the address (or addresses) that can be used
-for subscribing. The second line is the address for posting.
-
-o CCNET-L MAILING LIST
-  listserv@uga.uga.edu (or listserv@uga)
-  ccnet-l@uga.uga.edu
-
-o China Net Mailing List
-  majordomo@lists.mindspring.com
-  (See http://www.asia-net.com/ or jobs@asia-net.com)
-
-o EASUG (East Asian Software Users Group) Mailing List
-  easug-request@guvax.acc.georgetown.edu
-  easug@guvax.acc.georgetown.edu
-
-o EBTI-L (Electronic Buddhist Text Initiative) Mailing List
-  ebti-l-request@uxmail.ust.hk
-  ebti-l@uxmail.ust.hk
-
-o EFJ (Electronic Frontiers Japan) Mailing List
-  majordomo@lists.twics.com
-  efj@lists.twics.com
-
-o Hangul Mailing List (han.comp.hangul newsgroup)
-  majordomo@cair.kaist.ac.kr
-  hangul@cair.kaist.ac.kr
-
-o INSOFT-L Mailing List
-  majordomo@trans2.b30.ingr.com
-  insoft-l@trans2.b30
-
-o ISO 10646 Mailing List
-  listproc@listproc.hcf.jhu.edu
-  iso10646@listproc.hcf.jhu.edu
-
-o Japan Net Mailing List
-  majordomo@lists.mindspring.com
-  (See http://www.asia-net.com/ or jobs@asia-net.com)
-
-o KanjiTalk Mailing List
-  kanjitalk-request@cs15.atr-sw.atr.co.jp (or kanjitalk-request@crl.go.jp)
-  kanjitalk@cs15.atr-sw.atr.co.jp (or kanjitalk@crl.go.jp)
-
-o Mac Mailing List (han.sys.mac newsgroup)
-  majordomo@krnic.net
-  mac@krnic.net
-
-o Mule Mailing List
-  mule-request@etl.go.jp
-  mule@etl.go.jp or mule-jp@etl.go.jp
-
-o NIHONGO Mailing List (sci.lang.japan newsgroup)
-  listserv@mitvma.mit.edu (or listserv@mitvma)
-  nihongo@mitvma.mit.edu
-
-o Nihongo-Hiroba Mailing List
-  listproc@mcfeeley.cc.utexas.edu
-  nihongo-hiroba@mcfeeley.cc.utexas.edu
-
-o Nisus Mailing List
-  listserv@dartmouth.edu
-  nisus@dartmouth.edu
-
-o TLUG (Tokyo Linux User's Group) Mailing List
-  majordomo@lists.twics.com
-  tlug@lists.twics.com
-
-o Unicode Mailing List
-  unicode-request@unicode.org
-  unicode@unicode.org
-
-o WNN User Mailing List
-  wnn-user-request@wnn.astem.or.jp
-  wnn-user-jp@wnn.astem.or.jp
-
-o WWW Multilingual Mailing List
-  www-mling-request@square.ntt.jp
-  www-mling@square.ntt.jp
-
-If the name of the mailing list is part of the subscription address
-(such as "easug-request"), the message body should look like this:
-
-  subscribe
-
-Including your name is optional. If username in the subscription
-address is "listserv" or "majordomo" (these are names of mailing list
-managing software), the mailing list name must appear after
-"subscribe" in the message body as follows:
-
-  subscribe ccnet-l
-
-Again, including your name is optional.
-	The following URL has information about Japanese-related
-mailing lists:
-
-  gopher://gan1.ncc.go.jp/11/INFO/mail-lists/
-
-
-A.2: INTERNET RESOURCES
-
-	The Internet provides what I would consider to be the greatest
-information resources of all. These can be subcategorized into FTP,
-Telnet, Gopher, WWW, and e-mail.
-
-
-A.2.1: USEFUL FTP SITES
-
-	Below are the URLs for useful FTP sites. The directory
-specified is the recommended place from which to start poking around
-for useful files.
-
-  ftp://cair-archive.kaist.ac.kr/pub/hangul/
-  ftp://etlport.etl.go.jp/pub/mule/
-  ftp://ftp.adobe.com/pub/adobe/
-  ftp://ftp.cc.monash.edu.au/pub/nihongo/
-  ftp://ftp.ifcss.org/pub/software/
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/
-  ftp://ftp.sra.co.jp/pub/
-  ftp://ftp.uwtc.washington.edu/pub/Japanese/
-  ftp://kuso.shef.ac.uk/pub/Japanese/
-  ftp://unicode.org/pub/
-
-This list is expected to grow.
-
-
-A.2.2: USEFUL TELNET SITES
-
-	For those who have a NIFTY-Serve account, there is now a very
-convenient way to access NIFTY-Serve using telnet. The URL is as
-follows:
-
-  telnet://r2.niftyserve.or.jp/
-
-Information about what NIFTY-Serve has to offer (and how to subscribe)
-can be found at the following URL:
-
-  http://www.nifty.co.jp/
-
-	Another information service with a similar access mechanism is
-CompuServe, whose URL is as follows:
-
-  telnet://compuserve.com/
-
-You will need to press the return key to get the "Host Name:" prompt,
-at which time you type "cis" (just follow the menus from this point
-on).
-	You can also do a search on fj.* newsgroup articles at the
-following URL:
-
-  telnet://asahi-net.or.jp/
-
-You login as "fj-db" once you are connected.
-
-
-A.2.3: USEFUL GOPHER SITES
-
-	I am not too much of a Gopher user. There, of course, is the
-following:
-
-  gopher://gopher.ora.com/
-
-Another Gopher site provides information on Japanese-related mailing
-lists:
-
-  gopher://gan1.ncc.go.jp/11/INFO/mail-lists/
-
-If you happen to know of others, please let me know.
-
-
-A.2.4: USEFUL WWW SITES
-
-	Because the World-Wide Web is a constantly changing place (and
-more importantly, because I don't want to re-issue a new version of
-this document every month!), I will maintain links to useful documents
-at my WWW Home Page. Its URL is as follows:
-
-  http://jasper.ora.com/lunde/
-
-If you cannot get to my WWW Home Page, you couldn't get to any that I
-would list here anyway.
-
-
-A.2.5: USEFUL MAIL SERVERS
-
-	In the past (that is, in JAPAN.INF) I included a full list of
-the domains in the "jp" hierarchy. That took up a lot of space, and
-changes very rapidly. You can now send a request to a mail server in
-order to return the most current listing. The mail server is:
-
-  mail-server@nic.ad.jp
-
-The most common command is "send," and the following arguments can be
-supplied to retrieve specific documents (and should be in the message
-body, not on the "Subject:" line):
-
-  send help
-  send index
-  send jpnic/domain-list.txt
-  send jpnic/domain-list-e.txt
-
-The first sends back a help file, the second sends back a complete
-index of files that can be retrieved (use this one to see what other
-useful stuff is available), and the last two send back a complete
-listing of domains in the "fj" hierarchy (the last one send it back in
-English/romanized).
-
-
-A.3: OTHER RESOURCES
-
-	This section provides pointers to specific documentation
-available electronically or in print.
-
-
-A.3.1: BOOKS
-
-	There are other useful reference materials available in print
-or online, in addition to the various national and international
-standards mentioned throughout this document. The following are books
-that I recommend for further reading or mental stimulus. (Sorry for
-plugging my own books in this list, but they are relevant.)
-
-o Clews, John. "Language Automation Worldwide: The Development of
-  Character Set Standards." SESAME Computer Projects. 1988. ISBN
-  1-870095-01-4.
-
-o Flanagan, David. "Java in a Nutshell." O'Reilly & Associates,
-  Inc. 1996. ISBN 1-56592-183-6.
-
-o Frisch, AEleen. "Essential System Administration." Second Edition.
-  O'Reilly & Associates, Inc. 1995. ISBN 1-56592-127-5.
-
-o Huang, Jack & Timothy Huang. "An Introduction to Chinese, Japanese
-  and Korean Computing." World Scientific Computing. 1989. ISBN
-  9971-50-664-5.
-
-o IBM Corporation. "Character Data Representation Architecture - Level
-  2, Registry." 1993. IBM order number SC09-1391-01.
-
-o Kano, Nadine. "Developing International Software for Windows 95 and
-  Windows NT." Microsoft Press. 1995. ISBN 1-55615-840-8.
-
-o Kirch, Olaf. "Linux Network Administrator's Guide." O'Reilly &
-  Associates, Inc. 1995. ISBN 1-56592-087-2.
-
-o Kissell, Joe. "The Nisus Way." MIS:Press. 1996. ISBN 1-55828-455-9.
-
-o Krol, Ed. "The Whole Internet User's Guide & Catalog." Second
-  Edition. O'Reilly & Associates, Inc. 1994. ISBN 1-56592-063-5.
-
-o Liu, Cricket et al. "Managing Internet Information Services."
-  O'Reilly & Associates, Inc. 1994. ISBN 1-56592-062-7.
-
-o Lunde, Ken. "Understanding Japanese Information Processing."
-  O'Reilly & Associates, Incorporated. 1993. ISBN 1-56592-043-0. LCCN
-  PL524.5.L86 1993.
-
-o Lunde, Ken. "Nihongo Joho Shori." SOFTBANK Corporation. 1995. ISBN
-  4-89052-708-7.
-
-o Luong, Tuoc V. et al. "Internationalization: Developing Software for
-  Global Markets." John Wiley & Sons, Incorporated. 1995. ISBN
-  0-471-07661-9.
-
-o Schwartz, Randal L. "Learning Perl." O'Reilly & Associates,
-  Incorporated. 1993. ISBN 1-56592-042-2.
-
-o Stallman, Richard M. "GNU Emacs Manual." Tenth edition. Free
-  Software Foundation. 1994. ISBN 1-882114-04-3.
-
-o Tuthill, Bill. "Solaris International Developer's Guide." SunSoft
-  Press and PTR Prentice Hall. 1993. ISBN 0-13-031063-8.
-
-o Unicode Consortium, The. "The Unicode Standard: Worldwide Character
-  Encoding." Version 1.0. Volume 2. Addison-Wesley. 1992. ISBN
-  0-201-60845-6.
-
-o Vromans, Johan. "Perl 5 Desktop Reference." O'Reilly & Associates,
-  Inc. 1996. ISBN 1-56592-187-9.
-
-o Wall, Larry & Randal L. Schwartz. "Programming Perl." O'Reilly &
-  Associates, Incorporated. 1991. ISBN 0-937175-64-1.
-
-o Welsh, Matt & Lar Kaufman. "Running Linux." O'Reilly & Associates,
-  Inc. 1995. ISBN 1-56592-100-3.
-
-	If you want to get your hands on any of the national or
-international standards mentioned in this document, I suggest the
-following:
-
-o The American National Standards Institute can provide ISO, KS, and
-  JIS standards. Bear in mind that ISO standards will most likely
-  arrive as a photocopy of the original.
-
-  ANSI
-  11 West 42nd Street
-  New York, NY 10036
-  USA
-  +1-212-642-4900 (phone)
-  +1-212-302-1286 (facsimile)
-
-o The International Organization for Standardization can provide
-  ISO standards.
-
-  ISO
-  1, rue de Varemb
-  Case postale 56
-  CH-1211, Geneva 20
-  SWITZERLAND
-  +41-22-749-01-11 (phone)
-  +41-22-733-34-30 (facsimile)
-  central@isocs.iso.ch (e-mail)
-  http://www.iso.ch/ (WWW)
-
-o Chinese (GB and CNS) standards are the hardest to obtain. It is
-  quite unfortunate.
-
-
-A.3.2: MAGAZINES
-
-o "Computing Japan," published monthly, ISSN 1340-7228,
-  editors@cj.gol.com.
-
-o "MANGAJIN," published 10 times per year, ISSN 1051-8177.
-
-o "Multilingual Communications & Computing," published bi-monthly,
-  ISSN 1065-7657, info@multilingual.com.
-
-o "The Perl Journal," published quarterly, ISSN 1087-903X,
-  perl-journal-subscriptions@perl.com.
-
-
-A.3.3: JOURNALS
-
-o "Chinese Information Processing" (CIP), published bi-monthly, ISSN
-  1003-9082. (In Chinese.)
-
-o "Computer Processing of Chinese & Oriental Languages" (CPCOL),
-  co-published twice a year by World Scientific Publishing and Chinese
-  Language Computer Society (CLCS), ISSN 0715-9048.
-
-o "The Electronic Bodhidharma," published by the International
-  Research Institute for Zen (IRIZ) Buddhism, Hanazono University,
-  Japan. More information on the organization that publishes this
-  journal is available at the following URL:
-
-  http://www.iijnet.or.jp/iriz/irizhtml/irizhome.htm
-
-
-A.3.4: RFCs
-
-	Many RFCs (Request For Comments) are relevant to this
-document. They are:
-
-o RFC 1341: "MIME (Multipurpose Internet Mail Extensions): Mechanisms
-  for Specifying and Describing the Format of Internet Message
-  Bodies," by Nathaniel Borenstein and Ned Freed, June 1992.
-
-o RFC 1342: "Representation of Non-ASCII Text in Internet Message
-  Headers," by Keith Moore, June 1992.
-
-o RFC 1468: "Japanese Character Encoding for Internet Messages," by
-  Jun Murai et al., June 1993.
-
-o RFC 1521: "MIME (Multipurpose Internet Mail Extensions) Part One:
-  Mechanisms for Specifying and Describing the Format of Internet
-  Message Bodies," by Nathaniel Borenstein and Ned Freed, September
-  1993. Obsoletes RFC 1341.
-
-o RFC 1522: "MIME (Multipurpose Internet Mail Extensions) Part Two:
-  Message Header Extensions for Non-ASCII Text," by Keith Moore,
-  September 1993. Obsoletes RFC 1342.
-
-o RFC 1554: "ISO-2022-JP-2: Multilingual Extension of ISO-2022-JP," by
-  Masataka Ohta and Kenichi Handa, December 1993.
-
-o RFC 1557: "Korean Character Encoding for Internet Messages," by
-  Uhhyung Choi et al., December 1993.
-
-o RFC 1642: "UTF-7: A Mail-Safe Transformation Format of Unicode," by
-  David Goldsmith and Mark Davis, July 1994.
-
-o RFC 1815: "Character Sets ISO-10646 and ISO-10646-J-1," by Masataka
-  Ohta, July 1995.
-
-o RFC 1842: "ASCII Printable Characters-Based Chinese Character
-  Encoding for Internet Messages," by Ya-Gui Wei et al., August 1995.
-
-o RFC 1843: "HZ - A Data Format for Exchanging Files of Arbitrarily
-  Mixed Chinese and ASCII Characters," by Fung Fung Lee, August 1995.
-
-o RFC 1922: "Chinese Character Encoding for Internet Messages," by
-  Haifeng Zhu et al., March 1996.
-
-These RFCs can be obtained from FTP archives that contain all RFC
-documents, such as at the following URLs
-
-  ftp://nic.ddn.mil/rfc/
-  ftp://ftp.uu.net/inet/rfc/
-
-But these specific ones are mirrored at the following URL for
-convenience:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/Ch9/
-
-
-A.3.5: FAQs
-
-	There are several FAQ (Frequently Asked Questions) files that
-provide useful information. The following is a listing of some along
-with their URLs:
-
-o "Japanese Language Information" FAQ (formerly the "sci.lang.japan"
-  FAQ) by Rafael Santos (santos@mickey.ai.kyutech.ac.jp) at:
-
-  http://www.mickey.ai.kyutech.ac.jp/cgi-bin/japanese/
-
-  Update announcements are usually posted to the sci.lang.japan
-  newsgroup.
-
-o "Programming for Internationalization" FAQ by Michael Gschwind
-  (mike@vlsivie.tuwien.ac.at) at:
-
-  ftp://ftp.vlsivie.tuwien.ac.at/pub/8bit/ISO-programming
-
-  Also posted to the comp.software.international newsgroup. This and
-  other internationalization documents are also accessible through the
-  following URL:
-
-  http://www.vlsivie.tuwien.ac.at/mike/i18n.html
-
-o Three FAQs about Internet Service Providers in Japan by Taki Naruto
-  (tn@panix.com), Jesse Casman (jcasman@unm.edu), and Kenji Yoshida
-  (kenny@mb.tokyo.infoweb.or.jp), respectively, at:
-
-  http://www.panix.com/~tn/ispj.html
-  http://nobunaga.unm.edu/internet.html
-  http://cswww2.essex.ac.uk/users/whean/japan/net.html
-
-o "Internationalization Reference List" by Eugene Dorr
-  (gdorr@pgh.legent.com) at:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/doc/i18n-books.txt
-
-  Note really a FAQ, but quite useful because it is a very complete
-  listing of I18N-related books.
-
-o "INSOFT-L Service" by Brian Tatro (btatro@tatro.com) at:
-
-  http://iquest.com/~btatro/in2.html
-
-  This includes a link to the FAQ for the INSOFT-L Mailing List (see
-  Section A.1.2).
-
-o "How to Use Japanese on the Internet with a PC: From Login to WWW"
-  by Hideki Hirayama (sgw01623@niftyserve.or.jp) at:
-
-  ftp://ftp.ora.com/pub/examples/nutshell/ujip/faq/jpn-inet.FAQ
-
-o "Hangul and Internet in Korea" FAQ by Jungshik Shin
-  (jshin@minerva.cis.yale.edu) at:
-
-  http://pantheon.cis.yale.edu/~jshin/faq/
----  END (CJK.INF VERSION 2.1 07/12/96) 185553 BYTES  ---
diff --git a/tools/encoding/cp1250.txt b/tools/encoding/cp1250.txt
index 9bd72fd..9d36f28 100644
--- a/tools/encoding/cp1250.txt
+++ b/tools/encoding/cp1250.txt
@@ -272,4 +272,3 @@
 0xFE	0x0163	#LATIN SMALL LETTER T WITH CEDILLA
 0xFF	0x02D9	#DOT ABOVE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1251.txt b/tools/encoding/cp1251.txt
index 41c200e..5189b95 100644
--- a/tools/encoding/cp1251.txt
+++ b/tools/encoding/cp1251.txt
@@ -272,4 +272,3 @@
 0xFE	0x044E	#CYRILLIC SMALL LETTER YU
 0xFF	0x044F	#CYRILLIC SMALL LETTER YA
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1252.txt b/tools/encoding/cp1252.txt
index c551854..ebd0c4f 100644
--- a/tools/encoding/cp1252.txt
+++ b/tools/encoding/cp1252.txt
@@ -272,4 +272,3 @@
 0xFE	0x00FE	#LATIN SMALL LETTER THORN
 0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1253.txt b/tools/encoding/cp1253.txt
index 9fb2fb4..5995dc1 100644
--- a/tools/encoding/cp1253.txt
+++ b/tools/encoding/cp1253.txt
@@ -272,4 +272,3 @@
 0xFE	0x03CE	#GREEK SMALL LETTER OMEGA WITH TONOS
 0xFF		#UNDEFINED
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1254.txt b/tools/encoding/cp1254.txt
index f9c6147..51ffd89 100644
--- a/tools/encoding/cp1254.txt
+++ b/tools/encoding/cp1254.txt
@@ -272,4 +272,3 @@
 0xFE	0x015F	#LATIN SMALL LETTER S WITH CEDILLA
 0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1255.txt b/tools/encoding/cp1255.txt
index a87f192..815bce0 100644
--- a/tools/encoding/cp1255.txt
+++ b/tools/encoding/cp1255.txt
@@ -272,4 +272,3 @@
 0xFE	0x200F	#RIGHT-TO-LEFT MARK
 0xFF		#UNDEFINED
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1256.txt b/tools/encoding/cp1256.txt
index d3521ed..55f7797 100644
--- a/tools/encoding/cp1256.txt
+++ b/tools/encoding/cp1256.txt
@@ -272,4 +272,3 @@
 0xFE	0x200F	#RIGHT-TO-LEFT MARK
 0xFF		#UNDEFINED
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1257.txt b/tools/encoding/cp1257.txt
index c125cfd..3229e82 100644
--- a/tools/encoding/cp1257.txt
+++ b/tools/encoding/cp1257.txt
@@ -272,4 +272,3 @@
 0xFE	0x017E	#LATIN SMALL Z HACEK
 0xFF	0x02D9	#DOT ABOVE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp1258.txt b/tools/encoding/cp1258.txt
index de7b85c..617b96f 100644
--- a/tools/encoding/cp1258.txt
+++ b/tools/encoding/cp1258.txt
@@ -272,4 +272,3 @@
 0xFE	0x20AB	#DONG SIGN
 0xFF	0x00FF	#LATIN SMALL LETTER Y WITH DIAERESIS
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp437.txt b/tools/encoding/cp437.txt
index 479076f..ae38e17 100644
--- a/tools/encoding/cp437.txt
+++ b/tools/encoding/cp437.txt
@@ -271,4 +271,3 @@
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
-
\ No newline at end of file
diff --git a/tools/encoding/cp737.txt b/tools/encoding/cp737.txt
index 68f3d37..0fc572f 100644
--- a/tools/encoding/cp737.txt
+++ b/tools/encoding/cp737.txt
@@ -271,4 +271,3 @@
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
-
\ No newline at end of file
diff --git a/tools/encoding/cp775.txt b/tools/encoding/cp775.txt
index 380cf28..1ad4e4e 100644
--- a/tools/encoding/cp775.txt
+++ b/tools/encoding/cp775.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp850.txt b/tools/encoding/cp850.txt
index 312e439..590b1af 100644
--- a/tools/encoding/cp850.txt
+++ b/tools/encoding/cp850.txt
@@ -271,4 +271,3 @@
 0xfd	0x00b2	#SUPERSCRIPT TWO
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
-
\ No newline at end of file
diff --git a/tools/encoding/cp852.txt b/tools/encoding/cp852.txt
index bae9e7a..2f2daba 100644
--- a/tools/encoding/cp852.txt
+++ b/tools/encoding/cp852.txt
@@ -271,4 +271,3 @@
 0xfd	0x0159	#LATIN SMALL LETTER R WITH CARON
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
-
\ No newline at end of file
diff --git a/tools/encoding/cp855.txt b/tools/encoding/cp855.txt
index af0168d..d43daf0 100644
--- a/tools/encoding/cp855.txt
+++ b/tools/encoding/cp855.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp857.txt b/tools/encoding/cp857.txt
index 7dde69f..3059383 100644
--- a/tools/encoding/cp857.txt
+++ b/tools/encoding/cp857.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp860.txt b/tools/encoding/cp860.txt
index ce36f21..d7f2cb7 100644
--- a/tools/encoding/cp860.txt
+++ b/tools/encoding/cp860.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp861.txt b/tools/encoding/cp861.txt
index 5a50e4e..fe0f02b 100644
--- a/tools/encoding/cp861.txt
+++ b/tools/encoding/cp861.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp862.txt b/tools/encoding/cp862.txt
index 5a4f019..9631105 100644
--- a/tools/encoding/cp862.txt
+++ b/tools/encoding/cp862.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp863.txt b/tools/encoding/cp863.txt
index 115afbd..cc4eae1 100644
--- a/tools/encoding/cp863.txt
+++ b/tools/encoding/cp863.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp864.txt b/tools/encoding/cp864.txt
index 4cf3394..7aa055f 100644
--- a/tools/encoding/cp864.txt
+++ b/tools/encoding/cp864.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff		#UNDEFINED
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp865.txt b/tools/encoding/cp865.txt
index 38f5ce0..67705f4 100644
--- a/tools/encoding/cp865.txt
+++ b/tools/encoding/cp865.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp866.txt b/tools/encoding/cp866.txt
index 25b831a..880fb70 100644
--- a/tools/encoding/cp866.txt
+++ b/tools/encoding/cp866.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp869.txt b/tools/encoding/cp869.txt
index 691ef97..4c77ffd 100644
--- a/tools/encoding/cp869.txt
+++ b/tools/encoding/cp869.txt
@@ -272,4 +272,3 @@
 0xfe	0x25a0	#BLACK SQUARE
 0xff	0x00a0	#NO-BREAK SPACE
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp874.txt b/tools/encoding/cp874.txt
index 3530866..83d8c0e 100644
--- a/tools/encoding/cp874.txt
+++ b/tools/encoding/cp874.txt
@@ -272,4 +272,3 @@
 0xfe		#UNDEFINED
 0xff		#UNDEFINED
 
-
\ No newline at end of file
diff --git a/tools/encoding/cp932.txt b/tools/encoding/cp932.txt
index 2c22e53..592659b 100644
--- a/tools/encoding/cp932.txt
+++ b/tools/encoding/cp932.txt
@@ -7996,4 +7996,3 @@
 0xFC4A	0x9E19	#<CJK>
 0xFC4B	0x9ED1	#<CJK>
 
-
diff --git a/tools/encoding/cp936.txt b/tools/encoding/cp936.txt
index 21385f6..4d7b2d8 100644
--- a/tools/encoding/cp936.txt
+++ b/tools/encoding/cp936.txt
@@ -22063,4 +22063,3 @@
 0xFE4E	0xFA28	#<CJK>
 0xFE4F	0xFA29	#<CJK>
 
-
diff --git a/tools/encoding/cp949.txt b/tools/encoding/cp949.txt
index 7a392cc..3a8933c 100644
--- a/tools/encoding/cp949.txt
+++ b/tools/encoding/cp949.txt
@@ -17318,4 +17318,3 @@
 0xFDFD	0x7FB2	#<CJK>
 0xFDFE	0x8A70	#<CJK>
 
-
diff --git a/tools/encoding/cp950.txt b/tools/encoding/cp950.txt
deleted file mode 100644
index 5902b3d..0000000
--- a/tools/encoding/cp950.txt
+++ /dev/null
@@ -1,13775 +0,0 @@
-#
-#    Name:  cp950_Big5 to Unicode table
-#    Unicode version: 2.0
-#    Table version: 2.00
-#    Table format:  Format A
-#    Date:          04/24/96
-#    Authors:       Lori Brownell <loribr@microsoft.com>
-#                   K.D. Chang    <a-kchang@microsoft.com>
-#    General notes: none
-#
-#    Format: Three tab-separated columns
-#        Column #1 is the Big5 code (in hex as 0xXXXX)
-#        Column #2 is the Unicode (in hex as 0xXXXX)
-#        Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#    The entries are in Big5 order
-#
-0x00	0x0000	#NULL
-0x01	0x0001	#START OF HEADING
-0x02	0x0002	#START OF TEXT
-0x03	0x0003	#END OF TEXT
-0x04	0x0004	#END OF TRANSMISSION
-0x05	0x0005	#ENQUIRY
-0x06	0x0006	#ACKNOWLEDGE
-0x07	0x0007	#BELL
-0x08	0x0008	#BACKSPACE
-0x09	0x0009	#HORIZONTAL TABULATION
-0x0A	0x000A	#LINE FEED
-0x0B	0x000B	#VERTICAL TABULATION
-0x0C	0x000C	#FORM FEED
-0x0D	0x000D	#CARRIAGE RETURN
-0x0E	0x000E	#SHIFT OUT
-0x0F	0x000F	#SHIFT IN
-0x10	0x0010	#DATA LINK ESCAPE
-0x11	0x0011	#DEVICE CONTROL ONE
-0x12	0x0012	#DEVICE CONTROL TWO
-0x13	0x0013	#DEVICE CONTROL THREE
-0x14	0x0014	#DEVICE CONTROL FOUR
-0x15	0x0015	#NEGATIVE ACKNOWLEDGE
-0x16	0x0016	#SYNCHRONOUS IDLE
-0x17	0x0017	#END OF TRANSMISSION BLOCK
-0x18	0x0018	#CANCEL
-0x19	0x0019	#END OF MEDIUM
-0x1A	0x001A	#SUBSTITUTE
-0x1B	0x001B	#ESCAPE
-0x1C	0x001C	#FILE SEPARATOR
-0x1D	0x001D	#GROUP SEPARATOR
-0x1E	0x001E	#RECORD SEPARATOR
-0x1F	0x001F	#UNIT SEPARATOR
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2A	0x002A	#ASTERISK
-0x2B	0x002B	#PLUS SIGN
-0x2C	0x002C	#COMMA
-0x2D	0x002D	#HYPHEN-MINUS
-0x2E	0x002E	#FULL STOP
-0x2F	0x002F	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3A	0x003A	#COLON
-0x3B	0x003B	#SEMICOLON
-0x3C	0x003C	#LESS-THAN SIGN
-0x3D	0x003D	#EQUALS SIGN
-0x3E	0x003E	#GREATER-THAN SIGN
-0x3F	0x003F	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4A	0x004A	#LATIN CAPITAL LETTER J
-0x4B	0x004B	#LATIN CAPITAL LETTER K
-0x4C	0x004C	#LATIN CAPITAL LETTER L
-0x4D	0x004D	#LATIN CAPITAL LETTER M
-0x4E	0x004E	#LATIN CAPITAL LETTER N
-0x4F	0x004F	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5A	0x005A	#LATIN CAPITAL LETTER Z
-0x5B	0x005B	#LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS
-0x5D	0x005D	#RIGHT SQUARE BRACKET
-0x5E	0x005E	#CIRCUMFLEX ACCENT
-0x5F	0x005F	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6A	0x006A	#LATIN SMALL LETTER J
-0x6B	0x006B	#LATIN SMALL LETTER K
-0x6C	0x006C	#LATIN SMALL LETTER L
-0x6D	0x006D	#LATIN SMALL LETTER M
-0x6E	0x006E	#LATIN SMALL LETTER N
-0x6F	0x006F	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7A	0x007A	#LATIN SMALL LETTER Z
-0x7B	0x007B	#LEFT CURLY BRACKET
-0x7C	0x007C	#VERTICAL LINE
-0x7D	0x007D	#RIGHT CURLY BRACKET
-0x7E	0x007E	#TILDE
-0x7F	0x007F	#DELETE
-0x80		#UNDEFINED
-0x81		#DBCS LEAD BYTE
-0x82		#DBCS LEAD BYTE
-0x83		#DBCS LEAD BYTE
-0x84		#DBCS LEAD BYTE
-0x85		#DBCS LEAD BYTE
-0x86		#DBCS LEAD BYTE
-0x87		#DBCS LEAD BYTE
-0x88		#DBCS LEAD BYTE
-0x89		#DBCS LEAD BYTE
-0x8A		#DBCS LEAD BYTE
-0x8B		#DBCS LEAD BYTE
-0x8C		#DBCS LEAD BYTE
-0x8D		#DBCS LEAD BYTE
-0x8E		#DBCS LEAD BYTE
-0x8F		#DBCS LEAD BYTE
-0x90		#DBCS LEAD BYTE
-0x91		#DBCS LEAD BYTE
-0x92		#DBCS LEAD BYTE
-0x93		#DBCS LEAD BYTE
-0x94		#DBCS LEAD BYTE
-0x95		#DBCS LEAD BYTE
-0x96		#DBCS LEAD BYTE
-0x97		#DBCS LEAD BYTE
-0x98		#DBCS LEAD BYTE
-0x99		#DBCS LEAD BYTE
-0x9A		#DBCS LEAD BYTE
-0x9B		#DBCS LEAD BYTE
-0x9C		#DBCS LEAD BYTE
-0x9D		#DBCS LEAD BYTE
-0x9E		#DBCS LEAD BYTE
-0x9F		#DBCS LEAD BYTE
-0xA0		#DBCS LEAD BYTE
-0xA1		#DBCS LEAD BYTE
-0xA2		#DBCS LEAD BYTE
-0xA3		#DBCS LEAD BYTE
-0xA4		#DBCS LEAD BYTE
-0xA5		#DBCS LEAD BYTE
-0xA6		#DBCS LEAD BYTE
-0xA7		#DBCS LEAD BYTE
-0xA8		#DBCS LEAD BYTE
-0xA9		#DBCS LEAD BYTE
-0xAA		#DBCS LEAD BYTE
-0xAB		#DBCS LEAD BYTE
-0xAC		#DBCS LEAD BYTE
-0xAD		#DBCS LEAD BYTE
-0xAE		#DBCS LEAD BYTE
-0xAF		#DBCS LEAD BYTE
-0xB0		#DBCS LEAD BYTE
-0xB1		#DBCS LEAD BYTE
-0xB2		#DBCS LEAD BYTE
-0xB3		#DBCS LEAD BYTE
-0xB4		#DBCS LEAD BYTE
-0xB5		#DBCS LEAD BYTE
-0xB6		#DBCS LEAD BYTE
-0xB7		#DBCS LEAD BYTE
-0xB8		#DBCS LEAD BYTE
-0xB9		#DBCS LEAD BYTE
-0xBA		#DBCS LEAD BYTE
-0xBB		#DBCS LEAD BYTE
-0xBC		#DBCS LEAD BYTE
-0xBD		#DBCS LEAD BYTE
-0xBE		#DBCS LEAD BYTE
-0xBF		#DBCS LEAD BYTE
-0xC0		#DBCS LEAD BYTE
-0xC1		#DBCS LEAD BYTE
-0xC2		#DBCS LEAD BYTE
-0xC3		#DBCS LEAD BYTE
-0xC4		#DBCS LEAD BYTE
-0xC5		#DBCS LEAD BYTE
-0xC6		#DBCS LEAD BYTE
-0xC7		#DBCS LEAD BYTE
-0xC8		#DBCS LEAD BYTE
-0xC9		#DBCS LEAD BYTE
-0xCA		#DBCS LEAD BYTE
-0xCB		#DBCS LEAD BYTE
-0xCC		#DBCS LEAD BYTE
-0xCD		#DBCS LEAD BYTE
-0xCE		#DBCS LEAD BYTE
-0xCF		#DBCS LEAD BYTE
-0xD0		#DBCS LEAD BYTE
-0xD1		#DBCS LEAD BYTE
-0xD2		#DBCS LEAD BYTE
-0xD3		#DBCS LEAD BYTE
-0xD4		#DBCS LEAD BYTE
-0xD5		#DBCS LEAD BYTE
-0xD6		#DBCS LEAD BYTE
-0xD7		#DBCS LEAD BYTE
-0xD8		#DBCS LEAD BYTE
-0xD9		#DBCS LEAD BYTE
-0xDA		#DBCS LEAD BYTE
-0xDB		#DBCS LEAD BYTE
-0xDC		#DBCS LEAD BYTE
-0xDD		#DBCS LEAD BYTE
-0xDE		#DBCS LEAD BYTE
-0xDF		#DBCS LEAD BYTE
-0xE0		#DBCS LEAD BYTE
-0xE1		#DBCS LEAD BYTE
-0xE2		#DBCS LEAD BYTE
-0xE3		#DBCS LEAD BYTE
-0xE4		#DBCS LEAD BYTE
-0xE5		#DBCS LEAD BYTE
-0xE6		#DBCS LEAD BYTE
-0xE7		#DBCS LEAD BYTE
-0xE8		#DBCS LEAD BYTE
-0xE9		#DBCS LEAD BYTE
-0xEA		#DBCS LEAD BYTE
-0xEB		#DBCS LEAD BYTE
-0xEC		#DBCS LEAD BYTE
-0xED		#DBCS LEAD BYTE
-0xEE		#DBCS LEAD BYTE
-0xEF		#DBCS LEAD BYTE
-0xF0		#DBCS LEAD BYTE
-0xF1		#DBCS LEAD BYTE
-0xF2		#DBCS LEAD BYTE
-0xF3		#DBCS LEAD BYTE
-0xF4		#DBCS LEAD BYTE
-0xF5		#DBCS LEAD BYTE
-0xF6		#DBCS LEAD BYTE
-0xF7		#DBCS LEAD BYTE
-0xF8		#DBCS LEAD BYTE
-0xF9		#DBCS LEAD BYTE
-0xFA		#DBCS LEAD BYTE
-0xFB		#DBCS LEAD BYTE
-0xFC		#DBCS LEAD BYTE
-0xFD		#DBCS LEAD BYTE
-0xFE		#DBCS LEAD BYTE
-0xFF		#UNDEFINED
-0xA140	0x3000	#IDEOGRAPHIC SPACE
-0xA141	0xFF0C	#FULLWIDTH COMMA
-0xA142	0x3001	#IDEOGRAPHIC COMMA
-0xA143	0x3002	#IDEOGRAPHIC FULL STOP
-0xA144	0xFF0E	#FULLWIDTH FULL STOP
-0xA145	0x2027	#HYPHENATION POINT
-0xA146	0xFF1B	#FULLWIDTH SEMICOLON
-0xA147	0xFF1A	#FULLWIDTH COLON
-0xA148	0xFF1F	#FULLWIDTH QUESTION MARK
-0xA149	0xFF01	#FULLWIDTH EXCLAMATION MARK
-0xA14A	0xFE30	#PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
-0xA14B	0x2026	#HORIZONTAL ELLIPSIS
-0xA14C	0x2025	#TWO DOT LEADER
-0xA14D	0xFE50	#SMALL COMMA
-0xA14E	0xFE51	#SMALL IDEOGRAPHIC COMMA
-0xA14F	0xFE52	#SMALL FULL STOP
-0xA150	0x00B7	#MIDDLE DOT
-0xA151	0xFE54	#SMALL SEMICOLON
-0xA152	0xFE55	#SMALL COLON
-0xA153	0xFE56	#SMALL QUESTION MARK
-0xA154	0xFE57	#SMALL EXCLAMATION MARK
-0xA155	0xFF5C	#FULLWIDTH VERTICAL LINE
-0xA156	0x2013	#EN DASH
-0xA157	0xFE31	#PRESENTATION FORM FOR VERTICAL EM DASH
-0xA158	0x2014	#EM DASH
-0xA159	0xFE33	#PRESENTATION FORM FOR VERTICAL LOW LINE
-0xA15A	0x2574	#BOX DRAWINGS LIGHT LEFT
-0xA15B	0xFE34	#PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
-0xA15C	0xFE4F	#WAVY LOW LINE
-0xA15D	0xFF08	#FULLWIDTH LEFT PARENTHESIS
-0xA15E	0xFF09	#FULLWIDTH RIGHT PARENTHESIS
-0xA15F	0xFE35	#PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
-0xA160	0xFE36	#PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
-0xA161	0xFF5B	#FULLWIDTH LEFT CURLY BRACKET
-0xA162	0xFF5D	#FULLWIDTH RIGHT CURLY BRACKET
-0xA163	0xFE37	#PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
-0xA164	0xFE38	#PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
-0xA165	0x3014	#LEFT TORTOISE SHELL BRACKET
-0xA166	0x3015	#RIGHT TORTOISE SHELL BRACKET
-0xA167	0xFE39	#PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
-0xA168	0xFE3A	#PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
-0xA169	0x3010	#LEFT BLACK LENTICULAR BRACKET
-0xA16A	0x3011	#RIGHT BLACK LENTICULAR BRACKET
-0xA16B	0xFE3B	#PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
-0xA16C	0xFE3C	#PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
-0xA16D	0x300A	#LEFT DOUBLE ANGLE BRACKET
-0xA16E	0x300B	#RIGHT DOUBLE ANGLE BRACKET
-0xA16F	0xFE3D	#PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
-0xA170	0xFE3E	#PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
-0xA171	0x3008	#LEFT ANGLE BRACKET
-0xA172	0x3009	#RIGHT ANGLE BRACKET
-0xA173	0xFE3F	#PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
-0xA174	0xFE40	#PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
-0xA175	0x300C	#LEFT CORNER BRACKET
-0xA176	0x300D	#RIGHT CORNER BRACKET
-0xA177	0xFE41	#PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
-0xA178	0xFE42	#PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
-0xA179	0x300E	#LEFT WHITE CORNER BRACKET
-0xA17A	0x300F	#RIGHT WHITE CORNER BRACKET
-0xA17B	0xFE43	#PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
-0xA17C	0xFE44	#PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
-0xA17D	0xFE59	#SMALL LEFT PARENTHESIS
-0xA17E	0xFE5A	#SMALL RIGHT PARENTHESIS
-0xA1A1	0xFE5B	#SMALL LEFT CURLY BRACKET
-0xA1A2	0xFE5C	#SMALL RIGHT CURLY BRACKET
-0xA1A3	0xFE5D	#SMALL LEFT TORTOISE SHELL BRACKET
-0xA1A4	0xFE5E	#SMALL RIGHT TORTOISE SHELL BRACKET
-0xA1A5	0x2018	#LEFT SINGLE QUOTATION MARK
-0xA1A6	0x2019	#RIGHT SINGLE QUOTATION MARK
-0xA1A7	0x201C	#LEFT DOUBLE QUOTATION MARK
-0xA1A8	0x201D	#RIGHT DOUBLE QUOTATION MARK
-0xA1A9	0x301D	#REVERSED DOUBLE PRIME QUOTATION MARK
-0xA1AA	0x301E	#DOUBLE PRIME QUOTATION MARK
-0xA1AB	0x2035	#REVERSED PRIME
-0xA1AC	0x2032	#PRIME
-0xA1AD	0xFF03	#FULLWIDTH NUMBER SIGN
-0xA1AE	0xFF06	#FULLWIDTH AMPERSAND
-0xA1AF	0xFF0A	#FULLWIDTH ASTERISK
-0xA1B0	0x203B	#REFERENCE MARK
-0xA1B1	0x00A7	#SECTION SIGN
-0xA1B2	0x3003	#DITTO MARK
-0xA1B3	0x25CB	#WHITE CIRCLE
-0xA1B4	0x25CF	#BLACK CIRCLE
-0xA1B5	0x25B3	#WHITE UP-POINTING TRIANGLE
-0xA1B6	0x25B2	#BLACK UP-POINTING TRIANGLE
-0xA1B7	0x25CE	#BULLSEYE
-0xA1B8	0x2606	#WHITE STAR
-0xA1B9	0x2605	#BLACK STAR
-0xA1BA	0x25C7	#WHITE DIAMOND
-0xA1BB	0x25C6	#BLACK DIAMOND
-0xA1BC	0x25A1	#WHITE SQUARE
-0xA1BD	0x25A0	#BLACK SQUARE
-0xA1BE	0x25BD	#WHITE DOWN-POINTING TRIANGLE
-0xA1BF	0x25BC	#BLACK DOWN-POINTING TRIANGLE
-0xA1C0	0x32A3	#CIRCLED IDEOGRAPH CORRECT
-0xA1C1	0x2105	#CARE OF
-0xA1C2	0x00AF	#MACRON
-0xA1C3	0xFFE3	#FULLWIDTH MACRON
-0xA1C4	0xFF3F	#FULLWIDTH LOW LINE
-0xA1C5	0x02CD	#MODIFIER LETTER LOW MACRON
-0xA1C6	0xFE49	#DASHED OVERLINE
-0xA1C7	0xFE4A	#CENTRELINE OVERLINE
-0xA1C8	0xFE4D	#DASHED LOW LINE
-0xA1C9	0xFE4E	#CENTRELINE LOW LINE
-0xA1CA	0xFE4B	#WAVY OVERLINE
-0xA1CB	0xFE4C	#DOUBLE WAVY OVERLINE
-0xA1CC	0xFE5F	#SMALL NUMBER SIGN
-0xA1CD	0xFE60	#SMALL AMPERSAND
-0xA1CE	0xFE61	#SMALL ASTERISK
-0xA1CF	0xFF0B	#FULLWIDTH PLUS SIGN
-0xA1D0	0xFF0D	#FULLWIDTH HYPHEN-MINUS
-0xA1D1	0x00D7	#MULTIPLICATION SIGN
-0xA1D2	0x00F7	#DIVISION SIGN
-0xA1D3	0x00B1	#PLUS-MINUS SIGN
-0xA1D4	0x221A	#SQUARE ROOT
-0xA1D5	0xFF1C	#FULLWIDTH LESS-THAN SIGN
-0xA1D6	0xFF1E	#FULLWIDTH GREATER-THAN SIGN
-0xA1D7	0xFF1D	#FULLWIDTH EQUALS SIGN
-0xA1D8	0x2266	#LESS-THAN OVER EQUAL TO
-0xA1D9	0x2267	#GREATER-THAN OVER EQUAL TO
-0xA1DA	0x2260	#NOT EQUAL TO
-0xA1DB	0x221E	#INFINITY
-0xA1DC	0x2252	#APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0xA1DD	0x2261	#IDENTICAL TO
-0xA1DE	0xFE62	#SMALL PLUS SIGN
-0xA1DF	0xFE63	#SMALL HYPHEN-MINUS
-0xA1E0	0xFE64	#SMALL LESS-THAN SIGN
-0xA1E1	0xFE65	#SMALL GREATER-THAN SIGN
-0xA1E2	0xFE66	#SMALL EQUALS SIGN
-0xA1E3	0xFF5E	#FULLWIDTH TILDE
-0xA1E4	0x2229	#INTERSECTION
-0xA1E5	0x222A	#UNION
-0xA1E6	0x22A5	#UP TACK
-0xA1E7	0x2220	#ANGLE
-0xA1E8	0x221F	#RIGHT ANGLE
-0xA1E9	0x22BF	#RIGHT TRIANGLE
-0xA1EA	0x33D2	#SQUARE LOG
-0xA1EB	0x33D1	#SQUARE LN
-0xA1EC	0x222B	#INTEGRAL
-0xA1ED	0x222E	#CONTOUR INTEGRAL
-0xA1EE	0x2235	#BECAUSE
-0xA1EF	0x2234	#THEREFORE
-0xA1F0	0x2640	#FEMALE SIGN
-0xA1F1	0x2642	#MALE SIGN
-0xA1F2	0x2295	#CIRCLED PLUS
-0xA1F3	0x2299	#CIRCLED DOT OPERATOR
-0xA1F4	0x2191	#UPWARDS ARROW
-0xA1F5	0x2193	#DOWNWARDS ARROW
-0xA1F6	0x2190	#LEFTWARDS ARROW
-0xA1F7	0x2192	#RIGHTWARDS ARROW
-0xA1F8	0x2196	#NORTH WEST ARROW
-0xA1F9	0x2197	#NORTH EAST ARROW
-0xA1FA	0x2199	#SOUTH WEST ARROW
-0xA1FB	0x2198	#SOUTH EAST ARROW
-0xA1FC	0x2225	#PARALLEL TO
-0xA1FD	0x2223	#DIVIDES
-0xA1FE	0xFF0F	#FULLWIDTH SOLIDUS
-0xA240	0xFF3C	#FULLWIDTH REVERSE SOLIDUS
-0xA241	0x2215	#DIVISION SLASH
-0xA242	0xFE68	#SMALL REVERSE SOLIDUS
-0xA243	0xFF04	#FULLWIDTH DOLLAR SIGN
-0xA244	0xFFE5	#FULLWIDTH YEN SIGN
-0xA245	0x3012	#POSTAL MARK
-0xA246	0xFFE0	#FULLWIDTH CENT SIGN
-0xA247	0xFFE1	#FULLWIDTH POUND SIGN
-0xA248	0xFF05	#FULLWIDTH PERCENT SIGN
-0xA249	0xFF20	#FULLWIDTH COMMERCIAL AT
-0xA24A	0x2103	#DEGREE CELSIUS
-0xA24B	0x2109	#DEGREE FAHRENHEIT
-0xA24C	0xFE69	#SMALL DOLLAR SIGN
-0xA24D	0xFE6A	#SMALL PERCENT SIGN
-0xA24E	0xFE6B	#SMALL COMMERCIAL AT
-0xA24F	0x33D5	#SQUARE MIL
-0xA250	0x339C	#SQUARE MM
-0xA251	0x339D	#SQUARE CM
-0xA252	0x339E	#SQUARE KM
-0xA253	0x33CE	#SQUARE KM CAPITAL
-0xA254	0x33A1	#SQUARE M SQUARED
-0xA255	0x338E	#SQUARE MG
-0xA256	0x338F	#SQUARE KG
-0xA257	0x33C4	#SQUARE CC
-0xA258	0x00B0	#DEGREE SIGN
-0xA259	0x5159	#<CJK>
-0xA25A	0x515B	#<CJK>
-0xA25B	0x515E	#<CJK>
-0xA25C	0x515D	#<CJK>
-0xA25D	0x5161	#<CJK>
-0xA25E	0x5163	#<CJK>
-0xA25F	0x55E7	#<CJK>
-0xA260	0x74E9	#<CJK>
-0xA261	0x7CCE	#<CJK>
-0xA262	0x2581	#LOWER ONE EIGHTH BLOCK
-0xA263	0x2582	#LOWER ONE QUARTER BLOCK
-0xA264	0x2583	#LOWER THREE EIGHTHS BLOCK
-0xA265	0x2584	#LOWER HALF BLOCK
-0xA266	0x2585	#LOWER FIVE EIGHTHS BLOCK
-0xA267	0x2586	#LOWER THREE QUARTERS BLOCK
-0xA268	0x2587	#LOWER SEVEN EIGHTHS BLOCK
-0xA269	0x2588	#FULL BLOCK
-0xA26A	0x258F	#LEFT ONE EIGHTH BLOCK
-0xA26B	0x258E	#LEFT ONE QUARTER BLOCK
-0xA26C	0x258D	#LEFT THREE EIGHTHS BLOCK
-0xA26D	0x258C	#LEFT HALF BLOCK
-0xA26E	0x258B	#LEFT FIVE EIGHTHS BLOCK
-0xA26F	0x258A	#LEFT THREE QUARTERS BLOCK
-0xA270	0x2589	#LEFT SEVEN EIGHTHS BLOCK
-0xA271	0x253C	#BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0xA272	0x2534	#BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0xA273	0x252C	#BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0xA274	0x2524	#BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0xA275	0x251C	#BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0xA276	0x2594	#UPPER ONE EIGHTH BLOCK
-0xA277	0x2500	#BOX DRAWINGS LIGHT HORIZONTAL
-0xA278	0x2502	#BOX DRAWINGS LIGHT VERTICAL
-0xA279	0x2595	#RIGHT ONE EIGHTH BLOCK
-0xA27A	0x250C	#BOX DRAWINGS LIGHT DOWN AND RIGHT
-0xA27B	0x2510	#BOX DRAWINGS LIGHT DOWN AND LEFT
-0xA27C	0x2514	#BOX DRAWINGS LIGHT UP AND RIGHT
-0xA27D	0x2518	#BOX DRAWINGS LIGHT UP AND LEFT
-0xA27E	0x256D	#BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
-0xA2A1	0x256E	#BOX DRAWINGS LIGHT ARC DOWN AND LEFT
-0xA2A2	0x2570	#BOX DRAWINGS LIGHT ARC UP AND RIGHT
-0xA2A3	0x256F	#BOX DRAWINGS LIGHT ARC UP AND LEFT
-0xA2A4	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xA2A5	0x255E	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xA2A6	0x256A	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xA2A7	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xA2A8	0x25E2	#BLACK LOWER RIGHT TRIANGLE
-0xA2A9	0x25E3	#BLACK LOWER LEFT TRIANGLE
-0xA2AA	0x25E5	#BLACK UPPER RIGHT TRIANGLE
-0xA2AB	0x25E4	#BLACK UPPER LEFT TRIANGLE
-0xA2AC	0x2571	#BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
-0xA2AD	0x2572	#BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
-0xA2AE	0x2573	#BOX DRAWINGS LIGHT DIAGONAL CROSS
-0xA2AF	0xFF10	#FULLWIDTH DIGIT ZERO
-0xA2B0	0xFF11	#FULLWIDTH DIGIT ONE
-0xA2B1	0xFF12	#FULLWIDTH DIGIT TWO
-0xA2B2	0xFF13	#FULLWIDTH DIGIT THREE
-0xA2B3	0xFF14	#FULLWIDTH DIGIT FOUR
-0xA2B4	0xFF15	#FULLWIDTH DIGIT FIVE
-0xA2B5	0xFF16	#FULLWIDTH DIGIT SIX
-0xA2B6	0xFF17	#FULLWIDTH DIGIT SEVEN
-0xA2B7	0xFF18	#FULLWIDTH DIGIT EIGHT
-0xA2B8	0xFF19	#FULLWIDTH DIGIT NINE
-0xA2B9	0x2160	#ROMAN NUMERAL ONE
-0xA2BA	0x2161	#ROMAN NUMERAL TWO
-0xA2BB	0x2162	#ROMAN NUMERAL THREE
-0xA2BC	0x2163	#ROMAN NUMERAL FOUR
-0xA2BD	0x2164	#ROMAN NUMERAL FIVE
-0xA2BE	0x2165	#ROMAN NUMERAL SIX
-0xA2BF	0x2166	#ROMAN NUMERAL SEVEN
-0xA2C0	0x2167	#ROMAN NUMERAL EIGHT
-0xA2C1	0x2168	#ROMAN NUMERAL NINE
-0xA2C2	0x2169	#ROMAN NUMERAL TEN
-0xA2C3	0x3021	#HANGZHOU NUMERAL ONE
-0xA2C4	0x3022	#HANGZHOU NUMERAL TWO
-0xA2C5	0x3023	#HANGZHOU NUMERAL THREE
-0xA2C6	0x3024	#HANGZHOU NUMERAL FOUR
-0xA2C7	0x3025	#HANGZHOU NUMERAL FIVE
-0xA2C8	0x3026	#HANGZHOU NUMERAL SIX
-0xA2C9	0x3027	#HANGZHOU NUMERAL SEVEN
-0xA2CA	0x3028	#HANGZHOU NUMERAL EIGHT
-0xA2CB	0x3029	#HANGZHOU NUMERAL NINE
-0xA2CC	0x5341	#<CJK>
-0xA2CD	0x5344	#<CJK>
-0xA2CE	0x5345	#<CJK>
-0xA2CF	0xFF21	#FULLWIDTH LATIN CAPITAL LETTER A
-0xA2D0	0xFF22	#FULLWIDTH LATIN CAPITAL LETTER B
-0xA2D1	0xFF23	#FULLWIDTH LATIN CAPITAL LETTER C
-0xA2D2	0xFF24	#FULLWIDTH LATIN CAPITAL LETTER D
-0xA2D3	0xFF25	#FULLWIDTH LATIN CAPITAL LETTER E
-0xA2D4	0xFF26	#FULLWIDTH LATIN CAPITAL LETTER F
-0xA2D5	0xFF27	#FULLWIDTH LATIN CAPITAL LETTER G
-0xA2D6	0xFF28	#FULLWIDTH LATIN CAPITAL LETTER H
-0xA2D7	0xFF29	#FULLWIDTH LATIN CAPITAL LETTER I
-0xA2D8	0xFF2A	#FULLWIDTH LATIN CAPITAL LETTER J
-0xA2D9	0xFF2B	#FULLWIDTH LATIN CAPITAL LETTER K
-0xA2DA	0xFF2C	#FULLWIDTH LATIN CAPITAL LETTER L
-0xA2DB	0xFF2D	#FULLWIDTH LATIN CAPITAL LETTER M
-0xA2DC	0xFF2E	#FULLWIDTH LATIN CAPITAL LETTER N
-0xA2DD	0xFF2F	#FULLWIDTH LATIN CAPITAL LETTER O
-0xA2DE	0xFF30	#FULLWIDTH LATIN CAPITAL LETTER P
-0xA2DF	0xFF31	#FULLWIDTH LATIN CAPITAL LETTER Q
-0xA2E0	0xFF32	#FULLWIDTH LATIN CAPITAL LETTER R
-0xA2E1	0xFF33	#FULLWIDTH LATIN CAPITAL LETTER S
-0xA2E2	0xFF34	#FULLWIDTH LATIN CAPITAL LETTER T
-0xA2E3	0xFF35	#FULLWIDTH LATIN CAPITAL LETTER U
-0xA2E4	0xFF36	#FULLWIDTH LATIN CAPITAL LETTER V
-0xA2E5	0xFF37	#FULLWIDTH LATIN CAPITAL LETTER W
-0xA2E6	0xFF38	#FULLWIDTH LATIN CAPITAL LETTER X
-0xA2E7	0xFF39	#FULLWIDTH LATIN CAPITAL LETTER Y
-0xA2E8	0xFF3A	#FULLWIDTH LATIN CAPITAL LETTER Z
-0xA2E9	0xFF41	#FULLWIDTH LATIN SMALL LETTER A
-0xA2EA	0xFF42	#FULLWIDTH LATIN SMALL LETTER B
-0xA2EB	0xFF43	#FULLWIDTH LATIN SMALL LETTER C
-0xA2EC	0xFF44	#FULLWIDTH LATIN SMALL LETTER D
-0xA2ED	0xFF45	#FULLWIDTH LATIN SMALL LETTER E
-0xA2EE	0xFF46	#FULLWIDTH LATIN SMALL LETTER F
-0xA2EF	0xFF47	#FULLWIDTH LATIN SMALL LETTER G
-0xA2F0	0xFF48	#FULLWIDTH LATIN SMALL LETTER H
-0xA2F1	0xFF49	#FULLWIDTH LATIN SMALL LETTER I
-0xA2F2	0xFF4A	#FULLWIDTH LATIN SMALL LETTER J
-0xA2F3	0xFF4B	#FULLWIDTH LATIN SMALL LETTER K
-0xA2F4	0xFF4C	#FULLWIDTH LATIN SMALL LETTER L
-0xA2F5	0xFF4D	#FULLWIDTH LATIN SMALL LETTER M
-0xA2F6	0xFF4E	#FULLWIDTH LATIN SMALL LETTER N
-0xA2F7	0xFF4F	#FULLWIDTH LATIN SMALL LETTER O
-0xA2F8	0xFF50	#FULLWIDTH LATIN SMALL LETTER P
-0xA2F9	0xFF51	#FULLWIDTH LATIN SMALL LETTER Q
-0xA2FA	0xFF52	#FULLWIDTH LATIN SMALL LETTER R
-0xA2FB	0xFF53	#FULLWIDTH LATIN SMALL LETTER S
-0xA2FC	0xFF54	#FULLWIDTH LATIN SMALL LETTER T
-0xA2FD	0xFF55	#FULLWIDTH LATIN SMALL LETTER U
-0xA2FE	0xFF56	#FULLWIDTH LATIN SMALL LETTER V
-0xA340	0xFF57	#FULLWIDTH LATIN SMALL LETTER W
-0xA341	0xFF58	#FULLWIDTH LATIN SMALL LETTER X
-0xA342	0xFF59	#FULLWIDTH LATIN SMALL LETTER Y
-0xA343	0xFF5A	#FULLWIDTH LATIN SMALL LETTER Z
-0xA344	0x0391	#GREEK CAPITAL LETTER ALPHA
-0xA345	0x0392	#GREEK CAPITAL LETTER BETA
-0xA346	0x0393	#GREEK CAPITAL LETTER GAMMA
-0xA347	0x0394	#GREEK CAPITAL LETTER DELTA
-0xA348	0x0395	#GREEK CAPITAL LETTER EPSILON
-0xA349	0x0396	#GREEK CAPITAL LETTER ZETA
-0xA34A	0x0397	#GREEK CAPITAL LETTER ETA
-0xA34B	0x0398	#GREEK CAPITAL LETTER THETA
-0xA34C	0x0399	#GREEK CAPITAL LETTER IOTA
-0xA34D	0x039A	#GREEK CAPITAL LETTER KAPPA
-0xA34E	0x039B	#GREEK CAPITAL LETTER LAMDA
-0xA34F	0x039C	#GREEK CAPITAL LETTER MU
-0xA350	0x039D	#GREEK CAPITAL LETTER NU
-0xA351	0x039E	#GREEK CAPITAL LETTER XI
-0xA352	0x039F	#GREEK CAPITAL LETTER OMICRON
-0xA353	0x03A0	#GREEK CAPITAL LETTER PI
-0xA354	0x03A1	#GREEK CAPITAL LETTER RHO
-0xA355	0x03A3	#GREEK CAPITAL LETTER SIGMA
-0xA356	0x03A4	#GREEK CAPITAL LETTER TAU
-0xA357	0x03A5	#GREEK CAPITAL LETTER UPSILON
-0xA358	0x03A6	#GREEK CAPITAL LETTER PHI
-0xA359	0x03A7	#GREEK CAPITAL LETTER CHI
-0xA35A	0x03A8	#GREEK CAPITAL LETTER PSI
-0xA35B	0x03A9	#GREEK CAPITAL LETTER OMEGA
-0xA35C	0x03B1	#GREEK SMALL LETTER ALPHA
-0xA35D	0x03B2	#GREEK SMALL LETTER BETA
-0xA35E	0x03B3	#GREEK SMALL LETTER GAMMA
-0xA35F	0x03B4	#GREEK SMALL LETTER DELTA
-0xA360	0x03B5	#GREEK SMALL LETTER EPSILON
-0xA361	0x03B6	#GREEK SMALL LETTER ZETA
-0xA362	0x03B7	#GREEK SMALL LETTER ETA
-0xA363	0x03B8	#GREEK SMALL LETTER THETA
-0xA364	0x03B9	#GREEK SMALL LETTER IOTA
-0xA365	0x03BA	#GREEK SMALL LETTER KAPPA
-0xA366	0x03BB	#GREEK SMALL LETTER LAMDA
-0xA367	0x03BC	#GREEK SMALL LETTER MU
-0xA368	0x03BD	#GREEK SMALL LETTER NU
-0xA369	0x03BE	#GREEK SMALL LETTER XI
-0xA36A	0x03BF	#GREEK SMALL LETTER OMICRON
-0xA36B	0x03C0	#GREEK SMALL LETTER PI
-0xA36C	0x03C1	#GREEK SMALL LETTER RHO
-0xA36D	0x03C3	#GREEK SMALL LETTER SIGMA
-0xA36E	0x03C4	#GREEK SMALL LETTER TAU
-0xA36F	0x03C5	#GREEK SMALL LETTER UPSILON
-0xA370	0x03C6	#GREEK SMALL LETTER PHI
-0xA371	0x03C7	#GREEK SMALL LETTER CHI
-0xA372	0x03C8	#GREEK SMALL LETTER PSI
-0xA373	0x03C9	#GREEK SMALL LETTER OMEGA
-0xA374	0x3105	#BOPOMOFO LETTER B
-0xA375	0x3106	#BOPOMOFO LETTER P
-0xA376	0x3107	#BOPOMOFO LETTER M
-0xA377	0x3108	#BOPOMOFO LETTER F
-0xA378	0x3109	#BOPOMOFO LETTER D
-0xA379	0x310A	#BOPOMOFO LETTER T
-0xA37A	0x310B	#BOPOMOFO LETTER N
-0xA37B	0x310C	#BOPOMOFO LETTER L
-0xA37C	0x310D	#BOPOMOFO LETTER G
-0xA37D	0x310E	#BOPOMOFO LETTER K
-0xA37E	0x310F	#BOPOMOFO LETTER H
-0xA3A1	0x3110	#BOPOMOFO LETTER J
-0xA3A2	0x3111	#BOPOMOFO LETTER Q
-0xA3A3	0x3112	#BOPOMOFO LETTER X
-0xA3A4	0x3113	#BOPOMOFO LETTER ZH
-0xA3A5	0x3114	#BOPOMOFO LETTER CH
-0xA3A6	0x3115	#BOPOMOFO LETTER SH
-0xA3A7	0x3116	#BOPOMOFO LETTER R
-0xA3A8	0x3117	#BOPOMOFO LETTER Z
-0xA3A9	0x3118	#BOPOMOFO LETTER C
-0xA3AA	0x3119	#BOPOMOFO LETTER S
-0xA3AB	0x311A	#BOPOMOFO LETTER A
-0xA3AC	0x311B	#BOPOMOFO LETTER O
-0xA3AD	0x311C	#BOPOMOFO LETTER E
-0xA3AE	0x311D	#BOPOMOFO LETTER EH
-0xA3AF	0x311E	#BOPOMOFO LETTER AI
-0xA3B0	0x311F	#BOPOMOFO LETTER EI
-0xA3B1	0x3120	#BOPOMOFO LETTER AU
-0xA3B2	0x3121	#BOPOMOFO LETTER OU
-0xA3B3	0x3122	#BOPOMOFO LETTER AN
-0xA3B4	0x3123	#BOPOMOFO LETTER EN
-0xA3B5	0x3124	#BOPOMOFO LETTER ANG
-0xA3B6	0x3125	#BOPOMOFO LETTER ENG
-0xA3B7	0x3126	#BOPOMOFO LETTER ER
-0xA3B8	0x3127	#BOPOMOFO LETTER I
-0xA3B9	0x3128	#BOPOMOFO LETTER U
-0xA3BA	0x3129	#BOPOMOFO LETTER IU
-0xA3BB	0x02D9	#DOT ABOVE
-0xA3BC	0x02C9	#MODIFIER LETTER MACRON (MANDARIN CHINESE FIRST TONE)
-0xA3BD	0x02CA	#MODIFIER LETTER ACUTE ACCENT
-0xA3BE	0x02C7	#CARON
-0xA3BF	0x02CB	#MODIFIER LETTER GRAVE ACCENT
-0xA440	0x4E00	#<CJK>
-0xA441	0x4E59	#<CJK>
-0xA442	0x4E01	#<CJK>
-0xA443	0x4E03	#<CJK>
-0xA444	0x4E43	#<CJK>
-0xA445	0x4E5D	#<CJK>
-0xA446	0x4E86	#<CJK>
-0xA447	0x4E8C	#<CJK>
-0xA448	0x4EBA	#<CJK>
-0xA449	0x513F	#<CJK>
-0xA44A	0x5165	#<CJK>
-0xA44B	0x516B	#<CJK>
-0xA44C	0x51E0	#<CJK>
-0xA44D	0x5200	#<CJK>
-0xA44E	0x5201	#<CJK>
-0xA44F	0x529B	#<CJK>
-0xA450	0x5315	#<CJK>
-0xA451	0x5341	#<CJK>
-0xA452	0x535C	#<CJK>
-0xA453	0x53C8	#<CJK>
-0xA454	0x4E09	#<CJK>
-0xA455	0x4E0B	#<CJK>
-0xA456	0x4E08	#<CJK>
-0xA457	0x4E0A	#<CJK>
-0xA458	0x4E2B	#<CJK>
-0xA459	0x4E38	#<CJK>
-0xA45A	0x51E1	#<CJK>
-0xA45B	0x4E45	#<CJK>
-0xA45C	0x4E48	#<CJK>
-0xA45D	0x4E5F	#<CJK>
-0xA45E	0x4E5E	#<CJK>
-0xA45F	0x4E8E	#<CJK>
-0xA460	0x4EA1	#<CJK>
-0xA461	0x5140	#<CJK>
-0xA462	0x5203	#<CJK>
-0xA463	0x52FA	#<CJK>
-0xA464	0x5343	#<CJK>
-0xA465	0x53C9	#<CJK>
-0xA466	0x53E3	#<CJK>
-0xA467	0x571F	#<CJK>
-0xA468	0x58EB	#<CJK>
-0xA469	0x5915	#<CJK>
-0xA46A	0x5927	#<CJK>
-0xA46B	0x5973	#<CJK>
-0xA46C	0x5B50	#<CJK>
-0xA46D	0x5B51	#<CJK>
-0xA46E	0x5B53	#<CJK>
-0xA46F	0x5BF8	#<CJK>
-0xA470	0x5C0F	#<CJK>
-0xA471	0x5C22	#<CJK>
-0xA472	0x5C38	#<CJK>
-0xA473	0x5C71	#<CJK>
-0xA474	0x5DDD	#<CJK>
-0xA475	0x5DE5	#<CJK>
-0xA476	0x5DF1	#<CJK>
-0xA477	0x5DF2	#<CJK>
-0xA478	0x5DF3	#<CJK>
-0xA479	0x5DFE	#<CJK>
-0xA47A	0x5E72	#<CJK>
-0xA47B	0x5EFE	#<CJK>
-0xA47C	0x5F0B	#<CJK>
-0xA47D	0x5F13	#<CJK>
-0xA47E	0x624D	#<CJK>
-0xA4A1	0x4E11	#<CJK>
-0xA4A2	0x4E10	#<CJK>
-0xA4A3	0x4E0D	#<CJK>
-0xA4A4	0x4E2D	#<CJK>
-0xA4A5	0x4E30	#<CJK>
-0xA4A6	0x4E39	#<CJK>
-0xA4A7	0x4E4B	#<CJK>
-0xA4A8	0x5C39	#<CJK>
-0xA4A9	0x4E88	#<CJK>
-0xA4AA	0x4E91	#<CJK>
-0xA4AB	0x4E95	#<CJK>
-0xA4AC	0x4E92	#<CJK>
-0xA4AD	0x4E94	#<CJK>
-0xA4AE	0x4EA2	#<CJK>
-0xA4AF	0x4EC1	#<CJK>
-0xA4B0	0x4EC0	#<CJK>
-0xA4B1	0x4EC3	#<CJK>
-0xA4B2	0x4EC6	#<CJK>
-0xA4B3	0x4EC7	#<CJK>
-0xA4B4	0x4ECD	#<CJK>
-0xA4B5	0x4ECA	#<CJK>
-0xA4B6	0x4ECB	#<CJK>
-0xA4B7	0x4EC4	#<CJK>
-0xA4B8	0x5143	#<CJK>
-0xA4B9	0x5141	#<CJK>
-0xA4BA	0x5167	#<CJK>
-0xA4BB	0x516D	#<CJK>
-0xA4BC	0x516E	#<CJK>
-0xA4BD	0x516C	#<CJK>
-0xA4BE	0x5197	#<CJK>
-0xA4BF	0x51F6	#<CJK>
-0xA4C0	0x5206	#<CJK>
-0xA4C1	0x5207	#<CJK>
-0xA4C2	0x5208	#<CJK>
-0xA4C3	0x52FB	#<CJK>
-0xA4C4	0x52FE	#<CJK>
-0xA4C5	0x52FF	#<CJK>
-0xA4C6	0x5316	#<CJK>
-0xA4C7	0x5339	#<CJK>
-0xA4C8	0x5348	#<CJK>
-0xA4C9	0x5347	#<CJK>
-0xA4CA	0x5345	#<CJK>
-0xA4CB	0x535E	#<CJK>
-0xA4CC	0x5384	#<CJK>
-0xA4CD	0x53CB	#<CJK>
-0xA4CE	0x53CA	#<CJK>
-0xA4CF	0x53CD	#<CJK>
-0xA4D0	0x58EC	#<CJK>
-0xA4D1	0x5929	#<CJK>
-0xA4D2	0x592B	#<CJK>
-0xA4D3	0x592A	#<CJK>
-0xA4D4	0x592D	#<CJK>
-0xA4D5	0x5B54	#<CJK>
-0xA4D6	0x5C11	#<CJK>
-0xA4D7	0x5C24	#<CJK>
-0xA4D8	0x5C3A	#<CJK>
-0xA4D9	0x5C6F	#<CJK>
-0xA4DA	0x5DF4	#<CJK>
-0xA4DB	0x5E7B	#<CJK>
-0xA4DC	0x5EFF	#<CJK>
-0xA4DD	0x5F14	#<CJK>
-0xA4DE	0x5F15	#<CJK>
-0xA4DF	0x5FC3	#<CJK>
-0xA4E0	0x6208	#<CJK>
-0xA4E1	0x6236	#<CJK>
-0xA4E2	0x624B	#<CJK>
-0xA4E3	0x624E	#<CJK>
-0xA4E4	0x652F	#<CJK>
-0xA4E5	0x6587	#<CJK>
-0xA4E6	0x6597	#<CJK>
-0xA4E7	0x65A4	#<CJK>
-0xA4E8	0x65B9	#<CJK>
-0xA4E9	0x65E5	#<CJK>
-0xA4EA	0x66F0	#<CJK>
-0xA4EB	0x6708	#<CJK>
-0xA4EC	0x6728	#<CJK>
-0xA4ED	0x6B20	#<CJK>
-0xA4EE	0x6B62	#<CJK>
-0xA4EF	0x6B79	#<CJK>
-0xA4F0	0x6BCB	#<CJK>
-0xA4F1	0x6BD4	#<CJK>
-0xA4F2	0x6BDB	#<CJK>
-0xA4F3	0x6C0F	#<CJK>
-0xA4F4	0x6C34	#<CJK>
-0xA4F5	0x706B	#<CJK>
-0xA4F6	0x722A	#<CJK>
-0xA4F7	0x7236	#<CJK>
-0xA4F8	0x723B	#<CJK>
-0xA4F9	0x7247	#<CJK>
-0xA4FA	0x7259	#<CJK>
-0xA4FB	0x725B	#<CJK>
-0xA4FC	0x72AC	#<CJK>
-0xA4FD	0x738B	#<CJK>
-0xA4FE	0x4E19	#<CJK>
-0xA540	0x4E16	#<CJK>
-0xA541	0x4E15	#<CJK>
-0xA542	0x4E14	#<CJK>
-0xA543	0x4E18	#<CJK>
-0xA544	0x4E3B	#<CJK>
-0xA545	0x4E4D	#<CJK>
-0xA546	0x4E4F	#<CJK>
-0xA547	0x4E4E	#<CJK>
-0xA548	0x4EE5	#<CJK>
-0xA549	0x4ED8	#<CJK>
-0xA54A	0x4ED4	#<CJK>
-0xA54B	0x4ED5	#<CJK>
-0xA54C	0x4ED6	#<CJK>
-0xA54D	0x4ED7	#<CJK>
-0xA54E	0x4EE3	#<CJK>
-0xA54F	0x4EE4	#<CJK>
-0xA550	0x4ED9	#<CJK>
-0xA551	0x4EDE	#<CJK>
-0xA552	0x5145	#<CJK>
-0xA553	0x5144	#<CJK>
-0xA554	0x5189	#<CJK>
-0xA555	0x518A	#<CJK>
-0xA556	0x51AC	#<CJK>
-0xA557	0x51F9	#<CJK>
-0xA558	0x51FA	#<CJK>
-0xA559	0x51F8	#<CJK>
-0xA55A	0x520A	#<CJK>
-0xA55B	0x52A0	#<CJK>
-0xA55C	0x529F	#<CJK>
-0xA55D	0x5305	#<CJK>
-0xA55E	0x5306	#<CJK>
-0xA55F	0x5317	#<CJK>
-0xA560	0x531D	#<CJK>
-0xA561	0x4EDF	#<CJK>
-0xA562	0x534A	#<CJK>
-0xA563	0x5349	#<CJK>
-0xA564	0x5361	#<CJK>
-0xA565	0x5360	#<CJK>
-0xA566	0x536F	#<CJK>
-0xA567	0x536E	#<CJK>
-0xA568	0x53BB	#<CJK>
-0xA569	0x53EF	#<CJK>
-0xA56A	0x53E4	#<CJK>
-0xA56B	0x53F3	#<CJK>
-0xA56C	0x53EC	#<CJK>
-0xA56D	0x53EE	#<CJK>
-0xA56E	0x53E9	#<CJK>
-0xA56F	0x53E8	#<CJK>
-0xA570	0x53FC	#<CJK>
-0xA571	0x53F8	#<CJK>
-0xA572	0x53F5	#<CJK>
-0xA573	0x53EB	#<CJK>
-0xA574	0x53E6	#<CJK>
-0xA575	0x53EA	#<CJK>
-0xA576	0x53F2	#<CJK>
-0xA577	0x53F1	#<CJK>
-0xA578	0x53F0	#<CJK>
-0xA579	0x53E5	#<CJK>
-0xA57A	0x53ED	#<CJK>
-0xA57B	0x53FB	#<CJK>
-0xA57C	0x56DB	#<CJK>
-0xA57D	0x56DA	#<CJK>
-0xA57E	0x5916	#<CJK>
-0xA5A1	0x592E	#<CJK>
-0xA5A2	0x5931	#<CJK>
-0xA5A3	0x5974	#<CJK>
-0xA5A4	0x5976	#<CJK>
-0xA5A5	0x5B55	#<CJK>
-0xA5A6	0x5B83	#<CJK>
-0xA5A7	0x5C3C	#<CJK>
-0xA5A8	0x5DE8	#<CJK>
-0xA5A9	0x5DE7	#<CJK>
-0xA5AA	0x5DE6	#<CJK>
-0xA5AB	0x5E02	#<CJK>
-0xA5AC	0x5E03	#<CJK>
-0xA5AD	0x5E73	#<CJK>
-0xA5AE	0x5E7C	#<CJK>
-0xA5AF	0x5F01	#<CJK>
-0xA5B0	0x5F18	#<CJK>
-0xA5B1	0x5F17	#<CJK>
-0xA5B2	0x5FC5	#<CJK>
-0xA5B3	0x620A	#<CJK>
-0xA5B4	0x6253	#<CJK>
-0xA5B5	0x6254	#<CJK>
-0xA5B6	0x6252	#<CJK>
-0xA5B7	0x6251	#<CJK>
-0xA5B8	0x65A5	#<CJK>
-0xA5B9	0x65E6	#<CJK>
-0xA5BA	0x672E	#<CJK>
-0xA5BB	0x672C	#<CJK>
-0xA5BC	0x672A	#<CJK>
-0xA5BD	0x672B	#<CJK>
-0xA5BE	0x672D	#<CJK>
-0xA5BF	0x6B63	#<CJK>
-0xA5C0	0x6BCD	#<CJK>
-0xA5C1	0x6C11	#<CJK>
-0xA5C2	0x6C10	#<CJK>
-0xA5C3	0x6C38	#<CJK>
-0xA5C4	0x6C41	#<CJK>
-0xA5C5	0x6C40	#<CJK>
-0xA5C6	0x6C3E	#<CJK>
-0xA5C7	0x72AF	#<CJK>
-0xA5C8	0x7384	#<CJK>
-0xA5C9	0x7389	#<CJK>
-0xA5CA	0x74DC	#<CJK>
-0xA5CB	0x74E6	#<CJK>
-0xA5CC	0x7518	#<CJK>
-0xA5CD	0x751F	#<CJK>
-0xA5CE	0x7528	#<CJK>
-0xA5CF	0x7529	#<CJK>
-0xA5D0	0x7530	#<CJK>
-0xA5D1	0x7531	#<CJK>
-0xA5D2	0x7532	#<CJK>
-0xA5D3	0x7533	#<CJK>
-0xA5D4	0x758B	#<CJK>
-0xA5D5	0x767D	#<CJK>
-0xA5D6	0x76AE	#<CJK>
-0xA5D7	0x76BF	#<CJK>
-0xA5D8	0x76EE	#<CJK>
-0xA5D9	0x77DB	#<CJK>
-0xA5DA	0x77E2	#<CJK>
-0xA5DB	0x77F3	#<CJK>
-0xA5DC	0x793A	#<CJK>
-0xA5DD	0x79BE	#<CJK>
-0xA5DE	0x7A74	#<CJK>
-0xA5DF	0x7ACB	#<CJK>
-0xA5E0	0x4E1E	#<CJK>
-0xA5E1	0x4E1F	#<CJK>
-0xA5E2	0x4E52	#<CJK>
-0xA5E3	0x4E53	#<CJK>
-0xA5E4	0x4E69	#<CJK>
-0xA5E5	0x4E99	#<CJK>
-0xA5E6	0x4EA4	#<CJK>
-0xA5E7	0x4EA6	#<CJK>
-0xA5E8	0x4EA5	#<CJK>
-0xA5E9	0x4EFF	#<CJK>
-0xA5EA	0x4F09	#<CJK>
-0xA5EB	0x4F19	#<CJK>
-0xA5EC	0x4F0A	#<CJK>
-0xA5ED	0x4F15	#<CJK>
-0xA5EE	0x4F0D	#<CJK>
-0xA5EF	0x4F10	#<CJK>
-0xA5F0	0x4F11	#<CJK>
-0xA5F1	0x4F0F	#<CJK>
-0xA5F2	0x4EF2	#<CJK>
-0xA5F3	0x4EF6	#<CJK>
-0xA5F4	0x4EFB	#<CJK>
-0xA5F5	0x4EF0	#<CJK>
-0xA5F6	0x4EF3	#<CJK>
-0xA5F7	0x4EFD	#<CJK>
-0xA5F8	0x4F01	#<CJK>
-0xA5F9	0x4F0B	#<CJK>
-0xA5FA	0x5149	#<CJK>
-0xA5FB	0x5147	#<CJK>
-0xA5FC	0x5146	#<CJK>
-0xA5FD	0x5148	#<CJK>
-0xA5FE	0x5168	#<CJK>
-0xA640	0x5171	#<CJK>
-0xA641	0x518D	#<CJK>
-0xA642	0x51B0	#<CJK>
-0xA643	0x5217	#<CJK>
-0xA644	0x5211	#<CJK>
-0xA645	0x5212	#<CJK>
-0xA646	0x520E	#<CJK>
-0xA647	0x5216	#<CJK>
-0xA648	0x52A3	#<CJK>
-0xA649	0x5308	#<CJK>
-0xA64A	0x5321	#<CJK>
-0xA64B	0x5320	#<CJK>
-0xA64C	0x5370	#<CJK>
-0xA64D	0x5371	#<CJK>
-0xA64E	0x5409	#<CJK>
-0xA64F	0x540F	#<CJK>
-0xA650	0x540C	#<CJK>
-0xA651	0x540A	#<CJK>
-0xA652	0x5410	#<CJK>
-0xA653	0x5401	#<CJK>
-0xA654	0x540B	#<CJK>
-0xA655	0x5404	#<CJK>
-0xA656	0x5411	#<CJK>
-0xA657	0x540D	#<CJK>
-0xA658	0x5408	#<CJK>
-0xA659	0x5403	#<CJK>
-0xA65A	0x540E	#<CJK>
-0xA65B	0x5406	#<CJK>
-0xA65C	0x5412	#<CJK>
-0xA65D	0x56E0	#<CJK>
-0xA65E	0x56DE	#<CJK>
-0xA65F	0x56DD	#<CJK>
-0xA660	0x5733	#<CJK>
-0xA661	0x5730	#<CJK>
-0xA662	0x5728	#<CJK>
-0xA663	0x572D	#<CJK>
-0xA664	0x572C	#<CJK>
-0xA665	0x572F	#<CJK>
-0xA666	0x5729	#<CJK>
-0xA667	0x5919	#<CJK>
-0xA668	0x591A	#<CJK>
-0xA669	0x5937	#<CJK>
-0xA66A	0x5938	#<CJK>
-0xA66B	0x5984	#<CJK>
-0xA66C	0x5978	#<CJK>
-0xA66D	0x5983	#<CJK>
-0xA66E	0x597D	#<CJK>
-0xA66F	0x5979	#<CJK>
-0xA670	0x5982	#<CJK>
-0xA671	0x5981	#<CJK>
-0xA672	0x5B57	#<CJK>
-0xA673	0x5B58	#<CJK>
-0xA674	0x5B87	#<CJK>
-0xA675	0x5B88	#<CJK>
-0xA676	0x5B85	#<CJK>
-0xA677	0x5B89	#<CJK>
-0xA678	0x5BFA	#<CJK>
-0xA679	0x5C16	#<CJK>
-0xA67A	0x5C79	#<CJK>
-0xA67B	0x5DDE	#<CJK>
-0xA67C	0x5E06	#<CJK>
-0xA67D	0x5E76	#<CJK>
-0xA67E	0x5E74	#<CJK>
-0xA6A1	0x5F0F	#<CJK>
-0xA6A2	0x5F1B	#<CJK>
-0xA6A3	0x5FD9	#<CJK>
-0xA6A4	0x5FD6	#<CJK>
-0xA6A5	0x620E	#<CJK>
-0xA6A6	0x620C	#<CJK>
-0xA6A7	0x620D	#<CJK>
-0xA6A8	0x6210	#<CJK>
-0xA6A9	0x6263	#<CJK>
-0xA6AA	0x625B	#<CJK>
-0xA6AB	0x6258	#<CJK>
-0xA6AC	0x6536	#<CJK>
-0xA6AD	0x65E9	#<CJK>
-0xA6AE	0x65E8	#<CJK>
-0xA6AF	0x65EC	#<CJK>
-0xA6B0	0x65ED	#<CJK>
-0xA6B1	0x66F2	#<CJK>
-0xA6B2	0x66F3	#<CJK>
-0xA6B3	0x6709	#<CJK>
-0xA6B4	0x673D	#<CJK>
-0xA6B5	0x6734	#<CJK>
-0xA6B6	0x6731	#<CJK>
-0xA6B7	0x6735	#<CJK>
-0xA6B8	0x6B21	#<CJK>
-0xA6B9	0x6B64	#<CJK>
-0xA6BA	0x6B7B	#<CJK>
-0xA6BB	0x6C16	#<CJK>
-0xA6BC	0x6C5D	#<CJK>
-0xA6BD	0x6C57	#<CJK>
-0xA6BE	0x6C59	#<CJK>
-0xA6BF	0x6C5F	#<CJK>
-0xA6C0	0x6C60	#<CJK>
-0xA6C1	0x6C50	#<CJK>
-0xA6C2	0x6C55	#<CJK>
-0xA6C3	0x6C61	#<CJK>
-0xA6C4	0x6C5B	#<CJK>
-0xA6C5	0x6C4D	#<CJK>
-0xA6C6	0x6C4E	#<CJK>
-0xA6C7	0x7070	#<CJK>
-0xA6C8	0x725F	#<CJK>
-0xA6C9	0x725D	#<CJK>
-0xA6CA	0x767E	#<CJK>
-0xA6CB	0x7AF9	#<CJK>
-0xA6CC	0x7C73	#<CJK>
-0xA6CD	0x7CF8	#<CJK>
-0xA6CE	0x7F36	#<CJK>
-0xA6CF	0x7F8A	#<CJK>
-0xA6D0	0x7FBD	#<CJK>
-0xA6D1	0x8001	#<CJK>
-0xA6D2	0x8003	#<CJK>
-0xA6D3	0x800C	#<CJK>
-0xA6D4	0x8012	#<CJK>
-0xA6D5	0x8033	#<CJK>
-0xA6D6	0x807F	#<CJK>
-0xA6D7	0x8089	#<CJK>
-0xA6D8	0x808B	#<CJK>
-0xA6D9	0x808C	#<CJK>
-0xA6DA	0x81E3	#<CJK>
-0xA6DB	0x81EA	#<CJK>
-0xA6DC	0x81F3	#<CJK>
-0xA6DD	0x81FC	#<CJK>
-0xA6DE	0x820C	#<CJK>
-0xA6DF	0x821B	#<CJK>
-0xA6E0	0x821F	#<CJK>
-0xA6E1	0x826E	#<CJK>
-0xA6E2	0x8272	#<CJK>
-0xA6E3	0x827E	#<CJK>
-0xA6E4	0x866B	#<CJK>
-0xA6E5	0x8840	#<CJK>
-0xA6E6	0x884C	#<CJK>
-0xA6E7	0x8863	#<CJK>
-0xA6E8	0x897F	#<CJK>
-0xA6E9	0x9621	#<CJK>
-0xA6EA	0x4E32	#<CJK>
-0xA6EB	0x4EA8	#<CJK>
-0xA6EC	0x4F4D	#<CJK>
-0xA6ED	0x4F4F	#<CJK>
-0xA6EE	0x4F47	#<CJK>
-0xA6EF	0x4F57	#<CJK>
-0xA6F0	0x4F5E	#<CJK>
-0xA6F1	0x4F34	#<CJK>
-0xA6F2	0x4F5B	#<CJK>
-0xA6F3	0x4F55	#<CJK>
-0xA6F4	0x4F30	#<CJK>
-0xA6F5	0x4F50	#<CJK>
-0xA6F6	0x4F51	#<CJK>
-0xA6F7	0x4F3D	#<CJK>
-0xA6F8	0x4F3A	#<CJK>
-0xA6F9	0x4F38	#<CJK>
-0xA6FA	0x4F43	#<CJK>
-0xA6FB	0x4F54	#<CJK>
-0xA6FC	0x4F3C	#<CJK>
-0xA6FD	0x4F46	#<CJK>
-0xA6FE	0x4F63	#<CJK>
-0xA740	0x4F5C	#<CJK>
-0xA741	0x4F60	#<CJK>
-0xA742	0x4F2F	#<CJK>
-0xA743	0x4F4E	#<CJK>
-0xA744	0x4F36	#<CJK>
-0xA745	0x4F59	#<CJK>
-0xA746	0x4F5D	#<CJK>
-0xA747	0x4F48	#<CJK>
-0xA748	0x4F5A	#<CJK>
-0xA749	0x514C	#<CJK>
-0xA74A	0x514B	#<CJK>
-0xA74B	0x514D	#<CJK>
-0xA74C	0x5175	#<CJK>
-0xA74D	0x51B6	#<CJK>
-0xA74E	0x51B7	#<CJK>
-0xA74F	0x5225	#<CJK>
-0xA750	0x5224	#<CJK>
-0xA751	0x5229	#<CJK>
-0xA752	0x522A	#<CJK>
-0xA753	0x5228	#<CJK>
-0xA754	0x52AB	#<CJK>
-0xA755	0x52A9	#<CJK>
-0xA756	0x52AA	#<CJK>
-0xA757	0x52AC	#<CJK>
-0xA758	0x5323	#<CJK>
-0xA759	0x5373	#<CJK>
-0xA75A	0x5375	#<CJK>
-0xA75B	0x541D	#<CJK>
-0xA75C	0x542D	#<CJK>
-0xA75D	0x541E	#<CJK>
-0xA75E	0x543E	#<CJK>
-0xA75F	0x5426	#<CJK>
-0xA760	0x544E	#<CJK>
-0xA761	0x5427	#<CJK>
-0xA762	0x5446	#<CJK>
-0xA763	0x5443	#<CJK>
-0xA764	0x5433	#<CJK>
-0xA765	0x5448	#<CJK>
-0xA766	0x5442	#<CJK>
-0xA767	0x541B	#<CJK>
-0xA768	0x5429	#<CJK>
-0xA769	0x544A	#<CJK>
-0xA76A	0x5439	#<CJK>
-0xA76B	0x543B	#<CJK>
-0xA76C	0x5438	#<CJK>
-0xA76D	0x542E	#<CJK>
-0xA76E	0x5435	#<CJK>
-0xA76F	0x5436	#<CJK>
-0xA770	0x5420	#<CJK>
-0xA771	0x543C	#<CJK>
-0xA772	0x5440	#<CJK>
-0xA773	0x5431	#<CJK>
-0xA774	0x542B	#<CJK>
-0xA775	0x541F	#<CJK>
-0xA776	0x542C	#<CJK>
-0xA777	0x56EA	#<CJK>
-0xA778	0x56F0	#<CJK>
-0xA779	0x56E4	#<CJK>
-0xA77A	0x56EB	#<CJK>
-0xA77B	0x574A	#<CJK>
-0xA77C	0x5751	#<CJK>
-0xA77D	0x5740	#<CJK>
-0xA77E	0x574D	#<CJK>
-0xA7A1	0x5747	#<CJK>
-0xA7A2	0x574E	#<CJK>
-0xA7A3	0x573E	#<CJK>
-0xA7A4	0x5750	#<CJK>
-0xA7A5	0x574F	#<CJK>
-0xA7A6	0x573B	#<CJK>
-0xA7A7	0x58EF	#<CJK>
-0xA7A8	0x593E	#<CJK>
-0xA7A9	0x599D	#<CJK>
-0xA7AA	0x5992	#<CJK>
-0xA7AB	0x59A8	#<CJK>
-0xA7AC	0x599E	#<CJK>
-0xA7AD	0x59A3	#<CJK>
-0xA7AE	0x5999	#<CJK>
-0xA7AF	0x5996	#<CJK>
-0xA7B0	0x598D	#<CJK>
-0xA7B1	0x59A4	#<CJK>
-0xA7B2	0x5993	#<CJK>
-0xA7B3	0x598A	#<CJK>
-0xA7B4	0x59A5	#<CJK>
-0xA7B5	0x5B5D	#<CJK>
-0xA7B6	0x5B5C	#<CJK>
-0xA7B7	0x5B5A	#<CJK>
-0xA7B8	0x5B5B	#<CJK>
-0xA7B9	0x5B8C	#<CJK>
-0xA7BA	0x5B8B	#<CJK>
-0xA7BB	0x5B8F	#<CJK>
-0xA7BC	0x5C2C	#<CJK>
-0xA7BD	0x5C40	#<CJK>
-0xA7BE	0x5C41	#<CJK>
-0xA7BF	0x5C3F	#<CJK>
-0xA7C0	0x5C3E	#<CJK>
-0xA7C1	0x5C90	#<CJK>
-0xA7C2	0x5C91	#<CJK>
-0xA7C3	0x5C94	#<CJK>
-0xA7C4	0x5C8C	#<CJK>
-0xA7C5	0x5DEB	#<CJK>
-0xA7C6	0x5E0C	#<CJK>
-0xA7C7	0x5E8F	#<CJK>
-0xA7C8	0x5E87	#<CJK>
-0xA7C9	0x5E8A	#<CJK>
-0xA7CA	0x5EF7	#<CJK>
-0xA7CB	0x5F04	#<CJK>
-0xA7CC	0x5F1F	#<CJK>
-0xA7CD	0x5F64	#<CJK>
-0xA7CE	0x5F62	#<CJK>
-0xA7CF	0x5F77	#<CJK>
-0xA7D0	0x5F79	#<CJK>
-0xA7D1	0x5FD8	#<CJK>
-0xA7D2	0x5FCC	#<CJK>
-0xA7D3	0x5FD7	#<CJK>
-0xA7D4	0x5FCD	#<CJK>
-0xA7D5	0x5FF1	#<CJK>
-0xA7D6	0x5FEB	#<CJK>
-0xA7D7	0x5FF8	#<CJK>
-0xA7D8	0x5FEA	#<CJK>
-0xA7D9	0x6212	#<CJK>
-0xA7DA	0x6211	#<CJK>
-0xA7DB	0x6284	#<CJK>
-0xA7DC	0x6297	#<CJK>
-0xA7DD	0x6296	#<CJK>
-0xA7DE	0x6280	#<CJK>
-0xA7DF	0x6276	#<CJK>
-0xA7E0	0x6289	#<CJK>
-0xA7E1	0x626D	#<CJK>
-0xA7E2	0x628A	#<CJK>
-0xA7E3	0x627C	#<CJK>
-0xA7E4	0x627E	#<CJK>
-0xA7E5	0x6279	#<CJK>
-0xA7E6	0x6273	#<CJK>
-0xA7E7	0x6292	#<CJK>
-0xA7E8	0x626F	#<CJK>
-0xA7E9	0x6298	#<CJK>
-0xA7EA	0x626E	#<CJK>
-0xA7EB	0x6295	#<CJK>
-0xA7EC	0x6293	#<CJK>
-0xA7ED	0x6291	#<CJK>
-0xA7EE	0x6286	#<CJK>
-0xA7EF	0x6539	#<CJK>
-0xA7F0	0x653B	#<CJK>
-0xA7F1	0x6538	#<CJK>
-0xA7F2	0x65F1	#<CJK>
-0xA7F3	0x66F4	#<CJK>
-0xA7F4	0x675F	#<CJK>
-0xA7F5	0x674E	#<CJK>
-0xA7F6	0x674F	#<CJK>
-0xA7F7	0x6750	#<CJK>
-0xA7F8	0x6751	#<CJK>
-0xA7F9	0x675C	#<CJK>
-0xA7FA	0x6756	#<CJK>
-0xA7FB	0x675E	#<CJK>
-0xA7FC	0x6749	#<CJK>
-0xA7FD	0x6746	#<CJK>
-0xA7FE	0x6760	#<CJK>
-0xA840	0x6753	#<CJK>
-0xA841	0x6757	#<CJK>
-0xA842	0x6B65	#<CJK>
-0xA843	0x6BCF	#<CJK>
-0xA844	0x6C42	#<CJK>
-0xA845	0x6C5E	#<CJK>
-0xA846	0x6C99	#<CJK>
-0xA847	0x6C81	#<CJK>
-0xA848	0x6C88	#<CJK>
-0xA849	0x6C89	#<CJK>
-0xA84A	0x6C85	#<CJK>
-0xA84B	0x6C9B	#<CJK>
-0xA84C	0x6C6A	#<CJK>
-0xA84D	0x6C7A	#<CJK>
-0xA84E	0x6C90	#<CJK>
-0xA84F	0x6C70	#<CJK>
-0xA850	0x6C8C	#<CJK>
-0xA851	0x6C68	#<CJK>
-0xA852	0x6C96	#<CJK>
-0xA853	0x6C92	#<CJK>
-0xA854	0x6C7D	#<CJK>
-0xA855	0x6C83	#<CJK>
-0xA856	0x6C72	#<CJK>
-0xA857	0x6C7E	#<CJK>
-0xA858	0x6C74	#<CJK>
-0xA859	0x6C86	#<CJK>
-0xA85A	0x6C76	#<CJK>
-0xA85B	0x6C8D	#<CJK>
-0xA85C	0x6C94	#<CJK>
-0xA85D	0x6C98	#<CJK>
-0xA85E	0x6C82	#<CJK>
-0xA85F	0x7076	#<CJK>
-0xA860	0x707C	#<CJK>
-0xA861	0x707D	#<CJK>
-0xA862	0x7078	#<CJK>
-0xA863	0x7262	#<CJK>
-0xA864	0x7261	#<CJK>
-0xA865	0x7260	#<CJK>
-0xA866	0x72C4	#<CJK>
-0xA867	0x72C2	#<CJK>
-0xA868	0x7396	#<CJK>
-0xA869	0x752C	#<CJK>
-0xA86A	0x752B	#<CJK>
-0xA86B	0x7537	#<CJK>
-0xA86C	0x7538	#<CJK>
-0xA86D	0x7682	#<CJK>
-0xA86E	0x76EF	#<CJK>
-0xA86F	0x77E3	#<CJK>
-0xA870	0x79C1	#<CJK>
-0xA871	0x79C0	#<CJK>
-0xA872	0x79BF	#<CJK>
-0xA873	0x7A76	#<CJK>
-0xA874	0x7CFB	#<CJK>
-0xA875	0x7F55	#<CJK>
-0xA876	0x8096	#<CJK>
-0xA877	0x8093	#<CJK>
-0xA878	0x809D	#<CJK>
-0xA879	0x8098	#<CJK>
-0xA87A	0x809B	#<CJK>
-0xA87B	0x809A	#<CJK>
-0xA87C	0x80B2	#<CJK>
-0xA87D	0x826F	#<CJK>
-0xA87E	0x8292	#<CJK>
-0xA8A1	0x828B	#<CJK>
-0xA8A2	0x828D	#<CJK>
-0xA8A3	0x898B	#<CJK>
-0xA8A4	0x89D2	#<CJK>
-0xA8A5	0x8A00	#<CJK>
-0xA8A6	0x8C37	#<CJK>
-0xA8A7	0x8C46	#<CJK>
-0xA8A8	0x8C55	#<CJK>
-0xA8A9	0x8C9D	#<CJK>
-0xA8AA	0x8D64	#<CJK>
-0xA8AB	0x8D70	#<CJK>
-0xA8AC	0x8DB3	#<CJK>
-0xA8AD	0x8EAB	#<CJK>
-0xA8AE	0x8ECA	#<CJK>
-0xA8AF	0x8F9B	#<CJK>
-0xA8B0	0x8FB0	#<CJK>
-0xA8B1	0x8FC2	#<CJK>
-0xA8B2	0x8FC6	#<CJK>
-0xA8B3	0x8FC5	#<CJK>
-0xA8B4	0x8FC4	#<CJK>
-0xA8B5	0x5DE1	#<CJK>
-0xA8B6	0x9091	#<CJK>
-0xA8B7	0x90A2	#<CJK>
-0xA8B8	0x90AA	#<CJK>
-0xA8B9	0x90A6	#<CJK>
-0xA8BA	0x90A3	#<CJK>
-0xA8BB	0x9149	#<CJK>
-0xA8BC	0x91C6	#<CJK>
-0xA8BD	0x91CC	#<CJK>
-0xA8BE	0x9632	#<CJK>
-0xA8BF	0x962E	#<CJK>
-0xA8C0	0x9631	#<CJK>
-0xA8C1	0x962A	#<CJK>
-0xA8C2	0x962C	#<CJK>
-0xA8C3	0x4E26	#<CJK>
-0xA8C4	0x4E56	#<CJK>
-0xA8C5	0x4E73	#<CJK>
-0xA8C6	0x4E8B	#<CJK>
-0xA8C7	0x4E9B	#<CJK>
-0xA8C8	0x4E9E	#<CJK>
-0xA8C9	0x4EAB	#<CJK>
-0xA8CA	0x4EAC	#<CJK>
-0xA8CB	0x4F6F	#<CJK>
-0xA8CC	0x4F9D	#<CJK>
-0xA8CD	0x4F8D	#<CJK>
-0xA8CE	0x4F73	#<CJK>
-0xA8CF	0x4F7F	#<CJK>
-0xA8D0	0x4F6C	#<CJK>
-0xA8D1	0x4F9B	#<CJK>
-0xA8D2	0x4F8B	#<CJK>
-0xA8D3	0x4F86	#<CJK>
-0xA8D4	0x4F83	#<CJK>
-0xA8D5	0x4F70	#<CJK>
-0xA8D6	0x4F75	#<CJK>
-0xA8D7	0x4F88	#<CJK>
-0xA8D8	0x4F69	#<CJK>
-0xA8D9	0x4F7B	#<CJK>
-0xA8DA	0x4F96	#<CJK>
-0xA8DB	0x4F7E	#<CJK>
-0xA8DC	0x4F8F	#<CJK>
-0xA8DD	0x4F91	#<CJK>
-0xA8DE	0x4F7A	#<CJK>
-0xA8DF	0x5154	#<CJK>
-0xA8E0	0x5152	#<CJK>
-0xA8E1	0x5155	#<CJK>
-0xA8E2	0x5169	#<CJK>
-0xA8E3	0x5177	#<CJK>
-0xA8E4	0x5176	#<CJK>
-0xA8E5	0x5178	#<CJK>
-0xA8E6	0x51BD	#<CJK>
-0xA8E7	0x51FD	#<CJK>
-0xA8E8	0x523B	#<CJK>
-0xA8E9	0x5238	#<CJK>
-0xA8EA	0x5237	#<CJK>
-0xA8EB	0x523A	#<CJK>
-0xA8EC	0x5230	#<CJK>
-0xA8ED	0x522E	#<CJK>
-0xA8EE	0x5236	#<CJK>
-0xA8EF	0x5241	#<CJK>
-0xA8F0	0x52BE	#<CJK>
-0xA8F1	0x52BB	#<CJK>
-0xA8F2	0x5352	#<CJK>
-0xA8F3	0x5354	#<CJK>
-0xA8F4	0x5353	#<CJK>
-0xA8F5	0x5351	#<CJK>
-0xA8F6	0x5366	#<CJK>
-0xA8F7	0x5377	#<CJK>
-0xA8F8	0x5378	#<CJK>
-0xA8F9	0x5379	#<CJK>
-0xA8FA	0x53D6	#<CJK>
-0xA8FB	0x53D4	#<CJK>
-0xA8FC	0x53D7	#<CJK>
-0xA8FD	0x5473	#<CJK>
-0xA8FE	0x5475	#<CJK>
-0xA940	0x5496	#<CJK>
-0xA941	0x5478	#<CJK>
-0xA942	0x5495	#<CJK>
-0xA943	0x5480	#<CJK>
-0xA944	0x547B	#<CJK>
-0xA945	0x5477	#<CJK>
-0xA946	0x5484	#<CJK>
-0xA947	0x5492	#<CJK>
-0xA948	0x5486	#<CJK>
-0xA949	0x547C	#<CJK>
-0xA94A	0x5490	#<CJK>
-0xA94B	0x5471	#<CJK>
-0xA94C	0x5476	#<CJK>
-0xA94D	0x548C	#<CJK>
-0xA94E	0x549A	#<CJK>
-0xA94F	0x5462	#<CJK>
-0xA950	0x5468	#<CJK>
-0xA951	0x548B	#<CJK>
-0xA952	0x547D	#<CJK>
-0xA953	0x548E	#<CJK>
-0xA954	0x56FA	#<CJK>
-0xA955	0x5783	#<CJK>
-0xA956	0x5777	#<CJK>
-0xA957	0x576A	#<CJK>
-0xA958	0x5769	#<CJK>
-0xA959	0x5761	#<CJK>
-0xA95A	0x5766	#<CJK>
-0xA95B	0x5764	#<CJK>
-0xA95C	0x577C	#<CJK>
-0xA95D	0x591C	#<CJK>
-0xA95E	0x5949	#<CJK>
-0xA95F	0x5947	#<CJK>
-0xA960	0x5948	#<CJK>
-0xA961	0x5944	#<CJK>
-0xA962	0x5954	#<CJK>
-0xA963	0x59BE	#<CJK>
-0xA964	0x59BB	#<CJK>
-0xA965	0x59D4	#<CJK>
-0xA966	0x59B9	#<CJK>
-0xA967	0x59AE	#<CJK>
-0xA968	0x59D1	#<CJK>
-0xA969	0x59C6	#<CJK>
-0xA96A	0x59D0	#<CJK>
-0xA96B	0x59CD	#<CJK>
-0xA96C	0x59CB	#<CJK>
-0xA96D	0x59D3	#<CJK>
-0xA96E	0x59CA	#<CJK>
-0xA96F	0x59AF	#<CJK>
-0xA970	0x59B3	#<CJK>
-0xA971	0x59D2	#<CJK>
-0xA972	0x59C5	#<CJK>
-0xA973	0x5B5F	#<CJK>
-0xA974	0x5B64	#<CJK>
-0xA975	0x5B63	#<CJK>
-0xA976	0x5B97	#<CJK>
-0xA977	0x5B9A	#<CJK>
-0xA978	0x5B98	#<CJK>
-0xA979	0x5B9C	#<CJK>
-0xA97A	0x5B99	#<CJK>
-0xA97B	0x5B9B	#<CJK>
-0xA97C	0x5C1A	#<CJK>
-0xA97D	0x5C48	#<CJK>
-0xA97E	0x5C45	#<CJK>
-0xA9A1	0x5C46	#<CJK>
-0xA9A2	0x5CB7	#<CJK>
-0xA9A3	0x5CA1	#<CJK>
-0xA9A4	0x5CB8	#<CJK>
-0xA9A5	0x5CA9	#<CJK>
-0xA9A6	0x5CAB	#<CJK>
-0xA9A7	0x5CB1	#<CJK>
-0xA9A8	0x5CB3	#<CJK>
-0xA9A9	0x5E18	#<CJK>
-0xA9AA	0x5E1A	#<CJK>
-0xA9AB	0x5E16	#<CJK>
-0xA9AC	0x5E15	#<CJK>
-0xA9AD	0x5E1B	#<CJK>
-0xA9AE	0x5E11	#<CJK>
-0xA9AF	0x5E78	#<CJK>
-0xA9B0	0x5E9A	#<CJK>
-0xA9B1	0x5E97	#<CJK>
-0xA9B2	0x5E9C	#<CJK>
-0xA9B3	0x5E95	#<CJK>
-0xA9B4	0x5E96	#<CJK>
-0xA9B5	0x5EF6	#<CJK>
-0xA9B6	0x5F26	#<CJK>
-0xA9B7	0x5F27	#<CJK>
-0xA9B8	0x5F29	#<CJK>
-0xA9B9	0x5F80	#<CJK>
-0xA9BA	0x5F81	#<CJK>
-0xA9BB	0x5F7F	#<CJK>
-0xA9BC	0x5F7C	#<CJK>
-0xA9BD	0x5FDD	#<CJK>
-0xA9BE	0x5FE0	#<CJK>
-0xA9BF	0x5FFD	#<CJK>
-0xA9C0	0x5FF5	#<CJK>
-0xA9C1	0x5FFF	#<CJK>
-0xA9C2	0x600F	#<CJK>
-0xA9C3	0x6014	#<CJK>
-0xA9C4	0x602F	#<CJK>
-0xA9C5	0x6035	#<CJK>
-0xA9C6	0x6016	#<CJK>
-0xA9C7	0x602A	#<CJK>
-0xA9C8	0x6015	#<CJK>
-0xA9C9	0x6021	#<CJK>
-0xA9CA	0x6027	#<CJK>
-0xA9CB	0x6029	#<CJK>
-0xA9CC	0x602B	#<CJK>
-0xA9CD	0x601B	#<CJK>
-0xA9CE	0x6216	#<CJK>
-0xA9CF	0x6215	#<CJK>
-0xA9D0	0x623F	#<CJK>
-0xA9D1	0x623E	#<CJK>
-0xA9D2	0x6240	#<CJK>
-0xA9D3	0x627F	#<CJK>
-0xA9D4	0x62C9	#<CJK>
-0xA9D5	0x62CC	#<CJK>
-0xA9D6	0x62C4	#<CJK>
-0xA9D7	0x62BF	#<CJK>
-0xA9D8	0x62C2	#<CJK>
-0xA9D9	0x62B9	#<CJK>
-0xA9DA	0x62D2	#<CJK>
-0xA9DB	0x62DB	#<CJK>
-0xA9DC	0x62AB	#<CJK>
-0xA9DD	0x62D3	#<CJK>
-0xA9DE	0x62D4	#<CJK>
-0xA9DF	0x62CB	#<CJK>
-0xA9E0	0x62C8	#<CJK>
-0xA9E1	0x62A8	#<CJK>
-0xA9E2	0x62BD	#<CJK>
-0xA9E3	0x62BC	#<CJK>
-0xA9E4	0x62D0	#<CJK>
-0xA9E5	0x62D9	#<CJK>
-0xA9E6	0x62C7	#<CJK>
-0xA9E7	0x62CD	#<CJK>
-0xA9E8	0x62B5	#<CJK>
-0xA9E9	0x62DA	#<CJK>
-0xA9EA	0x62B1	#<CJK>
-0xA9EB	0x62D8	#<CJK>
-0xA9EC	0x62D6	#<CJK>
-0xA9ED	0x62D7	#<CJK>
-0xA9EE	0x62C6	#<CJK>
-0xA9EF	0x62AC	#<CJK>
-0xA9F0	0x62CE	#<CJK>
-0xA9F1	0x653E	#<CJK>
-0xA9F2	0x65A7	#<CJK>
-0xA9F3	0x65BC	#<CJK>
-0xA9F4	0x65FA	#<CJK>
-0xA9F5	0x6614	#<CJK>
-0xA9F6	0x6613	#<CJK>
-0xA9F7	0x660C	#<CJK>
-0xA9F8	0x6606	#<CJK>
-0xA9F9	0x6602	#<CJK>
-0xA9FA	0x660E	#<CJK>
-0xA9FB	0x6600	#<CJK>
-0xA9FC	0x660F	#<CJK>
-0xA9FD	0x6615	#<CJK>
-0xA9FE	0x660A	#<CJK>
-0xAA40	0x6607	#<CJK>
-0xAA41	0x670D	#<CJK>
-0xAA42	0x670B	#<CJK>
-0xAA43	0x676D	#<CJK>
-0xAA44	0x678B	#<CJK>
-0xAA45	0x6795	#<CJK>
-0xAA46	0x6771	#<CJK>
-0xAA47	0x679C	#<CJK>
-0xAA48	0x6773	#<CJK>
-0xAA49	0x6777	#<CJK>
-0xAA4A	0x6787	#<CJK>
-0xAA4B	0x679D	#<CJK>
-0xAA4C	0x6797	#<CJK>
-0xAA4D	0x676F	#<CJK>
-0xAA4E	0x6770	#<CJK>
-0xAA4F	0x677F	#<CJK>
-0xAA50	0x6789	#<CJK>
-0xAA51	0x677E	#<CJK>
-0xAA52	0x6790	#<CJK>
-0xAA53	0x6775	#<CJK>
-0xAA54	0x679A	#<CJK>
-0xAA55	0x6793	#<CJK>
-0xAA56	0x677C	#<CJK>
-0xAA57	0x676A	#<CJK>
-0xAA58	0x6772	#<CJK>
-0xAA59	0x6B23	#<CJK>
-0xAA5A	0x6B66	#<CJK>
-0xAA5B	0x6B67	#<CJK>
-0xAA5C	0x6B7F	#<CJK>
-0xAA5D	0x6C13	#<CJK>
-0xAA5E	0x6C1B	#<CJK>
-0xAA5F	0x6CE3	#<CJK>
-0xAA60	0x6CE8	#<CJK>
-0xAA61	0x6CF3	#<CJK>
-0xAA62	0x6CB1	#<CJK>
-0xAA63	0x6CCC	#<CJK>
-0xAA64	0x6CE5	#<CJK>
-0xAA65	0x6CB3	#<CJK>
-0xAA66	0x6CBD	#<CJK>
-0xAA67	0x6CBE	#<CJK>
-0xAA68	0x6CBC	#<CJK>
-0xAA69	0x6CE2	#<CJK>
-0xAA6A	0x6CAB	#<CJK>
-0xAA6B	0x6CD5	#<CJK>
-0xAA6C	0x6CD3	#<CJK>
-0xAA6D	0x6CB8	#<CJK>
-0xAA6E	0x6CC4	#<CJK>
-0xAA6F	0x6CB9	#<CJK>
-0xAA70	0x6CC1	#<CJK>
-0xAA71	0x6CAE	#<CJK>
-0xAA72	0x6CD7	#<CJK>
-0xAA73	0x6CC5	#<CJK>
-0xAA74	0x6CF1	#<CJK>
-0xAA75	0x6CBF	#<CJK>
-0xAA76	0x6CBB	#<CJK>
-0xAA77	0x6CE1	#<CJK>
-0xAA78	0x6CDB	#<CJK>
-0xAA79	0x6CCA	#<CJK>
-0xAA7A	0x6CAC	#<CJK>
-0xAA7B	0x6CEF	#<CJK>
-0xAA7C	0x6CDC	#<CJK>
-0xAA7D	0x6CD6	#<CJK>
-0xAA7E	0x6CE0	#<CJK>
-0xAAA1	0x7095	#<CJK>
-0xAAA2	0x708E	#<CJK>
-0xAAA3	0x7092	#<CJK>
-0xAAA4	0x708A	#<CJK>
-0xAAA5	0x7099	#<CJK>
-0xAAA6	0x722C	#<CJK>
-0xAAA7	0x722D	#<CJK>
-0xAAA8	0x7238	#<CJK>
-0xAAA9	0x7248	#<CJK>
-0xAAAA	0x7267	#<CJK>
-0xAAAB	0x7269	#<CJK>
-0xAAAC	0x72C0	#<CJK>
-0xAAAD	0x72CE	#<CJK>
-0xAAAE	0x72D9	#<CJK>
-0xAAAF	0x72D7	#<CJK>
-0xAAB0	0x72D0	#<CJK>
-0xAAB1	0x73A9	#<CJK>
-0xAAB2	0x73A8	#<CJK>
-0xAAB3	0x739F	#<CJK>
-0xAAB4	0x73AB	#<CJK>
-0xAAB5	0x73A5	#<CJK>
-0xAAB6	0x753D	#<CJK>
-0xAAB7	0x759D	#<CJK>
-0xAAB8	0x7599	#<CJK>
-0xAAB9	0x759A	#<CJK>
-0xAABA	0x7684	#<CJK>
-0xAABB	0x76C2	#<CJK>
-0xAABC	0x76F2	#<CJK>
-0xAABD	0x76F4	#<CJK>
-0xAABE	0x77E5	#<CJK>
-0xAABF	0x77FD	#<CJK>
-0xAAC0	0x793E	#<CJK>
-0xAAC1	0x7940	#<CJK>
-0xAAC2	0x7941	#<CJK>
-0xAAC3	0x79C9	#<CJK>
-0xAAC4	0x79C8	#<CJK>
-0xAAC5	0x7A7A	#<CJK>
-0xAAC6	0x7A79	#<CJK>
-0xAAC7	0x7AFA	#<CJK>
-0xAAC8	0x7CFE	#<CJK>
-0xAAC9	0x7F54	#<CJK>
-0xAACA	0x7F8C	#<CJK>
-0xAACB	0x7F8B	#<CJK>
-0xAACC	0x8005	#<CJK>
-0xAACD	0x80BA	#<CJK>
-0xAACE	0x80A5	#<CJK>
-0xAACF	0x80A2	#<CJK>
-0xAAD0	0x80B1	#<CJK>
-0xAAD1	0x80A1	#<CJK>
-0xAAD2	0x80AB	#<CJK>
-0xAAD3	0x80A9	#<CJK>
-0xAAD4	0x80B4	#<CJK>
-0xAAD5	0x80AA	#<CJK>
-0xAAD6	0x80AF	#<CJK>
-0xAAD7	0x81E5	#<CJK>
-0xAAD8	0x81FE	#<CJK>
-0xAAD9	0x820D	#<CJK>
-0xAADA	0x82B3	#<CJK>
-0xAADB	0x829D	#<CJK>
-0xAADC	0x8299	#<CJK>
-0xAADD	0x82AD	#<CJK>
-0xAADE	0x82BD	#<CJK>
-0xAADF	0x829F	#<CJK>
-0xAAE0	0x82B9	#<CJK>
-0xAAE1	0x82B1	#<CJK>
-0xAAE2	0x82AC	#<CJK>
-0xAAE3	0x82A5	#<CJK>
-0xAAE4	0x82AF	#<CJK>
-0xAAE5	0x82B8	#<CJK>
-0xAAE6	0x82A3	#<CJK>
-0xAAE7	0x82B0	#<CJK>
-0xAAE8	0x82BE	#<CJK>
-0xAAE9	0x82B7	#<CJK>
-0xAAEA	0x864E	#<CJK>
-0xAAEB	0x8671	#<CJK>
-0xAAEC	0x521D	#<CJK>
-0xAAED	0x8868	#<CJK>
-0xAAEE	0x8ECB	#<CJK>
-0xAAEF	0x8FCE	#<CJK>
-0xAAF0	0x8FD4	#<CJK>
-0xAAF1	0x8FD1	#<CJK>
-0xAAF2	0x90B5	#<CJK>
-0xAAF3	0x90B8	#<CJK>
-0xAAF4	0x90B1	#<CJK>
-0xAAF5	0x90B6	#<CJK>
-0xAAF6	0x91C7	#<CJK>
-0xAAF7	0x91D1	#<CJK>
-0xAAF8	0x9577	#<CJK>
-0xAAF9	0x9580	#<CJK>
-0xAAFA	0x961C	#<CJK>
-0xAAFB	0x9640	#<CJK>
-0xAAFC	0x963F	#<CJK>
-0xAAFD	0x963B	#<CJK>
-0xAAFE	0x9644	#<CJK>
-0xAB40	0x9642	#<CJK>
-0xAB41	0x96B9	#<CJK>
-0xAB42	0x96E8	#<CJK>
-0xAB43	0x9752	#<CJK>
-0xAB44	0x975E	#<CJK>
-0xAB45	0x4E9F	#<CJK>
-0xAB46	0x4EAD	#<CJK>
-0xAB47	0x4EAE	#<CJK>
-0xAB48	0x4FE1	#<CJK>
-0xAB49	0x4FB5	#<CJK>
-0xAB4A	0x4FAF	#<CJK>
-0xAB4B	0x4FBF	#<CJK>
-0xAB4C	0x4FE0	#<CJK>
-0xAB4D	0x4FD1	#<CJK>
-0xAB4E	0x4FCF	#<CJK>
-0xAB4F	0x4FDD	#<CJK>
-0xAB50	0x4FC3	#<CJK>
-0xAB51	0x4FB6	#<CJK>
-0xAB52	0x4FD8	#<CJK>
-0xAB53	0x4FDF	#<CJK>
-0xAB54	0x4FCA	#<CJK>
-0xAB55	0x4FD7	#<CJK>
-0xAB56	0x4FAE	#<CJK>
-0xAB57	0x4FD0	#<CJK>
-0xAB58	0x4FC4	#<CJK>
-0xAB59	0x4FC2	#<CJK>
-0xAB5A	0x4FDA	#<CJK>
-0xAB5B	0x4FCE	#<CJK>
-0xAB5C	0x4FDE	#<CJK>
-0xAB5D	0x4FB7	#<CJK>
-0xAB5E	0x5157	#<CJK>
-0xAB5F	0x5192	#<CJK>
-0xAB60	0x5191	#<CJK>
-0xAB61	0x51A0	#<CJK>
-0xAB62	0x524E	#<CJK>
-0xAB63	0x5243	#<CJK>
-0xAB64	0x524A	#<CJK>
-0xAB65	0x524D	#<CJK>
-0xAB66	0x524C	#<CJK>
-0xAB67	0x524B	#<CJK>
-0xAB68	0x5247	#<CJK>
-0xAB69	0x52C7	#<CJK>
-0xAB6A	0x52C9	#<CJK>
-0xAB6B	0x52C3	#<CJK>
-0xAB6C	0x52C1	#<CJK>
-0xAB6D	0x530D	#<CJK>
-0xAB6E	0x5357	#<CJK>
-0xAB6F	0x537B	#<CJK>
-0xAB70	0x539A	#<CJK>
-0xAB71	0x53DB	#<CJK>
-0xAB72	0x54AC	#<CJK>
-0xAB73	0x54C0	#<CJK>
-0xAB74	0x54A8	#<CJK>
-0xAB75	0x54CE	#<CJK>
-0xAB76	0x54C9	#<CJK>
-0xAB77	0x54B8	#<CJK>
-0xAB78	0x54A6	#<CJK>
-0xAB79	0x54B3	#<CJK>
-0xAB7A	0x54C7	#<CJK>
-0xAB7B	0x54C2	#<CJK>
-0xAB7C	0x54BD	#<CJK>
-0xAB7D	0x54AA	#<CJK>
-0xAB7E	0x54C1	#<CJK>
-0xABA1	0x54C4	#<CJK>
-0xABA2	0x54C8	#<CJK>
-0xABA3	0x54AF	#<CJK>
-0xABA4	0x54AB	#<CJK>
-0xABA5	0x54B1	#<CJK>
-0xABA6	0x54BB	#<CJK>
-0xABA7	0x54A9	#<CJK>
-0xABA8	0x54A7	#<CJK>
-0xABA9	0x54BF	#<CJK>
-0xABAA	0x56FF	#<CJK>
-0xABAB	0x5782	#<CJK>
-0xABAC	0x578B	#<CJK>
-0xABAD	0x57A0	#<CJK>
-0xABAE	0x57A3	#<CJK>
-0xABAF	0x57A2	#<CJK>
-0xABB0	0x57CE	#<CJK>
-0xABB1	0x57AE	#<CJK>
-0xABB2	0x5793	#<CJK>
-0xABB3	0x5955	#<CJK>
-0xABB4	0x5951	#<CJK>
-0xABB5	0x594F	#<CJK>
-0xABB6	0x594E	#<CJK>
-0xABB7	0x5950	#<CJK>
-0xABB8	0x59DC	#<CJK>
-0xABB9	0x59D8	#<CJK>
-0xABBA	0x59FF	#<CJK>
-0xABBB	0x59E3	#<CJK>
-0xABBC	0x59E8	#<CJK>
-0xABBD	0x5A03	#<CJK>
-0xABBE	0x59E5	#<CJK>
-0xABBF	0x59EA	#<CJK>
-0xABC0	0x59DA	#<CJK>
-0xABC1	0x59E6	#<CJK>
-0xABC2	0x5A01	#<CJK>
-0xABC3	0x59FB	#<CJK>
-0xABC4	0x5B69	#<CJK>
-0xABC5	0x5BA3	#<CJK>
-0xABC6	0x5BA6	#<CJK>
-0xABC7	0x5BA4	#<CJK>
-0xABC8	0x5BA2	#<CJK>
-0xABC9	0x5BA5	#<CJK>
-0xABCA	0x5C01	#<CJK>
-0xABCB	0x5C4E	#<CJK>
-0xABCC	0x5C4F	#<CJK>
-0xABCD	0x5C4D	#<CJK>
-0xABCE	0x5C4B	#<CJK>
-0xABCF	0x5CD9	#<CJK>
-0xABD0	0x5CD2	#<CJK>
-0xABD1	0x5DF7	#<CJK>
-0xABD2	0x5E1D	#<CJK>
-0xABD3	0x5E25	#<CJK>
-0xABD4	0x5E1F	#<CJK>
-0xABD5	0x5E7D	#<CJK>
-0xABD6	0x5EA0	#<CJK>
-0xABD7	0x5EA6	#<CJK>
-0xABD8	0x5EFA	#<CJK>
-0xABD9	0x5F08	#<CJK>
-0xABDA	0x5F2D	#<CJK>
-0xABDB	0x5F65	#<CJK>
-0xABDC	0x5F88	#<CJK>
-0xABDD	0x5F85	#<CJK>
-0xABDE	0x5F8A	#<CJK>
-0xABDF	0x5F8B	#<CJK>
-0xABE0	0x5F87	#<CJK>
-0xABE1	0x5F8C	#<CJK>
-0xABE2	0x5F89	#<CJK>
-0xABE3	0x6012	#<CJK>
-0xABE4	0x601D	#<CJK>
-0xABE5	0x6020	#<CJK>
-0xABE6	0x6025	#<CJK>
-0xABE7	0x600E	#<CJK>
-0xABE8	0x6028	#<CJK>
-0xABE9	0x604D	#<CJK>
-0xABEA	0x6070	#<CJK>
-0xABEB	0x6068	#<CJK>
-0xABEC	0x6062	#<CJK>
-0xABED	0x6046	#<CJK>
-0xABEE	0x6043	#<CJK>
-0xABEF	0x606C	#<CJK>
-0xABF0	0x606B	#<CJK>
-0xABF1	0x606A	#<CJK>
-0xABF2	0x6064	#<CJK>
-0xABF3	0x6241	#<CJK>
-0xABF4	0x62DC	#<CJK>
-0xABF5	0x6316	#<CJK>
-0xABF6	0x6309	#<CJK>
-0xABF7	0x62FC	#<CJK>
-0xABF8	0x62ED	#<CJK>
-0xABF9	0x6301	#<CJK>
-0xABFA	0x62EE	#<CJK>
-0xABFB	0x62FD	#<CJK>
-0xABFC	0x6307	#<CJK>
-0xABFD	0x62F1	#<CJK>
-0xABFE	0x62F7	#<CJK>
-0xAC40	0x62EF	#<CJK>
-0xAC41	0x62EC	#<CJK>
-0xAC42	0x62FE	#<CJK>
-0xAC43	0x62F4	#<CJK>
-0xAC44	0x6311	#<CJK>
-0xAC45	0x6302	#<CJK>
-0xAC46	0x653F	#<CJK>
-0xAC47	0x6545	#<CJK>
-0xAC48	0x65AB	#<CJK>
-0xAC49	0x65BD	#<CJK>
-0xAC4A	0x65E2	#<CJK>
-0xAC4B	0x6625	#<CJK>
-0xAC4C	0x662D	#<CJK>
-0xAC4D	0x6620	#<CJK>
-0xAC4E	0x6627	#<CJK>
-0xAC4F	0x662F	#<CJK>
-0xAC50	0x661F	#<CJK>
-0xAC51	0x6628	#<CJK>
-0xAC52	0x6631	#<CJK>
-0xAC53	0x6624	#<CJK>
-0xAC54	0x66F7	#<CJK>
-0xAC55	0x67FF	#<CJK>
-0xAC56	0x67D3	#<CJK>
-0xAC57	0x67F1	#<CJK>
-0xAC58	0x67D4	#<CJK>
-0xAC59	0x67D0	#<CJK>
-0xAC5A	0x67EC	#<CJK>
-0xAC5B	0x67B6	#<CJK>
-0xAC5C	0x67AF	#<CJK>
-0xAC5D	0x67F5	#<CJK>
-0xAC5E	0x67E9	#<CJK>
-0xAC5F	0x67EF	#<CJK>
-0xAC60	0x67C4	#<CJK>
-0xAC61	0x67D1	#<CJK>
-0xAC62	0x67B4	#<CJK>
-0xAC63	0x67DA	#<CJK>
-0xAC64	0x67E5	#<CJK>
-0xAC65	0x67B8	#<CJK>
-0xAC66	0x67CF	#<CJK>
-0xAC67	0x67DE	#<CJK>
-0xAC68	0x67F3	#<CJK>
-0xAC69	0x67B0	#<CJK>
-0xAC6A	0x67D9	#<CJK>
-0xAC6B	0x67E2	#<CJK>
-0xAC6C	0x67DD	#<CJK>
-0xAC6D	0x67D2	#<CJK>
-0xAC6E	0x6B6A	#<CJK>
-0xAC6F	0x6B83	#<CJK>
-0xAC70	0x6B86	#<CJK>
-0xAC71	0x6BB5	#<CJK>
-0xAC72	0x6BD2	#<CJK>
-0xAC73	0x6BD7	#<CJK>
-0xAC74	0x6C1F	#<CJK>
-0xAC75	0x6CC9	#<CJK>
-0xAC76	0x6D0B	#<CJK>
-0xAC77	0x6D32	#<CJK>
-0xAC78	0x6D2A	#<CJK>
-0xAC79	0x6D41	#<CJK>
-0xAC7A	0x6D25	#<CJK>
-0xAC7B	0x6D0C	#<CJK>
-0xAC7C	0x6D31	#<CJK>
-0xAC7D	0x6D1E	#<CJK>
-0xAC7E	0x6D17	#<CJK>
-0xACA1	0x6D3B	#<CJK>
-0xACA2	0x6D3D	#<CJK>
-0xACA3	0x6D3E	#<CJK>
-0xACA4	0x6D36	#<CJK>
-0xACA5	0x6D1B	#<CJK>
-0xACA6	0x6CF5	#<CJK>
-0xACA7	0x6D39	#<CJK>
-0xACA8	0x6D27	#<CJK>
-0xACA9	0x6D38	#<CJK>
-0xACAA	0x6D29	#<CJK>
-0xACAB	0x6D2E	#<CJK>
-0xACAC	0x6D35	#<CJK>
-0xACAD	0x6D0E	#<CJK>
-0xACAE	0x6D2B	#<CJK>
-0xACAF	0x70AB	#<CJK>
-0xACB0	0x70BA	#<CJK>
-0xACB1	0x70B3	#<CJK>
-0xACB2	0x70AC	#<CJK>
-0xACB3	0x70AF	#<CJK>
-0xACB4	0x70AD	#<CJK>
-0xACB5	0x70B8	#<CJK>
-0xACB6	0x70AE	#<CJK>
-0xACB7	0x70A4	#<CJK>
-0xACB8	0x7230	#<CJK>
-0xACB9	0x7272	#<CJK>
-0xACBA	0x726F	#<CJK>
-0xACBB	0x7274	#<CJK>
-0xACBC	0x72E9	#<CJK>
-0xACBD	0x72E0	#<CJK>
-0xACBE	0x72E1	#<CJK>
-0xACBF	0x73B7	#<CJK>
-0xACC0	0x73CA	#<CJK>
-0xACC1	0x73BB	#<CJK>
-0xACC2	0x73B2	#<CJK>
-0xACC3	0x73CD	#<CJK>
-0xACC4	0x73C0	#<CJK>
-0xACC5	0x73B3	#<CJK>
-0xACC6	0x751A	#<CJK>
-0xACC7	0x752D	#<CJK>
-0xACC8	0x754F	#<CJK>
-0xACC9	0x754C	#<CJK>
-0xACCA	0x754E	#<CJK>
-0xACCB	0x754B	#<CJK>
-0xACCC	0x75AB	#<CJK>
-0xACCD	0x75A4	#<CJK>
-0xACCE	0x75A5	#<CJK>
-0xACCF	0x75A2	#<CJK>
-0xACD0	0x75A3	#<CJK>
-0xACD1	0x7678	#<CJK>
-0xACD2	0x7686	#<CJK>
-0xACD3	0x7687	#<CJK>
-0xACD4	0x7688	#<CJK>
-0xACD5	0x76C8	#<CJK>
-0xACD6	0x76C6	#<CJK>
-0xACD7	0x76C3	#<CJK>
-0xACD8	0x76C5	#<CJK>
-0xACD9	0x7701	#<CJK>
-0xACDA	0x76F9	#<CJK>
-0xACDB	0x76F8	#<CJK>
-0xACDC	0x7709	#<CJK>
-0xACDD	0x770B	#<CJK>
-0xACDE	0x76FE	#<CJK>
-0xACDF	0x76FC	#<CJK>
-0xACE0	0x7707	#<CJK>
-0xACE1	0x77DC	#<CJK>
-0xACE2	0x7802	#<CJK>
-0xACE3	0x7814	#<CJK>
-0xACE4	0x780C	#<CJK>
-0xACE5	0x780D	#<CJK>
-0xACE6	0x7946	#<CJK>
-0xACE7	0x7949	#<CJK>
-0xACE8	0x7948	#<CJK>
-0xACE9	0x7947	#<CJK>
-0xACEA	0x79B9	#<CJK>
-0xACEB	0x79BA	#<CJK>
-0xACEC	0x79D1	#<CJK>
-0xACED	0x79D2	#<CJK>
-0xACEE	0x79CB	#<CJK>
-0xACEF	0x7A7F	#<CJK>
-0xACF0	0x7A81	#<CJK>
-0xACF1	0x7AFF	#<CJK>
-0xACF2	0x7AFD	#<CJK>
-0xACF3	0x7C7D	#<CJK>
-0xACF4	0x7D02	#<CJK>
-0xACF5	0x7D05	#<CJK>
-0xACF6	0x7D00	#<CJK>
-0xACF7	0x7D09	#<CJK>
-0xACF8	0x7D07	#<CJK>
-0xACF9	0x7D04	#<CJK>
-0xACFA	0x7D06	#<CJK>
-0xACFB	0x7F38	#<CJK>
-0xACFC	0x7F8E	#<CJK>
-0xACFD	0x7FBF	#<CJK>
-0xACFE	0x8004	#<CJK>
-0xAD40	0x8010	#<CJK>
-0xAD41	0x800D	#<CJK>
-0xAD42	0x8011	#<CJK>
-0xAD43	0x8036	#<CJK>
-0xAD44	0x80D6	#<CJK>
-0xAD45	0x80E5	#<CJK>
-0xAD46	0x80DA	#<CJK>
-0xAD47	0x80C3	#<CJK>
-0xAD48	0x80C4	#<CJK>
-0xAD49	0x80CC	#<CJK>
-0xAD4A	0x80E1	#<CJK>
-0xAD4B	0x80DB	#<CJK>
-0xAD4C	0x80CE	#<CJK>
-0xAD4D	0x80DE	#<CJK>
-0xAD4E	0x80E4	#<CJK>
-0xAD4F	0x80DD	#<CJK>
-0xAD50	0x81F4	#<CJK>
-0xAD51	0x8222	#<CJK>
-0xAD52	0x82E7	#<CJK>
-0xAD53	0x8303	#<CJK>
-0xAD54	0x8305	#<CJK>
-0xAD55	0x82E3	#<CJK>
-0xAD56	0x82DB	#<CJK>
-0xAD57	0x82E6	#<CJK>
-0xAD58	0x8304	#<CJK>
-0xAD59	0x82E5	#<CJK>
-0xAD5A	0x8302	#<CJK>
-0xAD5B	0x8309	#<CJK>
-0xAD5C	0x82D2	#<CJK>
-0xAD5D	0x82D7	#<CJK>
-0xAD5E	0x82F1	#<CJK>
-0xAD5F	0x8301	#<CJK>
-0xAD60	0x82DC	#<CJK>
-0xAD61	0x82D4	#<CJK>
-0xAD62	0x82D1	#<CJK>
-0xAD63	0x82DE	#<CJK>
-0xAD64	0x82D3	#<CJK>
-0xAD65	0x82DF	#<CJK>
-0xAD66	0x82EF	#<CJK>
-0xAD67	0x8306	#<CJK>
-0xAD68	0x8650	#<CJK>
-0xAD69	0x8679	#<CJK>
-0xAD6A	0x867B	#<CJK>
-0xAD6B	0x867A	#<CJK>
-0xAD6C	0x884D	#<CJK>
-0xAD6D	0x886B	#<CJK>
-0xAD6E	0x8981	#<CJK>
-0xAD6F	0x89D4	#<CJK>
-0xAD70	0x8A08	#<CJK>
-0xAD71	0x8A02	#<CJK>
-0xAD72	0x8A03	#<CJK>
-0xAD73	0x8C9E	#<CJK>
-0xAD74	0x8CA0	#<CJK>
-0xAD75	0x8D74	#<CJK>
-0xAD76	0x8D73	#<CJK>
-0xAD77	0x8DB4	#<CJK>
-0xAD78	0x8ECD	#<CJK>
-0xAD79	0x8ECC	#<CJK>
-0xAD7A	0x8FF0	#<CJK>
-0xAD7B	0x8FE6	#<CJK>
-0xAD7C	0x8FE2	#<CJK>
-0xAD7D	0x8FEA	#<CJK>
-0xAD7E	0x8FE5	#<CJK>
-0xADA1	0x8FED	#<CJK>
-0xADA2	0x8FEB	#<CJK>
-0xADA3	0x8FE4	#<CJK>
-0xADA4	0x8FE8	#<CJK>
-0xADA5	0x90CA	#<CJK>
-0xADA6	0x90CE	#<CJK>
-0xADA7	0x90C1	#<CJK>
-0xADA8	0x90C3	#<CJK>
-0xADA9	0x914B	#<CJK>
-0xADAA	0x914A	#<CJK>
-0xADAB	0x91CD	#<CJK>
-0xADAC	0x9582	#<CJK>
-0xADAD	0x9650	#<CJK>
-0xADAE	0x964B	#<CJK>
-0xADAF	0x964C	#<CJK>
-0xADB0	0x964D	#<CJK>
-0xADB1	0x9762	#<CJK>
-0xADB2	0x9769	#<CJK>
-0xADB3	0x97CB	#<CJK>
-0xADB4	0x97ED	#<CJK>
-0xADB5	0x97F3	#<CJK>
-0xADB6	0x9801	#<CJK>
-0xADB7	0x98A8	#<CJK>
-0xADB8	0x98DB	#<CJK>
-0xADB9	0x98DF	#<CJK>
-0xADBA	0x9996	#<CJK>
-0xADBB	0x9999	#<CJK>
-0xADBC	0x4E58	#<CJK>
-0xADBD	0x4EB3	#<CJK>
-0xADBE	0x500C	#<CJK>
-0xADBF	0x500D	#<CJK>
-0xADC0	0x5023	#<CJK>
-0xADC1	0x4FEF	#<CJK>
-0xADC2	0x5026	#<CJK>
-0xADC3	0x5025	#<CJK>
-0xADC4	0x4FF8	#<CJK>
-0xADC5	0x5029	#<CJK>
-0xADC6	0x5016	#<CJK>
-0xADC7	0x5006	#<CJK>
-0xADC8	0x503C	#<CJK>
-0xADC9	0x501F	#<CJK>
-0xADCA	0x501A	#<CJK>
-0xADCB	0x5012	#<CJK>
-0xADCC	0x5011	#<CJK>
-0xADCD	0x4FFA	#<CJK>
-0xADCE	0x5000	#<CJK>
-0xADCF	0x5014	#<CJK>
-0xADD0	0x5028	#<CJK>
-0xADD1	0x4FF1	#<CJK>
-0xADD2	0x5021	#<CJK>
-0xADD3	0x500B	#<CJK>
-0xADD4	0x5019	#<CJK>
-0xADD5	0x5018	#<CJK>
-0xADD6	0x4FF3	#<CJK>
-0xADD7	0x4FEE	#<CJK>
-0xADD8	0x502D	#<CJK>
-0xADD9	0x502A	#<CJK>
-0xADDA	0x4FFE	#<CJK>
-0xADDB	0x502B	#<CJK>
-0xADDC	0x5009	#<CJK>
-0xADDD	0x517C	#<CJK>
-0xADDE	0x51A4	#<CJK>
-0xADDF	0x51A5	#<CJK>
-0xADE0	0x51A2	#<CJK>
-0xADE1	0x51CD	#<CJK>
-0xADE2	0x51CC	#<CJK>
-0xADE3	0x51C6	#<CJK>
-0xADE4	0x51CB	#<CJK>
-0xADE5	0x5256	#<CJK>
-0xADE6	0x525C	#<CJK>
-0xADE7	0x5254	#<CJK>
-0xADE8	0x525B	#<CJK>
-0xADE9	0x525D	#<CJK>
-0xADEA	0x532A	#<CJK>
-0xADEB	0x537F	#<CJK>
-0xADEC	0x539F	#<CJK>
-0xADED	0x539D	#<CJK>
-0xADEE	0x53DF	#<CJK>
-0xADEF	0x54E8	#<CJK>
-0xADF0	0x5510	#<CJK>
-0xADF1	0x5501	#<CJK>
-0xADF2	0x5537	#<CJK>
-0xADF3	0x54FC	#<CJK>
-0xADF4	0x54E5	#<CJK>
-0xADF5	0x54F2	#<CJK>
-0xADF6	0x5506	#<CJK>
-0xADF7	0x54FA	#<CJK>
-0xADF8	0x5514	#<CJK>
-0xADF9	0x54E9	#<CJK>
-0xADFA	0x54ED	#<CJK>
-0xADFB	0x54E1	#<CJK>
-0xADFC	0x5509	#<CJK>
-0xADFD	0x54EE	#<CJK>
-0xADFE	0x54EA	#<CJK>
-0xAE40	0x54E6	#<CJK>
-0xAE41	0x5527	#<CJK>
-0xAE42	0x5507	#<CJK>
-0xAE43	0x54FD	#<CJK>
-0xAE44	0x550F	#<CJK>
-0xAE45	0x5703	#<CJK>
-0xAE46	0x5704	#<CJK>
-0xAE47	0x57C2	#<CJK>
-0xAE48	0x57D4	#<CJK>
-0xAE49	0x57CB	#<CJK>
-0xAE4A	0x57C3	#<CJK>
-0xAE4B	0x5809	#<CJK>
-0xAE4C	0x590F	#<CJK>
-0xAE4D	0x5957	#<CJK>
-0xAE4E	0x5958	#<CJK>
-0xAE4F	0x595A	#<CJK>
-0xAE50	0x5A11	#<CJK>
-0xAE51	0x5A18	#<CJK>
-0xAE52	0x5A1C	#<CJK>
-0xAE53	0x5A1F	#<CJK>
-0xAE54	0x5A1B	#<CJK>
-0xAE55	0x5A13	#<CJK>
-0xAE56	0x59EC	#<CJK>
-0xAE57	0x5A20	#<CJK>
-0xAE58	0x5A23	#<CJK>
-0xAE59	0x5A29	#<CJK>
-0xAE5A	0x5A25	#<CJK>
-0xAE5B	0x5A0C	#<CJK>
-0xAE5C	0x5A09	#<CJK>
-0xAE5D	0x5B6B	#<CJK>
-0xAE5E	0x5C58	#<CJK>
-0xAE5F	0x5BB0	#<CJK>
-0xAE60	0x5BB3	#<CJK>
-0xAE61	0x5BB6	#<CJK>
-0xAE62	0x5BB4	#<CJK>
-0xAE63	0x5BAE	#<CJK>
-0xAE64	0x5BB5	#<CJK>
-0xAE65	0x5BB9	#<CJK>
-0xAE66	0x5BB8	#<CJK>
-0xAE67	0x5C04	#<CJK>
-0xAE68	0x5C51	#<CJK>
-0xAE69	0x5C55	#<CJK>
-0xAE6A	0x5C50	#<CJK>
-0xAE6B	0x5CED	#<CJK>
-0xAE6C	0x5CFD	#<CJK>
-0xAE6D	0x5CFB	#<CJK>
-0xAE6E	0x5CEA	#<CJK>
-0xAE6F	0x5CE8	#<CJK>
-0xAE70	0x5CF0	#<CJK>
-0xAE71	0x5CF6	#<CJK>
-0xAE72	0x5D01	#<CJK>
-0xAE73	0x5CF4	#<CJK>
-0xAE74	0x5DEE	#<CJK>
-0xAE75	0x5E2D	#<CJK>
-0xAE76	0x5E2B	#<CJK>
-0xAE77	0x5EAB	#<CJK>
-0xAE78	0x5EAD	#<CJK>
-0xAE79	0x5EA7	#<CJK>
-0xAE7A	0x5F31	#<CJK>
-0xAE7B	0x5F92	#<CJK>
-0xAE7C	0x5F91	#<CJK>
-0xAE7D	0x5F90	#<CJK>
-0xAE7E	0x6059	#<CJK>
-0xAEA1	0x6063	#<CJK>
-0xAEA2	0x6065	#<CJK>
-0xAEA3	0x6050	#<CJK>
-0xAEA4	0x6055	#<CJK>
-0xAEA5	0x606D	#<CJK>
-0xAEA6	0x6069	#<CJK>
-0xAEA7	0x606F	#<CJK>
-0xAEA8	0x6084	#<CJK>
-0xAEA9	0x609F	#<CJK>
-0xAEAA	0x609A	#<CJK>
-0xAEAB	0x608D	#<CJK>
-0xAEAC	0x6094	#<CJK>
-0xAEAD	0x608C	#<CJK>
-0xAEAE	0x6085	#<CJK>
-0xAEAF	0x6096	#<CJK>
-0xAEB0	0x6247	#<CJK>
-0xAEB1	0x62F3	#<CJK>
-0xAEB2	0x6308	#<CJK>
-0xAEB3	0x62FF	#<CJK>
-0xAEB4	0x634E	#<CJK>
-0xAEB5	0x633E	#<CJK>
-0xAEB6	0x632F	#<CJK>
-0xAEB7	0x6355	#<CJK>
-0xAEB8	0x6342	#<CJK>
-0xAEB9	0x6346	#<CJK>
-0xAEBA	0x634F	#<CJK>
-0xAEBB	0x6349	#<CJK>
-0xAEBC	0x633A	#<CJK>
-0xAEBD	0x6350	#<CJK>
-0xAEBE	0x633D	#<CJK>
-0xAEBF	0x632A	#<CJK>
-0xAEC0	0x632B	#<CJK>
-0xAEC1	0x6328	#<CJK>
-0xAEC2	0x634D	#<CJK>
-0xAEC3	0x634C	#<CJK>
-0xAEC4	0x6548	#<CJK>
-0xAEC5	0x6549	#<CJK>
-0xAEC6	0x6599	#<CJK>
-0xAEC7	0x65C1	#<CJK>
-0xAEC8	0x65C5	#<CJK>
-0xAEC9	0x6642	#<CJK>
-0xAECA	0x6649	#<CJK>
-0xAECB	0x664F	#<CJK>
-0xAECC	0x6643	#<CJK>
-0xAECD	0x6652	#<CJK>
-0xAECE	0x664C	#<CJK>
-0xAECF	0x6645	#<CJK>
-0xAED0	0x6641	#<CJK>
-0xAED1	0x66F8	#<CJK>
-0xAED2	0x6714	#<CJK>
-0xAED3	0x6715	#<CJK>
-0xAED4	0x6717	#<CJK>
-0xAED5	0x6821	#<CJK>
-0xAED6	0x6838	#<CJK>
-0xAED7	0x6848	#<CJK>
-0xAED8	0x6846	#<CJK>
-0xAED9	0x6853	#<CJK>
-0xAEDA	0x6839	#<CJK>
-0xAEDB	0x6842	#<CJK>
-0xAEDC	0x6854	#<CJK>
-0xAEDD	0x6829	#<CJK>
-0xAEDE	0x68B3	#<CJK>
-0xAEDF	0x6817	#<CJK>
-0xAEE0	0x684C	#<CJK>
-0xAEE1	0x6851	#<CJK>
-0xAEE2	0x683D	#<CJK>
-0xAEE3	0x67F4	#<CJK>
-0xAEE4	0x6850	#<CJK>
-0xAEE5	0x6840	#<CJK>
-0xAEE6	0x683C	#<CJK>
-0xAEE7	0x6843	#<CJK>
-0xAEE8	0x682A	#<CJK>
-0xAEE9	0x6845	#<CJK>
-0xAEEA	0x6813	#<CJK>
-0xAEEB	0x6818	#<CJK>
-0xAEEC	0x6841	#<CJK>
-0xAEED	0x6B8A	#<CJK>
-0xAEEE	0x6B89	#<CJK>
-0xAEEF	0x6BB7	#<CJK>
-0xAEF0	0x6C23	#<CJK>
-0xAEF1	0x6C27	#<CJK>
-0xAEF2	0x6C28	#<CJK>
-0xAEF3	0x6C26	#<CJK>
-0xAEF4	0x6C24	#<CJK>
-0xAEF5	0x6CF0	#<CJK>
-0xAEF6	0x6D6A	#<CJK>
-0xAEF7	0x6D95	#<CJK>
-0xAEF8	0x6D88	#<CJK>
-0xAEF9	0x6D87	#<CJK>
-0xAEFA	0x6D66	#<CJK>
-0xAEFB	0x6D78	#<CJK>
-0xAEFC	0x6D77	#<CJK>
-0xAEFD	0x6D59	#<CJK>
-0xAEFE	0x6D93	#<CJK>
-0xAF40	0x6D6C	#<CJK>
-0xAF41	0x6D89	#<CJK>
-0xAF42	0x6D6E	#<CJK>
-0xAF43	0x6D5A	#<CJK>
-0xAF44	0x6D74	#<CJK>
-0xAF45	0x6D69	#<CJK>
-0xAF46	0x6D8C	#<CJK>
-0xAF47	0x6D8A	#<CJK>
-0xAF48	0x6D79	#<CJK>
-0xAF49	0x6D85	#<CJK>
-0xAF4A	0x6D65	#<CJK>
-0xAF4B	0x6D94	#<CJK>
-0xAF4C	0x70CA	#<CJK>
-0xAF4D	0x70D8	#<CJK>
-0xAF4E	0x70E4	#<CJK>
-0xAF4F	0x70D9	#<CJK>
-0xAF50	0x70C8	#<CJK>
-0xAF51	0x70CF	#<CJK>
-0xAF52	0x7239	#<CJK>
-0xAF53	0x7279	#<CJK>
-0xAF54	0x72FC	#<CJK>
-0xAF55	0x72F9	#<CJK>
-0xAF56	0x72FD	#<CJK>
-0xAF57	0x72F8	#<CJK>
-0xAF58	0x72F7	#<CJK>
-0xAF59	0x7386	#<CJK>
-0xAF5A	0x73ED	#<CJK>
-0xAF5B	0x7409	#<CJK>
-0xAF5C	0x73EE	#<CJK>
-0xAF5D	0x73E0	#<CJK>
-0xAF5E	0x73EA	#<CJK>
-0xAF5F	0x73DE	#<CJK>
-0xAF60	0x7554	#<CJK>
-0xAF61	0x755D	#<CJK>
-0xAF62	0x755C	#<CJK>
-0xAF63	0x755A	#<CJK>
-0xAF64	0x7559	#<CJK>
-0xAF65	0x75BE	#<CJK>
-0xAF66	0x75C5	#<CJK>
-0xAF67	0x75C7	#<CJK>
-0xAF68	0x75B2	#<CJK>
-0xAF69	0x75B3	#<CJK>
-0xAF6A	0x75BD	#<CJK>
-0xAF6B	0x75BC	#<CJK>
-0xAF6C	0x75B9	#<CJK>
-0xAF6D	0x75C2	#<CJK>
-0xAF6E	0x75B8	#<CJK>
-0xAF6F	0x768B	#<CJK>
-0xAF70	0x76B0	#<CJK>
-0xAF71	0x76CA	#<CJK>
-0xAF72	0x76CD	#<CJK>
-0xAF73	0x76CE	#<CJK>
-0xAF74	0x7729	#<CJK>
-0xAF75	0x771F	#<CJK>
-0xAF76	0x7720	#<CJK>
-0xAF77	0x7728	#<CJK>
-0xAF78	0x77E9	#<CJK>
-0xAF79	0x7830	#<CJK>
-0xAF7A	0x7827	#<CJK>
-0xAF7B	0x7838	#<CJK>
-0xAF7C	0x781D	#<CJK>
-0xAF7D	0x7834	#<CJK>
-0xAF7E	0x7837	#<CJK>
-0xAFA1	0x7825	#<CJK>
-0xAFA2	0x782D	#<CJK>
-0xAFA3	0x7820	#<CJK>
-0xAFA4	0x781F	#<CJK>
-0xAFA5	0x7832	#<CJK>
-0xAFA6	0x7955	#<CJK>
-0xAFA7	0x7950	#<CJK>
-0xAFA8	0x7960	#<CJK>
-0xAFA9	0x795F	#<CJK>
-0xAFAA	0x7956	#<CJK>
-0xAFAB	0x795E	#<CJK>
-0xAFAC	0x795D	#<CJK>
-0xAFAD	0x7957	#<CJK>
-0xAFAE	0x795A	#<CJK>
-0xAFAF	0x79E4	#<CJK>
-0xAFB0	0x79E3	#<CJK>
-0xAFB1	0x79E7	#<CJK>
-0xAFB2	0x79DF	#<CJK>
-0xAFB3	0x79E6	#<CJK>
-0xAFB4	0x79E9	#<CJK>
-0xAFB5	0x79D8	#<CJK>
-0xAFB6	0x7A84	#<CJK>
-0xAFB7	0x7A88	#<CJK>
-0xAFB8	0x7AD9	#<CJK>
-0xAFB9	0x7B06	#<CJK>
-0xAFBA	0x7B11	#<CJK>
-0xAFBB	0x7C89	#<CJK>
-0xAFBC	0x7D21	#<CJK>
-0xAFBD	0x7D17	#<CJK>
-0xAFBE	0x7D0B	#<CJK>
-0xAFBF	0x7D0A	#<CJK>
-0xAFC0	0x7D20	#<CJK>
-0xAFC1	0x7D22	#<CJK>
-0xAFC2	0x7D14	#<CJK>
-0xAFC3	0x7D10	#<CJK>
-0xAFC4	0x7D15	#<CJK>
-0xAFC5	0x7D1A	#<CJK>
-0xAFC6	0x7D1C	#<CJK>
-0xAFC7	0x7D0D	#<CJK>
-0xAFC8	0x7D19	#<CJK>
-0xAFC9	0x7D1B	#<CJK>
-0xAFCA	0x7F3A	#<CJK>
-0xAFCB	0x7F5F	#<CJK>
-0xAFCC	0x7F94	#<CJK>
-0xAFCD	0x7FC5	#<CJK>
-0xAFCE	0x7FC1	#<CJK>
-0xAFCF	0x8006	#<CJK>
-0xAFD0	0x8018	#<CJK>
-0xAFD1	0x8015	#<CJK>
-0xAFD2	0x8019	#<CJK>
-0xAFD3	0x8017	#<CJK>
-0xAFD4	0x803D	#<CJK>
-0xAFD5	0x803F	#<CJK>
-0xAFD6	0x80F1	#<CJK>
-0xAFD7	0x8102	#<CJK>
-0xAFD8	0x80F0	#<CJK>
-0xAFD9	0x8105	#<CJK>
-0xAFDA	0x80ED	#<CJK>
-0xAFDB	0x80F4	#<CJK>
-0xAFDC	0x8106	#<CJK>
-0xAFDD	0x80F8	#<CJK>
-0xAFDE	0x80F3	#<CJK>
-0xAFDF	0x8108	#<CJK>
-0xAFE0	0x80FD	#<CJK>
-0xAFE1	0x810A	#<CJK>
-0xAFE2	0x80FC	#<CJK>
-0xAFE3	0x80EF	#<CJK>
-0xAFE4	0x81ED	#<CJK>
-0xAFE5	0x81EC	#<CJK>
-0xAFE6	0x8200	#<CJK>
-0xAFE7	0x8210	#<CJK>
-0xAFE8	0x822A	#<CJK>
-0xAFE9	0x822B	#<CJK>
-0xAFEA	0x8228	#<CJK>
-0xAFEB	0x822C	#<CJK>
-0xAFEC	0x82BB	#<CJK>
-0xAFED	0x832B	#<CJK>
-0xAFEE	0x8352	#<CJK>
-0xAFEF	0x8354	#<CJK>
-0xAFF0	0x834A	#<CJK>
-0xAFF1	0x8338	#<CJK>
-0xAFF2	0x8350	#<CJK>
-0xAFF3	0x8349	#<CJK>
-0xAFF4	0x8335	#<CJK>
-0xAFF5	0x8334	#<CJK>
-0xAFF6	0x834F	#<CJK>
-0xAFF7	0x8332	#<CJK>
-0xAFF8	0x8339	#<CJK>
-0xAFF9	0x8336	#<CJK>
-0xAFFA	0x8317	#<CJK>
-0xAFFB	0x8340	#<CJK>
-0xAFFC	0x8331	#<CJK>
-0xAFFD	0x8328	#<CJK>
-0xAFFE	0x8343	#<CJK>
-0xB040	0x8654	#<CJK>
-0xB041	0x868A	#<CJK>
-0xB042	0x86AA	#<CJK>
-0xB043	0x8693	#<CJK>
-0xB044	0x86A4	#<CJK>
-0xB045	0x86A9	#<CJK>
-0xB046	0x868C	#<CJK>
-0xB047	0x86A3	#<CJK>
-0xB048	0x869C	#<CJK>
-0xB049	0x8870	#<CJK>
-0xB04A	0x8877	#<CJK>
-0xB04B	0x8881	#<CJK>
-0xB04C	0x8882	#<CJK>
-0xB04D	0x887D	#<CJK>
-0xB04E	0x8879	#<CJK>
-0xB04F	0x8A18	#<CJK>
-0xB050	0x8A10	#<CJK>
-0xB051	0x8A0E	#<CJK>
-0xB052	0x8A0C	#<CJK>
-0xB053	0x8A15	#<CJK>
-0xB054	0x8A0A	#<CJK>
-0xB055	0x8A17	#<CJK>
-0xB056	0x8A13	#<CJK>
-0xB057	0x8A16	#<CJK>
-0xB058	0x8A0F	#<CJK>
-0xB059	0x8A11	#<CJK>
-0xB05A	0x8C48	#<CJK>
-0xB05B	0x8C7A	#<CJK>
-0xB05C	0x8C79	#<CJK>
-0xB05D	0x8CA1	#<CJK>
-0xB05E	0x8CA2	#<CJK>
-0xB05F	0x8D77	#<CJK>
-0xB060	0x8EAC	#<CJK>
-0xB061	0x8ED2	#<CJK>
-0xB062	0x8ED4	#<CJK>
-0xB063	0x8ECF	#<CJK>
-0xB064	0x8FB1	#<CJK>
-0xB065	0x9001	#<CJK>
-0xB066	0x9006	#<CJK>
-0xB067	0x8FF7	#<CJK>
-0xB068	0x9000	#<CJK>
-0xB069	0x8FFA	#<CJK>
-0xB06A	0x8FF4	#<CJK>
-0xB06B	0x9003	#<CJK>
-0xB06C	0x8FFD	#<CJK>
-0xB06D	0x9005	#<CJK>
-0xB06E	0x8FF8	#<CJK>
-0xB06F	0x9095	#<CJK>
-0xB070	0x90E1	#<CJK>
-0xB071	0x90DD	#<CJK>
-0xB072	0x90E2	#<CJK>
-0xB073	0x9152	#<CJK>
-0xB074	0x914D	#<CJK>
-0xB075	0x914C	#<CJK>
-0xB076	0x91D8	#<CJK>
-0xB077	0x91DD	#<CJK>
-0xB078	0x91D7	#<CJK>
-0xB079	0x91DC	#<CJK>
-0xB07A	0x91D9	#<CJK>
-0xB07B	0x9583	#<CJK>
-0xB07C	0x9662	#<CJK>
-0xB07D	0x9663	#<CJK>
-0xB07E	0x9661	#<CJK>
-0xB0A1	0x965B	#<CJK>
-0xB0A2	0x965D	#<CJK>
-0xB0A3	0x9664	#<CJK>
-0xB0A4	0x9658	#<CJK>
-0xB0A5	0x965E	#<CJK>
-0xB0A6	0x96BB	#<CJK>
-0xB0A7	0x98E2	#<CJK>
-0xB0A8	0x99AC	#<CJK>
-0xB0A9	0x9AA8	#<CJK>
-0xB0AA	0x9AD8	#<CJK>
-0xB0AB	0x9B25	#<CJK>
-0xB0AC	0x9B32	#<CJK>
-0xB0AD	0x9B3C	#<CJK>
-0xB0AE	0x4E7E	#<CJK>
-0xB0AF	0x507A	#<CJK>
-0xB0B0	0x507D	#<CJK>
-0xB0B1	0x505C	#<CJK>
-0xB0B2	0x5047	#<CJK>
-0xB0B3	0x5043	#<CJK>
-0xB0B4	0x504C	#<CJK>
-0xB0B5	0x505A	#<CJK>
-0xB0B6	0x5049	#<CJK>
-0xB0B7	0x5065	#<CJK>
-0xB0B8	0x5076	#<CJK>
-0xB0B9	0x504E	#<CJK>
-0xB0BA	0x5055	#<CJK>
-0xB0BB	0x5075	#<CJK>
-0xB0BC	0x5074	#<CJK>
-0xB0BD	0x5077	#<CJK>
-0xB0BE	0x504F	#<CJK>
-0xB0BF	0x500F	#<CJK>
-0xB0C0	0x506F	#<CJK>
-0xB0C1	0x506D	#<CJK>
-0xB0C2	0x515C	#<CJK>
-0xB0C3	0x5195	#<CJK>
-0xB0C4	0x51F0	#<CJK>
-0xB0C5	0x526A	#<CJK>
-0xB0C6	0x526F	#<CJK>
-0xB0C7	0x52D2	#<CJK>
-0xB0C8	0x52D9	#<CJK>
-0xB0C9	0x52D8	#<CJK>
-0xB0CA	0x52D5	#<CJK>
-0xB0CB	0x5310	#<CJK>
-0xB0CC	0x530F	#<CJK>
-0xB0CD	0x5319	#<CJK>
-0xB0CE	0x533F	#<CJK>
-0xB0CF	0x5340	#<CJK>
-0xB0D0	0x533E	#<CJK>
-0xB0D1	0x53C3	#<CJK>
-0xB0D2	0x66FC	#<CJK>
-0xB0D3	0x5546	#<CJK>
-0xB0D4	0x556A	#<CJK>
-0xB0D5	0x5566	#<CJK>
-0xB0D6	0x5544	#<CJK>
-0xB0D7	0x555E	#<CJK>
-0xB0D8	0x5561	#<CJK>
-0xB0D9	0x5543	#<CJK>
-0xB0DA	0x554A	#<CJK>
-0xB0DB	0x5531	#<CJK>
-0xB0DC	0x5556	#<CJK>
-0xB0DD	0x554F	#<CJK>
-0xB0DE	0x5555	#<CJK>
-0xB0DF	0x552F	#<CJK>
-0xB0E0	0x5564	#<CJK>
-0xB0E1	0x5538	#<CJK>
-0xB0E2	0x552E	#<CJK>
-0xB0E3	0x555C	#<CJK>
-0xB0E4	0x552C	#<CJK>
-0xB0E5	0x5563	#<CJK>
-0xB0E6	0x5533	#<CJK>
-0xB0E7	0x5541	#<CJK>
-0xB0E8	0x5557	#<CJK>
-0xB0E9	0x5708	#<CJK>
-0xB0EA	0x570B	#<CJK>
-0xB0EB	0x5709	#<CJK>
-0xB0EC	0x57DF	#<CJK>
-0xB0ED	0x5805	#<CJK>
-0xB0EE	0x580A	#<CJK>
-0xB0EF	0x5806	#<CJK>
-0xB0F0	0x57E0	#<CJK>
-0xB0F1	0x57E4	#<CJK>
-0xB0F2	0x57FA	#<CJK>
-0xB0F3	0x5802	#<CJK>
-0xB0F4	0x5835	#<CJK>
-0xB0F5	0x57F7	#<CJK>
-0xB0F6	0x57F9	#<CJK>
-0xB0F7	0x5920	#<CJK>
-0xB0F8	0x5962	#<CJK>
-0xB0F9	0x5A36	#<CJK>
-0xB0FA	0x5A41	#<CJK>
-0xB0FB	0x5A49	#<CJK>
-0xB0FC	0x5A66	#<CJK>
-0xB0FD	0x5A6A	#<CJK>
-0xB0FE	0x5A40	#<CJK>
-0xB140	0x5A3C	#<CJK>
-0xB141	0x5A62	#<CJK>
-0xB142	0x5A5A	#<CJK>
-0xB143	0x5A46	#<CJK>
-0xB144	0x5A4A	#<CJK>
-0xB145	0x5B70	#<CJK>
-0xB146	0x5BC7	#<CJK>
-0xB147	0x5BC5	#<CJK>
-0xB148	0x5BC4	#<CJK>
-0xB149	0x5BC2	#<CJK>
-0xB14A	0x5BBF	#<CJK>
-0xB14B	0x5BC6	#<CJK>
-0xB14C	0x5C09	#<CJK>
-0xB14D	0x5C08	#<CJK>
-0xB14E	0x5C07	#<CJK>
-0xB14F	0x5C60	#<CJK>
-0xB150	0x5C5C	#<CJK>
-0xB151	0x5C5D	#<CJK>
-0xB152	0x5D07	#<CJK>
-0xB153	0x5D06	#<CJK>
-0xB154	0x5D0E	#<CJK>
-0xB155	0x5D1B	#<CJK>
-0xB156	0x5D16	#<CJK>
-0xB157	0x5D22	#<CJK>
-0xB158	0x5D11	#<CJK>
-0xB159	0x5D29	#<CJK>
-0xB15A	0x5D14	#<CJK>
-0xB15B	0x5D19	#<CJK>
-0xB15C	0x5D24	#<CJK>
-0xB15D	0x5D27	#<CJK>
-0xB15E	0x5D17	#<CJK>
-0xB15F	0x5DE2	#<CJK>
-0xB160	0x5E38	#<CJK>
-0xB161	0x5E36	#<CJK>
-0xB162	0x5E33	#<CJK>
-0xB163	0x5E37	#<CJK>
-0xB164	0x5EB7	#<CJK>
-0xB165	0x5EB8	#<CJK>
-0xB166	0x5EB6	#<CJK>
-0xB167	0x5EB5	#<CJK>
-0xB168	0x5EBE	#<CJK>
-0xB169	0x5F35	#<CJK>
-0xB16A	0x5F37	#<CJK>
-0xB16B	0x5F57	#<CJK>
-0xB16C	0x5F6C	#<CJK>
-0xB16D	0x5F69	#<CJK>
-0xB16E	0x5F6B	#<CJK>
-0xB16F	0x5F97	#<CJK>
-0xB170	0x5F99	#<CJK>
-0xB171	0x5F9E	#<CJK>
-0xB172	0x5F98	#<CJK>
-0xB173	0x5FA1	#<CJK>
-0xB174	0x5FA0	#<CJK>
-0xB175	0x5F9C	#<CJK>
-0xB176	0x607F	#<CJK>
-0xB177	0x60A3	#<CJK>
-0xB178	0x6089	#<CJK>
-0xB179	0x60A0	#<CJK>
-0xB17A	0x60A8	#<CJK>
-0xB17B	0x60CB	#<CJK>
-0xB17C	0x60B4	#<CJK>
-0xB17D	0x60E6	#<CJK>
-0xB17E	0x60BD	#<CJK>
-0xB1A1	0x60C5	#<CJK>
-0xB1A2	0x60BB	#<CJK>
-0xB1A3	0x60B5	#<CJK>
-0xB1A4	0x60DC	#<CJK>
-0xB1A5	0x60BC	#<CJK>
-0xB1A6	0x60D8	#<CJK>
-0xB1A7	0x60D5	#<CJK>
-0xB1A8	0x60C6	#<CJK>
-0xB1A9	0x60DF	#<CJK>
-0xB1AA	0x60B8	#<CJK>
-0xB1AB	0x60DA	#<CJK>
-0xB1AC	0x60C7	#<CJK>
-0xB1AD	0x621A	#<CJK>
-0xB1AE	0x621B	#<CJK>
-0xB1AF	0x6248	#<CJK>
-0xB1B0	0x63A0	#<CJK>
-0xB1B1	0x63A7	#<CJK>
-0xB1B2	0x6372	#<CJK>
-0xB1B3	0x6396	#<CJK>
-0xB1B4	0x63A2	#<CJK>
-0xB1B5	0x63A5	#<CJK>
-0xB1B6	0x6377	#<CJK>
-0xB1B7	0x6367	#<CJK>
-0xB1B8	0x6398	#<CJK>
-0xB1B9	0x63AA	#<CJK>
-0xB1BA	0x6371	#<CJK>
-0xB1BB	0x63A9	#<CJK>
-0xB1BC	0x6389	#<CJK>
-0xB1BD	0x6383	#<CJK>
-0xB1BE	0x639B	#<CJK>
-0xB1BF	0x636B	#<CJK>
-0xB1C0	0x63A8	#<CJK>
-0xB1C1	0x6384	#<CJK>
-0xB1C2	0x6388	#<CJK>
-0xB1C3	0x6399	#<CJK>
-0xB1C4	0x63A1	#<CJK>
-0xB1C5	0x63AC	#<CJK>
-0xB1C6	0x6392	#<CJK>
-0xB1C7	0x638F	#<CJK>
-0xB1C8	0x6380	#<CJK>
-0xB1C9	0x637B	#<CJK>
-0xB1CA	0x6369	#<CJK>
-0xB1CB	0x6368	#<CJK>
-0xB1CC	0x637A	#<CJK>
-0xB1CD	0x655D	#<CJK>
-0xB1CE	0x6556	#<CJK>
-0xB1CF	0x6551	#<CJK>
-0xB1D0	0x6559	#<CJK>
-0xB1D1	0x6557	#<CJK>
-0xB1D2	0x555F	#<CJK>
-0xB1D3	0x654F	#<CJK>
-0xB1D4	0x6558	#<CJK>
-0xB1D5	0x6555	#<CJK>
-0xB1D6	0x6554	#<CJK>
-0xB1D7	0x659C	#<CJK>
-0xB1D8	0x659B	#<CJK>
-0xB1D9	0x65AC	#<CJK>
-0xB1DA	0x65CF	#<CJK>
-0xB1DB	0x65CB	#<CJK>
-0xB1DC	0x65CC	#<CJK>
-0xB1DD	0x65CE	#<CJK>
-0xB1DE	0x665D	#<CJK>
-0xB1DF	0x665A	#<CJK>
-0xB1E0	0x6664	#<CJK>
-0xB1E1	0x6668	#<CJK>
-0xB1E2	0x6666	#<CJK>
-0xB1E3	0x665E	#<CJK>
-0xB1E4	0x66F9	#<CJK>
-0xB1E5	0x52D7	#<CJK>
-0xB1E6	0x671B	#<CJK>
-0xB1E7	0x6881	#<CJK>
-0xB1E8	0x68AF	#<CJK>
-0xB1E9	0x68A2	#<CJK>
-0xB1EA	0x6893	#<CJK>
-0xB1EB	0x68B5	#<CJK>
-0xB1EC	0x687F	#<CJK>
-0xB1ED	0x6876	#<CJK>
-0xB1EE	0x68B1	#<CJK>
-0xB1EF	0x68A7	#<CJK>
-0xB1F0	0x6897	#<CJK>
-0xB1F1	0x68B0	#<CJK>
-0xB1F2	0x6883	#<CJK>
-0xB1F3	0x68C4	#<CJK>
-0xB1F4	0x68AD	#<CJK>
-0xB1F5	0x6886	#<CJK>
-0xB1F6	0x6885	#<CJK>
-0xB1F7	0x6894	#<CJK>
-0xB1F8	0x689D	#<CJK>
-0xB1F9	0x68A8	#<CJK>
-0xB1FA	0x689F	#<CJK>
-0xB1FB	0x68A1	#<CJK>
-0xB1FC	0x6882	#<CJK>
-0xB1FD	0x6B32	#<CJK>
-0xB1FE	0x6BBA	#<CJK>
-0xB240	0x6BEB	#<CJK>
-0xB241	0x6BEC	#<CJK>
-0xB242	0x6C2B	#<CJK>
-0xB243	0x6D8E	#<CJK>
-0xB244	0x6DBC	#<CJK>
-0xB245	0x6DF3	#<CJK>
-0xB246	0x6DD9	#<CJK>
-0xB247	0x6DB2	#<CJK>
-0xB248	0x6DE1	#<CJK>
-0xB249	0x6DCC	#<CJK>
-0xB24A	0x6DE4	#<CJK>
-0xB24B	0x6DFB	#<CJK>
-0xB24C	0x6DFA	#<CJK>
-0xB24D	0x6E05	#<CJK>
-0xB24E	0x6DC7	#<CJK>
-0xB24F	0x6DCB	#<CJK>
-0xB250	0x6DAF	#<CJK>
-0xB251	0x6DD1	#<CJK>
-0xB252	0x6DAE	#<CJK>
-0xB253	0x6DDE	#<CJK>
-0xB254	0x6DF9	#<CJK>
-0xB255	0x6DB8	#<CJK>
-0xB256	0x6DF7	#<CJK>
-0xB257	0x6DF5	#<CJK>
-0xB258	0x6DC5	#<CJK>
-0xB259	0x6DD2	#<CJK>
-0xB25A	0x6E1A	#<CJK>
-0xB25B	0x6DB5	#<CJK>
-0xB25C	0x6DDA	#<CJK>
-0xB25D	0x6DEB	#<CJK>
-0xB25E	0x6DD8	#<CJK>
-0xB25F	0x6DEA	#<CJK>
-0xB260	0x6DF1	#<CJK>
-0xB261	0x6DEE	#<CJK>
-0xB262	0x6DE8	#<CJK>
-0xB263	0x6DC6	#<CJK>
-0xB264	0x6DC4	#<CJK>
-0xB265	0x6DAA	#<CJK>
-0xB266	0x6DEC	#<CJK>
-0xB267	0x6DBF	#<CJK>
-0xB268	0x6DE6	#<CJK>
-0xB269	0x70F9	#<CJK>
-0xB26A	0x7109	#<CJK>
-0xB26B	0x710A	#<CJK>
-0xB26C	0x70FD	#<CJK>
-0xB26D	0x70EF	#<CJK>
-0xB26E	0x723D	#<CJK>
-0xB26F	0x727D	#<CJK>
-0xB270	0x7281	#<CJK>
-0xB271	0x731C	#<CJK>
-0xB272	0x731B	#<CJK>
-0xB273	0x7316	#<CJK>
-0xB274	0x7313	#<CJK>
-0xB275	0x7319	#<CJK>
-0xB276	0x7387	#<CJK>
-0xB277	0x7405	#<CJK>
-0xB278	0x740A	#<CJK>
-0xB279	0x7403	#<CJK>
-0xB27A	0x7406	#<CJK>
-0xB27B	0x73FE	#<CJK>
-0xB27C	0x740D	#<CJK>
-0xB27D	0x74E0	#<CJK>
-0xB27E	0x74F6	#<CJK>
-0xB2A1	0x74F7	#<CJK>
-0xB2A2	0x751C	#<CJK>
-0xB2A3	0x7522	#<CJK>
-0xB2A4	0x7565	#<CJK>
-0xB2A5	0x7566	#<CJK>
-0xB2A6	0x7562	#<CJK>
-0xB2A7	0x7570	#<CJK>
-0xB2A8	0x758F	#<CJK>
-0xB2A9	0x75D4	#<CJK>
-0xB2AA	0x75D5	#<CJK>
-0xB2AB	0x75B5	#<CJK>
-0xB2AC	0x75CA	#<CJK>
-0xB2AD	0x75CD	#<CJK>
-0xB2AE	0x768E	#<CJK>
-0xB2AF	0x76D4	#<CJK>
-0xB2B0	0x76D2	#<CJK>
-0xB2B1	0x76DB	#<CJK>
-0xB2B2	0x7737	#<CJK>
-0xB2B3	0x773E	#<CJK>
-0xB2B4	0x773C	#<CJK>
-0xB2B5	0x7736	#<CJK>
-0xB2B6	0x7738	#<CJK>
-0xB2B7	0x773A	#<CJK>
-0xB2B8	0x786B	#<CJK>
-0xB2B9	0x7843	#<CJK>
-0xB2BA	0x784E	#<CJK>
-0xB2BB	0x7965	#<CJK>
-0xB2BC	0x7968	#<CJK>
-0xB2BD	0x796D	#<CJK>
-0xB2BE	0x79FB	#<CJK>
-0xB2BF	0x7A92	#<CJK>
-0xB2C0	0x7A95	#<CJK>
-0xB2C1	0x7B20	#<CJK>
-0xB2C2	0x7B28	#<CJK>
-0xB2C3	0x7B1B	#<CJK>
-0xB2C4	0x7B2C	#<CJK>
-0xB2C5	0x7B26	#<CJK>
-0xB2C6	0x7B19	#<CJK>
-0xB2C7	0x7B1E	#<CJK>
-0xB2C8	0x7B2E	#<CJK>
-0xB2C9	0x7C92	#<CJK>
-0xB2CA	0x7C97	#<CJK>
-0xB2CB	0x7C95	#<CJK>
-0xB2CC	0x7D46	#<CJK>
-0xB2CD	0x7D43	#<CJK>
-0xB2CE	0x7D71	#<CJK>
-0xB2CF	0x7D2E	#<CJK>
-0xB2D0	0x7D39	#<CJK>
-0xB2D1	0x7D3C	#<CJK>
-0xB2D2	0x7D40	#<CJK>
-0xB2D3	0x7D30	#<CJK>
-0xB2D4	0x7D33	#<CJK>
-0xB2D5	0x7D44	#<CJK>
-0xB2D6	0x7D2F	#<CJK>
-0xB2D7	0x7D42	#<CJK>
-0xB2D8	0x7D32	#<CJK>
-0xB2D9	0x7D31	#<CJK>
-0xB2DA	0x7F3D	#<CJK>
-0xB2DB	0x7F9E	#<CJK>
-0xB2DC	0x7F9A	#<CJK>
-0xB2DD	0x7FCC	#<CJK>
-0xB2DE	0x7FCE	#<CJK>
-0xB2DF	0x7FD2	#<CJK>
-0xB2E0	0x801C	#<CJK>
-0xB2E1	0x804A	#<CJK>
-0xB2E2	0x8046	#<CJK>
-0xB2E3	0x812F	#<CJK>
-0xB2E4	0x8116	#<CJK>
-0xB2E5	0x8123	#<CJK>
-0xB2E6	0x812B	#<CJK>
-0xB2E7	0x8129	#<CJK>
-0xB2E8	0x8130	#<CJK>
-0xB2E9	0x8124	#<CJK>
-0xB2EA	0x8202	#<CJK>
-0xB2EB	0x8235	#<CJK>
-0xB2EC	0x8237	#<CJK>
-0xB2ED	0x8236	#<CJK>
-0xB2EE	0x8239	#<CJK>
-0xB2EF	0x838E	#<CJK>
-0xB2F0	0x839E	#<CJK>
-0xB2F1	0x8398	#<CJK>
-0xB2F2	0x8378	#<CJK>
-0xB2F3	0x83A2	#<CJK>
-0xB2F4	0x8396	#<CJK>
-0xB2F5	0x83BD	#<CJK>
-0xB2F6	0x83AB	#<CJK>
-0xB2F7	0x8392	#<CJK>
-0xB2F8	0x838A	#<CJK>
-0xB2F9	0x8393	#<CJK>
-0xB2FA	0x8389	#<CJK>
-0xB2FB	0x83A0	#<CJK>
-0xB2FC	0x8377	#<CJK>
-0xB2FD	0x837B	#<CJK>
-0xB2FE	0x837C	#<CJK>
-0xB340	0x8386	#<CJK>
-0xB341	0x83A7	#<CJK>
-0xB342	0x8655	#<CJK>
-0xB343	0x5F6A	#<CJK>
-0xB344	0x86C7	#<CJK>
-0xB345	0x86C0	#<CJK>
-0xB346	0x86B6	#<CJK>
-0xB347	0x86C4	#<CJK>
-0xB348	0x86B5	#<CJK>
-0xB349	0x86C6	#<CJK>
-0xB34A	0x86CB	#<CJK>
-0xB34B	0x86B1	#<CJK>
-0xB34C	0x86AF	#<CJK>
-0xB34D	0x86C9	#<CJK>
-0xB34E	0x8853	#<CJK>
-0xB34F	0x889E	#<CJK>
-0xB350	0x8888	#<CJK>
-0xB351	0x88AB	#<CJK>
-0xB352	0x8892	#<CJK>
-0xB353	0x8896	#<CJK>
-0xB354	0x888D	#<CJK>
-0xB355	0x888B	#<CJK>
-0xB356	0x8993	#<CJK>
-0xB357	0x898F	#<CJK>
-0xB358	0x8A2A	#<CJK>
-0xB359	0x8A1D	#<CJK>
-0xB35A	0x8A23	#<CJK>
-0xB35B	0x8A25	#<CJK>
-0xB35C	0x8A31	#<CJK>
-0xB35D	0x8A2D	#<CJK>
-0xB35E	0x8A1F	#<CJK>
-0xB35F	0x8A1B	#<CJK>
-0xB360	0x8A22	#<CJK>
-0xB361	0x8C49	#<CJK>
-0xB362	0x8C5A	#<CJK>
-0xB363	0x8CA9	#<CJK>
-0xB364	0x8CAC	#<CJK>
-0xB365	0x8CAB	#<CJK>
-0xB366	0x8CA8	#<CJK>
-0xB367	0x8CAA	#<CJK>
-0xB368	0x8CA7	#<CJK>
-0xB369	0x8D67	#<CJK>
-0xB36A	0x8D66	#<CJK>
-0xB36B	0x8DBE	#<CJK>
-0xB36C	0x8DBA	#<CJK>
-0xB36D	0x8EDB	#<CJK>
-0xB36E	0x8EDF	#<CJK>
-0xB36F	0x9019	#<CJK>
-0xB370	0x900D	#<CJK>
-0xB371	0x901A	#<CJK>
-0xB372	0x9017	#<CJK>
-0xB373	0x9023	#<CJK>
-0xB374	0x901F	#<CJK>
-0xB375	0x901D	#<CJK>
-0xB376	0x9010	#<CJK>
-0xB377	0x9015	#<CJK>
-0xB378	0x901E	#<CJK>
-0xB379	0x9020	#<CJK>
-0xB37A	0x900F	#<CJK>
-0xB37B	0x9022	#<CJK>
-0xB37C	0x9016	#<CJK>
-0xB37D	0x901B	#<CJK>
-0xB37E	0x9014	#<CJK>
-0xB3A1	0x90E8	#<CJK>
-0xB3A2	0x90ED	#<CJK>
-0xB3A3	0x90FD	#<CJK>
-0xB3A4	0x9157	#<CJK>
-0xB3A5	0x91CE	#<CJK>
-0xB3A6	0x91F5	#<CJK>
-0xB3A7	0x91E6	#<CJK>
-0xB3A8	0x91E3	#<CJK>
-0xB3A9	0x91E7	#<CJK>
-0xB3AA	0x91ED	#<CJK>
-0xB3AB	0x91E9	#<CJK>
-0xB3AC	0x9589	#<CJK>
-0xB3AD	0x966A	#<CJK>
-0xB3AE	0x9675	#<CJK>
-0xB3AF	0x9673	#<CJK>
-0xB3B0	0x9678	#<CJK>
-0xB3B1	0x9670	#<CJK>
-0xB3B2	0x9674	#<CJK>
-0xB3B3	0x9676	#<CJK>
-0xB3B4	0x9677	#<CJK>
-0xB3B5	0x966C	#<CJK>
-0xB3B6	0x96C0	#<CJK>
-0xB3B7	0x96EA	#<CJK>
-0xB3B8	0x96E9	#<CJK>
-0xB3B9	0x7AE0	#<CJK>
-0xB3BA	0x7ADF	#<CJK>
-0xB3BB	0x9802	#<CJK>
-0xB3BC	0x9803	#<CJK>
-0xB3BD	0x9B5A	#<CJK>
-0xB3BE	0x9CE5	#<CJK>
-0xB3BF	0x9E75	#<CJK>
-0xB3C0	0x9E7F	#<CJK>
-0xB3C1	0x9EA5	#<CJK>
-0xB3C2	0x9EBB	#<CJK>
-0xB3C3	0x50A2	#<CJK>
-0xB3C4	0x508D	#<CJK>
-0xB3C5	0x5085	#<CJK>
-0xB3C6	0x5099	#<CJK>
-0xB3C7	0x5091	#<CJK>
-0xB3C8	0x5080	#<CJK>
-0xB3C9	0x5096	#<CJK>
-0xB3CA	0x5098	#<CJK>
-0xB3CB	0x509A	#<CJK>
-0xB3CC	0x6700	#<CJK>
-0xB3CD	0x51F1	#<CJK>
-0xB3CE	0x5272	#<CJK>
-0xB3CF	0x5274	#<CJK>
-0xB3D0	0x5275	#<CJK>
-0xB3D1	0x5269	#<CJK>
-0xB3D2	0x52DE	#<CJK>
-0xB3D3	0x52DD	#<CJK>
-0xB3D4	0x52DB	#<CJK>
-0xB3D5	0x535A	#<CJK>
-0xB3D6	0x53A5	#<CJK>
-0xB3D7	0x557B	#<CJK>
-0xB3D8	0x5580	#<CJK>
-0xB3D9	0x55A7	#<CJK>
-0xB3DA	0x557C	#<CJK>
-0xB3DB	0x558A	#<CJK>
-0xB3DC	0x559D	#<CJK>
-0xB3DD	0x5598	#<CJK>
-0xB3DE	0x5582	#<CJK>
-0xB3DF	0x559C	#<CJK>
-0xB3E0	0x55AA	#<CJK>
-0xB3E1	0x5594	#<CJK>
-0xB3E2	0x5587	#<CJK>
-0xB3E3	0x558B	#<CJK>
-0xB3E4	0x5583	#<CJK>
-0xB3E5	0x55B3	#<CJK>
-0xB3E6	0x55AE	#<CJK>
-0xB3E7	0x559F	#<CJK>
-0xB3E8	0x553E	#<CJK>
-0xB3E9	0x55B2	#<CJK>
-0xB3EA	0x559A	#<CJK>
-0xB3EB	0x55BB	#<CJK>
-0xB3EC	0x55AC	#<CJK>
-0xB3ED	0x55B1	#<CJK>
-0xB3EE	0x557E	#<CJK>
-0xB3EF	0x5589	#<CJK>
-0xB3F0	0x55AB	#<CJK>
-0xB3F1	0x5599	#<CJK>
-0xB3F2	0x570D	#<CJK>
-0xB3F3	0x582F	#<CJK>
-0xB3F4	0x582A	#<CJK>
-0xB3F5	0x5834	#<CJK>
-0xB3F6	0x5824	#<CJK>
-0xB3F7	0x5830	#<CJK>
-0xB3F8	0x5831	#<CJK>
-0xB3F9	0x5821	#<CJK>
-0xB3FA	0x581D	#<CJK>
-0xB3FB	0x5820	#<CJK>
-0xB3FC	0x58F9	#<CJK>
-0xB3FD	0x58FA	#<CJK>
-0xB3FE	0x5960	#<CJK>
-0xB440	0x5A77	#<CJK>
-0xB441	0x5A9A	#<CJK>
-0xB442	0x5A7F	#<CJK>
-0xB443	0x5A92	#<CJK>
-0xB444	0x5A9B	#<CJK>
-0xB445	0x5AA7	#<CJK>
-0xB446	0x5B73	#<CJK>
-0xB447	0x5B71	#<CJK>
-0xB448	0x5BD2	#<CJK>
-0xB449	0x5BCC	#<CJK>
-0xB44A	0x5BD3	#<CJK>
-0xB44B	0x5BD0	#<CJK>
-0xB44C	0x5C0A	#<CJK>
-0xB44D	0x5C0B	#<CJK>
-0xB44E	0x5C31	#<CJK>
-0xB44F	0x5D4C	#<CJK>
-0xB450	0x5D50	#<CJK>
-0xB451	0x5D34	#<CJK>
-0xB452	0x5D47	#<CJK>
-0xB453	0x5DFD	#<CJK>
-0xB454	0x5E45	#<CJK>
-0xB455	0x5E3D	#<CJK>
-0xB456	0x5E40	#<CJK>
-0xB457	0x5E43	#<CJK>
-0xB458	0x5E7E	#<CJK>
-0xB459	0x5ECA	#<CJK>
-0xB45A	0x5EC1	#<CJK>
-0xB45B	0x5EC2	#<CJK>
-0xB45C	0x5EC4	#<CJK>
-0xB45D	0x5F3C	#<CJK>
-0xB45E	0x5F6D	#<CJK>
-0xB45F	0x5FA9	#<CJK>
-0xB460	0x5FAA	#<CJK>
-0xB461	0x5FA8	#<CJK>
-0xB462	0x60D1	#<CJK>
-0xB463	0x60E1	#<CJK>
-0xB464	0x60B2	#<CJK>
-0xB465	0x60B6	#<CJK>
-0xB466	0x60E0	#<CJK>
-0xB467	0x611C	#<CJK>
-0xB468	0x6123	#<CJK>
-0xB469	0x60FA	#<CJK>
-0xB46A	0x6115	#<CJK>
-0xB46B	0x60F0	#<CJK>
-0xB46C	0x60FB	#<CJK>
-0xB46D	0x60F4	#<CJK>
-0xB46E	0x6168	#<CJK>
-0xB46F	0x60F1	#<CJK>
-0xB470	0x610E	#<CJK>
-0xB471	0x60F6	#<CJK>
-0xB472	0x6109	#<CJK>
-0xB473	0x6100	#<CJK>
-0xB474	0x6112	#<CJK>
-0xB475	0x621F	#<CJK>
-0xB476	0x6249	#<CJK>
-0xB477	0x63A3	#<CJK>
-0xB478	0x638C	#<CJK>
-0xB479	0x63CF	#<CJK>
-0xB47A	0x63C0	#<CJK>
-0xB47B	0x63E9	#<CJK>
-0xB47C	0x63C9	#<CJK>
-0xB47D	0x63C6	#<CJK>
-0xB47E	0x63CD	#<CJK>
-0xB4A1	0x63D2	#<CJK>
-0xB4A2	0x63E3	#<CJK>
-0xB4A3	0x63D0	#<CJK>
-0xB4A4	0x63E1	#<CJK>
-0xB4A5	0x63D6	#<CJK>
-0xB4A6	0x63ED	#<CJK>
-0xB4A7	0x63EE	#<CJK>
-0xB4A8	0x6376	#<CJK>
-0xB4A9	0x63F4	#<CJK>
-0xB4AA	0x63EA	#<CJK>
-0xB4AB	0x63DB	#<CJK>
-0xB4AC	0x6452	#<CJK>
-0xB4AD	0x63DA	#<CJK>
-0xB4AE	0x63F9	#<CJK>
-0xB4AF	0x655E	#<CJK>
-0xB4B0	0x6566	#<CJK>
-0xB4B1	0x6562	#<CJK>
-0xB4B2	0x6563	#<CJK>
-0xB4B3	0x6591	#<CJK>
-0xB4B4	0x6590	#<CJK>
-0xB4B5	0x65AF	#<CJK>
-0xB4B6	0x666E	#<CJK>
-0xB4B7	0x6670	#<CJK>
-0xB4B8	0x6674	#<CJK>
-0xB4B9	0x6676	#<CJK>
-0xB4BA	0x666F	#<CJK>
-0xB4BB	0x6691	#<CJK>
-0xB4BC	0x667A	#<CJK>
-0xB4BD	0x667E	#<CJK>
-0xB4BE	0x6677	#<CJK>
-0xB4BF	0x66FE	#<CJK>
-0xB4C0	0x66FF	#<CJK>
-0xB4C1	0x671F	#<CJK>
-0xB4C2	0x671D	#<CJK>
-0xB4C3	0x68FA	#<CJK>
-0xB4C4	0x68D5	#<CJK>
-0xB4C5	0x68E0	#<CJK>
-0xB4C6	0x68D8	#<CJK>
-0xB4C7	0x68D7	#<CJK>
-0xB4C8	0x6905	#<CJK>
-0xB4C9	0x68DF	#<CJK>
-0xB4CA	0x68F5	#<CJK>
-0xB4CB	0x68EE	#<CJK>
-0xB4CC	0x68E7	#<CJK>
-0xB4CD	0x68F9	#<CJK>
-0xB4CE	0x68D2	#<CJK>
-0xB4CF	0x68F2	#<CJK>
-0xB4D0	0x68E3	#<CJK>
-0xB4D1	0x68CB	#<CJK>
-0xB4D2	0x68CD	#<CJK>
-0xB4D3	0x690D	#<CJK>
-0xB4D4	0x6912	#<CJK>
-0xB4D5	0x690E	#<CJK>
-0xB4D6	0x68C9	#<CJK>
-0xB4D7	0x68DA	#<CJK>
-0xB4D8	0x696E	#<CJK>
-0xB4D9	0x68FB	#<CJK>
-0xB4DA	0x6B3E	#<CJK>
-0xB4DB	0x6B3A	#<CJK>
-0xB4DC	0x6B3D	#<CJK>
-0xB4DD	0x6B98	#<CJK>
-0xB4DE	0x6B96	#<CJK>
-0xB4DF	0x6BBC	#<CJK>
-0xB4E0	0x6BEF	#<CJK>
-0xB4E1	0x6C2E	#<CJK>
-0xB4E2	0x6C2F	#<CJK>
-0xB4E3	0x6C2C	#<CJK>
-0xB4E4	0x6E2F	#<CJK>
-0xB4E5	0x6E38	#<CJK>
-0xB4E6	0x6E54	#<CJK>
-0xB4E7	0x6E21	#<CJK>
-0xB4E8	0x6E32	#<CJK>
-0xB4E9	0x6E67	#<CJK>
-0xB4EA	0x6E4A	#<CJK>
-0xB4EB	0x6E20	#<CJK>
-0xB4EC	0x6E25	#<CJK>
-0xB4ED	0x6E23	#<CJK>
-0xB4EE	0x6E1B	#<CJK>
-0xB4EF	0x6E5B	#<CJK>
-0xB4F0	0x6E58	#<CJK>
-0xB4F1	0x6E24	#<CJK>
-0xB4F2	0x6E56	#<CJK>
-0xB4F3	0x6E6E	#<CJK>
-0xB4F4	0x6E2D	#<CJK>
-0xB4F5	0x6E26	#<CJK>
-0xB4F6	0x6E6F	#<CJK>
-0xB4F7	0x6E34	#<CJK>
-0xB4F8	0x6E4D	#<CJK>
-0xB4F9	0x6E3A	#<CJK>
-0xB4FA	0x6E2C	#<CJK>
-0xB4FB	0x6E43	#<CJK>
-0xB4FC	0x6E1D	#<CJK>
-0xB4FD	0x6E3E	#<CJK>
-0xB4FE	0x6ECB	#<CJK>
-0xB540	0x6E89	#<CJK>
-0xB541	0x6E19	#<CJK>
-0xB542	0x6E4E	#<CJK>
-0xB543	0x6E63	#<CJK>
-0xB544	0x6E44	#<CJK>
-0xB545	0x6E72	#<CJK>
-0xB546	0x6E69	#<CJK>
-0xB547	0x6E5F	#<CJK>
-0xB548	0x7119	#<CJK>
-0xB549	0x711A	#<CJK>
-0xB54A	0x7126	#<CJK>
-0xB54B	0x7130	#<CJK>
-0xB54C	0x7121	#<CJK>
-0xB54D	0x7136	#<CJK>
-0xB54E	0x716E	#<CJK>
-0xB54F	0x711C	#<CJK>
-0xB550	0x724C	#<CJK>
-0xB551	0x7284	#<CJK>
-0xB552	0x7280	#<CJK>
-0xB553	0x7336	#<CJK>
-0xB554	0x7325	#<CJK>
-0xB555	0x7334	#<CJK>
-0xB556	0x7329	#<CJK>
-0xB557	0x743A	#<CJK>
-0xB558	0x742A	#<CJK>
-0xB559	0x7433	#<CJK>
-0xB55A	0x7422	#<CJK>
-0xB55B	0x7425	#<CJK>
-0xB55C	0x7435	#<CJK>
-0xB55D	0x7436	#<CJK>
-0xB55E	0x7434	#<CJK>
-0xB55F	0x742F	#<CJK>
-0xB560	0x741B	#<CJK>
-0xB561	0x7426	#<CJK>
-0xB562	0x7428	#<CJK>
-0xB563	0x7525	#<CJK>
-0xB564	0x7526	#<CJK>
-0xB565	0x756B	#<CJK>
-0xB566	0x756A	#<CJK>
-0xB567	0x75E2	#<CJK>
-0xB568	0x75DB	#<CJK>
-0xB569	0x75E3	#<CJK>
-0xB56A	0x75D9	#<CJK>
-0xB56B	0x75D8	#<CJK>
-0xB56C	0x75DE	#<CJK>
-0xB56D	0x75E0	#<CJK>
-0xB56E	0x767B	#<CJK>
-0xB56F	0x767C	#<CJK>
-0xB570	0x7696	#<CJK>
-0xB571	0x7693	#<CJK>
-0xB572	0x76B4	#<CJK>
-0xB573	0x76DC	#<CJK>
-0xB574	0x774F	#<CJK>
-0xB575	0x77ED	#<CJK>
-0xB576	0x785D	#<CJK>
-0xB577	0x786C	#<CJK>
-0xB578	0x786F	#<CJK>
-0xB579	0x7A0D	#<CJK>
-0xB57A	0x7A08	#<CJK>
-0xB57B	0x7A0B	#<CJK>
-0xB57C	0x7A05	#<CJK>
-0xB57D	0x7A00	#<CJK>
-0xB57E	0x7A98	#<CJK>
-0xB5A1	0x7A97	#<CJK>
-0xB5A2	0x7A96	#<CJK>
-0xB5A3	0x7AE5	#<CJK>
-0xB5A4	0x7AE3	#<CJK>
-0xB5A5	0x7B49	#<CJK>
-0xB5A6	0x7B56	#<CJK>
-0xB5A7	0x7B46	#<CJK>
-0xB5A8	0x7B50	#<CJK>
-0xB5A9	0x7B52	#<CJK>
-0xB5AA	0x7B54	#<CJK>
-0xB5AB	0x7B4D	#<CJK>
-0xB5AC	0x7B4B	#<CJK>
-0xB5AD	0x7B4F	#<CJK>
-0xB5AE	0x7B51	#<CJK>
-0xB5AF	0x7C9F	#<CJK>
-0xB5B0	0x7CA5	#<CJK>
-0xB5B1	0x7D5E	#<CJK>
-0xB5B2	0x7D50	#<CJK>
-0xB5B3	0x7D68	#<CJK>
-0xB5B4	0x7D55	#<CJK>
-0xB5B5	0x7D2B	#<CJK>
-0xB5B6	0x7D6E	#<CJK>
-0xB5B7	0x7D72	#<CJK>
-0xB5B8	0x7D61	#<CJK>
-0xB5B9	0x7D66	#<CJK>
-0xB5BA	0x7D62	#<CJK>
-0xB5BB	0x7D70	#<CJK>
-0xB5BC	0x7D73	#<CJK>
-0xB5BD	0x5584	#<CJK>
-0xB5BE	0x7FD4	#<CJK>
-0xB5BF	0x7FD5	#<CJK>
-0xB5C0	0x800B	#<CJK>
-0xB5C1	0x8052	#<CJK>
-0xB5C2	0x8085	#<CJK>
-0xB5C3	0x8155	#<CJK>
-0xB5C4	0x8154	#<CJK>
-0xB5C5	0x814B	#<CJK>
-0xB5C6	0x8151	#<CJK>
-0xB5C7	0x814E	#<CJK>
-0xB5C8	0x8139	#<CJK>
-0xB5C9	0x8146	#<CJK>
-0xB5CA	0x813E	#<CJK>
-0xB5CB	0x814C	#<CJK>
-0xB5CC	0x8153	#<CJK>
-0xB5CD	0x8174	#<CJK>
-0xB5CE	0x8212	#<CJK>
-0xB5CF	0x821C	#<CJK>
-0xB5D0	0x83E9	#<CJK>
-0xB5D1	0x8403	#<CJK>
-0xB5D2	0x83F8	#<CJK>
-0xB5D3	0x840D	#<CJK>
-0xB5D4	0x83E0	#<CJK>
-0xB5D5	0x83C5	#<CJK>
-0xB5D6	0x840B	#<CJK>
-0xB5D7	0x83C1	#<CJK>
-0xB5D8	0x83EF	#<CJK>
-0xB5D9	0x83F1	#<CJK>
-0xB5DA	0x83F4	#<CJK>
-0xB5DB	0x8457	#<CJK>
-0xB5DC	0x840A	#<CJK>
-0xB5DD	0x83F0	#<CJK>
-0xB5DE	0x840C	#<CJK>
-0xB5DF	0x83CC	#<CJK>
-0xB5E0	0x83FD	#<CJK>
-0xB5E1	0x83F2	#<CJK>
-0xB5E2	0x83CA	#<CJK>
-0xB5E3	0x8438	#<CJK>
-0xB5E4	0x840E	#<CJK>
-0xB5E5	0x8404	#<CJK>
-0xB5E6	0x83DC	#<CJK>
-0xB5E7	0x8407	#<CJK>
-0xB5E8	0x83D4	#<CJK>
-0xB5E9	0x83DF	#<CJK>
-0xB5EA	0x865B	#<CJK>
-0xB5EB	0x86DF	#<CJK>
-0xB5EC	0x86D9	#<CJK>
-0xB5ED	0x86ED	#<CJK>
-0xB5EE	0x86D4	#<CJK>
-0xB5EF	0x86DB	#<CJK>
-0xB5F0	0x86E4	#<CJK>
-0xB5F1	0x86D0	#<CJK>
-0xB5F2	0x86DE	#<CJK>
-0xB5F3	0x8857	#<CJK>
-0xB5F4	0x88C1	#<CJK>
-0xB5F5	0x88C2	#<CJK>
-0xB5F6	0x88B1	#<CJK>
-0xB5F7	0x8983	#<CJK>
-0xB5F8	0x8996	#<CJK>
-0xB5F9	0x8A3B	#<CJK>
-0xB5FA	0x8A60	#<CJK>
-0xB5FB	0x8A55	#<CJK>
-0xB5FC	0x8A5E	#<CJK>
-0xB5FD	0x8A3C	#<CJK>
-0xB5FE	0x8A41	#<CJK>
-0xB640	0x8A54	#<CJK>
-0xB641	0x8A5B	#<CJK>
-0xB642	0x8A50	#<CJK>
-0xB643	0x8A46	#<CJK>
-0xB644	0x8A34	#<CJK>
-0xB645	0x8A3A	#<CJK>
-0xB646	0x8A36	#<CJK>
-0xB647	0x8A56	#<CJK>
-0xB648	0x8C61	#<CJK>
-0xB649	0x8C82	#<CJK>
-0xB64A	0x8CAF	#<CJK>
-0xB64B	0x8CBC	#<CJK>
-0xB64C	0x8CB3	#<CJK>
-0xB64D	0x8CBD	#<CJK>
-0xB64E	0x8CC1	#<CJK>
-0xB64F	0x8CBB	#<CJK>
-0xB650	0x8CC0	#<CJK>
-0xB651	0x8CB4	#<CJK>
-0xB652	0x8CB7	#<CJK>
-0xB653	0x8CB6	#<CJK>
-0xB654	0x8CBF	#<CJK>
-0xB655	0x8CB8	#<CJK>
-0xB656	0x8D8A	#<CJK>
-0xB657	0x8D85	#<CJK>
-0xB658	0x8D81	#<CJK>
-0xB659	0x8DCE	#<CJK>
-0xB65A	0x8DDD	#<CJK>
-0xB65B	0x8DCB	#<CJK>
-0xB65C	0x8DDA	#<CJK>
-0xB65D	0x8DD1	#<CJK>
-0xB65E	0x8DCC	#<CJK>
-0xB65F	0x8DDB	#<CJK>
-0xB660	0x8DC6	#<CJK>
-0xB661	0x8EFB	#<CJK>
-0xB662	0x8EF8	#<CJK>
-0xB663	0x8EFC	#<CJK>
-0xB664	0x8F9C	#<CJK>
-0xB665	0x902E	#<CJK>
-0xB666	0x9035	#<CJK>
-0xB667	0x9031	#<CJK>
-0xB668	0x9038	#<CJK>
-0xB669	0x9032	#<CJK>
-0xB66A	0x9036	#<CJK>
-0xB66B	0x9102	#<CJK>
-0xB66C	0x90F5	#<CJK>
-0xB66D	0x9109	#<CJK>
-0xB66E	0x90FE	#<CJK>
-0xB66F	0x9163	#<CJK>
-0xB670	0x9165	#<CJK>
-0xB671	0x91CF	#<CJK>
-0xB672	0x9214	#<CJK>
-0xB673	0x9215	#<CJK>
-0xB674	0x9223	#<CJK>
-0xB675	0x9209	#<CJK>
-0xB676	0x921E	#<CJK>
-0xB677	0x920D	#<CJK>
-0xB678	0x9210	#<CJK>
-0xB679	0x9207	#<CJK>
-0xB67A	0x9211	#<CJK>
-0xB67B	0x9594	#<CJK>
-0xB67C	0x958F	#<CJK>
-0xB67D	0x958B	#<CJK>
-0xB67E	0x9591	#<CJK>
-0xB6A1	0x9593	#<CJK>
-0xB6A2	0x9592	#<CJK>
-0xB6A3	0x958E	#<CJK>
-0xB6A4	0x968A	#<CJK>
-0xB6A5	0x968E	#<CJK>
-0xB6A6	0x968B	#<CJK>
-0xB6A7	0x967D	#<CJK>
-0xB6A8	0x9685	#<CJK>
-0xB6A9	0x9686	#<CJK>
-0xB6AA	0x968D	#<CJK>
-0xB6AB	0x9672	#<CJK>
-0xB6AC	0x9684	#<CJK>
-0xB6AD	0x96C1	#<CJK>
-0xB6AE	0x96C5	#<CJK>
-0xB6AF	0x96C4	#<CJK>
-0xB6B0	0x96C6	#<CJK>
-0xB6B1	0x96C7	#<CJK>
-0xB6B2	0x96EF	#<CJK>
-0xB6B3	0x96F2	#<CJK>
-0xB6B4	0x97CC	#<CJK>
-0xB6B5	0x9805	#<CJK>
-0xB6B6	0x9806	#<CJK>
-0xB6B7	0x9808	#<CJK>
-0xB6B8	0x98E7	#<CJK>
-0xB6B9	0x98EA	#<CJK>
-0xB6BA	0x98EF	#<CJK>
-0xB6BB	0x98E9	#<CJK>
-0xB6BC	0x98F2	#<CJK>
-0xB6BD	0x98ED	#<CJK>
-0xB6BE	0x99AE	#<CJK>
-0xB6BF	0x99AD	#<CJK>
-0xB6C0	0x9EC3	#<CJK>
-0xB6C1	0x9ECD	#<CJK>
-0xB6C2	0x9ED1	#<CJK>
-0xB6C3	0x4E82	#<CJK>
-0xB6C4	0x50AD	#<CJK>
-0xB6C5	0x50B5	#<CJK>
-0xB6C6	0x50B2	#<CJK>
-0xB6C7	0x50B3	#<CJK>
-0xB6C8	0x50C5	#<CJK>
-0xB6C9	0x50BE	#<CJK>
-0xB6CA	0x50AC	#<CJK>
-0xB6CB	0x50B7	#<CJK>
-0xB6CC	0x50BB	#<CJK>
-0xB6CD	0x50AF	#<CJK>
-0xB6CE	0x50C7	#<CJK>
-0xB6CF	0x527F	#<CJK>
-0xB6D0	0x5277	#<CJK>
-0xB6D1	0x527D	#<CJK>
-0xB6D2	0x52DF	#<CJK>
-0xB6D3	0x52E6	#<CJK>
-0xB6D4	0x52E4	#<CJK>
-0xB6D5	0x52E2	#<CJK>
-0xB6D6	0x52E3	#<CJK>
-0xB6D7	0x532F	#<CJK>
-0xB6D8	0x55DF	#<CJK>
-0xB6D9	0x55E8	#<CJK>
-0xB6DA	0x55D3	#<CJK>
-0xB6DB	0x55E6	#<CJK>
-0xB6DC	0x55CE	#<CJK>
-0xB6DD	0x55DC	#<CJK>
-0xB6DE	0x55C7	#<CJK>
-0xB6DF	0x55D1	#<CJK>
-0xB6E0	0x55E3	#<CJK>
-0xB6E1	0x55E4	#<CJK>
-0xB6E2	0x55EF	#<CJK>
-0xB6E3	0x55DA	#<CJK>
-0xB6E4	0x55E1	#<CJK>
-0xB6E5	0x55C5	#<CJK>
-0xB6E6	0x55C6	#<CJK>
-0xB6E7	0x55E5	#<CJK>
-0xB6E8	0x55C9	#<CJK>
-0xB6E9	0x5712	#<CJK>
-0xB6EA	0x5713	#<CJK>
-0xB6EB	0x585E	#<CJK>
-0xB6EC	0x5851	#<CJK>
-0xB6ED	0x5858	#<CJK>
-0xB6EE	0x5857	#<CJK>
-0xB6EF	0x585A	#<CJK>
-0xB6F0	0x5854	#<CJK>
-0xB6F1	0x586B	#<CJK>
-0xB6F2	0x584C	#<CJK>
-0xB6F3	0x586D	#<CJK>
-0xB6F4	0x584A	#<CJK>
-0xB6F5	0x5862	#<CJK>
-0xB6F6	0x5852	#<CJK>
-0xB6F7	0x584B	#<CJK>
-0xB6F8	0x5967	#<CJK>
-0xB6F9	0x5AC1	#<CJK>
-0xB6FA	0x5AC9	#<CJK>
-0xB6FB	0x5ACC	#<CJK>
-0xB6FC	0x5ABE	#<CJK>
-0xB6FD	0x5ABD	#<CJK>
-0xB6FE	0x5ABC	#<CJK>
-0xB740	0x5AB3	#<CJK>
-0xB741	0x5AC2	#<CJK>
-0xB742	0x5AB2	#<CJK>
-0xB743	0x5D69	#<CJK>
-0xB744	0x5D6F	#<CJK>
-0xB745	0x5E4C	#<CJK>
-0xB746	0x5E79	#<CJK>
-0xB747	0x5EC9	#<CJK>
-0xB748	0x5EC8	#<CJK>
-0xB749	0x5F12	#<CJK>
-0xB74A	0x5F59	#<CJK>
-0xB74B	0x5FAC	#<CJK>
-0xB74C	0x5FAE	#<CJK>
-0xB74D	0x611A	#<CJK>
-0xB74E	0x610F	#<CJK>
-0xB74F	0x6148	#<CJK>
-0xB750	0x611F	#<CJK>
-0xB751	0x60F3	#<CJK>
-0xB752	0x611B	#<CJK>
-0xB753	0x60F9	#<CJK>
-0xB754	0x6101	#<CJK>
-0xB755	0x6108	#<CJK>
-0xB756	0x614E	#<CJK>
-0xB757	0x614C	#<CJK>
-0xB758	0x6144	#<CJK>
-0xB759	0x614D	#<CJK>
-0xB75A	0x613E	#<CJK>
-0xB75B	0x6134	#<CJK>
-0xB75C	0x6127	#<CJK>
-0xB75D	0x610D	#<CJK>
-0xB75E	0x6106	#<CJK>
-0xB75F	0x6137	#<CJK>
-0xB760	0x6221	#<CJK>
-0xB761	0x6222	#<CJK>
-0xB762	0x6413	#<CJK>
-0xB763	0x643E	#<CJK>
-0xB764	0x641E	#<CJK>
-0xB765	0x642A	#<CJK>
-0xB766	0x642D	#<CJK>
-0xB767	0x643D	#<CJK>
-0xB768	0x642C	#<CJK>
-0xB769	0x640F	#<CJK>
-0xB76A	0x641C	#<CJK>
-0xB76B	0x6414	#<CJK>
-0xB76C	0x640D	#<CJK>
-0xB76D	0x6436	#<CJK>
-0xB76E	0x6416	#<CJK>
-0xB76F	0x6417	#<CJK>
-0xB770	0x6406	#<CJK>
-0xB771	0x656C	#<CJK>
-0xB772	0x659F	#<CJK>
-0xB773	0x65B0	#<CJK>
-0xB774	0x6697	#<CJK>
-0xB775	0x6689	#<CJK>
-0xB776	0x6687	#<CJK>
-0xB777	0x6688	#<CJK>
-0xB778	0x6696	#<CJK>
-0xB779	0x6684	#<CJK>
-0xB77A	0x6698	#<CJK>
-0xB77B	0x668D	#<CJK>
-0xB77C	0x6703	#<CJK>
-0xB77D	0x6994	#<CJK>
-0xB77E	0x696D	#<CJK>
-0xB7A1	0x695A	#<CJK>
-0xB7A2	0x6977	#<CJK>
-0xB7A3	0x6960	#<CJK>
-0xB7A4	0x6954	#<CJK>
-0xB7A5	0x6975	#<CJK>
-0xB7A6	0x6930	#<CJK>
-0xB7A7	0x6982	#<CJK>
-0xB7A8	0x694A	#<CJK>
-0xB7A9	0x6968	#<CJK>
-0xB7AA	0x696B	#<CJK>
-0xB7AB	0x695E	#<CJK>
-0xB7AC	0x6953	#<CJK>
-0xB7AD	0x6979	#<CJK>
-0xB7AE	0x6986	#<CJK>
-0xB7AF	0x695D	#<CJK>
-0xB7B0	0x6963	#<CJK>
-0xB7B1	0x695B	#<CJK>
-0xB7B2	0x6B47	#<CJK>
-0xB7B3	0x6B72	#<CJK>
-0xB7B4	0x6BC0	#<CJK>
-0xB7B5	0x6BBF	#<CJK>
-0xB7B6	0x6BD3	#<CJK>
-0xB7B7	0x6BFD	#<CJK>
-0xB7B8	0x6EA2	#<CJK>
-0xB7B9	0x6EAF	#<CJK>
-0xB7BA	0x6ED3	#<CJK>
-0xB7BB	0x6EB6	#<CJK>
-0xB7BC	0x6EC2	#<CJK>
-0xB7BD	0x6E90	#<CJK>
-0xB7BE	0x6E9D	#<CJK>
-0xB7BF	0x6EC7	#<CJK>
-0xB7C0	0x6EC5	#<CJK>
-0xB7C1	0x6EA5	#<CJK>
-0xB7C2	0x6E98	#<CJK>
-0xB7C3	0x6EBC	#<CJK>
-0xB7C4	0x6EBA	#<CJK>
-0xB7C5	0x6EAB	#<CJK>
-0xB7C6	0x6ED1	#<CJK>
-0xB7C7	0x6E96	#<CJK>
-0xB7C8	0x6E9C	#<CJK>
-0xB7C9	0x6EC4	#<CJK>
-0xB7CA	0x6ED4	#<CJK>
-0xB7CB	0x6EAA	#<CJK>
-0xB7CC	0x6EA7	#<CJK>
-0xB7CD	0x6EB4	#<CJK>
-0xB7CE	0x714E	#<CJK>
-0xB7CF	0x7159	#<CJK>
-0xB7D0	0x7169	#<CJK>
-0xB7D1	0x7164	#<CJK>
-0xB7D2	0x7149	#<CJK>
-0xB7D3	0x7167	#<CJK>
-0xB7D4	0x715C	#<CJK>
-0xB7D5	0x716C	#<CJK>
-0xB7D6	0x7166	#<CJK>
-0xB7D7	0x714C	#<CJK>
-0xB7D8	0x7165	#<CJK>
-0xB7D9	0x715E	#<CJK>
-0xB7DA	0x7146	#<CJK>
-0xB7DB	0x7168	#<CJK>
-0xB7DC	0x7156	#<CJK>
-0xB7DD	0x723A	#<CJK>
-0xB7DE	0x7252	#<CJK>
-0xB7DF	0x7337	#<CJK>
-0xB7E0	0x7345	#<CJK>
-0xB7E1	0x733F	#<CJK>
-0xB7E2	0x733E	#<CJK>
-0xB7E3	0x746F	#<CJK>
-0xB7E4	0x745A	#<CJK>
-0xB7E5	0x7455	#<CJK>
-0xB7E6	0x745F	#<CJK>
-0xB7E7	0x745E	#<CJK>
-0xB7E8	0x7441	#<CJK>
-0xB7E9	0x743F	#<CJK>
-0xB7EA	0x7459	#<CJK>
-0xB7EB	0x745B	#<CJK>
-0xB7EC	0x745C	#<CJK>
-0xB7ED	0x7576	#<CJK>
-0xB7EE	0x7578	#<CJK>
-0xB7EF	0x7600	#<CJK>
-0xB7F0	0x75F0	#<CJK>
-0xB7F1	0x7601	#<CJK>
-0xB7F2	0x75F2	#<CJK>
-0xB7F3	0x75F1	#<CJK>
-0xB7F4	0x75FA	#<CJK>
-0xB7F5	0x75FF	#<CJK>
-0xB7F6	0x75F4	#<CJK>
-0xB7F7	0x75F3	#<CJK>
-0xB7F8	0x76DE	#<CJK>
-0xB7F9	0x76DF	#<CJK>
-0xB7FA	0x775B	#<CJK>
-0xB7FB	0x776B	#<CJK>
-0xB7FC	0x7766	#<CJK>
-0xB7FD	0x775E	#<CJK>
-0xB7FE	0x7763	#<CJK>
-0xB840	0x7779	#<CJK>
-0xB841	0x776A	#<CJK>
-0xB842	0x776C	#<CJK>
-0xB843	0x775C	#<CJK>
-0xB844	0x7765	#<CJK>
-0xB845	0x7768	#<CJK>
-0xB846	0x7762	#<CJK>
-0xB847	0x77EE	#<CJK>
-0xB848	0x788E	#<CJK>
-0xB849	0x78B0	#<CJK>
-0xB84A	0x7897	#<CJK>
-0xB84B	0x7898	#<CJK>
-0xB84C	0x788C	#<CJK>
-0xB84D	0x7889	#<CJK>
-0xB84E	0x787C	#<CJK>
-0xB84F	0x7891	#<CJK>
-0xB850	0x7893	#<CJK>
-0xB851	0x787F	#<CJK>
-0xB852	0x797A	#<CJK>
-0xB853	0x797F	#<CJK>
-0xB854	0x7981	#<CJK>
-0xB855	0x842C	#<CJK>
-0xB856	0x79BD	#<CJK>
-0xB857	0x7A1C	#<CJK>
-0xB858	0x7A1A	#<CJK>
-0xB859	0x7A20	#<CJK>
-0xB85A	0x7A14	#<CJK>
-0xB85B	0x7A1F	#<CJK>
-0xB85C	0x7A1E	#<CJK>
-0xB85D	0x7A9F	#<CJK>
-0xB85E	0x7AA0	#<CJK>
-0xB85F	0x7B77	#<CJK>
-0xB860	0x7BC0	#<CJK>
-0xB861	0x7B60	#<CJK>
-0xB862	0x7B6E	#<CJK>
-0xB863	0x7B67	#<CJK>
-0xB864	0x7CB1	#<CJK>
-0xB865	0x7CB3	#<CJK>
-0xB866	0x7CB5	#<CJK>
-0xB867	0x7D93	#<CJK>
-0xB868	0x7D79	#<CJK>
-0xB869	0x7D91	#<CJK>
-0xB86A	0x7D81	#<CJK>
-0xB86B	0x7D8F	#<CJK>
-0xB86C	0x7D5B	#<CJK>
-0xB86D	0x7F6E	#<CJK>
-0xB86E	0x7F69	#<CJK>
-0xB86F	0x7F6A	#<CJK>
-0xB870	0x7F72	#<CJK>
-0xB871	0x7FA9	#<CJK>
-0xB872	0x7FA8	#<CJK>
-0xB873	0x7FA4	#<CJK>
-0xB874	0x8056	#<CJK>
-0xB875	0x8058	#<CJK>
-0xB876	0x8086	#<CJK>
-0xB877	0x8084	#<CJK>
-0xB878	0x8171	#<CJK>
-0xB879	0x8170	#<CJK>
-0xB87A	0x8178	#<CJK>
-0xB87B	0x8165	#<CJK>
-0xB87C	0x816E	#<CJK>
-0xB87D	0x8173	#<CJK>
-0xB87E	0x816B	#<CJK>
-0xB8A1	0x8179	#<CJK>
-0xB8A2	0x817A	#<CJK>
-0xB8A3	0x8166	#<CJK>
-0xB8A4	0x8205	#<CJK>
-0xB8A5	0x8247	#<CJK>
-0xB8A6	0x8482	#<CJK>
-0xB8A7	0x8477	#<CJK>
-0xB8A8	0x843D	#<CJK>
-0xB8A9	0x8431	#<CJK>
-0xB8AA	0x8475	#<CJK>
-0xB8AB	0x8466	#<CJK>
-0xB8AC	0x846B	#<CJK>
-0xB8AD	0x8449	#<CJK>
-0xB8AE	0x846C	#<CJK>
-0xB8AF	0x845B	#<CJK>
-0xB8B0	0x843C	#<CJK>
-0xB8B1	0x8435	#<CJK>
-0xB8B2	0x8461	#<CJK>
-0xB8B3	0x8463	#<CJK>
-0xB8B4	0x8469	#<CJK>
-0xB8B5	0x846D	#<CJK>
-0xB8B6	0x8446	#<CJK>
-0xB8B7	0x865E	#<CJK>
-0xB8B8	0x865C	#<CJK>
-0xB8B9	0x865F	#<CJK>
-0xB8BA	0x86F9	#<CJK>
-0xB8BB	0x8713	#<CJK>
-0xB8BC	0x8708	#<CJK>
-0xB8BD	0x8707	#<CJK>
-0xB8BE	0x8700	#<CJK>
-0xB8BF	0x86FE	#<CJK>
-0xB8C0	0x86FB	#<CJK>
-0xB8C1	0x8702	#<CJK>
-0xB8C2	0x8703	#<CJK>
-0xB8C3	0x8706	#<CJK>
-0xB8C4	0x870A	#<CJK>
-0xB8C5	0x8859	#<CJK>
-0xB8C6	0x88DF	#<CJK>
-0xB8C7	0x88D4	#<CJK>
-0xB8C8	0x88D9	#<CJK>
-0xB8C9	0x88DC	#<CJK>
-0xB8CA	0x88D8	#<CJK>
-0xB8CB	0x88DD	#<CJK>
-0xB8CC	0x88E1	#<CJK>
-0xB8CD	0x88CA	#<CJK>
-0xB8CE	0x88D5	#<CJK>
-0xB8CF	0x88D2	#<CJK>
-0xB8D0	0x899C	#<CJK>
-0xB8D1	0x89E3	#<CJK>
-0xB8D2	0x8A6B	#<CJK>
-0xB8D3	0x8A72	#<CJK>
-0xB8D4	0x8A73	#<CJK>
-0xB8D5	0x8A66	#<CJK>
-0xB8D6	0x8A69	#<CJK>
-0xB8D7	0x8A70	#<CJK>
-0xB8D8	0x8A87	#<CJK>
-0xB8D9	0x8A7C	#<CJK>
-0xB8DA	0x8A63	#<CJK>
-0xB8DB	0x8AA0	#<CJK>
-0xB8DC	0x8A71	#<CJK>
-0xB8DD	0x8A85	#<CJK>
-0xB8DE	0x8A6D	#<CJK>
-0xB8DF	0x8A62	#<CJK>
-0xB8E0	0x8A6E	#<CJK>
-0xB8E1	0x8A6C	#<CJK>
-0xB8E2	0x8A79	#<CJK>
-0xB8E3	0x8A7B	#<CJK>
-0xB8E4	0x8A3E	#<CJK>
-0xB8E5	0x8A68	#<CJK>
-0xB8E6	0x8C62	#<CJK>
-0xB8E7	0x8C8A	#<CJK>
-0xB8E8	0x8C89	#<CJK>
-0xB8E9	0x8CCA	#<CJK>
-0xB8EA	0x8CC7	#<CJK>
-0xB8EB	0x8CC8	#<CJK>
-0xB8EC	0x8CC4	#<CJK>
-0xB8ED	0x8CB2	#<CJK>
-0xB8EE	0x8CC3	#<CJK>
-0xB8EF	0x8CC2	#<CJK>
-0xB8F0	0x8CC5	#<CJK>
-0xB8F1	0x8DE1	#<CJK>
-0xB8F2	0x8DDF	#<CJK>
-0xB8F3	0x8DE8	#<CJK>
-0xB8F4	0x8DEF	#<CJK>
-0xB8F5	0x8DF3	#<CJK>
-0xB8F6	0x8DFA	#<CJK>
-0xB8F7	0x8DEA	#<CJK>
-0xB8F8	0x8DE4	#<CJK>
-0xB8F9	0x8DE6	#<CJK>
-0xB8FA	0x8EB2	#<CJK>
-0xB8FB	0x8F03	#<CJK>
-0xB8FC	0x8F09	#<CJK>
-0xB8FD	0x8EFE	#<CJK>
-0xB8FE	0x8F0A	#<CJK>
-0xB940	0x8F9F	#<CJK>
-0xB941	0x8FB2	#<CJK>
-0xB942	0x904B	#<CJK>
-0xB943	0x904A	#<CJK>
-0xB944	0x9053	#<CJK>
-0xB945	0x9042	#<CJK>
-0xB946	0x9054	#<CJK>
-0xB947	0x903C	#<CJK>
-0xB948	0x9055	#<CJK>
-0xB949	0x9050	#<CJK>
-0xB94A	0x9047	#<CJK>
-0xB94B	0x904F	#<CJK>
-0xB94C	0x904E	#<CJK>
-0xB94D	0x904D	#<CJK>
-0xB94E	0x9051	#<CJK>
-0xB94F	0x903E	#<CJK>
-0xB950	0x9041	#<CJK>
-0xB951	0x9112	#<CJK>
-0xB952	0x9117	#<CJK>
-0xB953	0x916C	#<CJK>
-0xB954	0x916A	#<CJK>
-0xB955	0x9169	#<CJK>
-0xB956	0x91C9	#<CJK>
-0xB957	0x9237	#<CJK>
-0xB958	0x9257	#<CJK>
-0xB959	0x9238	#<CJK>
-0xB95A	0x923D	#<CJK>
-0xB95B	0x9240	#<CJK>
-0xB95C	0x923E	#<CJK>
-0xB95D	0x925B	#<CJK>
-0xB95E	0x924B	#<CJK>
-0xB95F	0x9264	#<CJK>
-0xB960	0x9251	#<CJK>
-0xB961	0x9234	#<CJK>
-0xB962	0x9249	#<CJK>
-0xB963	0x924D	#<CJK>
-0xB964	0x9245	#<CJK>
-0xB965	0x9239	#<CJK>
-0xB966	0x923F	#<CJK>
-0xB967	0x925A	#<CJK>
-0xB968	0x9598	#<CJK>
-0xB969	0x9698	#<CJK>
-0xB96A	0x9694	#<CJK>
-0xB96B	0x9695	#<CJK>
-0xB96C	0x96CD	#<CJK>
-0xB96D	0x96CB	#<CJK>
-0xB96E	0x96C9	#<CJK>
-0xB96F	0x96CA	#<CJK>
-0xB970	0x96F7	#<CJK>
-0xB971	0x96FB	#<CJK>
-0xB972	0x96F9	#<CJK>
-0xB973	0x96F6	#<CJK>
-0xB974	0x9756	#<CJK>
-0xB975	0x9774	#<CJK>
-0xB976	0x9776	#<CJK>
-0xB977	0x9810	#<CJK>
-0xB978	0x9811	#<CJK>
-0xB979	0x9813	#<CJK>
-0xB97A	0x980A	#<CJK>
-0xB97B	0x9812	#<CJK>
-0xB97C	0x980C	#<CJK>
-0xB97D	0x98FC	#<CJK>
-0xB97E	0x98F4	#<CJK>
-0xB9A1	0x98FD	#<CJK>
-0xB9A2	0x98FE	#<CJK>
-0xB9A3	0x99B3	#<CJK>
-0xB9A4	0x99B1	#<CJK>
-0xB9A5	0x99B4	#<CJK>
-0xB9A6	0x9AE1	#<CJK>
-0xB9A7	0x9CE9	#<CJK>
-0xB9A8	0x9E82	#<CJK>
-0xB9A9	0x9F0E	#<CJK>
-0xB9AA	0x9F13	#<CJK>
-0xB9AB	0x9F20	#<CJK>
-0xB9AC	0x50E7	#<CJK>
-0xB9AD	0x50EE	#<CJK>
-0xB9AE	0x50E5	#<CJK>
-0xB9AF	0x50D6	#<CJK>
-0xB9B0	0x50ED	#<CJK>
-0xB9B1	0x50DA	#<CJK>
-0xB9B2	0x50D5	#<CJK>
-0xB9B3	0x50CF	#<CJK>
-0xB9B4	0x50D1	#<CJK>
-0xB9B5	0x50F1	#<CJK>
-0xB9B6	0x50CE	#<CJK>
-0xB9B7	0x50E9	#<CJK>
-0xB9B8	0x5162	#<CJK>
-0xB9B9	0x51F3	#<CJK>
-0xB9BA	0x5283	#<CJK>
-0xB9BB	0x5282	#<CJK>
-0xB9BC	0x5331	#<CJK>
-0xB9BD	0x53AD	#<CJK>
-0xB9BE	0x55FE	#<CJK>
-0xB9BF	0x5600	#<CJK>
-0xB9C0	0x561B	#<CJK>
-0xB9C1	0x5617	#<CJK>
-0xB9C2	0x55FD	#<CJK>
-0xB9C3	0x5614	#<CJK>
-0xB9C4	0x5606	#<CJK>
-0xB9C5	0x5609	#<CJK>
-0xB9C6	0x560D	#<CJK>
-0xB9C7	0x560E	#<CJK>
-0xB9C8	0x55F7	#<CJK>
-0xB9C9	0x5616	#<CJK>
-0xB9CA	0x561F	#<CJK>
-0xB9CB	0x5608	#<CJK>
-0xB9CC	0x5610	#<CJK>
-0xB9CD	0x55F6	#<CJK>
-0xB9CE	0x5718	#<CJK>
-0xB9CF	0x5716	#<CJK>
-0xB9D0	0x5875	#<CJK>
-0xB9D1	0x587E	#<CJK>
-0xB9D2	0x5883	#<CJK>
-0xB9D3	0x5893	#<CJK>
-0xB9D4	0x588A	#<CJK>
-0xB9D5	0x5879	#<CJK>
-0xB9D6	0x5885	#<CJK>
-0xB9D7	0x587D	#<CJK>
-0xB9D8	0x58FD	#<CJK>
-0xB9D9	0x5925	#<CJK>
-0xB9DA	0x5922	#<CJK>
-0xB9DB	0x5924	#<CJK>
-0xB9DC	0x596A	#<CJK>
-0xB9DD	0x5969	#<CJK>
-0xB9DE	0x5AE1	#<CJK>
-0xB9DF	0x5AE6	#<CJK>
-0xB9E0	0x5AE9	#<CJK>
-0xB9E1	0x5AD7	#<CJK>
-0xB9E2	0x5AD6	#<CJK>
-0xB9E3	0x5AD8	#<CJK>
-0xB9E4	0x5AE3	#<CJK>
-0xB9E5	0x5B75	#<CJK>
-0xB9E6	0x5BDE	#<CJK>
-0xB9E7	0x5BE7	#<CJK>
-0xB9E8	0x5BE1	#<CJK>
-0xB9E9	0x5BE5	#<CJK>
-0xB9EA	0x5BE6	#<CJK>
-0xB9EB	0x5BE8	#<CJK>
-0xB9EC	0x5BE2	#<CJK>
-0xB9ED	0x5BE4	#<CJK>
-0xB9EE	0x5BDF	#<CJK>
-0xB9EF	0x5C0D	#<CJK>
-0xB9F0	0x5C62	#<CJK>
-0xB9F1	0x5D84	#<CJK>
-0xB9F2	0x5D87	#<CJK>
-0xB9F3	0x5E5B	#<CJK>
-0xB9F4	0x5E63	#<CJK>
-0xB9F5	0x5E55	#<CJK>
-0xB9F6	0x5E57	#<CJK>
-0xB9F7	0x5E54	#<CJK>
-0xB9F8	0x5ED3	#<CJK>
-0xB9F9	0x5ED6	#<CJK>
-0xB9FA	0x5F0A	#<CJK>
-0xB9FB	0x5F46	#<CJK>
-0xB9FC	0x5F70	#<CJK>
-0xB9FD	0x5FB9	#<CJK>
-0xB9FE	0x6147	#<CJK>
-0xBA40	0x613F	#<CJK>
-0xBA41	0x614B	#<CJK>
-0xBA42	0x6177	#<CJK>
-0xBA43	0x6162	#<CJK>
-0xBA44	0x6163	#<CJK>
-0xBA45	0x615F	#<CJK>
-0xBA46	0x615A	#<CJK>
-0xBA47	0x6158	#<CJK>
-0xBA48	0x6175	#<CJK>
-0xBA49	0x622A	#<CJK>
-0xBA4A	0x6487	#<CJK>
-0xBA4B	0x6458	#<CJK>
-0xBA4C	0x6454	#<CJK>
-0xBA4D	0x64A4	#<CJK>
-0xBA4E	0x6478	#<CJK>
-0xBA4F	0x645F	#<CJK>
-0xBA50	0x647A	#<CJK>
-0xBA51	0x6451	#<CJK>
-0xBA52	0x6467	#<CJK>
-0xBA53	0x6434	#<CJK>
-0xBA54	0x646D	#<CJK>
-0xBA55	0x647B	#<CJK>
-0xBA56	0x6572	#<CJK>
-0xBA57	0x65A1	#<CJK>
-0xBA58	0x65D7	#<CJK>
-0xBA59	0x65D6	#<CJK>
-0xBA5A	0x66A2	#<CJK>
-0xBA5B	0x66A8	#<CJK>
-0xBA5C	0x669D	#<CJK>
-0xBA5D	0x699C	#<CJK>
-0xBA5E	0x69A8	#<CJK>
-0xBA5F	0x6995	#<CJK>
-0xBA60	0x69C1	#<CJK>
-0xBA61	0x69AE	#<CJK>
-0xBA62	0x69D3	#<CJK>
-0xBA63	0x69CB	#<CJK>
-0xBA64	0x699B	#<CJK>
-0xBA65	0x69B7	#<CJK>
-0xBA66	0x69BB	#<CJK>
-0xBA67	0x69AB	#<CJK>
-0xBA68	0x69B4	#<CJK>
-0xBA69	0x69D0	#<CJK>
-0xBA6A	0x69CD	#<CJK>
-0xBA6B	0x69AD	#<CJK>
-0xBA6C	0x69CC	#<CJK>
-0xBA6D	0x69A6	#<CJK>
-0xBA6E	0x69C3	#<CJK>
-0xBA6F	0x69A3	#<CJK>
-0xBA70	0x6B49	#<CJK>
-0xBA71	0x6B4C	#<CJK>
-0xBA72	0x6C33	#<CJK>
-0xBA73	0x6F33	#<CJK>
-0xBA74	0x6F14	#<CJK>
-0xBA75	0x6EFE	#<CJK>
-0xBA76	0x6F13	#<CJK>
-0xBA77	0x6EF4	#<CJK>
-0xBA78	0x6F29	#<CJK>
-0xBA79	0x6F3E	#<CJK>
-0xBA7A	0x6F20	#<CJK>
-0xBA7B	0x6F2C	#<CJK>
-0xBA7C	0x6F0F	#<CJK>
-0xBA7D	0x6F02	#<CJK>
-0xBA7E	0x6F22	#<CJK>
-0xBAA1	0x6EFF	#<CJK>
-0xBAA2	0x6EEF	#<CJK>
-0xBAA3	0x6F06	#<CJK>
-0xBAA4	0x6F31	#<CJK>
-0xBAA5	0x6F38	#<CJK>
-0xBAA6	0x6F32	#<CJK>
-0xBAA7	0x6F23	#<CJK>
-0xBAA8	0x6F15	#<CJK>
-0xBAA9	0x6F2B	#<CJK>
-0xBAAA	0x6F2F	#<CJK>
-0xBAAB	0x6F88	#<CJK>
-0xBAAC	0x6F2A	#<CJK>
-0xBAAD	0x6EEC	#<CJK>
-0xBAAE	0x6F01	#<CJK>
-0xBAAF	0x6EF2	#<CJK>
-0xBAB0	0x6ECC	#<CJK>
-0xBAB1	0x6EF7	#<CJK>
-0xBAB2	0x7194	#<CJK>
-0xBAB3	0x7199	#<CJK>
-0xBAB4	0x717D	#<CJK>
-0xBAB5	0x718A	#<CJK>
-0xBAB6	0x7184	#<CJK>
-0xBAB7	0x7192	#<CJK>
-0xBAB8	0x723E	#<CJK>
-0xBAB9	0x7292	#<CJK>
-0xBABA	0x7296	#<CJK>
-0xBABB	0x7344	#<CJK>
-0xBABC	0x7350	#<CJK>
-0xBABD	0x7464	#<CJK>
-0xBABE	0x7463	#<CJK>
-0xBABF	0x746A	#<CJK>
-0xBAC0	0x7470	#<CJK>
-0xBAC1	0x746D	#<CJK>
-0xBAC2	0x7504	#<CJK>
-0xBAC3	0x7591	#<CJK>
-0xBAC4	0x7627	#<CJK>
-0xBAC5	0x760D	#<CJK>
-0xBAC6	0x760B	#<CJK>
-0xBAC7	0x7609	#<CJK>
-0xBAC8	0x7613	#<CJK>
-0xBAC9	0x76E1	#<CJK>
-0xBACA	0x76E3	#<CJK>
-0xBACB	0x7784	#<CJK>
-0xBACC	0x777D	#<CJK>
-0xBACD	0x777F	#<CJK>
-0xBACE	0x7761	#<CJK>
-0xBACF	0x78C1	#<CJK>
-0xBAD0	0x789F	#<CJK>
-0xBAD1	0x78A7	#<CJK>
-0xBAD2	0x78B3	#<CJK>
-0xBAD3	0x78A9	#<CJK>
-0xBAD4	0x78A3	#<CJK>
-0xBAD5	0x798E	#<CJK>
-0xBAD6	0x798F	#<CJK>
-0xBAD7	0x798D	#<CJK>
-0xBAD8	0x7A2E	#<CJK>
-0xBAD9	0x7A31	#<CJK>
-0xBADA	0x7AAA	#<CJK>
-0xBADB	0x7AA9	#<CJK>
-0xBADC	0x7AED	#<CJK>
-0xBADD	0x7AEF	#<CJK>
-0xBADE	0x7BA1	#<CJK>
-0xBADF	0x7B95	#<CJK>
-0xBAE0	0x7B8B	#<CJK>
-0xBAE1	0x7B75	#<CJK>
-0xBAE2	0x7B97	#<CJK>
-0xBAE3	0x7B9D	#<CJK>
-0xBAE4	0x7B94	#<CJK>
-0xBAE5	0x7B8F	#<CJK>
-0xBAE6	0x7BB8	#<CJK>
-0xBAE7	0x7B87	#<CJK>
-0xBAE8	0x7B84	#<CJK>
-0xBAE9	0x7CB9	#<CJK>
-0xBAEA	0x7CBD	#<CJK>
-0xBAEB	0x7CBE	#<CJK>
-0xBAEC	0x7DBB	#<CJK>
-0xBAED	0x7DB0	#<CJK>
-0xBAEE	0x7D9C	#<CJK>
-0xBAEF	0x7DBD	#<CJK>
-0xBAF0	0x7DBE	#<CJK>
-0xBAF1	0x7DA0	#<CJK>
-0xBAF2	0x7DCA	#<CJK>
-0xBAF3	0x7DB4	#<CJK>
-0xBAF4	0x7DB2	#<CJK>
-0xBAF5	0x7DB1	#<CJK>
-0xBAF6	0x7DBA	#<CJK>
-0xBAF7	0x7DA2	#<CJK>
-0xBAF8	0x7DBF	#<CJK>
-0xBAF9	0x7DB5	#<CJK>
-0xBAFA	0x7DB8	#<CJK>
-0xBAFB	0x7DAD	#<CJK>
-0xBAFC	0x7DD2	#<CJK>
-0xBAFD	0x7DC7	#<CJK>
-0xBAFE	0x7DAC	#<CJK>
-0xBB40	0x7F70	#<CJK>
-0xBB41	0x7FE0	#<CJK>
-0xBB42	0x7FE1	#<CJK>
-0xBB43	0x7FDF	#<CJK>
-0xBB44	0x805E	#<CJK>
-0xBB45	0x805A	#<CJK>
-0xBB46	0x8087	#<CJK>
-0xBB47	0x8150	#<CJK>
-0xBB48	0x8180	#<CJK>
-0xBB49	0x818F	#<CJK>
-0xBB4A	0x8188	#<CJK>
-0xBB4B	0x818A	#<CJK>
-0xBB4C	0x817F	#<CJK>
-0xBB4D	0x8182	#<CJK>
-0xBB4E	0x81E7	#<CJK>
-0xBB4F	0x81FA	#<CJK>
-0xBB50	0x8207	#<CJK>
-0xBB51	0x8214	#<CJK>
-0xBB52	0x821E	#<CJK>
-0xBB53	0x824B	#<CJK>
-0xBB54	0x84C9	#<CJK>
-0xBB55	0x84BF	#<CJK>
-0xBB56	0x84C6	#<CJK>
-0xBB57	0x84C4	#<CJK>
-0xBB58	0x8499	#<CJK>
-0xBB59	0x849E	#<CJK>
-0xBB5A	0x84B2	#<CJK>
-0xBB5B	0x849C	#<CJK>
-0xBB5C	0x84CB	#<CJK>
-0xBB5D	0x84B8	#<CJK>
-0xBB5E	0x84C0	#<CJK>
-0xBB5F	0x84D3	#<CJK>
-0xBB60	0x8490	#<CJK>
-0xBB61	0x84BC	#<CJK>
-0xBB62	0x84D1	#<CJK>
-0xBB63	0x84CA	#<CJK>
-0xBB64	0x873F	#<CJK>
-0xBB65	0x871C	#<CJK>
-0xBB66	0x873B	#<CJK>
-0xBB67	0x8722	#<CJK>
-0xBB68	0x8725	#<CJK>
-0xBB69	0x8734	#<CJK>
-0xBB6A	0x8718	#<CJK>
-0xBB6B	0x8755	#<CJK>
-0xBB6C	0x8737	#<CJK>
-0xBB6D	0x8729	#<CJK>
-0xBB6E	0x88F3	#<CJK>
-0xBB6F	0x8902	#<CJK>
-0xBB70	0x88F4	#<CJK>
-0xBB71	0x88F9	#<CJK>
-0xBB72	0x88F8	#<CJK>
-0xBB73	0x88FD	#<CJK>
-0xBB74	0x88E8	#<CJK>
-0xBB75	0x891A	#<CJK>
-0xBB76	0x88EF	#<CJK>
-0xBB77	0x8AA6	#<CJK>
-0xBB78	0x8A8C	#<CJK>
-0xBB79	0x8A9E	#<CJK>
-0xBB7A	0x8AA3	#<CJK>
-0xBB7B	0x8A8D	#<CJK>
-0xBB7C	0x8AA1	#<CJK>
-0xBB7D	0x8A93	#<CJK>
-0xBB7E	0x8AA4	#<CJK>
-0xBBA1	0x8AAA	#<CJK>
-0xBBA2	0x8AA5	#<CJK>
-0xBBA3	0x8AA8	#<CJK>
-0xBBA4	0x8A98	#<CJK>
-0xBBA5	0x8A91	#<CJK>
-0xBBA6	0x8A9A	#<CJK>
-0xBBA7	0x8AA7	#<CJK>
-0xBBA8	0x8C6A	#<CJK>
-0xBBA9	0x8C8D	#<CJK>
-0xBBAA	0x8C8C	#<CJK>
-0xBBAB	0x8CD3	#<CJK>
-0xBBAC	0x8CD1	#<CJK>
-0xBBAD	0x8CD2	#<CJK>
-0xBBAE	0x8D6B	#<CJK>
-0xBBAF	0x8D99	#<CJK>
-0xBBB0	0x8D95	#<CJK>
-0xBBB1	0x8DFC	#<CJK>
-0xBBB2	0x8F14	#<CJK>
-0xBBB3	0x8F12	#<CJK>
-0xBBB4	0x8F15	#<CJK>
-0xBBB5	0x8F13	#<CJK>
-0xBBB6	0x8FA3	#<CJK>
-0xBBB7	0x9060	#<CJK>
-0xBBB8	0x9058	#<CJK>
-0xBBB9	0x905C	#<CJK>
-0xBBBA	0x9063	#<CJK>
-0xBBBB	0x9059	#<CJK>
-0xBBBC	0x905E	#<CJK>
-0xBBBD	0x9062	#<CJK>
-0xBBBE	0x905D	#<CJK>
-0xBBBF	0x905B	#<CJK>
-0xBBC0	0x9119	#<CJK>
-0xBBC1	0x9118	#<CJK>
-0xBBC2	0x911E	#<CJK>
-0xBBC3	0x9175	#<CJK>
-0xBBC4	0x9178	#<CJK>
-0xBBC5	0x9177	#<CJK>
-0xBBC6	0x9174	#<CJK>
-0xBBC7	0x9278	#<CJK>
-0xBBC8	0x9280	#<CJK>
-0xBBC9	0x9285	#<CJK>
-0xBBCA	0x9298	#<CJK>
-0xBBCB	0x9296	#<CJK>
-0xBBCC	0x927B	#<CJK>
-0xBBCD	0x9293	#<CJK>
-0xBBCE	0x929C	#<CJK>
-0xBBCF	0x92A8	#<CJK>
-0xBBD0	0x927C	#<CJK>
-0xBBD1	0x9291	#<CJK>
-0xBBD2	0x95A1	#<CJK>
-0xBBD3	0x95A8	#<CJK>
-0xBBD4	0x95A9	#<CJK>
-0xBBD5	0x95A3	#<CJK>
-0xBBD6	0x95A5	#<CJK>
-0xBBD7	0x95A4	#<CJK>
-0xBBD8	0x9699	#<CJK>
-0xBBD9	0x969C	#<CJK>
-0xBBDA	0x969B	#<CJK>
-0xBBDB	0x96CC	#<CJK>
-0xBBDC	0x96D2	#<CJK>
-0xBBDD	0x9700	#<CJK>
-0xBBDE	0x977C	#<CJK>
-0xBBDF	0x9785	#<CJK>
-0xBBE0	0x97F6	#<CJK>
-0xBBE1	0x9817	#<CJK>
-0xBBE2	0x9818	#<CJK>
-0xBBE3	0x98AF	#<CJK>
-0xBBE4	0x98B1	#<CJK>
-0xBBE5	0x9903	#<CJK>
-0xBBE6	0x9905	#<CJK>
-0xBBE7	0x990C	#<CJK>
-0xBBE8	0x9909	#<CJK>
-0xBBE9	0x99C1	#<CJK>
-0xBBEA	0x9AAF	#<CJK>
-0xBBEB	0x9AB0	#<CJK>
-0xBBEC	0x9AE6	#<CJK>
-0xBBED	0x9B41	#<CJK>
-0xBBEE	0x9B42	#<CJK>
-0xBBEF	0x9CF4	#<CJK>
-0xBBF0	0x9CF6	#<CJK>
-0xBBF1	0x9CF3	#<CJK>
-0xBBF2	0x9EBC	#<CJK>
-0xBBF3	0x9F3B	#<CJK>
-0xBBF4	0x9F4A	#<CJK>
-0xBBF5	0x5104	#<CJK>
-0xBBF6	0x5100	#<CJK>
-0xBBF7	0x50FB	#<CJK>
-0xBBF8	0x50F5	#<CJK>
-0xBBF9	0x50F9	#<CJK>
-0xBBFA	0x5102	#<CJK>
-0xBBFB	0x5108	#<CJK>
-0xBBFC	0x5109	#<CJK>
-0xBBFD	0x5105	#<CJK>
-0xBBFE	0x51DC	#<CJK>
-0xBC40	0x5287	#<CJK>
-0xBC41	0x5288	#<CJK>
-0xBC42	0x5289	#<CJK>
-0xBC43	0x528D	#<CJK>
-0xBC44	0x528A	#<CJK>
-0xBC45	0x52F0	#<CJK>
-0xBC46	0x53B2	#<CJK>
-0xBC47	0x562E	#<CJK>
-0xBC48	0x563B	#<CJK>
-0xBC49	0x5639	#<CJK>
-0xBC4A	0x5632	#<CJK>
-0xBC4B	0x563F	#<CJK>
-0xBC4C	0x5634	#<CJK>
-0xBC4D	0x5629	#<CJK>
-0xBC4E	0x5653	#<CJK>
-0xBC4F	0x564E	#<CJK>
-0xBC50	0x5657	#<CJK>
-0xBC51	0x5674	#<CJK>
-0xBC52	0x5636	#<CJK>
-0xBC53	0x562F	#<CJK>
-0xBC54	0x5630	#<CJK>
-0xBC55	0x5880	#<CJK>
-0xBC56	0x589F	#<CJK>
-0xBC57	0x589E	#<CJK>
-0xBC58	0x58B3	#<CJK>
-0xBC59	0x589C	#<CJK>
-0xBC5A	0x58AE	#<CJK>
-0xBC5B	0x58A9	#<CJK>
-0xBC5C	0x58A6	#<CJK>
-0xBC5D	0x596D	#<CJK>
-0xBC5E	0x5B09	#<CJK>
-0xBC5F	0x5AFB	#<CJK>
-0xBC60	0x5B0B	#<CJK>
-0xBC61	0x5AF5	#<CJK>
-0xBC62	0x5B0C	#<CJK>
-0xBC63	0x5B08	#<CJK>
-0xBC64	0x5BEE	#<CJK>
-0xBC65	0x5BEC	#<CJK>
-0xBC66	0x5BE9	#<CJK>
-0xBC67	0x5BEB	#<CJK>
-0xBC68	0x5C64	#<CJK>
-0xBC69	0x5C65	#<CJK>
-0xBC6A	0x5D9D	#<CJK>
-0xBC6B	0x5D94	#<CJK>
-0xBC6C	0x5E62	#<CJK>
-0xBC6D	0x5E5F	#<CJK>
-0xBC6E	0x5E61	#<CJK>
-0xBC6F	0x5EE2	#<CJK>
-0xBC70	0x5EDA	#<CJK>
-0xBC71	0x5EDF	#<CJK>
-0xBC72	0x5EDD	#<CJK>
-0xBC73	0x5EE3	#<CJK>
-0xBC74	0x5EE0	#<CJK>
-0xBC75	0x5F48	#<CJK>
-0xBC76	0x5F71	#<CJK>
-0xBC77	0x5FB7	#<CJK>
-0xBC78	0x5FB5	#<CJK>
-0xBC79	0x6176	#<CJK>
-0xBC7A	0x6167	#<CJK>
-0xBC7B	0x616E	#<CJK>
-0xBC7C	0x615D	#<CJK>
-0xBC7D	0x6155	#<CJK>
-0xBC7E	0x6182	#<CJK>
-0xBCA1	0x617C	#<CJK>
-0xBCA2	0x6170	#<CJK>
-0xBCA3	0x616B	#<CJK>
-0xBCA4	0x617E	#<CJK>
-0xBCA5	0x61A7	#<CJK>
-0xBCA6	0x6190	#<CJK>
-0xBCA7	0x61AB	#<CJK>
-0xBCA8	0x618E	#<CJK>
-0xBCA9	0x61AC	#<CJK>
-0xBCAA	0x619A	#<CJK>
-0xBCAB	0x61A4	#<CJK>
-0xBCAC	0x6194	#<CJK>
-0xBCAD	0x61AE	#<CJK>
-0xBCAE	0x622E	#<CJK>
-0xBCAF	0x6469	#<CJK>
-0xBCB0	0x646F	#<CJK>
-0xBCB1	0x6479	#<CJK>
-0xBCB2	0x649E	#<CJK>
-0xBCB3	0x64B2	#<CJK>
-0xBCB4	0x6488	#<CJK>
-0xBCB5	0x6490	#<CJK>
-0xBCB6	0x64B0	#<CJK>
-0xBCB7	0x64A5	#<CJK>
-0xBCB8	0x6493	#<CJK>
-0xBCB9	0x6495	#<CJK>
-0xBCBA	0x64A9	#<CJK>
-0xBCBB	0x6492	#<CJK>
-0xBCBC	0x64AE	#<CJK>
-0xBCBD	0x64AD	#<CJK>
-0xBCBE	0x64AB	#<CJK>
-0xBCBF	0x649A	#<CJK>
-0xBCC0	0x64AC	#<CJK>
-0xBCC1	0x6499	#<CJK>
-0xBCC2	0x64A2	#<CJK>
-0xBCC3	0x64B3	#<CJK>
-0xBCC4	0x6575	#<CJK>
-0xBCC5	0x6577	#<CJK>
-0xBCC6	0x6578	#<CJK>
-0xBCC7	0x66AE	#<CJK>
-0xBCC8	0x66AB	#<CJK>
-0xBCC9	0x66B4	#<CJK>
-0xBCCA	0x66B1	#<CJK>
-0xBCCB	0x6A23	#<CJK>
-0xBCCC	0x6A1F	#<CJK>
-0xBCCD	0x69E8	#<CJK>
-0xBCCE	0x6A01	#<CJK>
-0xBCCF	0x6A1E	#<CJK>
-0xBCD0	0x6A19	#<CJK>
-0xBCD1	0x69FD	#<CJK>
-0xBCD2	0x6A21	#<CJK>
-0xBCD3	0x6A13	#<CJK>
-0xBCD4	0x6A0A	#<CJK>
-0xBCD5	0x69F3	#<CJK>
-0xBCD6	0x6A02	#<CJK>
-0xBCD7	0x6A05	#<CJK>
-0xBCD8	0x69ED	#<CJK>
-0xBCD9	0x6A11	#<CJK>
-0xBCDA	0x6B50	#<CJK>
-0xBCDB	0x6B4E	#<CJK>
-0xBCDC	0x6BA4	#<CJK>
-0xBCDD	0x6BC5	#<CJK>
-0xBCDE	0x6BC6	#<CJK>
-0xBCDF	0x6F3F	#<CJK>
-0xBCE0	0x6F7C	#<CJK>
-0xBCE1	0x6F84	#<CJK>
-0xBCE2	0x6F51	#<CJK>
-0xBCE3	0x6F66	#<CJK>
-0xBCE4	0x6F54	#<CJK>
-0xBCE5	0x6F86	#<CJK>
-0xBCE6	0x6F6D	#<CJK>
-0xBCE7	0x6F5B	#<CJK>
-0xBCE8	0x6F78	#<CJK>
-0xBCE9	0x6F6E	#<CJK>
-0xBCEA	0x6F8E	#<CJK>
-0xBCEB	0x6F7A	#<CJK>
-0xBCEC	0x6F70	#<CJK>
-0xBCED	0x6F64	#<CJK>
-0xBCEE	0x6F97	#<CJK>
-0xBCEF	0x6F58	#<CJK>
-0xBCF0	0x6ED5	#<CJK>
-0xBCF1	0x6F6F	#<CJK>
-0xBCF2	0x6F60	#<CJK>
-0xBCF3	0x6F5F	#<CJK>
-0xBCF4	0x719F	#<CJK>
-0xBCF5	0x71AC	#<CJK>
-0xBCF6	0x71B1	#<CJK>
-0xBCF7	0x71A8	#<CJK>
-0xBCF8	0x7256	#<CJK>
-0xBCF9	0x729B	#<CJK>
-0xBCFA	0x734E	#<CJK>
-0xBCFB	0x7357	#<CJK>
-0xBCFC	0x7469	#<CJK>
-0xBCFD	0x748B	#<CJK>
-0xBCFE	0x7483	#<CJK>
-0xBD40	0x747E	#<CJK>
-0xBD41	0x7480	#<CJK>
-0xBD42	0x757F	#<CJK>
-0xBD43	0x7620	#<CJK>
-0xBD44	0x7629	#<CJK>
-0xBD45	0x761F	#<CJK>
-0xBD46	0x7624	#<CJK>
-0xBD47	0x7626	#<CJK>
-0xBD48	0x7621	#<CJK>
-0xBD49	0x7622	#<CJK>
-0xBD4A	0x769A	#<CJK>
-0xBD4B	0x76BA	#<CJK>
-0xBD4C	0x76E4	#<CJK>
-0xBD4D	0x778E	#<CJK>
-0xBD4E	0x7787	#<CJK>
-0xBD4F	0x778C	#<CJK>
-0xBD50	0x7791	#<CJK>
-0xBD51	0x778B	#<CJK>
-0xBD52	0x78CB	#<CJK>
-0xBD53	0x78C5	#<CJK>
-0xBD54	0x78BA	#<CJK>
-0xBD55	0x78CA	#<CJK>
-0xBD56	0x78BE	#<CJK>
-0xBD57	0x78D5	#<CJK>
-0xBD58	0x78BC	#<CJK>
-0xBD59	0x78D0	#<CJK>
-0xBD5A	0x7A3F	#<CJK>
-0xBD5B	0x7A3C	#<CJK>
-0xBD5C	0x7A40	#<CJK>
-0xBD5D	0x7A3D	#<CJK>
-0xBD5E	0x7A37	#<CJK>
-0xBD5F	0x7A3B	#<CJK>
-0xBD60	0x7AAF	#<CJK>
-0xBD61	0x7AAE	#<CJK>
-0xBD62	0x7BAD	#<CJK>
-0xBD63	0x7BB1	#<CJK>
-0xBD64	0x7BC4	#<CJK>
-0xBD65	0x7BB4	#<CJK>
-0xBD66	0x7BC6	#<CJK>
-0xBD67	0x7BC7	#<CJK>
-0xBD68	0x7BC1	#<CJK>
-0xBD69	0x7BA0	#<CJK>
-0xBD6A	0x7BCC	#<CJK>
-0xBD6B	0x7CCA	#<CJK>
-0xBD6C	0x7DE0	#<CJK>
-0xBD6D	0x7DF4	#<CJK>
-0xBD6E	0x7DEF	#<CJK>
-0xBD6F	0x7DFB	#<CJK>
-0xBD70	0x7DD8	#<CJK>
-0xBD71	0x7DEC	#<CJK>
-0xBD72	0x7DDD	#<CJK>
-0xBD73	0x7DE8	#<CJK>
-0xBD74	0x7DE3	#<CJK>
-0xBD75	0x7DDA	#<CJK>
-0xBD76	0x7DDE	#<CJK>
-0xBD77	0x7DE9	#<CJK>
-0xBD78	0x7D9E	#<CJK>
-0xBD79	0x7DD9	#<CJK>
-0xBD7A	0x7DF2	#<CJK>
-0xBD7B	0x7DF9	#<CJK>
-0xBD7C	0x7F75	#<CJK>
-0xBD7D	0x7F77	#<CJK>
-0xBD7E	0x7FAF	#<CJK>
-0xBDA1	0x7FE9	#<CJK>
-0xBDA2	0x8026	#<CJK>
-0xBDA3	0x819B	#<CJK>
-0xBDA4	0x819C	#<CJK>
-0xBDA5	0x819D	#<CJK>
-0xBDA6	0x81A0	#<CJK>
-0xBDA7	0x819A	#<CJK>
-0xBDA8	0x8198	#<CJK>
-0xBDA9	0x8517	#<CJK>
-0xBDAA	0x853D	#<CJK>
-0xBDAB	0x851A	#<CJK>
-0xBDAC	0x84EE	#<CJK>
-0xBDAD	0x852C	#<CJK>
-0xBDAE	0x852D	#<CJK>
-0xBDAF	0x8513	#<CJK>
-0xBDB0	0x8511	#<CJK>
-0xBDB1	0x8523	#<CJK>
-0xBDB2	0x8521	#<CJK>
-0xBDB3	0x8514	#<CJK>
-0xBDB4	0x84EC	#<CJK>
-0xBDB5	0x8525	#<CJK>
-0xBDB6	0x84FF	#<CJK>
-0xBDB7	0x8506	#<CJK>
-0xBDB8	0x8782	#<CJK>
-0xBDB9	0x8774	#<CJK>
-0xBDBA	0x8776	#<CJK>
-0xBDBB	0x8760	#<CJK>
-0xBDBC	0x8766	#<CJK>
-0xBDBD	0x8778	#<CJK>
-0xBDBE	0x8768	#<CJK>
-0xBDBF	0x8759	#<CJK>
-0xBDC0	0x8757	#<CJK>
-0xBDC1	0x874C	#<CJK>
-0xBDC2	0x8753	#<CJK>
-0xBDC3	0x885B	#<CJK>
-0xBDC4	0x885D	#<CJK>
-0xBDC5	0x8910	#<CJK>
-0xBDC6	0x8907	#<CJK>
-0xBDC7	0x8912	#<CJK>
-0xBDC8	0x8913	#<CJK>
-0xBDC9	0x8915	#<CJK>
-0xBDCA	0x890A	#<CJK>
-0xBDCB	0x8ABC	#<CJK>
-0xBDCC	0x8AD2	#<CJK>
-0xBDCD	0x8AC7	#<CJK>
-0xBDCE	0x8AC4	#<CJK>
-0xBDCF	0x8A95	#<CJK>
-0xBDD0	0x8ACB	#<CJK>
-0xBDD1	0x8AF8	#<CJK>
-0xBDD2	0x8AB2	#<CJK>
-0xBDD3	0x8AC9	#<CJK>
-0xBDD4	0x8AC2	#<CJK>
-0xBDD5	0x8ABF	#<CJK>
-0xBDD6	0x8AB0	#<CJK>
-0xBDD7	0x8AD6	#<CJK>
-0xBDD8	0x8ACD	#<CJK>
-0xBDD9	0x8AB6	#<CJK>
-0xBDDA	0x8AB9	#<CJK>
-0xBDDB	0x8ADB	#<CJK>
-0xBDDC	0x8C4C	#<CJK>
-0xBDDD	0x8C4E	#<CJK>
-0xBDDE	0x8C6C	#<CJK>
-0xBDDF	0x8CE0	#<CJK>
-0xBDE0	0x8CDE	#<CJK>
-0xBDE1	0x8CE6	#<CJK>
-0xBDE2	0x8CE4	#<CJK>
-0xBDE3	0x8CEC	#<CJK>
-0xBDE4	0x8CED	#<CJK>
-0xBDE5	0x8CE2	#<CJK>
-0xBDE6	0x8CE3	#<CJK>
-0xBDE7	0x8CDC	#<CJK>
-0xBDE8	0x8CEA	#<CJK>
-0xBDE9	0x8CE1	#<CJK>
-0xBDEA	0x8D6D	#<CJK>
-0xBDEB	0x8D9F	#<CJK>
-0xBDEC	0x8DA3	#<CJK>
-0xBDED	0x8E2B	#<CJK>
-0xBDEE	0x8E10	#<CJK>
-0xBDEF	0x8E1D	#<CJK>
-0xBDF0	0x8E22	#<CJK>
-0xBDF1	0x8E0F	#<CJK>
-0xBDF2	0x8E29	#<CJK>
-0xBDF3	0x8E1F	#<CJK>
-0xBDF4	0x8E21	#<CJK>
-0xBDF5	0x8E1E	#<CJK>
-0xBDF6	0x8EBA	#<CJK>
-0xBDF7	0x8F1D	#<CJK>
-0xBDF8	0x8F1B	#<CJK>
-0xBDF9	0x8F1F	#<CJK>
-0xBDFA	0x8F29	#<CJK>
-0xBDFB	0x8F26	#<CJK>
-0xBDFC	0x8F2A	#<CJK>
-0xBDFD	0x8F1C	#<CJK>
-0xBDFE	0x8F1E	#<CJK>
-0xBE40	0x8F25	#<CJK>
-0xBE41	0x9069	#<CJK>
-0xBE42	0x906E	#<CJK>
-0xBE43	0x9068	#<CJK>
-0xBE44	0x906D	#<CJK>
-0xBE45	0x9077	#<CJK>
-0xBE46	0x9130	#<CJK>
-0xBE47	0x912D	#<CJK>
-0xBE48	0x9127	#<CJK>
-0xBE49	0x9131	#<CJK>
-0xBE4A	0x9187	#<CJK>
-0xBE4B	0x9189	#<CJK>
-0xBE4C	0x918B	#<CJK>
-0xBE4D	0x9183	#<CJK>
-0xBE4E	0x92C5	#<CJK>
-0xBE4F	0x92BB	#<CJK>
-0xBE50	0x92B7	#<CJK>
-0xBE51	0x92EA	#<CJK>
-0xBE52	0x92AC	#<CJK>
-0xBE53	0x92E4	#<CJK>
-0xBE54	0x92C1	#<CJK>
-0xBE55	0x92B3	#<CJK>
-0xBE56	0x92BC	#<CJK>
-0xBE57	0x92D2	#<CJK>
-0xBE58	0x92C7	#<CJK>
-0xBE59	0x92F0	#<CJK>
-0xBE5A	0x92B2	#<CJK>
-0xBE5B	0x95AD	#<CJK>
-0xBE5C	0x95B1	#<CJK>
-0xBE5D	0x9704	#<CJK>
-0xBE5E	0x9706	#<CJK>
-0xBE5F	0x9707	#<CJK>
-0xBE60	0x9709	#<CJK>
-0xBE61	0x9760	#<CJK>
-0xBE62	0x978D	#<CJK>
-0xBE63	0x978B	#<CJK>
-0xBE64	0x978F	#<CJK>
-0xBE65	0x9821	#<CJK>
-0xBE66	0x982B	#<CJK>
-0xBE67	0x981C	#<CJK>
-0xBE68	0x98B3	#<CJK>
-0xBE69	0x990A	#<CJK>
-0xBE6A	0x9913	#<CJK>
-0xBE6B	0x9912	#<CJK>
-0xBE6C	0x9918	#<CJK>
-0xBE6D	0x99DD	#<CJK>
-0xBE6E	0x99D0	#<CJK>
-0xBE6F	0x99DF	#<CJK>
-0xBE70	0x99DB	#<CJK>
-0xBE71	0x99D1	#<CJK>
-0xBE72	0x99D5	#<CJK>
-0xBE73	0x99D2	#<CJK>
-0xBE74	0x99D9	#<CJK>
-0xBE75	0x9AB7	#<CJK>
-0xBE76	0x9AEE	#<CJK>
-0xBE77	0x9AEF	#<CJK>
-0xBE78	0x9B27	#<CJK>
-0xBE79	0x9B45	#<CJK>
-0xBE7A	0x9B44	#<CJK>
-0xBE7B	0x9B77	#<CJK>
-0xBE7C	0x9B6F	#<CJK>
-0xBE7D	0x9D06	#<CJK>
-0xBE7E	0x9D09	#<CJK>
-0xBEA1	0x9D03	#<CJK>
-0xBEA2	0x9EA9	#<CJK>
-0xBEA3	0x9EBE	#<CJK>
-0xBEA4	0x9ECE	#<CJK>
-0xBEA5	0x58A8	#<CJK>
-0xBEA6	0x9F52	#<CJK>
-0xBEA7	0x5112	#<CJK>
-0xBEA8	0x5118	#<CJK>
-0xBEA9	0x5114	#<CJK>
-0xBEAA	0x5110	#<CJK>
-0xBEAB	0x5115	#<CJK>
-0xBEAC	0x5180	#<CJK>
-0xBEAD	0x51AA	#<CJK>
-0xBEAE	0x51DD	#<CJK>
-0xBEAF	0x5291	#<CJK>
-0xBEB0	0x5293	#<CJK>
-0xBEB1	0x52F3	#<CJK>
-0xBEB2	0x5659	#<CJK>
-0xBEB3	0x566B	#<CJK>
-0xBEB4	0x5679	#<CJK>
-0xBEB5	0x5669	#<CJK>
-0xBEB6	0x5664	#<CJK>
-0xBEB7	0x5678	#<CJK>
-0xBEB8	0x566A	#<CJK>
-0xBEB9	0x5668	#<CJK>
-0xBEBA	0x5665	#<CJK>
-0xBEBB	0x5671	#<CJK>
-0xBEBC	0x566F	#<CJK>
-0xBEBD	0x566C	#<CJK>
-0xBEBE	0x5662	#<CJK>
-0xBEBF	0x5676	#<CJK>
-0xBEC0	0x58C1	#<CJK>
-0xBEC1	0x58BE	#<CJK>
-0xBEC2	0x58C7	#<CJK>
-0xBEC3	0x58C5	#<CJK>
-0xBEC4	0x596E	#<CJK>
-0xBEC5	0x5B1D	#<CJK>
-0xBEC6	0x5B34	#<CJK>
-0xBEC7	0x5B78	#<CJK>
-0xBEC8	0x5BF0	#<CJK>
-0xBEC9	0x5C0E	#<CJK>
-0xBECA	0x5F4A	#<CJK>
-0xBECB	0x61B2	#<CJK>
-0xBECC	0x6191	#<CJK>
-0xBECD	0x61A9	#<CJK>
-0xBECE	0x618A	#<CJK>
-0xBECF	0x61CD	#<CJK>
-0xBED0	0x61B6	#<CJK>
-0xBED1	0x61BE	#<CJK>
-0xBED2	0x61CA	#<CJK>
-0xBED3	0x61C8	#<CJK>
-0xBED4	0x6230	#<CJK>
-0xBED5	0x64C5	#<CJK>
-0xBED6	0x64C1	#<CJK>
-0xBED7	0x64CB	#<CJK>
-0xBED8	0x64BB	#<CJK>
-0xBED9	0x64BC	#<CJK>
-0xBEDA	0x64DA	#<CJK>
-0xBEDB	0x64C4	#<CJK>
-0xBEDC	0x64C7	#<CJK>
-0xBEDD	0x64C2	#<CJK>
-0xBEDE	0x64CD	#<CJK>
-0xBEDF	0x64BF	#<CJK>
-0xBEE0	0x64D2	#<CJK>
-0xBEE1	0x64D4	#<CJK>
-0xBEE2	0x64BE	#<CJK>
-0xBEE3	0x6574	#<CJK>
-0xBEE4	0x66C6	#<CJK>
-0xBEE5	0x66C9	#<CJK>
-0xBEE6	0x66B9	#<CJK>
-0xBEE7	0x66C4	#<CJK>
-0xBEE8	0x66C7	#<CJK>
-0xBEE9	0x66B8	#<CJK>
-0xBEEA	0x6A3D	#<CJK>
-0xBEEB	0x6A38	#<CJK>
-0xBEEC	0x6A3A	#<CJK>
-0xBEED	0x6A59	#<CJK>
-0xBEEE	0x6A6B	#<CJK>
-0xBEEF	0x6A58	#<CJK>
-0xBEF0	0x6A39	#<CJK>
-0xBEF1	0x6A44	#<CJK>
-0xBEF2	0x6A62	#<CJK>
-0xBEF3	0x6A61	#<CJK>
-0xBEF4	0x6A4B	#<CJK>
-0xBEF5	0x6A47	#<CJK>
-0xBEF6	0x6A35	#<CJK>
-0xBEF7	0x6A5F	#<CJK>
-0xBEF8	0x6A48	#<CJK>
-0xBEF9	0x6B59	#<CJK>
-0xBEFA	0x6B77	#<CJK>
-0xBEFB	0x6C05	#<CJK>
-0xBEFC	0x6FC2	#<CJK>
-0xBEFD	0x6FB1	#<CJK>
-0xBEFE	0x6FA1	#<CJK>
-0xBF40	0x6FC3	#<CJK>
-0xBF41	0x6FA4	#<CJK>
-0xBF42	0x6FC1	#<CJK>
-0xBF43	0x6FA7	#<CJK>
-0xBF44	0x6FB3	#<CJK>
-0xBF45	0x6FC0	#<CJK>
-0xBF46	0x6FB9	#<CJK>
-0xBF47	0x6FB6	#<CJK>
-0xBF48	0x6FA6	#<CJK>
-0xBF49	0x6FA0	#<CJK>
-0xBF4A	0x6FB4	#<CJK>
-0xBF4B	0x71BE	#<CJK>
-0xBF4C	0x71C9	#<CJK>
-0xBF4D	0x71D0	#<CJK>
-0xBF4E	0x71D2	#<CJK>
-0xBF4F	0x71C8	#<CJK>
-0xBF50	0x71D5	#<CJK>
-0xBF51	0x71B9	#<CJK>
-0xBF52	0x71CE	#<CJK>
-0xBF53	0x71D9	#<CJK>
-0xBF54	0x71DC	#<CJK>
-0xBF55	0x71C3	#<CJK>
-0xBF56	0x71C4	#<CJK>
-0xBF57	0x7368	#<CJK>
-0xBF58	0x749C	#<CJK>
-0xBF59	0x74A3	#<CJK>
-0xBF5A	0x7498	#<CJK>
-0xBF5B	0x749F	#<CJK>
-0xBF5C	0x749E	#<CJK>
-0xBF5D	0x74E2	#<CJK>
-0xBF5E	0x750C	#<CJK>
-0xBF5F	0x750D	#<CJK>
-0xBF60	0x7634	#<CJK>
-0xBF61	0x7638	#<CJK>
-0xBF62	0x763A	#<CJK>
-0xBF63	0x76E7	#<CJK>
-0xBF64	0x76E5	#<CJK>
-0xBF65	0x77A0	#<CJK>
-0xBF66	0x779E	#<CJK>
-0xBF67	0x779F	#<CJK>
-0xBF68	0x77A5	#<CJK>
-0xBF69	0x78E8	#<CJK>
-0xBF6A	0x78DA	#<CJK>
-0xBF6B	0x78EC	#<CJK>
-0xBF6C	0x78E7	#<CJK>
-0xBF6D	0x79A6	#<CJK>
-0xBF6E	0x7A4D	#<CJK>
-0xBF6F	0x7A4E	#<CJK>
-0xBF70	0x7A46	#<CJK>
-0xBF71	0x7A4C	#<CJK>
-0xBF72	0x7A4B	#<CJK>
-0xBF73	0x7ABA	#<CJK>
-0xBF74	0x7BD9	#<CJK>
-0xBF75	0x7C11	#<CJK>
-0xBF76	0x7BC9	#<CJK>
-0xBF77	0x7BE4	#<CJK>
-0xBF78	0x7BDB	#<CJK>
-0xBF79	0x7BE1	#<CJK>
-0xBF7A	0x7BE9	#<CJK>
-0xBF7B	0x7BE6	#<CJK>
-0xBF7C	0x7CD5	#<CJK>
-0xBF7D	0x7CD6	#<CJK>
-0xBF7E	0x7E0A	#<CJK>
-0xBFA1	0x7E11	#<CJK>
-0xBFA2	0x7E08	#<CJK>
-0xBFA3	0x7E1B	#<CJK>
-0xBFA4	0x7E23	#<CJK>
-0xBFA5	0x7E1E	#<CJK>
-0xBFA6	0x7E1D	#<CJK>
-0xBFA7	0x7E09	#<CJK>
-0xBFA8	0x7E10	#<CJK>
-0xBFA9	0x7F79	#<CJK>
-0xBFAA	0x7FB2	#<CJK>
-0xBFAB	0x7FF0	#<CJK>
-0xBFAC	0x7FF1	#<CJK>
-0xBFAD	0x7FEE	#<CJK>
-0xBFAE	0x8028	#<CJK>
-0xBFAF	0x81B3	#<CJK>
-0xBFB0	0x81A9	#<CJK>
-0xBFB1	0x81A8	#<CJK>
-0xBFB2	0x81FB	#<CJK>
-0xBFB3	0x8208	#<CJK>
-0xBFB4	0x8258	#<CJK>
-0xBFB5	0x8259	#<CJK>
-0xBFB6	0x854A	#<CJK>
-0xBFB7	0x8559	#<CJK>
-0xBFB8	0x8548	#<CJK>
-0xBFB9	0x8568	#<CJK>
-0xBFBA	0x8569	#<CJK>
-0xBFBB	0x8543	#<CJK>
-0xBFBC	0x8549	#<CJK>
-0xBFBD	0x856D	#<CJK>
-0xBFBE	0x856A	#<CJK>
-0xBFBF	0x855E	#<CJK>
-0xBFC0	0x8783	#<CJK>
-0xBFC1	0x879F	#<CJK>
-0xBFC2	0x879E	#<CJK>
-0xBFC3	0x87A2	#<CJK>
-0xBFC4	0x878D	#<CJK>
-0xBFC5	0x8861	#<CJK>
-0xBFC6	0x892A	#<CJK>
-0xBFC7	0x8932	#<CJK>
-0xBFC8	0x8925	#<CJK>
-0xBFC9	0x892B	#<CJK>
-0xBFCA	0x8921	#<CJK>
-0xBFCB	0x89AA	#<CJK>
-0xBFCC	0x89A6	#<CJK>
-0xBFCD	0x8AE6	#<CJK>
-0xBFCE	0x8AFA	#<CJK>
-0xBFCF	0x8AEB	#<CJK>
-0xBFD0	0x8AF1	#<CJK>
-0xBFD1	0x8B00	#<CJK>
-0xBFD2	0x8ADC	#<CJK>
-0xBFD3	0x8AE7	#<CJK>
-0xBFD4	0x8AEE	#<CJK>
-0xBFD5	0x8AFE	#<CJK>
-0xBFD6	0x8B01	#<CJK>
-0xBFD7	0x8B02	#<CJK>
-0xBFD8	0x8AF7	#<CJK>
-0xBFD9	0x8AED	#<CJK>
-0xBFDA	0x8AF3	#<CJK>
-0xBFDB	0x8AF6	#<CJK>
-0xBFDC	0x8AFC	#<CJK>
-0xBFDD	0x8C6B	#<CJK>
-0xBFDE	0x8C6D	#<CJK>
-0xBFDF	0x8C93	#<CJK>
-0xBFE0	0x8CF4	#<CJK>
-0xBFE1	0x8E44	#<CJK>
-0xBFE2	0x8E31	#<CJK>
-0xBFE3	0x8E34	#<CJK>
-0xBFE4	0x8E42	#<CJK>
-0xBFE5	0x8E39	#<CJK>
-0xBFE6	0x8E35	#<CJK>
-0xBFE7	0x8F3B	#<CJK>
-0xBFE8	0x8F2F	#<CJK>
-0xBFE9	0x8F38	#<CJK>
-0xBFEA	0x8F33	#<CJK>
-0xBFEB	0x8FA8	#<CJK>
-0xBFEC	0x8FA6	#<CJK>
-0xBFED	0x9075	#<CJK>
-0xBFEE	0x9074	#<CJK>
-0xBFEF	0x9078	#<CJK>
-0xBFF0	0x9072	#<CJK>
-0xBFF1	0x907C	#<CJK>
-0xBFF2	0x907A	#<CJK>
-0xBFF3	0x9134	#<CJK>
-0xBFF4	0x9192	#<CJK>
-0xBFF5	0x9320	#<CJK>
-0xBFF6	0x9336	#<CJK>
-0xBFF7	0x92F8	#<CJK>
-0xBFF8	0x9333	#<CJK>
-0xBFF9	0x932F	#<CJK>
-0xBFFA	0x9322	#<CJK>
-0xBFFB	0x92FC	#<CJK>
-0xBFFC	0x932B	#<CJK>
-0xBFFD	0x9304	#<CJK>
-0xBFFE	0x931A	#<CJK>
-0xC040	0x9310	#<CJK>
-0xC041	0x9326	#<CJK>
-0xC042	0x9321	#<CJK>
-0xC043	0x9315	#<CJK>
-0xC044	0x932E	#<CJK>
-0xC045	0x9319	#<CJK>
-0xC046	0x95BB	#<CJK>
-0xC047	0x96A7	#<CJK>
-0xC048	0x96A8	#<CJK>
-0xC049	0x96AA	#<CJK>
-0xC04A	0x96D5	#<CJK>
-0xC04B	0x970E	#<CJK>
-0xC04C	0x9711	#<CJK>
-0xC04D	0x9716	#<CJK>
-0xC04E	0x970D	#<CJK>
-0xC04F	0x9713	#<CJK>
-0xC050	0x970F	#<CJK>
-0xC051	0x975B	#<CJK>
-0xC052	0x975C	#<CJK>
-0xC053	0x9766	#<CJK>
-0xC054	0x9798	#<CJK>
-0xC055	0x9830	#<CJK>
-0xC056	0x9838	#<CJK>
-0xC057	0x983B	#<CJK>
-0xC058	0x9837	#<CJK>
-0xC059	0x982D	#<CJK>
-0xC05A	0x9839	#<CJK>
-0xC05B	0x9824	#<CJK>
-0xC05C	0x9910	#<CJK>
-0xC05D	0x9928	#<CJK>
-0xC05E	0x991E	#<CJK>
-0xC05F	0x991B	#<CJK>
-0xC060	0x9921	#<CJK>
-0xC061	0x991A	#<CJK>
-0xC062	0x99ED	#<CJK>
-0xC063	0x99E2	#<CJK>
-0xC064	0x99F1	#<CJK>
-0xC065	0x9AB8	#<CJK>
-0xC066	0x9ABC	#<CJK>
-0xC067	0x9AFB	#<CJK>
-0xC068	0x9AED	#<CJK>
-0xC069	0x9B28	#<CJK>
-0xC06A	0x9B91	#<CJK>
-0xC06B	0x9D15	#<CJK>
-0xC06C	0x9D23	#<CJK>
-0xC06D	0x9D26	#<CJK>
-0xC06E	0x9D28	#<CJK>
-0xC06F	0x9D12	#<CJK>
-0xC070	0x9D1B	#<CJK>
-0xC071	0x9ED8	#<CJK>
-0xC072	0x9ED4	#<CJK>
-0xC073	0x9F8D	#<CJK>
-0xC074	0x9F9C	#<CJK>
-0xC075	0x512A	#<CJK>
-0xC076	0x511F	#<CJK>
-0xC077	0x5121	#<CJK>
-0xC078	0x5132	#<CJK>
-0xC079	0x52F5	#<CJK>
-0xC07A	0x568E	#<CJK>
-0xC07B	0x5680	#<CJK>
-0xC07C	0x5690	#<CJK>
-0xC07D	0x5685	#<CJK>
-0xC07E	0x5687	#<CJK>
-0xC0A1	0x568F	#<CJK>
-0xC0A2	0x58D5	#<CJK>
-0xC0A3	0x58D3	#<CJK>
-0xC0A4	0x58D1	#<CJK>
-0xC0A5	0x58CE	#<CJK>
-0xC0A6	0x5B30	#<CJK>
-0xC0A7	0x5B2A	#<CJK>
-0xC0A8	0x5B24	#<CJK>
-0xC0A9	0x5B7A	#<CJK>
-0xC0AA	0x5C37	#<CJK>
-0xC0AB	0x5C68	#<CJK>
-0xC0AC	0x5DBC	#<CJK>
-0xC0AD	0x5DBA	#<CJK>
-0xC0AE	0x5DBD	#<CJK>
-0xC0AF	0x5DB8	#<CJK>
-0xC0B0	0x5E6B	#<CJK>
-0xC0B1	0x5F4C	#<CJK>
-0xC0B2	0x5FBD	#<CJK>
-0xC0B3	0x61C9	#<CJK>
-0xC0B4	0x61C2	#<CJK>
-0xC0B5	0x61C7	#<CJK>
-0xC0B6	0x61E6	#<CJK>
-0xC0B7	0x61CB	#<CJK>
-0xC0B8	0x6232	#<CJK>
-0xC0B9	0x6234	#<CJK>
-0xC0BA	0x64CE	#<CJK>
-0xC0BB	0x64CA	#<CJK>
-0xC0BC	0x64D8	#<CJK>
-0xC0BD	0x64E0	#<CJK>
-0xC0BE	0x64F0	#<CJK>
-0xC0BF	0x64E6	#<CJK>
-0xC0C0	0x64EC	#<CJK>
-0xC0C1	0x64F1	#<CJK>
-0xC0C2	0x64E2	#<CJK>
-0xC0C3	0x64ED	#<CJK>
-0xC0C4	0x6582	#<CJK>
-0xC0C5	0x6583	#<CJK>
-0xC0C6	0x66D9	#<CJK>
-0xC0C7	0x66D6	#<CJK>
-0xC0C8	0x6A80	#<CJK>
-0xC0C9	0x6A94	#<CJK>
-0xC0CA	0x6A84	#<CJK>
-0xC0CB	0x6AA2	#<CJK>
-0xC0CC	0x6A9C	#<CJK>
-0xC0CD	0x6ADB	#<CJK>
-0xC0CE	0x6AA3	#<CJK>
-0xC0CF	0x6A7E	#<CJK>
-0xC0D0	0x6A97	#<CJK>
-0xC0D1	0x6A90	#<CJK>
-0xC0D2	0x6AA0	#<CJK>
-0xC0D3	0x6B5C	#<CJK>
-0xC0D4	0x6BAE	#<CJK>
-0xC0D5	0x6BDA	#<CJK>
-0xC0D6	0x6C08	#<CJK>
-0xC0D7	0x6FD8	#<CJK>
-0xC0D8	0x6FF1	#<CJK>
-0xC0D9	0x6FDF	#<CJK>
-0xC0DA	0x6FE0	#<CJK>
-0xC0DB	0x6FDB	#<CJK>
-0xC0DC	0x6FE4	#<CJK>
-0xC0DD	0x6FEB	#<CJK>
-0xC0DE	0x6FEF	#<CJK>
-0xC0DF	0x6F80	#<CJK>
-0xC0E0	0x6FEC	#<CJK>
-0xC0E1	0x6FE1	#<CJK>
-0xC0E2	0x6FE9	#<CJK>
-0xC0E3	0x6FD5	#<CJK>
-0xC0E4	0x6FEE	#<CJK>
-0xC0E5	0x6FF0	#<CJK>
-0xC0E6	0x71E7	#<CJK>
-0xC0E7	0x71DF	#<CJK>
-0xC0E8	0x71EE	#<CJK>
-0xC0E9	0x71E6	#<CJK>
-0xC0EA	0x71E5	#<CJK>
-0xC0EB	0x71ED	#<CJK>
-0xC0EC	0x71EC	#<CJK>
-0xC0ED	0x71F4	#<CJK>
-0xC0EE	0x71E0	#<CJK>
-0xC0EF	0x7235	#<CJK>
-0xC0F0	0x7246	#<CJK>
-0xC0F1	0x7370	#<CJK>
-0xC0F2	0x7372	#<CJK>
-0xC0F3	0x74A9	#<CJK>
-0xC0F4	0x74B0	#<CJK>
-0xC0F5	0x74A6	#<CJK>
-0xC0F6	0x74A8	#<CJK>
-0xC0F7	0x7646	#<CJK>
-0xC0F8	0x7642	#<CJK>
-0xC0F9	0x764C	#<CJK>
-0xC0FA	0x76EA	#<CJK>
-0xC0FB	0x77B3	#<CJK>
-0xC0FC	0x77AA	#<CJK>
-0xC0FD	0x77B0	#<CJK>
-0xC0FE	0x77AC	#<CJK>
-0xC140	0x77A7	#<CJK>
-0xC141	0x77AD	#<CJK>
-0xC142	0x77EF	#<CJK>
-0xC143	0x78F7	#<CJK>
-0xC144	0x78FA	#<CJK>
-0xC145	0x78F4	#<CJK>
-0xC146	0x78EF	#<CJK>
-0xC147	0x7901	#<CJK>
-0xC148	0x79A7	#<CJK>
-0xC149	0x79AA	#<CJK>
-0xC14A	0x7A57	#<CJK>
-0xC14B	0x7ABF	#<CJK>
-0xC14C	0x7C07	#<CJK>
-0xC14D	0x7C0D	#<CJK>
-0xC14E	0x7BFE	#<CJK>
-0xC14F	0x7BF7	#<CJK>
-0xC150	0x7C0C	#<CJK>
-0xC151	0x7BE0	#<CJK>
-0xC152	0x7CE0	#<CJK>
-0xC153	0x7CDC	#<CJK>
-0xC154	0x7CDE	#<CJK>
-0xC155	0x7CE2	#<CJK>
-0xC156	0x7CDF	#<CJK>
-0xC157	0x7CD9	#<CJK>
-0xC158	0x7CDD	#<CJK>
-0xC159	0x7E2E	#<CJK>
-0xC15A	0x7E3E	#<CJK>
-0xC15B	0x7E46	#<CJK>
-0xC15C	0x7E37	#<CJK>
-0xC15D	0x7E32	#<CJK>
-0xC15E	0x7E43	#<CJK>
-0xC15F	0x7E2B	#<CJK>
-0xC160	0x7E3D	#<CJK>
-0xC161	0x7E31	#<CJK>
-0xC162	0x7E45	#<CJK>
-0xC163	0x7E41	#<CJK>
-0xC164	0x7E34	#<CJK>
-0xC165	0x7E39	#<CJK>
-0xC166	0x7E48	#<CJK>
-0xC167	0x7E35	#<CJK>
-0xC168	0x7E3F	#<CJK>
-0xC169	0x7E2F	#<CJK>
-0xC16A	0x7F44	#<CJK>
-0xC16B	0x7FF3	#<CJK>
-0xC16C	0x7FFC	#<CJK>
-0xC16D	0x8071	#<CJK>
-0xC16E	0x8072	#<CJK>
-0xC16F	0x8070	#<CJK>
-0xC170	0x806F	#<CJK>
-0xC171	0x8073	#<CJK>
-0xC172	0x81C6	#<CJK>
-0xC173	0x81C3	#<CJK>
-0xC174	0x81BA	#<CJK>
-0xC175	0x81C2	#<CJK>
-0xC176	0x81C0	#<CJK>
-0xC177	0x81BF	#<CJK>
-0xC178	0x81BD	#<CJK>
-0xC179	0x81C9	#<CJK>
-0xC17A	0x81BE	#<CJK>
-0xC17B	0x81E8	#<CJK>
-0xC17C	0x8209	#<CJK>
-0xC17D	0x8271	#<CJK>
-0xC17E	0x85AA	#<CJK>
-0xC1A1	0x8584	#<CJK>
-0xC1A2	0x857E	#<CJK>
-0xC1A3	0x859C	#<CJK>
-0xC1A4	0x8591	#<CJK>
-0xC1A5	0x8594	#<CJK>
-0xC1A6	0x85AF	#<CJK>
-0xC1A7	0x859B	#<CJK>
-0xC1A8	0x8587	#<CJK>
-0xC1A9	0x85A8	#<CJK>
-0xC1AA	0x858A	#<CJK>
-0xC1AB	0x8667	#<CJK>
-0xC1AC	0x87C0	#<CJK>
-0xC1AD	0x87D1	#<CJK>
-0xC1AE	0x87B3	#<CJK>
-0xC1AF	0x87D2	#<CJK>
-0xC1B0	0x87C6	#<CJK>
-0xC1B1	0x87AB	#<CJK>
-0xC1B2	0x87BB	#<CJK>
-0xC1B3	0x87BA	#<CJK>
-0xC1B4	0x87C8	#<CJK>
-0xC1B5	0x87CB	#<CJK>
-0xC1B6	0x893B	#<CJK>
-0xC1B7	0x8936	#<CJK>
-0xC1B8	0x8944	#<CJK>
-0xC1B9	0x8938	#<CJK>
-0xC1BA	0x893D	#<CJK>
-0xC1BB	0x89AC	#<CJK>
-0xC1BC	0x8B0E	#<CJK>
-0xC1BD	0x8B17	#<CJK>
-0xC1BE	0x8B19	#<CJK>
-0xC1BF	0x8B1B	#<CJK>
-0xC1C0	0x8B0A	#<CJK>
-0xC1C1	0x8B20	#<CJK>
-0xC1C2	0x8B1D	#<CJK>
-0xC1C3	0x8B04	#<CJK>
-0xC1C4	0x8B10	#<CJK>
-0xC1C5	0x8C41	#<CJK>
-0xC1C6	0x8C3F	#<CJK>
-0xC1C7	0x8C73	#<CJK>
-0xC1C8	0x8CFA	#<CJK>
-0xC1C9	0x8CFD	#<CJK>
-0xC1CA	0x8CFC	#<CJK>
-0xC1CB	0x8CF8	#<CJK>
-0xC1CC	0x8CFB	#<CJK>
-0xC1CD	0x8DA8	#<CJK>
-0xC1CE	0x8E49	#<CJK>
-0xC1CF	0x8E4B	#<CJK>
-0xC1D0	0x8E48	#<CJK>
-0xC1D1	0x8E4A	#<CJK>
-0xC1D2	0x8F44	#<CJK>
-0xC1D3	0x8F3E	#<CJK>
-0xC1D4	0x8F42	#<CJK>
-0xC1D5	0x8F45	#<CJK>
-0xC1D6	0x8F3F	#<CJK>
-0xC1D7	0x907F	#<CJK>
-0xC1D8	0x907D	#<CJK>
-0xC1D9	0x9084	#<CJK>
-0xC1DA	0x9081	#<CJK>
-0xC1DB	0x9082	#<CJK>
-0xC1DC	0x9080	#<CJK>
-0xC1DD	0x9139	#<CJK>
-0xC1DE	0x91A3	#<CJK>
-0xC1DF	0x919E	#<CJK>
-0xC1E0	0x919C	#<CJK>
-0xC1E1	0x934D	#<CJK>
-0xC1E2	0x9382	#<CJK>
-0xC1E3	0x9328	#<CJK>
-0xC1E4	0x9375	#<CJK>
-0xC1E5	0x934A	#<CJK>
-0xC1E6	0x9365	#<CJK>
-0xC1E7	0x934B	#<CJK>
-0xC1E8	0x9318	#<CJK>
-0xC1E9	0x937E	#<CJK>
-0xC1EA	0x936C	#<CJK>
-0xC1EB	0x935B	#<CJK>
-0xC1EC	0x9370	#<CJK>
-0xC1ED	0x935A	#<CJK>
-0xC1EE	0x9354	#<CJK>
-0xC1EF	0x95CA	#<CJK>
-0xC1F0	0x95CB	#<CJK>
-0xC1F1	0x95CC	#<CJK>
-0xC1F2	0x95C8	#<CJK>
-0xC1F3	0x95C6	#<CJK>
-0xC1F4	0x96B1	#<CJK>
-0xC1F5	0x96B8	#<CJK>
-0xC1F6	0x96D6	#<CJK>
-0xC1F7	0x971C	#<CJK>
-0xC1F8	0x971E	#<CJK>
-0xC1F9	0x97A0	#<CJK>
-0xC1FA	0x97D3	#<CJK>
-0xC1FB	0x9846	#<CJK>
-0xC1FC	0x98B6	#<CJK>
-0xC1FD	0x9935	#<CJK>
-0xC1FE	0x9A01	#<CJK>
-0xC240	0x99FF	#<CJK>
-0xC241	0x9BAE	#<CJK>
-0xC242	0x9BAB	#<CJK>
-0xC243	0x9BAA	#<CJK>
-0xC244	0x9BAD	#<CJK>
-0xC245	0x9D3B	#<CJK>
-0xC246	0x9D3F	#<CJK>
-0xC247	0x9E8B	#<CJK>
-0xC248	0x9ECF	#<CJK>
-0xC249	0x9EDE	#<CJK>
-0xC24A	0x9EDC	#<CJK>
-0xC24B	0x9EDD	#<CJK>
-0xC24C	0x9EDB	#<CJK>
-0xC24D	0x9F3E	#<CJK>
-0xC24E	0x9F4B	#<CJK>
-0xC24F	0x53E2	#<CJK>
-0xC250	0x5695	#<CJK>
-0xC251	0x56AE	#<CJK>
-0xC252	0x58D9	#<CJK>
-0xC253	0x58D8	#<CJK>
-0xC254	0x5B38	#<CJK>
-0xC255	0x5F5D	#<CJK>
-0xC256	0x61E3	#<CJK>
-0xC257	0x6233	#<CJK>
-0xC258	0x64F4	#<CJK>
-0xC259	0x64F2	#<CJK>
-0xC25A	0x64FE	#<CJK>
-0xC25B	0x6506	#<CJK>
-0xC25C	0x64FA	#<CJK>
-0xC25D	0x64FB	#<CJK>
-0xC25E	0x64F7	#<CJK>
-0xC25F	0x65B7	#<CJK>
-0xC260	0x66DC	#<CJK>
-0xC261	0x6726	#<CJK>
-0xC262	0x6AB3	#<CJK>
-0xC263	0x6AAC	#<CJK>
-0xC264	0x6AC3	#<CJK>
-0xC265	0x6ABB	#<CJK>
-0xC266	0x6AB8	#<CJK>
-0xC267	0x6AC2	#<CJK>
-0xC268	0x6AAE	#<CJK>
-0xC269	0x6AAF	#<CJK>
-0xC26A	0x6B5F	#<CJK>
-0xC26B	0x6B78	#<CJK>
-0xC26C	0x6BAF	#<CJK>
-0xC26D	0x7009	#<CJK>
-0xC26E	0x700B	#<CJK>
-0xC26F	0x6FFE	#<CJK>
-0xC270	0x7006	#<CJK>
-0xC271	0x6FFA	#<CJK>
-0xC272	0x7011	#<CJK>
-0xC273	0x700F	#<CJK>
-0xC274	0x71FB	#<CJK>
-0xC275	0x71FC	#<CJK>
-0xC276	0x71FE	#<CJK>
-0xC277	0x71F8	#<CJK>
-0xC278	0x7377	#<CJK>
-0xC279	0x7375	#<CJK>
-0xC27A	0x74A7	#<CJK>
-0xC27B	0x74BF	#<CJK>
-0xC27C	0x7515	#<CJK>
-0xC27D	0x7656	#<CJK>
-0xC27E	0x7658	#<CJK>
-0xC2A1	0x7652	#<CJK>
-0xC2A2	0x77BD	#<CJK>
-0xC2A3	0x77BF	#<CJK>
-0xC2A4	0x77BB	#<CJK>
-0xC2A5	0x77BC	#<CJK>
-0xC2A6	0x790E	#<CJK>
-0xC2A7	0x79AE	#<CJK>
-0xC2A8	0x7A61	#<CJK>
-0xC2A9	0x7A62	#<CJK>
-0xC2AA	0x7A60	#<CJK>
-0xC2AB	0x7AC4	#<CJK>
-0xC2AC	0x7AC5	#<CJK>
-0xC2AD	0x7C2B	#<CJK>
-0xC2AE	0x7C27	#<CJK>
-0xC2AF	0x7C2A	#<CJK>
-0xC2B0	0x7C1E	#<CJK>
-0xC2B1	0x7C23	#<CJK>
-0xC2B2	0x7C21	#<CJK>
-0xC2B3	0x7CE7	#<CJK>
-0xC2B4	0x7E54	#<CJK>
-0xC2B5	0x7E55	#<CJK>
-0xC2B6	0x7E5E	#<CJK>
-0xC2B7	0x7E5A	#<CJK>
-0xC2B8	0x7E61	#<CJK>
-0xC2B9	0x7E52	#<CJK>
-0xC2BA	0x7E59	#<CJK>
-0xC2BB	0x7F48	#<CJK>
-0xC2BC	0x7FF9	#<CJK>
-0xC2BD	0x7FFB	#<CJK>
-0xC2BE	0x8077	#<CJK>
-0xC2BF	0x8076	#<CJK>
-0xC2C0	0x81CD	#<CJK>
-0xC2C1	0x81CF	#<CJK>
-0xC2C2	0x820A	#<CJK>
-0xC2C3	0x85CF	#<CJK>
-0xC2C4	0x85A9	#<CJK>
-0xC2C5	0x85CD	#<CJK>
-0xC2C6	0x85D0	#<CJK>
-0xC2C7	0x85C9	#<CJK>
-0xC2C8	0x85B0	#<CJK>
-0xC2C9	0x85BA	#<CJK>
-0xC2CA	0x85B9	#<CJK>
-0xC2CB	0x85A6	#<CJK>
-0xC2CC	0x87EF	#<CJK>
-0xC2CD	0x87EC	#<CJK>
-0xC2CE	0x87F2	#<CJK>
-0xC2CF	0x87E0	#<CJK>
-0xC2D0	0x8986	#<CJK>
-0xC2D1	0x89B2	#<CJK>
-0xC2D2	0x89F4	#<CJK>
-0xC2D3	0x8B28	#<CJK>
-0xC2D4	0x8B39	#<CJK>
-0xC2D5	0x8B2C	#<CJK>
-0xC2D6	0x8B2B	#<CJK>
-0xC2D7	0x8C50	#<CJK>
-0xC2D8	0x8D05	#<CJK>
-0xC2D9	0x8E59	#<CJK>
-0xC2DA	0x8E63	#<CJK>
-0xC2DB	0x8E66	#<CJK>
-0xC2DC	0x8E64	#<CJK>
-0xC2DD	0x8E5F	#<CJK>
-0xC2DE	0x8E55	#<CJK>
-0xC2DF	0x8EC0	#<CJK>
-0xC2E0	0x8F49	#<CJK>
-0xC2E1	0x8F4D	#<CJK>
-0xC2E2	0x9087	#<CJK>
-0xC2E3	0x9083	#<CJK>
-0xC2E4	0x9088	#<CJK>
-0xC2E5	0x91AB	#<CJK>
-0xC2E6	0x91AC	#<CJK>
-0xC2E7	0x91D0	#<CJK>
-0xC2E8	0x9394	#<CJK>
-0xC2E9	0x938A	#<CJK>
-0xC2EA	0x9396	#<CJK>
-0xC2EB	0x93A2	#<CJK>
-0xC2EC	0x93B3	#<CJK>
-0xC2ED	0x93AE	#<CJK>
-0xC2EE	0x93AC	#<CJK>
-0xC2EF	0x93B0	#<CJK>
-0xC2F0	0x9398	#<CJK>
-0xC2F1	0x939A	#<CJK>
-0xC2F2	0x9397	#<CJK>
-0xC2F3	0x95D4	#<CJK>
-0xC2F4	0x95D6	#<CJK>
-0xC2F5	0x95D0	#<CJK>
-0xC2F6	0x95D5	#<CJK>
-0xC2F7	0x96E2	#<CJK>
-0xC2F8	0x96DC	#<CJK>
-0xC2F9	0x96D9	#<CJK>
-0xC2FA	0x96DB	#<CJK>
-0xC2FB	0x96DE	#<CJK>
-0xC2FC	0x9724	#<CJK>
-0xC2FD	0x97A3	#<CJK>
-0xC2FE	0x97A6	#<CJK>
-0xC340	0x97AD	#<CJK>
-0xC341	0x97F9	#<CJK>
-0xC342	0x984D	#<CJK>
-0xC343	0x984F	#<CJK>
-0xC344	0x984C	#<CJK>
-0xC345	0x984E	#<CJK>
-0xC346	0x9853	#<CJK>
-0xC347	0x98BA	#<CJK>
-0xC348	0x993E	#<CJK>
-0xC349	0x993F	#<CJK>
-0xC34A	0x993D	#<CJK>
-0xC34B	0x992E	#<CJK>
-0xC34C	0x99A5	#<CJK>
-0xC34D	0x9A0E	#<CJK>
-0xC34E	0x9AC1	#<CJK>
-0xC34F	0x9B03	#<CJK>
-0xC350	0x9B06	#<CJK>
-0xC351	0x9B4F	#<CJK>
-0xC352	0x9B4E	#<CJK>
-0xC353	0x9B4D	#<CJK>
-0xC354	0x9BCA	#<CJK>
-0xC355	0x9BC9	#<CJK>
-0xC356	0x9BFD	#<CJK>
-0xC357	0x9BC8	#<CJK>
-0xC358	0x9BC0	#<CJK>
-0xC359	0x9D51	#<CJK>
-0xC35A	0x9D5D	#<CJK>
-0xC35B	0x9D60	#<CJK>
-0xC35C	0x9EE0	#<CJK>
-0xC35D	0x9F15	#<CJK>
-0xC35E	0x9F2C	#<CJK>
-0xC35F	0x5133	#<CJK>
-0xC360	0x56A5	#<CJK>
-0xC361	0x58DE	#<CJK>
-0xC362	0x58DF	#<CJK>
-0xC363	0x58E2	#<CJK>
-0xC364	0x5BF5	#<CJK>
-0xC365	0x9F90	#<CJK>
-0xC366	0x5EEC	#<CJK>
-0xC367	0x61F2	#<CJK>
-0xC368	0x61F7	#<CJK>
-0xC369	0x61F6	#<CJK>
-0xC36A	0x61F5	#<CJK>
-0xC36B	0x6500	#<CJK>
-0xC36C	0x650F	#<CJK>
-0xC36D	0x66E0	#<CJK>
-0xC36E	0x66DD	#<CJK>
-0xC36F	0x6AE5	#<CJK>
-0xC370	0x6ADD	#<CJK>
-0xC371	0x6ADA	#<CJK>
-0xC372	0x6AD3	#<CJK>
-0xC373	0x701B	#<CJK>
-0xC374	0x701F	#<CJK>
-0xC375	0x7028	#<CJK>
-0xC376	0x701A	#<CJK>
-0xC377	0x701D	#<CJK>
-0xC378	0x7015	#<CJK>
-0xC379	0x7018	#<CJK>
-0xC37A	0x7206	#<CJK>
-0xC37B	0x720D	#<CJK>
-0xC37C	0x7258	#<CJK>
-0xC37D	0x72A2	#<CJK>
-0xC37E	0x7378	#<CJK>
-0xC3A1	0x737A	#<CJK>
-0xC3A2	0x74BD	#<CJK>
-0xC3A3	0x74CA	#<CJK>
-0xC3A4	0x74E3	#<CJK>
-0xC3A5	0x7587	#<CJK>
-0xC3A6	0x7586	#<CJK>
-0xC3A7	0x765F	#<CJK>
-0xC3A8	0x7661	#<CJK>
-0xC3A9	0x77C7	#<CJK>
-0xC3AA	0x7919	#<CJK>
-0xC3AB	0x79B1	#<CJK>
-0xC3AC	0x7A6B	#<CJK>
-0xC3AD	0x7A69	#<CJK>
-0xC3AE	0x7C3E	#<CJK>
-0xC3AF	0x7C3F	#<CJK>
-0xC3B0	0x7C38	#<CJK>
-0xC3B1	0x7C3D	#<CJK>
-0xC3B2	0x7C37	#<CJK>
-0xC3B3	0x7C40	#<CJK>
-0xC3B4	0x7E6B	#<CJK>
-0xC3B5	0x7E6D	#<CJK>
-0xC3B6	0x7E79	#<CJK>
-0xC3B7	0x7E69	#<CJK>
-0xC3B8	0x7E6A	#<CJK>
-0xC3B9	0x7F85	#<CJK>
-0xC3BA	0x7E73	#<CJK>
-0xC3BB	0x7FB6	#<CJK>
-0xC3BC	0x7FB9	#<CJK>
-0xC3BD	0x7FB8	#<CJK>
-0xC3BE	0x81D8	#<CJK>
-0xC3BF	0x85E9	#<CJK>
-0xC3C0	0x85DD	#<CJK>
-0xC3C1	0x85EA	#<CJK>
-0xC3C2	0x85D5	#<CJK>
-0xC3C3	0x85E4	#<CJK>
-0xC3C4	0x85E5	#<CJK>
-0xC3C5	0x85F7	#<CJK>
-0xC3C6	0x87FB	#<CJK>
-0xC3C7	0x8805	#<CJK>
-0xC3C8	0x880D	#<CJK>
-0xC3C9	0x87F9	#<CJK>
-0xC3CA	0x87FE	#<CJK>
-0xC3CB	0x8960	#<CJK>
-0xC3CC	0x895F	#<CJK>
-0xC3CD	0x8956	#<CJK>
-0xC3CE	0x895E	#<CJK>
-0xC3CF	0x8B41	#<CJK>
-0xC3D0	0x8B5C	#<CJK>
-0xC3D1	0x8B58	#<CJK>
-0xC3D2	0x8B49	#<CJK>
-0xC3D3	0x8B5A	#<CJK>
-0xC3D4	0x8B4E	#<CJK>
-0xC3D5	0x8B4F	#<CJK>
-0xC3D6	0x8B46	#<CJK>
-0xC3D7	0x8B59	#<CJK>
-0xC3D8	0x8D08	#<CJK>
-0xC3D9	0x8D0A	#<CJK>
-0xC3DA	0x8E7C	#<CJK>
-0xC3DB	0x8E72	#<CJK>
-0xC3DC	0x8E87	#<CJK>
-0xC3DD	0x8E76	#<CJK>
-0xC3DE	0x8E6C	#<CJK>
-0xC3DF	0x8E7A	#<CJK>
-0xC3E0	0x8E74	#<CJK>
-0xC3E1	0x8F54	#<CJK>
-0xC3E2	0x8F4E	#<CJK>
-0xC3E3	0x8FAD	#<CJK>
-0xC3E4	0x908A	#<CJK>
-0xC3E5	0x908B	#<CJK>
-0xC3E6	0x91B1	#<CJK>
-0xC3E7	0x91AE	#<CJK>
-0xC3E8	0x93E1	#<CJK>
-0xC3E9	0x93D1	#<CJK>
-0xC3EA	0x93DF	#<CJK>
-0xC3EB	0x93C3	#<CJK>
-0xC3EC	0x93C8	#<CJK>
-0xC3ED	0x93DC	#<CJK>
-0xC3EE	0x93DD	#<CJK>
-0xC3EF	0x93D6	#<CJK>
-0xC3F0	0x93E2	#<CJK>
-0xC3F1	0x93CD	#<CJK>
-0xC3F2	0x93D8	#<CJK>
-0xC3F3	0x93E4	#<CJK>
-0xC3F4	0x93D7	#<CJK>
-0xC3F5	0x93E8	#<CJK>
-0xC3F6	0x95DC	#<CJK>
-0xC3F7	0x96B4	#<CJK>
-0xC3F8	0x96E3	#<CJK>
-0xC3F9	0x972A	#<CJK>
-0xC3FA	0x9727	#<CJK>
-0xC3FB	0x9761	#<CJK>
-0xC3FC	0x97DC	#<CJK>
-0xC3FD	0x97FB	#<CJK>
-0xC3FE	0x985E	#<CJK>
-0xC440	0x9858	#<CJK>
-0xC441	0x985B	#<CJK>
-0xC442	0x98BC	#<CJK>
-0xC443	0x9945	#<CJK>
-0xC444	0x9949	#<CJK>
-0xC445	0x9A16	#<CJK>
-0xC446	0x9A19	#<CJK>
-0xC447	0x9B0D	#<CJK>
-0xC448	0x9BE8	#<CJK>
-0xC449	0x9BE7	#<CJK>
-0xC44A	0x9BD6	#<CJK>
-0xC44B	0x9BDB	#<CJK>
-0xC44C	0x9D89	#<CJK>
-0xC44D	0x9D61	#<CJK>
-0xC44E	0x9D72	#<CJK>
-0xC44F	0x9D6A	#<CJK>
-0xC450	0x9D6C	#<CJK>
-0xC451	0x9E92	#<CJK>
-0xC452	0x9E97	#<CJK>
-0xC453	0x9E93	#<CJK>
-0xC454	0x9EB4	#<CJK>
-0xC455	0x52F8	#<CJK>
-0xC456	0x56A8	#<CJK>
-0xC457	0x56B7	#<CJK>
-0xC458	0x56B6	#<CJK>
-0xC459	0x56B4	#<CJK>
-0xC45A	0x56BC	#<CJK>
-0xC45B	0x58E4	#<CJK>
-0xC45C	0x5B40	#<CJK>
-0xC45D	0x5B43	#<CJK>
-0xC45E	0x5B7D	#<CJK>
-0xC45F	0x5BF6	#<CJK>
-0xC460	0x5DC9	#<CJK>
-0xC461	0x61F8	#<CJK>
-0xC462	0x61FA	#<CJK>
-0xC463	0x6518	#<CJK>
-0xC464	0x6514	#<CJK>
-0xC465	0x6519	#<CJK>
-0xC466	0x66E6	#<CJK>
-0xC467	0x6727	#<CJK>
-0xC468	0x6AEC	#<CJK>
-0xC469	0x703E	#<CJK>
-0xC46A	0x7030	#<CJK>
-0xC46B	0x7032	#<CJK>
-0xC46C	0x7210	#<CJK>
-0xC46D	0x737B	#<CJK>
-0xC46E	0x74CF	#<CJK>
-0xC46F	0x7662	#<CJK>
-0xC470	0x7665	#<CJK>
-0xC471	0x7926	#<CJK>
-0xC472	0x792A	#<CJK>
-0xC473	0x792C	#<CJK>
-0xC474	0x792B	#<CJK>
-0xC475	0x7AC7	#<CJK>
-0xC476	0x7AF6	#<CJK>
-0xC477	0x7C4C	#<CJK>
-0xC478	0x7C43	#<CJK>
-0xC479	0x7C4D	#<CJK>
-0xC47A	0x7CEF	#<CJK>
-0xC47B	0x7CF0	#<CJK>
-0xC47C	0x8FAE	#<CJK>
-0xC47D	0x7E7D	#<CJK>
-0xC47E	0x7E7C	#<CJK>
-0xC4A1	0x7E82	#<CJK>
-0xC4A2	0x7F4C	#<CJK>
-0xC4A3	0x8000	#<CJK>
-0xC4A4	0x81DA	#<CJK>
-0xC4A5	0x8266	#<CJK>
-0xC4A6	0x85FB	#<CJK>
-0xC4A7	0x85F9	#<CJK>
-0xC4A8	0x8611	#<CJK>
-0xC4A9	0x85FA	#<CJK>
-0xC4AA	0x8606	#<CJK>
-0xC4AB	0x860B	#<CJK>
-0xC4AC	0x8607	#<CJK>
-0xC4AD	0x860A	#<CJK>
-0xC4AE	0x8814	#<CJK>
-0xC4AF	0x8815	#<CJK>
-0xC4B0	0x8964	#<CJK>
-0xC4B1	0x89BA	#<CJK>
-0xC4B2	0x89F8	#<CJK>
-0xC4B3	0x8B70	#<CJK>
-0xC4B4	0x8B6C	#<CJK>
-0xC4B5	0x8B66	#<CJK>
-0xC4B6	0x8B6F	#<CJK>
-0xC4B7	0x8B5F	#<CJK>
-0xC4B8	0x8B6B	#<CJK>
-0xC4B9	0x8D0F	#<CJK>
-0xC4BA	0x8D0D	#<CJK>
-0xC4BB	0x8E89	#<CJK>
-0xC4BC	0x8E81	#<CJK>
-0xC4BD	0x8E85	#<CJK>
-0xC4BE	0x8E82	#<CJK>
-0xC4BF	0x91B4	#<CJK>
-0xC4C0	0x91CB	#<CJK>
-0xC4C1	0x9418	#<CJK>
-0xC4C2	0x9403	#<CJK>
-0xC4C3	0x93FD	#<CJK>
-0xC4C4	0x95E1	#<CJK>
-0xC4C5	0x9730	#<CJK>
-0xC4C6	0x98C4	#<CJK>
-0xC4C7	0x9952	#<CJK>
-0xC4C8	0x9951	#<CJK>
-0xC4C9	0x99A8	#<CJK>
-0xC4CA	0x9A2B	#<CJK>
-0xC4CB	0x9A30	#<CJK>
-0xC4CC	0x9A37	#<CJK>
-0xC4CD	0x9A35	#<CJK>
-0xC4CE	0x9C13	#<CJK>
-0xC4CF	0x9C0D	#<CJK>
-0xC4D0	0x9E79	#<CJK>
-0xC4D1	0x9EB5	#<CJK>
-0xC4D2	0x9EE8	#<CJK>
-0xC4D3	0x9F2F	#<CJK>
-0xC4D4	0x9F5F	#<CJK>
-0xC4D5	0x9F63	#<CJK>
-0xC4D6	0x9F61	#<CJK>
-0xC4D7	0x5137	#<CJK>
-0xC4D8	0x5138	#<CJK>
-0xC4D9	0x56C1	#<CJK>
-0xC4DA	0x56C0	#<CJK>
-0xC4DB	0x56C2	#<CJK>
-0xC4DC	0x5914	#<CJK>
-0xC4DD	0x5C6C	#<CJK>
-0xC4DE	0x5DCD	#<CJK>
-0xC4DF	0x61FC	#<CJK>
-0xC4E0	0x61FE	#<CJK>
-0xC4E1	0x651D	#<CJK>
-0xC4E2	0x651C	#<CJK>
-0xC4E3	0x6595	#<CJK>
-0xC4E4	0x66E9	#<CJK>
-0xC4E5	0x6AFB	#<CJK>
-0xC4E6	0x6B04	#<CJK>
-0xC4E7	0x6AFA	#<CJK>
-0xC4E8	0x6BB2	#<CJK>
-0xC4E9	0x704C	#<CJK>
-0xC4EA	0x721B	#<CJK>
-0xC4EB	0x72A7	#<CJK>
-0xC4EC	0x74D6	#<CJK>
-0xC4ED	0x74D4	#<CJK>
-0xC4EE	0x7669	#<CJK>
-0xC4EF	0x77D3	#<CJK>
-0xC4F0	0x7C50	#<CJK>
-0xC4F1	0x7E8F	#<CJK>
-0xC4F2	0x7E8C	#<CJK>
-0xC4F3	0x7FBC	#<CJK>
-0xC4F4	0x8617	#<CJK>
-0xC4F5	0x862D	#<CJK>
-0xC4F6	0x861A	#<CJK>
-0xC4F7	0x8823	#<CJK>
-0xC4F8	0x8822	#<CJK>
-0xC4F9	0x8821	#<CJK>
-0xC4FA	0x881F	#<CJK>
-0xC4FB	0x896A	#<CJK>
-0xC4FC	0x896C	#<CJK>
-0xC4FD	0x89BD	#<CJK>
-0xC4FE	0x8B74	#<CJK>
-0xC540	0x8B77	#<CJK>
-0xC541	0x8B7D	#<CJK>
-0xC542	0x8D13	#<CJK>
-0xC543	0x8E8A	#<CJK>
-0xC544	0x8E8D	#<CJK>
-0xC545	0x8E8B	#<CJK>
-0xC546	0x8F5F	#<CJK>
-0xC547	0x8FAF	#<CJK>
-0xC548	0x91BA	#<CJK>
-0xC549	0x942E	#<CJK>
-0xC54A	0x9433	#<CJK>
-0xC54B	0x9435	#<CJK>
-0xC54C	0x943A	#<CJK>
-0xC54D	0x9438	#<CJK>
-0xC54E	0x9432	#<CJK>
-0xC54F	0x942B	#<CJK>
-0xC550	0x95E2	#<CJK>
-0xC551	0x9738	#<CJK>
-0xC552	0x9739	#<CJK>
-0xC553	0x9732	#<CJK>
-0xC554	0x97FF	#<CJK>
-0xC555	0x9867	#<CJK>
-0xC556	0x9865	#<CJK>
-0xC557	0x9957	#<CJK>
-0xC558	0x9A45	#<CJK>
-0xC559	0x9A43	#<CJK>
-0xC55A	0x9A40	#<CJK>
-0xC55B	0x9A3E	#<CJK>
-0xC55C	0x9ACF	#<CJK>
-0xC55D	0x9B54	#<CJK>
-0xC55E	0x9B51	#<CJK>
-0xC55F	0x9C2D	#<CJK>
-0xC560	0x9C25	#<CJK>
-0xC561	0x9DAF	#<CJK>
-0xC562	0x9DB4	#<CJK>
-0xC563	0x9DC2	#<CJK>
-0xC564	0x9DB8	#<CJK>
-0xC565	0x9E9D	#<CJK>
-0xC566	0x9EEF	#<CJK>
-0xC567	0x9F19	#<CJK>
-0xC568	0x9F5C	#<CJK>
-0xC569	0x9F66	#<CJK>
-0xC56A	0x9F67	#<CJK>
-0xC56B	0x513C	#<CJK>
-0xC56C	0x513B	#<CJK>
-0xC56D	0x56C8	#<CJK>
-0xC56E	0x56CA	#<CJK>
-0xC56F	0x56C9	#<CJK>
-0xC570	0x5B7F	#<CJK>
-0xC571	0x5DD4	#<CJK>
-0xC572	0x5DD2	#<CJK>
-0xC573	0x5F4E	#<CJK>
-0xC574	0x61FF	#<CJK>
-0xC575	0x6524	#<CJK>
-0xC576	0x6B0A	#<CJK>
-0xC577	0x6B61	#<CJK>
-0xC578	0x7051	#<CJK>
-0xC579	0x7058	#<CJK>
-0xC57A	0x7380	#<CJK>
-0xC57B	0x74E4	#<CJK>
-0xC57C	0x758A	#<CJK>
-0xC57D	0x766E	#<CJK>
-0xC57E	0x766C	#<CJK>
-0xC5A1	0x79B3	#<CJK>
-0xC5A2	0x7C60	#<CJK>
-0xC5A3	0x7C5F	#<CJK>
-0xC5A4	0x807E	#<CJK>
-0xC5A5	0x807D	#<CJK>
-0xC5A6	0x81DF	#<CJK>
-0xC5A7	0x8972	#<CJK>
-0xC5A8	0x896F	#<CJK>
-0xC5A9	0x89FC	#<CJK>
-0xC5AA	0x8B80	#<CJK>
-0xC5AB	0x8D16	#<CJK>
-0xC5AC	0x8D17	#<CJK>
-0xC5AD	0x8E91	#<CJK>
-0xC5AE	0x8E93	#<CJK>
-0xC5AF	0x8F61	#<CJK>
-0xC5B0	0x9148	#<CJK>
-0xC5B1	0x9444	#<CJK>
-0xC5B2	0x9451	#<CJK>
-0xC5B3	0x9452	#<CJK>
-0xC5B4	0x973D	#<CJK>
-0xC5B5	0x973E	#<CJK>
-0xC5B6	0x97C3	#<CJK>
-0xC5B7	0x97C1	#<CJK>
-0xC5B8	0x986B	#<CJK>
-0xC5B9	0x9955	#<CJK>
-0xC5BA	0x9A55	#<CJK>
-0xC5BB	0x9A4D	#<CJK>
-0xC5BC	0x9AD2	#<CJK>
-0xC5BD	0x9B1A	#<CJK>
-0xC5BE	0x9C49	#<CJK>
-0xC5BF	0x9C31	#<CJK>
-0xC5C0	0x9C3E	#<CJK>
-0xC5C1	0x9C3B	#<CJK>
-0xC5C2	0x9DD3	#<CJK>
-0xC5C3	0x9DD7	#<CJK>
-0xC5C4	0x9F34	#<CJK>
-0xC5C5	0x9F6C	#<CJK>
-0xC5C6	0x9F6A	#<CJK>
-0xC5C7	0x9F94	#<CJK>
-0xC5C8	0x56CC	#<CJK>
-0xC5C9	0x5DD6	#<CJK>
-0xC5CA	0x6200	#<CJK>
-0xC5CB	0x6523	#<CJK>
-0xC5CC	0x652B	#<CJK>
-0xC5CD	0x652A	#<CJK>
-0xC5CE	0x66EC	#<CJK>
-0xC5CF	0x6B10	#<CJK>
-0xC5D0	0x74DA	#<CJK>
-0xC5D1	0x7ACA	#<CJK>
-0xC5D2	0x7C64	#<CJK>
-0xC5D3	0x7C63	#<CJK>
-0xC5D4	0x7C65	#<CJK>
-0xC5D5	0x7E93	#<CJK>
-0xC5D6	0x7E96	#<CJK>
-0xC5D7	0x7E94	#<CJK>
-0xC5D8	0x81E2	#<CJK>
-0xC5D9	0x8638	#<CJK>
-0xC5DA	0x863F	#<CJK>
-0xC5DB	0x8831	#<CJK>
-0xC5DC	0x8B8A	#<CJK>
-0xC5DD	0x9090	#<CJK>
-0xC5DE	0x908F	#<CJK>
-0xC5DF	0x9463	#<CJK>
-0xC5E0	0x9460	#<CJK>
-0xC5E1	0x9464	#<CJK>
-0xC5E2	0x9768	#<CJK>
-0xC5E3	0x986F	#<CJK>
-0xC5E4	0x995C	#<CJK>
-0xC5E5	0x9A5A	#<CJK>
-0xC5E6	0x9A5B	#<CJK>
-0xC5E7	0x9A57	#<CJK>
-0xC5E8	0x9AD3	#<CJK>
-0xC5E9	0x9AD4	#<CJK>
-0xC5EA	0x9AD1	#<CJK>
-0xC5EB	0x9C54	#<CJK>
-0xC5EC	0x9C57	#<CJK>
-0xC5ED	0x9C56	#<CJK>
-0xC5EE	0x9DE5	#<CJK>
-0xC5EF	0x9E9F	#<CJK>
-0xC5F0	0x9EF4	#<CJK>
-0xC5F1	0x56D1	#<CJK>
-0xC5F2	0x58E9	#<CJK>
-0xC5F3	0x652C	#<CJK>
-0xC5F4	0x705E	#<CJK>
-0xC5F5	0x7671	#<CJK>
-0xC5F6	0x7672	#<CJK>
-0xC5F7	0x77D7	#<CJK>
-0xC5F8	0x7F50	#<CJK>
-0xC5F9	0x7F88	#<CJK>
-0xC5FA	0x8836	#<CJK>
-0xC5FB	0x8839	#<CJK>
-0xC5FC	0x8862	#<CJK>
-0xC5FD	0x8B93	#<CJK>
-0xC5FE	0x8B92	#<CJK>
-0xC640	0x8B96	#<CJK>
-0xC641	0x8277	#<CJK>
-0xC642	0x8D1B	#<CJK>
-0xC643	0x91C0	#<CJK>
-0xC644	0x946A	#<CJK>
-0xC645	0x9742	#<CJK>
-0xC646	0x9748	#<CJK>
-0xC647	0x9744	#<CJK>
-0xC648	0x97C6	#<CJK>
-0xC649	0x9870	#<CJK>
-0xC64A	0x9A5F	#<CJK>
-0xC64B	0x9B22	#<CJK>
-0xC64C	0x9B58	#<CJK>
-0xC64D	0x9C5F	#<CJK>
-0xC64E	0x9DF9	#<CJK>
-0xC64F	0x9DFA	#<CJK>
-0xC650	0x9E7C	#<CJK>
-0xC651	0x9E7D	#<CJK>
-0xC652	0x9F07	#<CJK>
-0xC653	0x9F77	#<CJK>
-0xC654	0x9F72	#<CJK>
-0xC655	0x5EF3	#<CJK>
-0xC656	0x6B16	#<CJK>
-0xC657	0x7063	#<CJK>
-0xC658	0x7C6C	#<CJK>
-0xC659	0x7C6E	#<CJK>
-0xC65A	0x883B	#<CJK>
-0xC65B	0x89C0	#<CJK>
-0xC65C	0x8EA1	#<CJK>
-0xC65D	0x91C1	#<CJK>
-0xC65E	0x9472	#<CJK>
-0xC65F	0x9470	#<CJK>
-0xC660	0x9871	#<CJK>
-0xC661	0x995E	#<CJK>
-0xC662	0x9AD6	#<CJK>
-0xC663	0x9B23	#<CJK>
-0xC664	0x9ECC	#<CJK>
-0xC665	0x7064	#<CJK>
-0xC666	0x77DA	#<CJK>
-0xC667	0x8B9A	#<CJK>
-0xC668	0x9477	#<CJK>
-0xC669	0x97C9	#<CJK>
-0xC66A	0x9A62	#<CJK>
-0xC66B	0x9A65	#<CJK>
-0xC66C	0x7E9C	#<CJK>
-0xC66D	0x8B9C	#<CJK>
-0xC66E	0x8EAA	#<CJK>
-0xC66F	0x91C5	#<CJK>
-0xC670	0x947D	#<CJK>
-0xC671	0x947E	#<CJK>
-0xC672	0x947C	#<CJK>
-0xC673	0x9C77	#<CJK>
-0xC674	0x9C78	#<CJK>
-0xC675	0x9EF7	#<CJK>
-0xC676	0x8C54	#<CJK>
-0xC677	0x947F	#<CJK>
-0xC678	0x9E1A	#<CJK>
-0xC679	0x7228	#<CJK>
-0xC67A	0x9A6A	#<CJK>
-0xC67B	0x9B31	#<CJK>
-0xC67C	0x9E1B	#<CJK>
-0xC67D	0x9E1E	#<CJK>
-0xC67E	0x7C72	#<CJK>
-0xC940	0x4E42	#<CJK>
-0xC941	0x4E5C	#<CJK>
-0xC942	0x51F5	#<CJK>
-0xC943	0x531A	#<CJK>
-0xC944	0x5382	#<CJK>
-0xC945	0x4E07	#<CJK>
-0xC946	0x4E0C	#<CJK>
-0xC947	0x4E47	#<CJK>
-0xC948	0x4E8D	#<CJK>
-0xC949	0x56D7	#<CJK>
-0xC94A	0xFA0C	#<CJK>
-0xC94B	0x5C6E	#<CJK>
-0xC94C	0x5F73	#<CJK>
-0xC94D	0x4E0F	#<CJK>
-0xC94E	0x5187	#<CJK>
-0xC94F	0x4E0E	#<CJK>
-0xC950	0x4E2E	#<CJK>
-0xC951	0x4E93	#<CJK>
-0xC952	0x4EC2	#<CJK>
-0xC953	0x4EC9	#<CJK>
-0xC954	0x4EC8	#<CJK>
-0xC955	0x5198	#<CJK>
-0xC956	0x52FC	#<CJK>
-0xC957	0x536C	#<CJK>
-0xC958	0x53B9	#<CJK>
-0xC959	0x5720	#<CJK>
-0xC95A	0x5903	#<CJK>
-0xC95B	0x592C	#<CJK>
-0xC95C	0x5C10	#<CJK>
-0xC95D	0x5DFF	#<CJK>
-0xC95E	0x65E1	#<CJK>
-0xC95F	0x6BB3	#<CJK>
-0xC960	0x6BCC	#<CJK>
-0xC961	0x6C14	#<CJK>
-0xC962	0x723F	#<CJK>
-0xC963	0x4E31	#<CJK>
-0xC964	0x4E3C	#<CJK>
-0xC965	0x4EE8	#<CJK>
-0xC966	0x4EDC	#<CJK>
-0xC967	0x4EE9	#<CJK>
-0xC968	0x4EE1	#<CJK>
-0xC969	0x4EDD	#<CJK>
-0xC96A	0x4EDA	#<CJK>
-0xC96B	0x520C	#<CJK>
-0xC96C	0x531C	#<CJK>
-0xC96D	0x534C	#<CJK>
-0xC96E	0x5722	#<CJK>
-0xC96F	0x5723	#<CJK>
-0xC970	0x5917	#<CJK>
-0xC971	0x592F	#<CJK>
-0xC972	0x5B81	#<CJK>
-0xC973	0x5B84	#<CJK>
-0xC974	0x5C12	#<CJK>
-0xC975	0x5C3B	#<CJK>
-0xC976	0x5C74	#<CJK>
-0xC977	0x5C73	#<CJK>
-0xC978	0x5E04	#<CJK>
-0xC979	0x5E80	#<CJK>
-0xC97A	0x5E82	#<CJK>
-0xC97B	0x5FC9	#<CJK>
-0xC97C	0x6209	#<CJK>
-0xC97D	0x6250	#<CJK>
-0xC97E	0x6C15	#<CJK>
-0xC9A1	0x6C36	#<CJK>
-0xC9A2	0x6C43	#<CJK>
-0xC9A3	0x6C3F	#<CJK>
-0xC9A4	0x6C3B	#<CJK>
-0xC9A5	0x72AE	#<CJK>
-0xC9A6	0x72B0	#<CJK>
-0xC9A7	0x738A	#<CJK>
-0xC9A8	0x79B8	#<CJK>
-0xC9A9	0x808A	#<CJK>
-0xC9AA	0x961E	#<CJK>
-0xC9AB	0x4F0E	#<CJK>
-0xC9AC	0x4F18	#<CJK>
-0xC9AD	0x4F2C	#<CJK>
-0xC9AE	0x4EF5	#<CJK>
-0xC9AF	0x4F14	#<CJK>
-0xC9B0	0x4EF1	#<CJK>
-0xC9B1	0x4F00	#<CJK>
-0xC9B2	0x4EF7	#<CJK>
-0xC9B3	0x4F08	#<CJK>
-0xC9B4	0x4F1D	#<CJK>
-0xC9B5	0x4F02	#<CJK>
-0xC9B6	0x4F05	#<CJK>
-0xC9B7	0x4F22	#<CJK>
-0xC9B8	0x4F13	#<CJK>
-0xC9B9	0x4F04	#<CJK>
-0xC9BA	0x4EF4	#<CJK>
-0xC9BB	0x4F12	#<CJK>
-0xC9BC	0x51B1	#<CJK>
-0xC9BD	0x5213	#<CJK>
-0xC9BE	0x5209	#<CJK>
-0xC9BF	0x5210	#<CJK>
-0xC9C0	0x52A6	#<CJK>
-0xC9C1	0x5322	#<CJK>
-0xC9C2	0x531F	#<CJK>
-0xC9C3	0x534D	#<CJK>
-0xC9C4	0x538A	#<CJK>
-0xC9C5	0x5407	#<CJK>
-0xC9C6	0x56E1	#<CJK>
-0xC9C7	0x56DF	#<CJK>
-0xC9C8	0x572E	#<CJK>
-0xC9C9	0x572A	#<CJK>
-0xC9CA	0x5734	#<CJK>
-0xC9CB	0x593C	#<CJK>
-0xC9CC	0x5980	#<CJK>
-0xC9CD	0x597C	#<CJK>
-0xC9CE	0x5985	#<CJK>
-0xC9CF	0x597B	#<CJK>
-0xC9D0	0x597E	#<CJK>
-0xC9D1	0x5977	#<CJK>
-0xC9D2	0x597F	#<CJK>
-0xC9D3	0x5B56	#<CJK>
-0xC9D4	0x5C15	#<CJK>
-0xC9D5	0x5C25	#<CJK>
-0xC9D6	0x5C7C	#<CJK>
-0xC9D7	0x5C7A	#<CJK>
-0xC9D8	0x5C7B	#<CJK>
-0xC9D9	0x5C7E	#<CJK>
-0xC9DA	0x5DDF	#<CJK>
-0xC9DB	0x5E75	#<CJK>
-0xC9DC	0x5E84	#<CJK>
-0xC9DD	0x5F02	#<CJK>
-0xC9DE	0x5F1A	#<CJK>
-0xC9DF	0x5F74	#<CJK>
-0xC9E0	0x5FD5	#<CJK>
-0xC9E1	0x5FD4	#<CJK>
-0xC9E2	0x5FCF	#<CJK>
-0xC9E3	0x625C	#<CJK>
-0xC9E4	0x625E	#<CJK>
-0xC9E5	0x6264	#<CJK>
-0xC9E6	0x6261	#<CJK>
-0xC9E7	0x6266	#<CJK>
-0xC9E8	0x6262	#<CJK>
-0xC9E9	0x6259	#<CJK>
-0xC9EA	0x6260	#<CJK>
-0xC9EB	0x625A	#<CJK>
-0xC9EC	0x6265	#<CJK>
-0xC9ED	0x65EF	#<CJK>
-0xC9EE	0x65EE	#<CJK>
-0xC9EF	0x673E	#<CJK>
-0xC9F0	0x6739	#<CJK>
-0xC9F1	0x6738	#<CJK>
-0xC9F2	0x673B	#<CJK>
-0xC9F3	0x673A	#<CJK>
-0xC9F4	0x673F	#<CJK>
-0xC9F5	0x673C	#<CJK>
-0xC9F6	0x6733	#<CJK>
-0xC9F7	0x6C18	#<CJK>
-0xC9F8	0x6C46	#<CJK>
-0xC9F9	0x6C52	#<CJK>
-0xC9FA	0x6C5C	#<CJK>
-0xC9FB	0x6C4F	#<CJK>
-0xC9FC	0x6C4A	#<CJK>
-0xC9FD	0x6C54	#<CJK>
-0xC9FE	0x6C4B	#<CJK>
-0xCA40	0x6C4C	#<CJK>
-0xCA41	0x7071	#<CJK>
-0xCA42	0x725E	#<CJK>
-0xCA43	0x72B4	#<CJK>
-0xCA44	0x72B5	#<CJK>
-0xCA45	0x738E	#<CJK>
-0xCA46	0x752A	#<CJK>
-0xCA47	0x767F	#<CJK>
-0xCA48	0x7A75	#<CJK>
-0xCA49	0x7F51	#<CJK>
-0xCA4A	0x8278	#<CJK>
-0xCA4B	0x827C	#<CJK>
-0xCA4C	0x8280	#<CJK>
-0xCA4D	0x827D	#<CJK>
-0xCA4E	0x827F	#<CJK>
-0xCA4F	0x864D	#<CJK>
-0xCA50	0x897E	#<CJK>
-0xCA51	0x9099	#<CJK>
-0xCA52	0x9097	#<CJK>
-0xCA53	0x9098	#<CJK>
-0xCA54	0x909B	#<CJK>
-0xCA55	0x9094	#<CJK>
-0xCA56	0x9622	#<CJK>
-0xCA57	0x9624	#<CJK>
-0xCA58	0x9620	#<CJK>
-0xCA59	0x9623	#<CJK>
-0xCA5A	0x4F56	#<CJK>
-0xCA5B	0x4F3B	#<CJK>
-0xCA5C	0x4F62	#<CJK>
-0xCA5D	0x4F49	#<CJK>
-0xCA5E	0x4F53	#<CJK>
-0xCA5F	0x4F64	#<CJK>
-0xCA60	0x4F3E	#<CJK>
-0xCA61	0x4F67	#<CJK>
-0xCA62	0x4F52	#<CJK>
-0xCA63	0x4F5F	#<CJK>
-0xCA64	0x4F41	#<CJK>
-0xCA65	0x4F58	#<CJK>
-0xCA66	0x4F2D	#<CJK>
-0xCA67	0x4F33	#<CJK>
-0xCA68	0x4F3F	#<CJK>
-0xCA69	0x4F61	#<CJK>
-0xCA6A	0x518F	#<CJK>
-0xCA6B	0x51B9	#<CJK>
-0xCA6C	0x521C	#<CJK>
-0xCA6D	0x521E	#<CJK>
-0xCA6E	0x5221	#<CJK>
-0xCA6F	0x52AD	#<CJK>
-0xCA70	0x52AE	#<CJK>
-0xCA71	0x5309	#<CJK>
-0xCA72	0x5363	#<CJK>
-0xCA73	0x5372	#<CJK>
-0xCA74	0x538E	#<CJK>
-0xCA75	0x538F	#<CJK>
-0xCA76	0x5430	#<CJK>
-0xCA77	0x5437	#<CJK>
-0xCA78	0x542A	#<CJK>
-0xCA79	0x5454	#<CJK>
-0xCA7A	0x5445	#<CJK>
-0xCA7B	0x5419	#<CJK>
-0xCA7C	0x541C	#<CJK>
-0xCA7D	0x5425	#<CJK>
-0xCA7E	0x5418	#<CJK>
-0xCAA1	0x543D	#<CJK>
-0xCAA2	0x544F	#<CJK>
-0xCAA3	0x5441	#<CJK>
-0xCAA4	0x5428	#<CJK>
-0xCAA5	0x5424	#<CJK>
-0xCAA6	0x5447	#<CJK>
-0xCAA7	0x56EE	#<CJK>
-0xCAA8	0x56E7	#<CJK>
-0xCAA9	0x56E5	#<CJK>
-0xCAAA	0x5741	#<CJK>
-0xCAAB	0x5745	#<CJK>
-0xCAAC	0x574C	#<CJK>
-0xCAAD	0x5749	#<CJK>
-0xCAAE	0x574B	#<CJK>
-0xCAAF	0x5752	#<CJK>
-0xCAB0	0x5906	#<CJK>
-0xCAB1	0x5940	#<CJK>
-0xCAB2	0x59A6	#<CJK>
-0xCAB3	0x5998	#<CJK>
-0xCAB4	0x59A0	#<CJK>
-0xCAB5	0x5997	#<CJK>
-0xCAB6	0x598E	#<CJK>
-0xCAB7	0x59A2	#<CJK>
-0xCAB8	0x5990	#<CJK>
-0xCAB9	0x598F	#<CJK>
-0xCABA	0x59A7	#<CJK>
-0xCABB	0x59A1	#<CJK>
-0xCABC	0x5B8E	#<CJK>
-0xCABD	0x5B92	#<CJK>
-0xCABE	0x5C28	#<CJK>
-0xCABF	0x5C2A	#<CJK>
-0xCAC0	0x5C8D	#<CJK>
-0xCAC1	0x5C8F	#<CJK>
-0xCAC2	0x5C88	#<CJK>
-0xCAC3	0x5C8B	#<CJK>
-0xCAC4	0x5C89	#<CJK>
-0xCAC5	0x5C92	#<CJK>
-0xCAC6	0x5C8A	#<CJK>
-0xCAC7	0x5C86	#<CJK>
-0xCAC8	0x5C93	#<CJK>
-0xCAC9	0x5C95	#<CJK>
-0xCACA	0x5DE0	#<CJK>
-0xCACB	0x5E0A	#<CJK>
-0xCACC	0x5E0E	#<CJK>
-0xCACD	0x5E8B	#<CJK>
-0xCACE	0x5E89	#<CJK>
-0xCACF	0x5E8C	#<CJK>
-0xCAD0	0x5E88	#<CJK>
-0xCAD1	0x5E8D	#<CJK>
-0xCAD2	0x5F05	#<CJK>
-0xCAD3	0x5F1D	#<CJK>
-0xCAD4	0x5F78	#<CJK>
-0xCAD5	0x5F76	#<CJK>
-0xCAD6	0x5FD2	#<CJK>
-0xCAD7	0x5FD1	#<CJK>
-0xCAD8	0x5FD0	#<CJK>
-0xCAD9	0x5FED	#<CJK>
-0xCADA	0x5FE8	#<CJK>
-0xCADB	0x5FEE	#<CJK>
-0xCADC	0x5FF3	#<CJK>
-0xCADD	0x5FE1	#<CJK>
-0xCADE	0x5FE4	#<CJK>
-0xCADF	0x5FE3	#<CJK>
-0xCAE0	0x5FFA	#<CJK>
-0xCAE1	0x5FEF	#<CJK>
-0xCAE2	0x5FF7	#<CJK>
-0xCAE3	0x5FFB	#<CJK>
-0xCAE4	0x6000	#<CJK>
-0xCAE5	0x5FF4	#<CJK>
-0xCAE6	0x623A	#<CJK>
-0xCAE7	0x6283	#<CJK>
-0xCAE8	0x628C	#<CJK>
-0xCAE9	0x628E	#<CJK>
-0xCAEA	0x628F	#<CJK>
-0xCAEB	0x6294	#<CJK>
-0xCAEC	0x6287	#<CJK>
-0xCAED	0x6271	#<CJK>
-0xCAEE	0x627B	#<CJK>
-0xCAEF	0x627A	#<CJK>
-0xCAF0	0x6270	#<CJK>
-0xCAF1	0x6281	#<CJK>
-0xCAF2	0x6288	#<CJK>
-0xCAF3	0x6277	#<CJK>
-0xCAF4	0x627D	#<CJK>
-0xCAF5	0x6272	#<CJK>
-0xCAF6	0x6274	#<CJK>
-0xCAF7	0x6537	#<CJK>
-0xCAF8	0x65F0	#<CJK>
-0xCAF9	0x65F4	#<CJK>
-0xCAFA	0x65F3	#<CJK>
-0xCAFB	0x65F2	#<CJK>
-0xCAFC	0x65F5	#<CJK>
-0xCAFD	0x6745	#<CJK>
-0xCAFE	0x6747	#<CJK>
-0xCB40	0x6759	#<CJK>
-0xCB41	0x6755	#<CJK>
-0xCB42	0x674C	#<CJK>
-0xCB43	0x6748	#<CJK>
-0xCB44	0x675D	#<CJK>
-0xCB45	0x674D	#<CJK>
-0xCB46	0x675A	#<CJK>
-0xCB47	0x674B	#<CJK>
-0xCB48	0x6BD0	#<CJK>
-0xCB49	0x6C19	#<CJK>
-0xCB4A	0x6C1A	#<CJK>
-0xCB4B	0x6C78	#<CJK>
-0xCB4C	0x6C67	#<CJK>
-0xCB4D	0x6C6B	#<CJK>
-0xCB4E	0x6C84	#<CJK>
-0xCB4F	0x6C8B	#<CJK>
-0xCB50	0x6C8F	#<CJK>
-0xCB51	0x6C71	#<CJK>
-0xCB52	0x6C6F	#<CJK>
-0xCB53	0x6C69	#<CJK>
-0xCB54	0x6C9A	#<CJK>
-0xCB55	0x6C6D	#<CJK>
-0xCB56	0x6C87	#<CJK>
-0xCB57	0x6C95	#<CJK>
-0xCB58	0x6C9C	#<CJK>
-0xCB59	0x6C66	#<CJK>
-0xCB5A	0x6C73	#<CJK>
-0xCB5B	0x6C65	#<CJK>
-0xCB5C	0x6C7B	#<CJK>
-0xCB5D	0x6C8E	#<CJK>
-0xCB5E	0x7074	#<CJK>
-0xCB5F	0x707A	#<CJK>
-0xCB60	0x7263	#<CJK>
-0xCB61	0x72BF	#<CJK>
-0xCB62	0x72BD	#<CJK>
-0xCB63	0x72C3	#<CJK>
-0xCB64	0x72C6	#<CJK>
-0xCB65	0x72C1	#<CJK>
-0xCB66	0x72BA	#<CJK>
-0xCB67	0x72C5	#<CJK>
-0xCB68	0x7395	#<CJK>
-0xCB69	0x7397	#<CJK>
-0xCB6A	0x7393	#<CJK>
-0xCB6B	0x7394	#<CJK>
-0xCB6C	0x7392	#<CJK>
-0xCB6D	0x753A	#<CJK>
-0xCB6E	0x7539	#<CJK>
-0xCB6F	0x7594	#<CJK>
-0xCB70	0x7595	#<CJK>
-0xCB71	0x7681	#<CJK>
-0xCB72	0x793D	#<CJK>
-0xCB73	0x8034	#<CJK>
-0xCB74	0x8095	#<CJK>
-0xCB75	0x8099	#<CJK>
-0xCB76	0x8090	#<CJK>
-0xCB77	0x8092	#<CJK>
-0xCB78	0x809C	#<CJK>
-0xCB79	0x8290	#<CJK>
-0xCB7A	0x828F	#<CJK>
-0xCB7B	0x8285	#<CJK>
-0xCB7C	0x828E	#<CJK>
-0xCB7D	0x8291	#<CJK>
-0xCB7E	0x8293	#<CJK>
-0xCBA1	0x828A	#<CJK>
-0xCBA2	0x8283	#<CJK>
-0xCBA3	0x8284	#<CJK>
-0xCBA4	0x8C78	#<CJK>
-0xCBA5	0x8FC9	#<CJK>
-0xCBA6	0x8FBF	#<CJK>
-0xCBA7	0x909F	#<CJK>
-0xCBA8	0x90A1	#<CJK>
-0xCBA9	0x90A5	#<CJK>
-0xCBAA	0x909E	#<CJK>
-0xCBAB	0x90A7	#<CJK>
-0xCBAC	0x90A0	#<CJK>
-0xCBAD	0x9630	#<CJK>
-0xCBAE	0x9628	#<CJK>
-0xCBAF	0x962F	#<CJK>
-0xCBB0	0x962D	#<CJK>
-0xCBB1	0x4E33	#<CJK>
-0xCBB2	0x4F98	#<CJK>
-0xCBB3	0x4F7C	#<CJK>
-0xCBB4	0x4F85	#<CJK>
-0xCBB5	0x4F7D	#<CJK>
-0xCBB6	0x4F80	#<CJK>
-0xCBB7	0x4F87	#<CJK>
-0xCBB8	0x4F76	#<CJK>
-0xCBB9	0x4F74	#<CJK>
-0xCBBA	0x4F89	#<CJK>
-0xCBBB	0x4F84	#<CJK>
-0xCBBC	0x4F77	#<CJK>
-0xCBBD	0x4F4C	#<CJK>
-0xCBBE	0x4F97	#<CJK>
-0xCBBF	0x4F6A	#<CJK>
-0xCBC0	0x4F9A	#<CJK>
-0xCBC1	0x4F79	#<CJK>
-0xCBC2	0x4F81	#<CJK>
-0xCBC3	0x4F78	#<CJK>
-0xCBC4	0x4F90	#<CJK>
-0xCBC5	0x4F9C	#<CJK>
-0xCBC6	0x4F94	#<CJK>
-0xCBC7	0x4F9E	#<CJK>
-0xCBC8	0x4F92	#<CJK>
-0xCBC9	0x4F82	#<CJK>
-0xCBCA	0x4F95	#<CJK>
-0xCBCB	0x4F6B	#<CJK>
-0xCBCC	0x4F6E	#<CJK>
-0xCBCD	0x519E	#<CJK>
-0xCBCE	0x51BC	#<CJK>
-0xCBCF	0x51BE	#<CJK>
-0xCBD0	0x5235	#<CJK>
-0xCBD1	0x5232	#<CJK>
-0xCBD2	0x5233	#<CJK>
-0xCBD3	0x5246	#<CJK>
-0xCBD4	0x5231	#<CJK>
-0xCBD5	0x52BC	#<CJK>
-0xCBD6	0x530A	#<CJK>
-0xCBD7	0x530B	#<CJK>
-0xCBD8	0x533C	#<CJK>
-0xCBD9	0x5392	#<CJK>
-0xCBDA	0x5394	#<CJK>
-0xCBDB	0x5487	#<CJK>
-0xCBDC	0x547F	#<CJK>
-0xCBDD	0x5481	#<CJK>
-0xCBDE	0x5491	#<CJK>
-0xCBDF	0x5482	#<CJK>
-0xCBE0	0x5488	#<CJK>
-0xCBE1	0x546B	#<CJK>
-0xCBE2	0x547A	#<CJK>
-0xCBE3	0x547E	#<CJK>
-0xCBE4	0x5465	#<CJK>
-0xCBE5	0x546C	#<CJK>
-0xCBE6	0x5474	#<CJK>
-0xCBE7	0x5466	#<CJK>
-0xCBE8	0x548D	#<CJK>
-0xCBE9	0x546F	#<CJK>
-0xCBEA	0x5461	#<CJK>
-0xCBEB	0x5460	#<CJK>
-0xCBEC	0x5498	#<CJK>
-0xCBED	0x5463	#<CJK>
-0xCBEE	0x5467	#<CJK>
-0xCBEF	0x5464	#<CJK>
-0xCBF0	0x56F7	#<CJK>
-0xCBF1	0x56F9	#<CJK>
-0xCBF2	0x576F	#<CJK>
-0xCBF3	0x5772	#<CJK>
-0xCBF4	0x576D	#<CJK>
-0xCBF5	0x576B	#<CJK>
-0xCBF6	0x5771	#<CJK>
-0xCBF7	0x5770	#<CJK>
-0xCBF8	0x5776	#<CJK>
-0xCBF9	0x5780	#<CJK>
-0xCBFA	0x5775	#<CJK>
-0xCBFB	0x577B	#<CJK>
-0xCBFC	0x5773	#<CJK>
-0xCBFD	0x5774	#<CJK>
-0xCBFE	0x5762	#<CJK>
-0xCC40	0x5768	#<CJK>
-0xCC41	0x577D	#<CJK>
-0xCC42	0x590C	#<CJK>
-0xCC43	0x5945	#<CJK>
-0xCC44	0x59B5	#<CJK>
-0xCC45	0x59BA	#<CJK>
-0xCC46	0x59CF	#<CJK>
-0xCC47	0x59CE	#<CJK>
-0xCC48	0x59B2	#<CJK>
-0xCC49	0x59CC	#<CJK>
-0xCC4A	0x59C1	#<CJK>
-0xCC4B	0x59B6	#<CJK>
-0xCC4C	0x59BC	#<CJK>
-0xCC4D	0x59C3	#<CJK>
-0xCC4E	0x59D6	#<CJK>
-0xCC4F	0x59B1	#<CJK>
-0xCC50	0x59BD	#<CJK>
-0xCC51	0x59C0	#<CJK>
-0xCC52	0x59C8	#<CJK>
-0xCC53	0x59B4	#<CJK>
-0xCC54	0x59C7	#<CJK>
-0xCC55	0x5B62	#<CJK>
-0xCC56	0x5B65	#<CJK>
-0xCC57	0x5B93	#<CJK>
-0xCC58	0x5B95	#<CJK>
-0xCC59	0x5C44	#<CJK>
-0xCC5A	0x5C47	#<CJK>
-0xCC5B	0x5CAE	#<CJK>
-0xCC5C	0x5CA4	#<CJK>
-0xCC5D	0x5CA0	#<CJK>
-0xCC5E	0x5CB5	#<CJK>
-0xCC5F	0x5CAF	#<CJK>
-0xCC60	0x5CA8	#<CJK>
-0xCC61	0x5CAC	#<CJK>
-0xCC62	0x5C9F	#<CJK>
-0xCC63	0x5CA3	#<CJK>
-0xCC64	0x5CAD	#<CJK>
-0xCC65	0x5CA2	#<CJK>
-0xCC66	0x5CAA	#<CJK>
-0xCC67	0x5CA7	#<CJK>
-0xCC68	0x5C9D	#<CJK>
-0xCC69	0x5CA5	#<CJK>
-0xCC6A	0x5CB6	#<CJK>
-0xCC6B	0x5CB0	#<CJK>
-0xCC6C	0x5CA6	#<CJK>
-0xCC6D	0x5E17	#<CJK>
-0xCC6E	0x5E14	#<CJK>
-0xCC6F	0x5E19	#<CJK>
-0xCC70	0x5F28	#<CJK>
-0xCC71	0x5F22	#<CJK>
-0xCC72	0x5F23	#<CJK>
-0xCC73	0x5F24	#<CJK>
-0xCC74	0x5F54	#<CJK>
-0xCC75	0x5F82	#<CJK>
-0xCC76	0x5F7E	#<CJK>
-0xCC77	0x5F7D	#<CJK>
-0xCC78	0x5FDE	#<CJK>
-0xCC79	0x5FE5	#<CJK>
-0xCC7A	0x602D	#<CJK>
-0xCC7B	0x6026	#<CJK>
-0xCC7C	0x6019	#<CJK>
-0xCC7D	0x6032	#<CJK>
-0xCC7E	0x600B	#<CJK>
-0xCCA1	0x6034	#<CJK>
-0xCCA2	0x600A	#<CJK>
-0xCCA3	0x6017	#<CJK>
-0xCCA4	0x6033	#<CJK>
-0xCCA5	0x601A	#<CJK>
-0xCCA6	0x601E	#<CJK>
-0xCCA7	0x602C	#<CJK>
-0xCCA8	0x6022	#<CJK>
-0xCCA9	0x600D	#<CJK>
-0xCCAA	0x6010	#<CJK>
-0xCCAB	0x602E	#<CJK>
-0xCCAC	0x6013	#<CJK>
-0xCCAD	0x6011	#<CJK>
-0xCCAE	0x600C	#<CJK>
-0xCCAF	0x6009	#<CJK>
-0xCCB0	0x601C	#<CJK>
-0xCCB1	0x6214	#<CJK>
-0xCCB2	0x623D	#<CJK>
-0xCCB3	0x62AD	#<CJK>
-0xCCB4	0x62B4	#<CJK>
-0xCCB5	0x62D1	#<CJK>
-0xCCB6	0x62BE	#<CJK>
-0xCCB7	0x62AA	#<CJK>
-0xCCB8	0x62B6	#<CJK>
-0xCCB9	0x62CA	#<CJK>
-0xCCBA	0x62AE	#<CJK>
-0xCCBB	0x62B3	#<CJK>
-0xCCBC	0x62AF	#<CJK>
-0xCCBD	0x62BB	#<CJK>
-0xCCBE	0x62A9	#<CJK>
-0xCCBF	0x62B0	#<CJK>
-0xCCC0	0x62B8	#<CJK>
-0xCCC1	0x653D	#<CJK>
-0xCCC2	0x65A8	#<CJK>
-0xCCC3	0x65BB	#<CJK>
-0xCCC4	0x6609	#<CJK>
-0xCCC5	0x65FC	#<CJK>
-0xCCC6	0x6604	#<CJK>
-0xCCC7	0x6612	#<CJK>
-0xCCC8	0x6608	#<CJK>
-0xCCC9	0x65FB	#<CJK>
-0xCCCA	0x6603	#<CJK>
-0xCCCB	0x660B	#<CJK>
-0xCCCC	0x660D	#<CJK>
-0xCCCD	0x6605	#<CJK>
-0xCCCE	0x65FD	#<CJK>
-0xCCCF	0x6611	#<CJK>
-0xCCD0	0x6610	#<CJK>
-0xCCD1	0x66F6	#<CJK>
-0xCCD2	0x670A	#<CJK>
-0xCCD3	0x6785	#<CJK>
-0xCCD4	0x676C	#<CJK>
-0xCCD5	0x678E	#<CJK>
-0xCCD6	0x6792	#<CJK>
-0xCCD7	0x6776	#<CJK>
-0xCCD8	0x677B	#<CJK>
-0xCCD9	0x6798	#<CJK>
-0xCCDA	0x6786	#<CJK>
-0xCCDB	0x6784	#<CJK>
-0xCCDC	0x6774	#<CJK>
-0xCCDD	0x678D	#<CJK>
-0xCCDE	0x678C	#<CJK>
-0xCCDF	0x677A	#<CJK>
-0xCCE0	0x679F	#<CJK>
-0xCCE1	0x6791	#<CJK>
-0xCCE2	0x6799	#<CJK>
-0xCCE3	0x6783	#<CJK>
-0xCCE4	0x677D	#<CJK>
-0xCCE5	0x6781	#<CJK>
-0xCCE6	0x6778	#<CJK>
-0xCCE7	0x6779	#<CJK>
-0xCCE8	0x6794	#<CJK>
-0xCCE9	0x6B25	#<CJK>
-0xCCEA	0x6B80	#<CJK>
-0xCCEB	0x6B7E	#<CJK>
-0xCCEC	0x6BDE	#<CJK>
-0xCCED	0x6C1D	#<CJK>
-0xCCEE	0x6C93	#<CJK>
-0xCCEF	0x6CEC	#<CJK>
-0xCCF0	0x6CEB	#<CJK>
-0xCCF1	0x6CEE	#<CJK>
-0xCCF2	0x6CD9	#<CJK>
-0xCCF3	0x6CB6	#<CJK>
-0xCCF4	0x6CD4	#<CJK>
-0xCCF5	0x6CAD	#<CJK>
-0xCCF6	0x6CE7	#<CJK>
-0xCCF7	0x6CB7	#<CJK>
-0xCCF8	0x6CD0	#<CJK>
-0xCCF9	0x6CC2	#<CJK>
-0xCCFA	0x6CBA	#<CJK>
-0xCCFB	0x6CC3	#<CJK>
-0xCCFC	0x6CC6	#<CJK>
-0xCCFD	0x6CED	#<CJK>
-0xCCFE	0x6CF2	#<CJK>
-0xCD40	0x6CD2	#<CJK>
-0xCD41	0x6CDD	#<CJK>
-0xCD42	0x6CB4	#<CJK>
-0xCD43	0x6C8A	#<CJK>
-0xCD44	0x6C9D	#<CJK>
-0xCD45	0x6C80	#<CJK>
-0xCD46	0x6CDE	#<CJK>
-0xCD47	0x6CC0	#<CJK>
-0xCD48	0x6D30	#<CJK>
-0xCD49	0x6CCD	#<CJK>
-0xCD4A	0x6CC7	#<CJK>
-0xCD4B	0x6CB0	#<CJK>
-0xCD4C	0x6CF9	#<CJK>
-0xCD4D	0x6CCF	#<CJK>
-0xCD4E	0x6CE9	#<CJK>
-0xCD4F	0x6CD1	#<CJK>
-0xCD50	0x7094	#<CJK>
-0xCD51	0x7098	#<CJK>
-0xCD52	0x7085	#<CJK>
-0xCD53	0x7093	#<CJK>
-0xCD54	0x7086	#<CJK>
-0xCD55	0x7084	#<CJK>
-0xCD56	0x7091	#<CJK>
-0xCD57	0x7096	#<CJK>
-0xCD58	0x7082	#<CJK>
-0xCD59	0x709A	#<CJK>
-0xCD5A	0x7083	#<CJK>
-0xCD5B	0x726A	#<CJK>
-0xCD5C	0x72D6	#<CJK>
-0xCD5D	0x72CB	#<CJK>
-0xCD5E	0x72D8	#<CJK>
-0xCD5F	0x72C9	#<CJK>
-0xCD60	0x72DC	#<CJK>
-0xCD61	0x72D2	#<CJK>
-0xCD62	0x72D4	#<CJK>
-0xCD63	0x72DA	#<CJK>
-0xCD64	0x72CC	#<CJK>
-0xCD65	0x72D1	#<CJK>
-0xCD66	0x73A4	#<CJK>
-0xCD67	0x73A1	#<CJK>
-0xCD68	0x73AD	#<CJK>
-0xCD69	0x73A6	#<CJK>
-0xCD6A	0x73A2	#<CJK>
-0xCD6B	0x73A0	#<CJK>
-0xCD6C	0x73AC	#<CJK>
-0xCD6D	0x739D	#<CJK>
-0xCD6E	0x74DD	#<CJK>
-0xCD6F	0x74E8	#<CJK>
-0xCD70	0x753F	#<CJK>
-0xCD71	0x7540	#<CJK>
-0xCD72	0x753E	#<CJK>
-0xCD73	0x758C	#<CJK>
-0xCD74	0x7598	#<CJK>
-0xCD75	0x76AF	#<CJK>
-0xCD76	0x76F3	#<CJK>
-0xCD77	0x76F1	#<CJK>
-0xCD78	0x76F0	#<CJK>
-0xCD79	0x76F5	#<CJK>
-0xCD7A	0x77F8	#<CJK>
-0xCD7B	0x77FC	#<CJK>
-0xCD7C	0x77F9	#<CJK>
-0xCD7D	0x77FB	#<CJK>
-0xCD7E	0x77FA	#<CJK>
-0xCDA1	0x77F7	#<CJK>
-0xCDA2	0x7942	#<CJK>
-0xCDA3	0x793F	#<CJK>
-0xCDA4	0x79C5	#<CJK>
-0xCDA5	0x7A78	#<CJK>
-0xCDA6	0x7A7B	#<CJK>
-0xCDA7	0x7AFB	#<CJK>
-0xCDA8	0x7C75	#<CJK>
-0xCDA9	0x7CFD	#<CJK>
-0xCDAA	0x8035	#<CJK>
-0xCDAB	0x808F	#<CJK>
-0xCDAC	0x80AE	#<CJK>
-0xCDAD	0x80A3	#<CJK>
-0xCDAE	0x80B8	#<CJK>
-0xCDAF	0x80B5	#<CJK>
-0xCDB0	0x80AD	#<CJK>
-0xCDB1	0x8220	#<CJK>
-0xCDB2	0x82A0	#<CJK>
-0xCDB3	0x82C0	#<CJK>
-0xCDB4	0x82AB	#<CJK>
-0xCDB5	0x829A	#<CJK>
-0xCDB6	0x8298	#<CJK>
-0xCDB7	0x829B	#<CJK>
-0xCDB8	0x82B5	#<CJK>
-0xCDB9	0x82A7	#<CJK>
-0xCDBA	0x82AE	#<CJK>
-0xCDBB	0x82BC	#<CJK>
-0xCDBC	0x829E	#<CJK>
-0xCDBD	0x82BA	#<CJK>
-0xCDBE	0x82B4	#<CJK>
-0xCDBF	0x82A8	#<CJK>
-0xCDC0	0x82A1	#<CJK>
-0xCDC1	0x82A9	#<CJK>
-0xCDC2	0x82C2	#<CJK>
-0xCDC3	0x82A4	#<CJK>
-0xCDC4	0x82C3	#<CJK>
-0xCDC5	0x82B6	#<CJK>
-0xCDC6	0x82A2	#<CJK>
-0xCDC7	0x8670	#<CJK>
-0xCDC8	0x866F	#<CJK>
-0xCDC9	0x866D	#<CJK>
-0xCDCA	0x866E	#<CJK>
-0xCDCB	0x8C56	#<CJK>
-0xCDCC	0x8FD2	#<CJK>
-0xCDCD	0x8FCB	#<CJK>
-0xCDCE	0x8FD3	#<CJK>
-0xCDCF	0x8FCD	#<CJK>
-0xCDD0	0x8FD6	#<CJK>
-0xCDD1	0x8FD5	#<CJK>
-0xCDD2	0x8FD7	#<CJK>
-0xCDD3	0x90B2	#<CJK>
-0xCDD4	0x90B4	#<CJK>
-0xCDD5	0x90AF	#<CJK>
-0xCDD6	0x90B3	#<CJK>
-0xCDD7	0x90B0	#<CJK>
-0xCDD8	0x9639	#<CJK>
-0xCDD9	0x963D	#<CJK>
-0xCDDA	0x963C	#<CJK>
-0xCDDB	0x963A	#<CJK>
-0xCDDC	0x9643	#<CJK>
-0xCDDD	0x4FCD	#<CJK>
-0xCDDE	0x4FC5	#<CJK>
-0xCDDF	0x4FD3	#<CJK>
-0xCDE0	0x4FB2	#<CJK>
-0xCDE1	0x4FC9	#<CJK>
-0xCDE2	0x4FCB	#<CJK>
-0xCDE3	0x4FC1	#<CJK>
-0xCDE4	0x4FD4	#<CJK>
-0xCDE5	0x4FDC	#<CJK>
-0xCDE6	0x4FD9	#<CJK>
-0xCDE7	0x4FBB	#<CJK>
-0xCDE8	0x4FB3	#<CJK>
-0xCDE9	0x4FDB	#<CJK>
-0xCDEA	0x4FC7	#<CJK>
-0xCDEB	0x4FD6	#<CJK>
-0xCDEC	0x4FBA	#<CJK>
-0xCDED	0x4FC0	#<CJK>
-0xCDEE	0x4FB9	#<CJK>
-0xCDEF	0x4FEC	#<CJK>
-0xCDF0	0x5244	#<CJK>
-0xCDF1	0x5249	#<CJK>
-0xCDF2	0x52C0	#<CJK>
-0xCDF3	0x52C2	#<CJK>
-0xCDF4	0x533D	#<CJK>
-0xCDF5	0x537C	#<CJK>
-0xCDF6	0x5397	#<CJK>
-0xCDF7	0x5396	#<CJK>
-0xCDF8	0x5399	#<CJK>
-0xCDF9	0x5398	#<CJK>
-0xCDFA	0x54BA	#<CJK>
-0xCDFB	0x54A1	#<CJK>
-0xCDFC	0x54AD	#<CJK>
-0xCDFD	0x54A5	#<CJK>
-0xCDFE	0x54CF	#<CJK>
-0xCE40	0x54C3	#<CJK>
-0xCE41	0x830D	#<CJK>
-0xCE42	0x54B7	#<CJK>
-0xCE43	0x54AE	#<CJK>
-0xCE44	0x54D6	#<CJK>
-0xCE45	0x54B6	#<CJK>
-0xCE46	0x54C5	#<CJK>
-0xCE47	0x54C6	#<CJK>
-0xCE48	0x54A0	#<CJK>
-0xCE49	0x5470	#<CJK>
-0xCE4A	0x54BC	#<CJK>
-0xCE4B	0x54A2	#<CJK>
-0xCE4C	0x54BE	#<CJK>
-0xCE4D	0x5472	#<CJK>
-0xCE4E	0x54DE	#<CJK>
-0xCE4F	0x54B0	#<CJK>
-0xCE50	0x57B5	#<CJK>
-0xCE51	0x579E	#<CJK>
-0xCE52	0x579F	#<CJK>
-0xCE53	0x57A4	#<CJK>
-0xCE54	0x578C	#<CJK>
-0xCE55	0x5797	#<CJK>
-0xCE56	0x579D	#<CJK>
-0xCE57	0x579B	#<CJK>
-0xCE58	0x5794	#<CJK>
-0xCE59	0x5798	#<CJK>
-0xCE5A	0x578F	#<CJK>
-0xCE5B	0x5799	#<CJK>
-0xCE5C	0x57A5	#<CJK>
-0xCE5D	0x579A	#<CJK>
-0xCE5E	0x5795	#<CJK>
-0xCE5F	0x58F4	#<CJK>
-0xCE60	0x590D	#<CJK>
-0xCE61	0x5953	#<CJK>
-0xCE62	0x59E1	#<CJK>
-0xCE63	0x59DE	#<CJK>
-0xCE64	0x59EE	#<CJK>
-0xCE65	0x5A00	#<CJK>
-0xCE66	0x59F1	#<CJK>
-0xCE67	0x59DD	#<CJK>
-0xCE68	0x59FA	#<CJK>
-0xCE69	0x59FD	#<CJK>
-0xCE6A	0x59FC	#<CJK>
-0xCE6B	0x59F6	#<CJK>
-0xCE6C	0x59E4	#<CJK>
-0xCE6D	0x59F2	#<CJK>
-0xCE6E	0x59F7	#<CJK>
-0xCE6F	0x59DB	#<CJK>
-0xCE70	0x59E9	#<CJK>
-0xCE71	0x59F3	#<CJK>
-0xCE72	0x59F5	#<CJK>
-0xCE73	0x59E0	#<CJK>
-0xCE74	0x59FE	#<CJK>
-0xCE75	0x59F4	#<CJK>
-0xCE76	0x59ED	#<CJK>
-0xCE77	0x5BA8	#<CJK>
-0xCE78	0x5C4C	#<CJK>
-0xCE79	0x5CD0	#<CJK>
-0xCE7A	0x5CD8	#<CJK>
-0xCE7B	0x5CCC	#<CJK>
-0xCE7C	0x5CD7	#<CJK>
-0xCE7D	0x5CCB	#<CJK>
-0xCE7E	0x5CDB	#<CJK>
-0xCEA1	0x5CDE	#<CJK>
-0xCEA2	0x5CDA	#<CJK>
-0xCEA3	0x5CC9	#<CJK>
-0xCEA4	0x5CC7	#<CJK>
-0xCEA5	0x5CCA	#<CJK>
-0xCEA6	0x5CD6	#<CJK>
-0xCEA7	0x5CD3	#<CJK>
-0xCEA8	0x5CD4	#<CJK>
-0xCEA9	0x5CCF	#<CJK>
-0xCEAA	0x5CC8	#<CJK>
-0xCEAB	0x5CC6	#<CJK>
-0xCEAC	0x5CCE	#<CJK>
-0xCEAD	0x5CDF	#<CJK>
-0xCEAE	0x5CF8	#<CJK>
-0xCEAF	0x5DF9	#<CJK>
-0xCEB0	0x5E21	#<CJK>
-0xCEB1	0x5E22	#<CJK>
-0xCEB2	0x5E23	#<CJK>
-0xCEB3	0x5E20	#<CJK>
-0xCEB4	0x5E24	#<CJK>
-0xCEB5	0x5EB0	#<CJK>
-0xCEB6	0x5EA4	#<CJK>
-0xCEB7	0x5EA2	#<CJK>
-0xCEB8	0x5E9B	#<CJK>
-0xCEB9	0x5EA3	#<CJK>
-0xCEBA	0x5EA5	#<CJK>
-0xCEBB	0x5F07	#<CJK>
-0xCEBC	0x5F2E	#<CJK>
-0xCEBD	0x5F56	#<CJK>
-0xCEBE	0x5F86	#<CJK>
-0xCEBF	0x6037	#<CJK>
-0xCEC0	0x6039	#<CJK>
-0xCEC1	0x6054	#<CJK>
-0xCEC2	0x6072	#<CJK>
-0xCEC3	0x605E	#<CJK>
-0xCEC4	0x6045	#<CJK>
-0xCEC5	0x6053	#<CJK>
-0xCEC6	0x6047	#<CJK>
-0xCEC7	0x6049	#<CJK>
-0xCEC8	0x605B	#<CJK>
-0xCEC9	0x604C	#<CJK>
-0xCECA	0x6040	#<CJK>
-0xCECB	0x6042	#<CJK>
-0xCECC	0x605F	#<CJK>
-0xCECD	0x6024	#<CJK>
-0xCECE	0x6044	#<CJK>
-0xCECF	0x6058	#<CJK>
-0xCED0	0x6066	#<CJK>
-0xCED1	0x606E	#<CJK>
-0xCED2	0x6242	#<CJK>
-0xCED3	0x6243	#<CJK>
-0xCED4	0x62CF	#<CJK>
-0xCED5	0x630D	#<CJK>
-0xCED6	0x630B	#<CJK>
-0xCED7	0x62F5	#<CJK>
-0xCED8	0x630E	#<CJK>
-0xCED9	0x6303	#<CJK>
-0xCEDA	0x62EB	#<CJK>
-0xCEDB	0x62F9	#<CJK>
-0xCEDC	0x630F	#<CJK>
-0xCEDD	0x630C	#<CJK>
-0xCEDE	0x62F8	#<CJK>
-0xCEDF	0x62F6	#<CJK>
-0xCEE0	0x6300	#<CJK>
-0xCEE1	0x6313	#<CJK>
-0xCEE2	0x6314	#<CJK>
-0xCEE3	0x62FA	#<CJK>
-0xCEE4	0x6315	#<CJK>
-0xCEE5	0x62FB	#<CJK>
-0xCEE6	0x62F0	#<CJK>
-0xCEE7	0x6541	#<CJK>
-0xCEE8	0x6543	#<CJK>
-0xCEE9	0x65AA	#<CJK>
-0xCEEA	0x65BF	#<CJK>
-0xCEEB	0x6636	#<CJK>
-0xCEEC	0x6621	#<CJK>
-0xCEED	0x6632	#<CJK>
-0xCEEE	0x6635	#<CJK>
-0xCEEF	0x661C	#<CJK>
-0xCEF0	0x6626	#<CJK>
-0xCEF1	0x6622	#<CJK>
-0xCEF2	0x6633	#<CJK>
-0xCEF3	0x662B	#<CJK>
-0xCEF4	0x663A	#<CJK>
-0xCEF5	0x661D	#<CJK>
-0xCEF6	0x6634	#<CJK>
-0xCEF7	0x6639	#<CJK>
-0xCEF8	0x662E	#<CJK>
-0xCEF9	0x670F	#<CJK>
-0xCEFA	0x6710	#<CJK>
-0xCEFB	0x67C1	#<CJK>
-0xCEFC	0x67F2	#<CJK>
-0xCEFD	0x67C8	#<CJK>
-0xCEFE	0x67BA	#<CJK>
-0xCF40	0x67DC	#<CJK>
-0xCF41	0x67BB	#<CJK>
-0xCF42	0x67F8	#<CJK>
-0xCF43	0x67D8	#<CJK>
-0xCF44	0x67C0	#<CJK>
-0xCF45	0x67B7	#<CJK>
-0xCF46	0x67C5	#<CJK>
-0xCF47	0x67EB	#<CJK>
-0xCF48	0x67E4	#<CJK>
-0xCF49	0x67DF	#<CJK>
-0xCF4A	0x67B5	#<CJK>
-0xCF4B	0x67CD	#<CJK>
-0xCF4C	0x67B3	#<CJK>
-0xCF4D	0x67F7	#<CJK>
-0xCF4E	0x67F6	#<CJK>
-0xCF4F	0x67EE	#<CJK>
-0xCF50	0x67E3	#<CJK>
-0xCF51	0x67C2	#<CJK>
-0xCF52	0x67B9	#<CJK>
-0xCF53	0x67CE	#<CJK>
-0xCF54	0x67E7	#<CJK>
-0xCF55	0x67F0	#<CJK>
-0xCF56	0x67B2	#<CJK>
-0xCF57	0x67FC	#<CJK>
-0xCF58	0x67C6	#<CJK>
-0xCF59	0x67ED	#<CJK>
-0xCF5A	0x67CC	#<CJK>
-0xCF5B	0x67AE	#<CJK>
-0xCF5C	0x67E6	#<CJK>
-0xCF5D	0x67DB	#<CJK>
-0xCF5E	0x67FA	#<CJK>
-0xCF5F	0x67C9	#<CJK>
-0xCF60	0x67CA	#<CJK>
-0xCF61	0x67C3	#<CJK>
-0xCF62	0x67EA	#<CJK>
-0xCF63	0x67CB	#<CJK>
-0xCF64	0x6B28	#<CJK>
-0xCF65	0x6B82	#<CJK>
-0xCF66	0x6B84	#<CJK>
-0xCF67	0x6BB6	#<CJK>
-0xCF68	0x6BD6	#<CJK>
-0xCF69	0x6BD8	#<CJK>
-0xCF6A	0x6BE0	#<CJK>
-0xCF6B	0x6C20	#<CJK>
-0xCF6C	0x6C21	#<CJK>
-0xCF6D	0x6D28	#<CJK>
-0xCF6E	0x6D34	#<CJK>
-0xCF6F	0x6D2D	#<CJK>
-0xCF70	0x6D1F	#<CJK>
-0xCF71	0x6D3C	#<CJK>
-0xCF72	0x6D3F	#<CJK>
-0xCF73	0x6D12	#<CJK>
-0xCF74	0x6D0A	#<CJK>
-0xCF75	0x6CDA	#<CJK>
-0xCF76	0x6D33	#<CJK>
-0xCF77	0x6D04	#<CJK>
-0xCF78	0x6D19	#<CJK>
-0xCF79	0x6D3A	#<CJK>
-0xCF7A	0x6D1A	#<CJK>
-0xCF7B	0x6D11	#<CJK>
-0xCF7C	0x6D00	#<CJK>
-0xCF7D	0x6D1D	#<CJK>
-0xCF7E	0x6D42	#<CJK>
-0xCFA1	0x6D01	#<CJK>
-0xCFA2	0x6D18	#<CJK>
-0xCFA3	0x6D37	#<CJK>
-0xCFA4	0x6D03	#<CJK>
-0xCFA5	0x6D0F	#<CJK>
-0xCFA6	0x6D40	#<CJK>
-0xCFA7	0x6D07	#<CJK>
-0xCFA8	0x6D20	#<CJK>
-0xCFA9	0x6D2C	#<CJK>
-0xCFAA	0x6D08	#<CJK>
-0xCFAB	0x6D22	#<CJK>
-0xCFAC	0x6D09	#<CJK>
-0xCFAD	0x6D10	#<CJK>
-0xCFAE	0x70B7	#<CJK>
-0xCFAF	0x709F	#<CJK>
-0xCFB0	0x70BE	#<CJK>
-0xCFB1	0x70B1	#<CJK>
-0xCFB2	0x70B0	#<CJK>
-0xCFB3	0x70A1	#<CJK>
-0xCFB4	0x70B4	#<CJK>
-0xCFB5	0x70B5	#<CJK>
-0xCFB6	0x70A9	#<CJK>
-0xCFB7	0x7241	#<CJK>
-0xCFB8	0x7249	#<CJK>
-0xCFB9	0x724A	#<CJK>
-0xCFBA	0x726C	#<CJK>
-0xCFBB	0x7270	#<CJK>
-0xCFBC	0x7273	#<CJK>
-0xCFBD	0x726E	#<CJK>
-0xCFBE	0x72CA	#<CJK>
-0xCFBF	0x72E4	#<CJK>
-0xCFC0	0x72E8	#<CJK>
-0xCFC1	0x72EB	#<CJK>
-0xCFC2	0x72DF	#<CJK>
-0xCFC3	0x72EA	#<CJK>
-0xCFC4	0x72E6	#<CJK>
-0xCFC5	0x72E3	#<CJK>
-0xCFC6	0x7385	#<CJK>
-0xCFC7	0x73CC	#<CJK>
-0xCFC8	0x73C2	#<CJK>
-0xCFC9	0x73C8	#<CJK>
-0xCFCA	0x73C5	#<CJK>
-0xCFCB	0x73B9	#<CJK>
-0xCFCC	0x73B6	#<CJK>
-0xCFCD	0x73B5	#<CJK>
-0xCFCE	0x73B4	#<CJK>
-0xCFCF	0x73EB	#<CJK>
-0xCFD0	0x73BF	#<CJK>
-0xCFD1	0x73C7	#<CJK>
-0xCFD2	0x73BE	#<CJK>
-0xCFD3	0x73C3	#<CJK>
-0xCFD4	0x73C6	#<CJK>
-0xCFD5	0x73B8	#<CJK>
-0xCFD6	0x73CB	#<CJK>
-0xCFD7	0x74EC	#<CJK>
-0xCFD8	0x74EE	#<CJK>
-0xCFD9	0x752E	#<CJK>
-0xCFDA	0x7547	#<CJK>
-0xCFDB	0x7548	#<CJK>
-0xCFDC	0x75A7	#<CJK>
-0xCFDD	0x75AA	#<CJK>
-0xCFDE	0x7679	#<CJK>
-0xCFDF	0x76C4	#<CJK>
-0xCFE0	0x7708	#<CJK>
-0xCFE1	0x7703	#<CJK>
-0xCFE2	0x7704	#<CJK>
-0xCFE3	0x7705	#<CJK>
-0xCFE4	0x770A	#<CJK>
-0xCFE5	0x76F7	#<CJK>
-0xCFE6	0x76FB	#<CJK>
-0xCFE7	0x76FA	#<CJK>
-0xCFE8	0x77E7	#<CJK>
-0xCFE9	0x77E8	#<CJK>
-0xCFEA	0x7806	#<CJK>
-0xCFEB	0x7811	#<CJK>
-0xCFEC	0x7812	#<CJK>
-0xCFED	0x7805	#<CJK>
-0xCFEE	0x7810	#<CJK>
-0xCFEF	0x780F	#<CJK>
-0xCFF0	0x780E	#<CJK>
-0xCFF1	0x7809	#<CJK>
-0xCFF2	0x7803	#<CJK>
-0xCFF3	0x7813	#<CJK>
-0xCFF4	0x794A	#<CJK>
-0xCFF5	0x794C	#<CJK>
-0xCFF6	0x794B	#<CJK>
-0xCFF7	0x7945	#<CJK>
-0xCFF8	0x7944	#<CJK>
-0xCFF9	0x79D5	#<CJK>
-0xCFFA	0x79CD	#<CJK>
-0xCFFB	0x79CF	#<CJK>
-0xCFFC	0x79D6	#<CJK>
-0xCFFD	0x79CE	#<CJK>
-0xCFFE	0x7A80	#<CJK>
-0xD040	0x7A7E	#<CJK>
-0xD041	0x7AD1	#<CJK>
-0xD042	0x7B00	#<CJK>
-0xD043	0x7B01	#<CJK>
-0xD044	0x7C7A	#<CJK>
-0xD045	0x7C78	#<CJK>
-0xD046	0x7C79	#<CJK>
-0xD047	0x7C7F	#<CJK>
-0xD048	0x7C80	#<CJK>
-0xD049	0x7C81	#<CJK>
-0xD04A	0x7D03	#<CJK>
-0xD04B	0x7D08	#<CJK>
-0xD04C	0x7D01	#<CJK>
-0xD04D	0x7F58	#<CJK>
-0xD04E	0x7F91	#<CJK>
-0xD04F	0x7F8D	#<CJK>
-0xD050	0x7FBE	#<CJK>
-0xD051	0x8007	#<CJK>
-0xD052	0x800E	#<CJK>
-0xD053	0x800F	#<CJK>
-0xD054	0x8014	#<CJK>
-0xD055	0x8037	#<CJK>
-0xD056	0x80D8	#<CJK>
-0xD057	0x80C7	#<CJK>
-0xD058	0x80E0	#<CJK>
-0xD059	0x80D1	#<CJK>
-0xD05A	0x80C8	#<CJK>
-0xD05B	0x80C2	#<CJK>
-0xD05C	0x80D0	#<CJK>
-0xD05D	0x80C5	#<CJK>
-0xD05E	0x80E3	#<CJK>
-0xD05F	0x80D9	#<CJK>
-0xD060	0x80DC	#<CJK>
-0xD061	0x80CA	#<CJK>
-0xD062	0x80D5	#<CJK>
-0xD063	0x80C9	#<CJK>
-0xD064	0x80CF	#<CJK>
-0xD065	0x80D7	#<CJK>
-0xD066	0x80E6	#<CJK>
-0xD067	0x80CD	#<CJK>
-0xD068	0x81FF	#<CJK>
-0xD069	0x8221	#<CJK>
-0xD06A	0x8294	#<CJK>
-0xD06B	0x82D9	#<CJK>
-0xD06C	0x82FE	#<CJK>
-0xD06D	0x82F9	#<CJK>
-0xD06E	0x8307	#<CJK>
-0xD06F	0x82E8	#<CJK>
-0xD070	0x8300	#<CJK>
-0xD071	0x82D5	#<CJK>
-0xD072	0x833A	#<CJK>
-0xD073	0x82EB	#<CJK>
-0xD074	0x82D6	#<CJK>
-0xD075	0x82F4	#<CJK>
-0xD076	0x82EC	#<CJK>
-0xD077	0x82E1	#<CJK>
-0xD078	0x82F2	#<CJK>
-0xD079	0x82F5	#<CJK>
-0xD07A	0x830C	#<CJK>
-0xD07B	0x82FB	#<CJK>
-0xD07C	0x82F6	#<CJK>
-0xD07D	0x82F0	#<CJK>
-0xD07E	0x82EA	#<CJK>
-0xD0A1	0x82E4	#<CJK>
-0xD0A2	0x82E0	#<CJK>
-0xD0A3	0x82FA	#<CJK>
-0xD0A4	0x82F3	#<CJK>
-0xD0A5	0x82ED	#<CJK>
-0xD0A6	0x8677	#<CJK>
-0xD0A7	0x8674	#<CJK>
-0xD0A8	0x867C	#<CJK>
-0xD0A9	0x8673	#<CJK>
-0xD0AA	0x8841	#<CJK>
-0xD0AB	0x884E	#<CJK>
-0xD0AC	0x8867	#<CJK>
-0xD0AD	0x886A	#<CJK>
-0xD0AE	0x8869	#<CJK>
-0xD0AF	0x89D3	#<CJK>
-0xD0B0	0x8A04	#<CJK>
-0xD0B1	0x8A07	#<CJK>
-0xD0B2	0x8D72	#<CJK>
-0xD0B3	0x8FE3	#<CJK>
-0xD0B4	0x8FE1	#<CJK>
-0xD0B5	0x8FEE	#<CJK>
-0xD0B6	0x8FE0	#<CJK>
-0xD0B7	0x90F1	#<CJK>
-0xD0B8	0x90BD	#<CJK>
-0xD0B9	0x90BF	#<CJK>
-0xD0BA	0x90D5	#<CJK>
-0xD0BB	0x90C5	#<CJK>
-0xD0BC	0x90BE	#<CJK>
-0xD0BD	0x90C7	#<CJK>
-0xD0BE	0x90CB	#<CJK>
-0xD0BF	0x90C8	#<CJK>
-0xD0C0	0x91D4	#<CJK>
-0xD0C1	0x91D3	#<CJK>
-0xD0C2	0x9654	#<CJK>
-0xD0C3	0x964F	#<CJK>
-0xD0C4	0x9651	#<CJK>
-0xD0C5	0x9653	#<CJK>
-0xD0C6	0x964A	#<CJK>
-0xD0C7	0x964E	#<CJK>
-0xD0C8	0x501E	#<CJK>
-0xD0C9	0x5005	#<CJK>
-0xD0CA	0x5007	#<CJK>
-0xD0CB	0x5013	#<CJK>
-0xD0CC	0x5022	#<CJK>
-0xD0CD	0x5030	#<CJK>
-0xD0CE	0x501B	#<CJK>
-0xD0CF	0x4FF5	#<CJK>
-0xD0D0	0x4FF4	#<CJK>
-0xD0D1	0x5033	#<CJK>
-0xD0D2	0x5037	#<CJK>
-0xD0D3	0x502C	#<CJK>
-0xD0D4	0x4FF6	#<CJK>
-0xD0D5	0x4FF7	#<CJK>
-0xD0D6	0x5017	#<CJK>
-0xD0D7	0x501C	#<CJK>
-0xD0D8	0x5020	#<CJK>
-0xD0D9	0x5027	#<CJK>
-0xD0DA	0x5035	#<CJK>
-0xD0DB	0x502F	#<CJK>
-0xD0DC	0x5031	#<CJK>
-0xD0DD	0x500E	#<CJK>
-0xD0DE	0x515A	#<CJK>
-0xD0DF	0x5194	#<CJK>
-0xD0E0	0x5193	#<CJK>
-0xD0E1	0x51CA	#<CJK>
-0xD0E2	0x51C4	#<CJK>
-0xD0E3	0x51C5	#<CJK>
-0xD0E4	0x51C8	#<CJK>
-0xD0E5	0x51CE	#<CJK>
-0xD0E6	0x5261	#<CJK>
-0xD0E7	0x525A	#<CJK>
-0xD0E8	0x5252	#<CJK>
-0xD0E9	0x525E	#<CJK>
-0xD0EA	0x525F	#<CJK>
-0xD0EB	0x5255	#<CJK>
-0xD0EC	0x5262	#<CJK>
-0xD0ED	0x52CD	#<CJK>
-0xD0EE	0x530E	#<CJK>
-0xD0EF	0x539E	#<CJK>
-0xD0F0	0x5526	#<CJK>
-0xD0F1	0x54E2	#<CJK>
-0xD0F2	0x5517	#<CJK>
-0xD0F3	0x5512	#<CJK>
-0xD0F4	0x54E7	#<CJK>
-0xD0F5	0x54F3	#<CJK>
-0xD0F6	0x54E4	#<CJK>
-0xD0F7	0x551A	#<CJK>
-0xD0F8	0x54FF	#<CJK>
-0xD0F9	0x5504	#<CJK>
-0xD0FA	0x5508	#<CJK>
-0xD0FB	0x54EB	#<CJK>
-0xD0FC	0x5511	#<CJK>
-0xD0FD	0x5505	#<CJK>
-0xD0FE	0x54F1	#<CJK>
-0xD140	0x550A	#<CJK>
-0xD141	0x54FB	#<CJK>
-0xD142	0x54F7	#<CJK>
-0xD143	0x54F8	#<CJK>
-0xD144	0x54E0	#<CJK>
-0xD145	0x550E	#<CJK>
-0xD146	0x5503	#<CJK>
-0xD147	0x550B	#<CJK>
-0xD148	0x5701	#<CJK>
-0xD149	0x5702	#<CJK>
-0xD14A	0x57CC	#<CJK>
-0xD14B	0x5832	#<CJK>
-0xD14C	0x57D5	#<CJK>
-0xD14D	0x57D2	#<CJK>
-0xD14E	0x57BA	#<CJK>
-0xD14F	0x57C6	#<CJK>
-0xD150	0x57BD	#<CJK>
-0xD151	0x57BC	#<CJK>
-0xD152	0x57B8	#<CJK>
-0xD153	0x57B6	#<CJK>
-0xD154	0x57BF	#<CJK>
-0xD155	0x57C7	#<CJK>
-0xD156	0x57D0	#<CJK>
-0xD157	0x57B9	#<CJK>
-0xD158	0x57C1	#<CJK>
-0xD159	0x590E	#<CJK>
-0xD15A	0x594A	#<CJK>
-0xD15B	0x5A19	#<CJK>
-0xD15C	0x5A16	#<CJK>
-0xD15D	0x5A2D	#<CJK>
-0xD15E	0x5A2E	#<CJK>
-0xD15F	0x5A15	#<CJK>
-0xD160	0x5A0F	#<CJK>
-0xD161	0x5A17	#<CJK>
-0xD162	0x5A0A	#<CJK>
-0xD163	0x5A1E	#<CJK>
-0xD164	0x5A33	#<CJK>
-0xD165	0x5B6C	#<CJK>
-0xD166	0x5BA7	#<CJK>
-0xD167	0x5BAD	#<CJK>
-0xD168	0x5BAC	#<CJK>
-0xD169	0x5C03	#<CJK>
-0xD16A	0x5C56	#<CJK>
-0xD16B	0x5C54	#<CJK>
-0xD16C	0x5CEC	#<CJK>
-0xD16D	0x5CFF	#<CJK>
-0xD16E	0x5CEE	#<CJK>
-0xD16F	0x5CF1	#<CJK>
-0xD170	0x5CF7	#<CJK>
-0xD171	0x5D00	#<CJK>
-0xD172	0x5CF9	#<CJK>
-0xD173	0x5E29	#<CJK>
-0xD174	0x5E28	#<CJK>
-0xD175	0x5EA8	#<CJK>
-0xD176	0x5EAE	#<CJK>
-0xD177	0x5EAA	#<CJK>
-0xD178	0x5EAC	#<CJK>
-0xD179	0x5F33	#<CJK>
-0xD17A	0x5F30	#<CJK>
-0xD17B	0x5F67	#<CJK>
-0xD17C	0x605D	#<CJK>
-0xD17D	0x605A	#<CJK>
-0xD17E	0x6067	#<CJK>
-0xD1A1	0x6041	#<CJK>
-0xD1A2	0x60A2	#<CJK>
-0xD1A3	0x6088	#<CJK>
-0xD1A4	0x6080	#<CJK>
-0xD1A5	0x6092	#<CJK>
-0xD1A6	0x6081	#<CJK>
-0xD1A7	0x609D	#<CJK>
-0xD1A8	0x6083	#<CJK>
-0xD1A9	0x6095	#<CJK>
-0xD1AA	0x609B	#<CJK>
-0xD1AB	0x6097	#<CJK>
-0xD1AC	0x6087	#<CJK>
-0xD1AD	0x609C	#<CJK>
-0xD1AE	0x608E	#<CJK>
-0xD1AF	0x6219	#<CJK>
-0xD1B0	0x6246	#<CJK>
-0xD1B1	0x62F2	#<CJK>
-0xD1B2	0x6310	#<CJK>
-0xD1B3	0x6356	#<CJK>
-0xD1B4	0x632C	#<CJK>
-0xD1B5	0x6344	#<CJK>
-0xD1B6	0x6345	#<CJK>
-0xD1B7	0x6336	#<CJK>
-0xD1B8	0x6343	#<CJK>
-0xD1B9	0x63E4	#<CJK>
-0xD1BA	0x6339	#<CJK>
-0xD1BB	0x634B	#<CJK>
-0xD1BC	0x634A	#<CJK>
-0xD1BD	0x633C	#<CJK>
-0xD1BE	0x6329	#<CJK>
-0xD1BF	0x6341	#<CJK>
-0xD1C0	0x6334	#<CJK>
-0xD1C1	0x6358	#<CJK>
-0xD1C2	0x6354	#<CJK>
-0xD1C3	0x6359	#<CJK>
-0xD1C4	0x632D	#<CJK>
-0xD1C5	0x6347	#<CJK>
-0xD1C6	0x6333	#<CJK>
-0xD1C7	0x635A	#<CJK>
-0xD1C8	0x6351	#<CJK>
-0xD1C9	0x6338	#<CJK>
-0xD1CA	0x6357	#<CJK>
-0xD1CB	0x6340	#<CJK>
-0xD1CC	0x6348	#<CJK>
-0xD1CD	0x654A	#<CJK>
-0xD1CE	0x6546	#<CJK>
-0xD1CF	0x65C6	#<CJK>
-0xD1D0	0x65C3	#<CJK>
-0xD1D1	0x65C4	#<CJK>
-0xD1D2	0x65C2	#<CJK>
-0xD1D3	0x664A	#<CJK>
-0xD1D4	0x665F	#<CJK>
-0xD1D5	0x6647	#<CJK>
-0xD1D6	0x6651	#<CJK>
-0xD1D7	0x6712	#<CJK>
-0xD1D8	0x6713	#<CJK>
-0xD1D9	0x681F	#<CJK>
-0xD1DA	0x681A	#<CJK>
-0xD1DB	0x6849	#<CJK>
-0xD1DC	0x6832	#<CJK>
-0xD1DD	0x6833	#<CJK>
-0xD1DE	0x683B	#<CJK>
-0xD1DF	0x684B	#<CJK>
-0xD1E0	0x684F	#<CJK>
-0xD1E1	0x6816	#<CJK>
-0xD1E2	0x6831	#<CJK>
-0xD1E3	0x681C	#<CJK>
-0xD1E4	0x6835	#<CJK>
-0xD1E5	0x682B	#<CJK>
-0xD1E6	0x682D	#<CJK>
-0xD1E7	0x682F	#<CJK>
-0xD1E8	0x684E	#<CJK>
-0xD1E9	0x6844	#<CJK>
-0xD1EA	0x6834	#<CJK>
-0xD1EB	0x681D	#<CJK>
-0xD1EC	0x6812	#<CJK>
-0xD1ED	0x6814	#<CJK>
-0xD1EE	0x6826	#<CJK>
-0xD1EF	0x6828	#<CJK>
-0xD1F0	0x682E	#<CJK>
-0xD1F1	0x684D	#<CJK>
-0xD1F2	0x683A	#<CJK>
-0xD1F3	0x6825	#<CJK>
-0xD1F4	0x6820	#<CJK>
-0xD1F5	0x6B2C	#<CJK>
-0xD1F6	0x6B2F	#<CJK>
-0xD1F7	0x6B2D	#<CJK>
-0xD1F8	0x6B31	#<CJK>
-0xD1F9	0x6B34	#<CJK>
-0xD1FA	0x6B6D	#<CJK>
-0xD1FB	0x8082	#<CJK>
-0xD1FC	0x6B88	#<CJK>
-0xD1FD	0x6BE6	#<CJK>
-0xD1FE	0x6BE4	#<CJK>
-0xD240	0x6BE8	#<CJK>
-0xD241	0x6BE3	#<CJK>
-0xD242	0x6BE2	#<CJK>
-0xD243	0x6BE7	#<CJK>
-0xD244	0x6C25	#<CJK>
-0xD245	0x6D7A	#<CJK>
-0xD246	0x6D63	#<CJK>
-0xD247	0x6D64	#<CJK>
-0xD248	0x6D76	#<CJK>
-0xD249	0x6D0D	#<CJK>
-0xD24A	0x6D61	#<CJK>
-0xD24B	0x6D92	#<CJK>
-0xD24C	0x6D58	#<CJK>
-0xD24D	0x6D62	#<CJK>
-0xD24E	0x6D6D	#<CJK>
-0xD24F	0x6D6F	#<CJK>
-0xD250	0x6D91	#<CJK>
-0xD251	0x6D8D	#<CJK>
-0xD252	0x6DEF	#<CJK>
-0xD253	0x6D7F	#<CJK>
-0xD254	0x6D86	#<CJK>
-0xD255	0x6D5E	#<CJK>
-0xD256	0x6D67	#<CJK>
-0xD257	0x6D60	#<CJK>
-0xD258	0x6D97	#<CJK>
-0xD259	0x6D70	#<CJK>
-0xD25A	0x6D7C	#<CJK>
-0xD25B	0x6D5F	#<CJK>
-0xD25C	0x6D82	#<CJK>
-0xD25D	0x6D98	#<CJK>
-0xD25E	0x6D2F	#<CJK>
-0xD25F	0x6D68	#<CJK>
-0xD260	0x6D8B	#<CJK>
-0xD261	0x6D7E	#<CJK>
-0xD262	0x6D80	#<CJK>
-0xD263	0x6D84	#<CJK>
-0xD264	0x6D16	#<CJK>
-0xD265	0x6D83	#<CJK>
-0xD266	0x6D7B	#<CJK>
-0xD267	0x6D7D	#<CJK>
-0xD268	0x6D75	#<CJK>
-0xD269	0x6D90	#<CJK>
-0xD26A	0x70DC	#<CJK>
-0xD26B	0x70D3	#<CJK>
-0xD26C	0x70D1	#<CJK>
-0xD26D	0x70DD	#<CJK>
-0xD26E	0x70CB	#<CJK>
-0xD26F	0x7F39	#<CJK>
-0xD270	0x70E2	#<CJK>
-0xD271	0x70D7	#<CJK>
-0xD272	0x70D2	#<CJK>
-0xD273	0x70DE	#<CJK>
-0xD274	0x70E0	#<CJK>
-0xD275	0x70D4	#<CJK>
-0xD276	0x70CD	#<CJK>
-0xD277	0x70C5	#<CJK>
-0xD278	0x70C6	#<CJK>
-0xD279	0x70C7	#<CJK>
-0xD27A	0x70DA	#<CJK>
-0xD27B	0x70CE	#<CJK>
-0xD27C	0x70E1	#<CJK>
-0xD27D	0x7242	#<CJK>
-0xD27E	0x7278	#<CJK>
-0xD2A1	0x7277	#<CJK>
-0xD2A2	0x7276	#<CJK>
-0xD2A3	0x7300	#<CJK>
-0xD2A4	0x72FA	#<CJK>
-0xD2A5	0x72F4	#<CJK>
-0xD2A6	0x72FE	#<CJK>
-0xD2A7	0x72F6	#<CJK>
-0xD2A8	0x72F3	#<CJK>
-0xD2A9	0x72FB	#<CJK>
-0xD2AA	0x7301	#<CJK>
-0xD2AB	0x73D3	#<CJK>
-0xD2AC	0x73D9	#<CJK>
-0xD2AD	0x73E5	#<CJK>
-0xD2AE	0x73D6	#<CJK>
-0xD2AF	0x73BC	#<CJK>
-0xD2B0	0x73E7	#<CJK>
-0xD2B1	0x73E3	#<CJK>
-0xD2B2	0x73E9	#<CJK>
-0xD2B3	0x73DC	#<CJK>
-0xD2B4	0x73D2	#<CJK>
-0xD2B5	0x73DB	#<CJK>
-0xD2B6	0x73D4	#<CJK>
-0xD2B7	0x73DD	#<CJK>
-0xD2B8	0x73DA	#<CJK>
-0xD2B9	0x73D7	#<CJK>
-0xD2BA	0x73D8	#<CJK>
-0xD2BB	0x73E8	#<CJK>
-0xD2BC	0x74DE	#<CJK>
-0xD2BD	0x74DF	#<CJK>
-0xD2BE	0x74F4	#<CJK>
-0xD2BF	0x74F5	#<CJK>
-0xD2C0	0x7521	#<CJK>
-0xD2C1	0x755B	#<CJK>
-0xD2C2	0x755F	#<CJK>
-0xD2C3	0x75B0	#<CJK>
-0xD2C4	0x75C1	#<CJK>
-0xD2C5	0x75BB	#<CJK>
-0xD2C6	0x75C4	#<CJK>
-0xD2C7	0x75C0	#<CJK>
-0xD2C8	0x75BF	#<CJK>
-0xD2C9	0x75B6	#<CJK>
-0xD2CA	0x75BA	#<CJK>
-0xD2CB	0x768A	#<CJK>
-0xD2CC	0x76C9	#<CJK>
-0xD2CD	0x771D	#<CJK>
-0xD2CE	0x771B	#<CJK>
-0xD2CF	0x7710	#<CJK>
-0xD2D0	0x7713	#<CJK>
-0xD2D1	0x7712	#<CJK>
-0xD2D2	0x7723	#<CJK>
-0xD2D3	0x7711	#<CJK>
-0xD2D4	0x7715	#<CJK>
-0xD2D5	0x7719	#<CJK>
-0xD2D6	0x771A	#<CJK>
-0xD2D7	0x7722	#<CJK>
-0xD2D8	0x7727	#<CJK>
-0xD2D9	0x7823	#<CJK>
-0xD2DA	0x782C	#<CJK>
-0xD2DB	0x7822	#<CJK>
-0xD2DC	0x7835	#<CJK>
-0xD2DD	0x782F	#<CJK>
-0xD2DE	0x7828	#<CJK>
-0xD2DF	0x782E	#<CJK>
-0xD2E0	0x782B	#<CJK>
-0xD2E1	0x7821	#<CJK>
-0xD2E2	0x7829	#<CJK>
-0xD2E3	0x7833	#<CJK>
-0xD2E4	0x782A	#<CJK>
-0xD2E5	0x7831	#<CJK>
-0xD2E6	0x7954	#<CJK>
-0xD2E7	0x795B	#<CJK>
-0xD2E8	0x794F	#<CJK>
-0xD2E9	0x795C	#<CJK>
-0xD2EA	0x7953	#<CJK>
-0xD2EB	0x7952	#<CJK>
-0xD2EC	0x7951	#<CJK>
-0xD2ED	0x79EB	#<CJK>
-0xD2EE	0x79EC	#<CJK>
-0xD2EF	0x79E0	#<CJK>
-0xD2F0	0x79EE	#<CJK>
-0xD2F1	0x79ED	#<CJK>
-0xD2F2	0x79EA	#<CJK>
-0xD2F3	0x79DC	#<CJK>
-0xD2F4	0x79DE	#<CJK>
-0xD2F5	0x79DD	#<CJK>
-0xD2F6	0x7A86	#<CJK>
-0xD2F7	0x7A89	#<CJK>
-0xD2F8	0x7A85	#<CJK>
-0xD2F9	0x7A8B	#<CJK>
-0xD2FA	0x7A8C	#<CJK>
-0xD2FB	0x7A8A	#<CJK>
-0xD2FC	0x7A87	#<CJK>
-0xD2FD	0x7AD8	#<CJK>
-0xD2FE	0x7B10	#<CJK>
-0xD340	0x7B04	#<CJK>
-0xD341	0x7B13	#<CJK>
-0xD342	0x7B05	#<CJK>
-0xD343	0x7B0F	#<CJK>
-0xD344	0x7B08	#<CJK>
-0xD345	0x7B0A	#<CJK>
-0xD346	0x7B0E	#<CJK>
-0xD347	0x7B09	#<CJK>
-0xD348	0x7B12	#<CJK>
-0xD349	0x7C84	#<CJK>
-0xD34A	0x7C91	#<CJK>
-0xD34B	0x7C8A	#<CJK>
-0xD34C	0x7C8C	#<CJK>
-0xD34D	0x7C88	#<CJK>
-0xD34E	0x7C8D	#<CJK>
-0xD34F	0x7C85	#<CJK>
-0xD350	0x7D1E	#<CJK>
-0xD351	0x7D1D	#<CJK>
-0xD352	0x7D11	#<CJK>
-0xD353	0x7D0E	#<CJK>
-0xD354	0x7D18	#<CJK>
-0xD355	0x7D16	#<CJK>
-0xD356	0x7D13	#<CJK>
-0xD357	0x7D1F	#<CJK>
-0xD358	0x7D12	#<CJK>
-0xD359	0x7D0F	#<CJK>
-0xD35A	0x7D0C	#<CJK>
-0xD35B	0x7F5C	#<CJK>
-0xD35C	0x7F61	#<CJK>
-0xD35D	0x7F5E	#<CJK>
-0xD35E	0x7F60	#<CJK>
-0xD35F	0x7F5D	#<CJK>
-0xD360	0x7F5B	#<CJK>
-0xD361	0x7F96	#<CJK>
-0xD362	0x7F92	#<CJK>
-0xD363	0x7FC3	#<CJK>
-0xD364	0x7FC2	#<CJK>
-0xD365	0x7FC0	#<CJK>
-0xD366	0x8016	#<CJK>
-0xD367	0x803E	#<CJK>
-0xD368	0x8039	#<CJK>
-0xD369	0x80FA	#<CJK>
-0xD36A	0x80F2	#<CJK>
-0xD36B	0x80F9	#<CJK>
-0xD36C	0x80F5	#<CJK>
-0xD36D	0x8101	#<CJK>
-0xD36E	0x80FB	#<CJK>
-0xD36F	0x8100	#<CJK>
-0xD370	0x8201	#<CJK>
-0xD371	0x822F	#<CJK>
-0xD372	0x8225	#<CJK>
-0xD373	0x8333	#<CJK>
-0xD374	0x832D	#<CJK>
-0xD375	0x8344	#<CJK>
-0xD376	0x8319	#<CJK>
-0xD377	0x8351	#<CJK>
-0xD378	0x8325	#<CJK>
-0xD379	0x8356	#<CJK>
-0xD37A	0x833F	#<CJK>
-0xD37B	0x8341	#<CJK>
-0xD37C	0x8326	#<CJK>
-0xD37D	0x831C	#<CJK>
-0xD37E	0x8322	#<CJK>
-0xD3A1	0x8342	#<CJK>
-0xD3A2	0x834E	#<CJK>
-0xD3A3	0x831B	#<CJK>
-0xD3A4	0x832A	#<CJK>
-0xD3A5	0x8308	#<CJK>
-0xD3A6	0x833C	#<CJK>
-0xD3A7	0x834D	#<CJK>
-0xD3A8	0x8316	#<CJK>
-0xD3A9	0x8324	#<CJK>
-0xD3AA	0x8320	#<CJK>
-0xD3AB	0x8337	#<CJK>
-0xD3AC	0x832F	#<CJK>
-0xD3AD	0x8329	#<CJK>
-0xD3AE	0x8347	#<CJK>
-0xD3AF	0x8345	#<CJK>
-0xD3B0	0x834C	#<CJK>
-0xD3B1	0x8353	#<CJK>
-0xD3B2	0x831E	#<CJK>
-0xD3B3	0x832C	#<CJK>
-0xD3B4	0x834B	#<CJK>
-0xD3B5	0x8327	#<CJK>
-0xD3B6	0x8348	#<CJK>
-0xD3B7	0x8653	#<CJK>
-0xD3B8	0x8652	#<CJK>
-0xD3B9	0x86A2	#<CJK>
-0xD3BA	0x86A8	#<CJK>
-0xD3BB	0x8696	#<CJK>
-0xD3BC	0x868D	#<CJK>
-0xD3BD	0x8691	#<CJK>
-0xD3BE	0x869E	#<CJK>
-0xD3BF	0x8687	#<CJK>
-0xD3C0	0x8697	#<CJK>
-0xD3C1	0x8686	#<CJK>
-0xD3C2	0x868B	#<CJK>
-0xD3C3	0x869A	#<CJK>
-0xD3C4	0x8685	#<CJK>
-0xD3C5	0x86A5	#<CJK>
-0xD3C6	0x8699	#<CJK>
-0xD3C7	0x86A1	#<CJK>
-0xD3C8	0x86A7	#<CJK>
-0xD3C9	0x8695	#<CJK>
-0xD3CA	0x8698	#<CJK>
-0xD3CB	0x868E	#<CJK>
-0xD3CC	0x869D	#<CJK>
-0xD3CD	0x8690	#<CJK>
-0xD3CE	0x8694	#<CJK>
-0xD3CF	0x8843	#<CJK>
-0xD3D0	0x8844	#<CJK>
-0xD3D1	0x886D	#<CJK>
-0xD3D2	0x8875	#<CJK>
-0xD3D3	0x8876	#<CJK>
-0xD3D4	0x8872	#<CJK>
-0xD3D5	0x8880	#<CJK>
-0xD3D6	0x8871	#<CJK>
-0xD3D7	0x887F	#<CJK>
-0xD3D8	0x886F	#<CJK>
-0xD3D9	0x8883	#<CJK>
-0xD3DA	0x887E	#<CJK>
-0xD3DB	0x8874	#<CJK>
-0xD3DC	0x887C	#<CJK>
-0xD3DD	0x8A12	#<CJK>
-0xD3DE	0x8C47	#<CJK>
-0xD3DF	0x8C57	#<CJK>
-0xD3E0	0x8C7B	#<CJK>
-0xD3E1	0x8CA4	#<CJK>
-0xD3E2	0x8CA3	#<CJK>
-0xD3E3	0x8D76	#<CJK>
-0xD3E4	0x8D78	#<CJK>
-0xD3E5	0x8DB5	#<CJK>
-0xD3E6	0x8DB7	#<CJK>
-0xD3E7	0x8DB6	#<CJK>
-0xD3E8	0x8ED1	#<CJK>
-0xD3E9	0x8ED3	#<CJK>
-0xD3EA	0x8FFE	#<CJK>
-0xD3EB	0x8FF5	#<CJK>
-0xD3EC	0x9002	#<CJK>
-0xD3ED	0x8FFF	#<CJK>
-0xD3EE	0x8FFB	#<CJK>
-0xD3EF	0x9004	#<CJK>
-0xD3F0	0x8FFC	#<CJK>
-0xD3F1	0x8FF6	#<CJK>
-0xD3F2	0x90D6	#<CJK>
-0xD3F3	0x90E0	#<CJK>
-0xD3F4	0x90D9	#<CJK>
-0xD3F5	0x90DA	#<CJK>
-0xD3F6	0x90E3	#<CJK>
-0xD3F7	0x90DF	#<CJK>
-0xD3F8	0x90E5	#<CJK>
-0xD3F9	0x90D8	#<CJK>
-0xD3FA	0x90DB	#<CJK>
-0xD3FB	0x90D7	#<CJK>
-0xD3FC	0x90DC	#<CJK>
-0xD3FD	0x90E4	#<CJK>
-0xD3FE	0x9150	#<CJK>
-0xD440	0x914E	#<CJK>
-0xD441	0x914F	#<CJK>
-0xD442	0x91D5	#<CJK>
-0xD443	0x91E2	#<CJK>
-0xD444	0x91DA	#<CJK>
-0xD445	0x965C	#<CJK>
-0xD446	0x965F	#<CJK>
-0xD447	0x96BC	#<CJK>
-0xD448	0x98E3	#<CJK>
-0xD449	0x9ADF	#<CJK>
-0xD44A	0x9B2F	#<CJK>
-0xD44B	0x4E7F	#<CJK>
-0xD44C	0x5070	#<CJK>
-0xD44D	0x506A	#<CJK>
-0xD44E	0x5061	#<CJK>
-0xD44F	0x505E	#<CJK>
-0xD450	0x5060	#<CJK>
-0xD451	0x5053	#<CJK>
-0xD452	0x504B	#<CJK>
-0xD453	0x505D	#<CJK>
-0xD454	0x5072	#<CJK>
-0xD455	0x5048	#<CJK>
-0xD456	0x504D	#<CJK>
-0xD457	0x5041	#<CJK>
-0xD458	0x505B	#<CJK>
-0xD459	0x504A	#<CJK>
-0xD45A	0x5062	#<CJK>
-0xD45B	0x5015	#<CJK>
-0xD45C	0x5045	#<CJK>
-0xD45D	0x505F	#<CJK>
-0xD45E	0x5069	#<CJK>
-0xD45F	0x506B	#<CJK>
-0xD460	0x5063	#<CJK>
-0xD461	0x5064	#<CJK>
-0xD462	0x5046	#<CJK>
-0xD463	0x5040	#<CJK>
-0xD464	0x506E	#<CJK>
-0xD465	0x5073	#<CJK>
-0xD466	0x5057	#<CJK>
-0xD467	0x5051	#<CJK>
-0xD468	0x51D0	#<CJK>
-0xD469	0x526B	#<CJK>
-0xD46A	0x526D	#<CJK>
-0xD46B	0x526C	#<CJK>
-0xD46C	0x526E	#<CJK>
-0xD46D	0x52D6	#<CJK>
-0xD46E	0x52D3	#<CJK>
-0xD46F	0x532D	#<CJK>
-0xD470	0x539C	#<CJK>
-0xD471	0x5575	#<CJK>
-0xD472	0x5576	#<CJK>
-0xD473	0x553C	#<CJK>
-0xD474	0x554D	#<CJK>
-0xD475	0x5550	#<CJK>
-0xD476	0x5534	#<CJK>
-0xD477	0x552A	#<CJK>
-0xD478	0x5551	#<CJK>
-0xD479	0x5562	#<CJK>
-0xD47A	0x5536	#<CJK>
-0xD47B	0x5535	#<CJK>
-0xD47C	0x5530	#<CJK>
-0xD47D	0x5552	#<CJK>
-0xD47E	0x5545	#<CJK>
-0xD4A1	0x550C	#<CJK>
-0xD4A2	0x5532	#<CJK>
-0xD4A3	0x5565	#<CJK>
-0xD4A4	0x554E	#<CJK>
-0xD4A5	0x5539	#<CJK>
-0xD4A6	0x5548	#<CJK>
-0xD4A7	0x552D	#<CJK>
-0xD4A8	0x553B	#<CJK>
-0xD4A9	0x5540	#<CJK>
-0xD4AA	0x554B	#<CJK>
-0xD4AB	0x570A	#<CJK>
-0xD4AC	0x5707	#<CJK>
-0xD4AD	0x57FB	#<CJK>
-0xD4AE	0x5814	#<CJK>
-0xD4AF	0x57E2	#<CJK>
-0xD4B0	0x57F6	#<CJK>
-0xD4B1	0x57DC	#<CJK>
-0xD4B2	0x57F4	#<CJK>
-0xD4B3	0x5800	#<CJK>
-0xD4B4	0x57ED	#<CJK>
-0xD4B5	0x57FD	#<CJK>
-0xD4B6	0x5808	#<CJK>
-0xD4B7	0x57F8	#<CJK>
-0xD4B8	0x580B	#<CJK>
-0xD4B9	0x57F3	#<CJK>
-0xD4BA	0x57CF	#<CJK>
-0xD4BB	0x5807	#<CJK>
-0xD4BC	0x57EE	#<CJK>
-0xD4BD	0x57E3	#<CJK>
-0xD4BE	0x57F2	#<CJK>
-0xD4BF	0x57E5	#<CJK>
-0xD4C0	0x57EC	#<CJK>
-0xD4C1	0x57E1	#<CJK>
-0xD4C2	0x580E	#<CJK>
-0xD4C3	0x57FC	#<CJK>
-0xD4C4	0x5810	#<CJK>
-0xD4C5	0x57E7	#<CJK>
-0xD4C6	0x5801	#<CJK>
-0xD4C7	0x580C	#<CJK>
-0xD4C8	0x57F1	#<CJK>
-0xD4C9	0x57E9	#<CJK>
-0xD4CA	0x57F0	#<CJK>
-0xD4CB	0x580D	#<CJK>
-0xD4CC	0x5804	#<CJK>
-0xD4CD	0x595C	#<CJK>
-0xD4CE	0x5A60	#<CJK>
-0xD4CF	0x5A58	#<CJK>
-0xD4D0	0x5A55	#<CJK>
-0xD4D1	0x5A67	#<CJK>
-0xD4D2	0x5A5E	#<CJK>
-0xD4D3	0x5A38	#<CJK>
-0xD4D4	0x5A35	#<CJK>
-0xD4D5	0x5A6D	#<CJK>
-0xD4D6	0x5A50	#<CJK>
-0xD4D7	0x5A5F	#<CJK>
-0xD4D8	0x5A65	#<CJK>
-0xD4D9	0x5A6C	#<CJK>
-0xD4DA	0x5A53	#<CJK>
-0xD4DB	0x5A64	#<CJK>
-0xD4DC	0x5A57	#<CJK>
-0xD4DD	0x5A43	#<CJK>
-0xD4DE	0x5A5D	#<CJK>
-0xD4DF	0x5A52	#<CJK>
-0xD4E0	0x5A44	#<CJK>
-0xD4E1	0x5A5B	#<CJK>
-0xD4E2	0x5A48	#<CJK>
-0xD4E3	0x5A8E	#<CJK>
-0xD4E4	0x5A3E	#<CJK>
-0xD4E5	0x5A4D	#<CJK>
-0xD4E6	0x5A39	#<CJK>
-0xD4E7	0x5A4C	#<CJK>
-0xD4E8	0x5A70	#<CJK>
-0xD4E9	0x5A69	#<CJK>
-0xD4EA	0x5A47	#<CJK>
-0xD4EB	0x5A51	#<CJK>
-0xD4EC	0x5A56	#<CJK>
-0xD4ED	0x5A42	#<CJK>
-0xD4EE	0x5A5C	#<CJK>
-0xD4EF	0x5B72	#<CJK>
-0xD4F0	0x5B6E	#<CJK>
-0xD4F1	0x5BC1	#<CJK>
-0xD4F2	0x5BC0	#<CJK>
-0xD4F3	0x5C59	#<CJK>
-0xD4F4	0x5D1E	#<CJK>
-0xD4F5	0x5D0B	#<CJK>
-0xD4F6	0x5D1D	#<CJK>
-0xD4F7	0x5D1A	#<CJK>
-0xD4F8	0x5D20	#<CJK>
-0xD4F9	0x5D0C	#<CJK>
-0xD4FA	0x5D28	#<CJK>
-0xD4FB	0x5D0D	#<CJK>
-0xD4FC	0x5D26	#<CJK>
-0xD4FD	0x5D25	#<CJK>
-0xD4FE	0x5D0F	#<CJK>
-0xD540	0x5D30	#<CJK>
-0xD541	0x5D12	#<CJK>
-0xD542	0x5D23	#<CJK>
-0xD543	0x5D1F	#<CJK>
-0xD544	0x5D2E	#<CJK>
-0xD545	0x5E3E	#<CJK>
-0xD546	0x5E34	#<CJK>
-0xD547	0x5EB1	#<CJK>
-0xD548	0x5EB4	#<CJK>
-0xD549	0x5EB9	#<CJK>
-0xD54A	0x5EB2	#<CJK>
-0xD54B	0x5EB3	#<CJK>
-0xD54C	0x5F36	#<CJK>
-0xD54D	0x5F38	#<CJK>
-0xD54E	0x5F9B	#<CJK>
-0xD54F	0x5F96	#<CJK>
-0xD550	0x5F9F	#<CJK>
-0xD551	0x608A	#<CJK>
-0xD552	0x6090	#<CJK>
-0xD553	0x6086	#<CJK>
-0xD554	0x60BE	#<CJK>
-0xD555	0x60B0	#<CJK>
-0xD556	0x60BA	#<CJK>
-0xD557	0x60D3	#<CJK>
-0xD558	0x60D4	#<CJK>
-0xD559	0x60CF	#<CJK>
-0xD55A	0x60E4	#<CJK>
-0xD55B	0x60D9	#<CJK>
-0xD55C	0x60DD	#<CJK>
-0xD55D	0x60C8	#<CJK>
-0xD55E	0x60B1	#<CJK>
-0xD55F	0x60DB	#<CJK>
-0xD560	0x60B7	#<CJK>
-0xD561	0x60CA	#<CJK>
-0xD562	0x60BF	#<CJK>
-0xD563	0x60C3	#<CJK>
-0xD564	0x60CD	#<CJK>
-0xD565	0x60C0	#<CJK>
-0xD566	0x6332	#<CJK>
-0xD567	0x6365	#<CJK>
-0xD568	0x638A	#<CJK>
-0xD569	0x6382	#<CJK>
-0xD56A	0x637D	#<CJK>
-0xD56B	0x63BD	#<CJK>
-0xD56C	0x639E	#<CJK>
-0xD56D	0x63AD	#<CJK>
-0xD56E	0x639D	#<CJK>
-0xD56F	0x6397	#<CJK>
-0xD570	0x63AB	#<CJK>
-0xD571	0x638E	#<CJK>
-0xD572	0x636F	#<CJK>
-0xD573	0x6387	#<CJK>
-0xD574	0x6390	#<CJK>
-0xD575	0x636E	#<CJK>
-0xD576	0x63AF	#<CJK>
-0xD577	0x6375	#<CJK>
-0xD578	0x639C	#<CJK>
-0xD579	0x636D	#<CJK>
-0xD57A	0x63AE	#<CJK>
-0xD57B	0x637C	#<CJK>
-0xD57C	0x63A4	#<CJK>
-0xD57D	0x633B	#<CJK>
-0xD57E	0x639F	#<CJK>
-0xD5A1	0x6378	#<CJK>
-0xD5A2	0x6385	#<CJK>
-0xD5A3	0x6381	#<CJK>
-0xD5A4	0x6391	#<CJK>
-0xD5A5	0x638D	#<CJK>
-0xD5A6	0x6370	#<CJK>
-0xD5A7	0x6553	#<CJK>
-0xD5A8	0x65CD	#<CJK>
-0xD5A9	0x6665	#<CJK>
-0xD5AA	0x6661	#<CJK>
-0xD5AB	0x665B	#<CJK>
-0xD5AC	0x6659	#<CJK>
-0xD5AD	0x665C	#<CJK>
-0xD5AE	0x6662	#<CJK>
-0xD5AF	0x6718	#<CJK>
-0xD5B0	0x6879	#<CJK>
-0xD5B1	0x6887	#<CJK>
-0xD5B2	0x6890	#<CJK>
-0xD5B3	0x689C	#<CJK>
-0xD5B4	0x686D	#<CJK>
-0xD5B5	0x686E	#<CJK>
-0xD5B6	0x68AE	#<CJK>
-0xD5B7	0x68AB	#<CJK>
-0xD5B8	0x6956	#<CJK>
-0xD5B9	0x686F	#<CJK>
-0xD5BA	0x68A3	#<CJK>
-0xD5BB	0x68AC	#<CJK>
-0xD5BC	0x68A9	#<CJK>
-0xD5BD	0x6875	#<CJK>
-0xD5BE	0x6874	#<CJK>
-0xD5BF	0x68B2	#<CJK>
-0xD5C0	0x688F	#<CJK>
-0xD5C1	0x6877	#<CJK>
-0xD5C2	0x6892	#<CJK>
-0xD5C3	0x687C	#<CJK>
-0xD5C4	0x686B	#<CJK>
-0xD5C5	0x6872	#<CJK>
-0xD5C6	0x68AA	#<CJK>
-0xD5C7	0x6880	#<CJK>
-0xD5C8	0x6871	#<CJK>
-0xD5C9	0x687E	#<CJK>
-0xD5CA	0x689B	#<CJK>
-0xD5CB	0x6896	#<CJK>
-0xD5CC	0x688B	#<CJK>
-0xD5CD	0x68A0	#<CJK>
-0xD5CE	0x6889	#<CJK>
-0xD5CF	0x68A4	#<CJK>
-0xD5D0	0x6878	#<CJK>
-0xD5D1	0x687B	#<CJK>
-0xD5D2	0x6891	#<CJK>
-0xD5D3	0x688C	#<CJK>
-0xD5D4	0x688A	#<CJK>
-0xD5D5	0x687D	#<CJK>
-0xD5D6	0x6B36	#<CJK>
-0xD5D7	0x6B33	#<CJK>
-0xD5D8	0x6B37	#<CJK>
-0xD5D9	0x6B38	#<CJK>
-0xD5DA	0x6B91	#<CJK>
-0xD5DB	0x6B8F	#<CJK>
-0xD5DC	0x6B8D	#<CJK>
-0xD5DD	0x6B8E	#<CJK>
-0xD5DE	0x6B8C	#<CJK>
-0xD5DF	0x6C2A	#<CJK>
-0xD5E0	0x6DC0	#<CJK>
-0xD5E1	0x6DAB	#<CJK>
-0xD5E2	0x6DB4	#<CJK>
-0xD5E3	0x6DB3	#<CJK>
-0xD5E4	0x6E74	#<CJK>
-0xD5E5	0x6DAC	#<CJK>
-0xD5E6	0x6DE9	#<CJK>
-0xD5E7	0x6DE2	#<CJK>
-0xD5E8	0x6DB7	#<CJK>
-0xD5E9	0x6DF6	#<CJK>
-0xD5EA	0x6DD4	#<CJK>
-0xD5EB	0x6E00	#<CJK>
-0xD5EC	0x6DC8	#<CJK>
-0xD5ED	0x6DE0	#<CJK>
-0xD5EE	0x6DDF	#<CJK>
-0xD5EF	0x6DD6	#<CJK>
-0xD5F0	0x6DBE	#<CJK>
-0xD5F1	0x6DE5	#<CJK>
-0xD5F2	0x6DDC	#<CJK>
-0xD5F3	0x6DDD	#<CJK>
-0xD5F4	0x6DDB	#<CJK>
-0xD5F5	0x6DF4	#<CJK>
-0xD5F6	0x6DCA	#<CJK>
-0xD5F7	0x6DBD	#<CJK>
-0xD5F8	0x6DED	#<CJK>
-0xD5F9	0x6DF0	#<CJK>
-0xD5FA	0x6DBA	#<CJK>
-0xD5FB	0x6DD5	#<CJK>
-0xD5FC	0x6DC2	#<CJK>
-0xD5FD	0x6DCF	#<CJK>
-0xD5FE	0x6DC9	#<CJK>
-0xD640	0x6DD0	#<CJK>
-0xD641	0x6DF2	#<CJK>
-0xD642	0x6DD3	#<CJK>
-0xD643	0x6DFD	#<CJK>
-0xD644	0x6DD7	#<CJK>
-0xD645	0x6DCD	#<CJK>
-0xD646	0x6DE3	#<CJK>
-0xD647	0x6DBB	#<CJK>
-0xD648	0x70FA	#<CJK>
-0xD649	0x710D	#<CJK>
-0xD64A	0x70F7	#<CJK>
-0xD64B	0x7117	#<CJK>
-0xD64C	0x70F4	#<CJK>
-0xD64D	0x710C	#<CJK>
-0xD64E	0x70F0	#<CJK>
-0xD64F	0x7104	#<CJK>
-0xD650	0x70F3	#<CJK>
-0xD651	0x7110	#<CJK>
-0xD652	0x70FC	#<CJK>
-0xD653	0x70FF	#<CJK>
-0xD654	0x7106	#<CJK>
-0xD655	0x7113	#<CJK>
-0xD656	0x7100	#<CJK>
-0xD657	0x70F8	#<CJK>
-0xD658	0x70F6	#<CJK>
-0xD659	0x710B	#<CJK>
-0xD65A	0x7102	#<CJK>
-0xD65B	0x710E	#<CJK>
-0xD65C	0x727E	#<CJK>
-0xD65D	0x727B	#<CJK>
-0xD65E	0x727C	#<CJK>
-0xD65F	0x727F	#<CJK>
-0xD660	0x731D	#<CJK>
-0xD661	0x7317	#<CJK>
-0xD662	0x7307	#<CJK>
-0xD663	0x7311	#<CJK>
-0xD664	0x7318	#<CJK>
-0xD665	0x730A	#<CJK>
-0xD666	0x7308	#<CJK>
-0xD667	0x72FF	#<CJK>
-0xD668	0x730F	#<CJK>
-0xD669	0x731E	#<CJK>
-0xD66A	0x7388	#<CJK>
-0xD66B	0x73F6	#<CJK>
-0xD66C	0x73F8	#<CJK>
-0xD66D	0x73F5	#<CJK>
-0xD66E	0x7404	#<CJK>
-0xD66F	0x7401	#<CJK>
-0xD670	0x73FD	#<CJK>
-0xD671	0x7407	#<CJK>
-0xD672	0x7400	#<CJK>
-0xD673	0x73FA	#<CJK>
-0xD674	0x73FC	#<CJK>
-0xD675	0x73FF	#<CJK>
-0xD676	0x740C	#<CJK>
-0xD677	0x740B	#<CJK>
-0xD678	0x73F4	#<CJK>
-0xD679	0x7408	#<CJK>
-0xD67A	0x7564	#<CJK>
-0xD67B	0x7563	#<CJK>
-0xD67C	0x75CE	#<CJK>
-0xD67D	0x75D2	#<CJK>
-0xD67E	0x75CF	#<CJK>
-0xD6A1	0x75CB	#<CJK>
-0xD6A2	0x75CC	#<CJK>
-0xD6A3	0x75D1	#<CJK>
-0xD6A4	0x75D0	#<CJK>
-0xD6A5	0x768F	#<CJK>
-0xD6A6	0x7689	#<CJK>
-0xD6A7	0x76D3	#<CJK>
-0xD6A8	0x7739	#<CJK>
-0xD6A9	0x772F	#<CJK>
-0xD6AA	0x772D	#<CJK>
-0xD6AB	0x7731	#<CJK>
-0xD6AC	0x7732	#<CJK>
-0xD6AD	0x7734	#<CJK>
-0xD6AE	0x7733	#<CJK>
-0xD6AF	0x773D	#<CJK>
-0xD6B0	0x7725	#<CJK>
-0xD6B1	0x773B	#<CJK>
-0xD6B2	0x7735	#<CJK>
-0xD6B3	0x7848	#<CJK>
-0xD6B4	0x7852	#<CJK>
-0xD6B5	0x7849	#<CJK>
-0xD6B6	0x784D	#<CJK>
-0xD6B7	0x784A	#<CJK>
-0xD6B8	0x784C	#<CJK>
-0xD6B9	0x7826	#<CJK>
-0xD6BA	0x7845	#<CJK>
-0xD6BB	0x7850	#<CJK>
-0xD6BC	0x7964	#<CJK>
-0xD6BD	0x7967	#<CJK>
-0xD6BE	0x7969	#<CJK>
-0xD6BF	0x796A	#<CJK>
-0xD6C0	0x7963	#<CJK>
-0xD6C1	0x796B	#<CJK>
-0xD6C2	0x7961	#<CJK>
-0xD6C3	0x79BB	#<CJK>
-0xD6C4	0x79FA	#<CJK>
-0xD6C5	0x79F8	#<CJK>
-0xD6C6	0x79F6	#<CJK>
-0xD6C7	0x79F7	#<CJK>
-0xD6C8	0x7A8F	#<CJK>
-0xD6C9	0x7A94	#<CJK>
-0xD6CA	0x7A90	#<CJK>
-0xD6CB	0x7B35	#<CJK>
-0xD6CC	0x7B47	#<CJK>
-0xD6CD	0x7B34	#<CJK>
-0xD6CE	0x7B25	#<CJK>
-0xD6CF	0x7B30	#<CJK>
-0xD6D0	0x7B22	#<CJK>
-0xD6D1	0x7B24	#<CJK>
-0xD6D2	0x7B33	#<CJK>
-0xD6D3	0x7B18	#<CJK>
-0xD6D4	0x7B2A	#<CJK>
-0xD6D5	0x7B1D	#<CJK>
-0xD6D6	0x7B31	#<CJK>
-0xD6D7	0x7B2B	#<CJK>
-0xD6D8	0x7B2D	#<CJK>
-0xD6D9	0x7B2F	#<CJK>
-0xD6DA	0x7B32	#<CJK>
-0xD6DB	0x7B38	#<CJK>
-0xD6DC	0x7B1A	#<CJK>
-0xD6DD	0x7B23	#<CJK>
-0xD6DE	0x7C94	#<CJK>
-0xD6DF	0x7C98	#<CJK>
-0xD6E0	0x7C96	#<CJK>
-0xD6E1	0x7CA3	#<CJK>
-0xD6E2	0x7D35	#<CJK>
-0xD6E3	0x7D3D	#<CJK>
-0xD6E4	0x7D38	#<CJK>
-0xD6E5	0x7D36	#<CJK>
-0xD6E6	0x7D3A	#<CJK>
-0xD6E7	0x7D45	#<CJK>
-0xD6E8	0x7D2C	#<CJK>
-0xD6E9	0x7D29	#<CJK>
-0xD6EA	0x7D41	#<CJK>
-0xD6EB	0x7D47	#<CJK>
-0xD6EC	0x7D3E	#<CJK>
-0xD6ED	0x7D3F	#<CJK>
-0xD6EE	0x7D4A	#<CJK>
-0xD6EF	0x7D3B	#<CJK>
-0xD6F0	0x7D28	#<CJK>
-0xD6F1	0x7F63	#<CJK>
-0xD6F2	0x7F95	#<CJK>
-0xD6F3	0x7F9C	#<CJK>
-0xD6F4	0x7F9D	#<CJK>
-0xD6F5	0x7F9B	#<CJK>
-0xD6F6	0x7FCA	#<CJK>
-0xD6F7	0x7FCB	#<CJK>
-0xD6F8	0x7FCD	#<CJK>
-0xD6F9	0x7FD0	#<CJK>
-0xD6FA	0x7FD1	#<CJK>
-0xD6FB	0x7FC7	#<CJK>
-0xD6FC	0x7FCF	#<CJK>
-0xD6FD	0x7FC9	#<CJK>
-0xD6FE	0x801F	#<CJK>
-0xD740	0x801E	#<CJK>
-0xD741	0x801B	#<CJK>
-0xD742	0x8047	#<CJK>
-0xD743	0x8043	#<CJK>
-0xD744	0x8048	#<CJK>
-0xD745	0x8118	#<CJK>
-0xD746	0x8125	#<CJK>
-0xD747	0x8119	#<CJK>
-0xD748	0x811B	#<CJK>
-0xD749	0x812D	#<CJK>
-0xD74A	0x811F	#<CJK>
-0xD74B	0x812C	#<CJK>
-0xD74C	0x811E	#<CJK>
-0xD74D	0x8121	#<CJK>
-0xD74E	0x8115	#<CJK>
-0xD74F	0x8127	#<CJK>
-0xD750	0x811D	#<CJK>
-0xD751	0x8122	#<CJK>
-0xD752	0x8211	#<CJK>
-0xD753	0x8238	#<CJK>
-0xD754	0x8233	#<CJK>
-0xD755	0x823A	#<CJK>
-0xD756	0x8234	#<CJK>
-0xD757	0x8232	#<CJK>
-0xD758	0x8274	#<CJK>
-0xD759	0x8390	#<CJK>
-0xD75A	0x83A3	#<CJK>
-0xD75B	0x83A8	#<CJK>
-0xD75C	0x838D	#<CJK>
-0xD75D	0x837A	#<CJK>
-0xD75E	0x8373	#<CJK>
-0xD75F	0x83A4	#<CJK>
-0xD760	0x8374	#<CJK>
-0xD761	0x838F	#<CJK>
-0xD762	0x8381	#<CJK>
-0xD763	0x8395	#<CJK>
-0xD764	0x8399	#<CJK>
-0xD765	0x8375	#<CJK>
-0xD766	0x8394	#<CJK>
-0xD767	0x83A9	#<CJK>
-0xD768	0x837D	#<CJK>
-0xD769	0x8383	#<CJK>
-0xD76A	0x838C	#<CJK>
-0xD76B	0x839D	#<CJK>
-0xD76C	0x839B	#<CJK>
-0xD76D	0x83AA	#<CJK>
-0xD76E	0x838B	#<CJK>
-0xD76F	0x837E	#<CJK>
-0xD770	0x83A5	#<CJK>
-0xD771	0x83AF	#<CJK>
-0xD772	0x8388	#<CJK>
-0xD773	0x8397	#<CJK>
-0xD774	0x83B0	#<CJK>
-0xD775	0x837F	#<CJK>
-0xD776	0x83A6	#<CJK>
-0xD777	0x8387	#<CJK>
-0xD778	0x83AE	#<CJK>
-0xD779	0x8376	#<CJK>
-0xD77A	0x839A	#<CJK>
-0xD77B	0x8659	#<CJK>
-0xD77C	0x8656	#<CJK>
-0xD77D	0x86BF	#<CJK>
-0xD77E	0x86B7	#<CJK>
-0xD7A1	0x86C2	#<CJK>
-0xD7A2	0x86C1	#<CJK>
-0xD7A3	0x86C5	#<CJK>
-0xD7A4	0x86BA	#<CJK>
-0xD7A5	0x86B0	#<CJK>
-0xD7A6	0x86C8	#<CJK>
-0xD7A7	0x86B9	#<CJK>
-0xD7A8	0x86B3	#<CJK>
-0xD7A9	0x86B8	#<CJK>
-0xD7AA	0x86CC	#<CJK>
-0xD7AB	0x86B4	#<CJK>
-0xD7AC	0x86BB	#<CJK>
-0xD7AD	0x86BC	#<CJK>
-0xD7AE	0x86C3	#<CJK>
-0xD7AF	0x86BD	#<CJK>
-0xD7B0	0x86BE	#<CJK>
-0xD7B1	0x8852	#<CJK>
-0xD7B2	0x8889	#<CJK>
-0xD7B3	0x8895	#<CJK>
-0xD7B4	0x88A8	#<CJK>
-0xD7B5	0x88A2	#<CJK>
-0xD7B6	0x88AA	#<CJK>
-0xD7B7	0x889A	#<CJK>
-0xD7B8	0x8891	#<CJK>
-0xD7B9	0x88A1	#<CJK>
-0xD7BA	0x889F	#<CJK>
-0xD7BB	0x8898	#<CJK>
-0xD7BC	0x88A7	#<CJK>
-0xD7BD	0x8899	#<CJK>
-0xD7BE	0x889B	#<CJK>
-0xD7BF	0x8897	#<CJK>
-0xD7C0	0x88A4	#<CJK>
-0xD7C1	0x88AC	#<CJK>
-0xD7C2	0x888C	#<CJK>
-0xD7C3	0x8893	#<CJK>
-0xD7C4	0x888E	#<CJK>
-0xD7C5	0x8982	#<CJK>
-0xD7C6	0x89D6	#<CJK>
-0xD7C7	0x89D9	#<CJK>
-0xD7C8	0x89D5	#<CJK>
-0xD7C9	0x8A30	#<CJK>
-0xD7CA	0x8A27	#<CJK>
-0xD7CB	0x8A2C	#<CJK>
-0xD7CC	0x8A1E	#<CJK>
-0xD7CD	0x8C39	#<CJK>
-0xD7CE	0x8C3B	#<CJK>
-0xD7CF	0x8C5C	#<CJK>
-0xD7D0	0x8C5D	#<CJK>
-0xD7D1	0x8C7D	#<CJK>
-0xD7D2	0x8CA5	#<CJK>
-0xD7D3	0x8D7D	#<CJK>
-0xD7D4	0x8D7B	#<CJK>
-0xD7D5	0x8D79	#<CJK>
-0xD7D6	0x8DBC	#<CJK>
-0xD7D7	0x8DC2	#<CJK>
-0xD7D8	0x8DB9	#<CJK>
-0xD7D9	0x8DBF	#<CJK>
-0xD7DA	0x8DC1	#<CJK>
-0xD7DB	0x8ED8	#<CJK>
-0xD7DC	0x8EDE	#<CJK>
-0xD7DD	0x8EDD	#<CJK>
-0xD7DE	0x8EDC	#<CJK>
-0xD7DF	0x8ED7	#<CJK>
-0xD7E0	0x8EE0	#<CJK>
-0xD7E1	0x8EE1	#<CJK>
-0xD7E2	0x9024	#<CJK>
-0xD7E3	0x900B	#<CJK>
-0xD7E4	0x9011	#<CJK>
-0xD7E5	0x901C	#<CJK>
-0xD7E6	0x900C	#<CJK>
-0xD7E7	0x9021	#<CJK>
-0xD7E8	0x90EF	#<CJK>
-0xD7E9	0x90EA	#<CJK>
-0xD7EA	0x90F0	#<CJK>
-0xD7EB	0x90F4	#<CJK>
-0xD7EC	0x90F2	#<CJK>
-0xD7ED	0x90F3	#<CJK>
-0xD7EE	0x90D4	#<CJK>
-0xD7EF	0x90EB	#<CJK>
-0xD7F0	0x90EC	#<CJK>
-0xD7F1	0x90E9	#<CJK>
-0xD7F2	0x9156	#<CJK>
-0xD7F3	0x9158	#<CJK>
-0xD7F4	0x915A	#<CJK>
-0xD7F5	0x9153	#<CJK>
-0xD7F6	0x9155	#<CJK>
-0xD7F7	0x91EC	#<CJK>
-0xD7F8	0x91F4	#<CJK>
-0xD7F9	0x91F1	#<CJK>
-0xD7FA	0x91F3	#<CJK>
-0xD7FB	0x91F8	#<CJK>
-0xD7FC	0x91E4	#<CJK>
-0xD7FD	0x91F9	#<CJK>
-0xD7FE	0x91EA	#<CJK>
-0xD840	0x91EB	#<CJK>
-0xD841	0x91F7	#<CJK>
-0xD842	0x91E8	#<CJK>
-0xD843	0x91EE	#<CJK>
-0xD844	0x957A	#<CJK>
-0xD845	0x9586	#<CJK>
-0xD846	0x9588	#<CJK>
-0xD847	0x967C	#<CJK>
-0xD848	0x966D	#<CJK>
-0xD849	0x966B	#<CJK>
-0xD84A	0x9671	#<CJK>
-0xD84B	0x966F	#<CJK>
-0xD84C	0x96BF	#<CJK>
-0xD84D	0x976A	#<CJK>
-0xD84E	0x9804	#<CJK>
-0xD84F	0x98E5	#<CJK>
-0xD850	0x9997	#<CJK>
-0xD851	0x509B	#<CJK>
-0xD852	0x5095	#<CJK>
-0xD853	0x5094	#<CJK>
-0xD854	0x509E	#<CJK>
-0xD855	0x508B	#<CJK>
-0xD856	0x50A3	#<CJK>
-0xD857	0x5083	#<CJK>
-0xD858	0x508C	#<CJK>
-0xD859	0x508E	#<CJK>
-0xD85A	0x509D	#<CJK>
-0xD85B	0x5068	#<CJK>
-0xD85C	0x509C	#<CJK>
-0xD85D	0x5092	#<CJK>
-0xD85E	0x5082	#<CJK>
-0xD85F	0x5087	#<CJK>
-0xD860	0x515F	#<CJK>
-0xD861	0x51D4	#<CJK>
-0xD862	0x5312	#<CJK>
-0xD863	0x5311	#<CJK>
-0xD864	0x53A4	#<CJK>
-0xD865	0x53A7	#<CJK>
-0xD866	0x5591	#<CJK>
-0xD867	0x55A8	#<CJK>
-0xD868	0x55A5	#<CJK>
-0xD869	0x55AD	#<CJK>
-0xD86A	0x5577	#<CJK>
-0xD86B	0x5645	#<CJK>
-0xD86C	0x55A2	#<CJK>
-0xD86D	0x5593	#<CJK>
-0xD86E	0x5588	#<CJK>
-0xD86F	0x558F	#<CJK>
-0xD870	0x55B5	#<CJK>
-0xD871	0x5581	#<CJK>
-0xD872	0x55A3	#<CJK>
-0xD873	0x5592	#<CJK>
-0xD874	0x55A4	#<CJK>
-0xD875	0x557D	#<CJK>
-0xD876	0x558C	#<CJK>
-0xD877	0x55A6	#<CJK>
-0xD878	0x557F	#<CJK>
-0xD879	0x5595	#<CJK>
-0xD87A	0x55A1	#<CJK>
-0xD87B	0x558E	#<CJK>
-0xD87C	0x570C	#<CJK>
-0xD87D	0x5829	#<CJK>
-0xD87E	0x5837	#<CJK>
-0xD8A1	0x5819	#<CJK>
-0xD8A2	0x581E	#<CJK>
-0xD8A3	0x5827	#<CJK>
-0xD8A4	0x5823	#<CJK>
-0xD8A5	0x5828	#<CJK>
-0xD8A6	0x57F5	#<CJK>
-0xD8A7	0x5848	#<CJK>
-0xD8A8	0x5825	#<CJK>
-0xD8A9	0x581C	#<CJK>
-0xD8AA	0x581B	#<CJK>
-0xD8AB	0x5833	#<CJK>
-0xD8AC	0x583F	#<CJK>
-0xD8AD	0x5836	#<CJK>
-0xD8AE	0x582E	#<CJK>
-0xD8AF	0x5839	#<CJK>
-0xD8B0	0x5838	#<CJK>
-0xD8B1	0x582D	#<CJK>
-0xD8B2	0x582C	#<CJK>
-0xD8B3	0x583B	#<CJK>
-0xD8B4	0x5961	#<CJK>
-0xD8B5	0x5AAF	#<CJK>
-0xD8B6	0x5A94	#<CJK>
-0xD8B7	0x5A9F	#<CJK>
-0xD8B8	0x5A7A	#<CJK>
-0xD8B9	0x5AA2	#<CJK>
-0xD8BA	0x5A9E	#<CJK>
-0xD8BB	0x5A78	#<CJK>
-0xD8BC	0x5AA6	#<CJK>
-0xD8BD	0x5A7C	#<CJK>
-0xD8BE	0x5AA5	#<CJK>
-0xD8BF	0x5AAC	#<CJK>
-0xD8C0	0x5A95	#<CJK>
-0xD8C1	0x5AAE	#<CJK>
-0xD8C2	0x5A37	#<CJK>
-0xD8C3	0x5A84	#<CJK>
-0xD8C4	0x5A8A	#<CJK>
-0xD8C5	0x5A97	#<CJK>
-0xD8C6	0x5A83	#<CJK>
-0xD8C7	0x5A8B	#<CJK>
-0xD8C8	0x5AA9	#<CJK>
-0xD8C9	0x5A7B	#<CJK>
-0xD8CA	0x5A7D	#<CJK>
-0xD8CB	0x5A8C	#<CJK>
-0xD8CC	0x5A9C	#<CJK>
-0xD8CD	0x5A8F	#<CJK>
-0xD8CE	0x5A93	#<CJK>
-0xD8CF	0x5A9D	#<CJK>
-0xD8D0	0x5BEA	#<CJK>
-0xD8D1	0x5BCD	#<CJK>
-0xD8D2	0x5BCB	#<CJK>
-0xD8D3	0x5BD4	#<CJK>
-0xD8D4	0x5BD1	#<CJK>
-0xD8D5	0x5BCA	#<CJK>
-0xD8D6	0x5BCE	#<CJK>
-0xD8D7	0x5C0C	#<CJK>
-0xD8D8	0x5C30	#<CJK>
-0xD8D9	0x5D37	#<CJK>
-0xD8DA	0x5D43	#<CJK>
-0xD8DB	0x5D6B	#<CJK>
-0xD8DC	0x5D41	#<CJK>
-0xD8DD	0x5D4B	#<CJK>
-0xD8DE	0x5D3F	#<CJK>
-0xD8DF	0x5D35	#<CJK>
-0xD8E0	0x5D51	#<CJK>
-0xD8E1	0x5D4E	#<CJK>
-0xD8E2	0x5D55	#<CJK>
-0xD8E3	0x5D33	#<CJK>
-0xD8E4	0x5D3A	#<CJK>
-0xD8E5	0x5D52	#<CJK>
-0xD8E6	0x5D3D	#<CJK>
-0xD8E7	0x5D31	#<CJK>
-0xD8E8	0x5D59	#<CJK>
-0xD8E9	0x5D42	#<CJK>
-0xD8EA	0x5D39	#<CJK>
-0xD8EB	0x5D49	#<CJK>
-0xD8EC	0x5D38	#<CJK>
-0xD8ED	0x5D3C	#<CJK>
-0xD8EE	0x5D32	#<CJK>
-0xD8EF	0x5D36	#<CJK>
-0xD8F0	0x5D40	#<CJK>
-0xD8F1	0x5D45	#<CJK>
-0xD8F2	0x5E44	#<CJK>
-0xD8F3	0x5E41	#<CJK>
-0xD8F4	0x5F58	#<CJK>
-0xD8F5	0x5FA6	#<CJK>
-0xD8F6	0x5FA5	#<CJK>
-0xD8F7	0x5FAB	#<CJK>
-0xD8F8	0x60C9	#<CJK>
-0xD8F9	0x60B9	#<CJK>
-0xD8FA	0x60CC	#<CJK>
-0xD8FB	0x60E2	#<CJK>
-0xD8FC	0x60CE	#<CJK>
-0xD8FD	0x60C4	#<CJK>
-0xD8FE	0x6114	#<CJK>
-0xD940	0x60F2	#<CJK>
-0xD941	0x610A	#<CJK>
-0xD942	0x6116	#<CJK>
-0xD943	0x6105	#<CJK>
-0xD944	0x60F5	#<CJK>
-0xD945	0x6113	#<CJK>
-0xD946	0x60F8	#<CJK>
-0xD947	0x60FC	#<CJK>
-0xD948	0x60FE	#<CJK>
-0xD949	0x60C1	#<CJK>
-0xD94A	0x6103	#<CJK>
-0xD94B	0x6118	#<CJK>
-0xD94C	0x611D	#<CJK>
-0xD94D	0x6110	#<CJK>
-0xD94E	0x60FF	#<CJK>
-0xD94F	0x6104	#<CJK>
-0xD950	0x610B	#<CJK>
-0xD951	0x624A	#<CJK>
-0xD952	0x6394	#<CJK>
-0xD953	0x63B1	#<CJK>
-0xD954	0x63B0	#<CJK>
-0xD955	0x63CE	#<CJK>
-0xD956	0x63E5	#<CJK>
-0xD957	0x63E8	#<CJK>
-0xD958	0x63EF	#<CJK>
-0xD959	0x63C3	#<CJK>
-0xD95A	0x649D	#<CJK>
-0xD95B	0x63F3	#<CJK>
-0xD95C	0x63CA	#<CJK>
-0xD95D	0x63E0	#<CJK>
-0xD95E	0x63F6	#<CJK>
-0xD95F	0x63D5	#<CJK>
-0xD960	0x63F2	#<CJK>
-0xD961	0x63F5	#<CJK>
-0xD962	0x6461	#<CJK>
-0xD963	0x63DF	#<CJK>
-0xD964	0x63BE	#<CJK>
-0xD965	0x63DD	#<CJK>
-0xD966	0x63DC	#<CJK>
-0xD967	0x63C4	#<CJK>
-0xD968	0x63D8	#<CJK>
-0xD969	0x63D3	#<CJK>
-0xD96A	0x63C2	#<CJK>
-0xD96B	0x63C7	#<CJK>
-0xD96C	0x63CC	#<CJK>
-0xD96D	0x63CB	#<CJK>
-0xD96E	0x63C8	#<CJK>
-0xD96F	0x63F0	#<CJK>
-0xD970	0x63D7	#<CJK>
-0xD971	0x63D9	#<CJK>
-0xD972	0x6532	#<CJK>
-0xD973	0x6567	#<CJK>
-0xD974	0x656A	#<CJK>
-0xD975	0x6564	#<CJK>
-0xD976	0x655C	#<CJK>
-0xD977	0x6568	#<CJK>
-0xD978	0x6565	#<CJK>
-0xD979	0x658C	#<CJK>
-0xD97A	0x659D	#<CJK>
-0xD97B	0x659E	#<CJK>
-0xD97C	0x65AE	#<CJK>
-0xD97D	0x65D0	#<CJK>
-0xD97E	0x65D2	#<CJK>
-0xD9A1	0x667C	#<CJK>
-0xD9A2	0x666C	#<CJK>
-0xD9A3	0x667B	#<CJK>
-0xD9A4	0x6680	#<CJK>
-0xD9A5	0x6671	#<CJK>
-0xD9A6	0x6679	#<CJK>
-0xD9A7	0x666A	#<CJK>
-0xD9A8	0x6672	#<CJK>
-0xD9A9	0x6701	#<CJK>
-0xD9AA	0x690C	#<CJK>
-0xD9AB	0x68D3	#<CJK>
-0xD9AC	0x6904	#<CJK>
-0xD9AD	0x68DC	#<CJK>
-0xD9AE	0x692A	#<CJK>
-0xD9AF	0x68EC	#<CJK>
-0xD9B0	0x68EA	#<CJK>
-0xD9B1	0x68F1	#<CJK>
-0xD9B2	0x690F	#<CJK>
-0xD9B3	0x68D6	#<CJK>
-0xD9B4	0x68F7	#<CJK>
-0xD9B5	0x68EB	#<CJK>
-0xD9B6	0x68E4	#<CJK>
-0xD9B7	0x68F6	#<CJK>
-0xD9B8	0x6913	#<CJK>
-0xD9B9	0x6910	#<CJK>
-0xD9BA	0x68F3	#<CJK>
-0xD9BB	0x68E1	#<CJK>
-0xD9BC	0x6907	#<CJK>
-0xD9BD	0x68CC	#<CJK>
-0xD9BE	0x6908	#<CJK>
-0xD9BF	0x6970	#<CJK>
-0xD9C0	0x68B4	#<CJK>
-0xD9C1	0x6911	#<CJK>
-0xD9C2	0x68EF	#<CJK>
-0xD9C3	0x68C6	#<CJK>
-0xD9C4	0x6914	#<CJK>
-0xD9C5	0x68F8	#<CJK>
-0xD9C6	0x68D0	#<CJK>
-0xD9C7	0x68FD	#<CJK>
-0xD9C8	0x68FC	#<CJK>
-0xD9C9	0x68E8	#<CJK>
-0xD9CA	0x690B	#<CJK>
-0xD9CB	0x690A	#<CJK>
-0xD9CC	0x6917	#<CJK>
-0xD9CD	0x68CE	#<CJK>
-0xD9CE	0x68C8	#<CJK>
-0xD9CF	0x68DD	#<CJK>
-0xD9D0	0x68DE	#<CJK>
-0xD9D1	0x68E6	#<CJK>
-0xD9D2	0x68F4	#<CJK>
-0xD9D3	0x68D1	#<CJK>
-0xD9D4	0x6906	#<CJK>
-0xD9D5	0x68D4	#<CJK>
-0xD9D6	0x68E9	#<CJK>
-0xD9D7	0x6915	#<CJK>
-0xD9D8	0x6925	#<CJK>
-0xD9D9	0x68C7	#<CJK>
-0xD9DA	0x6B39	#<CJK>
-0xD9DB	0x6B3B	#<CJK>
-0xD9DC	0x6B3F	#<CJK>
-0xD9DD	0x6B3C	#<CJK>
-0xD9DE	0x6B94	#<CJK>
-0xD9DF	0x6B97	#<CJK>
-0xD9E0	0x6B99	#<CJK>
-0xD9E1	0x6B95	#<CJK>
-0xD9E2	0x6BBD	#<CJK>
-0xD9E3	0x6BF0	#<CJK>
-0xD9E4	0x6BF2	#<CJK>
-0xD9E5	0x6BF3	#<CJK>
-0xD9E6	0x6C30	#<CJK>
-0xD9E7	0x6DFC	#<CJK>
-0xD9E8	0x6E46	#<CJK>
-0xD9E9	0x6E47	#<CJK>
-0xD9EA	0x6E1F	#<CJK>
-0xD9EB	0x6E49	#<CJK>
-0xD9EC	0x6E88	#<CJK>
-0xD9ED	0x6E3C	#<CJK>
-0xD9EE	0x6E3D	#<CJK>
-0xD9EF	0x6E45	#<CJK>
-0xD9F0	0x6E62	#<CJK>
-0xD9F1	0x6E2B	#<CJK>
-0xD9F2	0x6E3F	#<CJK>
-0xD9F3	0x6E41	#<CJK>
-0xD9F4	0x6E5D	#<CJK>
-0xD9F5	0x6E73	#<CJK>
-0xD9F6	0x6E1C	#<CJK>
-0xD9F7	0x6E33	#<CJK>
-0xD9F8	0x6E4B	#<CJK>
-0xD9F9	0x6E40	#<CJK>
-0xD9FA	0x6E51	#<CJK>
-0xD9FB	0x6E3B	#<CJK>
-0xD9FC	0x6E03	#<CJK>
-0xD9FD	0x6E2E	#<CJK>
-0xD9FE	0x6E5E	#<CJK>
-0xDA40	0x6E68	#<CJK>
-0xDA41	0x6E5C	#<CJK>
-0xDA42	0x6E61	#<CJK>
-0xDA43	0x6E31	#<CJK>
-0xDA44	0x6E28	#<CJK>
-0xDA45	0x6E60	#<CJK>
-0xDA46	0x6E71	#<CJK>
-0xDA47	0x6E6B	#<CJK>
-0xDA48	0x6E39	#<CJK>
-0xDA49	0x6E22	#<CJK>
-0xDA4A	0x6E30	#<CJK>
-0xDA4B	0x6E53	#<CJK>
-0xDA4C	0x6E65	#<CJK>
-0xDA4D	0x6E27	#<CJK>
-0xDA4E	0x6E78	#<CJK>
-0xDA4F	0x6E64	#<CJK>
-0xDA50	0x6E77	#<CJK>
-0xDA51	0x6E55	#<CJK>
-0xDA52	0x6E79	#<CJK>
-0xDA53	0x6E52	#<CJK>
-0xDA54	0x6E66	#<CJK>
-0xDA55	0x6E35	#<CJK>
-0xDA56	0x6E36	#<CJK>
-0xDA57	0x6E5A	#<CJK>
-0xDA58	0x7120	#<CJK>
-0xDA59	0x711E	#<CJK>
-0xDA5A	0x712F	#<CJK>
-0xDA5B	0x70FB	#<CJK>
-0xDA5C	0x712E	#<CJK>
-0xDA5D	0x7131	#<CJK>
-0xDA5E	0x7123	#<CJK>
-0xDA5F	0x7125	#<CJK>
-0xDA60	0x7122	#<CJK>
-0xDA61	0x7132	#<CJK>
-0xDA62	0x711F	#<CJK>
-0xDA63	0x7128	#<CJK>
-0xDA64	0x713A	#<CJK>
-0xDA65	0x711B	#<CJK>
-0xDA66	0x724B	#<CJK>
-0xDA67	0x725A	#<CJK>
-0xDA68	0x7288	#<CJK>
-0xDA69	0x7289	#<CJK>
-0xDA6A	0x7286	#<CJK>
-0xDA6B	0x7285	#<CJK>
-0xDA6C	0x728B	#<CJK>
-0xDA6D	0x7312	#<CJK>
-0xDA6E	0x730B	#<CJK>
-0xDA6F	0x7330	#<CJK>
-0xDA70	0x7322	#<CJK>
-0xDA71	0x7331	#<CJK>
-0xDA72	0x7333	#<CJK>
-0xDA73	0x7327	#<CJK>
-0xDA74	0x7332	#<CJK>
-0xDA75	0x732D	#<CJK>
-0xDA76	0x7326	#<CJK>
-0xDA77	0x7323	#<CJK>
-0xDA78	0x7335	#<CJK>
-0xDA79	0x730C	#<CJK>
-0xDA7A	0x742E	#<CJK>
-0xDA7B	0x742C	#<CJK>
-0xDA7C	0x7430	#<CJK>
-0xDA7D	0x742B	#<CJK>
-0xDA7E	0x7416	#<CJK>
-0xDAA1	0x741A	#<CJK>
-0xDAA2	0x7421	#<CJK>
-0xDAA3	0x742D	#<CJK>
-0xDAA4	0x7431	#<CJK>
-0xDAA5	0x7424	#<CJK>
-0xDAA6	0x7423	#<CJK>
-0xDAA7	0x741D	#<CJK>
-0xDAA8	0x7429	#<CJK>
-0xDAA9	0x7420	#<CJK>
-0xDAAA	0x7432	#<CJK>
-0xDAAB	0x74FB	#<CJK>
-0xDAAC	0x752F	#<CJK>
-0xDAAD	0x756F	#<CJK>
-0xDAAE	0x756C	#<CJK>
-0xDAAF	0x75E7	#<CJK>
-0xDAB0	0x75DA	#<CJK>
-0xDAB1	0x75E1	#<CJK>
-0xDAB2	0x75E6	#<CJK>
-0xDAB3	0x75DD	#<CJK>
-0xDAB4	0x75DF	#<CJK>
-0xDAB5	0x75E4	#<CJK>
-0xDAB6	0x75D7	#<CJK>
-0xDAB7	0x7695	#<CJK>
-0xDAB8	0x7692	#<CJK>
-0xDAB9	0x76DA	#<CJK>
-0xDABA	0x7746	#<CJK>
-0xDABB	0x7747	#<CJK>
-0xDABC	0x7744	#<CJK>
-0xDABD	0x774D	#<CJK>
-0xDABE	0x7745	#<CJK>
-0xDABF	0x774A	#<CJK>
-0xDAC0	0x774E	#<CJK>
-0xDAC1	0x774B	#<CJK>
-0xDAC2	0x774C	#<CJK>
-0xDAC3	0x77DE	#<CJK>
-0xDAC4	0x77EC	#<CJK>
-0xDAC5	0x7860	#<CJK>
-0xDAC6	0x7864	#<CJK>
-0xDAC7	0x7865	#<CJK>
-0xDAC8	0x785C	#<CJK>
-0xDAC9	0x786D	#<CJK>
-0xDACA	0x7871	#<CJK>
-0xDACB	0x786A	#<CJK>
-0xDACC	0x786E	#<CJK>
-0xDACD	0x7870	#<CJK>
-0xDACE	0x7869	#<CJK>
-0xDACF	0x7868	#<CJK>
-0xDAD0	0x785E	#<CJK>
-0xDAD1	0x7862	#<CJK>
-0xDAD2	0x7974	#<CJK>
-0xDAD3	0x7973	#<CJK>
-0xDAD4	0x7972	#<CJK>
-0xDAD5	0x7970	#<CJK>
-0xDAD6	0x7A02	#<CJK>
-0xDAD7	0x7A0A	#<CJK>
-0xDAD8	0x7A03	#<CJK>
-0xDAD9	0x7A0C	#<CJK>
-0xDADA	0x7A04	#<CJK>
-0xDADB	0x7A99	#<CJK>
-0xDADC	0x7AE6	#<CJK>
-0xDADD	0x7AE4	#<CJK>
-0xDADE	0x7B4A	#<CJK>
-0xDADF	0x7B3B	#<CJK>
-0xDAE0	0x7B44	#<CJK>
-0xDAE1	0x7B48	#<CJK>
-0xDAE2	0x7B4C	#<CJK>
-0xDAE3	0x7B4E	#<CJK>
-0xDAE4	0x7B40	#<CJK>
-0xDAE5	0x7B58	#<CJK>
-0xDAE6	0x7B45	#<CJK>
-0xDAE7	0x7CA2	#<CJK>
-0xDAE8	0x7C9E	#<CJK>
-0xDAE9	0x7CA8	#<CJK>
-0xDAEA	0x7CA1	#<CJK>
-0xDAEB	0x7D58	#<CJK>
-0xDAEC	0x7D6F	#<CJK>
-0xDAED	0x7D63	#<CJK>
-0xDAEE	0x7D53	#<CJK>
-0xDAEF	0x7D56	#<CJK>
-0xDAF0	0x7D67	#<CJK>
-0xDAF1	0x7D6A	#<CJK>
-0xDAF2	0x7D4F	#<CJK>
-0xDAF3	0x7D6D	#<CJK>
-0xDAF4	0x7D5C	#<CJK>
-0xDAF5	0x7D6B	#<CJK>
-0xDAF6	0x7D52	#<CJK>
-0xDAF7	0x7D54	#<CJK>
-0xDAF8	0x7D69	#<CJK>
-0xDAF9	0x7D51	#<CJK>
-0xDAFA	0x7D5F	#<CJK>
-0xDAFB	0x7D4E	#<CJK>
-0xDAFC	0x7F3E	#<CJK>
-0xDAFD	0x7F3F	#<CJK>
-0xDAFE	0x7F65	#<CJK>
-0xDB40	0x7F66	#<CJK>
-0xDB41	0x7FA2	#<CJK>
-0xDB42	0x7FA0	#<CJK>
-0xDB43	0x7FA1	#<CJK>
-0xDB44	0x7FD7	#<CJK>
-0xDB45	0x8051	#<CJK>
-0xDB46	0x804F	#<CJK>
-0xDB47	0x8050	#<CJK>
-0xDB48	0x80FE	#<CJK>
-0xDB49	0x80D4	#<CJK>
-0xDB4A	0x8143	#<CJK>
-0xDB4B	0x814A	#<CJK>
-0xDB4C	0x8152	#<CJK>
-0xDB4D	0x814F	#<CJK>
-0xDB4E	0x8147	#<CJK>
-0xDB4F	0x813D	#<CJK>
-0xDB50	0x814D	#<CJK>
-0xDB51	0x813A	#<CJK>
-0xDB52	0x81E6	#<CJK>
-0xDB53	0x81EE	#<CJK>
-0xDB54	0x81F7	#<CJK>
-0xDB55	0x81F8	#<CJK>
-0xDB56	0x81F9	#<CJK>
-0xDB57	0x8204	#<CJK>
-0xDB58	0x823C	#<CJK>
-0xDB59	0x823D	#<CJK>
-0xDB5A	0x823F	#<CJK>
-0xDB5B	0x8275	#<CJK>
-0xDB5C	0x833B	#<CJK>
-0xDB5D	0x83CF	#<CJK>
-0xDB5E	0x83F9	#<CJK>
-0xDB5F	0x8423	#<CJK>
-0xDB60	0x83C0	#<CJK>
-0xDB61	0x83E8	#<CJK>
-0xDB62	0x8412	#<CJK>
-0xDB63	0x83E7	#<CJK>
-0xDB64	0x83E4	#<CJK>
-0xDB65	0x83FC	#<CJK>
-0xDB66	0x83F6	#<CJK>
-0xDB67	0x8410	#<CJK>
-0xDB68	0x83C6	#<CJK>
-0xDB69	0x83C8	#<CJK>
-0xDB6A	0x83EB	#<CJK>
-0xDB6B	0x83E3	#<CJK>
-0xDB6C	0x83BF	#<CJK>
-0xDB6D	0x8401	#<CJK>
-0xDB6E	0x83DD	#<CJK>
-0xDB6F	0x83E5	#<CJK>
-0xDB70	0x83D8	#<CJK>
-0xDB71	0x83FF	#<CJK>
-0xDB72	0x83E1	#<CJK>
-0xDB73	0x83CB	#<CJK>
-0xDB74	0x83CE	#<CJK>
-0xDB75	0x83D6	#<CJK>
-0xDB76	0x83F5	#<CJK>
-0xDB77	0x83C9	#<CJK>
-0xDB78	0x8409	#<CJK>
-0xDB79	0x840F	#<CJK>
-0xDB7A	0x83DE	#<CJK>
-0xDB7B	0x8411	#<CJK>
-0xDB7C	0x8406	#<CJK>
-0xDB7D	0x83C2	#<CJK>
-0xDB7E	0x83F3	#<CJK>
-0xDBA1	0x83D5	#<CJK>
-0xDBA2	0x83FA	#<CJK>
-0xDBA3	0x83C7	#<CJK>
-0xDBA4	0x83D1	#<CJK>
-0xDBA5	0x83EA	#<CJK>
-0xDBA6	0x8413	#<CJK>
-0xDBA7	0x83C3	#<CJK>
-0xDBA8	0x83EC	#<CJK>
-0xDBA9	0x83EE	#<CJK>
-0xDBAA	0x83C4	#<CJK>
-0xDBAB	0x83FB	#<CJK>
-0xDBAC	0x83D7	#<CJK>
-0xDBAD	0x83E2	#<CJK>
-0xDBAE	0x841B	#<CJK>
-0xDBAF	0x83DB	#<CJK>
-0xDBB0	0x83FE	#<CJK>
-0xDBB1	0x86D8	#<CJK>
-0xDBB2	0x86E2	#<CJK>
-0xDBB3	0x86E6	#<CJK>
-0xDBB4	0x86D3	#<CJK>
-0xDBB5	0x86E3	#<CJK>
-0xDBB6	0x86DA	#<CJK>
-0xDBB7	0x86EA	#<CJK>
-0xDBB8	0x86DD	#<CJK>
-0xDBB9	0x86EB	#<CJK>
-0xDBBA	0x86DC	#<CJK>
-0xDBBB	0x86EC	#<CJK>
-0xDBBC	0x86E9	#<CJK>
-0xDBBD	0x86D7	#<CJK>
-0xDBBE	0x86E8	#<CJK>
-0xDBBF	0x86D1	#<CJK>
-0xDBC0	0x8848	#<CJK>
-0xDBC1	0x8856	#<CJK>
-0xDBC2	0x8855	#<CJK>
-0xDBC3	0x88BA	#<CJK>
-0xDBC4	0x88D7	#<CJK>
-0xDBC5	0x88B9	#<CJK>
-0xDBC6	0x88B8	#<CJK>
-0xDBC7	0x88C0	#<CJK>
-0xDBC8	0x88BE	#<CJK>
-0xDBC9	0x88B6	#<CJK>
-0xDBCA	0x88BC	#<CJK>
-0xDBCB	0x88B7	#<CJK>
-0xDBCC	0x88BD	#<CJK>
-0xDBCD	0x88B2	#<CJK>
-0xDBCE	0x8901	#<CJK>
-0xDBCF	0x88C9	#<CJK>
-0xDBD0	0x8995	#<CJK>
-0xDBD1	0x8998	#<CJK>
-0xDBD2	0x8997	#<CJK>
-0xDBD3	0x89DD	#<CJK>
-0xDBD4	0x89DA	#<CJK>
-0xDBD5	0x89DB	#<CJK>
-0xDBD6	0x8A4E	#<CJK>
-0xDBD7	0x8A4D	#<CJK>
-0xDBD8	0x8A39	#<CJK>
-0xDBD9	0x8A59	#<CJK>
-0xDBDA	0x8A40	#<CJK>
-0xDBDB	0x8A57	#<CJK>
-0xDBDC	0x8A58	#<CJK>
-0xDBDD	0x8A44	#<CJK>
-0xDBDE	0x8A45	#<CJK>
-0xDBDF	0x8A52	#<CJK>
-0xDBE0	0x8A48	#<CJK>
-0xDBE1	0x8A51	#<CJK>
-0xDBE2	0x8A4A	#<CJK>
-0xDBE3	0x8A4C	#<CJK>
-0xDBE4	0x8A4F	#<CJK>
-0xDBE5	0x8C5F	#<CJK>
-0xDBE6	0x8C81	#<CJK>
-0xDBE7	0x8C80	#<CJK>
-0xDBE8	0x8CBA	#<CJK>
-0xDBE9	0x8CBE	#<CJK>
-0xDBEA	0x8CB0	#<CJK>
-0xDBEB	0x8CB9	#<CJK>
-0xDBEC	0x8CB5	#<CJK>
-0xDBED	0x8D84	#<CJK>
-0xDBEE	0x8D80	#<CJK>
-0xDBEF	0x8D89	#<CJK>
-0xDBF0	0x8DD8	#<CJK>
-0xDBF1	0x8DD3	#<CJK>
-0xDBF2	0x8DCD	#<CJK>
-0xDBF3	0x8DC7	#<CJK>
-0xDBF4	0x8DD6	#<CJK>
-0xDBF5	0x8DDC	#<CJK>
-0xDBF6	0x8DCF	#<CJK>
-0xDBF7	0x8DD5	#<CJK>
-0xDBF8	0x8DD9	#<CJK>
-0xDBF9	0x8DC8	#<CJK>
-0xDBFA	0x8DD7	#<CJK>
-0xDBFB	0x8DC5	#<CJK>
-0xDBFC	0x8EEF	#<CJK>
-0xDBFD	0x8EF7	#<CJK>
-0xDBFE	0x8EFA	#<CJK>
-0xDC40	0x8EF9	#<CJK>
-0xDC41	0x8EE6	#<CJK>
-0xDC42	0x8EEE	#<CJK>
-0xDC43	0x8EE5	#<CJK>
-0xDC44	0x8EF5	#<CJK>
-0xDC45	0x8EE7	#<CJK>
-0xDC46	0x8EE8	#<CJK>
-0xDC47	0x8EF6	#<CJK>
-0xDC48	0x8EEB	#<CJK>
-0xDC49	0x8EF1	#<CJK>
-0xDC4A	0x8EEC	#<CJK>
-0xDC4B	0x8EF4	#<CJK>
-0xDC4C	0x8EE9	#<CJK>
-0xDC4D	0x902D	#<CJK>
-0xDC4E	0x9034	#<CJK>
-0xDC4F	0x902F	#<CJK>
-0xDC50	0x9106	#<CJK>
-0xDC51	0x912C	#<CJK>
-0xDC52	0x9104	#<CJK>
-0xDC53	0x90FF	#<CJK>
-0xDC54	0x90FC	#<CJK>
-0xDC55	0x9108	#<CJK>
-0xDC56	0x90F9	#<CJK>
-0xDC57	0x90FB	#<CJK>
-0xDC58	0x9101	#<CJK>
-0xDC59	0x9100	#<CJK>
-0xDC5A	0x9107	#<CJK>
-0xDC5B	0x9105	#<CJK>
-0xDC5C	0x9103	#<CJK>
-0xDC5D	0x9161	#<CJK>
-0xDC5E	0x9164	#<CJK>
-0xDC5F	0x915F	#<CJK>
-0xDC60	0x9162	#<CJK>
-0xDC61	0x9160	#<CJK>
-0xDC62	0x9201	#<CJK>
-0xDC63	0x920A	#<CJK>
-0xDC64	0x9225	#<CJK>
-0xDC65	0x9203	#<CJK>
-0xDC66	0x921A	#<CJK>
-0xDC67	0x9226	#<CJK>
-0xDC68	0x920F	#<CJK>
-0xDC69	0x920C	#<CJK>
-0xDC6A	0x9200	#<CJK>
-0xDC6B	0x9212	#<CJK>
-0xDC6C	0x91FF	#<CJK>
-0xDC6D	0x91FD	#<CJK>
-0xDC6E	0x9206	#<CJK>
-0xDC6F	0x9204	#<CJK>
-0xDC70	0x9227	#<CJK>
-0xDC71	0x9202	#<CJK>
-0xDC72	0x921C	#<CJK>
-0xDC73	0x9224	#<CJK>
-0xDC74	0x9219	#<CJK>
-0xDC75	0x9217	#<CJK>
-0xDC76	0x9205	#<CJK>
-0xDC77	0x9216	#<CJK>
-0xDC78	0x957B	#<CJK>
-0xDC79	0x958D	#<CJK>
-0xDC7A	0x958C	#<CJK>
-0xDC7B	0x9590	#<CJK>
-0xDC7C	0x9687	#<CJK>
-0xDC7D	0x967E	#<CJK>
-0xDC7E	0x9688	#<CJK>
-0xDCA1	0x9689	#<CJK>
-0xDCA2	0x9683	#<CJK>
-0xDCA3	0x9680	#<CJK>
-0xDCA4	0x96C2	#<CJK>
-0xDCA5	0x96C8	#<CJK>
-0xDCA6	0x96C3	#<CJK>
-0xDCA7	0x96F1	#<CJK>
-0xDCA8	0x96F0	#<CJK>
-0xDCA9	0x976C	#<CJK>
-0xDCAA	0x9770	#<CJK>
-0xDCAB	0x976E	#<CJK>
-0xDCAC	0x9807	#<CJK>
-0xDCAD	0x98A9	#<CJK>
-0xDCAE	0x98EB	#<CJK>
-0xDCAF	0x9CE6	#<CJK>
-0xDCB0	0x9EF9	#<CJK>
-0xDCB1	0x4E83	#<CJK>
-0xDCB2	0x4E84	#<CJK>
-0xDCB3	0x4EB6	#<CJK>
-0xDCB4	0x50BD	#<CJK>
-0xDCB5	0x50BF	#<CJK>
-0xDCB6	0x50C6	#<CJK>
-0xDCB7	0x50AE	#<CJK>
-0xDCB8	0x50C4	#<CJK>
-0xDCB9	0x50CA	#<CJK>
-0xDCBA	0x50B4	#<CJK>
-0xDCBB	0x50C8	#<CJK>
-0xDCBC	0x50C2	#<CJK>
-0xDCBD	0x50B0	#<CJK>
-0xDCBE	0x50C1	#<CJK>
-0xDCBF	0x50BA	#<CJK>
-0xDCC0	0x50B1	#<CJK>
-0xDCC1	0x50CB	#<CJK>
-0xDCC2	0x50C9	#<CJK>
-0xDCC3	0x50B6	#<CJK>
-0xDCC4	0x50B8	#<CJK>
-0xDCC5	0x51D7	#<CJK>
-0xDCC6	0x527A	#<CJK>
-0xDCC7	0x5278	#<CJK>
-0xDCC8	0x527B	#<CJK>
-0xDCC9	0x527C	#<CJK>
-0xDCCA	0x55C3	#<CJK>
-0xDCCB	0x55DB	#<CJK>
-0xDCCC	0x55CC	#<CJK>
-0xDCCD	0x55D0	#<CJK>
-0xDCCE	0x55CB	#<CJK>
-0xDCCF	0x55CA	#<CJK>
-0xDCD0	0x55DD	#<CJK>
-0xDCD1	0x55C0	#<CJK>
-0xDCD2	0x55D4	#<CJK>
-0xDCD3	0x55C4	#<CJK>
-0xDCD4	0x55E9	#<CJK>
-0xDCD5	0x55BF	#<CJK>
-0xDCD6	0x55D2	#<CJK>
-0xDCD7	0x558D	#<CJK>
-0xDCD8	0x55CF	#<CJK>
-0xDCD9	0x55D5	#<CJK>
-0xDCDA	0x55E2	#<CJK>
-0xDCDB	0x55D6	#<CJK>
-0xDCDC	0x55C8	#<CJK>
-0xDCDD	0x55F2	#<CJK>
-0xDCDE	0x55CD	#<CJK>
-0xDCDF	0x55D9	#<CJK>
-0xDCE0	0x55C2	#<CJK>
-0xDCE1	0x5714	#<CJK>
-0xDCE2	0x5853	#<CJK>
-0xDCE3	0x5868	#<CJK>
-0xDCE4	0x5864	#<CJK>
-0xDCE5	0x584F	#<CJK>
-0xDCE6	0x584D	#<CJK>
-0xDCE7	0x5849	#<CJK>
-0xDCE8	0x586F	#<CJK>
-0xDCE9	0x5855	#<CJK>
-0xDCEA	0x584E	#<CJK>
-0xDCEB	0x585D	#<CJK>
-0xDCEC	0x5859	#<CJK>
-0xDCED	0x5865	#<CJK>
-0xDCEE	0x585B	#<CJK>
-0xDCEF	0x583D	#<CJK>
-0xDCF0	0x5863	#<CJK>
-0xDCF1	0x5871	#<CJK>
-0xDCF2	0x58FC	#<CJK>
-0xDCF3	0x5AC7	#<CJK>
-0xDCF4	0x5AC4	#<CJK>
-0xDCF5	0x5ACB	#<CJK>
-0xDCF6	0x5ABA	#<CJK>
-0xDCF7	0x5AB8	#<CJK>
-0xDCF8	0x5AB1	#<CJK>
-0xDCF9	0x5AB5	#<CJK>
-0xDCFA	0x5AB0	#<CJK>
-0xDCFB	0x5ABF	#<CJK>
-0xDCFC	0x5AC8	#<CJK>
-0xDCFD	0x5ABB	#<CJK>
-0xDCFE	0x5AC6	#<CJK>
-0xDD40	0x5AB7	#<CJK>
-0xDD41	0x5AC0	#<CJK>
-0xDD42	0x5ACA	#<CJK>
-0xDD43	0x5AB4	#<CJK>
-0xDD44	0x5AB6	#<CJK>
-0xDD45	0x5ACD	#<CJK>
-0xDD46	0x5AB9	#<CJK>
-0xDD47	0x5A90	#<CJK>
-0xDD48	0x5BD6	#<CJK>
-0xDD49	0x5BD8	#<CJK>
-0xDD4A	0x5BD9	#<CJK>
-0xDD4B	0x5C1F	#<CJK>
-0xDD4C	0x5C33	#<CJK>
-0xDD4D	0x5D71	#<CJK>
-0xDD4E	0x5D63	#<CJK>
-0xDD4F	0x5D4A	#<CJK>
-0xDD50	0x5D65	#<CJK>
-0xDD51	0x5D72	#<CJK>
-0xDD52	0x5D6C	#<CJK>
-0xDD53	0x5D5E	#<CJK>
-0xDD54	0x5D68	#<CJK>
-0xDD55	0x5D67	#<CJK>
-0xDD56	0x5D62	#<CJK>
-0xDD57	0x5DF0	#<CJK>
-0xDD58	0x5E4F	#<CJK>
-0xDD59	0x5E4E	#<CJK>
-0xDD5A	0x5E4A	#<CJK>
-0xDD5B	0x5E4D	#<CJK>
-0xDD5C	0x5E4B	#<CJK>
-0xDD5D	0x5EC5	#<CJK>
-0xDD5E	0x5ECC	#<CJK>
-0xDD5F	0x5EC6	#<CJK>
-0xDD60	0x5ECB	#<CJK>
-0xDD61	0x5EC7	#<CJK>
-0xDD62	0x5F40	#<CJK>
-0xDD63	0x5FAF	#<CJK>
-0xDD64	0x5FAD	#<CJK>
-0xDD65	0x60F7	#<CJK>
-0xDD66	0x6149	#<CJK>
-0xDD67	0x614A	#<CJK>
-0xDD68	0x612B	#<CJK>
-0xDD69	0x6145	#<CJK>
-0xDD6A	0x6136	#<CJK>
-0xDD6B	0x6132	#<CJK>
-0xDD6C	0x612E	#<CJK>
-0xDD6D	0x6146	#<CJK>
-0xDD6E	0x612F	#<CJK>
-0xDD6F	0x614F	#<CJK>
-0xDD70	0x6129	#<CJK>
-0xDD71	0x6140	#<CJK>
-0xDD72	0x6220	#<CJK>
-0xDD73	0x9168	#<CJK>
-0xDD74	0x6223	#<CJK>
-0xDD75	0x6225	#<CJK>
-0xDD76	0x6224	#<CJK>
-0xDD77	0x63C5	#<CJK>
-0xDD78	0x63F1	#<CJK>
-0xDD79	0x63EB	#<CJK>
-0xDD7A	0x6410	#<CJK>
-0xDD7B	0x6412	#<CJK>
-0xDD7C	0x6409	#<CJK>
-0xDD7D	0x6420	#<CJK>
-0xDD7E	0x6424	#<CJK>
-0xDDA1	0x6433	#<CJK>
-0xDDA2	0x6443	#<CJK>
-0xDDA3	0x641F	#<CJK>
-0xDDA4	0x6415	#<CJK>
-0xDDA5	0x6418	#<CJK>
-0xDDA6	0x6439	#<CJK>
-0xDDA7	0x6437	#<CJK>
-0xDDA8	0x6422	#<CJK>
-0xDDA9	0x6423	#<CJK>
-0xDDAA	0x640C	#<CJK>
-0xDDAB	0x6426	#<CJK>
-0xDDAC	0x6430	#<CJK>
-0xDDAD	0x6428	#<CJK>
-0xDDAE	0x6441	#<CJK>
-0xDDAF	0x6435	#<CJK>
-0xDDB0	0x642F	#<CJK>
-0xDDB1	0x640A	#<CJK>
-0xDDB2	0x641A	#<CJK>
-0xDDB3	0x6440	#<CJK>
-0xDDB4	0x6425	#<CJK>
-0xDDB5	0x6427	#<CJK>
-0xDDB6	0x640B	#<CJK>
-0xDDB7	0x63E7	#<CJK>
-0xDDB8	0x641B	#<CJK>
-0xDDB9	0x642E	#<CJK>
-0xDDBA	0x6421	#<CJK>
-0xDDBB	0x640E	#<CJK>
-0xDDBC	0x656F	#<CJK>
-0xDDBD	0x6592	#<CJK>
-0xDDBE	0x65D3	#<CJK>
-0xDDBF	0x6686	#<CJK>
-0xDDC0	0x668C	#<CJK>
-0xDDC1	0x6695	#<CJK>
-0xDDC2	0x6690	#<CJK>
-0xDDC3	0x668B	#<CJK>
-0xDDC4	0x668A	#<CJK>
-0xDDC5	0x6699	#<CJK>
-0xDDC6	0x6694	#<CJK>
-0xDDC7	0x6678	#<CJK>
-0xDDC8	0x6720	#<CJK>
-0xDDC9	0x6966	#<CJK>
-0xDDCA	0x695F	#<CJK>
-0xDDCB	0x6938	#<CJK>
-0xDDCC	0x694E	#<CJK>
-0xDDCD	0x6962	#<CJK>
-0xDDCE	0x6971	#<CJK>
-0xDDCF	0x693F	#<CJK>
-0xDDD0	0x6945	#<CJK>
-0xDDD1	0x696A	#<CJK>
-0xDDD2	0x6939	#<CJK>
-0xDDD3	0x6942	#<CJK>
-0xDDD4	0x6957	#<CJK>
-0xDDD5	0x6959	#<CJK>
-0xDDD6	0x697A	#<CJK>
-0xDDD7	0x6948	#<CJK>
-0xDDD8	0x6949	#<CJK>
-0xDDD9	0x6935	#<CJK>
-0xDDDA	0x696C	#<CJK>
-0xDDDB	0x6933	#<CJK>
-0xDDDC	0x693D	#<CJK>
-0xDDDD	0x6965	#<CJK>
-0xDDDE	0x68F0	#<CJK>
-0xDDDF	0x6978	#<CJK>
-0xDDE0	0x6934	#<CJK>
-0xDDE1	0x6969	#<CJK>
-0xDDE2	0x6940	#<CJK>
-0xDDE3	0x696F	#<CJK>
-0xDDE4	0x6944	#<CJK>
-0xDDE5	0x6976	#<CJK>
-0xDDE6	0x6958	#<CJK>
-0xDDE7	0x6941	#<CJK>
-0xDDE8	0x6974	#<CJK>
-0xDDE9	0x694C	#<CJK>
-0xDDEA	0x693B	#<CJK>
-0xDDEB	0x694B	#<CJK>
-0xDDEC	0x6937	#<CJK>
-0xDDED	0x695C	#<CJK>
-0xDDEE	0x694F	#<CJK>
-0xDDEF	0x6951	#<CJK>
-0xDDF0	0x6932	#<CJK>
-0xDDF1	0x6952	#<CJK>
-0xDDF2	0x692F	#<CJK>
-0xDDF3	0x697B	#<CJK>
-0xDDF4	0x693C	#<CJK>
-0xDDF5	0x6B46	#<CJK>
-0xDDF6	0x6B45	#<CJK>
-0xDDF7	0x6B43	#<CJK>
-0xDDF8	0x6B42	#<CJK>
-0xDDF9	0x6B48	#<CJK>
-0xDDFA	0x6B41	#<CJK>
-0xDDFB	0x6B9B	#<CJK>
-0xDDFC	0xFA0D	#<CJK>
-0xDDFD	0x6BFB	#<CJK>
-0xDDFE	0x6BFC	#<CJK>
-0xDE40	0x6BF9	#<CJK>
-0xDE41	0x6BF7	#<CJK>
-0xDE42	0x6BF8	#<CJK>
-0xDE43	0x6E9B	#<CJK>
-0xDE44	0x6ED6	#<CJK>
-0xDE45	0x6EC8	#<CJK>
-0xDE46	0x6E8F	#<CJK>
-0xDE47	0x6EC0	#<CJK>
-0xDE48	0x6E9F	#<CJK>
-0xDE49	0x6E93	#<CJK>
-0xDE4A	0x6E94	#<CJK>
-0xDE4B	0x6EA0	#<CJK>
-0xDE4C	0x6EB1	#<CJK>
-0xDE4D	0x6EB9	#<CJK>
-0xDE4E	0x6EC6	#<CJK>
-0xDE4F	0x6ED2	#<CJK>
-0xDE50	0x6EBD	#<CJK>
-0xDE51	0x6EC1	#<CJK>
-0xDE52	0x6E9E	#<CJK>
-0xDE53	0x6EC9	#<CJK>
-0xDE54	0x6EB7	#<CJK>
-0xDE55	0x6EB0	#<CJK>
-0xDE56	0x6ECD	#<CJK>
-0xDE57	0x6EA6	#<CJK>
-0xDE58	0x6ECF	#<CJK>
-0xDE59	0x6EB2	#<CJK>
-0xDE5A	0x6EBE	#<CJK>
-0xDE5B	0x6EC3	#<CJK>
-0xDE5C	0x6EDC	#<CJK>
-0xDE5D	0x6ED8	#<CJK>
-0xDE5E	0x6E99	#<CJK>
-0xDE5F	0x6E92	#<CJK>
-0xDE60	0x6E8E	#<CJK>
-0xDE61	0x6E8D	#<CJK>
-0xDE62	0x6EA4	#<CJK>
-0xDE63	0x6EA1	#<CJK>
-0xDE64	0x6EBF	#<CJK>
-0xDE65	0x6EB3	#<CJK>
-0xDE66	0x6ED0	#<CJK>
-0xDE67	0x6ECA	#<CJK>
-0xDE68	0x6E97	#<CJK>
-0xDE69	0x6EAE	#<CJK>
-0xDE6A	0x6EA3	#<CJK>
-0xDE6B	0x7147	#<CJK>
-0xDE6C	0x7154	#<CJK>
-0xDE6D	0x7152	#<CJK>
-0xDE6E	0x7163	#<CJK>
-0xDE6F	0x7160	#<CJK>
-0xDE70	0x7141	#<CJK>
-0xDE71	0x715D	#<CJK>
-0xDE72	0x7162	#<CJK>
-0xDE73	0x7172	#<CJK>
-0xDE74	0x7178	#<CJK>
-0xDE75	0x716A	#<CJK>
-0xDE76	0x7161	#<CJK>
-0xDE77	0x7142	#<CJK>
-0xDE78	0x7158	#<CJK>
-0xDE79	0x7143	#<CJK>
-0xDE7A	0x714B	#<CJK>
-0xDE7B	0x7170	#<CJK>
-0xDE7C	0x715F	#<CJK>
-0xDE7D	0x7150	#<CJK>
-0xDE7E	0x7153	#<CJK>
-0xDEA1	0x7144	#<CJK>
-0xDEA2	0x714D	#<CJK>
-0xDEA3	0x715A	#<CJK>
-0xDEA4	0x724F	#<CJK>
-0xDEA5	0x728D	#<CJK>
-0xDEA6	0x728C	#<CJK>
-0xDEA7	0x7291	#<CJK>
-0xDEA8	0x7290	#<CJK>
-0xDEA9	0x728E	#<CJK>
-0xDEAA	0x733C	#<CJK>
-0xDEAB	0x7342	#<CJK>
-0xDEAC	0x733B	#<CJK>
-0xDEAD	0x733A	#<CJK>
-0xDEAE	0x7340	#<CJK>
-0xDEAF	0x734A	#<CJK>
-0xDEB0	0x7349	#<CJK>
-0xDEB1	0x7444	#<CJK>
-0xDEB2	0x744A	#<CJK>
-0xDEB3	0x744B	#<CJK>
-0xDEB4	0x7452	#<CJK>
-0xDEB5	0x7451	#<CJK>
-0xDEB6	0x7457	#<CJK>
-0xDEB7	0x7440	#<CJK>
-0xDEB8	0x744F	#<CJK>
-0xDEB9	0x7450	#<CJK>
-0xDEBA	0x744E	#<CJK>
-0xDEBB	0x7442	#<CJK>
-0xDEBC	0x7446	#<CJK>
-0xDEBD	0x744D	#<CJK>
-0xDEBE	0x7454	#<CJK>
-0xDEBF	0x74E1	#<CJK>
-0xDEC0	0x74FF	#<CJK>
-0xDEC1	0x74FE	#<CJK>
-0xDEC2	0x74FD	#<CJK>
-0xDEC3	0x751D	#<CJK>
-0xDEC4	0x7579	#<CJK>
-0xDEC5	0x7577	#<CJK>
-0xDEC6	0x6983	#<CJK>
-0xDEC7	0x75EF	#<CJK>
-0xDEC8	0x760F	#<CJK>
-0xDEC9	0x7603	#<CJK>
-0xDECA	0x75F7	#<CJK>
-0xDECB	0x75FE	#<CJK>
-0xDECC	0x75FC	#<CJK>
-0xDECD	0x75F9	#<CJK>
-0xDECE	0x75F8	#<CJK>
-0xDECF	0x7610	#<CJK>
-0xDED0	0x75FB	#<CJK>
-0xDED1	0x75F6	#<CJK>
-0xDED2	0x75ED	#<CJK>
-0xDED3	0x75F5	#<CJK>
-0xDED4	0x75FD	#<CJK>
-0xDED5	0x7699	#<CJK>
-0xDED6	0x76B5	#<CJK>
-0xDED7	0x76DD	#<CJK>
-0xDED8	0x7755	#<CJK>
-0xDED9	0x775F	#<CJK>
-0xDEDA	0x7760	#<CJK>
-0xDEDB	0x7752	#<CJK>
-0xDEDC	0x7756	#<CJK>
-0xDEDD	0x775A	#<CJK>
-0xDEDE	0x7769	#<CJK>
-0xDEDF	0x7767	#<CJK>
-0xDEE0	0x7754	#<CJK>
-0xDEE1	0x7759	#<CJK>
-0xDEE2	0x776D	#<CJK>
-0xDEE3	0x77E0	#<CJK>
-0xDEE4	0x7887	#<CJK>
-0xDEE5	0x789A	#<CJK>
-0xDEE6	0x7894	#<CJK>
-0xDEE7	0x788F	#<CJK>
-0xDEE8	0x7884	#<CJK>
-0xDEE9	0x7895	#<CJK>
-0xDEEA	0x7885	#<CJK>
-0xDEEB	0x7886	#<CJK>
-0xDEEC	0x78A1	#<CJK>
-0xDEED	0x7883	#<CJK>
-0xDEEE	0x7879	#<CJK>
-0xDEEF	0x7899	#<CJK>
-0xDEF0	0x7880	#<CJK>
-0xDEF1	0x7896	#<CJK>
-0xDEF2	0x787B	#<CJK>
-0xDEF3	0x797C	#<CJK>
-0xDEF4	0x7982	#<CJK>
-0xDEF5	0x797D	#<CJK>
-0xDEF6	0x7979	#<CJK>
-0xDEF7	0x7A11	#<CJK>
-0xDEF8	0x7A18	#<CJK>
-0xDEF9	0x7A19	#<CJK>
-0xDEFA	0x7A12	#<CJK>
-0xDEFB	0x7A17	#<CJK>
-0xDEFC	0x7A15	#<CJK>
-0xDEFD	0x7A22	#<CJK>
-0xDEFE	0x7A13	#<CJK>
-0xDF40	0x7A1B	#<CJK>
-0xDF41	0x7A10	#<CJK>
-0xDF42	0x7AA3	#<CJK>
-0xDF43	0x7AA2	#<CJK>
-0xDF44	0x7A9E	#<CJK>
-0xDF45	0x7AEB	#<CJK>
-0xDF46	0x7B66	#<CJK>
-0xDF47	0x7B64	#<CJK>
-0xDF48	0x7B6D	#<CJK>
-0xDF49	0x7B74	#<CJK>
-0xDF4A	0x7B69	#<CJK>
-0xDF4B	0x7B72	#<CJK>
-0xDF4C	0x7B65	#<CJK>
-0xDF4D	0x7B73	#<CJK>
-0xDF4E	0x7B71	#<CJK>
-0xDF4F	0x7B70	#<CJK>
-0xDF50	0x7B61	#<CJK>
-0xDF51	0x7B78	#<CJK>
-0xDF52	0x7B76	#<CJK>
-0xDF53	0x7B63	#<CJK>
-0xDF54	0x7CB2	#<CJK>
-0xDF55	0x7CB4	#<CJK>
-0xDF56	0x7CAF	#<CJK>
-0xDF57	0x7D88	#<CJK>
-0xDF58	0x7D86	#<CJK>
-0xDF59	0x7D80	#<CJK>
-0xDF5A	0x7D8D	#<CJK>
-0xDF5B	0x7D7F	#<CJK>
-0xDF5C	0x7D85	#<CJK>
-0xDF5D	0x7D7A	#<CJK>
-0xDF5E	0x7D8E	#<CJK>
-0xDF5F	0x7D7B	#<CJK>
-0xDF60	0x7D83	#<CJK>
-0xDF61	0x7D7C	#<CJK>
-0xDF62	0x7D8C	#<CJK>
-0xDF63	0x7D94	#<CJK>
-0xDF64	0x7D84	#<CJK>
-0xDF65	0x7D7D	#<CJK>
-0xDF66	0x7D92	#<CJK>
-0xDF67	0x7F6D	#<CJK>
-0xDF68	0x7F6B	#<CJK>
-0xDF69	0x7F67	#<CJK>
-0xDF6A	0x7F68	#<CJK>
-0xDF6B	0x7F6C	#<CJK>
-0xDF6C	0x7FA6	#<CJK>
-0xDF6D	0x7FA5	#<CJK>
-0xDF6E	0x7FA7	#<CJK>
-0xDF6F	0x7FDB	#<CJK>
-0xDF70	0x7FDC	#<CJK>
-0xDF71	0x8021	#<CJK>
-0xDF72	0x8164	#<CJK>
-0xDF73	0x8160	#<CJK>
-0xDF74	0x8177	#<CJK>
-0xDF75	0x815C	#<CJK>
-0xDF76	0x8169	#<CJK>
-0xDF77	0x815B	#<CJK>
-0xDF78	0x8162	#<CJK>
-0xDF79	0x8172	#<CJK>
-0xDF7A	0x6721	#<CJK>
-0xDF7B	0x815E	#<CJK>
-0xDF7C	0x8176	#<CJK>
-0xDF7D	0x8167	#<CJK>
-0xDF7E	0x816F	#<CJK>
-0xDFA1	0x8144	#<CJK>
-0xDFA2	0x8161	#<CJK>
-0xDFA3	0x821D	#<CJK>
-0xDFA4	0x8249	#<CJK>
-0xDFA5	0x8244	#<CJK>
-0xDFA6	0x8240	#<CJK>
-0xDFA7	0x8242	#<CJK>
-0xDFA8	0x8245	#<CJK>
-0xDFA9	0x84F1	#<CJK>
-0xDFAA	0x843F	#<CJK>
-0xDFAB	0x8456	#<CJK>
-0xDFAC	0x8476	#<CJK>
-0xDFAD	0x8479	#<CJK>
-0xDFAE	0x848F	#<CJK>
-0xDFAF	0x848D	#<CJK>
-0xDFB0	0x8465	#<CJK>
-0xDFB1	0x8451	#<CJK>
-0xDFB2	0x8440	#<CJK>
-0xDFB3	0x8486	#<CJK>
-0xDFB4	0x8467	#<CJK>
-0xDFB5	0x8430	#<CJK>
-0xDFB6	0x844D	#<CJK>
-0xDFB7	0x847D	#<CJK>
-0xDFB8	0x845A	#<CJK>
-0xDFB9	0x8459	#<CJK>
-0xDFBA	0x8474	#<CJK>
-0xDFBB	0x8473	#<CJK>
-0xDFBC	0x845D	#<CJK>
-0xDFBD	0x8507	#<CJK>
-0xDFBE	0x845E	#<CJK>
-0xDFBF	0x8437	#<CJK>
-0xDFC0	0x843A	#<CJK>
-0xDFC1	0x8434	#<CJK>
-0xDFC2	0x847A	#<CJK>
-0xDFC3	0x8443	#<CJK>
-0xDFC4	0x8478	#<CJK>
-0xDFC5	0x8432	#<CJK>
-0xDFC6	0x8445	#<CJK>
-0xDFC7	0x8429	#<CJK>
-0xDFC8	0x83D9	#<CJK>
-0xDFC9	0x844B	#<CJK>
-0xDFCA	0x842F	#<CJK>
-0xDFCB	0x8442	#<CJK>
-0xDFCC	0x842D	#<CJK>
-0xDFCD	0x845F	#<CJK>
-0xDFCE	0x8470	#<CJK>
-0xDFCF	0x8439	#<CJK>
-0xDFD0	0x844E	#<CJK>
-0xDFD1	0x844C	#<CJK>
-0xDFD2	0x8452	#<CJK>
-0xDFD3	0x846F	#<CJK>
-0xDFD4	0x84C5	#<CJK>
-0xDFD5	0x848E	#<CJK>
-0xDFD6	0x843B	#<CJK>
-0xDFD7	0x8447	#<CJK>
-0xDFD8	0x8436	#<CJK>
-0xDFD9	0x8433	#<CJK>
-0xDFDA	0x8468	#<CJK>
-0xDFDB	0x847E	#<CJK>
-0xDFDC	0x8444	#<CJK>
-0xDFDD	0x842B	#<CJK>
-0xDFDE	0x8460	#<CJK>
-0xDFDF	0x8454	#<CJK>
-0xDFE0	0x846E	#<CJK>
-0xDFE1	0x8450	#<CJK>
-0xDFE2	0x870B	#<CJK>
-0xDFE3	0x8704	#<CJK>
-0xDFE4	0x86F7	#<CJK>
-0xDFE5	0x870C	#<CJK>
-0xDFE6	0x86FA	#<CJK>
-0xDFE7	0x86D6	#<CJK>
-0xDFE8	0x86F5	#<CJK>
-0xDFE9	0x874D	#<CJK>
-0xDFEA	0x86F8	#<CJK>
-0xDFEB	0x870E	#<CJK>
-0xDFEC	0x8709	#<CJK>
-0xDFED	0x8701	#<CJK>
-0xDFEE	0x86F6	#<CJK>
-0xDFEF	0x870D	#<CJK>
-0xDFF0	0x8705	#<CJK>
-0xDFF1	0x88D6	#<CJK>
-0xDFF2	0x88CB	#<CJK>
-0xDFF3	0x88CD	#<CJK>
-0xDFF4	0x88CE	#<CJK>
-0xDFF5	0x88DE	#<CJK>
-0xDFF6	0x88DB	#<CJK>
-0xDFF7	0x88DA	#<CJK>
-0xDFF8	0x88CC	#<CJK>
-0xDFF9	0x88D0	#<CJK>
-0xDFFA	0x8985	#<CJK>
-0xDFFB	0x899B	#<CJK>
-0xDFFC	0x89DF	#<CJK>
-0xDFFD	0x89E5	#<CJK>
-0xDFFE	0x89E4	#<CJK>
-0xE040	0x89E1	#<CJK>
-0xE041	0x89E0	#<CJK>
-0xE042	0x89E2	#<CJK>
-0xE043	0x89DC	#<CJK>
-0xE044	0x89E6	#<CJK>
-0xE045	0x8A76	#<CJK>
-0xE046	0x8A86	#<CJK>
-0xE047	0x8A7F	#<CJK>
-0xE048	0x8A61	#<CJK>
-0xE049	0x8A3F	#<CJK>
-0xE04A	0x8A77	#<CJK>
-0xE04B	0x8A82	#<CJK>
-0xE04C	0x8A84	#<CJK>
-0xE04D	0x8A75	#<CJK>
-0xE04E	0x8A83	#<CJK>
-0xE04F	0x8A81	#<CJK>
-0xE050	0x8A74	#<CJK>
-0xE051	0x8A7A	#<CJK>
-0xE052	0x8C3C	#<CJK>
-0xE053	0x8C4B	#<CJK>
-0xE054	0x8C4A	#<CJK>
-0xE055	0x8C65	#<CJK>
-0xE056	0x8C64	#<CJK>
-0xE057	0x8C66	#<CJK>
-0xE058	0x8C86	#<CJK>
-0xE059	0x8C84	#<CJK>
-0xE05A	0x8C85	#<CJK>
-0xE05B	0x8CCC	#<CJK>
-0xE05C	0x8D68	#<CJK>
-0xE05D	0x8D69	#<CJK>
-0xE05E	0x8D91	#<CJK>
-0xE05F	0x8D8C	#<CJK>
-0xE060	0x8D8E	#<CJK>
-0xE061	0x8D8F	#<CJK>
-0xE062	0x8D8D	#<CJK>
-0xE063	0x8D93	#<CJK>
-0xE064	0x8D94	#<CJK>
-0xE065	0x8D90	#<CJK>
-0xE066	0x8D92	#<CJK>
-0xE067	0x8DF0	#<CJK>
-0xE068	0x8DE0	#<CJK>
-0xE069	0x8DEC	#<CJK>
-0xE06A	0x8DF1	#<CJK>
-0xE06B	0x8DEE	#<CJK>
-0xE06C	0x8DD0	#<CJK>
-0xE06D	0x8DE9	#<CJK>
-0xE06E	0x8DE3	#<CJK>
-0xE06F	0x8DE2	#<CJK>
-0xE070	0x8DE7	#<CJK>
-0xE071	0x8DF2	#<CJK>
-0xE072	0x8DEB	#<CJK>
-0xE073	0x8DF4	#<CJK>
-0xE074	0x8F06	#<CJK>
-0xE075	0x8EFF	#<CJK>
-0xE076	0x8F01	#<CJK>
-0xE077	0x8F00	#<CJK>
-0xE078	0x8F05	#<CJK>
-0xE079	0x8F07	#<CJK>
-0xE07A	0x8F08	#<CJK>
-0xE07B	0x8F02	#<CJK>
-0xE07C	0x8F0B	#<CJK>
-0xE07D	0x9052	#<CJK>
-0xE07E	0x903F	#<CJK>
-0xE0A1	0x9044	#<CJK>
-0xE0A2	0x9049	#<CJK>
-0xE0A3	0x903D	#<CJK>
-0xE0A4	0x9110	#<CJK>
-0xE0A5	0x910D	#<CJK>
-0xE0A6	0x910F	#<CJK>
-0xE0A7	0x9111	#<CJK>
-0xE0A8	0x9116	#<CJK>
-0xE0A9	0x9114	#<CJK>
-0xE0AA	0x910B	#<CJK>
-0xE0AB	0x910E	#<CJK>
-0xE0AC	0x916E	#<CJK>
-0xE0AD	0x916F	#<CJK>
-0xE0AE	0x9248	#<CJK>
-0xE0AF	0x9252	#<CJK>
-0xE0B0	0x9230	#<CJK>
-0xE0B1	0x923A	#<CJK>
-0xE0B2	0x9266	#<CJK>
-0xE0B3	0x9233	#<CJK>
-0xE0B4	0x9265	#<CJK>
-0xE0B5	0x925E	#<CJK>
-0xE0B6	0x9283	#<CJK>
-0xE0B7	0x922E	#<CJK>
-0xE0B8	0x924A	#<CJK>
-0xE0B9	0x9246	#<CJK>
-0xE0BA	0x926D	#<CJK>
-0xE0BB	0x926C	#<CJK>
-0xE0BC	0x924F	#<CJK>
-0xE0BD	0x9260	#<CJK>
-0xE0BE	0x9267	#<CJK>
-0xE0BF	0x926F	#<CJK>
-0xE0C0	0x9236	#<CJK>
-0xE0C1	0x9261	#<CJK>
-0xE0C2	0x9270	#<CJK>
-0xE0C3	0x9231	#<CJK>
-0xE0C4	0x9254	#<CJK>
-0xE0C5	0x9263	#<CJK>
-0xE0C6	0x9250	#<CJK>
-0xE0C7	0x9272	#<CJK>
-0xE0C8	0x924E	#<CJK>
-0xE0C9	0x9253	#<CJK>
-0xE0CA	0x924C	#<CJK>
-0xE0CB	0x9256	#<CJK>
-0xE0CC	0x9232	#<CJK>
-0xE0CD	0x959F	#<CJK>
-0xE0CE	0x959C	#<CJK>
-0xE0CF	0x959E	#<CJK>
-0xE0D0	0x959B	#<CJK>
-0xE0D1	0x9692	#<CJK>
-0xE0D2	0x9693	#<CJK>
-0xE0D3	0x9691	#<CJK>
-0xE0D4	0x9697	#<CJK>
-0xE0D5	0x96CE	#<CJK>
-0xE0D6	0x96FA	#<CJK>
-0xE0D7	0x96FD	#<CJK>
-0xE0D8	0x96F8	#<CJK>
-0xE0D9	0x96F5	#<CJK>
-0xE0DA	0x9773	#<CJK>
-0xE0DB	0x9777	#<CJK>
-0xE0DC	0x9778	#<CJK>
-0xE0DD	0x9772	#<CJK>
-0xE0DE	0x980F	#<CJK>
-0xE0DF	0x980D	#<CJK>
-0xE0E0	0x980E	#<CJK>
-0xE0E1	0x98AC	#<CJK>
-0xE0E2	0x98F6	#<CJK>
-0xE0E3	0x98F9	#<CJK>
-0xE0E4	0x99AF	#<CJK>
-0xE0E5	0x99B2	#<CJK>
-0xE0E6	0x99B0	#<CJK>
-0xE0E7	0x99B5	#<CJK>
-0xE0E8	0x9AAD	#<CJK>
-0xE0E9	0x9AAB	#<CJK>
-0xE0EA	0x9B5B	#<CJK>
-0xE0EB	0x9CEA	#<CJK>
-0xE0EC	0x9CED	#<CJK>
-0xE0ED	0x9CE7	#<CJK>
-0xE0EE	0x9E80	#<CJK>
-0xE0EF	0x9EFD	#<CJK>
-0xE0F0	0x50E6	#<CJK>
-0xE0F1	0x50D4	#<CJK>
-0xE0F2	0x50D7	#<CJK>
-0xE0F3	0x50E8	#<CJK>
-0xE0F4	0x50F3	#<CJK>
-0xE0F5	0x50DB	#<CJK>
-0xE0F6	0x50EA	#<CJK>
-0xE0F7	0x50DD	#<CJK>
-0xE0F8	0x50E4	#<CJK>
-0xE0F9	0x50D3	#<CJK>
-0xE0FA	0x50EC	#<CJK>
-0xE0FB	0x50F0	#<CJK>
-0xE0FC	0x50EF	#<CJK>
-0xE0FD	0x50E3	#<CJK>
-0xE0FE	0x50E0	#<CJK>
-0xE140	0x51D8	#<CJK>
-0xE141	0x5280	#<CJK>
-0xE142	0x5281	#<CJK>
-0xE143	0x52E9	#<CJK>
-0xE144	0x52EB	#<CJK>
-0xE145	0x5330	#<CJK>
-0xE146	0x53AC	#<CJK>
-0xE147	0x5627	#<CJK>
-0xE148	0x5615	#<CJK>
-0xE149	0x560C	#<CJK>
-0xE14A	0x5612	#<CJK>
-0xE14B	0x55FC	#<CJK>
-0xE14C	0x560F	#<CJK>
-0xE14D	0x561C	#<CJK>
-0xE14E	0x5601	#<CJK>
-0xE14F	0x5613	#<CJK>
-0xE150	0x5602	#<CJK>
-0xE151	0x55FA	#<CJK>
-0xE152	0x561D	#<CJK>
-0xE153	0x5604	#<CJK>
-0xE154	0x55FF	#<CJK>
-0xE155	0x55F9	#<CJK>
-0xE156	0x5889	#<CJK>
-0xE157	0x587C	#<CJK>
-0xE158	0x5890	#<CJK>
-0xE159	0x5898	#<CJK>
-0xE15A	0x5886	#<CJK>
-0xE15B	0x5881	#<CJK>
-0xE15C	0x587F	#<CJK>
-0xE15D	0x5874	#<CJK>
-0xE15E	0x588B	#<CJK>
-0xE15F	0x587A	#<CJK>
-0xE160	0x5887	#<CJK>
-0xE161	0x5891	#<CJK>
-0xE162	0x588E	#<CJK>
-0xE163	0x5876	#<CJK>
-0xE164	0x5882	#<CJK>
-0xE165	0x5888	#<CJK>
-0xE166	0x587B	#<CJK>
-0xE167	0x5894	#<CJK>
-0xE168	0x588F	#<CJK>
-0xE169	0x58FE	#<CJK>
-0xE16A	0x596B	#<CJK>
-0xE16B	0x5ADC	#<CJK>
-0xE16C	0x5AEE	#<CJK>
-0xE16D	0x5AE5	#<CJK>
-0xE16E	0x5AD5	#<CJK>
-0xE16F	0x5AEA	#<CJK>
-0xE170	0x5ADA	#<CJK>
-0xE171	0x5AED	#<CJK>
-0xE172	0x5AEB	#<CJK>
-0xE173	0x5AF3	#<CJK>
-0xE174	0x5AE2	#<CJK>
-0xE175	0x5AE0	#<CJK>
-0xE176	0x5ADB	#<CJK>
-0xE177	0x5AEC	#<CJK>
-0xE178	0x5ADE	#<CJK>
-0xE179	0x5ADD	#<CJK>
-0xE17A	0x5AD9	#<CJK>
-0xE17B	0x5AE8	#<CJK>
-0xE17C	0x5ADF	#<CJK>
-0xE17D	0x5B77	#<CJK>
-0xE17E	0x5BE0	#<CJK>
-0xE1A1	0x5BE3	#<CJK>
-0xE1A2	0x5C63	#<CJK>
-0xE1A3	0x5D82	#<CJK>
-0xE1A4	0x5D80	#<CJK>
-0xE1A5	0x5D7D	#<CJK>
-0xE1A6	0x5D86	#<CJK>
-0xE1A7	0x5D7A	#<CJK>
-0xE1A8	0x5D81	#<CJK>
-0xE1A9	0x5D77	#<CJK>
-0xE1AA	0x5D8A	#<CJK>
-0xE1AB	0x5D89	#<CJK>
-0xE1AC	0x5D88	#<CJK>
-0xE1AD	0x5D7E	#<CJK>
-0xE1AE	0x5D7C	#<CJK>
-0xE1AF	0x5D8D	#<CJK>
-0xE1B0	0x5D79	#<CJK>
-0xE1B1	0x5D7F	#<CJK>
-0xE1B2	0x5E58	#<CJK>
-0xE1B3	0x5E59	#<CJK>
-0xE1B4	0x5E53	#<CJK>
-0xE1B5	0x5ED8	#<CJK>
-0xE1B6	0x5ED1	#<CJK>
-0xE1B7	0x5ED7	#<CJK>
-0xE1B8	0x5ECE	#<CJK>
-0xE1B9	0x5EDC	#<CJK>
-0xE1BA	0x5ED5	#<CJK>
-0xE1BB	0x5ED9	#<CJK>
-0xE1BC	0x5ED2	#<CJK>
-0xE1BD	0x5ED4	#<CJK>
-0xE1BE	0x5F44	#<CJK>
-0xE1BF	0x5F43	#<CJK>
-0xE1C0	0x5F6F	#<CJK>
-0xE1C1	0x5FB6	#<CJK>
-0xE1C2	0x612C	#<CJK>
-0xE1C3	0x6128	#<CJK>
-0xE1C4	0x6141	#<CJK>
-0xE1C5	0x615E	#<CJK>
-0xE1C6	0x6171	#<CJK>
-0xE1C7	0x6173	#<CJK>
-0xE1C8	0x6152	#<CJK>
-0xE1C9	0x6153	#<CJK>
-0xE1CA	0x6172	#<CJK>
-0xE1CB	0x616C	#<CJK>
-0xE1CC	0x6180	#<CJK>
-0xE1CD	0x6174	#<CJK>
-0xE1CE	0x6154	#<CJK>
-0xE1CF	0x617A	#<CJK>
-0xE1D0	0x615B	#<CJK>
-0xE1D1	0x6165	#<CJK>
-0xE1D2	0x613B	#<CJK>
-0xE1D3	0x616A	#<CJK>
-0xE1D4	0x6161	#<CJK>
-0xE1D5	0x6156	#<CJK>
-0xE1D6	0x6229	#<CJK>
-0xE1D7	0x6227	#<CJK>
-0xE1D8	0x622B	#<CJK>
-0xE1D9	0x642B	#<CJK>
-0xE1DA	0x644D	#<CJK>
-0xE1DB	0x645B	#<CJK>
-0xE1DC	0x645D	#<CJK>
-0xE1DD	0x6474	#<CJK>
-0xE1DE	0x6476	#<CJK>
-0xE1DF	0x6472	#<CJK>
-0xE1E0	0x6473	#<CJK>
-0xE1E1	0x647D	#<CJK>
-0xE1E2	0x6475	#<CJK>
-0xE1E3	0x6466	#<CJK>
-0xE1E4	0x64A6	#<CJK>
-0xE1E5	0x644E	#<CJK>
-0xE1E6	0x6482	#<CJK>
-0xE1E7	0x645E	#<CJK>
-0xE1E8	0x645C	#<CJK>
-0xE1E9	0x644B	#<CJK>
-0xE1EA	0x6453	#<CJK>
-0xE1EB	0x6460	#<CJK>
-0xE1EC	0x6450	#<CJK>
-0xE1ED	0x647F	#<CJK>
-0xE1EE	0x643F	#<CJK>
-0xE1EF	0x646C	#<CJK>
-0xE1F0	0x646B	#<CJK>
-0xE1F1	0x6459	#<CJK>
-0xE1F2	0x6465	#<CJK>
-0xE1F3	0x6477	#<CJK>
-0xE1F4	0x6573	#<CJK>
-0xE1F5	0x65A0	#<CJK>
-0xE1F6	0x66A1	#<CJK>
-0xE1F7	0x66A0	#<CJK>
-0xE1F8	0x669F	#<CJK>
-0xE1F9	0x6705	#<CJK>
-0xE1FA	0x6704	#<CJK>
-0xE1FB	0x6722	#<CJK>
-0xE1FC	0x69B1	#<CJK>
-0xE1FD	0x69B6	#<CJK>
-0xE1FE	0x69C9	#<CJK>
-0xE240	0x69A0	#<CJK>
-0xE241	0x69CE	#<CJK>
-0xE242	0x6996	#<CJK>
-0xE243	0x69B0	#<CJK>
-0xE244	0x69AC	#<CJK>
-0xE245	0x69BC	#<CJK>
-0xE246	0x6991	#<CJK>
-0xE247	0x6999	#<CJK>
-0xE248	0x698E	#<CJK>
-0xE249	0x69A7	#<CJK>
-0xE24A	0x698D	#<CJK>
-0xE24B	0x69A9	#<CJK>
-0xE24C	0x69BE	#<CJK>
-0xE24D	0x69AF	#<CJK>
-0xE24E	0x69BF	#<CJK>
-0xE24F	0x69C4	#<CJK>
-0xE250	0x69BD	#<CJK>
-0xE251	0x69A4	#<CJK>
-0xE252	0x69D4	#<CJK>
-0xE253	0x69B9	#<CJK>
-0xE254	0x69CA	#<CJK>
-0xE255	0x699A	#<CJK>
-0xE256	0x69CF	#<CJK>
-0xE257	0x69B3	#<CJK>
-0xE258	0x6993	#<CJK>
-0xE259	0x69AA	#<CJK>
-0xE25A	0x69A1	#<CJK>
-0xE25B	0x699E	#<CJK>
-0xE25C	0x69D9	#<CJK>
-0xE25D	0x6997	#<CJK>
-0xE25E	0x6990	#<CJK>
-0xE25F	0x69C2	#<CJK>
-0xE260	0x69B5	#<CJK>
-0xE261	0x69A5	#<CJK>
-0xE262	0x69C6	#<CJK>
-0xE263	0x6B4A	#<CJK>
-0xE264	0x6B4D	#<CJK>
-0xE265	0x6B4B	#<CJK>
-0xE266	0x6B9E	#<CJK>
-0xE267	0x6B9F	#<CJK>
-0xE268	0x6BA0	#<CJK>
-0xE269	0x6BC3	#<CJK>
-0xE26A	0x6BC4	#<CJK>
-0xE26B	0x6BFE	#<CJK>
-0xE26C	0x6ECE	#<CJK>
-0xE26D	0x6EF5	#<CJK>
-0xE26E	0x6EF1	#<CJK>
-0xE26F	0x6F03	#<CJK>
-0xE270	0x6F25	#<CJK>
-0xE271	0x6EF8	#<CJK>
-0xE272	0x6F37	#<CJK>
-0xE273	0x6EFB	#<CJK>
-0xE274	0x6F2E	#<CJK>
-0xE275	0x6F09	#<CJK>
-0xE276	0x6F4E	#<CJK>
-0xE277	0x6F19	#<CJK>
-0xE278	0x6F1A	#<CJK>
-0xE279	0x6F27	#<CJK>
-0xE27A	0x6F18	#<CJK>
-0xE27B	0x6F3B	#<CJK>
-0xE27C	0x6F12	#<CJK>
-0xE27D	0x6EED	#<CJK>
-0xE27E	0x6F0A	#<CJK>
-0xE2A1	0x6F36	#<CJK>
-0xE2A2	0x6F73	#<CJK>
-0xE2A3	0x6EF9	#<CJK>
-0xE2A4	0x6EEE	#<CJK>
-0xE2A5	0x6F2D	#<CJK>
-0xE2A6	0x6F40	#<CJK>
-0xE2A7	0x6F30	#<CJK>
-0xE2A8	0x6F3C	#<CJK>
-0xE2A9	0x6F35	#<CJK>
-0xE2AA	0x6EEB	#<CJK>
-0xE2AB	0x6F07	#<CJK>
-0xE2AC	0x6F0E	#<CJK>
-0xE2AD	0x6F43	#<CJK>
-0xE2AE	0x6F05	#<CJK>
-0xE2AF	0x6EFD	#<CJK>
-0xE2B0	0x6EF6	#<CJK>
-0xE2B1	0x6F39	#<CJK>
-0xE2B2	0x6F1C	#<CJK>
-0xE2B3	0x6EFC	#<CJK>
-0xE2B4	0x6F3A	#<CJK>
-0xE2B5	0x6F1F	#<CJK>
-0xE2B6	0x6F0D	#<CJK>
-0xE2B7	0x6F1E	#<CJK>
-0xE2B8	0x6F08	#<CJK>
-0xE2B9	0x6F21	#<CJK>
-0xE2BA	0x7187	#<CJK>
-0xE2BB	0x7190	#<CJK>
-0xE2BC	0x7189	#<CJK>
-0xE2BD	0x7180	#<CJK>
-0xE2BE	0x7185	#<CJK>
-0xE2BF	0x7182	#<CJK>
-0xE2C0	0x718F	#<CJK>
-0xE2C1	0x717B	#<CJK>
-0xE2C2	0x7186	#<CJK>
-0xE2C3	0x7181	#<CJK>
-0xE2C4	0x7197	#<CJK>
-0xE2C5	0x7244	#<CJK>
-0xE2C6	0x7253	#<CJK>
-0xE2C7	0x7297	#<CJK>
-0xE2C8	0x7295	#<CJK>
-0xE2C9	0x7293	#<CJK>
-0xE2CA	0x7343	#<CJK>
-0xE2CB	0x734D	#<CJK>
-0xE2CC	0x7351	#<CJK>
-0xE2CD	0x734C	#<CJK>
-0xE2CE	0x7462	#<CJK>
-0xE2CF	0x7473	#<CJK>
-0xE2D0	0x7471	#<CJK>
-0xE2D1	0x7475	#<CJK>
-0xE2D2	0x7472	#<CJK>
-0xE2D3	0x7467	#<CJK>
-0xE2D4	0x746E	#<CJK>
-0xE2D5	0x7500	#<CJK>
-0xE2D6	0x7502	#<CJK>
-0xE2D7	0x7503	#<CJK>
-0xE2D8	0x757D	#<CJK>
-0xE2D9	0x7590	#<CJK>
-0xE2DA	0x7616	#<CJK>
-0xE2DB	0x7608	#<CJK>
-0xE2DC	0x760C	#<CJK>
-0xE2DD	0x7615	#<CJK>
-0xE2DE	0x7611	#<CJK>
-0xE2DF	0x760A	#<CJK>
-0xE2E0	0x7614	#<CJK>
-0xE2E1	0x76B8	#<CJK>
-0xE2E2	0x7781	#<CJK>
-0xE2E3	0x777C	#<CJK>
-0xE2E4	0x7785	#<CJK>
-0xE2E5	0x7782	#<CJK>
-0xE2E6	0x776E	#<CJK>
-0xE2E7	0x7780	#<CJK>
-0xE2E8	0x776F	#<CJK>
-0xE2E9	0x777E	#<CJK>
-0xE2EA	0x7783	#<CJK>
-0xE2EB	0x78B2	#<CJK>
-0xE2EC	0x78AA	#<CJK>
-0xE2ED	0x78B4	#<CJK>
-0xE2EE	0x78AD	#<CJK>
-0xE2EF	0x78A8	#<CJK>
-0xE2F0	0x787E	#<CJK>
-0xE2F1	0x78AB	#<CJK>
-0xE2F2	0x789E	#<CJK>
-0xE2F3	0x78A5	#<CJK>
-0xE2F4	0x78A0	#<CJK>
-0xE2F5	0x78AC	#<CJK>
-0xE2F6	0x78A2	#<CJK>
-0xE2F7	0x78A4	#<CJK>
-0xE2F8	0x7998	#<CJK>
-0xE2F9	0x798A	#<CJK>
-0xE2FA	0x798B	#<CJK>
-0xE2FB	0x7996	#<CJK>
-0xE2FC	0x7995	#<CJK>
-0xE2FD	0x7994	#<CJK>
-0xE2FE	0x7993	#<CJK>
-0xE340	0x7997	#<CJK>
-0xE341	0x7988	#<CJK>
-0xE342	0x7992	#<CJK>
-0xE343	0x7990	#<CJK>
-0xE344	0x7A2B	#<CJK>
-0xE345	0x7A4A	#<CJK>
-0xE346	0x7A30	#<CJK>
-0xE347	0x7A2F	#<CJK>
-0xE348	0x7A28	#<CJK>
-0xE349	0x7A26	#<CJK>
-0xE34A	0x7AA8	#<CJK>
-0xE34B	0x7AAB	#<CJK>
-0xE34C	0x7AAC	#<CJK>
-0xE34D	0x7AEE	#<CJK>
-0xE34E	0x7B88	#<CJK>
-0xE34F	0x7B9C	#<CJK>
-0xE350	0x7B8A	#<CJK>
-0xE351	0x7B91	#<CJK>
-0xE352	0x7B90	#<CJK>
-0xE353	0x7B96	#<CJK>
-0xE354	0x7B8D	#<CJK>
-0xE355	0x7B8C	#<CJK>
-0xE356	0x7B9B	#<CJK>
-0xE357	0x7B8E	#<CJK>
-0xE358	0x7B85	#<CJK>
-0xE359	0x7B98	#<CJK>
-0xE35A	0x5284	#<CJK>
-0xE35B	0x7B99	#<CJK>
-0xE35C	0x7BA4	#<CJK>
-0xE35D	0x7B82	#<CJK>
-0xE35E	0x7CBB	#<CJK>
-0xE35F	0x7CBF	#<CJK>
-0xE360	0x7CBC	#<CJK>
-0xE361	0x7CBA	#<CJK>
-0xE362	0x7DA7	#<CJK>
-0xE363	0x7DB7	#<CJK>
-0xE364	0x7DC2	#<CJK>
-0xE365	0x7DA3	#<CJK>
-0xE366	0x7DAA	#<CJK>
-0xE367	0x7DC1	#<CJK>
-0xE368	0x7DC0	#<CJK>
-0xE369	0x7DC5	#<CJK>
-0xE36A	0x7D9D	#<CJK>
-0xE36B	0x7DCE	#<CJK>
-0xE36C	0x7DC4	#<CJK>
-0xE36D	0x7DC6	#<CJK>
-0xE36E	0x7DCB	#<CJK>
-0xE36F	0x7DCC	#<CJK>
-0xE370	0x7DAF	#<CJK>
-0xE371	0x7DB9	#<CJK>
-0xE372	0x7D96	#<CJK>
-0xE373	0x7DBC	#<CJK>
-0xE374	0x7D9F	#<CJK>
-0xE375	0x7DA6	#<CJK>
-0xE376	0x7DAE	#<CJK>
-0xE377	0x7DA9	#<CJK>
-0xE378	0x7DA1	#<CJK>
-0xE379	0x7DC9	#<CJK>
-0xE37A	0x7F73	#<CJK>
-0xE37B	0x7FE2	#<CJK>
-0xE37C	0x7FE3	#<CJK>
-0xE37D	0x7FE5	#<CJK>
-0xE37E	0x7FDE	#<CJK>
-0xE3A1	0x8024	#<CJK>
-0xE3A2	0x805D	#<CJK>
-0xE3A3	0x805C	#<CJK>
-0xE3A4	0x8189	#<CJK>
-0xE3A5	0x8186	#<CJK>
-0xE3A6	0x8183	#<CJK>
-0xE3A7	0x8187	#<CJK>
-0xE3A8	0x818D	#<CJK>
-0xE3A9	0x818C	#<CJK>
-0xE3AA	0x818B	#<CJK>
-0xE3AB	0x8215	#<CJK>
-0xE3AC	0x8497	#<CJK>
-0xE3AD	0x84A4	#<CJK>
-0xE3AE	0x84A1	#<CJK>
-0xE3AF	0x849F	#<CJK>
-0xE3B0	0x84BA	#<CJK>
-0xE3B1	0x84CE	#<CJK>
-0xE3B2	0x84C2	#<CJK>
-0xE3B3	0x84AC	#<CJK>
-0xE3B4	0x84AE	#<CJK>
-0xE3B5	0x84AB	#<CJK>
-0xE3B6	0x84B9	#<CJK>
-0xE3B7	0x84B4	#<CJK>
-0xE3B8	0x84C1	#<CJK>
-0xE3B9	0x84CD	#<CJK>
-0xE3BA	0x84AA	#<CJK>
-0xE3BB	0x849A	#<CJK>
-0xE3BC	0x84B1	#<CJK>
-0xE3BD	0x84D0	#<CJK>
-0xE3BE	0x849D	#<CJK>
-0xE3BF	0x84A7	#<CJK>
-0xE3C0	0x84BB	#<CJK>
-0xE3C1	0x84A2	#<CJK>
-0xE3C2	0x8494	#<CJK>
-0xE3C3	0x84C7	#<CJK>
-0xE3C4	0x84CC	#<CJK>
-0xE3C5	0x849B	#<CJK>
-0xE3C6	0x84A9	#<CJK>
-0xE3C7	0x84AF	#<CJK>
-0xE3C8	0x84A8	#<CJK>
-0xE3C9	0x84D6	#<CJK>
-0xE3CA	0x8498	#<CJK>
-0xE3CB	0x84B6	#<CJK>
-0xE3CC	0x84CF	#<CJK>
-0xE3CD	0x84A0	#<CJK>
-0xE3CE	0x84D7	#<CJK>
-0xE3CF	0x84D4	#<CJK>
-0xE3D0	0x84D2	#<CJK>
-0xE3D1	0x84DB	#<CJK>
-0xE3D2	0x84B0	#<CJK>
-0xE3D3	0x8491	#<CJK>
-0xE3D4	0x8661	#<CJK>
-0xE3D5	0x8733	#<CJK>
-0xE3D6	0x8723	#<CJK>
-0xE3D7	0x8728	#<CJK>
-0xE3D8	0x876B	#<CJK>
-0xE3D9	0x8740	#<CJK>
-0xE3DA	0x872E	#<CJK>
-0xE3DB	0x871E	#<CJK>
-0xE3DC	0x8721	#<CJK>
-0xE3DD	0x8719	#<CJK>
-0xE3DE	0x871B	#<CJK>
-0xE3DF	0x8743	#<CJK>
-0xE3E0	0x872C	#<CJK>
-0xE3E1	0x8741	#<CJK>
-0xE3E2	0x873E	#<CJK>
-0xE3E3	0x8746	#<CJK>
-0xE3E4	0x8720	#<CJK>
-0xE3E5	0x8732	#<CJK>
-0xE3E6	0x872A	#<CJK>
-0xE3E7	0x872D	#<CJK>
-0xE3E8	0x873C	#<CJK>
-0xE3E9	0x8712	#<CJK>
-0xE3EA	0x873A	#<CJK>
-0xE3EB	0x8731	#<CJK>
-0xE3EC	0x8735	#<CJK>
-0xE3ED	0x8742	#<CJK>
-0xE3EE	0x8726	#<CJK>
-0xE3EF	0x8727	#<CJK>
-0xE3F0	0x8738	#<CJK>
-0xE3F1	0x8724	#<CJK>
-0xE3F2	0x871A	#<CJK>
-0xE3F3	0x8730	#<CJK>
-0xE3F4	0x8711	#<CJK>
-0xE3F5	0x88F7	#<CJK>
-0xE3F6	0x88E7	#<CJK>
-0xE3F7	0x88F1	#<CJK>
-0xE3F8	0x88F2	#<CJK>
-0xE3F9	0x88FA	#<CJK>
-0xE3FA	0x88FE	#<CJK>
-0xE3FB	0x88EE	#<CJK>
-0xE3FC	0x88FC	#<CJK>
-0xE3FD	0x88F6	#<CJK>
-0xE3FE	0x88FB	#<CJK>
-0xE440	0x88F0	#<CJK>
-0xE441	0x88EC	#<CJK>
-0xE442	0x88EB	#<CJK>
-0xE443	0x899D	#<CJK>
-0xE444	0x89A1	#<CJK>
-0xE445	0x899F	#<CJK>
-0xE446	0x899E	#<CJK>
-0xE447	0x89E9	#<CJK>
-0xE448	0x89EB	#<CJK>
-0xE449	0x89E8	#<CJK>
-0xE44A	0x8AAB	#<CJK>
-0xE44B	0x8A99	#<CJK>
-0xE44C	0x8A8B	#<CJK>
-0xE44D	0x8A92	#<CJK>
-0xE44E	0x8A8F	#<CJK>
-0xE44F	0x8A96	#<CJK>
-0xE450	0x8C3D	#<CJK>
-0xE451	0x8C68	#<CJK>
-0xE452	0x8C69	#<CJK>
-0xE453	0x8CD5	#<CJK>
-0xE454	0x8CCF	#<CJK>
-0xE455	0x8CD7	#<CJK>
-0xE456	0x8D96	#<CJK>
-0xE457	0x8E09	#<CJK>
-0xE458	0x8E02	#<CJK>
-0xE459	0x8DFF	#<CJK>
-0xE45A	0x8E0D	#<CJK>
-0xE45B	0x8DFD	#<CJK>
-0xE45C	0x8E0A	#<CJK>
-0xE45D	0x8E03	#<CJK>
-0xE45E	0x8E07	#<CJK>
-0xE45F	0x8E06	#<CJK>
-0xE460	0x8E05	#<CJK>
-0xE461	0x8DFE	#<CJK>
-0xE462	0x8E00	#<CJK>
-0xE463	0x8E04	#<CJK>
-0xE464	0x8F10	#<CJK>
-0xE465	0x8F11	#<CJK>
-0xE466	0x8F0E	#<CJK>
-0xE467	0x8F0D	#<CJK>
-0xE468	0x9123	#<CJK>
-0xE469	0x911C	#<CJK>
-0xE46A	0x9120	#<CJK>
-0xE46B	0x9122	#<CJK>
-0xE46C	0x911F	#<CJK>
-0xE46D	0x911D	#<CJK>
-0xE46E	0x911A	#<CJK>
-0xE46F	0x9124	#<CJK>
-0xE470	0x9121	#<CJK>
-0xE471	0x911B	#<CJK>
-0xE472	0x917A	#<CJK>
-0xE473	0x9172	#<CJK>
-0xE474	0x9179	#<CJK>
-0xE475	0x9173	#<CJK>
-0xE476	0x92A5	#<CJK>
-0xE477	0x92A4	#<CJK>
-0xE478	0x9276	#<CJK>
-0xE479	0x929B	#<CJK>
-0xE47A	0x927A	#<CJK>
-0xE47B	0x92A0	#<CJK>
-0xE47C	0x9294	#<CJK>
-0xE47D	0x92AA	#<CJK>
-0xE47E	0x928D	#<CJK>
-0xE4A1	0x92A6	#<CJK>
-0xE4A2	0x929A	#<CJK>
-0xE4A3	0x92AB	#<CJK>
-0xE4A4	0x9279	#<CJK>
-0xE4A5	0x9297	#<CJK>
-0xE4A6	0x927F	#<CJK>
-0xE4A7	0x92A3	#<CJK>
-0xE4A8	0x92EE	#<CJK>
-0xE4A9	0x928E	#<CJK>
-0xE4AA	0x9282	#<CJK>
-0xE4AB	0x9295	#<CJK>
-0xE4AC	0x92A2	#<CJK>
-0xE4AD	0x927D	#<CJK>
-0xE4AE	0x9288	#<CJK>
-0xE4AF	0x92A1	#<CJK>
-0xE4B0	0x928A	#<CJK>
-0xE4B1	0x9286	#<CJK>
-0xE4B2	0x928C	#<CJK>
-0xE4B3	0x9299	#<CJK>
-0xE4B4	0x92A7	#<CJK>
-0xE4B5	0x927E	#<CJK>
-0xE4B6	0x9287	#<CJK>
-0xE4B7	0x92A9	#<CJK>
-0xE4B8	0x929D	#<CJK>
-0xE4B9	0x928B	#<CJK>
-0xE4BA	0x922D	#<CJK>
-0xE4BB	0x969E	#<CJK>
-0xE4BC	0x96A1	#<CJK>
-0xE4BD	0x96FF	#<CJK>
-0xE4BE	0x9758	#<CJK>
-0xE4BF	0x977D	#<CJK>
-0xE4C0	0x977A	#<CJK>
-0xE4C1	0x977E	#<CJK>
-0xE4C2	0x9783	#<CJK>
-0xE4C3	0x9780	#<CJK>
-0xE4C4	0x9782	#<CJK>
-0xE4C5	0x977B	#<CJK>
-0xE4C6	0x9784	#<CJK>
-0xE4C7	0x9781	#<CJK>
-0xE4C8	0x977F	#<CJK>
-0xE4C9	0x97CE	#<CJK>
-0xE4CA	0x97CD	#<CJK>
-0xE4CB	0x9816	#<CJK>
-0xE4CC	0x98AD	#<CJK>
-0xE4CD	0x98AE	#<CJK>
-0xE4CE	0x9902	#<CJK>
-0xE4CF	0x9900	#<CJK>
-0xE4D0	0x9907	#<CJK>
-0xE4D1	0x999D	#<CJK>
-0xE4D2	0x999C	#<CJK>
-0xE4D3	0x99C3	#<CJK>
-0xE4D4	0x99B9	#<CJK>
-0xE4D5	0x99BB	#<CJK>
-0xE4D6	0x99BA	#<CJK>
-0xE4D7	0x99C2	#<CJK>
-0xE4D8	0x99BD	#<CJK>
-0xE4D9	0x99C7	#<CJK>
-0xE4DA	0x9AB1	#<CJK>
-0xE4DB	0x9AE3	#<CJK>
-0xE4DC	0x9AE7	#<CJK>
-0xE4DD	0x9B3E	#<CJK>
-0xE4DE	0x9B3F	#<CJK>
-0xE4DF	0x9B60	#<CJK>
-0xE4E0	0x9B61	#<CJK>
-0xE4E1	0x9B5F	#<CJK>
-0xE4E2	0x9CF1	#<CJK>
-0xE4E3	0x9CF2	#<CJK>
-0xE4E4	0x9CF5	#<CJK>
-0xE4E5	0x9EA7	#<CJK>
-0xE4E6	0x50FF	#<CJK>
-0xE4E7	0x5103	#<CJK>
-0xE4E8	0x5130	#<CJK>
-0xE4E9	0x50F8	#<CJK>
-0xE4EA	0x5106	#<CJK>
-0xE4EB	0x5107	#<CJK>
-0xE4EC	0x50F6	#<CJK>
-0xE4ED	0x50FE	#<CJK>
-0xE4EE	0x510B	#<CJK>
-0xE4EF	0x510C	#<CJK>
-0xE4F0	0x50FD	#<CJK>
-0xE4F1	0x510A	#<CJK>
-0xE4F2	0x528B	#<CJK>
-0xE4F3	0x528C	#<CJK>
-0xE4F4	0x52F1	#<CJK>
-0xE4F5	0x52EF	#<CJK>
-0xE4F6	0x5648	#<CJK>
-0xE4F7	0x5642	#<CJK>
-0xE4F8	0x564C	#<CJK>
-0xE4F9	0x5635	#<CJK>
-0xE4FA	0x5641	#<CJK>
-0xE4FB	0x564A	#<CJK>
-0xE4FC	0x5649	#<CJK>
-0xE4FD	0x5646	#<CJK>
-0xE4FE	0x5658	#<CJK>
-0xE540	0x565A	#<CJK>
-0xE541	0x5640	#<CJK>
-0xE542	0x5633	#<CJK>
-0xE543	0x563D	#<CJK>
-0xE544	0x562C	#<CJK>
-0xE545	0x563E	#<CJK>
-0xE546	0x5638	#<CJK>
-0xE547	0x562A	#<CJK>
-0xE548	0x563A	#<CJK>
-0xE549	0x571A	#<CJK>
-0xE54A	0x58AB	#<CJK>
-0xE54B	0x589D	#<CJK>
-0xE54C	0x58B1	#<CJK>
-0xE54D	0x58A0	#<CJK>
-0xE54E	0x58A3	#<CJK>
-0xE54F	0x58AF	#<CJK>
-0xE550	0x58AC	#<CJK>
-0xE551	0x58A5	#<CJK>
-0xE552	0x58A1	#<CJK>
-0xE553	0x58FF	#<CJK>
-0xE554	0x5AFF	#<CJK>
-0xE555	0x5AF4	#<CJK>
-0xE556	0x5AFD	#<CJK>
-0xE557	0x5AF7	#<CJK>
-0xE558	0x5AF6	#<CJK>
-0xE559	0x5B03	#<CJK>
-0xE55A	0x5AF8	#<CJK>
-0xE55B	0x5B02	#<CJK>
-0xE55C	0x5AF9	#<CJK>
-0xE55D	0x5B01	#<CJK>
-0xE55E	0x5B07	#<CJK>
-0xE55F	0x5B05	#<CJK>
-0xE560	0x5B0F	#<CJK>
-0xE561	0x5C67	#<CJK>
-0xE562	0x5D99	#<CJK>
-0xE563	0x5D97	#<CJK>
-0xE564	0x5D9F	#<CJK>
-0xE565	0x5D92	#<CJK>
-0xE566	0x5DA2	#<CJK>
-0xE567	0x5D93	#<CJK>
-0xE568	0x5D95	#<CJK>
-0xE569	0x5DA0	#<CJK>
-0xE56A	0x5D9C	#<CJK>
-0xE56B	0x5DA1	#<CJK>
-0xE56C	0x5D9A	#<CJK>
-0xE56D	0x5D9E	#<CJK>
-0xE56E	0x5E69	#<CJK>
-0xE56F	0x5E5D	#<CJK>
-0xE570	0x5E60	#<CJK>
-0xE571	0x5E5C	#<CJK>
-0xE572	0x7DF3	#<CJK>
-0xE573	0x5EDB	#<CJK>
-0xE574	0x5EDE	#<CJK>
-0xE575	0x5EE1	#<CJK>
-0xE576	0x5F49	#<CJK>
-0xE577	0x5FB2	#<CJK>
-0xE578	0x618B	#<CJK>
-0xE579	0x6183	#<CJK>
-0xE57A	0x6179	#<CJK>
-0xE57B	0x61B1	#<CJK>
-0xE57C	0x61B0	#<CJK>
-0xE57D	0x61A2	#<CJK>
-0xE57E	0x6189	#<CJK>
-0xE5A1	0x619B	#<CJK>
-0xE5A2	0x6193	#<CJK>
-0xE5A3	0x61AF	#<CJK>
-0xE5A4	0x61AD	#<CJK>
-0xE5A5	0x619F	#<CJK>
-0xE5A6	0x6192	#<CJK>
-0xE5A7	0x61AA	#<CJK>
-0xE5A8	0x61A1	#<CJK>
-0xE5A9	0x618D	#<CJK>
-0xE5AA	0x6166	#<CJK>
-0xE5AB	0x61B3	#<CJK>
-0xE5AC	0x622D	#<CJK>
-0xE5AD	0x646E	#<CJK>
-0xE5AE	0x6470	#<CJK>
-0xE5AF	0x6496	#<CJK>
-0xE5B0	0x64A0	#<CJK>
-0xE5B1	0x6485	#<CJK>
-0xE5B2	0x6497	#<CJK>
-0xE5B3	0x649C	#<CJK>
-0xE5B4	0x648F	#<CJK>
-0xE5B5	0x648B	#<CJK>
-0xE5B6	0x648A	#<CJK>
-0xE5B7	0x648C	#<CJK>
-0xE5B8	0x64A3	#<CJK>
-0xE5B9	0x649F	#<CJK>
-0xE5BA	0x6468	#<CJK>
-0xE5BB	0x64B1	#<CJK>
-0xE5BC	0x6498	#<CJK>
-0xE5BD	0x6576	#<CJK>
-0xE5BE	0x657A	#<CJK>
-0xE5BF	0x6579	#<CJK>
-0xE5C0	0x657B	#<CJK>
-0xE5C1	0x65B2	#<CJK>
-0xE5C2	0x65B3	#<CJK>
-0xE5C3	0x66B5	#<CJK>
-0xE5C4	0x66B0	#<CJK>
-0xE5C5	0x66A9	#<CJK>
-0xE5C6	0x66B2	#<CJK>
-0xE5C7	0x66B7	#<CJK>
-0xE5C8	0x66AA	#<CJK>
-0xE5C9	0x66AF	#<CJK>
-0xE5CA	0x6A00	#<CJK>
-0xE5CB	0x6A06	#<CJK>
-0xE5CC	0x6A17	#<CJK>
-0xE5CD	0x69E5	#<CJK>
-0xE5CE	0x69F8	#<CJK>
-0xE5CF	0x6A15	#<CJK>
-0xE5D0	0x69F1	#<CJK>
-0xE5D1	0x69E4	#<CJK>
-0xE5D2	0x6A20	#<CJK>
-0xE5D3	0x69FF	#<CJK>
-0xE5D4	0x69EC	#<CJK>
-0xE5D5	0x69E2	#<CJK>
-0xE5D6	0x6A1B	#<CJK>
-0xE5D7	0x6A1D	#<CJK>
-0xE5D8	0x69FE	#<CJK>
-0xE5D9	0x6A27	#<CJK>
-0xE5DA	0x69F2	#<CJK>
-0xE5DB	0x69EE	#<CJK>
-0xE5DC	0x6A14	#<CJK>
-0xE5DD	0x69F7	#<CJK>
-0xE5DE	0x69E7	#<CJK>
-0xE5DF	0x6A40	#<CJK>
-0xE5E0	0x6A08	#<CJK>
-0xE5E1	0x69E6	#<CJK>
-0xE5E2	0x69FB	#<CJK>
-0xE5E3	0x6A0D	#<CJK>
-0xE5E4	0x69FC	#<CJK>
-0xE5E5	0x69EB	#<CJK>
-0xE5E6	0x6A09	#<CJK>
-0xE5E7	0x6A04	#<CJK>
-0xE5E8	0x6A18	#<CJK>
-0xE5E9	0x6A25	#<CJK>
-0xE5EA	0x6A0F	#<CJK>
-0xE5EB	0x69F6	#<CJK>
-0xE5EC	0x6A26	#<CJK>
-0xE5ED	0x6A07	#<CJK>
-0xE5EE	0x69F4	#<CJK>
-0xE5EF	0x6A16	#<CJK>
-0xE5F0	0x6B51	#<CJK>
-0xE5F1	0x6BA5	#<CJK>
-0xE5F2	0x6BA3	#<CJK>
-0xE5F3	0x6BA2	#<CJK>
-0xE5F4	0x6BA6	#<CJK>
-0xE5F5	0x6C01	#<CJK>
-0xE5F6	0x6C00	#<CJK>
-0xE5F7	0x6BFF	#<CJK>
-0xE5F8	0x6C02	#<CJK>
-0xE5F9	0x6F41	#<CJK>
-0xE5FA	0x6F26	#<CJK>
-0xE5FB	0x6F7E	#<CJK>
-0xE5FC	0x6F87	#<CJK>
-0xE5FD	0x6FC6	#<CJK>
-0xE5FE	0x6F92	#<CJK>
-0xE640	0x6F8D	#<CJK>
-0xE641	0x6F89	#<CJK>
-0xE642	0x6F8C	#<CJK>
-0xE643	0x6F62	#<CJK>
-0xE644	0x6F4F	#<CJK>
-0xE645	0x6F85	#<CJK>
-0xE646	0x6F5A	#<CJK>
-0xE647	0x6F96	#<CJK>
-0xE648	0x6F76	#<CJK>
-0xE649	0x6F6C	#<CJK>
-0xE64A	0x6F82	#<CJK>
-0xE64B	0x6F55	#<CJK>
-0xE64C	0x6F72	#<CJK>
-0xE64D	0x6F52	#<CJK>
-0xE64E	0x6F50	#<CJK>
-0xE64F	0x6F57	#<CJK>
-0xE650	0x6F94	#<CJK>
-0xE651	0x6F93	#<CJK>
-0xE652	0x6F5D	#<CJK>
-0xE653	0x6F00	#<CJK>
-0xE654	0x6F61	#<CJK>
-0xE655	0x6F6B	#<CJK>
-0xE656	0x6F7D	#<CJK>
-0xE657	0x6F67	#<CJK>
-0xE658	0x6F90	#<CJK>
-0xE659	0x6F53	#<CJK>
-0xE65A	0x6F8B	#<CJK>
-0xE65B	0x6F69	#<CJK>
-0xE65C	0x6F7F	#<CJK>
-0xE65D	0x6F95	#<CJK>
-0xE65E	0x6F63	#<CJK>
-0xE65F	0x6F77	#<CJK>
-0xE660	0x6F6A	#<CJK>
-0xE661	0x6F7B	#<CJK>
-0xE662	0x71B2	#<CJK>
-0xE663	0x71AF	#<CJK>
-0xE664	0x719B	#<CJK>
-0xE665	0x71B0	#<CJK>
-0xE666	0x71A0	#<CJK>
-0xE667	0x719A	#<CJK>
-0xE668	0x71A9	#<CJK>
-0xE669	0x71B5	#<CJK>
-0xE66A	0x719D	#<CJK>
-0xE66B	0x71A5	#<CJK>
-0xE66C	0x719E	#<CJK>
-0xE66D	0x71A4	#<CJK>
-0xE66E	0x71A1	#<CJK>
-0xE66F	0x71AA	#<CJK>
-0xE670	0x719C	#<CJK>
-0xE671	0x71A7	#<CJK>
-0xE672	0x71B3	#<CJK>
-0xE673	0x7298	#<CJK>
-0xE674	0x729A	#<CJK>
-0xE675	0x7358	#<CJK>
-0xE676	0x7352	#<CJK>
-0xE677	0x735E	#<CJK>
-0xE678	0x735F	#<CJK>
-0xE679	0x7360	#<CJK>
-0xE67A	0x735D	#<CJK>
-0xE67B	0x735B	#<CJK>
-0xE67C	0x7361	#<CJK>
-0xE67D	0x735A	#<CJK>
-0xE67E	0x7359	#<CJK>
-0xE6A1	0x7362	#<CJK>
-0xE6A2	0x7487	#<CJK>
-0xE6A3	0x7489	#<CJK>
-0xE6A4	0x748A	#<CJK>
-0xE6A5	0x7486	#<CJK>
-0xE6A6	0x7481	#<CJK>
-0xE6A7	0x747D	#<CJK>
-0xE6A8	0x7485	#<CJK>
-0xE6A9	0x7488	#<CJK>
-0xE6AA	0x747C	#<CJK>
-0xE6AB	0x7479	#<CJK>
-0xE6AC	0x7508	#<CJK>
-0xE6AD	0x7507	#<CJK>
-0xE6AE	0x757E	#<CJK>
-0xE6AF	0x7625	#<CJK>
-0xE6B0	0x761E	#<CJK>
-0xE6B1	0x7619	#<CJK>
-0xE6B2	0x761D	#<CJK>
-0xE6B3	0x761C	#<CJK>
-0xE6B4	0x7623	#<CJK>
-0xE6B5	0x761A	#<CJK>
-0xE6B6	0x7628	#<CJK>
-0xE6B7	0x761B	#<CJK>
-0xE6B8	0x769C	#<CJK>
-0xE6B9	0x769D	#<CJK>
-0xE6BA	0x769E	#<CJK>
-0xE6BB	0x769B	#<CJK>
-0xE6BC	0x778D	#<CJK>
-0xE6BD	0x778F	#<CJK>
-0xE6BE	0x7789	#<CJK>
-0xE6BF	0x7788	#<CJK>
-0xE6C0	0x78CD	#<CJK>
-0xE6C1	0x78BB	#<CJK>
-0xE6C2	0x78CF	#<CJK>
-0xE6C3	0x78CC	#<CJK>
-0xE6C4	0x78D1	#<CJK>
-0xE6C5	0x78CE	#<CJK>
-0xE6C6	0x78D4	#<CJK>
-0xE6C7	0x78C8	#<CJK>
-0xE6C8	0x78C3	#<CJK>
-0xE6C9	0x78C4	#<CJK>
-0xE6CA	0x78C9	#<CJK>
-0xE6CB	0x799A	#<CJK>
-0xE6CC	0x79A1	#<CJK>
-0xE6CD	0x79A0	#<CJK>
-0xE6CE	0x799C	#<CJK>
-0xE6CF	0x79A2	#<CJK>
-0xE6D0	0x799B	#<CJK>
-0xE6D1	0x6B76	#<CJK>
-0xE6D2	0x7A39	#<CJK>
-0xE6D3	0x7AB2	#<CJK>
-0xE6D4	0x7AB4	#<CJK>
-0xE6D5	0x7AB3	#<CJK>
-0xE6D6	0x7BB7	#<CJK>
-0xE6D7	0x7BCB	#<CJK>
-0xE6D8	0x7BBE	#<CJK>
-0xE6D9	0x7BAC	#<CJK>
-0xE6DA	0x7BCE	#<CJK>
-0xE6DB	0x7BAF	#<CJK>
-0xE6DC	0x7BB9	#<CJK>
-0xE6DD	0x7BCA	#<CJK>
-0xE6DE	0x7BB5	#<CJK>
-0xE6DF	0x7CC5	#<CJK>
-0xE6E0	0x7CC8	#<CJK>
-0xE6E1	0x7CCC	#<CJK>
-0xE6E2	0x7CCB	#<CJK>
-0xE6E3	0x7DF7	#<CJK>
-0xE6E4	0x7DDB	#<CJK>
-0xE6E5	0x7DEA	#<CJK>
-0xE6E6	0x7DE7	#<CJK>
-0xE6E7	0x7DD7	#<CJK>
-0xE6E8	0x7DE1	#<CJK>
-0xE6E9	0x7E03	#<CJK>
-0xE6EA	0x7DFA	#<CJK>
-0xE6EB	0x7DE6	#<CJK>
-0xE6EC	0x7DF6	#<CJK>
-0xE6ED	0x7DF1	#<CJK>
-0xE6EE	0x7DF0	#<CJK>
-0xE6EF	0x7DEE	#<CJK>
-0xE6F0	0x7DDF	#<CJK>
-0xE6F1	0x7F76	#<CJK>
-0xE6F2	0x7FAC	#<CJK>
-0xE6F3	0x7FB0	#<CJK>
-0xE6F4	0x7FAD	#<CJK>
-0xE6F5	0x7FED	#<CJK>
-0xE6F6	0x7FEB	#<CJK>
-0xE6F7	0x7FEA	#<CJK>
-0xE6F8	0x7FEC	#<CJK>
-0xE6F9	0x7FE6	#<CJK>
-0xE6FA	0x7FE8	#<CJK>
-0xE6FB	0x8064	#<CJK>
-0xE6FC	0x8067	#<CJK>
-0xE6FD	0x81A3	#<CJK>
-0xE6FE	0x819F	#<CJK>
-0xE740	0x819E	#<CJK>
-0xE741	0x8195	#<CJK>
-0xE742	0x81A2	#<CJK>
-0xE743	0x8199	#<CJK>
-0xE744	0x8197	#<CJK>
-0xE745	0x8216	#<CJK>
-0xE746	0x824F	#<CJK>
-0xE747	0x8253	#<CJK>
-0xE748	0x8252	#<CJK>
-0xE749	0x8250	#<CJK>
-0xE74A	0x824E	#<CJK>
-0xE74B	0x8251	#<CJK>
-0xE74C	0x8524	#<CJK>
-0xE74D	0x853B	#<CJK>
-0xE74E	0x850F	#<CJK>
-0xE74F	0x8500	#<CJK>
-0xE750	0x8529	#<CJK>
-0xE751	0x850E	#<CJK>
-0xE752	0x8509	#<CJK>
-0xE753	0x850D	#<CJK>
-0xE754	0x851F	#<CJK>
-0xE755	0x850A	#<CJK>
-0xE756	0x8527	#<CJK>
-0xE757	0x851C	#<CJK>
-0xE758	0x84FB	#<CJK>
-0xE759	0x852B	#<CJK>
-0xE75A	0x84FA	#<CJK>
-0xE75B	0x8508	#<CJK>
-0xE75C	0x850C	#<CJK>
-0xE75D	0x84F4	#<CJK>
-0xE75E	0x852A	#<CJK>
-0xE75F	0x84F2	#<CJK>
-0xE760	0x8515	#<CJK>
-0xE761	0x84F7	#<CJK>
-0xE762	0x84EB	#<CJK>
-0xE763	0x84F3	#<CJK>
-0xE764	0x84FC	#<CJK>
-0xE765	0x8512	#<CJK>
-0xE766	0x84EA	#<CJK>
-0xE767	0x84E9	#<CJK>
-0xE768	0x8516	#<CJK>
-0xE769	0x84FE	#<CJK>
-0xE76A	0x8528	#<CJK>
-0xE76B	0x851D	#<CJK>
-0xE76C	0x852E	#<CJK>
-0xE76D	0x8502	#<CJK>
-0xE76E	0x84FD	#<CJK>
-0xE76F	0x851E	#<CJK>
-0xE770	0x84F6	#<CJK>
-0xE771	0x8531	#<CJK>
-0xE772	0x8526	#<CJK>
-0xE773	0x84E7	#<CJK>
-0xE774	0x84E8	#<CJK>
-0xE775	0x84F0	#<CJK>
-0xE776	0x84EF	#<CJK>
-0xE777	0x84F9	#<CJK>
-0xE778	0x8518	#<CJK>
-0xE779	0x8520	#<CJK>
-0xE77A	0x8530	#<CJK>
-0xE77B	0x850B	#<CJK>
-0xE77C	0x8519	#<CJK>
-0xE77D	0x852F	#<CJK>
-0xE77E	0x8662	#<CJK>
-0xE7A1	0x8756	#<CJK>
-0xE7A2	0x8763	#<CJK>
-0xE7A3	0x8764	#<CJK>
-0xE7A4	0x8777	#<CJK>
-0xE7A5	0x87E1	#<CJK>
-0xE7A6	0x8773	#<CJK>
-0xE7A7	0x8758	#<CJK>
-0xE7A8	0x8754	#<CJK>
-0xE7A9	0x875B	#<CJK>
-0xE7AA	0x8752	#<CJK>
-0xE7AB	0x8761	#<CJK>
-0xE7AC	0x875A	#<CJK>
-0xE7AD	0x8751	#<CJK>
-0xE7AE	0x875E	#<CJK>
-0xE7AF	0x876D	#<CJK>
-0xE7B0	0x876A	#<CJK>
-0xE7B1	0x8750	#<CJK>
-0xE7B2	0x874E	#<CJK>
-0xE7B3	0x875F	#<CJK>
-0xE7B4	0x875D	#<CJK>
-0xE7B5	0x876F	#<CJK>
-0xE7B6	0x876C	#<CJK>
-0xE7B7	0x877A	#<CJK>
-0xE7B8	0x876E	#<CJK>
-0xE7B9	0x875C	#<CJK>
-0xE7BA	0x8765	#<CJK>
-0xE7BB	0x874F	#<CJK>
-0xE7BC	0x877B	#<CJK>
-0xE7BD	0x8775	#<CJK>
-0xE7BE	0x8762	#<CJK>
-0xE7BF	0x8767	#<CJK>
-0xE7C0	0x8769	#<CJK>
-0xE7C1	0x885A	#<CJK>
-0xE7C2	0x8905	#<CJK>
-0xE7C3	0x890C	#<CJK>
-0xE7C4	0x8914	#<CJK>
-0xE7C5	0x890B	#<CJK>
-0xE7C6	0x8917	#<CJK>
-0xE7C7	0x8918	#<CJK>
-0xE7C8	0x8919	#<CJK>
-0xE7C9	0x8906	#<CJK>
-0xE7CA	0x8916	#<CJK>
-0xE7CB	0x8911	#<CJK>
-0xE7CC	0x890E	#<CJK>
-0xE7CD	0x8909	#<CJK>
-0xE7CE	0x89A2	#<CJK>
-0xE7CF	0x89A4	#<CJK>
-0xE7D0	0x89A3	#<CJK>
-0xE7D1	0x89ED	#<CJK>
-0xE7D2	0x89F0	#<CJK>
-0xE7D3	0x89EC	#<CJK>
-0xE7D4	0x8ACF	#<CJK>
-0xE7D5	0x8AC6	#<CJK>
-0xE7D6	0x8AB8	#<CJK>
-0xE7D7	0x8AD3	#<CJK>
-0xE7D8	0x8AD1	#<CJK>
-0xE7D9	0x8AD4	#<CJK>
-0xE7DA	0x8AD5	#<CJK>
-0xE7DB	0x8ABB	#<CJK>
-0xE7DC	0x8AD7	#<CJK>
-0xE7DD	0x8ABE	#<CJK>
-0xE7DE	0x8AC0	#<CJK>
-0xE7DF	0x8AC5	#<CJK>
-0xE7E0	0x8AD8	#<CJK>
-0xE7E1	0x8AC3	#<CJK>
-0xE7E2	0x8ABA	#<CJK>
-0xE7E3	0x8ABD	#<CJK>
-0xE7E4	0x8AD9	#<CJK>
-0xE7E5	0x8C3E	#<CJK>
-0xE7E6	0x8C4D	#<CJK>
-0xE7E7	0x8C8F	#<CJK>
-0xE7E8	0x8CE5	#<CJK>
-0xE7E9	0x8CDF	#<CJK>
-0xE7EA	0x8CD9	#<CJK>
-0xE7EB	0x8CE8	#<CJK>
-0xE7EC	0x8CDA	#<CJK>
-0xE7ED	0x8CDD	#<CJK>
-0xE7EE	0x8CE7	#<CJK>
-0xE7EF	0x8DA0	#<CJK>
-0xE7F0	0x8D9C	#<CJK>
-0xE7F1	0x8DA1	#<CJK>
-0xE7F2	0x8D9B	#<CJK>
-0xE7F3	0x8E20	#<CJK>
-0xE7F4	0x8E23	#<CJK>
-0xE7F5	0x8E25	#<CJK>
-0xE7F6	0x8E24	#<CJK>
-0xE7F7	0x8E2E	#<CJK>
-0xE7F8	0x8E15	#<CJK>
-0xE7F9	0x8E1B	#<CJK>
-0xE7FA	0x8E16	#<CJK>
-0xE7FB	0x8E11	#<CJK>
-0xE7FC	0x8E19	#<CJK>
-0xE7FD	0x8E26	#<CJK>
-0xE7FE	0x8E27	#<CJK>
-0xE840	0x8E14	#<CJK>
-0xE841	0x8E12	#<CJK>
-0xE842	0x8E18	#<CJK>
-0xE843	0x8E13	#<CJK>
-0xE844	0x8E1C	#<CJK>
-0xE845	0x8E17	#<CJK>
-0xE846	0x8E1A	#<CJK>
-0xE847	0x8F2C	#<CJK>
-0xE848	0x8F24	#<CJK>
-0xE849	0x8F18	#<CJK>
-0xE84A	0x8F1A	#<CJK>
-0xE84B	0x8F20	#<CJK>
-0xE84C	0x8F23	#<CJK>
-0xE84D	0x8F16	#<CJK>
-0xE84E	0x8F17	#<CJK>
-0xE84F	0x9073	#<CJK>
-0xE850	0x9070	#<CJK>
-0xE851	0x906F	#<CJK>
-0xE852	0x9067	#<CJK>
-0xE853	0x906B	#<CJK>
-0xE854	0x912F	#<CJK>
-0xE855	0x912B	#<CJK>
-0xE856	0x9129	#<CJK>
-0xE857	0x912A	#<CJK>
-0xE858	0x9132	#<CJK>
-0xE859	0x9126	#<CJK>
-0xE85A	0x912E	#<CJK>
-0xE85B	0x9185	#<CJK>
-0xE85C	0x9186	#<CJK>
-0xE85D	0x918A	#<CJK>
-0xE85E	0x9181	#<CJK>
-0xE85F	0x9182	#<CJK>
-0xE860	0x9184	#<CJK>
-0xE861	0x9180	#<CJK>
-0xE862	0x92D0	#<CJK>
-0xE863	0x92C3	#<CJK>
-0xE864	0x92C4	#<CJK>
-0xE865	0x92C0	#<CJK>
-0xE866	0x92D9	#<CJK>
-0xE867	0x92B6	#<CJK>
-0xE868	0x92CF	#<CJK>
-0xE869	0x92F1	#<CJK>
-0xE86A	0x92DF	#<CJK>
-0xE86B	0x92D8	#<CJK>
-0xE86C	0x92E9	#<CJK>
-0xE86D	0x92D7	#<CJK>
-0xE86E	0x92DD	#<CJK>
-0xE86F	0x92CC	#<CJK>
-0xE870	0x92EF	#<CJK>
-0xE871	0x92C2	#<CJK>
-0xE872	0x92E8	#<CJK>
-0xE873	0x92CA	#<CJK>
-0xE874	0x92C8	#<CJK>
-0xE875	0x92CE	#<CJK>
-0xE876	0x92E6	#<CJK>
-0xE877	0x92CD	#<CJK>
-0xE878	0x92D5	#<CJK>
-0xE879	0x92C9	#<CJK>
-0xE87A	0x92E0	#<CJK>
-0xE87B	0x92DE	#<CJK>
-0xE87C	0x92E7	#<CJK>
-0xE87D	0x92D1	#<CJK>
-0xE87E	0x92D3	#<CJK>
-0xE8A1	0x92B5	#<CJK>
-0xE8A2	0x92E1	#<CJK>
-0xE8A3	0x92C6	#<CJK>
-0xE8A4	0x92B4	#<CJK>
-0xE8A5	0x957C	#<CJK>
-0xE8A6	0x95AC	#<CJK>
-0xE8A7	0x95AB	#<CJK>
-0xE8A8	0x95AE	#<CJK>
-0xE8A9	0x95B0	#<CJK>
-0xE8AA	0x96A4	#<CJK>
-0xE8AB	0x96A2	#<CJK>
-0xE8AC	0x96D3	#<CJK>
-0xE8AD	0x9705	#<CJK>
-0xE8AE	0x9708	#<CJK>
-0xE8AF	0x9702	#<CJK>
-0xE8B0	0x975A	#<CJK>
-0xE8B1	0x978A	#<CJK>
-0xE8B2	0x978E	#<CJK>
-0xE8B3	0x9788	#<CJK>
-0xE8B4	0x97D0	#<CJK>
-0xE8B5	0x97CF	#<CJK>
-0xE8B6	0x981E	#<CJK>
-0xE8B7	0x981D	#<CJK>
-0xE8B8	0x9826	#<CJK>
-0xE8B9	0x9829	#<CJK>
-0xE8BA	0x9828	#<CJK>
-0xE8BB	0x9820	#<CJK>
-0xE8BC	0x981B	#<CJK>
-0xE8BD	0x9827	#<CJK>
-0xE8BE	0x98B2	#<CJK>
-0xE8BF	0x9908	#<CJK>
-0xE8C0	0x98FA	#<CJK>
-0xE8C1	0x9911	#<CJK>
-0xE8C2	0x9914	#<CJK>
-0xE8C3	0x9916	#<CJK>
-0xE8C4	0x9917	#<CJK>
-0xE8C5	0x9915	#<CJK>
-0xE8C6	0x99DC	#<CJK>
-0xE8C7	0x99CD	#<CJK>
-0xE8C8	0x99CF	#<CJK>
-0xE8C9	0x99D3	#<CJK>
-0xE8CA	0x99D4	#<CJK>
-0xE8CB	0x99CE	#<CJK>
-0xE8CC	0x99C9	#<CJK>
-0xE8CD	0x99D6	#<CJK>
-0xE8CE	0x99D8	#<CJK>
-0xE8CF	0x99CB	#<CJK>
-0xE8D0	0x99D7	#<CJK>
-0xE8D1	0x99CC	#<CJK>
-0xE8D2	0x9AB3	#<CJK>
-0xE8D3	0x9AEC	#<CJK>
-0xE8D4	0x9AEB	#<CJK>
-0xE8D5	0x9AF3	#<CJK>
-0xE8D6	0x9AF2	#<CJK>
-0xE8D7	0x9AF1	#<CJK>
-0xE8D8	0x9B46	#<CJK>
-0xE8D9	0x9B43	#<CJK>
-0xE8DA	0x9B67	#<CJK>
-0xE8DB	0x9B74	#<CJK>
-0xE8DC	0x9B71	#<CJK>
-0xE8DD	0x9B66	#<CJK>
-0xE8DE	0x9B76	#<CJK>
-0xE8DF	0x9B75	#<CJK>
-0xE8E0	0x9B70	#<CJK>
-0xE8E1	0x9B68	#<CJK>
-0xE8E2	0x9B64	#<CJK>
-0xE8E3	0x9B6C	#<CJK>
-0xE8E4	0x9CFC	#<CJK>
-0xE8E5	0x9CFA	#<CJK>
-0xE8E6	0x9CFD	#<CJK>
-0xE8E7	0x9CFF	#<CJK>
-0xE8E8	0x9CF7	#<CJK>
-0xE8E9	0x9D07	#<CJK>
-0xE8EA	0x9D00	#<CJK>
-0xE8EB	0x9CF9	#<CJK>
-0xE8EC	0x9CFB	#<CJK>
-0xE8ED	0x9D08	#<CJK>
-0xE8EE	0x9D05	#<CJK>
-0xE8EF	0x9D04	#<CJK>
-0xE8F0	0x9E83	#<CJK>
-0xE8F1	0x9ED3	#<CJK>
-0xE8F2	0x9F0F	#<CJK>
-0xE8F3	0x9F10	#<CJK>
-0xE8F4	0x511C	#<CJK>
-0xE8F5	0x5113	#<CJK>
-0xE8F6	0x5117	#<CJK>
-0xE8F7	0x511A	#<CJK>
-0xE8F8	0x5111	#<CJK>
-0xE8F9	0x51DE	#<CJK>
-0xE8FA	0x5334	#<CJK>
-0xE8FB	0x53E1	#<CJK>
-0xE8FC	0x5670	#<CJK>
-0xE8FD	0x5660	#<CJK>
-0xE8FE	0x566E	#<CJK>
-0xE940	0x5673	#<CJK>
-0xE941	0x5666	#<CJK>
-0xE942	0x5663	#<CJK>
-0xE943	0x566D	#<CJK>
-0xE944	0x5672	#<CJK>
-0xE945	0x565E	#<CJK>
-0xE946	0x5677	#<CJK>
-0xE947	0x571C	#<CJK>
-0xE948	0x571B	#<CJK>
-0xE949	0x58C8	#<CJK>
-0xE94A	0x58BD	#<CJK>
-0xE94B	0x58C9	#<CJK>
-0xE94C	0x58BF	#<CJK>
-0xE94D	0x58BA	#<CJK>
-0xE94E	0x58C2	#<CJK>
-0xE94F	0x58BC	#<CJK>
-0xE950	0x58C6	#<CJK>
-0xE951	0x5B17	#<CJK>
-0xE952	0x5B19	#<CJK>
-0xE953	0x5B1B	#<CJK>
-0xE954	0x5B21	#<CJK>
-0xE955	0x5B14	#<CJK>
-0xE956	0x5B13	#<CJK>
-0xE957	0x5B10	#<CJK>
-0xE958	0x5B16	#<CJK>
-0xE959	0x5B28	#<CJK>
-0xE95A	0x5B1A	#<CJK>
-0xE95B	0x5B20	#<CJK>
-0xE95C	0x5B1E	#<CJK>
-0xE95D	0x5BEF	#<CJK>
-0xE95E	0x5DAC	#<CJK>
-0xE95F	0x5DB1	#<CJK>
-0xE960	0x5DA9	#<CJK>
-0xE961	0x5DA7	#<CJK>
-0xE962	0x5DB5	#<CJK>
-0xE963	0x5DB0	#<CJK>
-0xE964	0x5DAE	#<CJK>
-0xE965	0x5DAA	#<CJK>
-0xE966	0x5DA8	#<CJK>
-0xE967	0x5DB2	#<CJK>
-0xE968	0x5DAD	#<CJK>
-0xE969	0x5DAF	#<CJK>
-0xE96A	0x5DB4	#<CJK>
-0xE96B	0x5E67	#<CJK>
-0xE96C	0x5E68	#<CJK>
-0xE96D	0x5E66	#<CJK>
-0xE96E	0x5E6F	#<CJK>
-0xE96F	0x5EE9	#<CJK>
-0xE970	0x5EE7	#<CJK>
-0xE971	0x5EE6	#<CJK>
-0xE972	0x5EE8	#<CJK>
-0xE973	0x5EE5	#<CJK>
-0xE974	0x5F4B	#<CJK>
-0xE975	0x5FBC	#<CJK>
-0xE976	0x619D	#<CJK>
-0xE977	0x61A8	#<CJK>
-0xE978	0x6196	#<CJK>
-0xE979	0x61C5	#<CJK>
-0xE97A	0x61B4	#<CJK>
-0xE97B	0x61C6	#<CJK>
-0xE97C	0x61C1	#<CJK>
-0xE97D	0x61CC	#<CJK>
-0xE97E	0x61BA	#<CJK>
-0xE9A1	0x61BF	#<CJK>
-0xE9A2	0x61B8	#<CJK>
-0xE9A3	0x618C	#<CJK>
-0xE9A4	0x64D7	#<CJK>
-0xE9A5	0x64D6	#<CJK>
-0xE9A6	0x64D0	#<CJK>
-0xE9A7	0x64CF	#<CJK>
-0xE9A8	0x64C9	#<CJK>
-0xE9A9	0x64BD	#<CJK>
-0xE9AA	0x6489	#<CJK>
-0xE9AB	0x64C3	#<CJK>
-0xE9AC	0x64DB	#<CJK>
-0xE9AD	0x64F3	#<CJK>
-0xE9AE	0x64D9	#<CJK>
-0xE9AF	0x6533	#<CJK>
-0xE9B0	0x657F	#<CJK>
-0xE9B1	0x657C	#<CJK>
-0xE9B2	0x65A2	#<CJK>
-0xE9B3	0x66C8	#<CJK>
-0xE9B4	0x66BE	#<CJK>
-0xE9B5	0x66C0	#<CJK>
-0xE9B6	0x66CA	#<CJK>
-0xE9B7	0x66CB	#<CJK>
-0xE9B8	0x66CF	#<CJK>
-0xE9B9	0x66BD	#<CJK>
-0xE9BA	0x66BB	#<CJK>
-0xE9BB	0x66BA	#<CJK>
-0xE9BC	0x66CC	#<CJK>
-0xE9BD	0x6723	#<CJK>
-0xE9BE	0x6A34	#<CJK>
-0xE9BF	0x6A66	#<CJK>
-0xE9C0	0x6A49	#<CJK>
-0xE9C1	0x6A67	#<CJK>
-0xE9C2	0x6A32	#<CJK>
-0xE9C3	0x6A68	#<CJK>
-0xE9C4	0x6A3E	#<CJK>
-0xE9C5	0x6A5D	#<CJK>
-0xE9C6	0x6A6D	#<CJK>
-0xE9C7	0x6A76	#<CJK>
-0xE9C8	0x6A5B	#<CJK>
-0xE9C9	0x6A51	#<CJK>
-0xE9CA	0x6A28	#<CJK>
-0xE9CB	0x6A5A	#<CJK>
-0xE9CC	0x6A3B	#<CJK>
-0xE9CD	0x6A3F	#<CJK>
-0xE9CE	0x6A41	#<CJK>
-0xE9CF	0x6A6A	#<CJK>
-0xE9D0	0x6A64	#<CJK>
-0xE9D1	0x6A50	#<CJK>
-0xE9D2	0x6A4F	#<CJK>
-0xE9D3	0x6A54	#<CJK>
-0xE9D4	0x6A6F	#<CJK>
-0xE9D5	0x6A69	#<CJK>
-0xE9D6	0x6A60	#<CJK>
-0xE9D7	0x6A3C	#<CJK>
-0xE9D8	0x6A5E	#<CJK>
-0xE9D9	0x6A56	#<CJK>
-0xE9DA	0x6A55	#<CJK>
-0xE9DB	0x6A4D	#<CJK>
-0xE9DC	0x6A4E	#<CJK>
-0xE9DD	0x6A46	#<CJK>
-0xE9DE	0x6B55	#<CJK>
-0xE9DF	0x6B54	#<CJK>
-0xE9E0	0x6B56	#<CJK>
-0xE9E1	0x6BA7	#<CJK>
-0xE9E2	0x6BAA	#<CJK>
-0xE9E3	0x6BAB	#<CJK>
-0xE9E4	0x6BC8	#<CJK>
-0xE9E5	0x6BC7	#<CJK>
-0xE9E6	0x6C04	#<CJK>
-0xE9E7	0x6C03	#<CJK>
-0xE9E8	0x6C06	#<CJK>
-0xE9E9	0x6FAD	#<CJK>
-0xE9EA	0x6FCB	#<CJK>
-0xE9EB	0x6FA3	#<CJK>
-0xE9EC	0x6FC7	#<CJK>
-0xE9ED	0x6FBC	#<CJK>
-0xE9EE	0x6FCE	#<CJK>
-0xE9EF	0x6FC8	#<CJK>
-0xE9F0	0x6F5E	#<CJK>
-0xE9F1	0x6FC4	#<CJK>
-0xE9F2	0x6FBD	#<CJK>
-0xE9F3	0x6F9E	#<CJK>
-0xE9F4	0x6FCA	#<CJK>
-0xE9F5	0x6FA8	#<CJK>
-0xE9F6	0x7004	#<CJK>
-0xE9F7	0x6FA5	#<CJK>
-0xE9F8	0x6FAE	#<CJK>
-0xE9F9	0x6FBA	#<CJK>
-0xE9FA	0x6FAC	#<CJK>
-0xE9FB	0x6FAA	#<CJK>
-0xE9FC	0x6FCF	#<CJK>
-0xE9FD	0x6FBF	#<CJK>
-0xE9FE	0x6FB8	#<CJK>
-0xEA40	0x6FA2	#<CJK>
-0xEA41	0x6FC9	#<CJK>
-0xEA42	0x6FAB	#<CJK>
-0xEA43	0x6FCD	#<CJK>
-0xEA44	0x6FAF	#<CJK>
-0xEA45	0x6FB2	#<CJK>
-0xEA46	0x6FB0	#<CJK>
-0xEA47	0x71C5	#<CJK>
-0xEA48	0x71C2	#<CJK>
-0xEA49	0x71BF	#<CJK>
-0xEA4A	0x71B8	#<CJK>
-0xEA4B	0x71D6	#<CJK>
-0xEA4C	0x71C0	#<CJK>
-0xEA4D	0x71C1	#<CJK>
-0xEA4E	0x71CB	#<CJK>
-0xEA4F	0x71D4	#<CJK>
-0xEA50	0x71CA	#<CJK>
-0xEA51	0x71C7	#<CJK>
-0xEA52	0x71CF	#<CJK>
-0xEA53	0x71BD	#<CJK>
-0xEA54	0x71D8	#<CJK>
-0xEA55	0x71BC	#<CJK>
-0xEA56	0x71C6	#<CJK>
-0xEA57	0x71DA	#<CJK>
-0xEA58	0x71DB	#<CJK>
-0xEA59	0x729D	#<CJK>
-0xEA5A	0x729E	#<CJK>
-0xEA5B	0x7369	#<CJK>
-0xEA5C	0x7366	#<CJK>
-0xEA5D	0x7367	#<CJK>
-0xEA5E	0x736C	#<CJK>
-0xEA5F	0x7365	#<CJK>
-0xEA60	0x736B	#<CJK>
-0xEA61	0x736A	#<CJK>
-0xEA62	0x747F	#<CJK>
-0xEA63	0x749A	#<CJK>
-0xEA64	0x74A0	#<CJK>
-0xEA65	0x7494	#<CJK>
-0xEA66	0x7492	#<CJK>
-0xEA67	0x7495	#<CJK>
-0xEA68	0x74A1	#<CJK>
-0xEA69	0x750B	#<CJK>
-0xEA6A	0x7580	#<CJK>
-0xEA6B	0x762F	#<CJK>
-0xEA6C	0x762D	#<CJK>
-0xEA6D	0x7631	#<CJK>
-0xEA6E	0x763D	#<CJK>
-0xEA6F	0x7633	#<CJK>
-0xEA70	0x763C	#<CJK>
-0xEA71	0x7635	#<CJK>
-0xEA72	0x7632	#<CJK>
-0xEA73	0x7630	#<CJK>
-0xEA74	0x76BB	#<CJK>
-0xEA75	0x76E6	#<CJK>
-0xEA76	0x779A	#<CJK>
-0xEA77	0x779D	#<CJK>
-0xEA78	0x77A1	#<CJK>
-0xEA79	0x779C	#<CJK>
-0xEA7A	0x779B	#<CJK>
-0xEA7B	0x77A2	#<CJK>
-0xEA7C	0x77A3	#<CJK>
-0xEA7D	0x7795	#<CJK>
-0xEA7E	0x7799	#<CJK>
-0xEAA1	0x7797	#<CJK>
-0xEAA2	0x78DD	#<CJK>
-0xEAA3	0x78E9	#<CJK>
-0xEAA4	0x78E5	#<CJK>
-0xEAA5	0x78EA	#<CJK>
-0xEAA6	0x78DE	#<CJK>
-0xEAA7	0x78E3	#<CJK>
-0xEAA8	0x78DB	#<CJK>
-0xEAA9	0x78E1	#<CJK>
-0xEAAA	0x78E2	#<CJK>
-0xEAAB	0x78ED	#<CJK>
-0xEAAC	0x78DF	#<CJK>
-0xEAAD	0x78E0	#<CJK>
-0xEAAE	0x79A4	#<CJK>
-0xEAAF	0x7A44	#<CJK>
-0xEAB0	0x7A48	#<CJK>
-0xEAB1	0x7A47	#<CJK>
-0xEAB2	0x7AB6	#<CJK>
-0xEAB3	0x7AB8	#<CJK>
-0xEAB4	0x7AB5	#<CJK>
-0xEAB5	0x7AB1	#<CJK>
-0xEAB6	0x7AB7	#<CJK>
-0xEAB7	0x7BDE	#<CJK>
-0xEAB8	0x7BE3	#<CJK>
-0xEAB9	0x7BE7	#<CJK>
-0xEABA	0x7BDD	#<CJK>
-0xEABB	0x7BD5	#<CJK>
-0xEABC	0x7BE5	#<CJK>
-0xEABD	0x7BDA	#<CJK>
-0xEABE	0x7BE8	#<CJK>
-0xEABF	0x7BF9	#<CJK>
-0xEAC0	0x7BD4	#<CJK>
-0xEAC1	0x7BEA	#<CJK>
-0xEAC2	0x7BE2	#<CJK>
-0xEAC3	0x7BDC	#<CJK>
-0xEAC4	0x7BEB	#<CJK>
-0xEAC5	0x7BD8	#<CJK>
-0xEAC6	0x7BDF	#<CJK>
-0xEAC7	0x7CD2	#<CJK>
-0xEAC8	0x7CD4	#<CJK>
-0xEAC9	0x7CD7	#<CJK>
-0xEACA	0x7CD0	#<CJK>
-0xEACB	0x7CD1	#<CJK>
-0xEACC	0x7E12	#<CJK>
-0xEACD	0x7E21	#<CJK>
-0xEACE	0x7E17	#<CJK>
-0xEACF	0x7E0C	#<CJK>
-0xEAD0	0x7E1F	#<CJK>
-0xEAD1	0x7E20	#<CJK>
-0xEAD2	0x7E13	#<CJK>
-0xEAD3	0x7E0E	#<CJK>
-0xEAD4	0x7E1C	#<CJK>
-0xEAD5	0x7E15	#<CJK>
-0xEAD6	0x7E1A	#<CJK>
-0xEAD7	0x7E22	#<CJK>
-0xEAD8	0x7E0B	#<CJK>
-0xEAD9	0x7E0F	#<CJK>
-0xEADA	0x7E16	#<CJK>
-0xEADB	0x7E0D	#<CJK>
-0xEADC	0x7E14	#<CJK>
-0xEADD	0x7E25	#<CJK>
-0xEADE	0x7E24	#<CJK>
-0xEADF	0x7F43	#<CJK>
-0xEAE0	0x7F7B	#<CJK>
-0xEAE1	0x7F7C	#<CJK>
-0xEAE2	0x7F7A	#<CJK>
-0xEAE3	0x7FB1	#<CJK>
-0xEAE4	0x7FEF	#<CJK>
-0xEAE5	0x802A	#<CJK>
-0xEAE6	0x8029	#<CJK>
-0xEAE7	0x806C	#<CJK>
-0xEAE8	0x81B1	#<CJK>
-0xEAE9	0x81A6	#<CJK>
-0xEAEA	0x81AE	#<CJK>
-0xEAEB	0x81B9	#<CJK>
-0xEAEC	0x81B5	#<CJK>
-0xEAED	0x81AB	#<CJK>
-0xEAEE	0x81B0	#<CJK>
-0xEAEF	0x81AC	#<CJK>
-0xEAF0	0x81B4	#<CJK>
-0xEAF1	0x81B2	#<CJK>
-0xEAF2	0x81B7	#<CJK>
-0xEAF3	0x81A7	#<CJK>
-0xEAF4	0x81F2	#<CJK>
-0xEAF5	0x8255	#<CJK>
-0xEAF6	0x8256	#<CJK>
-0xEAF7	0x8257	#<CJK>
-0xEAF8	0x8556	#<CJK>
-0xEAF9	0x8545	#<CJK>
-0xEAFA	0x856B	#<CJK>
-0xEAFB	0x854D	#<CJK>
-0xEAFC	0x8553	#<CJK>
-0xEAFD	0x8561	#<CJK>
-0xEAFE	0x8558	#<CJK>
-0xEB40	0x8540	#<CJK>
-0xEB41	0x8546	#<CJK>
-0xEB42	0x8564	#<CJK>
-0xEB43	0x8541	#<CJK>
-0xEB44	0x8562	#<CJK>
-0xEB45	0x8544	#<CJK>
-0xEB46	0x8551	#<CJK>
-0xEB47	0x8547	#<CJK>
-0xEB48	0x8563	#<CJK>
-0xEB49	0x853E	#<CJK>
-0xEB4A	0x855B	#<CJK>
-0xEB4B	0x8571	#<CJK>
-0xEB4C	0x854E	#<CJK>
-0xEB4D	0x856E	#<CJK>
-0xEB4E	0x8575	#<CJK>
-0xEB4F	0x8555	#<CJK>
-0xEB50	0x8567	#<CJK>
-0xEB51	0x8560	#<CJK>
-0xEB52	0x858C	#<CJK>
-0xEB53	0x8566	#<CJK>
-0xEB54	0x855D	#<CJK>
-0xEB55	0x8554	#<CJK>
-0xEB56	0x8565	#<CJK>
-0xEB57	0x856C	#<CJK>
-0xEB58	0x8663	#<CJK>
-0xEB59	0x8665	#<CJK>
-0xEB5A	0x8664	#<CJK>
-0xEB5B	0x879B	#<CJK>
-0xEB5C	0x878F	#<CJK>
-0xEB5D	0x8797	#<CJK>
-0xEB5E	0x8793	#<CJK>
-0xEB5F	0x8792	#<CJK>
-0xEB60	0x8788	#<CJK>
-0xEB61	0x8781	#<CJK>
-0xEB62	0x8796	#<CJK>
-0xEB63	0x8798	#<CJK>
-0xEB64	0x8779	#<CJK>
-0xEB65	0x8787	#<CJK>
-0xEB66	0x87A3	#<CJK>
-0xEB67	0x8785	#<CJK>
-0xEB68	0x8790	#<CJK>
-0xEB69	0x8791	#<CJK>
-0xEB6A	0x879D	#<CJK>
-0xEB6B	0x8784	#<CJK>
-0xEB6C	0x8794	#<CJK>
-0xEB6D	0x879C	#<CJK>
-0xEB6E	0x879A	#<CJK>
-0xEB6F	0x8789	#<CJK>
-0xEB70	0x891E	#<CJK>
-0xEB71	0x8926	#<CJK>
-0xEB72	0x8930	#<CJK>
-0xEB73	0x892D	#<CJK>
-0xEB74	0x892E	#<CJK>
-0xEB75	0x8927	#<CJK>
-0xEB76	0x8931	#<CJK>
-0xEB77	0x8922	#<CJK>
-0xEB78	0x8929	#<CJK>
-0xEB79	0x8923	#<CJK>
-0xEB7A	0x892F	#<CJK>
-0xEB7B	0x892C	#<CJK>
-0xEB7C	0x891F	#<CJK>
-0xEB7D	0x89F1	#<CJK>
-0xEB7E	0x8AE0	#<CJK>
-0xEBA1	0x8AE2	#<CJK>
-0xEBA2	0x8AF2	#<CJK>
-0xEBA3	0x8AF4	#<CJK>
-0xEBA4	0x8AF5	#<CJK>
-0xEBA5	0x8ADD	#<CJK>
-0xEBA6	0x8B14	#<CJK>
-0xEBA7	0x8AE4	#<CJK>
-0xEBA8	0x8ADF	#<CJK>
-0xEBA9	0x8AF0	#<CJK>
-0xEBAA	0x8AC8	#<CJK>
-0xEBAB	0x8ADE	#<CJK>
-0xEBAC	0x8AE1	#<CJK>
-0xEBAD	0x8AE8	#<CJK>
-0xEBAE	0x8AFF	#<CJK>
-0xEBAF	0x8AEF	#<CJK>
-0xEBB0	0x8AFB	#<CJK>
-0xEBB1	0x8C91	#<CJK>
-0xEBB2	0x8C92	#<CJK>
-0xEBB3	0x8C90	#<CJK>
-0xEBB4	0x8CF5	#<CJK>
-0xEBB5	0x8CEE	#<CJK>
-0xEBB6	0x8CF1	#<CJK>
-0xEBB7	0x8CF0	#<CJK>
-0xEBB8	0x8CF3	#<CJK>
-0xEBB9	0x8D6C	#<CJK>
-0xEBBA	0x8D6E	#<CJK>
-0xEBBB	0x8DA5	#<CJK>
-0xEBBC	0x8DA7	#<CJK>
-0xEBBD	0x8E33	#<CJK>
-0xEBBE	0x8E3E	#<CJK>
-0xEBBF	0x8E38	#<CJK>
-0xEBC0	0x8E40	#<CJK>
-0xEBC1	0x8E45	#<CJK>
-0xEBC2	0x8E36	#<CJK>
-0xEBC3	0x8E3C	#<CJK>
-0xEBC4	0x8E3D	#<CJK>
-0xEBC5	0x8E41	#<CJK>
-0xEBC6	0x8E30	#<CJK>
-0xEBC7	0x8E3F	#<CJK>
-0xEBC8	0x8EBD	#<CJK>
-0xEBC9	0x8F36	#<CJK>
-0xEBCA	0x8F2E	#<CJK>
-0xEBCB	0x8F35	#<CJK>
-0xEBCC	0x8F32	#<CJK>
-0xEBCD	0x8F39	#<CJK>
-0xEBCE	0x8F37	#<CJK>
-0xEBCF	0x8F34	#<CJK>
-0xEBD0	0x9076	#<CJK>
-0xEBD1	0x9079	#<CJK>
-0xEBD2	0x907B	#<CJK>
-0xEBD3	0x9086	#<CJK>
-0xEBD4	0x90FA	#<CJK>
-0xEBD5	0x9133	#<CJK>
-0xEBD6	0x9135	#<CJK>
-0xEBD7	0x9136	#<CJK>
-0xEBD8	0x9193	#<CJK>
-0xEBD9	0x9190	#<CJK>
-0xEBDA	0x9191	#<CJK>
-0xEBDB	0x918D	#<CJK>
-0xEBDC	0x918F	#<CJK>
-0xEBDD	0x9327	#<CJK>
-0xEBDE	0x931E	#<CJK>
-0xEBDF	0x9308	#<CJK>
-0xEBE0	0x931F	#<CJK>
-0xEBE1	0x9306	#<CJK>
-0xEBE2	0x930F	#<CJK>
-0xEBE3	0x937A	#<CJK>
-0xEBE4	0x9338	#<CJK>
-0xEBE5	0x933C	#<CJK>
-0xEBE6	0x931B	#<CJK>
-0xEBE7	0x9323	#<CJK>
-0xEBE8	0x9312	#<CJK>
-0xEBE9	0x9301	#<CJK>
-0xEBEA	0x9346	#<CJK>
-0xEBEB	0x932D	#<CJK>
-0xEBEC	0x930E	#<CJK>
-0xEBED	0x930D	#<CJK>
-0xEBEE	0x92CB	#<CJK>
-0xEBEF	0x931D	#<CJK>
-0xEBF0	0x92FA	#<CJK>
-0xEBF1	0x9325	#<CJK>
-0xEBF2	0x9313	#<CJK>
-0xEBF3	0x92F9	#<CJK>
-0xEBF4	0x92F7	#<CJK>
-0xEBF5	0x9334	#<CJK>
-0xEBF6	0x9302	#<CJK>
-0xEBF7	0x9324	#<CJK>
-0xEBF8	0x92FF	#<CJK>
-0xEBF9	0x9329	#<CJK>
-0xEBFA	0x9339	#<CJK>
-0xEBFB	0x9335	#<CJK>
-0xEBFC	0x932A	#<CJK>
-0xEBFD	0x9314	#<CJK>
-0xEBFE	0x930C	#<CJK>
-0xEC40	0x930B	#<CJK>
-0xEC41	0x92FE	#<CJK>
-0xEC42	0x9309	#<CJK>
-0xEC43	0x9300	#<CJK>
-0xEC44	0x92FB	#<CJK>
-0xEC45	0x9316	#<CJK>
-0xEC46	0x95BC	#<CJK>
-0xEC47	0x95CD	#<CJK>
-0xEC48	0x95BE	#<CJK>
-0xEC49	0x95B9	#<CJK>
-0xEC4A	0x95BA	#<CJK>
-0xEC4B	0x95B6	#<CJK>
-0xEC4C	0x95BF	#<CJK>
-0xEC4D	0x95B5	#<CJK>
-0xEC4E	0x95BD	#<CJK>
-0xEC4F	0x96A9	#<CJK>
-0xEC50	0x96D4	#<CJK>
-0xEC51	0x970B	#<CJK>
-0xEC52	0x9712	#<CJK>
-0xEC53	0x9710	#<CJK>
-0xEC54	0x9799	#<CJK>
-0xEC55	0x9797	#<CJK>
-0xEC56	0x9794	#<CJK>
-0xEC57	0x97F0	#<CJK>
-0xEC58	0x97F8	#<CJK>
-0xEC59	0x9835	#<CJK>
-0xEC5A	0x982F	#<CJK>
-0xEC5B	0x9832	#<CJK>
-0xEC5C	0x9924	#<CJK>
-0xEC5D	0x991F	#<CJK>
-0xEC5E	0x9927	#<CJK>
-0xEC5F	0x9929	#<CJK>
-0xEC60	0x999E	#<CJK>
-0xEC61	0x99EE	#<CJK>
-0xEC62	0x99EC	#<CJK>
-0xEC63	0x99E5	#<CJK>
-0xEC64	0x99E4	#<CJK>
-0xEC65	0x99F0	#<CJK>
-0xEC66	0x99E3	#<CJK>
-0xEC67	0x99EA	#<CJK>
-0xEC68	0x99E9	#<CJK>
-0xEC69	0x99E7	#<CJK>
-0xEC6A	0x9AB9	#<CJK>
-0xEC6B	0x9ABF	#<CJK>
-0xEC6C	0x9AB4	#<CJK>
-0xEC6D	0x9ABB	#<CJK>
-0xEC6E	0x9AF6	#<CJK>
-0xEC6F	0x9AFA	#<CJK>
-0xEC70	0x9AF9	#<CJK>
-0xEC71	0x9AF7	#<CJK>
-0xEC72	0x9B33	#<CJK>
-0xEC73	0x9B80	#<CJK>
-0xEC74	0x9B85	#<CJK>
-0xEC75	0x9B87	#<CJK>
-0xEC76	0x9B7C	#<CJK>
-0xEC77	0x9B7E	#<CJK>
-0xEC78	0x9B7B	#<CJK>
-0xEC79	0x9B82	#<CJK>
-0xEC7A	0x9B93	#<CJK>
-0xEC7B	0x9B92	#<CJK>
-0xEC7C	0x9B90	#<CJK>
-0xEC7D	0x9B7A	#<CJK>
-0xEC7E	0x9B95	#<CJK>
-0xECA1	0x9B7D	#<CJK>
-0xECA2	0x9B88	#<CJK>
-0xECA3	0x9D25	#<CJK>
-0xECA4	0x9D17	#<CJK>
-0xECA5	0x9D20	#<CJK>
-0xECA6	0x9D1E	#<CJK>
-0xECA7	0x9D14	#<CJK>
-0xECA8	0x9D29	#<CJK>
-0xECA9	0x9D1D	#<CJK>
-0xECAA	0x9D18	#<CJK>
-0xECAB	0x9D22	#<CJK>
-0xECAC	0x9D10	#<CJK>
-0xECAD	0x9D19	#<CJK>
-0xECAE	0x9D1F	#<CJK>
-0xECAF	0x9E88	#<CJK>
-0xECB0	0x9E86	#<CJK>
-0xECB1	0x9E87	#<CJK>
-0xECB2	0x9EAE	#<CJK>
-0xECB3	0x9EAD	#<CJK>
-0xECB4	0x9ED5	#<CJK>
-0xECB5	0x9ED6	#<CJK>
-0xECB6	0x9EFA	#<CJK>
-0xECB7	0x9F12	#<CJK>
-0xECB8	0x9F3D	#<CJK>
-0xECB9	0x5126	#<CJK>
-0xECBA	0x5125	#<CJK>
-0xECBB	0x5122	#<CJK>
-0xECBC	0x5124	#<CJK>
-0xECBD	0x5120	#<CJK>
-0xECBE	0x5129	#<CJK>
-0xECBF	0x52F4	#<CJK>
-0xECC0	0x5693	#<CJK>
-0xECC1	0x568C	#<CJK>
-0xECC2	0x568D	#<CJK>
-0xECC3	0x5686	#<CJK>
-0xECC4	0x5684	#<CJK>
-0xECC5	0x5683	#<CJK>
-0xECC6	0x567E	#<CJK>
-0xECC7	0x5682	#<CJK>
-0xECC8	0x567F	#<CJK>
-0xECC9	0x5681	#<CJK>
-0xECCA	0x58D6	#<CJK>
-0xECCB	0x58D4	#<CJK>
-0xECCC	0x58CF	#<CJK>
-0xECCD	0x58D2	#<CJK>
-0xECCE	0x5B2D	#<CJK>
-0xECCF	0x5B25	#<CJK>
-0xECD0	0x5B32	#<CJK>
-0xECD1	0x5B23	#<CJK>
-0xECD2	0x5B2C	#<CJK>
-0xECD3	0x5B27	#<CJK>
-0xECD4	0x5B26	#<CJK>
-0xECD5	0x5B2F	#<CJK>
-0xECD6	0x5B2E	#<CJK>
-0xECD7	0x5B7B	#<CJK>
-0xECD8	0x5BF1	#<CJK>
-0xECD9	0x5BF2	#<CJK>
-0xECDA	0x5DB7	#<CJK>
-0xECDB	0x5E6C	#<CJK>
-0xECDC	0x5E6A	#<CJK>
-0xECDD	0x5FBE	#<CJK>
-0xECDE	0x5FBB	#<CJK>
-0xECDF	0x61C3	#<CJK>
-0xECE0	0x61B5	#<CJK>
-0xECE1	0x61BC	#<CJK>
-0xECE2	0x61E7	#<CJK>
-0xECE3	0x61E0	#<CJK>
-0xECE4	0x61E5	#<CJK>
-0xECE5	0x61E4	#<CJK>
-0xECE6	0x61E8	#<CJK>
-0xECE7	0x61DE	#<CJK>
-0xECE8	0x64EF	#<CJK>
-0xECE9	0x64E9	#<CJK>
-0xECEA	0x64E3	#<CJK>
-0xECEB	0x64EB	#<CJK>
-0xECEC	0x64E4	#<CJK>
-0xECED	0x64E8	#<CJK>
-0xECEE	0x6581	#<CJK>
-0xECEF	0x6580	#<CJK>
-0xECF0	0x65B6	#<CJK>
-0xECF1	0x65DA	#<CJK>
-0xECF2	0x66D2	#<CJK>
-0xECF3	0x6A8D	#<CJK>
-0xECF4	0x6A96	#<CJK>
-0xECF5	0x6A81	#<CJK>
-0xECF6	0x6AA5	#<CJK>
-0xECF7	0x6A89	#<CJK>
-0xECF8	0x6A9F	#<CJK>
-0xECF9	0x6A9B	#<CJK>
-0xECFA	0x6AA1	#<CJK>
-0xECFB	0x6A9E	#<CJK>
-0xECFC	0x6A87	#<CJK>
-0xECFD	0x6A93	#<CJK>
-0xECFE	0x6A8E	#<CJK>
-0xED40	0x6A95	#<CJK>
-0xED41	0x6A83	#<CJK>
-0xED42	0x6AA8	#<CJK>
-0xED43	0x6AA4	#<CJK>
-0xED44	0x6A91	#<CJK>
-0xED45	0x6A7F	#<CJK>
-0xED46	0x6AA6	#<CJK>
-0xED47	0x6A9A	#<CJK>
-0xED48	0x6A85	#<CJK>
-0xED49	0x6A8C	#<CJK>
-0xED4A	0x6A92	#<CJK>
-0xED4B	0x6B5B	#<CJK>
-0xED4C	0x6BAD	#<CJK>
-0xED4D	0x6C09	#<CJK>
-0xED4E	0x6FCC	#<CJK>
-0xED4F	0x6FA9	#<CJK>
-0xED50	0x6FF4	#<CJK>
-0xED51	0x6FD4	#<CJK>
-0xED52	0x6FE3	#<CJK>
-0xED53	0x6FDC	#<CJK>
-0xED54	0x6FED	#<CJK>
-0xED55	0x6FE7	#<CJK>
-0xED56	0x6FE6	#<CJK>
-0xED57	0x6FDE	#<CJK>
-0xED58	0x6FF2	#<CJK>
-0xED59	0x6FDD	#<CJK>
-0xED5A	0x6FE2	#<CJK>
-0xED5B	0x6FE8	#<CJK>
-0xED5C	0x71E1	#<CJK>
-0xED5D	0x71F1	#<CJK>
-0xED5E	0x71E8	#<CJK>
-0xED5F	0x71F2	#<CJK>
-0xED60	0x71E4	#<CJK>
-0xED61	0x71F0	#<CJK>
-0xED62	0x71E2	#<CJK>
-0xED63	0x7373	#<CJK>
-0xED64	0x736E	#<CJK>
-0xED65	0x736F	#<CJK>
-0xED66	0x7497	#<CJK>
-0xED67	0x74B2	#<CJK>
-0xED68	0x74AB	#<CJK>
-0xED69	0x7490	#<CJK>
-0xED6A	0x74AA	#<CJK>
-0xED6B	0x74AD	#<CJK>
-0xED6C	0x74B1	#<CJK>
-0xED6D	0x74A5	#<CJK>
-0xED6E	0x74AF	#<CJK>
-0xED6F	0x7510	#<CJK>
-0xED70	0x7511	#<CJK>
-0xED71	0x7512	#<CJK>
-0xED72	0x750F	#<CJK>
-0xED73	0x7584	#<CJK>
-0xED74	0x7643	#<CJK>
-0xED75	0x7648	#<CJK>
-0xED76	0x7649	#<CJK>
-0xED77	0x7647	#<CJK>
-0xED78	0x76A4	#<CJK>
-0xED79	0x76E9	#<CJK>
-0xED7A	0x77B5	#<CJK>
-0xED7B	0x77AB	#<CJK>
-0xED7C	0x77B2	#<CJK>
-0xED7D	0x77B7	#<CJK>
-0xED7E	0x77B6	#<CJK>
-0xEDA1	0x77B4	#<CJK>
-0xEDA2	0x77B1	#<CJK>
-0xEDA3	0x77A8	#<CJK>
-0xEDA4	0x77F0	#<CJK>
-0xEDA5	0x78F3	#<CJK>
-0xEDA6	0x78FD	#<CJK>
-0xEDA7	0x7902	#<CJK>
-0xEDA8	0x78FB	#<CJK>
-0xEDA9	0x78FC	#<CJK>
-0xEDAA	0x78F2	#<CJK>
-0xEDAB	0x7905	#<CJK>
-0xEDAC	0x78F9	#<CJK>
-0xEDAD	0x78FE	#<CJK>
-0xEDAE	0x7904	#<CJK>
-0xEDAF	0x79AB	#<CJK>
-0xEDB0	0x79A8	#<CJK>
-0xEDB1	0x7A5C	#<CJK>
-0xEDB2	0x7A5B	#<CJK>
-0xEDB3	0x7A56	#<CJK>
-0xEDB4	0x7A58	#<CJK>
-0xEDB5	0x7A54	#<CJK>
-0xEDB6	0x7A5A	#<CJK>
-0xEDB7	0x7ABE	#<CJK>
-0xEDB8	0x7AC0	#<CJK>
-0xEDB9	0x7AC1	#<CJK>
-0xEDBA	0x7C05	#<CJK>
-0xEDBB	0x7C0F	#<CJK>
-0xEDBC	0x7BF2	#<CJK>
-0xEDBD	0x7C00	#<CJK>
-0xEDBE	0x7BFF	#<CJK>
-0xEDBF	0x7BFB	#<CJK>
-0xEDC0	0x7C0E	#<CJK>
-0xEDC1	0x7BF4	#<CJK>
-0xEDC2	0x7C0B	#<CJK>
-0xEDC3	0x7BF3	#<CJK>
-0xEDC4	0x7C02	#<CJK>
-0xEDC5	0x7C09	#<CJK>
-0xEDC6	0x7C03	#<CJK>
-0xEDC7	0x7C01	#<CJK>
-0xEDC8	0x7BF8	#<CJK>
-0xEDC9	0x7BFD	#<CJK>
-0xEDCA	0x7C06	#<CJK>
-0xEDCB	0x7BF0	#<CJK>
-0xEDCC	0x7BF1	#<CJK>
-0xEDCD	0x7C10	#<CJK>
-0xEDCE	0x7C0A	#<CJK>
-0xEDCF	0x7CE8	#<CJK>
-0xEDD0	0x7E2D	#<CJK>
-0xEDD1	0x7E3C	#<CJK>
-0xEDD2	0x7E42	#<CJK>
-0xEDD3	0x7E33	#<CJK>
-0xEDD4	0x9848	#<CJK>
-0xEDD5	0x7E38	#<CJK>
-0xEDD6	0x7E2A	#<CJK>
-0xEDD7	0x7E49	#<CJK>
-0xEDD8	0x7E40	#<CJK>
-0xEDD9	0x7E47	#<CJK>
-0xEDDA	0x7E29	#<CJK>
-0xEDDB	0x7E4C	#<CJK>
-0xEDDC	0x7E30	#<CJK>
-0xEDDD	0x7E3B	#<CJK>
-0xEDDE	0x7E36	#<CJK>
-0xEDDF	0x7E44	#<CJK>
-0xEDE0	0x7E3A	#<CJK>
-0xEDE1	0x7F45	#<CJK>
-0xEDE2	0x7F7F	#<CJK>
-0xEDE3	0x7F7E	#<CJK>
-0xEDE4	0x7F7D	#<CJK>
-0xEDE5	0x7FF4	#<CJK>
-0xEDE6	0x7FF2	#<CJK>
-0xEDE7	0x802C	#<CJK>
-0xEDE8	0x81BB	#<CJK>
-0xEDE9	0x81C4	#<CJK>
-0xEDEA	0x81CC	#<CJK>
-0xEDEB	0x81CA	#<CJK>
-0xEDEC	0x81C5	#<CJK>
-0xEDED	0x81C7	#<CJK>
-0xEDEE	0x81BC	#<CJK>
-0xEDEF	0x81E9	#<CJK>
-0xEDF0	0x825B	#<CJK>
-0xEDF1	0x825A	#<CJK>
-0xEDF2	0x825C	#<CJK>
-0xEDF3	0x8583	#<CJK>
-0xEDF4	0x8580	#<CJK>
-0xEDF5	0x858F	#<CJK>
-0xEDF6	0x85A7	#<CJK>
-0xEDF7	0x8595	#<CJK>
-0xEDF8	0x85A0	#<CJK>
-0xEDF9	0x858B	#<CJK>
-0xEDFA	0x85A3	#<CJK>
-0xEDFB	0x857B	#<CJK>
-0xEDFC	0x85A4	#<CJK>
-0xEDFD	0x859A	#<CJK>
-0xEDFE	0x859E	#<CJK>
-0xEE40	0x8577	#<CJK>
-0xEE41	0x857C	#<CJK>
-0xEE42	0x8589	#<CJK>
-0xEE43	0x85A1	#<CJK>
-0xEE44	0x857A	#<CJK>
-0xEE45	0x8578	#<CJK>
-0xEE46	0x8557	#<CJK>
-0xEE47	0x858E	#<CJK>
-0xEE48	0x8596	#<CJK>
-0xEE49	0x8586	#<CJK>
-0xEE4A	0x858D	#<CJK>
-0xEE4B	0x8599	#<CJK>
-0xEE4C	0x859D	#<CJK>
-0xEE4D	0x8581	#<CJK>
-0xEE4E	0x85A2	#<CJK>
-0xEE4F	0x8582	#<CJK>
-0xEE50	0x8588	#<CJK>
-0xEE51	0x8585	#<CJK>
-0xEE52	0x8579	#<CJK>
-0xEE53	0x8576	#<CJK>
-0xEE54	0x8598	#<CJK>
-0xEE55	0x8590	#<CJK>
-0xEE56	0x859F	#<CJK>
-0xEE57	0x8668	#<CJK>
-0xEE58	0x87BE	#<CJK>
-0xEE59	0x87AA	#<CJK>
-0xEE5A	0x87AD	#<CJK>
-0xEE5B	0x87C5	#<CJK>
-0xEE5C	0x87B0	#<CJK>
-0xEE5D	0x87AC	#<CJK>
-0xEE5E	0x87B9	#<CJK>
-0xEE5F	0x87B5	#<CJK>
-0xEE60	0x87BC	#<CJK>
-0xEE61	0x87AE	#<CJK>
-0xEE62	0x87C9	#<CJK>
-0xEE63	0x87C3	#<CJK>
-0xEE64	0x87C2	#<CJK>
-0xEE65	0x87CC	#<CJK>
-0xEE66	0x87B7	#<CJK>
-0xEE67	0x87AF	#<CJK>
-0xEE68	0x87C4	#<CJK>
-0xEE69	0x87CA	#<CJK>
-0xEE6A	0x87B4	#<CJK>
-0xEE6B	0x87B6	#<CJK>
-0xEE6C	0x87BF	#<CJK>
-0xEE6D	0x87B8	#<CJK>
-0xEE6E	0x87BD	#<CJK>
-0xEE6F	0x87DE	#<CJK>
-0xEE70	0x87B2	#<CJK>
-0xEE71	0x8935	#<CJK>
-0xEE72	0x8933	#<CJK>
-0xEE73	0x893C	#<CJK>
-0xEE74	0x893E	#<CJK>
-0xEE75	0x8941	#<CJK>
-0xEE76	0x8952	#<CJK>
-0xEE77	0x8937	#<CJK>
-0xEE78	0x8942	#<CJK>
-0xEE79	0x89AD	#<CJK>
-0xEE7A	0x89AF	#<CJK>
-0xEE7B	0x89AE	#<CJK>
-0xEE7C	0x89F2	#<CJK>
-0xEE7D	0x89F3	#<CJK>
-0xEE7E	0x8B1E	#<CJK>
-0xEEA1	0x8B18	#<CJK>
-0xEEA2	0x8B16	#<CJK>
-0xEEA3	0x8B11	#<CJK>
-0xEEA4	0x8B05	#<CJK>
-0xEEA5	0x8B0B	#<CJK>
-0xEEA6	0x8B22	#<CJK>
-0xEEA7	0x8B0F	#<CJK>
-0xEEA8	0x8B12	#<CJK>
-0xEEA9	0x8B15	#<CJK>
-0xEEAA	0x8B07	#<CJK>
-0xEEAB	0x8B0D	#<CJK>
-0xEEAC	0x8B08	#<CJK>
-0xEEAD	0x8B06	#<CJK>
-0xEEAE	0x8B1C	#<CJK>
-0xEEAF	0x8B13	#<CJK>
-0xEEB0	0x8B1A	#<CJK>
-0xEEB1	0x8C4F	#<CJK>
-0xEEB2	0x8C70	#<CJK>
-0xEEB3	0x8C72	#<CJK>
-0xEEB4	0x8C71	#<CJK>
-0xEEB5	0x8C6F	#<CJK>
-0xEEB6	0x8C95	#<CJK>
-0xEEB7	0x8C94	#<CJK>
-0xEEB8	0x8CF9	#<CJK>
-0xEEB9	0x8D6F	#<CJK>
-0xEEBA	0x8E4E	#<CJK>
-0xEEBB	0x8E4D	#<CJK>
-0xEEBC	0x8E53	#<CJK>
-0xEEBD	0x8E50	#<CJK>
-0xEEBE	0x8E4C	#<CJK>
-0xEEBF	0x8E47	#<CJK>
-0xEEC0	0x8F43	#<CJK>
-0xEEC1	0x8F40	#<CJK>
-0xEEC2	0x9085	#<CJK>
-0xEEC3	0x907E	#<CJK>
-0xEEC4	0x9138	#<CJK>
-0xEEC5	0x919A	#<CJK>
-0xEEC6	0x91A2	#<CJK>
-0xEEC7	0x919B	#<CJK>
-0xEEC8	0x9199	#<CJK>
-0xEEC9	0x919F	#<CJK>
-0xEECA	0x91A1	#<CJK>
-0xEECB	0x919D	#<CJK>
-0xEECC	0x91A0	#<CJK>
-0xEECD	0x93A1	#<CJK>
-0xEECE	0x9383	#<CJK>
-0xEECF	0x93AF	#<CJK>
-0xEED0	0x9364	#<CJK>
-0xEED1	0x9356	#<CJK>
-0xEED2	0x9347	#<CJK>
-0xEED3	0x937C	#<CJK>
-0xEED4	0x9358	#<CJK>
-0xEED5	0x935C	#<CJK>
-0xEED6	0x9376	#<CJK>
-0xEED7	0x9349	#<CJK>
-0xEED8	0x9350	#<CJK>
-0xEED9	0x9351	#<CJK>
-0xEEDA	0x9360	#<CJK>
-0xEEDB	0x936D	#<CJK>
-0xEEDC	0x938F	#<CJK>
-0xEEDD	0x934C	#<CJK>
-0xEEDE	0x936A	#<CJK>
-0xEEDF	0x9379	#<CJK>
-0xEEE0	0x9357	#<CJK>
-0xEEE1	0x9355	#<CJK>
-0xEEE2	0x9352	#<CJK>
-0xEEE3	0x934F	#<CJK>
-0xEEE4	0x9371	#<CJK>
-0xEEE5	0x9377	#<CJK>
-0xEEE6	0x937B	#<CJK>
-0xEEE7	0x9361	#<CJK>
-0xEEE8	0x935E	#<CJK>
-0xEEE9	0x9363	#<CJK>
-0xEEEA	0x9367	#<CJK>
-0xEEEB	0x9380	#<CJK>
-0xEEEC	0x934E	#<CJK>
-0xEEED	0x9359	#<CJK>
-0xEEEE	0x95C7	#<CJK>
-0xEEEF	0x95C0	#<CJK>
-0xEEF0	0x95C9	#<CJK>
-0xEEF1	0x95C3	#<CJK>
-0xEEF2	0x95C5	#<CJK>
-0xEEF3	0x95B7	#<CJK>
-0xEEF4	0x96AE	#<CJK>
-0xEEF5	0x96B0	#<CJK>
-0xEEF6	0x96AC	#<CJK>
-0xEEF7	0x9720	#<CJK>
-0xEEF8	0x971F	#<CJK>
-0xEEF9	0x9718	#<CJK>
-0xEEFA	0x971D	#<CJK>
-0xEEFB	0x9719	#<CJK>
-0xEEFC	0x979A	#<CJK>
-0xEEFD	0x97A1	#<CJK>
-0xEEFE	0x979C	#<CJK>
-0xEF40	0x979E	#<CJK>
-0xEF41	0x979D	#<CJK>
-0xEF42	0x97D5	#<CJK>
-0xEF43	0x97D4	#<CJK>
-0xEF44	0x97F1	#<CJK>
-0xEF45	0x9841	#<CJK>
-0xEF46	0x9844	#<CJK>
-0xEF47	0x984A	#<CJK>
-0xEF48	0x9849	#<CJK>
-0xEF49	0x9845	#<CJK>
-0xEF4A	0x9843	#<CJK>
-0xEF4B	0x9925	#<CJK>
-0xEF4C	0x992B	#<CJK>
-0xEF4D	0x992C	#<CJK>
-0xEF4E	0x992A	#<CJK>
-0xEF4F	0x9933	#<CJK>
-0xEF50	0x9932	#<CJK>
-0xEF51	0x992F	#<CJK>
-0xEF52	0x992D	#<CJK>
-0xEF53	0x9931	#<CJK>
-0xEF54	0x9930	#<CJK>
-0xEF55	0x9998	#<CJK>
-0xEF56	0x99A3	#<CJK>
-0xEF57	0x99A1	#<CJK>
-0xEF58	0x9A02	#<CJK>
-0xEF59	0x99FA	#<CJK>
-0xEF5A	0x99F4	#<CJK>
-0xEF5B	0x99F7	#<CJK>
-0xEF5C	0x99F9	#<CJK>
-0xEF5D	0x99F8	#<CJK>
-0xEF5E	0x99F6	#<CJK>
-0xEF5F	0x99FB	#<CJK>
-0xEF60	0x99FD	#<CJK>
-0xEF61	0x99FE	#<CJK>
-0xEF62	0x99FC	#<CJK>
-0xEF63	0x9A03	#<CJK>
-0xEF64	0x9ABE	#<CJK>
-0xEF65	0x9AFE	#<CJK>
-0xEF66	0x9AFD	#<CJK>
-0xEF67	0x9B01	#<CJK>
-0xEF68	0x9AFC	#<CJK>
-0xEF69	0x9B48	#<CJK>
-0xEF6A	0x9B9A	#<CJK>
-0xEF6B	0x9BA8	#<CJK>
-0xEF6C	0x9B9E	#<CJK>
-0xEF6D	0x9B9B	#<CJK>
-0xEF6E	0x9BA6	#<CJK>
-0xEF6F	0x9BA1	#<CJK>
-0xEF70	0x9BA5	#<CJK>
-0xEF71	0x9BA4	#<CJK>
-0xEF72	0x9B86	#<CJK>
-0xEF73	0x9BA2	#<CJK>
-0xEF74	0x9BA0	#<CJK>
-0xEF75	0x9BAF	#<CJK>
-0xEF76	0x9D33	#<CJK>
-0xEF77	0x9D41	#<CJK>
-0xEF78	0x9D67	#<CJK>
-0xEF79	0x9D36	#<CJK>
-0xEF7A	0x9D2E	#<CJK>
-0xEF7B	0x9D2F	#<CJK>
-0xEF7C	0x9D31	#<CJK>
-0xEF7D	0x9D38	#<CJK>
-0xEF7E	0x9D30	#<CJK>
-0xEFA1	0x9D45	#<CJK>
-0xEFA2	0x9D42	#<CJK>
-0xEFA3	0x9D43	#<CJK>
-0xEFA4	0x9D3E	#<CJK>
-0xEFA5	0x9D37	#<CJK>
-0xEFA6	0x9D40	#<CJK>
-0xEFA7	0x9D3D	#<CJK>
-0xEFA8	0x7FF5	#<CJK>
-0xEFA9	0x9D2D	#<CJK>
-0xEFAA	0x9E8A	#<CJK>
-0xEFAB	0x9E89	#<CJK>
-0xEFAC	0x9E8D	#<CJK>
-0xEFAD	0x9EB0	#<CJK>
-0xEFAE	0x9EC8	#<CJK>
-0xEFAF	0x9EDA	#<CJK>
-0xEFB0	0x9EFB	#<CJK>
-0xEFB1	0x9EFF	#<CJK>
-0xEFB2	0x9F24	#<CJK>
-0xEFB3	0x9F23	#<CJK>
-0xEFB4	0x9F22	#<CJK>
-0xEFB5	0x9F54	#<CJK>
-0xEFB6	0x9FA0	#<CJK>
-0xEFB7	0x5131	#<CJK>
-0xEFB8	0x512D	#<CJK>
-0xEFB9	0x512E	#<CJK>
-0xEFBA	0x5698	#<CJK>
-0xEFBB	0x569C	#<CJK>
-0xEFBC	0x5697	#<CJK>
-0xEFBD	0x569A	#<CJK>
-0xEFBE	0x569D	#<CJK>
-0xEFBF	0x5699	#<CJK>
-0xEFC0	0x5970	#<CJK>
-0xEFC1	0x5B3C	#<CJK>
-0xEFC2	0x5C69	#<CJK>
-0xEFC3	0x5C6A	#<CJK>
-0xEFC4	0x5DC0	#<CJK>
-0xEFC5	0x5E6D	#<CJK>
-0xEFC6	0x5E6E	#<CJK>
-0xEFC7	0x61D8	#<CJK>
-0xEFC8	0x61DF	#<CJK>
-0xEFC9	0x61ED	#<CJK>
-0xEFCA	0x61EE	#<CJK>
-0xEFCB	0x61F1	#<CJK>
-0xEFCC	0x61EA	#<CJK>
-0xEFCD	0x61F0	#<CJK>
-0xEFCE	0x61EB	#<CJK>
-0xEFCF	0x61D6	#<CJK>
-0xEFD0	0x61E9	#<CJK>
-0xEFD1	0x64FF	#<CJK>
-0xEFD2	0x6504	#<CJK>
-0xEFD3	0x64FD	#<CJK>
-0xEFD4	0x64F8	#<CJK>
-0xEFD5	0x6501	#<CJK>
-0xEFD6	0x6503	#<CJK>
-0xEFD7	0x64FC	#<CJK>
-0xEFD8	0x6594	#<CJK>
-0xEFD9	0x65DB	#<CJK>
-0xEFDA	0x66DA	#<CJK>
-0xEFDB	0x66DB	#<CJK>
-0xEFDC	0x66D8	#<CJK>
-0xEFDD	0x6AC5	#<CJK>
-0xEFDE	0x6AB9	#<CJK>
-0xEFDF	0x6ABD	#<CJK>
-0xEFE0	0x6AE1	#<CJK>
-0xEFE1	0x6AC6	#<CJK>
-0xEFE2	0x6ABA	#<CJK>
-0xEFE3	0x6AB6	#<CJK>
-0xEFE4	0x6AB7	#<CJK>
-0xEFE5	0x6AC7	#<CJK>
-0xEFE6	0x6AB4	#<CJK>
-0xEFE7	0x6AAD	#<CJK>
-0xEFE8	0x6B5E	#<CJK>
-0xEFE9	0x6BC9	#<CJK>
-0xEFEA	0x6C0B	#<CJK>
-0xEFEB	0x7007	#<CJK>
-0xEFEC	0x700C	#<CJK>
-0xEFED	0x700D	#<CJK>
-0xEFEE	0x7001	#<CJK>
-0xEFEF	0x7005	#<CJK>
-0xEFF0	0x7014	#<CJK>
-0xEFF1	0x700E	#<CJK>
-0xEFF2	0x6FFF	#<CJK>
-0xEFF3	0x7000	#<CJK>
-0xEFF4	0x6FFB	#<CJK>
-0xEFF5	0x7026	#<CJK>
-0xEFF6	0x6FFC	#<CJK>
-0xEFF7	0x6FF7	#<CJK>
-0xEFF8	0x700A	#<CJK>
-0xEFF9	0x7201	#<CJK>
-0xEFFA	0x71FF	#<CJK>
-0xEFFB	0x71F9	#<CJK>
-0xEFFC	0x7203	#<CJK>
-0xEFFD	0x71FD	#<CJK>
-0xEFFE	0x7376	#<CJK>
-0xF040	0x74B8	#<CJK>
-0xF041	0x74C0	#<CJK>
-0xF042	0x74B5	#<CJK>
-0xF043	0x74C1	#<CJK>
-0xF044	0x74BE	#<CJK>
-0xF045	0x74B6	#<CJK>
-0xF046	0x74BB	#<CJK>
-0xF047	0x74C2	#<CJK>
-0xF048	0x7514	#<CJK>
-0xF049	0x7513	#<CJK>
-0xF04A	0x765C	#<CJK>
-0xF04B	0x7664	#<CJK>
-0xF04C	0x7659	#<CJK>
-0xF04D	0x7650	#<CJK>
-0xF04E	0x7653	#<CJK>
-0xF04F	0x7657	#<CJK>
-0xF050	0x765A	#<CJK>
-0xF051	0x76A6	#<CJK>
-0xF052	0x76BD	#<CJK>
-0xF053	0x76EC	#<CJK>
-0xF054	0x77C2	#<CJK>
-0xF055	0x77BA	#<CJK>
-0xF056	0x78FF	#<CJK>
-0xF057	0x790C	#<CJK>
-0xF058	0x7913	#<CJK>
-0xF059	0x7914	#<CJK>
-0xF05A	0x7909	#<CJK>
-0xF05B	0x7910	#<CJK>
-0xF05C	0x7912	#<CJK>
-0xF05D	0x7911	#<CJK>
-0xF05E	0x79AD	#<CJK>
-0xF05F	0x79AC	#<CJK>
-0xF060	0x7A5F	#<CJK>
-0xF061	0x7C1C	#<CJK>
-0xF062	0x7C29	#<CJK>
-0xF063	0x7C19	#<CJK>
-0xF064	0x7C20	#<CJK>
-0xF065	0x7C1F	#<CJK>
-0xF066	0x7C2D	#<CJK>
-0xF067	0x7C1D	#<CJK>
-0xF068	0x7C26	#<CJK>
-0xF069	0x7C28	#<CJK>
-0xF06A	0x7C22	#<CJK>
-0xF06B	0x7C25	#<CJK>
-0xF06C	0x7C30	#<CJK>
-0xF06D	0x7E5C	#<CJK>
-0xF06E	0x7E50	#<CJK>
-0xF06F	0x7E56	#<CJK>
-0xF070	0x7E63	#<CJK>
-0xF071	0x7E58	#<CJK>
-0xF072	0x7E62	#<CJK>
-0xF073	0x7E5F	#<CJK>
-0xF074	0x7E51	#<CJK>
-0xF075	0x7E60	#<CJK>
-0xF076	0x7E57	#<CJK>
-0xF077	0x7E53	#<CJK>
-0xF078	0x7FB5	#<CJK>
-0xF079	0x7FB3	#<CJK>
-0xF07A	0x7FF7	#<CJK>
-0xF07B	0x7FF8	#<CJK>
-0xF07C	0x8075	#<CJK>
-0xF07D	0x81D1	#<CJK>
-0xF07E	0x81D2	#<CJK>
-0xF0A1	0x81D0	#<CJK>
-0xF0A2	0x825F	#<CJK>
-0xF0A3	0x825E	#<CJK>
-0xF0A4	0x85B4	#<CJK>
-0xF0A5	0x85C6	#<CJK>
-0xF0A6	0x85C0	#<CJK>
-0xF0A7	0x85C3	#<CJK>
-0xF0A8	0x85C2	#<CJK>
-0xF0A9	0x85B3	#<CJK>
-0xF0AA	0x85B5	#<CJK>
-0xF0AB	0x85BD	#<CJK>
-0xF0AC	0x85C7	#<CJK>
-0xF0AD	0x85C4	#<CJK>
-0xF0AE	0x85BF	#<CJK>
-0xF0AF	0x85CB	#<CJK>
-0xF0B0	0x85CE	#<CJK>
-0xF0B1	0x85C8	#<CJK>
-0xF0B2	0x85C5	#<CJK>
-0xF0B3	0x85B1	#<CJK>
-0xF0B4	0x85B6	#<CJK>
-0xF0B5	0x85D2	#<CJK>
-0xF0B6	0x8624	#<CJK>
-0xF0B7	0x85B8	#<CJK>
-0xF0B8	0x85B7	#<CJK>
-0xF0B9	0x85BE	#<CJK>
-0xF0BA	0x8669	#<CJK>
-0xF0BB	0x87E7	#<CJK>
-0xF0BC	0x87E6	#<CJK>
-0xF0BD	0x87E2	#<CJK>
-0xF0BE	0x87DB	#<CJK>
-0xF0BF	0x87EB	#<CJK>
-0xF0C0	0x87EA	#<CJK>
-0xF0C1	0x87E5	#<CJK>
-0xF0C2	0x87DF	#<CJK>
-0xF0C3	0x87F3	#<CJK>
-0xF0C4	0x87E4	#<CJK>
-0xF0C5	0x87D4	#<CJK>
-0xF0C6	0x87DC	#<CJK>
-0xF0C7	0x87D3	#<CJK>
-0xF0C8	0x87ED	#<CJK>
-0xF0C9	0x87D8	#<CJK>
-0xF0CA	0x87E3	#<CJK>
-0xF0CB	0x87A4	#<CJK>
-0xF0CC	0x87D7	#<CJK>
-0xF0CD	0x87D9	#<CJK>
-0xF0CE	0x8801	#<CJK>
-0xF0CF	0x87F4	#<CJK>
-0xF0D0	0x87E8	#<CJK>
-0xF0D1	0x87DD	#<CJK>
-0xF0D2	0x8953	#<CJK>
-0xF0D3	0x894B	#<CJK>
-0xF0D4	0x894F	#<CJK>
-0xF0D5	0x894C	#<CJK>
-0xF0D6	0x8946	#<CJK>
-0xF0D7	0x8950	#<CJK>
-0xF0D8	0x8951	#<CJK>
-0xF0D9	0x8949	#<CJK>
-0xF0DA	0x8B2A	#<CJK>
-0xF0DB	0x8B27	#<CJK>
-0xF0DC	0x8B23	#<CJK>
-0xF0DD	0x8B33	#<CJK>
-0xF0DE	0x8B30	#<CJK>
-0xF0DF	0x8B35	#<CJK>
-0xF0E0	0x8B47	#<CJK>
-0xF0E1	0x8B2F	#<CJK>
-0xF0E2	0x8B3C	#<CJK>
-0xF0E3	0x8B3E	#<CJK>
-0xF0E4	0x8B31	#<CJK>
-0xF0E5	0x8B25	#<CJK>
-0xF0E6	0x8B37	#<CJK>
-0xF0E7	0x8B26	#<CJK>
-0xF0E8	0x8B36	#<CJK>
-0xF0E9	0x8B2E	#<CJK>
-0xF0EA	0x8B24	#<CJK>
-0xF0EB	0x8B3B	#<CJK>
-0xF0EC	0x8B3D	#<CJK>
-0xF0ED	0x8B3A	#<CJK>
-0xF0EE	0x8C42	#<CJK>
-0xF0EF	0x8C75	#<CJK>
-0xF0F0	0x8C99	#<CJK>
-0xF0F1	0x8C98	#<CJK>
-0xF0F2	0x8C97	#<CJK>
-0xF0F3	0x8CFE	#<CJK>
-0xF0F4	0x8D04	#<CJK>
-0xF0F5	0x8D02	#<CJK>
-0xF0F6	0x8D00	#<CJK>
-0xF0F7	0x8E5C	#<CJK>
-0xF0F8	0x8E62	#<CJK>
-0xF0F9	0x8E60	#<CJK>
-0xF0FA	0x8E57	#<CJK>
-0xF0FB	0x8E56	#<CJK>
-0xF0FC	0x8E5E	#<CJK>
-0xF0FD	0x8E65	#<CJK>
-0xF0FE	0x8E67	#<CJK>
-0xF140	0x8E5B	#<CJK>
-0xF141	0x8E5A	#<CJK>
-0xF142	0x8E61	#<CJK>
-0xF143	0x8E5D	#<CJK>
-0xF144	0x8E69	#<CJK>
-0xF145	0x8E54	#<CJK>
-0xF146	0x8F46	#<CJK>
-0xF147	0x8F47	#<CJK>
-0xF148	0x8F48	#<CJK>
-0xF149	0x8F4B	#<CJK>
-0xF14A	0x9128	#<CJK>
-0xF14B	0x913A	#<CJK>
-0xF14C	0x913B	#<CJK>
-0xF14D	0x913E	#<CJK>
-0xF14E	0x91A8	#<CJK>
-0xF14F	0x91A5	#<CJK>
-0xF150	0x91A7	#<CJK>
-0xF151	0x91AF	#<CJK>
-0xF152	0x91AA	#<CJK>
-0xF153	0x93B5	#<CJK>
-0xF154	0x938C	#<CJK>
-0xF155	0x9392	#<CJK>
-0xF156	0x93B7	#<CJK>
-0xF157	0x939B	#<CJK>
-0xF158	0x939D	#<CJK>
-0xF159	0x9389	#<CJK>
-0xF15A	0x93A7	#<CJK>
-0xF15B	0x938E	#<CJK>
-0xF15C	0x93AA	#<CJK>
-0xF15D	0x939E	#<CJK>
-0xF15E	0x93A6	#<CJK>
-0xF15F	0x9395	#<CJK>
-0xF160	0x9388	#<CJK>
-0xF161	0x9399	#<CJK>
-0xF162	0x939F	#<CJK>
-0xF163	0x938D	#<CJK>
-0xF164	0x93B1	#<CJK>
-0xF165	0x9391	#<CJK>
-0xF166	0x93B2	#<CJK>
-0xF167	0x93A4	#<CJK>
-0xF168	0x93A8	#<CJK>
-0xF169	0x93B4	#<CJK>
-0xF16A	0x93A3	#<CJK>
-0xF16B	0x93A5	#<CJK>
-0xF16C	0x95D2	#<CJK>
-0xF16D	0x95D3	#<CJK>
-0xF16E	0x95D1	#<CJK>
-0xF16F	0x96B3	#<CJK>
-0xF170	0x96D7	#<CJK>
-0xF171	0x96DA	#<CJK>
-0xF172	0x5DC2	#<CJK>
-0xF173	0x96DF	#<CJK>
-0xF174	0x96D8	#<CJK>
-0xF175	0x96DD	#<CJK>
-0xF176	0x9723	#<CJK>
-0xF177	0x9722	#<CJK>
-0xF178	0x9725	#<CJK>
-0xF179	0x97AC	#<CJK>
-0xF17A	0x97AE	#<CJK>
-0xF17B	0x97A8	#<CJK>
-0xF17C	0x97AB	#<CJK>
-0xF17D	0x97A4	#<CJK>
-0xF17E	0x97AA	#<CJK>
-0xF1A1	0x97A2	#<CJK>
-0xF1A2	0x97A5	#<CJK>
-0xF1A3	0x97D7	#<CJK>
-0xF1A4	0x97D9	#<CJK>
-0xF1A5	0x97D6	#<CJK>
-0xF1A6	0x97D8	#<CJK>
-0xF1A7	0x97FA	#<CJK>
-0xF1A8	0x9850	#<CJK>
-0xF1A9	0x9851	#<CJK>
-0xF1AA	0x9852	#<CJK>
-0xF1AB	0x98B8	#<CJK>
-0xF1AC	0x9941	#<CJK>
-0xF1AD	0x993C	#<CJK>
-0xF1AE	0x993A	#<CJK>
-0xF1AF	0x9A0F	#<CJK>
-0xF1B0	0x9A0B	#<CJK>
-0xF1B1	0x9A09	#<CJK>
-0xF1B2	0x9A0D	#<CJK>
-0xF1B3	0x9A04	#<CJK>
-0xF1B4	0x9A11	#<CJK>
-0xF1B5	0x9A0A	#<CJK>
-0xF1B6	0x9A05	#<CJK>
-0xF1B7	0x9A07	#<CJK>
-0xF1B8	0x9A06	#<CJK>
-0xF1B9	0x9AC0	#<CJK>
-0xF1BA	0x9ADC	#<CJK>
-0xF1BB	0x9B08	#<CJK>
-0xF1BC	0x9B04	#<CJK>
-0xF1BD	0x9B05	#<CJK>
-0xF1BE	0x9B29	#<CJK>
-0xF1BF	0x9B35	#<CJK>
-0xF1C0	0x9B4A	#<CJK>
-0xF1C1	0x9B4C	#<CJK>
-0xF1C2	0x9B4B	#<CJK>
-0xF1C3	0x9BC7	#<CJK>
-0xF1C4	0x9BC6	#<CJK>
-0xF1C5	0x9BC3	#<CJK>
-0xF1C6	0x9BBF	#<CJK>
-0xF1C7	0x9BC1	#<CJK>
-0xF1C8	0x9BB5	#<CJK>
-0xF1C9	0x9BB8	#<CJK>
-0xF1CA	0x9BD3	#<CJK>
-0xF1CB	0x9BB6	#<CJK>
-0xF1CC	0x9BC4	#<CJK>
-0xF1CD	0x9BB9	#<CJK>
-0xF1CE	0x9BBD	#<CJK>
-0xF1CF	0x9D5C	#<CJK>
-0xF1D0	0x9D53	#<CJK>
-0xF1D1	0x9D4F	#<CJK>
-0xF1D2	0x9D4A	#<CJK>
-0xF1D3	0x9D5B	#<CJK>
-0xF1D4	0x9D4B	#<CJK>
-0xF1D5	0x9D59	#<CJK>
-0xF1D6	0x9D56	#<CJK>
-0xF1D7	0x9D4C	#<CJK>
-0xF1D8	0x9D57	#<CJK>
-0xF1D9	0x9D52	#<CJK>
-0xF1DA	0x9D54	#<CJK>
-0xF1DB	0x9D5F	#<CJK>
-0xF1DC	0x9D58	#<CJK>
-0xF1DD	0x9D5A	#<CJK>
-0xF1DE	0x9E8E	#<CJK>
-0xF1DF	0x9E8C	#<CJK>
-0xF1E0	0x9EDF	#<CJK>
-0xF1E1	0x9F01	#<CJK>
-0xF1E2	0x9F00	#<CJK>
-0xF1E3	0x9F16	#<CJK>
-0xF1E4	0x9F25	#<CJK>
-0xF1E5	0x9F2B	#<CJK>
-0xF1E6	0x9F2A	#<CJK>
-0xF1E7	0x9F29	#<CJK>
-0xF1E8	0x9F28	#<CJK>
-0xF1E9	0x9F4C	#<CJK>
-0xF1EA	0x9F55	#<CJK>
-0xF1EB	0x5134	#<CJK>
-0xF1EC	0x5135	#<CJK>
-0xF1ED	0x5296	#<CJK>
-0xF1EE	0x52F7	#<CJK>
-0xF1EF	0x53B4	#<CJK>
-0xF1F0	0x56AB	#<CJK>
-0xF1F1	0x56AD	#<CJK>
-0xF1F2	0x56A6	#<CJK>
-0xF1F3	0x56A7	#<CJK>
-0xF1F4	0x56AA	#<CJK>
-0xF1F5	0x56AC	#<CJK>
-0xF1F6	0x58DA	#<CJK>
-0xF1F7	0x58DD	#<CJK>
-0xF1F8	0x58DB	#<CJK>
-0xF1F9	0x5912	#<CJK>
-0xF1FA	0x5B3D	#<CJK>
-0xF1FB	0x5B3E	#<CJK>
-0xF1FC	0x5B3F	#<CJK>
-0xF1FD	0x5DC3	#<CJK>
-0xF1FE	0x5E70	#<CJK>
-0xF240	0x5FBF	#<CJK>
-0xF241	0x61FB	#<CJK>
-0xF242	0x6507	#<CJK>
-0xF243	0x6510	#<CJK>
-0xF244	0x650D	#<CJK>
-0xF245	0x6509	#<CJK>
-0xF246	0x650C	#<CJK>
-0xF247	0x650E	#<CJK>
-0xF248	0x6584	#<CJK>
-0xF249	0x65DE	#<CJK>
-0xF24A	0x65DD	#<CJK>
-0xF24B	0x66DE	#<CJK>
-0xF24C	0x6AE7	#<CJK>
-0xF24D	0x6AE0	#<CJK>
-0xF24E	0x6ACC	#<CJK>
-0xF24F	0x6AD1	#<CJK>
-0xF250	0x6AD9	#<CJK>
-0xF251	0x6ACB	#<CJK>
-0xF252	0x6ADF	#<CJK>
-0xF253	0x6ADC	#<CJK>
-0xF254	0x6AD0	#<CJK>
-0xF255	0x6AEB	#<CJK>
-0xF256	0x6ACF	#<CJK>
-0xF257	0x6ACD	#<CJK>
-0xF258	0x6ADE	#<CJK>
-0xF259	0x6B60	#<CJK>
-0xF25A	0x6BB0	#<CJK>
-0xF25B	0x6C0C	#<CJK>
-0xF25C	0x7019	#<CJK>
-0xF25D	0x7027	#<CJK>
-0xF25E	0x7020	#<CJK>
-0xF25F	0x7016	#<CJK>
-0xF260	0x702B	#<CJK>
-0xF261	0x7021	#<CJK>
-0xF262	0x7022	#<CJK>
-0xF263	0x7023	#<CJK>
-0xF264	0x7029	#<CJK>
-0xF265	0x7017	#<CJK>
-0xF266	0x7024	#<CJK>
-0xF267	0x701C	#<CJK>
-0xF268	0x702A	#<CJK>
-0xF269	0x720C	#<CJK>
-0xF26A	0x720A	#<CJK>
-0xF26B	0x7207	#<CJK>
-0xF26C	0x7202	#<CJK>
-0xF26D	0x7205	#<CJK>
-0xF26E	0x72A5	#<CJK>
-0xF26F	0x72A6	#<CJK>
-0xF270	0x72A4	#<CJK>
-0xF271	0x72A3	#<CJK>
-0xF272	0x72A1	#<CJK>
-0xF273	0x74CB	#<CJK>
-0xF274	0x74C5	#<CJK>
-0xF275	0x74B7	#<CJK>
-0xF276	0x74C3	#<CJK>
-0xF277	0x7516	#<CJK>
-0xF278	0x7660	#<CJK>
-0xF279	0x77C9	#<CJK>
-0xF27A	0x77CA	#<CJK>
-0xF27B	0x77C4	#<CJK>
-0xF27C	0x77F1	#<CJK>
-0xF27D	0x791D	#<CJK>
-0xF27E	0x791B	#<CJK>
-0xF2A1	0x7921	#<CJK>
-0xF2A2	0x791C	#<CJK>
-0xF2A3	0x7917	#<CJK>
-0xF2A4	0x791E	#<CJK>
-0xF2A5	0x79B0	#<CJK>
-0xF2A6	0x7A67	#<CJK>
-0xF2A7	0x7A68	#<CJK>
-0xF2A8	0x7C33	#<CJK>
-0xF2A9	0x7C3C	#<CJK>
-0xF2AA	0x7C39	#<CJK>
-0xF2AB	0x7C2C	#<CJK>
-0xF2AC	0x7C3B	#<CJK>
-0xF2AD	0x7CEC	#<CJK>
-0xF2AE	0x7CEA	#<CJK>
-0xF2AF	0x7E76	#<CJK>
-0xF2B0	0x7E75	#<CJK>
-0xF2B1	0x7E78	#<CJK>
-0xF2B2	0x7E70	#<CJK>
-0xF2B3	0x7E77	#<CJK>
-0xF2B4	0x7E6F	#<CJK>
-0xF2B5	0x7E7A	#<CJK>
-0xF2B6	0x7E72	#<CJK>
-0xF2B7	0x7E74	#<CJK>
-0xF2B8	0x7E68	#<CJK>
-0xF2B9	0x7F4B	#<CJK>
-0xF2BA	0x7F4A	#<CJK>
-0xF2BB	0x7F83	#<CJK>
-0xF2BC	0x7F86	#<CJK>
-0xF2BD	0x7FB7	#<CJK>
-0xF2BE	0x7FFD	#<CJK>
-0xF2BF	0x7FFE	#<CJK>
-0xF2C0	0x8078	#<CJK>
-0xF2C1	0x81D7	#<CJK>
-0xF2C2	0x81D5	#<CJK>
-0xF2C3	0x8264	#<CJK>
-0xF2C4	0x8261	#<CJK>
-0xF2C5	0x8263	#<CJK>
-0xF2C6	0x85EB	#<CJK>
-0xF2C7	0x85F1	#<CJK>
-0xF2C8	0x85ED	#<CJK>
-0xF2C9	0x85D9	#<CJK>
-0xF2CA	0x85E1	#<CJK>
-0xF2CB	0x85E8	#<CJK>
-0xF2CC	0x85DA	#<CJK>
-0xF2CD	0x85D7	#<CJK>
-0xF2CE	0x85EC	#<CJK>
-0xF2CF	0x85F2	#<CJK>
-0xF2D0	0x85F8	#<CJK>
-0xF2D1	0x85D8	#<CJK>
-0xF2D2	0x85DF	#<CJK>
-0xF2D3	0x85E3	#<CJK>
-0xF2D4	0x85DC	#<CJK>
-0xF2D5	0x85D1	#<CJK>
-0xF2D6	0x85F0	#<CJK>
-0xF2D7	0x85E6	#<CJK>
-0xF2D8	0x85EF	#<CJK>
-0xF2D9	0x85DE	#<CJK>
-0xF2DA	0x85E2	#<CJK>
-0xF2DB	0x8800	#<CJK>
-0xF2DC	0x87FA	#<CJK>
-0xF2DD	0x8803	#<CJK>
-0xF2DE	0x87F6	#<CJK>
-0xF2DF	0x87F7	#<CJK>
-0xF2E0	0x8809	#<CJK>
-0xF2E1	0x880C	#<CJK>
-0xF2E2	0x880B	#<CJK>
-0xF2E3	0x8806	#<CJK>
-0xF2E4	0x87FC	#<CJK>
-0xF2E5	0x8808	#<CJK>
-0xF2E6	0x87FF	#<CJK>
-0xF2E7	0x880A	#<CJK>
-0xF2E8	0x8802	#<CJK>
-0xF2E9	0x8962	#<CJK>
-0xF2EA	0x895A	#<CJK>
-0xF2EB	0x895B	#<CJK>
-0xF2EC	0x8957	#<CJK>
-0xF2ED	0x8961	#<CJK>
-0xF2EE	0x895C	#<CJK>
-0xF2EF	0x8958	#<CJK>
-0xF2F0	0x895D	#<CJK>
-0xF2F1	0x8959	#<CJK>
-0xF2F2	0x8988	#<CJK>
-0xF2F3	0x89B7	#<CJK>
-0xF2F4	0x89B6	#<CJK>
-0xF2F5	0x89F6	#<CJK>
-0xF2F6	0x8B50	#<CJK>
-0xF2F7	0x8B48	#<CJK>
-0xF2F8	0x8B4A	#<CJK>
-0xF2F9	0x8B40	#<CJK>
-0xF2FA	0x8B53	#<CJK>
-0xF2FB	0x8B56	#<CJK>
-0xF2FC	0x8B54	#<CJK>
-0xF2FD	0x8B4B	#<CJK>
-0xF2FE	0x8B55	#<CJK>
-0xF340	0x8B51	#<CJK>
-0xF341	0x8B42	#<CJK>
-0xF342	0x8B52	#<CJK>
-0xF343	0x8B57	#<CJK>
-0xF344	0x8C43	#<CJK>
-0xF345	0x8C77	#<CJK>
-0xF346	0x8C76	#<CJK>
-0xF347	0x8C9A	#<CJK>
-0xF348	0x8D06	#<CJK>
-0xF349	0x8D07	#<CJK>
-0xF34A	0x8D09	#<CJK>
-0xF34B	0x8DAC	#<CJK>
-0xF34C	0x8DAA	#<CJK>
-0xF34D	0x8DAD	#<CJK>
-0xF34E	0x8DAB	#<CJK>
-0xF34F	0x8E6D	#<CJK>
-0xF350	0x8E78	#<CJK>
-0xF351	0x8E73	#<CJK>
-0xF352	0x8E6A	#<CJK>
-0xF353	0x8E6F	#<CJK>
-0xF354	0x8E7B	#<CJK>
-0xF355	0x8EC2	#<CJK>
-0xF356	0x8F52	#<CJK>
-0xF357	0x8F51	#<CJK>
-0xF358	0x8F4F	#<CJK>
-0xF359	0x8F50	#<CJK>
-0xF35A	0x8F53	#<CJK>
-0xF35B	0x8FB4	#<CJK>
-0xF35C	0x9140	#<CJK>
-0xF35D	0x913F	#<CJK>
-0xF35E	0x91B0	#<CJK>
-0xF35F	0x91AD	#<CJK>
-0xF360	0x93DE	#<CJK>
-0xF361	0x93C7	#<CJK>
-0xF362	0x93CF	#<CJK>
-0xF363	0x93C2	#<CJK>
-0xF364	0x93DA	#<CJK>
-0xF365	0x93D0	#<CJK>
-0xF366	0x93F9	#<CJK>
-0xF367	0x93EC	#<CJK>
-0xF368	0x93CC	#<CJK>
-0xF369	0x93D9	#<CJK>
-0xF36A	0x93A9	#<CJK>
-0xF36B	0x93E6	#<CJK>
-0xF36C	0x93CA	#<CJK>
-0xF36D	0x93D4	#<CJK>
-0xF36E	0x93EE	#<CJK>
-0xF36F	0x93E3	#<CJK>
-0xF370	0x93D5	#<CJK>
-0xF371	0x93C4	#<CJK>
-0xF372	0x93CE	#<CJK>
-0xF373	0x93C0	#<CJK>
-0xF374	0x93D2	#<CJK>
-0xF375	0x93E7	#<CJK>
-0xF376	0x957D	#<CJK>
-0xF377	0x95DA	#<CJK>
-0xF378	0x95DB	#<CJK>
-0xF379	0x96E1	#<CJK>
-0xF37A	0x9729	#<CJK>
-0xF37B	0x972B	#<CJK>
-0xF37C	0x972C	#<CJK>
-0xF37D	0x9728	#<CJK>
-0xF37E	0x9726	#<CJK>
-0xF3A1	0x97B3	#<CJK>
-0xF3A2	0x97B7	#<CJK>
-0xF3A3	0x97B6	#<CJK>
-0xF3A4	0x97DD	#<CJK>
-0xF3A5	0x97DE	#<CJK>
-0xF3A6	0x97DF	#<CJK>
-0xF3A7	0x985C	#<CJK>
-0xF3A8	0x9859	#<CJK>
-0xF3A9	0x985D	#<CJK>
-0xF3AA	0x9857	#<CJK>
-0xF3AB	0x98BF	#<CJK>
-0xF3AC	0x98BD	#<CJK>
-0xF3AD	0x98BB	#<CJK>
-0xF3AE	0x98BE	#<CJK>
-0xF3AF	0x9948	#<CJK>
-0xF3B0	0x9947	#<CJK>
-0xF3B1	0x9943	#<CJK>
-0xF3B2	0x99A6	#<CJK>
-0xF3B3	0x99A7	#<CJK>
-0xF3B4	0x9A1A	#<CJK>
-0xF3B5	0x9A15	#<CJK>
-0xF3B6	0x9A25	#<CJK>
-0xF3B7	0x9A1D	#<CJK>
-0xF3B8	0x9A24	#<CJK>
-0xF3B9	0x9A1B	#<CJK>
-0xF3BA	0x9A22	#<CJK>
-0xF3BB	0x9A20	#<CJK>
-0xF3BC	0x9A27	#<CJK>
-0xF3BD	0x9A23	#<CJK>
-0xF3BE	0x9A1E	#<CJK>
-0xF3BF	0x9A1C	#<CJK>
-0xF3C0	0x9A14	#<CJK>
-0xF3C1	0x9AC2	#<CJK>
-0xF3C2	0x9B0B	#<CJK>
-0xF3C3	0x9B0A	#<CJK>
-0xF3C4	0x9B0E	#<CJK>
-0xF3C5	0x9B0C	#<CJK>
-0xF3C6	0x9B37	#<CJK>
-0xF3C7	0x9BEA	#<CJK>
-0xF3C8	0x9BEB	#<CJK>
-0xF3C9	0x9BE0	#<CJK>
-0xF3CA	0x9BDE	#<CJK>
-0xF3CB	0x9BE4	#<CJK>
-0xF3CC	0x9BE6	#<CJK>
-0xF3CD	0x9BE2	#<CJK>
-0xF3CE	0x9BF0	#<CJK>
-0xF3CF	0x9BD4	#<CJK>
-0xF3D0	0x9BD7	#<CJK>
-0xF3D1	0x9BEC	#<CJK>
-0xF3D2	0x9BDC	#<CJK>
-0xF3D3	0x9BD9	#<CJK>
-0xF3D4	0x9BE5	#<CJK>
-0xF3D5	0x9BD5	#<CJK>
-0xF3D6	0x9BE1	#<CJK>
-0xF3D7	0x9BDA	#<CJK>
-0xF3D8	0x9D77	#<CJK>
-0xF3D9	0x9D81	#<CJK>
-0xF3DA	0x9D8A	#<CJK>
-0xF3DB	0x9D84	#<CJK>
-0xF3DC	0x9D88	#<CJK>
-0xF3DD	0x9D71	#<CJK>
-0xF3DE	0x9D80	#<CJK>
-0xF3DF	0x9D78	#<CJK>
-0xF3E0	0x9D86	#<CJK>
-0xF3E1	0x9D8B	#<CJK>
-0xF3E2	0x9D8C	#<CJK>
-0xF3E3	0x9D7D	#<CJK>
-0xF3E4	0x9D6B	#<CJK>
-0xF3E5	0x9D74	#<CJK>
-0xF3E6	0x9D75	#<CJK>
-0xF3E7	0x9D70	#<CJK>
-0xF3E8	0x9D69	#<CJK>
-0xF3E9	0x9D85	#<CJK>
-0xF3EA	0x9D73	#<CJK>
-0xF3EB	0x9D7B	#<CJK>
-0xF3EC	0x9D82	#<CJK>
-0xF3ED	0x9D6F	#<CJK>
-0xF3EE	0x9D79	#<CJK>
-0xF3EF	0x9D7F	#<CJK>
-0xF3F0	0x9D87	#<CJK>
-0xF3F1	0x9D68	#<CJK>
-0xF3F2	0x9E94	#<CJK>
-0xF3F3	0x9E91	#<CJK>
-0xF3F4	0x9EC0	#<CJK>
-0xF3F5	0x9EFC	#<CJK>
-0xF3F6	0x9F2D	#<CJK>
-0xF3F7	0x9F40	#<CJK>
-0xF3F8	0x9F41	#<CJK>
-0xF3F9	0x9F4D	#<CJK>
-0xF3FA	0x9F56	#<CJK>
-0xF3FB	0x9F57	#<CJK>
-0xF3FC	0x9F58	#<CJK>
-0xF3FD	0x5337	#<CJK>
-0xF3FE	0x56B2	#<CJK>
-0xF440	0x56B5	#<CJK>
-0xF441	0x56B3	#<CJK>
-0xF442	0x58E3	#<CJK>
-0xF443	0x5B45	#<CJK>
-0xF444	0x5DC6	#<CJK>
-0xF445	0x5DC7	#<CJK>
-0xF446	0x5EEE	#<CJK>
-0xF447	0x5EEF	#<CJK>
-0xF448	0x5FC0	#<CJK>
-0xF449	0x5FC1	#<CJK>
-0xF44A	0x61F9	#<CJK>
-0xF44B	0x6517	#<CJK>
-0xF44C	0x6516	#<CJK>
-0xF44D	0x6515	#<CJK>
-0xF44E	0x6513	#<CJK>
-0xF44F	0x65DF	#<CJK>
-0xF450	0x66E8	#<CJK>
-0xF451	0x66E3	#<CJK>
-0xF452	0x66E4	#<CJK>
-0xF453	0x6AF3	#<CJK>
-0xF454	0x6AF0	#<CJK>
-0xF455	0x6AEA	#<CJK>
-0xF456	0x6AE8	#<CJK>
-0xF457	0x6AF9	#<CJK>
-0xF458	0x6AF1	#<CJK>
-0xF459	0x6AEE	#<CJK>
-0xF45A	0x6AEF	#<CJK>
-0xF45B	0x703C	#<CJK>
-0xF45C	0x7035	#<CJK>
-0xF45D	0x702F	#<CJK>
-0xF45E	0x7037	#<CJK>
-0xF45F	0x7034	#<CJK>
-0xF460	0x7031	#<CJK>
-0xF461	0x7042	#<CJK>
-0xF462	0x7038	#<CJK>
-0xF463	0x703F	#<CJK>
-0xF464	0x703A	#<CJK>
-0xF465	0x7039	#<CJK>
-0xF466	0x7040	#<CJK>
-0xF467	0x703B	#<CJK>
-0xF468	0x7033	#<CJK>
-0xF469	0x7041	#<CJK>
-0xF46A	0x7213	#<CJK>
-0xF46B	0x7214	#<CJK>
-0xF46C	0x72A8	#<CJK>
-0xF46D	0x737D	#<CJK>
-0xF46E	0x737C	#<CJK>
-0xF46F	0x74BA	#<CJK>
-0xF470	0x76AB	#<CJK>
-0xF471	0x76AA	#<CJK>
-0xF472	0x76BE	#<CJK>
-0xF473	0x76ED	#<CJK>
-0xF474	0x77CC	#<CJK>
-0xF475	0x77CE	#<CJK>
-0xF476	0x77CF	#<CJK>
-0xF477	0x77CD	#<CJK>
-0xF478	0x77F2	#<CJK>
-0xF479	0x7925	#<CJK>
-0xF47A	0x7923	#<CJK>
-0xF47B	0x7927	#<CJK>
-0xF47C	0x7928	#<CJK>
-0xF47D	0x7924	#<CJK>
-0xF47E	0x7929	#<CJK>
-0xF4A1	0x79B2	#<CJK>
-0xF4A2	0x7A6E	#<CJK>
-0xF4A3	0x7A6C	#<CJK>
-0xF4A4	0x7A6D	#<CJK>
-0xF4A5	0x7AF7	#<CJK>
-0xF4A6	0x7C49	#<CJK>
-0xF4A7	0x7C48	#<CJK>
-0xF4A8	0x7C4A	#<CJK>
-0xF4A9	0x7C47	#<CJK>
-0xF4AA	0x7C45	#<CJK>
-0xF4AB	0x7CEE	#<CJK>
-0xF4AC	0x7E7B	#<CJK>
-0xF4AD	0x7E7E	#<CJK>
-0xF4AE	0x7E81	#<CJK>
-0xF4AF	0x7E80	#<CJK>
-0xF4B0	0x7FBA	#<CJK>
-0xF4B1	0x7FFF	#<CJK>
-0xF4B2	0x8079	#<CJK>
-0xF4B3	0x81DB	#<CJK>
-0xF4B4	0x81D9	#<CJK>
-0xF4B5	0x820B	#<CJK>
-0xF4B6	0x8268	#<CJK>
-0xF4B7	0x8269	#<CJK>
-0xF4B8	0x8622	#<CJK>
-0xF4B9	0x85FF	#<CJK>
-0xF4BA	0x8601	#<CJK>
-0xF4BB	0x85FE	#<CJK>
-0xF4BC	0x861B	#<CJK>
-0xF4BD	0x8600	#<CJK>
-0xF4BE	0x85F6	#<CJK>
-0xF4BF	0x8604	#<CJK>
-0xF4C0	0x8609	#<CJK>
-0xF4C1	0x8605	#<CJK>
-0xF4C2	0x860C	#<CJK>
-0xF4C3	0x85FD	#<CJK>
-0xF4C4	0x8819	#<CJK>
-0xF4C5	0x8810	#<CJK>
-0xF4C6	0x8811	#<CJK>
-0xF4C7	0x8817	#<CJK>
-0xF4C8	0x8813	#<CJK>
-0xF4C9	0x8816	#<CJK>
-0xF4CA	0x8963	#<CJK>
-0xF4CB	0x8966	#<CJK>
-0xF4CC	0x89B9	#<CJK>
-0xF4CD	0x89F7	#<CJK>
-0xF4CE	0x8B60	#<CJK>
-0xF4CF	0x8B6A	#<CJK>
-0xF4D0	0x8B5D	#<CJK>
-0xF4D1	0x8B68	#<CJK>
-0xF4D2	0x8B63	#<CJK>
-0xF4D3	0x8B65	#<CJK>
-0xF4D4	0x8B67	#<CJK>
-0xF4D5	0x8B6D	#<CJK>
-0xF4D6	0x8DAE	#<CJK>
-0xF4D7	0x8E86	#<CJK>
-0xF4D8	0x8E88	#<CJK>
-0xF4D9	0x8E84	#<CJK>
-0xF4DA	0x8F59	#<CJK>
-0xF4DB	0x8F56	#<CJK>
-0xF4DC	0x8F57	#<CJK>
-0xF4DD	0x8F55	#<CJK>
-0xF4DE	0x8F58	#<CJK>
-0xF4DF	0x8F5A	#<CJK>
-0xF4E0	0x908D	#<CJK>
-0xF4E1	0x9143	#<CJK>
-0xF4E2	0x9141	#<CJK>
-0xF4E3	0x91B7	#<CJK>
-0xF4E4	0x91B5	#<CJK>
-0xF4E5	0x91B2	#<CJK>
-0xF4E6	0x91B3	#<CJK>
-0xF4E7	0x940B	#<CJK>
-0xF4E8	0x9413	#<CJK>
-0xF4E9	0x93FB	#<CJK>
-0xF4EA	0x9420	#<CJK>
-0xF4EB	0x940F	#<CJK>
-0xF4EC	0x9414	#<CJK>
-0xF4ED	0x93FE	#<CJK>
-0xF4EE	0x9415	#<CJK>
-0xF4EF	0x9410	#<CJK>
-0xF4F0	0x9428	#<CJK>
-0xF4F1	0x9419	#<CJK>
-0xF4F2	0x940D	#<CJK>
-0xF4F3	0x93F5	#<CJK>
-0xF4F4	0x9400	#<CJK>
-0xF4F5	0x93F7	#<CJK>
-0xF4F6	0x9407	#<CJK>
-0xF4F7	0x940E	#<CJK>
-0xF4F8	0x9416	#<CJK>
-0xF4F9	0x9412	#<CJK>
-0xF4FA	0x93FA	#<CJK>
-0xF4FB	0x9409	#<CJK>
-0xF4FC	0x93F8	#<CJK>
-0xF4FD	0x940A	#<CJK>
-0xF4FE	0x93FF	#<CJK>
-0xF540	0x93FC	#<CJK>
-0xF541	0x940C	#<CJK>
-0xF542	0x93F6	#<CJK>
-0xF543	0x9411	#<CJK>
-0xF544	0x9406	#<CJK>
-0xF545	0x95DE	#<CJK>
-0xF546	0x95E0	#<CJK>
-0xF547	0x95DF	#<CJK>
-0xF548	0x972E	#<CJK>
-0xF549	0x972F	#<CJK>
-0xF54A	0x97B9	#<CJK>
-0xF54B	0x97BB	#<CJK>
-0xF54C	0x97FD	#<CJK>
-0xF54D	0x97FE	#<CJK>
-0xF54E	0x9860	#<CJK>
-0xF54F	0x9862	#<CJK>
-0xF550	0x9863	#<CJK>
-0xF551	0x985F	#<CJK>
-0xF552	0x98C1	#<CJK>
-0xF553	0x98C2	#<CJK>
-0xF554	0x9950	#<CJK>
-0xF555	0x994E	#<CJK>
-0xF556	0x9959	#<CJK>
-0xF557	0x994C	#<CJK>
-0xF558	0x994B	#<CJK>
-0xF559	0x9953	#<CJK>
-0xF55A	0x9A32	#<CJK>
-0xF55B	0x9A34	#<CJK>
-0xF55C	0x9A31	#<CJK>
-0xF55D	0x9A2C	#<CJK>
-0xF55E	0x9A2A	#<CJK>
-0xF55F	0x9A36	#<CJK>
-0xF560	0x9A29	#<CJK>
-0xF561	0x9A2E	#<CJK>
-0xF562	0x9A38	#<CJK>
-0xF563	0x9A2D	#<CJK>
-0xF564	0x9AC7	#<CJK>
-0xF565	0x9ACA	#<CJK>
-0xF566	0x9AC6	#<CJK>
-0xF567	0x9B10	#<CJK>
-0xF568	0x9B12	#<CJK>
-0xF569	0x9B11	#<CJK>
-0xF56A	0x9C0B	#<CJK>
-0xF56B	0x9C08	#<CJK>
-0xF56C	0x9BF7	#<CJK>
-0xF56D	0x9C05	#<CJK>
-0xF56E	0x9C12	#<CJK>
-0xF56F	0x9BF8	#<CJK>
-0xF570	0x9C40	#<CJK>
-0xF571	0x9C07	#<CJK>
-0xF572	0x9C0E	#<CJK>
-0xF573	0x9C06	#<CJK>
-0xF574	0x9C17	#<CJK>
-0xF575	0x9C14	#<CJK>
-0xF576	0x9C09	#<CJK>
-0xF577	0x9D9F	#<CJK>
-0xF578	0x9D99	#<CJK>
-0xF579	0x9DA4	#<CJK>
-0xF57A	0x9D9D	#<CJK>
-0xF57B	0x9D92	#<CJK>
-0xF57C	0x9D98	#<CJK>
-0xF57D	0x9D90	#<CJK>
-0xF57E	0x9D9B	#<CJK>
-0xF5A1	0x9DA0	#<CJK>
-0xF5A2	0x9D94	#<CJK>
-0xF5A3	0x9D9C	#<CJK>
-0xF5A4	0x9DAA	#<CJK>
-0xF5A5	0x9D97	#<CJK>
-0xF5A6	0x9DA1	#<CJK>
-0xF5A7	0x9D9A	#<CJK>
-0xF5A8	0x9DA2	#<CJK>
-0xF5A9	0x9DA8	#<CJK>
-0xF5AA	0x9D9E	#<CJK>
-0xF5AB	0x9DA3	#<CJK>
-0xF5AC	0x9DBF	#<CJK>
-0xF5AD	0x9DA9	#<CJK>
-0xF5AE	0x9D96	#<CJK>
-0xF5AF	0x9DA6	#<CJK>
-0xF5B0	0x9DA7	#<CJK>
-0xF5B1	0x9E99	#<CJK>
-0xF5B2	0x9E9B	#<CJK>
-0xF5B3	0x9E9A	#<CJK>
-0xF5B4	0x9EE5	#<CJK>
-0xF5B5	0x9EE4	#<CJK>
-0xF5B6	0x9EE7	#<CJK>
-0xF5B7	0x9EE6	#<CJK>
-0xF5B8	0x9F30	#<CJK>
-0xF5B9	0x9F2E	#<CJK>
-0xF5BA	0x9F5B	#<CJK>
-0xF5BB	0x9F60	#<CJK>
-0xF5BC	0x9F5E	#<CJK>
-0xF5BD	0x9F5D	#<CJK>
-0xF5BE	0x9F59	#<CJK>
-0xF5BF	0x9F91	#<CJK>
-0xF5C0	0x513A	#<CJK>
-0xF5C1	0x5139	#<CJK>
-0xF5C2	0x5298	#<CJK>
-0xF5C3	0x5297	#<CJK>
-0xF5C4	0x56C3	#<CJK>
-0xF5C5	0x56BD	#<CJK>
-0xF5C6	0x56BE	#<CJK>
-0xF5C7	0x5B48	#<CJK>
-0xF5C8	0x5B47	#<CJK>
-0xF5C9	0x5DCB	#<CJK>
-0xF5CA	0x5DCF	#<CJK>
-0xF5CB	0x5EF1	#<CJK>
-0xF5CC	0x61FD	#<CJK>
-0xF5CD	0x651B	#<CJK>
-0xF5CE	0x6B02	#<CJK>
-0xF5CF	0x6AFC	#<CJK>
-0xF5D0	0x6B03	#<CJK>
-0xF5D1	0x6AF8	#<CJK>
-0xF5D2	0x6B00	#<CJK>
-0xF5D3	0x7043	#<CJK>
-0xF5D4	0x7044	#<CJK>
-0xF5D5	0x704A	#<CJK>
-0xF5D6	0x7048	#<CJK>
-0xF5D7	0x7049	#<CJK>
-0xF5D8	0x7045	#<CJK>
-0xF5D9	0x7046	#<CJK>
-0xF5DA	0x721D	#<CJK>
-0xF5DB	0x721A	#<CJK>
-0xF5DC	0x7219	#<CJK>
-0xF5DD	0x737E	#<CJK>
-0xF5DE	0x7517	#<CJK>
-0xF5DF	0x766A	#<CJK>
-0xF5E0	0x77D0	#<CJK>
-0xF5E1	0x792D	#<CJK>
-0xF5E2	0x7931	#<CJK>
-0xF5E3	0x792F	#<CJK>
-0xF5E4	0x7C54	#<CJK>
-0xF5E5	0x7C53	#<CJK>
-0xF5E6	0x7CF2	#<CJK>
-0xF5E7	0x7E8A	#<CJK>
-0xF5E8	0x7E87	#<CJK>
-0xF5E9	0x7E88	#<CJK>
-0xF5EA	0x7E8B	#<CJK>
-0xF5EB	0x7E86	#<CJK>
-0xF5EC	0x7E8D	#<CJK>
-0xF5ED	0x7F4D	#<CJK>
-0xF5EE	0x7FBB	#<CJK>
-0xF5EF	0x8030	#<CJK>
-0xF5F0	0x81DD	#<CJK>
-0xF5F1	0x8618	#<CJK>
-0xF5F2	0x862A	#<CJK>
-0xF5F3	0x8626	#<CJK>
-0xF5F4	0x861F	#<CJK>
-0xF5F5	0x8623	#<CJK>
-0xF5F6	0x861C	#<CJK>
-0xF5F7	0x8619	#<CJK>
-0xF5F8	0x8627	#<CJK>
-0xF5F9	0x862E	#<CJK>
-0xF5FA	0x8621	#<CJK>
-0xF5FB	0x8620	#<CJK>
-0xF5FC	0x8629	#<CJK>
-0xF5FD	0x861E	#<CJK>
-0xF5FE	0x8625	#<CJK>
-0xF640	0x8829	#<CJK>
-0xF641	0x881D	#<CJK>
-0xF642	0x881B	#<CJK>
-0xF643	0x8820	#<CJK>
-0xF644	0x8824	#<CJK>
-0xF645	0x881C	#<CJK>
-0xF646	0x882B	#<CJK>
-0xF647	0x884A	#<CJK>
-0xF648	0x896D	#<CJK>
-0xF649	0x8969	#<CJK>
-0xF64A	0x896E	#<CJK>
-0xF64B	0x896B	#<CJK>
-0xF64C	0x89FA	#<CJK>
-0xF64D	0x8B79	#<CJK>
-0xF64E	0x8B78	#<CJK>
-0xF64F	0x8B45	#<CJK>
-0xF650	0x8B7A	#<CJK>
-0xF651	0x8B7B	#<CJK>
-0xF652	0x8D10	#<CJK>
-0xF653	0x8D14	#<CJK>
-0xF654	0x8DAF	#<CJK>
-0xF655	0x8E8E	#<CJK>
-0xF656	0x8E8C	#<CJK>
-0xF657	0x8F5E	#<CJK>
-0xF658	0x8F5B	#<CJK>
-0xF659	0x8F5D	#<CJK>
-0xF65A	0x9146	#<CJK>
-0xF65B	0x9144	#<CJK>
-0xF65C	0x9145	#<CJK>
-0xF65D	0x91B9	#<CJK>
-0xF65E	0x943F	#<CJK>
-0xF65F	0x943B	#<CJK>
-0xF660	0x9436	#<CJK>
-0xF661	0x9429	#<CJK>
-0xF662	0x943D	#<CJK>
-0xF663	0x943C	#<CJK>
-0xF664	0x9430	#<CJK>
-0xF665	0x9439	#<CJK>
-0xF666	0x942A	#<CJK>
-0xF667	0x9437	#<CJK>
-0xF668	0x942C	#<CJK>
-0xF669	0x9440	#<CJK>
-0xF66A	0x9431	#<CJK>
-0xF66B	0x95E5	#<CJK>
-0xF66C	0x95E4	#<CJK>
-0xF66D	0x95E3	#<CJK>
-0xF66E	0x9735	#<CJK>
-0xF66F	0x973A	#<CJK>
-0xF670	0x97BF	#<CJK>
-0xF671	0x97E1	#<CJK>
-0xF672	0x9864	#<CJK>
-0xF673	0x98C9	#<CJK>
-0xF674	0x98C6	#<CJK>
-0xF675	0x98C0	#<CJK>
-0xF676	0x9958	#<CJK>
-0xF677	0x9956	#<CJK>
-0xF678	0x9A39	#<CJK>
-0xF679	0x9A3D	#<CJK>
-0xF67A	0x9A46	#<CJK>
-0xF67B	0x9A44	#<CJK>
-0xF67C	0x9A42	#<CJK>
-0xF67D	0x9A41	#<CJK>
-0xF67E	0x9A3A	#<CJK>
-0xF6A1	0x9A3F	#<CJK>
-0xF6A2	0x9ACD	#<CJK>
-0xF6A3	0x9B15	#<CJK>
-0xF6A4	0x9B17	#<CJK>
-0xF6A5	0x9B18	#<CJK>
-0xF6A6	0x9B16	#<CJK>
-0xF6A7	0x9B3A	#<CJK>
-0xF6A8	0x9B52	#<CJK>
-0xF6A9	0x9C2B	#<CJK>
-0xF6AA	0x9C1D	#<CJK>
-0xF6AB	0x9C1C	#<CJK>
-0xF6AC	0x9C2C	#<CJK>
-0xF6AD	0x9C23	#<CJK>
-0xF6AE	0x9C28	#<CJK>
-0xF6AF	0x9C29	#<CJK>
-0xF6B0	0x9C24	#<CJK>
-0xF6B1	0x9C21	#<CJK>
-0xF6B2	0x9DB7	#<CJK>
-0xF6B3	0x9DB6	#<CJK>
-0xF6B4	0x9DBC	#<CJK>
-0xF6B5	0x9DC1	#<CJK>
-0xF6B6	0x9DC7	#<CJK>
-0xF6B7	0x9DCA	#<CJK>
-0xF6B8	0x9DCF	#<CJK>
-0xF6B9	0x9DBE	#<CJK>
-0xF6BA	0x9DC5	#<CJK>
-0xF6BB	0x9DC3	#<CJK>
-0xF6BC	0x9DBB	#<CJK>
-0xF6BD	0x9DB5	#<CJK>
-0xF6BE	0x9DCE	#<CJK>
-0xF6BF	0x9DB9	#<CJK>
-0xF6C0	0x9DBA	#<CJK>
-0xF6C1	0x9DAC	#<CJK>
-0xF6C2	0x9DC8	#<CJK>
-0xF6C3	0x9DB1	#<CJK>
-0xF6C4	0x9DAD	#<CJK>
-0xF6C5	0x9DCC	#<CJK>
-0xF6C6	0x9DB3	#<CJK>
-0xF6C7	0x9DCD	#<CJK>
-0xF6C8	0x9DB2	#<CJK>
-0xF6C9	0x9E7A	#<CJK>
-0xF6CA	0x9E9C	#<CJK>
-0xF6CB	0x9EEB	#<CJK>
-0xF6CC	0x9EEE	#<CJK>
-0xF6CD	0x9EED	#<CJK>
-0xF6CE	0x9F1B	#<CJK>
-0xF6CF	0x9F18	#<CJK>
-0xF6D0	0x9F1A	#<CJK>
-0xF6D1	0x9F31	#<CJK>
-0xF6D2	0x9F4E	#<CJK>
-0xF6D3	0x9F65	#<CJK>
-0xF6D4	0x9F64	#<CJK>
-0xF6D5	0x9F92	#<CJK>
-0xF6D6	0x4EB9	#<CJK>
-0xF6D7	0x56C6	#<CJK>
-0xF6D8	0x56C5	#<CJK>
-0xF6D9	0x56CB	#<CJK>
-0xF6DA	0x5971	#<CJK>
-0xF6DB	0x5B4B	#<CJK>
-0xF6DC	0x5B4C	#<CJK>
-0xF6DD	0x5DD5	#<CJK>
-0xF6DE	0x5DD1	#<CJK>
-0xF6DF	0x5EF2	#<CJK>
-0xF6E0	0x6521	#<CJK>
-0xF6E1	0x6520	#<CJK>
-0xF6E2	0x6526	#<CJK>
-0xF6E3	0x6522	#<CJK>
-0xF6E4	0x6B0B	#<CJK>
-0xF6E5	0x6B08	#<CJK>
-0xF6E6	0x6B09	#<CJK>
-0xF6E7	0x6C0D	#<CJK>
-0xF6E8	0x7055	#<CJK>
-0xF6E9	0x7056	#<CJK>
-0xF6EA	0x7057	#<CJK>
-0xF6EB	0x7052	#<CJK>
-0xF6EC	0x721E	#<CJK>
-0xF6ED	0x721F	#<CJK>
-0xF6EE	0x72A9	#<CJK>
-0xF6EF	0x737F	#<CJK>
-0xF6F0	0x74D8	#<CJK>
-0xF6F1	0x74D5	#<CJK>
-0xF6F2	0x74D9	#<CJK>
-0xF6F3	0x74D7	#<CJK>
-0xF6F4	0x766D	#<CJK>
-0xF6F5	0x76AD	#<CJK>
-0xF6F6	0x7935	#<CJK>
-0xF6F7	0x79B4	#<CJK>
-0xF6F8	0x7A70	#<CJK>
-0xF6F9	0x7A71	#<CJK>
-0xF6FA	0x7C57	#<CJK>
-0xF6FB	0x7C5C	#<CJK>
-0xF6FC	0x7C59	#<CJK>
-0xF6FD	0x7C5B	#<CJK>
-0xF6FE	0x7C5A	#<CJK>
-0xF740	0x7CF4	#<CJK>
-0xF741	0x7CF1	#<CJK>
-0xF742	0x7E91	#<CJK>
-0xF743	0x7F4F	#<CJK>
-0xF744	0x7F87	#<CJK>
-0xF745	0x81DE	#<CJK>
-0xF746	0x826B	#<CJK>
-0xF747	0x8634	#<CJK>
-0xF748	0x8635	#<CJK>
-0xF749	0x8633	#<CJK>
-0xF74A	0x862C	#<CJK>
-0xF74B	0x8632	#<CJK>
-0xF74C	0x8636	#<CJK>
-0xF74D	0x882C	#<CJK>
-0xF74E	0x8828	#<CJK>
-0xF74F	0x8826	#<CJK>
-0xF750	0x882A	#<CJK>
-0xF751	0x8825	#<CJK>
-0xF752	0x8971	#<CJK>
-0xF753	0x89BF	#<CJK>
-0xF754	0x89BE	#<CJK>
-0xF755	0x89FB	#<CJK>
-0xF756	0x8B7E	#<CJK>
-0xF757	0x8B84	#<CJK>
-0xF758	0x8B82	#<CJK>
-0xF759	0x8B86	#<CJK>
-0xF75A	0x8B85	#<CJK>
-0xF75B	0x8B7F	#<CJK>
-0xF75C	0x8D15	#<CJK>
-0xF75D	0x8E95	#<CJK>
-0xF75E	0x8E94	#<CJK>
-0xF75F	0x8E9A	#<CJK>
-0xF760	0x8E92	#<CJK>
-0xF761	0x8E90	#<CJK>
-0xF762	0x8E96	#<CJK>
-0xF763	0x8E97	#<CJK>
-0xF764	0x8F60	#<CJK>
-0xF765	0x8F62	#<CJK>
-0xF766	0x9147	#<CJK>
-0xF767	0x944C	#<CJK>
-0xF768	0x9450	#<CJK>
-0xF769	0x944A	#<CJK>
-0xF76A	0x944B	#<CJK>
-0xF76B	0x944F	#<CJK>
-0xF76C	0x9447	#<CJK>
-0xF76D	0x9445	#<CJK>
-0xF76E	0x9448	#<CJK>
-0xF76F	0x9449	#<CJK>
-0xF770	0x9446	#<CJK>
-0xF771	0x973F	#<CJK>
-0xF772	0x97E3	#<CJK>
-0xF773	0x986A	#<CJK>
-0xF774	0x9869	#<CJK>
-0xF775	0x98CB	#<CJK>
-0xF776	0x9954	#<CJK>
-0xF777	0x995B	#<CJK>
-0xF778	0x9A4E	#<CJK>
-0xF779	0x9A53	#<CJK>
-0xF77A	0x9A54	#<CJK>
-0xF77B	0x9A4C	#<CJK>
-0xF77C	0x9A4F	#<CJK>
-0xF77D	0x9A48	#<CJK>
-0xF77E	0x9A4A	#<CJK>
-0xF7A1	0x9A49	#<CJK>
-0xF7A2	0x9A52	#<CJK>
-0xF7A3	0x9A50	#<CJK>
-0xF7A4	0x9AD0	#<CJK>
-0xF7A5	0x9B19	#<CJK>
-0xF7A6	0x9B2B	#<CJK>
-0xF7A7	0x9B3B	#<CJK>
-0xF7A8	0x9B56	#<CJK>
-0xF7A9	0x9B55	#<CJK>
-0xF7AA	0x9C46	#<CJK>
-0xF7AB	0x9C48	#<CJK>
-0xF7AC	0x9C3F	#<CJK>
-0xF7AD	0x9C44	#<CJK>
-0xF7AE	0x9C39	#<CJK>
-0xF7AF	0x9C33	#<CJK>
-0xF7B0	0x9C41	#<CJK>
-0xF7B1	0x9C3C	#<CJK>
-0xF7B2	0x9C37	#<CJK>
-0xF7B3	0x9C34	#<CJK>
-0xF7B4	0x9C32	#<CJK>
-0xF7B5	0x9C3D	#<CJK>
-0xF7B6	0x9C36	#<CJK>
-0xF7B7	0x9DDB	#<CJK>
-0xF7B8	0x9DD2	#<CJK>
-0xF7B9	0x9DDE	#<CJK>
-0xF7BA	0x9DDA	#<CJK>
-0xF7BB	0x9DCB	#<CJK>
-0xF7BC	0x9DD0	#<CJK>
-0xF7BD	0x9DDC	#<CJK>
-0xF7BE	0x9DD1	#<CJK>
-0xF7BF	0x9DDF	#<CJK>
-0xF7C0	0x9DE9	#<CJK>
-0xF7C1	0x9DD9	#<CJK>
-0xF7C2	0x9DD8	#<CJK>
-0xF7C3	0x9DD6	#<CJK>
-0xF7C4	0x9DF5	#<CJK>
-0xF7C5	0x9DD5	#<CJK>
-0xF7C6	0x9DDD	#<CJK>
-0xF7C7	0x9EB6	#<CJK>
-0xF7C8	0x9EF0	#<CJK>
-0xF7C9	0x9F35	#<CJK>
-0xF7CA	0x9F33	#<CJK>
-0xF7CB	0x9F32	#<CJK>
-0xF7CC	0x9F42	#<CJK>
-0xF7CD	0x9F6B	#<CJK>
-0xF7CE	0x9F95	#<CJK>
-0xF7CF	0x9FA2	#<CJK>
-0xF7D0	0x513D	#<CJK>
-0xF7D1	0x5299	#<CJK>
-0xF7D2	0x58E8	#<CJK>
-0xF7D3	0x58E7	#<CJK>
-0xF7D4	0x5972	#<CJK>
-0xF7D5	0x5B4D	#<CJK>
-0xF7D6	0x5DD8	#<CJK>
-0xF7D7	0x882F	#<CJK>
-0xF7D8	0x5F4F	#<CJK>
-0xF7D9	0x6201	#<CJK>
-0xF7DA	0x6203	#<CJK>
-0xF7DB	0x6204	#<CJK>
-0xF7DC	0x6529	#<CJK>
-0xF7DD	0x6525	#<CJK>
-0xF7DE	0x6596	#<CJK>
-0xF7DF	0x66EB	#<CJK>
-0xF7E0	0x6B11	#<CJK>
-0xF7E1	0x6B12	#<CJK>
-0xF7E2	0x6B0F	#<CJK>
-0xF7E3	0x6BCA	#<CJK>
-0xF7E4	0x705B	#<CJK>
-0xF7E5	0x705A	#<CJK>
-0xF7E6	0x7222	#<CJK>
-0xF7E7	0x7382	#<CJK>
-0xF7E8	0x7381	#<CJK>
-0xF7E9	0x7383	#<CJK>
-0xF7EA	0x7670	#<CJK>
-0xF7EB	0x77D4	#<CJK>
-0xF7EC	0x7C67	#<CJK>
-0xF7ED	0x7C66	#<CJK>
-0xF7EE	0x7E95	#<CJK>
-0xF7EF	0x826C	#<CJK>
-0xF7F0	0x863A	#<CJK>
-0xF7F1	0x8640	#<CJK>
-0xF7F2	0x8639	#<CJK>
-0xF7F3	0x863C	#<CJK>
-0xF7F4	0x8631	#<CJK>
-0xF7F5	0x863B	#<CJK>
-0xF7F6	0x863E	#<CJK>
-0xF7F7	0x8830	#<CJK>
-0xF7F8	0x8832	#<CJK>
-0xF7F9	0x882E	#<CJK>
-0xF7FA	0x8833	#<CJK>
-0xF7FB	0x8976	#<CJK>
-0xF7FC	0x8974	#<CJK>
-0xF7FD	0x8973	#<CJK>
-0xF7FE	0x89FE	#<CJK>
-0xF840	0x8B8C	#<CJK>
-0xF841	0x8B8E	#<CJK>
-0xF842	0x8B8B	#<CJK>
-0xF843	0x8B88	#<CJK>
-0xF844	0x8C45	#<CJK>
-0xF845	0x8D19	#<CJK>
-0xF846	0x8E98	#<CJK>
-0xF847	0x8F64	#<CJK>
-0xF848	0x8F63	#<CJK>
-0xF849	0x91BC	#<CJK>
-0xF84A	0x9462	#<CJK>
-0xF84B	0x9455	#<CJK>
-0xF84C	0x945D	#<CJK>
-0xF84D	0x9457	#<CJK>
-0xF84E	0x945E	#<CJK>
-0xF84F	0x97C4	#<CJK>
-0xF850	0x97C5	#<CJK>
-0xF851	0x9800	#<CJK>
-0xF852	0x9A56	#<CJK>
-0xF853	0x9A59	#<CJK>
-0xF854	0x9B1E	#<CJK>
-0xF855	0x9B1F	#<CJK>
-0xF856	0x9B20	#<CJK>
-0xF857	0x9C52	#<CJK>
-0xF858	0x9C58	#<CJK>
-0xF859	0x9C50	#<CJK>
-0xF85A	0x9C4A	#<CJK>
-0xF85B	0x9C4D	#<CJK>
-0xF85C	0x9C4B	#<CJK>
-0xF85D	0x9C55	#<CJK>
-0xF85E	0x9C59	#<CJK>
-0xF85F	0x9C4C	#<CJK>
-0xF860	0x9C4E	#<CJK>
-0xF861	0x9DFB	#<CJK>
-0xF862	0x9DF7	#<CJK>
-0xF863	0x9DEF	#<CJK>
-0xF864	0x9DE3	#<CJK>
-0xF865	0x9DEB	#<CJK>
-0xF866	0x9DF8	#<CJK>
-0xF867	0x9DE4	#<CJK>
-0xF868	0x9DF6	#<CJK>
-0xF869	0x9DE1	#<CJK>
-0xF86A	0x9DEE	#<CJK>
-0xF86B	0x9DE6	#<CJK>
-0xF86C	0x9DF2	#<CJK>
-0xF86D	0x9DF0	#<CJK>
-0xF86E	0x9DE2	#<CJK>
-0xF86F	0x9DEC	#<CJK>
-0xF870	0x9DF4	#<CJK>
-0xF871	0x9DF3	#<CJK>
-0xF872	0x9DE8	#<CJK>
-0xF873	0x9DED	#<CJK>
-0xF874	0x9EC2	#<CJK>
-0xF875	0x9ED0	#<CJK>
-0xF876	0x9EF2	#<CJK>
-0xF877	0x9EF3	#<CJK>
-0xF878	0x9F06	#<CJK>
-0xF879	0x9F1C	#<CJK>
-0xF87A	0x9F38	#<CJK>
-0xF87B	0x9F37	#<CJK>
-0xF87C	0x9F36	#<CJK>
-0xF87D	0x9F43	#<CJK>
-0xF87E	0x9F4F	#<CJK>
-0xF8A1	0x9F71	#<CJK>
-0xF8A2	0x9F70	#<CJK>
-0xF8A3	0x9F6E	#<CJK>
-0xF8A4	0x9F6F	#<CJK>
-0xF8A5	0x56D3	#<CJK>
-0xF8A6	0x56CD	#<CJK>
-0xF8A7	0x5B4E	#<CJK>
-0xF8A8	0x5C6D	#<CJK>
-0xF8A9	0x652D	#<CJK>
-0xF8AA	0x66ED	#<CJK>
-0xF8AB	0x66EE	#<CJK>
-0xF8AC	0x6B13	#<CJK>
-0xF8AD	0x705F	#<CJK>
-0xF8AE	0x7061	#<CJK>
-0xF8AF	0x705D	#<CJK>
-0xF8B0	0x7060	#<CJK>
-0xF8B1	0x7223	#<CJK>
-0xF8B2	0x74DB	#<CJK>
-0xF8B3	0x74E5	#<CJK>
-0xF8B4	0x77D5	#<CJK>
-0xF8B5	0x7938	#<CJK>
-0xF8B6	0x79B7	#<CJK>
-0xF8B7	0x79B6	#<CJK>
-0xF8B8	0x7C6A	#<CJK>
-0xF8B9	0x7E97	#<CJK>
-0xF8BA	0x7F89	#<CJK>
-0xF8BB	0x826D	#<CJK>
-0xF8BC	0x8643	#<CJK>
-0xF8BD	0x8838	#<CJK>
-0xF8BE	0x8837	#<CJK>
-0xF8BF	0x8835	#<CJK>
-0xF8C0	0x884B	#<CJK>
-0xF8C1	0x8B94	#<CJK>
-0xF8C2	0x8B95	#<CJK>
-0xF8C3	0x8E9E	#<CJK>
-0xF8C4	0x8E9F	#<CJK>
-0xF8C5	0x8EA0	#<CJK>
-0xF8C6	0x8E9D	#<CJK>
-0xF8C7	0x91BE	#<CJK>
-0xF8C8	0x91BD	#<CJK>
-0xF8C9	0x91C2	#<CJK>
-0xF8CA	0x946B	#<CJK>
-0xF8CB	0x9468	#<CJK>
-0xF8CC	0x9469	#<CJK>
-0xF8CD	0x96E5	#<CJK>
-0xF8CE	0x9746	#<CJK>
-0xF8CF	0x9743	#<CJK>
-0xF8D0	0x9747	#<CJK>
-0xF8D1	0x97C7	#<CJK>
-0xF8D2	0x97E5	#<CJK>
-0xF8D3	0x9A5E	#<CJK>
-0xF8D4	0x9AD5	#<CJK>
-0xF8D5	0x9B59	#<CJK>
-0xF8D6	0x9C63	#<CJK>
-0xF8D7	0x9C67	#<CJK>
-0xF8D8	0x9C66	#<CJK>
-0xF8D9	0x9C62	#<CJK>
-0xF8DA	0x9C5E	#<CJK>
-0xF8DB	0x9C60	#<CJK>
-0xF8DC	0x9E02	#<CJK>
-0xF8DD	0x9DFE	#<CJK>
-0xF8DE	0x9E07	#<CJK>
-0xF8DF	0x9E03	#<CJK>
-0xF8E0	0x9E06	#<CJK>
-0xF8E1	0x9E05	#<CJK>
-0xF8E2	0x9E00	#<CJK>
-0xF8E3	0x9E01	#<CJK>
-0xF8E4	0x9E09	#<CJK>
-0xF8E5	0x9DFF	#<CJK>
-0xF8E6	0x9DFD	#<CJK>
-0xF8E7	0x9E04	#<CJK>
-0xF8E8	0x9EA0	#<CJK>
-0xF8E9	0x9F1E	#<CJK>
-0xF8EA	0x9F46	#<CJK>
-0xF8EB	0x9F74	#<CJK>
-0xF8EC	0x9F75	#<CJK>
-0xF8ED	0x9F76	#<CJK>
-0xF8EE	0x56D4	#<CJK>
-0xF8EF	0x652E	#<CJK>
-0xF8F0	0x65B8	#<CJK>
-0xF8F1	0x6B18	#<CJK>
-0xF8F2	0x6B19	#<CJK>
-0xF8F3	0x6B17	#<CJK>
-0xF8F4	0x6B1A	#<CJK>
-0xF8F5	0x7062	#<CJK>
-0xF8F6	0x7226	#<CJK>
-0xF8F7	0x72AA	#<CJK>
-0xF8F8	0x77D8	#<CJK>
-0xF8F9	0x77D9	#<CJK>
-0xF8FA	0x7939	#<CJK>
-0xF8FB	0x7C69	#<CJK>
-0xF8FC	0x7C6B	#<CJK>
-0xF8FD	0x7CF6	#<CJK>
-0xF8FE	0x7E9A	#<CJK>
-0xF940	0x7E98	#<CJK>
-0xF941	0x7E9B	#<CJK>
-0xF942	0x7E99	#<CJK>
-0xF943	0x81E0	#<CJK>
-0xF944	0x81E1	#<CJK>
-0xF945	0x8646	#<CJK>
-0xF946	0x8647	#<CJK>
-0xF947	0x8648	#<CJK>
-0xF948	0x8979	#<CJK>
-0xF949	0x897A	#<CJK>
-0xF94A	0x897C	#<CJK>
-0xF94B	0x897B	#<CJK>
-0xF94C	0x89FF	#<CJK>
-0xF94D	0x8B98	#<CJK>
-0xF94E	0x8B99	#<CJK>
-0xF94F	0x8EA5	#<CJK>
-0xF950	0x8EA4	#<CJK>
-0xF951	0x8EA3	#<CJK>
-0xF952	0x946E	#<CJK>
-0xF953	0x946D	#<CJK>
-0xF954	0x946F	#<CJK>
-0xF955	0x9471	#<CJK>
-0xF956	0x9473	#<CJK>
-0xF957	0x9749	#<CJK>
-0xF958	0x9872	#<CJK>
-0xF959	0x995F	#<CJK>
-0xF95A	0x9C68	#<CJK>
-0xF95B	0x9C6E	#<CJK>
-0xF95C	0x9C6D	#<CJK>
-0xF95D	0x9E0B	#<CJK>
-0xF95E	0x9E0D	#<CJK>
-0xF95F	0x9E10	#<CJK>
-0xF960	0x9E0F	#<CJK>
-0xF961	0x9E12	#<CJK>
-0xF962	0x9E11	#<CJK>
-0xF963	0x9EA1	#<CJK>
-0xF964	0x9EF5	#<CJK>
-0xF965	0x9F09	#<CJK>
-0xF966	0x9F47	#<CJK>
-0xF967	0x9F78	#<CJK>
-0xF968	0x9F7B	#<CJK>
-0xF969	0x9F7A	#<CJK>
-0xF96A	0x9F79	#<CJK>
-0xF96B	0x571E	#<CJK>
-0xF96C	0x7066	#<CJK>
-0xF96D	0x7C6F	#<CJK>
-0xF96E	0x883C	#<CJK>
-0xF96F	0x8DB2	#<CJK>
-0xF970	0x8EA6	#<CJK>
-0xF971	0x91C3	#<CJK>
-0xF972	0x9474	#<CJK>
-0xF973	0x9478	#<CJK>
-0xF974	0x9476	#<CJK>
-0xF975	0x9475	#<CJK>
-0xF976	0x9A60	#<CJK>
-0xF977	0x9C74	#<CJK>
-0xF978	0x9C73	#<CJK>
-0xF979	0x9C71	#<CJK>
-0xF97A	0x9C75	#<CJK>
-0xF97B	0x9E14	#<CJK>
-0xF97C	0x9E13	#<CJK>
-0xF97D	0x9EF6	#<CJK>
-0xF97E	0x9F0A	#<CJK>
-0xF9A1	0x9FA4	#<CJK>
-0xF9A2	0x7068	#<CJK>
-0xF9A3	0x7065	#<CJK>
-0xF9A4	0x7CF7	#<CJK>
-0xF9A5	0x866A	#<CJK>
-0xF9A6	0x883E	#<CJK>
-0xF9A7	0x883D	#<CJK>
-0xF9A8	0x883F	#<CJK>
-0xF9A9	0x8B9E	#<CJK>
-0xF9AA	0x8C9C	#<CJK>
-0xF9AB	0x8EA9	#<CJK>
-0xF9AC	0x8EC9	#<CJK>
-0xF9AD	0x974B	#<CJK>
-0xF9AE	0x9873	#<CJK>
-0xF9AF	0x9874	#<CJK>
-0xF9B0	0x98CC	#<CJK>
-0xF9B1	0x9961	#<CJK>
-0xF9B2	0x99AB	#<CJK>
-0xF9B3	0x9A64	#<CJK>
-0xF9B4	0x9A66	#<CJK>
-0xF9B5	0x9A67	#<CJK>
-0xF9B6	0x9B24	#<CJK>
-0xF9B7	0x9E15	#<CJK>
-0xF9B8	0x9E17	#<CJK>
-0xF9B9	0x9F48	#<CJK>
-0xF9BA	0x6207	#<CJK>
-0xF9BB	0x6B1E	#<CJK>
-0xF9BC	0x7227	#<CJK>
-0xF9BD	0x864C	#<CJK>
-0xF9BE	0x8EA8	#<CJK>
-0xF9BF	0x9482	#<CJK>
-0xF9C0	0x9480	#<CJK>
-0xF9C1	0x9481	#<CJK>
-0xF9C2	0x9A69	#<CJK>
-0xF9C3	0x9A68	#<CJK>
-0xF9C4	0x9B2E	#<CJK>
-0xF9C5	0x9E19	#<CJK>
-0xF9C6	0x7229	#<CJK>
-0xF9C7	0x864B	#<CJK>
-0xF9C8	0x8B9F	#<CJK>
-0xF9C9	0x9483	#<CJK>
-0xF9CA	0x9C79	#<CJK>
-0xF9CB	0x9EB7	#<CJK>
-0xF9CC	0x7675	#<CJK>
-0xF9CD	0x9A6B	#<CJK>
-0xF9CE	0x9C7A	#<CJK>
-0xF9CF	0x9E1D	#<CJK>
-0xF9D0	0x7069	#<CJK>
-0xF9D1	0x706A	#<CJK>
-0xF9D2	0x9EA4	#<CJK>
-0xF9D3	0x9F7E	#<CJK>
-0xF9D4	0x9F49	#<CJK>
-0xF9D5	0x9F98	#<CJK>
-0xF9D6	0x7881	#<CJK>
-0xF9D7	0x92B9	#<CJK>
-0xF9D8	0x88CF	#<CJK>
-0xF9D9	0x58BB	#<CJK>
-0xF9DA	0x6052	#<CJK>
-0xF9DB	0x7CA7	#<CJK>
-0xF9DC	0x5AFA	#<CJK>
-0xF9DD	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xF9DE	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xF9DF	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xF9E0	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xF9E1	0x256C	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xF9E2	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xF9E3	0x255A	#BOX DRAWINGS DOUBLE UP AND RIGHT
-0xF9E4	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xF9E5	0x255D	#BOX DRAWINGS DOUBLE UP AND LEFT
-0xF9E6	0x2552	#BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-0xF9E7	0x2564	#BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-0xF9E8	0x2555	#BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-0xF9E9	0x255E	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xF9EA	0x256A	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xF9EB	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xF9EC	0x2558	#BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-0xF9ED	0x2567	#BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-0xF9EE	0x255B	#BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-0xF9EF	0x2553	#BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-0xF9F0	0x2565	#BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-0xF9F1	0x2556	#BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-0xF9F2	0x255F	#BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-0xF9F3	0x256B	#BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-0xF9F4	0x2562	#BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-0xF9F5	0x2559	#BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-0xF9F6	0x2568	#BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-0xF9F7	0x255C	#BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-0xF9F8	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
-0xF9F9	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xF9FA	0x256D	#BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
-0xF9FB	0x256E	#BOX DRAWINGS LIGHT ARC DOWN AND LEFT
-0xF9FC	0x2570	#BOX DRAWINGS LIGHT ARC UP AND RIGHT
-0xF9FD	0x256F	#BOX DRAWINGS LIGHT ARC UP AND LEFT
-0xF9FE	0x2593	#DARK SHADE
diff --git a/tools/encoding/dingbats.txt b/tools/encoding/dingbats.txt
deleted file mode 100644
index 334f8d6..0000000
--- a/tools/encoding/dingbats.txt
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# ITC Dingbats, for use on X.  Doesn't have Mac dingbats extensions.
-#
-# This file is derived from:
-#
-#   Name:             MacOS_Dingbats [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Dingbats code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Dingbats code order.
-#
-#   Several of these mappings require the use of corporate
-#   characters. See the file "MacOS-CorpCharList".
-#
-#   Notes on MacOS Dingbats:
-#   ------------------------
-#
-#   The MacOS Dingbats encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Dingbats encoding is being used, you must check if the
-#   font name is "Zapf Dingbats".
-#
-#   The layout of the Dingbats character set is identical to or
-#   a superset of the layout of the Adobe Zapf Dingbats encoding
-#   vector.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x2701	# UPPER BLADE SCISSORS
-0x22	0x2702	# BLACK SCISSORS
-0x23	0x2703	# LOWER BLADE SCISSORS
-0x24	0x2704	# WHITE SCISSORS
-0x25	0x260E	# BLACK TELEPHONE
-0x26	0x2706	# TELEPHONE LOCATION SIGN
-0x27	0x2707	# TAPE DRIVE
-0x28	0x2708	# AIRPLANE
-0x29	0x2709	# ENVELOPE
-0x2A	0x261B	# BLACK RIGHT POINTING INDEX
-0x2B	0x261E	# WHITE RIGHT POINTING INDEX
-0x2C	0x270C	# VICTORY HAND
-0x2D	0x270D	# WRITING HAND
-0x2E	0x270E	# LOWER RIGHT PENCIL
-0x2F	0x270F	# PENCIL
-0x30	0x2710	# UPPER RIGHT PENCIL
-0x31	0x2711	# WHITE NIB
-0x32	0x2712	# BLACK NIB
-0x33	0x2713	# CHECK MARK
-0x34	0x2714	# HEAVY CHECK MARK
-0x35	0x2715	# MULTIPLICATION X
-0x36	0x2716	# HEAVY MULTIPLICATION X
-0x37	0x2717	# BALLOT X
-0x38	0x2718	# HEAVY BALLOT X
-0x39	0x2719	# OUTLINED GREEK CROSS
-0x3A	0x271A	# HEAVY GREEK CROSS
-0x3B	0x271B	# OPEN CENTRE CROSS
-0x3C	0x271C	# HEAVY OPEN CENTRE CROSS
-0x3D	0x271D	# LATIN CROSS
-0x3E	0x271E	# SHADOWED WHITE LATIN CROSS
-0x3F	0x271F	# OUTLINED LATIN CROSS
-0x40	0x2720	# MALTESE CROSS
-0x41	0x2721	# STAR OF DAVID
-0x42	0x2722	# FOUR TEARDROP-SPOKED ASTERISK
-0x43	0x2723	# FOUR BALLOON-SPOKED ASTERISK
-0x44	0x2724	# HEAVY FOUR BALLOON-SPOKED ASTERISK
-0x45	0x2725	# FOUR CLUB-SPOKED ASTERISK
-0x46	0x2726	# BLACK FOUR POINTED STAR
-0x47	0x2727	# WHITE FOUR POINTED STAR
-0x48	0x2605	# BLACK STAR
-0x49	0x2729	# STRESS OUTLINED WHITE STAR
-0x4A	0x272A	# CIRCLED WHITE STAR
-0x4B	0x272B	# OPEN CENTRE BLACK STAR
-0x4C	0x272C	# BLACK CENTRE WHITE STAR
-0x4D	0x272D	# OUTLINED BLACK STAR
-0x4E	0x272E	# HEAVY OUTLINED BLACK STAR
-0x4F	0x272F	# PINWHEEL STAR
-0x50	0x2730	# SHADOWED WHITE STAR
-0x51	0x2731	# HEAVY ASTERISK
-0x52	0x2732	# OPEN CENTRE ASTERISK
-0x53	0x2733	# EIGHT SPOKED ASTERISK
-0x54	0x2734	# EIGHT POINTED BLACK STAR
-0x55	0x2735	# EIGHT POINTED PINWHEEL STAR
-0x56	0x2736	# SIX POINTED BLACK STAR
-0x57	0x2737	# EIGHT POINTED RECTILINEAR BLACK STAR
-0x58	0x2738	# HEAVY EIGHT POINTED RECTILINEAR BLACK STAR
-0x59	0x2739	# TWELVE POINTED BLACK STAR
-0x5A	0x273A	# SIXTEEN POINTED ASTERISK
-0x5B	0x273B	# TEARDROP-SPOKED ASTERISK
-0x5C	0x273C	# OPEN CENTRE TEARDROP-SPOKED ASTERISK
-0x5D	0x273D	# HEAVY TEARDROP-SPOKED ASTERISK
-0x5E	0x273E	# SIX PETALLED BLACK AND WHITE FLORETTE
-0x5F	0x273F	# BLACK FLORETTE
-0x60	0x2740	# WHITE FLORETTE
-0x61	0x2741	# EIGHT PETALLED OUTLINED BLACK FLORETTE
-0x62	0x2742	# CIRCLED OPEN CENTRE EIGHT POINTED STAR
-0x63	0x2743	# HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK
-0x64	0x2744	# SNOWFLAKE
-0x65	0x2745	# TIGHT TRIFOLIATE SNOWFLAKE
-0x66	0x2746	# HEAVY CHEVRON SNOWFLAKE
-0x67	0x2747	# SPARKLE
-0x68	0x2748	# HEAVY SPARKLE
-0x69	0x2749	# BALLOON-SPOKED ASTERISK
-0x6A	0x274A	# EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-0x6B	0x274B	# HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-0x6C	0x25CF	# BLACK CIRCLE
-0x6D	0x274D	# SHADOWED WHITE CIRCLE
-0x6E	0x25A0	# BLACK SQUARE
-0x6F	0x274F	# LOWER RIGHT DROP-SHADOWED WHITE SQUARE
-0x70	0x2750	# UPPER RIGHT DROP-SHADOWED WHITE SQUARE
-0x71	0x2751	# LOWER RIGHT SHADOWED WHITE SQUARE
-0x72	0x2752	# UPPER RIGHT SHADOWED WHITE SQUARE
-0x73	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x74	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0x75	0x25C6	# BLACK DIAMOND
-0x76	0x2756	# BLACK DIAMOND MINUS WHITE X
-0x77	0x25D7	# RIGHT HALF BLACK CIRCLE
-0x78	0x2758	# LIGHT VERTICAL BAR
-0x79	0x2759	# MEDIUM VERTICAL BAR
-0x7A	0x275A	# HEAVY VERTICAL BAR
-0x7B	0x275B	# HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT
-0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
-0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
-0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-0xA1	0x2761	# CURVED STEM PARAGRAPH SIGN ORNAMENT
-0xA2	0x2762	# HEAVY EXCLAMATION MARK ORNAMENT
-0xA3	0x2763	# HEAVY HEART EXCLAMATION MARK ORNAMENT
-0xA4	0x2764	# HEAVY BLACK HEART
-0xA5	0x2765	# ROTATED HEAVY BLACK HEART BULLET
-0xA6	0x2766	# FLORAL HEART
-0xA7	0x2767	# ROTATED FLORAL HEART BULLET
-0xA8	0x2663	# BLACK CLUB SUIT
-0xA9	0x2666	# BLACK DIAMOND SUIT
-0xAA	0x2665	# BLACK HEART SUIT
-0xAB	0x2660	# BLACK SPADE SUIT
-0xAC	0x2460	# CIRCLED DIGIT ONE
-0xAD	0x2461	# CIRCLED DIGIT TWO
-0xAE	0x2462	# CIRCLED DIGIT THREE
-0xAF	0x2463	# CIRCLED DIGIT FOUR
-0xB0	0x2464	# CIRCLED DIGIT FIVE
-0xB1	0x2465	# CIRCLED DIGIT SIX
-0xB2	0x2466	# CIRCLED DIGIT SEVEN
-0xB3	0x2467	# CIRCLED DIGIT EIGHT
-0xB4	0x2468	# CIRCLED DIGIT NINE
-0xB5	0x2469	# CIRCLED NUMBER TEN
-0xB6	0x2776	# DINGBAT NEGATIVE CIRCLED DIGIT ONE
-0xB7	0x2777	# DINGBAT NEGATIVE CIRCLED DIGIT TWO
-0xB8	0x2778	# DINGBAT NEGATIVE CIRCLED DIGIT THREE
-0xB9	0x2779	# DINGBAT NEGATIVE CIRCLED DIGIT FOUR
-0xBA	0x277A	# DINGBAT NEGATIVE CIRCLED DIGIT FIVE
-0xBB	0x277B	# DINGBAT NEGATIVE CIRCLED DIGIT SIX
-0xBC	0x277C	# DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
-0xBD	0x277D	# DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
-0xBE	0x277E	# DINGBAT NEGATIVE CIRCLED DIGIT NINE
-0xBF	0x277F	# DINGBAT NEGATIVE CIRCLED NUMBER TEN
-0xC0	0x2780	# DINGBAT CIRCLED SANS-SERIF DIGIT ONE
-0xC1	0x2781	# DINGBAT CIRCLED SANS-SERIF DIGIT TWO
-0xC2	0x2782	# DINGBAT CIRCLED SANS-SERIF DIGIT THREE
-0xC3	0x2783	# DINGBAT CIRCLED SANS-SERIF DIGIT FOUR
-0xC4	0x2784	# DINGBAT CIRCLED SANS-SERIF DIGIT FIVE
-0xC5	0x2785	# DINGBAT CIRCLED SANS-SERIF DIGIT SIX
-0xC6	0x2786	# DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN
-0xC7	0x2787	# DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT
-0xC8	0x2788	# DINGBAT CIRCLED SANS-SERIF DIGIT NINE
-0xC9	0x2789	# DINGBAT CIRCLED SANS-SERIF NUMBER TEN
-0xCA	0x278A	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE
-0xCB	0x278B	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO
-0xCC	0x278C	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE
-0xCD	0x278D	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR
-0xCE	0x278E	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE
-0xCF	0x278F	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX
-0xD0	0x2790	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN
-0xD1	0x2791	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT
-0xD2	0x2792	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE
-0xD3	0x2793	# DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
-0xD4	0x2794	# HEAVY WIDE-HEADED RIGHTWARDS ARROW
-0xD5	0x2192	# RIGHTWARDS ARROW
-0xD6	0x2194	# LEFT RIGHT ARROW
-0xD7	0x2195	# UP DOWN ARROW
-0xD8	0x2798	# HEAVY SOUTH EAST ARROW
-0xD9	0x2799	# HEAVY RIGHTWARDS ARROW
-0xDA	0x279A	# HEAVY NORTH EAST ARROW
-0xDB	0x279B	# DRAFTING POINT RIGHTWARDS ARROW
-0xDC	0x279C	# HEAVY ROUND-TIPPED RIGHTWARDS ARROW
-0xDD	0x279D	# TRIANGLE-HEADED RIGHTWARDS ARROW
-0xDE	0x279E	# HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW
-0xDF	0x279F	# DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-0xE0	0x27A0	# HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-0xE1	0x27A1	# BLACK RIGHTWARDS ARROW
-0xE2	0x27A2	# THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD
-0xE3	0x27A3	# THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD
-0xE4	0x27A4	# BLACK RIGHTWARDS ARROWHEAD
-0xE5	0x27A5	# HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW
-0xE6	0x27A6	# HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW
-0xE7	0x27A7	# SQUAT BLACK RIGHTWARDS ARROW
-0xE8	0x27A8	# HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW
-0xE9	0x27A9	# RIGHT-SHADED WHITE RIGHTWARDS ARROW
-0xEA	0x27AA	# LEFT-SHADED WHITE RIGHTWARDS ARROW
-0xEB	0x27AB	# BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-0xEC	0x27AC	# FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-0xED	0x27AD	# HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xEE	0x27AE	# HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xEF	0x27AF	# NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xF1	0x27B1	# NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xF2	0x27B2	# CIRCLED HEAVY WHITE RIGHTWARDS ARROW
-0xF3	0x27B3	# WHITE-FEATHERED RIGHTWARDS ARROW
-0xF4	0x27B4	# BLACK-FEATHERED SOUTH EAST ARROW
-0xF5	0x27B5	# BLACK-FEATHERED RIGHTWARDS ARROW
-0xF6	0x27B6	# BLACK-FEATHERED NORTH EAST ARROW
-0xF7	0x27B7	# HEAVY BLACK-FEATHERED SOUTH EAST ARROW
-0xF8	0x27B8	# HEAVY BLACK-FEATHERED RIGHTWARDS ARROW
-0xF9	0x27B9	# HEAVY BLACK-FEATHERED NORTH EAST ARROW
-0xFA	0x27BA	# TEARDROP-BARBED RIGHTWARDS ARROW
-0xFB	0x27BB	# HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW
-0xFC	0x27BC	# WEDGE-TAILED RIGHTWARDS ARROW
-0xFD	0x27BD	# HEAVY WEDGE-TAILED RIGHTWARDS ARROW
-0xFE	0x27BE	# OPEN OUTLINED RIGHTWARDS ARROW
diff --git a/tools/encoding/gb12345.txt b/tools/encoding/gb12345.txt
deleted file mode 100644
index 1e06637..0000000
--- a/tools/encoding/gb12345.txt
+++ /dev/null
@@ -1,7604 +0,0 @@
-#
-#	Name:             GB12345-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d1
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB12345-90 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB12345 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB12345 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB12345 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x2121	0x3000	# IDEOGRAPHIC SPACE
-0x2122	0x3001	# IDEOGRAPHIC COMMA
-0x2123	0x3002	# IDEOGRAPHIC FULL STOP
-0x2124	0x30FB	# KATAKANA MIDDLE DOT
-0x2125	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
-0x2126	0x02C7	# CARON (Mandarin Chinese third tone)
-0x2127	0x00A8	# DIAERESIS
-0x2128	0x3003	# DITTO MARK
-0x2129	0x3005	# IDEOGRAPHIC ITERATION MARK
-0x212A	0x2015	# HORIZONTAL BAR
-0x212B	0xFF5E	# FULLWIDTH TILDE
-0x212C	0x2225	# PARALLEL TO
-0x212D	0x2026	# HORIZONTAL ELLIPSIS
-0x212E	0x2018	# LEFT SINGLE QUOTATION MARK
-0x212F	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x2130	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x2131	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x2132	0x3014	# LEFT TORTOISE SHELL BRACKET
-0x2133	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0x2134	0x3008	# LEFT ANGLE BRACKET
-0x2135	0x3009	# RIGHT ANGLE BRACKET
-0x2136	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0x2137	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0x2138	0x300C	# LEFT CORNER BRACKET
-0x2139	0x300D	# RIGHT CORNER BRACKET
-0x213A	0x300E	# LEFT WHITE CORNER BRACKET
-0x213B	0x300F	# RIGHT WHITE CORNER BRACKET
-0x213C	0x3016	# LEFT WHITE LENTICULAR BRACKET
-0x213D	0x3017	# RIGHT WHITE LENTICULAR BRACKET
-0x213E	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0x213F	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0x2140	0x00B1	# PLUS-MINUS SIGN
-0x2141	0x00D7	# MULTIPLICATION SIGN
-0x2142	0x00F7	# DIVISION SIGN
-0x2143	0x2236	# RATIO
-0x2144	0x2227	# LOGICAL AND
-0x2145	0x2228	# LOGICAL OR
-0x2146	0x2211	# N-ARY SUMMATION
-0x2147	0x220F	# N-ARY PRODUCT
-0x2148	0x222A	# UNION
-0x2149	0x2229	# INTERSECTION
-0x214A	0x2208	# ELEMENT OF
-0x214B	0x2237	# PROPORTION
-0x214C	0x221A	# SQUARE ROOT
-0x214D	0x22A5	# UP TACK
-0x214E	0x2225	# PARALLEL TO
-0x214F	0x2220	# ANGLE
-0x2150	0x2312	# ARC
-0x2151	0x2299	# CIRCLED DOT OPERATOR
-0x2152	0x222B	# INTEGRAL
-0x2153	0x222E	# CONTOUR INTEGRAL
-0x2154	0x2261	# IDENTICAL TO
-0x2155	0x224C	# ALL EQUAL TO
-0x2156	0x2248	# ALMOST EQUAL TO
-0x2157	0x223D	# REVERSED TILDE
-0x2158	0x221D	# PROPORTIONAL TO
-0x2159	0x2260	# NOT EQUAL TO
-0x215A	0x226E	# NOT LESS-THAN
-0x215B	0x226F	# NOT GREATER-THAN
-0x215C	0x2264	# LESS-THAN OR EQUAL TO
-0x215D	0x2265	# GREATER-THAN OR EQUAL TO
-0x215E	0x221E	# INFINITY
-0x215F	0x2235	# BECAUSE
-0x2160	0x2234	# THEREFORE
-0x2161	0x2642	# MALE SIGN
-0x2162	0x2640	# FEMALE SIGN
-0x2163	0x00B0	# DEGREE SIGN
-0x2164	0x2032	# PRIME
-0x2165	0x2033	# DOUBLE PRIME
-0x2166	0x2103	# DEGREE CELSIUS
-0x2167	0xFF04	# FULLWIDTH DOLLAR SIGN
-0x2168	0x00A4	# CURRENCY SIGN
-0x2169	0xFFE0	# FULLWIDTH CENT SIGN
-0x216A	0xFFE1	# FULLWIDTH POUND SIGN
-0x216B	0x2030	# PER MILLE SIGN
-0x216C	0x00A7	# SECTION SIGN
-0x216D	0x2116	# NUMERO SIGN
-0x216E	0x2606	# WHITE STAR
-0x216F	0x2605	# BLACK STAR
-0x2170	0x25CB	# WHITE CIRCLE
-0x2171	0x25CF	# BLACK CIRCLE
-0x2172	0x25CE	# BULLSEYE
-0x2173	0x25C7	# WHITE DIAMOND
-0x2174	0x25C6	# BLACK DIAMOND
-0x2175	0x25A1	# WHITE SQUARE
-0x2176	0x25A0	# BLACK SQUARE
-0x2177	0x25B3	# WHITE UP-POINTING TRIANGLE
-0x2178	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x2179	0x203B	# REFERENCE MARK
-0x217A	0x2192	# RIGHTWARDS ARROW
-0x217B	0x2190	# LEFTWARDS ARROW
-0x217C	0x2191	# UPWARDS ARROW
-0x217D	0x2193	# DOWNWARDS ARROW
-0x217E	0x3013	# GETA MARK
-0x2231	0x2488	# DIGIT ONE FULL STOP
-0x2232	0x2489	# DIGIT TWO FULL STOP
-0x2233	0x248A	# DIGIT THREE FULL STOP
-0x2234	0x248B	# DIGIT FOUR FULL STOP
-0x2235	0x248C	# DIGIT FIVE FULL STOP
-0x2236	0x248D	# DIGIT SIX FULL STOP
-0x2237	0x248E	# DIGIT SEVEN FULL STOP
-0x2238	0x248F	# DIGIT EIGHT FULL STOP
-0x2239	0x2490	# DIGIT NINE FULL STOP
-0x223A	0x2491	# NUMBER TEN FULL STOP
-0x223B	0x2492	# NUMBER ELEVEN FULL STOP
-0x223C	0x2493	# NUMBER TWELVE FULL STOP
-0x223D	0x2494	# NUMBER THIRTEEN FULL STOP
-0x223E	0x2495	# NUMBER FOURTEEN FULL STOP
-0x223F	0x2496	# NUMBER FIFTEEN FULL STOP
-0x2240	0x2497	# NUMBER SIXTEEN FULL STOP
-0x2241	0x2498	# NUMBER SEVENTEEN FULL STOP
-0x2242	0x2499	# NUMBER EIGHTEEN FULL STOP
-0x2243	0x249A	# NUMBER NINETEEN FULL STOP
-0x2244	0x249B	# NUMBER TWENTY FULL STOP
-0x2245	0x2474	# PARENTHESIZED DIGIT ONE
-0x2246	0x2475	# PARENTHESIZED DIGIT TWO
-0x2247	0x2476	# PARENTHESIZED DIGIT THREE
-0x2248	0x2477	# PARENTHESIZED DIGIT FOUR
-0x2249	0x2478	# PARENTHESIZED DIGIT FIVE
-0x224A	0x2479	# PARENTHESIZED DIGIT SIX
-0x224B	0x247A	# PARENTHESIZED DIGIT SEVEN
-0x224C	0x247B	# PARENTHESIZED DIGIT EIGHT
-0x224D	0x247C	# PARENTHESIZED DIGIT NINE
-0x224E	0x247D	# PARENTHESIZED NUMBER TEN
-0x224F	0x247E	# PARENTHESIZED NUMBER ELEVEN
-0x2250	0x247F	# PARENTHESIZED NUMBER TWELVE
-0x2251	0x2480	# PARENTHESIZED NUMBER THIRTEEN
-0x2252	0x2481	# PARENTHESIZED NUMBER FOURTEEN
-0x2253	0x2482	# PARENTHESIZED NUMBER FIFTEEN
-0x2254	0x2483	# PARENTHESIZED NUMBER SIXTEEN
-0x2255	0x2484	# PARENTHESIZED NUMBER SEVENTEEN
-0x2256	0x2485	# PARENTHESIZED NUMBER EIGHTEEN
-0x2257	0x2486	# PARENTHESIZED NUMBER NINETEEN
-0x2258	0x2487	# PARENTHESIZED NUMBER TWENTY
-0x2259	0x2460	# CIRCLED DIGIT ONE
-0x225A	0x2461	# CIRCLED DIGIT TWO
-0x225B	0x2462	# CIRCLED DIGIT THREE
-0x225C	0x2463	# CIRCLED DIGIT FOUR
-0x225D	0x2464	# CIRCLED DIGIT FIVE
-0x225E	0x2465	# CIRCLED DIGIT SIX
-0x225F	0x2466	# CIRCLED DIGIT SEVEN
-0x2260	0x2467	# CIRCLED DIGIT EIGHT
-0x2261	0x2468	# CIRCLED DIGIT NINE
-0x2262	0x2469	# CIRCLED NUMBER TEN
-0x2265	0x3220	# PARENTHESIZED IDEOGRAPH ONE
-0x2266	0x3221	# PARENTHESIZED IDEOGRAPH TWO
-0x2267	0x3222	# PARENTHESIZED IDEOGRAPH THREE
-0x2268	0x3223	# PARENTHESIZED IDEOGRAPH FOUR
-0x2269	0x3224	# PARENTHESIZED IDEOGRAPH FIVE
-0x226A	0x3225	# PARENTHESIZED IDEOGRAPH SIX
-0x226B	0x3226	# PARENTHESIZED IDEOGRAPH SEVEN
-0x226C	0x3227	# PARENTHESIZED IDEOGRAPH EIGHT
-0x226D	0x3228	# PARENTHESIZED IDEOGRAPH NINE
-0x226E	0x3229	# PARENTHESIZED IDEOGRAPH TEN
-0x2271	0x2160	# ROMAN NUMERAL ONE
-0x2272	0x2161	# ROMAN NUMERAL TWO
-0x2273	0x2162	# ROMAN NUMERAL THREE
-0x2274	0x2163	# ROMAN NUMERAL FOUR
-0x2275	0x2164	# ROMAN NUMERAL FIVE
-0x2276	0x2165	# ROMAN NUMERAL SIX
-0x2277	0x2166	# ROMAN NUMERAL SEVEN
-0x2278	0x2167	# ROMAN NUMERAL EIGHT
-0x2279	0x2168	# ROMAN NUMERAL NINE
-0x227A	0x2169	# ROMAN NUMERAL TEN
-0x227B	0x216A	# ROMAN NUMERAL ELEVEN
-0x227C	0x216B	# ROMAN NUMERAL TWELVE
-0x2321	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0x2322	0xFF02	# FULLWIDTH QUOTATION MARK
-0x2323	0xFF03	# FULLWIDTH NUMBER SIGN
-0x2324	0xFFE5	# FULLWIDTH YEN SIGN
-0x2325	0xFF05	# FULLWIDTH PERCENT SIGN
-0x2326	0xFF06	# FULLWIDTH AMPERSAND
-0x2327	0xFF07	# FULLWIDTH APOSTROPHE
-0x2328	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0x2329	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0x232A	0xFF0A	# FULLWIDTH ASTERISK
-0x232B	0xFF0B	# FULLWIDTH PLUS SIGN
-0x232C	0xFF0C	# FULLWIDTH COMMA
-0x232D	0xFF0D	# FULLWIDTH HYPHEN-MINUS
-0x232E	0xFF0E	# FULLWIDTH FULL STOP
-0x232F	0xFF0F	# FULLWIDTH SOLIDUS
-0x2330	0xFF10	# FULLWIDTH DIGIT ZERO
-0x2331	0xFF11	# FULLWIDTH DIGIT ONE
-0x2332	0xFF12	# FULLWIDTH DIGIT TWO
-0x2333	0xFF13	# FULLWIDTH DIGIT THREE
-0x2334	0xFF14	# FULLWIDTH DIGIT FOUR
-0x2335	0xFF15	# FULLWIDTH DIGIT FIVE
-0x2336	0xFF16	# FULLWIDTH DIGIT SIX
-0x2337	0xFF17	# FULLWIDTH DIGIT SEVEN
-0x2338	0xFF18	# FULLWIDTH DIGIT EIGHT
-0x2339	0xFF19	# FULLWIDTH DIGIT NINE
-0x233A	0xFF1A	# FULLWIDTH COLON
-0x233B	0xFF1B	# FULLWIDTH SEMICOLON
-0x233C	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0x233D	0xFF1D	# FULLWIDTH EQUALS SIGN
-0x233E	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0x233F	0xFF1F	# FULLWIDTH QUESTION MARK
-0x2340	0xFF20	# FULLWIDTH COMMERCIAL AT
-0x2341	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0x2342	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0x2343	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0x2344	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0x2345	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0x2346	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0x2347	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0x2348	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0x2349	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0x234A	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0x234B	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0x234C	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0x234D	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0x234E	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0x234F	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0x2350	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0x2351	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0x2352	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0x2353	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0x2354	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0x2355	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0x2356	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0x2357	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0x2358	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0x2359	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0x235A	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0x235B	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
-0x235C	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
-0x235D	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
-0x235E	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
-0x235F	0xFF3F	# FULLWIDTH LOW LINE
-0x2360	0xFF40	# FULLWIDTH GRAVE ACCENT
-0x2361	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0x2362	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0x2363	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0x2364	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0x2365	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0x2366	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0x2367	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0x2368	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0x2369	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0x236A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0x236B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0x236C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0x236D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0x236E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0x236F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0x2370	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0x2371	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0x2372	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0x2373	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0x2374	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0x2375	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0x2376	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0x2377	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0x2378	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0x2379	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0x237A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0x237B	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0x237C	0xFF5C	# FULLWIDTH VERTICAL LINE
-0x237D	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0x237E	0xFFE3	# FULLWIDTH MACRON
-0x2421	0x3041	# HIRAGANA LETTER SMALL A
-0x2422	0x3042	# HIRAGANA LETTER A
-0x2423	0x3043	# HIRAGANA LETTER SMALL I
-0x2424	0x3044	# HIRAGANA LETTER I
-0x2425	0x3045	# HIRAGANA LETTER SMALL U
-0x2426	0x3046	# HIRAGANA LETTER U
-0x2427	0x3047	# HIRAGANA LETTER SMALL E
-0x2428	0x3048	# HIRAGANA LETTER E
-0x2429	0x3049	# HIRAGANA LETTER SMALL O
-0x242A	0x304A	# HIRAGANA LETTER O
-0x242B	0x304B	# HIRAGANA LETTER KA
-0x242C	0x304C	# HIRAGANA LETTER GA
-0x242D	0x304D	# HIRAGANA LETTER KI
-0x242E	0x304E	# HIRAGANA LETTER GI
-0x242F	0x304F	# HIRAGANA LETTER KU
-0x2430	0x3050	# HIRAGANA LETTER GU
-0x2431	0x3051	# HIRAGANA LETTER KE
-0x2432	0x3052	# HIRAGANA LETTER GE
-0x2433	0x3053	# HIRAGANA LETTER KO
-0x2434	0x3054	# HIRAGANA LETTER GO
-0x2435	0x3055	# HIRAGANA LETTER SA
-0x2436	0x3056	# HIRAGANA LETTER ZA
-0x2437	0x3057	# HIRAGANA LETTER SI
-0x2438	0x3058	# HIRAGANA LETTER ZI
-0x2439	0x3059	# HIRAGANA LETTER SU
-0x243A	0x305A	# HIRAGANA LETTER ZU
-0x243B	0x305B	# HIRAGANA LETTER SE
-0x243C	0x305C	# HIRAGANA LETTER ZE
-0x243D	0x305D	# HIRAGANA LETTER SO
-0x243E	0x305E	# HIRAGANA LETTER ZO
-0x243F	0x305F	# HIRAGANA LETTER TA
-0x2440	0x3060	# HIRAGANA LETTER DA
-0x2441	0x3061	# HIRAGANA LETTER TI
-0x2442	0x3062	# HIRAGANA LETTER DI
-0x2443	0x3063	# HIRAGANA LETTER SMALL TU
-0x2444	0x3064	# HIRAGANA LETTER TU
-0x2445	0x3065	# HIRAGANA LETTER DU
-0x2446	0x3066	# HIRAGANA LETTER TE
-0x2447	0x3067	# HIRAGANA LETTER DE
-0x2448	0x3068	# HIRAGANA LETTER TO
-0x2449	0x3069	# HIRAGANA LETTER DO
-0x244A	0x306A	# HIRAGANA LETTER NA
-0x244B	0x306B	# HIRAGANA LETTER NI
-0x244C	0x306C	# HIRAGANA LETTER NU
-0x244D	0x306D	# HIRAGANA LETTER NE
-0x244E	0x306E	# HIRAGANA LETTER NO
-0x244F	0x306F	# HIRAGANA LETTER HA
-0x2450	0x3070	# HIRAGANA LETTER BA
-0x2451	0x3071	# HIRAGANA LETTER PA
-0x2452	0x3072	# HIRAGANA LETTER HI
-0x2453	0x3073	# HIRAGANA LETTER BI
-0x2454	0x3074	# HIRAGANA LETTER PI
-0x2455	0x3075	# HIRAGANA LETTER HU
-0x2456	0x3076	# HIRAGANA LETTER BU
-0x2457	0x3077	# HIRAGANA LETTER PU
-0x2458	0x3078	# HIRAGANA LETTER HE
-0x2459	0x3079	# HIRAGANA LETTER BE
-0x245A	0x307A	# HIRAGANA LETTER PE
-0x245B	0x307B	# HIRAGANA LETTER HO
-0x245C	0x307C	# HIRAGANA LETTER BO
-0x245D	0x307D	# HIRAGANA LETTER PO
-0x245E	0x307E	# HIRAGANA LETTER MA
-0x245F	0x307F	# HIRAGANA LETTER MI
-0x2460	0x3080	# HIRAGANA LETTER MU
-0x2461	0x3081	# HIRAGANA LETTER ME
-0x2462	0x3082	# HIRAGANA LETTER MO
-0x2463	0x3083	# HIRAGANA LETTER SMALL YA
-0x2464	0x3084	# HIRAGANA LETTER YA
-0x2465	0x3085	# HIRAGANA LETTER SMALL YU
-0x2466	0x3086	# HIRAGANA LETTER YU
-0x2467	0x3087	# HIRAGANA LETTER SMALL YO
-0x2468	0x3088	# HIRAGANA LETTER YO
-0x2469	0x3089	# HIRAGANA LETTER RA
-0x246A	0x308A	# HIRAGANA LETTER RI
-0x246B	0x308B	# HIRAGANA LETTER RU
-0x246C	0x308C	# HIRAGANA LETTER RE
-0x246D	0x308D	# HIRAGANA LETTER RO
-0x246E	0x308E	# HIRAGANA LETTER SMALL WA
-0x246F	0x308F	# HIRAGANA LETTER WA
-0x2470	0x3090	# HIRAGANA LETTER WI
-0x2471	0x3091	# HIRAGANA LETTER WE
-0x2472	0x3092	# HIRAGANA LETTER WO
-0x2473	0x3093	# HIRAGANA LETTER N
-0x2521	0x30A1	# KATAKANA LETTER SMALL A
-0x2522	0x30A2	# KATAKANA LETTER A
-0x2523	0x30A3	# KATAKANA LETTER SMALL I
-0x2524	0x30A4	# KATAKANA LETTER I
-0x2525	0x30A5	# KATAKANA LETTER SMALL U
-0x2526	0x30A6	# KATAKANA LETTER U
-0x2527	0x30A7	# KATAKANA LETTER SMALL E
-0x2528	0x30A8	# KATAKANA LETTER E
-0x2529	0x30A9	# KATAKANA LETTER SMALL O
-0x252A	0x30AA	# KATAKANA LETTER O
-0x252B	0x30AB	# KATAKANA LETTER KA
-0x252C	0x30AC	# KATAKANA LETTER GA
-0x252D	0x30AD	# KATAKANA LETTER KI
-0x252E	0x30AE	# KATAKANA LETTER GI
-0x252F	0x30AF	# KATAKANA LETTER KU
-0x2530	0x30B0	# KATAKANA LETTER GU
-0x2531	0x30B1	# KATAKANA LETTER KE
-0x2532	0x30B2	# KATAKANA LETTER GE
-0x2533	0x30B3	# KATAKANA LETTER KO
-0x2534	0x30B4	# KATAKANA LETTER GO
-0x2535	0x30B5	# KATAKANA LETTER SA
-0x2536	0x30B6	# KATAKANA LETTER ZA
-0x2537	0x30B7	# KATAKANA LETTER SI
-0x2538	0x30B8	# KATAKANA LETTER ZI
-0x2539	0x30B9	# KATAKANA LETTER SU
-0x253A	0x30BA	# KATAKANA LETTER ZU
-0x253B	0x30BB	# KATAKANA LETTER SE
-0x253C	0x30BC	# KATAKANA LETTER ZE
-0x253D	0x30BD	# KATAKANA LETTER SO
-0x253E	0x30BE	# KATAKANA LETTER ZO
-0x253F	0x30BF	# KATAKANA LETTER TA
-0x2540	0x30C0	# KATAKANA LETTER DA
-0x2541	0x30C1	# KATAKANA LETTER TI
-0x2542	0x30C2	# KATAKANA LETTER DI
-0x2543	0x30C3	# KATAKANA LETTER SMALL TU
-0x2544	0x30C4	# KATAKANA LETTER TU
-0x2545	0x30C5	# KATAKANA LETTER DU
-0x2546	0x30C6	# KATAKANA LETTER TE
-0x2547	0x30C7	# KATAKANA LETTER DE
-0x2548	0x30C8	# KATAKANA LETTER TO
-0x2549	0x30C9	# KATAKANA LETTER DO
-0x254A	0x30CA	# KATAKANA LETTER NA
-0x254B	0x30CB	# KATAKANA LETTER NI
-0x254C	0x30CC	# KATAKANA LETTER NU
-0x254D	0x30CD	# KATAKANA LETTER NE
-0x254E	0x30CE	# KATAKANA LETTER NO
-0x254F	0x30CF	# KATAKANA LETTER HA
-0x2550	0x30D0	# KATAKANA LETTER BA
-0x2551	0x30D1	# KATAKANA LETTER PA
-0x2552	0x30D2	# KATAKANA LETTER HI
-0x2553	0x30D3	# KATAKANA LETTER BI
-0x2554	0x30D4	# KATAKANA LETTER PI
-0x2555	0x30D5	# KATAKANA LETTER HU
-0x2556	0x30D6	# KATAKANA LETTER BU
-0x2557	0x30D7	# KATAKANA LETTER PU
-0x2558	0x30D8	# KATAKANA LETTER HE
-0x2559	0x30D9	# KATAKANA LETTER BE
-0x255A	0x30DA	# KATAKANA LETTER PE
-0x255B	0x30DB	# KATAKANA LETTER HO
-0x255C	0x30DC	# KATAKANA LETTER BO
-0x255D	0x30DD	# KATAKANA LETTER PO
-0x255E	0x30DE	# KATAKANA LETTER MA
-0x255F	0x30DF	# KATAKANA LETTER MI
-0x2560	0x30E0	# KATAKANA LETTER MU
-0x2561	0x30E1	# KATAKANA LETTER ME
-0x2562	0x30E2	# KATAKANA LETTER MO
-0x2563	0x30E3	# KATAKANA LETTER SMALL YA
-0x2564	0x30E4	# KATAKANA LETTER YA
-0x2565	0x30E5	# KATAKANA LETTER SMALL YU
-0x2566	0x30E6	# KATAKANA LETTER YU
-0x2567	0x30E7	# KATAKANA LETTER SMALL YO
-0x2568	0x30E8	# KATAKANA LETTER YO
-0x2569	0x30E9	# KATAKANA LETTER RA
-0x256A	0x30EA	# KATAKANA LETTER RI
-0x256B	0x30EB	# KATAKANA LETTER RU
-0x256C	0x30EC	# KATAKANA LETTER RE
-0x256D	0x30ED	# KATAKANA LETTER RO
-0x256E	0x30EE	# KATAKANA LETTER SMALL WA
-0x256F	0x30EF	# KATAKANA LETTER WA
-0x2570	0x30F0	# KATAKANA LETTER WI
-0x2571	0x30F1	# KATAKANA LETTER WE
-0x2572	0x30F2	# KATAKANA LETTER WO
-0x2573	0x30F3	# KATAKANA LETTER N
-0x2574	0x30F4	# KATAKANA LETTER VU
-0x2575	0x30F5	# KATAKANA LETTER SMALL KA
-0x2576	0x30F6	# KATAKANA LETTER SMALL KE
-0x2621	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x2622	0x0392	# GREEK CAPITAL LETTER BETA
-0x2623	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x2624	0x0394	# GREEK CAPITAL LETTER DELTA
-0x2625	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x2626	0x0396	# GREEK CAPITAL LETTER ZETA
-0x2627	0x0397	# GREEK CAPITAL LETTER ETA
-0x2628	0x0398	# GREEK CAPITAL LETTER THETA
-0x2629	0x0399	# GREEK CAPITAL LETTER IOTA
-0x262A	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x262B	0x039B	# GREEK CAPITAL LETTER LAMDA
-0x262C	0x039C	# GREEK CAPITAL LETTER MU
-0x262D	0x039D	# GREEK CAPITAL LETTER NU
-0x262E	0x039E	# GREEK CAPITAL LETTER XI
-0x262F	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x2630	0x03A0	# GREEK CAPITAL LETTER PI
-0x2631	0x03A1	# GREEK CAPITAL LETTER RHO
-0x2632	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x2633	0x03A4	# GREEK CAPITAL LETTER TAU
-0x2634	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x2635	0x03A6	# GREEK CAPITAL LETTER PHI
-0x2636	0x03A7	# GREEK CAPITAL LETTER CHI
-0x2637	0x03A8	# GREEK CAPITAL LETTER PSI
-0x2638	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x2641	0x03B1	# GREEK SMALL LETTER ALPHA
-0x2642	0x03B2	# GREEK SMALL LETTER BETA
-0x2643	0x03B3	# GREEK SMALL LETTER GAMMA
-0x2644	0x03B4	# GREEK SMALL LETTER DELTA
-0x2645	0x03B5	# GREEK SMALL LETTER EPSILON
-0x2646	0x03B6	# GREEK SMALL LETTER ZETA
-0x2647	0x03B7	# GREEK SMALL LETTER ETA
-0x2648	0x03B8	# GREEK SMALL LETTER THETA
-0x2649	0x03B9	# GREEK SMALL LETTER IOTA
-0x264A	0x03BA	# GREEK SMALL LETTER KAPPA
-0x264B	0x03BB	# GREEK SMALL LETTER LAMDA
-0x264C	0x03BC	# GREEK SMALL LETTER MU
-0x264D	0x03BD	# GREEK SMALL LETTER NU
-0x264E	0x03BE	# GREEK SMALL LETTER XI
-0x264F	0x03BF	# GREEK SMALL LETTER OMICRON
-0x2650	0x03C0	# GREEK SMALL LETTER PI
-0x2651	0x03C1	# GREEK SMALL LETTER RHO
-0x2652	0x03C3	# GREEK SMALL LETTER SIGMA
-0x2653	0x03C4	# GREEK SMALL LETTER TAU
-0x2654	0x03C5	# GREEK SMALL LETTER UPSILON
-0x2655	0x03C6	# GREEK SMALL LETTER PHI
-0x2656	0x03C7	# GREEK SMALL LETTER CHI
-0x2657	0x03C8	# GREEK SMALL LETTER PSI
-0x2658	0x03C9	# GREEK SMALL LETTER OMEGA
-0x2721	0x0410	# CYRILLIC CAPITAL LETTER A
-0x2722	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x2723	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x2724	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x2725	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x2726	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x2727	0x0401	# CYRILLIC CAPITAL LETTER IO
-0x2728	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x2729	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x272A	0x0418	# CYRILLIC CAPITAL LETTER I
-0x272B	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x272C	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x272D	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x272E	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x272F	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x2730	0x041E	# CYRILLIC CAPITAL LETTER O
-0x2731	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x2732	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x2733	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x2734	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x2735	0x0423	# CYRILLIC CAPITAL LETTER U
-0x2736	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x2737	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x2738	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x2739	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x273A	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x273B	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x273C	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x273D	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x273E	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x273F	0x042D	# CYRILLIC CAPITAL LETTER E
-0x2740	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x2741	0x042F	# CYRILLIC CAPITAL LETTER YA
-0x2751	0x0430	# CYRILLIC SMALL LETTER A
-0x2752	0x0431	# CYRILLIC SMALL LETTER BE
-0x2753	0x0432	# CYRILLIC SMALL LETTER VE
-0x2754	0x0433	# CYRILLIC SMALL LETTER GHE
-0x2755	0x0434	# CYRILLIC SMALL LETTER DE
-0x2756	0x0435	# CYRILLIC SMALL LETTER IE
-0x2757	0x0451	# CYRILLIC SMALL LETTER IO
-0x2758	0x0436	# CYRILLIC SMALL LETTER ZHE
-0x2759	0x0437	# CYRILLIC SMALL LETTER ZE
-0x275A	0x0438	# CYRILLIC SMALL LETTER I
-0x275B	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0x275C	0x043A	# CYRILLIC SMALL LETTER KA
-0x275D	0x043B	# CYRILLIC SMALL LETTER EL
-0x275E	0x043C	# CYRILLIC SMALL LETTER EM
-0x275F	0x043D	# CYRILLIC SMALL LETTER EN
-0x2760	0x043E	# CYRILLIC SMALL LETTER O
-0x2761	0x043F	# CYRILLIC SMALL LETTER PE
-0x2762	0x0440	# CYRILLIC SMALL LETTER ER
-0x2763	0x0441	# CYRILLIC SMALL LETTER ES
-0x2764	0x0442	# CYRILLIC SMALL LETTER TE
-0x2765	0x0443	# CYRILLIC SMALL LETTER U
-0x2766	0x0444	# CYRILLIC SMALL LETTER EF
-0x2767	0x0445	# CYRILLIC SMALL LETTER HA
-0x2768	0x0446	# CYRILLIC SMALL LETTER TSE
-0x2769	0x0447	# CYRILLIC SMALL LETTER CHE
-0x276A	0x0448	# CYRILLIC SMALL LETTER SHA
-0x276B	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0x276C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0x276D	0x044B	# CYRILLIC SMALL LETTER YERU
-0x276E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0x276F	0x044D	# CYRILLIC SMALL LETTER E
-0x2770	0x044E	# CYRILLIC SMALL LETTER YU
-0x2771	0x044F	# CYRILLIC SMALL LETTER YA
-0x2821	0x0101	# LATIN SMALL LETTER A WITH MACRON
-0x2822	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x2823	0x01CE	# LATIN SMALL LETTER A WITH CARON
-0x2824	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x2825	0x0113	# LATIN SMALL LETTER E WITH MACRON
-0x2826	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x2827	0x011B	# LATIN SMALL LETTER E WITH CARON
-0x2828	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x2829	0x012B	# LATIN SMALL LETTER I WITH MACRON
-0x282A	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x282B	0x01D0	# LATIN SMALL LETTER I WITH CARON
-0x282C	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x282D	0x014D	# LATIN SMALL LETTER O WITH MACRON
-0x282E	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x282F	0x01D2	# LATIN SMALL LETTER O WITH CARON
-0x2830	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x2831	0x016B	# LATIN SMALL LETTER U WITH MACRON
-0x2832	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x2833	0x01D4	# LATIN SMALL LETTER U WITH CARON
-0x2834	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x2835	0x01D6	# LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-0x2836	0x01D8	# LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-0x2837	0x01DA	# LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-0x2838	0x01DC	# LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-0x2839	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0x283A	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x2845	0x3105	# BOPOMOFO LETTER B
-0x2846	0x3106	# BOPOMOFO LETTER P
-0x2847	0x3107	# BOPOMOFO LETTER M
-0x2848	0x3108	# BOPOMOFO LETTER F
-0x2849	0x3109	# BOPOMOFO LETTER D
-0x284A	0x310A	# BOPOMOFO LETTER T
-0x284B	0x310B	# BOPOMOFO LETTER N
-0x284C	0x310C	# BOPOMOFO LETTER L
-0x284D	0x310D	# BOPOMOFO LETTER G
-0x284E	0x310E	# BOPOMOFO LETTER K
-0x284F	0x310F	# BOPOMOFO LETTER H
-0x2850	0x3110	# BOPOMOFO LETTER J
-0x2851	0x3111	# BOPOMOFO LETTER Q
-0x2852	0x3112	# BOPOMOFO LETTER X
-0x2853	0x3113	# BOPOMOFO LETTER ZH
-0x2854	0x3114	# BOPOMOFO LETTER CH
-0x2855	0x3115	# BOPOMOFO LETTER SH
-0x2856	0x3116	# BOPOMOFO LETTER R
-0x2857	0x3117	# BOPOMOFO LETTER Z
-0x2858	0x3118	# BOPOMOFO LETTER C
-0x2859	0x3119	# BOPOMOFO LETTER S
-0x285A	0x311A	# BOPOMOFO LETTER A
-0x285B	0x311B	# BOPOMOFO LETTER O
-0x285C	0x311C	# BOPOMOFO LETTER E
-0x285D	0x311D	# BOPOMOFO LETTER EH
-0x285E	0x311E	# BOPOMOFO LETTER AI
-0x285F	0x311F	# BOPOMOFO LETTER EI
-0x2860	0x3120	# BOPOMOFO LETTER AU
-0x2861	0x3121	# BOPOMOFO LETTER OU
-0x2862	0x3122	# BOPOMOFO LETTER AN
-0x2863	0x3123	# BOPOMOFO LETTER EN
-0x2864	0x3124	# BOPOMOFO LETTER ANG
-0x2865	0x3125	# BOPOMOFO LETTER ENG
-0x2866	0x3126	# BOPOMOFO LETTER ER
-0x2867	0x3127	# BOPOMOFO LETTER I
-0x2868	0x3128	# BOPOMOFO LETTER U
-0x2869	0x3129	# BOPOMOFO LETTER IU
-0x2924	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x2925	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
-0x2926	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x2927	0x2503	# BOX DRAWINGS HEAVY VERTICAL
-0x2928	0x2504	# BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
-0x2929	0x2505	# BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
-0x292A	0x2506	# BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
-0x292B	0x2507	# BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
-0x292C	0x2508	# BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
-0x292D	0x2509	# BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
-0x292E	0x250A	# BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
-0x292F	0x250B	# BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
-0x2930	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x2931	0x250D	# BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
-0x2932	0x250E	# BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
-0x2933	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x2934	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x2935	0x2511	# BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
-0x2936	0x2512	# BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
-0x2937	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
-0x2938	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x2939	0x2515	# BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
-0x293A	0x2516	# BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
-0x293B	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
-0x293C	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x293D	0x2519	# BOX DRAWINGS UP LIGHT AND LEFT HEAVY
-0x293E	0x251A	# BOX DRAWINGS UP HEAVY AND LEFT LIGHT
-0x293F	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
-0x2940	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x2941	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x2942	0x251E	# BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
-0x2943	0x251F	# BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
-0x2944	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x2945	0x2521	# BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
-0x2946	0x2522	# BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
-0x2947	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x2948	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x2949	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x294A	0x2526	# BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
-0x294B	0x2527	# BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
-0x294C	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x294D	0x2529	# BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
-0x294E	0x252A	# BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
-0x294F	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x2950	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x2951	0x252D	# BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
-0x2952	0x252E	# BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
-0x2953	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x2954	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x2955	0x2531	# BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
-0x2956	0x2532	# BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
-0x2957	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x2958	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x2959	0x2535	# BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
-0x295A	0x2536	# BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
-0x295B	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x295C	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x295D	0x2539	# BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
-0x295E	0x253A	# BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
-0x295F	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x2960	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x2961	0x253D	# BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
-0x2962	0x253E	# BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
-0x2963	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x2964	0x2540	# BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
-0x2965	0x2541	# BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
-0x2966	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x2967	0x2543	# BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
-0x2968	0x2544	# BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
-0x2969	0x2545	# BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
-0x296A	0x2546	# BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
-0x296B	0x2547	# BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
-0x296C	0x2548	# BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
-0x296D	0x2549	# BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
-0x296E	0x254A	# BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
-0x296F	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x3021	0x554A	# <CJK>
-0x3022	0x963F	# <CJK>
-0x3023	0x57C3	# <CJK>
-0x3024	0x6328	# <CJK>
-0x3025	0x54CE	# <CJK>
-0x3026	0x5509	# <CJK>
-0x3027	0x54C0	# <CJK>
-0x3028	0x769A	# <CJK>
-0x3029	0x764C	# <CJK>
-0x302A	0x85F9	# <CJK>
-0x302B	0x77EE	# <CJK>
-0x302C	0x827E	# <CJK>
-0x302D	0x7919	# <CJK>
-0x302E	0x611B	# <CJK>
-0x302F	0x9698	# <CJK>
-0x3030	0x978D	# <CJK>
-0x3031	0x6C28	# <CJK>
-0x3032	0x5B89	# <CJK>
-0x3033	0x4FFA	# <CJK>
-0x3034	0x6309	# <CJK>
-0x3035	0x6697	# <CJK>
-0x3036	0x5CB8	# <CJK>
-0x3037	0x80FA	# <CJK>
-0x3038	0x6848	# <CJK>
-0x3039	0x9AAF	# <CJK>
-0x303A	0x6602	# <CJK>
-0x303B	0x76CE	# <CJK>
-0x303C	0x51F9	# <CJK>
-0x303D	0x6556	# <CJK>
-0x303E	0x71AC	# <CJK>
-0x303F	0x7FF1	# <CJK>
-0x3040	0x8956	# <CJK>
-0x3041	0x50B2	# <CJK>
-0x3042	0x5965	# <CJK>
-0x3043	0x61CA	# <CJK>
-0x3044	0x6FB3	# <CJK>
-0x3045	0x82AD	# <CJK>
-0x3046	0x634C	# <CJK>
-0x3047	0x6252	# <CJK>
-0x3048	0x53ED	# <CJK>
-0x3049	0x5427	# <CJK>
-0x304A	0x7B06	# <CJK>
-0x304B	0x516B	# <CJK>
-0x304C	0x75A4	# <CJK>
-0x304D	0x5DF4	# <CJK>
-0x304E	0x62D4	# <CJK>
-0x304F	0x8DCB	# <CJK>
-0x3050	0x9776	# <CJK>
-0x3051	0x628A	# <CJK>
-0x3052	0x8019	# <CJK>
-0x3053	0x58E9	# <CJK>
-0x3054	0x9738	# <CJK>
-0x3055	0x7F77	# <CJK>
-0x3056	0x7238	# <CJK>
-0x3057	0x767D	# <CJK>
-0x3058	0x67CF	# <CJK>
-0x3059	0x767E	# <CJK>
-0x305A	0x64FA	# <CJK>
-0x305B	0x4F70	# <CJK>
-0x305C	0x6557	# <CJK>
-0x305D	0x62DC	# <CJK>
-0x305E	0x7A17	# <CJK>
-0x305F	0x6591	# <CJK>
-0x3060	0x73ED	# <CJK>
-0x3061	0x642C	# <CJK>
-0x3062	0x6273	# <CJK>
-0x3063	0x822C	# <CJK>
-0x3064	0x9812	# <CJK>
-0x3065	0x677F	# <CJK>
-0x3066	0x7248	# <CJK>
-0x3067	0x626E	# <CJK>
-0x3068	0x62CC	# <CJK>
-0x3069	0x4F34	# <CJK>
-0x306A	0x74E3	# <CJK>
-0x306B	0x534A	# <CJK>
-0x306C	0x8FA6	# <CJK>
-0x306D	0x7D46	# <CJK>
-0x306E	0x90A6	# <CJK>
-0x306F	0x5E6B	# <CJK>
-0x3070	0x6886	# <CJK>
-0x3071	0x699C	# <CJK>
-0x3072	0x8180	# <CJK>
-0x3073	0x7D81	# <CJK>
-0x3074	0x68D2	# <CJK>
-0x3075	0x78C5	# <CJK>
-0x3076	0x868C	# <CJK>
-0x3077	0x938A	# <CJK>
-0x3078	0x508D	# <CJK>
-0x3079	0x8B17	# <CJK>
-0x307A	0x82DE	# <CJK>
-0x307B	0x80DE	# <CJK>
-0x307C	0x5305	# <CJK>
-0x307D	0x8912	# <CJK>
-0x307E	0x5265	# <CJK>
-0x3121	0x8584	# <CJK>
-0x3122	0x96F9	# <CJK>
-0x3123	0x4FDD	# <CJK>
-0x3124	0x5821	# <CJK>
-0x3125	0x98FD	# <CJK>
-0x3126	0x5BF6	# <CJK>
-0x3127	0x62B1	# <CJK>
-0x3128	0x5831	# <CJK>
-0x3129	0x66B4	# <CJK>
-0x312A	0x8C79	# <CJK>
-0x312B	0x9B91	# <CJK>
-0x312C	0x7206	# <CJK>
-0x312D	0x676F	# <CJK>
-0x312E	0x7891	# <CJK>
-0x312F	0x60B2	# <CJK>
-0x3130	0x5351	# <CJK>
-0x3131	0x5317	# <CJK>
-0x3132	0x8F29	# <CJK>
-0x3133	0x80CC	# <CJK>
-0x3134	0x8C9D	# <CJK>
-0x3135	0x92C7	# <CJK>
-0x3136	0x500D	# <CJK>
-0x3137	0x72FD	# <CJK>
-0x3138	0x5099	# <CJK>
-0x3139	0x618A	# <CJK>
-0x313A	0x7119	# <CJK>
-0x313B	0x88AB	# <CJK>
-0x313C	0x5954	# <CJK>
-0x313D	0x82EF	# <CJK>
-0x313E	0x672C	# <CJK>
-0x313F	0x7B28	# <CJK>
-0x3140	0x5D29	# <CJK>
-0x3141	0x7DB3	# <CJK>
-0x3142	0x752D	# <CJK>
-0x3143	0x6CF5	# <CJK>
-0x3144	0x8E66	# <CJK>
-0x3145	0x8FF8	# <CJK>
-0x3146	0x903C	# <CJK>
-0x3147	0x9F3B	# <CJK>
-0x3148	0x6BD4	# <CJK>
-0x3149	0x9119	# <CJK>
-0x314A	0x7B46	# <CJK>
-0x314B	0x5F7C	# <CJK>
-0x314C	0x78A7	# <CJK>
-0x314D	0x84D6	# <CJK>
-0x314E	0x853D	# <CJK>
-0x314F	0x7562	# <CJK>
-0x3150	0x6583	# <CJK>
-0x3151	0x6BD6	# <CJK>
-0x3152	0x5E63	# <CJK>
-0x3153	0x5E87	# <CJK>
-0x3154	0x75F9	# <CJK>
-0x3155	0x9589	# <CJK>
-0x3156	0x655D	# <CJK>
-0x3157	0x5F0A	# <CJK>
-0x3158	0x5FC5	# <CJK>
-0x3159	0x8F9F	# <CJK>
-0x315A	0x58C1	# <CJK>
-0x315B	0x81C2	# <CJK>
-0x315C	0x907F	# <CJK>
-0x315D	0x965B	# <CJK>
-0x315E	0x97AD	# <CJK>
-0x315F	0x908A	# <CJK>
-0x3160	0x7DE8	# <CJK>
-0x3161	0x8CB6	# <CJK>
-0x3162	0x6241	# <CJK>
-0x3163	0x4FBF	# <CJK>
-0x3164	0x8B8A	# <CJK>
-0x3165	0x535E	# <CJK>
-0x3166	0x8FA8	# <CJK>
-0x3167	0x8FAF	# <CJK>
-0x3168	0x8FAE	# <CJK>
-0x3169	0x904D	# <CJK>
-0x316A	0x6A19	# <CJK>
-0x316B	0x5F6A	# <CJK>
-0x316C	0x8198	# <CJK>
-0x316D	0x8868	# <CJK>
-0x316E	0x9C49	# <CJK>
-0x316F	0x618B	# <CJK>
-0x3170	0x522B	# <CJK>
-0x3171	0x765F	# <CJK>
-0x3172	0x5F6C	# <CJK>
-0x3173	0x658C	# <CJK>
-0x3174	0x7015	# <CJK>
-0x3175	0x6FF1	# <CJK>
-0x3176	0x8CD3	# <CJK>
-0x3177	0x64EF	# <CJK>
-0x3178	0x5175	# <CJK>
-0x3179	0x51B0	# <CJK>
-0x317A	0x67C4	# <CJK>
-0x317B	0x4E19	# <CJK>
-0x317C	0x79C9	# <CJK>
-0x317D	0x9905	# <CJK>
-0x317E	0x70B3	# <CJK>
-0x3221	0x75C5	# <CJK>
-0x3222	0x5E76	# <CJK>
-0x3223	0x73BB	# <CJK>
-0x3224	0x83E0	# <CJK>
-0x3225	0x64AD	# <CJK>
-0x3226	0x64A5	# <CJK>
-0x3227	0x9262	# <CJK>
-0x3228	0x6CE2	# <CJK>
-0x3229	0x535A	# <CJK>
-0x322A	0x52C3	# <CJK>
-0x322B	0x640F	# <CJK>
-0x322C	0x9251	# <CJK>
-0x322D	0x7B94	# <CJK>
-0x322E	0x4F2F	# <CJK>
-0x322F	0x5E1B	# <CJK>
-0x3230	0x8236	# <CJK>
-0x3231	0x8116	# <CJK>
-0x3232	0x818A	# <CJK>
-0x3233	0x6E24	# <CJK>
-0x3234	0x6CCA	# <CJK>
-0x3235	0x99C1	# <CJK>
-0x3236	0x6355	# <CJK>
-0x3237	0x535C	# <CJK>
-0x3238	0x54FA	# <CJK>
-0x3239	0x88DC	# <CJK>
-0x323A	0x57E0	# <CJK>
-0x323B	0x4E0D	# <CJK>
-0x323C	0x5E03	# <CJK>
-0x323D	0x6B65	# <CJK>
-0x323E	0x7C3F	# <CJK>
-0x323F	0x90E8	# <CJK>
-0x3240	0x6016	# <CJK>
-0x3241	0x64E6	# <CJK>
-0x3242	0x731C	# <CJK>
-0x3243	0x88C1	# <CJK>
-0x3244	0x6750	# <CJK>
-0x3245	0x624D	# <CJK>
-0x3246	0x8CA1	# <CJK>
-0x3247	0x776C	# <CJK>
-0x3248	0x8E29	# <CJK>
-0x3249	0x91C7	# <CJK>
-0x324A	0x5F69	# <CJK>
-0x324B	0x83DC	# <CJK>
-0x324C	0x8521	# <CJK>
-0x324D	0x9910	# <CJK>
-0x324E	0x53C3	# <CJK>
-0x324F	0x8836	# <CJK>
-0x3250	0x6B98	# <CJK>
-0x3251	0x615A	# <CJK>
-0x3252	0x6158	# <CJK>
-0x3253	0x71E6	# <CJK>
-0x3254	0x84BC	# <CJK>
-0x3255	0x8259	# <CJK>
-0x3256	0x5009	# <CJK>
-0x3257	0x6EC4	# <CJK>
-0x3258	0x85CF	# <CJK>
-0x3259	0x64CD	# <CJK>
-0x325A	0x7CD9	# <CJK>
-0x325B	0x69FD	# <CJK>
-0x325C	0x66F9	# <CJK>
-0x325D	0x8349	# <CJK>
-0x325E	0x53A0	# <CJK>
-0x325F	0x7B56	# <CJK>
-0x3260	0x5074	# <CJK>
-0x3261	0x518C	# <CJK>
-0x3262	0x6E2C	# <CJK>
-0x3263	0x5C64	# <CJK>
-0x3264	0x8E6D	# <CJK>
-0x3265	0x63D2	# <CJK>
-0x3266	0x53C9	# <CJK>
-0x3267	0x832C	# <CJK>
-0x3268	0x8336	# <CJK>
-0x3269	0x67E5	# <CJK>
-0x326A	0x78B4	# <CJK>
-0x326B	0x643D	# <CJK>
-0x326C	0x5BDF	# <CJK>
-0x326D	0x5C94	# <CJK>
-0x326E	0x5DEE	# <CJK>
-0x326F	0x8A6B	# <CJK>
-0x3270	0x62C6	# <CJK>
-0x3271	0x67F4	# <CJK>
-0x3272	0x8C7A	# <CJK>
-0x3273	0x6519	# <CJK>
-0x3274	0x647B	# <CJK>
-0x3275	0x87EC	# <CJK>
-0x3276	0x995E	# <CJK>
-0x3277	0x8B92	# <CJK>
-0x3278	0x7E8F	# <CJK>
-0x3279	0x93DF	# <CJK>
-0x327A	0x7523	# <CJK>
-0x327B	0x95E1	# <CJK>
-0x327C	0x986B	# <CJK>
-0x327D	0x660C	# <CJK>
-0x327E	0x7316	# <CJK>
-0x3321	0x5834	# <CJK>
-0x3322	0x5617	# <CJK>
-0x3323	0x5E38	# <CJK>
-0x3324	0x9577	# <CJK>
-0x3325	0x511F	# <CJK>
-0x3326	0x8178	# <CJK>
-0x3327	0x5EE0	# <CJK>
-0x3328	0x655E	# <CJK>
-0x3329	0x66A2	# <CJK>
-0x332A	0x5531	# <CJK>
-0x332B	0x5021	# <CJK>
-0x332C	0x8D85	# <CJK>
-0x332D	0x6284	# <CJK>
-0x332E	0x9214	# <CJK>
-0x332F	0x671D	# <CJK>
-0x3330	0x5632	# <CJK>
-0x3331	0x6F6E	# <CJK>
-0x3332	0x5DE2	# <CJK>
-0x3333	0x5435	# <CJK>
-0x3334	0x7092	# <CJK>
-0x3335	0x8ECA	# <CJK>
-0x3336	0x626F	# <CJK>
-0x3337	0x64A4	# <CJK>
-0x3338	0x63A3	# <CJK>
-0x3339	0x5FB9	# <CJK>
-0x333A	0x6F88	# <CJK>
-0x333B	0x90F4	# <CJK>
-0x333C	0x81E3	# <CJK>
-0x333D	0x8FB0	# <CJK>
-0x333E	0x5875	# <CJK>
-0x333F	0x6668	# <CJK>
-0x3340	0x5FF1	# <CJK>
-0x3341	0x6C89	# <CJK>
-0x3342	0x9673	# <CJK>
-0x3343	0x8D81	# <CJK>
-0x3344	0x896F	# <CJK>
-0x3345	0x6491	# <CJK>
-0x3346	0x7A31	# <CJK>
-0x3347	0x57CE	# <CJK>
-0x3348	0x6A59	# <CJK>
-0x3349	0x6210	# <CJK>
-0x334A	0x5448	# <CJK>
-0x334B	0x4E58	# <CJK>
-0x334C	0x7A0B	# <CJK>
-0x334D	0x61F2	# <CJK>
-0x334E	0x6F84	# <CJK>
-0x334F	0x8AA0	# <CJK>
-0x3350	0x627F	# <CJK>
-0x3351	0x901E	# <CJK>
-0x3352	0x9A01	# <CJK>
-0x3353	0x79E4	# <CJK>
-0x3354	0x5403	# <CJK>
-0x3355	0x75F4	# <CJK>
-0x3356	0x6301	# <CJK>
-0x3357	0x5319	# <CJK>
-0x3358	0x6C60	# <CJK>
-0x3359	0x9072	# <CJK>
-0x335A	0x5F1B	# <CJK>
-0x335B	0x99B3	# <CJK>
-0x335C	0x803B	# <CJK>
-0x335D	0x9F52	# <CJK>
-0x335E	0x4F88	# <CJK>
-0x335F	0x5C3A	# <CJK>
-0x3360	0x8D64	# <CJK>
-0x3361	0x7FC5	# <CJK>
-0x3362	0x65A5	# <CJK>
-0x3363	0x71BE	# <CJK>
-0x3364	0x5145	# <CJK>
-0x3365	0x885D	# <CJK>
-0x3366	0x87F2	# <CJK>
-0x3367	0x5D07	# <CJK>
-0x3368	0x5BF5	# <CJK>
-0x3369	0x62BD	# <CJK>
-0x336A	0x916C	# <CJK>
-0x336B	0x7587	# <CJK>
-0x336C	0x8E8A	# <CJK>
-0x336D	0x7A20	# <CJK>
-0x336E	0x6101	# <CJK>
-0x336F	0x7C4C	# <CJK>
-0x3370	0x4EC7	# <CJK>
-0x3371	0x7DA2	# <CJK>
-0x3372	0x7785	# <CJK>
-0x3373	0x919C	# <CJK>
-0x3374	0x81ED	# <CJK>
-0x3375	0x521D	# <CJK>
-0x3376	0x51FA	# <CJK>
-0x3377	0x6A71	# <CJK>
-0x3378	0x53A8	# <CJK>
-0x3379	0x8E87	# <CJK>
-0x337A	0x92E4	# <CJK>
-0x337B	0x96DB	# <CJK>
-0x337C	0x6EC1	# <CJK>
-0x337D	0x9664	# <CJK>
-0x337E	0x695A	# <CJK>
-0x3421	0x790E	# <CJK>
-0x3422	0x5132	# <CJK>
-0x3423	0x77D7	# <CJK>
-0x3424	0x6410	# <CJK>
-0x3425	0x89F8	# <CJK>
-0x3426	0x8655	# <CJK>
-0x3427	0x63E3	# <CJK>
-0x3428	0x5DDD	# <CJK>
-0x3429	0x7A7F	# <CJK>
-0x342A	0x693D	# <CJK>
-0x342B	0x50B3	# <CJK>
-0x342C	0x8239	# <CJK>
-0x342D	0x5598	# <CJK>
-0x342E	0x4E32	# <CJK>
-0x342F	0x7621	# <CJK>
-0x3430	0x7A97	# <CJK>
-0x3431	0x5E62	# <CJK>
-0x3432	0x5E8A	# <CJK>
-0x3433	0x95D6	# <CJK>
-0x3434	0x5275	# <CJK>
-0x3435	0x5439	# <CJK>
-0x3436	0x708A	# <CJK>
-0x3437	0x6376	# <CJK>
-0x3438	0x9318	# <CJK>
-0x3439	0x5782	# <CJK>
-0x343A	0x6625	# <CJK>
-0x343B	0x693F	# <CJK>
-0x343C	0x9187	# <CJK>
-0x343D	0x5507	# <CJK>
-0x343E	0x6DF3	# <CJK>
-0x343F	0x7D14	# <CJK>
-0x3440	0x8822	# <CJK>
-0x3441	0x6233	# <CJK>
-0x3442	0x7DBD	# <CJK>
-0x3443	0x75B5	# <CJK>
-0x3444	0x8328	# <CJK>
-0x3445	0x78C1	# <CJK>
-0x3446	0x96CC	# <CJK>
-0x3447	0x8FAD	# <CJK>
-0x3448	0x6148	# <CJK>
-0x3449	0x74F7	# <CJK>
-0x344A	0x8A5E	# <CJK>
-0x344B	0x6B64	# <CJK>
-0x344C	0x523A	# <CJK>
-0x344D	0x8CDC	# <CJK>
-0x344E	0x6B21	# <CJK>
-0x344F	0x8070	# <CJK>
-0x3450	0x8471	# <CJK>
-0x3451	0x56F1	# <CJK>
-0x3452	0x5306	# <CJK>
-0x3453	0x5F9E	# <CJK>
-0x3454	0x53E2	# <CJK>
-0x3455	0x51D1	# <CJK>
-0x3456	0x7C97	# <CJK>
-0x3457	0x918B	# <CJK>
-0x3458	0x7C07	# <CJK>
-0x3459	0x4FC3	# <CJK>
-0x345A	0x8EA5	# <CJK>
-0x345B	0x7BE1	# <CJK>
-0x345C	0x7AC4	# <CJK>
-0x345D	0x6467	# <CJK>
-0x345E	0x5D14	# <CJK>
-0x345F	0x50AC	# <CJK>
-0x3460	0x8106	# <CJK>
-0x3461	0x7601	# <CJK>
-0x3462	0x7CB9	# <CJK>
-0x3463	0x6DEC	# <CJK>
-0x3464	0x7FE0	# <CJK>
-0x3465	0x6751	# <CJK>
-0x3466	0x5B58	# <CJK>
-0x3467	0x5BF8	# <CJK>
-0x3468	0x78CB	# <CJK>
-0x3469	0x64AE	# <CJK>
-0x346A	0x6413	# <CJK>
-0x346B	0x63AA	# <CJK>
-0x346C	0x632B	# <CJK>
-0x346D	0x932F	# <CJK>
-0x346E	0x642D	# <CJK>
-0x346F	0x9054	# <CJK>
-0x3470	0x7B54	# <CJK>
-0x3471	0x7629	# <CJK>
-0x3472	0x6253	# <CJK>
-0x3473	0x5927	# <CJK>
-0x3474	0x5446	# <CJK>
-0x3475	0x6B79	# <CJK>
-0x3476	0x50A3	# <CJK>
-0x3477	0x6234	# <CJK>
-0x3478	0x5E36	# <CJK>
-0x3479	0x6B86	# <CJK>
-0x347A	0x4EE3	# <CJK>
-0x347B	0x8CB8	# <CJK>
-0x347C	0x888B	# <CJK>
-0x347D	0x5F85	# <CJK>
-0x347E	0x902E	# <CJK>
-0x3521	0x6020	# <CJK>
-0x3522	0x803D	# <CJK>
-0x3523	0x64D4	# <CJK>
-0x3524	0x4E39	# <CJK>
-0x3525	0x55AE	# <CJK>
-0x3526	0x9132	# <CJK>
-0x3527	0x64A3	# <CJK>
-0x3528	0x81BD	# <CJK>
-0x3529	0x65E6	# <CJK>
-0x352A	0x6C2E	# <CJK>
-0x352B	0x4F46	# <CJK>
-0x352C	0x619A	# <CJK>
-0x352D	0x6DE1	# <CJK>
-0x352E	0x8A95	# <CJK>
-0x352F	0x5F48	# <CJK>
-0x3530	0x86CB	# <CJK>
-0x3531	0x7576	# <CJK>
-0x3532	0x64CB	# <CJK>
-0x3533	0x9EE8	# <CJK>
-0x3534	0x8569	# <CJK>
-0x3535	0x6A94	# <CJK>
-0x3536	0x5200	# <CJK>
-0x3537	0x6417	# <CJK>
-0x3538	0x8E48	# <CJK>
-0x3539	0x5012	# <CJK>
-0x353A	0x5CF6	# <CJK>
-0x353B	0x79B1	# <CJK>
-0x353C	0x5C0E	# <CJK>
-0x353D	0x5230	# <CJK>
-0x353E	0x7A3B	# <CJK>
-0x353F	0x60BC	# <CJK>
-0x3540	0x9053	# <CJK>
-0x3541	0x76D7	# <CJK>
-0x3542	0x5FB7	# <CJK>
-0x3543	0x5F97	# <CJK>
-0x3544	0x7684	# <CJK>
-0x3545	0x8E6C	# <CJK>
-0x3546	0x71C8	# <CJK>
-0x3547	0x767B	# <CJK>
-0x3548	0x7B49	# <CJK>
-0x3549	0x77AA	# <CJK>
-0x354A	0x51F3	# <CJK>
-0x354B	0x9127	# <CJK>
-0x354C	0x5824	# <CJK>
-0x354D	0x4F4E	# <CJK>
-0x354E	0x6EF4	# <CJK>
-0x354F	0x8FEA	# <CJK>
-0x3550	0x6575	# <CJK>
-0x3551	0x7B1B	# <CJK>
-0x3552	0x72C4	# <CJK>
-0x3553	0x6ECC	# <CJK>
-0x3554	0x7FDF	# <CJK>
-0x3555	0x5AE1	# <CJK>
-0x3556	0x62B5	# <CJK>
-0x3557	0x5E95	# <CJK>
-0x3558	0x5730	# <CJK>
-0x3559	0x8482	# <CJK>
-0x355A	0x7B2C	# <CJK>
-0x355B	0x5E1D	# <CJK>
-0x355C	0x5F1F	# <CJK>
-0x355D	0x905E	# <CJK>
-0x355E	0x7DE0	# <CJK>
-0x355F	0x985B	# <CJK>
-0x3560	0x6382	# <CJK>
-0x3561	0x6EC7	# <CJK>
-0x3562	0x7898	# <CJK>
-0x3563	0x9EDE	# <CJK>
-0x3564	0x5178	# <CJK>
-0x3565	0x975B	# <CJK>
-0x3566	0x588A	# <CJK>
-0x3567	0x96FB	# <CJK>
-0x3568	0x4F43	# <CJK>
-0x3569	0x7538	# <CJK>
-0x356A	0x5E97	# <CJK>
-0x356B	0x60E6	# <CJK>
-0x356C	0x5960	# <CJK>
-0x356D	0x6FB1	# <CJK>
-0x356E	0x6BBF	# <CJK>
-0x356F	0x7889	# <CJK>
-0x3570	0x53FC	# <CJK>
-0x3571	0x96D5	# <CJK>
-0x3572	0x51CB	# <CJK>
-0x3573	0x5201	# <CJK>
-0x3574	0x6389	# <CJK>
-0x3575	0x540A	# <CJK>
-0x3576	0x91E3	# <CJK>
-0x3577	0x8ABF	# <CJK>
-0x3578	0x8DCC	# <CJK>
-0x3579	0x7239	# <CJK>
-0x357A	0x789F	# <CJK>
-0x357B	0x8776	# <CJK>
-0x357C	0x8FED	# <CJK>
-0x357D	0x8ADC	# <CJK>
-0x357E	0x758A	# <CJK>
-0x3621	0x4E01	# <CJK>
-0x3622	0x76EF	# <CJK>
-0x3623	0x53EE	# <CJK>
-0x3624	0x91D8	# <CJK>
-0x3625	0x9802	# <CJK>
-0x3626	0x9F0E	# <CJK>
-0x3627	0x9320	# <CJK>
-0x3628	0x5B9A	# <CJK>
-0x3629	0x8A02	# <CJK>
-0x362A	0x4E22	# <CJK>
-0x362B	0x6771	# <CJK>
-0x362C	0x51AC	# <CJK>
-0x362D	0x8463	# <CJK>
-0x362E	0x61C2	# <CJK>
-0x362F	0x52D5	# <CJK>
-0x3630	0x68DF	# <CJK>
-0x3631	0x4F97	# <CJK>
-0x3632	0x606B	# <CJK>
-0x3633	0x51CD	# <CJK>
-0x3634	0x6D1E	# <CJK>
-0x3635	0x515C	# <CJK>
-0x3636	0x6296	# <CJK>
-0x3637	0x9B25	# <CJK>
-0x3638	0x9661	# <CJK>
-0x3639	0x8C46	# <CJK>
-0x363A	0x9017	# <CJK>
-0x363B	0x75D8	# <CJK>
-0x363C	0x90FD	# <CJK>
-0x363D	0x7763	# <CJK>
-0x363E	0x6BD2	# <CJK>
-0x363F	0x72A2	# <CJK>
-0x3640	0x7368	# <CJK>
-0x3641	0x8B80	# <CJK>
-0x3642	0x5835	# <CJK>
-0x3643	0x7779	# <CJK>
-0x3644	0x8CED	# <CJK>
-0x3645	0x675C	# <CJK>
-0x3646	0x934D	# <CJK>
-0x3647	0x809A	# <CJK>
-0x3648	0x5EA6	# <CJK>
-0x3649	0x6E21	# <CJK>
-0x364A	0x5992	# <CJK>
-0x364B	0x7AEF	# <CJK>
-0x364C	0x77ED	# <CJK>
-0x364D	0x935B	# <CJK>
-0x364E	0x6BB5	# <CJK>
-0x364F	0x65B7	# <CJK>
-0x3650	0x7DDE	# <CJK>
-0x3651	0x5806	# <CJK>
-0x3652	0x5151	# <CJK>
-0x3653	0x968A	# <CJK>
-0x3654	0x5C0D	# <CJK>
-0x3655	0x58A9	# <CJK>
-0x3656	0x5678	# <CJK>
-0x3657	0x8E72	# <CJK>
-0x3658	0x6566	# <CJK>
-0x3659	0x9813	# <CJK>
-0x365A	0x56E4	# <CJK>
-0x365B	0x920D	# <CJK>
-0x365C	0x76FE	# <CJK>
-0x365D	0x9041	# <CJK>
-0x365E	0x6387	# <CJK>
-0x365F	0x54C6	# <CJK>
-0x3660	0x591A	# <CJK>
-0x3661	0x596A	# <CJK>
-0x3662	0x579B	# <CJK>
-0x3663	0x8EB2	# <CJK>
-0x3664	0x6735	# <CJK>
-0x3665	0x8DFA	# <CJK>
-0x3666	0x8235	# <CJK>
-0x3667	0x5241	# <CJK>
-0x3668	0x60F0	# <CJK>
-0x3669	0x58AE	# <CJK>
-0x366A	0x86FE	# <CJK>
-0x366B	0x5CE8	# <CJK>
-0x366C	0x9D5D	# <CJK>
-0x366D	0x4FC4	# <CJK>
-0x366E	0x984D	# <CJK>
-0x366F	0x8A1B	# <CJK>
-0x3670	0x5A25	# <CJK>
-0x3671	0x60E1	# <CJK>
-0x3672	0x5384	# <CJK>
-0x3673	0x627C	# <CJK>
-0x3674	0x904F	# <CJK>
-0x3675	0x9102	# <CJK>
-0x3676	0x9913	# <CJK>
-0x3677	0x6069	# <CJK>
-0x3678	0x800C	# <CJK>
-0x3679	0x5152	# <CJK>
-0x367A	0x8033	# <CJK>
-0x367B	0x723E	# <CJK>
-0x367C	0x990C	# <CJK>
-0x367D	0x6D31	# <CJK>
-0x367E	0x4E8C	# <CJK>
-0x3721	0x8CB3	# <CJK>
-0x3722	0x767C	# <CJK>
-0x3723	0x7F70	# <CJK>
-0x3724	0x7B4F	# <CJK>
-0x3725	0x4F10	# <CJK>
-0x3726	0x4E4F	# <CJK>
-0x3727	0x95A5	# <CJK>
-0x3728	0x6CD5	# <CJK>
-0x3729	0x73D0	# <CJK>
-0x372A	0x85E9	# <CJK>
-0x372B	0x5E06	# <CJK>
-0x372C	0x756A	# <CJK>
-0x372D	0x7FFB	# <CJK>
-0x372E	0x6A0A	# <CJK>
-0x372F	0x792C	# <CJK>
-0x3730	0x91E9	# <CJK>
-0x3731	0x7E41	# <CJK>
-0x3732	0x51E1	# <CJK>
-0x3733	0x7169	# <CJK>
-0x3734	0x53CD	# <CJK>
-0x3735	0x8FD4	# <CJK>
-0x3736	0x7BC4	# <CJK>
-0x3737	0x8CA9	# <CJK>
-0x3738	0x72AF	# <CJK>
-0x3739	0x98EF	# <CJK>
-0x373A	0x6CDB	# <CJK>
-0x373B	0x574A	# <CJK>
-0x373C	0x82B3	# <CJK>
-0x373D	0x65B9	# <CJK>
-0x373E	0x80AA	# <CJK>
-0x373F	0x623F	# <CJK>
-0x3740	0x9632	# <CJK>
-0x3741	0x59A8	# <CJK>
-0x3742	0x4EFF	# <CJK>
-0x3743	0x8A2A	# <CJK>
-0x3744	0x7D21	# <CJK>
-0x3745	0x653E	# <CJK>
-0x3746	0x83F2	# <CJK>
-0x3747	0x975E	# <CJK>
-0x3748	0x5561	# <CJK>
-0x3749	0x98DB	# <CJK>
-0x374A	0x80A5	# <CJK>
-0x374B	0x532A	# <CJK>
-0x374C	0x8AB9	# <CJK>
-0x374D	0x5420	# <CJK>
-0x374E	0x80BA	# <CJK>
-0x374F	0x5EE2	# <CJK>
-0x3750	0x6CB8	# <CJK>
-0x3751	0x8CBB	# <CJK>
-0x3752	0x82AC	# <CJK>
-0x3753	0x915A	# <CJK>
-0x3754	0x5429	# <CJK>
-0x3755	0x6C1B	# <CJK>
-0x3756	0x5206	# <CJK>
-0x3757	0x7D1B	# <CJK>
-0x3758	0x58B3	# <CJK>
-0x3759	0x711A	# <CJK>
-0x375A	0x6C7E	# <CJK>
-0x375B	0x7C89	# <CJK>
-0x375C	0x596E	# <CJK>
-0x375D	0x4EFD	# <CJK>
-0x375E	0x5FFF	# <CJK>
-0x375F	0x61A4	# <CJK>
-0x3760	0x7CDE	# <CJK>
-0x3761	0x8C50	# <CJK>
-0x3762	0x5C01	# <CJK>
-0x3763	0x6953	# <CJK>
-0x3764	0x8702	# <CJK>
-0x3765	0x5CF0	# <CJK>
-0x3766	0x92D2	# <CJK>
-0x3767	0x98A8	# <CJK>
-0x3768	0x760B	# <CJK>
-0x3769	0x70FD	# <CJK>
-0x376A	0x9022	# <CJK>
-0x376B	0x99AE	# <CJK>
-0x376C	0x7E2B	# <CJK>
-0x376D	0x8AF7	# <CJK>
-0x376E	0x5949	# <CJK>
-0x376F	0x9CF3	# <CJK>
-0x3770	0x4F5B	# <CJK>
-0x3771	0x5426	# <CJK>
-0x3772	0x592B	# <CJK>
-0x3773	0x6577	# <CJK>
-0x3774	0x819A	# <CJK>
-0x3775	0x5B75	# <CJK>
-0x3776	0x6276	# <CJK>
-0x3777	0x62C2	# <CJK>
-0x3778	0x8F3B	# <CJK>
-0x3779	0x5E45	# <CJK>
-0x377A	0x6C1F	# <CJK>
-0x377B	0x7B26	# <CJK>
-0x377C	0x4F0F	# <CJK>
-0x377D	0x4FD8	# <CJK>
-0x377E	0x670D	# <CJK>
-0x3821	0x6D6E	# <CJK>
-0x3822	0x6DAA	# <CJK>
-0x3823	0x798F	# <CJK>
-0x3824	0x88B1	# <CJK>
-0x3825	0x5F17	# <CJK>
-0x3826	0x752B	# <CJK>
-0x3827	0x64AB	# <CJK>
-0x3828	0x8F14	# <CJK>
-0x3829	0x4FEF	# <CJK>
-0x382A	0x91DC	# <CJK>
-0x382B	0x65A7	# <CJK>
-0x382C	0x812F	# <CJK>
-0x382D	0x8151	# <CJK>
-0x382E	0x5E9C	# <CJK>
-0x382F	0x8150	# <CJK>
-0x3830	0x8D74	# <CJK>
-0x3831	0x526F	# <CJK>
-0x3832	0x8986	# <CJK>
-0x3833	0x8CE6	# <CJK>
-0x3834	0x5FA9	# <CJK>
-0x3835	0x5085	# <CJK>
-0x3836	0x4ED8	# <CJK>
-0x3837	0x961C	# <CJK>
-0x3838	0x7236	# <CJK>
-0x3839	0x8179	# <CJK>
-0x383A	0x8CA0	# <CJK>
-0x383B	0x5BCC	# <CJK>
-0x383C	0x8A03	# <CJK>
-0x383D	0x9644	# <CJK>
-0x383E	0x5A66	# <CJK>
-0x383F	0x7E1B	# <CJK>
-0x3840	0x5490	# <CJK>
-0x3841	0x5676	# <CJK>
-0x3842	0x560E	# <CJK>
-0x3843	0x8A72	# <CJK>
-0x3844	0x6539	# <CJK>
-0x3845	0x6982	# <CJK>
-0x3846	0x9223	# <CJK>
-0x3847	0x84CB	# <CJK>
-0x3848	0x6E89	# <CJK>
-0x3849	0x5E79	# <CJK>
-0x384A	0x7518	# <CJK>
-0x384B	0x6746	# <CJK>
-0x384C	0x67D1	# <CJK>
-0x384D	0x7AFF	# <CJK>
-0x384E	0x809D	# <CJK>
-0x384F	0x8D95	# <CJK>
-0x3850	0x611F	# <CJK>
-0x3851	0x79C6	# <CJK>
-0x3852	0x6562	# <CJK>
-0x3853	0x8D1B	# <CJK>
-0x3854	0x5CA1	# <CJK>
-0x3855	0x525B	# <CJK>
-0x3856	0x92FC	# <CJK>
-0x3857	0x7F38	# <CJK>
-0x3858	0x809B	# <CJK>
-0x3859	0x7DB1	# <CJK>
-0x385A	0x5D17	# <CJK>
-0x385B	0x6E2F	# <CJK>
-0x385C	0x6760	# <CJK>
-0x385D	0x7BD9	# <CJK>
-0x385E	0x768B	# <CJK>
-0x385F	0x9AD8	# <CJK>
-0x3860	0x818F	# <CJK>
-0x3861	0x7F94	# <CJK>
-0x3862	0x7CD5	# <CJK>
-0x3863	0x641E	# <CJK>
-0x3864	0x93AC	# <CJK>
-0x3865	0x7A3F	# <CJK>
-0x3866	0x544A	# <CJK>
-0x3867	0x54E5	# <CJK>
-0x3868	0x6B4C	# <CJK>
-0x3869	0x64F1	# <CJK>
-0x386A	0x6208	# <CJK>
-0x386B	0x9D3F	# <CJK>
-0x386C	0x80F3	# <CJK>
-0x386D	0x7599	# <CJK>
-0x386E	0x5272	# <CJK>
-0x386F	0x9769	# <CJK>
-0x3870	0x845B	# <CJK>
-0x3871	0x683C	# <CJK>
-0x3872	0x86E4	# <CJK>
-0x3873	0x95A3	# <CJK>
-0x3874	0x9694	# <CJK>
-0x3875	0x927B	# <CJK>
-0x3876	0x500B	# <CJK>
-0x3877	0x5404	# <CJK>
-0x3878	0x7D66	# <CJK>
-0x3879	0x6839	# <CJK>
-0x387A	0x8DDF	# <CJK>
-0x387B	0x8015	# <CJK>
-0x387C	0x66F4	# <CJK>
-0x387D	0x5E9A	# <CJK>
-0x387E	0x7FB9	# <CJK>
-0x3921	0x57C2	# <CJK>
-0x3922	0x803F	# <CJK>
-0x3923	0x6897	# <CJK>
-0x3924	0x5DE5	# <CJK>
-0x3925	0x653B	# <CJK>
-0x3926	0x529F	# <CJK>
-0x3927	0x606D	# <CJK>
-0x3928	0x9F94	# <CJK>
-0x3929	0x4F9B	# <CJK>
-0x392A	0x8EAC	# <CJK>
-0x392B	0x516C	# <CJK>
-0x392C	0x5BAB	# <CJK>
-0x392D	0x5F13	# <CJK>
-0x392E	0x978F	# <CJK>
-0x392F	0x6C5E	# <CJK>
-0x3930	0x62F1	# <CJK>
-0x3931	0x8CA2	# <CJK>
-0x3932	0x5171	# <CJK>
-0x3933	0x920E	# <CJK>
-0x3934	0x52FE	# <CJK>
-0x3935	0x6E9D	# <CJK>
-0x3936	0x82DF	# <CJK>
-0x3937	0x72D7	# <CJK>
-0x3938	0x57A2	# <CJK>
-0x3939	0x69CB	# <CJK>
-0x393A	0x8CFC	# <CJK>
-0x393B	0x591F	# <CJK>
-0x393C	0x8F9C	# <CJK>
-0x393D	0x83C7	# <CJK>
-0x393E	0x5495	# <CJK>
-0x393F	0x7B8D	# <CJK>
-0x3940	0x4F30	# <CJK>
-0x3941	0x6CBD	# <CJK>
-0x3942	0x5B64	# <CJK>
-0x3943	0x59D1	# <CJK>
-0x3944	0x9F13	# <CJK>
-0x3945	0x53E4	# <CJK>
-0x3946	0x8831	# <CJK>
-0x3947	0x9AA8	# <CJK>
-0x3948	0x8C37	# <CJK>
-0x3949	0x80A1	# <CJK>
-0x394A	0x6545	# <CJK>
-0x394B	0x9867	# <CJK>
-0x394C	0x56FA	# <CJK>
-0x394D	0x96C7	# <CJK>
-0x394E	0x522E	# <CJK>
-0x394F	0x74DC	# <CJK>
-0x3950	0x526E	# <CJK>
-0x3951	0x5BE1	# <CJK>
-0x3952	0x6302	# <CJK>
-0x3953	0x8902	# <CJK>
-0x3954	0x4E56	# <CJK>
-0x3955	0x62D0	# <CJK>
-0x3956	0x602A	# <CJK>
-0x3957	0x68FA	# <CJK>
-0x3958	0x95DC	# <CJK>
-0x3959	0x5B98	# <CJK>
-0x395A	0x51A0	# <CJK>
-0x395B	0x89C0	# <CJK>
-0x395C	0x7BA1	# <CJK>
-0x395D	0x9928	# <CJK>
-0x395E	0x7F50	# <CJK>
-0x395F	0x6163	# <CJK>
-0x3960	0x704C	# <CJK>
-0x3961	0x8CAB	# <CJK>
-0x3962	0x5149	# <CJK>
-0x3963	0x5EE3	# <CJK>
-0x3964	0x901B	# <CJK>
-0x3965	0x7470	# <CJK>
-0x3966	0x898F	# <CJK>
-0x3967	0x572D	# <CJK>
-0x3968	0x7845	# <CJK>
-0x3969	0x6B78	# <CJK>
-0x396A	0x9F9C	# <CJK>
-0x396B	0x95A8	# <CJK>
-0x396C	0x8ECC	# <CJK>
-0x396D	0x9B3C	# <CJK>
-0x396E	0x8A6D	# <CJK>
-0x396F	0x7678	# <CJK>
-0x3970	0x6842	# <CJK>
-0x3971	0x6AC3	# <CJK>
-0x3972	0x8DEA	# <CJK>
-0x3973	0x8CB4	# <CJK>
-0x3974	0x528A	# <CJK>
-0x3975	0x8F25	# <CJK>
-0x3976	0x6EDA	# <CJK>
-0x3977	0x68CD	# <CJK>
-0x3978	0x934B	# <CJK>
-0x3979	0x90ED	# <CJK>
-0x397A	0x570B	# <CJK>
-0x397B	0x679C	# <CJK>
-0x397C	0x88F9	# <CJK>
-0x397D	0x904E	# <CJK>
-0x397E	0x54C8	# <CJK>
-0x3A21	0x9AB8	# <CJK>
-0x3A22	0x5B69	# <CJK>
-0x3A23	0x6D77	# <CJK>
-0x3A24	0x6C26	# <CJK>
-0x3A25	0x4EA5	# <CJK>
-0x3A26	0x5BB3	# <CJK>
-0x3A27	0x99ED	# <CJK>
-0x3A28	0x9163	# <CJK>
-0x3A29	0x61A8	# <CJK>
-0x3A2A	0x90AF	# <CJK>
-0x3A2B	0x97D3	# <CJK>
-0x3A2C	0x542B	# <CJK>
-0x3A2D	0x6DB5	# <CJK>
-0x3A2E	0x5BD2	# <CJK>
-0x3A2F	0x51FD	# <CJK>
-0x3A30	0x558A	# <CJK>
-0x3A31	0x7F55	# <CJK>
-0x3A32	0x7FF0	# <CJK>
-0x3A33	0x64BC	# <CJK>
-0x3A34	0x634D	# <CJK>
-0x3A35	0x65F1	# <CJK>
-0x3A36	0x61BE	# <CJK>
-0x3A37	0x608D	# <CJK>
-0x3A38	0x710A	# <CJK>
-0x3A39	0x6C57	# <CJK>
-0x3A3A	0x6F22	# <CJK>
-0x3A3B	0x592F	# <CJK>
-0x3A3C	0x676D	# <CJK>
-0x3A3D	0x822A	# <CJK>
-0x3A3E	0x58D5	# <CJK>
-0x3A3F	0x568E	# <CJK>
-0x3A40	0x8C6A	# <CJK>
-0x3A41	0x6BEB	# <CJK>
-0x3A42	0x90DD	# <CJK>
-0x3A43	0x597D	# <CJK>
-0x3A44	0x8017	# <CJK>
-0x3A45	0x865F	# <CJK>
-0x3A46	0x6D69	# <CJK>
-0x3A47	0x5475	# <CJK>
-0x3A48	0x559D	# <CJK>
-0x3A49	0x8377	# <CJK>
-0x3A4A	0x83CF	# <CJK>
-0x3A4B	0x6838	# <CJK>
-0x3A4C	0x79BE	# <CJK>
-0x3A4D	0x548C	# <CJK>
-0x3A4E	0x4F55	# <CJK>
-0x3A4F	0x5408	# <CJK>
-0x3A50	0x76D2	# <CJK>
-0x3A51	0x8C89	# <CJK>
-0x3A52	0x95A1	# <CJK>
-0x3A53	0x6CB3	# <CJK>
-0x3A54	0x6DB8	# <CJK>
-0x3A55	0x8D6B	# <CJK>
-0x3A56	0x8910	# <CJK>
-0x3A57	0x9DB4	# <CJK>
-0x3A58	0x8CC0	# <CJK>
-0x3A59	0x563F	# <CJK>
-0x3A5A	0x9ED1	# <CJK>
-0x3A5B	0x75D5	# <CJK>
-0x3A5C	0x5F88	# <CJK>
-0x3A5D	0x72E0	# <CJK>
-0x3A5E	0x6068	# <CJK>
-0x3A5F	0x54FC	# <CJK>
-0x3A60	0x4EA8	# <CJK>
-0x3A61	0x6A2A	# <CJK>
-0x3A62	0x8861	# <CJK>
-0x3A63	0x6052	# <CJK>
-0x3A64	0x8F5F	# <CJK>
-0x3A65	0x54C4	# <CJK>
-0x3A66	0x70D8	# <CJK>
-0x3A67	0x8679	# <CJK>
-0x3A68	0x9D3B	# <CJK>
-0x3A69	0x6D2A	# <CJK>
-0x3A6A	0x5B8F	# <CJK>
-0x3A6B	0x5F18	# <CJK>
-0x3A6C	0x7D05	# <CJK>
-0x3A6D	0x5589	# <CJK>
-0x3A6E	0x4FAF	# <CJK>
-0x3A6F	0x7334	# <CJK>
-0x3A70	0x543C	# <CJK>
-0x3A71	0x539A	# <CJK>
-0x3A72	0x5019	# <CJK>
-0x3A73	0x5F8C	# <CJK>
-0x3A74	0x547C	# <CJK>
-0x3A75	0x4E4E	# <CJK>
-0x3A76	0x5FFD	# <CJK>
-0x3A77	0x745A	# <CJK>
-0x3A78	0x58FA	# <CJK>
-0x3A79	0x846B	# <CJK>
-0x3A7A	0x80E1	# <CJK>
-0x3A7B	0x8774	# <CJK>
-0x3A7C	0x72D0	# <CJK>
-0x3A7D	0x7CCA	# <CJK>
-0x3A7E	0x6E56	# <CJK>
-0x3B21	0x5F27	# <CJK>
-0x3B22	0x864E	# <CJK>
-0x3B23	0x552C	# <CJK>
-0x3B24	0x8B77	# <CJK>
-0x3B25	0x4E92	# <CJK>
-0x3B26	0x6EEC	# <CJK>
-0x3B27	0x6237	# <CJK>
-0x3B28	0x82B1	# <CJK>
-0x3B29	0x5629	# <CJK>
-0x3B2A	0x83EF	# <CJK>
-0x3B2B	0x733E	# <CJK>
-0x3B2C	0x6ED1	# <CJK>
-0x3B2D	0x756B	# <CJK>
-0x3B2E	0x5283	# <CJK>
-0x3B2F	0x5316	# <CJK>
-0x3B30	0x8A71	# <CJK>
-0x3B31	0x69D0	# <CJK>
-0x3B32	0x5F8A	# <CJK>
-0x3B33	0x61F7	# <CJK>
-0x3B34	0x6DEE	# <CJK>
-0x3B35	0x58DE	# <CJK>
-0x3B36	0x6B61	# <CJK>
-0x3B37	0x74B0	# <CJK>
-0x3B38	0x6853	# <CJK>
-0x3B39	0x9084	# <CJK>
-0x3B3A	0x7DE9	# <CJK>
-0x3B3B	0x63DB	# <CJK>
-0x3B3C	0x60A3	# <CJK>
-0x3B3D	0x559A	# <CJK>
-0x3B3E	0x7613	# <CJK>
-0x3B3F	0x8C62	# <CJK>
-0x3B40	0x7165	# <CJK>
-0x3B41	0x6E19	# <CJK>
-0x3B42	0x5BA6	# <CJK>
-0x3B43	0x5E7B	# <CJK>
-0x3B44	0x8352	# <CJK>
-0x3B45	0x614C	# <CJK>
-0x3B46	0x9EC4	# <CJK>
-0x3B47	0x78FA	# <CJK>
-0x3B48	0x8757	# <CJK>
-0x3B49	0x7C27	# <CJK>
-0x3B4A	0x7687	# <CJK>
-0x3B4B	0x51F0	# <CJK>
-0x3B4C	0x60F6	# <CJK>
-0x3B4D	0x714C	# <CJK>
-0x3B4E	0x6643	# <CJK>
-0x3B4F	0x5E4C	# <CJK>
-0x3B50	0x604D	# <CJK>
-0x3B51	0x8B0A	# <CJK>
-0x3B52	0x7070	# <CJK>
-0x3B53	0x63EE	# <CJK>
-0x3B54	0x8F1D	# <CJK>
-0x3B55	0x5FBD	# <CJK>
-0x3B56	0x6062	# <CJK>
-0x3B57	0x86D4	# <CJK>
-0x3B58	0x56DE	# <CJK>
-0x3B59	0x6BC1	# <CJK>
-0x3B5A	0x6094	# <CJK>
-0x3B5B	0x6167	# <CJK>
-0x3B5C	0x5349	# <CJK>
-0x3B5D	0x60E0	# <CJK>
-0x3B5E	0x6666	# <CJK>
-0x3B5F	0x8CC4	# <CJK>
-0x3B60	0x7A62	# <CJK>
-0x3B61	0x6703	# <CJK>
-0x3B62	0x71F4	# <CJK>
-0x3B63	0x532F	# <CJK>
-0x3B64	0x8AF1	# <CJK>
-0x3B65	0x8AA8	# <CJK>
-0x3B66	0x7E6A	# <CJK>
-0x3B67	0x8477	# <CJK>
-0x3B68	0x660F	# <CJK>
-0x3B69	0x5A5A	# <CJK>
-0x3B6A	0x9B42	# <CJK>
-0x3B6B	0x6E3E	# <CJK>
-0x3B6C	0x6DF7	# <CJK>
-0x3B6D	0x8C41	# <CJK>
-0x3B6E	0x6D3B	# <CJK>
-0x3B6F	0x4F19	# <CJK>
-0x3B70	0x706B	# <CJK>
-0x3B71	0x7372	# <CJK>
-0x3B72	0x6216	# <CJK>
-0x3B73	0x60D1	# <CJK>
-0x3B74	0x970D	# <CJK>
-0x3B75	0x8CA8	# <CJK>
-0x3B76	0x798D	# <CJK>
-0x3B77	0x64CA	# <CJK>
-0x3B78	0x573E	# <CJK>
-0x3B79	0x57FA	# <CJK>
-0x3B7A	0x6A5F	# <CJK>
-0x3B7B	0x7578	# <CJK>
-0x3B7C	0x7A3D	# <CJK>
-0x3B7D	0x7A4D	# <CJK>
-0x3B7E	0x7B95	# <CJK>
-0x3C21	0x808C	# <CJK>
-0x3C22	0x9951	# <CJK>
-0x3C23	0x8FF9	# <CJK>
-0x3C24	0x6FC0	# <CJK>
-0x3C25	0x8B4F	# <CJK>
-0x3C26	0x9DC4	# <CJK>
-0x3C27	0x59EC	# <CJK>
-0x3C28	0x7E3E	# <CJK>
-0x3C29	0x7DDD	# <CJK>
-0x3C2A	0x5409	# <CJK>
-0x3C2B	0x6975	# <CJK>
-0x3C2C	0x68D8	# <CJK>
-0x3C2D	0x8F2F	# <CJK>
-0x3C2E	0x7C4D	# <CJK>
-0x3C2F	0x96C6	# <CJK>
-0x3C30	0x53CA	# <CJK>
-0x3C31	0x6025	# <CJK>
-0x3C32	0x75BE	# <CJK>
-0x3C33	0x6C72	# <CJK>
-0x3C34	0x5373	# <CJK>
-0x3C35	0x5AC9	# <CJK>
-0x3C36	0x7D1A	# <CJK>
-0x3C37	0x64E0	# <CJK>
-0x3C38	0x5E7E	# <CJK>
-0x3C39	0x810A	# <CJK>
-0x3C3A	0x5DF1	# <CJK>
-0x3C3B	0x858A	# <CJK>
-0x3C3C	0x6280	# <CJK>
-0x3C3D	0x5180	# <CJK>
-0x3C3E	0x5B63	# <CJK>
-0x3C3F	0x4F0E	# <CJK>
-0x3C40	0x796D	# <CJK>
-0x3C41	0x5291	# <CJK>
-0x3C42	0x60B8	# <CJK>
-0x3C43	0x6FDF	# <CJK>
-0x3C44	0x5BC4	# <CJK>
-0x3C45	0x5BC2	# <CJK>
-0x3C46	0x8A08	# <CJK>
-0x3C47	0x8A18	# <CJK>
-0x3C48	0x65E2	# <CJK>
-0x3C49	0x5FCC	# <CJK>
-0x3C4A	0x969B	# <CJK>
-0x3C4B	0x5993	# <CJK>
-0x3C4C	0x7E7C	# <CJK>
-0x3C4D	0x7D00	# <CJK>
-0x3C4E	0x5609	# <CJK>
-0x3C4F	0x67B7	# <CJK>
-0x3C50	0x593E	# <CJK>
-0x3C51	0x4F73	# <CJK>
-0x3C52	0x5BB6	# <CJK>
-0x3C53	0x52A0	# <CJK>
-0x3C54	0x83A2	# <CJK>
-0x3C55	0x9830	# <CJK>
-0x3C56	0x8CC8	# <CJK>
-0x3C57	0x7532	# <CJK>
-0x3C58	0x9240	# <CJK>
-0x3C59	0x5047	# <CJK>
-0x3C5A	0x7A3C	# <CJK>
-0x3C5B	0x50F9	# <CJK>
-0x3C5C	0x67B6	# <CJK>
-0x3C5D	0x99D5	# <CJK>
-0x3C5E	0x5AC1	# <CJK>
-0x3C5F	0x6BB2	# <CJK>
-0x3C60	0x76E3	# <CJK>
-0x3C61	0x5805	# <CJK>
-0x3C62	0x5C16	# <CJK>
-0x3C63	0x7B8B	# <CJK>
-0x3C64	0x9593	# <CJK>
-0x3C65	0x714E	# <CJK>
-0x3C66	0x517C	# <CJK>
-0x3C67	0x80A9	# <CJK>
-0x3C68	0x8271	# <CJK>
-0x3C69	0x5978	# <CJK>
-0x3C6A	0x7DD8	# <CJK>
-0x3C6B	0x7E6D	# <CJK>
-0x3C6C	0x6AA2	# <CJK>
-0x3C6D	0x67EC	# <CJK>
-0x3C6E	0x78B1	# <CJK>
-0x3C6F	0x9E7C	# <CJK>
-0x3C70	0x63C0	# <CJK>
-0x3C71	0x64BF	# <CJK>
-0x3C72	0x7C21	# <CJK>
-0x3C73	0x5109	# <CJK>
-0x3C74	0x526A	# <CJK>
-0x3C75	0x51CF	# <CJK>
-0x3C76	0x85A6	# <CJK>
-0x3C77	0x6ABB	# <CJK>
-0x3C78	0x9452	# <CJK>
-0x3C79	0x8E10	# <CJK>
-0x3C7A	0x8CE4	# <CJK>
-0x3C7B	0x898B	# <CJK>
-0x3C7C	0x9375	# <CJK>
-0x3C7D	0x7BAD	# <CJK>
-0x3C7E	0x4EF6	# <CJK>
-0x3D21	0x5065	# <CJK>
-0x3D22	0x8266	# <CJK>
-0x3D23	0x528D	# <CJK>
-0x3D24	0x991E	# <CJK>
-0x3D25	0x6F38	# <CJK>
-0x3D26	0x6FFA	# <CJK>
-0x3D27	0x6F97	# <CJK>
-0x3D28	0x5EFA	# <CJK>
-0x3D29	0x50F5	# <CJK>
-0x3D2A	0x59DC	# <CJK>
-0x3D2B	0x5C07	# <CJK>
-0x3D2C	0x6F3F	# <CJK>
-0x3D2D	0x6C5F	# <CJK>
-0x3D2E	0x7586	# <CJK>
-0x3D2F	0x8523	# <CJK>
-0x3D30	0x69F3	# <CJK>
-0x3D31	0x596C	# <CJK>
-0x3D32	0x8B1B	# <CJK>
-0x3D33	0x5320	# <CJK>
-0x3D34	0x91AC	# <CJK>
-0x3D35	0x964D	# <CJK>
-0x3D36	0x8549	# <CJK>
-0x3D37	0x6912	# <CJK>
-0x3D38	0x7901	# <CJK>
-0x3D39	0x7126	# <CJK>
-0x3D3A	0x81A0	# <CJK>
-0x3D3B	0x4EA4	# <CJK>
-0x3D3C	0x90CA	# <CJK>
-0x3D3D	0x6F86	# <CJK>
-0x3D3E	0x9A55	# <CJK>
-0x3D3F	0x5B0C	# <CJK>
-0x3D40	0x56BC	# <CJK>
-0x3D41	0x652A	# <CJK>
-0x3D42	0x9278	# <CJK>
-0x3D43	0x77EF	# <CJK>
-0x3D44	0x50E5	# <CJK>
-0x3D45	0x811A	# <CJK>
-0x3D46	0x72E1	# <CJK>
-0x3D47	0x89D2	# <CJK>
-0x3D48	0x9903	# <CJK>
-0x3D49	0x7E73	# <CJK>
-0x3D4A	0x7D5E	# <CJK>
-0x3D4B	0x527F	# <CJK>
-0x3D4C	0x6559	# <CJK>
-0x3D4D	0x9175	# <CJK>
-0x3D4E	0x8F4E	# <CJK>
-0x3D4F	0x8F03	# <CJK>
-0x3D50	0x53EB	# <CJK>
-0x3D51	0x7A96	# <CJK>
-0x3D52	0x63ED	# <CJK>
-0x3D53	0x63A5	# <CJK>
-0x3D54	0x7686	# <CJK>
-0x3D55	0x79F8	# <CJK>
-0x3D56	0x8857	# <CJK>
-0x3D57	0x968E	# <CJK>
-0x3D58	0x622A	# <CJK>
-0x3D59	0x52AB	# <CJK>
-0x3D5A	0x7BC0	# <CJK>
-0x3D5B	0x6854	# <CJK>
-0x3D5C	0x6770	# <CJK>
-0x3D5D	0x6377	# <CJK>
-0x3D5E	0x776B	# <CJK>
-0x3D5F	0x7AED	# <CJK>
-0x3D60	0x6F54	# <CJK>
-0x3D61	0x7D50	# <CJK>
-0x3D62	0x89E3	# <CJK>
-0x3D63	0x59D0	# <CJK>
-0x3D64	0x6212	# <CJK>
-0x3D65	0x85C9	# <CJK>
-0x3D66	0x82A5	# <CJK>
-0x3D67	0x754C	# <CJK>
-0x3D68	0x501F	# <CJK>
-0x3D69	0x4ECB	# <CJK>
-0x3D6A	0x75A5	# <CJK>
-0x3D6B	0x8AA1	# <CJK>
-0x3D6C	0x5C4A	# <CJK>
-0x3D6D	0x5DFE	# <CJK>
-0x3D6E	0x7B4B	# <CJK>
-0x3D6F	0x65A4	# <CJK>
-0x3D70	0x91D1	# <CJK>
-0x3D71	0x4ECA	# <CJK>
-0x3D72	0x6D25	# <CJK>
-0x3D73	0x895F	# <CJK>
-0x3D74	0x7DCA	# <CJK>
-0x3D75	0x9326	# <CJK>
-0x3D76	0x50C5	# <CJK>
-0x3D77	0x8B39	# <CJK>
-0x3D78	0x9032	# <CJK>
-0x3D79	0x9773	# <CJK>
-0x3D7A	0x6649	# <CJK>
-0x3D7B	0x7981	# <CJK>
-0x3D7C	0x8FD1	# <CJK>
-0x3D7D	0x71FC	# <CJK>
-0x3D7E	0x6D78	# <CJK>
-0x3E21	0x76E1	# <CJK>
-0x3E22	0x52C1	# <CJK>
-0x3E23	0x8346	# <CJK>
-0x3E24	0x5162	# <CJK>
-0x3E25	0x8396	# <CJK>
-0x3E26	0x775B	# <CJK>
-0x3E27	0x6676	# <CJK>
-0x3E28	0x9BE8	# <CJK>
-0x3E29	0x4EAC	# <CJK>
-0x3E2A	0x9A5A	# <CJK>
-0x3E2B	0x7CBE	# <CJK>
-0x3E2C	0x7CB3	# <CJK>
-0x3E2D	0x7D93	# <CJK>
-0x3E2E	0x4E95	# <CJK>
-0x3E2F	0x8B66	# <CJK>
-0x3E30	0x666F	# <CJK>
-0x3E31	0x9838	# <CJK>
-0x3E32	0x975C	# <CJK>
-0x3E33	0x5883	# <CJK>
-0x3E34	0x656C	# <CJK>
-0x3E35	0x93E1	# <CJK>
-0x3E36	0x5F91	# <CJK>
-0x3E37	0x75D9	# <CJK>
-0x3E38	0x9756	# <CJK>
-0x3E39	0x7ADF	# <CJK>
-0x3E3A	0x7AF6	# <CJK>
-0x3E3B	0x51C8	# <CJK>
-0x3E3C	0x70AF	# <CJK>
-0x3E3D	0x7A98	# <CJK>
-0x3E3E	0x63EA	# <CJK>
-0x3E3F	0x7A76	# <CJK>
-0x3E40	0x7CFE	# <CJK>
-0x3E41	0x7396	# <CJK>
-0x3E42	0x97ED	# <CJK>
-0x3E43	0x4E45	# <CJK>
-0x3E44	0x7078	# <CJK>
-0x3E45	0x4E5D	# <CJK>
-0x3E46	0x9152	# <CJK>
-0x3E47	0x53A9	# <CJK>
-0x3E48	0x6551	# <CJK>
-0x3E49	0x820A	# <CJK>
-0x3E4A	0x81FC	# <CJK>
-0x3E4B	0x8205	# <CJK>
-0x3E4C	0x548E	# <CJK>
-0x3E4D	0x5C31	# <CJK>
-0x3E4E	0x759A	# <CJK>
-0x3E4F	0x97A0	# <CJK>
-0x3E50	0x62D8	# <CJK>
-0x3E51	0x72D9	# <CJK>
-0x3E52	0x75BD	# <CJK>
-0x3E53	0x5C45	# <CJK>
-0x3E54	0x99D2	# <CJK>
-0x3E55	0x83CA	# <CJK>
-0x3E56	0x5C40	# <CJK>
-0x3E57	0x5480	# <CJK>
-0x3E58	0x77E9	# <CJK>
-0x3E59	0x8209	# <CJK>
-0x3E5A	0x6CAE	# <CJK>
-0x3E5B	0x805A	# <CJK>
-0x3E5C	0x62D2	# <CJK>
-0x3E5D	0x64DA	# <CJK>
-0x3E5E	0x5DE8	# <CJK>
-0x3E5F	0x5177	# <CJK>
-0x3E60	0x8DDD	# <CJK>
-0x3E61	0x8E1E	# <CJK>
-0x3E62	0x92F8	# <CJK>
-0x3E63	0x4FF1	# <CJK>
-0x3E64	0x53E5	# <CJK>
-0x3E65	0x61FC	# <CJK>
-0x3E66	0x70AC	# <CJK>
-0x3E67	0x5287	# <CJK>
-0x3E68	0x6350	# <CJK>
-0x3E69	0x9D51	# <CJK>
-0x3E6A	0x5A1F	# <CJK>
-0x3E6B	0x5026	# <CJK>
-0x3E6C	0x7737	# <CJK>
-0x3E6D	0x5377	# <CJK>
-0x3E6E	0x7D79	# <CJK>
-0x3E6F	0x6485	# <CJK>
-0x3E70	0x652B	# <CJK>
-0x3E71	0x6289	# <CJK>
-0x3E72	0x6398	# <CJK>
-0x3E73	0x5014	# <CJK>
-0x3E74	0x7235	# <CJK>
-0x3E75	0x89BA	# <CJK>
-0x3E76	0x51B3	# <CJK>
-0x3E77	0x8A23	# <CJK>
-0x3E78	0x7D76	# <CJK>
-0x3E79	0x5747	# <CJK>
-0x3E7A	0x83CC	# <CJK>
-0x3E7B	0x921E	# <CJK>
-0x3E7C	0x8ECD	# <CJK>
-0x3E7D	0x541B	# <CJK>
-0x3E7E	0x5CFB	# <CJK>
-0x3F21	0x4FCA	# <CJK>
-0x3F22	0x7AE3	# <CJK>
-0x3F23	0x6D5A	# <CJK>
-0x3F24	0x90E1	# <CJK>
-0x3F25	0x99FF	# <CJK>
-0x3F26	0x5580	# <CJK>
-0x3F27	0x5496	# <CJK>
-0x3F28	0x5361	# <CJK>
-0x3F29	0x54AF	# <CJK>
-0x3F2A	0x958B	# <CJK>
-0x3F2B	0x63E9	# <CJK>
-0x3F2C	0x6977	# <CJK>
-0x3F2D	0x51F1	# <CJK>
-0x3F2E	0x6168	# <CJK>
-0x3F2F	0x520A	# <CJK>
-0x3F30	0x582A	# <CJK>
-0x3F31	0x52D8	# <CJK>
-0x3F32	0x574E	# <CJK>
-0x3F33	0x780D	# <CJK>
-0x3F34	0x770B	# <CJK>
-0x3F35	0x5EB7	# <CJK>
-0x3F36	0x6177	# <CJK>
-0x3F37	0x7CE0	# <CJK>
-0x3F38	0x625B	# <CJK>
-0x3F39	0x6297	# <CJK>
-0x3F3A	0x4EA2	# <CJK>
-0x3F3B	0x7095	# <CJK>
-0x3F3C	0x8003	# <CJK>
-0x3F3D	0x62F7	# <CJK>
-0x3F3E	0x70E4	# <CJK>
-0x3F3F	0x9760	# <CJK>
-0x3F40	0x5777	# <CJK>
-0x3F41	0x82DB	# <CJK>
-0x3F42	0x67EF	# <CJK>
-0x3F43	0x68F5	# <CJK>
-0x3F44	0x78D5	# <CJK>
-0x3F45	0x9846	# <CJK>
-0x3F46	0x79D1	# <CJK>
-0x3F47	0x6BBB	# <CJK>
-0x3F48	0x54B3	# <CJK>
-0x3F49	0x53EF	# <CJK>
-0x3F4A	0x6E34	# <CJK>
-0x3F4B	0x514B	# <CJK>
-0x3F4C	0x523B	# <CJK>
-0x3F4D	0x5BA2	# <CJK>
-0x3F4E	0x8AB2	# <CJK>
-0x3F4F	0x80AF	# <CJK>
-0x3F50	0x5543	# <CJK>
-0x3F51	0x58BE	# <CJK>
-0x3F52	0x61C7	# <CJK>
-0x3F53	0x5751	# <CJK>
-0x3F54	0x542D	# <CJK>
-0x3F55	0x7A7A	# <CJK>
-0x3F56	0x6050	# <CJK>
-0x3F57	0x5B54	# <CJK>
-0x3F58	0x63A7	# <CJK>
-0x3F59	0x6473	# <CJK>
-0x3F5A	0x53E3	# <CJK>
-0x3F5B	0x6263	# <CJK>
-0x3F5C	0x5BC7	# <CJK>
-0x3F5D	0x67AF	# <CJK>
-0x3F5E	0x54ED	# <CJK>
-0x3F5F	0x7A9F	# <CJK>
-0x3F60	0x82E6	# <CJK>
-0x3F61	0x9177	# <CJK>
-0x3F62	0x5EAB	# <CJK>
-0x3F63	0x8932	# <CJK>
-0x3F64	0x8A87	# <CJK>
-0x3F65	0x57AE	# <CJK>
-0x3F66	0x630E	# <CJK>
-0x3F67	0x8DE8	# <CJK>
-0x3F68	0x80EF	# <CJK>
-0x3F69	0x584A	# <CJK>
-0x3F6A	0x7B77	# <CJK>
-0x3F6B	0x5108	# <CJK>
-0x3F6C	0x5FEB	# <CJK>
-0x3F6D	0x5BEC	# <CJK>
-0x3F6E	0x6B3E	# <CJK>
-0x3F6F	0x5321	# <CJK>
-0x3F70	0x7B50	# <CJK>
-0x3F71	0x72C2	# <CJK>
-0x3F72	0x6846	# <CJK>
-0x3F73	0x7926	# <CJK>
-0x3F74	0x7736	# <CJK>
-0x3F75	0x66E0	# <CJK>
-0x3F76	0x51B5	# <CJK>
-0x3F77	0x8667	# <CJK>
-0x3F78	0x76D4	# <CJK>
-0x3F79	0x5DCB	# <CJK>
-0x3F7A	0x7ABA	# <CJK>
-0x3F7B	0x8475	# <CJK>
-0x3F7C	0x594E	# <CJK>
-0x3F7D	0x9B41	# <CJK>
-0x3F7E	0x5080	# <CJK>
-0x4021	0x994B	# <CJK>
-0x4022	0x6127	# <CJK>
-0x4023	0x6F70	# <CJK>
-0x4024	0x5764	# <CJK>
-0x4025	0x6606	# <CJK>
-0x4026	0x6346	# <CJK>
-0x4027	0x56F0	# <CJK>
-0x4028	0x62EC	# <CJK>
-0x4029	0x64F4	# <CJK>
-0x402A	0x5ED3	# <CJK>
-0x402B	0x95CA	# <CJK>
-0x402C	0x5783	# <CJK>
-0x402D	0x62C9	# <CJK>
-0x402E	0x5587	# <CJK>
-0x402F	0x881F	# <CJK>
-0x4030	0x81D8	# <CJK>
-0x4031	0x8FA3	# <CJK>
-0x4032	0x5566	# <CJK>
-0x4033	0x840A	# <CJK>
-0x4034	0x4F86	# <CJK>
-0x4035	0x8CF4	# <CJK>
-0x4036	0x85CD	# <CJK>
-0x4037	0x5A6A	# <CJK>
-0x4038	0x6B04	# <CJK>
-0x4039	0x6514	# <CJK>
-0x403A	0x7C43	# <CJK>
-0x403B	0x95CC	# <CJK>
-0x403C	0x862D	# <CJK>
-0x403D	0x703E	# <CJK>
-0x403E	0x8B95	# <CJK>
-0x403F	0x652C	# <CJK>
-0x4040	0x89BD	# <CJK>
-0x4041	0x61F6	# <CJK>
-0x4042	0x7E9C	# <CJK>
-0x4043	0x721B	# <CJK>
-0x4044	0x6FEB	# <CJK>
-0x4045	0x7405	# <CJK>
-0x4046	0x6994	# <CJK>
-0x4047	0x72FC	# <CJK>
-0x4048	0x5ECA	# <CJK>
-0x4049	0x90CE	# <CJK>
-0x404A	0x6717	# <CJK>
-0x404B	0x6D6A	# <CJK>
-0x404C	0x6488	# <CJK>
-0x404D	0x52DE	# <CJK>
-0x404E	0x7262	# <CJK>
-0x404F	0x8001	# <CJK>
-0x4050	0x4F6C	# <CJK>
-0x4051	0x59E5	# <CJK>
-0x4052	0x916A	# <CJK>
-0x4053	0x70D9	# <CJK>
-0x4054	0x6F87	# <CJK>
-0x4055	0x52D2	# <CJK>
-0x4056	0x6A02	# <CJK>
-0x4057	0x96F7	# <CJK>
-0x4058	0x9433	# <CJK>
-0x4059	0x857E	# <CJK>
-0x405A	0x78CA	# <CJK>
-0x405B	0x7D2F	# <CJK>
-0x405C	0x5121	# <CJK>
-0x405D	0x58D8	# <CJK>
-0x405E	0x64C2	# <CJK>
-0x405F	0x808B	# <CJK>
-0x4060	0x985E	# <CJK>
-0x4061	0x6CEA	# <CJK>
-0x4062	0x68F1	# <CJK>
-0x4063	0x695E	# <CJK>
-0x4064	0x51B7	# <CJK>
-0x4065	0x5398	# <CJK>
-0x4066	0x68A8	# <CJK>
-0x4067	0x7281	# <CJK>
-0x4068	0x9ECE	# <CJK>
-0x4069	0x7C6C	# <CJK>
-0x406A	0x72F8	# <CJK>
-0x406B	0x96E2	# <CJK>
-0x406C	0x7055	# <CJK>
-0x406D	0x7406	# <CJK>
-0x406E	0x674E	# <CJK>
-0x406F	0x88CF	# <CJK>
-0x4070	0x9BC9	# <CJK>
-0x4071	0x79AE	# <CJK>
-0x4072	0x8389	# <CJK>
-0x4073	0x8354	# <CJK>
-0x4074	0x540F	# <CJK>
-0x4075	0x6817	# <CJK>
-0x4076	0x9E97	# <CJK>
-0x4077	0x53B2	# <CJK>
-0x4078	0x52F5	# <CJK>
-0x4079	0x792B	# <CJK>
-0x407A	0x6B77	# <CJK>
-0x407B	0x5229	# <CJK>
-0x407C	0x5088	# <CJK>
-0x407D	0x4F8B	# <CJK>
-0x407E	0x4FD0	# <CJK>
-0x4121	0x75E2	# <CJK>
-0x4122	0x7ACB	# <CJK>
-0x4123	0x7C92	# <CJK>
-0x4124	0x701D	# <CJK>
-0x4125	0x96B8	# <CJK>
-0x4126	0x529B	# <CJK>
-0x4127	0x7483	# <CJK>
-0x4128	0x54E9	# <CJK>
-0x4129	0x5006	# <CJK>
-0x412A	0x806F	# <CJK>
-0x412B	0x84EE	# <CJK>
-0x412C	0x9023	# <CJK>
-0x412D	0x942E	# <CJK>
-0x412E	0x5EC9	# <CJK>
-0x412F	0x6190	# <CJK>
-0x4130	0x6F23	# <CJK>
-0x4131	0x7C3E	# <CJK>
-0x4132	0x6582	# <CJK>
-0x4133	0x81C9	# <CJK>
-0x4134	0x93C8	# <CJK>
-0x4135	0x6200	# <CJK>
-0x4136	0x7149	# <CJK>
-0x4137	0x7DF4	# <CJK>
-0x4138	0x7CE7	# <CJK>
-0x4139	0x51C9	# <CJK>
-0x413A	0x6881	# <CJK>
-0x413B	0x7CB1	# <CJK>
-0x413C	0x826F	# <CJK>
-0x413D	0x5169	# <CJK>
-0x413E	0x8F1B	# <CJK>
-0x413F	0x91CF	# <CJK>
-0x4140	0x667E	# <CJK>
-0x4141	0x4EAE	# <CJK>
-0x4142	0x8AD2	# <CJK>
-0x4143	0x64A9	# <CJK>
-0x4144	0x804A	# <CJK>
-0x4145	0x50DA	# <CJK>
-0x4146	0x7642	# <CJK>
-0x4147	0x71CE	# <CJK>
-0x4148	0x5BE5	# <CJK>
-0x4149	0x907C	# <CJK>
-0x414A	0x6F66	# <CJK>
-0x414B	0x4E86	# <CJK>
-0x414C	0x6482	# <CJK>
-0x414D	0x9410	# <CJK>
-0x414E	0x5ED6	# <CJK>
-0x414F	0x6599	# <CJK>
-0x4150	0x5217	# <CJK>
-0x4151	0x88C2	# <CJK>
-0x4152	0x70C8	# <CJK>
-0x4153	0x52A3	# <CJK>
-0x4154	0x7375	# <CJK>
-0x4155	0x7433	# <CJK>
-0x4156	0x6797	# <CJK>
-0x4157	0x78F7	# <CJK>
-0x4158	0x9716	# <CJK>
-0x4159	0x81E8	# <CJK>
-0x415A	0x9130	# <CJK>
-0x415B	0x9C57	# <CJK>
-0x415C	0x6DCB	# <CJK>
-0x415D	0x51DB	# <CJK>
-0x415E	0x8CC3	# <CJK>
-0x415F	0x541D	# <CJK>
-0x4160	0x62CE	# <CJK>
-0x4161	0x73B2	# <CJK>
-0x4162	0x83F1	# <CJK>
-0x4163	0x96F6	# <CJK>
-0x4164	0x9F61	# <CJK>
-0x4165	0x9234	# <CJK>
-0x4166	0x4F36	# <CJK>
-0x4167	0x7F9A	# <CJK>
-0x4168	0x51CC	# <CJK>
-0x4169	0x9748	# <CJK>
-0x416A	0x9675	# <CJK>
-0x416B	0x5DBA	# <CJK>
-0x416C	0x9818	# <CJK>
-0x416D	0x53E6	# <CJK>
-0x416E	0x4EE4	# <CJK>
-0x416F	0x6E9C	# <CJK>
-0x4170	0x7409	# <CJK>
-0x4171	0x69B4	# <CJK>
-0x4172	0x786B	# <CJK>
-0x4173	0x993E	# <CJK>
-0x4174	0x7559	# <CJK>
-0x4175	0x5289	# <CJK>
-0x4176	0x7624	# <CJK>
-0x4177	0x6D41	# <CJK>
-0x4178	0x67F3	# <CJK>
-0x4179	0x516D	# <CJK>
-0x417A	0x9F8D	# <CJK>
-0x417B	0x807E	# <CJK>
-0x417C	0x56A8	# <CJK>
-0x417D	0x7C60	# <CJK>
-0x417E	0x7ABF	# <CJK>
-0x4221	0x9686	# <CJK>
-0x4222	0x58DF	# <CJK>
-0x4223	0x650F	# <CJK>
-0x4224	0x96B4	# <CJK>
-0x4225	0x6A13	# <CJK>
-0x4226	0x5A41	# <CJK>
-0x4227	0x645F	# <CJK>
-0x4228	0x7C0D	# <CJK>
-0x4229	0x6F0F	# <CJK>
-0x422A	0x964B	# <CJK>
-0x422B	0x8606	# <CJK>
-0x422C	0x76E7	# <CJK>
-0x422D	0x9871	# <CJK>
-0x422E	0x5EEC	# <CJK>
-0x422F	0x7210	# <CJK>
-0x4230	0x64C4	# <CJK>
-0x4231	0x6EF7	# <CJK>
-0x4232	0x865C	# <CJK>
-0x4233	0x9B6F	# <CJK>
-0x4234	0x9E93	# <CJK>
-0x4235	0x788C	# <CJK>
-0x4236	0x9732	# <CJK>
-0x4237	0x8DEF	# <CJK>
-0x4238	0x8CC2	# <CJK>
-0x4239	0x9E7F	# <CJK>
-0x423A	0x6F5E	# <CJK>
-0x423B	0x7984	# <CJK>
-0x423C	0x9332	# <CJK>
-0x423D	0x9678	# <CJK>
-0x423E	0x622E	# <CJK>
-0x423F	0x9A62	# <CJK>
-0x4240	0x5415	# <CJK>
-0x4241	0x92C1	# <CJK>
-0x4242	0x4FA3	# <CJK>
-0x4243	0x65C5	# <CJK>
-0x4244	0x5C65	# <CJK>
-0x4245	0x5C62	# <CJK>
-0x4246	0x7E37	# <CJK>
-0x4247	0x616E	# <CJK>
-0x4248	0x6C2F	# <CJK>
-0x4249	0x5F8B	# <CJK>
-0x424A	0x7387	# <CJK>
-0x424B	0x6FFE	# <CJK>
-0x424C	0x7DD1	# <CJK>
-0x424D	0x5DD2	# <CJK>
-0x424E	0x6523	# <CJK>
-0x424F	0x5B7F	# <CJK>
-0x4250	0x7064	# <CJK>
-0x4251	0x5375	# <CJK>
-0x4252	0x4E82	# <CJK>
-0x4253	0x63A0	# <CJK>
-0x4254	0x7565	# <CJK>
-0x4255	0x6384	# <CJK>
-0x4256	0x8F2A	# <CJK>
-0x4257	0x502B	# <CJK>
-0x4258	0x4F96	# <CJK>
-0x4259	0x6DEA	# <CJK>
-0x425A	0x7DB8	# <CJK>
-0x425B	0x8AD6	# <CJK>
-0x425C	0x863F	# <CJK>
-0x425D	0x87BA	# <CJK>
-0x425E	0x7F85	# <CJK>
-0x425F	0x908F	# <CJK>
-0x4260	0x947C	# <CJK>
-0x4261	0x7C6E	# <CJK>
-0x4262	0x9A3E	# <CJK>
-0x4263	0x88F8	# <CJK>
-0x4264	0x843D	# <CJK>
-0x4265	0x6D1B	# <CJK>
-0x4266	0x99F1	# <CJK>
-0x4267	0x7D61	# <CJK>
-0x4268	0x5ABD	# <CJK>
-0x4269	0x9EBB	# <CJK>
-0x426A	0x746A	# <CJK>
-0x426B	0x78BC	# <CJK>
-0x426C	0x879E	# <CJK>
-0x426D	0x99AC	# <CJK>
-0x426E	0x99E1	# <CJK>
-0x426F	0x561B	# <CJK>
-0x4270	0x55CE	# <CJK>
-0x4271	0x57CB	# <CJK>
-0x4272	0x8CB7	# <CJK>
-0x4273	0x9EA5	# <CJK>
-0x4274	0x8CE3	# <CJK>
-0x4275	0x9081	# <CJK>
-0x4276	0x8109	# <CJK>
-0x4277	0x779E	# <CJK>
-0x4278	0x9945	# <CJK>
-0x4279	0x883B	# <CJK>
-0x427A	0x6EFF	# <CJK>
-0x427B	0x8513	# <CJK>
-0x427C	0x66FC	# <CJK>
-0x427D	0x6162	# <CJK>
-0x427E	0x6F2B	# <CJK>
-0x4321	0x8B3E	# <CJK>
-0x4322	0x8292	# <CJK>
-0x4323	0x832B	# <CJK>
-0x4324	0x76F2	# <CJK>
-0x4325	0x6C13	# <CJK>
-0x4326	0x5FD9	# <CJK>
-0x4327	0x83BD	# <CJK>
-0x4328	0x732B	# <CJK>
-0x4329	0x8305	# <CJK>
-0x432A	0x9328	# <CJK>
-0x432B	0x6BDB	# <CJK>
-0x432C	0x77DB	# <CJK>
-0x432D	0x925A	# <CJK>
-0x432E	0x536F	# <CJK>
-0x432F	0x8302	# <CJK>
-0x4330	0x5192	# <CJK>
-0x4331	0x5E3D	# <CJK>
-0x4332	0x8C8C	# <CJK>
-0x4333	0x8CBF	# <CJK>
-0x4334	0x9EBD	# <CJK>
-0x4335	0x73AB	# <CJK>
-0x4336	0x679A	# <CJK>
-0x4337	0x6885	# <CJK>
-0x4338	0x9176	# <CJK>
-0x4339	0x9709	# <CJK>
-0x433A	0x7164	# <CJK>
-0x433B	0x6CA1	# <CJK>
-0x433C	0x7709	# <CJK>
-0x433D	0x5A92	# <CJK>
-0x433E	0x9382	# <CJK>
-0x433F	0x6BCF	# <CJK>
-0x4340	0x7F8E	# <CJK>
-0x4341	0x6627	# <CJK>
-0x4342	0x5BD0	# <CJK>
-0x4343	0x59B9	# <CJK>
-0x4344	0x5A9A	# <CJK>
-0x4345	0x9580	# <CJK>
-0x4346	0x60B6	# <CJK>
-0x4347	0x5011	# <CJK>
-0x4348	0x840C	# <CJK>
-0x4349	0x8499	# <CJK>
-0x434A	0x6AAC	# <CJK>
-0x434B	0x76DF	# <CJK>
-0x434C	0x9333	# <CJK>
-0x434D	0x731B	# <CJK>
-0x434E	0x5922	# <CJK>
-0x434F	0x5B5F	# <CJK>
-0x4350	0x772F	# <CJK>
-0x4351	0x919A	# <CJK>
-0x4352	0x9761	# <CJK>
-0x4353	0x7CDC	# <CJK>
-0x4354	0x8FF7	# <CJK>
-0x4355	0x8B0E	# <CJK>
-0x4356	0x5F4C	# <CJK>
-0x4357	0x7C73	# <CJK>
-0x4358	0x79D8	# <CJK>
-0x4359	0x8993	# <CJK>
-0x435A	0x6CCC	# <CJK>
-0x435B	0x871C	# <CJK>
-0x435C	0x5BC6	# <CJK>
-0x435D	0x5E42	# <CJK>
-0x435E	0x68C9	# <CJK>
-0x435F	0x7720	# <CJK>
-0x4360	0x7DBF	# <CJK>
-0x4361	0x5195	# <CJK>
-0x4362	0x514D	# <CJK>
-0x4363	0x52C9	# <CJK>
-0x4364	0x5A29	# <CJK>
-0x4365	0x7DEC	# <CJK>
-0x4366	0x9762	# <CJK>
-0x4367	0x82D7	# <CJK>
-0x4368	0x63CF	# <CJK>
-0x4369	0x7784	# <CJK>
-0x436A	0x85D0	# <CJK>
-0x436B	0x79D2	# <CJK>
-0x436C	0x6E3A	# <CJK>
-0x436D	0x5EDF	# <CJK>
-0x436E	0x5999	# <CJK>
-0x436F	0x8511	# <CJK>
-0x4370	0x6EC5	# <CJK>
-0x4371	0x6C11	# <CJK>
-0x4372	0x62BF	# <CJK>
-0x4373	0x76BF	# <CJK>
-0x4374	0x654F	# <CJK>
-0x4375	0x61AB	# <CJK>
-0x4376	0x95A9	# <CJK>
-0x4377	0x660E	# <CJK>
-0x4378	0x879F	# <CJK>
-0x4379	0x9CF4	# <CJK>
-0x437A	0x9298	# <CJK>
-0x437B	0x540D	# <CJK>
-0x437C	0x547D	# <CJK>
-0x437D	0x8B2C	# <CJK>
-0x437E	0x6478	# <CJK>
-0x4421	0x6479	# <CJK>
-0x4422	0x8611	# <CJK>
-0x4423	0x6A21	# <CJK>
-0x4424	0x819C	# <CJK>
-0x4425	0x78E8	# <CJK>
-0x4426	0x6469	# <CJK>
-0x4427	0x9B54	# <CJK>
-0x4428	0x62B9	# <CJK>
-0x4429	0x672B	# <CJK>
-0x442A	0x83AB	# <CJK>
-0x442B	0x58A8	# <CJK>
-0x442C	0x9ED8	# <CJK>
-0x442D	0x6CAB	# <CJK>
-0x442E	0x6F20	# <CJK>
-0x442F	0x5BDE	# <CJK>
-0x4430	0x964C	# <CJK>
-0x4431	0x8B00	# <CJK>
-0x4432	0x725F	# <CJK>
-0x4433	0x67D0	# <CJK>
-0x4434	0x62C7	# <CJK>
-0x4435	0x7261	# <CJK>
-0x4436	0x755D	# <CJK>
-0x4437	0x59C6	# <CJK>
-0x4438	0x6BCD	# <CJK>
-0x4439	0x5893	# <CJK>
-0x443A	0x66AE	# <CJK>
-0x443B	0x5E55	# <CJK>
-0x443C	0x52DF	# <CJK>
-0x443D	0x6155	# <CJK>
-0x443E	0x6728	# <CJK>
-0x443F	0x76EE	# <CJK>
-0x4440	0x7766	# <CJK>
-0x4441	0x7267	# <CJK>
-0x4442	0x7A46	# <CJK>
-0x4443	0x62FF	# <CJK>
-0x4444	0x54EA	# <CJK>
-0x4445	0x5450	# <CJK>
-0x4446	0x9209	# <CJK>
-0x4447	0x90A3	# <CJK>
-0x4448	0x5A1C	# <CJK>
-0x4449	0x7D0D	# <CJK>
-0x444A	0x6C16	# <CJK>
-0x444B	0x4E43	# <CJK>
-0x444C	0x5976	# <CJK>
-0x444D	0x8010	# <CJK>
-0x444E	0x5948	# <CJK>
-0x444F	0x5357	# <CJK>
-0x4450	0x7537	# <CJK>
-0x4451	0x96E3	# <CJK>
-0x4452	0x56CA	# <CJK>
-0x4453	0x6493	# <CJK>
-0x4454	0x8166	# <CJK>
-0x4455	0x60F1	# <CJK>
-0x4456	0x9B27	# <CJK>
-0x4457	0x6DD6	# <CJK>
-0x4458	0x5462	# <CJK>
-0x4459	0x9912	# <CJK>
-0x445A	0x5185	# <CJK>
-0x445B	0x5AE9	# <CJK>
-0x445C	0x80FD	# <CJK>
-0x445D	0x59AE	# <CJK>
-0x445E	0x9713	# <CJK>
-0x445F	0x502A	# <CJK>
-0x4460	0x6CE5	# <CJK>
-0x4461	0x5C3C	# <CJK>
-0x4462	0x64EC	# <CJK>
-0x4463	0x4F60	# <CJK>
-0x4464	0x533F	# <CJK>
-0x4465	0x81A9	# <CJK>
-0x4466	0x9006	# <CJK>
-0x4467	0x6EBA	# <CJK>
-0x4468	0x852B	# <CJK>
-0x4469	0x62C8	# <CJK>
-0x446A	0x5E74	# <CJK>
-0x446B	0x78BE	# <CJK>
-0x446C	0x6506	# <CJK>
-0x446D	0x637B	# <CJK>
-0x446E	0x5FF5	# <CJK>
-0x446F	0x5A18	# <CJK>
-0x4470	0x91C0	# <CJK>
-0x4471	0x9CE5	# <CJK>
-0x4472	0x5C3F	# <CJK>
-0x4473	0x634F	# <CJK>
-0x4474	0x8076	# <CJK>
-0x4475	0x5B7D	# <CJK>
-0x4476	0x5699	# <CJK>
-0x4477	0x9477	# <CJK>
-0x4478	0x93B3	# <CJK>
-0x4479	0x6D85	# <CJK>
-0x447A	0x60A8	# <CJK>
-0x447B	0x6AB8	# <CJK>
-0x447C	0x7370	# <CJK>
-0x447D	0x51DD	# <CJK>
-0x447E	0x5BE7	# <CJK>
-0x4521	0x64F0	# <CJK>
-0x4522	0x6FD8	# <CJK>
-0x4523	0x725B	# <CJK>
-0x4524	0x626D	# <CJK>
-0x4525	0x9215	# <CJK>
-0x4526	0x7D10	# <CJK>
-0x4527	0x81BF	# <CJK>
-0x4528	0x6FC3	# <CJK>
-0x4529	0x8FB2	# <CJK>
-0x452A	0x5F04	# <CJK>
-0x452B	0x5974	# <CJK>
-0x452C	0x52AA	# <CJK>
-0x452D	0x6012	# <CJK>
-0x452E	0x5973	# <CJK>
-0x452F	0x6696	# <CJK>
-0x4530	0x8650	# <CJK>
-0x4531	0x7627	# <CJK>
-0x4532	0x632A	# <CJK>
-0x4533	0x61E6	# <CJK>
-0x4534	0x7CEF	# <CJK>
-0x4535	0x8AFE	# <CJK>
-0x4536	0x54E6	# <CJK>
-0x4537	0x6B50	# <CJK>
-0x4538	0x9DD7	# <CJK>
-0x4539	0x6BC6	# <CJK>
-0x453A	0x85D5	# <CJK>
-0x453B	0x5614	# <CJK>
-0x453C	0x5076	# <CJK>
-0x453D	0x6F1A	# <CJK>
-0x453E	0x556A	# <CJK>
-0x453F	0x8DB4	# <CJK>
-0x4540	0x722C	# <CJK>
-0x4541	0x5E15	# <CJK>
-0x4542	0x6015	# <CJK>
-0x4543	0x7436	# <CJK>
-0x4544	0x62CD	# <CJK>
-0x4545	0x6392	# <CJK>
-0x4546	0x724C	# <CJK>
-0x4547	0x5F98	# <CJK>
-0x4548	0x6E43	# <CJK>
-0x4549	0x6D3E	# <CJK>
-0x454A	0x6500	# <CJK>
-0x454B	0x6F58	# <CJK>
-0x454C	0x76E4	# <CJK>
-0x454D	0x78D0	# <CJK>
-0x454E	0x76FC	# <CJK>
-0x454F	0x7554	# <CJK>
-0x4550	0x5224	# <CJK>
-0x4551	0x53DB	# <CJK>
-0x4552	0x4E53	# <CJK>
-0x4553	0x9F90	# <CJK>
-0x4554	0x65C1	# <CJK>
-0x4555	0x802A	# <CJK>
-0x4556	0x80D6	# <CJK>
-0x4557	0x629B	# <CJK>
-0x4558	0x5486	# <CJK>
-0x4559	0x5228	# <CJK>
-0x455A	0x70AE	# <CJK>
-0x455B	0x888D	# <CJK>
-0x455C	0x8DD1	# <CJK>
-0x455D	0x6CE1	# <CJK>
-0x455E	0x5478	# <CJK>
-0x455F	0x80DA	# <CJK>
-0x4560	0x57F9	# <CJK>
-0x4561	0x88F4	# <CJK>
-0x4562	0x8CE0	# <CJK>
-0x4563	0x966A	# <CJK>
-0x4564	0x914D	# <CJK>
-0x4565	0x4F69	# <CJK>
-0x4566	0x6C9B	# <CJK>
-0x4567	0x5674	# <CJK>
-0x4568	0x76C6	# <CJK>
-0x4569	0x7830	# <CJK>
-0x456A	0x62A8	# <CJK>
-0x456B	0x70F9	# <CJK>
-0x456C	0x6F8E	# <CJK>
-0x456D	0x5F6D	# <CJK>
-0x456E	0x84EC	# <CJK>
-0x456F	0x68DA	# <CJK>
-0x4570	0x787C	# <CJK>
-0x4571	0x7BF7	# <CJK>
-0x4572	0x81A8	# <CJK>
-0x4573	0x670B	# <CJK>
-0x4574	0x9D6C	# <CJK>
-0x4575	0x6367	# <CJK>
-0x4576	0x78B0	# <CJK>
-0x4577	0x576F	# <CJK>
-0x4578	0x7812	# <CJK>
-0x4579	0x9739	# <CJK>
-0x457A	0x6279	# <CJK>
-0x457B	0x62AB	# <CJK>
-0x457C	0x5288	# <CJK>
-0x457D	0x7435	# <CJK>
-0x457E	0x6BD7	# <CJK>
-0x4621	0x5564	# <CJK>
-0x4622	0x813E	# <CJK>
-0x4623	0x75B2	# <CJK>
-0x4624	0x76AE	# <CJK>
-0x4625	0x5339	# <CJK>
-0x4626	0x75DE	# <CJK>
-0x4627	0x50FB	# <CJK>
-0x4628	0x5C41	# <CJK>
-0x4629	0x8B6C	# <CJK>
-0x462A	0x7BC7	# <CJK>
-0x462B	0x504F	# <CJK>
-0x462C	0x7247	# <CJK>
-0x462D	0x9A19	# <CJK>
-0x462E	0x98C4	# <CJK>
-0x462F	0x6F02	# <CJK>
-0x4630	0x74E2	# <CJK>
-0x4631	0x7968	# <CJK>
-0x4632	0x6487	# <CJK>
-0x4633	0x77A5	# <CJK>
-0x4634	0x62FC	# <CJK>
-0x4635	0x983B	# <CJK>
-0x4636	0x8CA7	# <CJK>
-0x4637	0x54C1	# <CJK>
-0x4638	0x8058	# <CJK>
-0x4639	0x4E52	# <CJK>
-0x463A	0x576A	# <CJK>
-0x463B	0x860B	# <CJK>
-0x463C	0x840D	# <CJK>
-0x463D	0x5E73	# <CJK>
-0x463E	0x6191	# <CJK>
-0x463F	0x74F6	# <CJK>
-0x4640	0x8A55	# <CJK>
-0x4641	0x5C4F	# <CJK>
-0x4642	0x5761	# <CJK>
-0x4643	0x6F51	# <CJK>
-0x4644	0x9817	# <CJK>
-0x4645	0x5A46	# <CJK>
-0x4646	0x7834	# <CJK>
-0x4647	0x9B44	# <CJK>
-0x4648	0x8FEB	# <CJK>
-0x4649	0x7C95	# <CJK>
-0x464A	0x5256	# <CJK>
-0x464B	0x64B2	# <CJK>
-0x464C	0x92EA	# <CJK>
-0x464D	0x50D5	# <CJK>
-0x464E	0x8386	# <CJK>
-0x464F	0x8461	# <CJK>
-0x4650	0x83E9	# <CJK>
-0x4651	0x84B2	# <CJK>
-0x4652	0x57D4	# <CJK>
-0x4653	0x6A38	# <CJK>
-0x4654	0x5703	# <CJK>
-0x4655	0x666E	# <CJK>
-0x4656	0x6D66	# <CJK>
-0x4657	0x8B5C	# <CJK>
-0x4658	0x66DD	# <CJK>
-0x4659	0x7011	# <CJK>
-0x465A	0x671F	# <CJK>
-0x465B	0x6B3A	# <CJK>
-0x465C	0x68F2	# <CJK>
-0x465D	0x621A	# <CJK>
-0x465E	0x59BB	# <CJK>
-0x465F	0x4E03	# <CJK>
-0x4660	0x51C4	# <CJK>
-0x4661	0x6F06	# <CJK>
-0x4662	0x67D2	# <CJK>
-0x4663	0x6C8F	# <CJK>
-0x4664	0x5176	# <CJK>
-0x4665	0x68CB	# <CJK>
-0x4666	0x5947	# <CJK>
-0x4667	0x6B67	# <CJK>
-0x4668	0x7566	# <CJK>
-0x4669	0x5D0E	# <CJK>
-0x466A	0x81CD	# <CJK>
-0x466B	0x9F4A	# <CJK>
-0x466C	0x65D7	# <CJK>
-0x466D	0x7948	# <CJK>
-0x466E	0x7941	# <CJK>
-0x466F	0x9A0E	# <CJK>
-0x4670	0x8D77	# <CJK>
-0x4671	0x8C48	# <CJK>
-0x4672	0x4E5E	# <CJK>
-0x4673	0x4F01	# <CJK>
-0x4674	0x5553	# <CJK>
-0x4675	0x5951	# <CJK>
-0x4676	0x780C	# <CJK>
-0x4677	0x5668	# <CJK>
-0x4678	0x6C23	# <CJK>
-0x4679	0x8FC4	# <CJK>
-0x467A	0x68C4	# <CJK>
-0x467B	0x6C7D	# <CJK>
-0x467C	0x6CE3	# <CJK>
-0x467D	0x8A16	# <CJK>
-0x467E	0x6390	# <CJK>
-0x4721	0x6070	# <CJK>
-0x4722	0x6D3D	# <CJK>
-0x4723	0x727D	# <CJK>
-0x4724	0x6266	# <CJK>
-0x4725	0x91FA	# <CJK>
-0x4726	0x925B	# <CJK>
-0x4727	0x5343	# <CJK>
-0x4728	0x9077	# <CJK>
-0x4729	0x7C3D	# <CJK>
-0x472A	0x4EDF	# <CJK>
-0x472B	0x8B19	# <CJK>
-0x472C	0x4E7E	# <CJK>
-0x472D	0x9ED4	# <CJK>
-0x472E	0x9322	# <CJK>
-0x472F	0x9257	# <CJK>
-0x4730	0x524D	# <CJK>
-0x4731	0x6F5B	# <CJK>
-0x4732	0x9063	# <CJK>
-0x4733	0x6DFA	# <CJK>
-0x4734	0x8B74	# <CJK>
-0x4735	0x5879	# <CJK>
-0x4736	0x5D4C	# <CJK>
-0x4737	0x6B20	# <CJK>
-0x4738	0x6B49	# <CJK>
-0x4739	0x69CD	# <CJK>
-0x473A	0x55C6	# <CJK>
-0x473B	0x8154	# <CJK>
-0x473C	0x7F8C	# <CJK>
-0x473D	0x58BB	# <CJK>
-0x473E	0x8594	# <CJK>
-0x473F	0x5F3A	# <CJK>
-0x4740	0x6436	# <CJK>
-0x4741	0x6A47	# <CJK>
-0x4742	0x936C	# <CJK>
-0x4743	0x6572	# <CJK>
-0x4744	0x6084	# <CJK>
-0x4745	0x6A4B	# <CJK>
-0x4746	0x77A7	# <CJK>
-0x4747	0x55AC	# <CJK>
-0x4748	0x50D1	# <CJK>
-0x4749	0x5DE7	# <CJK>
-0x474A	0x9798	# <CJK>
-0x474B	0x64AC	# <CJK>
-0x474C	0x7FF9	# <CJK>
-0x474D	0x5CED	# <CJK>
-0x474E	0x4FCF	# <CJK>
-0x474F	0x7AC5	# <CJK>
-0x4750	0x5207	# <CJK>
-0x4751	0x8304	# <CJK>
-0x4752	0x4E14	# <CJK>
-0x4753	0x602F	# <CJK>
-0x4754	0x7ACA	# <CJK>
-0x4755	0x6B3D	# <CJK>
-0x4756	0x4FB5	# <CJK>
-0x4757	0x89AA	# <CJK>
-0x4758	0x79E6	# <CJK>
-0x4759	0x7434	# <CJK>
-0x475A	0x52E4	# <CJK>
-0x475B	0x82B9	# <CJK>
-0x475C	0x64D2	# <CJK>
-0x475D	0x79BD	# <CJK>
-0x475E	0x5BE2	# <CJK>
-0x475F	0x6C81	# <CJK>
-0x4760	0x9752	# <CJK>
-0x4761	0x8F15	# <CJK>
-0x4762	0x6C2B	# <CJK>
-0x4763	0x50BE	# <CJK>
-0x4764	0x537F	# <CJK>
-0x4765	0x6E05	# <CJK>
-0x4766	0x64CE	# <CJK>
-0x4767	0x6674	# <CJK>
-0x4768	0x6C30	# <CJK>
-0x4769	0x60C5	# <CJK>
-0x476A	0x9803	# <CJK>
-0x476B	0x8ACB	# <CJK>
-0x476C	0x6176	# <CJK>
-0x476D	0x74CA	# <CJK>
-0x476E	0x7AAE	# <CJK>
-0x476F	0x79CB	# <CJK>
-0x4770	0x4E18	# <CJK>
-0x4771	0x90B1	# <CJK>
-0x4772	0x7403	# <CJK>
-0x4773	0x6C42	# <CJK>
-0x4774	0x56DA	# <CJK>
-0x4775	0x914B	# <CJK>
-0x4776	0x6CC5	# <CJK>
-0x4777	0x8DA8	# <CJK>
-0x4778	0x5340	# <CJK>
-0x4779	0x86C6	# <CJK>
-0x477A	0x66F2	# <CJK>
-0x477B	0x8EC0	# <CJK>
-0x477C	0x5C48	# <CJK>
-0x477D	0x9A45	# <CJK>
-0x477E	0x6E20	# <CJK>
-0x4821	0x53D6	# <CJK>
-0x4822	0x5A36	# <CJK>
-0x4823	0x9F72	# <CJK>
-0x4824	0x8DA3	# <CJK>
-0x4825	0x53BB	# <CJK>
-0x4826	0x5708	# <CJK>
-0x4827	0x9874	# <CJK>
-0x4828	0x6B0A	# <CJK>
-0x4829	0x919B	# <CJK>
-0x482A	0x6CC9	# <CJK>
-0x482B	0x5168	# <CJK>
-0x482C	0x75CA	# <CJK>
-0x482D	0x62F3	# <CJK>
-0x482E	0x72AC	# <CJK>
-0x482F	0x5238	# <CJK>
-0x4830	0x52F8	# <CJK>
-0x4831	0x7F3A	# <CJK>
-0x4832	0x7094	# <CJK>
-0x4833	0x7638	# <CJK>
-0x4834	0x5374	# <CJK>
-0x4835	0x9D72	# <CJK>
-0x4836	0x69B7	# <CJK>
-0x4837	0x78BA	# <CJK>
-0x4838	0x96C0	# <CJK>
-0x4839	0x88D9	# <CJK>
-0x483A	0x7FA4	# <CJK>
-0x483B	0x7136	# <CJK>
-0x483C	0x71C3	# <CJK>
-0x483D	0x5189	# <CJK>
-0x483E	0x67D3	# <CJK>
-0x483F	0x74E4	# <CJK>
-0x4840	0x58E4	# <CJK>
-0x4841	0x6518	# <CJK>
-0x4842	0x56B7	# <CJK>
-0x4843	0x8B93	# <CJK>
-0x4844	0x9952	# <CJK>
-0x4845	0x64FE	# <CJK>
-0x4846	0x7E5E	# <CJK>
-0x4847	0x60F9	# <CJK>
-0x4848	0x71B1	# <CJK>
-0x4849	0x58EC	# <CJK>
-0x484A	0x4EC1	# <CJK>
-0x484B	0x4EBA	# <CJK>
-0x484C	0x5FCD	# <CJK>
-0x484D	0x97CC	# <CJK>
-0x484E	0x4EFB	# <CJK>
-0x484F	0x8A8D	# <CJK>
-0x4850	0x5203	# <CJK>
-0x4851	0x598A	# <CJK>
-0x4852	0x7D09	# <CJK>
-0x4853	0x6254	# <CJK>
-0x4854	0x4ECD	# <CJK>
-0x4855	0x65E5	# <CJK>
-0x4856	0x620E	# <CJK>
-0x4857	0x8338	# <CJK>
-0x4858	0x84C9	# <CJK>
-0x4859	0x69AE	# <CJK>
-0x485A	0x878D	# <CJK>
-0x485B	0x7194	# <CJK>
-0x485C	0x6EB6	# <CJK>
-0x485D	0x5BB9	# <CJK>
-0x485E	0x7D68	# <CJK>
-0x485F	0x5197	# <CJK>
-0x4860	0x63C9	# <CJK>
-0x4861	0x67D4	# <CJK>
-0x4862	0x8089	# <CJK>
-0x4863	0x8339	# <CJK>
-0x4864	0x8815	# <CJK>
-0x4865	0x5112	# <CJK>
-0x4866	0x5B7A	# <CJK>
-0x4867	0x5982	# <CJK>
-0x4868	0x8FB1	# <CJK>
-0x4869	0x4E73	# <CJK>
-0x486A	0x6C5D	# <CJK>
-0x486B	0x5165	# <CJK>
-0x486C	0x8925	# <CJK>
-0x486D	0x8EDF	# <CJK>
-0x486E	0x962E	# <CJK>
-0x486F	0x854A	# <CJK>
-0x4870	0x745E	# <CJK>
-0x4871	0x92ED	# <CJK>
-0x4872	0x958F	# <CJK>
-0x4873	0x6F64	# <CJK>
-0x4874	0x82E5	# <CJK>
-0x4875	0x5F31	# <CJK>
-0x4876	0x6492	# <CJK>
-0x4877	0x7051	# <CJK>
-0x4878	0x85A9	# <CJK>
-0x4879	0x816E	# <CJK>
-0x487A	0x9C13	# <CJK>
-0x487B	0x585E	# <CJK>
-0x487C	0x8CFD	# <CJK>
-0x487D	0x4E09	# <CJK>
-0x487E	0x53C1	# <CJK>
-0x4921	0x5098	# <CJK>
-0x4922	0x6563	# <CJK>
-0x4923	0x6851	# <CJK>
-0x4924	0x55D3	# <CJK>
-0x4925	0x55AA	# <CJK>
-0x4926	0x6414	# <CJK>
-0x4927	0x9A37	# <CJK>
-0x4928	0x6383	# <CJK>
-0x4929	0x5AC2	# <CJK>
-0x492A	0x745F	# <CJK>
-0x492B	0x8272	# <CJK>
-0x492C	0x6F80	# <CJK>
-0x492D	0x68EE	# <CJK>
-0x492E	0x50E7	# <CJK>
-0x492F	0x838E	# <CJK>
-0x4930	0x7802	# <CJK>
-0x4931	0x6BBA	# <CJK>
-0x4932	0x5239	# <CJK>
-0x4933	0x6C99	# <CJK>
-0x4934	0x7D17	# <CJK>
-0x4935	0x50BB	# <CJK>
-0x4936	0x5565	# <CJK>
-0x4937	0x715E	# <CJK>
-0x4938	0x7BE9	# <CJK>
-0x4939	0x66EC	# <CJK>
-0x493A	0x73CA	# <CJK>
-0x493B	0x82EB	# <CJK>
-0x493C	0x6749	# <CJK>
-0x493D	0x5C71	# <CJK>
-0x493E	0x5220	# <CJK>
-0x493F	0x717D	# <CJK>
-0x4940	0x886B	# <CJK>
-0x4941	0x9583	# <CJK>
-0x4942	0x965D	# <CJK>
-0x4943	0x64C5	# <CJK>
-0x4944	0x8D0D	# <CJK>
-0x4945	0x81B3	# <CJK>
-0x4946	0x5584	# <CJK>
-0x4947	0x6C55	# <CJK>
-0x4948	0x6247	# <CJK>
-0x4949	0x7E55	# <CJK>
-0x494A	0x5892	# <CJK>
-0x494B	0x50B7	# <CJK>
-0x494C	0x5546	# <CJK>
-0x494D	0x8CDE	# <CJK>
-0x494E	0x664C	# <CJK>
-0x494F	0x4E0A	# <CJK>
-0x4950	0x5C1A	# <CJK>
-0x4951	0x88F3	# <CJK>
-0x4952	0x68A2	# <CJK>
-0x4953	0x634E	# <CJK>
-0x4954	0x7A0D	# <CJK>
-0x4955	0x71D2	# <CJK>
-0x4956	0x828D	# <CJK>
-0x4957	0x52FA	# <CJK>
-0x4958	0x97F6	# <CJK>
-0x4959	0x5C11	# <CJK>
-0x495A	0x54E8	# <CJK>
-0x495B	0x90B5	# <CJK>
-0x495C	0x7D39	# <CJK>
-0x495D	0x5962	# <CJK>
-0x495E	0x8CD2	# <CJK>
-0x495F	0x86C7	# <CJK>
-0x4960	0x820C	# <CJK>
-0x4961	0x6368	# <CJK>
-0x4962	0x8D66	# <CJK>
-0x4963	0x651D	# <CJK>
-0x4964	0x5C04	# <CJK>
-0x4965	0x61FE	# <CJK>
-0x4966	0x6D89	# <CJK>
-0x4967	0x793E	# <CJK>
-0x4968	0x8A2D	# <CJK>
-0x4969	0x7837	# <CJK>
-0x496A	0x7533	# <CJK>
-0x496B	0x547B	# <CJK>
-0x496C	0x4F38	# <CJK>
-0x496D	0x8EAB	# <CJK>
-0x496E	0x6DF1	# <CJK>
-0x496F	0x5A20	# <CJK>
-0x4970	0x7D33	# <CJK>
-0x4971	0x795E	# <CJK>
-0x4972	0x6C88	# <CJK>
-0x4973	0x5BE9	# <CJK>
-0x4974	0x5B38	# <CJK>
-0x4975	0x751A	# <CJK>
-0x4976	0x814E	# <CJK>
-0x4977	0x614E	# <CJK>
-0x4978	0x6EF2	# <CJK>
-0x4979	0x8072	# <CJK>
-0x497A	0x751F	# <CJK>
-0x497B	0x7525	# <CJK>
-0x497C	0x7272	# <CJK>
-0x497D	0x5347	# <CJK>
-0x497E	0x7E69	# <CJK>
-0x4A21	0x7701	# <CJK>
-0x4A22	0x76DB	# <CJK>
-0x4A23	0x5269	# <CJK>
-0x4A24	0x52DD	# <CJK>
-0x4A25	0x8056	# <CJK>
-0x4A26	0x5E2B	# <CJK>
-0x4A27	0x5931	# <CJK>
-0x4A28	0x7345	# <CJK>
-0x4A29	0x65BD	# <CJK>
-0x4A2A	0x6FD5	# <CJK>
-0x4A2B	0x8A69	# <CJK>
-0x4A2C	0x5C38	# <CJK>
-0x4A2D	0x8671	# <CJK>
-0x4A2E	0x5341	# <CJK>
-0x4A2F	0x77F3	# <CJK>
-0x4A30	0x62FE	# <CJK>
-0x4A31	0x6642	# <CJK>
-0x4A32	0x4EC0	# <CJK>
-0x4A33	0x98DF	# <CJK>
-0x4A34	0x8755	# <CJK>
-0x4A35	0x5BE6	# <CJK>
-0x4A36	0x8B58	# <CJK>
-0x4A37	0x53F2	# <CJK>
-0x4A38	0x77E2	# <CJK>
-0x4A39	0x4F7F	# <CJK>
-0x4A3A	0x5C4E	# <CJK>
-0x4A3B	0x99DB	# <CJK>
-0x4A3C	0x59CB	# <CJK>
-0x4A3D	0x5F0F	# <CJK>
-0x4A3E	0x793A	# <CJK>
-0x4A3F	0x58EB	# <CJK>
-0x4A40	0x4E16	# <CJK>
-0x4A41	0x67FF	# <CJK>
-0x4A42	0x4E8B	# <CJK>
-0x4A43	0x62ED	# <CJK>
-0x4A44	0x8A93	# <CJK>
-0x4A45	0x901D	# <CJK>
-0x4A46	0x52E2	# <CJK>
-0x4A47	0x662F	# <CJK>
-0x4A48	0x55DC	# <CJK>
-0x4A49	0x566C	# <CJK>
-0x4A4A	0x9069	# <CJK>
-0x4A4B	0x4ED5	# <CJK>
-0x4A4C	0x4F8D	# <CJK>
-0x4A4D	0x91CB	# <CJK>
-0x4A4E	0x98FE	# <CJK>
-0x4A4F	0x6C0F	# <CJK>
-0x4A50	0x5E02	# <CJK>
-0x4A51	0x6043	# <CJK>
-0x4A52	0x5BA4	# <CJK>
-0x4A53	0x8996	# <CJK>
-0x4A54	0x8A66	# <CJK>
-0x4A55	0x6536	# <CJK>
-0x4A56	0x624B	# <CJK>
-0x4A57	0x9996	# <CJK>
-0x4A58	0x5B88	# <CJK>
-0x4A59	0x58FD	# <CJK>
-0x4A5A	0x6388	# <CJK>
-0x4A5B	0x552E	# <CJK>
-0x4A5C	0x53D7	# <CJK>
-0x4A5D	0x7626	# <CJK>
-0x4A5E	0x7378	# <CJK>
-0x4A5F	0x852C	# <CJK>
-0x4A60	0x6A1E	# <CJK>
-0x4A61	0x68B3	# <CJK>
-0x4A62	0x6B8A	# <CJK>
-0x4A63	0x6292	# <CJK>
-0x4A64	0x8F38	# <CJK>
-0x4A65	0x53D4	# <CJK>
-0x4A66	0x8212	# <CJK>
-0x4A67	0x6DD1	# <CJK>
-0x4A68	0x758F	# <CJK>
-0x4A69	0x66F8	# <CJK>
-0x4A6A	0x8D16	# <CJK>
-0x4A6B	0x5B70	# <CJK>
-0x4A6C	0x719F	# <CJK>
-0x4A6D	0x85AF	# <CJK>
-0x4A6E	0x6691	# <CJK>
-0x4A6F	0x66D9	# <CJK>
-0x4A70	0x7F72	# <CJK>
-0x4A71	0x8700	# <CJK>
-0x4A72	0x9ECD	# <CJK>
-0x4A73	0x9F20	# <CJK>
-0x4A74	0x5C6C	# <CJK>
-0x4A75	0x8853	# <CJK>
-0x4A76	0x8FF0	# <CJK>
-0x4A77	0x6A39	# <CJK>
-0x4A78	0x675F	# <CJK>
-0x4A79	0x620D	# <CJK>
-0x4A7A	0x7AEA	# <CJK>
-0x4A7B	0x5885	# <CJK>
-0x4A7C	0x5EB6	# <CJK>
-0x4A7D	0x6578	# <CJK>
-0x4A7E	0x6F31	# <CJK>
-0x4B21	0x6055	# <CJK>
-0x4B22	0x5237	# <CJK>
-0x4B23	0x800D	# <CJK>
-0x4B24	0x6454	# <CJK>
-0x4B25	0x8870	# <CJK>
-0x4B26	0x7529	# <CJK>
-0x4B27	0x5E25	# <CJK>
-0x4B28	0x6813	# <CJK>
-0x4B29	0x62F4	# <CJK>
-0x4B2A	0x971C	# <CJK>
-0x4B2B	0x96D9	# <CJK>
-0x4B2C	0x723D	# <CJK>
-0x4B2D	0x8AB0	# <CJK>
-0x4B2E	0x6C34	# <CJK>
-0x4B2F	0x7761	# <CJK>
-0x4B30	0x7A0E	# <CJK>
-0x4B31	0x542E	# <CJK>
-0x4B32	0x77AC	# <CJK>
-0x4B33	0x9806	# <CJK>
-0x4B34	0x821C	# <CJK>
-0x4B35	0x8AAC	# <CJK>
-0x4B36	0x78A9	# <CJK>
-0x4B37	0x6714	# <CJK>
-0x4B38	0x720D	# <CJK>
-0x4B39	0x65AF	# <CJK>
-0x4B3A	0x6495	# <CJK>
-0x4B3B	0x5636	# <CJK>
-0x4B3C	0x601D	# <CJK>
-0x4B3D	0x79C1	# <CJK>
-0x4B3E	0x53F8	# <CJK>
-0x4B3F	0x7D72	# <CJK>
-0x4B40	0x6B7B	# <CJK>
-0x4B41	0x8086	# <CJK>
-0x4B42	0x5BFA	# <CJK>
-0x4B43	0x55E3	# <CJK>
-0x4B44	0x56DB	# <CJK>
-0x4B45	0x4F3A	# <CJK>
-0x4B46	0x4F3C	# <CJK>
-0x4B47	0x98FC	# <CJK>
-0x4B48	0x5DF3	# <CJK>
-0x4B49	0x9B06	# <CJK>
-0x4B4A	0x8073	# <CJK>
-0x4B4B	0x616B	# <CJK>
-0x4B4C	0x980C	# <CJK>
-0x4B4D	0x9001	# <CJK>
-0x4B4E	0x5B8B	# <CJK>
-0x4B4F	0x8A1F	# <CJK>
-0x4B50	0x8AA6	# <CJK>
-0x4B51	0x641C	# <CJK>
-0x4B52	0x8258	# <CJK>
-0x4B53	0x64FB	# <CJK>
-0x4B54	0x55FD	# <CJK>
-0x4B55	0x8607	# <CJK>
-0x4B56	0x9165	# <CJK>
-0x4B57	0x4FD7	# <CJK>
-0x4B58	0x7D20	# <CJK>
-0x4B59	0x901F	# <CJK>
-0x4B5A	0x7C9F	# <CJK>
-0x4B5B	0x50F3	# <CJK>
-0x4B5C	0x5851	# <CJK>
-0x4B5D	0x6EAF	# <CJK>
-0x4B5E	0x5BBF	# <CJK>
-0x4B5F	0x8A34	# <CJK>
-0x4B60	0x8085	# <CJK>
-0x4B61	0x9178	# <CJK>
-0x4B62	0x849C	# <CJK>
-0x4B63	0x7B97	# <CJK>
-0x4B64	0x96D6	# <CJK>
-0x4B65	0x968B	# <CJK>
-0x4B66	0x96A8	# <CJK>
-0x4B67	0x7D8F	# <CJK>
-0x4B68	0x9AD3	# <CJK>
-0x4B69	0x788E	# <CJK>
-0x4B6A	0x6B72	# <CJK>
-0x4B6B	0x7A57	# <CJK>
-0x4B6C	0x9042	# <CJK>
-0x4B6D	0x96A7	# <CJK>
-0x4B6E	0x795F	# <CJK>
-0x4B6F	0x5B6B	# <CJK>
-0x4B70	0x640D	# <CJK>
-0x4B71	0x7B0B	# <CJK>
-0x4B72	0x84D1	# <CJK>
-0x4B73	0x68AD	# <CJK>
-0x4B74	0x5506	# <CJK>
-0x4B75	0x7E2E	# <CJK>
-0x4B76	0x7463	# <CJK>
-0x4B77	0x7D22	# <CJK>
-0x4B78	0x9396	# <CJK>
-0x4B79	0x6240	# <CJK>
-0x4B7A	0x584C	# <CJK>
-0x4B7B	0x4ED6	# <CJK>
-0x4B7C	0x5B83	# <CJK>
-0x4B7D	0x5979	# <CJK>
-0x4B7E	0x5854	# <CJK>
-0x4C21	0x737A	# <CJK>
-0x4C22	0x64BB	# <CJK>
-0x4C23	0x8E4B	# <CJK>
-0x4C24	0x8E0F	# <CJK>
-0x4C25	0x80CE	# <CJK>
-0x4C26	0x82D4	# <CJK>
-0x4C27	0x62AC	# <CJK>
-0x4C28	0x81FA	# <CJK>
-0x4C29	0x6CF0	# <CJK>
-0x4C2A	0x915E	# <CJK>
-0x4C2B	0x592A	# <CJK>
-0x4C2C	0x614B	# <CJK>
-0x4C2D	0x6C70	# <CJK>
-0x4C2E	0x574D	# <CJK>
-0x4C2F	0x6524	# <CJK>
-0x4C30	0x8CAA	# <CJK>
-0x4C31	0x7671	# <CJK>
-0x4C32	0x7058	# <CJK>
-0x4C33	0x58C7	# <CJK>
-0x4C34	0x6A80	# <CJK>
-0x4C35	0x75F0	# <CJK>
-0x4C36	0x6F6D	# <CJK>
-0x4C37	0x8B5A	# <CJK>
-0x4C38	0x8AC7	# <CJK>
-0x4C39	0x5766	# <CJK>
-0x4C3A	0x6BEF	# <CJK>
-0x4C3B	0x8892	# <CJK>
-0x4C3C	0x78B3	# <CJK>
-0x4C3D	0x63A2	# <CJK>
-0x4C3E	0x5606	# <CJK>
-0x4C3F	0x70AD	# <CJK>
-0x4C40	0x6E6F	# <CJK>
-0x4C41	0x5858	# <CJK>
-0x4C42	0x642A	# <CJK>
-0x4C43	0x5802	# <CJK>
-0x4C44	0x68E0	# <CJK>
-0x4C45	0x819B	# <CJK>
-0x4C46	0x5510	# <CJK>
-0x4C47	0x7CD6	# <CJK>
-0x4C48	0x5018	# <CJK>
-0x4C49	0x8EBA	# <CJK>
-0x4C4A	0x6DCC	# <CJK>
-0x4C4B	0x8D9F	# <CJK>
-0x4C4C	0x71D9	# <CJK>
-0x4C4D	0x638F	# <CJK>
-0x4C4E	0x6FE4	# <CJK>
-0x4C4F	0x6ED4	# <CJK>
-0x4C50	0x7E27	# <CJK>
-0x4C51	0x8404	# <CJK>
-0x4C52	0x6843	# <CJK>
-0x4C53	0x9003	# <CJK>
-0x4C54	0x6DD8	# <CJK>
-0x4C55	0x9676	# <CJK>
-0x4C56	0x8A0E	# <CJK>
-0x4C57	0x5957	# <CJK>
-0x4C58	0x7279	# <CJK>
-0x4C59	0x85E4	# <CJK>
-0x4C5A	0x9A30	# <CJK>
-0x4C5B	0x75BC	# <CJK>
-0x4C5C	0x8B04	# <CJK>
-0x4C5D	0x68AF	# <CJK>
-0x4C5E	0x5254	# <CJK>
-0x4C5F	0x8E22	# <CJK>
-0x4C60	0x92BB	# <CJK>
-0x4C61	0x63D0	# <CJK>
-0x4C62	0x984C	# <CJK>
-0x4C63	0x8E44	# <CJK>
-0x4C64	0x557C	# <CJK>
-0x4C65	0x9AD4	# <CJK>
-0x4C66	0x66FF	# <CJK>
-0x4C67	0x568F	# <CJK>
-0x4C68	0x60D5	# <CJK>
-0x4C69	0x6D95	# <CJK>
-0x4C6A	0x5243	# <CJK>
-0x4C6B	0x5C49	# <CJK>
-0x4C6C	0x5929	# <CJK>
-0x4C6D	0x6DFB	# <CJK>
-0x4C6E	0x586B	# <CJK>
-0x4C6F	0x7530	# <CJK>
-0x4C70	0x751C	# <CJK>
-0x4C71	0x606C	# <CJK>
-0x4C72	0x8214	# <CJK>
-0x4C73	0x8146	# <CJK>
-0x4C74	0x6311	# <CJK>
-0x4C75	0x689D	# <CJK>
-0x4C76	0x8FE2	# <CJK>
-0x4C77	0x773A	# <CJK>
-0x4C78	0x8DF3	# <CJK>
-0x4C79	0x8CBC	# <CJK>
-0x4C7A	0x9435	# <CJK>
-0x4C7B	0x5E16	# <CJK>
-0x4C7C	0x5EF3	# <CJK>
-0x4C7D	0x807D	# <CJK>
-0x4C7E	0x70F4	# <CJK>
-0x4D21	0x6C40	# <CJK>
-0x4D22	0x5EF7	# <CJK>
-0x4D23	0x505C	# <CJK>
-0x4D24	0x4EAD	# <CJK>
-0x4D25	0x5EAD	# <CJK>
-0x4D26	0x633A	# <CJK>
-0x4D27	0x8247	# <CJK>
-0x4D28	0x901A	# <CJK>
-0x4D29	0x6850	# <CJK>
-0x4D2A	0x916E	# <CJK>
-0x4D2B	0x77B3	# <CJK>
-0x4D2C	0x540C	# <CJK>
-0x4D2D	0x9285	# <CJK>
-0x4D2E	0x5F64	# <CJK>
-0x4D2F	0x7AE5	# <CJK>
-0x4D30	0x6876	# <CJK>
-0x4D31	0x6345	# <CJK>
-0x4D32	0x7B52	# <CJK>
-0x4D33	0x7D71	# <CJK>
-0x4D34	0x75DB	# <CJK>
-0x4D35	0x5077	# <CJK>
-0x4D36	0x6295	# <CJK>
-0x4D37	0x982D	# <CJK>
-0x4D38	0x900F	# <CJK>
-0x4D39	0x51F8	# <CJK>
-0x4D3A	0x79C3	# <CJK>
-0x4D3B	0x7A81	# <CJK>
-0x4D3C	0x5716	# <CJK>
-0x4D3D	0x5F92	# <CJK>
-0x4D3E	0x9014	# <CJK>
-0x4D3F	0x5857	# <CJK>
-0x4D40	0x5C60	# <CJK>
-0x4D41	0x571F	# <CJK>
-0x4D42	0x5410	# <CJK>
-0x4D43	0x5154	# <CJK>
-0x4D44	0x6E4D	# <CJK>
-0x4D45	0x5718	# <CJK>
-0x4D46	0x63A8	# <CJK>
-0x4D47	0x983D	# <CJK>
-0x4D48	0x817F	# <CJK>
-0x4D49	0x8715	# <CJK>
-0x4D4A	0x892A	# <CJK>
-0x4D4B	0x9000	# <CJK>
-0x4D4C	0x541E	# <CJK>
-0x4D4D	0x5C6F	# <CJK>
-0x4D4E	0x81C0	# <CJK>
-0x4D4F	0x62D6	# <CJK>
-0x4D50	0x6258	# <CJK>
-0x4D51	0x8131	# <CJK>
-0x4D52	0x9D15	# <CJK>
-0x4D53	0x9640	# <CJK>
-0x4D54	0x99B1	# <CJK>
-0x4D55	0x99DD	# <CJK>
-0x4D56	0x6A62	# <CJK>
-0x4D57	0x59A5	# <CJK>
-0x4D58	0x62D3	# <CJK>
-0x4D59	0x553E	# <CJK>
-0x4D5A	0x6316	# <CJK>
-0x4D5B	0x54C7	# <CJK>
-0x4D5C	0x86D9	# <CJK>
-0x4D5D	0x7AAA	# <CJK>
-0x4D5E	0x5A03	# <CJK>
-0x4D5F	0x74E6	# <CJK>
-0x4D60	0x896A	# <CJK>
-0x4D61	0x6B6A	# <CJK>
-0x4D62	0x5916	# <CJK>
-0x4D63	0x8C4C	# <CJK>
-0x4D64	0x5F4E	# <CJK>
-0x4D65	0x7063	# <CJK>
-0x4D66	0x73A9	# <CJK>
-0x4D67	0x9811	# <CJK>
-0x4D68	0x4E38	# <CJK>
-0x4D69	0x70F7	# <CJK>
-0x4D6A	0x5B8C	# <CJK>
-0x4D6B	0x7897	# <CJK>
-0x4D6C	0x633D	# <CJK>
-0x4D6D	0x665A	# <CJK>
-0x4D6E	0x7696	# <CJK>
-0x4D6F	0x60CB	# <CJK>
-0x4D70	0x5B9B	# <CJK>
-0x4D71	0x5A49	# <CJK>
-0x4D72	0x842C	# <CJK>
-0x4D73	0x8155	# <CJK>
-0x4D74	0x6C6A	# <CJK>
-0x4D75	0x738B	# <CJK>
-0x4D76	0x4EA1	# <CJK>
-0x4D77	0x6789	# <CJK>
-0x4D78	0x7DB2	# <CJK>
-0x4D79	0x5F80	# <CJK>
-0x4D7A	0x65FA	# <CJK>
-0x4D7B	0x671B	# <CJK>
-0x4D7C	0x5FD8	# <CJK>
-0x4D7D	0x5984	# <CJK>
-0x4D7E	0x5A01	# <CJK>
-0x4E21	0x5DCD	# <CJK>
-0x4E22	0x5FAE	# <CJK>
-0x4E23	0x5371	# <CJK>
-0x4E24	0x97CB	# <CJK>
-0x4E25	0x9055	# <CJK>
-0x4E26	0x6845	# <CJK>
-0x4E27	0x570D	# <CJK>
-0x4E28	0x552F	# <CJK>
-0x4E29	0x60DF	# <CJK>
-0x4E2A	0x7232	# <CJK>
-0x4E2B	0x6FF0	# <CJK>
-0x4E2C	0x7DAD	# <CJK>
-0x4E2D	0x8466	# <CJK>
-0x4E2E	0x840E	# <CJK>
-0x4E2F	0x59D4	# <CJK>
-0x4E30	0x5049	# <CJK>
-0x4E31	0x50DE	# <CJK>
-0x4E32	0x5C3E	# <CJK>
-0x4E33	0x7DEF	# <CJK>
-0x4E34	0x672A	# <CJK>
-0x4E35	0x851A	# <CJK>
-0x4E36	0x5473	# <CJK>
-0x4E37	0x754F	# <CJK>
-0x4E38	0x80C3	# <CJK>
-0x4E39	0x5582	# <CJK>
-0x4E3A	0x9B4F	# <CJK>
-0x4E3B	0x4F4D	# <CJK>
-0x4E3C	0x6E2D	# <CJK>
-0x4E3D	0x8B02	# <CJK>
-0x4E3E	0x5C09	# <CJK>
-0x4E3F	0x6170	# <CJK>
-0x4E40	0x885B	# <CJK>
-0x4E41	0x761F	# <CJK>
-0x4E42	0x6E29	# <CJK>
-0x4E43	0x868A	# <CJK>
-0x4E44	0x6587	# <CJK>
-0x4E45	0x805E	# <CJK>
-0x4E46	0x7D0B	# <CJK>
-0x4E47	0x543B	# <CJK>
-0x4E48	0x7A69	# <CJK>
-0x4E49	0x7D0A	# <CJK>
-0x4E4A	0x554F	# <CJK>
-0x4E4B	0x55E1	# <CJK>
-0x4E4C	0x7FC1	# <CJK>
-0x4E4D	0x74EE	# <CJK>
-0x4E4E	0x64BE	# <CJK>
-0x4E4F	0x8778	# <CJK>
-0x4E50	0x6E26	# <CJK>
-0x4E51	0x7AA9	# <CJK>
-0x4E52	0x6211	# <CJK>
-0x4E53	0x65A1	# <CJK>
-0x4E54	0x5367	# <CJK>
-0x4E55	0x63E1	# <CJK>
-0x4E56	0x6C83	# <CJK>
-0x4E57	0x5DEB	# <CJK>
-0x4E58	0x55DA	# <CJK>
-0x4E59	0x93A2	# <CJK>
-0x4E5A	0x70CF	# <CJK>
-0x4E5B	0x6C61	# <CJK>
-0x4E5C	0x8AA3	# <CJK>
-0x4E5D	0x5C4B	# <CJK>
-0x4E5E	0x7121	# <CJK>
-0x4E5F	0x856A	# <CJK>
-0x4E60	0x68A7	# <CJK>
-0x4E61	0x543E	# <CJK>
-0x4E62	0x5434	# <CJK>
-0x4E63	0x6BCB	# <CJK>
-0x4E64	0x6B66	# <CJK>
-0x4E65	0x4E94	# <CJK>
-0x4E66	0x6342	# <CJK>
-0x4E67	0x5348	# <CJK>
-0x4E68	0x821E	# <CJK>
-0x4E69	0x4F0D	# <CJK>
-0x4E6A	0x4FAE	# <CJK>
-0x4E6B	0x5862	# <CJK>
-0x4E6C	0x620A	# <CJK>
-0x4E6D	0x9727	# <CJK>
-0x4E6E	0x6664	# <CJK>
-0x4E6F	0x7269	# <CJK>
-0x4E70	0x52FF	# <CJK>
-0x4E71	0x52D9	# <CJK>
-0x4E72	0x609F	# <CJK>
-0x4E73	0x8AA4	# <CJK>
-0x4E74	0x6614	# <CJK>
-0x4E75	0x7199	# <CJK>
-0x4E76	0x6790	# <CJK>
-0x4E77	0x897F	# <CJK>
-0x4E78	0x7852	# <CJK>
-0x4E79	0x77FD	# <CJK>
-0x4E7A	0x6670	# <CJK>
-0x4E7B	0x563B	# <CJK>
-0x4E7C	0x5438	# <CJK>
-0x4E7D	0x932B	# <CJK>
-0x4E7E	0x72A7	# <CJK>
-0x4F21	0x7A00	# <CJK>
-0x4F22	0x606F	# <CJK>
-0x4F23	0x5E0C	# <CJK>
-0x4F24	0x6089	# <CJK>
-0x4F25	0x819D	# <CJK>
-0x4F26	0x5915	# <CJK>
-0x4F27	0x60DC	# <CJK>
-0x4F28	0x7184	# <CJK>
-0x4F29	0x70EF	# <CJK>
-0x4F2A	0x6EAA	# <CJK>
-0x4F2B	0x6C50	# <CJK>
-0x4F2C	0x7280	# <CJK>
-0x4F2D	0x6A84	# <CJK>
-0x4F2E	0x8972	# <CJK>
-0x4F2F	0x5E2D	# <CJK>
-0x4F30	0x7FD2	# <CJK>
-0x4F31	0x5AB3	# <CJK>
-0x4F32	0x559C	# <CJK>
-0x4F33	0x9291	# <CJK>
-0x4F34	0x6D17	# <CJK>
-0x4F35	0x7CFB	# <CJK>
-0x4F36	0x9699	# <CJK>
-0x4F37	0x6232	# <CJK>
-0x4F38	0x7D30	# <CJK>
-0x4F39	0x778E	# <CJK>
-0x4F3A	0x8766	# <CJK>
-0x4F3B	0x5323	# <CJK>
-0x4F3C	0x971E	# <CJK>
-0x4F3D	0x8F44	# <CJK>
-0x4F3E	0x6687	# <CJK>
-0x4F3F	0x5CFD	# <CJK>
-0x4F40	0x4FE0	# <CJK>
-0x4F41	0x72F9	# <CJK>
-0x4F42	0x4E0B	# <CJK>
-0x4F43	0x53A6	# <CJK>
-0x4F44	0x590F	# <CJK>
-0x4F45	0x5687	# <CJK>
-0x4F46	0x6380	# <CJK>
-0x4F47	0x9341	# <CJK>
-0x4F48	0x5148	# <CJK>
-0x4F49	0x4ED9	# <CJK>
-0x4F4A	0x9BAE	# <CJK>
-0x4F4B	0x7E96	# <CJK>
-0x4F4C	0x54B8	# <CJK>
-0x4F4D	0x8CE2	# <CJK>
-0x4F4E	0x929C	# <CJK>
-0x4F4F	0x8237	# <CJK>
-0x4F50	0x9591	# <CJK>
-0x4F51	0x6D8E	# <CJK>
-0x4F52	0x5F26	# <CJK>
-0x4F53	0x5ACC	# <CJK>
-0x4F54	0x986F	# <CJK>
-0x4F55	0x96AA	# <CJK>
-0x4F56	0x73FE	# <CJK>
-0x4F57	0x737B	# <CJK>
-0x4F58	0x7E23	# <CJK>
-0x4F59	0x817A	# <CJK>
-0x4F5A	0x9921	# <CJK>
-0x4F5B	0x7FA1	# <CJK>
-0x4F5C	0x61B2	# <CJK>
-0x4F5D	0x9677	# <CJK>
-0x4F5E	0x9650	# <CJK>
-0x4F5F	0x7DAB	# <CJK>
-0x4F60	0x76F8	# <CJK>
-0x4F61	0x53A2	# <CJK>
-0x4F62	0x9472	# <CJK>
-0x4F63	0x9999	# <CJK>
-0x4F64	0x7BB1	# <CJK>
-0x4F65	0x8944	# <CJK>
-0x4F66	0x6E58	# <CJK>
-0x4F67	0x9109	# <CJK>
-0x4F68	0x7FD4	# <CJK>
-0x4F69	0x7965	# <CJK>
-0x4F6A	0x8A73	# <CJK>
-0x4F6B	0x60F3	# <CJK>
-0x4F6C	0x97FF	# <CJK>
-0x4F6D	0x4EAB	# <CJK>
-0x4F6E	0x9805	# <CJK>
-0x4F6F	0x5DF7	# <CJK>
-0x4F70	0x6A61	# <CJK>
-0x4F71	0x50CF	# <CJK>
-0x4F72	0x5411	# <CJK>
-0x4F73	0x8C61	# <CJK>
-0x4F74	0x856D	# <CJK>
-0x4F75	0x785D	# <CJK>
-0x4F76	0x9704	# <CJK>
-0x4F77	0x524A	# <CJK>
-0x4F78	0x54EE	# <CJK>
-0x4F79	0x56C2	# <CJK>
-0x4F7A	0x92B7	# <CJK>
-0x4F7B	0x6D88	# <CJK>
-0x4F7C	0x5BB5	# <CJK>
-0x4F7D	0x6DC6	# <CJK>
-0x4F7E	0x66C9	# <CJK>
-0x5021	0x5C0F	# <CJK>
-0x5022	0x5B5D	# <CJK>
-0x5023	0x6821	# <CJK>
-0x5024	0x8096	# <CJK>
-0x5025	0x562F	# <CJK>
-0x5026	0x7B11	# <CJK>
-0x5027	0x6548	# <CJK>
-0x5028	0x6954	# <CJK>
-0x5029	0x4E9B	# <CJK>
-0x502A	0x6B47	# <CJK>
-0x502B	0x874E	# <CJK>
-0x502C	0x978B	# <CJK>
-0x502D	0x5354	# <CJK>
-0x502E	0x633E	# <CJK>
-0x502F	0x643A	# <CJK>
-0x5030	0x90AA	# <CJK>
-0x5031	0x659C	# <CJK>
-0x5032	0x8105	# <CJK>
-0x5033	0x8AE7	# <CJK>
-0x5034	0x5BEB	# <CJK>
-0x5035	0x68B0	# <CJK>
-0x5036	0x5378	# <CJK>
-0x5037	0x87F9	# <CJK>
-0x5038	0x61C8	# <CJK>
-0x5039	0x6CC4	# <CJK>
-0x503A	0x7009	# <CJK>
-0x503B	0x8B1D	# <CJK>
-0x503C	0x5C51	# <CJK>
-0x503D	0x85AA	# <CJK>
-0x503E	0x82AF	# <CJK>
-0x503F	0x92C5	# <CJK>
-0x5040	0x6B23	# <CJK>
-0x5041	0x8F9B	# <CJK>
-0x5042	0x65B0	# <CJK>
-0x5043	0x5FFB	# <CJK>
-0x5044	0x5FC3	# <CJK>
-0x5045	0x4FE1	# <CJK>
-0x5046	0x91C1	# <CJK>
-0x5047	0x661F	# <CJK>
-0x5048	0x8165	# <CJK>
-0x5049	0x7329	# <CJK>
-0x504A	0x60FA	# <CJK>
-0x504B	0x8208	# <CJK>
-0x504C	0x5211	# <CJK>
-0x504D	0x578B	# <CJK>
-0x504E	0x5F62	# <CJK>
-0x504F	0x90A2	# <CJK>
-0x5050	0x884C	# <CJK>
-0x5051	0x9192	# <CJK>
-0x5052	0x5E78	# <CJK>
-0x5053	0x674F	# <CJK>
-0x5054	0x6027	# <CJK>
-0x5055	0x59D3	# <CJK>
-0x5056	0x5144	# <CJK>
-0x5057	0x51F6	# <CJK>
-0x5058	0x80F8	# <CJK>
-0x5059	0x5308	# <CJK>
-0x505A	0x6C79	# <CJK>
-0x505B	0x96C4	# <CJK>
-0x505C	0x718A	# <CJK>
-0x505D	0x4F11	# <CJK>
-0x505E	0x4FEE	# <CJK>
-0x505F	0x7F9E	# <CJK>
-0x5060	0x673D	# <CJK>
-0x5061	0x55C5	# <CJK>
-0x5062	0x92B9	# <CJK>
-0x5063	0x79C0	# <CJK>
-0x5064	0x8896	# <CJK>
-0x5065	0x7D89	# <CJK>
-0x5066	0x589F	# <CJK>
-0x5067	0x620C	# <CJK>
-0x5068	0x9700	# <CJK>
-0x5069	0x865A	# <CJK>
-0x506A	0x5618	# <CJK>
-0x506B	0x9808	# <CJK>
-0x506C	0x5F90	# <CJK>
-0x506D	0x8A31	# <CJK>
-0x506E	0x84C4	# <CJK>
-0x506F	0x9157	# <CJK>
-0x5070	0x53D9	# <CJK>
-0x5071	0x65ED	# <CJK>
-0x5072	0x5E8F	# <CJK>
-0x5073	0x755C	# <CJK>
-0x5074	0x6064	# <CJK>
-0x5075	0x7D6E	# <CJK>
-0x5076	0x5A7F	# <CJK>
-0x5077	0x7DD2	# <CJK>
-0x5078	0x7E8C	# <CJK>
-0x5079	0x8ED2	# <CJK>
-0x507A	0x55A7	# <CJK>
-0x507B	0x5BA3	# <CJK>
-0x507C	0x61F8	# <CJK>
-0x507D	0x65CB	# <CJK>
-0x507E	0x7384	# <CJK>
-0x5121	0x9078	# <CJK>
-0x5122	0x766C	# <CJK>
-0x5123	0x7729	# <CJK>
-0x5124	0x7D62	# <CJK>
-0x5125	0x9774	# <CJK>
-0x5126	0x859B	# <CJK>
-0x5127	0x5B78	# <CJK>
-0x5128	0x7A74	# <CJK>
-0x5129	0x96EA	# <CJK>
-0x512A	0x8840	# <CJK>
-0x512B	0x52DB	# <CJK>
-0x512C	0x718F	# <CJK>
-0x512D	0x5FAA	# <CJK>
-0x512E	0x65EC	# <CJK>
-0x512F	0x8A62	# <CJK>
-0x5130	0x5C0B	# <CJK>
-0x5131	0x99B4	# <CJK>
-0x5132	0x5DE1	# <CJK>
-0x5133	0x6B89	# <CJK>
-0x5134	0x6C5B	# <CJK>
-0x5135	0x8A13	# <CJK>
-0x5136	0x8A0A	# <CJK>
-0x5137	0x905C	# <CJK>
-0x5138	0x8FC5	# <CJK>
-0x5139	0x58D3	# <CJK>
-0x513A	0x62BC	# <CJK>
-0x513B	0x9D09	# <CJK>
-0x513C	0x9D28	# <CJK>
-0x513D	0x5440	# <CJK>
-0x513E	0x4E2B	# <CJK>
-0x513F	0x82BD	# <CJK>
-0x5140	0x7259	# <CJK>
-0x5141	0x869C	# <CJK>
-0x5142	0x5D16	# <CJK>
-0x5143	0x8859	# <CJK>
-0x5144	0x6DAF	# <CJK>
-0x5145	0x96C5	# <CJK>
-0x5146	0x555E	# <CJK>
-0x5147	0x4E9E	# <CJK>
-0x5148	0x8A1D	# <CJK>
-0x5149	0x7109	# <CJK>
-0x514A	0x54BD	# <CJK>
-0x514B	0x95B9	# <CJK>
-0x514C	0x70DF	# <CJK>
-0x514D	0x6DF9	# <CJK>
-0x514E	0x9E7D	# <CJK>
-0x514F	0x56B4	# <CJK>
-0x5150	0x7814	# <CJK>
-0x5151	0x8712	# <CJK>
-0x5152	0x5CA9	# <CJK>
-0x5153	0x5EF6	# <CJK>
-0x5154	0x8A00	# <CJK>
-0x5155	0x9854	# <CJK>
-0x5156	0x95BB	# <CJK>
-0x5157	0x708E	# <CJK>
-0x5158	0x6CBF	# <CJK>
-0x5159	0x5944	# <CJK>
-0x515A	0x63A9	# <CJK>
-0x515B	0x773C	# <CJK>
-0x515C	0x884D	# <CJK>
-0x515D	0x6F14	# <CJK>
-0x515E	0x8277	# <CJK>
-0x515F	0x5830	# <CJK>
-0x5160	0x71D5	# <CJK>
-0x5161	0x53AD	# <CJK>
-0x5162	0x786F	# <CJK>
-0x5163	0x96C1	# <CJK>
-0x5164	0x5501	# <CJK>
-0x5165	0x5F66	# <CJK>
-0x5166	0x7130	# <CJK>
-0x5167	0x5BB4	# <CJK>
-0x5168	0x8AFA	# <CJK>
-0x5169	0x9A57	# <CJK>
-0x516A	0x6B83	# <CJK>
-0x516B	0x592E	# <CJK>
-0x516C	0x9D26	# <CJK>
-0x516D	0x79E7	# <CJK>
-0x516E	0x694A	# <CJK>
-0x516F	0x63DA	# <CJK>
-0x5170	0x4F6F	# <CJK>
-0x5171	0x760D	# <CJK>
-0x5172	0x7F8A	# <CJK>
-0x5173	0x6D0B	# <CJK>
-0x5174	0x967D	# <CJK>
-0x5175	0x6C27	# <CJK>
-0x5176	0x4EF0	# <CJK>
-0x5177	0x7662	# <CJK>
-0x5178	0x990A	# <CJK>
-0x5179	0x6A23	# <CJK>
-0x517A	0x6F3E	# <CJK>
-0x517B	0x9080	# <CJK>
-0x517C	0x8170	# <CJK>
-0x517D	0x5996	# <CJK>
-0x517E	0x7476	# <CJK>
-0x5221	0x6447	# <CJK>
-0x5222	0x582F	# <CJK>
-0x5223	0x9065	# <CJK>
-0x5224	0x7A91	# <CJK>
-0x5225	0x8B21	# <CJK>
-0x5226	0x59DA	# <CJK>
-0x5227	0x54AC	# <CJK>
-0x5228	0x8200	# <CJK>
-0x5229	0x85E5	# <CJK>
-0x522A	0x8981	# <CJK>
-0x522B	0x8000	# <CJK>
-0x522C	0x6930	# <CJK>
-0x522D	0x564E	# <CJK>
-0x522E	0x8036	# <CJK>
-0x522F	0x723A	# <CJK>
-0x5230	0x91CE	# <CJK>
-0x5231	0x51B6	# <CJK>
-0x5232	0x4E5F	# <CJK>
-0x5233	0x9801	# <CJK>
-0x5234	0x6396	# <CJK>
-0x5235	0x696D	# <CJK>
-0x5236	0x8449	# <CJK>
-0x5237	0x66F3	# <CJK>
-0x5238	0x814B	# <CJK>
-0x5239	0x591C	# <CJK>
-0x523A	0x6DB2	# <CJK>
-0x523B	0x4E00	# <CJK>
-0x523C	0x58F9	# <CJK>
-0x523D	0x91AB	# <CJK>
-0x523E	0x63D6	# <CJK>
-0x523F	0x92A5	# <CJK>
-0x5240	0x4F9D	# <CJK>
-0x5241	0x4F0A	# <CJK>
-0x5242	0x8863	# <CJK>
-0x5243	0x9824	# <CJK>
-0x5244	0x5937	# <CJK>
-0x5245	0x907A	# <CJK>
-0x5246	0x79FB	# <CJK>
-0x5247	0x5100	# <CJK>
-0x5248	0x80F0	# <CJK>
-0x5249	0x7591	# <CJK>
-0x524A	0x6C82	# <CJK>
-0x524B	0x5B9C	# <CJK>
-0x524C	0x59E8	# <CJK>
-0x524D	0x5F5D	# <CJK>
-0x524E	0x6905	# <CJK>
-0x524F	0x87FB	# <CJK>
-0x5250	0x501A	# <CJK>
-0x5251	0x5DF2	# <CJK>
-0x5252	0x4E59	# <CJK>
-0x5253	0x77E3	# <CJK>
-0x5254	0x4EE5	# <CJK>
-0x5255	0x85DD	# <CJK>
-0x5256	0x6291	# <CJK>
-0x5257	0x6613	# <CJK>
-0x5258	0x9091	# <CJK>
-0x5259	0x5C79	# <CJK>
-0x525A	0x5104	# <CJK>
-0x525B	0x5F79	# <CJK>
-0x525C	0x81C6	# <CJK>
-0x525D	0x9038	# <CJK>
-0x525E	0x8084	# <CJK>
-0x525F	0x75AB	# <CJK>
-0x5260	0x4EA6	# <CJK>
-0x5261	0x88D4	# <CJK>
-0x5262	0x610F	# <CJK>
-0x5263	0x6BC5	# <CJK>
-0x5264	0x61B6	# <CJK>
-0x5265	0x7FA9	# <CJK>
-0x5266	0x76CA	# <CJK>
-0x5267	0x6EA2	# <CJK>
-0x5268	0x8A63	# <CJK>
-0x5269	0x8B70	# <CJK>
-0x526A	0x8ABC	# <CJK>
-0x526B	0x8B6F	# <CJK>
-0x526C	0x5F02	# <CJK>
-0x526D	0x7FFC	# <CJK>
-0x526E	0x7FCC	# <CJK>
-0x526F	0x7E79	# <CJK>
-0x5270	0x8335	# <CJK>
-0x5271	0x852D	# <CJK>
-0x5272	0x56E0	# <CJK>
-0x5273	0x6BB7	# <CJK>
-0x5274	0x97F3	# <CJK>
-0x5275	0x9670	# <CJK>
-0x5276	0x59FB	# <CJK>
-0x5277	0x541F	# <CJK>
-0x5278	0x9280	# <CJK>
-0x5279	0x6DEB	# <CJK>
-0x527A	0x5BC5	# <CJK>
-0x527B	0x98F2	# <CJK>
-0x527C	0x5C39	# <CJK>
-0x527D	0x5F15	# <CJK>
-0x527E	0x96B1	# <CJK>
-0x5321	0x5370	# <CJK>
-0x5322	0x82F1	# <CJK>
-0x5323	0x6AFB	# <CJK>
-0x5324	0x5B30	# <CJK>
-0x5325	0x9DF9	# <CJK>
-0x5326	0x61C9	# <CJK>
-0x5327	0x7E93	# <CJK>
-0x5328	0x7469	# <CJK>
-0x5329	0x87A2	# <CJK>
-0x532A	0x71DF	# <CJK>
-0x532B	0x7192	# <CJK>
-0x532C	0x8805	# <CJK>
-0x532D	0x8FCE	# <CJK>
-0x532E	0x8D0F	# <CJK>
-0x532F	0x76C8	# <CJK>
-0x5330	0x5F71	# <CJK>
-0x5331	0x7A4E	# <CJK>
-0x5332	0x786C	# <CJK>
-0x5333	0x6620	# <CJK>
-0x5334	0x55B2	# <CJK>
-0x5335	0x64C1	# <CJK>
-0x5336	0x50AD	# <CJK>
-0x5337	0x81C3	# <CJK>
-0x5338	0x7670	# <CJK>
-0x5339	0x5EB8	# <CJK>
-0x533A	0x96CD	# <CJK>
-0x533B	0x8E34	# <CJK>
-0x533C	0x86F9	# <CJK>
-0x533D	0x548F	# <CJK>
-0x533E	0x6CF3	# <CJK>
-0x533F	0x6D8C	# <CJK>
-0x5340	0x6C38	# <CJK>
-0x5341	0x607F	# <CJK>
-0x5342	0x52C7	# <CJK>
-0x5343	0x7528	# <CJK>
-0x5344	0x5E7D	# <CJK>
-0x5345	0x512A	# <CJK>
-0x5346	0x60A0	# <CJK>
-0x5347	0x6182	# <CJK>
-0x5348	0x5C24	# <CJK>
-0x5349	0x7531	# <CJK>
-0x534A	0x90F5	# <CJK>
-0x534B	0x923E	# <CJK>
-0x534C	0x7336	# <CJK>
-0x534D	0x6CB9	# <CJK>
-0x534E	0x6E38	# <CJK>
-0x534F	0x9149	# <CJK>
-0x5350	0x6709	# <CJK>
-0x5351	0x53CB	# <CJK>
-0x5352	0x53F3	# <CJK>
-0x5353	0x4F51	# <CJK>
-0x5354	0x91C9	# <CJK>
-0x5355	0x8A98	# <CJK>
-0x5356	0x53C8	# <CJK>
-0x5357	0x5E7C	# <CJK>
-0x5358	0x8FC2	# <CJK>
-0x5359	0x6DE4	# <CJK>
-0x535A	0x4E8E	# <CJK>
-0x535B	0x76C2	# <CJK>
-0x535C	0x6986	# <CJK>
-0x535D	0x865E	# <CJK>
-0x535E	0x611A	# <CJK>
-0x535F	0x8F3F	# <CJK>
-0x5360	0x9918	# <CJK>
-0x5361	0x4FDE	# <CJK>
-0x5362	0x903E	# <CJK>
-0x5363	0x9B5A	# <CJK>
-0x5364	0x6109	# <CJK>
-0x5365	0x6E1D	# <CJK>
-0x5366	0x6F01	# <CJK>
-0x5367	0x9685	# <CJK>
-0x5368	0x4E88	# <CJK>
-0x5369	0x5A31	# <CJK>
-0x536A	0x96E8	# <CJK>
-0x536B	0x8207	# <CJK>
-0x536C	0x5DBC	# <CJK>
-0x536D	0x79B9	# <CJK>
-0x536E	0x5B87	# <CJK>
-0x536F	0x8A9E	# <CJK>
-0x5370	0x7FBD	# <CJK>
-0x5371	0x7389	# <CJK>
-0x5372	0x57DF	# <CJK>
-0x5373	0x828B	# <CJK>
-0x5374	0x9B31	# <CJK>
-0x5375	0x5401	# <CJK>
-0x5376	0x9047	# <CJK>
-0x5377	0x55BB	# <CJK>
-0x5378	0x5CEA	# <CJK>
-0x5379	0x5FA1	# <CJK>
-0x537A	0x6108	# <CJK>
-0x537B	0x6B32	# <CJK>
-0x537C	0x7344	# <CJK>
-0x537D	0x80B2	# <CJK>
-0x537E	0x8B7D	# <CJK>
-0x5421	0x6D74	# <CJK>
-0x5422	0x5BD3	# <CJK>
-0x5423	0x88D5	# <CJK>
-0x5424	0x9810	# <CJK>
-0x5425	0x8C6B	# <CJK>
-0x5426	0x99AD	# <CJK>
-0x5427	0x9D1B	# <CJK>
-0x5428	0x6DF5	# <CJK>
-0x5429	0x51A4	# <CJK>
-0x542A	0x5143	# <CJK>
-0x542B	0x57A3	# <CJK>
-0x542C	0x8881	# <CJK>
-0x542D	0x539F	# <CJK>
-0x542E	0x63F4	# <CJK>
-0x542F	0x8F45	# <CJK>
-0x5430	0x5712	# <CJK>
-0x5431	0x54E1	# <CJK>
-0x5432	0x5713	# <CJK>
-0x5433	0x733F	# <CJK>
-0x5434	0x6E90	# <CJK>
-0x5435	0x7DE3	# <CJK>
-0x5436	0x9060	# <CJK>
-0x5437	0x82D1	# <CJK>
-0x5438	0x9858	# <CJK>
-0x5439	0x6028	# <CJK>
-0x543A	0x9662	# <CJK>
-0x543B	0x66F0	# <CJK>
-0x543C	0x7D04	# <CJK>
-0x543D	0x8D8A	# <CJK>
-0x543E	0x8E8D	# <CJK>
-0x543F	0x9470	# <CJK>
-0x5440	0x5CB3	# <CJK>
-0x5441	0x7CA4	# <CJK>
-0x5442	0x6708	# <CJK>
-0x5443	0x60A6	# <CJK>
-0x5444	0x95B2	# <CJK>
-0x5445	0x8018	# <CJK>
-0x5446	0x96F2	# <CJK>
-0x5447	0x9116	# <CJK>
-0x5448	0x5300	# <CJK>
-0x5449	0x9695	# <CJK>
-0x544A	0x5141	# <CJK>
-0x544B	0x904B	# <CJK>
-0x544C	0x85F4	# <CJK>
-0x544D	0x9196	# <CJK>
-0x544E	0x6688	# <CJK>
-0x544F	0x97F5	# <CJK>
-0x5450	0x5B55	# <CJK>
-0x5451	0x531D	# <CJK>
-0x5452	0x7838	# <CJK>
-0x5453	0x96DC	# <CJK>
-0x5454	0x683D	# <CJK>
-0x5455	0x54C9	# <CJK>
-0x5456	0x707E	# <CJK>
-0x5457	0x5BB0	# <CJK>
-0x5458	0x8F09	# <CJK>
-0x5459	0x518D	# <CJK>
-0x545A	0x5728	# <CJK>
-0x545B	0x54B1	# <CJK>
-0x545C	0x6522	# <CJK>
-0x545D	0x66AB	# <CJK>
-0x545E	0x8D0A	# <CJK>
-0x545F	0x8D1C	# <CJK>
-0x5460	0x81DF	# <CJK>
-0x5461	0x846C	# <CJK>
-0x5462	0x906D	# <CJK>
-0x5463	0x7CDF	# <CJK>
-0x5464	0x947F	# <CJK>
-0x5465	0x85FB	# <CJK>
-0x5466	0x68D7	# <CJK>
-0x5467	0x65E9	# <CJK>
-0x5468	0x6FA1	# <CJK>
-0x5469	0x86A4	# <CJK>
-0x546A	0x8E81	# <CJK>
-0x546B	0x566A	# <CJK>
-0x546C	0x9020	# <CJK>
-0x546D	0x7682	# <CJK>
-0x546E	0x7AC8	# <CJK>
-0x546F	0x71E5	# <CJK>
-0x5470	0x8CAC	# <CJK>
-0x5471	0x64C7	# <CJK>
-0x5472	0x5247	# <CJK>
-0x5473	0x6FA4	# <CJK>
-0x5474	0x8CCA	# <CJK>
-0x5475	0x600E	# <CJK>
-0x5476	0x589E	# <CJK>
-0x5477	0x618E	# <CJK>
-0x5478	0x66FE	# <CJK>
-0x5479	0x8D08	# <CJK>
-0x547A	0x624E	# <CJK>
-0x547B	0x55B3	# <CJK>
-0x547C	0x6E23	# <CJK>
-0x547D	0x672D	# <CJK>
-0x547E	0x8ECB	# <CJK>
-0x5521	0x9358	# <CJK>
-0x5522	0x9598	# <CJK>
-0x5523	0x7728	# <CJK>
-0x5524	0x6805	# <CJK>
-0x5525	0x69A8	# <CJK>
-0x5526	0x548B	# <CJK>
-0x5527	0x4E4D	# <CJK>
-0x5528	0x70B8	# <CJK>
-0x5529	0x8A50	# <CJK>
-0x552A	0x6458	# <CJK>
-0x552B	0x9F4B	# <CJK>
-0x552C	0x5B85	# <CJK>
-0x552D	0x7A84	# <CJK>
-0x552E	0x50B5	# <CJK>
-0x552F	0x5BE8	# <CJK>
-0x5530	0x77BB	# <CJK>
-0x5531	0x6C08	# <CJK>
-0x5532	0x8A79	# <CJK>
-0x5533	0x7C98	# <CJK>
-0x5534	0x6CBE	# <CJK>
-0x5535	0x76DE	# <CJK>
-0x5536	0x65AC	# <CJK>
-0x5537	0x8F3E	# <CJK>
-0x5538	0x5D84	# <CJK>
-0x5539	0x5C55	# <CJK>
-0x553A	0x8638	# <CJK>
-0x553B	0x68E7	# <CJK>
-0x553C	0x5360	# <CJK>
-0x553D	0x6230	# <CJK>
-0x553E	0x7AD9	# <CJK>
-0x553F	0x6E5B	# <CJK>
-0x5540	0x7DBB	# <CJK>
-0x5541	0x6A1F	# <CJK>
-0x5542	0x7AE0	# <CJK>
-0x5543	0x5F70	# <CJK>
-0x5544	0x6F33	# <CJK>
-0x5545	0x5F35	# <CJK>
-0x5546	0x638C	# <CJK>
-0x5547	0x6F32	# <CJK>
-0x5548	0x6756	# <CJK>
-0x5549	0x4E08	# <CJK>
-0x554A	0x5E33	# <CJK>
-0x554B	0x8CEC	# <CJK>
-0x554C	0x4ED7	# <CJK>
-0x554D	0x8139	# <CJK>
-0x554E	0x7634	# <CJK>
-0x554F	0x969C	# <CJK>
-0x5550	0x62DB	# <CJK>
-0x5551	0x662D	# <CJK>
-0x5552	0x627E	# <CJK>
-0x5553	0x6CBC	# <CJK>
-0x5554	0x8D99	# <CJK>
-0x5555	0x7167	# <CJK>
-0x5556	0x7F69	# <CJK>
-0x5557	0x5146	# <CJK>
-0x5558	0x8087	# <CJK>
-0x5559	0x53EC	# <CJK>
-0x555A	0x906E	# <CJK>
-0x555B	0x6298	# <CJK>
-0x555C	0x54F2	# <CJK>
-0x555D	0x87C4	# <CJK>
-0x555E	0x8F4D	# <CJK>
-0x555F	0x8005	# <CJK>
-0x5560	0x937A	# <CJK>
-0x5561	0x8517	# <CJK>
-0x5562	0x9019	# <CJK>
-0x5563	0x6D59	# <CJK>
-0x5564	0x73CD	# <CJK>
-0x5565	0x659F	# <CJK>
-0x5566	0x771F	# <CJK>
-0x5567	0x7504	# <CJK>
-0x5568	0x7827	# <CJK>
-0x5569	0x81FB	# <CJK>
-0x556A	0x8C9E	# <CJK>
-0x556B	0x91DD	# <CJK>
-0x556C	0x5075	# <CJK>
-0x556D	0x6795	# <CJK>
-0x556E	0x75B9	# <CJK>
-0x556F	0x8A3A	# <CJK>
-0x5570	0x9707	# <CJK>
-0x5571	0x632F	# <CJK>
-0x5572	0x93AE	# <CJK>
-0x5573	0x9663	# <CJK>
-0x5574	0x84B8	# <CJK>
-0x5575	0x6399	# <CJK>
-0x5576	0x775C	# <CJK>
-0x5577	0x5F81	# <CJK>
-0x5578	0x7319	# <CJK>
-0x5579	0x722D	# <CJK>
-0x557A	0x6014	# <CJK>
-0x557B	0x6574	# <CJK>
-0x557C	0x62EF	# <CJK>
-0x557D	0x6B63	# <CJK>
-0x557E	0x653F	# <CJK>
-0x5621	0x5E40	# <CJK>
-0x5622	0x7665	# <CJK>
-0x5623	0x912D	# <CJK>
-0x5624	0x8B49	# <CJK>
-0x5625	0x829D	# <CJK>
-0x5626	0x679D	# <CJK>
-0x5627	0x652F	# <CJK>
-0x5628	0x5431	# <CJK>
-0x5629	0x8718	# <CJK>
-0x562A	0x77E5	# <CJK>
-0x562B	0x80A2	# <CJK>
-0x562C	0x8102	# <CJK>
-0x562D	0x6C41	# <CJK>
-0x562E	0x4E4B	# <CJK>
-0x562F	0x7E54	# <CJK>
-0x5630	0x8077	# <CJK>
-0x5631	0x76F4	# <CJK>
-0x5632	0x690D	# <CJK>
-0x5633	0x6B96	# <CJK>
-0x5634	0x57F7	# <CJK>
-0x5635	0x503C	# <CJK>
-0x5636	0x4F84	# <CJK>
-0x5637	0x5740	# <CJK>
-0x5638	0x6307	# <CJK>
-0x5639	0x6B62	# <CJK>
-0x563A	0x8DBE	# <CJK>
-0x563B	0x8879	# <CJK>
-0x563C	0x65E8	# <CJK>
-0x563D	0x7D19	# <CJK>
-0x563E	0x5FD7	# <CJK>
-0x563F	0x646F	# <CJK>
-0x5640	0x64F2	# <CJK>
-0x5641	0x81F3	# <CJK>
-0x5642	0x81F4	# <CJK>
-0x5643	0x7F6E	# <CJK>
-0x5644	0x5E5F	# <CJK>
-0x5645	0x5CD9	# <CJK>
-0x5646	0x5236	# <CJK>
-0x5647	0x667A	# <CJK>
-0x5648	0x79E9	# <CJK>
-0x5649	0x7A1A	# <CJK>
-0x564A	0x8CEA	# <CJK>
-0x564B	0x7099	# <CJK>
-0x564C	0x75D4	# <CJK>
-0x564D	0x6EEF	# <CJK>
-0x564E	0x6CBB	# <CJK>
-0x564F	0x7A92	# <CJK>
-0x5650	0x4E2D	# <CJK>
-0x5651	0x76C5	# <CJK>
-0x5652	0x5FE0	# <CJK>
-0x5653	0x9418	# <CJK>
-0x5654	0x8877	# <CJK>
-0x5655	0x7D42	# <CJK>
-0x5656	0x7A2E	# <CJK>
-0x5657	0x816B	# <CJK>
-0x5658	0x91CD	# <CJK>
-0x5659	0x4EF2	# <CJK>
-0x565A	0x8846	# <CJK>
-0x565B	0x821F	# <CJK>
-0x565C	0x5468	# <CJK>
-0x565D	0x5DDE	# <CJK>
-0x565E	0x6D32	# <CJK>
-0x565F	0x8B05	# <CJK>
-0x5660	0x7CA5	# <CJK>
-0x5661	0x8EF8	# <CJK>
-0x5662	0x8098	# <CJK>
-0x5663	0x5E1A	# <CJK>
-0x5664	0x5492	# <CJK>
-0x5665	0x76BA	# <CJK>
-0x5666	0x5B99	# <CJK>
-0x5667	0x665D	# <CJK>
-0x5668	0x9A5F	# <CJK>
-0x5669	0x73E0	# <CJK>
-0x566A	0x682A	# <CJK>
-0x566B	0x86DB	# <CJK>
-0x566C	0x6731	# <CJK>
-0x566D	0x732A	# <CJK>
-0x566E	0x8AF8	# <CJK>
-0x566F	0x8A85	# <CJK>
-0x5670	0x9010	# <CJK>
-0x5671	0x7AF9	# <CJK>
-0x5672	0x71ED	# <CJK>
-0x5673	0x716E	# <CJK>
-0x5674	0x62C4	# <CJK>
-0x5675	0x77DA	# <CJK>
-0x5676	0x56D1	# <CJK>
-0x5677	0x4E3B	# <CJK>
-0x5678	0x8457	# <CJK>
-0x5679	0x67F1	# <CJK>
-0x567A	0x52A9	# <CJK>
-0x567B	0x86C0	# <CJK>
-0x567C	0x8CAF	# <CJK>
-0x567D	0x9444	# <CJK>
-0x567E	0x7BC9	# <CJK>
-0x5721	0x4F4F	# <CJK>
-0x5722	0x6CE8	# <CJK>
-0x5723	0x795D	# <CJK>
-0x5724	0x99D0	# <CJK>
-0x5725	0x6293	# <CJK>
-0x5726	0x722A	# <CJK>
-0x5727	0x62FD	# <CJK>
-0x5728	0x5C08	# <CJK>
-0x5729	0x78DA	# <CJK>
-0x572A	0x8F49	# <CJK>
-0x572B	0x64B0	# <CJK>
-0x572C	0x8CFA	# <CJK>
-0x572D	0x7BC6	# <CJK>
-0x572E	0x6A01	# <CJK>
-0x572F	0x838A	# <CJK>
-0x5730	0x88DD	# <CJK>
-0x5731	0x599D	# <CJK>
-0x5732	0x649E	# <CJK>
-0x5733	0x58EF	# <CJK>
-0x5734	0x72C0	# <CJK>
-0x5735	0x690E	# <CJK>
-0x5736	0x9310	# <CJK>
-0x5737	0x8FFD	# <CJK>
-0x5738	0x8D05	# <CJK>
-0x5739	0x589C	# <CJK>
-0x573A	0x7DB4	# <CJK>
-0x573B	0x8AC4	# <CJK>
-0x573C	0x6E96	# <CJK>
-0x573D	0x6349	# <CJK>
-0x573E	0x62D9	# <CJK>
-0x573F	0x5353	# <CJK>
-0x5740	0x684C	# <CJK>
-0x5741	0x7422	# <CJK>
-0x5742	0x8301	# <CJK>
-0x5743	0x914C	# <CJK>
-0x5744	0x5544	# <CJK>
-0x5745	0x7740	# <CJK>
-0x5746	0x707C	# <CJK>
-0x5747	0x6FC1	# <CJK>
-0x5748	0x5179	# <CJK>
-0x5749	0x54A8	# <CJK>
-0x574A	0x8CC7	# <CJK>
-0x574B	0x59FF	# <CJK>
-0x574C	0x6ECB	# <CJK>
-0x574D	0x6DC4	# <CJK>
-0x574E	0x5B5C	# <CJK>
-0x574F	0x7D2B	# <CJK>
-0x5750	0x4ED4	# <CJK>
-0x5751	0x7C7D	# <CJK>
-0x5752	0x6ED3	# <CJK>
-0x5753	0x5B50	# <CJK>
-0x5754	0x81EA	# <CJK>
-0x5755	0x6F2C	# <CJK>
-0x5756	0x5B57	# <CJK>
-0x5757	0x9B03	# <CJK>
-0x5758	0x68D5	# <CJK>
-0x5759	0x8E2A	# <CJK>
-0x575A	0x5B97	# <CJK>
-0x575B	0x7D9C	# <CJK>
-0x575C	0x7E3D	# <CJK>
-0x575D	0x7E31	# <CJK>
-0x575E	0x9112	# <CJK>
-0x575F	0x8D70	# <CJK>
-0x5760	0x594F	# <CJK>
-0x5761	0x63CD	# <CJK>
-0x5762	0x79DF	# <CJK>
-0x5763	0x8DB3	# <CJK>
-0x5764	0x5352	# <CJK>
-0x5765	0x65CF	# <CJK>
-0x5766	0x7956	# <CJK>
-0x5767	0x8A5B	# <CJK>
-0x5768	0x963B	# <CJK>
-0x5769	0x7D44	# <CJK>
-0x576A	0x947D	# <CJK>
-0x576B	0x7E82	# <CJK>
-0x576C	0x5634	# <CJK>
-0x576D	0x9189	# <CJK>
-0x576E	0x6700	# <CJK>
-0x576F	0x7F6A	# <CJK>
-0x5770	0x5C0A	# <CJK>
-0x5771	0x9075	# <CJK>
-0x5772	0x6628	# <CJK>
-0x5773	0x5DE6	# <CJK>
-0x5774	0x4F50	# <CJK>
-0x5775	0x67DE	# <CJK>
-0x5776	0x505A	# <CJK>
-0x5777	0x4F5C	# <CJK>
-0x5778	0x5750	# <CJK>
-0x5779	0x5EA7	# <CJK>
-0x5821	0x4E8D	# <CJK>
-0x5822	0x4E0C	# <CJK>
-0x5823	0x5140	# <CJK>
-0x5824	0x4E10	# <CJK>
-0x5825	0x5EFF	# <CJK>
-0x5826	0x5345	# <CJK>
-0x5827	0x4E15	# <CJK>
-0x5828	0x4E98	# <CJK>
-0x5829	0x4E1E	# <CJK>
-0x582A	0x9B32	# <CJK>
-0x582B	0x5B6C	# <CJK>
-0x582C	0x5669	# <CJK>
-0x582D	0x4E28	# <CJK>
-0x582E	0x79BA	# <CJK>
-0x582F	0x4E3F	# <CJK>
-0x5830	0x5315	# <CJK>
-0x5831	0x4E47	# <CJK>
-0x5832	0x592D	# <CJK>
-0x5833	0x723B	# <CJK>
-0x5834	0x536E	# <CJK>
-0x5835	0x6C10	# <CJK>
-0x5836	0x56DF	# <CJK>
-0x5837	0x80E4	# <CJK>
-0x5838	0x9997	# <CJK>
-0x5839	0x6BD3	# <CJK>
-0x583A	0x777E	# <CJK>
-0x583B	0x9F17	# <CJK>
-0x583C	0x4E36	# <CJK>
-0x583D	0x4E9F	# <CJK>
-0x583E	0x9F10	# <CJK>
-0x583F	0x4E5C	# <CJK>
-0x5840	0x4E69	# <CJK>
-0x5841	0x4E93	# <CJK>
-0x5842	0x8288	# <CJK>
-0x5843	0x5B5B	# <CJK>
-0x5844	0x55C7	# <CJK>
-0x5845	0x560F	# <CJK>
-0x5846	0x4EC4	# <CJK>
-0x5847	0x5399	# <CJK>
-0x5848	0x539D	# <CJK>
-0x5849	0x53B4	# <CJK>
-0x584A	0x53A5	# <CJK>
-0x584B	0x53AE	# <CJK>
-0x584C	0x9768	# <CJK>
-0x584D	0x8D0B	# <CJK>
-0x584E	0x531A	# <CJK>
-0x584F	0x53F5	# <CJK>
-0x5850	0x532D	# <CJK>
-0x5851	0x5331	# <CJK>
-0x5852	0x533E	# <CJK>
-0x5853	0x8CFE	# <CJK>
-0x5854	0x5366	# <CJK>
-0x5855	0x5363	# <CJK>
-0x5856	0x5202	# <CJK>
-0x5857	0x5208	# <CJK>
-0x5858	0x520E	# <CJK>
-0x5859	0x5244	# <CJK>
-0x585A	0x5233	# <CJK>
-0x585B	0x528C	# <CJK>
-0x585C	0x5274	# <CJK>
-0x585D	0x524C	# <CJK>
-0x585E	0x525E	# <CJK>
-0x585F	0x5261	# <CJK>
-0x5860	0x525C	# <CJK>
-0x5861	0x84AF	# <CJK>
-0x5862	0x527D	# <CJK>
-0x5863	0x5282	# <CJK>
-0x5864	0x5281	# <CJK>
-0x5865	0x5290	# <CJK>
-0x5866	0x5293	# <CJK>
-0x5867	0x5182	# <CJK>
-0x5868	0x7F54	# <CJK>
-0x5869	0x4EBB	# <CJK>
-0x586A	0x4EC3	# <CJK>
-0x586B	0x4EC9	# <CJK>
-0x586C	0x4EC2	# <CJK>
-0x586D	0x4EE8	# <CJK>
-0x586E	0x4EE1	# <CJK>
-0x586F	0x4EEB	# <CJK>
-0x5870	0x4EDE	# <CJK>
-0x5871	0x50B4	# <CJK>
-0x5872	0x4EF3	# <CJK>
-0x5873	0x4F22	# <CJK>
-0x5874	0x4F64	# <CJK>
-0x5875	0x4EF5	# <CJK>
-0x5876	0x5000	# <CJK>
-0x5877	0x5096	# <CJK>
-0x5878	0x4F09	# <CJK>
-0x5879	0x4F47	# <CJK>
-0x587A	0x4F5E	# <CJK>
-0x587B	0x4F67	# <CJK>
-0x587C	0x6538	# <CJK>
-0x587D	0x4F5A	# <CJK>
-0x587E	0x4F5D	# <CJK>
-0x5921	0x4F5F	# <CJK>
-0x5922	0x4F57	# <CJK>
-0x5923	0x4F32	# <CJK>
-0x5924	0x4F3D	# <CJK>
-0x5925	0x4F76	# <CJK>
-0x5926	0x4F74	# <CJK>
-0x5927	0x4F91	# <CJK>
-0x5928	0x4F89	# <CJK>
-0x5929	0x4F83	# <CJK>
-0x592A	0x4F8F	# <CJK>
-0x592B	0x4F7E	# <CJK>
-0x592C	0x4F7B	# <CJK>
-0x592D	0x5115	# <CJK>
-0x592E	0x4F7C	# <CJK>
-0x592F	0x5102	# <CJK>
-0x5930	0x4F94	# <CJK>
-0x5931	0x5114	# <CJK>
-0x5932	0x513C	# <CJK>
-0x5933	0x5137	# <CJK>
-0x5934	0x4FC5	# <CJK>
-0x5935	0x4FDA	# <CJK>
-0x5936	0x4FE3	# <CJK>
-0x5937	0x4FDC	# <CJK>
-0x5938	0x4FD1	# <CJK>
-0x5939	0x4FDF	# <CJK>
-0x593A	0x4FF8	# <CJK>
-0x593B	0x5029	# <CJK>
-0x593C	0x504C	# <CJK>
-0x593D	0x4FF3	# <CJK>
-0x593E	0x502C	# <CJK>
-0x593F	0x500F	# <CJK>
-0x5940	0x502E	# <CJK>
-0x5941	0x502D	# <CJK>
-0x5942	0x4FFE	# <CJK>
-0x5943	0x501C	# <CJK>
-0x5944	0x500C	# <CJK>
-0x5945	0x5025	# <CJK>
-0x5946	0x5028	# <CJK>
-0x5947	0x50E8	# <CJK>
-0x5948	0x5043	# <CJK>
-0x5949	0x5055	# <CJK>
-0x594A	0x5048	# <CJK>
-0x594B	0x504E	# <CJK>
-0x594C	0x506C	# <CJK>
-0x594D	0x50C2	# <CJK>
-0x594E	0x513B	# <CJK>
-0x594F	0x5110	# <CJK>
-0x5950	0x513A	# <CJK>
-0x5951	0x50BA	# <CJK>
-0x5952	0x50D6	# <CJK>
-0x5953	0x5106	# <CJK>
-0x5954	0x50ED	# <CJK>
-0x5955	0x50EC	# <CJK>
-0x5956	0x50E6	# <CJK>
-0x5957	0x50EE	# <CJK>
-0x5958	0x5107	# <CJK>
-0x5959	0x510B	# <CJK>
-0x595A	0x4EDD	# <CJK>
-0x595B	0x6C3D	# <CJK>
-0x595C	0x4F58	# <CJK>
-0x595D	0x50C9	# <CJK>
-0x595E	0x4FCE	# <CJK>
-0x595F	0x9FA0	# <CJK>
-0x5960	0x6C46	# <CJK>
-0x5961	0x7CF4	# <CJK>
-0x5962	0x516E	# <CJK>
-0x5963	0x5DFD	# <CJK>
-0x5964	0x9ECC	# <CJK>
-0x5965	0x9998	# <CJK>
-0x5966	0x56C5	# <CJK>
-0x5967	0x5914	# <CJK>
-0x5968	0x52F9	# <CJK>
-0x5969	0x530D	# <CJK>
-0x596A	0x8A07	# <CJK>
-0x596B	0x5310	# <CJK>
-0x596C	0x9CEC	# <CJK>
-0x596D	0x5919	# <CJK>
-0x596E	0x5155	# <CJK>
-0x596F	0x4EA0	# <CJK>
-0x5970	0x5156	# <CJK>
-0x5971	0x4EB3	# <CJK>
-0x5972	0x886E	# <CJK>
-0x5973	0x88A4	# <CJK>
-0x5974	0x893B	# <CJK>
-0x5975	0x81E0	# <CJK>
-0x5976	0x88D2	# <CJK>
-0x5977	0x7980	# <CJK>
-0x5978	0x5B34	# <CJK>
-0x5979	0x8803	# <CJK>
-0x597A	0x7FB8	# <CJK>
-0x597B	0x51AB	# <CJK>
-0x597C	0x51B1	# <CJK>
-0x597D	0x51BD	# <CJK>
-0x597E	0x51BC	# <CJK>
-0x5A21	0x51C7	# <CJK>
-0x5A22	0x5196	# <CJK>
-0x5A23	0x51A2	# <CJK>
-0x5A24	0x51A5	# <CJK>
-0x5A25	0x8A01	# <CJK>
-0x5A26	0x8A10	# <CJK>
-0x5A27	0x8A0C	# <CJK>
-0x5A28	0x8A15	# <CJK>
-0x5A29	0x8B33	# <CJK>
-0x5A2A	0x8A4E	# <CJK>
-0x5A2B	0x8A25	# <CJK>
-0x5A2C	0x8A41	# <CJK>
-0x5A2D	0x8A36	# <CJK>
-0x5A2E	0x8A46	# <CJK>
-0x5A2F	0x8A54	# <CJK>
-0x5A30	0x8A58	# <CJK>
-0x5A31	0x8A52	# <CJK>
-0x5A32	0x8A86	# <CJK>
-0x5A33	0x8A84	# <CJK>
-0x5A34	0x8A7F	# <CJK>
-0x5A35	0x8A70	# <CJK>
-0x5A36	0x8A7C	# <CJK>
-0x5A37	0x8A75	# <CJK>
-0x5A38	0x8A6C	# <CJK>
-0x5A39	0x8A6E	# <CJK>
-0x5A3A	0x8ACD	# <CJK>
-0x5A3B	0x8AE2	# <CJK>
-0x5A3C	0x8A61	# <CJK>
-0x5A3D	0x8A9A	# <CJK>
-0x5A3E	0x8AA5	# <CJK>
-0x5A3F	0x8A91	# <CJK>
-0x5A40	0x8A92	# <CJK>
-0x5A41	0x8ACF	# <CJK>
-0x5A42	0x8AD1	# <CJK>
-0x5A43	0x8AC9	# <CJK>
-0x5A44	0x8ADB	# <CJK>
-0x5A45	0x8AD7	# <CJK>
-0x5A46	0x8AC2	# <CJK>
-0x5A47	0x8AB6	# <CJK>
-0x5A48	0x8AF6	# <CJK>
-0x5A49	0x8AEB	# <CJK>
-0x5A4A	0x8B14	# <CJK>
-0x5A4B	0x8B01	# <CJK>
-0x5A4C	0x8AE4	# <CJK>
-0x5A4D	0x8AED	# <CJK>
-0x5A4E	0x8AFC	# <CJK>
-0x5A4F	0x8AF3	# <CJK>
-0x5A50	0x8AE6	# <CJK>
-0x5A51	0x8AEE	# <CJK>
-0x5A52	0x8ADE	# <CJK>
-0x5A53	0x8B28	# <CJK>
-0x5A54	0x8B9C	# <CJK>
-0x5A55	0x8B16	# <CJK>
-0x5A56	0x8B1A	# <CJK>
-0x5A57	0x8B10	# <CJK>
-0x5A58	0x8B2B	# <CJK>
-0x5A59	0x8B2D	# <CJK>
-0x5A5A	0x8B56	# <CJK>
-0x5A5B	0x8B59	# <CJK>
-0x5A5C	0x8B4E	# <CJK>
-0x5A5D	0x8B9E	# <CJK>
-0x5A5E	0x8B6B	# <CJK>
-0x5A5F	0x8B96	# <CJK>
-0x5A60	0x5369	# <CJK>
-0x5A61	0x537A	# <CJK>
-0x5A62	0x961D	# <CJK>
-0x5A63	0x9622	# <CJK>
-0x5A64	0x9621	# <CJK>
-0x5A65	0x9631	# <CJK>
-0x5A66	0x962A	# <CJK>
-0x5A67	0x963D	# <CJK>
-0x5A68	0x963C	# <CJK>
-0x5A69	0x9642	# <CJK>
-0x5A6A	0x9658	# <CJK>
-0x5A6B	0x9654	# <CJK>
-0x5A6C	0x965F	# <CJK>
-0x5A6D	0x9689	# <CJK>
-0x5A6E	0x966C	# <CJK>
-0x5A6F	0x9672	# <CJK>
-0x5A70	0x9674	# <CJK>
-0x5A71	0x9688	# <CJK>
-0x5A72	0x968D	# <CJK>
-0x5A73	0x9697	# <CJK>
-0x5A74	0x96B0	# <CJK>
-0x5A75	0x9097	# <CJK>
-0x5A76	0x909B	# <CJK>
-0x5A77	0x913A	# <CJK>
-0x5A78	0x9099	# <CJK>
-0x5A79	0x9114	# <CJK>
-0x5A7A	0x90A1	# <CJK>
-0x5A7B	0x90B4	# <CJK>
-0x5A7C	0x90B3	# <CJK>
-0x5A7D	0x90B6	# <CJK>
-0x5A7E	0x9134	# <CJK>
-0x5B21	0x90B8	# <CJK>
-0x5B22	0x90B0	# <CJK>
-0x5B23	0x90DF	# <CJK>
-0x5B24	0x90C5	# <CJK>
-0x5B25	0x90BE	# <CJK>
-0x5B26	0x9136	# <CJK>
-0x5B27	0x90C4	# <CJK>
-0x5B28	0x90C7	# <CJK>
-0x5B29	0x9106	# <CJK>
-0x5B2A	0x9148	# <CJK>
-0x5B2B	0x90E2	# <CJK>
-0x5B2C	0x90DC	# <CJK>
-0x5B2D	0x90D7	# <CJK>
-0x5B2E	0x90DB	# <CJK>
-0x5B2F	0x90EB	# <CJK>
-0x5B30	0x90EF	# <CJK>
-0x5B31	0x90FE	# <CJK>
-0x5B32	0x9104	# <CJK>
-0x5B33	0x9122	# <CJK>
-0x5B34	0x911E	# <CJK>
-0x5B35	0x9123	# <CJK>
-0x5B36	0x9131	# <CJK>
-0x5B37	0x912F	# <CJK>
-0x5B38	0x9139	# <CJK>
-0x5B39	0x9143	# <CJK>
-0x5B3A	0x9146	# <CJK>
-0x5B3B	0x82BB	# <CJK>
-0x5B3C	0x5950	# <CJK>
-0x5B3D	0x52F1	# <CJK>
-0x5B3E	0x52AC	# <CJK>
-0x5B3F	0x52AD	# <CJK>
-0x5B40	0x52BE	# <CJK>
-0x5B41	0x54FF	# <CJK>
-0x5B42	0x52D0	# <CJK>
-0x5B43	0x52D6	# <CJK>
-0x5B44	0x52F0	# <CJK>
-0x5B45	0x53DF	# <CJK>
-0x5B46	0x71EE	# <CJK>
-0x5B47	0x77CD	# <CJK>
-0x5B48	0x5EF4	# <CJK>
-0x5B49	0x51F5	# <CJK>
-0x5B4A	0x51FC	# <CJK>
-0x5B4B	0x9B2F	# <CJK>
-0x5B4C	0x53B6	# <CJK>
-0x5B4D	0x5F01	# <CJK>
-0x5B4E	0x755A	# <CJK>
-0x5B4F	0x5DF0	# <CJK>
-0x5B50	0x574C	# <CJK>
-0x5B51	0x580A	# <CJK>
-0x5B52	0x57A1	# <CJK>
-0x5B53	0x587E	# <CJK>
-0x5B54	0x58BC	# <CJK>
-0x5B55	0x58C5	# <CJK>
-0x5B56	0x58D1	# <CJK>
-0x5B57	0x5729	# <CJK>
-0x5B58	0x572C	# <CJK>
-0x5B59	0x572A	# <CJK>
-0x5B5A	0x5733	# <CJK>
-0x5B5B	0x58D9	# <CJK>
-0x5B5C	0x572E	# <CJK>
-0x5B5D	0x572F	# <CJK>
-0x5B5E	0x58E2	# <CJK>
-0x5B5F	0x573B	# <CJK>
-0x5B60	0x5742	# <CJK>
-0x5B61	0x5769	# <CJK>
-0x5B62	0x58E0	# <CJK>
-0x5B63	0x576B	# <CJK>
-0x5B64	0x58DA	# <CJK>
-0x5B65	0x577C	# <CJK>
-0x5B66	0x577B	# <CJK>
-0x5B67	0x5768	# <CJK>
-0x5B68	0x576D	# <CJK>
-0x5B69	0x5776	# <CJK>
-0x5B6A	0x5773	# <CJK>
-0x5B6B	0x57E1	# <CJK>
-0x5B6C	0x57A4	# <CJK>
-0x5B6D	0x578C	# <CJK>
-0x5B6E	0x584F	# <CJK>
-0x5B6F	0x57CF	# <CJK>
-0x5B70	0x57A7	# <CJK>
-0x5B71	0x5816	# <CJK>
-0x5B72	0x5793	# <CJK>
-0x5B73	0x57A0	# <CJK>
-0x5B74	0x57D5	# <CJK>
-0x5B75	0x5852	# <CJK>
-0x5B76	0x581D	# <CJK>
-0x5B77	0x5864	# <CJK>
-0x5B78	0x57D2	# <CJK>
-0x5B79	0x57B8	# <CJK>
-0x5B7A	0x57F4	# <CJK>
-0x5B7B	0x57EF	# <CJK>
-0x5B7C	0x57F8	# <CJK>
-0x5B7D	0x57E4	# <CJK>
-0x5B7E	0x57DD	# <CJK>
-0x5C21	0x580B	# <CJK>
-0x5C22	0x580D	# <CJK>
-0x5C23	0x57FD	# <CJK>
-0x5C24	0x57ED	# <CJK>
-0x5C25	0x5800	# <CJK>
-0x5C26	0x581E	# <CJK>
-0x5C27	0x5819	# <CJK>
-0x5C28	0x5844	# <CJK>
-0x5C29	0x5820	# <CJK>
-0x5C2A	0x5865	# <CJK>
-0x5C2B	0x586C	# <CJK>
-0x5C2C	0x5881	# <CJK>
-0x5C2D	0x5889	# <CJK>
-0x5C2E	0x589A	# <CJK>
-0x5C2F	0x5880	# <CJK>
-0x5C30	0x99A8	# <CJK>
-0x5C31	0x9F19	# <CJK>
-0x5C32	0x61FF	# <CJK>
-0x5C33	0x8279	# <CJK>
-0x5C34	0x827D	# <CJK>
-0x5C35	0x827F	# <CJK>
-0x5C36	0x828F	# <CJK>
-0x5C37	0x828A	# <CJK>
-0x5C38	0x82A8	# <CJK>
-0x5C39	0x8284	# <CJK>
-0x5C3A	0x828E	# <CJK>
-0x5C3B	0x8291	# <CJK>
-0x5C3C	0x858C	# <CJK>
-0x5C3D	0x8299	# <CJK>
-0x5C3E	0x82AB	# <CJK>
-0x5C3F	0x8553	# <CJK>
-0x5C40	0x82BE	# <CJK>
-0x5C41	0x82B0	# <CJK>
-0x5C42	0x85F6	# <CJK>
-0x5C43	0x82CA	# <CJK>
-0x5C44	0x82E3	# <CJK>
-0x5C45	0x8298	# <CJK>
-0x5C46	0x82B7	# <CJK>
-0x5C47	0x82AE	# <CJK>
-0x5C48	0x83A7	# <CJK>
-0x5C49	0x8407	# <CJK>
-0x5C4A	0x84EF	# <CJK>
-0x5C4B	0x82A9	# <CJK>
-0x5C4C	0x82B4	# <CJK>
-0x5C4D	0x82A1	# <CJK>
-0x5C4E	0x82AA	# <CJK>
-0x5C4F	0x829F	# <CJK>
-0x5C50	0x82C4	# <CJK>
-0x5C51	0x82E7	# <CJK>
-0x5C52	0x82A4	# <CJK>
-0x5C53	0x82E1	# <CJK>
-0x5C54	0x8309	# <CJK>
-0x5C55	0x82F7	# <CJK>
-0x5C56	0x82E4	# <CJK>
-0x5C57	0x8622	# <CJK>
-0x5C58	0x8307	# <CJK>
-0x5C59	0x82DC	# <CJK>
-0x5C5A	0x82F4	# <CJK>
-0x5C5B	0x82D2	# <CJK>
-0x5C5C	0x82D8	# <CJK>
-0x5C5D	0x830C	# <CJK>
-0x5C5E	0x82FB	# <CJK>
-0x5C5F	0x82D3	# <CJK>
-0x5C60	0x8526	# <CJK>
-0x5C61	0x831A	# <CJK>
-0x5C62	0x8306	# <CJK>
-0x5C63	0x584B	# <CJK>
-0x5C64	0x7162	# <CJK>
-0x5C65	0x82E0	# <CJK>
-0x5C66	0x82D5	# <CJK>
-0x5C67	0x831C	# <CJK>
-0x5C68	0x8351	# <CJK>
-0x5C69	0x8558	# <CJK>
-0x5C6A	0x84FD	# <CJK>
-0x5C6B	0x8308	# <CJK>
-0x5C6C	0x8392	# <CJK>
-0x5C6D	0x833C	# <CJK>
-0x5C6E	0x8334	# <CJK>
-0x5C6F	0x8331	# <CJK>
-0x5C70	0x839B	# <CJK>
-0x5C71	0x854E	# <CJK>
-0x5C72	0x832F	# <CJK>
-0x5C73	0x834F	# <CJK>
-0x5C74	0x8347	# <CJK>
-0x5C75	0x8343	# <CJK>
-0x5C76	0x8588	# <CJK>
-0x5C77	0x8340	# <CJK>
-0x5C78	0x8317	# <CJK>
-0x5C79	0x85BA	# <CJK>
-0x5C7A	0x832D	# <CJK>
-0x5C7B	0x833A	# <CJK>
-0x5C7C	0x8333	# <CJK>
-0x5C7D	0x7296	# <CJK>
-0x5C7E	0x6ECE	# <CJK>
-0x5D21	0x8541	# <CJK>
-0x5D22	0x831B	# <CJK>
-0x5D23	0x85CE	# <CJK>
-0x5D24	0x8552	# <CJK>
-0x5D25	0x84C0	# <CJK>
-0x5D26	0x8452	# <CJK>
-0x5D27	0x8464	# <CJK>
-0x5D28	0x83B0	# <CJK>
-0x5D29	0x8378	# <CJK>
-0x5D2A	0x8494	# <CJK>
-0x5D2B	0x8435	# <CJK>
-0x5D2C	0x83A0	# <CJK>
-0x5D2D	0x83AA	# <CJK>
-0x5D2E	0x8393	# <CJK>
-0x5D2F	0x839C	# <CJK>
-0x5D30	0x8385	# <CJK>
-0x5D31	0x837C	# <CJK>
-0x5D32	0x859F	# <CJK>
-0x5D33	0x83A9	# <CJK>
-0x5D34	0x837D	# <CJK>
-0x5D35	0x8555	# <CJK>
-0x5D36	0x837B	# <CJK>
-0x5D37	0x8398	# <CJK>
-0x5D38	0x839E	# <CJK>
-0x5D39	0x83A8	# <CJK>
-0x5D3A	0x9DAF	# <CJK>
-0x5D3B	0x8493	# <CJK>
-0x5D3C	0x83C1	# <CJK>
-0x5D3D	0x8401	# <CJK>
-0x5D3E	0x83E5	# <CJK>
-0x5D3F	0x83D8	# <CJK>
-0x5D40	0x5807	# <CJK>
-0x5D41	0x8418	# <CJK>
-0x5D42	0x840B	# <CJK>
-0x5D43	0x83DD	# <CJK>
-0x5D44	0x83FD	# <CJK>
-0x5D45	0x83D6	# <CJK>
-0x5D46	0x841C	# <CJK>
-0x5D47	0x8438	# <CJK>
-0x5D48	0x8411	# <CJK>
-0x5D49	0x8406	# <CJK>
-0x5D4A	0x83D4	# <CJK>
-0x5D4B	0x83DF	# <CJK>
-0x5D4C	0x840F	# <CJK>
-0x5D4D	0x8403	# <CJK>
-0x5D4E	0x83F8	# <CJK>
-0x5D4F	0x83F9	# <CJK>
-0x5D50	0x83EA	# <CJK>
-0x5D51	0x83C5	# <CJK>
-0x5D52	0x83C0	# <CJK>
-0x5D53	0x7E08	# <CJK>
-0x5D54	0x83F0	# <CJK>
-0x5D55	0x83E1	# <CJK>
-0x5D56	0x845C	# <CJK>
-0x5D57	0x8451	# <CJK>
-0x5D58	0x845A	# <CJK>
-0x5D59	0x8459	# <CJK>
-0x5D5A	0x8473	# <CJK>
-0x5D5B	0x8546	# <CJK>
-0x5D5C	0x8488	# <CJK>
-0x5D5D	0x847A	# <CJK>
-0x5D5E	0x8562	# <CJK>
-0x5D5F	0x8478	# <CJK>
-0x5D60	0x843C	# <CJK>
-0x5D61	0x8446	# <CJK>
-0x5D62	0x8469	# <CJK>
-0x5D63	0x8476	# <CJK>
-0x5D64	0x851E	# <CJK>
-0x5D65	0x848E	# <CJK>
-0x5D66	0x8431	# <CJK>
-0x5D67	0x846D	# <CJK>
-0x5D68	0x84C1	# <CJK>
-0x5D69	0x84CD	# <CJK>
-0x5D6A	0x84D0	# <CJK>
-0x5D6B	0x9A40	# <CJK>
-0x5D6C	0x84BD	# <CJK>
-0x5D6D	0x84D3	# <CJK>
-0x5D6E	0x84CA	# <CJK>
-0x5D6F	0x84BF	# <CJK>
-0x5D70	0x84BA	# <CJK>
-0x5D71	0x863A	# <CJK>
-0x5D72	0x84A1	# <CJK>
-0x5D73	0x84B9	# <CJK>
-0x5D74	0x84B4	# <CJK>
-0x5D75	0x8497	# <CJK>
-0x5D76	0x93A3	# <CJK>
-0x5D77	0x8577	# <CJK>
-0x5D78	0x850C	# <CJK>
-0x5D79	0x750D	# <CJK>
-0x5D7A	0x8538	# <CJK>
-0x5D7B	0x84F0	# <CJK>
-0x5D7C	0x861E	# <CJK>
-0x5D7D	0x851F	# <CJK>
-0x5D7E	0x85FA	# <CJK>
-0x5E21	0x8556	# <CJK>
-0x5E22	0x853B	# <CJK>
-0x5E23	0x84FF	# <CJK>
-0x5E24	0x84FC	# <CJK>
-0x5E25	0x8559	# <CJK>
-0x5E26	0x8548	# <CJK>
-0x5E27	0x8568	# <CJK>
-0x5E28	0x8564	# <CJK>
-0x5E29	0x855E	# <CJK>
-0x5E2A	0x857A	# <CJK>
-0x5E2B	0x77A2	# <CJK>
-0x5E2C	0x8543	# <CJK>
-0x5E2D	0x8604	# <CJK>
-0x5E2E	0x857B	# <CJK>
-0x5E2F	0x85A4	# <CJK>
-0x5E30	0x85A8	# <CJK>
-0x5E31	0x8587	# <CJK>
-0x5E32	0x858F	# <CJK>
-0x5E33	0x8579	# <CJK>
-0x5E34	0x85EA	# <CJK>
-0x5E35	0x859C	# <CJK>
-0x5E36	0x8585	# <CJK>
-0x5E37	0x85B9	# <CJK>
-0x5E38	0x85B7	# <CJK>
-0x5E39	0x85B0	# <CJK>
-0x5E3A	0x861A	# <CJK>
-0x5E3B	0x85C1	# <CJK>
-0x5E3C	0x85DC	# <CJK>
-0x5E3D	0x85FF	# <CJK>
-0x5E3E	0x8627	# <CJK>
-0x5E3F	0x8605	# <CJK>
-0x5E40	0x8629	# <CJK>
-0x5E41	0x8616	# <CJK>
-0x5E42	0x863C	# <CJK>
-0x5E43	0x5EFE	# <CJK>
-0x5E44	0x5F08	# <CJK>
-0x5E45	0x593C	# <CJK>
-0x5E46	0x5969	# <CJK>
-0x5E47	0x8037	# <CJK>
-0x5E48	0x5955	# <CJK>
-0x5E49	0x595A	# <CJK>
-0x5E4A	0x5958	# <CJK>
-0x5E4B	0x530F	# <CJK>
-0x5E4C	0x5C22	# <CJK>
-0x5E4D	0x5C25	# <CJK>
-0x5E4E	0x5C2C	# <CJK>
-0x5E4F	0x5C37	# <CJK>
-0x5E50	0x624C	# <CJK>
-0x5E51	0x636B	# <CJK>
-0x5E52	0x6476	# <CJK>
-0x5E53	0x62BB	# <CJK>
-0x5E54	0x62CA	# <CJK>
-0x5E55	0x62DA	# <CJK>
-0x5E56	0x62D7	# <CJK>
-0x5E57	0x62EE	# <CJK>
-0x5E58	0x649F	# <CJK>
-0x5E59	0x62F6	# <CJK>
-0x5E5A	0x6339	# <CJK>
-0x5E5B	0x634B	# <CJK>
-0x5E5C	0x6343	# <CJK>
-0x5E5D	0x63AD	# <CJK>
-0x5E5E	0x63F6	# <CJK>
-0x5E5F	0x6371	# <CJK>
-0x5E60	0x637A	# <CJK>
-0x5E61	0x638E	# <CJK>
-0x5E62	0x6451	# <CJK>
-0x5E63	0x636D	# <CJK>
-0x5E64	0x63AC	# <CJK>
-0x5E65	0x638A	# <CJK>
-0x5E66	0x6369	# <CJK>
-0x5E67	0x63AE	# <CJK>
-0x5E68	0x645C	# <CJK>
-0x5E69	0x63F2	# <CJK>
-0x5E6A	0x63F8	# <CJK>
-0x5E6B	0x63E0	# <CJK>
-0x5E6C	0x64B3	# <CJK>
-0x5E6D	0x63C4	# <CJK>
-0x5E6E	0x63DE	# <CJK>
-0x5E6F	0x63CE	# <CJK>
-0x5E70	0x6452	# <CJK>
-0x5E71	0x63C6	# <CJK>
-0x5E72	0x63BE	# <CJK>
-0x5E73	0x6504	# <CJK>
-0x5E74	0x6441	# <CJK>
-0x5E75	0x640B	# <CJK>
-0x5E76	0x641B	# <CJK>
-0x5E77	0x6420	# <CJK>
-0x5E78	0x640C	# <CJK>
-0x5E79	0x6426	# <CJK>
-0x5E7A	0x6421	# <CJK>
-0x5E7B	0x645E	# <CJK>
-0x5E7C	0x6516	# <CJK>
-0x5E7D	0x646D	# <CJK>
-0x5E7E	0x6496	# <CJK>
-0x5F21	0x647A	# <CJK>
-0x5F22	0x64F7	# <CJK>
-0x5F23	0x64FC	# <CJK>
-0x5F24	0x6499	# <CJK>
-0x5F25	0x651B	# <CJK>
-0x5F26	0x64C0	# <CJK>
-0x5F27	0x64D0	# <CJK>
-0x5F28	0x64D7	# <CJK>
-0x5F29	0x64E4	# <CJK>
-0x5F2A	0x64E2	# <CJK>
-0x5F2B	0x6509	# <CJK>
-0x5F2C	0x6525	# <CJK>
-0x5F2D	0x652E	# <CJK>
-0x5F2E	0x5F0B	# <CJK>
-0x5F2F	0x5FD2	# <CJK>
-0x5F30	0x7519	# <CJK>
-0x5F31	0x5F11	# <CJK>
-0x5F32	0x535F	# <CJK>
-0x5F33	0x53F1	# <CJK>
-0x5F34	0x5630	# <CJK>
-0x5F35	0x53E9	# <CJK>
-0x5F36	0x53E8	# <CJK>
-0x5F37	0x53FB	# <CJK>
-0x5F38	0x5412	# <CJK>
-0x5F39	0x5416	# <CJK>
-0x5F3A	0x5406	# <CJK>
-0x5F3B	0x544B	# <CJK>
-0x5F3C	0x5638	# <CJK>
-0x5F3D	0x56C8	# <CJK>
-0x5F3E	0x5454	# <CJK>
-0x5F3F	0x56A6	# <CJK>
-0x5F40	0x5443	# <CJK>
-0x5F41	0x5421	# <CJK>
-0x5F42	0x5504	# <CJK>
-0x5F43	0x54BC	# <CJK>
-0x5F44	0x5423	# <CJK>
-0x5F45	0x5432	# <CJK>
-0x5F46	0x5482	# <CJK>
-0x5F47	0x5494	# <CJK>
-0x5F48	0x5477	# <CJK>
-0x5F49	0x5471	# <CJK>
-0x5F4A	0x5464	# <CJK>
-0x5F4B	0x549A	# <CJK>
-0x5F4C	0x5680	# <CJK>
-0x5F4D	0x5484	# <CJK>
-0x5F4E	0x5476	# <CJK>
-0x5F4F	0x5466	# <CJK>
-0x5F50	0x565D	# <CJK>
-0x5F51	0x54D0	# <CJK>
-0x5F52	0x54AD	# <CJK>
-0x5F53	0x54C2	# <CJK>
-0x5F54	0x54B4	# <CJK>
-0x5F55	0x5660	# <CJK>
-0x5F56	0x54A7	# <CJK>
-0x5F57	0x54A6	# <CJK>
-0x5F58	0x5635	# <CJK>
-0x5F59	0x55F6	# <CJK>
-0x5F5A	0x5472	# <CJK>
-0x5F5B	0x54A3	# <CJK>
-0x5F5C	0x5666	# <CJK>
-0x5F5D	0x54BB	# <CJK>
-0x5F5E	0x54BF	# <CJK>
-0x5F5F	0x54CC	# <CJK>
-0x5F60	0x5672	# <CJK>
-0x5F61	0x54DA	# <CJK>
-0x5F62	0x568C	# <CJK>
-0x5F63	0x54A9	# <CJK>
-0x5F64	0x54AA	# <CJK>
-0x5F65	0x54A4	# <CJK>
-0x5F66	0x5665	# <CJK>
-0x5F67	0x54CF	# <CJK>
-0x5F68	0x54DE	# <CJK>
-0x5F69	0x561C	# <CJK>
-0x5F6A	0x54E7	# <CJK>
-0x5F6B	0x562E	# <CJK>
-0x5F6C	0x54FD	# <CJK>
-0x5F6D	0x5514	# <CJK>
-0x5F6E	0x54F3	# <CJK>
-0x5F6F	0x55E9	# <CJK>
-0x5F70	0x5523	# <CJK>
-0x5F71	0x550F	# <CJK>
-0x5F72	0x5511	# <CJK>
-0x5F73	0x5527	# <CJK>
-0x5F74	0x552A	# <CJK>
-0x5F75	0x5616	# <CJK>
-0x5F76	0x558F	# <CJK>
-0x5F77	0x55B5	# <CJK>
-0x5F78	0x5549	# <CJK>
-0x5F79	0x56C0	# <CJK>
-0x5F7A	0x5541	# <CJK>
-0x5F7B	0x5555	# <CJK>
-0x5F7C	0x553F	# <CJK>
-0x5F7D	0x5550	# <CJK>
-0x5F7E	0x553C	# <CJK>
-0x6021	0x5537	# <CJK>
-0x6022	0x5556	# <CJK>
-0x6023	0x5575	# <CJK>
-0x6024	0x5576	# <CJK>
-0x6025	0x5577	# <CJK>
-0x6026	0x5533	# <CJK>
-0x6027	0x5530	# <CJK>
-0x6028	0x555C	# <CJK>
-0x6029	0x558B	# <CJK>
-0x602A	0x55D2	# <CJK>
-0x602B	0x5583	# <CJK>
-0x602C	0x55B1	# <CJK>
-0x602D	0x55B9	# <CJK>
-0x602E	0x5588	# <CJK>
-0x602F	0x5581	# <CJK>
-0x6030	0x559F	# <CJK>
-0x6031	0x557E	# <CJK>
-0x6032	0x55D6	# <CJK>
-0x6033	0x5591	# <CJK>
-0x6034	0x557B	# <CJK>
-0x6035	0x55DF	# <CJK>
-0x6036	0x560D	# <CJK>
-0x6037	0x56B3	# <CJK>
-0x6038	0x5594	# <CJK>
-0x6039	0x5599	# <CJK>
-0x603A	0x55EA	# <CJK>
-0x603B	0x55F7	# <CJK>
-0x603C	0x55C9	# <CJK>
-0x603D	0x561F	# <CJK>
-0x603E	0x55D1	# <CJK>
-0x603F	0x56C1	# <CJK>
-0x6040	0x55EC	# <CJK>
-0x6041	0x55D4	# <CJK>
-0x6042	0x55E6	# <CJK>
-0x6043	0x55DD	# <CJK>
-0x6044	0x55C4	# <CJK>
-0x6045	0x55EF	# <CJK>
-0x6046	0x55E5	# <CJK>
-0x6047	0x55F2	# <CJK>
-0x6048	0x566F	# <CJK>
-0x6049	0x55CC	# <CJK>
-0x604A	0x55CD	# <CJK>
-0x604B	0x55E8	# <CJK>
-0x604C	0x55F5	# <CJK>
-0x604D	0x55E4	# <CJK>
-0x604E	0x8F61	# <CJK>
-0x604F	0x561E	# <CJK>
-0x6050	0x5608	# <CJK>
-0x6051	0x560C	# <CJK>
-0x6052	0x5601	# <CJK>
-0x6053	0x56B6	# <CJK>
-0x6054	0x5623	# <CJK>
-0x6055	0x55FE	# <CJK>
-0x6056	0x5600	# <CJK>
-0x6057	0x5627	# <CJK>
-0x6058	0x562D	# <CJK>
-0x6059	0x5658	# <CJK>
-0x605A	0x5639	# <CJK>
-0x605B	0x5657	# <CJK>
-0x605C	0x562C	# <CJK>
-0x605D	0x564D	# <CJK>
-0x605E	0x5662	# <CJK>
-0x605F	0x5659	# <CJK>
-0x6060	0x5695	# <CJK>
-0x6061	0x564C	# <CJK>
-0x6062	0x5654	# <CJK>
-0x6063	0x5686	# <CJK>
-0x6064	0x5664	# <CJK>
-0x6065	0x5671	# <CJK>
-0x6066	0x566B	# <CJK>
-0x6067	0x567B	# <CJK>
-0x6068	0x567C	# <CJK>
-0x6069	0x5685	# <CJK>
-0x606A	0x5693	# <CJK>
-0x606B	0x56AF	# <CJK>
-0x606C	0x56D4	# <CJK>
-0x606D	0x56D7	# <CJK>
-0x606E	0x56DD	# <CJK>
-0x606F	0x56E1	# <CJK>
-0x6070	0x5707	# <CJK>
-0x6071	0x56EB	# <CJK>
-0x6072	0x56F9	# <CJK>
-0x6073	0x56FF	# <CJK>
-0x6074	0x5704	# <CJK>
-0x6075	0x570A	# <CJK>
-0x6076	0x5709	# <CJK>
-0x6077	0x571C	# <CJK>
-0x6078	0x5E43	# <CJK>
-0x6079	0x5E19	# <CJK>
-0x607A	0x5E14	# <CJK>
-0x607B	0x5E11	# <CJK>
-0x607C	0x5E6C	# <CJK>
-0x607D	0x5E58	# <CJK>
-0x607E	0x5E57	# <CJK>
-0x6121	0x5E37	# <CJK>
-0x6122	0x5E44	# <CJK>
-0x6123	0x5E54	# <CJK>
-0x6124	0x5E5B	# <CJK>
-0x6125	0x5E5E	# <CJK>
-0x6126	0x5E61	# <CJK>
-0x6127	0x5C8C	# <CJK>
-0x6128	0x5C7A	# <CJK>
-0x6129	0x5C8D	# <CJK>
-0x612A	0x5C90	# <CJK>
-0x612B	0x5D87	# <CJK>
-0x612C	0x5C88	# <CJK>
-0x612D	0x5CF4	# <CJK>
-0x612E	0x5C99	# <CJK>
-0x612F	0x5C91	# <CJK>
-0x6130	0x5D50	# <CJK>
-0x6131	0x5C9C	# <CJK>
-0x6132	0x5CB5	# <CJK>
-0x6133	0x5CA2	# <CJK>
-0x6134	0x5D2C	# <CJK>
-0x6135	0x5CAC	# <CJK>
-0x6136	0x5CAB	# <CJK>
-0x6137	0x5CB1	# <CJK>
-0x6138	0x5CA3	# <CJK>
-0x6139	0x5CC1	# <CJK>
-0x613A	0x5CB7	# <CJK>
-0x613B	0x5DA7	# <CJK>
-0x613C	0x5CD2	# <CJK>
-0x613D	0x5DA0	# <CJK>
-0x613E	0x5CCB	# <CJK>
-0x613F	0x5D22	# <CJK>
-0x6140	0x5D97	# <CJK>
-0x6141	0x5D0D	# <CJK>
-0x6142	0x5D27	# <CJK>
-0x6143	0x5D26	# <CJK>
-0x6144	0x5D2E	# <CJK>
-0x6145	0x5D24	# <CJK>
-0x6146	0x5D1E	# <CJK>
-0x6147	0x5D06	# <CJK>
-0x6148	0x5D1B	# <CJK>
-0x6149	0x5DB8	# <CJK>
-0x614A	0x5D3E	# <CJK>
-0x614B	0x5D34	# <CJK>
-0x614C	0x5D3D	# <CJK>
-0x614D	0x5D6C	# <CJK>
-0x614E	0x5D5B	# <CJK>
-0x614F	0x5D6F	# <CJK>
-0x6150	0x5D81	# <CJK>
-0x6151	0x5D6B	# <CJK>
-0x6152	0x5D4B	# <CJK>
-0x6153	0x5D4A	# <CJK>
-0x6154	0x5D69	# <CJK>
-0x6155	0x5D74	# <CJK>
-0x6156	0x5D82	# <CJK>
-0x6157	0x5D99	# <CJK>
-0x6158	0x5D9D	# <CJK>
-0x6159	0x8C73	# <CJK>
-0x615A	0x5DB7	# <CJK>
-0x615B	0x5DD4	# <CJK>
-0x615C	0x5F73	# <CJK>
-0x615D	0x5F77	# <CJK>
-0x615E	0x5F82	# <CJK>
-0x615F	0x5F87	# <CJK>
-0x6160	0x5F89	# <CJK>
-0x6161	0x540E	# <CJK>
-0x6162	0x5FA0	# <CJK>
-0x6163	0x5F99	# <CJK>
-0x6164	0x5F9C	# <CJK>
-0x6165	0x5FA8	# <CJK>
-0x6166	0x5FAD	# <CJK>
-0x6167	0x5FB5	# <CJK>
-0x6168	0x5FBC	# <CJK>
-0x6169	0x8862	# <CJK>
-0x616A	0x5F61	# <CJK>
-0x616B	0x72AD	# <CJK>
-0x616C	0x72B0	# <CJK>
-0x616D	0x72B4	# <CJK>
-0x616E	0x7377	# <CJK>
-0x616F	0x7341	# <CJK>
-0x6170	0x72C3	# <CJK>
-0x6171	0x72C1	# <CJK>
-0x6172	0x72CE	# <CJK>
-0x6173	0x72CD	# <CJK>
-0x6174	0x72D2	# <CJK>
-0x6175	0x72E8	# <CJK>
-0x6176	0x736A	# <CJK>
-0x6177	0x72E9	# <CJK>
-0x6178	0x733B	# <CJK>
-0x6179	0x72F4	# <CJK>
-0x617A	0x72F7	# <CJK>
-0x617B	0x7301	# <CJK>
-0x617C	0x72F3	# <CJK>
-0x617D	0x736B	# <CJK>
-0x617E	0x72FA	# <CJK>
-0x6221	0x72FB	# <CJK>
-0x6222	0x7317	# <CJK>
-0x6223	0x7313	# <CJK>
-0x6224	0x7380	# <CJK>
-0x6225	0x730A	# <CJK>
-0x6226	0x731E	# <CJK>
-0x6227	0x731D	# <CJK>
-0x6228	0x737C	# <CJK>
-0x6229	0x7322	# <CJK>
-0x622A	0x7339	# <CJK>
-0x622B	0x7325	# <CJK>
-0x622C	0x732C	# <CJK>
-0x622D	0x7338	# <CJK>
-0x622E	0x7331	# <CJK>
-0x622F	0x7350	# <CJK>
-0x6230	0x734D	# <CJK>
-0x6231	0x7357	# <CJK>
-0x6232	0x7360	# <CJK>
-0x6233	0x736C	# <CJK>
-0x6234	0x736F	# <CJK>
-0x6235	0x737E	# <CJK>
-0x6236	0x821B	# <CJK>
-0x6237	0x5925	# <CJK>
-0x6238	0x98E7	# <CJK>
-0x6239	0x5924	# <CJK>
-0x623A	0x5902	# <CJK>
-0x623B	0x98E0	# <CJK>
-0x623C	0x9933	# <CJK>
-0x623D	0x98E9	# <CJK>
-0x623E	0x993C	# <CJK>
-0x623F	0x98EA	# <CJK>
-0x6240	0x98EB	# <CJK>
-0x6241	0x98ED	# <CJK>
-0x6242	0x98F4	# <CJK>
-0x6243	0x9909	# <CJK>
-0x6244	0x9911	# <CJK>
-0x6245	0x4F59	# <CJK>
-0x6246	0x991B	# <CJK>
-0x6247	0x9937	# <CJK>
-0x6248	0x993F	# <CJK>
-0x6249	0x9943	# <CJK>
-0x624A	0x9948	# <CJK>
-0x624B	0x9949	# <CJK>
-0x624C	0x994A	# <CJK>
-0x624D	0x994C	# <CJK>
-0x624E	0x9962	# <CJK>
-0x624F	0x5E80	# <CJK>
-0x6250	0x5EE1	# <CJK>
-0x6251	0x5E8B	# <CJK>
-0x6252	0x5E96	# <CJK>
-0x6253	0x5EA5	# <CJK>
-0x6254	0x5EA0	# <CJK>
-0x6255	0x5EB9	# <CJK>
-0x6256	0x5EB5	# <CJK>
-0x6257	0x5EBE	# <CJK>
-0x6258	0x5EB3	# <CJK>
-0x6259	0x8CE1	# <CJK>
-0x625A	0x5ED2	# <CJK>
-0x625B	0x5ED1	# <CJK>
-0x625C	0x5EDB	# <CJK>
-0x625D	0x5EE8	# <CJK>
-0x625E	0x5EEA	# <CJK>
-0x625F	0x81BA	# <CJK>
-0x6260	0x5FC4	# <CJK>
-0x6261	0x5FC9	# <CJK>
-0x6262	0x5FD6	# <CJK>
-0x6263	0x61FA	# <CJK>
-0x6264	0x61AE	# <CJK>
-0x6265	0x5FEE	# <CJK>
-0x6266	0x616A	# <CJK>
-0x6267	0x5FE1	# <CJK>
-0x6268	0x5FE4	# <CJK>
-0x6269	0x613E	# <CJK>
-0x626A	0x60B5	# <CJK>
-0x626B	0x6134	# <CJK>
-0x626C	0x5FEA	# <CJK>
-0x626D	0x5FED	# <CJK>
-0x626E	0x5FF8	# <CJK>
-0x626F	0x6019	# <CJK>
-0x6270	0x6035	# <CJK>
-0x6271	0x6026	# <CJK>
-0x6272	0x601B	# <CJK>
-0x6273	0x600F	# <CJK>
-0x6274	0x600D	# <CJK>
-0x6275	0x6029	# <CJK>
-0x6276	0x602B	# <CJK>
-0x6277	0x600A	# <CJK>
-0x6278	0x61CC	# <CJK>
-0x6279	0x6021	# <CJK>
-0x627A	0x615F	# <CJK>
-0x627B	0x61E8	# <CJK>
-0x627C	0x60FB	# <CJK>
-0x627D	0x6137	# <CJK>
-0x627E	0x6042	# <CJK>
-0x6321	0x606A	# <CJK>
-0x6322	0x60F2	# <CJK>
-0x6323	0x6096	# <CJK>
-0x6324	0x609A	# <CJK>
-0x6325	0x6173	# <CJK>
-0x6326	0x609D	# <CJK>
-0x6327	0x6083	# <CJK>
-0x6328	0x6092	# <CJK>
-0x6329	0x608C	# <CJK>
-0x632A	0x609B	# <CJK>
-0x632B	0x611C	# <CJK>
-0x632C	0x60BB	# <CJK>
-0x632D	0x60B1	# <CJK>
-0x632E	0x60DD	# <CJK>
-0x632F	0x60D8	# <CJK>
-0x6330	0x60C6	# <CJK>
-0x6331	0x60DA	# <CJK>
-0x6332	0x60B4	# <CJK>
-0x6333	0x6120	# <CJK>
-0x6334	0x6192	# <CJK>
-0x6335	0x6115	# <CJK>
-0x6336	0x6123	# <CJK>
-0x6337	0x60F4	# <CJK>
-0x6338	0x6100	# <CJK>
-0x6339	0x610E	# <CJK>
-0x633A	0x612B	# <CJK>
-0x633B	0x614A	# <CJK>
-0x633C	0x6175	# <CJK>
-0x633D	0x61AC	# <CJK>
-0x633E	0x6194	# <CJK>
-0x633F	0x61A7	# <CJK>
-0x6340	0x61B7	# <CJK>
-0x6341	0x61D4	# <CJK>
-0x6342	0x61F5	# <CJK>
-0x6343	0x5FDD	# <CJK>
-0x6344	0x96B3	# <CJK>
-0x6345	0x9582	# <CJK>
-0x6346	0x9586	# <CJK>
-0x6347	0x95C8	# <CJK>
-0x6348	0x958E	# <CJK>
-0x6349	0x9594	# <CJK>
-0x634A	0x958C	# <CJK>
-0x634B	0x95E5	# <CJK>
-0x634C	0x95AD	# <CJK>
-0x634D	0x95AB	# <CJK>
-0x634E	0x9B2E	# <CJK>
-0x634F	0x95AC	# <CJK>
-0x6350	0x95BE	# <CJK>
-0x6351	0x95B6	# <CJK>
-0x6352	0x9B29	# <CJK>
-0x6353	0x95BF	# <CJK>
-0x6354	0x95BD	# <CJK>
-0x6355	0x95BC	# <CJK>
-0x6356	0x95C3	# <CJK>
-0x6357	0x95CB	# <CJK>
-0x6358	0x95D4	# <CJK>
-0x6359	0x95D0	# <CJK>
-0x635A	0x95D5	# <CJK>
-0x635B	0x95DE	# <CJK>
-0x635C	0x4E2C	# <CJK>
-0x635D	0x723F	# <CJK>
-0x635E	0x6215	# <CJK>
-0x635F	0x6C35	# <CJK>
-0x6360	0x6C54	# <CJK>
-0x6361	0x6C5C	# <CJK>
-0x6362	0x6C4A	# <CJK>
-0x6363	0x7043	# <CJK>
-0x6364	0x6C85	# <CJK>
-0x6365	0x6C90	# <CJK>
-0x6366	0x6C94	# <CJK>
-0x6367	0x6C8C	# <CJK>
-0x6368	0x6C68	# <CJK>
-0x6369	0x6C69	# <CJK>
-0x636A	0x6C74	# <CJK>
-0x636B	0x6C76	# <CJK>
-0x636C	0x6C86	# <CJK>
-0x636D	0x6F59	# <CJK>
-0x636E	0x6CD0	# <CJK>
-0x636F	0x6CD4	# <CJK>
-0x6370	0x6CAD	# <CJK>
-0x6371	0x7027	# <CJK>
-0x6372	0x7018	# <CJK>
-0x6373	0x6CF1	# <CJK>
-0x6374	0x6CD7	# <CJK>
-0x6375	0x6CB2	# <CJK>
-0x6376	0x6CE0	# <CJK>
-0x6377	0x6CD6	# <CJK>
-0x6378	0x6FFC	# <CJK>
-0x6379	0x6CEB	# <CJK>
-0x637A	0x6CEE	# <CJK>
-0x637B	0x6CB1	# <CJK>
-0x637C	0x6CD3	# <CJK>
-0x637D	0x6CEF	# <CJK>
-0x637E	0x6D87	# <CJK>
-0x6421	0x6D39	# <CJK>
-0x6422	0x6D27	# <CJK>
-0x6423	0x6D0C	# <CJK>
-0x6424	0x6D79	# <CJK>
-0x6425	0x6E5E	# <CJK>
-0x6426	0x6D07	# <CJK>
-0x6427	0x6D04	# <CJK>
-0x6428	0x6D19	# <CJK>
-0x6429	0x6D0E	# <CJK>
-0x642A	0x6D2B	# <CJK>
-0x642B	0x6FAE	# <CJK>
-0x642C	0x6D2E	# <CJK>
-0x642D	0x6D35	# <CJK>
-0x642E	0x6D1A	# <CJK>
-0x642F	0x700F	# <CJK>
-0x6430	0x6EF8	# <CJK>
-0x6431	0x6F6F	# <CJK>
-0x6432	0x6D33	# <CJK>
-0x6433	0x6D91	# <CJK>
-0x6434	0x6D6F	# <CJK>
-0x6435	0x6DF6	# <CJK>
-0x6436	0x6F7F	# <CJK>
-0x6437	0x6D5E	# <CJK>
-0x6438	0x6D93	# <CJK>
-0x6439	0x6D94	# <CJK>
-0x643A	0x6D5C	# <CJK>
-0x643B	0x6D60	# <CJK>
-0x643C	0x6D7C	# <CJK>
-0x643D	0x6D63	# <CJK>
-0x643E	0x6E1A	# <CJK>
-0x643F	0x6DC7	# <CJK>
-0x6440	0x6DC5	# <CJK>
-0x6441	0x6DDE	# <CJK>
-0x6442	0x7006	# <CJK>
-0x6443	0x6DBF	# <CJK>
-0x6444	0x6DE0	# <CJK>
-0x6445	0x6FA0	# <CJK>
-0x6446	0x6DE6	# <CJK>
-0x6447	0x6DDD	# <CJK>
-0x6448	0x6DD9	# <CJK>
-0x6449	0x700B	# <CJK>
-0x644A	0x6DAB	# <CJK>
-0x644B	0x6E0C	# <CJK>
-0x644C	0x6DAE	# <CJK>
-0x644D	0x6E2B	# <CJK>
-0x644E	0x6E6E	# <CJK>
-0x644F	0x6E4E	# <CJK>
-0x6450	0x6E6B	# <CJK>
-0x6451	0x6EB2	# <CJK>
-0x6452	0x6E5F	# <CJK>
-0x6453	0x6E86	# <CJK>
-0x6454	0x6E53	# <CJK>
-0x6455	0x6E54	# <CJK>
-0x6456	0x6E32	# <CJK>
-0x6457	0x6E25	# <CJK>
-0x6458	0x6E44	# <CJK>
-0x6459	0x7067	# <CJK>
-0x645A	0x6EB1	# <CJK>
-0x645B	0x6E98	# <CJK>
-0x645C	0x7044	# <CJK>
-0x645D	0x6F2D	# <CJK>
-0x645E	0x7005	# <CJK>
-0x645F	0x6EA5	# <CJK>
-0x6460	0x6EA7	# <CJK>
-0x6461	0x6EBD	# <CJK>
-0x6462	0x6EBB	# <CJK>
-0x6463	0x6EB7	# <CJK>
-0x6464	0x6F77	# <CJK>
-0x6465	0x6EB4	# <CJK>
-0x6466	0x6ECF	# <CJK>
-0x6467	0x6E8F	# <CJK>
-0x6468	0x6EC2	# <CJK>
-0x6469	0x6E9F	# <CJK>
-0x646A	0x6F62	# <CJK>
-0x646B	0x7020	# <CJK>
-0x646C	0x701F	# <CJK>
-0x646D	0x6F24	# <CJK>
-0x646E	0x6F15	# <CJK>
-0x646F	0x6EF9	# <CJK>
-0x6470	0x6F2F	# <CJK>
-0x6471	0x6F36	# <CJK>
-0x6472	0x7032	# <CJK>
-0x6473	0x6F74	# <CJK>
-0x6474	0x6F2A	# <CJK>
-0x6475	0x6F09	# <CJK>
-0x6476	0x6F29	# <CJK>
-0x6477	0x6F89	# <CJK>
-0x6478	0x6F8D	# <CJK>
-0x6479	0x6F8C	# <CJK>
-0x647A	0x6F78	# <CJK>
-0x647B	0x6F72	# <CJK>
-0x647C	0x6F7C	# <CJK>
-0x647D	0x6F7A	# <CJK>
-0x647E	0x7028	# <CJK>
-0x6521	0x6FC9	# <CJK>
-0x6522	0x6FA7	# <CJK>
-0x6523	0x6FB9	# <CJK>
-0x6524	0x6FB6	# <CJK>
-0x6525	0x6FC2	# <CJK>
-0x6526	0x6FE1	# <CJK>
-0x6527	0x6FEE	# <CJK>
-0x6528	0x6FDE	# <CJK>
-0x6529	0x6FE0	# <CJK>
-0x652A	0x6FEF	# <CJK>
-0x652B	0x701A	# <CJK>
-0x652C	0x7023	# <CJK>
-0x652D	0x701B	# <CJK>
-0x652E	0x7039	# <CJK>
-0x652F	0x7035	# <CJK>
-0x6530	0x705D	# <CJK>
-0x6531	0x705E	# <CJK>
-0x6532	0x5B80	# <CJK>
-0x6533	0x5B84	# <CJK>
-0x6534	0x5B95	# <CJK>
-0x6535	0x5B93	# <CJK>
-0x6536	0x5BA5	# <CJK>
-0x6537	0x5BB8	# <CJK>
-0x6538	0x752F	# <CJK>
-0x6539	0x9A2B	# <CJK>
-0x653A	0x6434	# <CJK>
-0x653B	0x5BE4	# <CJK>
-0x653C	0x5BEE	# <CJK>
-0x653D	0x8930	# <CJK>
-0x653E	0x5BF0	# <CJK>
-0x653F	0x8E47	# <CJK>
-0x6540	0x8B07	# <CJK>
-0x6541	0x8FB6	# <CJK>
-0x6542	0x8FD3	# <CJK>
-0x6543	0x8FD5	# <CJK>
-0x6544	0x8FE5	# <CJK>
-0x6545	0x8FEE	# <CJK>
-0x6546	0x8FE4	# <CJK>
-0x6547	0x9087	# <CJK>
-0x6548	0x8FE6	# <CJK>
-0x6549	0x9015	# <CJK>
-0x654A	0x8FE8	# <CJK>
-0x654B	0x9005	# <CJK>
-0x654C	0x9004	# <CJK>
-0x654D	0x900B	# <CJK>
-0x654E	0x9090	# <CJK>
-0x654F	0x9011	# <CJK>
-0x6550	0x900D	# <CJK>
-0x6551	0x9016	# <CJK>
-0x6552	0x9021	# <CJK>
-0x6553	0x9035	# <CJK>
-0x6554	0x9036	# <CJK>
-0x6555	0x902D	# <CJK>
-0x6556	0x902F	# <CJK>
-0x6557	0x9044	# <CJK>
-0x6558	0x9051	# <CJK>
-0x6559	0x9052	# <CJK>
-0x655A	0x9050	# <CJK>
-0x655B	0x9068	# <CJK>
-0x655C	0x9058	# <CJK>
-0x655D	0x9062	# <CJK>
-0x655E	0x905B	# <CJK>
-0x655F	0x66B9	# <CJK>
-0x6560	0x9074	# <CJK>
-0x6561	0x907D	# <CJK>
-0x6562	0x9082	# <CJK>
-0x6563	0x9088	# <CJK>
-0x6564	0x9083	# <CJK>
-0x6565	0x908B	# <CJK>
-0x6566	0x5F50	# <CJK>
-0x6567	0x5F57	# <CJK>
-0x6568	0x5F56	# <CJK>
-0x6569	0x5F58	# <CJK>
-0x656A	0x5C3B	# <CJK>
-0x656B	0x54AB	# <CJK>
-0x656C	0x5C50	# <CJK>
-0x656D	0x5C59	# <CJK>
-0x656E	0x5B71	# <CJK>
-0x656F	0x5C63	# <CJK>
-0x6570	0x5C68	# <CJK>
-0x6571	0x7FBC	# <CJK>
-0x6572	0x5F33	# <CJK>
-0x6573	0x5F29	# <CJK>
-0x6574	0x5F2D	# <CJK>
-0x6575	0x8274	# <CJK>
-0x6576	0x5F3C	# <CJK>
-0x6577	0x9B3B	# <CJK>
-0x6578	0x5C6E	# <CJK>
-0x6579	0x5981	# <CJK>
-0x657A	0x5983	# <CJK>
-0x657B	0x598D	# <CJK>
-0x657C	0x5AF5	# <CJK>
-0x657D	0x5AD7	# <CJK>
-0x657E	0x59A3	# <CJK>
-0x6621	0x5997	# <CJK>
-0x6622	0x59CA	# <CJK>
-0x6623	0x5B00	# <CJK>
-0x6624	0x599E	# <CJK>
-0x6625	0x59A4	# <CJK>
-0x6626	0x59D2	# <CJK>
-0x6627	0x59B2	# <CJK>
-0x6628	0x59AF	# <CJK>
-0x6629	0x59D7	# <CJK>
-0x662A	0x59BE	# <CJK>
-0x662B	0x5A6D	# <CJK>
-0x662C	0x5B08	# <CJK>
-0x662D	0x59DD	# <CJK>
-0x662E	0x5B4C	# <CJK>
-0x662F	0x59E3	# <CJK>
-0x6630	0x59D8	# <CJK>
-0x6631	0x59F9	# <CJK>
-0x6632	0x5A0C	# <CJK>
-0x6633	0x5A09	# <CJK>
-0x6634	0x5AA7	# <CJK>
-0x6635	0x5AFB	# <CJK>
-0x6636	0x5A11	# <CJK>
-0x6637	0x5A23	# <CJK>
-0x6638	0x5A13	# <CJK>
-0x6639	0x5A40	# <CJK>
-0x663A	0x5A67	# <CJK>
-0x663B	0x5A4A	# <CJK>
-0x663C	0x5A55	# <CJK>
-0x663D	0x5A3C	# <CJK>
-0x663E	0x5A62	# <CJK>
-0x663F	0x5B0B	# <CJK>
-0x6640	0x80EC	# <CJK>
-0x6641	0x5AAA	# <CJK>
-0x6642	0x5A9B	# <CJK>
-0x6643	0x5A77	# <CJK>
-0x6644	0x5A7A	# <CJK>
-0x6645	0x5ABE	# <CJK>
-0x6646	0x5AEB	# <CJK>
-0x6647	0x5AB2	# <CJK>
-0x6648	0x5B21	# <CJK>
-0x6649	0x5B2A	# <CJK>
-0x664A	0x5AB8	# <CJK>
-0x664B	0x5AE0	# <CJK>
-0x664C	0x5AE3	# <CJK>
-0x664D	0x5B19	# <CJK>
-0x664E	0x5AD6	# <CJK>
-0x664F	0x5AE6	# <CJK>
-0x6650	0x5AD8	# <CJK>
-0x6651	0x5ADC	# <CJK>
-0x6652	0x5B09	# <CJK>
-0x6653	0x5B17	# <CJK>
-0x6654	0x5B16	# <CJK>
-0x6655	0x5B32	# <CJK>
-0x6656	0x5B37	# <CJK>
-0x6657	0x5B40	# <CJK>
-0x6658	0x5C15	# <CJK>
-0x6659	0x5C1C	# <CJK>
-0x665A	0x5B5A	# <CJK>
-0x665B	0x5B65	# <CJK>
-0x665C	0x5B73	# <CJK>
-0x665D	0x5B51	# <CJK>
-0x665E	0x5B53	# <CJK>
-0x665F	0x5B62	# <CJK>
-0x6660	0x99D4	# <CJK>
-0x6661	0x99DF	# <CJK>
-0x6662	0x99D9	# <CJK>
-0x6663	0x9A36	# <CJK>
-0x6664	0x9A5B	# <CJK>
-0x6665	0x99D1	# <CJK>
-0x6666	0x99D8	# <CJK>
-0x6667	0x9A4D	# <CJK>
-0x6668	0x9A4A	# <CJK>
-0x6669	0x99E2	# <CJK>
-0x666A	0x9A6A	# <CJK>
-0x666B	0x9A0F	# <CJK>
-0x666C	0x9A0D	# <CJK>
-0x666D	0x9A05	# <CJK>
-0x666E	0x9A42	# <CJK>
-0x666F	0x9A2D	# <CJK>
-0x6670	0x9A16	# <CJK>
-0x6671	0x9A41	# <CJK>
-0x6672	0x9A2E	# <CJK>
-0x6673	0x9A38	# <CJK>
-0x6674	0x9A43	# <CJK>
-0x6675	0x9A44	# <CJK>
-0x6676	0x9A4F	# <CJK>
-0x6677	0x9A65	# <CJK>
-0x6678	0x9A64	# <CJK>
-0x6679	0x7CF9	# <CJK>
-0x667A	0x7D06	# <CJK>
-0x667B	0x7D02	# <CJK>
-0x667C	0x7D07	# <CJK>
-0x667D	0x7D08	# <CJK>
-0x667E	0x7E8A	# <CJK>
-0x6721	0x7D1C	# <CJK>
-0x6722	0x7D15	# <CJK>
-0x6723	0x7D13	# <CJK>
-0x6724	0x7D3A	# <CJK>
-0x6725	0x7D32	# <CJK>
-0x6726	0x7D31	# <CJK>
-0x6727	0x7E10	# <CJK>
-0x6728	0x7D3C	# <CJK>
-0x6729	0x7D40	# <CJK>
-0x672A	0x7D3F	# <CJK>
-0x672B	0x7D5D	# <CJK>
-0x672C	0x7D4E	# <CJK>
-0x672D	0x7D73	# <CJK>
-0x672E	0x7D86	# <CJK>
-0x672F	0x7D83	# <CJK>
-0x6730	0x7D88	# <CJK>
-0x6731	0x7DBE	# <CJK>
-0x6732	0x7DBA	# <CJK>
-0x6733	0x7DCB	# <CJK>
-0x6734	0x7DD4	# <CJK>
-0x6735	0x7DC4	# <CJK>
-0x6736	0x7D9E	# <CJK>
-0x6737	0x7DAC	# <CJK>
-0x6738	0x7DB9	# <CJK>
-0x6739	0x7DA3	# <CJK>
-0x673A	0x7DB0	# <CJK>
-0x673B	0x7DC7	# <CJK>
-0x673C	0x7DD9	# <CJK>
-0x673D	0x7DD7	# <CJK>
-0x673E	0x7DF9	# <CJK>
-0x673F	0x7DF2	# <CJK>
-0x6740	0x7E62	# <CJK>
-0x6741	0x7DE6	# <CJK>
-0x6742	0x7DF6	# <CJK>
-0x6743	0x7DF1	# <CJK>
-0x6744	0x7E0B	# <CJK>
-0x6745	0x7DE1	# <CJK>
-0x6746	0x7E09	# <CJK>
-0x6747	0x7E1D	# <CJK>
-0x6748	0x7E1F	# <CJK>
-0x6749	0x7E1E	# <CJK>
-0x674A	0x7E2D	# <CJK>
-0x674B	0x7E0A	# <CJK>
-0x674C	0x7E11	# <CJK>
-0x674D	0x7E7D	# <CJK>
-0x674E	0x7E39	# <CJK>
-0x674F	0x7E35	# <CJK>
-0x6750	0x7E32	# <CJK>
-0x6751	0x7E46	# <CJK>
-0x6752	0x7E45	# <CJK>
-0x6753	0x7E88	# <CJK>
-0x6754	0x7E5A	# <CJK>
-0x6755	0x7E52	# <CJK>
-0x6756	0x7E6E	# <CJK>
-0x6757	0x7E7E	# <CJK>
-0x6758	0x7E70	# <CJK>
-0x6759	0x7E6F	# <CJK>
-0x675A	0x7E98	# <CJK>
-0x675B	0x5E7A	# <CJK>
-0x675C	0x757F	# <CJK>
-0x675D	0x5DDB	# <CJK>
-0x675E	0x753E	# <CJK>
-0x675F	0x9095	# <CJK>
-0x6760	0x738E	# <CJK>
-0x6761	0x74A3	# <CJK>
-0x6762	0x744B	# <CJK>
-0x6763	0x73A2	# <CJK>
-0x6764	0x739F	# <CJK>
-0x6765	0x73CF	# <CJK>
-0x6766	0x73C2	# <CJK>
-0x6767	0x74CF	# <CJK>
-0x6768	0x73B7	# <CJK>
-0x6769	0x73B3	# <CJK>
-0x676A	0x73C0	# <CJK>
-0x676B	0x73C9	# <CJK>
-0x676C	0x73C8	# <CJK>
-0x676D	0x73E5	# <CJK>
-0x676E	0x73D9	# <CJK>
-0x676F	0x980A	# <CJK>
-0x6770	0x740A	# <CJK>
-0x6771	0x73E9	# <CJK>
-0x6772	0x73E7	# <CJK>
-0x6773	0x73DE	# <CJK>
-0x6774	0x74BD	# <CJK>
-0x6775	0x743F	# <CJK>
-0x6776	0x7489	# <CJK>
-0x6777	0x742A	# <CJK>
-0x6778	0x745B	# <CJK>
-0x6779	0x7426	# <CJK>
-0x677A	0x7425	# <CJK>
-0x677B	0x7428	# <CJK>
-0x677C	0x7430	# <CJK>
-0x677D	0x742E	# <CJK>
-0x677E	0x742C	# <CJK>
-0x6821	0x741B	# <CJK>
-0x6822	0x741A	# <CJK>
-0x6823	0x7441	# <CJK>
-0x6824	0x745C	# <CJK>
-0x6825	0x7457	# <CJK>
-0x6826	0x7455	# <CJK>
-0x6827	0x7459	# <CJK>
-0x6828	0x74A6	# <CJK>
-0x6829	0x746D	# <CJK>
-0x682A	0x747E	# <CJK>
-0x682B	0x749C	# <CJK>
-0x682C	0x74D4	# <CJK>
-0x682D	0x7480	# <CJK>
-0x682E	0x7481	# <CJK>
-0x682F	0x7487	# <CJK>
-0x6830	0x748B	# <CJK>
-0x6831	0x749E	# <CJK>
-0x6832	0x74A8	# <CJK>
-0x6833	0x74A9	# <CJK>
-0x6834	0x7490	# <CJK>
-0x6835	0x74A7	# <CJK>
-0x6836	0x74DA	# <CJK>
-0x6837	0x74BA	# <CJK>
-0x6838	0x97D9	# <CJK>
-0x6839	0x97DE	# <CJK>
-0x683A	0x97DC	# <CJK>
-0x683B	0x674C	# <CJK>
-0x683C	0x6753	# <CJK>
-0x683D	0x675E	# <CJK>
-0x683E	0x6748	# <CJK>
-0x683F	0x69AA	# <CJK>
-0x6840	0x6AEA	# <CJK>
-0x6841	0x6787	# <CJK>
-0x6842	0x676A	# <CJK>
-0x6843	0x6773	# <CJK>
-0x6844	0x6798	# <CJK>
-0x6845	0x6898	# <CJK>
-0x6846	0x6775	# <CJK>
-0x6847	0x68D6	# <CJK>
-0x6848	0x6A05	# <CJK>
-0x6849	0x689F	# <CJK>
-0x684A	0x678B	# <CJK>
-0x684B	0x6777	# <CJK>
-0x684C	0x677C	# <CJK>
-0x684D	0x67F0	# <CJK>
-0x684E	0x6ADB	# <CJK>
-0x684F	0x67D8	# <CJK>
-0x6850	0x6AF3	# <CJK>
-0x6851	0x67E9	# <CJK>
-0x6852	0x67B0	# <CJK>
-0x6853	0x6AE8	# <CJK>
-0x6854	0x67D9	# <CJK>
-0x6855	0x67B5	# <CJK>
-0x6856	0x67DA	# <CJK>
-0x6857	0x67B3	# <CJK>
-0x6858	0x67DD	# <CJK>
-0x6859	0x6800	# <CJK>
-0x685A	0x67C3	# <CJK>
-0x685B	0x67B8	# <CJK>
-0x685C	0x67E2	# <CJK>
-0x685D	0x6ADF	# <CJK>
-0x685E	0x67C1	# <CJK>
-0x685F	0x6A89	# <CJK>
-0x6860	0x6832	# <CJK>
-0x6861	0x6833	# <CJK>
-0x6862	0x690F	# <CJK>
-0x6863	0x6A48	# <CJK>
-0x6864	0x684E	# <CJK>
-0x6865	0x6968	# <CJK>
-0x6866	0x6844	# <CJK>
-0x6867	0x69BF	# <CJK>
-0x6868	0x6883	# <CJK>
-0x6869	0x681D	# <CJK>
-0x686A	0x6855	# <CJK>
-0x686B	0x6A3A	# <CJK>
-0x686C	0x6841	# <CJK>
-0x686D	0x6A9C	# <CJK>
-0x686E	0x6840	# <CJK>
-0x686F	0x6B12	# <CJK>
-0x6870	0x684A	# <CJK>
-0x6871	0x6849	# <CJK>
-0x6872	0x6829	# <CJK>
-0x6873	0x68B5	# <CJK>
-0x6874	0x688F	# <CJK>
-0x6875	0x6874	# <CJK>
-0x6876	0x6877	# <CJK>
-0x6877	0x6893	# <CJK>
-0x6878	0x686B	# <CJK>
-0x6879	0x6B1E	# <CJK>
-0x687A	0x696E	# <CJK>
-0x687B	0x68FC	# <CJK>
-0x687C	0x6ADD	# <CJK>
-0x687D	0x69E7	# <CJK>
-0x687E	0x68F9	# <CJK>
-0x6921	0x6B0F	# <CJK>
-0x6922	0x68F0	# <CJK>
-0x6923	0x690B	# <CJK>
-0x6924	0x6901	# <CJK>
-0x6925	0x6957	# <CJK>
-0x6926	0x68E3	# <CJK>
-0x6927	0x6910	# <CJK>
-0x6928	0x6971	# <CJK>
-0x6929	0x6939	# <CJK>
-0x692A	0x6960	# <CJK>
-0x692B	0x6942	# <CJK>
-0x692C	0x695D	# <CJK>
-0x692D	0x6B16	# <CJK>
-0x692E	0x696B	# <CJK>
-0x692F	0x6980	# <CJK>
-0x6930	0x6998	# <CJK>
-0x6931	0x6978	# <CJK>
-0x6932	0x6934	# <CJK>
-0x6933	0x69CC	# <CJK>
-0x6934	0x6AEC	# <CJK>
-0x6935	0x6ADA	# <CJK>
-0x6936	0x69CE	# <CJK>
-0x6937	0x6AF8	# <CJK>
-0x6938	0x6966	# <CJK>
-0x6939	0x6963	# <CJK>
-0x693A	0x6979	# <CJK>
-0x693B	0x699B	# <CJK>
-0x693C	0x69A7	# <CJK>
-0x693D	0x69BB	# <CJK>
-0x693E	0x69AB	# <CJK>
-0x693F	0x69AD	# <CJK>
-0x6940	0x69D4	# <CJK>
-0x6941	0x69B1	# <CJK>
-0x6942	0x69C1	# <CJK>
-0x6943	0x69CA	# <CJK>
-0x6944	0x6AB3	# <CJK>
-0x6945	0x6995	# <CJK>
-0x6946	0x6AE7	# <CJK>
-0x6947	0x698D	# <CJK>
-0x6948	0x69FF	# <CJK>
-0x6949	0x6AA3	# <CJK>
-0x694A	0x69ED	# <CJK>
-0x694B	0x6A17	# <CJK>
-0x694C	0x6A18	# <CJK>
-0x694D	0x6A65	# <CJK>
-0x694E	0x69F2	# <CJK>
-0x694F	0x6A44	# <CJK>
-0x6950	0x6A3E	# <CJK>
-0x6951	0x6AA0	# <CJK>
-0x6952	0x6A50	# <CJK>
-0x6953	0x6A5B	# <CJK>
-0x6954	0x6A35	# <CJK>
-0x6955	0x6A8E	# <CJK>
-0x6956	0x6AD3	# <CJK>
-0x6957	0x6A3D	# <CJK>
-0x6958	0x6A28	# <CJK>
-0x6959	0x6A58	# <CJK>
-0x695A	0x6ADE	# <CJK>
-0x695B	0x6A91	# <CJK>
-0x695C	0x6A90	# <CJK>
-0x695D	0x6AA9	# <CJK>
-0x695E	0x6A97	# <CJK>
-0x695F	0x6AAB	# <CJK>
-0x6960	0x7337	# <CJK>
-0x6961	0x7352	# <CJK>
-0x6962	0x6B81	# <CJK>
-0x6963	0x6B82	# <CJK>
-0x6964	0x6BA4	# <CJK>
-0x6965	0x6B84	# <CJK>
-0x6966	0x6B9E	# <CJK>
-0x6967	0x6BAE	# <CJK>
-0x6968	0x6B8D	# <CJK>
-0x6969	0x6BAB	# <CJK>
-0x696A	0x6B9B	# <CJK>
-0x696B	0x6BAF	# <CJK>
-0x696C	0x6BAA	# <CJK>
-0x696D	0x8ED4	# <CJK>
-0x696E	0x8EDB	# <CJK>
-0x696F	0x8EF2	# <CJK>
-0x6970	0x8EFB	# <CJK>
-0x6971	0x8F64	# <CJK>
-0x6972	0x8EF9	# <CJK>
-0x6973	0x8EFC	# <CJK>
-0x6974	0x8EEB	# <CJK>
-0x6975	0x8EE4	# <CJK>
-0x6976	0x8F62	# <CJK>
-0x6977	0x8EFA	# <CJK>
-0x6978	0x8EFE	# <CJK>
-0x6979	0x8F0A	# <CJK>
-0x697A	0x8F07	# <CJK>
-0x697B	0x8F05	# <CJK>
-0x697C	0x8F12	# <CJK>
-0x697D	0x8F26	# <CJK>
-0x697E	0x8F1E	# <CJK>
-0x6A21	0x8F1F	# <CJK>
-0x6A22	0x8F1C	# <CJK>
-0x6A23	0x8F33	# <CJK>
-0x6A24	0x8F46	# <CJK>
-0x6A25	0x8F54	# <CJK>
-0x6A26	0x8ECE	# <CJK>
-0x6A27	0x6214	# <CJK>
-0x6A28	0x6227	# <CJK>
-0x6A29	0x621B	# <CJK>
-0x6A2A	0x621F	# <CJK>
-0x6A2B	0x6222	# <CJK>
-0x6A2C	0x6221	# <CJK>
-0x6A2D	0x6225	# <CJK>
-0x6A2E	0x6224	# <CJK>
-0x6A2F	0x6229	# <CJK>
-0x6A30	0x81E7	# <CJK>
-0x6A31	0x750C	# <CJK>
-0x6A32	0x74F4	# <CJK>
-0x6A33	0x74FF	# <CJK>
-0x6A34	0x750F	# <CJK>
-0x6A35	0x7511	# <CJK>
-0x6A36	0x7513	# <CJK>
-0x6A37	0x6534	# <CJK>
-0x6A38	0x65EE	# <CJK>
-0x6A39	0x65EF	# <CJK>
-0x6A3A	0x65F0	# <CJK>
-0x6A3B	0x660A	# <CJK>
-0x6A3C	0x66C7	# <CJK>
-0x6A3D	0x6772	# <CJK>
-0x6A3E	0x6603	# <CJK>
-0x6A3F	0x6615	# <CJK>
-0x6A40	0x6600	# <CJK>
-0x6A41	0x7085	# <CJK>
-0x6A42	0x66F7	# <CJK>
-0x6A43	0x661D	# <CJK>
-0x6A44	0x6634	# <CJK>
-0x6A45	0x6631	# <CJK>
-0x6A46	0x6636	# <CJK>
-0x6A47	0x6635	# <CJK>
-0x6A48	0x8006	# <CJK>
-0x6A49	0x665F	# <CJK>
-0x6A4A	0x66C4	# <CJK>
-0x6A4B	0x6641	# <CJK>
-0x6A4C	0x664F	# <CJK>
-0x6A4D	0x6689	# <CJK>
-0x6A4E	0x6661	# <CJK>
-0x6A4F	0x6657	# <CJK>
-0x6A50	0x6677	# <CJK>
-0x6A51	0x6684	# <CJK>
-0x6A52	0x668C	# <CJK>
-0x6A53	0x66D6	# <CJK>
-0x6A54	0x669D	# <CJK>
-0x6A55	0x66BE	# <CJK>
-0x6A56	0x66DB	# <CJK>
-0x6A57	0x66DC	# <CJK>
-0x6A58	0x66E6	# <CJK>
-0x6A59	0x66E9	# <CJK>
-0x6A5A	0x8CC1	# <CJK>
-0x6A5B	0x8CB0	# <CJK>
-0x6A5C	0x8CBA	# <CJK>
-0x6A5D	0x8CBD	# <CJK>
-0x6A5E	0x8D04	# <CJK>
-0x6A5F	0x8CB2	# <CJK>
-0x6A60	0x8CC5	# <CJK>
-0x6A61	0x8D10	# <CJK>
-0x6A62	0x8CD1	# <CJK>
-0x6A63	0x8CDA	# <CJK>
-0x6A64	0x8CD5	# <CJK>
-0x6A65	0x8CEB	# <CJK>
-0x6A66	0x8CE7	# <CJK>
-0x6A67	0x8CFB	# <CJK>
-0x6A68	0x8998	# <CJK>
-0x6A69	0x89AC	# <CJK>
-0x6A6A	0x89A1	# <CJK>
-0x6A6B	0x89BF	# <CJK>
-0x6A6C	0x89A6	# <CJK>
-0x6A6D	0x89AF	# <CJK>
-0x6A6E	0x89B2	# <CJK>
-0x6A6F	0x89B7	# <CJK>
-0x6A70	0x726E	# <CJK>
-0x6A71	0x729F	# <CJK>
-0x6A72	0x725D	# <CJK>
-0x6A73	0x7266	# <CJK>
-0x6A74	0x726F	# <CJK>
-0x6A75	0x727E	# <CJK>
-0x6A76	0x727F	# <CJK>
-0x6A77	0x7284	# <CJK>
-0x6A78	0x728B	# <CJK>
-0x6A79	0x728D	# <CJK>
-0x6A7A	0x728F	# <CJK>
-0x6A7B	0x7292	# <CJK>
-0x6A7C	0x6308	# <CJK>
-0x6A7D	0x6332	# <CJK>
-0x6A7E	0x63B0	# <CJK>
-0x6B21	0x643F	# <CJK>
-0x6B22	0x64D8	# <CJK>
-0x6B23	0x8004	# <CJK>
-0x6B24	0x6BEA	# <CJK>
-0x6B25	0x6BF3	# <CJK>
-0x6B26	0x6BFD	# <CJK>
-0x6B27	0x6BFF	# <CJK>
-0x6B28	0x6BF9	# <CJK>
-0x6B29	0x6C05	# <CJK>
-0x6B2A	0x6C0C	# <CJK>
-0x6B2B	0x6C06	# <CJK>
-0x6B2C	0x6C0D	# <CJK>
-0x6B2D	0x6C15	# <CJK>
-0x6B2E	0x6C18	# <CJK>
-0x6B2F	0x6C19	# <CJK>
-0x6B30	0x6C1A	# <CJK>
-0x6B31	0x6C21	# <CJK>
-0x6B32	0x6C2C	# <CJK>
-0x6B33	0x6C24	# <CJK>
-0x6B34	0x6C2A	# <CJK>
-0x6B35	0x6C32	# <CJK>
-0x6B36	0x6535	# <CJK>
-0x6B37	0x6555	# <CJK>
-0x6B38	0x656B	# <CJK>
-0x6B39	0x7258	# <CJK>
-0x6B3A	0x7252	# <CJK>
-0x6B3B	0x7256	# <CJK>
-0x6B3C	0x7230	# <CJK>
-0x6B3D	0x8662	# <CJK>
-0x6B3E	0x5216	# <CJK>
-0x6B3F	0x809F	# <CJK>
-0x6B40	0x809C	# <CJK>
-0x6B41	0x8093	# <CJK>
-0x6B42	0x80BC	# <CJK>
-0x6B43	0x670A	# <CJK>
-0x6B44	0x80BD	# <CJK>
-0x6B45	0x80B1	# <CJK>
-0x6B46	0x80AB	# <CJK>
-0x6B47	0x80AD	# <CJK>
-0x6B48	0x80B4	# <CJK>
-0x6B49	0x80B7	# <CJK>
-0x6B4A	0x6727	# <CJK>
-0x6B4B	0x8156	# <CJK>
-0x6B4C	0x80E9	# <CJK>
-0x6B4D	0x81DA	# <CJK>
-0x6B4E	0x80DB	# <CJK>
-0x6B4F	0x80C2	# <CJK>
-0x6B50	0x80C4	# <CJK>
-0x6B51	0x80D9	# <CJK>
-0x6B52	0x80CD	# <CJK>
-0x6B53	0x80D7	# <CJK>
-0x6B54	0x6710	# <CJK>
-0x6B55	0x80DD	# <CJK>
-0x6B56	0x811B	# <CJK>
-0x6B57	0x80F1	# <CJK>
-0x6B58	0x80F4	# <CJK>
-0x6B59	0x80ED	# <CJK>
-0x6B5A	0x81BE	# <CJK>
-0x6B5B	0x810E	# <CJK>
-0x6B5C	0x80F2	# <CJK>
-0x6B5D	0x80FC	# <CJK>
-0x6B5E	0x6715	# <CJK>
-0x6B5F	0x8112	# <CJK>
-0x6B60	0x8C5A	# <CJK>
-0x6B61	0x8161	# <CJK>
-0x6B62	0x811E	# <CJK>
-0x6B63	0x812C	# <CJK>
-0x6B64	0x8118	# <CJK>
-0x6B65	0x8132	# <CJK>
-0x6B66	0x8148	# <CJK>
-0x6B67	0x814C	# <CJK>
-0x6B68	0x8153	# <CJK>
-0x6B69	0x8174	# <CJK>
-0x6B6A	0x8159	# <CJK>
-0x6B6B	0x815A	# <CJK>
-0x6B6C	0x8171	# <CJK>
-0x6B6D	0x8160	# <CJK>
-0x6B6E	0x8169	# <CJK>
-0x6B6F	0x817C	# <CJK>
-0x6B70	0x817D	# <CJK>
-0x6B71	0x816D	# <CJK>
-0x6B72	0x8167	# <CJK>
-0x6B73	0x584D	# <CJK>
-0x6B74	0x5AB5	# <CJK>
-0x6B75	0x8188	# <CJK>
-0x6B76	0x8182	# <CJK>
-0x6B77	0x81CF	# <CJK>
-0x6B78	0x6ED5	# <CJK>
-0x6B79	0x81A3	# <CJK>
-0x6B7A	0x81AA	# <CJK>
-0x6B7B	0x81CC	# <CJK>
-0x6B7C	0x6726	# <CJK>
-0x6B7D	0x81CA	# <CJK>
-0x6B7E	0x81BB	# <CJK>
-0x6C21	0x81C1	# <CJK>
-0x6C22	0x81A6	# <CJK>
-0x6C23	0x6B5F	# <CJK>
-0x6C24	0x6B37	# <CJK>
-0x6C25	0x6B39	# <CJK>
-0x6C26	0x6B43	# <CJK>
-0x6C27	0x6B46	# <CJK>
-0x6C28	0x6B59	# <CJK>
-0x6C29	0x98AE	# <CJK>
-0x6C2A	0x98AF	# <CJK>
-0x6C2B	0x98B6	# <CJK>
-0x6C2C	0x98BC	# <CJK>
-0x6C2D	0x98C6	# <CJK>
-0x6C2E	0x98C8	# <CJK>
-0x6C2F	0x6BB3	# <CJK>
-0x6C30	0x5F40	# <CJK>
-0x6C31	0x8F42	# <CJK>
-0x6C32	0x89F3	# <CJK>
-0x6C33	0x6590	# <CJK>
-0x6C34	0x9F4F	# <CJK>
-0x6C35	0x6595	# <CJK>
-0x6C36	0x65BC	# <CJK>
-0x6C37	0x65C6	# <CJK>
-0x6C38	0x65C4	# <CJK>
-0x6C39	0x65C3	# <CJK>
-0x6C3A	0x65CC	# <CJK>
-0x6C3B	0x65CE	# <CJK>
-0x6C3C	0x65D2	# <CJK>
-0x6C3D	0x65D6	# <CJK>
-0x6C3E	0x716C	# <CJK>
-0x6C3F	0x7152	# <CJK>
-0x6C40	0x7096	# <CJK>
-0x6C41	0x7197	# <CJK>
-0x6C42	0x70BB	# <CJK>
-0x6C43	0x70C0	# <CJK>
-0x6C44	0x70B7	# <CJK>
-0x6C45	0x70AB	# <CJK>
-0x6C46	0x70B1	# <CJK>
-0x6C47	0x71C1	# <CJK>
-0x6C48	0x70CA	# <CJK>
-0x6C49	0x7110	# <CJK>
-0x6C4A	0x7113	# <CJK>
-0x6C4B	0x71DC	# <CJK>
-0x6C4C	0x712F	# <CJK>
-0x6C4D	0x7131	# <CJK>
-0x6C4E	0x7173	# <CJK>
-0x6C4F	0x715C	# <CJK>
-0x6C50	0x7168	# <CJK>
-0x6C51	0x7145	# <CJK>
-0x6C52	0x7172	# <CJK>
-0x6C53	0x714A	# <CJK>
-0x6C54	0x7178	# <CJK>
-0x6C55	0x717A	# <CJK>
-0x6C56	0x7198	# <CJK>
-0x6C57	0x71B3	# <CJK>
-0x6C58	0x71B5	# <CJK>
-0x6C59	0x71A8	# <CJK>
-0x6C5A	0x71A0	# <CJK>
-0x6C5B	0x71E0	# <CJK>
-0x6C5C	0x71D4	# <CJK>
-0x6C5D	0x71E7	# <CJK>
-0x6C5E	0x71F9	# <CJK>
-0x6C5F	0x721D	# <CJK>
-0x6C60	0x7228	# <CJK>
-0x6C61	0x706C	# <CJK>
-0x6C62	0x71FE	# <CJK>
-0x6C63	0x7166	# <CJK>
-0x6C64	0x71B9	# <CJK>
-0x6C65	0x623E	# <CJK>
-0x6C66	0x623D	# <CJK>
-0x6C67	0x6243	# <CJK>
-0x6C68	0x6248	# <CJK>
-0x6C69	0x6249	# <CJK>
-0x6C6A	0x793B	# <CJK>
-0x6C6B	0x7940	# <CJK>
-0x6C6C	0x7946	# <CJK>
-0x6C6D	0x7949	# <CJK>
-0x6C6E	0x795B	# <CJK>
-0x6C6F	0x795C	# <CJK>
-0x6C70	0x7953	# <CJK>
-0x6C71	0x795A	# <CJK>
-0x6C72	0x79B0	# <CJK>
-0x6C73	0x7957	# <CJK>
-0x6C74	0x7960	# <CJK>
-0x6C75	0x798E	# <CJK>
-0x6C76	0x7967	# <CJK>
-0x6C77	0x797A	# <CJK>
-0x6C78	0x79AA	# <CJK>
-0x6C79	0x798A	# <CJK>
-0x6C7A	0x799A	# <CJK>
-0x6C7B	0x79A7	# <CJK>
-0x6C7C	0x79B3	# <CJK>
-0x6C7D	0x5FD1	# <CJK>
-0x6C7E	0x5FD0	# <CJK>
-0x6D21	0x61DF	# <CJK>
-0x6D22	0x605D	# <CJK>
-0x6D23	0x605A	# <CJK>
-0x6D24	0x6067	# <CJK>
-0x6D25	0x6041	# <CJK>
-0x6D26	0x6059	# <CJK>
-0x6D27	0x6063	# <CJK>
-0x6D28	0x6164	# <CJK>
-0x6D29	0x6106	# <CJK>
-0x6D2A	0x610D	# <CJK>
-0x6D2B	0x615D	# <CJK>
-0x6D2C	0x61A9	# <CJK>
-0x6D2D	0x619D	# <CJK>
-0x6D2E	0x61CB	# <CJK>
-0x6D2F	0x61E3	# <CJK>
-0x6D30	0x6207	# <CJK>
-0x6D31	0x8080	# <CJK>
-0x6D32	0x807F	# <CJK>
-0x6D33	0x6C93	# <CJK>
-0x6D34	0x6FA9	# <CJK>
-0x6D35	0x6DFC	# <CJK>
-0x6D36	0x78EF	# <CJK>
-0x6D37	0x77F8	# <CJK>
-0x6D38	0x78AD	# <CJK>
-0x6D39	0x7809	# <CJK>
-0x6D3A	0x7868	# <CJK>
-0x6D3B	0x7818	# <CJK>
-0x6D3C	0x7811	# <CJK>
-0x6D3D	0x65AB	# <CJK>
-0x6D3E	0x782D	# <CJK>
-0x6D3F	0x78B8	# <CJK>
-0x6D40	0x781D	# <CJK>
-0x6D41	0x7839	# <CJK>
-0x6D42	0x792A	# <CJK>
-0x6D43	0x7931	# <CJK>
-0x6D44	0x781F	# <CJK>
-0x6D45	0x783C	# <CJK>
-0x6D46	0x7825	# <CJK>
-0x6D47	0x782C	# <CJK>
-0x6D48	0x7823	# <CJK>
-0x6D49	0x7829	# <CJK>
-0x6D4A	0x784E	# <CJK>
-0x6D4B	0x786D	# <CJK>
-0x6D4C	0x7864	# <CJK>
-0x6D4D	0x78FD	# <CJK>
-0x6D4E	0x7826	# <CJK>
-0x6D4F	0x7850	# <CJK>
-0x6D50	0x7847	# <CJK>
-0x6D51	0x784C	# <CJK>
-0x6D52	0x786A	# <CJK>
-0x6D53	0x78E7	# <CJK>
-0x6D54	0x7893	# <CJK>
-0x6D55	0x789A	# <CJK>
-0x6D56	0x7887	# <CJK>
-0x6D57	0x78E3	# <CJK>
-0x6D58	0x78A1	# <CJK>
-0x6D59	0x78A3	# <CJK>
-0x6D5A	0x78B2	# <CJK>
-0x6D5B	0x78B9	# <CJK>
-0x6D5C	0x78A5	# <CJK>
-0x6D5D	0x78D4	# <CJK>
-0x6D5E	0x78D9	# <CJK>
-0x6D5F	0x78C9	# <CJK>
-0x6D60	0x78EC	# <CJK>
-0x6D61	0x78F2	# <CJK>
-0x6D62	0x7905	# <CJK>
-0x6D63	0x78F4	# <CJK>
-0x6D64	0x7913	# <CJK>
-0x6D65	0x7924	# <CJK>
-0x6D66	0x791E	# <CJK>
-0x6D67	0x7934	# <CJK>
-0x6D68	0x9F95	# <CJK>
-0x6D69	0x9EF9	# <CJK>
-0x6D6A	0x9EFB	# <CJK>
-0x6D6B	0x9EFC	# <CJK>
-0x6D6C	0x76F1	# <CJK>
-0x6D6D	0x7704	# <CJK>
-0x6D6E	0x7798	# <CJK>
-0x6D6F	0x76F9	# <CJK>
-0x6D70	0x7707	# <CJK>
-0x6D71	0x7708	# <CJK>
-0x6D72	0x771A	# <CJK>
-0x6D73	0x7722	# <CJK>
-0x6D74	0x7719	# <CJK>
-0x6D75	0x772D	# <CJK>
-0x6D76	0x7726	# <CJK>
-0x6D77	0x7735	# <CJK>
-0x6D78	0x7738	# <CJK>
-0x6D79	0x775E	# <CJK>
-0x6D7A	0x77BC	# <CJK>
-0x6D7B	0x7747	# <CJK>
-0x6D7C	0x7743	# <CJK>
-0x6D7D	0x775A	# <CJK>
-0x6D7E	0x7768	# <CJK>
-0x6E21	0x7762	# <CJK>
-0x6E22	0x7765	# <CJK>
-0x6E23	0x777F	# <CJK>
-0x6E24	0x778D	# <CJK>
-0x6E25	0x777D	# <CJK>
-0x6E26	0x7780	# <CJK>
-0x6E27	0x778C	# <CJK>
-0x6E28	0x7791	# <CJK>
-0x6E29	0x779F	# <CJK>
-0x6E2A	0x77A0	# <CJK>
-0x6E2B	0x77B0	# <CJK>
-0x6E2C	0x77B5	# <CJK>
-0x6E2D	0x77BD	# <CJK>
-0x6E2E	0x753A	# <CJK>
-0x6E2F	0x7540	# <CJK>
-0x6E30	0x754E	# <CJK>
-0x6E31	0x754B	# <CJK>
-0x6E32	0x7548	# <CJK>
-0x6E33	0x755B	# <CJK>
-0x6E34	0x7572	# <CJK>
-0x6E35	0x7579	# <CJK>
-0x6E36	0x7583	# <CJK>
-0x6E37	0x7F58	# <CJK>
-0x6E38	0x7F61	# <CJK>
-0x6E39	0x7F5F	# <CJK>
-0x6E3A	0x8A48	# <CJK>
-0x6E3B	0x7F68	# <CJK>
-0x6E3C	0x7F86	# <CJK>
-0x6E3D	0x7F71	# <CJK>
-0x6E3E	0x7F79	# <CJK>
-0x6E3F	0x7F88	# <CJK>
-0x6E40	0x7F7E	# <CJK>
-0x6E41	0x76CD	# <CJK>
-0x6E42	0x76E5	# <CJK>
-0x6E43	0x8832	# <CJK>
-0x6E44	0x91D2	# <CJK>
-0x6E45	0x91D3	# <CJK>
-0x6E46	0x91D4	# <CJK>
-0x6E47	0x91D9	# <CJK>
-0x6E48	0x91D7	# <CJK>
-0x6E49	0x91D5	# <CJK>
-0x6E4A	0x91F7	# <CJK>
-0x6E4B	0x91E7	# <CJK>
-0x6E4C	0x91E4	# <CJK>
-0x6E4D	0x9346	# <CJK>
-0x6E4E	0x91F5	# <CJK>
-0x6E4F	0x91F9	# <CJK>
-0x6E50	0x9208	# <CJK>
-0x6E51	0x9226	# <CJK>
-0x6E52	0x9245	# <CJK>
-0x6E53	0x9211	# <CJK>
-0x6E54	0x9210	# <CJK>
-0x6E55	0x9201	# <CJK>
-0x6E56	0x9227	# <CJK>
-0x6E57	0x9204	# <CJK>
-0x6E58	0x9225	# <CJK>
-0x6E59	0x9200	# <CJK>
-0x6E5A	0x923A	# <CJK>
-0x6E5B	0x9266	# <CJK>
-0x6E5C	0x9237	# <CJK>
-0x6E5D	0x9233	# <CJK>
-0x6E5E	0x9255	# <CJK>
-0x6E5F	0x923D	# <CJK>
-0x6E60	0x9238	# <CJK>
-0x6E61	0x925E	# <CJK>
-0x6E62	0x926C	# <CJK>
-0x6E63	0x926D	# <CJK>
-0x6E64	0x923F	# <CJK>
-0x6E65	0x9460	# <CJK>
-0x6E66	0x9230	# <CJK>
-0x6E67	0x9249	# <CJK>
-0x6E68	0x9248	# <CJK>
-0x6E69	0x924D	# <CJK>
-0x6E6A	0x922E	# <CJK>
-0x6E6B	0x9239	# <CJK>
-0x6E6C	0x9438	# <CJK>
-0x6E6D	0x92AC	# <CJK>
-0x6E6E	0x92A0	# <CJK>
-0x6E6F	0x927A	# <CJK>
-0x6E70	0x92AA	# <CJK>
-0x6E71	0x92EE	# <CJK>
-0x6E72	0x92CF	# <CJK>
-0x6E73	0x9403	# <CJK>
-0x6E74	0x92E3	# <CJK>
-0x6E75	0x943A	# <CJK>
-0x6E76	0x92B1	# <CJK>
-0x6E77	0x92A6	# <CJK>
-0x6E78	0x93A7	# <CJK>
-0x6E79	0x9296	# <CJK>
-0x6E7A	0x92CC	# <CJK>
-0x6E7B	0x92A9	# <CJK>
-0x6E7C	0x93F5	# <CJK>
-0x6E7D	0x9293	# <CJK>
-0x6E7E	0x927F	# <CJK>
-0x6F21	0x93A9	# <CJK>
-0x6F22	0x929A	# <CJK>
-0x6F23	0x931A	# <CJK>
-0x6F24	0x92AB	# <CJK>
-0x6F25	0x9283	# <CJK>
-0x6F26	0x940B	# <CJK>
-0x6F27	0x92A8	# <CJK>
-0x6F28	0x92A3	# <CJK>
-0x6F29	0x9412	# <CJK>
-0x6F2A	0x9338	# <CJK>
-0x6F2B	0x92F1	# <CJK>
-0x6F2C	0x93D7	# <CJK>
-0x6F2D	0x92E5	# <CJK>
-0x6F2E	0x92F0	# <CJK>
-0x6F2F	0x92EF	# <CJK>
-0x6F30	0x92E8	# <CJK>
-0x6F31	0x92BC	# <CJK>
-0x6F32	0x92DD	# <CJK>
-0x6F33	0x92F6	# <CJK>
-0x6F34	0x9426	# <CJK>
-0x6F35	0x9427	# <CJK>
-0x6F36	0x92C3	# <CJK>
-0x6F37	0x92DF	# <CJK>
-0x6F38	0x92E6	# <CJK>
-0x6F39	0x9312	# <CJK>
-0x6F3A	0x9306	# <CJK>
-0x6F3B	0x9369	# <CJK>
-0x6F3C	0x931B	# <CJK>
-0x6F3D	0x9340	# <CJK>
-0x6F3E	0x9301	# <CJK>
-0x6F3F	0x9315	# <CJK>
-0x6F40	0x932E	# <CJK>
-0x6F41	0x9343	# <CJK>
-0x6F42	0x9307	# <CJK>
-0x6F43	0x9308	# <CJK>
-0x6F44	0x931F	# <CJK>
-0x6F45	0x9319	# <CJK>
-0x6F46	0x9365	# <CJK>
-0x6F47	0x9347	# <CJK>
-0x6F48	0x9376	# <CJK>
-0x6F49	0x9354	# <CJK>
-0x6F4A	0x9364	# <CJK>
-0x6F4B	0x93AA	# <CJK>
-0x6F4C	0x9370	# <CJK>
-0x6F4D	0x9384	# <CJK>
-0x6F4E	0x93E4	# <CJK>
-0x6F4F	0x93D8	# <CJK>
-0x6F50	0x9428	# <CJK>
-0x6F51	0x9387	# <CJK>
-0x6F52	0x93CC	# <CJK>
-0x6F53	0x9398	# <CJK>
-0x6F54	0x93B8	# <CJK>
-0x6F55	0x93BF	# <CJK>
-0x6F56	0x93A6	# <CJK>
-0x6F57	0x93B0	# <CJK>
-0x6F58	0x93B5	# <CJK>
-0x6F59	0x944C	# <CJK>
-0x6F5A	0x93E2	# <CJK>
-0x6F5B	0x93DC	# <CJK>
-0x6F5C	0x93DD	# <CJK>
-0x6F5D	0x93CD	# <CJK>
-0x6F5E	0x93DE	# <CJK>
-0x6F5F	0x93C3	# <CJK>
-0x6F60	0x93C7	# <CJK>
-0x6F61	0x93D1	# <CJK>
-0x6F62	0x9414	# <CJK>
-0x6F63	0x941D	# <CJK>
-0x6F64	0x93F7	# <CJK>
-0x6F65	0x9465	# <CJK>
-0x6F66	0x9413	# <CJK>
-0x6F67	0x946D	# <CJK>
-0x6F68	0x9420	# <CJK>
-0x6F69	0x9479	# <CJK>
-0x6F6A	0x93F9	# <CJK>
-0x6F6B	0x9419	# <CJK>
-0x6F6C	0x944A	# <CJK>
-0x6F6D	0x9432	# <CJK>
-0x6F6E	0x943F	# <CJK>
-0x6F6F	0x9454	# <CJK>
-0x6F70	0x9463	# <CJK>
-0x6F71	0x937E	# <CJK>
-0x6F72	0x77E7	# <CJK>
-0x6F73	0x77EC	# <CJK>
-0x6F74	0x96C9	# <CJK>
-0x6F75	0x79D5	# <CJK>
-0x6F76	0x79ED	# <CJK>
-0x6F77	0x79E3	# <CJK>
-0x6F78	0x79EB	# <CJK>
-0x6F79	0x7A06	# <CJK>
-0x6F7A	0x5D47	# <CJK>
-0x6F7B	0x7A03	# <CJK>
-0x6F7C	0x7A02	# <CJK>
-0x6F7D	0x7A1E	# <CJK>
-0x6F7E	0x7A14	# <CJK>
-0x7021	0x7A39	# <CJK>
-0x7022	0x7A37	# <CJK>
-0x7023	0x7A61	# <CJK>
-0x7024	0x9ECF	# <CJK>
-0x7025	0x99A5	# <CJK>
-0x7026	0x7A70	# <CJK>
-0x7027	0x7688	# <CJK>
-0x7028	0x768E	# <CJK>
-0x7029	0x7693	# <CJK>
-0x702A	0x7699	# <CJK>
-0x702B	0x76A4	# <CJK>
-0x702C	0x74DE	# <CJK>
-0x702D	0x74E0	# <CJK>
-0x702E	0x752C	# <CJK>
-0x702F	0x9CE9	# <CJK>
-0x7030	0x9CF6	# <CJK>
-0x7031	0x9D07	# <CJK>
-0x7032	0x9D06	# <CJK>
-0x7033	0x9D23	# <CJK>
-0x7034	0x9D87	# <CJK>
-0x7035	0x9E15	# <CJK>
-0x7036	0x9D1D	# <CJK>
-0x7037	0x9D1F	# <CJK>
-0x7038	0x9DE5	# <CJK>
-0x7039	0x9D2F	# <CJK>
-0x703A	0x9DD9	# <CJK>
-0x703B	0x9D30	# <CJK>
-0x703C	0x9D42	# <CJK>
-0x703D	0x9E1E	# <CJK>
-0x703E	0x9D53	# <CJK>
-0x703F	0x9E1D	# <CJK>
-0x7040	0x9D60	# <CJK>
-0x7041	0x9D52	# <CJK>
-0x7042	0x9DF3	# <CJK>
-0x7043	0x9D5C	# <CJK>
-0x7044	0x9D61	# <CJK>
-0x7045	0x9D93	# <CJK>
-0x7046	0x9D6A	# <CJK>
-0x7047	0x9D6F	# <CJK>
-0x7048	0x9D89	# <CJK>
-0x7049	0x9D98	# <CJK>
-0x704A	0x9D9A	# <CJK>
-0x704B	0x9DC0	# <CJK>
-0x704C	0x9DA5	# <CJK>
-0x704D	0x9DA9	# <CJK>
-0x704E	0x9DC2	# <CJK>
-0x704F	0x9DBC	# <CJK>
-0x7050	0x9E1A	# <CJK>
-0x7051	0x9DD3	# <CJK>
-0x7052	0x9DDA	# <CJK>
-0x7053	0x9DEF	# <CJK>
-0x7054	0x9DE6	# <CJK>
-0x7055	0x9DF2	# <CJK>
-0x7056	0x9DF8	# <CJK>
-0x7057	0x9E0C	# <CJK>
-0x7058	0x9DFA	# <CJK>
-0x7059	0x9E1B	# <CJK>
-0x705A	0x7592	# <CJK>
-0x705B	0x7594	# <CJK>
-0x705C	0x7664	# <CJK>
-0x705D	0x7658	# <CJK>
-0x705E	0x759D	# <CJK>
-0x705F	0x7667	# <CJK>
-0x7060	0x75A3	# <CJK>
-0x7061	0x75B3	# <CJK>
-0x7062	0x75B4	# <CJK>
-0x7063	0x75B8	# <CJK>
-0x7064	0x75C4	# <CJK>
-0x7065	0x75B1	# <CJK>
-0x7066	0x75B0	# <CJK>
-0x7067	0x75C3	# <CJK>
-0x7068	0x75C2	# <CJK>
-0x7069	0x7602	# <CJK>
-0x706A	0x75CD	# <CJK>
-0x706B	0x75E3	# <CJK>
-0x706C	0x7646	# <CJK>
-0x706D	0x75E6	# <CJK>
-0x706E	0x75E4	# <CJK>
-0x706F	0x7647	# <CJK>
-0x7070	0x75E7	# <CJK>
-0x7071	0x7603	# <CJK>
-0x7072	0x75F1	# <CJK>
-0x7073	0x75FC	# <CJK>
-0x7074	0x75FF	# <CJK>
-0x7075	0x7610	# <CJK>
-0x7076	0x7600	# <CJK>
-0x7077	0x7649	# <CJK>
-0x7078	0x760C	# <CJK>
-0x7079	0x761E	# <CJK>
-0x707A	0x760A	# <CJK>
-0x707B	0x7625	# <CJK>
-0x707C	0x763B	# <CJK>
-0x707D	0x7615	# <CJK>
-0x707E	0x7619	# <CJK>
-0x7121	0x761B	# <CJK>
-0x7122	0x763C	# <CJK>
-0x7123	0x7622	# <CJK>
-0x7124	0x7620	# <CJK>
-0x7125	0x7640	# <CJK>
-0x7126	0x762D	# <CJK>
-0x7127	0x7630	# <CJK>
-0x7128	0x766D	# <CJK>
-0x7129	0x7635	# <CJK>
-0x712A	0x7643	# <CJK>
-0x712B	0x766E	# <CJK>
-0x712C	0x7633	# <CJK>
-0x712D	0x764D	# <CJK>
-0x712E	0x7669	# <CJK>
-0x712F	0x7654	# <CJK>
-0x7130	0x765C	# <CJK>
-0x7131	0x7656	# <CJK>
-0x7132	0x7672	# <CJK>
-0x7133	0x766F	# <CJK>
-0x7134	0x7FCA	# <CJK>
-0x7135	0x7AE6	# <CJK>
-0x7136	0x7A78	# <CJK>
-0x7137	0x7A79	# <CJK>
-0x7138	0x7A80	# <CJK>
-0x7139	0x7A86	# <CJK>
-0x713A	0x7A88	# <CJK>
-0x713B	0x7A95	# <CJK>
-0x713C	0x7AC7	# <CJK>
-0x713D	0x7AA0	# <CJK>
-0x713E	0x7AAC	# <CJK>
-0x713F	0x7AA8	# <CJK>
-0x7140	0x7AB6	# <CJK>
-0x7141	0x7AB3	# <CJK>
-0x7142	0x8864	# <CJK>
-0x7143	0x8869	# <CJK>
-0x7144	0x8872	# <CJK>
-0x7145	0x887D	# <CJK>
-0x7146	0x887F	# <CJK>
-0x7147	0x8882	# <CJK>
-0x7148	0x88A2	# <CJK>
-0x7149	0x8960	# <CJK>
-0x714A	0x88B7	# <CJK>
-0x714B	0x88BC	# <CJK>
-0x714C	0x88C9	# <CJK>
-0x714D	0x8933	# <CJK>
-0x714E	0x88CE	# <CJK>
-0x714F	0x895D	# <CJK>
-0x7150	0x8947	# <CJK>
-0x7151	0x88F1	# <CJK>
-0x7152	0x891A	# <CJK>
-0x7153	0x88FC	# <CJK>
-0x7154	0x88E8	# <CJK>
-0x7155	0x88FE	# <CJK>
-0x7156	0x88F0	# <CJK>
-0x7157	0x8921	# <CJK>
-0x7158	0x8919	# <CJK>
-0x7159	0x8913	# <CJK>
-0x715A	0x8938	# <CJK>
-0x715B	0x890A	# <CJK>
-0x715C	0x8964	# <CJK>
-0x715D	0x892B	# <CJK>
-0x715E	0x8936	# <CJK>
-0x715F	0x8941	# <CJK>
-0x7160	0x8966	# <CJK>
-0x7161	0x897B	# <CJK>
-0x7162	0x758B	# <CJK>
-0x7163	0x80E5	# <CJK>
-0x7164	0x76B8	# <CJK>
-0x7165	0x76B4	# <CJK>
-0x7166	0x77DC	# <CJK>
-0x7167	0x8012	# <CJK>
-0x7168	0x8014	# <CJK>
-0x7169	0x8016	# <CJK>
-0x716A	0x801C	# <CJK>
-0x716B	0x8020	# <CJK>
-0x716C	0x802E	# <CJK>
-0x716D	0x8025	# <CJK>
-0x716E	0x8026	# <CJK>
-0x716F	0x802C	# <CJK>
-0x7170	0x8029	# <CJK>
-0x7171	0x8028	# <CJK>
-0x7172	0x8031	# <CJK>
-0x7173	0x800B	# <CJK>
-0x7174	0x8035	# <CJK>
-0x7175	0x8043	# <CJK>
-0x7176	0x8046	# <CJK>
-0x7177	0x8079	# <CJK>
-0x7178	0x8052	# <CJK>
-0x7179	0x8075	# <CJK>
-0x717A	0x8071	# <CJK>
-0x717B	0x8983	# <CJK>
-0x717C	0x9807	# <CJK>
-0x717D	0x980E	# <CJK>
-0x717E	0x980F	# <CJK>
-0x7221	0x9821	# <CJK>
-0x7222	0x981C	# <CJK>
-0x7223	0x6F41	# <CJK>
-0x7224	0x9826	# <CJK>
-0x7225	0x9837	# <CJK>
-0x7226	0x984E	# <CJK>
-0x7227	0x9853	# <CJK>
-0x7228	0x9873	# <CJK>
-0x7229	0x9862	# <CJK>
-0x722A	0x9859	# <CJK>
-0x722B	0x9865	# <CJK>
-0x722C	0x986C	# <CJK>
-0x722D	0x9870	# <CJK>
-0x722E	0x864D	# <CJK>
-0x722F	0x8654	# <CJK>
-0x7230	0x866C	# <CJK>
-0x7231	0x87E3	# <CJK>
-0x7232	0x8806	# <CJK>
-0x7233	0x867A	# <CJK>
-0x7234	0x867C	# <CJK>
-0x7235	0x867B	# <CJK>
-0x7236	0x86A8	# <CJK>
-0x7237	0x868D	# <CJK>
-0x7238	0x868B	# <CJK>
-0x7239	0x8706	# <CJK>
-0x723A	0x869D	# <CJK>
-0x723B	0x86A7	# <CJK>
-0x723C	0x86A3	# <CJK>
-0x723D	0x86AA	# <CJK>
-0x723E	0x8693	# <CJK>
-0x723F	0x86A9	# <CJK>
-0x7240	0x86B6	# <CJK>
-0x7241	0x86C4	# <CJK>
-0x7242	0x86B5	# <CJK>
-0x7243	0x8823	# <CJK>
-0x7244	0x86B0	# <CJK>
-0x7245	0x86BA	# <CJK>
-0x7246	0x86B1	# <CJK>
-0x7247	0x86AF	# <CJK>
-0x7248	0x86C9	# <CJK>
-0x7249	0x87F6	# <CJK>
-0x724A	0x86B4	# <CJK>
-0x724B	0x86E9	# <CJK>
-0x724C	0x86FA	# <CJK>
-0x724D	0x87EF	# <CJK>
-0x724E	0x86ED	# <CJK>
-0x724F	0x8784	# <CJK>
-0x7250	0x86D0	# <CJK>
-0x7251	0x8713	# <CJK>
-0x7252	0x86DE	# <CJK>
-0x7253	0x8810	# <CJK>
-0x7254	0x86DF	# <CJK>
-0x7255	0x86D8	# <CJK>
-0x7256	0x86D1	# <CJK>
-0x7257	0x8703	# <CJK>
-0x7258	0x8707	# <CJK>
-0x7259	0x86F8	# <CJK>
-0x725A	0x8708	# <CJK>
-0x725B	0x870A	# <CJK>
-0x725C	0x870D	# <CJK>
-0x725D	0x8709	# <CJK>
-0x725E	0x8723	# <CJK>
-0x725F	0x873B	# <CJK>
-0x7260	0x871E	# <CJK>
-0x7261	0x8725	# <CJK>
-0x7262	0x872E	# <CJK>
-0x7263	0x871A	# <CJK>
-0x7264	0x873E	# <CJK>
-0x7265	0x87C8	# <CJK>
-0x7266	0x8734	# <CJK>
-0x7267	0x8731	# <CJK>
-0x7268	0x8729	# <CJK>
-0x7269	0x8737	# <CJK>
-0x726A	0x873F	# <CJK>
-0x726B	0x8782	# <CJK>
-0x726C	0x8722	# <CJK>
-0x726D	0x877D	# <CJK>
-0x726E	0x8811	# <CJK>
-0x726F	0x877B	# <CJK>
-0x7270	0x8760	# <CJK>
-0x7271	0x8770	# <CJK>
-0x7272	0x874C	# <CJK>
-0x7273	0x876E	# <CJK>
-0x7274	0x878B	# <CJK>
-0x7275	0x8753	# <CJK>
-0x7276	0x8763	# <CJK>
-0x7277	0x87BB	# <CJK>
-0x7278	0x8764	# <CJK>
-0x7279	0x8759	# <CJK>
-0x727A	0x8765	# <CJK>
-0x727B	0x8793	# <CJK>
-0x727C	0x87AF	# <CJK>
-0x727D	0x87CE	# <CJK>
-0x727E	0x87D2	# <CJK>
-0x7321	0x87C6	# <CJK>
-0x7322	0x8788	# <CJK>
-0x7323	0x8785	# <CJK>
-0x7324	0x87AD	# <CJK>
-0x7325	0x8797	# <CJK>
-0x7326	0x8783	# <CJK>
-0x7327	0x87AB	# <CJK>
-0x7328	0x87E5	# <CJK>
-0x7329	0x87AC	# <CJK>
-0x732A	0x87B5	# <CJK>
-0x732B	0x87B3	# <CJK>
-0x732C	0x87CB	# <CJK>
-0x732D	0x87D3	# <CJK>
-0x732E	0x87BD	# <CJK>
-0x732F	0x87D1	# <CJK>
-0x7330	0x87C0	# <CJK>
-0x7331	0x87CA	# <CJK>
-0x7332	0x87DB	# <CJK>
-0x7333	0x87EA	# <CJK>
-0x7334	0x87E0	# <CJK>
-0x7335	0x87EE	# <CJK>
-0x7336	0x8816	# <CJK>
-0x7337	0x8813	# <CJK>
-0x7338	0x87FE	# <CJK>
-0x7339	0x880A	# <CJK>
-0x733A	0x881B	# <CJK>
-0x733B	0x8821	# <CJK>
-0x733C	0x8839	# <CJK>
-0x733D	0x883C	# <CJK>
-0x733E	0x7F36	# <CJK>
-0x733F	0x7F4C	# <CJK>
-0x7340	0x7F44	# <CJK>
-0x7341	0x7F45	# <CJK>
-0x7342	0x8210	# <CJK>
-0x7343	0x7AFA	# <CJK>
-0x7344	0x7AFD	# <CJK>
-0x7345	0x7B08	# <CJK>
-0x7346	0x7BE4	# <CJK>
-0x7347	0x7B04	# <CJK>
-0x7348	0x7B67	# <CJK>
-0x7349	0x7B0A	# <CJK>
-0x734A	0x7B2B	# <CJK>
-0x734B	0x7B0F	# <CJK>
-0x734C	0x7B47	# <CJK>
-0x734D	0x7B38	# <CJK>
-0x734E	0x7B2A	# <CJK>
-0x734F	0x7B19	# <CJK>
-0x7350	0x7B2E	# <CJK>
-0x7351	0x7B31	# <CJK>
-0x7352	0x7B20	# <CJK>
-0x7353	0x7B25	# <CJK>
-0x7354	0x7B24	# <CJK>
-0x7355	0x7B33	# <CJK>
-0x7356	0x7C69	# <CJK>
-0x7357	0x7B1E	# <CJK>
-0x7358	0x7B58	# <CJK>
-0x7359	0x7BF3	# <CJK>
-0x735A	0x7B45	# <CJK>
-0x735B	0x7B75	# <CJK>
-0x735C	0x7B4C	# <CJK>
-0x735D	0x7B8F	# <CJK>
-0x735E	0x7B60	# <CJK>
-0x735F	0x7B6E	# <CJK>
-0x7360	0x7B7B	# <CJK>
-0x7361	0x7B62	# <CJK>
-0x7362	0x7B72	# <CJK>
-0x7363	0x7B71	# <CJK>
-0x7364	0x7B90	# <CJK>
-0x7365	0x7C00	# <CJK>
-0x7366	0x7BCB	# <CJK>
-0x7367	0x7BB8	# <CJK>
-0x7368	0x7BAC	# <CJK>
-0x7369	0x7B9D	# <CJK>
-0x736A	0x7C5C	# <CJK>
-0x736B	0x7B85	# <CJK>
-0x736C	0x7C1E	# <CJK>
-0x736D	0x7B9C	# <CJK>
-0x736E	0x7BA2	# <CJK>
-0x736F	0x7C2B	# <CJK>
-0x7370	0x7BB4	# <CJK>
-0x7371	0x7C23	# <CJK>
-0x7372	0x7BC1	# <CJK>
-0x7373	0x7BCC	# <CJK>
-0x7374	0x7BDD	# <CJK>
-0x7375	0x7BDA	# <CJK>
-0x7376	0x7BE5	# <CJK>
-0x7377	0x7BE6	# <CJK>
-0x7378	0x7BEA	# <CJK>
-0x7379	0x7C0C	# <CJK>
-0x737A	0x7BFE	# <CJK>
-0x737B	0x7BFC	# <CJK>
-0x737C	0x7C0F	# <CJK>
-0x737D	0x7C6A	# <CJK>
-0x737E	0x7C0B	# <CJK>
-0x7421	0x7C1F	# <CJK>
-0x7422	0x7C2A	# <CJK>
-0x7423	0x7C26	# <CJK>
-0x7424	0x7C38	# <CJK>
-0x7425	0x7C5F	# <CJK>
-0x7426	0x7C40	# <CJK>
-0x7427	0x81FE	# <CJK>
-0x7428	0x8201	# <CJK>
-0x7429	0x8202	# <CJK>
-0x742A	0x8204	# <CJK>
-0x742B	0x81EC	# <CJK>
-0x742C	0x8844	# <CJK>
-0x742D	0x8221	# <CJK>
-0x742E	0x8222	# <CJK>
-0x742F	0x8264	# <CJK>
-0x7430	0x822D	# <CJK>
-0x7431	0x822F	# <CJK>
-0x7432	0x8228	# <CJK>
-0x7433	0x822B	# <CJK>
-0x7434	0x8238	# <CJK>
-0x7435	0x826B	# <CJK>
-0x7436	0x8233	# <CJK>
-0x7437	0x8234	# <CJK>
-0x7438	0x823E	# <CJK>
-0x7439	0x8244	# <CJK>
-0x743A	0x8249	# <CJK>
-0x743B	0x824B	# <CJK>
-0x743C	0x824F	# <CJK>
-0x743D	0x825A	# <CJK>
-0x743E	0x825F	# <CJK>
-0x743F	0x8268	# <CJK>
-0x7440	0x887E	# <CJK>
-0x7441	0x88CA	# <CJK>
-0x7442	0x8888	# <CJK>
-0x7443	0x88D8	# <CJK>
-0x7444	0x88DF	# <CJK>
-0x7445	0x895E	# <CJK>
-0x7446	0x7F9D	# <CJK>
-0x7447	0x7FA5	# <CJK>
-0x7448	0x7FA7	# <CJK>
-0x7449	0x7FAF	# <CJK>
-0x744A	0x7FB0	# <CJK>
-0x744B	0x7FB2	# <CJK>
-0x744C	0x7C7C	# <CJK>
-0x744D	0x6549	# <CJK>
-0x744E	0x7C91	# <CJK>
-0x744F	0x7CF2	# <CJK>
-0x7450	0x7CF6	# <CJK>
-0x7451	0x7C9E	# <CJK>
-0x7452	0x7CA2	# <CJK>
-0x7453	0x7CB2	# <CJK>
-0x7454	0x7CBC	# <CJK>
-0x7455	0x7CBD	# <CJK>
-0x7456	0x7CDD	# <CJK>
-0x7457	0x7CC7	# <CJK>
-0x7458	0x7CCC	# <CJK>
-0x7459	0x7CCD	# <CJK>
-0x745A	0x7CC8	# <CJK>
-0x745B	0x7CC5	# <CJK>
-0x745C	0x7CD7	# <CJK>
-0x745D	0x7CE8	# <CJK>
-0x745E	0x826E	# <CJK>
-0x745F	0x66A8	# <CJK>
-0x7460	0x7FBF	# <CJK>
-0x7461	0x7FCE	# <CJK>
-0x7462	0x7FD5	# <CJK>
-0x7463	0x7FE5	# <CJK>
-0x7464	0x7FE1	# <CJK>
-0x7465	0x7FE6	# <CJK>
-0x7466	0x7FE9	# <CJK>
-0x7467	0x7FEE	# <CJK>
-0x7468	0x7FF3	# <CJK>
-0x7469	0x7CF8	# <CJK>
-0x746A	0x7E36	# <CJK>
-0x746B	0x7DA6	# <CJK>
-0x746C	0x7DAE	# <CJK>
-0x746D	0x7E47	# <CJK>
-0x746E	0x7E9B	# <CJK>
-0x746F	0x9EA9	# <CJK>
-0x7470	0x9EB4	# <CJK>
-0x7471	0x8D73	# <CJK>
-0x7472	0x8D84	# <CJK>
-0x7473	0x8D94	# <CJK>
-0x7474	0x8D91	# <CJK>
-0x7475	0x8DB2	# <CJK>
-0x7476	0x8D67	# <CJK>
-0x7477	0x8D6D	# <CJK>
-0x7478	0x8C47	# <CJK>
-0x7479	0x8C49	# <CJK>
-0x747A	0x914A	# <CJK>
-0x747B	0x9150	# <CJK>
-0x747C	0x914E	# <CJK>
-0x747D	0x914F	# <CJK>
-0x747E	0x9164	# <CJK>
-0x7521	0x9162	# <CJK>
-0x7522	0x9161	# <CJK>
-0x7523	0x9170	# <CJK>
-0x7524	0x9169	# <CJK>
-0x7525	0x916F	# <CJK>
-0x7526	0x91C5	# <CJK>
-0x7527	0x91C3	# <CJK>
-0x7528	0x9172	# <CJK>
-0x7529	0x9174	# <CJK>
-0x752A	0x9179	# <CJK>
-0x752B	0x918C	# <CJK>
-0x752C	0x9185	# <CJK>
-0x752D	0x9190	# <CJK>
-0x752E	0x918D	# <CJK>
-0x752F	0x9191	# <CJK>
-0x7530	0x91A2	# <CJK>
-0x7531	0x91A3	# <CJK>
-0x7532	0x91AA	# <CJK>
-0x7533	0x91AD	# <CJK>
-0x7534	0x91AE	# <CJK>
-0x7535	0x91AF	# <CJK>
-0x7536	0x91B5	# <CJK>
-0x7537	0x91B4	# <CJK>
-0x7538	0x91BA	# <CJK>
-0x7539	0x8C55	# <CJK>
-0x753A	0x9E7A	# <CJK>
-0x753B	0x8E89	# <CJK>
-0x753C	0x8DEB	# <CJK>
-0x753D	0x8E05	# <CJK>
-0x753E	0x8E59	# <CJK>
-0x753F	0x8E69	# <CJK>
-0x7540	0x8DB5	# <CJK>
-0x7541	0x8DBF	# <CJK>
-0x7542	0x8DBC	# <CJK>
-0x7543	0x8DBA	# <CJK>
-0x7544	0x8E4C	# <CJK>
-0x7545	0x8DD6	# <CJK>
-0x7546	0x8DD7	# <CJK>
-0x7547	0x8DDA	# <CJK>
-0x7548	0x8E92	# <CJK>
-0x7549	0x8DCE	# <CJK>
-0x754A	0x8DCF	# <CJK>
-0x754B	0x8DDB	# <CJK>
-0x754C	0x8DC6	# <CJK>
-0x754D	0x8DEC	# <CJK>
-0x754E	0x8E7A	# <CJK>
-0x754F	0x8E55	# <CJK>
-0x7550	0x8DE3	# <CJK>
-0x7551	0x8E9A	# <CJK>
-0x7552	0x8E8B	# <CJK>
-0x7553	0x8DE4	# <CJK>
-0x7554	0x8E09	# <CJK>
-0x7555	0x8DFD	# <CJK>
-0x7556	0x8E14	# <CJK>
-0x7557	0x8E1D	# <CJK>
-0x7558	0x8E1F	# <CJK>
-0x7559	0x8E93	# <CJK>
-0x755A	0x8E2E	# <CJK>
-0x755B	0x8E23	# <CJK>
-0x755C	0x8E91	# <CJK>
-0x755D	0x8E3A	# <CJK>
-0x755E	0x8E40	# <CJK>
-0x755F	0x8E39	# <CJK>
-0x7560	0x8E35	# <CJK>
-0x7561	0x8E3D	# <CJK>
-0x7562	0x8E31	# <CJK>
-0x7563	0x8E49	# <CJK>
-0x7564	0x8E41	# <CJK>
-0x7565	0x8E42	# <CJK>
-0x7566	0x8EA1	# <CJK>
-0x7567	0x8E63	# <CJK>
-0x7568	0x8E4A	# <CJK>
-0x7569	0x8E70	# <CJK>
-0x756A	0x8E76	# <CJK>
-0x756B	0x8E7C	# <CJK>
-0x756C	0x8E6F	# <CJK>
-0x756D	0x8E74	# <CJK>
-0x756E	0x8E85	# <CJK>
-0x756F	0x8EAA	# <CJK>
-0x7570	0x8E94	# <CJK>
-0x7571	0x8E90	# <CJK>
-0x7572	0x8EA6	# <CJK>
-0x7573	0x8E9E	# <CJK>
-0x7574	0x8C78	# <CJK>
-0x7575	0x8C82	# <CJK>
-0x7576	0x8C8A	# <CJK>
-0x7577	0x8C85	# <CJK>
-0x7578	0x8C98	# <CJK>
-0x7579	0x8C94	# <CJK>
-0x757A	0x659B	# <CJK>
-0x757B	0x89D6	# <CJK>
-0x757C	0x89F4	# <CJK>
-0x757D	0x89DA	# <CJK>
-0x757E	0x89DC	# <CJK>
-0x7621	0x89E5	# <CJK>
-0x7622	0x89EB	# <CJK>
-0x7623	0x89F6	# <CJK>
-0x7624	0x8A3E	# <CJK>
-0x7625	0x8B26	# <CJK>
-0x7626	0x975A	# <CJK>
-0x7627	0x96E9	# <CJK>
-0x7628	0x9742	# <CJK>
-0x7629	0x96EF	# <CJK>
-0x762A	0x9706	# <CJK>
-0x762B	0x973D	# <CJK>
-0x762C	0x9708	# <CJK>
-0x762D	0x970F	# <CJK>
-0x762E	0x970E	# <CJK>
-0x762F	0x972A	# <CJK>
-0x7630	0x9744	# <CJK>
-0x7631	0x9730	# <CJK>
-0x7632	0x973E	# <CJK>
-0x7633	0x9F54	# <CJK>
-0x7634	0x9F5F	# <CJK>
-0x7635	0x9F59	# <CJK>
-0x7636	0x9F60	# <CJK>
-0x7637	0x9F5C	# <CJK>
-0x7638	0x9F66	# <CJK>
-0x7639	0x9F6C	# <CJK>
-0x763A	0x9F6A	# <CJK>
-0x763B	0x9F77	# <CJK>
-0x763C	0x9EFD	# <CJK>
-0x763D	0x9EFF	# <CJK>
-0x763E	0x9F09	# <CJK>
-0x763F	0x96B9	# <CJK>
-0x7640	0x96BC	# <CJK>
-0x7641	0x96BD	# <CJK>
-0x7642	0x96CE	# <CJK>
-0x7643	0x96D2	# <CJK>
-0x7644	0x77BF	# <CJK>
-0x7645	0x8B8E	# <CJK>
-0x7646	0x928E	# <CJK>
-0x7647	0x947E	# <CJK>
-0x7648	0x92C8	# <CJK>
-0x7649	0x93E8	# <CJK>
-0x764A	0x936A	# <CJK>
-0x764B	0x93CA	# <CJK>
-0x764C	0x938F	# <CJK>
-0x764D	0x943E	# <CJK>
-0x764E	0x946B	# <CJK>
-0x764F	0x9B77	# <CJK>
-0x7650	0x9B74	# <CJK>
-0x7651	0x9B81	# <CJK>
-0x7652	0x9B83	# <CJK>
-0x7653	0x9B8E	# <CJK>
-0x7654	0x9C78	# <CJK>
-0x7655	0x7A4C	# <CJK>
-0x7656	0x9B92	# <CJK>
-0x7657	0x9C5F	# <CJK>
-0x7658	0x9B90	# <CJK>
-0x7659	0x9BAD	# <CJK>
-0x765A	0x9B9A	# <CJK>
-0x765B	0x9BAA	# <CJK>
-0x765C	0x9B9E	# <CJK>
-0x765D	0x9C6D	# <CJK>
-0x765E	0x9BAB	# <CJK>
-0x765F	0x9B9D	# <CJK>
-0x7660	0x9C58	# <CJK>
-0x7661	0x9BC1	# <CJK>
-0x7662	0x9C7A	# <CJK>
-0x7663	0x9C31	# <CJK>
-0x7664	0x9C39	# <CJK>
-0x7665	0x9C23	# <CJK>
-0x7666	0x9C37	# <CJK>
-0x7667	0x9BC0	# <CJK>
-0x7668	0x9BCA	# <CJK>
-0x7669	0x9BC7	# <CJK>
-0x766A	0x9BFD	# <CJK>
-0x766B	0x9BD6	# <CJK>
-0x766C	0x9BEA	# <CJK>
-0x766D	0x9BEB	# <CJK>
-0x766E	0x9BE1	# <CJK>
-0x766F	0x9BE4	# <CJK>
-0x7670	0x9BE7	# <CJK>
-0x7671	0x9BDD	# <CJK>
-0x7672	0x9BE2	# <CJK>
-0x7673	0x9BF0	# <CJK>
-0x7674	0x9BDB	# <CJK>
-0x7675	0x9BF4	# <CJK>
-0x7676	0x9BD4	# <CJK>
-0x7677	0x9C5D	# <CJK>
-0x7678	0x9C08	# <CJK>
-0x7679	0x9C10	# <CJK>
-0x767A	0x9C0D	# <CJK>
-0x767B	0x9C12	# <CJK>
-0x767C	0x9C09	# <CJK>
-0x767D	0x9BFF	# <CJK>
-0x767E	0x9C20	# <CJK>
-0x7721	0x9C32	# <CJK>
-0x7722	0x9C2D	# <CJK>
-0x7723	0x9C28	# <CJK>
-0x7724	0x9C25	# <CJK>
-0x7725	0x9C29	# <CJK>
-0x7726	0x9C33	# <CJK>
-0x7727	0x9C3E	# <CJK>
-0x7728	0x9C48	# <CJK>
-0x7729	0x9C3B	# <CJK>
-0x772A	0x9C35	# <CJK>
-0x772B	0x9C45	# <CJK>
-0x772C	0x9C56	# <CJK>
-0x772D	0x9C54	# <CJK>
-0x772E	0x9C52	# <CJK>
-0x772F	0x9C67	# <CJK>
-0x7730	0x977C	# <CJK>
-0x7731	0x9785	# <CJK>
-0x7732	0x97C3	# <CJK>
-0x7733	0x97BD	# <CJK>
-0x7734	0x9794	# <CJK>
-0x7735	0x97C9	# <CJK>
-0x7736	0x97AB	# <CJK>
-0x7737	0x97A3	# <CJK>
-0x7738	0x97B2	# <CJK>
-0x7739	0x97B4	# <CJK>
-0x773A	0x9AB1	# <CJK>
-0x773B	0x9AB0	# <CJK>
-0x773C	0x9AB7	# <CJK>
-0x773D	0x9DBB	# <CJK>
-0x773E	0x9AB6	# <CJK>
-0x773F	0x9ABA	# <CJK>
-0x7740	0x9ABC	# <CJK>
-0x7741	0x9AC1	# <CJK>
-0x7742	0x9AC0	# <CJK>
-0x7743	0x9ACF	# <CJK>
-0x7744	0x9AC2	# <CJK>
-0x7745	0x9AD6	# <CJK>
-0x7746	0x9AD5	# <CJK>
-0x7747	0x9AD1	# <CJK>
-0x7748	0x9B45	# <CJK>
-0x7749	0x9B43	# <CJK>
-0x774A	0x9B58	# <CJK>
-0x774B	0x9B4E	# <CJK>
-0x774C	0x9B48	# <CJK>
-0x774D	0x9B4D	# <CJK>
-0x774E	0x9B51	# <CJK>
-0x774F	0x9957	# <CJK>
-0x7750	0x995C	# <CJK>
-0x7751	0x992E	# <CJK>
-0x7752	0x9955	# <CJK>
-0x7753	0x9954	# <CJK>
-0x7754	0x9ADF	# <CJK>
-0x7755	0x9AE1	# <CJK>
-0x7756	0x9AE6	# <CJK>
-0x7757	0x9AEF	# <CJK>
-0x7758	0x9AEB	# <CJK>
-0x7759	0x9AFB	# <CJK>
-0x775A	0x9AED	# <CJK>
-0x775B	0x9AF9	# <CJK>
-0x775C	0x9B08	# <CJK>
-0x775D	0x9B0F	# <CJK>
-0x775E	0x9B22	# <CJK>
-0x775F	0x9B1F	# <CJK>
-0x7760	0x9B23	# <CJK>
-0x7761	0x4E48	# <CJK>
-0x7762	0x9EBE	# <CJK>
-0x7763	0x7E3B	# <CJK>
-0x7764	0x9E82	# <CJK>
-0x7765	0x9E87	# <CJK>
-0x7766	0x9E88	# <CJK>
-0x7767	0x9E8B	# <CJK>
-0x7768	0x9E92	# <CJK>
-0x7769	0x93D6	# <CJK>
-0x776A	0x9E9D	# <CJK>
-0x776B	0x9E9F	# <CJK>
-0x776C	0x9EDB	# <CJK>
-0x776D	0x9EDC	# <CJK>
-0x776E	0x9EDD	# <CJK>
-0x776F	0x9EE0	# <CJK>
-0x7770	0x9EDF	# <CJK>
-0x7771	0x9EE2	# <CJK>
-0x7772	0x9EF7	# <CJK>
-0x7773	0x9EE7	# <CJK>
-0x7774	0x9EE5	# <CJK>
-0x7775	0x9EF2	# <CJK>
-0x7776	0x9EEF	# <CJK>
-0x7777	0x9F22	# <CJK>
-0x7778	0x9F2C	# <CJK>
-0x7779	0x9F2F	# <CJK>
-0x777A	0x9F39	# <CJK>
-0x777B	0x9F37	# <CJK>
-0x777C	0x9F3D	# <CJK>
-0x777D	0x9F3E	# <CJK>
-0x777E	0x9F44	# <CJK>
-0x7821	0x896C	# <CJK>
-0x7822	0x95C6	# <CJK>
-0x7823	0x9336	# <CJK>
-0x7824	0x5F46	# <CJK>
-0x7825	0x8514	# <CJK>
-0x7826	0x7E94	# <CJK>
-0x7827	0x5382	# <CJK>
-0x7828	0x51B2	# <CJK>
-0x7829	0x4E11	# <CJK>
-0x782A	0x9F63	# <CJK>
-0x782B	0x5679	# <CJK>
-0x782C	0x515A	# <CJK>
-0x782D	0x6DC0	# <CJK>
-0x782E	0x9F15	# <CJK>
-0x782F	0x6597	# <CJK>
-0x7830	0x5641	# <CJK>
-0x7831	0x9AEE	# <CJK>
-0x7832	0x8303	# <CJK>
-0x7833	0x4E30	# <CJK>
-0x7834	0x8907	# <CJK>
-0x7835	0x5E72	# <CJK>
-0x7836	0x7A40	# <CJK>
-0x7837	0x98B3	# <CJK>
-0x7838	0x5E7F	# <CJK>
-0x7839	0x95A4	# <CJK>
-0x783A	0x9B0D	# <CJK>
-0x783B	0x5212	# <CJK>
-0x783C	0x8FF4	# <CJK>
-0x783D	0x5F59	# <CJK>
-0x783E	0x7A6B	# <CJK>
-0x783F	0x98E2	# <CJK>
-0x7840	0x51E0	# <CJK>
-0x7841	0x50A2	# <CJK>
-0x7842	0x4EF7	# <CJK>
-0x7843	0x8350	# <CJK>
-0x7844	0x8591	# <CJK>
-0x7845	0x5118	# <CJK>
-0x7846	0x636E	# <CJK>
-0x7847	0x6372	# <CJK>
-0x7848	0x524B	# <CJK>
-0x7849	0x5938	# <CJK>
-0x784A	0x774F	# <CJK>
-0x784B	0x8721	# <CJK>
-0x784C	0x814A	# <CJK>
-0x784D	0x7E8D	# <CJK>
-0x784E	0x91CC	# <CJK>
-0x784F	0x66C6	# <CJK>
-0x7850	0x5E18	# <CJK>
-0x7851	0x77AD	# <CJK>
-0x7852	0x9E75	# <CJK>
-0x7853	0x56C9	# <CJK>
-0x7854	0x9EF4	# <CJK>
-0x7855	0x6FDB	# <CJK>
-0x7856	0x61DE	# <CJK>
-0x7857	0x77C7	# <CJK>
-0x7858	0x7030	# <CJK>
-0x7859	0x9EB5	# <CJK>
-0x785A	0x884A	# <CJK>
-0x785B	0x95E2	# <CJK>
-0x785C	0x82F9	# <CJK>
-0x785D	0x51ED	# <CJK>
-0x785E	0x6251	# <CJK>
-0x785F	0x4EC6	# <CJK>
-0x7860	0x6734	# <CJK>
-0x7861	0x97C6	# <CJK>
-0x7862	0x7C64	# <CJK>
-0x7863	0x7E34	# <CJK>
-0x7864	0x97A6	# <CJK>
-0x7865	0x9EAF	# <CJK>
-0x7866	0x786E	# <CJK>
-0x7867	0x820D	# <CJK>
-0x7868	0x672F	# <CJK>
-0x7869	0x677E	# <CJK>
-0x786A	0x56CC	# <CJK>
-0x786B	0x53F0	# <CJK>
-0x786C	0x98B1	# <CJK>
-0x786D	0x6AAF	# <CJK>
-0x786E	0x7F4E	# <CJK>
-0x786F	0x6D82	# <CJK>
-0x7870	0x7CF0	# <CJK>
-0x7871	0x4E07	# <CJK>
-0x7872	0x4FC2	# <CJK>
-0x7873	0x7E6B	# <CJK>
-0x7874	0x9E79	# <CJK>
-0x7875	0x56AE	# <CJK>
-0x7876	0x9B1A	# <CJK>
-0x7877	0x846F	# <CJK>
-0x7878	0x53F6	# <CJK>
-0x7879	0x90C1	# <CJK>
-0x787A	0x79A6	# <CJK>
-0x787B	0x7C72	# <CJK>
-0x787C	0x613F	# <CJK>
-0x787D	0x4E91	# <CJK>
-0x787E	0x9AD2	# <CJK>
-0x7921	0x75C7	# <CJK>
-0x7922	0x96BB	# <CJK>
-0x7923	0x53EA	# <CJK>
-0x7924	0x7DFB	# <CJK>
-0x7925	0x88FD	# <CJK>
-0x7926	0x79CD	# <CJK>
-0x7927	0x7843	# <CJK>
-0x7928	0x7B51	# <CJK>
-0x7929	0x51C6	# <CJK>
diff --git a/tools/encoding/gb1988.txt b/tools/encoding/gb1988.txt
deleted file mode 100644
index 800cd68..0000000
--- a/tools/encoding/gb1988.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x00A5	# YUAN SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS (rendered as Halfwidth Yen Sign)
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x203E	# OVERLINE
-0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
-0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
-0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
-0xA4	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
-0xA5	0xFF65	# HALFWIDTH KATAKANA MIDDLE DOT
-0xA6	0xFF66	# HALFWIDTH KATAKANA LETTER WO
-0xA7	0xFF67	# HALFWIDTH KATAKANA LETTER SMALL A
-0xA8	0xFF68	# HALFWIDTH KATAKANA LETTER SMALL I
-0xA9	0xFF69	# HALFWIDTH KATAKANA LETTER SMALL U
-0xAA	0xFF6A	# HALFWIDTH KATAKANA LETTER SMALL E
-0xAB	0xFF6B	# HALFWIDTH KATAKANA LETTER SMALL O
-0xAC	0xFF6C	# HALFWIDTH KATAKANA LETTER SMALL YA
-0xAD	0xFF6D	# HALFWIDTH KATAKANA LETTER SMALL YU
-0xAE	0xFF6E	# HALFWIDTH KATAKANA LETTER SMALL YO
-0xAF	0xFF6F	# HALFWIDTH KATAKANA LETTER SMALL TU
-0xB0	0xFF70	# HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0xB1	0xFF71	# HALFWIDTH KATAKANA LETTER A
-0xB2	0xFF72	# HALFWIDTH KATAKANA LETTER I
-0xB3	0xFF73	# HALFWIDTH KATAKANA LETTER U
-0xB4	0xFF74	# HALFWIDTH KATAKANA LETTER E
-0xB5	0xFF75	# HALFWIDTH KATAKANA LETTER O
-0xB6	0xFF76	# HALFWIDTH KATAKANA LETTER KA
-0xB7	0xFF77	# HALFWIDTH KATAKANA LETTER KI
-0xB8	0xFF78	# HALFWIDTH KATAKANA LETTER KU
-0xB9	0xFF79	# HALFWIDTH KATAKANA LETTER KE
-0xBA	0xFF7A	# HALFWIDTH KATAKANA LETTER KO
-0xBB	0xFF7B	# HALFWIDTH KATAKANA LETTER SA
-0xBC	0xFF7C	# HALFWIDTH KATAKANA LETTER SI
-0xBD	0xFF7D	# HALFWIDTH KATAKANA LETTER SU
-0xBE	0xFF7E	# HALFWIDTH KATAKANA LETTER SE
-0xBF	0xFF7F	# HALFWIDTH KATAKANA LETTER SO
-0xC0	0xFF80	# HALFWIDTH KATAKANA LETTER TA
-0xC1	0xFF81	# HALFWIDTH KATAKANA LETTER TI
-0xC2	0xFF82	# HALFWIDTH KATAKANA LETTER TU
-0xC3	0xFF83	# HALFWIDTH KATAKANA LETTER TE
-0xC4	0xFF84	# HALFWIDTH KATAKANA LETTER TO
-0xC5	0xFF85	# HALFWIDTH KATAKANA LETTER NA
-0xC6	0xFF86	# HALFWIDTH KATAKANA LETTER NI
-0xC7	0xFF87	# HALFWIDTH KATAKANA LETTER NU
-0xC8	0xFF88	# HALFWIDTH KATAKANA LETTER NE
-0xC9	0xFF89	# HALFWIDTH KATAKANA LETTER NO
-0xCA	0xFF8A	# HALFWIDTH KATAKANA LETTER HA
-0xCB	0xFF8B	# HALFWIDTH KATAKANA LETTER HI
-0xCC	0xFF8C	# HALFWIDTH KATAKANA LETTER HU
-0xCD	0xFF8D	# HALFWIDTH KATAKANA LETTER HE
-0xCE	0xFF8E	# HALFWIDTH KATAKANA LETTER HO
-0xCF	0xFF8F	# HALFWIDTH KATAKANA LETTER MA
-0xD0	0xFF90	# HALFWIDTH KATAKANA LETTER MI
-0xD1	0xFF91	# HALFWIDTH KATAKANA LETTER MU
-0xD2	0xFF92	# HALFWIDTH KATAKANA LETTER ME
-0xD3	0xFF93	# HALFWIDTH KATAKANA LETTER MO
-0xD4	0xFF94	# HALFWIDTH KATAKANA LETTER YA
-0xD5	0xFF95	# HALFWIDTH KATAKANA LETTER YU
-0xD6	0xFF96	# HALFWIDTH KATAKANA LETTER YO
-0xD7	0xFF97	# HALFWIDTH KATAKANA LETTER RA
-0xD8	0xFF98	# HALFWIDTH KATAKANA LETTER RI
-0xD9	0xFF99	# HALFWIDTH KATAKANA LETTER RU
-0xDA	0xFF9A	# HALFWIDTH KATAKANA LETTER RE
-0xDB	0xFF9B	# HALFWIDTH KATAKANA LETTER RO
-0xDC	0xFF9C	# HALFWIDTH KATAKANA LETTER WA
-0xDD	0xFF9D	# HALFWIDTH KATAKANA LETTER N
-0xDE	0xFF9E	# HALFWIDTH KATAKANA VOICED SOUND MARK
-0xDF	0xFF9F	# HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
diff --git a/tools/encoding/gb2312.txt b/tools/encoding/gb2312.txt
deleted file mode 100644
index b9a1629..0000000
--- a/tools/encoding/gb2312.txt
+++ /dev/null
@@ -1,7515 +0,0 @@
-# gb2312.txt --
-#
-#	GB2312 to Unicode table (modified)
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# RCS: @(#) $Id: gb2312.txt,v 1.2 1999/04/16 00:47:55 stanton Exp $
-#
-# NOTE: this table has been modified to include the 7-bit ASCII
-# characters that are allowed in GB2312 files.
-#
-#
-#	Name:             GB2312-80 to Unicode table (complete, hex format)
-#	Unicode version:  1.1
-#	Table version:    0.0d2
-#	Table format:     Format A
-#	Date:             6 December 1993
-#	Author:           Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data Metis and Taligent currently have on how
-#       GB2312-80 characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in GB2312 order
-#
-#	The following algorithms can be used to change the hex form
-#		of GB2312 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x777E -> 0x575E -> 8794
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x2121	0x3000	# IDEOGRAPHIC SPACE
-0x2122	0x3001	# IDEOGRAPHIC COMMA
-0x2123	0x3002	# IDEOGRAPHIC FULL STOP
-0x2124	0x30FB	# KATAKANA MIDDLE DOT
-0x2125	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
-0x2126	0x02C7	# CARON (Mandarin Chinese third tone)
-0x2127	0x00A8	# DIAERESIS
-0x2128	0x3003	# DITTO MARK
-0x2129	0x3005	# IDEOGRAPHIC ITERATION MARK
-0x212A	0x2015	# HORIZONTAL BAR
-0x212B	0xFF5E	# FULLWIDTH TILDE
-0x212C	0x2225	# PARALLEL TO
-0x212D	0x2026	# HORIZONTAL ELLIPSIS
-0x212E	0x2018	# LEFT SINGLE QUOTATION MARK
-0x212F	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x2130	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x2131	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x2132	0x3014	# LEFT TORTOISE SHELL BRACKET
-0x2133	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0x2134	0x3008	# LEFT ANGLE BRACKET
-0x2135	0x3009	# RIGHT ANGLE BRACKET
-0x2136	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0x2137	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0x2138	0x300C	# LEFT CORNER BRACKET
-0x2139	0x300D	# RIGHT CORNER BRACKET
-0x213A	0x300E	# LEFT WHITE CORNER BRACKET
-0x213B	0x300F	# RIGHT WHITE CORNER BRACKET
-0x213C	0x3016	# LEFT WHITE LENTICULAR BRACKET
-0x213D	0x3017	# RIGHT WHITE LENTICULAR BRACKET
-0x213E	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0x213F	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0x2140	0x00B1	# PLUS-MINUS SIGN
-0x2141	0x00D7	# MULTIPLICATION SIGN
-0x2142	0x00F7	# DIVISION SIGN
-0x2143	0x2236	# RATIO
-0x2144	0x2227	# LOGICAL AND
-0x2145	0x2228	# LOGICAL OR
-0x2146	0x2211	# N-ARY SUMMATION
-0x2147	0x220F	# N-ARY PRODUCT
-0x2148	0x222A	# UNION
-0x2149	0x2229	# INTERSECTION
-0x214A	0x2208	# ELEMENT OF
-0x214B	0x2237	# PROPORTION
-0x214C	0x221A	# SQUARE ROOT
-0x214D	0x22A5	# UP TACK
-0x214E	0x2225	# PARALLEL TO
-0x214F	0x2220	# ANGLE
-0x2150	0x2312	# ARC
-0x2151	0x2299	# CIRCLED DOT OPERATOR
-0x2152	0x222B	# INTEGRAL
-0x2153	0x222E	# CONTOUR INTEGRAL
-0x2154	0x2261	# IDENTICAL TO
-0x2155	0x224C	# ALL EQUAL TO
-0x2156	0x2248	# ALMOST EQUAL TO
-0x2157	0x223D	# REVERSED TILDE
-0x2158	0x221D	# PROPORTIONAL TO
-0x2159	0x2260	# NOT EQUAL TO
-0x215A	0x226E	# NOT LESS-THAN
-0x215B	0x226F	# NOT GREATER-THAN
-0x215C	0x2264	# LESS-THAN OR EQUAL TO
-0x215D	0x2265	# GREATER-THAN OR EQUAL TO
-0x215E	0x221E	# INFINITY
-0x215F	0x2235	# BECAUSE
-0x2160	0x2234	# THEREFORE
-0x2161	0x2642	# MALE SIGN
-0x2162	0x2640	# FEMALE SIGN
-0x2163	0x00B0	# DEGREE SIGN
-0x2164	0x2032	# PRIME
-0x2165	0x2033	# DOUBLE PRIME
-0x2166	0x2103	# DEGREE CELSIUS
-0x2167	0xFF04	# FULLWIDTH DOLLAR SIGN
-0x2168	0x00A4	# CURRENCY SIGN
-0x2169	0xFFE0	# FULLWIDTH CENT SIGN
-0x216A	0xFFE1	# FULLWIDTH POUND SIGN
-0x216B	0x2030	# PER MILLE SIGN
-0x216C	0x00A7	# SECTION SIGN
-0x216D	0x2116	# NUMERO SIGN
-0x216E	0x2606	# WHITE STAR
-0x216F	0x2605	# BLACK STAR
-0x2170	0x25CB	# WHITE CIRCLE
-0x2171	0x25CF	# BLACK CIRCLE
-0x2172	0x25CE	# BULLSEYE
-0x2173	0x25C7	# WHITE DIAMOND
-0x2174	0x25C6	# BLACK DIAMOND
-0x2175	0x25A1	# WHITE SQUARE
-0x2176	0x25A0	# BLACK SQUARE
-0x2177	0x25B3	# WHITE UP-POINTING TRIANGLE
-0x2178	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x2179	0x203B	# REFERENCE MARK
-0x217A	0x2192	# RIGHTWARDS ARROW
-0x217B	0x2190	# LEFTWARDS ARROW
-0x217C	0x2191	# UPWARDS ARROW
-0x217D	0x2193	# DOWNWARDS ARROW
-0x217E	0x3013	# GETA MARK
-0x2231	0x2488	# DIGIT ONE FULL STOP
-0x2232	0x2489	# DIGIT TWO FULL STOP
-0x2233	0x248A	# DIGIT THREE FULL STOP
-0x2234	0x248B	# DIGIT FOUR FULL STOP
-0x2235	0x248C	# DIGIT FIVE FULL STOP
-0x2236	0x248D	# DIGIT SIX FULL STOP
-0x2237	0x248E	# DIGIT SEVEN FULL STOP
-0x2238	0x248F	# DIGIT EIGHT FULL STOP
-0x2239	0x2490	# DIGIT NINE FULL STOP
-0x223A	0x2491	# NUMBER TEN FULL STOP
-0x223B	0x2492	# NUMBER ELEVEN FULL STOP
-0x223C	0x2493	# NUMBER TWELVE FULL STOP
-0x223D	0x2494	# NUMBER THIRTEEN FULL STOP
-0x223E	0x2495	# NUMBER FOURTEEN FULL STOP
-0x223F	0x2496	# NUMBER FIFTEEN FULL STOP
-0x2240	0x2497	# NUMBER SIXTEEN FULL STOP
-0x2241	0x2498	# NUMBER SEVENTEEN FULL STOP
-0x2242	0x2499	# NUMBER EIGHTEEN FULL STOP
-0x2243	0x249A	# NUMBER NINETEEN FULL STOP
-0x2244	0x249B	# NUMBER TWENTY FULL STOP
-0x2245	0x2474	# PARENTHESIZED DIGIT ONE
-0x2246	0x2475	# PARENTHESIZED DIGIT TWO
-0x2247	0x2476	# PARENTHESIZED DIGIT THREE
-0x2248	0x2477	# PARENTHESIZED DIGIT FOUR
-0x2249	0x2478	# PARENTHESIZED DIGIT FIVE
-0x224A	0x2479	# PARENTHESIZED DIGIT SIX
-0x224B	0x247A	# PARENTHESIZED DIGIT SEVEN
-0x224C	0x247B	# PARENTHESIZED DIGIT EIGHT
-0x224D	0x247C	# PARENTHESIZED DIGIT NINE
-0x224E	0x247D	# PARENTHESIZED NUMBER TEN
-0x224F	0x247E	# PARENTHESIZED NUMBER ELEVEN
-0x2250	0x247F	# PARENTHESIZED NUMBER TWELVE
-0x2251	0x2480	# PARENTHESIZED NUMBER THIRTEEN
-0x2252	0x2481	# PARENTHESIZED NUMBER FOURTEEN
-0x2253	0x2482	# PARENTHESIZED NUMBER FIFTEEN
-0x2254	0x2483	# PARENTHESIZED NUMBER SIXTEEN
-0x2255	0x2484	# PARENTHESIZED NUMBER SEVENTEEN
-0x2256	0x2485	# PARENTHESIZED NUMBER EIGHTEEN
-0x2257	0x2486	# PARENTHESIZED NUMBER NINETEEN
-0x2258	0x2487	# PARENTHESIZED NUMBER TWENTY
-0x2259	0x2460	# CIRCLED DIGIT ONE
-0x225A	0x2461	# CIRCLED DIGIT TWO
-0x225B	0x2462	# CIRCLED DIGIT THREE
-0x225C	0x2463	# CIRCLED DIGIT FOUR
-0x225D	0x2464	# CIRCLED DIGIT FIVE
-0x225E	0x2465	# CIRCLED DIGIT SIX
-0x225F	0x2466	# CIRCLED DIGIT SEVEN
-0x2260	0x2467	# CIRCLED DIGIT EIGHT
-0x2261	0x2468	# CIRCLED DIGIT NINE
-0x2262	0x2469	# CIRCLED NUMBER TEN
-0x2265	0x3220	# PARENTHESIZED IDEOGRAPH ONE
-0x2266	0x3221	# PARENTHESIZED IDEOGRAPH TWO
-0x2267	0x3222	# PARENTHESIZED IDEOGRAPH THREE
-0x2268	0x3223	# PARENTHESIZED IDEOGRAPH FOUR
-0x2269	0x3224	# PARENTHESIZED IDEOGRAPH FIVE
-0x226A	0x3225	# PARENTHESIZED IDEOGRAPH SIX
-0x226B	0x3226	# PARENTHESIZED IDEOGRAPH SEVEN
-0x226C	0x3227	# PARENTHESIZED IDEOGRAPH EIGHT
-0x226D	0x3228	# PARENTHESIZED IDEOGRAPH NINE
-0x226E	0x3229	# PARENTHESIZED IDEOGRAPH TEN
-0x2271	0x2160	# ROMAN NUMERAL ONE
-0x2272	0x2161	# ROMAN NUMERAL TWO
-0x2273	0x2162	# ROMAN NUMERAL THREE
-0x2274	0x2163	# ROMAN NUMERAL FOUR
-0x2275	0x2164	# ROMAN NUMERAL FIVE
-0x2276	0x2165	# ROMAN NUMERAL SIX
-0x2277	0x2166	# ROMAN NUMERAL SEVEN
-0x2278	0x2167	# ROMAN NUMERAL EIGHT
-0x2279	0x2168	# ROMAN NUMERAL NINE
-0x227A	0x2169	# ROMAN NUMERAL TEN
-0x227B	0x216A	# ROMAN NUMERAL ELEVEN
-0x227C	0x216B	# ROMAN NUMERAL TWELVE
-0x2321	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0x2322	0xFF02	# FULLWIDTH QUOTATION MARK
-0x2323	0xFF03	# FULLWIDTH NUMBER SIGN
-0x2324	0xFFE5	# FULLWIDTH YEN SIGN
-0x2325	0xFF05	# FULLWIDTH PERCENT SIGN
-0x2326	0xFF06	# FULLWIDTH AMPERSAND
-0x2327	0xFF07	# FULLWIDTH APOSTROPHE
-0x2328	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0x2329	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0x232A	0xFF0A	# FULLWIDTH ASTERISK
-0x232B	0xFF0B	# FULLWIDTH PLUS SIGN
-0x232C	0xFF0C	# FULLWIDTH COMMA
-0x232D	0xFF0D	# FULLWIDTH HYPHEN-MINUS
-0x232E	0xFF0E	# FULLWIDTH FULL STOP
-0x232F	0xFF0F	# FULLWIDTH SOLIDUS
-0x2330	0xFF10	# FULLWIDTH DIGIT ZERO
-0x2331	0xFF11	# FULLWIDTH DIGIT ONE
-0x2332	0xFF12	# FULLWIDTH DIGIT TWO
-0x2333	0xFF13	# FULLWIDTH DIGIT THREE
-0x2334	0xFF14	# FULLWIDTH DIGIT FOUR
-0x2335	0xFF15	# FULLWIDTH DIGIT FIVE
-0x2336	0xFF16	# FULLWIDTH DIGIT SIX
-0x2337	0xFF17	# FULLWIDTH DIGIT SEVEN
-0x2338	0xFF18	# FULLWIDTH DIGIT EIGHT
-0x2339	0xFF19	# FULLWIDTH DIGIT NINE
-0x233A	0xFF1A	# FULLWIDTH COLON
-0x233B	0xFF1B	# FULLWIDTH SEMICOLON
-0x233C	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0x233D	0xFF1D	# FULLWIDTH EQUALS SIGN
-0x233E	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0x233F	0xFF1F	# FULLWIDTH QUESTION MARK
-0x2340	0xFF20	# FULLWIDTH COMMERCIAL AT
-0x2341	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0x2342	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0x2343	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0x2344	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0x2345	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0x2346	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0x2347	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0x2348	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0x2349	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0x234A	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0x234B	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0x234C	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0x234D	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0x234E	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0x234F	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0x2350	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0x2351	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0x2352	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0x2353	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0x2354	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0x2355	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0x2356	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0x2357	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0x2358	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0x2359	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0x235A	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0x235B	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
-0x235C	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
-0x235D	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
-0x235E	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
-0x235F	0xFF3F	# FULLWIDTH LOW LINE
-0x2360	0xFF40	# FULLWIDTH GRAVE ACCENT
-0x2361	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0x2362	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0x2363	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0x2364	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0x2365	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0x2366	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0x2367	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0x2368	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0x2369	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0x236A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0x236B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0x236C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0x236D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0x236E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0x236F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0x2370	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0x2371	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0x2372	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0x2373	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0x2374	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0x2375	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0x2376	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0x2377	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0x2378	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0x2379	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0x237A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0x237B	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0x237C	0xFF5C	# FULLWIDTH VERTICAL LINE
-0x237D	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0x237E	0xFFE3	# FULLWIDTH MACRON
-0x2421	0x3041	# HIRAGANA LETTER SMALL A
-0x2422	0x3042	# HIRAGANA LETTER A
-0x2423	0x3043	# HIRAGANA LETTER SMALL I
-0x2424	0x3044	# HIRAGANA LETTER I
-0x2425	0x3045	# HIRAGANA LETTER SMALL U
-0x2426	0x3046	# HIRAGANA LETTER U
-0x2427	0x3047	# HIRAGANA LETTER SMALL E
-0x2428	0x3048	# HIRAGANA LETTER E
-0x2429	0x3049	# HIRAGANA LETTER SMALL O
-0x242A	0x304A	# HIRAGANA LETTER O
-0x242B	0x304B	# HIRAGANA LETTER KA
-0x242C	0x304C	# HIRAGANA LETTER GA
-0x242D	0x304D	# HIRAGANA LETTER KI
-0x242E	0x304E	# HIRAGANA LETTER GI
-0x242F	0x304F	# HIRAGANA LETTER KU
-0x2430	0x3050	# HIRAGANA LETTER GU
-0x2431	0x3051	# HIRAGANA LETTER KE
-0x2432	0x3052	# HIRAGANA LETTER GE
-0x2433	0x3053	# HIRAGANA LETTER KO
-0x2434	0x3054	# HIRAGANA LETTER GO
-0x2435	0x3055	# HIRAGANA LETTER SA
-0x2436	0x3056	# HIRAGANA LETTER ZA
-0x2437	0x3057	# HIRAGANA LETTER SI
-0x2438	0x3058	# HIRAGANA LETTER ZI
-0x2439	0x3059	# HIRAGANA LETTER SU
-0x243A	0x305A	# HIRAGANA LETTER ZU
-0x243B	0x305B	# HIRAGANA LETTER SE
-0x243C	0x305C	# HIRAGANA LETTER ZE
-0x243D	0x305D	# HIRAGANA LETTER SO
-0x243E	0x305E	# HIRAGANA LETTER ZO
-0x243F	0x305F	# HIRAGANA LETTER TA
-0x2440	0x3060	# HIRAGANA LETTER DA
-0x2441	0x3061	# HIRAGANA LETTER TI
-0x2442	0x3062	# HIRAGANA LETTER DI
-0x2443	0x3063	# HIRAGANA LETTER SMALL TU
-0x2444	0x3064	# HIRAGANA LETTER TU
-0x2445	0x3065	# HIRAGANA LETTER DU
-0x2446	0x3066	# HIRAGANA LETTER TE
-0x2447	0x3067	# HIRAGANA LETTER DE
-0x2448	0x3068	# HIRAGANA LETTER TO
-0x2449	0x3069	# HIRAGANA LETTER DO
-0x244A	0x306A	# HIRAGANA LETTER NA
-0x244B	0x306B	# HIRAGANA LETTER NI
-0x244C	0x306C	# HIRAGANA LETTER NU
-0x244D	0x306D	# HIRAGANA LETTER NE
-0x244E	0x306E	# HIRAGANA LETTER NO
-0x244F	0x306F	# HIRAGANA LETTER HA
-0x2450	0x3070	# HIRAGANA LETTER BA
-0x2451	0x3071	# HIRAGANA LETTER PA
-0x2452	0x3072	# HIRAGANA LETTER HI
-0x2453	0x3073	# HIRAGANA LETTER BI
-0x2454	0x3074	# HIRAGANA LETTER PI
-0x2455	0x3075	# HIRAGANA LETTER HU
-0x2456	0x3076	# HIRAGANA LETTER BU
-0x2457	0x3077	# HIRAGANA LETTER PU
-0x2458	0x3078	# HIRAGANA LETTER HE
-0x2459	0x3079	# HIRAGANA LETTER BE
-0x245A	0x307A	# HIRAGANA LETTER PE
-0x245B	0x307B	# HIRAGANA LETTER HO
-0x245C	0x307C	# HIRAGANA LETTER BO
-0x245D	0x307D	# HIRAGANA LETTER PO
-0x245E	0x307E	# HIRAGANA LETTER MA
-0x245F	0x307F	# HIRAGANA LETTER MI
-0x2460	0x3080	# HIRAGANA LETTER MU
-0x2461	0x3081	# HIRAGANA LETTER ME
-0x2462	0x3082	# HIRAGANA LETTER MO
-0x2463	0x3083	# HIRAGANA LETTER SMALL YA
-0x2464	0x3084	# HIRAGANA LETTER YA
-0x2465	0x3085	# HIRAGANA LETTER SMALL YU
-0x2466	0x3086	# HIRAGANA LETTER YU
-0x2467	0x3087	# HIRAGANA LETTER SMALL YO
-0x2468	0x3088	# HIRAGANA LETTER YO
-0x2469	0x3089	# HIRAGANA LETTER RA
-0x246A	0x308A	# HIRAGANA LETTER RI
-0x246B	0x308B	# HIRAGANA LETTER RU
-0x246C	0x308C	# HIRAGANA LETTER RE
-0x246D	0x308D	# HIRAGANA LETTER RO
-0x246E	0x308E	# HIRAGANA LETTER SMALL WA
-0x246F	0x308F	# HIRAGANA LETTER WA
-0x2470	0x3090	# HIRAGANA LETTER WI
-0x2471	0x3091	# HIRAGANA LETTER WE
-0x2472	0x3092	# HIRAGANA LETTER WO
-0x2473	0x3093	# HIRAGANA LETTER N
-0x2521	0x30A1	# KATAKANA LETTER SMALL A
-0x2522	0x30A2	# KATAKANA LETTER A
-0x2523	0x30A3	# KATAKANA LETTER SMALL I
-0x2524	0x30A4	# KATAKANA LETTER I
-0x2525	0x30A5	# KATAKANA LETTER SMALL U
-0x2526	0x30A6	# KATAKANA LETTER U
-0x2527	0x30A7	# KATAKANA LETTER SMALL E
-0x2528	0x30A8	# KATAKANA LETTER E
-0x2529	0x30A9	# KATAKANA LETTER SMALL O
-0x252A	0x30AA	# KATAKANA LETTER O
-0x252B	0x30AB	# KATAKANA LETTER KA
-0x252C	0x30AC	# KATAKANA LETTER GA
-0x252D	0x30AD	# KATAKANA LETTER KI
-0x252E	0x30AE	# KATAKANA LETTER GI
-0x252F	0x30AF	# KATAKANA LETTER KU
-0x2530	0x30B0	# KATAKANA LETTER GU
-0x2531	0x30B1	# KATAKANA LETTER KE
-0x2532	0x30B2	# KATAKANA LETTER GE
-0x2533	0x30B3	# KATAKANA LETTER KO
-0x2534	0x30B4	# KATAKANA LETTER GO
-0x2535	0x30B5	# KATAKANA LETTER SA
-0x2536	0x30B6	# KATAKANA LETTER ZA
-0x2537	0x30B7	# KATAKANA LETTER SI
-0x2538	0x30B8	# KATAKANA LETTER ZI
-0x2539	0x30B9	# KATAKANA LETTER SU
-0x253A	0x30BA	# KATAKANA LETTER ZU
-0x253B	0x30BB	# KATAKANA LETTER SE
-0x253C	0x30BC	# KATAKANA LETTER ZE
-0x253D	0x30BD	# KATAKANA LETTER SO
-0x253E	0x30BE	# KATAKANA LETTER ZO
-0x253F	0x30BF	# KATAKANA LETTER TA
-0x2540	0x30C0	# KATAKANA LETTER DA
-0x2541	0x30C1	# KATAKANA LETTER TI
-0x2542	0x30C2	# KATAKANA LETTER DI
-0x2543	0x30C3	# KATAKANA LETTER SMALL TU
-0x2544	0x30C4	# KATAKANA LETTER TU
-0x2545	0x30C5	# KATAKANA LETTER DU
-0x2546	0x30C6	# KATAKANA LETTER TE
-0x2547	0x30C7	# KATAKANA LETTER DE
-0x2548	0x30C8	# KATAKANA LETTER TO
-0x2549	0x30C9	# KATAKANA LETTER DO
-0x254A	0x30CA	# KATAKANA LETTER NA
-0x254B	0x30CB	# KATAKANA LETTER NI
-0x254C	0x30CC	# KATAKANA LETTER NU
-0x254D	0x30CD	# KATAKANA LETTER NE
-0x254E	0x30CE	# KATAKANA LETTER NO
-0x254F	0x30CF	# KATAKANA LETTER HA
-0x2550	0x30D0	# KATAKANA LETTER BA
-0x2551	0x30D1	# KATAKANA LETTER PA
-0x2552	0x30D2	# KATAKANA LETTER HI
-0x2553	0x30D3	# KATAKANA LETTER BI
-0x2554	0x30D4	# KATAKANA LETTER PI
-0x2555	0x30D5	# KATAKANA LETTER HU
-0x2556	0x30D6	# KATAKANA LETTER BU
-0x2557	0x30D7	# KATAKANA LETTER PU
-0x2558	0x30D8	# KATAKANA LETTER HE
-0x2559	0x30D9	# KATAKANA LETTER BE
-0x255A	0x30DA	# KATAKANA LETTER PE
-0x255B	0x30DB	# KATAKANA LETTER HO
-0x255C	0x30DC	# KATAKANA LETTER BO
-0x255D	0x30DD	# KATAKANA LETTER PO
-0x255E	0x30DE	# KATAKANA LETTER MA
-0x255F	0x30DF	# KATAKANA LETTER MI
-0x2560	0x30E0	# KATAKANA LETTER MU
-0x2561	0x30E1	# KATAKANA LETTER ME
-0x2562	0x30E2	# KATAKANA LETTER MO
-0x2563	0x30E3	# KATAKANA LETTER SMALL YA
-0x2564	0x30E4	# KATAKANA LETTER YA
-0x2565	0x30E5	# KATAKANA LETTER SMALL YU
-0x2566	0x30E6	# KATAKANA LETTER YU
-0x2567	0x30E7	# KATAKANA LETTER SMALL YO
-0x2568	0x30E8	# KATAKANA LETTER YO
-0x2569	0x30E9	# KATAKANA LETTER RA
-0x256A	0x30EA	# KATAKANA LETTER RI
-0x256B	0x30EB	# KATAKANA LETTER RU
-0x256C	0x30EC	# KATAKANA LETTER RE
-0x256D	0x30ED	# KATAKANA LETTER RO
-0x256E	0x30EE	# KATAKANA LETTER SMALL WA
-0x256F	0x30EF	# KATAKANA LETTER WA
-0x2570	0x30F0	# KATAKANA LETTER WI
-0x2571	0x30F1	# KATAKANA LETTER WE
-0x2572	0x30F2	# KATAKANA LETTER WO
-0x2573	0x30F3	# KATAKANA LETTER N
-0x2574	0x30F4	# KATAKANA LETTER VU
-0x2575	0x30F5	# KATAKANA LETTER SMALL KA
-0x2576	0x30F6	# KATAKANA LETTER SMALL KE
-0x2621	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x2622	0x0392	# GREEK CAPITAL LETTER BETA
-0x2623	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x2624	0x0394	# GREEK CAPITAL LETTER DELTA
-0x2625	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x2626	0x0396	# GREEK CAPITAL LETTER ZETA
-0x2627	0x0397	# GREEK CAPITAL LETTER ETA
-0x2628	0x0398	# GREEK CAPITAL LETTER THETA
-0x2629	0x0399	# GREEK CAPITAL LETTER IOTA
-0x262A	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x262B	0x039B	# GREEK CAPITAL LETTER LAMDA
-0x262C	0x039C	# GREEK CAPITAL LETTER MU
-0x262D	0x039D	# GREEK CAPITAL LETTER NU
-0x262E	0x039E	# GREEK CAPITAL LETTER XI
-0x262F	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x2630	0x03A0	# GREEK CAPITAL LETTER PI
-0x2631	0x03A1	# GREEK CAPITAL LETTER RHO
-0x2632	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x2633	0x03A4	# GREEK CAPITAL LETTER TAU
-0x2634	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x2635	0x03A6	# GREEK CAPITAL LETTER PHI
-0x2636	0x03A7	# GREEK CAPITAL LETTER CHI
-0x2637	0x03A8	# GREEK CAPITAL LETTER PSI
-0x2638	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x2641	0x03B1	# GREEK SMALL LETTER ALPHA
-0x2642	0x03B2	# GREEK SMALL LETTER BETA
-0x2643	0x03B3	# GREEK SMALL LETTER GAMMA
-0x2644	0x03B4	# GREEK SMALL LETTER DELTA
-0x2645	0x03B5	# GREEK SMALL LETTER EPSILON
-0x2646	0x03B6	# GREEK SMALL LETTER ZETA
-0x2647	0x03B7	# GREEK SMALL LETTER ETA
-0x2648	0x03B8	# GREEK SMALL LETTER THETA
-0x2649	0x03B9	# GREEK SMALL LETTER IOTA
-0x264A	0x03BA	# GREEK SMALL LETTER KAPPA
-0x264B	0x03BB	# GREEK SMALL LETTER LAMDA
-0x264C	0x03BC	# GREEK SMALL LETTER MU
-0x264D	0x03BD	# GREEK SMALL LETTER NU
-0x264E	0x03BE	# GREEK SMALL LETTER XI
-0x264F	0x03BF	# GREEK SMALL LETTER OMICRON
-0x2650	0x03C0	# GREEK SMALL LETTER PI
-0x2651	0x03C1	# GREEK SMALL LETTER RHO
-0x2652	0x03C3	# GREEK SMALL LETTER SIGMA
-0x2653	0x03C4	# GREEK SMALL LETTER TAU
-0x2654	0x03C5	# GREEK SMALL LETTER UPSILON
-0x2655	0x03C6	# GREEK SMALL LETTER PHI
-0x2656	0x03C7	# GREEK SMALL LETTER CHI
-0x2657	0x03C8	# GREEK SMALL LETTER PSI
-0x2658	0x03C9	# GREEK SMALL LETTER OMEGA
-0x2721	0x0410	# CYRILLIC CAPITAL LETTER A
-0x2722	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x2723	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x2724	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x2725	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x2726	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x2727	0x0401	# CYRILLIC CAPITAL LETTER IO
-0x2728	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x2729	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x272A	0x0418	# CYRILLIC CAPITAL LETTER I
-0x272B	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x272C	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x272D	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x272E	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x272F	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x2730	0x041E	# CYRILLIC CAPITAL LETTER O
-0x2731	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x2732	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x2733	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x2734	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x2735	0x0423	# CYRILLIC CAPITAL LETTER U
-0x2736	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x2737	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x2738	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x2739	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x273A	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x273B	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x273C	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x273D	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x273E	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x273F	0x042D	# CYRILLIC CAPITAL LETTER E
-0x2740	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x2741	0x042F	# CYRILLIC CAPITAL LETTER YA
-0x2751	0x0430	# CYRILLIC SMALL LETTER A
-0x2752	0x0431	# CYRILLIC SMALL LETTER BE
-0x2753	0x0432	# CYRILLIC SMALL LETTER VE
-0x2754	0x0433	# CYRILLIC SMALL LETTER GHE
-0x2755	0x0434	# CYRILLIC SMALL LETTER DE
-0x2756	0x0435	# CYRILLIC SMALL LETTER IE
-0x2757	0x0451	# CYRILLIC SMALL LETTER IO
-0x2758	0x0436	# CYRILLIC SMALL LETTER ZHE
-0x2759	0x0437	# CYRILLIC SMALL LETTER ZE
-0x275A	0x0438	# CYRILLIC SMALL LETTER I
-0x275B	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0x275C	0x043A	# CYRILLIC SMALL LETTER KA
-0x275D	0x043B	# CYRILLIC SMALL LETTER EL
-0x275E	0x043C	# CYRILLIC SMALL LETTER EM
-0x275F	0x043D	# CYRILLIC SMALL LETTER EN
-0x2760	0x043E	# CYRILLIC SMALL LETTER O
-0x2761	0x043F	# CYRILLIC SMALL LETTER PE
-0x2762	0x0440	# CYRILLIC SMALL LETTER ER
-0x2763	0x0441	# CYRILLIC SMALL LETTER ES
-0x2764	0x0442	# CYRILLIC SMALL LETTER TE
-0x2765	0x0443	# CYRILLIC SMALL LETTER U
-0x2766	0x0444	# CYRILLIC SMALL LETTER EF
-0x2767	0x0445	# CYRILLIC SMALL LETTER HA
-0x2768	0x0446	# CYRILLIC SMALL LETTER TSE
-0x2769	0x0447	# CYRILLIC SMALL LETTER CHE
-0x276A	0x0448	# CYRILLIC SMALL LETTER SHA
-0x276B	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0x276C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0x276D	0x044B	# CYRILLIC SMALL LETTER YERU
-0x276E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0x276F	0x044D	# CYRILLIC SMALL LETTER E
-0x2770	0x044E	# CYRILLIC SMALL LETTER YU
-0x2771	0x044F	# CYRILLIC SMALL LETTER YA
-0x2821	0x0101	# LATIN SMALL LETTER A WITH MACRON
-0x2822	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x2823	0x01CE	# LATIN SMALL LETTER A WITH CARON
-0x2824	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x2825	0x0113	# LATIN SMALL LETTER E WITH MACRON
-0x2826	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x2827	0x011B	# LATIN SMALL LETTER E WITH CARON
-0x2828	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x2829	0x012B	# LATIN SMALL LETTER I WITH MACRON
-0x282A	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x282B	0x01D0	# LATIN SMALL LETTER I WITH CARON
-0x282C	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x282D	0x014D	# LATIN SMALL LETTER O WITH MACRON
-0x282E	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x282F	0x01D2	# LATIN SMALL LETTER O WITH CARON
-0x2830	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x2831	0x016B	# LATIN SMALL LETTER U WITH MACRON
-0x2832	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x2833	0x01D4	# LATIN SMALL LETTER U WITH CARON
-0x2834	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x2835	0x01D6	# LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-0x2836	0x01D8	# LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-0x2837	0x01DA	# LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-0x2838	0x01DC	# LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-0x2839	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0x283A	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x2845	0x3105	# BOPOMOFO LETTER B
-0x2846	0x3106	# BOPOMOFO LETTER P
-0x2847	0x3107	# BOPOMOFO LETTER M
-0x2848	0x3108	# BOPOMOFO LETTER F
-0x2849	0x3109	# BOPOMOFO LETTER D
-0x284A	0x310A	# BOPOMOFO LETTER T
-0x284B	0x310B	# BOPOMOFO LETTER N
-0x284C	0x310C	# BOPOMOFO LETTER L
-0x284D	0x310D	# BOPOMOFO LETTER G
-0x284E	0x310E	# BOPOMOFO LETTER K
-0x284F	0x310F	# BOPOMOFO LETTER H
-0x2850	0x3110	# BOPOMOFO LETTER J
-0x2851	0x3111	# BOPOMOFO LETTER Q
-0x2852	0x3112	# BOPOMOFO LETTER X
-0x2853	0x3113	# BOPOMOFO LETTER ZH
-0x2854	0x3114	# BOPOMOFO LETTER CH
-0x2855	0x3115	# BOPOMOFO LETTER SH
-0x2856	0x3116	# BOPOMOFO LETTER R
-0x2857	0x3117	# BOPOMOFO LETTER Z
-0x2858	0x3118	# BOPOMOFO LETTER C
-0x2859	0x3119	# BOPOMOFO LETTER S
-0x285A	0x311A	# BOPOMOFO LETTER A
-0x285B	0x311B	# BOPOMOFO LETTER O
-0x285C	0x311C	# BOPOMOFO LETTER E
-0x285D	0x311D	# BOPOMOFO LETTER EH
-0x285E	0x311E	# BOPOMOFO LETTER AI
-0x285F	0x311F	# BOPOMOFO LETTER EI
-0x2860	0x3120	# BOPOMOFO LETTER AU
-0x2861	0x3121	# BOPOMOFO LETTER OU
-0x2862	0x3122	# BOPOMOFO LETTER AN
-0x2863	0x3123	# BOPOMOFO LETTER EN
-0x2864	0x3124	# BOPOMOFO LETTER ANG
-0x2865	0x3125	# BOPOMOFO LETTER ENG
-0x2866	0x3126	# BOPOMOFO LETTER ER
-0x2867	0x3127	# BOPOMOFO LETTER I
-0x2868	0x3128	# BOPOMOFO LETTER U
-0x2869	0x3129	# BOPOMOFO LETTER IU
-0x2924	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x2925	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
-0x2926	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x2927	0x2503	# BOX DRAWINGS HEAVY VERTICAL
-0x2928	0x2504	# BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
-0x2929	0x2505	# BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
-0x292A	0x2506	# BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
-0x292B	0x2507	# BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
-0x292C	0x2508	# BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
-0x292D	0x2509	# BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
-0x292E	0x250A	# BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
-0x292F	0x250B	# BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
-0x2930	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x2931	0x250D	# BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
-0x2932	0x250E	# BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
-0x2933	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x2934	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x2935	0x2511	# BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
-0x2936	0x2512	# BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
-0x2937	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
-0x2938	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x2939	0x2515	# BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
-0x293A	0x2516	# BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
-0x293B	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
-0x293C	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x293D	0x2519	# BOX DRAWINGS UP LIGHT AND LEFT HEAVY
-0x293E	0x251A	# BOX DRAWINGS UP HEAVY AND LEFT LIGHT
-0x293F	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
-0x2940	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x2941	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x2942	0x251E	# BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
-0x2943	0x251F	# BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
-0x2944	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x2945	0x2521	# BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
-0x2946	0x2522	# BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
-0x2947	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x2948	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x2949	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x294A	0x2526	# BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
-0x294B	0x2527	# BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
-0x294C	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x294D	0x2529	# BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
-0x294E	0x252A	# BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
-0x294F	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x2950	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x2951	0x252D	# BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
-0x2952	0x252E	# BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
-0x2953	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x2954	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x2955	0x2531	# BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
-0x2956	0x2532	# BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
-0x2957	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x2958	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x2959	0x2535	# BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
-0x295A	0x2536	# BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
-0x295B	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x295C	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x295D	0x2539	# BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
-0x295E	0x253A	# BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
-0x295F	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x2960	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x2961	0x253D	# BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
-0x2962	0x253E	# BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
-0x2963	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x2964	0x2540	# BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
-0x2965	0x2541	# BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
-0x2966	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x2967	0x2543	# BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
-0x2968	0x2544	# BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
-0x2969	0x2545	# BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
-0x296A	0x2546	# BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
-0x296B	0x2547	# BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
-0x296C	0x2548	# BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
-0x296D	0x2549	# BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
-0x296E	0x254A	# BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
-0x296F	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x3021	0x554A	# <CJK>
-0x3022	0x963F	# <CJK>
-0x3023	0x57C3	# <CJK>
-0x3024	0x6328	# <CJK>
-0x3025	0x54CE	# <CJK>
-0x3026	0x5509	# <CJK>
-0x3027	0x54C0	# <CJK>
-0x3028	0x7691	# <CJK>
-0x3029	0x764C	# <CJK>
-0x302A	0x853C	# <CJK>
-0x302B	0x77EE	# <CJK>
-0x302C	0x827E	# <CJK>
-0x302D	0x788D	# <CJK>
-0x302E	0x7231	# <CJK>
-0x302F	0x9698	# <CJK>
-0x3030	0x978D	# <CJK>
-0x3031	0x6C28	# <CJK>
-0x3032	0x5B89	# <CJK>
-0x3033	0x4FFA	# <CJK>
-0x3034	0x6309	# <CJK>
-0x3035	0x6697	# <CJK>
-0x3036	0x5CB8	# <CJK>
-0x3037	0x80FA	# <CJK>
-0x3038	0x6848	# <CJK>
-0x3039	0x80AE	# <CJK>
-0x303A	0x6602	# <CJK>
-0x303B	0x76CE	# <CJK>
-0x303C	0x51F9	# <CJK>
-0x303D	0x6556	# <CJK>
-0x303E	0x71AC	# <CJK>
-0x303F	0x7FF1	# <CJK>
-0x3040	0x8884	# <CJK>
-0x3041	0x50B2	# <CJK>
-0x3042	0x5965	# <CJK>
-0x3043	0x61CA	# <CJK>
-0x3044	0x6FB3	# <CJK>
-0x3045	0x82AD	# <CJK>
-0x3046	0x634C	# <CJK>
-0x3047	0x6252	# <CJK>
-0x3048	0x53ED	# <CJK>
-0x3049	0x5427	# <CJK>
-0x304A	0x7B06	# <CJK>
-0x304B	0x516B	# <CJK>
-0x304C	0x75A4	# <CJK>
-0x304D	0x5DF4	# <CJK>
-0x304E	0x62D4	# <CJK>
-0x304F	0x8DCB	# <CJK>
-0x3050	0x9776	# <CJK>
-0x3051	0x628A	# <CJK>
-0x3052	0x8019	# <CJK>
-0x3053	0x575D	# <CJK>
-0x3054	0x9738	# <CJK>
-0x3055	0x7F62	# <CJK>
-0x3056	0x7238	# <CJK>
-0x3057	0x767D	# <CJK>
-0x3058	0x67CF	# <CJK>
-0x3059	0x767E	# <CJK>
-0x305A	0x6446	# <CJK>
-0x305B	0x4F70	# <CJK>
-0x305C	0x8D25	# <CJK>
-0x305D	0x62DC	# <CJK>
-0x305E	0x7A17	# <CJK>
-0x305F	0x6591	# <CJK>
-0x3060	0x73ED	# <CJK>
-0x3061	0x642C	# <CJK>
-0x3062	0x6273	# <CJK>
-0x3063	0x822C	# <CJK>
-0x3064	0x9881	# <CJK>
-0x3065	0x677F	# <CJK>
-0x3066	0x7248	# <CJK>
-0x3067	0x626E	# <CJK>
-0x3068	0x62CC	# <CJK>
-0x3069	0x4F34	# <CJK>
-0x306A	0x74E3	# <CJK>
-0x306B	0x534A	# <CJK>
-0x306C	0x529E	# <CJK>
-0x306D	0x7ECA	# <CJK>
-0x306E	0x90A6	# <CJK>
-0x306F	0x5E2E	# <CJK>
-0x3070	0x6886	# <CJK>
-0x3071	0x699C	# <CJK>
-0x3072	0x8180	# <CJK>
-0x3073	0x7ED1	# <CJK>
-0x3074	0x68D2	# <CJK>
-0x3075	0x78C5	# <CJK>
-0x3076	0x868C	# <CJK>
-0x3077	0x9551	# <CJK>
-0x3078	0x508D	# <CJK>
-0x3079	0x8C24	# <CJK>
-0x307A	0x82DE	# <CJK>
-0x307B	0x80DE	# <CJK>
-0x307C	0x5305	# <CJK>
-0x307D	0x8912	# <CJK>
-0x307E	0x5265	# <CJK>
-0x3121	0x8584	# <CJK>
-0x3122	0x96F9	# <CJK>
-0x3123	0x4FDD	# <CJK>
-0x3124	0x5821	# <CJK>
-0x3125	0x9971	# <CJK>
-0x3126	0x5B9D	# <CJK>
-0x3127	0x62B1	# <CJK>
-0x3128	0x62A5	# <CJK>
-0x3129	0x66B4	# <CJK>
-0x312A	0x8C79	# <CJK>
-0x312B	0x9C8D	# <CJK>
-0x312C	0x7206	# <CJK>
-0x312D	0x676F	# <CJK>
-0x312E	0x7891	# <CJK>
-0x312F	0x60B2	# <CJK>
-0x3130	0x5351	# <CJK>
-0x3131	0x5317	# <CJK>
-0x3132	0x8F88	# <CJK>
-0x3133	0x80CC	# <CJK>
-0x3134	0x8D1D	# <CJK>
-0x3135	0x94A1	# <CJK>
-0x3136	0x500D	# <CJK>
-0x3137	0x72C8	# <CJK>
-0x3138	0x5907	# <CJK>
-0x3139	0x60EB	# <CJK>
-0x313A	0x7119	# <CJK>
-0x313B	0x88AB	# <CJK>
-0x313C	0x5954	# <CJK>
-0x313D	0x82EF	# <CJK>
-0x313E	0x672C	# <CJK>
-0x313F	0x7B28	# <CJK>
-0x3140	0x5D29	# <CJK>
-0x3141	0x7EF7	# <CJK>
-0x3142	0x752D	# <CJK>
-0x3143	0x6CF5	# <CJK>
-0x3144	0x8E66	# <CJK>
-0x3145	0x8FF8	# <CJK>
-0x3146	0x903C	# <CJK>
-0x3147	0x9F3B	# <CJK>
-0x3148	0x6BD4	# <CJK>
-0x3149	0x9119	# <CJK>
-0x314A	0x7B14	# <CJK>
-0x314B	0x5F7C	# <CJK>
-0x314C	0x78A7	# <CJK>
-0x314D	0x84D6	# <CJK>
-0x314E	0x853D	# <CJK>
-0x314F	0x6BD5	# <CJK>
-0x3150	0x6BD9	# <CJK>
-0x3151	0x6BD6	# <CJK>
-0x3152	0x5E01	# <CJK>
-0x3153	0x5E87	# <CJK>
-0x3154	0x75F9	# <CJK>
-0x3155	0x95ED	# <CJK>
-0x3156	0x655D	# <CJK>
-0x3157	0x5F0A	# <CJK>
-0x3158	0x5FC5	# <CJK>
-0x3159	0x8F9F	# <CJK>
-0x315A	0x58C1	# <CJK>
-0x315B	0x81C2	# <CJK>
-0x315C	0x907F	# <CJK>
-0x315D	0x965B	# <CJK>
-0x315E	0x97AD	# <CJK>
-0x315F	0x8FB9	# <CJK>
-0x3160	0x7F16	# <CJK>
-0x3161	0x8D2C	# <CJK>
-0x3162	0x6241	# <CJK>
-0x3163	0x4FBF	# <CJK>
-0x3164	0x53D8	# <CJK>
-0x3165	0x535E	# <CJK>
-0x3166	0x8FA8	# <CJK>
-0x3167	0x8FA9	# <CJK>
-0x3168	0x8FAB	# <CJK>
-0x3169	0x904D	# <CJK>
-0x316A	0x6807	# <CJK>
-0x316B	0x5F6A	# <CJK>
-0x316C	0x8198	# <CJK>
-0x316D	0x8868	# <CJK>
-0x316E	0x9CD6	# <CJK>
-0x316F	0x618B	# <CJK>
-0x3170	0x522B	# <CJK>
-0x3171	0x762A	# <CJK>
-0x3172	0x5F6C	# <CJK>
-0x3173	0x658C	# <CJK>
-0x3174	0x6FD2	# <CJK>
-0x3175	0x6EE8	# <CJK>
-0x3176	0x5BBE	# <CJK>
-0x3177	0x6448	# <CJK>
-0x3178	0x5175	# <CJK>
-0x3179	0x51B0	# <CJK>
-0x317A	0x67C4	# <CJK>
-0x317B	0x4E19	# <CJK>
-0x317C	0x79C9	# <CJK>
-0x317D	0x997C	# <CJK>
-0x317E	0x70B3	# <CJK>
-0x3221	0x75C5	# <CJK>
-0x3222	0x5E76	# <CJK>
-0x3223	0x73BB	# <CJK>
-0x3224	0x83E0	# <CJK>
-0x3225	0x64AD	# <CJK>
-0x3226	0x62E8	# <CJK>
-0x3227	0x94B5	# <CJK>
-0x3228	0x6CE2	# <CJK>
-0x3229	0x535A	# <CJK>
-0x322A	0x52C3	# <CJK>
-0x322B	0x640F	# <CJK>
-0x322C	0x94C2	# <CJK>
-0x322D	0x7B94	# <CJK>
-0x322E	0x4F2F	# <CJK>
-0x322F	0x5E1B	# <CJK>
-0x3230	0x8236	# <CJK>
-0x3231	0x8116	# <CJK>
-0x3232	0x818A	# <CJK>
-0x3233	0x6E24	# <CJK>
-0x3234	0x6CCA	# <CJK>
-0x3235	0x9A73	# <CJK>
-0x3236	0x6355	# <CJK>
-0x3237	0x535C	# <CJK>
-0x3238	0x54FA	# <CJK>
-0x3239	0x8865	# <CJK>
-0x323A	0x57E0	# <CJK>
-0x323B	0x4E0D	# <CJK>
-0x323C	0x5E03	# <CJK>
-0x323D	0x6B65	# <CJK>
-0x323E	0x7C3F	# <CJK>
-0x323F	0x90E8	# <CJK>
-0x3240	0x6016	# <CJK>
-0x3241	0x64E6	# <CJK>
-0x3242	0x731C	# <CJK>
-0x3243	0x88C1	# <CJK>
-0x3244	0x6750	# <CJK>
-0x3245	0x624D	# <CJK>
-0x3246	0x8D22	# <CJK>
-0x3247	0x776C	# <CJK>
-0x3248	0x8E29	# <CJK>
-0x3249	0x91C7	# <CJK>
-0x324A	0x5F69	# <CJK>
-0x324B	0x83DC	# <CJK>
-0x324C	0x8521	# <CJK>
-0x324D	0x9910	# <CJK>
-0x324E	0x53C2	# <CJK>
-0x324F	0x8695	# <CJK>
-0x3250	0x6B8B	# <CJK>
-0x3251	0x60ED	# <CJK>
-0x3252	0x60E8	# <CJK>
-0x3253	0x707F	# <CJK>
-0x3254	0x82CD	# <CJK>
-0x3255	0x8231	# <CJK>
-0x3256	0x4ED3	# <CJK>
-0x3257	0x6CA7	# <CJK>
-0x3258	0x85CF	# <CJK>
-0x3259	0x64CD	# <CJK>
-0x325A	0x7CD9	# <CJK>
-0x325B	0x69FD	# <CJK>
-0x325C	0x66F9	# <CJK>
-0x325D	0x8349	# <CJK>
-0x325E	0x5395	# <CJK>
-0x325F	0x7B56	# <CJK>
-0x3260	0x4FA7	# <CJK>
-0x3261	0x518C	# <CJK>
-0x3262	0x6D4B	# <CJK>
-0x3263	0x5C42	# <CJK>
-0x3264	0x8E6D	# <CJK>
-0x3265	0x63D2	# <CJK>
-0x3266	0x53C9	# <CJK>
-0x3267	0x832C	# <CJK>
-0x3268	0x8336	# <CJK>
-0x3269	0x67E5	# <CJK>
-0x326A	0x78B4	# <CJK>
-0x326B	0x643D	# <CJK>
-0x326C	0x5BDF	# <CJK>
-0x326D	0x5C94	# <CJK>
-0x326E	0x5DEE	# <CJK>
-0x326F	0x8BE7	# <CJK>
-0x3270	0x62C6	# <CJK>
-0x3271	0x67F4	# <CJK>
-0x3272	0x8C7A	# <CJK>
-0x3273	0x6400	# <CJK>
-0x3274	0x63BA	# <CJK>
-0x3275	0x8749	# <CJK>
-0x3276	0x998B	# <CJK>
-0x3277	0x8C17	# <CJK>
-0x3278	0x7F20	# <CJK>
-0x3279	0x94F2	# <CJK>
-0x327A	0x4EA7	# <CJK>
-0x327B	0x9610	# <CJK>
-0x327C	0x98A4	# <CJK>
-0x327D	0x660C	# <CJK>
-0x327E	0x7316	# <CJK>
-0x3321	0x573A	# <CJK>
-0x3322	0x5C1D	# <CJK>
-0x3323	0x5E38	# <CJK>
-0x3324	0x957F	# <CJK>
-0x3325	0x507F	# <CJK>
-0x3326	0x80A0	# <CJK>
-0x3327	0x5382	# <CJK>
-0x3328	0x655E	# <CJK>
-0x3329	0x7545	# <CJK>
-0x332A	0x5531	# <CJK>
-0x332B	0x5021	# <CJK>
-0x332C	0x8D85	# <CJK>
-0x332D	0x6284	# <CJK>
-0x332E	0x949E	# <CJK>
-0x332F	0x671D	# <CJK>
-0x3330	0x5632	# <CJK>
-0x3331	0x6F6E	# <CJK>
-0x3332	0x5DE2	# <CJK>
-0x3333	0x5435	# <CJK>
-0x3334	0x7092	# <CJK>
-0x3335	0x8F66	# <CJK>
-0x3336	0x626F	# <CJK>
-0x3337	0x64A4	# <CJK>
-0x3338	0x63A3	# <CJK>
-0x3339	0x5F7B	# <CJK>
-0x333A	0x6F88	# <CJK>
-0x333B	0x90F4	# <CJK>
-0x333C	0x81E3	# <CJK>
-0x333D	0x8FB0	# <CJK>
-0x333E	0x5C18	# <CJK>
-0x333F	0x6668	# <CJK>
-0x3340	0x5FF1	# <CJK>
-0x3341	0x6C89	# <CJK>
-0x3342	0x9648	# <CJK>
-0x3343	0x8D81	# <CJK>
-0x3344	0x886C	# <CJK>
-0x3345	0x6491	# <CJK>
-0x3346	0x79F0	# <CJK>
-0x3347	0x57CE	# <CJK>
-0x3348	0x6A59	# <CJK>
-0x3349	0x6210	# <CJK>
-0x334A	0x5448	# <CJK>
-0x334B	0x4E58	# <CJK>
-0x334C	0x7A0B	# <CJK>
-0x334D	0x60E9	# <CJK>
-0x334E	0x6F84	# <CJK>
-0x334F	0x8BDA	# <CJK>
-0x3350	0x627F	# <CJK>
-0x3351	0x901E	# <CJK>
-0x3352	0x9A8B	# <CJK>
-0x3353	0x79E4	# <CJK>
-0x3354	0x5403	# <CJK>
-0x3355	0x75F4	# <CJK>
-0x3356	0x6301	# <CJK>
-0x3357	0x5319	# <CJK>
-0x3358	0x6C60	# <CJK>
-0x3359	0x8FDF	# <CJK>
-0x335A	0x5F1B	# <CJK>
-0x335B	0x9A70	# <CJK>
-0x335C	0x803B	# <CJK>
-0x335D	0x9F7F	# <CJK>
-0x335E	0x4F88	# <CJK>
-0x335F	0x5C3A	# <CJK>
-0x3360	0x8D64	# <CJK>
-0x3361	0x7FC5	# <CJK>
-0x3362	0x65A5	# <CJK>
-0x3363	0x70BD	# <CJK>
-0x3364	0x5145	# <CJK>
-0x3365	0x51B2	# <CJK>
-0x3366	0x866B	# <CJK>
-0x3367	0x5D07	# <CJK>
-0x3368	0x5BA0	# <CJK>
-0x3369	0x62BD	# <CJK>
-0x336A	0x916C	# <CJK>
-0x336B	0x7574	# <CJK>
-0x336C	0x8E0C	# <CJK>
-0x336D	0x7A20	# <CJK>
-0x336E	0x6101	# <CJK>
-0x336F	0x7B79	# <CJK>
-0x3370	0x4EC7	# <CJK>
-0x3371	0x7EF8	# <CJK>
-0x3372	0x7785	# <CJK>
-0x3373	0x4E11	# <CJK>
-0x3374	0x81ED	# <CJK>
-0x3375	0x521D	# <CJK>
-0x3376	0x51FA	# <CJK>
-0x3377	0x6A71	# <CJK>
-0x3378	0x53A8	# <CJK>
-0x3379	0x8E87	# <CJK>
-0x337A	0x9504	# <CJK>
-0x337B	0x96CF	# <CJK>
-0x337C	0x6EC1	# <CJK>
-0x337D	0x9664	# <CJK>
-0x337E	0x695A	# <CJK>
-0x3421	0x7840	# <CJK>
-0x3422	0x50A8	# <CJK>
-0x3423	0x77D7	# <CJK>
-0x3424	0x6410	# <CJK>
-0x3425	0x89E6	# <CJK>
-0x3426	0x5904	# <CJK>
-0x3427	0x63E3	# <CJK>
-0x3428	0x5DDD	# <CJK>
-0x3429	0x7A7F	# <CJK>
-0x342A	0x693D	# <CJK>
-0x342B	0x4F20	# <CJK>
-0x342C	0x8239	# <CJK>
-0x342D	0x5598	# <CJK>
-0x342E	0x4E32	# <CJK>
-0x342F	0x75AE	# <CJK>
-0x3430	0x7A97	# <CJK>
-0x3431	0x5E62	# <CJK>
-0x3432	0x5E8A	# <CJK>
-0x3433	0x95EF	# <CJK>
-0x3434	0x521B	# <CJK>
-0x3435	0x5439	# <CJK>
-0x3436	0x708A	# <CJK>
-0x3437	0x6376	# <CJK>
-0x3438	0x9524	# <CJK>
-0x3439	0x5782	# <CJK>
-0x343A	0x6625	# <CJK>
-0x343B	0x693F	# <CJK>
-0x343C	0x9187	# <CJK>
-0x343D	0x5507	# <CJK>
-0x343E	0x6DF3	# <CJK>
-0x343F	0x7EAF	# <CJK>
-0x3440	0x8822	# <CJK>
-0x3441	0x6233	# <CJK>
-0x3442	0x7EF0	# <CJK>
-0x3443	0x75B5	# <CJK>
-0x3444	0x8328	# <CJK>
-0x3445	0x78C1	# <CJK>
-0x3446	0x96CC	# <CJK>
-0x3447	0x8F9E	# <CJK>
-0x3448	0x6148	# <CJK>
-0x3449	0x74F7	# <CJK>
-0x344A	0x8BCD	# <CJK>
-0x344B	0x6B64	# <CJK>
-0x344C	0x523A	# <CJK>
-0x344D	0x8D50	# <CJK>
-0x344E	0x6B21	# <CJK>
-0x344F	0x806A	# <CJK>
-0x3450	0x8471	# <CJK>
-0x3451	0x56F1	# <CJK>
-0x3452	0x5306	# <CJK>
-0x3453	0x4ECE	# <CJK>
-0x3454	0x4E1B	# <CJK>
-0x3455	0x51D1	# <CJK>
-0x3456	0x7C97	# <CJK>
-0x3457	0x918B	# <CJK>
-0x3458	0x7C07	# <CJK>
-0x3459	0x4FC3	# <CJK>
-0x345A	0x8E7F	# <CJK>
-0x345B	0x7BE1	# <CJK>
-0x345C	0x7A9C	# <CJK>
-0x345D	0x6467	# <CJK>
-0x345E	0x5D14	# <CJK>
-0x345F	0x50AC	# <CJK>
-0x3460	0x8106	# <CJK>
-0x3461	0x7601	# <CJK>
-0x3462	0x7CB9	# <CJK>
-0x3463	0x6DEC	# <CJK>
-0x3464	0x7FE0	# <CJK>
-0x3465	0x6751	# <CJK>
-0x3466	0x5B58	# <CJK>
-0x3467	0x5BF8	# <CJK>
-0x3468	0x78CB	# <CJK>
-0x3469	0x64AE	# <CJK>
-0x346A	0x6413	# <CJK>
-0x346B	0x63AA	# <CJK>
-0x346C	0x632B	# <CJK>
-0x346D	0x9519	# <CJK>
-0x346E	0x642D	# <CJK>
-0x346F	0x8FBE	# <CJK>
-0x3470	0x7B54	# <CJK>
-0x3471	0x7629	# <CJK>
-0x3472	0x6253	# <CJK>
-0x3473	0x5927	# <CJK>
-0x3474	0x5446	# <CJK>
-0x3475	0x6B79	# <CJK>
-0x3476	0x50A3	# <CJK>
-0x3477	0x6234	# <CJK>
-0x3478	0x5E26	# <CJK>
-0x3479	0x6B86	# <CJK>
-0x347A	0x4EE3	# <CJK>
-0x347B	0x8D37	# <CJK>
-0x347C	0x888B	# <CJK>
-0x347D	0x5F85	# <CJK>
-0x347E	0x902E	# <CJK>
-0x3521	0x6020	# <CJK>
-0x3522	0x803D	# <CJK>
-0x3523	0x62C5	# <CJK>
-0x3524	0x4E39	# <CJK>
-0x3525	0x5355	# <CJK>
-0x3526	0x90F8	# <CJK>
-0x3527	0x63B8	# <CJK>
-0x3528	0x80C6	# <CJK>
-0x3529	0x65E6	# <CJK>
-0x352A	0x6C2E	# <CJK>
-0x352B	0x4F46	# <CJK>
-0x352C	0x60EE	# <CJK>
-0x352D	0x6DE1	# <CJK>
-0x352E	0x8BDE	# <CJK>
-0x352F	0x5F39	# <CJK>
-0x3530	0x86CB	# <CJK>
-0x3531	0x5F53	# <CJK>
-0x3532	0x6321	# <CJK>
-0x3533	0x515A	# <CJK>
-0x3534	0x8361	# <CJK>
-0x3535	0x6863	# <CJK>
-0x3536	0x5200	# <CJK>
-0x3537	0x6363	# <CJK>
-0x3538	0x8E48	# <CJK>
-0x3539	0x5012	# <CJK>
-0x353A	0x5C9B	# <CJK>
-0x353B	0x7977	# <CJK>
-0x353C	0x5BFC	# <CJK>
-0x353D	0x5230	# <CJK>
-0x353E	0x7A3B	# <CJK>
-0x353F	0x60BC	# <CJK>
-0x3540	0x9053	# <CJK>
-0x3541	0x76D7	# <CJK>
-0x3542	0x5FB7	# <CJK>
-0x3543	0x5F97	# <CJK>
-0x3544	0x7684	# <CJK>
-0x3545	0x8E6C	# <CJK>
-0x3546	0x706F	# <CJK>
-0x3547	0x767B	# <CJK>
-0x3548	0x7B49	# <CJK>
-0x3549	0x77AA	# <CJK>
-0x354A	0x51F3	# <CJK>
-0x354B	0x9093	# <CJK>
-0x354C	0x5824	# <CJK>
-0x354D	0x4F4E	# <CJK>
-0x354E	0x6EF4	# <CJK>
-0x354F	0x8FEA	# <CJK>
-0x3550	0x654C	# <CJK>
-0x3551	0x7B1B	# <CJK>
-0x3552	0x72C4	# <CJK>
-0x3553	0x6DA4	# <CJK>
-0x3554	0x7FDF	# <CJK>
-0x3555	0x5AE1	# <CJK>
-0x3556	0x62B5	# <CJK>
-0x3557	0x5E95	# <CJK>
-0x3558	0x5730	# <CJK>
-0x3559	0x8482	# <CJK>
-0x355A	0x7B2C	# <CJK>
-0x355B	0x5E1D	# <CJK>
-0x355C	0x5F1F	# <CJK>
-0x355D	0x9012	# <CJK>
-0x355E	0x7F14	# <CJK>
-0x355F	0x98A0	# <CJK>
-0x3560	0x6382	# <CJK>
-0x3561	0x6EC7	# <CJK>
-0x3562	0x7898	# <CJK>
-0x3563	0x70B9	# <CJK>
-0x3564	0x5178	# <CJK>
-0x3565	0x975B	# <CJK>
-0x3566	0x57AB	# <CJK>
-0x3567	0x7535	# <CJK>
-0x3568	0x4F43	# <CJK>
-0x3569	0x7538	# <CJK>
-0x356A	0x5E97	# <CJK>
-0x356B	0x60E6	# <CJK>
-0x356C	0x5960	# <CJK>
-0x356D	0x6DC0	# <CJK>
-0x356E	0x6BBF	# <CJK>
-0x356F	0x7889	# <CJK>
-0x3570	0x53FC	# <CJK>
-0x3571	0x96D5	# <CJK>
-0x3572	0x51CB	# <CJK>
-0x3573	0x5201	# <CJK>
-0x3574	0x6389	# <CJK>
-0x3575	0x540A	# <CJK>
-0x3576	0x9493	# <CJK>
-0x3577	0x8C03	# <CJK>
-0x3578	0x8DCC	# <CJK>
-0x3579	0x7239	# <CJK>
-0x357A	0x789F	# <CJK>
-0x357B	0x8776	# <CJK>
-0x357C	0x8FED	# <CJK>
-0x357D	0x8C0D	# <CJK>
-0x357E	0x53E0	# <CJK>
-0x3621	0x4E01	# <CJK>
-0x3622	0x76EF	# <CJK>
-0x3623	0x53EE	# <CJK>
-0x3624	0x9489	# <CJK>
-0x3625	0x9876	# <CJK>
-0x3626	0x9F0E	# <CJK>
-0x3627	0x952D	# <CJK>
-0x3628	0x5B9A	# <CJK>
-0x3629	0x8BA2	# <CJK>
-0x362A	0x4E22	# <CJK>
-0x362B	0x4E1C	# <CJK>
-0x362C	0x51AC	# <CJK>
-0x362D	0x8463	# <CJK>
-0x362E	0x61C2	# <CJK>
-0x362F	0x52A8	# <CJK>
-0x3630	0x680B	# <CJK>
-0x3631	0x4F97	# <CJK>
-0x3632	0x606B	# <CJK>
-0x3633	0x51BB	# <CJK>
-0x3634	0x6D1E	# <CJK>
-0x3635	0x515C	# <CJK>
-0x3636	0x6296	# <CJK>
-0x3637	0x6597	# <CJK>
-0x3638	0x9661	# <CJK>
-0x3639	0x8C46	# <CJK>
-0x363A	0x9017	# <CJK>
-0x363B	0x75D8	# <CJK>
-0x363C	0x90FD	# <CJK>
-0x363D	0x7763	# <CJK>
-0x363E	0x6BD2	# <CJK>
-0x363F	0x728A	# <CJK>
-0x3640	0x72EC	# <CJK>
-0x3641	0x8BFB	# <CJK>
-0x3642	0x5835	# <CJK>
-0x3643	0x7779	# <CJK>
-0x3644	0x8D4C	# <CJK>
-0x3645	0x675C	# <CJK>
-0x3646	0x9540	# <CJK>
-0x3647	0x809A	# <CJK>
-0x3648	0x5EA6	# <CJK>
-0x3649	0x6E21	# <CJK>
-0x364A	0x5992	# <CJK>
-0x364B	0x7AEF	# <CJK>
-0x364C	0x77ED	# <CJK>
-0x364D	0x953B	# <CJK>
-0x364E	0x6BB5	# <CJK>
-0x364F	0x65AD	# <CJK>
-0x3650	0x7F0E	# <CJK>
-0x3651	0x5806	# <CJK>
-0x3652	0x5151	# <CJK>
-0x3653	0x961F	# <CJK>
-0x3654	0x5BF9	# <CJK>
-0x3655	0x58A9	# <CJK>
-0x3656	0x5428	# <CJK>
-0x3657	0x8E72	# <CJK>
-0x3658	0x6566	# <CJK>
-0x3659	0x987F	# <CJK>
-0x365A	0x56E4	# <CJK>
-0x365B	0x949D	# <CJK>
-0x365C	0x76FE	# <CJK>
-0x365D	0x9041	# <CJK>
-0x365E	0x6387	# <CJK>
-0x365F	0x54C6	# <CJK>
-0x3660	0x591A	# <CJK>
-0x3661	0x593A	# <CJK>
-0x3662	0x579B	# <CJK>
-0x3663	0x8EB2	# <CJK>
-0x3664	0x6735	# <CJK>
-0x3665	0x8DFA	# <CJK>
-0x3666	0x8235	# <CJK>
-0x3667	0x5241	# <CJK>
-0x3668	0x60F0	# <CJK>
-0x3669	0x5815	# <CJK>
-0x366A	0x86FE	# <CJK>
-0x366B	0x5CE8	# <CJK>
-0x366C	0x9E45	# <CJK>
-0x366D	0x4FC4	# <CJK>
-0x366E	0x989D	# <CJK>
-0x366F	0x8BB9	# <CJK>
-0x3670	0x5A25	# <CJK>
-0x3671	0x6076	# <CJK>
-0x3672	0x5384	# <CJK>
-0x3673	0x627C	# <CJK>
-0x3674	0x904F	# <CJK>
-0x3675	0x9102	# <CJK>
-0x3676	0x997F	# <CJK>
-0x3677	0x6069	# <CJK>
-0x3678	0x800C	# <CJK>
-0x3679	0x513F	# <CJK>
-0x367A	0x8033	# <CJK>
-0x367B	0x5C14	# <CJK>
-0x367C	0x9975	# <CJK>
-0x367D	0x6D31	# <CJK>
-0x367E	0x4E8C	# <CJK>
-0x3721	0x8D30	# <CJK>
-0x3722	0x53D1	# <CJK>
-0x3723	0x7F5A	# <CJK>
-0x3724	0x7B4F	# <CJK>
-0x3725	0x4F10	# <CJK>
-0x3726	0x4E4F	# <CJK>
-0x3727	0x9600	# <CJK>
-0x3728	0x6CD5	# <CJK>
-0x3729	0x73D0	# <CJK>
-0x372A	0x85E9	# <CJK>
-0x372B	0x5E06	# <CJK>
-0x372C	0x756A	# <CJK>
-0x372D	0x7FFB	# <CJK>
-0x372E	0x6A0A	# <CJK>
-0x372F	0x77FE	# <CJK>
-0x3730	0x9492	# <CJK>
-0x3731	0x7E41	# <CJK>
-0x3732	0x51E1	# <CJK>
-0x3733	0x70E6	# <CJK>
-0x3734	0x53CD	# <CJK>
-0x3735	0x8FD4	# <CJK>
-0x3736	0x8303	# <CJK>
-0x3737	0x8D29	# <CJK>
-0x3738	0x72AF	# <CJK>
-0x3739	0x996D	# <CJK>
-0x373A	0x6CDB	# <CJK>
-0x373B	0x574A	# <CJK>
-0x373C	0x82B3	# <CJK>
-0x373D	0x65B9	# <CJK>
-0x373E	0x80AA	# <CJK>
-0x373F	0x623F	# <CJK>
-0x3740	0x9632	# <CJK>
-0x3741	0x59A8	# <CJK>
-0x3742	0x4EFF	# <CJK>
-0x3743	0x8BBF	# <CJK>
-0x3744	0x7EBA	# <CJK>
-0x3745	0x653E	# <CJK>
-0x3746	0x83F2	# <CJK>
-0x3747	0x975E	# <CJK>
-0x3748	0x5561	# <CJK>
-0x3749	0x98DE	# <CJK>
-0x374A	0x80A5	# <CJK>
-0x374B	0x532A	# <CJK>
-0x374C	0x8BFD	# <CJK>
-0x374D	0x5420	# <CJK>
-0x374E	0x80BA	# <CJK>
-0x374F	0x5E9F	# <CJK>
-0x3750	0x6CB8	# <CJK>
-0x3751	0x8D39	# <CJK>
-0x3752	0x82AC	# <CJK>
-0x3753	0x915A	# <CJK>
-0x3754	0x5429	# <CJK>
-0x3755	0x6C1B	# <CJK>
-0x3756	0x5206	# <CJK>
-0x3757	0x7EB7	# <CJK>
-0x3758	0x575F	# <CJK>
-0x3759	0x711A	# <CJK>
-0x375A	0x6C7E	# <CJK>
-0x375B	0x7C89	# <CJK>
-0x375C	0x594B	# <CJK>
-0x375D	0x4EFD	# <CJK>
-0x375E	0x5FFF	# <CJK>
-0x375F	0x6124	# <CJK>
-0x3760	0x7CAA	# <CJK>
-0x3761	0x4E30	# <CJK>
-0x3762	0x5C01	# <CJK>
-0x3763	0x67AB	# <CJK>
-0x3764	0x8702	# <CJK>
-0x3765	0x5CF0	# <CJK>
-0x3766	0x950B	# <CJK>
-0x3767	0x98CE	# <CJK>
-0x3768	0x75AF	# <CJK>
-0x3769	0x70FD	# <CJK>
-0x376A	0x9022	# <CJK>
-0x376B	0x51AF	# <CJK>
-0x376C	0x7F1D	# <CJK>
-0x376D	0x8BBD	# <CJK>
-0x376E	0x5949	# <CJK>
-0x376F	0x51E4	# <CJK>
-0x3770	0x4F5B	# <CJK>
-0x3771	0x5426	# <CJK>
-0x3772	0x592B	# <CJK>
-0x3773	0x6577	# <CJK>
-0x3774	0x80A4	# <CJK>
-0x3775	0x5B75	# <CJK>
-0x3776	0x6276	# <CJK>
-0x3777	0x62C2	# <CJK>
-0x3778	0x8F90	# <CJK>
-0x3779	0x5E45	# <CJK>
-0x377A	0x6C1F	# <CJK>
-0x377B	0x7B26	# <CJK>
-0x377C	0x4F0F	# <CJK>
-0x377D	0x4FD8	# <CJK>
-0x377E	0x670D	# <CJK>
-0x3821	0x6D6E	# <CJK>
-0x3822	0x6DAA	# <CJK>
-0x3823	0x798F	# <CJK>
-0x3824	0x88B1	# <CJK>
-0x3825	0x5F17	# <CJK>
-0x3826	0x752B	# <CJK>
-0x3827	0x629A	# <CJK>
-0x3828	0x8F85	# <CJK>
-0x3829	0x4FEF	# <CJK>
-0x382A	0x91DC	# <CJK>
-0x382B	0x65A7	# <CJK>
-0x382C	0x812F	# <CJK>
-0x382D	0x8151	# <CJK>
-0x382E	0x5E9C	# <CJK>
-0x382F	0x8150	# <CJK>
-0x3830	0x8D74	# <CJK>
-0x3831	0x526F	# <CJK>
-0x3832	0x8986	# <CJK>
-0x3833	0x8D4B	# <CJK>
-0x3834	0x590D	# <CJK>
-0x3835	0x5085	# <CJK>
-0x3836	0x4ED8	# <CJK>
-0x3837	0x961C	# <CJK>
-0x3838	0x7236	# <CJK>
-0x3839	0x8179	# <CJK>
-0x383A	0x8D1F	# <CJK>
-0x383B	0x5BCC	# <CJK>
-0x383C	0x8BA3	# <CJK>
-0x383D	0x9644	# <CJK>
-0x383E	0x5987	# <CJK>
-0x383F	0x7F1A	# <CJK>
-0x3840	0x5490	# <CJK>
-0x3841	0x5676	# <CJK>
-0x3842	0x560E	# <CJK>
-0x3843	0x8BE5	# <CJK>
-0x3844	0x6539	# <CJK>
-0x3845	0x6982	# <CJK>
-0x3846	0x9499	# <CJK>
-0x3847	0x76D6	# <CJK>
-0x3848	0x6E89	# <CJK>
-0x3849	0x5E72	# <CJK>
-0x384A	0x7518	# <CJK>
-0x384B	0x6746	# <CJK>
-0x384C	0x67D1	# <CJK>
-0x384D	0x7AFF	# <CJK>
-0x384E	0x809D	# <CJK>
-0x384F	0x8D76	# <CJK>
-0x3850	0x611F	# <CJK>
-0x3851	0x79C6	# <CJK>
-0x3852	0x6562	# <CJK>
-0x3853	0x8D63	# <CJK>
-0x3854	0x5188	# <CJK>
-0x3855	0x521A	# <CJK>
-0x3856	0x94A2	# <CJK>
-0x3857	0x7F38	# <CJK>
-0x3858	0x809B	# <CJK>
-0x3859	0x7EB2	# <CJK>
-0x385A	0x5C97	# <CJK>
-0x385B	0x6E2F	# <CJK>
-0x385C	0x6760	# <CJK>
-0x385D	0x7BD9	# <CJK>
-0x385E	0x768B	# <CJK>
-0x385F	0x9AD8	# <CJK>
-0x3860	0x818F	# <CJK>
-0x3861	0x7F94	# <CJK>
-0x3862	0x7CD5	# <CJK>
-0x3863	0x641E	# <CJK>
-0x3864	0x9550	# <CJK>
-0x3865	0x7A3F	# <CJK>
-0x3866	0x544A	# <CJK>
-0x3867	0x54E5	# <CJK>
-0x3868	0x6B4C	# <CJK>
-0x3869	0x6401	# <CJK>
-0x386A	0x6208	# <CJK>
-0x386B	0x9E3D	# <CJK>
-0x386C	0x80F3	# <CJK>
-0x386D	0x7599	# <CJK>
-0x386E	0x5272	# <CJK>
-0x386F	0x9769	# <CJK>
-0x3870	0x845B	# <CJK>
-0x3871	0x683C	# <CJK>
-0x3872	0x86E4	# <CJK>
-0x3873	0x9601	# <CJK>
-0x3874	0x9694	# <CJK>
-0x3875	0x94EC	# <CJK>
-0x3876	0x4E2A	# <CJK>
-0x3877	0x5404	# <CJK>
-0x3878	0x7ED9	# <CJK>
-0x3879	0x6839	# <CJK>
-0x387A	0x8DDF	# <CJK>
-0x387B	0x8015	# <CJK>
-0x387C	0x66F4	# <CJK>
-0x387D	0x5E9A	# <CJK>
-0x387E	0x7FB9	# <CJK>
-0x3921	0x57C2	# <CJK>
-0x3922	0x803F	# <CJK>
-0x3923	0x6897	# <CJK>
-0x3924	0x5DE5	# <CJK>
-0x3925	0x653B	# <CJK>
-0x3926	0x529F	# <CJK>
-0x3927	0x606D	# <CJK>
-0x3928	0x9F9A	# <CJK>
-0x3929	0x4F9B	# <CJK>
-0x392A	0x8EAC	# <CJK>
-0x392B	0x516C	# <CJK>
-0x392C	0x5BAB	# <CJK>
-0x392D	0x5F13	# <CJK>
-0x392E	0x5DE9	# <CJK>
-0x392F	0x6C5E	# <CJK>
-0x3930	0x62F1	# <CJK>
-0x3931	0x8D21	# <CJK>
-0x3932	0x5171	# <CJK>
-0x3933	0x94A9	# <CJK>
-0x3934	0x52FE	# <CJK>
-0x3935	0x6C9F	# <CJK>
-0x3936	0x82DF	# <CJK>
-0x3937	0x72D7	# <CJK>
-0x3938	0x57A2	# <CJK>
-0x3939	0x6784	# <CJK>
-0x393A	0x8D2D	# <CJK>
-0x393B	0x591F	# <CJK>
-0x393C	0x8F9C	# <CJK>
-0x393D	0x83C7	# <CJK>
-0x393E	0x5495	# <CJK>
-0x393F	0x7B8D	# <CJK>
-0x3940	0x4F30	# <CJK>
-0x3941	0x6CBD	# <CJK>
-0x3942	0x5B64	# <CJK>
-0x3943	0x59D1	# <CJK>
-0x3944	0x9F13	# <CJK>
-0x3945	0x53E4	# <CJK>
-0x3946	0x86CA	# <CJK>
-0x3947	0x9AA8	# <CJK>
-0x3948	0x8C37	# <CJK>
-0x3949	0x80A1	# <CJK>
-0x394A	0x6545	# <CJK>
-0x394B	0x987E	# <CJK>
-0x394C	0x56FA	# <CJK>
-0x394D	0x96C7	# <CJK>
-0x394E	0x522E	# <CJK>
-0x394F	0x74DC	# <CJK>
-0x3950	0x5250	# <CJK>
-0x3951	0x5BE1	# <CJK>
-0x3952	0x6302	# <CJK>
-0x3953	0x8902	# <CJK>
-0x3954	0x4E56	# <CJK>
-0x3955	0x62D0	# <CJK>
-0x3956	0x602A	# <CJK>
-0x3957	0x68FA	# <CJK>
-0x3958	0x5173	# <CJK>
-0x3959	0x5B98	# <CJK>
-0x395A	0x51A0	# <CJK>
-0x395B	0x89C2	# <CJK>
-0x395C	0x7BA1	# <CJK>
-0x395D	0x9986	# <CJK>
-0x395E	0x7F50	# <CJK>
-0x395F	0x60EF	# <CJK>
-0x3960	0x704C	# <CJK>
-0x3961	0x8D2F	# <CJK>
-0x3962	0x5149	# <CJK>
-0x3963	0x5E7F	# <CJK>
-0x3964	0x901B	# <CJK>
-0x3965	0x7470	# <CJK>
-0x3966	0x89C4	# <CJK>
-0x3967	0x572D	# <CJK>
-0x3968	0x7845	# <CJK>
-0x3969	0x5F52	# <CJK>
-0x396A	0x9F9F	# <CJK>
-0x396B	0x95FA	# <CJK>
-0x396C	0x8F68	# <CJK>
-0x396D	0x9B3C	# <CJK>
-0x396E	0x8BE1	# <CJK>
-0x396F	0x7678	# <CJK>
-0x3970	0x6842	# <CJK>
-0x3971	0x67DC	# <CJK>
-0x3972	0x8DEA	# <CJK>
-0x3973	0x8D35	# <CJK>
-0x3974	0x523D	# <CJK>
-0x3975	0x8F8A	# <CJK>
-0x3976	0x6EDA	# <CJK>
-0x3977	0x68CD	# <CJK>
-0x3978	0x9505	# <CJK>
-0x3979	0x90ED	# <CJK>
-0x397A	0x56FD	# <CJK>
-0x397B	0x679C	# <CJK>
-0x397C	0x88F9	# <CJK>
-0x397D	0x8FC7	# <CJK>
-0x397E	0x54C8	# <CJK>
-0x3A21	0x9AB8	# <CJK>
-0x3A22	0x5B69	# <CJK>
-0x3A23	0x6D77	# <CJK>
-0x3A24	0x6C26	# <CJK>
-0x3A25	0x4EA5	# <CJK>
-0x3A26	0x5BB3	# <CJK>
-0x3A27	0x9A87	# <CJK>
-0x3A28	0x9163	# <CJK>
-0x3A29	0x61A8	# <CJK>
-0x3A2A	0x90AF	# <CJK>
-0x3A2B	0x97E9	# <CJK>
-0x3A2C	0x542B	# <CJK>
-0x3A2D	0x6DB5	# <CJK>
-0x3A2E	0x5BD2	# <CJK>
-0x3A2F	0x51FD	# <CJK>
-0x3A30	0x558A	# <CJK>
-0x3A31	0x7F55	# <CJK>
-0x3A32	0x7FF0	# <CJK>
-0x3A33	0x64BC	# <CJK>
-0x3A34	0x634D	# <CJK>
-0x3A35	0x65F1	# <CJK>
-0x3A36	0x61BE	# <CJK>
-0x3A37	0x608D	# <CJK>
-0x3A38	0x710A	# <CJK>
-0x3A39	0x6C57	# <CJK>
-0x3A3A	0x6C49	# <CJK>
-0x3A3B	0x592F	# <CJK>
-0x3A3C	0x676D	# <CJK>
-0x3A3D	0x822A	# <CJK>
-0x3A3E	0x58D5	# <CJK>
-0x3A3F	0x568E	# <CJK>
-0x3A40	0x8C6A	# <CJK>
-0x3A41	0x6BEB	# <CJK>
-0x3A42	0x90DD	# <CJK>
-0x3A43	0x597D	# <CJK>
-0x3A44	0x8017	# <CJK>
-0x3A45	0x53F7	# <CJK>
-0x3A46	0x6D69	# <CJK>
-0x3A47	0x5475	# <CJK>
-0x3A48	0x559D	# <CJK>
-0x3A49	0x8377	# <CJK>
-0x3A4A	0x83CF	# <CJK>
-0x3A4B	0x6838	# <CJK>
-0x3A4C	0x79BE	# <CJK>
-0x3A4D	0x548C	# <CJK>
-0x3A4E	0x4F55	# <CJK>
-0x3A4F	0x5408	# <CJK>
-0x3A50	0x76D2	# <CJK>
-0x3A51	0x8C89	# <CJK>
-0x3A52	0x9602	# <CJK>
-0x3A53	0x6CB3	# <CJK>
-0x3A54	0x6DB8	# <CJK>
-0x3A55	0x8D6B	# <CJK>
-0x3A56	0x8910	# <CJK>
-0x3A57	0x9E64	# <CJK>
-0x3A58	0x8D3A	# <CJK>
-0x3A59	0x563F	# <CJK>
-0x3A5A	0x9ED1	# <CJK>
-0x3A5B	0x75D5	# <CJK>
-0x3A5C	0x5F88	# <CJK>
-0x3A5D	0x72E0	# <CJK>
-0x3A5E	0x6068	# <CJK>
-0x3A5F	0x54FC	# <CJK>
-0x3A60	0x4EA8	# <CJK>
-0x3A61	0x6A2A	# <CJK>
-0x3A62	0x8861	# <CJK>
-0x3A63	0x6052	# <CJK>
-0x3A64	0x8F70	# <CJK>
-0x3A65	0x54C4	# <CJK>
-0x3A66	0x70D8	# <CJK>
-0x3A67	0x8679	# <CJK>
-0x3A68	0x9E3F	# <CJK>
-0x3A69	0x6D2A	# <CJK>
-0x3A6A	0x5B8F	# <CJK>
-0x3A6B	0x5F18	# <CJK>
-0x3A6C	0x7EA2	# <CJK>
-0x3A6D	0x5589	# <CJK>
-0x3A6E	0x4FAF	# <CJK>
-0x3A6F	0x7334	# <CJK>
-0x3A70	0x543C	# <CJK>
-0x3A71	0x539A	# <CJK>
-0x3A72	0x5019	# <CJK>
-0x3A73	0x540E	# <CJK>
-0x3A74	0x547C	# <CJK>
-0x3A75	0x4E4E	# <CJK>
-0x3A76	0x5FFD	# <CJK>
-0x3A77	0x745A	# <CJK>
-0x3A78	0x58F6	# <CJK>
-0x3A79	0x846B	# <CJK>
-0x3A7A	0x80E1	# <CJK>
-0x3A7B	0x8774	# <CJK>
-0x3A7C	0x72D0	# <CJK>
-0x3A7D	0x7CCA	# <CJK>
-0x3A7E	0x6E56	# <CJK>
-0x3B21	0x5F27	# <CJK>
-0x3B22	0x864E	# <CJK>
-0x3B23	0x552C	# <CJK>
-0x3B24	0x62A4	# <CJK>
-0x3B25	0x4E92	# <CJK>
-0x3B26	0x6CAA	# <CJK>
-0x3B27	0x6237	# <CJK>
-0x3B28	0x82B1	# <CJK>
-0x3B29	0x54D7	# <CJK>
-0x3B2A	0x534E	# <CJK>
-0x3B2B	0x733E	# <CJK>
-0x3B2C	0x6ED1	# <CJK>
-0x3B2D	0x753B	# <CJK>
-0x3B2E	0x5212	# <CJK>
-0x3B2F	0x5316	# <CJK>
-0x3B30	0x8BDD	# <CJK>
-0x3B31	0x69D0	# <CJK>
-0x3B32	0x5F8A	# <CJK>
-0x3B33	0x6000	# <CJK>
-0x3B34	0x6DEE	# <CJK>
-0x3B35	0x574F	# <CJK>
-0x3B36	0x6B22	# <CJK>
-0x3B37	0x73AF	# <CJK>
-0x3B38	0x6853	# <CJK>
-0x3B39	0x8FD8	# <CJK>
-0x3B3A	0x7F13	# <CJK>
-0x3B3B	0x6362	# <CJK>
-0x3B3C	0x60A3	# <CJK>
-0x3B3D	0x5524	# <CJK>
-0x3B3E	0x75EA	# <CJK>
-0x3B3F	0x8C62	# <CJK>
-0x3B40	0x7115	# <CJK>
-0x3B41	0x6DA3	# <CJK>
-0x3B42	0x5BA6	# <CJK>
-0x3B43	0x5E7B	# <CJK>
-0x3B44	0x8352	# <CJK>
-0x3B45	0x614C	# <CJK>
-0x3B46	0x9EC4	# <CJK>
-0x3B47	0x78FA	# <CJK>
-0x3B48	0x8757	# <CJK>
-0x3B49	0x7C27	# <CJK>
-0x3B4A	0x7687	# <CJK>
-0x3B4B	0x51F0	# <CJK>
-0x3B4C	0x60F6	# <CJK>
-0x3B4D	0x714C	# <CJK>
-0x3B4E	0x6643	# <CJK>
-0x3B4F	0x5E4C	# <CJK>
-0x3B50	0x604D	# <CJK>
-0x3B51	0x8C0E	# <CJK>
-0x3B52	0x7070	# <CJK>
-0x3B53	0x6325	# <CJK>
-0x3B54	0x8F89	# <CJK>
-0x3B55	0x5FBD	# <CJK>
-0x3B56	0x6062	# <CJK>
-0x3B57	0x86D4	# <CJK>
-0x3B58	0x56DE	# <CJK>
-0x3B59	0x6BC1	# <CJK>
-0x3B5A	0x6094	# <CJK>
-0x3B5B	0x6167	# <CJK>
-0x3B5C	0x5349	# <CJK>
-0x3B5D	0x60E0	# <CJK>
-0x3B5E	0x6666	# <CJK>
-0x3B5F	0x8D3F	# <CJK>
-0x3B60	0x79FD	# <CJK>
-0x3B61	0x4F1A	# <CJK>
-0x3B62	0x70E9	# <CJK>
-0x3B63	0x6C47	# <CJK>
-0x3B64	0x8BB3	# <CJK>
-0x3B65	0x8BF2	# <CJK>
-0x3B66	0x7ED8	# <CJK>
-0x3B67	0x8364	# <CJK>
-0x3B68	0x660F	# <CJK>
-0x3B69	0x5A5A	# <CJK>
-0x3B6A	0x9B42	# <CJK>
-0x3B6B	0x6D51	# <CJK>
-0x3B6C	0x6DF7	# <CJK>
-0x3B6D	0x8C41	# <CJK>
-0x3B6E	0x6D3B	# <CJK>
-0x3B6F	0x4F19	# <CJK>
-0x3B70	0x706B	# <CJK>
-0x3B71	0x83B7	# <CJK>
-0x3B72	0x6216	# <CJK>
-0x3B73	0x60D1	# <CJK>
-0x3B74	0x970D	# <CJK>
-0x3B75	0x8D27	# <CJK>
-0x3B76	0x7978	# <CJK>
-0x3B77	0x51FB	# <CJK>
-0x3B78	0x573E	# <CJK>
-0x3B79	0x57FA	# <CJK>
-0x3B7A	0x673A	# <CJK>
-0x3B7B	0x7578	# <CJK>
-0x3B7C	0x7A3D	# <CJK>
-0x3B7D	0x79EF	# <CJK>
-0x3B7E	0x7B95	# <CJK>
-0x3C21	0x808C	# <CJK>
-0x3C22	0x9965	# <CJK>
-0x3C23	0x8FF9	# <CJK>
-0x3C24	0x6FC0	# <CJK>
-0x3C25	0x8BA5	# <CJK>
-0x3C26	0x9E21	# <CJK>
-0x3C27	0x59EC	# <CJK>
-0x3C28	0x7EE9	# <CJK>
-0x3C29	0x7F09	# <CJK>
-0x3C2A	0x5409	# <CJK>
-0x3C2B	0x6781	# <CJK>
-0x3C2C	0x68D8	# <CJK>
-0x3C2D	0x8F91	# <CJK>
-0x3C2E	0x7C4D	# <CJK>
-0x3C2F	0x96C6	# <CJK>
-0x3C30	0x53CA	# <CJK>
-0x3C31	0x6025	# <CJK>
-0x3C32	0x75BE	# <CJK>
-0x3C33	0x6C72	# <CJK>
-0x3C34	0x5373	# <CJK>
-0x3C35	0x5AC9	# <CJK>
-0x3C36	0x7EA7	# <CJK>
-0x3C37	0x6324	# <CJK>
-0x3C38	0x51E0	# <CJK>
-0x3C39	0x810A	# <CJK>
-0x3C3A	0x5DF1	# <CJK>
-0x3C3B	0x84DF	# <CJK>
-0x3C3C	0x6280	# <CJK>
-0x3C3D	0x5180	# <CJK>
-0x3C3E	0x5B63	# <CJK>
-0x3C3F	0x4F0E	# <CJK>
-0x3C40	0x796D	# <CJK>
-0x3C41	0x5242	# <CJK>
-0x3C42	0x60B8	# <CJK>
-0x3C43	0x6D4E	# <CJK>
-0x3C44	0x5BC4	# <CJK>
-0x3C45	0x5BC2	# <CJK>
-0x3C46	0x8BA1	# <CJK>
-0x3C47	0x8BB0	# <CJK>
-0x3C48	0x65E2	# <CJK>
-0x3C49	0x5FCC	# <CJK>
-0x3C4A	0x9645	# <CJK>
-0x3C4B	0x5993	# <CJK>
-0x3C4C	0x7EE7	# <CJK>
-0x3C4D	0x7EAA	# <CJK>
-0x3C4E	0x5609	# <CJK>
-0x3C4F	0x67B7	# <CJK>
-0x3C50	0x5939	# <CJK>
-0x3C51	0x4F73	# <CJK>
-0x3C52	0x5BB6	# <CJK>
-0x3C53	0x52A0	# <CJK>
-0x3C54	0x835A	# <CJK>
-0x3C55	0x988A	# <CJK>
-0x3C56	0x8D3E	# <CJK>
-0x3C57	0x7532	# <CJK>
-0x3C58	0x94BE	# <CJK>
-0x3C59	0x5047	# <CJK>
-0x3C5A	0x7A3C	# <CJK>
-0x3C5B	0x4EF7	# <CJK>
-0x3C5C	0x67B6	# <CJK>
-0x3C5D	0x9A7E	# <CJK>
-0x3C5E	0x5AC1	# <CJK>
-0x3C5F	0x6B7C	# <CJK>
-0x3C60	0x76D1	# <CJK>
-0x3C61	0x575A	# <CJK>
-0x3C62	0x5C16	# <CJK>
-0x3C63	0x7B3A	# <CJK>
-0x3C64	0x95F4	# <CJK>
-0x3C65	0x714E	# <CJK>
-0x3C66	0x517C	# <CJK>
-0x3C67	0x80A9	# <CJK>
-0x3C68	0x8270	# <CJK>
-0x3C69	0x5978	# <CJK>
-0x3C6A	0x7F04	# <CJK>
-0x3C6B	0x8327	# <CJK>
-0x3C6C	0x68C0	# <CJK>
-0x3C6D	0x67EC	# <CJK>
-0x3C6E	0x78B1	# <CJK>
-0x3C6F	0x7877	# <CJK>
-0x3C70	0x62E3	# <CJK>
-0x3C71	0x6361	# <CJK>
-0x3C72	0x7B80	# <CJK>
-0x3C73	0x4FED	# <CJK>
-0x3C74	0x526A	# <CJK>
-0x3C75	0x51CF	# <CJK>
-0x3C76	0x8350	# <CJK>
-0x3C77	0x69DB	# <CJK>
-0x3C78	0x9274	# <CJK>
-0x3C79	0x8DF5	# <CJK>
-0x3C7A	0x8D31	# <CJK>
-0x3C7B	0x89C1	# <CJK>
-0x3C7C	0x952E	# <CJK>
-0x3C7D	0x7BAD	# <CJK>
-0x3C7E	0x4EF6	# <CJK>
-0x3D21	0x5065	# <CJK>
-0x3D22	0x8230	# <CJK>
-0x3D23	0x5251	# <CJK>
-0x3D24	0x996F	# <CJK>
-0x3D25	0x6E10	# <CJK>
-0x3D26	0x6E85	# <CJK>
-0x3D27	0x6DA7	# <CJK>
-0x3D28	0x5EFA	# <CJK>
-0x3D29	0x50F5	# <CJK>
-0x3D2A	0x59DC	# <CJK>
-0x3D2B	0x5C06	# <CJK>
-0x3D2C	0x6D46	# <CJK>
-0x3D2D	0x6C5F	# <CJK>
-0x3D2E	0x7586	# <CJK>
-0x3D2F	0x848B	# <CJK>
-0x3D30	0x6868	# <CJK>
-0x3D31	0x5956	# <CJK>
-0x3D32	0x8BB2	# <CJK>
-0x3D33	0x5320	# <CJK>
-0x3D34	0x9171	# <CJK>
-0x3D35	0x964D	# <CJK>
-0x3D36	0x8549	# <CJK>
-0x3D37	0x6912	# <CJK>
-0x3D38	0x7901	# <CJK>
-0x3D39	0x7126	# <CJK>
-0x3D3A	0x80F6	# <CJK>
-0x3D3B	0x4EA4	# <CJK>
-0x3D3C	0x90CA	# <CJK>
-0x3D3D	0x6D47	# <CJK>
-0x3D3E	0x9A84	# <CJK>
-0x3D3F	0x5A07	# <CJK>
-0x3D40	0x56BC	# <CJK>
-0x3D41	0x6405	# <CJK>
-0x3D42	0x94F0	# <CJK>
-0x3D43	0x77EB	# <CJK>
-0x3D44	0x4FA5	# <CJK>
-0x3D45	0x811A	# <CJK>
-0x3D46	0x72E1	# <CJK>
-0x3D47	0x89D2	# <CJK>
-0x3D48	0x997A	# <CJK>
-0x3D49	0x7F34	# <CJK>
-0x3D4A	0x7EDE	# <CJK>
-0x3D4B	0x527F	# <CJK>
-0x3D4C	0x6559	# <CJK>
-0x3D4D	0x9175	# <CJK>
-0x3D4E	0x8F7F	# <CJK>
-0x3D4F	0x8F83	# <CJK>
-0x3D50	0x53EB	# <CJK>
-0x3D51	0x7A96	# <CJK>
-0x3D52	0x63ED	# <CJK>
-0x3D53	0x63A5	# <CJK>
-0x3D54	0x7686	# <CJK>
-0x3D55	0x79F8	# <CJK>
-0x3D56	0x8857	# <CJK>
-0x3D57	0x9636	# <CJK>
-0x3D58	0x622A	# <CJK>
-0x3D59	0x52AB	# <CJK>
-0x3D5A	0x8282	# <CJK>
-0x3D5B	0x6854	# <CJK>
-0x3D5C	0x6770	# <CJK>
-0x3D5D	0x6377	# <CJK>
-0x3D5E	0x776B	# <CJK>
-0x3D5F	0x7AED	# <CJK>
-0x3D60	0x6D01	# <CJK>
-0x3D61	0x7ED3	# <CJK>
-0x3D62	0x89E3	# <CJK>
-0x3D63	0x59D0	# <CJK>
-0x3D64	0x6212	# <CJK>
-0x3D65	0x85C9	# <CJK>
-0x3D66	0x82A5	# <CJK>
-0x3D67	0x754C	# <CJK>
-0x3D68	0x501F	# <CJK>
-0x3D69	0x4ECB	# <CJK>
-0x3D6A	0x75A5	# <CJK>
-0x3D6B	0x8BEB	# <CJK>
-0x3D6C	0x5C4A	# <CJK>
-0x3D6D	0x5DFE	# <CJK>
-0x3D6E	0x7B4B	# <CJK>
-0x3D6F	0x65A4	# <CJK>
-0x3D70	0x91D1	# <CJK>
-0x3D71	0x4ECA	# <CJK>
-0x3D72	0x6D25	# <CJK>
-0x3D73	0x895F	# <CJK>
-0x3D74	0x7D27	# <CJK>
-0x3D75	0x9526	# <CJK>
-0x3D76	0x4EC5	# <CJK>
-0x3D77	0x8C28	# <CJK>
-0x3D78	0x8FDB	# <CJK>
-0x3D79	0x9773	# <CJK>
-0x3D7A	0x664B	# <CJK>
-0x3D7B	0x7981	# <CJK>
-0x3D7C	0x8FD1	# <CJK>
-0x3D7D	0x70EC	# <CJK>
-0x3D7E	0x6D78	# <CJK>
-0x3E21	0x5C3D	# <CJK>
-0x3E22	0x52B2	# <CJK>
-0x3E23	0x8346	# <CJK>
-0x3E24	0x5162	# <CJK>
-0x3E25	0x830E	# <CJK>
-0x3E26	0x775B	# <CJK>
-0x3E27	0x6676	# <CJK>
-0x3E28	0x9CB8	# <CJK>
-0x3E29	0x4EAC	# <CJK>
-0x3E2A	0x60CA	# <CJK>
-0x3E2B	0x7CBE	# <CJK>
-0x3E2C	0x7CB3	# <CJK>
-0x3E2D	0x7ECF	# <CJK>
-0x3E2E	0x4E95	# <CJK>
-0x3E2F	0x8B66	# <CJK>
-0x3E30	0x666F	# <CJK>
-0x3E31	0x9888	# <CJK>
-0x3E32	0x9759	# <CJK>
-0x3E33	0x5883	# <CJK>
-0x3E34	0x656C	# <CJK>
-0x3E35	0x955C	# <CJK>
-0x3E36	0x5F84	# <CJK>
-0x3E37	0x75C9	# <CJK>
-0x3E38	0x9756	# <CJK>
-0x3E39	0x7ADF	# <CJK>
-0x3E3A	0x7ADE	# <CJK>
-0x3E3B	0x51C0	# <CJK>
-0x3E3C	0x70AF	# <CJK>
-0x3E3D	0x7A98	# <CJK>
-0x3E3E	0x63EA	# <CJK>
-0x3E3F	0x7A76	# <CJK>
-0x3E40	0x7EA0	# <CJK>
-0x3E41	0x7396	# <CJK>
-0x3E42	0x97ED	# <CJK>
-0x3E43	0x4E45	# <CJK>
-0x3E44	0x7078	# <CJK>
-0x3E45	0x4E5D	# <CJK>
-0x3E46	0x9152	# <CJK>
-0x3E47	0x53A9	# <CJK>
-0x3E48	0x6551	# <CJK>
-0x3E49	0x65E7	# <CJK>
-0x3E4A	0x81FC	# <CJK>
-0x3E4B	0x8205	# <CJK>
-0x3E4C	0x548E	# <CJK>
-0x3E4D	0x5C31	# <CJK>
-0x3E4E	0x759A	# <CJK>
-0x3E4F	0x97A0	# <CJK>
-0x3E50	0x62D8	# <CJK>
-0x3E51	0x72D9	# <CJK>
-0x3E52	0x75BD	# <CJK>
-0x3E53	0x5C45	# <CJK>
-0x3E54	0x9A79	# <CJK>
-0x3E55	0x83CA	# <CJK>
-0x3E56	0x5C40	# <CJK>
-0x3E57	0x5480	# <CJK>
-0x3E58	0x77E9	# <CJK>
-0x3E59	0x4E3E	# <CJK>
-0x3E5A	0x6CAE	# <CJK>
-0x3E5B	0x805A	# <CJK>
-0x3E5C	0x62D2	# <CJK>
-0x3E5D	0x636E	# <CJK>
-0x3E5E	0x5DE8	# <CJK>
-0x3E5F	0x5177	# <CJK>
-0x3E60	0x8DDD	# <CJK>
-0x3E61	0x8E1E	# <CJK>
-0x3E62	0x952F	# <CJK>
-0x3E63	0x4FF1	# <CJK>
-0x3E64	0x53E5	# <CJK>
-0x3E65	0x60E7	# <CJK>
-0x3E66	0x70AC	# <CJK>
-0x3E67	0x5267	# <CJK>
-0x3E68	0x6350	# <CJK>
-0x3E69	0x9E43	# <CJK>
-0x3E6A	0x5A1F	# <CJK>
-0x3E6B	0x5026	# <CJK>
-0x3E6C	0x7737	# <CJK>
-0x3E6D	0x5377	# <CJK>
-0x3E6E	0x7EE2	# <CJK>
-0x3E6F	0x6485	# <CJK>
-0x3E70	0x652B	# <CJK>
-0x3E71	0x6289	# <CJK>
-0x3E72	0x6398	# <CJK>
-0x3E73	0x5014	# <CJK>
-0x3E74	0x7235	# <CJK>
-0x3E75	0x89C9	# <CJK>
-0x3E76	0x51B3	# <CJK>
-0x3E77	0x8BC0	# <CJK>
-0x3E78	0x7EDD	# <CJK>
-0x3E79	0x5747	# <CJK>
-0x3E7A	0x83CC	# <CJK>
-0x3E7B	0x94A7	# <CJK>
-0x3E7C	0x519B	# <CJK>
-0x3E7D	0x541B	# <CJK>
-0x3E7E	0x5CFB	# <CJK>
-0x3F21	0x4FCA	# <CJK>
-0x3F22	0x7AE3	# <CJK>
-0x3F23	0x6D5A	# <CJK>
-0x3F24	0x90E1	# <CJK>
-0x3F25	0x9A8F	# <CJK>
-0x3F26	0x5580	# <CJK>
-0x3F27	0x5496	# <CJK>
-0x3F28	0x5361	# <CJK>
-0x3F29	0x54AF	# <CJK>
-0x3F2A	0x5F00	# <CJK>
-0x3F2B	0x63E9	# <CJK>
-0x3F2C	0x6977	# <CJK>
-0x3F2D	0x51EF	# <CJK>
-0x3F2E	0x6168	# <CJK>
-0x3F2F	0x520A	# <CJK>
-0x3F30	0x582A	# <CJK>
-0x3F31	0x52D8	# <CJK>
-0x3F32	0x574E	# <CJK>
-0x3F33	0x780D	# <CJK>
-0x3F34	0x770B	# <CJK>
-0x3F35	0x5EB7	# <CJK>
-0x3F36	0x6177	# <CJK>
-0x3F37	0x7CE0	# <CJK>
-0x3F38	0x625B	# <CJK>
-0x3F39	0x6297	# <CJK>
-0x3F3A	0x4EA2	# <CJK>
-0x3F3B	0x7095	# <CJK>
-0x3F3C	0x8003	# <CJK>
-0x3F3D	0x62F7	# <CJK>
-0x3F3E	0x70E4	# <CJK>
-0x3F3F	0x9760	# <CJK>
-0x3F40	0x5777	# <CJK>
-0x3F41	0x82DB	# <CJK>
-0x3F42	0x67EF	# <CJK>
-0x3F43	0x68F5	# <CJK>
-0x3F44	0x78D5	# <CJK>
-0x3F45	0x9897	# <CJK>
-0x3F46	0x79D1	# <CJK>
-0x3F47	0x58F3	# <CJK>
-0x3F48	0x54B3	# <CJK>
-0x3F49	0x53EF	# <CJK>
-0x3F4A	0x6E34	# <CJK>
-0x3F4B	0x514B	# <CJK>
-0x3F4C	0x523B	# <CJK>
-0x3F4D	0x5BA2	# <CJK>
-0x3F4E	0x8BFE	# <CJK>
-0x3F4F	0x80AF	# <CJK>
-0x3F50	0x5543	# <CJK>
-0x3F51	0x57A6	# <CJK>
-0x3F52	0x6073	# <CJK>
-0x3F53	0x5751	# <CJK>
-0x3F54	0x542D	# <CJK>
-0x3F55	0x7A7A	# <CJK>
-0x3F56	0x6050	# <CJK>
-0x3F57	0x5B54	# <CJK>
-0x3F58	0x63A7	# <CJK>
-0x3F59	0x62A0	# <CJK>
-0x3F5A	0x53E3	# <CJK>
-0x3F5B	0x6263	# <CJK>
-0x3F5C	0x5BC7	# <CJK>
-0x3F5D	0x67AF	# <CJK>
-0x3F5E	0x54ED	# <CJK>
-0x3F5F	0x7A9F	# <CJK>
-0x3F60	0x82E6	# <CJK>
-0x3F61	0x9177	# <CJK>
-0x3F62	0x5E93	# <CJK>
-0x3F63	0x88E4	# <CJK>
-0x3F64	0x5938	# <CJK>
-0x3F65	0x57AE	# <CJK>
-0x3F66	0x630E	# <CJK>
-0x3F67	0x8DE8	# <CJK>
-0x3F68	0x80EF	# <CJK>
-0x3F69	0x5757	# <CJK>
-0x3F6A	0x7B77	# <CJK>
-0x3F6B	0x4FA9	# <CJK>
-0x3F6C	0x5FEB	# <CJK>
-0x3F6D	0x5BBD	# <CJK>
-0x3F6E	0x6B3E	# <CJK>
-0x3F6F	0x5321	# <CJK>
-0x3F70	0x7B50	# <CJK>
-0x3F71	0x72C2	# <CJK>
-0x3F72	0x6846	# <CJK>
-0x3F73	0x77FF	# <CJK>
-0x3F74	0x7736	# <CJK>
-0x3F75	0x65F7	# <CJK>
-0x3F76	0x51B5	# <CJK>
-0x3F77	0x4E8F	# <CJK>
-0x3F78	0x76D4	# <CJK>
-0x3F79	0x5CBF	# <CJK>
-0x3F7A	0x7AA5	# <CJK>
-0x3F7B	0x8475	# <CJK>
-0x3F7C	0x594E	# <CJK>
-0x3F7D	0x9B41	# <CJK>
-0x3F7E	0x5080	# <CJK>
-0x4021	0x9988	# <CJK>
-0x4022	0x6127	# <CJK>
-0x4023	0x6E83	# <CJK>
-0x4024	0x5764	# <CJK>
-0x4025	0x6606	# <CJK>
-0x4026	0x6346	# <CJK>
-0x4027	0x56F0	# <CJK>
-0x4028	0x62EC	# <CJK>
-0x4029	0x6269	# <CJK>
-0x402A	0x5ED3	# <CJK>
-0x402B	0x9614	# <CJK>
-0x402C	0x5783	# <CJK>
-0x402D	0x62C9	# <CJK>
-0x402E	0x5587	# <CJK>
-0x402F	0x8721	# <CJK>
-0x4030	0x814A	# <CJK>
-0x4031	0x8FA3	# <CJK>
-0x4032	0x5566	# <CJK>
-0x4033	0x83B1	# <CJK>
-0x4034	0x6765	# <CJK>
-0x4035	0x8D56	# <CJK>
-0x4036	0x84DD	# <CJK>
-0x4037	0x5A6A	# <CJK>
-0x4038	0x680F	# <CJK>
-0x4039	0x62E6	# <CJK>
-0x403A	0x7BEE	# <CJK>
-0x403B	0x9611	# <CJK>
-0x403C	0x5170	# <CJK>
-0x403D	0x6F9C	# <CJK>
-0x403E	0x8C30	# <CJK>
-0x403F	0x63FD	# <CJK>
-0x4040	0x89C8	# <CJK>
-0x4041	0x61D2	# <CJK>
-0x4042	0x7F06	# <CJK>
-0x4043	0x70C2	# <CJK>
-0x4044	0x6EE5	# <CJK>
-0x4045	0x7405	# <CJK>
-0x4046	0x6994	# <CJK>
-0x4047	0x72FC	# <CJK>
-0x4048	0x5ECA	# <CJK>
-0x4049	0x90CE	# <CJK>
-0x404A	0x6717	# <CJK>
-0x404B	0x6D6A	# <CJK>
-0x404C	0x635E	# <CJK>
-0x404D	0x52B3	# <CJK>
-0x404E	0x7262	# <CJK>
-0x404F	0x8001	# <CJK>
-0x4050	0x4F6C	# <CJK>
-0x4051	0x59E5	# <CJK>
-0x4052	0x916A	# <CJK>
-0x4053	0x70D9	# <CJK>
-0x4054	0x6D9D	# <CJK>
-0x4055	0x52D2	# <CJK>
-0x4056	0x4E50	# <CJK>
-0x4057	0x96F7	# <CJK>
-0x4058	0x956D	# <CJK>
-0x4059	0x857E	# <CJK>
-0x405A	0x78CA	# <CJK>
-0x405B	0x7D2F	# <CJK>
-0x405C	0x5121	# <CJK>
-0x405D	0x5792	# <CJK>
-0x405E	0x64C2	# <CJK>
-0x405F	0x808B	# <CJK>
-0x4060	0x7C7B	# <CJK>
-0x4061	0x6CEA	# <CJK>
-0x4062	0x68F1	# <CJK>
-0x4063	0x695E	# <CJK>
-0x4064	0x51B7	# <CJK>
-0x4065	0x5398	# <CJK>
-0x4066	0x68A8	# <CJK>
-0x4067	0x7281	# <CJK>
-0x4068	0x9ECE	# <CJK>
-0x4069	0x7BF1	# <CJK>
-0x406A	0x72F8	# <CJK>
-0x406B	0x79BB	# <CJK>
-0x406C	0x6F13	# <CJK>
-0x406D	0x7406	# <CJK>
-0x406E	0x674E	# <CJK>
-0x406F	0x91CC	# <CJK>
-0x4070	0x9CA4	# <CJK>
-0x4071	0x793C	# <CJK>
-0x4072	0x8389	# <CJK>
-0x4073	0x8354	# <CJK>
-0x4074	0x540F	# <CJK>
-0x4075	0x6817	# <CJK>
-0x4076	0x4E3D	# <CJK>
-0x4077	0x5389	# <CJK>
-0x4078	0x52B1	# <CJK>
-0x4079	0x783E	# <CJK>
-0x407A	0x5386	# <CJK>
-0x407B	0x5229	# <CJK>
-0x407C	0x5088	# <CJK>
-0x407D	0x4F8B	# <CJK>
-0x407E	0x4FD0	# <CJK>
-0x4121	0x75E2	# <CJK>
-0x4122	0x7ACB	# <CJK>
-0x4123	0x7C92	# <CJK>
-0x4124	0x6CA5	# <CJK>
-0x4125	0x96B6	# <CJK>
-0x4126	0x529B	# <CJK>
-0x4127	0x7483	# <CJK>
-0x4128	0x54E9	# <CJK>
-0x4129	0x4FE9	# <CJK>
-0x412A	0x8054	# <CJK>
-0x412B	0x83B2	# <CJK>
-0x412C	0x8FDE	# <CJK>
-0x412D	0x9570	# <CJK>
-0x412E	0x5EC9	# <CJK>
-0x412F	0x601C	# <CJK>
-0x4130	0x6D9F	# <CJK>
-0x4131	0x5E18	# <CJK>
-0x4132	0x655B	# <CJK>
-0x4133	0x8138	# <CJK>
-0x4134	0x94FE	# <CJK>
-0x4135	0x604B	# <CJK>
-0x4136	0x70BC	# <CJK>
-0x4137	0x7EC3	# <CJK>
-0x4138	0x7CAE	# <CJK>
-0x4139	0x51C9	# <CJK>
-0x413A	0x6881	# <CJK>
-0x413B	0x7CB1	# <CJK>
-0x413C	0x826F	# <CJK>
-0x413D	0x4E24	# <CJK>
-0x413E	0x8F86	# <CJK>
-0x413F	0x91CF	# <CJK>
-0x4140	0x667E	# <CJK>
-0x4141	0x4EAE	# <CJK>
-0x4142	0x8C05	# <CJK>
-0x4143	0x64A9	# <CJK>
-0x4144	0x804A	# <CJK>
-0x4145	0x50DA	# <CJK>
-0x4146	0x7597	# <CJK>
-0x4147	0x71CE	# <CJK>
-0x4148	0x5BE5	# <CJK>
-0x4149	0x8FBD	# <CJK>
-0x414A	0x6F66	# <CJK>
-0x414B	0x4E86	# <CJK>
-0x414C	0x6482	# <CJK>
-0x414D	0x9563	# <CJK>
-0x414E	0x5ED6	# <CJK>
-0x414F	0x6599	# <CJK>
-0x4150	0x5217	# <CJK>
-0x4151	0x88C2	# <CJK>
-0x4152	0x70C8	# <CJK>
-0x4153	0x52A3	# <CJK>
-0x4154	0x730E	# <CJK>
-0x4155	0x7433	# <CJK>
-0x4156	0x6797	# <CJK>
-0x4157	0x78F7	# <CJK>
-0x4158	0x9716	# <CJK>
-0x4159	0x4E34	# <CJK>
-0x415A	0x90BB	# <CJK>
-0x415B	0x9CDE	# <CJK>
-0x415C	0x6DCB	# <CJK>
-0x415D	0x51DB	# <CJK>
-0x415E	0x8D41	# <CJK>
-0x415F	0x541D	# <CJK>
-0x4160	0x62CE	# <CJK>
-0x4161	0x73B2	# <CJK>
-0x4162	0x83F1	# <CJK>
-0x4163	0x96F6	# <CJK>
-0x4164	0x9F84	# <CJK>
-0x4165	0x94C3	# <CJK>
-0x4166	0x4F36	# <CJK>
-0x4167	0x7F9A	# <CJK>
-0x4168	0x51CC	# <CJK>
-0x4169	0x7075	# <CJK>
-0x416A	0x9675	# <CJK>
-0x416B	0x5CAD	# <CJK>
-0x416C	0x9886	# <CJK>
-0x416D	0x53E6	# <CJK>
-0x416E	0x4EE4	# <CJK>
-0x416F	0x6E9C	# <CJK>
-0x4170	0x7409	# <CJK>
-0x4171	0x69B4	# <CJK>
-0x4172	0x786B	# <CJK>
-0x4173	0x998F	# <CJK>
-0x4174	0x7559	# <CJK>
-0x4175	0x5218	# <CJK>
-0x4176	0x7624	# <CJK>
-0x4177	0x6D41	# <CJK>
-0x4178	0x67F3	# <CJK>
-0x4179	0x516D	# <CJK>
-0x417A	0x9F99	# <CJK>
-0x417B	0x804B	# <CJK>
-0x417C	0x5499	# <CJK>
-0x417D	0x7B3C	# <CJK>
-0x417E	0x7ABF	# <CJK>
-0x4221	0x9686	# <CJK>
-0x4222	0x5784	# <CJK>
-0x4223	0x62E2	# <CJK>
-0x4224	0x9647	# <CJK>
-0x4225	0x697C	# <CJK>
-0x4226	0x5A04	# <CJK>
-0x4227	0x6402	# <CJK>
-0x4228	0x7BD3	# <CJK>
-0x4229	0x6F0F	# <CJK>
-0x422A	0x964B	# <CJK>
-0x422B	0x82A6	# <CJK>
-0x422C	0x5362	# <CJK>
-0x422D	0x9885	# <CJK>
-0x422E	0x5E90	# <CJK>
-0x422F	0x7089	# <CJK>
-0x4230	0x63B3	# <CJK>
-0x4231	0x5364	# <CJK>
-0x4232	0x864F	# <CJK>
-0x4233	0x9C81	# <CJK>
-0x4234	0x9E93	# <CJK>
-0x4235	0x788C	# <CJK>
-0x4236	0x9732	# <CJK>
-0x4237	0x8DEF	# <CJK>
-0x4238	0x8D42	# <CJK>
-0x4239	0x9E7F	# <CJK>
-0x423A	0x6F5E	# <CJK>
-0x423B	0x7984	# <CJK>
-0x423C	0x5F55	# <CJK>
-0x423D	0x9646	# <CJK>
-0x423E	0x622E	# <CJK>
-0x423F	0x9A74	# <CJK>
-0x4240	0x5415	# <CJK>
-0x4241	0x94DD	# <CJK>
-0x4242	0x4FA3	# <CJK>
-0x4243	0x65C5	# <CJK>
-0x4244	0x5C65	# <CJK>
-0x4245	0x5C61	# <CJK>
-0x4246	0x7F15	# <CJK>
-0x4247	0x8651	# <CJK>
-0x4248	0x6C2F	# <CJK>
-0x4249	0x5F8B	# <CJK>
-0x424A	0x7387	# <CJK>
-0x424B	0x6EE4	# <CJK>
-0x424C	0x7EFF	# <CJK>
-0x424D	0x5CE6	# <CJK>
-0x424E	0x631B	# <CJK>
-0x424F	0x5B6A	# <CJK>
-0x4250	0x6EE6	# <CJK>
-0x4251	0x5375	# <CJK>
-0x4252	0x4E71	# <CJK>
-0x4253	0x63A0	# <CJK>
-0x4254	0x7565	# <CJK>
-0x4255	0x62A1	# <CJK>
-0x4256	0x8F6E	# <CJK>
-0x4257	0x4F26	# <CJK>
-0x4258	0x4ED1	# <CJK>
-0x4259	0x6CA6	# <CJK>
-0x425A	0x7EB6	# <CJK>
-0x425B	0x8BBA	# <CJK>
-0x425C	0x841D	# <CJK>
-0x425D	0x87BA	# <CJK>
-0x425E	0x7F57	# <CJK>
-0x425F	0x903B	# <CJK>
-0x4260	0x9523	# <CJK>
-0x4261	0x7BA9	# <CJK>
-0x4262	0x9AA1	# <CJK>
-0x4263	0x88F8	# <CJK>
-0x4264	0x843D	# <CJK>
-0x4265	0x6D1B	# <CJK>
-0x4266	0x9A86	# <CJK>
-0x4267	0x7EDC	# <CJK>
-0x4268	0x5988	# <CJK>
-0x4269	0x9EBB	# <CJK>
-0x426A	0x739B	# <CJK>
-0x426B	0x7801	# <CJK>
-0x426C	0x8682	# <CJK>
-0x426D	0x9A6C	# <CJK>
-0x426E	0x9A82	# <CJK>
-0x426F	0x561B	# <CJK>
-0x4270	0x5417	# <CJK>
-0x4271	0x57CB	# <CJK>
-0x4272	0x4E70	# <CJK>
-0x4273	0x9EA6	# <CJK>
-0x4274	0x5356	# <CJK>
-0x4275	0x8FC8	# <CJK>
-0x4276	0x8109	# <CJK>
-0x4277	0x7792	# <CJK>
-0x4278	0x9992	# <CJK>
-0x4279	0x86EE	# <CJK>
-0x427A	0x6EE1	# <CJK>
-0x427B	0x8513	# <CJK>
-0x427C	0x66FC	# <CJK>
-0x427D	0x6162	# <CJK>
-0x427E	0x6F2B	# <CJK>
-0x4321	0x8C29	# <CJK>
-0x4322	0x8292	# <CJK>
-0x4323	0x832B	# <CJK>
-0x4324	0x76F2	# <CJK>
-0x4325	0x6C13	# <CJK>
-0x4326	0x5FD9	# <CJK>
-0x4327	0x83BD	# <CJK>
-0x4328	0x732B	# <CJK>
-0x4329	0x8305	# <CJK>
-0x432A	0x951A	# <CJK>
-0x432B	0x6BDB	# <CJK>
-0x432C	0x77DB	# <CJK>
-0x432D	0x94C6	# <CJK>
-0x432E	0x536F	# <CJK>
-0x432F	0x8302	# <CJK>
-0x4330	0x5192	# <CJK>
-0x4331	0x5E3D	# <CJK>
-0x4332	0x8C8C	# <CJK>
-0x4333	0x8D38	# <CJK>
-0x4334	0x4E48	# <CJK>
-0x4335	0x73AB	# <CJK>
-0x4336	0x679A	# <CJK>
-0x4337	0x6885	# <CJK>
-0x4338	0x9176	# <CJK>
-0x4339	0x9709	# <CJK>
-0x433A	0x7164	# <CJK>
-0x433B	0x6CA1	# <CJK>
-0x433C	0x7709	# <CJK>
-0x433D	0x5A92	# <CJK>
-0x433E	0x9541	# <CJK>
-0x433F	0x6BCF	# <CJK>
-0x4340	0x7F8E	# <CJK>
-0x4341	0x6627	# <CJK>
-0x4342	0x5BD0	# <CJK>
-0x4343	0x59B9	# <CJK>
-0x4344	0x5A9A	# <CJK>
-0x4345	0x95E8	# <CJK>
-0x4346	0x95F7	# <CJK>
-0x4347	0x4EEC	# <CJK>
-0x4348	0x840C	# <CJK>
-0x4349	0x8499	# <CJK>
-0x434A	0x6AAC	# <CJK>
-0x434B	0x76DF	# <CJK>
-0x434C	0x9530	# <CJK>
-0x434D	0x731B	# <CJK>
-0x434E	0x68A6	# <CJK>
-0x434F	0x5B5F	# <CJK>
-0x4350	0x772F	# <CJK>
-0x4351	0x919A	# <CJK>
-0x4352	0x9761	# <CJK>
-0x4353	0x7CDC	# <CJK>
-0x4354	0x8FF7	# <CJK>
-0x4355	0x8C1C	# <CJK>
-0x4356	0x5F25	# <CJK>
-0x4357	0x7C73	# <CJK>
-0x4358	0x79D8	# <CJK>
-0x4359	0x89C5	# <CJK>
-0x435A	0x6CCC	# <CJK>
-0x435B	0x871C	# <CJK>
-0x435C	0x5BC6	# <CJK>
-0x435D	0x5E42	# <CJK>
-0x435E	0x68C9	# <CJK>
-0x435F	0x7720	# <CJK>
-0x4360	0x7EF5	# <CJK>
-0x4361	0x5195	# <CJK>
-0x4362	0x514D	# <CJK>
-0x4363	0x52C9	# <CJK>
-0x4364	0x5A29	# <CJK>
-0x4365	0x7F05	# <CJK>
-0x4366	0x9762	# <CJK>
-0x4367	0x82D7	# <CJK>
-0x4368	0x63CF	# <CJK>
-0x4369	0x7784	# <CJK>
-0x436A	0x85D0	# <CJK>
-0x436B	0x79D2	# <CJK>
-0x436C	0x6E3A	# <CJK>
-0x436D	0x5E99	# <CJK>
-0x436E	0x5999	# <CJK>
-0x436F	0x8511	# <CJK>
-0x4370	0x706D	# <CJK>
-0x4371	0x6C11	# <CJK>
-0x4372	0x62BF	# <CJK>
-0x4373	0x76BF	# <CJK>
-0x4374	0x654F	# <CJK>
-0x4375	0x60AF	# <CJK>
-0x4376	0x95FD	# <CJK>
-0x4377	0x660E	# <CJK>
-0x4378	0x879F	# <CJK>
-0x4379	0x9E23	# <CJK>
-0x437A	0x94ED	# <CJK>
-0x437B	0x540D	# <CJK>
-0x437C	0x547D	# <CJK>
-0x437D	0x8C2C	# <CJK>
-0x437E	0x6478	# <CJK>
-0x4421	0x6479	# <CJK>
-0x4422	0x8611	# <CJK>
-0x4423	0x6A21	# <CJK>
-0x4424	0x819C	# <CJK>
-0x4425	0x78E8	# <CJK>
-0x4426	0x6469	# <CJK>
-0x4427	0x9B54	# <CJK>
-0x4428	0x62B9	# <CJK>
-0x4429	0x672B	# <CJK>
-0x442A	0x83AB	# <CJK>
-0x442B	0x58A8	# <CJK>
-0x442C	0x9ED8	# <CJK>
-0x442D	0x6CAB	# <CJK>
-0x442E	0x6F20	# <CJK>
-0x442F	0x5BDE	# <CJK>
-0x4430	0x964C	# <CJK>
-0x4431	0x8C0B	# <CJK>
-0x4432	0x725F	# <CJK>
-0x4433	0x67D0	# <CJK>
-0x4434	0x62C7	# <CJK>
-0x4435	0x7261	# <CJK>
-0x4436	0x4EA9	# <CJK>
-0x4437	0x59C6	# <CJK>
-0x4438	0x6BCD	# <CJK>
-0x4439	0x5893	# <CJK>
-0x443A	0x66AE	# <CJK>
-0x443B	0x5E55	# <CJK>
-0x443C	0x52DF	# <CJK>
-0x443D	0x6155	# <CJK>
-0x443E	0x6728	# <CJK>
-0x443F	0x76EE	# <CJK>
-0x4440	0x7766	# <CJK>
-0x4441	0x7267	# <CJK>
-0x4442	0x7A46	# <CJK>
-0x4443	0x62FF	# <CJK>
-0x4444	0x54EA	# <CJK>
-0x4445	0x5450	# <CJK>
-0x4446	0x94A0	# <CJK>
-0x4447	0x90A3	# <CJK>
-0x4448	0x5A1C	# <CJK>
-0x4449	0x7EB3	# <CJK>
-0x444A	0x6C16	# <CJK>
-0x444B	0x4E43	# <CJK>
-0x444C	0x5976	# <CJK>
-0x444D	0x8010	# <CJK>
-0x444E	0x5948	# <CJK>
-0x444F	0x5357	# <CJK>
-0x4450	0x7537	# <CJK>
-0x4451	0x96BE	# <CJK>
-0x4452	0x56CA	# <CJK>
-0x4453	0x6320	# <CJK>
-0x4454	0x8111	# <CJK>
-0x4455	0x607C	# <CJK>
-0x4456	0x95F9	# <CJK>
-0x4457	0x6DD6	# <CJK>
-0x4458	0x5462	# <CJK>
-0x4459	0x9981	# <CJK>
-0x445A	0x5185	# <CJK>
-0x445B	0x5AE9	# <CJK>
-0x445C	0x80FD	# <CJK>
-0x445D	0x59AE	# <CJK>
-0x445E	0x9713	# <CJK>
-0x445F	0x502A	# <CJK>
-0x4460	0x6CE5	# <CJK>
-0x4461	0x5C3C	# <CJK>
-0x4462	0x62DF	# <CJK>
-0x4463	0x4F60	# <CJK>
-0x4464	0x533F	# <CJK>
-0x4465	0x817B	# <CJK>
-0x4466	0x9006	# <CJK>
-0x4467	0x6EBA	# <CJK>
-0x4468	0x852B	# <CJK>
-0x4469	0x62C8	# <CJK>
-0x446A	0x5E74	# <CJK>
-0x446B	0x78BE	# <CJK>
-0x446C	0x64B5	# <CJK>
-0x446D	0x637B	# <CJK>
-0x446E	0x5FF5	# <CJK>
-0x446F	0x5A18	# <CJK>
-0x4470	0x917F	# <CJK>
-0x4471	0x9E1F	# <CJK>
-0x4472	0x5C3F	# <CJK>
-0x4473	0x634F	# <CJK>
-0x4474	0x8042	# <CJK>
-0x4475	0x5B7D	# <CJK>
-0x4476	0x556E	# <CJK>
-0x4477	0x954A	# <CJK>
-0x4478	0x954D	# <CJK>
-0x4479	0x6D85	# <CJK>
-0x447A	0x60A8	# <CJK>
-0x447B	0x67E0	# <CJK>
-0x447C	0x72DE	# <CJK>
-0x447D	0x51DD	# <CJK>
-0x447E	0x5B81	# <CJK>
-0x4521	0x62E7	# <CJK>
-0x4522	0x6CDE	# <CJK>
-0x4523	0x725B	# <CJK>
-0x4524	0x626D	# <CJK>
-0x4525	0x94AE	# <CJK>
-0x4526	0x7EBD	# <CJK>
-0x4527	0x8113	# <CJK>
-0x4528	0x6D53	# <CJK>
-0x4529	0x519C	# <CJK>
-0x452A	0x5F04	# <CJK>
-0x452B	0x5974	# <CJK>
-0x452C	0x52AA	# <CJK>
-0x452D	0x6012	# <CJK>
-0x452E	0x5973	# <CJK>
-0x452F	0x6696	# <CJK>
-0x4530	0x8650	# <CJK>
-0x4531	0x759F	# <CJK>
-0x4532	0x632A	# <CJK>
-0x4533	0x61E6	# <CJK>
-0x4534	0x7CEF	# <CJK>
-0x4535	0x8BFA	# <CJK>
-0x4536	0x54E6	# <CJK>
-0x4537	0x6B27	# <CJK>
-0x4538	0x9E25	# <CJK>
-0x4539	0x6BB4	# <CJK>
-0x453A	0x85D5	# <CJK>
-0x453B	0x5455	# <CJK>
-0x453C	0x5076	# <CJK>
-0x453D	0x6CA4	# <CJK>
-0x453E	0x556A	# <CJK>
-0x453F	0x8DB4	# <CJK>
-0x4540	0x722C	# <CJK>
-0x4541	0x5E15	# <CJK>
-0x4542	0x6015	# <CJK>
-0x4543	0x7436	# <CJK>
-0x4544	0x62CD	# <CJK>
-0x4545	0x6392	# <CJK>
-0x4546	0x724C	# <CJK>
-0x4547	0x5F98	# <CJK>
-0x4548	0x6E43	# <CJK>
-0x4549	0x6D3E	# <CJK>
-0x454A	0x6500	# <CJK>
-0x454B	0x6F58	# <CJK>
-0x454C	0x76D8	# <CJK>
-0x454D	0x78D0	# <CJK>
-0x454E	0x76FC	# <CJK>
-0x454F	0x7554	# <CJK>
-0x4550	0x5224	# <CJK>
-0x4551	0x53DB	# <CJK>
-0x4552	0x4E53	# <CJK>
-0x4553	0x5E9E	# <CJK>
-0x4554	0x65C1	# <CJK>
-0x4555	0x802A	# <CJK>
-0x4556	0x80D6	# <CJK>
-0x4557	0x629B	# <CJK>
-0x4558	0x5486	# <CJK>
-0x4559	0x5228	# <CJK>
-0x455A	0x70AE	# <CJK>
-0x455B	0x888D	# <CJK>
-0x455C	0x8DD1	# <CJK>
-0x455D	0x6CE1	# <CJK>
-0x455E	0x5478	# <CJK>
-0x455F	0x80DA	# <CJK>
-0x4560	0x57F9	# <CJK>
-0x4561	0x88F4	# <CJK>
-0x4562	0x8D54	# <CJK>
-0x4563	0x966A	# <CJK>
-0x4564	0x914D	# <CJK>
-0x4565	0x4F69	# <CJK>
-0x4566	0x6C9B	# <CJK>
-0x4567	0x55B7	# <CJK>
-0x4568	0x76C6	# <CJK>
-0x4569	0x7830	# <CJK>
-0x456A	0x62A8	# <CJK>
-0x456B	0x70F9	# <CJK>
-0x456C	0x6F8E	# <CJK>
-0x456D	0x5F6D	# <CJK>
-0x456E	0x84EC	# <CJK>
-0x456F	0x68DA	# <CJK>
-0x4570	0x787C	# <CJK>
-0x4571	0x7BF7	# <CJK>
-0x4572	0x81A8	# <CJK>
-0x4573	0x670B	# <CJK>
-0x4574	0x9E4F	# <CJK>
-0x4575	0x6367	# <CJK>
-0x4576	0x78B0	# <CJK>
-0x4577	0x576F	# <CJK>
-0x4578	0x7812	# <CJK>
-0x4579	0x9739	# <CJK>
-0x457A	0x6279	# <CJK>
-0x457B	0x62AB	# <CJK>
-0x457C	0x5288	# <CJK>
-0x457D	0x7435	# <CJK>
-0x457E	0x6BD7	# <CJK>
-0x4621	0x5564	# <CJK>
-0x4622	0x813E	# <CJK>
-0x4623	0x75B2	# <CJK>
-0x4624	0x76AE	# <CJK>
-0x4625	0x5339	# <CJK>
-0x4626	0x75DE	# <CJK>
-0x4627	0x50FB	# <CJK>
-0x4628	0x5C41	# <CJK>
-0x4629	0x8B6C	# <CJK>
-0x462A	0x7BC7	# <CJK>
-0x462B	0x504F	# <CJK>
-0x462C	0x7247	# <CJK>
-0x462D	0x9A97	# <CJK>
-0x462E	0x98D8	# <CJK>
-0x462F	0x6F02	# <CJK>
-0x4630	0x74E2	# <CJK>
-0x4631	0x7968	# <CJK>
-0x4632	0x6487	# <CJK>
-0x4633	0x77A5	# <CJK>
-0x4634	0x62FC	# <CJK>
-0x4635	0x9891	# <CJK>
-0x4636	0x8D2B	# <CJK>
-0x4637	0x54C1	# <CJK>
-0x4638	0x8058	# <CJK>
-0x4639	0x4E52	# <CJK>
-0x463A	0x576A	# <CJK>
-0x463B	0x82F9	# <CJK>
-0x463C	0x840D	# <CJK>
-0x463D	0x5E73	# <CJK>
-0x463E	0x51ED	# <CJK>
-0x463F	0x74F6	# <CJK>
-0x4640	0x8BC4	# <CJK>
-0x4641	0x5C4F	# <CJK>
-0x4642	0x5761	# <CJK>
-0x4643	0x6CFC	# <CJK>
-0x4644	0x9887	# <CJK>
-0x4645	0x5A46	# <CJK>
-0x4646	0x7834	# <CJK>
-0x4647	0x9B44	# <CJK>
-0x4648	0x8FEB	# <CJK>
-0x4649	0x7C95	# <CJK>
-0x464A	0x5256	# <CJK>
-0x464B	0x6251	# <CJK>
-0x464C	0x94FA	# <CJK>
-0x464D	0x4EC6	# <CJK>
-0x464E	0x8386	# <CJK>
-0x464F	0x8461	# <CJK>
-0x4650	0x83E9	# <CJK>
-0x4651	0x84B2	# <CJK>
-0x4652	0x57D4	# <CJK>
-0x4653	0x6734	# <CJK>
-0x4654	0x5703	# <CJK>
-0x4655	0x666E	# <CJK>
-0x4656	0x6D66	# <CJK>
-0x4657	0x8C31	# <CJK>
-0x4658	0x66DD	# <CJK>
-0x4659	0x7011	# <CJK>
-0x465A	0x671F	# <CJK>
-0x465B	0x6B3A	# <CJK>
-0x465C	0x6816	# <CJK>
-0x465D	0x621A	# <CJK>
-0x465E	0x59BB	# <CJK>
-0x465F	0x4E03	# <CJK>
-0x4660	0x51C4	# <CJK>
-0x4661	0x6F06	# <CJK>
-0x4662	0x67D2	# <CJK>
-0x4663	0x6C8F	# <CJK>
-0x4664	0x5176	# <CJK>
-0x4665	0x68CB	# <CJK>
-0x4666	0x5947	# <CJK>
-0x4667	0x6B67	# <CJK>
-0x4668	0x7566	# <CJK>
-0x4669	0x5D0E	# <CJK>
-0x466A	0x8110	# <CJK>
-0x466B	0x9F50	# <CJK>
-0x466C	0x65D7	# <CJK>
-0x466D	0x7948	# <CJK>
-0x466E	0x7941	# <CJK>
-0x466F	0x9A91	# <CJK>
-0x4670	0x8D77	# <CJK>
-0x4671	0x5C82	# <CJK>
-0x4672	0x4E5E	# <CJK>
-0x4673	0x4F01	# <CJK>
-0x4674	0x542F	# <CJK>
-0x4675	0x5951	# <CJK>
-0x4676	0x780C	# <CJK>
-0x4677	0x5668	# <CJK>
-0x4678	0x6C14	# <CJK>
-0x4679	0x8FC4	# <CJK>
-0x467A	0x5F03	# <CJK>
-0x467B	0x6C7D	# <CJK>
-0x467C	0x6CE3	# <CJK>
-0x467D	0x8BAB	# <CJK>
-0x467E	0x6390	# <CJK>
-0x4721	0x6070	# <CJK>
-0x4722	0x6D3D	# <CJK>
-0x4723	0x7275	# <CJK>
-0x4724	0x6266	# <CJK>
-0x4725	0x948E	# <CJK>
-0x4726	0x94C5	# <CJK>
-0x4727	0x5343	# <CJK>
-0x4728	0x8FC1	# <CJK>
-0x4729	0x7B7E	# <CJK>
-0x472A	0x4EDF	# <CJK>
-0x472B	0x8C26	# <CJK>
-0x472C	0x4E7E	# <CJK>
-0x472D	0x9ED4	# <CJK>
-0x472E	0x94B1	# <CJK>
-0x472F	0x94B3	# <CJK>
-0x4730	0x524D	# <CJK>
-0x4731	0x6F5C	# <CJK>
-0x4732	0x9063	# <CJK>
-0x4733	0x6D45	# <CJK>
-0x4734	0x8C34	# <CJK>
-0x4735	0x5811	# <CJK>
-0x4736	0x5D4C	# <CJK>
-0x4737	0x6B20	# <CJK>
-0x4738	0x6B49	# <CJK>
-0x4739	0x67AA	# <CJK>
-0x473A	0x545B	# <CJK>
-0x473B	0x8154	# <CJK>
-0x473C	0x7F8C	# <CJK>
-0x473D	0x5899	# <CJK>
-0x473E	0x8537	# <CJK>
-0x473F	0x5F3A	# <CJK>
-0x4740	0x62A2	# <CJK>
-0x4741	0x6A47	# <CJK>
-0x4742	0x9539	# <CJK>
-0x4743	0x6572	# <CJK>
-0x4744	0x6084	# <CJK>
-0x4745	0x6865	# <CJK>
-0x4746	0x77A7	# <CJK>
-0x4747	0x4E54	# <CJK>
-0x4748	0x4FA8	# <CJK>
-0x4749	0x5DE7	# <CJK>
-0x474A	0x9798	# <CJK>
-0x474B	0x64AC	# <CJK>
-0x474C	0x7FD8	# <CJK>
-0x474D	0x5CED	# <CJK>
-0x474E	0x4FCF	# <CJK>
-0x474F	0x7A8D	# <CJK>
-0x4750	0x5207	# <CJK>
-0x4751	0x8304	# <CJK>
-0x4752	0x4E14	# <CJK>
-0x4753	0x602F	# <CJK>
-0x4754	0x7A83	# <CJK>
-0x4755	0x94A6	# <CJK>
-0x4756	0x4FB5	# <CJK>
-0x4757	0x4EB2	# <CJK>
-0x4758	0x79E6	# <CJK>
-0x4759	0x7434	# <CJK>
-0x475A	0x52E4	# <CJK>
-0x475B	0x82B9	# <CJK>
-0x475C	0x64D2	# <CJK>
-0x475D	0x79BD	# <CJK>
-0x475E	0x5BDD	# <CJK>
-0x475F	0x6C81	# <CJK>
-0x4760	0x9752	# <CJK>
-0x4761	0x8F7B	# <CJK>
-0x4762	0x6C22	# <CJK>
-0x4763	0x503E	# <CJK>
-0x4764	0x537F	# <CJK>
-0x4765	0x6E05	# <CJK>
-0x4766	0x64CE	# <CJK>
-0x4767	0x6674	# <CJK>
-0x4768	0x6C30	# <CJK>
-0x4769	0x60C5	# <CJK>
-0x476A	0x9877	# <CJK>
-0x476B	0x8BF7	# <CJK>
-0x476C	0x5E86	# <CJK>
-0x476D	0x743C	# <CJK>
-0x476E	0x7A77	# <CJK>
-0x476F	0x79CB	# <CJK>
-0x4770	0x4E18	# <CJK>
-0x4771	0x90B1	# <CJK>
-0x4772	0x7403	# <CJK>
-0x4773	0x6C42	# <CJK>
-0x4774	0x56DA	# <CJK>
-0x4775	0x914B	# <CJK>
-0x4776	0x6CC5	# <CJK>
-0x4777	0x8D8B	# <CJK>
-0x4778	0x533A	# <CJK>
-0x4779	0x86C6	# <CJK>
-0x477A	0x66F2	# <CJK>
-0x477B	0x8EAF	# <CJK>
-0x477C	0x5C48	# <CJK>
-0x477D	0x9A71	# <CJK>
-0x477E	0x6E20	# <CJK>
-0x4821	0x53D6	# <CJK>
-0x4822	0x5A36	# <CJK>
-0x4823	0x9F8B	# <CJK>
-0x4824	0x8DA3	# <CJK>
-0x4825	0x53BB	# <CJK>
-0x4826	0x5708	# <CJK>
-0x4827	0x98A7	# <CJK>
-0x4828	0x6743	# <CJK>
-0x4829	0x919B	# <CJK>
-0x482A	0x6CC9	# <CJK>
-0x482B	0x5168	# <CJK>
-0x482C	0x75CA	# <CJK>
-0x482D	0x62F3	# <CJK>
-0x482E	0x72AC	# <CJK>
-0x482F	0x5238	# <CJK>
-0x4830	0x529D	# <CJK>
-0x4831	0x7F3A	# <CJK>
-0x4832	0x7094	# <CJK>
-0x4833	0x7638	# <CJK>
-0x4834	0x5374	# <CJK>
-0x4835	0x9E4A	# <CJK>
-0x4836	0x69B7	# <CJK>
-0x4837	0x786E	# <CJK>
-0x4838	0x96C0	# <CJK>
-0x4839	0x88D9	# <CJK>
-0x483A	0x7FA4	# <CJK>
-0x483B	0x7136	# <CJK>
-0x483C	0x71C3	# <CJK>
-0x483D	0x5189	# <CJK>
-0x483E	0x67D3	# <CJK>
-0x483F	0x74E4	# <CJK>
-0x4840	0x58E4	# <CJK>
-0x4841	0x6518	# <CJK>
-0x4842	0x56B7	# <CJK>
-0x4843	0x8BA9	# <CJK>
-0x4844	0x9976	# <CJK>
-0x4845	0x6270	# <CJK>
-0x4846	0x7ED5	# <CJK>
-0x4847	0x60F9	# <CJK>
-0x4848	0x70ED	# <CJK>
-0x4849	0x58EC	# <CJK>
-0x484A	0x4EC1	# <CJK>
-0x484B	0x4EBA	# <CJK>
-0x484C	0x5FCD	# <CJK>
-0x484D	0x97E7	# <CJK>
-0x484E	0x4EFB	# <CJK>
-0x484F	0x8BA4	# <CJK>
-0x4850	0x5203	# <CJK>
-0x4851	0x598A	# <CJK>
-0x4852	0x7EAB	# <CJK>
-0x4853	0x6254	# <CJK>
-0x4854	0x4ECD	# <CJK>
-0x4855	0x65E5	# <CJK>
-0x4856	0x620E	# <CJK>
-0x4857	0x8338	# <CJK>
-0x4858	0x84C9	# <CJK>
-0x4859	0x8363	# <CJK>
-0x485A	0x878D	# <CJK>
-0x485B	0x7194	# <CJK>
-0x485C	0x6EB6	# <CJK>
-0x485D	0x5BB9	# <CJK>
-0x485E	0x7ED2	# <CJK>
-0x485F	0x5197	# <CJK>
-0x4860	0x63C9	# <CJK>
-0x4861	0x67D4	# <CJK>
-0x4862	0x8089	# <CJK>
-0x4863	0x8339	# <CJK>
-0x4864	0x8815	# <CJK>
-0x4865	0x5112	# <CJK>
-0x4866	0x5B7A	# <CJK>
-0x4867	0x5982	# <CJK>
-0x4868	0x8FB1	# <CJK>
-0x4869	0x4E73	# <CJK>
-0x486A	0x6C5D	# <CJK>
-0x486B	0x5165	# <CJK>
-0x486C	0x8925	# <CJK>
-0x486D	0x8F6F	# <CJK>
-0x486E	0x962E	# <CJK>
-0x486F	0x854A	# <CJK>
-0x4870	0x745E	# <CJK>
-0x4871	0x9510	# <CJK>
-0x4872	0x95F0	# <CJK>
-0x4873	0x6DA6	# <CJK>
-0x4874	0x82E5	# <CJK>
-0x4875	0x5F31	# <CJK>
-0x4876	0x6492	# <CJK>
-0x4877	0x6D12	# <CJK>
-0x4878	0x8428	# <CJK>
-0x4879	0x816E	# <CJK>
-0x487A	0x9CC3	# <CJK>
-0x487B	0x585E	# <CJK>
-0x487C	0x8D5B	# <CJK>
-0x487D	0x4E09	# <CJK>
-0x487E	0x53C1	# <CJK>
-0x4921	0x4F1E	# <CJK>
-0x4922	0x6563	# <CJK>
-0x4923	0x6851	# <CJK>
-0x4924	0x55D3	# <CJK>
-0x4925	0x4E27	# <CJK>
-0x4926	0x6414	# <CJK>
-0x4927	0x9A9A	# <CJK>
-0x4928	0x626B	# <CJK>
-0x4929	0x5AC2	# <CJK>
-0x492A	0x745F	# <CJK>
-0x492B	0x8272	# <CJK>
-0x492C	0x6DA9	# <CJK>
-0x492D	0x68EE	# <CJK>
-0x492E	0x50E7	# <CJK>
-0x492F	0x838E	# <CJK>
-0x4930	0x7802	# <CJK>
-0x4931	0x6740	# <CJK>
-0x4932	0x5239	# <CJK>
-0x4933	0x6C99	# <CJK>
-0x4934	0x7EB1	# <CJK>
-0x4935	0x50BB	# <CJK>
-0x4936	0x5565	# <CJK>
-0x4937	0x715E	# <CJK>
-0x4938	0x7B5B	# <CJK>
-0x4939	0x6652	# <CJK>
-0x493A	0x73CA	# <CJK>
-0x493B	0x82EB	# <CJK>
-0x493C	0x6749	# <CJK>
-0x493D	0x5C71	# <CJK>
-0x493E	0x5220	# <CJK>
-0x493F	0x717D	# <CJK>
-0x4940	0x886B	# <CJK>
-0x4941	0x95EA	# <CJK>
-0x4942	0x9655	# <CJK>
-0x4943	0x64C5	# <CJK>
-0x4944	0x8D61	# <CJK>
-0x4945	0x81B3	# <CJK>
-0x4946	0x5584	# <CJK>
-0x4947	0x6C55	# <CJK>
-0x4948	0x6247	# <CJK>
-0x4949	0x7F2E	# <CJK>
-0x494A	0x5892	# <CJK>
-0x494B	0x4F24	# <CJK>
-0x494C	0x5546	# <CJK>
-0x494D	0x8D4F	# <CJK>
-0x494E	0x664C	# <CJK>
-0x494F	0x4E0A	# <CJK>
-0x4950	0x5C1A	# <CJK>
-0x4951	0x88F3	# <CJK>
-0x4952	0x68A2	# <CJK>
-0x4953	0x634E	# <CJK>
-0x4954	0x7A0D	# <CJK>
-0x4955	0x70E7	# <CJK>
-0x4956	0x828D	# <CJK>
-0x4957	0x52FA	# <CJK>
-0x4958	0x97F6	# <CJK>
-0x4959	0x5C11	# <CJK>
-0x495A	0x54E8	# <CJK>
-0x495B	0x90B5	# <CJK>
-0x495C	0x7ECD	# <CJK>
-0x495D	0x5962	# <CJK>
-0x495E	0x8D4A	# <CJK>
-0x495F	0x86C7	# <CJK>
-0x4960	0x820C	# <CJK>
-0x4961	0x820D	# <CJK>
-0x4962	0x8D66	# <CJK>
-0x4963	0x6444	# <CJK>
-0x4964	0x5C04	# <CJK>
-0x4965	0x6151	# <CJK>
-0x4966	0x6D89	# <CJK>
-0x4967	0x793E	# <CJK>
-0x4968	0x8BBE	# <CJK>
-0x4969	0x7837	# <CJK>
-0x496A	0x7533	# <CJK>
-0x496B	0x547B	# <CJK>
-0x496C	0x4F38	# <CJK>
-0x496D	0x8EAB	# <CJK>
-0x496E	0x6DF1	# <CJK>
-0x496F	0x5A20	# <CJK>
-0x4970	0x7EC5	# <CJK>
-0x4971	0x795E	# <CJK>
-0x4972	0x6C88	# <CJK>
-0x4973	0x5BA1	# <CJK>
-0x4974	0x5A76	# <CJK>
-0x4975	0x751A	# <CJK>
-0x4976	0x80BE	# <CJK>
-0x4977	0x614E	# <CJK>
-0x4978	0x6E17	# <CJK>
-0x4979	0x58F0	# <CJK>
-0x497A	0x751F	# <CJK>
-0x497B	0x7525	# <CJK>
-0x497C	0x7272	# <CJK>
-0x497D	0x5347	# <CJK>
-0x497E	0x7EF3	# <CJK>
-0x4A21	0x7701	# <CJK>
-0x4A22	0x76DB	# <CJK>
-0x4A23	0x5269	# <CJK>
-0x4A24	0x80DC	# <CJK>
-0x4A25	0x5723	# <CJK>
-0x4A26	0x5E08	# <CJK>
-0x4A27	0x5931	# <CJK>
-0x4A28	0x72EE	# <CJK>
-0x4A29	0x65BD	# <CJK>
-0x4A2A	0x6E7F	# <CJK>
-0x4A2B	0x8BD7	# <CJK>
-0x4A2C	0x5C38	# <CJK>
-0x4A2D	0x8671	# <CJK>
-0x4A2E	0x5341	# <CJK>
-0x4A2F	0x77F3	# <CJK>
-0x4A30	0x62FE	# <CJK>
-0x4A31	0x65F6	# <CJK>
-0x4A32	0x4EC0	# <CJK>
-0x4A33	0x98DF	# <CJK>
-0x4A34	0x8680	# <CJK>
-0x4A35	0x5B9E	# <CJK>
-0x4A36	0x8BC6	# <CJK>
-0x4A37	0x53F2	# <CJK>
-0x4A38	0x77E2	# <CJK>
-0x4A39	0x4F7F	# <CJK>
-0x4A3A	0x5C4E	# <CJK>
-0x4A3B	0x9A76	# <CJK>
-0x4A3C	0x59CB	# <CJK>
-0x4A3D	0x5F0F	# <CJK>
-0x4A3E	0x793A	# <CJK>
-0x4A3F	0x58EB	# <CJK>
-0x4A40	0x4E16	# <CJK>
-0x4A41	0x67FF	# <CJK>
-0x4A42	0x4E8B	# <CJK>
-0x4A43	0x62ED	# <CJK>
-0x4A44	0x8A93	# <CJK>
-0x4A45	0x901D	# <CJK>
-0x4A46	0x52BF	# <CJK>
-0x4A47	0x662F	# <CJK>
-0x4A48	0x55DC	# <CJK>
-0x4A49	0x566C	# <CJK>
-0x4A4A	0x9002	# <CJK>
-0x4A4B	0x4ED5	# <CJK>
-0x4A4C	0x4F8D	# <CJK>
-0x4A4D	0x91CA	# <CJK>
-0x4A4E	0x9970	# <CJK>
-0x4A4F	0x6C0F	# <CJK>
-0x4A50	0x5E02	# <CJK>
-0x4A51	0x6043	# <CJK>
-0x4A52	0x5BA4	# <CJK>
-0x4A53	0x89C6	# <CJK>
-0x4A54	0x8BD5	# <CJK>
-0x4A55	0x6536	# <CJK>
-0x4A56	0x624B	# <CJK>
-0x4A57	0x9996	# <CJK>
-0x4A58	0x5B88	# <CJK>
-0x4A59	0x5BFF	# <CJK>
-0x4A5A	0x6388	# <CJK>
-0x4A5B	0x552E	# <CJK>
-0x4A5C	0x53D7	# <CJK>
-0x4A5D	0x7626	# <CJK>
-0x4A5E	0x517D	# <CJK>
-0x4A5F	0x852C	# <CJK>
-0x4A60	0x67A2	# <CJK>
-0x4A61	0x68B3	# <CJK>
-0x4A62	0x6B8A	# <CJK>
-0x4A63	0x6292	# <CJK>
-0x4A64	0x8F93	# <CJK>
-0x4A65	0x53D4	# <CJK>
-0x4A66	0x8212	# <CJK>
-0x4A67	0x6DD1	# <CJK>
-0x4A68	0x758F	# <CJK>
-0x4A69	0x4E66	# <CJK>
-0x4A6A	0x8D4E	# <CJK>
-0x4A6B	0x5B70	# <CJK>
-0x4A6C	0x719F	# <CJK>
-0x4A6D	0x85AF	# <CJK>
-0x4A6E	0x6691	# <CJK>
-0x4A6F	0x66D9	# <CJK>
-0x4A70	0x7F72	# <CJK>
-0x4A71	0x8700	# <CJK>
-0x4A72	0x9ECD	# <CJK>
-0x4A73	0x9F20	# <CJK>
-0x4A74	0x5C5E	# <CJK>
-0x4A75	0x672F	# <CJK>
-0x4A76	0x8FF0	# <CJK>
-0x4A77	0x6811	# <CJK>
-0x4A78	0x675F	# <CJK>
-0x4A79	0x620D	# <CJK>
-0x4A7A	0x7AD6	# <CJK>
-0x4A7B	0x5885	# <CJK>
-0x4A7C	0x5EB6	# <CJK>
-0x4A7D	0x6570	# <CJK>
-0x4A7E	0x6F31	# <CJK>
-0x4B21	0x6055	# <CJK>
-0x4B22	0x5237	# <CJK>
-0x4B23	0x800D	# <CJK>
-0x4B24	0x6454	# <CJK>
-0x4B25	0x8870	# <CJK>
-0x4B26	0x7529	# <CJK>
-0x4B27	0x5E05	# <CJK>
-0x4B28	0x6813	# <CJK>
-0x4B29	0x62F4	# <CJK>
-0x4B2A	0x971C	# <CJK>
-0x4B2B	0x53CC	# <CJK>
-0x4B2C	0x723D	# <CJK>
-0x4B2D	0x8C01	# <CJK>
-0x4B2E	0x6C34	# <CJK>
-0x4B2F	0x7761	# <CJK>
-0x4B30	0x7A0E	# <CJK>
-0x4B31	0x542E	# <CJK>
-0x4B32	0x77AC	# <CJK>
-0x4B33	0x987A	# <CJK>
-0x4B34	0x821C	# <CJK>
-0x4B35	0x8BF4	# <CJK>
-0x4B36	0x7855	# <CJK>
-0x4B37	0x6714	# <CJK>
-0x4B38	0x70C1	# <CJK>
-0x4B39	0x65AF	# <CJK>
-0x4B3A	0x6495	# <CJK>
-0x4B3B	0x5636	# <CJK>
-0x4B3C	0x601D	# <CJK>
-0x4B3D	0x79C1	# <CJK>
-0x4B3E	0x53F8	# <CJK>
-0x4B3F	0x4E1D	# <CJK>
-0x4B40	0x6B7B	# <CJK>
-0x4B41	0x8086	# <CJK>
-0x4B42	0x5BFA	# <CJK>
-0x4B43	0x55E3	# <CJK>
-0x4B44	0x56DB	# <CJK>
-0x4B45	0x4F3A	# <CJK>
-0x4B46	0x4F3C	# <CJK>
-0x4B47	0x9972	# <CJK>
-0x4B48	0x5DF3	# <CJK>
-0x4B49	0x677E	# <CJK>
-0x4B4A	0x8038	# <CJK>
-0x4B4B	0x6002	# <CJK>
-0x4B4C	0x9882	# <CJK>
-0x4B4D	0x9001	# <CJK>
-0x4B4E	0x5B8B	# <CJK>
-0x4B4F	0x8BBC	# <CJK>
-0x4B50	0x8BF5	# <CJK>
-0x4B51	0x641C	# <CJK>
-0x4B52	0x8258	# <CJK>
-0x4B53	0x64DE	# <CJK>
-0x4B54	0x55FD	# <CJK>
-0x4B55	0x82CF	# <CJK>
-0x4B56	0x9165	# <CJK>
-0x4B57	0x4FD7	# <CJK>
-0x4B58	0x7D20	# <CJK>
-0x4B59	0x901F	# <CJK>
-0x4B5A	0x7C9F	# <CJK>
-0x4B5B	0x50F3	# <CJK>
-0x4B5C	0x5851	# <CJK>
-0x4B5D	0x6EAF	# <CJK>
-0x4B5E	0x5BBF	# <CJK>
-0x4B5F	0x8BC9	# <CJK>
-0x4B60	0x8083	# <CJK>
-0x4B61	0x9178	# <CJK>
-0x4B62	0x849C	# <CJK>
-0x4B63	0x7B97	# <CJK>
-0x4B64	0x867D	# <CJK>
-0x4B65	0x968B	# <CJK>
-0x4B66	0x968F	# <CJK>
-0x4B67	0x7EE5	# <CJK>
-0x4B68	0x9AD3	# <CJK>
-0x4B69	0x788E	# <CJK>
-0x4B6A	0x5C81	# <CJK>
-0x4B6B	0x7A57	# <CJK>
-0x4B6C	0x9042	# <CJK>
-0x4B6D	0x96A7	# <CJK>
-0x4B6E	0x795F	# <CJK>
-0x4B6F	0x5B59	# <CJK>
-0x4B70	0x635F	# <CJK>
-0x4B71	0x7B0B	# <CJK>
-0x4B72	0x84D1	# <CJK>
-0x4B73	0x68AD	# <CJK>
-0x4B74	0x5506	# <CJK>
-0x4B75	0x7F29	# <CJK>
-0x4B76	0x7410	# <CJK>
-0x4B77	0x7D22	# <CJK>
-0x4B78	0x9501	# <CJK>
-0x4B79	0x6240	# <CJK>
-0x4B7A	0x584C	# <CJK>
-0x4B7B	0x4ED6	# <CJK>
-0x4B7C	0x5B83	# <CJK>
-0x4B7D	0x5979	# <CJK>
-0x4B7E	0x5854	# <CJK>
-0x4C21	0x736D	# <CJK>
-0x4C22	0x631E	# <CJK>
-0x4C23	0x8E4B	# <CJK>
-0x4C24	0x8E0F	# <CJK>
-0x4C25	0x80CE	# <CJK>
-0x4C26	0x82D4	# <CJK>
-0x4C27	0x62AC	# <CJK>
-0x4C28	0x53F0	# <CJK>
-0x4C29	0x6CF0	# <CJK>
-0x4C2A	0x915E	# <CJK>
-0x4C2B	0x592A	# <CJK>
-0x4C2C	0x6001	# <CJK>
-0x4C2D	0x6C70	# <CJK>
-0x4C2E	0x574D	# <CJK>
-0x4C2F	0x644A	# <CJK>
-0x4C30	0x8D2A	# <CJK>
-0x4C31	0x762B	# <CJK>
-0x4C32	0x6EE9	# <CJK>
-0x4C33	0x575B	# <CJK>
-0x4C34	0x6A80	# <CJK>
-0x4C35	0x75F0	# <CJK>
-0x4C36	0x6F6D	# <CJK>
-0x4C37	0x8C2D	# <CJK>
-0x4C38	0x8C08	# <CJK>
-0x4C39	0x5766	# <CJK>
-0x4C3A	0x6BEF	# <CJK>
-0x4C3B	0x8892	# <CJK>
-0x4C3C	0x78B3	# <CJK>
-0x4C3D	0x63A2	# <CJK>
-0x4C3E	0x53F9	# <CJK>
-0x4C3F	0x70AD	# <CJK>
-0x4C40	0x6C64	# <CJK>
-0x4C41	0x5858	# <CJK>
-0x4C42	0x642A	# <CJK>
-0x4C43	0x5802	# <CJK>
-0x4C44	0x68E0	# <CJK>
-0x4C45	0x819B	# <CJK>
-0x4C46	0x5510	# <CJK>
-0x4C47	0x7CD6	# <CJK>
-0x4C48	0x5018	# <CJK>
-0x4C49	0x8EBA	# <CJK>
-0x4C4A	0x6DCC	# <CJK>
-0x4C4B	0x8D9F	# <CJK>
-0x4C4C	0x70EB	# <CJK>
-0x4C4D	0x638F	# <CJK>
-0x4C4E	0x6D9B	# <CJK>
-0x4C4F	0x6ED4	# <CJK>
-0x4C50	0x7EE6	# <CJK>
-0x4C51	0x8404	# <CJK>
-0x4C52	0x6843	# <CJK>
-0x4C53	0x9003	# <CJK>
-0x4C54	0x6DD8	# <CJK>
-0x4C55	0x9676	# <CJK>
-0x4C56	0x8BA8	# <CJK>
-0x4C57	0x5957	# <CJK>
-0x4C58	0x7279	# <CJK>
-0x4C59	0x85E4	# <CJK>
-0x4C5A	0x817E	# <CJK>
-0x4C5B	0x75BC	# <CJK>
-0x4C5C	0x8A8A	# <CJK>
-0x4C5D	0x68AF	# <CJK>
-0x4C5E	0x5254	# <CJK>
-0x4C5F	0x8E22	# <CJK>
-0x4C60	0x9511	# <CJK>
-0x4C61	0x63D0	# <CJK>
-0x4C62	0x9898	# <CJK>
-0x4C63	0x8E44	# <CJK>
-0x4C64	0x557C	# <CJK>
-0x4C65	0x4F53	# <CJK>
-0x4C66	0x66FF	# <CJK>
-0x4C67	0x568F	# <CJK>
-0x4C68	0x60D5	# <CJK>
-0x4C69	0x6D95	# <CJK>
-0x4C6A	0x5243	# <CJK>
-0x4C6B	0x5C49	# <CJK>
-0x4C6C	0x5929	# <CJK>
-0x4C6D	0x6DFB	# <CJK>
-0x4C6E	0x586B	# <CJK>
-0x4C6F	0x7530	# <CJK>
-0x4C70	0x751C	# <CJK>
-0x4C71	0x606C	# <CJK>
-0x4C72	0x8214	# <CJK>
-0x4C73	0x8146	# <CJK>
-0x4C74	0x6311	# <CJK>
-0x4C75	0x6761	# <CJK>
-0x4C76	0x8FE2	# <CJK>
-0x4C77	0x773A	# <CJK>
-0x4C78	0x8DF3	# <CJK>
-0x4C79	0x8D34	# <CJK>
-0x4C7A	0x94C1	# <CJK>
-0x4C7B	0x5E16	# <CJK>
-0x4C7C	0x5385	# <CJK>
-0x4C7D	0x542C	# <CJK>
-0x4C7E	0x70C3	# <CJK>
-0x4D21	0x6C40	# <CJK>
-0x4D22	0x5EF7	# <CJK>
-0x4D23	0x505C	# <CJK>
-0x4D24	0x4EAD	# <CJK>
-0x4D25	0x5EAD	# <CJK>
-0x4D26	0x633A	# <CJK>
-0x4D27	0x8247	# <CJK>
-0x4D28	0x901A	# <CJK>
-0x4D29	0x6850	# <CJK>
-0x4D2A	0x916E	# <CJK>
-0x4D2B	0x77B3	# <CJK>
-0x4D2C	0x540C	# <CJK>
-0x4D2D	0x94DC	# <CJK>
-0x4D2E	0x5F64	# <CJK>
-0x4D2F	0x7AE5	# <CJK>
-0x4D30	0x6876	# <CJK>
-0x4D31	0x6345	# <CJK>
-0x4D32	0x7B52	# <CJK>
-0x4D33	0x7EDF	# <CJK>
-0x4D34	0x75DB	# <CJK>
-0x4D35	0x5077	# <CJK>
-0x4D36	0x6295	# <CJK>
-0x4D37	0x5934	# <CJK>
-0x4D38	0x900F	# <CJK>
-0x4D39	0x51F8	# <CJK>
-0x4D3A	0x79C3	# <CJK>
-0x4D3B	0x7A81	# <CJK>
-0x4D3C	0x56FE	# <CJK>
-0x4D3D	0x5F92	# <CJK>
-0x4D3E	0x9014	# <CJK>
-0x4D3F	0x6D82	# <CJK>
-0x4D40	0x5C60	# <CJK>
-0x4D41	0x571F	# <CJK>
-0x4D42	0x5410	# <CJK>
-0x4D43	0x5154	# <CJK>
-0x4D44	0x6E4D	# <CJK>
-0x4D45	0x56E2	# <CJK>
-0x4D46	0x63A8	# <CJK>
-0x4D47	0x9893	# <CJK>
-0x4D48	0x817F	# <CJK>
-0x4D49	0x8715	# <CJK>
-0x4D4A	0x892A	# <CJK>
-0x4D4B	0x9000	# <CJK>
-0x4D4C	0x541E	# <CJK>
-0x4D4D	0x5C6F	# <CJK>
-0x4D4E	0x81C0	# <CJK>
-0x4D4F	0x62D6	# <CJK>
-0x4D50	0x6258	# <CJK>
-0x4D51	0x8131	# <CJK>
-0x4D52	0x9E35	# <CJK>
-0x4D53	0x9640	# <CJK>
-0x4D54	0x9A6E	# <CJK>
-0x4D55	0x9A7C	# <CJK>
-0x4D56	0x692D	# <CJK>
-0x4D57	0x59A5	# <CJK>
-0x4D58	0x62D3	# <CJK>
-0x4D59	0x553E	# <CJK>
-0x4D5A	0x6316	# <CJK>
-0x4D5B	0x54C7	# <CJK>
-0x4D5C	0x86D9	# <CJK>
-0x4D5D	0x6D3C	# <CJK>
-0x4D5E	0x5A03	# <CJK>
-0x4D5F	0x74E6	# <CJK>
-0x4D60	0x889C	# <CJK>
-0x4D61	0x6B6A	# <CJK>
-0x4D62	0x5916	# <CJK>
-0x4D63	0x8C4C	# <CJK>
-0x4D64	0x5F2F	# <CJK>
-0x4D65	0x6E7E	# <CJK>
-0x4D66	0x73A9	# <CJK>
-0x4D67	0x987D	# <CJK>
-0x4D68	0x4E38	# <CJK>
-0x4D69	0x70F7	# <CJK>
-0x4D6A	0x5B8C	# <CJK>
-0x4D6B	0x7897	# <CJK>
-0x4D6C	0x633D	# <CJK>
-0x4D6D	0x665A	# <CJK>
-0x4D6E	0x7696	# <CJK>
-0x4D6F	0x60CB	# <CJK>
-0x4D70	0x5B9B	# <CJK>
-0x4D71	0x5A49	# <CJK>
-0x4D72	0x4E07	# <CJK>
-0x4D73	0x8155	# <CJK>
-0x4D74	0x6C6A	# <CJK>
-0x4D75	0x738B	# <CJK>
-0x4D76	0x4EA1	# <CJK>
-0x4D77	0x6789	# <CJK>
-0x4D78	0x7F51	# <CJK>
-0x4D79	0x5F80	# <CJK>
-0x4D7A	0x65FA	# <CJK>
-0x4D7B	0x671B	# <CJK>
-0x4D7C	0x5FD8	# <CJK>
-0x4D7D	0x5984	# <CJK>
-0x4D7E	0x5A01	# <CJK>
-0x4E21	0x5DCD	# <CJK>
-0x4E22	0x5FAE	# <CJK>
-0x4E23	0x5371	# <CJK>
-0x4E24	0x97E6	# <CJK>
-0x4E25	0x8FDD	# <CJK>
-0x4E26	0x6845	# <CJK>
-0x4E27	0x56F4	# <CJK>
-0x4E28	0x552F	# <CJK>
-0x4E29	0x60DF	# <CJK>
-0x4E2A	0x4E3A	# <CJK>
-0x4E2B	0x6F4D	# <CJK>
-0x4E2C	0x7EF4	# <CJK>
-0x4E2D	0x82C7	# <CJK>
-0x4E2E	0x840E	# <CJK>
-0x4E2F	0x59D4	# <CJK>
-0x4E30	0x4F1F	# <CJK>
-0x4E31	0x4F2A	# <CJK>
-0x4E32	0x5C3E	# <CJK>
-0x4E33	0x7EAC	# <CJK>
-0x4E34	0x672A	# <CJK>
-0x4E35	0x851A	# <CJK>
-0x4E36	0x5473	# <CJK>
-0x4E37	0x754F	# <CJK>
-0x4E38	0x80C3	# <CJK>
-0x4E39	0x5582	# <CJK>
-0x4E3A	0x9B4F	# <CJK>
-0x4E3B	0x4F4D	# <CJK>
-0x4E3C	0x6E2D	# <CJK>
-0x4E3D	0x8C13	# <CJK>
-0x4E3E	0x5C09	# <CJK>
-0x4E3F	0x6170	# <CJK>
-0x4E40	0x536B	# <CJK>
-0x4E41	0x761F	# <CJK>
-0x4E42	0x6E29	# <CJK>
-0x4E43	0x868A	# <CJK>
-0x4E44	0x6587	# <CJK>
-0x4E45	0x95FB	# <CJK>
-0x4E46	0x7EB9	# <CJK>
-0x4E47	0x543B	# <CJK>
-0x4E48	0x7A33	# <CJK>
-0x4E49	0x7D0A	# <CJK>
-0x4E4A	0x95EE	# <CJK>
-0x4E4B	0x55E1	# <CJK>
-0x4E4C	0x7FC1	# <CJK>
-0x4E4D	0x74EE	# <CJK>
-0x4E4E	0x631D	# <CJK>
-0x4E4F	0x8717	# <CJK>
-0x4E50	0x6DA1	# <CJK>
-0x4E51	0x7A9D	# <CJK>
-0x4E52	0x6211	# <CJK>
-0x4E53	0x65A1	# <CJK>
-0x4E54	0x5367	# <CJK>
-0x4E55	0x63E1	# <CJK>
-0x4E56	0x6C83	# <CJK>
-0x4E57	0x5DEB	# <CJK>
-0x4E58	0x545C	# <CJK>
-0x4E59	0x94A8	# <CJK>
-0x4E5A	0x4E4C	# <CJK>
-0x4E5B	0x6C61	# <CJK>
-0x4E5C	0x8BEC	# <CJK>
-0x4E5D	0x5C4B	# <CJK>
-0x4E5E	0x65E0	# <CJK>
-0x4E5F	0x829C	# <CJK>
-0x4E60	0x68A7	# <CJK>
-0x4E61	0x543E	# <CJK>
-0x4E62	0x5434	# <CJK>
-0x4E63	0x6BCB	# <CJK>
-0x4E64	0x6B66	# <CJK>
-0x4E65	0x4E94	# <CJK>
-0x4E66	0x6342	# <CJK>
-0x4E67	0x5348	# <CJK>
-0x4E68	0x821E	# <CJK>
-0x4E69	0x4F0D	# <CJK>
-0x4E6A	0x4FAE	# <CJK>
-0x4E6B	0x575E	# <CJK>
-0x4E6C	0x620A	# <CJK>
-0x4E6D	0x96FE	# <CJK>
-0x4E6E	0x6664	# <CJK>
-0x4E6F	0x7269	# <CJK>
-0x4E70	0x52FF	# <CJK>
-0x4E71	0x52A1	# <CJK>
-0x4E72	0x609F	# <CJK>
-0x4E73	0x8BEF	# <CJK>
-0x4E74	0x6614	# <CJK>
-0x4E75	0x7199	# <CJK>
-0x4E76	0x6790	# <CJK>
-0x4E77	0x897F	# <CJK>
-0x4E78	0x7852	# <CJK>
-0x4E79	0x77FD	# <CJK>
-0x4E7A	0x6670	# <CJK>
-0x4E7B	0x563B	# <CJK>
-0x4E7C	0x5438	# <CJK>
-0x4E7D	0x9521	# <CJK>
-0x4E7E	0x727A	# <CJK>
-0x4F21	0x7A00	# <CJK>
-0x4F22	0x606F	# <CJK>
-0x4F23	0x5E0C	# <CJK>
-0x4F24	0x6089	# <CJK>
-0x4F25	0x819D	# <CJK>
-0x4F26	0x5915	# <CJK>
-0x4F27	0x60DC	# <CJK>
-0x4F28	0x7184	# <CJK>
-0x4F29	0x70EF	# <CJK>
-0x4F2A	0x6EAA	# <CJK>
-0x4F2B	0x6C50	# <CJK>
-0x4F2C	0x7280	# <CJK>
-0x4F2D	0x6A84	# <CJK>
-0x4F2E	0x88AD	# <CJK>
-0x4F2F	0x5E2D	# <CJK>
-0x4F30	0x4E60	# <CJK>
-0x4F31	0x5AB3	# <CJK>
-0x4F32	0x559C	# <CJK>
-0x4F33	0x94E3	# <CJK>
-0x4F34	0x6D17	# <CJK>
-0x4F35	0x7CFB	# <CJK>
-0x4F36	0x9699	# <CJK>
-0x4F37	0x620F	# <CJK>
-0x4F38	0x7EC6	# <CJK>
-0x4F39	0x778E	# <CJK>
-0x4F3A	0x867E	# <CJK>
-0x4F3B	0x5323	# <CJK>
-0x4F3C	0x971E	# <CJK>
-0x4F3D	0x8F96	# <CJK>
-0x4F3E	0x6687	# <CJK>
-0x4F3F	0x5CE1	# <CJK>
-0x4F40	0x4FA0	# <CJK>
-0x4F41	0x72ED	# <CJK>
-0x4F42	0x4E0B	# <CJK>
-0x4F43	0x53A6	# <CJK>
-0x4F44	0x590F	# <CJK>
-0x4F45	0x5413	# <CJK>
-0x4F46	0x6380	# <CJK>
-0x4F47	0x9528	# <CJK>
-0x4F48	0x5148	# <CJK>
-0x4F49	0x4ED9	# <CJK>
-0x4F4A	0x9C9C	# <CJK>
-0x4F4B	0x7EA4	# <CJK>
-0x4F4C	0x54B8	# <CJK>
-0x4F4D	0x8D24	# <CJK>
-0x4F4E	0x8854	# <CJK>
-0x4F4F	0x8237	# <CJK>
-0x4F50	0x95F2	# <CJK>
-0x4F51	0x6D8E	# <CJK>
-0x4F52	0x5F26	# <CJK>
-0x4F53	0x5ACC	# <CJK>
-0x4F54	0x663E	# <CJK>
-0x4F55	0x9669	# <CJK>
-0x4F56	0x73B0	# <CJK>
-0x4F57	0x732E	# <CJK>
-0x4F58	0x53BF	# <CJK>
-0x4F59	0x817A	# <CJK>
-0x4F5A	0x9985	# <CJK>
-0x4F5B	0x7FA1	# <CJK>
-0x4F5C	0x5BAA	# <CJK>
-0x4F5D	0x9677	# <CJK>
-0x4F5E	0x9650	# <CJK>
-0x4F5F	0x7EBF	# <CJK>
-0x4F60	0x76F8	# <CJK>
-0x4F61	0x53A2	# <CJK>
-0x4F62	0x9576	# <CJK>
-0x4F63	0x9999	# <CJK>
-0x4F64	0x7BB1	# <CJK>
-0x4F65	0x8944	# <CJK>
-0x4F66	0x6E58	# <CJK>
-0x4F67	0x4E61	# <CJK>
-0x4F68	0x7FD4	# <CJK>
-0x4F69	0x7965	# <CJK>
-0x4F6A	0x8BE6	# <CJK>
-0x4F6B	0x60F3	# <CJK>
-0x4F6C	0x54CD	# <CJK>
-0x4F6D	0x4EAB	# <CJK>
-0x4F6E	0x9879	# <CJK>
-0x4F6F	0x5DF7	# <CJK>
-0x4F70	0x6A61	# <CJK>
-0x4F71	0x50CF	# <CJK>
-0x4F72	0x5411	# <CJK>
-0x4F73	0x8C61	# <CJK>
-0x4F74	0x8427	# <CJK>
-0x4F75	0x785D	# <CJK>
-0x4F76	0x9704	# <CJK>
-0x4F77	0x524A	# <CJK>
-0x4F78	0x54EE	# <CJK>
-0x4F79	0x56A3	# <CJK>
-0x4F7A	0x9500	# <CJK>
-0x4F7B	0x6D88	# <CJK>
-0x4F7C	0x5BB5	# <CJK>
-0x4F7D	0x6DC6	# <CJK>
-0x4F7E	0x6653	# <CJK>
-0x5021	0x5C0F	# <CJK>
-0x5022	0x5B5D	# <CJK>
-0x5023	0x6821	# <CJK>
-0x5024	0x8096	# <CJK>
-0x5025	0x5578	# <CJK>
-0x5026	0x7B11	# <CJK>
-0x5027	0x6548	# <CJK>
-0x5028	0x6954	# <CJK>
-0x5029	0x4E9B	# <CJK>
-0x502A	0x6B47	# <CJK>
-0x502B	0x874E	# <CJK>
-0x502C	0x978B	# <CJK>
-0x502D	0x534F	# <CJK>
-0x502E	0x631F	# <CJK>
-0x502F	0x643A	# <CJK>
-0x5030	0x90AA	# <CJK>
-0x5031	0x659C	# <CJK>
-0x5032	0x80C1	# <CJK>
-0x5033	0x8C10	# <CJK>
-0x5034	0x5199	# <CJK>
-0x5035	0x68B0	# <CJK>
-0x5036	0x5378	# <CJK>
-0x5037	0x87F9	# <CJK>
-0x5038	0x61C8	# <CJK>
-0x5039	0x6CC4	# <CJK>
-0x503A	0x6CFB	# <CJK>
-0x503B	0x8C22	# <CJK>
-0x503C	0x5C51	# <CJK>
-0x503D	0x85AA	# <CJK>
-0x503E	0x82AF	# <CJK>
-0x503F	0x950C	# <CJK>
-0x5040	0x6B23	# <CJK>
-0x5041	0x8F9B	# <CJK>
-0x5042	0x65B0	# <CJK>
-0x5043	0x5FFB	# <CJK>
-0x5044	0x5FC3	# <CJK>
-0x5045	0x4FE1	# <CJK>
-0x5046	0x8845	# <CJK>
-0x5047	0x661F	# <CJK>
-0x5048	0x8165	# <CJK>
-0x5049	0x7329	# <CJK>
-0x504A	0x60FA	# <CJK>
-0x504B	0x5174	# <CJK>
-0x504C	0x5211	# <CJK>
-0x504D	0x578B	# <CJK>
-0x504E	0x5F62	# <CJK>
-0x504F	0x90A2	# <CJK>
-0x5050	0x884C	# <CJK>
-0x5051	0x9192	# <CJK>
-0x5052	0x5E78	# <CJK>
-0x5053	0x674F	# <CJK>
-0x5054	0x6027	# <CJK>
-0x5055	0x59D3	# <CJK>
-0x5056	0x5144	# <CJK>
-0x5057	0x51F6	# <CJK>
-0x5058	0x80F8	# <CJK>
-0x5059	0x5308	# <CJK>
-0x505A	0x6C79	# <CJK>
-0x505B	0x96C4	# <CJK>
-0x505C	0x718A	# <CJK>
-0x505D	0x4F11	# <CJK>
-0x505E	0x4FEE	# <CJK>
-0x505F	0x7F9E	# <CJK>
-0x5060	0x673D	# <CJK>
-0x5061	0x55C5	# <CJK>
-0x5062	0x9508	# <CJK>
-0x5063	0x79C0	# <CJK>
-0x5064	0x8896	# <CJK>
-0x5065	0x7EE3	# <CJK>
-0x5066	0x589F	# <CJK>
-0x5067	0x620C	# <CJK>
-0x5068	0x9700	# <CJK>
-0x5069	0x865A	# <CJK>
-0x506A	0x5618	# <CJK>
-0x506B	0x987B	# <CJK>
-0x506C	0x5F90	# <CJK>
-0x506D	0x8BB8	# <CJK>
-0x506E	0x84C4	# <CJK>
-0x506F	0x9157	# <CJK>
-0x5070	0x53D9	# <CJK>
-0x5071	0x65ED	# <CJK>
-0x5072	0x5E8F	# <CJK>
-0x5073	0x755C	# <CJK>
-0x5074	0x6064	# <CJK>
-0x5075	0x7D6E	# <CJK>
-0x5076	0x5A7F	# <CJK>
-0x5077	0x7EEA	# <CJK>
-0x5078	0x7EED	# <CJK>
-0x5079	0x8F69	# <CJK>
-0x507A	0x55A7	# <CJK>
-0x507B	0x5BA3	# <CJK>
-0x507C	0x60AC	# <CJK>
-0x507D	0x65CB	# <CJK>
-0x507E	0x7384	# <CJK>
-0x5121	0x9009	# <CJK>
-0x5122	0x7663	# <CJK>
-0x5123	0x7729	# <CJK>
-0x5124	0x7EDA	# <CJK>
-0x5125	0x9774	# <CJK>
-0x5126	0x859B	# <CJK>
-0x5127	0x5B66	# <CJK>
-0x5128	0x7A74	# <CJK>
-0x5129	0x96EA	# <CJK>
-0x512A	0x8840	# <CJK>
-0x512B	0x52CB	# <CJK>
-0x512C	0x718F	# <CJK>
-0x512D	0x5FAA	# <CJK>
-0x512E	0x65EC	# <CJK>
-0x512F	0x8BE2	# <CJK>
-0x5130	0x5BFB	# <CJK>
-0x5131	0x9A6F	# <CJK>
-0x5132	0x5DE1	# <CJK>
-0x5133	0x6B89	# <CJK>
-0x5134	0x6C5B	# <CJK>
-0x5135	0x8BAD	# <CJK>
-0x5136	0x8BAF	# <CJK>
-0x5137	0x900A	# <CJK>
-0x5138	0x8FC5	# <CJK>
-0x5139	0x538B	# <CJK>
-0x513A	0x62BC	# <CJK>
-0x513B	0x9E26	# <CJK>
-0x513C	0x9E2D	# <CJK>
-0x513D	0x5440	# <CJK>
-0x513E	0x4E2B	# <CJK>
-0x513F	0x82BD	# <CJK>
-0x5140	0x7259	# <CJK>
-0x5141	0x869C	# <CJK>
-0x5142	0x5D16	# <CJK>
-0x5143	0x8859	# <CJK>
-0x5144	0x6DAF	# <CJK>
-0x5145	0x96C5	# <CJK>
-0x5146	0x54D1	# <CJK>
-0x5147	0x4E9A	# <CJK>
-0x5148	0x8BB6	# <CJK>
-0x5149	0x7109	# <CJK>
-0x514A	0x54BD	# <CJK>
-0x514B	0x9609	# <CJK>
-0x514C	0x70DF	# <CJK>
-0x514D	0x6DF9	# <CJK>
-0x514E	0x76D0	# <CJK>
-0x514F	0x4E25	# <CJK>
-0x5150	0x7814	# <CJK>
-0x5151	0x8712	# <CJK>
-0x5152	0x5CA9	# <CJK>
-0x5153	0x5EF6	# <CJK>
-0x5154	0x8A00	# <CJK>
-0x5155	0x989C	# <CJK>
-0x5156	0x960E	# <CJK>
-0x5157	0x708E	# <CJK>
-0x5158	0x6CBF	# <CJK>
-0x5159	0x5944	# <CJK>
-0x515A	0x63A9	# <CJK>
-0x515B	0x773C	# <CJK>
-0x515C	0x884D	# <CJK>
-0x515D	0x6F14	# <CJK>
-0x515E	0x8273	# <CJK>
-0x515F	0x5830	# <CJK>
-0x5160	0x71D5	# <CJK>
-0x5161	0x538C	# <CJK>
-0x5162	0x781A	# <CJK>
-0x5163	0x96C1	# <CJK>
-0x5164	0x5501	# <CJK>
-0x5165	0x5F66	# <CJK>
-0x5166	0x7130	# <CJK>
-0x5167	0x5BB4	# <CJK>
-0x5168	0x8C1A	# <CJK>
-0x5169	0x9A8C	# <CJK>
-0x516A	0x6B83	# <CJK>
-0x516B	0x592E	# <CJK>
-0x516C	0x9E2F	# <CJK>
-0x516D	0x79E7	# <CJK>
-0x516E	0x6768	# <CJK>
-0x516F	0x626C	# <CJK>
-0x5170	0x4F6F	# <CJK>
-0x5171	0x75A1	# <CJK>
-0x5172	0x7F8A	# <CJK>
-0x5173	0x6D0B	# <CJK>
-0x5174	0x9633	# <CJK>
-0x5175	0x6C27	# <CJK>
-0x5176	0x4EF0	# <CJK>
-0x5177	0x75D2	# <CJK>
-0x5178	0x517B	# <CJK>
-0x5179	0x6837	# <CJK>
-0x517A	0x6F3E	# <CJK>
-0x517B	0x9080	# <CJK>
-0x517C	0x8170	# <CJK>
-0x517D	0x5996	# <CJK>
-0x517E	0x7476	# <CJK>
-0x5221	0x6447	# <CJK>
-0x5222	0x5C27	# <CJK>
-0x5223	0x9065	# <CJK>
-0x5224	0x7A91	# <CJK>
-0x5225	0x8C23	# <CJK>
-0x5226	0x59DA	# <CJK>
-0x5227	0x54AC	# <CJK>
-0x5228	0x8200	# <CJK>
-0x5229	0x836F	# <CJK>
-0x522A	0x8981	# <CJK>
-0x522B	0x8000	# <CJK>
-0x522C	0x6930	# <CJK>
-0x522D	0x564E	# <CJK>
-0x522E	0x8036	# <CJK>
-0x522F	0x7237	# <CJK>
-0x5230	0x91CE	# <CJK>
-0x5231	0x51B6	# <CJK>
-0x5232	0x4E5F	# <CJK>
-0x5233	0x9875	# <CJK>
-0x5234	0x6396	# <CJK>
-0x5235	0x4E1A	# <CJK>
-0x5236	0x53F6	# <CJK>
-0x5237	0x66F3	# <CJK>
-0x5238	0x814B	# <CJK>
-0x5239	0x591C	# <CJK>
-0x523A	0x6DB2	# <CJK>
-0x523B	0x4E00	# <CJK>
-0x523C	0x58F9	# <CJK>
-0x523D	0x533B	# <CJK>
-0x523E	0x63D6	# <CJK>
-0x523F	0x94F1	# <CJK>
-0x5240	0x4F9D	# <CJK>
-0x5241	0x4F0A	# <CJK>
-0x5242	0x8863	# <CJK>
-0x5243	0x9890	# <CJK>
-0x5244	0x5937	# <CJK>
-0x5245	0x9057	# <CJK>
-0x5246	0x79FB	# <CJK>
-0x5247	0x4EEA	# <CJK>
-0x5248	0x80F0	# <CJK>
-0x5249	0x7591	# <CJK>
-0x524A	0x6C82	# <CJK>
-0x524B	0x5B9C	# <CJK>
-0x524C	0x59E8	# <CJK>
-0x524D	0x5F5D	# <CJK>
-0x524E	0x6905	# <CJK>
-0x524F	0x8681	# <CJK>
-0x5250	0x501A	# <CJK>
-0x5251	0x5DF2	# <CJK>
-0x5252	0x4E59	# <CJK>
-0x5253	0x77E3	# <CJK>
-0x5254	0x4EE5	# <CJK>
-0x5255	0x827A	# <CJK>
-0x5256	0x6291	# <CJK>
-0x5257	0x6613	# <CJK>
-0x5258	0x9091	# <CJK>
-0x5259	0x5C79	# <CJK>
-0x525A	0x4EBF	# <CJK>
-0x525B	0x5F79	# <CJK>
-0x525C	0x81C6	# <CJK>
-0x525D	0x9038	# <CJK>
-0x525E	0x8084	# <CJK>
-0x525F	0x75AB	# <CJK>
-0x5260	0x4EA6	# <CJK>
-0x5261	0x88D4	# <CJK>
-0x5262	0x610F	# <CJK>
-0x5263	0x6BC5	# <CJK>
-0x5264	0x5FC6	# <CJK>
-0x5265	0x4E49	# <CJK>
-0x5266	0x76CA	# <CJK>
-0x5267	0x6EA2	# <CJK>
-0x5268	0x8BE3	# <CJK>
-0x5269	0x8BAE	# <CJK>
-0x526A	0x8C0A	# <CJK>
-0x526B	0x8BD1	# <CJK>
-0x526C	0x5F02	# <CJK>
-0x526D	0x7FFC	# <CJK>
-0x526E	0x7FCC	# <CJK>
-0x526F	0x7ECE	# <CJK>
-0x5270	0x8335	# <CJK>
-0x5271	0x836B	# <CJK>
-0x5272	0x56E0	# <CJK>
-0x5273	0x6BB7	# <CJK>
-0x5274	0x97F3	# <CJK>
-0x5275	0x9634	# <CJK>
-0x5276	0x59FB	# <CJK>
-0x5277	0x541F	# <CJK>
-0x5278	0x94F6	# <CJK>
-0x5279	0x6DEB	# <CJK>
-0x527A	0x5BC5	# <CJK>
-0x527B	0x996E	# <CJK>
-0x527C	0x5C39	# <CJK>
-0x527D	0x5F15	# <CJK>
-0x527E	0x9690	# <CJK>
-0x5321	0x5370	# <CJK>
-0x5322	0x82F1	# <CJK>
-0x5323	0x6A31	# <CJK>
-0x5324	0x5A74	# <CJK>
-0x5325	0x9E70	# <CJK>
-0x5326	0x5E94	# <CJK>
-0x5327	0x7F28	# <CJK>
-0x5328	0x83B9	# <CJK>
-0x5329	0x8424	# <CJK>
-0x532A	0x8425	# <CJK>
-0x532B	0x8367	# <CJK>
-0x532C	0x8747	# <CJK>
-0x532D	0x8FCE	# <CJK>
-0x532E	0x8D62	# <CJK>
-0x532F	0x76C8	# <CJK>
-0x5330	0x5F71	# <CJK>
-0x5331	0x9896	# <CJK>
-0x5332	0x786C	# <CJK>
-0x5333	0x6620	# <CJK>
-0x5334	0x54DF	# <CJK>
-0x5335	0x62E5	# <CJK>
-0x5336	0x4F63	# <CJK>
-0x5337	0x81C3	# <CJK>
-0x5338	0x75C8	# <CJK>
-0x5339	0x5EB8	# <CJK>
-0x533A	0x96CD	# <CJK>
-0x533B	0x8E0A	# <CJK>
-0x533C	0x86F9	# <CJK>
-0x533D	0x548F	# <CJK>
-0x533E	0x6CF3	# <CJK>
-0x533F	0x6D8C	# <CJK>
-0x5340	0x6C38	# <CJK>
-0x5341	0x607F	# <CJK>
-0x5342	0x52C7	# <CJK>
-0x5343	0x7528	# <CJK>
-0x5344	0x5E7D	# <CJK>
-0x5345	0x4F18	# <CJK>
-0x5346	0x60A0	# <CJK>
-0x5347	0x5FE7	# <CJK>
-0x5348	0x5C24	# <CJK>
-0x5349	0x7531	# <CJK>
-0x534A	0x90AE	# <CJK>
-0x534B	0x94C0	# <CJK>
-0x534C	0x72B9	# <CJK>
-0x534D	0x6CB9	# <CJK>
-0x534E	0x6E38	# <CJK>
-0x534F	0x9149	# <CJK>
-0x5350	0x6709	# <CJK>
-0x5351	0x53CB	# <CJK>
-0x5352	0x53F3	# <CJK>
-0x5353	0x4F51	# <CJK>
-0x5354	0x91C9	# <CJK>
-0x5355	0x8BF1	# <CJK>
-0x5356	0x53C8	# <CJK>
-0x5357	0x5E7C	# <CJK>
-0x5358	0x8FC2	# <CJK>
-0x5359	0x6DE4	# <CJK>
-0x535A	0x4E8E	# <CJK>
-0x535B	0x76C2	# <CJK>
-0x535C	0x6986	# <CJK>
-0x535D	0x865E	# <CJK>
-0x535E	0x611A	# <CJK>
-0x535F	0x8206	# <CJK>
-0x5360	0x4F59	# <CJK>
-0x5361	0x4FDE	# <CJK>
-0x5362	0x903E	# <CJK>
-0x5363	0x9C7C	# <CJK>
-0x5364	0x6109	# <CJK>
-0x5365	0x6E1D	# <CJK>
-0x5366	0x6E14	# <CJK>
-0x5367	0x9685	# <CJK>
-0x5368	0x4E88	# <CJK>
-0x5369	0x5A31	# <CJK>
-0x536A	0x96E8	# <CJK>
-0x536B	0x4E0E	# <CJK>
-0x536C	0x5C7F	# <CJK>
-0x536D	0x79B9	# <CJK>
-0x536E	0x5B87	# <CJK>
-0x536F	0x8BED	# <CJK>
-0x5370	0x7FBD	# <CJK>
-0x5371	0x7389	# <CJK>
-0x5372	0x57DF	# <CJK>
-0x5373	0x828B	# <CJK>
-0x5374	0x90C1	# <CJK>
-0x5375	0x5401	# <CJK>
-0x5376	0x9047	# <CJK>
-0x5377	0x55BB	# <CJK>
-0x5378	0x5CEA	# <CJK>
-0x5379	0x5FA1	# <CJK>
-0x537A	0x6108	# <CJK>
-0x537B	0x6B32	# <CJK>
-0x537C	0x72F1	# <CJK>
-0x537D	0x80B2	# <CJK>
-0x537E	0x8A89	# <CJK>
-0x5421	0x6D74	# <CJK>
-0x5422	0x5BD3	# <CJK>
-0x5423	0x88D5	# <CJK>
-0x5424	0x9884	# <CJK>
-0x5425	0x8C6B	# <CJK>
-0x5426	0x9A6D	# <CJK>
-0x5427	0x9E33	# <CJK>
-0x5428	0x6E0A	# <CJK>
-0x5429	0x51A4	# <CJK>
-0x542A	0x5143	# <CJK>
-0x542B	0x57A3	# <CJK>
-0x542C	0x8881	# <CJK>
-0x542D	0x539F	# <CJK>
-0x542E	0x63F4	# <CJK>
-0x542F	0x8F95	# <CJK>
-0x5430	0x56ED	# <CJK>
-0x5431	0x5458	# <CJK>
-0x5432	0x5706	# <CJK>
-0x5433	0x733F	# <CJK>
-0x5434	0x6E90	# <CJK>
-0x5435	0x7F18	# <CJK>
-0x5436	0x8FDC	# <CJK>
-0x5437	0x82D1	# <CJK>
-0x5438	0x613F	# <CJK>
-0x5439	0x6028	# <CJK>
-0x543A	0x9662	# <CJK>
-0x543B	0x66F0	# <CJK>
-0x543C	0x7EA6	# <CJK>
-0x543D	0x8D8A	# <CJK>
-0x543E	0x8DC3	# <CJK>
-0x543F	0x94A5	# <CJK>
-0x5440	0x5CB3	# <CJK>
-0x5441	0x7CA4	# <CJK>
-0x5442	0x6708	# <CJK>
-0x5443	0x60A6	# <CJK>
-0x5444	0x9605	# <CJK>
-0x5445	0x8018	# <CJK>
-0x5446	0x4E91	# <CJK>
-0x5447	0x90E7	# <CJK>
-0x5448	0x5300	# <CJK>
-0x5449	0x9668	# <CJK>
-0x544A	0x5141	# <CJK>
-0x544B	0x8FD0	# <CJK>
-0x544C	0x8574	# <CJK>
-0x544D	0x915D	# <CJK>
-0x544E	0x6655	# <CJK>
-0x544F	0x97F5	# <CJK>
-0x5450	0x5B55	# <CJK>
-0x5451	0x531D	# <CJK>
-0x5452	0x7838	# <CJK>
-0x5453	0x6742	# <CJK>
-0x5454	0x683D	# <CJK>
-0x5455	0x54C9	# <CJK>
-0x5456	0x707E	# <CJK>
-0x5457	0x5BB0	# <CJK>
-0x5458	0x8F7D	# <CJK>
-0x5459	0x518D	# <CJK>
-0x545A	0x5728	# <CJK>
-0x545B	0x54B1	# <CJK>
-0x545C	0x6512	# <CJK>
-0x545D	0x6682	# <CJK>
-0x545E	0x8D5E	# <CJK>
-0x545F	0x8D43	# <CJK>
-0x5460	0x810F	# <CJK>
-0x5461	0x846C	# <CJK>
-0x5462	0x906D	# <CJK>
-0x5463	0x7CDF	# <CJK>
-0x5464	0x51FF	# <CJK>
-0x5465	0x85FB	# <CJK>
-0x5466	0x67A3	# <CJK>
-0x5467	0x65E9	# <CJK>
-0x5468	0x6FA1	# <CJK>
-0x5469	0x86A4	# <CJK>
-0x546A	0x8E81	# <CJK>
-0x546B	0x566A	# <CJK>
-0x546C	0x9020	# <CJK>
-0x546D	0x7682	# <CJK>
-0x546E	0x7076	# <CJK>
-0x546F	0x71E5	# <CJK>
-0x5470	0x8D23	# <CJK>
-0x5471	0x62E9	# <CJK>
-0x5472	0x5219	# <CJK>
-0x5473	0x6CFD	# <CJK>
-0x5474	0x8D3C	# <CJK>
-0x5475	0x600E	# <CJK>
-0x5476	0x589E	# <CJK>
-0x5477	0x618E	# <CJK>
-0x5478	0x66FE	# <CJK>
-0x5479	0x8D60	# <CJK>
-0x547A	0x624E	# <CJK>
-0x547B	0x55B3	# <CJK>
-0x547C	0x6E23	# <CJK>
-0x547D	0x672D	# <CJK>
-0x547E	0x8F67	# <CJK>
-0x5521	0x94E1	# <CJK>
-0x5522	0x95F8	# <CJK>
-0x5523	0x7728	# <CJK>
-0x5524	0x6805	# <CJK>
-0x5525	0x69A8	# <CJK>
-0x5526	0x548B	# <CJK>
-0x5527	0x4E4D	# <CJK>
-0x5528	0x70B8	# <CJK>
-0x5529	0x8BC8	# <CJK>
-0x552A	0x6458	# <CJK>
-0x552B	0x658B	# <CJK>
-0x552C	0x5B85	# <CJK>
-0x552D	0x7A84	# <CJK>
-0x552E	0x503A	# <CJK>
-0x552F	0x5BE8	# <CJK>
-0x5530	0x77BB	# <CJK>
-0x5531	0x6BE1	# <CJK>
-0x5532	0x8A79	# <CJK>
-0x5533	0x7C98	# <CJK>
-0x5534	0x6CBE	# <CJK>
-0x5535	0x76CF	# <CJK>
-0x5536	0x65A9	# <CJK>
-0x5537	0x8F97	# <CJK>
-0x5538	0x5D2D	# <CJK>
-0x5539	0x5C55	# <CJK>
-0x553A	0x8638	# <CJK>
-0x553B	0x6808	# <CJK>
-0x553C	0x5360	# <CJK>
-0x553D	0x6218	# <CJK>
-0x553E	0x7AD9	# <CJK>
-0x553F	0x6E5B	# <CJK>
-0x5540	0x7EFD	# <CJK>
-0x5541	0x6A1F	# <CJK>
-0x5542	0x7AE0	# <CJK>
-0x5543	0x5F70	# <CJK>
-0x5544	0x6F33	# <CJK>
-0x5545	0x5F20	# <CJK>
-0x5546	0x638C	# <CJK>
-0x5547	0x6DA8	# <CJK>
-0x5548	0x6756	# <CJK>
-0x5549	0x4E08	# <CJK>
-0x554A	0x5E10	# <CJK>
-0x554B	0x8D26	# <CJK>
-0x554C	0x4ED7	# <CJK>
-0x554D	0x80C0	# <CJK>
-0x554E	0x7634	# <CJK>
-0x554F	0x969C	# <CJK>
-0x5550	0x62DB	# <CJK>
-0x5551	0x662D	# <CJK>
-0x5552	0x627E	# <CJK>
-0x5553	0x6CBC	# <CJK>
-0x5554	0x8D75	# <CJK>
-0x5555	0x7167	# <CJK>
-0x5556	0x7F69	# <CJK>
-0x5557	0x5146	# <CJK>
-0x5558	0x8087	# <CJK>
-0x5559	0x53EC	# <CJK>
-0x555A	0x906E	# <CJK>
-0x555B	0x6298	# <CJK>
-0x555C	0x54F2	# <CJK>
-0x555D	0x86F0	# <CJK>
-0x555E	0x8F99	# <CJK>
-0x555F	0x8005	# <CJK>
-0x5560	0x9517	# <CJK>
-0x5561	0x8517	# <CJK>
-0x5562	0x8FD9	# <CJK>
-0x5563	0x6D59	# <CJK>
-0x5564	0x73CD	# <CJK>
-0x5565	0x659F	# <CJK>
-0x5566	0x771F	# <CJK>
-0x5567	0x7504	# <CJK>
-0x5568	0x7827	# <CJK>
-0x5569	0x81FB	# <CJK>
-0x556A	0x8D1E	# <CJK>
-0x556B	0x9488	# <CJK>
-0x556C	0x4FA6	# <CJK>
-0x556D	0x6795	# <CJK>
-0x556E	0x75B9	# <CJK>
-0x556F	0x8BCA	# <CJK>
-0x5570	0x9707	# <CJK>
-0x5571	0x632F	# <CJK>
-0x5572	0x9547	# <CJK>
-0x5573	0x9635	# <CJK>
-0x5574	0x84B8	# <CJK>
-0x5575	0x6323	# <CJK>
-0x5576	0x7741	# <CJK>
-0x5577	0x5F81	# <CJK>
-0x5578	0x72F0	# <CJK>
-0x5579	0x4E89	# <CJK>
-0x557A	0x6014	# <CJK>
-0x557B	0x6574	# <CJK>
-0x557C	0x62EF	# <CJK>
-0x557D	0x6B63	# <CJK>
-0x557E	0x653F	# <CJK>
-0x5621	0x5E27	# <CJK>
-0x5622	0x75C7	# <CJK>
-0x5623	0x90D1	# <CJK>
-0x5624	0x8BC1	# <CJK>
-0x5625	0x829D	# <CJK>
-0x5626	0x679D	# <CJK>
-0x5627	0x652F	# <CJK>
-0x5628	0x5431	# <CJK>
-0x5629	0x8718	# <CJK>
-0x562A	0x77E5	# <CJK>
-0x562B	0x80A2	# <CJK>
-0x562C	0x8102	# <CJK>
-0x562D	0x6C41	# <CJK>
-0x562E	0x4E4B	# <CJK>
-0x562F	0x7EC7	# <CJK>
-0x5630	0x804C	# <CJK>
-0x5631	0x76F4	# <CJK>
-0x5632	0x690D	# <CJK>
-0x5633	0x6B96	# <CJK>
-0x5634	0x6267	# <CJK>
-0x5635	0x503C	# <CJK>
-0x5636	0x4F84	# <CJK>
-0x5637	0x5740	# <CJK>
-0x5638	0x6307	# <CJK>
-0x5639	0x6B62	# <CJK>
-0x563A	0x8DBE	# <CJK>
-0x563B	0x53EA	# <CJK>
-0x563C	0x65E8	# <CJK>
-0x563D	0x7EB8	# <CJK>
-0x563E	0x5FD7	# <CJK>
-0x563F	0x631A	# <CJK>
-0x5640	0x63B7	# <CJK>
-0x5641	0x81F3	# <CJK>
-0x5642	0x81F4	# <CJK>
-0x5643	0x7F6E	# <CJK>
-0x5644	0x5E1C	# <CJK>
-0x5645	0x5CD9	# <CJK>
-0x5646	0x5236	# <CJK>
-0x5647	0x667A	# <CJK>
-0x5648	0x79E9	# <CJK>
-0x5649	0x7A1A	# <CJK>
-0x564A	0x8D28	# <CJK>
-0x564B	0x7099	# <CJK>
-0x564C	0x75D4	# <CJK>
-0x564D	0x6EDE	# <CJK>
-0x564E	0x6CBB	# <CJK>
-0x564F	0x7A92	# <CJK>
-0x5650	0x4E2D	# <CJK>
-0x5651	0x76C5	# <CJK>
-0x5652	0x5FE0	# <CJK>
-0x5653	0x949F	# <CJK>
-0x5654	0x8877	# <CJK>
-0x5655	0x7EC8	# <CJK>
-0x5656	0x79CD	# <CJK>
-0x5657	0x80BF	# <CJK>
-0x5658	0x91CD	# <CJK>
-0x5659	0x4EF2	# <CJK>
-0x565A	0x4F17	# <CJK>
-0x565B	0x821F	# <CJK>
-0x565C	0x5468	# <CJK>
-0x565D	0x5DDE	# <CJK>
-0x565E	0x6D32	# <CJK>
-0x565F	0x8BCC	# <CJK>
-0x5660	0x7CA5	# <CJK>
-0x5661	0x8F74	# <CJK>
-0x5662	0x8098	# <CJK>
-0x5663	0x5E1A	# <CJK>
-0x5664	0x5492	# <CJK>
-0x5665	0x76B1	# <CJK>
-0x5666	0x5B99	# <CJK>
-0x5667	0x663C	# <CJK>
-0x5668	0x9AA4	# <CJK>
-0x5669	0x73E0	# <CJK>
-0x566A	0x682A	# <CJK>
-0x566B	0x86DB	# <CJK>
-0x566C	0x6731	# <CJK>
-0x566D	0x732A	# <CJK>
-0x566E	0x8BF8	# <CJK>
-0x566F	0x8BDB	# <CJK>
-0x5670	0x9010	# <CJK>
-0x5671	0x7AF9	# <CJK>
-0x5672	0x70DB	# <CJK>
-0x5673	0x716E	# <CJK>
-0x5674	0x62C4	# <CJK>
-0x5675	0x77A9	# <CJK>
-0x5676	0x5631	# <CJK>
-0x5677	0x4E3B	# <CJK>
-0x5678	0x8457	# <CJK>
-0x5679	0x67F1	# <CJK>
-0x567A	0x52A9	# <CJK>
-0x567B	0x86C0	# <CJK>
-0x567C	0x8D2E	# <CJK>
-0x567D	0x94F8	# <CJK>
-0x567E	0x7B51	# <CJK>
-0x5721	0x4F4F	# <CJK>
-0x5722	0x6CE8	# <CJK>
-0x5723	0x795D	# <CJK>
-0x5724	0x9A7B	# <CJK>
-0x5725	0x6293	# <CJK>
-0x5726	0x722A	# <CJK>
-0x5727	0x62FD	# <CJK>
-0x5728	0x4E13	# <CJK>
-0x5729	0x7816	# <CJK>
-0x572A	0x8F6C	# <CJK>
-0x572B	0x64B0	# <CJK>
-0x572C	0x8D5A	# <CJK>
-0x572D	0x7BC6	# <CJK>
-0x572E	0x6869	# <CJK>
-0x572F	0x5E84	# <CJK>
-0x5730	0x88C5	# <CJK>
-0x5731	0x5986	# <CJK>
-0x5732	0x649E	# <CJK>
-0x5733	0x58EE	# <CJK>
-0x5734	0x72B6	# <CJK>
-0x5735	0x690E	# <CJK>
-0x5736	0x9525	# <CJK>
-0x5737	0x8FFD	# <CJK>
-0x5738	0x8D58	# <CJK>
-0x5739	0x5760	# <CJK>
-0x573A	0x7F00	# <CJK>
-0x573B	0x8C06	# <CJK>
-0x573C	0x51C6	# <CJK>
-0x573D	0x6349	# <CJK>
-0x573E	0x62D9	# <CJK>
-0x573F	0x5353	# <CJK>
-0x5740	0x684C	# <CJK>
-0x5741	0x7422	# <CJK>
-0x5742	0x8301	# <CJK>
-0x5743	0x914C	# <CJK>
-0x5744	0x5544	# <CJK>
-0x5745	0x7740	# <CJK>
-0x5746	0x707C	# <CJK>
-0x5747	0x6D4A	# <CJK>
-0x5748	0x5179	# <CJK>
-0x5749	0x54A8	# <CJK>
-0x574A	0x8D44	# <CJK>
-0x574B	0x59FF	# <CJK>
-0x574C	0x6ECB	# <CJK>
-0x574D	0x6DC4	# <CJK>
-0x574E	0x5B5C	# <CJK>
-0x574F	0x7D2B	# <CJK>
-0x5750	0x4ED4	# <CJK>
-0x5751	0x7C7D	# <CJK>
-0x5752	0x6ED3	# <CJK>
-0x5753	0x5B50	# <CJK>
-0x5754	0x81EA	# <CJK>
-0x5755	0x6E0D	# <CJK>
-0x5756	0x5B57	# <CJK>
-0x5757	0x9B03	# <CJK>
-0x5758	0x68D5	# <CJK>
-0x5759	0x8E2A	# <CJK>
-0x575A	0x5B97	# <CJK>
-0x575B	0x7EFC	# <CJK>
-0x575C	0x603B	# <CJK>
-0x575D	0x7EB5	# <CJK>
-0x575E	0x90B9	# <CJK>
-0x575F	0x8D70	# <CJK>
-0x5760	0x594F	# <CJK>
-0x5761	0x63CD	# <CJK>
-0x5762	0x79DF	# <CJK>
-0x5763	0x8DB3	# <CJK>
-0x5764	0x5352	# <CJK>
-0x5765	0x65CF	# <CJK>
-0x5766	0x7956	# <CJK>
-0x5767	0x8BC5	# <CJK>
-0x5768	0x963B	# <CJK>
-0x5769	0x7EC4	# <CJK>
-0x576A	0x94BB	# <CJK>
-0x576B	0x7E82	# <CJK>
-0x576C	0x5634	# <CJK>
-0x576D	0x9189	# <CJK>
-0x576E	0x6700	# <CJK>
-0x576F	0x7F6A	# <CJK>
-0x5770	0x5C0A	# <CJK>
-0x5771	0x9075	# <CJK>
-0x5772	0x6628	# <CJK>
-0x5773	0x5DE6	# <CJK>
-0x5774	0x4F50	# <CJK>
-0x5775	0x67DE	# <CJK>
-0x5776	0x505A	# <CJK>
-0x5777	0x4F5C	# <CJK>
-0x5778	0x5750	# <CJK>
-0x5779	0x5EA7	# <CJK>
-0x5821	0x4E8D	# <CJK>
-0x5822	0x4E0C	# <CJK>
-0x5823	0x5140	# <CJK>
-0x5824	0x4E10	# <CJK>
-0x5825	0x5EFF	# <CJK>
-0x5826	0x5345	# <CJK>
-0x5827	0x4E15	# <CJK>
-0x5828	0x4E98	# <CJK>
-0x5829	0x4E1E	# <CJK>
-0x582A	0x9B32	# <CJK>
-0x582B	0x5B6C	# <CJK>
-0x582C	0x5669	# <CJK>
-0x582D	0x4E28	# <CJK>
-0x582E	0x79BA	# <CJK>
-0x582F	0x4E3F	# <CJK>
-0x5830	0x5315	# <CJK>
-0x5831	0x4E47	# <CJK>
-0x5832	0x592D	# <CJK>
-0x5833	0x723B	# <CJK>
-0x5834	0x536E	# <CJK>
-0x5835	0x6C10	# <CJK>
-0x5836	0x56DF	# <CJK>
-0x5837	0x80E4	# <CJK>
-0x5838	0x9997	# <CJK>
-0x5839	0x6BD3	# <CJK>
-0x583A	0x777E	# <CJK>
-0x583B	0x9F17	# <CJK>
-0x583C	0x4E36	# <CJK>
-0x583D	0x4E9F	# <CJK>
-0x583E	0x9F10	# <CJK>
-0x583F	0x4E5C	# <CJK>
-0x5840	0x4E69	# <CJK>
-0x5841	0x4E93	# <CJK>
-0x5842	0x8288	# <CJK>
-0x5843	0x5B5B	# <CJK>
-0x5844	0x556C	# <CJK>
-0x5845	0x560F	# <CJK>
-0x5846	0x4EC4	# <CJK>
-0x5847	0x538D	# <CJK>
-0x5848	0x539D	# <CJK>
-0x5849	0x53A3	# <CJK>
-0x584A	0x53A5	# <CJK>
-0x584B	0x53AE	# <CJK>
-0x584C	0x9765	# <CJK>
-0x584D	0x8D5D	# <CJK>
-0x584E	0x531A	# <CJK>
-0x584F	0x53F5	# <CJK>
-0x5850	0x5326	# <CJK>
-0x5851	0x532E	# <CJK>
-0x5852	0x533E	# <CJK>
-0x5853	0x8D5C	# <CJK>
-0x5854	0x5366	# <CJK>
-0x5855	0x5363	# <CJK>
-0x5856	0x5202	# <CJK>
-0x5857	0x5208	# <CJK>
-0x5858	0x520E	# <CJK>
-0x5859	0x522D	# <CJK>
-0x585A	0x5233	# <CJK>
-0x585B	0x523F	# <CJK>
-0x585C	0x5240	# <CJK>
-0x585D	0x524C	# <CJK>
-0x585E	0x525E	# <CJK>
-0x585F	0x5261	# <CJK>
-0x5860	0x525C	# <CJK>
-0x5861	0x84AF	# <CJK>
-0x5862	0x527D	# <CJK>
-0x5863	0x5282	# <CJK>
-0x5864	0x5281	# <CJK>
-0x5865	0x5290	# <CJK>
-0x5866	0x5293	# <CJK>
-0x5867	0x5182	# <CJK>
-0x5868	0x7F54	# <CJK>
-0x5869	0x4EBB	# <CJK>
-0x586A	0x4EC3	# <CJK>
-0x586B	0x4EC9	# <CJK>
-0x586C	0x4EC2	# <CJK>
-0x586D	0x4EE8	# <CJK>
-0x586E	0x4EE1	# <CJK>
-0x586F	0x4EEB	# <CJK>
-0x5870	0x4EDE	# <CJK>
-0x5871	0x4F1B	# <CJK>
-0x5872	0x4EF3	# <CJK>
-0x5873	0x4F22	# <CJK>
-0x5874	0x4F64	# <CJK>
-0x5875	0x4EF5	# <CJK>
-0x5876	0x4F25	# <CJK>
-0x5877	0x4F27	# <CJK>
-0x5878	0x4F09	# <CJK>
-0x5879	0x4F2B	# <CJK>
-0x587A	0x4F5E	# <CJK>
-0x587B	0x4F67	# <CJK>
-0x587C	0x6538	# <CJK>
-0x587D	0x4F5A	# <CJK>
-0x587E	0x4F5D	# <CJK>
-0x5921	0x4F5F	# <CJK>
-0x5922	0x4F57	# <CJK>
-0x5923	0x4F32	# <CJK>
-0x5924	0x4F3D	# <CJK>
-0x5925	0x4F76	# <CJK>
-0x5926	0x4F74	# <CJK>
-0x5927	0x4F91	# <CJK>
-0x5928	0x4F89	# <CJK>
-0x5929	0x4F83	# <CJK>
-0x592A	0x4F8F	# <CJK>
-0x592B	0x4F7E	# <CJK>
-0x592C	0x4F7B	# <CJK>
-0x592D	0x4FAA	# <CJK>
-0x592E	0x4F7C	# <CJK>
-0x592F	0x4FAC	# <CJK>
-0x5930	0x4F94	# <CJK>
-0x5931	0x4FE6	# <CJK>
-0x5932	0x4FE8	# <CJK>
-0x5933	0x4FEA	# <CJK>
-0x5934	0x4FC5	# <CJK>
-0x5935	0x4FDA	# <CJK>
-0x5936	0x4FE3	# <CJK>
-0x5937	0x4FDC	# <CJK>
-0x5938	0x4FD1	# <CJK>
-0x5939	0x4FDF	# <CJK>
-0x593A	0x4FF8	# <CJK>
-0x593B	0x5029	# <CJK>
-0x593C	0x504C	# <CJK>
-0x593D	0x4FF3	# <CJK>
-0x593E	0x502C	# <CJK>
-0x593F	0x500F	# <CJK>
-0x5940	0x502E	# <CJK>
-0x5941	0x502D	# <CJK>
-0x5942	0x4FFE	# <CJK>
-0x5943	0x501C	# <CJK>
-0x5944	0x500C	# <CJK>
-0x5945	0x5025	# <CJK>
-0x5946	0x5028	# <CJK>
-0x5947	0x507E	# <CJK>
-0x5948	0x5043	# <CJK>
-0x5949	0x5055	# <CJK>
-0x594A	0x5048	# <CJK>
-0x594B	0x504E	# <CJK>
-0x594C	0x506C	# <CJK>
-0x594D	0x507B	# <CJK>
-0x594E	0x50A5	# <CJK>
-0x594F	0x50A7	# <CJK>
-0x5950	0x50A9	# <CJK>
-0x5951	0x50BA	# <CJK>
-0x5952	0x50D6	# <CJK>
-0x5953	0x5106	# <CJK>
-0x5954	0x50ED	# <CJK>
-0x5955	0x50EC	# <CJK>
-0x5956	0x50E6	# <CJK>
-0x5957	0x50EE	# <CJK>
-0x5958	0x5107	# <CJK>
-0x5959	0x510B	# <CJK>
-0x595A	0x4EDD	# <CJK>
-0x595B	0x6C3D	# <CJK>
-0x595C	0x4F58	# <CJK>
-0x595D	0x4F65	# <CJK>
-0x595E	0x4FCE	# <CJK>
-0x595F	0x9FA0	# <CJK>
-0x5960	0x6C46	# <CJK>
-0x5961	0x7C74	# <CJK>
-0x5962	0x516E	# <CJK>
-0x5963	0x5DFD	# <CJK>
-0x5964	0x9EC9	# <CJK>
-0x5965	0x9998	# <CJK>
-0x5966	0x5181	# <CJK>
-0x5967	0x5914	# <CJK>
-0x5968	0x52F9	# <CJK>
-0x5969	0x530D	# <CJK>
-0x596A	0x8A07	# <CJK>
-0x596B	0x5310	# <CJK>
-0x596C	0x51EB	# <CJK>
-0x596D	0x5919	# <CJK>
-0x596E	0x5155	# <CJK>
-0x596F	0x4EA0	# <CJK>
-0x5970	0x5156	# <CJK>
-0x5971	0x4EB3	# <CJK>
-0x5972	0x886E	# <CJK>
-0x5973	0x88A4	# <CJK>
-0x5974	0x4EB5	# <CJK>
-0x5975	0x8114	# <CJK>
-0x5976	0x88D2	# <CJK>
-0x5977	0x7980	# <CJK>
-0x5978	0x5B34	# <CJK>
-0x5979	0x8803	# <CJK>
-0x597A	0x7FB8	# <CJK>
-0x597B	0x51AB	# <CJK>
-0x597C	0x51B1	# <CJK>
-0x597D	0x51BD	# <CJK>
-0x597E	0x51BC	# <CJK>
-0x5A21	0x51C7	# <CJK>
-0x5A22	0x5196	# <CJK>
-0x5A23	0x51A2	# <CJK>
-0x5A24	0x51A5	# <CJK>
-0x5A25	0x8BA0	# <CJK>
-0x5A26	0x8BA6	# <CJK>
-0x5A27	0x8BA7	# <CJK>
-0x5A28	0x8BAA	# <CJK>
-0x5A29	0x8BB4	# <CJK>
-0x5A2A	0x8BB5	# <CJK>
-0x5A2B	0x8BB7	# <CJK>
-0x5A2C	0x8BC2	# <CJK>
-0x5A2D	0x8BC3	# <CJK>
-0x5A2E	0x8BCB	# <CJK>
-0x5A2F	0x8BCF	# <CJK>
-0x5A30	0x8BCE	# <CJK>
-0x5A31	0x8BD2	# <CJK>
-0x5A32	0x8BD3	# <CJK>
-0x5A33	0x8BD4	# <CJK>
-0x5A34	0x8BD6	# <CJK>
-0x5A35	0x8BD8	# <CJK>
-0x5A36	0x8BD9	# <CJK>
-0x5A37	0x8BDC	# <CJK>
-0x5A38	0x8BDF	# <CJK>
-0x5A39	0x8BE0	# <CJK>
-0x5A3A	0x8BE4	# <CJK>
-0x5A3B	0x8BE8	# <CJK>
-0x5A3C	0x8BE9	# <CJK>
-0x5A3D	0x8BEE	# <CJK>
-0x5A3E	0x8BF0	# <CJK>
-0x5A3F	0x8BF3	# <CJK>
-0x5A40	0x8BF6	# <CJK>
-0x5A41	0x8BF9	# <CJK>
-0x5A42	0x8BFC	# <CJK>
-0x5A43	0x8BFF	# <CJK>
-0x5A44	0x8C00	# <CJK>
-0x5A45	0x8C02	# <CJK>
-0x5A46	0x8C04	# <CJK>
-0x5A47	0x8C07	# <CJK>
-0x5A48	0x8C0C	# <CJK>
-0x5A49	0x8C0F	# <CJK>
-0x5A4A	0x8C11	# <CJK>
-0x5A4B	0x8C12	# <CJK>
-0x5A4C	0x8C14	# <CJK>
-0x5A4D	0x8C15	# <CJK>
-0x5A4E	0x8C16	# <CJK>
-0x5A4F	0x8C19	# <CJK>
-0x5A50	0x8C1B	# <CJK>
-0x5A51	0x8C18	# <CJK>
-0x5A52	0x8C1D	# <CJK>
-0x5A53	0x8C1F	# <CJK>
-0x5A54	0x8C20	# <CJK>
-0x5A55	0x8C21	# <CJK>
-0x5A56	0x8C25	# <CJK>
-0x5A57	0x8C27	# <CJK>
-0x5A58	0x8C2A	# <CJK>
-0x5A59	0x8C2B	# <CJK>
-0x5A5A	0x8C2E	# <CJK>
-0x5A5B	0x8C2F	# <CJK>
-0x5A5C	0x8C32	# <CJK>
-0x5A5D	0x8C33	# <CJK>
-0x5A5E	0x8C35	# <CJK>
-0x5A5F	0x8C36	# <CJK>
-0x5A60	0x5369	# <CJK>
-0x5A61	0x537A	# <CJK>
-0x5A62	0x961D	# <CJK>
-0x5A63	0x9622	# <CJK>
-0x5A64	0x9621	# <CJK>
-0x5A65	0x9631	# <CJK>
-0x5A66	0x962A	# <CJK>
-0x5A67	0x963D	# <CJK>
-0x5A68	0x963C	# <CJK>
-0x5A69	0x9642	# <CJK>
-0x5A6A	0x9649	# <CJK>
-0x5A6B	0x9654	# <CJK>
-0x5A6C	0x965F	# <CJK>
-0x5A6D	0x9667	# <CJK>
-0x5A6E	0x966C	# <CJK>
-0x5A6F	0x9672	# <CJK>
-0x5A70	0x9674	# <CJK>
-0x5A71	0x9688	# <CJK>
-0x5A72	0x968D	# <CJK>
-0x5A73	0x9697	# <CJK>
-0x5A74	0x96B0	# <CJK>
-0x5A75	0x9097	# <CJK>
-0x5A76	0x909B	# <CJK>
-0x5A77	0x909D	# <CJK>
-0x5A78	0x9099	# <CJK>
-0x5A79	0x90AC	# <CJK>
-0x5A7A	0x90A1	# <CJK>
-0x5A7B	0x90B4	# <CJK>
-0x5A7C	0x90B3	# <CJK>
-0x5A7D	0x90B6	# <CJK>
-0x5A7E	0x90BA	# <CJK>
-0x5B21	0x90B8	# <CJK>
-0x5B22	0x90B0	# <CJK>
-0x5B23	0x90CF	# <CJK>
-0x5B24	0x90C5	# <CJK>
-0x5B25	0x90BE	# <CJK>
-0x5B26	0x90D0	# <CJK>
-0x5B27	0x90C4	# <CJK>
-0x5B28	0x90C7	# <CJK>
-0x5B29	0x90D3	# <CJK>
-0x5B2A	0x90E6	# <CJK>
-0x5B2B	0x90E2	# <CJK>
-0x5B2C	0x90DC	# <CJK>
-0x5B2D	0x90D7	# <CJK>
-0x5B2E	0x90DB	# <CJK>
-0x5B2F	0x90EB	# <CJK>
-0x5B30	0x90EF	# <CJK>
-0x5B31	0x90FE	# <CJK>
-0x5B32	0x9104	# <CJK>
-0x5B33	0x9122	# <CJK>
-0x5B34	0x911E	# <CJK>
-0x5B35	0x9123	# <CJK>
-0x5B36	0x9131	# <CJK>
-0x5B37	0x912F	# <CJK>
-0x5B38	0x9139	# <CJK>
-0x5B39	0x9143	# <CJK>
-0x5B3A	0x9146	# <CJK>
-0x5B3B	0x520D	# <CJK>
-0x5B3C	0x5942	# <CJK>
-0x5B3D	0x52A2	# <CJK>
-0x5B3E	0x52AC	# <CJK>
-0x5B3F	0x52AD	# <CJK>
-0x5B40	0x52BE	# <CJK>
-0x5B41	0x54FF	# <CJK>
-0x5B42	0x52D0	# <CJK>
-0x5B43	0x52D6	# <CJK>
-0x5B44	0x52F0	# <CJK>
-0x5B45	0x53DF	# <CJK>
-0x5B46	0x71EE	# <CJK>
-0x5B47	0x77CD	# <CJK>
-0x5B48	0x5EF4	# <CJK>
-0x5B49	0x51F5	# <CJK>
-0x5B4A	0x51FC	# <CJK>
-0x5B4B	0x9B2F	# <CJK>
-0x5B4C	0x53B6	# <CJK>
-0x5B4D	0x5F01	# <CJK>
-0x5B4E	0x755A	# <CJK>
-0x5B4F	0x5DEF	# <CJK>
-0x5B50	0x574C	# <CJK>
-0x5B51	0x57A9	# <CJK>
-0x5B52	0x57A1	# <CJK>
-0x5B53	0x587E	# <CJK>
-0x5B54	0x58BC	# <CJK>
-0x5B55	0x58C5	# <CJK>
-0x5B56	0x58D1	# <CJK>
-0x5B57	0x5729	# <CJK>
-0x5B58	0x572C	# <CJK>
-0x5B59	0x572A	# <CJK>
-0x5B5A	0x5733	# <CJK>
-0x5B5B	0x5739	# <CJK>
-0x5B5C	0x572E	# <CJK>
-0x5B5D	0x572F	# <CJK>
-0x5B5E	0x575C	# <CJK>
-0x5B5F	0x573B	# <CJK>
-0x5B60	0x5742	# <CJK>
-0x5B61	0x5769	# <CJK>
-0x5B62	0x5785	# <CJK>
-0x5B63	0x576B	# <CJK>
-0x5B64	0x5786	# <CJK>
-0x5B65	0x577C	# <CJK>
-0x5B66	0x577B	# <CJK>
-0x5B67	0x5768	# <CJK>
-0x5B68	0x576D	# <CJK>
-0x5B69	0x5776	# <CJK>
-0x5B6A	0x5773	# <CJK>
-0x5B6B	0x57AD	# <CJK>
-0x5B6C	0x57A4	# <CJK>
-0x5B6D	0x578C	# <CJK>
-0x5B6E	0x57B2	# <CJK>
-0x5B6F	0x57CF	# <CJK>
-0x5B70	0x57A7	# <CJK>
-0x5B71	0x57B4	# <CJK>
-0x5B72	0x5793	# <CJK>
-0x5B73	0x57A0	# <CJK>
-0x5B74	0x57D5	# <CJK>
-0x5B75	0x57D8	# <CJK>
-0x5B76	0x57DA	# <CJK>
-0x5B77	0x57D9	# <CJK>
-0x5B78	0x57D2	# <CJK>
-0x5B79	0x57B8	# <CJK>
-0x5B7A	0x57F4	# <CJK>
-0x5B7B	0x57EF	# <CJK>
-0x5B7C	0x57F8	# <CJK>
-0x5B7D	0x57E4	# <CJK>
-0x5B7E	0x57DD	# <CJK>
-0x5C21	0x580B	# <CJK>
-0x5C22	0x580D	# <CJK>
-0x5C23	0x57FD	# <CJK>
-0x5C24	0x57ED	# <CJK>
-0x5C25	0x5800	# <CJK>
-0x5C26	0x581E	# <CJK>
-0x5C27	0x5819	# <CJK>
-0x5C28	0x5844	# <CJK>
-0x5C29	0x5820	# <CJK>
-0x5C2A	0x5865	# <CJK>
-0x5C2B	0x586C	# <CJK>
-0x5C2C	0x5881	# <CJK>
-0x5C2D	0x5889	# <CJK>
-0x5C2E	0x589A	# <CJK>
-0x5C2F	0x5880	# <CJK>
-0x5C30	0x99A8	# <CJK>
-0x5C31	0x9F19	# <CJK>
-0x5C32	0x61FF	# <CJK>
-0x5C33	0x8279	# <CJK>
-0x5C34	0x827D	# <CJK>
-0x5C35	0x827F	# <CJK>
-0x5C36	0x828F	# <CJK>
-0x5C37	0x828A	# <CJK>
-0x5C38	0x82A8	# <CJK>
-0x5C39	0x8284	# <CJK>
-0x5C3A	0x828E	# <CJK>
-0x5C3B	0x8291	# <CJK>
-0x5C3C	0x8297	# <CJK>
-0x5C3D	0x8299	# <CJK>
-0x5C3E	0x82AB	# <CJK>
-0x5C3F	0x82B8	# <CJK>
-0x5C40	0x82BE	# <CJK>
-0x5C41	0x82B0	# <CJK>
-0x5C42	0x82C8	# <CJK>
-0x5C43	0x82CA	# <CJK>
-0x5C44	0x82E3	# <CJK>
-0x5C45	0x8298	# <CJK>
-0x5C46	0x82B7	# <CJK>
-0x5C47	0x82AE	# <CJK>
-0x5C48	0x82CB	# <CJK>
-0x5C49	0x82CC	# <CJK>
-0x5C4A	0x82C1	# <CJK>
-0x5C4B	0x82A9	# <CJK>
-0x5C4C	0x82B4	# <CJK>
-0x5C4D	0x82A1	# <CJK>
-0x5C4E	0x82AA	# <CJK>
-0x5C4F	0x829F	# <CJK>
-0x5C50	0x82C4	# <CJK>
-0x5C51	0x82CE	# <CJK>
-0x5C52	0x82A4	# <CJK>
-0x5C53	0x82E1	# <CJK>
-0x5C54	0x8309	# <CJK>
-0x5C55	0x82F7	# <CJK>
-0x5C56	0x82E4	# <CJK>
-0x5C57	0x830F	# <CJK>
-0x5C58	0x8307	# <CJK>
-0x5C59	0x82DC	# <CJK>
-0x5C5A	0x82F4	# <CJK>
-0x5C5B	0x82D2	# <CJK>
-0x5C5C	0x82D8	# <CJK>
-0x5C5D	0x830C	# <CJK>
-0x5C5E	0x82FB	# <CJK>
-0x5C5F	0x82D3	# <CJK>
-0x5C60	0x8311	# <CJK>
-0x5C61	0x831A	# <CJK>
-0x5C62	0x8306	# <CJK>
-0x5C63	0x8314	# <CJK>
-0x5C64	0x8315	# <CJK>
-0x5C65	0x82E0	# <CJK>
-0x5C66	0x82D5	# <CJK>
-0x5C67	0x831C	# <CJK>
-0x5C68	0x8351	# <CJK>
-0x5C69	0x835B	# <CJK>
-0x5C6A	0x835C	# <CJK>
-0x5C6B	0x8308	# <CJK>
-0x5C6C	0x8392	# <CJK>
-0x5C6D	0x833C	# <CJK>
-0x5C6E	0x8334	# <CJK>
-0x5C6F	0x8331	# <CJK>
-0x5C70	0x839B	# <CJK>
-0x5C71	0x835E	# <CJK>
-0x5C72	0x832F	# <CJK>
-0x5C73	0x834F	# <CJK>
-0x5C74	0x8347	# <CJK>
-0x5C75	0x8343	# <CJK>
-0x5C76	0x835F	# <CJK>
-0x5C77	0x8340	# <CJK>
-0x5C78	0x8317	# <CJK>
-0x5C79	0x8360	# <CJK>
-0x5C7A	0x832D	# <CJK>
-0x5C7B	0x833A	# <CJK>
-0x5C7C	0x8333	# <CJK>
-0x5C7D	0x8366	# <CJK>
-0x5C7E	0x8365	# <CJK>
-0x5D21	0x8368	# <CJK>
-0x5D22	0x831B	# <CJK>
-0x5D23	0x8369	# <CJK>
-0x5D24	0x836C	# <CJK>
-0x5D25	0x836A	# <CJK>
-0x5D26	0x836D	# <CJK>
-0x5D27	0x836E	# <CJK>
-0x5D28	0x83B0	# <CJK>
-0x5D29	0x8378	# <CJK>
-0x5D2A	0x83B3	# <CJK>
-0x5D2B	0x83B4	# <CJK>
-0x5D2C	0x83A0	# <CJK>
-0x5D2D	0x83AA	# <CJK>
-0x5D2E	0x8393	# <CJK>
-0x5D2F	0x839C	# <CJK>
-0x5D30	0x8385	# <CJK>
-0x5D31	0x837C	# <CJK>
-0x5D32	0x83B6	# <CJK>
-0x5D33	0x83A9	# <CJK>
-0x5D34	0x837D	# <CJK>
-0x5D35	0x83B8	# <CJK>
-0x5D36	0x837B	# <CJK>
-0x5D37	0x8398	# <CJK>
-0x5D38	0x839E	# <CJK>
-0x5D39	0x83A8	# <CJK>
-0x5D3A	0x83BA	# <CJK>
-0x5D3B	0x83BC	# <CJK>
-0x5D3C	0x83C1	# <CJK>
-0x5D3D	0x8401	# <CJK>
-0x5D3E	0x83E5	# <CJK>
-0x5D3F	0x83D8	# <CJK>
-0x5D40	0x5807	# <CJK>
-0x5D41	0x8418	# <CJK>
-0x5D42	0x840B	# <CJK>
-0x5D43	0x83DD	# <CJK>
-0x5D44	0x83FD	# <CJK>
-0x5D45	0x83D6	# <CJK>
-0x5D46	0x841C	# <CJK>
-0x5D47	0x8438	# <CJK>
-0x5D48	0x8411	# <CJK>
-0x5D49	0x8406	# <CJK>
-0x5D4A	0x83D4	# <CJK>
-0x5D4B	0x83DF	# <CJK>
-0x5D4C	0x840F	# <CJK>
-0x5D4D	0x8403	# <CJK>
-0x5D4E	0x83F8	# <CJK>
-0x5D4F	0x83F9	# <CJK>
-0x5D50	0x83EA	# <CJK>
-0x5D51	0x83C5	# <CJK>
-0x5D52	0x83C0	# <CJK>
-0x5D53	0x8426	# <CJK>
-0x5D54	0x83F0	# <CJK>
-0x5D55	0x83E1	# <CJK>
-0x5D56	0x845C	# <CJK>
-0x5D57	0x8451	# <CJK>
-0x5D58	0x845A	# <CJK>
-0x5D59	0x8459	# <CJK>
-0x5D5A	0x8473	# <CJK>
-0x5D5B	0x8487	# <CJK>
-0x5D5C	0x8488	# <CJK>
-0x5D5D	0x847A	# <CJK>
-0x5D5E	0x8489	# <CJK>
-0x5D5F	0x8478	# <CJK>
-0x5D60	0x843C	# <CJK>
-0x5D61	0x8446	# <CJK>
-0x5D62	0x8469	# <CJK>
-0x5D63	0x8476	# <CJK>
-0x5D64	0x848C	# <CJK>
-0x5D65	0x848E	# <CJK>
-0x5D66	0x8431	# <CJK>
-0x5D67	0x846D	# <CJK>
-0x5D68	0x84C1	# <CJK>
-0x5D69	0x84CD	# <CJK>
-0x5D6A	0x84D0	# <CJK>
-0x5D6B	0x84E6	# <CJK>
-0x5D6C	0x84BD	# <CJK>
-0x5D6D	0x84D3	# <CJK>
-0x5D6E	0x84CA	# <CJK>
-0x5D6F	0x84BF	# <CJK>
-0x5D70	0x84BA	# <CJK>
-0x5D71	0x84E0	# <CJK>
-0x5D72	0x84A1	# <CJK>
-0x5D73	0x84B9	# <CJK>
-0x5D74	0x84B4	# <CJK>
-0x5D75	0x8497	# <CJK>
-0x5D76	0x84E5	# <CJK>
-0x5D77	0x84E3	# <CJK>
-0x5D78	0x850C	# <CJK>
-0x5D79	0x750D	# <CJK>
-0x5D7A	0x8538	# <CJK>
-0x5D7B	0x84F0	# <CJK>
-0x5D7C	0x8539	# <CJK>
-0x5D7D	0x851F	# <CJK>
-0x5D7E	0x853A	# <CJK>
-0x5E21	0x8556	# <CJK>
-0x5E22	0x853B	# <CJK>
-0x5E23	0x84FF	# <CJK>
-0x5E24	0x84FC	# <CJK>
-0x5E25	0x8559	# <CJK>
-0x5E26	0x8548	# <CJK>
-0x5E27	0x8568	# <CJK>
-0x5E28	0x8564	# <CJK>
-0x5E29	0x855E	# <CJK>
-0x5E2A	0x857A	# <CJK>
-0x5E2B	0x77A2	# <CJK>
-0x5E2C	0x8543	# <CJK>
-0x5E2D	0x8572	# <CJK>
-0x5E2E	0x857B	# <CJK>
-0x5E2F	0x85A4	# <CJK>
-0x5E30	0x85A8	# <CJK>
-0x5E31	0x8587	# <CJK>
-0x5E32	0x858F	# <CJK>
-0x5E33	0x8579	# <CJK>
-0x5E34	0x85AE	# <CJK>
-0x5E35	0x859C	# <CJK>
-0x5E36	0x8585	# <CJK>
-0x5E37	0x85B9	# <CJK>
-0x5E38	0x85B7	# <CJK>
-0x5E39	0x85B0	# <CJK>
-0x5E3A	0x85D3	# <CJK>
-0x5E3B	0x85C1	# <CJK>
-0x5E3C	0x85DC	# <CJK>
-0x5E3D	0x85FF	# <CJK>
-0x5E3E	0x8627	# <CJK>
-0x5E3F	0x8605	# <CJK>
-0x5E40	0x8629	# <CJK>
-0x5E41	0x8616	# <CJK>
-0x5E42	0x863C	# <CJK>
-0x5E43	0x5EFE	# <CJK>
-0x5E44	0x5F08	# <CJK>
-0x5E45	0x593C	# <CJK>
-0x5E46	0x5941	# <CJK>
-0x5E47	0x8037	# <CJK>
-0x5E48	0x5955	# <CJK>
-0x5E49	0x595A	# <CJK>
-0x5E4A	0x5958	# <CJK>
-0x5E4B	0x530F	# <CJK>
-0x5E4C	0x5C22	# <CJK>
-0x5E4D	0x5C25	# <CJK>
-0x5E4E	0x5C2C	# <CJK>
-0x5E4F	0x5C34	# <CJK>
-0x5E50	0x624C	# <CJK>
-0x5E51	0x626A	# <CJK>
-0x5E52	0x629F	# <CJK>
-0x5E53	0x62BB	# <CJK>
-0x5E54	0x62CA	# <CJK>
-0x5E55	0x62DA	# <CJK>
-0x5E56	0x62D7	# <CJK>
-0x5E57	0x62EE	# <CJK>
-0x5E58	0x6322	# <CJK>
-0x5E59	0x62F6	# <CJK>
-0x5E5A	0x6339	# <CJK>
-0x5E5B	0x634B	# <CJK>
-0x5E5C	0x6343	# <CJK>
-0x5E5D	0x63AD	# <CJK>
-0x5E5E	0x63F6	# <CJK>
-0x5E5F	0x6371	# <CJK>
-0x5E60	0x637A	# <CJK>
-0x5E61	0x638E	# <CJK>
-0x5E62	0x63B4	# <CJK>
-0x5E63	0x636D	# <CJK>
-0x5E64	0x63AC	# <CJK>
-0x5E65	0x638A	# <CJK>
-0x5E66	0x6369	# <CJK>
-0x5E67	0x63AE	# <CJK>
-0x5E68	0x63BC	# <CJK>
-0x5E69	0x63F2	# <CJK>
-0x5E6A	0x63F8	# <CJK>
-0x5E6B	0x63E0	# <CJK>
-0x5E6C	0x63FF	# <CJK>
-0x5E6D	0x63C4	# <CJK>
-0x5E6E	0x63DE	# <CJK>
-0x5E6F	0x63CE	# <CJK>
-0x5E70	0x6452	# <CJK>
-0x5E71	0x63C6	# <CJK>
-0x5E72	0x63BE	# <CJK>
-0x5E73	0x6445	# <CJK>
-0x5E74	0x6441	# <CJK>
-0x5E75	0x640B	# <CJK>
-0x5E76	0x641B	# <CJK>
-0x5E77	0x6420	# <CJK>
-0x5E78	0x640C	# <CJK>
-0x5E79	0x6426	# <CJK>
-0x5E7A	0x6421	# <CJK>
-0x5E7B	0x645E	# <CJK>
-0x5E7C	0x6484	# <CJK>
-0x5E7D	0x646D	# <CJK>
-0x5E7E	0x6496	# <CJK>
-0x5F21	0x647A	# <CJK>
-0x5F22	0x64B7	# <CJK>
-0x5F23	0x64B8	# <CJK>
-0x5F24	0x6499	# <CJK>
-0x5F25	0x64BA	# <CJK>
-0x5F26	0x64C0	# <CJK>
-0x5F27	0x64D0	# <CJK>
-0x5F28	0x64D7	# <CJK>
-0x5F29	0x64E4	# <CJK>
-0x5F2A	0x64E2	# <CJK>
-0x5F2B	0x6509	# <CJK>
-0x5F2C	0x6525	# <CJK>
-0x5F2D	0x652E	# <CJK>
-0x5F2E	0x5F0B	# <CJK>
-0x5F2F	0x5FD2	# <CJK>
-0x5F30	0x7519	# <CJK>
-0x5F31	0x5F11	# <CJK>
-0x5F32	0x535F	# <CJK>
-0x5F33	0x53F1	# <CJK>
-0x5F34	0x53FD	# <CJK>
-0x5F35	0x53E9	# <CJK>
-0x5F36	0x53E8	# <CJK>
-0x5F37	0x53FB	# <CJK>
-0x5F38	0x5412	# <CJK>
-0x5F39	0x5416	# <CJK>
-0x5F3A	0x5406	# <CJK>
-0x5F3B	0x544B	# <CJK>
-0x5F3C	0x5452	# <CJK>
-0x5F3D	0x5453	# <CJK>
-0x5F3E	0x5454	# <CJK>
-0x5F3F	0x5456	# <CJK>
-0x5F40	0x5443	# <CJK>
-0x5F41	0x5421	# <CJK>
-0x5F42	0x5457	# <CJK>
-0x5F43	0x5459	# <CJK>
-0x5F44	0x5423	# <CJK>
-0x5F45	0x5432	# <CJK>
-0x5F46	0x5482	# <CJK>
-0x5F47	0x5494	# <CJK>
-0x5F48	0x5477	# <CJK>
-0x5F49	0x5471	# <CJK>
-0x5F4A	0x5464	# <CJK>
-0x5F4B	0x549A	# <CJK>
-0x5F4C	0x549B	# <CJK>
-0x5F4D	0x5484	# <CJK>
-0x5F4E	0x5476	# <CJK>
-0x5F4F	0x5466	# <CJK>
-0x5F50	0x549D	# <CJK>
-0x5F51	0x54D0	# <CJK>
-0x5F52	0x54AD	# <CJK>
-0x5F53	0x54C2	# <CJK>
-0x5F54	0x54B4	# <CJK>
-0x5F55	0x54D2	# <CJK>
-0x5F56	0x54A7	# <CJK>
-0x5F57	0x54A6	# <CJK>
-0x5F58	0x54D3	# <CJK>
-0x5F59	0x54D4	# <CJK>
-0x5F5A	0x5472	# <CJK>
-0x5F5B	0x54A3	# <CJK>
-0x5F5C	0x54D5	# <CJK>
-0x5F5D	0x54BB	# <CJK>
-0x5F5E	0x54BF	# <CJK>
-0x5F5F	0x54CC	# <CJK>
-0x5F60	0x54D9	# <CJK>
-0x5F61	0x54DA	# <CJK>
-0x5F62	0x54DC	# <CJK>
-0x5F63	0x54A9	# <CJK>
-0x5F64	0x54AA	# <CJK>
-0x5F65	0x54A4	# <CJK>
-0x5F66	0x54DD	# <CJK>
-0x5F67	0x54CF	# <CJK>
-0x5F68	0x54DE	# <CJK>
-0x5F69	0x551B	# <CJK>
-0x5F6A	0x54E7	# <CJK>
-0x5F6B	0x5520	# <CJK>
-0x5F6C	0x54FD	# <CJK>
-0x5F6D	0x5514	# <CJK>
-0x5F6E	0x54F3	# <CJK>
-0x5F6F	0x5522	# <CJK>
-0x5F70	0x5523	# <CJK>
-0x5F71	0x550F	# <CJK>
-0x5F72	0x5511	# <CJK>
-0x5F73	0x5527	# <CJK>
-0x5F74	0x552A	# <CJK>
-0x5F75	0x5567	# <CJK>
-0x5F76	0x558F	# <CJK>
-0x5F77	0x55B5	# <CJK>
-0x5F78	0x5549	# <CJK>
-0x5F79	0x556D	# <CJK>
-0x5F7A	0x5541	# <CJK>
-0x5F7B	0x5555	# <CJK>
-0x5F7C	0x553F	# <CJK>
-0x5F7D	0x5550	# <CJK>
-0x5F7E	0x553C	# <CJK>
-0x6021	0x5537	# <CJK>
-0x6022	0x5556	# <CJK>
-0x6023	0x5575	# <CJK>
-0x6024	0x5576	# <CJK>
-0x6025	0x5577	# <CJK>
-0x6026	0x5533	# <CJK>
-0x6027	0x5530	# <CJK>
-0x6028	0x555C	# <CJK>
-0x6029	0x558B	# <CJK>
-0x602A	0x55D2	# <CJK>
-0x602B	0x5583	# <CJK>
-0x602C	0x55B1	# <CJK>
-0x602D	0x55B9	# <CJK>
-0x602E	0x5588	# <CJK>
-0x602F	0x5581	# <CJK>
-0x6030	0x559F	# <CJK>
-0x6031	0x557E	# <CJK>
-0x6032	0x55D6	# <CJK>
-0x6033	0x5591	# <CJK>
-0x6034	0x557B	# <CJK>
-0x6035	0x55DF	# <CJK>
-0x6036	0x55BD	# <CJK>
-0x6037	0x55BE	# <CJK>
-0x6038	0x5594	# <CJK>
-0x6039	0x5599	# <CJK>
-0x603A	0x55EA	# <CJK>
-0x603B	0x55F7	# <CJK>
-0x603C	0x55C9	# <CJK>
-0x603D	0x561F	# <CJK>
-0x603E	0x55D1	# <CJK>
-0x603F	0x55EB	# <CJK>
-0x6040	0x55EC	# <CJK>
-0x6041	0x55D4	# <CJK>
-0x6042	0x55E6	# <CJK>
-0x6043	0x55DD	# <CJK>
-0x6044	0x55C4	# <CJK>
-0x6045	0x55EF	# <CJK>
-0x6046	0x55E5	# <CJK>
-0x6047	0x55F2	# <CJK>
-0x6048	0x55F3	# <CJK>
-0x6049	0x55CC	# <CJK>
-0x604A	0x55CD	# <CJK>
-0x604B	0x55E8	# <CJK>
-0x604C	0x55F5	# <CJK>
-0x604D	0x55E4	# <CJK>
-0x604E	0x8F94	# <CJK>
-0x604F	0x561E	# <CJK>
-0x6050	0x5608	# <CJK>
-0x6051	0x560C	# <CJK>
-0x6052	0x5601	# <CJK>
-0x6053	0x5624	# <CJK>
-0x6054	0x5623	# <CJK>
-0x6055	0x55FE	# <CJK>
-0x6056	0x5600	# <CJK>
-0x6057	0x5627	# <CJK>
-0x6058	0x562D	# <CJK>
-0x6059	0x5658	# <CJK>
-0x605A	0x5639	# <CJK>
-0x605B	0x5657	# <CJK>
-0x605C	0x562C	# <CJK>
-0x605D	0x564D	# <CJK>
-0x605E	0x5662	# <CJK>
-0x605F	0x5659	# <CJK>
-0x6060	0x565C	# <CJK>
-0x6061	0x564C	# <CJK>
-0x6062	0x5654	# <CJK>
-0x6063	0x5686	# <CJK>
-0x6064	0x5664	# <CJK>
-0x6065	0x5671	# <CJK>
-0x6066	0x566B	# <CJK>
-0x6067	0x567B	# <CJK>
-0x6068	0x567C	# <CJK>
-0x6069	0x5685	# <CJK>
-0x606A	0x5693	# <CJK>
-0x606B	0x56AF	# <CJK>
-0x606C	0x56D4	# <CJK>
-0x606D	0x56D7	# <CJK>
-0x606E	0x56DD	# <CJK>
-0x606F	0x56E1	# <CJK>
-0x6070	0x56F5	# <CJK>
-0x6071	0x56EB	# <CJK>
-0x6072	0x56F9	# <CJK>
-0x6073	0x56FF	# <CJK>
-0x6074	0x5704	# <CJK>
-0x6075	0x570A	# <CJK>
-0x6076	0x5709	# <CJK>
-0x6077	0x571C	# <CJK>
-0x6078	0x5E0F	# <CJK>
-0x6079	0x5E19	# <CJK>
-0x607A	0x5E14	# <CJK>
-0x607B	0x5E11	# <CJK>
-0x607C	0x5E31	# <CJK>
-0x607D	0x5E3B	# <CJK>
-0x607E	0x5E3C	# <CJK>
-0x6121	0x5E37	# <CJK>
-0x6122	0x5E44	# <CJK>
-0x6123	0x5E54	# <CJK>
-0x6124	0x5E5B	# <CJK>
-0x6125	0x5E5E	# <CJK>
-0x6126	0x5E61	# <CJK>
-0x6127	0x5C8C	# <CJK>
-0x6128	0x5C7A	# <CJK>
-0x6129	0x5C8D	# <CJK>
-0x612A	0x5C90	# <CJK>
-0x612B	0x5C96	# <CJK>
-0x612C	0x5C88	# <CJK>
-0x612D	0x5C98	# <CJK>
-0x612E	0x5C99	# <CJK>
-0x612F	0x5C91	# <CJK>
-0x6130	0x5C9A	# <CJK>
-0x6131	0x5C9C	# <CJK>
-0x6132	0x5CB5	# <CJK>
-0x6133	0x5CA2	# <CJK>
-0x6134	0x5CBD	# <CJK>
-0x6135	0x5CAC	# <CJK>
-0x6136	0x5CAB	# <CJK>
-0x6137	0x5CB1	# <CJK>
-0x6138	0x5CA3	# <CJK>
-0x6139	0x5CC1	# <CJK>
-0x613A	0x5CB7	# <CJK>
-0x613B	0x5CC4	# <CJK>
-0x613C	0x5CD2	# <CJK>
-0x613D	0x5CE4	# <CJK>
-0x613E	0x5CCB	# <CJK>
-0x613F	0x5CE5	# <CJK>
-0x6140	0x5D02	# <CJK>
-0x6141	0x5D03	# <CJK>
-0x6142	0x5D27	# <CJK>
-0x6143	0x5D26	# <CJK>
-0x6144	0x5D2E	# <CJK>
-0x6145	0x5D24	# <CJK>
-0x6146	0x5D1E	# <CJK>
-0x6147	0x5D06	# <CJK>
-0x6148	0x5D1B	# <CJK>
-0x6149	0x5D58	# <CJK>
-0x614A	0x5D3E	# <CJK>
-0x614B	0x5D34	# <CJK>
-0x614C	0x5D3D	# <CJK>
-0x614D	0x5D6C	# <CJK>
-0x614E	0x5D5B	# <CJK>
-0x614F	0x5D6F	# <CJK>
-0x6150	0x5D5D	# <CJK>
-0x6151	0x5D6B	# <CJK>
-0x6152	0x5D4B	# <CJK>
-0x6153	0x5D4A	# <CJK>
-0x6154	0x5D69	# <CJK>
-0x6155	0x5D74	# <CJK>
-0x6156	0x5D82	# <CJK>
-0x6157	0x5D99	# <CJK>
-0x6158	0x5D9D	# <CJK>
-0x6159	0x8C73	# <CJK>
-0x615A	0x5DB7	# <CJK>
-0x615B	0x5DC5	# <CJK>
-0x615C	0x5F73	# <CJK>
-0x615D	0x5F77	# <CJK>
-0x615E	0x5F82	# <CJK>
-0x615F	0x5F87	# <CJK>
-0x6160	0x5F89	# <CJK>
-0x6161	0x5F8C	# <CJK>
-0x6162	0x5F95	# <CJK>
-0x6163	0x5F99	# <CJK>
-0x6164	0x5F9C	# <CJK>
-0x6165	0x5FA8	# <CJK>
-0x6166	0x5FAD	# <CJK>
-0x6167	0x5FB5	# <CJK>
-0x6168	0x5FBC	# <CJK>
-0x6169	0x8862	# <CJK>
-0x616A	0x5F61	# <CJK>
-0x616B	0x72AD	# <CJK>
-0x616C	0x72B0	# <CJK>
-0x616D	0x72B4	# <CJK>
-0x616E	0x72B7	# <CJK>
-0x616F	0x72B8	# <CJK>
-0x6170	0x72C3	# <CJK>
-0x6171	0x72C1	# <CJK>
-0x6172	0x72CE	# <CJK>
-0x6173	0x72CD	# <CJK>
-0x6174	0x72D2	# <CJK>
-0x6175	0x72E8	# <CJK>
-0x6176	0x72EF	# <CJK>
-0x6177	0x72E9	# <CJK>
-0x6178	0x72F2	# <CJK>
-0x6179	0x72F4	# <CJK>
-0x617A	0x72F7	# <CJK>
-0x617B	0x7301	# <CJK>
-0x617C	0x72F3	# <CJK>
-0x617D	0x7303	# <CJK>
-0x617E	0x72FA	# <CJK>
-0x6221	0x72FB	# <CJK>
-0x6222	0x7317	# <CJK>
-0x6223	0x7313	# <CJK>
-0x6224	0x7321	# <CJK>
-0x6225	0x730A	# <CJK>
-0x6226	0x731E	# <CJK>
-0x6227	0x731D	# <CJK>
-0x6228	0x7315	# <CJK>
-0x6229	0x7322	# <CJK>
-0x622A	0x7339	# <CJK>
-0x622B	0x7325	# <CJK>
-0x622C	0x732C	# <CJK>
-0x622D	0x7338	# <CJK>
-0x622E	0x7331	# <CJK>
-0x622F	0x7350	# <CJK>
-0x6230	0x734D	# <CJK>
-0x6231	0x7357	# <CJK>
-0x6232	0x7360	# <CJK>
-0x6233	0x736C	# <CJK>
-0x6234	0x736F	# <CJK>
-0x6235	0x737E	# <CJK>
-0x6236	0x821B	# <CJK>
-0x6237	0x5925	# <CJK>
-0x6238	0x98E7	# <CJK>
-0x6239	0x5924	# <CJK>
-0x623A	0x5902	# <CJK>
-0x623B	0x9963	# <CJK>
-0x623C	0x9967	# <CJK>
-0x623D	0x9968	# <CJK>
-0x623E	0x9969	# <CJK>
-0x623F	0x996A	# <CJK>
-0x6240	0x996B	# <CJK>
-0x6241	0x996C	# <CJK>
-0x6242	0x9974	# <CJK>
-0x6243	0x9977	# <CJK>
-0x6244	0x997D	# <CJK>
-0x6245	0x9980	# <CJK>
-0x6246	0x9984	# <CJK>
-0x6247	0x9987	# <CJK>
-0x6248	0x998A	# <CJK>
-0x6249	0x998D	# <CJK>
-0x624A	0x9990	# <CJK>
-0x624B	0x9991	# <CJK>
-0x624C	0x9993	# <CJK>
-0x624D	0x9994	# <CJK>
-0x624E	0x9995	# <CJK>
-0x624F	0x5E80	# <CJK>
-0x6250	0x5E91	# <CJK>
-0x6251	0x5E8B	# <CJK>
-0x6252	0x5E96	# <CJK>
-0x6253	0x5EA5	# <CJK>
-0x6254	0x5EA0	# <CJK>
-0x6255	0x5EB9	# <CJK>
-0x6256	0x5EB5	# <CJK>
-0x6257	0x5EBE	# <CJK>
-0x6258	0x5EB3	# <CJK>
-0x6259	0x8D53	# <CJK>
-0x625A	0x5ED2	# <CJK>
-0x625B	0x5ED1	# <CJK>
-0x625C	0x5EDB	# <CJK>
-0x625D	0x5EE8	# <CJK>
-0x625E	0x5EEA	# <CJK>
-0x625F	0x81BA	# <CJK>
-0x6260	0x5FC4	# <CJK>
-0x6261	0x5FC9	# <CJK>
-0x6262	0x5FD6	# <CJK>
-0x6263	0x5FCF	# <CJK>
-0x6264	0x6003	# <CJK>
-0x6265	0x5FEE	# <CJK>
-0x6266	0x6004	# <CJK>
-0x6267	0x5FE1	# <CJK>
-0x6268	0x5FE4	# <CJK>
-0x6269	0x5FFE	# <CJK>
-0x626A	0x6005	# <CJK>
-0x626B	0x6006	# <CJK>
-0x626C	0x5FEA	# <CJK>
-0x626D	0x5FED	# <CJK>
-0x626E	0x5FF8	# <CJK>
-0x626F	0x6019	# <CJK>
-0x6270	0x6035	# <CJK>
-0x6271	0x6026	# <CJK>
-0x6272	0x601B	# <CJK>
-0x6273	0x600F	# <CJK>
-0x6274	0x600D	# <CJK>
-0x6275	0x6029	# <CJK>
-0x6276	0x602B	# <CJK>
-0x6277	0x600A	# <CJK>
-0x6278	0x603F	# <CJK>
-0x6279	0x6021	# <CJK>
-0x627A	0x6078	# <CJK>
-0x627B	0x6079	# <CJK>
-0x627C	0x607B	# <CJK>
-0x627D	0x607A	# <CJK>
-0x627E	0x6042	# <CJK>
-0x6321	0x606A	# <CJK>
-0x6322	0x607D	# <CJK>
-0x6323	0x6096	# <CJK>
-0x6324	0x609A	# <CJK>
-0x6325	0x60AD	# <CJK>
-0x6326	0x609D	# <CJK>
-0x6327	0x6083	# <CJK>
-0x6328	0x6092	# <CJK>
-0x6329	0x608C	# <CJK>
-0x632A	0x609B	# <CJK>
-0x632B	0x60EC	# <CJK>
-0x632C	0x60BB	# <CJK>
-0x632D	0x60B1	# <CJK>
-0x632E	0x60DD	# <CJK>
-0x632F	0x60D8	# <CJK>
-0x6330	0x60C6	# <CJK>
-0x6331	0x60DA	# <CJK>
-0x6332	0x60B4	# <CJK>
-0x6333	0x6120	# <CJK>
-0x6334	0x6126	# <CJK>
-0x6335	0x6115	# <CJK>
-0x6336	0x6123	# <CJK>
-0x6337	0x60F4	# <CJK>
-0x6338	0x6100	# <CJK>
-0x6339	0x610E	# <CJK>
-0x633A	0x612B	# <CJK>
-0x633B	0x614A	# <CJK>
-0x633C	0x6175	# <CJK>
-0x633D	0x61AC	# <CJK>
-0x633E	0x6194	# <CJK>
-0x633F	0x61A7	# <CJK>
-0x6340	0x61B7	# <CJK>
-0x6341	0x61D4	# <CJK>
-0x6342	0x61F5	# <CJK>
-0x6343	0x5FDD	# <CJK>
-0x6344	0x96B3	# <CJK>
-0x6345	0x95E9	# <CJK>
-0x6346	0x95EB	# <CJK>
-0x6347	0x95F1	# <CJK>
-0x6348	0x95F3	# <CJK>
-0x6349	0x95F5	# <CJK>
-0x634A	0x95F6	# <CJK>
-0x634B	0x95FC	# <CJK>
-0x634C	0x95FE	# <CJK>
-0x634D	0x9603	# <CJK>
-0x634E	0x9604	# <CJK>
-0x634F	0x9606	# <CJK>
-0x6350	0x9608	# <CJK>
-0x6351	0x960A	# <CJK>
-0x6352	0x960B	# <CJK>
-0x6353	0x960C	# <CJK>
-0x6354	0x960D	# <CJK>
-0x6355	0x960F	# <CJK>
-0x6356	0x9612	# <CJK>
-0x6357	0x9615	# <CJK>
-0x6358	0x9616	# <CJK>
-0x6359	0x9617	# <CJK>
-0x635A	0x9619	# <CJK>
-0x635B	0x961A	# <CJK>
-0x635C	0x4E2C	# <CJK>
-0x635D	0x723F	# <CJK>
-0x635E	0x6215	# <CJK>
-0x635F	0x6C35	# <CJK>
-0x6360	0x6C54	# <CJK>
-0x6361	0x6C5C	# <CJK>
-0x6362	0x6C4A	# <CJK>
-0x6363	0x6CA3	# <CJK>
-0x6364	0x6C85	# <CJK>
-0x6365	0x6C90	# <CJK>
-0x6366	0x6C94	# <CJK>
-0x6367	0x6C8C	# <CJK>
-0x6368	0x6C68	# <CJK>
-0x6369	0x6C69	# <CJK>
-0x636A	0x6C74	# <CJK>
-0x636B	0x6C76	# <CJK>
-0x636C	0x6C86	# <CJK>
-0x636D	0x6CA9	# <CJK>
-0x636E	0x6CD0	# <CJK>
-0x636F	0x6CD4	# <CJK>
-0x6370	0x6CAD	# <CJK>
-0x6371	0x6CF7	# <CJK>
-0x6372	0x6CF8	# <CJK>
-0x6373	0x6CF1	# <CJK>
-0x6374	0x6CD7	# <CJK>
-0x6375	0x6CB2	# <CJK>
-0x6376	0x6CE0	# <CJK>
-0x6377	0x6CD6	# <CJK>
-0x6378	0x6CFA	# <CJK>
-0x6379	0x6CEB	# <CJK>
-0x637A	0x6CEE	# <CJK>
-0x637B	0x6CB1	# <CJK>
-0x637C	0x6CD3	# <CJK>
-0x637D	0x6CEF	# <CJK>
-0x637E	0x6CFE	# <CJK>
-0x6421	0x6D39	# <CJK>
-0x6422	0x6D27	# <CJK>
-0x6423	0x6D0C	# <CJK>
-0x6424	0x6D43	# <CJK>
-0x6425	0x6D48	# <CJK>
-0x6426	0x6D07	# <CJK>
-0x6427	0x6D04	# <CJK>
-0x6428	0x6D19	# <CJK>
-0x6429	0x6D0E	# <CJK>
-0x642A	0x6D2B	# <CJK>
-0x642B	0x6D4D	# <CJK>
-0x642C	0x6D2E	# <CJK>
-0x642D	0x6D35	# <CJK>
-0x642E	0x6D1A	# <CJK>
-0x642F	0x6D4F	# <CJK>
-0x6430	0x6D52	# <CJK>
-0x6431	0x6D54	# <CJK>
-0x6432	0x6D33	# <CJK>
-0x6433	0x6D91	# <CJK>
-0x6434	0x6D6F	# <CJK>
-0x6435	0x6D9E	# <CJK>
-0x6436	0x6DA0	# <CJK>
-0x6437	0x6D5E	# <CJK>
-0x6438	0x6D93	# <CJK>
-0x6439	0x6D94	# <CJK>
-0x643A	0x6D5C	# <CJK>
-0x643B	0x6D60	# <CJK>
-0x643C	0x6D7C	# <CJK>
-0x643D	0x6D63	# <CJK>
-0x643E	0x6E1A	# <CJK>
-0x643F	0x6DC7	# <CJK>
-0x6440	0x6DC5	# <CJK>
-0x6441	0x6DDE	# <CJK>
-0x6442	0x6E0E	# <CJK>
-0x6443	0x6DBF	# <CJK>
-0x6444	0x6DE0	# <CJK>
-0x6445	0x6E11	# <CJK>
-0x6446	0x6DE6	# <CJK>
-0x6447	0x6DDD	# <CJK>
-0x6448	0x6DD9	# <CJK>
-0x6449	0x6E16	# <CJK>
-0x644A	0x6DAB	# <CJK>
-0x644B	0x6E0C	# <CJK>
-0x644C	0x6DAE	# <CJK>
-0x644D	0x6E2B	# <CJK>
-0x644E	0x6E6E	# <CJK>
-0x644F	0x6E4E	# <CJK>
-0x6450	0x6E6B	# <CJK>
-0x6451	0x6EB2	# <CJK>
-0x6452	0x6E5F	# <CJK>
-0x6453	0x6E86	# <CJK>
-0x6454	0x6E53	# <CJK>
-0x6455	0x6E54	# <CJK>
-0x6456	0x6E32	# <CJK>
-0x6457	0x6E25	# <CJK>
-0x6458	0x6E44	# <CJK>
-0x6459	0x6EDF	# <CJK>
-0x645A	0x6EB1	# <CJK>
-0x645B	0x6E98	# <CJK>
-0x645C	0x6EE0	# <CJK>
-0x645D	0x6F2D	# <CJK>
-0x645E	0x6EE2	# <CJK>
-0x645F	0x6EA5	# <CJK>
-0x6460	0x6EA7	# <CJK>
-0x6461	0x6EBD	# <CJK>
-0x6462	0x6EBB	# <CJK>
-0x6463	0x6EB7	# <CJK>
-0x6464	0x6ED7	# <CJK>
-0x6465	0x6EB4	# <CJK>
-0x6466	0x6ECF	# <CJK>
-0x6467	0x6E8F	# <CJK>
-0x6468	0x6EC2	# <CJK>
-0x6469	0x6E9F	# <CJK>
-0x646A	0x6F62	# <CJK>
-0x646B	0x6F46	# <CJK>
-0x646C	0x6F47	# <CJK>
-0x646D	0x6F24	# <CJK>
-0x646E	0x6F15	# <CJK>
-0x646F	0x6EF9	# <CJK>
-0x6470	0x6F2F	# <CJK>
-0x6471	0x6F36	# <CJK>
-0x6472	0x6F4B	# <CJK>
-0x6473	0x6F74	# <CJK>
-0x6474	0x6F2A	# <CJK>
-0x6475	0x6F09	# <CJK>
-0x6476	0x6F29	# <CJK>
-0x6477	0x6F89	# <CJK>
-0x6478	0x6F8D	# <CJK>
-0x6479	0x6F8C	# <CJK>
-0x647A	0x6F78	# <CJK>
-0x647B	0x6F72	# <CJK>
-0x647C	0x6F7C	# <CJK>
-0x647D	0x6F7A	# <CJK>
-0x647E	0x6FD1	# <CJK>
-0x6521	0x6FC9	# <CJK>
-0x6522	0x6FA7	# <CJK>
-0x6523	0x6FB9	# <CJK>
-0x6524	0x6FB6	# <CJK>
-0x6525	0x6FC2	# <CJK>
-0x6526	0x6FE1	# <CJK>
-0x6527	0x6FEE	# <CJK>
-0x6528	0x6FDE	# <CJK>
-0x6529	0x6FE0	# <CJK>
-0x652A	0x6FEF	# <CJK>
-0x652B	0x701A	# <CJK>
-0x652C	0x7023	# <CJK>
-0x652D	0x701B	# <CJK>
-0x652E	0x7039	# <CJK>
-0x652F	0x7035	# <CJK>
-0x6530	0x704F	# <CJK>
-0x6531	0x705E	# <CJK>
-0x6532	0x5B80	# <CJK>
-0x6533	0x5B84	# <CJK>
-0x6534	0x5B95	# <CJK>
-0x6535	0x5B93	# <CJK>
-0x6536	0x5BA5	# <CJK>
-0x6537	0x5BB8	# <CJK>
-0x6538	0x752F	# <CJK>
-0x6539	0x9A9E	# <CJK>
-0x653A	0x6434	# <CJK>
-0x653B	0x5BE4	# <CJK>
-0x653C	0x5BEE	# <CJK>
-0x653D	0x8930	# <CJK>
-0x653E	0x5BF0	# <CJK>
-0x653F	0x8E47	# <CJK>
-0x6540	0x8B07	# <CJK>
-0x6541	0x8FB6	# <CJK>
-0x6542	0x8FD3	# <CJK>
-0x6543	0x8FD5	# <CJK>
-0x6544	0x8FE5	# <CJK>
-0x6545	0x8FEE	# <CJK>
-0x6546	0x8FE4	# <CJK>
-0x6547	0x8FE9	# <CJK>
-0x6548	0x8FE6	# <CJK>
-0x6549	0x8FF3	# <CJK>
-0x654A	0x8FE8	# <CJK>
-0x654B	0x9005	# <CJK>
-0x654C	0x9004	# <CJK>
-0x654D	0x900B	# <CJK>
-0x654E	0x9026	# <CJK>
-0x654F	0x9011	# <CJK>
-0x6550	0x900D	# <CJK>
-0x6551	0x9016	# <CJK>
-0x6552	0x9021	# <CJK>
-0x6553	0x9035	# <CJK>
-0x6554	0x9036	# <CJK>
-0x6555	0x902D	# <CJK>
-0x6556	0x902F	# <CJK>
-0x6557	0x9044	# <CJK>
-0x6558	0x9051	# <CJK>
-0x6559	0x9052	# <CJK>
-0x655A	0x9050	# <CJK>
-0x655B	0x9068	# <CJK>
-0x655C	0x9058	# <CJK>
-0x655D	0x9062	# <CJK>
-0x655E	0x905B	# <CJK>
-0x655F	0x66B9	# <CJK>
-0x6560	0x9074	# <CJK>
-0x6561	0x907D	# <CJK>
-0x6562	0x9082	# <CJK>
-0x6563	0x9088	# <CJK>
-0x6564	0x9083	# <CJK>
-0x6565	0x908B	# <CJK>
-0x6566	0x5F50	# <CJK>
-0x6567	0x5F57	# <CJK>
-0x6568	0x5F56	# <CJK>
-0x6569	0x5F58	# <CJK>
-0x656A	0x5C3B	# <CJK>
-0x656B	0x54AB	# <CJK>
-0x656C	0x5C50	# <CJK>
-0x656D	0x5C59	# <CJK>
-0x656E	0x5B71	# <CJK>
-0x656F	0x5C63	# <CJK>
-0x6570	0x5C66	# <CJK>
-0x6571	0x7FBC	# <CJK>
-0x6572	0x5F2A	# <CJK>
-0x6573	0x5F29	# <CJK>
-0x6574	0x5F2D	# <CJK>
-0x6575	0x8274	# <CJK>
-0x6576	0x5F3C	# <CJK>
-0x6577	0x9B3B	# <CJK>
-0x6578	0x5C6E	# <CJK>
-0x6579	0x5981	# <CJK>
-0x657A	0x5983	# <CJK>
-0x657B	0x598D	# <CJK>
-0x657C	0x59A9	# <CJK>
-0x657D	0x59AA	# <CJK>
-0x657E	0x59A3	# <CJK>
-0x6621	0x5997	# <CJK>
-0x6622	0x59CA	# <CJK>
-0x6623	0x59AB	# <CJK>
-0x6624	0x599E	# <CJK>
-0x6625	0x59A4	# <CJK>
-0x6626	0x59D2	# <CJK>
-0x6627	0x59B2	# <CJK>
-0x6628	0x59AF	# <CJK>
-0x6629	0x59D7	# <CJK>
-0x662A	0x59BE	# <CJK>
-0x662B	0x5A05	# <CJK>
-0x662C	0x5A06	# <CJK>
-0x662D	0x59DD	# <CJK>
-0x662E	0x5A08	# <CJK>
-0x662F	0x59E3	# <CJK>
-0x6630	0x59D8	# <CJK>
-0x6631	0x59F9	# <CJK>
-0x6632	0x5A0C	# <CJK>
-0x6633	0x5A09	# <CJK>
-0x6634	0x5A32	# <CJK>
-0x6635	0x5A34	# <CJK>
-0x6636	0x5A11	# <CJK>
-0x6637	0x5A23	# <CJK>
-0x6638	0x5A13	# <CJK>
-0x6639	0x5A40	# <CJK>
-0x663A	0x5A67	# <CJK>
-0x663B	0x5A4A	# <CJK>
-0x663C	0x5A55	# <CJK>
-0x663D	0x5A3C	# <CJK>
-0x663E	0x5A62	# <CJK>
-0x663F	0x5A75	# <CJK>
-0x6640	0x80EC	# <CJK>
-0x6641	0x5AAA	# <CJK>
-0x6642	0x5A9B	# <CJK>
-0x6643	0x5A77	# <CJK>
-0x6644	0x5A7A	# <CJK>
-0x6645	0x5ABE	# <CJK>
-0x6646	0x5AEB	# <CJK>
-0x6647	0x5AB2	# <CJK>
-0x6648	0x5AD2	# <CJK>
-0x6649	0x5AD4	# <CJK>
-0x664A	0x5AB8	# <CJK>
-0x664B	0x5AE0	# <CJK>
-0x664C	0x5AE3	# <CJK>
-0x664D	0x5AF1	# <CJK>
-0x664E	0x5AD6	# <CJK>
-0x664F	0x5AE6	# <CJK>
-0x6650	0x5AD8	# <CJK>
-0x6651	0x5ADC	# <CJK>
-0x6652	0x5B09	# <CJK>
-0x6653	0x5B17	# <CJK>
-0x6654	0x5B16	# <CJK>
-0x6655	0x5B32	# <CJK>
-0x6656	0x5B37	# <CJK>
-0x6657	0x5B40	# <CJK>
-0x6658	0x5C15	# <CJK>
-0x6659	0x5C1C	# <CJK>
-0x665A	0x5B5A	# <CJK>
-0x665B	0x5B65	# <CJK>
-0x665C	0x5B73	# <CJK>
-0x665D	0x5B51	# <CJK>
-0x665E	0x5B53	# <CJK>
-0x665F	0x5B62	# <CJK>
-0x6660	0x9A75	# <CJK>
-0x6661	0x9A77	# <CJK>
-0x6662	0x9A78	# <CJK>
-0x6663	0x9A7A	# <CJK>
-0x6664	0x9A7F	# <CJK>
-0x6665	0x9A7D	# <CJK>
-0x6666	0x9A80	# <CJK>
-0x6667	0x9A81	# <CJK>
-0x6668	0x9A85	# <CJK>
-0x6669	0x9A88	# <CJK>
-0x666A	0x9A8A	# <CJK>
-0x666B	0x9A90	# <CJK>
-0x666C	0x9A92	# <CJK>
-0x666D	0x9A93	# <CJK>
-0x666E	0x9A96	# <CJK>
-0x666F	0x9A98	# <CJK>
-0x6670	0x9A9B	# <CJK>
-0x6671	0x9A9C	# <CJK>
-0x6672	0x9A9D	# <CJK>
-0x6673	0x9A9F	# <CJK>
-0x6674	0x9AA0	# <CJK>
-0x6675	0x9AA2	# <CJK>
-0x6676	0x9AA3	# <CJK>
-0x6677	0x9AA5	# <CJK>
-0x6678	0x9AA7	# <CJK>
-0x6679	0x7E9F	# <CJK>
-0x667A	0x7EA1	# <CJK>
-0x667B	0x7EA3	# <CJK>
-0x667C	0x7EA5	# <CJK>
-0x667D	0x7EA8	# <CJK>
-0x667E	0x7EA9	# <CJK>
-0x6721	0x7EAD	# <CJK>
-0x6722	0x7EB0	# <CJK>
-0x6723	0x7EBE	# <CJK>
-0x6724	0x7EC0	# <CJK>
-0x6725	0x7EC1	# <CJK>
-0x6726	0x7EC2	# <CJK>
-0x6727	0x7EC9	# <CJK>
-0x6728	0x7ECB	# <CJK>
-0x6729	0x7ECC	# <CJK>
-0x672A	0x7ED0	# <CJK>
-0x672B	0x7ED4	# <CJK>
-0x672C	0x7ED7	# <CJK>
-0x672D	0x7EDB	# <CJK>
-0x672E	0x7EE0	# <CJK>
-0x672F	0x7EE1	# <CJK>
-0x6730	0x7EE8	# <CJK>
-0x6731	0x7EEB	# <CJK>
-0x6732	0x7EEE	# <CJK>
-0x6733	0x7EEF	# <CJK>
-0x6734	0x7EF1	# <CJK>
-0x6735	0x7EF2	# <CJK>
-0x6736	0x7F0D	# <CJK>
-0x6737	0x7EF6	# <CJK>
-0x6738	0x7EFA	# <CJK>
-0x6739	0x7EFB	# <CJK>
-0x673A	0x7EFE	# <CJK>
-0x673B	0x7F01	# <CJK>
-0x673C	0x7F02	# <CJK>
-0x673D	0x7F03	# <CJK>
-0x673E	0x7F07	# <CJK>
-0x673F	0x7F08	# <CJK>
-0x6740	0x7F0B	# <CJK>
-0x6741	0x7F0C	# <CJK>
-0x6742	0x7F0F	# <CJK>
-0x6743	0x7F11	# <CJK>
-0x6744	0x7F12	# <CJK>
-0x6745	0x7F17	# <CJK>
-0x6746	0x7F19	# <CJK>
-0x6747	0x7F1C	# <CJK>
-0x6748	0x7F1B	# <CJK>
-0x6749	0x7F1F	# <CJK>
-0x674A	0x7F21	# <CJK>
-0x674B	0x7F22	# <CJK>
-0x674C	0x7F23	# <CJK>
-0x674D	0x7F24	# <CJK>
-0x674E	0x7F25	# <CJK>
-0x674F	0x7F26	# <CJK>
-0x6750	0x7F27	# <CJK>
-0x6751	0x7F2A	# <CJK>
-0x6752	0x7F2B	# <CJK>
-0x6753	0x7F2C	# <CJK>
-0x6754	0x7F2D	# <CJK>
-0x6755	0x7F2F	# <CJK>
-0x6756	0x7F30	# <CJK>
-0x6757	0x7F31	# <CJK>
-0x6758	0x7F32	# <CJK>
-0x6759	0x7F33	# <CJK>
-0x675A	0x7F35	# <CJK>
-0x675B	0x5E7A	# <CJK>
-0x675C	0x757F	# <CJK>
-0x675D	0x5DDB	# <CJK>
-0x675E	0x753E	# <CJK>
-0x675F	0x9095	# <CJK>
-0x6760	0x738E	# <CJK>
-0x6761	0x7391	# <CJK>
-0x6762	0x73AE	# <CJK>
-0x6763	0x73A2	# <CJK>
-0x6764	0x739F	# <CJK>
-0x6765	0x73CF	# <CJK>
-0x6766	0x73C2	# <CJK>
-0x6767	0x73D1	# <CJK>
-0x6768	0x73B7	# <CJK>
-0x6769	0x73B3	# <CJK>
-0x676A	0x73C0	# <CJK>
-0x676B	0x73C9	# <CJK>
-0x676C	0x73C8	# <CJK>
-0x676D	0x73E5	# <CJK>
-0x676E	0x73D9	# <CJK>
-0x676F	0x987C	# <CJK>
-0x6770	0x740A	# <CJK>
-0x6771	0x73E9	# <CJK>
-0x6772	0x73E7	# <CJK>
-0x6773	0x73DE	# <CJK>
-0x6774	0x73BA	# <CJK>
-0x6775	0x73F2	# <CJK>
-0x6776	0x740F	# <CJK>
-0x6777	0x742A	# <CJK>
-0x6778	0x745B	# <CJK>
-0x6779	0x7426	# <CJK>
-0x677A	0x7425	# <CJK>
-0x677B	0x7428	# <CJK>
-0x677C	0x7430	# <CJK>
-0x677D	0x742E	# <CJK>
-0x677E	0x742C	# <CJK>
-0x6821	0x741B	# <CJK>
-0x6822	0x741A	# <CJK>
-0x6823	0x7441	# <CJK>
-0x6824	0x745C	# <CJK>
-0x6825	0x7457	# <CJK>
-0x6826	0x7455	# <CJK>
-0x6827	0x7459	# <CJK>
-0x6828	0x7477	# <CJK>
-0x6829	0x746D	# <CJK>
-0x682A	0x747E	# <CJK>
-0x682B	0x749C	# <CJK>
-0x682C	0x748E	# <CJK>
-0x682D	0x7480	# <CJK>
-0x682E	0x7481	# <CJK>
-0x682F	0x7487	# <CJK>
-0x6830	0x748B	# <CJK>
-0x6831	0x749E	# <CJK>
-0x6832	0x74A8	# <CJK>
-0x6833	0x74A9	# <CJK>
-0x6834	0x7490	# <CJK>
-0x6835	0x74A7	# <CJK>
-0x6836	0x74D2	# <CJK>
-0x6837	0x74BA	# <CJK>
-0x6838	0x97EA	# <CJK>
-0x6839	0x97EB	# <CJK>
-0x683A	0x97EC	# <CJK>
-0x683B	0x674C	# <CJK>
-0x683C	0x6753	# <CJK>
-0x683D	0x675E	# <CJK>
-0x683E	0x6748	# <CJK>
-0x683F	0x6769	# <CJK>
-0x6840	0x67A5	# <CJK>
-0x6841	0x6787	# <CJK>
-0x6842	0x676A	# <CJK>
-0x6843	0x6773	# <CJK>
-0x6844	0x6798	# <CJK>
-0x6845	0x67A7	# <CJK>
-0x6846	0x6775	# <CJK>
-0x6847	0x67A8	# <CJK>
-0x6848	0x679E	# <CJK>
-0x6849	0x67AD	# <CJK>
-0x684A	0x678B	# <CJK>
-0x684B	0x6777	# <CJK>
-0x684C	0x677C	# <CJK>
-0x684D	0x67F0	# <CJK>
-0x684E	0x6809	# <CJK>
-0x684F	0x67D8	# <CJK>
-0x6850	0x680A	# <CJK>
-0x6851	0x67E9	# <CJK>
-0x6852	0x67B0	# <CJK>
-0x6853	0x680C	# <CJK>
-0x6854	0x67D9	# <CJK>
-0x6855	0x67B5	# <CJK>
-0x6856	0x67DA	# <CJK>
-0x6857	0x67B3	# <CJK>
-0x6858	0x67DD	# <CJK>
-0x6859	0x6800	# <CJK>
-0x685A	0x67C3	# <CJK>
-0x685B	0x67B8	# <CJK>
-0x685C	0x67E2	# <CJK>
-0x685D	0x680E	# <CJK>
-0x685E	0x67C1	# <CJK>
-0x685F	0x67FD	# <CJK>
-0x6860	0x6832	# <CJK>
-0x6861	0x6833	# <CJK>
-0x6862	0x6860	# <CJK>
-0x6863	0x6861	# <CJK>
-0x6864	0x684E	# <CJK>
-0x6865	0x6862	# <CJK>
-0x6866	0x6844	# <CJK>
-0x6867	0x6864	# <CJK>
-0x6868	0x6883	# <CJK>
-0x6869	0x681D	# <CJK>
-0x686A	0x6855	# <CJK>
-0x686B	0x6866	# <CJK>
-0x686C	0x6841	# <CJK>
-0x686D	0x6867	# <CJK>
-0x686E	0x6840	# <CJK>
-0x686F	0x683E	# <CJK>
-0x6870	0x684A	# <CJK>
-0x6871	0x6849	# <CJK>
-0x6872	0x6829	# <CJK>
-0x6873	0x68B5	# <CJK>
-0x6874	0x688F	# <CJK>
-0x6875	0x6874	# <CJK>
-0x6876	0x6877	# <CJK>
-0x6877	0x6893	# <CJK>
-0x6878	0x686B	# <CJK>
-0x6879	0x68C2	# <CJK>
-0x687A	0x696E	# <CJK>
-0x687B	0x68FC	# <CJK>
-0x687C	0x691F	# <CJK>
-0x687D	0x6920	# <CJK>
-0x687E	0x68F9	# <CJK>
-0x6921	0x6924	# <CJK>
-0x6922	0x68F0	# <CJK>
-0x6923	0x690B	# <CJK>
-0x6924	0x6901	# <CJK>
-0x6925	0x6957	# <CJK>
-0x6926	0x68E3	# <CJK>
-0x6927	0x6910	# <CJK>
-0x6928	0x6971	# <CJK>
-0x6929	0x6939	# <CJK>
-0x692A	0x6960	# <CJK>
-0x692B	0x6942	# <CJK>
-0x692C	0x695D	# <CJK>
-0x692D	0x6984	# <CJK>
-0x692E	0x696B	# <CJK>
-0x692F	0x6980	# <CJK>
-0x6930	0x6998	# <CJK>
-0x6931	0x6978	# <CJK>
-0x6932	0x6934	# <CJK>
-0x6933	0x69CC	# <CJK>
-0x6934	0x6987	# <CJK>
-0x6935	0x6988	# <CJK>
-0x6936	0x69CE	# <CJK>
-0x6937	0x6989	# <CJK>
-0x6938	0x6966	# <CJK>
-0x6939	0x6963	# <CJK>
-0x693A	0x6979	# <CJK>
-0x693B	0x699B	# <CJK>
-0x693C	0x69A7	# <CJK>
-0x693D	0x69BB	# <CJK>
-0x693E	0x69AB	# <CJK>
-0x693F	0x69AD	# <CJK>
-0x6940	0x69D4	# <CJK>
-0x6941	0x69B1	# <CJK>
-0x6942	0x69C1	# <CJK>
-0x6943	0x69CA	# <CJK>
-0x6944	0x69DF	# <CJK>
-0x6945	0x6995	# <CJK>
-0x6946	0x69E0	# <CJK>
-0x6947	0x698D	# <CJK>
-0x6948	0x69FF	# <CJK>
-0x6949	0x6A2F	# <CJK>
-0x694A	0x69ED	# <CJK>
-0x694B	0x6A17	# <CJK>
-0x694C	0x6A18	# <CJK>
-0x694D	0x6A65	# <CJK>
-0x694E	0x69F2	# <CJK>
-0x694F	0x6A44	# <CJK>
-0x6950	0x6A3E	# <CJK>
-0x6951	0x6AA0	# <CJK>
-0x6952	0x6A50	# <CJK>
-0x6953	0x6A5B	# <CJK>
-0x6954	0x6A35	# <CJK>
-0x6955	0x6A8E	# <CJK>
-0x6956	0x6A79	# <CJK>
-0x6957	0x6A3D	# <CJK>
-0x6958	0x6A28	# <CJK>
-0x6959	0x6A58	# <CJK>
-0x695A	0x6A7C	# <CJK>
-0x695B	0x6A91	# <CJK>
-0x695C	0x6A90	# <CJK>
-0x695D	0x6AA9	# <CJK>
-0x695E	0x6A97	# <CJK>
-0x695F	0x6AAB	# <CJK>
-0x6960	0x7337	# <CJK>
-0x6961	0x7352	# <CJK>
-0x6962	0x6B81	# <CJK>
-0x6963	0x6B82	# <CJK>
-0x6964	0x6B87	# <CJK>
-0x6965	0x6B84	# <CJK>
-0x6966	0x6B92	# <CJK>
-0x6967	0x6B93	# <CJK>
-0x6968	0x6B8D	# <CJK>
-0x6969	0x6B9A	# <CJK>
-0x696A	0x6B9B	# <CJK>
-0x696B	0x6BA1	# <CJK>
-0x696C	0x6BAA	# <CJK>
-0x696D	0x8F6B	# <CJK>
-0x696E	0x8F6D	# <CJK>
-0x696F	0x8F71	# <CJK>
-0x6970	0x8F72	# <CJK>
-0x6971	0x8F73	# <CJK>
-0x6972	0x8F75	# <CJK>
-0x6973	0x8F76	# <CJK>
-0x6974	0x8F78	# <CJK>
-0x6975	0x8F77	# <CJK>
-0x6976	0x8F79	# <CJK>
-0x6977	0x8F7A	# <CJK>
-0x6978	0x8F7C	# <CJK>
-0x6979	0x8F7E	# <CJK>
-0x697A	0x8F81	# <CJK>
-0x697B	0x8F82	# <CJK>
-0x697C	0x8F84	# <CJK>
-0x697D	0x8F87	# <CJK>
-0x697E	0x8F8B	# <CJK>
-0x6A21	0x8F8D	# <CJK>
-0x6A22	0x8F8E	# <CJK>
-0x6A23	0x8F8F	# <CJK>
-0x6A24	0x8F98	# <CJK>
-0x6A25	0x8F9A	# <CJK>
-0x6A26	0x8ECE	# <CJK>
-0x6A27	0x620B	# <CJK>
-0x6A28	0x6217	# <CJK>
-0x6A29	0x621B	# <CJK>
-0x6A2A	0x621F	# <CJK>
-0x6A2B	0x6222	# <CJK>
-0x6A2C	0x6221	# <CJK>
-0x6A2D	0x6225	# <CJK>
-0x6A2E	0x6224	# <CJK>
-0x6A2F	0x622C	# <CJK>
-0x6A30	0x81E7	# <CJK>
-0x6A31	0x74EF	# <CJK>
-0x6A32	0x74F4	# <CJK>
-0x6A33	0x74FF	# <CJK>
-0x6A34	0x750F	# <CJK>
-0x6A35	0x7511	# <CJK>
-0x6A36	0x7513	# <CJK>
-0x6A37	0x6534	# <CJK>
-0x6A38	0x65EE	# <CJK>
-0x6A39	0x65EF	# <CJK>
-0x6A3A	0x65F0	# <CJK>
-0x6A3B	0x660A	# <CJK>
-0x6A3C	0x6619	# <CJK>
-0x6A3D	0x6772	# <CJK>
-0x6A3E	0x6603	# <CJK>
-0x6A3F	0x6615	# <CJK>
-0x6A40	0x6600	# <CJK>
-0x6A41	0x7085	# <CJK>
-0x6A42	0x66F7	# <CJK>
-0x6A43	0x661D	# <CJK>
-0x6A44	0x6634	# <CJK>
-0x6A45	0x6631	# <CJK>
-0x6A46	0x6636	# <CJK>
-0x6A47	0x6635	# <CJK>
-0x6A48	0x8006	# <CJK>
-0x6A49	0x665F	# <CJK>
-0x6A4A	0x6654	# <CJK>
-0x6A4B	0x6641	# <CJK>
-0x6A4C	0x664F	# <CJK>
-0x6A4D	0x6656	# <CJK>
-0x6A4E	0x6661	# <CJK>
-0x6A4F	0x6657	# <CJK>
-0x6A50	0x6677	# <CJK>
-0x6A51	0x6684	# <CJK>
-0x6A52	0x668C	# <CJK>
-0x6A53	0x66A7	# <CJK>
-0x6A54	0x669D	# <CJK>
-0x6A55	0x66BE	# <CJK>
-0x6A56	0x66DB	# <CJK>
-0x6A57	0x66DC	# <CJK>
-0x6A58	0x66E6	# <CJK>
-0x6A59	0x66E9	# <CJK>
-0x6A5A	0x8D32	# <CJK>
-0x6A5B	0x8D33	# <CJK>
-0x6A5C	0x8D36	# <CJK>
-0x6A5D	0x8D3B	# <CJK>
-0x6A5E	0x8D3D	# <CJK>
-0x6A5F	0x8D40	# <CJK>
-0x6A60	0x8D45	# <CJK>
-0x6A61	0x8D46	# <CJK>
-0x6A62	0x8D48	# <CJK>
-0x6A63	0x8D49	# <CJK>
-0x6A64	0x8D47	# <CJK>
-0x6A65	0x8D4D	# <CJK>
-0x6A66	0x8D55	# <CJK>
-0x6A67	0x8D59	# <CJK>
-0x6A68	0x89C7	# <CJK>
-0x6A69	0x89CA	# <CJK>
-0x6A6A	0x89CB	# <CJK>
-0x6A6B	0x89CC	# <CJK>
-0x6A6C	0x89CE	# <CJK>
-0x6A6D	0x89CF	# <CJK>
-0x6A6E	0x89D0	# <CJK>
-0x6A6F	0x89D1	# <CJK>
-0x6A70	0x726E	# <CJK>
-0x6A71	0x729F	# <CJK>
-0x6A72	0x725D	# <CJK>
-0x6A73	0x7266	# <CJK>
-0x6A74	0x726F	# <CJK>
-0x6A75	0x727E	# <CJK>
-0x6A76	0x727F	# <CJK>
-0x6A77	0x7284	# <CJK>
-0x6A78	0x728B	# <CJK>
-0x6A79	0x728D	# <CJK>
-0x6A7A	0x728F	# <CJK>
-0x6A7B	0x7292	# <CJK>
-0x6A7C	0x6308	# <CJK>
-0x6A7D	0x6332	# <CJK>
-0x6A7E	0x63B0	# <CJK>
-0x6B21	0x643F	# <CJK>
-0x6B22	0x64D8	# <CJK>
-0x6B23	0x8004	# <CJK>
-0x6B24	0x6BEA	# <CJK>
-0x6B25	0x6BF3	# <CJK>
-0x6B26	0x6BFD	# <CJK>
-0x6B27	0x6BF5	# <CJK>
-0x6B28	0x6BF9	# <CJK>
-0x6B29	0x6C05	# <CJK>
-0x6B2A	0x6C07	# <CJK>
-0x6B2B	0x6C06	# <CJK>
-0x6B2C	0x6C0D	# <CJK>
-0x6B2D	0x6C15	# <CJK>
-0x6B2E	0x6C18	# <CJK>
-0x6B2F	0x6C19	# <CJK>
-0x6B30	0x6C1A	# <CJK>
-0x6B31	0x6C21	# <CJK>
-0x6B32	0x6C29	# <CJK>
-0x6B33	0x6C24	# <CJK>
-0x6B34	0x6C2A	# <CJK>
-0x6B35	0x6C32	# <CJK>
-0x6B36	0x6535	# <CJK>
-0x6B37	0x6555	# <CJK>
-0x6B38	0x656B	# <CJK>
-0x6B39	0x724D	# <CJK>
-0x6B3A	0x7252	# <CJK>
-0x6B3B	0x7256	# <CJK>
-0x6B3C	0x7230	# <CJK>
-0x6B3D	0x8662	# <CJK>
-0x6B3E	0x5216	# <CJK>
-0x6B3F	0x809F	# <CJK>
-0x6B40	0x809C	# <CJK>
-0x6B41	0x8093	# <CJK>
-0x6B42	0x80BC	# <CJK>
-0x6B43	0x670A	# <CJK>
-0x6B44	0x80BD	# <CJK>
-0x6B45	0x80B1	# <CJK>
-0x6B46	0x80AB	# <CJK>
-0x6B47	0x80AD	# <CJK>
-0x6B48	0x80B4	# <CJK>
-0x6B49	0x80B7	# <CJK>
-0x6B4A	0x80E7	# <CJK>
-0x6B4B	0x80E8	# <CJK>
-0x6B4C	0x80E9	# <CJK>
-0x6B4D	0x80EA	# <CJK>
-0x6B4E	0x80DB	# <CJK>
-0x6B4F	0x80C2	# <CJK>
-0x6B50	0x80C4	# <CJK>
-0x6B51	0x80D9	# <CJK>
-0x6B52	0x80CD	# <CJK>
-0x6B53	0x80D7	# <CJK>
-0x6B54	0x6710	# <CJK>
-0x6B55	0x80DD	# <CJK>
-0x6B56	0x80EB	# <CJK>
-0x6B57	0x80F1	# <CJK>
-0x6B58	0x80F4	# <CJK>
-0x6B59	0x80ED	# <CJK>
-0x6B5A	0x810D	# <CJK>
-0x6B5B	0x810E	# <CJK>
-0x6B5C	0x80F2	# <CJK>
-0x6B5D	0x80FC	# <CJK>
-0x6B5E	0x6715	# <CJK>
-0x6B5F	0x8112	# <CJK>
-0x6B60	0x8C5A	# <CJK>
-0x6B61	0x8136	# <CJK>
-0x6B62	0x811E	# <CJK>
-0x6B63	0x812C	# <CJK>
-0x6B64	0x8118	# <CJK>
-0x6B65	0x8132	# <CJK>
-0x6B66	0x8148	# <CJK>
-0x6B67	0x814C	# <CJK>
-0x6B68	0x8153	# <CJK>
-0x6B69	0x8174	# <CJK>
-0x6B6A	0x8159	# <CJK>
-0x6B6B	0x815A	# <CJK>
-0x6B6C	0x8171	# <CJK>
-0x6B6D	0x8160	# <CJK>
-0x6B6E	0x8169	# <CJK>
-0x6B6F	0x817C	# <CJK>
-0x6B70	0x817D	# <CJK>
-0x6B71	0x816D	# <CJK>
-0x6B72	0x8167	# <CJK>
-0x6B73	0x584D	# <CJK>
-0x6B74	0x5AB5	# <CJK>
-0x6B75	0x8188	# <CJK>
-0x6B76	0x8182	# <CJK>
-0x6B77	0x8191	# <CJK>
-0x6B78	0x6ED5	# <CJK>
-0x6B79	0x81A3	# <CJK>
-0x6B7A	0x81AA	# <CJK>
-0x6B7B	0x81CC	# <CJK>
-0x6B7C	0x6726	# <CJK>
-0x6B7D	0x81CA	# <CJK>
-0x6B7E	0x81BB	# <CJK>
-0x6C21	0x81C1	# <CJK>
-0x6C22	0x81A6	# <CJK>
-0x6C23	0x6B24	# <CJK>
-0x6C24	0x6B37	# <CJK>
-0x6C25	0x6B39	# <CJK>
-0x6C26	0x6B43	# <CJK>
-0x6C27	0x6B46	# <CJK>
-0x6C28	0x6B59	# <CJK>
-0x6C29	0x98D1	# <CJK>
-0x6C2A	0x98D2	# <CJK>
-0x6C2B	0x98D3	# <CJK>
-0x6C2C	0x98D5	# <CJK>
-0x6C2D	0x98D9	# <CJK>
-0x6C2E	0x98DA	# <CJK>
-0x6C2F	0x6BB3	# <CJK>
-0x6C30	0x5F40	# <CJK>
-0x6C31	0x6BC2	# <CJK>
-0x6C32	0x89F3	# <CJK>
-0x6C33	0x6590	# <CJK>
-0x6C34	0x9F51	# <CJK>
-0x6C35	0x6593	# <CJK>
-0x6C36	0x65BC	# <CJK>
-0x6C37	0x65C6	# <CJK>
-0x6C38	0x65C4	# <CJK>
-0x6C39	0x65C3	# <CJK>
-0x6C3A	0x65CC	# <CJK>
-0x6C3B	0x65CE	# <CJK>
-0x6C3C	0x65D2	# <CJK>
-0x6C3D	0x65D6	# <CJK>
-0x6C3E	0x7080	# <CJK>
-0x6C3F	0x709C	# <CJK>
-0x6C40	0x7096	# <CJK>
-0x6C41	0x709D	# <CJK>
-0x6C42	0x70BB	# <CJK>
-0x6C43	0x70C0	# <CJK>
-0x6C44	0x70B7	# <CJK>
-0x6C45	0x70AB	# <CJK>
-0x6C46	0x70B1	# <CJK>
-0x6C47	0x70E8	# <CJK>
-0x6C48	0x70CA	# <CJK>
-0x6C49	0x7110	# <CJK>
-0x6C4A	0x7113	# <CJK>
-0x6C4B	0x7116	# <CJK>
-0x6C4C	0x712F	# <CJK>
-0x6C4D	0x7131	# <CJK>
-0x6C4E	0x7173	# <CJK>
-0x6C4F	0x715C	# <CJK>
-0x6C50	0x7168	# <CJK>
-0x6C51	0x7145	# <CJK>
-0x6C52	0x7172	# <CJK>
-0x6C53	0x714A	# <CJK>
-0x6C54	0x7178	# <CJK>
-0x6C55	0x717A	# <CJK>
-0x6C56	0x7198	# <CJK>
-0x6C57	0x71B3	# <CJK>
-0x6C58	0x71B5	# <CJK>
-0x6C59	0x71A8	# <CJK>
-0x6C5A	0x71A0	# <CJK>
-0x6C5B	0x71E0	# <CJK>
-0x6C5C	0x71D4	# <CJK>
-0x6C5D	0x71E7	# <CJK>
-0x6C5E	0x71F9	# <CJK>
-0x6C5F	0x721D	# <CJK>
-0x6C60	0x7228	# <CJK>
-0x6C61	0x706C	# <CJK>
-0x6C62	0x7118	# <CJK>
-0x6C63	0x7166	# <CJK>
-0x6C64	0x71B9	# <CJK>
-0x6C65	0x623E	# <CJK>
-0x6C66	0x623D	# <CJK>
-0x6C67	0x6243	# <CJK>
-0x6C68	0x6248	# <CJK>
-0x6C69	0x6249	# <CJK>
-0x6C6A	0x793B	# <CJK>
-0x6C6B	0x7940	# <CJK>
-0x6C6C	0x7946	# <CJK>
-0x6C6D	0x7949	# <CJK>
-0x6C6E	0x795B	# <CJK>
-0x6C6F	0x795C	# <CJK>
-0x6C70	0x7953	# <CJK>
-0x6C71	0x795A	# <CJK>
-0x6C72	0x7962	# <CJK>
-0x6C73	0x7957	# <CJK>
-0x6C74	0x7960	# <CJK>
-0x6C75	0x796F	# <CJK>
-0x6C76	0x7967	# <CJK>
-0x6C77	0x797A	# <CJK>
-0x6C78	0x7985	# <CJK>
-0x6C79	0x798A	# <CJK>
-0x6C7A	0x799A	# <CJK>
-0x6C7B	0x79A7	# <CJK>
-0x6C7C	0x79B3	# <CJK>
-0x6C7D	0x5FD1	# <CJK>
-0x6C7E	0x5FD0	# <CJK>
-0x6D21	0x603C	# <CJK>
-0x6D22	0x605D	# <CJK>
-0x6D23	0x605A	# <CJK>
-0x6D24	0x6067	# <CJK>
-0x6D25	0x6041	# <CJK>
-0x6D26	0x6059	# <CJK>
-0x6D27	0x6063	# <CJK>
-0x6D28	0x60AB	# <CJK>
-0x6D29	0x6106	# <CJK>
-0x6D2A	0x610D	# <CJK>
-0x6D2B	0x615D	# <CJK>
-0x6D2C	0x61A9	# <CJK>
-0x6D2D	0x619D	# <CJK>
-0x6D2E	0x61CB	# <CJK>
-0x6D2F	0x61D1	# <CJK>
-0x6D30	0x6206	# <CJK>
-0x6D31	0x8080	# <CJK>
-0x6D32	0x807F	# <CJK>
-0x6D33	0x6C93	# <CJK>
-0x6D34	0x6CF6	# <CJK>
-0x6D35	0x6DFC	# <CJK>
-0x6D36	0x77F6	# <CJK>
-0x6D37	0x77F8	# <CJK>
-0x6D38	0x7800	# <CJK>
-0x6D39	0x7809	# <CJK>
-0x6D3A	0x7817	# <CJK>
-0x6D3B	0x7818	# <CJK>
-0x6D3C	0x7811	# <CJK>
-0x6D3D	0x65AB	# <CJK>
-0x6D3E	0x782D	# <CJK>
-0x6D3F	0x781C	# <CJK>
-0x6D40	0x781D	# <CJK>
-0x6D41	0x7839	# <CJK>
-0x6D42	0x783A	# <CJK>
-0x6D43	0x783B	# <CJK>
-0x6D44	0x781F	# <CJK>
-0x6D45	0x783C	# <CJK>
-0x6D46	0x7825	# <CJK>
-0x6D47	0x782C	# <CJK>
-0x6D48	0x7823	# <CJK>
-0x6D49	0x7829	# <CJK>
-0x6D4A	0x784E	# <CJK>
-0x6D4B	0x786D	# <CJK>
-0x6D4C	0x7856	# <CJK>
-0x6D4D	0x7857	# <CJK>
-0x6D4E	0x7826	# <CJK>
-0x6D4F	0x7850	# <CJK>
-0x6D50	0x7847	# <CJK>
-0x6D51	0x784C	# <CJK>
-0x6D52	0x786A	# <CJK>
-0x6D53	0x789B	# <CJK>
-0x6D54	0x7893	# <CJK>
-0x6D55	0x789A	# <CJK>
-0x6D56	0x7887	# <CJK>
-0x6D57	0x789C	# <CJK>
-0x6D58	0x78A1	# <CJK>
-0x6D59	0x78A3	# <CJK>
-0x6D5A	0x78B2	# <CJK>
-0x6D5B	0x78B9	# <CJK>
-0x6D5C	0x78A5	# <CJK>
-0x6D5D	0x78D4	# <CJK>
-0x6D5E	0x78D9	# <CJK>
-0x6D5F	0x78C9	# <CJK>
-0x6D60	0x78EC	# <CJK>
-0x6D61	0x78F2	# <CJK>
-0x6D62	0x7905	# <CJK>
-0x6D63	0x78F4	# <CJK>
-0x6D64	0x7913	# <CJK>
-0x6D65	0x7924	# <CJK>
-0x6D66	0x791E	# <CJK>
-0x6D67	0x7934	# <CJK>
-0x6D68	0x9F9B	# <CJK>
-0x6D69	0x9EF9	# <CJK>
-0x6D6A	0x9EFB	# <CJK>
-0x6D6B	0x9EFC	# <CJK>
-0x6D6C	0x76F1	# <CJK>
-0x6D6D	0x7704	# <CJK>
-0x6D6E	0x770D	# <CJK>
-0x6D6F	0x76F9	# <CJK>
-0x6D70	0x7707	# <CJK>
-0x6D71	0x7708	# <CJK>
-0x6D72	0x771A	# <CJK>
-0x6D73	0x7722	# <CJK>
-0x6D74	0x7719	# <CJK>
-0x6D75	0x772D	# <CJK>
-0x6D76	0x7726	# <CJK>
-0x6D77	0x7735	# <CJK>
-0x6D78	0x7738	# <CJK>
-0x6D79	0x7750	# <CJK>
-0x6D7A	0x7751	# <CJK>
-0x6D7B	0x7747	# <CJK>
-0x6D7C	0x7743	# <CJK>
-0x6D7D	0x775A	# <CJK>
-0x6D7E	0x7768	# <CJK>
-0x6E21	0x7762	# <CJK>
-0x6E22	0x7765	# <CJK>
-0x6E23	0x777F	# <CJK>
-0x6E24	0x778D	# <CJK>
-0x6E25	0x777D	# <CJK>
-0x6E26	0x7780	# <CJK>
-0x6E27	0x778C	# <CJK>
-0x6E28	0x7791	# <CJK>
-0x6E29	0x779F	# <CJK>
-0x6E2A	0x77A0	# <CJK>
-0x6E2B	0x77B0	# <CJK>
-0x6E2C	0x77B5	# <CJK>
-0x6E2D	0x77BD	# <CJK>
-0x6E2E	0x753A	# <CJK>
-0x6E2F	0x7540	# <CJK>
-0x6E30	0x754E	# <CJK>
-0x6E31	0x754B	# <CJK>
-0x6E32	0x7548	# <CJK>
-0x6E33	0x755B	# <CJK>
-0x6E34	0x7572	# <CJK>
-0x6E35	0x7579	# <CJK>
-0x6E36	0x7583	# <CJK>
-0x6E37	0x7F58	# <CJK>
-0x6E38	0x7F61	# <CJK>
-0x6E39	0x7F5F	# <CJK>
-0x6E3A	0x8A48	# <CJK>
-0x6E3B	0x7F68	# <CJK>
-0x6E3C	0x7F74	# <CJK>
-0x6E3D	0x7F71	# <CJK>
-0x6E3E	0x7F79	# <CJK>
-0x6E3F	0x7F81	# <CJK>
-0x6E40	0x7F7E	# <CJK>
-0x6E41	0x76CD	# <CJK>
-0x6E42	0x76E5	# <CJK>
-0x6E43	0x8832	# <CJK>
-0x6E44	0x9485	# <CJK>
-0x6E45	0x9486	# <CJK>
-0x6E46	0x9487	# <CJK>
-0x6E47	0x948B	# <CJK>
-0x6E48	0x948A	# <CJK>
-0x6E49	0x948C	# <CJK>
-0x6E4A	0x948D	# <CJK>
-0x6E4B	0x948F	# <CJK>
-0x6E4C	0x9490	# <CJK>
-0x6E4D	0x9494	# <CJK>
-0x6E4E	0x9497	# <CJK>
-0x6E4F	0x9495	# <CJK>
-0x6E50	0x949A	# <CJK>
-0x6E51	0x949B	# <CJK>
-0x6E52	0x949C	# <CJK>
-0x6E53	0x94A3	# <CJK>
-0x6E54	0x94A4	# <CJK>
-0x6E55	0x94AB	# <CJK>
-0x6E56	0x94AA	# <CJK>
-0x6E57	0x94AD	# <CJK>
-0x6E58	0x94AC	# <CJK>
-0x6E59	0x94AF	# <CJK>
-0x6E5A	0x94B0	# <CJK>
-0x6E5B	0x94B2	# <CJK>
-0x6E5C	0x94B4	# <CJK>
-0x6E5D	0x94B6	# <CJK>
-0x6E5E	0x94B7	# <CJK>
-0x6E5F	0x94B8	# <CJK>
-0x6E60	0x94B9	# <CJK>
-0x6E61	0x94BA	# <CJK>
-0x6E62	0x94BC	# <CJK>
-0x6E63	0x94BD	# <CJK>
-0x6E64	0x94BF	# <CJK>
-0x6E65	0x94C4	# <CJK>
-0x6E66	0x94C8	# <CJK>
-0x6E67	0x94C9	# <CJK>
-0x6E68	0x94CA	# <CJK>
-0x6E69	0x94CB	# <CJK>
-0x6E6A	0x94CC	# <CJK>
-0x6E6B	0x94CD	# <CJK>
-0x6E6C	0x94CE	# <CJK>
-0x6E6D	0x94D0	# <CJK>
-0x6E6E	0x94D1	# <CJK>
-0x6E6F	0x94D2	# <CJK>
-0x6E70	0x94D5	# <CJK>
-0x6E71	0x94D6	# <CJK>
-0x6E72	0x94D7	# <CJK>
-0x6E73	0x94D9	# <CJK>
-0x6E74	0x94D8	# <CJK>
-0x6E75	0x94DB	# <CJK>
-0x6E76	0x94DE	# <CJK>
-0x6E77	0x94DF	# <CJK>
-0x6E78	0x94E0	# <CJK>
-0x6E79	0x94E2	# <CJK>
-0x6E7A	0x94E4	# <CJK>
-0x6E7B	0x94E5	# <CJK>
-0x6E7C	0x94E7	# <CJK>
-0x6E7D	0x94E8	# <CJK>
-0x6E7E	0x94EA	# <CJK>
-0x6F21	0x94E9	# <CJK>
-0x6F22	0x94EB	# <CJK>
-0x6F23	0x94EE	# <CJK>
-0x6F24	0x94EF	# <CJK>
-0x6F25	0x94F3	# <CJK>
-0x6F26	0x94F4	# <CJK>
-0x6F27	0x94F5	# <CJK>
-0x6F28	0x94F7	# <CJK>
-0x6F29	0x94F9	# <CJK>
-0x6F2A	0x94FC	# <CJK>
-0x6F2B	0x94FD	# <CJK>
-0x6F2C	0x94FF	# <CJK>
-0x6F2D	0x9503	# <CJK>
-0x6F2E	0x9502	# <CJK>
-0x6F2F	0x9506	# <CJK>
-0x6F30	0x9507	# <CJK>
-0x6F31	0x9509	# <CJK>
-0x6F32	0x950A	# <CJK>
-0x6F33	0x950D	# <CJK>
-0x6F34	0x950E	# <CJK>
-0x6F35	0x950F	# <CJK>
-0x6F36	0x9512	# <CJK>
-0x6F37	0x9513	# <CJK>
-0x6F38	0x9514	# <CJK>
-0x6F39	0x9515	# <CJK>
-0x6F3A	0x9516	# <CJK>
-0x6F3B	0x9518	# <CJK>
-0x6F3C	0x951B	# <CJK>
-0x6F3D	0x951D	# <CJK>
-0x6F3E	0x951E	# <CJK>
-0x6F3F	0x951F	# <CJK>
-0x6F40	0x9522	# <CJK>
-0x6F41	0x952A	# <CJK>
-0x6F42	0x952B	# <CJK>
-0x6F43	0x9529	# <CJK>
-0x6F44	0x952C	# <CJK>
-0x6F45	0x9531	# <CJK>
-0x6F46	0x9532	# <CJK>
-0x6F47	0x9534	# <CJK>
-0x6F48	0x9536	# <CJK>
-0x6F49	0x9537	# <CJK>
-0x6F4A	0x9538	# <CJK>
-0x6F4B	0x953C	# <CJK>
-0x6F4C	0x953E	# <CJK>
-0x6F4D	0x953F	# <CJK>
-0x6F4E	0x9542	# <CJK>
-0x6F4F	0x9535	# <CJK>
-0x6F50	0x9544	# <CJK>
-0x6F51	0x9545	# <CJK>
-0x6F52	0x9546	# <CJK>
-0x6F53	0x9549	# <CJK>
-0x6F54	0x954C	# <CJK>
-0x6F55	0x954E	# <CJK>
-0x6F56	0x954F	# <CJK>
-0x6F57	0x9552	# <CJK>
-0x6F58	0x9553	# <CJK>
-0x6F59	0x9554	# <CJK>
-0x6F5A	0x9556	# <CJK>
-0x6F5B	0x9557	# <CJK>
-0x6F5C	0x9558	# <CJK>
-0x6F5D	0x9559	# <CJK>
-0x6F5E	0x955B	# <CJK>
-0x6F5F	0x955E	# <CJK>
-0x6F60	0x955F	# <CJK>
-0x6F61	0x955D	# <CJK>
-0x6F62	0x9561	# <CJK>
-0x6F63	0x9562	# <CJK>
-0x6F64	0x9564	# <CJK>
-0x6F65	0x9565	# <CJK>
-0x6F66	0x9566	# <CJK>
-0x6F67	0x9567	# <CJK>
-0x6F68	0x9568	# <CJK>
-0x6F69	0x9569	# <CJK>
-0x6F6A	0x956A	# <CJK>
-0x6F6B	0x956B	# <CJK>
-0x6F6C	0x956C	# <CJK>
-0x6F6D	0x956F	# <CJK>
-0x6F6E	0x9571	# <CJK>
-0x6F6F	0x9572	# <CJK>
-0x6F70	0x9573	# <CJK>
-0x6F71	0x953A	# <CJK>
-0x6F72	0x77E7	# <CJK>
-0x6F73	0x77EC	# <CJK>
-0x6F74	0x96C9	# <CJK>
-0x6F75	0x79D5	# <CJK>
-0x6F76	0x79ED	# <CJK>
-0x6F77	0x79E3	# <CJK>
-0x6F78	0x79EB	# <CJK>
-0x6F79	0x7A06	# <CJK>
-0x6F7A	0x5D47	# <CJK>
-0x6F7B	0x7A03	# <CJK>
-0x6F7C	0x7A02	# <CJK>
-0x6F7D	0x7A1E	# <CJK>
-0x6F7E	0x7A14	# <CJK>
-0x7021	0x7A39	# <CJK>
-0x7022	0x7A37	# <CJK>
-0x7023	0x7A51	# <CJK>
-0x7024	0x9ECF	# <CJK>
-0x7025	0x99A5	# <CJK>
-0x7026	0x7A70	# <CJK>
-0x7027	0x7688	# <CJK>
-0x7028	0x768E	# <CJK>
-0x7029	0x7693	# <CJK>
-0x702A	0x7699	# <CJK>
-0x702B	0x76A4	# <CJK>
-0x702C	0x74DE	# <CJK>
-0x702D	0x74E0	# <CJK>
-0x702E	0x752C	# <CJK>
-0x702F	0x9E20	# <CJK>
-0x7030	0x9E22	# <CJK>
-0x7031	0x9E28	# <CJK>
-0x7032	0x9E29	# <CJK>
-0x7033	0x9E2A	# <CJK>
-0x7034	0x9E2B	# <CJK>
-0x7035	0x9E2C	# <CJK>
-0x7036	0x9E32	# <CJK>
-0x7037	0x9E31	# <CJK>
-0x7038	0x9E36	# <CJK>
-0x7039	0x9E38	# <CJK>
-0x703A	0x9E37	# <CJK>
-0x703B	0x9E39	# <CJK>
-0x703C	0x9E3A	# <CJK>
-0x703D	0x9E3E	# <CJK>
-0x703E	0x9E41	# <CJK>
-0x703F	0x9E42	# <CJK>
-0x7040	0x9E44	# <CJK>
-0x7041	0x9E46	# <CJK>
-0x7042	0x9E47	# <CJK>
-0x7043	0x9E48	# <CJK>
-0x7044	0x9E49	# <CJK>
-0x7045	0x9E4B	# <CJK>
-0x7046	0x9E4C	# <CJK>
-0x7047	0x9E4E	# <CJK>
-0x7048	0x9E51	# <CJK>
-0x7049	0x9E55	# <CJK>
-0x704A	0x9E57	# <CJK>
-0x704B	0x9E5A	# <CJK>
-0x704C	0x9E5B	# <CJK>
-0x704D	0x9E5C	# <CJK>
-0x704E	0x9E5E	# <CJK>
-0x704F	0x9E63	# <CJK>
-0x7050	0x9E66	# <CJK>
-0x7051	0x9E67	# <CJK>
-0x7052	0x9E68	# <CJK>
-0x7053	0x9E69	# <CJK>
-0x7054	0x9E6A	# <CJK>
-0x7055	0x9E6B	# <CJK>
-0x7056	0x9E6C	# <CJK>
-0x7057	0x9E71	# <CJK>
-0x7058	0x9E6D	# <CJK>
-0x7059	0x9E73	# <CJK>
-0x705A	0x7592	# <CJK>
-0x705B	0x7594	# <CJK>
-0x705C	0x7596	# <CJK>
-0x705D	0x75A0	# <CJK>
-0x705E	0x759D	# <CJK>
-0x705F	0x75AC	# <CJK>
-0x7060	0x75A3	# <CJK>
-0x7061	0x75B3	# <CJK>
-0x7062	0x75B4	# <CJK>
-0x7063	0x75B8	# <CJK>
-0x7064	0x75C4	# <CJK>
-0x7065	0x75B1	# <CJK>
-0x7066	0x75B0	# <CJK>
-0x7067	0x75C3	# <CJK>
-0x7068	0x75C2	# <CJK>
-0x7069	0x75D6	# <CJK>
-0x706A	0x75CD	# <CJK>
-0x706B	0x75E3	# <CJK>
-0x706C	0x75E8	# <CJK>
-0x706D	0x75E6	# <CJK>
-0x706E	0x75E4	# <CJK>
-0x706F	0x75EB	# <CJK>
-0x7070	0x75E7	# <CJK>
-0x7071	0x7603	# <CJK>
-0x7072	0x75F1	# <CJK>
-0x7073	0x75FC	# <CJK>
-0x7074	0x75FF	# <CJK>
-0x7075	0x7610	# <CJK>
-0x7076	0x7600	# <CJK>
-0x7077	0x7605	# <CJK>
-0x7078	0x760C	# <CJK>
-0x7079	0x7617	# <CJK>
-0x707A	0x760A	# <CJK>
-0x707B	0x7625	# <CJK>
-0x707C	0x7618	# <CJK>
-0x707D	0x7615	# <CJK>
-0x707E	0x7619	# <CJK>
-0x7121	0x761B	# <CJK>
-0x7122	0x763C	# <CJK>
-0x7123	0x7622	# <CJK>
-0x7124	0x7620	# <CJK>
-0x7125	0x7640	# <CJK>
-0x7126	0x762D	# <CJK>
-0x7127	0x7630	# <CJK>
-0x7128	0x763F	# <CJK>
-0x7129	0x7635	# <CJK>
-0x712A	0x7643	# <CJK>
-0x712B	0x763E	# <CJK>
-0x712C	0x7633	# <CJK>
-0x712D	0x764D	# <CJK>
-0x712E	0x765E	# <CJK>
-0x712F	0x7654	# <CJK>
-0x7130	0x765C	# <CJK>
-0x7131	0x7656	# <CJK>
-0x7132	0x766B	# <CJK>
-0x7133	0x766F	# <CJK>
-0x7134	0x7FCA	# <CJK>
-0x7135	0x7AE6	# <CJK>
-0x7136	0x7A78	# <CJK>
-0x7137	0x7A79	# <CJK>
-0x7138	0x7A80	# <CJK>
-0x7139	0x7A86	# <CJK>
-0x713A	0x7A88	# <CJK>
-0x713B	0x7A95	# <CJK>
-0x713C	0x7AA6	# <CJK>
-0x713D	0x7AA0	# <CJK>
-0x713E	0x7AAC	# <CJK>
-0x713F	0x7AA8	# <CJK>
-0x7140	0x7AAD	# <CJK>
-0x7141	0x7AB3	# <CJK>
-0x7142	0x8864	# <CJK>
-0x7143	0x8869	# <CJK>
-0x7144	0x8872	# <CJK>
-0x7145	0x887D	# <CJK>
-0x7146	0x887F	# <CJK>
-0x7147	0x8882	# <CJK>
-0x7148	0x88A2	# <CJK>
-0x7149	0x88C6	# <CJK>
-0x714A	0x88B7	# <CJK>
-0x714B	0x88BC	# <CJK>
-0x714C	0x88C9	# <CJK>
-0x714D	0x88E2	# <CJK>
-0x714E	0x88CE	# <CJK>
-0x714F	0x88E3	# <CJK>
-0x7150	0x88E5	# <CJK>
-0x7151	0x88F1	# <CJK>
-0x7152	0x891A	# <CJK>
-0x7153	0x88FC	# <CJK>
-0x7154	0x88E8	# <CJK>
-0x7155	0x88FE	# <CJK>
-0x7156	0x88F0	# <CJK>
-0x7157	0x8921	# <CJK>
-0x7158	0x8919	# <CJK>
-0x7159	0x8913	# <CJK>
-0x715A	0x891B	# <CJK>
-0x715B	0x890A	# <CJK>
-0x715C	0x8934	# <CJK>
-0x715D	0x892B	# <CJK>
-0x715E	0x8936	# <CJK>
-0x715F	0x8941	# <CJK>
-0x7160	0x8966	# <CJK>
-0x7161	0x897B	# <CJK>
-0x7162	0x758B	# <CJK>
-0x7163	0x80E5	# <CJK>
-0x7164	0x76B2	# <CJK>
-0x7165	0x76B4	# <CJK>
-0x7166	0x77DC	# <CJK>
-0x7167	0x8012	# <CJK>
-0x7168	0x8014	# <CJK>
-0x7169	0x8016	# <CJK>
-0x716A	0x801C	# <CJK>
-0x716B	0x8020	# <CJK>
-0x716C	0x8022	# <CJK>
-0x716D	0x8025	# <CJK>
-0x716E	0x8026	# <CJK>
-0x716F	0x8027	# <CJK>
-0x7170	0x8029	# <CJK>
-0x7171	0x8028	# <CJK>
-0x7172	0x8031	# <CJK>
-0x7173	0x800B	# <CJK>
-0x7174	0x8035	# <CJK>
-0x7175	0x8043	# <CJK>
-0x7176	0x8046	# <CJK>
-0x7177	0x804D	# <CJK>
-0x7178	0x8052	# <CJK>
-0x7179	0x8069	# <CJK>
-0x717A	0x8071	# <CJK>
-0x717B	0x8983	# <CJK>
-0x717C	0x9878	# <CJK>
-0x717D	0x9880	# <CJK>
-0x717E	0x9883	# <CJK>
-0x7221	0x9889	# <CJK>
-0x7222	0x988C	# <CJK>
-0x7223	0x988D	# <CJK>
-0x7224	0x988F	# <CJK>
-0x7225	0x9894	# <CJK>
-0x7226	0x989A	# <CJK>
-0x7227	0x989B	# <CJK>
-0x7228	0x989E	# <CJK>
-0x7229	0x989F	# <CJK>
-0x722A	0x98A1	# <CJK>
-0x722B	0x98A2	# <CJK>
-0x722C	0x98A5	# <CJK>
-0x722D	0x98A6	# <CJK>
-0x722E	0x864D	# <CJK>
-0x722F	0x8654	# <CJK>
-0x7230	0x866C	# <CJK>
-0x7231	0x866E	# <CJK>
-0x7232	0x867F	# <CJK>
-0x7233	0x867A	# <CJK>
-0x7234	0x867C	# <CJK>
-0x7235	0x867B	# <CJK>
-0x7236	0x86A8	# <CJK>
-0x7237	0x868D	# <CJK>
-0x7238	0x868B	# <CJK>
-0x7239	0x86AC	# <CJK>
-0x723A	0x869D	# <CJK>
-0x723B	0x86A7	# <CJK>
-0x723C	0x86A3	# <CJK>
-0x723D	0x86AA	# <CJK>
-0x723E	0x8693	# <CJK>
-0x723F	0x86A9	# <CJK>
-0x7240	0x86B6	# <CJK>
-0x7241	0x86C4	# <CJK>
-0x7242	0x86B5	# <CJK>
-0x7243	0x86CE	# <CJK>
-0x7244	0x86B0	# <CJK>
-0x7245	0x86BA	# <CJK>
-0x7246	0x86B1	# <CJK>
-0x7247	0x86AF	# <CJK>
-0x7248	0x86C9	# <CJK>
-0x7249	0x86CF	# <CJK>
-0x724A	0x86B4	# <CJK>
-0x724B	0x86E9	# <CJK>
-0x724C	0x86F1	# <CJK>
-0x724D	0x86F2	# <CJK>
-0x724E	0x86ED	# <CJK>
-0x724F	0x86F3	# <CJK>
-0x7250	0x86D0	# <CJK>
-0x7251	0x8713	# <CJK>
-0x7252	0x86DE	# <CJK>
-0x7253	0x86F4	# <CJK>
-0x7254	0x86DF	# <CJK>
-0x7255	0x86D8	# <CJK>
-0x7256	0x86D1	# <CJK>
-0x7257	0x8703	# <CJK>
-0x7258	0x8707	# <CJK>
-0x7259	0x86F8	# <CJK>
-0x725A	0x8708	# <CJK>
-0x725B	0x870A	# <CJK>
-0x725C	0x870D	# <CJK>
-0x725D	0x8709	# <CJK>
-0x725E	0x8723	# <CJK>
-0x725F	0x873B	# <CJK>
-0x7260	0x871E	# <CJK>
-0x7261	0x8725	# <CJK>
-0x7262	0x872E	# <CJK>
-0x7263	0x871A	# <CJK>
-0x7264	0x873E	# <CJK>
-0x7265	0x8748	# <CJK>
-0x7266	0x8734	# <CJK>
-0x7267	0x8731	# <CJK>
-0x7268	0x8729	# <CJK>
-0x7269	0x8737	# <CJK>
-0x726A	0x873F	# <CJK>
-0x726B	0x8782	# <CJK>
-0x726C	0x8722	# <CJK>
-0x726D	0x877D	# <CJK>
-0x726E	0x877E	# <CJK>
-0x726F	0x877B	# <CJK>
-0x7270	0x8760	# <CJK>
-0x7271	0x8770	# <CJK>
-0x7272	0x874C	# <CJK>
-0x7273	0x876E	# <CJK>
-0x7274	0x878B	# <CJK>
-0x7275	0x8753	# <CJK>
-0x7276	0x8763	# <CJK>
-0x7277	0x877C	# <CJK>
-0x7278	0x8764	# <CJK>
-0x7279	0x8759	# <CJK>
-0x727A	0x8765	# <CJK>
-0x727B	0x8793	# <CJK>
-0x727C	0x87AF	# <CJK>
-0x727D	0x87A8	# <CJK>
-0x727E	0x87D2	# <CJK>
-0x7321	0x87C6	# <CJK>
-0x7322	0x8788	# <CJK>
-0x7323	0x8785	# <CJK>
-0x7324	0x87AD	# <CJK>
-0x7325	0x8797	# <CJK>
-0x7326	0x8783	# <CJK>
-0x7327	0x87AB	# <CJK>
-0x7328	0x87E5	# <CJK>
-0x7329	0x87AC	# <CJK>
-0x732A	0x87B5	# <CJK>
-0x732B	0x87B3	# <CJK>
-0x732C	0x87CB	# <CJK>
-0x732D	0x87D3	# <CJK>
-0x732E	0x87BD	# <CJK>
-0x732F	0x87D1	# <CJK>
-0x7330	0x87C0	# <CJK>
-0x7331	0x87CA	# <CJK>
-0x7332	0x87DB	# <CJK>
-0x7333	0x87EA	# <CJK>
-0x7334	0x87E0	# <CJK>
-0x7335	0x87EE	# <CJK>
-0x7336	0x8816	# <CJK>
-0x7337	0x8813	# <CJK>
-0x7338	0x87FE	# <CJK>
-0x7339	0x880A	# <CJK>
-0x733A	0x881B	# <CJK>
-0x733B	0x8821	# <CJK>
-0x733C	0x8839	# <CJK>
-0x733D	0x883C	# <CJK>
-0x733E	0x7F36	# <CJK>
-0x733F	0x7F42	# <CJK>
-0x7340	0x7F44	# <CJK>
-0x7341	0x7F45	# <CJK>
-0x7342	0x8210	# <CJK>
-0x7343	0x7AFA	# <CJK>
-0x7344	0x7AFD	# <CJK>
-0x7345	0x7B08	# <CJK>
-0x7346	0x7B03	# <CJK>
-0x7347	0x7B04	# <CJK>
-0x7348	0x7B15	# <CJK>
-0x7349	0x7B0A	# <CJK>
-0x734A	0x7B2B	# <CJK>
-0x734B	0x7B0F	# <CJK>
-0x734C	0x7B47	# <CJK>
-0x734D	0x7B38	# <CJK>
-0x734E	0x7B2A	# <CJK>
-0x734F	0x7B19	# <CJK>
-0x7350	0x7B2E	# <CJK>
-0x7351	0x7B31	# <CJK>
-0x7352	0x7B20	# <CJK>
-0x7353	0x7B25	# <CJK>
-0x7354	0x7B24	# <CJK>
-0x7355	0x7B33	# <CJK>
-0x7356	0x7B3E	# <CJK>
-0x7357	0x7B1E	# <CJK>
-0x7358	0x7B58	# <CJK>
-0x7359	0x7B5A	# <CJK>
-0x735A	0x7B45	# <CJK>
-0x735B	0x7B75	# <CJK>
-0x735C	0x7B4C	# <CJK>
-0x735D	0x7B5D	# <CJK>
-0x735E	0x7B60	# <CJK>
-0x735F	0x7B6E	# <CJK>
-0x7360	0x7B7B	# <CJK>
-0x7361	0x7B62	# <CJK>
-0x7362	0x7B72	# <CJK>
-0x7363	0x7B71	# <CJK>
-0x7364	0x7B90	# <CJK>
-0x7365	0x7BA6	# <CJK>
-0x7366	0x7BA7	# <CJK>
-0x7367	0x7BB8	# <CJK>
-0x7368	0x7BAC	# <CJK>
-0x7369	0x7B9D	# <CJK>
-0x736A	0x7BA8	# <CJK>
-0x736B	0x7B85	# <CJK>
-0x736C	0x7BAA	# <CJK>
-0x736D	0x7B9C	# <CJK>
-0x736E	0x7BA2	# <CJK>
-0x736F	0x7BAB	# <CJK>
-0x7370	0x7BB4	# <CJK>
-0x7371	0x7BD1	# <CJK>
-0x7372	0x7BC1	# <CJK>
-0x7373	0x7BCC	# <CJK>
-0x7374	0x7BDD	# <CJK>
-0x7375	0x7BDA	# <CJK>
-0x7376	0x7BE5	# <CJK>
-0x7377	0x7BE6	# <CJK>
-0x7378	0x7BEA	# <CJK>
-0x7379	0x7C0C	# <CJK>
-0x737A	0x7BFE	# <CJK>
-0x737B	0x7BFC	# <CJK>
-0x737C	0x7C0F	# <CJK>
-0x737D	0x7C16	# <CJK>
-0x737E	0x7C0B	# <CJK>
-0x7421	0x7C1F	# <CJK>
-0x7422	0x7C2A	# <CJK>
-0x7423	0x7C26	# <CJK>
-0x7424	0x7C38	# <CJK>
-0x7425	0x7C41	# <CJK>
-0x7426	0x7C40	# <CJK>
-0x7427	0x81FE	# <CJK>
-0x7428	0x8201	# <CJK>
-0x7429	0x8202	# <CJK>
-0x742A	0x8204	# <CJK>
-0x742B	0x81EC	# <CJK>
-0x742C	0x8844	# <CJK>
-0x742D	0x8221	# <CJK>
-0x742E	0x8222	# <CJK>
-0x742F	0x8223	# <CJK>
-0x7430	0x822D	# <CJK>
-0x7431	0x822F	# <CJK>
-0x7432	0x8228	# <CJK>
-0x7433	0x822B	# <CJK>
-0x7434	0x8238	# <CJK>
-0x7435	0x823B	# <CJK>
-0x7436	0x8233	# <CJK>
-0x7437	0x8234	# <CJK>
-0x7438	0x823E	# <CJK>
-0x7439	0x8244	# <CJK>
-0x743A	0x8249	# <CJK>
-0x743B	0x824B	# <CJK>
-0x743C	0x824F	# <CJK>
-0x743D	0x825A	# <CJK>
-0x743E	0x825F	# <CJK>
-0x743F	0x8268	# <CJK>
-0x7440	0x887E	# <CJK>
-0x7441	0x8885	# <CJK>
-0x7442	0x8888	# <CJK>
-0x7443	0x88D8	# <CJK>
-0x7444	0x88DF	# <CJK>
-0x7445	0x895E	# <CJK>
-0x7446	0x7F9D	# <CJK>
-0x7447	0x7F9F	# <CJK>
-0x7448	0x7FA7	# <CJK>
-0x7449	0x7FAF	# <CJK>
-0x744A	0x7FB0	# <CJK>
-0x744B	0x7FB2	# <CJK>
-0x744C	0x7C7C	# <CJK>
-0x744D	0x6549	# <CJK>
-0x744E	0x7C91	# <CJK>
-0x744F	0x7C9D	# <CJK>
-0x7450	0x7C9C	# <CJK>
-0x7451	0x7C9E	# <CJK>
-0x7452	0x7CA2	# <CJK>
-0x7453	0x7CB2	# <CJK>
-0x7454	0x7CBC	# <CJK>
-0x7455	0x7CBD	# <CJK>
-0x7456	0x7CC1	# <CJK>
-0x7457	0x7CC7	# <CJK>
-0x7458	0x7CCC	# <CJK>
-0x7459	0x7CCD	# <CJK>
-0x745A	0x7CC8	# <CJK>
-0x745B	0x7CC5	# <CJK>
-0x745C	0x7CD7	# <CJK>
-0x745D	0x7CE8	# <CJK>
-0x745E	0x826E	# <CJK>
-0x745F	0x66A8	# <CJK>
-0x7460	0x7FBF	# <CJK>
-0x7461	0x7FCE	# <CJK>
-0x7462	0x7FD5	# <CJK>
-0x7463	0x7FE5	# <CJK>
-0x7464	0x7FE1	# <CJK>
-0x7465	0x7FE6	# <CJK>
-0x7466	0x7FE9	# <CJK>
-0x7467	0x7FEE	# <CJK>
-0x7468	0x7FF3	# <CJK>
-0x7469	0x7CF8	# <CJK>
-0x746A	0x7D77	# <CJK>
-0x746B	0x7DA6	# <CJK>
-0x746C	0x7DAE	# <CJK>
-0x746D	0x7E47	# <CJK>
-0x746E	0x7E9B	# <CJK>
-0x746F	0x9EB8	# <CJK>
-0x7470	0x9EB4	# <CJK>
-0x7471	0x8D73	# <CJK>
-0x7472	0x8D84	# <CJK>
-0x7473	0x8D94	# <CJK>
-0x7474	0x8D91	# <CJK>
-0x7475	0x8DB1	# <CJK>
-0x7476	0x8D67	# <CJK>
-0x7477	0x8D6D	# <CJK>
-0x7478	0x8C47	# <CJK>
-0x7479	0x8C49	# <CJK>
-0x747A	0x914A	# <CJK>
-0x747B	0x9150	# <CJK>
-0x747C	0x914E	# <CJK>
-0x747D	0x914F	# <CJK>
-0x747E	0x9164	# <CJK>
-0x7521	0x9162	# <CJK>
-0x7522	0x9161	# <CJK>
-0x7523	0x9170	# <CJK>
-0x7524	0x9169	# <CJK>
-0x7525	0x916F	# <CJK>
-0x7526	0x917D	# <CJK>
-0x7527	0x917E	# <CJK>
-0x7528	0x9172	# <CJK>
-0x7529	0x9174	# <CJK>
-0x752A	0x9179	# <CJK>
-0x752B	0x918C	# <CJK>
-0x752C	0x9185	# <CJK>
-0x752D	0x9190	# <CJK>
-0x752E	0x918D	# <CJK>
-0x752F	0x9191	# <CJK>
-0x7530	0x91A2	# <CJK>
-0x7531	0x91A3	# <CJK>
-0x7532	0x91AA	# <CJK>
-0x7533	0x91AD	# <CJK>
-0x7534	0x91AE	# <CJK>
-0x7535	0x91AF	# <CJK>
-0x7536	0x91B5	# <CJK>
-0x7537	0x91B4	# <CJK>
-0x7538	0x91BA	# <CJK>
-0x7539	0x8C55	# <CJK>
-0x753A	0x9E7E	# <CJK>
-0x753B	0x8DB8	# <CJK>
-0x753C	0x8DEB	# <CJK>
-0x753D	0x8E05	# <CJK>
-0x753E	0x8E59	# <CJK>
-0x753F	0x8E69	# <CJK>
-0x7540	0x8DB5	# <CJK>
-0x7541	0x8DBF	# <CJK>
-0x7542	0x8DBC	# <CJK>
-0x7543	0x8DBA	# <CJK>
-0x7544	0x8DC4	# <CJK>
-0x7545	0x8DD6	# <CJK>
-0x7546	0x8DD7	# <CJK>
-0x7547	0x8DDA	# <CJK>
-0x7548	0x8DDE	# <CJK>
-0x7549	0x8DCE	# <CJK>
-0x754A	0x8DCF	# <CJK>
-0x754B	0x8DDB	# <CJK>
-0x754C	0x8DC6	# <CJK>
-0x754D	0x8DEC	# <CJK>
-0x754E	0x8DF7	# <CJK>
-0x754F	0x8DF8	# <CJK>
-0x7550	0x8DE3	# <CJK>
-0x7551	0x8DF9	# <CJK>
-0x7552	0x8DFB	# <CJK>
-0x7553	0x8DE4	# <CJK>
-0x7554	0x8E09	# <CJK>
-0x7555	0x8DFD	# <CJK>
-0x7556	0x8E14	# <CJK>
-0x7557	0x8E1D	# <CJK>
-0x7558	0x8E1F	# <CJK>
-0x7559	0x8E2C	# <CJK>
-0x755A	0x8E2E	# <CJK>
-0x755B	0x8E23	# <CJK>
-0x755C	0x8E2F	# <CJK>
-0x755D	0x8E3A	# <CJK>
-0x755E	0x8E40	# <CJK>
-0x755F	0x8E39	# <CJK>
-0x7560	0x8E35	# <CJK>
-0x7561	0x8E3D	# <CJK>
-0x7562	0x8E31	# <CJK>
-0x7563	0x8E49	# <CJK>
-0x7564	0x8E41	# <CJK>
-0x7565	0x8E42	# <CJK>
-0x7566	0x8E51	# <CJK>
-0x7567	0x8E52	# <CJK>
-0x7568	0x8E4A	# <CJK>
-0x7569	0x8E70	# <CJK>
-0x756A	0x8E76	# <CJK>
-0x756B	0x8E7C	# <CJK>
-0x756C	0x8E6F	# <CJK>
-0x756D	0x8E74	# <CJK>
-0x756E	0x8E85	# <CJK>
-0x756F	0x8E8F	# <CJK>
-0x7570	0x8E94	# <CJK>
-0x7571	0x8E90	# <CJK>
-0x7572	0x8E9C	# <CJK>
-0x7573	0x8E9E	# <CJK>
-0x7574	0x8C78	# <CJK>
-0x7575	0x8C82	# <CJK>
-0x7576	0x8C8A	# <CJK>
-0x7577	0x8C85	# <CJK>
-0x7578	0x8C98	# <CJK>
-0x7579	0x8C94	# <CJK>
-0x757A	0x659B	# <CJK>
-0x757B	0x89D6	# <CJK>
-0x757C	0x89DE	# <CJK>
-0x757D	0x89DA	# <CJK>
-0x757E	0x89DC	# <CJK>
-0x7621	0x89E5	# <CJK>
-0x7622	0x89EB	# <CJK>
-0x7623	0x89EF	# <CJK>
-0x7624	0x8A3E	# <CJK>
-0x7625	0x8B26	# <CJK>
-0x7626	0x9753	# <CJK>
-0x7627	0x96E9	# <CJK>
-0x7628	0x96F3	# <CJK>
-0x7629	0x96EF	# <CJK>
-0x762A	0x9706	# <CJK>
-0x762B	0x9701	# <CJK>
-0x762C	0x9708	# <CJK>
-0x762D	0x970F	# <CJK>
-0x762E	0x970E	# <CJK>
-0x762F	0x972A	# <CJK>
-0x7630	0x972D	# <CJK>
-0x7631	0x9730	# <CJK>
-0x7632	0x973E	# <CJK>
-0x7633	0x9F80	# <CJK>
-0x7634	0x9F83	# <CJK>
-0x7635	0x9F85	# <CJK>
-0x7636	0x9F86	# <CJK>
-0x7637	0x9F87	# <CJK>
-0x7638	0x9F88	# <CJK>
-0x7639	0x9F89	# <CJK>
-0x763A	0x9F8A	# <CJK>
-0x763B	0x9F8C	# <CJK>
-0x763C	0x9EFE	# <CJK>
-0x763D	0x9F0B	# <CJK>
-0x763E	0x9F0D	# <CJK>
-0x763F	0x96B9	# <CJK>
-0x7640	0x96BC	# <CJK>
-0x7641	0x96BD	# <CJK>
-0x7642	0x96CE	# <CJK>
-0x7643	0x96D2	# <CJK>
-0x7644	0x77BF	# <CJK>
-0x7645	0x96E0	# <CJK>
-0x7646	0x928E	# <CJK>
-0x7647	0x92AE	# <CJK>
-0x7648	0x92C8	# <CJK>
-0x7649	0x933E	# <CJK>
-0x764A	0x936A	# <CJK>
-0x764B	0x93CA	# <CJK>
-0x764C	0x938F	# <CJK>
-0x764D	0x943E	# <CJK>
-0x764E	0x946B	# <CJK>
-0x764F	0x9C7F	# <CJK>
-0x7650	0x9C82	# <CJK>
-0x7651	0x9C85	# <CJK>
-0x7652	0x9C86	# <CJK>
-0x7653	0x9C87	# <CJK>
-0x7654	0x9C88	# <CJK>
-0x7655	0x7A23	# <CJK>
-0x7656	0x9C8B	# <CJK>
-0x7657	0x9C8E	# <CJK>
-0x7658	0x9C90	# <CJK>
-0x7659	0x9C91	# <CJK>
-0x765A	0x9C92	# <CJK>
-0x765B	0x9C94	# <CJK>
-0x765C	0x9C95	# <CJK>
-0x765D	0x9C9A	# <CJK>
-0x765E	0x9C9B	# <CJK>
-0x765F	0x9C9E	# <CJK>
-0x7660	0x9C9F	# <CJK>
-0x7661	0x9CA0	# <CJK>
-0x7662	0x9CA1	# <CJK>
-0x7663	0x9CA2	# <CJK>
-0x7664	0x9CA3	# <CJK>
-0x7665	0x9CA5	# <CJK>
-0x7666	0x9CA6	# <CJK>
-0x7667	0x9CA7	# <CJK>
-0x7668	0x9CA8	# <CJK>
-0x7669	0x9CA9	# <CJK>
-0x766A	0x9CAB	# <CJK>
-0x766B	0x9CAD	# <CJK>
-0x766C	0x9CAE	# <CJK>
-0x766D	0x9CB0	# <CJK>
-0x766E	0x9CB1	# <CJK>
-0x766F	0x9CB2	# <CJK>
-0x7670	0x9CB3	# <CJK>
-0x7671	0x9CB4	# <CJK>
-0x7672	0x9CB5	# <CJK>
-0x7673	0x9CB6	# <CJK>
-0x7674	0x9CB7	# <CJK>
-0x7675	0x9CBA	# <CJK>
-0x7676	0x9CBB	# <CJK>
-0x7677	0x9CBC	# <CJK>
-0x7678	0x9CBD	# <CJK>
-0x7679	0x9CC4	# <CJK>
-0x767A	0x9CC5	# <CJK>
-0x767B	0x9CC6	# <CJK>
-0x767C	0x9CC7	# <CJK>
-0x767D	0x9CCA	# <CJK>
-0x767E	0x9CCB	# <CJK>
-0x7721	0x9CCC	# <CJK>
-0x7722	0x9CCD	# <CJK>
-0x7723	0x9CCE	# <CJK>
-0x7724	0x9CCF	# <CJK>
-0x7725	0x9CD0	# <CJK>
-0x7726	0x9CD3	# <CJK>
-0x7727	0x9CD4	# <CJK>
-0x7728	0x9CD5	# <CJK>
-0x7729	0x9CD7	# <CJK>
-0x772A	0x9CD8	# <CJK>
-0x772B	0x9CD9	# <CJK>
-0x772C	0x9CDC	# <CJK>
-0x772D	0x9CDD	# <CJK>
-0x772E	0x9CDF	# <CJK>
-0x772F	0x9CE2	# <CJK>
-0x7730	0x977C	# <CJK>
-0x7731	0x9785	# <CJK>
-0x7732	0x9791	# <CJK>
-0x7733	0x9792	# <CJK>
-0x7734	0x9794	# <CJK>
-0x7735	0x97AF	# <CJK>
-0x7736	0x97AB	# <CJK>
-0x7737	0x97A3	# <CJK>
-0x7738	0x97B2	# <CJK>
-0x7739	0x97B4	# <CJK>
-0x773A	0x9AB1	# <CJK>
-0x773B	0x9AB0	# <CJK>
-0x773C	0x9AB7	# <CJK>
-0x773D	0x9E58	# <CJK>
-0x773E	0x9AB6	# <CJK>
-0x773F	0x9ABA	# <CJK>
-0x7740	0x9ABC	# <CJK>
-0x7741	0x9AC1	# <CJK>
-0x7742	0x9AC0	# <CJK>
-0x7743	0x9AC5	# <CJK>
-0x7744	0x9AC2	# <CJK>
-0x7745	0x9ACB	# <CJK>
-0x7746	0x9ACC	# <CJK>
-0x7747	0x9AD1	# <CJK>
-0x7748	0x9B45	# <CJK>
-0x7749	0x9B43	# <CJK>
-0x774A	0x9B47	# <CJK>
-0x774B	0x9B49	# <CJK>
-0x774C	0x9B48	# <CJK>
-0x774D	0x9B4D	# <CJK>
-0x774E	0x9B51	# <CJK>
-0x774F	0x98E8	# <CJK>
-0x7750	0x990D	# <CJK>
-0x7751	0x992E	# <CJK>
-0x7752	0x9955	# <CJK>
-0x7753	0x9954	# <CJK>
-0x7754	0x9ADF	# <CJK>
-0x7755	0x9AE1	# <CJK>
-0x7756	0x9AE6	# <CJK>
-0x7757	0x9AEF	# <CJK>
-0x7758	0x9AEB	# <CJK>
-0x7759	0x9AFB	# <CJK>
-0x775A	0x9AED	# <CJK>
-0x775B	0x9AF9	# <CJK>
-0x775C	0x9B08	# <CJK>
-0x775D	0x9B0F	# <CJK>
-0x775E	0x9B13	# <CJK>
-0x775F	0x9B1F	# <CJK>
-0x7760	0x9B23	# <CJK>
-0x7761	0x9EBD	# <CJK>
-0x7762	0x9EBE	# <CJK>
-0x7763	0x7E3B	# <CJK>
-0x7764	0x9E82	# <CJK>
-0x7765	0x9E87	# <CJK>
-0x7766	0x9E88	# <CJK>
-0x7767	0x9E8B	# <CJK>
-0x7768	0x9E92	# <CJK>
-0x7769	0x93D6	# <CJK>
-0x776A	0x9E9D	# <CJK>
-0x776B	0x9E9F	# <CJK>
-0x776C	0x9EDB	# <CJK>
-0x776D	0x9EDC	# <CJK>
-0x776E	0x9EDD	# <CJK>
-0x776F	0x9EE0	# <CJK>
-0x7770	0x9EDF	# <CJK>
-0x7771	0x9EE2	# <CJK>
-0x7772	0x9EE9	# <CJK>
-0x7773	0x9EE7	# <CJK>
-0x7774	0x9EE5	# <CJK>
-0x7775	0x9EEA	# <CJK>
-0x7776	0x9EEF	# <CJK>
-0x7777	0x9F22	# <CJK>
-0x7778	0x9F2C	# <CJK>
-0x7779	0x9F2F	# <CJK>
-0x777A	0x9F39	# <CJK>
-0x777B	0x9F37	# <CJK>
-0x777C	0x9F3D	# <CJK>
-0x777D	0x9F3E	# <CJK>
-0x777E	0x9F44	# <CJK>
diff --git a/tools/encoding/iso2022-jp.esc b/tools/encoding/iso2022-jp.esc
deleted file mode 100644
index 761f107..0000000
--- a/tools/encoding/iso2022-jp.esc
+++ /dev/null
@@ -1,10 +0,0 @@
-name		iso2022-jp
-init		{}
-final		{}
-iso8859-1	\x1b(B
-jis0201		\x1b(J
-jis0208		\x1b$@
-jis0208		\x1b$B
-jis0212		\x1b$(D
-gb2312		\x1b$A
-ksc5601		\x1b$(C
diff --git a/tools/encoding/iso2022-kr.esc b/tools/encoding/iso2022-kr.esc
deleted file mode 100644
index 5e5ed4e..0000000
--- a/tools/encoding/iso2022-kr.esc
+++ /dev/null
@@ -1,5 +0,0 @@
-name		iso2022-kr
-init		\x1b$)C
-final		{}
-iso8859-1	\x0f
-ksc5601		\x0e
diff --git a/tools/encoding/iso2022.esc b/tools/encoding/iso2022.esc
deleted file mode 100644
index 4b4b906..0000000
--- a/tools/encoding/iso2022.esc
+++ /dev/null
@@ -1,14 +0,0 @@
-name		iso2022
-init		{}
-final		{}
-iso8859-1	\x1b(B
-jis0201		\x1b(J
-gb1988		\x1b(T
-jis0208		\x1b$@
-jis0208		\x1b$B
-jis0212		\x1b$(D
-gb2312		\x1b$A
-ksc5601		\x1b$(C
-jis0208		\x1b&@\x1b$B
-
-
diff --git a/tools/encoding/iso8859-1.txt b/tools/encoding/iso8859-1.txt
deleted file mode 100644
index ec1d763..0000000
--- a/tools/encoding/iso8859-1.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-#
-#	Name:             ISO 8859-1 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-1 (1987) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-1 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-1 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x00A1	#	INVERTED EXCLAMATION MARK
-0xA2	0x00A2	#	CENT SIGN
-0xA3	0x00A3	#	POUND SIGN
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA5	0x00A5	#	YEN SIGN
-0xA6	0x00A6	#	BROKEN BAR
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x00A9	#	COPYRIGHT SIGN
-0xAA	0x00AA	#	FEMININE ORDINAL INDICATOR
-0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#	NOT SIGN
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x00AE	#	REGISTERED SIGN
-0xAF	0x00AF	#	MACRON
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x00B1	#	PLUS-MINUS SIGN
-0xB2	0x00B2	#	SUPERSCRIPT TWO
-0xB3	0x00B3	#	SUPERSCRIPT THREE
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x00B5	#	MICRO SIGN
-0xB6	0x00B6	#	PILCROW SIGN
-0xB7	0x00B7	#	MIDDLE DOT
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x00B9	#	SUPERSCRIPT ONE
-0xBA	0x00BA	#	MASCULINE ORDINAL INDICATOR
-0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x00BC	#	VULGAR FRACTION ONE QUARTER
-0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
-0xBE	0x00BE	#	VULGAR FRACTION THREE QUARTERS
-0xBF	0x00BF	#	INVERTED QUESTION MARK
-0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
-0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	0x00D0	#	LATIN CAPITAL LETTER ETH (Icelandic)
-0xD1	0x00D1	#	LATIN CAPITAL LETTER N WITH TILDE
-0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#	MULTIPLICATION SIGN
-0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	0x00DE	#	LATIN CAPITAL LETTER THORN (Icelandic)
-0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S (German)
-0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#	LATIN SMALL LETTER AE
-0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	0x00F0	#	LATIN SMALL LETTER ETH (Icelandic)
-0xF1	0x00F1	#	LATIN SMALL LETTER N WITH TILDE
-0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#	DIVISION SIGN
-0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
-0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x00FD	#	LATIN SMALL LETTER Y WITH ACUTE
-0xFE	0x00FE	#	LATIN SMALL LETTER THORN (Icelandic)
-0xFF	0x00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
diff --git a/tools/encoding/iso8859-2.txt b/tools/encoding/iso8859-2.txt
deleted file mode 100644
index e6f4fb0..0000000
--- a/tools/encoding/iso8859-2.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-#
-#	Name:             ISO 8859-2 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-2 (1987) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-2 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-2 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
-0xA2	0x02D8	#	BREVE
-0xA3	0x0141	#	LATIN CAPITAL LETTER L WITH STROKE
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA5	0x013D	#	LATIN CAPITAL LETTER L WITH CARON
-0xA6	0x015A	#	LATIN CAPITAL LETTER S WITH ACUTE
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
-0xAA	0x015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
-0xAB	0x0164	#	LATIN CAPITAL LETTER T WITH CARON
-0xAC	0x0179	#	LATIN CAPITAL LETTER Z WITH ACUTE
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
-0xAF	0x017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
-0xB2	0x02DB	#	OGONEK
-0xB3	0x0142	#	LATIN SMALL LETTER L WITH STROKE
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x013E	#	LATIN SMALL LETTER L WITH CARON
-0xB6	0x015B	#	LATIN SMALL LETTER S WITH ACUTE
-0xB7	0x02C7	#	CARON
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x0161	#	LATIN SMALL LETTER S WITH CARON
-0xBA	0x015F	#	LATIN SMALL LETTER S WITH CEDILLA
-0xBB	0x0165	#	LATIN SMALL LETTER T WITH CARON
-0xBC	0x017A	#	LATIN SMALL LETTER Z WITH ACUTE
-0xBD	0x02DD	#	DOUBLE ACUTE ACCENT
-0xBE	0x017E	#	LATIN SMALL LETTER Z WITH CARON
-0xBF	0x017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
-0xC0	0x0154	#	LATIN CAPITAL LETTER R WITH ACUTE
-0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x0102	#	LATIN CAPITAL LETTER A WITH BREVE
-0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x0139	#	LATIN CAPITAL LETTER L WITH ACUTE
-0xC6	0x0106	#	LATIN CAPITAL LETTER C WITH ACUTE
-0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
-0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x011A	#	LATIN CAPITAL LETTER E WITH CARON
-0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x010E	#	LATIN CAPITAL LETTER D WITH CARON
-0xD0	0x0110	#	LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x0143	#	LATIN CAPITAL LETTER N WITH ACUTE
-0xD2	0x0147	#	LATIN CAPITAL LETTER N WITH CARON
-0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x0150	#	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#	MULTIPLICATION SIGN
-0xD8	0x0158	#	LATIN CAPITAL LETTER R WITH CARON
-0xD9	0x016E	#	LATIN CAPITAL LETTER U WITH RING ABOVE
-0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x0170	#	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	0x0162	#	LATIN CAPITAL LETTER T WITH CEDILLA
-0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
-0xE0	0x0155	#	LATIN SMALL LETTER R WITH ACUTE
-0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x0103	#	LATIN SMALL LETTER A WITH BREVE
-0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x013A	#	LATIN SMALL LETTER L WITH ACUTE
-0xE6	0x0107	#	LATIN SMALL LETTER C WITH ACUTE
-0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x010D	#	LATIN SMALL LETTER C WITH CARON
-0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
-0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x011B	#	LATIN SMALL LETTER E WITH CARON
-0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x010F	#	LATIN SMALL LETTER D WITH CARON
-0xF0	0x0111	#	LATIN SMALL LETTER D WITH STROKE
-0xF1	0x0144	#	LATIN SMALL LETTER N WITH ACUTE
-0xF2	0x0148	#	LATIN SMALL LETTER N WITH CARON
-0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x0151	#	LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#	DIVISION SIGN
-0xF8	0x0159	#	LATIN SMALL LETTER R WITH CARON
-0xF9	0x016F	#	LATIN SMALL LETTER U WITH RING ABOVE
-0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x0171	#	LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x00FD	#	LATIN SMALL LETTER Y WITH ACUTE
-0xFE	0x0163	#	LATIN SMALL LETTER T WITH CEDILLA
-0xFF	0x02D9	#	DOT ABOVE
diff --git a/tools/encoding/iso8859-3.txt b/tools/encoding/iso8859-3.txt
deleted file mode 100644
index 9986688..0000000
--- a/tools/encoding/iso8859-3.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-#
-#	Name:             ISO 8859-3 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-3 (1988) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-3 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-3 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x0126	#	LATIN CAPITAL LETTER H WITH STROKE
-0xA2	0x02D8	#	BREVE
-0xA3	0x00A3	#	POUND SIGN
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA6	0x0124	#	LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x0130	#	LATIN CAPITAL LETTER I WITH DOT ABOVE
-0xAA	0x015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
-0xAB	0x011E	#	LATIN CAPITAL LETTER G WITH BREVE
-0xAC	0x0134	#	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAF	0x017B	#	LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x0127	#	LATIN SMALL LETTER H WITH STROKE
-0xB2	0x00B2	#	SUPERSCRIPT TWO
-0xB3	0x00B3	#	SUPERSCRIPT THREE
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x00B5	#	MICRO SIGN
-0xB6	0x0125	#	LATIN SMALL LETTER H WITH CIRCUMFLEX
-0xB7	0x00B7	#	MIDDLE DOT
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x0131	#	LATIN SMALL LETTER DOTLESS I
-0xBA	0x015F	#	LATIN SMALL LETTER S WITH CEDILLA
-0xBB	0x011F	#	LATIN SMALL LETTER G WITH BREVE
-0xBC	0x0135	#	LATIN SMALL LETTER J WITH CIRCUMFLEX
-0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
-0xBF	0x017C	#	LATIN SMALL LETTER Z WITH DOT ABOVE
-0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x010A	#	LATIN CAPITAL LETTER C WITH DOT ABOVE
-0xC6	0x0108	#	LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD1	0x00D1	#	LATIN CAPITAL LETTER N WITH TILDE
-0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x0120	#	LATIN CAPITAL LETTER G WITH DOT ABOVE
-0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#	MULTIPLICATION SIGN
-0xD8	0x011C	#	LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x016C	#	LATIN CAPITAL LETTER U WITH BREVE
-0xDE	0x015C	#	LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
-0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x010B	#	LATIN SMALL LETTER C WITH DOT ABOVE
-0xE6	0x0109	#	LATIN SMALL LETTER C WITH CIRCUMFLEX
-0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
-0xF1	0x00F1	#	LATIN SMALL LETTER N WITH TILDE
-0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x0121	#	LATIN SMALL LETTER G WITH DOT ABOVE
-0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#	DIVISION SIGN
-0xF8	0x011D	#	LATIN SMALL LETTER G WITH CIRCUMFLEX
-0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x016D	#	LATIN SMALL LETTER U WITH BREVE
-0xFE	0x015D	#	LATIN SMALL LETTER S WITH CIRCUMFLEX
-0xFF	0x02D9	#	DOT ABOVE
diff --git a/tools/encoding/iso8859-4.txt b/tools/encoding/iso8859-4.txt
deleted file mode 100644
index c686a39..0000000
--- a/tools/encoding/iso8859-4.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-#
-#	Name:             ISO 8859-4 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-4 (1988) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-4 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-4 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x0104	#	LATIN CAPITAL LETTER A WITH OGONEK
-0xA2	0x0138	#	LATIN SMALL LETTER KRA
-0xA3	0x0156	#	LATIN CAPITAL LETTER R WITH CEDILLA
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA5	0x0128	#	LATIN CAPITAL LETTER I WITH TILDE
-0xA6	0x013B	#	LATIN CAPITAL LETTER L WITH CEDILLA
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x0160	#	LATIN CAPITAL LETTER S WITH CARON
-0xAA	0x0112	#	LATIN CAPITAL LETTER E WITH MACRON
-0xAB	0x0122	#	LATIN CAPITAL LETTER G WITH CEDILLA
-0xAC	0x0166	#	LATIN CAPITAL LETTER T WITH STROKE
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x017D	#	LATIN CAPITAL LETTER Z WITH CARON
-0xAF	0x00AF	#	MACRON
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x0105	#	LATIN SMALL LETTER A WITH OGONEK
-0xB2	0x02DB	#	OGONEK
-0xB3	0x0157	#	LATIN SMALL LETTER R WITH CEDILLA
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x0129	#	LATIN SMALL LETTER I WITH TILDE
-0xB6	0x013C	#	LATIN SMALL LETTER L WITH CEDILLA
-0xB7	0x02C7	#	CARON
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x0161	#	LATIN SMALL LETTER S WITH CARON
-0xBA	0x0113	#	LATIN SMALL LETTER E WITH MACRON
-0xBB	0x0123	#	LATIN SMALL LETTER G WITH CEDILLA
-0xBC	0x0167	#	LATIN SMALL LETTER T WITH STROKE
-0xBD	0x014A	#	LATIN CAPITAL LETTER ENG
-0xBE	0x017E	#	LATIN SMALL LETTER Z WITH CARON
-0xBF	0x014B	#	LATIN SMALL LETTER ENG
-0xC0	0x0100	#	LATIN CAPITAL LETTER A WITH MACRON
-0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
-0xC7	0x012E	#	LATIN CAPITAL LETTER I WITH OGONEK
-0xC8	0x010C	#	LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x0118	#	LATIN CAPITAL LETTER E WITH OGONEK
-0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x0116	#	LATIN CAPITAL LETTER E WITH DOT ABOVE
-0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x012A	#	LATIN CAPITAL LETTER I WITH MACRON
-0xD0	0x0110	#	LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x0145	#	LATIN CAPITAL LETTER N WITH CEDILLA
-0xD2	0x014C	#	LATIN CAPITAL LETTER O WITH MACRON
-0xD3	0x0136	#	LATIN CAPITAL LETTER K WITH CEDILLA
-0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#	MULTIPLICATION SIGN
-0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x0172	#	LATIN CAPITAL LETTER U WITH OGONEK
-0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x0168	#	LATIN CAPITAL LETTER U WITH TILDE
-0xDE	0x016A	#	LATIN CAPITAL LETTER U WITH MACRON
-0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
-0xE0	0x0101	#	LATIN SMALL LETTER A WITH MACRON
-0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#	LATIN SMALL LETTER AE
-0xE7	0x012F	#	LATIN SMALL LETTER I WITH OGONEK
-0xE8	0x010D	#	LATIN SMALL LETTER C WITH CARON
-0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x0119	#	LATIN SMALL LETTER E WITH OGONEK
-0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x0117	#	LATIN SMALL LETTER E WITH DOT ABOVE
-0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x012B	#	LATIN SMALL LETTER I WITH MACRON
-0xF0	0x0111	#	LATIN SMALL LETTER D WITH STROKE
-0xF1	0x0146	#	LATIN SMALL LETTER N WITH CEDILLA
-0xF2	0x014D	#	LATIN SMALL LETTER O WITH MACRON
-0xF3	0x0137	#	LATIN SMALL LETTER K WITH CEDILLA
-0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#	DIVISION SIGN
-0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
-0xF9	0x0173	#	LATIN SMALL LETTER U WITH OGONEK
-0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x0169	#	LATIN SMALL LETTER U WITH TILDE
-0xFE	0x016B	#	LATIN SMALL LETTER U WITH MACRON
-0xFF	0x02D9	#	DOT ABOVE
diff --git a/tools/encoding/iso8859-5.txt b/tools/encoding/iso8859-5.txt
deleted file mode 100644
index ae7a76e..0000000
--- a/tools/encoding/iso8859-5.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-#
-#	Name:             ISO 8859-5 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-5 (1988) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-5 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-5 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x0401	#	CYRILLIC CAPITAL LETTER IO
-0xA2	0x0402	#	CYRILLIC CAPITAL LETTER DJE
-0xA3	0x0403	#	CYRILLIC CAPITAL LETTER GJE
-0xA4	0x0404	#	CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0xA5	0x0405	#	CYRILLIC CAPITAL LETTER DZE
-0xA6	0x0406	#	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0xA7	0x0407	#	CYRILLIC CAPITAL LETTER YI
-0xA8	0x0408	#	CYRILLIC CAPITAL LETTER JE
-0xA9	0x0409	#	CYRILLIC CAPITAL LETTER LJE
-0xAA	0x040A	#	CYRILLIC CAPITAL LETTER NJE
-0xAB	0x040B	#	CYRILLIC CAPITAL LETTER TSHE
-0xAC	0x040C	#	CYRILLIC CAPITAL LETTER KJE
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x040E	#	CYRILLIC CAPITAL LETTER SHORT U
-0xAF	0x040F	#	CYRILLIC CAPITAL LETTER DZHE
-0xB0	0x0410	#	CYRILLIC CAPITAL LETTER A
-0xB1	0x0411	#	CYRILLIC CAPITAL LETTER BE
-0xB2	0x0412	#	CYRILLIC CAPITAL LETTER VE
-0xB3	0x0413	#	CYRILLIC CAPITAL LETTER GHE
-0xB4	0x0414	#	CYRILLIC CAPITAL LETTER DE
-0xB5	0x0415	#	CYRILLIC CAPITAL LETTER IE
-0xB6	0x0416	#	CYRILLIC CAPITAL LETTER ZHE
-0xB7	0x0417	#	CYRILLIC CAPITAL LETTER ZE
-0xB8	0x0418	#	CYRILLIC CAPITAL LETTER I
-0xB9	0x0419	#	CYRILLIC CAPITAL LETTER SHORT I
-0xBA	0x041A	#	CYRILLIC CAPITAL LETTER KA
-0xBB	0x041B	#	CYRILLIC CAPITAL LETTER EL
-0xBC	0x041C	#	CYRILLIC CAPITAL LETTER EM
-0xBD	0x041D	#	CYRILLIC CAPITAL LETTER EN
-0xBE	0x041E	#	CYRILLIC CAPITAL LETTER O
-0xBF	0x041F	#	CYRILLIC CAPITAL LETTER PE
-0xC0	0x0420	#	CYRILLIC CAPITAL LETTER ER
-0xC1	0x0421	#	CYRILLIC CAPITAL LETTER ES
-0xC2	0x0422	#	CYRILLIC CAPITAL LETTER TE
-0xC3	0x0423	#	CYRILLIC CAPITAL LETTER U
-0xC4	0x0424	#	CYRILLIC CAPITAL LETTER EF
-0xC5	0x0425	#	CYRILLIC CAPITAL LETTER HA
-0xC6	0x0426	#	CYRILLIC CAPITAL LETTER TSE
-0xC7	0x0427	#	CYRILLIC CAPITAL LETTER CHE
-0xC8	0x0428	#	CYRILLIC CAPITAL LETTER SHA
-0xC9	0x0429	#	CYRILLIC CAPITAL LETTER SHCHA
-0xCA	0x042A	#	CYRILLIC CAPITAL LETTER HARD SIGN
-0xCB	0x042B	#	CYRILLIC CAPITAL LETTER YERU
-0xCC	0x042C	#	CYRILLIC CAPITAL LETTER SOFT SIGN
-0xCD	0x042D	#	CYRILLIC CAPITAL LETTER E
-0xCE	0x042E	#	CYRILLIC CAPITAL LETTER YU
-0xCF	0x042F	#	CYRILLIC CAPITAL LETTER YA
-0xD0	0x0430	#	CYRILLIC SMALL LETTER A
-0xD1	0x0431	#	CYRILLIC SMALL LETTER BE
-0xD2	0x0432	#	CYRILLIC SMALL LETTER VE
-0xD3	0x0433	#	CYRILLIC SMALL LETTER GHE
-0xD4	0x0434	#	CYRILLIC SMALL LETTER DE
-0xD5	0x0435	#	CYRILLIC SMALL LETTER IE
-0xD6	0x0436	#	CYRILLIC SMALL LETTER ZHE
-0xD7	0x0437	#	CYRILLIC SMALL LETTER ZE
-0xD8	0x0438	#	CYRILLIC SMALL LETTER I
-0xD9	0x0439	#	CYRILLIC SMALL LETTER SHORT I
-0xDA	0x043A	#	CYRILLIC SMALL LETTER KA
-0xDB	0x043B	#	CYRILLIC SMALL LETTER EL
-0xDC	0x043C	#	CYRILLIC SMALL LETTER EM
-0xDD	0x043D	#	CYRILLIC SMALL LETTER EN
-0xDE	0x043E	#	CYRILLIC SMALL LETTER O
-0xDF	0x043F	#	CYRILLIC SMALL LETTER PE
-0xE0	0x0440	#	CYRILLIC SMALL LETTER ER
-0xE1	0x0441	#	CYRILLIC SMALL LETTER ES
-0xE2	0x0442	#	CYRILLIC SMALL LETTER TE
-0xE3	0x0443	#	CYRILLIC SMALL LETTER U
-0xE4	0x0444	#	CYRILLIC SMALL LETTER EF
-0xE5	0x0445	#	CYRILLIC SMALL LETTER HA
-0xE6	0x0446	#	CYRILLIC SMALL LETTER TSE
-0xE7	0x0447	#	CYRILLIC SMALL LETTER CHE
-0xE8	0x0448	#	CYRILLIC SMALL LETTER SHA
-0xE9	0x0449	#	CYRILLIC SMALL LETTER SHCHA
-0xEA	0x044A	#	CYRILLIC SMALL LETTER HARD SIGN
-0xEB	0x044B	#	CYRILLIC SMALL LETTER YERU
-0xEC	0x044C	#	CYRILLIC SMALL LETTER SOFT SIGN
-0xED	0x044D	#	CYRILLIC SMALL LETTER E
-0xEE	0x044E	#	CYRILLIC SMALL LETTER YU
-0xEF	0x044F	#	CYRILLIC SMALL LETTER YA
-0xF0	0x2116	#	NUMERO SIGN
-0xF1	0x0451	#	CYRILLIC SMALL LETTER IO
-0xF2	0x0452	#	CYRILLIC SMALL LETTER DJE
-0xF3	0x0453	#	CYRILLIC SMALL LETTER GJE
-0xF4	0x0454	#	CYRILLIC SMALL LETTER UKRAINIAN IE
-0xF5	0x0455	#	CYRILLIC SMALL LETTER DZE
-0xF6	0x0456	#	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0xF7	0x0457	#	CYRILLIC SMALL LETTER YI
-0xF8	0x0458	#	CYRILLIC SMALL LETTER JE
-0xF9	0x0459	#	CYRILLIC SMALL LETTER LJE
-0xFA	0x045A	#	CYRILLIC SMALL LETTER NJE
-0xFB	0x045B	#	CYRILLIC SMALL LETTER TSHE
-0xFC	0x045C	#	CYRILLIC SMALL LETTER KJE
-0xFD	0x00A7	#	SECTION SIGN
-0xFE	0x045E	#	CYRILLIC SMALL LETTER SHORT U
-0xFF	0x045F	#	CYRILLIC SMALL LETTER DZHE
diff --git a/tools/encoding/iso8859-6.txt b/tools/encoding/iso8859-6.txt
deleted file mode 100644
index 7452f5a..0000000
--- a/tools/encoding/iso8859-6.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-#
-#	Name:             ISO 8859-6 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-6 (1987) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-6 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-6 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0660	#	ARABIC-INDIC DIGIT ZERO
-0x31	0x0661	#	ARABIC-INDIC DIGIT ONE
-0x32	0x0662	#	ARABIC-INDIC DIGIT TWO
-0x33	0x0663	#	ARABIC-INDIC DIGIT THREE
-0x34	0x0664	#	ARABIC-INDIC DIGIT FOUR
-0x35	0x0665	#	ARABIC-INDIC DIGIT FIVE
-0x36	0x0666	#	ARABIC-INDIC DIGIT SIX
-0x37	0x0667	#	ARABIC-INDIC DIGIT SEVEN
-0x38	0x0668	#	ARABIC-INDIC DIGIT EIGHT
-0x39	0x0669	#	ARABIC-INDIC DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA4	0x00A4	#	CURRENCY SIGN
-0xAC	0x060C	#	ARABIC COMMA
-0xAD	0x00AD	#	SOFT HYPHEN
-0xBB	0x061B	#	ARABIC SEMICOLON
-0xBF	0x061F	#	ARABIC QUESTION MARK
-0xC1	0x0621	#	ARABIC LETTER HAMZA
-0xC2	0x0622	#	ARABIC LETTER ALEF WITH MADDA ABOVE
-0xC3	0x0623	#	ARABIC LETTER ALEF WITH HAMZA ABOVE
-0xC4	0x0624	#	ARABIC LETTER WAW WITH HAMZA ABOVE
-0xC5	0x0625	#	ARABIC LETTER ALEF WITH HAMZA BELOW
-0xC6	0x0626	#	ARABIC LETTER YEH WITH HAMZA ABOVE
-0xC7	0x0627	#	ARABIC LETTER ALEF
-0xC8	0x0628	#	ARABIC LETTER BEH
-0xC9	0x0629	#	ARABIC LETTER TEH MARBUTA
-0xCA	0x062A	#	ARABIC LETTER TEH
-0xCB	0x062B	#	ARABIC LETTER THEH
-0xCC	0x062C	#	ARABIC LETTER JEEM
-0xCD	0x062D	#	ARABIC LETTER HAH
-0xCE	0x062E	#	ARABIC LETTER KHAH
-0xCF	0x062F	#	ARABIC LETTER DAL
-0xD0	0x0630	#	ARABIC LETTER THAL
-0xD1	0x0631	#	ARABIC LETTER REH
-0xD2	0x0632	#	ARABIC LETTER ZAIN
-0xD3	0x0633	#	ARABIC LETTER SEEN
-0xD4	0x0634	#	ARABIC LETTER SHEEN
-0xD5	0x0635	#	ARABIC LETTER SAD
-0xD6	0x0636	#	ARABIC LETTER DAD
-0xD7	0x0637	#	ARABIC LETTER TAH
-0xD8	0x0638	#	ARABIC LETTER ZAH
-0xD9	0x0639	#	ARABIC LETTER AIN
-0xDA	0x063A	#	ARABIC LETTER GHAIN
-0xE0	0x0640	#	ARABIC TATWEEL
-0xE1	0x0641	#	ARABIC LETTER FEH
-0xE2	0x0642	#	ARABIC LETTER QAF
-0xE3	0x0643	#	ARABIC LETTER KAF
-0xE4	0x0644	#	ARABIC LETTER LAM
-0xE5	0x0645	#	ARABIC LETTER MEEM
-0xE6	0x0646	#	ARABIC LETTER NOON
-0xE7	0x0647	#	ARABIC LETTER HEH
-0xE8	0x0648	#	ARABIC LETTER WAW
-0xE9	0x0649	#	ARABIC LETTER ALEF MAKSURA
-0xEA	0x064A	#	ARABIC LETTER YEH
-0xEB	0x064B	#	ARABIC FATHATAN
-0xEC	0x064C	#	ARABIC DAMMATAN
-0xED	0x064D	#	ARABIC KASRATAN
-0xEE	0x064E	#	ARABIC FATHA
-0xEF	0x064F	#	ARABIC DAMMA
-0xF0	0x0650	#	ARABIC KASRA
-0xF1	0x0651	#	ARABIC SHADDA
-0xF2	0x0652	#	ARABIC SUKUN
diff --git a/tools/encoding/iso8859-7.txt b/tools/encoding/iso8859-7.txt
deleted file mode 100644
index f9ea851..0000000
--- a/tools/encoding/iso8859-7.txt
+++ /dev/null
@@ -1,224 +0,0 @@
-#
-#	Name:             ISO 8859-7 (1987) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-7 (1987) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-7 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-7 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x02BD	#	MODIFIER LETTER REVERSED COMMA
-0xA2	0x02BC	#	MODIFIER LETTER APOSTROPHE
-0xA3	0x00A3	#	POUND SIGN
-0xA6	0x00A6	#	BROKEN BAR
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x00A9	#	COPYRIGHT SIGN
-0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#	NOT SIGN
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAF	0x2015	#	HORIZONTAL BAR
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x00B1	#	PLUS-MINUS SIGN
-0xB2	0x00B2	#	SUPERSCRIPT TWO
-0xB3	0x00B3	#	SUPERSCRIPT THREE
-0xB4	0x0384	#	GREEK TONOS
-0xB5	0x0385	#	GREEK DIALYTIKA TONOS
-0xB6	0x0386	#	GREEK CAPITAL LETTER ALPHA WITH TONOS
-0xB7	0x00B7	#	MIDDLE DOT
-0xB8	0x0388	#	GREEK CAPITAL LETTER EPSILON WITH TONOS
-0xB9	0x0389	#	GREEK CAPITAL LETTER ETA WITH TONOS
-0xBA	0x038A	#	GREEK CAPITAL LETTER IOTA WITH TONOS
-0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x038C	#	GREEK CAPITAL LETTER OMICRON WITH TONOS
-0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
-0xBE	0x038E	#	GREEK CAPITAL LETTER UPSILON WITH TONOS
-0xBF	0x038F	#	GREEK CAPITAL LETTER OMEGA WITH TONOS
-0xC0	0x0390	#	GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-0xC1	0x0391	#	GREEK CAPITAL LETTER ALPHA
-0xC2	0x0392	#	GREEK CAPITAL LETTER BETA
-0xC3	0x0393	#	GREEK CAPITAL LETTER GAMMA
-0xC4	0x0394	#	GREEK CAPITAL LETTER DELTA
-0xC5	0x0395	#	GREEK CAPITAL LETTER EPSILON
-0xC6	0x0396	#	GREEK CAPITAL LETTER ZETA
-0xC7	0x0397	#	GREEK CAPITAL LETTER ETA
-0xC8	0x0398	#	GREEK CAPITAL LETTER THETA
-0xC9	0x0399	#	GREEK CAPITAL LETTER IOTA
-0xCA	0x039A	#	GREEK CAPITAL LETTER KAPPA
-0xCB	0x039B	#	GREEK CAPITAL LETTER LAMDA
-0xCC	0x039C	#	GREEK CAPITAL LETTER MU
-0xCD	0x039D	#	GREEK CAPITAL LETTER NU
-0xCE	0x039E	#	GREEK CAPITAL LETTER XI
-0xCF	0x039F	#	GREEK CAPITAL LETTER OMICRON
-0xD0	0x03A0	#	GREEK CAPITAL LETTER PI
-0xD1	0x03A1	#	GREEK CAPITAL LETTER RHO
-0xD3	0x03A3	#	GREEK CAPITAL LETTER SIGMA
-0xD4	0x03A4	#	GREEK CAPITAL LETTER TAU
-0xD5	0x03A5	#	GREEK CAPITAL LETTER UPSILON
-0xD6	0x03A6	#	GREEK CAPITAL LETTER PHI
-0xD7	0x03A7	#	GREEK CAPITAL LETTER CHI
-0xD8	0x03A8	#	GREEK CAPITAL LETTER PSI
-0xD9	0x03A9	#	GREEK CAPITAL LETTER OMEGA
-0xDA	0x03AA	#	GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-0xDB	0x03AB	#	GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-0xDC	0x03AC	#	GREEK SMALL LETTER ALPHA WITH TONOS
-0xDD	0x03AD	#	GREEK SMALL LETTER EPSILON WITH TONOS
-0xDE	0x03AE	#	GREEK SMALL LETTER ETA WITH TONOS
-0xDF	0x03AF	#	GREEK SMALL LETTER IOTA WITH TONOS
-0xE0	0x03B0	#	GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-0xE1	0x03B1	#	GREEK SMALL LETTER ALPHA
-0xE2	0x03B2	#	GREEK SMALL LETTER BETA
-0xE3	0x03B3	#	GREEK SMALL LETTER GAMMA
-0xE4	0x03B4	#	GREEK SMALL LETTER DELTA
-0xE5	0x03B5	#	GREEK SMALL LETTER EPSILON
-0xE6	0x03B6	#	GREEK SMALL LETTER ZETA
-0xE7	0x03B7	#	GREEK SMALL LETTER ETA
-0xE8	0x03B8	#	GREEK SMALL LETTER THETA
-0xE9	0x03B9	#	GREEK SMALL LETTER IOTA
-0xEA	0x03BA	#	GREEK SMALL LETTER KAPPA
-0xEB	0x03BB	#	GREEK SMALL LETTER LAMDA
-0xEC	0x03BC	#	GREEK SMALL LETTER MU
-0xED	0x03BD	#	GREEK SMALL LETTER NU
-0xEE	0x03BE	#	GREEK SMALL LETTER XI
-0xEF	0x03BF	#	GREEK SMALL LETTER OMICRON
-0xF0	0x03C0	#	GREEK SMALL LETTER PI
-0xF1	0x03C1	#	GREEK SMALL LETTER RHO
-0xF2	0x03C2	#	GREEK SMALL LETTER FINAL SIGMA
-0xF3	0x03C3	#	GREEK SMALL LETTER SIGMA
-0xF4	0x03C4	#	GREEK SMALL LETTER TAU
-0xF5	0x03C5	#	GREEK SMALL LETTER UPSILON
-0xF6	0x03C6	#	GREEK SMALL LETTER PHI
-0xF7	0x03C7	#	GREEK SMALL LETTER CHI
-0xF8	0x03C8	#	GREEK SMALL LETTER PSI
-0xF9	0x03C9	#	GREEK SMALL LETTER OMEGA
-0xFA	0x03CA	#	GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0xFB	0x03CB	#	GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-0xFC	0x03CC	#	GREEK SMALL LETTER OMICRON WITH TONOS
-0xFD	0x03CD	#	GREEK SMALL LETTER UPSILON WITH TONOS
-0xFE	0x03CE	#	GREEK SMALL LETTER OMEGA WITH TONOS
diff --git a/tools/encoding/iso8859-8.txt b/tools/encoding/iso8859-8.txt
deleted file mode 100644
index 347f567..0000000
--- a/tools/encoding/iso8859-8.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-#	Name:             ISO 8859-8 (1988) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-8 (1988) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-8 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-8 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA2	0x00A2	#	CENT SIGN
-0xA3	0x00A3	#	POUND SIGN
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA5	0x00A5	#	YEN SIGN
-0xA6	0x00A6	#	BROKEN BAR
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x00A9	#	COPYRIGHT SIGN
-0xAA	0x00D7	#	MULTIPLICATION SIGN
-0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#	NOT SIGN
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x00AE	#	REGISTERED SIGN
-0xAF	0x203E	#	OVERLINE
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x00B1	#	PLUS-MINUS SIGN
-0xB2	0x00B2	#	SUPERSCRIPT TWO
-0xB3	0x00B3	#	SUPERSCRIPT THREE
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x00B5	#	MICRO SIGN
-0xB6	0x00B6	#	PILCROW SIGN
-0xB7	0x00B7	#	MIDDLE DOT
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x00B9	#	SUPERSCRIPT ONE
-0xBA	0x00F7	#	DIVISION SIGN
-0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x00BC	#	VULGAR FRACTION ONE QUARTER
-0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
-0xBE	0x00BE	#	VULGAR FRACTION THREE QUARTERS
-0xDF	0x2017	#	DOUBLE LOW LINE
-0xE0	0x05D0	#	HEBREW LETTER ALEF
-0xE1	0x05D1	#	HEBREW LETTER BET
-0xE2	0x05D2	#	HEBREW LETTER GIMEL
-0xE3	0x05D3	#	HEBREW LETTER DALET
-0xE4	0x05D4	#	HEBREW LETTER HE
-0xE5	0x05D5	#	HEBREW LETTER VAV
-0xE6	0x05D6	#	HEBREW LETTER ZAYIN
-0xE7	0x05D7	#	HEBREW LETTER HET
-0xE8	0x05D8	#	HEBREW LETTER TET
-0xE9	0x05D9	#	HEBREW LETTER YOD
-0xEA	0x05DA	#	HEBREW LETTER FINAL KAF
-0xEB	0x05DB	#	HEBREW LETTER KAF
-0xEC	0x05DC	#	HEBREW LETTER LAMED
-0xED	0x05DD	#	HEBREW LETTER FINAL MEM
-0xEE	0x05DE	#	HEBREW LETTER MEM
-0xEF	0x05DF	#	HEBREW LETTER FINAL NUN
-0xF0	0x05E0	#	HEBREW LETTER NUN
-0xF1	0x05E1	#	HEBREW LETTER SAMEKH
-0xF2	0x05E2	#	HEBREW LETTER AYIN
-0xF3	0x05E3	#	HEBREW LETTER FINAL PE
-0xF4	0x05E4	#	HEBREW LETTER PE
-0xF5	0x05E5	#	HEBREW LETTER FINAL TSADI
-0xF6	0x05E6	#	HEBREW LETTER TSADI
-0xF7	0x05E7	#	HEBREW LETTER QOF
-0xF8	0x05E8	#	HEBREW LETTER RESH
-0xF9	0x05E9	#	HEBREW LETTER SHIN
-0xFA	0x05EA	#	HEBREW LETTER TAV
diff --git a/tools/encoding/iso8859-9.txt b/tools/encoding/iso8859-9.txt
deleted file mode 100644
index 7a065c6..0000000
--- a/tools/encoding/iso8859-9.txt
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-#	Name:             ISO 8859-9 (1989) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.1
-#	Table format:     Format A
-#	Date:             16 January 1995
-#	Authors:          Tim Greenwood <greenwood@r2me2.enet.dec.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1995 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       ISO 8859-9 (1989) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the ISO 8859-9 code (in hex as 0xXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#
-#	The entries are in ISO 8859-9 order
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-0x20	0x0020	#	SPACE
-0x21	0x0021	#	EXCLAMATION MARK
-0x22	0x0022	#	QUOTATION MARK
-0x23	0x0023	#	NUMBER SIGN
-0x24	0x0024	#	DOLLAR SIGN
-0x25	0x0025	#	PERCENT SIGN
-0x26	0x0026	#	AMPERSAND
-0x27	0x0027	#	APOSTROPHE
-0x28	0x0028	#	LEFT PARENTHESIS
-0x29	0x0029	#	RIGHT PARENTHESIS
-0x2A	0x002A	#	ASTERISK
-0x2B	0x002B	#	PLUS SIGN
-0x2C	0x002C	#	COMMA
-0x2D	0x002D	#	HYPHEN-MINUS
-0x2E	0x002E	#	FULL STOP
-0x2F	0x002F	#	SOLIDUS
-0x30	0x0030	#	DIGIT ZERO
-0x31	0x0031	#	DIGIT ONE
-0x32	0x0032	#	DIGIT TWO
-0x33	0x0033	#	DIGIT THREE
-0x34	0x0034	#	DIGIT FOUR
-0x35	0x0035	#	DIGIT FIVE
-0x36	0x0036	#	DIGIT SIX
-0x37	0x0037	#	DIGIT SEVEN
-0x38	0x0038	#	DIGIT EIGHT
-0x39	0x0039	#	DIGIT NINE
-0x3A	0x003A	#	COLON
-0x3B	0x003B	#	SEMICOLON
-0x3C	0x003C	#	LESS-THAN SIGN
-0x3D	0x003D	#	EQUALS SIGN
-0x3E	0x003E	#	GREATER-THAN SIGN
-0x3F	0x003F	#	QUESTION MARK
-0x40	0x0040	#	COMMERCIAL AT
-0x41	0x0041	#	LATIN CAPITAL LETTER A
-0x42	0x0042	#	LATIN CAPITAL LETTER B
-0x43	0x0043	#	LATIN CAPITAL LETTER C
-0x44	0x0044	#	LATIN CAPITAL LETTER D
-0x45	0x0045	#	LATIN CAPITAL LETTER E
-0x46	0x0046	#	LATIN CAPITAL LETTER F
-0x47	0x0047	#	LATIN CAPITAL LETTER G
-0x48	0x0048	#	LATIN CAPITAL LETTER H
-0x49	0x0049	#	LATIN CAPITAL LETTER I
-0x4A	0x004A	#	LATIN CAPITAL LETTER J
-0x4B	0x004B	#	LATIN CAPITAL LETTER K
-0x4C	0x004C	#	LATIN CAPITAL LETTER L
-0x4D	0x004D	#	LATIN CAPITAL LETTER M
-0x4E	0x004E	#	LATIN CAPITAL LETTER N
-0x4F	0x004F	#	LATIN CAPITAL LETTER O
-0x50	0x0050	#	LATIN CAPITAL LETTER P
-0x51	0x0051	#	LATIN CAPITAL LETTER Q
-0x52	0x0052	#	LATIN CAPITAL LETTER R
-0x53	0x0053	#	LATIN CAPITAL LETTER S
-0x54	0x0054	#	LATIN CAPITAL LETTER T
-0x55	0x0055	#	LATIN CAPITAL LETTER U
-0x56	0x0056	#	LATIN CAPITAL LETTER V
-0x57	0x0057	#	LATIN CAPITAL LETTER W
-0x58	0x0058	#	LATIN CAPITAL LETTER X
-0x59	0x0059	#	LATIN CAPITAL LETTER Y
-0x5A	0x005A	#	LATIN CAPITAL LETTER Z
-0x5B	0x005B	#	LEFT SQUARE BRACKET
-0x5C	0x005C	#	REVERSE SOLIDUS
-0x5D	0x005D	#	RIGHT SQUARE BRACKET
-0x5E	0x005E	#	CIRCUMFLEX ACCENT
-0x5F	0x005F	#	LOW LINE
-0x60	0x0060	#	GRAVE ACCENT
-0x61	0x0061	#	LATIN SMALL LETTER A
-0x62	0x0062	#	LATIN SMALL LETTER B
-0x63	0x0063	#	LATIN SMALL LETTER C
-0x64	0x0064	#	LATIN SMALL LETTER D
-0x65	0x0065	#	LATIN SMALL LETTER E
-0x66	0x0066	#	LATIN SMALL LETTER F
-0x67	0x0067	#	LATIN SMALL LETTER G
-0x68	0x0068	#	LATIN SMALL LETTER H
-0x69	0x0069	#	LATIN SMALL LETTER I
-0x6A	0x006A	#	LATIN SMALL LETTER J
-0x6B	0x006B	#	LATIN SMALL LETTER K
-0x6C	0x006C	#	LATIN SMALL LETTER L
-0x6D	0x006D	#	LATIN SMALL LETTER M
-0x6E	0x006E	#	LATIN SMALL LETTER N
-0x6F	0x006F	#	LATIN SMALL LETTER O
-0x70	0x0070	#	LATIN SMALL LETTER P
-0x71	0x0071	#	LATIN SMALL LETTER Q
-0x72	0x0072	#	LATIN SMALL LETTER R
-0x73	0x0073	#	LATIN SMALL LETTER S
-0x74	0x0074	#	LATIN SMALL LETTER T
-0x75	0x0075	#	LATIN SMALL LETTER U
-0x76	0x0076	#	LATIN SMALL LETTER V
-0x77	0x0077	#	LATIN SMALL LETTER W
-0x78	0x0078	#	LATIN SMALL LETTER X
-0x79	0x0079	#	LATIN SMALL LETTER Y
-0x7A	0x007A	#	LATIN SMALL LETTER Z
-0x7B	0x007B	#	LEFT CURLY BRACKET
-0x7C	0x007C	#	VERTICAL LINE
-0x7D	0x007D	#	RIGHT CURLY BRACKET
-0x7E	0x007E	#	TILDE
-0xA0	0x00A0	#	NO-BREAK SPACE
-0xA1	0x00A1	#	INVERTED EXCLAMATION MARK
-0xA2	0x00A2	#	CENT SIGN
-0xA3	0x00A3	#	POUND SIGN
-0xA4	0x00A4	#	CURRENCY SIGN
-0xA5	0x00A5	#	YEN SIGN
-0xA6	0x00A6	#	BROKEN BAR
-0xA7	0x00A7	#	SECTION SIGN
-0xA8	0x00A8	#	DIAERESIS
-0xA9	0x00A9	#	COPYRIGHT SIGN
-0xAA	0x00AA	#	FEMININE ORDINAL INDICATOR
-0xAB	0x00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	0x00AC	#	NOT SIGN
-0xAD	0x00AD	#	SOFT HYPHEN
-0xAE	0x00AE	#	REGISTERED SIGN
-0xAF	0x00AF	#	MACRON
-0xB0	0x00B0	#	DEGREE SIGN
-0xB1	0x00B1	#	PLUS-MINUS SIGN
-0xB2	0x00B2	#	SUPERSCRIPT TWO
-0xB3	0x00B3	#	SUPERSCRIPT THREE
-0xB4	0x00B4	#	ACUTE ACCENT
-0xB5	0x00B5	#	MICRO SIGN
-0xB6	0x00B6	#	PILCROW SIGN
-0xB7	0x00B7	#	MIDDLE DOT
-0xB8	0x00B8	#	CEDILLA
-0xB9	0x00B9	#	SUPERSCRIPT ONE
-0xBA	0x00BA	#	MASCULINE ORDINAL INDICATOR
-0xBB	0x00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	0x00BC	#	VULGAR FRACTION ONE QUARTER
-0xBD	0x00BD	#	VULGAR FRACTION ONE HALF
-0xBE	0x00BE	#	VULGAR FRACTION THREE QUARTERS
-0xBF	0x00BF	#	INVERTED QUESTION MARK
-0xC0	0x00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	0x00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	0x00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	0x00C3	#	LATIN CAPITAL LETTER A WITH TILDE
-0xC4	0x00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	0x00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	0x00C6	#	LATIN CAPITAL LETTER AE
-0xC7	0x00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	0x00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	0x00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	0x00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	0x00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	0x00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	0x00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	0x00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	0x00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	0x011E	#	LATIN CAPITAL LETTER G WITH BREVE
-0xD1	0x00D1	#	LATIN CAPITAL LETTER N WITH TILDE
-0xD2	0x00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	0x00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	0x00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	0x00D5	#	LATIN CAPITAL LETTER O WITH TILDE
-0xD6	0x00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	0x00D7	#	MULTIPLICATION SIGN
-0xD8	0x00D8	#	LATIN CAPITAL LETTER O WITH STROKE
-0xD9	0x00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	0x00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	0x00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	0x00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	0x0130	#	LATIN CAPITAL LETTER I WITH DOT ABOVE
-0xDE	0x015E	#	LATIN CAPITAL LETTER S WITH CEDILLA
-0xDF	0x00DF	#	LATIN SMALL LETTER SHARP S
-0xE0	0x00E0	#	LATIN SMALL LETTER A WITH GRAVE
-0xE1	0x00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	0x00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	0x00E3	#	LATIN SMALL LETTER A WITH TILDE
-0xE4	0x00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	0x00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	0x00E6	#	LATIN SMALL LETTER AE
-0xE7	0x00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xE8	0x00E8	#	LATIN SMALL LETTER E WITH GRAVE
-0xE9	0x00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	0x00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	0x00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	0x00EC	#	LATIN SMALL LETTER I WITH GRAVE
-0xED	0x00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	0x00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	0x00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	0x011F	#	LATIN SMALL LETTER G WITH BREVE
-0xF1	0x00F1	#	LATIN SMALL LETTER N WITH TILDE
-0xF2	0x00F2	#	LATIN SMALL LETTER O WITH GRAVE
-0xF3	0x00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xF4	0x00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	0x00F5	#	LATIN SMALL LETTER O WITH TILDE
-0xF6	0x00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	0x00F7	#	DIVISION SIGN
-0xF8	0x00F8	#	LATIN SMALL LETTER O WITH STROKE
-0xF9	0x00F9	#	LATIN SMALL LETTER U WITH GRAVE
-0xFA	0x00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	0x00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	0x00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	0x0131	#	LATIN SMALL LETTER DOTLESS I
-0xFE	0x015F	#	LATIN SMALL LETTER S WITH CEDILLA
-0xFF	0x00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
-
-
diff --git a/tools/encoding/jis0201.txt b/tools/encoding/jis0201.txt
deleted file mode 100644
index d84c98a..0000000
--- a/tools/encoding/jis0201.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-#	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
-#	Unicode version:  1.1
-#	Table version:    0.9
-#	Table format:     Format A
-#	Date:             8 March 1994
-#	Authors:          Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#	single-byte JIS X 0201 characters map into Unicode 1.1
-#	(ISO/IEC 10646:1-1993 UCS-2).
-#
-#	Format:  Three tab-separated columns
-#		Column #1 is the shift JIS code (in hex as 0xXX)
-#		Column #2 is the Unicode (in hex as 0xXXXX)
-#		Column #3 the Unicode (ISO 10646) name (follows a comment sign)
-#
-#	The entries are in JIS order
-#
-#   These mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies.
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS (rendered as Halfwidth Yen Sign)
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x203E	# OVERLINE
-0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
-0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
-0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
-0xA4	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
-0xA5	0xFF65	# HALFWIDTH KATAKANA MIDDLE DOT
-0xA6	0xFF66	# HALFWIDTH KATAKANA LETTER WO
-0xA7	0xFF67	# HALFWIDTH KATAKANA LETTER SMALL A
-0xA8	0xFF68	# HALFWIDTH KATAKANA LETTER SMALL I
-0xA9	0xFF69	# HALFWIDTH KATAKANA LETTER SMALL U
-0xAA	0xFF6A	# HALFWIDTH KATAKANA LETTER SMALL E
-0xAB	0xFF6B	# HALFWIDTH KATAKANA LETTER SMALL O
-0xAC	0xFF6C	# HALFWIDTH KATAKANA LETTER SMALL YA
-0xAD	0xFF6D	# HALFWIDTH KATAKANA LETTER SMALL YU
-0xAE	0xFF6E	# HALFWIDTH KATAKANA LETTER SMALL YO
-0xAF	0xFF6F	# HALFWIDTH KATAKANA LETTER SMALL TU
-0xB0	0xFF70	# HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0xB1	0xFF71	# HALFWIDTH KATAKANA LETTER A
-0xB2	0xFF72	# HALFWIDTH KATAKANA LETTER I
-0xB3	0xFF73	# HALFWIDTH KATAKANA LETTER U
-0xB4	0xFF74	# HALFWIDTH KATAKANA LETTER E
-0xB5	0xFF75	# HALFWIDTH KATAKANA LETTER O
-0xB6	0xFF76	# HALFWIDTH KATAKANA LETTER KA
-0xB7	0xFF77	# HALFWIDTH KATAKANA LETTER KI
-0xB8	0xFF78	# HALFWIDTH KATAKANA LETTER KU
-0xB9	0xFF79	# HALFWIDTH KATAKANA LETTER KE
-0xBA	0xFF7A	# HALFWIDTH KATAKANA LETTER KO
-0xBB	0xFF7B	# HALFWIDTH KATAKANA LETTER SA
-0xBC	0xFF7C	# HALFWIDTH KATAKANA LETTER SI
-0xBD	0xFF7D	# HALFWIDTH KATAKANA LETTER SU
-0xBE	0xFF7E	# HALFWIDTH KATAKANA LETTER SE
-0xBF	0xFF7F	# HALFWIDTH KATAKANA LETTER SO
-0xC0	0xFF80	# HALFWIDTH KATAKANA LETTER TA
-0xC1	0xFF81	# HALFWIDTH KATAKANA LETTER TI
-0xC2	0xFF82	# HALFWIDTH KATAKANA LETTER TU
-0xC3	0xFF83	# HALFWIDTH KATAKANA LETTER TE
-0xC4	0xFF84	# HALFWIDTH KATAKANA LETTER TO
-0xC5	0xFF85	# HALFWIDTH KATAKANA LETTER NA
-0xC6	0xFF86	# HALFWIDTH KATAKANA LETTER NI
-0xC7	0xFF87	# HALFWIDTH KATAKANA LETTER NU
-0xC8	0xFF88	# HALFWIDTH KATAKANA LETTER NE
-0xC9	0xFF89	# HALFWIDTH KATAKANA LETTER NO
-0xCA	0xFF8A	# HALFWIDTH KATAKANA LETTER HA
-0xCB	0xFF8B	# HALFWIDTH KATAKANA LETTER HI
-0xCC	0xFF8C	# HALFWIDTH KATAKANA LETTER HU
-0xCD	0xFF8D	# HALFWIDTH KATAKANA LETTER HE
-0xCE	0xFF8E	# HALFWIDTH KATAKANA LETTER HO
-0xCF	0xFF8F	# HALFWIDTH KATAKANA LETTER MA
-0xD0	0xFF90	# HALFWIDTH KATAKANA LETTER MI
-0xD1	0xFF91	# HALFWIDTH KATAKANA LETTER MU
-0xD2	0xFF92	# HALFWIDTH KATAKANA LETTER ME
-0xD3	0xFF93	# HALFWIDTH KATAKANA LETTER MO
-0xD4	0xFF94	# HALFWIDTH KATAKANA LETTER YA
-0xD5	0xFF95	# HALFWIDTH KATAKANA LETTER YU
-0xD6	0xFF96	# HALFWIDTH KATAKANA LETTER YO
-0xD7	0xFF97	# HALFWIDTH KATAKANA LETTER RA
-0xD8	0xFF98	# HALFWIDTH KATAKANA LETTER RI
-0xD9	0xFF99	# HALFWIDTH KATAKANA LETTER RU
-0xDA	0xFF9A	# HALFWIDTH KATAKANA LETTER RE
-0xDB	0xFF9B	# HALFWIDTH KATAKANA LETTER RO
-0xDC	0xFF9C	# HALFWIDTH KATAKANA LETTER WA
-0xDD	0xFF9D	# HALFWIDTH KATAKANA LETTER N
-0xDE	0xFF9E	# HALFWIDTH KATAKANA VOICED SOUND MARK
-0xDF	0xFF9F	# HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
diff --git a/tools/encoding/jis0208.txt b/tools/encoding/jis0208.txt
deleted file mode 100644
index ef9ce79..0000000
--- a/tools/encoding/jis0208.txt
+++ /dev/null
@@ -1,6940 +0,0 @@
-#
-#	Name:             JIS X 0208 (1990) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.9
-#	Table format:     Format A
-#	Date:             8 March 1994
-#	Authors:          Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       JIS X 0208 (1983) characters map into Unicode.
-#
-#	Format:  Four tab-separated columns
-#		 Column #1 is the shift-JIS code (in hex)
-#		 Column #2 is the JIS X 0208 code (in hex as 0xXXXX)
-#		 Column #3 is the Unicode (in hex as 0xXXXX)
-#		 Column #4 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in JIS X 0208 order
-#
-#	The following algorithms can be used to change the hex form
-#		of JIS 0208 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x7426 -> 0x5406 -> 8406
-#
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x8140	0x2121	0x3000	# IDEOGRAPHIC SPACE
-0x8141	0x2122	0x3001	# IDEOGRAPHIC COMMA
-0x8142	0x2123	0x3002	# IDEOGRAPHIC FULL STOP
-0x8143	0x2124	0xFF0C	# FULLWIDTH COMMA
-0x8144	0x2125	0xFF0E	# FULLWIDTH FULL STOP
-0x8145	0x2126	0x30FB	# KATAKANA MIDDLE DOT
-0x8146	0x2127	0xFF1A	# FULLWIDTH COLON
-0x8147	0x2128	0xFF1B	# FULLWIDTH SEMICOLON
-0x8148	0x2129	0xFF1F	# FULLWIDTH QUESTION MARK
-0x8149	0x212A	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0x814A	0x212B	0x309B	# KATAKANA-HIRAGANA VOICED SOUND MARK
-0x814B	0x212C	0x309C	# KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-0x814C	0x212D	0x00B4	# ACUTE ACCENT
-0x814D	0x212E	0xFF40	# FULLWIDTH GRAVE ACCENT
-0x814E	0x212F	0x00A8	# DIAERESIS
-0x814F	0x2130	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
-0x8150	0x2131	0xFFE3	# FULLWIDTH MACRON
-0x8151	0x2132	0xFF3F	# FULLWIDTH LOW LINE
-0x8152	0x2133	0x30FD	# KATAKANA ITERATION MARK
-0x8153	0x2134	0x30FE	# KATAKANA VOICED ITERATION MARK
-0x8154	0x2135	0x309D	# HIRAGANA ITERATION MARK
-0x8155	0x2136	0x309E	# HIRAGANA VOICED ITERATION MARK
-0x8156	0x2137	0x3003	# DITTO MARK
-0x8157	0x2138	0x4EDD	# <CJK>
-0x8158	0x2139	0x3005	# IDEOGRAPHIC ITERATION MARK
-0x8159	0x213A	0x3006	# IDEOGRAPHIC CLOSING MARK
-0x815A	0x213B	0x3007	# IDEOGRAPHIC NUMBER ZERO
-0x815B	0x213C	0x30FC	# KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0x815C	0x213D	0x2015	# HORIZONTAL BAR
-0x815D	0x213E	0x2010	# HYPHEN
-0x815E	0x213F	0xFF0F	# FULLWIDTH SOLIDUS
-0x815F	0x2140	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
-0x8160	0x2141	0x301C	# WAVE DASH
-0x8161	0x2142	0x2016	# DOUBLE VERTICAL LINE
-0x8162	0x2143	0xFF5C	# FULLWIDTH VERTICAL LINE
-0x8163	0x2144	0x2026	# HORIZONTAL ELLIPSIS
-0x8164	0x2145	0x2025	# TWO DOT LEADER
-0x8165	0x2146	0x2018	# LEFT SINGLE QUOTATION MARK
-0x8166	0x2147	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x8167	0x2148	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x8168	0x2149	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x8169	0x214A	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0x816A	0x214B	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0x816B	0x214C	0x3014	# LEFT TORTOISE SHELL BRACKET
-0x816C	0x214D	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0x816D	0x214E	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
-0x816E	0x214F	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
-0x816F	0x2150	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0x8170	0x2151	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0x8171	0x2152	0x3008	# LEFT ANGLE BRACKET
-0x8172	0x2153	0x3009	# RIGHT ANGLE BRACKET
-0x8173	0x2154	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0x8174	0x2155	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0x8175	0x2156	0x300C	# LEFT CORNER BRACKET
-0x8176	0x2157	0x300D	# RIGHT CORNER BRACKET
-0x8177	0x2158	0x300E	# LEFT WHITE CORNER BRACKET
-0x8178	0x2159	0x300F	# RIGHT WHITE CORNER BRACKET
-0x8179	0x215A	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0x817A	0x215B	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0x817B	0x215C	0xFF0B	# FULLWIDTH PLUS SIGN
-0x817C	0x215D	0x2212	# MINUS SIGN
-0x817D	0x215E	0x00B1	# PLUS-MINUS SIGN
-0x817E	0x215F	0x00D7	# MULTIPLICATION SIGN
-0x8180	0x2160	0x00F7	# DIVISION SIGN
-0x8181	0x2161	0xFF1D	# FULLWIDTH EQUALS SIGN
-0x8182	0x2162	0x2260	# NOT EQUAL TO
-0x8183	0x2163	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0x8184	0x2164	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0x8185	0x2165	0x2266	# LESS-THAN OVER EQUAL TO
-0x8186	0x2166	0x2267	# GREATER-THAN OVER EQUAL TO
-0x8187	0x2167	0x221E	# INFINITY
-0x8188	0x2168	0x2234	# THEREFORE
-0x8189	0x2169	0x2642	# MALE SIGN
-0x818A	0x216A	0x2640	# FEMALE SIGN
-0x818B	0x216B	0x00B0	# DEGREE SIGN
-0x818C	0x216C	0x2032	# PRIME
-0x818D	0x216D	0x2033	# DOUBLE PRIME
-0x818E	0x216E	0x2103	# DEGREE CELSIUS
-0x818F	0x216F	0xFFE5	# FULLWIDTH YEN SIGN
-0x8190	0x2170	0xFF04	# FULLWIDTH DOLLAR SIGN
-0x8191	0x2171	0x00A2	# CENT SIGN
-0x8192	0x2172	0x00A3	# POUND SIGN
-0x8193	0x2173	0xFF05	# FULLWIDTH PERCENT SIGN
-0x8194	0x2174	0xFF03	# FULLWIDTH NUMBER SIGN
-0x8195	0x2175	0xFF06	# FULLWIDTH AMPERSAND
-0x8196	0x2176	0xFF0A	# FULLWIDTH ASTERISK
-0x8197	0x2177	0xFF20	# FULLWIDTH COMMERCIAL AT
-0x8198	0x2178	0x00A7	# SECTION SIGN
-0x8199	0x2179	0x2606	# WHITE STAR
-0x819A	0x217A	0x2605	# BLACK STAR
-0x819B	0x217B	0x25CB	# WHITE CIRCLE
-0x819C	0x217C	0x25CF	# BLACK CIRCLE
-0x819D	0x217D	0x25CE	# BULLSEYE
-0x819E	0x217E	0x25C7	# WHITE DIAMOND
-0x819F	0x2221	0x25C6	# BLACK DIAMOND
-0x81A0	0x2222	0x25A1	# WHITE SQUARE
-0x81A1	0x2223	0x25A0	# BLACK SQUARE
-0x81A2	0x2224	0x25B3	# WHITE UP-POINTING TRIANGLE
-0x81A3	0x2225	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x81A4	0x2226	0x25BD	# WHITE DOWN-POINTING TRIANGLE
-0x81A5	0x2227	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0x81A6	0x2228	0x203B	# REFERENCE MARK
-0x81A7	0x2229	0x3012	# POSTAL MARK
-0x81A8	0x222A	0x2192	# RIGHTWARDS ARROW
-0x81A9	0x222B	0x2190	# LEFTWARDS ARROW
-0x81AA	0x222C	0x2191	# UPWARDS ARROW
-0x81AB	0x222D	0x2193	# DOWNWARDS ARROW
-0x81AC	0x222E	0x3013	# GETA MARK
-0x81B8	0x223A	0x2208	# ELEMENT OF
-0x81B9	0x223B	0x220B	# CONTAINS AS MEMBER
-0x81BA	0x223C	0x2286	# SUBSET OF OR EQUAL TO
-0x81BB	0x223D	0x2287	# SUPERSET OF OR EQUAL TO
-0x81BC	0x223E	0x2282	# SUBSET OF
-0x81BD	0x223F	0x2283	# SUPERSET OF
-0x81BE	0x2240	0x222A	# UNION
-0x81BF	0x2241	0x2229	# INTERSECTION
-0x81C8	0x224A	0x2227	# LOGICAL AND
-0x81C9	0x224B	0x2228	# LOGICAL OR
-0x81CA	0x224C	0x00AC	# NOT SIGN
-0x81CB	0x224D	0x21D2	# RIGHTWARDS DOUBLE ARROW
-0x81CC	0x224E	0x21D4	# LEFT RIGHT DOUBLE ARROW
-0x81CD	0x224F	0x2200	# FOR ALL
-0x81CE	0x2250	0x2203	# THERE EXISTS
-0x81DA	0x225C	0x2220	# ANGLE
-0x81DB	0x225D	0x22A5	# UP TACK
-0x81DC	0x225E	0x2312	# ARC
-0x81DD	0x225F	0x2202	# PARTIAL DIFFERENTIAL
-0x81DE	0x2260	0x2207	# NABLA
-0x81DF	0x2261	0x2261	# IDENTICAL TO
-0x81E0	0x2262	0x2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0x81E1	0x2263	0x226A	# MUCH LESS-THAN
-0x81E2	0x2264	0x226B	# MUCH GREATER-THAN
-0x81E3	0x2265	0x221A	# SQUARE ROOT
-0x81E4	0x2266	0x223D	# REVERSED TILDE
-0x81E5	0x2267	0x221D	# PROPORTIONAL TO
-0x81E6	0x2268	0x2235	# BECAUSE
-0x81E7	0x2269	0x222B	# INTEGRAL
-0x81E8	0x226A	0x222C	# DOUBLE INTEGRAL
-0x81F0	0x2272	0x212B	# ANGSTROM SIGN
-0x81F1	0x2273	0x2030	# PER MILLE SIGN
-0x81F2	0x2274	0x266F	# MUSIC SHARP SIGN
-0x81F3	0x2275	0x266D	# MUSIC FLAT SIGN
-0x81F4	0x2276	0x266A	# EIGHTH NOTE
-0x81F5	0x2277	0x2020	# DAGGER
-0x81F6	0x2278	0x2021	# DOUBLE DAGGER
-0x81F7	0x2279	0x00B6	# PILCROW SIGN
-0x81FC	0x227E	0x25EF	# LARGE CIRCLE
-0x824F	0x2330	0xFF10	# FULLWIDTH DIGIT ZERO
-0x8250	0x2331	0xFF11	# FULLWIDTH DIGIT ONE
-0x8251	0x2332	0xFF12	# FULLWIDTH DIGIT TWO
-0x8252	0x2333	0xFF13	# FULLWIDTH DIGIT THREE
-0x8253	0x2334	0xFF14	# FULLWIDTH DIGIT FOUR
-0x8254	0x2335	0xFF15	# FULLWIDTH DIGIT FIVE
-0x8255	0x2336	0xFF16	# FULLWIDTH DIGIT SIX
-0x8256	0x2337	0xFF17	# FULLWIDTH DIGIT SEVEN
-0x8257	0x2338	0xFF18	# FULLWIDTH DIGIT EIGHT
-0x8258	0x2339	0xFF19	# FULLWIDTH DIGIT NINE
-0x8260	0x2341	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0x8261	0x2342	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0x8262	0x2343	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0x8263	0x2344	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0x8264	0x2345	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0x8265	0x2346	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0x8266	0x2347	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0x8267	0x2348	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0x8268	0x2349	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0x8269	0x234A	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0x826A	0x234B	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0x826B	0x234C	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0x826C	0x234D	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0x826D	0x234E	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0x826E	0x234F	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0x826F	0x2350	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0x8270	0x2351	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0x8271	0x2352	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0x8272	0x2353	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0x8273	0x2354	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0x8274	0x2355	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0x8275	0x2356	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0x8276	0x2357	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0x8277	0x2358	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0x8278	0x2359	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0x8279	0x235A	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0x8281	0x2361	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0x8282	0x2362	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0x8283	0x2363	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0x8284	0x2364	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0x8285	0x2365	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0x8286	0x2366	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0x8287	0x2367	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0x8288	0x2368	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0x8289	0x2369	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0x828A	0x236A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0x828B	0x236B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0x828C	0x236C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0x828D	0x236D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0x828E	0x236E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0x828F	0x236F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0x8290	0x2370	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0x8291	0x2371	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0x8292	0x2372	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0x8293	0x2373	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0x8294	0x2374	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0x8295	0x2375	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0x8296	0x2376	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0x8297	0x2377	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0x8298	0x2378	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0x8299	0x2379	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0x829A	0x237A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0x829F	0x2421	0x3041	# HIRAGANA LETTER SMALL A
-0x82A0	0x2422	0x3042	# HIRAGANA LETTER A
-0x82A1	0x2423	0x3043	# HIRAGANA LETTER SMALL I
-0x82A2	0x2424	0x3044	# HIRAGANA LETTER I
-0x82A3	0x2425	0x3045	# HIRAGANA LETTER SMALL U
-0x82A4	0x2426	0x3046	# HIRAGANA LETTER U
-0x82A5	0x2427	0x3047	# HIRAGANA LETTER SMALL E
-0x82A6	0x2428	0x3048	# HIRAGANA LETTER E
-0x82A7	0x2429	0x3049	# HIRAGANA LETTER SMALL O
-0x82A8	0x242A	0x304A	# HIRAGANA LETTER O
-0x82A9	0x242B	0x304B	# HIRAGANA LETTER KA
-0x82AA	0x242C	0x304C	# HIRAGANA LETTER GA
-0x82AB	0x242D	0x304D	# HIRAGANA LETTER KI
-0x82AC	0x242E	0x304E	# HIRAGANA LETTER GI
-0x82AD	0x242F	0x304F	# HIRAGANA LETTER KU
-0x82AE	0x2430	0x3050	# HIRAGANA LETTER GU
-0x82AF	0x2431	0x3051	# HIRAGANA LETTER KE
-0x82B0	0x2432	0x3052	# HIRAGANA LETTER GE
-0x82B1	0x2433	0x3053	# HIRAGANA LETTER KO
-0x82B2	0x2434	0x3054	# HIRAGANA LETTER GO
-0x82B3	0x2435	0x3055	# HIRAGANA LETTER SA
-0x82B4	0x2436	0x3056	# HIRAGANA LETTER ZA
-0x82B5	0x2437	0x3057	# HIRAGANA LETTER SI
-0x82B6	0x2438	0x3058	# HIRAGANA LETTER ZI
-0x82B7	0x2439	0x3059	# HIRAGANA LETTER SU
-0x82B8	0x243A	0x305A	# HIRAGANA LETTER ZU
-0x82B9	0x243B	0x305B	# HIRAGANA LETTER SE
-0x82BA	0x243C	0x305C	# HIRAGANA LETTER ZE
-0x82BB	0x243D	0x305D	# HIRAGANA LETTER SO
-0x82BC	0x243E	0x305E	# HIRAGANA LETTER ZO
-0x82BD	0x243F	0x305F	# HIRAGANA LETTER TA
-0x82BE	0x2440	0x3060	# HIRAGANA LETTER DA
-0x82BF	0x2441	0x3061	# HIRAGANA LETTER TI
-0x82C0	0x2442	0x3062	# HIRAGANA LETTER DI
-0x82C1	0x2443	0x3063	# HIRAGANA LETTER SMALL TU
-0x82C2	0x2444	0x3064	# HIRAGANA LETTER TU
-0x82C3	0x2445	0x3065	# HIRAGANA LETTER DU
-0x82C4	0x2446	0x3066	# HIRAGANA LETTER TE
-0x82C5	0x2447	0x3067	# HIRAGANA LETTER DE
-0x82C6	0x2448	0x3068	# HIRAGANA LETTER TO
-0x82C7	0x2449	0x3069	# HIRAGANA LETTER DO
-0x82C8	0x244A	0x306A	# HIRAGANA LETTER NA
-0x82C9	0x244B	0x306B	# HIRAGANA LETTER NI
-0x82CA	0x244C	0x306C	# HIRAGANA LETTER NU
-0x82CB	0x244D	0x306D	# HIRAGANA LETTER NE
-0x82CC	0x244E	0x306E	# HIRAGANA LETTER NO
-0x82CD	0x244F	0x306F	# HIRAGANA LETTER HA
-0x82CE	0x2450	0x3070	# HIRAGANA LETTER BA
-0x82CF	0x2451	0x3071	# HIRAGANA LETTER PA
-0x82D0	0x2452	0x3072	# HIRAGANA LETTER HI
-0x82D1	0x2453	0x3073	# HIRAGANA LETTER BI
-0x82D2	0x2454	0x3074	# HIRAGANA LETTER PI
-0x82D3	0x2455	0x3075	# HIRAGANA LETTER HU
-0x82D4	0x2456	0x3076	# HIRAGANA LETTER BU
-0x82D5	0x2457	0x3077	# HIRAGANA LETTER PU
-0x82D6	0x2458	0x3078	# HIRAGANA LETTER HE
-0x82D7	0x2459	0x3079	# HIRAGANA LETTER BE
-0x82D8	0x245A	0x307A	# HIRAGANA LETTER PE
-0x82D9	0x245B	0x307B	# HIRAGANA LETTER HO
-0x82DA	0x245C	0x307C	# HIRAGANA LETTER BO
-0x82DB	0x245D	0x307D	# HIRAGANA LETTER PO
-0x82DC	0x245E	0x307E	# HIRAGANA LETTER MA
-0x82DD	0x245F	0x307F	# HIRAGANA LETTER MI
-0x82DE	0x2460	0x3080	# HIRAGANA LETTER MU
-0x82DF	0x2461	0x3081	# HIRAGANA LETTER ME
-0x82E0	0x2462	0x3082	# HIRAGANA LETTER MO
-0x82E1	0x2463	0x3083	# HIRAGANA LETTER SMALL YA
-0x82E2	0x2464	0x3084	# HIRAGANA LETTER YA
-0x82E3	0x2465	0x3085	# HIRAGANA LETTER SMALL YU
-0x82E4	0x2466	0x3086	# HIRAGANA LETTER YU
-0x82E5	0x2467	0x3087	# HIRAGANA LETTER SMALL YO
-0x82E6	0x2468	0x3088	# HIRAGANA LETTER YO
-0x82E7	0x2469	0x3089	# HIRAGANA LETTER RA
-0x82E8	0x246A	0x308A	# HIRAGANA LETTER RI
-0x82E9	0x246B	0x308B	# HIRAGANA LETTER RU
-0x82EA	0x246C	0x308C	# HIRAGANA LETTER RE
-0x82EB	0x246D	0x308D	# HIRAGANA LETTER RO
-0x82EC	0x246E	0x308E	# HIRAGANA LETTER SMALL WA
-0x82ED	0x246F	0x308F	# HIRAGANA LETTER WA
-0x82EE	0x2470	0x3090	# HIRAGANA LETTER WI
-0x82EF	0x2471	0x3091	# HIRAGANA LETTER WE
-0x82F0	0x2472	0x3092	# HIRAGANA LETTER WO
-0x82F1	0x2473	0x3093	# HIRAGANA LETTER N
-0x8340	0x2521	0x30A1	# KATAKANA LETTER SMALL A
-0x8341	0x2522	0x30A2	# KATAKANA LETTER A
-0x8342	0x2523	0x30A3	# KATAKANA LETTER SMALL I
-0x8343	0x2524	0x30A4	# KATAKANA LETTER I
-0x8344	0x2525	0x30A5	# KATAKANA LETTER SMALL U
-0x8345	0x2526	0x30A6	# KATAKANA LETTER U
-0x8346	0x2527	0x30A7	# KATAKANA LETTER SMALL E
-0x8347	0x2528	0x30A8	# KATAKANA LETTER E
-0x8348	0x2529	0x30A9	# KATAKANA LETTER SMALL O
-0x8349	0x252A	0x30AA	# KATAKANA LETTER O
-0x834A	0x252B	0x30AB	# KATAKANA LETTER KA
-0x834B	0x252C	0x30AC	# KATAKANA LETTER GA
-0x834C	0x252D	0x30AD	# KATAKANA LETTER KI
-0x834D	0x252E	0x30AE	# KATAKANA LETTER GI
-0x834E	0x252F	0x30AF	# KATAKANA LETTER KU
-0x834F	0x2530	0x30B0	# KATAKANA LETTER GU
-0x8350	0x2531	0x30B1	# KATAKANA LETTER KE
-0x8351	0x2532	0x30B2	# KATAKANA LETTER GE
-0x8352	0x2533	0x30B3	# KATAKANA LETTER KO
-0x8353	0x2534	0x30B4	# KATAKANA LETTER GO
-0x8354	0x2535	0x30B5	# KATAKANA LETTER SA
-0x8355	0x2536	0x30B6	# KATAKANA LETTER ZA
-0x8356	0x2537	0x30B7	# KATAKANA LETTER SI
-0x8357	0x2538	0x30B8	# KATAKANA LETTER ZI
-0x8358	0x2539	0x30B9	# KATAKANA LETTER SU
-0x8359	0x253A	0x30BA	# KATAKANA LETTER ZU
-0x835A	0x253B	0x30BB	# KATAKANA LETTER SE
-0x835B	0x253C	0x30BC	# KATAKANA LETTER ZE
-0x835C	0x253D	0x30BD	# KATAKANA LETTER SO
-0x835D	0x253E	0x30BE	# KATAKANA LETTER ZO
-0x835E	0x253F	0x30BF	# KATAKANA LETTER TA
-0x835F	0x2540	0x30C0	# KATAKANA LETTER DA
-0x8360	0x2541	0x30C1	# KATAKANA LETTER TI
-0x8361	0x2542	0x30C2	# KATAKANA LETTER DI
-0x8362	0x2543	0x30C3	# KATAKANA LETTER SMALL TU
-0x8363	0x2544	0x30C4	# KATAKANA LETTER TU
-0x8364	0x2545	0x30C5	# KATAKANA LETTER DU
-0x8365	0x2546	0x30C6	# KATAKANA LETTER TE
-0x8366	0x2547	0x30C7	# KATAKANA LETTER DE
-0x8367	0x2548	0x30C8	# KATAKANA LETTER TO
-0x8368	0x2549	0x30C9	# KATAKANA LETTER DO
-0x8369	0x254A	0x30CA	# KATAKANA LETTER NA
-0x836A	0x254B	0x30CB	# KATAKANA LETTER NI
-0x836B	0x254C	0x30CC	# KATAKANA LETTER NU
-0x836C	0x254D	0x30CD	# KATAKANA LETTER NE
-0x836D	0x254E	0x30CE	# KATAKANA LETTER NO
-0x836E	0x254F	0x30CF	# KATAKANA LETTER HA
-0x836F	0x2550	0x30D0	# KATAKANA LETTER BA
-0x8370	0x2551	0x30D1	# KATAKANA LETTER PA
-0x8371	0x2552	0x30D2	# KATAKANA LETTER HI
-0x8372	0x2553	0x30D3	# KATAKANA LETTER BI
-0x8373	0x2554	0x30D4	# KATAKANA LETTER PI
-0x8374	0x2555	0x30D5	# KATAKANA LETTER HU
-0x8375	0x2556	0x30D6	# KATAKANA LETTER BU
-0x8376	0x2557	0x30D7	# KATAKANA LETTER PU
-0x8377	0x2558	0x30D8	# KATAKANA LETTER HE
-0x8378	0x2559	0x30D9	# KATAKANA LETTER BE
-0x8379	0x255A	0x30DA	# KATAKANA LETTER PE
-0x837A	0x255B	0x30DB	# KATAKANA LETTER HO
-0x837B	0x255C	0x30DC	# KATAKANA LETTER BO
-0x837C	0x255D	0x30DD	# KATAKANA LETTER PO
-0x837D	0x255E	0x30DE	# KATAKANA LETTER MA
-0x837E	0x255F	0x30DF	# KATAKANA LETTER MI
-0x8380	0x2560	0x30E0	# KATAKANA LETTER MU
-0x8381	0x2561	0x30E1	# KATAKANA LETTER ME
-0x8382	0x2562	0x30E2	# KATAKANA LETTER MO
-0x8383	0x2563	0x30E3	# KATAKANA LETTER SMALL YA
-0x8384	0x2564	0x30E4	# KATAKANA LETTER YA
-0x8385	0x2565	0x30E5	# KATAKANA LETTER SMALL YU
-0x8386	0x2566	0x30E6	# KATAKANA LETTER YU
-0x8387	0x2567	0x30E7	# KATAKANA LETTER SMALL YO
-0x8388	0x2568	0x30E8	# KATAKANA LETTER YO
-0x8389	0x2569	0x30E9	# KATAKANA LETTER RA
-0x838A	0x256A	0x30EA	# KATAKANA LETTER RI
-0x838B	0x256B	0x30EB	# KATAKANA LETTER RU
-0x838C	0x256C	0x30EC	# KATAKANA LETTER RE
-0x838D	0x256D	0x30ED	# KATAKANA LETTER RO
-0x838E	0x256E	0x30EE	# KATAKANA LETTER SMALL WA
-0x838F	0x256F	0x30EF	# KATAKANA LETTER WA
-0x8390	0x2570	0x30F0	# KATAKANA LETTER WI
-0x8391	0x2571	0x30F1	# KATAKANA LETTER WE
-0x8392	0x2572	0x30F2	# KATAKANA LETTER WO
-0x8393	0x2573	0x30F3	# KATAKANA LETTER N
-0x8394	0x2574	0x30F4	# KATAKANA LETTER VU
-0x8395	0x2575	0x30F5	# KATAKANA LETTER SMALL KA
-0x8396	0x2576	0x30F6	# KATAKANA LETTER SMALL KE
-0x839F	0x2621	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x83A0	0x2622	0x0392	# GREEK CAPITAL LETTER BETA
-0x83A1	0x2623	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x83A2	0x2624	0x0394	# GREEK CAPITAL LETTER DELTA
-0x83A3	0x2625	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x83A4	0x2626	0x0396	# GREEK CAPITAL LETTER ZETA
-0x83A5	0x2627	0x0397	# GREEK CAPITAL LETTER ETA
-0x83A6	0x2628	0x0398	# GREEK CAPITAL LETTER THETA
-0x83A7	0x2629	0x0399	# GREEK CAPITAL LETTER IOTA
-0x83A8	0x262A	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x83A9	0x262B	0x039B	# GREEK CAPITAL LETTER LAMDA
-0x83AA	0x262C	0x039C	# GREEK CAPITAL LETTER MU
-0x83AB	0x262D	0x039D	# GREEK CAPITAL LETTER NU
-0x83AC	0x262E	0x039E	# GREEK CAPITAL LETTER XI
-0x83AD	0x262F	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x83AE	0x2630	0x03A0	# GREEK CAPITAL LETTER PI
-0x83AF	0x2631	0x03A1	# GREEK CAPITAL LETTER RHO
-0x83B0	0x2632	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x83B1	0x2633	0x03A4	# GREEK CAPITAL LETTER TAU
-0x83B2	0x2634	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x83B3	0x2635	0x03A6	# GREEK CAPITAL LETTER PHI
-0x83B4	0x2636	0x03A7	# GREEK CAPITAL LETTER CHI
-0x83B5	0x2637	0x03A8	# GREEK CAPITAL LETTER PSI
-0x83B6	0x2638	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x83BF	0x2641	0x03B1	# GREEK SMALL LETTER ALPHA
-0x83C0	0x2642	0x03B2	# GREEK SMALL LETTER BETA
-0x83C1	0x2643	0x03B3	# GREEK SMALL LETTER GAMMA
-0x83C2	0x2644	0x03B4	# GREEK SMALL LETTER DELTA
-0x83C3	0x2645	0x03B5	# GREEK SMALL LETTER EPSILON
-0x83C4	0x2646	0x03B6	# GREEK SMALL LETTER ZETA
-0x83C5	0x2647	0x03B7	# GREEK SMALL LETTER ETA
-0x83C6	0x2648	0x03B8	# GREEK SMALL LETTER THETA
-0x83C7	0x2649	0x03B9	# GREEK SMALL LETTER IOTA
-0x83C8	0x264A	0x03BA	# GREEK SMALL LETTER KAPPA
-0x83C9	0x264B	0x03BB	# GREEK SMALL LETTER LAMDA
-0x83CA	0x264C	0x03BC	# GREEK SMALL LETTER MU
-0x83CB	0x264D	0x03BD	# GREEK SMALL LETTER NU
-0x83CC	0x264E	0x03BE	# GREEK SMALL LETTER XI
-0x83CD	0x264F	0x03BF	# GREEK SMALL LETTER OMICRON
-0x83CE	0x2650	0x03C0	# GREEK SMALL LETTER PI
-0x83CF	0x2651	0x03C1	# GREEK SMALL LETTER RHO
-0x83D0	0x2652	0x03C3	# GREEK SMALL LETTER SIGMA
-0x83D1	0x2653	0x03C4	# GREEK SMALL LETTER TAU
-0x83D2	0x2654	0x03C5	# GREEK SMALL LETTER UPSILON
-0x83D3	0x2655	0x03C6	# GREEK SMALL LETTER PHI
-0x83D4	0x2656	0x03C7	# GREEK SMALL LETTER CHI
-0x83D5	0x2657	0x03C8	# GREEK SMALL LETTER PSI
-0x83D6	0x2658	0x03C9	# GREEK SMALL LETTER OMEGA
-0x8440	0x2721	0x0410	# CYRILLIC CAPITAL LETTER A
-0x8441	0x2722	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x8442	0x2723	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x8443	0x2724	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x8444	0x2725	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x8445	0x2726	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x8446	0x2727	0x0401	# CYRILLIC CAPITAL LETTER IO
-0x8447	0x2728	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x8448	0x2729	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x8449	0x272A	0x0418	# CYRILLIC CAPITAL LETTER I
-0x844A	0x272B	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x844B	0x272C	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x844C	0x272D	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x844D	0x272E	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x844E	0x272F	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x844F	0x2730	0x041E	# CYRILLIC CAPITAL LETTER O
-0x8450	0x2731	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x8451	0x2732	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x8452	0x2733	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x8453	0x2734	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x8454	0x2735	0x0423	# CYRILLIC CAPITAL LETTER U
-0x8455	0x2736	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x8456	0x2737	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x8457	0x2738	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x8458	0x2739	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x8459	0x273A	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x845A	0x273B	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x845B	0x273C	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x845C	0x273D	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x845D	0x273E	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x845E	0x273F	0x042D	# CYRILLIC CAPITAL LETTER E
-0x845F	0x2740	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x8460	0x2741	0x042F	# CYRILLIC CAPITAL LETTER YA
-0x8470	0x2751	0x0430	# CYRILLIC SMALL LETTER A
-0x8471	0x2752	0x0431	# CYRILLIC SMALL LETTER BE
-0x8472	0x2753	0x0432	# CYRILLIC SMALL LETTER VE
-0x8473	0x2754	0x0433	# CYRILLIC SMALL LETTER GHE
-0x8474	0x2755	0x0434	# CYRILLIC SMALL LETTER DE
-0x8475	0x2756	0x0435	# CYRILLIC SMALL LETTER IE
-0x8476	0x2757	0x0451	# CYRILLIC SMALL LETTER IO
-0x8477	0x2758	0x0436	# CYRILLIC SMALL LETTER ZHE
-0x8478	0x2759	0x0437	# CYRILLIC SMALL LETTER ZE
-0x8479	0x275A	0x0438	# CYRILLIC SMALL LETTER I
-0x847A	0x275B	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0x847B	0x275C	0x043A	# CYRILLIC SMALL LETTER KA
-0x847C	0x275D	0x043B	# CYRILLIC SMALL LETTER EL
-0x847D	0x275E	0x043C	# CYRILLIC SMALL LETTER EM
-0x847E	0x275F	0x043D	# CYRILLIC SMALL LETTER EN
-0x8480	0x2760	0x043E	# CYRILLIC SMALL LETTER O
-0x8481	0x2761	0x043F	# CYRILLIC SMALL LETTER PE
-0x8482	0x2762	0x0440	# CYRILLIC SMALL LETTER ER
-0x8483	0x2763	0x0441	# CYRILLIC SMALL LETTER ES
-0x8484	0x2764	0x0442	# CYRILLIC SMALL LETTER TE
-0x8485	0x2765	0x0443	# CYRILLIC SMALL LETTER U
-0x8486	0x2766	0x0444	# CYRILLIC SMALL LETTER EF
-0x8487	0x2767	0x0445	# CYRILLIC SMALL LETTER HA
-0x8488	0x2768	0x0446	# CYRILLIC SMALL LETTER TSE
-0x8489	0x2769	0x0447	# CYRILLIC SMALL LETTER CHE
-0x848A	0x276A	0x0448	# CYRILLIC SMALL LETTER SHA
-0x848B	0x276B	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0x848C	0x276C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0x848D	0x276D	0x044B	# CYRILLIC SMALL LETTER YERU
-0x848E	0x276E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0x848F	0x276F	0x044D	# CYRILLIC SMALL LETTER E
-0x8490	0x2770	0x044E	# CYRILLIC SMALL LETTER YU
-0x8491	0x2771	0x044F	# CYRILLIC SMALL LETTER YA
-0x849F	0x2821	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x84A0	0x2822	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x84A1	0x2823	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x84A2	0x2824	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x84A3	0x2825	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x84A4	0x2826	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x84A5	0x2827	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x84A6	0x2828	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x84A7	0x2829	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x84A8	0x282A	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x84A9	0x282B	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x84AA	0x282C	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
-0x84AB	0x282D	0x2503	# BOX DRAWINGS HEAVY VERTICAL
-0x84AC	0x282E	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x84AD	0x282F	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
-0x84AE	0x2830	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
-0x84AF	0x2831	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
-0x84B0	0x2832	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x84B1	0x2833	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x84B2	0x2834	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x84B3	0x2835	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x84B4	0x2836	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x84B5	0x2837	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x84B6	0x2838	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x84B7	0x2839	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x84B8	0x283A	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x84B9	0x283B	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x84BA	0x283C	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x84BB	0x283D	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x84BC	0x283E	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x84BD	0x283F	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x84BE	0x2840	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x889F	0x3021	0x4E9C	# <CJK>
-0x88A0	0x3022	0x5516	# <CJK>
-0x88A1	0x3023	0x5A03	# <CJK>
-0x88A2	0x3024	0x963F	# <CJK>
-0x88A3	0x3025	0x54C0	# <CJK>
-0x88A4	0x3026	0x611B	# <CJK>
-0x88A5	0x3027	0x6328	# <CJK>
-0x88A6	0x3028	0x59F6	# <CJK>
-0x88A7	0x3029	0x9022	# <CJK>
-0x88A8	0x302A	0x8475	# <CJK>
-0x88A9	0x302B	0x831C	# <CJK>
-0x88AA	0x302C	0x7A50	# <CJK>
-0x88AB	0x302D	0x60AA	# <CJK>
-0x88AC	0x302E	0x63E1	# <CJK>
-0x88AD	0x302F	0x6E25	# <CJK>
-0x88AE	0x3030	0x65ED	# <CJK>
-0x88AF	0x3031	0x8466	# <CJK>
-0x88B0	0x3032	0x82A6	# <CJK>
-0x88B1	0x3033	0x9BF5	# <CJK>
-0x88B2	0x3034	0x6893	# <CJK>
-0x88B3	0x3035	0x5727	# <CJK>
-0x88B4	0x3036	0x65A1	# <CJK>
-0x88B5	0x3037	0x6271	# <CJK>
-0x88B6	0x3038	0x5B9B	# <CJK>
-0x88B7	0x3039	0x59D0	# <CJK>
-0x88B8	0x303A	0x867B	# <CJK>
-0x88B9	0x303B	0x98F4	# <CJK>
-0x88BA	0x303C	0x7D62	# <CJK>
-0x88BB	0x303D	0x7DBE	# <CJK>
-0x88BC	0x303E	0x9B8E	# <CJK>
-0x88BD	0x303F	0x6216	# <CJK>
-0x88BE	0x3040	0x7C9F	# <CJK>
-0x88BF	0x3041	0x88B7	# <CJK>
-0x88C0	0x3042	0x5B89	# <CJK>
-0x88C1	0x3043	0x5EB5	# <CJK>
-0x88C2	0x3044	0x6309	# <CJK>
-0x88C3	0x3045	0x6697	# <CJK>
-0x88C4	0x3046	0x6848	# <CJK>
-0x88C5	0x3047	0x95C7	# <CJK>
-0x88C6	0x3048	0x978D	# <CJK>
-0x88C7	0x3049	0x674F	# <CJK>
-0x88C8	0x304A	0x4EE5	# <CJK>
-0x88C9	0x304B	0x4F0A	# <CJK>
-0x88CA	0x304C	0x4F4D	# <CJK>
-0x88CB	0x304D	0x4F9D	# <CJK>
-0x88CC	0x304E	0x5049	# <CJK>
-0x88CD	0x304F	0x56F2	# <CJK>
-0x88CE	0x3050	0x5937	# <CJK>
-0x88CF	0x3051	0x59D4	# <CJK>
-0x88D0	0x3052	0x5A01	# <CJK>
-0x88D1	0x3053	0x5C09	# <CJK>
-0x88D2	0x3054	0x60DF	# <CJK>
-0x88D3	0x3055	0x610F	# <CJK>
-0x88D4	0x3056	0x6170	# <CJK>
-0x88D5	0x3057	0x6613	# <CJK>
-0x88D6	0x3058	0x6905	# <CJK>
-0x88D7	0x3059	0x70BA	# <CJK>
-0x88D8	0x305A	0x754F	# <CJK>
-0x88D9	0x305B	0x7570	# <CJK>
-0x88DA	0x305C	0x79FB	# <CJK>
-0x88DB	0x305D	0x7DAD	# <CJK>
-0x88DC	0x305E	0x7DEF	# <CJK>
-0x88DD	0x305F	0x80C3	# <CJK>
-0x88DE	0x3060	0x840E	# <CJK>
-0x88DF	0x3061	0x8863	# <CJK>
-0x88E0	0x3062	0x8B02	# <CJK>
-0x88E1	0x3063	0x9055	# <CJK>
-0x88E2	0x3064	0x907A	# <CJK>
-0x88E3	0x3065	0x533B	# <CJK>
-0x88E4	0x3066	0x4E95	# <CJK>
-0x88E5	0x3067	0x4EA5	# <CJK>
-0x88E6	0x3068	0x57DF	# <CJK>
-0x88E7	0x3069	0x80B2	# <CJK>
-0x88E8	0x306A	0x90C1	# <CJK>
-0x88E9	0x306B	0x78EF	# <CJK>
-0x88EA	0x306C	0x4E00	# <CJK>
-0x88EB	0x306D	0x58F1	# <CJK>
-0x88EC	0x306E	0x6EA2	# <CJK>
-0x88ED	0x306F	0x9038	# <CJK>
-0x88EE	0x3070	0x7A32	# <CJK>
-0x88EF	0x3071	0x8328	# <CJK>
-0x88F0	0x3072	0x828B	# <CJK>
-0x88F1	0x3073	0x9C2F	# <CJK>
-0x88F2	0x3074	0x5141	# <CJK>
-0x88F3	0x3075	0x5370	# <CJK>
-0x88F4	0x3076	0x54BD	# <CJK>
-0x88F5	0x3077	0x54E1	# <CJK>
-0x88F6	0x3078	0x56E0	# <CJK>
-0x88F7	0x3079	0x59FB	# <CJK>
-0x88F8	0x307A	0x5F15	# <CJK>
-0x88F9	0x307B	0x98F2	# <CJK>
-0x88FA	0x307C	0x6DEB	# <CJK>
-0x88FB	0x307D	0x80E4	# <CJK>
-0x88FC	0x307E	0x852D	# <CJK>
-0x8940	0x3121	0x9662	# <CJK>
-0x8941	0x3122	0x9670	# <CJK>
-0x8942	0x3123	0x96A0	# <CJK>
-0x8943	0x3124	0x97FB	# <CJK>
-0x8944	0x3125	0x540B	# <CJK>
-0x8945	0x3126	0x53F3	# <CJK>
-0x8946	0x3127	0x5B87	# <CJK>
-0x8947	0x3128	0x70CF	# <CJK>
-0x8948	0x3129	0x7FBD	# <CJK>
-0x8949	0x312A	0x8FC2	# <CJK>
-0x894A	0x312B	0x96E8	# <CJK>
-0x894B	0x312C	0x536F	# <CJK>
-0x894C	0x312D	0x9D5C	# <CJK>
-0x894D	0x312E	0x7ABA	# <CJK>
-0x894E	0x312F	0x4E11	# <CJK>
-0x894F	0x3130	0x7893	# <CJK>
-0x8950	0x3131	0x81FC	# <CJK>
-0x8951	0x3132	0x6E26	# <CJK>
-0x8952	0x3133	0x5618	# <CJK>
-0x8953	0x3134	0x5504	# <CJK>
-0x8954	0x3135	0x6B1D	# <CJK>
-0x8955	0x3136	0x851A	# <CJK>
-0x8956	0x3137	0x9C3B	# <CJK>
-0x8957	0x3138	0x59E5	# <CJK>
-0x8958	0x3139	0x53A9	# <CJK>
-0x8959	0x313A	0x6D66	# <CJK>
-0x895A	0x313B	0x74DC	# <CJK>
-0x895B	0x313C	0x958F	# <CJK>
-0x895C	0x313D	0x5642	# <CJK>
-0x895D	0x313E	0x4E91	# <CJK>
-0x895E	0x313F	0x904B	# <CJK>
-0x895F	0x3140	0x96F2	# <CJK>
-0x8960	0x3141	0x834F	# <CJK>
-0x8961	0x3142	0x990C	# <CJK>
-0x8962	0x3143	0x53E1	# <CJK>
-0x8963	0x3144	0x55B6	# <CJK>
-0x8964	0x3145	0x5B30	# <CJK>
-0x8965	0x3146	0x5F71	# <CJK>
-0x8966	0x3147	0x6620	# <CJK>
-0x8967	0x3148	0x66F3	# <CJK>
-0x8968	0x3149	0x6804	# <CJK>
-0x8969	0x314A	0x6C38	# <CJK>
-0x896A	0x314B	0x6CF3	# <CJK>
-0x896B	0x314C	0x6D29	# <CJK>
-0x896C	0x314D	0x745B	# <CJK>
-0x896D	0x314E	0x76C8	# <CJK>
-0x896E	0x314F	0x7A4E	# <CJK>
-0x896F	0x3150	0x9834	# <CJK>
-0x8970	0x3151	0x82F1	# <CJK>
-0x8971	0x3152	0x885B	# <CJK>
-0x8972	0x3153	0x8A60	# <CJK>
-0x8973	0x3154	0x92ED	# <CJK>
-0x8974	0x3155	0x6DB2	# <CJK>
-0x8975	0x3156	0x75AB	# <CJK>
-0x8976	0x3157	0x76CA	# <CJK>
-0x8977	0x3158	0x99C5	# <CJK>
-0x8978	0x3159	0x60A6	# <CJK>
-0x8979	0x315A	0x8B01	# <CJK>
-0x897A	0x315B	0x8D8A	# <CJK>
-0x897B	0x315C	0x95B2	# <CJK>
-0x897C	0x315D	0x698E	# <CJK>
-0x897D	0x315E	0x53AD	# <CJK>
-0x897E	0x315F	0x5186	# <CJK>
-0x8980	0x3160	0x5712	# <CJK>
-0x8981	0x3161	0x5830	# <CJK>
-0x8982	0x3162	0x5944	# <CJK>
-0x8983	0x3163	0x5BB4	# <CJK>
-0x8984	0x3164	0x5EF6	# <CJK>
-0x8985	0x3165	0x6028	# <CJK>
-0x8986	0x3166	0x63A9	# <CJK>
-0x8987	0x3167	0x63F4	# <CJK>
-0x8988	0x3168	0x6CBF	# <CJK>
-0x8989	0x3169	0x6F14	# <CJK>
-0x898A	0x316A	0x708E	# <CJK>
-0x898B	0x316B	0x7114	# <CJK>
-0x898C	0x316C	0x7159	# <CJK>
-0x898D	0x316D	0x71D5	# <CJK>
-0x898E	0x316E	0x733F	# <CJK>
-0x898F	0x316F	0x7E01	# <CJK>
-0x8990	0x3170	0x8276	# <CJK>
-0x8991	0x3171	0x82D1	# <CJK>
-0x8992	0x3172	0x8597	# <CJK>
-0x8993	0x3173	0x9060	# <CJK>
-0x8994	0x3174	0x925B	# <CJK>
-0x8995	0x3175	0x9D1B	# <CJK>
-0x8996	0x3176	0x5869	# <CJK>
-0x8997	0x3177	0x65BC	# <CJK>
-0x8998	0x3178	0x6C5A	# <CJK>
-0x8999	0x3179	0x7525	# <CJK>
-0x899A	0x317A	0x51F9	# <CJK>
-0x899B	0x317B	0x592E	# <CJK>
-0x899C	0x317C	0x5965	# <CJK>
-0x899D	0x317D	0x5F80	# <CJK>
-0x899E	0x317E	0x5FDC	# <CJK>
-0x899F	0x3221	0x62BC	# <CJK>
-0x89A0	0x3222	0x65FA	# <CJK>
-0x89A1	0x3223	0x6A2A	# <CJK>
-0x89A2	0x3224	0x6B27	# <CJK>
-0x89A3	0x3225	0x6BB4	# <CJK>
-0x89A4	0x3226	0x738B	# <CJK>
-0x89A5	0x3227	0x7FC1	# <CJK>
-0x89A6	0x3228	0x8956	# <CJK>
-0x89A7	0x3229	0x9D2C	# <CJK>
-0x89A8	0x322A	0x9D0E	# <CJK>
-0x89A9	0x322B	0x9EC4	# <CJK>
-0x89AA	0x322C	0x5CA1	# <CJK>
-0x89AB	0x322D	0x6C96	# <CJK>
-0x89AC	0x322E	0x837B	# <CJK>
-0x89AD	0x322F	0x5104	# <CJK>
-0x89AE	0x3230	0x5C4B	# <CJK>
-0x89AF	0x3231	0x61B6	# <CJK>
-0x89B0	0x3232	0x81C6	# <CJK>
-0x89B1	0x3233	0x6876	# <CJK>
-0x89B2	0x3234	0x7261	# <CJK>
-0x89B3	0x3235	0x4E59	# <CJK>
-0x89B4	0x3236	0x4FFA	# <CJK>
-0x89B5	0x3237	0x5378	# <CJK>
-0x89B6	0x3238	0x6069	# <CJK>
-0x89B7	0x3239	0x6E29	# <CJK>
-0x89B8	0x323A	0x7A4F	# <CJK>
-0x89B9	0x323B	0x97F3	# <CJK>
-0x89BA	0x323C	0x4E0B	# <CJK>
-0x89BB	0x323D	0x5316	# <CJK>
-0x89BC	0x323E	0x4EEE	# <CJK>
-0x89BD	0x323F	0x4F55	# <CJK>
-0x89BE	0x3240	0x4F3D	# <CJK>
-0x89BF	0x3241	0x4FA1	# <CJK>
-0x89C0	0x3242	0x4F73	# <CJK>
-0x89C1	0x3243	0x52A0	# <CJK>
-0x89C2	0x3244	0x53EF	# <CJK>
-0x89C3	0x3245	0x5609	# <CJK>
-0x89C4	0x3246	0x590F	# <CJK>
-0x89C5	0x3247	0x5AC1	# <CJK>
-0x89C6	0x3248	0x5BB6	# <CJK>
-0x89C7	0x3249	0x5BE1	# <CJK>
-0x89C8	0x324A	0x79D1	# <CJK>
-0x89C9	0x324B	0x6687	# <CJK>
-0x89CA	0x324C	0x679C	# <CJK>
-0x89CB	0x324D	0x67B6	# <CJK>
-0x89CC	0x324E	0x6B4C	# <CJK>
-0x89CD	0x324F	0x6CB3	# <CJK>
-0x89CE	0x3250	0x706B	# <CJK>
-0x89CF	0x3251	0x73C2	# <CJK>
-0x89D0	0x3252	0x798D	# <CJK>
-0x89D1	0x3253	0x79BE	# <CJK>
-0x89D2	0x3254	0x7A3C	# <CJK>
-0x89D3	0x3255	0x7B87	# <CJK>
-0x89D4	0x3256	0x82B1	# <CJK>
-0x89D5	0x3257	0x82DB	# <CJK>
-0x89D6	0x3258	0x8304	# <CJK>
-0x89D7	0x3259	0x8377	# <CJK>
-0x89D8	0x325A	0x83EF	# <CJK>
-0x89D9	0x325B	0x83D3	# <CJK>
-0x89DA	0x325C	0x8766	# <CJK>
-0x89DB	0x325D	0x8AB2	# <CJK>
-0x89DC	0x325E	0x5629	# <CJK>
-0x89DD	0x325F	0x8CA8	# <CJK>
-0x89DE	0x3260	0x8FE6	# <CJK>
-0x89DF	0x3261	0x904E	# <CJK>
-0x89E0	0x3262	0x971E	# <CJK>
-0x89E1	0x3263	0x868A	# <CJK>
-0x89E2	0x3264	0x4FC4	# <CJK>
-0x89E3	0x3265	0x5CE8	# <CJK>
-0x89E4	0x3266	0x6211	# <CJK>
-0x89E5	0x3267	0x7259	# <CJK>
-0x89E6	0x3268	0x753B	# <CJK>
-0x89E7	0x3269	0x81E5	# <CJK>
-0x89E8	0x326A	0x82BD	# <CJK>
-0x89E9	0x326B	0x86FE	# <CJK>
-0x89EA	0x326C	0x8CC0	# <CJK>
-0x89EB	0x326D	0x96C5	# <CJK>
-0x89EC	0x326E	0x9913	# <CJK>
-0x89ED	0x326F	0x99D5	# <CJK>
-0x89EE	0x3270	0x4ECB	# <CJK>
-0x89EF	0x3271	0x4F1A	# <CJK>
-0x89F0	0x3272	0x89E3	# <CJK>
-0x89F1	0x3273	0x56DE	# <CJK>
-0x89F2	0x3274	0x584A	# <CJK>
-0x89F3	0x3275	0x58CA	# <CJK>
-0x89F4	0x3276	0x5EFB	# <CJK>
-0x89F5	0x3277	0x5FEB	# <CJK>
-0x89F6	0x3278	0x602A	# <CJK>
-0x89F7	0x3279	0x6094	# <CJK>
-0x89F8	0x327A	0x6062	# <CJK>
-0x89F9	0x327B	0x61D0	# <CJK>
-0x89FA	0x327C	0x6212	# <CJK>
-0x89FB	0x327D	0x62D0	# <CJK>
-0x89FC	0x327E	0x6539	# <CJK>
-0x8A40	0x3321	0x9B41	# <CJK>
-0x8A41	0x3322	0x6666	# <CJK>
-0x8A42	0x3323	0x68B0	# <CJK>
-0x8A43	0x3324	0x6D77	# <CJK>
-0x8A44	0x3325	0x7070	# <CJK>
-0x8A45	0x3326	0x754C	# <CJK>
-0x8A46	0x3327	0x7686	# <CJK>
-0x8A47	0x3328	0x7D75	# <CJK>
-0x8A48	0x3329	0x82A5	# <CJK>
-0x8A49	0x332A	0x87F9	# <CJK>
-0x8A4A	0x332B	0x958B	# <CJK>
-0x8A4B	0x332C	0x968E	# <CJK>
-0x8A4C	0x332D	0x8C9D	# <CJK>
-0x8A4D	0x332E	0x51F1	# <CJK>
-0x8A4E	0x332F	0x52BE	# <CJK>
-0x8A4F	0x3330	0x5916	# <CJK>
-0x8A50	0x3331	0x54B3	# <CJK>
-0x8A51	0x3332	0x5BB3	# <CJK>
-0x8A52	0x3333	0x5D16	# <CJK>
-0x8A53	0x3334	0x6168	# <CJK>
-0x8A54	0x3335	0x6982	# <CJK>
-0x8A55	0x3336	0x6DAF	# <CJK>
-0x8A56	0x3337	0x788D	# <CJK>
-0x8A57	0x3338	0x84CB	# <CJK>
-0x8A58	0x3339	0x8857	# <CJK>
-0x8A59	0x333A	0x8A72	# <CJK>
-0x8A5A	0x333B	0x93A7	# <CJK>
-0x8A5B	0x333C	0x9AB8	# <CJK>
-0x8A5C	0x333D	0x6D6C	# <CJK>
-0x8A5D	0x333E	0x99A8	# <CJK>
-0x8A5E	0x333F	0x86D9	# <CJK>
-0x8A5F	0x3340	0x57A3	# <CJK>
-0x8A60	0x3341	0x67FF	# <CJK>
-0x8A61	0x3342	0x86CE	# <CJK>
-0x8A62	0x3343	0x920E	# <CJK>
-0x8A63	0x3344	0x5283	# <CJK>
-0x8A64	0x3345	0x5687	# <CJK>
-0x8A65	0x3346	0x5404	# <CJK>
-0x8A66	0x3347	0x5ED3	# <CJK>
-0x8A67	0x3348	0x62E1	# <CJK>
-0x8A68	0x3349	0x64B9	# <CJK>
-0x8A69	0x334A	0x683C	# <CJK>
-0x8A6A	0x334B	0x6838	# <CJK>
-0x8A6B	0x334C	0x6BBB	# <CJK>
-0x8A6C	0x334D	0x7372	# <CJK>
-0x8A6D	0x334E	0x78BA	# <CJK>
-0x8A6E	0x334F	0x7A6B	# <CJK>
-0x8A6F	0x3350	0x899A	# <CJK>
-0x8A70	0x3351	0x89D2	# <CJK>
-0x8A71	0x3352	0x8D6B	# <CJK>
-0x8A72	0x3353	0x8F03	# <CJK>
-0x8A73	0x3354	0x90ED	# <CJK>
-0x8A74	0x3355	0x95A3	# <CJK>
-0x8A75	0x3356	0x9694	# <CJK>
-0x8A76	0x3357	0x9769	# <CJK>
-0x8A77	0x3358	0x5B66	# <CJK>
-0x8A78	0x3359	0x5CB3	# <CJK>
-0x8A79	0x335A	0x697D	# <CJK>
-0x8A7A	0x335B	0x984D	# <CJK>
-0x8A7B	0x335C	0x984E	# <CJK>
-0x8A7C	0x335D	0x639B	# <CJK>
-0x8A7D	0x335E	0x7B20	# <CJK>
-0x8A7E	0x335F	0x6A2B	# <CJK>
-0x8A80	0x3360	0x6A7F	# <CJK>
-0x8A81	0x3361	0x68B6	# <CJK>
-0x8A82	0x3362	0x9C0D	# <CJK>
-0x8A83	0x3363	0x6F5F	# <CJK>
-0x8A84	0x3364	0x5272	# <CJK>
-0x8A85	0x3365	0x559D	# <CJK>
-0x8A86	0x3366	0x6070	# <CJK>
-0x8A87	0x3367	0x62EC	# <CJK>
-0x8A88	0x3368	0x6D3B	# <CJK>
-0x8A89	0x3369	0x6E07	# <CJK>
-0x8A8A	0x336A	0x6ED1	# <CJK>
-0x8A8B	0x336B	0x845B	# <CJK>
-0x8A8C	0x336C	0x8910	# <CJK>
-0x8A8D	0x336D	0x8F44	# <CJK>
-0x8A8E	0x336E	0x4E14	# <CJK>
-0x8A8F	0x336F	0x9C39	# <CJK>
-0x8A90	0x3370	0x53F6	# <CJK>
-0x8A91	0x3371	0x691B	# <CJK>
-0x8A92	0x3372	0x6A3A	# <CJK>
-0x8A93	0x3373	0x9784	# <CJK>
-0x8A94	0x3374	0x682A	# <CJK>
-0x8A95	0x3375	0x515C	# <CJK>
-0x8A96	0x3376	0x7AC3	# <CJK>
-0x8A97	0x3377	0x84B2	# <CJK>
-0x8A98	0x3378	0x91DC	# <CJK>
-0x8A99	0x3379	0x938C	# <CJK>
-0x8A9A	0x337A	0x565B	# <CJK>
-0x8A9B	0x337B	0x9D28	# <CJK>
-0x8A9C	0x337C	0x6822	# <CJK>
-0x8A9D	0x337D	0x8305	# <CJK>
-0x8A9E	0x337E	0x8431	# <CJK>
-0x8A9F	0x3421	0x7CA5	# <CJK>
-0x8AA0	0x3422	0x5208	# <CJK>
-0x8AA1	0x3423	0x82C5	# <CJK>
-0x8AA2	0x3424	0x74E6	# <CJK>
-0x8AA3	0x3425	0x4E7E	# <CJK>
-0x8AA4	0x3426	0x4F83	# <CJK>
-0x8AA5	0x3427	0x51A0	# <CJK>
-0x8AA6	0x3428	0x5BD2	# <CJK>
-0x8AA7	0x3429	0x520A	# <CJK>
-0x8AA8	0x342A	0x52D8	# <CJK>
-0x8AA9	0x342B	0x52E7	# <CJK>
-0x8AAA	0x342C	0x5DFB	# <CJK>
-0x8AAB	0x342D	0x559A	# <CJK>
-0x8AAC	0x342E	0x582A	# <CJK>
-0x8AAD	0x342F	0x59E6	# <CJK>
-0x8AAE	0x3430	0x5B8C	# <CJK>
-0x8AAF	0x3431	0x5B98	# <CJK>
-0x8AB0	0x3432	0x5BDB	# <CJK>
-0x8AB1	0x3433	0x5E72	# <CJK>
-0x8AB2	0x3434	0x5E79	# <CJK>
-0x8AB3	0x3435	0x60A3	# <CJK>
-0x8AB4	0x3436	0x611F	# <CJK>
-0x8AB5	0x3437	0x6163	# <CJK>
-0x8AB6	0x3438	0x61BE	# <CJK>
-0x8AB7	0x3439	0x63DB	# <CJK>
-0x8AB8	0x343A	0x6562	# <CJK>
-0x8AB9	0x343B	0x67D1	# <CJK>
-0x8ABA	0x343C	0x6853	# <CJK>
-0x8ABB	0x343D	0x68FA	# <CJK>
-0x8ABC	0x343E	0x6B3E	# <CJK>
-0x8ABD	0x343F	0x6B53	# <CJK>
-0x8ABE	0x3440	0x6C57	# <CJK>
-0x8ABF	0x3441	0x6F22	# <CJK>
-0x8AC0	0x3442	0x6F97	# <CJK>
-0x8AC1	0x3443	0x6F45	# <CJK>
-0x8AC2	0x3444	0x74B0	# <CJK>
-0x8AC3	0x3445	0x7518	# <CJK>
-0x8AC4	0x3446	0x76E3	# <CJK>
-0x8AC5	0x3447	0x770B	# <CJK>
-0x8AC6	0x3448	0x7AFF	# <CJK>
-0x8AC7	0x3449	0x7BA1	# <CJK>
-0x8AC8	0x344A	0x7C21	# <CJK>
-0x8AC9	0x344B	0x7DE9	# <CJK>
-0x8ACA	0x344C	0x7F36	# <CJK>
-0x8ACB	0x344D	0x7FF0	# <CJK>
-0x8ACC	0x344E	0x809D	# <CJK>
-0x8ACD	0x344F	0x8266	# <CJK>
-0x8ACE	0x3450	0x839E	# <CJK>
-0x8ACF	0x3451	0x89B3	# <CJK>
-0x8AD0	0x3452	0x8ACC	# <CJK>
-0x8AD1	0x3453	0x8CAB	# <CJK>
-0x8AD2	0x3454	0x9084	# <CJK>
-0x8AD3	0x3455	0x9451	# <CJK>
-0x8AD4	0x3456	0x9593	# <CJK>
-0x8AD5	0x3457	0x9591	# <CJK>
-0x8AD6	0x3458	0x95A2	# <CJK>
-0x8AD7	0x3459	0x9665	# <CJK>
-0x8AD8	0x345A	0x97D3	# <CJK>
-0x8AD9	0x345B	0x9928	# <CJK>
-0x8ADA	0x345C	0x8218	# <CJK>
-0x8ADB	0x345D	0x4E38	# <CJK>
-0x8ADC	0x345E	0x542B	# <CJK>
-0x8ADD	0x345F	0x5CB8	# <CJK>
-0x8ADE	0x3460	0x5DCC	# <CJK>
-0x8ADF	0x3461	0x73A9	# <CJK>
-0x8AE0	0x3462	0x764C	# <CJK>
-0x8AE1	0x3463	0x773C	# <CJK>
-0x8AE2	0x3464	0x5CA9	# <CJK>
-0x8AE3	0x3465	0x7FEB	# <CJK>
-0x8AE4	0x3466	0x8D0B	# <CJK>
-0x8AE5	0x3467	0x96C1	# <CJK>
-0x8AE6	0x3468	0x9811	# <CJK>
-0x8AE7	0x3469	0x9854	# <CJK>
-0x8AE8	0x346A	0x9858	# <CJK>
-0x8AE9	0x346B	0x4F01	# <CJK>
-0x8AEA	0x346C	0x4F0E	# <CJK>
-0x8AEB	0x346D	0x5371	# <CJK>
-0x8AEC	0x346E	0x559C	# <CJK>
-0x8AED	0x346F	0x5668	# <CJK>
-0x8AEE	0x3470	0x57FA	# <CJK>
-0x8AEF	0x3471	0x5947	# <CJK>
-0x8AF0	0x3472	0x5B09	# <CJK>
-0x8AF1	0x3473	0x5BC4	# <CJK>
-0x8AF2	0x3474	0x5C90	# <CJK>
-0x8AF3	0x3475	0x5E0C	# <CJK>
-0x8AF4	0x3476	0x5E7E	# <CJK>
-0x8AF5	0x3477	0x5FCC	# <CJK>
-0x8AF6	0x3478	0x63EE	# <CJK>
-0x8AF7	0x3479	0x673A	# <CJK>
-0x8AF8	0x347A	0x65D7	# <CJK>
-0x8AF9	0x347B	0x65E2	# <CJK>
-0x8AFA	0x347C	0x671F	# <CJK>
-0x8AFB	0x347D	0x68CB	# <CJK>
-0x8AFC	0x347E	0x68C4	# <CJK>
-0x8B40	0x3521	0x6A5F	# <CJK>
-0x8B41	0x3522	0x5E30	# <CJK>
-0x8B42	0x3523	0x6BC5	# <CJK>
-0x8B43	0x3524	0x6C17	# <CJK>
-0x8B44	0x3525	0x6C7D	# <CJK>
-0x8B45	0x3526	0x757F	# <CJK>
-0x8B46	0x3527	0x7948	# <CJK>
-0x8B47	0x3528	0x5B63	# <CJK>
-0x8B48	0x3529	0x7A00	# <CJK>
-0x8B49	0x352A	0x7D00	# <CJK>
-0x8B4A	0x352B	0x5FBD	# <CJK>
-0x8B4B	0x352C	0x898F	# <CJK>
-0x8B4C	0x352D	0x8A18	# <CJK>
-0x8B4D	0x352E	0x8CB4	# <CJK>
-0x8B4E	0x352F	0x8D77	# <CJK>
-0x8B4F	0x3530	0x8ECC	# <CJK>
-0x8B50	0x3531	0x8F1D	# <CJK>
-0x8B51	0x3532	0x98E2	# <CJK>
-0x8B52	0x3533	0x9A0E	# <CJK>
-0x8B53	0x3534	0x9B3C	# <CJK>
-0x8B54	0x3535	0x4E80	# <CJK>
-0x8B55	0x3536	0x507D	# <CJK>
-0x8B56	0x3537	0x5100	# <CJK>
-0x8B57	0x3538	0x5993	# <CJK>
-0x8B58	0x3539	0x5B9C	# <CJK>
-0x8B59	0x353A	0x622F	# <CJK>
-0x8B5A	0x353B	0x6280	# <CJK>
-0x8B5B	0x353C	0x64EC	# <CJK>
-0x8B5C	0x353D	0x6B3A	# <CJK>
-0x8B5D	0x353E	0x72A0	# <CJK>
-0x8B5E	0x353F	0x7591	# <CJK>
-0x8B5F	0x3540	0x7947	# <CJK>
-0x8B60	0x3541	0x7FA9	# <CJK>
-0x8B61	0x3542	0x87FB	# <CJK>
-0x8B62	0x3543	0x8ABC	# <CJK>
-0x8B63	0x3544	0x8B70	# <CJK>
-0x8B64	0x3545	0x63AC	# <CJK>
-0x8B65	0x3546	0x83CA	# <CJK>
-0x8B66	0x3547	0x97A0	# <CJK>
-0x8B67	0x3548	0x5409	# <CJK>
-0x8B68	0x3549	0x5403	# <CJK>
-0x8B69	0x354A	0x55AB	# <CJK>
-0x8B6A	0x354B	0x6854	# <CJK>
-0x8B6B	0x354C	0x6A58	# <CJK>
-0x8B6C	0x354D	0x8A70	# <CJK>
-0x8B6D	0x354E	0x7827	# <CJK>
-0x8B6E	0x354F	0x6775	# <CJK>
-0x8B6F	0x3550	0x9ECD	# <CJK>
-0x8B70	0x3551	0x5374	# <CJK>
-0x8B71	0x3552	0x5BA2	# <CJK>
-0x8B72	0x3553	0x811A	# <CJK>
-0x8B73	0x3554	0x8650	# <CJK>
-0x8B74	0x3555	0x9006	# <CJK>
-0x8B75	0x3556	0x4E18	# <CJK>
-0x8B76	0x3557	0x4E45	# <CJK>
-0x8B77	0x3558	0x4EC7	# <CJK>
-0x8B78	0x3559	0x4F11	# <CJK>
-0x8B79	0x355A	0x53CA	# <CJK>
-0x8B7A	0x355B	0x5438	# <CJK>
-0x8B7B	0x355C	0x5BAE	# <CJK>
-0x8B7C	0x355D	0x5F13	# <CJK>
-0x8B7D	0x355E	0x6025	# <CJK>
-0x8B7E	0x355F	0x6551	# <CJK>
-0x8B80	0x3560	0x673D	# <CJK>
-0x8B81	0x3561	0x6C42	# <CJK>
-0x8B82	0x3562	0x6C72	# <CJK>
-0x8B83	0x3563	0x6CE3	# <CJK>
-0x8B84	0x3564	0x7078	# <CJK>
-0x8B85	0x3565	0x7403	# <CJK>
-0x8B86	0x3566	0x7A76	# <CJK>
-0x8B87	0x3567	0x7AAE	# <CJK>
-0x8B88	0x3568	0x7B08	# <CJK>
-0x8B89	0x3569	0x7D1A	# <CJK>
-0x8B8A	0x356A	0x7CFE	# <CJK>
-0x8B8B	0x356B	0x7D66	# <CJK>
-0x8B8C	0x356C	0x65E7	# <CJK>
-0x8B8D	0x356D	0x725B	# <CJK>
-0x8B8E	0x356E	0x53BB	# <CJK>
-0x8B8F	0x356F	0x5C45	# <CJK>
-0x8B90	0x3570	0x5DE8	# <CJK>
-0x8B91	0x3571	0x62D2	# <CJK>
-0x8B92	0x3572	0x62E0	# <CJK>
-0x8B93	0x3573	0x6319	# <CJK>
-0x8B94	0x3574	0x6E20	# <CJK>
-0x8B95	0x3575	0x865A	# <CJK>
-0x8B96	0x3576	0x8A31	# <CJK>
-0x8B97	0x3577	0x8DDD	# <CJK>
-0x8B98	0x3578	0x92F8	# <CJK>
-0x8B99	0x3579	0x6F01	# <CJK>
-0x8B9A	0x357A	0x79A6	# <CJK>
-0x8B9B	0x357B	0x9B5A	# <CJK>
-0x8B9C	0x357C	0x4EA8	# <CJK>
-0x8B9D	0x357D	0x4EAB	# <CJK>
-0x8B9E	0x357E	0x4EAC	# <CJK>
-0x8B9F	0x3621	0x4F9B	# <CJK>
-0x8BA0	0x3622	0x4FA0	# <CJK>
-0x8BA1	0x3623	0x50D1	# <CJK>
-0x8BA2	0x3624	0x5147	# <CJK>
-0x8BA3	0x3625	0x7AF6	# <CJK>
-0x8BA4	0x3626	0x5171	# <CJK>
-0x8BA5	0x3627	0x51F6	# <CJK>
-0x8BA6	0x3628	0x5354	# <CJK>
-0x8BA7	0x3629	0x5321	# <CJK>
-0x8BA8	0x362A	0x537F	# <CJK>
-0x8BA9	0x362B	0x53EB	# <CJK>
-0x8BAA	0x362C	0x55AC	# <CJK>
-0x8BAB	0x362D	0x5883	# <CJK>
-0x8BAC	0x362E	0x5CE1	# <CJK>
-0x8BAD	0x362F	0x5F37	# <CJK>
-0x8BAE	0x3630	0x5F4A	# <CJK>
-0x8BAF	0x3631	0x602F	# <CJK>
-0x8BB0	0x3632	0x6050	# <CJK>
-0x8BB1	0x3633	0x606D	# <CJK>
-0x8BB2	0x3634	0x631F	# <CJK>
-0x8BB3	0x3635	0x6559	# <CJK>
-0x8BB4	0x3636	0x6A4B	# <CJK>
-0x8BB5	0x3637	0x6CC1	# <CJK>
-0x8BB6	0x3638	0x72C2	# <CJK>
-0x8BB7	0x3639	0x72ED	# <CJK>
-0x8BB8	0x363A	0x77EF	# <CJK>
-0x8BB9	0x363B	0x80F8	# <CJK>
-0x8BBA	0x363C	0x8105	# <CJK>
-0x8BBB	0x363D	0x8208	# <CJK>
-0x8BBC	0x363E	0x854E	# <CJK>
-0x8BBD	0x363F	0x90F7	# <CJK>
-0x8BBE	0x3640	0x93E1	# <CJK>
-0x8BBF	0x3641	0x97FF	# <CJK>
-0x8BC0	0x3642	0x9957	# <CJK>
-0x8BC1	0x3643	0x9A5A	# <CJK>
-0x8BC2	0x3644	0x4EF0	# <CJK>
-0x8BC3	0x3645	0x51DD	# <CJK>
-0x8BC4	0x3646	0x5C2D	# <CJK>
-0x8BC5	0x3647	0x6681	# <CJK>
-0x8BC6	0x3648	0x696D	# <CJK>
-0x8BC7	0x3649	0x5C40	# <CJK>
-0x8BC8	0x364A	0x66F2	# <CJK>
-0x8BC9	0x364B	0x6975	# <CJK>
-0x8BCA	0x364C	0x7389	# <CJK>
-0x8BCB	0x364D	0x6850	# <CJK>
-0x8BCC	0x364E	0x7C81	# <CJK>
-0x8BCD	0x364F	0x50C5	# <CJK>
-0x8BCE	0x3650	0x52E4	# <CJK>
-0x8BCF	0x3651	0x5747	# <CJK>
-0x8BD0	0x3652	0x5DFE	# <CJK>
-0x8BD1	0x3653	0x9326	# <CJK>
-0x8BD2	0x3654	0x65A4	# <CJK>
-0x8BD3	0x3655	0x6B23	# <CJK>
-0x8BD4	0x3656	0x6B3D	# <CJK>
-0x8BD5	0x3657	0x7434	# <CJK>
-0x8BD6	0x3658	0x7981	# <CJK>
-0x8BD7	0x3659	0x79BD	# <CJK>
-0x8BD8	0x365A	0x7B4B	# <CJK>
-0x8BD9	0x365B	0x7DCA	# <CJK>
-0x8BDA	0x365C	0x82B9	# <CJK>
-0x8BDB	0x365D	0x83CC	# <CJK>
-0x8BDC	0x365E	0x887F	# <CJK>
-0x8BDD	0x365F	0x895F	# <CJK>
-0x8BDE	0x3660	0x8B39	# <CJK>
-0x8BDF	0x3661	0x8FD1	# <CJK>
-0x8BE0	0x3662	0x91D1	# <CJK>
-0x8BE1	0x3663	0x541F	# <CJK>
-0x8BE2	0x3664	0x9280	# <CJK>
-0x8BE3	0x3665	0x4E5D	# <CJK>
-0x8BE4	0x3666	0x5036	# <CJK>
-0x8BE5	0x3667	0x53E5	# <CJK>
-0x8BE6	0x3668	0x533A	# <CJK>
-0x8BE7	0x3669	0x72D7	# <CJK>
-0x8BE8	0x366A	0x7396	# <CJK>
-0x8BE9	0x366B	0x77E9	# <CJK>
-0x8BEA	0x366C	0x82E6	# <CJK>
-0x8BEB	0x366D	0x8EAF	# <CJK>
-0x8BEC	0x366E	0x99C6	# <CJK>
-0x8BED	0x366F	0x99C8	# <CJK>
-0x8BEE	0x3670	0x99D2	# <CJK>
-0x8BEF	0x3671	0x5177	# <CJK>
-0x8BF0	0x3672	0x611A	# <CJK>
-0x8BF1	0x3673	0x865E	# <CJK>
-0x8BF2	0x3674	0x55B0	# <CJK>
-0x8BF3	0x3675	0x7A7A	# <CJK>
-0x8BF4	0x3676	0x5076	# <CJK>
-0x8BF5	0x3677	0x5BD3	# <CJK>
-0x8BF6	0x3678	0x9047	# <CJK>
-0x8BF7	0x3679	0x9685	# <CJK>
-0x8BF8	0x367A	0x4E32	# <CJK>
-0x8BF9	0x367B	0x6ADB	# <CJK>
-0x8BFA	0x367C	0x91E7	# <CJK>
-0x8BFB	0x367D	0x5C51	# <CJK>
-0x8BFC	0x367E	0x5C48	# <CJK>
-0x8C40	0x3721	0x6398	# <CJK>
-0x8C41	0x3722	0x7A9F	# <CJK>
-0x8C42	0x3723	0x6C93	# <CJK>
-0x8C43	0x3724	0x9774	# <CJK>
-0x8C44	0x3725	0x8F61	# <CJK>
-0x8C45	0x3726	0x7AAA	# <CJK>
-0x8C46	0x3727	0x718A	# <CJK>
-0x8C47	0x3728	0x9688	# <CJK>
-0x8C48	0x3729	0x7C82	# <CJK>
-0x8C49	0x372A	0x6817	# <CJK>
-0x8C4A	0x372B	0x7E70	# <CJK>
-0x8C4B	0x372C	0x6851	# <CJK>
-0x8C4C	0x372D	0x936C	# <CJK>
-0x8C4D	0x372E	0x52F2	# <CJK>
-0x8C4E	0x372F	0x541B	# <CJK>
-0x8C4F	0x3730	0x85AB	# <CJK>
-0x8C50	0x3731	0x8A13	# <CJK>
-0x8C51	0x3732	0x7FA4	# <CJK>
-0x8C52	0x3733	0x8ECD	# <CJK>
-0x8C53	0x3734	0x90E1	# <CJK>
-0x8C54	0x3735	0x5366	# <CJK>
-0x8C55	0x3736	0x8888	# <CJK>
-0x8C56	0x3737	0x7941	# <CJK>
-0x8C57	0x3738	0x4FC2	# <CJK>
-0x8C58	0x3739	0x50BE	# <CJK>
-0x8C59	0x373A	0x5211	# <CJK>
-0x8C5A	0x373B	0x5144	# <CJK>
-0x8C5B	0x373C	0x5553	# <CJK>
-0x8C5C	0x373D	0x572D	# <CJK>
-0x8C5D	0x373E	0x73EA	# <CJK>
-0x8C5E	0x373F	0x578B	# <CJK>
-0x8C5F	0x3740	0x5951	# <CJK>
-0x8C60	0x3741	0x5F62	# <CJK>
-0x8C61	0x3742	0x5F84	# <CJK>
-0x8C62	0x3743	0x6075	# <CJK>
-0x8C63	0x3744	0x6176	# <CJK>
-0x8C64	0x3745	0x6167	# <CJK>
-0x8C65	0x3746	0x61A9	# <CJK>
-0x8C66	0x3747	0x63B2	# <CJK>
-0x8C67	0x3748	0x643A	# <CJK>
-0x8C68	0x3749	0x656C	# <CJK>
-0x8C69	0x374A	0x666F	# <CJK>
-0x8C6A	0x374B	0x6842	# <CJK>
-0x8C6B	0x374C	0x6E13	# <CJK>
-0x8C6C	0x374D	0x7566	# <CJK>
-0x8C6D	0x374E	0x7A3D	# <CJK>
-0x8C6E	0x374F	0x7CFB	# <CJK>
-0x8C6F	0x3750	0x7D4C	# <CJK>
-0x8C70	0x3751	0x7D99	# <CJK>
-0x8C71	0x3752	0x7E4B	# <CJK>
-0x8C72	0x3753	0x7F6B	# <CJK>
-0x8C73	0x3754	0x830E	# <CJK>
-0x8C74	0x3755	0x834A	# <CJK>
-0x8C75	0x3756	0x86CD	# <CJK>
-0x8C76	0x3757	0x8A08	# <CJK>
-0x8C77	0x3758	0x8A63	# <CJK>
-0x8C78	0x3759	0x8B66	# <CJK>
-0x8C79	0x375A	0x8EFD	# <CJK>
-0x8C7A	0x375B	0x981A	# <CJK>
-0x8C7B	0x375C	0x9D8F	# <CJK>
-0x8C7C	0x375D	0x82B8	# <CJK>
-0x8C7D	0x375E	0x8FCE	# <CJK>
-0x8C7E	0x375F	0x9BE8	# <CJK>
-0x8C80	0x3760	0x5287	# <CJK>
-0x8C81	0x3761	0x621F	# <CJK>
-0x8C82	0x3762	0x6483	# <CJK>
-0x8C83	0x3763	0x6FC0	# <CJK>
-0x8C84	0x3764	0x9699	# <CJK>
-0x8C85	0x3765	0x6841	# <CJK>
-0x8C86	0x3766	0x5091	# <CJK>
-0x8C87	0x3767	0x6B20	# <CJK>
-0x8C88	0x3768	0x6C7A	# <CJK>
-0x8C89	0x3769	0x6F54	# <CJK>
-0x8C8A	0x376A	0x7A74	# <CJK>
-0x8C8B	0x376B	0x7D50	# <CJK>
-0x8C8C	0x376C	0x8840	# <CJK>
-0x8C8D	0x376D	0x8A23	# <CJK>
-0x8C8E	0x376E	0x6708	# <CJK>
-0x8C8F	0x376F	0x4EF6	# <CJK>
-0x8C90	0x3770	0x5039	# <CJK>
-0x8C91	0x3771	0x5026	# <CJK>
-0x8C92	0x3772	0x5065	# <CJK>
-0x8C93	0x3773	0x517C	# <CJK>
-0x8C94	0x3774	0x5238	# <CJK>
-0x8C95	0x3775	0x5263	# <CJK>
-0x8C96	0x3776	0x55A7	# <CJK>
-0x8C97	0x3777	0x570F	# <CJK>
-0x8C98	0x3778	0x5805	# <CJK>
-0x8C99	0x3779	0x5ACC	# <CJK>
-0x8C9A	0x377A	0x5EFA	# <CJK>
-0x8C9B	0x377B	0x61B2	# <CJK>
-0x8C9C	0x377C	0x61F8	# <CJK>
-0x8C9D	0x377D	0x62F3	# <CJK>
-0x8C9E	0x377E	0x6372	# <CJK>
-0x8C9F	0x3821	0x691C	# <CJK>
-0x8CA0	0x3822	0x6A29	# <CJK>
-0x8CA1	0x3823	0x727D	# <CJK>
-0x8CA2	0x3824	0x72AC	# <CJK>
-0x8CA3	0x3825	0x732E	# <CJK>
-0x8CA4	0x3826	0x7814	# <CJK>
-0x8CA5	0x3827	0x786F	# <CJK>
-0x8CA6	0x3828	0x7D79	# <CJK>
-0x8CA7	0x3829	0x770C	# <CJK>
-0x8CA8	0x382A	0x80A9	# <CJK>
-0x8CA9	0x382B	0x898B	# <CJK>
-0x8CAA	0x382C	0x8B19	# <CJK>
-0x8CAB	0x382D	0x8CE2	# <CJK>
-0x8CAC	0x382E	0x8ED2	# <CJK>
-0x8CAD	0x382F	0x9063	# <CJK>
-0x8CAE	0x3830	0x9375	# <CJK>
-0x8CAF	0x3831	0x967A	# <CJK>
-0x8CB0	0x3832	0x9855	# <CJK>
-0x8CB1	0x3833	0x9A13	# <CJK>
-0x8CB2	0x3834	0x9E78	# <CJK>
-0x8CB3	0x3835	0x5143	# <CJK>
-0x8CB4	0x3836	0x539F	# <CJK>
-0x8CB5	0x3837	0x53B3	# <CJK>
-0x8CB6	0x3838	0x5E7B	# <CJK>
-0x8CB7	0x3839	0x5F26	# <CJK>
-0x8CB8	0x383A	0x6E1B	# <CJK>
-0x8CB9	0x383B	0x6E90	# <CJK>
-0x8CBA	0x383C	0x7384	# <CJK>
-0x8CBB	0x383D	0x73FE	# <CJK>
-0x8CBC	0x383E	0x7D43	# <CJK>
-0x8CBD	0x383F	0x8237	# <CJK>
-0x8CBE	0x3840	0x8A00	# <CJK>
-0x8CBF	0x3841	0x8AFA	# <CJK>
-0x8CC0	0x3842	0x9650	# <CJK>
-0x8CC1	0x3843	0x4E4E	# <CJK>
-0x8CC2	0x3844	0x500B	# <CJK>
-0x8CC3	0x3845	0x53E4	# <CJK>
-0x8CC4	0x3846	0x547C	# <CJK>
-0x8CC5	0x3847	0x56FA	# <CJK>
-0x8CC6	0x3848	0x59D1	# <CJK>
-0x8CC7	0x3849	0x5B64	# <CJK>
-0x8CC8	0x384A	0x5DF1	# <CJK>
-0x8CC9	0x384B	0x5EAB	# <CJK>
-0x8CCA	0x384C	0x5F27	# <CJK>
-0x8CCB	0x384D	0x6238	# <CJK>
-0x8CCC	0x384E	0x6545	# <CJK>
-0x8CCD	0x384F	0x67AF	# <CJK>
-0x8CCE	0x3850	0x6E56	# <CJK>
-0x8CCF	0x3851	0x72D0	# <CJK>
-0x8CD0	0x3852	0x7CCA	# <CJK>
-0x8CD1	0x3853	0x88B4	# <CJK>
-0x8CD2	0x3854	0x80A1	# <CJK>
-0x8CD3	0x3855	0x80E1	# <CJK>
-0x8CD4	0x3856	0x83F0	# <CJK>
-0x8CD5	0x3857	0x864E	# <CJK>
-0x8CD6	0x3858	0x8A87	# <CJK>
-0x8CD7	0x3859	0x8DE8	# <CJK>
-0x8CD8	0x385A	0x9237	# <CJK>
-0x8CD9	0x385B	0x96C7	# <CJK>
-0x8CDA	0x385C	0x9867	# <CJK>
-0x8CDB	0x385D	0x9F13	# <CJK>
-0x8CDC	0x385E	0x4E94	# <CJK>
-0x8CDD	0x385F	0x4E92	# <CJK>
-0x8CDE	0x3860	0x4F0D	# <CJK>
-0x8CDF	0x3861	0x5348	# <CJK>
-0x8CE0	0x3862	0x5449	# <CJK>
-0x8CE1	0x3863	0x543E	# <CJK>
-0x8CE2	0x3864	0x5A2F	# <CJK>
-0x8CE3	0x3865	0x5F8C	# <CJK>
-0x8CE4	0x3866	0x5FA1	# <CJK>
-0x8CE5	0x3867	0x609F	# <CJK>
-0x8CE6	0x3868	0x68A7	# <CJK>
-0x8CE7	0x3869	0x6A8E	# <CJK>
-0x8CE8	0x386A	0x745A	# <CJK>
-0x8CE9	0x386B	0x7881	# <CJK>
-0x8CEA	0x386C	0x8A9E	# <CJK>
-0x8CEB	0x386D	0x8AA4	# <CJK>
-0x8CEC	0x386E	0x8B77	# <CJK>
-0x8CED	0x386F	0x9190	# <CJK>
-0x8CEE	0x3870	0x4E5E	# <CJK>
-0x8CEF	0x3871	0x9BC9	# <CJK>
-0x8CF0	0x3872	0x4EA4	# <CJK>
-0x8CF1	0x3873	0x4F7C	# <CJK>
-0x8CF2	0x3874	0x4FAF	# <CJK>
-0x8CF3	0x3875	0x5019	# <CJK>
-0x8CF4	0x3876	0x5016	# <CJK>
-0x8CF5	0x3877	0x5149	# <CJK>
-0x8CF6	0x3878	0x516C	# <CJK>
-0x8CF7	0x3879	0x529F	# <CJK>
-0x8CF8	0x387A	0x52B9	# <CJK>
-0x8CF9	0x387B	0x52FE	# <CJK>
-0x8CFA	0x387C	0x539A	# <CJK>
-0x8CFB	0x387D	0x53E3	# <CJK>
-0x8CFC	0x387E	0x5411	# <CJK>
-0x8D40	0x3921	0x540E	# <CJK>
-0x8D41	0x3922	0x5589	# <CJK>
-0x8D42	0x3923	0x5751	# <CJK>
-0x8D43	0x3924	0x57A2	# <CJK>
-0x8D44	0x3925	0x597D	# <CJK>
-0x8D45	0x3926	0x5B54	# <CJK>
-0x8D46	0x3927	0x5B5D	# <CJK>
-0x8D47	0x3928	0x5B8F	# <CJK>
-0x8D48	0x3929	0x5DE5	# <CJK>
-0x8D49	0x392A	0x5DE7	# <CJK>
-0x8D4A	0x392B	0x5DF7	# <CJK>
-0x8D4B	0x392C	0x5E78	# <CJK>
-0x8D4C	0x392D	0x5E83	# <CJK>
-0x8D4D	0x392E	0x5E9A	# <CJK>
-0x8D4E	0x392F	0x5EB7	# <CJK>
-0x8D4F	0x3930	0x5F18	# <CJK>
-0x8D50	0x3931	0x6052	# <CJK>
-0x8D51	0x3932	0x614C	# <CJK>
-0x8D52	0x3933	0x6297	# <CJK>
-0x8D53	0x3934	0x62D8	# <CJK>
-0x8D54	0x3935	0x63A7	# <CJK>
-0x8D55	0x3936	0x653B	# <CJK>
-0x8D56	0x3937	0x6602	# <CJK>
-0x8D57	0x3938	0x6643	# <CJK>
-0x8D58	0x3939	0x66F4	# <CJK>
-0x8D59	0x393A	0x676D	# <CJK>
-0x8D5A	0x393B	0x6821	# <CJK>
-0x8D5B	0x393C	0x6897	# <CJK>
-0x8D5C	0x393D	0x69CB	# <CJK>
-0x8D5D	0x393E	0x6C5F	# <CJK>
-0x8D5E	0x393F	0x6D2A	# <CJK>
-0x8D5F	0x3940	0x6D69	# <CJK>
-0x8D60	0x3941	0x6E2F	# <CJK>
-0x8D61	0x3942	0x6E9D	# <CJK>
-0x8D62	0x3943	0x7532	# <CJK>
-0x8D63	0x3944	0x7687	# <CJK>
-0x8D64	0x3945	0x786C	# <CJK>
-0x8D65	0x3946	0x7A3F	# <CJK>
-0x8D66	0x3947	0x7CE0	# <CJK>
-0x8D67	0x3948	0x7D05	# <CJK>
-0x8D68	0x3949	0x7D18	# <CJK>
-0x8D69	0x394A	0x7D5E	# <CJK>
-0x8D6A	0x394B	0x7DB1	# <CJK>
-0x8D6B	0x394C	0x8015	# <CJK>
-0x8D6C	0x394D	0x8003	# <CJK>
-0x8D6D	0x394E	0x80AF	# <CJK>
-0x8D6E	0x394F	0x80B1	# <CJK>
-0x8D6F	0x3950	0x8154	# <CJK>
-0x8D70	0x3951	0x818F	# <CJK>
-0x8D71	0x3952	0x822A	# <CJK>
-0x8D72	0x3953	0x8352	# <CJK>
-0x8D73	0x3954	0x884C	# <CJK>
-0x8D74	0x3955	0x8861	# <CJK>
-0x8D75	0x3956	0x8B1B	# <CJK>
-0x8D76	0x3957	0x8CA2	# <CJK>
-0x8D77	0x3958	0x8CFC	# <CJK>
-0x8D78	0x3959	0x90CA	# <CJK>
-0x8D79	0x395A	0x9175	# <CJK>
-0x8D7A	0x395B	0x9271	# <CJK>
-0x8D7B	0x395C	0x783F	# <CJK>
-0x8D7C	0x395D	0x92FC	# <CJK>
-0x8D7D	0x395E	0x95A4	# <CJK>
-0x8D7E	0x395F	0x964D	# <CJK>
-0x8D80	0x3960	0x9805	# <CJK>
-0x8D81	0x3961	0x9999	# <CJK>
-0x8D82	0x3962	0x9AD8	# <CJK>
-0x8D83	0x3963	0x9D3B	# <CJK>
-0x8D84	0x3964	0x525B	# <CJK>
-0x8D85	0x3965	0x52AB	# <CJK>
-0x8D86	0x3966	0x53F7	# <CJK>
-0x8D87	0x3967	0x5408	# <CJK>
-0x8D88	0x3968	0x58D5	# <CJK>
-0x8D89	0x3969	0x62F7	# <CJK>
-0x8D8A	0x396A	0x6FE0	# <CJK>
-0x8D8B	0x396B	0x8C6A	# <CJK>
-0x8D8C	0x396C	0x8F5F	# <CJK>
-0x8D8D	0x396D	0x9EB9	# <CJK>
-0x8D8E	0x396E	0x514B	# <CJK>
-0x8D8F	0x396F	0x523B	# <CJK>
-0x8D90	0x3970	0x544A	# <CJK>
-0x8D91	0x3971	0x56FD	# <CJK>
-0x8D92	0x3972	0x7A40	# <CJK>
-0x8D93	0x3973	0x9177	# <CJK>
-0x8D94	0x3974	0x9D60	# <CJK>
-0x8D95	0x3975	0x9ED2	# <CJK>
-0x8D96	0x3976	0x7344	# <CJK>
-0x8D97	0x3977	0x6F09	# <CJK>
-0x8D98	0x3978	0x8170	# <CJK>
-0x8D99	0x3979	0x7511	# <CJK>
-0x8D9A	0x397A	0x5FFD	# <CJK>
-0x8D9B	0x397B	0x60DA	# <CJK>
-0x8D9C	0x397C	0x9AA8	# <CJK>
-0x8D9D	0x397D	0x72DB	# <CJK>
-0x8D9E	0x397E	0x8FBC	# <CJK>
-0x8D9F	0x3A21	0x6B64	# <CJK>
-0x8DA0	0x3A22	0x9803	# <CJK>
-0x8DA1	0x3A23	0x4ECA	# <CJK>
-0x8DA2	0x3A24	0x56F0	# <CJK>
-0x8DA3	0x3A25	0x5764	# <CJK>
-0x8DA4	0x3A26	0x58BE	# <CJK>
-0x8DA5	0x3A27	0x5A5A	# <CJK>
-0x8DA6	0x3A28	0x6068	# <CJK>
-0x8DA7	0x3A29	0x61C7	# <CJK>
-0x8DA8	0x3A2A	0x660F	# <CJK>
-0x8DA9	0x3A2B	0x6606	# <CJK>
-0x8DAA	0x3A2C	0x6839	# <CJK>
-0x8DAB	0x3A2D	0x68B1	# <CJK>
-0x8DAC	0x3A2E	0x6DF7	# <CJK>
-0x8DAD	0x3A2F	0x75D5	# <CJK>
-0x8DAE	0x3A30	0x7D3A	# <CJK>
-0x8DAF	0x3A31	0x826E	# <CJK>
-0x8DB0	0x3A32	0x9B42	# <CJK>
-0x8DB1	0x3A33	0x4E9B	# <CJK>
-0x8DB2	0x3A34	0x4F50	# <CJK>
-0x8DB3	0x3A35	0x53C9	# <CJK>
-0x8DB4	0x3A36	0x5506	# <CJK>
-0x8DB5	0x3A37	0x5D6F	# <CJK>
-0x8DB6	0x3A38	0x5DE6	# <CJK>
-0x8DB7	0x3A39	0x5DEE	# <CJK>
-0x8DB8	0x3A3A	0x67FB	# <CJK>
-0x8DB9	0x3A3B	0x6C99	# <CJK>
-0x8DBA	0x3A3C	0x7473	# <CJK>
-0x8DBB	0x3A3D	0x7802	# <CJK>
-0x8DBC	0x3A3E	0x8A50	# <CJK>
-0x8DBD	0x3A3F	0x9396	# <CJK>
-0x8DBE	0x3A40	0x88DF	# <CJK>
-0x8DBF	0x3A41	0x5750	# <CJK>
-0x8DC0	0x3A42	0x5EA7	# <CJK>
-0x8DC1	0x3A43	0x632B	# <CJK>
-0x8DC2	0x3A44	0x50B5	# <CJK>
-0x8DC3	0x3A45	0x50AC	# <CJK>
-0x8DC4	0x3A46	0x518D	# <CJK>
-0x8DC5	0x3A47	0x6700	# <CJK>
-0x8DC6	0x3A48	0x54C9	# <CJK>
-0x8DC7	0x3A49	0x585E	# <CJK>
-0x8DC8	0x3A4A	0x59BB	# <CJK>
-0x8DC9	0x3A4B	0x5BB0	# <CJK>
-0x8DCA	0x3A4C	0x5F69	# <CJK>
-0x8DCB	0x3A4D	0x624D	# <CJK>
-0x8DCC	0x3A4E	0x63A1	# <CJK>
-0x8DCD	0x3A4F	0x683D	# <CJK>
-0x8DCE	0x3A50	0x6B73	# <CJK>
-0x8DCF	0x3A51	0x6E08	# <CJK>
-0x8DD0	0x3A52	0x707D	# <CJK>
-0x8DD1	0x3A53	0x91C7	# <CJK>
-0x8DD2	0x3A54	0x7280	# <CJK>
-0x8DD3	0x3A55	0x7815	# <CJK>
-0x8DD4	0x3A56	0x7826	# <CJK>
-0x8DD5	0x3A57	0x796D	# <CJK>
-0x8DD6	0x3A58	0x658E	# <CJK>
-0x8DD7	0x3A59	0x7D30	# <CJK>
-0x8DD8	0x3A5A	0x83DC	# <CJK>
-0x8DD9	0x3A5B	0x88C1	# <CJK>
-0x8DDA	0x3A5C	0x8F09	# <CJK>
-0x8DDB	0x3A5D	0x969B	# <CJK>
-0x8DDC	0x3A5E	0x5264	# <CJK>
-0x8DDD	0x3A5F	0x5728	# <CJK>
-0x8DDE	0x3A60	0x6750	# <CJK>
-0x8DDF	0x3A61	0x7F6A	# <CJK>
-0x8DE0	0x3A62	0x8CA1	# <CJK>
-0x8DE1	0x3A63	0x51B4	# <CJK>
-0x8DE2	0x3A64	0x5742	# <CJK>
-0x8DE3	0x3A65	0x962A	# <CJK>
-0x8DE4	0x3A66	0x583A	# <CJK>
-0x8DE5	0x3A67	0x698A	# <CJK>
-0x8DE6	0x3A68	0x80B4	# <CJK>
-0x8DE7	0x3A69	0x54B2	# <CJK>
-0x8DE8	0x3A6A	0x5D0E	# <CJK>
-0x8DE9	0x3A6B	0x57FC	# <CJK>
-0x8DEA	0x3A6C	0x7895	# <CJK>
-0x8DEB	0x3A6D	0x9DFA	# <CJK>
-0x8DEC	0x3A6E	0x4F5C	# <CJK>
-0x8DED	0x3A6F	0x524A	# <CJK>
-0x8DEE	0x3A70	0x548B	# <CJK>
-0x8DEF	0x3A71	0x643E	# <CJK>
-0x8DF0	0x3A72	0x6628	# <CJK>
-0x8DF1	0x3A73	0x6714	# <CJK>
-0x8DF2	0x3A74	0x67F5	# <CJK>
-0x8DF3	0x3A75	0x7A84	# <CJK>
-0x8DF4	0x3A76	0x7B56	# <CJK>
-0x8DF5	0x3A77	0x7D22	# <CJK>
-0x8DF6	0x3A78	0x932F	# <CJK>
-0x8DF7	0x3A79	0x685C	# <CJK>
-0x8DF8	0x3A7A	0x9BAD	# <CJK>
-0x8DF9	0x3A7B	0x7B39	# <CJK>
-0x8DFA	0x3A7C	0x5319	# <CJK>
-0x8DFB	0x3A7D	0x518A	# <CJK>
-0x8DFC	0x3A7E	0x5237	# <CJK>
-0x8E40	0x3B21	0x5BDF	# <CJK>
-0x8E41	0x3B22	0x62F6	# <CJK>
-0x8E42	0x3B23	0x64AE	# <CJK>
-0x8E43	0x3B24	0x64E6	# <CJK>
-0x8E44	0x3B25	0x672D	# <CJK>
-0x8E45	0x3B26	0x6BBA	# <CJK>
-0x8E46	0x3B27	0x85A9	# <CJK>
-0x8E47	0x3B28	0x96D1	# <CJK>
-0x8E48	0x3B29	0x7690	# <CJK>
-0x8E49	0x3B2A	0x9BD6	# <CJK>
-0x8E4A	0x3B2B	0x634C	# <CJK>
-0x8E4B	0x3B2C	0x9306	# <CJK>
-0x8E4C	0x3B2D	0x9BAB	# <CJK>
-0x8E4D	0x3B2E	0x76BF	# <CJK>
-0x8E4E	0x3B2F	0x6652	# <CJK>
-0x8E4F	0x3B30	0x4E09	# <CJK>
-0x8E50	0x3B31	0x5098	# <CJK>
-0x8E51	0x3B32	0x53C2	# <CJK>
-0x8E52	0x3B33	0x5C71	# <CJK>
-0x8E53	0x3B34	0x60E8	# <CJK>
-0x8E54	0x3B35	0x6492	# <CJK>
-0x8E55	0x3B36	0x6563	# <CJK>
-0x8E56	0x3B37	0x685F	# <CJK>
-0x8E57	0x3B38	0x71E6	# <CJK>
-0x8E58	0x3B39	0x73CA	# <CJK>
-0x8E59	0x3B3A	0x7523	# <CJK>
-0x8E5A	0x3B3B	0x7B97	# <CJK>
-0x8E5B	0x3B3C	0x7E82	# <CJK>
-0x8E5C	0x3B3D	0x8695	# <CJK>
-0x8E5D	0x3B3E	0x8B83	# <CJK>
-0x8E5E	0x3B3F	0x8CDB	# <CJK>
-0x8E5F	0x3B40	0x9178	# <CJK>
-0x8E60	0x3B41	0x9910	# <CJK>
-0x8E61	0x3B42	0x65AC	# <CJK>
-0x8E62	0x3B43	0x66AB	# <CJK>
-0x8E63	0x3B44	0x6B8B	# <CJK>
-0x8E64	0x3B45	0x4ED5	# <CJK>
-0x8E65	0x3B46	0x4ED4	# <CJK>
-0x8E66	0x3B47	0x4F3A	# <CJK>
-0x8E67	0x3B48	0x4F7F	# <CJK>
-0x8E68	0x3B49	0x523A	# <CJK>
-0x8E69	0x3B4A	0x53F8	# <CJK>
-0x8E6A	0x3B4B	0x53F2	# <CJK>
-0x8E6B	0x3B4C	0x55E3	# <CJK>
-0x8E6C	0x3B4D	0x56DB	# <CJK>
-0x8E6D	0x3B4E	0x58EB	# <CJK>
-0x8E6E	0x3B4F	0x59CB	# <CJK>
-0x8E6F	0x3B50	0x59C9	# <CJK>
-0x8E70	0x3B51	0x59FF	# <CJK>
-0x8E71	0x3B52	0x5B50	# <CJK>
-0x8E72	0x3B53	0x5C4D	# <CJK>
-0x8E73	0x3B54	0x5E02	# <CJK>
-0x8E74	0x3B55	0x5E2B	# <CJK>
-0x8E75	0x3B56	0x5FD7	# <CJK>
-0x8E76	0x3B57	0x601D	# <CJK>
-0x8E77	0x3B58	0x6307	# <CJK>
-0x8E78	0x3B59	0x652F	# <CJK>
-0x8E79	0x3B5A	0x5B5C	# <CJK>
-0x8E7A	0x3B5B	0x65AF	# <CJK>
-0x8E7B	0x3B5C	0x65BD	# <CJK>
-0x8E7C	0x3B5D	0x65E8	# <CJK>
-0x8E7D	0x3B5E	0x679D	# <CJK>
-0x8E7E	0x3B5F	0x6B62	# <CJK>
-0x8E80	0x3B60	0x6B7B	# <CJK>
-0x8E81	0x3B61	0x6C0F	# <CJK>
-0x8E82	0x3B62	0x7345	# <CJK>
-0x8E83	0x3B63	0x7949	# <CJK>
-0x8E84	0x3B64	0x79C1	# <CJK>
-0x8E85	0x3B65	0x7CF8	# <CJK>
-0x8E86	0x3B66	0x7D19	# <CJK>
-0x8E87	0x3B67	0x7D2B	# <CJK>
-0x8E88	0x3B68	0x80A2	# <CJK>
-0x8E89	0x3B69	0x8102	# <CJK>
-0x8E8A	0x3B6A	0x81F3	# <CJK>
-0x8E8B	0x3B6B	0x8996	# <CJK>
-0x8E8C	0x3B6C	0x8A5E	# <CJK>
-0x8E8D	0x3B6D	0x8A69	# <CJK>
-0x8E8E	0x3B6E	0x8A66	# <CJK>
-0x8E8F	0x3B6F	0x8A8C	# <CJK>
-0x8E90	0x3B70	0x8AEE	# <CJK>
-0x8E91	0x3B71	0x8CC7	# <CJK>
-0x8E92	0x3B72	0x8CDC	# <CJK>
-0x8E93	0x3B73	0x96CC	# <CJK>
-0x8E94	0x3B74	0x98FC	# <CJK>
-0x8E95	0x3B75	0x6B6F	# <CJK>
-0x8E96	0x3B76	0x4E8B	# <CJK>
-0x8E97	0x3B77	0x4F3C	# <CJK>
-0x8E98	0x3B78	0x4F8D	# <CJK>
-0x8E99	0x3B79	0x5150	# <CJK>
-0x8E9A	0x3B7A	0x5B57	# <CJK>
-0x8E9B	0x3B7B	0x5BFA	# <CJK>
-0x8E9C	0x3B7C	0x6148	# <CJK>
-0x8E9D	0x3B7D	0x6301	# <CJK>
-0x8E9E	0x3B7E	0x6642	# <CJK>
-0x8E9F	0x3C21	0x6B21	# <CJK>
-0x8EA0	0x3C22	0x6ECB	# <CJK>
-0x8EA1	0x3C23	0x6CBB	# <CJK>
-0x8EA2	0x3C24	0x723E	# <CJK>
-0x8EA3	0x3C25	0x74BD	# <CJK>
-0x8EA4	0x3C26	0x75D4	# <CJK>
-0x8EA5	0x3C27	0x78C1	# <CJK>
-0x8EA6	0x3C28	0x793A	# <CJK>
-0x8EA7	0x3C29	0x800C	# <CJK>
-0x8EA8	0x3C2A	0x8033	# <CJK>
-0x8EA9	0x3C2B	0x81EA	# <CJK>
-0x8EAA	0x3C2C	0x8494	# <CJK>
-0x8EAB	0x3C2D	0x8F9E	# <CJK>
-0x8EAC	0x3C2E	0x6C50	# <CJK>
-0x8EAD	0x3C2F	0x9E7F	# <CJK>
-0x8EAE	0x3C30	0x5F0F	# <CJK>
-0x8EAF	0x3C31	0x8B58	# <CJK>
-0x8EB0	0x3C32	0x9D2B	# <CJK>
-0x8EB1	0x3C33	0x7AFA	# <CJK>
-0x8EB2	0x3C34	0x8EF8	# <CJK>
-0x8EB3	0x3C35	0x5B8D	# <CJK>
-0x8EB4	0x3C36	0x96EB	# <CJK>
-0x8EB5	0x3C37	0x4E03	# <CJK>
-0x8EB6	0x3C38	0x53F1	# <CJK>
-0x8EB7	0x3C39	0x57F7	# <CJK>
-0x8EB8	0x3C3A	0x5931	# <CJK>
-0x8EB9	0x3C3B	0x5AC9	# <CJK>
-0x8EBA	0x3C3C	0x5BA4	# <CJK>
-0x8EBB	0x3C3D	0x6089	# <CJK>
-0x8EBC	0x3C3E	0x6E7F	# <CJK>
-0x8EBD	0x3C3F	0x6F06	# <CJK>
-0x8EBE	0x3C40	0x75BE	# <CJK>
-0x8EBF	0x3C41	0x8CEA	# <CJK>
-0x8EC0	0x3C42	0x5B9F	# <CJK>
-0x8EC1	0x3C43	0x8500	# <CJK>
-0x8EC2	0x3C44	0x7BE0	# <CJK>
-0x8EC3	0x3C45	0x5072	# <CJK>
-0x8EC4	0x3C46	0x67F4	# <CJK>
-0x8EC5	0x3C47	0x829D	# <CJK>
-0x8EC6	0x3C48	0x5C61	# <CJK>
-0x8EC7	0x3C49	0x854A	# <CJK>
-0x8EC8	0x3C4A	0x7E1E	# <CJK>
-0x8EC9	0x3C4B	0x820E	# <CJK>
-0x8ECA	0x3C4C	0x5199	# <CJK>
-0x8ECB	0x3C4D	0x5C04	# <CJK>
-0x8ECC	0x3C4E	0x6368	# <CJK>
-0x8ECD	0x3C4F	0x8D66	# <CJK>
-0x8ECE	0x3C50	0x659C	# <CJK>
-0x8ECF	0x3C51	0x716E	# <CJK>
-0x8ED0	0x3C52	0x793E	# <CJK>
-0x8ED1	0x3C53	0x7D17	# <CJK>
-0x8ED2	0x3C54	0x8005	# <CJK>
-0x8ED3	0x3C55	0x8B1D	# <CJK>
-0x8ED4	0x3C56	0x8ECA	# <CJK>
-0x8ED5	0x3C57	0x906E	# <CJK>
-0x8ED6	0x3C58	0x86C7	# <CJK>
-0x8ED7	0x3C59	0x90AA	# <CJK>
-0x8ED8	0x3C5A	0x501F	# <CJK>
-0x8ED9	0x3C5B	0x52FA	# <CJK>
-0x8EDA	0x3C5C	0x5C3A	# <CJK>
-0x8EDB	0x3C5D	0x6753	# <CJK>
-0x8EDC	0x3C5E	0x707C	# <CJK>
-0x8EDD	0x3C5F	0x7235	# <CJK>
-0x8EDE	0x3C60	0x914C	# <CJK>
-0x8EDF	0x3C61	0x91C8	# <CJK>
-0x8EE0	0x3C62	0x932B	# <CJK>
-0x8EE1	0x3C63	0x82E5	# <CJK>
-0x8EE2	0x3C64	0x5BC2	# <CJK>
-0x8EE3	0x3C65	0x5F31	# <CJK>
-0x8EE4	0x3C66	0x60F9	# <CJK>
-0x8EE5	0x3C67	0x4E3B	# <CJK>
-0x8EE6	0x3C68	0x53D6	# <CJK>
-0x8EE7	0x3C69	0x5B88	# <CJK>
-0x8EE8	0x3C6A	0x624B	# <CJK>
-0x8EE9	0x3C6B	0x6731	# <CJK>
-0x8EEA	0x3C6C	0x6B8A	# <CJK>
-0x8EEB	0x3C6D	0x72E9	# <CJK>
-0x8EEC	0x3C6E	0x73E0	# <CJK>
-0x8EED	0x3C6F	0x7A2E	# <CJK>
-0x8EEE	0x3C70	0x816B	# <CJK>
-0x8EEF	0x3C71	0x8DA3	# <CJK>
-0x8EF0	0x3C72	0x9152	# <CJK>
-0x8EF1	0x3C73	0x9996	# <CJK>
-0x8EF2	0x3C74	0x5112	# <CJK>
-0x8EF3	0x3C75	0x53D7	# <CJK>
-0x8EF4	0x3C76	0x546A	# <CJK>
-0x8EF5	0x3C77	0x5BFF	# <CJK>
-0x8EF6	0x3C78	0x6388	# <CJK>
-0x8EF7	0x3C79	0x6A39	# <CJK>
-0x8EF8	0x3C7A	0x7DAC	# <CJK>
-0x8EF9	0x3C7B	0x9700	# <CJK>
-0x8EFA	0x3C7C	0x56DA	# <CJK>
-0x8EFB	0x3C7D	0x53CE	# <CJK>
-0x8EFC	0x3C7E	0x5468	# <CJK>
-0x8F40	0x3D21	0x5B97	# <CJK>
-0x8F41	0x3D22	0x5C31	# <CJK>
-0x8F42	0x3D23	0x5DDE	# <CJK>
-0x8F43	0x3D24	0x4FEE	# <CJK>
-0x8F44	0x3D25	0x6101	# <CJK>
-0x8F45	0x3D26	0x62FE	# <CJK>
-0x8F46	0x3D27	0x6D32	# <CJK>
-0x8F47	0x3D28	0x79C0	# <CJK>
-0x8F48	0x3D29	0x79CB	# <CJK>
-0x8F49	0x3D2A	0x7D42	# <CJK>
-0x8F4A	0x3D2B	0x7E4D	# <CJK>
-0x8F4B	0x3D2C	0x7FD2	# <CJK>
-0x8F4C	0x3D2D	0x81ED	# <CJK>
-0x8F4D	0x3D2E	0x821F	# <CJK>
-0x8F4E	0x3D2F	0x8490	# <CJK>
-0x8F4F	0x3D30	0x8846	# <CJK>
-0x8F50	0x3D31	0x8972	# <CJK>
-0x8F51	0x3D32	0x8B90	# <CJK>
-0x8F52	0x3D33	0x8E74	# <CJK>
-0x8F53	0x3D34	0x8F2F	# <CJK>
-0x8F54	0x3D35	0x9031	# <CJK>
-0x8F55	0x3D36	0x914B	# <CJK>
-0x8F56	0x3D37	0x916C	# <CJK>
-0x8F57	0x3D38	0x96C6	# <CJK>
-0x8F58	0x3D39	0x919C	# <CJK>
-0x8F59	0x3D3A	0x4EC0	# <CJK>
-0x8F5A	0x3D3B	0x4F4F	# <CJK>
-0x8F5B	0x3D3C	0x5145	# <CJK>
-0x8F5C	0x3D3D	0x5341	# <CJK>
-0x8F5D	0x3D3E	0x5F93	# <CJK>
-0x8F5E	0x3D3F	0x620E	# <CJK>
-0x8F5F	0x3D40	0x67D4	# <CJK>
-0x8F60	0x3D41	0x6C41	# <CJK>
-0x8F61	0x3D42	0x6E0B	# <CJK>
-0x8F62	0x3D43	0x7363	# <CJK>
-0x8F63	0x3D44	0x7E26	# <CJK>
-0x8F64	0x3D45	0x91CD	# <CJK>
-0x8F65	0x3D46	0x9283	# <CJK>
-0x8F66	0x3D47	0x53D4	# <CJK>
-0x8F67	0x3D48	0x5919	# <CJK>
-0x8F68	0x3D49	0x5BBF	# <CJK>
-0x8F69	0x3D4A	0x6DD1	# <CJK>
-0x8F6A	0x3D4B	0x795D	# <CJK>
-0x8F6B	0x3D4C	0x7E2E	# <CJK>
-0x8F6C	0x3D4D	0x7C9B	# <CJK>
-0x8F6D	0x3D4E	0x587E	# <CJK>
-0x8F6E	0x3D4F	0x719F	# <CJK>
-0x8F6F	0x3D50	0x51FA	# <CJK>
-0x8F70	0x3D51	0x8853	# <CJK>
-0x8F71	0x3D52	0x8FF0	# <CJK>
-0x8F72	0x3D53	0x4FCA	# <CJK>
-0x8F73	0x3D54	0x5CFB	# <CJK>
-0x8F74	0x3D55	0x6625	# <CJK>
-0x8F75	0x3D56	0x77AC	# <CJK>
-0x8F76	0x3D57	0x7AE3	# <CJK>
-0x8F77	0x3D58	0x821C	# <CJK>
-0x8F78	0x3D59	0x99FF	# <CJK>
-0x8F79	0x3D5A	0x51C6	# <CJK>
-0x8F7A	0x3D5B	0x5FAA	# <CJK>
-0x8F7B	0x3D5C	0x65EC	# <CJK>
-0x8F7C	0x3D5D	0x696F	# <CJK>
-0x8F7D	0x3D5E	0x6B89	# <CJK>
-0x8F7E	0x3D5F	0x6DF3	# <CJK>
-0x8F80	0x3D60	0x6E96	# <CJK>
-0x8F81	0x3D61	0x6F64	# <CJK>
-0x8F82	0x3D62	0x76FE	# <CJK>
-0x8F83	0x3D63	0x7D14	# <CJK>
-0x8F84	0x3D64	0x5DE1	# <CJK>
-0x8F85	0x3D65	0x9075	# <CJK>
-0x8F86	0x3D66	0x9187	# <CJK>
-0x8F87	0x3D67	0x9806	# <CJK>
-0x8F88	0x3D68	0x51E6	# <CJK>
-0x8F89	0x3D69	0x521D	# <CJK>
-0x8F8A	0x3D6A	0x6240	# <CJK>
-0x8F8B	0x3D6B	0x6691	# <CJK>
-0x8F8C	0x3D6C	0x66D9	# <CJK>
-0x8F8D	0x3D6D	0x6E1A	# <CJK>
-0x8F8E	0x3D6E	0x5EB6	# <CJK>
-0x8F8F	0x3D6F	0x7DD2	# <CJK>
-0x8F90	0x3D70	0x7F72	# <CJK>
-0x8F91	0x3D71	0x66F8	# <CJK>
-0x8F92	0x3D72	0x85AF	# <CJK>
-0x8F93	0x3D73	0x85F7	# <CJK>
-0x8F94	0x3D74	0x8AF8	# <CJK>
-0x8F95	0x3D75	0x52A9	# <CJK>
-0x8F96	0x3D76	0x53D9	# <CJK>
-0x8F97	0x3D77	0x5973	# <CJK>
-0x8F98	0x3D78	0x5E8F	# <CJK>
-0x8F99	0x3D79	0x5F90	# <CJK>
-0x8F9A	0x3D7A	0x6055	# <CJK>
-0x8F9B	0x3D7B	0x92E4	# <CJK>
-0x8F9C	0x3D7C	0x9664	# <CJK>
-0x8F9D	0x3D7D	0x50B7	# <CJK>
-0x8F9E	0x3D7E	0x511F	# <CJK>
-0x8F9F	0x3E21	0x52DD	# <CJK>
-0x8FA0	0x3E22	0x5320	# <CJK>
-0x8FA1	0x3E23	0x5347	# <CJK>
-0x8FA2	0x3E24	0x53EC	# <CJK>
-0x8FA3	0x3E25	0x54E8	# <CJK>
-0x8FA4	0x3E26	0x5546	# <CJK>
-0x8FA5	0x3E27	0x5531	# <CJK>
-0x8FA6	0x3E28	0x5617	# <CJK>
-0x8FA7	0x3E29	0x5968	# <CJK>
-0x8FA8	0x3E2A	0x59BE	# <CJK>
-0x8FA9	0x3E2B	0x5A3C	# <CJK>
-0x8FAA	0x3E2C	0x5BB5	# <CJK>
-0x8FAB	0x3E2D	0x5C06	# <CJK>
-0x8FAC	0x3E2E	0x5C0F	# <CJK>
-0x8FAD	0x3E2F	0x5C11	# <CJK>
-0x8FAE	0x3E30	0x5C1A	# <CJK>
-0x8FAF	0x3E31	0x5E84	# <CJK>
-0x8FB0	0x3E32	0x5E8A	# <CJK>
-0x8FB1	0x3E33	0x5EE0	# <CJK>
-0x8FB2	0x3E34	0x5F70	# <CJK>
-0x8FB3	0x3E35	0x627F	# <CJK>
-0x8FB4	0x3E36	0x6284	# <CJK>
-0x8FB5	0x3E37	0x62DB	# <CJK>
-0x8FB6	0x3E38	0x638C	# <CJK>
-0x8FB7	0x3E39	0x6377	# <CJK>
-0x8FB8	0x3E3A	0x6607	# <CJK>
-0x8FB9	0x3E3B	0x660C	# <CJK>
-0x8FBA	0x3E3C	0x662D	# <CJK>
-0x8FBB	0x3E3D	0x6676	# <CJK>
-0x8FBC	0x3E3E	0x677E	# <CJK>
-0x8FBD	0x3E3F	0x68A2	# <CJK>
-0x8FBE	0x3E40	0x6A1F	# <CJK>
-0x8FBF	0x3E41	0x6A35	# <CJK>
-0x8FC0	0x3E42	0x6CBC	# <CJK>
-0x8FC1	0x3E43	0x6D88	# <CJK>
-0x8FC2	0x3E44	0x6E09	# <CJK>
-0x8FC3	0x3E45	0x6E58	# <CJK>
-0x8FC4	0x3E46	0x713C	# <CJK>
-0x8FC5	0x3E47	0x7126	# <CJK>
-0x8FC6	0x3E48	0x7167	# <CJK>
-0x8FC7	0x3E49	0x75C7	# <CJK>
-0x8FC8	0x3E4A	0x7701	# <CJK>
-0x8FC9	0x3E4B	0x785D	# <CJK>
-0x8FCA	0x3E4C	0x7901	# <CJK>
-0x8FCB	0x3E4D	0x7965	# <CJK>
-0x8FCC	0x3E4E	0x79F0	# <CJK>
-0x8FCD	0x3E4F	0x7AE0	# <CJK>
-0x8FCE	0x3E50	0x7B11	# <CJK>
-0x8FCF	0x3E51	0x7CA7	# <CJK>
-0x8FD0	0x3E52	0x7D39	# <CJK>
-0x8FD1	0x3E53	0x8096	# <CJK>
-0x8FD2	0x3E54	0x83D6	# <CJK>
-0x8FD3	0x3E55	0x848B	# <CJK>
-0x8FD4	0x3E56	0x8549	# <CJK>
-0x8FD5	0x3E57	0x885D	# <CJK>
-0x8FD6	0x3E58	0x88F3	# <CJK>
-0x8FD7	0x3E59	0x8A1F	# <CJK>
-0x8FD8	0x3E5A	0x8A3C	# <CJK>
-0x8FD9	0x3E5B	0x8A54	# <CJK>
-0x8FDA	0x3E5C	0x8A73	# <CJK>
-0x8FDB	0x3E5D	0x8C61	# <CJK>
-0x8FDC	0x3E5E	0x8CDE	# <CJK>
-0x8FDD	0x3E5F	0x91A4	# <CJK>
-0x8FDE	0x3E60	0x9266	# <CJK>
-0x8FDF	0x3E61	0x937E	# <CJK>
-0x8FE0	0x3E62	0x9418	# <CJK>
-0x8FE1	0x3E63	0x969C	# <CJK>
-0x8FE2	0x3E64	0x9798	# <CJK>
-0x8FE3	0x3E65	0x4E0A	# <CJK>
-0x8FE4	0x3E66	0x4E08	# <CJK>
-0x8FE5	0x3E67	0x4E1E	# <CJK>
-0x8FE6	0x3E68	0x4E57	# <CJK>
-0x8FE7	0x3E69	0x5197	# <CJK>
-0x8FE8	0x3E6A	0x5270	# <CJK>
-0x8FE9	0x3E6B	0x57CE	# <CJK>
-0x8FEA	0x3E6C	0x5834	# <CJK>
-0x8FEB	0x3E6D	0x58CC	# <CJK>
-0x8FEC	0x3E6E	0x5B22	# <CJK>
-0x8FED	0x3E6F	0x5E38	# <CJK>
-0x8FEE	0x3E70	0x60C5	# <CJK>
-0x8FEF	0x3E71	0x64FE	# <CJK>
-0x8FF0	0x3E72	0x6761	# <CJK>
-0x8FF1	0x3E73	0x6756	# <CJK>
-0x8FF2	0x3E74	0x6D44	# <CJK>
-0x8FF3	0x3E75	0x72B6	# <CJK>
-0x8FF4	0x3E76	0x7573	# <CJK>
-0x8FF5	0x3E77	0x7A63	# <CJK>
-0x8FF6	0x3E78	0x84B8	# <CJK>
-0x8FF7	0x3E79	0x8B72	# <CJK>
-0x8FF8	0x3E7A	0x91B8	# <CJK>
-0x8FF9	0x3E7B	0x9320	# <CJK>
-0x8FFA	0x3E7C	0x5631	# <CJK>
-0x8FFB	0x3E7D	0x57F4	# <CJK>
-0x8FFC	0x3E7E	0x98FE	# <CJK>
-0x9040	0x3F21	0x62ED	# <CJK>
-0x9041	0x3F22	0x690D	# <CJK>
-0x9042	0x3F23	0x6B96	# <CJK>
-0x9043	0x3F24	0x71ED	# <CJK>
-0x9044	0x3F25	0x7E54	# <CJK>
-0x9045	0x3F26	0x8077	# <CJK>
-0x9046	0x3F27	0x8272	# <CJK>
-0x9047	0x3F28	0x89E6	# <CJK>
-0x9048	0x3F29	0x98DF	# <CJK>
-0x9049	0x3F2A	0x8755	# <CJK>
-0x904A	0x3F2B	0x8FB1	# <CJK>
-0x904B	0x3F2C	0x5C3B	# <CJK>
-0x904C	0x3F2D	0x4F38	# <CJK>
-0x904D	0x3F2E	0x4FE1	# <CJK>
-0x904E	0x3F2F	0x4FB5	# <CJK>
-0x904F	0x3F30	0x5507	# <CJK>
-0x9050	0x3F31	0x5A20	# <CJK>
-0x9051	0x3F32	0x5BDD	# <CJK>
-0x9052	0x3F33	0x5BE9	# <CJK>
-0x9053	0x3F34	0x5FC3	# <CJK>
-0x9054	0x3F35	0x614E	# <CJK>
-0x9055	0x3F36	0x632F	# <CJK>
-0x9056	0x3F37	0x65B0	# <CJK>
-0x9057	0x3F38	0x664B	# <CJK>
-0x9058	0x3F39	0x68EE	# <CJK>
-0x9059	0x3F3A	0x699B	# <CJK>
-0x905A	0x3F3B	0x6D78	# <CJK>
-0x905B	0x3F3C	0x6DF1	# <CJK>
-0x905C	0x3F3D	0x7533	# <CJK>
-0x905D	0x3F3E	0x75B9	# <CJK>
-0x905E	0x3F3F	0x771F	# <CJK>
-0x905F	0x3F40	0x795E	# <CJK>
-0x9060	0x3F41	0x79E6	# <CJK>
-0x9061	0x3F42	0x7D33	# <CJK>
-0x9062	0x3F43	0x81E3	# <CJK>
-0x9063	0x3F44	0x82AF	# <CJK>
-0x9064	0x3F45	0x85AA	# <CJK>
-0x9065	0x3F46	0x89AA	# <CJK>
-0x9066	0x3F47	0x8A3A	# <CJK>
-0x9067	0x3F48	0x8EAB	# <CJK>
-0x9068	0x3F49	0x8F9B	# <CJK>
-0x9069	0x3F4A	0x9032	# <CJK>
-0x906A	0x3F4B	0x91DD	# <CJK>
-0x906B	0x3F4C	0x9707	# <CJK>
-0x906C	0x3F4D	0x4EBA	# <CJK>
-0x906D	0x3F4E	0x4EC1	# <CJK>
-0x906E	0x3F4F	0x5203	# <CJK>
-0x906F	0x3F50	0x5875	# <CJK>
-0x9070	0x3F51	0x58EC	# <CJK>
-0x9071	0x3F52	0x5C0B	# <CJK>
-0x9072	0x3F53	0x751A	# <CJK>
-0x9073	0x3F54	0x5C3D	# <CJK>
-0x9074	0x3F55	0x814E	# <CJK>
-0x9075	0x3F56	0x8A0A	# <CJK>
-0x9076	0x3F57	0x8FC5	# <CJK>
-0x9077	0x3F58	0x9663	# <CJK>
-0x9078	0x3F59	0x976D	# <CJK>
-0x9079	0x3F5A	0x7B25	# <CJK>
-0x907A	0x3F5B	0x8ACF	# <CJK>
-0x907B	0x3F5C	0x9808	# <CJK>
-0x907C	0x3F5D	0x9162	# <CJK>
-0x907D	0x3F5E	0x56F3	# <CJK>
-0x907E	0x3F5F	0x53A8	# <CJK>
-0x9080	0x3F60	0x9017	# <CJK>
-0x9081	0x3F61	0x5439	# <CJK>
-0x9082	0x3F62	0x5782	# <CJK>
-0x9083	0x3F63	0x5E25	# <CJK>
-0x9084	0x3F64	0x63A8	# <CJK>
-0x9085	0x3F65	0x6C34	# <CJK>
-0x9086	0x3F66	0x708A	# <CJK>
-0x9087	0x3F67	0x7761	# <CJK>
-0x9088	0x3F68	0x7C8B	# <CJK>
-0x9089	0x3F69	0x7FE0	# <CJK>
-0x908A	0x3F6A	0x8870	# <CJK>
-0x908B	0x3F6B	0x9042	# <CJK>
-0x908C	0x3F6C	0x9154	# <CJK>
-0x908D	0x3F6D	0x9310	# <CJK>
-0x908E	0x3F6E	0x9318	# <CJK>
-0x908F	0x3F6F	0x968F	# <CJK>
-0x9090	0x3F70	0x745E	# <CJK>
-0x9091	0x3F71	0x9AC4	# <CJK>
-0x9092	0x3F72	0x5D07	# <CJK>
-0x9093	0x3F73	0x5D69	# <CJK>
-0x9094	0x3F74	0x6570	# <CJK>
-0x9095	0x3F75	0x67A2	# <CJK>
-0x9096	0x3F76	0x8DA8	# <CJK>
-0x9097	0x3F77	0x96DB	# <CJK>
-0x9098	0x3F78	0x636E	# <CJK>
-0x9099	0x3F79	0x6749	# <CJK>
-0x909A	0x3F7A	0x6919	# <CJK>
-0x909B	0x3F7B	0x83C5	# <CJK>
-0x909C	0x3F7C	0x9817	# <CJK>
-0x909D	0x3F7D	0x96C0	# <CJK>
-0x909E	0x3F7E	0x88FE	# <CJK>
-0x909F	0x4021	0x6F84	# <CJK>
-0x90A0	0x4022	0x647A	# <CJK>
-0x90A1	0x4023	0x5BF8	# <CJK>
-0x90A2	0x4024	0x4E16	# <CJK>
-0x90A3	0x4025	0x702C	# <CJK>
-0x90A4	0x4026	0x755D	# <CJK>
-0x90A5	0x4027	0x662F	# <CJK>
-0x90A6	0x4028	0x51C4	# <CJK>
-0x90A7	0x4029	0x5236	# <CJK>
-0x90A8	0x402A	0x52E2	# <CJK>
-0x90A9	0x402B	0x59D3	# <CJK>
-0x90AA	0x402C	0x5F81	# <CJK>
-0x90AB	0x402D	0x6027	# <CJK>
-0x90AC	0x402E	0x6210	# <CJK>
-0x90AD	0x402F	0x653F	# <CJK>
-0x90AE	0x4030	0x6574	# <CJK>
-0x90AF	0x4031	0x661F	# <CJK>
-0x90B0	0x4032	0x6674	# <CJK>
-0x90B1	0x4033	0x68F2	# <CJK>
-0x90B2	0x4034	0x6816	# <CJK>
-0x90B3	0x4035	0x6B63	# <CJK>
-0x90B4	0x4036	0x6E05	# <CJK>
-0x90B5	0x4037	0x7272	# <CJK>
-0x90B6	0x4038	0x751F	# <CJK>
-0x90B7	0x4039	0x76DB	# <CJK>
-0x90B8	0x403A	0x7CBE	# <CJK>
-0x90B9	0x403B	0x8056	# <CJK>
-0x90BA	0x403C	0x58F0	# <CJK>
-0x90BB	0x403D	0x88FD	# <CJK>
-0x90BC	0x403E	0x897F	# <CJK>
-0x90BD	0x403F	0x8AA0	# <CJK>
-0x90BE	0x4040	0x8A93	# <CJK>
-0x90BF	0x4041	0x8ACB	# <CJK>
-0x90C0	0x4042	0x901D	# <CJK>
-0x90C1	0x4043	0x9192	# <CJK>
-0x90C2	0x4044	0x9752	# <CJK>
-0x90C3	0x4045	0x9759	# <CJK>
-0x90C4	0x4046	0x6589	# <CJK>
-0x90C5	0x4047	0x7A0E	# <CJK>
-0x90C6	0x4048	0x8106	# <CJK>
-0x90C7	0x4049	0x96BB	# <CJK>
-0x90C8	0x404A	0x5E2D	# <CJK>
-0x90C9	0x404B	0x60DC	# <CJK>
-0x90CA	0x404C	0x621A	# <CJK>
-0x90CB	0x404D	0x65A5	# <CJK>
-0x90CC	0x404E	0x6614	# <CJK>
-0x90CD	0x404F	0x6790	# <CJK>
-0x90CE	0x4050	0x77F3	# <CJK>
-0x90CF	0x4051	0x7A4D	# <CJK>
-0x90D0	0x4052	0x7C4D	# <CJK>
-0x90D1	0x4053	0x7E3E	# <CJK>
-0x90D2	0x4054	0x810A	# <CJK>
-0x90D3	0x4055	0x8CAC	# <CJK>
-0x90D4	0x4056	0x8D64	# <CJK>
-0x90D5	0x4057	0x8DE1	# <CJK>
-0x90D6	0x4058	0x8E5F	# <CJK>
-0x90D7	0x4059	0x78A9	# <CJK>
-0x90D8	0x405A	0x5207	# <CJK>
-0x90D9	0x405B	0x62D9	# <CJK>
-0x90DA	0x405C	0x63A5	# <CJK>
-0x90DB	0x405D	0x6442	# <CJK>
-0x90DC	0x405E	0x6298	# <CJK>
-0x90DD	0x405F	0x8A2D	# <CJK>
-0x90DE	0x4060	0x7A83	# <CJK>
-0x90DF	0x4061	0x7BC0	# <CJK>
-0x90E0	0x4062	0x8AAC	# <CJK>
-0x90E1	0x4063	0x96EA	# <CJK>
-0x90E2	0x4064	0x7D76	# <CJK>
-0x90E3	0x4065	0x820C	# <CJK>
-0x90E4	0x4066	0x8749	# <CJK>
-0x90E5	0x4067	0x4ED9	# <CJK>
-0x90E6	0x4068	0x5148	# <CJK>
-0x90E7	0x4069	0x5343	# <CJK>
-0x90E8	0x406A	0x5360	# <CJK>
-0x90E9	0x406B	0x5BA3	# <CJK>
-0x90EA	0x406C	0x5C02	# <CJK>
-0x90EB	0x406D	0x5C16	# <CJK>
-0x90EC	0x406E	0x5DDD	# <CJK>
-0x90ED	0x406F	0x6226	# <CJK>
-0x90EE	0x4070	0x6247	# <CJK>
-0x90EF	0x4071	0x64B0	# <CJK>
-0x90F0	0x4072	0x6813	# <CJK>
-0x90F1	0x4073	0x6834	# <CJK>
-0x90F2	0x4074	0x6CC9	# <CJK>
-0x90F3	0x4075	0x6D45	# <CJK>
-0x90F4	0x4076	0x6D17	# <CJK>
-0x90F5	0x4077	0x67D3	# <CJK>
-0x90F6	0x4078	0x6F5C	# <CJK>
-0x90F7	0x4079	0x714E	# <CJK>
-0x90F8	0x407A	0x717D	# <CJK>
-0x90F9	0x407B	0x65CB	# <CJK>
-0x90FA	0x407C	0x7A7F	# <CJK>
-0x90FB	0x407D	0x7BAD	# <CJK>
-0x90FC	0x407E	0x7DDA	# <CJK>
-0x9140	0x4121	0x7E4A	# <CJK>
-0x9141	0x4122	0x7FA8	# <CJK>
-0x9142	0x4123	0x817A	# <CJK>
-0x9143	0x4124	0x821B	# <CJK>
-0x9144	0x4125	0x8239	# <CJK>
-0x9145	0x4126	0x85A6	# <CJK>
-0x9146	0x4127	0x8A6E	# <CJK>
-0x9147	0x4128	0x8CCE	# <CJK>
-0x9148	0x4129	0x8DF5	# <CJK>
-0x9149	0x412A	0x9078	# <CJK>
-0x914A	0x412B	0x9077	# <CJK>
-0x914B	0x412C	0x92AD	# <CJK>
-0x914C	0x412D	0x9291	# <CJK>
-0x914D	0x412E	0x9583	# <CJK>
-0x914E	0x412F	0x9BAE	# <CJK>
-0x914F	0x4130	0x524D	# <CJK>
-0x9150	0x4131	0x5584	# <CJK>
-0x9151	0x4132	0x6F38	# <CJK>
-0x9152	0x4133	0x7136	# <CJK>
-0x9153	0x4134	0x5168	# <CJK>
-0x9154	0x4135	0x7985	# <CJK>
-0x9155	0x4136	0x7E55	# <CJK>
-0x9156	0x4137	0x81B3	# <CJK>
-0x9157	0x4138	0x7CCE	# <CJK>
-0x9158	0x4139	0x564C	# <CJK>
-0x9159	0x413A	0x5851	# <CJK>
-0x915A	0x413B	0x5CA8	# <CJK>
-0x915B	0x413C	0x63AA	# <CJK>
-0x915C	0x413D	0x66FE	# <CJK>
-0x915D	0x413E	0x66FD	# <CJK>
-0x915E	0x413F	0x695A	# <CJK>
-0x915F	0x4140	0x72D9	# <CJK>
-0x9160	0x4141	0x758F	# <CJK>
-0x9161	0x4142	0x758E	# <CJK>
-0x9162	0x4143	0x790E	# <CJK>
-0x9163	0x4144	0x7956	# <CJK>
-0x9164	0x4145	0x79DF	# <CJK>
-0x9165	0x4146	0x7C97	# <CJK>
-0x9166	0x4147	0x7D20	# <CJK>
-0x9167	0x4148	0x7D44	# <CJK>
-0x9168	0x4149	0x8607	# <CJK>
-0x9169	0x414A	0x8A34	# <CJK>
-0x916A	0x414B	0x963B	# <CJK>
-0x916B	0x414C	0x9061	# <CJK>
-0x916C	0x414D	0x9F20	# <CJK>
-0x916D	0x414E	0x50E7	# <CJK>
-0x916E	0x414F	0x5275	# <CJK>
-0x916F	0x4150	0x53CC	# <CJK>
-0x9170	0x4151	0x53E2	# <CJK>
-0x9171	0x4152	0x5009	# <CJK>
-0x9172	0x4153	0x55AA	# <CJK>
-0x9173	0x4154	0x58EE	# <CJK>
-0x9174	0x4155	0x594F	# <CJK>
-0x9175	0x4156	0x723D	# <CJK>
-0x9176	0x4157	0x5B8B	# <CJK>
-0x9177	0x4158	0x5C64	# <CJK>
-0x9178	0x4159	0x531D	# <CJK>
-0x9179	0x415A	0x60E3	# <CJK>
-0x917A	0x415B	0x60F3	# <CJK>
-0x917B	0x415C	0x635C	# <CJK>
-0x917C	0x415D	0x6383	# <CJK>
-0x917D	0x415E	0x633F	# <CJK>
-0x917E	0x415F	0x63BB	# <CJK>
-0x9180	0x4160	0x64CD	# <CJK>
-0x9181	0x4161	0x65E9	# <CJK>
-0x9182	0x4162	0x66F9	# <CJK>
-0x9183	0x4163	0x5DE3	# <CJK>
-0x9184	0x4164	0x69CD	# <CJK>
-0x9185	0x4165	0x69FD	# <CJK>
-0x9186	0x4166	0x6F15	# <CJK>
-0x9187	0x4167	0x71E5	# <CJK>
-0x9188	0x4168	0x4E89	# <CJK>
-0x9189	0x4169	0x75E9	# <CJK>
-0x918A	0x416A	0x76F8	# <CJK>
-0x918B	0x416B	0x7A93	# <CJK>
-0x918C	0x416C	0x7CDF	# <CJK>
-0x918D	0x416D	0x7DCF	# <CJK>
-0x918E	0x416E	0x7D9C	# <CJK>
-0x918F	0x416F	0x8061	# <CJK>
-0x9190	0x4170	0x8349	# <CJK>
-0x9191	0x4171	0x8358	# <CJK>
-0x9192	0x4172	0x846C	# <CJK>
-0x9193	0x4173	0x84BC	# <CJK>
-0x9194	0x4174	0x85FB	# <CJK>
-0x9195	0x4175	0x88C5	# <CJK>
-0x9196	0x4176	0x8D70	# <CJK>
-0x9197	0x4177	0x9001	# <CJK>
-0x9198	0x4178	0x906D	# <CJK>
-0x9199	0x4179	0x9397	# <CJK>
-0x919A	0x417A	0x971C	# <CJK>
-0x919B	0x417B	0x9A12	# <CJK>
-0x919C	0x417C	0x50CF	# <CJK>
-0x919D	0x417D	0x5897	# <CJK>
-0x919E	0x417E	0x618E	# <CJK>
-0x919F	0x4221	0x81D3	# <CJK>
-0x91A0	0x4222	0x8535	# <CJK>
-0x91A1	0x4223	0x8D08	# <CJK>
-0x91A2	0x4224	0x9020	# <CJK>
-0x91A3	0x4225	0x4FC3	# <CJK>
-0x91A4	0x4226	0x5074	# <CJK>
-0x91A5	0x4227	0x5247	# <CJK>
-0x91A6	0x4228	0x5373	# <CJK>
-0x91A7	0x4229	0x606F	# <CJK>
-0x91A8	0x422A	0x6349	# <CJK>
-0x91A9	0x422B	0x675F	# <CJK>
-0x91AA	0x422C	0x6E2C	# <CJK>
-0x91AB	0x422D	0x8DB3	# <CJK>
-0x91AC	0x422E	0x901F	# <CJK>
-0x91AD	0x422F	0x4FD7	# <CJK>
-0x91AE	0x4230	0x5C5E	# <CJK>
-0x91AF	0x4231	0x8CCA	# <CJK>
-0x91B0	0x4232	0x65CF	# <CJK>
-0x91B1	0x4233	0x7D9A	# <CJK>
-0x91B2	0x4234	0x5352	# <CJK>
-0x91B3	0x4235	0x8896	# <CJK>
-0x91B4	0x4236	0x5176	# <CJK>
-0x91B5	0x4237	0x63C3	# <CJK>
-0x91B6	0x4238	0x5B58	# <CJK>
-0x91B7	0x4239	0x5B6B	# <CJK>
-0x91B8	0x423A	0x5C0A	# <CJK>
-0x91B9	0x423B	0x640D	# <CJK>
-0x91BA	0x423C	0x6751	# <CJK>
-0x91BB	0x423D	0x905C	# <CJK>
-0x91BC	0x423E	0x4ED6	# <CJK>
-0x91BD	0x423F	0x591A	# <CJK>
-0x91BE	0x4240	0x592A	# <CJK>
-0x91BF	0x4241	0x6C70	# <CJK>
-0x91C0	0x4242	0x8A51	# <CJK>
-0x91C1	0x4243	0x553E	# <CJK>
-0x91C2	0x4244	0x5815	# <CJK>
-0x91C3	0x4245	0x59A5	# <CJK>
-0x91C4	0x4246	0x60F0	# <CJK>
-0x91C5	0x4247	0x6253	# <CJK>
-0x91C6	0x4248	0x67C1	# <CJK>
-0x91C7	0x4249	0x8235	# <CJK>
-0x91C8	0x424A	0x6955	# <CJK>
-0x91C9	0x424B	0x9640	# <CJK>
-0x91CA	0x424C	0x99C4	# <CJK>
-0x91CB	0x424D	0x9A28	# <CJK>
-0x91CC	0x424E	0x4F53	# <CJK>
-0x91CD	0x424F	0x5806	# <CJK>
-0x91CE	0x4250	0x5BFE	# <CJK>
-0x91CF	0x4251	0x8010	# <CJK>
-0x91D0	0x4252	0x5CB1	# <CJK>
-0x91D1	0x4253	0x5E2F	# <CJK>
-0x91D2	0x4254	0x5F85	# <CJK>
-0x91D3	0x4255	0x6020	# <CJK>
-0x91D4	0x4256	0x614B	# <CJK>
-0x91D5	0x4257	0x6234	# <CJK>
-0x91D6	0x4258	0x66FF	# <CJK>
-0x91D7	0x4259	0x6CF0	# <CJK>
-0x91D8	0x425A	0x6EDE	# <CJK>
-0x91D9	0x425B	0x80CE	# <CJK>
-0x91DA	0x425C	0x817F	# <CJK>
-0x91DB	0x425D	0x82D4	# <CJK>
-0x91DC	0x425E	0x888B	# <CJK>
-0x91DD	0x425F	0x8CB8	# <CJK>
-0x91DE	0x4260	0x9000	# <CJK>
-0x91DF	0x4261	0x902E	# <CJK>
-0x91E0	0x4262	0x968A	# <CJK>
-0x91E1	0x4263	0x9EDB	# <CJK>
-0x91E2	0x4264	0x9BDB	# <CJK>
-0x91E3	0x4265	0x4EE3	# <CJK>
-0x91E4	0x4266	0x53F0	# <CJK>
-0x91E5	0x4267	0x5927	# <CJK>
-0x91E6	0x4268	0x7B2C	# <CJK>
-0x91E7	0x4269	0x918D	# <CJK>
-0x91E8	0x426A	0x984C	# <CJK>
-0x91E9	0x426B	0x9DF9	# <CJK>
-0x91EA	0x426C	0x6EDD	# <CJK>
-0x91EB	0x426D	0x7027	# <CJK>
-0x91EC	0x426E	0x5353	# <CJK>
-0x91ED	0x426F	0x5544	# <CJK>
-0x91EE	0x4270	0x5B85	# <CJK>
-0x91EF	0x4271	0x6258	# <CJK>
-0x91F0	0x4272	0x629E	# <CJK>
-0x91F1	0x4273	0x62D3	# <CJK>
-0x91F2	0x4274	0x6CA2	# <CJK>
-0x91F3	0x4275	0x6FEF	# <CJK>
-0x91F4	0x4276	0x7422	# <CJK>
-0x91F5	0x4277	0x8A17	# <CJK>
-0x91F6	0x4278	0x9438	# <CJK>
-0x91F7	0x4279	0x6FC1	# <CJK>
-0x91F8	0x427A	0x8AFE	# <CJK>
-0x91F9	0x427B	0x8338	# <CJK>
-0x91FA	0x427C	0x51E7	# <CJK>
-0x91FB	0x427D	0x86F8	# <CJK>
-0x91FC	0x427E	0x53EA	# <CJK>
-0x9240	0x4321	0x53E9	# <CJK>
-0x9241	0x4322	0x4F46	# <CJK>
-0x9242	0x4323	0x9054	# <CJK>
-0x9243	0x4324	0x8FB0	# <CJK>
-0x9244	0x4325	0x596A	# <CJK>
-0x9245	0x4326	0x8131	# <CJK>
-0x9246	0x4327	0x5DFD	# <CJK>
-0x9247	0x4328	0x7AEA	# <CJK>
-0x9248	0x4329	0x8FBF	# <CJK>
-0x9249	0x432A	0x68DA	# <CJK>
-0x924A	0x432B	0x8C37	# <CJK>
-0x924B	0x432C	0x72F8	# <CJK>
-0x924C	0x432D	0x9C48	# <CJK>
-0x924D	0x432E	0x6A3D	# <CJK>
-0x924E	0x432F	0x8AB0	# <CJK>
-0x924F	0x4330	0x4E39	# <CJK>
-0x9250	0x4331	0x5358	# <CJK>
-0x9251	0x4332	0x5606	# <CJK>
-0x9252	0x4333	0x5766	# <CJK>
-0x9253	0x4334	0x62C5	# <CJK>
-0x9254	0x4335	0x63A2	# <CJK>
-0x9255	0x4336	0x65E6	# <CJK>
-0x9256	0x4337	0x6B4E	# <CJK>
-0x9257	0x4338	0x6DE1	# <CJK>
-0x9258	0x4339	0x6E5B	# <CJK>
-0x9259	0x433A	0x70AD	# <CJK>
-0x925A	0x433B	0x77ED	# <CJK>
-0x925B	0x433C	0x7AEF	# <CJK>
-0x925C	0x433D	0x7BAA	# <CJK>
-0x925D	0x433E	0x7DBB	# <CJK>
-0x925E	0x433F	0x803D	# <CJK>
-0x925F	0x4340	0x80C6	# <CJK>
-0x9260	0x4341	0x86CB	# <CJK>
-0x9261	0x4342	0x8A95	# <CJK>
-0x9262	0x4343	0x935B	# <CJK>
-0x9263	0x4344	0x56E3	# <CJK>
-0x9264	0x4345	0x58C7	# <CJK>
-0x9265	0x4346	0x5F3E	# <CJK>
-0x9266	0x4347	0x65AD	# <CJK>
-0x9267	0x4348	0x6696	# <CJK>
-0x9268	0x4349	0x6A80	# <CJK>
-0x9269	0x434A	0x6BB5	# <CJK>
-0x926A	0x434B	0x7537	# <CJK>
-0x926B	0x434C	0x8AC7	# <CJK>
-0x926C	0x434D	0x5024	# <CJK>
-0x926D	0x434E	0x77E5	# <CJK>
-0x926E	0x434F	0x5730	# <CJK>
-0x926F	0x4350	0x5F1B	# <CJK>
-0x9270	0x4351	0x6065	# <CJK>
-0x9271	0x4352	0x667A	# <CJK>
-0x9272	0x4353	0x6C60	# <CJK>
-0x9273	0x4354	0x75F4	# <CJK>
-0x9274	0x4355	0x7A1A	# <CJK>
-0x9275	0x4356	0x7F6E	# <CJK>
-0x9276	0x4357	0x81F4	# <CJK>
-0x9277	0x4358	0x8718	# <CJK>
-0x9278	0x4359	0x9045	# <CJK>
-0x9279	0x435A	0x99B3	# <CJK>
-0x927A	0x435B	0x7BC9	# <CJK>
-0x927B	0x435C	0x755C	# <CJK>
-0x927C	0x435D	0x7AF9	# <CJK>
-0x927D	0x435E	0x7B51	# <CJK>
-0x927E	0x435F	0x84C4	# <CJK>
-0x9280	0x4360	0x9010	# <CJK>
-0x9281	0x4361	0x79E9	# <CJK>
-0x9282	0x4362	0x7A92	# <CJK>
-0x9283	0x4363	0x8336	# <CJK>
-0x9284	0x4364	0x5AE1	# <CJK>
-0x9285	0x4365	0x7740	# <CJK>
-0x9286	0x4366	0x4E2D	# <CJK>
-0x9287	0x4367	0x4EF2	# <CJK>
-0x9288	0x4368	0x5B99	# <CJK>
-0x9289	0x4369	0x5FE0	# <CJK>
-0x928A	0x436A	0x62BD	# <CJK>
-0x928B	0x436B	0x663C	# <CJK>
-0x928C	0x436C	0x67F1	# <CJK>
-0x928D	0x436D	0x6CE8	# <CJK>
-0x928E	0x436E	0x866B	# <CJK>
-0x928F	0x436F	0x8877	# <CJK>
-0x9290	0x4370	0x8A3B	# <CJK>
-0x9291	0x4371	0x914E	# <CJK>
-0x9292	0x4372	0x92F3	# <CJK>
-0x9293	0x4373	0x99D0	# <CJK>
-0x9294	0x4374	0x6A17	# <CJK>
-0x9295	0x4375	0x7026	# <CJK>
-0x9296	0x4376	0x732A	# <CJK>
-0x9297	0x4377	0x82E7	# <CJK>
-0x9298	0x4378	0x8457	# <CJK>
-0x9299	0x4379	0x8CAF	# <CJK>
-0x929A	0x437A	0x4E01	# <CJK>
-0x929B	0x437B	0x5146	# <CJK>
-0x929C	0x437C	0x51CB	# <CJK>
-0x929D	0x437D	0x558B	# <CJK>
-0x929E	0x437E	0x5BF5	# <CJK>
-0x929F	0x4421	0x5E16	# <CJK>
-0x92A0	0x4422	0x5E33	# <CJK>
-0x92A1	0x4423	0x5E81	# <CJK>
-0x92A2	0x4424	0x5F14	# <CJK>
-0x92A3	0x4425	0x5F35	# <CJK>
-0x92A4	0x4426	0x5F6B	# <CJK>
-0x92A5	0x4427	0x5FB4	# <CJK>
-0x92A6	0x4428	0x61F2	# <CJK>
-0x92A7	0x4429	0x6311	# <CJK>
-0x92A8	0x442A	0x66A2	# <CJK>
-0x92A9	0x442B	0x671D	# <CJK>
-0x92AA	0x442C	0x6F6E	# <CJK>
-0x92AB	0x442D	0x7252	# <CJK>
-0x92AC	0x442E	0x753A	# <CJK>
-0x92AD	0x442F	0x773A	# <CJK>
-0x92AE	0x4430	0x8074	# <CJK>
-0x92AF	0x4431	0x8139	# <CJK>
-0x92B0	0x4432	0x8178	# <CJK>
-0x92B1	0x4433	0x8776	# <CJK>
-0x92B2	0x4434	0x8ABF	# <CJK>
-0x92B3	0x4435	0x8ADC	# <CJK>
-0x92B4	0x4436	0x8D85	# <CJK>
-0x92B5	0x4437	0x8DF3	# <CJK>
-0x92B6	0x4438	0x929A	# <CJK>
-0x92B7	0x4439	0x9577	# <CJK>
-0x92B8	0x443A	0x9802	# <CJK>
-0x92B9	0x443B	0x9CE5	# <CJK>
-0x92BA	0x443C	0x52C5	# <CJK>
-0x92BB	0x443D	0x6357	# <CJK>
-0x92BC	0x443E	0x76F4	# <CJK>
-0x92BD	0x443F	0x6715	# <CJK>
-0x92BE	0x4440	0x6C88	# <CJK>
-0x92BF	0x4441	0x73CD	# <CJK>
-0x92C0	0x4442	0x8CC3	# <CJK>
-0x92C1	0x4443	0x93AE	# <CJK>
-0x92C2	0x4444	0x9673	# <CJK>
-0x92C3	0x4445	0x6D25	# <CJK>
-0x92C4	0x4446	0x589C	# <CJK>
-0x92C5	0x4447	0x690E	# <CJK>
-0x92C6	0x4448	0x69CC	# <CJK>
-0x92C7	0x4449	0x8FFD	# <CJK>
-0x92C8	0x444A	0x939A	# <CJK>
-0x92C9	0x444B	0x75DB	# <CJK>
-0x92CA	0x444C	0x901A	# <CJK>
-0x92CB	0x444D	0x585A	# <CJK>
-0x92CC	0x444E	0x6802	# <CJK>
-0x92CD	0x444F	0x63B4	# <CJK>
-0x92CE	0x4450	0x69FB	# <CJK>
-0x92CF	0x4451	0x4F43	# <CJK>
-0x92D0	0x4452	0x6F2C	# <CJK>
-0x92D1	0x4453	0x67D8	# <CJK>
-0x92D2	0x4454	0x8FBB	# <CJK>
-0x92D3	0x4455	0x8526	# <CJK>
-0x92D4	0x4456	0x7DB4	# <CJK>
-0x92D5	0x4457	0x9354	# <CJK>
-0x92D6	0x4458	0x693F	# <CJK>
-0x92D7	0x4459	0x6F70	# <CJK>
-0x92D8	0x445A	0x576A	# <CJK>
-0x92D9	0x445B	0x58F7	# <CJK>
-0x92DA	0x445C	0x5B2C	# <CJK>
-0x92DB	0x445D	0x7D2C	# <CJK>
-0x92DC	0x445E	0x722A	# <CJK>
-0x92DD	0x445F	0x540A	# <CJK>
-0x92DE	0x4460	0x91E3	# <CJK>
-0x92DF	0x4461	0x9DB4	# <CJK>
-0x92E0	0x4462	0x4EAD	# <CJK>
-0x92E1	0x4463	0x4F4E	# <CJK>
-0x92E2	0x4464	0x505C	# <CJK>
-0x92E3	0x4465	0x5075	# <CJK>
-0x92E4	0x4466	0x5243	# <CJK>
-0x92E5	0x4467	0x8C9E	# <CJK>
-0x92E6	0x4468	0x5448	# <CJK>
-0x92E7	0x4469	0x5824	# <CJK>
-0x92E8	0x446A	0x5B9A	# <CJK>
-0x92E9	0x446B	0x5E1D	# <CJK>
-0x92EA	0x446C	0x5E95	# <CJK>
-0x92EB	0x446D	0x5EAD	# <CJK>
-0x92EC	0x446E	0x5EF7	# <CJK>
-0x92ED	0x446F	0x5F1F	# <CJK>
-0x92EE	0x4470	0x608C	# <CJK>
-0x92EF	0x4471	0x62B5	# <CJK>
-0x92F0	0x4472	0x633A	# <CJK>
-0x92F1	0x4473	0x63D0	# <CJK>
-0x92F2	0x4474	0x68AF	# <CJK>
-0x92F3	0x4475	0x6C40	# <CJK>
-0x92F4	0x4476	0x7887	# <CJK>
-0x92F5	0x4477	0x798E	# <CJK>
-0x92F6	0x4478	0x7A0B	# <CJK>
-0x92F7	0x4479	0x7DE0	# <CJK>
-0x92F8	0x447A	0x8247	# <CJK>
-0x92F9	0x447B	0x8A02	# <CJK>
-0x92FA	0x447C	0x8AE6	# <CJK>
-0x92FB	0x447D	0x8E44	# <CJK>
-0x92FC	0x447E	0x9013	# <CJK>
-0x9340	0x4521	0x90B8	# <CJK>
-0x9341	0x4522	0x912D	# <CJK>
-0x9342	0x4523	0x91D8	# <CJK>
-0x9343	0x4524	0x9F0E	# <CJK>
-0x9344	0x4525	0x6CE5	# <CJK>
-0x9345	0x4526	0x6458	# <CJK>
-0x9346	0x4527	0x64E2	# <CJK>
-0x9347	0x4528	0x6575	# <CJK>
-0x9348	0x4529	0x6EF4	# <CJK>
-0x9349	0x452A	0x7684	# <CJK>
-0x934A	0x452B	0x7B1B	# <CJK>
-0x934B	0x452C	0x9069	# <CJK>
-0x934C	0x452D	0x93D1	# <CJK>
-0x934D	0x452E	0x6EBA	# <CJK>
-0x934E	0x452F	0x54F2	# <CJK>
-0x934F	0x4530	0x5FB9	# <CJK>
-0x9350	0x4531	0x64A4	# <CJK>
-0x9351	0x4532	0x8F4D	# <CJK>
-0x9352	0x4533	0x8FED	# <CJK>
-0x9353	0x4534	0x9244	# <CJK>
-0x9354	0x4535	0x5178	# <CJK>
-0x9355	0x4536	0x586B	# <CJK>
-0x9356	0x4537	0x5929	# <CJK>
-0x9357	0x4538	0x5C55	# <CJK>
-0x9358	0x4539	0x5E97	# <CJK>
-0x9359	0x453A	0x6DFB	# <CJK>
-0x935A	0x453B	0x7E8F	# <CJK>
-0x935B	0x453C	0x751C	# <CJK>
-0x935C	0x453D	0x8CBC	# <CJK>
-0x935D	0x453E	0x8EE2	# <CJK>
-0x935E	0x453F	0x985B	# <CJK>
-0x935F	0x4540	0x70B9	# <CJK>
-0x9360	0x4541	0x4F1D	# <CJK>
-0x9361	0x4542	0x6BBF	# <CJK>
-0x9362	0x4543	0x6FB1	# <CJK>
-0x9363	0x4544	0x7530	# <CJK>
-0x9364	0x4545	0x96FB	# <CJK>
-0x9365	0x4546	0x514E	# <CJK>
-0x9366	0x4547	0x5410	# <CJK>
-0x9367	0x4548	0x5835	# <CJK>
-0x9368	0x4549	0x5857	# <CJK>
-0x9369	0x454A	0x59AC	# <CJK>
-0x936A	0x454B	0x5C60	# <CJK>
-0x936B	0x454C	0x5F92	# <CJK>
-0x936C	0x454D	0x6597	# <CJK>
-0x936D	0x454E	0x675C	# <CJK>
-0x936E	0x454F	0x6E21	# <CJK>
-0x936F	0x4550	0x767B	# <CJK>
-0x9370	0x4551	0x83DF	# <CJK>
-0x9371	0x4552	0x8CED	# <CJK>
-0x9372	0x4553	0x9014	# <CJK>
-0x9373	0x4554	0x90FD	# <CJK>
-0x9374	0x4555	0x934D	# <CJK>
-0x9375	0x4556	0x7825	# <CJK>
-0x9376	0x4557	0x783A	# <CJK>
-0x9377	0x4558	0x52AA	# <CJK>
-0x9378	0x4559	0x5EA6	# <CJK>
-0x9379	0x455A	0x571F	# <CJK>
-0x937A	0x455B	0x5974	# <CJK>
-0x937B	0x455C	0x6012	# <CJK>
-0x937C	0x455D	0x5012	# <CJK>
-0x937D	0x455E	0x515A	# <CJK>
-0x937E	0x455F	0x51AC	# <CJK>
-0x9380	0x4560	0x51CD	# <CJK>
-0x9381	0x4561	0x5200	# <CJK>
-0x9382	0x4562	0x5510	# <CJK>
-0x9383	0x4563	0x5854	# <CJK>
-0x9384	0x4564	0x5858	# <CJK>
-0x9385	0x4565	0x5957	# <CJK>
-0x9386	0x4566	0x5B95	# <CJK>
-0x9387	0x4567	0x5CF6	# <CJK>
-0x9388	0x4568	0x5D8B	# <CJK>
-0x9389	0x4569	0x60BC	# <CJK>
-0x938A	0x456A	0x6295	# <CJK>
-0x938B	0x456B	0x642D	# <CJK>
-0x938C	0x456C	0x6771	# <CJK>
-0x938D	0x456D	0x6843	# <CJK>
-0x938E	0x456E	0x68BC	# <CJK>
-0x938F	0x456F	0x68DF	# <CJK>
-0x9390	0x4570	0x76D7	# <CJK>
-0x9391	0x4571	0x6DD8	# <CJK>
-0x9392	0x4572	0x6E6F	# <CJK>
-0x9393	0x4573	0x6D9B	# <CJK>
-0x9394	0x4574	0x706F	# <CJK>
-0x9395	0x4575	0x71C8	# <CJK>
-0x9396	0x4576	0x5F53	# <CJK>
-0x9397	0x4577	0x75D8	# <CJK>
-0x9398	0x4578	0x7977	# <CJK>
-0x9399	0x4579	0x7B49	# <CJK>
-0x939A	0x457A	0x7B54	# <CJK>
-0x939B	0x457B	0x7B52	# <CJK>
-0x939C	0x457C	0x7CD6	# <CJK>
-0x939D	0x457D	0x7D71	# <CJK>
-0x939E	0x457E	0x5230	# <CJK>
-0x939F	0x4621	0x8463	# <CJK>
-0x93A0	0x4622	0x8569	# <CJK>
-0x93A1	0x4623	0x85E4	# <CJK>
-0x93A2	0x4624	0x8A0E	# <CJK>
-0x93A3	0x4625	0x8B04	# <CJK>
-0x93A4	0x4626	0x8C46	# <CJK>
-0x93A5	0x4627	0x8E0F	# <CJK>
-0x93A6	0x4628	0x9003	# <CJK>
-0x93A7	0x4629	0x900F	# <CJK>
-0x93A8	0x462A	0x9419	# <CJK>
-0x93A9	0x462B	0x9676	# <CJK>
-0x93AA	0x462C	0x982D	# <CJK>
-0x93AB	0x462D	0x9A30	# <CJK>
-0x93AC	0x462E	0x95D8	# <CJK>
-0x93AD	0x462F	0x50CD	# <CJK>
-0x93AE	0x4630	0x52D5	# <CJK>
-0x93AF	0x4631	0x540C	# <CJK>
-0x93B0	0x4632	0x5802	# <CJK>
-0x93B1	0x4633	0x5C0E	# <CJK>
-0x93B2	0x4634	0x61A7	# <CJK>
-0x93B3	0x4635	0x649E	# <CJK>
-0x93B4	0x4636	0x6D1E	# <CJK>
-0x93B5	0x4637	0x77B3	# <CJK>
-0x93B6	0x4638	0x7AE5	# <CJK>
-0x93B7	0x4639	0x80F4	# <CJK>
-0x93B8	0x463A	0x8404	# <CJK>
-0x93B9	0x463B	0x9053	# <CJK>
-0x93BA	0x463C	0x9285	# <CJK>
-0x93BB	0x463D	0x5CE0	# <CJK>
-0x93BC	0x463E	0x9D07	# <CJK>
-0x93BD	0x463F	0x533F	# <CJK>
-0x93BE	0x4640	0x5F97	# <CJK>
-0x93BF	0x4641	0x5FB3	# <CJK>
-0x93C0	0x4642	0x6D9C	# <CJK>
-0x93C1	0x4643	0x7279	# <CJK>
-0x93C2	0x4644	0x7763	# <CJK>
-0x93C3	0x4645	0x79BF	# <CJK>
-0x93C4	0x4646	0x7BE4	# <CJK>
-0x93C5	0x4647	0x6BD2	# <CJK>
-0x93C6	0x4648	0x72EC	# <CJK>
-0x93C7	0x4649	0x8AAD	# <CJK>
-0x93C8	0x464A	0x6803	# <CJK>
-0x93C9	0x464B	0x6A61	# <CJK>
-0x93CA	0x464C	0x51F8	# <CJK>
-0x93CB	0x464D	0x7A81	# <CJK>
-0x93CC	0x464E	0x6934	# <CJK>
-0x93CD	0x464F	0x5C4A	# <CJK>
-0x93CE	0x4650	0x9CF6	# <CJK>
-0x93CF	0x4651	0x82EB	# <CJK>
-0x93D0	0x4652	0x5BC5	# <CJK>
-0x93D1	0x4653	0x9149	# <CJK>
-0x93D2	0x4654	0x701E	# <CJK>
-0x93D3	0x4655	0x5678	# <CJK>
-0x93D4	0x4656	0x5C6F	# <CJK>
-0x93D5	0x4657	0x60C7	# <CJK>
-0x93D6	0x4658	0x6566	# <CJK>
-0x93D7	0x4659	0x6C8C	# <CJK>
-0x93D8	0x465A	0x8C5A	# <CJK>
-0x93D9	0x465B	0x9041	# <CJK>
-0x93DA	0x465C	0x9813	# <CJK>
-0x93DB	0x465D	0x5451	# <CJK>
-0x93DC	0x465E	0x66C7	# <CJK>
-0x93DD	0x465F	0x920D	# <CJK>
-0x93DE	0x4660	0x5948	# <CJK>
-0x93DF	0x4661	0x90A3	# <CJK>
-0x93E0	0x4662	0x5185	# <CJK>
-0x93E1	0x4663	0x4E4D	# <CJK>
-0x93E2	0x4664	0x51EA	# <CJK>
-0x93E3	0x4665	0x8599	# <CJK>
-0x93E4	0x4666	0x8B0E	# <CJK>
-0x93E5	0x4667	0x7058	# <CJK>
-0x93E6	0x4668	0x637A	# <CJK>
-0x93E7	0x4669	0x934B	# <CJK>
-0x93E8	0x466A	0x6962	# <CJK>
-0x93E9	0x466B	0x99B4	# <CJK>
-0x93EA	0x466C	0x7E04	# <CJK>
-0x93EB	0x466D	0x7577	# <CJK>
-0x93EC	0x466E	0x5357	# <CJK>
-0x93ED	0x466F	0x6960	# <CJK>
-0x93EE	0x4670	0x8EDF	# <CJK>
-0x93EF	0x4671	0x96E3	# <CJK>
-0x93F0	0x4672	0x6C5D	# <CJK>
-0x93F1	0x4673	0x4E8C	# <CJK>
-0x93F2	0x4674	0x5C3C	# <CJK>
-0x93F3	0x4675	0x5F10	# <CJK>
-0x93F4	0x4676	0x8FE9	# <CJK>
-0x93F5	0x4677	0x5302	# <CJK>
-0x93F6	0x4678	0x8CD1	# <CJK>
-0x93F7	0x4679	0x8089	# <CJK>
-0x93F8	0x467A	0x8679	# <CJK>
-0x93F9	0x467B	0x5EFF	# <CJK>
-0x93FA	0x467C	0x65E5	# <CJK>
-0x93FB	0x467D	0x4E73	# <CJK>
-0x93FC	0x467E	0x5165	# <CJK>
-0x9440	0x4721	0x5982	# <CJK>
-0x9441	0x4722	0x5C3F	# <CJK>
-0x9442	0x4723	0x97EE	# <CJK>
-0x9443	0x4724	0x4EFB	# <CJK>
-0x9444	0x4725	0x598A	# <CJK>
-0x9445	0x4726	0x5FCD	# <CJK>
-0x9446	0x4727	0x8A8D	# <CJK>
-0x9447	0x4728	0x6FE1	# <CJK>
-0x9448	0x4729	0x79B0	# <CJK>
-0x9449	0x472A	0x7962	# <CJK>
-0x944A	0x472B	0x5BE7	# <CJK>
-0x944B	0x472C	0x8471	# <CJK>
-0x944C	0x472D	0x732B	# <CJK>
-0x944D	0x472E	0x71B1	# <CJK>
-0x944E	0x472F	0x5E74	# <CJK>
-0x944F	0x4730	0x5FF5	# <CJK>
-0x9450	0x4731	0x637B	# <CJK>
-0x9451	0x4732	0x649A	# <CJK>
-0x9452	0x4733	0x71C3	# <CJK>
-0x9453	0x4734	0x7C98	# <CJK>
-0x9454	0x4735	0x4E43	# <CJK>
-0x9455	0x4736	0x5EFC	# <CJK>
-0x9456	0x4737	0x4E4B	# <CJK>
-0x9457	0x4738	0x57DC	# <CJK>
-0x9458	0x4739	0x56A2	# <CJK>
-0x9459	0x473A	0x60A9	# <CJK>
-0x945A	0x473B	0x6FC3	# <CJK>
-0x945B	0x473C	0x7D0D	# <CJK>
-0x945C	0x473D	0x80FD	# <CJK>
-0x945D	0x473E	0x8133	# <CJK>
-0x945E	0x473F	0x81BF	# <CJK>
-0x945F	0x4740	0x8FB2	# <CJK>
-0x9460	0x4741	0x8997	# <CJK>
-0x9461	0x4742	0x86A4	# <CJK>
-0x9462	0x4743	0x5DF4	# <CJK>
-0x9463	0x4744	0x628A	# <CJK>
-0x9464	0x4745	0x64AD	# <CJK>
-0x9465	0x4746	0x8987	# <CJK>
-0x9466	0x4747	0x6777	# <CJK>
-0x9467	0x4748	0x6CE2	# <CJK>
-0x9468	0x4749	0x6D3E	# <CJK>
-0x9469	0x474A	0x7436	# <CJK>
-0x946A	0x474B	0x7834	# <CJK>
-0x946B	0x474C	0x5A46	# <CJK>
-0x946C	0x474D	0x7F75	# <CJK>
-0x946D	0x474E	0x82AD	# <CJK>
-0x946E	0x474F	0x99AC	# <CJK>
-0x946F	0x4750	0x4FF3	# <CJK>
-0x9470	0x4751	0x5EC3	# <CJK>
-0x9471	0x4752	0x62DD	# <CJK>
-0x9472	0x4753	0x6392	# <CJK>
-0x9473	0x4754	0x6557	# <CJK>
-0x9474	0x4755	0x676F	# <CJK>
-0x9475	0x4756	0x76C3	# <CJK>
-0x9476	0x4757	0x724C	# <CJK>
-0x9477	0x4758	0x80CC	# <CJK>
-0x9478	0x4759	0x80BA	# <CJK>
-0x9479	0x475A	0x8F29	# <CJK>
-0x947A	0x475B	0x914D	# <CJK>
-0x947B	0x475C	0x500D	# <CJK>
-0x947C	0x475D	0x57F9	# <CJK>
-0x947D	0x475E	0x5A92	# <CJK>
-0x947E	0x475F	0x6885	# <CJK>
-0x9480	0x4760	0x6973	# <CJK>
-0x9481	0x4761	0x7164	# <CJK>
-0x9482	0x4762	0x72FD	# <CJK>
-0x9483	0x4763	0x8CB7	# <CJK>
-0x9484	0x4764	0x58F2	# <CJK>
-0x9485	0x4765	0x8CE0	# <CJK>
-0x9486	0x4766	0x966A	# <CJK>
-0x9487	0x4767	0x9019	# <CJK>
-0x9488	0x4768	0x877F	# <CJK>
-0x9489	0x4769	0x79E4	# <CJK>
-0x948A	0x476A	0x77E7	# <CJK>
-0x948B	0x476B	0x8429	# <CJK>
-0x948C	0x476C	0x4F2F	# <CJK>
-0x948D	0x476D	0x5265	# <CJK>
-0x948E	0x476E	0x535A	# <CJK>
-0x948F	0x476F	0x62CD	# <CJK>
-0x9490	0x4770	0x67CF	# <CJK>
-0x9491	0x4771	0x6CCA	# <CJK>
-0x9492	0x4772	0x767D	# <CJK>
-0x9493	0x4773	0x7B94	# <CJK>
-0x9494	0x4774	0x7C95	# <CJK>
-0x9495	0x4775	0x8236	# <CJK>
-0x9496	0x4776	0x8584	# <CJK>
-0x9497	0x4777	0x8FEB	# <CJK>
-0x9498	0x4778	0x66DD	# <CJK>
-0x9499	0x4779	0x6F20	# <CJK>
-0x949A	0x477A	0x7206	# <CJK>
-0x949B	0x477B	0x7E1B	# <CJK>
-0x949C	0x477C	0x83AB	# <CJK>
-0x949D	0x477D	0x99C1	# <CJK>
-0x949E	0x477E	0x9EA6	# <CJK>
-0x949F	0x4821	0x51FD	# <CJK>
-0x94A0	0x4822	0x7BB1	# <CJK>
-0x94A1	0x4823	0x7872	# <CJK>
-0x94A2	0x4824	0x7BB8	# <CJK>
-0x94A3	0x4825	0x8087	# <CJK>
-0x94A4	0x4826	0x7B48	# <CJK>
-0x94A5	0x4827	0x6AE8	# <CJK>
-0x94A6	0x4828	0x5E61	# <CJK>
-0x94A7	0x4829	0x808C	# <CJK>
-0x94A8	0x482A	0x7551	# <CJK>
-0x94A9	0x482B	0x7560	# <CJK>
-0x94AA	0x482C	0x516B	# <CJK>
-0x94AB	0x482D	0x9262	# <CJK>
-0x94AC	0x482E	0x6E8C	# <CJK>
-0x94AD	0x482F	0x767A	# <CJK>
-0x94AE	0x4830	0x9197	# <CJK>
-0x94AF	0x4831	0x9AEA	# <CJK>
-0x94B0	0x4832	0x4F10	# <CJK>
-0x94B1	0x4833	0x7F70	# <CJK>
-0x94B2	0x4834	0x629C	# <CJK>
-0x94B3	0x4835	0x7B4F	# <CJK>
-0x94B4	0x4836	0x95A5	# <CJK>
-0x94B5	0x4837	0x9CE9	# <CJK>
-0x94B6	0x4838	0x567A	# <CJK>
-0x94B7	0x4839	0x5859	# <CJK>
-0x94B8	0x483A	0x86E4	# <CJK>
-0x94B9	0x483B	0x96BC	# <CJK>
-0x94BA	0x483C	0x4F34	# <CJK>
-0x94BB	0x483D	0x5224	# <CJK>
-0x94BC	0x483E	0x534A	# <CJK>
-0x94BD	0x483F	0x53CD	# <CJK>
-0x94BE	0x4840	0x53DB	# <CJK>
-0x94BF	0x4841	0x5E06	# <CJK>
-0x94C0	0x4842	0x642C	# <CJK>
-0x94C1	0x4843	0x6591	# <CJK>
-0x94C2	0x4844	0x677F	# <CJK>
-0x94C3	0x4845	0x6C3E	# <CJK>
-0x94C4	0x4846	0x6C4E	# <CJK>
-0x94C5	0x4847	0x7248	# <CJK>
-0x94C6	0x4848	0x72AF	# <CJK>
-0x94C7	0x4849	0x73ED	# <CJK>
-0x94C8	0x484A	0x7554	# <CJK>
-0x94C9	0x484B	0x7E41	# <CJK>
-0x94CA	0x484C	0x822C	# <CJK>
-0x94CB	0x484D	0x85E9	# <CJK>
-0x94CC	0x484E	0x8CA9	# <CJK>
-0x94CD	0x484F	0x7BC4	# <CJK>
-0x94CE	0x4850	0x91C6	# <CJK>
-0x94CF	0x4851	0x7169	# <CJK>
-0x94D0	0x4852	0x9812	# <CJK>
-0x94D1	0x4853	0x98EF	# <CJK>
-0x94D2	0x4854	0x633D	# <CJK>
-0x94D3	0x4855	0x6669	# <CJK>
-0x94D4	0x4856	0x756A	# <CJK>
-0x94D5	0x4857	0x76E4	# <CJK>
-0x94D6	0x4858	0x78D0	# <CJK>
-0x94D7	0x4859	0x8543	# <CJK>
-0x94D8	0x485A	0x86EE	# <CJK>
-0x94D9	0x485B	0x532A	# <CJK>
-0x94DA	0x485C	0x5351	# <CJK>
-0x94DB	0x485D	0x5426	# <CJK>
-0x94DC	0x485E	0x5983	# <CJK>
-0x94DD	0x485F	0x5E87	# <CJK>
-0x94DE	0x4860	0x5F7C	# <CJK>
-0x94DF	0x4861	0x60B2	# <CJK>
-0x94E0	0x4862	0x6249	# <CJK>
-0x94E1	0x4863	0x6279	# <CJK>
-0x94E2	0x4864	0x62AB	# <CJK>
-0x94E3	0x4865	0x6590	# <CJK>
-0x94E4	0x4866	0x6BD4	# <CJK>
-0x94E5	0x4867	0x6CCC	# <CJK>
-0x94E6	0x4868	0x75B2	# <CJK>
-0x94E7	0x4869	0x76AE	# <CJK>
-0x94E8	0x486A	0x7891	# <CJK>
-0x94E9	0x486B	0x79D8	# <CJK>
-0x94EA	0x486C	0x7DCB	# <CJK>
-0x94EB	0x486D	0x7F77	# <CJK>
-0x94EC	0x486E	0x80A5	# <CJK>
-0x94ED	0x486F	0x88AB	# <CJK>
-0x94EE	0x4870	0x8AB9	# <CJK>
-0x94EF	0x4871	0x8CBB	# <CJK>
-0x94F0	0x4872	0x907F	# <CJK>
-0x94F1	0x4873	0x975E	# <CJK>
-0x94F2	0x4874	0x98DB	# <CJK>
-0x94F3	0x4875	0x6A0B	# <CJK>
-0x94F4	0x4876	0x7C38	# <CJK>
-0x94F5	0x4877	0x5099	# <CJK>
-0x94F6	0x4878	0x5C3E	# <CJK>
-0x94F7	0x4879	0x5FAE	# <CJK>
-0x94F8	0x487A	0x6787	# <CJK>
-0x94F9	0x487B	0x6BD8	# <CJK>
-0x94FA	0x487C	0x7435	# <CJK>
-0x94FB	0x487D	0x7709	# <CJK>
-0x94FC	0x487E	0x7F8E	# <CJK>
-0x9540	0x4921	0x9F3B	# <CJK>
-0x9541	0x4922	0x67CA	# <CJK>
-0x9542	0x4923	0x7A17	# <CJK>
-0x9543	0x4924	0x5339	# <CJK>
-0x9544	0x4925	0x758B	# <CJK>
-0x9545	0x4926	0x9AED	# <CJK>
-0x9546	0x4927	0x5F66	# <CJK>
-0x9547	0x4928	0x819D	# <CJK>
-0x9548	0x4929	0x83F1	# <CJK>
-0x9549	0x492A	0x8098	# <CJK>
-0x954A	0x492B	0x5F3C	# <CJK>
-0x954B	0x492C	0x5FC5	# <CJK>
-0x954C	0x492D	0x7562	# <CJK>
-0x954D	0x492E	0x7B46	# <CJK>
-0x954E	0x492F	0x903C	# <CJK>
-0x954F	0x4930	0x6867	# <CJK>
-0x9550	0x4931	0x59EB	# <CJK>
-0x9551	0x4932	0x5A9B	# <CJK>
-0x9552	0x4933	0x7D10	# <CJK>
-0x9553	0x4934	0x767E	# <CJK>
-0x9554	0x4935	0x8B2C	# <CJK>
-0x9555	0x4936	0x4FF5	# <CJK>
-0x9556	0x4937	0x5F6A	# <CJK>
-0x9557	0x4938	0x6A19	# <CJK>
-0x9558	0x4939	0x6C37	# <CJK>
-0x9559	0x493A	0x6F02	# <CJK>
-0x955A	0x493B	0x74E2	# <CJK>
-0x955B	0x493C	0x7968	# <CJK>
-0x955C	0x493D	0x8868	# <CJK>
-0x955D	0x493E	0x8A55	# <CJK>
-0x955E	0x493F	0x8C79	# <CJK>
-0x955F	0x4940	0x5EDF	# <CJK>
-0x9560	0x4941	0x63CF	# <CJK>
-0x9561	0x4942	0x75C5	# <CJK>
-0x9562	0x4943	0x79D2	# <CJK>
-0x9563	0x4944	0x82D7	# <CJK>
-0x9564	0x4945	0x9328	# <CJK>
-0x9565	0x4946	0x92F2	# <CJK>
-0x9566	0x4947	0x849C	# <CJK>
-0x9567	0x4948	0x86ED	# <CJK>
-0x9568	0x4949	0x9C2D	# <CJK>
-0x9569	0x494A	0x54C1	# <CJK>
-0x956A	0x494B	0x5F6C	# <CJK>
-0x956B	0x494C	0x658C	# <CJK>
-0x956C	0x494D	0x6D5C	# <CJK>
-0x956D	0x494E	0x7015	# <CJK>
-0x956E	0x494F	0x8CA7	# <CJK>
-0x956F	0x4950	0x8CD3	# <CJK>
-0x9570	0x4951	0x983B	# <CJK>
-0x9571	0x4952	0x654F	# <CJK>
-0x9572	0x4953	0x74F6	# <CJK>
-0x9573	0x4954	0x4E0D	# <CJK>
-0x9574	0x4955	0x4ED8	# <CJK>
-0x9575	0x4956	0x57E0	# <CJK>
-0x9576	0x4957	0x592B	# <CJK>
-0x9577	0x4958	0x5A66	# <CJK>
-0x9578	0x4959	0x5BCC	# <CJK>
-0x9579	0x495A	0x51A8	# <CJK>
-0x957A	0x495B	0x5E03	# <CJK>
-0x957B	0x495C	0x5E9C	# <CJK>
-0x957C	0x495D	0x6016	# <CJK>
-0x957D	0x495E	0x6276	# <CJK>
-0x957E	0x495F	0x6577	# <CJK>
-0x9580	0x4960	0x65A7	# <CJK>
-0x9581	0x4961	0x666E	# <CJK>
-0x9582	0x4962	0x6D6E	# <CJK>
-0x9583	0x4963	0x7236	# <CJK>
-0x9584	0x4964	0x7B26	# <CJK>
-0x9585	0x4965	0x8150	# <CJK>
-0x9586	0x4966	0x819A	# <CJK>
-0x9587	0x4967	0x8299	# <CJK>
-0x9588	0x4968	0x8B5C	# <CJK>
-0x9589	0x4969	0x8CA0	# <CJK>
-0x958A	0x496A	0x8CE6	# <CJK>
-0x958B	0x496B	0x8D74	# <CJK>
-0x958C	0x496C	0x961C	# <CJK>
-0x958D	0x496D	0x9644	# <CJK>
-0x958E	0x496E	0x4FAE	# <CJK>
-0x958F	0x496F	0x64AB	# <CJK>
-0x9590	0x4970	0x6B66	# <CJK>
-0x9591	0x4971	0x821E	# <CJK>
-0x9592	0x4972	0x8461	# <CJK>
-0x9593	0x4973	0x856A	# <CJK>
-0x9594	0x4974	0x90E8	# <CJK>
-0x9595	0x4975	0x5C01	# <CJK>
-0x9596	0x4976	0x6953	# <CJK>
-0x9597	0x4977	0x98A8	# <CJK>
-0x9598	0x4978	0x847A	# <CJK>
-0x9599	0x4979	0x8557	# <CJK>
-0x959A	0x497A	0x4F0F	# <CJK>
-0x959B	0x497B	0x526F	# <CJK>
-0x959C	0x497C	0x5FA9	# <CJK>
-0x959D	0x497D	0x5E45	# <CJK>
-0x959E	0x497E	0x670D	# <CJK>
-0x959F	0x4A21	0x798F	# <CJK>
-0x95A0	0x4A22	0x8179	# <CJK>
-0x95A1	0x4A23	0x8907	# <CJK>
-0x95A2	0x4A24	0x8986	# <CJK>
-0x95A3	0x4A25	0x6DF5	# <CJK>
-0x95A4	0x4A26	0x5F17	# <CJK>
-0x95A5	0x4A27	0x6255	# <CJK>
-0x95A6	0x4A28	0x6CB8	# <CJK>
-0x95A7	0x4A29	0x4ECF	# <CJK>
-0x95A8	0x4A2A	0x7269	# <CJK>
-0x95A9	0x4A2B	0x9B92	# <CJK>
-0x95AA	0x4A2C	0x5206	# <CJK>
-0x95AB	0x4A2D	0x543B	# <CJK>
-0x95AC	0x4A2E	0x5674	# <CJK>
-0x95AD	0x4A2F	0x58B3	# <CJK>
-0x95AE	0x4A30	0x61A4	# <CJK>
-0x95AF	0x4A31	0x626E	# <CJK>
-0x95B0	0x4A32	0x711A	# <CJK>
-0x95B1	0x4A33	0x596E	# <CJK>
-0x95B2	0x4A34	0x7C89	# <CJK>
-0x95B3	0x4A35	0x7CDE	# <CJK>
-0x95B4	0x4A36	0x7D1B	# <CJK>
-0x95B5	0x4A37	0x96F0	# <CJK>
-0x95B6	0x4A38	0x6587	# <CJK>
-0x95B7	0x4A39	0x805E	# <CJK>
-0x95B8	0x4A3A	0x4E19	# <CJK>
-0x95B9	0x4A3B	0x4F75	# <CJK>
-0x95BA	0x4A3C	0x5175	# <CJK>
-0x95BB	0x4A3D	0x5840	# <CJK>
-0x95BC	0x4A3E	0x5E63	# <CJK>
-0x95BD	0x4A3F	0x5E73	# <CJK>
-0x95BE	0x4A40	0x5F0A	# <CJK>
-0x95BF	0x4A41	0x67C4	# <CJK>
-0x95C0	0x4A42	0x4E26	# <CJK>
-0x95C1	0x4A43	0x853D	# <CJK>
-0x95C2	0x4A44	0x9589	# <CJK>
-0x95C3	0x4A45	0x965B	# <CJK>
-0x95C4	0x4A46	0x7C73	# <CJK>
-0x95C5	0x4A47	0x9801	# <CJK>
-0x95C6	0x4A48	0x50FB	# <CJK>
-0x95C7	0x4A49	0x58C1	# <CJK>
-0x95C8	0x4A4A	0x7656	# <CJK>
-0x95C9	0x4A4B	0x78A7	# <CJK>
-0x95CA	0x4A4C	0x5225	# <CJK>
-0x95CB	0x4A4D	0x77A5	# <CJK>
-0x95CC	0x4A4E	0x8511	# <CJK>
-0x95CD	0x4A4F	0x7B86	# <CJK>
-0x95CE	0x4A50	0x504F	# <CJK>
-0x95CF	0x4A51	0x5909	# <CJK>
-0x95D0	0x4A52	0x7247	# <CJK>
-0x95D1	0x4A53	0x7BC7	# <CJK>
-0x95D2	0x4A54	0x7DE8	# <CJK>
-0x95D3	0x4A55	0x8FBA	# <CJK>
-0x95D4	0x4A56	0x8FD4	# <CJK>
-0x95D5	0x4A57	0x904D	# <CJK>
-0x95D6	0x4A58	0x4FBF	# <CJK>
-0x95D7	0x4A59	0x52C9	# <CJK>
-0x95D8	0x4A5A	0x5A29	# <CJK>
-0x95D9	0x4A5B	0x5F01	# <CJK>
-0x95DA	0x4A5C	0x97AD	# <CJK>
-0x95DB	0x4A5D	0x4FDD	# <CJK>
-0x95DC	0x4A5E	0x8217	# <CJK>
-0x95DD	0x4A5F	0x92EA	# <CJK>
-0x95DE	0x4A60	0x5703	# <CJK>
-0x95DF	0x4A61	0x6355	# <CJK>
-0x95E0	0x4A62	0x6B69	# <CJK>
-0x95E1	0x4A63	0x752B	# <CJK>
-0x95E2	0x4A64	0x88DC	# <CJK>
-0x95E3	0x4A65	0x8F14	# <CJK>
-0x95E4	0x4A66	0x7A42	# <CJK>
-0x95E5	0x4A67	0x52DF	# <CJK>
-0x95E6	0x4A68	0x5893	# <CJK>
-0x95E7	0x4A69	0x6155	# <CJK>
-0x95E8	0x4A6A	0x620A	# <CJK>
-0x95E9	0x4A6B	0x66AE	# <CJK>
-0x95EA	0x4A6C	0x6BCD	# <CJK>
-0x95EB	0x4A6D	0x7C3F	# <CJK>
-0x95EC	0x4A6E	0x83E9	# <CJK>
-0x95ED	0x4A6F	0x5023	# <CJK>
-0x95EE	0x4A70	0x4FF8	# <CJK>
-0x95EF	0x4A71	0x5305	# <CJK>
-0x95F0	0x4A72	0x5446	# <CJK>
-0x95F1	0x4A73	0x5831	# <CJK>
-0x95F2	0x4A74	0x5949	# <CJK>
-0x95F3	0x4A75	0x5B9D	# <CJK>
-0x95F4	0x4A76	0x5CF0	# <CJK>
-0x95F5	0x4A77	0x5CEF	# <CJK>
-0x95F6	0x4A78	0x5D29	# <CJK>
-0x95F7	0x4A79	0x5E96	# <CJK>
-0x95F8	0x4A7A	0x62B1	# <CJK>
-0x95F9	0x4A7B	0x6367	# <CJK>
-0x95FA	0x4A7C	0x653E	# <CJK>
-0x95FB	0x4A7D	0x65B9	# <CJK>
-0x95FC	0x4A7E	0x670B	# <CJK>
-0x9640	0x4B21	0x6CD5	# <CJK>
-0x9641	0x4B22	0x6CE1	# <CJK>
-0x9642	0x4B23	0x70F9	# <CJK>
-0x9643	0x4B24	0x7832	# <CJK>
-0x9644	0x4B25	0x7E2B	# <CJK>
-0x9645	0x4B26	0x80DE	# <CJK>
-0x9646	0x4B27	0x82B3	# <CJK>
-0x9647	0x4B28	0x840C	# <CJK>
-0x9648	0x4B29	0x84EC	# <CJK>
-0x9649	0x4B2A	0x8702	# <CJK>
-0x964A	0x4B2B	0x8912	# <CJK>
-0x964B	0x4B2C	0x8A2A	# <CJK>
-0x964C	0x4B2D	0x8C4A	# <CJK>
-0x964D	0x4B2E	0x90A6	# <CJK>
-0x964E	0x4B2F	0x92D2	# <CJK>
-0x964F	0x4B30	0x98FD	# <CJK>
-0x9650	0x4B31	0x9CF3	# <CJK>
-0x9651	0x4B32	0x9D6C	# <CJK>
-0x9652	0x4B33	0x4E4F	# <CJK>
-0x9653	0x4B34	0x4EA1	# <CJK>
-0x9654	0x4B35	0x508D	# <CJK>
-0x9655	0x4B36	0x5256	# <CJK>
-0x9656	0x4B37	0x574A	# <CJK>
-0x9657	0x4B38	0x59A8	# <CJK>
-0x9658	0x4B39	0x5E3D	# <CJK>
-0x9659	0x4B3A	0x5FD8	# <CJK>
-0x965A	0x4B3B	0x5FD9	# <CJK>
-0x965B	0x4B3C	0x623F	# <CJK>
-0x965C	0x4B3D	0x66B4	# <CJK>
-0x965D	0x4B3E	0x671B	# <CJK>
-0x965E	0x4B3F	0x67D0	# <CJK>
-0x965F	0x4B40	0x68D2	# <CJK>
-0x9660	0x4B41	0x5192	# <CJK>
-0x9661	0x4B42	0x7D21	# <CJK>
-0x9662	0x4B43	0x80AA	# <CJK>
-0x9663	0x4B44	0x81A8	# <CJK>
-0x9664	0x4B45	0x8B00	# <CJK>
-0x9665	0x4B46	0x8C8C	# <CJK>
-0x9666	0x4B47	0x8CBF	# <CJK>
-0x9667	0x4B48	0x927E	# <CJK>
-0x9668	0x4B49	0x9632	# <CJK>
-0x9669	0x4B4A	0x5420	# <CJK>
-0x966A	0x4B4B	0x982C	# <CJK>
-0x966B	0x4B4C	0x5317	# <CJK>
-0x966C	0x4B4D	0x50D5	# <CJK>
-0x966D	0x4B4E	0x535C	# <CJK>
-0x966E	0x4B4F	0x58A8	# <CJK>
-0x966F	0x4B50	0x64B2	# <CJK>
-0x9670	0x4B51	0x6734	# <CJK>
-0x9671	0x4B52	0x7267	# <CJK>
-0x9672	0x4B53	0x7766	# <CJK>
-0x9673	0x4B54	0x7A46	# <CJK>
-0x9674	0x4B55	0x91E6	# <CJK>
-0x9675	0x4B56	0x52C3	# <CJK>
-0x9676	0x4B57	0x6CA1	# <CJK>
-0x9677	0x4B58	0x6B86	# <CJK>
-0x9678	0x4B59	0x5800	# <CJK>
-0x9679	0x4B5A	0x5E4C	# <CJK>
-0x967A	0x4B5B	0x5954	# <CJK>
-0x967B	0x4B5C	0x672C	# <CJK>
-0x967C	0x4B5D	0x7FFB	# <CJK>
-0x967D	0x4B5E	0x51E1	# <CJK>
-0x967E	0x4B5F	0x76C6	# <CJK>
-0x9680	0x4B60	0x6469	# <CJK>
-0x9681	0x4B61	0x78E8	# <CJK>
-0x9682	0x4B62	0x9B54	# <CJK>
-0x9683	0x4B63	0x9EBB	# <CJK>
-0x9684	0x4B64	0x57CB	# <CJK>
-0x9685	0x4B65	0x59B9	# <CJK>
-0x9686	0x4B66	0x6627	# <CJK>
-0x9687	0x4B67	0x679A	# <CJK>
-0x9688	0x4B68	0x6BCE	# <CJK>
-0x9689	0x4B69	0x54E9	# <CJK>
-0x968A	0x4B6A	0x69D9	# <CJK>
-0x968B	0x4B6B	0x5E55	# <CJK>
-0x968C	0x4B6C	0x819C	# <CJK>
-0x968D	0x4B6D	0x6795	# <CJK>
-0x968E	0x4B6E	0x9BAA	# <CJK>
-0x968F	0x4B6F	0x67FE	# <CJK>
-0x9690	0x4B70	0x9C52	# <CJK>
-0x9691	0x4B71	0x685D	# <CJK>
-0x9692	0x4B72	0x4EA6	# <CJK>
-0x9693	0x4B73	0x4FE3	# <CJK>
-0x9694	0x4B74	0x53C8	# <CJK>
-0x9695	0x4B75	0x62B9	# <CJK>
-0x9696	0x4B76	0x672B	# <CJK>
-0x9697	0x4B77	0x6CAB	# <CJK>
-0x9698	0x4B78	0x8FC4	# <CJK>
-0x9699	0x4B79	0x4FAD	# <CJK>
-0x969A	0x4B7A	0x7E6D	# <CJK>
-0x969B	0x4B7B	0x9EBF	# <CJK>
-0x969C	0x4B7C	0x4E07	# <CJK>
-0x969D	0x4B7D	0x6162	# <CJK>
-0x969E	0x4B7E	0x6E80	# <CJK>
-0x969F	0x4C21	0x6F2B	# <CJK>
-0x96A0	0x4C22	0x8513	# <CJK>
-0x96A1	0x4C23	0x5473	# <CJK>
-0x96A2	0x4C24	0x672A	# <CJK>
-0x96A3	0x4C25	0x9B45	# <CJK>
-0x96A4	0x4C26	0x5DF3	# <CJK>
-0x96A5	0x4C27	0x7B95	# <CJK>
-0x96A6	0x4C28	0x5CAC	# <CJK>
-0x96A7	0x4C29	0x5BC6	# <CJK>
-0x96A8	0x4C2A	0x871C	# <CJK>
-0x96A9	0x4C2B	0x6E4A	# <CJK>
-0x96AA	0x4C2C	0x84D1	# <CJK>
-0x96AB	0x4C2D	0x7A14	# <CJK>
-0x96AC	0x4C2E	0x8108	# <CJK>
-0x96AD	0x4C2F	0x5999	# <CJK>
-0x96AE	0x4C30	0x7C8D	# <CJK>
-0x96AF	0x4C31	0x6C11	# <CJK>
-0x96B0	0x4C32	0x7720	# <CJK>
-0x96B1	0x4C33	0x52D9	# <CJK>
-0x96B2	0x4C34	0x5922	# <CJK>
-0x96B3	0x4C35	0x7121	# <CJK>
-0x96B4	0x4C36	0x725F	# <CJK>
-0x96B5	0x4C37	0x77DB	# <CJK>
-0x96B6	0x4C38	0x9727	# <CJK>
-0x96B7	0x4C39	0x9D61	# <CJK>
-0x96B8	0x4C3A	0x690B	# <CJK>
-0x96B9	0x4C3B	0x5A7F	# <CJK>
-0x96BA	0x4C3C	0x5A18	# <CJK>
-0x96BB	0x4C3D	0x51A5	# <CJK>
-0x96BC	0x4C3E	0x540D	# <CJK>
-0x96BD	0x4C3F	0x547D	# <CJK>
-0x96BE	0x4C40	0x660E	# <CJK>
-0x96BF	0x4C41	0x76DF	# <CJK>
-0x96C0	0x4C42	0x8FF7	# <CJK>
-0x96C1	0x4C43	0x9298	# <CJK>
-0x96C2	0x4C44	0x9CF4	# <CJK>
-0x96C3	0x4C45	0x59EA	# <CJK>
-0x96C4	0x4C46	0x725D	# <CJK>
-0x96C5	0x4C47	0x6EC5	# <CJK>
-0x96C6	0x4C48	0x514D	# <CJK>
-0x96C7	0x4C49	0x68C9	# <CJK>
-0x96C8	0x4C4A	0x7DBF	# <CJK>
-0x96C9	0x4C4B	0x7DEC	# <CJK>
-0x96CA	0x4C4C	0x9762	# <CJK>
-0x96CB	0x4C4D	0x9EBA	# <CJK>
-0x96CC	0x4C4E	0x6478	# <CJK>
-0x96CD	0x4C4F	0x6A21	# <CJK>
-0x96CE	0x4C50	0x8302	# <CJK>
-0x96CF	0x4C51	0x5984	# <CJK>
-0x96D0	0x4C52	0x5B5F	# <CJK>
-0x96D1	0x4C53	0x6BDB	# <CJK>
-0x96D2	0x4C54	0x731B	# <CJK>
-0x96D3	0x4C55	0x76F2	# <CJK>
-0x96D4	0x4C56	0x7DB2	# <CJK>
-0x96D5	0x4C57	0x8017	# <CJK>
-0x96D6	0x4C58	0x8499	# <CJK>
-0x96D7	0x4C59	0x5132	# <CJK>
-0x96D8	0x4C5A	0x6728	# <CJK>
-0x96D9	0x4C5B	0x9ED9	# <CJK>
-0x96DA	0x4C5C	0x76EE	# <CJK>
-0x96DB	0x4C5D	0x6762	# <CJK>
-0x96DC	0x4C5E	0x52FF	# <CJK>
-0x96DD	0x4C5F	0x9905	# <CJK>
-0x96DE	0x4C60	0x5C24	# <CJK>
-0x96DF	0x4C61	0x623B	# <CJK>
-0x96E0	0x4C62	0x7C7E	# <CJK>
-0x96E1	0x4C63	0x8CB0	# <CJK>
-0x96E2	0x4C64	0x554F	# <CJK>
-0x96E3	0x4C65	0x60B6	# <CJK>
-0x96E4	0x4C66	0x7D0B	# <CJK>
-0x96E5	0x4C67	0x9580	# <CJK>
-0x96E6	0x4C68	0x5301	# <CJK>
-0x96E7	0x4C69	0x4E5F	# <CJK>
-0x96E8	0x4C6A	0x51B6	# <CJK>
-0x96E9	0x4C6B	0x591C	# <CJK>
-0x96EA	0x4C6C	0x723A	# <CJK>
-0x96EB	0x4C6D	0x8036	# <CJK>
-0x96EC	0x4C6E	0x91CE	# <CJK>
-0x96ED	0x4C6F	0x5F25	# <CJK>
-0x96EE	0x4C70	0x77E2	# <CJK>
-0x96EF	0x4C71	0x5384	# <CJK>
-0x96F0	0x4C72	0x5F79	# <CJK>
-0x96F1	0x4C73	0x7D04	# <CJK>
-0x96F2	0x4C74	0x85AC	# <CJK>
-0x96F3	0x4C75	0x8A33	# <CJK>
-0x96F4	0x4C76	0x8E8D	# <CJK>
-0x96F5	0x4C77	0x9756	# <CJK>
-0x96F6	0x4C78	0x67F3	# <CJK>
-0x96F7	0x4C79	0x85AE	# <CJK>
-0x96F8	0x4C7A	0x9453	# <CJK>
-0x96F9	0x4C7B	0x6109	# <CJK>
-0x96FA	0x4C7C	0x6108	# <CJK>
-0x96FB	0x4C7D	0x6CB9	# <CJK>
-0x96FC	0x4C7E	0x7652	# <CJK>
-0x9740	0x4D21	0x8AED	# <CJK>
-0x9741	0x4D22	0x8F38	# <CJK>
-0x9742	0x4D23	0x552F	# <CJK>
-0x9743	0x4D24	0x4F51	# <CJK>
-0x9744	0x4D25	0x512A	# <CJK>
-0x9745	0x4D26	0x52C7	# <CJK>
-0x9746	0x4D27	0x53CB	# <CJK>
-0x9747	0x4D28	0x5BA5	# <CJK>
-0x9748	0x4D29	0x5E7D	# <CJK>
-0x9749	0x4D2A	0x60A0	# <CJK>
-0x974A	0x4D2B	0x6182	# <CJK>
-0x974B	0x4D2C	0x63D6	# <CJK>
-0x974C	0x4D2D	0x6709	# <CJK>
-0x974D	0x4D2E	0x67DA	# <CJK>
-0x974E	0x4D2F	0x6E67	# <CJK>
-0x974F	0x4D30	0x6D8C	# <CJK>
-0x9750	0x4D31	0x7336	# <CJK>
-0x9751	0x4D32	0x7337	# <CJK>
-0x9752	0x4D33	0x7531	# <CJK>
-0x9753	0x4D34	0x7950	# <CJK>
-0x9754	0x4D35	0x88D5	# <CJK>
-0x9755	0x4D36	0x8A98	# <CJK>
-0x9756	0x4D37	0x904A	# <CJK>
-0x9757	0x4D38	0x9091	# <CJK>
-0x9758	0x4D39	0x90F5	# <CJK>
-0x9759	0x4D3A	0x96C4	# <CJK>
-0x975A	0x4D3B	0x878D	# <CJK>
-0x975B	0x4D3C	0x5915	# <CJK>
-0x975C	0x4D3D	0x4E88	# <CJK>
-0x975D	0x4D3E	0x4F59	# <CJK>
-0x975E	0x4D3F	0x4E0E	# <CJK>
-0x975F	0x4D40	0x8A89	# <CJK>
-0x9760	0x4D41	0x8F3F	# <CJK>
-0x9761	0x4D42	0x9810	# <CJK>
-0x9762	0x4D43	0x50AD	# <CJK>
-0x9763	0x4D44	0x5E7C	# <CJK>
-0x9764	0x4D45	0x5996	# <CJK>
-0x9765	0x4D46	0x5BB9	# <CJK>
-0x9766	0x4D47	0x5EB8	# <CJK>
-0x9767	0x4D48	0x63DA	# <CJK>
-0x9768	0x4D49	0x63FA	# <CJK>
-0x9769	0x4D4A	0x64C1	# <CJK>
-0x976A	0x4D4B	0x66DC	# <CJK>
-0x976B	0x4D4C	0x694A	# <CJK>
-0x976C	0x4D4D	0x69D8	# <CJK>
-0x976D	0x4D4E	0x6D0B	# <CJK>
-0x976E	0x4D4F	0x6EB6	# <CJK>
-0x976F	0x4D50	0x7194	# <CJK>
-0x9770	0x4D51	0x7528	# <CJK>
-0x9771	0x4D52	0x7AAF	# <CJK>
-0x9772	0x4D53	0x7F8A	# <CJK>
-0x9773	0x4D54	0x8000	# <CJK>
-0x9774	0x4D55	0x8449	# <CJK>
-0x9775	0x4D56	0x84C9	# <CJK>
-0x9776	0x4D57	0x8981	# <CJK>
-0x9777	0x4D58	0x8B21	# <CJK>
-0x9778	0x4D59	0x8E0A	# <CJK>
-0x9779	0x4D5A	0x9065	# <CJK>
-0x977A	0x4D5B	0x967D	# <CJK>
-0x977B	0x4D5C	0x990A	# <CJK>
-0x977C	0x4D5D	0x617E	# <CJK>
-0x977D	0x4D5E	0x6291	# <CJK>
-0x977E	0x4D5F	0x6B32	# <CJK>
-0x9780	0x4D60	0x6C83	# <CJK>
-0x9781	0x4D61	0x6D74	# <CJK>
-0x9782	0x4D62	0x7FCC	# <CJK>
-0x9783	0x4D63	0x7FFC	# <CJK>
-0x9784	0x4D64	0x6DC0	# <CJK>
-0x9785	0x4D65	0x7F85	# <CJK>
-0x9786	0x4D66	0x87BA	# <CJK>
-0x9787	0x4D67	0x88F8	# <CJK>
-0x9788	0x4D68	0x6765	# <CJK>
-0x9789	0x4D69	0x83B1	# <CJK>
-0x978A	0x4D6A	0x983C	# <CJK>
-0x978B	0x4D6B	0x96F7	# <CJK>
-0x978C	0x4D6C	0x6D1B	# <CJK>
-0x978D	0x4D6D	0x7D61	# <CJK>
-0x978E	0x4D6E	0x843D	# <CJK>
-0x978F	0x4D6F	0x916A	# <CJK>
-0x9790	0x4D70	0x4E71	# <CJK>
-0x9791	0x4D71	0x5375	# <CJK>
-0x9792	0x4D72	0x5D50	# <CJK>
-0x9793	0x4D73	0x6B04	# <CJK>
-0x9794	0x4D74	0x6FEB	# <CJK>
-0x9795	0x4D75	0x85CD	# <CJK>
-0x9796	0x4D76	0x862D	# <CJK>
-0x9797	0x4D77	0x89A7	# <CJK>
-0x9798	0x4D78	0x5229	# <CJK>
-0x9799	0x4D79	0x540F	# <CJK>
-0x979A	0x4D7A	0x5C65	# <CJK>
-0x979B	0x4D7B	0x674E	# <CJK>
-0x979C	0x4D7C	0x68A8	# <CJK>
-0x979D	0x4D7D	0x7406	# <CJK>
-0x979E	0x4D7E	0x7483	# <CJK>
-0x979F	0x4E21	0x75E2	# <CJK>
-0x97A0	0x4E22	0x88CF	# <CJK>
-0x97A1	0x4E23	0x88E1	# <CJK>
-0x97A2	0x4E24	0x91CC	# <CJK>
-0x97A3	0x4E25	0x96E2	# <CJK>
-0x97A4	0x4E26	0x9678	# <CJK>
-0x97A5	0x4E27	0x5F8B	# <CJK>
-0x97A6	0x4E28	0x7387	# <CJK>
-0x97A7	0x4E29	0x7ACB	# <CJK>
-0x97A8	0x4E2A	0x844E	# <CJK>
-0x97A9	0x4E2B	0x63A0	# <CJK>
-0x97AA	0x4E2C	0x7565	# <CJK>
-0x97AB	0x4E2D	0x5289	# <CJK>
-0x97AC	0x4E2E	0x6D41	# <CJK>
-0x97AD	0x4E2F	0x6E9C	# <CJK>
-0x97AE	0x4E30	0x7409	# <CJK>
-0x97AF	0x4E31	0x7559	# <CJK>
-0x97B0	0x4E32	0x786B	# <CJK>
-0x97B1	0x4E33	0x7C92	# <CJK>
-0x97B2	0x4E34	0x9686	# <CJK>
-0x97B3	0x4E35	0x7ADC	# <CJK>
-0x97B4	0x4E36	0x9F8D	# <CJK>
-0x97B5	0x4E37	0x4FB6	# <CJK>
-0x97B6	0x4E38	0x616E	# <CJK>
-0x97B7	0x4E39	0x65C5	# <CJK>
-0x97B8	0x4E3A	0x865C	# <CJK>
-0x97B9	0x4E3B	0x4E86	# <CJK>
-0x97BA	0x4E3C	0x4EAE	# <CJK>
-0x97BB	0x4E3D	0x50DA	# <CJK>
-0x97BC	0x4E3E	0x4E21	# <CJK>
-0x97BD	0x4E3F	0x51CC	# <CJK>
-0x97BE	0x4E40	0x5BEE	# <CJK>
-0x97BF	0x4E41	0x6599	# <CJK>
-0x97C0	0x4E42	0x6881	# <CJK>
-0x97C1	0x4E43	0x6DBC	# <CJK>
-0x97C2	0x4E44	0x731F	# <CJK>
-0x97C3	0x4E45	0x7642	# <CJK>
-0x97C4	0x4E46	0x77AD	# <CJK>
-0x97C5	0x4E47	0x7A1C	# <CJK>
-0x97C6	0x4E48	0x7CE7	# <CJK>
-0x97C7	0x4E49	0x826F	# <CJK>
-0x97C8	0x4E4A	0x8AD2	# <CJK>
-0x97C9	0x4E4B	0x907C	# <CJK>
-0x97CA	0x4E4C	0x91CF	# <CJK>
-0x97CB	0x4E4D	0x9675	# <CJK>
-0x97CC	0x4E4E	0x9818	# <CJK>
-0x97CD	0x4E4F	0x529B	# <CJK>
-0x97CE	0x4E50	0x7DD1	# <CJK>
-0x97CF	0x4E51	0x502B	# <CJK>
-0x97D0	0x4E52	0x5398	# <CJK>
-0x97D1	0x4E53	0x6797	# <CJK>
-0x97D2	0x4E54	0x6DCB	# <CJK>
-0x97D3	0x4E55	0x71D0	# <CJK>
-0x97D4	0x4E56	0x7433	# <CJK>
-0x97D5	0x4E57	0x81E8	# <CJK>
-0x97D6	0x4E58	0x8F2A	# <CJK>
-0x97D7	0x4E59	0x96A3	# <CJK>
-0x97D8	0x4E5A	0x9C57	# <CJK>
-0x97D9	0x4E5B	0x9E9F	# <CJK>
-0x97DA	0x4E5C	0x7460	# <CJK>
-0x97DB	0x4E5D	0x5841	# <CJK>
-0x97DC	0x4E5E	0x6D99	# <CJK>
-0x97DD	0x4E5F	0x7D2F	# <CJK>
-0x97DE	0x4E60	0x985E	# <CJK>
-0x97DF	0x4E61	0x4EE4	# <CJK>
-0x97E0	0x4E62	0x4F36	# <CJK>
-0x97E1	0x4E63	0x4F8B	# <CJK>
-0x97E2	0x4E64	0x51B7	# <CJK>
-0x97E3	0x4E65	0x52B1	# <CJK>
-0x97E4	0x4E66	0x5DBA	# <CJK>
-0x97E5	0x4E67	0x601C	# <CJK>
-0x97E6	0x4E68	0x73B2	# <CJK>
-0x97E7	0x4E69	0x793C	# <CJK>
-0x97E8	0x4E6A	0x82D3	# <CJK>
-0x97E9	0x4E6B	0x9234	# <CJK>
-0x97EA	0x4E6C	0x96B7	# <CJK>
-0x97EB	0x4E6D	0x96F6	# <CJK>
-0x97EC	0x4E6E	0x970A	# <CJK>
-0x97ED	0x4E6F	0x9E97	# <CJK>
-0x97EE	0x4E70	0x9F62	# <CJK>
-0x97EF	0x4E71	0x66A6	# <CJK>
-0x97F0	0x4E72	0x6B74	# <CJK>
-0x97F1	0x4E73	0x5217	# <CJK>
-0x97F2	0x4E74	0x52A3	# <CJK>
-0x97F3	0x4E75	0x70C8	# <CJK>
-0x97F4	0x4E76	0x88C2	# <CJK>
-0x97F5	0x4E77	0x5EC9	# <CJK>
-0x97F6	0x4E78	0x604B	# <CJK>
-0x97F7	0x4E79	0x6190	# <CJK>
-0x97F8	0x4E7A	0x6F23	# <CJK>
-0x97F9	0x4E7B	0x7149	# <CJK>
-0x97FA	0x4E7C	0x7C3E	# <CJK>
-0x97FB	0x4E7D	0x7DF4	# <CJK>
-0x97FC	0x4E7E	0x806F	# <CJK>
-0x9840	0x4F21	0x84EE	# <CJK>
-0x9841	0x4F22	0x9023	# <CJK>
-0x9842	0x4F23	0x932C	# <CJK>
-0x9843	0x4F24	0x5442	# <CJK>
-0x9844	0x4F25	0x9B6F	# <CJK>
-0x9845	0x4F26	0x6AD3	# <CJK>
-0x9846	0x4F27	0x7089	# <CJK>
-0x9847	0x4F28	0x8CC2	# <CJK>
-0x9848	0x4F29	0x8DEF	# <CJK>
-0x9849	0x4F2A	0x9732	# <CJK>
-0x984A	0x4F2B	0x52B4	# <CJK>
-0x984B	0x4F2C	0x5A41	# <CJK>
-0x984C	0x4F2D	0x5ECA	# <CJK>
-0x984D	0x4F2E	0x5F04	# <CJK>
-0x984E	0x4F2F	0x6717	# <CJK>
-0x984F	0x4F30	0x697C	# <CJK>
-0x9850	0x4F31	0x6994	# <CJK>
-0x9851	0x4F32	0x6D6A	# <CJK>
-0x9852	0x4F33	0x6F0F	# <CJK>
-0x9853	0x4F34	0x7262	# <CJK>
-0x9854	0x4F35	0x72FC	# <CJK>
-0x9855	0x4F36	0x7BED	# <CJK>
-0x9856	0x4F37	0x8001	# <CJK>
-0x9857	0x4F38	0x807E	# <CJK>
-0x9858	0x4F39	0x874B	# <CJK>
-0x9859	0x4F3A	0x90CE	# <CJK>
-0x985A	0x4F3B	0x516D	# <CJK>
-0x985B	0x4F3C	0x9E93	# <CJK>
-0x985C	0x4F3D	0x7984	# <CJK>
-0x985D	0x4F3E	0x808B	# <CJK>
-0x985E	0x4F3F	0x9332	# <CJK>
-0x985F	0x4F40	0x8AD6	# <CJK>
-0x9860	0x4F41	0x502D	# <CJK>
-0x9861	0x4F42	0x548C	# <CJK>
-0x9862	0x4F43	0x8A71	# <CJK>
-0x9863	0x4F44	0x6B6A	# <CJK>
-0x9864	0x4F45	0x8CC4	# <CJK>
-0x9865	0x4F46	0x8107	# <CJK>
-0x9866	0x4F47	0x60D1	# <CJK>
-0x9867	0x4F48	0x67A0	# <CJK>
-0x9868	0x4F49	0x9DF2	# <CJK>
-0x9869	0x4F4A	0x4E99	# <CJK>
-0x986A	0x4F4B	0x4E98	# <CJK>
-0x986B	0x4F4C	0x9C10	# <CJK>
-0x986C	0x4F4D	0x8A6B	# <CJK>
-0x986D	0x4F4E	0x85C1	# <CJK>
-0x986E	0x4F4F	0x8568	# <CJK>
-0x986F	0x4F50	0x6900	# <CJK>
-0x9870	0x4F51	0x6E7E	# <CJK>
-0x9871	0x4F52	0x7897	# <CJK>
-0x9872	0x4F53	0x8155	# <CJK>
-0x989F	0x5021	0x5F0C	# <CJK>
-0x98A0	0x5022	0x4E10	# <CJK>
-0x98A1	0x5023	0x4E15	# <CJK>
-0x98A2	0x5024	0x4E2A	# <CJK>
-0x98A3	0x5025	0x4E31	# <CJK>
-0x98A4	0x5026	0x4E36	# <CJK>
-0x98A5	0x5027	0x4E3C	# <CJK>
-0x98A6	0x5028	0x4E3F	# <CJK>
-0x98A7	0x5029	0x4E42	# <CJK>
-0x98A8	0x502A	0x4E56	# <CJK>
-0x98A9	0x502B	0x4E58	# <CJK>
-0x98AA	0x502C	0x4E82	# <CJK>
-0x98AB	0x502D	0x4E85	# <CJK>
-0x98AC	0x502E	0x8C6B	# <CJK>
-0x98AD	0x502F	0x4E8A	# <CJK>
-0x98AE	0x5030	0x8212	# <CJK>
-0x98AF	0x5031	0x5F0D	# <CJK>
-0x98B0	0x5032	0x4E8E	# <CJK>
-0x98B1	0x5033	0x4E9E	# <CJK>
-0x98B2	0x5034	0x4E9F	# <CJK>
-0x98B3	0x5035	0x4EA0	# <CJK>
-0x98B4	0x5036	0x4EA2	# <CJK>
-0x98B5	0x5037	0x4EB0	# <CJK>
-0x98B6	0x5038	0x4EB3	# <CJK>
-0x98B7	0x5039	0x4EB6	# <CJK>
-0x98B8	0x503A	0x4ECE	# <CJK>
-0x98B9	0x503B	0x4ECD	# <CJK>
-0x98BA	0x503C	0x4EC4	# <CJK>
-0x98BB	0x503D	0x4EC6	# <CJK>
-0x98BC	0x503E	0x4EC2	# <CJK>
-0x98BD	0x503F	0x4ED7	# <CJK>
-0x98BE	0x5040	0x4EDE	# <CJK>
-0x98BF	0x5041	0x4EED	# <CJK>
-0x98C0	0x5042	0x4EDF	# <CJK>
-0x98C1	0x5043	0x4EF7	# <CJK>
-0x98C2	0x5044	0x4F09	# <CJK>
-0x98C3	0x5045	0x4F5A	# <CJK>
-0x98C4	0x5046	0x4F30	# <CJK>
-0x98C5	0x5047	0x4F5B	# <CJK>
-0x98C6	0x5048	0x4F5D	# <CJK>
-0x98C7	0x5049	0x4F57	# <CJK>
-0x98C8	0x504A	0x4F47	# <CJK>
-0x98C9	0x504B	0x4F76	# <CJK>
-0x98CA	0x504C	0x4F88	# <CJK>
-0x98CB	0x504D	0x4F8F	# <CJK>
-0x98CC	0x504E	0x4F98	# <CJK>
-0x98CD	0x504F	0x4F7B	# <CJK>
-0x98CE	0x5050	0x4F69	# <CJK>
-0x98CF	0x5051	0x4F70	# <CJK>
-0x98D0	0x5052	0x4F91	# <CJK>
-0x98D1	0x5053	0x4F6F	# <CJK>
-0x98D2	0x5054	0x4F86	# <CJK>
-0x98D3	0x5055	0x4F96	# <CJK>
-0x98D4	0x5056	0x5118	# <CJK>
-0x98D5	0x5057	0x4FD4	# <CJK>
-0x98D6	0x5058	0x4FDF	# <CJK>
-0x98D7	0x5059	0x4FCE	# <CJK>
-0x98D8	0x505A	0x4FD8	# <CJK>
-0x98D9	0x505B	0x4FDB	# <CJK>
-0x98DA	0x505C	0x4FD1	# <CJK>
-0x98DB	0x505D	0x4FDA	# <CJK>
-0x98DC	0x505E	0x4FD0	# <CJK>
-0x98DD	0x505F	0x4FE4	# <CJK>
-0x98DE	0x5060	0x4FE5	# <CJK>
-0x98DF	0x5061	0x501A	# <CJK>
-0x98E0	0x5062	0x5028	# <CJK>
-0x98E1	0x5063	0x5014	# <CJK>
-0x98E2	0x5064	0x502A	# <CJK>
-0x98E3	0x5065	0x5025	# <CJK>
-0x98E4	0x5066	0x5005	# <CJK>
-0x98E5	0x5067	0x4F1C	# <CJK>
-0x98E6	0x5068	0x4FF6	# <CJK>
-0x98E7	0x5069	0x5021	# <CJK>
-0x98E8	0x506A	0x5029	# <CJK>
-0x98E9	0x506B	0x502C	# <CJK>
-0x98EA	0x506C	0x4FFE	# <CJK>
-0x98EB	0x506D	0x4FEF	# <CJK>
-0x98EC	0x506E	0x5011	# <CJK>
-0x98ED	0x506F	0x5006	# <CJK>
-0x98EE	0x5070	0x5043	# <CJK>
-0x98EF	0x5071	0x5047	# <CJK>
-0x98F0	0x5072	0x6703	# <CJK>
-0x98F1	0x5073	0x5055	# <CJK>
-0x98F2	0x5074	0x5050	# <CJK>
-0x98F3	0x5075	0x5048	# <CJK>
-0x98F4	0x5076	0x505A	# <CJK>
-0x98F5	0x5077	0x5056	# <CJK>
-0x98F6	0x5078	0x506C	# <CJK>
-0x98F7	0x5079	0x5078	# <CJK>
-0x98F8	0x507A	0x5080	# <CJK>
-0x98F9	0x507B	0x509A	# <CJK>
-0x98FA	0x507C	0x5085	# <CJK>
-0x98FB	0x507D	0x50B4	# <CJK>
-0x98FC	0x507E	0x50B2	# <CJK>
-0x9940	0x5121	0x50C9	# <CJK>
-0x9941	0x5122	0x50CA	# <CJK>
-0x9942	0x5123	0x50B3	# <CJK>
-0x9943	0x5124	0x50C2	# <CJK>
-0x9944	0x5125	0x50D6	# <CJK>
-0x9945	0x5126	0x50DE	# <CJK>
-0x9946	0x5127	0x50E5	# <CJK>
-0x9947	0x5128	0x50ED	# <CJK>
-0x9948	0x5129	0x50E3	# <CJK>
-0x9949	0x512A	0x50EE	# <CJK>
-0x994A	0x512B	0x50F9	# <CJK>
-0x994B	0x512C	0x50F5	# <CJK>
-0x994C	0x512D	0x5109	# <CJK>
-0x994D	0x512E	0x5101	# <CJK>
-0x994E	0x512F	0x5102	# <CJK>
-0x994F	0x5130	0x5116	# <CJK>
-0x9950	0x5131	0x5115	# <CJK>
-0x9951	0x5132	0x5114	# <CJK>
-0x9952	0x5133	0x511A	# <CJK>
-0x9953	0x5134	0x5121	# <CJK>
-0x9954	0x5135	0x513A	# <CJK>
-0x9955	0x5136	0x5137	# <CJK>
-0x9956	0x5137	0x513C	# <CJK>
-0x9957	0x5138	0x513B	# <CJK>
-0x9958	0x5139	0x513F	# <CJK>
-0x9959	0x513A	0x5140	# <CJK>
-0x995A	0x513B	0x5152	# <CJK>
-0x995B	0x513C	0x514C	# <CJK>
-0x995C	0x513D	0x5154	# <CJK>
-0x995D	0x513E	0x5162	# <CJK>
-0x995E	0x513F	0x7AF8	# <CJK>
-0x995F	0x5140	0x5169	# <CJK>
-0x9960	0x5141	0x516A	# <CJK>
-0x9961	0x5142	0x516E	# <CJK>
-0x9962	0x5143	0x5180	# <CJK>
-0x9963	0x5144	0x5182	# <CJK>
-0x9964	0x5145	0x56D8	# <CJK>
-0x9965	0x5146	0x518C	# <CJK>
-0x9966	0x5147	0x5189	# <CJK>
-0x9967	0x5148	0x518F	# <CJK>
-0x9968	0x5149	0x5191	# <CJK>
-0x9969	0x514A	0x5193	# <CJK>
-0x996A	0x514B	0x5195	# <CJK>
-0x996B	0x514C	0x5196	# <CJK>
-0x996C	0x514D	0x51A4	# <CJK>
-0x996D	0x514E	0x51A6	# <CJK>
-0x996E	0x514F	0x51A2	# <CJK>
-0x996F	0x5150	0x51A9	# <CJK>
-0x9970	0x5151	0x51AA	# <CJK>
-0x9971	0x5152	0x51AB	# <CJK>
-0x9972	0x5153	0x51B3	# <CJK>
-0x9973	0x5154	0x51B1	# <CJK>
-0x9974	0x5155	0x51B2	# <CJK>
-0x9975	0x5156	0x51B0	# <CJK>
-0x9976	0x5157	0x51B5	# <CJK>
-0x9977	0x5158	0x51BD	# <CJK>
-0x9978	0x5159	0x51C5	# <CJK>
-0x9979	0x515A	0x51C9	# <CJK>
-0x997A	0x515B	0x51DB	# <CJK>
-0x997B	0x515C	0x51E0	# <CJK>
-0x997C	0x515D	0x8655	# <CJK>
-0x997D	0x515E	0x51E9	# <CJK>
-0x997E	0x515F	0x51ED	# <CJK>
-0x9980	0x5160	0x51F0	# <CJK>
-0x9981	0x5161	0x51F5	# <CJK>
-0x9982	0x5162	0x51FE	# <CJK>
-0x9983	0x5163	0x5204	# <CJK>
-0x9984	0x5164	0x520B	# <CJK>
-0x9985	0x5165	0x5214	# <CJK>
-0x9986	0x5166	0x520E	# <CJK>
-0x9987	0x5167	0x5227	# <CJK>
-0x9988	0x5168	0x522A	# <CJK>
-0x9989	0x5169	0x522E	# <CJK>
-0x998A	0x516A	0x5233	# <CJK>
-0x998B	0x516B	0x5239	# <CJK>
-0x998C	0x516C	0x524F	# <CJK>
-0x998D	0x516D	0x5244	# <CJK>
-0x998E	0x516E	0x524B	# <CJK>
-0x998F	0x516F	0x524C	# <CJK>
-0x9990	0x5170	0x525E	# <CJK>
-0x9991	0x5171	0x5254	# <CJK>
-0x9992	0x5172	0x526A	# <CJK>
-0x9993	0x5173	0x5274	# <CJK>
-0x9994	0x5174	0x5269	# <CJK>
-0x9995	0x5175	0x5273	# <CJK>
-0x9996	0x5176	0x527F	# <CJK>
-0x9997	0x5177	0x527D	# <CJK>
-0x9998	0x5178	0x528D	# <CJK>
-0x9999	0x5179	0x5294	# <CJK>
-0x999A	0x517A	0x5292	# <CJK>
-0x999B	0x517B	0x5271	# <CJK>
-0x999C	0x517C	0x5288	# <CJK>
-0x999D	0x517D	0x5291	# <CJK>
-0x999E	0x517E	0x8FA8	# <CJK>
-0x999F	0x5221	0x8FA7	# <CJK>
-0x99A0	0x5222	0x52AC	# <CJK>
-0x99A1	0x5223	0x52AD	# <CJK>
-0x99A2	0x5224	0x52BC	# <CJK>
-0x99A3	0x5225	0x52B5	# <CJK>
-0x99A4	0x5226	0x52C1	# <CJK>
-0x99A5	0x5227	0x52CD	# <CJK>
-0x99A6	0x5228	0x52D7	# <CJK>
-0x99A7	0x5229	0x52DE	# <CJK>
-0x99A8	0x522A	0x52E3	# <CJK>
-0x99A9	0x522B	0x52E6	# <CJK>
-0x99AA	0x522C	0x98ED	# <CJK>
-0x99AB	0x522D	0x52E0	# <CJK>
-0x99AC	0x522E	0x52F3	# <CJK>
-0x99AD	0x522F	0x52F5	# <CJK>
-0x99AE	0x5230	0x52F8	# <CJK>
-0x99AF	0x5231	0x52F9	# <CJK>
-0x99B0	0x5232	0x5306	# <CJK>
-0x99B1	0x5233	0x5308	# <CJK>
-0x99B2	0x5234	0x7538	# <CJK>
-0x99B3	0x5235	0x530D	# <CJK>
-0x99B4	0x5236	0x5310	# <CJK>
-0x99B5	0x5237	0x530F	# <CJK>
-0x99B6	0x5238	0x5315	# <CJK>
-0x99B7	0x5239	0x531A	# <CJK>
-0x99B8	0x523A	0x5323	# <CJK>
-0x99B9	0x523B	0x532F	# <CJK>
-0x99BA	0x523C	0x5331	# <CJK>
-0x99BB	0x523D	0x5333	# <CJK>
-0x99BC	0x523E	0x5338	# <CJK>
-0x99BD	0x523F	0x5340	# <CJK>
-0x99BE	0x5240	0x5346	# <CJK>
-0x99BF	0x5241	0x5345	# <CJK>
-0x99C0	0x5242	0x4E17	# <CJK>
-0x99C1	0x5243	0x5349	# <CJK>
-0x99C2	0x5244	0x534D	# <CJK>
-0x99C3	0x5245	0x51D6	# <CJK>
-0x99C4	0x5246	0x535E	# <CJK>
-0x99C5	0x5247	0x5369	# <CJK>
-0x99C6	0x5248	0x536E	# <CJK>
-0x99C7	0x5249	0x5918	# <CJK>
-0x99C8	0x524A	0x537B	# <CJK>
-0x99C9	0x524B	0x5377	# <CJK>
-0x99CA	0x524C	0x5382	# <CJK>
-0x99CB	0x524D	0x5396	# <CJK>
-0x99CC	0x524E	0x53A0	# <CJK>
-0x99CD	0x524F	0x53A6	# <CJK>
-0x99CE	0x5250	0x53A5	# <CJK>
-0x99CF	0x5251	0x53AE	# <CJK>
-0x99D0	0x5252	0x53B0	# <CJK>
-0x99D1	0x5253	0x53B6	# <CJK>
-0x99D2	0x5254	0x53C3	# <CJK>
-0x99D3	0x5255	0x7C12	# <CJK>
-0x99D4	0x5256	0x96D9	# <CJK>
-0x99D5	0x5257	0x53DF	# <CJK>
-0x99D6	0x5258	0x66FC	# <CJK>
-0x99D7	0x5259	0x71EE	# <CJK>
-0x99D8	0x525A	0x53EE	# <CJK>
-0x99D9	0x525B	0x53E8	# <CJK>
-0x99DA	0x525C	0x53ED	# <CJK>
-0x99DB	0x525D	0x53FA	# <CJK>
-0x99DC	0x525E	0x5401	# <CJK>
-0x99DD	0x525F	0x543D	# <CJK>
-0x99DE	0x5260	0x5440	# <CJK>
-0x99DF	0x5261	0x542C	# <CJK>
-0x99E0	0x5262	0x542D	# <CJK>
-0x99E1	0x5263	0x543C	# <CJK>
-0x99E2	0x5264	0x542E	# <CJK>
-0x99E3	0x5265	0x5436	# <CJK>
-0x99E4	0x5266	0x5429	# <CJK>
-0x99E5	0x5267	0x541D	# <CJK>
-0x99E6	0x5268	0x544E	# <CJK>
-0x99E7	0x5269	0x548F	# <CJK>
-0x99E8	0x526A	0x5475	# <CJK>
-0x99E9	0x526B	0x548E	# <CJK>
-0x99EA	0x526C	0x545F	# <CJK>
-0x99EB	0x526D	0x5471	# <CJK>
-0x99EC	0x526E	0x5477	# <CJK>
-0x99ED	0x526F	0x5470	# <CJK>
-0x99EE	0x5270	0x5492	# <CJK>
-0x99EF	0x5271	0x547B	# <CJK>
-0x99F0	0x5272	0x5480	# <CJK>
-0x99F1	0x5273	0x5476	# <CJK>
-0x99F2	0x5274	0x5484	# <CJK>
-0x99F3	0x5275	0x5490	# <CJK>
-0x99F4	0x5276	0x5486	# <CJK>
-0x99F5	0x5277	0x54C7	# <CJK>
-0x99F6	0x5278	0x54A2	# <CJK>
-0x99F7	0x5279	0x54B8	# <CJK>
-0x99F8	0x527A	0x54A5	# <CJK>
-0x99F9	0x527B	0x54AC	# <CJK>
-0x99FA	0x527C	0x54C4	# <CJK>
-0x99FB	0x527D	0x54C8	# <CJK>
-0x99FC	0x527E	0x54A8	# <CJK>
-0x9A40	0x5321	0x54AB	# <CJK>
-0x9A41	0x5322	0x54C2	# <CJK>
-0x9A42	0x5323	0x54A4	# <CJK>
-0x9A43	0x5324	0x54BE	# <CJK>
-0x9A44	0x5325	0x54BC	# <CJK>
-0x9A45	0x5326	0x54D8	# <CJK>
-0x9A46	0x5327	0x54E5	# <CJK>
-0x9A47	0x5328	0x54E6	# <CJK>
-0x9A48	0x5329	0x550F	# <CJK>
-0x9A49	0x532A	0x5514	# <CJK>
-0x9A4A	0x532B	0x54FD	# <CJK>
-0x9A4B	0x532C	0x54EE	# <CJK>
-0x9A4C	0x532D	0x54ED	# <CJK>
-0x9A4D	0x532E	0x54FA	# <CJK>
-0x9A4E	0x532F	0x54E2	# <CJK>
-0x9A4F	0x5330	0x5539	# <CJK>
-0x9A50	0x5331	0x5540	# <CJK>
-0x9A51	0x5332	0x5563	# <CJK>
-0x9A52	0x5333	0x554C	# <CJK>
-0x9A53	0x5334	0x552E	# <CJK>
-0x9A54	0x5335	0x555C	# <CJK>
-0x9A55	0x5336	0x5545	# <CJK>
-0x9A56	0x5337	0x5556	# <CJK>
-0x9A57	0x5338	0x5557	# <CJK>
-0x9A58	0x5339	0x5538	# <CJK>
-0x9A59	0x533A	0x5533	# <CJK>
-0x9A5A	0x533B	0x555D	# <CJK>
-0x9A5B	0x533C	0x5599	# <CJK>
-0x9A5C	0x533D	0x5580	# <CJK>
-0x9A5D	0x533E	0x54AF	# <CJK>
-0x9A5E	0x533F	0x558A	# <CJK>
-0x9A5F	0x5340	0x559F	# <CJK>
-0x9A60	0x5341	0x557B	# <CJK>
-0x9A61	0x5342	0x557E	# <CJK>
-0x9A62	0x5343	0x5598	# <CJK>
-0x9A63	0x5344	0x559E	# <CJK>
-0x9A64	0x5345	0x55AE	# <CJK>
-0x9A65	0x5346	0x557C	# <CJK>
-0x9A66	0x5347	0x5583	# <CJK>
-0x9A67	0x5348	0x55A9	# <CJK>
-0x9A68	0x5349	0x5587	# <CJK>
-0x9A69	0x534A	0x55A8	# <CJK>
-0x9A6A	0x534B	0x55DA	# <CJK>
-0x9A6B	0x534C	0x55C5	# <CJK>
-0x9A6C	0x534D	0x55DF	# <CJK>
-0x9A6D	0x534E	0x55C4	# <CJK>
-0x9A6E	0x534F	0x55DC	# <CJK>
-0x9A6F	0x5350	0x55E4	# <CJK>
-0x9A70	0x5351	0x55D4	# <CJK>
-0x9A71	0x5352	0x5614	# <CJK>
-0x9A72	0x5353	0x55F7	# <CJK>
-0x9A73	0x5354	0x5616	# <CJK>
-0x9A74	0x5355	0x55FE	# <CJK>
-0x9A75	0x5356	0x55FD	# <CJK>
-0x9A76	0x5357	0x561B	# <CJK>
-0x9A77	0x5358	0x55F9	# <CJK>
-0x9A78	0x5359	0x564E	# <CJK>
-0x9A79	0x535A	0x5650	# <CJK>
-0x9A7A	0x535B	0x71DF	# <CJK>
-0x9A7B	0x535C	0x5634	# <CJK>
-0x9A7C	0x535D	0x5636	# <CJK>
-0x9A7D	0x535E	0x5632	# <CJK>
-0x9A7E	0x535F	0x5638	# <CJK>
-0x9A80	0x5360	0x566B	# <CJK>
-0x9A81	0x5361	0x5664	# <CJK>
-0x9A82	0x5362	0x562F	# <CJK>
-0x9A83	0x5363	0x566C	# <CJK>
-0x9A84	0x5364	0x566A	# <CJK>
-0x9A85	0x5365	0x5686	# <CJK>
-0x9A86	0x5366	0x5680	# <CJK>
-0x9A87	0x5367	0x568A	# <CJK>
-0x9A88	0x5368	0x56A0	# <CJK>
-0x9A89	0x5369	0x5694	# <CJK>
-0x9A8A	0x536A	0x568F	# <CJK>
-0x9A8B	0x536B	0x56A5	# <CJK>
-0x9A8C	0x536C	0x56AE	# <CJK>
-0x9A8D	0x536D	0x56B6	# <CJK>
-0x9A8E	0x536E	0x56B4	# <CJK>
-0x9A8F	0x536F	0x56C2	# <CJK>
-0x9A90	0x5370	0x56BC	# <CJK>
-0x9A91	0x5371	0x56C1	# <CJK>
-0x9A92	0x5372	0x56C3	# <CJK>
-0x9A93	0x5373	0x56C0	# <CJK>
-0x9A94	0x5374	0x56C8	# <CJK>
-0x9A95	0x5375	0x56CE	# <CJK>
-0x9A96	0x5376	0x56D1	# <CJK>
-0x9A97	0x5377	0x56D3	# <CJK>
-0x9A98	0x5378	0x56D7	# <CJK>
-0x9A99	0x5379	0x56EE	# <CJK>
-0x9A9A	0x537A	0x56F9	# <CJK>
-0x9A9B	0x537B	0x5700	# <CJK>
-0x9A9C	0x537C	0x56FF	# <CJK>
-0x9A9D	0x537D	0x5704	# <CJK>
-0x9A9E	0x537E	0x5709	# <CJK>
-0x9A9F	0x5421	0x5708	# <CJK>
-0x9AA0	0x5422	0x570B	# <CJK>
-0x9AA1	0x5423	0x570D	# <CJK>
-0x9AA2	0x5424	0x5713	# <CJK>
-0x9AA3	0x5425	0x5718	# <CJK>
-0x9AA4	0x5426	0x5716	# <CJK>
-0x9AA5	0x5427	0x55C7	# <CJK>
-0x9AA6	0x5428	0x571C	# <CJK>
-0x9AA7	0x5429	0x5726	# <CJK>
-0x9AA8	0x542A	0x5737	# <CJK>
-0x9AA9	0x542B	0x5738	# <CJK>
-0x9AAA	0x542C	0x574E	# <CJK>
-0x9AAB	0x542D	0x573B	# <CJK>
-0x9AAC	0x542E	0x5740	# <CJK>
-0x9AAD	0x542F	0x574F	# <CJK>
-0x9AAE	0x5430	0x5769	# <CJK>
-0x9AAF	0x5431	0x57C0	# <CJK>
-0x9AB0	0x5432	0x5788	# <CJK>
-0x9AB1	0x5433	0x5761	# <CJK>
-0x9AB2	0x5434	0x577F	# <CJK>
-0x9AB3	0x5435	0x5789	# <CJK>
-0x9AB4	0x5436	0x5793	# <CJK>
-0x9AB5	0x5437	0x57A0	# <CJK>
-0x9AB6	0x5438	0x57B3	# <CJK>
-0x9AB7	0x5439	0x57A4	# <CJK>
-0x9AB8	0x543A	0x57AA	# <CJK>
-0x9AB9	0x543B	0x57B0	# <CJK>
-0x9ABA	0x543C	0x57C3	# <CJK>
-0x9ABB	0x543D	0x57C6	# <CJK>
-0x9ABC	0x543E	0x57D4	# <CJK>
-0x9ABD	0x543F	0x57D2	# <CJK>
-0x9ABE	0x5440	0x57D3	# <CJK>
-0x9ABF	0x5441	0x580A	# <CJK>
-0x9AC0	0x5442	0x57D6	# <CJK>
-0x9AC1	0x5443	0x57E3	# <CJK>
-0x9AC2	0x5444	0x580B	# <CJK>
-0x9AC3	0x5445	0x5819	# <CJK>
-0x9AC4	0x5446	0x581D	# <CJK>
-0x9AC5	0x5447	0x5872	# <CJK>
-0x9AC6	0x5448	0x5821	# <CJK>
-0x9AC7	0x5449	0x5862	# <CJK>
-0x9AC8	0x544A	0x584B	# <CJK>
-0x9AC9	0x544B	0x5870	# <CJK>
-0x9ACA	0x544C	0x6BC0	# <CJK>
-0x9ACB	0x544D	0x5852	# <CJK>
-0x9ACC	0x544E	0x583D	# <CJK>
-0x9ACD	0x544F	0x5879	# <CJK>
-0x9ACE	0x5450	0x5885	# <CJK>
-0x9ACF	0x5451	0x58B9	# <CJK>
-0x9AD0	0x5452	0x589F	# <CJK>
-0x9AD1	0x5453	0x58AB	# <CJK>
-0x9AD2	0x5454	0x58BA	# <CJK>
-0x9AD3	0x5455	0x58DE	# <CJK>
-0x9AD4	0x5456	0x58BB	# <CJK>
-0x9AD5	0x5457	0x58B8	# <CJK>
-0x9AD6	0x5458	0x58AE	# <CJK>
-0x9AD7	0x5459	0x58C5	# <CJK>
-0x9AD8	0x545A	0x58D3	# <CJK>
-0x9AD9	0x545B	0x58D1	# <CJK>
-0x9ADA	0x545C	0x58D7	# <CJK>
-0x9ADB	0x545D	0x58D9	# <CJK>
-0x9ADC	0x545E	0x58D8	# <CJK>
-0x9ADD	0x545F	0x58E5	# <CJK>
-0x9ADE	0x5460	0x58DC	# <CJK>
-0x9ADF	0x5461	0x58E4	# <CJK>
-0x9AE0	0x5462	0x58DF	# <CJK>
-0x9AE1	0x5463	0x58EF	# <CJK>
-0x9AE2	0x5464	0x58FA	# <CJK>
-0x9AE3	0x5465	0x58F9	# <CJK>
-0x9AE4	0x5466	0x58FB	# <CJK>
-0x9AE5	0x5467	0x58FC	# <CJK>
-0x9AE6	0x5468	0x58FD	# <CJK>
-0x9AE7	0x5469	0x5902	# <CJK>
-0x9AE8	0x546A	0x590A	# <CJK>
-0x9AE9	0x546B	0x5910	# <CJK>
-0x9AEA	0x546C	0x591B	# <CJK>
-0x9AEB	0x546D	0x68A6	# <CJK>
-0x9AEC	0x546E	0x5925	# <CJK>
-0x9AED	0x546F	0x592C	# <CJK>
-0x9AEE	0x5470	0x592D	# <CJK>
-0x9AEF	0x5471	0x5932	# <CJK>
-0x9AF0	0x5472	0x5938	# <CJK>
-0x9AF1	0x5473	0x593E	# <CJK>
-0x9AF2	0x5474	0x7AD2	# <CJK>
-0x9AF3	0x5475	0x5955	# <CJK>
-0x9AF4	0x5476	0x5950	# <CJK>
-0x9AF5	0x5477	0x594E	# <CJK>
-0x9AF6	0x5478	0x595A	# <CJK>
-0x9AF7	0x5479	0x5958	# <CJK>
-0x9AF8	0x547A	0x5962	# <CJK>
-0x9AF9	0x547B	0x5960	# <CJK>
-0x9AFA	0x547C	0x5967	# <CJK>
-0x9AFB	0x547D	0x596C	# <CJK>
-0x9AFC	0x547E	0x5969	# <CJK>
-0x9B40	0x5521	0x5978	# <CJK>
-0x9B41	0x5522	0x5981	# <CJK>
-0x9B42	0x5523	0x599D	# <CJK>
-0x9B43	0x5524	0x4F5E	# <CJK>
-0x9B44	0x5525	0x4FAB	# <CJK>
-0x9B45	0x5526	0x59A3	# <CJK>
-0x9B46	0x5527	0x59B2	# <CJK>
-0x9B47	0x5528	0x59C6	# <CJK>
-0x9B48	0x5529	0x59E8	# <CJK>
-0x9B49	0x552A	0x59DC	# <CJK>
-0x9B4A	0x552B	0x598D	# <CJK>
-0x9B4B	0x552C	0x59D9	# <CJK>
-0x9B4C	0x552D	0x59DA	# <CJK>
-0x9B4D	0x552E	0x5A25	# <CJK>
-0x9B4E	0x552F	0x5A1F	# <CJK>
-0x9B4F	0x5530	0x5A11	# <CJK>
-0x9B50	0x5531	0x5A1C	# <CJK>
-0x9B51	0x5532	0x5A09	# <CJK>
-0x9B52	0x5533	0x5A1A	# <CJK>
-0x9B53	0x5534	0x5A40	# <CJK>
-0x9B54	0x5535	0x5A6C	# <CJK>
-0x9B55	0x5536	0x5A49	# <CJK>
-0x9B56	0x5537	0x5A35	# <CJK>
-0x9B57	0x5538	0x5A36	# <CJK>
-0x9B58	0x5539	0x5A62	# <CJK>
-0x9B59	0x553A	0x5A6A	# <CJK>
-0x9B5A	0x553B	0x5A9A	# <CJK>
-0x9B5B	0x553C	0x5ABC	# <CJK>
-0x9B5C	0x553D	0x5ABE	# <CJK>
-0x9B5D	0x553E	0x5ACB	# <CJK>
-0x9B5E	0x553F	0x5AC2	# <CJK>
-0x9B5F	0x5540	0x5ABD	# <CJK>
-0x9B60	0x5541	0x5AE3	# <CJK>
-0x9B61	0x5542	0x5AD7	# <CJK>
-0x9B62	0x5543	0x5AE6	# <CJK>
-0x9B63	0x5544	0x5AE9	# <CJK>
-0x9B64	0x5545	0x5AD6	# <CJK>
-0x9B65	0x5546	0x5AFA	# <CJK>
-0x9B66	0x5547	0x5AFB	# <CJK>
-0x9B67	0x5548	0x5B0C	# <CJK>
-0x9B68	0x5549	0x5B0B	# <CJK>
-0x9B69	0x554A	0x5B16	# <CJK>
-0x9B6A	0x554B	0x5B32	# <CJK>
-0x9B6B	0x554C	0x5AD0	# <CJK>
-0x9B6C	0x554D	0x5B2A	# <CJK>
-0x9B6D	0x554E	0x5B36	# <CJK>
-0x9B6E	0x554F	0x5B3E	# <CJK>
-0x9B6F	0x5550	0x5B43	# <CJK>
-0x9B70	0x5551	0x5B45	# <CJK>
-0x9B71	0x5552	0x5B40	# <CJK>
-0x9B72	0x5553	0x5B51	# <CJK>
-0x9B73	0x5554	0x5B55	# <CJK>
-0x9B74	0x5555	0x5B5A	# <CJK>
-0x9B75	0x5556	0x5B5B	# <CJK>
-0x9B76	0x5557	0x5B65	# <CJK>
-0x9B77	0x5558	0x5B69	# <CJK>
-0x9B78	0x5559	0x5B70	# <CJK>
-0x9B79	0x555A	0x5B73	# <CJK>
-0x9B7A	0x555B	0x5B75	# <CJK>
-0x9B7B	0x555C	0x5B78	# <CJK>
-0x9B7C	0x555D	0x6588	# <CJK>
-0x9B7D	0x555E	0x5B7A	# <CJK>
-0x9B7E	0x555F	0x5B80	# <CJK>
-0x9B80	0x5560	0x5B83	# <CJK>
-0x9B81	0x5561	0x5BA6	# <CJK>
-0x9B82	0x5562	0x5BB8	# <CJK>
-0x9B83	0x5563	0x5BC3	# <CJK>
-0x9B84	0x5564	0x5BC7	# <CJK>
-0x9B85	0x5565	0x5BC9	# <CJK>
-0x9B86	0x5566	0x5BD4	# <CJK>
-0x9B87	0x5567	0x5BD0	# <CJK>
-0x9B88	0x5568	0x5BE4	# <CJK>
-0x9B89	0x5569	0x5BE6	# <CJK>
-0x9B8A	0x556A	0x5BE2	# <CJK>
-0x9B8B	0x556B	0x5BDE	# <CJK>
-0x9B8C	0x556C	0x5BE5	# <CJK>
-0x9B8D	0x556D	0x5BEB	# <CJK>
-0x9B8E	0x556E	0x5BF0	# <CJK>
-0x9B8F	0x556F	0x5BF6	# <CJK>
-0x9B90	0x5570	0x5BF3	# <CJK>
-0x9B91	0x5571	0x5C05	# <CJK>
-0x9B92	0x5572	0x5C07	# <CJK>
-0x9B93	0x5573	0x5C08	# <CJK>
-0x9B94	0x5574	0x5C0D	# <CJK>
-0x9B95	0x5575	0x5C13	# <CJK>
-0x9B96	0x5576	0x5C20	# <CJK>
-0x9B97	0x5577	0x5C22	# <CJK>
-0x9B98	0x5578	0x5C28	# <CJK>
-0x9B99	0x5579	0x5C38	# <CJK>
-0x9B9A	0x557A	0x5C39	# <CJK>
-0x9B9B	0x557B	0x5C41	# <CJK>
-0x9B9C	0x557C	0x5C46	# <CJK>
-0x9B9D	0x557D	0x5C4E	# <CJK>
-0x9B9E	0x557E	0x5C53	# <CJK>
-0x9B9F	0x5621	0x5C50	# <CJK>
-0x9BA0	0x5622	0x5C4F	# <CJK>
-0x9BA1	0x5623	0x5B71	# <CJK>
-0x9BA2	0x5624	0x5C6C	# <CJK>
-0x9BA3	0x5625	0x5C6E	# <CJK>
-0x9BA4	0x5626	0x4E62	# <CJK>
-0x9BA5	0x5627	0x5C76	# <CJK>
-0x9BA6	0x5628	0x5C79	# <CJK>
-0x9BA7	0x5629	0x5C8C	# <CJK>
-0x9BA8	0x562A	0x5C91	# <CJK>
-0x9BA9	0x562B	0x5C94	# <CJK>
-0x9BAA	0x562C	0x599B	# <CJK>
-0x9BAB	0x562D	0x5CAB	# <CJK>
-0x9BAC	0x562E	0x5CBB	# <CJK>
-0x9BAD	0x562F	0x5CB6	# <CJK>
-0x9BAE	0x5630	0x5CBC	# <CJK>
-0x9BAF	0x5631	0x5CB7	# <CJK>
-0x9BB0	0x5632	0x5CC5	# <CJK>
-0x9BB1	0x5633	0x5CBE	# <CJK>
-0x9BB2	0x5634	0x5CC7	# <CJK>
-0x9BB3	0x5635	0x5CD9	# <CJK>
-0x9BB4	0x5636	0x5CE9	# <CJK>
-0x9BB5	0x5637	0x5CFD	# <CJK>
-0x9BB6	0x5638	0x5CFA	# <CJK>
-0x9BB7	0x5639	0x5CED	# <CJK>
-0x9BB8	0x563A	0x5D8C	# <CJK>
-0x9BB9	0x563B	0x5CEA	# <CJK>
-0x9BBA	0x563C	0x5D0B	# <CJK>
-0x9BBB	0x563D	0x5D15	# <CJK>
-0x9BBC	0x563E	0x5D17	# <CJK>
-0x9BBD	0x563F	0x5D5C	# <CJK>
-0x9BBE	0x5640	0x5D1F	# <CJK>
-0x9BBF	0x5641	0x5D1B	# <CJK>
-0x9BC0	0x5642	0x5D11	# <CJK>
-0x9BC1	0x5643	0x5D14	# <CJK>
-0x9BC2	0x5644	0x5D22	# <CJK>
-0x9BC3	0x5645	0x5D1A	# <CJK>
-0x9BC4	0x5646	0x5D19	# <CJK>
-0x9BC5	0x5647	0x5D18	# <CJK>
-0x9BC6	0x5648	0x5D4C	# <CJK>
-0x9BC7	0x5649	0x5D52	# <CJK>
-0x9BC8	0x564A	0x5D4E	# <CJK>
-0x9BC9	0x564B	0x5D4B	# <CJK>
-0x9BCA	0x564C	0x5D6C	# <CJK>
-0x9BCB	0x564D	0x5D73	# <CJK>
-0x9BCC	0x564E	0x5D76	# <CJK>
-0x9BCD	0x564F	0x5D87	# <CJK>
-0x9BCE	0x5650	0x5D84	# <CJK>
-0x9BCF	0x5651	0x5D82	# <CJK>
-0x9BD0	0x5652	0x5DA2	# <CJK>
-0x9BD1	0x5653	0x5D9D	# <CJK>
-0x9BD2	0x5654	0x5DAC	# <CJK>
-0x9BD3	0x5655	0x5DAE	# <CJK>
-0x9BD4	0x5656	0x5DBD	# <CJK>
-0x9BD5	0x5657	0x5D90	# <CJK>
-0x9BD6	0x5658	0x5DB7	# <CJK>
-0x9BD7	0x5659	0x5DBC	# <CJK>
-0x9BD8	0x565A	0x5DC9	# <CJK>
-0x9BD9	0x565B	0x5DCD	# <CJK>
-0x9BDA	0x565C	0x5DD3	# <CJK>
-0x9BDB	0x565D	0x5DD2	# <CJK>
-0x9BDC	0x565E	0x5DD6	# <CJK>
-0x9BDD	0x565F	0x5DDB	# <CJK>
-0x9BDE	0x5660	0x5DEB	# <CJK>
-0x9BDF	0x5661	0x5DF2	# <CJK>
-0x9BE0	0x5662	0x5DF5	# <CJK>
-0x9BE1	0x5663	0x5E0B	# <CJK>
-0x9BE2	0x5664	0x5E1A	# <CJK>
-0x9BE3	0x5665	0x5E19	# <CJK>
-0x9BE4	0x5666	0x5E11	# <CJK>
-0x9BE5	0x5667	0x5E1B	# <CJK>
-0x9BE6	0x5668	0x5E36	# <CJK>
-0x9BE7	0x5669	0x5E37	# <CJK>
-0x9BE8	0x566A	0x5E44	# <CJK>
-0x9BE9	0x566B	0x5E43	# <CJK>
-0x9BEA	0x566C	0x5E40	# <CJK>
-0x9BEB	0x566D	0x5E4E	# <CJK>
-0x9BEC	0x566E	0x5E57	# <CJK>
-0x9BED	0x566F	0x5E54	# <CJK>
-0x9BEE	0x5670	0x5E5F	# <CJK>
-0x9BEF	0x5671	0x5E62	# <CJK>
-0x9BF0	0x5672	0x5E64	# <CJK>
-0x9BF1	0x5673	0x5E47	# <CJK>
-0x9BF2	0x5674	0x5E75	# <CJK>
-0x9BF3	0x5675	0x5E76	# <CJK>
-0x9BF4	0x5676	0x5E7A	# <CJK>
-0x9BF5	0x5677	0x9EBC	# <CJK>
-0x9BF6	0x5678	0x5E7F	# <CJK>
-0x9BF7	0x5679	0x5EA0	# <CJK>
-0x9BF8	0x567A	0x5EC1	# <CJK>
-0x9BF9	0x567B	0x5EC2	# <CJK>
-0x9BFA	0x567C	0x5EC8	# <CJK>
-0x9BFB	0x567D	0x5ED0	# <CJK>
-0x9BFC	0x567E	0x5ECF	# <CJK>
-0x9C40	0x5721	0x5ED6	# <CJK>
-0x9C41	0x5722	0x5EE3	# <CJK>
-0x9C42	0x5723	0x5EDD	# <CJK>
-0x9C43	0x5724	0x5EDA	# <CJK>
-0x9C44	0x5725	0x5EDB	# <CJK>
-0x9C45	0x5726	0x5EE2	# <CJK>
-0x9C46	0x5727	0x5EE1	# <CJK>
-0x9C47	0x5728	0x5EE8	# <CJK>
-0x9C48	0x5729	0x5EE9	# <CJK>
-0x9C49	0x572A	0x5EEC	# <CJK>
-0x9C4A	0x572B	0x5EF1	# <CJK>
-0x9C4B	0x572C	0x5EF3	# <CJK>
-0x9C4C	0x572D	0x5EF0	# <CJK>
-0x9C4D	0x572E	0x5EF4	# <CJK>
-0x9C4E	0x572F	0x5EF8	# <CJK>
-0x9C4F	0x5730	0x5EFE	# <CJK>
-0x9C50	0x5731	0x5F03	# <CJK>
-0x9C51	0x5732	0x5F09	# <CJK>
-0x9C52	0x5733	0x5F5D	# <CJK>
-0x9C53	0x5734	0x5F5C	# <CJK>
-0x9C54	0x5735	0x5F0B	# <CJK>
-0x9C55	0x5736	0x5F11	# <CJK>
-0x9C56	0x5737	0x5F16	# <CJK>
-0x9C57	0x5738	0x5F29	# <CJK>
-0x9C58	0x5739	0x5F2D	# <CJK>
-0x9C59	0x573A	0x5F38	# <CJK>
-0x9C5A	0x573B	0x5F41	# <CJK>
-0x9C5B	0x573C	0x5F48	# <CJK>
-0x9C5C	0x573D	0x5F4C	# <CJK>
-0x9C5D	0x573E	0x5F4E	# <CJK>
-0x9C5E	0x573F	0x5F2F	# <CJK>
-0x9C5F	0x5740	0x5F51	# <CJK>
-0x9C60	0x5741	0x5F56	# <CJK>
-0x9C61	0x5742	0x5F57	# <CJK>
-0x9C62	0x5743	0x5F59	# <CJK>
-0x9C63	0x5744	0x5F61	# <CJK>
-0x9C64	0x5745	0x5F6D	# <CJK>
-0x9C65	0x5746	0x5F73	# <CJK>
-0x9C66	0x5747	0x5F77	# <CJK>
-0x9C67	0x5748	0x5F83	# <CJK>
-0x9C68	0x5749	0x5F82	# <CJK>
-0x9C69	0x574A	0x5F7F	# <CJK>
-0x9C6A	0x574B	0x5F8A	# <CJK>
-0x9C6B	0x574C	0x5F88	# <CJK>
-0x9C6C	0x574D	0x5F91	# <CJK>
-0x9C6D	0x574E	0x5F87	# <CJK>
-0x9C6E	0x574F	0x5F9E	# <CJK>
-0x9C6F	0x5750	0x5F99	# <CJK>
-0x9C70	0x5751	0x5F98	# <CJK>
-0x9C71	0x5752	0x5FA0	# <CJK>
-0x9C72	0x5753	0x5FA8	# <CJK>
-0x9C73	0x5754	0x5FAD	# <CJK>
-0x9C74	0x5755	0x5FBC	# <CJK>
-0x9C75	0x5756	0x5FD6	# <CJK>
-0x9C76	0x5757	0x5FFB	# <CJK>
-0x9C77	0x5758	0x5FE4	# <CJK>
-0x9C78	0x5759	0x5FF8	# <CJK>
-0x9C79	0x575A	0x5FF1	# <CJK>
-0x9C7A	0x575B	0x5FDD	# <CJK>
-0x9C7B	0x575C	0x60B3	# <CJK>
-0x9C7C	0x575D	0x5FFF	# <CJK>
-0x9C7D	0x575E	0x6021	# <CJK>
-0x9C7E	0x575F	0x6060	# <CJK>
-0x9C80	0x5760	0x6019	# <CJK>
-0x9C81	0x5761	0x6010	# <CJK>
-0x9C82	0x5762	0x6029	# <CJK>
-0x9C83	0x5763	0x600E	# <CJK>
-0x9C84	0x5764	0x6031	# <CJK>
-0x9C85	0x5765	0x601B	# <CJK>
-0x9C86	0x5766	0x6015	# <CJK>
-0x9C87	0x5767	0x602B	# <CJK>
-0x9C88	0x5768	0x6026	# <CJK>
-0x9C89	0x5769	0x600F	# <CJK>
-0x9C8A	0x576A	0x603A	# <CJK>
-0x9C8B	0x576B	0x605A	# <CJK>
-0x9C8C	0x576C	0x6041	# <CJK>
-0x9C8D	0x576D	0x606A	# <CJK>
-0x9C8E	0x576E	0x6077	# <CJK>
-0x9C8F	0x576F	0x605F	# <CJK>
-0x9C90	0x5770	0x604A	# <CJK>
-0x9C91	0x5771	0x6046	# <CJK>
-0x9C92	0x5772	0x604D	# <CJK>
-0x9C93	0x5773	0x6063	# <CJK>
-0x9C94	0x5774	0x6043	# <CJK>
-0x9C95	0x5775	0x6064	# <CJK>
-0x9C96	0x5776	0x6042	# <CJK>
-0x9C97	0x5777	0x606C	# <CJK>
-0x9C98	0x5778	0x606B	# <CJK>
-0x9C99	0x5779	0x6059	# <CJK>
-0x9C9A	0x577A	0x6081	# <CJK>
-0x9C9B	0x577B	0x608D	# <CJK>
-0x9C9C	0x577C	0x60E7	# <CJK>
-0x9C9D	0x577D	0x6083	# <CJK>
-0x9C9E	0x577E	0x609A	# <CJK>
-0x9C9F	0x5821	0x6084	# <CJK>
-0x9CA0	0x5822	0x609B	# <CJK>
-0x9CA1	0x5823	0x6096	# <CJK>
-0x9CA2	0x5824	0x6097	# <CJK>
-0x9CA3	0x5825	0x6092	# <CJK>
-0x9CA4	0x5826	0x60A7	# <CJK>
-0x9CA5	0x5827	0x608B	# <CJK>
-0x9CA6	0x5828	0x60E1	# <CJK>
-0x9CA7	0x5829	0x60B8	# <CJK>
-0x9CA8	0x582A	0x60E0	# <CJK>
-0x9CA9	0x582B	0x60D3	# <CJK>
-0x9CAA	0x582C	0x60B4	# <CJK>
-0x9CAB	0x582D	0x5FF0	# <CJK>
-0x9CAC	0x582E	0x60BD	# <CJK>
-0x9CAD	0x582F	0x60C6	# <CJK>
-0x9CAE	0x5830	0x60B5	# <CJK>
-0x9CAF	0x5831	0x60D8	# <CJK>
-0x9CB0	0x5832	0x614D	# <CJK>
-0x9CB1	0x5833	0x6115	# <CJK>
-0x9CB2	0x5834	0x6106	# <CJK>
-0x9CB3	0x5835	0x60F6	# <CJK>
-0x9CB4	0x5836	0x60F7	# <CJK>
-0x9CB5	0x5837	0x6100	# <CJK>
-0x9CB6	0x5838	0x60F4	# <CJK>
-0x9CB7	0x5839	0x60FA	# <CJK>
-0x9CB8	0x583A	0x6103	# <CJK>
-0x9CB9	0x583B	0x6121	# <CJK>
-0x9CBA	0x583C	0x60FB	# <CJK>
-0x9CBB	0x583D	0x60F1	# <CJK>
-0x9CBC	0x583E	0x610D	# <CJK>
-0x9CBD	0x583F	0x610E	# <CJK>
-0x9CBE	0x5840	0x6147	# <CJK>
-0x9CBF	0x5841	0x613E	# <CJK>
-0x9CC0	0x5842	0x6128	# <CJK>
-0x9CC1	0x5843	0x6127	# <CJK>
-0x9CC2	0x5844	0x614A	# <CJK>
-0x9CC3	0x5845	0x613F	# <CJK>
-0x9CC4	0x5846	0x613C	# <CJK>
-0x9CC5	0x5847	0x612C	# <CJK>
-0x9CC6	0x5848	0x6134	# <CJK>
-0x9CC7	0x5849	0x613D	# <CJK>
-0x9CC8	0x584A	0x6142	# <CJK>
-0x9CC9	0x584B	0x6144	# <CJK>
-0x9CCA	0x584C	0x6173	# <CJK>
-0x9CCB	0x584D	0x6177	# <CJK>
-0x9CCC	0x584E	0x6158	# <CJK>
-0x9CCD	0x584F	0x6159	# <CJK>
-0x9CCE	0x5850	0x615A	# <CJK>
-0x9CCF	0x5851	0x616B	# <CJK>
-0x9CD0	0x5852	0x6174	# <CJK>
-0x9CD1	0x5853	0x616F	# <CJK>
-0x9CD2	0x5854	0x6165	# <CJK>
-0x9CD3	0x5855	0x6171	# <CJK>
-0x9CD4	0x5856	0x615F	# <CJK>
-0x9CD5	0x5857	0x615D	# <CJK>
-0x9CD6	0x5858	0x6153	# <CJK>
-0x9CD7	0x5859	0x6175	# <CJK>
-0x9CD8	0x585A	0x6199	# <CJK>
-0x9CD9	0x585B	0x6196	# <CJK>
-0x9CDA	0x585C	0x6187	# <CJK>
-0x9CDB	0x585D	0x61AC	# <CJK>
-0x9CDC	0x585E	0x6194	# <CJK>
-0x9CDD	0x585F	0x619A	# <CJK>
-0x9CDE	0x5860	0x618A	# <CJK>
-0x9CDF	0x5861	0x6191	# <CJK>
-0x9CE0	0x5862	0x61AB	# <CJK>
-0x9CE1	0x5863	0x61AE	# <CJK>
-0x9CE2	0x5864	0x61CC	# <CJK>
-0x9CE3	0x5865	0x61CA	# <CJK>
-0x9CE4	0x5866	0x61C9	# <CJK>
-0x9CE5	0x5867	0x61F7	# <CJK>
-0x9CE6	0x5868	0x61C8	# <CJK>
-0x9CE7	0x5869	0x61C3	# <CJK>
-0x9CE8	0x586A	0x61C6	# <CJK>
-0x9CE9	0x586B	0x61BA	# <CJK>
-0x9CEA	0x586C	0x61CB	# <CJK>
-0x9CEB	0x586D	0x7F79	# <CJK>
-0x9CEC	0x586E	0x61CD	# <CJK>
-0x9CED	0x586F	0x61E6	# <CJK>
-0x9CEE	0x5870	0x61E3	# <CJK>
-0x9CEF	0x5871	0x61F6	# <CJK>
-0x9CF0	0x5872	0x61FA	# <CJK>
-0x9CF1	0x5873	0x61F4	# <CJK>
-0x9CF2	0x5874	0x61FF	# <CJK>
-0x9CF3	0x5875	0x61FD	# <CJK>
-0x9CF4	0x5876	0x61FC	# <CJK>
-0x9CF5	0x5877	0x61FE	# <CJK>
-0x9CF6	0x5878	0x6200	# <CJK>
-0x9CF7	0x5879	0x6208	# <CJK>
-0x9CF8	0x587A	0x6209	# <CJK>
-0x9CF9	0x587B	0x620D	# <CJK>
-0x9CFA	0x587C	0x620C	# <CJK>
-0x9CFB	0x587D	0x6214	# <CJK>
-0x9CFC	0x587E	0x621B	# <CJK>
-0x9D40	0x5921	0x621E	# <CJK>
-0x9D41	0x5922	0x6221	# <CJK>
-0x9D42	0x5923	0x622A	# <CJK>
-0x9D43	0x5924	0x622E	# <CJK>
-0x9D44	0x5925	0x6230	# <CJK>
-0x9D45	0x5926	0x6232	# <CJK>
-0x9D46	0x5927	0x6233	# <CJK>
-0x9D47	0x5928	0x6241	# <CJK>
-0x9D48	0x5929	0x624E	# <CJK>
-0x9D49	0x592A	0x625E	# <CJK>
-0x9D4A	0x592B	0x6263	# <CJK>
-0x9D4B	0x592C	0x625B	# <CJK>
-0x9D4C	0x592D	0x6260	# <CJK>
-0x9D4D	0x592E	0x6268	# <CJK>
-0x9D4E	0x592F	0x627C	# <CJK>
-0x9D4F	0x5930	0x6282	# <CJK>
-0x9D50	0x5931	0x6289	# <CJK>
-0x9D51	0x5932	0x627E	# <CJK>
-0x9D52	0x5933	0x6292	# <CJK>
-0x9D53	0x5934	0x6293	# <CJK>
-0x9D54	0x5935	0x6296	# <CJK>
-0x9D55	0x5936	0x62D4	# <CJK>
-0x9D56	0x5937	0x6283	# <CJK>
-0x9D57	0x5938	0x6294	# <CJK>
-0x9D58	0x5939	0x62D7	# <CJK>
-0x9D59	0x593A	0x62D1	# <CJK>
-0x9D5A	0x593B	0x62BB	# <CJK>
-0x9D5B	0x593C	0x62CF	# <CJK>
-0x9D5C	0x593D	0x62FF	# <CJK>
-0x9D5D	0x593E	0x62C6	# <CJK>
-0x9D5E	0x593F	0x64D4	# <CJK>
-0x9D5F	0x5940	0x62C8	# <CJK>
-0x9D60	0x5941	0x62DC	# <CJK>
-0x9D61	0x5942	0x62CC	# <CJK>
-0x9D62	0x5943	0x62CA	# <CJK>
-0x9D63	0x5944	0x62C2	# <CJK>
-0x9D64	0x5945	0x62C7	# <CJK>
-0x9D65	0x5946	0x629B	# <CJK>
-0x9D66	0x5947	0x62C9	# <CJK>
-0x9D67	0x5948	0x630C	# <CJK>
-0x9D68	0x5949	0x62EE	# <CJK>
-0x9D69	0x594A	0x62F1	# <CJK>
-0x9D6A	0x594B	0x6327	# <CJK>
-0x9D6B	0x594C	0x6302	# <CJK>
-0x9D6C	0x594D	0x6308	# <CJK>
-0x9D6D	0x594E	0x62EF	# <CJK>
-0x9D6E	0x594F	0x62F5	# <CJK>
-0x9D6F	0x5950	0x6350	# <CJK>
-0x9D70	0x5951	0x633E	# <CJK>
-0x9D71	0x5952	0x634D	# <CJK>
-0x9D72	0x5953	0x641C	# <CJK>
-0x9D73	0x5954	0x634F	# <CJK>
-0x9D74	0x5955	0x6396	# <CJK>
-0x9D75	0x5956	0x638E	# <CJK>
-0x9D76	0x5957	0x6380	# <CJK>
-0x9D77	0x5958	0x63AB	# <CJK>
-0x9D78	0x5959	0x6376	# <CJK>
-0x9D79	0x595A	0x63A3	# <CJK>
-0x9D7A	0x595B	0x638F	# <CJK>
-0x9D7B	0x595C	0x6389	# <CJK>
-0x9D7C	0x595D	0x639F	# <CJK>
-0x9D7D	0x595E	0x63B5	# <CJK>
-0x9D7E	0x595F	0x636B	# <CJK>
-0x9D80	0x5960	0x6369	# <CJK>
-0x9D81	0x5961	0x63BE	# <CJK>
-0x9D82	0x5962	0x63E9	# <CJK>
-0x9D83	0x5963	0x63C0	# <CJK>
-0x9D84	0x5964	0x63C6	# <CJK>
-0x9D85	0x5965	0x63E3	# <CJK>
-0x9D86	0x5966	0x63C9	# <CJK>
-0x9D87	0x5967	0x63D2	# <CJK>
-0x9D88	0x5968	0x63F6	# <CJK>
-0x9D89	0x5969	0x63C4	# <CJK>
-0x9D8A	0x596A	0x6416	# <CJK>
-0x9D8B	0x596B	0x6434	# <CJK>
-0x9D8C	0x596C	0x6406	# <CJK>
-0x9D8D	0x596D	0x6413	# <CJK>
-0x9D8E	0x596E	0x6426	# <CJK>
-0x9D8F	0x596F	0x6436	# <CJK>
-0x9D90	0x5970	0x651D	# <CJK>
-0x9D91	0x5971	0x6417	# <CJK>
-0x9D92	0x5972	0x6428	# <CJK>
-0x9D93	0x5973	0x640F	# <CJK>
-0x9D94	0x5974	0x6467	# <CJK>
-0x9D95	0x5975	0x646F	# <CJK>
-0x9D96	0x5976	0x6476	# <CJK>
-0x9D97	0x5977	0x644E	# <CJK>
-0x9D98	0x5978	0x652A	# <CJK>
-0x9D99	0x5979	0x6495	# <CJK>
-0x9D9A	0x597A	0x6493	# <CJK>
-0x9D9B	0x597B	0x64A5	# <CJK>
-0x9D9C	0x597C	0x64A9	# <CJK>
-0x9D9D	0x597D	0x6488	# <CJK>
-0x9D9E	0x597E	0x64BC	# <CJK>
-0x9D9F	0x5A21	0x64DA	# <CJK>
-0x9DA0	0x5A22	0x64D2	# <CJK>
-0x9DA1	0x5A23	0x64C5	# <CJK>
-0x9DA2	0x5A24	0x64C7	# <CJK>
-0x9DA3	0x5A25	0x64BB	# <CJK>
-0x9DA4	0x5A26	0x64D8	# <CJK>
-0x9DA5	0x5A27	0x64C2	# <CJK>
-0x9DA6	0x5A28	0x64F1	# <CJK>
-0x9DA7	0x5A29	0x64E7	# <CJK>
-0x9DA8	0x5A2A	0x8209	# <CJK>
-0x9DA9	0x5A2B	0x64E0	# <CJK>
-0x9DAA	0x5A2C	0x64E1	# <CJK>
-0x9DAB	0x5A2D	0x62AC	# <CJK>
-0x9DAC	0x5A2E	0x64E3	# <CJK>
-0x9DAD	0x5A2F	0x64EF	# <CJK>
-0x9DAE	0x5A30	0x652C	# <CJK>
-0x9DAF	0x5A31	0x64F6	# <CJK>
-0x9DB0	0x5A32	0x64F4	# <CJK>
-0x9DB1	0x5A33	0x64F2	# <CJK>
-0x9DB2	0x5A34	0x64FA	# <CJK>
-0x9DB3	0x5A35	0x6500	# <CJK>
-0x9DB4	0x5A36	0x64FD	# <CJK>
-0x9DB5	0x5A37	0x6518	# <CJK>
-0x9DB6	0x5A38	0x651C	# <CJK>
-0x9DB7	0x5A39	0x6505	# <CJK>
-0x9DB8	0x5A3A	0x6524	# <CJK>
-0x9DB9	0x5A3B	0x6523	# <CJK>
-0x9DBA	0x5A3C	0x652B	# <CJK>
-0x9DBB	0x5A3D	0x6534	# <CJK>
-0x9DBC	0x5A3E	0x6535	# <CJK>
-0x9DBD	0x5A3F	0x6537	# <CJK>
-0x9DBE	0x5A40	0x6536	# <CJK>
-0x9DBF	0x5A41	0x6538	# <CJK>
-0x9DC0	0x5A42	0x754B	# <CJK>
-0x9DC1	0x5A43	0x6548	# <CJK>
-0x9DC2	0x5A44	0x6556	# <CJK>
-0x9DC3	0x5A45	0x6555	# <CJK>
-0x9DC4	0x5A46	0x654D	# <CJK>
-0x9DC5	0x5A47	0x6558	# <CJK>
-0x9DC6	0x5A48	0x655E	# <CJK>
-0x9DC7	0x5A49	0x655D	# <CJK>
-0x9DC8	0x5A4A	0x6572	# <CJK>
-0x9DC9	0x5A4B	0x6578	# <CJK>
-0x9DCA	0x5A4C	0x6582	# <CJK>
-0x9DCB	0x5A4D	0x6583	# <CJK>
-0x9DCC	0x5A4E	0x8B8A	# <CJK>
-0x9DCD	0x5A4F	0x659B	# <CJK>
-0x9DCE	0x5A50	0x659F	# <CJK>
-0x9DCF	0x5A51	0x65AB	# <CJK>
-0x9DD0	0x5A52	0x65B7	# <CJK>
-0x9DD1	0x5A53	0x65C3	# <CJK>
-0x9DD2	0x5A54	0x65C6	# <CJK>
-0x9DD3	0x5A55	0x65C1	# <CJK>
-0x9DD4	0x5A56	0x65C4	# <CJK>
-0x9DD5	0x5A57	0x65CC	# <CJK>
-0x9DD6	0x5A58	0x65D2	# <CJK>
-0x9DD7	0x5A59	0x65DB	# <CJK>
-0x9DD8	0x5A5A	0x65D9	# <CJK>
-0x9DD9	0x5A5B	0x65E0	# <CJK>
-0x9DDA	0x5A5C	0x65E1	# <CJK>
-0x9DDB	0x5A5D	0x65F1	# <CJK>
-0x9DDC	0x5A5E	0x6772	# <CJK>
-0x9DDD	0x5A5F	0x660A	# <CJK>
-0x9DDE	0x5A60	0x6603	# <CJK>
-0x9DDF	0x5A61	0x65FB	# <CJK>
-0x9DE0	0x5A62	0x6773	# <CJK>
-0x9DE1	0x5A63	0x6635	# <CJK>
-0x9DE2	0x5A64	0x6636	# <CJK>
-0x9DE3	0x5A65	0x6634	# <CJK>
-0x9DE4	0x5A66	0x661C	# <CJK>
-0x9DE5	0x5A67	0x664F	# <CJK>
-0x9DE6	0x5A68	0x6644	# <CJK>
-0x9DE7	0x5A69	0x6649	# <CJK>
-0x9DE8	0x5A6A	0x6641	# <CJK>
-0x9DE9	0x5A6B	0x665E	# <CJK>
-0x9DEA	0x5A6C	0x665D	# <CJK>
-0x9DEB	0x5A6D	0x6664	# <CJK>
-0x9DEC	0x5A6E	0x6667	# <CJK>
-0x9DED	0x5A6F	0x6668	# <CJK>
-0x9DEE	0x5A70	0x665F	# <CJK>
-0x9DEF	0x5A71	0x6662	# <CJK>
-0x9DF0	0x5A72	0x6670	# <CJK>
-0x9DF1	0x5A73	0x6683	# <CJK>
-0x9DF2	0x5A74	0x6688	# <CJK>
-0x9DF3	0x5A75	0x668E	# <CJK>
-0x9DF4	0x5A76	0x6689	# <CJK>
-0x9DF5	0x5A77	0x6684	# <CJK>
-0x9DF6	0x5A78	0x6698	# <CJK>
-0x9DF7	0x5A79	0x669D	# <CJK>
-0x9DF8	0x5A7A	0x66C1	# <CJK>
-0x9DF9	0x5A7B	0x66B9	# <CJK>
-0x9DFA	0x5A7C	0x66C9	# <CJK>
-0x9DFB	0x5A7D	0x66BE	# <CJK>
-0x9DFC	0x5A7E	0x66BC	# <CJK>
-0x9E40	0x5B21	0x66C4	# <CJK>
-0x9E41	0x5B22	0x66B8	# <CJK>
-0x9E42	0x5B23	0x66D6	# <CJK>
-0x9E43	0x5B24	0x66DA	# <CJK>
-0x9E44	0x5B25	0x66E0	# <CJK>
-0x9E45	0x5B26	0x663F	# <CJK>
-0x9E46	0x5B27	0x66E6	# <CJK>
-0x9E47	0x5B28	0x66E9	# <CJK>
-0x9E48	0x5B29	0x66F0	# <CJK>
-0x9E49	0x5B2A	0x66F5	# <CJK>
-0x9E4A	0x5B2B	0x66F7	# <CJK>
-0x9E4B	0x5B2C	0x670F	# <CJK>
-0x9E4C	0x5B2D	0x6716	# <CJK>
-0x9E4D	0x5B2E	0x671E	# <CJK>
-0x9E4E	0x5B2F	0x6726	# <CJK>
-0x9E4F	0x5B30	0x6727	# <CJK>
-0x9E50	0x5B31	0x9738	# <CJK>
-0x9E51	0x5B32	0x672E	# <CJK>
-0x9E52	0x5B33	0x673F	# <CJK>
-0x9E53	0x5B34	0x6736	# <CJK>
-0x9E54	0x5B35	0x6741	# <CJK>
-0x9E55	0x5B36	0x6738	# <CJK>
-0x9E56	0x5B37	0x6737	# <CJK>
-0x9E57	0x5B38	0x6746	# <CJK>
-0x9E58	0x5B39	0x675E	# <CJK>
-0x9E59	0x5B3A	0x6760	# <CJK>
-0x9E5A	0x5B3B	0x6759	# <CJK>
-0x9E5B	0x5B3C	0x6763	# <CJK>
-0x9E5C	0x5B3D	0x6764	# <CJK>
-0x9E5D	0x5B3E	0x6789	# <CJK>
-0x9E5E	0x5B3F	0x6770	# <CJK>
-0x9E5F	0x5B40	0x67A9	# <CJK>
-0x9E60	0x5B41	0x677C	# <CJK>
-0x9E61	0x5B42	0x676A	# <CJK>
-0x9E62	0x5B43	0x678C	# <CJK>
-0x9E63	0x5B44	0x678B	# <CJK>
-0x9E64	0x5B45	0x67A6	# <CJK>
-0x9E65	0x5B46	0x67A1	# <CJK>
-0x9E66	0x5B47	0x6785	# <CJK>
-0x9E67	0x5B48	0x67B7	# <CJK>
-0x9E68	0x5B49	0x67EF	# <CJK>
-0x9E69	0x5B4A	0x67B4	# <CJK>
-0x9E6A	0x5B4B	0x67EC	# <CJK>
-0x9E6B	0x5B4C	0x67B3	# <CJK>
-0x9E6C	0x5B4D	0x67E9	# <CJK>
-0x9E6D	0x5B4E	0x67B8	# <CJK>
-0x9E6E	0x5B4F	0x67E4	# <CJK>
-0x9E6F	0x5B50	0x67DE	# <CJK>
-0x9E70	0x5B51	0x67DD	# <CJK>
-0x9E71	0x5B52	0x67E2	# <CJK>
-0x9E72	0x5B53	0x67EE	# <CJK>
-0x9E73	0x5B54	0x67B9	# <CJK>
-0x9E74	0x5B55	0x67CE	# <CJK>
-0x9E75	0x5B56	0x67C6	# <CJK>
-0x9E76	0x5B57	0x67E7	# <CJK>
-0x9E77	0x5B58	0x6A9C	# <CJK>
-0x9E78	0x5B59	0x681E	# <CJK>
-0x9E79	0x5B5A	0x6846	# <CJK>
-0x9E7A	0x5B5B	0x6829	# <CJK>
-0x9E7B	0x5B5C	0x6840	# <CJK>
-0x9E7C	0x5B5D	0x684D	# <CJK>
-0x9E7D	0x5B5E	0x6832	# <CJK>
-0x9E7E	0x5B5F	0x684E	# <CJK>
-0x9E80	0x5B60	0x68B3	# <CJK>
-0x9E81	0x5B61	0x682B	# <CJK>
-0x9E82	0x5B62	0x6859	# <CJK>
-0x9E83	0x5B63	0x6863	# <CJK>
-0x9E84	0x5B64	0x6877	# <CJK>
-0x9E85	0x5B65	0x687F	# <CJK>
-0x9E86	0x5B66	0x689F	# <CJK>
-0x9E87	0x5B67	0x688F	# <CJK>
-0x9E88	0x5B68	0x68AD	# <CJK>
-0x9E89	0x5B69	0x6894	# <CJK>
-0x9E8A	0x5B6A	0x689D	# <CJK>
-0x9E8B	0x5B6B	0x689B	# <CJK>
-0x9E8C	0x5B6C	0x6883	# <CJK>
-0x9E8D	0x5B6D	0x6AAE	# <CJK>
-0x9E8E	0x5B6E	0x68B9	# <CJK>
-0x9E8F	0x5B6F	0x6874	# <CJK>
-0x9E90	0x5B70	0x68B5	# <CJK>
-0x9E91	0x5B71	0x68A0	# <CJK>
-0x9E92	0x5B72	0x68BA	# <CJK>
-0x9E93	0x5B73	0x690F	# <CJK>
-0x9E94	0x5B74	0x688D	# <CJK>
-0x9E95	0x5B75	0x687E	# <CJK>
-0x9E96	0x5B76	0x6901	# <CJK>
-0x9E97	0x5B77	0x68CA	# <CJK>
-0x9E98	0x5B78	0x6908	# <CJK>
-0x9E99	0x5B79	0x68D8	# <CJK>
-0x9E9A	0x5B7A	0x6922	# <CJK>
-0x9E9B	0x5B7B	0x6926	# <CJK>
-0x9E9C	0x5B7C	0x68E1	# <CJK>
-0x9E9D	0x5B7D	0x690C	# <CJK>
-0x9E9E	0x5B7E	0x68CD	# <CJK>
-0x9E9F	0x5C21	0x68D4	# <CJK>
-0x9EA0	0x5C22	0x68E7	# <CJK>
-0x9EA1	0x5C23	0x68D5	# <CJK>
-0x9EA2	0x5C24	0x6936	# <CJK>
-0x9EA3	0x5C25	0x6912	# <CJK>
-0x9EA4	0x5C26	0x6904	# <CJK>
-0x9EA5	0x5C27	0x68D7	# <CJK>
-0x9EA6	0x5C28	0x68E3	# <CJK>
-0x9EA7	0x5C29	0x6925	# <CJK>
-0x9EA8	0x5C2A	0x68F9	# <CJK>
-0x9EA9	0x5C2B	0x68E0	# <CJK>
-0x9EAA	0x5C2C	0x68EF	# <CJK>
-0x9EAB	0x5C2D	0x6928	# <CJK>
-0x9EAC	0x5C2E	0x692A	# <CJK>
-0x9EAD	0x5C2F	0x691A	# <CJK>
-0x9EAE	0x5C30	0x6923	# <CJK>
-0x9EAF	0x5C31	0x6921	# <CJK>
-0x9EB0	0x5C32	0x68C6	# <CJK>
-0x9EB1	0x5C33	0x6979	# <CJK>
-0x9EB2	0x5C34	0x6977	# <CJK>
-0x9EB3	0x5C35	0x695C	# <CJK>
-0x9EB4	0x5C36	0x6978	# <CJK>
-0x9EB5	0x5C37	0x696B	# <CJK>
-0x9EB6	0x5C38	0x6954	# <CJK>
-0x9EB7	0x5C39	0x697E	# <CJK>
-0x9EB8	0x5C3A	0x696E	# <CJK>
-0x9EB9	0x5C3B	0x6939	# <CJK>
-0x9EBA	0x5C3C	0x6974	# <CJK>
-0x9EBB	0x5C3D	0x693D	# <CJK>
-0x9EBC	0x5C3E	0x6959	# <CJK>
-0x9EBD	0x5C3F	0x6930	# <CJK>
-0x9EBE	0x5C40	0x6961	# <CJK>
-0x9EBF	0x5C41	0x695E	# <CJK>
-0x9EC0	0x5C42	0x695D	# <CJK>
-0x9EC1	0x5C43	0x6981	# <CJK>
-0x9EC2	0x5C44	0x696A	# <CJK>
-0x9EC3	0x5C45	0x69B2	# <CJK>
-0x9EC4	0x5C46	0x69AE	# <CJK>
-0x9EC5	0x5C47	0x69D0	# <CJK>
-0x9EC6	0x5C48	0x69BF	# <CJK>
-0x9EC7	0x5C49	0x69C1	# <CJK>
-0x9EC8	0x5C4A	0x69D3	# <CJK>
-0x9EC9	0x5C4B	0x69BE	# <CJK>
-0x9ECA	0x5C4C	0x69CE	# <CJK>
-0x9ECB	0x5C4D	0x5BE8	# <CJK>
-0x9ECC	0x5C4E	0x69CA	# <CJK>
-0x9ECD	0x5C4F	0x69DD	# <CJK>
-0x9ECE	0x5C50	0x69BB	# <CJK>
-0x9ECF	0x5C51	0x69C3	# <CJK>
-0x9ED0	0x5C52	0x69A7	# <CJK>
-0x9ED1	0x5C53	0x6A2E	# <CJK>
-0x9ED2	0x5C54	0x6991	# <CJK>
-0x9ED3	0x5C55	0x69A0	# <CJK>
-0x9ED4	0x5C56	0x699C	# <CJK>
-0x9ED5	0x5C57	0x6995	# <CJK>
-0x9ED6	0x5C58	0x69B4	# <CJK>
-0x9ED7	0x5C59	0x69DE	# <CJK>
-0x9ED8	0x5C5A	0x69E8	# <CJK>
-0x9ED9	0x5C5B	0x6A02	# <CJK>
-0x9EDA	0x5C5C	0x6A1B	# <CJK>
-0x9EDB	0x5C5D	0x69FF	# <CJK>
-0x9EDC	0x5C5E	0x6B0A	# <CJK>
-0x9EDD	0x5C5F	0x69F9	# <CJK>
-0x9EDE	0x5C60	0x69F2	# <CJK>
-0x9EDF	0x5C61	0x69E7	# <CJK>
-0x9EE0	0x5C62	0x6A05	# <CJK>
-0x9EE1	0x5C63	0x69B1	# <CJK>
-0x9EE2	0x5C64	0x6A1E	# <CJK>
-0x9EE3	0x5C65	0x69ED	# <CJK>
-0x9EE4	0x5C66	0x6A14	# <CJK>
-0x9EE5	0x5C67	0x69EB	# <CJK>
-0x9EE6	0x5C68	0x6A0A	# <CJK>
-0x9EE7	0x5C69	0x6A12	# <CJK>
-0x9EE8	0x5C6A	0x6AC1	# <CJK>
-0x9EE9	0x5C6B	0x6A23	# <CJK>
-0x9EEA	0x5C6C	0x6A13	# <CJK>
-0x9EEB	0x5C6D	0x6A44	# <CJK>
-0x9EEC	0x5C6E	0x6A0C	# <CJK>
-0x9EED	0x5C6F	0x6A72	# <CJK>
-0x9EEE	0x5C70	0x6A36	# <CJK>
-0x9EEF	0x5C71	0x6A78	# <CJK>
-0x9EF0	0x5C72	0x6A47	# <CJK>
-0x9EF1	0x5C73	0x6A62	# <CJK>
-0x9EF2	0x5C74	0x6A59	# <CJK>
-0x9EF3	0x5C75	0x6A66	# <CJK>
-0x9EF4	0x5C76	0x6A48	# <CJK>
-0x9EF5	0x5C77	0x6A38	# <CJK>
-0x9EF6	0x5C78	0x6A22	# <CJK>
-0x9EF7	0x5C79	0x6A90	# <CJK>
-0x9EF8	0x5C7A	0x6A8D	# <CJK>
-0x9EF9	0x5C7B	0x6AA0	# <CJK>
-0x9EFA	0x5C7C	0x6A84	# <CJK>
-0x9EFB	0x5C7D	0x6AA2	# <CJK>
-0x9EFC	0x5C7E	0x6AA3	# <CJK>
-0x9F40	0x5D21	0x6A97	# <CJK>
-0x9F41	0x5D22	0x8617	# <CJK>
-0x9F42	0x5D23	0x6ABB	# <CJK>
-0x9F43	0x5D24	0x6AC3	# <CJK>
-0x9F44	0x5D25	0x6AC2	# <CJK>
-0x9F45	0x5D26	0x6AB8	# <CJK>
-0x9F46	0x5D27	0x6AB3	# <CJK>
-0x9F47	0x5D28	0x6AAC	# <CJK>
-0x9F48	0x5D29	0x6ADE	# <CJK>
-0x9F49	0x5D2A	0x6AD1	# <CJK>
-0x9F4A	0x5D2B	0x6ADF	# <CJK>
-0x9F4B	0x5D2C	0x6AAA	# <CJK>
-0x9F4C	0x5D2D	0x6ADA	# <CJK>
-0x9F4D	0x5D2E	0x6AEA	# <CJK>
-0x9F4E	0x5D2F	0x6AFB	# <CJK>
-0x9F4F	0x5D30	0x6B05	# <CJK>
-0x9F50	0x5D31	0x8616	# <CJK>
-0x9F51	0x5D32	0x6AFA	# <CJK>
-0x9F52	0x5D33	0x6B12	# <CJK>
-0x9F53	0x5D34	0x6B16	# <CJK>
-0x9F54	0x5D35	0x9B31	# <CJK>
-0x9F55	0x5D36	0x6B1F	# <CJK>
-0x9F56	0x5D37	0x6B38	# <CJK>
-0x9F57	0x5D38	0x6B37	# <CJK>
-0x9F58	0x5D39	0x76DC	# <CJK>
-0x9F59	0x5D3A	0x6B39	# <CJK>
-0x9F5A	0x5D3B	0x98EE	# <CJK>
-0x9F5B	0x5D3C	0x6B47	# <CJK>
-0x9F5C	0x5D3D	0x6B43	# <CJK>
-0x9F5D	0x5D3E	0x6B49	# <CJK>
-0x9F5E	0x5D3F	0x6B50	# <CJK>
-0x9F5F	0x5D40	0x6B59	# <CJK>
-0x9F60	0x5D41	0x6B54	# <CJK>
-0x9F61	0x5D42	0x6B5B	# <CJK>
-0x9F62	0x5D43	0x6B5F	# <CJK>
-0x9F63	0x5D44	0x6B61	# <CJK>
-0x9F64	0x5D45	0x6B78	# <CJK>
-0x9F65	0x5D46	0x6B79	# <CJK>
-0x9F66	0x5D47	0x6B7F	# <CJK>
-0x9F67	0x5D48	0x6B80	# <CJK>
-0x9F68	0x5D49	0x6B84	# <CJK>
-0x9F69	0x5D4A	0x6B83	# <CJK>
-0x9F6A	0x5D4B	0x6B8D	# <CJK>
-0x9F6B	0x5D4C	0x6B98	# <CJK>
-0x9F6C	0x5D4D	0x6B95	# <CJK>
-0x9F6D	0x5D4E	0x6B9E	# <CJK>
-0x9F6E	0x5D4F	0x6BA4	# <CJK>
-0x9F6F	0x5D50	0x6BAA	# <CJK>
-0x9F70	0x5D51	0x6BAB	# <CJK>
-0x9F71	0x5D52	0x6BAF	# <CJK>
-0x9F72	0x5D53	0x6BB2	# <CJK>
-0x9F73	0x5D54	0x6BB1	# <CJK>
-0x9F74	0x5D55	0x6BB3	# <CJK>
-0x9F75	0x5D56	0x6BB7	# <CJK>
-0x9F76	0x5D57	0x6BBC	# <CJK>
-0x9F77	0x5D58	0x6BC6	# <CJK>
-0x9F78	0x5D59	0x6BCB	# <CJK>
-0x9F79	0x5D5A	0x6BD3	# <CJK>
-0x9F7A	0x5D5B	0x6BDF	# <CJK>
-0x9F7B	0x5D5C	0x6BEC	# <CJK>
-0x9F7C	0x5D5D	0x6BEB	# <CJK>
-0x9F7D	0x5D5E	0x6BF3	# <CJK>
-0x9F7E	0x5D5F	0x6BEF	# <CJK>
-0x9F80	0x5D60	0x9EBE	# <CJK>
-0x9F81	0x5D61	0x6C08	# <CJK>
-0x9F82	0x5D62	0x6C13	# <CJK>
-0x9F83	0x5D63	0x6C14	# <CJK>
-0x9F84	0x5D64	0x6C1B	# <CJK>
-0x9F85	0x5D65	0x6C24	# <CJK>
-0x9F86	0x5D66	0x6C23	# <CJK>
-0x9F87	0x5D67	0x6C5E	# <CJK>
-0x9F88	0x5D68	0x6C55	# <CJK>
-0x9F89	0x5D69	0x6C62	# <CJK>
-0x9F8A	0x5D6A	0x6C6A	# <CJK>
-0x9F8B	0x5D6B	0x6C82	# <CJK>
-0x9F8C	0x5D6C	0x6C8D	# <CJK>
-0x9F8D	0x5D6D	0x6C9A	# <CJK>
-0x9F8E	0x5D6E	0x6C81	# <CJK>
-0x9F8F	0x5D6F	0x6C9B	# <CJK>
-0x9F90	0x5D70	0x6C7E	# <CJK>
-0x9F91	0x5D71	0x6C68	# <CJK>
-0x9F92	0x5D72	0x6C73	# <CJK>
-0x9F93	0x5D73	0x6C92	# <CJK>
-0x9F94	0x5D74	0x6C90	# <CJK>
-0x9F95	0x5D75	0x6CC4	# <CJK>
-0x9F96	0x5D76	0x6CF1	# <CJK>
-0x9F97	0x5D77	0x6CD3	# <CJK>
-0x9F98	0x5D78	0x6CBD	# <CJK>
-0x9F99	0x5D79	0x6CD7	# <CJK>
-0x9F9A	0x5D7A	0x6CC5	# <CJK>
-0x9F9B	0x5D7B	0x6CDD	# <CJK>
-0x9F9C	0x5D7C	0x6CAE	# <CJK>
-0x9F9D	0x5D7D	0x6CB1	# <CJK>
-0x9F9E	0x5D7E	0x6CBE	# <CJK>
-0x9F9F	0x5E21	0x6CBA	# <CJK>
-0x9FA0	0x5E22	0x6CDB	# <CJK>
-0x9FA1	0x5E23	0x6CEF	# <CJK>
-0x9FA2	0x5E24	0x6CD9	# <CJK>
-0x9FA3	0x5E25	0x6CEA	# <CJK>
-0x9FA4	0x5E26	0x6D1F	# <CJK>
-0x9FA5	0x5E27	0x884D	# <CJK>
-0x9FA6	0x5E28	0x6D36	# <CJK>
-0x9FA7	0x5E29	0x6D2B	# <CJK>
-0x9FA8	0x5E2A	0x6D3D	# <CJK>
-0x9FA9	0x5E2B	0x6D38	# <CJK>
-0x9FAA	0x5E2C	0x6D19	# <CJK>
-0x9FAB	0x5E2D	0x6D35	# <CJK>
-0x9FAC	0x5E2E	0x6D33	# <CJK>
-0x9FAD	0x5E2F	0x6D12	# <CJK>
-0x9FAE	0x5E30	0x6D0C	# <CJK>
-0x9FAF	0x5E31	0x6D63	# <CJK>
-0x9FB0	0x5E32	0x6D93	# <CJK>
-0x9FB1	0x5E33	0x6D64	# <CJK>
-0x9FB2	0x5E34	0x6D5A	# <CJK>
-0x9FB3	0x5E35	0x6D79	# <CJK>
-0x9FB4	0x5E36	0x6D59	# <CJK>
-0x9FB5	0x5E37	0x6D8E	# <CJK>
-0x9FB6	0x5E38	0x6D95	# <CJK>
-0x9FB7	0x5E39	0x6FE4	# <CJK>
-0x9FB8	0x5E3A	0x6D85	# <CJK>
-0x9FB9	0x5E3B	0x6DF9	# <CJK>
-0x9FBA	0x5E3C	0x6E15	# <CJK>
-0x9FBB	0x5E3D	0x6E0A	# <CJK>
-0x9FBC	0x5E3E	0x6DB5	# <CJK>
-0x9FBD	0x5E3F	0x6DC7	# <CJK>
-0x9FBE	0x5E40	0x6DE6	# <CJK>
-0x9FBF	0x5E41	0x6DB8	# <CJK>
-0x9FC0	0x5E42	0x6DC6	# <CJK>
-0x9FC1	0x5E43	0x6DEC	# <CJK>
-0x9FC2	0x5E44	0x6DDE	# <CJK>
-0x9FC3	0x5E45	0x6DCC	# <CJK>
-0x9FC4	0x5E46	0x6DE8	# <CJK>
-0x9FC5	0x5E47	0x6DD2	# <CJK>
-0x9FC6	0x5E48	0x6DC5	# <CJK>
-0x9FC7	0x5E49	0x6DFA	# <CJK>
-0x9FC8	0x5E4A	0x6DD9	# <CJK>
-0x9FC9	0x5E4B	0x6DE4	# <CJK>
-0x9FCA	0x5E4C	0x6DD5	# <CJK>
-0x9FCB	0x5E4D	0x6DEA	# <CJK>
-0x9FCC	0x5E4E	0x6DEE	# <CJK>
-0x9FCD	0x5E4F	0x6E2D	# <CJK>
-0x9FCE	0x5E50	0x6E6E	# <CJK>
-0x9FCF	0x5E51	0x6E2E	# <CJK>
-0x9FD0	0x5E52	0x6E19	# <CJK>
-0x9FD1	0x5E53	0x6E72	# <CJK>
-0x9FD2	0x5E54	0x6E5F	# <CJK>
-0x9FD3	0x5E55	0x6E3E	# <CJK>
-0x9FD4	0x5E56	0x6E23	# <CJK>
-0x9FD5	0x5E57	0x6E6B	# <CJK>
-0x9FD6	0x5E58	0x6E2B	# <CJK>
-0x9FD7	0x5E59	0x6E76	# <CJK>
-0x9FD8	0x5E5A	0x6E4D	# <CJK>
-0x9FD9	0x5E5B	0x6E1F	# <CJK>
-0x9FDA	0x5E5C	0x6E43	# <CJK>
-0x9FDB	0x5E5D	0x6E3A	# <CJK>
-0x9FDC	0x5E5E	0x6E4E	# <CJK>
-0x9FDD	0x5E5F	0x6E24	# <CJK>
-0x9FDE	0x5E60	0x6EFF	# <CJK>
-0x9FDF	0x5E61	0x6E1D	# <CJK>
-0x9FE0	0x5E62	0x6E38	# <CJK>
-0x9FE1	0x5E63	0x6E82	# <CJK>
-0x9FE2	0x5E64	0x6EAA	# <CJK>
-0x9FE3	0x5E65	0x6E98	# <CJK>
-0x9FE4	0x5E66	0x6EC9	# <CJK>
-0x9FE5	0x5E67	0x6EB7	# <CJK>
-0x9FE6	0x5E68	0x6ED3	# <CJK>
-0x9FE7	0x5E69	0x6EBD	# <CJK>
-0x9FE8	0x5E6A	0x6EAF	# <CJK>
-0x9FE9	0x5E6B	0x6EC4	# <CJK>
-0x9FEA	0x5E6C	0x6EB2	# <CJK>
-0x9FEB	0x5E6D	0x6ED4	# <CJK>
-0x9FEC	0x5E6E	0x6ED5	# <CJK>
-0x9FED	0x5E6F	0x6E8F	# <CJK>
-0x9FEE	0x5E70	0x6EA5	# <CJK>
-0x9FEF	0x5E71	0x6EC2	# <CJK>
-0x9FF0	0x5E72	0x6E9F	# <CJK>
-0x9FF1	0x5E73	0x6F41	# <CJK>
-0x9FF2	0x5E74	0x6F11	# <CJK>
-0x9FF3	0x5E75	0x704C	# <CJK>
-0x9FF4	0x5E76	0x6EEC	# <CJK>
-0x9FF5	0x5E77	0x6EF8	# <CJK>
-0x9FF6	0x5E78	0x6EFE	# <CJK>
-0x9FF7	0x5E79	0x6F3F	# <CJK>
-0x9FF8	0x5E7A	0x6EF2	# <CJK>
-0x9FF9	0x5E7B	0x6F31	# <CJK>
-0x9FFA	0x5E7C	0x6EEF	# <CJK>
-0x9FFB	0x5E7D	0x6F32	# <CJK>
-0x9FFC	0x5E7E	0x6ECC	# <CJK>
-0xE040	0x5F21	0x6F3E	# <CJK>
-0xE041	0x5F22	0x6F13	# <CJK>
-0xE042	0x5F23	0x6EF7	# <CJK>
-0xE043	0x5F24	0x6F86	# <CJK>
-0xE044	0x5F25	0x6F7A	# <CJK>
-0xE045	0x5F26	0x6F78	# <CJK>
-0xE046	0x5F27	0x6F81	# <CJK>
-0xE047	0x5F28	0x6F80	# <CJK>
-0xE048	0x5F29	0x6F6F	# <CJK>
-0xE049	0x5F2A	0x6F5B	# <CJK>
-0xE04A	0x5F2B	0x6FF3	# <CJK>
-0xE04B	0x5F2C	0x6F6D	# <CJK>
-0xE04C	0x5F2D	0x6F82	# <CJK>
-0xE04D	0x5F2E	0x6F7C	# <CJK>
-0xE04E	0x5F2F	0x6F58	# <CJK>
-0xE04F	0x5F30	0x6F8E	# <CJK>
-0xE050	0x5F31	0x6F91	# <CJK>
-0xE051	0x5F32	0x6FC2	# <CJK>
-0xE052	0x5F33	0x6F66	# <CJK>
-0xE053	0x5F34	0x6FB3	# <CJK>
-0xE054	0x5F35	0x6FA3	# <CJK>
-0xE055	0x5F36	0x6FA1	# <CJK>
-0xE056	0x5F37	0x6FA4	# <CJK>
-0xE057	0x5F38	0x6FB9	# <CJK>
-0xE058	0x5F39	0x6FC6	# <CJK>
-0xE059	0x5F3A	0x6FAA	# <CJK>
-0xE05A	0x5F3B	0x6FDF	# <CJK>
-0xE05B	0x5F3C	0x6FD5	# <CJK>
-0xE05C	0x5F3D	0x6FEC	# <CJK>
-0xE05D	0x5F3E	0x6FD4	# <CJK>
-0xE05E	0x5F3F	0x6FD8	# <CJK>
-0xE05F	0x5F40	0x6FF1	# <CJK>
-0xE060	0x5F41	0x6FEE	# <CJK>
-0xE061	0x5F42	0x6FDB	# <CJK>
-0xE062	0x5F43	0x7009	# <CJK>
-0xE063	0x5F44	0x700B	# <CJK>
-0xE064	0x5F45	0x6FFA	# <CJK>
-0xE065	0x5F46	0x7011	# <CJK>
-0xE066	0x5F47	0x7001	# <CJK>
-0xE067	0x5F48	0x700F	# <CJK>
-0xE068	0x5F49	0x6FFE	# <CJK>
-0xE069	0x5F4A	0x701B	# <CJK>
-0xE06A	0x5F4B	0x701A	# <CJK>
-0xE06B	0x5F4C	0x6F74	# <CJK>
-0xE06C	0x5F4D	0x701D	# <CJK>
-0xE06D	0x5F4E	0x7018	# <CJK>
-0xE06E	0x5F4F	0x701F	# <CJK>
-0xE06F	0x5F50	0x7030	# <CJK>
-0xE070	0x5F51	0x703E	# <CJK>
-0xE071	0x5F52	0x7032	# <CJK>
-0xE072	0x5F53	0x7051	# <CJK>
-0xE073	0x5F54	0x7063	# <CJK>
-0xE074	0x5F55	0x7099	# <CJK>
-0xE075	0x5F56	0x7092	# <CJK>
-0xE076	0x5F57	0x70AF	# <CJK>
-0xE077	0x5F58	0x70F1	# <CJK>
-0xE078	0x5F59	0x70AC	# <CJK>
-0xE079	0x5F5A	0x70B8	# <CJK>
-0xE07A	0x5F5B	0x70B3	# <CJK>
-0xE07B	0x5F5C	0x70AE	# <CJK>
-0xE07C	0x5F5D	0x70DF	# <CJK>
-0xE07D	0x5F5E	0x70CB	# <CJK>
-0xE07E	0x5F5F	0x70DD	# <CJK>
-0xE080	0x5F60	0x70D9	# <CJK>
-0xE081	0x5F61	0x7109	# <CJK>
-0xE082	0x5F62	0x70FD	# <CJK>
-0xE083	0x5F63	0x711C	# <CJK>
-0xE084	0x5F64	0x7119	# <CJK>
-0xE085	0x5F65	0x7165	# <CJK>
-0xE086	0x5F66	0x7155	# <CJK>
-0xE087	0x5F67	0x7188	# <CJK>
-0xE088	0x5F68	0x7166	# <CJK>
-0xE089	0x5F69	0x7162	# <CJK>
-0xE08A	0x5F6A	0x714C	# <CJK>
-0xE08B	0x5F6B	0x7156	# <CJK>
-0xE08C	0x5F6C	0x716C	# <CJK>
-0xE08D	0x5F6D	0x718F	# <CJK>
-0xE08E	0x5F6E	0x71FB	# <CJK>
-0xE08F	0x5F6F	0x7184	# <CJK>
-0xE090	0x5F70	0x7195	# <CJK>
-0xE091	0x5F71	0x71A8	# <CJK>
-0xE092	0x5F72	0x71AC	# <CJK>
-0xE093	0x5F73	0x71D7	# <CJK>
-0xE094	0x5F74	0x71B9	# <CJK>
-0xE095	0x5F75	0x71BE	# <CJK>
-0xE096	0x5F76	0x71D2	# <CJK>
-0xE097	0x5F77	0x71C9	# <CJK>
-0xE098	0x5F78	0x71D4	# <CJK>
-0xE099	0x5F79	0x71CE	# <CJK>
-0xE09A	0x5F7A	0x71E0	# <CJK>
-0xE09B	0x5F7B	0x71EC	# <CJK>
-0xE09C	0x5F7C	0x71E7	# <CJK>
-0xE09D	0x5F7D	0x71F5	# <CJK>
-0xE09E	0x5F7E	0x71FC	# <CJK>
-0xE09F	0x6021	0x71F9	# <CJK>
-0xE0A0	0x6022	0x71FF	# <CJK>
-0xE0A1	0x6023	0x720D	# <CJK>
-0xE0A2	0x6024	0x7210	# <CJK>
-0xE0A3	0x6025	0x721B	# <CJK>
-0xE0A4	0x6026	0x7228	# <CJK>
-0xE0A5	0x6027	0x722D	# <CJK>
-0xE0A6	0x6028	0x722C	# <CJK>
-0xE0A7	0x6029	0x7230	# <CJK>
-0xE0A8	0x602A	0x7232	# <CJK>
-0xE0A9	0x602B	0x723B	# <CJK>
-0xE0AA	0x602C	0x723C	# <CJK>
-0xE0AB	0x602D	0x723F	# <CJK>
-0xE0AC	0x602E	0x7240	# <CJK>
-0xE0AD	0x602F	0x7246	# <CJK>
-0xE0AE	0x6030	0x724B	# <CJK>
-0xE0AF	0x6031	0x7258	# <CJK>
-0xE0B0	0x6032	0x7274	# <CJK>
-0xE0B1	0x6033	0x727E	# <CJK>
-0xE0B2	0x6034	0x7282	# <CJK>
-0xE0B3	0x6035	0x7281	# <CJK>
-0xE0B4	0x6036	0x7287	# <CJK>
-0xE0B5	0x6037	0x7292	# <CJK>
-0xE0B6	0x6038	0x7296	# <CJK>
-0xE0B7	0x6039	0x72A2	# <CJK>
-0xE0B8	0x603A	0x72A7	# <CJK>
-0xE0B9	0x603B	0x72B9	# <CJK>
-0xE0BA	0x603C	0x72B2	# <CJK>
-0xE0BB	0x603D	0x72C3	# <CJK>
-0xE0BC	0x603E	0x72C6	# <CJK>
-0xE0BD	0x603F	0x72C4	# <CJK>
-0xE0BE	0x6040	0x72CE	# <CJK>
-0xE0BF	0x6041	0x72D2	# <CJK>
-0xE0C0	0x6042	0x72E2	# <CJK>
-0xE0C1	0x6043	0x72E0	# <CJK>
-0xE0C2	0x6044	0x72E1	# <CJK>
-0xE0C3	0x6045	0x72F9	# <CJK>
-0xE0C4	0x6046	0x72F7	# <CJK>
-0xE0C5	0x6047	0x500F	# <CJK>
-0xE0C6	0x6048	0x7317	# <CJK>
-0xE0C7	0x6049	0x730A	# <CJK>
-0xE0C8	0x604A	0x731C	# <CJK>
-0xE0C9	0x604B	0x7316	# <CJK>
-0xE0CA	0x604C	0x731D	# <CJK>
-0xE0CB	0x604D	0x7334	# <CJK>
-0xE0CC	0x604E	0x732F	# <CJK>
-0xE0CD	0x604F	0x7329	# <CJK>
-0xE0CE	0x6050	0x7325	# <CJK>
-0xE0CF	0x6051	0x733E	# <CJK>
-0xE0D0	0x6052	0x734E	# <CJK>
-0xE0D1	0x6053	0x734F	# <CJK>
-0xE0D2	0x6054	0x9ED8	# <CJK>
-0xE0D3	0x6055	0x7357	# <CJK>
-0xE0D4	0x6056	0x736A	# <CJK>
-0xE0D5	0x6057	0x7368	# <CJK>
-0xE0D6	0x6058	0x7370	# <CJK>
-0xE0D7	0x6059	0x7378	# <CJK>
-0xE0D8	0x605A	0x7375	# <CJK>
-0xE0D9	0x605B	0x737B	# <CJK>
-0xE0DA	0x605C	0x737A	# <CJK>
-0xE0DB	0x605D	0x73C8	# <CJK>
-0xE0DC	0x605E	0x73B3	# <CJK>
-0xE0DD	0x605F	0x73CE	# <CJK>
-0xE0DE	0x6060	0x73BB	# <CJK>
-0xE0DF	0x6061	0x73C0	# <CJK>
-0xE0E0	0x6062	0x73E5	# <CJK>
-0xE0E1	0x6063	0x73EE	# <CJK>
-0xE0E2	0x6064	0x73DE	# <CJK>
-0xE0E3	0x6065	0x74A2	# <CJK>
-0xE0E4	0x6066	0x7405	# <CJK>
-0xE0E5	0x6067	0x746F	# <CJK>
-0xE0E6	0x6068	0x7425	# <CJK>
-0xE0E7	0x6069	0x73F8	# <CJK>
-0xE0E8	0x606A	0x7432	# <CJK>
-0xE0E9	0x606B	0x743A	# <CJK>
-0xE0EA	0x606C	0x7455	# <CJK>
-0xE0EB	0x606D	0x743F	# <CJK>
-0xE0EC	0x606E	0x745F	# <CJK>
-0xE0ED	0x606F	0x7459	# <CJK>
-0xE0EE	0x6070	0x7441	# <CJK>
-0xE0EF	0x6071	0x745C	# <CJK>
-0xE0F0	0x6072	0x7469	# <CJK>
-0xE0F1	0x6073	0x7470	# <CJK>
-0xE0F2	0x6074	0x7463	# <CJK>
-0xE0F3	0x6075	0x746A	# <CJK>
-0xE0F4	0x6076	0x7476	# <CJK>
-0xE0F5	0x6077	0x747E	# <CJK>
-0xE0F6	0x6078	0x748B	# <CJK>
-0xE0F7	0x6079	0x749E	# <CJK>
-0xE0F8	0x607A	0x74A7	# <CJK>
-0xE0F9	0x607B	0x74CA	# <CJK>
-0xE0FA	0x607C	0x74CF	# <CJK>
-0xE0FB	0x607D	0x74D4	# <CJK>
-0xE0FC	0x607E	0x73F1	# <CJK>
-0xE140	0x6121	0x74E0	# <CJK>
-0xE141	0x6122	0x74E3	# <CJK>
-0xE142	0x6123	0x74E7	# <CJK>
-0xE143	0x6124	0x74E9	# <CJK>
-0xE144	0x6125	0x74EE	# <CJK>
-0xE145	0x6126	0x74F2	# <CJK>
-0xE146	0x6127	0x74F0	# <CJK>
-0xE147	0x6128	0x74F1	# <CJK>
-0xE148	0x6129	0x74F8	# <CJK>
-0xE149	0x612A	0x74F7	# <CJK>
-0xE14A	0x612B	0x7504	# <CJK>
-0xE14B	0x612C	0x7503	# <CJK>
-0xE14C	0x612D	0x7505	# <CJK>
-0xE14D	0x612E	0x750C	# <CJK>
-0xE14E	0x612F	0x750E	# <CJK>
-0xE14F	0x6130	0x750D	# <CJK>
-0xE150	0x6131	0x7515	# <CJK>
-0xE151	0x6132	0x7513	# <CJK>
-0xE152	0x6133	0x751E	# <CJK>
-0xE153	0x6134	0x7526	# <CJK>
-0xE154	0x6135	0x752C	# <CJK>
-0xE155	0x6136	0x753C	# <CJK>
-0xE156	0x6137	0x7544	# <CJK>
-0xE157	0x6138	0x754D	# <CJK>
-0xE158	0x6139	0x754A	# <CJK>
-0xE159	0x613A	0x7549	# <CJK>
-0xE15A	0x613B	0x755B	# <CJK>
-0xE15B	0x613C	0x7546	# <CJK>
-0xE15C	0x613D	0x755A	# <CJK>
-0xE15D	0x613E	0x7569	# <CJK>
-0xE15E	0x613F	0x7564	# <CJK>
-0xE15F	0x6140	0x7567	# <CJK>
-0xE160	0x6141	0x756B	# <CJK>
-0xE161	0x6142	0x756D	# <CJK>
-0xE162	0x6143	0x7578	# <CJK>
-0xE163	0x6144	0x7576	# <CJK>
-0xE164	0x6145	0x7586	# <CJK>
-0xE165	0x6146	0x7587	# <CJK>
-0xE166	0x6147	0x7574	# <CJK>
-0xE167	0x6148	0x758A	# <CJK>
-0xE168	0x6149	0x7589	# <CJK>
-0xE169	0x614A	0x7582	# <CJK>
-0xE16A	0x614B	0x7594	# <CJK>
-0xE16B	0x614C	0x759A	# <CJK>
-0xE16C	0x614D	0x759D	# <CJK>
-0xE16D	0x614E	0x75A5	# <CJK>
-0xE16E	0x614F	0x75A3	# <CJK>
-0xE16F	0x6150	0x75C2	# <CJK>
-0xE170	0x6151	0x75B3	# <CJK>
-0xE171	0x6152	0x75C3	# <CJK>
-0xE172	0x6153	0x75B5	# <CJK>
-0xE173	0x6154	0x75BD	# <CJK>
-0xE174	0x6155	0x75B8	# <CJK>
-0xE175	0x6156	0x75BC	# <CJK>
-0xE176	0x6157	0x75B1	# <CJK>
-0xE177	0x6158	0x75CD	# <CJK>
-0xE178	0x6159	0x75CA	# <CJK>
-0xE179	0x615A	0x75D2	# <CJK>
-0xE17A	0x615B	0x75D9	# <CJK>
-0xE17B	0x615C	0x75E3	# <CJK>
-0xE17C	0x615D	0x75DE	# <CJK>
-0xE17D	0x615E	0x75FE	# <CJK>
-0xE17E	0x615F	0x75FF	# <CJK>
-0xE180	0x6160	0x75FC	# <CJK>
-0xE181	0x6161	0x7601	# <CJK>
-0xE182	0x6162	0x75F0	# <CJK>
-0xE183	0x6163	0x75FA	# <CJK>
-0xE184	0x6164	0x75F2	# <CJK>
-0xE185	0x6165	0x75F3	# <CJK>
-0xE186	0x6166	0x760B	# <CJK>
-0xE187	0x6167	0x760D	# <CJK>
-0xE188	0x6168	0x7609	# <CJK>
-0xE189	0x6169	0x761F	# <CJK>
-0xE18A	0x616A	0x7627	# <CJK>
-0xE18B	0x616B	0x7620	# <CJK>
-0xE18C	0x616C	0x7621	# <CJK>
-0xE18D	0x616D	0x7622	# <CJK>
-0xE18E	0x616E	0x7624	# <CJK>
-0xE18F	0x616F	0x7634	# <CJK>
-0xE190	0x6170	0x7630	# <CJK>
-0xE191	0x6171	0x763B	# <CJK>
-0xE192	0x6172	0x7647	# <CJK>
-0xE193	0x6173	0x7648	# <CJK>
-0xE194	0x6174	0x7646	# <CJK>
-0xE195	0x6175	0x765C	# <CJK>
-0xE196	0x6176	0x7658	# <CJK>
-0xE197	0x6177	0x7661	# <CJK>
-0xE198	0x6178	0x7662	# <CJK>
-0xE199	0x6179	0x7668	# <CJK>
-0xE19A	0x617A	0x7669	# <CJK>
-0xE19B	0x617B	0x766A	# <CJK>
-0xE19C	0x617C	0x7667	# <CJK>
-0xE19D	0x617D	0x766C	# <CJK>
-0xE19E	0x617E	0x7670	# <CJK>
-0xE19F	0x6221	0x7672	# <CJK>
-0xE1A0	0x6222	0x7676	# <CJK>
-0xE1A1	0x6223	0x7678	# <CJK>
-0xE1A2	0x6224	0x767C	# <CJK>
-0xE1A3	0x6225	0x7680	# <CJK>
-0xE1A4	0x6226	0x7683	# <CJK>
-0xE1A5	0x6227	0x7688	# <CJK>
-0xE1A6	0x6228	0x768B	# <CJK>
-0xE1A7	0x6229	0x768E	# <CJK>
-0xE1A8	0x622A	0x7696	# <CJK>
-0xE1A9	0x622B	0x7693	# <CJK>
-0xE1AA	0x622C	0x7699	# <CJK>
-0xE1AB	0x622D	0x769A	# <CJK>
-0xE1AC	0x622E	0x76B0	# <CJK>
-0xE1AD	0x622F	0x76B4	# <CJK>
-0xE1AE	0x6230	0x76B8	# <CJK>
-0xE1AF	0x6231	0x76B9	# <CJK>
-0xE1B0	0x6232	0x76BA	# <CJK>
-0xE1B1	0x6233	0x76C2	# <CJK>
-0xE1B2	0x6234	0x76CD	# <CJK>
-0xE1B3	0x6235	0x76D6	# <CJK>
-0xE1B4	0x6236	0x76D2	# <CJK>
-0xE1B5	0x6237	0x76DE	# <CJK>
-0xE1B6	0x6238	0x76E1	# <CJK>
-0xE1B7	0x6239	0x76E5	# <CJK>
-0xE1B8	0x623A	0x76E7	# <CJK>
-0xE1B9	0x623B	0x76EA	# <CJK>
-0xE1BA	0x623C	0x862F	# <CJK>
-0xE1BB	0x623D	0x76FB	# <CJK>
-0xE1BC	0x623E	0x7708	# <CJK>
-0xE1BD	0x623F	0x7707	# <CJK>
-0xE1BE	0x6240	0x7704	# <CJK>
-0xE1BF	0x6241	0x7729	# <CJK>
-0xE1C0	0x6242	0x7724	# <CJK>
-0xE1C1	0x6243	0x771E	# <CJK>
-0xE1C2	0x6244	0x7725	# <CJK>
-0xE1C3	0x6245	0x7726	# <CJK>
-0xE1C4	0x6246	0x771B	# <CJK>
-0xE1C5	0x6247	0x7737	# <CJK>
-0xE1C6	0x6248	0x7738	# <CJK>
-0xE1C7	0x6249	0x7747	# <CJK>
-0xE1C8	0x624A	0x775A	# <CJK>
-0xE1C9	0x624B	0x7768	# <CJK>
-0xE1CA	0x624C	0x776B	# <CJK>
-0xE1CB	0x624D	0x775B	# <CJK>
-0xE1CC	0x624E	0x7765	# <CJK>
-0xE1CD	0x624F	0x777F	# <CJK>
-0xE1CE	0x6250	0x777E	# <CJK>
-0xE1CF	0x6251	0x7779	# <CJK>
-0xE1D0	0x6252	0x778E	# <CJK>
-0xE1D1	0x6253	0x778B	# <CJK>
-0xE1D2	0x6254	0x7791	# <CJK>
-0xE1D3	0x6255	0x77A0	# <CJK>
-0xE1D4	0x6256	0x779E	# <CJK>
-0xE1D5	0x6257	0x77B0	# <CJK>
-0xE1D6	0x6258	0x77B6	# <CJK>
-0xE1D7	0x6259	0x77B9	# <CJK>
-0xE1D8	0x625A	0x77BF	# <CJK>
-0xE1D9	0x625B	0x77BC	# <CJK>
-0xE1DA	0x625C	0x77BD	# <CJK>
-0xE1DB	0x625D	0x77BB	# <CJK>
-0xE1DC	0x625E	0x77C7	# <CJK>
-0xE1DD	0x625F	0x77CD	# <CJK>
-0xE1DE	0x6260	0x77D7	# <CJK>
-0xE1DF	0x6261	0x77DA	# <CJK>
-0xE1E0	0x6262	0x77DC	# <CJK>
-0xE1E1	0x6263	0x77E3	# <CJK>
-0xE1E2	0x6264	0x77EE	# <CJK>
-0xE1E3	0x6265	0x77FC	# <CJK>
-0xE1E4	0x6266	0x780C	# <CJK>
-0xE1E5	0x6267	0x7812	# <CJK>
-0xE1E6	0x6268	0x7926	# <CJK>
-0xE1E7	0x6269	0x7820	# <CJK>
-0xE1E8	0x626A	0x792A	# <CJK>
-0xE1E9	0x626B	0x7845	# <CJK>
-0xE1EA	0x626C	0x788E	# <CJK>
-0xE1EB	0x626D	0x7874	# <CJK>
-0xE1EC	0x626E	0x7886	# <CJK>
-0xE1ED	0x626F	0x787C	# <CJK>
-0xE1EE	0x6270	0x789A	# <CJK>
-0xE1EF	0x6271	0x788C	# <CJK>
-0xE1F0	0x6272	0x78A3	# <CJK>
-0xE1F1	0x6273	0x78B5	# <CJK>
-0xE1F2	0x6274	0x78AA	# <CJK>
-0xE1F3	0x6275	0x78AF	# <CJK>
-0xE1F4	0x6276	0x78D1	# <CJK>
-0xE1F5	0x6277	0x78C6	# <CJK>
-0xE1F6	0x6278	0x78CB	# <CJK>
-0xE1F7	0x6279	0x78D4	# <CJK>
-0xE1F8	0x627A	0x78BE	# <CJK>
-0xE1F9	0x627B	0x78BC	# <CJK>
-0xE1FA	0x627C	0x78C5	# <CJK>
-0xE1FB	0x627D	0x78CA	# <CJK>
-0xE1FC	0x627E	0x78EC	# <CJK>
-0xE240	0x6321	0x78E7	# <CJK>
-0xE241	0x6322	0x78DA	# <CJK>
-0xE242	0x6323	0x78FD	# <CJK>
-0xE243	0x6324	0x78F4	# <CJK>
-0xE244	0x6325	0x7907	# <CJK>
-0xE245	0x6326	0x7912	# <CJK>
-0xE246	0x6327	0x7911	# <CJK>
-0xE247	0x6328	0x7919	# <CJK>
-0xE248	0x6329	0x792C	# <CJK>
-0xE249	0x632A	0x792B	# <CJK>
-0xE24A	0x632B	0x7940	# <CJK>
-0xE24B	0x632C	0x7960	# <CJK>
-0xE24C	0x632D	0x7957	# <CJK>
-0xE24D	0x632E	0x795F	# <CJK>
-0xE24E	0x632F	0x795A	# <CJK>
-0xE24F	0x6330	0x7955	# <CJK>
-0xE250	0x6331	0x7953	# <CJK>
-0xE251	0x6332	0x797A	# <CJK>
-0xE252	0x6333	0x797F	# <CJK>
-0xE253	0x6334	0x798A	# <CJK>
-0xE254	0x6335	0x799D	# <CJK>
-0xE255	0x6336	0x79A7	# <CJK>
-0xE256	0x6337	0x9F4B	# <CJK>
-0xE257	0x6338	0x79AA	# <CJK>
-0xE258	0x6339	0x79AE	# <CJK>
-0xE259	0x633A	0x79B3	# <CJK>
-0xE25A	0x633B	0x79B9	# <CJK>
-0xE25B	0x633C	0x79BA	# <CJK>
-0xE25C	0x633D	0x79C9	# <CJK>
-0xE25D	0x633E	0x79D5	# <CJK>
-0xE25E	0x633F	0x79E7	# <CJK>
-0xE25F	0x6340	0x79EC	# <CJK>
-0xE260	0x6341	0x79E1	# <CJK>
-0xE261	0x6342	0x79E3	# <CJK>
-0xE262	0x6343	0x7A08	# <CJK>
-0xE263	0x6344	0x7A0D	# <CJK>
-0xE264	0x6345	0x7A18	# <CJK>
-0xE265	0x6346	0x7A19	# <CJK>
-0xE266	0x6347	0x7A20	# <CJK>
-0xE267	0x6348	0x7A1F	# <CJK>
-0xE268	0x6349	0x7980	# <CJK>
-0xE269	0x634A	0x7A31	# <CJK>
-0xE26A	0x634B	0x7A3B	# <CJK>
-0xE26B	0x634C	0x7A3E	# <CJK>
-0xE26C	0x634D	0x7A37	# <CJK>
-0xE26D	0x634E	0x7A43	# <CJK>
-0xE26E	0x634F	0x7A57	# <CJK>
-0xE26F	0x6350	0x7A49	# <CJK>
-0xE270	0x6351	0x7A61	# <CJK>
-0xE271	0x6352	0x7A62	# <CJK>
-0xE272	0x6353	0x7A69	# <CJK>
-0xE273	0x6354	0x9F9D	# <CJK>
-0xE274	0x6355	0x7A70	# <CJK>
-0xE275	0x6356	0x7A79	# <CJK>
-0xE276	0x6357	0x7A7D	# <CJK>
-0xE277	0x6358	0x7A88	# <CJK>
-0xE278	0x6359	0x7A97	# <CJK>
-0xE279	0x635A	0x7A95	# <CJK>
-0xE27A	0x635B	0x7A98	# <CJK>
-0xE27B	0x635C	0x7A96	# <CJK>
-0xE27C	0x635D	0x7AA9	# <CJK>
-0xE27D	0x635E	0x7AC8	# <CJK>
-0xE27E	0x635F	0x7AB0	# <CJK>
-0xE280	0x6360	0x7AB6	# <CJK>
-0xE281	0x6361	0x7AC5	# <CJK>
-0xE282	0x6362	0x7AC4	# <CJK>
-0xE283	0x6363	0x7ABF	# <CJK>
-0xE284	0x6364	0x9083	# <CJK>
-0xE285	0x6365	0x7AC7	# <CJK>
-0xE286	0x6366	0x7ACA	# <CJK>
-0xE287	0x6367	0x7ACD	# <CJK>
-0xE288	0x6368	0x7ACF	# <CJK>
-0xE289	0x6369	0x7AD5	# <CJK>
-0xE28A	0x636A	0x7AD3	# <CJK>
-0xE28B	0x636B	0x7AD9	# <CJK>
-0xE28C	0x636C	0x7ADA	# <CJK>
-0xE28D	0x636D	0x7ADD	# <CJK>
-0xE28E	0x636E	0x7AE1	# <CJK>
-0xE28F	0x636F	0x7AE2	# <CJK>
-0xE290	0x6370	0x7AE6	# <CJK>
-0xE291	0x6371	0x7AED	# <CJK>
-0xE292	0x6372	0x7AF0	# <CJK>
-0xE293	0x6373	0x7B02	# <CJK>
-0xE294	0x6374	0x7B0F	# <CJK>
-0xE295	0x6375	0x7B0A	# <CJK>
-0xE296	0x6376	0x7B06	# <CJK>
-0xE297	0x6377	0x7B33	# <CJK>
-0xE298	0x6378	0x7B18	# <CJK>
-0xE299	0x6379	0x7B19	# <CJK>
-0xE29A	0x637A	0x7B1E	# <CJK>
-0xE29B	0x637B	0x7B35	# <CJK>
-0xE29C	0x637C	0x7B28	# <CJK>
-0xE29D	0x637D	0x7B36	# <CJK>
-0xE29E	0x637E	0x7B50	# <CJK>
-0xE29F	0x6421	0x7B7A	# <CJK>
-0xE2A0	0x6422	0x7B04	# <CJK>
-0xE2A1	0x6423	0x7B4D	# <CJK>
-0xE2A2	0x6424	0x7B0B	# <CJK>
-0xE2A3	0x6425	0x7B4C	# <CJK>
-0xE2A4	0x6426	0x7B45	# <CJK>
-0xE2A5	0x6427	0x7B75	# <CJK>
-0xE2A6	0x6428	0x7B65	# <CJK>
-0xE2A7	0x6429	0x7B74	# <CJK>
-0xE2A8	0x642A	0x7B67	# <CJK>
-0xE2A9	0x642B	0x7B70	# <CJK>
-0xE2AA	0x642C	0x7B71	# <CJK>
-0xE2AB	0x642D	0x7B6C	# <CJK>
-0xE2AC	0x642E	0x7B6E	# <CJK>
-0xE2AD	0x642F	0x7B9D	# <CJK>
-0xE2AE	0x6430	0x7B98	# <CJK>
-0xE2AF	0x6431	0x7B9F	# <CJK>
-0xE2B0	0x6432	0x7B8D	# <CJK>
-0xE2B1	0x6433	0x7B9C	# <CJK>
-0xE2B2	0x6434	0x7B9A	# <CJK>
-0xE2B3	0x6435	0x7B8B	# <CJK>
-0xE2B4	0x6436	0x7B92	# <CJK>
-0xE2B5	0x6437	0x7B8F	# <CJK>
-0xE2B6	0x6438	0x7B5D	# <CJK>
-0xE2B7	0x6439	0x7B99	# <CJK>
-0xE2B8	0x643A	0x7BCB	# <CJK>
-0xE2B9	0x643B	0x7BC1	# <CJK>
-0xE2BA	0x643C	0x7BCC	# <CJK>
-0xE2BB	0x643D	0x7BCF	# <CJK>
-0xE2BC	0x643E	0x7BB4	# <CJK>
-0xE2BD	0x643F	0x7BC6	# <CJK>
-0xE2BE	0x6440	0x7BDD	# <CJK>
-0xE2BF	0x6441	0x7BE9	# <CJK>
-0xE2C0	0x6442	0x7C11	# <CJK>
-0xE2C1	0x6443	0x7C14	# <CJK>
-0xE2C2	0x6444	0x7BE6	# <CJK>
-0xE2C3	0x6445	0x7BE5	# <CJK>
-0xE2C4	0x6446	0x7C60	# <CJK>
-0xE2C5	0x6447	0x7C00	# <CJK>
-0xE2C6	0x6448	0x7C07	# <CJK>
-0xE2C7	0x6449	0x7C13	# <CJK>
-0xE2C8	0x644A	0x7BF3	# <CJK>
-0xE2C9	0x644B	0x7BF7	# <CJK>
-0xE2CA	0x644C	0x7C17	# <CJK>
-0xE2CB	0x644D	0x7C0D	# <CJK>
-0xE2CC	0x644E	0x7BF6	# <CJK>
-0xE2CD	0x644F	0x7C23	# <CJK>
-0xE2CE	0x6450	0x7C27	# <CJK>
-0xE2CF	0x6451	0x7C2A	# <CJK>
-0xE2D0	0x6452	0x7C1F	# <CJK>
-0xE2D1	0x6453	0x7C37	# <CJK>
-0xE2D2	0x6454	0x7C2B	# <CJK>
-0xE2D3	0x6455	0x7C3D	# <CJK>
-0xE2D4	0x6456	0x7C4C	# <CJK>
-0xE2D5	0x6457	0x7C43	# <CJK>
-0xE2D6	0x6458	0x7C54	# <CJK>
-0xE2D7	0x6459	0x7C4F	# <CJK>
-0xE2D8	0x645A	0x7C40	# <CJK>
-0xE2D9	0x645B	0x7C50	# <CJK>
-0xE2DA	0x645C	0x7C58	# <CJK>
-0xE2DB	0x645D	0x7C5F	# <CJK>
-0xE2DC	0x645E	0x7C64	# <CJK>
-0xE2DD	0x645F	0x7C56	# <CJK>
-0xE2DE	0x6460	0x7C65	# <CJK>
-0xE2DF	0x6461	0x7C6C	# <CJK>
-0xE2E0	0x6462	0x7C75	# <CJK>
-0xE2E1	0x6463	0x7C83	# <CJK>
-0xE2E2	0x6464	0x7C90	# <CJK>
-0xE2E3	0x6465	0x7CA4	# <CJK>
-0xE2E4	0x6466	0x7CAD	# <CJK>
-0xE2E5	0x6467	0x7CA2	# <CJK>
-0xE2E6	0x6468	0x7CAB	# <CJK>
-0xE2E7	0x6469	0x7CA1	# <CJK>
-0xE2E8	0x646A	0x7CA8	# <CJK>
-0xE2E9	0x646B	0x7CB3	# <CJK>
-0xE2EA	0x646C	0x7CB2	# <CJK>
-0xE2EB	0x646D	0x7CB1	# <CJK>
-0xE2EC	0x646E	0x7CAE	# <CJK>
-0xE2ED	0x646F	0x7CB9	# <CJK>
-0xE2EE	0x6470	0x7CBD	# <CJK>
-0xE2EF	0x6471	0x7CC0	# <CJK>
-0xE2F0	0x6472	0x7CC5	# <CJK>
-0xE2F1	0x6473	0x7CC2	# <CJK>
-0xE2F2	0x6474	0x7CD8	# <CJK>
-0xE2F3	0x6475	0x7CD2	# <CJK>
-0xE2F4	0x6476	0x7CDC	# <CJK>
-0xE2F5	0x6477	0x7CE2	# <CJK>
-0xE2F6	0x6478	0x9B3B	# <CJK>
-0xE2F7	0x6479	0x7CEF	# <CJK>
-0xE2F8	0x647A	0x7CF2	# <CJK>
-0xE2F9	0x647B	0x7CF4	# <CJK>
-0xE2FA	0x647C	0x7CF6	# <CJK>
-0xE2FB	0x647D	0x7CFA	# <CJK>
-0xE2FC	0x647E	0x7D06	# <CJK>
-0xE340	0x6521	0x7D02	# <CJK>
-0xE341	0x6522	0x7D1C	# <CJK>
-0xE342	0x6523	0x7D15	# <CJK>
-0xE343	0x6524	0x7D0A	# <CJK>
-0xE344	0x6525	0x7D45	# <CJK>
-0xE345	0x6526	0x7D4B	# <CJK>
-0xE346	0x6527	0x7D2E	# <CJK>
-0xE347	0x6528	0x7D32	# <CJK>
-0xE348	0x6529	0x7D3F	# <CJK>
-0xE349	0x652A	0x7D35	# <CJK>
-0xE34A	0x652B	0x7D46	# <CJK>
-0xE34B	0x652C	0x7D73	# <CJK>
-0xE34C	0x652D	0x7D56	# <CJK>
-0xE34D	0x652E	0x7D4E	# <CJK>
-0xE34E	0x652F	0x7D72	# <CJK>
-0xE34F	0x6530	0x7D68	# <CJK>
-0xE350	0x6531	0x7D6E	# <CJK>
-0xE351	0x6532	0x7D4F	# <CJK>
-0xE352	0x6533	0x7D63	# <CJK>
-0xE353	0x6534	0x7D93	# <CJK>
-0xE354	0x6535	0x7D89	# <CJK>
-0xE355	0x6536	0x7D5B	# <CJK>
-0xE356	0x6537	0x7D8F	# <CJK>
-0xE357	0x6538	0x7D7D	# <CJK>
-0xE358	0x6539	0x7D9B	# <CJK>
-0xE359	0x653A	0x7DBA	# <CJK>
-0xE35A	0x653B	0x7DAE	# <CJK>
-0xE35B	0x653C	0x7DA3	# <CJK>
-0xE35C	0x653D	0x7DB5	# <CJK>
-0xE35D	0x653E	0x7DC7	# <CJK>
-0xE35E	0x653F	0x7DBD	# <CJK>
-0xE35F	0x6540	0x7DAB	# <CJK>
-0xE360	0x6541	0x7E3D	# <CJK>
-0xE361	0x6542	0x7DA2	# <CJK>
-0xE362	0x6543	0x7DAF	# <CJK>
-0xE363	0x6544	0x7DDC	# <CJK>
-0xE364	0x6545	0x7DB8	# <CJK>
-0xE365	0x6546	0x7D9F	# <CJK>
-0xE366	0x6547	0x7DB0	# <CJK>
-0xE367	0x6548	0x7DD8	# <CJK>
-0xE368	0x6549	0x7DDD	# <CJK>
-0xE369	0x654A	0x7DE4	# <CJK>
-0xE36A	0x654B	0x7DDE	# <CJK>
-0xE36B	0x654C	0x7DFB	# <CJK>
-0xE36C	0x654D	0x7DF2	# <CJK>
-0xE36D	0x654E	0x7DE1	# <CJK>
-0xE36E	0x654F	0x7E05	# <CJK>
-0xE36F	0x6550	0x7E0A	# <CJK>
-0xE370	0x6551	0x7E23	# <CJK>
-0xE371	0x6552	0x7E21	# <CJK>
-0xE372	0x6553	0x7E12	# <CJK>
-0xE373	0x6554	0x7E31	# <CJK>
-0xE374	0x6555	0x7E1F	# <CJK>
-0xE375	0x6556	0x7E09	# <CJK>
-0xE376	0x6557	0x7E0B	# <CJK>
-0xE377	0x6558	0x7E22	# <CJK>
-0xE378	0x6559	0x7E46	# <CJK>
-0xE379	0x655A	0x7E66	# <CJK>
-0xE37A	0x655B	0x7E3B	# <CJK>
-0xE37B	0x655C	0x7E35	# <CJK>
-0xE37C	0x655D	0x7E39	# <CJK>
-0xE37D	0x655E	0x7E43	# <CJK>
-0xE37E	0x655F	0x7E37	# <CJK>
-0xE380	0x6560	0x7E32	# <CJK>
-0xE381	0x6561	0x7E3A	# <CJK>
-0xE382	0x6562	0x7E67	# <CJK>
-0xE383	0x6563	0x7E5D	# <CJK>
-0xE384	0x6564	0x7E56	# <CJK>
-0xE385	0x6565	0x7E5E	# <CJK>
-0xE386	0x6566	0x7E59	# <CJK>
-0xE387	0x6567	0x7E5A	# <CJK>
-0xE388	0x6568	0x7E79	# <CJK>
-0xE389	0x6569	0x7E6A	# <CJK>
-0xE38A	0x656A	0x7E69	# <CJK>
-0xE38B	0x656B	0x7E7C	# <CJK>
-0xE38C	0x656C	0x7E7B	# <CJK>
-0xE38D	0x656D	0x7E83	# <CJK>
-0xE38E	0x656E	0x7DD5	# <CJK>
-0xE38F	0x656F	0x7E7D	# <CJK>
-0xE390	0x6570	0x8FAE	# <CJK>
-0xE391	0x6571	0x7E7F	# <CJK>
-0xE392	0x6572	0x7E88	# <CJK>
-0xE393	0x6573	0x7E89	# <CJK>
-0xE394	0x6574	0x7E8C	# <CJK>
-0xE395	0x6575	0x7E92	# <CJK>
-0xE396	0x6576	0x7E90	# <CJK>
-0xE397	0x6577	0x7E93	# <CJK>
-0xE398	0x6578	0x7E94	# <CJK>
-0xE399	0x6579	0x7E96	# <CJK>
-0xE39A	0x657A	0x7E8E	# <CJK>
-0xE39B	0x657B	0x7E9B	# <CJK>
-0xE39C	0x657C	0x7E9C	# <CJK>
-0xE39D	0x657D	0x7F38	# <CJK>
-0xE39E	0x657E	0x7F3A	# <CJK>
-0xE39F	0x6621	0x7F45	# <CJK>
-0xE3A0	0x6622	0x7F4C	# <CJK>
-0xE3A1	0x6623	0x7F4D	# <CJK>
-0xE3A2	0x6624	0x7F4E	# <CJK>
-0xE3A3	0x6625	0x7F50	# <CJK>
-0xE3A4	0x6626	0x7F51	# <CJK>
-0xE3A5	0x6627	0x7F55	# <CJK>
-0xE3A6	0x6628	0x7F54	# <CJK>
-0xE3A7	0x6629	0x7F58	# <CJK>
-0xE3A8	0x662A	0x7F5F	# <CJK>
-0xE3A9	0x662B	0x7F60	# <CJK>
-0xE3AA	0x662C	0x7F68	# <CJK>
-0xE3AB	0x662D	0x7F69	# <CJK>
-0xE3AC	0x662E	0x7F67	# <CJK>
-0xE3AD	0x662F	0x7F78	# <CJK>
-0xE3AE	0x6630	0x7F82	# <CJK>
-0xE3AF	0x6631	0x7F86	# <CJK>
-0xE3B0	0x6632	0x7F83	# <CJK>
-0xE3B1	0x6633	0x7F88	# <CJK>
-0xE3B2	0x6634	0x7F87	# <CJK>
-0xE3B3	0x6635	0x7F8C	# <CJK>
-0xE3B4	0x6636	0x7F94	# <CJK>
-0xE3B5	0x6637	0x7F9E	# <CJK>
-0xE3B6	0x6638	0x7F9D	# <CJK>
-0xE3B7	0x6639	0x7F9A	# <CJK>
-0xE3B8	0x663A	0x7FA3	# <CJK>
-0xE3B9	0x663B	0x7FAF	# <CJK>
-0xE3BA	0x663C	0x7FB2	# <CJK>
-0xE3BB	0x663D	0x7FB9	# <CJK>
-0xE3BC	0x663E	0x7FAE	# <CJK>
-0xE3BD	0x663F	0x7FB6	# <CJK>
-0xE3BE	0x6640	0x7FB8	# <CJK>
-0xE3BF	0x6641	0x8B71	# <CJK>
-0xE3C0	0x6642	0x7FC5	# <CJK>
-0xE3C1	0x6643	0x7FC6	# <CJK>
-0xE3C2	0x6644	0x7FCA	# <CJK>
-0xE3C3	0x6645	0x7FD5	# <CJK>
-0xE3C4	0x6646	0x7FD4	# <CJK>
-0xE3C5	0x6647	0x7FE1	# <CJK>
-0xE3C6	0x6648	0x7FE6	# <CJK>
-0xE3C7	0x6649	0x7FE9	# <CJK>
-0xE3C8	0x664A	0x7FF3	# <CJK>
-0xE3C9	0x664B	0x7FF9	# <CJK>
-0xE3CA	0x664C	0x98DC	# <CJK>
-0xE3CB	0x664D	0x8006	# <CJK>
-0xE3CC	0x664E	0x8004	# <CJK>
-0xE3CD	0x664F	0x800B	# <CJK>
-0xE3CE	0x6650	0x8012	# <CJK>
-0xE3CF	0x6651	0x8018	# <CJK>
-0xE3D0	0x6652	0x8019	# <CJK>
-0xE3D1	0x6653	0x801C	# <CJK>
-0xE3D2	0x6654	0x8021	# <CJK>
-0xE3D3	0x6655	0x8028	# <CJK>
-0xE3D4	0x6656	0x803F	# <CJK>
-0xE3D5	0x6657	0x803B	# <CJK>
-0xE3D6	0x6658	0x804A	# <CJK>
-0xE3D7	0x6659	0x8046	# <CJK>
-0xE3D8	0x665A	0x8052	# <CJK>
-0xE3D9	0x665B	0x8058	# <CJK>
-0xE3DA	0x665C	0x805A	# <CJK>
-0xE3DB	0x665D	0x805F	# <CJK>
-0xE3DC	0x665E	0x8062	# <CJK>
-0xE3DD	0x665F	0x8068	# <CJK>
-0xE3DE	0x6660	0x8073	# <CJK>
-0xE3DF	0x6661	0x8072	# <CJK>
-0xE3E0	0x6662	0x8070	# <CJK>
-0xE3E1	0x6663	0x8076	# <CJK>
-0xE3E2	0x6664	0x8079	# <CJK>
-0xE3E3	0x6665	0x807D	# <CJK>
-0xE3E4	0x6666	0x807F	# <CJK>
-0xE3E5	0x6667	0x8084	# <CJK>
-0xE3E6	0x6668	0x8086	# <CJK>
-0xE3E7	0x6669	0x8085	# <CJK>
-0xE3E8	0x666A	0x809B	# <CJK>
-0xE3E9	0x666B	0x8093	# <CJK>
-0xE3EA	0x666C	0x809A	# <CJK>
-0xE3EB	0x666D	0x80AD	# <CJK>
-0xE3EC	0x666E	0x5190	# <CJK>
-0xE3ED	0x666F	0x80AC	# <CJK>
-0xE3EE	0x6670	0x80DB	# <CJK>
-0xE3EF	0x6671	0x80E5	# <CJK>
-0xE3F0	0x6672	0x80D9	# <CJK>
-0xE3F1	0x6673	0x80DD	# <CJK>
-0xE3F2	0x6674	0x80C4	# <CJK>
-0xE3F3	0x6675	0x80DA	# <CJK>
-0xE3F4	0x6676	0x80D6	# <CJK>
-0xE3F5	0x6677	0x8109	# <CJK>
-0xE3F6	0x6678	0x80EF	# <CJK>
-0xE3F7	0x6679	0x80F1	# <CJK>
-0xE3F8	0x667A	0x811B	# <CJK>
-0xE3F9	0x667B	0x8129	# <CJK>
-0xE3FA	0x667C	0x8123	# <CJK>
-0xE3FB	0x667D	0x812F	# <CJK>
-0xE3FC	0x667E	0x814B	# <CJK>
-0xE440	0x6721	0x968B	# <CJK>
-0xE441	0x6722	0x8146	# <CJK>
-0xE442	0x6723	0x813E	# <CJK>
-0xE443	0x6724	0x8153	# <CJK>
-0xE444	0x6725	0x8151	# <CJK>
-0xE445	0x6726	0x80FC	# <CJK>
-0xE446	0x6727	0x8171	# <CJK>
-0xE447	0x6728	0x816E	# <CJK>
-0xE448	0x6729	0x8165	# <CJK>
-0xE449	0x672A	0x8166	# <CJK>
-0xE44A	0x672B	0x8174	# <CJK>
-0xE44B	0x672C	0x8183	# <CJK>
-0xE44C	0x672D	0x8188	# <CJK>
-0xE44D	0x672E	0x818A	# <CJK>
-0xE44E	0x672F	0x8180	# <CJK>
-0xE44F	0x6730	0x8182	# <CJK>
-0xE450	0x6731	0x81A0	# <CJK>
-0xE451	0x6732	0x8195	# <CJK>
-0xE452	0x6733	0x81A4	# <CJK>
-0xE453	0x6734	0x81A3	# <CJK>
-0xE454	0x6735	0x815F	# <CJK>
-0xE455	0x6736	0x8193	# <CJK>
-0xE456	0x6737	0x81A9	# <CJK>
-0xE457	0x6738	0x81B0	# <CJK>
-0xE458	0x6739	0x81B5	# <CJK>
-0xE459	0x673A	0x81BE	# <CJK>
-0xE45A	0x673B	0x81B8	# <CJK>
-0xE45B	0x673C	0x81BD	# <CJK>
-0xE45C	0x673D	0x81C0	# <CJK>
-0xE45D	0x673E	0x81C2	# <CJK>
-0xE45E	0x673F	0x81BA	# <CJK>
-0xE45F	0x6740	0x81C9	# <CJK>
-0xE460	0x6741	0x81CD	# <CJK>
-0xE461	0x6742	0x81D1	# <CJK>
-0xE462	0x6743	0x81D9	# <CJK>
-0xE463	0x6744	0x81D8	# <CJK>
-0xE464	0x6745	0x81C8	# <CJK>
-0xE465	0x6746	0x81DA	# <CJK>
-0xE466	0x6747	0x81DF	# <CJK>
-0xE467	0x6748	0x81E0	# <CJK>
-0xE468	0x6749	0x81E7	# <CJK>
-0xE469	0x674A	0x81FA	# <CJK>
-0xE46A	0x674B	0x81FB	# <CJK>
-0xE46B	0x674C	0x81FE	# <CJK>
-0xE46C	0x674D	0x8201	# <CJK>
-0xE46D	0x674E	0x8202	# <CJK>
-0xE46E	0x674F	0x8205	# <CJK>
-0xE46F	0x6750	0x8207	# <CJK>
-0xE470	0x6751	0x820A	# <CJK>
-0xE471	0x6752	0x820D	# <CJK>
-0xE472	0x6753	0x8210	# <CJK>
-0xE473	0x6754	0x8216	# <CJK>
-0xE474	0x6755	0x8229	# <CJK>
-0xE475	0x6756	0x822B	# <CJK>
-0xE476	0x6757	0x8238	# <CJK>
-0xE477	0x6758	0x8233	# <CJK>
-0xE478	0x6759	0x8240	# <CJK>
-0xE479	0x675A	0x8259	# <CJK>
-0xE47A	0x675B	0x8258	# <CJK>
-0xE47B	0x675C	0x825D	# <CJK>
-0xE47C	0x675D	0x825A	# <CJK>
-0xE47D	0x675E	0x825F	# <CJK>
-0xE47E	0x675F	0x8264	# <CJK>
-0xE480	0x6760	0x8262	# <CJK>
-0xE481	0x6761	0x8268	# <CJK>
-0xE482	0x6762	0x826A	# <CJK>
-0xE483	0x6763	0x826B	# <CJK>
-0xE484	0x6764	0x822E	# <CJK>
-0xE485	0x6765	0x8271	# <CJK>
-0xE486	0x6766	0x8277	# <CJK>
-0xE487	0x6767	0x8278	# <CJK>
-0xE488	0x6768	0x827E	# <CJK>
-0xE489	0x6769	0x828D	# <CJK>
-0xE48A	0x676A	0x8292	# <CJK>
-0xE48B	0x676B	0x82AB	# <CJK>
-0xE48C	0x676C	0x829F	# <CJK>
-0xE48D	0x676D	0x82BB	# <CJK>
-0xE48E	0x676E	0x82AC	# <CJK>
-0xE48F	0x676F	0x82E1	# <CJK>
-0xE490	0x6770	0x82E3	# <CJK>
-0xE491	0x6771	0x82DF	# <CJK>
-0xE492	0x6772	0x82D2	# <CJK>
-0xE493	0x6773	0x82F4	# <CJK>
-0xE494	0x6774	0x82F3	# <CJK>
-0xE495	0x6775	0x82FA	# <CJK>
-0xE496	0x6776	0x8393	# <CJK>
-0xE497	0x6777	0x8303	# <CJK>
-0xE498	0x6778	0x82FB	# <CJK>
-0xE499	0x6779	0x82F9	# <CJK>
-0xE49A	0x677A	0x82DE	# <CJK>
-0xE49B	0x677B	0x8306	# <CJK>
-0xE49C	0x677C	0x82DC	# <CJK>
-0xE49D	0x677D	0x8309	# <CJK>
-0xE49E	0x677E	0x82D9	# <CJK>
-0xE49F	0x6821	0x8335	# <CJK>
-0xE4A0	0x6822	0x8334	# <CJK>
-0xE4A1	0x6823	0x8316	# <CJK>
-0xE4A2	0x6824	0x8332	# <CJK>
-0xE4A3	0x6825	0x8331	# <CJK>
-0xE4A4	0x6826	0x8340	# <CJK>
-0xE4A5	0x6827	0x8339	# <CJK>
-0xE4A6	0x6828	0x8350	# <CJK>
-0xE4A7	0x6829	0x8345	# <CJK>
-0xE4A8	0x682A	0x832F	# <CJK>
-0xE4A9	0x682B	0x832B	# <CJK>
-0xE4AA	0x682C	0x8317	# <CJK>
-0xE4AB	0x682D	0x8318	# <CJK>
-0xE4AC	0x682E	0x8385	# <CJK>
-0xE4AD	0x682F	0x839A	# <CJK>
-0xE4AE	0x6830	0x83AA	# <CJK>
-0xE4AF	0x6831	0x839F	# <CJK>
-0xE4B0	0x6832	0x83A2	# <CJK>
-0xE4B1	0x6833	0x8396	# <CJK>
-0xE4B2	0x6834	0x8323	# <CJK>
-0xE4B3	0x6835	0x838E	# <CJK>
-0xE4B4	0x6836	0x8387	# <CJK>
-0xE4B5	0x6837	0x838A	# <CJK>
-0xE4B6	0x6838	0x837C	# <CJK>
-0xE4B7	0x6839	0x83B5	# <CJK>
-0xE4B8	0x683A	0x8373	# <CJK>
-0xE4B9	0x683B	0x8375	# <CJK>
-0xE4BA	0x683C	0x83A0	# <CJK>
-0xE4BB	0x683D	0x8389	# <CJK>
-0xE4BC	0x683E	0x83A8	# <CJK>
-0xE4BD	0x683F	0x83F4	# <CJK>
-0xE4BE	0x6840	0x8413	# <CJK>
-0xE4BF	0x6841	0x83EB	# <CJK>
-0xE4C0	0x6842	0x83CE	# <CJK>
-0xE4C1	0x6843	0x83FD	# <CJK>
-0xE4C2	0x6844	0x8403	# <CJK>
-0xE4C3	0x6845	0x83D8	# <CJK>
-0xE4C4	0x6846	0x840B	# <CJK>
-0xE4C5	0x6847	0x83C1	# <CJK>
-0xE4C6	0x6848	0x83F7	# <CJK>
-0xE4C7	0x6849	0x8407	# <CJK>
-0xE4C8	0x684A	0x83E0	# <CJK>
-0xE4C9	0x684B	0x83F2	# <CJK>
-0xE4CA	0x684C	0x840D	# <CJK>
-0xE4CB	0x684D	0x8422	# <CJK>
-0xE4CC	0x684E	0x8420	# <CJK>
-0xE4CD	0x684F	0x83BD	# <CJK>
-0xE4CE	0x6850	0x8438	# <CJK>
-0xE4CF	0x6851	0x8506	# <CJK>
-0xE4D0	0x6852	0x83FB	# <CJK>
-0xE4D1	0x6853	0x846D	# <CJK>
-0xE4D2	0x6854	0x842A	# <CJK>
-0xE4D3	0x6855	0x843C	# <CJK>
-0xE4D4	0x6856	0x855A	# <CJK>
-0xE4D5	0x6857	0x8484	# <CJK>
-0xE4D6	0x6858	0x8477	# <CJK>
-0xE4D7	0x6859	0x846B	# <CJK>
-0xE4D8	0x685A	0x84AD	# <CJK>
-0xE4D9	0x685B	0x846E	# <CJK>
-0xE4DA	0x685C	0x8482	# <CJK>
-0xE4DB	0x685D	0x8469	# <CJK>
-0xE4DC	0x685E	0x8446	# <CJK>
-0xE4DD	0x685F	0x842C	# <CJK>
-0xE4DE	0x6860	0x846F	# <CJK>
-0xE4DF	0x6861	0x8479	# <CJK>
-0xE4E0	0x6862	0x8435	# <CJK>
-0xE4E1	0x6863	0x84CA	# <CJK>
-0xE4E2	0x6864	0x8462	# <CJK>
-0xE4E3	0x6865	0x84B9	# <CJK>
-0xE4E4	0x6866	0x84BF	# <CJK>
-0xE4E5	0x6867	0x849F	# <CJK>
-0xE4E6	0x6868	0x84D9	# <CJK>
-0xE4E7	0x6869	0x84CD	# <CJK>
-0xE4E8	0x686A	0x84BB	# <CJK>
-0xE4E9	0x686B	0x84DA	# <CJK>
-0xE4EA	0x686C	0x84D0	# <CJK>
-0xE4EB	0x686D	0x84C1	# <CJK>
-0xE4EC	0x686E	0x84C6	# <CJK>
-0xE4ED	0x686F	0x84D6	# <CJK>
-0xE4EE	0x6870	0x84A1	# <CJK>
-0xE4EF	0x6871	0x8521	# <CJK>
-0xE4F0	0x6872	0x84FF	# <CJK>
-0xE4F1	0x6873	0x84F4	# <CJK>
-0xE4F2	0x6874	0x8517	# <CJK>
-0xE4F3	0x6875	0x8518	# <CJK>
-0xE4F4	0x6876	0x852C	# <CJK>
-0xE4F5	0x6877	0x851F	# <CJK>
-0xE4F6	0x6878	0x8515	# <CJK>
-0xE4F7	0x6879	0x8514	# <CJK>
-0xE4F8	0x687A	0x84FC	# <CJK>
-0xE4F9	0x687B	0x8540	# <CJK>
-0xE4FA	0x687C	0x8563	# <CJK>
-0xE4FB	0x687D	0x8558	# <CJK>
-0xE4FC	0x687E	0x8548	# <CJK>
-0xE540	0x6921	0x8541	# <CJK>
-0xE541	0x6922	0x8602	# <CJK>
-0xE542	0x6923	0x854B	# <CJK>
-0xE543	0x6924	0x8555	# <CJK>
-0xE544	0x6925	0x8580	# <CJK>
-0xE545	0x6926	0x85A4	# <CJK>
-0xE546	0x6927	0x8588	# <CJK>
-0xE547	0x6928	0x8591	# <CJK>
-0xE548	0x6929	0x858A	# <CJK>
-0xE549	0x692A	0x85A8	# <CJK>
-0xE54A	0x692B	0x856D	# <CJK>
-0xE54B	0x692C	0x8594	# <CJK>
-0xE54C	0x692D	0x859B	# <CJK>
-0xE54D	0x692E	0x85EA	# <CJK>
-0xE54E	0x692F	0x8587	# <CJK>
-0xE54F	0x6930	0x859C	# <CJK>
-0xE550	0x6931	0x8577	# <CJK>
-0xE551	0x6932	0x857E	# <CJK>
-0xE552	0x6933	0x8590	# <CJK>
-0xE553	0x6934	0x85C9	# <CJK>
-0xE554	0x6935	0x85BA	# <CJK>
-0xE555	0x6936	0x85CF	# <CJK>
-0xE556	0x6937	0x85B9	# <CJK>
-0xE557	0x6938	0x85D0	# <CJK>
-0xE558	0x6939	0x85D5	# <CJK>
-0xE559	0x693A	0x85DD	# <CJK>
-0xE55A	0x693B	0x85E5	# <CJK>
-0xE55B	0x693C	0x85DC	# <CJK>
-0xE55C	0x693D	0x85F9	# <CJK>
-0xE55D	0x693E	0x860A	# <CJK>
-0xE55E	0x693F	0x8613	# <CJK>
-0xE55F	0x6940	0x860B	# <CJK>
-0xE560	0x6941	0x85FE	# <CJK>
-0xE561	0x6942	0x85FA	# <CJK>
-0xE562	0x6943	0x8606	# <CJK>
-0xE563	0x6944	0x8622	# <CJK>
-0xE564	0x6945	0x861A	# <CJK>
-0xE565	0x6946	0x8630	# <CJK>
-0xE566	0x6947	0x863F	# <CJK>
-0xE567	0x6948	0x864D	# <CJK>
-0xE568	0x6949	0x4E55	# <CJK>
-0xE569	0x694A	0x8654	# <CJK>
-0xE56A	0x694B	0x865F	# <CJK>
-0xE56B	0x694C	0x8667	# <CJK>
-0xE56C	0x694D	0x8671	# <CJK>
-0xE56D	0x694E	0x8693	# <CJK>
-0xE56E	0x694F	0x86A3	# <CJK>
-0xE56F	0x6950	0x86A9	# <CJK>
-0xE570	0x6951	0x86AA	# <CJK>
-0xE571	0x6952	0x868B	# <CJK>
-0xE572	0x6953	0x868C	# <CJK>
-0xE573	0x6954	0x86B6	# <CJK>
-0xE574	0x6955	0x86AF	# <CJK>
-0xE575	0x6956	0x86C4	# <CJK>
-0xE576	0x6957	0x86C6	# <CJK>
-0xE577	0x6958	0x86B0	# <CJK>
-0xE578	0x6959	0x86C9	# <CJK>
-0xE579	0x695A	0x8823	# <CJK>
-0xE57A	0x695B	0x86AB	# <CJK>
-0xE57B	0x695C	0x86D4	# <CJK>
-0xE57C	0x695D	0x86DE	# <CJK>
-0xE57D	0x695E	0x86E9	# <CJK>
-0xE57E	0x695F	0x86EC	# <CJK>
-0xE580	0x6960	0x86DF	# <CJK>
-0xE581	0x6961	0x86DB	# <CJK>
-0xE582	0x6962	0x86EF	# <CJK>
-0xE583	0x6963	0x8712	# <CJK>
-0xE584	0x6964	0x8706	# <CJK>
-0xE585	0x6965	0x8708	# <CJK>
-0xE586	0x6966	0x8700	# <CJK>
-0xE587	0x6967	0x8703	# <CJK>
-0xE588	0x6968	0x86FB	# <CJK>
-0xE589	0x6969	0x8711	# <CJK>
-0xE58A	0x696A	0x8709	# <CJK>
-0xE58B	0x696B	0x870D	# <CJK>
-0xE58C	0x696C	0x86F9	# <CJK>
-0xE58D	0x696D	0x870A	# <CJK>
-0xE58E	0x696E	0x8734	# <CJK>
-0xE58F	0x696F	0x873F	# <CJK>
-0xE590	0x6970	0x8737	# <CJK>
-0xE591	0x6971	0x873B	# <CJK>
-0xE592	0x6972	0x8725	# <CJK>
-0xE593	0x6973	0x8729	# <CJK>
-0xE594	0x6974	0x871A	# <CJK>
-0xE595	0x6975	0x8760	# <CJK>
-0xE596	0x6976	0x875F	# <CJK>
-0xE597	0x6977	0x8778	# <CJK>
-0xE598	0x6978	0x874C	# <CJK>
-0xE599	0x6979	0x874E	# <CJK>
-0xE59A	0x697A	0x8774	# <CJK>
-0xE59B	0x697B	0x8757	# <CJK>
-0xE59C	0x697C	0x8768	# <CJK>
-0xE59D	0x697D	0x876E	# <CJK>
-0xE59E	0x697E	0x8759	# <CJK>
-0xE59F	0x6A21	0x8753	# <CJK>
-0xE5A0	0x6A22	0x8763	# <CJK>
-0xE5A1	0x6A23	0x876A	# <CJK>
-0xE5A2	0x6A24	0x8805	# <CJK>
-0xE5A3	0x6A25	0x87A2	# <CJK>
-0xE5A4	0x6A26	0x879F	# <CJK>
-0xE5A5	0x6A27	0x8782	# <CJK>
-0xE5A6	0x6A28	0x87AF	# <CJK>
-0xE5A7	0x6A29	0x87CB	# <CJK>
-0xE5A8	0x6A2A	0x87BD	# <CJK>
-0xE5A9	0x6A2B	0x87C0	# <CJK>
-0xE5AA	0x6A2C	0x87D0	# <CJK>
-0xE5AB	0x6A2D	0x96D6	# <CJK>
-0xE5AC	0x6A2E	0x87AB	# <CJK>
-0xE5AD	0x6A2F	0x87C4	# <CJK>
-0xE5AE	0x6A30	0x87B3	# <CJK>
-0xE5AF	0x6A31	0x87C7	# <CJK>
-0xE5B0	0x6A32	0x87C6	# <CJK>
-0xE5B1	0x6A33	0x87BB	# <CJK>
-0xE5B2	0x6A34	0x87EF	# <CJK>
-0xE5B3	0x6A35	0x87F2	# <CJK>
-0xE5B4	0x6A36	0x87E0	# <CJK>
-0xE5B5	0x6A37	0x880F	# <CJK>
-0xE5B6	0x6A38	0x880D	# <CJK>
-0xE5B7	0x6A39	0x87FE	# <CJK>
-0xE5B8	0x6A3A	0x87F6	# <CJK>
-0xE5B9	0x6A3B	0x87F7	# <CJK>
-0xE5BA	0x6A3C	0x880E	# <CJK>
-0xE5BB	0x6A3D	0x87D2	# <CJK>
-0xE5BC	0x6A3E	0x8811	# <CJK>
-0xE5BD	0x6A3F	0x8816	# <CJK>
-0xE5BE	0x6A40	0x8815	# <CJK>
-0xE5BF	0x6A41	0x8822	# <CJK>
-0xE5C0	0x6A42	0x8821	# <CJK>
-0xE5C1	0x6A43	0x8831	# <CJK>
-0xE5C2	0x6A44	0x8836	# <CJK>
-0xE5C3	0x6A45	0x8839	# <CJK>
-0xE5C4	0x6A46	0x8827	# <CJK>
-0xE5C5	0x6A47	0x883B	# <CJK>
-0xE5C6	0x6A48	0x8844	# <CJK>
-0xE5C7	0x6A49	0x8842	# <CJK>
-0xE5C8	0x6A4A	0x8852	# <CJK>
-0xE5C9	0x6A4B	0x8859	# <CJK>
-0xE5CA	0x6A4C	0x885E	# <CJK>
-0xE5CB	0x6A4D	0x8862	# <CJK>
-0xE5CC	0x6A4E	0x886B	# <CJK>
-0xE5CD	0x6A4F	0x8881	# <CJK>
-0xE5CE	0x6A50	0x887E	# <CJK>
-0xE5CF	0x6A51	0x889E	# <CJK>
-0xE5D0	0x6A52	0x8875	# <CJK>
-0xE5D1	0x6A53	0x887D	# <CJK>
-0xE5D2	0x6A54	0x88B5	# <CJK>
-0xE5D3	0x6A55	0x8872	# <CJK>
-0xE5D4	0x6A56	0x8882	# <CJK>
-0xE5D5	0x6A57	0x8897	# <CJK>
-0xE5D6	0x6A58	0x8892	# <CJK>
-0xE5D7	0x6A59	0x88AE	# <CJK>
-0xE5D8	0x6A5A	0x8899	# <CJK>
-0xE5D9	0x6A5B	0x88A2	# <CJK>
-0xE5DA	0x6A5C	0x888D	# <CJK>
-0xE5DB	0x6A5D	0x88A4	# <CJK>
-0xE5DC	0x6A5E	0x88B0	# <CJK>
-0xE5DD	0x6A5F	0x88BF	# <CJK>
-0xE5DE	0x6A60	0x88B1	# <CJK>
-0xE5DF	0x6A61	0x88C3	# <CJK>
-0xE5E0	0x6A62	0x88C4	# <CJK>
-0xE5E1	0x6A63	0x88D4	# <CJK>
-0xE5E2	0x6A64	0x88D8	# <CJK>
-0xE5E3	0x6A65	0x88D9	# <CJK>
-0xE5E4	0x6A66	0x88DD	# <CJK>
-0xE5E5	0x6A67	0x88F9	# <CJK>
-0xE5E6	0x6A68	0x8902	# <CJK>
-0xE5E7	0x6A69	0x88FC	# <CJK>
-0xE5E8	0x6A6A	0x88F4	# <CJK>
-0xE5E9	0x6A6B	0x88E8	# <CJK>
-0xE5EA	0x6A6C	0x88F2	# <CJK>
-0xE5EB	0x6A6D	0x8904	# <CJK>
-0xE5EC	0x6A6E	0x890C	# <CJK>
-0xE5ED	0x6A6F	0x890A	# <CJK>
-0xE5EE	0x6A70	0x8913	# <CJK>
-0xE5EF	0x6A71	0x8943	# <CJK>
-0xE5F0	0x6A72	0x891E	# <CJK>
-0xE5F1	0x6A73	0x8925	# <CJK>
-0xE5F2	0x6A74	0x892A	# <CJK>
-0xE5F3	0x6A75	0x892B	# <CJK>
-0xE5F4	0x6A76	0x8941	# <CJK>
-0xE5F5	0x6A77	0x8944	# <CJK>
-0xE5F6	0x6A78	0x893B	# <CJK>
-0xE5F7	0x6A79	0x8936	# <CJK>
-0xE5F8	0x6A7A	0x8938	# <CJK>
-0xE5F9	0x6A7B	0x894C	# <CJK>
-0xE5FA	0x6A7C	0x891D	# <CJK>
-0xE5FB	0x6A7D	0x8960	# <CJK>
-0xE5FC	0x6A7E	0x895E	# <CJK>
-0xE640	0x6B21	0x8966	# <CJK>
-0xE641	0x6B22	0x8964	# <CJK>
-0xE642	0x6B23	0x896D	# <CJK>
-0xE643	0x6B24	0x896A	# <CJK>
-0xE644	0x6B25	0x896F	# <CJK>
-0xE645	0x6B26	0x8974	# <CJK>
-0xE646	0x6B27	0x8977	# <CJK>
-0xE647	0x6B28	0x897E	# <CJK>
-0xE648	0x6B29	0x8983	# <CJK>
-0xE649	0x6B2A	0x8988	# <CJK>
-0xE64A	0x6B2B	0x898A	# <CJK>
-0xE64B	0x6B2C	0x8993	# <CJK>
-0xE64C	0x6B2D	0x8998	# <CJK>
-0xE64D	0x6B2E	0x89A1	# <CJK>
-0xE64E	0x6B2F	0x89A9	# <CJK>
-0xE64F	0x6B30	0x89A6	# <CJK>
-0xE650	0x6B31	0x89AC	# <CJK>
-0xE651	0x6B32	0x89AF	# <CJK>
-0xE652	0x6B33	0x89B2	# <CJK>
-0xE653	0x6B34	0x89BA	# <CJK>
-0xE654	0x6B35	0x89BD	# <CJK>
-0xE655	0x6B36	0x89BF	# <CJK>
-0xE656	0x6B37	0x89C0	# <CJK>
-0xE657	0x6B38	0x89DA	# <CJK>
-0xE658	0x6B39	0x89DC	# <CJK>
-0xE659	0x6B3A	0x89DD	# <CJK>
-0xE65A	0x6B3B	0x89E7	# <CJK>
-0xE65B	0x6B3C	0x89F4	# <CJK>
-0xE65C	0x6B3D	0x89F8	# <CJK>
-0xE65D	0x6B3E	0x8A03	# <CJK>
-0xE65E	0x6B3F	0x8A16	# <CJK>
-0xE65F	0x6B40	0x8A10	# <CJK>
-0xE660	0x6B41	0x8A0C	# <CJK>
-0xE661	0x6B42	0x8A1B	# <CJK>
-0xE662	0x6B43	0x8A1D	# <CJK>
-0xE663	0x6B44	0x8A25	# <CJK>
-0xE664	0x6B45	0x8A36	# <CJK>
-0xE665	0x6B46	0x8A41	# <CJK>
-0xE666	0x6B47	0x8A5B	# <CJK>
-0xE667	0x6B48	0x8A52	# <CJK>
-0xE668	0x6B49	0x8A46	# <CJK>
-0xE669	0x6B4A	0x8A48	# <CJK>
-0xE66A	0x6B4B	0x8A7C	# <CJK>
-0xE66B	0x6B4C	0x8A6D	# <CJK>
-0xE66C	0x6B4D	0x8A6C	# <CJK>
-0xE66D	0x6B4E	0x8A62	# <CJK>
-0xE66E	0x6B4F	0x8A85	# <CJK>
-0xE66F	0x6B50	0x8A82	# <CJK>
-0xE670	0x6B51	0x8A84	# <CJK>
-0xE671	0x6B52	0x8AA8	# <CJK>
-0xE672	0x6B53	0x8AA1	# <CJK>
-0xE673	0x6B54	0x8A91	# <CJK>
-0xE674	0x6B55	0x8AA5	# <CJK>
-0xE675	0x6B56	0x8AA6	# <CJK>
-0xE676	0x6B57	0x8A9A	# <CJK>
-0xE677	0x6B58	0x8AA3	# <CJK>
-0xE678	0x6B59	0x8AC4	# <CJK>
-0xE679	0x6B5A	0x8ACD	# <CJK>
-0xE67A	0x6B5B	0x8AC2	# <CJK>
-0xE67B	0x6B5C	0x8ADA	# <CJK>
-0xE67C	0x6B5D	0x8AEB	# <CJK>
-0xE67D	0x6B5E	0x8AF3	# <CJK>
-0xE67E	0x6B5F	0x8AE7	# <CJK>
-0xE680	0x6B60	0x8AE4	# <CJK>
-0xE681	0x6B61	0x8AF1	# <CJK>
-0xE682	0x6B62	0x8B14	# <CJK>
-0xE683	0x6B63	0x8AE0	# <CJK>
-0xE684	0x6B64	0x8AE2	# <CJK>
-0xE685	0x6B65	0x8AF7	# <CJK>
-0xE686	0x6B66	0x8ADE	# <CJK>
-0xE687	0x6B67	0x8ADB	# <CJK>
-0xE688	0x6B68	0x8B0C	# <CJK>
-0xE689	0x6B69	0x8B07	# <CJK>
-0xE68A	0x6B6A	0x8B1A	# <CJK>
-0xE68B	0x6B6B	0x8AE1	# <CJK>
-0xE68C	0x6B6C	0x8B16	# <CJK>
-0xE68D	0x6B6D	0x8B10	# <CJK>
-0xE68E	0x6B6E	0x8B17	# <CJK>
-0xE68F	0x6B6F	0x8B20	# <CJK>
-0xE690	0x6B70	0x8B33	# <CJK>
-0xE691	0x6B71	0x97AB	# <CJK>
-0xE692	0x6B72	0x8B26	# <CJK>
-0xE693	0x6B73	0x8B2B	# <CJK>
-0xE694	0x6B74	0x8B3E	# <CJK>
-0xE695	0x6B75	0x8B28	# <CJK>
-0xE696	0x6B76	0x8B41	# <CJK>
-0xE697	0x6B77	0x8B4C	# <CJK>
-0xE698	0x6B78	0x8B4F	# <CJK>
-0xE699	0x6B79	0x8B4E	# <CJK>
-0xE69A	0x6B7A	0x8B49	# <CJK>
-0xE69B	0x6B7B	0x8B56	# <CJK>
-0xE69C	0x6B7C	0x8B5B	# <CJK>
-0xE69D	0x6B7D	0x8B5A	# <CJK>
-0xE69E	0x6B7E	0x8B6B	# <CJK>
-0xE69F	0x6C21	0x8B5F	# <CJK>
-0xE6A0	0x6C22	0x8B6C	# <CJK>
-0xE6A1	0x6C23	0x8B6F	# <CJK>
-0xE6A2	0x6C24	0x8B74	# <CJK>
-0xE6A3	0x6C25	0x8B7D	# <CJK>
-0xE6A4	0x6C26	0x8B80	# <CJK>
-0xE6A5	0x6C27	0x8B8C	# <CJK>
-0xE6A6	0x6C28	0x8B8E	# <CJK>
-0xE6A7	0x6C29	0x8B92	# <CJK>
-0xE6A8	0x6C2A	0x8B93	# <CJK>
-0xE6A9	0x6C2B	0x8B96	# <CJK>
-0xE6AA	0x6C2C	0x8B99	# <CJK>
-0xE6AB	0x6C2D	0x8B9A	# <CJK>
-0xE6AC	0x6C2E	0x8C3A	# <CJK>
-0xE6AD	0x6C2F	0x8C41	# <CJK>
-0xE6AE	0x6C30	0x8C3F	# <CJK>
-0xE6AF	0x6C31	0x8C48	# <CJK>
-0xE6B0	0x6C32	0x8C4C	# <CJK>
-0xE6B1	0x6C33	0x8C4E	# <CJK>
-0xE6B2	0x6C34	0x8C50	# <CJK>
-0xE6B3	0x6C35	0x8C55	# <CJK>
-0xE6B4	0x6C36	0x8C62	# <CJK>
-0xE6B5	0x6C37	0x8C6C	# <CJK>
-0xE6B6	0x6C38	0x8C78	# <CJK>
-0xE6B7	0x6C39	0x8C7A	# <CJK>
-0xE6B8	0x6C3A	0x8C82	# <CJK>
-0xE6B9	0x6C3B	0x8C89	# <CJK>
-0xE6BA	0x6C3C	0x8C85	# <CJK>
-0xE6BB	0x6C3D	0x8C8A	# <CJK>
-0xE6BC	0x6C3E	0x8C8D	# <CJK>
-0xE6BD	0x6C3F	0x8C8E	# <CJK>
-0xE6BE	0x6C40	0x8C94	# <CJK>
-0xE6BF	0x6C41	0x8C7C	# <CJK>
-0xE6C0	0x6C42	0x8C98	# <CJK>
-0xE6C1	0x6C43	0x621D	# <CJK>
-0xE6C2	0x6C44	0x8CAD	# <CJK>
-0xE6C3	0x6C45	0x8CAA	# <CJK>
-0xE6C4	0x6C46	0x8CBD	# <CJK>
-0xE6C5	0x6C47	0x8CB2	# <CJK>
-0xE6C6	0x6C48	0x8CB3	# <CJK>
-0xE6C7	0x6C49	0x8CAE	# <CJK>
-0xE6C8	0x6C4A	0x8CB6	# <CJK>
-0xE6C9	0x6C4B	0x8CC8	# <CJK>
-0xE6CA	0x6C4C	0x8CC1	# <CJK>
-0xE6CB	0x6C4D	0x8CE4	# <CJK>
-0xE6CC	0x6C4E	0x8CE3	# <CJK>
-0xE6CD	0x6C4F	0x8CDA	# <CJK>
-0xE6CE	0x6C50	0x8CFD	# <CJK>
-0xE6CF	0x6C51	0x8CFA	# <CJK>
-0xE6D0	0x6C52	0x8CFB	# <CJK>
-0xE6D1	0x6C53	0x8D04	# <CJK>
-0xE6D2	0x6C54	0x8D05	# <CJK>
-0xE6D3	0x6C55	0x8D0A	# <CJK>
-0xE6D4	0x6C56	0x8D07	# <CJK>
-0xE6D5	0x6C57	0x8D0F	# <CJK>
-0xE6D6	0x6C58	0x8D0D	# <CJK>
-0xE6D7	0x6C59	0x8D10	# <CJK>
-0xE6D8	0x6C5A	0x9F4E	# <CJK>
-0xE6D9	0x6C5B	0x8D13	# <CJK>
-0xE6DA	0x6C5C	0x8CCD	# <CJK>
-0xE6DB	0x6C5D	0x8D14	# <CJK>
-0xE6DC	0x6C5E	0x8D16	# <CJK>
-0xE6DD	0x6C5F	0x8D67	# <CJK>
-0xE6DE	0x6C60	0x8D6D	# <CJK>
-0xE6DF	0x6C61	0x8D71	# <CJK>
-0xE6E0	0x6C62	0x8D73	# <CJK>
-0xE6E1	0x6C63	0x8D81	# <CJK>
-0xE6E2	0x6C64	0x8D99	# <CJK>
-0xE6E3	0x6C65	0x8DC2	# <CJK>
-0xE6E4	0x6C66	0x8DBE	# <CJK>
-0xE6E5	0x6C67	0x8DBA	# <CJK>
-0xE6E6	0x6C68	0x8DCF	# <CJK>
-0xE6E7	0x6C69	0x8DDA	# <CJK>
-0xE6E8	0x6C6A	0x8DD6	# <CJK>
-0xE6E9	0x6C6B	0x8DCC	# <CJK>
-0xE6EA	0x6C6C	0x8DDB	# <CJK>
-0xE6EB	0x6C6D	0x8DCB	# <CJK>
-0xE6EC	0x6C6E	0x8DEA	# <CJK>
-0xE6ED	0x6C6F	0x8DEB	# <CJK>
-0xE6EE	0x6C70	0x8DDF	# <CJK>
-0xE6EF	0x6C71	0x8DE3	# <CJK>
-0xE6F0	0x6C72	0x8DFC	# <CJK>
-0xE6F1	0x6C73	0x8E08	# <CJK>
-0xE6F2	0x6C74	0x8E09	# <CJK>
-0xE6F3	0x6C75	0x8DFF	# <CJK>
-0xE6F4	0x6C76	0x8E1D	# <CJK>
-0xE6F5	0x6C77	0x8E1E	# <CJK>
-0xE6F6	0x6C78	0x8E10	# <CJK>
-0xE6F7	0x6C79	0x8E1F	# <CJK>
-0xE6F8	0x6C7A	0x8E42	# <CJK>
-0xE6F9	0x6C7B	0x8E35	# <CJK>
-0xE6FA	0x6C7C	0x8E30	# <CJK>
-0xE6FB	0x6C7D	0x8E34	# <CJK>
-0xE6FC	0x6C7E	0x8E4A	# <CJK>
-0xE740	0x6D21	0x8E47	# <CJK>
-0xE741	0x6D22	0x8E49	# <CJK>
-0xE742	0x6D23	0x8E4C	# <CJK>
-0xE743	0x6D24	0x8E50	# <CJK>
-0xE744	0x6D25	0x8E48	# <CJK>
-0xE745	0x6D26	0x8E59	# <CJK>
-0xE746	0x6D27	0x8E64	# <CJK>
-0xE747	0x6D28	0x8E60	# <CJK>
-0xE748	0x6D29	0x8E2A	# <CJK>
-0xE749	0x6D2A	0x8E63	# <CJK>
-0xE74A	0x6D2B	0x8E55	# <CJK>
-0xE74B	0x6D2C	0x8E76	# <CJK>
-0xE74C	0x6D2D	0x8E72	# <CJK>
-0xE74D	0x6D2E	0x8E7C	# <CJK>
-0xE74E	0x6D2F	0x8E81	# <CJK>
-0xE74F	0x6D30	0x8E87	# <CJK>
-0xE750	0x6D31	0x8E85	# <CJK>
-0xE751	0x6D32	0x8E84	# <CJK>
-0xE752	0x6D33	0x8E8B	# <CJK>
-0xE753	0x6D34	0x8E8A	# <CJK>
-0xE754	0x6D35	0x8E93	# <CJK>
-0xE755	0x6D36	0x8E91	# <CJK>
-0xE756	0x6D37	0x8E94	# <CJK>
-0xE757	0x6D38	0x8E99	# <CJK>
-0xE758	0x6D39	0x8EAA	# <CJK>
-0xE759	0x6D3A	0x8EA1	# <CJK>
-0xE75A	0x6D3B	0x8EAC	# <CJK>
-0xE75B	0x6D3C	0x8EB0	# <CJK>
-0xE75C	0x6D3D	0x8EC6	# <CJK>
-0xE75D	0x6D3E	0x8EB1	# <CJK>
-0xE75E	0x6D3F	0x8EBE	# <CJK>
-0xE75F	0x6D40	0x8EC5	# <CJK>
-0xE760	0x6D41	0x8EC8	# <CJK>
-0xE761	0x6D42	0x8ECB	# <CJK>
-0xE762	0x6D43	0x8EDB	# <CJK>
-0xE763	0x6D44	0x8EE3	# <CJK>
-0xE764	0x6D45	0x8EFC	# <CJK>
-0xE765	0x6D46	0x8EFB	# <CJK>
-0xE766	0x6D47	0x8EEB	# <CJK>
-0xE767	0x6D48	0x8EFE	# <CJK>
-0xE768	0x6D49	0x8F0A	# <CJK>
-0xE769	0x6D4A	0x8F05	# <CJK>
-0xE76A	0x6D4B	0x8F15	# <CJK>
-0xE76B	0x6D4C	0x8F12	# <CJK>
-0xE76C	0x6D4D	0x8F19	# <CJK>
-0xE76D	0x6D4E	0x8F13	# <CJK>
-0xE76E	0x6D4F	0x8F1C	# <CJK>
-0xE76F	0x6D50	0x8F1F	# <CJK>
-0xE770	0x6D51	0x8F1B	# <CJK>
-0xE771	0x6D52	0x8F0C	# <CJK>
-0xE772	0x6D53	0x8F26	# <CJK>
-0xE773	0x6D54	0x8F33	# <CJK>
-0xE774	0x6D55	0x8F3B	# <CJK>
-0xE775	0x6D56	0x8F39	# <CJK>
-0xE776	0x6D57	0x8F45	# <CJK>
-0xE777	0x6D58	0x8F42	# <CJK>
-0xE778	0x6D59	0x8F3E	# <CJK>
-0xE779	0x6D5A	0x8F4C	# <CJK>
-0xE77A	0x6D5B	0x8F49	# <CJK>
-0xE77B	0x6D5C	0x8F46	# <CJK>
-0xE77C	0x6D5D	0x8F4E	# <CJK>
-0xE77D	0x6D5E	0x8F57	# <CJK>
-0xE77E	0x6D5F	0x8F5C	# <CJK>
-0xE780	0x6D60	0x8F62	# <CJK>
-0xE781	0x6D61	0x8F63	# <CJK>
-0xE782	0x6D62	0x8F64	# <CJK>
-0xE783	0x6D63	0x8F9C	# <CJK>
-0xE784	0x6D64	0x8F9F	# <CJK>
-0xE785	0x6D65	0x8FA3	# <CJK>
-0xE786	0x6D66	0x8FAD	# <CJK>
-0xE787	0x6D67	0x8FAF	# <CJK>
-0xE788	0x6D68	0x8FB7	# <CJK>
-0xE789	0x6D69	0x8FDA	# <CJK>
-0xE78A	0x6D6A	0x8FE5	# <CJK>
-0xE78B	0x6D6B	0x8FE2	# <CJK>
-0xE78C	0x6D6C	0x8FEA	# <CJK>
-0xE78D	0x6D6D	0x8FEF	# <CJK>
-0xE78E	0x6D6E	0x9087	# <CJK>
-0xE78F	0x6D6F	0x8FF4	# <CJK>
-0xE790	0x6D70	0x9005	# <CJK>
-0xE791	0x6D71	0x8FF9	# <CJK>
-0xE792	0x6D72	0x8FFA	# <CJK>
-0xE793	0x6D73	0x9011	# <CJK>
-0xE794	0x6D74	0x9015	# <CJK>
-0xE795	0x6D75	0x9021	# <CJK>
-0xE796	0x6D76	0x900D	# <CJK>
-0xE797	0x6D77	0x901E	# <CJK>
-0xE798	0x6D78	0x9016	# <CJK>
-0xE799	0x6D79	0x900B	# <CJK>
-0xE79A	0x6D7A	0x9027	# <CJK>
-0xE79B	0x6D7B	0x9036	# <CJK>
-0xE79C	0x6D7C	0x9035	# <CJK>
-0xE79D	0x6D7D	0x9039	# <CJK>
-0xE79E	0x6D7E	0x8FF8	# <CJK>
-0xE79F	0x6E21	0x904F	# <CJK>
-0xE7A0	0x6E22	0x9050	# <CJK>
-0xE7A1	0x6E23	0x9051	# <CJK>
-0xE7A2	0x6E24	0x9052	# <CJK>
-0xE7A3	0x6E25	0x900E	# <CJK>
-0xE7A4	0x6E26	0x9049	# <CJK>
-0xE7A5	0x6E27	0x903E	# <CJK>
-0xE7A6	0x6E28	0x9056	# <CJK>
-0xE7A7	0x6E29	0x9058	# <CJK>
-0xE7A8	0x6E2A	0x905E	# <CJK>
-0xE7A9	0x6E2B	0x9068	# <CJK>
-0xE7AA	0x6E2C	0x906F	# <CJK>
-0xE7AB	0x6E2D	0x9076	# <CJK>
-0xE7AC	0x6E2E	0x96A8	# <CJK>
-0xE7AD	0x6E2F	0x9072	# <CJK>
-0xE7AE	0x6E30	0x9082	# <CJK>
-0xE7AF	0x6E31	0x907D	# <CJK>
-0xE7B0	0x6E32	0x9081	# <CJK>
-0xE7B1	0x6E33	0x9080	# <CJK>
-0xE7B2	0x6E34	0x908A	# <CJK>
-0xE7B3	0x6E35	0x9089	# <CJK>
-0xE7B4	0x6E36	0x908F	# <CJK>
-0xE7B5	0x6E37	0x90A8	# <CJK>
-0xE7B6	0x6E38	0x90AF	# <CJK>
-0xE7B7	0x6E39	0x90B1	# <CJK>
-0xE7B8	0x6E3A	0x90B5	# <CJK>
-0xE7B9	0x6E3B	0x90E2	# <CJK>
-0xE7BA	0x6E3C	0x90E4	# <CJK>
-0xE7BB	0x6E3D	0x6248	# <CJK>
-0xE7BC	0x6E3E	0x90DB	# <CJK>
-0xE7BD	0x6E3F	0x9102	# <CJK>
-0xE7BE	0x6E40	0x9112	# <CJK>
-0xE7BF	0x6E41	0x9119	# <CJK>
-0xE7C0	0x6E42	0x9132	# <CJK>
-0xE7C1	0x6E43	0x9130	# <CJK>
-0xE7C2	0x6E44	0x914A	# <CJK>
-0xE7C3	0x6E45	0x9156	# <CJK>
-0xE7C4	0x6E46	0x9158	# <CJK>
-0xE7C5	0x6E47	0x9163	# <CJK>
-0xE7C6	0x6E48	0x9165	# <CJK>
-0xE7C7	0x6E49	0x9169	# <CJK>
-0xE7C8	0x6E4A	0x9173	# <CJK>
-0xE7C9	0x6E4B	0x9172	# <CJK>
-0xE7CA	0x6E4C	0x918B	# <CJK>
-0xE7CB	0x6E4D	0x9189	# <CJK>
-0xE7CC	0x6E4E	0x9182	# <CJK>
-0xE7CD	0x6E4F	0x91A2	# <CJK>
-0xE7CE	0x6E50	0x91AB	# <CJK>
-0xE7CF	0x6E51	0x91AF	# <CJK>
-0xE7D0	0x6E52	0x91AA	# <CJK>
-0xE7D1	0x6E53	0x91B5	# <CJK>
-0xE7D2	0x6E54	0x91B4	# <CJK>
-0xE7D3	0x6E55	0x91BA	# <CJK>
-0xE7D4	0x6E56	0x91C0	# <CJK>
-0xE7D5	0x6E57	0x91C1	# <CJK>
-0xE7D6	0x6E58	0x91C9	# <CJK>
-0xE7D7	0x6E59	0x91CB	# <CJK>
-0xE7D8	0x6E5A	0x91D0	# <CJK>
-0xE7D9	0x6E5B	0x91D6	# <CJK>
-0xE7DA	0x6E5C	0x91DF	# <CJK>
-0xE7DB	0x6E5D	0x91E1	# <CJK>
-0xE7DC	0x6E5E	0x91DB	# <CJK>
-0xE7DD	0x6E5F	0x91FC	# <CJK>
-0xE7DE	0x6E60	0x91F5	# <CJK>
-0xE7DF	0x6E61	0x91F6	# <CJK>
-0xE7E0	0x6E62	0x921E	# <CJK>
-0xE7E1	0x6E63	0x91FF	# <CJK>
-0xE7E2	0x6E64	0x9214	# <CJK>
-0xE7E3	0x6E65	0x922C	# <CJK>
-0xE7E4	0x6E66	0x9215	# <CJK>
-0xE7E5	0x6E67	0x9211	# <CJK>
-0xE7E6	0x6E68	0x925E	# <CJK>
-0xE7E7	0x6E69	0x9257	# <CJK>
-0xE7E8	0x6E6A	0x9245	# <CJK>
-0xE7E9	0x6E6B	0x9249	# <CJK>
-0xE7EA	0x6E6C	0x9264	# <CJK>
-0xE7EB	0x6E6D	0x9248	# <CJK>
-0xE7EC	0x6E6E	0x9295	# <CJK>
-0xE7ED	0x6E6F	0x923F	# <CJK>
-0xE7EE	0x6E70	0x924B	# <CJK>
-0xE7EF	0x6E71	0x9250	# <CJK>
-0xE7F0	0x6E72	0x929C	# <CJK>
-0xE7F1	0x6E73	0x9296	# <CJK>
-0xE7F2	0x6E74	0x9293	# <CJK>
-0xE7F3	0x6E75	0x929B	# <CJK>
-0xE7F4	0x6E76	0x925A	# <CJK>
-0xE7F5	0x6E77	0x92CF	# <CJK>
-0xE7F6	0x6E78	0x92B9	# <CJK>
-0xE7F7	0x6E79	0x92B7	# <CJK>
-0xE7F8	0x6E7A	0x92E9	# <CJK>
-0xE7F9	0x6E7B	0x930F	# <CJK>
-0xE7FA	0x6E7C	0x92FA	# <CJK>
-0xE7FB	0x6E7D	0x9344	# <CJK>
-0xE7FC	0x6E7E	0x932E	# <CJK>
-0xE840	0x6F21	0x9319	# <CJK>
-0xE841	0x6F22	0x9322	# <CJK>
-0xE842	0x6F23	0x931A	# <CJK>
-0xE843	0x6F24	0x9323	# <CJK>
-0xE844	0x6F25	0x933A	# <CJK>
-0xE845	0x6F26	0x9335	# <CJK>
-0xE846	0x6F27	0x933B	# <CJK>
-0xE847	0x6F28	0x935C	# <CJK>
-0xE848	0x6F29	0x9360	# <CJK>
-0xE849	0x6F2A	0x937C	# <CJK>
-0xE84A	0x6F2B	0x936E	# <CJK>
-0xE84B	0x6F2C	0x9356	# <CJK>
-0xE84C	0x6F2D	0x93B0	# <CJK>
-0xE84D	0x6F2E	0x93AC	# <CJK>
-0xE84E	0x6F2F	0x93AD	# <CJK>
-0xE84F	0x6F30	0x9394	# <CJK>
-0xE850	0x6F31	0x93B9	# <CJK>
-0xE851	0x6F32	0x93D6	# <CJK>
-0xE852	0x6F33	0x93D7	# <CJK>
-0xE853	0x6F34	0x93E8	# <CJK>
-0xE854	0x6F35	0x93E5	# <CJK>
-0xE855	0x6F36	0x93D8	# <CJK>
-0xE856	0x6F37	0x93C3	# <CJK>
-0xE857	0x6F38	0x93DD	# <CJK>
-0xE858	0x6F39	0x93D0	# <CJK>
-0xE859	0x6F3A	0x93C8	# <CJK>
-0xE85A	0x6F3B	0x93E4	# <CJK>
-0xE85B	0x6F3C	0x941A	# <CJK>
-0xE85C	0x6F3D	0x9414	# <CJK>
-0xE85D	0x6F3E	0x9413	# <CJK>
-0xE85E	0x6F3F	0x9403	# <CJK>
-0xE85F	0x6F40	0x9407	# <CJK>
-0xE860	0x6F41	0x9410	# <CJK>
-0xE861	0x6F42	0x9436	# <CJK>
-0xE862	0x6F43	0x942B	# <CJK>
-0xE863	0x6F44	0x9435	# <CJK>
-0xE864	0x6F45	0x9421	# <CJK>
-0xE865	0x6F46	0x943A	# <CJK>
-0xE866	0x6F47	0x9441	# <CJK>
-0xE867	0x6F48	0x9452	# <CJK>
-0xE868	0x6F49	0x9444	# <CJK>
-0xE869	0x6F4A	0x945B	# <CJK>
-0xE86A	0x6F4B	0x9460	# <CJK>
-0xE86B	0x6F4C	0x9462	# <CJK>
-0xE86C	0x6F4D	0x945E	# <CJK>
-0xE86D	0x6F4E	0x946A	# <CJK>
-0xE86E	0x6F4F	0x9229	# <CJK>
-0xE86F	0x6F50	0x9470	# <CJK>
-0xE870	0x6F51	0x9475	# <CJK>
-0xE871	0x6F52	0x9477	# <CJK>
-0xE872	0x6F53	0x947D	# <CJK>
-0xE873	0x6F54	0x945A	# <CJK>
-0xE874	0x6F55	0x947C	# <CJK>
-0xE875	0x6F56	0x947E	# <CJK>
-0xE876	0x6F57	0x9481	# <CJK>
-0xE877	0x6F58	0x947F	# <CJK>
-0xE878	0x6F59	0x9582	# <CJK>
-0xE879	0x6F5A	0x9587	# <CJK>
-0xE87A	0x6F5B	0x958A	# <CJK>
-0xE87B	0x6F5C	0x9594	# <CJK>
-0xE87C	0x6F5D	0x9596	# <CJK>
-0xE87D	0x6F5E	0x9598	# <CJK>
-0xE87E	0x6F5F	0x9599	# <CJK>
-0xE880	0x6F60	0x95A0	# <CJK>
-0xE881	0x6F61	0x95A8	# <CJK>
-0xE882	0x6F62	0x95A7	# <CJK>
-0xE883	0x6F63	0x95AD	# <CJK>
-0xE884	0x6F64	0x95BC	# <CJK>
-0xE885	0x6F65	0x95BB	# <CJK>
-0xE886	0x6F66	0x95B9	# <CJK>
-0xE887	0x6F67	0x95BE	# <CJK>
-0xE888	0x6F68	0x95CA	# <CJK>
-0xE889	0x6F69	0x6FF6	# <CJK>
-0xE88A	0x6F6A	0x95C3	# <CJK>
-0xE88B	0x6F6B	0x95CD	# <CJK>
-0xE88C	0x6F6C	0x95CC	# <CJK>
-0xE88D	0x6F6D	0x95D5	# <CJK>
-0xE88E	0x6F6E	0x95D4	# <CJK>
-0xE88F	0x6F6F	0x95D6	# <CJK>
-0xE890	0x6F70	0x95DC	# <CJK>
-0xE891	0x6F71	0x95E1	# <CJK>
-0xE892	0x6F72	0x95E5	# <CJK>
-0xE893	0x6F73	0x95E2	# <CJK>
-0xE894	0x6F74	0x9621	# <CJK>
-0xE895	0x6F75	0x9628	# <CJK>
-0xE896	0x6F76	0x962E	# <CJK>
-0xE897	0x6F77	0x962F	# <CJK>
-0xE898	0x6F78	0x9642	# <CJK>
-0xE899	0x6F79	0x964C	# <CJK>
-0xE89A	0x6F7A	0x964F	# <CJK>
-0xE89B	0x6F7B	0x964B	# <CJK>
-0xE89C	0x6F7C	0x9677	# <CJK>
-0xE89D	0x6F7D	0x965C	# <CJK>
-0xE89E	0x6F7E	0x965E	# <CJK>
-0xE89F	0x7021	0x965D	# <CJK>
-0xE8A0	0x7022	0x965F	# <CJK>
-0xE8A1	0x7023	0x9666	# <CJK>
-0xE8A2	0x7024	0x9672	# <CJK>
-0xE8A3	0x7025	0x966C	# <CJK>
-0xE8A4	0x7026	0x968D	# <CJK>
-0xE8A5	0x7027	0x9698	# <CJK>
-0xE8A6	0x7028	0x9695	# <CJK>
-0xE8A7	0x7029	0x9697	# <CJK>
-0xE8A8	0x702A	0x96AA	# <CJK>
-0xE8A9	0x702B	0x96A7	# <CJK>
-0xE8AA	0x702C	0x96B1	# <CJK>
-0xE8AB	0x702D	0x96B2	# <CJK>
-0xE8AC	0x702E	0x96B0	# <CJK>
-0xE8AD	0x702F	0x96B4	# <CJK>
-0xE8AE	0x7030	0x96B6	# <CJK>
-0xE8AF	0x7031	0x96B8	# <CJK>
-0xE8B0	0x7032	0x96B9	# <CJK>
-0xE8B1	0x7033	0x96CE	# <CJK>
-0xE8B2	0x7034	0x96CB	# <CJK>
-0xE8B3	0x7035	0x96C9	# <CJK>
-0xE8B4	0x7036	0x96CD	# <CJK>
-0xE8B5	0x7037	0x894D	# <CJK>
-0xE8B6	0x7038	0x96DC	# <CJK>
-0xE8B7	0x7039	0x970D	# <CJK>
-0xE8B8	0x703A	0x96D5	# <CJK>
-0xE8B9	0x703B	0x96F9	# <CJK>
-0xE8BA	0x703C	0x9704	# <CJK>
-0xE8BB	0x703D	0x9706	# <CJK>
-0xE8BC	0x703E	0x9708	# <CJK>
-0xE8BD	0x703F	0x9713	# <CJK>
-0xE8BE	0x7040	0x970E	# <CJK>
-0xE8BF	0x7041	0x9711	# <CJK>
-0xE8C0	0x7042	0x970F	# <CJK>
-0xE8C1	0x7043	0x9716	# <CJK>
-0xE8C2	0x7044	0x9719	# <CJK>
-0xE8C3	0x7045	0x9724	# <CJK>
-0xE8C4	0x7046	0x972A	# <CJK>
-0xE8C5	0x7047	0x9730	# <CJK>
-0xE8C6	0x7048	0x9739	# <CJK>
-0xE8C7	0x7049	0x973D	# <CJK>
-0xE8C8	0x704A	0x973E	# <CJK>
-0xE8C9	0x704B	0x9744	# <CJK>
-0xE8CA	0x704C	0x9746	# <CJK>
-0xE8CB	0x704D	0x9748	# <CJK>
-0xE8CC	0x704E	0x9742	# <CJK>
-0xE8CD	0x704F	0x9749	# <CJK>
-0xE8CE	0x7050	0x975C	# <CJK>
-0xE8CF	0x7051	0x9760	# <CJK>
-0xE8D0	0x7052	0x9764	# <CJK>
-0xE8D1	0x7053	0x9766	# <CJK>
-0xE8D2	0x7054	0x9768	# <CJK>
-0xE8D3	0x7055	0x52D2	# <CJK>
-0xE8D4	0x7056	0x976B	# <CJK>
-0xE8D5	0x7057	0x9771	# <CJK>
-0xE8D6	0x7058	0x9779	# <CJK>
-0xE8D7	0x7059	0x9785	# <CJK>
-0xE8D8	0x705A	0x977C	# <CJK>
-0xE8D9	0x705B	0x9781	# <CJK>
-0xE8DA	0x705C	0x977A	# <CJK>
-0xE8DB	0x705D	0x9786	# <CJK>
-0xE8DC	0x705E	0x978B	# <CJK>
-0xE8DD	0x705F	0x978F	# <CJK>
-0xE8DE	0x7060	0x9790	# <CJK>
-0xE8DF	0x7061	0x979C	# <CJK>
-0xE8E0	0x7062	0x97A8	# <CJK>
-0xE8E1	0x7063	0x97A6	# <CJK>
-0xE8E2	0x7064	0x97A3	# <CJK>
-0xE8E3	0x7065	0x97B3	# <CJK>
-0xE8E4	0x7066	0x97B4	# <CJK>
-0xE8E5	0x7067	0x97C3	# <CJK>
-0xE8E6	0x7068	0x97C6	# <CJK>
-0xE8E7	0x7069	0x97C8	# <CJK>
-0xE8E8	0x706A	0x97CB	# <CJK>
-0xE8E9	0x706B	0x97DC	# <CJK>
-0xE8EA	0x706C	0x97ED	# <CJK>
-0xE8EB	0x706D	0x9F4F	# <CJK>
-0xE8EC	0x706E	0x97F2	# <CJK>
-0xE8ED	0x706F	0x7ADF	# <CJK>
-0xE8EE	0x7070	0x97F6	# <CJK>
-0xE8EF	0x7071	0x97F5	# <CJK>
-0xE8F0	0x7072	0x980F	# <CJK>
-0xE8F1	0x7073	0x980C	# <CJK>
-0xE8F2	0x7074	0x9838	# <CJK>
-0xE8F3	0x7075	0x9824	# <CJK>
-0xE8F4	0x7076	0x9821	# <CJK>
-0xE8F5	0x7077	0x9837	# <CJK>
-0xE8F6	0x7078	0x983D	# <CJK>
-0xE8F7	0x7079	0x9846	# <CJK>
-0xE8F8	0x707A	0x984F	# <CJK>
-0xE8F9	0x707B	0x984B	# <CJK>
-0xE8FA	0x707C	0x986B	# <CJK>
-0xE8FB	0x707D	0x986F	# <CJK>
-0xE8FC	0x707E	0x9870	# <CJK>
-0xE940	0x7121	0x9871	# <CJK>
-0xE941	0x7122	0x9874	# <CJK>
-0xE942	0x7123	0x9873	# <CJK>
-0xE943	0x7124	0x98AA	# <CJK>
-0xE944	0x7125	0x98AF	# <CJK>
-0xE945	0x7126	0x98B1	# <CJK>
-0xE946	0x7127	0x98B6	# <CJK>
-0xE947	0x7128	0x98C4	# <CJK>
-0xE948	0x7129	0x98C3	# <CJK>
-0xE949	0x712A	0x98C6	# <CJK>
-0xE94A	0x712B	0x98E9	# <CJK>
-0xE94B	0x712C	0x98EB	# <CJK>
-0xE94C	0x712D	0x9903	# <CJK>
-0xE94D	0x712E	0x9909	# <CJK>
-0xE94E	0x712F	0x9912	# <CJK>
-0xE94F	0x7130	0x9914	# <CJK>
-0xE950	0x7131	0x9918	# <CJK>
-0xE951	0x7132	0x9921	# <CJK>
-0xE952	0x7133	0x991D	# <CJK>
-0xE953	0x7134	0x991E	# <CJK>
-0xE954	0x7135	0x9924	# <CJK>
-0xE955	0x7136	0x9920	# <CJK>
-0xE956	0x7137	0x992C	# <CJK>
-0xE957	0x7138	0x992E	# <CJK>
-0xE958	0x7139	0x993D	# <CJK>
-0xE959	0x713A	0x993E	# <CJK>
-0xE95A	0x713B	0x9942	# <CJK>
-0xE95B	0x713C	0x9949	# <CJK>
-0xE95C	0x713D	0x9945	# <CJK>
-0xE95D	0x713E	0x9950	# <CJK>
-0xE95E	0x713F	0x994B	# <CJK>
-0xE95F	0x7140	0x9951	# <CJK>
-0xE960	0x7141	0x9952	# <CJK>
-0xE961	0x7142	0x994C	# <CJK>
-0xE962	0x7143	0x9955	# <CJK>
-0xE963	0x7144	0x9997	# <CJK>
-0xE964	0x7145	0x9998	# <CJK>
-0xE965	0x7146	0x99A5	# <CJK>
-0xE966	0x7147	0x99AD	# <CJK>
-0xE967	0x7148	0x99AE	# <CJK>
-0xE968	0x7149	0x99BC	# <CJK>
-0xE969	0x714A	0x99DF	# <CJK>
-0xE96A	0x714B	0x99DB	# <CJK>
-0xE96B	0x714C	0x99DD	# <CJK>
-0xE96C	0x714D	0x99D8	# <CJK>
-0xE96D	0x714E	0x99D1	# <CJK>
-0xE96E	0x714F	0x99ED	# <CJK>
-0xE96F	0x7150	0x99EE	# <CJK>
-0xE970	0x7151	0x99F1	# <CJK>
-0xE971	0x7152	0x99F2	# <CJK>
-0xE972	0x7153	0x99FB	# <CJK>
-0xE973	0x7154	0x99F8	# <CJK>
-0xE974	0x7155	0x9A01	# <CJK>
-0xE975	0x7156	0x9A0F	# <CJK>
-0xE976	0x7157	0x9A05	# <CJK>
-0xE977	0x7158	0x99E2	# <CJK>
-0xE978	0x7159	0x9A19	# <CJK>
-0xE979	0x715A	0x9A2B	# <CJK>
-0xE97A	0x715B	0x9A37	# <CJK>
-0xE97B	0x715C	0x9A45	# <CJK>
-0xE97C	0x715D	0x9A42	# <CJK>
-0xE97D	0x715E	0x9A40	# <CJK>
-0xE97E	0x715F	0x9A43	# <CJK>
-0xE980	0x7160	0x9A3E	# <CJK>
-0xE981	0x7161	0x9A55	# <CJK>
-0xE982	0x7162	0x9A4D	# <CJK>
-0xE983	0x7163	0x9A5B	# <CJK>
-0xE984	0x7164	0x9A57	# <CJK>
-0xE985	0x7165	0x9A5F	# <CJK>
-0xE986	0x7166	0x9A62	# <CJK>
-0xE987	0x7167	0x9A65	# <CJK>
-0xE988	0x7168	0x9A64	# <CJK>
-0xE989	0x7169	0x9A69	# <CJK>
-0xE98A	0x716A	0x9A6B	# <CJK>
-0xE98B	0x716B	0x9A6A	# <CJK>
-0xE98C	0x716C	0x9AAD	# <CJK>
-0xE98D	0x716D	0x9AB0	# <CJK>
-0xE98E	0x716E	0x9ABC	# <CJK>
-0xE98F	0x716F	0x9AC0	# <CJK>
-0xE990	0x7170	0x9ACF	# <CJK>
-0xE991	0x7171	0x9AD1	# <CJK>
-0xE992	0x7172	0x9AD3	# <CJK>
-0xE993	0x7173	0x9AD4	# <CJK>
-0xE994	0x7174	0x9ADE	# <CJK>
-0xE995	0x7175	0x9ADF	# <CJK>
-0xE996	0x7176	0x9AE2	# <CJK>
-0xE997	0x7177	0x9AE3	# <CJK>
-0xE998	0x7178	0x9AE6	# <CJK>
-0xE999	0x7179	0x9AEF	# <CJK>
-0xE99A	0x717A	0x9AEB	# <CJK>
-0xE99B	0x717B	0x9AEE	# <CJK>
-0xE99C	0x717C	0x9AF4	# <CJK>
-0xE99D	0x717D	0x9AF1	# <CJK>
-0xE99E	0x717E	0x9AF7	# <CJK>
-0xE99F	0x7221	0x9AFB	# <CJK>
-0xE9A0	0x7222	0x9B06	# <CJK>
-0xE9A1	0x7223	0x9B18	# <CJK>
-0xE9A2	0x7224	0x9B1A	# <CJK>
-0xE9A3	0x7225	0x9B1F	# <CJK>
-0xE9A4	0x7226	0x9B22	# <CJK>
-0xE9A5	0x7227	0x9B23	# <CJK>
-0xE9A6	0x7228	0x9B25	# <CJK>
-0xE9A7	0x7229	0x9B27	# <CJK>
-0xE9A8	0x722A	0x9B28	# <CJK>
-0xE9A9	0x722B	0x9B29	# <CJK>
-0xE9AA	0x722C	0x9B2A	# <CJK>
-0xE9AB	0x722D	0x9B2E	# <CJK>
-0xE9AC	0x722E	0x9B2F	# <CJK>
-0xE9AD	0x722F	0x9B32	# <CJK>
-0xE9AE	0x7230	0x9B44	# <CJK>
-0xE9AF	0x7231	0x9B43	# <CJK>
-0xE9B0	0x7232	0x9B4F	# <CJK>
-0xE9B1	0x7233	0x9B4D	# <CJK>
-0xE9B2	0x7234	0x9B4E	# <CJK>
-0xE9B3	0x7235	0x9B51	# <CJK>
-0xE9B4	0x7236	0x9B58	# <CJK>
-0xE9B5	0x7237	0x9B74	# <CJK>
-0xE9B6	0x7238	0x9B93	# <CJK>
-0xE9B7	0x7239	0x9B83	# <CJK>
-0xE9B8	0x723A	0x9B91	# <CJK>
-0xE9B9	0x723B	0x9B96	# <CJK>
-0xE9BA	0x723C	0x9B97	# <CJK>
-0xE9BB	0x723D	0x9B9F	# <CJK>
-0xE9BC	0x723E	0x9BA0	# <CJK>
-0xE9BD	0x723F	0x9BA8	# <CJK>
-0xE9BE	0x7240	0x9BB4	# <CJK>
-0xE9BF	0x7241	0x9BC0	# <CJK>
-0xE9C0	0x7242	0x9BCA	# <CJK>
-0xE9C1	0x7243	0x9BB9	# <CJK>
-0xE9C2	0x7244	0x9BC6	# <CJK>
-0xE9C3	0x7245	0x9BCF	# <CJK>
-0xE9C4	0x7246	0x9BD1	# <CJK>
-0xE9C5	0x7247	0x9BD2	# <CJK>
-0xE9C6	0x7248	0x9BE3	# <CJK>
-0xE9C7	0x7249	0x9BE2	# <CJK>
-0xE9C8	0x724A	0x9BE4	# <CJK>
-0xE9C9	0x724B	0x9BD4	# <CJK>
-0xE9CA	0x724C	0x9BE1	# <CJK>
-0xE9CB	0x724D	0x9C3A	# <CJK>
-0xE9CC	0x724E	0x9BF2	# <CJK>
-0xE9CD	0x724F	0x9BF1	# <CJK>
-0xE9CE	0x7250	0x9BF0	# <CJK>
-0xE9CF	0x7251	0x9C15	# <CJK>
-0xE9D0	0x7252	0x9C14	# <CJK>
-0xE9D1	0x7253	0x9C09	# <CJK>
-0xE9D2	0x7254	0x9C13	# <CJK>
-0xE9D3	0x7255	0x9C0C	# <CJK>
-0xE9D4	0x7256	0x9C06	# <CJK>
-0xE9D5	0x7257	0x9C08	# <CJK>
-0xE9D6	0x7258	0x9C12	# <CJK>
-0xE9D7	0x7259	0x9C0A	# <CJK>
-0xE9D8	0x725A	0x9C04	# <CJK>
-0xE9D9	0x725B	0x9C2E	# <CJK>
-0xE9DA	0x725C	0x9C1B	# <CJK>
-0xE9DB	0x725D	0x9C25	# <CJK>
-0xE9DC	0x725E	0x9C24	# <CJK>
-0xE9DD	0x725F	0x9C21	# <CJK>
-0xE9DE	0x7260	0x9C30	# <CJK>
-0xE9DF	0x7261	0x9C47	# <CJK>
-0xE9E0	0x7262	0x9C32	# <CJK>
-0xE9E1	0x7263	0x9C46	# <CJK>
-0xE9E2	0x7264	0x9C3E	# <CJK>
-0xE9E3	0x7265	0x9C5A	# <CJK>
-0xE9E4	0x7266	0x9C60	# <CJK>
-0xE9E5	0x7267	0x9C67	# <CJK>
-0xE9E6	0x7268	0x9C76	# <CJK>
-0xE9E7	0x7269	0x9C78	# <CJK>
-0xE9E8	0x726A	0x9CE7	# <CJK>
-0xE9E9	0x726B	0x9CEC	# <CJK>
-0xE9EA	0x726C	0x9CF0	# <CJK>
-0xE9EB	0x726D	0x9D09	# <CJK>
-0xE9EC	0x726E	0x9D08	# <CJK>
-0xE9ED	0x726F	0x9CEB	# <CJK>
-0xE9EE	0x7270	0x9D03	# <CJK>
-0xE9EF	0x7271	0x9D06	# <CJK>
-0xE9F0	0x7272	0x9D2A	# <CJK>
-0xE9F1	0x7273	0x9D26	# <CJK>
-0xE9F2	0x7274	0x9DAF	# <CJK>
-0xE9F3	0x7275	0x9D23	# <CJK>
-0xE9F4	0x7276	0x9D1F	# <CJK>
-0xE9F5	0x7277	0x9D44	# <CJK>
-0xE9F6	0x7278	0x9D15	# <CJK>
-0xE9F7	0x7279	0x9D12	# <CJK>
-0xE9F8	0x727A	0x9D41	# <CJK>
-0xE9F9	0x727B	0x9D3F	# <CJK>
-0xE9FA	0x727C	0x9D3E	# <CJK>
-0xE9FB	0x727D	0x9D46	# <CJK>
-0xE9FC	0x727E	0x9D48	# <CJK>
-0xEA40	0x7321	0x9D5D	# <CJK>
-0xEA41	0x7322	0x9D5E	# <CJK>
-0xEA42	0x7323	0x9D64	# <CJK>
-0xEA43	0x7324	0x9D51	# <CJK>
-0xEA44	0x7325	0x9D50	# <CJK>
-0xEA45	0x7326	0x9D59	# <CJK>
-0xEA46	0x7327	0x9D72	# <CJK>
-0xEA47	0x7328	0x9D89	# <CJK>
-0xEA48	0x7329	0x9D87	# <CJK>
-0xEA49	0x732A	0x9DAB	# <CJK>
-0xEA4A	0x732B	0x9D6F	# <CJK>
-0xEA4B	0x732C	0x9D7A	# <CJK>
-0xEA4C	0x732D	0x9D9A	# <CJK>
-0xEA4D	0x732E	0x9DA4	# <CJK>
-0xEA4E	0x732F	0x9DA9	# <CJK>
-0xEA4F	0x7330	0x9DB2	# <CJK>
-0xEA50	0x7331	0x9DC4	# <CJK>
-0xEA51	0x7332	0x9DC1	# <CJK>
-0xEA52	0x7333	0x9DBB	# <CJK>
-0xEA53	0x7334	0x9DB8	# <CJK>
-0xEA54	0x7335	0x9DBA	# <CJK>
-0xEA55	0x7336	0x9DC6	# <CJK>
-0xEA56	0x7337	0x9DCF	# <CJK>
-0xEA57	0x7338	0x9DC2	# <CJK>
-0xEA58	0x7339	0x9DD9	# <CJK>
-0xEA59	0x733A	0x9DD3	# <CJK>
-0xEA5A	0x733B	0x9DF8	# <CJK>
-0xEA5B	0x733C	0x9DE6	# <CJK>
-0xEA5C	0x733D	0x9DED	# <CJK>
-0xEA5D	0x733E	0x9DEF	# <CJK>
-0xEA5E	0x733F	0x9DFD	# <CJK>
-0xEA5F	0x7340	0x9E1A	# <CJK>
-0xEA60	0x7341	0x9E1B	# <CJK>
-0xEA61	0x7342	0x9E1E	# <CJK>
-0xEA62	0x7343	0x9E75	# <CJK>
-0xEA63	0x7344	0x9E79	# <CJK>
-0xEA64	0x7345	0x9E7D	# <CJK>
-0xEA65	0x7346	0x9E81	# <CJK>
-0xEA66	0x7347	0x9E88	# <CJK>
-0xEA67	0x7348	0x9E8B	# <CJK>
-0xEA68	0x7349	0x9E8C	# <CJK>
-0xEA69	0x734A	0x9E92	# <CJK>
-0xEA6A	0x734B	0x9E95	# <CJK>
-0xEA6B	0x734C	0x9E91	# <CJK>
-0xEA6C	0x734D	0x9E9D	# <CJK>
-0xEA6D	0x734E	0x9EA5	# <CJK>
-0xEA6E	0x734F	0x9EA9	# <CJK>
-0xEA6F	0x7350	0x9EB8	# <CJK>
-0xEA70	0x7351	0x9EAA	# <CJK>
-0xEA71	0x7352	0x9EAD	# <CJK>
-0xEA72	0x7353	0x9761	# <CJK>
-0xEA73	0x7354	0x9ECC	# <CJK>
-0xEA74	0x7355	0x9ECE	# <CJK>
-0xEA75	0x7356	0x9ECF	# <CJK>
-0xEA76	0x7357	0x9ED0	# <CJK>
-0xEA77	0x7358	0x9ED4	# <CJK>
-0xEA78	0x7359	0x9EDC	# <CJK>
-0xEA79	0x735A	0x9EDE	# <CJK>
-0xEA7A	0x735B	0x9EDD	# <CJK>
-0xEA7B	0x735C	0x9EE0	# <CJK>
-0xEA7C	0x735D	0x9EE5	# <CJK>
-0xEA7D	0x735E	0x9EE8	# <CJK>
-0xEA7E	0x735F	0x9EEF	# <CJK>
-0xEA80	0x7360	0x9EF4	# <CJK>
-0xEA81	0x7361	0x9EF6	# <CJK>
-0xEA82	0x7362	0x9EF7	# <CJK>
-0xEA83	0x7363	0x9EF9	# <CJK>
-0xEA84	0x7364	0x9EFB	# <CJK>
-0xEA85	0x7365	0x9EFC	# <CJK>
-0xEA86	0x7366	0x9EFD	# <CJK>
-0xEA87	0x7367	0x9F07	# <CJK>
-0xEA88	0x7368	0x9F08	# <CJK>
-0xEA89	0x7369	0x76B7	# <CJK>
-0xEA8A	0x736A	0x9F15	# <CJK>
-0xEA8B	0x736B	0x9F21	# <CJK>
-0xEA8C	0x736C	0x9F2C	# <CJK>
-0xEA8D	0x736D	0x9F3E	# <CJK>
-0xEA8E	0x736E	0x9F4A	# <CJK>
-0xEA8F	0x736F	0x9F52	# <CJK>
-0xEA90	0x7370	0x9F54	# <CJK>
-0xEA91	0x7371	0x9F63	# <CJK>
-0xEA92	0x7372	0x9F5F	# <CJK>
-0xEA93	0x7373	0x9F60	# <CJK>
-0xEA94	0x7374	0x9F61	# <CJK>
-0xEA95	0x7375	0x9F66	# <CJK>
-0xEA96	0x7376	0x9F67	# <CJK>
-0xEA97	0x7377	0x9F6C	# <CJK>
-0xEA98	0x7378	0x9F6A	# <CJK>
-0xEA99	0x7379	0x9F77	# <CJK>
-0xEA9A	0x737A	0x9F72	# <CJK>
-0xEA9B	0x737B	0x9F76	# <CJK>
-0xEA9C	0x737C	0x9F95	# <CJK>
-0xEA9D	0x737D	0x9F9C	# <CJK>
-0xEA9E	0x737E	0x9FA0	# <CJK>
-0xEA9F	0x7421	0x582F	# <CJK>
-0xEAA0	0x7422	0x69C7	# <CJK>
-0xEAA1	0x7423	0x9059	# <CJK>
-0xEAA2	0x7424	0x7464	# <CJK>
-0xEAA3	0x7425	0x51DC	# <CJK>
-0xEAA4	0x7426	0x7199	# <CJK>
diff --git a/tools/encoding/jis0212.txt b/tools/encoding/jis0212.txt
deleted file mode 100644
index b6d4cb2..0000000
--- a/tools/encoding/jis0212.txt
+++ /dev/null
@@ -1,6141 +0,0 @@
-#
-#	Name:             JIS X 0212 (1990) to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.9
-#	Table format:     Format A
-#	Date:             8 March 1994
-#	Authors:          Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       JIS X 0212 (1983) characters map into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are in JIS X 0212 order
-#
-#	The following algorithms can be used to change the hex form
-#		of JIS 0212 to other standard forms:
-#
-#		To change hex to EUC form, add 0x8080
-#		To change hex to kuten form, first subtract 0x2020.  Then
-#			the high and low bytes correspond to the ku and ten of
-#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
-#			0x6D63 -> 0x4D43 -> 7767
-#
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#	Notes:
-#
-#	1. JIS X 0212 apparently unified the following two symbols
-#	   into a single character at 0x2922:
-#	
-#	   LATIN CAPITAL LETTER D WITH STROKE
-#	   LATIN CAPITAL LETTER ETH
-#
-#	   However, JIS X 0212 maintains the distinction between
-#	   the lowercase forms of these two elements at 0x2942 and 0x2943.
-#	   Given the structre of these JIS encodings, it is clear that
-#	   0x2922 and 0x2942 are intended to be a capital/small pair.
-#	   Consequently, in the Unicode mapping, 0x2922 is treated as
-#	   LATIN CAPITAL LETTER D WITH STROKE.
-#	  
-0x222F	0x02D8	# BREVE
-0x2230	0x02C7	# CARON (Mandarin Chinese third tone)
-0x2231	0x00B8	# CEDILLA
-0x2232	0x02D9	# DOT ABOVE (Mandarin Chinese light tone)
-0x2233	0x02DD	# DOUBLE ACUTE ACCENT
-0x2234	0x00AF	# MACRON
-0x2235	0x02DB	# OGONEK
-0x2236	0x02DA	# RING ABOVE
-0x2237	0x007E	# TILDE
-0x2238	0x0384	# GREEK TONOS
-0x2239	0x0385	# GREEK DIALYTIKA TONOS
-0x2242	0x00A1	# INVERTED EXCLAMATION MARK
-0x2243	0x00A6	# BROKEN BAR
-0x2244	0x00BF	# INVERTED QUESTION MARK
-0x226B	0x00BA	# MASCULINE ORDINAL INDICATOR
-0x226C	0x00AA	# FEMININE ORDINAL INDICATOR
-0x226D	0x00A9	# COPYRIGHT SIGN
-0x226E	0x00AE	# REGISTERED SIGN
-0x226F	0x2122	# TRADE MARK SIGN
-0x2270	0x00A4	# CURRENCY SIGN
-0x2271	0x2116	# NUMERO SIGN
-0x2661	0x0386	# GREEK CAPITAL LETTER ALPHA WITH TONOS
-0x2662	0x0388	# GREEK CAPITAL LETTER EPSILON WITH TONOS
-0x2663	0x0389	# GREEK CAPITAL LETTER ETA WITH TONOS
-0x2664	0x038A	# GREEK CAPITAL LETTER IOTA WITH TONOS
-0x2665	0x03AA	# GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-0x2667	0x038C	# GREEK CAPITAL LETTER OMICRON WITH TONOS
-0x2669	0x038E	# GREEK CAPITAL LETTER UPSILON WITH TONOS
-0x266A	0x03AB	# GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-0x266C	0x038F	# GREEK CAPITAL LETTER OMEGA WITH TONOS
-0x2671	0x03AC	# GREEK SMALL LETTER ALPHA WITH TONOS
-0x2672	0x03AD	# GREEK SMALL LETTER EPSILON WITH TONOS
-0x2673	0x03AE	# GREEK SMALL LETTER ETA WITH TONOS
-0x2674	0x03AF	# GREEK SMALL LETTER IOTA WITH TONOS
-0x2675	0x03CA	# GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0x2676	0x0390	# GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-0x2677	0x03CC	# GREEK SMALL LETTER OMICRON WITH TONOS
-0x2678	0x03C2	# GREEK SMALL LETTER FINAL SIGMA
-0x2679	0x03CD	# GREEK SMALL LETTER UPSILON WITH TONOS
-0x267A	0x03CB	# GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-0x267B	0x03B0	# GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-0x267C	0x03CE	# GREEK SMALL LETTER OMEGA WITH TONOS
-0x2742	0x0402	# CYRILLIC CAPITAL LETTER DJE
-0x2743	0x0403	# CYRILLIC CAPITAL LETTER GJE
-0x2744	0x0404	# CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0x2745	0x0405	# CYRILLIC CAPITAL LETTER DZE
-0x2746	0x0406	# CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0x2747	0x0407	# CYRILLIC CAPITAL LETTER YI
-0x2748	0x0408	# CYRILLIC CAPITAL LETTER JE
-0x2749	0x0409	# CYRILLIC CAPITAL LETTER LJE
-0x274A	0x040A	# CYRILLIC CAPITAL LETTER NJE
-0x274B	0x040B	# CYRILLIC CAPITAL LETTER TSHE
-0x274C	0x040C	# CYRILLIC CAPITAL LETTER KJE
-0x274D	0x040E	# CYRILLIC CAPITAL LETTER SHORT U
-0x274E	0x040F	# CYRILLIC CAPITAL LETTER DZHE
-0x2772	0x0452	# CYRILLIC SMALL LETTER DJE
-0x2773	0x0453	# CYRILLIC SMALL LETTER GJE
-0x2774	0x0454	# CYRILLIC SMALL LETTER UKRAINIAN IE
-0x2775	0x0455	# CYRILLIC SMALL LETTER DZE
-0x2776	0x0456	# CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0x2777	0x0457	# CYRILLIC SMALL LETTER YI
-0x2778	0x0458	# CYRILLIC SMALL LETTER JE
-0x2779	0x0459	# CYRILLIC SMALL LETTER LJE
-0x277A	0x045A	# CYRILLIC SMALL LETTER NJE
-0x277B	0x045B	# CYRILLIC SMALL LETTER TSHE
-0x277C	0x045C	# CYRILLIC SMALL LETTER KJE
-0x277D	0x045E	# CYRILLIC SMALL LETTER SHORT U
-0x277E	0x045F	# CYRILLIC SMALL LETTER DZHE
-0x2921	0x00C6	# LATIN CAPITAL LIGATURE AE
-0x2922	0x0110	# LATIN CAPITAL LETTER D WITH STROKE
-0x2924	0x0126	# LATIN CAPITAL LETTER H WITH STROKE
-0x2926	0x0132	# LATIN CAPITAL LIGATURE IJ
-0x2928	0x0141	# LATIN CAPITAL LETTER L WITH STROKE
-0x2929	0x013F	# LATIN CAPITAL LETTER L WITH MIDDLE DOT
-0x292B	0x014A	# LATIN CAPITAL LETTER ENG
-0x292C	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
-0x292D	0x0152	# LATIN CAPITAL LIGATURE OE
-0x292F	0x0166	# LATIN CAPITAL LETTER T WITH STROKE
-0x2930	0x00DE	# LATIN CAPITAL LETTER THORN
-0x2941	0x00E6	# LATIN SMALL LIGATURE AE
-0x2942	0x0111	# LATIN SMALL LETTER D WITH STROKE
-0x2943	0x00F0	# LATIN SMALL LETTER ETH
-0x2944	0x0127	# LATIN SMALL LETTER H WITH STROKE
-0x2945	0x0131	# LATIN SMALL LETTER DOTLESS I
-0x2946	0x0133	# LATIN SMALL LIGATURE IJ
-0x2947	0x0138	# LATIN SMALL LETTER KRA
-0x2948	0x0142	# LATIN SMALL LETTER L WITH STROKE
-0x2949	0x0140	# LATIN SMALL LETTER L WITH MIDDLE DOT
-0x294A	0x0149	# LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-0x294B	0x014B	# LATIN SMALL LETTER ENG
-0x294C	0x00F8	# LATIN SMALL LETTER O WITH STROKE
-0x294D	0x0153	# LATIN SMALL LIGATURE OE
-0x294E	0x00DF	# LATIN SMALL LETTER SHARP S
-0x294F	0x0167	# LATIN SMALL LETTER T WITH STROKE
-0x2950	0x00FE	# LATIN SMALL LETTER THORN
-0x2A21	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0x2A22	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0x2A23	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x2A24	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0x2A25	0x0102	# LATIN CAPITAL LETTER A WITH BREVE
-0x2A26	0x01CD	# LATIN CAPITAL LETTER A WITH CARON
-0x2A27	0x0100	# LATIN CAPITAL LETTER A WITH MACRON
-0x2A28	0x0104	# LATIN CAPITAL LETTER A WITH OGONEK
-0x2A29	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x2A2A	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0x2A2B	0x0106	# LATIN CAPITAL LETTER C WITH ACUTE
-0x2A2C	0x0108	# LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-0x2A2D	0x010C	# LATIN CAPITAL LETTER C WITH CARON
-0x2A2E	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x2A2F	0x010A	# LATIN CAPITAL LETTER C WITH DOT ABOVE
-0x2A30	0x010E	# LATIN CAPITAL LETTER D WITH CARON
-0x2A31	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x2A32	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0x2A33	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0x2A34	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0x2A35	0x011A	# LATIN CAPITAL LETTER E WITH CARON
-0x2A36	0x0116	# LATIN CAPITAL LETTER E WITH DOT ABOVE
-0x2A37	0x0112	# LATIN CAPITAL LETTER E WITH MACRON
-0x2A38	0x0118	# LATIN CAPITAL LETTER E WITH OGONEK
-0x2A3A	0x011C	# LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-0x2A3B	0x011E	# LATIN CAPITAL LETTER G WITH BREVE
-0x2A3C	0x0122	# LATIN CAPITAL LETTER G WITH CEDILLA
-0x2A3D	0x0120	# LATIN CAPITAL LETTER G WITH DOT ABOVE
-0x2A3E	0x0124	# LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-0x2A3F	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0x2A40	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0x2A41	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0x2A42	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0x2A43	0x01CF	# LATIN CAPITAL LETTER I WITH CARON
-0x2A44	0x0130	# LATIN CAPITAL LETTER I WITH DOT ABOVE
-0x2A45	0x012A	# LATIN CAPITAL LETTER I WITH MACRON
-0x2A46	0x012E	# LATIN CAPITAL LETTER I WITH OGONEK
-0x2A47	0x0128	# LATIN CAPITAL LETTER I WITH TILDE
-0x2A48	0x0134	# LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-0x2A49	0x0136	# LATIN CAPITAL LETTER K WITH CEDILLA
-0x2A4A	0x0139	# LATIN CAPITAL LETTER L WITH ACUTE
-0x2A4B	0x013D	# LATIN CAPITAL LETTER L WITH CARON
-0x2A4C	0x013B	# LATIN CAPITAL LETTER L WITH CEDILLA
-0x2A4D	0x0143	# LATIN CAPITAL LETTER N WITH ACUTE
-0x2A4E	0x0147	# LATIN CAPITAL LETTER N WITH CARON
-0x2A4F	0x0145	# LATIN CAPITAL LETTER N WITH CEDILLA
-0x2A50	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x2A51	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0x2A52	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0x2A53	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x2A54	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0x2A55	0x01D1	# LATIN CAPITAL LETTER O WITH CARON
-0x2A56	0x0150	# LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0x2A57	0x014C	# LATIN CAPITAL LETTER O WITH MACRON
-0x2A58	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0x2A59	0x0154	# LATIN CAPITAL LETTER R WITH ACUTE
-0x2A5A	0x0158	# LATIN CAPITAL LETTER R WITH CARON
-0x2A5B	0x0156	# LATIN CAPITAL LETTER R WITH CEDILLA
-0x2A5C	0x015A	# LATIN CAPITAL LETTER S WITH ACUTE
-0x2A5D	0x015C	# LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-0x2A5E	0x0160	# LATIN CAPITAL LETTER S WITH CARON
-0x2A5F	0x015E	# LATIN CAPITAL LETTER S WITH CEDILLA
-0x2A60	0x0164	# LATIN CAPITAL LETTER T WITH CARON
-0x2A61	0x0162	# LATIN CAPITAL LETTER T WITH CEDILLA
-0x2A62	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0x2A63	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0x2A64	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x2A65	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0x2A66	0x016C	# LATIN CAPITAL LETTER U WITH BREVE
-0x2A67	0x01D3	# LATIN CAPITAL LETTER U WITH CARON
-0x2A68	0x0170	# LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0x2A69	0x016A	# LATIN CAPITAL LETTER U WITH MACRON
-0x2A6A	0x0172	# LATIN CAPITAL LETTER U WITH OGONEK
-0x2A6B	0x016E	# LATIN CAPITAL LETTER U WITH RING ABOVE
-0x2A6C	0x0168	# LATIN CAPITAL LETTER U WITH TILDE
-0x2A6D	0x01D7	# LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-0x2A6E	0x01DB	# LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-0x2A6F	0x01D9	# LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-0x2A70	0x01D5	# LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
-0x2A71	0x0174	# LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-0x2A72	0x00DD	# LATIN CAPITAL LETTER Y WITH ACUTE
-0x2A73	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
-0x2A74	0x0176	# LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-0x2A75	0x0179	# LATIN CAPITAL LETTER Z WITH ACUTE
-0x2A76	0x017D	# LATIN CAPITAL LETTER Z WITH CARON
-0x2A77	0x017B	# LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0x2B21	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x2B22	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x2B23	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x2B24	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x2B25	0x0103	# LATIN SMALL LETTER A WITH BREVE
-0x2B26	0x01CE	# LATIN SMALL LETTER A WITH CARON
-0x2B27	0x0101	# LATIN SMALL LETTER A WITH MACRON
-0x2B28	0x0105	# LATIN SMALL LETTER A WITH OGONEK
-0x2B29	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x2B2A	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x2B2B	0x0107	# LATIN SMALL LETTER C WITH ACUTE
-0x2B2C	0x0109	# LATIN SMALL LETTER C WITH CIRCUMFLEX
-0x2B2D	0x010D	# LATIN SMALL LETTER C WITH CARON
-0x2B2E	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x2B2F	0x010B	# LATIN SMALL LETTER C WITH DOT ABOVE
-0x2B30	0x010F	# LATIN SMALL LETTER D WITH CARON
-0x2B31	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x2B32	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x2B33	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x2B34	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x2B35	0x011B	# LATIN SMALL LETTER E WITH CARON
-0x2B36	0x0117	# LATIN SMALL LETTER E WITH DOT ABOVE
-0x2B37	0x0113	# LATIN SMALL LETTER E WITH MACRON
-0x2B38	0x0119	# LATIN SMALL LETTER E WITH OGONEK
-0x2B39	0x01F5	# LATIN SMALL LETTER G WITH ACUTE
-0x2B3A	0x011D	# LATIN SMALL LETTER G WITH CIRCUMFLEX
-0x2B3B	0x011F	# LATIN SMALL LETTER G WITH BREVE
-0x2B3D	0x0121	# LATIN SMALL LETTER G WITH DOT ABOVE
-0x2B3E	0x0125	# LATIN SMALL LETTER H WITH CIRCUMFLEX
-0x2B3F	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x2B40	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x2B41	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x2B42	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x2B43	0x01D0	# LATIN SMALL LETTER I WITH CARON
-0x2B45	0x012B	# LATIN SMALL LETTER I WITH MACRON
-0x2B46	0x012F	# LATIN SMALL LETTER I WITH OGONEK
-0x2B47	0x0129	# LATIN SMALL LETTER I WITH TILDE
-0x2B48	0x0135	# LATIN SMALL LETTER J WITH CIRCUMFLEX
-0x2B49	0x0137	# LATIN SMALL LETTER K WITH CEDILLA
-0x2B4A	0x013A	# LATIN SMALL LETTER L WITH ACUTE
-0x2B4B	0x013E	# LATIN SMALL LETTER L WITH CARON
-0x2B4C	0x013C	# LATIN SMALL LETTER L WITH CEDILLA
-0x2B4D	0x0144	# LATIN SMALL LETTER N WITH ACUTE
-0x2B4E	0x0148	# LATIN SMALL LETTER N WITH CARON
-0x2B4F	0x0146	# LATIN SMALL LETTER N WITH CEDILLA
-0x2B50	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x2B51	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x2B52	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x2B53	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x2B54	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x2B55	0x01D2	# LATIN SMALL LETTER O WITH CARON
-0x2B56	0x0151	# LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0x2B57	0x014D	# LATIN SMALL LETTER O WITH MACRON
-0x2B58	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x2B59	0x0155	# LATIN SMALL LETTER R WITH ACUTE
-0x2B5A	0x0159	# LATIN SMALL LETTER R WITH CARON
-0x2B5B	0x0157	# LATIN SMALL LETTER R WITH CEDILLA
-0x2B5C	0x015B	# LATIN SMALL LETTER S WITH ACUTE
-0x2B5D	0x015D	# LATIN SMALL LETTER S WITH CIRCUMFLEX
-0x2B5E	0x0161	# LATIN SMALL LETTER S WITH CARON
-0x2B5F	0x015F	# LATIN SMALL LETTER S WITH CEDILLA
-0x2B60	0x0165	# LATIN SMALL LETTER T WITH CARON
-0x2B61	0x0163	# LATIN SMALL LETTER T WITH CEDILLA
-0x2B62	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x2B63	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x2B64	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0x2B65	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x2B66	0x016D	# LATIN SMALL LETTER U WITH BREVE
-0x2B67	0x01D4	# LATIN SMALL LETTER U WITH CARON
-0x2B68	0x0171	# LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0x2B69	0x016B	# LATIN SMALL LETTER U WITH MACRON
-0x2B6A	0x0173	# LATIN SMALL LETTER U WITH OGONEK
-0x2B6B	0x016F	# LATIN SMALL LETTER U WITH RING ABOVE
-0x2B6C	0x0169	# LATIN SMALL LETTER U WITH TILDE
-0x2B6D	0x01D8	# LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-0x2B6E	0x01DC	# LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-0x2B6F	0x01DA	# LATIN SMALL LETTER U WITH DIAERESIS AND CARON
-0x2B70	0x01D6	# LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
-0x2B71	0x0175	# LATIN SMALL LETTER W WITH CIRCUMFLEX
-0x2B72	0x00FD	# LATIN SMALL LETTER Y WITH ACUTE
-0x2B73	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
-0x2B74	0x0177	# LATIN SMALL LETTER Y WITH CIRCUMFLEX
-0x2B75	0x017A	# LATIN SMALL LETTER Z WITH ACUTE
-0x2B76	0x017E	# LATIN SMALL LETTER Z WITH CARON
-0x2B77	0x017C	# LATIN SMALL LETTER Z WITH DOT ABOVE
-0x3021	0x4E02	# <CJK>
-0x3022	0x4E04	# <CJK>
-0x3023	0x4E05	# <CJK>
-0x3024	0x4E0C	# <CJK>
-0x3025	0x4E12	# <CJK>
-0x3026	0x4E1F	# <CJK>
-0x3027	0x4E23	# <CJK>
-0x3028	0x4E24	# <CJK>
-0x3029	0x4E28	# <CJK>
-0x302A	0x4E2B	# <CJK>
-0x302B	0x4E2E	# <CJK>
-0x302C	0x4E2F	# <CJK>
-0x302D	0x4E30	# <CJK>
-0x302E	0x4E35	# <CJK>
-0x302F	0x4E40	# <CJK>
-0x3030	0x4E41	# <CJK>
-0x3031	0x4E44	# <CJK>
-0x3032	0x4E47	# <CJK>
-0x3033	0x4E51	# <CJK>
-0x3034	0x4E5A	# <CJK>
-0x3035	0x4E5C	# <CJK>
-0x3036	0x4E63	# <CJK>
-0x3037	0x4E68	# <CJK>
-0x3038	0x4E69	# <CJK>
-0x3039	0x4E74	# <CJK>
-0x303A	0x4E75	# <CJK>
-0x303B	0x4E79	# <CJK>
-0x303C	0x4E7F	# <CJK>
-0x303D	0x4E8D	# <CJK>
-0x303E	0x4E96	# <CJK>
-0x303F	0x4E97	# <CJK>
-0x3040	0x4E9D	# <CJK>
-0x3041	0x4EAF	# <CJK>
-0x3042	0x4EB9	# <CJK>
-0x3043	0x4EC3	# <CJK>
-0x3044	0x4ED0	# <CJK>
-0x3045	0x4EDA	# <CJK>
-0x3046	0x4EDB	# <CJK>
-0x3047	0x4EE0	# <CJK>
-0x3048	0x4EE1	# <CJK>
-0x3049	0x4EE2	# <CJK>
-0x304A	0x4EE8	# <CJK>
-0x304B	0x4EEF	# <CJK>
-0x304C	0x4EF1	# <CJK>
-0x304D	0x4EF3	# <CJK>
-0x304E	0x4EF5	# <CJK>
-0x304F	0x4EFD	# <CJK>
-0x3050	0x4EFE	# <CJK>
-0x3051	0x4EFF	# <CJK>
-0x3052	0x4F00	# <CJK>
-0x3053	0x4F02	# <CJK>
-0x3054	0x4F03	# <CJK>
-0x3055	0x4F08	# <CJK>
-0x3056	0x4F0B	# <CJK>
-0x3057	0x4F0C	# <CJK>
-0x3058	0x4F12	# <CJK>
-0x3059	0x4F15	# <CJK>
-0x305A	0x4F16	# <CJK>
-0x305B	0x4F17	# <CJK>
-0x305C	0x4F19	# <CJK>
-0x305D	0x4F2E	# <CJK>
-0x305E	0x4F31	# <CJK>
-0x305F	0x4F60	# <CJK>
-0x3060	0x4F33	# <CJK>
-0x3061	0x4F35	# <CJK>
-0x3062	0x4F37	# <CJK>
-0x3063	0x4F39	# <CJK>
-0x3064	0x4F3B	# <CJK>
-0x3065	0x4F3E	# <CJK>
-0x3066	0x4F40	# <CJK>
-0x3067	0x4F42	# <CJK>
-0x3068	0x4F48	# <CJK>
-0x3069	0x4F49	# <CJK>
-0x306A	0x4F4B	# <CJK>
-0x306B	0x4F4C	# <CJK>
-0x306C	0x4F52	# <CJK>
-0x306D	0x4F54	# <CJK>
-0x306E	0x4F56	# <CJK>
-0x306F	0x4F58	# <CJK>
-0x3070	0x4F5F	# <CJK>
-0x3071	0x4F63	# <CJK>
-0x3072	0x4F6A	# <CJK>
-0x3073	0x4F6C	# <CJK>
-0x3074	0x4F6E	# <CJK>
-0x3075	0x4F71	# <CJK>
-0x3076	0x4F77	# <CJK>
-0x3077	0x4F78	# <CJK>
-0x3078	0x4F79	# <CJK>
-0x3079	0x4F7A	# <CJK>
-0x307A	0x4F7D	# <CJK>
-0x307B	0x4F7E	# <CJK>
-0x307C	0x4F81	# <CJK>
-0x307D	0x4F82	# <CJK>
-0x307E	0x4F84	# <CJK>
-0x3121	0x4F85	# <CJK>
-0x3122	0x4F89	# <CJK>
-0x3123	0x4F8A	# <CJK>
-0x3124	0x4F8C	# <CJK>
-0x3125	0x4F8E	# <CJK>
-0x3126	0x4F90	# <CJK>
-0x3127	0x4F92	# <CJK>
-0x3128	0x4F93	# <CJK>
-0x3129	0x4F94	# <CJK>
-0x312A	0x4F97	# <CJK>
-0x312B	0x4F99	# <CJK>
-0x312C	0x4F9A	# <CJK>
-0x312D	0x4F9E	# <CJK>
-0x312E	0x4F9F	# <CJK>
-0x312F	0x4FB2	# <CJK>
-0x3130	0x4FB7	# <CJK>
-0x3131	0x4FB9	# <CJK>
-0x3132	0x4FBB	# <CJK>
-0x3133	0x4FBC	# <CJK>
-0x3134	0x4FBD	# <CJK>
-0x3135	0x4FBE	# <CJK>
-0x3136	0x4FC0	# <CJK>
-0x3137	0x4FC1	# <CJK>
-0x3138	0x4FC5	# <CJK>
-0x3139	0x4FC6	# <CJK>
-0x313A	0x4FC8	# <CJK>
-0x313B	0x4FC9	# <CJK>
-0x313C	0x4FCB	# <CJK>
-0x313D	0x4FCC	# <CJK>
-0x313E	0x4FCD	# <CJK>
-0x313F	0x4FCF	# <CJK>
-0x3140	0x4FD2	# <CJK>
-0x3141	0x4FDC	# <CJK>
-0x3142	0x4FE0	# <CJK>
-0x3143	0x4FE2	# <CJK>
-0x3144	0x4FF0	# <CJK>
-0x3145	0x4FF2	# <CJK>
-0x3146	0x4FFC	# <CJK>
-0x3147	0x4FFD	# <CJK>
-0x3148	0x4FFF	# <CJK>
-0x3149	0x5000	# <CJK>
-0x314A	0x5001	# <CJK>
-0x314B	0x5004	# <CJK>
-0x314C	0x5007	# <CJK>
-0x314D	0x500A	# <CJK>
-0x314E	0x500C	# <CJK>
-0x314F	0x500E	# <CJK>
-0x3150	0x5010	# <CJK>
-0x3151	0x5013	# <CJK>
-0x3152	0x5017	# <CJK>
-0x3153	0x5018	# <CJK>
-0x3154	0x501B	# <CJK>
-0x3155	0x501C	# <CJK>
-0x3156	0x501D	# <CJK>
-0x3157	0x501E	# <CJK>
-0x3158	0x5022	# <CJK>
-0x3159	0x5027	# <CJK>
-0x315A	0x502E	# <CJK>
-0x315B	0x5030	# <CJK>
-0x315C	0x5032	# <CJK>
-0x315D	0x5033	# <CJK>
-0x315E	0x5035	# <CJK>
-0x315F	0x5040	# <CJK>
-0x3160	0x5041	# <CJK>
-0x3161	0x5042	# <CJK>
-0x3162	0x5045	# <CJK>
-0x3163	0x5046	# <CJK>
-0x3164	0x504A	# <CJK>
-0x3165	0x504C	# <CJK>
-0x3166	0x504E	# <CJK>
-0x3167	0x5051	# <CJK>
-0x3168	0x5052	# <CJK>
-0x3169	0x5053	# <CJK>
-0x316A	0x5057	# <CJK>
-0x316B	0x5059	# <CJK>
-0x316C	0x505F	# <CJK>
-0x316D	0x5060	# <CJK>
-0x316E	0x5062	# <CJK>
-0x316F	0x5063	# <CJK>
-0x3170	0x5066	# <CJK>
-0x3171	0x5067	# <CJK>
-0x3172	0x506A	# <CJK>
-0x3173	0x506D	# <CJK>
-0x3174	0x5070	# <CJK>
-0x3175	0x5071	# <CJK>
-0x3176	0x503B	# <CJK>
-0x3177	0x5081	# <CJK>
-0x3178	0x5083	# <CJK>
-0x3179	0x5084	# <CJK>
-0x317A	0x5086	# <CJK>
-0x317B	0x508A	# <CJK>
-0x317C	0x508E	# <CJK>
-0x317D	0x508F	# <CJK>
-0x317E	0x5090	# <CJK>
-0x3221	0x5092	# <CJK>
-0x3222	0x5093	# <CJK>
-0x3223	0x5094	# <CJK>
-0x3224	0x5096	# <CJK>
-0x3225	0x509B	# <CJK>
-0x3226	0x509C	# <CJK>
-0x3227	0x509E	# <CJK>
-0x3228	0x509F	# <CJK>
-0x3229	0x50A0	# <CJK>
-0x322A	0x50A1	# <CJK>
-0x322B	0x50A2	# <CJK>
-0x322C	0x50AA	# <CJK>
-0x322D	0x50AF	# <CJK>
-0x322E	0x50B0	# <CJK>
-0x322F	0x50B9	# <CJK>
-0x3230	0x50BA	# <CJK>
-0x3231	0x50BD	# <CJK>
-0x3232	0x50C0	# <CJK>
-0x3233	0x50C3	# <CJK>
-0x3234	0x50C4	# <CJK>
-0x3235	0x50C7	# <CJK>
-0x3236	0x50CC	# <CJK>
-0x3237	0x50CE	# <CJK>
-0x3238	0x50D0	# <CJK>
-0x3239	0x50D3	# <CJK>
-0x323A	0x50D4	# <CJK>
-0x323B	0x50D8	# <CJK>
-0x323C	0x50DC	# <CJK>
-0x323D	0x50DD	# <CJK>
-0x323E	0x50DF	# <CJK>
-0x323F	0x50E2	# <CJK>
-0x3240	0x50E4	# <CJK>
-0x3241	0x50E6	# <CJK>
-0x3242	0x50E8	# <CJK>
-0x3243	0x50E9	# <CJK>
-0x3244	0x50EF	# <CJK>
-0x3245	0x50F1	# <CJK>
-0x3246	0x50F6	# <CJK>
-0x3247	0x50FA	# <CJK>
-0x3248	0x50FE	# <CJK>
-0x3249	0x5103	# <CJK>
-0x324A	0x5106	# <CJK>
-0x324B	0x5107	# <CJK>
-0x324C	0x5108	# <CJK>
-0x324D	0x510B	# <CJK>
-0x324E	0x510C	# <CJK>
-0x324F	0x510D	# <CJK>
-0x3250	0x510E	# <CJK>
-0x3251	0x50F2	# <CJK>
-0x3252	0x5110	# <CJK>
-0x3253	0x5117	# <CJK>
-0x3254	0x5119	# <CJK>
-0x3255	0x511B	# <CJK>
-0x3256	0x511C	# <CJK>
-0x3257	0x511D	# <CJK>
-0x3258	0x511E	# <CJK>
-0x3259	0x5123	# <CJK>
-0x325A	0x5127	# <CJK>
-0x325B	0x5128	# <CJK>
-0x325C	0x512C	# <CJK>
-0x325D	0x512D	# <CJK>
-0x325E	0x512F	# <CJK>
-0x325F	0x5131	# <CJK>
-0x3260	0x5133	# <CJK>
-0x3261	0x5134	# <CJK>
-0x3262	0x5135	# <CJK>
-0x3263	0x5138	# <CJK>
-0x3264	0x5139	# <CJK>
-0x3265	0x5142	# <CJK>
-0x3266	0x514A	# <CJK>
-0x3267	0x514F	# <CJK>
-0x3268	0x5153	# <CJK>
-0x3269	0x5155	# <CJK>
-0x326A	0x5157	# <CJK>
-0x326B	0x5158	# <CJK>
-0x326C	0x515F	# <CJK>
-0x326D	0x5164	# <CJK>
-0x326E	0x5166	# <CJK>
-0x326F	0x517E	# <CJK>
-0x3270	0x5183	# <CJK>
-0x3271	0x5184	# <CJK>
-0x3272	0x518B	# <CJK>
-0x3273	0x518E	# <CJK>
-0x3274	0x5198	# <CJK>
-0x3275	0x519D	# <CJK>
-0x3276	0x51A1	# <CJK>
-0x3277	0x51A3	# <CJK>
-0x3278	0x51AD	# <CJK>
-0x3279	0x51B8	# <CJK>
-0x327A	0x51BA	# <CJK>
-0x327B	0x51BC	# <CJK>
-0x327C	0x51BE	# <CJK>
-0x327D	0x51BF	# <CJK>
-0x327E	0x51C2	# <CJK>
-0x3321	0x51C8	# <CJK>
-0x3322	0x51CF	# <CJK>
-0x3323	0x51D1	# <CJK>
-0x3324	0x51D2	# <CJK>
-0x3325	0x51D3	# <CJK>
-0x3326	0x51D5	# <CJK>
-0x3327	0x51D8	# <CJK>
-0x3328	0x51DE	# <CJK>
-0x3329	0x51E2	# <CJK>
-0x332A	0x51E5	# <CJK>
-0x332B	0x51EE	# <CJK>
-0x332C	0x51F2	# <CJK>
-0x332D	0x51F3	# <CJK>
-0x332E	0x51F4	# <CJK>
-0x332F	0x51F7	# <CJK>
-0x3330	0x5201	# <CJK>
-0x3331	0x5202	# <CJK>
-0x3332	0x5205	# <CJK>
-0x3333	0x5212	# <CJK>
-0x3334	0x5213	# <CJK>
-0x3335	0x5215	# <CJK>
-0x3336	0x5216	# <CJK>
-0x3337	0x5218	# <CJK>
-0x3338	0x5222	# <CJK>
-0x3339	0x5228	# <CJK>
-0x333A	0x5231	# <CJK>
-0x333B	0x5232	# <CJK>
-0x333C	0x5235	# <CJK>
-0x333D	0x523C	# <CJK>
-0x333E	0x5245	# <CJK>
-0x333F	0x5249	# <CJK>
-0x3340	0x5255	# <CJK>
-0x3341	0x5257	# <CJK>
-0x3342	0x5258	# <CJK>
-0x3343	0x525A	# <CJK>
-0x3344	0x525C	# <CJK>
-0x3345	0x525F	# <CJK>
-0x3346	0x5260	# <CJK>
-0x3347	0x5261	# <CJK>
-0x3348	0x5266	# <CJK>
-0x3349	0x526E	# <CJK>
-0x334A	0x5277	# <CJK>
-0x334B	0x5278	# <CJK>
-0x334C	0x5279	# <CJK>
-0x334D	0x5280	# <CJK>
-0x334E	0x5282	# <CJK>
-0x334F	0x5285	# <CJK>
-0x3350	0x528A	# <CJK>
-0x3351	0x528C	# <CJK>
-0x3352	0x5293	# <CJK>
-0x3353	0x5295	# <CJK>
-0x3354	0x5296	# <CJK>
-0x3355	0x5297	# <CJK>
-0x3356	0x5298	# <CJK>
-0x3357	0x529A	# <CJK>
-0x3358	0x529C	# <CJK>
-0x3359	0x52A4	# <CJK>
-0x335A	0x52A5	# <CJK>
-0x335B	0x52A6	# <CJK>
-0x335C	0x52A7	# <CJK>
-0x335D	0x52AF	# <CJK>
-0x335E	0x52B0	# <CJK>
-0x335F	0x52B6	# <CJK>
-0x3360	0x52B7	# <CJK>
-0x3361	0x52B8	# <CJK>
-0x3362	0x52BA	# <CJK>
-0x3363	0x52BB	# <CJK>
-0x3364	0x52BD	# <CJK>
-0x3365	0x52C0	# <CJK>
-0x3366	0x52C4	# <CJK>
-0x3367	0x52C6	# <CJK>
-0x3368	0x52C8	# <CJK>
-0x3369	0x52CC	# <CJK>
-0x336A	0x52CF	# <CJK>
-0x336B	0x52D1	# <CJK>
-0x336C	0x52D4	# <CJK>
-0x336D	0x52D6	# <CJK>
-0x336E	0x52DB	# <CJK>
-0x336F	0x52DC	# <CJK>
-0x3370	0x52E1	# <CJK>
-0x3371	0x52E5	# <CJK>
-0x3372	0x52E8	# <CJK>
-0x3373	0x52E9	# <CJK>
-0x3374	0x52EA	# <CJK>
-0x3375	0x52EC	# <CJK>
-0x3376	0x52F0	# <CJK>
-0x3377	0x52F1	# <CJK>
-0x3378	0x52F4	# <CJK>
-0x3379	0x52F6	# <CJK>
-0x337A	0x52F7	# <CJK>
-0x337B	0x5300	# <CJK>
-0x337C	0x5303	# <CJK>
-0x337D	0x530A	# <CJK>
-0x337E	0x530B	# <CJK>
-0x3421	0x530C	# <CJK>
-0x3422	0x5311	# <CJK>
-0x3423	0x5313	# <CJK>
-0x3424	0x5318	# <CJK>
-0x3425	0x531B	# <CJK>
-0x3426	0x531C	# <CJK>
-0x3427	0x531E	# <CJK>
-0x3428	0x531F	# <CJK>
-0x3429	0x5325	# <CJK>
-0x342A	0x5327	# <CJK>
-0x342B	0x5328	# <CJK>
-0x342C	0x5329	# <CJK>
-0x342D	0x532B	# <CJK>
-0x342E	0x532C	# <CJK>
-0x342F	0x532D	# <CJK>
-0x3430	0x5330	# <CJK>
-0x3431	0x5332	# <CJK>
-0x3432	0x5335	# <CJK>
-0x3433	0x533C	# <CJK>
-0x3434	0x533D	# <CJK>
-0x3435	0x533E	# <CJK>
-0x3436	0x5342	# <CJK>
-0x3437	0x534C	# <CJK>
-0x3438	0x534B	# <CJK>
-0x3439	0x5359	# <CJK>
-0x343A	0x535B	# <CJK>
-0x343B	0x5361	# <CJK>
-0x343C	0x5363	# <CJK>
-0x343D	0x5365	# <CJK>
-0x343E	0x536C	# <CJK>
-0x343F	0x536D	# <CJK>
-0x3440	0x5372	# <CJK>
-0x3441	0x5379	# <CJK>
-0x3442	0x537E	# <CJK>
-0x3443	0x5383	# <CJK>
-0x3444	0x5387	# <CJK>
-0x3445	0x5388	# <CJK>
-0x3446	0x538E	# <CJK>
-0x3447	0x5393	# <CJK>
-0x3448	0x5394	# <CJK>
-0x3449	0x5399	# <CJK>
-0x344A	0x539D	# <CJK>
-0x344B	0x53A1	# <CJK>
-0x344C	0x53A4	# <CJK>
-0x344D	0x53AA	# <CJK>
-0x344E	0x53AB	# <CJK>
-0x344F	0x53AF	# <CJK>
-0x3450	0x53B2	# <CJK>
-0x3451	0x53B4	# <CJK>
-0x3452	0x53B5	# <CJK>
-0x3453	0x53B7	# <CJK>
-0x3454	0x53B8	# <CJK>
-0x3455	0x53BA	# <CJK>
-0x3456	0x53BD	# <CJK>
-0x3457	0x53C0	# <CJK>
-0x3458	0x53C5	# <CJK>
-0x3459	0x53CF	# <CJK>
-0x345A	0x53D2	# <CJK>
-0x345B	0x53D3	# <CJK>
-0x345C	0x53D5	# <CJK>
-0x345D	0x53DA	# <CJK>
-0x345E	0x53DD	# <CJK>
-0x345F	0x53DE	# <CJK>
-0x3460	0x53E0	# <CJK>
-0x3461	0x53E6	# <CJK>
-0x3462	0x53E7	# <CJK>
-0x3463	0x53F5	# <CJK>
-0x3464	0x5402	# <CJK>
-0x3465	0x5413	# <CJK>
-0x3466	0x541A	# <CJK>
-0x3467	0x5421	# <CJK>
-0x3468	0x5427	# <CJK>
-0x3469	0x5428	# <CJK>
-0x346A	0x542A	# <CJK>
-0x346B	0x542F	# <CJK>
-0x346C	0x5431	# <CJK>
-0x346D	0x5434	# <CJK>
-0x346E	0x5435	# <CJK>
-0x346F	0x5443	# <CJK>
-0x3470	0x5444	# <CJK>
-0x3471	0x5447	# <CJK>
-0x3472	0x544D	# <CJK>
-0x3473	0x544F	# <CJK>
-0x3474	0x545E	# <CJK>
-0x3475	0x5462	# <CJK>
-0x3476	0x5464	# <CJK>
-0x3477	0x5466	# <CJK>
-0x3478	0x5467	# <CJK>
-0x3479	0x5469	# <CJK>
-0x347A	0x546B	# <CJK>
-0x347B	0x546D	# <CJK>
-0x347C	0x546E	# <CJK>
-0x347D	0x5474	# <CJK>
-0x347E	0x547F	# <CJK>
-0x3521	0x5481	# <CJK>
-0x3522	0x5483	# <CJK>
-0x3523	0x5485	# <CJK>
-0x3524	0x5488	# <CJK>
-0x3525	0x5489	# <CJK>
-0x3526	0x548D	# <CJK>
-0x3527	0x5491	# <CJK>
-0x3528	0x5495	# <CJK>
-0x3529	0x5496	# <CJK>
-0x352A	0x549C	# <CJK>
-0x352B	0x549F	# <CJK>
-0x352C	0x54A1	# <CJK>
-0x352D	0x54A6	# <CJK>
-0x352E	0x54A7	# <CJK>
-0x352F	0x54A9	# <CJK>
-0x3530	0x54AA	# <CJK>
-0x3531	0x54AD	# <CJK>
-0x3532	0x54AE	# <CJK>
-0x3533	0x54B1	# <CJK>
-0x3534	0x54B7	# <CJK>
-0x3535	0x54B9	# <CJK>
-0x3536	0x54BA	# <CJK>
-0x3537	0x54BB	# <CJK>
-0x3538	0x54BF	# <CJK>
-0x3539	0x54C6	# <CJK>
-0x353A	0x54CA	# <CJK>
-0x353B	0x54CD	# <CJK>
-0x353C	0x54CE	# <CJK>
-0x353D	0x54E0	# <CJK>
-0x353E	0x54EA	# <CJK>
-0x353F	0x54EC	# <CJK>
-0x3540	0x54EF	# <CJK>
-0x3541	0x54F6	# <CJK>
-0x3542	0x54FC	# <CJK>
-0x3543	0x54FE	# <CJK>
-0x3544	0x54FF	# <CJK>
-0x3545	0x5500	# <CJK>
-0x3546	0x5501	# <CJK>
-0x3547	0x5505	# <CJK>
-0x3548	0x5508	# <CJK>
-0x3549	0x5509	# <CJK>
-0x354A	0x550C	# <CJK>
-0x354B	0x550D	# <CJK>
-0x354C	0x550E	# <CJK>
-0x354D	0x5515	# <CJK>
-0x354E	0x552A	# <CJK>
-0x354F	0x552B	# <CJK>
-0x3550	0x5532	# <CJK>
-0x3551	0x5535	# <CJK>
-0x3552	0x5536	# <CJK>
-0x3553	0x553B	# <CJK>
-0x3554	0x553C	# <CJK>
-0x3555	0x553D	# <CJK>
-0x3556	0x5541	# <CJK>
-0x3557	0x5547	# <CJK>
-0x3558	0x5549	# <CJK>
-0x3559	0x554A	# <CJK>
-0x355A	0x554D	# <CJK>
-0x355B	0x5550	# <CJK>
-0x355C	0x5551	# <CJK>
-0x355D	0x5558	# <CJK>
-0x355E	0x555A	# <CJK>
-0x355F	0x555B	# <CJK>
-0x3560	0x555E	# <CJK>
-0x3561	0x5560	# <CJK>
-0x3562	0x5561	# <CJK>
-0x3563	0x5564	# <CJK>
-0x3564	0x5566	# <CJK>
-0x3565	0x557F	# <CJK>
-0x3566	0x5581	# <CJK>
-0x3567	0x5582	# <CJK>
-0x3568	0x5586	# <CJK>
-0x3569	0x5588	# <CJK>
-0x356A	0x558E	# <CJK>
-0x356B	0x558F	# <CJK>
-0x356C	0x5591	# <CJK>
-0x356D	0x5592	# <CJK>
-0x356E	0x5593	# <CJK>
-0x356F	0x5594	# <CJK>
-0x3570	0x5597	# <CJK>
-0x3571	0x55A3	# <CJK>
-0x3572	0x55A4	# <CJK>
-0x3573	0x55AD	# <CJK>
-0x3574	0x55B2	# <CJK>
-0x3575	0x55BF	# <CJK>
-0x3576	0x55C1	# <CJK>
-0x3577	0x55C3	# <CJK>
-0x3578	0x55C6	# <CJK>
-0x3579	0x55C9	# <CJK>
-0x357A	0x55CB	# <CJK>
-0x357B	0x55CC	# <CJK>
-0x357C	0x55CE	# <CJK>
-0x357D	0x55D1	# <CJK>
-0x357E	0x55D2	# <CJK>
-0x3621	0x55D3	# <CJK>
-0x3622	0x55D7	# <CJK>
-0x3623	0x55D8	# <CJK>
-0x3624	0x55DB	# <CJK>
-0x3625	0x55DE	# <CJK>
-0x3626	0x55E2	# <CJK>
-0x3627	0x55E9	# <CJK>
-0x3628	0x55F6	# <CJK>
-0x3629	0x55FF	# <CJK>
-0x362A	0x5605	# <CJK>
-0x362B	0x5608	# <CJK>
-0x362C	0x560A	# <CJK>
-0x362D	0x560D	# <CJK>
-0x362E	0x560E	# <CJK>
-0x362F	0x560F	# <CJK>
-0x3630	0x5610	# <CJK>
-0x3631	0x5611	# <CJK>
-0x3632	0x5612	# <CJK>
-0x3633	0x5619	# <CJK>
-0x3634	0x562C	# <CJK>
-0x3635	0x5630	# <CJK>
-0x3636	0x5633	# <CJK>
-0x3637	0x5635	# <CJK>
-0x3638	0x5637	# <CJK>
-0x3639	0x5639	# <CJK>
-0x363A	0x563B	# <CJK>
-0x363B	0x563C	# <CJK>
-0x363C	0x563D	# <CJK>
-0x363D	0x563F	# <CJK>
-0x363E	0x5640	# <CJK>
-0x363F	0x5641	# <CJK>
-0x3640	0x5643	# <CJK>
-0x3641	0x5644	# <CJK>
-0x3642	0x5646	# <CJK>
-0x3643	0x5649	# <CJK>
-0x3644	0x564B	# <CJK>
-0x3645	0x564D	# <CJK>
-0x3646	0x564F	# <CJK>
-0x3647	0x5654	# <CJK>
-0x3648	0x565E	# <CJK>
-0x3649	0x5660	# <CJK>
-0x364A	0x5661	# <CJK>
-0x364B	0x5662	# <CJK>
-0x364C	0x5663	# <CJK>
-0x364D	0x5666	# <CJK>
-0x364E	0x5669	# <CJK>
-0x364F	0x566D	# <CJK>
-0x3650	0x566F	# <CJK>
-0x3651	0x5671	# <CJK>
-0x3652	0x5672	# <CJK>
-0x3653	0x5675	# <CJK>
-0x3654	0x5684	# <CJK>
-0x3655	0x5685	# <CJK>
-0x3656	0x5688	# <CJK>
-0x3657	0x568B	# <CJK>
-0x3658	0x568C	# <CJK>
-0x3659	0x5695	# <CJK>
-0x365A	0x5699	# <CJK>
-0x365B	0x569A	# <CJK>
-0x365C	0x569D	# <CJK>
-0x365D	0x569E	# <CJK>
-0x365E	0x569F	# <CJK>
-0x365F	0x56A6	# <CJK>
-0x3660	0x56A7	# <CJK>
-0x3661	0x56A8	# <CJK>
-0x3662	0x56A9	# <CJK>
-0x3663	0x56AB	# <CJK>
-0x3664	0x56AC	# <CJK>
-0x3665	0x56AD	# <CJK>
-0x3666	0x56B1	# <CJK>
-0x3667	0x56B3	# <CJK>
-0x3668	0x56B7	# <CJK>
-0x3669	0x56BE	# <CJK>
-0x366A	0x56C5	# <CJK>
-0x366B	0x56C9	# <CJK>
-0x366C	0x56CA	# <CJK>
-0x366D	0x56CB	# <CJK>
-0x366E	0x56CF	# <CJK>
-0x366F	0x56D0	# <CJK>
-0x3670	0x56CC	# <CJK>
-0x3671	0x56CD	# <CJK>
-0x3672	0x56D9	# <CJK>
-0x3673	0x56DC	# <CJK>
-0x3674	0x56DD	# <CJK>
-0x3675	0x56DF	# <CJK>
-0x3676	0x56E1	# <CJK>
-0x3677	0x56E4	# <CJK>
-0x3678	0x56E5	# <CJK>
-0x3679	0x56E6	# <CJK>
-0x367A	0x56E7	# <CJK>
-0x367B	0x56E8	# <CJK>
-0x367C	0x56F1	# <CJK>
-0x367D	0x56EB	# <CJK>
-0x367E	0x56ED	# <CJK>
-0x3721	0x56F6	# <CJK>
-0x3722	0x56F7	# <CJK>
-0x3723	0x5701	# <CJK>
-0x3724	0x5702	# <CJK>
-0x3725	0x5707	# <CJK>
-0x3726	0x570A	# <CJK>
-0x3727	0x570C	# <CJK>
-0x3728	0x5711	# <CJK>
-0x3729	0x5715	# <CJK>
-0x372A	0x571A	# <CJK>
-0x372B	0x571B	# <CJK>
-0x372C	0x571D	# <CJK>
-0x372D	0x5720	# <CJK>
-0x372E	0x5722	# <CJK>
-0x372F	0x5723	# <CJK>
-0x3730	0x5724	# <CJK>
-0x3731	0x5725	# <CJK>
-0x3732	0x5729	# <CJK>
-0x3733	0x572A	# <CJK>
-0x3734	0x572C	# <CJK>
-0x3735	0x572E	# <CJK>
-0x3736	0x572F	# <CJK>
-0x3737	0x5733	# <CJK>
-0x3738	0x5734	# <CJK>
-0x3739	0x573D	# <CJK>
-0x373A	0x573E	# <CJK>
-0x373B	0x573F	# <CJK>
-0x373C	0x5745	# <CJK>
-0x373D	0x5746	# <CJK>
-0x373E	0x574C	# <CJK>
-0x373F	0x574D	# <CJK>
-0x3740	0x5752	# <CJK>
-0x3741	0x5762	# <CJK>
-0x3742	0x5765	# <CJK>
-0x3743	0x5767	# <CJK>
-0x3744	0x5768	# <CJK>
-0x3745	0x576B	# <CJK>
-0x3746	0x576D	# <CJK>
-0x3747	0x576E	# <CJK>
-0x3748	0x576F	# <CJK>
-0x3749	0x5770	# <CJK>
-0x374A	0x5771	# <CJK>
-0x374B	0x5773	# <CJK>
-0x374C	0x5774	# <CJK>
-0x374D	0x5775	# <CJK>
-0x374E	0x5777	# <CJK>
-0x374F	0x5779	# <CJK>
-0x3750	0x577A	# <CJK>
-0x3751	0x577B	# <CJK>
-0x3752	0x577C	# <CJK>
-0x3753	0x577E	# <CJK>
-0x3754	0x5781	# <CJK>
-0x3755	0x5783	# <CJK>
-0x3756	0x578C	# <CJK>
-0x3757	0x5794	# <CJK>
-0x3758	0x5797	# <CJK>
-0x3759	0x5799	# <CJK>
-0x375A	0x579A	# <CJK>
-0x375B	0x579C	# <CJK>
-0x375C	0x579D	# <CJK>
-0x375D	0x579E	# <CJK>
-0x375E	0x579F	# <CJK>
-0x375F	0x57A1	# <CJK>
-0x3760	0x5795	# <CJK>
-0x3761	0x57A7	# <CJK>
-0x3762	0x57A8	# <CJK>
-0x3763	0x57A9	# <CJK>
-0x3764	0x57AC	# <CJK>
-0x3765	0x57B8	# <CJK>
-0x3766	0x57BD	# <CJK>
-0x3767	0x57C7	# <CJK>
-0x3768	0x57C8	# <CJK>
-0x3769	0x57CC	# <CJK>
-0x376A	0x57CF	# <CJK>
-0x376B	0x57D5	# <CJK>
-0x376C	0x57DD	# <CJK>
-0x376D	0x57DE	# <CJK>
-0x376E	0x57E4	# <CJK>
-0x376F	0x57E6	# <CJK>
-0x3770	0x57E7	# <CJK>
-0x3771	0x57E9	# <CJK>
-0x3772	0x57ED	# <CJK>
-0x3773	0x57F0	# <CJK>
-0x3774	0x57F5	# <CJK>
-0x3775	0x57F6	# <CJK>
-0x3776	0x57F8	# <CJK>
-0x3777	0x57FD	# <CJK>
-0x3778	0x57FE	# <CJK>
-0x3779	0x57FF	# <CJK>
-0x377A	0x5803	# <CJK>
-0x377B	0x5804	# <CJK>
-0x377C	0x5808	# <CJK>
-0x377D	0x5809	# <CJK>
-0x377E	0x57E1	# <CJK>
-0x3821	0x580C	# <CJK>
-0x3822	0x580D	# <CJK>
-0x3823	0x581B	# <CJK>
-0x3824	0x581E	# <CJK>
-0x3825	0x581F	# <CJK>
-0x3826	0x5820	# <CJK>
-0x3827	0x5826	# <CJK>
-0x3828	0x5827	# <CJK>
-0x3829	0x582D	# <CJK>
-0x382A	0x5832	# <CJK>
-0x382B	0x5839	# <CJK>
-0x382C	0x583F	# <CJK>
-0x382D	0x5849	# <CJK>
-0x382E	0x584C	# <CJK>
-0x382F	0x584D	# <CJK>
-0x3830	0x584F	# <CJK>
-0x3831	0x5850	# <CJK>
-0x3832	0x5855	# <CJK>
-0x3833	0x585F	# <CJK>
-0x3834	0x5861	# <CJK>
-0x3835	0x5864	# <CJK>
-0x3836	0x5867	# <CJK>
-0x3837	0x5868	# <CJK>
-0x3838	0x5878	# <CJK>
-0x3839	0x587C	# <CJK>
-0x383A	0x587F	# <CJK>
-0x383B	0x5880	# <CJK>
-0x383C	0x5881	# <CJK>
-0x383D	0x5887	# <CJK>
-0x383E	0x5888	# <CJK>
-0x383F	0x5889	# <CJK>
-0x3840	0x588A	# <CJK>
-0x3841	0x588C	# <CJK>
-0x3842	0x588D	# <CJK>
-0x3843	0x588F	# <CJK>
-0x3844	0x5890	# <CJK>
-0x3845	0x5894	# <CJK>
-0x3846	0x5896	# <CJK>
-0x3847	0x589D	# <CJK>
-0x3848	0x58A0	# <CJK>
-0x3849	0x58A1	# <CJK>
-0x384A	0x58A2	# <CJK>
-0x384B	0x58A6	# <CJK>
-0x384C	0x58A9	# <CJK>
-0x384D	0x58B1	# <CJK>
-0x384E	0x58B2	# <CJK>
-0x384F	0x58C4	# <CJK>
-0x3850	0x58BC	# <CJK>
-0x3851	0x58C2	# <CJK>
-0x3852	0x58C8	# <CJK>
-0x3853	0x58CD	# <CJK>
-0x3854	0x58CE	# <CJK>
-0x3855	0x58D0	# <CJK>
-0x3856	0x58D2	# <CJK>
-0x3857	0x58D4	# <CJK>
-0x3858	0x58D6	# <CJK>
-0x3859	0x58DA	# <CJK>
-0x385A	0x58DD	# <CJK>
-0x385B	0x58E1	# <CJK>
-0x385C	0x58E2	# <CJK>
-0x385D	0x58E9	# <CJK>
-0x385E	0x58F3	# <CJK>
-0x385F	0x5905	# <CJK>
-0x3860	0x5906	# <CJK>
-0x3861	0x590B	# <CJK>
-0x3862	0x590C	# <CJK>
-0x3863	0x5912	# <CJK>
-0x3864	0x5913	# <CJK>
-0x3865	0x5914	# <CJK>
-0x3866	0x8641	# <CJK>
-0x3867	0x591D	# <CJK>
-0x3868	0x5921	# <CJK>
-0x3869	0x5923	# <CJK>
-0x386A	0x5924	# <CJK>
-0x386B	0x5928	# <CJK>
-0x386C	0x592F	# <CJK>
-0x386D	0x5930	# <CJK>
-0x386E	0x5933	# <CJK>
-0x386F	0x5935	# <CJK>
-0x3870	0x5936	# <CJK>
-0x3871	0x593F	# <CJK>
-0x3872	0x5943	# <CJK>
-0x3873	0x5946	# <CJK>
-0x3874	0x5952	# <CJK>
-0x3875	0x5953	# <CJK>
-0x3876	0x5959	# <CJK>
-0x3877	0x595B	# <CJK>
-0x3878	0x595D	# <CJK>
-0x3879	0x595E	# <CJK>
-0x387A	0x595F	# <CJK>
-0x387B	0x5961	# <CJK>
-0x387C	0x5963	# <CJK>
-0x387D	0x596B	# <CJK>
-0x387E	0x596D	# <CJK>
-0x3921	0x596F	# <CJK>
-0x3922	0x5972	# <CJK>
-0x3923	0x5975	# <CJK>
-0x3924	0x5976	# <CJK>
-0x3925	0x5979	# <CJK>
-0x3926	0x597B	# <CJK>
-0x3927	0x597C	# <CJK>
-0x3928	0x598B	# <CJK>
-0x3929	0x598C	# <CJK>
-0x392A	0x598E	# <CJK>
-0x392B	0x5992	# <CJK>
-0x392C	0x5995	# <CJK>
-0x392D	0x5997	# <CJK>
-0x392E	0x599F	# <CJK>
-0x392F	0x59A4	# <CJK>
-0x3930	0x59A7	# <CJK>
-0x3931	0x59AD	# <CJK>
-0x3932	0x59AE	# <CJK>
-0x3933	0x59AF	# <CJK>
-0x3934	0x59B0	# <CJK>
-0x3935	0x59B3	# <CJK>
-0x3936	0x59B7	# <CJK>
-0x3937	0x59BA	# <CJK>
-0x3938	0x59BC	# <CJK>
-0x3939	0x59C1	# <CJK>
-0x393A	0x59C3	# <CJK>
-0x393B	0x59C4	# <CJK>
-0x393C	0x59C8	# <CJK>
-0x393D	0x59CA	# <CJK>
-0x393E	0x59CD	# <CJK>
-0x393F	0x59D2	# <CJK>
-0x3940	0x59DD	# <CJK>
-0x3941	0x59DE	# <CJK>
-0x3942	0x59DF	# <CJK>
-0x3943	0x59E3	# <CJK>
-0x3944	0x59E4	# <CJK>
-0x3945	0x59E7	# <CJK>
-0x3946	0x59EE	# <CJK>
-0x3947	0x59EF	# <CJK>
-0x3948	0x59F1	# <CJK>
-0x3949	0x59F2	# <CJK>
-0x394A	0x59F4	# <CJK>
-0x394B	0x59F7	# <CJK>
-0x394C	0x5A00	# <CJK>
-0x394D	0x5A04	# <CJK>
-0x394E	0x5A0C	# <CJK>
-0x394F	0x5A0D	# <CJK>
-0x3950	0x5A0E	# <CJK>
-0x3951	0x5A12	# <CJK>
-0x3952	0x5A13	# <CJK>
-0x3953	0x5A1E	# <CJK>
-0x3954	0x5A23	# <CJK>
-0x3955	0x5A24	# <CJK>
-0x3956	0x5A27	# <CJK>
-0x3957	0x5A28	# <CJK>
-0x3958	0x5A2A	# <CJK>
-0x3959	0x5A2D	# <CJK>
-0x395A	0x5A30	# <CJK>
-0x395B	0x5A44	# <CJK>
-0x395C	0x5A45	# <CJK>
-0x395D	0x5A47	# <CJK>
-0x395E	0x5A48	# <CJK>
-0x395F	0x5A4C	# <CJK>
-0x3960	0x5A50	# <CJK>
-0x3961	0x5A55	# <CJK>
-0x3962	0x5A5E	# <CJK>
-0x3963	0x5A63	# <CJK>
-0x3964	0x5A65	# <CJK>
-0x3965	0x5A67	# <CJK>
-0x3966	0x5A6D	# <CJK>
-0x3967	0x5A77	# <CJK>
-0x3968	0x5A7A	# <CJK>
-0x3969	0x5A7B	# <CJK>
-0x396A	0x5A7E	# <CJK>
-0x396B	0x5A8B	# <CJK>
-0x396C	0x5A90	# <CJK>
-0x396D	0x5A93	# <CJK>
-0x396E	0x5A96	# <CJK>
-0x396F	0x5A99	# <CJK>
-0x3970	0x5A9C	# <CJK>
-0x3971	0x5A9E	# <CJK>
-0x3972	0x5A9F	# <CJK>
-0x3973	0x5AA0	# <CJK>
-0x3974	0x5AA2	# <CJK>
-0x3975	0x5AA7	# <CJK>
-0x3976	0x5AAC	# <CJK>
-0x3977	0x5AB1	# <CJK>
-0x3978	0x5AB2	# <CJK>
-0x3979	0x5AB3	# <CJK>
-0x397A	0x5AB5	# <CJK>
-0x397B	0x5AB8	# <CJK>
-0x397C	0x5ABA	# <CJK>
-0x397D	0x5ABB	# <CJK>
-0x397E	0x5ABF	# <CJK>
-0x3A21	0x5AC4	# <CJK>
-0x3A22	0x5AC6	# <CJK>
-0x3A23	0x5AC8	# <CJK>
-0x3A24	0x5ACF	# <CJK>
-0x3A25	0x5ADA	# <CJK>
-0x3A26	0x5ADC	# <CJK>
-0x3A27	0x5AE0	# <CJK>
-0x3A28	0x5AE5	# <CJK>
-0x3A29	0x5AEA	# <CJK>
-0x3A2A	0x5AEE	# <CJK>
-0x3A2B	0x5AF5	# <CJK>
-0x3A2C	0x5AF6	# <CJK>
-0x3A2D	0x5AFD	# <CJK>
-0x3A2E	0x5B00	# <CJK>
-0x3A2F	0x5B01	# <CJK>
-0x3A30	0x5B08	# <CJK>
-0x3A31	0x5B17	# <CJK>
-0x3A32	0x5B34	# <CJK>
-0x3A33	0x5B19	# <CJK>
-0x3A34	0x5B1B	# <CJK>
-0x3A35	0x5B1D	# <CJK>
-0x3A36	0x5B21	# <CJK>
-0x3A37	0x5B25	# <CJK>
-0x3A38	0x5B2D	# <CJK>
-0x3A39	0x5B38	# <CJK>
-0x3A3A	0x5B41	# <CJK>
-0x3A3B	0x5B4B	# <CJK>
-0x3A3C	0x5B4C	# <CJK>
-0x3A3D	0x5B52	# <CJK>
-0x3A3E	0x5B56	# <CJK>
-0x3A3F	0x5B5E	# <CJK>
-0x3A40	0x5B68	# <CJK>
-0x3A41	0x5B6E	# <CJK>
-0x3A42	0x5B6F	# <CJK>
-0x3A43	0x5B7C	# <CJK>
-0x3A44	0x5B7D	# <CJK>
-0x3A45	0x5B7E	# <CJK>
-0x3A46	0x5B7F	# <CJK>
-0x3A47	0x5B81	# <CJK>
-0x3A48	0x5B84	# <CJK>
-0x3A49	0x5B86	# <CJK>
-0x3A4A	0x5B8A	# <CJK>
-0x3A4B	0x5B8E	# <CJK>
-0x3A4C	0x5B90	# <CJK>
-0x3A4D	0x5B91	# <CJK>
-0x3A4E	0x5B93	# <CJK>
-0x3A4F	0x5B94	# <CJK>
-0x3A50	0x5B96	# <CJK>
-0x3A51	0x5BA8	# <CJK>
-0x3A52	0x5BA9	# <CJK>
-0x3A53	0x5BAC	# <CJK>
-0x3A54	0x5BAD	# <CJK>
-0x3A55	0x5BAF	# <CJK>
-0x3A56	0x5BB1	# <CJK>
-0x3A57	0x5BB2	# <CJK>
-0x3A58	0x5BB7	# <CJK>
-0x3A59	0x5BBA	# <CJK>
-0x3A5A	0x5BBC	# <CJK>
-0x3A5B	0x5BC0	# <CJK>
-0x3A5C	0x5BC1	# <CJK>
-0x3A5D	0x5BCD	# <CJK>
-0x3A5E	0x5BCF	# <CJK>
-0x3A5F	0x5BD6	# <CJK>
-0x3A60	0x5BD7	# <CJK>
-0x3A61	0x5BD8	# <CJK>
-0x3A62	0x5BD9	# <CJK>
-0x3A63	0x5BDA	# <CJK>
-0x3A64	0x5BE0	# <CJK>
-0x3A65	0x5BEF	# <CJK>
-0x3A66	0x5BF1	# <CJK>
-0x3A67	0x5BF4	# <CJK>
-0x3A68	0x5BFD	# <CJK>
-0x3A69	0x5C0C	# <CJK>
-0x3A6A	0x5C17	# <CJK>
-0x3A6B	0x5C1E	# <CJK>
-0x3A6C	0x5C1F	# <CJK>
-0x3A6D	0x5C23	# <CJK>
-0x3A6E	0x5C26	# <CJK>
-0x3A6F	0x5C29	# <CJK>
-0x3A70	0x5C2B	# <CJK>
-0x3A71	0x5C2C	# <CJK>
-0x3A72	0x5C2E	# <CJK>
-0x3A73	0x5C30	# <CJK>
-0x3A74	0x5C32	# <CJK>
-0x3A75	0x5C35	# <CJK>
-0x3A76	0x5C36	# <CJK>
-0x3A77	0x5C59	# <CJK>
-0x3A78	0x5C5A	# <CJK>
-0x3A79	0x5C5C	# <CJK>
-0x3A7A	0x5C62	# <CJK>
-0x3A7B	0x5C63	# <CJK>
-0x3A7C	0x5C67	# <CJK>
-0x3A7D	0x5C68	# <CJK>
-0x3A7E	0x5C69	# <CJK>
-0x3B21	0x5C6D	# <CJK>
-0x3B22	0x5C70	# <CJK>
-0x3B23	0x5C74	# <CJK>
-0x3B24	0x5C75	# <CJK>
-0x3B25	0x5C7A	# <CJK>
-0x3B26	0x5C7B	# <CJK>
-0x3B27	0x5C7C	# <CJK>
-0x3B28	0x5C7D	# <CJK>
-0x3B29	0x5C87	# <CJK>
-0x3B2A	0x5C88	# <CJK>
-0x3B2B	0x5C8A	# <CJK>
-0x3B2C	0x5C8F	# <CJK>
-0x3B2D	0x5C92	# <CJK>
-0x3B2E	0x5C9D	# <CJK>
-0x3B2F	0x5C9F	# <CJK>
-0x3B30	0x5CA0	# <CJK>
-0x3B31	0x5CA2	# <CJK>
-0x3B32	0x5CA3	# <CJK>
-0x3B33	0x5CA6	# <CJK>
-0x3B34	0x5CAA	# <CJK>
-0x3B35	0x5CB2	# <CJK>
-0x3B36	0x5CB4	# <CJK>
-0x3B37	0x5CB5	# <CJK>
-0x3B38	0x5CBA	# <CJK>
-0x3B39	0x5CC9	# <CJK>
-0x3B3A	0x5CCB	# <CJK>
-0x3B3B	0x5CD2	# <CJK>
-0x3B3C	0x5CDD	# <CJK>
-0x3B3D	0x5CD7	# <CJK>
-0x3B3E	0x5CEE	# <CJK>
-0x3B3F	0x5CF1	# <CJK>
-0x3B40	0x5CF2	# <CJK>
-0x3B41	0x5CF4	# <CJK>
-0x3B42	0x5D01	# <CJK>
-0x3B43	0x5D06	# <CJK>
-0x3B44	0x5D0D	# <CJK>
-0x3B45	0x5D12	# <CJK>
-0x3B46	0x5D2B	# <CJK>
-0x3B47	0x5D23	# <CJK>
-0x3B48	0x5D24	# <CJK>
-0x3B49	0x5D26	# <CJK>
-0x3B4A	0x5D27	# <CJK>
-0x3B4B	0x5D31	# <CJK>
-0x3B4C	0x5D34	# <CJK>
-0x3B4D	0x5D39	# <CJK>
-0x3B4E	0x5D3D	# <CJK>
-0x3B4F	0x5D3F	# <CJK>
-0x3B50	0x5D42	# <CJK>
-0x3B51	0x5D43	# <CJK>
-0x3B52	0x5D46	# <CJK>
-0x3B53	0x5D48	# <CJK>
-0x3B54	0x5D55	# <CJK>
-0x3B55	0x5D51	# <CJK>
-0x3B56	0x5D59	# <CJK>
-0x3B57	0x5D4A	# <CJK>
-0x3B58	0x5D5F	# <CJK>
-0x3B59	0x5D60	# <CJK>
-0x3B5A	0x5D61	# <CJK>
-0x3B5B	0x5D62	# <CJK>
-0x3B5C	0x5D64	# <CJK>
-0x3B5D	0x5D6A	# <CJK>
-0x3B5E	0x5D6D	# <CJK>
-0x3B5F	0x5D70	# <CJK>
-0x3B60	0x5D79	# <CJK>
-0x3B61	0x5D7A	# <CJK>
-0x3B62	0x5D7E	# <CJK>
-0x3B63	0x5D7F	# <CJK>
-0x3B64	0x5D81	# <CJK>
-0x3B65	0x5D83	# <CJK>
-0x3B66	0x5D88	# <CJK>
-0x3B67	0x5D8A	# <CJK>
-0x3B68	0x5D92	# <CJK>
-0x3B69	0x5D93	# <CJK>
-0x3B6A	0x5D94	# <CJK>
-0x3B6B	0x5D95	# <CJK>
-0x3B6C	0x5D99	# <CJK>
-0x3B6D	0x5D9B	# <CJK>
-0x3B6E	0x5D9F	# <CJK>
-0x3B6F	0x5DA0	# <CJK>
-0x3B70	0x5DA7	# <CJK>
-0x3B71	0x5DAB	# <CJK>
-0x3B72	0x5DB0	# <CJK>
-0x3B73	0x5DB4	# <CJK>
-0x3B74	0x5DB8	# <CJK>
-0x3B75	0x5DB9	# <CJK>
-0x3B76	0x5DC3	# <CJK>
-0x3B77	0x5DC7	# <CJK>
-0x3B78	0x5DCB	# <CJK>
-0x3B79	0x5DD0	# <CJK>
-0x3B7A	0x5DCE	# <CJK>
-0x3B7B	0x5DD8	# <CJK>
-0x3B7C	0x5DD9	# <CJK>
-0x3B7D	0x5DE0	# <CJK>
-0x3B7E	0x5DE4	# <CJK>
-0x3C21	0x5DE9	# <CJK>
-0x3C22	0x5DF8	# <CJK>
-0x3C23	0x5DF9	# <CJK>
-0x3C24	0x5E00	# <CJK>
-0x3C25	0x5E07	# <CJK>
-0x3C26	0x5E0D	# <CJK>
-0x3C27	0x5E12	# <CJK>
-0x3C28	0x5E14	# <CJK>
-0x3C29	0x5E15	# <CJK>
-0x3C2A	0x5E18	# <CJK>
-0x3C2B	0x5E1F	# <CJK>
-0x3C2C	0x5E20	# <CJK>
-0x3C2D	0x5E2E	# <CJK>
-0x3C2E	0x5E28	# <CJK>
-0x3C2F	0x5E32	# <CJK>
-0x3C30	0x5E35	# <CJK>
-0x3C31	0x5E3E	# <CJK>
-0x3C32	0x5E4B	# <CJK>
-0x3C33	0x5E50	# <CJK>
-0x3C34	0x5E49	# <CJK>
-0x3C35	0x5E51	# <CJK>
-0x3C36	0x5E56	# <CJK>
-0x3C37	0x5E58	# <CJK>
-0x3C38	0x5E5B	# <CJK>
-0x3C39	0x5E5C	# <CJK>
-0x3C3A	0x5E5E	# <CJK>
-0x3C3B	0x5E68	# <CJK>
-0x3C3C	0x5E6A	# <CJK>
-0x3C3D	0x5E6B	# <CJK>
-0x3C3E	0x5E6C	# <CJK>
-0x3C3F	0x5E6D	# <CJK>
-0x3C40	0x5E6E	# <CJK>
-0x3C41	0x5E70	# <CJK>
-0x3C42	0x5E80	# <CJK>
-0x3C43	0x5E8B	# <CJK>
-0x3C44	0x5E8E	# <CJK>
-0x3C45	0x5EA2	# <CJK>
-0x3C46	0x5EA4	# <CJK>
-0x3C47	0x5EA5	# <CJK>
-0x3C48	0x5EA8	# <CJK>
-0x3C49	0x5EAA	# <CJK>
-0x3C4A	0x5EAC	# <CJK>
-0x3C4B	0x5EB1	# <CJK>
-0x3C4C	0x5EB3	# <CJK>
-0x3C4D	0x5EBD	# <CJK>
-0x3C4E	0x5EBE	# <CJK>
-0x3C4F	0x5EBF	# <CJK>
-0x3C50	0x5EC6	# <CJK>
-0x3C51	0x5ECC	# <CJK>
-0x3C52	0x5ECB	# <CJK>
-0x3C53	0x5ECE	# <CJK>
-0x3C54	0x5ED1	# <CJK>
-0x3C55	0x5ED2	# <CJK>
-0x3C56	0x5ED4	# <CJK>
-0x3C57	0x5ED5	# <CJK>
-0x3C58	0x5EDC	# <CJK>
-0x3C59	0x5EDE	# <CJK>
-0x3C5A	0x5EE5	# <CJK>
-0x3C5B	0x5EEB	# <CJK>
-0x3C5C	0x5F02	# <CJK>
-0x3C5D	0x5F06	# <CJK>
-0x3C5E	0x5F07	# <CJK>
-0x3C5F	0x5F08	# <CJK>
-0x3C60	0x5F0E	# <CJK>
-0x3C61	0x5F19	# <CJK>
-0x3C62	0x5F1C	# <CJK>
-0x3C63	0x5F1D	# <CJK>
-0x3C64	0x5F21	# <CJK>
-0x3C65	0x5F22	# <CJK>
-0x3C66	0x5F23	# <CJK>
-0x3C67	0x5F24	# <CJK>
-0x3C68	0x5F28	# <CJK>
-0x3C69	0x5F2B	# <CJK>
-0x3C6A	0x5F2C	# <CJK>
-0x3C6B	0x5F2E	# <CJK>
-0x3C6C	0x5F30	# <CJK>
-0x3C6D	0x5F34	# <CJK>
-0x3C6E	0x5F36	# <CJK>
-0x3C6F	0x5F3B	# <CJK>
-0x3C70	0x5F3D	# <CJK>
-0x3C71	0x5F3F	# <CJK>
-0x3C72	0x5F40	# <CJK>
-0x3C73	0x5F44	# <CJK>
-0x3C74	0x5F45	# <CJK>
-0x3C75	0x5F47	# <CJK>
-0x3C76	0x5F4D	# <CJK>
-0x3C77	0x5F50	# <CJK>
-0x3C78	0x5F54	# <CJK>
-0x3C79	0x5F58	# <CJK>
-0x3C7A	0x5F5B	# <CJK>
-0x3C7B	0x5F60	# <CJK>
-0x3C7C	0x5F63	# <CJK>
-0x3C7D	0x5F64	# <CJK>
-0x3C7E	0x5F67	# <CJK>
-0x3D21	0x5F6F	# <CJK>
-0x3D22	0x5F72	# <CJK>
-0x3D23	0x5F74	# <CJK>
-0x3D24	0x5F75	# <CJK>
-0x3D25	0x5F78	# <CJK>
-0x3D26	0x5F7A	# <CJK>
-0x3D27	0x5F7D	# <CJK>
-0x3D28	0x5F7E	# <CJK>
-0x3D29	0x5F89	# <CJK>
-0x3D2A	0x5F8D	# <CJK>
-0x3D2B	0x5F8F	# <CJK>
-0x3D2C	0x5F96	# <CJK>
-0x3D2D	0x5F9C	# <CJK>
-0x3D2E	0x5F9D	# <CJK>
-0x3D2F	0x5FA2	# <CJK>
-0x3D30	0x5FA7	# <CJK>
-0x3D31	0x5FAB	# <CJK>
-0x3D32	0x5FA4	# <CJK>
-0x3D33	0x5FAC	# <CJK>
-0x3D34	0x5FAF	# <CJK>
-0x3D35	0x5FB0	# <CJK>
-0x3D36	0x5FB1	# <CJK>
-0x3D37	0x5FB8	# <CJK>
-0x3D38	0x5FC4	# <CJK>
-0x3D39	0x5FC7	# <CJK>
-0x3D3A	0x5FC8	# <CJK>
-0x3D3B	0x5FC9	# <CJK>
-0x3D3C	0x5FCB	# <CJK>
-0x3D3D	0x5FD0	# <CJK>
-0x3D3E	0x5FD1	# <CJK>
-0x3D3F	0x5FD2	# <CJK>
-0x3D40	0x5FD3	# <CJK>
-0x3D41	0x5FD4	# <CJK>
-0x3D42	0x5FDE	# <CJK>
-0x3D43	0x5FE1	# <CJK>
-0x3D44	0x5FE2	# <CJK>
-0x3D45	0x5FE8	# <CJK>
-0x3D46	0x5FE9	# <CJK>
-0x3D47	0x5FEA	# <CJK>
-0x3D48	0x5FEC	# <CJK>
-0x3D49	0x5FED	# <CJK>
-0x3D4A	0x5FEE	# <CJK>
-0x3D4B	0x5FEF	# <CJK>
-0x3D4C	0x5FF2	# <CJK>
-0x3D4D	0x5FF3	# <CJK>
-0x3D4E	0x5FF6	# <CJK>
-0x3D4F	0x5FFA	# <CJK>
-0x3D50	0x5FFC	# <CJK>
-0x3D51	0x6007	# <CJK>
-0x3D52	0x600A	# <CJK>
-0x3D53	0x600D	# <CJK>
-0x3D54	0x6013	# <CJK>
-0x3D55	0x6014	# <CJK>
-0x3D56	0x6017	# <CJK>
-0x3D57	0x6018	# <CJK>
-0x3D58	0x601A	# <CJK>
-0x3D59	0x601F	# <CJK>
-0x3D5A	0x6024	# <CJK>
-0x3D5B	0x602D	# <CJK>
-0x3D5C	0x6033	# <CJK>
-0x3D5D	0x6035	# <CJK>
-0x3D5E	0x6040	# <CJK>
-0x3D5F	0x6047	# <CJK>
-0x3D60	0x6048	# <CJK>
-0x3D61	0x6049	# <CJK>
-0x3D62	0x604C	# <CJK>
-0x3D63	0x6051	# <CJK>
-0x3D64	0x6054	# <CJK>
-0x3D65	0x6056	# <CJK>
-0x3D66	0x6057	# <CJK>
-0x3D67	0x605D	# <CJK>
-0x3D68	0x6061	# <CJK>
-0x3D69	0x6067	# <CJK>
-0x3D6A	0x6071	# <CJK>
-0x3D6B	0x607E	# <CJK>
-0x3D6C	0x607F	# <CJK>
-0x3D6D	0x6082	# <CJK>
-0x3D6E	0x6086	# <CJK>
-0x3D6F	0x6088	# <CJK>
-0x3D70	0x608A	# <CJK>
-0x3D71	0x608E	# <CJK>
-0x3D72	0x6091	# <CJK>
-0x3D73	0x6093	# <CJK>
-0x3D74	0x6095	# <CJK>
-0x3D75	0x6098	# <CJK>
-0x3D76	0x609D	# <CJK>
-0x3D77	0x609E	# <CJK>
-0x3D78	0x60A2	# <CJK>
-0x3D79	0x60A4	# <CJK>
-0x3D7A	0x60A5	# <CJK>
-0x3D7B	0x60A8	# <CJK>
-0x3D7C	0x60B0	# <CJK>
-0x3D7D	0x60B1	# <CJK>
-0x3D7E	0x60B7	# <CJK>
-0x3E21	0x60BB	# <CJK>
-0x3E22	0x60BE	# <CJK>
-0x3E23	0x60C2	# <CJK>
-0x3E24	0x60C4	# <CJK>
-0x3E25	0x60C8	# <CJK>
-0x3E26	0x60C9	# <CJK>
-0x3E27	0x60CA	# <CJK>
-0x3E28	0x60CB	# <CJK>
-0x3E29	0x60CE	# <CJK>
-0x3E2A	0x60CF	# <CJK>
-0x3E2B	0x60D4	# <CJK>
-0x3E2C	0x60D5	# <CJK>
-0x3E2D	0x60D9	# <CJK>
-0x3E2E	0x60DB	# <CJK>
-0x3E2F	0x60DD	# <CJK>
-0x3E30	0x60DE	# <CJK>
-0x3E31	0x60E2	# <CJK>
-0x3E32	0x60E5	# <CJK>
-0x3E33	0x60F2	# <CJK>
-0x3E34	0x60F5	# <CJK>
-0x3E35	0x60F8	# <CJK>
-0x3E36	0x60FC	# <CJK>
-0x3E37	0x60FD	# <CJK>
-0x3E38	0x6102	# <CJK>
-0x3E39	0x6107	# <CJK>
-0x3E3A	0x610A	# <CJK>
-0x3E3B	0x610C	# <CJK>
-0x3E3C	0x6110	# <CJK>
-0x3E3D	0x6111	# <CJK>
-0x3E3E	0x6112	# <CJK>
-0x3E3F	0x6113	# <CJK>
-0x3E40	0x6114	# <CJK>
-0x3E41	0x6116	# <CJK>
-0x3E42	0x6117	# <CJK>
-0x3E43	0x6119	# <CJK>
-0x3E44	0x611C	# <CJK>
-0x3E45	0x611E	# <CJK>
-0x3E46	0x6122	# <CJK>
-0x3E47	0x612A	# <CJK>
-0x3E48	0x612B	# <CJK>
-0x3E49	0x6130	# <CJK>
-0x3E4A	0x6131	# <CJK>
-0x3E4B	0x6135	# <CJK>
-0x3E4C	0x6136	# <CJK>
-0x3E4D	0x6137	# <CJK>
-0x3E4E	0x6139	# <CJK>
-0x3E4F	0x6141	# <CJK>
-0x3E50	0x6145	# <CJK>
-0x3E51	0x6146	# <CJK>
-0x3E52	0x6149	# <CJK>
-0x3E53	0x615E	# <CJK>
-0x3E54	0x6160	# <CJK>
-0x3E55	0x616C	# <CJK>
-0x3E56	0x6172	# <CJK>
-0x3E57	0x6178	# <CJK>
-0x3E58	0x617B	# <CJK>
-0x3E59	0x617C	# <CJK>
-0x3E5A	0x617F	# <CJK>
-0x3E5B	0x6180	# <CJK>
-0x3E5C	0x6181	# <CJK>
-0x3E5D	0x6183	# <CJK>
-0x3E5E	0x6184	# <CJK>
-0x3E5F	0x618B	# <CJK>
-0x3E60	0x618D	# <CJK>
-0x3E61	0x6192	# <CJK>
-0x3E62	0x6193	# <CJK>
-0x3E63	0x6197	# <CJK>
-0x3E64	0x6198	# <CJK>
-0x3E65	0x619C	# <CJK>
-0x3E66	0x619D	# <CJK>
-0x3E67	0x619F	# <CJK>
-0x3E68	0x61A0	# <CJK>
-0x3E69	0x61A5	# <CJK>
-0x3E6A	0x61A8	# <CJK>
-0x3E6B	0x61AA	# <CJK>
-0x3E6C	0x61AD	# <CJK>
-0x3E6D	0x61B8	# <CJK>
-0x3E6E	0x61B9	# <CJK>
-0x3E6F	0x61BC	# <CJK>
-0x3E70	0x61C0	# <CJK>
-0x3E71	0x61C1	# <CJK>
-0x3E72	0x61C2	# <CJK>
-0x3E73	0x61CE	# <CJK>
-0x3E74	0x61CF	# <CJK>
-0x3E75	0x61D5	# <CJK>
-0x3E76	0x61DC	# <CJK>
-0x3E77	0x61DD	# <CJK>
-0x3E78	0x61DE	# <CJK>
-0x3E79	0x61DF	# <CJK>
-0x3E7A	0x61E1	# <CJK>
-0x3E7B	0x61E2	# <CJK>
-0x3E7C	0x61E7	# <CJK>
-0x3E7D	0x61E9	# <CJK>
-0x3E7E	0x61E5	# <CJK>
-0x3F21	0x61EC	# <CJK>
-0x3F22	0x61ED	# <CJK>
-0x3F23	0x61EF	# <CJK>
-0x3F24	0x6201	# <CJK>
-0x3F25	0x6203	# <CJK>
-0x3F26	0x6204	# <CJK>
-0x3F27	0x6207	# <CJK>
-0x3F28	0x6213	# <CJK>
-0x3F29	0x6215	# <CJK>
-0x3F2A	0x621C	# <CJK>
-0x3F2B	0x6220	# <CJK>
-0x3F2C	0x6222	# <CJK>
-0x3F2D	0x6223	# <CJK>
-0x3F2E	0x6227	# <CJK>
-0x3F2F	0x6229	# <CJK>
-0x3F30	0x622B	# <CJK>
-0x3F31	0x6239	# <CJK>
-0x3F32	0x623D	# <CJK>
-0x3F33	0x6242	# <CJK>
-0x3F34	0x6243	# <CJK>
-0x3F35	0x6244	# <CJK>
-0x3F36	0x6246	# <CJK>
-0x3F37	0x624C	# <CJK>
-0x3F38	0x6250	# <CJK>
-0x3F39	0x6251	# <CJK>
-0x3F3A	0x6252	# <CJK>
-0x3F3B	0x6254	# <CJK>
-0x3F3C	0x6256	# <CJK>
-0x3F3D	0x625A	# <CJK>
-0x3F3E	0x625C	# <CJK>
-0x3F3F	0x6264	# <CJK>
-0x3F40	0x626D	# <CJK>
-0x3F41	0x626F	# <CJK>
-0x3F42	0x6273	# <CJK>
-0x3F43	0x627A	# <CJK>
-0x3F44	0x627D	# <CJK>
-0x3F45	0x628D	# <CJK>
-0x3F46	0x628E	# <CJK>
-0x3F47	0x628F	# <CJK>
-0x3F48	0x6290	# <CJK>
-0x3F49	0x62A6	# <CJK>
-0x3F4A	0x62A8	# <CJK>
-0x3F4B	0x62B3	# <CJK>
-0x3F4C	0x62B6	# <CJK>
-0x3F4D	0x62B7	# <CJK>
-0x3F4E	0x62BA	# <CJK>
-0x3F4F	0x62BE	# <CJK>
-0x3F50	0x62BF	# <CJK>
-0x3F51	0x62C4	# <CJK>
-0x3F52	0x62CE	# <CJK>
-0x3F53	0x62D5	# <CJK>
-0x3F54	0x62D6	# <CJK>
-0x3F55	0x62DA	# <CJK>
-0x3F56	0x62EA	# <CJK>
-0x3F57	0x62F2	# <CJK>
-0x3F58	0x62F4	# <CJK>
-0x3F59	0x62FC	# <CJK>
-0x3F5A	0x62FD	# <CJK>
-0x3F5B	0x6303	# <CJK>
-0x3F5C	0x6304	# <CJK>
-0x3F5D	0x630A	# <CJK>
-0x3F5E	0x630B	# <CJK>
-0x3F5F	0x630D	# <CJK>
-0x3F60	0x6310	# <CJK>
-0x3F61	0x6313	# <CJK>
-0x3F62	0x6316	# <CJK>
-0x3F63	0x6318	# <CJK>
-0x3F64	0x6329	# <CJK>
-0x3F65	0x632A	# <CJK>
-0x3F66	0x632D	# <CJK>
-0x3F67	0x6335	# <CJK>
-0x3F68	0x6336	# <CJK>
-0x3F69	0x6339	# <CJK>
-0x3F6A	0x633C	# <CJK>
-0x3F6B	0x6341	# <CJK>
-0x3F6C	0x6342	# <CJK>
-0x3F6D	0x6343	# <CJK>
-0x3F6E	0x6344	# <CJK>
-0x3F6F	0x6346	# <CJK>
-0x3F70	0x634A	# <CJK>
-0x3F71	0x634B	# <CJK>
-0x3F72	0x634E	# <CJK>
-0x3F73	0x6352	# <CJK>
-0x3F74	0x6353	# <CJK>
-0x3F75	0x6354	# <CJK>
-0x3F76	0x6358	# <CJK>
-0x3F77	0x635B	# <CJK>
-0x3F78	0x6365	# <CJK>
-0x3F79	0x6366	# <CJK>
-0x3F7A	0x636C	# <CJK>
-0x3F7B	0x636D	# <CJK>
-0x3F7C	0x6371	# <CJK>
-0x3F7D	0x6374	# <CJK>
-0x3F7E	0x6375	# <CJK>
-0x4021	0x6378	# <CJK>
-0x4022	0x637C	# <CJK>
-0x4023	0x637D	# <CJK>
-0x4024	0x637F	# <CJK>
-0x4025	0x6382	# <CJK>
-0x4026	0x6384	# <CJK>
-0x4027	0x6387	# <CJK>
-0x4028	0x638A	# <CJK>
-0x4029	0x6390	# <CJK>
-0x402A	0x6394	# <CJK>
-0x402B	0x6395	# <CJK>
-0x402C	0x6399	# <CJK>
-0x402D	0x639A	# <CJK>
-0x402E	0x639E	# <CJK>
-0x402F	0x63A4	# <CJK>
-0x4030	0x63A6	# <CJK>
-0x4031	0x63AD	# <CJK>
-0x4032	0x63AE	# <CJK>
-0x4033	0x63AF	# <CJK>
-0x4034	0x63BD	# <CJK>
-0x4035	0x63C1	# <CJK>
-0x4036	0x63C5	# <CJK>
-0x4037	0x63C8	# <CJK>
-0x4038	0x63CE	# <CJK>
-0x4039	0x63D1	# <CJK>
-0x403A	0x63D3	# <CJK>
-0x403B	0x63D4	# <CJK>
-0x403C	0x63D5	# <CJK>
-0x403D	0x63DC	# <CJK>
-0x403E	0x63E0	# <CJK>
-0x403F	0x63E5	# <CJK>
-0x4040	0x63EA	# <CJK>
-0x4041	0x63EC	# <CJK>
-0x4042	0x63F2	# <CJK>
-0x4043	0x63F3	# <CJK>
-0x4044	0x63F5	# <CJK>
-0x4045	0x63F8	# <CJK>
-0x4046	0x63F9	# <CJK>
-0x4047	0x6409	# <CJK>
-0x4048	0x640A	# <CJK>
-0x4049	0x6410	# <CJK>
-0x404A	0x6412	# <CJK>
-0x404B	0x6414	# <CJK>
-0x404C	0x6418	# <CJK>
-0x404D	0x641E	# <CJK>
-0x404E	0x6420	# <CJK>
-0x404F	0x6422	# <CJK>
-0x4050	0x6424	# <CJK>
-0x4051	0x6425	# <CJK>
-0x4052	0x6429	# <CJK>
-0x4053	0x642A	# <CJK>
-0x4054	0x642F	# <CJK>
-0x4055	0x6430	# <CJK>
-0x4056	0x6435	# <CJK>
-0x4057	0x643D	# <CJK>
-0x4058	0x643F	# <CJK>
-0x4059	0x644B	# <CJK>
-0x405A	0x644F	# <CJK>
-0x405B	0x6451	# <CJK>
-0x405C	0x6452	# <CJK>
-0x405D	0x6453	# <CJK>
-0x405E	0x6454	# <CJK>
-0x405F	0x645A	# <CJK>
-0x4060	0x645B	# <CJK>
-0x4061	0x645C	# <CJK>
-0x4062	0x645D	# <CJK>
-0x4063	0x645F	# <CJK>
-0x4064	0x6460	# <CJK>
-0x4065	0x6461	# <CJK>
-0x4066	0x6463	# <CJK>
-0x4067	0x646D	# <CJK>
-0x4068	0x6473	# <CJK>
-0x4069	0x6474	# <CJK>
-0x406A	0x647B	# <CJK>
-0x406B	0x647D	# <CJK>
-0x406C	0x6485	# <CJK>
-0x406D	0x6487	# <CJK>
-0x406E	0x648F	# <CJK>
-0x406F	0x6490	# <CJK>
-0x4070	0x6491	# <CJK>
-0x4071	0x6498	# <CJK>
-0x4072	0x6499	# <CJK>
-0x4073	0x649B	# <CJK>
-0x4074	0x649D	# <CJK>
-0x4075	0x649F	# <CJK>
-0x4076	0x64A1	# <CJK>
-0x4077	0x64A3	# <CJK>
-0x4078	0x64A6	# <CJK>
-0x4079	0x64A8	# <CJK>
-0x407A	0x64AC	# <CJK>
-0x407B	0x64B3	# <CJK>
-0x407C	0x64BD	# <CJK>
-0x407D	0x64BE	# <CJK>
-0x407E	0x64BF	# <CJK>
-0x4121	0x64C4	# <CJK>
-0x4122	0x64C9	# <CJK>
-0x4123	0x64CA	# <CJK>
-0x4124	0x64CB	# <CJK>
-0x4125	0x64CC	# <CJK>
-0x4126	0x64CE	# <CJK>
-0x4127	0x64D0	# <CJK>
-0x4128	0x64D1	# <CJK>
-0x4129	0x64D5	# <CJK>
-0x412A	0x64D7	# <CJK>
-0x412B	0x64E4	# <CJK>
-0x412C	0x64E5	# <CJK>
-0x412D	0x64E9	# <CJK>
-0x412E	0x64EA	# <CJK>
-0x412F	0x64ED	# <CJK>
-0x4130	0x64F0	# <CJK>
-0x4131	0x64F5	# <CJK>
-0x4132	0x64F7	# <CJK>
-0x4133	0x64FB	# <CJK>
-0x4134	0x64FF	# <CJK>
-0x4135	0x6501	# <CJK>
-0x4136	0x6504	# <CJK>
-0x4137	0x6508	# <CJK>
-0x4138	0x6509	# <CJK>
-0x4139	0x650A	# <CJK>
-0x413A	0x650F	# <CJK>
-0x413B	0x6513	# <CJK>
-0x413C	0x6514	# <CJK>
-0x413D	0x6516	# <CJK>
-0x413E	0x6519	# <CJK>
-0x413F	0x651B	# <CJK>
-0x4140	0x651E	# <CJK>
-0x4141	0x651F	# <CJK>
-0x4142	0x6522	# <CJK>
-0x4143	0x6526	# <CJK>
-0x4144	0x6529	# <CJK>
-0x4145	0x652E	# <CJK>
-0x4146	0x6531	# <CJK>
-0x4147	0x653A	# <CJK>
-0x4148	0x653C	# <CJK>
-0x4149	0x653D	# <CJK>
-0x414A	0x6543	# <CJK>
-0x414B	0x6547	# <CJK>
-0x414C	0x6549	# <CJK>
-0x414D	0x6550	# <CJK>
-0x414E	0x6552	# <CJK>
-0x414F	0x6554	# <CJK>
-0x4150	0x655F	# <CJK>
-0x4151	0x6560	# <CJK>
-0x4152	0x6567	# <CJK>
-0x4153	0x656B	# <CJK>
-0x4154	0x657A	# <CJK>
-0x4155	0x657D	# <CJK>
-0x4156	0x6581	# <CJK>
-0x4157	0x6585	# <CJK>
-0x4158	0x658A	# <CJK>
-0x4159	0x6592	# <CJK>
-0x415A	0x6595	# <CJK>
-0x415B	0x6598	# <CJK>
-0x415C	0x659D	# <CJK>
-0x415D	0x65A0	# <CJK>
-0x415E	0x65A3	# <CJK>
-0x415F	0x65A6	# <CJK>
-0x4160	0x65AE	# <CJK>
-0x4161	0x65B2	# <CJK>
-0x4162	0x65B3	# <CJK>
-0x4163	0x65B4	# <CJK>
-0x4164	0x65BF	# <CJK>
-0x4165	0x65C2	# <CJK>
-0x4166	0x65C8	# <CJK>
-0x4167	0x65C9	# <CJK>
-0x4168	0x65CE	# <CJK>
-0x4169	0x65D0	# <CJK>
-0x416A	0x65D4	# <CJK>
-0x416B	0x65D6	# <CJK>
-0x416C	0x65D8	# <CJK>
-0x416D	0x65DF	# <CJK>
-0x416E	0x65F0	# <CJK>
-0x416F	0x65F2	# <CJK>
-0x4170	0x65F4	# <CJK>
-0x4171	0x65F5	# <CJK>
-0x4172	0x65F9	# <CJK>
-0x4173	0x65FE	# <CJK>
-0x4174	0x65FF	# <CJK>
-0x4175	0x6600	# <CJK>
-0x4176	0x6604	# <CJK>
-0x4177	0x6608	# <CJK>
-0x4178	0x6609	# <CJK>
-0x4179	0x660D	# <CJK>
-0x417A	0x6611	# <CJK>
-0x417B	0x6612	# <CJK>
-0x417C	0x6615	# <CJK>
-0x417D	0x6616	# <CJK>
-0x417E	0x661D	# <CJK>
-0x4221	0x661E	# <CJK>
-0x4222	0x6621	# <CJK>
-0x4223	0x6622	# <CJK>
-0x4224	0x6623	# <CJK>
-0x4225	0x6624	# <CJK>
-0x4226	0x6626	# <CJK>
-0x4227	0x6629	# <CJK>
-0x4228	0x662A	# <CJK>
-0x4229	0x662B	# <CJK>
-0x422A	0x662C	# <CJK>
-0x422B	0x662E	# <CJK>
-0x422C	0x6630	# <CJK>
-0x422D	0x6631	# <CJK>
-0x422E	0x6633	# <CJK>
-0x422F	0x6639	# <CJK>
-0x4230	0x6637	# <CJK>
-0x4231	0x6640	# <CJK>
-0x4232	0x6645	# <CJK>
-0x4233	0x6646	# <CJK>
-0x4234	0x664A	# <CJK>
-0x4235	0x664C	# <CJK>
-0x4236	0x6651	# <CJK>
-0x4237	0x664E	# <CJK>
-0x4238	0x6657	# <CJK>
-0x4239	0x6658	# <CJK>
-0x423A	0x6659	# <CJK>
-0x423B	0x665B	# <CJK>
-0x423C	0x665C	# <CJK>
-0x423D	0x6660	# <CJK>
-0x423E	0x6661	# <CJK>
-0x423F	0x66FB	# <CJK>
-0x4240	0x666A	# <CJK>
-0x4241	0x666B	# <CJK>
-0x4242	0x666C	# <CJK>
-0x4243	0x667E	# <CJK>
-0x4244	0x6673	# <CJK>
-0x4245	0x6675	# <CJK>
-0x4246	0x667F	# <CJK>
-0x4247	0x6677	# <CJK>
-0x4248	0x6678	# <CJK>
-0x4249	0x6679	# <CJK>
-0x424A	0x667B	# <CJK>
-0x424B	0x6680	# <CJK>
-0x424C	0x667C	# <CJK>
-0x424D	0x668B	# <CJK>
-0x424E	0x668C	# <CJK>
-0x424F	0x668D	# <CJK>
-0x4250	0x6690	# <CJK>
-0x4251	0x6692	# <CJK>
-0x4252	0x6699	# <CJK>
-0x4253	0x669A	# <CJK>
-0x4254	0x669B	# <CJK>
-0x4255	0x669C	# <CJK>
-0x4256	0x669F	# <CJK>
-0x4257	0x66A0	# <CJK>
-0x4258	0x66A4	# <CJK>
-0x4259	0x66AD	# <CJK>
-0x425A	0x66B1	# <CJK>
-0x425B	0x66B2	# <CJK>
-0x425C	0x66B5	# <CJK>
-0x425D	0x66BB	# <CJK>
-0x425E	0x66BF	# <CJK>
-0x425F	0x66C0	# <CJK>
-0x4260	0x66C2	# <CJK>
-0x4261	0x66C3	# <CJK>
-0x4262	0x66C8	# <CJK>
-0x4263	0x66CC	# <CJK>
-0x4264	0x66CE	# <CJK>
-0x4265	0x66CF	# <CJK>
-0x4266	0x66D4	# <CJK>
-0x4267	0x66DB	# <CJK>
-0x4268	0x66DF	# <CJK>
-0x4269	0x66E8	# <CJK>
-0x426A	0x66EB	# <CJK>
-0x426B	0x66EC	# <CJK>
-0x426C	0x66EE	# <CJK>
-0x426D	0x66FA	# <CJK>
-0x426E	0x6705	# <CJK>
-0x426F	0x6707	# <CJK>
-0x4270	0x670E	# <CJK>
-0x4271	0x6713	# <CJK>
-0x4272	0x6719	# <CJK>
-0x4273	0x671C	# <CJK>
-0x4274	0x6720	# <CJK>
-0x4275	0x6722	# <CJK>
-0x4276	0x6733	# <CJK>
-0x4277	0x673E	# <CJK>
-0x4278	0x6745	# <CJK>
-0x4279	0x6747	# <CJK>
-0x427A	0x6748	# <CJK>
-0x427B	0x674C	# <CJK>
-0x427C	0x6754	# <CJK>
-0x427D	0x6755	# <CJK>
-0x427E	0x675D	# <CJK>
-0x4321	0x6766	# <CJK>
-0x4322	0x676C	# <CJK>
-0x4323	0x676E	# <CJK>
-0x4324	0x6774	# <CJK>
-0x4325	0x6776	# <CJK>
-0x4326	0x677B	# <CJK>
-0x4327	0x6781	# <CJK>
-0x4328	0x6784	# <CJK>
-0x4329	0x678E	# <CJK>
-0x432A	0x678F	# <CJK>
-0x432B	0x6791	# <CJK>
-0x432C	0x6793	# <CJK>
-0x432D	0x6796	# <CJK>
-0x432E	0x6798	# <CJK>
-0x432F	0x6799	# <CJK>
-0x4330	0x679B	# <CJK>
-0x4331	0x67B0	# <CJK>
-0x4332	0x67B1	# <CJK>
-0x4333	0x67B2	# <CJK>
-0x4334	0x67B5	# <CJK>
-0x4335	0x67BB	# <CJK>
-0x4336	0x67BC	# <CJK>
-0x4337	0x67BD	# <CJK>
-0x4338	0x67F9	# <CJK>
-0x4339	0x67C0	# <CJK>
-0x433A	0x67C2	# <CJK>
-0x433B	0x67C3	# <CJK>
-0x433C	0x67C5	# <CJK>
-0x433D	0x67C8	# <CJK>
-0x433E	0x67C9	# <CJK>
-0x433F	0x67D2	# <CJK>
-0x4340	0x67D7	# <CJK>
-0x4341	0x67D9	# <CJK>
-0x4342	0x67DC	# <CJK>
-0x4343	0x67E1	# <CJK>
-0x4344	0x67E6	# <CJK>
-0x4345	0x67F0	# <CJK>
-0x4346	0x67F2	# <CJK>
-0x4347	0x67F6	# <CJK>
-0x4348	0x67F7	# <CJK>
-0x4349	0x6852	# <CJK>
-0x434A	0x6814	# <CJK>
-0x434B	0x6819	# <CJK>
-0x434C	0x681D	# <CJK>
-0x434D	0x681F	# <CJK>
-0x434E	0x6828	# <CJK>
-0x434F	0x6827	# <CJK>
-0x4350	0x682C	# <CJK>
-0x4351	0x682D	# <CJK>
-0x4352	0x682F	# <CJK>
-0x4353	0x6830	# <CJK>
-0x4354	0x6831	# <CJK>
-0x4355	0x6833	# <CJK>
-0x4356	0x683B	# <CJK>
-0x4357	0x683F	# <CJK>
-0x4358	0x6844	# <CJK>
-0x4359	0x6845	# <CJK>
-0x435A	0x684A	# <CJK>
-0x435B	0x684C	# <CJK>
-0x435C	0x6855	# <CJK>
-0x435D	0x6857	# <CJK>
-0x435E	0x6858	# <CJK>
-0x435F	0x685B	# <CJK>
-0x4360	0x686B	# <CJK>
-0x4361	0x686E	# <CJK>
-0x4362	0x686F	# <CJK>
-0x4363	0x6870	# <CJK>
-0x4364	0x6871	# <CJK>
-0x4365	0x6872	# <CJK>
-0x4366	0x6875	# <CJK>
-0x4367	0x6879	# <CJK>
-0x4368	0x687A	# <CJK>
-0x4369	0x687B	# <CJK>
-0x436A	0x687C	# <CJK>
-0x436B	0x6882	# <CJK>
-0x436C	0x6884	# <CJK>
-0x436D	0x6886	# <CJK>
-0x436E	0x6888	# <CJK>
-0x436F	0x6896	# <CJK>
-0x4370	0x6898	# <CJK>
-0x4371	0x689A	# <CJK>
-0x4372	0x689C	# <CJK>
-0x4373	0x68A1	# <CJK>
-0x4374	0x68A3	# <CJK>
-0x4375	0x68A5	# <CJK>
-0x4376	0x68A9	# <CJK>
-0x4377	0x68AA	# <CJK>
-0x4378	0x68AE	# <CJK>
-0x4379	0x68B2	# <CJK>
-0x437A	0x68BB	# <CJK>
-0x437B	0x68C5	# <CJK>
-0x437C	0x68C8	# <CJK>
-0x437D	0x68CC	# <CJK>
-0x437E	0x68CF	# <CJK>
-0x4421	0x68D0	# <CJK>
-0x4422	0x68D1	# <CJK>
-0x4423	0x68D3	# <CJK>
-0x4424	0x68D6	# <CJK>
-0x4425	0x68D9	# <CJK>
-0x4426	0x68DC	# <CJK>
-0x4427	0x68DD	# <CJK>
-0x4428	0x68E5	# <CJK>
-0x4429	0x68E8	# <CJK>
-0x442A	0x68EA	# <CJK>
-0x442B	0x68EB	# <CJK>
-0x442C	0x68EC	# <CJK>
-0x442D	0x68ED	# <CJK>
-0x442E	0x68F0	# <CJK>
-0x442F	0x68F1	# <CJK>
-0x4430	0x68F5	# <CJK>
-0x4431	0x68F6	# <CJK>
-0x4432	0x68FB	# <CJK>
-0x4433	0x68FC	# <CJK>
-0x4434	0x68FD	# <CJK>
-0x4435	0x6906	# <CJK>
-0x4436	0x6909	# <CJK>
-0x4437	0x690A	# <CJK>
-0x4438	0x6910	# <CJK>
-0x4439	0x6911	# <CJK>
-0x443A	0x6913	# <CJK>
-0x443B	0x6916	# <CJK>
-0x443C	0x6917	# <CJK>
-0x443D	0x6931	# <CJK>
-0x443E	0x6933	# <CJK>
-0x443F	0x6935	# <CJK>
-0x4440	0x6938	# <CJK>
-0x4441	0x693B	# <CJK>
-0x4442	0x6942	# <CJK>
-0x4443	0x6945	# <CJK>
-0x4444	0x6949	# <CJK>
-0x4445	0x694E	# <CJK>
-0x4446	0x6957	# <CJK>
-0x4447	0x695B	# <CJK>
-0x4448	0x6963	# <CJK>
-0x4449	0x6964	# <CJK>
-0x444A	0x6965	# <CJK>
-0x444B	0x6966	# <CJK>
-0x444C	0x6968	# <CJK>
-0x444D	0x6969	# <CJK>
-0x444E	0x696C	# <CJK>
-0x444F	0x6970	# <CJK>
-0x4450	0x6971	# <CJK>
-0x4451	0x6972	# <CJK>
-0x4452	0x697A	# <CJK>
-0x4453	0x697B	# <CJK>
-0x4454	0x697F	# <CJK>
-0x4455	0x6980	# <CJK>
-0x4456	0x698D	# <CJK>
-0x4457	0x6992	# <CJK>
-0x4458	0x6996	# <CJK>
-0x4459	0x6998	# <CJK>
-0x445A	0x69A1	# <CJK>
-0x445B	0x69A5	# <CJK>
-0x445C	0x69A6	# <CJK>
-0x445D	0x69A8	# <CJK>
-0x445E	0x69AB	# <CJK>
-0x445F	0x69AD	# <CJK>
-0x4460	0x69AF	# <CJK>
-0x4461	0x69B7	# <CJK>
-0x4462	0x69B8	# <CJK>
-0x4463	0x69BA	# <CJK>
-0x4464	0x69BC	# <CJK>
-0x4465	0x69C5	# <CJK>
-0x4466	0x69C8	# <CJK>
-0x4467	0x69D1	# <CJK>
-0x4468	0x69D6	# <CJK>
-0x4469	0x69D7	# <CJK>
-0x446A	0x69E2	# <CJK>
-0x446B	0x69E5	# <CJK>
-0x446C	0x69EE	# <CJK>
-0x446D	0x69EF	# <CJK>
-0x446E	0x69F1	# <CJK>
-0x446F	0x69F3	# <CJK>
-0x4470	0x69F5	# <CJK>
-0x4471	0x69FE	# <CJK>
-0x4472	0x6A00	# <CJK>
-0x4473	0x6A01	# <CJK>
-0x4474	0x6A03	# <CJK>
-0x4475	0x6A0F	# <CJK>
-0x4476	0x6A11	# <CJK>
-0x4477	0x6A15	# <CJK>
-0x4478	0x6A1A	# <CJK>
-0x4479	0x6A1D	# <CJK>
-0x447A	0x6A20	# <CJK>
-0x447B	0x6A24	# <CJK>
-0x447C	0x6A28	# <CJK>
-0x447D	0x6A30	# <CJK>
-0x447E	0x6A32	# <CJK>
-0x4521	0x6A34	# <CJK>
-0x4522	0x6A37	# <CJK>
-0x4523	0x6A3B	# <CJK>
-0x4524	0x6A3E	# <CJK>
-0x4525	0x6A3F	# <CJK>
-0x4526	0x6A45	# <CJK>
-0x4527	0x6A46	# <CJK>
-0x4528	0x6A49	# <CJK>
-0x4529	0x6A4A	# <CJK>
-0x452A	0x6A4E	# <CJK>
-0x452B	0x6A50	# <CJK>
-0x452C	0x6A51	# <CJK>
-0x452D	0x6A52	# <CJK>
-0x452E	0x6A55	# <CJK>
-0x452F	0x6A56	# <CJK>
-0x4530	0x6A5B	# <CJK>
-0x4531	0x6A64	# <CJK>
-0x4532	0x6A67	# <CJK>
-0x4533	0x6A6A	# <CJK>
-0x4534	0x6A71	# <CJK>
-0x4535	0x6A73	# <CJK>
-0x4536	0x6A7E	# <CJK>
-0x4537	0x6A81	# <CJK>
-0x4538	0x6A83	# <CJK>
-0x4539	0x6A86	# <CJK>
-0x453A	0x6A87	# <CJK>
-0x453B	0x6A89	# <CJK>
-0x453C	0x6A8B	# <CJK>
-0x453D	0x6A91	# <CJK>
-0x453E	0x6A9B	# <CJK>
-0x453F	0x6A9D	# <CJK>
-0x4540	0x6A9E	# <CJK>
-0x4541	0x6A9F	# <CJK>
-0x4542	0x6AA5	# <CJK>
-0x4543	0x6AAB	# <CJK>
-0x4544	0x6AAF	# <CJK>
-0x4545	0x6AB0	# <CJK>
-0x4546	0x6AB1	# <CJK>
-0x4547	0x6AB4	# <CJK>
-0x4548	0x6ABD	# <CJK>
-0x4549	0x6ABE	# <CJK>
-0x454A	0x6ABF	# <CJK>
-0x454B	0x6AC6	# <CJK>
-0x454C	0x6AC9	# <CJK>
-0x454D	0x6AC8	# <CJK>
-0x454E	0x6ACC	# <CJK>
-0x454F	0x6AD0	# <CJK>
-0x4550	0x6AD4	# <CJK>
-0x4551	0x6AD5	# <CJK>
-0x4552	0x6AD6	# <CJK>
-0x4553	0x6ADC	# <CJK>
-0x4554	0x6ADD	# <CJK>
-0x4555	0x6AE4	# <CJK>
-0x4556	0x6AE7	# <CJK>
-0x4557	0x6AEC	# <CJK>
-0x4558	0x6AF0	# <CJK>
-0x4559	0x6AF1	# <CJK>
-0x455A	0x6AF2	# <CJK>
-0x455B	0x6AFC	# <CJK>
-0x455C	0x6AFD	# <CJK>
-0x455D	0x6B02	# <CJK>
-0x455E	0x6B03	# <CJK>
-0x455F	0x6B06	# <CJK>
-0x4560	0x6B07	# <CJK>
-0x4561	0x6B09	# <CJK>
-0x4562	0x6B0F	# <CJK>
-0x4563	0x6B10	# <CJK>
-0x4564	0x6B11	# <CJK>
-0x4565	0x6B17	# <CJK>
-0x4566	0x6B1B	# <CJK>
-0x4567	0x6B1E	# <CJK>
-0x4568	0x6B24	# <CJK>
-0x4569	0x6B28	# <CJK>
-0x456A	0x6B2B	# <CJK>
-0x456B	0x6B2C	# <CJK>
-0x456C	0x6B2F	# <CJK>
-0x456D	0x6B35	# <CJK>
-0x456E	0x6B36	# <CJK>
-0x456F	0x6B3B	# <CJK>
-0x4570	0x6B3F	# <CJK>
-0x4571	0x6B46	# <CJK>
-0x4572	0x6B4A	# <CJK>
-0x4573	0x6B4D	# <CJK>
-0x4574	0x6B52	# <CJK>
-0x4575	0x6B56	# <CJK>
-0x4576	0x6B58	# <CJK>
-0x4577	0x6B5D	# <CJK>
-0x4578	0x6B60	# <CJK>
-0x4579	0x6B67	# <CJK>
-0x457A	0x6B6B	# <CJK>
-0x457B	0x6B6E	# <CJK>
-0x457C	0x6B70	# <CJK>
-0x457D	0x6B75	# <CJK>
-0x457E	0x6B7D	# <CJK>
-0x4621	0x6B7E	# <CJK>
-0x4622	0x6B82	# <CJK>
-0x4623	0x6B85	# <CJK>
-0x4624	0x6B97	# <CJK>
-0x4625	0x6B9B	# <CJK>
-0x4626	0x6B9F	# <CJK>
-0x4627	0x6BA0	# <CJK>
-0x4628	0x6BA2	# <CJK>
-0x4629	0x6BA3	# <CJK>
-0x462A	0x6BA8	# <CJK>
-0x462B	0x6BA9	# <CJK>
-0x462C	0x6BAC	# <CJK>
-0x462D	0x6BAD	# <CJK>
-0x462E	0x6BAE	# <CJK>
-0x462F	0x6BB0	# <CJK>
-0x4630	0x6BB8	# <CJK>
-0x4631	0x6BB9	# <CJK>
-0x4632	0x6BBD	# <CJK>
-0x4633	0x6BBE	# <CJK>
-0x4634	0x6BC3	# <CJK>
-0x4635	0x6BC4	# <CJK>
-0x4636	0x6BC9	# <CJK>
-0x4637	0x6BCC	# <CJK>
-0x4638	0x6BD6	# <CJK>
-0x4639	0x6BDA	# <CJK>
-0x463A	0x6BE1	# <CJK>
-0x463B	0x6BE3	# <CJK>
-0x463C	0x6BE6	# <CJK>
-0x463D	0x6BE7	# <CJK>
-0x463E	0x6BEE	# <CJK>
-0x463F	0x6BF1	# <CJK>
-0x4640	0x6BF7	# <CJK>
-0x4641	0x6BF9	# <CJK>
-0x4642	0x6BFF	# <CJK>
-0x4643	0x6C02	# <CJK>
-0x4644	0x6C04	# <CJK>
-0x4645	0x6C05	# <CJK>
-0x4646	0x6C09	# <CJK>
-0x4647	0x6C0D	# <CJK>
-0x4648	0x6C0E	# <CJK>
-0x4649	0x6C10	# <CJK>
-0x464A	0x6C12	# <CJK>
-0x464B	0x6C19	# <CJK>
-0x464C	0x6C1F	# <CJK>
-0x464D	0x6C26	# <CJK>
-0x464E	0x6C27	# <CJK>
-0x464F	0x6C28	# <CJK>
-0x4650	0x6C2C	# <CJK>
-0x4651	0x6C2E	# <CJK>
-0x4652	0x6C33	# <CJK>
-0x4653	0x6C35	# <CJK>
-0x4654	0x6C36	# <CJK>
-0x4655	0x6C3A	# <CJK>
-0x4656	0x6C3B	# <CJK>
-0x4657	0x6C3F	# <CJK>
-0x4658	0x6C4A	# <CJK>
-0x4659	0x6C4B	# <CJK>
-0x465A	0x6C4D	# <CJK>
-0x465B	0x6C4F	# <CJK>
-0x465C	0x6C52	# <CJK>
-0x465D	0x6C54	# <CJK>
-0x465E	0x6C59	# <CJK>
-0x465F	0x6C5B	# <CJK>
-0x4660	0x6C5C	# <CJK>
-0x4661	0x6C6B	# <CJK>
-0x4662	0x6C6D	# <CJK>
-0x4663	0x6C6F	# <CJK>
-0x4664	0x6C74	# <CJK>
-0x4665	0x6C76	# <CJK>
-0x4666	0x6C78	# <CJK>
-0x4667	0x6C79	# <CJK>
-0x4668	0x6C7B	# <CJK>
-0x4669	0x6C85	# <CJK>
-0x466A	0x6C86	# <CJK>
-0x466B	0x6C87	# <CJK>
-0x466C	0x6C89	# <CJK>
-0x466D	0x6C94	# <CJK>
-0x466E	0x6C95	# <CJK>
-0x466F	0x6C97	# <CJK>
-0x4670	0x6C98	# <CJK>
-0x4671	0x6C9C	# <CJK>
-0x4672	0x6C9F	# <CJK>
-0x4673	0x6CB0	# <CJK>
-0x4674	0x6CB2	# <CJK>
-0x4675	0x6CB4	# <CJK>
-0x4676	0x6CC2	# <CJK>
-0x4677	0x6CC6	# <CJK>
-0x4678	0x6CCD	# <CJK>
-0x4679	0x6CCF	# <CJK>
-0x467A	0x6CD0	# <CJK>
-0x467B	0x6CD1	# <CJK>
-0x467C	0x6CD2	# <CJK>
-0x467D	0x6CD4	# <CJK>
-0x467E	0x6CD6	# <CJK>
-0x4721	0x6CDA	# <CJK>
-0x4722	0x6CDC	# <CJK>
-0x4723	0x6CE0	# <CJK>
-0x4724	0x6CE7	# <CJK>
-0x4725	0x6CE9	# <CJK>
-0x4726	0x6CEB	# <CJK>
-0x4727	0x6CEC	# <CJK>
-0x4728	0x6CEE	# <CJK>
-0x4729	0x6CF2	# <CJK>
-0x472A	0x6CF4	# <CJK>
-0x472B	0x6D04	# <CJK>
-0x472C	0x6D07	# <CJK>
-0x472D	0x6D0A	# <CJK>
-0x472E	0x6D0E	# <CJK>
-0x472F	0x6D0F	# <CJK>
-0x4730	0x6D11	# <CJK>
-0x4731	0x6D13	# <CJK>
-0x4732	0x6D1A	# <CJK>
-0x4733	0x6D26	# <CJK>
-0x4734	0x6D27	# <CJK>
-0x4735	0x6D28	# <CJK>
-0x4736	0x6C67	# <CJK>
-0x4737	0x6D2E	# <CJK>
-0x4738	0x6D2F	# <CJK>
-0x4739	0x6D31	# <CJK>
-0x473A	0x6D39	# <CJK>
-0x473B	0x6D3C	# <CJK>
-0x473C	0x6D3F	# <CJK>
-0x473D	0x6D57	# <CJK>
-0x473E	0x6D5E	# <CJK>
-0x473F	0x6D5F	# <CJK>
-0x4740	0x6D61	# <CJK>
-0x4741	0x6D65	# <CJK>
-0x4742	0x6D67	# <CJK>
-0x4743	0x6D6F	# <CJK>
-0x4744	0x6D70	# <CJK>
-0x4745	0x6D7C	# <CJK>
-0x4746	0x6D82	# <CJK>
-0x4747	0x6D87	# <CJK>
-0x4748	0x6D91	# <CJK>
-0x4749	0x6D92	# <CJK>
-0x474A	0x6D94	# <CJK>
-0x474B	0x6D96	# <CJK>
-0x474C	0x6D97	# <CJK>
-0x474D	0x6D98	# <CJK>
-0x474E	0x6DAA	# <CJK>
-0x474F	0x6DAC	# <CJK>
-0x4750	0x6DB4	# <CJK>
-0x4751	0x6DB7	# <CJK>
-0x4752	0x6DB9	# <CJK>
-0x4753	0x6DBD	# <CJK>
-0x4754	0x6DBF	# <CJK>
-0x4755	0x6DC4	# <CJK>
-0x4756	0x6DC8	# <CJK>
-0x4757	0x6DCA	# <CJK>
-0x4758	0x6DCE	# <CJK>
-0x4759	0x6DCF	# <CJK>
-0x475A	0x6DD6	# <CJK>
-0x475B	0x6DDB	# <CJK>
-0x475C	0x6DDD	# <CJK>
-0x475D	0x6DDF	# <CJK>
-0x475E	0x6DE0	# <CJK>
-0x475F	0x6DE2	# <CJK>
-0x4760	0x6DE5	# <CJK>
-0x4761	0x6DE9	# <CJK>
-0x4762	0x6DEF	# <CJK>
-0x4763	0x6DF0	# <CJK>
-0x4764	0x6DF4	# <CJK>
-0x4765	0x6DF6	# <CJK>
-0x4766	0x6DFC	# <CJK>
-0x4767	0x6E00	# <CJK>
-0x4768	0x6E04	# <CJK>
-0x4769	0x6E1E	# <CJK>
-0x476A	0x6E22	# <CJK>
-0x476B	0x6E27	# <CJK>
-0x476C	0x6E32	# <CJK>
-0x476D	0x6E36	# <CJK>
-0x476E	0x6E39	# <CJK>
-0x476F	0x6E3B	# <CJK>
-0x4770	0x6E3C	# <CJK>
-0x4771	0x6E44	# <CJK>
-0x4772	0x6E45	# <CJK>
-0x4773	0x6E48	# <CJK>
-0x4774	0x6E49	# <CJK>
-0x4775	0x6E4B	# <CJK>
-0x4776	0x6E4F	# <CJK>
-0x4777	0x6E51	# <CJK>
-0x4778	0x6E52	# <CJK>
-0x4779	0x6E53	# <CJK>
-0x477A	0x6E54	# <CJK>
-0x477B	0x6E57	# <CJK>
-0x477C	0x6E5C	# <CJK>
-0x477D	0x6E5D	# <CJK>
-0x477E	0x6E5E	# <CJK>
-0x4821	0x6E62	# <CJK>
-0x4822	0x6E63	# <CJK>
-0x4823	0x6E68	# <CJK>
-0x4824	0x6E73	# <CJK>
-0x4825	0x6E7B	# <CJK>
-0x4826	0x6E7D	# <CJK>
-0x4827	0x6E8D	# <CJK>
-0x4828	0x6E93	# <CJK>
-0x4829	0x6E99	# <CJK>
-0x482A	0x6EA0	# <CJK>
-0x482B	0x6EA7	# <CJK>
-0x482C	0x6EAD	# <CJK>
-0x482D	0x6EAE	# <CJK>
-0x482E	0x6EB1	# <CJK>
-0x482F	0x6EB3	# <CJK>
-0x4830	0x6EBB	# <CJK>
-0x4831	0x6EBF	# <CJK>
-0x4832	0x6EC0	# <CJK>
-0x4833	0x6EC1	# <CJK>
-0x4834	0x6EC3	# <CJK>
-0x4835	0x6EC7	# <CJK>
-0x4836	0x6EC8	# <CJK>
-0x4837	0x6ECA	# <CJK>
-0x4838	0x6ECD	# <CJK>
-0x4839	0x6ECE	# <CJK>
-0x483A	0x6ECF	# <CJK>
-0x483B	0x6EEB	# <CJK>
-0x483C	0x6EED	# <CJK>
-0x483D	0x6EEE	# <CJK>
-0x483E	0x6EF9	# <CJK>
-0x483F	0x6EFB	# <CJK>
-0x4840	0x6EFD	# <CJK>
-0x4841	0x6F04	# <CJK>
-0x4842	0x6F08	# <CJK>
-0x4843	0x6F0A	# <CJK>
-0x4844	0x6F0C	# <CJK>
-0x4845	0x6F0D	# <CJK>
-0x4846	0x6F16	# <CJK>
-0x4847	0x6F18	# <CJK>
-0x4848	0x6F1A	# <CJK>
-0x4849	0x6F1B	# <CJK>
-0x484A	0x6F26	# <CJK>
-0x484B	0x6F29	# <CJK>
-0x484C	0x6F2A	# <CJK>
-0x484D	0x6F2F	# <CJK>
-0x484E	0x6F30	# <CJK>
-0x484F	0x6F33	# <CJK>
-0x4850	0x6F36	# <CJK>
-0x4851	0x6F3B	# <CJK>
-0x4852	0x6F3C	# <CJK>
-0x4853	0x6F2D	# <CJK>
-0x4854	0x6F4F	# <CJK>
-0x4855	0x6F51	# <CJK>
-0x4856	0x6F52	# <CJK>
-0x4857	0x6F53	# <CJK>
-0x4858	0x6F57	# <CJK>
-0x4859	0x6F59	# <CJK>
-0x485A	0x6F5A	# <CJK>
-0x485B	0x6F5D	# <CJK>
-0x485C	0x6F5E	# <CJK>
-0x485D	0x6F61	# <CJK>
-0x485E	0x6F62	# <CJK>
-0x485F	0x6F68	# <CJK>
-0x4860	0x6F6C	# <CJK>
-0x4861	0x6F7D	# <CJK>
-0x4862	0x6F7E	# <CJK>
-0x4863	0x6F83	# <CJK>
-0x4864	0x6F87	# <CJK>
-0x4865	0x6F88	# <CJK>
-0x4866	0x6F8B	# <CJK>
-0x4867	0x6F8C	# <CJK>
-0x4868	0x6F8D	# <CJK>
-0x4869	0x6F90	# <CJK>
-0x486A	0x6F92	# <CJK>
-0x486B	0x6F93	# <CJK>
-0x486C	0x6F94	# <CJK>
-0x486D	0x6F96	# <CJK>
-0x486E	0x6F9A	# <CJK>
-0x486F	0x6F9F	# <CJK>
-0x4870	0x6FA0	# <CJK>
-0x4871	0x6FA5	# <CJK>
-0x4872	0x6FA6	# <CJK>
-0x4873	0x6FA7	# <CJK>
-0x4874	0x6FA8	# <CJK>
-0x4875	0x6FAE	# <CJK>
-0x4876	0x6FAF	# <CJK>
-0x4877	0x6FB0	# <CJK>
-0x4878	0x6FB5	# <CJK>
-0x4879	0x6FB6	# <CJK>
-0x487A	0x6FBC	# <CJK>
-0x487B	0x6FC5	# <CJK>
-0x487C	0x6FC7	# <CJK>
-0x487D	0x6FC8	# <CJK>
-0x487E	0x6FCA	# <CJK>
-0x4921	0x6FDA	# <CJK>
-0x4922	0x6FDE	# <CJK>
-0x4923	0x6FE8	# <CJK>
-0x4924	0x6FE9	# <CJK>
-0x4925	0x6FF0	# <CJK>
-0x4926	0x6FF5	# <CJK>
-0x4927	0x6FF9	# <CJK>
-0x4928	0x6FFC	# <CJK>
-0x4929	0x6FFD	# <CJK>
-0x492A	0x7000	# <CJK>
-0x492B	0x7005	# <CJK>
-0x492C	0x7006	# <CJK>
-0x492D	0x7007	# <CJK>
-0x492E	0x700D	# <CJK>
-0x492F	0x7017	# <CJK>
-0x4930	0x7020	# <CJK>
-0x4931	0x7023	# <CJK>
-0x4932	0x702F	# <CJK>
-0x4933	0x7034	# <CJK>
-0x4934	0x7037	# <CJK>
-0x4935	0x7039	# <CJK>
-0x4936	0x703C	# <CJK>
-0x4937	0x7043	# <CJK>
-0x4938	0x7044	# <CJK>
-0x4939	0x7048	# <CJK>
-0x493A	0x7049	# <CJK>
-0x493B	0x704A	# <CJK>
-0x493C	0x704B	# <CJK>
-0x493D	0x7054	# <CJK>
-0x493E	0x7055	# <CJK>
-0x493F	0x705D	# <CJK>
-0x4940	0x705E	# <CJK>
-0x4941	0x704E	# <CJK>
-0x4942	0x7064	# <CJK>
-0x4943	0x7065	# <CJK>
-0x4944	0x706C	# <CJK>
-0x4945	0x706E	# <CJK>
-0x4946	0x7075	# <CJK>
-0x4947	0x7076	# <CJK>
-0x4948	0x707E	# <CJK>
-0x4949	0x7081	# <CJK>
-0x494A	0x7085	# <CJK>
-0x494B	0x7086	# <CJK>
-0x494C	0x7094	# <CJK>
-0x494D	0x7095	# <CJK>
-0x494E	0x7096	# <CJK>
-0x494F	0x7097	# <CJK>
-0x4950	0x7098	# <CJK>
-0x4951	0x709B	# <CJK>
-0x4952	0x70A4	# <CJK>
-0x4953	0x70AB	# <CJK>
-0x4954	0x70B0	# <CJK>
-0x4955	0x70B1	# <CJK>
-0x4956	0x70B4	# <CJK>
-0x4957	0x70B7	# <CJK>
-0x4958	0x70CA	# <CJK>
-0x4959	0x70D1	# <CJK>
-0x495A	0x70D3	# <CJK>
-0x495B	0x70D4	# <CJK>
-0x495C	0x70D5	# <CJK>
-0x495D	0x70D6	# <CJK>
-0x495E	0x70D8	# <CJK>
-0x495F	0x70DC	# <CJK>
-0x4960	0x70E4	# <CJK>
-0x4961	0x70FA	# <CJK>
-0x4962	0x7103	# <CJK>
-0x4963	0x7104	# <CJK>
-0x4964	0x7105	# <CJK>
-0x4965	0x7106	# <CJK>
-0x4966	0x7107	# <CJK>
-0x4967	0x710B	# <CJK>
-0x4968	0x710C	# <CJK>
-0x4969	0x710F	# <CJK>
-0x496A	0x711E	# <CJK>
-0x496B	0x7120	# <CJK>
-0x496C	0x712B	# <CJK>
-0x496D	0x712D	# <CJK>
-0x496E	0x712F	# <CJK>
-0x496F	0x7130	# <CJK>
-0x4970	0x7131	# <CJK>
-0x4971	0x7138	# <CJK>
-0x4972	0x7141	# <CJK>
-0x4973	0x7145	# <CJK>
-0x4974	0x7146	# <CJK>
-0x4975	0x7147	# <CJK>
-0x4976	0x714A	# <CJK>
-0x4977	0x714B	# <CJK>
-0x4978	0x7150	# <CJK>
-0x4979	0x7152	# <CJK>
-0x497A	0x7157	# <CJK>
-0x497B	0x715A	# <CJK>
-0x497C	0x715C	# <CJK>
-0x497D	0x715E	# <CJK>
-0x497E	0x7160	# <CJK>
-0x4A21	0x7168	# <CJK>
-0x4A22	0x7179	# <CJK>
-0x4A23	0x7180	# <CJK>
-0x4A24	0x7185	# <CJK>
-0x4A25	0x7187	# <CJK>
-0x4A26	0x718C	# <CJK>
-0x4A27	0x7192	# <CJK>
-0x4A28	0x719A	# <CJK>
-0x4A29	0x719B	# <CJK>
-0x4A2A	0x71A0	# <CJK>
-0x4A2B	0x71A2	# <CJK>
-0x4A2C	0x71AF	# <CJK>
-0x4A2D	0x71B0	# <CJK>
-0x4A2E	0x71B2	# <CJK>
-0x4A2F	0x71B3	# <CJK>
-0x4A30	0x71BA	# <CJK>
-0x4A31	0x71BF	# <CJK>
-0x4A32	0x71C0	# <CJK>
-0x4A33	0x71C1	# <CJK>
-0x4A34	0x71C4	# <CJK>
-0x4A35	0x71CB	# <CJK>
-0x4A36	0x71CC	# <CJK>
-0x4A37	0x71D3	# <CJK>
-0x4A38	0x71D6	# <CJK>
-0x4A39	0x71D9	# <CJK>
-0x4A3A	0x71DA	# <CJK>
-0x4A3B	0x71DC	# <CJK>
-0x4A3C	0x71F8	# <CJK>
-0x4A3D	0x71FE	# <CJK>
-0x4A3E	0x7200	# <CJK>
-0x4A3F	0x7207	# <CJK>
-0x4A40	0x7208	# <CJK>
-0x4A41	0x7209	# <CJK>
-0x4A42	0x7213	# <CJK>
-0x4A43	0x7217	# <CJK>
-0x4A44	0x721A	# <CJK>
-0x4A45	0x721D	# <CJK>
-0x4A46	0x721F	# <CJK>
-0x4A47	0x7224	# <CJK>
-0x4A48	0x722B	# <CJK>
-0x4A49	0x722F	# <CJK>
-0x4A4A	0x7234	# <CJK>
-0x4A4B	0x7238	# <CJK>
-0x4A4C	0x7239	# <CJK>
-0x4A4D	0x7241	# <CJK>
-0x4A4E	0x7242	# <CJK>
-0x4A4F	0x7243	# <CJK>
-0x4A50	0x7245	# <CJK>
-0x4A51	0x724E	# <CJK>
-0x4A52	0x724F	# <CJK>
-0x4A53	0x7250	# <CJK>
-0x4A54	0x7253	# <CJK>
-0x4A55	0x7255	# <CJK>
-0x4A56	0x7256	# <CJK>
-0x4A57	0x725A	# <CJK>
-0x4A58	0x725C	# <CJK>
-0x4A59	0x725E	# <CJK>
-0x4A5A	0x7260	# <CJK>
-0x4A5B	0x7263	# <CJK>
-0x4A5C	0x7268	# <CJK>
-0x4A5D	0x726B	# <CJK>
-0x4A5E	0x726E	# <CJK>
-0x4A5F	0x726F	# <CJK>
-0x4A60	0x7271	# <CJK>
-0x4A61	0x7277	# <CJK>
-0x4A62	0x7278	# <CJK>
-0x4A63	0x727B	# <CJK>
-0x4A64	0x727C	# <CJK>
-0x4A65	0x727F	# <CJK>
-0x4A66	0x7284	# <CJK>
-0x4A67	0x7289	# <CJK>
-0x4A68	0x728D	# <CJK>
-0x4A69	0x728E	# <CJK>
-0x4A6A	0x7293	# <CJK>
-0x4A6B	0x729B	# <CJK>
-0x4A6C	0x72A8	# <CJK>
-0x4A6D	0x72AD	# <CJK>
-0x4A6E	0x72AE	# <CJK>
-0x4A6F	0x72B1	# <CJK>
-0x4A70	0x72B4	# <CJK>
-0x4A71	0x72BE	# <CJK>
-0x4A72	0x72C1	# <CJK>
-0x4A73	0x72C7	# <CJK>
-0x4A74	0x72C9	# <CJK>
-0x4A75	0x72CC	# <CJK>
-0x4A76	0x72D5	# <CJK>
-0x4A77	0x72D6	# <CJK>
-0x4A78	0x72D8	# <CJK>
-0x4A79	0x72DF	# <CJK>
-0x4A7A	0x72E5	# <CJK>
-0x4A7B	0x72F3	# <CJK>
-0x4A7C	0x72F4	# <CJK>
-0x4A7D	0x72FA	# <CJK>
-0x4A7E	0x72FB	# <CJK>
-0x4B21	0x72FE	# <CJK>
-0x4B22	0x7302	# <CJK>
-0x4B23	0x7304	# <CJK>
-0x4B24	0x7305	# <CJK>
-0x4B25	0x7307	# <CJK>
-0x4B26	0x730B	# <CJK>
-0x4B27	0x730D	# <CJK>
-0x4B28	0x7312	# <CJK>
-0x4B29	0x7313	# <CJK>
-0x4B2A	0x7318	# <CJK>
-0x4B2B	0x7319	# <CJK>
-0x4B2C	0x731E	# <CJK>
-0x4B2D	0x7322	# <CJK>
-0x4B2E	0x7324	# <CJK>
-0x4B2F	0x7327	# <CJK>
-0x4B30	0x7328	# <CJK>
-0x4B31	0x732C	# <CJK>
-0x4B32	0x7331	# <CJK>
-0x4B33	0x7332	# <CJK>
-0x4B34	0x7335	# <CJK>
-0x4B35	0x733A	# <CJK>
-0x4B36	0x733B	# <CJK>
-0x4B37	0x733D	# <CJK>
-0x4B38	0x7343	# <CJK>
-0x4B39	0x734D	# <CJK>
-0x4B3A	0x7350	# <CJK>
-0x4B3B	0x7352	# <CJK>
-0x4B3C	0x7356	# <CJK>
-0x4B3D	0x7358	# <CJK>
-0x4B3E	0x735D	# <CJK>
-0x4B3F	0x735E	# <CJK>
-0x4B40	0x735F	# <CJK>
-0x4B41	0x7360	# <CJK>
-0x4B42	0x7366	# <CJK>
-0x4B43	0x7367	# <CJK>
-0x4B44	0x7369	# <CJK>
-0x4B45	0x736B	# <CJK>
-0x4B46	0x736C	# <CJK>
-0x4B47	0x736E	# <CJK>
-0x4B48	0x736F	# <CJK>
-0x4B49	0x7371	# <CJK>
-0x4B4A	0x7377	# <CJK>
-0x4B4B	0x7379	# <CJK>
-0x4B4C	0x737C	# <CJK>
-0x4B4D	0x7380	# <CJK>
-0x4B4E	0x7381	# <CJK>
-0x4B4F	0x7383	# <CJK>
-0x4B50	0x7385	# <CJK>
-0x4B51	0x7386	# <CJK>
-0x4B52	0x738E	# <CJK>
-0x4B53	0x7390	# <CJK>
-0x4B54	0x7393	# <CJK>
-0x4B55	0x7395	# <CJK>
-0x4B56	0x7397	# <CJK>
-0x4B57	0x7398	# <CJK>
-0x4B58	0x739C	# <CJK>
-0x4B59	0x739E	# <CJK>
-0x4B5A	0x739F	# <CJK>
-0x4B5B	0x73A0	# <CJK>
-0x4B5C	0x73A2	# <CJK>
-0x4B5D	0x73A5	# <CJK>
-0x4B5E	0x73A6	# <CJK>
-0x4B5F	0x73AA	# <CJK>
-0x4B60	0x73AB	# <CJK>
-0x4B61	0x73AD	# <CJK>
-0x4B62	0x73B5	# <CJK>
-0x4B63	0x73B7	# <CJK>
-0x4B64	0x73B9	# <CJK>
-0x4B65	0x73BC	# <CJK>
-0x4B66	0x73BD	# <CJK>
-0x4B67	0x73BF	# <CJK>
-0x4B68	0x73C5	# <CJK>
-0x4B69	0x73C6	# <CJK>
-0x4B6A	0x73C9	# <CJK>
-0x4B6B	0x73CB	# <CJK>
-0x4B6C	0x73CC	# <CJK>
-0x4B6D	0x73CF	# <CJK>
-0x4B6E	0x73D2	# <CJK>
-0x4B6F	0x73D3	# <CJK>
-0x4B70	0x73D6	# <CJK>
-0x4B71	0x73D9	# <CJK>
-0x4B72	0x73DD	# <CJK>
-0x4B73	0x73E1	# <CJK>
-0x4B74	0x73E3	# <CJK>
-0x4B75	0x73E6	# <CJK>
-0x4B76	0x73E7	# <CJK>
-0x4B77	0x73E9	# <CJK>
-0x4B78	0x73F4	# <CJK>
-0x4B79	0x73F5	# <CJK>
-0x4B7A	0x73F7	# <CJK>
-0x4B7B	0x73F9	# <CJK>
-0x4B7C	0x73FA	# <CJK>
-0x4B7D	0x73FB	# <CJK>
-0x4B7E	0x73FD	# <CJK>
-0x4C21	0x73FF	# <CJK>
-0x4C22	0x7400	# <CJK>
-0x4C23	0x7401	# <CJK>
-0x4C24	0x7404	# <CJK>
-0x4C25	0x7407	# <CJK>
-0x4C26	0x740A	# <CJK>
-0x4C27	0x7411	# <CJK>
-0x4C28	0x741A	# <CJK>
-0x4C29	0x741B	# <CJK>
-0x4C2A	0x7424	# <CJK>
-0x4C2B	0x7426	# <CJK>
-0x4C2C	0x7428	# <CJK>
-0x4C2D	0x7429	# <CJK>
-0x4C2E	0x742A	# <CJK>
-0x4C2F	0x742B	# <CJK>
-0x4C30	0x742C	# <CJK>
-0x4C31	0x742D	# <CJK>
-0x4C32	0x742E	# <CJK>
-0x4C33	0x742F	# <CJK>
-0x4C34	0x7430	# <CJK>
-0x4C35	0x7431	# <CJK>
-0x4C36	0x7439	# <CJK>
-0x4C37	0x7440	# <CJK>
-0x4C38	0x7443	# <CJK>
-0x4C39	0x7444	# <CJK>
-0x4C3A	0x7446	# <CJK>
-0x4C3B	0x7447	# <CJK>
-0x4C3C	0x744B	# <CJK>
-0x4C3D	0x744D	# <CJK>
-0x4C3E	0x7451	# <CJK>
-0x4C3F	0x7452	# <CJK>
-0x4C40	0x7457	# <CJK>
-0x4C41	0x745D	# <CJK>
-0x4C42	0x7462	# <CJK>
-0x4C43	0x7466	# <CJK>
-0x4C44	0x7467	# <CJK>
-0x4C45	0x7468	# <CJK>
-0x4C46	0x746B	# <CJK>
-0x4C47	0x746D	# <CJK>
-0x4C48	0x746E	# <CJK>
-0x4C49	0x7471	# <CJK>
-0x4C4A	0x7472	# <CJK>
-0x4C4B	0x7480	# <CJK>
-0x4C4C	0x7481	# <CJK>
-0x4C4D	0x7485	# <CJK>
-0x4C4E	0x7486	# <CJK>
-0x4C4F	0x7487	# <CJK>
-0x4C50	0x7489	# <CJK>
-0x4C51	0x748F	# <CJK>
-0x4C52	0x7490	# <CJK>
-0x4C53	0x7491	# <CJK>
-0x4C54	0x7492	# <CJK>
-0x4C55	0x7498	# <CJK>
-0x4C56	0x7499	# <CJK>
-0x4C57	0x749A	# <CJK>
-0x4C58	0x749C	# <CJK>
-0x4C59	0x749F	# <CJK>
-0x4C5A	0x74A0	# <CJK>
-0x4C5B	0x74A1	# <CJK>
-0x4C5C	0x74A3	# <CJK>
-0x4C5D	0x74A6	# <CJK>
-0x4C5E	0x74A8	# <CJK>
-0x4C5F	0x74A9	# <CJK>
-0x4C60	0x74AA	# <CJK>
-0x4C61	0x74AB	# <CJK>
-0x4C62	0x74AE	# <CJK>
-0x4C63	0x74AF	# <CJK>
-0x4C64	0x74B1	# <CJK>
-0x4C65	0x74B2	# <CJK>
-0x4C66	0x74B5	# <CJK>
-0x4C67	0x74B9	# <CJK>
-0x4C68	0x74BB	# <CJK>
-0x4C69	0x74BF	# <CJK>
-0x4C6A	0x74C8	# <CJK>
-0x4C6B	0x74C9	# <CJK>
-0x4C6C	0x74CC	# <CJK>
-0x4C6D	0x74D0	# <CJK>
-0x4C6E	0x74D3	# <CJK>
-0x4C6F	0x74D8	# <CJK>
-0x4C70	0x74DA	# <CJK>
-0x4C71	0x74DB	# <CJK>
-0x4C72	0x74DE	# <CJK>
-0x4C73	0x74DF	# <CJK>
-0x4C74	0x74E4	# <CJK>
-0x4C75	0x74E8	# <CJK>
-0x4C76	0x74EA	# <CJK>
-0x4C77	0x74EB	# <CJK>
-0x4C78	0x74EF	# <CJK>
-0x4C79	0x74F4	# <CJK>
-0x4C7A	0x74FA	# <CJK>
-0x4C7B	0x74FB	# <CJK>
-0x4C7C	0x74FC	# <CJK>
-0x4C7D	0x74FF	# <CJK>
-0x4C7E	0x7506	# <CJK>
-0x4D21	0x7512	# <CJK>
-0x4D22	0x7516	# <CJK>
-0x4D23	0x7517	# <CJK>
-0x4D24	0x7520	# <CJK>
-0x4D25	0x7521	# <CJK>
-0x4D26	0x7524	# <CJK>
-0x4D27	0x7527	# <CJK>
-0x4D28	0x7529	# <CJK>
-0x4D29	0x752A	# <CJK>
-0x4D2A	0x752F	# <CJK>
-0x4D2B	0x7536	# <CJK>
-0x4D2C	0x7539	# <CJK>
-0x4D2D	0x753D	# <CJK>
-0x4D2E	0x753E	# <CJK>
-0x4D2F	0x753F	# <CJK>
-0x4D30	0x7540	# <CJK>
-0x4D31	0x7543	# <CJK>
-0x4D32	0x7547	# <CJK>
-0x4D33	0x7548	# <CJK>
-0x4D34	0x754E	# <CJK>
-0x4D35	0x7550	# <CJK>
-0x4D36	0x7552	# <CJK>
-0x4D37	0x7557	# <CJK>
-0x4D38	0x755E	# <CJK>
-0x4D39	0x755F	# <CJK>
-0x4D3A	0x7561	# <CJK>
-0x4D3B	0x756F	# <CJK>
-0x4D3C	0x7571	# <CJK>
-0x4D3D	0x7579	# <CJK>
-0x4D3E	0x757A	# <CJK>
-0x4D3F	0x757B	# <CJK>
-0x4D40	0x757C	# <CJK>
-0x4D41	0x757D	# <CJK>
-0x4D42	0x757E	# <CJK>
-0x4D43	0x7581	# <CJK>
-0x4D44	0x7585	# <CJK>
-0x4D45	0x7590	# <CJK>
-0x4D46	0x7592	# <CJK>
-0x4D47	0x7593	# <CJK>
-0x4D48	0x7595	# <CJK>
-0x4D49	0x7599	# <CJK>
-0x4D4A	0x759C	# <CJK>
-0x4D4B	0x75A2	# <CJK>
-0x4D4C	0x75A4	# <CJK>
-0x4D4D	0x75B4	# <CJK>
-0x4D4E	0x75BA	# <CJK>
-0x4D4F	0x75BF	# <CJK>
-0x4D50	0x75C0	# <CJK>
-0x4D51	0x75C1	# <CJK>
-0x4D52	0x75C4	# <CJK>
-0x4D53	0x75C6	# <CJK>
-0x4D54	0x75CC	# <CJK>
-0x4D55	0x75CE	# <CJK>
-0x4D56	0x75CF	# <CJK>
-0x4D57	0x75D7	# <CJK>
-0x4D58	0x75DC	# <CJK>
-0x4D59	0x75DF	# <CJK>
-0x4D5A	0x75E0	# <CJK>
-0x4D5B	0x75E1	# <CJK>
-0x4D5C	0x75E4	# <CJK>
-0x4D5D	0x75E7	# <CJK>
-0x4D5E	0x75EC	# <CJK>
-0x4D5F	0x75EE	# <CJK>
-0x4D60	0x75EF	# <CJK>
-0x4D61	0x75F1	# <CJK>
-0x4D62	0x75F9	# <CJK>
-0x4D63	0x7600	# <CJK>
-0x4D64	0x7602	# <CJK>
-0x4D65	0x7603	# <CJK>
-0x4D66	0x7604	# <CJK>
-0x4D67	0x7607	# <CJK>
-0x4D68	0x7608	# <CJK>
-0x4D69	0x760A	# <CJK>
-0x4D6A	0x760C	# <CJK>
-0x4D6B	0x760F	# <CJK>
-0x4D6C	0x7612	# <CJK>
-0x4D6D	0x7613	# <CJK>
-0x4D6E	0x7615	# <CJK>
-0x4D6F	0x7616	# <CJK>
-0x4D70	0x7619	# <CJK>
-0x4D71	0x761B	# <CJK>
-0x4D72	0x761C	# <CJK>
-0x4D73	0x761D	# <CJK>
-0x4D74	0x761E	# <CJK>
-0x4D75	0x7623	# <CJK>
-0x4D76	0x7625	# <CJK>
-0x4D77	0x7626	# <CJK>
-0x4D78	0x7629	# <CJK>
-0x4D79	0x762D	# <CJK>
-0x4D7A	0x7632	# <CJK>
-0x4D7B	0x7633	# <CJK>
-0x4D7C	0x7635	# <CJK>
-0x4D7D	0x7638	# <CJK>
-0x4D7E	0x7639	# <CJK>
-0x4E21	0x763A	# <CJK>
-0x4E22	0x763C	# <CJK>
-0x4E23	0x764A	# <CJK>
-0x4E24	0x7640	# <CJK>
-0x4E25	0x7641	# <CJK>
-0x4E26	0x7643	# <CJK>
-0x4E27	0x7644	# <CJK>
-0x4E28	0x7645	# <CJK>
-0x4E29	0x7649	# <CJK>
-0x4E2A	0x764B	# <CJK>
-0x4E2B	0x7655	# <CJK>
-0x4E2C	0x7659	# <CJK>
-0x4E2D	0x765F	# <CJK>
-0x4E2E	0x7664	# <CJK>
-0x4E2F	0x7665	# <CJK>
-0x4E30	0x766D	# <CJK>
-0x4E31	0x766E	# <CJK>
-0x4E32	0x766F	# <CJK>
-0x4E33	0x7671	# <CJK>
-0x4E34	0x7674	# <CJK>
-0x4E35	0x7681	# <CJK>
-0x4E36	0x7685	# <CJK>
-0x4E37	0x768C	# <CJK>
-0x4E38	0x768D	# <CJK>
-0x4E39	0x7695	# <CJK>
-0x4E3A	0x769B	# <CJK>
-0x4E3B	0x769C	# <CJK>
-0x4E3C	0x769D	# <CJK>
-0x4E3D	0x769F	# <CJK>
-0x4E3E	0x76A0	# <CJK>
-0x4E3F	0x76A2	# <CJK>
-0x4E40	0x76A3	# <CJK>
-0x4E41	0x76A4	# <CJK>
-0x4E42	0x76A5	# <CJK>
-0x4E43	0x76A6	# <CJK>
-0x4E44	0x76A7	# <CJK>
-0x4E45	0x76A8	# <CJK>
-0x4E46	0x76AA	# <CJK>
-0x4E47	0x76AD	# <CJK>
-0x4E48	0x76BD	# <CJK>
-0x4E49	0x76C1	# <CJK>
-0x4E4A	0x76C5	# <CJK>
-0x4E4B	0x76C9	# <CJK>
-0x4E4C	0x76CB	# <CJK>
-0x4E4D	0x76CC	# <CJK>
-0x4E4E	0x76CE	# <CJK>
-0x4E4F	0x76D4	# <CJK>
-0x4E50	0x76D9	# <CJK>
-0x4E51	0x76E0	# <CJK>
-0x4E52	0x76E6	# <CJK>
-0x4E53	0x76E8	# <CJK>
-0x4E54	0x76EC	# <CJK>
-0x4E55	0x76F0	# <CJK>
-0x4E56	0x76F1	# <CJK>
-0x4E57	0x76F6	# <CJK>
-0x4E58	0x76F9	# <CJK>
-0x4E59	0x76FC	# <CJK>
-0x4E5A	0x7700	# <CJK>
-0x4E5B	0x7706	# <CJK>
-0x4E5C	0x770A	# <CJK>
-0x4E5D	0x770E	# <CJK>
-0x4E5E	0x7712	# <CJK>
-0x4E5F	0x7714	# <CJK>
-0x4E60	0x7715	# <CJK>
-0x4E61	0x7717	# <CJK>
-0x4E62	0x7719	# <CJK>
-0x4E63	0x771A	# <CJK>
-0x4E64	0x771C	# <CJK>
-0x4E65	0x7722	# <CJK>
-0x4E66	0x7728	# <CJK>
-0x4E67	0x772D	# <CJK>
-0x4E68	0x772E	# <CJK>
-0x4E69	0x772F	# <CJK>
-0x4E6A	0x7734	# <CJK>
-0x4E6B	0x7735	# <CJK>
-0x4E6C	0x7736	# <CJK>
-0x4E6D	0x7739	# <CJK>
-0x4E6E	0x773D	# <CJK>
-0x4E6F	0x773E	# <CJK>
-0x4E70	0x7742	# <CJK>
-0x4E71	0x7745	# <CJK>
-0x4E72	0x7746	# <CJK>
-0x4E73	0x774A	# <CJK>
-0x4E74	0x774D	# <CJK>
-0x4E75	0x774E	# <CJK>
-0x4E76	0x774F	# <CJK>
-0x4E77	0x7752	# <CJK>
-0x4E78	0x7756	# <CJK>
-0x4E79	0x7757	# <CJK>
-0x4E7A	0x775C	# <CJK>
-0x4E7B	0x775E	# <CJK>
-0x4E7C	0x775F	# <CJK>
-0x4E7D	0x7760	# <CJK>
-0x4E7E	0x7762	# <CJK>
-0x4F21	0x7764	# <CJK>
-0x4F22	0x7767	# <CJK>
-0x4F23	0x776A	# <CJK>
-0x4F24	0x776C	# <CJK>
-0x4F25	0x7770	# <CJK>
-0x4F26	0x7772	# <CJK>
-0x4F27	0x7773	# <CJK>
-0x4F28	0x7774	# <CJK>
-0x4F29	0x777A	# <CJK>
-0x4F2A	0x777D	# <CJK>
-0x4F2B	0x7780	# <CJK>
-0x4F2C	0x7784	# <CJK>
-0x4F2D	0x778C	# <CJK>
-0x4F2E	0x778D	# <CJK>
-0x4F2F	0x7794	# <CJK>
-0x4F30	0x7795	# <CJK>
-0x4F31	0x7796	# <CJK>
-0x4F32	0x779A	# <CJK>
-0x4F33	0x779F	# <CJK>
-0x4F34	0x77A2	# <CJK>
-0x4F35	0x77A7	# <CJK>
-0x4F36	0x77AA	# <CJK>
-0x4F37	0x77AE	# <CJK>
-0x4F38	0x77AF	# <CJK>
-0x4F39	0x77B1	# <CJK>
-0x4F3A	0x77B5	# <CJK>
-0x4F3B	0x77BE	# <CJK>
-0x4F3C	0x77C3	# <CJK>
-0x4F3D	0x77C9	# <CJK>
-0x4F3E	0x77D1	# <CJK>
-0x4F3F	0x77D2	# <CJK>
-0x4F40	0x77D5	# <CJK>
-0x4F41	0x77D9	# <CJK>
-0x4F42	0x77DE	# <CJK>
-0x4F43	0x77DF	# <CJK>
-0x4F44	0x77E0	# <CJK>
-0x4F45	0x77E4	# <CJK>
-0x4F46	0x77E6	# <CJK>
-0x4F47	0x77EA	# <CJK>
-0x4F48	0x77EC	# <CJK>
-0x4F49	0x77F0	# <CJK>
-0x4F4A	0x77F1	# <CJK>
-0x4F4B	0x77F4	# <CJK>
-0x4F4C	0x77F8	# <CJK>
-0x4F4D	0x77FB	# <CJK>
-0x4F4E	0x7805	# <CJK>
-0x4F4F	0x7806	# <CJK>
-0x4F50	0x7809	# <CJK>
-0x4F51	0x780D	# <CJK>
-0x4F52	0x780E	# <CJK>
-0x4F53	0x7811	# <CJK>
-0x4F54	0x781D	# <CJK>
-0x4F55	0x7821	# <CJK>
-0x4F56	0x7822	# <CJK>
-0x4F57	0x7823	# <CJK>
-0x4F58	0x782D	# <CJK>
-0x4F59	0x782E	# <CJK>
-0x4F5A	0x7830	# <CJK>
-0x4F5B	0x7835	# <CJK>
-0x4F5C	0x7837	# <CJK>
-0x4F5D	0x7843	# <CJK>
-0x4F5E	0x7844	# <CJK>
-0x4F5F	0x7847	# <CJK>
-0x4F60	0x7848	# <CJK>
-0x4F61	0x784C	# <CJK>
-0x4F62	0x784E	# <CJK>
-0x4F63	0x7852	# <CJK>
-0x4F64	0x785C	# <CJK>
-0x4F65	0x785E	# <CJK>
-0x4F66	0x7860	# <CJK>
-0x4F67	0x7861	# <CJK>
-0x4F68	0x7863	# <CJK>
-0x4F69	0x7864	# <CJK>
-0x4F6A	0x7868	# <CJK>
-0x4F6B	0x786A	# <CJK>
-0x4F6C	0x786E	# <CJK>
-0x4F6D	0x787A	# <CJK>
-0x4F6E	0x787E	# <CJK>
-0x4F6F	0x788A	# <CJK>
-0x4F70	0x788F	# <CJK>
-0x4F71	0x7894	# <CJK>
-0x4F72	0x7898	# <CJK>
-0x4F73	0x78A1	# <CJK>
-0x4F74	0x789D	# <CJK>
-0x4F75	0x789E	# <CJK>
-0x4F76	0x789F	# <CJK>
-0x4F77	0x78A4	# <CJK>
-0x4F78	0x78A8	# <CJK>
-0x4F79	0x78AC	# <CJK>
-0x4F7A	0x78AD	# <CJK>
-0x4F7B	0x78B0	# <CJK>
-0x4F7C	0x78B1	# <CJK>
-0x4F7D	0x78B2	# <CJK>
-0x4F7E	0x78B3	# <CJK>
-0x5021	0x78BB	# <CJK>
-0x5022	0x78BD	# <CJK>
-0x5023	0x78BF	# <CJK>
-0x5024	0x78C7	# <CJK>
-0x5025	0x78C8	# <CJK>
-0x5026	0x78C9	# <CJK>
-0x5027	0x78CC	# <CJK>
-0x5028	0x78CE	# <CJK>
-0x5029	0x78D2	# <CJK>
-0x502A	0x78D3	# <CJK>
-0x502B	0x78D5	# <CJK>
-0x502C	0x78D6	# <CJK>
-0x502D	0x78E4	# <CJK>
-0x502E	0x78DB	# <CJK>
-0x502F	0x78DF	# <CJK>
-0x5030	0x78E0	# <CJK>
-0x5031	0x78E1	# <CJK>
-0x5032	0x78E6	# <CJK>
-0x5033	0x78EA	# <CJK>
-0x5034	0x78F2	# <CJK>
-0x5035	0x78F3	# <CJK>
-0x5036	0x7900	# <CJK>
-0x5037	0x78F6	# <CJK>
-0x5038	0x78F7	# <CJK>
-0x5039	0x78FA	# <CJK>
-0x503A	0x78FB	# <CJK>
-0x503B	0x78FF	# <CJK>
-0x503C	0x7906	# <CJK>
-0x503D	0x790C	# <CJK>
-0x503E	0x7910	# <CJK>
-0x503F	0x791A	# <CJK>
-0x5040	0x791C	# <CJK>
-0x5041	0x791E	# <CJK>
-0x5042	0x791F	# <CJK>
-0x5043	0x7920	# <CJK>
-0x5044	0x7925	# <CJK>
-0x5045	0x7927	# <CJK>
-0x5046	0x7929	# <CJK>
-0x5047	0x792D	# <CJK>
-0x5048	0x7931	# <CJK>
-0x5049	0x7934	# <CJK>
-0x504A	0x7935	# <CJK>
-0x504B	0x793B	# <CJK>
-0x504C	0x793D	# <CJK>
-0x504D	0x793F	# <CJK>
-0x504E	0x7944	# <CJK>
-0x504F	0x7945	# <CJK>
-0x5050	0x7946	# <CJK>
-0x5051	0x794A	# <CJK>
-0x5052	0x794B	# <CJK>
-0x5053	0x794F	# <CJK>
-0x5054	0x7951	# <CJK>
-0x5055	0x7954	# <CJK>
-0x5056	0x7958	# <CJK>
-0x5057	0x795B	# <CJK>
-0x5058	0x795C	# <CJK>
-0x5059	0x7967	# <CJK>
-0x505A	0x7969	# <CJK>
-0x505B	0x796B	# <CJK>
-0x505C	0x7972	# <CJK>
-0x505D	0x7979	# <CJK>
-0x505E	0x797B	# <CJK>
-0x505F	0x797C	# <CJK>
-0x5060	0x797E	# <CJK>
-0x5061	0x798B	# <CJK>
-0x5062	0x798C	# <CJK>
-0x5063	0x7991	# <CJK>
-0x5064	0x7993	# <CJK>
-0x5065	0x7994	# <CJK>
-0x5066	0x7995	# <CJK>
-0x5067	0x7996	# <CJK>
-0x5068	0x7998	# <CJK>
-0x5069	0x799B	# <CJK>
-0x506A	0x799C	# <CJK>
-0x506B	0x79A1	# <CJK>
-0x506C	0x79A8	# <CJK>
-0x506D	0x79A9	# <CJK>
-0x506E	0x79AB	# <CJK>
-0x506F	0x79AF	# <CJK>
-0x5070	0x79B1	# <CJK>
-0x5071	0x79B4	# <CJK>
-0x5072	0x79B8	# <CJK>
-0x5073	0x79BB	# <CJK>
-0x5074	0x79C2	# <CJK>
-0x5075	0x79C4	# <CJK>
-0x5076	0x79C7	# <CJK>
-0x5077	0x79C8	# <CJK>
-0x5078	0x79CA	# <CJK>
-0x5079	0x79CF	# <CJK>
-0x507A	0x79D4	# <CJK>
-0x507B	0x79D6	# <CJK>
-0x507C	0x79DA	# <CJK>
-0x507D	0x79DD	# <CJK>
-0x507E	0x79DE	# <CJK>
-0x5121	0x79E0	# <CJK>
-0x5122	0x79E2	# <CJK>
-0x5123	0x79E5	# <CJK>
-0x5124	0x79EA	# <CJK>
-0x5125	0x79EB	# <CJK>
-0x5126	0x79ED	# <CJK>
-0x5127	0x79F1	# <CJK>
-0x5128	0x79F8	# <CJK>
-0x5129	0x79FC	# <CJK>
-0x512A	0x7A02	# <CJK>
-0x512B	0x7A03	# <CJK>
-0x512C	0x7A07	# <CJK>
-0x512D	0x7A09	# <CJK>
-0x512E	0x7A0A	# <CJK>
-0x512F	0x7A0C	# <CJK>
-0x5130	0x7A11	# <CJK>
-0x5131	0x7A15	# <CJK>
-0x5132	0x7A1B	# <CJK>
-0x5133	0x7A1E	# <CJK>
-0x5134	0x7A21	# <CJK>
-0x5135	0x7A27	# <CJK>
-0x5136	0x7A2B	# <CJK>
-0x5137	0x7A2D	# <CJK>
-0x5138	0x7A2F	# <CJK>
-0x5139	0x7A30	# <CJK>
-0x513A	0x7A34	# <CJK>
-0x513B	0x7A35	# <CJK>
-0x513C	0x7A38	# <CJK>
-0x513D	0x7A39	# <CJK>
-0x513E	0x7A3A	# <CJK>
-0x513F	0x7A44	# <CJK>
-0x5140	0x7A45	# <CJK>
-0x5141	0x7A47	# <CJK>
-0x5142	0x7A48	# <CJK>
-0x5143	0x7A4C	# <CJK>
-0x5144	0x7A55	# <CJK>
-0x5145	0x7A56	# <CJK>
-0x5146	0x7A59	# <CJK>
-0x5147	0x7A5C	# <CJK>
-0x5148	0x7A5D	# <CJK>
-0x5149	0x7A5F	# <CJK>
-0x514A	0x7A60	# <CJK>
-0x514B	0x7A65	# <CJK>
-0x514C	0x7A67	# <CJK>
-0x514D	0x7A6A	# <CJK>
-0x514E	0x7A6D	# <CJK>
-0x514F	0x7A75	# <CJK>
-0x5150	0x7A78	# <CJK>
-0x5151	0x7A7E	# <CJK>
-0x5152	0x7A80	# <CJK>
-0x5153	0x7A82	# <CJK>
-0x5154	0x7A85	# <CJK>
-0x5155	0x7A86	# <CJK>
-0x5156	0x7A8A	# <CJK>
-0x5157	0x7A8B	# <CJK>
-0x5158	0x7A90	# <CJK>
-0x5159	0x7A91	# <CJK>
-0x515A	0x7A94	# <CJK>
-0x515B	0x7A9E	# <CJK>
-0x515C	0x7AA0	# <CJK>
-0x515D	0x7AA3	# <CJK>
-0x515E	0x7AAC	# <CJK>
-0x515F	0x7AB3	# <CJK>
-0x5160	0x7AB5	# <CJK>
-0x5161	0x7AB9	# <CJK>
-0x5162	0x7ABB	# <CJK>
-0x5163	0x7ABC	# <CJK>
-0x5164	0x7AC6	# <CJK>
-0x5165	0x7AC9	# <CJK>
-0x5166	0x7ACC	# <CJK>
-0x5167	0x7ACE	# <CJK>
-0x5168	0x7AD1	# <CJK>
-0x5169	0x7ADB	# <CJK>
-0x516A	0x7AE8	# <CJK>
-0x516B	0x7AE9	# <CJK>
-0x516C	0x7AEB	# <CJK>
-0x516D	0x7AEC	# <CJK>
-0x516E	0x7AF1	# <CJK>
-0x516F	0x7AF4	# <CJK>
-0x5170	0x7AFB	# <CJK>
-0x5171	0x7AFD	# <CJK>
-0x5172	0x7AFE	# <CJK>
-0x5173	0x7B07	# <CJK>
-0x5174	0x7B14	# <CJK>
-0x5175	0x7B1F	# <CJK>
-0x5176	0x7B23	# <CJK>
-0x5177	0x7B27	# <CJK>
-0x5178	0x7B29	# <CJK>
-0x5179	0x7B2A	# <CJK>
-0x517A	0x7B2B	# <CJK>
-0x517B	0x7B2D	# <CJK>
-0x517C	0x7B2E	# <CJK>
-0x517D	0x7B2F	# <CJK>
-0x517E	0x7B30	# <CJK>
-0x5221	0x7B31	# <CJK>
-0x5222	0x7B34	# <CJK>
-0x5223	0x7B3D	# <CJK>
-0x5224	0x7B3F	# <CJK>
-0x5225	0x7B40	# <CJK>
-0x5226	0x7B41	# <CJK>
-0x5227	0x7B47	# <CJK>
-0x5228	0x7B4E	# <CJK>
-0x5229	0x7B55	# <CJK>
-0x522A	0x7B60	# <CJK>
-0x522B	0x7B64	# <CJK>
-0x522C	0x7B66	# <CJK>
-0x522D	0x7B69	# <CJK>
-0x522E	0x7B6A	# <CJK>
-0x522F	0x7B6D	# <CJK>
-0x5230	0x7B6F	# <CJK>
-0x5231	0x7B72	# <CJK>
-0x5232	0x7B73	# <CJK>
-0x5233	0x7B77	# <CJK>
-0x5234	0x7B84	# <CJK>
-0x5235	0x7B89	# <CJK>
-0x5236	0x7B8E	# <CJK>
-0x5237	0x7B90	# <CJK>
-0x5238	0x7B91	# <CJK>
-0x5239	0x7B96	# <CJK>
-0x523A	0x7B9B	# <CJK>
-0x523B	0x7B9E	# <CJK>
-0x523C	0x7BA0	# <CJK>
-0x523D	0x7BA5	# <CJK>
-0x523E	0x7BAC	# <CJK>
-0x523F	0x7BAF	# <CJK>
-0x5240	0x7BB0	# <CJK>
-0x5241	0x7BB2	# <CJK>
-0x5242	0x7BB5	# <CJK>
-0x5243	0x7BB6	# <CJK>
-0x5244	0x7BBA	# <CJK>
-0x5245	0x7BBB	# <CJK>
-0x5246	0x7BBC	# <CJK>
-0x5247	0x7BBD	# <CJK>
-0x5248	0x7BC2	# <CJK>
-0x5249	0x7BC5	# <CJK>
-0x524A	0x7BC8	# <CJK>
-0x524B	0x7BCA	# <CJK>
-0x524C	0x7BD4	# <CJK>
-0x524D	0x7BD6	# <CJK>
-0x524E	0x7BD7	# <CJK>
-0x524F	0x7BD9	# <CJK>
-0x5250	0x7BDA	# <CJK>
-0x5251	0x7BDB	# <CJK>
-0x5252	0x7BE8	# <CJK>
-0x5253	0x7BEA	# <CJK>
-0x5254	0x7BF2	# <CJK>
-0x5255	0x7BF4	# <CJK>
-0x5256	0x7BF5	# <CJK>
-0x5257	0x7BF8	# <CJK>
-0x5258	0x7BF9	# <CJK>
-0x5259	0x7BFA	# <CJK>
-0x525A	0x7BFC	# <CJK>
-0x525B	0x7BFE	# <CJK>
-0x525C	0x7C01	# <CJK>
-0x525D	0x7C02	# <CJK>
-0x525E	0x7C03	# <CJK>
-0x525F	0x7C04	# <CJK>
-0x5260	0x7C06	# <CJK>
-0x5261	0x7C09	# <CJK>
-0x5262	0x7C0B	# <CJK>
-0x5263	0x7C0C	# <CJK>
-0x5264	0x7C0E	# <CJK>
-0x5265	0x7C0F	# <CJK>
-0x5266	0x7C19	# <CJK>
-0x5267	0x7C1B	# <CJK>
-0x5268	0x7C20	# <CJK>
-0x5269	0x7C25	# <CJK>
-0x526A	0x7C26	# <CJK>
-0x526B	0x7C28	# <CJK>
-0x526C	0x7C2C	# <CJK>
-0x526D	0x7C31	# <CJK>
-0x526E	0x7C33	# <CJK>
-0x526F	0x7C34	# <CJK>
-0x5270	0x7C36	# <CJK>
-0x5271	0x7C39	# <CJK>
-0x5272	0x7C3A	# <CJK>
-0x5273	0x7C46	# <CJK>
-0x5274	0x7C4A	# <CJK>
-0x5275	0x7C55	# <CJK>
-0x5276	0x7C51	# <CJK>
-0x5277	0x7C52	# <CJK>
-0x5278	0x7C53	# <CJK>
-0x5279	0x7C59	# <CJK>
-0x527A	0x7C5A	# <CJK>
-0x527B	0x7C5B	# <CJK>
-0x527C	0x7C5C	# <CJK>
-0x527D	0x7C5D	# <CJK>
-0x527E	0x7C5E	# <CJK>
-0x5321	0x7C61	# <CJK>
-0x5322	0x7C63	# <CJK>
-0x5323	0x7C67	# <CJK>
-0x5324	0x7C69	# <CJK>
-0x5325	0x7C6D	# <CJK>
-0x5326	0x7C6E	# <CJK>
-0x5327	0x7C70	# <CJK>
-0x5328	0x7C72	# <CJK>
-0x5329	0x7C79	# <CJK>
-0x532A	0x7C7C	# <CJK>
-0x532B	0x7C7D	# <CJK>
-0x532C	0x7C86	# <CJK>
-0x532D	0x7C87	# <CJK>
-0x532E	0x7C8F	# <CJK>
-0x532F	0x7C94	# <CJK>
-0x5330	0x7C9E	# <CJK>
-0x5331	0x7CA0	# <CJK>
-0x5332	0x7CA6	# <CJK>
-0x5333	0x7CB0	# <CJK>
-0x5334	0x7CB6	# <CJK>
-0x5335	0x7CB7	# <CJK>
-0x5336	0x7CBA	# <CJK>
-0x5337	0x7CBB	# <CJK>
-0x5338	0x7CBC	# <CJK>
-0x5339	0x7CBF	# <CJK>
-0x533A	0x7CC4	# <CJK>
-0x533B	0x7CC7	# <CJK>
-0x533C	0x7CC8	# <CJK>
-0x533D	0x7CC9	# <CJK>
-0x533E	0x7CCD	# <CJK>
-0x533F	0x7CCF	# <CJK>
-0x5340	0x7CD3	# <CJK>
-0x5341	0x7CD4	# <CJK>
-0x5342	0x7CD5	# <CJK>
-0x5343	0x7CD7	# <CJK>
-0x5344	0x7CD9	# <CJK>
-0x5345	0x7CDA	# <CJK>
-0x5346	0x7CDD	# <CJK>
-0x5347	0x7CE6	# <CJK>
-0x5348	0x7CE9	# <CJK>
-0x5349	0x7CEB	# <CJK>
-0x534A	0x7CF5	# <CJK>
-0x534B	0x7D03	# <CJK>
-0x534C	0x7D07	# <CJK>
-0x534D	0x7D08	# <CJK>
-0x534E	0x7D09	# <CJK>
-0x534F	0x7D0F	# <CJK>
-0x5350	0x7D11	# <CJK>
-0x5351	0x7D12	# <CJK>
-0x5352	0x7D13	# <CJK>
-0x5353	0x7D16	# <CJK>
-0x5354	0x7D1D	# <CJK>
-0x5355	0x7D1E	# <CJK>
-0x5356	0x7D23	# <CJK>
-0x5357	0x7D26	# <CJK>
-0x5358	0x7D2A	# <CJK>
-0x5359	0x7D2D	# <CJK>
-0x535A	0x7D31	# <CJK>
-0x535B	0x7D3C	# <CJK>
-0x535C	0x7D3D	# <CJK>
-0x535D	0x7D3E	# <CJK>
-0x535E	0x7D40	# <CJK>
-0x535F	0x7D41	# <CJK>
-0x5360	0x7D47	# <CJK>
-0x5361	0x7D48	# <CJK>
-0x5362	0x7D4D	# <CJK>
-0x5363	0x7D51	# <CJK>
-0x5364	0x7D53	# <CJK>
-0x5365	0x7D57	# <CJK>
-0x5366	0x7D59	# <CJK>
-0x5367	0x7D5A	# <CJK>
-0x5368	0x7D5C	# <CJK>
-0x5369	0x7D5D	# <CJK>
-0x536A	0x7D65	# <CJK>
-0x536B	0x7D67	# <CJK>
-0x536C	0x7D6A	# <CJK>
-0x536D	0x7D70	# <CJK>
-0x536E	0x7D78	# <CJK>
-0x536F	0x7D7A	# <CJK>
-0x5370	0x7D7B	# <CJK>
-0x5371	0x7D7F	# <CJK>
-0x5372	0x7D81	# <CJK>
-0x5373	0x7D82	# <CJK>
-0x5374	0x7D83	# <CJK>
-0x5375	0x7D85	# <CJK>
-0x5376	0x7D86	# <CJK>
-0x5377	0x7D88	# <CJK>
-0x5378	0x7D8B	# <CJK>
-0x5379	0x7D8C	# <CJK>
-0x537A	0x7D8D	# <CJK>
-0x537B	0x7D91	# <CJK>
-0x537C	0x7D96	# <CJK>
-0x537D	0x7D97	# <CJK>
-0x537E	0x7D9D	# <CJK>
-0x5421	0x7D9E	# <CJK>
-0x5422	0x7DA6	# <CJK>
-0x5423	0x7DA7	# <CJK>
-0x5424	0x7DAA	# <CJK>
-0x5425	0x7DB3	# <CJK>
-0x5426	0x7DB6	# <CJK>
-0x5427	0x7DB7	# <CJK>
-0x5428	0x7DB9	# <CJK>
-0x5429	0x7DC2	# <CJK>
-0x542A	0x7DC3	# <CJK>
-0x542B	0x7DC4	# <CJK>
-0x542C	0x7DC5	# <CJK>
-0x542D	0x7DC6	# <CJK>
-0x542E	0x7DCC	# <CJK>
-0x542F	0x7DCD	# <CJK>
-0x5430	0x7DCE	# <CJK>
-0x5431	0x7DD7	# <CJK>
-0x5432	0x7DD9	# <CJK>
-0x5433	0x7E00	# <CJK>
-0x5434	0x7DE2	# <CJK>
-0x5435	0x7DE5	# <CJK>
-0x5436	0x7DE6	# <CJK>
-0x5437	0x7DEA	# <CJK>
-0x5438	0x7DEB	# <CJK>
-0x5439	0x7DED	# <CJK>
-0x543A	0x7DF1	# <CJK>
-0x543B	0x7DF5	# <CJK>
-0x543C	0x7DF6	# <CJK>
-0x543D	0x7DF9	# <CJK>
-0x543E	0x7DFA	# <CJK>
-0x543F	0x7E08	# <CJK>
-0x5440	0x7E10	# <CJK>
-0x5441	0x7E11	# <CJK>
-0x5442	0x7E15	# <CJK>
-0x5443	0x7E17	# <CJK>
-0x5444	0x7E1C	# <CJK>
-0x5445	0x7E1D	# <CJK>
-0x5446	0x7E20	# <CJK>
-0x5447	0x7E27	# <CJK>
-0x5448	0x7E28	# <CJK>
-0x5449	0x7E2C	# <CJK>
-0x544A	0x7E2D	# <CJK>
-0x544B	0x7E2F	# <CJK>
-0x544C	0x7E33	# <CJK>
-0x544D	0x7E36	# <CJK>
-0x544E	0x7E3F	# <CJK>
-0x544F	0x7E44	# <CJK>
-0x5450	0x7E45	# <CJK>
-0x5451	0x7E47	# <CJK>
-0x5452	0x7E4E	# <CJK>
-0x5453	0x7E50	# <CJK>
-0x5454	0x7E52	# <CJK>
-0x5455	0x7E58	# <CJK>
-0x5456	0x7E5F	# <CJK>
-0x5457	0x7E61	# <CJK>
-0x5458	0x7E62	# <CJK>
-0x5459	0x7E65	# <CJK>
-0x545A	0x7E6B	# <CJK>
-0x545B	0x7E6E	# <CJK>
-0x545C	0x7E6F	# <CJK>
-0x545D	0x7E73	# <CJK>
-0x545E	0x7E78	# <CJK>
-0x545F	0x7E7E	# <CJK>
-0x5460	0x7E81	# <CJK>
-0x5461	0x7E86	# <CJK>
-0x5462	0x7E87	# <CJK>
-0x5463	0x7E8A	# <CJK>
-0x5464	0x7E8D	# <CJK>
-0x5465	0x7E91	# <CJK>
-0x5466	0x7E95	# <CJK>
-0x5467	0x7E98	# <CJK>
-0x5468	0x7E9A	# <CJK>
-0x5469	0x7E9D	# <CJK>
-0x546A	0x7E9E	# <CJK>
-0x546B	0x7F3C	# <CJK>
-0x546C	0x7F3B	# <CJK>
-0x546D	0x7F3D	# <CJK>
-0x546E	0x7F3E	# <CJK>
-0x546F	0x7F3F	# <CJK>
-0x5470	0x7F43	# <CJK>
-0x5471	0x7F44	# <CJK>
-0x5472	0x7F47	# <CJK>
-0x5473	0x7F4F	# <CJK>
-0x5474	0x7F52	# <CJK>
-0x5475	0x7F53	# <CJK>
-0x5476	0x7F5B	# <CJK>
-0x5477	0x7F5C	# <CJK>
-0x5478	0x7F5D	# <CJK>
-0x5479	0x7F61	# <CJK>
-0x547A	0x7F63	# <CJK>
-0x547B	0x7F64	# <CJK>
-0x547C	0x7F65	# <CJK>
-0x547D	0x7F66	# <CJK>
-0x547E	0x7F6D	# <CJK>
-0x5521	0x7F71	# <CJK>
-0x5522	0x7F7D	# <CJK>
-0x5523	0x7F7E	# <CJK>
-0x5524	0x7F7F	# <CJK>
-0x5525	0x7F80	# <CJK>
-0x5526	0x7F8B	# <CJK>
-0x5527	0x7F8D	# <CJK>
-0x5528	0x7F8F	# <CJK>
-0x5529	0x7F90	# <CJK>
-0x552A	0x7F91	# <CJK>
-0x552B	0x7F96	# <CJK>
-0x552C	0x7F97	# <CJK>
-0x552D	0x7F9C	# <CJK>
-0x552E	0x7FA1	# <CJK>
-0x552F	0x7FA2	# <CJK>
-0x5530	0x7FA6	# <CJK>
-0x5531	0x7FAA	# <CJK>
-0x5532	0x7FAD	# <CJK>
-0x5533	0x7FB4	# <CJK>
-0x5534	0x7FBC	# <CJK>
-0x5535	0x7FBF	# <CJK>
-0x5536	0x7FC0	# <CJK>
-0x5537	0x7FC3	# <CJK>
-0x5538	0x7FC8	# <CJK>
-0x5539	0x7FCE	# <CJK>
-0x553A	0x7FCF	# <CJK>
-0x553B	0x7FDB	# <CJK>
-0x553C	0x7FDF	# <CJK>
-0x553D	0x7FE3	# <CJK>
-0x553E	0x7FE5	# <CJK>
-0x553F	0x7FE8	# <CJK>
-0x5540	0x7FEC	# <CJK>
-0x5541	0x7FEE	# <CJK>
-0x5542	0x7FEF	# <CJK>
-0x5543	0x7FF2	# <CJK>
-0x5544	0x7FFA	# <CJK>
-0x5545	0x7FFD	# <CJK>
-0x5546	0x7FFE	# <CJK>
-0x5547	0x7FFF	# <CJK>
-0x5548	0x8007	# <CJK>
-0x5549	0x8008	# <CJK>
-0x554A	0x800A	# <CJK>
-0x554B	0x800D	# <CJK>
-0x554C	0x800E	# <CJK>
-0x554D	0x800F	# <CJK>
-0x554E	0x8011	# <CJK>
-0x554F	0x8013	# <CJK>
-0x5550	0x8014	# <CJK>
-0x5551	0x8016	# <CJK>
-0x5552	0x801D	# <CJK>
-0x5553	0x801E	# <CJK>
-0x5554	0x801F	# <CJK>
-0x5555	0x8020	# <CJK>
-0x5556	0x8024	# <CJK>
-0x5557	0x8026	# <CJK>
-0x5558	0x802C	# <CJK>
-0x5559	0x802E	# <CJK>
-0x555A	0x8030	# <CJK>
-0x555B	0x8034	# <CJK>
-0x555C	0x8035	# <CJK>
-0x555D	0x8037	# <CJK>
-0x555E	0x8039	# <CJK>
-0x555F	0x803A	# <CJK>
-0x5560	0x803C	# <CJK>
-0x5561	0x803E	# <CJK>
-0x5562	0x8040	# <CJK>
-0x5563	0x8044	# <CJK>
-0x5564	0x8060	# <CJK>
-0x5565	0x8064	# <CJK>
-0x5566	0x8066	# <CJK>
-0x5567	0x806D	# <CJK>
-0x5568	0x8071	# <CJK>
-0x5569	0x8075	# <CJK>
-0x556A	0x8081	# <CJK>
-0x556B	0x8088	# <CJK>
-0x556C	0x808E	# <CJK>
-0x556D	0x809C	# <CJK>
-0x556E	0x809E	# <CJK>
-0x556F	0x80A6	# <CJK>
-0x5570	0x80A7	# <CJK>
-0x5571	0x80AB	# <CJK>
-0x5572	0x80B8	# <CJK>
-0x5573	0x80B9	# <CJK>
-0x5574	0x80C8	# <CJK>
-0x5575	0x80CD	# <CJK>
-0x5576	0x80CF	# <CJK>
-0x5577	0x80D2	# <CJK>
-0x5578	0x80D4	# <CJK>
-0x5579	0x80D5	# <CJK>
-0x557A	0x80D7	# <CJK>
-0x557B	0x80D8	# <CJK>
-0x557C	0x80E0	# <CJK>
-0x557D	0x80ED	# <CJK>
-0x557E	0x80EE	# <CJK>
-0x5621	0x80F0	# <CJK>
-0x5622	0x80F2	# <CJK>
-0x5623	0x80F3	# <CJK>
-0x5624	0x80F6	# <CJK>
-0x5625	0x80F9	# <CJK>
-0x5626	0x80FA	# <CJK>
-0x5627	0x80FE	# <CJK>
-0x5628	0x8103	# <CJK>
-0x5629	0x810B	# <CJK>
-0x562A	0x8116	# <CJK>
-0x562B	0x8117	# <CJK>
-0x562C	0x8118	# <CJK>
-0x562D	0x811C	# <CJK>
-0x562E	0x811E	# <CJK>
-0x562F	0x8120	# <CJK>
-0x5630	0x8124	# <CJK>
-0x5631	0x8127	# <CJK>
-0x5632	0x812C	# <CJK>
-0x5633	0x8130	# <CJK>
-0x5634	0x8135	# <CJK>
-0x5635	0x813A	# <CJK>
-0x5636	0x813C	# <CJK>
-0x5637	0x8145	# <CJK>
-0x5638	0x8147	# <CJK>
-0x5639	0x814A	# <CJK>
-0x563A	0x814C	# <CJK>
-0x563B	0x8152	# <CJK>
-0x563C	0x8157	# <CJK>
-0x563D	0x8160	# <CJK>
-0x563E	0x8161	# <CJK>
-0x563F	0x8167	# <CJK>
-0x5640	0x8168	# <CJK>
-0x5641	0x8169	# <CJK>
-0x5642	0x816D	# <CJK>
-0x5643	0x816F	# <CJK>
-0x5644	0x8177	# <CJK>
-0x5645	0x8181	# <CJK>
-0x5646	0x8190	# <CJK>
-0x5647	0x8184	# <CJK>
-0x5648	0x8185	# <CJK>
-0x5649	0x8186	# <CJK>
-0x564A	0x818B	# <CJK>
-0x564B	0x818E	# <CJK>
-0x564C	0x8196	# <CJK>
-0x564D	0x8198	# <CJK>
-0x564E	0x819B	# <CJK>
-0x564F	0x819E	# <CJK>
-0x5650	0x81A2	# <CJK>
-0x5651	0x81AE	# <CJK>
-0x5652	0x81B2	# <CJK>
-0x5653	0x81B4	# <CJK>
-0x5654	0x81BB	# <CJK>
-0x5655	0x81CB	# <CJK>
-0x5656	0x81C3	# <CJK>
-0x5657	0x81C5	# <CJK>
-0x5658	0x81CA	# <CJK>
-0x5659	0x81CE	# <CJK>
-0x565A	0x81CF	# <CJK>
-0x565B	0x81D5	# <CJK>
-0x565C	0x81D7	# <CJK>
-0x565D	0x81DB	# <CJK>
-0x565E	0x81DD	# <CJK>
-0x565F	0x81DE	# <CJK>
-0x5660	0x81E1	# <CJK>
-0x5661	0x81E4	# <CJK>
-0x5662	0x81EB	# <CJK>
-0x5663	0x81EC	# <CJK>
-0x5664	0x81F0	# <CJK>
-0x5665	0x81F1	# <CJK>
-0x5666	0x81F2	# <CJK>
-0x5667	0x81F5	# <CJK>
-0x5668	0x81F6	# <CJK>
-0x5669	0x81F8	# <CJK>
-0x566A	0x81F9	# <CJK>
-0x566B	0x81FD	# <CJK>
-0x566C	0x81FF	# <CJK>
-0x566D	0x8200	# <CJK>
-0x566E	0x8203	# <CJK>
-0x566F	0x820F	# <CJK>
-0x5670	0x8213	# <CJK>
-0x5671	0x8214	# <CJK>
-0x5672	0x8219	# <CJK>
-0x5673	0x821A	# <CJK>
-0x5674	0x821D	# <CJK>
-0x5675	0x8221	# <CJK>
-0x5676	0x8222	# <CJK>
-0x5677	0x8228	# <CJK>
-0x5678	0x8232	# <CJK>
-0x5679	0x8234	# <CJK>
-0x567A	0x823A	# <CJK>
-0x567B	0x8243	# <CJK>
-0x567C	0x8244	# <CJK>
-0x567D	0x8245	# <CJK>
-0x567E	0x8246	# <CJK>
-0x5721	0x824B	# <CJK>
-0x5722	0x824E	# <CJK>
-0x5723	0x824F	# <CJK>
-0x5724	0x8251	# <CJK>
-0x5725	0x8256	# <CJK>
-0x5726	0x825C	# <CJK>
-0x5727	0x8260	# <CJK>
-0x5728	0x8263	# <CJK>
-0x5729	0x8267	# <CJK>
-0x572A	0x826D	# <CJK>
-0x572B	0x8274	# <CJK>
-0x572C	0x827B	# <CJK>
-0x572D	0x827D	# <CJK>
-0x572E	0x827F	# <CJK>
-0x572F	0x8280	# <CJK>
-0x5730	0x8281	# <CJK>
-0x5731	0x8283	# <CJK>
-0x5732	0x8284	# <CJK>
-0x5733	0x8287	# <CJK>
-0x5734	0x8289	# <CJK>
-0x5735	0x828A	# <CJK>
-0x5736	0x828E	# <CJK>
-0x5737	0x8291	# <CJK>
-0x5738	0x8294	# <CJK>
-0x5739	0x8296	# <CJK>
-0x573A	0x8298	# <CJK>
-0x573B	0x829A	# <CJK>
-0x573C	0x829B	# <CJK>
-0x573D	0x82A0	# <CJK>
-0x573E	0x82A1	# <CJK>
-0x573F	0x82A3	# <CJK>
-0x5740	0x82A4	# <CJK>
-0x5741	0x82A7	# <CJK>
-0x5742	0x82A8	# <CJK>
-0x5743	0x82A9	# <CJK>
-0x5744	0x82AA	# <CJK>
-0x5745	0x82AE	# <CJK>
-0x5746	0x82B0	# <CJK>
-0x5747	0x82B2	# <CJK>
-0x5748	0x82B4	# <CJK>
-0x5749	0x82B7	# <CJK>
-0x574A	0x82BA	# <CJK>
-0x574B	0x82BC	# <CJK>
-0x574C	0x82BE	# <CJK>
-0x574D	0x82BF	# <CJK>
-0x574E	0x82C6	# <CJK>
-0x574F	0x82D0	# <CJK>
-0x5750	0x82D5	# <CJK>
-0x5751	0x82DA	# <CJK>
-0x5752	0x82E0	# <CJK>
-0x5753	0x82E2	# <CJK>
-0x5754	0x82E4	# <CJK>
-0x5755	0x82E8	# <CJK>
-0x5756	0x82EA	# <CJK>
-0x5757	0x82ED	# <CJK>
-0x5758	0x82EF	# <CJK>
-0x5759	0x82F6	# <CJK>
-0x575A	0x82F7	# <CJK>
-0x575B	0x82FD	# <CJK>
-0x575C	0x82FE	# <CJK>
-0x575D	0x8300	# <CJK>
-0x575E	0x8301	# <CJK>
-0x575F	0x8307	# <CJK>
-0x5760	0x8308	# <CJK>
-0x5761	0x830A	# <CJK>
-0x5762	0x830B	# <CJK>
-0x5763	0x8354	# <CJK>
-0x5764	0x831B	# <CJK>
-0x5765	0x831D	# <CJK>
-0x5766	0x831E	# <CJK>
-0x5767	0x831F	# <CJK>
-0x5768	0x8321	# <CJK>
-0x5769	0x8322	# <CJK>
-0x576A	0x832C	# <CJK>
-0x576B	0x832D	# <CJK>
-0x576C	0x832E	# <CJK>
-0x576D	0x8330	# <CJK>
-0x576E	0x8333	# <CJK>
-0x576F	0x8337	# <CJK>
-0x5770	0x833A	# <CJK>
-0x5771	0x833C	# <CJK>
-0x5772	0x833D	# <CJK>
-0x5773	0x8342	# <CJK>
-0x5774	0x8343	# <CJK>
-0x5775	0x8344	# <CJK>
-0x5776	0x8347	# <CJK>
-0x5777	0x834D	# <CJK>
-0x5778	0x834E	# <CJK>
-0x5779	0x8351	# <CJK>
-0x577A	0x8355	# <CJK>
-0x577B	0x8356	# <CJK>
-0x577C	0x8357	# <CJK>
-0x577D	0x8370	# <CJK>
-0x577E	0x8378	# <CJK>
-0x5821	0x837D	# <CJK>
-0x5822	0x837F	# <CJK>
-0x5823	0x8380	# <CJK>
-0x5824	0x8382	# <CJK>
-0x5825	0x8384	# <CJK>
-0x5826	0x8386	# <CJK>
-0x5827	0x838D	# <CJK>
-0x5828	0x8392	# <CJK>
-0x5829	0x8394	# <CJK>
-0x582A	0x8395	# <CJK>
-0x582B	0x8398	# <CJK>
-0x582C	0x8399	# <CJK>
-0x582D	0x839B	# <CJK>
-0x582E	0x839C	# <CJK>
-0x582F	0x839D	# <CJK>
-0x5830	0x83A6	# <CJK>
-0x5831	0x83A7	# <CJK>
-0x5832	0x83A9	# <CJK>
-0x5833	0x83AC	# <CJK>
-0x5834	0x83BE	# <CJK>
-0x5835	0x83BF	# <CJK>
-0x5836	0x83C0	# <CJK>
-0x5837	0x83C7	# <CJK>
-0x5838	0x83C9	# <CJK>
-0x5839	0x83CF	# <CJK>
-0x583A	0x83D0	# <CJK>
-0x583B	0x83D1	# <CJK>
-0x583C	0x83D4	# <CJK>
-0x583D	0x83DD	# <CJK>
-0x583E	0x8353	# <CJK>
-0x583F	0x83E8	# <CJK>
-0x5840	0x83EA	# <CJK>
-0x5841	0x83F6	# <CJK>
-0x5842	0x83F8	# <CJK>
-0x5843	0x83F9	# <CJK>
-0x5844	0x83FC	# <CJK>
-0x5845	0x8401	# <CJK>
-0x5846	0x8406	# <CJK>
-0x5847	0x840A	# <CJK>
-0x5848	0x840F	# <CJK>
-0x5849	0x8411	# <CJK>
-0x584A	0x8415	# <CJK>
-0x584B	0x8419	# <CJK>
-0x584C	0x83AD	# <CJK>
-0x584D	0x842F	# <CJK>
-0x584E	0x8439	# <CJK>
-0x584F	0x8445	# <CJK>
-0x5850	0x8447	# <CJK>
-0x5851	0x8448	# <CJK>
-0x5852	0x844A	# <CJK>
-0x5853	0x844D	# <CJK>
-0x5854	0x844F	# <CJK>
-0x5855	0x8451	# <CJK>
-0x5856	0x8452	# <CJK>
-0x5857	0x8456	# <CJK>
-0x5858	0x8458	# <CJK>
-0x5859	0x8459	# <CJK>
-0x585A	0x845A	# <CJK>
-0x585B	0x845C	# <CJK>
-0x585C	0x8460	# <CJK>
-0x585D	0x8464	# <CJK>
-0x585E	0x8465	# <CJK>
-0x585F	0x8467	# <CJK>
-0x5860	0x846A	# <CJK>
-0x5861	0x8470	# <CJK>
-0x5862	0x8473	# <CJK>
-0x5863	0x8474	# <CJK>
-0x5864	0x8476	# <CJK>
-0x5865	0x8478	# <CJK>
-0x5866	0x847C	# <CJK>
-0x5867	0x847D	# <CJK>
-0x5868	0x8481	# <CJK>
-0x5869	0x8485	# <CJK>
-0x586A	0x8492	# <CJK>
-0x586B	0x8493	# <CJK>
-0x586C	0x8495	# <CJK>
-0x586D	0x849E	# <CJK>
-0x586E	0x84A6	# <CJK>
-0x586F	0x84A8	# <CJK>
-0x5870	0x84A9	# <CJK>
-0x5871	0x84AA	# <CJK>
-0x5872	0x84AF	# <CJK>
-0x5873	0x84B1	# <CJK>
-0x5874	0x84B4	# <CJK>
-0x5875	0x84BA	# <CJK>
-0x5876	0x84BD	# <CJK>
-0x5877	0x84BE	# <CJK>
-0x5878	0x84C0	# <CJK>
-0x5879	0x84C2	# <CJK>
-0x587A	0x84C7	# <CJK>
-0x587B	0x84C8	# <CJK>
-0x587C	0x84CC	# <CJK>
-0x587D	0x84CF	# <CJK>
-0x587E	0x84D3	# <CJK>
-0x5921	0x84DC	# <CJK>
-0x5922	0x84E7	# <CJK>
-0x5923	0x84EA	# <CJK>
-0x5924	0x84EF	# <CJK>
-0x5925	0x84F0	# <CJK>
-0x5926	0x84F1	# <CJK>
-0x5927	0x84F2	# <CJK>
-0x5928	0x84F7	# <CJK>
-0x5929	0x8532	# <CJK>
-0x592A	0x84FA	# <CJK>
-0x592B	0x84FB	# <CJK>
-0x592C	0x84FD	# <CJK>
-0x592D	0x8502	# <CJK>
-0x592E	0x8503	# <CJK>
-0x592F	0x8507	# <CJK>
-0x5930	0x850C	# <CJK>
-0x5931	0x850E	# <CJK>
-0x5932	0x8510	# <CJK>
-0x5933	0x851C	# <CJK>
-0x5934	0x851E	# <CJK>
-0x5935	0x8522	# <CJK>
-0x5936	0x8523	# <CJK>
-0x5937	0x8524	# <CJK>
-0x5938	0x8525	# <CJK>
-0x5939	0x8527	# <CJK>
-0x593A	0x852A	# <CJK>
-0x593B	0x852B	# <CJK>
-0x593C	0x852F	# <CJK>
-0x593D	0x8533	# <CJK>
-0x593E	0x8534	# <CJK>
-0x593F	0x8536	# <CJK>
-0x5940	0x853F	# <CJK>
-0x5941	0x8546	# <CJK>
-0x5942	0x854F	# <CJK>
-0x5943	0x8550	# <CJK>
-0x5944	0x8551	# <CJK>
-0x5945	0x8552	# <CJK>
-0x5946	0x8553	# <CJK>
-0x5947	0x8556	# <CJK>
-0x5948	0x8559	# <CJK>
-0x5949	0x855C	# <CJK>
-0x594A	0x855D	# <CJK>
-0x594B	0x855E	# <CJK>
-0x594C	0x855F	# <CJK>
-0x594D	0x8560	# <CJK>
-0x594E	0x8561	# <CJK>
-0x594F	0x8562	# <CJK>
-0x5950	0x8564	# <CJK>
-0x5951	0x856B	# <CJK>
-0x5952	0x856F	# <CJK>
-0x5953	0x8579	# <CJK>
-0x5954	0x857A	# <CJK>
-0x5955	0x857B	# <CJK>
-0x5956	0x857D	# <CJK>
-0x5957	0x857F	# <CJK>
-0x5958	0x8581	# <CJK>
-0x5959	0x8585	# <CJK>
-0x595A	0x8586	# <CJK>
-0x595B	0x8589	# <CJK>
-0x595C	0x858B	# <CJK>
-0x595D	0x858C	# <CJK>
-0x595E	0x858F	# <CJK>
-0x595F	0x8593	# <CJK>
-0x5960	0x8598	# <CJK>
-0x5961	0x859D	# <CJK>
-0x5962	0x859F	# <CJK>
-0x5963	0x85A0	# <CJK>
-0x5964	0x85A2	# <CJK>
-0x5965	0x85A5	# <CJK>
-0x5966	0x85A7	# <CJK>
-0x5967	0x85B4	# <CJK>
-0x5968	0x85B6	# <CJK>
-0x5969	0x85B7	# <CJK>
-0x596A	0x85B8	# <CJK>
-0x596B	0x85BC	# <CJK>
-0x596C	0x85BD	# <CJK>
-0x596D	0x85BE	# <CJK>
-0x596E	0x85BF	# <CJK>
-0x596F	0x85C2	# <CJK>
-0x5970	0x85C7	# <CJK>
-0x5971	0x85CA	# <CJK>
-0x5972	0x85CB	# <CJK>
-0x5973	0x85CE	# <CJK>
-0x5974	0x85AD	# <CJK>
-0x5975	0x85D8	# <CJK>
-0x5976	0x85DA	# <CJK>
-0x5977	0x85DF	# <CJK>
-0x5978	0x85E0	# <CJK>
-0x5979	0x85E6	# <CJK>
-0x597A	0x85E8	# <CJK>
-0x597B	0x85ED	# <CJK>
-0x597C	0x85F3	# <CJK>
-0x597D	0x85F6	# <CJK>
-0x597E	0x85FC	# <CJK>
-0x5A21	0x85FF	# <CJK>
-0x5A22	0x8600	# <CJK>
-0x5A23	0x8604	# <CJK>
-0x5A24	0x8605	# <CJK>
-0x5A25	0x860D	# <CJK>
-0x5A26	0x860E	# <CJK>
-0x5A27	0x8610	# <CJK>
-0x5A28	0x8611	# <CJK>
-0x5A29	0x8612	# <CJK>
-0x5A2A	0x8618	# <CJK>
-0x5A2B	0x8619	# <CJK>
-0x5A2C	0x861B	# <CJK>
-0x5A2D	0x861E	# <CJK>
-0x5A2E	0x8621	# <CJK>
-0x5A2F	0x8627	# <CJK>
-0x5A30	0x8629	# <CJK>
-0x5A31	0x8636	# <CJK>
-0x5A32	0x8638	# <CJK>
-0x5A33	0x863A	# <CJK>
-0x5A34	0x863C	# <CJK>
-0x5A35	0x863D	# <CJK>
-0x5A36	0x8640	# <CJK>
-0x5A37	0x8642	# <CJK>
-0x5A38	0x8646	# <CJK>
-0x5A39	0x8652	# <CJK>
-0x5A3A	0x8653	# <CJK>
-0x5A3B	0x8656	# <CJK>
-0x5A3C	0x8657	# <CJK>
-0x5A3D	0x8658	# <CJK>
-0x5A3E	0x8659	# <CJK>
-0x5A3F	0x865D	# <CJK>
-0x5A40	0x8660	# <CJK>
-0x5A41	0x8661	# <CJK>
-0x5A42	0x8662	# <CJK>
-0x5A43	0x8663	# <CJK>
-0x5A44	0x8664	# <CJK>
-0x5A45	0x8669	# <CJK>
-0x5A46	0x866C	# <CJK>
-0x5A47	0x866F	# <CJK>
-0x5A48	0x8675	# <CJK>
-0x5A49	0x8676	# <CJK>
-0x5A4A	0x8677	# <CJK>
-0x5A4B	0x867A	# <CJK>
-0x5A4C	0x868D	# <CJK>
-0x5A4D	0x8691	# <CJK>
-0x5A4E	0x8696	# <CJK>
-0x5A4F	0x8698	# <CJK>
-0x5A50	0x869A	# <CJK>
-0x5A51	0x869C	# <CJK>
-0x5A52	0x86A1	# <CJK>
-0x5A53	0x86A6	# <CJK>
-0x5A54	0x86A7	# <CJK>
-0x5A55	0x86A8	# <CJK>
-0x5A56	0x86AD	# <CJK>
-0x5A57	0x86B1	# <CJK>
-0x5A58	0x86B3	# <CJK>
-0x5A59	0x86B4	# <CJK>
-0x5A5A	0x86B5	# <CJK>
-0x5A5B	0x86B7	# <CJK>
-0x5A5C	0x86B8	# <CJK>
-0x5A5D	0x86B9	# <CJK>
-0x5A5E	0x86BF	# <CJK>
-0x5A5F	0x86C0	# <CJK>
-0x5A60	0x86C1	# <CJK>
-0x5A61	0x86C3	# <CJK>
-0x5A62	0x86C5	# <CJK>
-0x5A63	0x86D1	# <CJK>
-0x5A64	0x86D2	# <CJK>
-0x5A65	0x86D5	# <CJK>
-0x5A66	0x86D7	# <CJK>
-0x5A67	0x86DA	# <CJK>
-0x5A68	0x86DC	# <CJK>
-0x5A69	0x86E0	# <CJK>
-0x5A6A	0x86E3	# <CJK>
-0x5A6B	0x86E5	# <CJK>
-0x5A6C	0x86E7	# <CJK>
-0x5A6D	0x8688	# <CJK>
-0x5A6E	0x86FA	# <CJK>
-0x5A6F	0x86FC	# <CJK>
-0x5A70	0x86FD	# <CJK>
-0x5A71	0x8704	# <CJK>
-0x5A72	0x8705	# <CJK>
-0x5A73	0x8707	# <CJK>
-0x5A74	0x870B	# <CJK>
-0x5A75	0x870E	# <CJK>
-0x5A76	0x870F	# <CJK>
-0x5A77	0x8710	# <CJK>
-0x5A78	0x8713	# <CJK>
-0x5A79	0x8714	# <CJK>
-0x5A7A	0x8719	# <CJK>
-0x5A7B	0x871E	# <CJK>
-0x5A7C	0x871F	# <CJK>
-0x5A7D	0x8721	# <CJK>
-0x5A7E	0x8723	# <CJK>
-0x5B21	0x8728	# <CJK>
-0x5B22	0x872E	# <CJK>
-0x5B23	0x872F	# <CJK>
-0x5B24	0x8731	# <CJK>
-0x5B25	0x8732	# <CJK>
-0x5B26	0x8739	# <CJK>
-0x5B27	0x873A	# <CJK>
-0x5B28	0x873C	# <CJK>
-0x5B29	0x873D	# <CJK>
-0x5B2A	0x873E	# <CJK>
-0x5B2B	0x8740	# <CJK>
-0x5B2C	0x8743	# <CJK>
-0x5B2D	0x8745	# <CJK>
-0x5B2E	0x874D	# <CJK>
-0x5B2F	0x8758	# <CJK>
-0x5B30	0x875D	# <CJK>
-0x5B31	0x8761	# <CJK>
-0x5B32	0x8764	# <CJK>
-0x5B33	0x8765	# <CJK>
-0x5B34	0x876F	# <CJK>
-0x5B35	0x8771	# <CJK>
-0x5B36	0x8772	# <CJK>
-0x5B37	0x877B	# <CJK>
-0x5B38	0x8783	# <CJK>
-0x5B39	0x8784	# <CJK>
-0x5B3A	0x8785	# <CJK>
-0x5B3B	0x8786	# <CJK>
-0x5B3C	0x8787	# <CJK>
-0x5B3D	0x8788	# <CJK>
-0x5B3E	0x8789	# <CJK>
-0x5B3F	0x878B	# <CJK>
-0x5B40	0x878C	# <CJK>
-0x5B41	0x8790	# <CJK>
-0x5B42	0x8793	# <CJK>
-0x5B43	0x8795	# <CJK>
-0x5B44	0x8797	# <CJK>
-0x5B45	0x8798	# <CJK>
-0x5B46	0x8799	# <CJK>
-0x5B47	0x879E	# <CJK>
-0x5B48	0x87A0	# <CJK>
-0x5B49	0x87A3	# <CJK>
-0x5B4A	0x87A7	# <CJK>
-0x5B4B	0x87AC	# <CJK>
-0x5B4C	0x87AD	# <CJK>
-0x5B4D	0x87AE	# <CJK>
-0x5B4E	0x87B1	# <CJK>
-0x5B4F	0x87B5	# <CJK>
-0x5B50	0x87BE	# <CJK>
-0x5B51	0x87BF	# <CJK>
-0x5B52	0x87C1	# <CJK>
-0x5B53	0x87C8	# <CJK>
-0x5B54	0x87C9	# <CJK>
-0x5B55	0x87CA	# <CJK>
-0x5B56	0x87CE	# <CJK>
-0x5B57	0x87D5	# <CJK>
-0x5B58	0x87D6	# <CJK>
-0x5B59	0x87D9	# <CJK>
-0x5B5A	0x87DA	# <CJK>
-0x5B5B	0x87DC	# <CJK>
-0x5B5C	0x87DF	# <CJK>
-0x5B5D	0x87E2	# <CJK>
-0x5B5E	0x87E3	# <CJK>
-0x5B5F	0x87E4	# <CJK>
-0x5B60	0x87EA	# <CJK>
-0x5B61	0x87EB	# <CJK>
-0x5B62	0x87ED	# <CJK>
-0x5B63	0x87F1	# <CJK>
-0x5B64	0x87F3	# <CJK>
-0x5B65	0x87F8	# <CJK>
-0x5B66	0x87FA	# <CJK>
-0x5B67	0x87FF	# <CJK>
-0x5B68	0x8801	# <CJK>
-0x5B69	0x8803	# <CJK>
-0x5B6A	0x8806	# <CJK>
-0x5B6B	0x8809	# <CJK>
-0x5B6C	0x880A	# <CJK>
-0x5B6D	0x880B	# <CJK>
-0x5B6E	0x8810	# <CJK>
-0x5B6F	0x8819	# <CJK>
-0x5B70	0x8812	# <CJK>
-0x5B71	0x8813	# <CJK>
-0x5B72	0x8814	# <CJK>
-0x5B73	0x8818	# <CJK>
-0x5B74	0x881A	# <CJK>
-0x5B75	0x881B	# <CJK>
-0x5B76	0x881C	# <CJK>
-0x5B77	0x881E	# <CJK>
-0x5B78	0x881F	# <CJK>
-0x5B79	0x8828	# <CJK>
-0x5B7A	0x882D	# <CJK>
-0x5B7B	0x882E	# <CJK>
-0x5B7C	0x8830	# <CJK>
-0x5B7D	0x8832	# <CJK>
-0x5B7E	0x8835	# <CJK>
-0x5C21	0x883A	# <CJK>
-0x5C22	0x883C	# <CJK>
-0x5C23	0x8841	# <CJK>
-0x5C24	0x8843	# <CJK>
-0x5C25	0x8845	# <CJK>
-0x5C26	0x8848	# <CJK>
-0x5C27	0x8849	# <CJK>
-0x5C28	0x884A	# <CJK>
-0x5C29	0x884B	# <CJK>
-0x5C2A	0x884E	# <CJK>
-0x5C2B	0x8851	# <CJK>
-0x5C2C	0x8855	# <CJK>
-0x5C2D	0x8856	# <CJK>
-0x5C2E	0x8858	# <CJK>
-0x5C2F	0x885A	# <CJK>
-0x5C30	0x885C	# <CJK>
-0x5C31	0x885F	# <CJK>
-0x5C32	0x8860	# <CJK>
-0x5C33	0x8864	# <CJK>
-0x5C34	0x8869	# <CJK>
-0x5C35	0x8871	# <CJK>
-0x5C36	0x8879	# <CJK>
-0x5C37	0x887B	# <CJK>
-0x5C38	0x8880	# <CJK>
-0x5C39	0x8898	# <CJK>
-0x5C3A	0x889A	# <CJK>
-0x5C3B	0x889B	# <CJK>
-0x5C3C	0x889C	# <CJK>
-0x5C3D	0x889F	# <CJK>
-0x5C3E	0x88A0	# <CJK>
-0x5C3F	0x88A8	# <CJK>
-0x5C40	0x88AA	# <CJK>
-0x5C41	0x88BA	# <CJK>
-0x5C42	0x88BD	# <CJK>
-0x5C43	0x88BE	# <CJK>
-0x5C44	0x88C0	# <CJK>
-0x5C45	0x88CA	# <CJK>
-0x5C46	0x88CB	# <CJK>
-0x5C47	0x88CC	# <CJK>
-0x5C48	0x88CD	# <CJK>
-0x5C49	0x88CE	# <CJK>
-0x5C4A	0x88D1	# <CJK>
-0x5C4B	0x88D2	# <CJK>
-0x5C4C	0x88D3	# <CJK>
-0x5C4D	0x88DB	# <CJK>
-0x5C4E	0x88DE	# <CJK>
-0x5C4F	0x88E7	# <CJK>
-0x5C50	0x88EF	# <CJK>
-0x5C51	0x88F0	# <CJK>
-0x5C52	0x88F1	# <CJK>
-0x5C53	0x88F5	# <CJK>
-0x5C54	0x88F7	# <CJK>
-0x5C55	0x8901	# <CJK>
-0x5C56	0x8906	# <CJK>
-0x5C57	0x890D	# <CJK>
-0x5C58	0x890E	# <CJK>
-0x5C59	0x890F	# <CJK>
-0x5C5A	0x8915	# <CJK>
-0x5C5B	0x8916	# <CJK>
-0x5C5C	0x8918	# <CJK>
-0x5C5D	0x8919	# <CJK>
-0x5C5E	0x891A	# <CJK>
-0x5C5F	0x891C	# <CJK>
-0x5C60	0x8920	# <CJK>
-0x5C61	0x8926	# <CJK>
-0x5C62	0x8927	# <CJK>
-0x5C63	0x8928	# <CJK>
-0x5C64	0x8930	# <CJK>
-0x5C65	0x8931	# <CJK>
-0x5C66	0x8932	# <CJK>
-0x5C67	0x8935	# <CJK>
-0x5C68	0x8939	# <CJK>
-0x5C69	0x893A	# <CJK>
-0x5C6A	0x893E	# <CJK>
-0x5C6B	0x8940	# <CJK>
-0x5C6C	0x8942	# <CJK>
-0x5C6D	0x8945	# <CJK>
-0x5C6E	0x8946	# <CJK>
-0x5C6F	0x8949	# <CJK>
-0x5C70	0x894F	# <CJK>
-0x5C71	0x8952	# <CJK>
-0x5C72	0x8957	# <CJK>
-0x5C73	0x895A	# <CJK>
-0x5C74	0x895B	# <CJK>
-0x5C75	0x895C	# <CJK>
-0x5C76	0x8961	# <CJK>
-0x5C77	0x8962	# <CJK>
-0x5C78	0x8963	# <CJK>
-0x5C79	0x896B	# <CJK>
-0x5C7A	0x896E	# <CJK>
-0x5C7B	0x8970	# <CJK>
-0x5C7C	0x8973	# <CJK>
-0x5C7D	0x8975	# <CJK>
-0x5C7E	0x897A	# <CJK>
-0x5D21	0x897B	# <CJK>
-0x5D22	0x897C	# <CJK>
-0x5D23	0x897D	# <CJK>
-0x5D24	0x8989	# <CJK>
-0x5D25	0x898D	# <CJK>
-0x5D26	0x8990	# <CJK>
-0x5D27	0x8994	# <CJK>
-0x5D28	0x8995	# <CJK>
-0x5D29	0x899B	# <CJK>
-0x5D2A	0x899C	# <CJK>
-0x5D2B	0x899F	# <CJK>
-0x5D2C	0x89A0	# <CJK>
-0x5D2D	0x89A5	# <CJK>
-0x5D2E	0x89B0	# <CJK>
-0x5D2F	0x89B4	# <CJK>
-0x5D30	0x89B5	# <CJK>
-0x5D31	0x89B6	# <CJK>
-0x5D32	0x89B7	# <CJK>
-0x5D33	0x89BC	# <CJK>
-0x5D34	0x89D4	# <CJK>
-0x5D35	0x89D5	# <CJK>
-0x5D36	0x89D6	# <CJK>
-0x5D37	0x89D7	# <CJK>
-0x5D38	0x89D8	# <CJK>
-0x5D39	0x89E5	# <CJK>
-0x5D3A	0x89E9	# <CJK>
-0x5D3B	0x89EB	# <CJK>
-0x5D3C	0x89ED	# <CJK>
-0x5D3D	0x89F1	# <CJK>
-0x5D3E	0x89F3	# <CJK>
-0x5D3F	0x89F6	# <CJK>
-0x5D40	0x89F9	# <CJK>
-0x5D41	0x89FD	# <CJK>
-0x5D42	0x89FF	# <CJK>
-0x5D43	0x8A04	# <CJK>
-0x5D44	0x8A05	# <CJK>
-0x5D45	0x8A07	# <CJK>
-0x5D46	0x8A0F	# <CJK>
-0x5D47	0x8A11	# <CJK>
-0x5D48	0x8A12	# <CJK>
-0x5D49	0x8A14	# <CJK>
-0x5D4A	0x8A15	# <CJK>
-0x5D4B	0x8A1E	# <CJK>
-0x5D4C	0x8A20	# <CJK>
-0x5D4D	0x8A22	# <CJK>
-0x5D4E	0x8A24	# <CJK>
-0x5D4F	0x8A26	# <CJK>
-0x5D50	0x8A2B	# <CJK>
-0x5D51	0x8A2C	# <CJK>
-0x5D52	0x8A2F	# <CJK>
-0x5D53	0x8A35	# <CJK>
-0x5D54	0x8A37	# <CJK>
-0x5D55	0x8A3D	# <CJK>
-0x5D56	0x8A3E	# <CJK>
-0x5D57	0x8A40	# <CJK>
-0x5D58	0x8A43	# <CJK>
-0x5D59	0x8A45	# <CJK>
-0x5D5A	0x8A47	# <CJK>
-0x5D5B	0x8A49	# <CJK>
-0x5D5C	0x8A4D	# <CJK>
-0x5D5D	0x8A4E	# <CJK>
-0x5D5E	0x8A53	# <CJK>
-0x5D5F	0x8A56	# <CJK>
-0x5D60	0x8A57	# <CJK>
-0x5D61	0x8A58	# <CJK>
-0x5D62	0x8A5C	# <CJK>
-0x5D63	0x8A5D	# <CJK>
-0x5D64	0x8A61	# <CJK>
-0x5D65	0x8A65	# <CJK>
-0x5D66	0x8A67	# <CJK>
-0x5D67	0x8A75	# <CJK>
-0x5D68	0x8A76	# <CJK>
-0x5D69	0x8A77	# <CJK>
-0x5D6A	0x8A79	# <CJK>
-0x5D6B	0x8A7A	# <CJK>
-0x5D6C	0x8A7B	# <CJK>
-0x5D6D	0x8A7E	# <CJK>
-0x5D6E	0x8A7F	# <CJK>
-0x5D6F	0x8A80	# <CJK>
-0x5D70	0x8A83	# <CJK>
-0x5D71	0x8A86	# <CJK>
-0x5D72	0x8A8B	# <CJK>
-0x5D73	0x8A8F	# <CJK>
-0x5D74	0x8A90	# <CJK>
-0x5D75	0x8A92	# <CJK>
-0x5D76	0x8A96	# <CJK>
-0x5D77	0x8A97	# <CJK>
-0x5D78	0x8A99	# <CJK>
-0x5D79	0x8A9F	# <CJK>
-0x5D7A	0x8AA7	# <CJK>
-0x5D7B	0x8AA9	# <CJK>
-0x5D7C	0x8AAE	# <CJK>
-0x5D7D	0x8AAF	# <CJK>
-0x5D7E	0x8AB3	# <CJK>
-0x5E21	0x8AB6	# <CJK>
-0x5E22	0x8AB7	# <CJK>
-0x5E23	0x8ABB	# <CJK>
-0x5E24	0x8ABE	# <CJK>
-0x5E25	0x8AC3	# <CJK>
-0x5E26	0x8AC6	# <CJK>
-0x5E27	0x8AC8	# <CJK>
-0x5E28	0x8AC9	# <CJK>
-0x5E29	0x8ACA	# <CJK>
-0x5E2A	0x8AD1	# <CJK>
-0x5E2B	0x8AD3	# <CJK>
-0x5E2C	0x8AD4	# <CJK>
-0x5E2D	0x8AD5	# <CJK>
-0x5E2E	0x8AD7	# <CJK>
-0x5E2F	0x8ADD	# <CJK>
-0x5E30	0x8ADF	# <CJK>
-0x5E31	0x8AEC	# <CJK>
-0x5E32	0x8AF0	# <CJK>
-0x5E33	0x8AF4	# <CJK>
-0x5E34	0x8AF5	# <CJK>
-0x5E35	0x8AF6	# <CJK>
-0x5E36	0x8AFC	# <CJK>
-0x5E37	0x8AFF	# <CJK>
-0x5E38	0x8B05	# <CJK>
-0x5E39	0x8B06	# <CJK>
-0x5E3A	0x8B0B	# <CJK>
-0x5E3B	0x8B11	# <CJK>
-0x5E3C	0x8B1C	# <CJK>
-0x5E3D	0x8B1E	# <CJK>
-0x5E3E	0x8B1F	# <CJK>
-0x5E3F	0x8B0A	# <CJK>
-0x5E40	0x8B2D	# <CJK>
-0x5E41	0x8B30	# <CJK>
-0x5E42	0x8B37	# <CJK>
-0x5E43	0x8B3C	# <CJK>
-0x5E44	0x8B42	# <CJK>
-0x5E45	0x8B43	# <CJK>
-0x5E46	0x8B44	# <CJK>
-0x5E47	0x8B45	# <CJK>
-0x5E48	0x8B46	# <CJK>
-0x5E49	0x8B48	# <CJK>
-0x5E4A	0x8B52	# <CJK>
-0x5E4B	0x8B53	# <CJK>
-0x5E4C	0x8B54	# <CJK>
-0x5E4D	0x8B59	# <CJK>
-0x5E4E	0x8B4D	# <CJK>
-0x5E4F	0x8B5E	# <CJK>
-0x5E50	0x8B63	# <CJK>
-0x5E51	0x8B6D	# <CJK>
-0x5E52	0x8B76	# <CJK>
-0x5E53	0x8B78	# <CJK>
-0x5E54	0x8B79	# <CJK>
-0x5E55	0x8B7C	# <CJK>
-0x5E56	0x8B7E	# <CJK>
-0x5E57	0x8B81	# <CJK>
-0x5E58	0x8B84	# <CJK>
-0x5E59	0x8B85	# <CJK>
-0x5E5A	0x8B8B	# <CJK>
-0x5E5B	0x8B8D	# <CJK>
-0x5E5C	0x8B8F	# <CJK>
-0x5E5D	0x8B94	# <CJK>
-0x5E5E	0x8B95	# <CJK>
-0x5E5F	0x8B9C	# <CJK>
-0x5E60	0x8B9E	# <CJK>
-0x5E61	0x8B9F	# <CJK>
-0x5E62	0x8C38	# <CJK>
-0x5E63	0x8C39	# <CJK>
-0x5E64	0x8C3D	# <CJK>
-0x5E65	0x8C3E	# <CJK>
-0x5E66	0x8C45	# <CJK>
-0x5E67	0x8C47	# <CJK>
-0x5E68	0x8C49	# <CJK>
-0x5E69	0x8C4B	# <CJK>
-0x5E6A	0x8C4F	# <CJK>
-0x5E6B	0x8C51	# <CJK>
-0x5E6C	0x8C53	# <CJK>
-0x5E6D	0x8C54	# <CJK>
-0x5E6E	0x8C57	# <CJK>
-0x5E6F	0x8C58	# <CJK>
-0x5E70	0x8C5B	# <CJK>
-0x5E71	0x8C5D	# <CJK>
-0x5E72	0x8C59	# <CJK>
-0x5E73	0x8C63	# <CJK>
-0x5E74	0x8C64	# <CJK>
-0x5E75	0x8C66	# <CJK>
-0x5E76	0x8C68	# <CJK>
-0x5E77	0x8C69	# <CJK>
-0x5E78	0x8C6D	# <CJK>
-0x5E79	0x8C73	# <CJK>
-0x5E7A	0x8C75	# <CJK>
-0x5E7B	0x8C76	# <CJK>
-0x5E7C	0x8C7B	# <CJK>
-0x5E7D	0x8C7E	# <CJK>
-0x5E7E	0x8C86	# <CJK>
-0x5F21	0x8C87	# <CJK>
-0x5F22	0x8C8B	# <CJK>
-0x5F23	0x8C90	# <CJK>
-0x5F24	0x8C92	# <CJK>
-0x5F25	0x8C93	# <CJK>
-0x5F26	0x8C99	# <CJK>
-0x5F27	0x8C9B	# <CJK>
-0x5F28	0x8C9C	# <CJK>
-0x5F29	0x8CA4	# <CJK>
-0x5F2A	0x8CB9	# <CJK>
-0x5F2B	0x8CBA	# <CJK>
-0x5F2C	0x8CC5	# <CJK>
-0x5F2D	0x8CC6	# <CJK>
-0x5F2E	0x8CC9	# <CJK>
-0x5F2F	0x8CCB	# <CJK>
-0x5F30	0x8CCF	# <CJK>
-0x5F31	0x8CD6	# <CJK>
-0x5F32	0x8CD5	# <CJK>
-0x5F33	0x8CD9	# <CJK>
-0x5F34	0x8CDD	# <CJK>
-0x5F35	0x8CE1	# <CJK>
-0x5F36	0x8CE8	# <CJK>
-0x5F37	0x8CEC	# <CJK>
-0x5F38	0x8CEF	# <CJK>
-0x5F39	0x8CF0	# <CJK>
-0x5F3A	0x8CF2	# <CJK>
-0x5F3B	0x8CF5	# <CJK>
-0x5F3C	0x8CF7	# <CJK>
-0x5F3D	0x8CF8	# <CJK>
-0x5F3E	0x8CFE	# <CJK>
-0x5F3F	0x8CFF	# <CJK>
-0x5F40	0x8D01	# <CJK>
-0x5F41	0x8D03	# <CJK>
-0x5F42	0x8D09	# <CJK>
-0x5F43	0x8D12	# <CJK>
-0x5F44	0x8D17	# <CJK>
-0x5F45	0x8D1B	# <CJK>
-0x5F46	0x8D65	# <CJK>
-0x5F47	0x8D69	# <CJK>
-0x5F48	0x8D6C	# <CJK>
-0x5F49	0x8D6E	# <CJK>
-0x5F4A	0x8D7F	# <CJK>
-0x5F4B	0x8D82	# <CJK>
-0x5F4C	0x8D84	# <CJK>
-0x5F4D	0x8D88	# <CJK>
-0x5F4E	0x8D8D	# <CJK>
-0x5F4F	0x8D90	# <CJK>
-0x5F50	0x8D91	# <CJK>
-0x5F51	0x8D95	# <CJK>
-0x5F52	0x8D9E	# <CJK>
-0x5F53	0x8D9F	# <CJK>
-0x5F54	0x8DA0	# <CJK>
-0x5F55	0x8DA6	# <CJK>
-0x5F56	0x8DAB	# <CJK>
-0x5F57	0x8DAC	# <CJK>
-0x5F58	0x8DAF	# <CJK>
-0x5F59	0x8DB2	# <CJK>
-0x5F5A	0x8DB5	# <CJK>
-0x5F5B	0x8DB7	# <CJK>
-0x5F5C	0x8DB9	# <CJK>
-0x5F5D	0x8DBB	# <CJK>
-0x5F5E	0x8DC0	# <CJK>
-0x5F5F	0x8DC5	# <CJK>
-0x5F60	0x8DC6	# <CJK>
-0x5F61	0x8DC7	# <CJK>
-0x5F62	0x8DC8	# <CJK>
-0x5F63	0x8DCA	# <CJK>
-0x5F64	0x8DCE	# <CJK>
-0x5F65	0x8DD1	# <CJK>
-0x5F66	0x8DD4	# <CJK>
-0x5F67	0x8DD5	# <CJK>
-0x5F68	0x8DD7	# <CJK>
-0x5F69	0x8DD9	# <CJK>
-0x5F6A	0x8DE4	# <CJK>
-0x5F6B	0x8DE5	# <CJK>
-0x5F6C	0x8DE7	# <CJK>
-0x5F6D	0x8DEC	# <CJK>
-0x5F6E	0x8DF0	# <CJK>
-0x5F6F	0x8DBC	# <CJK>
-0x5F70	0x8DF1	# <CJK>
-0x5F71	0x8DF2	# <CJK>
-0x5F72	0x8DF4	# <CJK>
-0x5F73	0x8DFD	# <CJK>
-0x5F74	0x8E01	# <CJK>
-0x5F75	0x8E04	# <CJK>
-0x5F76	0x8E05	# <CJK>
-0x5F77	0x8E06	# <CJK>
-0x5F78	0x8E0B	# <CJK>
-0x5F79	0x8E11	# <CJK>
-0x5F7A	0x8E14	# <CJK>
-0x5F7B	0x8E16	# <CJK>
-0x5F7C	0x8E20	# <CJK>
-0x5F7D	0x8E21	# <CJK>
-0x5F7E	0x8E22	# <CJK>
-0x6021	0x8E23	# <CJK>
-0x6022	0x8E26	# <CJK>
-0x6023	0x8E27	# <CJK>
-0x6024	0x8E31	# <CJK>
-0x6025	0x8E33	# <CJK>
-0x6026	0x8E36	# <CJK>
-0x6027	0x8E37	# <CJK>
-0x6028	0x8E38	# <CJK>
-0x6029	0x8E39	# <CJK>
-0x602A	0x8E3D	# <CJK>
-0x602B	0x8E40	# <CJK>
-0x602C	0x8E41	# <CJK>
-0x602D	0x8E4B	# <CJK>
-0x602E	0x8E4D	# <CJK>
-0x602F	0x8E4E	# <CJK>
-0x6030	0x8E4F	# <CJK>
-0x6031	0x8E54	# <CJK>
-0x6032	0x8E5B	# <CJK>
-0x6033	0x8E5C	# <CJK>
-0x6034	0x8E5D	# <CJK>
-0x6035	0x8E5E	# <CJK>
-0x6036	0x8E61	# <CJK>
-0x6037	0x8E62	# <CJK>
-0x6038	0x8E69	# <CJK>
-0x6039	0x8E6C	# <CJK>
-0x603A	0x8E6D	# <CJK>
-0x603B	0x8E6F	# <CJK>
-0x603C	0x8E70	# <CJK>
-0x603D	0x8E71	# <CJK>
-0x603E	0x8E79	# <CJK>
-0x603F	0x8E7A	# <CJK>
-0x6040	0x8E7B	# <CJK>
-0x6041	0x8E82	# <CJK>
-0x6042	0x8E83	# <CJK>
-0x6043	0x8E89	# <CJK>
-0x6044	0x8E90	# <CJK>
-0x6045	0x8E92	# <CJK>
-0x6046	0x8E95	# <CJK>
-0x6047	0x8E9A	# <CJK>
-0x6048	0x8E9B	# <CJK>
-0x6049	0x8E9D	# <CJK>
-0x604A	0x8E9E	# <CJK>
-0x604B	0x8EA2	# <CJK>
-0x604C	0x8EA7	# <CJK>
-0x604D	0x8EA9	# <CJK>
-0x604E	0x8EAD	# <CJK>
-0x604F	0x8EAE	# <CJK>
-0x6050	0x8EB3	# <CJK>
-0x6051	0x8EB5	# <CJK>
-0x6052	0x8EBA	# <CJK>
-0x6053	0x8EBB	# <CJK>
-0x6054	0x8EC0	# <CJK>
-0x6055	0x8EC1	# <CJK>
-0x6056	0x8EC3	# <CJK>
-0x6057	0x8EC4	# <CJK>
-0x6058	0x8EC7	# <CJK>
-0x6059	0x8ECF	# <CJK>
-0x605A	0x8ED1	# <CJK>
-0x605B	0x8ED4	# <CJK>
-0x605C	0x8EDC	# <CJK>
-0x605D	0x8EE8	# <CJK>
-0x605E	0x8EEE	# <CJK>
-0x605F	0x8EF0	# <CJK>
-0x6060	0x8EF1	# <CJK>
-0x6061	0x8EF7	# <CJK>
-0x6062	0x8EF9	# <CJK>
-0x6063	0x8EFA	# <CJK>
-0x6064	0x8EED	# <CJK>
-0x6065	0x8F00	# <CJK>
-0x6066	0x8F02	# <CJK>
-0x6067	0x8F07	# <CJK>
-0x6068	0x8F08	# <CJK>
-0x6069	0x8F0F	# <CJK>
-0x606A	0x8F10	# <CJK>
-0x606B	0x8F16	# <CJK>
-0x606C	0x8F17	# <CJK>
-0x606D	0x8F18	# <CJK>
-0x606E	0x8F1E	# <CJK>
-0x606F	0x8F20	# <CJK>
-0x6070	0x8F21	# <CJK>
-0x6071	0x8F23	# <CJK>
-0x6072	0x8F25	# <CJK>
-0x6073	0x8F27	# <CJK>
-0x6074	0x8F28	# <CJK>
-0x6075	0x8F2C	# <CJK>
-0x6076	0x8F2D	# <CJK>
-0x6077	0x8F2E	# <CJK>
-0x6078	0x8F34	# <CJK>
-0x6079	0x8F35	# <CJK>
-0x607A	0x8F36	# <CJK>
-0x607B	0x8F37	# <CJK>
-0x607C	0x8F3A	# <CJK>
-0x607D	0x8F40	# <CJK>
-0x607E	0x8F41	# <CJK>
-0x6121	0x8F43	# <CJK>
-0x6122	0x8F47	# <CJK>
-0x6123	0x8F4F	# <CJK>
-0x6124	0x8F51	# <CJK>
-0x6125	0x8F52	# <CJK>
-0x6126	0x8F53	# <CJK>
-0x6127	0x8F54	# <CJK>
-0x6128	0x8F55	# <CJK>
-0x6129	0x8F58	# <CJK>
-0x612A	0x8F5D	# <CJK>
-0x612B	0x8F5E	# <CJK>
-0x612C	0x8F65	# <CJK>
-0x612D	0x8F9D	# <CJK>
-0x612E	0x8FA0	# <CJK>
-0x612F	0x8FA1	# <CJK>
-0x6130	0x8FA4	# <CJK>
-0x6131	0x8FA5	# <CJK>
-0x6132	0x8FA6	# <CJK>
-0x6133	0x8FB5	# <CJK>
-0x6134	0x8FB6	# <CJK>
-0x6135	0x8FB8	# <CJK>
-0x6136	0x8FBE	# <CJK>
-0x6137	0x8FC0	# <CJK>
-0x6138	0x8FC1	# <CJK>
-0x6139	0x8FC6	# <CJK>
-0x613A	0x8FCA	# <CJK>
-0x613B	0x8FCB	# <CJK>
-0x613C	0x8FCD	# <CJK>
-0x613D	0x8FD0	# <CJK>
-0x613E	0x8FD2	# <CJK>
-0x613F	0x8FD3	# <CJK>
-0x6140	0x8FD5	# <CJK>
-0x6141	0x8FE0	# <CJK>
-0x6142	0x8FE3	# <CJK>
-0x6143	0x8FE4	# <CJK>
-0x6144	0x8FE8	# <CJK>
-0x6145	0x8FEE	# <CJK>
-0x6146	0x8FF1	# <CJK>
-0x6147	0x8FF5	# <CJK>
-0x6148	0x8FF6	# <CJK>
-0x6149	0x8FFB	# <CJK>
-0x614A	0x8FFE	# <CJK>
-0x614B	0x9002	# <CJK>
-0x614C	0x9004	# <CJK>
-0x614D	0x9008	# <CJK>
-0x614E	0x900C	# <CJK>
-0x614F	0x9018	# <CJK>
-0x6150	0x901B	# <CJK>
-0x6151	0x9028	# <CJK>
-0x6152	0x9029	# <CJK>
-0x6153	0x902F	# <CJK>
-0x6154	0x902A	# <CJK>
-0x6155	0x902C	# <CJK>
-0x6156	0x902D	# <CJK>
-0x6157	0x9033	# <CJK>
-0x6158	0x9034	# <CJK>
-0x6159	0x9037	# <CJK>
-0x615A	0x903F	# <CJK>
-0x615B	0x9043	# <CJK>
-0x615C	0x9044	# <CJK>
-0x615D	0x904C	# <CJK>
-0x615E	0x905B	# <CJK>
-0x615F	0x905D	# <CJK>
-0x6160	0x9062	# <CJK>
-0x6161	0x9066	# <CJK>
-0x6162	0x9067	# <CJK>
-0x6163	0x906C	# <CJK>
-0x6164	0x9070	# <CJK>
-0x6165	0x9074	# <CJK>
-0x6166	0x9079	# <CJK>
-0x6167	0x9085	# <CJK>
-0x6168	0x9088	# <CJK>
-0x6169	0x908B	# <CJK>
-0x616A	0x908C	# <CJK>
-0x616B	0x908E	# <CJK>
-0x616C	0x9090	# <CJK>
-0x616D	0x9095	# <CJK>
-0x616E	0x9097	# <CJK>
-0x616F	0x9098	# <CJK>
-0x6170	0x9099	# <CJK>
-0x6171	0x909B	# <CJK>
-0x6172	0x90A0	# <CJK>
-0x6173	0x90A1	# <CJK>
-0x6174	0x90A2	# <CJK>
-0x6175	0x90A5	# <CJK>
-0x6176	0x90B0	# <CJK>
-0x6177	0x90B2	# <CJK>
-0x6178	0x90B3	# <CJK>
-0x6179	0x90B4	# <CJK>
-0x617A	0x90B6	# <CJK>
-0x617B	0x90BD	# <CJK>
-0x617C	0x90CC	# <CJK>
-0x617D	0x90BE	# <CJK>
-0x617E	0x90C3	# <CJK>
-0x6221	0x90C4	# <CJK>
-0x6222	0x90C5	# <CJK>
-0x6223	0x90C7	# <CJK>
-0x6224	0x90C8	# <CJK>
-0x6225	0x90D5	# <CJK>
-0x6226	0x90D7	# <CJK>
-0x6227	0x90D8	# <CJK>
-0x6228	0x90D9	# <CJK>
-0x6229	0x90DC	# <CJK>
-0x622A	0x90DD	# <CJK>
-0x622B	0x90DF	# <CJK>
-0x622C	0x90E5	# <CJK>
-0x622D	0x90D2	# <CJK>
-0x622E	0x90F6	# <CJK>
-0x622F	0x90EB	# <CJK>
-0x6230	0x90EF	# <CJK>
-0x6231	0x90F0	# <CJK>
-0x6232	0x90F4	# <CJK>
-0x6233	0x90FE	# <CJK>
-0x6234	0x90FF	# <CJK>
-0x6235	0x9100	# <CJK>
-0x6236	0x9104	# <CJK>
-0x6237	0x9105	# <CJK>
-0x6238	0x9106	# <CJK>
-0x6239	0x9108	# <CJK>
-0x623A	0x910D	# <CJK>
-0x623B	0x9110	# <CJK>
-0x623C	0x9114	# <CJK>
-0x623D	0x9116	# <CJK>
-0x623E	0x9117	# <CJK>
-0x623F	0x9118	# <CJK>
-0x6240	0x911A	# <CJK>
-0x6241	0x911C	# <CJK>
-0x6242	0x911E	# <CJK>
-0x6243	0x9120	# <CJK>
-0x6244	0x9125	# <CJK>
-0x6245	0x9122	# <CJK>
-0x6246	0x9123	# <CJK>
-0x6247	0x9127	# <CJK>
-0x6248	0x9129	# <CJK>
-0x6249	0x912E	# <CJK>
-0x624A	0x912F	# <CJK>
-0x624B	0x9131	# <CJK>
-0x624C	0x9134	# <CJK>
-0x624D	0x9136	# <CJK>
-0x624E	0x9137	# <CJK>
-0x624F	0x9139	# <CJK>
-0x6250	0x913A	# <CJK>
-0x6251	0x913C	# <CJK>
-0x6252	0x913D	# <CJK>
-0x6253	0x9143	# <CJK>
-0x6254	0x9147	# <CJK>
-0x6255	0x9148	# <CJK>
-0x6256	0x914F	# <CJK>
-0x6257	0x9153	# <CJK>
-0x6258	0x9157	# <CJK>
-0x6259	0x9159	# <CJK>
-0x625A	0x915A	# <CJK>
-0x625B	0x915B	# <CJK>
-0x625C	0x9161	# <CJK>
-0x625D	0x9164	# <CJK>
-0x625E	0x9167	# <CJK>
-0x625F	0x916D	# <CJK>
-0x6260	0x9174	# <CJK>
-0x6261	0x9179	# <CJK>
-0x6262	0x917A	# <CJK>
-0x6263	0x917B	# <CJK>
-0x6264	0x9181	# <CJK>
-0x6265	0x9183	# <CJK>
-0x6266	0x9185	# <CJK>
-0x6267	0x9186	# <CJK>
-0x6268	0x918A	# <CJK>
-0x6269	0x918E	# <CJK>
-0x626A	0x9191	# <CJK>
-0x626B	0x9193	# <CJK>
-0x626C	0x9194	# <CJK>
-0x626D	0x9195	# <CJK>
-0x626E	0x9198	# <CJK>
-0x626F	0x919E	# <CJK>
-0x6270	0x91A1	# <CJK>
-0x6271	0x91A6	# <CJK>
-0x6272	0x91A8	# <CJK>
-0x6273	0x91AC	# <CJK>
-0x6274	0x91AD	# <CJK>
-0x6275	0x91AE	# <CJK>
-0x6276	0x91B0	# <CJK>
-0x6277	0x91B1	# <CJK>
-0x6278	0x91B2	# <CJK>
-0x6279	0x91B3	# <CJK>
-0x627A	0x91B6	# <CJK>
-0x627B	0x91BB	# <CJK>
-0x627C	0x91BC	# <CJK>
-0x627D	0x91BD	# <CJK>
-0x627E	0x91BF	# <CJK>
-0x6321	0x91C2	# <CJK>
-0x6322	0x91C3	# <CJK>
-0x6323	0x91C5	# <CJK>
-0x6324	0x91D3	# <CJK>
-0x6325	0x91D4	# <CJK>
-0x6326	0x91D7	# <CJK>
-0x6327	0x91D9	# <CJK>
-0x6328	0x91DA	# <CJK>
-0x6329	0x91DE	# <CJK>
-0x632A	0x91E4	# <CJK>
-0x632B	0x91E5	# <CJK>
-0x632C	0x91E9	# <CJK>
-0x632D	0x91EA	# <CJK>
-0x632E	0x91EC	# <CJK>
-0x632F	0x91ED	# <CJK>
-0x6330	0x91EE	# <CJK>
-0x6331	0x91EF	# <CJK>
-0x6332	0x91F0	# <CJK>
-0x6333	0x91F1	# <CJK>
-0x6334	0x91F7	# <CJK>
-0x6335	0x91F9	# <CJK>
-0x6336	0x91FB	# <CJK>
-0x6337	0x91FD	# <CJK>
-0x6338	0x9200	# <CJK>
-0x6339	0x9201	# <CJK>
-0x633A	0x9204	# <CJK>
-0x633B	0x9205	# <CJK>
-0x633C	0x9206	# <CJK>
-0x633D	0x9207	# <CJK>
-0x633E	0x9209	# <CJK>
-0x633F	0x920A	# <CJK>
-0x6340	0x920C	# <CJK>
-0x6341	0x9210	# <CJK>
-0x6342	0x9212	# <CJK>
-0x6343	0x9213	# <CJK>
-0x6344	0x9216	# <CJK>
-0x6345	0x9218	# <CJK>
-0x6346	0x921C	# <CJK>
-0x6347	0x921D	# <CJK>
-0x6348	0x9223	# <CJK>
-0x6349	0x9224	# <CJK>
-0x634A	0x9225	# <CJK>
-0x634B	0x9226	# <CJK>
-0x634C	0x9228	# <CJK>
-0x634D	0x922E	# <CJK>
-0x634E	0x922F	# <CJK>
-0x634F	0x9230	# <CJK>
-0x6350	0x9233	# <CJK>
-0x6351	0x9235	# <CJK>
-0x6352	0x9236	# <CJK>
-0x6353	0x9238	# <CJK>
-0x6354	0x9239	# <CJK>
-0x6355	0x923A	# <CJK>
-0x6356	0x923C	# <CJK>
-0x6357	0x923E	# <CJK>
-0x6358	0x9240	# <CJK>
-0x6359	0x9242	# <CJK>
-0x635A	0x9243	# <CJK>
-0x635B	0x9246	# <CJK>
-0x635C	0x9247	# <CJK>
-0x635D	0x924A	# <CJK>
-0x635E	0x924D	# <CJK>
-0x635F	0x924E	# <CJK>
-0x6360	0x924F	# <CJK>
-0x6361	0x9251	# <CJK>
-0x6362	0x9258	# <CJK>
-0x6363	0x9259	# <CJK>
-0x6364	0x925C	# <CJK>
-0x6365	0x925D	# <CJK>
-0x6366	0x9260	# <CJK>
-0x6367	0x9261	# <CJK>
-0x6368	0x9265	# <CJK>
-0x6369	0x9267	# <CJK>
-0x636A	0x9268	# <CJK>
-0x636B	0x9269	# <CJK>
-0x636C	0x926E	# <CJK>
-0x636D	0x926F	# <CJK>
-0x636E	0x9270	# <CJK>
-0x636F	0x9275	# <CJK>
-0x6370	0x9276	# <CJK>
-0x6371	0x9277	# <CJK>
-0x6372	0x9278	# <CJK>
-0x6373	0x9279	# <CJK>
-0x6374	0x927B	# <CJK>
-0x6375	0x927C	# <CJK>
-0x6376	0x927D	# <CJK>
-0x6377	0x927F	# <CJK>
-0x6378	0x9288	# <CJK>
-0x6379	0x9289	# <CJK>
-0x637A	0x928A	# <CJK>
-0x637B	0x928D	# <CJK>
-0x637C	0x928E	# <CJK>
-0x637D	0x9292	# <CJK>
-0x637E	0x9297	# <CJK>
-0x6421	0x9299	# <CJK>
-0x6422	0x929F	# <CJK>
-0x6423	0x92A0	# <CJK>
-0x6424	0x92A4	# <CJK>
-0x6425	0x92A5	# <CJK>
-0x6426	0x92A7	# <CJK>
-0x6427	0x92A8	# <CJK>
-0x6428	0x92AB	# <CJK>
-0x6429	0x92AF	# <CJK>
-0x642A	0x92B2	# <CJK>
-0x642B	0x92B6	# <CJK>
-0x642C	0x92B8	# <CJK>
-0x642D	0x92BA	# <CJK>
-0x642E	0x92BB	# <CJK>
-0x642F	0x92BC	# <CJK>
-0x6430	0x92BD	# <CJK>
-0x6431	0x92BF	# <CJK>
-0x6432	0x92C0	# <CJK>
-0x6433	0x92C1	# <CJK>
-0x6434	0x92C2	# <CJK>
-0x6435	0x92C3	# <CJK>
-0x6436	0x92C5	# <CJK>
-0x6437	0x92C6	# <CJK>
-0x6438	0x92C7	# <CJK>
-0x6439	0x92C8	# <CJK>
-0x643A	0x92CB	# <CJK>
-0x643B	0x92CC	# <CJK>
-0x643C	0x92CD	# <CJK>
-0x643D	0x92CE	# <CJK>
-0x643E	0x92D0	# <CJK>
-0x643F	0x92D3	# <CJK>
-0x6440	0x92D5	# <CJK>
-0x6441	0x92D7	# <CJK>
-0x6442	0x92D8	# <CJK>
-0x6443	0x92D9	# <CJK>
-0x6444	0x92DC	# <CJK>
-0x6445	0x92DD	# <CJK>
-0x6446	0x92DF	# <CJK>
-0x6447	0x92E0	# <CJK>
-0x6448	0x92E1	# <CJK>
-0x6449	0x92E3	# <CJK>
-0x644A	0x92E5	# <CJK>
-0x644B	0x92E7	# <CJK>
-0x644C	0x92E8	# <CJK>
-0x644D	0x92EC	# <CJK>
-0x644E	0x92EE	# <CJK>
-0x644F	0x92F0	# <CJK>
-0x6450	0x92F9	# <CJK>
-0x6451	0x92FB	# <CJK>
-0x6452	0x92FF	# <CJK>
-0x6453	0x9300	# <CJK>
-0x6454	0x9302	# <CJK>
-0x6455	0x9308	# <CJK>
-0x6456	0x930D	# <CJK>
-0x6457	0x9311	# <CJK>
-0x6458	0x9314	# <CJK>
-0x6459	0x9315	# <CJK>
-0x645A	0x931C	# <CJK>
-0x645B	0x931D	# <CJK>
-0x645C	0x931E	# <CJK>
-0x645D	0x931F	# <CJK>
-0x645E	0x9321	# <CJK>
-0x645F	0x9324	# <CJK>
-0x6460	0x9325	# <CJK>
-0x6461	0x9327	# <CJK>
-0x6462	0x9329	# <CJK>
-0x6463	0x932A	# <CJK>
-0x6464	0x9333	# <CJK>
-0x6465	0x9334	# <CJK>
-0x6466	0x9336	# <CJK>
-0x6467	0x9337	# <CJK>
-0x6468	0x9347	# <CJK>
-0x6469	0x9348	# <CJK>
-0x646A	0x9349	# <CJK>
-0x646B	0x9350	# <CJK>
-0x646C	0x9351	# <CJK>
-0x646D	0x9352	# <CJK>
-0x646E	0x9355	# <CJK>
-0x646F	0x9357	# <CJK>
-0x6470	0x9358	# <CJK>
-0x6471	0x935A	# <CJK>
-0x6472	0x935E	# <CJK>
-0x6473	0x9364	# <CJK>
-0x6474	0x9365	# <CJK>
-0x6475	0x9367	# <CJK>
-0x6476	0x9369	# <CJK>
-0x6477	0x936A	# <CJK>
-0x6478	0x936D	# <CJK>
-0x6479	0x936F	# <CJK>
-0x647A	0x9370	# <CJK>
-0x647B	0x9371	# <CJK>
-0x647C	0x9373	# <CJK>
-0x647D	0x9374	# <CJK>
-0x647E	0x9376	# <CJK>
-0x6521	0x937A	# <CJK>
-0x6522	0x937D	# <CJK>
-0x6523	0x937F	# <CJK>
-0x6524	0x9380	# <CJK>
-0x6525	0x9381	# <CJK>
-0x6526	0x9382	# <CJK>
-0x6527	0x9388	# <CJK>
-0x6528	0x938A	# <CJK>
-0x6529	0x938B	# <CJK>
-0x652A	0x938D	# <CJK>
-0x652B	0x938F	# <CJK>
-0x652C	0x9392	# <CJK>
-0x652D	0x9395	# <CJK>
-0x652E	0x9398	# <CJK>
-0x652F	0x939B	# <CJK>
-0x6530	0x939E	# <CJK>
-0x6531	0x93A1	# <CJK>
-0x6532	0x93A3	# <CJK>
-0x6533	0x93A4	# <CJK>
-0x6534	0x93A6	# <CJK>
-0x6535	0x93A8	# <CJK>
-0x6536	0x93AB	# <CJK>
-0x6537	0x93B4	# <CJK>
-0x6538	0x93B5	# <CJK>
-0x6539	0x93B6	# <CJK>
-0x653A	0x93BA	# <CJK>
-0x653B	0x93A9	# <CJK>
-0x653C	0x93C1	# <CJK>
-0x653D	0x93C4	# <CJK>
-0x653E	0x93C5	# <CJK>
-0x653F	0x93C6	# <CJK>
-0x6540	0x93C7	# <CJK>
-0x6541	0x93C9	# <CJK>
-0x6542	0x93CA	# <CJK>
-0x6543	0x93CB	# <CJK>
-0x6544	0x93CC	# <CJK>
-0x6545	0x93CD	# <CJK>
-0x6546	0x93D3	# <CJK>
-0x6547	0x93D9	# <CJK>
-0x6548	0x93DC	# <CJK>
-0x6549	0x93DE	# <CJK>
-0x654A	0x93DF	# <CJK>
-0x654B	0x93E2	# <CJK>
-0x654C	0x93E6	# <CJK>
-0x654D	0x93E7	# <CJK>
-0x654E	0x93F9	# <CJK>
-0x654F	0x93F7	# <CJK>
-0x6550	0x93F8	# <CJK>
-0x6551	0x93FA	# <CJK>
-0x6552	0x93FB	# <CJK>
-0x6553	0x93FD	# <CJK>
-0x6554	0x9401	# <CJK>
-0x6555	0x9402	# <CJK>
-0x6556	0x9404	# <CJK>
-0x6557	0x9408	# <CJK>
-0x6558	0x9409	# <CJK>
-0x6559	0x940D	# <CJK>
-0x655A	0x940E	# <CJK>
-0x655B	0x940F	# <CJK>
-0x655C	0x9415	# <CJK>
-0x655D	0x9416	# <CJK>
-0x655E	0x9417	# <CJK>
-0x655F	0x941F	# <CJK>
-0x6560	0x942E	# <CJK>
-0x6561	0x942F	# <CJK>
-0x6562	0x9431	# <CJK>
-0x6563	0x9432	# <CJK>
-0x6564	0x9433	# <CJK>
-0x6565	0x9434	# <CJK>
-0x6566	0x943B	# <CJK>
-0x6567	0x943F	# <CJK>
-0x6568	0x943D	# <CJK>
-0x6569	0x9443	# <CJK>
-0x656A	0x9445	# <CJK>
-0x656B	0x9448	# <CJK>
-0x656C	0x944A	# <CJK>
-0x656D	0x944C	# <CJK>
-0x656E	0x9455	# <CJK>
-0x656F	0x9459	# <CJK>
-0x6570	0x945C	# <CJK>
-0x6571	0x945F	# <CJK>
-0x6572	0x9461	# <CJK>
-0x6573	0x9463	# <CJK>
-0x6574	0x9468	# <CJK>
-0x6575	0x946B	# <CJK>
-0x6576	0x946D	# <CJK>
-0x6577	0x946E	# <CJK>
-0x6578	0x946F	# <CJK>
-0x6579	0x9471	# <CJK>
-0x657A	0x9472	# <CJK>
-0x657B	0x9484	# <CJK>
-0x657C	0x9483	# <CJK>
-0x657D	0x9578	# <CJK>
-0x657E	0x9579	# <CJK>
-0x6621	0x957E	# <CJK>
-0x6622	0x9584	# <CJK>
-0x6623	0x9588	# <CJK>
-0x6624	0x958C	# <CJK>
-0x6625	0x958D	# <CJK>
-0x6626	0x958E	# <CJK>
-0x6627	0x959D	# <CJK>
-0x6628	0x959E	# <CJK>
-0x6629	0x959F	# <CJK>
-0x662A	0x95A1	# <CJK>
-0x662B	0x95A6	# <CJK>
-0x662C	0x95A9	# <CJK>
-0x662D	0x95AB	# <CJK>
-0x662E	0x95AC	# <CJK>
-0x662F	0x95B4	# <CJK>
-0x6630	0x95B6	# <CJK>
-0x6631	0x95BA	# <CJK>
-0x6632	0x95BD	# <CJK>
-0x6633	0x95BF	# <CJK>
-0x6634	0x95C6	# <CJK>
-0x6635	0x95C8	# <CJK>
-0x6636	0x95C9	# <CJK>
-0x6637	0x95CB	# <CJK>
-0x6638	0x95D0	# <CJK>
-0x6639	0x95D1	# <CJK>
-0x663A	0x95D2	# <CJK>
-0x663B	0x95D3	# <CJK>
-0x663C	0x95D9	# <CJK>
-0x663D	0x95DA	# <CJK>
-0x663E	0x95DD	# <CJK>
-0x663F	0x95DE	# <CJK>
-0x6640	0x95DF	# <CJK>
-0x6641	0x95E0	# <CJK>
-0x6642	0x95E4	# <CJK>
-0x6643	0x95E6	# <CJK>
-0x6644	0x961D	# <CJK>
-0x6645	0x961E	# <CJK>
-0x6646	0x9622	# <CJK>
-0x6647	0x9624	# <CJK>
-0x6648	0x9625	# <CJK>
-0x6649	0x9626	# <CJK>
-0x664A	0x962C	# <CJK>
-0x664B	0x9631	# <CJK>
-0x664C	0x9633	# <CJK>
-0x664D	0x9637	# <CJK>
-0x664E	0x9638	# <CJK>
-0x664F	0x9639	# <CJK>
-0x6650	0x963A	# <CJK>
-0x6651	0x963C	# <CJK>
-0x6652	0x963D	# <CJK>
-0x6653	0x9641	# <CJK>
-0x6654	0x9652	# <CJK>
-0x6655	0x9654	# <CJK>
-0x6656	0x9656	# <CJK>
-0x6657	0x9657	# <CJK>
-0x6658	0x9658	# <CJK>
-0x6659	0x9661	# <CJK>
-0x665A	0x966E	# <CJK>
-0x665B	0x9674	# <CJK>
-0x665C	0x967B	# <CJK>
-0x665D	0x967C	# <CJK>
-0x665E	0x967E	# <CJK>
-0x665F	0x967F	# <CJK>
-0x6660	0x9681	# <CJK>
-0x6661	0x9682	# <CJK>
-0x6662	0x9683	# <CJK>
-0x6663	0x9684	# <CJK>
-0x6664	0x9689	# <CJK>
-0x6665	0x9691	# <CJK>
-0x6666	0x9696	# <CJK>
-0x6667	0x969A	# <CJK>
-0x6668	0x969D	# <CJK>
-0x6669	0x969F	# <CJK>
-0x666A	0x96A4	# <CJK>
-0x666B	0x96A5	# <CJK>
-0x666C	0x96A6	# <CJK>
-0x666D	0x96A9	# <CJK>
-0x666E	0x96AE	# <CJK>
-0x666F	0x96AF	# <CJK>
-0x6670	0x96B3	# <CJK>
-0x6671	0x96BA	# <CJK>
-0x6672	0x96CA	# <CJK>
-0x6673	0x96D2	# <CJK>
-0x6674	0x5DB2	# <CJK>
-0x6675	0x96D8	# <CJK>
-0x6676	0x96DA	# <CJK>
-0x6677	0x96DD	# <CJK>
-0x6678	0x96DE	# <CJK>
-0x6679	0x96DF	# <CJK>
-0x667A	0x96E9	# <CJK>
-0x667B	0x96EF	# <CJK>
-0x667C	0x96F1	# <CJK>
-0x667D	0x96FA	# <CJK>
-0x667E	0x9702	# <CJK>
-0x6721	0x9703	# <CJK>
-0x6722	0x9705	# <CJK>
-0x6723	0x9709	# <CJK>
-0x6724	0x971A	# <CJK>
-0x6725	0x971B	# <CJK>
-0x6726	0x971D	# <CJK>
-0x6727	0x9721	# <CJK>
-0x6728	0x9722	# <CJK>
-0x6729	0x9723	# <CJK>
-0x672A	0x9728	# <CJK>
-0x672B	0x9731	# <CJK>
-0x672C	0x9733	# <CJK>
-0x672D	0x9741	# <CJK>
-0x672E	0x9743	# <CJK>
-0x672F	0x974A	# <CJK>
-0x6730	0x974E	# <CJK>
-0x6731	0x974F	# <CJK>
-0x6732	0x9755	# <CJK>
-0x6733	0x9757	# <CJK>
-0x6734	0x9758	# <CJK>
-0x6735	0x975A	# <CJK>
-0x6736	0x975B	# <CJK>
-0x6737	0x9763	# <CJK>
-0x6738	0x9767	# <CJK>
-0x6739	0x976A	# <CJK>
-0x673A	0x976E	# <CJK>
-0x673B	0x9773	# <CJK>
-0x673C	0x9776	# <CJK>
-0x673D	0x9777	# <CJK>
-0x673E	0x9778	# <CJK>
-0x673F	0x977B	# <CJK>
-0x6740	0x977D	# <CJK>
-0x6741	0x977F	# <CJK>
-0x6742	0x9780	# <CJK>
-0x6743	0x9789	# <CJK>
-0x6744	0x9795	# <CJK>
-0x6745	0x9796	# <CJK>
-0x6746	0x9797	# <CJK>
-0x6747	0x9799	# <CJK>
-0x6748	0x979A	# <CJK>
-0x6749	0x979E	# <CJK>
-0x674A	0x979F	# <CJK>
-0x674B	0x97A2	# <CJK>
-0x674C	0x97AC	# <CJK>
-0x674D	0x97AE	# <CJK>
-0x674E	0x97B1	# <CJK>
-0x674F	0x97B2	# <CJK>
-0x6750	0x97B5	# <CJK>
-0x6751	0x97B6	# <CJK>
-0x6752	0x97B8	# <CJK>
-0x6753	0x97B9	# <CJK>
-0x6754	0x97BA	# <CJK>
-0x6755	0x97BC	# <CJK>
-0x6756	0x97BE	# <CJK>
-0x6757	0x97BF	# <CJK>
-0x6758	0x97C1	# <CJK>
-0x6759	0x97C4	# <CJK>
-0x675A	0x97C5	# <CJK>
-0x675B	0x97C7	# <CJK>
-0x675C	0x97C9	# <CJK>
-0x675D	0x97CA	# <CJK>
-0x675E	0x97CC	# <CJK>
-0x675F	0x97CD	# <CJK>
-0x6760	0x97CE	# <CJK>
-0x6761	0x97D0	# <CJK>
-0x6762	0x97D1	# <CJK>
-0x6763	0x97D4	# <CJK>
-0x6764	0x97D7	# <CJK>
-0x6765	0x97D8	# <CJK>
-0x6766	0x97D9	# <CJK>
-0x6767	0x97DD	# <CJK>
-0x6768	0x97DE	# <CJK>
-0x6769	0x97E0	# <CJK>
-0x676A	0x97DB	# <CJK>
-0x676B	0x97E1	# <CJK>
-0x676C	0x97E4	# <CJK>
-0x676D	0x97EF	# <CJK>
-0x676E	0x97F1	# <CJK>
-0x676F	0x97F4	# <CJK>
-0x6770	0x97F7	# <CJK>
-0x6771	0x97F8	# <CJK>
-0x6772	0x97FA	# <CJK>
-0x6773	0x9807	# <CJK>
-0x6774	0x980A	# <CJK>
-0x6775	0x9819	# <CJK>
-0x6776	0x980D	# <CJK>
-0x6777	0x980E	# <CJK>
-0x6778	0x9814	# <CJK>
-0x6779	0x9816	# <CJK>
-0x677A	0x981C	# <CJK>
-0x677B	0x981E	# <CJK>
-0x677C	0x9820	# <CJK>
-0x677D	0x9823	# <CJK>
-0x677E	0x9826	# <CJK>
-0x6821	0x982B	# <CJK>
-0x6822	0x982E	# <CJK>
-0x6823	0x982F	# <CJK>
-0x6824	0x9830	# <CJK>
-0x6825	0x9832	# <CJK>
-0x6826	0x9833	# <CJK>
-0x6827	0x9835	# <CJK>
-0x6828	0x9825	# <CJK>
-0x6829	0x983E	# <CJK>
-0x682A	0x9844	# <CJK>
-0x682B	0x9847	# <CJK>
-0x682C	0x984A	# <CJK>
-0x682D	0x9851	# <CJK>
-0x682E	0x9852	# <CJK>
-0x682F	0x9853	# <CJK>
-0x6830	0x9856	# <CJK>
-0x6831	0x9857	# <CJK>
-0x6832	0x9859	# <CJK>
-0x6833	0x985A	# <CJK>
-0x6834	0x9862	# <CJK>
-0x6835	0x9863	# <CJK>
-0x6836	0x9865	# <CJK>
-0x6837	0x9866	# <CJK>
-0x6838	0x986A	# <CJK>
-0x6839	0x986C	# <CJK>
-0x683A	0x98AB	# <CJK>
-0x683B	0x98AD	# <CJK>
-0x683C	0x98AE	# <CJK>
-0x683D	0x98B0	# <CJK>
-0x683E	0x98B4	# <CJK>
-0x683F	0x98B7	# <CJK>
-0x6840	0x98B8	# <CJK>
-0x6841	0x98BA	# <CJK>
-0x6842	0x98BB	# <CJK>
-0x6843	0x98BF	# <CJK>
-0x6844	0x98C2	# <CJK>
-0x6845	0x98C5	# <CJK>
-0x6846	0x98C8	# <CJK>
-0x6847	0x98CC	# <CJK>
-0x6848	0x98E1	# <CJK>
-0x6849	0x98E3	# <CJK>
-0x684A	0x98E5	# <CJK>
-0x684B	0x98E6	# <CJK>
-0x684C	0x98E7	# <CJK>
-0x684D	0x98EA	# <CJK>
-0x684E	0x98F3	# <CJK>
-0x684F	0x98F6	# <CJK>
-0x6850	0x9902	# <CJK>
-0x6851	0x9907	# <CJK>
-0x6852	0x9908	# <CJK>
-0x6853	0x9911	# <CJK>
-0x6854	0x9915	# <CJK>
-0x6855	0x9916	# <CJK>
-0x6856	0x9917	# <CJK>
-0x6857	0x991A	# <CJK>
-0x6858	0x991B	# <CJK>
-0x6859	0x991C	# <CJK>
-0x685A	0x991F	# <CJK>
-0x685B	0x9922	# <CJK>
-0x685C	0x9926	# <CJK>
-0x685D	0x9927	# <CJK>
-0x685E	0x992B	# <CJK>
-0x685F	0x9931	# <CJK>
-0x6860	0x9932	# <CJK>
-0x6861	0x9933	# <CJK>
-0x6862	0x9934	# <CJK>
-0x6863	0x9935	# <CJK>
-0x6864	0x9939	# <CJK>
-0x6865	0x993A	# <CJK>
-0x6866	0x993B	# <CJK>
-0x6867	0x993C	# <CJK>
-0x6868	0x9940	# <CJK>
-0x6869	0x9941	# <CJK>
-0x686A	0x9946	# <CJK>
-0x686B	0x9947	# <CJK>
-0x686C	0x9948	# <CJK>
-0x686D	0x994D	# <CJK>
-0x686E	0x994E	# <CJK>
-0x686F	0x9954	# <CJK>
-0x6870	0x9958	# <CJK>
-0x6871	0x9959	# <CJK>
-0x6872	0x995B	# <CJK>
-0x6873	0x995C	# <CJK>
-0x6874	0x995E	# <CJK>
-0x6875	0x995F	# <CJK>
-0x6876	0x9960	# <CJK>
-0x6877	0x999B	# <CJK>
-0x6878	0x999D	# <CJK>
-0x6879	0x999F	# <CJK>
-0x687A	0x99A6	# <CJK>
-0x687B	0x99B0	# <CJK>
-0x687C	0x99B1	# <CJK>
-0x687D	0x99B2	# <CJK>
-0x687E	0x99B5	# <CJK>
-0x6921	0x99B9	# <CJK>
-0x6922	0x99BA	# <CJK>
-0x6923	0x99BD	# <CJK>
-0x6924	0x99BF	# <CJK>
-0x6925	0x99C3	# <CJK>
-0x6926	0x99C9	# <CJK>
-0x6927	0x99D3	# <CJK>
-0x6928	0x99D4	# <CJK>
-0x6929	0x99D9	# <CJK>
-0x692A	0x99DA	# <CJK>
-0x692B	0x99DC	# <CJK>
-0x692C	0x99DE	# <CJK>
-0x692D	0x99E7	# <CJK>
-0x692E	0x99EA	# <CJK>
-0x692F	0x99EB	# <CJK>
-0x6930	0x99EC	# <CJK>
-0x6931	0x99F0	# <CJK>
-0x6932	0x99F4	# <CJK>
-0x6933	0x99F5	# <CJK>
-0x6934	0x99F9	# <CJK>
-0x6935	0x99FD	# <CJK>
-0x6936	0x99FE	# <CJK>
-0x6937	0x9A02	# <CJK>
-0x6938	0x9A03	# <CJK>
-0x6939	0x9A04	# <CJK>
-0x693A	0x9A0B	# <CJK>
-0x693B	0x9A0C	# <CJK>
-0x693C	0x9A10	# <CJK>
-0x693D	0x9A11	# <CJK>
-0x693E	0x9A16	# <CJK>
-0x693F	0x9A1E	# <CJK>
-0x6940	0x9A20	# <CJK>
-0x6941	0x9A22	# <CJK>
-0x6942	0x9A23	# <CJK>
-0x6943	0x9A24	# <CJK>
-0x6944	0x9A27	# <CJK>
-0x6945	0x9A2D	# <CJK>
-0x6946	0x9A2E	# <CJK>
-0x6947	0x9A33	# <CJK>
-0x6948	0x9A35	# <CJK>
-0x6949	0x9A36	# <CJK>
-0x694A	0x9A38	# <CJK>
-0x694B	0x9A47	# <CJK>
-0x694C	0x9A41	# <CJK>
-0x694D	0x9A44	# <CJK>
-0x694E	0x9A4A	# <CJK>
-0x694F	0x9A4B	# <CJK>
-0x6950	0x9A4C	# <CJK>
-0x6951	0x9A4E	# <CJK>
-0x6952	0x9A51	# <CJK>
-0x6953	0x9A54	# <CJK>
-0x6954	0x9A56	# <CJK>
-0x6955	0x9A5D	# <CJK>
-0x6956	0x9AAA	# <CJK>
-0x6957	0x9AAC	# <CJK>
-0x6958	0x9AAE	# <CJK>
-0x6959	0x9AAF	# <CJK>
-0x695A	0x9AB2	# <CJK>
-0x695B	0x9AB4	# <CJK>
-0x695C	0x9AB5	# <CJK>
-0x695D	0x9AB6	# <CJK>
-0x695E	0x9AB9	# <CJK>
-0x695F	0x9ABB	# <CJK>
-0x6960	0x9ABE	# <CJK>
-0x6961	0x9ABF	# <CJK>
-0x6962	0x9AC1	# <CJK>
-0x6963	0x9AC3	# <CJK>
-0x6964	0x9AC6	# <CJK>
-0x6965	0x9AC8	# <CJK>
-0x6966	0x9ACE	# <CJK>
-0x6967	0x9AD0	# <CJK>
-0x6968	0x9AD2	# <CJK>
-0x6969	0x9AD5	# <CJK>
-0x696A	0x9AD6	# <CJK>
-0x696B	0x9AD7	# <CJK>
-0x696C	0x9ADB	# <CJK>
-0x696D	0x9ADC	# <CJK>
-0x696E	0x9AE0	# <CJK>
-0x696F	0x9AE4	# <CJK>
-0x6970	0x9AE5	# <CJK>
-0x6971	0x9AE7	# <CJK>
-0x6972	0x9AE9	# <CJK>
-0x6973	0x9AEC	# <CJK>
-0x6974	0x9AF2	# <CJK>
-0x6975	0x9AF3	# <CJK>
-0x6976	0x9AF5	# <CJK>
-0x6977	0x9AF9	# <CJK>
-0x6978	0x9AFA	# <CJK>
-0x6979	0x9AFD	# <CJK>
-0x697A	0x9AFF	# <CJK>
-0x697B	0x9B00	# <CJK>
-0x697C	0x9B01	# <CJK>
-0x697D	0x9B02	# <CJK>
-0x697E	0x9B03	# <CJK>
-0x6A21	0x9B04	# <CJK>
-0x6A22	0x9B05	# <CJK>
-0x6A23	0x9B08	# <CJK>
-0x6A24	0x9B09	# <CJK>
-0x6A25	0x9B0B	# <CJK>
-0x6A26	0x9B0C	# <CJK>
-0x6A27	0x9B0D	# <CJK>
-0x6A28	0x9B0E	# <CJK>
-0x6A29	0x9B10	# <CJK>
-0x6A2A	0x9B12	# <CJK>
-0x6A2B	0x9B16	# <CJK>
-0x6A2C	0x9B19	# <CJK>
-0x6A2D	0x9B1B	# <CJK>
-0x6A2E	0x9B1C	# <CJK>
-0x6A2F	0x9B20	# <CJK>
-0x6A30	0x9B26	# <CJK>
-0x6A31	0x9B2B	# <CJK>
-0x6A32	0x9B2D	# <CJK>
-0x6A33	0x9B33	# <CJK>
-0x6A34	0x9B34	# <CJK>
-0x6A35	0x9B35	# <CJK>
-0x6A36	0x9B37	# <CJK>
-0x6A37	0x9B39	# <CJK>
-0x6A38	0x9B3A	# <CJK>
-0x6A39	0x9B3D	# <CJK>
-0x6A3A	0x9B48	# <CJK>
-0x6A3B	0x9B4B	# <CJK>
-0x6A3C	0x9B4C	# <CJK>
-0x6A3D	0x9B55	# <CJK>
-0x6A3E	0x9B56	# <CJK>
-0x6A3F	0x9B57	# <CJK>
-0x6A40	0x9B5B	# <CJK>
-0x6A41	0x9B5E	# <CJK>
-0x6A42	0x9B61	# <CJK>
-0x6A43	0x9B63	# <CJK>
-0x6A44	0x9B65	# <CJK>
-0x6A45	0x9B66	# <CJK>
-0x6A46	0x9B68	# <CJK>
-0x6A47	0x9B6A	# <CJK>
-0x6A48	0x9B6B	# <CJK>
-0x6A49	0x9B6C	# <CJK>
-0x6A4A	0x9B6D	# <CJK>
-0x6A4B	0x9B6E	# <CJK>
-0x6A4C	0x9B73	# <CJK>
-0x6A4D	0x9B75	# <CJK>
-0x6A4E	0x9B77	# <CJK>
-0x6A4F	0x9B78	# <CJK>
-0x6A50	0x9B79	# <CJK>
-0x6A51	0x9B7F	# <CJK>
-0x6A52	0x9B80	# <CJK>
-0x6A53	0x9B84	# <CJK>
-0x6A54	0x9B85	# <CJK>
-0x6A55	0x9B86	# <CJK>
-0x6A56	0x9B87	# <CJK>
-0x6A57	0x9B89	# <CJK>
-0x6A58	0x9B8A	# <CJK>
-0x6A59	0x9B8B	# <CJK>
-0x6A5A	0x9B8D	# <CJK>
-0x6A5B	0x9B8F	# <CJK>
-0x6A5C	0x9B90	# <CJK>
-0x6A5D	0x9B94	# <CJK>
-0x6A5E	0x9B9A	# <CJK>
-0x6A5F	0x9B9D	# <CJK>
-0x6A60	0x9B9E	# <CJK>
-0x6A61	0x9BA6	# <CJK>
-0x6A62	0x9BA7	# <CJK>
-0x6A63	0x9BA9	# <CJK>
-0x6A64	0x9BAC	# <CJK>
-0x6A65	0x9BB0	# <CJK>
-0x6A66	0x9BB1	# <CJK>
-0x6A67	0x9BB2	# <CJK>
-0x6A68	0x9BB7	# <CJK>
-0x6A69	0x9BB8	# <CJK>
-0x6A6A	0x9BBB	# <CJK>
-0x6A6B	0x9BBC	# <CJK>
-0x6A6C	0x9BBE	# <CJK>
-0x6A6D	0x9BBF	# <CJK>
-0x6A6E	0x9BC1	# <CJK>
-0x6A6F	0x9BC7	# <CJK>
-0x6A70	0x9BC8	# <CJK>
-0x6A71	0x9BCE	# <CJK>
-0x6A72	0x9BD0	# <CJK>
-0x6A73	0x9BD7	# <CJK>
-0x6A74	0x9BD8	# <CJK>
-0x6A75	0x9BDD	# <CJK>
-0x6A76	0x9BDF	# <CJK>
-0x6A77	0x9BE5	# <CJK>
-0x6A78	0x9BE7	# <CJK>
-0x6A79	0x9BEA	# <CJK>
-0x6A7A	0x9BEB	# <CJK>
-0x6A7B	0x9BEF	# <CJK>
-0x6A7C	0x9BF3	# <CJK>
-0x6A7D	0x9BF7	# <CJK>
-0x6A7E	0x9BF8	# <CJK>
-0x6B21	0x9BF9	# <CJK>
-0x6B22	0x9BFA	# <CJK>
-0x6B23	0x9BFD	# <CJK>
-0x6B24	0x9BFF	# <CJK>
-0x6B25	0x9C00	# <CJK>
-0x6B26	0x9C02	# <CJK>
-0x6B27	0x9C0B	# <CJK>
-0x6B28	0x9C0F	# <CJK>
-0x6B29	0x9C11	# <CJK>
-0x6B2A	0x9C16	# <CJK>
-0x6B2B	0x9C18	# <CJK>
-0x6B2C	0x9C19	# <CJK>
-0x6B2D	0x9C1A	# <CJK>
-0x6B2E	0x9C1C	# <CJK>
-0x6B2F	0x9C1E	# <CJK>
-0x6B30	0x9C22	# <CJK>
-0x6B31	0x9C23	# <CJK>
-0x6B32	0x9C26	# <CJK>
-0x6B33	0x9C27	# <CJK>
-0x6B34	0x9C28	# <CJK>
-0x6B35	0x9C29	# <CJK>
-0x6B36	0x9C2A	# <CJK>
-0x6B37	0x9C31	# <CJK>
-0x6B38	0x9C35	# <CJK>
-0x6B39	0x9C36	# <CJK>
-0x6B3A	0x9C37	# <CJK>
-0x6B3B	0x9C3D	# <CJK>
-0x6B3C	0x9C41	# <CJK>
-0x6B3D	0x9C43	# <CJK>
-0x6B3E	0x9C44	# <CJK>
-0x6B3F	0x9C45	# <CJK>
-0x6B40	0x9C49	# <CJK>
-0x6B41	0x9C4A	# <CJK>
-0x6B42	0x9C4E	# <CJK>
-0x6B43	0x9C4F	# <CJK>
-0x6B44	0x9C50	# <CJK>
-0x6B45	0x9C53	# <CJK>
-0x6B46	0x9C54	# <CJK>
-0x6B47	0x9C56	# <CJK>
-0x6B48	0x9C58	# <CJK>
-0x6B49	0x9C5B	# <CJK>
-0x6B4A	0x9C5D	# <CJK>
-0x6B4B	0x9C5E	# <CJK>
-0x6B4C	0x9C5F	# <CJK>
-0x6B4D	0x9C63	# <CJK>
-0x6B4E	0x9C69	# <CJK>
-0x6B4F	0x9C6A	# <CJK>
-0x6B50	0x9C5C	# <CJK>
-0x6B51	0x9C6B	# <CJK>
-0x6B52	0x9C68	# <CJK>
-0x6B53	0x9C6E	# <CJK>
-0x6B54	0x9C70	# <CJK>
-0x6B55	0x9C72	# <CJK>
-0x6B56	0x9C75	# <CJK>
-0x6B57	0x9C77	# <CJK>
-0x6B58	0x9C7B	# <CJK>
-0x6B59	0x9CE6	# <CJK>
-0x6B5A	0x9CF2	# <CJK>
-0x6B5B	0x9CF7	# <CJK>
-0x6B5C	0x9CF9	# <CJK>
-0x6B5D	0x9D0B	# <CJK>
-0x6B5E	0x9D02	# <CJK>
-0x6B5F	0x9D11	# <CJK>
-0x6B60	0x9D17	# <CJK>
-0x6B61	0x9D18	# <CJK>
-0x6B62	0x9D1C	# <CJK>
-0x6B63	0x9D1D	# <CJK>
-0x6B64	0x9D1E	# <CJK>
-0x6B65	0x9D2F	# <CJK>
-0x6B66	0x9D30	# <CJK>
-0x6B67	0x9D32	# <CJK>
-0x6B68	0x9D33	# <CJK>
-0x6B69	0x9D34	# <CJK>
-0x6B6A	0x9D3A	# <CJK>
-0x6B6B	0x9D3C	# <CJK>
-0x6B6C	0x9D45	# <CJK>
-0x6B6D	0x9D3D	# <CJK>
-0x6B6E	0x9D42	# <CJK>
-0x6B6F	0x9D43	# <CJK>
-0x6B70	0x9D47	# <CJK>
-0x6B71	0x9D4A	# <CJK>
-0x6B72	0x9D53	# <CJK>
-0x6B73	0x9D54	# <CJK>
-0x6B74	0x9D5F	# <CJK>
-0x6B75	0x9D63	# <CJK>
-0x6B76	0x9D62	# <CJK>
-0x6B77	0x9D65	# <CJK>
-0x6B78	0x9D69	# <CJK>
-0x6B79	0x9D6A	# <CJK>
-0x6B7A	0x9D6B	# <CJK>
-0x6B7B	0x9D70	# <CJK>
-0x6B7C	0x9D76	# <CJK>
-0x6B7D	0x9D77	# <CJK>
-0x6B7E	0x9D7B	# <CJK>
-0x6C21	0x9D7C	# <CJK>
-0x6C22	0x9D7E	# <CJK>
-0x6C23	0x9D83	# <CJK>
-0x6C24	0x9D84	# <CJK>
-0x6C25	0x9D86	# <CJK>
-0x6C26	0x9D8A	# <CJK>
-0x6C27	0x9D8D	# <CJK>
-0x6C28	0x9D8E	# <CJK>
-0x6C29	0x9D92	# <CJK>
-0x6C2A	0x9D93	# <CJK>
-0x6C2B	0x9D95	# <CJK>
-0x6C2C	0x9D96	# <CJK>
-0x6C2D	0x9D97	# <CJK>
-0x6C2E	0x9D98	# <CJK>
-0x6C2F	0x9DA1	# <CJK>
-0x6C30	0x9DAA	# <CJK>
-0x6C31	0x9DAC	# <CJK>
-0x6C32	0x9DAE	# <CJK>
-0x6C33	0x9DB1	# <CJK>
-0x6C34	0x9DB5	# <CJK>
-0x6C35	0x9DB9	# <CJK>
-0x6C36	0x9DBC	# <CJK>
-0x6C37	0x9DBF	# <CJK>
-0x6C38	0x9DC3	# <CJK>
-0x6C39	0x9DC7	# <CJK>
-0x6C3A	0x9DC9	# <CJK>
-0x6C3B	0x9DCA	# <CJK>
-0x6C3C	0x9DD4	# <CJK>
-0x6C3D	0x9DD5	# <CJK>
-0x6C3E	0x9DD6	# <CJK>
-0x6C3F	0x9DD7	# <CJK>
-0x6C40	0x9DDA	# <CJK>
-0x6C41	0x9DDE	# <CJK>
-0x6C42	0x9DDF	# <CJK>
-0x6C43	0x9DE0	# <CJK>
-0x6C44	0x9DE5	# <CJK>
-0x6C45	0x9DE7	# <CJK>
-0x6C46	0x9DE9	# <CJK>
-0x6C47	0x9DEB	# <CJK>
-0x6C48	0x9DEE	# <CJK>
-0x6C49	0x9DF0	# <CJK>
-0x6C4A	0x9DF3	# <CJK>
-0x6C4B	0x9DF4	# <CJK>
-0x6C4C	0x9DFE	# <CJK>
-0x6C4D	0x9E0A	# <CJK>
-0x6C4E	0x9E02	# <CJK>
-0x6C4F	0x9E07	# <CJK>
-0x6C50	0x9E0E	# <CJK>
-0x6C51	0x9E10	# <CJK>
-0x6C52	0x9E11	# <CJK>
-0x6C53	0x9E12	# <CJK>
-0x6C54	0x9E15	# <CJK>
-0x6C55	0x9E16	# <CJK>
-0x6C56	0x9E19	# <CJK>
-0x6C57	0x9E1C	# <CJK>
-0x6C58	0x9E1D	# <CJK>
-0x6C59	0x9E7A	# <CJK>
-0x6C5A	0x9E7B	# <CJK>
-0x6C5B	0x9E7C	# <CJK>
-0x6C5C	0x9E80	# <CJK>
-0x6C5D	0x9E82	# <CJK>
-0x6C5E	0x9E83	# <CJK>
-0x6C5F	0x9E84	# <CJK>
-0x6C60	0x9E85	# <CJK>
-0x6C61	0x9E87	# <CJK>
-0x6C62	0x9E8E	# <CJK>
-0x6C63	0x9E8F	# <CJK>
-0x6C64	0x9E96	# <CJK>
-0x6C65	0x9E98	# <CJK>
-0x6C66	0x9E9B	# <CJK>
-0x6C67	0x9E9E	# <CJK>
-0x6C68	0x9EA4	# <CJK>
-0x6C69	0x9EA8	# <CJK>
-0x6C6A	0x9EAC	# <CJK>
-0x6C6B	0x9EAE	# <CJK>
-0x6C6C	0x9EAF	# <CJK>
-0x6C6D	0x9EB0	# <CJK>
-0x6C6E	0x9EB3	# <CJK>
-0x6C6F	0x9EB4	# <CJK>
-0x6C70	0x9EB5	# <CJK>
-0x6C71	0x9EC6	# <CJK>
-0x6C72	0x9EC8	# <CJK>
-0x6C73	0x9ECB	# <CJK>
-0x6C74	0x9ED5	# <CJK>
-0x6C75	0x9EDF	# <CJK>
-0x6C76	0x9EE4	# <CJK>
-0x6C77	0x9EE7	# <CJK>
-0x6C78	0x9EEC	# <CJK>
-0x6C79	0x9EED	# <CJK>
-0x6C7A	0x9EEE	# <CJK>
-0x6C7B	0x9EF0	# <CJK>
-0x6C7C	0x9EF1	# <CJK>
-0x6C7D	0x9EF2	# <CJK>
-0x6C7E	0x9EF5	# <CJK>
-0x6D21	0x9EF8	# <CJK>
-0x6D22	0x9EFF	# <CJK>
-0x6D23	0x9F02	# <CJK>
-0x6D24	0x9F03	# <CJK>
-0x6D25	0x9F09	# <CJK>
-0x6D26	0x9F0F	# <CJK>
-0x6D27	0x9F10	# <CJK>
-0x6D28	0x9F11	# <CJK>
-0x6D29	0x9F12	# <CJK>
-0x6D2A	0x9F14	# <CJK>
-0x6D2B	0x9F16	# <CJK>
-0x6D2C	0x9F17	# <CJK>
-0x6D2D	0x9F19	# <CJK>
-0x6D2E	0x9F1A	# <CJK>
-0x6D2F	0x9F1B	# <CJK>
-0x6D30	0x9F1F	# <CJK>
-0x6D31	0x9F22	# <CJK>
-0x6D32	0x9F26	# <CJK>
-0x6D33	0x9F2A	# <CJK>
-0x6D34	0x9F2B	# <CJK>
-0x6D35	0x9F2F	# <CJK>
-0x6D36	0x9F31	# <CJK>
-0x6D37	0x9F32	# <CJK>
-0x6D38	0x9F34	# <CJK>
-0x6D39	0x9F37	# <CJK>
-0x6D3A	0x9F39	# <CJK>
-0x6D3B	0x9F3A	# <CJK>
-0x6D3C	0x9F3C	# <CJK>
-0x6D3D	0x9F3D	# <CJK>
-0x6D3E	0x9F3F	# <CJK>
-0x6D3F	0x9F41	# <CJK>
-0x6D40	0x9F43	# <CJK>
-0x6D41	0x9F44	# <CJK>
-0x6D42	0x9F45	# <CJK>
-0x6D43	0x9F46	# <CJK>
-0x6D44	0x9F47	# <CJK>
-0x6D45	0x9F53	# <CJK>
-0x6D46	0x9F55	# <CJK>
-0x6D47	0x9F56	# <CJK>
-0x6D48	0x9F57	# <CJK>
-0x6D49	0x9F58	# <CJK>
-0x6D4A	0x9F5A	# <CJK>
-0x6D4B	0x9F5D	# <CJK>
-0x6D4C	0x9F5E	# <CJK>
-0x6D4D	0x9F68	# <CJK>
-0x6D4E	0x9F69	# <CJK>
-0x6D4F	0x9F6D	# <CJK>
-0x6D50	0x9F6E	# <CJK>
-0x6D51	0x9F6F	# <CJK>
-0x6D52	0x9F70	# <CJK>
-0x6D53	0x9F71	# <CJK>
-0x6D54	0x9F73	# <CJK>
-0x6D55	0x9F75	# <CJK>
-0x6D56	0x9F7A	# <CJK>
-0x6D57	0x9F7D	# <CJK>
-0x6D58	0x9F8F	# <CJK>
-0x6D59	0x9F90	# <CJK>
-0x6D5A	0x9F91	# <CJK>
-0x6D5B	0x9F92	# <CJK>
-0x6D5C	0x9F94	# <CJK>
-0x6D5D	0x9F96	# <CJK>
-0x6D5E	0x9F97	# <CJK>
-0x6D5F	0x9F9E	# <CJK>
-0x6D60	0x9FA1	# <CJK>
-0x6D61	0x9FA2	# <CJK>
-0x6D62	0x9FA3	# <CJK>
-0x6D63	0x9FA5	# <CJK>
diff --git a/tools/encoding/ksc5601.txt b/tools/encoding/ksc5601.txt
deleted file mode 100644
index 5c6e7dc..0000000
--- a/tools/encoding/ksc5601.txt
+++ /dev/null
@@ -1,8262 +0,0 @@
-# What is enclosed below is the mapping between KS C 5601-1987
-# and Unicode 2.0.   It's automatically generated from KSC5601.TXT
-# (at ftp://ftp.unicode.org/Public/MAPPING/EASTASIA/KSC) which is
-# actually NOT the mapping between KS C 5601-1992 and Unicode 2.0
-# BUT the mapping table between UHC(Microsoft Unified Hangul Code)
-# and Unicode 2.0. Hence, in this pacakge, I renamed it as UHC.TXT
-#
-# The Unix command  used is 
-# egrep '^0x' < KSC5601.TXT |   \
-# egrep -v '^0x([8-9]...|A0..|..[4-9].|..A0)' | perl tab.pl
-#
-# where tab.pl  is as following
-#----------tab.pl
-#  $n=0;
-#  while (<>) {
-#    local($euck, $ucs4, @rest) = split;
-#    local($u)=hex($ucs4);
-#    local($k)=hex($euck);
-#    printf ("0x%04X  0x%04X  %s\n",$k-0x8080, $u,join(' ',@rest));
-#  }
-#
-# Column #1 : KS C 5601-1987(KS C 5601-1992 excluding addtional Hangul
-#            syllables defined for Johab encoding in Annex 3)
-#            in hex as 0xXXXX
-# Column #2 : the Unicode (in hex as 0xXXXX)
-# Column #3 : the Unicode name (following a comment sign, '#')
-# The number of characters enumerated in this table is 8824, the
-# as listed in KS C 5601-987
-# 
-# 
-# The entries are in KS C 5601-1987 order
-# You can use the following algorithms to convert the hex form
-# of KS C 5601 to other forms
-#   To get EUCKorea(EUC-KR) code points, add 0x8080.
-#   To get row(Hang) and column(Yol) as used in KS C 5601-1987 manual,
-#      first subtract 0x2020. Then
-#      the high and low bytes correspond to the row(Hang) and the column(Yol),
-#      respectively
-0x2121  0x3000  # IDEOGRAPHIC SPACE
-0x2122  0x3001  # IDEOGRAPHIC COMMA
-0x2123  0x3002  # IDEOGRAPHIC FULL STOP
-0x2124  0x00B7  # MIDDLE DOT
-0x2125  0x2025  # TWO DOT LEADER
-0x2126  0x2026  # HORIZONTAL ELLIPSIS
-0x2127  0x00A8  # DIAERESIS
-0x2128  0x3003  # DITTO MARK
-0x2129  0x00AD  # SOFT HYPHEN
-0x212A  0x2015  # HORIZONTAL BAR
-0x212B  0x2225  # PARALLEL TO
-0x212C  0xFF3C  # FULLWIDTH REVERSE SOLIDUS
-0x212D  0x223C  # TILDE OPERATOR
-0x212E  0x2018  # LEFT SINGLE QUOTATION MARK
-0x212F  0x2019  # RIGHT SINGLE QUOTATION MARK
-0x2130  0x201C  # LEFT DOUBLE QUOTATION MARK
-0x2131  0x201D  # RIGHT DOUBLE QUOTATION MARK
-0x2132  0x3014  # LEFT TORTOISE SHELL BRACKET
-0x2133  0x3015  # RIGHT TORTOISE SHELL BRACKET
-0x2134  0x3008  # LEFT ANGLE BRACKET
-0x2135  0x3009  # RIGHT ANGLE BRACKET
-0x2136  0x300A  # LEFT DOUBLE ANGLE BRACKET
-0x2137  0x300B  # RIGHT DOUBLE ANGLE BRACKET
-0x2138  0x300C  # LEFT CORNER BRACKET
-0x2139  0x300D  # RIGHT CORNER BRACKET
-0x213A  0x300E  # LEFT WHITE CORNER BRACKET
-0x213B  0x300F  # RIGHT WHITE CORNER BRACKET
-0x213C  0x3010  # LEFT BLACK LENTICULAR BRACKET
-0x213D  0x3011  # RIGHT BLACK LENTICULAR BRACKET
-0x213E  0x00B1  # PLUS-MINUS SIGN
-0x213F  0x00D7  # MULTIPLICATION SIGN
-0x2140  0x00F7  # DIVISION SIGN
-0x2141  0x2260  # NOT EQUAL TO
-0x2142  0x2264  # LESS-THAN OR EQUAL TO
-0x2143  0x2265  # GREATER-THAN OR EQUAL TO
-0x2144  0x221E  # INFINITY
-0x2145  0x2234  # THEREFORE
-0x2146  0x00B0  # DEGREE SIGN
-0x2147  0x2032  # PRIME
-0x2148  0x2033  # DOUBLE PRIME
-0x2149  0x2103  # DEGREE CELSIUS
-0x214A  0x212B  # ANGSTROM SIGN
-0x214B  0xFFE0  # FULLWIDTH CENT SIGN
-0x214C  0xFFE1  # FULLWIDTH POUND SIGN
-0x214D  0xFFE5  # FULLWIDTH YEN SIGN
-0x214E  0x2642  # MALE SIGN
-0x214F  0x2640  # FEMALE SIGN
-0x2150  0x2220  # ANGLE
-0x2151  0x22A5  # UP TACK
-0x2152  0x2312  # ARC
-0x2153  0x2202  # PARTIAL DIFFERENTIAL
-0x2154  0x2207  # NABLA
-0x2155  0x2261  # IDENTICAL TO
-0x2156  0x2252  # APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0x2157  0x00A7  # SECTION SIGN
-0x2158  0x203B  # REFERENCE MARK
-0x2159  0x2606  # WHITE STAR
-0x215A  0x2605  # BLACK STAR
-0x215B  0x25CB  # WHITE CIRCLE
-0x215C  0x25CF  # BLACK CIRCLE
-0x215D  0x25CE  # BULLSEYE
-0x215E  0x25C7  # WHITE DIAMOND
-0x215F  0x25C6  # BLACK DIAMOND
-0x2160  0x25A1  # WHITE SQUARE
-0x2161  0x25A0  # BLACK SQUARE
-0x2162  0x25B3  # WHITE UP-POINTING TRIANGLE
-0x2163  0x25B2  # BLACK UP-POINTING TRIANGLE
-0x2164  0x25BD  # WHITE DOWN-POINTING TRIANGLE
-0x2165  0x25BC  # BLACK DOWN-POINTING TRIANGLE
-0x2166  0x2192  # RIGHTWARDS ARROW
-0x2167  0x2190  # LEFTWARDS ARROW
-0x2168  0x2191  # UPWARDS ARROW
-0x2169  0x2193  # DOWNWARDS ARROW
-0x216A  0x2194  # LEFT RIGHT ARROW
-0x216B  0x3013  # GETA MARK
-0x216C  0x226A  # MUCH LESS-THAN
-0x216D  0x226B  # MUCH GREATER-THAN
-0x216E  0x221A  # SQUARE ROOT
-0x216F  0x223D  # REVERSED TILDE
-0x2170  0x221D  # PROPORTIONAL TO
-0x2171  0x2235  # BECAUSE
-0x2172  0x222B  # INTEGRAL
-0x2173  0x222C  # DOUBLE INTEGRAL
-0x2174  0x2208  # ELEMENT OF
-0x2175  0x220B  # CONTAINS AS MEMBER
-0x2176  0x2286  # SUBSET OF OR EQUAL TO
-0x2177  0x2287  # SUPERSET OF OR EQUAL TO
-0x2178  0x2282  # SUBSET OF
-0x2179  0x2283  # SUPERSET OF
-0x217A  0x222A  # UNION
-0x217B  0x2229  # INTERSECTION
-0x217C  0x2227  # LOGICAL AND
-0x217D  0x2228  # LOGICAL OR
-0x217E  0xFFE2  # FULLWIDTH NOT SIGN
-0x2221  0x21D2  # RIGHTWARDS DOUBLE ARROW
-0x2222  0x21D4  # LEFT RIGHT DOUBLE ARROW
-0x2223  0x2200  # FOR ALL
-0x2224  0x2203  # THERE EXISTS
-0x2225  0x00B4  # ACUTE ACCENT
-0x2226  0xFF5E  # FULLWIDTH TILDE
-0x2227  0x02C7  # CARON
-0x2228  0x02D8  # BREVE
-0x2229  0x02DD  # DOUBLE ACUTE ACCENT
-0x222A  0x02DA  # RING ABOVE
-0x222B  0x02D9  # DOT ABOVE
-0x222C  0x00B8  # CEDILLA
-0x222D  0x02DB  # OGONEK
-0x222E  0x00A1  # INVERTED EXCLAMATION MARK
-0x222F  0x00BF  # INVERTED QUESTION MARK
-0x2230  0x02D0  # MODIFIER LETTER TRIANGULAR COLON
-0x2231  0x222E  # CONTOUR INTEGRAL
-0x2232  0x2211  # N-ARY SUMMATION
-0x2233  0x220F  # N-ARY PRODUCT
-0x2234  0x00A4  # CURRENCY SIGN
-0x2235  0x2109  # DEGREE FAHRENHEIT
-0x2236  0x2030  # PER MILLE SIGN
-0x2237  0x25C1  # WHITE LEFT-POINTING TRIANGLE
-0x2238  0x25C0  # BLACK LEFT-POINTING TRIANGLE
-0x2239  0x25B7  # WHITE RIGHT-POINTING TRIANGLE
-0x223A  0x25B6  # BLACK RIGHT-POINTING TRIANGLE
-0x223B  0x2664  # WHITE SPADE SUIT
-0x223C  0x2660  # BLACK SPADE SUIT
-0x223D  0x2661  # WHITE HEART SUIT
-0x223E  0x2665  # BLACK HEART SUIT
-0x223F  0x2667  # WHITE CLUB SUIT
-0x2240  0x2663  # BLACK CLUB SUIT
-0x2241  0x2299  # CIRCLED DOT OPERATOR
-0x2242  0x25C8  # WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND
-0x2243  0x25A3  # WHITE SQUARE CONTAINING BLACK SMALL SQUARE
-0x2244  0x25D0  # CIRCLE WITH LEFT HALF BLACK
-0x2245  0x25D1  # CIRCLE WITH RIGHT HALF BLACK
-0x2246  0x2592  # MEDIUM SHADE
-0x2247  0x25A4  # SQUARE WITH HORIZONTAL FILL
-0x2248  0x25A5  # SQUARE WITH VERTICAL FILL
-0x2249  0x25A8  # SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
-0x224A  0x25A7  # SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
-0x224B  0x25A6  # SQUARE WITH ORTHOGONAL CROSSHATCH FILL
-0x224C  0x25A9  # SQUARE WITH DIAGONAL CROSSHATCH FILL
-0x224D  0x2668  # HOT SPRINGS
-0x224E  0x260F  # WHITE TELEPHONE
-0x224F  0x260E  # BLACK TELEPHONE
-0x2250  0x261C  # WHITE LEFT POINTING INDEX
-0x2251  0x261E  # WHITE RIGHT POINTING INDEX
-0x2252  0x00B6  # PILCROW SIGN
-0x2253  0x2020  # DAGGER
-0x2254  0x2021  # DOUBLE DAGGER
-0x2255  0x2195  # UP DOWN ARROW
-0x2256  0x2197  # NORTH EAST ARROW
-0x2257  0x2199  # SOUTH WEST ARROW
-0x2258  0x2196  # NORTH WEST ARROW
-0x2259  0x2198  # SOUTH EAST ARROW
-0x225A  0x266D  # MUSIC FLAT SIGN
-0x225B  0x2669  # QUARTER NOTE
-0x225C  0x266A  # EIGHTH NOTE
-0x225D  0x266C  # BEAMED SIXTEENTH NOTES
-0x225E  0x327F  # KOREAN STANDARD SYMBOL
-0x225F  0x321C  # PARENTHESIZED HANGUL CIEUC U
-0x2260  0x2116  # NUMERO SIGN
-0x2261  0x33C7  # SQUARE CO
-0x2262  0x2122  # TRADE MARK SIGN
-0x2263  0x33C2  # SQUARE AM
-0x2264  0x33D8  # SQUARE PM
-0x2265  0x2121  # TELEPHONE SIGN
-0x2321  0xFF01  # FULLWIDTH EXCLAMATION MARK
-0x2322  0xFF02  # FULLWIDTH QUOTATION MARK
-0x2323  0xFF03  # FULLWIDTH NUMBER SIGN
-0x2324  0xFF04  # FULLWIDTH DOLLAR SIGN
-0x2325  0xFF05  # FULLWIDTH PERCENT SIGN
-0x2326  0xFF06  # FULLWIDTH AMPERSAND
-0x2327  0xFF07  # FULLWIDTH APOSTROPHE
-0x2328  0xFF08  # FULLWIDTH LEFT PARENTHESIS
-0x2329  0xFF09  # FULLWIDTH RIGHT PARENTHESIS
-0x232A  0xFF0A  # FULLWIDTH ASTERISK
-0x232B  0xFF0B  # FULLWIDTH PLUS SIGN
-0x232C  0xFF0C  # FULLWIDTH COMMA
-0x232D  0xFF0D  # FULLWIDTH HYPHEN-MINUS
-0x232E  0xFF0E  # FULLWIDTH FULL STOP
-0x232F  0xFF0F  # FULLWIDTH SOLIDUS
-0x2330  0xFF10  # FULLWIDTH DIGIT ZERO
-0x2331  0xFF11  # FULLWIDTH DIGIT ONE
-0x2332  0xFF12  # FULLWIDTH DIGIT TWO
-0x2333  0xFF13  # FULLWIDTH DIGIT THREE
-0x2334  0xFF14  # FULLWIDTH DIGIT FOUR
-0x2335  0xFF15  # FULLWIDTH DIGIT FIVE
-0x2336  0xFF16  # FULLWIDTH DIGIT SIX
-0x2337  0xFF17  # FULLWIDTH DIGIT SEVEN
-0x2338  0xFF18  # FULLWIDTH DIGIT EIGHT
-0x2339  0xFF19  # FULLWIDTH DIGIT NINE
-0x233A  0xFF1A  # FULLWIDTH COLON
-0x233B  0xFF1B  # FULLWIDTH SEMICOLON
-0x233C  0xFF1C  # FULLWIDTH LESS-THAN SIGN
-0x233D  0xFF1D  # FULLWIDTH EQUALS SIGN
-0x233E  0xFF1E  # FULLWIDTH GREATER-THAN SIGN
-0x233F  0xFF1F  # FULLWIDTH QUESTION MARK
-0x2340  0xFF20  # FULLWIDTH COMMERCIAL AT
-0x2341  0xFF21  # FULLWIDTH LATIN CAPITAL LETTER A
-0x2342  0xFF22  # FULLWIDTH LATIN CAPITAL LETTER B
-0x2343  0xFF23  # FULLWIDTH LATIN CAPITAL LETTER C
-0x2344  0xFF24  # FULLWIDTH LATIN CAPITAL LETTER D
-0x2345  0xFF25  # FULLWIDTH LATIN CAPITAL LETTER E
-0x2346  0xFF26  # FULLWIDTH LATIN CAPITAL LETTER F
-0x2347  0xFF27  # FULLWIDTH LATIN CAPITAL LETTER G
-0x2348  0xFF28  # FULLWIDTH LATIN CAPITAL LETTER H
-0x2349  0xFF29  # FULLWIDTH LATIN CAPITAL LETTER I
-0x234A  0xFF2A  # FULLWIDTH LATIN CAPITAL LETTER J
-0x234B  0xFF2B  # FULLWIDTH LATIN CAPITAL LETTER K
-0x234C  0xFF2C  # FULLWIDTH LATIN CAPITAL LETTER L
-0x234D  0xFF2D  # FULLWIDTH LATIN CAPITAL LETTER M
-0x234E  0xFF2E  # FULLWIDTH LATIN CAPITAL LETTER N
-0x234F  0xFF2F  # FULLWIDTH LATIN CAPITAL LETTER O
-0x2350  0xFF30  # FULLWIDTH LATIN CAPITAL LETTER P
-0x2351  0xFF31  # FULLWIDTH LATIN CAPITAL LETTER Q
-0x2352  0xFF32  # FULLWIDTH LATIN CAPITAL LETTER R
-0x2353  0xFF33  # FULLWIDTH LATIN CAPITAL LETTER S
-0x2354  0xFF34  # FULLWIDTH LATIN CAPITAL LETTER T
-0x2355  0xFF35  # FULLWIDTH LATIN CAPITAL LETTER U
-0x2356  0xFF36  # FULLWIDTH LATIN CAPITAL LETTER V
-0x2357  0xFF37  # FULLWIDTH LATIN CAPITAL LETTER W
-0x2358  0xFF38  # FULLWIDTH LATIN CAPITAL LETTER X
-0x2359  0xFF39  # FULLWIDTH LATIN CAPITAL LETTER Y
-0x235A  0xFF3A  # FULLWIDTH LATIN CAPITAL LETTER Z
-0x235B  0xFF3B  # FULLWIDTH LEFT SQUARE BRACKET
-0x235C  0xFFE6  # FULLWIDTH WON SIGN
-0x235D  0xFF3D  # FULLWIDTH RIGHT SQUARE BRACKET
-0x235E  0xFF3E  # FULLWIDTH CIRCUMFLEX ACCENT
-0x235F  0xFF3F  # FULLWIDTH LOW LINE
-0x2360  0xFF40  # FULLWIDTH GRAVE ACCENT
-0x2361  0xFF41  # FULLWIDTH LATIN SMALL LETTER A
-0x2362  0xFF42  # FULLWIDTH LATIN SMALL LETTER B
-0x2363  0xFF43  # FULLWIDTH LATIN SMALL LETTER C
-0x2364  0xFF44  # FULLWIDTH LATIN SMALL LETTER D
-0x2365  0xFF45  # FULLWIDTH LATIN SMALL LETTER E
-0x2366  0xFF46  # FULLWIDTH LATIN SMALL LETTER F
-0x2367  0xFF47  # FULLWIDTH LATIN SMALL LETTER G
-0x2368  0xFF48  # FULLWIDTH LATIN SMALL LETTER H
-0x2369  0xFF49  # FULLWIDTH LATIN SMALL LETTER I
-0x236A  0xFF4A  # FULLWIDTH LATIN SMALL LETTER J
-0x236B  0xFF4B  # FULLWIDTH LATIN SMALL LETTER K
-0x236C  0xFF4C  # FULLWIDTH LATIN SMALL LETTER L
-0x236D  0xFF4D  # FULLWIDTH LATIN SMALL LETTER M
-0x236E  0xFF4E  # FULLWIDTH LATIN SMALL LETTER N
-0x236F  0xFF4F  # FULLWIDTH LATIN SMALL LETTER O
-0x2370  0xFF50  # FULLWIDTH LATIN SMALL LETTER P
-0x2371  0xFF51  # FULLWIDTH LATIN SMALL LETTER Q
-0x2372  0xFF52  # FULLWIDTH LATIN SMALL LETTER R
-0x2373  0xFF53  # FULLWIDTH LATIN SMALL LETTER S
-0x2374  0xFF54  # FULLWIDTH LATIN SMALL LETTER T
-0x2375  0xFF55  # FULLWIDTH LATIN SMALL LETTER U
-0x2376  0xFF56  # FULLWIDTH LATIN SMALL LETTER V
-0x2377  0xFF57  # FULLWIDTH LATIN SMALL LETTER W
-0x2378  0xFF58  # FULLWIDTH LATIN SMALL LETTER X
-0x2379  0xFF59  # FULLWIDTH LATIN SMALL LETTER Y
-0x237A  0xFF5A  # FULLWIDTH LATIN SMALL LETTER Z
-0x237B  0xFF5B  # FULLWIDTH LEFT CURLY BRACKET
-0x237C  0xFF5C  # FULLWIDTH VERTICAL LINE
-0x237D  0xFF5D  # FULLWIDTH RIGHT CURLY BRACKET
-0x237E  0xFFE3  # FULLWIDTH MACRON
-0x2421  0x3131  # HANGUL LETTER KIYEOK
-0x2422  0x3132  # HANGUL LETTER SSANGKIYEOK
-0x2423  0x3133  # HANGUL LETTER KIYEOK-SIOS
-0x2424  0x3134  # HANGUL LETTER NIEUN
-0x2425  0x3135  # HANGUL LETTER NIEUN-CIEUC
-0x2426  0x3136  # HANGUL LETTER NIEUN-HIEUH
-0x2427  0x3137  # HANGUL LETTER TIKEUT
-0x2428  0x3138  # HANGUL LETTER SSANGTIKEUT
-0x2429  0x3139  # HANGUL LETTER RIEUL
-0x242A  0x313A  # HANGUL LETTER RIEUL-KIYEOK
-0x242B  0x313B  # HANGUL LETTER RIEUL-MIEUM
-0x242C  0x313C  # HANGUL LETTER RIEUL-PIEUP
-0x242D  0x313D  # HANGUL LETTER RIEUL-SIOS
-0x242E  0x313E  # HANGUL LETTER RIEUL-THIEUTH
-0x242F  0x313F  # HANGUL LETTER RIEUL-PHIEUPH
-0x2430  0x3140  # HANGUL LETTER RIEUL-HIEUH
-0x2431  0x3141  # HANGUL LETTER MIEUM
-0x2432  0x3142  # HANGUL LETTER PIEUP
-0x2433  0x3143  # HANGUL LETTER SSANGPIEUP
-0x2434  0x3144  # HANGUL LETTER PIEUP-SIOS
-0x2435  0x3145  # HANGUL LETTER SIOS
-0x2436  0x3146  # HANGUL LETTER SSANGSIOS
-0x2437  0x3147  # HANGUL LETTER IEUNG
-0x2438  0x3148  # HANGUL LETTER CIEUC
-0x2439  0x3149  # HANGUL LETTER SSANGCIEUC
-0x243A  0x314A  # HANGUL LETTER CHIEUCH
-0x243B  0x314B  # HANGUL LETTER KHIEUKH
-0x243C  0x314C  # HANGUL LETTER THIEUTH
-0x243D  0x314D  # HANGUL LETTER PHIEUPH
-0x243E  0x314E  # HANGUL LETTER HIEUH
-0x243F  0x314F  # HANGUL LETTER A
-0x2440  0x3150  # HANGUL LETTER AE
-0x2441  0x3151  # HANGUL LETTER YA
-0x2442  0x3152  # HANGUL LETTER YAE
-0x2443  0x3153  # HANGUL LETTER EO
-0x2444  0x3154  # HANGUL LETTER E
-0x2445  0x3155  # HANGUL LETTER YEO
-0x2446  0x3156  # HANGUL LETTER YE
-0x2447  0x3157  # HANGUL LETTER O
-0x2448  0x3158  # HANGUL LETTER WA
-0x2449  0x3159  # HANGUL LETTER WAE
-0x244A  0x315A  # HANGUL LETTER OE
-0x244B  0x315B  # HANGUL LETTER YO
-0x244C  0x315C  # HANGUL LETTER U
-0x244D  0x315D  # HANGUL LETTER WEO
-0x244E  0x315E  # HANGUL LETTER WE
-0x244F  0x315F  # HANGUL LETTER WI
-0x2450  0x3160  # HANGUL LETTER YU
-0x2451  0x3161  # HANGUL LETTER EU
-0x2452  0x3162  # HANGUL LETTER YI
-0x2453  0x3163  # HANGUL LETTER I
-0x2454  0x3164  # HANGUL FILLER
-0x2455  0x3165  # HANGUL LETTER SSANGNIEUN
-0x2456  0x3166  # HANGUL LETTER NIEUN-TIKEUT
-0x2457  0x3167  # HANGUL LETTER NIEUN-SIOS
-0x2458  0x3168  # HANGUL LETTER NIEUN-PANSIOS
-0x2459  0x3169  # HANGUL LETTER RIEUL-KIYEOK-SIOS
-0x245A  0x316A  # HANGUL LETTER RIEUL-TIKEUT
-0x245B  0x316B  # HANGUL LETTER RIEUL-PIEUP-SIOS
-0x245C  0x316C  # HANGUL LETTER RIEUL-PANSIOS
-0x245D  0x316D  # HANGUL LETTER RIEUL-YEORINHIEUH
-0x245E  0x316E  # HANGUL LETTER MIEUM-PIEUP
-0x245F  0x316F  # HANGUL LETTER MIEUM-SIOS
-0x2460  0x3170  # HANGUL LETTER MIEUM-PANSIOS
-0x2461  0x3171  # HANGUL LETTER KAPYEOUNMIEUM
-0x2462  0x3172  # HANGUL LETTER PIEUP-KIYEOK
-0x2463  0x3173  # HANGUL LETTER PIEUP-TIKEUT
-0x2464  0x3174  # HANGUL LETTER PIEUP-SIOS-KIYEOK
-0x2465  0x3175  # HANGUL LETTER PIEUP-SIOS-TIKEUT
-0x2466  0x3176  # HANGUL LETTER PIEUP-CIEUC
-0x2467  0x3177  # HANGUL LETTER PIEUP-THIEUTH
-0x2468  0x3178  # HANGUL LETTER KAPYEOUNPIEUP
-0x2469  0x3179  # HANGUL LETTER KAPYEOUNSSANGPIEUP
-0x246A  0x317A  # HANGUL LETTER SIOS-KIYEOK
-0x246B  0x317B  # HANGUL LETTER SIOS-NIEUN
-0x246C  0x317C  # HANGUL LETTER SIOS-TIKEUT
-0x246D  0x317D  # HANGUL LETTER SIOS-PIEUP
-0x246E  0x317E  # HANGUL LETTER SIOS-CIEUC
-0x246F  0x317F  # HANGUL LETTER PANSIOS
-0x2470  0x3180  # HANGUL LETTER SSANGIEUNG
-0x2471  0x3181  # HANGUL LETTER YESIEUNG
-0x2472  0x3182  # HANGUL LETTER YESIEUNG-SIOS
-0x2473  0x3183  # HANGUL LETTER YESIEUNG-PANSIOS
-0x2474  0x3184  # HANGUL LETTER KAPYEOUNPHIEUPH
-0x2475  0x3185  # HANGUL LETTER SSANGHIEUH
-0x2476  0x3186  # HANGUL LETTER YEORINHIEUH
-0x2477  0x3187  # HANGUL LETTER YO-YA
-0x2478  0x3188  # HANGUL LETTER YO-YAE
-0x2479  0x3189  # HANGUL LETTER YO-I
-0x247A  0x318A  # HANGUL LETTER YU-YEO
-0x247B  0x318B  # HANGUL LETTER YU-YE
-0x247C  0x318C  # HANGUL LETTER YU-I
-0x247D  0x318D  # HANGUL LETTER ARAEA
-0x247E  0x318E  # HANGUL LETTER ARAEAE
-0x2521  0x2170  # SMALL ROMAN NUMERAL ONE
-0x2522  0x2171  # SMALL ROMAN NUMERAL TWO
-0x2523  0x2172  # SMALL ROMAN NUMERAL THREE
-0x2524  0x2173  # SMALL ROMAN NUMERAL FOUR
-0x2525  0x2174  # SMALL ROMAN NUMERAL FIVE
-0x2526  0x2175  # SMALL ROMAN NUMERAL SIX
-0x2527  0x2176  # SMALL ROMAN NUMERAL SEVEN
-0x2528  0x2177  # SMALL ROMAN NUMERAL EIGHT
-0x2529  0x2178  # SMALL ROMAN NUMERAL NINE
-0x252A  0x2179  # SMALL ROMAN NUMERAL TEN
-0x2530  0x2160  # ROMAN NUMERAL ONE
-0x2531  0x2161  # ROMAN NUMERAL TWO
-0x2532  0x2162  # ROMAN NUMERAL THREE
-0x2533  0x2163  # ROMAN NUMERAL FOUR
-0x2534  0x2164  # ROMAN NUMERAL FIVE
-0x2535  0x2165  # ROMAN NUMERAL SIX
-0x2536  0x2166  # ROMAN NUMERAL SEVEN
-0x2537  0x2167  # ROMAN NUMERAL EIGHT
-0x2538  0x2168  # ROMAN NUMERAL NINE
-0x2539  0x2169  # ROMAN NUMERAL TEN
-0x2541  0x0391  # GREEK CAPITAL LETTER ALPHA
-0x2542  0x0392  # GREEK CAPITAL LETTER BETA
-0x2543  0x0393  # GREEK CAPITAL LETTER GAMMA
-0x2544  0x0394  # GREEK CAPITAL LETTER DELTA
-0x2545  0x0395  # GREEK CAPITAL LETTER EPSILON
-0x2546  0x0396  # GREEK CAPITAL LETTER ZETA
-0x2547  0x0397  # GREEK CAPITAL LETTER ETA
-0x2548  0x0398  # GREEK CAPITAL LETTER THETA
-0x2549  0x0399  # GREEK CAPITAL LETTER IOTA
-0x254A  0x039A  # GREEK CAPITAL LETTER KAPPA
-0x254B  0x039B  # GREEK CAPITAL LETTER LAMDA
-0x254C  0x039C  # GREEK CAPITAL LETTER MU
-0x254D  0x039D  # GREEK CAPITAL LETTER NU
-0x254E  0x039E  # GREEK CAPITAL LETTER XI
-0x254F  0x039F  # GREEK CAPITAL LETTER OMICRON
-0x2550  0x03A0  # GREEK CAPITAL LETTER PI
-0x2551  0x03A1  # GREEK CAPITAL LETTER RHO
-0x2552  0x03A3  # GREEK CAPITAL LETTER SIGMA
-0x2553  0x03A4  # GREEK CAPITAL LETTER TAU
-0x2554  0x03A5  # GREEK CAPITAL LETTER UPSILON
-0x2555  0x03A6  # GREEK CAPITAL LETTER PHI
-0x2556  0x03A7  # GREEK CAPITAL LETTER CHI
-0x2557  0x03A8  # GREEK CAPITAL LETTER PSI
-0x2558  0x03A9  # GREEK CAPITAL LETTER OMEGA
-0x2561  0x03B1  # GREEK SMALL LETTER ALPHA
-0x2562  0x03B2  # GREEK SMALL LETTER BETA
-0x2563  0x03B3  # GREEK SMALL LETTER GAMMA
-0x2564  0x03B4  # GREEK SMALL LETTER DELTA
-0x2565  0x03B5  # GREEK SMALL LETTER EPSILON
-0x2566  0x03B6  # GREEK SMALL LETTER ZETA
-0x2567  0x03B7  # GREEK SMALL LETTER ETA
-0x2568  0x03B8  # GREEK SMALL LETTER THETA
-0x2569  0x03B9  # GREEK SMALL LETTER IOTA
-0x256A  0x03BA  # GREEK SMALL LETTER KAPPA
-0x256B  0x03BB  # GREEK SMALL LETTER LAMDA
-0x256C  0x03BC  # GREEK SMALL LETTER MU
-0x256D  0x03BD  # GREEK SMALL LETTER NU
-0x256E  0x03BE  # GREEK SMALL LETTER XI
-0x256F  0x03BF  # GREEK SMALL LETTER OMICRON
-0x2570  0x03C0  # GREEK SMALL LETTER PI
-0x2571  0x03C1  # GREEK SMALL LETTER RHO
-0x2572  0x03C3  # GREEK SMALL LETTER SIGMA
-0x2573  0x03C4  # GREEK SMALL LETTER TAU
-0x2574  0x03C5  # GREEK SMALL LETTER UPSILON
-0x2575  0x03C6  # GREEK SMALL LETTER PHI
-0x2576  0x03C7  # GREEK SMALL LETTER CHI
-0x2577  0x03C8  # GREEK SMALL LETTER PSI
-0x2578  0x03C9  # GREEK SMALL LETTER OMEGA
-0x2621  0x2500  # BOX DRAWINGS LIGHT HORIZONTAL
-0x2622  0x2502  # BOX DRAWINGS LIGHT VERTICAL
-0x2623  0x250C  # BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x2624  0x2510  # BOX DRAWINGS LIGHT DOWN AND LEFT
-0x2625  0x2518  # BOX DRAWINGS LIGHT UP AND LEFT
-0x2626  0x2514  # BOX DRAWINGS LIGHT UP AND RIGHT
-0x2627  0x251C  # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x2628  0x252C  # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x2629  0x2524  # BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x262A  0x2534  # BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x262B  0x253C  # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x262C  0x2501  # BOX DRAWINGS HEAVY HORIZONTAL
-0x262D  0x2503  # BOX DRAWINGS HEAVY VERTICAL
-0x262E  0x250F  # BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x262F  0x2513  # BOX DRAWINGS HEAVY DOWN AND LEFT
-0x2630  0x251B  # BOX DRAWINGS HEAVY UP AND LEFT
-0x2631  0x2517  # BOX DRAWINGS HEAVY UP AND RIGHT
-0x2632  0x2523  # BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x2633  0x2533  # BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x2634  0x252B  # BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x2635  0x253B  # BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x2636  0x254B  # BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x2637  0x2520  # BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x2638  0x252F  # BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x2639  0x2528  # BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x263A  0x2537  # BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x263B  0x253F  # BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x263C  0x251D  # BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x263D  0x2530  # BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x263E  0x2525  # BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x263F  0x2538  # BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x2640  0x2542  # BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x2641  0x2512  # BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
-0x2642  0x2511  # BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
-0x2643  0x251A  # BOX DRAWINGS UP HEAVY AND LEFT LIGHT
-0x2644  0x2519  # BOX DRAWINGS UP LIGHT AND LEFT HEAVY
-0x2645  0x2516  # BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
-0x2646  0x2515  # BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
-0x2647  0x250E  # BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
-0x2648  0x250D  # BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
-0x2649  0x251E  # BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
-0x264A  0x251F  # BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
-0x264B  0x2521  # BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
-0x264C  0x2522  # BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
-0x264D  0x2526  # BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
-0x264E  0x2527  # BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
-0x264F  0x2529  # BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
-0x2650  0x252A  # BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
-0x2651  0x252D  # BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
-0x2652  0x252E  # BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
-0x2653  0x2531  # BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
-0x2654  0x2532  # BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
-0x2655  0x2535  # BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
-0x2656  0x2536  # BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
-0x2657  0x2539  # BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
-0x2658  0x253A  # BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
-0x2659  0x253D  # BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
-0x265A  0x253E  # BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
-0x265B  0x2540  # BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
-0x265C  0x2541  # BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
-0x265D  0x2543  # BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
-0x265E  0x2544  # BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
-0x265F  0x2545  # BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
-0x2660  0x2546  # BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
-0x2661  0x2547  # BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
-0x2662  0x2548  # BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
-0x2663  0x2549  # BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
-0x2664  0x254A  # BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
-0x2721  0x3395  # SQUARE MU L
-0x2722  0x3396  # SQUARE ML
-0x2723  0x3397  # SQUARE DL
-0x2724  0x2113  # SCRIPT SMALL L
-0x2725  0x3398  # SQUARE KL
-0x2726  0x33C4  # SQUARE CC
-0x2727  0x33A3  # SQUARE MM CUBED
-0x2728  0x33A4  # SQUARE CM CUBED
-0x2729  0x33A5  # SQUARE M CUBED
-0x272A  0x33A6  # SQUARE KM CUBED
-0x272B  0x3399  # SQUARE FM
-0x272C  0x339A  # SQUARE NM
-0x272D  0x339B  # SQUARE MU M
-0x272E  0x339C  # SQUARE MM
-0x272F  0x339D  # SQUARE CM
-0x2730  0x339E  # SQUARE KM
-0x2731  0x339F  # SQUARE MM SQUARED
-0x2732  0x33A0  # SQUARE CM SQUARED
-0x2733  0x33A1  # SQUARE M SQUARED
-0x2734  0x33A2  # SQUARE KM SQUARED
-0x2735  0x33CA  # SQUARE HA
-0x2736  0x338D  # SQUARE MU G
-0x2737  0x338E  # SQUARE MG
-0x2738  0x338F  # SQUARE KG
-0x2739  0x33CF  # SQUARE KT
-0x273A  0x3388  # SQUARE CAL
-0x273B  0x3389  # SQUARE KCAL
-0x273C  0x33C8  # SQUARE DB
-0x273D  0x33A7  # SQUARE M OVER S
-0x273E  0x33A8  # SQUARE M OVER S SQUARED
-0x273F  0x33B0  # SQUARE PS
-0x2740  0x33B1  # SQUARE NS
-0x2741  0x33B2  # SQUARE MU S
-0x2742  0x33B3  # SQUARE MS
-0x2743  0x33B4  # SQUARE PV
-0x2744  0x33B5  # SQUARE NV
-0x2745  0x33B6  # SQUARE MU V
-0x2746  0x33B7  # SQUARE MV
-0x2747  0x33B8  # SQUARE KV
-0x2748  0x33B9  # SQUARE MV MEGA
-0x2749  0x3380  # SQUARE PA AMPS
-0x274A  0x3381  # SQUARE NA
-0x274B  0x3382  # SQUARE MU A
-0x274C  0x3383  # SQUARE MA
-0x274D  0x3384  # SQUARE KA
-0x274E  0x33BA  # SQUARE PW
-0x274F  0x33BB  # SQUARE NW
-0x2750  0x33BC  # SQUARE MU W
-0x2751  0x33BD  # SQUARE MW
-0x2752  0x33BE  # SQUARE KW
-0x2753  0x33BF  # SQUARE MW MEGA
-0x2754  0x3390  # SQUARE HZ
-0x2755  0x3391  # SQUARE KHZ
-0x2756  0x3392  # SQUARE MHZ
-0x2757  0x3393  # SQUARE GHZ
-0x2758  0x3394  # SQUARE THZ
-0x2759  0x2126  # OHM SIGN
-0x275A  0x33C0  # SQUARE K OHM
-0x275B  0x33C1  # SQUARE M OHM
-0x275C  0x338A  # SQUARE PF
-0x275D  0x338B  # SQUARE NF
-0x275E  0x338C  # SQUARE MU F
-0x275F  0x33D6  # SQUARE MOL
-0x2760  0x33C5  # SQUARE CD
-0x2761  0x33AD  # SQUARE RAD
-0x2762  0x33AE  # SQUARE RAD OVER S
-0x2763  0x33AF  # SQUARE RAD OVER S SQUARED
-0x2764  0x33DB  # SQUARE SR
-0x2765  0x33A9  # SQUARE PA
-0x2766  0x33AA  # SQUARE KPA
-0x2767  0x33AB  # SQUARE MPA
-0x2768  0x33AC  # SQUARE GPA
-0x2769  0x33DD  # SQUARE WB
-0x276A  0x33D0  # SQUARE LM
-0x276B  0x33D3  # SQUARE LX
-0x276C  0x33C3  # SQUARE BQ
-0x276D  0x33C9  # SQUARE GY
-0x276E  0x33DC  # SQUARE SV
-0x276F  0x33C6  # SQUARE C OVER KG
-0x2821  0x00C6  # LATIN CAPITAL LIGATURE AE
-0x2822  0x00D0  # LATIN CAPITAL LETTER ETH
-0x2823  0x00AA  # FEMININE ORDINAL INDICATOR
-0x2824  0x0126  # LATIN CAPITAL LETTER H WITH STROKE
-0x2826  0x0132  # LATIN CAPITAL LIGATURE IJ
-0x2828  0x013F  # LATIN CAPITAL LETTER L WITH MIDDLE DOT
-0x2829  0x0141  # LATIN CAPITAL LETTER L WITH STROKE
-0x282A  0x00D8  # LATIN CAPITAL LETTER O WITH STROKE
-0x282B  0x0152  # LATIN CAPITAL LIGATURE OE
-0x282C  0x00BA  # MASCULINE ORDINAL INDICATOR
-0x282D  0x00DE  # LATIN CAPITAL LETTER THORN
-0x282E  0x0166  # LATIN CAPITAL LETTER T WITH STROKE
-0x282F  0x014A  # LATIN CAPITAL LETTER ENG
-0x2831  0x3260  # CIRCLED HANGUL KIYEOK
-0x2832  0x3261  # CIRCLED HANGUL NIEUN
-0x2833  0x3262  # CIRCLED HANGUL TIKEUT
-0x2834  0x3263  # CIRCLED HANGUL RIEUL
-0x2835  0x3264  # CIRCLED HANGUL MIEUM
-0x2836  0x3265  # CIRCLED HANGUL PIEUP
-0x2837  0x3266  # CIRCLED HANGUL SIOS
-0x2838  0x3267  # CIRCLED HANGUL IEUNG
-0x2839  0x3268  # CIRCLED HANGUL CIEUC
-0x283A  0x3269  # CIRCLED HANGUL CHIEUCH
-0x283B  0x326A  # CIRCLED HANGUL KHIEUKH
-0x283C  0x326B  # CIRCLED HANGUL THIEUTH
-0x283D  0x326C  # CIRCLED HANGUL PHIEUPH
-0x283E  0x326D  # CIRCLED HANGUL HIEUH
-0x283F  0x326E  # CIRCLED HANGUL KIYEOK A
-0x2840  0x326F  # CIRCLED HANGUL NIEUN A
-0x2841  0x3270  # CIRCLED HANGUL TIKEUT A
-0x2842  0x3271  # CIRCLED HANGUL RIEUL A
-0x2843  0x3272  # CIRCLED HANGUL MIEUM A
-0x2844  0x3273  # CIRCLED HANGUL PIEUP A
-0x2845  0x3274  # CIRCLED HANGUL SIOS A
-0x2846  0x3275  # CIRCLED HANGUL IEUNG A
-0x2847  0x3276  # CIRCLED HANGUL CIEUC A
-0x2848  0x3277  # CIRCLED HANGUL CHIEUCH A
-0x2849  0x3278  # CIRCLED HANGUL KHIEUKH A
-0x284A  0x3279  # CIRCLED HANGUL THIEUTH A
-0x284B  0x327A  # CIRCLED HANGUL PHIEUPH A
-0x284C  0x327B  # CIRCLED HANGUL HIEUH A
-0x284D  0x24D0  # CIRCLED LATIN SMALL LETTER A
-0x284E  0x24D1  # CIRCLED LATIN SMALL LETTER B
-0x284F  0x24D2  # CIRCLED LATIN SMALL LETTER C
-0x2850  0x24D3  # CIRCLED LATIN SMALL LETTER D
-0x2851  0x24D4  # CIRCLED LATIN SMALL LETTER E
-0x2852  0x24D5  # CIRCLED LATIN SMALL LETTER F
-0x2853  0x24D6  # CIRCLED LATIN SMALL LETTER G
-0x2854  0x24D7  # CIRCLED LATIN SMALL LETTER H
-0x2855  0x24D8  # CIRCLED LATIN SMALL LETTER I
-0x2856  0x24D9  # CIRCLED LATIN SMALL LETTER J
-0x2857  0x24DA  # CIRCLED LATIN SMALL LETTER K
-0x2858  0x24DB  # CIRCLED LATIN SMALL LETTER L
-0x2859  0x24DC  # CIRCLED LATIN SMALL LETTER M
-0x285A  0x24DD  # CIRCLED LATIN SMALL LETTER N
-0x285B  0x24DE  # CIRCLED LATIN SMALL LETTER O
-0x285C  0x24DF  # CIRCLED LATIN SMALL LETTER P
-0x285D  0x24E0  # CIRCLED LATIN SMALL LETTER Q
-0x285E  0x24E1  # CIRCLED LATIN SMALL LETTER R
-0x285F  0x24E2  # CIRCLED LATIN SMALL LETTER S
-0x2860  0x24E3  # CIRCLED LATIN SMALL LETTER T
-0x2861  0x24E4  # CIRCLED LATIN SMALL LETTER U
-0x2862  0x24E5  # CIRCLED LATIN SMALL LETTER V
-0x2863  0x24E6  # CIRCLED LATIN SMALL LETTER W
-0x2864  0x24E7  # CIRCLED LATIN SMALL LETTER X
-0x2865  0x24E8  # CIRCLED LATIN SMALL LETTER Y
-0x2866  0x24E9  # CIRCLED LATIN SMALL LETTER Z
-0x2867  0x2460  # CIRCLED DIGIT ONE
-0x2868  0x2461  # CIRCLED DIGIT TWO
-0x2869  0x2462  # CIRCLED DIGIT THREE
-0x286A  0x2463  # CIRCLED DIGIT FOUR
-0x286B  0x2464  # CIRCLED DIGIT FIVE
-0x286C  0x2465  # CIRCLED DIGIT SIX
-0x286D  0x2466  # CIRCLED DIGIT SEVEN
-0x286E  0x2467  # CIRCLED DIGIT EIGHT
-0x286F  0x2468  # CIRCLED DIGIT NINE
-0x2870  0x2469  # CIRCLED NUMBER TEN
-0x2871  0x246A  # CIRCLED NUMBER ELEVEN
-0x2872  0x246B  # CIRCLED NUMBER TWELVE
-0x2873  0x246C  # CIRCLED NUMBER THIRTEEN
-0x2874  0x246D  # CIRCLED NUMBER FOURTEEN
-0x2875  0x246E  # CIRCLED NUMBER FIFTEEN
-0x2876  0x00BD  # VULGAR FRACTION ONE HALF
-0x2877  0x2153  # VULGAR FRACTION ONE THIRD
-0x2878  0x2154  # VULGAR FRACTION TWO THIRDS
-0x2879  0x00BC  # VULGAR FRACTION ONE QUARTER
-0x287A  0x00BE  # VULGAR FRACTION THREE QUARTERS
-0x287B  0x215B  # VULGAR FRACTION ONE EIGHTH
-0x287C  0x215C  # VULGAR FRACTION THREE EIGHTHS
-0x287D  0x215D  # VULGAR FRACTION FIVE EIGHTHS
-0x287E  0x215E  # VULGAR FRACTION SEVEN EIGHTHS
-0x2921  0x00E6  # LATIN SMALL LIGATURE AE
-0x2922  0x0111  # LATIN SMALL LETTER D WITH STROKE
-0x2923  0x00F0  # LATIN SMALL LETTER ETH
-0x2924  0x0127  # LATIN SMALL LETTER H WITH STROKE
-0x2925  0x0131  # LATIN SMALL LETTER DOTLESS I
-0x2926  0x0133  # LATIN SMALL LIGATURE IJ
-0x2927  0x0138  # LATIN SMALL LETTER KRA
-0x2928  0x0140  # LATIN SMALL LETTER L WITH MIDDLE DOT
-0x2929  0x0142  # LATIN SMALL LETTER L WITH STROKE
-0x292A  0x00F8  # LATIN SMALL LETTER O WITH STROKE
-0x292B  0x0153  # LATIN SMALL LIGATURE OE
-0x292C  0x00DF  # LATIN SMALL LETTER SHARP S
-0x292D  0x00FE  # LATIN SMALL LETTER THORN
-0x292E  0x0167  # LATIN SMALL LETTER T WITH STROKE
-0x292F  0x014B  # LATIN SMALL LETTER ENG
-0x2930  0x0149  # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-0x2931  0x3200  # PARENTHESIZED HANGUL KIYEOK
-0x2932  0x3201  # PARENTHESIZED HANGUL NIEUN
-0x2933  0x3202  # PARENTHESIZED HANGUL TIKEUT
-0x2934  0x3203  # PARENTHESIZED HANGUL RIEUL
-0x2935  0x3204  # PARENTHESIZED HANGUL MIEUM
-0x2936  0x3205  # PARENTHESIZED HANGUL PIEUP
-0x2937  0x3206  # PARENTHESIZED HANGUL SIOS
-0x2938  0x3207  # PARENTHESIZED HANGUL IEUNG
-0x2939  0x3208  # PARENTHESIZED HANGUL CIEUC
-0x293A  0x3209  # PARENTHESIZED HANGUL CHIEUCH
-0x293B  0x320A  # PARENTHESIZED HANGUL KHIEUKH
-0x293C  0x320B  # PARENTHESIZED HANGUL THIEUTH
-0x293D  0x320C  # PARENTHESIZED HANGUL PHIEUPH
-0x293E  0x320D  # PARENTHESIZED HANGUL HIEUH
-0x293F  0x320E  # PARENTHESIZED HANGUL KIYEOK A
-0x2940  0x320F  # PARENTHESIZED HANGUL NIEUN A
-0x2941  0x3210  # PARENTHESIZED HANGUL TIKEUT A
-0x2942  0x3211  # PARENTHESIZED HANGUL RIEUL A
-0x2943  0x3212  # PARENTHESIZED HANGUL MIEUM A
-0x2944  0x3213  # PARENTHESIZED HANGUL PIEUP A
-0x2945  0x3214  # PARENTHESIZED HANGUL SIOS A
-0x2946  0x3215  # PARENTHESIZED HANGUL IEUNG A
-0x2947  0x3216  # PARENTHESIZED HANGUL CIEUC A
-0x2948  0x3217  # PARENTHESIZED HANGUL CHIEUCH A
-0x2949  0x3218  # PARENTHESIZED HANGUL KHIEUKH A
-0x294A  0x3219  # PARENTHESIZED HANGUL THIEUTH A
-0x294B  0x321A  # PARENTHESIZED HANGUL PHIEUPH A
-0x294C  0x321B  # PARENTHESIZED HANGUL HIEUH A
-0x294D  0x249C  # PARENTHESIZED LATIN SMALL LETTER A
-0x294E  0x249D  # PARENTHESIZED LATIN SMALL LETTER B
-0x294F  0x249E  # PARENTHESIZED LATIN SMALL LETTER C
-0x2950  0x249F  # PARENTHESIZED LATIN SMALL LETTER D
-0x2951  0x24A0  # PARENTHESIZED LATIN SMALL LETTER E
-0x2952  0x24A1  # PARENTHESIZED LATIN SMALL LETTER F
-0x2953  0x24A2  # PARENTHESIZED LATIN SMALL LETTER G
-0x2954  0x24A3  # PARENTHESIZED LATIN SMALL LETTER H
-0x2955  0x24A4  # PARENTHESIZED LATIN SMALL LETTER I
-0x2956  0x24A5  # PARENTHESIZED LATIN SMALL LETTER J
-0x2957  0x24A6  # PARENTHESIZED LATIN SMALL LETTER K
-0x2958  0x24A7  # PARENTHESIZED LATIN SMALL LETTER L
-0x2959  0x24A8  # PARENTHESIZED LATIN SMALL LETTER M
-0x295A  0x24A9  # PARENTHESIZED LATIN SMALL LETTER N
-0x295B  0x24AA  # PARENTHESIZED LATIN SMALL LETTER O
-0x295C  0x24AB  # PARENTHESIZED LATIN SMALL LETTER P
-0x295D  0x24AC  # PARENTHESIZED LATIN SMALL LETTER Q
-0x295E  0x24AD  # PARENTHESIZED LATIN SMALL LETTER R
-0x295F  0x24AE  # PARENTHESIZED LATIN SMALL LETTER S
-0x2960  0x24AF  # PARENTHESIZED LATIN SMALL LETTER T
-0x2961  0x24B0  # PARENTHESIZED LATIN SMALL LETTER U
-0x2962  0x24B1  # PARENTHESIZED LATIN SMALL LETTER V
-0x2963  0x24B2  # PARENTHESIZED LATIN SMALL LETTER W
-0x2964  0x24B3  # PARENTHESIZED LATIN SMALL LETTER X
-0x2965  0x24B4  # PARENTHESIZED LATIN SMALL LETTER Y
-0x2966  0x24B5  # PARENTHESIZED LATIN SMALL LETTER Z
-0x2967  0x2474  # PARENTHESIZED DIGIT ONE
-0x2968  0x2475  # PARENTHESIZED DIGIT TWO
-0x2969  0x2476  # PARENTHESIZED DIGIT THREE
-0x296A  0x2477  # PARENTHESIZED DIGIT FOUR
-0x296B  0x2478  # PARENTHESIZED DIGIT FIVE
-0x296C  0x2479  # PARENTHESIZED DIGIT SIX
-0x296D  0x247A  # PARENTHESIZED DIGIT SEVEN
-0x296E  0x247B  # PARENTHESIZED DIGIT EIGHT
-0x296F  0x247C  # PARENTHESIZED DIGIT NINE
-0x2970  0x247D  # PARENTHESIZED NUMBER TEN
-0x2971  0x247E  # PARENTHESIZED NUMBER ELEVEN
-0x2972  0x247F  # PARENTHESIZED NUMBER TWELVE
-0x2973  0x2480  # PARENTHESIZED NUMBER THIRTEEN
-0x2974  0x2481  # PARENTHESIZED NUMBER FOURTEEN
-0x2975  0x2482  # PARENTHESIZED NUMBER FIFTEEN
-0x2976  0x00B9  # SUPERSCRIPT ONE
-0x2977  0x00B2  # SUPERSCRIPT TWO
-0x2978  0x00B3  # SUPERSCRIPT THREE
-0x2979  0x2074  # SUPERSCRIPT FOUR
-0x297A  0x207F  # SUPERSCRIPT LATIN SMALL LETTER N
-0x297B  0x2081  # SUBSCRIPT ONE
-0x297C  0x2082  # SUBSCRIPT TWO
-0x297D  0x2083  # SUBSCRIPT THREE
-0x297E  0x2084  # SUBSCRIPT FOUR
-0x2A21  0x3041  # HIRAGANA LETTER SMALL A
-0x2A22  0x3042  # HIRAGANA LETTER A
-0x2A23  0x3043  # HIRAGANA LETTER SMALL I
-0x2A24  0x3044  # HIRAGANA LETTER I
-0x2A25  0x3045  # HIRAGANA LETTER SMALL U
-0x2A26  0x3046  # HIRAGANA LETTER U
-0x2A27  0x3047  # HIRAGANA LETTER SMALL E
-0x2A28  0x3048  # HIRAGANA LETTER E
-0x2A29  0x3049  # HIRAGANA LETTER SMALL O
-0x2A2A  0x304A  # HIRAGANA LETTER O
-0x2A2B  0x304B  # HIRAGANA LETTER KA
-0x2A2C  0x304C  # HIRAGANA LETTER GA
-0x2A2D  0x304D  # HIRAGANA LETTER KI
-0x2A2E  0x304E  # HIRAGANA LETTER GI
-0x2A2F  0x304F  # HIRAGANA LETTER KU
-0x2A30  0x3050  # HIRAGANA LETTER GU
-0x2A31  0x3051  # HIRAGANA LETTER KE
-0x2A32  0x3052  # HIRAGANA LETTER GE
-0x2A33  0x3053  # HIRAGANA LETTER KO
-0x2A34  0x3054  # HIRAGANA LETTER GO
-0x2A35  0x3055  # HIRAGANA LETTER SA
-0x2A36  0x3056  # HIRAGANA LETTER ZA
-0x2A37  0x3057  # HIRAGANA LETTER SI
-0x2A38  0x3058  # HIRAGANA LETTER ZI
-0x2A39  0x3059  # HIRAGANA LETTER SU
-0x2A3A  0x305A  # HIRAGANA LETTER ZU
-0x2A3B  0x305B  # HIRAGANA LETTER SE
-0x2A3C  0x305C  # HIRAGANA LETTER ZE
-0x2A3D  0x305D  # HIRAGANA LETTER SO
-0x2A3E  0x305E  # HIRAGANA LETTER ZO
-0x2A3F  0x305F  # HIRAGANA LETTER TA
-0x2A40  0x3060  # HIRAGANA LETTER DA
-0x2A41  0x3061  # HIRAGANA LETTER TI
-0x2A42  0x3062  # HIRAGANA LETTER DI
-0x2A43  0x3063  # HIRAGANA LETTER SMALL TU
-0x2A44  0x3064  # HIRAGANA LETTER TU
-0x2A45  0x3065  # HIRAGANA LETTER DU
-0x2A46  0x3066  # HIRAGANA LETTER TE
-0x2A47  0x3067  # HIRAGANA LETTER DE
-0x2A48  0x3068  # HIRAGANA LETTER TO
-0x2A49  0x3069  # HIRAGANA LETTER DO
-0x2A4A  0x306A  # HIRAGANA LETTER NA
-0x2A4B  0x306B  # HIRAGANA LETTER NI
-0x2A4C  0x306C  # HIRAGANA LETTER NU
-0x2A4D  0x306D  # HIRAGANA LETTER NE
-0x2A4E  0x306E  # HIRAGANA LETTER NO
-0x2A4F  0x306F  # HIRAGANA LETTER HA
-0x2A50  0x3070  # HIRAGANA LETTER BA
-0x2A51  0x3071  # HIRAGANA LETTER PA
-0x2A52  0x3072  # HIRAGANA LETTER HI
-0x2A53  0x3073  # HIRAGANA LETTER BI
-0x2A54  0x3074  # HIRAGANA LETTER PI
-0x2A55  0x3075  # HIRAGANA LETTER HU
-0x2A56  0x3076  # HIRAGANA LETTER BU
-0x2A57  0x3077  # HIRAGANA LETTER PU
-0x2A58  0x3078  # HIRAGANA LETTER HE
-0x2A59  0x3079  # HIRAGANA LETTER BE
-0x2A5A  0x307A  # HIRAGANA LETTER PE
-0x2A5B  0x307B  # HIRAGANA LETTER HO
-0x2A5C  0x307C  # HIRAGANA LETTER BO
-0x2A5D  0x307D  # HIRAGANA LETTER PO
-0x2A5E  0x307E  # HIRAGANA LETTER MA
-0x2A5F  0x307F  # HIRAGANA LETTER MI
-0x2A60  0x3080  # HIRAGANA LETTER MU
-0x2A61  0x3081  # HIRAGANA LETTER ME
-0x2A62  0x3082  # HIRAGANA LETTER MO
-0x2A63  0x3083  # HIRAGANA LETTER SMALL YA
-0x2A64  0x3084  # HIRAGANA LETTER YA
-0x2A65  0x3085  # HIRAGANA LETTER SMALL YU
-0x2A66  0x3086  # HIRAGANA LETTER YU
-0x2A67  0x3087  # HIRAGANA LETTER SMALL YO
-0x2A68  0x3088  # HIRAGANA LETTER YO
-0x2A69  0x3089  # HIRAGANA LETTER RA
-0x2A6A  0x308A  # HIRAGANA LETTER RI
-0x2A6B  0x308B  # HIRAGANA LETTER RU
-0x2A6C  0x308C  # HIRAGANA LETTER RE
-0x2A6D  0x308D  # HIRAGANA LETTER RO
-0x2A6E  0x308E  # HIRAGANA LETTER SMALL WA
-0x2A6F  0x308F  # HIRAGANA LETTER WA
-0x2A70  0x3090  # HIRAGANA LETTER WI
-0x2A71  0x3091  # HIRAGANA LETTER WE
-0x2A72  0x3092  # HIRAGANA LETTER WO
-0x2A73  0x3093  # HIRAGANA LETTER N
-0x2B21  0x30A1  # KATAKANA LETTER SMALL A
-0x2B22  0x30A2  # KATAKANA LETTER A
-0x2B23  0x30A3  # KATAKANA LETTER SMALL I
-0x2B24  0x30A4  # KATAKANA LETTER I
-0x2B25  0x30A5  # KATAKANA LETTER SMALL U
-0x2B26  0x30A6  # KATAKANA LETTER U
-0x2B27  0x30A7  # KATAKANA LETTER SMALL E
-0x2B28  0x30A8  # KATAKANA LETTER E
-0x2B29  0x30A9  # KATAKANA LETTER SMALL O
-0x2B2A  0x30AA  # KATAKANA LETTER O
-0x2B2B  0x30AB  # KATAKANA LETTER KA
-0x2B2C  0x30AC  # KATAKANA LETTER GA
-0x2B2D  0x30AD  # KATAKANA LETTER KI
-0x2B2E  0x30AE  # KATAKANA LETTER GI
-0x2B2F  0x30AF  # KATAKANA LETTER KU
-0x2B30  0x30B0  # KATAKANA LETTER GU
-0x2B31  0x30B1  # KATAKANA LETTER KE
-0x2B32  0x30B2  # KATAKANA LETTER GE
-0x2B33  0x30B3  # KATAKANA LETTER KO
-0x2B34  0x30B4  # KATAKANA LETTER GO
-0x2B35  0x30B5  # KATAKANA LETTER SA
-0x2B36  0x30B6  # KATAKANA LETTER ZA
-0x2B37  0x30B7  # KATAKANA LETTER SI
-0x2B38  0x30B8  # KATAKANA LETTER ZI
-0x2B39  0x30B9  # KATAKANA LETTER SU
-0x2B3A  0x30BA  # KATAKANA LETTER ZU
-0x2B3B  0x30BB  # KATAKANA LETTER SE
-0x2B3C  0x30BC  # KATAKANA LETTER ZE
-0x2B3D  0x30BD  # KATAKANA LETTER SO
-0x2B3E  0x30BE  # KATAKANA LETTER ZO
-0x2B3F  0x30BF  # KATAKANA LETTER TA
-0x2B40  0x30C0  # KATAKANA LETTER DA
-0x2B41  0x30C1  # KATAKANA LETTER TI
-0x2B42  0x30C2  # KATAKANA LETTER DI
-0x2B43  0x30C3  # KATAKANA LETTER SMALL TU
-0x2B44  0x30C4  # KATAKANA LETTER TU
-0x2B45  0x30C5  # KATAKANA LETTER DU
-0x2B46  0x30C6  # KATAKANA LETTER TE
-0x2B47  0x30C7  # KATAKANA LETTER DE
-0x2B48  0x30C8  # KATAKANA LETTER TO
-0x2B49  0x30C9  # KATAKANA LETTER DO
-0x2B4A  0x30CA  # KATAKANA LETTER NA
-0x2B4B  0x30CB  # KATAKANA LETTER NI
-0x2B4C  0x30CC  # KATAKANA LETTER NU
-0x2B4D  0x30CD  # KATAKANA LETTER NE
-0x2B4E  0x30CE  # KATAKANA LETTER NO
-0x2B4F  0x30CF  # KATAKANA LETTER HA
-0x2B50  0x30D0  # KATAKANA LETTER BA
-0x2B51  0x30D1  # KATAKANA LETTER PA
-0x2B52  0x30D2  # KATAKANA LETTER HI
-0x2B53  0x30D3  # KATAKANA LETTER BI
-0x2B54  0x30D4  # KATAKANA LETTER PI
-0x2B55  0x30D5  # KATAKANA LETTER HU
-0x2B56  0x30D6  # KATAKANA LETTER BU
-0x2B57  0x30D7  # KATAKANA LETTER PU
-0x2B58  0x30D8  # KATAKANA LETTER HE
-0x2B59  0x30D9  # KATAKANA LETTER BE
-0x2B5A  0x30DA  # KATAKANA LETTER PE
-0x2B5B  0x30DB  # KATAKANA LETTER HO
-0x2B5C  0x30DC  # KATAKANA LETTER BO
-0x2B5D  0x30DD  # KATAKANA LETTER PO
-0x2B5E  0x30DE  # KATAKANA LETTER MA
-0x2B5F  0x30DF  # KATAKANA LETTER MI
-0x2B60  0x30E0  # KATAKANA LETTER MU
-0x2B61  0x30E1  # KATAKANA LETTER ME
-0x2B62  0x30E2  # KATAKANA LETTER MO
-0x2B63  0x30E3  # KATAKANA LETTER SMALL YA
-0x2B64  0x30E4  # KATAKANA LETTER YA
-0x2B65  0x30E5  # KATAKANA LETTER SMALL YU
-0x2B66  0x30E6  # KATAKANA LETTER YU
-0x2B67  0x30E7  # KATAKANA LETTER SMALL YO
-0x2B68  0x30E8  # KATAKANA LETTER YO
-0x2B69  0x30E9  # KATAKANA LETTER RA
-0x2B6A  0x30EA  # KATAKANA LETTER RI
-0x2B6B  0x30EB  # KATAKANA LETTER RU
-0x2B6C  0x30EC  # KATAKANA LETTER RE
-0x2B6D  0x30ED  # KATAKANA LETTER RO
-0x2B6E  0x30EE  # KATAKANA LETTER SMALL WA
-0x2B6F  0x30EF  # KATAKANA LETTER WA
-0x2B70  0x30F0  # KATAKANA LETTER WI
-0x2B71  0x30F1  # KATAKANA LETTER WE
-0x2B72  0x30F2  # KATAKANA LETTER WO
-0x2B73  0x30F3  # KATAKANA LETTER N
-0x2B74  0x30F4  # KATAKANA LETTER VU
-0x2B75  0x30F5  # KATAKANA LETTER SMALL KA
-0x2B76  0x30F6  # KATAKANA LETTER SMALL KE
-0x2C21  0x0410  # CYRILLIC CAPITAL LETTER A
-0x2C22  0x0411  # CYRILLIC CAPITAL LETTER BE
-0x2C23  0x0412  # CYRILLIC CAPITAL LETTER VE
-0x2C24  0x0413  # CYRILLIC CAPITAL LETTER GHE
-0x2C25  0x0414  # CYRILLIC CAPITAL LETTER DE
-0x2C26  0x0415  # CYRILLIC CAPITAL LETTER IE
-0x2C27  0x0401  # CYRILLIC CAPITAL LETTER IO
-0x2C28  0x0416  # CYRILLIC CAPITAL LETTER ZHE
-0x2C29  0x0417  # CYRILLIC CAPITAL LETTER ZE
-0x2C2A  0x0418  # CYRILLIC CAPITAL LETTER I
-0x2C2B  0x0419  # CYRILLIC CAPITAL LETTER SHORT I
-0x2C2C  0x041A  # CYRILLIC CAPITAL LETTER KA
-0x2C2D  0x041B  # CYRILLIC CAPITAL LETTER EL
-0x2C2E  0x041C  # CYRILLIC CAPITAL LETTER EM
-0x2C2F  0x041D  # CYRILLIC CAPITAL LETTER EN
-0x2C30  0x041E  # CYRILLIC CAPITAL LETTER O
-0x2C31  0x041F  # CYRILLIC CAPITAL LETTER PE
-0x2C32  0x0420  # CYRILLIC CAPITAL LETTER ER
-0x2C33  0x0421  # CYRILLIC CAPITAL LETTER ES
-0x2C34  0x0422  # CYRILLIC CAPITAL LETTER TE
-0x2C35  0x0423  # CYRILLIC CAPITAL LETTER U
-0x2C36  0x0424  # CYRILLIC CAPITAL LETTER EF
-0x2C37  0x0425  # CYRILLIC CAPITAL LETTER HA
-0x2C38  0x0426  # CYRILLIC CAPITAL LETTER TSE
-0x2C39  0x0427  # CYRILLIC CAPITAL LETTER CHE
-0x2C3A  0x0428  # CYRILLIC CAPITAL LETTER SHA
-0x2C3B  0x0429  # CYRILLIC CAPITAL LETTER SHCHA
-0x2C3C  0x042A  # CYRILLIC CAPITAL LETTER HARD SIGN
-0x2C3D  0x042B  # CYRILLIC CAPITAL LETTER YERU
-0x2C3E  0x042C  # CYRILLIC CAPITAL LETTER SOFT SIGN
-0x2C3F  0x042D  # CYRILLIC CAPITAL LETTER E
-0x2C40  0x042E  # CYRILLIC CAPITAL LETTER YU
-0x2C41  0x042F  # CYRILLIC CAPITAL LETTER YA
-0x2C51  0x0430  # CYRILLIC SMALL LETTER A
-0x2C52  0x0431  # CYRILLIC SMALL LETTER BE
-0x2C53  0x0432  # CYRILLIC SMALL LETTER VE
-0x2C54  0x0433  # CYRILLIC SMALL LETTER GHE
-0x2C55  0x0434  # CYRILLIC SMALL LETTER DE
-0x2C56  0x0435  # CYRILLIC SMALL LETTER IE
-0x2C57  0x0451  # CYRILLIC SMALL LETTER IO
-0x2C58  0x0436  # CYRILLIC SMALL LETTER ZHE
-0x2C59  0x0437  # CYRILLIC SMALL LETTER ZE
-0x2C5A  0x0438  # CYRILLIC SMALL LETTER I
-0x2C5B  0x0439  # CYRILLIC SMALL LETTER SHORT I
-0x2C5C  0x043A  # CYRILLIC SMALL LETTER KA
-0x2C5D  0x043B  # CYRILLIC SMALL LETTER EL
-0x2C5E  0x043C  # CYRILLIC SMALL LETTER EM
-0x2C5F  0x043D  # CYRILLIC SMALL LETTER EN
-0x2C60  0x043E  # CYRILLIC SMALL LETTER O
-0x2C61  0x043F  # CYRILLIC SMALL LETTER PE
-0x2C62  0x0440  # CYRILLIC SMALL LETTER ER
-0x2C63  0x0441  # CYRILLIC SMALL LETTER ES
-0x2C64  0x0442  # CYRILLIC SMALL LETTER TE
-0x2C65  0x0443  # CYRILLIC SMALL LETTER U
-0x2C66  0x0444  # CYRILLIC SMALL LETTER EF
-0x2C67  0x0445  # CYRILLIC SMALL LETTER HA
-0x2C68  0x0446  # CYRILLIC SMALL LETTER TSE
-0x2C69  0x0447  # CYRILLIC SMALL LETTER CHE
-0x2C6A  0x0448  # CYRILLIC SMALL LETTER SHA
-0x2C6B  0x0449  # CYRILLIC SMALL LETTER SHCHA
-0x2C6C  0x044A  # CYRILLIC SMALL LETTER HARD SIGN
-0x2C6D  0x044B  # CYRILLIC SMALL LETTER YERU
-0x2C6E  0x044C  # CYRILLIC SMALL LETTER SOFT SIGN
-0x2C6F  0x044D  # CYRILLIC SMALL LETTER E
-0x2C70  0x044E  # CYRILLIC SMALL LETTER YU
-0x2C71  0x044F  # CYRILLIC SMALL LETTER YA
-0x3021  0xAC00  # HANGUL SYLLABLE KIYEOK-A
-0x3022  0xAC01  # HANGUL SYLLABLE KIYEOK-A-KIYEOK
-0x3023  0xAC04  # HANGUL SYLLABLE KIYEOK-A-NIEUN
-0x3024  0xAC07  # HANGUL SYLLABLE KIYEOK-A-TIKEUT
-0x3025  0xAC08  # HANGUL SYLLABLE KIYEOK-A-RIEUL
-0x3026  0xAC09  # HANGUL SYLLABLE KIYEOK-A-RIEULKIYEOK
-0x3027  0xAC0A  # HANGUL SYLLABLE KIYEOK-A-RIEULMIEUM
-0x3028  0xAC10  # HANGUL SYLLABLE KIYEOK-A-MIEUM
-0x3029  0xAC11  # HANGUL SYLLABLE KIYEOK-A-PIEUP
-0x302A  0xAC12  # HANGUL SYLLABLE KIYEOK-A-PIEUPSIOS
-0x302B  0xAC13  # HANGUL SYLLABLE KIYEOK-A-SIOS
-0x302C  0xAC14  # HANGUL SYLLABLE KIYEOK-A-SSANGSIOS
-0x302D  0xAC15  # HANGUL SYLLABLE KIYEOK-A-IEUNG
-0x302E  0xAC16  # HANGUL SYLLABLE KIYEOK-A-CIEUC
-0x302F  0xAC17  # HANGUL SYLLABLE KIYEOK-A-CHIEUCH
-0x3030  0xAC19  # HANGUL SYLLABLE KIYEOK-A-THIEUTH
-0x3031  0xAC1A  # HANGUL SYLLABLE KIYEOK-A-PHIEUPH
-0x3032  0xAC1B  # HANGUL SYLLABLE KIYEOK-A-HIEUH
-0x3033  0xAC1C  # HANGUL SYLLABLE KIYEOK-AE
-0x3034  0xAC1D  # HANGUL SYLLABLE KIYEOK-AE-KIYEOK
-0x3035  0xAC20  # HANGUL SYLLABLE KIYEOK-AE-NIEUN
-0x3036  0xAC24  # HANGUL SYLLABLE KIYEOK-AE-RIEUL
-0x3037  0xAC2C  # HANGUL SYLLABLE KIYEOK-AE-MIEUM
-0x3038  0xAC2D  # HANGUL SYLLABLE KIYEOK-AE-PIEUP
-0x3039  0xAC2F  # HANGUL SYLLABLE KIYEOK-AE-SIOS
-0x303A  0xAC30  # HANGUL SYLLABLE KIYEOK-AE-SSANGSIOS
-0x303B  0xAC31  # HANGUL SYLLABLE KIYEOK-AE-IEUNG
-0x303C  0xAC38  # HANGUL SYLLABLE KIYEOK-YA
-0x303D  0xAC39  # HANGUL SYLLABLE KIYEOK-YA-KIYEOK
-0x303E  0xAC3C  # HANGUL SYLLABLE KIYEOK-YA-NIEUN
-0x303F  0xAC40  # HANGUL SYLLABLE KIYEOK-YA-RIEUL
-0x3040  0xAC4B  # HANGUL SYLLABLE KIYEOK-YA-SIOS
-0x3041  0xAC4D  # HANGUL SYLLABLE KIYEOK-YA-IEUNG
-0x3042  0xAC54  # HANGUL SYLLABLE KIYEOK-YAE
-0x3043  0xAC58  # HANGUL SYLLABLE KIYEOK-YAE-NIEUN
-0x3044  0xAC5C  # HANGUL SYLLABLE KIYEOK-YAE-RIEUL
-0x3045  0xAC70  # HANGUL SYLLABLE KIYEOK-EO
-0x3046  0xAC71  # HANGUL SYLLABLE KIYEOK-EO-KIYEOK
-0x3047  0xAC74  # HANGUL SYLLABLE KIYEOK-EO-NIEUN
-0x3048  0xAC77  # HANGUL SYLLABLE KIYEOK-EO-TIKEUT
-0x3049  0xAC78  # HANGUL SYLLABLE KIYEOK-EO-RIEUL
-0x304A  0xAC7A  # HANGUL SYLLABLE KIYEOK-EO-RIEULMIEUM
-0x304B  0xAC80  # HANGUL SYLLABLE KIYEOK-EO-MIEUM
-0x304C  0xAC81  # HANGUL SYLLABLE KIYEOK-EO-PIEUP
-0x304D  0xAC83  # HANGUL SYLLABLE KIYEOK-EO-SIOS
-0x304E  0xAC84  # HANGUL SYLLABLE KIYEOK-EO-SSANGSIOS
-0x304F  0xAC85  # HANGUL SYLLABLE KIYEOK-EO-IEUNG
-0x3050  0xAC86  # HANGUL SYLLABLE KIYEOK-EO-CIEUC
-0x3051  0xAC89  # HANGUL SYLLABLE KIYEOK-EO-THIEUTH
-0x3052  0xAC8A  # HANGUL SYLLABLE KIYEOK-EO-PHIEUPH
-0x3053  0xAC8B  # HANGUL SYLLABLE KIYEOK-EO-HIEUH
-0x3054  0xAC8C  # HANGUL SYLLABLE KIYEOK-E
-0x3055  0xAC90  # HANGUL SYLLABLE KIYEOK-E-NIEUN
-0x3056  0xAC94  # HANGUL SYLLABLE KIYEOK-E-RIEUL
-0x3057  0xAC9C  # HANGUL SYLLABLE KIYEOK-E-MIEUM
-0x3058  0xAC9D  # HANGUL SYLLABLE KIYEOK-E-PIEUP
-0x3059  0xAC9F  # HANGUL SYLLABLE KIYEOK-E-SIOS
-0x305A  0xACA0  # HANGUL SYLLABLE KIYEOK-E-SSANGSIOS
-0x305B  0xACA1  # HANGUL SYLLABLE KIYEOK-E-IEUNG
-0x305C  0xACA8  # HANGUL SYLLABLE KIYEOK-YEO
-0x305D  0xACA9  # HANGUL SYLLABLE KIYEOK-YEO-KIYEOK
-0x305E  0xACAA  # HANGUL SYLLABLE KIYEOK-YEO-SSANGKIYEOK
-0x305F  0xACAC  # HANGUL SYLLABLE KIYEOK-YEO-NIEUN
-0x3060  0xACAF  # HANGUL SYLLABLE KIYEOK-YEO-TIKEUT
-0x3061  0xACB0  # HANGUL SYLLABLE KIYEOK-YEO-RIEUL
-0x3062  0xACB8  # HANGUL SYLLABLE KIYEOK-YEO-MIEUM
-0x3063  0xACB9  # HANGUL SYLLABLE KIYEOK-YEO-PIEUP
-0x3064  0xACBB  # HANGUL SYLLABLE KIYEOK-YEO-SIOS
-0x3065  0xACBC  # HANGUL SYLLABLE KIYEOK-YEO-SSANGSIOS
-0x3066  0xACBD  # HANGUL SYLLABLE KIYEOK-YEO-IEUNG
-0x3067  0xACC1  # HANGUL SYLLABLE KIYEOK-YEO-THIEUTH
-0x3068  0xACC4  # HANGUL SYLLABLE KIYEOK-YE
-0x3069  0xACC8  # HANGUL SYLLABLE KIYEOK-YE-NIEUN
-0x306A  0xACCC  # HANGUL SYLLABLE KIYEOK-YE-RIEUL
-0x306B  0xACD5  # HANGUL SYLLABLE KIYEOK-YE-PIEUP
-0x306C  0xACD7  # HANGUL SYLLABLE KIYEOK-YE-SIOS
-0x306D  0xACE0  # HANGUL SYLLABLE KIYEOK-O
-0x306E  0xACE1  # HANGUL SYLLABLE KIYEOK-O-KIYEOK
-0x306F  0xACE4  # HANGUL SYLLABLE KIYEOK-O-NIEUN
-0x3070  0xACE7  # HANGUL SYLLABLE KIYEOK-O-TIKEUT
-0x3071  0xACE8  # HANGUL SYLLABLE KIYEOK-O-RIEUL
-0x3072  0xACEA  # HANGUL SYLLABLE KIYEOK-O-RIEULMIEUM
-0x3073  0xACEC  # HANGUL SYLLABLE KIYEOK-O-RIEULSIOS
-0x3074  0xACEF  # HANGUL SYLLABLE KIYEOK-O-RIEULHIEUH
-0x3075  0xACF0  # HANGUL SYLLABLE KIYEOK-O-MIEUM
-0x3076  0xACF1  # HANGUL SYLLABLE KIYEOK-O-PIEUP
-0x3077  0xACF3  # HANGUL SYLLABLE KIYEOK-O-SIOS
-0x3078  0xACF5  # HANGUL SYLLABLE KIYEOK-O-IEUNG
-0x3079  0xACF6  # HANGUL SYLLABLE KIYEOK-O-CIEUC
-0x307A  0xACFC  # HANGUL SYLLABLE KIYEOK-WA
-0x307B  0xACFD  # HANGUL SYLLABLE KIYEOK-WA-KIYEOK
-0x307C  0xAD00  # HANGUL SYLLABLE KIYEOK-WA-NIEUN
-0x307D  0xAD04  # HANGUL SYLLABLE KIYEOK-WA-RIEUL
-0x307E  0xAD06  # HANGUL SYLLABLE KIYEOK-WA-RIEULMIEUM
-0x3121  0xAD0C  # HANGUL SYLLABLE KIYEOK-WA-MIEUM
-0x3122  0xAD0D  # HANGUL SYLLABLE KIYEOK-WA-PIEUP
-0x3123  0xAD0F  # HANGUL SYLLABLE KIYEOK-WA-SIOS
-0x3124  0xAD11  # HANGUL SYLLABLE KIYEOK-WA-IEUNG
-0x3125  0xAD18  # HANGUL SYLLABLE KIYEOK-WAE
-0x3126  0xAD1C  # HANGUL SYLLABLE KIYEOK-WAE-NIEUN
-0x3127  0xAD20  # HANGUL SYLLABLE KIYEOK-WAE-RIEUL
-0x3128  0xAD29  # HANGUL SYLLABLE KIYEOK-WAE-PIEUP
-0x3129  0xAD2C  # HANGUL SYLLABLE KIYEOK-WAE-SSANGSIOS
-0x312A  0xAD2D  # HANGUL SYLLABLE KIYEOK-WAE-IEUNG
-0x312B  0xAD34  # HANGUL SYLLABLE KIYEOK-OE
-0x312C  0xAD35  # HANGUL SYLLABLE KIYEOK-OE-KIYEOK
-0x312D  0xAD38  # HANGUL SYLLABLE KIYEOK-OE-NIEUN
-0x312E  0xAD3C  # HANGUL SYLLABLE KIYEOK-OE-RIEUL
-0x312F  0xAD44  # HANGUL SYLLABLE KIYEOK-OE-MIEUM
-0x3130  0xAD45  # HANGUL SYLLABLE KIYEOK-OE-PIEUP
-0x3131  0xAD47  # HANGUL SYLLABLE KIYEOK-OE-SIOS
-0x3132  0xAD49  # HANGUL SYLLABLE KIYEOK-OE-IEUNG
-0x3133  0xAD50  # HANGUL SYLLABLE KIYEOK-YO
-0x3134  0xAD54  # HANGUL SYLLABLE KIYEOK-YO-NIEUN
-0x3135  0xAD58  # HANGUL SYLLABLE KIYEOK-YO-RIEUL
-0x3136  0xAD61  # HANGUL SYLLABLE KIYEOK-YO-PIEUP
-0x3137  0xAD63  # HANGUL SYLLABLE KIYEOK-YO-SIOS
-0x3138  0xAD6C  # HANGUL SYLLABLE KIYEOK-U
-0x3139  0xAD6D  # HANGUL SYLLABLE KIYEOK-U-KIYEOK
-0x313A  0xAD70  # HANGUL SYLLABLE KIYEOK-U-NIEUN
-0x313B  0xAD73  # HANGUL SYLLABLE KIYEOK-U-TIKEUT
-0x313C  0xAD74  # HANGUL SYLLABLE KIYEOK-U-RIEUL
-0x313D  0xAD75  # HANGUL SYLLABLE KIYEOK-U-RIEULKIYEOK
-0x313E  0xAD76  # HANGUL SYLLABLE KIYEOK-U-RIEULMIEUM
-0x313F  0xAD7B  # HANGUL SYLLABLE KIYEOK-U-RIEULHIEUH
-0x3140  0xAD7C  # HANGUL SYLLABLE KIYEOK-U-MIEUM
-0x3141  0xAD7D  # HANGUL SYLLABLE KIYEOK-U-PIEUP
-0x3142  0xAD7F  # HANGUL SYLLABLE KIYEOK-U-SIOS
-0x3143  0xAD81  # HANGUL SYLLABLE KIYEOK-U-IEUNG
-0x3144  0xAD82  # HANGUL SYLLABLE KIYEOK-U-CIEUC
-0x3145  0xAD88  # HANGUL SYLLABLE KIYEOK-WEO
-0x3146  0xAD89  # HANGUL SYLLABLE KIYEOK-WEO-KIYEOK
-0x3147  0xAD8C  # HANGUL SYLLABLE KIYEOK-WEO-NIEUN
-0x3148  0xAD90  # HANGUL SYLLABLE KIYEOK-WEO-RIEUL
-0x3149  0xAD9C  # HANGUL SYLLABLE KIYEOK-WEO-SSANGSIOS
-0x314A  0xAD9D  # HANGUL SYLLABLE KIYEOK-WEO-IEUNG
-0x314B  0xADA4  # HANGUL SYLLABLE KIYEOK-WE
-0x314C  0xADB7  # HANGUL SYLLABLE KIYEOK-WE-SIOS
-0x314D  0xADC0  # HANGUL SYLLABLE KIYEOK-WI
-0x314E  0xADC1  # HANGUL SYLLABLE KIYEOK-WI-KIYEOK
-0x314F  0xADC4  # HANGUL SYLLABLE KIYEOK-WI-NIEUN
-0x3150  0xADC8  # HANGUL SYLLABLE KIYEOK-WI-RIEUL
-0x3151  0xADD0  # HANGUL SYLLABLE KIYEOK-WI-MIEUM
-0x3152  0xADD1  # HANGUL SYLLABLE KIYEOK-WI-PIEUP
-0x3153  0xADD3  # HANGUL SYLLABLE KIYEOK-WI-SIOS
-0x3154  0xADDC  # HANGUL SYLLABLE KIYEOK-YU
-0x3155  0xADE0  # HANGUL SYLLABLE KIYEOK-YU-NIEUN
-0x3156  0xADE4  # HANGUL SYLLABLE KIYEOK-YU-RIEUL
-0x3157  0xADF8  # HANGUL SYLLABLE KIYEOK-EU
-0x3158  0xADF9  # HANGUL SYLLABLE KIYEOK-EU-KIYEOK
-0x3159  0xADFC  # HANGUL SYLLABLE KIYEOK-EU-NIEUN
-0x315A  0xADFF  # HANGUL SYLLABLE KIYEOK-EU-TIKEUT
-0x315B  0xAE00  # HANGUL SYLLABLE KIYEOK-EU-RIEUL
-0x315C  0xAE01  # HANGUL SYLLABLE KIYEOK-EU-RIEULKIYEOK
-0x315D  0xAE08  # HANGUL SYLLABLE KIYEOK-EU-MIEUM
-0x315E  0xAE09  # HANGUL SYLLABLE KIYEOK-EU-PIEUP
-0x315F  0xAE0B  # HANGUL SYLLABLE KIYEOK-EU-SIOS
-0x3160  0xAE0D  # HANGUL SYLLABLE KIYEOK-EU-IEUNG
-0x3161  0xAE14  # HANGUL SYLLABLE KIYEOK-YI
-0x3162  0xAE30  # HANGUL SYLLABLE KIYEOK-I
-0x3163  0xAE31  # HANGUL SYLLABLE KIYEOK-I-KIYEOK
-0x3164  0xAE34  # HANGUL SYLLABLE KIYEOK-I-NIEUN
-0x3165  0xAE37  # HANGUL SYLLABLE KIYEOK-I-TIKEUT
-0x3166  0xAE38  # HANGUL SYLLABLE KIYEOK-I-RIEUL
-0x3167  0xAE3A  # HANGUL SYLLABLE KIYEOK-I-RIEULMIEUM
-0x3168  0xAE40  # HANGUL SYLLABLE KIYEOK-I-MIEUM
-0x3169  0xAE41  # HANGUL SYLLABLE KIYEOK-I-PIEUP
-0x316A  0xAE43  # HANGUL SYLLABLE KIYEOK-I-SIOS
-0x316B  0xAE45  # HANGUL SYLLABLE KIYEOK-I-IEUNG
-0x316C  0xAE46  # HANGUL SYLLABLE KIYEOK-I-CIEUC
-0x316D  0xAE4A  # HANGUL SYLLABLE KIYEOK-I-PHIEUPH
-0x316E  0xAE4C  # HANGUL SYLLABLE SSANGKIYEOK-A
-0x316F  0xAE4D  # HANGUL SYLLABLE SSANGKIYEOK-A-KIYEOK
-0x3170  0xAE4E  # HANGUL SYLLABLE SSANGKIYEOK-A-SSANGKIYEOK
-0x3171  0xAE50  # HANGUL SYLLABLE SSANGKIYEOK-A-NIEUN
-0x3172  0xAE54  # HANGUL SYLLABLE SSANGKIYEOK-A-RIEUL
-0x3173  0xAE56  # HANGUL SYLLABLE SSANGKIYEOK-A-RIEULMIEUM
-0x3174  0xAE5C  # HANGUL SYLLABLE SSANGKIYEOK-A-MIEUM
-0x3175  0xAE5D  # HANGUL SYLLABLE SSANGKIYEOK-A-PIEUP
-0x3176  0xAE5F  # HANGUL SYLLABLE SSANGKIYEOK-A-SIOS
-0x3177  0xAE60  # HANGUL SYLLABLE SSANGKIYEOK-A-SSANGSIOS
-0x3178  0xAE61  # HANGUL SYLLABLE SSANGKIYEOK-A-IEUNG
-0x3179  0xAE65  # HANGUL SYLLABLE SSANGKIYEOK-A-THIEUTH
-0x317A  0xAE68  # HANGUL SYLLABLE SSANGKIYEOK-AE
-0x317B  0xAE69  # HANGUL SYLLABLE SSANGKIYEOK-AE-KIYEOK
-0x317C  0xAE6C  # HANGUL SYLLABLE SSANGKIYEOK-AE-NIEUN
-0x317D  0xAE70  # HANGUL SYLLABLE SSANGKIYEOK-AE-RIEUL
-0x317E  0xAE78  # HANGUL SYLLABLE SSANGKIYEOK-AE-MIEUM
-0x3221  0xAE79  # HANGUL SYLLABLE SSANGKIYEOK-AE-PIEUP
-0x3222  0xAE7B  # HANGUL SYLLABLE SSANGKIYEOK-AE-SIOS
-0x3223  0xAE7C  # HANGUL SYLLABLE SSANGKIYEOK-AE-SSANGSIOS
-0x3224  0xAE7D  # HANGUL SYLLABLE SSANGKIYEOK-AE-IEUNG
-0x3225  0xAE84  # HANGUL SYLLABLE SSANGKIYEOK-YA
-0x3226  0xAE85  # HANGUL SYLLABLE SSANGKIYEOK-YA-KIYEOK
-0x3227  0xAE8C  # HANGUL SYLLABLE SSANGKIYEOK-YA-RIEUL
-0x3228  0xAEBC  # HANGUL SYLLABLE SSANGKIYEOK-EO
-0x3229  0xAEBD  # HANGUL SYLLABLE SSANGKIYEOK-EO-KIYEOK
-0x322A  0xAEBE  # HANGUL SYLLABLE SSANGKIYEOK-EO-SSANGKIYEOK
-0x322B  0xAEC0  # HANGUL SYLLABLE SSANGKIYEOK-EO-NIEUN
-0x322C  0xAEC4  # HANGUL SYLLABLE SSANGKIYEOK-EO-RIEUL
-0x322D  0xAECC  # HANGUL SYLLABLE SSANGKIYEOK-EO-MIEUM
-0x322E  0xAECD  # HANGUL SYLLABLE SSANGKIYEOK-EO-PIEUP
-0x322F  0xAECF  # HANGUL SYLLABLE SSANGKIYEOK-EO-SIOS
-0x3230  0xAED0  # HANGUL SYLLABLE SSANGKIYEOK-EO-SSANGSIOS
-0x3231  0xAED1  # HANGUL SYLLABLE SSANGKIYEOK-EO-IEUNG
-0x3232  0xAED8  # HANGUL SYLLABLE SSANGKIYEOK-E
-0x3233  0xAED9  # HANGUL SYLLABLE SSANGKIYEOK-E-KIYEOK
-0x3234  0xAEDC  # HANGUL SYLLABLE SSANGKIYEOK-E-NIEUN
-0x3235  0xAEE8  # HANGUL SYLLABLE SSANGKIYEOK-E-MIEUM
-0x3236  0xAEEB  # HANGUL SYLLABLE SSANGKIYEOK-E-SIOS
-0x3237  0xAEED  # HANGUL SYLLABLE SSANGKIYEOK-E-IEUNG
-0x3238  0xAEF4  # HANGUL SYLLABLE SSANGKIYEOK-YEO
-0x3239  0xAEF8  # HANGUL SYLLABLE SSANGKIYEOK-YEO-NIEUN
-0x323A  0xAEFC  # HANGUL SYLLABLE SSANGKIYEOK-YEO-RIEUL
-0x323B  0xAF07  # HANGUL SYLLABLE SSANGKIYEOK-YEO-SIOS
-0x323C  0xAF08  # HANGUL SYLLABLE SSANGKIYEOK-YEO-SSANGSIOS
-0x323D  0xAF0D  # HANGUL SYLLABLE SSANGKIYEOK-YEO-THIEUTH
-0x323E  0xAF10  # HANGUL SYLLABLE SSANGKIYEOK-YE
-0x323F  0xAF2C  # HANGUL SYLLABLE SSANGKIYEOK-O
-0x3240  0xAF2D  # HANGUL SYLLABLE SSANGKIYEOK-O-KIYEOK
-0x3241  0xAF30  # HANGUL SYLLABLE SSANGKIYEOK-O-NIEUN
-0x3242  0xAF32  # HANGUL SYLLABLE SSANGKIYEOK-O-NIEUNHIEUH
-0x3243  0xAF34  # HANGUL SYLLABLE SSANGKIYEOK-O-RIEUL
-0x3244  0xAF3C  # HANGUL SYLLABLE SSANGKIYEOK-O-MIEUM
-0x3245  0xAF3D  # HANGUL SYLLABLE SSANGKIYEOK-O-PIEUP
-0x3246  0xAF3F  # HANGUL SYLLABLE SSANGKIYEOK-O-SIOS
-0x3247  0xAF41  # HANGUL SYLLABLE SSANGKIYEOK-O-IEUNG
-0x3248  0xAF42  # HANGUL SYLLABLE SSANGKIYEOK-O-CIEUC
-0x3249  0xAF43  # HANGUL SYLLABLE SSANGKIYEOK-O-CHIEUCH
-0x324A  0xAF48  # HANGUL SYLLABLE SSANGKIYEOK-WA
-0x324B  0xAF49  # HANGUL SYLLABLE SSANGKIYEOK-WA-KIYEOK
-0x324C  0xAF50  # HANGUL SYLLABLE SSANGKIYEOK-WA-RIEUL
-0x324D  0xAF5C  # HANGUL SYLLABLE SSANGKIYEOK-WA-SSANGSIOS
-0x324E  0xAF5D  # HANGUL SYLLABLE SSANGKIYEOK-WA-IEUNG
-0x324F  0xAF64  # HANGUL SYLLABLE SSANGKIYEOK-WAE
-0x3250  0xAF65  # HANGUL SYLLABLE SSANGKIYEOK-WAE-KIYEOK
-0x3251  0xAF79  # HANGUL SYLLABLE SSANGKIYEOK-WAE-IEUNG
-0x3252  0xAF80  # HANGUL SYLLABLE SSANGKIYEOK-OE
-0x3253  0xAF84  # HANGUL SYLLABLE SSANGKIYEOK-OE-NIEUN
-0x3254  0xAF88  # HANGUL SYLLABLE SSANGKIYEOK-OE-RIEUL
-0x3255  0xAF90  # HANGUL SYLLABLE SSANGKIYEOK-OE-MIEUM
-0x3256  0xAF91  # HANGUL SYLLABLE SSANGKIYEOK-OE-PIEUP
-0x3257  0xAF95  # HANGUL SYLLABLE SSANGKIYEOK-OE-IEUNG
-0x3258  0xAF9C  # HANGUL SYLLABLE SSANGKIYEOK-YO
-0x3259  0xAFB8  # HANGUL SYLLABLE SSANGKIYEOK-U
-0x325A  0xAFB9  # HANGUL SYLLABLE SSANGKIYEOK-U-KIYEOK
-0x325B  0xAFBC  # HANGUL SYLLABLE SSANGKIYEOK-U-NIEUN
-0x325C  0xAFC0  # HANGUL SYLLABLE SSANGKIYEOK-U-RIEUL
-0x325D  0xAFC7  # HANGUL SYLLABLE SSANGKIYEOK-U-RIEULHIEUH
-0x325E  0xAFC8  # HANGUL SYLLABLE SSANGKIYEOK-U-MIEUM
-0x325F  0xAFC9  # HANGUL SYLLABLE SSANGKIYEOK-U-PIEUP
-0x3260  0xAFCB  # HANGUL SYLLABLE SSANGKIYEOK-U-SIOS
-0x3261  0xAFCD  # HANGUL SYLLABLE SSANGKIYEOK-U-IEUNG
-0x3262  0xAFCE  # HANGUL SYLLABLE SSANGKIYEOK-U-CIEUC
-0x3263  0xAFD4  # HANGUL SYLLABLE SSANGKIYEOK-WEO
-0x3264  0xAFDC  # HANGUL SYLLABLE SSANGKIYEOK-WEO-RIEUL
-0x3265  0xAFE8  # HANGUL SYLLABLE SSANGKIYEOK-WEO-SSANGSIOS
-0x3266  0xAFE9  # HANGUL SYLLABLE SSANGKIYEOK-WEO-IEUNG
-0x3267  0xAFF0  # HANGUL SYLLABLE SSANGKIYEOK-WE
-0x3268  0xAFF1  # HANGUL SYLLABLE SSANGKIYEOK-WE-KIYEOK
-0x3269  0xAFF4  # HANGUL SYLLABLE SSANGKIYEOK-WE-NIEUN
-0x326A  0xAFF8  # HANGUL SYLLABLE SSANGKIYEOK-WE-RIEUL
-0x326B  0xB000  # HANGUL SYLLABLE SSANGKIYEOK-WE-MIEUM
-0x326C  0xB001  # HANGUL SYLLABLE SSANGKIYEOK-WE-PIEUP
-0x326D  0xB004  # HANGUL SYLLABLE SSANGKIYEOK-WE-SSANGSIOS
-0x326E  0xB00C  # HANGUL SYLLABLE SSANGKIYEOK-WI
-0x326F  0xB010  # HANGUL SYLLABLE SSANGKIYEOK-WI-NIEUN
-0x3270  0xB014  # HANGUL SYLLABLE SSANGKIYEOK-WI-RIEUL
-0x3271  0xB01C  # HANGUL SYLLABLE SSANGKIYEOK-WI-MIEUM
-0x3272  0xB01D  # HANGUL SYLLABLE SSANGKIYEOK-WI-PIEUP
-0x3273  0xB028  # HANGUL SYLLABLE SSANGKIYEOK-YU
-0x3274  0xB044  # HANGUL SYLLABLE SSANGKIYEOK-EU
-0x3275  0xB045  # HANGUL SYLLABLE SSANGKIYEOK-EU-KIYEOK
-0x3276  0xB048  # HANGUL SYLLABLE SSANGKIYEOK-EU-NIEUN
-0x3277  0xB04A  # HANGUL SYLLABLE SSANGKIYEOK-EU-NIEUNHIEUH
-0x3278  0xB04C  # HANGUL SYLLABLE SSANGKIYEOK-EU-RIEUL
-0x3279  0xB04E  # HANGUL SYLLABLE SSANGKIYEOK-EU-RIEULMIEUM
-0x327A  0xB053  # HANGUL SYLLABLE SSANGKIYEOK-EU-RIEULHIEUH
-0x327B  0xB054  # HANGUL SYLLABLE SSANGKIYEOK-EU-MIEUM
-0x327C  0xB055  # HANGUL SYLLABLE SSANGKIYEOK-EU-PIEUP
-0x327D  0xB057  # HANGUL SYLLABLE SSANGKIYEOK-EU-SIOS
-0x327E  0xB059  # HANGUL SYLLABLE SSANGKIYEOK-EU-IEUNG
-0x3321  0xB05D  # HANGUL SYLLABLE SSANGKIYEOK-EU-THIEUTH
-0x3322  0xB07C  # HANGUL SYLLABLE SSANGKIYEOK-I
-0x3323  0xB07D  # HANGUL SYLLABLE SSANGKIYEOK-I-KIYEOK
-0x3324  0xB080  # HANGUL SYLLABLE SSANGKIYEOK-I-NIEUN
-0x3325  0xB084  # HANGUL SYLLABLE SSANGKIYEOK-I-RIEUL
-0x3326  0xB08C  # HANGUL SYLLABLE SSANGKIYEOK-I-MIEUM
-0x3327  0xB08D  # HANGUL SYLLABLE SSANGKIYEOK-I-PIEUP
-0x3328  0xB08F  # HANGUL SYLLABLE SSANGKIYEOK-I-SIOS
-0x3329  0xB091  # HANGUL SYLLABLE SSANGKIYEOK-I-IEUNG
-0x332A  0xB098  # HANGUL SYLLABLE NIEUN-A
-0x332B  0xB099  # HANGUL SYLLABLE NIEUN-A-KIYEOK
-0x332C  0xB09A  # HANGUL SYLLABLE NIEUN-A-SSANGKIYEOK
-0x332D  0xB09C  # HANGUL SYLLABLE NIEUN-A-NIEUN
-0x332E  0xB09F  # HANGUL SYLLABLE NIEUN-A-TIKEUT
-0x332F  0xB0A0  # HANGUL SYLLABLE NIEUN-A-RIEUL
-0x3330  0xB0A1  # HANGUL SYLLABLE NIEUN-A-RIEULKIYEOK
-0x3331  0xB0A2  # HANGUL SYLLABLE NIEUN-A-RIEULMIEUM
-0x3332  0xB0A8  # HANGUL SYLLABLE NIEUN-A-MIEUM
-0x3333  0xB0A9  # HANGUL SYLLABLE NIEUN-A-PIEUP
-0x3334  0xB0AB  # HANGUL SYLLABLE NIEUN-A-SIOS
-0x3335  0xB0AC  # HANGUL SYLLABLE NIEUN-A-SSANGSIOS
-0x3336  0xB0AD  # HANGUL SYLLABLE NIEUN-A-IEUNG
-0x3337  0xB0AE  # HANGUL SYLLABLE NIEUN-A-CIEUC
-0x3338  0xB0AF  # HANGUL SYLLABLE NIEUN-A-CHIEUCH
-0x3339  0xB0B1  # HANGUL SYLLABLE NIEUN-A-THIEUTH
-0x333A  0xB0B3  # HANGUL SYLLABLE NIEUN-A-HIEUH
-0x333B  0xB0B4  # HANGUL SYLLABLE NIEUN-AE
-0x333C  0xB0B5  # HANGUL SYLLABLE NIEUN-AE-KIYEOK
-0x333D  0xB0B8  # HANGUL SYLLABLE NIEUN-AE-NIEUN
-0x333E  0xB0BC  # HANGUL SYLLABLE NIEUN-AE-RIEUL
-0x333F  0xB0C4  # HANGUL SYLLABLE NIEUN-AE-MIEUM
-0x3340  0xB0C5  # HANGUL SYLLABLE NIEUN-AE-PIEUP
-0x3341  0xB0C7  # HANGUL SYLLABLE NIEUN-AE-SIOS
-0x3342  0xB0C8  # HANGUL SYLLABLE NIEUN-AE-SSANGSIOS
-0x3343  0xB0C9  # HANGUL SYLLABLE NIEUN-AE-IEUNG
-0x3344  0xB0D0  # HANGUL SYLLABLE NIEUN-YA
-0x3345  0xB0D1  # HANGUL SYLLABLE NIEUN-YA-KIYEOK
-0x3346  0xB0D4  # HANGUL SYLLABLE NIEUN-YA-NIEUN
-0x3347  0xB0D8  # HANGUL SYLLABLE NIEUN-YA-RIEUL
-0x3348  0xB0E0  # HANGUL SYLLABLE NIEUN-YA-MIEUM
-0x3349  0xB0E5  # HANGUL SYLLABLE NIEUN-YA-IEUNG
-0x334A  0xB108  # HANGUL SYLLABLE NIEUN-EO
-0x334B  0xB109  # HANGUL SYLLABLE NIEUN-EO-KIYEOK
-0x334C  0xB10B  # HANGUL SYLLABLE NIEUN-EO-KIYEOKSIOS
-0x334D  0xB10C  # HANGUL SYLLABLE NIEUN-EO-NIEUN
-0x334E  0xB110  # HANGUL SYLLABLE NIEUN-EO-RIEUL
-0x334F  0xB112  # HANGUL SYLLABLE NIEUN-EO-RIEULMIEUM
-0x3350  0xB113  # HANGUL SYLLABLE NIEUN-EO-RIEULPIEUP
-0x3351  0xB118  # HANGUL SYLLABLE NIEUN-EO-MIEUM
-0x3352  0xB119  # HANGUL SYLLABLE NIEUN-EO-PIEUP
-0x3353  0xB11B  # HANGUL SYLLABLE NIEUN-EO-SIOS
-0x3354  0xB11C  # HANGUL SYLLABLE NIEUN-EO-SSANGSIOS
-0x3355  0xB11D  # HANGUL SYLLABLE NIEUN-EO-IEUNG
-0x3356  0xB123  # HANGUL SYLLABLE NIEUN-EO-HIEUH
-0x3357  0xB124  # HANGUL SYLLABLE NIEUN-E
-0x3358  0xB125  # HANGUL SYLLABLE NIEUN-E-KIYEOK
-0x3359  0xB128  # HANGUL SYLLABLE NIEUN-E-NIEUN
-0x335A  0xB12C  # HANGUL SYLLABLE NIEUN-E-RIEUL
-0x335B  0xB134  # HANGUL SYLLABLE NIEUN-E-MIEUM
-0x335C  0xB135  # HANGUL SYLLABLE NIEUN-E-PIEUP
-0x335D  0xB137  # HANGUL SYLLABLE NIEUN-E-SIOS
-0x335E  0xB138  # HANGUL SYLLABLE NIEUN-E-SSANGSIOS
-0x335F  0xB139  # HANGUL SYLLABLE NIEUN-E-IEUNG
-0x3360  0xB140  # HANGUL SYLLABLE NIEUN-YEO
-0x3361  0xB141  # HANGUL SYLLABLE NIEUN-YEO-KIYEOK
-0x3362  0xB144  # HANGUL SYLLABLE NIEUN-YEO-NIEUN
-0x3363  0xB148  # HANGUL SYLLABLE NIEUN-YEO-RIEUL
-0x3364  0xB150  # HANGUL SYLLABLE NIEUN-YEO-MIEUM
-0x3365  0xB151  # HANGUL SYLLABLE NIEUN-YEO-PIEUP
-0x3366  0xB154  # HANGUL SYLLABLE NIEUN-YEO-SSANGSIOS
-0x3367  0xB155  # HANGUL SYLLABLE NIEUN-YEO-IEUNG
-0x3368  0xB158  # HANGUL SYLLABLE NIEUN-YEO-KHIEUKH
-0x3369  0xB15C  # HANGUL SYLLABLE NIEUN-YE
-0x336A  0xB160  # HANGUL SYLLABLE NIEUN-YE-NIEUN
-0x336B  0xB178  # HANGUL SYLLABLE NIEUN-O
-0x336C  0xB179  # HANGUL SYLLABLE NIEUN-O-KIYEOK
-0x336D  0xB17C  # HANGUL SYLLABLE NIEUN-O-NIEUN
-0x336E  0xB180  # HANGUL SYLLABLE NIEUN-O-RIEUL
-0x336F  0xB182  # HANGUL SYLLABLE NIEUN-O-RIEULMIEUM
-0x3370  0xB188  # HANGUL SYLLABLE NIEUN-O-MIEUM
-0x3371  0xB189  # HANGUL SYLLABLE NIEUN-O-PIEUP
-0x3372  0xB18B  # HANGUL SYLLABLE NIEUN-O-SIOS
-0x3373  0xB18D  # HANGUL SYLLABLE NIEUN-O-IEUNG
-0x3374  0xB192  # HANGUL SYLLABLE NIEUN-O-PHIEUPH
-0x3375  0xB193  # HANGUL SYLLABLE NIEUN-O-HIEUH
-0x3376  0xB194  # HANGUL SYLLABLE NIEUN-WA
-0x3377  0xB198  # HANGUL SYLLABLE NIEUN-WA-NIEUN
-0x3378  0xB19C  # HANGUL SYLLABLE NIEUN-WA-RIEUL
-0x3379  0xB1A8  # HANGUL SYLLABLE NIEUN-WA-SSANGSIOS
-0x337A  0xB1CC  # HANGUL SYLLABLE NIEUN-OE
-0x337B  0xB1D0  # HANGUL SYLLABLE NIEUN-OE-NIEUN
-0x337C  0xB1D4  # HANGUL SYLLABLE NIEUN-OE-RIEUL
-0x337D  0xB1DC  # HANGUL SYLLABLE NIEUN-OE-MIEUM
-0x337E  0xB1DD  # HANGUL SYLLABLE NIEUN-OE-PIEUP
-0x3421  0xB1DF  # HANGUL SYLLABLE NIEUN-OE-SIOS
-0x3422  0xB1E8  # HANGUL SYLLABLE NIEUN-YO
-0x3423  0xB1E9  # HANGUL SYLLABLE NIEUN-YO-KIYEOK
-0x3424  0xB1EC  # HANGUL SYLLABLE NIEUN-YO-NIEUN
-0x3425  0xB1F0  # HANGUL SYLLABLE NIEUN-YO-RIEUL
-0x3426  0xB1F9  # HANGUL SYLLABLE NIEUN-YO-PIEUP
-0x3427  0xB1FB  # HANGUL SYLLABLE NIEUN-YO-SIOS
-0x3428  0xB1FD  # HANGUL SYLLABLE NIEUN-YO-IEUNG
-0x3429  0xB204  # HANGUL SYLLABLE NIEUN-U
-0x342A  0xB205  # HANGUL SYLLABLE NIEUN-U-KIYEOK
-0x342B  0xB208  # HANGUL SYLLABLE NIEUN-U-NIEUN
-0x342C  0xB20B  # HANGUL SYLLABLE NIEUN-U-TIKEUT
-0x342D  0xB20C  # HANGUL SYLLABLE NIEUN-U-RIEUL
-0x342E  0xB214  # HANGUL SYLLABLE NIEUN-U-MIEUM
-0x342F  0xB215  # HANGUL SYLLABLE NIEUN-U-PIEUP
-0x3430  0xB217  # HANGUL SYLLABLE NIEUN-U-SIOS
-0x3431  0xB219  # HANGUL SYLLABLE NIEUN-U-IEUNG
-0x3432  0xB220  # HANGUL SYLLABLE NIEUN-WEO
-0x3433  0xB234  # HANGUL SYLLABLE NIEUN-WEO-SSANGSIOS
-0x3434  0xB23C  # HANGUL SYLLABLE NIEUN-WE
-0x3435  0xB258  # HANGUL SYLLABLE NIEUN-WI
-0x3436  0xB25C  # HANGUL SYLLABLE NIEUN-WI-NIEUN
-0x3437  0xB260  # HANGUL SYLLABLE NIEUN-WI-RIEUL
-0x3438  0xB268  # HANGUL SYLLABLE NIEUN-WI-MIEUM
-0x3439  0xB269  # HANGUL SYLLABLE NIEUN-WI-PIEUP
-0x343A  0xB274  # HANGUL SYLLABLE NIEUN-YU
-0x343B  0xB275  # HANGUL SYLLABLE NIEUN-YU-KIYEOK
-0x343C  0xB27C  # HANGUL SYLLABLE NIEUN-YU-RIEUL
-0x343D  0xB284  # HANGUL SYLLABLE NIEUN-YU-MIEUM
-0x343E  0xB285  # HANGUL SYLLABLE NIEUN-YU-PIEUP
-0x343F  0xB289  # HANGUL SYLLABLE NIEUN-YU-IEUNG
-0x3440  0xB290  # HANGUL SYLLABLE NIEUN-EU
-0x3441  0xB291  # HANGUL SYLLABLE NIEUN-EU-KIYEOK
-0x3442  0xB294  # HANGUL SYLLABLE NIEUN-EU-NIEUN
-0x3443  0xB298  # HANGUL SYLLABLE NIEUN-EU-RIEUL
-0x3444  0xB299  # HANGUL SYLLABLE NIEUN-EU-RIEULKIYEOK
-0x3445  0xB29A  # HANGUL SYLLABLE NIEUN-EU-RIEULMIEUM
-0x3446  0xB2A0  # HANGUL SYLLABLE NIEUN-EU-MIEUM
-0x3447  0xB2A1  # HANGUL SYLLABLE NIEUN-EU-PIEUP
-0x3448  0xB2A3  # HANGUL SYLLABLE NIEUN-EU-SIOS
-0x3449  0xB2A5  # HANGUL SYLLABLE NIEUN-EU-IEUNG
-0x344A  0xB2A6  # HANGUL SYLLABLE NIEUN-EU-CIEUC
-0x344B  0xB2AA  # HANGUL SYLLABLE NIEUN-EU-PHIEUPH
-0x344C  0xB2AC  # HANGUL SYLLABLE NIEUN-YI
-0x344D  0xB2B0  # HANGUL SYLLABLE NIEUN-YI-NIEUN
-0x344E  0xB2B4  # HANGUL SYLLABLE NIEUN-YI-RIEUL
-0x344F  0xB2C8  # HANGUL SYLLABLE NIEUN-I
-0x3450  0xB2C9  # HANGUL SYLLABLE NIEUN-I-KIYEOK
-0x3451  0xB2CC  # HANGUL SYLLABLE NIEUN-I-NIEUN
-0x3452  0xB2D0  # HANGUL SYLLABLE NIEUN-I-RIEUL
-0x3453  0xB2D2  # HANGUL SYLLABLE NIEUN-I-RIEULMIEUM-<3/22/95>
-0x3454  0xB2D8  # HANGUL SYLLABLE NIEUN-I-MIEUM
-0x3455  0xB2D9  # HANGUL SYLLABLE NIEUN-I-PIEUP
-0x3456  0xB2DB  # HANGUL SYLLABLE NIEUN-I-SIOS
-0x3457  0xB2DD  # HANGUL SYLLABLE NIEUN-I-IEUNG
-0x3458  0xB2E2  # HANGUL SYLLABLE NIEUN-I-PHIEUPH
-0x3459  0xB2E4  # HANGUL SYLLABLE TIKEUT-A
-0x345A  0xB2E5  # HANGUL SYLLABLE TIKEUT-A-KIYEOK
-0x345B  0xB2E6  # HANGUL SYLLABLE TIKEUT-A-SSANGKIYEOK
-0x345C  0xB2E8  # HANGUL SYLLABLE TIKEUT-A-NIEUN
-0x345D  0xB2EB  # HANGUL SYLLABLE TIKEUT-A-TIKEUT
-0x345E  0xB2EC  # HANGUL SYLLABLE TIKEUT-A-RIEUL
-0x345F  0xB2ED  # HANGUL SYLLABLE TIKEUT-A-RIEULKIYEOK
-0x3460  0xB2EE  # HANGUL SYLLABLE TIKEUT-A-RIEULMIEUM
-0x3461  0xB2EF  # HANGUL SYLLABLE TIKEUT-A-RIEULPIEUP
-0x3462  0xB2F3  # HANGUL SYLLABLE TIKEUT-A-RIEULHIEUH
-0x3463  0xB2F4  # HANGUL SYLLABLE TIKEUT-A-MIEUM
-0x3464  0xB2F5  # HANGUL SYLLABLE TIKEUT-A-PIEUP
-0x3465  0xB2F7  # HANGUL SYLLABLE TIKEUT-A-SIOS
-0x3466  0xB2F8  # HANGUL SYLLABLE TIKEUT-A-SSANGSIOS
-0x3467  0xB2F9  # HANGUL SYLLABLE TIKEUT-A-IEUNG
-0x3468  0xB2FA  # HANGUL SYLLABLE TIKEUT-A-CIEUC
-0x3469  0xB2FB  # HANGUL SYLLABLE TIKEUT-A-CHIEUCH
-0x346A  0xB2FF  # HANGUL SYLLABLE TIKEUT-A-HIEUH
-0x346B  0xB300  # HANGUL SYLLABLE TIKEUT-AE
-0x346C  0xB301  # HANGUL SYLLABLE TIKEUT-AE-KIYEOK
-0x346D  0xB304  # HANGUL SYLLABLE TIKEUT-AE-NIEUN
-0x346E  0xB308  # HANGUL SYLLABLE TIKEUT-AE-RIEUL
-0x346F  0xB310  # HANGUL SYLLABLE TIKEUT-AE-MIEUM
-0x3470  0xB311  # HANGUL SYLLABLE TIKEUT-AE-PIEUP
-0x3471  0xB313  # HANGUL SYLLABLE TIKEUT-AE-SIOS
-0x3472  0xB314  # HANGUL SYLLABLE TIKEUT-AE-SSANGSIOS
-0x3473  0xB315  # HANGUL SYLLABLE TIKEUT-AE-IEUNG
-0x3474  0xB31C  # HANGUL SYLLABLE TIKEUT-YA
-0x3475  0xB354  # HANGUL SYLLABLE TIKEUT-EO
-0x3476  0xB355  # HANGUL SYLLABLE TIKEUT-EO-KIYEOK
-0x3477  0xB356  # HANGUL SYLLABLE TIKEUT-EO-SSANGKIYEOK
-0x3478  0xB358  # HANGUL SYLLABLE TIKEUT-EO-NIEUN
-0x3479  0xB35B  # HANGUL SYLLABLE TIKEUT-EO-TIKEUT
-0x347A  0xB35C  # HANGUL SYLLABLE TIKEUT-EO-RIEUL
-0x347B  0xB35E  # HANGUL SYLLABLE TIKEUT-EO-RIEULMIEUM
-0x347C  0xB35F  # HANGUL SYLLABLE TIKEUT-EO-RIEULPIEUP
-0x347D  0xB364  # HANGUL SYLLABLE TIKEUT-EO-MIEUM
-0x347E  0xB365  # HANGUL SYLLABLE TIKEUT-EO-PIEUP
-0x3521  0xB367  # HANGUL SYLLABLE TIKEUT-EO-SIOS
-0x3522  0xB369  # HANGUL SYLLABLE TIKEUT-EO-IEUNG
-0x3523  0xB36B  # HANGUL SYLLABLE TIKEUT-EO-CHIEUCH
-0x3524  0xB36E  # HANGUL SYLLABLE TIKEUT-EO-PHIEUPH
-0x3525  0xB370  # HANGUL SYLLABLE TIKEUT-E
-0x3526  0xB371  # HANGUL SYLLABLE TIKEUT-E-KIYEOK
-0x3527  0xB374  # HANGUL SYLLABLE TIKEUT-E-NIEUN
-0x3528  0xB378  # HANGUL SYLLABLE TIKEUT-E-RIEUL
-0x3529  0xB380  # HANGUL SYLLABLE TIKEUT-E-MIEUM
-0x352A  0xB381  # HANGUL SYLLABLE TIKEUT-E-PIEUP
-0x352B  0xB383  # HANGUL SYLLABLE TIKEUT-E-SIOS
-0x352C  0xB384  # HANGUL SYLLABLE TIKEUT-E-SSANGSIOS
-0x352D  0xB385  # HANGUL SYLLABLE TIKEUT-E-IEUNG
-0x352E  0xB38C  # HANGUL SYLLABLE TIKEUT-YEO
-0x352F  0xB390  # HANGUL SYLLABLE TIKEUT-YEO-NIEUN
-0x3530  0xB394  # HANGUL SYLLABLE TIKEUT-YEO-RIEUL
-0x3531  0xB3A0  # HANGUL SYLLABLE TIKEUT-YEO-SSANGSIOS
-0x3532  0xB3A1  # HANGUL SYLLABLE TIKEUT-YEO-IEUNG
-0x3533  0xB3A8  # HANGUL SYLLABLE TIKEUT-YE
-0x3534  0xB3AC  # HANGUL SYLLABLE TIKEUT-YE-NIEUN
-0x3535  0xB3C4  # HANGUL SYLLABLE TIKEUT-O
-0x3536  0xB3C5  # HANGUL SYLLABLE TIKEUT-O-KIYEOK
-0x3537  0xB3C8  # HANGUL SYLLABLE TIKEUT-O-NIEUN
-0x3538  0xB3CB  # HANGUL SYLLABLE TIKEUT-O-TIKEUT
-0x3539  0xB3CC  # HANGUL SYLLABLE TIKEUT-O-RIEUL
-0x353A  0xB3CE  # HANGUL SYLLABLE TIKEUT-O-RIEULMIEUM
-0x353B  0xB3D0  # HANGUL SYLLABLE TIKEUT-O-RIEULSIOS
-0x353C  0xB3D4  # HANGUL SYLLABLE TIKEUT-O-MIEUM
-0x353D  0xB3D5  # HANGUL SYLLABLE TIKEUT-O-PIEUP
-0x353E  0xB3D7  # HANGUL SYLLABLE TIKEUT-O-SIOS
-0x353F  0xB3D9  # HANGUL SYLLABLE TIKEUT-O-IEUNG
-0x3540  0xB3DB  # HANGUL SYLLABLE TIKEUT-O-CHIEUCH
-0x3541  0xB3DD  # HANGUL SYLLABLE TIKEUT-O-THIEUTH
-0x3542  0xB3E0  # HANGUL SYLLABLE TIKEUT-WA
-0x3543  0xB3E4  # HANGUL SYLLABLE TIKEUT-WA-NIEUN
-0x3544  0xB3E8  # HANGUL SYLLABLE TIKEUT-WA-RIEUL
-0x3545  0xB3FC  # HANGUL SYLLABLE TIKEUT-WAE
-0x3546  0xB410  # HANGUL SYLLABLE TIKEUT-WAE-SSANGSIOS
-0x3547  0xB418  # HANGUL SYLLABLE TIKEUT-OE
-0x3548  0xB41C  # HANGUL SYLLABLE TIKEUT-OE-NIEUN
-0x3549  0xB420  # HANGUL SYLLABLE TIKEUT-OE-RIEUL
-0x354A  0xB428  # HANGUL SYLLABLE TIKEUT-OE-MIEUM
-0x354B  0xB429  # HANGUL SYLLABLE TIKEUT-OE-PIEUP
-0x354C  0xB42B  # HANGUL SYLLABLE TIKEUT-OE-SIOS
-0x354D  0xB434  # HANGUL SYLLABLE TIKEUT-YO
-0x354E  0xB450  # HANGUL SYLLABLE TIKEUT-U
-0x354F  0xB451  # HANGUL SYLLABLE TIKEUT-U-KIYEOK
-0x3550  0xB454  # HANGUL SYLLABLE TIKEUT-U-NIEUN
-0x3551  0xB458  # HANGUL SYLLABLE TIKEUT-U-RIEUL
-0x3552  0xB460  # HANGUL SYLLABLE TIKEUT-U-MIEUM
-0x3553  0xB461  # HANGUL SYLLABLE TIKEUT-U-PIEUP
-0x3554  0xB463  # HANGUL SYLLABLE TIKEUT-U-SIOS
-0x3555  0xB465  # HANGUL SYLLABLE TIKEUT-U-IEUNG
-0x3556  0xB46C  # HANGUL SYLLABLE TIKEUT-WEO
-0x3557  0xB480  # HANGUL SYLLABLE TIKEUT-WEO-SSANGSIOS
-0x3558  0xB488  # HANGUL SYLLABLE TIKEUT-WE
-0x3559  0xB49D  # HANGUL SYLLABLE TIKEUT-WE-IEUNG
-0x355A  0xB4A4  # HANGUL SYLLABLE TIKEUT-WI
-0x355B  0xB4A8  # HANGUL SYLLABLE TIKEUT-WI-NIEUN
-0x355C  0xB4AC  # HANGUL SYLLABLE TIKEUT-WI-RIEUL
-0x355D  0xB4B5  # HANGUL SYLLABLE TIKEUT-WI-PIEUP
-0x355E  0xB4B7  # HANGUL SYLLABLE TIKEUT-WI-SIOS
-0x355F  0xB4B9  # HANGUL SYLLABLE TIKEUT-WI-IEUNG
-0x3560  0xB4C0  # HANGUL SYLLABLE TIKEUT-YU
-0x3561  0xB4C4  # HANGUL SYLLABLE TIKEUT-YU-NIEUN
-0x3562  0xB4C8  # HANGUL SYLLABLE TIKEUT-YU-RIEUL
-0x3563  0xB4D0  # HANGUL SYLLABLE TIKEUT-YU-MIEUM
-0x3564  0xB4D5  # HANGUL SYLLABLE TIKEUT-YU-IEUNG
-0x3565  0xB4DC  # HANGUL SYLLABLE TIKEUT-EU
-0x3566  0xB4DD  # HANGUL SYLLABLE TIKEUT-EU-KIYEOK
-0x3567  0xB4E0  # HANGUL SYLLABLE TIKEUT-EU-NIEUN
-0x3568  0xB4E3  # HANGUL SYLLABLE TIKEUT-EU-TIKEUT
-0x3569  0xB4E4  # HANGUL SYLLABLE TIKEUT-EU-RIEUL
-0x356A  0xB4E6  # HANGUL SYLLABLE TIKEUT-EU-RIEULMIEUM
-0x356B  0xB4EC  # HANGUL SYLLABLE TIKEUT-EU-MIEUM
-0x356C  0xB4ED  # HANGUL SYLLABLE TIKEUT-EU-PIEUP
-0x356D  0xB4EF  # HANGUL SYLLABLE TIKEUT-EU-SIOS
-0x356E  0xB4F1  # HANGUL SYLLABLE TIKEUT-EU-IEUNG
-0x356F  0xB4F8  # HANGUL SYLLABLE TIKEUT-YI
-0x3570  0xB514  # HANGUL SYLLABLE TIKEUT-I
-0x3571  0xB515  # HANGUL SYLLABLE TIKEUT-I-KIYEOK
-0x3572  0xB518  # HANGUL SYLLABLE TIKEUT-I-NIEUN
-0x3573  0xB51B  # HANGUL SYLLABLE TIKEUT-I-TIKEUT
-0x3574  0xB51C  # HANGUL SYLLABLE TIKEUT-I-RIEUL
-0x3575  0xB524  # HANGUL SYLLABLE TIKEUT-I-MIEUM
-0x3576  0xB525  # HANGUL SYLLABLE TIKEUT-I-PIEUP
-0x3577  0xB527  # HANGUL SYLLABLE TIKEUT-I-SIOS
-0x3578  0xB528  # HANGUL SYLLABLE TIKEUT-I-SSANGSIOS
-0x3579  0xB529  # HANGUL SYLLABLE TIKEUT-I-IEUNG
-0x357A  0xB52A  # HANGUL SYLLABLE TIKEUT-I-CIEUC
-0x357B  0xB530  # HANGUL SYLLABLE SSANGTIKEUT-A
-0x357C  0xB531  # HANGUL SYLLABLE SSANGTIKEUT-A-KIYEOK
-0x357D  0xB534  # HANGUL SYLLABLE SSANGTIKEUT-A-NIEUN
-0x357E  0xB538  # HANGUL SYLLABLE SSANGTIKEUT-A-RIEUL
-0x3621  0xB540  # HANGUL SYLLABLE SSANGTIKEUT-A-MIEUM
-0x3622  0xB541  # HANGUL SYLLABLE SSANGTIKEUT-A-PIEUP
-0x3623  0xB543  # HANGUL SYLLABLE SSANGTIKEUT-A-SIOS
-0x3624  0xB544  # HANGUL SYLLABLE SSANGTIKEUT-A-SSANGSIOS
-0x3625  0xB545  # HANGUL SYLLABLE SSANGTIKEUT-A-IEUNG
-0x3626  0xB54B  # HANGUL SYLLABLE SSANGTIKEUT-A-HIEUH
-0x3627  0xB54C  # HANGUL SYLLABLE SSANGTIKEUT-AE
-0x3628  0xB54D  # HANGUL SYLLABLE SSANGTIKEUT-AE-KIYEOK
-0x3629  0xB550  # HANGUL SYLLABLE SSANGTIKEUT-AE-NIEUN
-0x362A  0xB554  # HANGUL SYLLABLE SSANGTIKEUT-AE-RIEUL
-0x362B  0xB55C  # HANGUL SYLLABLE SSANGTIKEUT-AE-MIEUM
-0x362C  0xB55D  # HANGUL SYLLABLE SSANGTIKEUT-AE-PIEUP
-0x362D  0xB55F  # HANGUL SYLLABLE SSANGTIKEUT-AE-SIOS
-0x362E  0xB560  # HANGUL SYLLABLE SSANGTIKEUT-AE-SSANGSIOS
-0x362F  0xB561  # HANGUL SYLLABLE SSANGTIKEUT-AE-IEUNG
-0x3630  0xB5A0  # HANGUL SYLLABLE SSANGTIKEUT-EO
-0x3631  0xB5A1  # HANGUL SYLLABLE SSANGTIKEUT-EO-KIYEOK
-0x3632  0xB5A4  # HANGUL SYLLABLE SSANGTIKEUT-EO-NIEUN
-0x3633  0xB5A8  # HANGUL SYLLABLE SSANGTIKEUT-EO-RIEUL
-0x3634  0xB5AA  # HANGUL SYLLABLE SSANGTIKEUT-EO-RIEULMIEUM
-0x3635  0xB5AB  # HANGUL SYLLABLE SSANGTIKEUT-EO-RIEULPIEUP
-0x3636  0xB5B0  # HANGUL SYLLABLE SSANGTIKEUT-EO-MIEUM
-0x3637  0xB5B1  # HANGUL SYLLABLE SSANGTIKEUT-EO-PIEUP
-0x3638  0xB5B3  # HANGUL SYLLABLE SSANGTIKEUT-EO-SIOS
-0x3639  0xB5B4  # HANGUL SYLLABLE SSANGTIKEUT-EO-SSANGSIOS
-0x363A  0xB5B5  # HANGUL SYLLABLE SSANGTIKEUT-EO-IEUNG
-0x363B  0xB5BB  # HANGUL SYLLABLE SSANGTIKEUT-EO-HIEUH
-0x363C  0xB5BC  # HANGUL SYLLABLE SSANGTIKEUT-E
-0x363D  0xB5BD  # HANGUL SYLLABLE SSANGTIKEUT-E-KIYEOK
-0x363E  0xB5C0  # HANGUL SYLLABLE SSANGTIKEUT-E-NIEUN
-0x363F  0xB5C4  # HANGUL SYLLABLE SSANGTIKEUT-E-RIEUL
-0x3640  0xB5CC  # HANGUL SYLLABLE SSANGTIKEUT-E-MIEUM
-0x3641  0xB5CD  # HANGUL SYLLABLE SSANGTIKEUT-E-PIEUP
-0x3642  0xB5CF  # HANGUL SYLLABLE SSANGTIKEUT-E-SIOS
-0x3643  0xB5D0  # HANGUL SYLLABLE SSANGTIKEUT-E-SSANGSIOS
-0x3644  0xB5D1  # HANGUL SYLLABLE SSANGTIKEUT-E-IEUNG
-0x3645  0xB5D8  # HANGUL SYLLABLE SSANGTIKEUT-YEO
-0x3646  0xB5EC  # HANGUL SYLLABLE SSANGTIKEUT-YEO-SSANGSIOS
-0x3647  0xB610  # HANGUL SYLLABLE SSANGTIKEUT-O
-0x3648  0xB611  # HANGUL SYLLABLE SSANGTIKEUT-O-KIYEOK
-0x3649  0xB614  # HANGUL SYLLABLE SSANGTIKEUT-O-NIEUN
-0x364A  0xB618  # HANGUL SYLLABLE SSANGTIKEUT-O-RIEUL
-0x364B  0xB625  # HANGUL SYLLABLE SSANGTIKEUT-O-IEUNG
-0x364C  0xB62C  # HANGUL SYLLABLE SSANGTIKEUT-WA
-0x364D  0xB634  # HANGUL SYLLABLE SSANGTIKEUT-WA-RIEUL
-0x364E  0xB648  # HANGUL SYLLABLE SSANGTIKEUT-WAE
-0x364F  0xB664  # HANGUL SYLLABLE SSANGTIKEUT-OE
-0x3650  0xB668  # HANGUL SYLLABLE SSANGTIKEUT-OE-NIEUN
-0x3651  0xB69C  # HANGUL SYLLABLE SSANGTIKEUT-U
-0x3652  0xB69D  # HANGUL SYLLABLE SSANGTIKEUT-U-KIYEOK
-0x3653  0xB6A0  # HANGUL SYLLABLE SSANGTIKEUT-U-NIEUN
-0x3654  0xB6A4  # HANGUL SYLLABLE SSANGTIKEUT-U-RIEUL
-0x3655  0xB6AB  # HANGUL SYLLABLE SSANGTIKEUT-U-RIEULHIEUH
-0x3656  0xB6AC  # HANGUL SYLLABLE SSANGTIKEUT-U-MIEUM
-0x3657  0xB6B1  # HANGUL SYLLABLE SSANGTIKEUT-U-IEUNG
-0x3658  0xB6D4  # HANGUL SYLLABLE SSANGTIKEUT-WE
-0x3659  0xB6F0  # HANGUL SYLLABLE SSANGTIKEUT-WI
-0x365A  0xB6F4  # HANGUL SYLLABLE SSANGTIKEUT-WI-NIEUN
-0x365B  0xB6F8  # HANGUL SYLLABLE SSANGTIKEUT-WI-RIEUL
-0x365C  0xB700  # HANGUL SYLLABLE SSANGTIKEUT-WI-MIEUM
-0x365D  0xB701  # HANGUL SYLLABLE SSANGTIKEUT-WI-PIEUP
-0x365E  0xB705  # HANGUL SYLLABLE SSANGTIKEUT-WI-IEUNG
-0x365F  0xB728  # HANGUL SYLLABLE SSANGTIKEUT-EU
-0x3660  0xB729  # HANGUL SYLLABLE SSANGTIKEUT-EU-KIYEOK
-0x3661  0xB72C  # HANGUL SYLLABLE SSANGTIKEUT-EU-NIEUN
-0x3662  0xB72F  # HANGUL SYLLABLE SSANGTIKEUT-EU-TIKEUT
-0x3663  0xB730  # HANGUL SYLLABLE SSANGTIKEUT-EU-RIEUL
-0x3664  0xB738  # HANGUL SYLLABLE SSANGTIKEUT-EU-MIEUM
-0x3665  0xB739  # HANGUL SYLLABLE SSANGTIKEUT-EU-PIEUP
-0x3666  0xB73B  # HANGUL SYLLABLE SSANGTIKEUT-EU-SIOS
-0x3667  0xB744  # HANGUL SYLLABLE SSANGTIKEUT-YI
-0x3668  0xB748  # HANGUL SYLLABLE SSANGTIKEUT-YI-NIEUN
-0x3669  0xB74C  # HANGUL SYLLABLE SSANGTIKEUT-YI-RIEUL
-0x366A  0xB754  # HANGUL SYLLABLE SSANGTIKEUT-YI-MIEUM
-0x366B  0xB755  # HANGUL SYLLABLE SSANGTIKEUT-YI-PIEUP
-0x366C  0xB760  # HANGUL SYLLABLE SSANGTIKEUT-I
-0x366D  0xB764  # HANGUL SYLLABLE SSANGTIKEUT-I-NIEUN
-0x366E  0xB768  # HANGUL SYLLABLE SSANGTIKEUT-I-RIEUL
-0x366F  0xB770  # HANGUL SYLLABLE SSANGTIKEUT-I-MIEUM
-0x3670  0xB771  # HANGUL SYLLABLE SSANGTIKEUT-I-PIEUP
-0x3671  0xB773  # HANGUL SYLLABLE SSANGTIKEUT-I-SIOS
-0x3672  0xB775  # HANGUL SYLLABLE SSANGTIKEUT-I-IEUNG
-0x3673  0xB77C  # HANGUL SYLLABLE RIEUL-A
-0x3674  0xB77D  # HANGUL SYLLABLE RIEUL-A-KIYEOK
-0x3675  0xB780  # HANGUL SYLLABLE RIEUL-A-NIEUN
-0x3676  0xB784  # HANGUL SYLLABLE RIEUL-A-RIEUL
-0x3677  0xB78C  # HANGUL SYLLABLE RIEUL-A-MIEUM
-0x3678  0xB78D  # HANGUL SYLLABLE RIEUL-A-PIEUP
-0x3679  0xB78F  # HANGUL SYLLABLE RIEUL-A-SIOS
-0x367A  0xB790  # HANGUL SYLLABLE RIEUL-A-SSANGSIOS
-0x367B  0xB791  # HANGUL SYLLABLE RIEUL-A-IEUNG
-0x367C  0xB792  # HANGUL SYLLABLE RIEUL-A-CIEUC
-0x367D  0xB796  # HANGUL SYLLABLE RIEUL-A-PHIEUPH
-0x367E  0xB797  # HANGUL SYLLABLE RIEUL-A-HIEUH
-0x3721  0xB798  # HANGUL SYLLABLE RIEUL-AE
-0x3722  0xB799  # HANGUL SYLLABLE RIEUL-AE-KIYEOK
-0x3723  0xB79C  # HANGUL SYLLABLE RIEUL-AE-NIEUN
-0x3724  0xB7A0  # HANGUL SYLLABLE RIEUL-AE-RIEUL
-0x3725  0xB7A8  # HANGUL SYLLABLE RIEUL-AE-MIEUM
-0x3726  0xB7A9  # HANGUL SYLLABLE RIEUL-AE-PIEUP
-0x3727  0xB7AB  # HANGUL SYLLABLE RIEUL-AE-SIOS
-0x3728  0xB7AC  # HANGUL SYLLABLE RIEUL-AE-SSANGSIOS
-0x3729  0xB7AD  # HANGUL SYLLABLE RIEUL-AE-IEUNG
-0x372A  0xB7B4  # HANGUL SYLLABLE RIEUL-YA
-0x372B  0xB7B5  # HANGUL SYLLABLE RIEUL-YA-KIYEOK
-0x372C  0xB7B8  # HANGUL SYLLABLE RIEUL-YA-NIEUN
-0x372D  0xB7C7  # HANGUL SYLLABLE RIEUL-YA-SIOS
-0x372E  0xB7C9  # HANGUL SYLLABLE RIEUL-YA-IEUNG
-0x372F  0xB7EC  # HANGUL SYLLABLE RIEUL-EO
-0x3730  0xB7ED  # HANGUL SYLLABLE RIEUL-EO-KIYEOK
-0x3731  0xB7F0  # HANGUL SYLLABLE RIEUL-EO-NIEUN
-0x3732  0xB7F4  # HANGUL SYLLABLE RIEUL-EO-RIEUL
-0x3733  0xB7FC  # HANGUL SYLLABLE RIEUL-EO-MIEUM
-0x3734  0xB7FD  # HANGUL SYLLABLE RIEUL-EO-PIEUP
-0x3735  0xB7FF  # HANGUL SYLLABLE RIEUL-EO-SIOS
-0x3736  0xB800  # HANGUL SYLLABLE RIEUL-EO-SSANGSIOS
-0x3737  0xB801  # HANGUL SYLLABLE RIEUL-EO-IEUNG
-0x3738  0xB807  # HANGUL SYLLABLE RIEUL-EO-HIEUH
-0x3739  0xB808  # HANGUL SYLLABLE RIEUL-E
-0x373A  0xB809  # HANGUL SYLLABLE RIEUL-E-KIYEOK
-0x373B  0xB80C  # HANGUL SYLLABLE RIEUL-E-NIEUN
-0x373C  0xB810  # HANGUL SYLLABLE RIEUL-E-RIEUL
-0x373D  0xB818  # HANGUL SYLLABLE RIEUL-E-MIEUM
-0x373E  0xB819  # HANGUL SYLLABLE RIEUL-E-PIEUP
-0x373F  0xB81B  # HANGUL SYLLABLE RIEUL-E-SIOS
-0x3740  0xB81D  # HANGUL SYLLABLE RIEUL-E-IEUNG
-0x3741  0xB824  # HANGUL SYLLABLE RIEUL-YEO
-0x3742  0xB825  # HANGUL SYLLABLE RIEUL-YEO-KIYEOK
-0x3743  0xB828  # HANGUL SYLLABLE RIEUL-YEO-NIEUN
-0x3744  0xB82C  # HANGUL SYLLABLE RIEUL-YEO-RIEUL
-0x3745  0xB834  # HANGUL SYLLABLE RIEUL-YEO-MIEUM
-0x3746  0xB835  # HANGUL SYLLABLE RIEUL-YEO-PIEUP
-0x3747  0xB837  # HANGUL SYLLABLE RIEUL-YEO-SIOS
-0x3748  0xB838  # HANGUL SYLLABLE RIEUL-YEO-SSANGSIOS
-0x3749  0xB839  # HANGUL SYLLABLE RIEUL-YEO-IEUNG
-0x374A  0xB840  # HANGUL SYLLABLE RIEUL-YE
-0x374B  0xB844  # HANGUL SYLLABLE RIEUL-YE-NIEUN
-0x374C  0xB851  # HANGUL SYLLABLE RIEUL-YE-PIEUP
-0x374D  0xB853  # HANGUL SYLLABLE RIEUL-YE-SIOS
-0x374E  0xB85C  # HANGUL SYLLABLE RIEUL-O
-0x374F  0xB85D  # HANGUL SYLLABLE RIEUL-O-KIYEOK
-0x3750  0xB860  # HANGUL SYLLABLE RIEUL-O-NIEUN
-0x3751  0xB864  # HANGUL SYLLABLE RIEUL-O-RIEUL
-0x3752  0xB86C  # HANGUL SYLLABLE RIEUL-O-MIEUM
-0x3753  0xB86D  # HANGUL SYLLABLE RIEUL-O-PIEUP
-0x3754  0xB86F  # HANGUL SYLLABLE RIEUL-O-SIOS
-0x3755  0xB871  # HANGUL SYLLABLE RIEUL-O-IEUNG
-0x3756  0xB878  # HANGUL SYLLABLE RIEUL-WA
-0x3757  0xB87C  # HANGUL SYLLABLE RIEUL-WA-NIEUN
-0x3758  0xB88D  # HANGUL SYLLABLE RIEUL-WA-IEUNG
-0x3759  0xB8A8  # HANGUL SYLLABLE RIEUL-WAE-SSANGSIOS
-0x375A  0xB8B0  # HANGUL SYLLABLE RIEUL-OE
-0x375B  0xB8B4  # HANGUL SYLLABLE RIEUL-OE-NIEUN
-0x375C  0xB8B8  # HANGUL SYLLABLE RIEUL-OE-RIEUL
-0x375D  0xB8C0  # HANGUL SYLLABLE RIEUL-OE-MIEUM
-0x375E  0xB8C1  # HANGUL SYLLABLE RIEUL-OE-PIEUP
-0x375F  0xB8C3  # HANGUL SYLLABLE RIEUL-OE-SIOS
-0x3760  0xB8C5  # HANGUL SYLLABLE RIEUL-OE-IEUNG
-0x3761  0xB8CC  # HANGUL SYLLABLE RIEUL-YO
-0x3762  0xB8D0  # HANGUL SYLLABLE RIEUL-YO-NIEUN
-0x3763  0xB8D4  # HANGUL SYLLABLE RIEUL-YO-RIEUL
-0x3764  0xB8DD  # HANGUL SYLLABLE RIEUL-YO-PIEUP
-0x3765  0xB8DF  # HANGUL SYLLABLE RIEUL-YO-SIOS
-0x3766  0xB8E1  # HANGUL SYLLABLE RIEUL-YO-IEUNG
-0x3767  0xB8E8  # HANGUL SYLLABLE RIEUL-U
-0x3768  0xB8E9  # HANGUL SYLLABLE RIEUL-U-KIYEOK
-0x3769  0xB8EC  # HANGUL SYLLABLE RIEUL-U-NIEUN
-0x376A  0xB8F0  # HANGUL SYLLABLE RIEUL-U-RIEUL
-0x376B  0xB8F8  # HANGUL SYLLABLE RIEUL-U-MIEUM
-0x376C  0xB8F9  # HANGUL SYLLABLE RIEUL-U-PIEUP
-0x376D  0xB8FB  # HANGUL SYLLABLE RIEUL-U-SIOS
-0x376E  0xB8FD  # HANGUL SYLLABLE RIEUL-U-IEUNG
-0x376F  0xB904  # HANGUL SYLLABLE RIEUL-WEO
-0x3770  0xB918  # HANGUL SYLLABLE RIEUL-WEO-SSANGSIOS
-0x3771  0xB920  # HANGUL SYLLABLE RIEUL-WE
-0x3772  0xB93C  # HANGUL SYLLABLE RIEUL-WI
-0x3773  0xB93D  # HANGUL SYLLABLE RIEUL-WI-KIYEOK
-0x3774  0xB940  # HANGUL SYLLABLE RIEUL-WI-NIEUN
-0x3775  0xB944  # HANGUL SYLLABLE RIEUL-WI-RIEUL
-0x3776  0xB94C  # HANGUL SYLLABLE RIEUL-WI-MIEUM
-0x3777  0xB94F  # HANGUL SYLLABLE RIEUL-WI-SIOS
-0x3778  0xB951  # HANGUL SYLLABLE RIEUL-WI-IEUNG
-0x3779  0xB958  # HANGUL SYLLABLE RIEUL-YU
-0x377A  0xB959  # HANGUL SYLLABLE RIEUL-YU-KIYEOK
-0x377B  0xB95C  # HANGUL SYLLABLE RIEUL-YU-NIEUN
-0x377C  0xB960  # HANGUL SYLLABLE RIEUL-YU-RIEUL
-0x377D  0xB968  # HANGUL SYLLABLE RIEUL-YU-MIEUM
-0x377E  0xB969  # HANGUL SYLLABLE RIEUL-YU-PIEUP
-0x3821  0xB96B  # HANGUL SYLLABLE RIEUL-YU-SIOS
-0x3822  0xB96D  # HANGUL SYLLABLE RIEUL-YU-IEUNG
-0x3823  0xB974  # HANGUL SYLLABLE RIEUL-EU
-0x3824  0xB975  # HANGUL SYLLABLE RIEUL-EU-KIYEOK
-0x3825  0xB978  # HANGUL SYLLABLE RIEUL-EU-NIEUN
-0x3826  0xB97C  # HANGUL SYLLABLE RIEUL-EU-RIEUL
-0x3827  0xB984  # HANGUL SYLLABLE RIEUL-EU-MIEUM
-0x3828  0xB985  # HANGUL SYLLABLE RIEUL-EU-PIEUP
-0x3829  0xB987  # HANGUL SYLLABLE RIEUL-EU-SIOS
-0x382A  0xB989  # HANGUL SYLLABLE RIEUL-EU-IEUNG
-0x382B  0xB98A  # HANGUL SYLLABLE RIEUL-EU-CIEUC
-0x382C  0xB98D  # HANGUL SYLLABLE RIEUL-EU-THIEUTH
-0x382D  0xB98E  # HANGUL SYLLABLE RIEUL-EU-PHIEUPH
-0x382E  0xB9AC  # HANGUL SYLLABLE RIEUL-I
-0x382F  0xB9AD  # HANGUL SYLLABLE RIEUL-I-KIYEOK
-0x3830  0xB9B0  # HANGUL SYLLABLE RIEUL-I-NIEUN
-0x3831  0xB9B4  # HANGUL SYLLABLE RIEUL-I-RIEUL
-0x3832  0xB9BC  # HANGUL SYLLABLE RIEUL-I-MIEUM
-0x3833  0xB9BD  # HANGUL SYLLABLE RIEUL-I-PIEUP
-0x3834  0xB9BF  # HANGUL SYLLABLE RIEUL-I-SIOS
-0x3835  0xB9C1  # HANGUL SYLLABLE RIEUL-I-IEUNG
-0x3836  0xB9C8  # HANGUL SYLLABLE MIEUM-A
-0x3837  0xB9C9  # HANGUL SYLLABLE MIEUM-A-KIYEOK
-0x3838  0xB9CC  # HANGUL SYLLABLE MIEUM-A-NIEUN
-0x3839  0xB9CE  # HANGUL SYLLABLE MIEUM-A-NIEUNHIEUH
-0x383A  0xB9CF  # HANGUL SYLLABLE MIEUM-A-TIKEUT
-0x383B  0xB9D0  # HANGUL SYLLABLE MIEUM-A-RIEUL
-0x383C  0xB9D1  # HANGUL SYLLABLE MIEUM-A-RIEULKIYEOK
-0x383D  0xB9D2  # HANGUL SYLLABLE MIEUM-A-RIEULMIEUM
-0x383E  0xB9D8  # HANGUL SYLLABLE MIEUM-A-MIEUM
-0x383F  0xB9D9  # HANGUL SYLLABLE MIEUM-A-PIEUP
-0x3840  0xB9DB  # HANGUL SYLLABLE MIEUM-A-SIOS
-0x3841  0xB9DD  # HANGUL SYLLABLE MIEUM-A-IEUNG
-0x3842  0xB9DE  # HANGUL SYLLABLE MIEUM-A-CIEUC
-0x3843  0xB9E1  # HANGUL SYLLABLE MIEUM-A-THIEUTH
-0x3844  0xB9E3  # HANGUL SYLLABLE MIEUM-A-HIEUH
-0x3845  0xB9E4  # HANGUL SYLLABLE MIEUM-AE
-0x3846  0xB9E5  # HANGUL SYLLABLE MIEUM-AE-KIYEOK
-0x3847  0xB9E8  # HANGUL SYLLABLE MIEUM-AE-NIEUN
-0x3848  0xB9EC  # HANGUL SYLLABLE MIEUM-AE-RIEUL
-0x3849  0xB9F4  # HANGUL SYLLABLE MIEUM-AE-MIEUM
-0x384A  0xB9F5  # HANGUL SYLLABLE MIEUM-AE-PIEUP
-0x384B  0xB9F7  # HANGUL SYLLABLE MIEUM-AE-SIOS
-0x384C  0xB9F8  # HANGUL SYLLABLE MIEUM-AE-SSANGSIOS
-0x384D  0xB9F9  # HANGUL SYLLABLE MIEUM-AE-IEUNG
-0x384E  0xB9FA  # HANGUL SYLLABLE MIEUM-AE-CIEUC
-0x384F  0xBA00  # HANGUL SYLLABLE MIEUM-YA
-0x3850  0xBA01  # HANGUL SYLLABLE MIEUM-YA-KIYEOK
-0x3851  0xBA08  # HANGUL SYLLABLE MIEUM-YA-RIEUL
-0x3852  0xBA15  # HANGUL SYLLABLE MIEUM-YA-IEUNG
-0x3853  0xBA38  # HANGUL SYLLABLE MIEUM-EO
-0x3854  0xBA39  # HANGUL SYLLABLE MIEUM-EO-KIYEOK
-0x3855  0xBA3C  # HANGUL SYLLABLE MIEUM-EO-NIEUN
-0x3856  0xBA40  # HANGUL SYLLABLE MIEUM-EO-RIEUL
-0x3857  0xBA42  # HANGUL SYLLABLE MIEUM-EO-RIEULMIEUM
-0x3858  0xBA48  # HANGUL SYLLABLE MIEUM-EO-MIEUM
-0x3859  0xBA49  # HANGUL SYLLABLE MIEUM-EO-PIEUP
-0x385A  0xBA4B  # HANGUL SYLLABLE MIEUM-EO-SIOS
-0x385B  0xBA4D  # HANGUL SYLLABLE MIEUM-EO-IEUNG
-0x385C  0xBA4E  # HANGUL SYLLABLE MIEUM-EO-CIEUC
-0x385D  0xBA53  # HANGUL SYLLABLE MIEUM-EO-HIEUH
-0x385E  0xBA54  # HANGUL SYLLABLE MIEUM-E
-0x385F  0xBA55  # HANGUL SYLLABLE MIEUM-E-KIYEOK
-0x3860  0xBA58  # HANGUL SYLLABLE MIEUM-E-NIEUN
-0x3861  0xBA5C  # HANGUL SYLLABLE MIEUM-E-RIEUL
-0x3862  0xBA64  # HANGUL SYLLABLE MIEUM-E-MIEUM
-0x3863  0xBA65  # HANGUL SYLLABLE MIEUM-E-PIEUP
-0x3864  0xBA67  # HANGUL SYLLABLE MIEUM-E-SIOS
-0x3865  0xBA68  # HANGUL SYLLABLE MIEUM-E-SSANGSIOS
-0x3866  0xBA69  # HANGUL SYLLABLE MIEUM-E-IEUNG
-0x3867  0xBA70  # HANGUL SYLLABLE MIEUM-YEO
-0x3868  0xBA71  # HANGUL SYLLABLE MIEUM-YEO-KIYEOK
-0x3869  0xBA74  # HANGUL SYLLABLE MIEUM-YEO-NIEUN
-0x386A  0xBA78  # HANGUL SYLLABLE MIEUM-YEO-RIEUL
-0x386B  0xBA83  # HANGUL SYLLABLE MIEUM-YEO-SIOS
-0x386C  0xBA84  # HANGUL SYLLABLE MIEUM-YEO-SSANGSIOS
-0x386D  0xBA85  # HANGUL SYLLABLE MIEUM-YEO-IEUNG
-0x386E  0xBA87  # HANGUL SYLLABLE MIEUM-YEO-CHIEUCH
-0x386F  0xBA8C  # HANGUL SYLLABLE MIEUM-YE
-0x3870  0xBAA8  # HANGUL SYLLABLE MIEUM-O
-0x3871  0xBAA9  # HANGUL SYLLABLE MIEUM-O-KIYEOK
-0x3872  0xBAAB  # HANGUL SYLLABLE MIEUM-O-KIYEOKSIOS
-0x3873  0xBAAC  # HANGUL SYLLABLE MIEUM-O-NIEUN
-0x3874  0xBAB0  # HANGUL SYLLABLE MIEUM-O-RIEUL
-0x3875  0xBAB2  # HANGUL SYLLABLE MIEUM-O-RIEULMIEUM
-0x3876  0xBAB8  # HANGUL SYLLABLE MIEUM-O-MIEUM
-0x3877  0xBAB9  # HANGUL SYLLABLE MIEUM-O-PIEUP
-0x3878  0xBABB  # HANGUL SYLLABLE MIEUM-O-SIOS
-0x3879  0xBABD  # HANGUL SYLLABLE MIEUM-O-IEUNG
-0x387A  0xBAC4  # HANGUL SYLLABLE MIEUM-WA
-0x387B  0xBAC8  # HANGUL SYLLABLE MIEUM-WA-NIEUN
-0x387C  0xBAD8  # HANGUL SYLLABLE MIEUM-WA-SSANGSIOS
-0x387D  0xBAD9  # HANGUL SYLLABLE MIEUM-WA-IEUNG
-0x387E  0xBAFC  # HANGUL SYLLABLE MIEUM-OE
-0x3921  0xBB00  # HANGUL SYLLABLE MIEUM-OE-NIEUN
-0x3922  0xBB04  # HANGUL SYLLABLE MIEUM-OE-RIEUL
-0x3923  0xBB0D  # HANGUL SYLLABLE MIEUM-OE-PIEUP
-0x3924  0xBB0F  # HANGUL SYLLABLE MIEUM-OE-SIOS
-0x3925  0xBB11  # HANGUL SYLLABLE MIEUM-OE-IEUNG
-0x3926  0xBB18  # HANGUL SYLLABLE MIEUM-YO
-0x3927  0xBB1C  # HANGUL SYLLABLE MIEUM-YO-NIEUN
-0x3928  0xBB20  # HANGUL SYLLABLE MIEUM-YO-RIEUL
-0x3929  0xBB29  # HANGUL SYLLABLE MIEUM-YO-PIEUP
-0x392A  0xBB2B  # HANGUL SYLLABLE MIEUM-YO-SIOS
-0x392B  0xBB34  # HANGUL SYLLABLE MIEUM-U
-0x392C  0xBB35  # HANGUL SYLLABLE MIEUM-U-KIYEOK
-0x392D  0xBB36  # HANGUL SYLLABLE MIEUM-U-SSANGKIYEOK
-0x392E  0xBB38  # HANGUL SYLLABLE MIEUM-U-NIEUN
-0x392F  0xBB3B  # HANGUL SYLLABLE MIEUM-U-TIKEUT
-0x3930  0xBB3C  # HANGUL SYLLABLE MIEUM-U-RIEUL
-0x3931  0xBB3D  # HANGUL SYLLABLE MIEUM-U-RIEULKIYEOK
-0x3932  0xBB3E  # HANGUL SYLLABLE MIEUM-U-RIEULMIEUM
-0x3933  0xBB44  # HANGUL SYLLABLE MIEUM-U-MIEUM
-0x3934  0xBB45  # HANGUL SYLLABLE MIEUM-U-PIEUP
-0x3935  0xBB47  # HANGUL SYLLABLE MIEUM-U-SIOS
-0x3936  0xBB49  # HANGUL SYLLABLE MIEUM-U-IEUNG
-0x3937  0xBB4D  # HANGUL SYLLABLE MIEUM-U-THIEUTH
-0x3938  0xBB4F  # HANGUL SYLLABLE MIEUM-U-HIEUH
-0x3939  0xBB50  # HANGUL SYLLABLE MIEUM-WEO
-0x393A  0xBB54  # HANGUL SYLLABLE MIEUM-WEO-NIEUN
-0x393B  0xBB58  # HANGUL SYLLABLE MIEUM-WEO-RIEUL
-0x393C  0xBB61  # HANGUL SYLLABLE MIEUM-WEO-PIEUP
-0x393D  0xBB63  # HANGUL SYLLABLE MIEUM-WEO-SIOS
-0x393E  0xBB6C  # HANGUL SYLLABLE MIEUM-WE
-0x393F  0xBB88  # HANGUL SYLLABLE MIEUM-WI
-0x3940  0xBB8C  # HANGUL SYLLABLE MIEUM-WI-NIEUN
-0x3941  0xBB90  # HANGUL SYLLABLE MIEUM-WI-RIEUL
-0x3942  0xBBA4  # HANGUL SYLLABLE MIEUM-YU
-0x3943  0xBBA8  # HANGUL SYLLABLE MIEUM-YU-NIEUN
-0x3944  0xBBAC  # HANGUL SYLLABLE MIEUM-YU-RIEUL
-0x3945  0xBBB4  # HANGUL SYLLABLE MIEUM-YU-MIEUM
-0x3946  0xBBB7  # HANGUL SYLLABLE MIEUM-YU-SIOS
-0x3947  0xBBC0  # HANGUL SYLLABLE MIEUM-EU
-0x3948  0xBBC4  # HANGUL SYLLABLE MIEUM-EU-NIEUN
-0x3949  0xBBC8  # HANGUL SYLLABLE MIEUM-EU-RIEUL
-0x394A  0xBBD0  # HANGUL SYLLABLE MIEUM-EU-MIEUM
-0x394B  0xBBD3  # HANGUL SYLLABLE MIEUM-EU-SIOS
-0x394C  0xBBF8  # HANGUL SYLLABLE MIEUM-I
-0x394D  0xBBF9  # HANGUL SYLLABLE MIEUM-I-KIYEOK
-0x394E  0xBBFC  # HANGUL SYLLABLE MIEUM-I-NIEUN
-0x394F  0xBBFF  # HANGUL SYLLABLE MIEUM-I-TIKEUT
-0x3950  0xBC00  # HANGUL SYLLABLE MIEUM-I-RIEUL
-0x3951  0xBC02  # HANGUL SYLLABLE MIEUM-I-RIEULMIEUM
-0x3952  0xBC08  # HANGUL SYLLABLE MIEUM-I-MIEUM
-0x3953  0xBC09  # HANGUL SYLLABLE MIEUM-I-PIEUP
-0x3954  0xBC0B  # HANGUL SYLLABLE MIEUM-I-SIOS
-0x3955  0xBC0C  # HANGUL SYLLABLE MIEUM-I-SSANGSIOS
-0x3956  0xBC0D  # HANGUL SYLLABLE MIEUM-I-IEUNG
-0x3957  0xBC0F  # HANGUL SYLLABLE MIEUM-I-CHIEUCH
-0x3958  0xBC11  # HANGUL SYLLABLE MIEUM-I-THIEUTH
-0x3959  0xBC14  # HANGUL SYLLABLE PIEUP-A
-0x395A  0xBC15  # HANGUL SYLLABLE PIEUP-A-KIYEOK
-0x395B  0xBC16  # HANGUL SYLLABLE PIEUP-A-SSANGKIYEOK
-0x395C  0xBC17  # HANGUL SYLLABLE PIEUP-A-KIYEOKSIOS
-0x395D  0xBC18  # HANGUL SYLLABLE PIEUP-A-NIEUN
-0x395E  0xBC1B  # HANGUL SYLLABLE PIEUP-A-TIKEUT
-0x395F  0xBC1C  # HANGUL SYLLABLE PIEUP-A-RIEUL
-0x3960  0xBC1D  # HANGUL SYLLABLE PIEUP-A-RIEULKIYEOK
-0x3961  0xBC1E  # HANGUL SYLLABLE PIEUP-A-RIEULMIEUM
-0x3962  0xBC1F  # HANGUL SYLLABLE PIEUP-A-RIEULPIEUP
-0x3963  0xBC24  # HANGUL SYLLABLE PIEUP-A-MIEUM
-0x3964  0xBC25  # HANGUL SYLLABLE PIEUP-A-PIEUP
-0x3965  0xBC27  # HANGUL SYLLABLE PIEUP-A-SIOS
-0x3966  0xBC29  # HANGUL SYLLABLE PIEUP-A-IEUNG
-0x3967  0xBC2D  # HANGUL SYLLABLE PIEUP-A-THIEUTH
-0x3968  0xBC30  # HANGUL SYLLABLE PIEUP-AE
-0x3969  0xBC31  # HANGUL SYLLABLE PIEUP-AE-KIYEOK
-0x396A  0xBC34  # HANGUL SYLLABLE PIEUP-AE-NIEUN
-0x396B  0xBC38  # HANGUL SYLLABLE PIEUP-AE-RIEUL
-0x396C  0xBC40  # HANGUL SYLLABLE PIEUP-AE-MIEUM
-0x396D  0xBC41  # HANGUL SYLLABLE PIEUP-AE-PIEUP
-0x396E  0xBC43  # HANGUL SYLLABLE PIEUP-AE-SIOS
-0x396F  0xBC44  # HANGUL SYLLABLE PIEUP-AE-SSANGSIOS
-0x3970  0xBC45  # HANGUL SYLLABLE PIEUP-AE-IEUNG
-0x3971  0xBC49  # HANGUL SYLLABLE PIEUP-AE-THIEUTH
-0x3972  0xBC4C  # HANGUL SYLLABLE PIEUP-YA
-0x3973  0xBC4D  # HANGUL SYLLABLE PIEUP-YA-KIYEOK
-0x3974  0xBC50  # HANGUL SYLLABLE PIEUP-YA-NIEUN
-0x3975  0xBC5D  # HANGUL SYLLABLE PIEUP-YA-PIEUP
-0x3976  0xBC84  # HANGUL SYLLABLE PIEUP-EO
-0x3977  0xBC85  # HANGUL SYLLABLE PIEUP-EO-KIYEOK
-0x3978  0xBC88  # HANGUL SYLLABLE PIEUP-EO-NIEUN
-0x3979  0xBC8B  # HANGUL SYLLABLE PIEUP-EO-TIKEUT
-0x397A  0xBC8C  # HANGUL SYLLABLE PIEUP-EO-RIEUL
-0x397B  0xBC8E  # HANGUL SYLLABLE PIEUP-EO-RIEULMIEUM
-0x397C  0xBC94  # HANGUL SYLLABLE PIEUP-EO-MIEUM
-0x397D  0xBC95  # HANGUL SYLLABLE PIEUP-EO-PIEUP
-0x397E  0xBC97  # HANGUL SYLLABLE PIEUP-EO-SIOS
-0x3A21  0xBC99  # HANGUL SYLLABLE PIEUP-EO-IEUNG
-0x3A22  0xBC9A  # HANGUL SYLLABLE PIEUP-EO-CIEUC
-0x3A23  0xBCA0  # HANGUL SYLLABLE PIEUP-E
-0x3A24  0xBCA1  # HANGUL SYLLABLE PIEUP-E-KIYEOK
-0x3A25  0xBCA4  # HANGUL SYLLABLE PIEUP-E-NIEUN
-0x3A26  0xBCA7  # HANGUL SYLLABLE PIEUP-E-TIKEUT
-0x3A27  0xBCA8  # HANGUL SYLLABLE PIEUP-E-RIEUL
-0x3A28  0xBCB0  # HANGUL SYLLABLE PIEUP-E-MIEUM
-0x3A29  0xBCB1  # HANGUL SYLLABLE PIEUP-E-PIEUP
-0x3A2A  0xBCB3  # HANGUL SYLLABLE PIEUP-E-SIOS
-0x3A2B  0xBCB4  # HANGUL SYLLABLE PIEUP-E-SSANGSIOS
-0x3A2C  0xBCB5  # HANGUL SYLLABLE PIEUP-E-IEUNG
-0x3A2D  0xBCBC  # HANGUL SYLLABLE PIEUP-YEO
-0x3A2E  0xBCBD  # HANGUL SYLLABLE PIEUP-YEO-KIYEOK
-0x3A2F  0xBCC0  # HANGUL SYLLABLE PIEUP-YEO-NIEUN
-0x3A30  0xBCC4  # HANGUL SYLLABLE PIEUP-YEO-RIEUL
-0x3A31  0xBCCD  # HANGUL SYLLABLE PIEUP-YEO-PIEUP
-0x3A32  0xBCCF  # HANGUL SYLLABLE PIEUP-YEO-SIOS
-0x3A33  0xBCD0  # HANGUL SYLLABLE PIEUP-YEO-SSANGSIOS
-0x3A34  0xBCD1  # HANGUL SYLLABLE PIEUP-YEO-IEUNG
-0x3A35  0xBCD5  # HANGUL SYLLABLE PIEUP-YEO-THIEUTH
-0x3A36  0xBCD8  # HANGUL SYLLABLE PIEUP-YE
-0x3A37  0xBCDC  # HANGUL SYLLABLE PIEUP-YE-NIEUN
-0x3A38  0xBCF4  # HANGUL SYLLABLE PIEUP-O
-0x3A39  0xBCF5  # HANGUL SYLLABLE PIEUP-O-KIYEOK
-0x3A3A  0xBCF6  # HANGUL SYLLABLE PIEUP-O-SSANGKIYEOK
-0x3A3B  0xBCF8  # HANGUL SYLLABLE PIEUP-O-NIEUN
-0x3A3C  0xBCFC  # HANGUL SYLLABLE PIEUP-O-RIEUL
-0x3A3D  0xBD04  # HANGUL SYLLABLE PIEUP-O-MIEUM
-0x3A3E  0xBD05  # HANGUL SYLLABLE PIEUP-O-PIEUP
-0x3A3F  0xBD07  # HANGUL SYLLABLE PIEUP-O-SIOS
-0x3A40  0xBD09  # HANGUL SYLLABLE PIEUP-O-IEUNG
-0x3A41  0xBD10  # HANGUL SYLLABLE PIEUP-WA
-0x3A42  0xBD14  # HANGUL SYLLABLE PIEUP-WA-NIEUN
-0x3A43  0xBD24  # HANGUL SYLLABLE PIEUP-WA-SSANGSIOS
-0x3A44  0xBD2C  # HANGUL SYLLABLE PIEUP-WAE
-0x3A45  0xBD40  # HANGUL SYLLABLE PIEUP-WAE-SSANGSIOS
-0x3A46  0xBD48  # HANGUL SYLLABLE PIEUP-OE
-0x3A47  0xBD49  # HANGUL SYLLABLE PIEUP-OE-KIYEOK
-0x3A48  0xBD4C  # HANGUL SYLLABLE PIEUP-OE-NIEUN
-0x3A49  0xBD50  # HANGUL SYLLABLE PIEUP-OE-RIEUL
-0x3A4A  0xBD58  # HANGUL SYLLABLE PIEUP-OE-MIEUM
-0x3A4B  0xBD59  # HANGUL SYLLABLE PIEUP-OE-PIEUP
-0x3A4C  0xBD64  # HANGUL SYLLABLE PIEUP-YO
-0x3A4D  0xBD68  # HANGUL SYLLABLE PIEUP-YO-NIEUN
-0x3A4E  0xBD80  # HANGUL SYLLABLE PIEUP-U
-0x3A4F  0xBD81  # HANGUL SYLLABLE PIEUP-U-KIYEOK
-0x3A50  0xBD84  # HANGUL SYLLABLE PIEUP-U-NIEUN
-0x3A51  0xBD87  # HANGUL SYLLABLE PIEUP-U-TIKEUT
-0x3A52  0xBD88  # HANGUL SYLLABLE PIEUP-U-RIEUL
-0x3A53  0xBD89  # HANGUL SYLLABLE PIEUP-U-RIEULKIYEOK
-0x3A54  0xBD8A  # HANGUL SYLLABLE PIEUP-U-RIEULMIEUM
-0x3A55  0xBD90  # HANGUL SYLLABLE PIEUP-U-MIEUM
-0x3A56  0xBD91  # HANGUL SYLLABLE PIEUP-U-PIEUP
-0x3A57  0xBD93  # HANGUL SYLLABLE PIEUP-U-SIOS
-0x3A58  0xBD95  # HANGUL SYLLABLE PIEUP-U-IEUNG
-0x3A59  0xBD99  # HANGUL SYLLABLE PIEUP-U-THIEUTH
-0x3A5A  0xBD9A  # HANGUL SYLLABLE PIEUP-U-PHIEUPH
-0x3A5B  0xBD9C  # HANGUL SYLLABLE PIEUP-WEO
-0x3A5C  0xBDA4  # HANGUL SYLLABLE PIEUP-WEO-RIEUL
-0x3A5D  0xBDB0  # HANGUL SYLLABLE PIEUP-WEO-SSANGSIOS
-0x3A5E  0xBDB8  # HANGUL SYLLABLE PIEUP-WE
-0x3A5F  0xBDD4  # HANGUL SYLLABLE PIEUP-WI
-0x3A60  0xBDD5  # HANGUL SYLLABLE PIEUP-WI-KIYEOK
-0x3A61  0xBDD8  # HANGUL SYLLABLE PIEUP-WI-NIEUN
-0x3A62  0xBDDC  # HANGUL SYLLABLE PIEUP-WI-RIEUL
-0x3A63  0xBDE9  # HANGUL SYLLABLE PIEUP-WI-IEUNG
-0x3A64  0xBDF0  # HANGUL SYLLABLE PIEUP-YU
-0x3A65  0xBDF4  # HANGUL SYLLABLE PIEUP-YU-NIEUN
-0x3A66  0xBDF8  # HANGUL SYLLABLE PIEUP-YU-RIEUL
-0x3A67  0xBE00  # HANGUL SYLLABLE PIEUP-YU-MIEUM
-0x3A68  0xBE03  # HANGUL SYLLABLE PIEUP-YU-SIOS
-0x3A69  0xBE05  # HANGUL SYLLABLE PIEUP-YU-IEUNG
-0x3A6A  0xBE0C  # HANGUL SYLLABLE PIEUP-EU
-0x3A6B  0xBE0D  # HANGUL SYLLABLE PIEUP-EU-KIYEOK
-0x3A6C  0xBE10  # HANGUL SYLLABLE PIEUP-EU-NIEUN
-0x3A6D  0xBE14  # HANGUL SYLLABLE PIEUP-EU-RIEUL
-0x3A6E  0xBE1C  # HANGUL SYLLABLE PIEUP-EU-MIEUM
-0x3A6F  0xBE1D  # HANGUL SYLLABLE PIEUP-EU-PIEUP
-0x3A70  0xBE1F  # HANGUL SYLLABLE PIEUP-EU-SIOS
-0x3A71  0xBE44  # HANGUL SYLLABLE PIEUP-I
-0x3A72  0xBE45  # HANGUL SYLLABLE PIEUP-I-KIYEOK
-0x3A73  0xBE48  # HANGUL SYLLABLE PIEUP-I-NIEUN
-0x3A74  0xBE4C  # HANGUL SYLLABLE PIEUP-I-RIEUL
-0x3A75  0xBE4E  # HANGUL SYLLABLE PIEUP-I-RIEULMIEUM
-0x3A76  0xBE54  # HANGUL SYLLABLE PIEUP-I-MIEUM
-0x3A77  0xBE55  # HANGUL SYLLABLE PIEUP-I-PIEUP
-0x3A78  0xBE57  # HANGUL SYLLABLE PIEUP-I-SIOS
-0x3A79  0xBE59  # HANGUL SYLLABLE PIEUP-I-IEUNG
-0x3A7A  0xBE5A  # HANGUL SYLLABLE PIEUP-I-CIEUC
-0x3A7B  0xBE5B  # HANGUL SYLLABLE PIEUP-I-CHIEUCH
-0x3A7C  0xBE60  # HANGUL SYLLABLE SSANGPIEUP-A
-0x3A7D  0xBE61  # HANGUL SYLLABLE SSANGPIEUP-A-KIYEOK
-0x3A7E  0xBE64  # HANGUL SYLLABLE SSANGPIEUP-A-NIEUN
-0x3B21  0xBE68  # HANGUL SYLLABLE SSANGPIEUP-A-RIEUL
-0x3B22  0xBE6A  # HANGUL SYLLABLE SSANGPIEUP-A-RIEULMIEUM
-0x3B23  0xBE70  # HANGUL SYLLABLE SSANGPIEUP-A-MIEUM
-0x3B24  0xBE71  # HANGUL SYLLABLE SSANGPIEUP-A-PIEUP
-0x3B25  0xBE73  # HANGUL SYLLABLE SSANGPIEUP-A-SIOS
-0x3B26  0xBE74  # HANGUL SYLLABLE SSANGPIEUP-A-SSANGSIOS
-0x3B27  0xBE75  # HANGUL SYLLABLE SSANGPIEUP-A-IEUNG
-0x3B28  0xBE7B  # HANGUL SYLLABLE SSANGPIEUP-A-HIEUH
-0x3B29  0xBE7C  # HANGUL SYLLABLE SSANGPIEUP-AE
-0x3B2A  0xBE7D  # HANGUL SYLLABLE SSANGPIEUP-AE-KIYEOK
-0x3B2B  0xBE80  # HANGUL SYLLABLE SSANGPIEUP-AE-NIEUN
-0x3B2C  0xBE84  # HANGUL SYLLABLE SSANGPIEUP-AE-RIEUL
-0x3B2D  0xBE8C  # HANGUL SYLLABLE SSANGPIEUP-AE-MIEUM
-0x3B2E  0xBE8D  # HANGUL SYLLABLE SSANGPIEUP-AE-PIEUP
-0x3B2F  0xBE8F  # HANGUL SYLLABLE SSANGPIEUP-AE-SIOS
-0x3B30  0xBE90  # HANGUL SYLLABLE SSANGPIEUP-AE-SSANGSIOS
-0x3B31  0xBE91  # HANGUL SYLLABLE SSANGPIEUP-AE-IEUNG
-0x3B32  0xBE98  # HANGUL SYLLABLE SSANGPIEUP-YA
-0x3B33  0xBE99  # HANGUL SYLLABLE SSANGPIEUP-YA-KIYEOK
-0x3B34  0xBEA8  # HANGUL SYLLABLE SSANGPIEUP-YA-MIEUM
-0x3B35  0xBED0  # HANGUL SYLLABLE SSANGPIEUP-EO
-0x3B36  0xBED1  # HANGUL SYLLABLE SSANGPIEUP-EO-KIYEOK
-0x3B37  0xBED4  # HANGUL SYLLABLE SSANGPIEUP-EO-NIEUN
-0x3B38  0xBED7  # HANGUL SYLLABLE SSANGPIEUP-EO-TIKEUT
-0x3B39  0xBED8  # HANGUL SYLLABLE SSANGPIEUP-EO-RIEUL
-0x3B3A  0xBEE0  # HANGUL SYLLABLE SSANGPIEUP-EO-MIEUM
-0x3B3B  0xBEE3  # HANGUL SYLLABLE SSANGPIEUP-EO-SIOS
-0x3B3C  0xBEE4  # HANGUL SYLLABLE SSANGPIEUP-EO-SSANGSIOS
-0x3B3D  0xBEE5  # HANGUL SYLLABLE SSANGPIEUP-EO-IEUNG
-0x3B3E  0xBEEC  # HANGUL SYLLABLE SSANGPIEUP-E
-0x3B3F  0xBF01  # HANGUL SYLLABLE SSANGPIEUP-E-IEUNG
-0x3B40  0xBF08  # HANGUL SYLLABLE SSANGPIEUP-YEO
-0x3B41  0xBF09  # HANGUL SYLLABLE SSANGPIEUP-YEO-KIYEOK
-0x3B42  0xBF18  # HANGUL SYLLABLE SSANGPIEUP-YEO-MIEUM
-0x3B43  0xBF19  # HANGUL SYLLABLE SSANGPIEUP-YEO-PIEUP
-0x3B44  0xBF1B  # HANGUL SYLLABLE SSANGPIEUP-YEO-SIOS
-0x3B45  0xBF1C  # HANGUL SYLLABLE SSANGPIEUP-YEO-SSANGSIOS
-0x3B46  0xBF1D  # HANGUL SYLLABLE SSANGPIEUP-YEO-IEUNG
-0x3B47  0xBF40  # HANGUL SYLLABLE SSANGPIEUP-O
-0x3B48  0xBF41  # HANGUL SYLLABLE SSANGPIEUP-O-KIYEOK
-0x3B49  0xBF44  # HANGUL SYLLABLE SSANGPIEUP-O-NIEUN
-0x3B4A  0xBF48  # HANGUL SYLLABLE SSANGPIEUP-O-RIEUL
-0x3B4B  0xBF50  # HANGUL SYLLABLE SSANGPIEUP-O-MIEUM
-0x3B4C  0xBF51  # HANGUL SYLLABLE SSANGPIEUP-O-PIEUP
-0x3B4D  0xBF55  # HANGUL SYLLABLE SSANGPIEUP-O-IEUNG
-0x3B4E  0xBF94  # HANGUL SYLLABLE SSANGPIEUP-OE
-0x3B4F  0xBFB0  # HANGUL SYLLABLE SSANGPIEUP-YO
-0x3B50  0xBFC5  # HANGUL SYLLABLE SSANGPIEUP-YO-IEUNG
-0x3B51  0xBFCC  # HANGUL SYLLABLE SSANGPIEUP-U
-0x3B52  0xBFCD  # HANGUL SYLLABLE SSANGPIEUP-U-KIYEOK
-0x3B53  0xBFD0  # HANGUL SYLLABLE SSANGPIEUP-U-NIEUN
-0x3B54  0xBFD4  # HANGUL SYLLABLE SSANGPIEUP-U-RIEUL
-0x3B55  0xBFDC  # HANGUL SYLLABLE SSANGPIEUP-U-MIEUM
-0x3B56  0xBFDF  # HANGUL SYLLABLE SSANGPIEUP-U-SIOS
-0x3B57  0xBFE1  # HANGUL SYLLABLE SSANGPIEUP-U-IEUNG
-0x3B58  0xC03C  # HANGUL SYLLABLE SSANGPIEUP-YU
-0x3B59  0xC051  # HANGUL SYLLABLE SSANGPIEUP-YU-IEUNG
-0x3B5A  0xC058  # HANGUL SYLLABLE SSANGPIEUP-EU
-0x3B5B  0xC05C  # HANGUL SYLLABLE SSANGPIEUP-EU-NIEUN
-0x3B5C  0xC060  # HANGUL SYLLABLE SSANGPIEUP-EU-RIEUL
-0x3B5D  0xC068  # HANGUL SYLLABLE SSANGPIEUP-EU-MIEUM
-0x3B5E  0xC069  # HANGUL SYLLABLE SSANGPIEUP-EU-PIEUP
-0x3B5F  0xC090  # HANGUL SYLLABLE SSANGPIEUP-I
-0x3B60  0xC091  # HANGUL SYLLABLE SSANGPIEUP-I-KIYEOK
-0x3B61  0xC094  # HANGUL SYLLABLE SSANGPIEUP-I-NIEUN
-0x3B62  0xC098  # HANGUL SYLLABLE SSANGPIEUP-I-RIEUL
-0x3B63  0xC0A0  # HANGUL SYLLABLE SSANGPIEUP-I-MIEUM
-0x3B64  0xC0A1  # HANGUL SYLLABLE SSANGPIEUP-I-PIEUP
-0x3B65  0xC0A3  # HANGUL SYLLABLE SSANGPIEUP-I-SIOS
-0x3B66  0xC0A5  # HANGUL SYLLABLE SSANGPIEUP-I-IEUNG
-0x3B67  0xC0AC  # HANGUL SYLLABLE SIOS-A
-0x3B68  0xC0AD  # HANGUL SYLLABLE SIOS-A-KIYEOK
-0x3B69  0xC0AF  # HANGUL SYLLABLE SIOS-A-KIYEOKSIOS
-0x3B6A  0xC0B0  # HANGUL SYLLABLE SIOS-A-NIEUN
-0x3B6B  0xC0B3  # HANGUL SYLLABLE SIOS-A-TIKEUT
-0x3B6C  0xC0B4  # HANGUL SYLLABLE SIOS-A-RIEUL
-0x3B6D  0xC0B5  # HANGUL SYLLABLE SIOS-A-RIEULKIYEOK
-0x3B6E  0xC0B6  # HANGUL SYLLABLE SIOS-A-RIEULMIEUM
-0x3B6F  0xC0BC  # HANGUL SYLLABLE SIOS-A-MIEUM
-0x3B70  0xC0BD  # HANGUL SYLLABLE SIOS-A-PIEUP
-0x3B71  0xC0BF  # HANGUL SYLLABLE SIOS-A-SIOS
-0x3B72  0xC0C0  # HANGUL SYLLABLE SIOS-A-SSANGSIOS
-0x3B73  0xC0C1  # HANGUL SYLLABLE SIOS-A-IEUNG
-0x3B74  0xC0C5  # HANGUL SYLLABLE SIOS-A-THIEUTH
-0x3B75  0xC0C8  # HANGUL SYLLABLE SIOS-AE
-0x3B76  0xC0C9  # HANGUL SYLLABLE SIOS-AE-KIYEOK
-0x3B77  0xC0CC  # HANGUL SYLLABLE SIOS-AE-NIEUN
-0x3B78  0xC0D0  # HANGUL SYLLABLE SIOS-AE-RIEUL
-0x3B79  0xC0D8  # HANGUL SYLLABLE SIOS-AE-MIEUM
-0x3B7A  0xC0D9  # HANGUL SYLLABLE SIOS-AE-PIEUP
-0x3B7B  0xC0DB  # HANGUL SYLLABLE SIOS-AE-SIOS
-0x3B7C  0xC0DC  # HANGUL SYLLABLE SIOS-AE-SSANGSIOS
-0x3B7D  0xC0DD  # HANGUL SYLLABLE SIOS-AE-IEUNG
-0x3B7E  0xC0E4  # HANGUL SYLLABLE SIOS-YA
-0x3C21  0xC0E5  # HANGUL SYLLABLE SIOS-YA-KIYEOK
-0x3C22  0xC0E8  # HANGUL SYLLABLE SIOS-YA-NIEUN
-0x3C23  0xC0EC  # HANGUL SYLLABLE SIOS-YA-RIEUL
-0x3C24  0xC0F4  # HANGUL SYLLABLE SIOS-YA-MIEUM
-0x3C25  0xC0F5  # HANGUL SYLLABLE SIOS-YA-PIEUP
-0x3C26  0xC0F7  # HANGUL SYLLABLE SIOS-YA-SIOS
-0x3C27  0xC0F9  # HANGUL SYLLABLE SIOS-YA-IEUNG
-0x3C28  0xC100  # HANGUL SYLLABLE SIOS-YAE
-0x3C29  0xC104  # HANGUL SYLLABLE SIOS-YAE-NIEUN
-0x3C2A  0xC108  # HANGUL SYLLABLE SIOS-YAE-RIEUL
-0x3C2B  0xC110  # HANGUL SYLLABLE SIOS-YAE-MIEUM
-0x3C2C  0xC115  # HANGUL SYLLABLE SIOS-YAE-IEUNG
-0x3C2D  0xC11C  # HANGUL SYLLABLE SIOS-EO
-0x3C2E  0xC11D  # HANGUL SYLLABLE SIOS-EO-KIYEOK
-0x3C2F  0xC11E  # HANGUL SYLLABLE SIOS-EO-SSANGKIYEOK
-0x3C30  0xC11F  # HANGUL SYLLABLE SIOS-EO-KIYEOKSIOS
-0x3C31  0xC120  # HANGUL SYLLABLE SIOS-EO-NIEUN
-0x3C32  0xC123  # HANGUL SYLLABLE SIOS-EO-TIKEUT
-0x3C33  0xC124  # HANGUL SYLLABLE SIOS-EO-RIEUL
-0x3C34  0xC126  # HANGUL SYLLABLE SIOS-EO-RIEULMIEUM
-0x3C35  0xC127  # HANGUL SYLLABLE SIOS-EO-RIEULPIEUP
-0x3C36  0xC12C  # HANGUL SYLLABLE SIOS-EO-MIEUM
-0x3C37  0xC12D  # HANGUL SYLLABLE SIOS-EO-PIEUP
-0x3C38  0xC12F  # HANGUL SYLLABLE SIOS-EO-SIOS
-0x3C39  0xC130  # HANGUL SYLLABLE SIOS-EO-SSANGSIOS
-0x3C3A  0xC131  # HANGUL SYLLABLE SIOS-EO-IEUNG
-0x3C3B  0xC136  # HANGUL SYLLABLE SIOS-EO-PHIEUPH
-0x3C3C  0xC138  # HANGUL SYLLABLE SIOS-E
-0x3C3D  0xC139  # HANGUL SYLLABLE SIOS-E-KIYEOK
-0x3C3E  0xC13C  # HANGUL SYLLABLE SIOS-E-NIEUN
-0x3C3F  0xC140  # HANGUL SYLLABLE SIOS-E-RIEUL
-0x3C40  0xC148  # HANGUL SYLLABLE SIOS-E-MIEUM
-0x3C41  0xC149  # HANGUL SYLLABLE SIOS-E-PIEUP
-0x3C42  0xC14B  # HANGUL SYLLABLE SIOS-E-SIOS
-0x3C43  0xC14C  # HANGUL SYLLABLE SIOS-E-SSANGSIOS
-0x3C44  0xC14D  # HANGUL SYLLABLE SIOS-E-IEUNG
-0x3C45  0xC154  # HANGUL SYLLABLE SIOS-YEO
-0x3C46  0xC155  # HANGUL SYLLABLE SIOS-YEO-KIYEOK
-0x3C47  0xC158  # HANGUL SYLLABLE SIOS-YEO-NIEUN
-0x3C48  0xC15C  # HANGUL SYLLABLE SIOS-YEO-RIEUL
-0x3C49  0xC164  # HANGUL SYLLABLE SIOS-YEO-MIEUM
-0x3C4A  0xC165  # HANGUL SYLLABLE SIOS-YEO-PIEUP
-0x3C4B  0xC167  # HANGUL SYLLABLE SIOS-YEO-SIOS
-0x3C4C  0xC168  # HANGUL SYLLABLE SIOS-YEO-SSANGSIOS
-0x3C4D  0xC169  # HANGUL SYLLABLE SIOS-YEO-IEUNG
-0x3C4E  0xC170  # HANGUL SYLLABLE SIOS-YE
-0x3C4F  0xC174  # HANGUL SYLLABLE SIOS-YE-NIEUN
-0x3C50  0xC178  # HANGUL SYLLABLE SIOS-YE-RIEUL
-0x3C51  0xC185  # HANGUL SYLLABLE SIOS-YE-IEUNG
-0x3C52  0xC18C  # HANGUL SYLLABLE SIOS-O
-0x3C53  0xC18D  # HANGUL SYLLABLE SIOS-O-KIYEOK
-0x3C54  0xC18E  # HANGUL SYLLABLE SIOS-O-SSANGKIYEOK
-0x3C55  0xC190  # HANGUL SYLLABLE SIOS-O-NIEUN
-0x3C56  0xC194  # HANGUL SYLLABLE SIOS-O-RIEUL
-0x3C57  0xC196  # HANGUL SYLLABLE SIOS-O-RIEULMIEUM
-0x3C58  0xC19C  # HANGUL SYLLABLE SIOS-O-MIEUM
-0x3C59  0xC19D  # HANGUL SYLLABLE SIOS-O-PIEUP
-0x3C5A  0xC19F  # HANGUL SYLLABLE SIOS-O-SIOS
-0x3C5B  0xC1A1  # HANGUL SYLLABLE SIOS-O-IEUNG
-0x3C5C  0xC1A5  # HANGUL SYLLABLE SIOS-O-THIEUTH
-0x3C5D  0xC1A8  # HANGUL SYLLABLE SIOS-WA
-0x3C5E  0xC1A9  # HANGUL SYLLABLE SIOS-WA-KIYEOK
-0x3C5F  0xC1AC  # HANGUL SYLLABLE SIOS-WA-NIEUN
-0x3C60  0xC1B0  # HANGUL SYLLABLE SIOS-WA-RIEUL
-0x3C61  0xC1BD  # HANGUL SYLLABLE SIOS-WA-IEUNG
-0x3C62  0xC1C4  # HANGUL SYLLABLE SIOS-WAE
-0x3C63  0xC1C8  # HANGUL SYLLABLE SIOS-WAE-NIEUN
-0x3C64  0xC1CC  # HANGUL SYLLABLE SIOS-WAE-RIEUL
-0x3C65  0xC1D4  # HANGUL SYLLABLE SIOS-WAE-MIEUM
-0x3C66  0xC1D7  # HANGUL SYLLABLE SIOS-WAE-SIOS
-0x3C67  0xC1D8  # HANGUL SYLLABLE SIOS-WAE-SSANGSIOS
-0x3C68  0xC1E0  # HANGUL SYLLABLE SIOS-OE
-0x3C69  0xC1E4  # HANGUL SYLLABLE SIOS-OE-NIEUN
-0x3C6A  0xC1E8  # HANGUL SYLLABLE SIOS-OE-RIEUL
-0x3C6B  0xC1F0  # HANGUL SYLLABLE SIOS-OE-MIEUM
-0x3C6C  0xC1F1  # HANGUL SYLLABLE SIOS-OE-PIEUP
-0x3C6D  0xC1F3  # HANGUL SYLLABLE SIOS-OE-SIOS
-0x3C6E  0xC1FC  # HANGUL SYLLABLE SIOS-YO
-0x3C6F  0xC1FD  # HANGUL SYLLABLE SIOS-YO-KIYEOK
-0x3C70  0xC200  # HANGUL SYLLABLE SIOS-YO-NIEUN
-0x3C71  0xC204  # HANGUL SYLLABLE SIOS-YO-RIEUL
-0x3C72  0xC20C  # HANGUL SYLLABLE SIOS-YO-MIEUM
-0x3C73  0xC20D  # HANGUL SYLLABLE SIOS-YO-PIEUP
-0x3C74  0xC20F  # HANGUL SYLLABLE SIOS-YO-SIOS
-0x3C75  0xC211  # HANGUL SYLLABLE SIOS-YO-IEUNG
-0x3C76  0xC218  # HANGUL SYLLABLE SIOS-U
-0x3C77  0xC219  # HANGUL SYLLABLE SIOS-U-KIYEOK
-0x3C78  0xC21C  # HANGUL SYLLABLE SIOS-U-NIEUN
-0x3C79  0xC21F  # HANGUL SYLLABLE SIOS-U-TIKEUT
-0x3C7A  0xC220  # HANGUL SYLLABLE SIOS-U-RIEUL
-0x3C7B  0xC228  # HANGUL SYLLABLE SIOS-U-MIEUM
-0x3C7C  0xC229  # HANGUL SYLLABLE SIOS-U-PIEUP
-0x3C7D  0xC22B  # HANGUL SYLLABLE SIOS-U-SIOS
-0x3C7E  0xC22D  # HANGUL SYLLABLE SIOS-U-IEUNG
-0x3D21  0xC22F  # HANGUL SYLLABLE SIOS-U-CHIEUCH
-0x3D22  0xC231  # HANGUL SYLLABLE SIOS-U-THIEUTH
-0x3D23  0xC232  # HANGUL SYLLABLE SIOS-U-PHIEUPH
-0x3D24  0xC234  # HANGUL SYLLABLE SIOS-WEO
-0x3D25  0xC248  # HANGUL SYLLABLE SIOS-WEO-SSANGSIOS
-0x3D26  0xC250  # HANGUL SYLLABLE SIOS-WE
-0x3D27  0xC251  # HANGUL SYLLABLE SIOS-WE-KIYEOK
-0x3D28  0xC254  # HANGUL SYLLABLE SIOS-WE-NIEUN
-0x3D29  0xC258  # HANGUL SYLLABLE SIOS-WE-RIEUL
-0x3D2A  0xC260  # HANGUL SYLLABLE SIOS-WE-MIEUM
-0x3D2B  0xC265  # HANGUL SYLLABLE SIOS-WE-IEUNG
-0x3D2C  0xC26C  # HANGUL SYLLABLE SIOS-WI
-0x3D2D  0xC26D  # HANGUL SYLLABLE SIOS-WI-KIYEOK
-0x3D2E  0xC270  # HANGUL SYLLABLE SIOS-WI-NIEUN
-0x3D2F  0xC274  # HANGUL SYLLABLE SIOS-WI-RIEUL
-0x3D30  0xC27C  # HANGUL SYLLABLE SIOS-WI-MIEUM
-0x3D31  0xC27D  # HANGUL SYLLABLE SIOS-WI-PIEUP
-0x3D32  0xC27F  # HANGUL SYLLABLE SIOS-WI-SIOS
-0x3D33  0xC281  # HANGUL SYLLABLE SIOS-WI-IEUNG
-0x3D34  0xC288  # HANGUL SYLLABLE SIOS-YU
-0x3D35  0xC289  # HANGUL SYLLABLE SIOS-YU-KIYEOK
-0x3D36  0xC290  # HANGUL SYLLABLE SIOS-YU-RIEUL
-0x3D37  0xC298  # HANGUL SYLLABLE SIOS-YU-MIEUM
-0x3D38  0xC29B  # HANGUL SYLLABLE SIOS-YU-SIOS
-0x3D39  0xC29D  # HANGUL SYLLABLE SIOS-YU-IEUNG
-0x3D3A  0xC2A4  # HANGUL SYLLABLE SIOS-EU
-0x3D3B  0xC2A5  # HANGUL SYLLABLE SIOS-EU-KIYEOK
-0x3D3C  0xC2A8  # HANGUL SYLLABLE SIOS-EU-NIEUN
-0x3D3D  0xC2AC  # HANGUL SYLLABLE SIOS-EU-RIEUL
-0x3D3E  0xC2AD  # HANGUL SYLLABLE SIOS-EU-RIEULKIYEOK
-0x3D3F  0xC2B4  # HANGUL SYLLABLE SIOS-EU-MIEUM
-0x3D40  0xC2B5  # HANGUL SYLLABLE SIOS-EU-PIEUP
-0x3D41  0xC2B7  # HANGUL SYLLABLE SIOS-EU-SIOS
-0x3D42  0xC2B9  # HANGUL SYLLABLE SIOS-EU-IEUNG
-0x3D43  0xC2DC  # HANGUL SYLLABLE SIOS-I
-0x3D44  0xC2DD  # HANGUL SYLLABLE SIOS-I-KIYEOK
-0x3D45  0xC2E0  # HANGUL SYLLABLE SIOS-I-NIEUN
-0x3D46  0xC2E3  # HANGUL SYLLABLE SIOS-I-TIKEUT
-0x3D47  0xC2E4  # HANGUL SYLLABLE SIOS-I-RIEUL
-0x3D48  0xC2EB  # HANGUL SYLLABLE SIOS-I-RIEULHIEUH
-0x3D49  0xC2EC  # HANGUL SYLLABLE SIOS-I-MIEUM
-0x3D4A  0xC2ED  # HANGUL SYLLABLE SIOS-I-PIEUP
-0x3D4B  0xC2EF  # HANGUL SYLLABLE SIOS-I-SIOS
-0x3D4C  0xC2F1  # HANGUL SYLLABLE SIOS-I-IEUNG
-0x3D4D  0xC2F6  # HANGUL SYLLABLE SIOS-I-PHIEUPH
-0x3D4E  0xC2F8  # HANGUL SYLLABLE SSANGSIOS-A
-0x3D4F  0xC2F9  # HANGUL SYLLABLE SSANGSIOS-A-KIYEOK
-0x3D50  0xC2FB  # HANGUL SYLLABLE SSANGSIOS-A-KIYEOKSIOS
-0x3D51  0xC2FC  # HANGUL SYLLABLE SSANGSIOS-A-NIEUN
-0x3D52  0xC300  # HANGUL SYLLABLE SSANGSIOS-A-RIEUL
-0x3D53  0xC308  # HANGUL SYLLABLE SSANGSIOS-A-MIEUM
-0x3D54  0xC309  # HANGUL SYLLABLE SSANGSIOS-A-PIEUP
-0x3D55  0xC30C  # HANGUL SYLLABLE SSANGSIOS-A-SSANGSIOS
-0x3D56  0xC30D  # HANGUL SYLLABLE SSANGSIOS-A-IEUNG
-0x3D57  0xC313  # HANGUL SYLLABLE SSANGSIOS-A-HIEUH
-0x3D58  0xC314  # HANGUL SYLLABLE SSANGSIOS-AE
-0x3D59  0xC315  # HANGUL SYLLABLE SSANGSIOS-AE-KIYEOK
-0x3D5A  0xC318  # HANGUL SYLLABLE SSANGSIOS-AE-NIEUN
-0x3D5B  0xC31C  # HANGUL SYLLABLE SSANGSIOS-AE-RIEUL
-0x3D5C  0xC324  # HANGUL SYLLABLE SSANGSIOS-AE-MIEUM
-0x3D5D  0xC325  # HANGUL SYLLABLE SSANGSIOS-AE-PIEUP
-0x3D5E  0xC328  # HANGUL SYLLABLE SSANGSIOS-AE-SSANGSIOS
-0x3D5F  0xC329  # HANGUL SYLLABLE SSANGSIOS-AE-IEUNG
-0x3D60  0xC345  # HANGUL SYLLABLE SSANGSIOS-YA-IEUNG
-0x3D61  0xC368  # HANGUL SYLLABLE SSANGSIOS-EO
-0x3D62  0xC369  # HANGUL SYLLABLE SSANGSIOS-EO-KIYEOK
-0x3D63  0xC36C  # HANGUL SYLLABLE SSANGSIOS-EO-NIEUN
-0x3D64  0xC370  # HANGUL SYLLABLE SSANGSIOS-EO-RIEUL
-0x3D65  0xC372  # HANGUL SYLLABLE SSANGSIOS-EO-RIEULMIEUM
-0x3D66  0xC378  # HANGUL SYLLABLE SSANGSIOS-EO-MIEUM
-0x3D67  0xC379  # HANGUL SYLLABLE SSANGSIOS-EO-PIEUP
-0x3D68  0xC37C  # HANGUL SYLLABLE SSANGSIOS-EO-SSANGSIOS
-0x3D69  0xC37D  # HANGUL SYLLABLE SSANGSIOS-EO-IEUNG
-0x3D6A  0xC384  # HANGUL SYLLABLE SSANGSIOS-E
-0x3D6B  0xC388  # HANGUL SYLLABLE SSANGSIOS-E-NIEUN
-0x3D6C  0xC38C  # HANGUL SYLLABLE SSANGSIOS-E-RIEUL
-0x3D6D  0xC3C0  # HANGUL SYLLABLE SSANGSIOS-YE-NIEUN
-0x3D6E  0xC3D8  # HANGUL SYLLABLE SSANGSIOS-O
-0x3D6F  0xC3D9  # HANGUL SYLLABLE SSANGSIOS-O-KIYEOK
-0x3D70  0xC3DC  # HANGUL SYLLABLE SSANGSIOS-O-NIEUN
-0x3D71  0xC3DF  # HANGUL SYLLABLE SSANGSIOS-O-TIKEUT
-0x3D72  0xC3E0  # HANGUL SYLLABLE SSANGSIOS-O-RIEUL
-0x3D73  0xC3E2  # HANGUL SYLLABLE SSANGSIOS-O-RIEULMIEUM
-0x3D74  0xC3E8  # HANGUL SYLLABLE SSANGSIOS-O-MIEUM
-0x3D75  0xC3E9  # HANGUL SYLLABLE SSANGSIOS-O-PIEUP
-0x3D76  0xC3ED  # HANGUL SYLLABLE SSANGSIOS-O-IEUNG
-0x3D77  0xC3F4  # HANGUL SYLLABLE SSANGSIOS-WA
-0x3D78  0xC3F5  # HANGUL SYLLABLE SSANGSIOS-WA-KIYEOK
-0x3D79  0xC3F8  # HANGUL SYLLABLE SSANGSIOS-WA-NIEUN
-0x3D7A  0xC408  # HANGUL SYLLABLE SSANGSIOS-WA-SSANGSIOS
-0x3D7B  0xC410  # HANGUL SYLLABLE SSANGSIOS-WAE
-0x3D7C  0xC424  # HANGUL SYLLABLE SSANGSIOS-WAE-SSANGSIOS
-0x3D7D  0xC42C  # HANGUL SYLLABLE SSANGSIOS-OE
-0x3D7E  0xC430  # HANGUL SYLLABLE SSANGSIOS-OE-NIEUN
-0x3E21  0xC434  # HANGUL SYLLABLE SSANGSIOS-OE-RIEUL
-0x3E22  0xC43C  # HANGUL SYLLABLE SSANGSIOS-OE-MIEUM
-0x3E23  0xC43D  # HANGUL SYLLABLE SSANGSIOS-OE-PIEUP
-0x3E24  0xC448  # HANGUL SYLLABLE SSANGSIOS-YO
-0x3E25  0xC464  # HANGUL SYLLABLE SSANGSIOS-U
-0x3E26  0xC465  # HANGUL SYLLABLE SSANGSIOS-U-KIYEOK
-0x3E27  0xC468  # HANGUL SYLLABLE SSANGSIOS-U-NIEUN
-0x3E28  0xC46C  # HANGUL SYLLABLE SSANGSIOS-U-RIEUL
-0x3E29  0xC474  # HANGUL SYLLABLE SSANGSIOS-U-MIEUM
-0x3E2A  0xC475  # HANGUL SYLLABLE SSANGSIOS-U-PIEUP
-0x3E2B  0xC479  # HANGUL SYLLABLE SSANGSIOS-U-IEUNG
-0x3E2C  0xC480  # HANGUL SYLLABLE SSANGSIOS-WEO
-0x3E2D  0xC494  # HANGUL SYLLABLE SSANGSIOS-WEO-SSANGSIOS
-0x3E2E  0xC49C  # HANGUL SYLLABLE SSANGSIOS-WE
-0x3E2F  0xC4B8  # HANGUL SYLLABLE SSANGSIOS-WI
-0x3E30  0xC4BC  # HANGUL SYLLABLE SSANGSIOS-WI-NIEUN
-0x3E31  0xC4E9  # HANGUL SYLLABLE SSANGSIOS-YU-IEUNG
-0x3E32  0xC4F0  # HANGUL SYLLABLE SSANGSIOS-EU
-0x3E33  0xC4F1  # HANGUL SYLLABLE SSANGSIOS-EU-KIYEOK
-0x3E34  0xC4F4  # HANGUL SYLLABLE SSANGSIOS-EU-NIEUN
-0x3E35  0xC4F8  # HANGUL SYLLABLE SSANGSIOS-EU-RIEUL
-0x3E36  0xC4FA  # HANGUL SYLLABLE SSANGSIOS-EU-RIEULMIEUM
-0x3E37  0xC4FF  # HANGUL SYLLABLE SSANGSIOS-EU-RIEULHIEUH
-0x3E38  0xC500  # HANGUL SYLLABLE SSANGSIOS-EU-MIEUM
-0x3E39  0xC501  # HANGUL SYLLABLE SSANGSIOS-EU-PIEUP
-0x3E3A  0xC50C  # HANGUL SYLLABLE SSANGSIOS-YI
-0x3E3B  0xC510  # HANGUL SYLLABLE SSANGSIOS-YI-NIEUN
-0x3E3C  0xC514  # HANGUL SYLLABLE SSANGSIOS-YI-RIEUL
-0x3E3D  0xC51C  # HANGUL SYLLABLE SSANGSIOS-YI-MIEUM
-0x3E3E  0xC528  # HANGUL SYLLABLE SSANGSIOS-I
-0x3E3F  0xC529  # HANGUL SYLLABLE SSANGSIOS-I-KIYEOK
-0x3E40  0xC52C  # HANGUL SYLLABLE SSANGSIOS-I-NIEUN
-0x3E41  0xC530  # HANGUL SYLLABLE SSANGSIOS-I-RIEUL
-0x3E42  0xC538  # HANGUL SYLLABLE SSANGSIOS-I-MIEUM
-0x3E43  0xC539  # HANGUL SYLLABLE SSANGSIOS-I-PIEUP
-0x3E44  0xC53B  # HANGUL SYLLABLE SSANGSIOS-I-SIOS
-0x3E45  0xC53D  # HANGUL SYLLABLE SSANGSIOS-I-IEUNG
-0x3E46  0xC544  # HANGUL SYLLABLE IEUNG-A
-0x3E47  0xC545  # HANGUL SYLLABLE IEUNG-A-KIYEOK
-0x3E48  0xC548  # HANGUL SYLLABLE IEUNG-A-NIEUN
-0x3E49  0xC549  # HANGUL SYLLABLE IEUNG-A-NIEUNCIEUC
-0x3E4A  0xC54A  # HANGUL SYLLABLE IEUNG-A-NIEUNHIEUH
-0x3E4B  0xC54C  # HANGUL SYLLABLE IEUNG-A-RIEUL
-0x3E4C  0xC54D  # HANGUL SYLLABLE IEUNG-A-RIEULKIYEOK
-0x3E4D  0xC54E  # HANGUL SYLLABLE IEUNG-A-RIEULMIEUM
-0x3E4E  0xC553  # HANGUL SYLLABLE IEUNG-A-RIEULHIEUH
-0x3E4F  0xC554  # HANGUL SYLLABLE IEUNG-A-MIEUM
-0x3E50  0xC555  # HANGUL SYLLABLE IEUNG-A-PIEUP
-0x3E51  0xC557  # HANGUL SYLLABLE IEUNG-A-SIOS
-0x3E52  0xC558  # HANGUL SYLLABLE IEUNG-A-SSANGSIOS
-0x3E53  0xC559  # HANGUL SYLLABLE IEUNG-A-IEUNG
-0x3E54  0xC55D  # HANGUL SYLLABLE IEUNG-A-THIEUTH
-0x3E55  0xC55E  # HANGUL SYLLABLE IEUNG-A-PHIEUPH
-0x3E56  0xC560  # HANGUL SYLLABLE IEUNG-AE
-0x3E57  0xC561  # HANGUL SYLLABLE IEUNG-AE-KIYEOK
-0x3E58  0xC564  # HANGUL SYLLABLE IEUNG-AE-NIEUN
-0x3E59  0xC568  # HANGUL SYLLABLE IEUNG-AE-RIEUL
-0x3E5A  0xC570  # HANGUL SYLLABLE IEUNG-AE-MIEUM
-0x3E5B  0xC571  # HANGUL SYLLABLE IEUNG-AE-PIEUP
-0x3E5C  0xC573  # HANGUL SYLLABLE IEUNG-AE-SIOS
-0x3E5D  0xC574  # HANGUL SYLLABLE IEUNG-AE-SSANGSIOS
-0x3E5E  0xC575  # HANGUL SYLLABLE IEUNG-AE-IEUNG
-0x3E5F  0xC57C  # HANGUL SYLLABLE IEUNG-YA
-0x3E60  0xC57D  # HANGUL SYLLABLE IEUNG-YA-KIYEOK
-0x3E61  0xC580  # HANGUL SYLLABLE IEUNG-YA-NIEUN
-0x3E62  0xC584  # HANGUL SYLLABLE IEUNG-YA-RIEUL
-0x3E63  0xC587  # HANGUL SYLLABLE IEUNG-YA-RIEULPIEUP
-0x3E64  0xC58C  # HANGUL SYLLABLE IEUNG-YA-MIEUM
-0x3E65  0xC58D  # HANGUL SYLLABLE IEUNG-YA-PIEUP
-0x3E66  0xC58F  # HANGUL SYLLABLE IEUNG-YA-SIOS
-0x3E67  0xC591  # HANGUL SYLLABLE IEUNG-YA-IEUNG
-0x3E68  0xC595  # HANGUL SYLLABLE IEUNG-YA-THIEUTH
-0x3E69  0xC597  # HANGUL SYLLABLE IEUNG-YA-HIEUH
-0x3E6A  0xC598  # HANGUL SYLLABLE IEUNG-YAE
-0x3E6B  0xC59C  # HANGUL SYLLABLE IEUNG-YAE-NIEUN
-0x3E6C  0xC5A0  # HANGUL SYLLABLE IEUNG-YAE-RIEUL
-0x3E6D  0xC5A9  # HANGUL SYLLABLE IEUNG-YAE-PIEUP
-0x3E6E  0xC5B4  # HANGUL SYLLABLE IEUNG-EO
-0x3E6F  0xC5B5  # HANGUL SYLLABLE IEUNG-EO-KIYEOK
-0x3E70  0xC5B8  # HANGUL SYLLABLE IEUNG-EO-NIEUN
-0x3E71  0xC5B9  # HANGUL SYLLABLE IEUNG-EO-NIEUNCIEUC
-0x3E72  0xC5BB  # HANGUL SYLLABLE IEUNG-EO-TIKEUT
-0x3E73  0xC5BC  # HANGUL SYLLABLE IEUNG-EO-RIEUL
-0x3E74  0xC5BD  # HANGUL SYLLABLE IEUNG-EO-RIEULKIYEOK
-0x3E75  0xC5BE  # HANGUL SYLLABLE IEUNG-EO-RIEULMIEUM
-0x3E76  0xC5C4  # HANGUL SYLLABLE IEUNG-EO-MIEUM
-0x3E77  0xC5C5  # HANGUL SYLLABLE IEUNG-EO-PIEUP
-0x3E78  0xC5C6  # HANGUL SYLLABLE IEUNG-EO-PIEUPSIOS
-0x3E79  0xC5C7  # HANGUL SYLLABLE IEUNG-EO-SIOS
-0x3E7A  0xC5C8  # HANGUL SYLLABLE IEUNG-EO-SSANGSIOS
-0x3E7B  0xC5C9  # HANGUL SYLLABLE IEUNG-EO-IEUNG
-0x3E7C  0xC5CA  # HANGUL SYLLABLE IEUNG-EO-CIEUC
-0x3E7D  0xC5CC  # HANGUL SYLLABLE IEUNG-EO-KHIEUKH
-0x3E7E  0xC5CE  # HANGUL SYLLABLE IEUNG-EO-PHIEUPH
-0x3F21  0xC5D0  # HANGUL SYLLABLE IEUNG-E
-0x3F22  0xC5D1  # HANGUL SYLLABLE IEUNG-E-KIYEOK
-0x3F23  0xC5D4  # HANGUL SYLLABLE IEUNG-E-NIEUN
-0x3F24  0xC5D8  # HANGUL SYLLABLE IEUNG-E-RIEUL
-0x3F25  0xC5E0  # HANGUL SYLLABLE IEUNG-E-MIEUM
-0x3F26  0xC5E1  # HANGUL SYLLABLE IEUNG-E-PIEUP
-0x3F27  0xC5E3  # HANGUL SYLLABLE IEUNG-E-SIOS
-0x3F28  0xC5E5  # HANGUL SYLLABLE IEUNG-E-IEUNG
-0x3F29  0xC5EC  # HANGUL SYLLABLE IEUNG-YEO
-0x3F2A  0xC5ED  # HANGUL SYLLABLE IEUNG-YEO-KIYEOK
-0x3F2B  0xC5EE  # HANGUL SYLLABLE IEUNG-YEO-SSANGKIYEOK
-0x3F2C  0xC5F0  # HANGUL SYLLABLE IEUNG-YEO-NIEUN
-0x3F2D  0xC5F4  # HANGUL SYLLABLE IEUNG-YEO-RIEUL
-0x3F2E  0xC5F6  # HANGUL SYLLABLE IEUNG-YEO-RIEULMIEUM
-0x3F2F  0xC5F7  # HANGUL SYLLABLE IEUNG-YEO-RIEULPIEUP
-0x3F30  0xC5FC  # HANGUL SYLLABLE IEUNG-YEO-MIEUM
-0x3F31  0xC5FD  # HANGUL SYLLABLE IEUNG-YEO-PIEUP
-0x3F32  0xC5FE  # HANGUL SYLLABLE IEUNG-YEO-PIEUPSIOS
-0x3F33  0xC5FF  # HANGUL SYLLABLE IEUNG-YEO-SIOS
-0x3F34  0xC600  # HANGUL SYLLABLE IEUNG-YEO-SSANGSIOS
-0x3F35  0xC601  # HANGUL SYLLABLE IEUNG-YEO-IEUNG
-0x3F36  0xC605  # HANGUL SYLLABLE IEUNG-YEO-THIEUTH
-0x3F37  0xC606  # HANGUL SYLLABLE IEUNG-YEO-PHIEUPH
-0x3F38  0xC607  # HANGUL SYLLABLE IEUNG-YEO-HIEUH
-0x3F39  0xC608  # HANGUL SYLLABLE IEUNG-YE
-0x3F3A  0xC60C  # HANGUL SYLLABLE IEUNG-YE-NIEUN
-0x3F3B  0xC610  # HANGUL SYLLABLE IEUNG-YE-RIEUL
-0x3F3C  0xC618  # HANGUL SYLLABLE IEUNG-YE-MIEUM
-0x3F3D  0xC619  # HANGUL SYLLABLE IEUNG-YE-PIEUP
-0x3F3E  0xC61B  # HANGUL SYLLABLE IEUNG-YE-SIOS
-0x3F3F  0xC61C  # HANGUL SYLLABLE IEUNG-YE-SSANGSIOS
-0x3F40  0xC624  # HANGUL SYLLABLE IEUNG-O
-0x3F41  0xC625  # HANGUL SYLLABLE IEUNG-O-KIYEOK
-0x3F42  0xC628  # HANGUL SYLLABLE IEUNG-O-NIEUN
-0x3F43  0xC62C  # HANGUL SYLLABLE IEUNG-O-RIEUL
-0x3F44  0xC62D  # HANGUL SYLLABLE IEUNG-O-RIEULKIYEOK
-0x3F45  0xC62E  # HANGUL SYLLABLE IEUNG-O-RIEULMIEUM
-0x3F46  0xC630  # HANGUL SYLLABLE IEUNG-O-RIEULSIOS
-0x3F47  0xC633  # HANGUL SYLLABLE IEUNG-O-RIEULHIEUH
-0x3F48  0xC634  # HANGUL SYLLABLE IEUNG-O-MIEUM
-0x3F49  0xC635  # HANGUL SYLLABLE IEUNG-O-PIEUP
-0x3F4A  0xC637  # HANGUL SYLLABLE IEUNG-O-SIOS
-0x3F4B  0xC639  # HANGUL SYLLABLE IEUNG-O-IEUNG
-0x3F4C  0xC63B  # HANGUL SYLLABLE IEUNG-O-CHIEUCH
-0x3F4D  0xC640  # HANGUL SYLLABLE IEUNG-WA
-0x3F4E  0xC641  # HANGUL SYLLABLE IEUNG-WA-KIYEOK
-0x3F4F  0xC644  # HANGUL SYLLABLE IEUNG-WA-NIEUN
-0x3F50  0xC648  # HANGUL SYLLABLE IEUNG-WA-RIEUL
-0x3F51  0xC650  # HANGUL SYLLABLE IEUNG-WA-MIEUM
-0x3F52  0xC651  # HANGUL SYLLABLE IEUNG-WA-PIEUP
-0x3F53  0xC653  # HANGUL SYLLABLE IEUNG-WA-SIOS
-0x3F54  0xC654  # HANGUL SYLLABLE IEUNG-WA-SSANGSIOS
-0x3F55  0xC655  # HANGUL SYLLABLE IEUNG-WA-IEUNG
-0x3F56  0xC65C  # HANGUL SYLLABLE IEUNG-WAE
-0x3F57  0xC65D  # HANGUL SYLLABLE IEUNG-WAE-KIYEOK
-0x3F58  0xC660  # HANGUL SYLLABLE IEUNG-WAE-NIEUN
-0x3F59  0xC66C  # HANGUL SYLLABLE IEUNG-WAE-MIEUM
-0x3F5A  0xC66F  # HANGUL SYLLABLE IEUNG-WAE-SIOS
-0x3F5B  0xC671  # HANGUL SYLLABLE IEUNG-WAE-IEUNG
-0x3F5C  0xC678  # HANGUL SYLLABLE IEUNG-OE
-0x3F5D  0xC679  # HANGUL SYLLABLE IEUNG-OE-KIYEOK
-0x3F5E  0xC67C  # HANGUL SYLLABLE IEUNG-OE-NIEUN
-0x3F5F  0xC680  # HANGUL SYLLABLE IEUNG-OE-RIEUL
-0x3F60  0xC688  # HANGUL SYLLABLE IEUNG-OE-MIEUM
-0x3F61  0xC689  # HANGUL SYLLABLE IEUNG-OE-PIEUP
-0x3F62  0xC68B  # HANGUL SYLLABLE IEUNG-OE-SIOS
-0x3F63  0xC68D  # HANGUL SYLLABLE IEUNG-OE-IEUNG
-0x3F64  0xC694  # HANGUL SYLLABLE IEUNG-YO
-0x3F65  0xC695  # HANGUL SYLLABLE IEUNG-YO-KIYEOK
-0x3F66  0xC698  # HANGUL SYLLABLE IEUNG-YO-NIEUN
-0x3F67  0xC69C  # HANGUL SYLLABLE IEUNG-YO-RIEUL
-0x3F68  0xC6A4  # HANGUL SYLLABLE IEUNG-YO-MIEUM
-0x3F69  0xC6A5  # HANGUL SYLLABLE IEUNG-YO-PIEUP
-0x3F6A  0xC6A7  # HANGUL SYLLABLE IEUNG-YO-SIOS
-0x3F6B  0xC6A9  # HANGUL SYLLABLE IEUNG-YO-IEUNG
-0x3F6C  0xC6B0  # HANGUL SYLLABLE IEUNG-U
-0x3F6D  0xC6B1  # HANGUL SYLLABLE IEUNG-U-KIYEOK
-0x3F6E  0xC6B4  # HANGUL SYLLABLE IEUNG-U-NIEUN
-0x3F6F  0xC6B8  # HANGUL SYLLABLE IEUNG-U-RIEUL
-0x3F70  0xC6B9  # HANGUL SYLLABLE IEUNG-U-RIEULKIYEOK
-0x3F71  0xC6BA  # HANGUL SYLLABLE IEUNG-U-RIEULMIEUM
-0x3F72  0xC6C0  # HANGUL SYLLABLE IEUNG-U-MIEUM
-0x3F73  0xC6C1  # HANGUL SYLLABLE IEUNG-U-PIEUP
-0x3F74  0xC6C3  # HANGUL SYLLABLE IEUNG-U-SIOS
-0x3F75  0xC6C5  # HANGUL SYLLABLE IEUNG-U-IEUNG
-0x3F76  0xC6CC  # HANGUL SYLLABLE IEUNG-WEO
-0x3F77  0xC6CD  # HANGUL SYLLABLE IEUNG-WEO-KIYEOK
-0x3F78  0xC6D0  # HANGUL SYLLABLE IEUNG-WEO-NIEUN
-0x3F79  0xC6D4  # HANGUL SYLLABLE IEUNG-WEO-RIEUL
-0x3F7A  0xC6DC  # HANGUL SYLLABLE IEUNG-WEO-MIEUM
-0x3F7B  0xC6DD  # HANGUL SYLLABLE IEUNG-WEO-PIEUP
-0x3F7C  0xC6E0  # HANGUL SYLLABLE IEUNG-WEO-SSANGSIOS
-0x3F7D  0xC6E1  # HANGUL SYLLABLE IEUNG-WEO-IEUNG
-0x3F7E  0xC6E8  # HANGUL SYLLABLE IEUNG-WE
-0x4021  0xC6E9  # HANGUL SYLLABLE IEUNG-WE-KIYEOK
-0x4022  0xC6EC  # HANGUL SYLLABLE IEUNG-WE-NIEUN
-0x4023  0xC6F0  # HANGUL SYLLABLE IEUNG-WE-RIEUL
-0x4024  0xC6F8  # HANGUL SYLLABLE IEUNG-WE-MIEUM
-0x4025  0xC6F9  # HANGUL SYLLABLE IEUNG-WE-PIEUP
-0x4026  0xC6FD  # HANGUL SYLLABLE IEUNG-WE-IEUNG
-0x4027  0xC704  # HANGUL SYLLABLE IEUNG-WI
-0x4028  0xC705  # HANGUL SYLLABLE IEUNG-WI-KIYEOK
-0x4029  0xC708  # HANGUL SYLLABLE IEUNG-WI-NIEUN
-0x402A  0xC70C  # HANGUL SYLLABLE IEUNG-WI-RIEUL
-0x402B  0xC714  # HANGUL SYLLABLE IEUNG-WI-MIEUM
-0x402C  0xC715  # HANGUL SYLLABLE IEUNG-WI-PIEUP
-0x402D  0xC717  # HANGUL SYLLABLE IEUNG-WI-SIOS
-0x402E  0xC719  # HANGUL SYLLABLE IEUNG-WI-IEUNG
-0x402F  0xC720  # HANGUL SYLLABLE IEUNG-YU
-0x4030  0xC721  # HANGUL SYLLABLE IEUNG-YU-KIYEOK
-0x4031  0xC724  # HANGUL SYLLABLE IEUNG-YU-NIEUN
-0x4032  0xC728  # HANGUL SYLLABLE IEUNG-YU-RIEUL
-0x4033  0xC730  # HANGUL SYLLABLE IEUNG-YU-MIEUM
-0x4034  0xC731  # HANGUL SYLLABLE IEUNG-YU-PIEUP
-0x4035  0xC733  # HANGUL SYLLABLE IEUNG-YU-SIOS
-0x4036  0xC735  # HANGUL SYLLABLE IEUNG-YU-IEUNG
-0x4037  0xC737  # HANGUL SYLLABLE IEUNG-YU-CHIEUCH
-0x4038  0xC73C  # HANGUL SYLLABLE IEUNG-EU
-0x4039  0xC73D  # HANGUL SYLLABLE IEUNG-EU-KIYEOK
-0x403A  0xC740  # HANGUL SYLLABLE IEUNG-EU-NIEUN
-0x403B  0xC744  # HANGUL SYLLABLE IEUNG-EU-RIEUL
-0x403C  0xC74A  # HANGUL SYLLABLE IEUNG-EU-RIEULPHIEUPH
-0x403D  0xC74C  # HANGUL SYLLABLE IEUNG-EU-MIEUM
-0x403E  0xC74D  # HANGUL SYLLABLE IEUNG-EU-PIEUP
-0x403F  0xC74F  # HANGUL SYLLABLE IEUNG-EU-SIOS
-0x4040  0xC751  # HANGUL SYLLABLE IEUNG-EU-IEUNG
-0x4041  0xC752  # HANGUL SYLLABLE IEUNG-EU-CIEUC
-0x4042  0xC753  # HANGUL SYLLABLE IEUNG-EU-CHIEUCH
-0x4043  0xC754  # HANGUL SYLLABLE IEUNG-EU-KHIEUKH
-0x4044  0xC755  # HANGUL SYLLABLE IEUNG-EU-THIEUTH
-0x4045  0xC756  # HANGUL SYLLABLE IEUNG-EU-PHIEUPH
-0x4046  0xC757  # HANGUL SYLLABLE IEUNG-EU-HIEUH
-0x4047  0xC758  # HANGUL SYLLABLE IEUNG-YI
-0x4048  0xC75C  # HANGUL SYLLABLE IEUNG-YI-NIEUN
-0x4049  0xC760  # HANGUL SYLLABLE IEUNG-YI-RIEUL
-0x404A  0xC768  # HANGUL SYLLABLE IEUNG-YI-MIEUM
-0x404B  0xC76B  # HANGUL SYLLABLE IEUNG-YI-SIOS
-0x404C  0xC774  # HANGUL SYLLABLE IEUNG-I
-0x404D  0xC775  # HANGUL SYLLABLE IEUNG-I-KIYEOK
-0x404E  0xC778  # HANGUL SYLLABLE IEUNG-I-NIEUN
-0x404F  0xC77C  # HANGUL SYLLABLE IEUNG-I-RIEUL
-0x4050  0xC77D  # HANGUL SYLLABLE IEUNG-I-RIEULKIYEOK
-0x4051  0xC77E  # HANGUL SYLLABLE IEUNG-I-RIEULMIEUM
-0x4052  0xC783  # HANGUL SYLLABLE IEUNG-I-RIEULHIEUH
-0x4053  0xC784  # HANGUL SYLLABLE IEUNG-I-MIEUM
-0x4054  0xC785  # HANGUL SYLLABLE IEUNG-I-PIEUP
-0x4055  0xC787  # HANGUL SYLLABLE IEUNG-I-SIOS
-0x4056  0xC788  # HANGUL SYLLABLE IEUNG-I-SSANGSIOS
-0x4057  0xC789  # HANGUL SYLLABLE IEUNG-I-IEUNG
-0x4058  0xC78A  # HANGUL SYLLABLE IEUNG-I-CIEUC
-0x4059  0xC78E  # HANGUL SYLLABLE IEUNG-I-PHIEUPH
-0x405A  0xC790  # HANGUL SYLLABLE CIEUC-A
-0x405B  0xC791  # HANGUL SYLLABLE CIEUC-A-KIYEOK
-0x405C  0xC794  # HANGUL SYLLABLE CIEUC-A-NIEUN
-0x405D  0xC796  # HANGUL SYLLABLE CIEUC-A-NIEUNHIEUH
-0x405E  0xC797  # HANGUL SYLLABLE CIEUC-A-TIKEUT
-0x405F  0xC798  # HANGUL SYLLABLE CIEUC-A-RIEUL
-0x4060  0xC79A  # HANGUL SYLLABLE CIEUC-A-RIEULMIEUM
-0x4061  0xC7A0  # HANGUL SYLLABLE CIEUC-A-MIEUM
-0x4062  0xC7A1  # HANGUL SYLLABLE CIEUC-A-PIEUP
-0x4063  0xC7A3  # HANGUL SYLLABLE CIEUC-A-SIOS
-0x4064  0xC7A4  # HANGUL SYLLABLE CIEUC-A-SSANGSIOS
-0x4065  0xC7A5  # HANGUL SYLLABLE CIEUC-A-IEUNG
-0x4066  0xC7A6  # HANGUL SYLLABLE CIEUC-A-CIEUC
-0x4067  0xC7AC  # HANGUL SYLLABLE CIEUC-AE
-0x4068  0xC7AD  # HANGUL SYLLABLE CIEUC-AE-KIYEOK
-0x4069  0xC7B0  # HANGUL SYLLABLE CIEUC-AE-NIEUN
-0x406A  0xC7B4  # HANGUL SYLLABLE CIEUC-AE-RIEUL
-0x406B  0xC7BC  # HANGUL SYLLABLE CIEUC-AE-MIEUM
-0x406C  0xC7BD  # HANGUL SYLLABLE CIEUC-AE-PIEUP
-0x406D  0xC7BF  # HANGUL SYLLABLE CIEUC-AE-SIOS
-0x406E  0xC7C0  # HANGUL SYLLABLE CIEUC-AE-SSANGSIOS
-0x406F  0xC7C1  # HANGUL SYLLABLE CIEUC-AE-IEUNG
-0x4070  0xC7C8  # HANGUL SYLLABLE CIEUC-YA
-0x4071  0xC7C9  # HANGUL SYLLABLE CIEUC-YA-KIYEOK
-0x4072  0xC7CC  # HANGUL SYLLABLE CIEUC-YA-NIEUN
-0x4073  0xC7CE  # HANGUL SYLLABLE CIEUC-YA-NIEUNHIEUH
-0x4074  0xC7D0  # HANGUL SYLLABLE CIEUC-YA-RIEUL
-0x4075  0xC7D8  # HANGUL SYLLABLE CIEUC-YA-MIEUM
-0x4076  0xC7DD  # HANGUL SYLLABLE CIEUC-YA-IEUNG
-0x4077  0xC7E4  # HANGUL SYLLABLE CIEUC-YAE
-0x4078  0xC7E8  # HANGUL SYLLABLE CIEUC-YAE-NIEUN
-0x4079  0xC7EC  # HANGUL SYLLABLE CIEUC-YAE-RIEUL
-0x407A  0xC800  # HANGUL SYLLABLE CIEUC-EO
-0x407B  0xC801  # HANGUL SYLLABLE CIEUC-EO-KIYEOK
-0x407C  0xC804  # HANGUL SYLLABLE CIEUC-EO-NIEUN
-0x407D  0xC808  # HANGUL SYLLABLE CIEUC-EO-RIEUL
-0x407E  0xC80A  # HANGUL SYLLABLE CIEUC-EO-RIEULMIEUM
-0x4121  0xC810  # HANGUL SYLLABLE CIEUC-EO-MIEUM
-0x4122  0xC811  # HANGUL SYLLABLE CIEUC-EO-PIEUP
-0x4123  0xC813  # HANGUL SYLLABLE CIEUC-EO-SIOS
-0x4124  0xC815  # HANGUL SYLLABLE CIEUC-EO-IEUNG
-0x4125  0xC816  # HANGUL SYLLABLE CIEUC-EO-CIEUC
-0x4126  0xC81C  # HANGUL SYLLABLE CIEUC-E
-0x4127  0xC81D  # HANGUL SYLLABLE CIEUC-E-KIYEOK
-0x4128  0xC820  # HANGUL SYLLABLE CIEUC-E-NIEUN
-0x4129  0xC824  # HANGUL SYLLABLE CIEUC-E-RIEUL
-0x412A  0xC82C  # HANGUL SYLLABLE CIEUC-E-MIEUM
-0x412B  0xC82D  # HANGUL SYLLABLE CIEUC-E-PIEUP
-0x412C  0xC82F  # HANGUL SYLLABLE CIEUC-E-SIOS
-0x412D  0xC831  # HANGUL SYLLABLE CIEUC-E-IEUNG
-0x412E  0xC838  # HANGUL SYLLABLE CIEUC-YEO
-0x412F  0xC83C  # HANGUL SYLLABLE CIEUC-YEO-NIEUN
-0x4130  0xC840  # HANGUL SYLLABLE CIEUC-YEO-RIEUL
-0x4131  0xC848  # HANGUL SYLLABLE CIEUC-YEO-MIEUM
-0x4132  0xC849  # HANGUL SYLLABLE CIEUC-YEO-PIEUP
-0x4133  0xC84C  # HANGUL SYLLABLE CIEUC-YEO-SSANGSIOS
-0x4134  0xC84D  # HANGUL SYLLABLE CIEUC-YEO-IEUNG
-0x4135  0xC854  # HANGUL SYLLABLE CIEUC-YE
-0x4136  0xC870  # HANGUL SYLLABLE CIEUC-O
-0x4137  0xC871  # HANGUL SYLLABLE CIEUC-O-KIYEOK
-0x4138  0xC874  # HANGUL SYLLABLE CIEUC-O-NIEUN
-0x4139  0xC878  # HANGUL SYLLABLE CIEUC-O-RIEUL
-0x413A  0xC87A  # HANGUL SYLLABLE CIEUC-O-RIEULMIEUM
-0x413B  0xC880  # HANGUL SYLLABLE CIEUC-O-MIEUM
-0x413C  0xC881  # HANGUL SYLLABLE CIEUC-O-PIEUP
-0x413D  0xC883  # HANGUL SYLLABLE CIEUC-O-SIOS
-0x413E  0xC885  # HANGUL SYLLABLE CIEUC-O-IEUNG
-0x413F  0xC886  # HANGUL SYLLABLE CIEUC-O-CIEUC
-0x4140  0xC887  # HANGUL SYLLABLE CIEUC-O-CHIEUCH
-0x4141  0xC88B  # HANGUL SYLLABLE CIEUC-O-HIEUH
-0x4142  0xC88C  # HANGUL SYLLABLE CIEUC-WA
-0x4143  0xC88D  # HANGUL SYLLABLE CIEUC-WA-KIYEOK
-0x4144  0xC894  # HANGUL SYLLABLE CIEUC-WA-RIEUL
-0x4145  0xC89D  # HANGUL SYLLABLE CIEUC-WA-PIEUP
-0x4146  0xC89F  # HANGUL SYLLABLE CIEUC-WA-SIOS
-0x4147  0xC8A1  # HANGUL SYLLABLE CIEUC-WA-IEUNG
-0x4148  0xC8A8  # HANGUL SYLLABLE CIEUC-WAE
-0x4149  0xC8BC  # HANGUL SYLLABLE CIEUC-WAE-SSANGSIOS
-0x414A  0xC8BD  # HANGUL SYLLABLE CIEUC-WAE-IEUNG
-0x414B  0xC8C4  # HANGUL SYLLABLE CIEUC-OE
-0x414C  0xC8C8  # HANGUL SYLLABLE CIEUC-OE-NIEUN
-0x414D  0xC8CC  # HANGUL SYLLABLE CIEUC-OE-RIEUL
-0x414E  0xC8D4  # HANGUL SYLLABLE CIEUC-OE-MIEUM
-0x414F  0xC8D5  # HANGUL SYLLABLE CIEUC-OE-PIEUP
-0x4150  0xC8D7  # HANGUL SYLLABLE CIEUC-OE-SIOS
-0x4151  0xC8D9  # HANGUL SYLLABLE CIEUC-OE-IEUNG
-0x4152  0xC8E0  # HANGUL SYLLABLE CIEUC-YO
-0x4153  0xC8E1  # HANGUL SYLLABLE CIEUC-YO-KIYEOK
-0x4154  0xC8E4  # HANGUL SYLLABLE CIEUC-YO-NIEUN
-0x4155  0xC8F5  # HANGUL SYLLABLE CIEUC-YO-IEUNG
-0x4156  0xC8FC  # HANGUL SYLLABLE CIEUC-U
-0x4157  0xC8FD  # HANGUL SYLLABLE CIEUC-U-KIYEOK
-0x4158  0xC900  # HANGUL SYLLABLE CIEUC-U-NIEUN
-0x4159  0xC904  # HANGUL SYLLABLE CIEUC-U-RIEUL
-0x415A  0xC905  # HANGUL SYLLABLE CIEUC-U-RIEULKIYEOK
-0x415B  0xC906  # HANGUL SYLLABLE CIEUC-U-RIEULMIEUM
-0x415C  0xC90C  # HANGUL SYLLABLE CIEUC-U-MIEUM
-0x415D  0xC90D  # HANGUL SYLLABLE CIEUC-U-PIEUP
-0x415E  0xC90F  # HANGUL SYLLABLE CIEUC-U-SIOS
-0x415F  0xC911  # HANGUL SYLLABLE CIEUC-U-IEUNG
-0x4160  0xC918  # HANGUL SYLLABLE CIEUC-WEO
-0x4161  0xC92C  # HANGUL SYLLABLE CIEUC-WEO-SSANGSIOS
-0x4162  0xC934  # HANGUL SYLLABLE CIEUC-WE
-0x4163  0xC950  # HANGUL SYLLABLE CIEUC-WI
-0x4164  0xC951  # HANGUL SYLLABLE CIEUC-WI-KIYEOK
-0x4165  0xC954  # HANGUL SYLLABLE CIEUC-WI-NIEUN
-0x4166  0xC958  # HANGUL SYLLABLE CIEUC-WI-RIEUL
-0x4167  0xC960  # HANGUL SYLLABLE CIEUC-WI-MIEUM
-0x4168  0xC961  # HANGUL SYLLABLE CIEUC-WI-PIEUP
-0x4169  0xC963  # HANGUL SYLLABLE CIEUC-WI-SIOS
-0x416A  0xC96C  # HANGUL SYLLABLE CIEUC-YU
-0x416B  0xC970  # HANGUL SYLLABLE CIEUC-YU-NIEUN
-0x416C  0xC974  # HANGUL SYLLABLE CIEUC-YU-RIEUL
-0x416D  0xC97C  # HANGUL SYLLABLE CIEUC-YU-MIEUM
-0x416E  0xC988  # HANGUL SYLLABLE CIEUC-EU
-0x416F  0xC989  # HANGUL SYLLABLE CIEUC-EU-KIYEOK
-0x4170  0xC98C  # HANGUL SYLLABLE CIEUC-EU-NIEUN
-0x4171  0xC990  # HANGUL SYLLABLE CIEUC-EU-RIEUL
-0x4172  0xC998  # HANGUL SYLLABLE CIEUC-EU-MIEUM
-0x4173  0xC999  # HANGUL SYLLABLE CIEUC-EU-PIEUP
-0x4174  0xC99B  # HANGUL SYLLABLE CIEUC-EU-SIOS
-0x4175  0xC99D  # HANGUL SYLLABLE CIEUC-EU-IEUNG
-0x4176  0xC9C0  # HANGUL SYLLABLE CIEUC-I
-0x4177  0xC9C1  # HANGUL SYLLABLE CIEUC-I-KIYEOK
-0x4178  0xC9C4  # HANGUL SYLLABLE CIEUC-I-NIEUN
-0x4179  0xC9C7  # HANGUL SYLLABLE CIEUC-I-TIKEUT
-0x417A  0xC9C8  # HANGUL SYLLABLE CIEUC-I-RIEUL
-0x417B  0xC9CA  # HANGUL SYLLABLE CIEUC-I-RIEULMIEUM
-0x417C  0xC9D0  # HANGUL SYLLABLE CIEUC-I-MIEUM
-0x417D  0xC9D1  # HANGUL SYLLABLE CIEUC-I-PIEUP
-0x417E  0xC9D3  # HANGUL SYLLABLE CIEUC-I-SIOS
-0x4221  0xC9D5  # HANGUL SYLLABLE CIEUC-I-IEUNG
-0x4222  0xC9D6  # HANGUL SYLLABLE CIEUC-I-CIEUC
-0x4223  0xC9D9  # HANGUL SYLLABLE CIEUC-I-THIEUTH
-0x4224  0xC9DA  # HANGUL SYLLABLE CIEUC-I-PHIEUPH
-0x4225  0xC9DC  # HANGUL SYLLABLE SSANGCIEUC-A
-0x4226  0xC9DD  # HANGUL SYLLABLE SSANGCIEUC-A-KIYEOK
-0x4227  0xC9E0  # HANGUL SYLLABLE SSANGCIEUC-A-NIEUN
-0x4228  0xC9E2  # HANGUL SYLLABLE SSANGCIEUC-A-NIEUNHIEUH
-0x4229  0xC9E4  # HANGUL SYLLABLE SSANGCIEUC-A-RIEUL
-0x422A  0xC9E7  # HANGUL SYLLABLE SSANGCIEUC-A-RIEULPIEUP
-0x422B  0xC9EC  # HANGUL SYLLABLE SSANGCIEUC-A-MIEUM
-0x422C  0xC9ED  # HANGUL SYLLABLE SSANGCIEUC-A-PIEUP
-0x422D  0xC9EF  # HANGUL SYLLABLE SSANGCIEUC-A-SIOS
-0x422E  0xC9F0  # HANGUL SYLLABLE SSANGCIEUC-A-SSANGSIOS
-0x422F  0xC9F1  # HANGUL SYLLABLE SSANGCIEUC-A-IEUNG
-0x4230  0xC9F8  # HANGUL SYLLABLE SSANGCIEUC-AE
-0x4231  0xC9F9  # HANGUL SYLLABLE SSANGCIEUC-AE-KIYEOK
-0x4232  0xC9FC  # HANGUL SYLLABLE SSANGCIEUC-AE-NIEUN
-0x4233  0xCA00  # HANGUL SYLLABLE SSANGCIEUC-AE-RIEUL
-0x4234  0xCA08  # HANGUL SYLLABLE SSANGCIEUC-AE-MIEUM
-0x4235  0xCA09  # HANGUL SYLLABLE SSANGCIEUC-AE-PIEUP
-0x4236  0xCA0B  # HANGUL SYLLABLE SSANGCIEUC-AE-SIOS
-0x4237  0xCA0C  # HANGUL SYLLABLE SSANGCIEUC-AE-SSANGSIOS
-0x4238  0xCA0D  # HANGUL SYLLABLE SSANGCIEUC-AE-IEUNG
-0x4239  0xCA14  # HANGUL SYLLABLE SSANGCIEUC-YA
-0x423A  0xCA18  # HANGUL SYLLABLE SSANGCIEUC-YA-NIEUN
-0x423B  0xCA29  # HANGUL SYLLABLE SSANGCIEUC-YA-IEUNG
-0x423C  0xCA4C  # HANGUL SYLLABLE SSANGCIEUC-EO
-0x423D  0xCA4D  # HANGUL SYLLABLE SSANGCIEUC-EO-KIYEOK
-0x423E  0xCA50  # HANGUL SYLLABLE SSANGCIEUC-EO-NIEUN
-0x423F  0xCA54  # HANGUL SYLLABLE SSANGCIEUC-EO-RIEUL
-0x4240  0xCA5C  # HANGUL SYLLABLE SSANGCIEUC-EO-MIEUM
-0x4241  0xCA5D  # HANGUL SYLLABLE SSANGCIEUC-EO-PIEUP
-0x4242  0xCA5F  # HANGUL SYLLABLE SSANGCIEUC-EO-SIOS
-0x4243  0xCA60  # HANGUL SYLLABLE SSANGCIEUC-EO-SSANGSIOS
-0x4244  0xCA61  # HANGUL SYLLABLE SSANGCIEUC-EO-IEUNG
-0x4245  0xCA68  # HANGUL SYLLABLE SSANGCIEUC-E
-0x4246  0xCA7D  # HANGUL SYLLABLE SSANGCIEUC-E-IEUNG
-0x4247  0xCA84  # HANGUL SYLLABLE SSANGCIEUC-YEO
-0x4248  0xCA98  # HANGUL SYLLABLE SSANGCIEUC-YEO-SSANGSIOS
-0x4249  0xCABC  # HANGUL SYLLABLE SSANGCIEUC-O
-0x424A  0xCABD  # HANGUL SYLLABLE SSANGCIEUC-O-KIYEOK
-0x424B  0xCAC0  # HANGUL SYLLABLE SSANGCIEUC-O-NIEUN
-0x424C  0xCAC4  # HANGUL SYLLABLE SSANGCIEUC-O-RIEUL
-0x424D  0xCACC  # HANGUL SYLLABLE SSANGCIEUC-O-MIEUM
-0x424E  0xCACD  # HANGUL SYLLABLE SSANGCIEUC-O-PIEUP
-0x424F  0xCACF  # HANGUL SYLLABLE SSANGCIEUC-O-SIOS
-0x4250  0xCAD1  # HANGUL SYLLABLE SSANGCIEUC-O-IEUNG
-0x4251  0xCAD3  # HANGUL SYLLABLE SSANGCIEUC-O-CHIEUCH
-0x4252  0xCAD8  # HANGUL SYLLABLE SSANGCIEUC-WA
-0x4253  0xCAD9  # HANGUL SYLLABLE SSANGCIEUC-WA-KIYEOK
-0x4254  0xCAE0  # HANGUL SYLLABLE SSANGCIEUC-WA-RIEUL
-0x4255  0xCAEC  # HANGUL SYLLABLE SSANGCIEUC-WA-SSANGSIOS
-0x4256  0xCAF4  # HANGUL SYLLABLE SSANGCIEUC-WAE
-0x4257  0xCB08  # HANGUL SYLLABLE SSANGCIEUC-WAE-SSANGSIOS
-0x4258  0xCB10  # HANGUL SYLLABLE SSANGCIEUC-OE
-0x4259  0xCB14  # HANGUL SYLLABLE SSANGCIEUC-OE-NIEUN
-0x425A  0xCB18  # HANGUL SYLLABLE SSANGCIEUC-OE-RIEUL
-0x425B  0xCB20  # HANGUL SYLLABLE SSANGCIEUC-OE-MIEUM
-0x425C  0xCB21  # HANGUL SYLLABLE SSANGCIEUC-OE-PIEUP
-0x425D  0xCB41  # HANGUL SYLLABLE SSANGCIEUC-YO-IEUNG
-0x425E  0xCB48  # HANGUL SYLLABLE SSANGCIEUC-U
-0x425F  0xCB49  # HANGUL SYLLABLE SSANGCIEUC-U-KIYEOK
-0x4260  0xCB4C  # HANGUL SYLLABLE SSANGCIEUC-U-NIEUN
-0x4261  0xCB50  # HANGUL SYLLABLE SSANGCIEUC-U-RIEUL
-0x4262  0xCB58  # HANGUL SYLLABLE SSANGCIEUC-U-MIEUM
-0x4263  0xCB59  # HANGUL SYLLABLE SSANGCIEUC-U-PIEUP
-0x4264  0xCB5D  # HANGUL SYLLABLE SSANGCIEUC-U-IEUNG
-0x4265  0xCB64  # HANGUL SYLLABLE SSANGCIEUC-WEO
-0x4266  0xCB78  # HANGUL SYLLABLE SSANGCIEUC-WEO-SSANGSIOS
-0x4267  0xCB79  # HANGUL SYLLABLE SSANGCIEUC-WEO-IEUNG
-0x4268  0xCB9C  # HANGUL SYLLABLE SSANGCIEUC-WI
-0x4269  0xCBB8  # HANGUL SYLLABLE SSANGCIEUC-YU
-0x426A  0xCBD4  # HANGUL SYLLABLE SSANGCIEUC-EU
-0x426B  0xCBE4  # HANGUL SYLLABLE SSANGCIEUC-EU-MIEUM
-0x426C  0xCBE7  # HANGUL SYLLABLE SSANGCIEUC-EU-SIOS
-0x426D  0xCBE9  # HANGUL SYLLABLE SSANGCIEUC-EU-IEUNG
-0x426E  0xCC0C  # HANGUL SYLLABLE SSANGCIEUC-I
-0x426F  0xCC0D  # HANGUL SYLLABLE SSANGCIEUC-I-KIYEOK
-0x4270  0xCC10  # HANGUL SYLLABLE SSANGCIEUC-I-NIEUN
-0x4271  0xCC14  # HANGUL SYLLABLE SSANGCIEUC-I-RIEUL
-0x4272  0xCC1C  # HANGUL SYLLABLE SSANGCIEUC-I-MIEUM
-0x4273  0xCC1D  # HANGUL SYLLABLE SSANGCIEUC-I-PIEUP
-0x4274  0xCC21  # HANGUL SYLLABLE SSANGCIEUC-I-IEUNG
-0x4275  0xCC22  # HANGUL SYLLABLE SSANGCIEUC-I-CIEUC
-0x4276  0xCC27  # HANGUL SYLLABLE SSANGCIEUC-I-HIEUH
-0x4277  0xCC28  # HANGUL SYLLABLE CHIEUCH-A
-0x4278  0xCC29  # HANGUL SYLLABLE CHIEUCH-A-KIYEOK
-0x4279  0xCC2C  # HANGUL SYLLABLE CHIEUCH-A-NIEUN
-0x427A  0xCC2E  # HANGUL SYLLABLE CHIEUCH-A-NIEUNHIEUH
-0x427B  0xCC30  # HANGUL SYLLABLE CHIEUCH-A-RIEUL
-0x427C  0xCC38  # HANGUL SYLLABLE CHIEUCH-A-MIEUM
-0x427D  0xCC39  # HANGUL SYLLABLE CHIEUCH-A-PIEUP
-0x427E  0xCC3B  # HANGUL SYLLABLE CHIEUCH-A-SIOS
-0x4321  0xCC3C  # HANGUL SYLLABLE CHIEUCH-A-SSANGSIOS
-0x4322  0xCC3D  # HANGUL SYLLABLE CHIEUCH-A-IEUNG
-0x4323  0xCC3E  # HANGUL SYLLABLE CHIEUCH-A-CIEUC
-0x4324  0xCC44  # HANGUL SYLLABLE CHIEUCH-AE
-0x4325  0xCC45  # HANGUL SYLLABLE CHIEUCH-AE-KIYEOK
-0x4326  0xCC48  # HANGUL SYLLABLE CHIEUCH-AE-NIEUN
-0x4327  0xCC4C  # HANGUL SYLLABLE CHIEUCH-AE-RIEUL
-0x4328  0xCC54  # HANGUL SYLLABLE CHIEUCH-AE-MIEUM
-0x4329  0xCC55  # HANGUL SYLLABLE CHIEUCH-AE-PIEUP
-0x432A  0xCC57  # HANGUL SYLLABLE CHIEUCH-AE-SIOS
-0x432B  0xCC58  # HANGUL SYLLABLE CHIEUCH-AE-SSANGSIOS
-0x432C  0xCC59  # HANGUL SYLLABLE CHIEUCH-AE-IEUNG
-0x432D  0xCC60  # HANGUL SYLLABLE CHIEUCH-YA
-0x432E  0xCC64  # HANGUL SYLLABLE CHIEUCH-YA-NIEUN
-0x432F  0xCC66  # HANGUL SYLLABLE CHIEUCH-YA-NIEUNHIEUH
-0x4330  0xCC68  # HANGUL SYLLABLE CHIEUCH-YA-RIEUL
-0x4331  0xCC70  # HANGUL SYLLABLE CHIEUCH-YA-MIEUM
-0x4332  0xCC75  # HANGUL SYLLABLE CHIEUCH-YA-IEUNG
-0x4333  0xCC98  # HANGUL SYLLABLE CHIEUCH-EO
-0x4334  0xCC99  # HANGUL SYLLABLE CHIEUCH-EO-KIYEOK
-0x4335  0xCC9C  # HANGUL SYLLABLE CHIEUCH-EO-NIEUN
-0x4336  0xCCA0  # HANGUL SYLLABLE CHIEUCH-EO-RIEUL
-0x4337  0xCCA8  # HANGUL SYLLABLE CHIEUCH-EO-MIEUM
-0x4338  0xCCA9  # HANGUL SYLLABLE CHIEUCH-EO-PIEUP
-0x4339  0xCCAB  # HANGUL SYLLABLE CHIEUCH-EO-SIOS
-0x433A  0xCCAC  # HANGUL SYLLABLE CHIEUCH-EO-SSANGSIOS
-0x433B  0xCCAD  # HANGUL SYLLABLE CHIEUCH-EO-IEUNG
-0x433C  0xCCB4  # HANGUL SYLLABLE CHIEUCH-E
-0x433D  0xCCB5  # HANGUL SYLLABLE CHIEUCH-E-KIYEOK
-0x433E  0xCCB8  # HANGUL SYLLABLE CHIEUCH-E-NIEUN
-0x433F  0xCCBC  # HANGUL SYLLABLE CHIEUCH-E-RIEUL
-0x4340  0xCCC4  # HANGUL SYLLABLE CHIEUCH-E-MIEUM
-0x4341  0xCCC5  # HANGUL SYLLABLE CHIEUCH-E-PIEUP
-0x4342  0xCCC7  # HANGUL SYLLABLE CHIEUCH-E-SIOS
-0x4343  0xCCC9  # HANGUL SYLLABLE CHIEUCH-E-IEUNG
-0x4344  0xCCD0  # HANGUL SYLLABLE CHIEUCH-YEO
-0x4345  0xCCD4  # HANGUL SYLLABLE CHIEUCH-YEO-NIEUN
-0x4346  0xCCE4  # HANGUL SYLLABLE CHIEUCH-YEO-SSANGSIOS
-0x4347  0xCCEC  # HANGUL SYLLABLE CHIEUCH-YE
-0x4348  0xCCF0  # HANGUL SYLLABLE CHIEUCH-YE-NIEUN
-0x4349  0xCD01  # HANGUL SYLLABLE CHIEUCH-YE-IEUNG
-0x434A  0xCD08  # HANGUL SYLLABLE CHIEUCH-O
-0x434B  0xCD09  # HANGUL SYLLABLE CHIEUCH-O-KIYEOK
-0x434C  0xCD0C  # HANGUL SYLLABLE CHIEUCH-O-NIEUN
-0x434D  0xCD10  # HANGUL SYLLABLE CHIEUCH-O-RIEUL
-0x434E  0xCD18  # HANGUL SYLLABLE CHIEUCH-O-MIEUM
-0x434F  0xCD19  # HANGUL SYLLABLE CHIEUCH-O-PIEUP
-0x4350  0xCD1B  # HANGUL SYLLABLE CHIEUCH-O-SIOS
-0x4351  0xCD1D  # HANGUL SYLLABLE CHIEUCH-O-IEUNG
-0x4352  0xCD24  # HANGUL SYLLABLE CHIEUCH-WA
-0x4353  0xCD28  # HANGUL SYLLABLE CHIEUCH-WA-NIEUN
-0x4354  0xCD2C  # HANGUL SYLLABLE CHIEUCH-WA-RIEUL
-0x4355  0xCD39  # HANGUL SYLLABLE CHIEUCH-WA-IEUNG
-0x4356  0xCD5C  # HANGUL SYLLABLE CHIEUCH-OE
-0x4357  0xCD60  # HANGUL SYLLABLE CHIEUCH-OE-NIEUN
-0x4358  0xCD64  # HANGUL SYLLABLE CHIEUCH-OE-RIEUL
-0x4359  0xCD6C  # HANGUL SYLLABLE CHIEUCH-OE-MIEUM
-0x435A  0xCD6D  # HANGUL SYLLABLE CHIEUCH-OE-PIEUP
-0x435B  0xCD6F  # HANGUL SYLLABLE CHIEUCH-OE-SIOS
-0x435C  0xCD71  # HANGUL SYLLABLE CHIEUCH-OE-IEUNG
-0x435D  0xCD78  # HANGUL SYLLABLE CHIEUCH-YO
-0x435E  0xCD88  # HANGUL SYLLABLE CHIEUCH-YO-MIEUM
-0x435F  0xCD94  # HANGUL SYLLABLE CHIEUCH-U
-0x4360  0xCD95  # HANGUL SYLLABLE CHIEUCH-U-KIYEOK
-0x4361  0xCD98  # HANGUL SYLLABLE CHIEUCH-U-NIEUN
-0x4362  0xCD9C  # HANGUL SYLLABLE CHIEUCH-U-RIEUL
-0x4363  0xCDA4  # HANGUL SYLLABLE CHIEUCH-U-MIEUM
-0x4364  0xCDA5  # HANGUL SYLLABLE CHIEUCH-U-PIEUP
-0x4365  0xCDA7  # HANGUL SYLLABLE CHIEUCH-U-SIOS
-0x4366  0xCDA9  # HANGUL SYLLABLE CHIEUCH-U-IEUNG
-0x4367  0xCDB0  # HANGUL SYLLABLE CHIEUCH-WEO
-0x4368  0xCDC4  # HANGUL SYLLABLE CHIEUCH-WEO-SSANGSIOS
-0x4369  0xCDCC  # HANGUL SYLLABLE CHIEUCH-WE
-0x436A  0xCDD0  # HANGUL SYLLABLE CHIEUCH-WE-NIEUN
-0x436B  0xCDE8  # HANGUL SYLLABLE CHIEUCH-WI
-0x436C  0xCDEC  # HANGUL SYLLABLE CHIEUCH-WI-NIEUN
-0x436D  0xCDF0  # HANGUL SYLLABLE CHIEUCH-WI-RIEUL
-0x436E  0xCDF8  # HANGUL SYLLABLE CHIEUCH-WI-MIEUM
-0x436F  0xCDF9  # HANGUL SYLLABLE CHIEUCH-WI-PIEUP
-0x4370  0xCDFB  # HANGUL SYLLABLE CHIEUCH-WI-SIOS
-0x4371  0xCDFD  # HANGUL SYLLABLE CHIEUCH-WI-IEUNG
-0x4372  0xCE04  # HANGUL SYLLABLE CHIEUCH-YU
-0x4373  0xCE08  # HANGUL SYLLABLE CHIEUCH-YU-NIEUN
-0x4374  0xCE0C  # HANGUL SYLLABLE CHIEUCH-YU-RIEUL
-0x4375  0xCE14  # HANGUL SYLLABLE CHIEUCH-YU-MIEUM
-0x4376  0xCE19  # HANGUL SYLLABLE CHIEUCH-YU-IEUNG
-0x4377  0xCE20  # HANGUL SYLLABLE CHIEUCH-EU
-0x4378  0xCE21  # HANGUL SYLLABLE CHIEUCH-EU-KIYEOK
-0x4379  0xCE24  # HANGUL SYLLABLE CHIEUCH-EU-NIEUN
-0x437A  0xCE28  # HANGUL SYLLABLE CHIEUCH-EU-RIEUL
-0x437B  0xCE30  # HANGUL SYLLABLE CHIEUCH-EU-MIEUM
-0x437C  0xCE31  # HANGUL SYLLABLE CHIEUCH-EU-PIEUP
-0x437D  0xCE33  # HANGUL SYLLABLE CHIEUCH-EU-SIOS
-0x437E  0xCE35  # HANGUL SYLLABLE CHIEUCH-EU-IEUNG
-0x4421  0xCE58  # HANGUL SYLLABLE CHIEUCH-I
-0x4422  0xCE59  # HANGUL SYLLABLE CHIEUCH-I-KIYEOK
-0x4423  0xCE5C  # HANGUL SYLLABLE CHIEUCH-I-NIEUN
-0x4424  0xCE5F  # HANGUL SYLLABLE CHIEUCH-I-TIKEUT
-0x4425  0xCE60  # HANGUL SYLLABLE CHIEUCH-I-RIEUL
-0x4426  0xCE61  # HANGUL SYLLABLE CHIEUCH-I-RIEULKIYEOK
-0x4427  0xCE68  # HANGUL SYLLABLE CHIEUCH-I-MIEUM
-0x4428  0xCE69  # HANGUL SYLLABLE CHIEUCH-I-PIEUP
-0x4429  0xCE6B  # HANGUL SYLLABLE CHIEUCH-I-SIOS
-0x442A  0xCE6D  # HANGUL SYLLABLE CHIEUCH-I-IEUNG
-0x442B  0xCE74  # HANGUL SYLLABLE KHIEUKH-A
-0x442C  0xCE75  # HANGUL SYLLABLE KHIEUKH-A-KIYEOK
-0x442D  0xCE78  # HANGUL SYLLABLE KHIEUKH-A-NIEUN
-0x442E  0xCE7C  # HANGUL SYLLABLE KHIEUKH-A-RIEUL
-0x442F  0xCE84  # HANGUL SYLLABLE KHIEUKH-A-MIEUM
-0x4430  0xCE85  # HANGUL SYLLABLE KHIEUKH-A-PIEUP
-0x4431  0xCE87  # HANGUL SYLLABLE KHIEUKH-A-SIOS
-0x4432  0xCE89  # HANGUL SYLLABLE KHIEUKH-A-IEUNG
-0x4433  0xCE90  # HANGUL SYLLABLE KHIEUKH-AE
-0x4434  0xCE91  # HANGUL SYLLABLE KHIEUKH-AE-KIYEOK
-0x4435  0xCE94  # HANGUL SYLLABLE KHIEUKH-AE-NIEUN
-0x4436  0xCE98  # HANGUL SYLLABLE KHIEUKH-AE-RIEUL
-0x4437  0xCEA0  # HANGUL SYLLABLE KHIEUKH-AE-MIEUM
-0x4438  0xCEA1  # HANGUL SYLLABLE KHIEUKH-AE-PIEUP
-0x4439  0xCEA3  # HANGUL SYLLABLE KHIEUKH-AE-SIOS
-0x443A  0xCEA4  # HANGUL SYLLABLE KHIEUKH-AE-SSANGSIOS
-0x443B  0xCEA5  # HANGUL SYLLABLE KHIEUKH-AE-IEUNG
-0x443C  0xCEAC  # HANGUL SYLLABLE KHIEUKH-YA
-0x443D  0xCEAD  # HANGUL SYLLABLE KHIEUKH-YA-KIYEOK
-0x443E  0xCEC1  # HANGUL SYLLABLE KHIEUKH-YA-IEUNG
-0x443F  0xCEE4  # HANGUL SYLLABLE KHIEUKH-EO
-0x4440  0xCEE5  # HANGUL SYLLABLE KHIEUKH-EO-KIYEOK
-0x4441  0xCEE8  # HANGUL SYLLABLE KHIEUKH-EO-NIEUN
-0x4442  0xCEEB  # HANGUL SYLLABLE KHIEUKH-EO-TIKEUT
-0x4443  0xCEEC  # HANGUL SYLLABLE KHIEUKH-EO-RIEUL
-0x4444  0xCEF4  # HANGUL SYLLABLE KHIEUKH-EO-MIEUM
-0x4445  0xCEF5  # HANGUL SYLLABLE KHIEUKH-EO-PIEUP
-0x4446  0xCEF7  # HANGUL SYLLABLE KHIEUKH-EO-SIOS
-0x4447  0xCEF8  # HANGUL SYLLABLE KHIEUKH-EO-SSANGSIOS
-0x4448  0xCEF9  # HANGUL SYLLABLE KHIEUKH-EO-IEUNG
-0x4449  0xCF00  # HANGUL SYLLABLE KHIEUKH-E
-0x444A  0xCF01  # HANGUL SYLLABLE KHIEUKH-E-KIYEOK
-0x444B  0xCF04  # HANGUL SYLLABLE KHIEUKH-E-NIEUN
-0x444C  0xCF08  # HANGUL SYLLABLE KHIEUKH-E-RIEUL
-0x444D  0xCF10  # HANGUL SYLLABLE KHIEUKH-E-MIEUM
-0x444E  0xCF11  # HANGUL SYLLABLE KHIEUKH-E-PIEUP
-0x444F  0xCF13  # HANGUL SYLLABLE KHIEUKH-E-SIOS
-0x4450  0xCF15  # HANGUL SYLLABLE KHIEUKH-E-IEUNG
-0x4451  0xCF1C  # HANGUL SYLLABLE KHIEUKH-YEO
-0x4452  0xCF20  # HANGUL SYLLABLE KHIEUKH-YEO-NIEUN
-0x4453  0xCF24  # HANGUL SYLLABLE KHIEUKH-YEO-RIEUL
-0x4454  0xCF2C  # HANGUL SYLLABLE KHIEUKH-YEO-MIEUM
-0x4455  0xCF2D  # HANGUL SYLLABLE KHIEUKH-YEO-PIEUP
-0x4456  0xCF2F  # HANGUL SYLLABLE KHIEUKH-YEO-SIOS
-0x4457  0xCF30  # HANGUL SYLLABLE KHIEUKH-YEO-SSANGSIOS
-0x4458  0xCF31  # HANGUL SYLLABLE KHIEUKH-YEO-IEUNG
-0x4459  0xCF38  # HANGUL SYLLABLE KHIEUKH-YE
-0x445A  0xCF54  # HANGUL SYLLABLE KHIEUKH-O
-0x445B  0xCF55  # HANGUL SYLLABLE KHIEUKH-O-KIYEOK
-0x445C  0xCF58  # HANGUL SYLLABLE KHIEUKH-O-NIEUN
-0x445D  0xCF5C  # HANGUL SYLLABLE KHIEUKH-O-RIEUL
-0x445E  0xCF64  # HANGUL SYLLABLE KHIEUKH-O-MIEUM
-0x445F  0xCF65  # HANGUL SYLLABLE KHIEUKH-O-PIEUP
-0x4460  0xCF67  # HANGUL SYLLABLE KHIEUKH-O-SIOS
-0x4461  0xCF69  # HANGUL SYLLABLE KHIEUKH-O-IEUNG
-0x4462  0xCF70  # HANGUL SYLLABLE KHIEUKH-WA
-0x4463  0xCF71  # HANGUL SYLLABLE KHIEUKH-WA-KIYEOK
-0x4464  0xCF74  # HANGUL SYLLABLE KHIEUKH-WA-NIEUN
-0x4465  0xCF78  # HANGUL SYLLABLE KHIEUKH-WA-RIEUL
-0x4466  0xCF80  # HANGUL SYLLABLE KHIEUKH-WA-MIEUM
-0x4467  0xCF85  # HANGUL SYLLABLE KHIEUKH-WA-IEUNG
-0x4468  0xCF8C  # HANGUL SYLLABLE KHIEUKH-WAE
-0x4469  0xCFA1  # HANGUL SYLLABLE KHIEUKH-WAE-IEUNG
-0x446A  0xCFA8  # HANGUL SYLLABLE KHIEUKH-OE
-0x446B  0xCFB0  # HANGUL SYLLABLE KHIEUKH-OE-RIEUL
-0x446C  0xCFC4  # HANGUL SYLLABLE KHIEUKH-YO
-0x446D  0xCFE0  # HANGUL SYLLABLE KHIEUKH-U
-0x446E  0xCFE1  # HANGUL SYLLABLE KHIEUKH-U-KIYEOK
-0x446F  0xCFE4  # HANGUL SYLLABLE KHIEUKH-U-NIEUN
-0x4470  0xCFE8  # HANGUL SYLLABLE KHIEUKH-U-RIEUL
-0x4471  0xCFF0  # HANGUL SYLLABLE KHIEUKH-U-MIEUM
-0x4472  0xCFF1  # HANGUL SYLLABLE KHIEUKH-U-PIEUP
-0x4473  0xCFF3  # HANGUL SYLLABLE KHIEUKH-U-SIOS
-0x4474  0xCFF5  # HANGUL SYLLABLE KHIEUKH-U-IEUNG
-0x4475  0xCFFC  # HANGUL SYLLABLE KHIEUKH-WEO
-0x4476  0xD000  # HANGUL SYLLABLE KHIEUKH-WEO-NIEUN
-0x4477  0xD004  # HANGUL SYLLABLE KHIEUKH-WEO-RIEUL
-0x4478  0xD011  # HANGUL SYLLABLE KHIEUKH-WEO-IEUNG
-0x4479  0xD018  # HANGUL SYLLABLE KHIEUKH-WE
-0x447A  0xD02D  # HANGUL SYLLABLE KHIEUKH-WE-IEUNG
-0x447B  0xD034  # HANGUL SYLLABLE KHIEUKH-WI
-0x447C  0xD035  # HANGUL SYLLABLE KHIEUKH-WI-KIYEOK
-0x447D  0xD038  # HANGUL SYLLABLE KHIEUKH-WI-NIEUN
-0x447E  0xD03C  # HANGUL SYLLABLE KHIEUKH-WI-RIEUL
-0x4521  0xD044  # HANGUL SYLLABLE KHIEUKH-WI-MIEUM
-0x4522  0xD045  # HANGUL SYLLABLE KHIEUKH-WI-PIEUP
-0x4523  0xD047  # HANGUL SYLLABLE KHIEUKH-WI-SIOS
-0x4524  0xD049  # HANGUL SYLLABLE KHIEUKH-WI-IEUNG
-0x4525  0xD050  # HANGUL SYLLABLE KHIEUKH-YU
-0x4526  0xD054  # HANGUL SYLLABLE KHIEUKH-YU-NIEUN
-0x4527  0xD058  # HANGUL SYLLABLE KHIEUKH-YU-RIEUL
-0x4528  0xD060  # HANGUL SYLLABLE KHIEUKH-YU-MIEUM
-0x4529  0xD06C  # HANGUL SYLLABLE KHIEUKH-EU
-0x452A  0xD06D  # HANGUL SYLLABLE KHIEUKH-EU-KIYEOK
-0x452B  0xD070  # HANGUL SYLLABLE KHIEUKH-EU-NIEUN
-0x452C  0xD074  # HANGUL SYLLABLE KHIEUKH-EU-RIEUL
-0x452D  0xD07C  # HANGUL SYLLABLE KHIEUKH-EU-MIEUM
-0x452E  0xD07D  # HANGUL SYLLABLE KHIEUKH-EU-PIEUP
-0x452F  0xD081  # HANGUL SYLLABLE KHIEUKH-EU-IEUNG
-0x4530  0xD0A4  # HANGUL SYLLABLE KHIEUKH-I
-0x4531  0xD0A5  # HANGUL SYLLABLE KHIEUKH-I-KIYEOK
-0x4532  0xD0A8  # HANGUL SYLLABLE KHIEUKH-I-NIEUN
-0x4533  0xD0AC  # HANGUL SYLLABLE KHIEUKH-I-RIEUL
-0x4534  0xD0B4  # HANGUL SYLLABLE KHIEUKH-I-MIEUM
-0x4535  0xD0B5  # HANGUL SYLLABLE KHIEUKH-I-PIEUP
-0x4536  0xD0B7  # HANGUL SYLLABLE KHIEUKH-I-SIOS
-0x4537  0xD0B9  # HANGUL SYLLABLE KHIEUKH-I-IEUNG
-0x4538  0xD0C0  # HANGUL SYLLABLE THIEUTH-A
-0x4539  0xD0C1  # HANGUL SYLLABLE THIEUTH-A-KIYEOK
-0x453A  0xD0C4  # HANGUL SYLLABLE THIEUTH-A-NIEUN
-0x453B  0xD0C8  # HANGUL SYLLABLE THIEUTH-A-RIEUL
-0x453C  0xD0C9  # HANGUL SYLLABLE THIEUTH-A-RIEULKIYEOK
-0x453D  0xD0D0  # HANGUL SYLLABLE THIEUTH-A-MIEUM
-0x453E  0xD0D1  # HANGUL SYLLABLE THIEUTH-A-PIEUP
-0x453F  0xD0D3  # HANGUL SYLLABLE THIEUTH-A-SIOS
-0x4540  0xD0D4  # HANGUL SYLLABLE THIEUTH-A-SSANGSIOS
-0x4541  0xD0D5  # HANGUL SYLLABLE THIEUTH-A-IEUNG
-0x4542  0xD0DC  # HANGUL SYLLABLE THIEUTH-AE
-0x4543  0xD0DD  # HANGUL SYLLABLE THIEUTH-AE-KIYEOK
-0x4544  0xD0E0  # HANGUL SYLLABLE THIEUTH-AE-NIEUN
-0x4545  0xD0E4  # HANGUL SYLLABLE THIEUTH-AE-RIEUL
-0x4546  0xD0EC  # HANGUL SYLLABLE THIEUTH-AE-MIEUM
-0x4547  0xD0ED  # HANGUL SYLLABLE THIEUTH-AE-PIEUP
-0x4548  0xD0EF  # HANGUL SYLLABLE THIEUTH-AE-SIOS
-0x4549  0xD0F0  # HANGUL SYLLABLE THIEUTH-AE-SSANGSIOS
-0x454A  0xD0F1  # HANGUL SYLLABLE THIEUTH-AE-IEUNG
-0x454B  0xD0F8  # HANGUL SYLLABLE THIEUTH-YA
-0x454C  0xD10D  # HANGUL SYLLABLE THIEUTH-YA-IEUNG
-0x454D  0xD130  # HANGUL SYLLABLE THIEUTH-EO
-0x454E  0xD131  # HANGUL SYLLABLE THIEUTH-EO-KIYEOK
-0x454F  0xD134  # HANGUL SYLLABLE THIEUTH-EO-NIEUN
-0x4550  0xD138  # HANGUL SYLLABLE THIEUTH-EO-RIEUL
-0x4551  0xD13A  # HANGUL SYLLABLE THIEUTH-EO-RIEULMIEUM
-0x4552  0xD140  # HANGUL SYLLABLE THIEUTH-EO-MIEUM
-0x4553  0xD141  # HANGUL SYLLABLE THIEUTH-EO-PIEUP
-0x4554  0xD143  # HANGUL SYLLABLE THIEUTH-EO-SIOS
-0x4555  0xD144  # HANGUL SYLLABLE THIEUTH-EO-SSANGSIOS
-0x4556  0xD145  # HANGUL SYLLABLE THIEUTH-EO-IEUNG
-0x4557  0xD14C  # HANGUL SYLLABLE THIEUTH-E
-0x4558  0xD14D  # HANGUL SYLLABLE THIEUTH-E-KIYEOK
-0x4559  0xD150  # HANGUL SYLLABLE THIEUTH-E-NIEUN
-0x455A  0xD154  # HANGUL SYLLABLE THIEUTH-E-RIEUL
-0x455B  0xD15C  # HANGUL SYLLABLE THIEUTH-E-MIEUM
-0x455C  0xD15D  # HANGUL SYLLABLE THIEUTH-E-PIEUP
-0x455D  0xD15F  # HANGUL SYLLABLE THIEUTH-E-SIOS
-0x455E  0xD161  # HANGUL SYLLABLE THIEUTH-E-IEUNG
-0x455F  0xD168  # HANGUL SYLLABLE THIEUTH-YEO
-0x4560  0xD16C  # HANGUL SYLLABLE THIEUTH-YEO-NIEUN
-0x4561  0xD17C  # HANGUL SYLLABLE THIEUTH-YEO-SSANGSIOS
-0x4562  0xD184  # HANGUL SYLLABLE THIEUTH-YE
-0x4563  0xD188  # HANGUL SYLLABLE THIEUTH-YE-NIEUN
-0x4564  0xD1A0  # HANGUL SYLLABLE THIEUTH-O
-0x4565  0xD1A1  # HANGUL SYLLABLE THIEUTH-O-KIYEOK
-0x4566  0xD1A4  # HANGUL SYLLABLE THIEUTH-O-NIEUN
-0x4567  0xD1A8  # HANGUL SYLLABLE THIEUTH-O-RIEUL
-0x4568  0xD1B0  # HANGUL SYLLABLE THIEUTH-O-MIEUM
-0x4569  0xD1B1  # HANGUL SYLLABLE THIEUTH-O-PIEUP
-0x456A  0xD1B3  # HANGUL SYLLABLE THIEUTH-O-SIOS
-0x456B  0xD1B5  # HANGUL SYLLABLE THIEUTH-O-IEUNG
-0x456C  0xD1BA  # HANGUL SYLLABLE THIEUTH-O-PHIEUPH
-0x456D  0xD1BC  # HANGUL SYLLABLE THIEUTH-WA
-0x456E  0xD1C0  # HANGUL SYLLABLE THIEUTH-WA-NIEUN
-0x456F  0xD1D8  # HANGUL SYLLABLE THIEUTH-WAE
-0x4570  0xD1F4  # HANGUL SYLLABLE THIEUTH-OE
-0x4571  0xD1F8  # HANGUL SYLLABLE THIEUTH-OE-NIEUN
-0x4572  0xD207  # HANGUL SYLLABLE THIEUTH-OE-SIOS
-0x4573  0xD209  # HANGUL SYLLABLE THIEUTH-OE-IEUNG
-0x4574  0xD210  # HANGUL SYLLABLE THIEUTH-YO
-0x4575  0xD22C  # HANGUL SYLLABLE THIEUTH-U
-0x4576  0xD22D  # HANGUL SYLLABLE THIEUTH-U-KIYEOK
-0x4577  0xD230  # HANGUL SYLLABLE THIEUTH-U-NIEUN
-0x4578  0xD234  # HANGUL SYLLABLE THIEUTH-U-RIEUL
-0x4579  0xD23C  # HANGUL SYLLABLE THIEUTH-U-MIEUM
-0x457A  0xD23D  # HANGUL SYLLABLE THIEUTH-U-PIEUP
-0x457B  0xD23F  # HANGUL SYLLABLE THIEUTH-U-SIOS
-0x457C  0xD241  # HANGUL SYLLABLE THIEUTH-U-IEUNG
-0x457D  0xD248  # HANGUL SYLLABLE THIEUTH-WEO
-0x457E  0xD25C  # HANGUL SYLLABLE THIEUTH-WEO-SSANGSIOS
-0x4621  0xD264  # HANGUL SYLLABLE THIEUTH-WE
-0x4622  0xD280  # HANGUL SYLLABLE THIEUTH-WI
-0x4623  0xD281  # HANGUL SYLLABLE THIEUTH-WI-KIYEOK
-0x4624  0xD284  # HANGUL SYLLABLE THIEUTH-WI-NIEUN
-0x4625  0xD288  # HANGUL SYLLABLE THIEUTH-WI-RIEUL
-0x4626  0xD290  # HANGUL SYLLABLE THIEUTH-WI-MIEUM
-0x4627  0xD291  # HANGUL SYLLABLE THIEUTH-WI-PIEUP
-0x4628  0xD295  # HANGUL SYLLABLE THIEUTH-WI-IEUNG
-0x4629  0xD29C  # HANGUL SYLLABLE THIEUTH-YU
-0x462A  0xD2A0  # HANGUL SYLLABLE THIEUTH-YU-NIEUN
-0x462B  0xD2A4  # HANGUL SYLLABLE THIEUTH-YU-RIEUL
-0x462C  0xD2AC  # HANGUL SYLLABLE THIEUTH-YU-MIEUM
-0x462D  0xD2B1  # HANGUL SYLLABLE THIEUTH-YU-IEUNG
-0x462E  0xD2B8  # HANGUL SYLLABLE THIEUTH-EU
-0x462F  0xD2B9  # HANGUL SYLLABLE THIEUTH-EU-KIYEOK
-0x4630  0xD2BC  # HANGUL SYLLABLE THIEUTH-EU-NIEUN
-0x4631  0xD2BF  # HANGUL SYLLABLE THIEUTH-EU-TIKEUT
-0x4632  0xD2C0  # HANGUL SYLLABLE THIEUTH-EU-RIEUL
-0x4633  0xD2C2  # HANGUL SYLLABLE THIEUTH-EU-RIEULMIEUM
-0x4634  0xD2C8  # HANGUL SYLLABLE THIEUTH-EU-MIEUM
-0x4635  0xD2C9  # HANGUL SYLLABLE THIEUTH-EU-PIEUP
-0x4636  0xD2CB  # HANGUL SYLLABLE THIEUTH-EU-SIOS
-0x4637  0xD2D4  # HANGUL SYLLABLE THIEUTH-YI
-0x4638  0xD2D8  # HANGUL SYLLABLE THIEUTH-YI-NIEUN
-0x4639  0xD2DC  # HANGUL SYLLABLE THIEUTH-YI-RIEUL
-0x463A  0xD2E4  # HANGUL SYLLABLE THIEUTH-YI-MIEUM
-0x463B  0xD2E5  # HANGUL SYLLABLE THIEUTH-YI-PIEUP
-0x463C  0xD2F0  # HANGUL SYLLABLE THIEUTH-I
-0x463D  0xD2F1  # HANGUL SYLLABLE THIEUTH-I-KIYEOK
-0x463E  0xD2F4  # HANGUL SYLLABLE THIEUTH-I-NIEUN
-0x463F  0xD2F8  # HANGUL SYLLABLE THIEUTH-I-RIEUL
-0x4640  0xD300  # HANGUL SYLLABLE THIEUTH-I-MIEUM
-0x4641  0xD301  # HANGUL SYLLABLE THIEUTH-I-PIEUP
-0x4642  0xD303  # HANGUL SYLLABLE THIEUTH-I-SIOS
-0x4643  0xD305  # HANGUL SYLLABLE THIEUTH-I-IEUNG
-0x4644  0xD30C  # HANGUL SYLLABLE PHIEUPH-A
-0x4645  0xD30D  # HANGUL SYLLABLE PHIEUPH-A-KIYEOK
-0x4646  0xD30E  # HANGUL SYLLABLE PHIEUPH-A-SSANGKIYEOK
-0x4647  0xD310  # HANGUL SYLLABLE PHIEUPH-A-NIEUN
-0x4648  0xD314  # HANGUL SYLLABLE PHIEUPH-A-RIEUL
-0x4649  0xD316  # HANGUL SYLLABLE PHIEUPH-A-RIEULMIEUM
-0x464A  0xD31C  # HANGUL SYLLABLE PHIEUPH-A-MIEUM
-0x464B  0xD31D  # HANGUL SYLLABLE PHIEUPH-A-PIEUP
-0x464C  0xD31F  # HANGUL SYLLABLE PHIEUPH-A-SIOS
-0x464D  0xD320  # HANGUL SYLLABLE PHIEUPH-A-SSANGSIOS
-0x464E  0xD321  # HANGUL SYLLABLE PHIEUPH-A-IEUNG
-0x464F  0xD325  # HANGUL SYLLABLE PHIEUPH-A-THIEUTH
-0x4650  0xD328  # HANGUL SYLLABLE PHIEUPH-AE
-0x4651  0xD329  # HANGUL SYLLABLE PHIEUPH-AE-KIYEOK
-0x4652  0xD32C  # HANGUL SYLLABLE PHIEUPH-AE-NIEUN
-0x4653  0xD330  # HANGUL SYLLABLE PHIEUPH-AE-RIEUL
-0x4654  0xD338  # HANGUL SYLLABLE PHIEUPH-AE-MIEUM
-0x4655  0xD339  # HANGUL SYLLABLE PHIEUPH-AE-PIEUP
-0x4656  0xD33B  # HANGUL SYLLABLE PHIEUPH-AE-SIOS
-0x4657  0xD33C  # HANGUL SYLLABLE PHIEUPH-AE-SSANGSIOS
-0x4658  0xD33D  # HANGUL SYLLABLE PHIEUPH-AE-IEUNG
-0x4659  0xD344  # HANGUL SYLLABLE PHIEUPH-YA
-0x465A  0xD345  # HANGUL SYLLABLE PHIEUPH-YA-KIYEOK
-0x465B  0xD37C  # HANGUL SYLLABLE PHIEUPH-EO
-0x465C  0xD37D  # HANGUL SYLLABLE PHIEUPH-EO-KIYEOK
-0x465D  0xD380  # HANGUL SYLLABLE PHIEUPH-EO-NIEUN
-0x465E  0xD384  # HANGUL SYLLABLE PHIEUPH-EO-RIEUL
-0x465F  0xD38C  # HANGUL SYLLABLE PHIEUPH-EO-MIEUM
-0x4660  0xD38D  # HANGUL SYLLABLE PHIEUPH-EO-PIEUP
-0x4661  0xD38F  # HANGUL SYLLABLE PHIEUPH-EO-SIOS
-0x4662  0xD390  # HANGUL SYLLABLE PHIEUPH-EO-SSANGSIOS
-0x4663  0xD391  # HANGUL SYLLABLE PHIEUPH-EO-IEUNG
-0x4664  0xD398  # HANGUL SYLLABLE PHIEUPH-E
-0x4665  0xD399  # HANGUL SYLLABLE PHIEUPH-E-KIYEOK
-0x4666  0xD39C  # HANGUL SYLLABLE PHIEUPH-E-NIEUN
-0x4667  0xD3A0  # HANGUL SYLLABLE PHIEUPH-E-RIEUL
-0x4668  0xD3A8  # HANGUL SYLLABLE PHIEUPH-E-MIEUM
-0x4669  0xD3A9  # HANGUL SYLLABLE PHIEUPH-E-PIEUP
-0x466A  0xD3AB  # HANGUL SYLLABLE PHIEUPH-E-SIOS
-0x466B  0xD3AD  # HANGUL SYLLABLE PHIEUPH-E-IEUNG
-0x466C  0xD3B4  # HANGUL SYLLABLE PHIEUPH-YEO
-0x466D  0xD3B8  # HANGUL SYLLABLE PHIEUPH-YEO-NIEUN
-0x466E  0xD3BC  # HANGUL SYLLABLE PHIEUPH-YEO-RIEUL
-0x466F  0xD3C4  # HANGUL SYLLABLE PHIEUPH-YEO-MIEUM
-0x4670  0xD3C5  # HANGUL SYLLABLE PHIEUPH-YEO-PIEUP
-0x4671  0xD3C8  # HANGUL SYLLABLE PHIEUPH-YEO-SSANGSIOS
-0x4672  0xD3C9  # HANGUL SYLLABLE PHIEUPH-YEO-IEUNG
-0x4673  0xD3D0  # HANGUL SYLLABLE PHIEUPH-YE
-0x4674  0xD3D8  # HANGUL SYLLABLE PHIEUPH-YE-RIEUL
-0x4675  0xD3E1  # HANGUL SYLLABLE PHIEUPH-YE-PIEUP
-0x4676  0xD3E3  # HANGUL SYLLABLE PHIEUPH-YE-SIOS
-0x4677  0xD3EC  # HANGUL SYLLABLE PHIEUPH-O
-0x4678  0xD3ED  # HANGUL SYLLABLE PHIEUPH-O-KIYEOK
-0x4679  0xD3F0  # HANGUL SYLLABLE PHIEUPH-O-NIEUN
-0x467A  0xD3F4  # HANGUL SYLLABLE PHIEUPH-O-RIEUL
-0x467B  0xD3FC  # HANGUL SYLLABLE PHIEUPH-O-MIEUM
-0x467C  0xD3FD  # HANGUL SYLLABLE PHIEUPH-O-PIEUP
-0x467D  0xD3FF  # HANGUL SYLLABLE PHIEUPH-O-SIOS
-0x467E  0xD401  # HANGUL SYLLABLE PHIEUPH-O-IEUNG
-0x4721  0xD408  # HANGUL SYLLABLE PHIEUPH-WA
-0x4722  0xD41D  # HANGUL SYLLABLE PHIEUPH-WA-IEUNG
-0x4723  0xD440  # HANGUL SYLLABLE PHIEUPH-OE
-0x4724  0xD444  # HANGUL SYLLABLE PHIEUPH-OE-NIEUN
-0x4725  0xD45C  # HANGUL SYLLABLE PHIEUPH-YO
-0x4726  0xD460  # HANGUL SYLLABLE PHIEUPH-YO-NIEUN
-0x4727  0xD464  # HANGUL SYLLABLE PHIEUPH-YO-RIEUL
-0x4728  0xD46D  # HANGUL SYLLABLE PHIEUPH-YO-PIEUP
-0x4729  0xD46F  # HANGUL SYLLABLE PHIEUPH-YO-SIOS
-0x472A  0xD478  # HANGUL SYLLABLE PHIEUPH-U
-0x472B  0xD479  # HANGUL SYLLABLE PHIEUPH-U-KIYEOK
-0x472C  0xD47C  # HANGUL SYLLABLE PHIEUPH-U-NIEUN
-0x472D  0xD47F  # HANGUL SYLLABLE PHIEUPH-U-TIKEUT
-0x472E  0xD480  # HANGUL SYLLABLE PHIEUPH-U-RIEUL
-0x472F  0xD482  # HANGUL SYLLABLE PHIEUPH-U-RIEULMIEUM
-0x4730  0xD488  # HANGUL SYLLABLE PHIEUPH-U-MIEUM
-0x4731  0xD489  # HANGUL SYLLABLE PHIEUPH-U-PIEUP
-0x4732  0xD48B  # HANGUL SYLLABLE PHIEUPH-U-SIOS
-0x4733  0xD48D  # HANGUL SYLLABLE PHIEUPH-U-IEUNG
-0x4734  0xD494  # HANGUL SYLLABLE PHIEUPH-WEO
-0x4735  0xD4A9  # HANGUL SYLLABLE PHIEUPH-WEO-IEUNG
-0x4736  0xD4CC  # HANGUL SYLLABLE PHIEUPH-WI
-0x4737  0xD4D0  # HANGUL SYLLABLE PHIEUPH-WI-NIEUN
-0x4738  0xD4D4  # HANGUL SYLLABLE PHIEUPH-WI-RIEUL
-0x4739  0xD4DC  # HANGUL SYLLABLE PHIEUPH-WI-MIEUM
-0x473A  0xD4DF  # HANGUL SYLLABLE PHIEUPH-WI-SIOS
-0x473B  0xD4E8  # HANGUL SYLLABLE PHIEUPH-YU
-0x473C  0xD4EC  # HANGUL SYLLABLE PHIEUPH-YU-NIEUN
-0x473D  0xD4F0  # HANGUL SYLLABLE PHIEUPH-YU-RIEUL
-0x473E  0xD4F8  # HANGUL SYLLABLE PHIEUPH-YU-MIEUM
-0x473F  0xD4FB  # HANGUL SYLLABLE PHIEUPH-YU-SIOS
-0x4740  0xD4FD  # HANGUL SYLLABLE PHIEUPH-YU-IEUNG
-0x4741  0xD504  # HANGUL SYLLABLE PHIEUPH-EU
-0x4742  0xD508  # HANGUL SYLLABLE PHIEUPH-EU-NIEUN
-0x4743  0xD50C  # HANGUL SYLLABLE PHIEUPH-EU-RIEUL
-0x4744  0xD514  # HANGUL SYLLABLE PHIEUPH-EU-MIEUM
-0x4745  0xD515  # HANGUL SYLLABLE PHIEUPH-EU-PIEUP
-0x4746  0xD517  # HANGUL SYLLABLE PHIEUPH-EU-SIOS
-0x4747  0xD53C  # HANGUL SYLLABLE PHIEUPH-I
-0x4748  0xD53D  # HANGUL SYLLABLE PHIEUPH-I-KIYEOK
-0x4749  0xD540  # HANGUL SYLLABLE PHIEUPH-I-NIEUN
-0x474A  0xD544  # HANGUL SYLLABLE PHIEUPH-I-RIEUL
-0x474B  0xD54C  # HANGUL SYLLABLE PHIEUPH-I-MIEUM
-0x474C  0xD54D  # HANGUL SYLLABLE PHIEUPH-I-PIEUP
-0x474D  0xD54F  # HANGUL SYLLABLE PHIEUPH-I-SIOS
-0x474E  0xD551  # HANGUL SYLLABLE PHIEUPH-I-IEUNG
-0x474F  0xD558  # HANGUL SYLLABLE HIEUH-A
-0x4750  0xD559  # HANGUL SYLLABLE HIEUH-A-KIYEOK
-0x4751  0xD55C  # HANGUL SYLLABLE HIEUH-A-NIEUN
-0x4752  0xD560  # HANGUL SYLLABLE HIEUH-A-RIEUL
-0x4753  0xD565  # HANGUL SYLLABLE HIEUH-A-RIEULTHIEUTH
-0x4754  0xD568  # HANGUL SYLLABLE HIEUH-A-MIEUM
-0x4755  0xD569  # HANGUL SYLLABLE HIEUH-A-PIEUP
-0x4756  0xD56B  # HANGUL SYLLABLE HIEUH-A-SIOS
-0x4757  0xD56D  # HANGUL SYLLABLE HIEUH-A-IEUNG
-0x4758  0xD574  # HANGUL SYLLABLE HIEUH-AE
-0x4759  0xD575  # HANGUL SYLLABLE HIEUH-AE-KIYEOK
-0x475A  0xD578  # HANGUL SYLLABLE HIEUH-AE-NIEUN
-0x475B  0xD57C  # HANGUL SYLLABLE HIEUH-AE-RIEUL
-0x475C  0xD584  # HANGUL SYLLABLE HIEUH-AE-MIEUM
-0x475D  0xD585  # HANGUL SYLLABLE HIEUH-AE-PIEUP
-0x475E  0xD587  # HANGUL SYLLABLE HIEUH-AE-SIOS
-0x475F  0xD588  # HANGUL SYLLABLE HIEUH-AE-SSANGSIOS
-0x4760  0xD589  # HANGUL SYLLABLE HIEUH-AE-IEUNG
-0x4761  0xD590  # HANGUL SYLLABLE HIEUH-YA
-0x4762  0xD5A5  # HANGUL SYLLABLE HIEUH-YA-IEUNG
-0x4763  0xD5C8  # HANGUL SYLLABLE HIEUH-EO
-0x4764  0xD5C9  # HANGUL SYLLABLE HIEUH-EO-KIYEOK
-0x4765  0xD5CC  # HANGUL SYLLABLE HIEUH-EO-NIEUN
-0x4766  0xD5D0  # HANGUL SYLLABLE HIEUH-EO-RIEUL
-0x4767  0xD5D2  # HANGUL SYLLABLE HIEUH-EO-RIEULMIEUM
-0x4768  0xD5D8  # HANGUL SYLLABLE HIEUH-EO-MIEUM
-0x4769  0xD5D9  # HANGUL SYLLABLE HIEUH-EO-PIEUP
-0x476A  0xD5DB  # HANGUL SYLLABLE HIEUH-EO-SIOS
-0x476B  0xD5DD  # HANGUL SYLLABLE HIEUH-EO-IEUNG
-0x476C  0xD5E4  # HANGUL SYLLABLE HIEUH-E
-0x476D  0xD5E5  # HANGUL SYLLABLE HIEUH-E-KIYEOK
-0x476E  0xD5E8  # HANGUL SYLLABLE HIEUH-E-NIEUN
-0x476F  0xD5EC  # HANGUL SYLLABLE HIEUH-E-RIEUL
-0x4770  0xD5F4  # HANGUL SYLLABLE HIEUH-E-MIEUM
-0x4771  0xD5F5  # HANGUL SYLLABLE HIEUH-E-PIEUP
-0x4772  0xD5F7  # HANGUL SYLLABLE HIEUH-E-SIOS
-0x4773  0xD5F9  # HANGUL SYLLABLE HIEUH-E-IEUNG
-0x4774  0xD600  # HANGUL SYLLABLE HIEUH-YEO
-0x4775  0xD601  # HANGUL SYLLABLE HIEUH-YEO-KIYEOK
-0x4776  0xD604  # HANGUL SYLLABLE HIEUH-YEO-NIEUN
-0x4777  0xD608  # HANGUL SYLLABLE HIEUH-YEO-RIEUL
-0x4778  0xD610  # HANGUL SYLLABLE HIEUH-YEO-MIEUM
-0x4779  0xD611  # HANGUL SYLLABLE HIEUH-YEO-PIEUP
-0x477A  0xD613  # HANGUL SYLLABLE HIEUH-YEO-SIOS
-0x477B  0xD614  # HANGUL SYLLABLE HIEUH-YEO-SSANGSIOS
-0x477C  0xD615  # HANGUL SYLLABLE HIEUH-YEO-IEUNG
-0x477D  0xD61C  # HANGUL SYLLABLE HIEUH-YE
-0x477E  0xD620  # HANGUL SYLLABLE HIEUH-YE-NIEUN
-0x4821  0xD624  # HANGUL SYLLABLE HIEUH-YE-RIEUL
-0x4822  0xD62D  # HANGUL SYLLABLE HIEUH-YE-PIEUP
-0x4823  0xD638  # HANGUL SYLLABLE HIEUH-O
-0x4824  0xD639  # HANGUL SYLLABLE HIEUH-O-KIYEOK
-0x4825  0xD63C  # HANGUL SYLLABLE HIEUH-O-NIEUN
-0x4826  0xD640  # HANGUL SYLLABLE HIEUH-O-RIEUL
-0x4827  0xD645  # HANGUL SYLLABLE HIEUH-O-RIEULTHIEUTH
-0x4828  0xD648  # HANGUL SYLLABLE HIEUH-O-MIEUM
-0x4829  0xD649  # HANGUL SYLLABLE HIEUH-O-PIEUP
-0x482A  0xD64B  # HANGUL SYLLABLE HIEUH-O-SIOS
-0x482B  0xD64D  # HANGUL SYLLABLE HIEUH-O-IEUNG
-0x482C  0xD651  # HANGUL SYLLABLE HIEUH-O-THIEUTH
-0x482D  0xD654  # HANGUL SYLLABLE HIEUH-WA
-0x482E  0xD655  # HANGUL SYLLABLE HIEUH-WA-KIYEOK
-0x482F  0xD658  # HANGUL SYLLABLE HIEUH-WA-NIEUN
-0x4830  0xD65C  # HANGUL SYLLABLE HIEUH-WA-RIEUL
-0x4831  0xD667  # HANGUL SYLLABLE HIEUH-WA-SIOS
-0x4832  0xD669  # HANGUL SYLLABLE HIEUH-WA-IEUNG
-0x4833  0xD670  # HANGUL SYLLABLE HIEUH-WAE
-0x4834  0xD671  # HANGUL SYLLABLE HIEUH-WAE-KIYEOK
-0x4835  0xD674  # HANGUL SYLLABLE HIEUH-WAE-NIEUN
-0x4836  0xD683  # HANGUL SYLLABLE HIEUH-WAE-SIOS
-0x4837  0xD685  # HANGUL SYLLABLE HIEUH-WAE-IEUNG
-0x4838  0xD68C  # HANGUL SYLLABLE HIEUH-OE
-0x4839  0xD68D  # HANGUL SYLLABLE HIEUH-OE-KIYEOK
-0x483A  0xD690  # HANGUL SYLLABLE HIEUH-OE-NIEUN
-0x483B  0xD694  # HANGUL SYLLABLE HIEUH-OE-RIEUL
-0x483C  0xD69D  # HANGUL SYLLABLE HIEUH-OE-PIEUP
-0x483D  0xD69F  # HANGUL SYLLABLE HIEUH-OE-SIOS
-0x483E  0xD6A1  # HANGUL SYLLABLE HIEUH-OE-IEUNG
-0x483F  0xD6A8  # HANGUL SYLLABLE HIEUH-YO
-0x4840  0xD6AC  # HANGUL SYLLABLE HIEUH-YO-NIEUN
-0x4841  0xD6B0  # HANGUL SYLLABLE HIEUH-YO-RIEUL
-0x4842  0xD6B9  # HANGUL SYLLABLE HIEUH-YO-PIEUP
-0x4843  0xD6BB  # HANGUL SYLLABLE HIEUH-YO-SIOS
-0x4844  0xD6C4  # HANGUL SYLLABLE HIEUH-U
-0x4845  0xD6C5  # HANGUL SYLLABLE HIEUH-U-KIYEOK
-0x4846  0xD6C8  # HANGUL SYLLABLE HIEUH-U-NIEUN
-0x4847  0xD6CC  # HANGUL SYLLABLE HIEUH-U-RIEUL
-0x4848  0xD6D1  # HANGUL SYLLABLE HIEUH-U-RIEULTHIEUTH
-0x4849  0xD6D4  # HANGUL SYLLABLE HIEUH-U-MIEUM
-0x484A  0xD6D7  # HANGUL SYLLABLE HIEUH-U-SIOS
-0x484B  0xD6D9  # HANGUL SYLLABLE HIEUH-U-IEUNG
-0x484C  0xD6E0  # HANGUL SYLLABLE HIEUH-WEO
-0x484D  0xD6E4  # HANGUL SYLLABLE HIEUH-WEO-NIEUN
-0x484E  0xD6E8  # HANGUL SYLLABLE HIEUH-WEO-RIEUL
-0x484F  0xD6F0  # HANGUL SYLLABLE HIEUH-WEO-MIEUM
-0x4850  0xD6F5  # HANGUL SYLLABLE HIEUH-WEO-IEUNG
-0x4851  0xD6FC  # HANGUL SYLLABLE HIEUH-WE
-0x4852  0xD6FD  # HANGUL SYLLABLE HIEUH-WE-KIYEOK
-0x4853  0xD700  # HANGUL SYLLABLE HIEUH-WE-NIEUN
-0x4854  0xD704  # HANGUL SYLLABLE HIEUH-WE-RIEUL
-0x4855  0xD711  # HANGUL SYLLABLE HIEUH-WE-IEUNG
-0x4856  0xD718  # HANGUL SYLLABLE HIEUH-WI
-0x4857  0xD719  # HANGUL SYLLABLE HIEUH-WI-KIYEOK
-0x4858  0xD71C  # HANGUL SYLLABLE HIEUH-WI-NIEUN
-0x4859  0xD720  # HANGUL SYLLABLE HIEUH-WI-RIEUL
-0x485A  0xD728  # HANGUL SYLLABLE HIEUH-WI-MIEUM
-0x485B  0xD729  # HANGUL SYLLABLE HIEUH-WI-PIEUP
-0x485C  0xD72B  # HANGUL SYLLABLE HIEUH-WI-SIOS
-0x485D  0xD72D  # HANGUL SYLLABLE HIEUH-WI-IEUNG
-0x485E  0xD734  # HANGUL SYLLABLE HIEUH-YU
-0x485F  0xD735  # HANGUL SYLLABLE HIEUH-YU-KIYEOK
-0x4860  0xD738  # HANGUL SYLLABLE HIEUH-YU-NIEUN
-0x4861  0xD73C  # HANGUL SYLLABLE HIEUH-YU-RIEUL
-0x4862  0xD744  # HANGUL SYLLABLE HIEUH-YU-MIEUM
-0x4863  0xD747  # HANGUL SYLLABLE HIEUH-YU-SIOS
-0x4864  0xD749  # HANGUL SYLLABLE HIEUH-YU-IEUNG
-0x4865  0xD750  # HANGUL SYLLABLE HIEUH-EU
-0x4866  0xD751  # HANGUL SYLLABLE HIEUH-EU-KIYEOK
-0x4867  0xD754  # HANGUL SYLLABLE HIEUH-EU-NIEUN
-0x4868  0xD756  # HANGUL SYLLABLE HIEUH-EU-NIEUNHIEUH
-0x4869  0xD757  # HANGUL SYLLABLE HIEUH-EU-TIKEUT
-0x486A  0xD758  # HANGUL SYLLABLE HIEUH-EU-RIEUL
-0x486B  0xD759  # HANGUL SYLLABLE HIEUH-EU-RIEULKIYEOK
-0x486C  0xD760  # HANGUL SYLLABLE HIEUH-EU-MIEUM
-0x486D  0xD761  # HANGUL SYLLABLE HIEUH-EU-PIEUP
-0x486E  0xD763  # HANGUL SYLLABLE HIEUH-EU-SIOS
-0x486F  0xD765  # HANGUL SYLLABLE HIEUH-EU-IEUNG
-0x4870  0xD769  # HANGUL SYLLABLE HIEUH-EU-THIEUTH
-0x4871  0xD76C  # HANGUL SYLLABLE HIEUH-YI
-0x4872  0xD770  # HANGUL SYLLABLE HIEUH-YI-NIEUN
-0x4873  0xD774  # HANGUL SYLLABLE HIEUH-YI-RIEUL
-0x4874  0xD77C  # HANGUL SYLLABLE HIEUH-YI-MIEUM
-0x4875  0xD77D  # HANGUL SYLLABLE HIEUH-YI-PIEUP
-0x4876  0xD781  # HANGUL SYLLABLE HIEUH-YI-IEUNG
-0x4877  0xD788  # HANGUL SYLLABLE HIEUH-I
-0x4878  0xD789  # HANGUL SYLLABLE HIEUH-I-KIYEOK
-0x4879  0xD78C  # HANGUL SYLLABLE HIEUH-I-NIEUN
-0x487A  0xD790  # HANGUL SYLLABLE HIEUH-I-RIEUL
-0x487B  0xD798  # HANGUL SYLLABLE HIEUH-I-MIEUM
-0x487C  0xD799  # HANGUL SYLLABLE HIEUH-I-PIEUP
-0x487D  0xD79B  # HANGUL SYLLABLE HIEUH-I-SIOS
-0x487E  0xD79D  # HANGUL SYLLABLE HIEUH-I-IEUNG
-0x4A21  0x4F3D  # <CJK>
-0x4A22  0x4F73  # <CJK>
-0x4A23  0x5047  # <CJK>
-0x4A24  0x50F9  # <CJK>
-0x4A25  0x52A0  # <CJK>
-0x4A26  0x53EF  # <CJK>
-0x4A27  0x5475  # <CJK>
-0x4A28  0x54E5  # <CJK>
-0x4A29  0x5609  # <CJK>
-0x4A2A  0x5AC1  # <CJK>
-0x4A2B  0x5BB6  # <CJK>
-0x4A2C  0x6687  # <CJK>
-0x4A2D  0x67B6  # <CJK>
-0x4A2E  0x67B7  # <CJK>
-0x4A2F  0x67EF  # <CJK>
-0x4A30  0x6B4C  # <CJK>
-0x4A31  0x73C2  # <CJK>
-0x4A32  0x75C2  # <CJK>
-0x4A33  0x7A3C  # <CJK>
-0x4A34  0x82DB  # <CJK>
-0x4A35  0x8304  # <CJK>
-0x4A36  0x8857  # <CJK>
-0x4A37  0x8888  # <CJK>
-0x4A38  0x8A36  # <CJK>
-0x4A39  0x8CC8  # <CJK>
-0x4A3A  0x8DCF  # <CJK>
-0x4A3B  0x8EFB  # <CJK>
-0x4A3C  0x8FE6  # <CJK>
-0x4A3D  0x99D5  # <CJK>
-0x4A3E  0x523B  # <CJK>
-0x4A3F  0x5374  # <CJK>
-0x4A40  0x5404  # <CJK>
-0x4A41  0x606A  # <CJK>
-0x4A42  0x6164  # <CJK>
-0x4A43  0x6BBC  # <CJK>
-0x4A44  0x73CF  # <CJK>
-0x4A45  0x811A  # <CJK>
-0x4A46  0x89BA  # <CJK>
-0x4A47  0x89D2  # <CJK>
-0x4A48  0x95A3  # <CJK>
-0x4A49  0x4F83  # <CJK>
-0x4A4A  0x520A  # <CJK>
-0x4A4B  0x58BE  # <CJK>
-0x4A4C  0x5978  # <CJK>
-0x4A4D  0x59E6  # <CJK>
-0x4A4E  0x5E72  # <CJK>
-0x4A4F  0x5E79  # <CJK>
-0x4A50  0x61C7  # <CJK>
-0x4A51  0x63C0  # <CJK>
-0x4A52  0x6746  # <CJK>
-0x4A53  0x67EC  # <CJK>
-0x4A54  0x687F  # <CJK>
-0x4A55  0x6F97  # <CJK>
-0x4A56  0x764E  # <CJK>
-0x4A57  0x770B  # <CJK>
-0x4A58  0x78F5  # <CJK>
-0x4A59  0x7A08  # <CJK>
-0x4A5A  0x7AFF  # <CJK>
-0x4A5B  0x7C21  # <CJK>
-0x4A5C  0x809D  # <CJK>
-0x4A5D  0x826E  # <CJK>
-0x4A5E  0x8271  # <CJK>
-0x4A5F  0x8AEB  # <CJK>
-0x4A60  0x9593  # <CJK>
-0x4A61  0x4E6B  # <CJK>
-0x4A62  0x559D  # <CJK>
-0x4A63  0x66F7  # <CJK>
-0x4A64  0x6E34  # <CJK>
-0x4A65  0x78A3  # <CJK>
-0x4A66  0x7AED  # <CJK>
-0x4A67  0x845B  # <CJK>
-0x4A68  0x8910  # <CJK>
-0x4A69  0x874E  # <CJK>
-0x4A6A  0x97A8  # <CJK>
-0x4A6B  0x52D8  # <CJK>
-0x4A6C  0x574E  # <CJK>
-0x4A6D  0x582A  # <CJK>
-0x4A6E  0x5D4C  # <CJK>
-0x4A6F  0x611F  # <CJK>
-0x4A70  0x61BE  # <CJK>
-0x4A71  0x6221  # <CJK>
-0x4A72  0x6562  # <CJK>
-0x4A73  0x67D1  # <CJK>
-0x4A74  0x6A44  # <CJK>
-0x4A75  0x6E1B  # <CJK>
-0x4A76  0x7518  # <CJK>
-0x4A77  0x75B3  # <CJK>
-0x4A78  0x76E3  # <CJK>
-0x4A79  0x77B0  # <CJK>
-0x4A7A  0x7D3A  # <CJK>
-0x4A7B  0x90AF  # <CJK>
-0x4A7C  0x9451  # <CJK>
-0x4A7D  0x9452  # <CJK>
-0x4A7E  0x9F95  # <CJK>
-0x4B21  0x5323  # <CJK>
-0x4B22  0x5CAC  # <CJK>
-0x4B23  0x7532  # <CJK>
-0x4B24  0x80DB  # <CJK>
-0x4B25  0x9240  # <CJK>
-0x4B26  0x9598  # <CJK>
-0x4B27  0x525B  # <CJK>
-0x4B28  0x5808  # <CJK>
-0x4B29  0x59DC  # <CJK>
-0x4B2A  0x5CA1  # <CJK>
-0x4B2B  0x5D17  # <CJK>
-0x4B2C  0x5EB7  # <CJK>
-0x4B2D  0x5F3A  # <CJK>
-0x4B2E  0x5F4A  # <CJK>
-0x4B2F  0x6177  # <CJK>
-0x4B30  0x6C5F  # <CJK>
-0x4B31  0x757A  # <CJK>
-0x4B32  0x7586  # <CJK>
-0x4B33  0x7CE0  # <CJK>
-0x4B34  0x7D73  # <CJK>
-0x4B35  0x7DB1  # <CJK>
-0x4B36  0x7F8C  # <CJK>
-0x4B37  0x8154  # <CJK>
-0x4B38  0x8221  # <CJK>
-0x4B39  0x8591  # <CJK>
-0x4B3A  0x8941  # <CJK>
-0x4B3B  0x8B1B  # <CJK>
-0x4B3C  0x92FC  # <CJK>
-0x4B3D  0x964D  # <CJK>
-0x4B3E  0x9C47  # <CJK>
-0x4B3F  0x4ECB  # <CJK>
-0x4B40  0x4EF7  # <CJK>
-0x4B41  0x500B  # <CJK>
-0x4B42  0x51F1  # <CJK>
-0x4B43  0x584F  # <CJK>
-0x4B44  0x6137  # <CJK>
-0x4B45  0x613E  # <CJK>
-0x4B46  0x6168  # <CJK>
-0x4B47  0x6539  # <CJK>
-0x4B48  0x69EA  # <CJK>
-0x4B49  0x6F11  # <CJK>
-0x4B4A  0x75A5  # <CJK>
-0x4B4B  0x7686  # <CJK>
-0x4B4C  0x76D6  # <CJK>
-0x4B4D  0x7B87  # <CJK>
-0x4B4E  0x82A5  # <CJK>
-0x4B4F  0x84CB  # <CJK>
-0x4B50  0xF900  # <CJK>
-0x4B51  0x93A7  # <CJK>
-0x4B52  0x958B  # <CJK>
-0x4B53  0x5580  # <CJK>
-0x4B54  0x5BA2  # <CJK>
-0x4B55  0x5751  # <CJK>
-0x4B56  0xF901  # <CJK>
-0x4B57  0x7CB3  # <CJK>
-0x4B58  0x7FB9  # <CJK>
-0x4B59  0x91B5  # <CJK>
-0x4B5A  0x5028  # <CJK>
-0x4B5B  0x53BB  # <CJK>
-0x4B5C  0x5C45  # <CJK>
-0x4B5D  0x5DE8  # <CJK>
-0x4B5E  0x62D2  # <CJK>
-0x4B5F  0x636E  # <CJK>
-0x4B60  0x64DA  # <CJK>
-0x4B61  0x64E7  # <CJK>
-0x4B62  0x6E20  # <CJK>
-0x4B63  0x70AC  # <CJK>
-0x4B64  0x795B  # <CJK>
-0x4B65  0x8DDD  # <CJK>
-0x4B66  0x8E1E  # <CJK>
-0x4B67  0xF902  # <CJK>
-0x4B68  0x907D  # <CJK>
-0x4B69  0x9245  # <CJK>
-0x4B6A  0x92F8  # <CJK>
-0x4B6B  0x4E7E  # <CJK>
-0x4B6C  0x4EF6  # <CJK>
-0x4B6D  0x5065  # <CJK>
-0x4B6E  0x5DFE  # <CJK>
-0x4B6F  0x5EFA  # <CJK>
-0x4B70  0x6106  # <CJK>
-0x4B71  0x6957  # <CJK>
-0x4B72  0x8171  # <CJK>
-0x4B73  0x8654  # <CJK>
-0x4B74  0x8E47  # <CJK>
-0x4B75  0x9375  # <CJK>
-0x4B76  0x9A2B  # <CJK>
-0x4B77  0x4E5E  # <CJK>
-0x4B78  0x5091  # <CJK>
-0x4B79  0x6770  # <CJK>
-0x4B7A  0x6840  # <CJK>
-0x4B7B  0x5109  # <CJK>
-0x4B7C  0x528D  # <CJK>
-0x4B7D  0x5292  # <CJK>
-0x4B7E  0x6AA2  # <CJK>
-0x4C21  0x77BC  # <CJK>
-0x4C22  0x9210  # <CJK>
-0x4C23  0x9ED4  # <CJK>
-0x4C24  0x52AB  # <CJK>
-0x4C25  0x602F  # <CJK>
-0x4C26  0x8FF2  # <CJK>
-0x4C27  0x5048  # <CJK>
-0x4C28  0x61A9  # <CJK>
-0x4C29  0x63ED  # <CJK>
-0x4C2A  0x64CA  # <CJK>
-0x4C2B  0x683C  # <CJK>
-0x4C2C  0x6A84  # <CJK>
-0x4C2D  0x6FC0  # <CJK>
-0x4C2E  0x8188  # <CJK>
-0x4C2F  0x89A1  # <CJK>
-0x4C30  0x9694  # <CJK>
-0x4C31  0x5805  # <CJK>
-0x4C32  0x727D  # <CJK>
-0x4C33  0x72AC  # <CJK>
-0x4C34  0x7504  # <CJK>
-0x4C35  0x7D79  # <CJK>
-0x4C36  0x7E6D  # <CJK>
-0x4C37  0x80A9  # <CJK>
-0x4C38  0x898B  # <CJK>
-0x4C39  0x8B74  # <CJK>
-0x4C3A  0x9063  # <CJK>
-0x4C3B  0x9D51  # <CJK>
-0x4C3C  0x6289  # <CJK>
-0x4C3D  0x6C7A  # <CJK>
-0x4C3E  0x6F54  # <CJK>
-0x4C3F  0x7D50  # <CJK>
-0x4C40  0x7F3A  # <CJK>
-0x4C41  0x8A23  # <CJK>
-0x4C42  0x517C  # <CJK>
-0x4C43  0x614A  # <CJK>
-0x4C44  0x7B9D  # <CJK>
-0x4C45  0x8B19  # <CJK>
-0x4C46  0x9257  # <CJK>
-0x4C47  0x938C  # <CJK>
-0x4C48  0x4EAC  # <CJK>
-0x4C49  0x4FD3  # <CJK>
-0x4C4A  0x501E  # <CJK>
-0x4C4B  0x50BE  # <CJK>
-0x4C4C  0x5106  # <CJK>
-0x4C4D  0x52C1  # <CJK>
-0x4C4E  0x52CD  # <CJK>
-0x4C4F  0x537F  # <CJK>
-0x4C50  0x5770  # <CJK>
-0x4C51  0x5883  # <CJK>
-0x4C52  0x5E9A  # <CJK>
-0x4C53  0x5F91  # <CJK>
-0x4C54  0x6176  # <CJK>
-0x4C55  0x61AC  # <CJK>
-0x4C56  0x64CE  # <CJK>
-0x4C57  0x656C  # <CJK>
-0x4C58  0x666F  # <CJK>
-0x4C59  0x66BB  # <CJK>
-0x4C5A  0x66F4  # <CJK>
-0x4C5B  0x6897  # <CJK>
-0x4C5C  0x6D87  # <CJK>
-0x4C5D  0x7085  # <CJK>
-0x4C5E  0x70F1  # <CJK>
-0x4C5F  0x749F  # <CJK>
-0x4C60  0x74A5  # <CJK>
-0x4C61  0x74CA  # <CJK>
-0x4C62  0x75D9  # <CJK>
-0x4C63  0x786C  # <CJK>
-0x4C64  0x78EC  # <CJK>
-0x4C65  0x7ADF  # <CJK>
-0x4C66  0x7AF6  # <CJK>
-0x4C67  0x7D45  # <CJK>
-0x4C68  0x7D93  # <CJK>
-0x4C69  0x8015  # <CJK>
-0x4C6A  0x803F  # <CJK>
-0x4C6B  0x811B  # <CJK>
-0x4C6C  0x8396  # <CJK>
-0x4C6D  0x8B66  # <CJK>
-0x4C6E  0x8F15  # <CJK>
-0x4C6F  0x9015  # <CJK>
-0x4C70  0x93E1  # <CJK>
-0x4C71  0x9803  # <CJK>
-0x4C72  0x9838  # <CJK>
-0x4C73  0x9A5A  # <CJK>
-0x4C74  0x9BE8  # <CJK>
-0x4C75  0x4FC2  # <CJK>
-0x4C76  0x5553  # <CJK>
-0x4C77  0x583A  # <CJK>
-0x4C78  0x5951  # <CJK>
-0x4C79  0x5B63  # <CJK>
-0x4C7A  0x5C46  # <CJK>
-0x4C7B  0x60B8  # <CJK>
-0x4C7C  0x6212  # <CJK>
-0x4C7D  0x6842  # <CJK>
-0x4C7E  0x68B0  # <CJK>
-0x4D21  0x68E8  # <CJK>
-0x4D22  0x6EAA  # <CJK>
-0x4D23  0x754C  # <CJK>
-0x4D24  0x7678  # <CJK>
-0x4D25  0x78CE  # <CJK>
-0x4D26  0x7A3D  # <CJK>
-0x4D27  0x7CFB  # <CJK>
-0x4D28  0x7E6B  # <CJK>
-0x4D29  0x7E7C  # <CJK>
-0x4D2A  0x8A08  # <CJK>
-0x4D2B  0x8AA1  # <CJK>
-0x4D2C  0x8C3F  # <CJK>
-0x4D2D  0x968E  # <CJK>
-0x4D2E  0x9DC4  # <CJK>
-0x4D2F  0x53E4  # <CJK>
-0x4D30  0x53E9  # <CJK>
-0x4D31  0x544A  # <CJK>
-0x4D32  0x5471  # <CJK>
-0x4D33  0x56FA  # <CJK>
-0x4D34  0x59D1  # <CJK>
-0x4D35  0x5B64  # <CJK>
-0x4D36  0x5C3B  # <CJK>
-0x4D37  0x5EAB  # <CJK>
-0x4D38  0x62F7  # <CJK>
-0x4D39  0x6537  # <CJK>
-0x4D3A  0x6545  # <CJK>
-0x4D3B  0x6572  # <CJK>
-0x4D3C  0x66A0  # <CJK>
-0x4D3D  0x67AF  # <CJK>
-0x4D3E  0x69C1  # <CJK>
-0x4D3F  0x6CBD  # <CJK>
-0x4D40  0x75FC  # <CJK>
-0x4D41  0x7690  # <CJK>
-0x4D42  0x777E  # <CJK>
-0x4D43  0x7A3F  # <CJK>
-0x4D44  0x7F94  # <CJK>
-0x4D45  0x8003  # <CJK>
-0x4D46  0x80A1  # <CJK>
-0x4D47  0x818F  # <CJK>
-0x4D48  0x82E6  # <CJK>
-0x4D49  0x82FD  # <CJK>
-0x4D4A  0x83F0  # <CJK>
-0x4D4B  0x85C1  # <CJK>
-0x4D4C  0x8831  # <CJK>
-0x4D4D  0x88B4  # <CJK>
-0x4D4E  0x8AA5  # <CJK>
-0x4D4F  0xF903  # <CJK>
-0x4D50  0x8F9C  # <CJK>
-0x4D51  0x932E  # <CJK>
-0x4D52  0x96C7  # <CJK>
-0x4D53  0x9867  # <CJK>
-0x4D54  0x9AD8  # <CJK>
-0x4D55  0x9F13  # <CJK>
-0x4D56  0x54ED  # <CJK>
-0x4D57  0x659B  # <CJK>
-0x4D58  0x66F2  # <CJK>
-0x4D59  0x688F  # <CJK>
-0x4D5A  0x7A40  # <CJK>
-0x4D5B  0x8C37  # <CJK>
-0x4D5C  0x9D60  # <CJK>
-0x4D5D  0x56F0  # <CJK>
-0x4D5E  0x5764  # <CJK>
-0x4D5F  0x5D11  # <CJK>
-0x4D60  0x6606  # <CJK>
-0x4D61  0x68B1  # <CJK>
-0x4D62  0x68CD  # <CJK>
-0x4D63  0x6EFE  # <CJK>
-0x4D64  0x7428  # <CJK>
-0x4D65  0x889E  # <CJK>
-0x4D66  0x9BE4  # <CJK>
-0x4D67  0x6C68  # <CJK>
-0x4D68  0xF904  # <CJK>
-0x4D69  0x9AA8  # <CJK>
-0x4D6A  0x4F9B  # <CJK>
-0x4D6B  0x516C  # <CJK>
-0x4D6C  0x5171  # <CJK>
-0x4D6D  0x529F  # <CJK>
-0x4D6E  0x5B54  # <CJK>
-0x4D6F  0x5DE5  # <CJK>
-0x4D70  0x6050  # <CJK>
-0x4D71  0x606D  # <CJK>
-0x4D72  0x62F1  # <CJK>
-0x4D73  0x63A7  # <CJK>
-0x4D74  0x653B  # <CJK>
-0x4D75  0x73D9  # <CJK>
-0x4D76  0x7A7A  # <CJK>
-0x4D77  0x86A3  # <CJK>
-0x4D78  0x8CA2  # <CJK>
-0x4D79  0x978F  # <CJK>
-0x4D7A  0x4E32  # <CJK>
-0x4D7B  0x5BE1  # <CJK>
-0x4D7C  0x6208  # <CJK>
-0x4D7D  0x679C  # <CJK>
-0x4D7E  0x74DC  # <CJK>
-0x4E21  0x79D1  # <CJK>
-0x4E22  0x83D3  # <CJK>
-0x4E23  0x8A87  # <CJK>
-0x4E24  0x8AB2  # <CJK>
-0x4E25  0x8DE8  # <CJK>
-0x4E26  0x904E  # <CJK>
-0x4E27  0x934B  # <CJK>
-0x4E28  0x9846  # <CJK>
-0x4E29  0x5ED3  # <CJK>
-0x4E2A  0x69E8  # <CJK>
-0x4E2B  0x85FF  # <CJK>
-0x4E2C  0x90ED  # <CJK>
-0x4E2D  0xF905  # <CJK>
-0x4E2E  0x51A0  # <CJK>
-0x4E2F  0x5B98  # <CJK>
-0x4E30  0x5BEC  # <CJK>
-0x4E31  0x6163  # <CJK>
-0x4E32  0x68FA  # <CJK>
-0x4E33  0x6B3E  # <CJK>
-0x4E34  0x704C  # <CJK>
-0x4E35  0x742F  # <CJK>
-0x4E36  0x74D8  # <CJK>
-0x4E37  0x7BA1  # <CJK>
-0x4E38  0x7F50  # <CJK>
-0x4E39  0x83C5  # <CJK>
-0x4E3A  0x89C0  # <CJK>
-0x4E3B  0x8CAB  # <CJK>
-0x4E3C  0x95DC  # <CJK>
-0x4E3D  0x9928  # <CJK>
-0x4E3E  0x522E  # <CJK>
-0x4E3F  0x605D  # <CJK>
-0x4E40  0x62EC  # <CJK>
-0x4E41  0x9002  # <CJK>
-0x4E42  0x4F8A  # <CJK>
-0x4E43  0x5149  # <CJK>
-0x4E44  0x5321  # <CJK>
-0x4E45  0x58D9  # <CJK>
-0x4E46  0x5EE3  # <CJK>
-0x4E47  0x66E0  # <CJK>
-0x4E48  0x6D38  # <CJK>
-0x4E49  0x709A  # <CJK>
-0x4E4A  0x72C2  # <CJK>
-0x4E4B  0x73D6  # <CJK>
-0x4E4C  0x7B50  # <CJK>
-0x4E4D  0x80F1  # <CJK>
-0x4E4E  0x945B  # <CJK>
-0x4E4F  0x5366  # <CJK>
-0x4E50  0x639B  # <CJK>
-0x4E51  0x7F6B  # <CJK>
-0x4E52  0x4E56  # <CJK>
-0x4E53  0x5080  # <CJK>
-0x4E54  0x584A  # <CJK>
-0x4E55  0x58DE  # <CJK>
-0x4E56  0x602A  # <CJK>
-0x4E57  0x6127  # <CJK>
-0x4E58  0x62D0  # <CJK>
-0x4E59  0x69D0  # <CJK>
-0x4E5A  0x9B41  # <CJK>
-0x4E5B  0x5B8F  # <CJK>
-0x4E5C  0x7D18  # <CJK>
-0x4E5D  0x80B1  # <CJK>
-0x4E5E  0x8F5F  # <CJK>
-0x4E5F  0x4EA4  # <CJK>
-0x4E60  0x50D1  # <CJK>
-0x4E61  0x54AC  # <CJK>
-0x4E62  0x55AC  # <CJK>
-0x4E63  0x5B0C  # <CJK>
-0x4E64  0x5DA0  # <CJK>
-0x4E65  0x5DE7  # <CJK>
-0x4E66  0x652A  # <CJK>
-0x4E67  0x654E  # <CJK>
-0x4E68  0x6821  # <CJK>
-0x4E69  0x6A4B  # <CJK>
-0x4E6A  0x72E1  # <CJK>
-0x4E6B  0x768E  # <CJK>
-0x4E6C  0x77EF  # <CJK>
-0x4E6D  0x7D5E  # <CJK>
-0x4E6E  0x7FF9  # <CJK>
-0x4E6F  0x81A0  # <CJK>
-0x4E70  0x854E  # <CJK>
-0x4E71  0x86DF  # <CJK>
-0x4E72  0x8F03  # <CJK>
-0x4E73  0x8F4E  # <CJK>
-0x4E74  0x90CA  # <CJK>
-0x4E75  0x9903  # <CJK>
-0x4E76  0x9A55  # <CJK>
-0x4E77  0x9BAB  # <CJK>
-0x4E78  0x4E18  # <CJK>
-0x4E79  0x4E45  # <CJK>
-0x4E7A  0x4E5D  # <CJK>
-0x4E7B  0x4EC7  # <CJK>
-0x4E7C  0x4FF1  # <CJK>
-0x4E7D  0x5177  # <CJK>
-0x4E7E  0x52FE  # <CJK>
-0x4F21  0x5340  # <CJK>
-0x4F22  0x53E3  # <CJK>
-0x4F23  0x53E5  # <CJK>
-0x4F24  0x548E  # <CJK>
-0x4F25  0x5614  # <CJK>
-0x4F26  0x5775  # <CJK>
-0x4F27  0x57A2  # <CJK>
-0x4F28  0x5BC7  # <CJK>
-0x4F29  0x5D87  # <CJK>
-0x4F2A  0x5ED0  # <CJK>
-0x4F2B  0x61FC  # <CJK>
-0x4F2C  0x62D8  # <CJK>
-0x4F2D  0x6551  # <CJK>
-0x4F2E  0x67B8  # <CJK>
-0x4F2F  0x67E9  # <CJK>
-0x4F30  0x69CB  # <CJK>
-0x4F31  0x6B50  # <CJK>
-0x4F32  0x6BC6  # <CJK>
-0x4F33  0x6BEC  # <CJK>
-0x4F34  0x6C42  # <CJK>
-0x4F35  0x6E9D  # <CJK>
-0x4F36  0x7078  # <CJK>
-0x4F37  0x72D7  # <CJK>
-0x4F38  0x7396  # <CJK>
-0x4F39  0x7403  # <CJK>
-0x4F3A  0x77BF  # <CJK>
-0x4F3B  0x77E9  # <CJK>
-0x4F3C  0x7A76  # <CJK>
-0x4F3D  0x7D7F  # <CJK>
-0x4F3E  0x8009  # <CJK>
-0x4F3F  0x81FC  # <CJK>
-0x4F40  0x8205  # <CJK>
-0x4F41  0x820A  # <CJK>
-0x4F42  0x82DF  # <CJK>
-0x4F43  0x8862  # <CJK>
-0x4F44  0x8B33  # <CJK>
-0x4F45  0x8CFC  # <CJK>
-0x4F46  0x8EC0  # <CJK>
-0x4F47  0x9011  # <CJK>
-0x4F48  0x90B1  # <CJK>
-0x4F49  0x9264  # <CJK>
-0x4F4A  0x92B6  # <CJK>
-0x4F4B  0x99D2  # <CJK>
-0x4F4C  0x9A45  # <CJK>
-0x4F4D  0x9CE9  # <CJK>
-0x4F4E  0x9DD7  # <CJK>
-0x4F4F  0x9F9C  # <CJK>
-0x4F50  0x570B  # <CJK>
-0x4F51  0x5C40  # <CJK>
-0x4F52  0x83CA  # <CJK>
-0x4F53  0x97A0  # <CJK>
-0x4F54  0x97AB  # <CJK>
-0x4F55  0x9EB4  # <CJK>
-0x4F56  0x541B  # <CJK>
-0x4F57  0x7A98  # <CJK>
-0x4F58  0x7FA4  # <CJK>
-0x4F59  0x88D9  # <CJK>
-0x4F5A  0x8ECD  # <CJK>
-0x4F5B  0x90E1  # <CJK>
-0x4F5C  0x5800  # <CJK>
-0x4F5D  0x5C48  # <CJK>
-0x4F5E  0x6398  # <CJK>
-0x4F5F  0x7A9F  # <CJK>
-0x4F60  0x5BAE  # <CJK>
-0x4F61  0x5F13  # <CJK>
-0x4F62  0x7A79  # <CJK>
-0x4F63  0x7AAE  # <CJK>
-0x4F64  0x828E  # <CJK>
-0x4F65  0x8EAC  # <CJK>
-0x4F66  0x5026  # <CJK>
-0x4F67  0x5238  # <CJK>
-0x4F68  0x52F8  # <CJK>
-0x4F69  0x5377  # <CJK>
-0x4F6A  0x5708  # <CJK>
-0x4F6B  0x62F3  # <CJK>
-0x4F6C  0x6372  # <CJK>
-0x4F6D  0x6B0A  # <CJK>
-0x4F6E  0x6DC3  # <CJK>
-0x4F6F  0x7737  # <CJK>
-0x4F70  0x53A5  # <CJK>
-0x4F71  0x7357  # <CJK>
-0x4F72  0x8568  # <CJK>
-0x4F73  0x8E76  # <CJK>
-0x4F74  0x95D5  # <CJK>
-0x4F75  0x673A  # <CJK>
-0x4F76  0x6AC3  # <CJK>
-0x4F77  0x6F70  # <CJK>
-0x4F78  0x8A6D  # <CJK>
-0x4F79  0x8ECC  # <CJK>
-0x4F7A  0x994B  # <CJK>
-0x4F7B  0xF906  # <CJK>
-0x4F7C  0x6677  # <CJK>
-0x4F7D  0x6B78  # <CJK>
-0x4F7E  0x8CB4  # <CJK>
-0x5021  0x9B3C  # <CJK>
-0x5022  0xF907  # <CJK>
-0x5023  0x53EB  # <CJK>
-0x5024  0x572D  # <CJK>
-0x5025  0x594E  # <CJK>
-0x5026  0x63C6  # <CJK>
-0x5027  0x69FB  # <CJK>
-0x5028  0x73EA  # <CJK>
-0x5029  0x7845  # <CJK>
-0x502A  0x7ABA  # <CJK>
-0x502B  0x7AC5  # <CJK>
-0x502C  0x7CFE  # <CJK>
-0x502D  0x8475  # <CJK>
-0x502E  0x898F  # <CJK>
-0x502F  0x8D73  # <CJK>
-0x5030  0x9035  # <CJK>
-0x5031  0x95A8  # <CJK>
-0x5032  0x52FB  # <CJK>
-0x5033  0x5747  # <CJK>
-0x5034  0x7547  # <CJK>
-0x5035  0x7B60  # <CJK>
-0x5036  0x83CC  # <CJK>
-0x5037  0x921E  # <CJK>
-0x5038  0xF908  # <CJK>
-0x5039  0x6A58  # <CJK>
-0x503A  0x514B  # <CJK>
-0x503B  0x524B  # <CJK>
-0x503C  0x5287  # <CJK>
-0x503D  0x621F  # <CJK>
-0x503E  0x68D8  # <CJK>
-0x503F  0x6975  # <CJK>
-0x5040  0x9699  # <CJK>
-0x5041  0x50C5  # <CJK>
-0x5042  0x52A4  # <CJK>
-0x5043  0x52E4  # <CJK>
-0x5044  0x61C3  # <CJK>
-0x5045  0x65A4  # <CJK>
-0x5046  0x6839  # <CJK>
-0x5047  0x69FF  # <CJK>
-0x5048  0x747E  # <CJK>
-0x5049  0x7B4B  # <CJK>
-0x504A  0x82B9  # <CJK>
-0x504B  0x83EB  # <CJK>
-0x504C  0x89B2  # <CJK>
-0x504D  0x8B39  # <CJK>
-0x504E  0x8FD1  # <CJK>
-0x504F  0x9949  # <CJK>
-0x5050  0xF909  # <CJK>
-0x5051  0x4ECA  # <CJK>
-0x5052  0x5997  # <CJK>
-0x5053  0x64D2  # <CJK>
-0x5054  0x6611  # <CJK>
-0x5055  0x6A8E  # <CJK>
-0x5056  0x7434  # <CJK>
-0x5057  0x7981  # <CJK>
-0x5058  0x79BD  # <CJK>
-0x5059  0x82A9  # <CJK>
-0x505A  0x887E  # <CJK>
-0x505B  0x887F  # <CJK>
-0x505C  0x895F  # <CJK>
-0x505D  0xF90A  # <CJK>
-0x505E  0x9326  # <CJK>
-0x505F  0x4F0B  # <CJK>
-0x5060  0x53CA  # <CJK>
-0x5061  0x6025  # <CJK>
-0x5062  0x6271  # <CJK>
-0x5063  0x6C72  # <CJK>
-0x5064  0x7D1A  # <CJK>
-0x5065  0x7D66  # <CJK>
-0x5066  0x4E98  # <CJK>
-0x5067  0x5162  # <CJK>
-0x5068  0x77DC  # <CJK>
-0x5069  0x80AF  # <CJK>
-0x506A  0x4F01  # <CJK>
-0x506B  0x4F0E  # <CJK>
-0x506C  0x5176  # <CJK>
-0x506D  0x5180  # <CJK>
-0x506E  0x55DC  # <CJK>
-0x506F  0x5668  # <CJK>
-0x5070  0x573B  # <CJK>
-0x5071  0x57FA  # <CJK>
-0x5072  0x57FC  # <CJK>
-0x5073  0x5914  # <CJK>
-0x5074  0x5947  # <CJK>
-0x5075  0x5993  # <CJK>
-0x5076  0x5BC4  # <CJK>
-0x5077  0x5C90  # <CJK>
-0x5078  0x5D0E  # <CJK>
-0x5079  0x5DF1  # <CJK>
-0x507A  0x5E7E  # <CJK>
-0x507B  0x5FCC  # <CJK>
-0x507C  0x6280  # <CJK>
-0x507D  0x65D7  # <CJK>
-0x507E  0x65E3  # <CJK>
-0x5121  0x671E  # <CJK>
-0x5122  0x671F  # <CJK>
-0x5123  0x675E  # <CJK>
-0x5124  0x68CB  # <CJK>
-0x5125  0x68C4  # <CJK>
-0x5126  0x6A5F  # <CJK>
-0x5127  0x6B3A  # <CJK>
-0x5128  0x6C23  # <CJK>
-0x5129  0x6C7D  # <CJK>
-0x512A  0x6C82  # <CJK>
-0x512B  0x6DC7  # <CJK>
-0x512C  0x7398  # <CJK>
-0x512D  0x7426  # <CJK>
-0x512E  0x742A  # <CJK>
-0x512F  0x7482  # <CJK>
-0x5130  0x74A3  # <CJK>
-0x5131  0x7578  # <CJK>
-0x5132  0x757F  # <CJK>
-0x5133  0x7881  # <CJK>
-0x5134  0x78EF  # <CJK>
-0x5135  0x7941  # <CJK>
-0x5136  0x7947  # <CJK>
-0x5137  0x7948  # <CJK>
-0x5138  0x797A  # <CJK>
-0x5139  0x7B95  # <CJK>
-0x513A  0x7D00  # <CJK>
-0x513B  0x7DBA  # <CJK>
-0x513C  0x7F88  # <CJK>
-0x513D  0x8006  # <CJK>
-0x513E  0x802D  # <CJK>
-0x513F  0x808C  # <CJK>
-0x5140  0x8A18  # <CJK>
-0x5141  0x8B4F  # <CJK>
-0x5142  0x8C48  # <CJK>
-0x5143  0x8D77  # <CJK>
-0x5144  0x9321  # <CJK>
-0x5145  0x9324  # <CJK>
-0x5146  0x98E2  # <CJK>
-0x5147  0x9951  # <CJK>
-0x5148  0x9A0E  # <CJK>
-0x5149  0x9A0F  # <CJK>
-0x514A  0x9A65  # <CJK>
-0x514B  0x9E92  # <CJK>
-0x514C  0x7DCA  # <CJK>
-0x514D  0x4F76  # <CJK>
-0x514E  0x5409  # <CJK>
-0x514F  0x62EE  # <CJK>
-0x5150  0x6854  # <CJK>
-0x5151  0x91D1  # <CJK>
-0x5152  0x55AB  # <CJK>
-0x5153  0x513A  # <CJK>
-0x5154  0xF90B  # <CJK>
-0x5155  0xF90C  # <CJK>
-0x5156  0x5A1C  # <CJK>
-0x5157  0x61E6  # <CJK>
-0x5158  0xF90D  # <CJK>
-0x5159  0x62CF  # <CJK>
-0x515A  0x62FF  # <CJK>
-0x515B  0xF90E  # <CJK>
-0x515C  0xF90F  # <CJK>
-0x515D  0xF910  # <CJK>
-0x515E  0xF911  # <CJK>
-0x515F  0xF912  # <CJK>
-0x5160  0xF913  # <CJK>
-0x5161  0x90A3  # <CJK>
-0x5162  0xF914  # <CJK>
-0x5163  0xF915  # <CJK>
-0x5164  0xF916  # <CJK>
-0x5165  0xF917  # <CJK>
-0x5166  0xF918  # <CJK>
-0x5167  0x8AFE  # <CJK>
-0x5168  0xF919  # <CJK>
-0x5169  0xF91A  # <CJK>
-0x516A  0xF91B  # <CJK>
-0x516B  0xF91C  # <CJK>
-0x516C  0x6696  # <CJK>
-0x516D  0xF91D  # <CJK>
-0x516E  0x7156  # <CJK>
-0x516F  0xF91E  # <CJK>
-0x5170  0xF91F  # <CJK>
-0x5171  0x96E3  # <CJK>
-0x5172  0xF920  # <CJK>
-0x5173  0x634F  # <CJK>
-0x5174  0x637A  # <CJK>
-0x5175  0x5357  # <CJK>
-0x5176  0xF921  # <CJK>
-0x5177  0x678F  # <CJK>
-0x5178  0x6960  # <CJK>
-0x5179  0x6E73  # <CJK>
-0x517A  0xF922  # <CJK>
-0x517B  0x7537  # <CJK>
-0x517C  0xF923  # <CJK>
-0x517D  0xF924  # <CJK>
-0x517E  0xF925  # <CJK>
-0x5221  0x7D0D  # <CJK>
-0x5222  0xF926  # <CJK>
-0x5223  0xF927  # <CJK>
-0x5224  0x8872  # <CJK>
-0x5225  0x56CA  # <CJK>
-0x5226  0x5A18  # <CJK>
-0x5227  0xF928  # <CJK>
-0x5228  0xF929  # <CJK>
-0x5229  0xF92A  # <CJK>
-0x522A  0xF92B  # <CJK>
-0x522B  0xF92C  # <CJK>
-0x522C  0x4E43  # <CJK>
-0x522D  0xF92D  # <CJK>
-0x522E  0x5167  # <CJK>
-0x522F  0x5948  # <CJK>
-0x5230  0x67F0  # <CJK>
-0x5231  0x8010  # <CJK>
-0x5232  0xF92E  # <CJK>
-0x5233  0x5973  # <CJK>
-0x5234  0x5E74  # <CJK>
-0x5235  0x649A  # <CJK>
-0x5236  0x79CA  # <CJK>
-0x5237  0x5FF5  # <CJK>
-0x5238  0x606C  # <CJK>
-0x5239  0x62C8  # <CJK>
-0x523A  0x637B  # <CJK>
-0x523B  0x5BE7  # <CJK>
-0x523C  0x5BD7  # <CJK>
-0x523D  0x52AA  # <CJK>
-0x523E  0xF92F  # <CJK>
-0x523F  0x5974  # <CJK>
-0x5240  0x5F29  # <CJK>
-0x5241  0x6012  # <CJK>
-0x5242  0xF930  # <CJK>
-0x5243  0xF931  # <CJK>
-0x5244  0xF932  # <CJK>
-0x5245  0x7459  # <CJK>
-0x5246  0xF933  # <CJK>
-0x5247  0xF934  # <CJK>
-0x5248  0xF935  # <CJK>
-0x5249  0xF936  # <CJK>
-0x524A  0xF937  # <CJK>
-0x524B  0xF938  # <CJK>
-0x524C  0x99D1  # <CJK>
-0x524D  0xF939  # <CJK>
-0x524E  0xF93A  # <CJK>
-0x524F  0xF93B  # <CJK>
-0x5250  0xF93C  # <CJK>
-0x5251  0xF93D  # <CJK>
-0x5252  0xF93E  # <CJK>
-0x5253  0xF93F  # <CJK>
-0x5254  0xF940  # <CJK>
-0x5255  0xF941  # <CJK>
-0x5256  0xF942  # <CJK>
-0x5257  0xF943  # <CJK>
-0x5258  0x6FC3  # <CJK>
-0x5259  0xF944  # <CJK>
-0x525A  0xF945  # <CJK>
-0x525B  0x81BF  # <CJK>
-0x525C  0x8FB2  # <CJK>
-0x525D  0x60F1  # <CJK>
-0x525E  0xF946  # <CJK>
-0x525F  0xF947  # <CJK>
-0x5260  0x8166  # <CJK>
-0x5261  0xF948  # <CJK>
-0x5262  0xF949  # <CJK>
-0x5263  0x5C3F  # <CJK>
-0x5264  0xF94A  # <CJK>
-0x5265  0xF94B  # <CJK>
-0x5266  0xF94C  # <CJK>
-0x5267  0xF94D  # <CJK>
-0x5268  0xF94E  # <CJK>
-0x5269  0xF94F  # <CJK>
-0x526A  0xF950  # <CJK>
-0x526B  0xF951  # <CJK>
-0x526C  0x5AE9  # <CJK>
-0x526D  0x8A25  # <CJK>
-0x526E  0x677B  # <CJK>
-0x526F  0x7D10  # <CJK>
-0x5270  0xF952  # <CJK>
-0x5271  0xF953  # <CJK>
-0x5272  0xF954  # <CJK>
-0x5273  0xF955  # <CJK>
-0x5274  0xF956  # <CJK>
-0x5275  0xF957  # <CJK>
-0x5276  0x80FD  # <CJK>
-0x5277  0xF958  # <CJK>
-0x5278  0xF959  # <CJK>
-0x5279  0x5C3C  # <CJK>
-0x527A  0x6CE5  # <CJK>
-0x527B  0x533F  # <CJK>
-0x527C  0x6EBA  # <CJK>
-0x527D  0x591A  # <CJK>
-0x527E  0x8336  # <CJK>
-0x5321  0x4E39  # <CJK>
-0x5322  0x4EB6  # <CJK>
-0x5323  0x4F46  # <CJK>
-0x5324  0x55AE  # <CJK>
-0x5325  0x5718  # <CJK>
-0x5326  0x58C7  # <CJK>
-0x5327  0x5F56  # <CJK>
-0x5328  0x65B7  # <CJK>
-0x5329  0x65E6  # <CJK>
-0x532A  0x6A80  # <CJK>
-0x532B  0x6BB5  # <CJK>
-0x532C  0x6E4D  # <CJK>
-0x532D  0x77ED  # <CJK>
-0x532E  0x7AEF  # <CJK>
-0x532F  0x7C1E  # <CJK>
-0x5330  0x7DDE  # <CJK>
-0x5331  0x86CB  # <CJK>
-0x5332  0x8892  # <CJK>
-0x5333  0x9132  # <CJK>
-0x5334  0x935B  # <CJK>
-0x5335  0x64BB  # <CJK>
-0x5336  0x6FBE  # <CJK>
-0x5337  0x737A  # <CJK>
-0x5338  0x75B8  # <CJK>
-0x5339  0x9054  # <CJK>
-0x533A  0x5556  # <CJK>
-0x533B  0x574D  # <CJK>
-0x533C  0x61BA  # <CJK>
-0x533D  0x64D4  # <CJK>
-0x533E  0x66C7  # <CJK>
-0x533F  0x6DE1  # <CJK>
-0x5340  0x6E5B  # <CJK>
-0x5341  0x6F6D  # <CJK>
-0x5342  0x6FB9  # <CJK>
-0x5343  0x75F0  # <CJK>
-0x5344  0x8043  # <CJK>
-0x5345  0x81BD  # <CJK>
-0x5346  0x8541  # <CJK>
-0x5347  0x8983  # <CJK>
-0x5348  0x8AC7  # <CJK>
-0x5349  0x8B5A  # <CJK>
-0x534A  0x931F  # <CJK>
-0x534B  0x6C93  # <CJK>
-0x534C  0x7553  # <CJK>
-0x534D  0x7B54  # <CJK>
-0x534E  0x8E0F  # <CJK>
-0x534F  0x905D  # <CJK>
-0x5350  0x5510  # <CJK>
-0x5351  0x5802  # <CJK>
-0x5352  0x5858  # <CJK>
-0x5353  0x5E62  # <CJK>
-0x5354  0x6207  # <CJK>
-0x5355  0x649E  # <CJK>
-0x5356  0x68E0  # <CJK>
-0x5357  0x7576  # <CJK>
-0x5358  0x7CD6  # <CJK>
-0x5359  0x87B3  # <CJK>
-0x535A  0x9EE8  # <CJK>
-0x535B  0x4EE3  # <CJK>
-0x535C  0x5788  # <CJK>
-0x535D  0x576E  # <CJK>
-0x535E  0x5927  # <CJK>
-0x535F  0x5C0D  # <CJK>
-0x5360  0x5CB1  # <CJK>
-0x5361  0x5E36  # <CJK>
-0x5362  0x5F85  # <CJK>
-0x5363  0x6234  # <CJK>
-0x5364  0x64E1  # <CJK>
-0x5365  0x73B3  # <CJK>
-0x5366  0x81FA  # <CJK>
-0x5367  0x888B  # <CJK>
-0x5368  0x8CB8  # <CJK>
-0x5369  0x968A  # <CJK>
-0x536A  0x9EDB  # <CJK>
-0x536B  0x5B85  # <CJK>
-0x536C  0x5FB7  # <CJK>
-0x536D  0x60B3  # <CJK>
-0x536E  0x5012  # <CJK>
-0x536F  0x5200  # <CJK>
-0x5370  0x5230  # <CJK>
-0x5371  0x5716  # <CJK>
-0x5372  0x5835  # <CJK>
-0x5373  0x5857  # <CJK>
-0x5374  0x5C0E  # <CJK>
-0x5375  0x5C60  # <CJK>
-0x5376  0x5CF6  # <CJK>
-0x5377  0x5D8B  # <CJK>
-0x5378  0x5EA6  # <CJK>
-0x5379  0x5F92  # <CJK>
-0x537A  0x60BC  # <CJK>
-0x537B  0x6311  # <CJK>
-0x537C  0x6389  # <CJK>
-0x537D  0x6417  # <CJK>
-0x537E  0x6843  # <CJK>
-0x5421  0x68F9  # <CJK>
-0x5422  0x6AC2  # <CJK>
-0x5423  0x6DD8  # <CJK>
-0x5424  0x6E21  # <CJK>
-0x5425  0x6ED4  # <CJK>
-0x5426  0x6FE4  # <CJK>
-0x5427  0x71FE  # <CJK>
-0x5428  0x76DC  # <CJK>
-0x5429  0x7779  # <CJK>
-0x542A  0x79B1  # <CJK>
-0x542B  0x7A3B  # <CJK>
-0x542C  0x8404  # <CJK>
-0x542D  0x89A9  # <CJK>
-0x542E  0x8CED  # <CJK>
-0x542F  0x8DF3  # <CJK>
-0x5430  0x8E48  # <CJK>
-0x5431  0x9003  # <CJK>
-0x5432  0x9014  # <CJK>
-0x5433  0x9053  # <CJK>
-0x5434  0x90FD  # <CJK>
-0x5435  0x934D  # <CJK>
-0x5436  0x9676  # <CJK>
-0x5437  0x97DC  # <CJK>
-0x5438  0x6BD2  # <CJK>
-0x5439  0x7006  # <CJK>
-0x543A  0x7258  # <CJK>
-0x543B  0x72A2  # <CJK>
-0x543C  0x7368  # <CJK>
-0x543D  0x7763  # <CJK>
-0x543E  0x79BF  # <CJK>
-0x543F  0x7BE4  # <CJK>
-0x5440  0x7E9B  # <CJK>
-0x5441  0x8B80  # <CJK>
-0x5442  0x58A9  # <CJK>
-0x5443  0x60C7  # <CJK>
-0x5444  0x6566  # <CJK>
-0x5445  0x65FD  # <CJK>
-0x5446  0x66BE  # <CJK>
-0x5447  0x6C8C  # <CJK>
-0x5448  0x711E  # <CJK>
-0x5449  0x71C9  # <CJK>
-0x544A  0x8C5A  # <CJK>
-0x544B  0x9813  # <CJK>
-0x544C  0x4E6D  # <CJK>
-0x544D  0x7A81  # <CJK>
-0x544E  0x4EDD  # <CJK>
-0x544F  0x51AC  # <CJK>
-0x5450  0x51CD  # <CJK>
-0x5451  0x52D5  # <CJK>
-0x5452  0x540C  # <CJK>
-0x5453  0x61A7  # <CJK>
-0x5454  0x6771  # <CJK>
-0x5455  0x6850  # <CJK>
-0x5456  0x68DF  # <CJK>
-0x5457  0x6D1E  # <CJK>
-0x5458  0x6F7C  # <CJK>
-0x5459  0x75BC  # <CJK>
-0x545A  0x77B3  # <CJK>
-0x545B  0x7AE5  # <CJK>
-0x545C  0x80F4  # <CJK>
-0x545D  0x8463  # <CJK>
-0x545E  0x9285  # <CJK>
-0x545F  0x515C  # <CJK>
-0x5460  0x6597  # <CJK>
-0x5461  0x675C  # <CJK>
-0x5462  0x6793  # <CJK>
-0x5463  0x75D8  # <CJK>
-0x5464  0x7AC7  # <CJK>
-0x5465  0x8373  # <CJK>
-0x5466  0xF95A  # <CJK>
-0x5467  0x8C46  # <CJK>
-0x5468  0x9017  # <CJK>
-0x5469  0x982D  # <CJK>
-0x546A  0x5C6F  # <CJK>
-0x546B  0x81C0  # <CJK>
-0x546C  0x829A  # <CJK>
-0x546D  0x9041  # <CJK>
-0x546E  0x906F  # <CJK>
-0x546F  0x920D  # <CJK>
-0x5470  0x5F97  # <CJK>
-0x5471  0x5D9D  # <CJK>
-0x5472  0x6A59  # <CJK>
-0x5473  0x71C8  # <CJK>
-0x5474  0x767B  # <CJK>
-0x5475  0x7B49  # <CJK>
-0x5476  0x85E4  # <CJK>
-0x5477  0x8B04  # <CJK>
-0x5478  0x9127  # <CJK>
-0x5479  0x9A30  # <CJK>
-0x547A  0x5587  # <CJK>
-0x547B  0x61F6  # <CJK>
-0x547C  0xF95B  # <CJK>
-0x547D  0x7669  # <CJK>
-0x547E  0x7F85  # <CJK>
-0x5521  0x863F  # <CJK>
-0x5522  0x87BA  # <CJK>
-0x5523  0x88F8  # <CJK>
-0x5524  0x908F  # <CJK>
-0x5525  0xF95C  # <CJK>
-0x5526  0x6D1B  # <CJK>
-0x5527  0x70D9  # <CJK>
-0x5528  0x73DE  # <CJK>
-0x5529  0x7D61  # <CJK>
-0x552A  0x843D  # <CJK>
-0x552B  0xF95D  # <CJK>
-0x552C  0x916A  # <CJK>
-0x552D  0x99F1  # <CJK>
-0x552E  0xF95E  # <CJK>
-0x552F  0x4E82  # <CJK>
-0x5530  0x5375  # <CJK>
-0x5531  0x6B04  # <CJK>
-0x5532  0x6B12  # <CJK>
-0x5533  0x703E  # <CJK>
-0x5534  0x721B  # <CJK>
-0x5535  0x862D  # <CJK>
-0x5536  0x9E1E  # <CJK>
-0x5537  0x524C  # <CJK>
-0x5538  0x8FA3  # <CJK>
-0x5539  0x5D50  # <CJK>
-0x553A  0x64E5  # <CJK>
-0x553B  0x652C  # <CJK>
-0x553C  0x6B16  # <CJK>
-0x553D  0x6FEB  # <CJK>
-0x553E  0x7C43  # <CJK>
-0x553F  0x7E9C  # <CJK>
-0x5540  0x85CD  # <CJK>
-0x5541  0x8964  # <CJK>
-0x5542  0x89BD  # <CJK>
-0x5543  0x62C9  # <CJK>
-0x5544  0x81D8  # <CJK>
-0x5545  0x881F  # <CJK>
-0x5546  0x5ECA  # <CJK>
-0x5547  0x6717  # <CJK>
-0x5548  0x6D6A  # <CJK>
-0x5549  0x72FC  # <CJK>
-0x554A  0x7405  # <CJK>
-0x554B  0x746F  # <CJK>
-0x554C  0x8782  # <CJK>
-0x554D  0x90DE  # <CJK>
-0x554E  0x4F86  # <CJK>
-0x554F  0x5D0D  # <CJK>
-0x5550  0x5FA0  # <CJK>
-0x5551  0x840A  # <CJK>
-0x5552  0x51B7  # <CJK>
-0x5553  0x63A0  # <CJK>
-0x5554  0x7565  # <CJK>
-0x5555  0x4EAE  # <CJK>
-0x5556  0x5006  # <CJK>
-0x5557  0x5169  # <CJK>
-0x5558  0x51C9  # <CJK>
-0x5559  0x6881  # <CJK>
-0x555A  0x6A11  # <CJK>
-0x555B  0x7CAE  # <CJK>
-0x555C  0x7CB1  # <CJK>
-0x555D  0x7CE7  # <CJK>
-0x555E  0x826F  # <CJK>
-0x555F  0x8AD2  # <CJK>
-0x5560  0x8F1B  # <CJK>
-0x5561  0x91CF  # <CJK>
-0x5562  0x4FB6  # <CJK>
-0x5563  0x5137  # <CJK>
-0x5564  0x52F5  # <CJK>
-0x5565  0x5442  # <CJK>
-0x5566  0x5EEC  # <CJK>
-0x5567  0x616E  # <CJK>
-0x5568  0x623E  # <CJK>
-0x5569  0x65C5  # <CJK>
-0x556A  0x6ADA  # <CJK>
-0x556B  0x6FFE  # <CJK>
-0x556C  0x792A  # <CJK>
-0x556D  0x85DC  # <CJK>
-0x556E  0x8823  # <CJK>
-0x556F  0x95AD  # <CJK>
-0x5570  0x9A62  # <CJK>
-0x5571  0x9A6A  # <CJK>
-0x5572  0x9E97  # <CJK>
-0x5573  0x9ECE  # <CJK>
-0x5574  0x529B  # <CJK>
-0x5575  0x66C6  # <CJK>
-0x5576  0x6B77  # <CJK>
-0x5577  0x701D  # <CJK>
-0x5578  0x792B  # <CJK>
-0x5579  0x8F62  # <CJK>
-0x557A  0x9742  # <CJK>
-0x557B  0x6190  # <CJK>
-0x557C  0x6200  # <CJK>
-0x557D  0x6523  # <CJK>
-0x557E  0x6F23  # <CJK>
-0x5621  0x7149  # <CJK>
-0x5622  0x7489  # <CJK>
-0x5623  0x7DF4  # <CJK>
-0x5624  0x806F  # <CJK>
-0x5625  0x84EE  # <CJK>
-0x5626  0x8F26  # <CJK>
-0x5627  0x9023  # <CJK>
-0x5628  0x934A  # <CJK>
-0x5629  0x51BD  # <CJK>
-0x562A  0x5217  # <CJK>
-0x562B  0x52A3  # <CJK>
-0x562C  0x6D0C  # <CJK>
-0x562D  0x70C8  # <CJK>
-0x562E  0x88C2  # <CJK>
-0x562F  0x5EC9  # <CJK>
-0x5630  0x6582  # <CJK>
-0x5631  0x6BAE  # <CJK>
-0x5632  0x6FC2  # <CJK>
-0x5633  0x7C3E  # <CJK>
-0x5634  0x7375  # <CJK>
-0x5635  0x4EE4  # <CJK>
-0x5636  0x4F36  # <CJK>
-0x5637  0x56F9  # <CJK>
-0x5638  0xF95F  # <CJK>
-0x5639  0x5CBA  # <CJK>
-0x563A  0x5DBA  # <CJK>
-0x563B  0x601C  # <CJK>
-0x563C  0x73B2  # <CJK>
-0x563D  0x7B2D  # <CJK>
-0x563E  0x7F9A  # <CJK>
-0x563F  0x7FCE  # <CJK>
-0x5640  0x8046  # <CJK>
-0x5641  0x901E  # <CJK>
-0x5642  0x9234  # <CJK>
-0x5643  0x96F6  # <CJK>
-0x5644  0x9748  # <CJK>
-0x5645  0x9818  # <CJK>
-0x5646  0x9F61  # <CJK>
-0x5647  0x4F8B  # <CJK>
-0x5648  0x6FA7  # <CJK>
-0x5649  0x79AE  # <CJK>
-0x564A  0x91B4  # <CJK>
-0x564B  0x96B7  # <CJK>
-0x564C  0x52DE  # <CJK>
-0x564D  0xF960  # <CJK>
-0x564E  0x6488  # <CJK>
-0x564F  0x64C4  # <CJK>
-0x5650  0x6AD3  # <CJK>
-0x5651  0x6F5E  # <CJK>
-0x5652  0x7018  # <CJK>
-0x5653  0x7210  # <CJK>
-0x5654  0x76E7  # <CJK>
-0x5655  0x8001  # <CJK>
-0x5656  0x8606  # <CJK>
-0x5657  0x865C  # <CJK>
-0x5658  0x8DEF  # <CJK>
-0x5659  0x8F05  # <CJK>
-0x565A  0x9732  # <CJK>
-0x565B  0x9B6F  # <CJK>
-0x565C  0x9DFA  # <CJK>
-0x565D  0x9E75  # <CJK>
-0x565E  0x788C  # <CJK>
-0x565F  0x797F  # <CJK>
-0x5660  0x7DA0  # <CJK>
-0x5661  0x83C9  # <CJK>
-0x5662  0x9304  # <CJK>
-0x5663  0x9E7F  # <CJK>
-0x5664  0x9E93  # <CJK>
-0x5665  0x8AD6  # <CJK>
-0x5666  0x58DF  # <CJK>
-0x5667  0x5F04  # <CJK>
-0x5668  0x6727  # <CJK>
-0x5669  0x7027  # <CJK>
-0x566A  0x74CF  # <CJK>
-0x566B  0x7C60  # <CJK>
-0x566C  0x807E  # <CJK>
-0x566D  0x5121  # <CJK>
-0x566E  0x7028  # <CJK>
-0x566F  0x7262  # <CJK>
-0x5670  0x78CA  # <CJK>
-0x5671  0x8CC2  # <CJK>
-0x5672  0x8CDA  # <CJK>
-0x5673  0x8CF4  # <CJK>
-0x5674  0x96F7  # <CJK>
-0x5675  0x4E86  # <CJK>
-0x5676  0x50DA  # <CJK>
-0x5677  0x5BEE  # <CJK>
-0x5678  0x5ED6  # <CJK>
-0x5679  0x6599  # <CJK>
-0x567A  0x71CE  # <CJK>
-0x567B  0x7642  # <CJK>
-0x567C  0x77AD  # <CJK>
-0x567D  0x804A  # <CJK>
-0x567E  0x84FC  # <CJK>
-0x5721  0x907C  # <CJK>
-0x5722  0x9B27  # <CJK>
-0x5723  0x9F8D  # <CJK>
-0x5724  0x58D8  # <CJK>
-0x5725  0x5A41  # <CJK>
-0x5726  0x5C62  # <CJK>
-0x5727  0x6A13  # <CJK>
-0x5728  0x6DDA  # <CJK>
-0x5729  0x6F0F  # <CJK>
-0x572A  0x763B  # <CJK>
-0x572B  0x7D2F  # <CJK>
-0x572C  0x7E37  # <CJK>
-0x572D  0x851E  # <CJK>
-0x572E  0x8938  # <CJK>
-0x572F  0x93E4  # <CJK>
-0x5730  0x964B  # <CJK>
-0x5731  0x5289  # <CJK>
-0x5732  0x65D2  # <CJK>
-0x5733  0x67F3  # <CJK>
-0x5734  0x69B4  # <CJK>
-0x5735  0x6D41  # <CJK>
-0x5736  0x6E9C  # <CJK>
-0x5737  0x700F  # <CJK>
-0x5738  0x7409  # <CJK>
-0x5739  0x7460  # <CJK>
-0x573A  0x7559  # <CJK>
-0x573B  0x7624  # <CJK>
-0x573C  0x786B  # <CJK>
-0x573D  0x8B2C  # <CJK>
-0x573E  0x985E  # <CJK>
-0x573F  0x516D  # <CJK>
-0x5740  0x622E  # <CJK>
-0x5741  0x9678  # <CJK>
-0x5742  0x4F96  # <CJK>
-0x5743  0x502B  # <CJK>
-0x5744  0x5D19  # <CJK>
-0x5745  0x6DEA  # <CJK>
-0x5746  0x7DB8  # <CJK>
-0x5747  0x8F2A  # <CJK>
-0x5748  0x5F8B  # <CJK>
-0x5749  0x6144  # <CJK>
-0x574A  0x6817  # <CJK>
-0x574B  0xF961  # <CJK>
-0x574C  0x9686  # <CJK>
-0x574D  0x52D2  # <CJK>
-0x574E  0x808B  # <CJK>
-0x574F  0x51DC  # <CJK>
-0x5750  0x51CC  # <CJK>
-0x5751  0x695E  # <CJK>
-0x5752  0x7A1C  # <CJK>
-0x5753  0x7DBE  # <CJK>
-0x5754  0x83F1  # <CJK>
-0x5755  0x9675  # <CJK>
-0x5756  0x4FDA  # <CJK>
-0x5757  0x5229  # <CJK>
-0x5758  0x5398  # <CJK>
-0x5759  0x540F  # <CJK>
-0x575A  0x550E  # <CJK>
-0x575B  0x5C65  # <CJK>
-0x575C  0x60A7  # <CJK>
-0x575D  0x674E  # <CJK>
-0x575E  0x68A8  # <CJK>
-0x575F  0x6D6C  # <CJK>
-0x5760  0x7281  # <CJK>
-0x5761  0x72F8  # <CJK>
-0x5762  0x7406  # <CJK>
-0x5763  0x7483  # <CJK>
-0x5764  0xF962  # <CJK>
-0x5765  0x75E2  # <CJK>
-0x5766  0x7C6C  # <CJK>
-0x5767  0x7F79  # <CJK>
-0x5768  0x7FB8  # <CJK>
-0x5769  0x8389  # <CJK>
-0x576A  0x88CF  # <CJK>
-0x576B  0x88E1  # <CJK>
-0x576C  0x91CC  # <CJK>
-0x576D  0x91D0  # <CJK>
-0x576E  0x96E2  # <CJK>
-0x576F  0x9BC9  # <CJK>
-0x5770  0x541D  # <CJK>
-0x5771  0x6F7E  # <CJK>
-0x5772  0x71D0  # <CJK>
-0x5773  0x7498  # <CJK>
-0x5774  0x85FA  # <CJK>
-0x5775  0x8EAA  # <CJK>
-0x5776  0x96A3  # <CJK>
-0x5777  0x9C57  # <CJK>
-0x5778  0x9E9F  # <CJK>
-0x5779  0x6797  # <CJK>
-0x577A  0x6DCB  # <CJK>
-0x577B  0x7433  # <CJK>
-0x577C  0x81E8  # <CJK>
-0x577D  0x9716  # <CJK>
-0x577E  0x782C  # <CJK>
-0x5821  0x7ACB  # <CJK>
-0x5822  0x7B20  # <CJK>
-0x5823  0x7C92  # <CJK>
-0x5824  0x6469  # <CJK>
-0x5825  0x746A  # <CJK>
-0x5826  0x75F2  # <CJK>
-0x5827  0x78BC  # <CJK>
-0x5828  0x78E8  # <CJK>
-0x5829  0x99AC  # <CJK>
-0x582A  0x9B54  # <CJK>
-0x582B  0x9EBB  # <CJK>
-0x582C  0x5BDE  # <CJK>
-0x582D  0x5E55  # <CJK>
-0x582E  0x6F20  # <CJK>
-0x582F  0x819C  # <CJK>
-0x5830  0x83AB  # <CJK>
-0x5831  0x9088  # <CJK>
-0x5832  0x4E07  # <CJK>
-0x5833  0x534D  # <CJK>
-0x5834  0x5A29  # <CJK>
-0x5835  0x5DD2  # <CJK>
-0x5836  0x5F4E  # <CJK>
-0x5837  0x6162  # <CJK>
-0x5838  0x633D  # <CJK>
-0x5839  0x6669  # <CJK>
-0x583A  0x66FC  # <CJK>
-0x583B  0x6EFF  # <CJK>
-0x583C  0x6F2B  # <CJK>
-0x583D  0x7063  # <CJK>
-0x583E  0x779E  # <CJK>
-0x583F  0x842C  # <CJK>
-0x5840  0x8513  # <CJK>
-0x5841  0x883B  # <CJK>
-0x5842  0x8F13  # <CJK>
-0x5843  0x9945  # <CJK>
-0x5844  0x9C3B  # <CJK>
-0x5845  0x551C  # <CJK>
-0x5846  0x62B9  # <CJK>
-0x5847  0x672B  # <CJK>
-0x5848  0x6CAB  # <CJK>
-0x5849  0x8309  # <CJK>
-0x584A  0x896A  # <CJK>
-0x584B  0x977A  # <CJK>
-0x584C  0x4EA1  # <CJK>
-0x584D  0x5984  # <CJK>
-0x584E  0x5FD8  # <CJK>
-0x584F  0x5FD9  # <CJK>
-0x5850  0x671B  # <CJK>
-0x5851  0x7DB2  # <CJK>
-0x5852  0x7F54  # <CJK>
-0x5853  0x8292  # <CJK>
-0x5854  0x832B  # <CJK>
-0x5855  0x83BD  # <CJK>
-0x5856  0x8F1E  # <CJK>
-0x5857  0x9099  # <CJK>
-0x5858  0x57CB  # <CJK>
-0x5859  0x59B9  # <CJK>
-0x585A  0x5A92  # <CJK>
-0x585B  0x5BD0  # <CJK>
-0x585C  0x6627  # <CJK>
-0x585D  0x679A  # <CJK>
-0x585E  0x6885  # <CJK>
-0x585F  0x6BCF  # <CJK>
-0x5860  0x7164  # <CJK>
-0x5861  0x7F75  # <CJK>
-0x5862  0x8CB7  # <CJK>
-0x5863  0x8CE3  # <CJK>
-0x5864  0x9081  # <CJK>
-0x5865  0x9B45  # <CJK>
-0x5866  0x8108  # <CJK>
-0x5867  0x8C8A  # <CJK>
-0x5868  0x964C  # <CJK>
-0x5869  0x9A40  # <CJK>
-0x586A  0x9EA5  # <CJK>
-0x586B  0x5B5F  # <CJK>
-0x586C  0x6C13  # <CJK>
-0x586D  0x731B  # <CJK>
-0x586E  0x76F2  # <CJK>
-0x586F  0x76DF  # <CJK>
-0x5870  0x840C  # <CJK>
-0x5871  0x51AA  # <CJK>
-0x5872  0x8993  # <CJK>
-0x5873  0x514D  # <CJK>
-0x5874  0x5195  # <CJK>
-0x5875  0x52C9  # <CJK>
-0x5876  0x68C9  # <CJK>
-0x5877  0x6C94  # <CJK>
-0x5878  0x7704  # <CJK>
-0x5879  0x7720  # <CJK>
-0x587A  0x7DBF  # <CJK>
-0x587B  0x7DEC  # <CJK>
-0x587C  0x9762  # <CJK>
-0x587D  0x9EB5  # <CJK>
-0x587E  0x6EC5  # <CJK>
-0x5921  0x8511  # <CJK>
-0x5922  0x51A5  # <CJK>
-0x5923  0x540D  # <CJK>
-0x5924  0x547D  # <CJK>
-0x5925  0x660E  # <CJK>
-0x5926  0x669D  # <CJK>
-0x5927  0x6927  # <CJK>
-0x5928  0x6E9F  # <CJK>
-0x5929  0x76BF  # <CJK>
-0x592A  0x7791  # <CJK>
-0x592B  0x8317  # <CJK>
-0x592C  0x84C2  # <CJK>
-0x592D  0x879F  # <CJK>
-0x592E  0x9169  # <CJK>
-0x592F  0x9298  # <CJK>
-0x5930  0x9CF4  # <CJK>
-0x5931  0x8882  # <CJK>
-0x5932  0x4FAE  # <CJK>
-0x5933  0x5192  # <CJK>
-0x5934  0x52DF  # <CJK>
-0x5935  0x59C6  # <CJK>
-0x5936  0x5E3D  # <CJK>
-0x5937  0x6155  # <CJK>
-0x5938  0x6478  # <CJK>
-0x5939  0x6479  # <CJK>
-0x593A  0x66AE  # <CJK>
-0x593B  0x67D0  # <CJK>
-0x593C  0x6A21  # <CJK>
-0x593D  0x6BCD  # <CJK>
-0x593E  0x6BDB  # <CJK>
-0x593F  0x725F  # <CJK>
-0x5940  0x7261  # <CJK>
-0x5941  0x7441  # <CJK>
-0x5942  0x7738  # <CJK>
-0x5943  0x77DB  # <CJK>
-0x5944  0x8017  # <CJK>
-0x5945  0x82BC  # <CJK>
-0x5946  0x8305  # <CJK>
-0x5947  0x8B00  # <CJK>
-0x5948  0x8B28  # <CJK>
-0x5949  0x8C8C  # <CJK>
-0x594A  0x6728  # <CJK>
-0x594B  0x6C90  # <CJK>
-0x594C  0x7267  # <CJK>
-0x594D  0x76EE  # <CJK>
-0x594E  0x7766  # <CJK>
-0x594F  0x7A46  # <CJK>
-0x5950  0x9DA9  # <CJK>
-0x5951  0x6B7F  # <CJK>
-0x5952  0x6C92  # <CJK>
-0x5953  0x5922  # <CJK>
-0x5954  0x6726  # <CJK>
-0x5955  0x8499  # <CJK>
-0x5956  0x536F  # <CJK>
-0x5957  0x5893  # <CJK>
-0x5958  0x5999  # <CJK>
-0x5959  0x5EDF  # <CJK>
-0x595A  0x63CF  # <CJK>
-0x595B  0x6634  # <CJK>
-0x595C  0x6773  # <CJK>
-0x595D  0x6E3A  # <CJK>
-0x595E  0x732B  # <CJK>
-0x595F  0x7AD7  # <CJK>
-0x5960  0x82D7  # <CJK>
-0x5961  0x9328  # <CJK>
-0x5962  0x52D9  # <CJK>
-0x5963  0x5DEB  # <CJK>
-0x5964  0x61AE  # <CJK>
-0x5965  0x61CB  # <CJK>
-0x5966  0x620A  # <CJK>
-0x5967  0x62C7  # <CJK>
-0x5968  0x64AB  # <CJK>
-0x5969  0x65E0  # <CJK>
-0x596A  0x6959  # <CJK>
-0x596B  0x6B66  # <CJK>
-0x596C  0x6BCB  # <CJK>
-0x596D  0x7121  # <CJK>
-0x596E  0x73F7  # <CJK>
-0x596F  0x755D  # <CJK>
-0x5970  0x7E46  # <CJK>
-0x5971  0x821E  # <CJK>
-0x5972  0x8302  # <CJK>
-0x5973  0x856A  # <CJK>
-0x5974  0x8AA3  # <CJK>
-0x5975  0x8CBF  # <CJK>
-0x5976  0x9727  # <CJK>
-0x5977  0x9D61  # <CJK>
-0x5978  0x58A8  # <CJK>
-0x5979  0x9ED8  # <CJK>
-0x597A  0x5011  # <CJK>
-0x597B  0x520E  # <CJK>
-0x597C  0x543B  # <CJK>
-0x597D  0x554F  # <CJK>
-0x597E  0x6587  # <CJK>
-0x5A21  0x6C76  # <CJK>
-0x5A22  0x7D0A  # <CJK>
-0x5A23  0x7D0B  # <CJK>
-0x5A24  0x805E  # <CJK>
-0x5A25  0x868A  # <CJK>
-0x5A26  0x9580  # <CJK>
-0x5A27  0x96EF  # <CJK>
-0x5A28  0x52FF  # <CJK>
-0x5A29  0x6C95  # <CJK>
-0x5A2A  0x7269  # <CJK>
-0x5A2B  0x5473  # <CJK>
-0x5A2C  0x5A9A  # <CJK>
-0x5A2D  0x5C3E  # <CJK>
-0x5A2E  0x5D4B  # <CJK>
-0x5A2F  0x5F4C  # <CJK>
-0x5A30  0x5FAE  # <CJK>
-0x5A31  0x672A  # <CJK>
-0x5A32  0x68B6  # <CJK>
-0x5A33  0x6963  # <CJK>
-0x5A34  0x6E3C  # <CJK>
-0x5A35  0x6E44  # <CJK>
-0x5A36  0x7709  # <CJK>
-0x5A37  0x7C73  # <CJK>
-0x5A38  0x7F8E  # <CJK>
-0x5A39  0x8587  # <CJK>
-0x5A3A  0x8B0E  # <CJK>
-0x5A3B  0x8FF7  # <CJK>
-0x5A3C  0x9761  # <CJK>
-0x5A3D  0x9EF4  # <CJK>
-0x5A3E  0x5CB7  # <CJK>
-0x5A3F  0x60B6  # <CJK>
-0x5A40  0x610D  # <CJK>
-0x5A41  0x61AB  # <CJK>
-0x5A42  0x654F  # <CJK>
-0x5A43  0x65FB  # <CJK>
-0x5A44  0x65FC  # <CJK>
-0x5A45  0x6C11  # <CJK>
-0x5A46  0x6CEF  # <CJK>
-0x5A47  0x739F  # <CJK>
-0x5A48  0x73C9  # <CJK>
-0x5A49  0x7DE1  # <CJK>
-0x5A4A  0x9594  # <CJK>
-0x5A4B  0x5BC6  # <CJK>
-0x5A4C  0x871C  # <CJK>
-0x5A4D  0x8B10  # <CJK>
-0x5A4E  0x525D  # <CJK>
-0x5A4F  0x535A  # <CJK>
-0x5A50  0x62CD  # <CJK>
-0x5A51  0x640F  # <CJK>
-0x5A52  0x64B2  # <CJK>
-0x5A53  0x6734  # <CJK>
-0x5A54  0x6A38  # <CJK>
-0x5A55  0x6CCA  # <CJK>
-0x5A56  0x73C0  # <CJK>
-0x5A57  0x749E  # <CJK>
-0x5A58  0x7B94  # <CJK>
-0x5A59  0x7C95  # <CJK>
-0x5A5A  0x7E1B  # <CJK>
-0x5A5B  0x818A  # <CJK>
-0x5A5C  0x8236  # <CJK>
-0x5A5D  0x8584  # <CJK>
-0x5A5E  0x8FEB  # <CJK>
-0x5A5F  0x96F9  # <CJK>
-0x5A60  0x99C1  # <CJK>
-0x5A61  0x4F34  # <CJK>
-0x5A62  0x534A  # <CJK>
-0x5A63  0x53CD  # <CJK>
-0x5A64  0x53DB  # <CJK>
-0x5A65  0x62CC  # <CJK>
-0x5A66  0x642C  # <CJK>
-0x5A67  0x6500  # <CJK>
-0x5A68  0x6591  # <CJK>
-0x5A69  0x69C3  # <CJK>
-0x5A6A  0x6CEE  # <CJK>
-0x5A6B  0x6F58  # <CJK>
-0x5A6C  0x73ED  # <CJK>
-0x5A6D  0x7554  # <CJK>
-0x5A6E  0x7622  # <CJK>
-0x5A6F  0x76E4  # <CJK>
-0x5A70  0x76FC  # <CJK>
-0x5A71  0x78D0  # <CJK>
-0x5A72  0x78FB  # <CJK>
-0x5A73  0x792C  # <CJK>
-0x5A74  0x7D46  # <CJK>
-0x5A75  0x822C  # <CJK>
-0x5A76  0x87E0  # <CJK>
-0x5A77  0x8FD4  # <CJK>
-0x5A78  0x9812  # <CJK>
-0x5A79  0x98EF  # <CJK>
-0x5A7A  0x52C3  # <CJK>
-0x5A7B  0x62D4  # <CJK>
-0x5A7C  0x64A5  # <CJK>
-0x5A7D  0x6E24  # <CJK>
-0x5A7E  0x6F51  # <CJK>
-0x5B21  0x767C  # <CJK>
-0x5B22  0x8DCB  # <CJK>
-0x5B23  0x91B1  # <CJK>
-0x5B24  0x9262  # <CJK>
-0x5B25  0x9AEE  # <CJK>
-0x5B26  0x9B43  # <CJK>
-0x5B27  0x5023  # <CJK>
-0x5B28  0x508D  # <CJK>
-0x5B29  0x574A  # <CJK>
-0x5B2A  0x59A8  # <CJK>
-0x5B2B  0x5C28  # <CJK>
-0x5B2C  0x5E47  # <CJK>
-0x5B2D  0x5F77  # <CJK>
-0x5B2E  0x623F  # <CJK>
-0x5B2F  0x653E  # <CJK>
-0x5B30  0x65B9  # <CJK>
-0x5B31  0x65C1  # <CJK>
-0x5B32  0x6609  # <CJK>
-0x5B33  0x678B  # <CJK>
-0x5B34  0x699C  # <CJK>
-0x5B35  0x6EC2  # <CJK>
-0x5B36  0x78C5  # <CJK>
-0x5B37  0x7D21  # <CJK>
-0x5B38  0x80AA  # <CJK>
-0x5B39  0x8180  # <CJK>
-0x5B3A  0x822B  # <CJK>
-0x5B3B  0x82B3  # <CJK>
-0x5B3C  0x84A1  # <CJK>
-0x5B3D  0x868C  # <CJK>
-0x5B3E  0x8A2A  # <CJK>
-0x5B3F  0x8B17  # <CJK>
-0x5B40  0x90A6  # <CJK>
-0x5B41  0x9632  # <CJK>
-0x5B42  0x9F90  # <CJK>
-0x5B43  0x500D  # <CJK>
-0x5B44  0x4FF3  # <CJK>
-0x5B45  0xF963  # <CJK>
-0x5B46  0x57F9  # <CJK>
-0x5B47  0x5F98  # <CJK>
-0x5B48  0x62DC  # <CJK>
-0x5B49  0x6392  # <CJK>
-0x5B4A  0x676F  # <CJK>
-0x5B4B  0x6E43  # <CJK>
-0x5B4C  0x7119  # <CJK>
-0x5B4D  0x76C3  # <CJK>
-0x5B4E  0x80CC  # <CJK>
-0x5B4F  0x80DA  # <CJK>
-0x5B50  0x88F4  # <CJK>
-0x5B51  0x88F5  # <CJK>
-0x5B52  0x8919  # <CJK>
-0x5B53  0x8CE0  # <CJK>
-0x5B54  0x8F29  # <CJK>
-0x5B55  0x914D  # <CJK>
-0x5B56  0x966A  # <CJK>
-0x5B57  0x4F2F  # <CJK>
-0x5B58  0x4F70  # <CJK>
-0x5B59  0x5E1B  # <CJK>
-0x5B5A  0x67CF  # <CJK>
-0x5B5B  0x6822  # <CJK>
-0x5B5C  0x767D  # <CJK>
-0x5B5D  0x767E  # <CJK>
-0x5B5E  0x9B44  # <CJK>
-0x5B5F  0x5E61  # <CJK>
-0x5B60  0x6A0A  # <CJK>
-0x5B61  0x7169  # <CJK>
-0x5B62  0x71D4  # <CJK>
-0x5B63  0x756A  # <CJK>
-0x5B64  0xF964  # <CJK>
-0x5B65  0x7E41  # <CJK>
-0x5B66  0x8543  # <CJK>
-0x5B67  0x85E9  # <CJK>
-0x5B68  0x98DC  # <CJK>
-0x5B69  0x4F10  # <CJK>
-0x5B6A  0x7B4F  # <CJK>
-0x5B6B  0x7F70  # <CJK>
-0x5B6C  0x95A5  # <CJK>
-0x5B6D  0x51E1  # <CJK>
-0x5B6E  0x5E06  # <CJK>
-0x5B6F  0x68B5  # <CJK>
-0x5B70  0x6C3E  # <CJK>
-0x5B71  0x6C4E  # <CJK>
-0x5B72  0x6CDB  # <CJK>
-0x5B73  0x72AF  # <CJK>
-0x5B74  0x7BC4  # <CJK>
-0x5B75  0x8303  # <CJK>
-0x5B76  0x6CD5  # <CJK>
-0x5B77  0x743A  # <CJK>
-0x5B78  0x50FB  # <CJK>
-0x5B79  0x5288  # <CJK>
-0x5B7A  0x58C1  # <CJK>
-0x5B7B  0x64D8  # <CJK>
-0x5B7C  0x6A97  # <CJK>
-0x5B7D  0x74A7  # <CJK>
-0x5B7E  0x7656  # <CJK>
-0x5C21  0x78A7  # <CJK>
-0x5C22  0x8617  # <CJK>
-0x5C23  0x95E2  # <CJK>
-0x5C24  0x9739  # <CJK>
-0x5C25  0xF965  # <CJK>
-0x5C26  0x535E  # <CJK>
-0x5C27  0x5F01  # <CJK>
-0x5C28  0x8B8A  # <CJK>
-0x5C29  0x8FA8  # <CJK>
-0x5C2A  0x8FAF  # <CJK>
-0x5C2B  0x908A  # <CJK>
-0x5C2C  0x5225  # <CJK>
-0x5C2D  0x77A5  # <CJK>
-0x5C2E  0x9C49  # <CJK>
-0x5C2F  0x9F08  # <CJK>
-0x5C30  0x4E19  # <CJK>
-0x5C31  0x5002  # <CJK>
-0x5C32  0x5175  # <CJK>
-0x5C33  0x5C5B  # <CJK>
-0x5C34  0x5E77  # <CJK>
-0x5C35  0x661E  # <CJK>
-0x5C36  0x663A  # <CJK>
-0x5C37  0x67C4  # <CJK>
-0x5C38  0x68C5  # <CJK>
-0x5C39  0x70B3  # <CJK>
-0x5C3A  0x7501  # <CJK>
-0x5C3B  0x75C5  # <CJK>
-0x5C3C  0x79C9  # <CJK>
-0x5C3D  0x7ADD  # <CJK>
-0x5C3E  0x8F27  # <CJK>
-0x5C3F  0x9920  # <CJK>
-0x5C40  0x9A08  # <CJK>
-0x5C41  0x4FDD  # <CJK>
-0x5C42  0x5821  # <CJK>
-0x5C43  0x5831  # <CJK>
-0x5C44  0x5BF6  # <CJK>
-0x5C45  0x666E  # <CJK>
-0x5C46  0x6B65  # <CJK>
-0x5C47  0x6D11  # <CJK>
-0x5C48  0x6E7A  # <CJK>
-0x5C49  0x6F7D  # <CJK>
-0x5C4A  0x73E4  # <CJK>
-0x5C4B  0x752B  # <CJK>
-0x5C4C  0x83E9  # <CJK>
-0x5C4D  0x88DC  # <CJK>
-0x5C4E  0x8913  # <CJK>
-0x5C4F  0x8B5C  # <CJK>
-0x5C50  0x8F14  # <CJK>
-0x5C51  0x4F0F  # <CJK>
-0x5C52  0x50D5  # <CJK>
-0x5C53  0x5310  # <CJK>
-0x5C54  0x535C  # <CJK>
-0x5C55  0x5B93  # <CJK>
-0x5C56  0x5FA9  # <CJK>
-0x5C57  0x670D  # <CJK>
-0x5C58  0x798F  # <CJK>
-0x5C59  0x8179  # <CJK>
-0x5C5A  0x832F  # <CJK>
-0x5C5B  0x8514  # <CJK>
-0x5C5C  0x8907  # <CJK>
-0x5C5D  0x8986  # <CJK>
-0x5C5E  0x8F39  # <CJK>
-0x5C5F  0x8F3B  # <CJK>
-0x5C60  0x99A5  # <CJK>
-0x5C61  0x9C12  # <CJK>
-0x5C62  0x672C  # <CJK>
-0x5C63  0x4E76  # <CJK>
-0x5C64  0x4FF8  # <CJK>
-0x5C65  0x5949  # <CJK>
-0x5C66  0x5C01  # <CJK>
-0x5C67  0x5CEF  # <CJK>
-0x5C68  0x5CF0  # <CJK>
-0x5C69  0x6367  # <CJK>
-0x5C6A  0x68D2  # <CJK>
-0x5C6B  0x70FD  # <CJK>
-0x5C6C  0x71A2  # <CJK>
-0x5C6D  0x742B  # <CJK>
-0x5C6E  0x7E2B  # <CJK>
-0x5C6F  0x84EC  # <CJK>
-0x5C70  0x8702  # <CJK>
-0x5C71  0x9022  # <CJK>
-0x5C72  0x92D2  # <CJK>
-0x5C73  0x9CF3  # <CJK>
-0x5C74  0x4E0D  # <CJK>
-0x5C75  0x4ED8  # <CJK>
-0x5C76  0x4FEF  # <CJK>
-0x5C77  0x5085  # <CJK>
-0x5C78  0x5256  # <CJK>
-0x5C79  0x526F  # <CJK>
-0x5C7A  0x5426  # <CJK>
-0x5C7B  0x5490  # <CJK>
-0x5C7C  0x57E0  # <CJK>
-0x5C7D  0x592B  # <CJK>
-0x5C7E  0x5A66  # <CJK>
-0x5D21  0x5B5A  # <CJK>
-0x5D22  0x5B75  # <CJK>
-0x5D23  0x5BCC  # <CJK>
-0x5D24  0x5E9C  # <CJK>
-0x5D25  0xF966  # <CJK>
-0x5D26  0x6276  # <CJK>
-0x5D27  0x6577  # <CJK>
-0x5D28  0x65A7  # <CJK>
-0x5D29  0x6D6E  # <CJK>
-0x5D2A  0x6EA5  # <CJK>
-0x5D2B  0x7236  # <CJK>
-0x5D2C  0x7B26  # <CJK>
-0x5D2D  0x7C3F  # <CJK>
-0x5D2E  0x7F36  # <CJK>
-0x5D2F  0x8150  # <CJK>
-0x5D30  0x8151  # <CJK>
-0x5D31  0x819A  # <CJK>
-0x5D32  0x8240  # <CJK>
-0x5D33  0x8299  # <CJK>
-0x5D34  0x83A9  # <CJK>
-0x5D35  0x8A03  # <CJK>
-0x5D36  0x8CA0  # <CJK>
-0x5D37  0x8CE6  # <CJK>
-0x5D38  0x8CFB  # <CJK>
-0x5D39  0x8D74  # <CJK>
-0x5D3A  0x8DBA  # <CJK>
-0x5D3B  0x90E8  # <CJK>
-0x5D3C  0x91DC  # <CJK>
-0x5D3D  0x961C  # <CJK>
-0x5D3E  0x9644  # <CJK>
-0x5D3F  0x99D9  # <CJK>
-0x5D40  0x9CE7  # <CJK>
-0x5D41  0x5317  # <CJK>
-0x5D42  0x5206  # <CJK>
-0x5D43  0x5429  # <CJK>
-0x5D44  0x5674  # <CJK>
-0x5D45  0x58B3  # <CJK>
-0x5D46  0x5954  # <CJK>
-0x5D47  0x596E  # <CJK>
-0x5D48  0x5FFF  # <CJK>
-0x5D49  0x61A4  # <CJK>
-0x5D4A  0x626E  # <CJK>
-0x5D4B  0x6610  # <CJK>
-0x5D4C  0x6C7E  # <CJK>
-0x5D4D  0x711A  # <CJK>
-0x5D4E  0x76C6  # <CJK>
-0x5D4F  0x7C89  # <CJK>
-0x5D50  0x7CDE  # <CJK>
-0x5D51  0x7D1B  # <CJK>
-0x5D52  0x82AC  # <CJK>
-0x5D53  0x8CC1  # <CJK>
-0x5D54  0x96F0  # <CJK>
-0x5D55  0xF967  # <CJK>
-0x5D56  0x4F5B  # <CJK>
-0x5D57  0x5F17  # <CJK>
-0x5D58  0x5F7F  # <CJK>
-0x5D59  0x62C2  # <CJK>
-0x5D5A  0x5D29  # <CJK>
-0x5D5B  0x670B  # <CJK>
-0x5D5C  0x68DA  # <CJK>
-0x5D5D  0x787C  # <CJK>
-0x5D5E  0x7E43  # <CJK>
-0x5D5F  0x9D6C  # <CJK>
-0x5D60  0x4E15  # <CJK>
-0x5D61  0x5099  # <CJK>
-0x5D62  0x5315  # <CJK>
-0x5D63  0x532A  # <CJK>
-0x5D64  0x5351  # <CJK>
-0x5D65  0x5983  # <CJK>
-0x5D66  0x5A62  # <CJK>
-0x5D67  0x5E87  # <CJK>
-0x5D68  0x60B2  # <CJK>
-0x5D69  0x618A  # <CJK>
-0x5D6A  0x6249  # <CJK>
-0x5D6B  0x6279  # <CJK>
-0x5D6C  0x6590  # <CJK>
-0x5D6D  0x6787  # <CJK>
-0x5D6E  0x69A7  # <CJK>
-0x5D6F  0x6BD4  # <CJK>
-0x5D70  0x6BD6  # <CJK>
-0x5D71  0x6BD7  # <CJK>
-0x5D72  0x6BD8  # <CJK>
-0x5D73  0x6CB8  # <CJK>
-0x5D74  0xF968  # <CJK>
-0x5D75  0x7435  # <CJK>
-0x5D76  0x75FA  # <CJK>
-0x5D77  0x7812  # <CJK>
-0x5D78  0x7891  # <CJK>
-0x5D79  0x79D5  # <CJK>
-0x5D7A  0x79D8  # <CJK>
-0x5D7B  0x7C83  # <CJK>
-0x5D7C  0x7DCB  # <CJK>
-0x5D7D  0x7FE1  # <CJK>
-0x5D7E  0x80A5  # <CJK>
-0x5E21  0x813E  # <CJK>
-0x5E22  0x81C2  # <CJK>
-0x5E23  0x83F2  # <CJK>
-0x5E24  0x871A  # <CJK>
-0x5E25  0x88E8  # <CJK>
-0x5E26  0x8AB9  # <CJK>
-0x5E27  0x8B6C  # <CJK>
-0x5E28  0x8CBB  # <CJK>
-0x5E29  0x9119  # <CJK>
-0x5E2A  0x975E  # <CJK>
-0x5E2B  0x98DB  # <CJK>
-0x5E2C  0x9F3B  # <CJK>
-0x5E2D  0x56AC  # <CJK>
-0x5E2E  0x5B2A  # <CJK>
-0x5E2F  0x5F6C  # <CJK>
-0x5E30  0x658C  # <CJK>
-0x5E31  0x6AB3  # <CJK>
-0x5E32  0x6BAF  # <CJK>
-0x5E33  0x6D5C  # <CJK>
-0x5E34  0x6FF1  # <CJK>
-0x5E35  0x7015  # <CJK>
-0x5E36  0x725D  # <CJK>
-0x5E37  0x73AD  # <CJK>
-0x5E38  0x8CA7  # <CJK>
-0x5E39  0x8CD3  # <CJK>
-0x5E3A  0x983B  # <CJK>
-0x5E3B  0x6191  # <CJK>
-0x5E3C  0x6C37  # <CJK>
-0x5E3D  0x8058  # <CJK>
-0x5E3E  0x9A01  # <CJK>
-0x5E3F  0x4E4D  # <CJK>
-0x5E40  0x4E8B  # <CJK>
-0x5E41  0x4E9B  # <CJK>
-0x5E42  0x4ED5  # <CJK>
-0x5E43  0x4F3A  # <CJK>
-0x5E44  0x4F3C  # <CJK>
-0x5E45  0x4F7F  # <CJK>
-0x5E46  0x4FDF  # <CJK>
-0x5E47  0x50FF  # <CJK>
-0x5E48  0x53F2  # <CJK>
-0x5E49  0x53F8  # <CJK>
-0x5E4A  0x5506  # <CJK>
-0x5E4B  0x55E3  # <CJK>
-0x5E4C  0x56DB  # <CJK>
-0x5E4D  0x58EB  # <CJK>
-0x5E4E  0x5962  # <CJK>
-0x5E4F  0x5A11  # <CJK>
-0x5E50  0x5BEB  # <CJK>
-0x5E51  0x5BFA  # <CJK>
-0x5E52  0x5C04  # <CJK>
-0x5E53  0x5DF3  # <CJK>
-0x5E54  0x5E2B  # <CJK>
-0x5E55  0x5F99  # <CJK>
-0x5E56  0x601D  # <CJK>
-0x5E57  0x6368  # <CJK>
-0x5E58  0x659C  # <CJK>
-0x5E59  0x65AF  # <CJK>
-0x5E5A  0x67F6  # <CJK>
-0x5E5B  0x67FB  # <CJK>
-0x5E5C  0x68AD  # <CJK>
-0x5E5D  0x6B7B  # <CJK>
-0x5E5E  0x6C99  # <CJK>
-0x5E5F  0x6CD7  # <CJK>
-0x5E60  0x6E23  # <CJK>
-0x5E61  0x7009  # <CJK>
-0x5E62  0x7345  # <CJK>
-0x5E63  0x7802  # <CJK>
-0x5E64  0x793E  # <CJK>
-0x5E65  0x7940  # <CJK>
-0x5E66  0x7960  # <CJK>
-0x5E67  0x79C1  # <CJK>
-0x5E68  0x7BE9  # <CJK>
-0x5E69  0x7D17  # <CJK>
-0x5E6A  0x7D72  # <CJK>
-0x5E6B  0x8086  # <CJK>
-0x5E6C  0x820D  # <CJK>
-0x5E6D  0x838E  # <CJK>
-0x5E6E  0x84D1  # <CJK>
-0x5E6F  0x86C7  # <CJK>
-0x5E70  0x88DF  # <CJK>
-0x5E71  0x8A50  # <CJK>
-0x5E72  0x8A5E  # <CJK>
-0x5E73  0x8B1D  # <CJK>
-0x5E74  0x8CDC  # <CJK>
-0x5E75  0x8D66  # <CJK>
-0x5E76  0x8FAD  # <CJK>
-0x5E77  0x90AA  # <CJK>
-0x5E78  0x98FC  # <CJK>
-0x5E79  0x99DF  # <CJK>
-0x5E7A  0x9E9D  # <CJK>
-0x5E7B  0x524A  # <CJK>
-0x5E7C  0xF969  # <CJK>
-0x5E7D  0x6714  # <CJK>
-0x5E7E  0xF96A  # <CJK>
-0x5F21  0x5098  # <CJK>
-0x5F22  0x522A  # <CJK>
-0x5F23  0x5C71  # <CJK>
-0x5F24  0x6563  # <CJK>
-0x5F25  0x6C55  # <CJK>
-0x5F26  0x73CA  # <CJK>
-0x5F27  0x7523  # <CJK>
-0x5F28  0x759D  # <CJK>
-0x5F29  0x7B97  # <CJK>
-0x5F2A  0x849C  # <CJK>
-0x5F2B  0x9178  # <CJK>
-0x5F2C  0x9730  # <CJK>
-0x5F2D  0x4E77  # <CJK>
-0x5F2E  0x6492  # <CJK>
-0x5F2F  0x6BBA  # <CJK>
-0x5F30  0x715E  # <CJK>
-0x5F31  0x85A9  # <CJK>
-0x5F32  0x4E09  # <CJK>
-0x5F33  0xF96B  # <CJK>
-0x5F34  0x6749  # <CJK>
-0x5F35  0x68EE  # <CJK>
-0x5F36  0x6E17  # <CJK>
-0x5F37  0x829F  # <CJK>
-0x5F38  0x8518  # <CJK>
-0x5F39  0x886B  # <CJK>
-0x5F3A  0x63F7  # <CJK>
-0x5F3B  0x6F81  # <CJK>
-0x5F3C  0x9212  # <CJK>
-0x5F3D  0x98AF  # <CJK>
-0x5F3E  0x4E0A  # <CJK>
-0x5F3F  0x50B7  # <CJK>
-0x5F40  0x50CF  # <CJK>
-0x5F41  0x511F  # <CJK>
-0x5F42  0x5546  # <CJK>
-0x5F43  0x55AA  # <CJK>
-0x5F44  0x5617  # <CJK>
-0x5F45  0x5B40  # <CJK>
-0x5F46  0x5C19  # <CJK>
-0x5F47  0x5CE0  # <CJK>
-0x5F48  0x5E38  # <CJK>
-0x5F49  0x5E8A  # <CJK>
-0x5F4A  0x5EA0  # <CJK>
-0x5F4B  0x5EC2  # <CJK>
-0x5F4C  0x60F3  # <CJK>
-0x5F4D  0x6851  # <CJK>
-0x5F4E  0x6A61  # <CJK>
-0x5F4F  0x6E58  # <CJK>
-0x5F50  0x723D  # <CJK>
-0x5F51  0x7240  # <CJK>
-0x5F52  0x72C0  # <CJK>
-0x5F53  0x76F8  # <CJK>
-0x5F54  0x7965  # <CJK>
-0x5F55  0x7BB1  # <CJK>
-0x5F56  0x7FD4  # <CJK>
-0x5F57  0x88F3  # <CJK>
-0x5F58  0x89F4  # <CJK>
-0x5F59  0x8A73  # <CJK>
-0x5F5A  0x8C61  # <CJK>
-0x5F5B  0x8CDE  # <CJK>
-0x5F5C  0x971C  # <CJK>
-0x5F5D  0x585E  # <CJK>
-0x5F5E  0x74BD  # <CJK>
-0x5F5F  0x8CFD  # <CJK>
-0x5F60  0x55C7  # <CJK>
-0x5F61  0xF96C  # <CJK>
-0x5F62  0x7A61  # <CJK>
-0x5F63  0x7D22  # <CJK>
-0x5F64  0x8272  # <CJK>
-0x5F65  0x7272  # <CJK>
-0x5F66  0x751F  # <CJK>
-0x5F67  0x7525  # <CJK>
-0x5F68  0xF96D  # <CJK>
-0x5F69  0x7B19  # <CJK>
-0x5F6A  0x5885  # <CJK>
-0x5F6B  0x58FB  # <CJK>
-0x5F6C  0x5DBC  # <CJK>
-0x5F6D  0x5E8F  # <CJK>
-0x5F6E  0x5EB6  # <CJK>
-0x5F6F  0x5F90  # <CJK>
-0x5F70  0x6055  # <CJK>
-0x5F71  0x6292  # <CJK>
-0x5F72  0x637F  # <CJK>
-0x5F73  0x654D  # <CJK>
-0x5F74  0x6691  # <CJK>
-0x5F75  0x66D9  # <CJK>
-0x5F76  0x66F8  # <CJK>
-0x5F77  0x6816  # <CJK>
-0x5F78  0x68F2  # <CJK>
-0x5F79  0x7280  # <CJK>
-0x5F7A  0x745E  # <CJK>
-0x5F7B  0x7B6E  # <CJK>
-0x5F7C  0x7D6E  # <CJK>
-0x5F7D  0x7DD6  # <CJK>
-0x5F7E  0x7F72  # <CJK>
-0x6021  0x80E5  # <CJK>
-0x6022  0x8212  # <CJK>
-0x6023  0x85AF  # <CJK>
-0x6024  0x897F  # <CJK>
-0x6025  0x8A93  # <CJK>
-0x6026  0x901D  # <CJK>
-0x6027  0x92E4  # <CJK>
-0x6028  0x9ECD  # <CJK>
-0x6029  0x9F20  # <CJK>
-0x602A  0x5915  # <CJK>
-0x602B  0x596D  # <CJK>
-0x602C  0x5E2D  # <CJK>
-0x602D  0x60DC  # <CJK>
-0x602E  0x6614  # <CJK>
-0x602F  0x6673  # <CJK>
-0x6030  0x6790  # <CJK>
-0x6031  0x6C50  # <CJK>
-0x6032  0x6DC5  # <CJK>
-0x6033  0x6F5F  # <CJK>
-0x6034  0x77F3  # <CJK>
-0x6035  0x78A9  # <CJK>
-0x6036  0x84C6  # <CJK>
-0x6037  0x91CB  # <CJK>
-0x6038  0x932B  # <CJK>
-0x6039  0x4ED9  # <CJK>
-0x603A  0x50CA  # <CJK>
-0x603B  0x5148  # <CJK>
-0x603C  0x5584  # <CJK>
-0x603D  0x5B0B  # <CJK>
-0x603E  0x5BA3  # <CJK>
-0x603F  0x6247  # <CJK>
-0x6040  0x657E  # <CJK>
-0x6041  0x65CB  # <CJK>
-0x6042  0x6E32  # <CJK>
-0x6043  0x717D  # <CJK>
-0x6044  0x7401  # <CJK>
-0x6045  0x7444  # <CJK>
-0x6046  0x7487  # <CJK>
-0x6047  0x74BF  # <CJK>
-0x6048  0x766C  # <CJK>
-0x6049  0x79AA  # <CJK>
-0x604A  0x7DDA  # <CJK>
-0x604B  0x7E55  # <CJK>
-0x604C  0x7FA8  # <CJK>
-0x604D  0x817A  # <CJK>
-0x604E  0x81B3  # <CJK>
-0x604F  0x8239  # <CJK>
-0x6050  0x861A  # <CJK>
-0x6051  0x87EC  # <CJK>
-0x6052  0x8A75  # <CJK>
-0x6053  0x8DE3  # <CJK>
-0x6054  0x9078  # <CJK>
-0x6055  0x9291  # <CJK>
-0x6056  0x9425  # <CJK>
-0x6057  0x994D  # <CJK>
-0x6058  0x9BAE  # <CJK>
-0x6059  0x5368  # <CJK>
-0x605A  0x5C51  # <CJK>
-0x605B  0x6954  # <CJK>
-0x605C  0x6CC4  # <CJK>
-0x605D  0x6D29  # <CJK>
-0x605E  0x6E2B  # <CJK>
-0x605F  0x820C  # <CJK>
-0x6060  0x859B  # <CJK>
-0x6061  0x893B  # <CJK>
-0x6062  0x8A2D  # <CJK>
-0x6063  0x8AAA  # <CJK>
-0x6064  0x96EA  # <CJK>
-0x6065  0x9F67  # <CJK>
-0x6066  0x5261  # <CJK>
-0x6067  0x66B9  # <CJK>
-0x6068  0x6BB2  # <CJK>
-0x6069  0x7E96  # <CJK>
-0x606A  0x87FE  # <CJK>
-0x606B  0x8D0D  # <CJK>
-0x606C  0x9583  # <CJK>
-0x606D  0x965D  # <CJK>
-0x606E  0x651D  # <CJK>
-0x606F  0x6D89  # <CJK>
-0x6070  0x71EE  # <CJK>
-0x6071  0xF96E  # <CJK>
-0x6072  0x57CE  # <CJK>
-0x6073  0x59D3  # <CJK>
-0x6074  0x5BAC  # <CJK>
-0x6075  0x6027  # <CJK>
-0x6076  0x60FA  # <CJK>
-0x6077  0x6210  # <CJK>
-0x6078  0x661F  # <CJK>
-0x6079  0x665F  # <CJK>
-0x607A  0x7329  # <CJK>
-0x607B  0x73F9  # <CJK>
-0x607C  0x76DB  # <CJK>
-0x607D  0x7701  # <CJK>
-0x607E  0x7B6C  # <CJK>
-0x6121  0x8056  # <CJK>
-0x6122  0x8072  # <CJK>
-0x6123  0x8165  # <CJK>
-0x6124  0x8AA0  # <CJK>
-0x6125  0x9192  # <CJK>
-0x6126  0x4E16  # <CJK>
-0x6127  0x52E2  # <CJK>
-0x6128  0x6B72  # <CJK>
-0x6129  0x6D17  # <CJK>
-0x612A  0x7A05  # <CJK>
-0x612B  0x7B39  # <CJK>
-0x612C  0x7D30  # <CJK>
-0x612D  0xF96F  # <CJK>
-0x612E  0x8CB0  # <CJK>
-0x612F  0x53EC  # <CJK>
-0x6130  0x562F  # <CJK>
-0x6131  0x5851  # <CJK>
-0x6132  0x5BB5  # <CJK>
-0x6133  0x5C0F  # <CJK>
-0x6134  0x5C11  # <CJK>
-0x6135  0x5DE2  # <CJK>
-0x6136  0x6240  # <CJK>
-0x6137  0x6383  # <CJK>
-0x6138  0x6414  # <CJK>
-0x6139  0x662D  # <CJK>
-0x613A  0x68B3  # <CJK>
-0x613B  0x6CBC  # <CJK>
-0x613C  0x6D88  # <CJK>
-0x613D  0x6EAF  # <CJK>
-0x613E  0x701F  # <CJK>
-0x613F  0x70A4  # <CJK>
-0x6140  0x71D2  # <CJK>
-0x6141  0x7526  # <CJK>
-0x6142  0x758F  # <CJK>
-0x6143  0x758E  # <CJK>
-0x6144  0x7619  # <CJK>
-0x6145  0x7B11  # <CJK>
-0x6146  0x7BE0  # <CJK>
-0x6147  0x7C2B  # <CJK>
-0x6148  0x7D20  # <CJK>
-0x6149  0x7D39  # <CJK>
-0x614A  0x852C  # <CJK>
-0x614B  0x856D  # <CJK>
-0x614C  0x8607  # <CJK>
-0x614D  0x8A34  # <CJK>
-0x614E  0x900D  # <CJK>
-0x614F  0x9061  # <CJK>
-0x6150  0x90B5  # <CJK>
-0x6151  0x92B7  # <CJK>
-0x6152  0x97F6  # <CJK>
-0x6153  0x9A37  # <CJK>
-0x6154  0x4FD7  # <CJK>
-0x6155  0x5C6C  # <CJK>
-0x6156  0x675F  # <CJK>
-0x6157  0x6D91  # <CJK>
-0x6158  0x7C9F  # <CJK>
-0x6159  0x7E8C  # <CJK>
-0x615A  0x8B16  # <CJK>
-0x615B  0x8D16  # <CJK>
-0x615C  0x901F  # <CJK>
-0x615D  0x5B6B  # <CJK>
-0x615E  0x5DFD  # <CJK>
-0x615F  0x640D  # <CJK>
-0x6160  0x84C0  # <CJK>
-0x6161  0x905C  # <CJK>
-0x6162  0x98E1  # <CJK>
-0x6163  0x7387  # <CJK>
-0x6164  0x5B8B  # <CJK>
-0x6165  0x609A  # <CJK>
-0x6166  0x677E  # <CJK>
-0x6167  0x6DDE  # <CJK>
-0x6168  0x8A1F  # <CJK>
-0x6169  0x8AA6  # <CJK>
-0x616A  0x9001  # <CJK>
-0x616B  0x980C  # <CJK>
-0x616C  0x5237  # <CJK>
-0x616D  0xF970  # <CJK>
-0x616E  0x7051  # <CJK>
-0x616F  0x788E  # <CJK>
-0x6170  0x9396  # <CJK>
-0x6171  0x8870  # <CJK>
-0x6172  0x91D7  # <CJK>
-0x6173  0x4FEE  # <CJK>
-0x6174  0x53D7  # <CJK>
-0x6175  0x55FD  # <CJK>
-0x6176  0x56DA  # <CJK>
-0x6177  0x5782  # <CJK>
-0x6178  0x58FD  # <CJK>
-0x6179  0x5AC2  # <CJK>
-0x617A  0x5B88  # <CJK>
-0x617B  0x5CAB  # <CJK>
-0x617C  0x5CC0  # <CJK>
-0x617D  0x5E25  # <CJK>
-0x617E  0x6101  # <CJK>
-0x6221  0x620D  # <CJK>
-0x6222  0x624B  # <CJK>
-0x6223  0x6388  # <CJK>
-0x6224  0x641C  # <CJK>
-0x6225  0x6536  # <CJK>
-0x6226  0x6578  # <CJK>
-0x6227  0x6A39  # <CJK>
-0x6228  0x6B8A  # <CJK>
-0x6229  0x6C34  # <CJK>
-0x622A  0x6D19  # <CJK>
-0x622B  0x6F31  # <CJK>
-0x622C  0x71E7  # <CJK>
-0x622D  0x72E9  # <CJK>
-0x622E  0x7378  # <CJK>
-0x622F  0x7407  # <CJK>
-0x6230  0x74B2  # <CJK>
-0x6231  0x7626  # <CJK>
-0x6232  0x7761  # <CJK>
-0x6233  0x79C0  # <CJK>
-0x6234  0x7A57  # <CJK>
-0x6235  0x7AEA  # <CJK>
-0x6236  0x7CB9  # <CJK>
-0x6237  0x7D8F  # <CJK>
-0x6238  0x7DAC  # <CJK>
-0x6239  0x7E61  # <CJK>
-0x623A  0x7F9E  # <CJK>
-0x623B  0x8129  # <CJK>
-0x623C  0x8331  # <CJK>
-0x623D  0x8490  # <CJK>
-0x623E  0x84DA  # <CJK>
-0x623F  0x85EA  # <CJK>
-0x6240  0x8896  # <CJK>
-0x6241  0x8AB0  # <CJK>
-0x6242  0x8B90  # <CJK>
-0x6243  0x8F38  # <CJK>
-0x6244  0x9042  # <CJK>
-0x6245  0x9083  # <CJK>
-0x6246  0x916C  # <CJK>
-0x6247  0x9296  # <CJK>
-0x6248  0x92B9  # <CJK>
-0x6249  0x968B  # <CJK>
-0x624A  0x96A7  # <CJK>
-0x624B  0x96A8  # <CJK>
-0x624C  0x96D6  # <CJK>
-0x624D  0x9700  # <CJK>
-0x624E  0x9808  # <CJK>
-0x624F  0x9996  # <CJK>
-0x6250  0x9AD3  # <CJK>
-0x6251  0x9B1A  # <CJK>
-0x6252  0x53D4  # <CJK>
-0x6253  0x587E  # <CJK>
-0x6254  0x5919  # <CJK>
-0x6255  0x5B70  # <CJK>
-0x6256  0x5BBF  # <CJK>
-0x6257  0x6DD1  # <CJK>
-0x6258  0x6F5A  # <CJK>
-0x6259  0x719F  # <CJK>
-0x625A  0x7421  # <CJK>
-0x625B  0x74B9  # <CJK>
-0x625C  0x8085  # <CJK>
-0x625D  0x83FD  # <CJK>
-0x625E  0x5DE1  # <CJK>
-0x625F  0x5F87  # <CJK>
-0x6260  0x5FAA  # <CJK>
-0x6261  0x6042  # <CJK>
-0x6262  0x65EC  # <CJK>
-0x6263  0x6812  # <CJK>
-0x6264  0x696F  # <CJK>
-0x6265  0x6A53  # <CJK>
-0x6266  0x6B89  # <CJK>
-0x6267  0x6D35  # <CJK>
-0x6268  0x6DF3  # <CJK>
-0x6269  0x73E3  # <CJK>
-0x626A  0x76FE  # <CJK>
-0x626B  0x77AC  # <CJK>
-0x626C  0x7B4D  # <CJK>
-0x626D  0x7D14  # <CJK>
-0x626E  0x8123  # <CJK>
-0x626F  0x821C  # <CJK>
-0x6270  0x8340  # <CJK>
-0x6271  0x84F4  # <CJK>
-0x6272  0x8563  # <CJK>
-0x6273  0x8A62  # <CJK>
-0x6274  0x8AC4  # <CJK>
-0x6275  0x9187  # <CJK>
-0x6276  0x931E  # <CJK>
-0x6277  0x9806  # <CJK>
-0x6278  0x99B4  # <CJK>
-0x6279  0x620C  # <CJK>
-0x627A  0x8853  # <CJK>
-0x627B  0x8FF0  # <CJK>
-0x627C  0x9265  # <CJK>
-0x627D  0x5D07  # <CJK>
-0x627E  0x5D27  # <CJK>
-0x6321  0x5D69  # <CJK>
-0x6322  0x745F  # <CJK>
-0x6323  0x819D  # <CJK>
-0x6324  0x8768  # <CJK>
-0x6325  0x6FD5  # <CJK>
-0x6326  0x62FE  # <CJK>
-0x6327  0x7FD2  # <CJK>
-0x6328  0x8936  # <CJK>
-0x6329  0x8972  # <CJK>
-0x632A  0x4E1E  # <CJK>
-0x632B  0x4E58  # <CJK>
-0x632C  0x50E7  # <CJK>
-0x632D  0x52DD  # <CJK>
-0x632E  0x5347  # <CJK>
-0x632F  0x627F  # <CJK>
-0x6330  0x6607  # <CJK>
-0x6331  0x7E69  # <CJK>
-0x6332  0x8805  # <CJK>
-0x6333  0x965E  # <CJK>
-0x6334  0x4F8D  # <CJK>
-0x6335  0x5319  # <CJK>
-0x6336  0x5636  # <CJK>
-0x6337  0x59CB  # <CJK>
-0x6338  0x5AA4  # <CJK>
-0x6339  0x5C38  # <CJK>
-0x633A  0x5C4E  # <CJK>
-0x633B  0x5C4D  # <CJK>
-0x633C  0x5E02  # <CJK>
-0x633D  0x5F11  # <CJK>
-0x633E  0x6043  # <CJK>
-0x633F  0x65BD  # <CJK>
-0x6340  0x662F  # <CJK>
-0x6341  0x6642  # <CJK>
-0x6342  0x67BE  # <CJK>
-0x6343  0x67F4  # <CJK>
-0x6344  0x731C  # <CJK>
-0x6345  0x77E2  # <CJK>
-0x6346  0x793A  # <CJK>
-0x6347  0x7FC5  # <CJK>
-0x6348  0x8494  # <CJK>
-0x6349  0x84CD  # <CJK>
-0x634A  0x8996  # <CJK>
-0x634B  0x8A66  # <CJK>
-0x634C  0x8A69  # <CJK>
-0x634D  0x8AE1  # <CJK>
-0x634E  0x8C55  # <CJK>
-0x634F  0x8C7A  # <CJK>
-0x6350  0x57F4  # <CJK>
-0x6351  0x5BD4  # <CJK>
-0x6352  0x5F0F  # <CJK>
-0x6353  0x606F  # <CJK>
-0x6354  0x62ED  # <CJK>
-0x6355  0x690D  # <CJK>
-0x6356  0x6B96  # <CJK>
-0x6357  0x6E5C  # <CJK>
-0x6358  0x7184  # <CJK>
-0x6359  0x7BD2  # <CJK>
-0x635A  0x8755  # <CJK>
-0x635B  0x8B58  # <CJK>
-0x635C  0x8EFE  # <CJK>
-0x635D  0x98DF  # <CJK>
-0x635E  0x98FE  # <CJK>
-0x635F  0x4F38  # <CJK>
-0x6360  0x4F81  # <CJK>
-0x6361  0x4FE1  # <CJK>
-0x6362  0x547B  # <CJK>
-0x6363  0x5A20  # <CJK>
-0x6364  0x5BB8  # <CJK>
-0x6365  0x613C  # <CJK>
-0x6366  0x65B0  # <CJK>
-0x6367  0x6668  # <CJK>
-0x6368  0x71FC  # <CJK>
-0x6369  0x7533  # <CJK>
-0x636A  0x795E  # <CJK>
-0x636B  0x7D33  # <CJK>
-0x636C  0x814E  # <CJK>
-0x636D  0x81E3  # <CJK>
-0x636E  0x8398  # <CJK>
-0x636F  0x85AA  # <CJK>
-0x6370  0x85CE  # <CJK>
-0x6371  0x8703  # <CJK>
-0x6372  0x8A0A  # <CJK>
-0x6373  0x8EAB  # <CJK>
-0x6374  0x8F9B  # <CJK>
-0x6375  0xF971  # <CJK>
-0x6376  0x8FC5  # <CJK>
-0x6377  0x5931  # <CJK>
-0x6378  0x5BA4  # <CJK>
-0x6379  0x5BE6  # <CJK>
-0x637A  0x6089  # <CJK>
-0x637B  0x5BE9  # <CJK>
-0x637C  0x5C0B  # <CJK>
-0x637D  0x5FC3  # <CJK>
-0x637E  0x6C81  # <CJK>
-0x6421  0xF972  # <CJK>
-0x6422  0x6DF1  # <CJK>
-0x6423  0x700B  # <CJK>
-0x6424  0x751A  # <CJK>
-0x6425  0x82AF  # <CJK>
-0x6426  0x8AF6  # <CJK>
-0x6427  0x4EC0  # <CJK>
-0x6428  0x5341  # <CJK>
-0x6429  0xF973  # <CJK>
-0x642A  0x96D9  # <CJK>
-0x642B  0x6C0F  # <CJK>
-0x642C  0x4E9E  # <CJK>
-0x642D  0x4FC4  # <CJK>
-0x642E  0x5152  # <CJK>
-0x642F  0x555E  # <CJK>
-0x6430  0x5A25  # <CJK>
-0x6431  0x5CE8  # <CJK>
-0x6432  0x6211  # <CJK>
-0x6433  0x7259  # <CJK>
-0x6434  0x82BD  # <CJK>
-0x6435  0x83AA  # <CJK>
-0x6436  0x86FE  # <CJK>
-0x6437  0x8859  # <CJK>
-0x6438  0x8A1D  # <CJK>
-0x6439  0x963F  # <CJK>
-0x643A  0x96C5  # <CJK>
-0x643B  0x9913  # <CJK>
-0x643C  0x9D09  # <CJK>
-0x643D  0x9D5D  # <CJK>
-0x643E  0x580A  # <CJK>
-0x643F  0x5CB3  # <CJK>
-0x6440  0x5DBD  # <CJK>
-0x6441  0x5E44  # <CJK>
-0x6442  0x60E1  # <CJK>
-0x6443  0x6115  # <CJK>
-0x6444  0x63E1  # <CJK>
-0x6445  0x6A02  # <CJK>
-0x6446  0x6E25  # <CJK>
-0x6447  0x9102  # <CJK>
-0x6448  0x9354  # <CJK>
-0x6449  0x984E  # <CJK>
-0x644A  0x9C10  # <CJK>
-0x644B  0x9F77  # <CJK>
-0x644C  0x5B89  # <CJK>
-0x644D  0x5CB8  # <CJK>
-0x644E  0x6309  # <CJK>
-0x644F  0x664F  # <CJK>
-0x6450  0x6848  # <CJK>
-0x6451  0x773C  # <CJK>
-0x6452  0x96C1  # <CJK>
-0x6453  0x978D  # <CJK>
-0x6454  0x9854  # <CJK>
-0x6455  0x9B9F  # <CJK>
-0x6456  0x65A1  # <CJK>
-0x6457  0x8B01  # <CJK>
-0x6458  0x8ECB  # <CJK>
-0x6459  0x95BC  # <CJK>
-0x645A  0x5535  # <CJK>
-0x645B  0x5CA9  # <CJK>
-0x645C  0x5DD6  # <CJK>
-0x645D  0x5EB5  # <CJK>
-0x645E  0x6697  # <CJK>
-0x645F  0x764C  # <CJK>
-0x6460  0x83F4  # <CJK>
-0x6461  0x95C7  # <CJK>
-0x6462  0x58D3  # <CJK>
-0x6463  0x62BC  # <CJK>
-0x6464  0x72CE  # <CJK>
-0x6465  0x9D28  # <CJK>
-0x6466  0x4EF0  # <CJK>
-0x6467  0x592E  # <CJK>
-0x6468  0x600F  # <CJK>
-0x6469  0x663B  # <CJK>
-0x646A  0x6B83  # <CJK>
-0x646B  0x79E7  # <CJK>
-0x646C  0x9D26  # <CJK>
-0x646D  0x5393  # <CJK>
-0x646E  0x54C0  # <CJK>
-0x646F  0x57C3  # <CJK>
-0x6470  0x5D16  # <CJK>
-0x6471  0x611B  # <CJK>
-0x6472  0x66D6  # <CJK>
-0x6473  0x6DAF  # <CJK>
-0x6474  0x788D  # <CJK>
-0x6475  0x827E  # <CJK>
-0x6476  0x9698  # <CJK>
-0x6477  0x9744  # <CJK>
-0x6478  0x5384  # <CJK>
-0x6479  0x627C  # <CJK>
-0x647A  0x6396  # <CJK>
-0x647B  0x6DB2  # <CJK>
-0x647C  0x7E0A  # <CJK>
-0x647D  0x814B  # <CJK>
-0x647E  0x984D  # <CJK>
-0x6521  0x6AFB  # <CJK>
-0x6522  0x7F4C  # <CJK>
-0x6523  0x9DAF  # <CJK>
-0x6524  0x9E1A  # <CJK>
-0x6525  0x4E5F  # <CJK>
-0x6526  0x503B  # <CJK>
-0x6527  0x51B6  # <CJK>
-0x6528  0x591C  # <CJK>
-0x6529  0x60F9  # <CJK>
-0x652A  0x63F6  # <CJK>
-0x652B  0x6930  # <CJK>
-0x652C  0x723A  # <CJK>
-0x652D  0x8036  # <CJK>
-0x652E  0xF974  # <CJK>
-0x652F  0x91CE  # <CJK>
-0x6530  0x5F31  # <CJK>
-0x6531  0xF975  # <CJK>
-0x6532  0xF976  # <CJK>
-0x6533  0x7D04  # <CJK>
-0x6534  0x82E5  # <CJK>
-0x6535  0x846F  # <CJK>
-0x6536  0x84BB  # <CJK>
-0x6537  0x85E5  # <CJK>
-0x6538  0x8E8D  # <CJK>
-0x6539  0xF977  # <CJK>
-0x653A  0x4F6F  # <CJK>
-0x653B  0xF978  # <CJK>
-0x653C  0xF979  # <CJK>
-0x653D  0x58E4  # <CJK>
-0x653E  0x5B43  # <CJK>
-0x653F  0x6059  # <CJK>
-0x6540  0x63DA  # <CJK>
-0x6541  0x6518  # <CJK>
-0x6542  0x656D  # <CJK>
-0x6543  0x6698  # <CJK>
-0x6544  0xF97A  # <CJK>
-0x6545  0x694A  # <CJK>
-0x6546  0x6A23  # <CJK>
-0x6547  0x6D0B  # <CJK>
-0x6548  0x7001  # <CJK>
-0x6549  0x716C  # <CJK>
-0x654A  0x75D2  # <CJK>
-0x654B  0x760D  # <CJK>
-0x654C  0x79B3  # <CJK>
-0x654D  0x7A70  # <CJK>
-0x654E  0xF97B  # <CJK>
-0x654F  0x7F8A  # <CJK>
-0x6550  0xF97C  # <CJK>
-0x6551  0x8944  # <CJK>
-0x6552  0xF97D  # <CJK>
-0x6553  0x8B93  # <CJK>
-0x6554  0x91C0  # <CJK>
-0x6555  0x967D  # <CJK>
-0x6556  0xF97E  # <CJK>
-0x6557  0x990A  # <CJK>
-0x6558  0x5704  # <CJK>
-0x6559  0x5FA1  # <CJK>
-0x655A  0x65BC  # <CJK>
-0x655B  0x6F01  # <CJK>
-0x655C  0x7600  # <CJK>
-0x655D  0x79A6  # <CJK>
-0x655E  0x8A9E  # <CJK>
-0x655F  0x99AD  # <CJK>
-0x6560  0x9B5A  # <CJK>
-0x6561  0x9F6C  # <CJK>
-0x6562  0x5104  # <CJK>
-0x6563  0x61B6  # <CJK>
-0x6564  0x6291  # <CJK>
-0x6565  0x6A8D  # <CJK>
-0x6566  0x81C6  # <CJK>
-0x6567  0x5043  # <CJK>
-0x6568  0x5830  # <CJK>
-0x6569  0x5F66  # <CJK>
-0x656A  0x7109  # <CJK>
-0x656B  0x8A00  # <CJK>
-0x656C  0x8AFA  # <CJK>
-0x656D  0x5B7C  # <CJK>
-0x656E  0x8616  # <CJK>
-0x656F  0x4FFA  # <CJK>
-0x6570  0x513C  # <CJK>
-0x6571  0x56B4  # <CJK>
-0x6572  0x5944  # <CJK>
-0x6573  0x63A9  # <CJK>
-0x6574  0x6DF9  # <CJK>
-0x6575  0x5DAA  # <CJK>
-0x6576  0x696D  # <CJK>
-0x6577  0x5186  # <CJK>
-0x6578  0x4E88  # <CJK>
-0x6579  0x4F59  # <CJK>
-0x657A  0xF97F  # <CJK>
-0x657B  0xF980  # <CJK>
-0x657C  0xF981  # <CJK>
-0x657D  0x5982  # <CJK>
-0x657E  0xF982  # <CJK>
-0x6621  0xF983  # <CJK>
-0x6622  0x6B5F  # <CJK>
-0x6623  0x6C5D  # <CJK>
-0x6624  0xF984  # <CJK>
-0x6625  0x74B5  # <CJK>
-0x6626  0x7916  # <CJK>
-0x6627  0xF985  # <CJK>
-0x6628  0x8207  # <CJK>
-0x6629  0x8245  # <CJK>
-0x662A  0x8339  # <CJK>
-0x662B  0x8F3F  # <CJK>
-0x662C  0x8F5D  # <CJK>
-0x662D  0xF986  # <CJK>
-0x662E  0x9918  # <CJK>
-0x662F  0xF987  # <CJK>
-0x6630  0xF988  # <CJK>
-0x6631  0xF989  # <CJK>
-0x6632  0x4EA6  # <CJK>
-0x6633  0xF98A  # <CJK>
-0x6634  0x57DF  # <CJK>
-0x6635  0x5F79  # <CJK>
-0x6636  0x6613  # <CJK>
-0x6637  0xF98B  # <CJK>
-0x6638  0xF98C  # <CJK>
-0x6639  0x75AB  # <CJK>
-0x663A  0x7E79  # <CJK>
-0x663B  0x8B6F  # <CJK>
-0x663C  0xF98D  # <CJK>
-0x663D  0x9006  # <CJK>
-0x663E  0x9A5B  # <CJK>
-0x663F  0x56A5  # <CJK>
-0x6640  0x5827  # <CJK>
-0x6641  0x59F8  # <CJK>
-0x6642  0x5A1F  # <CJK>
-0x6643  0x5BB4  # <CJK>
-0x6644  0xF98E  # <CJK>
-0x6645  0x5EF6  # <CJK>
-0x6646  0xF98F  # <CJK>
-0x6647  0xF990  # <CJK>
-0x6648  0x6350  # <CJK>
-0x6649  0x633B  # <CJK>
-0x664A  0xF991  # <CJK>
-0x664B  0x693D  # <CJK>
-0x664C  0x6C87  # <CJK>
-0x664D  0x6CBF  # <CJK>
-0x664E  0x6D8E  # <CJK>
-0x664F  0x6D93  # <CJK>
-0x6650  0x6DF5  # <CJK>
-0x6651  0x6F14  # <CJK>
-0x6652  0xF992  # <CJK>
-0x6653  0x70DF  # <CJK>
-0x6654  0x7136  # <CJK>
-0x6655  0x7159  # <CJK>
-0x6656  0xF993  # <CJK>
-0x6657  0x71C3  # <CJK>
-0x6658  0x71D5  # <CJK>
-0x6659  0xF994  # <CJK>
-0x665A  0x784F  # <CJK>
-0x665B  0x786F  # <CJK>
-0x665C  0xF995  # <CJK>
-0x665D  0x7B75  # <CJK>
-0x665E  0x7DE3  # <CJK>
-0x665F  0xF996  # <CJK>
-0x6660  0x7E2F  # <CJK>
-0x6661  0xF997  # <CJK>
-0x6662  0x884D  # <CJK>
-0x6663  0x8EDF  # <CJK>
-0x6664  0xF998  # <CJK>
-0x6665  0xF999  # <CJK>
-0x6666  0xF99A  # <CJK>
-0x6667  0x925B  # <CJK>
-0x6668  0xF99B  # <CJK>
-0x6669  0x9CF6  # <CJK>
-0x666A  0xF99C  # <CJK>
-0x666B  0xF99D  # <CJK>
-0x666C  0xF99E  # <CJK>
-0x666D  0x6085  # <CJK>
-0x666E  0x6D85  # <CJK>
-0x666F  0xF99F  # <CJK>
-0x6670  0x71B1  # <CJK>
-0x6671  0xF9A0  # <CJK>
-0x6672  0xF9A1  # <CJK>
-0x6673  0x95B1  # <CJK>
-0x6674  0x53AD  # <CJK>
-0x6675  0xF9A2  # <CJK>
-0x6676  0xF9A3  # <CJK>
-0x6677  0xF9A4  # <CJK>
-0x6678  0x67D3  # <CJK>
-0x6679  0xF9A5  # <CJK>
-0x667A  0x708E  # <CJK>
-0x667B  0x7130  # <CJK>
-0x667C  0x7430  # <CJK>
-0x667D  0x8276  # <CJK>
-0x667E  0x82D2  # <CJK>
-0x6721  0xF9A6  # <CJK>
-0x6722  0x95BB  # <CJK>
-0x6723  0x9AE5  # <CJK>
-0x6724  0x9E7D  # <CJK>
-0x6725  0x66C4  # <CJK>
-0x6726  0xF9A7  # <CJK>
-0x6727  0x71C1  # <CJK>
-0x6728  0x8449  # <CJK>
-0x6729  0xF9A8  # <CJK>
-0x672A  0xF9A9  # <CJK>
-0x672B  0x584B  # <CJK>
-0x672C  0xF9AA  # <CJK>
-0x672D  0xF9AB  # <CJK>
-0x672E  0x5DB8  # <CJK>
-0x672F  0x5F71  # <CJK>
-0x6730  0xF9AC  # <CJK>
-0x6731  0x6620  # <CJK>
-0x6732  0x668E  # <CJK>
-0x6733  0x6979  # <CJK>
-0x6734  0x69AE  # <CJK>
-0x6735  0x6C38  # <CJK>
-0x6736  0x6CF3  # <CJK>
-0x6737  0x6E36  # <CJK>
-0x6738  0x6F41  # <CJK>
-0x6739  0x6FDA  # <CJK>
-0x673A  0x701B  # <CJK>
-0x673B  0x702F  # <CJK>
-0x673C  0x7150  # <CJK>
-0x673D  0x71DF  # <CJK>
-0x673E  0x7370  # <CJK>
-0x673F  0xF9AD  # <CJK>
-0x6740  0x745B  # <CJK>
-0x6741  0xF9AE  # <CJK>
-0x6742  0x74D4  # <CJK>
-0x6743  0x76C8  # <CJK>
-0x6744  0x7A4E  # <CJK>
-0x6745  0x7E93  # <CJK>
-0x6746  0xF9AF  # <CJK>
-0x6747  0xF9B0  # <CJK>
-0x6748  0x82F1  # <CJK>
-0x6749  0x8A60  # <CJK>
-0x674A  0x8FCE  # <CJK>
-0x674B  0xF9B1  # <CJK>
-0x674C  0x9348  # <CJK>
-0x674D  0xF9B2  # <CJK>
-0x674E  0x9719  # <CJK>
-0x674F  0xF9B3  # <CJK>
-0x6750  0xF9B4  # <CJK>
-0x6751  0x4E42  # <CJK>
-0x6752  0x502A  # <CJK>
-0x6753  0xF9B5  # <CJK>
-0x6754  0x5208  # <CJK>
-0x6755  0x53E1  # <CJK>
-0x6756  0x66F3  # <CJK>
-0x6757  0x6C6D  # <CJK>
-0x6758  0x6FCA  # <CJK>
-0x6759  0x730A  # <CJK>
-0x675A  0x777F  # <CJK>
-0x675B  0x7A62  # <CJK>
-0x675C  0x82AE  # <CJK>
-0x675D  0x85DD  # <CJK>
-0x675E  0x8602  # <CJK>
-0x675F  0xF9B6  # <CJK>
-0x6760  0x88D4  # <CJK>
-0x6761  0x8A63  # <CJK>
-0x6762  0x8B7D  # <CJK>
-0x6763  0x8C6B  # <CJK>
-0x6764  0xF9B7  # <CJK>
-0x6765  0x92B3  # <CJK>
-0x6766  0xF9B8  # <CJK>
-0x6767  0x9713  # <CJK>
-0x6768  0x9810  # <CJK>
-0x6769  0x4E94  # <CJK>
-0x676A  0x4F0D  # <CJK>
-0x676B  0x4FC9  # <CJK>
-0x676C  0x50B2  # <CJK>
-0x676D  0x5348  # <CJK>
-0x676E  0x543E  # <CJK>
-0x676F  0x5433  # <CJK>
-0x6770  0x55DA  # <CJK>
-0x6771  0x5862  # <CJK>
-0x6772  0x58BA  # <CJK>
-0x6773  0x5967  # <CJK>
-0x6774  0x5A1B  # <CJK>
-0x6775  0x5BE4  # <CJK>
-0x6776  0x609F  # <CJK>
-0x6777  0xF9B9  # <CJK>
-0x6778  0x61CA  # <CJK>
-0x6779  0x6556  # <CJK>
-0x677A  0x65FF  # <CJK>
-0x677B  0x6664  # <CJK>
-0x677C  0x68A7  # <CJK>
-0x677D  0x6C5A  # <CJK>
-0x677E  0x6FB3  # <CJK>
-0x6821  0x70CF  # <CJK>
-0x6822  0x71AC  # <CJK>
-0x6823  0x7352  # <CJK>
-0x6824  0x7B7D  # <CJK>
-0x6825  0x8708  # <CJK>
-0x6826  0x8AA4  # <CJK>
-0x6827  0x9C32  # <CJK>
-0x6828  0x9F07  # <CJK>
-0x6829  0x5C4B  # <CJK>
-0x682A  0x6C83  # <CJK>
-0x682B  0x7344  # <CJK>
-0x682C  0x7389  # <CJK>
-0x682D  0x923A  # <CJK>
-0x682E  0x6EAB  # <CJK>
-0x682F  0x7465  # <CJK>
-0x6830  0x761F  # <CJK>
-0x6831  0x7A69  # <CJK>
-0x6832  0x7E15  # <CJK>
-0x6833  0x860A  # <CJK>
-0x6834  0x5140  # <CJK>
-0x6835  0x58C5  # <CJK>
-0x6836  0x64C1  # <CJK>
-0x6837  0x74EE  # <CJK>
-0x6838  0x7515  # <CJK>
-0x6839  0x7670  # <CJK>
-0x683A  0x7FC1  # <CJK>
-0x683B  0x9095  # <CJK>
-0x683C  0x96CD  # <CJK>
-0x683D  0x9954  # <CJK>
-0x683E  0x6E26  # <CJK>
-0x683F  0x74E6  # <CJK>
-0x6840  0x7AA9  # <CJK>
-0x6841  0x7AAA  # <CJK>
-0x6842  0x81E5  # <CJK>
-0x6843  0x86D9  # <CJK>
-0x6844  0x8778  # <CJK>
-0x6845  0x8A1B  # <CJK>
-0x6846  0x5A49  # <CJK>
-0x6847  0x5B8C  # <CJK>
-0x6848  0x5B9B  # <CJK>
-0x6849  0x68A1  # <CJK>
-0x684A  0x6900  # <CJK>
-0x684B  0x6D63  # <CJK>
-0x684C  0x73A9  # <CJK>
-0x684D  0x7413  # <CJK>
-0x684E  0x742C  # <CJK>
-0x684F  0x7897  # <CJK>
-0x6850  0x7DE9  # <CJK>
-0x6851  0x7FEB  # <CJK>
-0x6852  0x8118  # <CJK>
-0x6853  0x8155  # <CJK>
-0x6854  0x839E  # <CJK>
-0x6855  0x8C4C  # <CJK>
-0x6856  0x962E  # <CJK>
-0x6857  0x9811  # <CJK>
-0x6858  0x66F0  # <CJK>
-0x6859  0x5F80  # <CJK>
-0x685A  0x65FA  # <CJK>
-0x685B  0x6789  # <CJK>
-0x685C  0x6C6A  # <CJK>
-0x685D  0x738B  # <CJK>
-0x685E  0x502D  # <CJK>
-0x685F  0x5A03  # <CJK>
-0x6860  0x6B6A  # <CJK>
-0x6861  0x77EE  # <CJK>
-0x6862  0x5916  # <CJK>
-0x6863  0x5D6C  # <CJK>
-0x6864  0x5DCD  # <CJK>
-0x6865  0x7325  # <CJK>
-0x6866  0x754F  # <CJK>
-0x6867  0xF9BA  # <CJK>
-0x6868  0xF9BB  # <CJK>
-0x6869  0x50E5  # <CJK>
-0x686A  0x51F9  # <CJK>
-0x686B  0x582F  # <CJK>
-0x686C  0x592D  # <CJK>
-0x686D  0x5996  # <CJK>
-0x686E  0x59DA  # <CJK>
-0x686F  0x5BE5  # <CJK>
-0x6870  0xF9BC  # <CJK>
-0x6871  0xF9BD  # <CJK>
-0x6872  0x5DA2  # <CJK>
-0x6873  0x62D7  # <CJK>
-0x6874  0x6416  # <CJK>
-0x6875  0x6493  # <CJK>
-0x6876  0x64FE  # <CJK>
-0x6877  0xF9BE  # <CJK>
-0x6878  0x66DC  # <CJK>
-0x6879  0xF9BF  # <CJK>
-0x687A  0x6A48  # <CJK>
-0x687B  0xF9C0  # <CJK>
-0x687C  0x71FF  # <CJK>
-0x687D  0x7464  # <CJK>
-0x687E  0xF9C1  # <CJK>
-0x6921  0x7A88  # <CJK>
-0x6922  0x7AAF  # <CJK>
-0x6923  0x7E47  # <CJK>
-0x6924  0x7E5E  # <CJK>
-0x6925  0x8000  # <CJK>
-0x6926  0x8170  # <CJK>
-0x6927  0xF9C2  # <CJK>
-0x6928  0x87EF  # <CJK>
-0x6929  0x8981  # <CJK>
-0x692A  0x8B20  # <CJK>
-0x692B  0x9059  # <CJK>
-0x692C  0xF9C3  # <CJK>
-0x692D  0x9080  # <CJK>
-0x692E  0x9952  # <CJK>
-0x692F  0x617E  # <CJK>
-0x6930  0x6B32  # <CJK>
-0x6931  0x6D74  # <CJK>
-0x6932  0x7E1F  # <CJK>
-0x6933  0x8925  # <CJK>
-0x6934  0x8FB1  # <CJK>
-0x6935  0x4FD1  # <CJK>
-0x6936  0x50AD  # <CJK>
-0x6937  0x5197  # <CJK>
-0x6938  0x52C7  # <CJK>
-0x6939  0x57C7  # <CJK>
-0x693A  0x5889  # <CJK>
-0x693B  0x5BB9  # <CJK>
-0x693C  0x5EB8  # <CJK>
-0x693D  0x6142  # <CJK>
-0x693E  0x6995  # <CJK>
-0x693F  0x6D8C  # <CJK>
-0x6940  0x6E67  # <CJK>
-0x6941  0x6EB6  # <CJK>
-0x6942  0x7194  # <CJK>
-0x6943  0x7462  # <CJK>
-0x6944  0x7528  # <CJK>
-0x6945  0x752C  # <CJK>
-0x6946  0x8073  # <CJK>
-0x6947  0x8338  # <CJK>
-0x6948  0x84C9  # <CJK>
-0x6949  0x8E0A  # <CJK>
-0x694A  0x9394  # <CJK>
-0x694B  0x93DE  # <CJK>
-0x694C  0xF9C4  # <CJK>
-0x694D  0x4E8E  # <CJK>
-0x694E  0x4F51  # <CJK>
-0x694F  0x5076  # <CJK>
-0x6950  0x512A  # <CJK>
-0x6951  0x53C8  # <CJK>
-0x6952  0x53CB  # <CJK>
-0x6953  0x53F3  # <CJK>
-0x6954  0x5B87  # <CJK>
-0x6955  0x5BD3  # <CJK>
-0x6956  0x5C24  # <CJK>
-0x6957  0x611A  # <CJK>
-0x6958  0x6182  # <CJK>
-0x6959  0x65F4  # <CJK>
-0x695A  0x725B  # <CJK>
-0x695B  0x7397  # <CJK>
-0x695C  0x7440  # <CJK>
-0x695D  0x76C2  # <CJK>
-0x695E  0x7950  # <CJK>
-0x695F  0x7991  # <CJK>
-0x6960  0x79B9  # <CJK>
-0x6961  0x7D06  # <CJK>
-0x6962  0x7FBD  # <CJK>
-0x6963  0x828B  # <CJK>
-0x6964  0x85D5  # <CJK>
-0x6965  0x865E  # <CJK>
-0x6966  0x8FC2  # <CJK>
-0x6967  0x9047  # <CJK>
-0x6968  0x90F5  # <CJK>
-0x6969  0x91EA  # <CJK>
-0x696A  0x9685  # <CJK>
-0x696B  0x96E8  # <CJK>
-0x696C  0x96E9  # <CJK>
-0x696D  0x52D6  # <CJK>
-0x696E  0x5F67  # <CJK>
-0x696F  0x65ED  # <CJK>
-0x6970  0x6631  # <CJK>
-0x6971  0x682F  # <CJK>
-0x6972  0x715C  # <CJK>
-0x6973  0x7A36  # <CJK>
-0x6974  0x90C1  # <CJK>
-0x6975  0x980A  # <CJK>
-0x6976  0x4E91  # <CJK>
-0x6977  0xF9C5  # <CJK>
-0x6978  0x6A52  # <CJK>
-0x6979  0x6B9E  # <CJK>
-0x697A  0x6F90  # <CJK>
-0x697B  0x7189  # <CJK>
-0x697C  0x8018  # <CJK>
-0x697D  0x82B8  # <CJK>
-0x697E  0x8553  # <CJK>
-0x6A21  0x904B  # <CJK>
-0x6A22  0x9695  # <CJK>
-0x6A23  0x96F2  # <CJK>
-0x6A24  0x97FB  # <CJK>
-0x6A25  0x851A  # <CJK>
-0x6A26  0x9B31  # <CJK>
-0x6A27  0x4E90  # <CJK>
-0x6A28  0x718A  # <CJK>
-0x6A29  0x96C4  # <CJK>
-0x6A2A  0x5143  # <CJK>
-0x6A2B  0x539F  # <CJK>
-0x6A2C  0x54E1  # <CJK>
-0x6A2D  0x5713  # <CJK>
-0x6A2E  0x5712  # <CJK>
-0x6A2F  0x57A3  # <CJK>
-0x6A30  0x5A9B  # <CJK>
-0x6A31  0x5AC4  # <CJK>
-0x6A32  0x5BC3  # <CJK>
-0x6A33  0x6028  # <CJK>
-0x6A34  0x613F  # <CJK>
-0x6A35  0x63F4  # <CJK>
-0x6A36  0x6C85  # <CJK>
-0x6A37  0x6D39  # <CJK>
-0x6A38  0x6E72  # <CJK>
-0x6A39  0x6E90  # <CJK>
-0x6A3A  0x7230  # <CJK>
-0x6A3B  0x733F  # <CJK>
-0x6A3C  0x7457  # <CJK>
-0x6A3D  0x82D1  # <CJK>
-0x6A3E  0x8881  # <CJK>
-0x6A3F  0x8F45  # <CJK>
-0x6A40  0x9060  # <CJK>
-0x6A41  0xF9C6  # <CJK>
-0x6A42  0x9662  # <CJK>
-0x6A43  0x9858  # <CJK>
-0x6A44  0x9D1B  # <CJK>
-0x6A45  0x6708  # <CJK>
-0x6A46  0x8D8A  # <CJK>
-0x6A47  0x925E  # <CJK>
-0x6A48  0x4F4D  # <CJK>
-0x6A49  0x5049  # <CJK>
-0x6A4A  0x50DE  # <CJK>
-0x6A4B  0x5371  # <CJK>
-0x6A4C  0x570D  # <CJK>
-0x6A4D  0x59D4  # <CJK>
-0x6A4E  0x5A01  # <CJK>
-0x6A4F  0x5C09  # <CJK>
-0x6A50  0x6170  # <CJK>
-0x6A51  0x6690  # <CJK>
-0x6A52  0x6E2D  # <CJK>
-0x6A53  0x7232  # <CJK>
-0x6A54  0x744B  # <CJK>
-0x6A55  0x7DEF  # <CJK>
-0x6A56  0x80C3  # <CJK>
-0x6A57  0x840E  # <CJK>
-0x6A58  0x8466  # <CJK>
-0x6A59  0x853F  # <CJK>
-0x6A5A  0x875F  # <CJK>
-0x6A5B  0x885B  # <CJK>
-0x6A5C  0x8918  # <CJK>
-0x6A5D  0x8B02  # <CJK>
-0x6A5E  0x9055  # <CJK>
-0x6A5F  0x97CB  # <CJK>
-0x6A60  0x9B4F  # <CJK>
-0x6A61  0x4E73  # <CJK>
-0x6A62  0x4F91  # <CJK>
-0x6A63  0x5112  # <CJK>
-0x6A64  0x516A  # <CJK>
-0x6A65  0xF9C7  # <CJK>
-0x6A66  0x552F  # <CJK>
-0x6A67  0x55A9  # <CJK>
-0x6A68  0x5B7A  # <CJK>
-0x6A69  0x5BA5  # <CJK>
-0x6A6A  0x5E7C  # <CJK>
-0x6A6B  0x5E7D  # <CJK>
-0x6A6C  0x5EBE  # <CJK>
-0x6A6D  0x60A0  # <CJK>
-0x6A6E  0x60DF  # <CJK>
-0x6A6F  0x6108  # <CJK>
-0x6A70  0x6109  # <CJK>
-0x6A71  0x63C4  # <CJK>
-0x6A72  0x6538  # <CJK>
-0x6A73  0x6709  # <CJK>
-0x6A74  0xF9C8  # <CJK>
-0x6A75  0x67D4  # <CJK>
-0x6A76  0x67DA  # <CJK>
-0x6A77  0xF9C9  # <CJK>
-0x6A78  0x6961  # <CJK>
-0x6A79  0x6962  # <CJK>
-0x6A7A  0x6CB9  # <CJK>
-0x6A7B  0x6D27  # <CJK>
-0x6A7C  0xF9CA  # <CJK>
-0x6A7D  0x6E38  # <CJK>
-0x6A7E  0xF9CB  # <CJK>
-0x6B21  0x6FE1  # <CJK>
-0x6B22  0x7336  # <CJK>
-0x6B23  0x7337  # <CJK>
-0x6B24  0xF9CC  # <CJK>
-0x6B25  0x745C  # <CJK>
-0x6B26  0x7531  # <CJK>
-0x6B27  0xF9CD  # <CJK>
-0x6B28  0x7652  # <CJK>
-0x6B29  0xF9CE  # <CJK>
-0x6B2A  0xF9CF  # <CJK>
-0x6B2B  0x7DAD  # <CJK>
-0x6B2C  0x81FE  # <CJK>
-0x6B2D  0x8438  # <CJK>
-0x6B2E  0x88D5  # <CJK>
-0x6B2F  0x8A98  # <CJK>
-0x6B30  0x8ADB  # <CJK>
-0x6B31  0x8AED  # <CJK>
-0x6B32  0x8E30  # <CJK>
-0x6B33  0x8E42  # <CJK>
-0x6B34  0x904A  # <CJK>
-0x6B35  0x903E  # <CJK>
-0x6B36  0x907A  # <CJK>
-0x6B37  0x9149  # <CJK>
-0x6B38  0x91C9  # <CJK>
-0x6B39  0x936E  # <CJK>
-0x6B3A  0xF9D0  # <CJK>
-0x6B3B  0xF9D1  # <CJK>
-0x6B3C  0x5809  # <CJK>
-0x6B3D  0xF9D2  # <CJK>
-0x6B3E  0x6BD3  # <CJK>
-0x6B3F  0x8089  # <CJK>
-0x6B40  0x80B2  # <CJK>
-0x6B41  0xF9D3  # <CJK>
-0x6B42  0xF9D4  # <CJK>
-0x6B43  0x5141  # <CJK>
-0x6B44  0x596B  # <CJK>
-0x6B45  0x5C39  # <CJK>
-0x6B46  0xF9D5  # <CJK>
-0x6B47  0xF9D6  # <CJK>
-0x6B48  0x6F64  # <CJK>
-0x6B49  0x73A7  # <CJK>
-0x6B4A  0x80E4  # <CJK>
-0x6B4B  0x8D07  # <CJK>
-0x6B4C  0xF9D7  # <CJK>
-0x6B4D  0x9217  # <CJK>
-0x6B4E  0x958F  # <CJK>
-0x6B4F  0xF9D8  # <CJK>
-0x6B50  0xF9D9  # <CJK>
-0x6B51  0xF9DA  # <CJK>
-0x6B52  0xF9DB  # <CJK>
-0x6B53  0x807F  # <CJK>
-0x6B54  0x620E  # <CJK>
-0x6B55  0x701C  # <CJK>
-0x6B56  0x7D68  # <CJK>
-0x6B57  0x878D  # <CJK>
-0x6B58  0xF9DC  # <CJK>
-0x6B59  0x57A0  # <CJK>
-0x6B5A  0x6069  # <CJK>
-0x6B5B  0x6147  # <CJK>
-0x6B5C  0x6BB7  # <CJK>
-0x6B5D  0x8ABE  # <CJK>
-0x6B5E  0x9280  # <CJK>
-0x6B5F  0x96B1  # <CJK>
-0x6B60  0x4E59  # <CJK>
-0x6B61  0x541F  # <CJK>
-0x6B62  0x6DEB  # <CJK>
-0x6B63  0x852D  # <CJK>
-0x6B64  0x9670  # <CJK>
-0x6B65  0x97F3  # <CJK>
-0x6B66  0x98EE  # <CJK>
-0x6B67  0x63D6  # <CJK>
-0x6B68  0x6CE3  # <CJK>
-0x6B69  0x9091  # <CJK>
-0x6B6A  0x51DD  # <CJK>
-0x6B6B  0x61C9  # <CJK>
-0x6B6C  0x81BA  # <CJK>
-0x6B6D  0x9DF9  # <CJK>
-0x6B6E  0x4F9D  # <CJK>
-0x6B6F  0x501A  # <CJK>
-0x6B70  0x5100  # <CJK>
-0x6B71  0x5B9C  # <CJK>
-0x6B72  0x610F  # <CJK>
-0x6B73  0x61FF  # <CJK>
-0x6B74  0x64EC  # <CJK>
-0x6B75  0x6905  # <CJK>
-0x6B76  0x6BC5  # <CJK>
-0x6B77  0x7591  # <CJK>
-0x6B78  0x77E3  # <CJK>
-0x6B79  0x7FA9  # <CJK>
-0x6B7A  0x8264  # <CJK>
-0x6B7B  0x858F  # <CJK>
-0x6B7C  0x87FB  # <CJK>
-0x6B7D  0x8863  # <CJK>
-0x6B7E  0x8ABC  # <CJK>
-0x6C21  0x8B70  # <CJK>
-0x6C22  0x91AB  # <CJK>
-0x6C23  0x4E8C  # <CJK>
-0x6C24  0x4EE5  # <CJK>
-0x6C25  0x4F0A  # <CJK>
-0x6C26  0xF9DD  # <CJK>
-0x6C27  0xF9DE  # <CJK>
-0x6C28  0x5937  # <CJK>
-0x6C29  0x59E8  # <CJK>
-0x6C2A  0xF9DF  # <CJK>
-0x6C2B  0x5DF2  # <CJK>
-0x6C2C  0x5F1B  # <CJK>
-0x6C2D  0x5F5B  # <CJK>
-0x6C2E  0x6021  # <CJK>
-0x6C2F  0xF9E0  # <CJK>
-0x6C30  0xF9E1  # <CJK>
-0x6C31  0xF9E2  # <CJK>
-0x6C32  0xF9E3  # <CJK>
-0x6C33  0x723E  # <CJK>
-0x6C34  0x73E5  # <CJK>
-0x6C35  0xF9E4  # <CJK>
-0x6C36  0x7570  # <CJK>
-0x6C37  0x75CD  # <CJK>
-0x6C38  0xF9E5  # <CJK>
-0x6C39  0x79FB  # <CJK>
-0x6C3A  0xF9E6  # <CJK>
-0x6C3B  0x800C  # <CJK>
-0x6C3C  0x8033  # <CJK>
-0x6C3D  0x8084  # <CJK>
-0x6C3E  0x82E1  # <CJK>
-0x6C3F  0x8351  # <CJK>
-0x6C40  0xF9E7  # <CJK>
-0x6C41  0xF9E8  # <CJK>
-0x6C42  0x8CBD  # <CJK>
-0x6C43  0x8CB3  # <CJK>
-0x6C44  0x9087  # <CJK>
-0x6C45  0xF9E9  # <CJK>
-0x6C46  0xF9EA  # <CJK>
-0x6C47  0x98F4  # <CJK>
-0x6C48  0x990C  # <CJK>
-0x6C49  0xF9EB  # <CJK>
-0x6C4A  0xF9EC  # <CJK>
-0x6C4B  0x7037  # <CJK>
-0x6C4C  0x76CA  # <CJK>
-0x6C4D  0x7FCA  # <CJK>
-0x6C4E  0x7FCC  # <CJK>
-0x6C4F  0x7FFC  # <CJK>
-0x6C50  0x8B1A  # <CJK>
-0x6C51  0x4EBA  # <CJK>
-0x6C52  0x4EC1  # <CJK>
-0x6C53  0x5203  # <CJK>
-0x6C54  0x5370  # <CJK>
-0x6C55  0xF9ED  # <CJK>
-0x6C56  0x54BD  # <CJK>
-0x6C57  0x56E0  # <CJK>
-0x6C58  0x59FB  # <CJK>
-0x6C59  0x5BC5  # <CJK>
-0x6C5A  0x5F15  # <CJK>
-0x6C5B  0x5FCD  # <CJK>
-0x6C5C  0x6E6E  # <CJK>
-0x6C5D  0xF9EE  # <CJK>
-0x6C5E  0xF9EF  # <CJK>
-0x6C5F  0x7D6A  # <CJK>
-0x6C60  0x8335  # <CJK>
-0x6C61  0xF9F0  # <CJK>
-0x6C62  0x8693  # <CJK>
-0x6C63  0x8A8D  # <CJK>
-0x6C64  0xF9F1  # <CJK>
-0x6C65  0x976D  # <CJK>
-0x6C66  0x9777  # <CJK>
-0x6C67  0xF9F2  # <CJK>
-0x6C68  0xF9F3  # <CJK>
-0x6C69  0x4E00  # <CJK>
-0x6C6A  0x4F5A  # <CJK>
-0x6C6B  0x4F7E  # <CJK>
-0x6C6C  0x58F9  # <CJK>
-0x6C6D  0x65E5  # <CJK>
-0x6C6E  0x6EA2  # <CJK>
-0x6C6F  0x9038  # <CJK>
-0x6C70  0x93B0  # <CJK>
-0x6C71  0x99B9  # <CJK>
-0x6C72  0x4EFB  # <CJK>
-0x6C73  0x58EC  # <CJK>
-0x6C74  0x598A  # <CJK>
-0x6C75  0x59D9  # <CJK>
-0x6C76  0x6041  # <CJK>
-0x6C77  0xF9F4  # <CJK>
-0x6C78  0xF9F5  # <CJK>
-0x6C79  0x7A14  # <CJK>
-0x6C7A  0xF9F6  # <CJK>
-0x6C7B  0x834F  # <CJK>
-0x6C7C  0x8CC3  # <CJK>
-0x6C7D  0x5165  # <CJK>
-0x6C7E  0x5344  # <CJK>
-0x6D21  0xF9F7  # <CJK>
-0x6D22  0xF9F8  # <CJK>
-0x6D23  0xF9F9  # <CJK>
-0x6D24  0x4ECD  # <CJK>
-0x6D25  0x5269  # <CJK>
-0x6D26  0x5B55  # <CJK>
-0x6D27  0x82BF  # <CJK>
-0x6D28  0x4ED4  # <CJK>
-0x6D29  0x523A  # <CJK>
-0x6D2A  0x54A8  # <CJK>
-0x6D2B  0x59C9  # <CJK>
-0x6D2C  0x59FF  # <CJK>
-0x6D2D  0x5B50  # <CJK>
-0x6D2E  0x5B57  # <CJK>
-0x6D2F  0x5B5C  # <CJK>
-0x6D30  0x6063  # <CJK>
-0x6D31  0x6148  # <CJK>
-0x6D32  0x6ECB  # <CJK>
-0x6D33  0x7099  # <CJK>
-0x6D34  0x716E  # <CJK>
-0x6D35  0x7386  # <CJK>
-0x6D36  0x74F7  # <CJK>
-0x6D37  0x75B5  # <CJK>
-0x6D38  0x78C1  # <CJK>
-0x6D39  0x7D2B  # <CJK>
-0x6D3A  0x8005  # <CJK>
-0x6D3B  0x81EA  # <CJK>
-0x6D3C  0x8328  # <CJK>
-0x6D3D  0x8517  # <CJK>
-0x6D3E  0x85C9  # <CJK>
-0x6D3F  0x8AEE  # <CJK>
-0x6D40  0x8CC7  # <CJK>
-0x6D41  0x96CC  # <CJK>
-0x6D42  0x4F5C  # <CJK>
-0x6D43  0x52FA  # <CJK>
-0x6D44  0x56BC  # <CJK>
-0x6D45  0x65AB  # <CJK>
-0x6D46  0x6628  # <CJK>
-0x6D47  0x707C  # <CJK>
-0x6D48  0x70B8  # <CJK>
-0x6D49  0x7235  # <CJK>
-0x6D4A  0x7DBD  # <CJK>
-0x6D4B  0x828D  # <CJK>
-0x6D4C  0x914C  # <CJK>
-0x6D4D  0x96C0  # <CJK>
-0x6D4E  0x9D72  # <CJK>
-0x6D4F  0x5B71  # <CJK>
-0x6D50  0x68E7  # <CJK>
-0x6D51  0x6B98  # <CJK>
-0x6D52  0x6F7A  # <CJK>
-0x6D53  0x76DE  # <CJK>
-0x6D54  0x5C91  # <CJK>
-0x6D55  0x66AB  # <CJK>
-0x6D56  0x6F5B  # <CJK>
-0x6D57  0x7BB4  # <CJK>
-0x6D58  0x7C2A  # <CJK>
-0x6D59  0x8836  # <CJK>
-0x6D5A  0x96DC  # <CJK>
-0x6D5B  0x4E08  # <CJK>
-0x6D5C  0x4ED7  # <CJK>
-0x6D5D  0x5320  # <CJK>
-0x6D5E  0x5834  # <CJK>
-0x6D5F  0x58BB  # <CJK>
-0x6D60  0x58EF  # <CJK>
-0x6D61  0x596C  # <CJK>
-0x6D62  0x5C07  # <CJK>
-0x6D63  0x5E33  # <CJK>
-0x6D64  0x5E84  # <CJK>
-0x6D65  0x5F35  # <CJK>
-0x6D66  0x638C  # <CJK>
-0x6D67  0x66B2  # <CJK>
-0x6D68  0x6756  # <CJK>
-0x6D69  0x6A1F  # <CJK>
-0x6D6A  0x6AA3  # <CJK>
-0x6D6B  0x6B0C  # <CJK>
-0x6D6C  0x6F3F  # <CJK>
-0x6D6D  0x7246  # <CJK>
-0x6D6E  0xF9FA  # <CJK>
-0x6D6F  0x7350  # <CJK>
-0x6D70  0x748B  # <CJK>
-0x6D71  0x7AE0  # <CJK>
-0x6D72  0x7CA7  # <CJK>
-0x6D73  0x8178  # <CJK>
-0x6D74  0x81DF  # <CJK>
-0x6D75  0x81E7  # <CJK>
-0x6D76  0x838A  # <CJK>
-0x6D77  0x846C  # <CJK>
-0x6D78  0x8523  # <CJK>
-0x6D79  0x8594  # <CJK>
-0x6D7A  0x85CF  # <CJK>
-0x6D7B  0x88DD  # <CJK>
-0x6D7C  0x8D13  # <CJK>
-0x6D7D  0x91AC  # <CJK>
-0x6D7E  0x9577  # <CJK>
-0x6E21  0x969C  # <CJK>
-0x6E22  0x518D  # <CJK>
-0x6E23  0x54C9  # <CJK>
-0x6E24  0x5728  # <CJK>
-0x6E25  0x5BB0  # <CJK>
-0x6E26  0x624D  # <CJK>
-0x6E27  0x6750  # <CJK>
-0x6E28  0x683D  # <CJK>
-0x6E29  0x6893  # <CJK>
-0x6E2A  0x6E3D  # <CJK>
-0x6E2B  0x6ED3  # <CJK>
-0x6E2C  0x707D  # <CJK>
-0x6E2D  0x7E21  # <CJK>
-0x6E2E  0x88C1  # <CJK>
-0x6E2F  0x8CA1  # <CJK>
-0x6E30  0x8F09  # <CJK>
-0x6E31  0x9F4B  # <CJK>
-0x6E32  0x9F4E  # <CJK>
-0x6E33  0x722D  # <CJK>
-0x6E34  0x7B8F  # <CJK>
-0x6E35  0x8ACD  # <CJK>
-0x6E36  0x931A  # <CJK>
-0x6E37  0x4F47  # <CJK>
-0x6E38  0x4F4E  # <CJK>
-0x6E39  0x5132  # <CJK>
-0x6E3A  0x5480  # <CJK>
-0x6E3B  0x59D0  # <CJK>
-0x6E3C  0x5E95  # <CJK>
-0x6E3D  0x62B5  # <CJK>
-0x6E3E  0x6775  # <CJK>
-0x6E3F  0x696E  # <CJK>
-0x6E40  0x6A17  # <CJK>
-0x6E41  0x6CAE  # <CJK>
-0x6E42  0x6E1A  # <CJK>
-0x6E43  0x72D9  # <CJK>
-0x6E44  0x732A  # <CJK>
-0x6E45  0x75BD  # <CJK>
-0x6E46  0x7BB8  # <CJK>
-0x6E47  0x7D35  # <CJK>
-0x6E48  0x82E7  # <CJK>
-0x6E49  0x83F9  # <CJK>
-0x6E4A  0x8457  # <CJK>
-0x6E4B  0x85F7  # <CJK>
-0x6E4C  0x8A5B  # <CJK>
-0x6E4D  0x8CAF  # <CJK>
-0x6E4E  0x8E87  # <CJK>
-0x6E4F  0x9019  # <CJK>
-0x6E50  0x90B8  # <CJK>
-0x6E51  0x96CE  # <CJK>
-0x6E52  0x9F5F  # <CJK>
-0x6E53  0x52E3  # <CJK>
-0x6E54  0x540A  # <CJK>
-0x6E55  0x5AE1  # <CJK>
-0x6E56  0x5BC2  # <CJK>
-0x6E57  0x6458  # <CJK>
-0x6E58  0x6575  # <CJK>
-0x6E59  0x6EF4  # <CJK>
-0x6E5A  0x72C4  # <CJK>
-0x6E5B  0xF9FB  # <CJK>
-0x6E5C  0x7684  # <CJK>
-0x6E5D  0x7A4D  # <CJK>
-0x6E5E  0x7B1B  # <CJK>
-0x6E5F  0x7C4D  # <CJK>
-0x6E60  0x7E3E  # <CJK>
-0x6E61  0x7FDF  # <CJK>
-0x6E62  0x837B  # <CJK>
-0x6E63  0x8B2B  # <CJK>
-0x6E64  0x8CCA  # <CJK>
-0x6E65  0x8D64  # <CJK>
-0x6E66  0x8DE1  # <CJK>
-0x6E67  0x8E5F  # <CJK>
-0x6E68  0x8FEA  # <CJK>
-0x6E69  0x8FF9  # <CJK>
-0x6E6A  0x9069  # <CJK>
-0x6E6B  0x93D1  # <CJK>
-0x6E6C  0x4F43  # <CJK>
-0x6E6D  0x4F7A  # <CJK>
-0x6E6E  0x50B3  # <CJK>
-0x6E6F  0x5168  # <CJK>
-0x6E70  0x5178  # <CJK>
-0x6E71  0x524D  # <CJK>
-0x6E72  0x526A  # <CJK>
-0x6E73  0x5861  # <CJK>
-0x6E74  0x587C  # <CJK>
-0x6E75  0x5960  # <CJK>
-0x6E76  0x5C08  # <CJK>
-0x6E77  0x5C55  # <CJK>
-0x6E78  0x5EDB  # <CJK>
-0x6E79  0x609B  # <CJK>
-0x6E7A  0x6230  # <CJK>
-0x6E7B  0x6813  # <CJK>
-0x6E7C  0x6BBF  # <CJK>
-0x6E7D  0x6C08  # <CJK>
-0x6E7E  0x6FB1  # <CJK>
-0x6F21  0x714E  # <CJK>
-0x6F22  0x7420  # <CJK>
-0x6F23  0x7530  # <CJK>
-0x6F24  0x7538  # <CJK>
-0x6F25  0x7551  # <CJK>
-0x6F26  0x7672  # <CJK>
-0x6F27  0x7B4C  # <CJK>
-0x6F28  0x7B8B  # <CJK>
-0x6F29  0x7BAD  # <CJK>
-0x6F2A  0x7BC6  # <CJK>
-0x6F2B  0x7E8F  # <CJK>
-0x6F2C  0x8A6E  # <CJK>
-0x6F2D  0x8F3E  # <CJK>
-0x6F2E  0x8F49  # <CJK>
-0x6F2F  0x923F  # <CJK>
-0x6F30  0x9293  # <CJK>
-0x6F31  0x9322  # <CJK>
-0x6F32  0x942B  # <CJK>
-0x6F33  0x96FB  # <CJK>
-0x6F34  0x985A  # <CJK>
-0x6F35  0x986B  # <CJK>
-0x6F36  0x991E  # <CJK>
-0x6F37  0x5207  # <CJK>
-0x6F38  0x622A  # <CJK>
-0x6F39  0x6298  # <CJK>
-0x6F3A  0x6D59  # <CJK>
-0x6F3B  0x7664  # <CJK>
-0x6F3C  0x7ACA  # <CJK>
-0x6F3D  0x7BC0  # <CJK>
-0x6F3E  0x7D76  # <CJK>
-0x6F3F  0x5360  # <CJK>
-0x6F40  0x5CBE  # <CJK>
-0x6F41  0x5E97  # <CJK>
-0x6F42  0x6F38  # <CJK>
-0x6F43  0x70B9  # <CJK>
-0x6F44  0x7C98  # <CJK>
-0x6F45  0x9711  # <CJK>
-0x6F46  0x9B8E  # <CJK>
-0x6F47  0x9EDE  # <CJK>
-0x6F48  0x63A5  # <CJK>
-0x6F49  0x647A  # <CJK>
-0x6F4A  0x8776  # <CJK>
-0x6F4B  0x4E01  # <CJK>
-0x6F4C  0x4E95  # <CJK>
-0x6F4D  0x4EAD  # <CJK>
-0x6F4E  0x505C  # <CJK>
-0x6F4F  0x5075  # <CJK>
-0x6F50  0x5448  # <CJK>
-0x6F51  0x59C3  # <CJK>
-0x6F52  0x5B9A  # <CJK>
-0x6F53  0x5E40  # <CJK>
-0x6F54  0x5EAD  # <CJK>
-0x6F55  0x5EF7  # <CJK>
-0x6F56  0x5F81  # <CJK>
-0x6F57  0x60C5  # <CJK>
-0x6F58  0x633A  # <CJK>
-0x6F59  0x653F  # <CJK>
-0x6F5A  0x6574  # <CJK>
-0x6F5B  0x65CC  # <CJK>
-0x6F5C  0x6676  # <CJK>
-0x6F5D  0x6678  # <CJK>
-0x6F5E  0x67FE  # <CJK>
-0x6F5F  0x6968  # <CJK>
-0x6F60  0x6A89  # <CJK>
-0x6F61  0x6B63  # <CJK>
-0x6F62  0x6C40  # <CJK>
-0x6F63  0x6DC0  # <CJK>
-0x6F64  0x6DE8  # <CJK>
-0x6F65  0x6E1F  # <CJK>
-0x6F66  0x6E5E  # <CJK>
-0x6F67  0x701E  # <CJK>
-0x6F68  0x70A1  # <CJK>
-0x6F69  0x738E  # <CJK>
-0x6F6A  0x73FD  # <CJK>
-0x6F6B  0x753A  # <CJK>
-0x6F6C  0x775B  # <CJK>
-0x6F6D  0x7887  # <CJK>
-0x6F6E  0x798E  # <CJK>
-0x6F6F  0x7A0B  # <CJK>
-0x6F70  0x7A7D  # <CJK>
-0x6F71  0x7CBE  # <CJK>
-0x6F72  0x7D8E  # <CJK>
-0x6F73  0x8247  # <CJK>
-0x6F74  0x8A02  # <CJK>
-0x6F75  0x8AEA  # <CJK>
-0x6F76  0x8C9E  # <CJK>
-0x6F77  0x912D  # <CJK>
-0x6F78  0x914A  # <CJK>
-0x6F79  0x91D8  # <CJK>
-0x6F7A  0x9266  # <CJK>
-0x6F7B  0x92CC  # <CJK>
-0x6F7C  0x9320  # <CJK>
-0x6F7D  0x9706  # <CJK>
-0x6F7E  0x9756  # <CJK>
-0x7021  0x975C  # <CJK>
-0x7022  0x9802  # <CJK>
-0x7023  0x9F0E  # <CJK>
-0x7024  0x5236  # <CJK>
-0x7025  0x5291  # <CJK>
-0x7026  0x557C  # <CJK>
-0x7027  0x5824  # <CJK>
-0x7028  0x5E1D  # <CJK>
-0x7029  0x5F1F  # <CJK>
-0x702A  0x608C  # <CJK>
-0x702B  0x63D0  # <CJK>
-0x702C  0x68AF  # <CJK>
-0x702D  0x6FDF  # <CJK>
-0x702E  0x796D  # <CJK>
-0x702F  0x7B2C  # <CJK>
-0x7030  0x81CD  # <CJK>
-0x7031  0x85BA  # <CJK>
-0x7032  0x88FD  # <CJK>
-0x7033  0x8AF8  # <CJK>
-0x7034  0x8E44  # <CJK>
-0x7035  0x918D  # <CJK>
-0x7036  0x9664  # <CJK>
-0x7037  0x969B  # <CJK>
-0x7038  0x973D  # <CJK>
-0x7039  0x984C  # <CJK>
-0x703A  0x9F4A  # <CJK>
-0x703B  0x4FCE  # <CJK>
-0x703C  0x5146  # <CJK>
-0x703D  0x51CB  # <CJK>
-0x703E  0x52A9  # <CJK>
-0x703F  0x5632  # <CJK>
-0x7040  0x5F14  # <CJK>
-0x7041  0x5F6B  # <CJK>
-0x7042  0x63AA  # <CJK>
-0x7043  0x64CD  # <CJK>
-0x7044  0x65E9  # <CJK>
-0x7045  0x6641  # <CJK>
-0x7046  0x66FA  # <CJK>
-0x7047  0x66F9  # <CJK>
-0x7048  0x671D  # <CJK>
-0x7049  0x689D  # <CJK>
-0x704A  0x68D7  # <CJK>
-0x704B  0x69FD  # <CJK>
-0x704C  0x6F15  # <CJK>
-0x704D  0x6F6E  # <CJK>
-0x704E  0x7167  # <CJK>
-0x704F  0x71E5  # <CJK>
-0x7050  0x722A  # <CJK>
-0x7051  0x74AA  # <CJK>
-0x7052  0x773A  # <CJK>
-0x7053  0x7956  # <CJK>
-0x7054  0x795A  # <CJK>
-0x7055  0x79DF  # <CJK>
-0x7056  0x7A20  # <CJK>
-0x7057  0x7A95  # <CJK>
-0x7058  0x7C97  # <CJK>
-0x7059  0x7CDF  # <CJK>
-0x705A  0x7D44  # <CJK>
-0x705B  0x7E70  # <CJK>
-0x705C  0x8087  # <CJK>
-0x705D  0x85FB  # <CJK>
-0x705E  0x86A4  # <CJK>
-0x705F  0x8A54  # <CJK>
-0x7060  0x8ABF  # <CJK>
-0x7061  0x8D99  # <CJK>
-0x7062  0x8E81  # <CJK>
-0x7063  0x9020  # <CJK>
-0x7064  0x906D  # <CJK>
-0x7065  0x91E3  # <CJK>
-0x7066  0x963B  # <CJK>
-0x7067  0x96D5  # <CJK>
-0x7068  0x9CE5  # <CJK>
-0x7069  0x65CF  # <CJK>
-0x706A  0x7C07  # <CJK>
-0x706B  0x8DB3  # <CJK>
-0x706C  0x93C3  # <CJK>
-0x706D  0x5B58  # <CJK>
-0x706E  0x5C0A  # <CJK>
-0x706F  0x5352  # <CJK>
-0x7070  0x62D9  # <CJK>
-0x7071  0x731D  # <CJK>
-0x7072  0x5027  # <CJK>
-0x7073  0x5B97  # <CJK>
-0x7074  0x5F9E  # <CJK>
-0x7075  0x60B0  # <CJK>
-0x7076  0x616B  # <CJK>
-0x7077  0x68D5  # <CJK>
-0x7078  0x6DD9  # <CJK>
-0x7079  0x742E  # <CJK>
-0x707A  0x7A2E  # <CJK>
-0x707B  0x7D42  # <CJK>
-0x707C  0x7D9C  # <CJK>
-0x707D  0x7E31  # <CJK>
-0x707E  0x816B  # <CJK>
-0x7121  0x8E2A  # <CJK>
-0x7122  0x8E35  # <CJK>
-0x7123  0x937E  # <CJK>
-0x7124  0x9418  # <CJK>
-0x7125  0x4F50  # <CJK>
-0x7126  0x5750  # <CJK>
-0x7127  0x5DE6  # <CJK>
-0x7128  0x5EA7  # <CJK>
-0x7129  0x632B  # <CJK>
-0x712A  0x7F6A  # <CJK>
-0x712B  0x4E3B  # <CJK>
-0x712C  0x4F4F  # <CJK>
-0x712D  0x4F8F  # <CJK>
-0x712E  0x505A  # <CJK>
-0x712F  0x59DD  # <CJK>
-0x7130  0x80C4  # <CJK>
-0x7131  0x546A  # <CJK>
-0x7132  0x5468  # <CJK>
-0x7133  0x55FE  # <CJK>
-0x7134  0x594F  # <CJK>
-0x7135  0x5B99  # <CJK>
-0x7136  0x5DDE  # <CJK>
-0x7137  0x5EDA  # <CJK>
-0x7138  0x665D  # <CJK>
-0x7139  0x6731  # <CJK>
-0x713A  0x67F1  # <CJK>
-0x713B  0x682A  # <CJK>
-0x713C  0x6CE8  # <CJK>
-0x713D  0x6D32  # <CJK>
-0x713E  0x6E4A  # <CJK>
-0x713F  0x6F8D  # <CJK>
-0x7140  0x70B7  # <CJK>
-0x7141  0x73E0  # <CJK>
-0x7142  0x7587  # <CJK>
-0x7143  0x7C4C  # <CJK>
-0x7144  0x7D02  # <CJK>
-0x7145  0x7D2C  # <CJK>
-0x7146  0x7DA2  # <CJK>
-0x7147  0x821F  # <CJK>
-0x7148  0x86DB  # <CJK>
-0x7149  0x8A3B  # <CJK>
-0x714A  0x8A85  # <CJK>
-0x714B  0x8D70  # <CJK>
-0x714C  0x8E8A  # <CJK>
-0x714D  0x8F33  # <CJK>
-0x714E  0x9031  # <CJK>
-0x714F  0x914E  # <CJK>
-0x7150  0x9152  # <CJK>
-0x7151  0x9444  # <CJK>
-0x7152  0x99D0  # <CJK>
-0x7153  0x7AF9  # <CJK>
-0x7154  0x7CA5  # <CJK>
-0x7155  0x4FCA  # <CJK>
-0x7156  0x5101  # <CJK>
-0x7157  0x51C6  # <CJK>
-0x7158  0x57C8  # <CJK>
-0x7159  0x5BEF  # <CJK>
-0x715A  0x5CFB  # <CJK>
-0x715B  0x6659  # <CJK>
-0x715C  0x6A3D  # <CJK>
-0x715D  0x6D5A  # <CJK>
-0x715E  0x6E96  # <CJK>
-0x715F  0x6FEC  # <CJK>
-0x7160  0x710C  # <CJK>
-0x7161  0x756F  # <CJK>
-0x7162  0x7AE3  # <CJK>
-0x7163  0x8822  # <CJK>
-0x7164  0x9021  # <CJK>
-0x7165  0x9075  # <CJK>
-0x7166  0x96CB  # <CJK>
-0x7167  0x99FF  # <CJK>
-0x7168  0x8301  # <CJK>
-0x7169  0x4E2D  # <CJK>
-0x716A  0x4EF2  # <CJK>
-0x716B  0x8846  # <CJK>
-0x716C  0x91CD  # <CJK>
-0x716D  0x537D  # <CJK>
-0x716E  0x6ADB  # <CJK>
-0x716F  0x696B  # <CJK>
-0x7170  0x6C41  # <CJK>
-0x7171  0x847A  # <CJK>
-0x7172  0x589E  # <CJK>
-0x7173  0x618E  # <CJK>
-0x7174  0x66FE  # <CJK>
-0x7175  0x62EF  # <CJK>
-0x7176  0x70DD  # <CJK>
-0x7177  0x7511  # <CJK>
-0x7178  0x75C7  # <CJK>
-0x7179  0x7E52  # <CJK>
-0x717A  0x84B8  # <CJK>
-0x717B  0x8B49  # <CJK>
-0x717C  0x8D08  # <CJK>
-0x717D  0x4E4B  # <CJK>
-0x717E  0x53EA  # <CJK>
-0x7221  0x54AB  # <CJK>
-0x7222  0x5730  # <CJK>
-0x7223  0x5740  # <CJK>
-0x7224  0x5FD7  # <CJK>
-0x7225  0x6301  # <CJK>
-0x7226  0x6307  # <CJK>
-0x7227  0x646F  # <CJK>
-0x7228  0x652F  # <CJK>
-0x7229  0x65E8  # <CJK>
-0x722A  0x667A  # <CJK>
-0x722B  0x679D  # <CJK>
-0x722C  0x67B3  # <CJK>
-0x722D  0x6B62  # <CJK>
-0x722E  0x6C60  # <CJK>
-0x722F  0x6C9A  # <CJK>
-0x7230  0x6F2C  # <CJK>
-0x7231  0x77E5  # <CJK>
-0x7232  0x7825  # <CJK>
-0x7233  0x7949  # <CJK>
-0x7234  0x7957  # <CJK>
-0x7235  0x7D19  # <CJK>
-0x7236  0x80A2  # <CJK>
-0x7237  0x8102  # <CJK>
-0x7238  0x81F3  # <CJK>
-0x7239  0x829D  # <CJK>
-0x723A  0x82B7  # <CJK>
-0x723B  0x8718  # <CJK>
-0x723C  0x8A8C  # <CJK>
-0x723D  0xF9FC  # <CJK>
-0x723E  0x8D04  # <CJK>
-0x723F  0x8DBE  # <CJK>
-0x7240  0x9072  # <CJK>
-0x7241  0x76F4  # <CJK>
-0x7242  0x7A19  # <CJK>
-0x7243  0x7A37  # <CJK>
-0x7244  0x7E54  # <CJK>
-0x7245  0x8077  # <CJK>
-0x7246  0x5507  # <CJK>
-0x7247  0x55D4  # <CJK>
-0x7248  0x5875  # <CJK>
-0x7249  0x632F  # <CJK>
-0x724A  0x6422  # <CJK>
-0x724B  0x6649  # <CJK>
-0x724C  0x664B  # <CJK>
-0x724D  0x686D  # <CJK>
-0x724E  0x699B  # <CJK>
-0x724F  0x6B84  # <CJK>
-0x7250  0x6D25  # <CJK>
-0x7251  0x6EB1  # <CJK>
-0x7252  0x73CD  # <CJK>
-0x7253  0x7468  # <CJK>
-0x7254  0x74A1  # <CJK>
-0x7255  0x755B  # <CJK>
-0x7256  0x75B9  # <CJK>
-0x7257  0x76E1  # <CJK>
-0x7258  0x771E  # <CJK>
-0x7259  0x778B  # <CJK>
-0x725A  0x79E6  # <CJK>
-0x725B  0x7E09  # <CJK>
-0x725C  0x7E1D  # <CJK>
-0x725D  0x81FB  # <CJK>
-0x725E  0x852F  # <CJK>
-0x725F  0x8897  # <CJK>
-0x7260  0x8A3A  # <CJK>
-0x7261  0x8CD1  # <CJK>
-0x7262  0x8EEB  # <CJK>
-0x7263  0x8FB0  # <CJK>
-0x7264  0x9032  # <CJK>
-0x7265  0x93AD  # <CJK>
-0x7266  0x9663  # <CJK>
-0x7267  0x9673  # <CJK>
-0x7268  0x9707  # <CJK>
-0x7269  0x4F84  # <CJK>
-0x726A  0x53F1  # <CJK>
-0x726B  0x59EA  # <CJK>
-0x726C  0x5AC9  # <CJK>
-0x726D  0x5E19  # <CJK>
-0x726E  0x684E  # <CJK>
-0x726F  0x74C6  # <CJK>
-0x7270  0x75BE  # <CJK>
-0x7271  0x79E9  # <CJK>
-0x7272  0x7A92  # <CJK>
-0x7273  0x81A3  # <CJK>
-0x7274  0x86ED  # <CJK>
-0x7275  0x8CEA  # <CJK>
-0x7276  0x8DCC  # <CJK>
-0x7277  0x8FED  # <CJK>
-0x7278  0x659F  # <CJK>
-0x7279  0x6715  # <CJK>
-0x727A  0xF9FD  # <CJK>
-0x727B  0x57F7  # <CJK>
-0x727C  0x6F57  # <CJK>
-0x727D  0x7DDD  # <CJK>
-0x727E  0x8F2F  # <CJK>
-0x7321  0x93F6  # <CJK>
-0x7322  0x96C6  # <CJK>
-0x7323  0x5FB5  # <CJK>
-0x7324  0x61F2  # <CJK>
-0x7325  0x6F84  # <CJK>
-0x7326  0x4E14  # <CJK>
-0x7327  0x4F98  # <CJK>
-0x7328  0x501F  # <CJK>
-0x7329  0x53C9  # <CJK>
-0x732A  0x55DF  # <CJK>
-0x732B  0x5D6F  # <CJK>
-0x732C  0x5DEE  # <CJK>
-0x732D  0x6B21  # <CJK>
-0x732E  0x6B64  # <CJK>
-0x732F  0x78CB  # <CJK>
-0x7330  0x7B9A  # <CJK>
-0x7331  0xF9FE  # <CJK>
-0x7332  0x8E49  # <CJK>
-0x7333  0x8ECA  # <CJK>
-0x7334  0x906E  # <CJK>
-0x7335  0x6349  # <CJK>
-0x7336  0x643E  # <CJK>
-0x7337  0x7740  # <CJK>
-0x7338  0x7A84  # <CJK>
-0x7339  0x932F  # <CJK>
-0x733A  0x947F  # <CJK>
-0x733B  0x9F6A  # <CJK>
-0x733C  0x64B0  # <CJK>
-0x733D  0x6FAF  # <CJK>
-0x733E  0x71E6  # <CJK>
-0x733F  0x74A8  # <CJK>
-0x7340  0x74DA  # <CJK>
-0x7341  0x7AC4  # <CJK>
-0x7342  0x7C12  # <CJK>
-0x7343  0x7E82  # <CJK>
-0x7344  0x7CB2  # <CJK>
-0x7345  0x7E98  # <CJK>
-0x7346  0x8B9A  # <CJK>
-0x7347  0x8D0A  # <CJK>
-0x7348  0x947D  # <CJK>
-0x7349  0x9910  # <CJK>
-0x734A  0x994C  # <CJK>
-0x734B  0x5239  # <CJK>
-0x734C  0x5BDF  # <CJK>
-0x734D  0x64E6  # <CJK>
-0x734E  0x672D  # <CJK>
-0x734F  0x7D2E  # <CJK>
-0x7350  0x50ED  # <CJK>
-0x7351  0x53C3  # <CJK>
-0x7352  0x5879  # <CJK>
-0x7353  0x6158  # <CJK>
-0x7354  0x6159  # <CJK>
-0x7355  0x61FA  # <CJK>
-0x7356  0x65AC  # <CJK>
-0x7357  0x7AD9  # <CJK>
-0x7358  0x8B92  # <CJK>
-0x7359  0x8B96  # <CJK>
-0x735A  0x5009  # <CJK>
-0x735B  0x5021  # <CJK>
-0x735C  0x5275  # <CJK>
-0x735D  0x5531  # <CJK>
-0x735E  0x5A3C  # <CJK>
-0x735F  0x5EE0  # <CJK>
-0x7360  0x5F70  # <CJK>
-0x7361  0x6134  # <CJK>
-0x7362  0x655E  # <CJK>
-0x7363  0x660C  # <CJK>
-0x7364  0x6636  # <CJK>
-0x7365  0x66A2  # <CJK>
-0x7366  0x69CD  # <CJK>
-0x7367  0x6EC4  # <CJK>
-0x7368  0x6F32  # <CJK>
-0x7369  0x7316  # <CJK>
-0x736A  0x7621  # <CJK>
-0x736B  0x7A93  # <CJK>
-0x736C  0x8139  # <CJK>
-0x736D  0x8259  # <CJK>
-0x736E  0x83D6  # <CJK>
-0x736F  0x84BC  # <CJK>
-0x7370  0x50B5  # <CJK>
-0x7371  0x57F0  # <CJK>
-0x7372  0x5BC0  # <CJK>
-0x7373  0x5BE8  # <CJK>
-0x7374  0x5F69  # <CJK>
-0x7375  0x63A1  # <CJK>
-0x7376  0x7826  # <CJK>
-0x7377  0x7DB5  # <CJK>
-0x7378  0x83DC  # <CJK>
-0x7379  0x8521  # <CJK>
-0x737A  0x91C7  # <CJK>
-0x737B  0x91F5  # <CJK>
-0x737C  0x518A  # <CJK>
-0x737D  0x67F5  # <CJK>
-0x737E  0x7B56  # <CJK>
-0x7421  0x8CAC  # <CJK>
-0x7422  0x51C4  # <CJK>
-0x7423  0x59BB  # <CJK>
-0x7424  0x60BD  # <CJK>
-0x7425  0x8655  # <CJK>
-0x7426  0x501C  # <CJK>
-0x7427  0xF9FF  # <CJK>
-0x7428  0x5254  # <CJK>
-0x7429  0x5C3A  # <CJK>
-0x742A  0x617D  # <CJK>
-0x742B  0x621A  # <CJK>
-0x742C  0x62D3  # <CJK>
-0x742D  0x64F2  # <CJK>
-0x742E  0x65A5  # <CJK>
-0x742F  0x6ECC  # <CJK>
-0x7430  0x7620  # <CJK>
-0x7431  0x810A  # <CJK>
-0x7432  0x8E60  # <CJK>
-0x7433  0x965F  # <CJK>
-0x7434  0x96BB  # <CJK>
-0x7435  0x4EDF  # <CJK>
-0x7436  0x5343  # <CJK>
-0x7437  0x5598  # <CJK>
-0x7438  0x5929  # <CJK>
-0x7439  0x5DDD  # <CJK>
-0x743A  0x64C5  # <CJK>
-0x743B  0x6CC9  # <CJK>
-0x743C  0x6DFA  # <CJK>
-0x743D  0x7394  # <CJK>
-0x743E  0x7A7F  # <CJK>
-0x743F  0x821B  # <CJK>
-0x7440  0x85A6  # <CJK>
-0x7441  0x8CE4  # <CJK>
-0x7442  0x8E10  # <CJK>
-0x7443  0x9077  # <CJK>
-0x7444  0x91E7  # <CJK>
-0x7445  0x95E1  # <CJK>
-0x7446  0x9621  # <CJK>
-0x7447  0x97C6  # <CJK>
-0x7448  0x51F8  # <CJK>
-0x7449  0x54F2  # <CJK>
-0x744A  0x5586  # <CJK>
-0x744B  0x5FB9  # <CJK>
-0x744C  0x64A4  # <CJK>
-0x744D  0x6F88  # <CJK>
-0x744E  0x7DB4  # <CJK>
-0x744F  0x8F1F  # <CJK>
-0x7450  0x8F4D  # <CJK>
-0x7451  0x9435  # <CJK>
-0x7452  0x50C9  # <CJK>
-0x7453  0x5C16  # <CJK>
-0x7454  0x6CBE  # <CJK>
-0x7455  0x6DFB  # <CJK>
-0x7456  0x751B  # <CJK>
-0x7457  0x77BB  # <CJK>
-0x7458  0x7C3D  # <CJK>
-0x7459  0x7C64  # <CJK>
-0x745A  0x8A79  # <CJK>
-0x745B  0x8AC2  # <CJK>
-0x745C  0x581E  # <CJK>
-0x745D  0x59BE  # <CJK>
-0x745E  0x5E16  # <CJK>
-0x745F  0x6377  # <CJK>
-0x7460  0x7252  # <CJK>
-0x7461  0x758A  # <CJK>
-0x7462  0x776B  # <CJK>
-0x7463  0x8ADC  # <CJK>
-0x7464  0x8CBC  # <CJK>
-0x7465  0x8F12  # <CJK>
-0x7466  0x5EF3  # <CJK>
-0x7467  0x6674  # <CJK>
-0x7468  0x6DF8  # <CJK>
-0x7469  0x807D  # <CJK>
-0x746A  0x83C1  # <CJK>
-0x746B  0x8ACB  # <CJK>
-0x746C  0x9751  # <CJK>
-0x746D  0x9BD6  # <CJK>
-0x746E  0xFA00  # <CJK>
-0x746F  0x5243  # <CJK>
-0x7470  0x66FF  # <CJK>
-0x7471  0x6D95  # <CJK>
-0x7472  0x6EEF  # <CJK>
-0x7473  0x7DE0  # <CJK>
-0x7474  0x8AE6  # <CJK>
-0x7475  0x902E  # <CJK>
-0x7476  0x905E  # <CJK>
-0x7477  0x9AD4  # <CJK>
-0x7478  0x521D  # <CJK>
-0x7479  0x527F  # <CJK>
-0x747A  0x54E8  # <CJK>
-0x747B  0x6194  # <CJK>
-0x747C  0x6284  # <CJK>
-0x747D  0x62DB  # <CJK>
-0x747E  0x68A2  # <CJK>
-0x7521  0x6912  # <CJK>
-0x7522  0x695A  # <CJK>
-0x7523  0x6A35  # <CJK>
-0x7524  0x7092  # <CJK>
-0x7525  0x7126  # <CJK>
-0x7526  0x785D  # <CJK>
-0x7527  0x7901  # <CJK>
-0x7528  0x790E  # <CJK>
-0x7529  0x79D2  # <CJK>
-0x752A  0x7A0D  # <CJK>
-0x752B  0x8096  # <CJK>
-0x752C  0x8278  # <CJK>
-0x752D  0x82D5  # <CJK>
-0x752E  0x8349  # <CJK>
-0x752F  0x8549  # <CJK>
-0x7530  0x8C82  # <CJK>
-0x7531  0x8D85  # <CJK>
-0x7532  0x9162  # <CJK>
-0x7533  0x918B  # <CJK>
-0x7534  0x91AE  # <CJK>
-0x7535  0x4FC3  # <CJK>
-0x7536  0x56D1  # <CJK>
-0x7537  0x71ED  # <CJK>
-0x7538  0x77D7  # <CJK>
-0x7539  0x8700  # <CJK>
-0x753A  0x89F8  # <CJK>
-0x753B  0x5BF8  # <CJK>
-0x753C  0x5FD6  # <CJK>
-0x753D  0x6751  # <CJK>
-0x753E  0x90A8  # <CJK>
-0x753F  0x53E2  # <CJK>
-0x7540  0x585A  # <CJK>
-0x7541  0x5BF5  # <CJK>
-0x7542  0x60A4  # <CJK>
-0x7543  0x6181  # <CJK>
-0x7544  0x6460  # <CJK>
-0x7545  0x7E3D  # <CJK>
-0x7546  0x8070  # <CJK>
-0x7547  0x8525  # <CJK>
-0x7548  0x9283  # <CJK>
-0x7549  0x64AE  # <CJK>
-0x754A  0x50AC  # <CJK>
-0x754B  0x5D14  # <CJK>
-0x754C  0x6700  # <CJK>
-0x754D  0x589C  # <CJK>
-0x754E  0x62BD  # <CJK>
-0x754F  0x63A8  # <CJK>
-0x7550  0x690E  # <CJK>
-0x7551  0x6978  # <CJK>
-0x7552  0x6A1E  # <CJK>
-0x7553  0x6E6B  # <CJK>
-0x7554  0x76BA  # <CJK>
-0x7555  0x79CB  # <CJK>
-0x7556  0x82BB  # <CJK>
-0x7557  0x8429  # <CJK>
-0x7558  0x8ACF  # <CJK>
-0x7559  0x8DA8  # <CJK>
-0x755A  0x8FFD  # <CJK>
-0x755B  0x9112  # <CJK>
-0x755C  0x914B  # <CJK>
-0x755D  0x919C  # <CJK>
-0x755E  0x9310  # <CJK>
-0x755F  0x9318  # <CJK>
-0x7560  0x939A  # <CJK>
-0x7561  0x96DB  # <CJK>
-0x7562  0x9A36  # <CJK>
-0x7563  0x9C0D  # <CJK>
-0x7564  0x4E11  # <CJK>
-0x7565  0x755C  # <CJK>
-0x7566  0x795D  # <CJK>
-0x7567  0x7AFA  # <CJK>
-0x7568  0x7B51  # <CJK>
-0x7569  0x7BC9  # <CJK>
-0x756A  0x7E2E  # <CJK>
-0x756B  0x84C4  # <CJK>
-0x756C  0x8E59  # <CJK>
-0x756D  0x8E74  # <CJK>
-0x756E  0x8EF8  # <CJK>
-0x756F  0x9010  # <CJK>
-0x7570  0x6625  # <CJK>
-0x7571  0x693F  # <CJK>
-0x7572  0x7443  # <CJK>
-0x7573  0x51FA  # <CJK>
-0x7574  0x672E  # <CJK>
-0x7575  0x9EDC  # <CJK>
-0x7576  0x5145  # <CJK>
-0x7577  0x5FE0  # <CJK>
-0x7578  0x6C96  # <CJK>
-0x7579  0x87F2  # <CJK>
-0x757A  0x885D  # <CJK>
-0x757B  0x8877  # <CJK>
-0x757C  0x60B4  # <CJK>
-0x757D  0x81B5  # <CJK>
-0x757E  0x8403  # <CJK>
-0x7621  0x8D05  # <CJK>
-0x7622  0x53D6  # <CJK>
-0x7623  0x5439  # <CJK>
-0x7624  0x5634  # <CJK>
-0x7625  0x5A36  # <CJK>
-0x7626  0x5C31  # <CJK>
-0x7627  0x708A  # <CJK>
-0x7628  0x7FE0  # <CJK>
-0x7629  0x805A  # <CJK>
-0x762A  0x8106  # <CJK>
-0x762B  0x81ED  # <CJK>
-0x762C  0x8DA3  # <CJK>
-0x762D  0x9189  # <CJK>
-0x762E  0x9A5F  # <CJK>
-0x762F  0x9DF2  # <CJK>
-0x7630  0x5074  # <CJK>
-0x7631  0x4EC4  # <CJK>
-0x7632  0x53A0  # <CJK>
-0x7633  0x60FB  # <CJK>
-0x7634  0x6E2C  # <CJK>
-0x7635  0x5C64  # <CJK>
-0x7636  0x4F88  # <CJK>
-0x7637  0x5024  # <CJK>
-0x7638  0x55E4  # <CJK>
-0x7639  0x5CD9  # <CJK>
-0x763A  0x5E5F  # <CJK>
-0x763B  0x6065  # <CJK>
-0x763C  0x6894  # <CJK>
-0x763D  0x6CBB  # <CJK>
-0x763E  0x6DC4  # <CJK>
-0x763F  0x71BE  # <CJK>
-0x7640  0x75D4  # <CJK>
-0x7641  0x75F4  # <CJK>
-0x7642  0x7661  # <CJK>
-0x7643  0x7A1A  # <CJK>
-0x7644  0x7A49  # <CJK>
-0x7645  0x7DC7  # <CJK>
-0x7646  0x7DFB  # <CJK>
-0x7647  0x7F6E  # <CJK>
-0x7648  0x81F4  # <CJK>
-0x7649  0x86A9  # <CJK>
-0x764A  0x8F1C  # <CJK>
-0x764B  0x96C9  # <CJK>
-0x764C  0x99B3  # <CJK>
-0x764D  0x9F52  # <CJK>
-0x764E  0x5247  # <CJK>
-0x764F  0x52C5  # <CJK>
-0x7650  0x98ED  # <CJK>
-0x7651  0x89AA  # <CJK>
-0x7652  0x4E03  # <CJK>
-0x7653  0x67D2  # <CJK>
-0x7654  0x6F06  # <CJK>
-0x7655  0x4FB5  # <CJK>
-0x7656  0x5BE2  # <CJK>
-0x7657  0x6795  # <CJK>
-0x7658  0x6C88  # <CJK>
-0x7659  0x6D78  # <CJK>
-0x765A  0x741B  # <CJK>
-0x765B  0x7827  # <CJK>
-0x765C  0x91DD  # <CJK>
-0x765D  0x937C  # <CJK>
-0x765E  0x87C4  # <CJK>
-0x765F  0x79E4  # <CJK>
-0x7660  0x7A31  # <CJK>
-0x7661  0x5FEB  # <CJK>
-0x7662  0x4ED6  # <CJK>
-0x7663  0x54A4  # <CJK>
-0x7664  0x553E  # <CJK>
-0x7665  0x58AE  # <CJK>
-0x7666  0x59A5  # <CJK>
-0x7667  0x60F0  # <CJK>
-0x7668  0x6253  # <CJK>
-0x7669  0x62D6  # <CJK>
-0x766A  0x6736  # <CJK>
-0x766B  0x6955  # <CJK>
-0x766C  0x8235  # <CJK>
-0x766D  0x9640  # <CJK>
-0x766E  0x99B1  # <CJK>
-0x766F  0x99DD  # <CJK>
-0x7670  0x502C  # <CJK>
-0x7671  0x5353  # <CJK>
-0x7672  0x5544  # <CJK>
-0x7673  0x577C  # <CJK>
-0x7674  0xFA01  # <CJK>
-0x7675  0x6258  # <CJK>
-0x7676  0xFA02  # <CJK>
-0x7677  0x64E2  # <CJK>
-0x7678  0x666B  # <CJK>
-0x7679  0x67DD  # <CJK>
-0x767A  0x6FC1  # <CJK>
-0x767B  0x6FEF  # <CJK>
-0x767C  0x7422  # <CJK>
-0x767D  0x7438  # <CJK>
-0x767E  0x8A17  # <CJK>
-0x7721  0x9438  # <CJK>
-0x7722  0x5451  # <CJK>
-0x7723  0x5606  # <CJK>
-0x7724  0x5766  # <CJK>
-0x7725  0x5F48  # <CJK>
-0x7726  0x619A  # <CJK>
-0x7727  0x6B4E  # <CJK>
-0x7728  0x7058  # <CJK>
-0x7729  0x70AD  # <CJK>
-0x772A  0x7DBB  # <CJK>
-0x772B  0x8A95  # <CJK>
-0x772C  0x596A  # <CJK>
-0x772D  0x812B  # <CJK>
-0x772E  0x63A2  # <CJK>
-0x772F  0x7708  # <CJK>
-0x7730  0x803D  # <CJK>
-0x7731  0x8CAA  # <CJK>
-0x7732  0x5854  # <CJK>
-0x7733  0x642D  # <CJK>
-0x7734  0x69BB  # <CJK>
-0x7735  0x5B95  # <CJK>
-0x7736  0x5E11  # <CJK>
-0x7737  0x6E6F  # <CJK>
-0x7738  0xFA03  # <CJK>
-0x7739  0x8569  # <CJK>
-0x773A  0x514C  # <CJK>
-0x773B  0x53F0  # <CJK>
-0x773C  0x592A  # <CJK>
-0x773D  0x6020  # <CJK>
-0x773E  0x614B  # <CJK>
-0x773F  0x6B86  # <CJK>
-0x7740  0x6C70  # <CJK>
-0x7741  0x6CF0  # <CJK>
-0x7742  0x7B1E  # <CJK>
-0x7743  0x80CE  # <CJK>
-0x7744  0x82D4  # <CJK>
-0x7745  0x8DC6  # <CJK>
-0x7746  0x90B0  # <CJK>
-0x7747  0x98B1  # <CJK>
-0x7748  0xFA04  # <CJK>
-0x7749  0x64C7  # <CJK>
-0x774A  0x6FA4  # <CJK>
-0x774B  0x6491  # <CJK>
-0x774C  0x6504  # <CJK>
-0x774D  0x514E  # <CJK>
-0x774E  0x5410  # <CJK>
-0x774F  0x571F  # <CJK>
-0x7750  0x8A0E  # <CJK>
-0x7751  0x615F  # <CJK>
-0x7752  0x6876  # <CJK>
-0x7753  0xFA05  # <CJK>
-0x7754  0x75DB  # <CJK>
-0x7755  0x7B52  # <CJK>
-0x7756  0x7D71  # <CJK>
-0x7757  0x901A  # <CJK>
-0x7758  0x5806  # <CJK>
-0x7759  0x69CC  # <CJK>
-0x775A  0x817F  # <CJK>
-0x775B  0x892A  # <CJK>
-0x775C  0x9000  # <CJK>
-0x775D  0x9839  # <CJK>
-0x775E  0x5078  # <CJK>
-0x775F  0x5957  # <CJK>
-0x7760  0x59AC  # <CJK>
-0x7761  0x6295  # <CJK>
-0x7762  0x900F  # <CJK>
-0x7763  0x9B2A  # <CJK>
-0x7764  0x615D  # <CJK>
-0x7765  0x7279  # <CJK>
-0x7766  0x95D6  # <CJK>
-0x7767  0x5761  # <CJK>
-0x7768  0x5A46  # <CJK>
-0x7769  0x5DF4  # <CJK>
-0x776A  0x628A  # <CJK>
-0x776B  0x64AD  # <CJK>
-0x776C  0x64FA  # <CJK>
-0x776D  0x6777  # <CJK>
-0x776E  0x6CE2  # <CJK>
-0x776F  0x6D3E  # <CJK>
-0x7770  0x722C  # <CJK>
-0x7771  0x7436  # <CJK>
-0x7772  0x7834  # <CJK>
-0x7773  0x7F77  # <CJK>
-0x7774  0x82AD  # <CJK>
-0x7775  0x8DDB  # <CJK>
-0x7776  0x9817  # <CJK>
-0x7777  0x5224  # <CJK>
-0x7778  0x5742  # <CJK>
-0x7779  0x677F  # <CJK>
-0x777A  0x7248  # <CJK>
-0x777B  0x74E3  # <CJK>
-0x777C  0x8CA9  # <CJK>
-0x777D  0x8FA6  # <CJK>
-0x777E  0x9211  # <CJK>
-0x7821  0x962A  # <CJK>
-0x7822  0x516B  # <CJK>
-0x7823  0x53ED  # <CJK>
-0x7824  0x634C  # <CJK>
-0x7825  0x4F69  # <CJK>
-0x7826  0x5504  # <CJK>
-0x7827  0x6096  # <CJK>
-0x7828  0x6557  # <CJK>
-0x7829  0x6C9B  # <CJK>
-0x782A  0x6D7F  # <CJK>
-0x782B  0x724C  # <CJK>
-0x782C  0x72FD  # <CJK>
-0x782D  0x7A17  # <CJK>
-0x782E  0x8987  # <CJK>
-0x782F  0x8C9D  # <CJK>
-0x7830  0x5F6D  # <CJK>
-0x7831  0x6F8E  # <CJK>
-0x7832  0x70F9  # <CJK>
-0x7833  0x81A8  # <CJK>
-0x7834  0x610E  # <CJK>
-0x7835  0x4FBF  # <CJK>
-0x7836  0x504F  # <CJK>
-0x7837  0x6241  # <CJK>
-0x7838  0x7247  # <CJK>
-0x7839  0x7BC7  # <CJK>
-0x783A  0x7DE8  # <CJK>
-0x783B  0x7FE9  # <CJK>
-0x783C  0x904D  # <CJK>
-0x783D  0x97AD  # <CJK>
-0x783E  0x9A19  # <CJK>
-0x783F  0x8CB6  # <CJK>
-0x7840  0x576A  # <CJK>
-0x7841  0x5E73  # <CJK>
-0x7842  0x67B0  # <CJK>
-0x7843  0x840D  # <CJK>
-0x7844  0x8A55  # <CJK>
-0x7845  0x5420  # <CJK>
-0x7846  0x5B16  # <CJK>
-0x7847  0x5E63  # <CJK>
-0x7848  0x5EE2  # <CJK>
-0x7849  0x5F0A  # <CJK>
-0x784A  0x6583  # <CJK>
-0x784B  0x80BA  # <CJK>
-0x784C  0x853D  # <CJK>
-0x784D  0x9589  # <CJK>
-0x784E  0x965B  # <CJK>
-0x784F  0x4F48  # <CJK>
-0x7850  0x5305  # <CJK>
-0x7851  0x530D  # <CJK>
-0x7852  0x530F  # <CJK>
-0x7853  0x5486  # <CJK>
-0x7854  0x54FA  # <CJK>
-0x7855  0x5703  # <CJK>
-0x7856  0x5E03  # <CJK>
-0x7857  0x6016  # <CJK>
-0x7858  0x629B  # <CJK>
-0x7859  0x62B1  # <CJK>
-0x785A  0x6355  # <CJK>
-0x785B  0xFA06  # <CJK>
-0x785C  0x6CE1  # <CJK>
-0x785D  0x6D66  # <CJK>
-0x785E  0x75B1  # <CJK>
-0x785F  0x7832  # <CJK>
-0x7860  0x80DE  # <CJK>
-0x7861  0x812F  # <CJK>
-0x7862  0x82DE  # <CJK>
-0x7863  0x8461  # <CJK>
-0x7864  0x84B2  # <CJK>
-0x7865  0x888D  # <CJK>
-0x7866  0x8912  # <CJK>
-0x7867  0x900B  # <CJK>
-0x7868  0x92EA  # <CJK>
-0x7869  0x98FD  # <CJK>
-0x786A  0x9B91  # <CJK>
-0x786B  0x5E45  # <CJK>
-0x786C  0x66B4  # <CJK>
-0x786D  0x66DD  # <CJK>
-0x786E  0x7011  # <CJK>
-0x786F  0x7206  # <CJK>
-0x7870  0xFA07  # <CJK>
-0x7871  0x4FF5  # <CJK>
-0x7872  0x527D  # <CJK>
-0x7873  0x5F6A  # <CJK>
-0x7874  0x6153  # <CJK>
-0x7875  0x6753  # <CJK>
-0x7876  0x6A19  # <CJK>
-0x7877  0x6F02  # <CJK>
-0x7878  0x74E2  # <CJK>
-0x7879  0x7968  # <CJK>
-0x787A  0x8868  # <CJK>
-0x787B  0x8C79  # <CJK>
-0x787C  0x98C7  # <CJK>
-0x787D  0x98C4  # <CJK>
-0x787E  0x9A43  # <CJK>
-0x7921  0x54C1  # <CJK>
-0x7922  0x7A1F  # <CJK>
-0x7923  0x6953  # <CJK>
-0x7924  0x8AF7  # <CJK>
-0x7925  0x8C4A  # <CJK>
-0x7926  0x98A8  # <CJK>
-0x7927  0x99AE  # <CJK>
-0x7928  0x5F7C  # <CJK>
-0x7929  0x62AB  # <CJK>
-0x792A  0x75B2  # <CJK>
-0x792B  0x76AE  # <CJK>
-0x792C  0x88AB  # <CJK>
-0x792D  0x907F  # <CJK>
-0x792E  0x9642  # <CJK>
-0x792F  0x5339  # <CJK>
-0x7930  0x5F3C  # <CJK>
-0x7931  0x5FC5  # <CJK>
-0x7932  0x6CCC  # <CJK>
-0x7933  0x73CC  # <CJK>
-0x7934  0x7562  # <CJK>
-0x7935  0x758B  # <CJK>
-0x7936  0x7B46  # <CJK>
-0x7937  0x82FE  # <CJK>
-0x7938  0x999D  # <CJK>
-0x7939  0x4E4F  # <CJK>
-0x793A  0x903C  # <CJK>
-0x793B  0x4E0B  # <CJK>
-0x793C  0x4F55  # <CJK>
-0x793D  0x53A6  # <CJK>
-0x793E  0x590F  # <CJK>
-0x793F  0x5EC8  # <CJK>
-0x7940  0x6630  # <CJK>
-0x7941  0x6CB3  # <CJK>
-0x7942  0x7455  # <CJK>
-0x7943  0x8377  # <CJK>
-0x7944  0x8766  # <CJK>
-0x7945  0x8CC0  # <CJK>
-0x7946  0x9050  # <CJK>
-0x7947  0x971E  # <CJK>
-0x7948  0x9C15  # <CJK>
-0x7949  0x58D1  # <CJK>
-0x794A  0x5B78  # <CJK>
-0x794B  0x8650  # <CJK>
-0x794C  0x8B14  # <CJK>
-0x794D  0x9DB4  # <CJK>
-0x794E  0x5BD2  # <CJK>
-0x794F  0x6068  # <CJK>
-0x7950  0x608D  # <CJK>
-0x7951  0x65F1  # <CJK>
-0x7952  0x6C57  # <CJK>
-0x7953  0x6F22  # <CJK>
-0x7954  0x6FA3  # <CJK>
-0x7955  0x701A  # <CJK>
-0x7956  0x7F55  # <CJK>
-0x7957  0x7FF0  # <CJK>
-0x7958  0x9591  # <CJK>
-0x7959  0x9592  # <CJK>
-0x795A  0x9650  # <CJK>
-0x795B  0x97D3  # <CJK>
-0x795C  0x5272  # <CJK>
-0x795D  0x8F44  # <CJK>
-0x795E  0x51FD  # <CJK>
-0x795F  0x542B  # <CJK>
-0x7960  0x54B8  # <CJK>
-0x7961  0x5563  # <CJK>
-0x7962  0x558A  # <CJK>
-0x7963  0x6ABB  # <CJK>
-0x7964  0x6DB5  # <CJK>
-0x7965  0x7DD8  # <CJK>
-0x7966  0x8266  # <CJK>
-0x7967  0x929C  # <CJK>
-0x7968  0x9677  # <CJK>
-0x7969  0x9E79  # <CJK>
-0x796A  0x5408  # <CJK>
-0x796B  0x54C8  # <CJK>
-0x796C  0x76D2  # <CJK>
-0x796D  0x86E4  # <CJK>
-0x796E  0x95A4  # <CJK>
-0x796F  0x95D4  # <CJK>
-0x7970  0x965C  # <CJK>
-0x7971  0x4EA2  # <CJK>
-0x7972  0x4F09  # <CJK>
-0x7973  0x59EE  # <CJK>
-0x7974  0x5AE6  # <CJK>
-0x7975  0x5DF7  # <CJK>
-0x7976  0x6052  # <CJK>
-0x7977  0x6297  # <CJK>
-0x7978  0x676D  # <CJK>
-0x7979  0x6841  # <CJK>
-0x797A  0x6C86  # <CJK>
-0x797B  0x6E2F  # <CJK>
-0x797C  0x7F38  # <CJK>
-0x797D  0x809B  # <CJK>
-0x797E  0x822A  # <CJK>
-0x7A21  0xFA08  # <CJK>
-0x7A22  0xFA09  # <CJK>
-0x7A23  0x9805  # <CJK>
-0x7A24  0x4EA5  # <CJK>
-0x7A25  0x5055  # <CJK>
-0x7A26  0x54B3  # <CJK>
-0x7A27  0x5793  # <CJK>
-0x7A28  0x595A  # <CJK>
-0x7A29  0x5B69  # <CJK>
-0x7A2A  0x5BB3  # <CJK>
-0x7A2B  0x61C8  # <CJK>
-0x7A2C  0x6977  # <CJK>
-0x7A2D  0x6D77  # <CJK>
-0x7A2E  0x7023  # <CJK>
-0x7A2F  0x87F9  # <CJK>
-0x7A30  0x89E3  # <CJK>
-0x7A31  0x8A72  # <CJK>
-0x7A32  0x8AE7  # <CJK>
-0x7A33  0x9082  # <CJK>
-0x7A34  0x99ED  # <CJK>
-0x7A35  0x9AB8  # <CJK>
-0x7A36  0x52BE  # <CJK>
-0x7A37  0x6838  # <CJK>
-0x7A38  0x5016  # <CJK>
-0x7A39  0x5E78  # <CJK>
-0x7A3A  0x674F  # <CJK>
-0x7A3B  0x8347  # <CJK>
-0x7A3C  0x884C  # <CJK>
-0x7A3D  0x4EAB  # <CJK>
-0x7A3E  0x5411  # <CJK>
-0x7A3F  0x56AE  # <CJK>
-0x7A40  0x73E6  # <CJK>
-0x7A41  0x9115  # <CJK>
-0x7A42  0x97FF  # <CJK>
-0x7A43  0x9909  # <CJK>
-0x7A44  0x9957  # <CJK>
-0x7A45  0x9999  # <CJK>
-0x7A46  0x5653  # <CJK>
-0x7A47  0x589F  # <CJK>
-0x7A48  0x865B  # <CJK>
-0x7A49  0x8A31  # <CJK>
-0x7A4A  0x61B2  # <CJK>
-0x7A4B  0x6AF6  # <CJK>
-0x7A4C  0x737B  # <CJK>
-0x7A4D  0x8ED2  # <CJK>
-0x7A4E  0x6B47  # <CJK>
-0x7A4F  0x96AA  # <CJK>
-0x7A50  0x9A57  # <CJK>
-0x7A51  0x5955  # <CJK>
-0x7A52  0x7200  # <CJK>
-0x7A53  0x8D6B  # <CJK>
-0x7A54  0x9769  # <CJK>
-0x7A55  0x4FD4  # <CJK>
-0x7A56  0x5CF4  # <CJK>
-0x7A57  0x5F26  # <CJK>
-0x7A58  0x61F8  # <CJK>
-0x7A59  0x665B  # <CJK>
-0x7A5A  0x6CEB  # <CJK>
-0x7A5B  0x70AB  # <CJK>
-0x7A5C  0x7384  # <CJK>
-0x7A5D  0x73B9  # <CJK>
-0x7A5E  0x73FE  # <CJK>
-0x7A5F  0x7729  # <CJK>
-0x7A60  0x774D  # <CJK>
-0x7A61  0x7D43  # <CJK>
-0x7A62  0x7D62  # <CJK>
-0x7A63  0x7E23  # <CJK>
-0x7A64  0x8237  # <CJK>
-0x7A65  0x8852  # <CJK>
-0x7A66  0xFA0A  # <CJK>
-0x7A67  0x8CE2  # <CJK>
-0x7A68  0x9249  # <CJK>
-0x7A69  0x986F  # <CJK>
-0x7A6A  0x5B51  # <CJK>
-0x7A6B  0x7A74  # <CJK>
-0x7A6C  0x8840  # <CJK>
-0x7A6D  0x9801  # <CJK>
-0x7A6E  0x5ACC  # <CJK>
-0x7A6F  0x4FE0  # <CJK>
-0x7A70  0x5354  # <CJK>
-0x7A71  0x593E  # <CJK>
-0x7A72  0x5CFD  # <CJK>
-0x7A73  0x633E  # <CJK>
-0x7A74  0x6D79  # <CJK>
-0x7A75  0x72F9  # <CJK>
-0x7A76  0x8105  # <CJK>
-0x7A77  0x8107  # <CJK>
-0x7A78  0x83A2  # <CJK>
-0x7A79  0x92CF  # <CJK>
-0x7A7A  0x9830  # <CJK>
-0x7A7B  0x4EA8  # <CJK>
-0x7A7C  0x5144  # <CJK>
-0x7A7D  0x5211  # <CJK>
-0x7A7E  0x578B  # <CJK>
-0x7B21  0x5F62  # <CJK>
-0x7B22  0x6CC2  # <CJK>
-0x7B23  0x6ECE  # <CJK>
-0x7B24  0x7005  # <CJK>
-0x7B25  0x7050  # <CJK>
-0x7B26  0x70AF  # <CJK>
-0x7B27  0x7192  # <CJK>
-0x7B28  0x73E9  # <CJK>
-0x7B29  0x7469  # <CJK>
-0x7B2A  0x834A  # <CJK>
-0x7B2B  0x87A2  # <CJK>
-0x7B2C  0x8861  # <CJK>
-0x7B2D  0x9008  # <CJK>
-0x7B2E  0x90A2  # <CJK>
-0x7B2F  0x93A3  # <CJK>
-0x7B30  0x99A8  # <CJK>
-0x7B31  0x516E  # <CJK>
-0x7B32  0x5F57  # <CJK>
-0x7B33  0x60E0  # <CJK>
-0x7B34  0x6167  # <CJK>
-0x7B35  0x66B3  # <CJK>
-0x7B36  0x8559  # <CJK>
-0x7B37  0x8E4A  # <CJK>
-0x7B38  0x91AF  # <CJK>
-0x7B39  0x978B  # <CJK>
-0x7B3A  0x4E4E  # <CJK>
-0x7B3B  0x4E92  # <CJK>
-0x7B3C  0x547C  # <CJK>
-0x7B3D  0x58D5  # <CJK>
-0x7B3E  0x58FA  # <CJK>
-0x7B3F  0x597D  # <CJK>
-0x7B40  0x5CB5  # <CJK>
-0x7B41  0x5F27  # <CJK>
-0x7B42  0x6236  # <CJK>
-0x7B43  0x6248  # <CJK>
-0x7B44  0x660A  # <CJK>
-0x7B45  0x6667  # <CJK>
-0x7B46  0x6BEB  # <CJK>
-0x7B47  0x6D69  # <CJK>
-0x7B48  0x6DCF  # <CJK>
-0x7B49  0x6E56  # <CJK>
-0x7B4A  0x6EF8  # <CJK>
-0x7B4B  0x6F94  # <CJK>
-0x7B4C  0x6FE0  # <CJK>
-0x7B4D  0x6FE9  # <CJK>
-0x7B4E  0x705D  # <CJK>
-0x7B4F  0x72D0  # <CJK>
-0x7B50  0x7425  # <CJK>
-0x7B51  0x745A  # <CJK>
-0x7B52  0x74E0  # <CJK>
-0x7B53  0x7693  # <CJK>
-0x7B54  0x795C  # <CJK>
-0x7B55  0x7CCA  # <CJK>
-0x7B56  0x7E1E  # <CJK>
-0x7B57  0x80E1  # <CJK>
-0x7B58  0x82A6  # <CJK>
-0x7B59  0x846B  # <CJK>
-0x7B5A  0x84BF  # <CJK>
-0x7B5B  0x864E  # <CJK>
-0x7B5C  0x865F  # <CJK>
-0x7B5D  0x8774  # <CJK>
-0x7B5E  0x8B77  # <CJK>
-0x7B5F  0x8C6A  # <CJK>
-0x7B60  0x93AC  # <CJK>
-0x7B61  0x9800  # <CJK>
-0x7B62  0x9865  # <CJK>
-0x7B63  0x60D1  # <CJK>
-0x7B64  0x6216  # <CJK>
-0x7B65  0x9177  # <CJK>
-0x7B66  0x5A5A  # <CJK>
-0x7B67  0x660F  # <CJK>
-0x7B68  0x6DF7  # <CJK>
-0x7B69  0x6E3E  # <CJK>
-0x7B6A  0x743F  # <CJK>
-0x7B6B  0x9B42  # <CJK>
-0x7B6C  0x5FFD  # <CJK>
-0x7B6D  0x60DA  # <CJK>
-0x7B6E  0x7B0F  # <CJK>
-0x7B6F  0x54C4  # <CJK>
-0x7B70  0x5F18  # <CJK>
-0x7B71  0x6C5E  # <CJK>
-0x7B72  0x6CD3  # <CJK>
-0x7B73  0x6D2A  # <CJK>
-0x7B74  0x70D8  # <CJK>
-0x7B75  0x7D05  # <CJK>
-0x7B76  0x8679  # <CJK>
-0x7B77  0x8A0C  # <CJK>
-0x7B78  0x9D3B  # <CJK>
-0x7B79  0x5316  # <CJK>
-0x7B7A  0x548C  # <CJK>
-0x7B7B  0x5B05  # <CJK>
-0x7B7C  0x6A3A  # <CJK>
-0x7B7D  0x706B  # <CJK>
-0x7B7E  0x7575  # <CJK>
-0x7C21  0x798D  # <CJK>
-0x7C22  0x79BE  # <CJK>
-0x7C23  0x82B1  # <CJK>
-0x7C24  0x83EF  # <CJK>
-0x7C25  0x8A71  # <CJK>
-0x7C26  0x8B41  # <CJK>
-0x7C27  0x8CA8  # <CJK>
-0x7C28  0x9774  # <CJK>
-0x7C29  0xFA0B  # <CJK>
-0x7C2A  0x64F4  # <CJK>
-0x7C2B  0x652B  # <CJK>
-0x7C2C  0x78BA  # <CJK>
-0x7C2D  0x78BB  # <CJK>
-0x7C2E  0x7A6B  # <CJK>
-0x7C2F  0x4E38  # <CJK>
-0x7C30  0x559A  # <CJK>
-0x7C31  0x5950  # <CJK>
-0x7C32  0x5BA6  # <CJK>
-0x7C33  0x5E7B  # <CJK>
-0x7C34  0x60A3  # <CJK>
-0x7C35  0x63DB  # <CJK>
-0x7C36  0x6B61  # <CJK>
-0x7C37  0x6665  # <CJK>
-0x7C38  0x6853  # <CJK>
-0x7C39  0x6E19  # <CJK>
-0x7C3A  0x7165  # <CJK>
-0x7C3B  0x74B0  # <CJK>
-0x7C3C  0x7D08  # <CJK>
-0x7C3D  0x9084  # <CJK>
-0x7C3E  0x9A69  # <CJK>
-0x7C3F  0x9C25  # <CJK>
-0x7C40  0x6D3B  # <CJK>
-0x7C41  0x6ED1  # <CJK>
-0x7C42  0x733E  # <CJK>
-0x7C43  0x8C41  # <CJK>
-0x7C44  0x95CA  # <CJK>
-0x7C45  0x51F0  # <CJK>
-0x7C46  0x5E4C  # <CJK>
-0x7C47  0x5FA8  # <CJK>
-0x7C48  0x604D  # <CJK>
-0x7C49  0x60F6  # <CJK>
-0x7C4A  0x6130  # <CJK>
-0x7C4B  0x614C  # <CJK>
-0x7C4C  0x6643  # <CJK>
-0x7C4D  0x6644  # <CJK>
-0x7C4E  0x69A5  # <CJK>
-0x7C4F  0x6CC1  # <CJK>
-0x7C50  0x6E5F  # <CJK>
-0x7C51  0x6EC9  # <CJK>
-0x7C52  0x6F62  # <CJK>
-0x7C53  0x714C  # <CJK>
-0x7C54  0x749C  # <CJK>
-0x7C55  0x7687  # <CJK>
-0x7C56  0x7BC1  # <CJK>
-0x7C57  0x7C27  # <CJK>
-0x7C58  0x8352  # <CJK>
-0x7C59  0x8757  # <CJK>
-0x7C5A  0x9051  # <CJK>
-0x7C5B  0x968D  # <CJK>
-0x7C5C  0x9EC3  # <CJK>
-0x7C5D  0x532F  # <CJK>
-0x7C5E  0x56DE  # <CJK>
-0x7C5F  0x5EFB  # <CJK>
-0x7C60  0x5F8A  # <CJK>
-0x7C61  0x6062  # <CJK>
-0x7C62  0x6094  # <CJK>
-0x7C63  0x61F7  # <CJK>
-0x7C64  0x6666  # <CJK>
-0x7C65  0x6703  # <CJK>
-0x7C66  0x6A9C  # <CJK>
-0x7C67  0x6DEE  # <CJK>
-0x7C68  0x6FAE  # <CJK>
-0x7C69  0x7070  # <CJK>
-0x7C6A  0x736A  # <CJK>
-0x7C6B  0x7E6A  # <CJK>
-0x7C6C  0x81BE  # <CJK>
-0x7C6D  0x8334  # <CJK>
-0x7C6E  0x86D4  # <CJK>
-0x7C6F  0x8AA8  # <CJK>
-0x7C70  0x8CC4  # <CJK>
-0x7C71  0x5283  # <CJK>
-0x7C72  0x7372  # <CJK>
-0x7C73  0x5B96  # <CJK>
-0x7C74  0x6A6B  # <CJK>
-0x7C75  0x9404  # <CJK>
-0x7C76  0x54EE  # <CJK>
-0x7C77  0x5686  # <CJK>
-0x7C78  0x5B5D  # <CJK>
-0x7C79  0x6548  # <CJK>
-0x7C7A  0x6585  # <CJK>
-0x7C7B  0x66C9  # <CJK>
-0x7C7C  0x689F  # <CJK>
-0x7C7D  0x6D8D  # <CJK>
-0x7C7E  0x6DC6  # <CJK>
-0x7D21  0x723B  # <CJK>
-0x7D22  0x80B4  # <CJK>
-0x7D23  0x9175  # <CJK>
-0x7D24  0x9A4D  # <CJK>
-0x7D25  0x4FAF  # <CJK>
-0x7D26  0x5019  # <CJK>
-0x7D27  0x539A  # <CJK>
-0x7D28  0x540E  # <CJK>
-0x7D29  0x543C  # <CJK>
-0x7D2A  0x5589  # <CJK>
-0x7D2B  0x55C5  # <CJK>
-0x7D2C  0x5E3F  # <CJK>
-0x7D2D  0x5F8C  # <CJK>
-0x7D2E  0x673D  # <CJK>
-0x7D2F  0x7166  # <CJK>
-0x7D30  0x73DD  # <CJK>
-0x7D31  0x9005  # <CJK>
-0x7D32  0x52DB  # <CJK>
-0x7D33  0x52F3  # <CJK>
-0x7D34  0x5864  # <CJK>
-0x7D35  0x58CE  # <CJK>
-0x7D36  0x7104  # <CJK>
-0x7D37  0x718F  # <CJK>
-0x7D38  0x71FB  # <CJK>
-0x7D39  0x85B0  # <CJK>
-0x7D3A  0x8A13  # <CJK>
-0x7D3B  0x6688  # <CJK>
-0x7D3C  0x85A8  # <CJK>
-0x7D3D  0x55A7  # <CJK>
-0x7D3E  0x6684  # <CJK>
-0x7D3F  0x714A  # <CJK>
-0x7D40  0x8431  # <CJK>
-0x7D41  0x5349  # <CJK>
-0x7D42  0x5599  # <CJK>
-0x7D43  0x6BC1  # <CJK>
-0x7D44  0x5F59  # <CJK>
-0x7D45  0x5FBD  # <CJK>
-0x7D46  0x63EE  # <CJK>
-0x7D47  0x6689  # <CJK>
-0x7D48  0x7147  # <CJK>
-0x7D49  0x8AF1  # <CJK>
-0x7D4A  0x8F1D  # <CJK>
-0x7D4B  0x9EBE  # <CJK>
-0x7D4C  0x4F11  # <CJK>
-0x7D4D  0x643A  # <CJK>
-0x7D4E  0x70CB  # <CJK>
-0x7D4F  0x7566  # <CJK>
-0x7D50  0x8667  # <CJK>
-0x7D51  0x6064  # <CJK>
-0x7D52  0x8B4E  # <CJK>
-0x7D53  0x9DF8  # <CJK>
-0x7D54  0x5147  # <CJK>
-0x7D55  0x51F6  # <CJK>
-0x7D56  0x5308  # <CJK>
-0x7D57  0x6D36  # <CJK>
-0x7D58  0x80F8  # <CJK>
-0x7D59  0x9ED1  # <CJK>
-0x7D5A  0x6615  # <CJK>
-0x7D5B  0x6B23  # <CJK>
-0x7D5C  0x7098  # <CJK>
-0x7D5D  0x75D5  # <CJK>
-0x7D5E  0x5403  # <CJK>
-0x7D5F  0x5C79  # <CJK>
-0x7D60  0x7D07  # <CJK>
-0x7D61  0x8A16  # <CJK>
-0x7D62  0x6B20  # <CJK>
-0x7D63  0x6B3D  # <CJK>
-0x7D64  0x6B46  # <CJK>
-0x7D65  0x5438  # <CJK>
-0x7D66  0x6070  # <CJK>
-0x7D67  0x6D3D  # <CJK>
-0x7D68  0x7FD5  # <CJK>
-0x7D69  0x8208  # <CJK>
-0x7D6A  0x50D6  # <CJK>
-0x7D6B  0x51DE  # <CJK>
-0x7D6C  0x559C  # <CJK>
-0x7D6D  0x566B  # <CJK>
-0x7D6E  0x56CD  # <CJK>
-0x7D6F  0x59EC  # <CJK>
-0x7D70  0x5B09  # <CJK>
-0x7D71  0x5E0C  # <CJK>
-0x7D72  0x6199  # <CJK>
-0x7D73  0x6198  # <CJK>
-0x7D74  0x6231  # <CJK>
-0x7D75  0x665E  # <CJK>
-0x7D76  0x66E6  # <CJK>
-0x7D77  0x7199  # <CJK>
-0x7D78  0x71B9  # <CJK>
-0x7D79  0x71BA  # <CJK>
-0x7D7A  0x72A7  # <CJK>
-0x7D7B  0x79A7  # <CJK>
-0x7D7C  0x7A00  # <CJK>
-0x7D7D  0x7FB2  # <CJK>
-0x7D7E  0x8A70  # <CJK>
diff --git a/tools/encoding/macCentEuro.txt b/tools/encoding/macCentEuro.txt
deleted file mode 100644
index bff8b30..0000000
--- a/tools/encoding/macCentEuro.txt
+++ /dev/null
@@ -1,293 +0,0 @@
-#
-#   Name:             MacOS_CentralEurope [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <5>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS CentralEurope code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS CentralEurope code order.
-#
-#   Notes on MacOS CentralEurope:
-#   -----------------------------
-#
-#   This character set is intended to cover the following languages,
-#   which are written in Roman script but using a different set of
-#   accented characters which are not in the standard MacOS Roman
-#   set (MacOS CentralEurope also contains fewer punctuation and
-#   math characters than standard MacOS Roman):
-#   - several Slavic languages (Czech, Polish, Slovak, Slovenian)
-#   - Hungarian
-#   - the languages of the Baltic republics (Estonian, Latvian,
-#     Lithuanian)
-#
-#    The MacOS CentralEurope encoding also includes a number of
-#    characters needed for the Mac OS user interface (e.g. ellipsis),
-#    Mac OS localization (bullet for echoing passwords, copyright
-#    sign, etc.), several typographic punctuation symbols, math
-#    symbols, etc. All of the characters in MacOS CentralEurope that
-#    are also in the MacOS Roman encoding are at the same code point
-#    as in MacOS Roman. This improves application compatibility (since
-#    some naughty applications hard-code the MacOS Roman code points
-#    of certain characters).
-#
-#    The MacOS CentralEurope encoding is currently used for the
-#    following MacOS localizations: Czech, Polish, and Hungarian.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x0100	# LATIN CAPITAL LETTER A WITH MACRON
-0x82	0x0101	# LATIN SMALL LETTER A WITH MACRON
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x0104	# LATIN CAPITAL LETTER A WITH OGONEK
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x0105	# LATIN SMALL LETTER A WITH OGONEK
-0x89	0x010C	# LATIN CAPITAL LETTER C WITH CARON
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x010D	# LATIN SMALL LETTER C WITH CARON
-0x8C	0x0106	# LATIN CAPITAL LETTER C WITH ACUTE
-0x8D	0x0107	# LATIN SMALL LETTER C WITH ACUTE
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x0179	# LATIN CAPITAL LETTER Z WITH ACUTE
-0x90	0x017A	# LATIN SMALL LETTER Z WITH ACUTE
-0x91	0x010E	# LATIN CAPITAL LETTER D WITH CARON
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x010F	# LATIN SMALL LETTER D WITH CARON
-0x94	0x0112	# LATIN CAPITAL LETTER E WITH MACRON
-0x95	0x0113	# LATIN SMALL LETTER E WITH MACRON
-0x96	0x0116	# LATIN CAPITAL LETTER E WITH DOT ABOVE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x0117	# LATIN SMALL LETTER E WITH DOT ABOVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x011A	# LATIN CAPITAL LETTER E WITH CARON
-0x9E	0x011B	# LATIN SMALL LETTER E WITH CARON
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x0118	# LATIN CAPITAL LETTER E WITH OGONEK
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x0119	# LATIN SMALL LETTER E WITH OGONEK
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x0123	# LATIN SMALL LETTER G WITH CEDILLA
-0xAF	0x012E	# LATIN CAPITAL LETTER I WITH OGONEK
-0xB0	0x012F	# LATIN SMALL LETTER I WITH OGONEK
-0xB1	0x012A	# LATIN CAPITAL LETTER I WITH MACRON
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x012B	# LATIN SMALL LETTER I WITH MACRON
-0xB5	0x0136	# LATIN CAPITAL LETTER K WITH CEDILLA
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x0142	# LATIN SMALL LETTER L WITH STROKE
-0xB9	0x013B	# LATIN CAPITAL LETTER L WITH CEDILLA
-0xBA	0x013C	# LATIN SMALL LETTER L WITH CEDILLA
-0xBB	0x013D	# LATIN CAPITAL LETTER L WITH CARON
-0xBC	0x013E	# LATIN SMALL LETTER L WITH CARON
-0xBD	0x0139	# LATIN CAPITAL LETTER L WITH ACUTE
-0xBE	0x013A	# LATIN SMALL LETTER L WITH ACUTE
-0xBF	0x0145	# LATIN CAPITAL LETTER N WITH CEDILLA
-0xC0	0x0146	# LATIN SMALL LETTER N WITH CEDILLA
-0xC1	0x0143	# LATIN CAPITAL LETTER N WITH ACUTE
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0144	# LATIN SMALL LETTER N WITH ACUTE
-0xC5	0x0147	# LATIN CAPITAL LETTER N WITH CARON
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x0148	# LATIN SMALL LETTER N WITH CARON
-0xCC	0x0150	# LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0151	# LATIN SMALL LETTER O WITH DOUBLE ACUTE
-0xCF	0x014C	# LATIN CAPITAL LETTER O WITH MACRON
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0x014D	# LATIN SMALL LETTER O WITH MACRON
-0xD9	0x0154	# LATIN CAPITAL LETTER R WITH ACUTE
-0xDA	0x0155	# LATIN SMALL LETTER R WITH ACUTE
-0xDB	0x0158	# LATIN CAPITAL LETTER R WITH CARON
-0xDC	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0xDD	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0xDE	0x0159	# LATIN SMALL LETTER R WITH CARON
-0xDF	0x0156	# LATIN CAPITAL LETTER R WITH CEDILLA
-0xE0	0x0157	# LATIN SMALL LETTER R WITH CEDILLA
-0xE1	0x0160	# LATIN CAPITAL LETTER S WITH CARON
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x0161	# LATIN SMALL LETTER S WITH CARON
-0xE5	0x015A	# LATIN CAPITAL LETTER S WITH ACUTE
-0xE6	0x015B	# LATIN SMALL LETTER S WITH ACUTE
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x0164	# LATIN CAPITAL LETTER T WITH CARON
-0xE9	0x0165	# LATIN SMALL LETTER T WITH CARON
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x017D	# LATIN CAPITAL LETTER Z WITH CARON
-0xEC	0x017E	# LATIN SMALL LETTER Z WITH CARON
-0xED	0x016A	# LATIN CAPITAL LETTER U WITH MACRON
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0x016B	# LATIN SMALL LETTER U WITH MACRON
-0xF1	0x016E	# LATIN CAPITAL LETTER U WITH RING ABOVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x016F	# LATIN SMALL LETTER U WITH RING ABOVE
-0xF4	0x0170	# LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-0xF5	0x0171	# LATIN SMALL LETTER U WITH DOUBLE ACUTE
-0xF6	0x0172	# LATIN CAPITAL LETTER U WITH OGONEK
-0xF7	0x0173	# LATIN SMALL LETTER U WITH OGONEK
-0xF8	0x00DD	# LATIN CAPITAL LETTER Y WITH ACUTE
-0xF9	0x00FD	# LATIN SMALL LETTER Y WITH ACUTE
-0xFA	0x0137	# LATIN SMALL LETTER K WITH CEDILLA
-0xFB	0x017B	# LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xFC	0x0141	# LATIN CAPITAL LETTER L WITH STROKE
-0xFD	0x017C	# LATIN SMALL LETTER Z WITH DOT ABOVE
-0xFE	0x0122	# LATIN CAPITAL LETTER G WITH CEDILLA
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macCroatian.txt b/tools/encoding/macCroatian.txt
deleted file mode 100644
index 3cdfa2d..0000000
--- a/tools/encoding/macCroatian.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-#   Name:             MacOS_Croatian [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <6>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Croatian code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Croatian code order.
-#
-#   One of these mappings requires the use of a corporate character
-#   (for the Apple logo character). See the file "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Croatian:
-#   ------------------------
-#
-#   The MacOS Croatian encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Croatian encoding is being used, you must check if the
-#   system region code is 68, verCroatia (or 25, verYugoCroatian,
-#   only used in older systems).
-#
-#   This character set is a variant of standard MacOS Roman
-#   encoding, adding five accented letter case pairs to handle
-#   Croatian. It has 20 code point differences from standard
-#   MacOS Roman, but only 10 differences in repertoire.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x0160	# LATIN CAPITAL LETTER S WITH CARON
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x00B4	# ACUTE ACCENT
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x017D	# LATIN CAPITAL LETTER Z WITH CARON
-0xAF	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x2206	# INCREMENT
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x220F	# N-ARY PRODUCT
-0xB9	0x0161	# LATIN SMALL LETTER S WITH CARON
-0xBA	0x222B	# INTEGRAL
-0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
-0xBD	0x2126	# OHM SIGN
-0xBE	0x017E	# LATIN SMALL LETTER Z WITH CARON
-0xBF	0x00F8	# LATIN SMALL LETTER O WITH STROKE
-0xC0	0x00BF	# INVERTED QUESTION MARK
-0xC1	0x00A1	# INVERTED EXCLAMATION MARK
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x0106	# LATIN CAPITAL LETTER C WITH ACUTE
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x010C	# LATIN CAPITAL LETTER C WITH CARON
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x0110	# LATIN CAPITAL LETTER D WITH STROKE
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0xF8FF	# Apple logo
-0xD9	0x00A9	# COPYRIGHT SIGN
-0xDA	0x2044	# FRACTION SLASH
-0xDB	0x00A4	# CURRENCY SIGN
-0xDC	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0xDD	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0xDE	0x00C6	# LATIN CAPITAL LIGATURE AE
-0xDF	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xE0	0x2013	# EN DASH
-0xE1	0x00B7	# MIDDLE DOT
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	# PER MILLE SIGN
-0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x0107	# LATIN SMALL LETTER C WITH ACUTE
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x010D	# LATIN SMALL LETTER C WITH CARON
-0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0x0111	# LATIN SMALL LETTER D WITH STROKE
-0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0x0131	# LATIN SMALL LETTER DOTLESS I
-0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
-0xF7	0x02DC	# SMALL TILDE
-0xF8	0x00AF	# MACRON
-0xF9	0x03C0	# GREEK SMALL LETTER PI
-0xFA	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xFB	0x02DA	# RING ABOVE
-0xFC	0x00B8	# CEDILLA
-0xFD	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xFE	0x00E6	# LATIN SMALL LIGATURE AE
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macCyrillic.txt b/tools/encoding/macCyrillic.txt
deleted file mode 100644
index 59ac721..0000000
--- a/tools/encoding/macCyrillic.txt
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-#   Name:             MacOS_Cyrillic [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <5>)
-#   Date:             15 April 1995
-#   Authors:          Peter Edberg <edberg1@applelink.apple.com>
-#                     Judy Kettenhofen
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Cyrillic code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Cyrillic code order.
-#
-#   Notes on MacOS Cyrillic:
-#   ------------------------
-#
-#   The MacOS Cyrillic encoding includes the full Cyrillic letter
-#   repertoire of ISO 8859-5 (although not at the same code points).
-#   This covers most of the Slavic languages written in Cyrillic
-#   script.
-#
-#   The MacOS Cyrillic encoding also includes a number of characters
-#   needed for the MacOS user interface (e.g. ellipsis), MacOS
-#   localization (bullet for echoing passwords, copyright sign, etc.
-#   All of the characters in MacOS Cyrillic that are also in the MacOS
-#   Roman encoding are at the same code point as MacOS Roman. This
-#   improves application compatibility (since some naughty applications
-#   hard-code the MacOS Roman code points of certain characters).
-#
-#   A variant of MacOS Cyrillic is used for Ukrainian. A separate
-#   mapping table is available for Ukrainian.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x0410	# CYRILLIC CAPITAL LETTER A
-0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x82	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x83	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x84	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x85	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x86	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x87	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x88	0x0418	# CYRILLIC CAPITAL LETTER I
-0x89	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x8A	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x8B	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x8C	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x8D	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x8E	0x041E	# CYRILLIC CAPITAL LETTER O
-0x8F	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x90	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x91	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x92	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x93	0x0423	# CYRILLIC CAPITAL LETTER U
-0x94	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x95	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x96	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x97	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x98	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x99	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x9A	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x9B	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x9C	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x9D	0x042D	# CYRILLIC CAPITAL LETTER E
-0x9E	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x9F	0x042F	# CYRILLIC CAPITAL LETTER YA
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x0406	# CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x0402	# CYRILLIC CAPITAL LETTER DJE
-0xAC	0x0452	# CYRILLIC SMALL LETTER DJE
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x0403	# CYRILLIC CAPITAL LETTER GJE
-0xAF	0x0453	# CYRILLIC SMALL LETTER GJE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x0456	# CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x0408	# CYRILLIC CAPITAL LETTER JE
-0xB8	0x0404	# CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0xB9	0x0454	# CYRILLIC SMALL LETTER UKRAINIAN IE
-0xBA	0x0407	# CYRILLIC CAPITAL LETTER YI
-0xBB	0x0457	# CYRILLIC SMALL LETTER YI
-0xBC	0x0409	# CYRILLIC CAPITAL LETTER LJE
-0xBD	0x0459	# CYRILLIC SMALL LETTER LJE
-0xBE	0x040A	# CYRILLIC CAPITAL LETTER NJE
-0xBF	0x045A	# CYRILLIC SMALL LETTER NJE
-0xC0	0x0458	# CYRILLIC SMALL LETTER JE
-0xC1	0x0405	# CYRILLIC CAPITAL LETTER DZE
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x040B	# CYRILLIC CAPITAL LETTER TSHE
-0xCC	0x045B	# CYRILLIC SMALL LETTER TSHE
-0xCD	0x040C	# CYRILLIC CAPITAL LETTER KJE
-0xCE	0x045C	# CYRILLIC SMALL LETTER KJE
-0xCF	0x0455	# CYRILLIC SMALL LETTER DZE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xD8	0x040E	# CYRILLIC CAPITAL LETTER SHORT U
-0xD9	0x045E	# CYRILLIC SMALL LETTER SHORT U
-0xDA	0x040F	# CYRILLIC CAPITAL LETTER DZHE
-0xDB	0x045F	# CYRILLIC SMALL LETTER DZHE
-0xDC	0x2116	# NUMERO SIGN
-0xDD	0x0401	# CYRILLIC CAPITAL LETTER IO
-0xDE	0x0451	# CYRILLIC SMALL LETTER IO
-0xDF	0x044F	# CYRILLIC SMALL LETTER YA
-0xE0	0x0430	# CYRILLIC SMALL LETTER A
-0xE1	0x0431	# CYRILLIC SMALL LETTER BE
-0xE2	0x0432	# CYRILLIC SMALL LETTER VE
-0xE3	0x0433	# CYRILLIC SMALL LETTER GHE
-0xE4	0x0434	# CYRILLIC SMALL LETTER DE
-0xE5	0x0435	# CYRILLIC SMALL LETTER IE
-0xE6	0x0436	# CYRILLIC SMALL LETTER ZHE
-0xE7	0x0437	# CYRILLIC SMALL LETTER ZE
-0xE8	0x0438	# CYRILLIC SMALL LETTER I
-0xE9	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0xEA	0x043A	# CYRILLIC SMALL LETTER KA
-0xEB	0x043B	# CYRILLIC SMALL LETTER EL
-0xEC	0x043C	# CYRILLIC SMALL LETTER EM
-0xED	0x043D	# CYRILLIC SMALL LETTER EN
-0xEE	0x043E	# CYRILLIC SMALL LETTER O
-0xEF	0x043F	# CYRILLIC SMALL LETTER PE
-0xF0	0x0440	# CYRILLIC SMALL LETTER ER
-0xF1	0x0441	# CYRILLIC SMALL LETTER ES
-0xF2	0x0442	# CYRILLIC SMALL LETTER TE
-0xF3	0x0443	# CYRILLIC SMALL LETTER U
-0xF4	0x0444	# CYRILLIC SMALL LETTER EF
-0xF5	0x0445	# CYRILLIC SMALL LETTER HA
-0xF6	0x0446	# CYRILLIC SMALL LETTER TSE
-0xF7	0x0447	# CYRILLIC SMALL LETTER CHE
-0xF8	0x0448	# CYRILLIC SMALL LETTER SHA
-0xF9	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0xFA	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0xFB	0x044B	# CYRILLIC SMALL LETTER YERU
-0xFC	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0xFD	0x044D	# CYRILLIC SMALL LETTER E
-0xFE	0x044E	# CYRILLIC SMALL LETTER YU
-0xFF	0x00A4	# CURRENCY SIGN
diff --git a/tools/encoding/macDingbats.txt b/tools/encoding/macDingbats.txt
deleted file mode 100644
index 273d526..0000000
--- a/tools/encoding/macDingbats.txt
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-#   Name:             MacOS_Dingbats [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Dingbats code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Dingbats code order.
-#
-#   Several of these mappings require the use of corporate
-#   characters. See the file "MacOS-CorpCharList".
-#
-#   Notes on MacOS Dingbats:
-#   ------------------------
-#
-#   The MacOS Dingbats encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Dingbats encoding is being used, you must check if the
-#   font name is "Zapf Dingbats".
-#
-#   The layout of the Dingbats character set is identical to or
-#   a superset of the layout of the Adobe Zapf Dingbats encoding
-#   vector.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x2701	# UPPER BLADE SCISSORS
-0x22	0x2702	# BLACK SCISSORS
-0x23	0x2703	# LOWER BLADE SCISSORS
-0x24	0x2704	# WHITE SCISSORS
-0x25	0x260E	# BLACK TELEPHONE
-0x26	0x2706	# TELEPHONE LOCATION SIGN
-0x27	0x2707	# TAPE DRIVE
-0x28	0x2708	# AIRPLANE
-0x29	0x2709	# ENVELOPE
-0x2A	0x261B	# BLACK RIGHT POINTING INDEX
-0x2B	0x261E	# WHITE RIGHT POINTING INDEX
-0x2C	0x270C	# VICTORY HAND
-0x2D	0x270D	# WRITING HAND
-0x2E	0x270E	# LOWER RIGHT PENCIL
-0x2F	0x270F	# PENCIL
-0x30	0x2710	# UPPER RIGHT PENCIL
-0x31	0x2711	# WHITE NIB
-0x32	0x2712	# BLACK NIB
-0x33	0x2713	# CHECK MARK
-0x34	0x2714	# HEAVY CHECK MARK
-0x35	0x2715	# MULTIPLICATION X
-0x36	0x2716	# HEAVY MULTIPLICATION X
-0x37	0x2717	# BALLOT X
-0x38	0x2718	# HEAVY BALLOT X
-0x39	0x2719	# OUTLINED GREEK CROSS
-0x3A	0x271A	# HEAVY GREEK CROSS
-0x3B	0x271B	# OPEN CENTRE CROSS
-0x3C	0x271C	# HEAVY OPEN CENTRE CROSS
-0x3D	0x271D	# LATIN CROSS
-0x3E	0x271E	# SHADOWED WHITE LATIN CROSS
-0x3F	0x271F	# OUTLINED LATIN CROSS
-0x40	0x2720	# MALTESE CROSS
-0x41	0x2721	# STAR OF DAVID
-0x42	0x2722	# FOUR TEARDROP-SPOKED ASTERISK
-0x43	0x2723	# FOUR BALLOON-SPOKED ASTERISK
-0x44	0x2724	# HEAVY FOUR BALLOON-SPOKED ASTERISK
-0x45	0x2725	# FOUR CLUB-SPOKED ASTERISK
-0x46	0x2726	# BLACK FOUR POINTED STAR
-0x47	0x2727	# WHITE FOUR POINTED STAR
-0x48	0x2605	# BLACK STAR
-0x49	0x2729	# STRESS OUTLINED WHITE STAR
-0x4A	0x272A	# CIRCLED WHITE STAR
-0x4B	0x272B	# OPEN CENTRE BLACK STAR
-0x4C	0x272C	# BLACK CENTRE WHITE STAR
-0x4D	0x272D	# OUTLINED BLACK STAR
-0x4E	0x272E	# HEAVY OUTLINED BLACK STAR
-0x4F	0x272F	# PINWHEEL STAR
-0x50	0x2730	# SHADOWED WHITE STAR
-0x51	0x2731	# HEAVY ASTERISK
-0x52	0x2732	# OPEN CENTRE ASTERISK
-0x53	0x2733	# EIGHT SPOKED ASTERISK
-0x54	0x2734	# EIGHT POINTED BLACK STAR
-0x55	0x2735	# EIGHT POINTED PINWHEEL STAR
-0x56	0x2736	# SIX POINTED BLACK STAR
-0x57	0x2737	# EIGHT POINTED RECTILINEAR BLACK STAR
-0x58	0x2738	# HEAVY EIGHT POINTED RECTILINEAR BLACK STAR
-0x59	0x2739	# TWELVE POINTED BLACK STAR
-0x5A	0x273A	# SIXTEEN POINTED ASTERISK
-0x5B	0x273B	# TEARDROP-SPOKED ASTERISK
-0x5C	0x273C	# OPEN CENTRE TEARDROP-SPOKED ASTERISK
-0x5D	0x273D	# HEAVY TEARDROP-SPOKED ASTERISK
-0x5E	0x273E	# SIX PETALLED BLACK AND WHITE FLORETTE
-0x5F	0x273F	# BLACK FLORETTE
-0x60	0x2740	# WHITE FLORETTE
-0x61	0x2741	# EIGHT PETALLED OUTLINED BLACK FLORETTE
-0x62	0x2742	# CIRCLED OPEN CENTRE EIGHT POINTED STAR
-0x63	0x2743	# HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK
-0x64	0x2744	# SNOWFLAKE
-0x65	0x2745	# TIGHT TRIFOLIATE SNOWFLAKE
-0x66	0x2746	# HEAVY CHEVRON SNOWFLAKE
-0x67	0x2747	# SPARKLE
-0x68	0x2748	# HEAVY SPARKLE
-0x69	0x2749	# BALLOON-SPOKED ASTERISK
-0x6A	0x274A	# EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-0x6B	0x274B	# HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-0x6C	0x25CF	# BLACK CIRCLE
-0x6D	0x274D	# SHADOWED WHITE CIRCLE
-0x6E	0x25A0	# BLACK SQUARE
-0x6F	0x274F	# LOWER RIGHT DROP-SHADOWED WHITE SQUARE
-0x70	0x2750	# UPPER RIGHT DROP-SHADOWED WHITE SQUARE
-0x71	0x2751	# LOWER RIGHT SHADOWED WHITE SQUARE
-0x72	0x2752	# UPPER RIGHT SHADOWED WHITE SQUARE
-0x73	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x74	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0x75	0x25C6	# BLACK DIAMOND
-0x76	0x2756	# BLACK DIAMOND MINUS WHITE X
-0x77	0x25D7	# RIGHT HALF BLACK CIRCLE
-0x78	0x2758	# LIGHT VERTICAL BAR
-0x79	0x2759	# MEDIUM VERTICAL BAR
-0x7A	0x275A	# HEAVY VERTICAL BAR
-0x7B	0x275B	# HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT
-0x7C	0x275C	# HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
-0x7D	0x275D	# HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
-0x7E	0x275E	# HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-0x80	0xF8D7	# medium left parenthesis ornament
-0x81	0xF8D8	# medium right parenthesis ornament
-0x82	0xF8D9	# medium flattened left parenthesis ornament
-0x83	0xF8DA	# medium flattened right parenthesis ornament
-0x84	0xF8DB	# medium left-pointing angle bracket ornament
-0x85	0xF8DC	# medium right-pointing angle bracket ornament
-0x86	0xF8DD	# heavy left-pointing angle quotation mark ornament
-0x87	0xF8DE	# heavy right-pointing angle quotation mark ornament
-0x88	0xF8DF	# heavy left-pointing angle bracket ornament
-0x89	0xF8E0	# heavy right-pointing angle bracket ornament
-0x8A	0xF8E1	# light left tortoise shell bracket ornament
-0x8B	0xF8E2	# light right tortoise shell bracket ornament
-0x8C	0xF8E3	# medium left curly bracket ornament
-0x8D	0xF8E4	# medium right curly bracket ornament
-0xA1	0x2761	# CURVED STEM PARAGRAPH SIGN ORNAMENT
-0xA2	0x2762	# HEAVY EXCLAMATION MARK ORNAMENT
-0xA3	0x2763	# HEAVY HEART EXCLAMATION MARK ORNAMENT
-0xA4	0x2764	# HEAVY BLACK HEART
-0xA5	0x2765	# ROTATED HEAVY BLACK HEART BULLET
-0xA6	0x2766	# FLORAL HEART
-0xA7	0x2767	# ROTATED FLORAL HEART BULLET
-0xA8	0x2663	# BLACK CLUB SUIT
-0xA9	0x2666	# BLACK DIAMOND SUIT
-0xAA	0x2665	# BLACK HEART SUIT
-0xAB	0x2660	# BLACK SPADE SUIT
-0xAC	0x2460	# CIRCLED DIGIT ONE
-0xAD	0x2461	# CIRCLED DIGIT TWO
-0xAE	0x2462	# CIRCLED DIGIT THREE
-0xAF	0x2463	# CIRCLED DIGIT FOUR
-0xB0	0x2464	# CIRCLED DIGIT FIVE
-0xB1	0x2465	# CIRCLED DIGIT SIX
-0xB2	0x2466	# CIRCLED DIGIT SEVEN
-0xB3	0x2467	# CIRCLED DIGIT EIGHT
-0xB4	0x2468	# CIRCLED DIGIT NINE
-0xB5	0x2469	# CIRCLED NUMBER TEN
-0xB6	0x2776	# DINGBAT NEGATIVE CIRCLED DIGIT ONE
-0xB7	0x2777	# DINGBAT NEGATIVE CIRCLED DIGIT TWO
-0xB8	0x2778	# DINGBAT NEGATIVE CIRCLED DIGIT THREE
-0xB9	0x2779	# DINGBAT NEGATIVE CIRCLED DIGIT FOUR
-0xBA	0x277A	# DINGBAT NEGATIVE CIRCLED DIGIT FIVE
-0xBB	0x277B	# DINGBAT NEGATIVE CIRCLED DIGIT SIX
-0xBC	0x277C	# DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
-0xBD	0x277D	# DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
-0xBE	0x277E	# DINGBAT NEGATIVE CIRCLED DIGIT NINE
-0xBF	0x277F	# DINGBAT NEGATIVE CIRCLED NUMBER TEN
-0xC0	0x2780	# DINGBAT CIRCLED SANS-SERIF DIGIT ONE
-0xC1	0x2781	# DINGBAT CIRCLED SANS-SERIF DIGIT TWO
-0xC2	0x2782	# DINGBAT CIRCLED SANS-SERIF DIGIT THREE
-0xC3	0x2783	# DINGBAT CIRCLED SANS-SERIF DIGIT FOUR
-0xC4	0x2784	# DINGBAT CIRCLED SANS-SERIF DIGIT FIVE
-0xC5	0x2785	# DINGBAT CIRCLED SANS-SERIF DIGIT SIX
-0xC6	0x2786	# DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN
-0xC7	0x2787	# DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT
-0xC8	0x2788	# DINGBAT CIRCLED SANS-SERIF DIGIT NINE
-0xC9	0x2789	# DINGBAT CIRCLED SANS-SERIF NUMBER TEN
-0xCA	0x278A	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE
-0xCB	0x278B	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO
-0xCC	0x278C	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE
-0xCD	0x278D	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR
-0xCE	0x278E	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE
-0xCF	0x278F	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX
-0xD0	0x2790	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN
-0xD1	0x2791	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT
-0xD2	0x2792	# DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE
-0xD3	0x2793	# DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
-0xD4	0x2794	# HEAVY WIDE-HEADED RIGHTWARDS ARROW
-0xD5	0x2192	# RIGHTWARDS ARROW
-0xD6	0x2194	# LEFT RIGHT ARROW
-0xD7	0x2195	# UP DOWN ARROW
-0xD8	0x2798	# HEAVY SOUTH EAST ARROW
-0xD9	0x2799	# HEAVY RIGHTWARDS ARROW
-0xDA	0x279A	# HEAVY NORTH EAST ARROW
-0xDB	0x279B	# DRAFTING POINT RIGHTWARDS ARROW
-0xDC	0x279C	# HEAVY ROUND-TIPPED RIGHTWARDS ARROW
-0xDD	0x279D	# TRIANGLE-HEADED RIGHTWARDS ARROW
-0xDE	0x279E	# HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW
-0xDF	0x279F	# DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-0xE0	0x27A0	# HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-0xE1	0x27A1	# BLACK RIGHTWARDS ARROW
-0xE2	0x27A2	# THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD
-0xE3	0x27A3	# THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD
-0xE4	0x27A4	# BLACK RIGHTWARDS ARROWHEAD
-0xE5	0x27A5	# HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW
-0xE6	0x27A6	# HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW
-0xE7	0x27A7	# SQUAT BLACK RIGHTWARDS ARROW
-0xE8	0x27A8	# HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW
-0xE9	0x27A9	# RIGHT-SHADED WHITE RIGHTWARDS ARROW
-0xEA	0x27AA	# LEFT-SHADED WHITE RIGHTWARDS ARROW
-0xEB	0x27AB	# BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-0xEC	0x27AC	# FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-0xED	0x27AD	# HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xEE	0x27AE	# HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xEF	0x27AF	# NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xF1	0x27B1	# NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-0xF2	0x27B2	# CIRCLED HEAVY WHITE RIGHTWARDS ARROW
-0xF3	0x27B3	# WHITE-FEATHERED RIGHTWARDS ARROW
-0xF4	0x27B4	# BLACK-FEATHERED SOUTH EAST ARROW
-0xF5	0x27B5	# BLACK-FEATHERED RIGHTWARDS ARROW
-0xF6	0x27B6	# BLACK-FEATHERED NORTH EAST ARROW
-0xF7	0x27B7	# HEAVY BLACK-FEATHERED SOUTH EAST ARROW
-0xF8	0x27B8	# HEAVY BLACK-FEATHERED RIGHTWARDS ARROW
-0xF9	0x27B9	# HEAVY BLACK-FEATHERED NORTH EAST ARROW
-0xFA	0x27BA	# TEARDROP-BARBED RIGHTWARDS ARROW
-0xFB	0x27BB	# HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW
-0xFC	0x27BC	# WEDGE-TAILED RIGHTWARDS ARROW
-0xFD	0x27BD	# HEAVY WEDGE-TAILED RIGHTWARDS ARROW
-0xFE	0x27BE	# OPEN OUTLINED RIGHTWARDS ARROW
diff --git a/tools/encoding/macGreek.txt b/tools/encoding/macGreek.txt
deleted file mode 100644
index c9420a1..0000000
--- a/tools/encoding/macGreek.txt
+++ /dev/null
@@ -1,290 +0,0 @@
-#
-#   Name:             MacOS_Greek [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <7>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Greek code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Greek code order.
-#
-#   One of these mappings requires the use of a corporate character
-#   (for an undefined code point). See the file "MacOS-CorpCharList".
-#
-#   Notes on MacOS Greek:
-#   ---------------------
-#
-#   Although a MacOS script code is defined for Greek (smGreek = 6),
-#   the Greek localized system does not currently use it (the font
-#   family IDs are in the MacOS Roman range). To determine if the
-#   Greek encoding is being used when the script code is smRoman (0),
-#   you must check if the system region code is 20, verGreece.
-#
-#   The MacOS Greek encoding is a superset of the repertoire of
-#   ISO 8859-5 (although characters are not at the same code points).
-#
-#   This character set was used by all MacOS Greek systems 6.x and
-#   7.x except for system 6.0.7, which used a variant character set
-#   but was quickly replaced with Greek system 6.0.7.1 using the
-#   standard character set documented here. Greek system 4.1 used a
-#   variant Greek set that had ISO 8859-7 in 0xA0-0xFF (with some
-#   holes filled in with DTP characters), and MacOS Roman accented
-#   Roman letters in 0x80-0x9F.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00B9	# SUPERSCRIPT ONE
-0x82	0x00B2	# SUPERSCRIPT TWO
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00B3	# SUPERSCRIPT THREE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x0385	# GREEK DIALYTIKA TONOS
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x0384	# GREEK TONOS
-0x8C	0x00A8	# DIAERESIS
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00A3	# POUND SIGN
-0x93	0x2122	# TRADE MARK SIGN
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x2022	# BULLET
-0x97	0x00BD	# VULGAR FRACTION ONE HALF
-0x98	0x2030	# PER MILLE SIGN
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00A6	# BROKEN BAR
-0x9C	0x00AD	# SOFT HYPHEN
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x0393	# GREEK CAPITAL LETTER GAMMA
-0xA2	0x0394	# GREEK CAPITAL LETTER DELTA
-0xA3	0x0398	# GREEK CAPITAL LETTER THETA
-0xA4	0x039B	# GREEK CAPITAL LETTER LAMBDA
-0xA5	0x039E	# GREEK CAPITAL LETTER XI
-0xA6	0x03A0	# GREEK CAPITAL LETTER PI
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0xAB	0x03AA	# GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-0xAC	0x00A7	# SECTION SIGN
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x00B0	# DEGREE SIGN
-0xAF	0x0387	# GREEK ANO TELEIA
-0xB0	0x0391	# GREEK CAPITAL LETTER ALPHA
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	# YEN SIGN
-0xB5	0x0392	# GREEK CAPITAL LETTER BETA
-0xB6	0x0395	# GREEK CAPITAL LETTER EPSILON
-0xB7	0x0396	# GREEK CAPITAL LETTER ZETA
-0xB8	0x0397	# GREEK CAPITAL LETTER ETA
-0xB9	0x0399	# GREEK CAPITAL LETTER IOTA
-0xBA	0x039A	# GREEK CAPITAL LETTER KAPPA
-0xBB	0x039C	# GREEK CAPITAL LETTER MU
-0xBC	0x03A6	# GREEK CAPITAL LETTER PHI
-0xBD	0x03AB	# GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-0xBE	0x03A8	# GREEK CAPITAL LETTER PSI
-0xBF	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0xC0	0x03AC	# GREEK SMALL LETTER ALPHA WITH TONOS
-0xC1	0x039D	# GREEK CAPITAL LETTER NU
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x039F	# GREEK CAPITAL LETTER OMICRON
-0xC4	0x03A1	# GREEK CAPITAL LETTER RHO
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x03A4	# GREEK CAPITAL LETTER TAU
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0xCC	0x03A7	# GREEK CAPITAL LETTER CHI
-0xCD	0x0386	# GREEK CAPITAL LETTER ALPHA WITH TONOS
-0xCE	0x0388	# GREEK CAPITAL LETTER EPSILON WITH TONOS
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x2013	# EN DASH
-0xD1	0x2015	# HORIZONTAL BAR
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x0389	# GREEK CAPITAL LETTER ETA WITH TONOS
-0xD8	0x038A	# GREEK CAPITAL LETTER IOTA WITH TONOS
-0xD9	0x038C	# GREEK CAPITAL LETTER OMICRON WITH TONOS
-0xDA	0x038E	# GREEK CAPITAL LETTER UPSILON WITH TONOS
-0xDB	0x03AD	# GREEK SMALL LETTER EPSILON WITH TONOS
-0xDC	0x03AE	# GREEK SMALL LETTER ETA WITH TONOS
-0xDD	0x03AF	# GREEK SMALL LETTER IOTA WITH TONOS
-0xDE	0x03CC	# GREEK SMALL LETTER OMICRON WITH TONOS
-0xDF	0x038F	# GREEK CAPITAL LETTER OMEGA WITH TONOS
-0xE0	0x03CD	# GREEK SMALL LETTER UPSILON WITH TONOS
-0xE1	0x03B1	# GREEK SMALL LETTER ALPHA
-0xE2	0x03B2	# GREEK SMALL LETTER BETA
-0xE3	0x03C8	# GREEK SMALL LETTER PSI
-0xE4	0x03B4	# GREEK SMALL LETTER DELTA
-0xE5	0x03B5	# GREEK SMALL LETTER EPSILON
-0xE6	0x03C6	# GREEK SMALL LETTER PHI
-0xE7	0x03B3	# GREEK SMALL LETTER GAMMA
-0xE8	0x03B7	# GREEK SMALL LETTER ETA
-0xE9	0x03B9	# GREEK SMALL LETTER IOTA
-0xEA	0x03BE	# GREEK SMALL LETTER XI
-0xEB	0x03BA	# GREEK SMALL LETTER KAPPA
-0xEC	0x03BB	# GREEK SMALL LETTER LAMBDA
-0xED	0x03BC	# GREEK SMALL LETTER MU
-0xEE	0x03BD	# GREEK SMALL LETTER NU
-0xEF	0x03BF	# GREEK SMALL LETTER OMICRON
-0xF0	0x03C0	# GREEK SMALL LETTER PI
-0xF1	0x03CE	# GREEK SMALL LETTER OMEGA WITH TONOS
-0xF2	0x03C1	# GREEK SMALL LETTER RHO
-0xF3	0x03C3	# GREEK SMALL LETTER SIGMA
-0xF4	0x03C4	# GREEK SMALL LETTER TAU
-0xF5	0x03B8	# GREEK SMALL LETTER THETA
-0xF6	0x03C9	# GREEK SMALL LETTER OMEGA
-0xF7	0x03C2	# GREEK SMALL LETTER FINAL SIGMA
-0xF8	0x03C7	# GREEK SMALL LETTER CHI
-0xF9	0x03C5	# GREEK SMALL LETTER UPSILON
-0xFA	0x03B6	# GREEK SMALL LETTER ZETA
-0xFB	0x03CA	# GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0xFC	0x03CB	# GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-0xFD	0x0390	# GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-0xFE	0x03B0	# GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-0xFF	0xF8A0	# undefined1
diff --git a/tools/encoding/macIceland.txt b/tools/encoding/macIceland.txt
deleted file mode 100644
index ee79a37..0000000
--- a/tools/encoding/macIceland.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-#
-#   Name:             MacOS_Icelandic [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <5>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Icelandic code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Icelandic code order.
-#
-#   One of these mappings requires the use of a corporate character
-#   (for the Apple logo character). See the file "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Icelandic:
-#   -------------------------
-#
-#   The MacOS Icelandic encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Icelandic encoding is being used, you must also check if
-#   the system region code is 21, verIceland.
-#
-#   This character set is a variant of standard MacOS Roman,
-#   adding upper and lower eth, thorn, and Y acute. It has 6 code
-#   point differences from standard MacOS Roman.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x00DD	# LATIN CAPITAL LETTER Y WITH ACUTE
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x00B4	# ACUTE ACCENT
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x00C6	# LATIN CAPITAL LIGATURE AE
-0xAF	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	# YEN SIGN
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x220F	# N-ARY PRODUCT
-0xB9	0x03C0	# GREEK SMALL LETTER PI
-0xBA	0x222B	# INTEGRAL
-0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
-0xBD	0x2126	# OHM SIGN
-0xBE	0x00E6	# LATIN SMALL LIGATURE AE
-0xBF	0x00F8	# LATIN SMALL LETTER O WITH STROKE
-0xC0	0x00BF	# INVERTED QUESTION MARK
-0xC1	0x00A1	# INVERTED EXCLAMATION MARK
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
-0xD9	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xDA	0x2044	# FRACTION SLASH
-0xDB	0x00A4	# CURRENCY SIGN
-0xDC	0x00D0	# LATIN CAPITAL LETTER ETH
-0xDD	0x00F0	# LATIN SMALL LETTER ETH
-0xDE	0x00DE	# LATIN CAPITAL LETTER THORN
-0xDF	0x00FE	# LATIN SMALL LETTER THORN
-0xE0	0x00FD	# LATIN SMALL LETTER Y WITH ACUTE
-0xE1	0x00B7	# MIDDLE DOT
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	# PER MILLE SIGN
-0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0xF8FF	# Apple logo
-0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0x0131	# LATIN SMALL LETTER DOTLESS I
-0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
-0xF7	0x02DC	# SMALL TILDE
-0xF8	0x00AF	# MACRON
-0xF9	0x02D8	# BREVE
-0xFA	0x02D9	# DOT ABOVE
-0xFB	0x02DA	# RING ABOVE
-0xFC	0x00B8	# CEDILLA
-0xFD	0x02DD	# DOUBLE ACUTE ACCENT
-0xFE	0x02DB	# OGONEK
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macJapan.txt b/tools/encoding/macJapan.txt
deleted file mode 100644
index 7121b3b..0000000
--- a/tools/encoding/macJapan.txt
+++ /dev/null
@@ -1,7598 +0,0 @@
-#
-#   Name:             MacOS_Japanese [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <11>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Japanese code (in hex as 0xNN or 0xNNNN)
-#     Column #2 is the Unicode or Unicode sequence (in hex as 0xNNNN
-#       or 0xNNNN+0xNNNN).
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#     In some cases an additional comment follows the Unicode name.
-#
-#   The table is divided into three sections, each set off by a header.
-#     Basic - Shift-JIS plus five additional one-byte characters. The
-#       mappings for this section are based on the UTC mappings for
-#       Shift-JIS dated 8 March 1994, adjusted as necessary for the
-#       differences between Shift-JIS and this Apple basic set (also
-#       adjusted in two places for a better match with the JIS spec).
-#       Changes from UTC mappings are noted with additional comments.
-#     Apple extensions - additional two-byte characters
-#     Vertical forms - separately-encoded vertical forms
-#   Within each table, the entries are in MacOS Japanese code order.
-#   The mappings are only for the standard version of MacOS Japanese
-#     (not for the several variants).
-#
-#   Note that in three cases, a single MacOS Japanese character maps
-#   to a sequence of Unicode characters. This is indicated by joining
-#   the Unicode characters with '+'. See entries for MacOS Japanese
-#   characters 0x8791, 0x8792, and 0x879D.
-#
-#   Some of these mappings require the use of corporate characters.
-#   See the file "MacOS-CorpCharList".
-#
-#   Notes on MacOS Japanese:
-#   ------------------------
-#
-#    This table covers the standard MacOS Japanese character set used in
-#    System software versions 7.1 and later. Certain fonts may be based
-#    on a modified version of this character set. See below for more
-#    information.
-#
-#    There are several MacJapanese encodings. Most of them are ways of
-#    representing JIS X0208-1990 and JIS X0201-1976 in the Shift-JIS
-#    form, but with additional characters.
-#
-#    Some of the information below comes from Ken Lunde's book
-#    "Understanding Japanese Information Processing", O'Reilly & Assoc.,
-#    1993.
-#
-# 1. Conventional Shift-JIS
-#
-#    Most Shift-JIS implementations include the following characters:
-#
-#    a)  One-byte characters with codes from 0x00-0x7F for a Japanese
-#        variant of ISO 646 (ASCII), in which the ASCII backslash
-#        character at x5C is replaced by a yen sign , the tilde at 0x7E
-#        is replaced by overline, and usually the vertical line at 0x7C
-#        is replaced by broken bar (this is the Roman repertoire from JIS
-#        X0201). The standard MacOS Japanese version retains tilde at
-#        0x7E and vertical bar at 0x7C, although the PostScript variant
-#        uses broken bar at 0x7C. The difference between vertical line
-#        and broken bar is sometimes considered just a glyph variant.
-#
-#    b)  One-byte katakana and punctuation characters with codes from
-#        0xA1-0xDF (this is the katakana repertoire from JIS X0201).
-#
-#    c)  JIS X0208-1990 characters in Shift-JIS form. In this form, byte
-#        values 0x81-0x9F and 0xE0-0xEF are used to indicate the first
-#        byte of a 2-byte character in the JIS domain. JIS X0208
-#        characters are usually represented in "ku-ten" or row-cell
-#        (row-column) form, with row and cell values each running from 1
-#        through 94. These are transformed into Shift-JIS form in the
-#        following way:
-#
-#        rowOffset = (row < 63) ? 0x80 : 0xC0;
-#        cellOffset = (row % 2 == 1) ? 0x3F + (cell > 63 ? 1 : 0) : 0x9E;
-#        shiftJISbyte1 = (row + 1)/2 + rowOffset;
-#        shiftJISbyte2 = cell + cellOffset;
-#
-#        Astute observers will note that (i) in this form the second
-#        bytes of Shift-JIS characters are in the range 0x40-0x7E or
-#        0x80-0xFC; and (2) the maximum ku-ten code 94,94 maps to
-#        Shift-JIS code 0xEFFC.
-#
-#        Note: PostScript fonts are based on JIS X0208-1983 (formerly
-#        known as JIS C6226-1983). This version of JIS was missing two
-#        kanji characters that were added for JIS X0208-1990: in ku-ten
-#        form these are 84,05 and 84,06; in Shift-JIS form these are
-#        0xEAA3 and 0xEAA4. The other differences in the two versions are
-#        changes in standard glyphs, not character differences.
-#
-#    d)  User-defined characters. Usually, byte values 0xF0-0xFC are used
-#        to indicate the first byte of a user-defined 2-byte character
-#        (the second byte follows the above conventions and is in the
-#        range 0x40-0x7E or 0x80-0xFC).
-#
-#   This provides 13*188 = 2444 characters.
-#
-# 2. Additional Apple one-byte characters
-#
-#    The above scheme leaves 5 one-byte characters unused: 0x80, 0xA0,
-#    and 0xFD-0xFF. The standard Macintosh Japanese encoding defines
-#    these as follows:
-#
-#        0x80 backslash (the character moved from 0x5C)
-#        0xA0 halfwidth no-break space (0xA0 as halfwidth space is a
-#             common industry addition))
-#        0xFD copyright sign
-#        0xFE trademark sign
-#        0xFF horizontal ellipsis
-#
-# 3. Apple two-byte extensions
-#
-#    Not all of the available JIS X0208 ku-ten codes are assigned to
-#    characters. Most vendors make use of this to provide character set
-#    extensions, vendor-specific assignments for some of the unused
-#    codes. Apple is no exception, but Apple's situation is complex:
-#    Different fonts implement different character sets! This situation
-#    is cleaned up in the Japanese TrueType fonts for system software
-#    7.1.2 and later. However, the PostScript fonts still implement a
-#    different character set. I will describe the various extension sets
-#    below, then list what I know about fonts that match each one.
-#
-#    a)  Vertical forms at ku+10 position - some of the characters in
-#        rows 1, 4, and 5 (punctuation, hiragana, katakana) have vertical
-#        forms (the corresponding form used for vertical text) encoded at
-#        a position obtained by adding 10 to the row number (thus giving
-#        them Shift-JIS codes 0x86nn, 0x87nn, 0x88nn). This was necessary
-#        for vertical text in the past, but vertical forms are handled
-#        automatically by QuickDraw(tm) GX in the future and no longer
-#        need separate encoding.
-#
-#        0x8641-0x8681 (symbols), 0x879F-0x87EC (hiragana), 0x8840-0x8896
-#        (katakana). Note that Kanji characters begin at 0x889F.
-#
-#    b)  Vertical forms at ku+84 position - same as above, but vertical
-#        forms encoded in a different position, using shift-JIS codes
-#        0xEBnn, 0xECnn, 0xEDnn. This is the location in the standard
-#        MacOS Japanese encoding, and is also the location of vertical
-#        forms in PostScript Japanese fonts (the PostScript fonts have
-#        some additional vertical forms for characters in rows other than
-#        1, 4, and 5; these additional vertical forms have a more complex
-#        mapping, not necessarily at ku+84).
-#
-#        0xEB41-0xEB81 (symbols), 0xEC9F-0xECEC (hiragana), 0xED40-0xED96
-#        (katakana). Note that Kanji characters end at 0xEAA4.
-#
-#    c)  Various Apple extension characters in JIS rows 9-15, with
-#        Shift-JIS codes 0x85nn-0x88nn. These cannot coexist with the
-#        ku+10 vertical forms.
-#
-#    d)  Postscript extension set characters in JIS rows 9-15, with
-#        Shift-JIS codes 0x85nn-0x88nn. This is a different extension set
-#        and cannot coexist with the ku+10 vertical forms or the Apple
-#        extensions. Note: Fonts that have this set also use an earlier
-#        version of JIS, X0208-1983, which is missing two kanji that are
-#        in JIS X0208-1990.
-#
-#    Here are some possible variations, the version numbers assigned to
-#    some of them, and some fonts that are known to match them:
-#
-#                 Apple   PostSc  ku+10  ku+84
-#    variant      extras  extras  vert   vert   fonts, comments
-#    -------      ------  ------  -----  -----  ---------------
-#    standard     yes     no      no     yes    TrueType fonts version >= 2.1
-#                                               (all TT, system >= J-7.1.2)
-#    stdNoVert    yes     no      no     no     Artificial variant for users
-#                                               who don't want separately-
-#                                               encoded vertical forms (e.g.
-#                                               GX users)
-#    basic        no      no      no     no     Artificial variant for basic
-#                                               interchange
-#    screenPS     no      no      no     yes    SaiMincho & ChuGothic screen
-#                                               fonts; mostly missing 0xFD-0xFF,
-#                                               missing 0xEAA3, 0xEAA4
-#    printPS      no      yes     no     yes    SaiMincho & ChuGothic PostScript
-#                                               fonts; missing 0x80, 0xFD-0xFF,
-#                                               0xEAA3, 0xEAA4; 0x7C is broken
-#                                               bar; have extra vertical forms
-#    kuPlus10Vert no      no      yes    no     HonMincho & MaruGothic fonts in
-#                                               system J-7.1
-#
-# 4. Halfwidth characters
-#
-#    The one-byte characters are usually called halfwidth characters,
-#    while two-byte characters are called fullwidth. The PostScript
-#    printing variant listed above includes two-byte halfwidth characters
-#    in addition to one-byte halfwidth characters, so halfwidth does not
-#    always imply a one-byte character.
-#
-##################
-
-##################
-# Basic
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS (rendered as Halfwidth Yen Sign)
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE # Apple change
-#
-0x8140	0x3000	# IDEOGRAPHIC SPACE
-0x8141	0x3001	# IDEOGRAPHIC COMMA
-0x8142	0x3002	# IDEOGRAPHIC FULL STOP
-0x8143	0xFF0C	# FULLWIDTH COMMA
-0x8144	0xFF0E	# FULLWIDTH FULL STOP
-0x8145	0x30FB	# KATAKANA MIDDLE DOT
-0x8146	0xFF1A	# FULLWIDTH COLON
-0x8147	0xFF1B	# FULLWIDTH SEMICOLON
-0x8148	0xFF1F	# FULLWIDTH QUESTION MARK
-0x8149	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0x814A	0x309B	# KATAKANA-HIRAGANA VOICED SOUND MARK
-0x814B	0x309C	# KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-0x814C	0x00B4	# ACUTE ACCENT
-0x814D	0xFF40	# FULLWIDTH GRAVE ACCENT
-0x814E	0x00A8	# DIAERESIS
-0x814F	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
-0x8150	0x203E	# OVERLINE # Change UTC mapping to match JIS spec
-0x8151	0xFF3F	# FULLWIDTH LOW LINE
-0x8152	0x30FD	# KATAKANA ITERATION MARK
-0x8153	0x30FE	# KATAKANA VOICED ITERATION MARK
-0x8154	0x309D	# HIRAGANA ITERATION MARK
-0x8155	0x309E	# HIRAGANA VOICED ITERATION MARK
-0x8156	0x3003	# DITTO MARK
-0x8157	0x4EDD	# <CJK>
-0x8158	0x3005	# IDEOGRAPHIC ITERATION MARK
-0x8159	0x3006	# IDEOGRAPHIC CLOSING MARK
-0x815A	0x3007	# IDEOGRAPHIC NUMBER ZERO
-0x815B	0x30FC	# KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0x815C	0x2014	# EM DASH # Change UTC mapping to match JIS spec
-0x815D	0x2010	# HYPHEN
-0x815E	0xFF0F	# FULLWIDTH SOLIDUS
-0x815F	0xFF3C	# FULLWIDTH REVERSE SOLIDUS # change mapping to separate from MacOS-J 0x80
-0x8160	0x301C	# WAVE DASH
-0x8161	0x2016	# DOUBLE VERTICAL LINE # 0x8161 could also map to U+2225
-0x8162	0xFF5C	# FULLWIDTH VERTICAL LINE
-0x8163	0x22EF	# MIDLINE HORIZONTAL ELLIPSIS # change mapping to separate from MacOS-J 0xFF
-0x8164	0x2025	# TWO DOT LEADER
-0x8165	0x2018	# LEFT SINGLE QUOTATION MARK
-0x8166	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x8167	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x8168	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x8169	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0x816A	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0x816B	0x3014	# LEFT TORTOISE SHELL BRACKET
-0x816C	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0x816D	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
-0x816E	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
-0x816F	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0x8170	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0x8171	0x3008	# LEFT ANGLE BRACKET
-0x8172	0x3009	# RIGHT ANGLE BRACKET
-0x8173	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0x8174	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0x8175	0x300C	# LEFT CORNER BRACKET
-0x8176	0x300D	# RIGHT CORNER BRACKET
-0x8177	0x300E	# LEFT WHITE CORNER BRACKET
-0x8178	0x300F	# RIGHT WHITE CORNER BRACKET
-0x8179	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0x817A	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0x817B	0xFF0B	# FULLWIDTH PLUS SIGN
-0x817C	0x2212	# MINUS SIGN
-0x817D	0x00B1	# PLUS-MINUS SIGN
-0x817E	0x00D7	# MULTIPLICATION SIGN
-0x8180	0x00F7	# DIVISION SIGN
-0x8181	0xFF1D	# FULLWIDTH EQUALS SIGN
-0x8182	0x2260	# NOT EQUAL TO
-0x8183	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0x8184	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0x8185	0x2266	# LESS-THAN OVER EQUAL TO
-0x8186	0x2267	# GREATER-THAN OVER EQUAL TO
-0x8187	0x221E	# INFINITY
-0x8188	0x2234	# THEREFORE
-0x8189	0x2642	# MALE SIGN
-0x818A	0x2640	# FEMALE SIGN
-0x818B	0x00B0	# DEGREE SIGN
-0x818C	0x2032	# PRIME
-0x818D	0x2033	# DOUBLE PRIME
-0x818E	0x2103	# DEGREE CELSIUS
-0x818F	0xFFE5	# FULLWIDTH YEN SIGN
-0x8190	0xFF04	# FULLWIDTH DOLLAR SIGN
-0x8191	0x00A2	# CENT SIGN
-0x8192	0x00A3	# POUND SIGN
-0x8193	0xFF05	# FULLWIDTH PERCENT SIGN
-0x8194	0xFF03	# FULLWIDTH NUMBER SIGN
-0x8195	0xFF06	# FULLWIDTH AMPERSAND
-0x8196	0xFF0A	# FULLWIDTH ASTERISK
-0x8197	0xFF20	# FULLWIDTH COMMERCIAL AT
-0x8198	0x00A7	# SECTION SIGN
-0x8199	0x2606	# WHITE STAR
-0x819A	0x2605	# BLACK STAR
-0x819B	0x25CB	# WHITE CIRCLE
-0x819C	0x25CF	# BLACK CIRCLE
-0x819D	0x25CE	# BULLSEYE
-0x819E	0x25C7	# WHITE DIAMOND
-0x819F	0x25C6	# BLACK DIAMOND
-0x81A0	0x25A1	# WHITE SQUARE
-0x81A1	0x25A0	# BLACK SQUARE
-0x81A2	0x25B3	# WHITE UP-POINTING TRIANGLE
-0x81A3	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x81A4	0x25BD	# WHITE DOWN-POINTING TRIANGLE
-0x81A5	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0x81A6	0x203B	# REFERENCE MARK
-0x81A7	0x3012	# POSTAL MARK
-0x81A8	0x2192	# RIGHTWARDS ARROW
-0x81A9	0x2190	# LEFTWARDS ARROW
-0x81AA	0x2191	# UPWARDS ARROW
-0x81AB	0x2193	# DOWNWARDS ARROW
-0x81AC	0x3013	# GETA MARK
-0x81B8	0x2208	# ELEMENT OF
-0x81B9	0x220B	# CONTAINS AS MEMBER
-0x81BA	0x2286	# SUBSET OF OR EQUAL TO
-0x81BB	0x2287	# SUPERSET OF OR EQUAL TO
-0x81BC	0x2282	# SUBSET OF
-0x81BD	0x2283	# SUPERSET OF
-0x81BE	0x222A	# UNION
-0x81BF	0x2229	# INTERSECTION
-0x81C8	0x2227	# LOGICAL AND
-0x81C9	0x2228	# LOGICAL OR
-0x81CA	0x00AC	# NOT SIGN
-0x81CB	0x21D2	# RIGHTWARDS DOUBLE ARROW
-0x81CC	0x21D4	# LEFT RIGHT DOUBLE ARROW
-0x81CD	0x2200	# FOR ALL
-0x81CE	0x2203	# THERE EXISTS
-0x81DA	0x2220	# ANGLE
-0x81DB	0x22A5	# UP TACK
-0x81DC	0x2312	# ARC
-0x81DD	0x2202	# PARTIAL DIFFERENTIAL
-0x81DE	0x2207	# NABLA
-0x81DF	0x2261	# IDENTICAL TO
-0x81E0	0x2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0x81E1	0x226A	# MUCH LESS-THAN
-0x81E2	0x226B	# MUCH GREATER-THAN
-0x81E3	0x221A	# SQUARE ROOT
-0x81E4	0x223D	# REVERSED TILDE # This UTC mapping is questionable
-0x81E5	0x221D	# PROPORTIONAL TO
-0x81E6	0x2235	# BECAUSE
-0x81E7	0x222B	# INTEGRAL
-0x81E8	0x222C	# DOUBLE INTEGRAL
-0x81F0	0x212B	# ANGSTROM SIGN
-0x81F1	0x2030	# PER MILLE SIGN
-0x81F2	0x266F	# MUSIC SHARP SIGN
-0x81F3	0x266D	# MUSIC FLAT SIGN
-0x81F4	0x266A	# EIGHTH NOTE
-0x81F5	0x2020	# DAGGER
-0x81F6	0x2021	# DOUBLE DAGGER
-0x81F7	0x00B6	# PILCROW SIGN
-0x81FC	0x25EF	# LARGE CIRCLE
-0x824F	0xFF10	# FULLWIDTH DIGIT ZERO
-0x8250	0xFF11	# FULLWIDTH DIGIT ONE
-0x8251	0xFF12	# FULLWIDTH DIGIT TWO
-0x8252	0xFF13	# FULLWIDTH DIGIT THREE
-0x8253	0xFF14	# FULLWIDTH DIGIT FOUR
-0x8254	0xFF15	# FULLWIDTH DIGIT FIVE
-0x8255	0xFF16	# FULLWIDTH DIGIT SIX
-0x8256	0xFF17	# FULLWIDTH DIGIT SEVEN
-0x8257	0xFF18	# FULLWIDTH DIGIT EIGHT
-0x8258	0xFF19	# FULLWIDTH DIGIT NINE
-0x8260	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0x8261	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0x8262	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0x8263	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0x8264	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0x8265	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0x8266	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0x8267	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0x8268	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0x8269	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0x826A	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0x826B	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0x826C	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0x826D	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0x826E	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0x826F	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0x8270	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0x8271	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0x8272	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0x8273	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0x8274	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0x8275	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0x8276	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0x8277	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0x8278	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0x8279	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0x8281	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0x8282	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0x8283	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0x8284	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0x8285	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0x8286	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0x8287	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0x8288	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0x8289	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0x828A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0x828B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0x828C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0x828D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0x828E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0x828F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0x8290	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0x8291	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0x8292	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0x8293	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0x8294	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0x8295	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0x8296	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0x8297	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0x8298	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0x8299	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0x829A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0x829F	0x3041	# HIRAGANA LETTER SMALL A
-0x82A0	0x3042	# HIRAGANA LETTER A
-0x82A1	0x3043	# HIRAGANA LETTER SMALL I
-0x82A2	0x3044	# HIRAGANA LETTER I
-0x82A3	0x3045	# HIRAGANA LETTER SMALL U
-0x82A4	0x3046	# HIRAGANA LETTER U
-0x82A5	0x3047	# HIRAGANA LETTER SMALL E
-0x82A6	0x3048	# HIRAGANA LETTER E
-0x82A7	0x3049	# HIRAGANA LETTER SMALL O
-0x82A8	0x304A	# HIRAGANA LETTER O
-0x82A9	0x304B	# HIRAGANA LETTER KA
-0x82AA	0x304C	# HIRAGANA LETTER GA
-0x82AB	0x304D	# HIRAGANA LETTER KI
-0x82AC	0x304E	# HIRAGANA LETTER GI
-0x82AD	0x304F	# HIRAGANA LETTER KU
-0x82AE	0x3050	# HIRAGANA LETTER GU
-0x82AF	0x3051	# HIRAGANA LETTER KE
-0x82B0	0x3052	# HIRAGANA LETTER GE
-0x82B1	0x3053	# HIRAGANA LETTER KO
-0x82B2	0x3054	# HIRAGANA LETTER GO
-0x82B3	0x3055	# HIRAGANA LETTER SA
-0x82B4	0x3056	# HIRAGANA LETTER ZA
-0x82B5	0x3057	# HIRAGANA LETTER SI
-0x82B6	0x3058	# HIRAGANA LETTER ZI
-0x82B7	0x3059	# HIRAGANA LETTER SU
-0x82B8	0x305A	# HIRAGANA LETTER ZU
-0x82B9	0x305B	# HIRAGANA LETTER SE
-0x82BA	0x305C	# HIRAGANA LETTER ZE
-0x82BB	0x305D	# HIRAGANA LETTER SO
-0x82BC	0x305E	# HIRAGANA LETTER ZO
-0x82BD	0x305F	# HIRAGANA LETTER TA
-0x82BE	0x3060	# HIRAGANA LETTER DA
-0x82BF	0x3061	# HIRAGANA LETTER TI
-0x82C0	0x3062	# HIRAGANA LETTER DI
-0x82C1	0x3063	# HIRAGANA LETTER SMALL TU
-0x82C2	0x3064	# HIRAGANA LETTER TU
-0x82C3	0x3065	# HIRAGANA LETTER DU
-0x82C4	0x3066	# HIRAGANA LETTER TE
-0x82C5	0x3067	# HIRAGANA LETTER DE
-0x82C6	0x3068	# HIRAGANA LETTER TO
-0x82C7	0x3069	# HIRAGANA LETTER DO
-0x82C8	0x306A	# HIRAGANA LETTER NA
-0x82C9	0x306B	# HIRAGANA LETTER NI
-0x82CA	0x306C	# HIRAGANA LETTER NU
-0x82CB	0x306D	# HIRAGANA LETTER NE
-0x82CC	0x306E	# HIRAGANA LETTER NO
-0x82CD	0x306F	# HIRAGANA LETTER HA
-0x82CE	0x3070	# HIRAGANA LETTER BA
-0x82CF	0x3071	# HIRAGANA LETTER PA
-0x82D0	0x3072	# HIRAGANA LETTER HI
-0x82D1	0x3073	# HIRAGANA LETTER BI
-0x82D2	0x3074	# HIRAGANA LETTER PI
-0x82D3	0x3075	# HIRAGANA LETTER HU
-0x82D4	0x3076	# HIRAGANA LETTER BU
-0x82D5	0x3077	# HIRAGANA LETTER PU
-0x82D6	0x3078	# HIRAGANA LETTER HE
-0x82D7	0x3079	# HIRAGANA LETTER BE
-0x82D8	0x307A	# HIRAGANA LETTER PE
-0x82D9	0x307B	# HIRAGANA LETTER HO
-0x82DA	0x307C	# HIRAGANA LETTER BO
-0x82DB	0x307D	# HIRAGANA LETTER PO
-0x82DC	0x307E	# HIRAGANA LETTER MA
-0x82DD	0x307F	# HIRAGANA LETTER MI
-0x82DE	0x3080	# HIRAGANA LETTER MU
-0x82DF	0x3081	# HIRAGANA LETTER ME
-0x82E0	0x3082	# HIRAGANA LETTER MO
-0x82E1	0x3083	# HIRAGANA LETTER SMALL YA
-0x82E2	0x3084	# HIRAGANA LETTER YA
-0x82E3	0x3085	# HIRAGANA LETTER SMALL YU
-0x82E4	0x3086	# HIRAGANA LETTER YU
-0x82E5	0x3087	# HIRAGANA LETTER SMALL YO
-0x82E6	0x3088	# HIRAGANA LETTER YO
-0x82E7	0x3089	# HIRAGANA LETTER RA
-0x82E8	0x308A	# HIRAGANA LETTER RI
-0x82E9	0x308B	# HIRAGANA LETTER RU
-0x82EA	0x308C	# HIRAGANA LETTER RE
-0x82EB	0x308D	# HIRAGANA LETTER RO
-0x82EC	0x308E	# HIRAGANA LETTER SMALL WA
-0x82ED	0x308F	# HIRAGANA LETTER WA
-0x82EE	0x3090	# HIRAGANA LETTER WI
-0x82EF	0x3091	# HIRAGANA LETTER WE
-0x82F0	0x3092	# HIRAGANA LETTER WO
-0x82F1	0x3093	# HIRAGANA LETTER N
-0x8340	0x30A1	# KATAKANA LETTER SMALL A
-0x8341	0x30A2	# KATAKANA LETTER A
-0x8342	0x30A3	# KATAKANA LETTER SMALL I
-0x8343	0x30A4	# KATAKANA LETTER I
-0x8344	0x30A5	# KATAKANA LETTER SMALL U
-0x8345	0x30A6	# KATAKANA LETTER U
-0x8346	0x30A7	# KATAKANA LETTER SMALL E
-0x8347	0x30A8	# KATAKANA LETTER E
-0x8348	0x30A9	# KATAKANA LETTER SMALL O
-0x8349	0x30AA	# KATAKANA LETTER O
-0x834A	0x30AB	# KATAKANA LETTER KA
-0x834B	0x30AC	# KATAKANA LETTER GA
-0x834C	0x30AD	# KATAKANA LETTER KI
-0x834D	0x30AE	# KATAKANA LETTER GI
-0x834E	0x30AF	# KATAKANA LETTER KU
-0x834F	0x30B0	# KATAKANA LETTER GU
-0x8350	0x30B1	# KATAKANA LETTER KE
-0x8351	0x30B2	# KATAKANA LETTER GE
-0x8352	0x30B3	# KATAKANA LETTER KO
-0x8353	0x30B4	# KATAKANA LETTER GO
-0x8354	0x30B5	# KATAKANA LETTER SA
-0x8355	0x30B6	# KATAKANA LETTER ZA
-0x8356	0x30B7	# KATAKANA LETTER SI
-0x8357	0x30B8	# KATAKANA LETTER ZI
-0x8358	0x30B9	# KATAKANA LETTER SU
-0x8359	0x30BA	# KATAKANA LETTER ZU
-0x835A	0x30BB	# KATAKANA LETTER SE
-0x835B	0x30BC	# KATAKANA LETTER ZE
-0x835C	0x30BD	# KATAKANA LETTER SO
-0x835D	0x30BE	# KATAKANA LETTER ZO
-0x835E	0x30BF	# KATAKANA LETTER TA
-0x835F	0x30C0	# KATAKANA LETTER DA
-0x8360	0x30C1	# KATAKANA LETTER TI
-0x8361	0x30C2	# KATAKANA LETTER DI
-0x8362	0x30C3	# KATAKANA LETTER SMALL TU
-0x8363	0x30C4	# KATAKANA LETTER TU
-0x8364	0x30C5	# KATAKANA LETTER DU
-0x8365	0x30C6	# KATAKANA LETTER TE
-0x8366	0x30C7	# KATAKANA LETTER DE
-0x8367	0x30C8	# KATAKANA LETTER TO
-0x8368	0x30C9	# KATAKANA LETTER DO
-0x8369	0x30CA	# KATAKANA LETTER NA
-0x836A	0x30CB	# KATAKANA LETTER NI
-0x836B	0x30CC	# KATAKANA LETTER NU
-0x836C	0x30CD	# KATAKANA LETTER NE
-0x836D	0x30CE	# KATAKANA LETTER NO
-0x836E	0x30CF	# KATAKANA LETTER HA
-0x836F	0x30D0	# KATAKANA LETTER BA
-0x8370	0x30D1	# KATAKANA LETTER PA
-0x8371	0x30D2	# KATAKANA LETTER HI
-0x8372	0x30D3	# KATAKANA LETTER BI
-0x8373	0x30D4	# KATAKANA LETTER PI
-0x8374	0x30D5	# KATAKANA LETTER HU
-0x8375	0x30D6	# KATAKANA LETTER BU
-0x8376	0x30D7	# KATAKANA LETTER PU
-0x8377	0x30D8	# KATAKANA LETTER HE
-0x8378	0x30D9	# KATAKANA LETTER BE
-0x8379	0x30DA	# KATAKANA LETTER PE
-0x837A	0x30DB	# KATAKANA LETTER HO
-0x837B	0x30DC	# KATAKANA LETTER BO
-0x837C	0x30DD	# KATAKANA LETTER PO
-0x837D	0x30DE	# KATAKANA LETTER MA
-0x837E	0x30DF	# KATAKANA LETTER MI
-0x8380	0x30E0	# KATAKANA LETTER MU
-0x8381	0x30E1	# KATAKANA LETTER ME
-0x8382	0x30E2	# KATAKANA LETTER MO
-0x8383	0x30E3	# KATAKANA LETTER SMALL YA
-0x8384	0x30E4	# KATAKANA LETTER YA
-0x8385	0x30E5	# KATAKANA LETTER SMALL YU
-0x8386	0x30E6	# KATAKANA LETTER YU
-0x8387	0x30E7	# KATAKANA LETTER SMALL YO
-0x8388	0x30E8	# KATAKANA LETTER YO
-0x8389	0x30E9	# KATAKANA LETTER RA
-0x838A	0x30EA	# KATAKANA LETTER RI
-0x838B	0x30EB	# KATAKANA LETTER RU
-0x838C	0x30EC	# KATAKANA LETTER RE
-0x838D	0x30ED	# KATAKANA LETTER RO
-0x838E	0x30EE	# KATAKANA LETTER SMALL WA
-0x838F	0x30EF	# KATAKANA LETTER WA
-0x8390	0x30F0	# KATAKANA LETTER WI
-0x8391	0x30F1	# KATAKANA LETTER WE
-0x8392	0x30F2	# KATAKANA LETTER WO
-0x8393	0x30F3	# KATAKANA LETTER N
-0x8394	0x30F4	# KATAKANA LETTER VU
-0x8395	0x30F5	# KATAKANA LETTER SMALL KA
-0x8396	0x30F6	# KATAKANA LETTER SMALL KE
-0x839F	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x83A0	0x0392	# GREEK CAPITAL LETTER BETA
-0x83A1	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x83A2	0x0394	# GREEK CAPITAL LETTER DELTA
-0x83A3	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x83A4	0x0396	# GREEK CAPITAL LETTER ZETA
-0x83A5	0x0397	# GREEK CAPITAL LETTER ETA
-0x83A6	0x0398	# GREEK CAPITAL LETTER THETA
-0x83A7	0x0399	# GREEK CAPITAL LETTER IOTA
-0x83A8	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x83A9	0x039B	# GREEK CAPITAL LETTER LAMBDA
-0x83AA	0x039C	# GREEK CAPITAL LETTER MU
-0x83AB	0x039D	# GREEK CAPITAL LETTER NU
-0x83AC	0x039E	# GREEK CAPITAL LETTER XI
-0x83AD	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x83AE	0x03A0	# GREEK CAPITAL LETTER PI
-0x83AF	0x03A1	# GREEK CAPITAL LETTER RHO
-0x83B0	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x83B1	0x03A4	# GREEK CAPITAL LETTER TAU
-0x83B2	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x83B3	0x03A6	# GREEK CAPITAL LETTER PHI
-0x83B4	0x03A7	# GREEK CAPITAL LETTER CHI
-0x83B5	0x03A8	# GREEK CAPITAL LETTER PSI
-0x83B6	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x83BF	0x03B1	# GREEK SMALL LETTER ALPHA
-0x83C0	0x03B2	# GREEK SMALL LETTER BETA
-0x83C1	0x03B3	# GREEK SMALL LETTER GAMMA
-0x83C2	0x03B4	# GREEK SMALL LETTER DELTA
-0x83C3	0x03B5	# GREEK SMALL LETTER EPSILON
-0x83C4	0x03B6	# GREEK SMALL LETTER ZETA
-0x83C5	0x03B7	# GREEK SMALL LETTER ETA
-0x83C6	0x03B8	# GREEK SMALL LETTER THETA
-0x83C7	0x03B9	# GREEK SMALL LETTER IOTA
-0x83C8	0x03BA	# GREEK SMALL LETTER KAPPA
-0x83C9	0x03BB	# GREEK SMALL LETTER LAMBDA
-0x83CA	0x03BC	# GREEK SMALL LETTER MU
-0x83CB	0x03BD	# GREEK SMALL LETTER NU
-0x83CC	0x03BE	# GREEK SMALL LETTER XI
-0x83CD	0x03BF	# GREEK SMALL LETTER OMICRON
-0x83CE	0x03C0	# GREEK SMALL LETTER PI
-0x83CF	0x03C1	# GREEK SMALL LETTER RHO
-0x83D0	0x03C3	# GREEK SMALL LETTER SIGMA
-0x83D1	0x03C4	# GREEK SMALL LETTER TAU
-0x83D2	0x03C5	# GREEK SMALL LETTER UPSILON
-0x83D3	0x03C6	# GREEK SMALL LETTER PHI
-0x83D4	0x03C7	# GREEK SMALL LETTER CHI
-0x83D5	0x03C8	# GREEK SMALL LETTER PSI
-0x83D6	0x03C9	# GREEK SMALL LETTER OMEGA
-0x8440	0x0410	# CYRILLIC CAPITAL LETTER A
-0x8441	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x8442	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x8443	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x8444	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x8445	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x8446	0x0401	# CYRILLIC CAPITAL LETTER IO
-0x8447	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x8448	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x8449	0x0418	# CYRILLIC CAPITAL LETTER I
-0x844A	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x844B	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x844C	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x844D	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x844E	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x844F	0x041E	# CYRILLIC CAPITAL LETTER O
-0x8450	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x8451	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x8452	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x8453	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x8454	0x0423	# CYRILLIC CAPITAL LETTER U
-0x8455	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x8456	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x8457	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x8458	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x8459	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x845A	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x845B	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x845C	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x845D	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x845E	0x042D	# CYRILLIC CAPITAL LETTER E
-0x845F	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x8460	0x042F	# CYRILLIC CAPITAL LETTER YA
-0x8470	0x0430	# CYRILLIC SMALL LETTER A
-0x8471	0x0431	# CYRILLIC SMALL LETTER BE
-0x8472	0x0432	# CYRILLIC SMALL LETTER VE
-0x8473	0x0433	# CYRILLIC SMALL LETTER GHE
-0x8474	0x0434	# CYRILLIC SMALL LETTER DE
-0x8475	0x0435	# CYRILLIC SMALL LETTER IE
-0x8476	0x0451	# CYRILLIC SMALL LETTER IO
-0x8477	0x0436	# CYRILLIC SMALL LETTER ZHE
-0x8478	0x0437	# CYRILLIC SMALL LETTER ZE
-0x8479	0x0438	# CYRILLIC SMALL LETTER I
-0x847A	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0x847B	0x043A	# CYRILLIC SMALL LETTER KA
-0x847C	0x043B	# CYRILLIC SMALL LETTER EL
-0x847D	0x043C	# CYRILLIC SMALL LETTER EM
-0x847E	0x043D	# CYRILLIC SMALL LETTER EN
-0x8480	0x043E	# CYRILLIC SMALL LETTER O
-0x8481	0x043F	# CYRILLIC SMALL LETTER PE
-0x8482	0x0440	# CYRILLIC SMALL LETTER ER
-0x8483	0x0441	# CYRILLIC SMALL LETTER ES
-0x8484	0x0442	# CYRILLIC SMALL LETTER TE
-0x8485	0x0443	# CYRILLIC SMALL LETTER U
-0x8486	0x0444	# CYRILLIC SMALL LETTER EF
-0x8487	0x0445	# CYRILLIC SMALL LETTER HA
-0x8488	0x0446	# CYRILLIC SMALL LETTER TSE
-0x8489	0x0447	# CYRILLIC SMALL LETTER CHE
-0x848A	0x0448	# CYRILLIC SMALL LETTER SHA
-0x848B	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0x848C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0x848D	0x044B	# CYRILLIC SMALL LETTER YERU
-0x848E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0x848F	0x044D	# CYRILLIC SMALL LETTER E
-0x8490	0x044E	# CYRILLIC SMALL LETTER YU
-0x8491	0x044F	# CYRILLIC SMALL LETTER YA
-0x849F	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x84A0	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x84A1	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x84A2	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x84A3	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x84A4	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x84A5	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x84A6	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x84A7	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x84A8	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x84A9	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x84AA	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
-0x84AB	0x2503	# BOX DRAWINGS HEAVY VERTICAL
-0x84AC	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x84AD	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
-0x84AE	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
-0x84AF	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
-0x84B0	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x84B1	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x84B2	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x84B3	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x84B4	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x84B5	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x84B6	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x84B7	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x84B8	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x84B9	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x84BA	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x84BB	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x84BC	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x84BD	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x84BE	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x889F	0x4E9C	# <CJK>
-0x88A0	0x5516	# <CJK>
-0x88A1	0x5A03	# <CJK>
-0x88A2	0x963F	# <CJK>
-0x88A3	0x54C0	# <CJK>
-0x88A4	0x611B	# <CJK>
-0x88A5	0x6328	# <CJK>
-0x88A6	0x59F6	# <CJK>
-0x88A7	0x9022	# <CJK>
-0x88A8	0x8475	# <CJK>
-0x88A9	0x831C	# <CJK>
-0x88AA	0x7A50	# <CJK>
-0x88AB	0x60AA	# <CJK>
-0x88AC	0x63E1	# <CJK>
-0x88AD	0x6E25	# <CJK>
-0x88AE	0x65ED	# <CJK>
-0x88AF	0x8466	# <CJK>
-0x88B0	0x82A6	# <CJK>
-0x88B1	0x9BF5	# <CJK>
-0x88B2	0x6893	# <CJK>
-0x88B3	0x5727	# <CJK>
-0x88B4	0x65A1	# <CJK>
-0x88B5	0x6271	# <CJK>
-0x88B6	0x5B9B	# <CJK>
-0x88B7	0x59D0	# <CJK>
-0x88B8	0x867B	# <CJK>
-0x88B9	0x98F4	# <CJK>
-0x88BA	0x7D62	# <CJK>
-0x88BB	0x7DBE	# <CJK>
-0x88BC	0x9B8E	# <CJK>
-0x88BD	0x6216	# <CJK>
-0x88BE	0x7C9F	# <CJK>
-0x88BF	0x88B7	# <CJK>
-0x88C0	0x5B89	# <CJK>
-0x88C1	0x5EB5	# <CJK>
-0x88C2	0x6309	# <CJK>
-0x88C3	0x6697	# <CJK>
-0x88C4	0x6848	# <CJK>
-0x88C5	0x95C7	# <CJK>
-0x88C6	0x978D	# <CJK>
-0x88C7	0x674F	# <CJK>
-0x88C8	0x4EE5	# <CJK>
-0x88C9	0x4F0A	# <CJK>
-0x88CA	0x4F4D	# <CJK>
-0x88CB	0x4F9D	# <CJK>
-0x88CC	0x5049	# <CJK>
-0x88CD	0x56F2	# <CJK>
-0x88CE	0x5937	# <CJK>
-0x88CF	0x59D4	# <CJK>
-0x88D0	0x5A01	# <CJK>
-0x88D1	0x5C09	# <CJK>
-0x88D2	0x60DF	# <CJK>
-0x88D3	0x610F	# <CJK>
-0x88D4	0x6170	# <CJK>
-0x88D5	0x6613	# <CJK>
-0x88D6	0x6905	# <CJK>
-0x88D7	0x70BA	# <CJK>
-0x88D8	0x754F	# <CJK>
-0x88D9	0x7570	# <CJK>
-0x88DA	0x79FB	# <CJK>
-0x88DB	0x7DAD	# <CJK>
-0x88DC	0x7DEF	# <CJK>
-0x88DD	0x80C3	# <CJK>
-0x88DE	0x840E	# <CJK>
-0x88DF	0x8863	# <CJK>
-0x88E0	0x8B02	# <CJK>
-0x88E1	0x9055	# <CJK>
-0x88E2	0x907A	# <CJK>
-0x88E3	0x533B	# <CJK>
-0x88E4	0x4E95	# <CJK>
-0x88E5	0x4EA5	# <CJK>
-0x88E6	0x57DF	# <CJK>
-0x88E7	0x80B2	# <CJK>
-0x88E8	0x90C1	# <CJK>
-0x88E9	0x78EF	# <CJK>
-0x88EA	0x4E00	# <CJK>
-0x88EB	0x58F1	# <CJK>
-0x88EC	0x6EA2	# <CJK>
-0x88ED	0x9038	# <CJK>
-0x88EE	0x7A32	# <CJK>
-0x88EF	0x8328	# <CJK>
-0x88F0	0x828B	# <CJK>
-0x88F1	0x9C2F	# <CJK>
-0x88F2	0x5141	# <CJK>
-0x88F3	0x5370	# <CJK>
-0x88F4	0x54BD	# <CJK>
-0x88F5	0x54E1	# <CJK>
-0x88F6	0x56E0	# <CJK>
-0x88F7	0x59FB	# <CJK>
-0x88F8	0x5F15	# <CJK>
-0x88F9	0x98F2	# <CJK>
-0x88FA	0x6DEB	# <CJK>
-0x88FB	0x80E4	# <CJK>
-0x88FC	0x852D	# <CJK>
-0x8940	0x9662	# <CJK>
-0x8941	0x9670	# <CJK>
-0x8942	0x96A0	# <CJK>
-0x8943	0x97FB	# <CJK>
-0x8944	0x540B	# <CJK>
-0x8945	0x53F3	# <CJK>
-0x8946	0x5B87	# <CJK>
-0x8947	0x70CF	# <CJK>
-0x8948	0x7FBD	# <CJK>
-0x8949	0x8FC2	# <CJK>
-0x894A	0x96E8	# <CJK>
-0x894B	0x536F	# <CJK>
-0x894C	0x9D5C	# <CJK>
-0x894D	0x7ABA	# <CJK>
-0x894E	0x4E11	# <CJK>
-0x894F	0x7893	# <CJK>
-0x8950	0x81FC	# <CJK>
-0x8951	0x6E26	# <CJK>
-0x8952	0x5618	# <CJK>
-0x8953	0x5504	# <CJK>
-0x8954	0x6B1D	# <CJK>
-0x8955	0x851A	# <CJK>
-0x8956	0x9C3B	# <CJK>
-0x8957	0x59E5	# <CJK>
-0x8958	0x53A9	# <CJK>
-0x8959	0x6D66	# <CJK>
-0x895A	0x74DC	# <CJK>
-0x895B	0x958F	# <CJK>
-0x895C	0x5642	# <CJK>
-0x895D	0x4E91	# <CJK>
-0x895E	0x904B	# <CJK>
-0x895F	0x96F2	# <CJK>
-0x8960	0x834F	# <CJK>
-0x8961	0x990C	# <CJK>
-0x8962	0x53E1	# <CJK>
-0x8963	0x55B6	# <CJK>
-0x8964	0x5B30	# <CJK>
-0x8965	0x5F71	# <CJK>
-0x8966	0x6620	# <CJK>
-0x8967	0x66F3	# <CJK>
-0x8968	0x6804	# <CJK>
-0x8969	0x6C38	# <CJK>
-0x896A	0x6CF3	# <CJK>
-0x896B	0x6D29	# <CJK>
-0x896C	0x745B	# <CJK>
-0x896D	0x76C8	# <CJK>
-0x896E	0x7A4E	# <CJK>
-0x896F	0x9834	# <CJK>
-0x8970	0x82F1	# <CJK>
-0x8971	0x885B	# <CJK>
-0x8972	0x8A60	# <CJK>
-0x8973	0x92ED	# <CJK>
-0x8974	0x6DB2	# <CJK>
-0x8975	0x75AB	# <CJK>
-0x8976	0x76CA	# <CJK>
-0x8977	0x99C5	# <CJK>
-0x8978	0x60A6	# <CJK>
-0x8979	0x8B01	# <CJK>
-0x897A	0x8D8A	# <CJK>
-0x897B	0x95B2	# <CJK>
-0x897C	0x698E	# <CJK>
-0x897D	0x53AD	# <CJK>
-0x897E	0x5186	# <CJK>
-0x8980	0x5712	# <CJK>
-0x8981	0x5830	# <CJK>
-0x8982	0x5944	# <CJK>
-0x8983	0x5BB4	# <CJK>
-0x8984	0x5EF6	# <CJK>
-0x8985	0x6028	# <CJK>
-0x8986	0x63A9	# <CJK>
-0x8987	0x63F4	# <CJK>
-0x8988	0x6CBF	# <CJK>
-0x8989	0x6F14	# <CJK>
-0x898A	0x708E	# <CJK>
-0x898B	0x7114	# <CJK>
-0x898C	0x7159	# <CJK>
-0x898D	0x71D5	# <CJK>
-0x898E	0x733F	# <CJK>
-0x898F	0x7E01	# <CJK>
-0x8990	0x8276	# <CJK>
-0x8991	0x82D1	# <CJK>
-0x8992	0x8597	# <CJK>
-0x8993	0x9060	# <CJK>
-0x8994	0x925B	# <CJK>
-0x8995	0x9D1B	# <CJK>
-0x8996	0x5869	# <CJK>
-0x8997	0x65BC	# <CJK>
-0x8998	0x6C5A	# <CJK>
-0x8999	0x7525	# <CJK>
-0x899A	0x51F9	# <CJK>
-0x899B	0x592E	# <CJK>
-0x899C	0x5965	# <CJK>
-0x899D	0x5F80	# <CJK>
-0x899E	0x5FDC	# <CJK>
-0x899F	0x62BC	# <CJK>
-0x89A0	0x65FA	# <CJK>
-0x89A1	0x6A2A	# <CJK>
-0x89A2	0x6B27	# <CJK>
-0x89A3	0x6BB4	# <CJK>
-0x89A4	0x738B	# <CJK>
-0x89A5	0x7FC1	# <CJK>
-0x89A6	0x8956	# <CJK>
-0x89A7	0x9D2C	# <CJK>
-0x89A8	0x9D0E	# <CJK>
-0x89A9	0x9EC4	# <CJK>
-0x89AA	0x5CA1	# <CJK>
-0x89AB	0x6C96	# <CJK>
-0x89AC	0x837B	# <CJK>
-0x89AD	0x5104	# <CJK>
-0x89AE	0x5C4B	# <CJK>
-0x89AF	0x61B6	# <CJK>
-0x89B0	0x81C6	# <CJK>
-0x89B1	0x6876	# <CJK>
-0x89B2	0x7261	# <CJK>
-0x89B3	0x4E59	# <CJK>
-0x89B4	0x4FFA	# <CJK>
-0x89B5	0x5378	# <CJK>
-0x89B6	0x6069	# <CJK>
-0x89B7	0x6E29	# <CJK>
-0x89B8	0x7A4F	# <CJK>
-0x89B9	0x97F3	# <CJK>
-0x89BA	0x4E0B	# <CJK>
-0x89BB	0x5316	# <CJK>
-0x89BC	0x4EEE	# <CJK>
-0x89BD	0x4F55	# <CJK>
-0x89BE	0x4F3D	# <CJK>
-0x89BF	0x4FA1	# <CJK>
-0x89C0	0x4F73	# <CJK>
-0x89C1	0x52A0	# <CJK>
-0x89C2	0x53EF	# <CJK>
-0x89C3	0x5609	# <CJK>
-0x89C4	0x590F	# <CJK>
-0x89C5	0x5AC1	# <CJK>
-0x89C6	0x5BB6	# <CJK>
-0x89C7	0x5BE1	# <CJK>
-0x89C8	0x79D1	# <CJK>
-0x89C9	0x6687	# <CJK>
-0x89CA	0x679C	# <CJK>
-0x89CB	0x67B6	# <CJK>
-0x89CC	0x6B4C	# <CJK>
-0x89CD	0x6CB3	# <CJK>
-0x89CE	0x706B	# <CJK>
-0x89CF	0x73C2	# <CJK>
-0x89D0	0x798D	# <CJK>
-0x89D1	0x79BE	# <CJK>
-0x89D2	0x7A3C	# <CJK>
-0x89D3	0x7B87	# <CJK>
-0x89D4	0x82B1	# <CJK>
-0x89D5	0x82DB	# <CJK>
-0x89D6	0x8304	# <CJK>
-0x89D7	0x8377	# <CJK>
-0x89D8	0x83EF	# <CJK>
-0x89D9	0x83D3	# <CJK>
-0x89DA	0x8766	# <CJK>
-0x89DB	0x8AB2	# <CJK>
-0x89DC	0x5629	# <CJK>
-0x89DD	0x8CA8	# <CJK>
-0x89DE	0x8FE6	# <CJK>
-0x89DF	0x904E	# <CJK>
-0x89E0	0x971E	# <CJK>
-0x89E1	0x868A	# <CJK>
-0x89E2	0x4FC4	# <CJK>
-0x89E3	0x5CE8	# <CJK>
-0x89E4	0x6211	# <CJK>
-0x89E5	0x7259	# <CJK>
-0x89E6	0x753B	# <CJK>
-0x89E7	0x81E5	# <CJK>
-0x89E8	0x82BD	# <CJK>
-0x89E9	0x86FE	# <CJK>
-0x89EA	0x8CC0	# <CJK>
-0x89EB	0x96C5	# <CJK>
-0x89EC	0x9913	# <CJK>
-0x89ED	0x99D5	# <CJK>
-0x89EE	0x4ECB	# <CJK>
-0x89EF	0x4F1A	# <CJK>
-0x89F0	0x89E3	# <CJK>
-0x89F1	0x56DE	# <CJK>
-0x89F2	0x584A	# <CJK>
-0x89F3	0x58CA	# <CJK>
-0x89F4	0x5EFB	# <CJK>
-0x89F5	0x5FEB	# <CJK>
-0x89F6	0x602A	# <CJK>
-0x89F7	0x6094	# <CJK>
-0x89F8	0x6062	# <CJK>
-0x89F9	0x61D0	# <CJK>
-0x89FA	0x6212	# <CJK>
-0x89FB	0x62D0	# <CJK>
-0x89FC	0x6539	# <CJK>
-0x8A40	0x9B41	# <CJK>
-0x8A41	0x6666	# <CJK>
-0x8A42	0x68B0	# <CJK>
-0x8A43	0x6D77	# <CJK>
-0x8A44	0x7070	# <CJK>
-0x8A45	0x754C	# <CJK>
-0x8A46	0x7686	# <CJK>
-0x8A47	0x7D75	# <CJK>
-0x8A48	0x82A5	# <CJK>
-0x8A49	0x87F9	# <CJK>
-0x8A4A	0x958B	# <CJK>
-0x8A4B	0x968E	# <CJK>
-0x8A4C	0x8C9D	# <CJK>
-0x8A4D	0x51F1	# <CJK>
-0x8A4E	0x52BE	# <CJK>
-0x8A4F	0x5916	# <CJK>
-0x8A50	0x54B3	# <CJK>
-0x8A51	0x5BB3	# <CJK>
-0x8A52	0x5D16	# <CJK>
-0x8A53	0x6168	# <CJK>
-0x8A54	0x6982	# <CJK>
-0x8A55	0x6DAF	# <CJK>
-0x8A56	0x788D	# <CJK>
-0x8A57	0x84CB	# <CJK>
-0x8A58	0x8857	# <CJK>
-0x8A59	0x8A72	# <CJK>
-0x8A5A	0x93A7	# <CJK>
-0x8A5B	0x9AB8	# <CJK>
-0x8A5C	0x6D6C	# <CJK>
-0x8A5D	0x99A8	# <CJK>
-0x8A5E	0x86D9	# <CJK>
-0x8A5F	0x57A3	# <CJK>
-0x8A60	0x67FF	# <CJK>
-0x8A61	0x86CE	# <CJK>
-0x8A62	0x920E	# <CJK>
-0x8A63	0x5283	# <CJK>
-0x8A64	0x5687	# <CJK>
-0x8A65	0x5404	# <CJK>
-0x8A66	0x5ED3	# <CJK>
-0x8A67	0x62E1	# <CJK>
-0x8A68	0x64B9	# <CJK>
-0x8A69	0x683C	# <CJK>
-0x8A6A	0x6838	# <CJK>
-0x8A6B	0x6BBB	# <CJK>
-0x8A6C	0x7372	# <CJK>
-0x8A6D	0x78BA	# <CJK>
-0x8A6E	0x7A6B	# <CJK>
-0x8A6F	0x899A	# <CJK>
-0x8A70	0x89D2	# <CJK>
-0x8A71	0x8D6B	# <CJK>
-0x8A72	0x8F03	# <CJK>
-0x8A73	0x90ED	# <CJK>
-0x8A74	0x95A3	# <CJK>
-0x8A75	0x9694	# <CJK>
-0x8A76	0x9769	# <CJK>
-0x8A77	0x5B66	# <CJK>
-0x8A78	0x5CB3	# <CJK>
-0x8A79	0x697D	# <CJK>
-0x8A7A	0x984D	# <CJK>
-0x8A7B	0x984E	# <CJK>
-0x8A7C	0x639B	# <CJK>
-0x8A7D	0x7B20	# <CJK>
-0x8A7E	0x6A2B	# <CJK>
-0x8A80	0x6A7F	# <CJK>
-0x8A81	0x68B6	# <CJK>
-0x8A82	0x9C0D	# <CJK>
-0x8A83	0x6F5F	# <CJK>
-0x8A84	0x5272	# <CJK>
-0x8A85	0x559D	# <CJK>
-0x8A86	0x6070	# <CJK>
-0x8A87	0x62EC	# <CJK>
-0x8A88	0x6D3B	# <CJK>
-0x8A89	0x6E07	# <CJK>
-0x8A8A	0x6ED1	# <CJK>
-0x8A8B	0x845B	# <CJK>
-0x8A8C	0x8910	# <CJK>
-0x8A8D	0x8F44	# <CJK>
-0x8A8E	0x4E14	# <CJK>
-0x8A8F	0x9C39	# <CJK>
-0x8A90	0x53F6	# <CJK>
-0x8A91	0x691B	# <CJK>
-0x8A92	0x6A3A	# <CJK>
-0x8A93	0x9784	# <CJK>
-0x8A94	0x682A	# <CJK>
-0x8A95	0x515C	# <CJK>
-0x8A96	0x7AC3	# <CJK>
-0x8A97	0x84B2	# <CJK>
-0x8A98	0x91DC	# <CJK>
-0x8A99	0x938C	# <CJK>
-0x8A9A	0x565B	# <CJK>
-0x8A9B	0x9D28	# <CJK>
-0x8A9C	0x6822	# <CJK>
-0x8A9D	0x8305	# <CJK>
-0x8A9E	0x8431	# <CJK>
-0x8A9F	0x7CA5	# <CJK>
-0x8AA0	0x5208	# <CJK>
-0x8AA1	0x82C5	# <CJK>
-0x8AA2	0x74E6	# <CJK>
-0x8AA3	0x4E7E	# <CJK>
-0x8AA4	0x4F83	# <CJK>
-0x8AA5	0x51A0	# <CJK>
-0x8AA6	0x5BD2	# <CJK>
-0x8AA7	0x520A	# <CJK>
-0x8AA8	0x52D8	# <CJK>
-0x8AA9	0x52E7	# <CJK>
-0x8AAA	0x5DFB	# <CJK>
-0x8AAB	0x559A	# <CJK>
-0x8AAC	0x582A	# <CJK>
-0x8AAD	0x59E6	# <CJK>
-0x8AAE	0x5B8C	# <CJK>
-0x8AAF	0x5B98	# <CJK>
-0x8AB0	0x5BDB	# <CJK>
-0x8AB1	0x5E72	# <CJK>
-0x8AB2	0x5E79	# <CJK>
-0x8AB3	0x60A3	# <CJK>
-0x8AB4	0x611F	# <CJK>
-0x8AB5	0x6163	# <CJK>
-0x8AB6	0x61BE	# <CJK>
-0x8AB7	0x63DB	# <CJK>
-0x8AB8	0x6562	# <CJK>
-0x8AB9	0x67D1	# <CJK>
-0x8ABA	0x6853	# <CJK>
-0x8ABB	0x68FA	# <CJK>
-0x8ABC	0x6B3E	# <CJK>
-0x8ABD	0x6B53	# <CJK>
-0x8ABE	0x6C57	# <CJK>
-0x8ABF	0x6F22	# <CJK>
-0x8AC0	0x6F97	# <CJK>
-0x8AC1	0x6F45	# <CJK>
-0x8AC2	0x74B0	# <CJK>
-0x8AC3	0x7518	# <CJK>
-0x8AC4	0x76E3	# <CJK>
-0x8AC5	0x770B	# <CJK>
-0x8AC6	0x7AFF	# <CJK>
-0x8AC7	0x7BA1	# <CJK>
-0x8AC8	0x7C21	# <CJK>
-0x8AC9	0x7DE9	# <CJK>
-0x8ACA	0x7F36	# <CJK>
-0x8ACB	0x7FF0	# <CJK>
-0x8ACC	0x809D	# <CJK>
-0x8ACD	0x8266	# <CJK>
-0x8ACE	0x839E	# <CJK>
-0x8ACF	0x89B3	# <CJK>
-0x8AD0	0x8ACC	# <CJK>
-0x8AD1	0x8CAB	# <CJK>
-0x8AD2	0x9084	# <CJK>
-0x8AD3	0x9451	# <CJK>
-0x8AD4	0x9593	# <CJK>
-0x8AD5	0x9591	# <CJK>
-0x8AD6	0x95A2	# <CJK>
-0x8AD7	0x9665	# <CJK>
-0x8AD8	0x97D3	# <CJK>
-0x8AD9	0x9928	# <CJK>
-0x8ADA	0x8218	# <CJK>
-0x8ADB	0x4E38	# <CJK>
-0x8ADC	0x542B	# <CJK>
-0x8ADD	0x5CB8	# <CJK>
-0x8ADE	0x5DCC	# <CJK>
-0x8ADF	0x73A9	# <CJK>
-0x8AE0	0x764C	# <CJK>
-0x8AE1	0x773C	# <CJK>
-0x8AE2	0x5CA9	# <CJK>
-0x8AE3	0x7FEB	# <CJK>
-0x8AE4	0x8D0B	# <CJK>
-0x8AE5	0x96C1	# <CJK>
-0x8AE6	0x9811	# <CJK>
-0x8AE7	0x9854	# <CJK>
-0x8AE8	0x9858	# <CJK>
-0x8AE9	0x4F01	# <CJK>
-0x8AEA	0x4F0E	# <CJK>
-0x8AEB	0x5371	# <CJK>
-0x8AEC	0x559C	# <CJK>
-0x8AED	0x5668	# <CJK>
-0x8AEE	0x57FA	# <CJK>
-0x8AEF	0x5947	# <CJK>
-0x8AF0	0x5B09	# <CJK>
-0x8AF1	0x5BC4	# <CJK>
-0x8AF2	0x5C90	# <CJK>
-0x8AF3	0x5E0C	# <CJK>
-0x8AF4	0x5E7E	# <CJK>
-0x8AF5	0x5FCC	# <CJK>
-0x8AF6	0x63EE	# <CJK>
-0x8AF7	0x673A	# <CJK>
-0x8AF8	0x65D7	# <CJK>
-0x8AF9	0x65E2	# <CJK>
-0x8AFA	0x671F	# <CJK>
-0x8AFB	0x68CB	# <CJK>
-0x8AFC	0x68C4	# <CJK>
-0x8B40	0x6A5F	# <CJK>
-0x8B41	0x5E30	# <CJK>
-0x8B42	0x6BC5	# <CJK>
-0x8B43	0x6C17	# <CJK>
-0x8B44	0x6C7D	# <CJK>
-0x8B45	0x757F	# <CJK>
-0x8B46	0x7948	# <CJK>
-0x8B47	0x5B63	# <CJK>
-0x8B48	0x7A00	# <CJK>
-0x8B49	0x7D00	# <CJK>
-0x8B4A	0x5FBD	# <CJK>
-0x8B4B	0x898F	# <CJK>
-0x8B4C	0x8A18	# <CJK>
-0x8B4D	0x8CB4	# <CJK>
-0x8B4E	0x8D77	# <CJK>
-0x8B4F	0x8ECC	# <CJK>
-0x8B50	0x8F1D	# <CJK>
-0x8B51	0x98E2	# <CJK>
-0x8B52	0x9A0E	# <CJK>
-0x8B53	0x9B3C	# <CJK>
-0x8B54	0x4E80	# <CJK>
-0x8B55	0x507D	# <CJK>
-0x8B56	0x5100	# <CJK>
-0x8B57	0x5993	# <CJK>
-0x8B58	0x5B9C	# <CJK>
-0x8B59	0x622F	# <CJK>
-0x8B5A	0x6280	# <CJK>
-0x8B5B	0x64EC	# <CJK>
-0x8B5C	0x6B3A	# <CJK>
-0x8B5D	0x72A0	# <CJK>
-0x8B5E	0x7591	# <CJK>
-0x8B5F	0x7947	# <CJK>
-0x8B60	0x7FA9	# <CJK>
-0x8B61	0x87FB	# <CJK>
-0x8B62	0x8ABC	# <CJK>
-0x8B63	0x8B70	# <CJK>
-0x8B64	0x63AC	# <CJK>
-0x8B65	0x83CA	# <CJK>
-0x8B66	0x97A0	# <CJK>
-0x8B67	0x5409	# <CJK>
-0x8B68	0x5403	# <CJK>
-0x8B69	0x55AB	# <CJK>
-0x8B6A	0x6854	# <CJK>
-0x8B6B	0x6A58	# <CJK>
-0x8B6C	0x8A70	# <CJK>
-0x8B6D	0x7827	# <CJK>
-0x8B6E	0x6775	# <CJK>
-0x8B6F	0x9ECD	# <CJK>
-0x8B70	0x5374	# <CJK>
-0x8B71	0x5BA2	# <CJK>
-0x8B72	0x811A	# <CJK>
-0x8B73	0x8650	# <CJK>
-0x8B74	0x9006	# <CJK>
-0x8B75	0x4E18	# <CJK>
-0x8B76	0x4E45	# <CJK>
-0x8B77	0x4EC7	# <CJK>
-0x8B78	0x4F11	# <CJK>
-0x8B79	0x53CA	# <CJK>
-0x8B7A	0x5438	# <CJK>
-0x8B7B	0x5BAE	# <CJK>
-0x8B7C	0x5F13	# <CJK>
-0x8B7D	0x6025	# <CJK>
-0x8B7E	0x6551	# <CJK>
-0x8B80	0x673D	# <CJK>
-0x8B81	0x6C42	# <CJK>
-0x8B82	0x6C72	# <CJK>
-0x8B83	0x6CE3	# <CJK>
-0x8B84	0x7078	# <CJK>
-0x8B85	0x7403	# <CJK>
-0x8B86	0x7A76	# <CJK>
-0x8B87	0x7AAE	# <CJK>
-0x8B88	0x7B08	# <CJK>
-0x8B89	0x7D1A	# <CJK>
-0x8B8A	0x7CFE	# <CJK>
-0x8B8B	0x7D66	# <CJK>
-0x8B8C	0x65E7	# <CJK>
-0x8B8D	0x725B	# <CJK>
-0x8B8E	0x53BB	# <CJK>
-0x8B8F	0x5C45	# <CJK>
-0x8B90	0x5DE8	# <CJK>
-0x8B91	0x62D2	# <CJK>
-0x8B92	0x62E0	# <CJK>
-0x8B93	0x6319	# <CJK>
-0x8B94	0x6E20	# <CJK>
-0x8B95	0x865A	# <CJK>
-0x8B96	0x8A31	# <CJK>
-0x8B97	0x8DDD	# <CJK>
-0x8B98	0x92F8	# <CJK>
-0x8B99	0x6F01	# <CJK>
-0x8B9A	0x79A6	# <CJK>
-0x8B9B	0x9B5A	# <CJK>
-0x8B9C	0x4EA8	# <CJK>
-0x8B9D	0x4EAB	# <CJK>
-0x8B9E	0x4EAC	# <CJK>
-0x8B9F	0x4F9B	# <CJK>
-0x8BA0	0x4FA0	# <CJK>
-0x8BA1	0x50D1	# <CJK>
-0x8BA2	0x5147	# <CJK>
-0x8BA3	0x7AF6	# <CJK>
-0x8BA4	0x5171	# <CJK>
-0x8BA5	0x51F6	# <CJK>
-0x8BA6	0x5354	# <CJK>
-0x8BA7	0x5321	# <CJK>
-0x8BA8	0x537F	# <CJK>
-0x8BA9	0x53EB	# <CJK>
-0x8BAA	0x55AC	# <CJK>
-0x8BAB	0x5883	# <CJK>
-0x8BAC	0x5CE1	# <CJK>
-0x8BAD	0x5F37	# <CJK>
-0x8BAE	0x5F4A	# <CJK>
-0x8BAF	0x602F	# <CJK>
-0x8BB0	0x6050	# <CJK>
-0x8BB1	0x606D	# <CJK>
-0x8BB2	0x631F	# <CJK>
-0x8BB3	0x6559	# <CJK>
-0x8BB4	0x6A4B	# <CJK>
-0x8BB5	0x6CC1	# <CJK>
-0x8BB6	0x72C2	# <CJK>
-0x8BB7	0x72ED	# <CJK>
-0x8BB8	0x77EF	# <CJK>
-0x8BB9	0x80F8	# <CJK>
-0x8BBA	0x8105	# <CJK>
-0x8BBB	0x8208	# <CJK>
-0x8BBC	0x854E	# <CJK>
-0x8BBD	0x90F7	# <CJK>
-0x8BBE	0x93E1	# <CJK>
-0x8BBF	0x97FF	# <CJK>
-0x8BC0	0x9957	# <CJK>
-0x8BC1	0x9A5A	# <CJK>
-0x8BC2	0x4EF0	# <CJK>
-0x8BC3	0x51DD	# <CJK>
-0x8BC4	0x5C2D	# <CJK>
-0x8BC5	0x6681	# <CJK>
-0x8BC6	0x696D	# <CJK>
-0x8BC7	0x5C40	# <CJK>
-0x8BC8	0x66F2	# <CJK>
-0x8BC9	0x6975	# <CJK>
-0x8BCA	0x7389	# <CJK>
-0x8BCB	0x6850	# <CJK>
-0x8BCC	0x7C81	# <CJK>
-0x8BCD	0x50C5	# <CJK>
-0x8BCE	0x52E4	# <CJK>
-0x8BCF	0x5747	# <CJK>
-0x8BD0	0x5DFE	# <CJK>
-0x8BD1	0x9326	# <CJK>
-0x8BD2	0x65A4	# <CJK>
-0x8BD3	0x6B23	# <CJK>
-0x8BD4	0x6B3D	# <CJK>
-0x8BD5	0x7434	# <CJK>
-0x8BD6	0x7981	# <CJK>
-0x8BD7	0x79BD	# <CJK>
-0x8BD8	0x7B4B	# <CJK>
-0x8BD9	0x7DCA	# <CJK>
-0x8BDA	0x82B9	# <CJK>
-0x8BDB	0x83CC	# <CJK>
-0x8BDC	0x887F	# <CJK>
-0x8BDD	0x895F	# <CJK>
-0x8BDE	0x8B39	# <CJK>
-0x8BDF	0x8FD1	# <CJK>
-0x8BE0	0x91D1	# <CJK>
-0x8BE1	0x541F	# <CJK>
-0x8BE2	0x9280	# <CJK>
-0x8BE3	0x4E5D	# <CJK>
-0x8BE4	0x5036	# <CJK>
-0x8BE5	0x53E5	# <CJK>
-0x8BE6	0x533A	# <CJK>
-0x8BE7	0x72D7	# <CJK>
-0x8BE8	0x7396	# <CJK>
-0x8BE9	0x77E9	# <CJK>
-0x8BEA	0x82E6	# <CJK>
-0x8BEB	0x8EAF	# <CJK>
-0x8BEC	0x99C6	# <CJK>
-0x8BED	0x99C8	# <CJK>
-0x8BEE	0x99D2	# <CJK>
-0x8BEF	0x5177	# <CJK>
-0x8BF0	0x611A	# <CJK>
-0x8BF1	0x865E	# <CJK>
-0x8BF2	0x55B0	# <CJK>
-0x8BF3	0x7A7A	# <CJK>
-0x8BF4	0x5076	# <CJK>
-0x8BF5	0x5BD3	# <CJK>
-0x8BF6	0x9047	# <CJK>
-0x8BF7	0x9685	# <CJK>
-0x8BF8	0x4E32	# <CJK>
-0x8BF9	0x6ADB	# <CJK>
-0x8BFA	0x91E7	# <CJK>
-0x8BFB	0x5C51	# <CJK>
-0x8BFC	0x5C48	# <CJK>
-0x8C40	0x6398	# <CJK>
-0x8C41	0x7A9F	# <CJK>
-0x8C42	0x6C93	# <CJK>
-0x8C43	0x9774	# <CJK>
-0x8C44	0x8F61	# <CJK>
-0x8C45	0x7AAA	# <CJK>
-0x8C46	0x718A	# <CJK>
-0x8C47	0x9688	# <CJK>
-0x8C48	0x7C82	# <CJK>
-0x8C49	0x6817	# <CJK>
-0x8C4A	0x7E70	# <CJK>
-0x8C4B	0x6851	# <CJK>
-0x8C4C	0x936C	# <CJK>
-0x8C4D	0x52F2	# <CJK>
-0x8C4E	0x541B	# <CJK>
-0x8C4F	0x85AB	# <CJK>
-0x8C50	0x8A13	# <CJK>
-0x8C51	0x7FA4	# <CJK>
-0x8C52	0x8ECD	# <CJK>
-0x8C53	0x90E1	# <CJK>
-0x8C54	0x5366	# <CJK>
-0x8C55	0x8888	# <CJK>
-0x8C56	0x7941	# <CJK>
-0x8C57	0x4FC2	# <CJK>
-0x8C58	0x50BE	# <CJK>
-0x8C59	0x5211	# <CJK>
-0x8C5A	0x5144	# <CJK>
-0x8C5B	0x5553	# <CJK>
-0x8C5C	0x572D	# <CJK>
-0x8C5D	0x73EA	# <CJK>
-0x8C5E	0x578B	# <CJK>
-0x8C5F	0x5951	# <CJK>
-0x8C60	0x5F62	# <CJK>
-0x8C61	0x5F84	# <CJK>
-0x8C62	0x6075	# <CJK>
-0x8C63	0x6176	# <CJK>
-0x8C64	0x6167	# <CJK>
-0x8C65	0x61A9	# <CJK>
-0x8C66	0x63B2	# <CJK>
-0x8C67	0x643A	# <CJK>
-0x8C68	0x656C	# <CJK>
-0x8C69	0x666F	# <CJK>
-0x8C6A	0x6842	# <CJK>
-0x8C6B	0x6E13	# <CJK>
-0x8C6C	0x7566	# <CJK>
-0x8C6D	0x7A3D	# <CJK>
-0x8C6E	0x7CFB	# <CJK>
-0x8C6F	0x7D4C	# <CJK>
-0x8C70	0x7D99	# <CJK>
-0x8C71	0x7E4B	# <CJK>
-0x8C72	0x7F6B	# <CJK>
-0x8C73	0x830E	# <CJK>
-0x8C74	0x834A	# <CJK>
-0x8C75	0x86CD	# <CJK>
-0x8C76	0x8A08	# <CJK>
-0x8C77	0x8A63	# <CJK>
-0x8C78	0x8B66	# <CJK>
-0x8C79	0x8EFD	# <CJK>
-0x8C7A	0x981A	# <CJK>
-0x8C7B	0x9D8F	# <CJK>
-0x8C7C	0x82B8	# <CJK>
-0x8C7D	0x8FCE	# <CJK>
-0x8C7E	0x9BE8	# <CJK>
-0x8C80	0x5287	# <CJK>
-0x8C81	0x621F	# <CJK>
-0x8C82	0x6483	# <CJK>
-0x8C83	0x6FC0	# <CJK>
-0x8C84	0x9699	# <CJK>
-0x8C85	0x6841	# <CJK>
-0x8C86	0x5091	# <CJK>
-0x8C87	0x6B20	# <CJK>
-0x8C88	0x6C7A	# <CJK>
-0x8C89	0x6F54	# <CJK>
-0x8C8A	0x7A74	# <CJK>
-0x8C8B	0x7D50	# <CJK>
-0x8C8C	0x8840	# <CJK>
-0x8C8D	0x8A23	# <CJK>
-0x8C8E	0x6708	# <CJK>
-0x8C8F	0x4EF6	# <CJK>
-0x8C90	0x5039	# <CJK>
-0x8C91	0x5026	# <CJK>
-0x8C92	0x5065	# <CJK>
-0x8C93	0x517C	# <CJK>
-0x8C94	0x5238	# <CJK>
-0x8C95	0x5263	# <CJK>
-0x8C96	0x55A7	# <CJK>
-0x8C97	0x570F	# <CJK>
-0x8C98	0x5805	# <CJK>
-0x8C99	0x5ACC	# <CJK>
-0x8C9A	0x5EFA	# <CJK>
-0x8C9B	0x61B2	# <CJK>
-0x8C9C	0x61F8	# <CJK>
-0x8C9D	0x62F3	# <CJK>
-0x8C9E	0x6372	# <CJK>
-0x8C9F	0x691C	# <CJK>
-0x8CA0	0x6A29	# <CJK>
-0x8CA1	0x727D	# <CJK>
-0x8CA2	0x72AC	# <CJK>
-0x8CA3	0x732E	# <CJK>
-0x8CA4	0x7814	# <CJK>
-0x8CA5	0x786F	# <CJK>
-0x8CA6	0x7D79	# <CJK>
-0x8CA7	0x770C	# <CJK>
-0x8CA8	0x80A9	# <CJK>
-0x8CA9	0x898B	# <CJK>
-0x8CAA	0x8B19	# <CJK>
-0x8CAB	0x8CE2	# <CJK>
-0x8CAC	0x8ED2	# <CJK>
-0x8CAD	0x9063	# <CJK>
-0x8CAE	0x9375	# <CJK>
-0x8CAF	0x967A	# <CJK>
-0x8CB0	0x9855	# <CJK>
-0x8CB1	0x9A13	# <CJK>
-0x8CB2	0x9E78	# <CJK>
-0x8CB3	0x5143	# <CJK>
-0x8CB4	0x539F	# <CJK>
-0x8CB5	0x53B3	# <CJK>
-0x8CB6	0x5E7B	# <CJK>
-0x8CB7	0x5F26	# <CJK>
-0x8CB8	0x6E1B	# <CJK>
-0x8CB9	0x6E90	# <CJK>
-0x8CBA	0x7384	# <CJK>
-0x8CBB	0x73FE	# <CJK>
-0x8CBC	0x7D43	# <CJK>
-0x8CBD	0x8237	# <CJK>
-0x8CBE	0x8A00	# <CJK>
-0x8CBF	0x8AFA	# <CJK>
-0x8CC0	0x9650	# <CJK>
-0x8CC1	0x4E4E	# <CJK>
-0x8CC2	0x500B	# <CJK>
-0x8CC3	0x53E4	# <CJK>
-0x8CC4	0x547C	# <CJK>
-0x8CC5	0x56FA	# <CJK>
-0x8CC6	0x59D1	# <CJK>
-0x8CC7	0x5B64	# <CJK>
-0x8CC8	0x5DF1	# <CJK>
-0x8CC9	0x5EAB	# <CJK>
-0x8CCA	0x5F27	# <CJK>
-0x8CCB	0x6238	# <CJK>
-0x8CCC	0x6545	# <CJK>
-0x8CCD	0x67AF	# <CJK>
-0x8CCE	0x6E56	# <CJK>
-0x8CCF	0x72D0	# <CJK>
-0x8CD0	0x7CCA	# <CJK>
-0x8CD1	0x88B4	# <CJK>
-0x8CD2	0x80A1	# <CJK>
-0x8CD3	0x80E1	# <CJK>
-0x8CD4	0x83F0	# <CJK>
-0x8CD5	0x864E	# <CJK>
-0x8CD6	0x8A87	# <CJK>
-0x8CD7	0x8DE8	# <CJK>
-0x8CD8	0x9237	# <CJK>
-0x8CD9	0x96C7	# <CJK>
-0x8CDA	0x9867	# <CJK>
-0x8CDB	0x9F13	# <CJK>
-0x8CDC	0x4E94	# <CJK>
-0x8CDD	0x4E92	# <CJK>
-0x8CDE	0x4F0D	# <CJK>
-0x8CDF	0x5348	# <CJK>
-0x8CE0	0x5449	# <CJK>
-0x8CE1	0x543E	# <CJK>
-0x8CE2	0x5A2F	# <CJK>
-0x8CE3	0x5F8C	# <CJK>
-0x8CE4	0x5FA1	# <CJK>
-0x8CE5	0x609F	# <CJK>
-0x8CE6	0x68A7	# <CJK>
-0x8CE7	0x6A8E	# <CJK>
-0x8CE8	0x745A	# <CJK>
-0x8CE9	0x7881	# <CJK>
-0x8CEA	0x8A9E	# <CJK>
-0x8CEB	0x8AA4	# <CJK>
-0x8CEC	0x8B77	# <CJK>
-0x8CED	0x9190	# <CJK>
-0x8CEE	0x4E5E	# <CJK>
-0x8CEF	0x9BC9	# <CJK>
-0x8CF0	0x4EA4	# <CJK>
-0x8CF1	0x4F7C	# <CJK>
-0x8CF2	0x4FAF	# <CJK>
-0x8CF3	0x5019	# <CJK>
-0x8CF4	0x5016	# <CJK>
-0x8CF5	0x5149	# <CJK>
-0x8CF6	0x516C	# <CJK>
-0x8CF7	0x529F	# <CJK>
-0x8CF8	0x52B9	# <CJK>
-0x8CF9	0x52FE	# <CJK>
-0x8CFA	0x539A	# <CJK>
-0x8CFB	0x53E3	# <CJK>
-0x8CFC	0x5411	# <CJK>
-0x8D40	0x540E	# <CJK>
-0x8D41	0x5589	# <CJK>
-0x8D42	0x5751	# <CJK>
-0x8D43	0x57A2	# <CJK>
-0x8D44	0x597D	# <CJK>
-0x8D45	0x5B54	# <CJK>
-0x8D46	0x5B5D	# <CJK>
-0x8D47	0x5B8F	# <CJK>
-0x8D48	0x5DE5	# <CJK>
-0x8D49	0x5DE7	# <CJK>
-0x8D4A	0x5DF7	# <CJK>
-0x8D4B	0x5E78	# <CJK>
-0x8D4C	0x5E83	# <CJK>
-0x8D4D	0x5E9A	# <CJK>
-0x8D4E	0x5EB7	# <CJK>
-0x8D4F	0x5F18	# <CJK>
-0x8D50	0x6052	# <CJK>
-0x8D51	0x614C	# <CJK>
-0x8D52	0x6297	# <CJK>
-0x8D53	0x62D8	# <CJK>
-0x8D54	0x63A7	# <CJK>
-0x8D55	0x653B	# <CJK>
-0x8D56	0x6602	# <CJK>
-0x8D57	0x6643	# <CJK>
-0x8D58	0x66F4	# <CJK>
-0x8D59	0x676D	# <CJK>
-0x8D5A	0x6821	# <CJK>
-0x8D5B	0x6897	# <CJK>
-0x8D5C	0x69CB	# <CJK>
-0x8D5D	0x6C5F	# <CJK>
-0x8D5E	0x6D2A	# <CJK>
-0x8D5F	0x6D69	# <CJK>
-0x8D60	0x6E2F	# <CJK>
-0x8D61	0x6E9D	# <CJK>
-0x8D62	0x7532	# <CJK>
-0x8D63	0x7687	# <CJK>
-0x8D64	0x786C	# <CJK>
-0x8D65	0x7A3F	# <CJK>
-0x8D66	0x7CE0	# <CJK>
-0x8D67	0x7D05	# <CJK>
-0x8D68	0x7D18	# <CJK>
-0x8D69	0x7D5E	# <CJK>
-0x8D6A	0x7DB1	# <CJK>
-0x8D6B	0x8015	# <CJK>
-0x8D6C	0x8003	# <CJK>
-0x8D6D	0x80AF	# <CJK>
-0x8D6E	0x80B1	# <CJK>
-0x8D6F	0x8154	# <CJK>
-0x8D70	0x818F	# <CJK>
-0x8D71	0x822A	# <CJK>
-0x8D72	0x8352	# <CJK>
-0x8D73	0x884C	# <CJK>
-0x8D74	0x8861	# <CJK>
-0x8D75	0x8B1B	# <CJK>
-0x8D76	0x8CA2	# <CJK>
-0x8D77	0x8CFC	# <CJK>
-0x8D78	0x90CA	# <CJK>
-0x8D79	0x9175	# <CJK>
-0x8D7A	0x9271	# <CJK>
-0x8D7B	0x783F	# <CJK>
-0x8D7C	0x92FC	# <CJK>
-0x8D7D	0x95A4	# <CJK>
-0x8D7E	0x964D	# <CJK>
-0x8D80	0x9805	# <CJK>
-0x8D81	0x9999	# <CJK>
-0x8D82	0x9AD8	# <CJK>
-0x8D83	0x9D3B	# <CJK>
-0x8D84	0x525B	# <CJK>
-0x8D85	0x52AB	# <CJK>
-0x8D86	0x53F7	# <CJK>
-0x8D87	0x5408	# <CJK>
-0x8D88	0x58D5	# <CJK>
-0x8D89	0x62F7	# <CJK>
-0x8D8A	0x6FE0	# <CJK>
-0x8D8B	0x8C6A	# <CJK>
-0x8D8C	0x8F5F	# <CJK>
-0x8D8D	0x9EB9	# <CJK>
-0x8D8E	0x514B	# <CJK>
-0x8D8F	0x523B	# <CJK>
-0x8D90	0x544A	# <CJK>
-0x8D91	0x56FD	# <CJK>
-0x8D92	0x7A40	# <CJK>
-0x8D93	0x9177	# <CJK>
-0x8D94	0x9D60	# <CJK>
-0x8D95	0x9ED2	# <CJK>
-0x8D96	0x7344	# <CJK>
-0x8D97	0x6F09	# <CJK>
-0x8D98	0x8170	# <CJK>
-0x8D99	0x7511	# <CJK>
-0x8D9A	0x5FFD	# <CJK>
-0x8D9B	0x60DA	# <CJK>
-0x8D9C	0x9AA8	# <CJK>
-0x8D9D	0x72DB	# <CJK>
-0x8D9E	0x8FBC	# <CJK>
-0x8D9F	0x6B64	# <CJK>
-0x8DA0	0x9803	# <CJK>
-0x8DA1	0x4ECA	# <CJK>
-0x8DA2	0x56F0	# <CJK>
-0x8DA3	0x5764	# <CJK>
-0x8DA4	0x58BE	# <CJK>
-0x8DA5	0x5A5A	# <CJK>
-0x8DA6	0x6068	# <CJK>
-0x8DA7	0x61C7	# <CJK>
-0x8DA8	0x660F	# <CJK>
-0x8DA9	0x6606	# <CJK>
-0x8DAA	0x6839	# <CJK>
-0x8DAB	0x68B1	# <CJK>
-0x8DAC	0x6DF7	# <CJK>
-0x8DAD	0x75D5	# <CJK>
-0x8DAE	0x7D3A	# <CJK>
-0x8DAF	0x826E	# <CJK>
-0x8DB0	0x9B42	# <CJK>
-0x8DB1	0x4E9B	# <CJK>
-0x8DB2	0x4F50	# <CJK>
-0x8DB3	0x53C9	# <CJK>
-0x8DB4	0x5506	# <CJK>
-0x8DB5	0x5D6F	# <CJK>
-0x8DB6	0x5DE6	# <CJK>
-0x8DB7	0x5DEE	# <CJK>
-0x8DB8	0x67FB	# <CJK>
-0x8DB9	0x6C99	# <CJK>
-0x8DBA	0x7473	# <CJK>
-0x8DBB	0x7802	# <CJK>
-0x8DBC	0x8A50	# <CJK>
-0x8DBD	0x9396	# <CJK>
-0x8DBE	0x88DF	# <CJK>
-0x8DBF	0x5750	# <CJK>
-0x8DC0	0x5EA7	# <CJK>
-0x8DC1	0x632B	# <CJK>
-0x8DC2	0x50B5	# <CJK>
-0x8DC3	0x50AC	# <CJK>
-0x8DC4	0x518D	# <CJK>
-0x8DC5	0x6700	# <CJK>
-0x8DC6	0x54C9	# <CJK>
-0x8DC7	0x585E	# <CJK>
-0x8DC8	0x59BB	# <CJK>
-0x8DC9	0x5BB0	# <CJK>
-0x8DCA	0x5F69	# <CJK>
-0x8DCB	0x624D	# <CJK>
-0x8DCC	0x63A1	# <CJK>
-0x8DCD	0x683D	# <CJK>
-0x8DCE	0x6B73	# <CJK>
-0x8DCF	0x6E08	# <CJK>
-0x8DD0	0x707D	# <CJK>
-0x8DD1	0x91C7	# <CJK>
-0x8DD2	0x7280	# <CJK>
-0x8DD3	0x7815	# <CJK>
-0x8DD4	0x7826	# <CJK>
-0x8DD5	0x796D	# <CJK>
-0x8DD6	0x658E	# <CJK>
-0x8DD7	0x7D30	# <CJK>
-0x8DD8	0x83DC	# <CJK>
-0x8DD9	0x88C1	# <CJK>
-0x8DDA	0x8F09	# <CJK>
-0x8DDB	0x969B	# <CJK>
-0x8DDC	0x5264	# <CJK>
-0x8DDD	0x5728	# <CJK>
-0x8DDE	0x6750	# <CJK>
-0x8DDF	0x7F6A	# <CJK>
-0x8DE0	0x8CA1	# <CJK>
-0x8DE1	0x51B4	# <CJK>
-0x8DE2	0x5742	# <CJK>
-0x8DE3	0x962A	# <CJK>
-0x8DE4	0x583A	# <CJK>
-0x8DE5	0x698A	# <CJK>
-0x8DE6	0x80B4	# <CJK>
-0x8DE7	0x54B2	# <CJK>
-0x8DE8	0x5D0E	# <CJK>
-0x8DE9	0x57FC	# <CJK>
-0x8DEA	0x7895	# <CJK>
-0x8DEB	0x9DFA	# <CJK>
-0x8DEC	0x4F5C	# <CJK>
-0x8DED	0x524A	# <CJK>
-0x8DEE	0x548B	# <CJK>
-0x8DEF	0x643E	# <CJK>
-0x8DF0	0x6628	# <CJK>
-0x8DF1	0x6714	# <CJK>
-0x8DF2	0x67F5	# <CJK>
-0x8DF3	0x7A84	# <CJK>
-0x8DF4	0x7B56	# <CJK>
-0x8DF5	0x7D22	# <CJK>
-0x8DF6	0x932F	# <CJK>
-0x8DF7	0x685C	# <CJK>
-0x8DF8	0x9BAD	# <CJK>
-0x8DF9	0x7B39	# <CJK>
-0x8DFA	0x5319	# <CJK>
-0x8DFB	0x518A	# <CJK>
-0x8DFC	0x5237	# <CJK>
-0x8E40	0x5BDF	# <CJK>
-0x8E41	0x62F6	# <CJK>
-0x8E42	0x64AE	# <CJK>
-0x8E43	0x64E6	# <CJK>
-0x8E44	0x672D	# <CJK>
-0x8E45	0x6BBA	# <CJK>
-0x8E46	0x85A9	# <CJK>
-0x8E47	0x96D1	# <CJK>
-0x8E48	0x7690	# <CJK>
-0x8E49	0x9BD6	# <CJK>
-0x8E4A	0x634C	# <CJK>
-0x8E4B	0x9306	# <CJK>
-0x8E4C	0x9BAB	# <CJK>
-0x8E4D	0x76BF	# <CJK>
-0x8E4E	0x6652	# <CJK>
-0x8E4F	0x4E09	# <CJK>
-0x8E50	0x5098	# <CJK>
-0x8E51	0x53C2	# <CJK>
-0x8E52	0x5C71	# <CJK>
-0x8E53	0x60E8	# <CJK>
-0x8E54	0x6492	# <CJK>
-0x8E55	0x6563	# <CJK>
-0x8E56	0x685F	# <CJK>
-0x8E57	0x71E6	# <CJK>
-0x8E58	0x73CA	# <CJK>
-0x8E59	0x7523	# <CJK>
-0x8E5A	0x7B97	# <CJK>
-0x8E5B	0x7E82	# <CJK>
-0x8E5C	0x8695	# <CJK>
-0x8E5D	0x8B83	# <CJK>
-0x8E5E	0x8CDB	# <CJK>
-0x8E5F	0x9178	# <CJK>
-0x8E60	0x9910	# <CJK>
-0x8E61	0x65AC	# <CJK>
-0x8E62	0x66AB	# <CJK>
-0x8E63	0x6B8B	# <CJK>
-0x8E64	0x4ED5	# <CJK>
-0x8E65	0x4ED4	# <CJK>
-0x8E66	0x4F3A	# <CJK>
-0x8E67	0x4F7F	# <CJK>
-0x8E68	0x523A	# <CJK>
-0x8E69	0x53F8	# <CJK>
-0x8E6A	0x53F2	# <CJK>
-0x8E6B	0x55E3	# <CJK>
-0x8E6C	0x56DB	# <CJK>
-0x8E6D	0x58EB	# <CJK>
-0x8E6E	0x59CB	# <CJK>
-0x8E6F	0x59C9	# <CJK>
-0x8E70	0x59FF	# <CJK>
-0x8E71	0x5B50	# <CJK>
-0x8E72	0x5C4D	# <CJK>
-0x8E73	0x5E02	# <CJK>
-0x8E74	0x5E2B	# <CJK>
-0x8E75	0x5FD7	# <CJK>
-0x8E76	0x601D	# <CJK>
-0x8E77	0x6307	# <CJK>
-0x8E78	0x652F	# <CJK>
-0x8E79	0x5B5C	# <CJK>
-0x8E7A	0x65AF	# <CJK>
-0x8E7B	0x65BD	# <CJK>
-0x8E7C	0x65E8	# <CJK>
-0x8E7D	0x679D	# <CJK>
-0x8E7E	0x6B62	# <CJK>
-0x8E80	0x6B7B	# <CJK>
-0x8E81	0x6C0F	# <CJK>
-0x8E82	0x7345	# <CJK>
-0x8E83	0x7949	# <CJK>
-0x8E84	0x79C1	# <CJK>
-0x8E85	0x7CF8	# <CJK>
-0x8E86	0x7D19	# <CJK>
-0x8E87	0x7D2B	# <CJK>
-0x8E88	0x80A2	# <CJK>
-0x8E89	0x8102	# <CJK>
-0x8E8A	0x81F3	# <CJK>
-0x8E8B	0x8996	# <CJK>
-0x8E8C	0x8A5E	# <CJK>
-0x8E8D	0x8A69	# <CJK>
-0x8E8E	0x8A66	# <CJK>
-0x8E8F	0x8A8C	# <CJK>
-0x8E90	0x8AEE	# <CJK>
-0x8E91	0x8CC7	# <CJK>
-0x8E92	0x8CDC	# <CJK>
-0x8E93	0x96CC	# <CJK>
-0x8E94	0x98FC	# <CJK>
-0x8E95	0x6B6F	# <CJK>
-0x8E96	0x4E8B	# <CJK>
-0x8E97	0x4F3C	# <CJK>
-0x8E98	0x4F8D	# <CJK>
-0x8E99	0x5150	# <CJK>
-0x8E9A	0x5B57	# <CJK>
-0x8E9B	0x5BFA	# <CJK>
-0x8E9C	0x6148	# <CJK>
-0x8E9D	0x6301	# <CJK>
-0x8E9E	0x6642	# <CJK>
-0x8E9F	0x6B21	# <CJK>
-0x8EA0	0x6ECB	# <CJK>
-0x8EA1	0x6CBB	# <CJK>
-0x8EA2	0x723E	# <CJK>
-0x8EA3	0x74BD	# <CJK>
-0x8EA4	0x75D4	# <CJK>
-0x8EA5	0x78C1	# <CJK>
-0x8EA6	0x793A	# <CJK>
-0x8EA7	0x800C	# <CJK>
-0x8EA8	0x8033	# <CJK>
-0x8EA9	0x81EA	# <CJK>
-0x8EAA	0x8494	# <CJK>
-0x8EAB	0x8F9E	# <CJK>
-0x8EAC	0x6C50	# <CJK>
-0x8EAD	0x9E7F	# <CJK>
-0x8EAE	0x5F0F	# <CJK>
-0x8EAF	0x8B58	# <CJK>
-0x8EB0	0x9D2B	# <CJK>
-0x8EB1	0x7AFA	# <CJK>
-0x8EB2	0x8EF8	# <CJK>
-0x8EB3	0x5B8D	# <CJK>
-0x8EB4	0x96EB	# <CJK>
-0x8EB5	0x4E03	# <CJK>
-0x8EB6	0x53F1	# <CJK>
-0x8EB7	0x57F7	# <CJK>
-0x8EB8	0x5931	# <CJK>
-0x8EB9	0x5AC9	# <CJK>
-0x8EBA	0x5BA4	# <CJK>
-0x8EBB	0x6089	# <CJK>
-0x8EBC	0x6E7F	# <CJK>
-0x8EBD	0x6F06	# <CJK>
-0x8EBE	0x75BE	# <CJK>
-0x8EBF	0x8CEA	# <CJK>
-0x8EC0	0x5B9F	# <CJK>
-0x8EC1	0x8500	# <CJK>
-0x8EC2	0x7BE0	# <CJK>
-0x8EC3	0x5072	# <CJK>
-0x8EC4	0x67F4	# <CJK>
-0x8EC5	0x829D	# <CJK>
-0x8EC6	0x5C61	# <CJK>
-0x8EC7	0x854A	# <CJK>
-0x8EC8	0x7E1E	# <CJK>
-0x8EC9	0x820E	# <CJK>
-0x8ECA	0x5199	# <CJK>
-0x8ECB	0x5C04	# <CJK>
-0x8ECC	0x6368	# <CJK>
-0x8ECD	0x8D66	# <CJK>
-0x8ECE	0x659C	# <CJK>
-0x8ECF	0x716E	# <CJK>
-0x8ED0	0x793E	# <CJK>
-0x8ED1	0x7D17	# <CJK>
-0x8ED2	0x8005	# <CJK>
-0x8ED3	0x8B1D	# <CJK>
-0x8ED4	0x8ECA	# <CJK>
-0x8ED5	0x906E	# <CJK>
-0x8ED6	0x86C7	# <CJK>
-0x8ED7	0x90AA	# <CJK>
-0x8ED8	0x501F	# <CJK>
-0x8ED9	0x52FA	# <CJK>
-0x8EDA	0x5C3A	# <CJK>
-0x8EDB	0x6753	# <CJK>
-0x8EDC	0x707C	# <CJK>
-0x8EDD	0x7235	# <CJK>
-0x8EDE	0x914C	# <CJK>
-0x8EDF	0x91C8	# <CJK>
-0x8EE0	0x932B	# <CJK>
-0x8EE1	0x82E5	# <CJK>
-0x8EE2	0x5BC2	# <CJK>
-0x8EE3	0x5F31	# <CJK>
-0x8EE4	0x60F9	# <CJK>
-0x8EE5	0x4E3B	# <CJK>
-0x8EE6	0x53D6	# <CJK>
-0x8EE7	0x5B88	# <CJK>
-0x8EE8	0x624B	# <CJK>
-0x8EE9	0x6731	# <CJK>
-0x8EEA	0x6B8A	# <CJK>
-0x8EEB	0x72E9	# <CJK>
-0x8EEC	0x73E0	# <CJK>
-0x8EED	0x7A2E	# <CJK>
-0x8EEE	0x816B	# <CJK>
-0x8EEF	0x8DA3	# <CJK>
-0x8EF0	0x9152	# <CJK>
-0x8EF1	0x9996	# <CJK>
-0x8EF2	0x5112	# <CJK>
-0x8EF3	0x53D7	# <CJK>
-0x8EF4	0x546A	# <CJK>
-0x8EF5	0x5BFF	# <CJK>
-0x8EF6	0x6388	# <CJK>
-0x8EF7	0x6A39	# <CJK>
-0x8EF8	0x7DAC	# <CJK>
-0x8EF9	0x9700	# <CJK>
-0x8EFA	0x56DA	# <CJK>
-0x8EFB	0x53CE	# <CJK>
-0x8EFC	0x5468	# <CJK>
-0x8F40	0x5B97	# <CJK>
-0x8F41	0x5C31	# <CJK>
-0x8F42	0x5DDE	# <CJK>
-0x8F43	0x4FEE	# <CJK>
-0x8F44	0x6101	# <CJK>
-0x8F45	0x62FE	# <CJK>
-0x8F46	0x6D32	# <CJK>
-0x8F47	0x79C0	# <CJK>
-0x8F48	0x79CB	# <CJK>
-0x8F49	0x7D42	# <CJK>
-0x8F4A	0x7E4D	# <CJK>
-0x8F4B	0x7FD2	# <CJK>
-0x8F4C	0x81ED	# <CJK>
-0x8F4D	0x821F	# <CJK>
-0x8F4E	0x8490	# <CJK>
-0x8F4F	0x8846	# <CJK>
-0x8F50	0x8972	# <CJK>
-0x8F51	0x8B90	# <CJK>
-0x8F52	0x8E74	# <CJK>
-0x8F53	0x8F2F	# <CJK>
-0x8F54	0x9031	# <CJK>
-0x8F55	0x914B	# <CJK>
-0x8F56	0x916C	# <CJK>
-0x8F57	0x96C6	# <CJK>
-0x8F58	0x919C	# <CJK>
-0x8F59	0x4EC0	# <CJK>
-0x8F5A	0x4F4F	# <CJK>
-0x8F5B	0x5145	# <CJK>
-0x8F5C	0x5341	# <CJK>
-0x8F5D	0x5F93	# <CJK>
-0x8F5E	0x620E	# <CJK>
-0x8F5F	0x67D4	# <CJK>
-0x8F60	0x6C41	# <CJK>
-0x8F61	0x6E0B	# <CJK>
-0x8F62	0x7363	# <CJK>
-0x8F63	0x7E26	# <CJK>
-0x8F64	0x91CD	# <CJK>
-0x8F65	0x9283	# <CJK>
-0x8F66	0x53D4	# <CJK>
-0x8F67	0x5919	# <CJK>
-0x8F68	0x5BBF	# <CJK>
-0x8F69	0x6DD1	# <CJK>
-0x8F6A	0x795D	# <CJK>
-0x8F6B	0x7E2E	# <CJK>
-0x8F6C	0x7C9B	# <CJK>
-0x8F6D	0x587E	# <CJK>
-0x8F6E	0x719F	# <CJK>
-0x8F6F	0x51FA	# <CJK>
-0x8F70	0x8853	# <CJK>
-0x8F71	0x8FF0	# <CJK>
-0x8F72	0x4FCA	# <CJK>
-0x8F73	0x5CFB	# <CJK>
-0x8F74	0x6625	# <CJK>
-0x8F75	0x77AC	# <CJK>
-0x8F76	0x7AE3	# <CJK>
-0x8F77	0x821C	# <CJK>
-0x8F78	0x99FF	# <CJK>
-0x8F79	0x51C6	# <CJK>
-0x8F7A	0x5FAA	# <CJK>
-0x8F7B	0x65EC	# <CJK>
-0x8F7C	0x696F	# <CJK>
-0x8F7D	0x6B89	# <CJK>
-0x8F7E	0x6DF3	# <CJK>
-0x8F80	0x6E96	# <CJK>
-0x8F81	0x6F64	# <CJK>
-0x8F82	0x76FE	# <CJK>
-0x8F83	0x7D14	# <CJK>
-0x8F84	0x5DE1	# <CJK>
-0x8F85	0x9075	# <CJK>
-0x8F86	0x9187	# <CJK>
-0x8F87	0x9806	# <CJK>
-0x8F88	0x51E6	# <CJK>
-0x8F89	0x521D	# <CJK>
-0x8F8A	0x6240	# <CJK>
-0x8F8B	0x6691	# <CJK>
-0x8F8C	0x66D9	# <CJK>
-0x8F8D	0x6E1A	# <CJK>
-0x8F8E	0x5EB6	# <CJK>
-0x8F8F	0x7DD2	# <CJK>
-0x8F90	0x7F72	# <CJK>
-0x8F91	0x66F8	# <CJK>
-0x8F92	0x85AF	# <CJK>
-0x8F93	0x85F7	# <CJK>
-0x8F94	0x8AF8	# <CJK>
-0x8F95	0x52A9	# <CJK>
-0x8F96	0x53D9	# <CJK>
-0x8F97	0x5973	# <CJK>
-0x8F98	0x5E8F	# <CJK>
-0x8F99	0x5F90	# <CJK>
-0x8F9A	0x6055	# <CJK>
-0x8F9B	0x92E4	# <CJK>
-0x8F9C	0x9664	# <CJK>
-0x8F9D	0x50B7	# <CJK>
-0x8F9E	0x511F	# <CJK>
-0x8F9F	0x52DD	# <CJK>
-0x8FA0	0x5320	# <CJK>
-0x8FA1	0x5347	# <CJK>
-0x8FA2	0x53EC	# <CJK>
-0x8FA3	0x54E8	# <CJK>
-0x8FA4	0x5546	# <CJK>
-0x8FA5	0x5531	# <CJK>
-0x8FA6	0x5617	# <CJK>
-0x8FA7	0x5968	# <CJK>
-0x8FA8	0x59BE	# <CJK>
-0x8FA9	0x5A3C	# <CJK>
-0x8FAA	0x5BB5	# <CJK>
-0x8FAB	0x5C06	# <CJK>
-0x8FAC	0x5C0F	# <CJK>
-0x8FAD	0x5C11	# <CJK>
-0x8FAE	0x5C1A	# <CJK>
-0x8FAF	0x5E84	# <CJK>
-0x8FB0	0x5E8A	# <CJK>
-0x8FB1	0x5EE0	# <CJK>
-0x8FB2	0x5F70	# <CJK>
-0x8FB3	0x627F	# <CJK>
-0x8FB4	0x6284	# <CJK>
-0x8FB5	0x62DB	# <CJK>
-0x8FB6	0x638C	# <CJK>
-0x8FB7	0x6377	# <CJK>
-0x8FB8	0x6607	# <CJK>
-0x8FB9	0x660C	# <CJK>
-0x8FBA	0x662D	# <CJK>
-0x8FBB	0x6676	# <CJK>
-0x8FBC	0x677E	# <CJK>
-0x8FBD	0x68A2	# <CJK>
-0x8FBE	0x6A1F	# <CJK>
-0x8FBF	0x6A35	# <CJK>
-0x8FC0	0x6CBC	# <CJK>
-0x8FC1	0x6D88	# <CJK>
-0x8FC2	0x6E09	# <CJK>
-0x8FC3	0x6E58	# <CJK>
-0x8FC4	0x713C	# <CJK>
-0x8FC5	0x7126	# <CJK>
-0x8FC6	0x7167	# <CJK>
-0x8FC7	0x75C7	# <CJK>
-0x8FC8	0x7701	# <CJK>
-0x8FC9	0x785D	# <CJK>
-0x8FCA	0x7901	# <CJK>
-0x8FCB	0x7965	# <CJK>
-0x8FCC	0x79F0	# <CJK>
-0x8FCD	0x7AE0	# <CJK>
-0x8FCE	0x7B11	# <CJK>
-0x8FCF	0x7CA7	# <CJK>
-0x8FD0	0x7D39	# <CJK>
-0x8FD1	0x8096	# <CJK>
-0x8FD2	0x83D6	# <CJK>
-0x8FD3	0x848B	# <CJK>
-0x8FD4	0x8549	# <CJK>
-0x8FD5	0x885D	# <CJK>
-0x8FD6	0x88F3	# <CJK>
-0x8FD7	0x8A1F	# <CJK>
-0x8FD8	0x8A3C	# <CJK>
-0x8FD9	0x8A54	# <CJK>
-0x8FDA	0x8A73	# <CJK>
-0x8FDB	0x8C61	# <CJK>
-0x8FDC	0x8CDE	# <CJK>
-0x8FDD	0x91A4	# <CJK>
-0x8FDE	0x9266	# <CJK>
-0x8FDF	0x937E	# <CJK>
-0x8FE0	0x9418	# <CJK>
-0x8FE1	0x969C	# <CJK>
-0x8FE2	0x9798	# <CJK>
-0x8FE3	0x4E0A	# <CJK>
-0x8FE4	0x4E08	# <CJK>
-0x8FE5	0x4E1E	# <CJK>
-0x8FE6	0x4E57	# <CJK>
-0x8FE7	0x5197	# <CJK>
-0x8FE8	0x5270	# <CJK>
-0x8FE9	0x57CE	# <CJK>
-0x8FEA	0x5834	# <CJK>
-0x8FEB	0x58CC	# <CJK>
-0x8FEC	0x5B22	# <CJK>
-0x8FED	0x5E38	# <CJK>
-0x8FEE	0x60C5	# <CJK>
-0x8FEF	0x64FE	# <CJK>
-0x8FF0	0x6761	# <CJK>
-0x8FF1	0x6756	# <CJK>
-0x8FF2	0x6D44	# <CJK>
-0x8FF3	0x72B6	# <CJK>
-0x8FF4	0x7573	# <CJK>
-0x8FF5	0x7A63	# <CJK>
-0x8FF6	0x84B8	# <CJK>
-0x8FF7	0x8B72	# <CJK>
-0x8FF8	0x91B8	# <CJK>
-0x8FF9	0x9320	# <CJK>
-0x8FFA	0x5631	# <CJK>
-0x8FFB	0x57F4	# <CJK>
-0x8FFC	0x98FE	# <CJK>
-0x9040	0x62ED	# <CJK>
-0x9041	0x690D	# <CJK>
-0x9042	0x6B96	# <CJK>
-0x9043	0x71ED	# <CJK>
-0x9044	0x7E54	# <CJK>
-0x9045	0x8077	# <CJK>
-0x9046	0x8272	# <CJK>
-0x9047	0x89E6	# <CJK>
-0x9048	0x98DF	# <CJK>
-0x9049	0x8755	# <CJK>
-0x904A	0x8FB1	# <CJK>
-0x904B	0x5C3B	# <CJK>
-0x904C	0x4F38	# <CJK>
-0x904D	0x4FE1	# <CJK>
-0x904E	0x4FB5	# <CJK>
-0x904F	0x5507	# <CJK>
-0x9050	0x5A20	# <CJK>
-0x9051	0x5BDD	# <CJK>
-0x9052	0x5BE9	# <CJK>
-0x9053	0x5FC3	# <CJK>
-0x9054	0x614E	# <CJK>
-0x9055	0x632F	# <CJK>
-0x9056	0x65B0	# <CJK>
-0x9057	0x664B	# <CJK>
-0x9058	0x68EE	# <CJK>
-0x9059	0x699B	# <CJK>
-0x905A	0x6D78	# <CJK>
-0x905B	0x6DF1	# <CJK>
-0x905C	0x7533	# <CJK>
-0x905D	0x75B9	# <CJK>
-0x905E	0x771F	# <CJK>
-0x905F	0x795E	# <CJK>
-0x9060	0x79E6	# <CJK>
-0x9061	0x7D33	# <CJK>
-0x9062	0x81E3	# <CJK>
-0x9063	0x82AF	# <CJK>
-0x9064	0x85AA	# <CJK>
-0x9065	0x89AA	# <CJK>
-0x9066	0x8A3A	# <CJK>
-0x9067	0x8EAB	# <CJK>
-0x9068	0x8F9B	# <CJK>
-0x9069	0x9032	# <CJK>
-0x906A	0x91DD	# <CJK>
-0x906B	0x9707	# <CJK>
-0x906C	0x4EBA	# <CJK>
-0x906D	0x4EC1	# <CJK>
-0x906E	0x5203	# <CJK>
-0x906F	0x5875	# <CJK>
-0x9070	0x58EC	# <CJK>
-0x9071	0x5C0B	# <CJK>
-0x9072	0x751A	# <CJK>
-0x9073	0x5C3D	# <CJK>
-0x9074	0x814E	# <CJK>
-0x9075	0x8A0A	# <CJK>
-0x9076	0x8FC5	# <CJK>
-0x9077	0x9663	# <CJK>
-0x9078	0x976D	# <CJK>
-0x9079	0x7B25	# <CJK>
-0x907A	0x8ACF	# <CJK>
-0x907B	0x9808	# <CJK>
-0x907C	0x9162	# <CJK>
-0x907D	0x56F3	# <CJK>
-0x907E	0x53A8	# <CJK>
-0x9080	0x9017	# <CJK>
-0x9081	0x5439	# <CJK>
-0x9082	0x5782	# <CJK>
-0x9083	0x5E25	# <CJK>
-0x9084	0x63A8	# <CJK>
-0x9085	0x6C34	# <CJK>
-0x9086	0x708A	# <CJK>
-0x9087	0x7761	# <CJK>
-0x9088	0x7C8B	# <CJK>
-0x9089	0x7FE0	# <CJK>
-0x908A	0x8870	# <CJK>
-0x908B	0x9042	# <CJK>
-0x908C	0x9154	# <CJK>
-0x908D	0x9310	# <CJK>
-0x908E	0x9318	# <CJK>
-0x908F	0x968F	# <CJK>
-0x9090	0x745E	# <CJK>
-0x9091	0x9AC4	# <CJK>
-0x9092	0x5D07	# <CJK>
-0x9093	0x5D69	# <CJK>
-0x9094	0x6570	# <CJK>
-0x9095	0x67A2	# <CJK>
-0x9096	0x8DA8	# <CJK>
-0x9097	0x96DB	# <CJK>
-0x9098	0x636E	# <CJK>
-0x9099	0x6749	# <CJK>
-0x909A	0x6919	# <CJK>
-0x909B	0x83C5	# <CJK>
-0x909C	0x9817	# <CJK>
-0x909D	0x96C0	# <CJK>
-0x909E	0x88FE	# <CJK>
-0x909F	0x6F84	# <CJK>
-0x90A0	0x647A	# <CJK>
-0x90A1	0x5BF8	# <CJK>
-0x90A2	0x4E16	# <CJK>
-0x90A3	0x702C	# <CJK>
-0x90A4	0x755D	# <CJK>
-0x90A5	0x662F	# <CJK>
-0x90A6	0x51C4	# <CJK>
-0x90A7	0x5236	# <CJK>
-0x90A8	0x52E2	# <CJK>
-0x90A9	0x59D3	# <CJK>
-0x90AA	0x5F81	# <CJK>
-0x90AB	0x6027	# <CJK>
-0x90AC	0x6210	# <CJK>
-0x90AD	0x653F	# <CJK>
-0x90AE	0x6574	# <CJK>
-0x90AF	0x661F	# <CJK>
-0x90B0	0x6674	# <CJK>
-0x90B1	0x68F2	# <CJK>
-0x90B2	0x6816	# <CJK>
-0x90B3	0x6B63	# <CJK>
-0x90B4	0x6E05	# <CJK>
-0x90B5	0x7272	# <CJK>
-0x90B6	0x751F	# <CJK>
-0x90B7	0x76DB	# <CJK>
-0x90B8	0x7CBE	# <CJK>
-0x90B9	0x8056	# <CJK>
-0x90BA	0x58F0	# <CJK>
-0x90BB	0x88FD	# <CJK>
-0x90BC	0x897F	# <CJK>
-0x90BD	0x8AA0	# <CJK>
-0x90BE	0x8A93	# <CJK>
-0x90BF	0x8ACB	# <CJK>
-0x90C0	0x901D	# <CJK>
-0x90C1	0x9192	# <CJK>
-0x90C2	0x9752	# <CJK>
-0x90C3	0x9759	# <CJK>
-0x90C4	0x6589	# <CJK>
-0x90C5	0x7A0E	# <CJK>
-0x90C6	0x8106	# <CJK>
-0x90C7	0x96BB	# <CJK>
-0x90C8	0x5E2D	# <CJK>
-0x90C9	0x60DC	# <CJK>
-0x90CA	0x621A	# <CJK>
-0x90CB	0x65A5	# <CJK>
-0x90CC	0x6614	# <CJK>
-0x90CD	0x6790	# <CJK>
-0x90CE	0x77F3	# <CJK>
-0x90CF	0x7A4D	# <CJK>
-0x90D0	0x7C4D	# <CJK>
-0x90D1	0x7E3E	# <CJK>
-0x90D2	0x810A	# <CJK>
-0x90D3	0x8CAC	# <CJK>
-0x90D4	0x8D64	# <CJK>
-0x90D5	0x8DE1	# <CJK>
-0x90D6	0x8E5F	# <CJK>
-0x90D7	0x78A9	# <CJK>
-0x90D8	0x5207	# <CJK>
-0x90D9	0x62D9	# <CJK>
-0x90DA	0x63A5	# <CJK>
-0x90DB	0x6442	# <CJK>
-0x90DC	0x6298	# <CJK>
-0x90DD	0x8A2D	# <CJK>
-0x90DE	0x7A83	# <CJK>
-0x90DF	0x7BC0	# <CJK>
-0x90E0	0x8AAC	# <CJK>
-0x90E1	0x96EA	# <CJK>
-0x90E2	0x7D76	# <CJK>
-0x90E3	0x820C	# <CJK>
-0x90E4	0x8749	# <CJK>
-0x90E5	0x4ED9	# <CJK>
-0x90E6	0x5148	# <CJK>
-0x90E7	0x5343	# <CJK>
-0x90E8	0x5360	# <CJK>
-0x90E9	0x5BA3	# <CJK>
-0x90EA	0x5C02	# <CJK>
-0x90EB	0x5C16	# <CJK>
-0x90EC	0x5DDD	# <CJK>
-0x90ED	0x6226	# <CJK>
-0x90EE	0x6247	# <CJK>
-0x90EF	0x64B0	# <CJK>
-0x90F0	0x6813	# <CJK>
-0x90F1	0x6834	# <CJK>
-0x90F2	0x6CC9	# <CJK>
-0x90F3	0x6D45	# <CJK>
-0x90F4	0x6D17	# <CJK>
-0x90F5	0x67D3	# <CJK>
-0x90F6	0x6F5C	# <CJK>
-0x90F7	0x714E	# <CJK>
-0x90F8	0x717D	# <CJK>
-0x90F9	0x65CB	# <CJK>
-0x90FA	0x7A7F	# <CJK>
-0x90FB	0x7BAD	# <CJK>
-0x90FC	0x7DDA	# <CJK>
-0x9140	0x7E4A	# <CJK>
-0x9141	0x7FA8	# <CJK>
-0x9142	0x817A	# <CJK>
-0x9143	0x821B	# <CJK>
-0x9144	0x8239	# <CJK>
-0x9145	0x85A6	# <CJK>
-0x9146	0x8A6E	# <CJK>
-0x9147	0x8CCE	# <CJK>
-0x9148	0x8DF5	# <CJK>
-0x9149	0x9078	# <CJK>
-0x914A	0x9077	# <CJK>
-0x914B	0x92AD	# <CJK>
-0x914C	0x9291	# <CJK>
-0x914D	0x9583	# <CJK>
-0x914E	0x9BAE	# <CJK>
-0x914F	0x524D	# <CJK>
-0x9150	0x5584	# <CJK>
-0x9151	0x6F38	# <CJK>
-0x9152	0x7136	# <CJK>
-0x9153	0x5168	# <CJK>
-0x9154	0x7985	# <CJK>
-0x9155	0x7E55	# <CJK>
-0x9156	0x81B3	# <CJK>
-0x9157	0x7CCE	# <CJK>
-0x9158	0x564C	# <CJK>
-0x9159	0x5851	# <CJK>
-0x915A	0x5CA8	# <CJK>
-0x915B	0x63AA	# <CJK>
-0x915C	0x66FE	# <CJK>
-0x915D	0x66FD	# <CJK>
-0x915E	0x695A	# <CJK>
-0x915F	0x72D9	# <CJK>
-0x9160	0x758F	# <CJK>
-0x9161	0x758E	# <CJK>
-0x9162	0x790E	# <CJK>
-0x9163	0x7956	# <CJK>
-0x9164	0x79DF	# <CJK>
-0x9165	0x7C97	# <CJK>
-0x9166	0x7D20	# <CJK>
-0x9167	0x7D44	# <CJK>
-0x9168	0x8607	# <CJK>
-0x9169	0x8A34	# <CJK>
-0x916A	0x963B	# <CJK>
-0x916B	0x9061	# <CJK>
-0x916C	0x9F20	# <CJK>
-0x916D	0x50E7	# <CJK>
-0x916E	0x5275	# <CJK>
-0x916F	0x53CC	# <CJK>
-0x9170	0x53E2	# <CJK>
-0x9171	0x5009	# <CJK>
-0x9172	0x55AA	# <CJK>
-0x9173	0x58EE	# <CJK>
-0x9174	0x594F	# <CJK>
-0x9175	0x723D	# <CJK>
-0x9176	0x5B8B	# <CJK>
-0x9177	0x5C64	# <CJK>
-0x9178	0x531D	# <CJK>
-0x9179	0x60E3	# <CJK>
-0x917A	0x60F3	# <CJK>
-0x917B	0x635C	# <CJK>
-0x917C	0x6383	# <CJK>
-0x917D	0x633F	# <CJK>
-0x917E	0x63BB	# <CJK>
-0x9180	0x64CD	# <CJK>
-0x9181	0x65E9	# <CJK>
-0x9182	0x66F9	# <CJK>
-0x9183	0x5DE3	# <CJK>
-0x9184	0x69CD	# <CJK>
-0x9185	0x69FD	# <CJK>
-0x9186	0x6F15	# <CJK>
-0x9187	0x71E5	# <CJK>
-0x9188	0x4E89	# <CJK>
-0x9189	0x75E9	# <CJK>
-0x918A	0x76F8	# <CJK>
-0x918B	0x7A93	# <CJK>
-0x918C	0x7CDF	# <CJK>
-0x918D	0x7DCF	# <CJK>
-0x918E	0x7D9C	# <CJK>
-0x918F	0x8061	# <CJK>
-0x9190	0x8349	# <CJK>
-0x9191	0x8358	# <CJK>
-0x9192	0x846C	# <CJK>
-0x9193	0x84BC	# <CJK>
-0x9194	0x85FB	# <CJK>
-0x9195	0x88C5	# <CJK>
-0x9196	0x8D70	# <CJK>
-0x9197	0x9001	# <CJK>
-0x9198	0x906D	# <CJK>
-0x9199	0x9397	# <CJK>
-0x919A	0x971C	# <CJK>
-0x919B	0x9A12	# <CJK>
-0x919C	0x50CF	# <CJK>
-0x919D	0x5897	# <CJK>
-0x919E	0x618E	# <CJK>
-0x919F	0x81D3	# <CJK>
-0x91A0	0x8535	# <CJK>
-0x91A1	0x8D08	# <CJK>
-0x91A2	0x9020	# <CJK>
-0x91A3	0x4FC3	# <CJK>
-0x91A4	0x5074	# <CJK>
-0x91A5	0x5247	# <CJK>
-0x91A6	0x5373	# <CJK>
-0x91A7	0x606F	# <CJK>
-0x91A8	0x6349	# <CJK>
-0x91A9	0x675F	# <CJK>
-0x91AA	0x6E2C	# <CJK>
-0x91AB	0x8DB3	# <CJK>
-0x91AC	0x901F	# <CJK>
-0x91AD	0x4FD7	# <CJK>
-0x91AE	0x5C5E	# <CJK>
-0x91AF	0x8CCA	# <CJK>
-0x91B0	0x65CF	# <CJK>
-0x91B1	0x7D9A	# <CJK>
-0x91B2	0x5352	# <CJK>
-0x91B3	0x8896	# <CJK>
-0x91B4	0x5176	# <CJK>
-0x91B5	0x63C3	# <CJK>
-0x91B6	0x5B58	# <CJK>
-0x91B7	0x5B6B	# <CJK>
-0x91B8	0x5C0A	# <CJK>
-0x91B9	0x640D	# <CJK>
-0x91BA	0x6751	# <CJK>
-0x91BB	0x905C	# <CJK>
-0x91BC	0x4ED6	# <CJK>
-0x91BD	0x591A	# <CJK>
-0x91BE	0x592A	# <CJK>
-0x91BF	0x6C70	# <CJK>
-0x91C0	0x8A51	# <CJK>
-0x91C1	0x553E	# <CJK>
-0x91C2	0x5815	# <CJK>
-0x91C3	0x59A5	# <CJK>
-0x91C4	0x60F0	# <CJK>
-0x91C5	0x6253	# <CJK>
-0x91C6	0x67C1	# <CJK>
-0x91C7	0x8235	# <CJK>
-0x91C8	0x6955	# <CJK>
-0x91C9	0x9640	# <CJK>
-0x91CA	0x99C4	# <CJK>
-0x91CB	0x9A28	# <CJK>
-0x91CC	0x4F53	# <CJK>
-0x91CD	0x5806	# <CJK>
-0x91CE	0x5BFE	# <CJK>
-0x91CF	0x8010	# <CJK>
-0x91D0	0x5CB1	# <CJK>
-0x91D1	0x5E2F	# <CJK>
-0x91D2	0x5F85	# <CJK>
-0x91D3	0x6020	# <CJK>
-0x91D4	0x614B	# <CJK>
-0x91D5	0x6234	# <CJK>
-0x91D6	0x66FF	# <CJK>
-0x91D7	0x6CF0	# <CJK>
-0x91D8	0x6EDE	# <CJK>
-0x91D9	0x80CE	# <CJK>
-0x91DA	0x817F	# <CJK>
-0x91DB	0x82D4	# <CJK>
-0x91DC	0x888B	# <CJK>
-0x91DD	0x8CB8	# <CJK>
-0x91DE	0x9000	# <CJK>
-0x91DF	0x902E	# <CJK>
-0x91E0	0x968A	# <CJK>
-0x91E1	0x9EDB	# <CJK>
-0x91E2	0x9BDB	# <CJK>
-0x91E3	0x4EE3	# <CJK>
-0x91E4	0x53F0	# <CJK>
-0x91E5	0x5927	# <CJK>
-0x91E6	0x7B2C	# <CJK>
-0x91E7	0x918D	# <CJK>
-0x91E8	0x984C	# <CJK>
-0x91E9	0x9DF9	# <CJK>
-0x91EA	0x6EDD	# <CJK>
-0x91EB	0x7027	# <CJK>
-0x91EC	0x5353	# <CJK>
-0x91ED	0x5544	# <CJK>
-0x91EE	0x5B85	# <CJK>
-0x91EF	0x6258	# <CJK>
-0x91F0	0x629E	# <CJK>
-0x91F1	0x62D3	# <CJK>
-0x91F2	0x6CA2	# <CJK>
-0x91F3	0x6FEF	# <CJK>
-0x91F4	0x7422	# <CJK>
-0x91F5	0x8A17	# <CJK>
-0x91F6	0x9438	# <CJK>
-0x91F7	0x6FC1	# <CJK>
-0x91F8	0x8AFE	# <CJK>
-0x91F9	0x8338	# <CJK>
-0x91FA	0x51E7	# <CJK>
-0x91FB	0x86F8	# <CJK>
-0x91FC	0x53EA	# <CJK>
-0x9240	0x53E9	# <CJK>
-0x9241	0x4F46	# <CJK>
-0x9242	0x9054	# <CJK>
-0x9243	0x8FB0	# <CJK>
-0x9244	0x596A	# <CJK>
-0x9245	0x8131	# <CJK>
-0x9246	0x5DFD	# <CJK>
-0x9247	0x7AEA	# <CJK>
-0x9248	0x8FBF	# <CJK>
-0x9249	0x68DA	# <CJK>
-0x924A	0x8C37	# <CJK>
-0x924B	0x72F8	# <CJK>
-0x924C	0x9C48	# <CJK>
-0x924D	0x6A3D	# <CJK>
-0x924E	0x8AB0	# <CJK>
-0x924F	0x4E39	# <CJK>
-0x9250	0x5358	# <CJK>
-0x9251	0x5606	# <CJK>
-0x9252	0x5766	# <CJK>
-0x9253	0x62C5	# <CJK>
-0x9254	0x63A2	# <CJK>
-0x9255	0x65E6	# <CJK>
-0x9256	0x6B4E	# <CJK>
-0x9257	0x6DE1	# <CJK>
-0x9258	0x6E5B	# <CJK>
-0x9259	0x70AD	# <CJK>
-0x925A	0x77ED	# <CJK>
-0x925B	0x7AEF	# <CJK>
-0x925C	0x7BAA	# <CJK>
-0x925D	0x7DBB	# <CJK>
-0x925E	0x803D	# <CJK>
-0x925F	0x80C6	# <CJK>
-0x9260	0x86CB	# <CJK>
-0x9261	0x8A95	# <CJK>
-0x9262	0x935B	# <CJK>
-0x9263	0x56E3	# <CJK>
-0x9264	0x58C7	# <CJK>
-0x9265	0x5F3E	# <CJK>
-0x9266	0x65AD	# <CJK>
-0x9267	0x6696	# <CJK>
-0x9268	0x6A80	# <CJK>
-0x9269	0x6BB5	# <CJK>
-0x926A	0x7537	# <CJK>
-0x926B	0x8AC7	# <CJK>
-0x926C	0x5024	# <CJK>
-0x926D	0x77E5	# <CJK>
-0x926E	0x5730	# <CJK>
-0x926F	0x5F1B	# <CJK>
-0x9270	0x6065	# <CJK>
-0x9271	0x667A	# <CJK>
-0x9272	0x6C60	# <CJK>
-0x9273	0x75F4	# <CJK>
-0x9274	0x7A1A	# <CJK>
-0x9275	0x7F6E	# <CJK>
-0x9276	0x81F4	# <CJK>
-0x9277	0x8718	# <CJK>
-0x9278	0x9045	# <CJK>
-0x9279	0x99B3	# <CJK>
-0x927A	0x7BC9	# <CJK>
-0x927B	0x755C	# <CJK>
-0x927C	0x7AF9	# <CJK>
-0x927D	0x7B51	# <CJK>
-0x927E	0x84C4	# <CJK>
-0x9280	0x9010	# <CJK>
-0x9281	0x79E9	# <CJK>
-0x9282	0x7A92	# <CJK>
-0x9283	0x8336	# <CJK>
-0x9284	0x5AE1	# <CJK>
-0x9285	0x7740	# <CJK>
-0x9286	0x4E2D	# <CJK>
-0x9287	0x4EF2	# <CJK>
-0x9288	0x5B99	# <CJK>
-0x9289	0x5FE0	# <CJK>
-0x928A	0x62BD	# <CJK>
-0x928B	0x663C	# <CJK>
-0x928C	0x67F1	# <CJK>
-0x928D	0x6CE8	# <CJK>
-0x928E	0x866B	# <CJK>
-0x928F	0x8877	# <CJK>
-0x9290	0x8A3B	# <CJK>
-0x9291	0x914E	# <CJK>
-0x9292	0x92F3	# <CJK>
-0x9293	0x99D0	# <CJK>
-0x9294	0x6A17	# <CJK>
-0x9295	0x7026	# <CJK>
-0x9296	0x732A	# <CJK>
-0x9297	0x82E7	# <CJK>
-0x9298	0x8457	# <CJK>
-0x9299	0x8CAF	# <CJK>
-0x929A	0x4E01	# <CJK>
-0x929B	0x5146	# <CJK>
-0x929C	0x51CB	# <CJK>
-0x929D	0x558B	# <CJK>
-0x929E	0x5BF5	# <CJK>
-0x929F	0x5E16	# <CJK>
-0x92A0	0x5E33	# <CJK>
-0x92A1	0x5E81	# <CJK>
-0x92A2	0x5F14	# <CJK>
-0x92A3	0x5F35	# <CJK>
-0x92A4	0x5F6B	# <CJK>
-0x92A5	0x5FB4	# <CJK>
-0x92A6	0x61F2	# <CJK>
-0x92A7	0x6311	# <CJK>
-0x92A8	0x66A2	# <CJK>
-0x92A9	0x671D	# <CJK>
-0x92AA	0x6F6E	# <CJK>
-0x92AB	0x7252	# <CJK>
-0x92AC	0x753A	# <CJK>
-0x92AD	0x773A	# <CJK>
-0x92AE	0x8074	# <CJK>
-0x92AF	0x8139	# <CJK>
-0x92B0	0x8178	# <CJK>
-0x92B1	0x8776	# <CJK>
-0x92B2	0x8ABF	# <CJK>
-0x92B3	0x8ADC	# <CJK>
-0x92B4	0x8D85	# <CJK>
-0x92B5	0x8DF3	# <CJK>
-0x92B6	0x929A	# <CJK>
-0x92B7	0x9577	# <CJK>
-0x92B8	0x9802	# <CJK>
-0x92B9	0x9CE5	# <CJK>
-0x92BA	0x52C5	# <CJK>
-0x92BB	0x6357	# <CJK>
-0x92BC	0x76F4	# <CJK>
-0x92BD	0x6715	# <CJK>
-0x92BE	0x6C88	# <CJK>
-0x92BF	0x73CD	# <CJK>
-0x92C0	0x8CC3	# <CJK>
-0x92C1	0x93AE	# <CJK>
-0x92C2	0x9673	# <CJK>
-0x92C3	0x6D25	# <CJK>
-0x92C4	0x589C	# <CJK>
-0x92C5	0x690E	# <CJK>
-0x92C6	0x69CC	# <CJK>
-0x92C7	0x8FFD	# <CJK>
-0x92C8	0x939A	# <CJK>
-0x92C9	0x75DB	# <CJK>
-0x92CA	0x901A	# <CJK>
-0x92CB	0x585A	# <CJK>
-0x92CC	0x6802	# <CJK>
-0x92CD	0x63B4	# <CJK>
-0x92CE	0x69FB	# <CJK>
-0x92CF	0x4F43	# <CJK>
-0x92D0	0x6F2C	# <CJK>
-0x92D1	0x67D8	# <CJK>
-0x92D2	0x8FBB	# <CJK>
-0x92D3	0x8526	# <CJK>
-0x92D4	0x7DB4	# <CJK>
-0x92D5	0x9354	# <CJK>
-0x92D6	0x693F	# <CJK>
-0x92D7	0x6F70	# <CJK>
-0x92D8	0x576A	# <CJK>
-0x92D9	0x58F7	# <CJK>
-0x92DA	0x5B2C	# <CJK>
-0x92DB	0x7D2C	# <CJK>
-0x92DC	0x722A	# <CJK>
-0x92DD	0x540A	# <CJK>
-0x92DE	0x91E3	# <CJK>
-0x92DF	0x9DB4	# <CJK>
-0x92E0	0x4EAD	# <CJK>
-0x92E1	0x4F4E	# <CJK>
-0x92E2	0x505C	# <CJK>
-0x92E3	0x5075	# <CJK>
-0x92E4	0x5243	# <CJK>
-0x92E5	0x8C9E	# <CJK>
-0x92E6	0x5448	# <CJK>
-0x92E7	0x5824	# <CJK>
-0x92E8	0x5B9A	# <CJK>
-0x92E9	0x5E1D	# <CJK>
-0x92EA	0x5E95	# <CJK>
-0x92EB	0x5EAD	# <CJK>
-0x92EC	0x5EF7	# <CJK>
-0x92ED	0x5F1F	# <CJK>
-0x92EE	0x608C	# <CJK>
-0x92EF	0x62B5	# <CJK>
-0x92F0	0x633A	# <CJK>
-0x92F1	0x63D0	# <CJK>
-0x92F2	0x68AF	# <CJK>
-0x92F3	0x6C40	# <CJK>
-0x92F4	0x7887	# <CJK>
-0x92F5	0x798E	# <CJK>
-0x92F6	0x7A0B	# <CJK>
-0x92F7	0x7DE0	# <CJK>
-0x92F8	0x8247	# <CJK>
-0x92F9	0x8A02	# <CJK>
-0x92FA	0x8AE6	# <CJK>
-0x92FB	0x8E44	# <CJK>
-0x92FC	0x9013	# <CJK>
-0x9340	0x90B8	# <CJK>
-0x9341	0x912D	# <CJK>
-0x9342	0x91D8	# <CJK>
-0x9343	0x9F0E	# <CJK>
-0x9344	0x6CE5	# <CJK>
-0x9345	0x6458	# <CJK>
-0x9346	0x64E2	# <CJK>
-0x9347	0x6575	# <CJK>
-0x9348	0x6EF4	# <CJK>
-0x9349	0x7684	# <CJK>
-0x934A	0x7B1B	# <CJK>
-0x934B	0x9069	# <CJK>
-0x934C	0x93D1	# <CJK>
-0x934D	0x6EBA	# <CJK>
-0x934E	0x54F2	# <CJK>
-0x934F	0x5FB9	# <CJK>
-0x9350	0x64A4	# <CJK>
-0x9351	0x8F4D	# <CJK>
-0x9352	0x8FED	# <CJK>
-0x9353	0x9244	# <CJK>
-0x9354	0x5178	# <CJK>
-0x9355	0x586B	# <CJK>
-0x9356	0x5929	# <CJK>
-0x9357	0x5C55	# <CJK>
-0x9358	0x5E97	# <CJK>
-0x9359	0x6DFB	# <CJK>
-0x935A	0x7E8F	# <CJK>
-0x935B	0x751C	# <CJK>
-0x935C	0x8CBC	# <CJK>
-0x935D	0x8EE2	# <CJK>
-0x935E	0x985B	# <CJK>
-0x935F	0x70B9	# <CJK>
-0x9360	0x4F1D	# <CJK>
-0x9361	0x6BBF	# <CJK>
-0x9362	0x6FB1	# <CJK>
-0x9363	0x7530	# <CJK>
-0x9364	0x96FB	# <CJK>
-0x9365	0x514E	# <CJK>
-0x9366	0x5410	# <CJK>
-0x9367	0x5835	# <CJK>
-0x9368	0x5857	# <CJK>
-0x9369	0x59AC	# <CJK>
-0x936A	0x5C60	# <CJK>
-0x936B	0x5F92	# <CJK>
-0x936C	0x6597	# <CJK>
-0x936D	0x675C	# <CJK>
-0x936E	0x6E21	# <CJK>
-0x936F	0x767B	# <CJK>
-0x9370	0x83DF	# <CJK>
-0x9371	0x8CED	# <CJK>
-0x9372	0x9014	# <CJK>
-0x9373	0x90FD	# <CJK>
-0x9374	0x934D	# <CJK>
-0x9375	0x7825	# <CJK>
-0x9376	0x783A	# <CJK>
-0x9377	0x52AA	# <CJK>
-0x9378	0x5EA6	# <CJK>
-0x9379	0x571F	# <CJK>
-0x937A	0x5974	# <CJK>
-0x937B	0x6012	# <CJK>
-0x937C	0x5012	# <CJK>
-0x937D	0x515A	# <CJK>
-0x937E	0x51AC	# <CJK>
-0x9380	0x51CD	# <CJK>
-0x9381	0x5200	# <CJK>
-0x9382	0x5510	# <CJK>
-0x9383	0x5854	# <CJK>
-0x9384	0x5858	# <CJK>
-0x9385	0x5957	# <CJK>
-0x9386	0x5B95	# <CJK>
-0x9387	0x5CF6	# <CJK>
-0x9388	0x5D8B	# <CJK>
-0x9389	0x60BC	# <CJK>
-0x938A	0x6295	# <CJK>
-0x938B	0x642D	# <CJK>
-0x938C	0x6771	# <CJK>
-0x938D	0x6843	# <CJK>
-0x938E	0x68BC	# <CJK>
-0x938F	0x68DF	# <CJK>
-0x9390	0x76D7	# <CJK>
-0x9391	0x6DD8	# <CJK>
-0x9392	0x6E6F	# <CJK>
-0x9393	0x6D9B	# <CJK>
-0x9394	0x706F	# <CJK>
-0x9395	0x71C8	# <CJK>
-0x9396	0x5F53	# <CJK>
-0x9397	0x75D8	# <CJK>
-0x9398	0x7977	# <CJK>
-0x9399	0x7B49	# <CJK>
-0x939A	0x7B54	# <CJK>
-0x939B	0x7B52	# <CJK>
-0x939C	0x7CD6	# <CJK>
-0x939D	0x7D71	# <CJK>
-0x939E	0x5230	# <CJK>
-0x939F	0x8463	# <CJK>
-0x93A0	0x8569	# <CJK>
-0x93A1	0x85E4	# <CJK>
-0x93A2	0x8A0E	# <CJK>
-0x93A3	0x8B04	# <CJK>
-0x93A4	0x8C46	# <CJK>
-0x93A5	0x8E0F	# <CJK>
-0x93A6	0x9003	# <CJK>
-0x93A7	0x900F	# <CJK>
-0x93A8	0x9419	# <CJK>
-0x93A9	0x9676	# <CJK>
-0x93AA	0x982D	# <CJK>
-0x93AB	0x9A30	# <CJK>
-0x93AC	0x95D8	# <CJK>
-0x93AD	0x50CD	# <CJK>
-0x93AE	0x52D5	# <CJK>
-0x93AF	0x540C	# <CJK>
-0x93B0	0x5802	# <CJK>
-0x93B1	0x5C0E	# <CJK>
-0x93B2	0x61A7	# <CJK>
-0x93B3	0x649E	# <CJK>
-0x93B4	0x6D1E	# <CJK>
-0x93B5	0x77B3	# <CJK>
-0x93B6	0x7AE5	# <CJK>
-0x93B7	0x80F4	# <CJK>
-0x93B8	0x8404	# <CJK>
-0x93B9	0x9053	# <CJK>
-0x93BA	0x9285	# <CJK>
-0x93BB	0x5CE0	# <CJK>
-0x93BC	0x9D07	# <CJK>
-0x93BD	0x533F	# <CJK>
-0x93BE	0x5F97	# <CJK>
-0x93BF	0x5FB3	# <CJK>
-0x93C0	0x6D9C	# <CJK>
-0x93C1	0x7279	# <CJK>
-0x93C2	0x7763	# <CJK>
-0x93C3	0x79BF	# <CJK>
-0x93C4	0x7BE4	# <CJK>
-0x93C5	0x6BD2	# <CJK>
-0x93C6	0x72EC	# <CJK>
-0x93C7	0x8AAD	# <CJK>
-0x93C8	0x6803	# <CJK>
-0x93C9	0x6A61	# <CJK>
-0x93CA	0x51F8	# <CJK>
-0x93CB	0x7A81	# <CJK>
-0x93CC	0x6934	# <CJK>
-0x93CD	0x5C4A	# <CJK>
-0x93CE	0x9CF6	# <CJK>
-0x93CF	0x82EB	# <CJK>
-0x93D0	0x5BC5	# <CJK>
-0x93D1	0x9149	# <CJK>
-0x93D2	0x701E	# <CJK>
-0x93D3	0x5678	# <CJK>
-0x93D4	0x5C6F	# <CJK>
-0x93D5	0x60C7	# <CJK>
-0x93D6	0x6566	# <CJK>
-0x93D7	0x6C8C	# <CJK>
-0x93D8	0x8C5A	# <CJK>
-0x93D9	0x9041	# <CJK>
-0x93DA	0x9813	# <CJK>
-0x93DB	0x5451	# <CJK>
-0x93DC	0x66C7	# <CJK>
-0x93DD	0x920D	# <CJK>
-0x93DE	0x5948	# <CJK>
-0x93DF	0x90A3	# <CJK>
-0x93E0	0x5185	# <CJK>
-0x93E1	0x4E4D	# <CJK>
-0x93E2	0x51EA	# <CJK>
-0x93E3	0x8599	# <CJK>
-0x93E4	0x8B0E	# <CJK>
-0x93E5	0x7058	# <CJK>
-0x93E6	0x637A	# <CJK>
-0x93E7	0x934B	# <CJK>
-0x93E8	0x6962	# <CJK>
-0x93E9	0x99B4	# <CJK>
-0x93EA	0x7E04	# <CJK>
-0x93EB	0x7577	# <CJK>
-0x93EC	0x5357	# <CJK>
-0x93ED	0x6960	# <CJK>
-0x93EE	0x8EDF	# <CJK>
-0x93EF	0x96E3	# <CJK>
-0x93F0	0x6C5D	# <CJK>
-0x93F1	0x4E8C	# <CJK>
-0x93F2	0x5C3C	# <CJK>
-0x93F3	0x5F10	# <CJK>
-0x93F4	0x8FE9	# <CJK>
-0x93F5	0x5302	# <CJK>
-0x93F6	0x8CD1	# <CJK>
-0x93F7	0x8089	# <CJK>
-0x93F8	0x8679	# <CJK>
-0x93F9	0x5EFF	# <CJK>
-0x93FA	0x65E5	# <CJK>
-0x93FB	0x4E73	# <CJK>
-0x93FC	0x5165	# <CJK>
-0x9440	0x5982	# <CJK>
-0x9441	0x5C3F	# <CJK>
-0x9442	0x97EE	# <CJK>
-0x9443	0x4EFB	# <CJK>
-0x9444	0x598A	# <CJK>
-0x9445	0x5FCD	# <CJK>
-0x9446	0x8A8D	# <CJK>
-0x9447	0x6FE1	# <CJK>
-0x9448	0x79B0	# <CJK>
-0x9449	0x7962	# <CJK>
-0x944A	0x5BE7	# <CJK>
-0x944B	0x8471	# <CJK>
-0x944C	0x732B	# <CJK>
-0x944D	0x71B1	# <CJK>
-0x944E	0x5E74	# <CJK>
-0x944F	0x5FF5	# <CJK>
-0x9450	0x637B	# <CJK>
-0x9451	0x649A	# <CJK>
-0x9452	0x71C3	# <CJK>
-0x9453	0x7C98	# <CJK>
-0x9454	0x4E43	# <CJK>
-0x9455	0x5EFC	# <CJK>
-0x9456	0x4E4B	# <CJK>
-0x9457	0x57DC	# <CJK>
-0x9458	0x56A2	# <CJK>
-0x9459	0x60A9	# <CJK>
-0x945A	0x6FC3	# <CJK>
-0x945B	0x7D0D	# <CJK>
-0x945C	0x80FD	# <CJK>
-0x945D	0x8133	# <CJK>
-0x945E	0x81BF	# <CJK>
-0x945F	0x8FB2	# <CJK>
-0x9460	0x8997	# <CJK>
-0x9461	0x86A4	# <CJK>
-0x9462	0x5DF4	# <CJK>
-0x9463	0x628A	# <CJK>
-0x9464	0x64AD	# <CJK>
-0x9465	0x8987	# <CJK>
-0x9466	0x6777	# <CJK>
-0x9467	0x6CE2	# <CJK>
-0x9468	0x6D3E	# <CJK>
-0x9469	0x7436	# <CJK>
-0x946A	0x7834	# <CJK>
-0x946B	0x5A46	# <CJK>
-0x946C	0x7F75	# <CJK>
-0x946D	0x82AD	# <CJK>
-0x946E	0x99AC	# <CJK>
-0x946F	0x4FF3	# <CJK>
-0x9470	0x5EC3	# <CJK>
-0x9471	0x62DD	# <CJK>
-0x9472	0x6392	# <CJK>
-0x9473	0x6557	# <CJK>
-0x9474	0x676F	# <CJK>
-0x9475	0x76C3	# <CJK>
-0x9476	0x724C	# <CJK>
-0x9477	0x80CC	# <CJK>
-0x9478	0x80BA	# <CJK>
-0x9479	0x8F29	# <CJK>
-0x947A	0x914D	# <CJK>
-0x947B	0x500D	# <CJK>
-0x947C	0x57F9	# <CJK>
-0x947D	0x5A92	# <CJK>
-0x947E	0x6885	# <CJK>
-0x9480	0x6973	# <CJK>
-0x9481	0x7164	# <CJK>
-0x9482	0x72FD	# <CJK>
-0x9483	0x8CB7	# <CJK>
-0x9484	0x58F2	# <CJK>
-0x9485	0x8CE0	# <CJK>
-0x9486	0x966A	# <CJK>
-0x9487	0x9019	# <CJK>
-0x9488	0x877F	# <CJK>
-0x9489	0x79E4	# <CJK>
-0x948A	0x77E7	# <CJK>
-0x948B	0x8429	# <CJK>
-0x948C	0x4F2F	# <CJK>
-0x948D	0x5265	# <CJK>
-0x948E	0x535A	# <CJK>
-0x948F	0x62CD	# <CJK>
-0x9490	0x67CF	# <CJK>
-0x9491	0x6CCA	# <CJK>
-0x9492	0x767D	# <CJK>
-0x9493	0x7B94	# <CJK>
-0x9494	0x7C95	# <CJK>
-0x9495	0x8236	# <CJK>
-0x9496	0x8584	# <CJK>
-0x9497	0x8FEB	# <CJK>
-0x9498	0x66DD	# <CJK>
-0x9499	0x6F20	# <CJK>
-0x949A	0x7206	# <CJK>
-0x949B	0x7E1B	# <CJK>
-0x949C	0x83AB	# <CJK>
-0x949D	0x99C1	# <CJK>
-0x949E	0x9EA6	# <CJK>
-0x949F	0x51FD	# <CJK>
-0x94A0	0x7BB1	# <CJK>
-0x94A1	0x7872	# <CJK>
-0x94A2	0x7BB8	# <CJK>
-0x94A3	0x8087	# <CJK>
-0x94A4	0x7B48	# <CJK>
-0x94A5	0x6AE8	# <CJK>
-0x94A6	0x5E61	# <CJK>
-0x94A7	0x808C	# <CJK>
-0x94A8	0x7551	# <CJK>
-0x94A9	0x7560	# <CJK>
-0x94AA	0x516B	# <CJK>
-0x94AB	0x9262	# <CJK>
-0x94AC	0x6E8C	# <CJK>
-0x94AD	0x767A	# <CJK>
-0x94AE	0x9197	# <CJK>
-0x94AF	0x9AEA	# <CJK>
-0x94B0	0x4F10	# <CJK>
-0x94B1	0x7F70	# <CJK>
-0x94B2	0x629C	# <CJK>
-0x94B3	0x7B4F	# <CJK>
-0x94B4	0x95A5	# <CJK>
-0x94B5	0x9CE9	# <CJK>
-0x94B6	0x567A	# <CJK>
-0x94B7	0x5859	# <CJK>
-0x94B8	0x86E4	# <CJK>
-0x94B9	0x96BC	# <CJK>
-0x94BA	0x4F34	# <CJK>
-0x94BB	0x5224	# <CJK>
-0x94BC	0x534A	# <CJK>
-0x94BD	0x53CD	# <CJK>
-0x94BE	0x53DB	# <CJK>
-0x94BF	0x5E06	# <CJK>
-0x94C0	0x642C	# <CJK>
-0x94C1	0x6591	# <CJK>
-0x94C2	0x677F	# <CJK>
-0x94C3	0x6C3E	# <CJK>
-0x94C4	0x6C4E	# <CJK>
-0x94C5	0x7248	# <CJK>
-0x94C6	0x72AF	# <CJK>
-0x94C7	0x73ED	# <CJK>
-0x94C8	0x7554	# <CJK>
-0x94C9	0x7E41	# <CJK>
-0x94CA	0x822C	# <CJK>
-0x94CB	0x85E9	# <CJK>
-0x94CC	0x8CA9	# <CJK>
-0x94CD	0x7BC4	# <CJK>
-0x94CE	0x91C6	# <CJK>
-0x94CF	0x7169	# <CJK>
-0x94D0	0x9812	# <CJK>
-0x94D1	0x98EF	# <CJK>
-0x94D2	0x633D	# <CJK>
-0x94D3	0x6669	# <CJK>
-0x94D4	0x756A	# <CJK>
-0x94D5	0x76E4	# <CJK>
-0x94D6	0x78D0	# <CJK>
-0x94D7	0x8543	# <CJK>
-0x94D8	0x86EE	# <CJK>
-0x94D9	0x532A	# <CJK>
-0x94DA	0x5351	# <CJK>
-0x94DB	0x5426	# <CJK>
-0x94DC	0x5983	# <CJK>
-0x94DD	0x5E87	# <CJK>
-0x94DE	0x5F7C	# <CJK>
-0x94DF	0x60B2	# <CJK>
-0x94E0	0x6249	# <CJK>
-0x94E1	0x6279	# <CJK>
-0x94E2	0x62AB	# <CJK>
-0x94E3	0x6590	# <CJK>
-0x94E4	0x6BD4	# <CJK>
-0x94E5	0x6CCC	# <CJK>
-0x94E6	0x75B2	# <CJK>
-0x94E7	0x76AE	# <CJK>
-0x94E8	0x7891	# <CJK>
-0x94E9	0x79D8	# <CJK>
-0x94EA	0x7DCB	# <CJK>
-0x94EB	0x7F77	# <CJK>
-0x94EC	0x80A5	# <CJK>
-0x94ED	0x88AB	# <CJK>
-0x94EE	0x8AB9	# <CJK>
-0x94EF	0x8CBB	# <CJK>
-0x94F0	0x907F	# <CJK>
-0x94F1	0x975E	# <CJK>
-0x94F2	0x98DB	# <CJK>
-0x94F3	0x6A0B	# <CJK>
-0x94F4	0x7C38	# <CJK>
-0x94F5	0x5099	# <CJK>
-0x94F6	0x5C3E	# <CJK>
-0x94F7	0x5FAE	# <CJK>
-0x94F8	0x6787	# <CJK>
-0x94F9	0x6BD8	# <CJK>
-0x94FA	0x7435	# <CJK>
-0x94FB	0x7709	# <CJK>
-0x94FC	0x7F8E	# <CJK>
-0x9540	0x9F3B	# <CJK>
-0x9541	0x67CA	# <CJK>
-0x9542	0x7A17	# <CJK>
-0x9543	0x5339	# <CJK>
-0x9544	0x758B	# <CJK>
-0x9545	0x9AED	# <CJK>
-0x9546	0x5F66	# <CJK>
-0x9547	0x819D	# <CJK>
-0x9548	0x83F1	# <CJK>
-0x9549	0x8098	# <CJK>
-0x954A	0x5F3C	# <CJK>
-0x954B	0x5FC5	# <CJK>
-0x954C	0x7562	# <CJK>
-0x954D	0x7B46	# <CJK>
-0x954E	0x903C	# <CJK>
-0x954F	0x6867	# <CJK>
-0x9550	0x59EB	# <CJK>
-0x9551	0x5A9B	# <CJK>
-0x9552	0x7D10	# <CJK>
-0x9553	0x767E	# <CJK>
-0x9554	0x8B2C	# <CJK>
-0x9555	0x4FF5	# <CJK>
-0x9556	0x5F6A	# <CJK>
-0x9557	0x6A19	# <CJK>
-0x9558	0x6C37	# <CJK>
-0x9559	0x6F02	# <CJK>
-0x955A	0x74E2	# <CJK>
-0x955B	0x7968	# <CJK>
-0x955C	0x8868	# <CJK>
-0x955D	0x8A55	# <CJK>
-0x955E	0x8C79	# <CJK>
-0x955F	0x5EDF	# <CJK>
-0x9560	0x63CF	# <CJK>
-0x9561	0x75C5	# <CJK>
-0x9562	0x79D2	# <CJK>
-0x9563	0x82D7	# <CJK>
-0x9564	0x9328	# <CJK>
-0x9565	0x92F2	# <CJK>
-0x9566	0x849C	# <CJK>
-0x9567	0x86ED	# <CJK>
-0x9568	0x9C2D	# <CJK>
-0x9569	0x54C1	# <CJK>
-0x956A	0x5F6C	# <CJK>
-0x956B	0x658C	# <CJK>
-0x956C	0x6D5C	# <CJK>
-0x956D	0x7015	# <CJK>
-0x956E	0x8CA7	# <CJK>
-0x956F	0x8CD3	# <CJK>
-0x9570	0x983B	# <CJK>
-0x9571	0x654F	# <CJK>
-0x9572	0x74F6	# <CJK>
-0x9573	0x4E0D	# <CJK>
-0x9574	0x4ED8	# <CJK>
-0x9575	0x57E0	# <CJK>
-0x9576	0x592B	# <CJK>
-0x9577	0x5A66	# <CJK>
-0x9578	0x5BCC	# <CJK>
-0x9579	0x51A8	# <CJK>
-0x957A	0x5E03	# <CJK>
-0x957B	0x5E9C	# <CJK>
-0x957C	0x6016	# <CJK>
-0x957D	0x6276	# <CJK>
-0x957E	0x6577	# <CJK>
-0x9580	0x65A7	# <CJK>
-0x9581	0x666E	# <CJK>
-0x9582	0x6D6E	# <CJK>
-0x9583	0x7236	# <CJK>
-0x9584	0x7B26	# <CJK>
-0x9585	0x8150	# <CJK>
-0x9586	0x819A	# <CJK>
-0x9587	0x8299	# <CJK>
-0x9588	0x8B5C	# <CJK>
-0x9589	0x8CA0	# <CJK>
-0x958A	0x8CE6	# <CJK>
-0x958B	0x8D74	# <CJK>
-0x958C	0x961C	# <CJK>
-0x958D	0x9644	# <CJK>
-0x958E	0x4FAE	# <CJK>
-0x958F	0x64AB	# <CJK>
-0x9590	0x6B66	# <CJK>
-0x9591	0x821E	# <CJK>
-0x9592	0x8461	# <CJK>
-0x9593	0x856A	# <CJK>
-0x9594	0x90E8	# <CJK>
-0x9595	0x5C01	# <CJK>
-0x9596	0x6953	# <CJK>
-0x9597	0x98A8	# <CJK>
-0x9598	0x847A	# <CJK>
-0x9599	0x8557	# <CJK>
-0x959A	0x4F0F	# <CJK>
-0x959B	0x526F	# <CJK>
-0x959C	0x5FA9	# <CJK>
-0x959D	0x5E45	# <CJK>
-0x959E	0x670D	# <CJK>
-0x959F	0x798F	# <CJK>
-0x95A0	0x8179	# <CJK>
-0x95A1	0x8907	# <CJK>
-0x95A2	0x8986	# <CJK>
-0x95A3	0x6DF5	# <CJK>
-0x95A4	0x5F17	# <CJK>
-0x95A5	0x6255	# <CJK>
-0x95A6	0x6CB8	# <CJK>
-0x95A7	0x4ECF	# <CJK>
-0x95A8	0x7269	# <CJK>
-0x95A9	0x9B92	# <CJK>
-0x95AA	0x5206	# <CJK>
-0x95AB	0x543B	# <CJK>
-0x95AC	0x5674	# <CJK>
-0x95AD	0x58B3	# <CJK>
-0x95AE	0x61A4	# <CJK>
-0x95AF	0x626E	# <CJK>
-0x95B0	0x711A	# <CJK>
-0x95B1	0x596E	# <CJK>
-0x95B2	0x7C89	# <CJK>
-0x95B3	0x7CDE	# <CJK>
-0x95B4	0x7D1B	# <CJK>
-0x95B5	0x96F0	# <CJK>
-0x95B6	0x6587	# <CJK>
-0x95B7	0x805E	# <CJK>
-0x95B8	0x4E19	# <CJK>
-0x95B9	0x4F75	# <CJK>
-0x95BA	0x5175	# <CJK>
-0x95BB	0x5840	# <CJK>
-0x95BC	0x5E63	# <CJK>
-0x95BD	0x5E73	# <CJK>
-0x95BE	0x5F0A	# <CJK>
-0x95BF	0x67C4	# <CJK>
-0x95C0	0x4E26	# <CJK>
-0x95C1	0x853D	# <CJK>
-0x95C2	0x9589	# <CJK>
-0x95C3	0x965B	# <CJK>
-0x95C4	0x7C73	# <CJK>
-0x95C5	0x9801	# <CJK>
-0x95C6	0x50FB	# <CJK>
-0x95C7	0x58C1	# <CJK>
-0x95C8	0x7656	# <CJK>
-0x95C9	0x78A7	# <CJK>
-0x95CA	0x5225	# <CJK>
-0x95CB	0x77A5	# <CJK>
-0x95CC	0x8511	# <CJK>
-0x95CD	0x7B86	# <CJK>
-0x95CE	0x504F	# <CJK>
-0x95CF	0x5909	# <CJK>
-0x95D0	0x7247	# <CJK>
-0x95D1	0x7BC7	# <CJK>
-0x95D2	0x7DE8	# <CJK>
-0x95D3	0x8FBA	# <CJK>
-0x95D4	0x8FD4	# <CJK>
-0x95D5	0x904D	# <CJK>
-0x95D6	0x4FBF	# <CJK>
-0x95D7	0x52C9	# <CJK>
-0x95D8	0x5A29	# <CJK>
-0x95D9	0x5F01	# <CJK>
-0x95DA	0x97AD	# <CJK>
-0x95DB	0x4FDD	# <CJK>
-0x95DC	0x8217	# <CJK>
-0x95DD	0x92EA	# <CJK>
-0x95DE	0x5703	# <CJK>
-0x95DF	0x6355	# <CJK>
-0x95E0	0x6B69	# <CJK>
-0x95E1	0x752B	# <CJK>
-0x95E2	0x88DC	# <CJK>
-0x95E3	0x8F14	# <CJK>
-0x95E4	0x7A42	# <CJK>
-0x95E5	0x52DF	# <CJK>
-0x95E6	0x5893	# <CJK>
-0x95E7	0x6155	# <CJK>
-0x95E8	0x620A	# <CJK>
-0x95E9	0x66AE	# <CJK>
-0x95EA	0x6BCD	# <CJK>
-0x95EB	0x7C3F	# <CJK>
-0x95EC	0x83E9	# <CJK>
-0x95ED	0x5023	# <CJK>
-0x95EE	0x4FF8	# <CJK>
-0x95EF	0x5305	# <CJK>
-0x95F0	0x5446	# <CJK>
-0x95F1	0x5831	# <CJK>
-0x95F2	0x5949	# <CJK>
-0x95F3	0x5B9D	# <CJK>
-0x95F4	0x5CF0	# <CJK>
-0x95F5	0x5CEF	# <CJK>
-0x95F6	0x5D29	# <CJK>
-0x95F7	0x5E96	# <CJK>
-0x95F8	0x62B1	# <CJK>
-0x95F9	0x6367	# <CJK>
-0x95FA	0x653E	# <CJK>
-0x95FB	0x65B9	# <CJK>
-0x95FC	0x670B	# <CJK>
-0x9640	0x6CD5	# <CJK>
-0x9641	0x6CE1	# <CJK>
-0x9642	0x70F9	# <CJK>
-0x9643	0x7832	# <CJK>
-0x9644	0x7E2B	# <CJK>
-0x9645	0x80DE	# <CJK>
-0x9646	0x82B3	# <CJK>
-0x9647	0x840C	# <CJK>
-0x9648	0x84EC	# <CJK>
-0x9649	0x8702	# <CJK>
-0x964A	0x8912	# <CJK>
-0x964B	0x8A2A	# <CJK>
-0x964C	0x8C4A	# <CJK>
-0x964D	0x90A6	# <CJK>
-0x964E	0x92D2	# <CJK>
-0x964F	0x98FD	# <CJK>
-0x9650	0x9CF3	# <CJK>
-0x9651	0x9D6C	# <CJK>
-0x9652	0x4E4F	# <CJK>
-0x9653	0x4EA1	# <CJK>
-0x9654	0x508D	# <CJK>
-0x9655	0x5256	# <CJK>
-0x9656	0x574A	# <CJK>
-0x9657	0x59A8	# <CJK>
-0x9658	0x5E3D	# <CJK>
-0x9659	0x5FD8	# <CJK>
-0x965A	0x5FD9	# <CJK>
-0x965B	0x623F	# <CJK>
-0x965C	0x66B4	# <CJK>
-0x965D	0x671B	# <CJK>
-0x965E	0x67D0	# <CJK>
-0x965F	0x68D2	# <CJK>
-0x9660	0x5192	# <CJK>
-0x9661	0x7D21	# <CJK>
-0x9662	0x80AA	# <CJK>
-0x9663	0x81A8	# <CJK>
-0x9664	0x8B00	# <CJK>
-0x9665	0x8C8C	# <CJK>
-0x9666	0x8CBF	# <CJK>
-0x9667	0x927E	# <CJK>
-0x9668	0x9632	# <CJK>
-0x9669	0x5420	# <CJK>
-0x966A	0x982C	# <CJK>
-0x966B	0x5317	# <CJK>
-0x966C	0x50D5	# <CJK>
-0x966D	0x535C	# <CJK>
-0x966E	0x58A8	# <CJK>
-0x966F	0x64B2	# <CJK>
-0x9670	0x6734	# <CJK>
-0x9671	0x7267	# <CJK>
-0x9672	0x7766	# <CJK>
-0x9673	0x7A46	# <CJK>
-0x9674	0x91E6	# <CJK>
-0x9675	0x52C3	# <CJK>
-0x9676	0x6CA1	# <CJK>
-0x9677	0x6B86	# <CJK>
-0x9678	0x5800	# <CJK>
-0x9679	0x5E4C	# <CJK>
-0x967A	0x5954	# <CJK>
-0x967B	0x672C	# <CJK>
-0x967C	0x7FFB	# <CJK>
-0x967D	0x51E1	# <CJK>
-0x967E	0x76C6	# <CJK>
-0x9680	0x6469	# <CJK>
-0x9681	0x78E8	# <CJK>
-0x9682	0x9B54	# <CJK>
-0x9683	0x9EBB	# <CJK>
-0x9684	0x57CB	# <CJK>
-0x9685	0x59B9	# <CJK>
-0x9686	0x6627	# <CJK>
-0x9687	0x679A	# <CJK>
-0x9688	0x6BCE	# <CJK>
-0x9689	0x54E9	# <CJK>
-0x968A	0x69D9	# <CJK>
-0x968B	0x5E55	# <CJK>
-0x968C	0x819C	# <CJK>
-0x968D	0x6795	# <CJK>
-0x968E	0x9BAA	# <CJK>
-0x968F	0x67FE	# <CJK>
-0x9690	0x9C52	# <CJK>
-0x9691	0x685D	# <CJK>
-0x9692	0x4EA6	# <CJK>
-0x9693	0x4FE3	# <CJK>
-0x9694	0x53C8	# <CJK>
-0x9695	0x62B9	# <CJK>
-0x9696	0x672B	# <CJK>
-0x9697	0x6CAB	# <CJK>
-0x9698	0x8FC4	# <CJK>
-0x9699	0x4FAD	# <CJK>
-0x969A	0x7E6D	# <CJK>
-0x969B	0x9EBF	# <CJK>
-0x969C	0x4E07	# <CJK>
-0x969D	0x6162	# <CJK>
-0x969E	0x6E80	# <CJK>
-0x969F	0x6F2B	# <CJK>
-0x96A0	0x8513	# <CJK>
-0x96A1	0x5473	# <CJK>
-0x96A2	0x672A	# <CJK>
-0x96A3	0x9B45	# <CJK>
-0x96A4	0x5DF3	# <CJK>
-0x96A5	0x7B95	# <CJK>
-0x96A6	0x5CAC	# <CJK>
-0x96A7	0x5BC6	# <CJK>
-0x96A8	0x871C	# <CJK>
-0x96A9	0x6E4A	# <CJK>
-0x96AA	0x84D1	# <CJK>
-0x96AB	0x7A14	# <CJK>
-0x96AC	0x8108	# <CJK>
-0x96AD	0x5999	# <CJK>
-0x96AE	0x7C8D	# <CJK>
-0x96AF	0x6C11	# <CJK>
-0x96B0	0x7720	# <CJK>
-0x96B1	0x52D9	# <CJK>
-0x96B2	0x5922	# <CJK>
-0x96B3	0x7121	# <CJK>
-0x96B4	0x725F	# <CJK>
-0x96B5	0x77DB	# <CJK>
-0x96B6	0x9727	# <CJK>
-0x96B7	0x9D61	# <CJK>
-0x96B8	0x690B	# <CJK>
-0x96B9	0x5A7F	# <CJK>
-0x96BA	0x5A18	# <CJK>
-0x96BB	0x51A5	# <CJK>
-0x96BC	0x540D	# <CJK>
-0x96BD	0x547D	# <CJK>
-0x96BE	0x660E	# <CJK>
-0x96BF	0x76DF	# <CJK>
-0x96C0	0x8FF7	# <CJK>
-0x96C1	0x9298	# <CJK>
-0x96C2	0x9CF4	# <CJK>
-0x96C3	0x59EA	# <CJK>
-0x96C4	0x725D	# <CJK>
-0x96C5	0x6EC5	# <CJK>
-0x96C6	0x514D	# <CJK>
-0x96C7	0x68C9	# <CJK>
-0x96C8	0x7DBF	# <CJK>
-0x96C9	0x7DEC	# <CJK>
-0x96CA	0x9762	# <CJK>
-0x96CB	0x9EBA	# <CJK>
-0x96CC	0x6478	# <CJK>
-0x96CD	0x6A21	# <CJK>
-0x96CE	0x8302	# <CJK>
-0x96CF	0x5984	# <CJK>
-0x96D0	0x5B5F	# <CJK>
-0x96D1	0x6BDB	# <CJK>
-0x96D2	0x731B	# <CJK>
-0x96D3	0x76F2	# <CJK>
-0x96D4	0x7DB2	# <CJK>
-0x96D5	0x8017	# <CJK>
-0x96D6	0x8499	# <CJK>
-0x96D7	0x5132	# <CJK>
-0x96D8	0x6728	# <CJK>
-0x96D9	0x9ED9	# <CJK>
-0x96DA	0x76EE	# <CJK>
-0x96DB	0x6762	# <CJK>
-0x96DC	0x52FF	# <CJK>
-0x96DD	0x9905	# <CJK>
-0x96DE	0x5C24	# <CJK>
-0x96DF	0x623B	# <CJK>
-0x96E0	0x7C7E	# <CJK>
-0x96E1	0x8CB0	# <CJK>
-0x96E2	0x554F	# <CJK>
-0x96E3	0x60B6	# <CJK>
-0x96E4	0x7D0B	# <CJK>
-0x96E5	0x9580	# <CJK>
-0x96E6	0x5301	# <CJK>
-0x96E7	0x4E5F	# <CJK>
-0x96E8	0x51B6	# <CJK>
-0x96E9	0x591C	# <CJK>
-0x96EA	0x723A	# <CJK>
-0x96EB	0x8036	# <CJK>
-0x96EC	0x91CE	# <CJK>
-0x96ED	0x5F25	# <CJK>
-0x96EE	0x77E2	# <CJK>
-0x96EF	0x5384	# <CJK>
-0x96F0	0x5F79	# <CJK>
-0x96F1	0x7D04	# <CJK>
-0x96F2	0x85AC	# <CJK>
-0x96F3	0x8A33	# <CJK>
-0x96F4	0x8E8D	# <CJK>
-0x96F5	0x9756	# <CJK>
-0x96F6	0x67F3	# <CJK>
-0x96F7	0x85AE	# <CJK>
-0x96F8	0x9453	# <CJK>
-0x96F9	0x6109	# <CJK>
-0x96FA	0x6108	# <CJK>
-0x96FB	0x6CB9	# <CJK>
-0x96FC	0x7652	# <CJK>
-0x9740	0x8AED	# <CJK>
-0x9741	0x8F38	# <CJK>
-0x9742	0x552F	# <CJK>
-0x9743	0x4F51	# <CJK>
-0x9744	0x512A	# <CJK>
-0x9745	0x52C7	# <CJK>
-0x9746	0x53CB	# <CJK>
-0x9747	0x5BA5	# <CJK>
-0x9748	0x5E7D	# <CJK>
-0x9749	0x60A0	# <CJK>
-0x974A	0x6182	# <CJK>
-0x974B	0x63D6	# <CJK>
-0x974C	0x6709	# <CJK>
-0x974D	0x67DA	# <CJK>
-0x974E	0x6E67	# <CJK>
-0x974F	0x6D8C	# <CJK>
-0x9750	0x7336	# <CJK>
-0x9751	0x7337	# <CJK>
-0x9752	0x7531	# <CJK>
-0x9753	0x7950	# <CJK>
-0x9754	0x88D5	# <CJK>
-0x9755	0x8A98	# <CJK>
-0x9756	0x904A	# <CJK>
-0x9757	0x9091	# <CJK>
-0x9758	0x90F5	# <CJK>
-0x9759	0x96C4	# <CJK>
-0x975A	0x878D	# <CJK>
-0x975B	0x5915	# <CJK>
-0x975C	0x4E88	# <CJK>
-0x975D	0x4F59	# <CJK>
-0x975E	0x4E0E	# <CJK>
-0x975F	0x8A89	# <CJK>
-0x9760	0x8F3F	# <CJK>
-0x9761	0x9810	# <CJK>
-0x9762	0x50AD	# <CJK>
-0x9763	0x5E7C	# <CJK>
-0x9764	0x5996	# <CJK>
-0x9765	0x5BB9	# <CJK>
-0x9766	0x5EB8	# <CJK>
-0x9767	0x63DA	# <CJK>
-0x9768	0x63FA	# <CJK>
-0x9769	0x64C1	# <CJK>
-0x976A	0x66DC	# <CJK>
-0x976B	0x694A	# <CJK>
-0x976C	0x69D8	# <CJK>
-0x976D	0x6D0B	# <CJK>
-0x976E	0x6EB6	# <CJK>
-0x976F	0x7194	# <CJK>
-0x9770	0x7528	# <CJK>
-0x9771	0x7AAF	# <CJK>
-0x9772	0x7F8A	# <CJK>
-0x9773	0x8000	# <CJK>
-0x9774	0x8449	# <CJK>
-0x9775	0x84C9	# <CJK>
-0x9776	0x8981	# <CJK>
-0x9777	0x8B21	# <CJK>
-0x9778	0x8E0A	# <CJK>
-0x9779	0x9065	# <CJK>
-0x977A	0x967D	# <CJK>
-0x977B	0x990A	# <CJK>
-0x977C	0x617E	# <CJK>
-0x977D	0x6291	# <CJK>
-0x977E	0x6B32	# <CJK>
-0x9780	0x6C83	# <CJK>
-0x9781	0x6D74	# <CJK>
-0x9782	0x7FCC	# <CJK>
-0x9783	0x7FFC	# <CJK>
-0x9784	0x6DC0	# <CJK>
-0x9785	0x7F85	# <CJK>
-0x9786	0x87BA	# <CJK>
-0x9787	0x88F8	# <CJK>
-0x9788	0x6765	# <CJK>
-0x9789	0x83B1	# <CJK>
-0x978A	0x983C	# <CJK>
-0x978B	0x96F7	# <CJK>
-0x978C	0x6D1B	# <CJK>
-0x978D	0x7D61	# <CJK>
-0x978E	0x843D	# <CJK>
-0x978F	0x916A	# <CJK>
-0x9790	0x4E71	# <CJK>
-0x9791	0x5375	# <CJK>
-0x9792	0x5D50	# <CJK>
-0x9793	0x6B04	# <CJK>
-0x9794	0x6FEB	# <CJK>
-0x9795	0x85CD	# <CJK>
-0x9796	0x862D	# <CJK>
-0x9797	0x89A7	# <CJK>
-0x9798	0x5229	# <CJK>
-0x9799	0x540F	# <CJK>
-0x979A	0x5C65	# <CJK>
-0x979B	0x674E	# <CJK>
-0x979C	0x68A8	# <CJK>
-0x979D	0x7406	# <CJK>
-0x979E	0x7483	# <CJK>
-0x979F	0x75E2	# <CJK>
-0x97A0	0x88CF	# <CJK>
-0x97A1	0x88E1	# <CJK>
-0x97A2	0x91CC	# <CJK>
-0x97A3	0x96E2	# <CJK>
-0x97A4	0x9678	# <CJK>
-0x97A5	0x5F8B	# <CJK>
-0x97A6	0x7387	# <CJK>
-0x97A7	0x7ACB	# <CJK>
-0x97A8	0x844E	# <CJK>
-0x97A9	0x63A0	# <CJK>
-0x97AA	0x7565	# <CJK>
-0x97AB	0x5289	# <CJK>
-0x97AC	0x6D41	# <CJK>
-0x97AD	0x6E9C	# <CJK>
-0x97AE	0x7409	# <CJK>
-0x97AF	0x7559	# <CJK>
-0x97B0	0x786B	# <CJK>
-0x97B1	0x7C92	# <CJK>
-0x97B2	0x9686	# <CJK>
-0x97B3	0x7ADC	# <CJK>
-0x97B4	0x9F8D	# <CJK>
-0x97B5	0x4FB6	# <CJK>
-0x97B6	0x616E	# <CJK>
-0x97B7	0x65C5	# <CJK>
-0x97B8	0x865C	# <CJK>
-0x97B9	0x4E86	# <CJK>
-0x97BA	0x4EAE	# <CJK>
-0x97BB	0x50DA	# <CJK>
-0x97BC	0x4E21	# <CJK>
-0x97BD	0x51CC	# <CJK>
-0x97BE	0x5BEE	# <CJK>
-0x97BF	0x6599	# <CJK>
-0x97C0	0x6881	# <CJK>
-0x97C1	0x6DBC	# <CJK>
-0x97C2	0x731F	# <CJK>
-0x97C3	0x7642	# <CJK>
-0x97C4	0x77AD	# <CJK>
-0x97C5	0x7A1C	# <CJK>
-0x97C6	0x7CE7	# <CJK>
-0x97C7	0x826F	# <CJK>
-0x97C8	0x8AD2	# <CJK>
-0x97C9	0x907C	# <CJK>
-0x97CA	0x91CF	# <CJK>
-0x97CB	0x9675	# <CJK>
-0x97CC	0x9818	# <CJK>
-0x97CD	0x529B	# <CJK>
-0x97CE	0x7DD1	# <CJK>
-0x97CF	0x502B	# <CJK>
-0x97D0	0x5398	# <CJK>
-0x97D1	0x6797	# <CJK>
-0x97D2	0x6DCB	# <CJK>
-0x97D3	0x71D0	# <CJK>
-0x97D4	0x7433	# <CJK>
-0x97D5	0x81E8	# <CJK>
-0x97D6	0x8F2A	# <CJK>
-0x97D7	0x96A3	# <CJK>
-0x97D8	0x9C57	# <CJK>
-0x97D9	0x9E9F	# <CJK>
-0x97DA	0x7460	# <CJK>
-0x97DB	0x5841	# <CJK>
-0x97DC	0x6D99	# <CJK>
-0x97DD	0x7D2F	# <CJK>
-0x97DE	0x985E	# <CJK>
-0x97DF	0x4EE4	# <CJK>
-0x97E0	0x4F36	# <CJK>
-0x97E1	0x4F8B	# <CJK>
-0x97E2	0x51B7	# <CJK>
-0x97E3	0x52B1	# <CJK>
-0x97E4	0x5DBA	# <CJK>
-0x97E5	0x601C	# <CJK>
-0x97E6	0x73B2	# <CJK>
-0x97E7	0x793C	# <CJK>
-0x97E8	0x82D3	# <CJK>
-0x97E9	0x9234	# <CJK>
-0x97EA	0x96B7	# <CJK>
-0x97EB	0x96F6	# <CJK>
-0x97EC	0x970A	# <CJK>
-0x97ED	0x9E97	# <CJK>
-0x97EE	0x9F62	# <CJK>
-0x97EF	0x66A6	# <CJK>
-0x97F0	0x6B74	# <CJK>
-0x97F1	0x5217	# <CJK>
-0x97F2	0x52A3	# <CJK>
-0x97F3	0x70C8	# <CJK>
-0x97F4	0x88C2	# <CJK>
-0x97F5	0x5EC9	# <CJK>
-0x97F6	0x604B	# <CJK>
-0x97F7	0x6190	# <CJK>
-0x97F8	0x6F23	# <CJK>
-0x97F9	0x7149	# <CJK>
-0x97FA	0x7C3E	# <CJK>
-0x97FB	0x7DF4	# <CJK>
-0x97FC	0x806F	# <CJK>
-0x9840	0x84EE	# <CJK>
-0x9841	0x9023	# <CJK>
-0x9842	0x932C	# <CJK>
-0x9843	0x5442	# <CJK>
-0x9844	0x9B6F	# <CJK>
-0x9845	0x6AD3	# <CJK>
-0x9846	0x7089	# <CJK>
-0x9847	0x8CC2	# <CJK>
-0x9848	0x8DEF	# <CJK>
-0x9849	0x9732	# <CJK>
-0x984A	0x52B4	# <CJK>
-0x984B	0x5A41	# <CJK>
-0x984C	0x5ECA	# <CJK>
-0x984D	0x5F04	# <CJK>
-0x984E	0x6717	# <CJK>
-0x984F	0x697C	# <CJK>
-0x9850	0x6994	# <CJK>
-0x9851	0x6D6A	# <CJK>
-0x9852	0x6F0F	# <CJK>
-0x9853	0x7262	# <CJK>
-0x9854	0x72FC	# <CJK>
-0x9855	0x7BED	# <CJK>
-0x9856	0x8001	# <CJK>
-0x9857	0x807E	# <CJK>
-0x9858	0x874B	# <CJK>
-0x9859	0x90CE	# <CJK>
-0x985A	0x516D	# <CJK>
-0x985B	0x9E93	# <CJK>
-0x985C	0x7984	# <CJK>
-0x985D	0x808B	# <CJK>
-0x985E	0x9332	# <CJK>
-0x985F	0x8AD6	# <CJK>
-0x9860	0x502D	# <CJK>
-0x9861	0x548C	# <CJK>
-0x9862	0x8A71	# <CJK>
-0x9863	0x6B6A	# <CJK>
-0x9864	0x8CC4	# <CJK>
-0x9865	0x8107	# <CJK>
-0x9866	0x60D1	# <CJK>
-0x9867	0x67A0	# <CJK>
-0x9868	0x9DF2	# <CJK>
-0x9869	0x4E99	# <CJK>
-0x986A	0x4E98	# <CJK>
-0x986B	0x9C10	# <CJK>
-0x986C	0x8A6B	# <CJK>
-0x986D	0x85C1	# <CJK>
-0x986E	0x8568	# <CJK>
-0x986F	0x6900	# <CJK>
-0x9870	0x6E7E	# <CJK>
-0x9871	0x7897	# <CJK>
-0x9872	0x8155	# <CJK>
-0x989F	0x5F0C	# <CJK>
-0x98A0	0x4E10	# <CJK>
-0x98A1	0x4E15	# <CJK>
-0x98A2	0x4E2A	# <CJK>
-0x98A3	0x4E31	# <CJK>
-0x98A4	0x4E36	# <CJK>
-0x98A5	0x4E3C	# <CJK>
-0x98A6	0x4E3F	# <CJK>
-0x98A7	0x4E42	# <CJK>
-0x98A8	0x4E56	# <CJK>
-0x98A9	0x4E58	# <CJK>
-0x98AA	0x4E82	# <CJK>
-0x98AB	0x4E85	# <CJK>
-0x98AC	0x8C6B	# <CJK>
-0x98AD	0x4E8A	# <CJK>
-0x98AE	0x8212	# <CJK>
-0x98AF	0x5F0D	# <CJK>
-0x98B0	0x4E8E	# <CJK>
-0x98B1	0x4E9E	# <CJK>
-0x98B2	0x4E9F	# <CJK>
-0x98B3	0x4EA0	# <CJK>
-0x98B4	0x4EA2	# <CJK>
-0x98B5	0x4EB0	# <CJK>
-0x98B6	0x4EB3	# <CJK>
-0x98B7	0x4EB6	# <CJK>
-0x98B8	0x4ECE	# <CJK>
-0x98B9	0x4ECD	# <CJK>
-0x98BA	0x4EC4	# <CJK>
-0x98BB	0x4EC6	# <CJK>
-0x98BC	0x4EC2	# <CJK>
-0x98BD	0x4ED7	# <CJK>
-0x98BE	0x4EDE	# <CJK>
-0x98BF	0x4EED	# <CJK>
-0x98C0	0x4EDF	# <CJK>
-0x98C1	0x4EF7	# <CJK>
-0x98C2	0x4F09	# <CJK>
-0x98C3	0x4F5A	# <CJK>
-0x98C4	0x4F30	# <CJK>
-0x98C5	0x4F5B	# <CJK>
-0x98C6	0x4F5D	# <CJK>
-0x98C7	0x4F57	# <CJK>
-0x98C8	0x4F47	# <CJK>
-0x98C9	0x4F76	# <CJK>
-0x98CA	0x4F88	# <CJK>
-0x98CB	0x4F8F	# <CJK>
-0x98CC	0x4F98	# <CJK>
-0x98CD	0x4F7B	# <CJK>
-0x98CE	0x4F69	# <CJK>
-0x98CF	0x4F70	# <CJK>
-0x98D0	0x4F91	# <CJK>
-0x98D1	0x4F6F	# <CJK>
-0x98D2	0x4F86	# <CJK>
-0x98D3	0x4F96	# <CJK>
-0x98D4	0x5118	# <CJK>
-0x98D5	0x4FD4	# <CJK>
-0x98D6	0x4FDF	# <CJK>
-0x98D7	0x4FCE	# <CJK>
-0x98D8	0x4FD8	# <CJK>
-0x98D9	0x4FDB	# <CJK>
-0x98DA	0x4FD1	# <CJK>
-0x98DB	0x4FDA	# <CJK>
-0x98DC	0x4FD0	# <CJK>
-0x98DD	0x4FE4	# <CJK>
-0x98DE	0x4FE5	# <CJK>
-0x98DF	0x501A	# <CJK>
-0x98E0	0x5028	# <CJK>
-0x98E1	0x5014	# <CJK>
-0x98E2	0x502A	# <CJK>
-0x98E3	0x5025	# <CJK>
-0x98E4	0x5005	# <CJK>
-0x98E5	0x4F1C	# <CJK>
-0x98E6	0x4FF6	# <CJK>
-0x98E7	0x5021	# <CJK>
-0x98E8	0x5029	# <CJK>
-0x98E9	0x502C	# <CJK>
-0x98EA	0x4FFE	# <CJK>
-0x98EB	0x4FEF	# <CJK>
-0x98EC	0x5011	# <CJK>
-0x98ED	0x5006	# <CJK>
-0x98EE	0x5043	# <CJK>
-0x98EF	0x5047	# <CJK>
-0x98F0	0x6703	# <CJK>
-0x98F1	0x5055	# <CJK>
-0x98F2	0x5050	# <CJK>
-0x98F3	0x5048	# <CJK>
-0x98F4	0x505A	# <CJK>
-0x98F5	0x5056	# <CJK>
-0x98F6	0x506C	# <CJK>
-0x98F7	0x5078	# <CJK>
-0x98F8	0x5080	# <CJK>
-0x98F9	0x509A	# <CJK>
-0x98FA	0x5085	# <CJK>
-0x98FB	0x50B4	# <CJK>
-0x98FC	0x50B2	# <CJK>
-0x9940	0x50C9	# <CJK>
-0x9941	0x50CA	# <CJK>
-0x9942	0x50B3	# <CJK>
-0x9943	0x50C2	# <CJK>
-0x9944	0x50D6	# <CJK>
-0x9945	0x50DE	# <CJK>
-0x9946	0x50E5	# <CJK>
-0x9947	0x50ED	# <CJK>
-0x9948	0x50E3	# <CJK>
-0x9949	0x50EE	# <CJK>
-0x994A	0x50F9	# <CJK>
-0x994B	0x50F5	# <CJK>
-0x994C	0x5109	# <CJK>
-0x994D	0x5101	# <CJK>
-0x994E	0x5102	# <CJK>
-0x994F	0x5116	# <CJK>
-0x9950	0x5115	# <CJK>
-0x9951	0x5114	# <CJK>
-0x9952	0x511A	# <CJK>
-0x9953	0x5121	# <CJK>
-0x9954	0x513A	# <CJK>
-0x9955	0x5137	# <CJK>
-0x9956	0x513C	# <CJK>
-0x9957	0x513B	# <CJK>
-0x9958	0x513F	# <CJK>
-0x9959	0x5140	# <CJK>
-0x995A	0x5152	# <CJK>
-0x995B	0x514C	# <CJK>
-0x995C	0x5154	# <CJK>
-0x995D	0x5162	# <CJK>
-0x995E	0x7AF8	# <CJK>
-0x995F	0x5169	# <CJK>
-0x9960	0x516A	# <CJK>
-0x9961	0x516E	# <CJK>
-0x9962	0x5180	# <CJK>
-0x9963	0x5182	# <CJK>
-0x9964	0x56D8	# <CJK>
-0x9965	0x518C	# <CJK>
-0x9966	0x5189	# <CJK>
-0x9967	0x518F	# <CJK>
-0x9968	0x5191	# <CJK>
-0x9969	0x5193	# <CJK>
-0x996A	0x5195	# <CJK>
-0x996B	0x5196	# <CJK>
-0x996C	0x51A4	# <CJK>
-0x996D	0x51A6	# <CJK>
-0x996E	0x51A2	# <CJK>
-0x996F	0x51A9	# <CJK>
-0x9970	0x51AA	# <CJK>
-0x9971	0x51AB	# <CJK>
-0x9972	0x51B3	# <CJK>
-0x9973	0x51B1	# <CJK>
-0x9974	0x51B2	# <CJK>
-0x9975	0x51B0	# <CJK>
-0x9976	0x51B5	# <CJK>
-0x9977	0x51BD	# <CJK>
-0x9978	0x51C5	# <CJK>
-0x9979	0x51C9	# <CJK>
-0x997A	0x51DB	# <CJK>
-0x997B	0x51E0	# <CJK>
-0x997C	0x8655	# <CJK>
-0x997D	0x51E9	# <CJK>
-0x997E	0x51ED	# <CJK>
-0x9980	0x51F0	# <CJK>
-0x9981	0x51F5	# <CJK>
-0x9982	0x51FE	# <CJK>
-0x9983	0x5204	# <CJK>
-0x9984	0x520B	# <CJK>
-0x9985	0x5214	# <CJK>
-0x9986	0x520E	# <CJK>
-0x9987	0x5227	# <CJK>
-0x9988	0x522A	# <CJK>
-0x9989	0x522E	# <CJK>
-0x998A	0x5233	# <CJK>
-0x998B	0x5239	# <CJK>
-0x998C	0x524F	# <CJK>
-0x998D	0x5244	# <CJK>
-0x998E	0x524B	# <CJK>
-0x998F	0x524C	# <CJK>
-0x9990	0x525E	# <CJK>
-0x9991	0x5254	# <CJK>
-0x9992	0x526A	# <CJK>
-0x9993	0x5274	# <CJK>
-0x9994	0x5269	# <CJK>
-0x9995	0x5273	# <CJK>
-0x9996	0x527F	# <CJK>
-0x9997	0x527D	# <CJK>
-0x9998	0x528D	# <CJK>
-0x9999	0x5294	# <CJK>
-0x999A	0x5292	# <CJK>
-0x999B	0x5271	# <CJK>
-0x999C	0x5288	# <CJK>
-0x999D	0x5291	# <CJK>
-0x999E	0x8FA8	# <CJK>
-0x999F	0x8FA7	# <CJK>
-0x99A0	0x52AC	# <CJK>
-0x99A1	0x52AD	# <CJK>
-0x99A2	0x52BC	# <CJK>
-0x99A3	0x52B5	# <CJK>
-0x99A4	0x52C1	# <CJK>
-0x99A5	0x52CD	# <CJK>
-0x99A6	0x52D7	# <CJK>
-0x99A7	0x52DE	# <CJK>
-0x99A8	0x52E3	# <CJK>
-0x99A9	0x52E6	# <CJK>
-0x99AA	0x98ED	# <CJK>
-0x99AB	0x52E0	# <CJK>
-0x99AC	0x52F3	# <CJK>
-0x99AD	0x52F5	# <CJK>
-0x99AE	0x52F8	# <CJK>
-0x99AF	0x52F9	# <CJK>
-0x99B0	0x5306	# <CJK>
-0x99B1	0x5308	# <CJK>
-0x99B2	0x7538	# <CJK>
-0x99B3	0x530D	# <CJK>
-0x99B4	0x5310	# <CJK>
-0x99B5	0x530F	# <CJK>
-0x99B6	0x5315	# <CJK>
-0x99B7	0x531A	# <CJK>
-0x99B8	0x5323	# <CJK>
-0x99B9	0x532F	# <CJK>
-0x99BA	0x5331	# <CJK>
-0x99BB	0x5333	# <CJK>
-0x99BC	0x5338	# <CJK>
-0x99BD	0x5340	# <CJK>
-0x99BE	0x5346	# <CJK>
-0x99BF	0x5345	# <CJK>
-0x99C0	0x4E17	# <CJK>
-0x99C1	0x5349	# <CJK>
-0x99C2	0x534D	# <CJK>
-0x99C3	0x51D6	# <CJK>
-0x99C4	0x535E	# <CJK>
-0x99C5	0x5369	# <CJK>
-0x99C6	0x536E	# <CJK>
-0x99C7	0x5918	# <CJK>
-0x99C8	0x537B	# <CJK>
-0x99C9	0x5377	# <CJK>
-0x99CA	0x5382	# <CJK>
-0x99CB	0x5396	# <CJK>
-0x99CC	0x53A0	# <CJK>
-0x99CD	0x53A6	# <CJK>
-0x99CE	0x53A5	# <CJK>
-0x99CF	0x53AE	# <CJK>
-0x99D0	0x53B0	# <CJK>
-0x99D1	0x53B6	# <CJK>
-0x99D2	0x53C3	# <CJK>
-0x99D3	0x7C12	# <CJK>
-0x99D4	0x96D9	# <CJK>
-0x99D5	0x53DF	# <CJK>
-0x99D6	0x66FC	# <CJK>
-0x99D7	0x71EE	# <CJK>
-0x99D8	0x53EE	# <CJK>
-0x99D9	0x53E8	# <CJK>
-0x99DA	0x53ED	# <CJK>
-0x99DB	0x53FA	# <CJK>
-0x99DC	0x5401	# <CJK>
-0x99DD	0x543D	# <CJK>
-0x99DE	0x5440	# <CJK>
-0x99DF	0x542C	# <CJK>
-0x99E0	0x542D	# <CJK>
-0x99E1	0x543C	# <CJK>
-0x99E2	0x542E	# <CJK>
-0x99E3	0x5436	# <CJK>
-0x99E4	0x5429	# <CJK>
-0x99E5	0x541D	# <CJK>
-0x99E6	0x544E	# <CJK>
-0x99E7	0x548F	# <CJK>
-0x99E8	0x5475	# <CJK>
-0x99E9	0x548E	# <CJK>
-0x99EA	0x545F	# <CJK>
-0x99EB	0x5471	# <CJK>
-0x99EC	0x5477	# <CJK>
-0x99ED	0x5470	# <CJK>
-0x99EE	0x5492	# <CJK>
-0x99EF	0x547B	# <CJK>
-0x99F0	0x5480	# <CJK>
-0x99F1	0x5476	# <CJK>
-0x99F2	0x5484	# <CJK>
-0x99F3	0x5490	# <CJK>
-0x99F4	0x5486	# <CJK>
-0x99F5	0x54C7	# <CJK>
-0x99F6	0x54A2	# <CJK>
-0x99F7	0x54B8	# <CJK>
-0x99F8	0x54A5	# <CJK>
-0x99F9	0x54AC	# <CJK>
-0x99FA	0x54C4	# <CJK>
-0x99FB	0x54C8	# <CJK>
-0x99FC	0x54A8	# <CJK>
-0x9A40	0x54AB	# <CJK>
-0x9A41	0x54C2	# <CJK>
-0x9A42	0x54A4	# <CJK>
-0x9A43	0x54BE	# <CJK>
-0x9A44	0x54BC	# <CJK>
-0x9A45	0x54D8	# <CJK>
-0x9A46	0x54E5	# <CJK>
-0x9A47	0x54E6	# <CJK>
-0x9A48	0x550F	# <CJK>
-0x9A49	0x5514	# <CJK>
-0x9A4A	0x54FD	# <CJK>
-0x9A4B	0x54EE	# <CJK>
-0x9A4C	0x54ED	# <CJK>
-0x9A4D	0x54FA	# <CJK>
-0x9A4E	0x54E2	# <CJK>
-0x9A4F	0x5539	# <CJK>
-0x9A50	0x5540	# <CJK>
-0x9A51	0x5563	# <CJK>
-0x9A52	0x554C	# <CJK>
-0x9A53	0x552E	# <CJK>
-0x9A54	0x555C	# <CJK>
-0x9A55	0x5545	# <CJK>
-0x9A56	0x5556	# <CJK>
-0x9A57	0x5557	# <CJK>
-0x9A58	0x5538	# <CJK>
-0x9A59	0x5533	# <CJK>
-0x9A5A	0x555D	# <CJK>
-0x9A5B	0x5599	# <CJK>
-0x9A5C	0x5580	# <CJK>
-0x9A5D	0x54AF	# <CJK>
-0x9A5E	0x558A	# <CJK>
-0x9A5F	0x559F	# <CJK>
-0x9A60	0x557B	# <CJK>
-0x9A61	0x557E	# <CJK>
-0x9A62	0x5598	# <CJK>
-0x9A63	0x559E	# <CJK>
-0x9A64	0x55AE	# <CJK>
-0x9A65	0x557C	# <CJK>
-0x9A66	0x5583	# <CJK>
-0x9A67	0x55A9	# <CJK>
-0x9A68	0x5587	# <CJK>
-0x9A69	0x55A8	# <CJK>
-0x9A6A	0x55DA	# <CJK>
-0x9A6B	0x55C5	# <CJK>
-0x9A6C	0x55DF	# <CJK>
-0x9A6D	0x55C4	# <CJK>
-0x9A6E	0x55DC	# <CJK>
-0x9A6F	0x55E4	# <CJK>
-0x9A70	0x55D4	# <CJK>
-0x9A71	0x5614	# <CJK>
-0x9A72	0x55F7	# <CJK>
-0x9A73	0x5616	# <CJK>
-0x9A74	0x55FE	# <CJK>
-0x9A75	0x55FD	# <CJK>
-0x9A76	0x561B	# <CJK>
-0x9A77	0x55F9	# <CJK>
-0x9A78	0x564E	# <CJK>
-0x9A79	0x5650	# <CJK>
-0x9A7A	0x71DF	# <CJK>
-0x9A7B	0x5634	# <CJK>
-0x9A7C	0x5636	# <CJK>
-0x9A7D	0x5632	# <CJK>
-0x9A7E	0x5638	# <CJK>
-0x9A80	0x566B	# <CJK>
-0x9A81	0x5664	# <CJK>
-0x9A82	0x562F	# <CJK>
-0x9A83	0x566C	# <CJK>
-0x9A84	0x566A	# <CJK>
-0x9A85	0x5686	# <CJK>
-0x9A86	0x5680	# <CJK>
-0x9A87	0x568A	# <CJK>
-0x9A88	0x56A0	# <CJK>
-0x9A89	0x5694	# <CJK>
-0x9A8A	0x568F	# <CJK>
-0x9A8B	0x56A5	# <CJK>
-0x9A8C	0x56AE	# <CJK>
-0x9A8D	0x56B6	# <CJK>
-0x9A8E	0x56B4	# <CJK>
-0x9A8F	0x56C2	# <CJK>
-0x9A90	0x56BC	# <CJK>
-0x9A91	0x56C1	# <CJK>
-0x9A92	0x56C3	# <CJK>
-0x9A93	0x56C0	# <CJK>
-0x9A94	0x56C8	# <CJK>
-0x9A95	0x56CE	# <CJK>
-0x9A96	0x56D1	# <CJK>
-0x9A97	0x56D3	# <CJK>
-0x9A98	0x56D7	# <CJK>
-0x9A99	0x56EE	# <CJK>
-0x9A9A	0x56F9	# <CJK>
-0x9A9B	0x5700	# <CJK>
-0x9A9C	0x56FF	# <CJK>
-0x9A9D	0x5704	# <CJK>
-0x9A9E	0x5709	# <CJK>
-0x9A9F	0x5708	# <CJK>
-0x9AA0	0x570B	# <CJK>
-0x9AA1	0x570D	# <CJK>
-0x9AA2	0x5713	# <CJK>
-0x9AA3	0x5718	# <CJK>
-0x9AA4	0x5716	# <CJK>
-0x9AA5	0x55C7	# <CJK>
-0x9AA6	0x571C	# <CJK>
-0x9AA7	0x5726	# <CJK>
-0x9AA8	0x5737	# <CJK>
-0x9AA9	0x5738	# <CJK>
-0x9AAA	0x574E	# <CJK>
-0x9AAB	0x573B	# <CJK>
-0x9AAC	0x5740	# <CJK>
-0x9AAD	0x574F	# <CJK>
-0x9AAE	0x5769	# <CJK>
-0x9AAF	0x57C0	# <CJK>
-0x9AB0	0x5788	# <CJK>
-0x9AB1	0x5761	# <CJK>
-0x9AB2	0x577F	# <CJK>
-0x9AB3	0x5789	# <CJK>
-0x9AB4	0x5793	# <CJK>
-0x9AB5	0x57A0	# <CJK>
-0x9AB6	0x57B3	# <CJK>
-0x9AB7	0x57A4	# <CJK>
-0x9AB8	0x57AA	# <CJK>
-0x9AB9	0x57B0	# <CJK>
-0x9ABA	0x57C3	# <CJK>
-0x9ABB	0x57C6	# <CJK>
-0x9ABC	0x57D4	# <CJK>
-0x9ABD	0x57D2	# <CJK>
-0x9ABE	0x57D3	# <CJK>
-0x9ABF	0x580A	# <CJK>
-0x9AC0	0x57D6	# <CJK>
-0x9AC1	0x57E3	# <CJK>
-0x9AC2	0x580B	# <CJK>
-0x9AC3	0x5819	# <CJK>
-0x9AC4	0x581D	# <CJK>
-0x9AC5	0x5872	# <CJK>
-0x9AC6	0x5821	# <CJK>
-0x9AC7	0x5862	# <CJK>
-0x9AC8	0x584B	# <CJK>
-0x9AC9	0x5870	# <CJK>
-0x9ACA	0x6BC0	# <CJK>
-0x9ACB	0x5852	# <CJK>
-0x9ACC	0x583D	# <CJK>
-0x9ACD	0x5879	# <CJK>
-0x9ACE	0x5885	# <CJK>
-0x9ACF	0x58B9	# <CJK>
-0x9AD0	0x589F	# <CJK>
-0x9AD1	0x58AB	# <CJK>
-0x9AD2	0x58BA	# <CJK>
-0x9AD3	0x58DE	# <CJK>
-0x9AD4	0x58BB	# <CJK>
-0x9AD5	0x58B8	# <CJK>
-0x9AD6	0x58AE	# <CJK>
-0x9AD7	0x58C5	# <CJK>
-0x9AD8	0x58D3	# <CJK>
-0x9AD9	0x58D1	# <CJK>
-0x9ADA	0x58D7	# <CJK>
-0x9ADB	0x58D9	# <CJK>
-0x9ADC	0x58D8	# <CJK>
-0x9ADD	0x58E5	# <CJK>
-0x9ADE	0x58DC	# <CJK>
-0x9ADF	0x58E4	# <CJK>
-0x9AE0	0x58DF	# <CJK>
-0x9AE1	0x58EF	# <CJK>
-0x9AE2	0x58FA	# <CJK>
-0x9AE3	0x58F9	# <CJK>
-0x9AE4	0x58FB	# <CJK>
-0x9AE5	0x58FC	# <CJK>
-0x9AE6	0x58FD	# <CJK>
-0x9AE7	0x5902	# <CJK>
-0x9AE8	0x590A	# <CJK>
-0x9AE9	0x5910	# <CJK>
-0x9AEA	0x591B	# <CJK>
-0x9AEB	0x68A6	# <CJK>
-0x9AEC	0x5925	# <CJK>
-0x9AED	0x592C	# <CJK>
-0x9AEE	0x592D	# <CJK>
-0x9AEF	0x5932	# <CJK>
-0x9AF0	0x5938	# <CJK>
-0x9AF1	0x593E	# <CJK>
-0x9AF2	0x7AD2	# <CJK>
-0x9AF3	0x5955	# <CJK>
-0x9AF4	0x5950	# <CJK>
-0x9AF5	0x594E	# <CJK>
-0x9AF6	0x595A	# <CJK>
-0x9AF7	0x5958	# <CJK>
-0x9AF8	0x5962	# <CJK>
-0x9AF9	0x5960	# <CJK>
-0x9AFA	0x5967	# <CJK>
-0x9AFB	0x596C	# <CJK>
-0x9AFC	0x5969	# <CJK>
-0x9B40	0x5978	# <CJK>
-0x9B41	0x5981	# <CJK>
-0x9B42	0x599D	# <CJK>
-0x9B43	0x4F5E	# <CJK>
-0x9B44	0x4FAB	# <CJK>
-0x9B45	0x59A3	# <CJK>
-0x9B46	0x59B2	# <CJK>
-0x9B47	0x59C6	# <CJK>
-0x9B48	0x59E8	# <CJK>
-0x9B49	0x59DC	# <CJK>
-0x9B4A	0x598D	# <CJK>
-0x9B4B	0x59D9	# <CJK>
-0x9B4C	0x59DA	# <CJK>
-0x9B4D	0x5A25	# <CJK>
-0x9B4E	0x5A1F	# <CJK>
-0x9B4F	0x5A11	# <CJK>
-0x9B50	0x5A1C	# <CJK>
-0x9B51	0x5A09	# <CJK>
-0x9B52	0x5A1A	# <CJK>
-0x9B53	0x5A40	# <CJK>
-0x9B54	0x5A6C	# <CJK>
-0x9B55	0x5A49	# <CJK>
-0x9B56	0x5A35	# <CJK>
-0x9B57	0x5A36	# <CJK>
-0x9B58	0x5A62	# <CJK>
-0x9B59	0x5A6A	# <CJK>
-0x9B5A	0x5A9A	# <CJK>
-0x9B5B	0x5ABC	# <CJK>
-0x9B5C	0x5ABE	# <CJK>
-0x9B5D	0x5ACB	# <CJK>
-0x9B5E	0x5AC2	# <CJK>
-0x9B5F	0x5ABD	# <CJK>
-0x9B60	0x5AE3	# <CJK>
-0x9B61	0x5AD7	# <CJK>
-0x9B62	0x5AE6	# <CJK>
-0x9B63	0x5AE9	# <CJK>
-0x9B64	0x5AD6	# <CJK>
-0x9B65	0x5AFA	# <CJK>
-0x9B66	0x5AFB	# <CJK>
-0x9B67	0x5B0C	# <CJK>
-0x9B68	0x5B0B	# <CJK>
-0x9B69	0x5B16	# <CJK>
-0x9B6A	0x5B32	# <CJK>
-0x9B6B	0x5AD0	# <CJK>
-0x9B6C	0x5B2A	# <CJK>
-0x9B6D	0x5B36	# <CJK>
-0x9B6E	0x5B3E	# <CJK>
-0x9B6F	0x5B43	# <CJK>
-0x9B70	0x5B45	# <CJK>
-0x9B71	0x5B40	# <CJK>
-0x9B72	0x5B51	# <CJK>
-0x9B73	0x5B55	# <CJK>
-0x9B74	0x5B5A	# <CJK>
-0x9B75	0x5B5B	# <CJK>
-0x9B76	0x5B65	# <CJK>
-0x9B77	0x5B69	# <CJK>
-0x9B78	0x5B70	# <CJK>
-0x9B79	0x5B73	# <CJK>
-0x9B7A	0x5B75	# <CJK>
-0x9B7B	0x5B78	# <CJK>
-0x9B7C	0x6588	# <CJK>
-0x9B7D	0x5B7A	# <CJK>
-0x9B7E	0x5B80	# <CJK>
-0x9B80	0x5B83	# <CJK>
-0x9B81	0x5BA6	# <CJK>
-0x9B82	0x5BB8	# <CJK>
-0x9B83	0x5BC3	# <CJK>
-0x9B84	0x5BC7	# <CJK>
-0x9B85	0x5BC9	# <CJK>
-0x9B86	0x5BD4	# <CJK>
-0x9B87	0x5BD0	# <CJK>
-0x9B88	0x5BE4	# <CJK>
-0x9B89	0x5BE6	# <CJK>
-0x9B8A	0x5BE2	# <CJK>
-0x9B8B	0x5BDE	# <CJK>
-0x9B8C	0x5BE5	# <CJK>
-0x9B8D	0x5BEB	# <CJK>
-0x9B8E	0x5BF0	# <CJK>
-0x9B8F	0x5BF6	# <CJK>
-0x9B90	0x5BF3	# <CJK>
-0x9B91	0x5C05	# <CJK>
-0x9B92	0x5C07	# <CJK>
-0x9B93	0x5C08	# <CJK>
-0x9B94	0x5C0D	# <CJK>
-0x9B95	0x5C13	# <CJK>
-0x9B96	0x5C20	# <CJK>
-0x9B97	0x5C22	# <CJK>
-0x9B98	0x5C28	# <CJK>
-0x9B99	0x5C38	# <CJK>
-0x9B9A	0x5C39	# <CJK>
-0x9B9B	0x5C41	# <CJK>
-0x9B9C	0x5C46	# <CJK>
-0x9B9D	0x5C4E	# <CJK>
-0x9B9E	0x5C53	# <CJK>
-0x9B9F	0x5C50	# <CJK>
-0x9BA0	0x5C4F	# <CJK>
-0x9BA1	0x5B71	# <CJK>
-0x9BA2	0x5C6C	# <CJK>
-0x9BA3	0x5C6E	# <CJK>
-0x9BA4	0x4E62	# <CJK>
-0x9BA5	0x5C76	# <CJK>
-0x9BA6	0x5C79	# <CJK>
-0x9BA7	0x5C8C	# <CJK>
-0x9BA8	0x5C91	# <CJK>
-0x9BA9	0x5C94	# <CJK>
-0x9BAA	0x599B	# <CJK>
-0x9BAB	0x5CAB	# <CJK>
-0x9BAC	0x5CBB	# <CJK>
-0x9BAD	0x5CB6	# <CJK>
-0x9BAE	0x5CBC	# <CJK>
-0x9BAF	0x5CB7	# <CJK>
-0x9BB0	0x5CC5	# <CJK>
-0x9BB1	0x5CBE	# <CJK>
-0x9BB2	0x5CC7	# <CJK>
-0x9BB3	0x5CD9	# <CJK>
-0x9BB4	0x5CE9	# <CJK>
-0x9BB5	0x5CFD	# <CJK>
-0x9BB6	0x5CFA	# <CJK>
-0x9BB7	0x5CED	# <CJK>
-0x9BB8	0x5D8C	# <CJK>
-0x9BB9	0x5CEA	# <CJK>
-0x9BBA	0x5D0B	# <CJK>
-0x9BBB	0x5D15	# <CJK>
-0x9BBC	0x5D17	# <CJK>
-0x9BBD	0x5D5C	# <CJK>
-0x9BBE	0x5D1F	# <CJK>
-0x9BBF	0x5D1B	# <CJK>
-0x9BC0	0x5D11	# <CJK>
-0x9BC1	0x5D14	# <CJK>
-0x9BC2	0x5D22	# <CJK>
-0x9BC3	0x5D1A	# <CJK>
-0x9BC4	0x5D19	# <CJK>
-0x9BC5	0x5D18	# <CJK>
-0x9BC6	0x5D4C	# <CJK>
-0x9BC7	0x5D52	# <CJK>
-0x9BC8	0x5D4E	# <CJK>
-0x9BC9	0x5D4B	# <CJK>
-0x9BCA	0x5D6C	# <CJK>
-0x9BCB	0x5D73	# <CJK>
-0x9BCC	0x5D76	# <CJK>
-0x9BCD	0x5D87	# <CJK>
-0x9BCE	0x5D84	# <CJK>
-0x9BCF	0x5D82	# <CJK>
-0x9BD0	0x5DA2	# <CJK>
-0x9BD1	0x5D9D	# <CJK>
-0x9BD2	0x5DAC	# <CJK>
-0x9BD3	0x5DAE	# <CJK>
-0x9BD4	0x5DBD	# <CJK>
-0x9BD5	0x5D90	# <CJK>
-0x9BD6	0x5DB7	# <CJK>
-0x9BD7	0x5DBC	# <CJK>
-0x9BD8	0x5DC9	# <CJK>
-0x9BD9	0x5DCD	# <CJK>
-0x9BDA	0x5DD3	# <CJK>
-0x9BDB	0x5DD2	# <CJK>
-0x9BDC	0x5DD6	# <CJK>
-0x9BDD	0x5DDB	# <CJK>
-0x9BDE	0x5DEB	# <CJK>
-0x9BDF	0x5DF2	# <CJK>
-0x9BE0	0x5DF5	# <CJK>
-0x9BE1	0x5E0B	# <CJK>
-0x9BE2	0x5E1A	# <CJK>
-0x9BE3	0x5E19	# <CJK>
-0x9BE4	0x5E11	# <CJK>
-0x9BE5	0x5E1B	# <CJK>
-0x9BE6	0x5E36	# <CJK>
-0x9BE7	0x5E37	# <CJK>
-0x9BE8	0x5E44	# <CJK>
-0x9BE9	0x5E43	# <CJK>
-0x9BEA	0x5E40	# <CJK>
-0x9BEB	0x5E4E	# <CJK>
-0x9BEC	0x5E57	# <CJK>
-0x9BED	0x5E54	# <CJK>
-0x9BEE	0x5E5F	# <CJK>
-0x9BEF	0x5E62	# <CJK>
-0x9BF0	0x5E64	# <CJK>
-0x9BF1	0x5E47	# <CJK>
-0x9BF2	0x5E75	# <CJK>
-0x9BF3	0x5E76	# <CJK>
-0x9BF4	0x5E7A	# <CJK>
-0x9BF5	0x9EBC	# <CJK>
-0x9BF6	0x5E7F	# <CJK>
-0x9BF7	0x5EA0	# <CJK>
-0x9BF8	0x5EC1	# <CJK>
-0x9BF9	0x5EC2	# <CJK>
-0x9BFA	0x5EC8	# <CJK>
-0x9BFB	0x5ED0	# <CJK>
-0x9BFC	0x5ECF	# <CJK>
-0x9C40	0x5ED6	# <CJK>
-0x9C41	0x5EE3	# <CJK>
-0x9C42	0x5EDD	# <CJK>
-0x9C43	0x5EDA	# <CJK>
-0x9C44	0x5EDB	# <CJK>
-0x9C45	0x5EE2	# <CJK>
-0x9C46	0x5EE1	# <CJK>
-0x9C47	0x5EE8	# <CJK>
-0x9C48	0x5EE9	# <CJK>
-0x9C49	0x5EEC	# <CJK>
-0x9C4A	0x5EF1	# <CJK>
-0x9C4B	0x5EF3	# <CJK>
-0x9C4C	0x5EF0	# <CJK>
-0x9C4D	0x5EF4	# <CJK>
-0x9C4E	0x5EF8	# <CJK>
-0x9C4F	0x5EFE	# <CJK>
-0x9C50	0x5F03	# <CJK>
-0x9C51	0x5F09	# <CJK>
-0x9C52	0x5F5D	# <CJK>
-0x9C53	0x5F5C	# <CJK>
-0x9C54	0x5F0B	# <CJK>
-0x9C55	0x5F11	# <CJK>
-0x9C56	0x5F16	# <CJK>
-0x9C57	0x5F29	# <CJK>
-0x9C58	0x5F2D	# <CJK>
-0x9C59	0x5F38	# <CJK>
-0x9C5A	0x5F41	# <CJK>
-0x9C5B	0x5F48	# <CJK>
-0x9C5C	0x5F4C	# <CJK>
-0x9C5D	0x5F4E	# <CJK>
-0x9C5E	0x5F2F	# <CJK>
-0x9C5F	0x5F51	# <CJK>
-0x9C60	0x5F56	# <CJK>
-0x9C61	0x5F57	# <CJK>
-0x9C62	0x5F59	# <CJK>
-0x9C63	0x5F61	# <CJK>
-0x9C64	0x5F6D	# <CJK>
-0x9C65	0x5F73	# <CJK>
-0x9C66	0x5F77	# <CJK>
-0x9C67	0x5F83	# <CJK>
-0x9C68	0x5F82	# <CJK>
-0x9C69	0x5F7F	# <CJK>
-0x9C6A	0x5F8A	# <CJK>
-0x9C6B	0x5F88	# <CJK>
-0x9C6C	0x5F91	# <CJK>
-0x9C6D	0x5F87	# <CJK>
-0x9C6E	0x5F9E	# <CJK>
-0x9C6F	0x5F99	# <CJK>
-0x9C70	0x5F98	# <CJK>
-0x9C71	0x5FA0	# <CJK>
-0x9C72	0x5FA8	# <CJK>
-0x9C73	0x5FAD	# <CJK>
-0x9C74	0x5FBC	# <CJK>
-0x9C75	0x5FD6	# <CJK>
-0x9C76	0x5FFB	# <CJK>
-0x9C77	0x5FE4	# <CJK>
-0x9C78	0x5FF8	# <CJK>
-0x9C79	0x5FF1	# <CJK>
-0x9C7A	0x5FDD	# <CJK>
-0x9C7B	0x60B3	# <CJK>
-0x9C7C	0x5FFF	# <CJK>
-0x9C7D	0x6021	# <CJK>
-0x9C7E	0x6060	# <CJK>
-0x9C80	0x6019	# <CJK>
-0x9C81	0x6010	# <CJK>
-0x9C82	0x6029	# <CJK>
-0x9C83	0x600E	# <CJK>
-0x9C84	0x6031	# <CJK>
-0x9C85	0x601B	# <CJK>
-0x9C86	0x6015	# <CJK>
-0x9C87	0x602B	# <CJK>
-0x9C88	0x6026	# <CJK>
-0x9C89	0x600F	# <CJK>
-0x9C8A	0x603A	# <CJK>
-0x9C8B	0x605A	# <CJK>
-0x9C8C	0x6041	# <CJK>
-0x9C8D	0x606A	# <CJK>
-0x9C8E	0x6077	# <CJK>
-0x9C8F	0x605F	# <CJK>
-0x9C90	0x604A	# <CJK>
-0x9C91	0x6046	# <CJK>
-0x9C92	0x604D	# <CJK>
-0x9C93	0x6063	# <CJK>
-0x9C94	0x6043	# <CJK>
-0x9C95	0x6064	# <CJK>
-0x9C96	0x6042	# <CJK>
-0x9C97	0x606C	# <CJK>
-0x9C98	0x606B	# <CJK>
-0x9C99	0x6059	# <CJK>
-0x9C9A	0x6081	# <CJK>
-0x9C9B	0x608D	# <CJK>
-0x9C9C	0x60E7	# <CJK>
-0x9C9D	0x6083	# <CJK>
-0x9C9E	0x609A	# <CJK>
-0x9C9F	0x6084	# <CJK>
-0x9CA0	0x609B	# <CJK>
-0x9CA1	0x6096	# <CJK>
-0x9CA2	0x6097	# <CJK>
-0x9CA3	0x6092	# <CJK>
-0x9CA4	0x60A7	# <CJK>
-0x9CA5	0x608B	# <CJK>
-0x9CA6	0x60E1	# <CJK>
-0x9CA7	0x60B8	# <CJK>
-0x9CA8	0x60E0	# <CJK>
-0x9CA9	0x60D3	# <CJK>
-0x9CAA	0x60B4	# <CJK>
-0x9CAB	0x5FF0	# <CJK>
-0x9CAC	0x60BD	# <CJK>
-0x9CAD	0x60C6	# <CJK>
-0x9CAE	0x60B5	# <CJK>
-0x9CAF	0x60D8	# <CJK>
-0x9CB0	0x614D	# <CJK>
-0x9CB1	0x6115	# <CJK>
-0x9CB2	0x6106	# <CJK>
-0x9CB3	0x60F6	# <CJK>
-0x9CB4	0x60F7	# <CJK>
-0x9CB5	0x6100	# <CJK>
-0x9CB6	0x60F4	# <CJK>
-0x9CB7	0x60FA	# <CJK>
-0x9CB8	0x6103	# <CJK>
-0x9CB9	0x6121	# <CJK>
-0x9CBA	0x60FB	# <CJK>
-0x9CBB	0x60F1	# <CJK>
-0x9CBC	0x610D	# <CJK>
-0x9CBD	0x610E	# <CJK>
-0x9CBE	0x6147	# <CJK>
-0x9CBF	0x613E	# <CJK>
-0x9CC0	0x6128	# <CJK>
-0x9CC1	0x6127	# <CJK>
-0x9CC2	0x614A	# <CJK>
-0x9CC3	0x613F	# <CJK>
-0x9CC4	0x613C	# <CJK>
-0x9CC5	0x612C	# <CJK>
-0x9CC6	0x6134	# <CJK>
-0x9CC7	0x613D	# <CJK>
-0x9CC8	0x6142	# <CJK>
-0x9CC9	0x6144	# <CJK>
-0x9CCA	0x6173	# <CJK>
-0x9CCB	0x6177	# <CJK>
-0x9CCC	0x6158	# <CJK>
-0x9CCD	0x6159	# <CJK>
-0x9CCE	0x615A	# <CJK>
-0x9CCF	0x616B	# <CJK>
-0x9CD0	0x6174	# <CJK>
-0x9CD1	0x616F	# <CJK>
-0x9CD2	0x6165	# <CJK>
-0x9CD3	0x6171	# <CJK>
-0x9CD4	0x615F	# <CJK>
-0x9CD5	0x615D	# <CJK>
-0x9CD6	0x6153	# <CJK>
-0x9CD7	0x6175	# <CJK>
-0x9CD8	0x6199	# <CJK>
-0x9CD9	0x6196	# <CJK>
-0x9CDA	0x6187	# <CJK>
-0x9CDB	0x61AC	# <CJK>
-0x9CDC	0x6194	# <CJK>
-0x9CDD	0x619A	# <CJK>
-0x9CDE	0x618A	# <CJK>
-0x9CDF	0x6191	# <CJK>
-0x9CE0	0x61AB	# <CJK>
-0x9CE1	0x61AE	# <CJK>
-0x9CE2	0x61CC	# <CJK>
-0x9CE3	0x61CA	# <CJK>
-0x9CE4	0x61C9	# <CJK>
-0x9CE5	0x61F7	# <CJK>
-0x9CE6	0x61C8	# <CJK>
-0x9CE7	0x61C3	# <CJK>
-0x9CE8	0x61C6	# <CJK>
-0x9CE9	0x61BA	# <CJK>
-0x9CEA	0x61CB	# <CJK>
-0x9CEB	0x7F79	# <CJK>
-0x9CEC	0x61CD	# <CJK>
-0x9CED	0x61E6	# <CJK>
-0x9CEE	0x61E3	# <CJK>
-0x9CEF	0x61F6	# <CJK>
-0x9CF0	0x61FA	# <CJK>
-0x9CF1	0x61F4	# <CJK>
-0x9CF2	0x61FF	# <CJK>
-0x9CF3	0x61FD	# <CJK>
-0x9CF4	0x61FC	# <CJK>
-0x9CF5	0x61FE	# <CJK>
-0x9CF6	0x6200	# <CJK>
-0x9CF7	0x6208	# <CJK>
-0x9CF8	0x6209	# <CJK>
-0x9CF9	0x620D	# <CJK>
-0x9CFA	0x620C	# <CJK>
-0x9CFB	0x6214	# <CJK>
-0x9CFC	0x621B	# <CJK>
-0x9D40	0x621E	# <CJK>
-0x9D41	0x6221	# <CJK>
-0x9D42	0x622A	# <CJK>
-0x9D43	0x622E	# <CJK>
-0x9D44	0x6230	# <CJK>
-0x9D45	0x6232	# <CJK>
-0x9D46	0x6233	# <CJK>
-0x9D47	0x6241	# <CJK>
-0x9D48	0x624E	# <CJK>
-0x9D49	0x625E	# <CJK>
-0x9D4A	0x6263	# <CJK>
-0x9D4B	0x625B	# <CJK>
-0x9D4C	0x6260	# <CJK>
-0x9D4D	0x6268	# <CJK>
-0x9D4E	0x627C	# <CJK>
-0x9D4F	0x6282	# <CJK>
-0x9D50	0x6289	# <CJK>
-0x9D51	0x627E	# <CJK>
-0x9D52	0x6292	# <CJK>
-0x9D53	0x6293	# <CJK>
-0x9D54	0x6296	# <CJK>
-0x9D55	0x62D4	# <CJK>
-0x9D56	0x6283	# <CJK>
-0x9D57	0x6294	# <CJK>
-0x9D58	0x62D7	# <CJK>
-0x9D59	0x62D1	# <CJK>
-0x9D5A	0x62BB	# <CJK>
-0x9D5B	0x62CF	# <CJK>
-0x9D5C	0x62FF	# <CJK>
-0x9D5D	0x62C6	# <CJK>
-0x9D5E	0x64D4	# <CJK>
-0x9D5F	0x62C8	# <CJK>
-0x9D60	0x62DC	# <CJK>
-0x9D61	0x62CC	# <CJK>
-0x9D62	0x62CA	# <CJK>
-0x9D63	0x62C2	# <CJK>
-0x9D64	0x62C7	# <CJK>
-0x9D65	0x629B	# <CJK>
-0x9D66	0x62C9	# <CJK>
-0x9D67	0x630C	# <CJK>
-0x9D68	0x62EE	# <CJK>
-0x9D69	0x62F1	# <CJK>
-0x9D6A	0x6327	# <CJK>
-0x9D6B	0x6302	# <CJK>
-0x9D6C	0x6308	# <CJK>
-0x9D6D	0x62EF	# <CJK>
-0x9D6E	0x62F5	# <CJK>
-0x9D6F	0x6350	# <CJK>
-0x9D70	0x633E	# <CJK>
-0x9D71	0x634D	# <CJK>
-0x9D72	0x641C	# <CJK>
-0x9D73	0x634F	# <CJK>
-0x9D74	0x6396	# <CJK>
-0x9D75	0x638E	# <CJK>
-0x9D76	0x6380	# <CJK>
-0x9D77	0x63AB	# <CJK>
-0x9D78	0x6376	# <CJK>
-0x9D79	0x63A3	# <CJK>
-0x9D7A	0x638F	# <CJK>
-0x9D7B	0x6389	# <CJK>
-0x9D7C	0x639F	# <CJK>
-0x9D7D	0x63B5	# <CJK>
-0x9D7E	0x636B	# <CJK>
-0x9D80	0x6369	# <CJK>
-0x9D81	0x63BE	# <CJK>
-0x9D82	0x63E9	# <CJK>
-0x9D83	0x63C0	# <CJK>
-0x9D84	0x63C6	# <CJK>
-0x9D85	0x63E3	# <CJK>
-0x9D86	0x63C9	# <CJK>
-0x9D87	0x63D2	# <CJK>
-0x9D88	0x63F6	# <CJK>
-0x9D89	0x63C4	# <CJK>
-0x9D8A	0x6416	# <CJK>
-0x9D8B	0x6434	# <CJK>
-0x9D8C	0x6406	# <CJK>
-0x9D8D	0x6413	# <CJK>
-0x9D8E	0x6426	# <CJK>
-0x9D8F	0x6436	# <CJK>
-0x9D90	0x651D	# <CJK>
-0x9D91	0x6417	# <CJK>
-0x9D92	0x6428	# <CJK>
-0x9D93	0x640F	# <CJK>
-0x9D94	0x6467	# <CJK>
-0x9D95	0x646F	# <CJK>
-0x9D96	0x6476	# <CJK>
-0x9D97	0x644E	# <CJK>
-0x9D98	0x652A	# <CJK>
-0x9D99	0x6495	# <CJK>
-0x9D9A	0x6493	# <CJK>
-0x9D9B	0x64A5	# <CJK>
-0x9D9C	0x64A9	# <CJK>
-0x9D9D	0x6488	# <CJK>
-0x9D9E	0x64BC	# <CJK>
-0x9D9F	0x64DA	# <CJK>
-0x9DA0	0x64D2	# <CJK>
-0x9DA1	0x64C5	# <CJK>
-0x9DA2	0x64C7	# <CJK>
-0x9DA3	0x64BB	# <CJK>
-0x9DA4	0x64D8	# <CJK>
-0x9DA5	0x64C2	# <CJK>
-0x9DA6	0x64F1	# <CJK>
-0x9DA7	0x64E7	# <CJK>
-0x9DA8	0x8209	# <CJK>
-0x9DA9	0x64E0	# <CJK>
-0x9DAA	0x64E1	# <CJK>
-0x9DAB	0x62AC	# <CJK>
-0x9DAC	0x64E3	# <CJK>
-0x9DAD	0x64EF	# <CJK>
-0x9DAE	0x652C	# <CJK>
-0x9DAF	0x64F6	# <CJK>
-0x9DB0	0x64F4	# <CJK>
-0x9DB1	0x64F2	# <CJK>
-0x9DB2	0x64FA	# <CJK>
-0x9DB3	0x6500	# <CJK>
-0x9DB4	0x64FD	# <CJK>
-0x9DB5	0x6518	# <CJK>
-0x9DB6	0x651C	# <CJK>
-0x9DB7	0x6505	# <CJK>
-0x9DB8	0x6524	# <CJK>
-0x9DB9	0x6523	# <CJK>
-0x9DBA	0x652B	# <CJK>
-0x9DBB	0x6534	# <CJK>
-0x9DBC	0x6535	# <CJK>
-0x9DBD	0x6537	# <CJK>
-0x9DBE	0x6536	# <CJK>
-0x9DBF	0x6538	# <CJK>
-0x9DC0	0x754B	# <CJK>
-0x9DC1	0x6548	# <CJK>
-0x9DC2	0x6556	# <CJK>
-0x9DC3	0x6555	# <CJK>
-0x9DC4	0x654D	# <CJK>
-0x9DC5	0x6558	# <CJK>
-0x9DC6	0x655E	# <CJK>
-0x9DC7	0x655D	# <CJK>
-0x9DC8	0x6572	# <CJK>
-0x9DC9	0x6578	# <CJK>
-0x9DCA	0x6582	# <CJK>
-0x9DCB	0x6583	# <CJK>
-0x9DCC	0x8B8A	# <CJK>
-0x9DCD	0x659B	# <CJK>
-0x9DCE	0x659F	# <CJK>
-0x9DCF	0x65AB	# <CJK>
-0x9DD0	0x65B7	# <CJK>
-0x9DD1	0x65C3	# <CJK>
-0x9DD2	0x65C6	# <CJK>
-0x9DD3	0x65C1	# <CJK>
-0x9DD4	0x65C4	# <CJK>
-0x9DD5	0x65CC	# <CJK>
-0x9DD6	0x65D2	# <CJK>
-0x9DD7	0x65DB	# <CJK>
-0x9DD8	0x65D9	# <CJK>
-0x9DD9	0x65E0	# <CJK>
-0x9DDA	0x65E1	# <CJK>
-0x9DDB	0x65F1	# <CJK>
-0x9DDC	0x6772	# <CJK>
-0x9DDD	0x660A	# <CJK>
-0x9DDE	0x6603	# <CJK>
-0x9DDF	0x65FB	# <CJK>
-0x9DE0	0x6773	# <CJK>
-0x9DE1	0x6635	# <CJK>
-0x9DE2	0x6636	# <CJK>
-0x9DE3	0x6634	# <CJK>
-0x9DE4	0x661C	# <CJK>
-0x9DE5	0x664F	# <CJK>
-0x9DE6	0x6644	# <CJK>
-0x9DE7	0x6649	# <CJK>
-0x9DE8	0x6641	# <CJK>
-0x9DE9	0x665E	# <CJK>
-0x9DEA	0x665D	# <CJK>
-0x9DEB	0x6664	# <CJK>
-0x9DEC	0x6667	# <CJK>
-0x9DED	0x6668	# <CJK>
-0x9DEE	0x665F	# <CJK>
-0x9DEF	0x6662	# <CJK>
-0x9DF0	0x6670	# <CJK>
-0x9DF1	0x6683	# <CJK>
-0x9DF2	0x6688	# <CJK>
-0x9DF3	0x668E	# <CJK>
-0x9DF4	0x6689	# <CJK>
-0x9DF5	0x6684	# <CJK>
-0x9DF6	0x6698	# <CJK>
-0x9DF7	0x669D	# <CJK>
-0x9DF8	0x66C1	# <CJK>
-0x9DF9	0x66B9	# <CJK>
-0x9DFA	0x66C9	# <CJK>
-0x9DFB	0x66BE	# <CJK>
-0x9DFC	0x66BC	# <CJK>
-0x9E40	0x66C4	# <CJK>
-0x9E41	0x66B8	# <CJK>
-0x9E42	0x66D6	# <CJK>
-0x9E43	0x66DA	# <CJK>
-0x9E44	0x66E0	# <CJK>
-0x9E45	0x663F	# <CJK>
-0x9E46	0x66E6	# <CJK>
-0x9E47	0x66E9	# <CJK>
-0x9E48	0x66F0	# <CJK>
-0x9E49	0x66F5	# <CJK>
-0x9E4A	0x66F7	# <CJK>
-0x9E4B	0x670F	# <CJK>
-0x9E4C	0x6716	# <CJK>
-0x9E4D	0x671E	# <CJK>
-0x9E4E	0x6726	# <CJK>
-0x9E4F	0x6727	# <CJK>
-0x9E50	0x9738	# <CJK>
-0x9E51	0x672E	# <CJK>
-0x9E52	0x673F	# <CJK>
-0x9E53	0x6736	# <CJK>
-0x9E54	0x6741	# <CJK>
-0x9E55	0x6738	# <CJK>
-0x9E56	0x6737	# <CJK>
-0x9E57	0x6746	# <CJK>
-0x9E58	0x675E	# <CJK>
-0x9E59	0x6760	# <CJK>
-0x9E5A	0x6759	# <CJK>
-0x9E5B	0x6763	# <CJK>
-0x9E5C	0x6764	# <CJK>
-0x9E5D	0x6789	# <CJK>
-0x9E5E	0x6770	# <CJK>
-0x9E5F	0x67A9	# <CJK>
-0x9E60	0x677C	# <CJK>
-0x9E61	0x676A	# <CJK>
-0x9E62	0x678C	# <CJK>
-0x9E63	0x678B	# <CJK>
-0x9E64	0x67A6	# <CJK>
-0x9E65	0x67A1	# <CJK>
-0x9E66	0x6785	# <CJK>
-0x9E67	0x67B7	# <CJK>
-0x9E68	0x67EF	# <CJK>
-0x9E69	0x67B4	# <CJK>
-0x9E6A	0x67EC	# <CJK>
-0x9E6B	0x67B3	# <CJK>
-0x9E6C	0x67E9	# <CJK>
-0x9E6D	0x67B8	# <CJK>
-0x9E6E	0x67E4	# <CJK>
-0x9E6F	0x67DE	# <CJK>
-0x9E70	0x67DD	# <CJK>
-0x9E71	0x67E2	# <CJK>
-0x9E72	0x67EE	# <CJK>
-0x9E73	0x67B9	# <CJK>
-0x9E74	0x67CE	# <CJK>
-0x9E75	0x67C6	# <CJK>
-0x9E76	0x67E7	# <CJK>
-0x9E77	0x6A9C	# <CJK>
-0x9E78	0x681E	# <CJK>
-0x9E79	0x6846	# <CJK>
-0x9E7A	0x6829	# <CJK>
-0x9E7B	0x6840	# <CJK>
-0x9E7C	0x684D	# <CJK>
-0x9E7D	0x6832	# <CJK>
-0x9E7E	0x684E	# <CJK>
-0x9E80	0x68B3	# <CJK>
-0x9E81	0x682B	# <CJK>
-0x9E82	0x6859	# <CJK>
-0x9E83	0x6863	# <CJK>
-0x9E84	0x6877	# <CJK>
-0x9E85	0x687F	# <CJK>
-0x9E86	0x689F	# <CJK>
-0x9E87	0x688F	# <CJK>
-0x9E88	0x68AD	# <CJK>
-0x9E89	0x6894	# <CJK>
-0x9E8A	0x689D	# <CJK>
-0x9E8B	0x689B	# <CJK>
-0x9E8C	0x6883	# <CJK>
-0x9E8D	0x6AAE	# <CJK>
-0x9E8E	0x68B9	# <CJK>
-0x9E8F	0x6874	# <CJK>
-0x9E90	0x68B5	# <CJK>
-0x9E91	0x68A0	# <CJK>
-0x9E92	0x68BA	# <CJK>
-0x9E93	0x690F	# <CJK>
-0x9E94	0x688D	# <CJK>
-0x9E95	0x687E	# <CJK>
-0x9E96	0x6901	# <CJK>
-0x9E97	0x68CA	# <CJK>
-0x9E98	0x6908	# <CJK>
-0x9E99	0x68D8	# <CJK>
-0x9E9A	0x6922	# <CJK>
-0x9E9B	0x6926	# <CJK>
-0x9E9C	0x68E1	# <CJK>
-0x9E9D	0x690C	# <CJK>
-0x9E9E	0x68CD	# <CJK>
-0x9E9F	0x68D4	# <CJK>
-0x9EA0	0x68E7	# <CJK>
-0x9EA1	0x68D5	# <CJK>
-0x9EA2	0x6936	# <CJK>
-0x9EA3	0x6912	# <CJK>
-0x9EA4	0x6904	# <CJK>
-0x9EA5	0x68D7	# <CJK>
-0x9EA6	0x68E3	# <CJK>
-0x9EA7	0x6925	# <CJK>
-0x9EA8	0x68F9	# <CJK>
-0x9EA9	0x68E0	# <CJK>
-0x9EAA	0x68EF	# <CJK>
-0x9EAB	0x6928	# <CJK>
-0x9EAC	0x692A	# <CJK>
-0x9EAD	0x691A	# <CJK>
-0x9EAE	0x6923	# <CJK>
-0x9EAF	0x6921	# <CJK>
-0x9EB0	0x68C6	# <CJK>
-0x9EB1	0x6979	# <CJK>
-0x9EB2	0x6977	# <CJK>
-0x9EB3	0x695C	# <CJK>
-0x9EB4	0x6978	# <CJK>
-0x9EB5	0x696B	# <CJK>
-0x9EB6	0x6954	# <CJK>
-0x9EB7	0x697E	# <CJK>
-0x9EB8	0x696E	# <CJK>
-0x9EB9	0x6939	# <CJK>
-0x9EBA	0x6974	# <CJK>
-0x9EBB	0x693D	# <CJK>
-0x9EBC	0x6959	# <CJK>
-0x9EBD	0x6930	# <CJK>
-0x9EBE	0x6961	# <CJK>
-0x9EBF	0x695E	# <CJK>
-0x9EC0	0x695D	# <CJK>
-0x9EC1	0x6981	# <CJK>
-0x9EC2	0x696A	# <CJK>
-0x9EC3	0x69B2	# <CJK>
-0x9EC4	0x69AE	# <CJK>
-0x9EC5	0x69D0	# <CJK>
-0x9EC6	0x69BF	# <CJK>
-0x9EC7	0x69C1	# <CJK>
-0x9EC8	0x69D3	# <CJK>
-0x9EC9	0x69BE	# <CJK>
-0x9ECA	0x69CE	# <CJK>
-0x9ECB	0x5BE8	# <CJK>
-0x9ECC	0x69CA	# <CJK>
-0x9ECD	0x69DD	# <CJK>
-0x9ECE	0x69BB	# <CJK>
-0x9ECF	0x69C3	# <CJK>
-0x9ED0	0x69A7	# <CJK>
-0x9ED1	0x6A2E	# <CJK>
-0x9ED2	0x6991	# <CJK>
-0x9ED3	0x69A0	# <CJK>
-0x9ED4	0x699C	# <CJK>
-0x9ED5	0x6995	# <CJK>
-0x9ED6	0x69B4	# <CJK>
-0x9ED7	0x69DE	# <CJK>
-0x9ED8	0x69E8	# <CJK>
-0x9ED9	0x6A02	# <CJK>
-0x9EDA	0x6A1B	# <CJK>
-0x9EDB	0x69FF	# <CJK>
-0x9EDC	0x6B0A	# <CJK>
-0x9EDD	0x69F9	# <CJK>
-0x9EDE	0x69F2	# <CJK>
-0x9EDF	0x69E7	# <CJK>
-0x9EE0	0x6A05	# <CJK>
-0x9EE1	0x69B1	# <CJK>
-0x9EE2	0x6A1E	# <CJK>
-0x9EE3	0x69ED	# <CJK>
-0x9EE4	0x6A14	# <CJK>
-0x9EE5	0x69EB	# <CJK>
-0x9EE6	0x6A0A	# <CJK>
-0x9EE7	0x6A12	# <CJK>
-0x9EE8	0x6AC1	# <CJK>
-0x9EE9	0x6A23	# <CJK>
-0x9EEA	0x6A13	# <CJK>
-0x9EEB	0x6A44	# <CJK>
-0x9EEC	0x6A0C	# <CJK>
-0x9EED	0x6A72	# <CJK>
-0x9EEE	0x6A36	# <CJK>
-0x9EEF	0x6A78	# <CJK>
-0x9EF0	0x6A47	# <CJK>
-0x9EF1	0x6A62	# <CJK>
-0x9EF2	0x6A59	# <CJK>
-0x9EF3	0x6A66	# <CJK>
-0x9EF4	0x6A48	# <CJK>
-0x9EF5	0x6A38	# <CJK>
-0x9EF6	0x6A22	# <CJK>
-0x9EF7	0x6A90	# <CJK>
-0x9EF8	0x6A8D	# <CJK>
-0x9EF9	0x6AA0	# <CJK>
-0x9EFA	0x6A84	# <CJK>
-0x9EFB	0x6AA2	# <CJK>
-0x9EFC	0x6AA3	# <CJK>
-0x9F40	0x6A97	# <CJK>
-0x9F41	0x8617	# <CJK>
-0x9F42	0x6ABB	# <CJK>
-0x9F43	0x6AC3	# <CJK>
-0x9F44	0x6AC2	# <CJK>
-0x9F45	0x6AB8	# <CJK>
-0x9F46	0x6AB3	# <CJK>
-0x9F47	0x6AAC	# <CJK>
-0x9F48	0x6ADE	# <CJK>
-0x9F49	0x6AD1	# <CJK>
-0x9F4A	0x6ADF	# <CJK>
-0x9F4B	0x6AAA	# <CJK>
-0x9F4C	0x6ADA	# <CJK>
-0x9F4D	0x6AEA	# <CJK>
-0x9F4E	0x6AFB	# <CJK>
-0x9F4F	0x6B05	# <CJK>
-0x9F50	0x8616	# <CJK>
-0x9F51	0x6AFA	# <CJK>
-0x9F52	0x6B12	# <CJK>
-0x9F53	0x6B16	# <CJK>
-0x9F54	0x9B31	# <CJK>
-0x9F55	0x6B1F	# <CJK>
-0x9F56	0x6B38	# <CJK>
-0x9F57	0x6B37	# <CJK>
-0x9F58	0x76DC	# <CJK>
-0x9F59	0x6B39	# <CJK>
-0x9F5A	0x98EE	# <CJK>
-0x9F5B	0x6B47	# <CJK>
-0x9F5C	0x6B43	# <CJK>
-0x9F5D	0x6B49	# <CJK>
-0x9F5E	0x6B50	# <CJK>
-0x9F5F	0x6B59	# <CJK>
-0x9F60	0x6B54	# <CJK>
-0x9F61	0x6B5B	# <CJK>
-0x9F62	0x6B5F	# <CJK>
-0x9F63	0x6B61	# <CJK>
-0x9F64	0x6B78	# <CJK>
-0x9F65	0x6B79	# <CJK>
-0x9F66	0x6B7F	# <CJK>
-0x9F67	0x6B80	# <CJK>
-0x9F68	0x6B84	# <CJK>
-0x9F69	0x6B83	# <CJK>
-0x9F6A	0x6B8D	# <CJK>
-0x9F6B	0x6B98	# <CJK>
-0x9F6C	0x6B95	# <CJK>
-0x9F6D	0x6B9E	# <CJK>
-0x9F6E	0x6BA4	# <CJK>
-0x9F6F	0x6BAA	# <CJK>
-0x9F70	0x6BAB	# <CJK>
-0x9F71	0x6BAF	# <CJK>
-0x9F72	0x6BB2	# <CJK>
-0x9F73	0x6BB1	# <CJK>
-0x9F74	0x6BB3	# <CJK>
-0x9F75	0x6BB7	# <CJK>
-0x9F76	0x6BBC	# <CJK>
-0x9F77	0x6BC6	# <CJK>
-0x9F78	0x6BCB	# <CJK>
-0x9F79	0x6BD3	# <CJK>
-0x9F7A	0x6BDF	# <CJK>
-0x9F7B	0x6BEC	# <CJK>
-0x9F7C	0x6BEB	# <CJK>
-0x9F7D	0x6BF3	# <CJK>
-0x9F7E	0x6BEF	# <CJK>
-0x9F80	0x9EBE	# <CJK>
-0x9F81	0x6C08	# <CJK>
-0x9F82	0x6C13	# <CJK>
-0x9F83	0x6C14	# <CJK>
-0x9F84	0x6C1B	# <CJK>
-0x9F85	0x6C24	# <CJK>
-0x9F86	0x6C23	# <CJK>
-0x9F87	0x6C5E	# <CJK>
-0x9F88	0x6C55	# <CJK>
-0x9F89	0x6C62	# <CJK>
-0x9F8A	0x6C6A	# <CJK>
-0x9F8B	0x6C82	# <CJK>
-0x9F8C	0x6C8D	# <CJK>
-0x9F8D	0x6C9A	# <CJK>
-0x9F8E	0x6C81	# <CJK>
-0x9F8F	0x6C9B	# <CJK>
-0x9F90	0x6C7E	# <CJK>
-0x9F91	0x6C68	# <CJK>
-0x9F92	0x6C73	# <CJK>
-0x9F93	0x6C92	# <CJK>
-0x9F94	0x6C90	# <CJK>
-0x9F95	0x6CC4	# <CJK>
-0x9F96	0x6CF1	# <CJK>
-0x9F97	0x6CD3	# <CJK>
-0x9F98	0x6CBD	# <CJK>
-0x9F99	0x6CD7	# <CJK>
-0x9F9A	0x6CC5	# <CJK>
-0x9F9B	0x6CDD	# <CJK>
-0x9F9C	0x6CAE	# <CJK>
-0x9F9D	0x6CB1	# <CJK>
-0x9F9E	0x6CBE	# <CJK>
-0x9F9F	0x6CBA	# <CJK>
-0x9FA0	0x6CDB	# <CJK>
-0x9FA1	0x6CEF	# <CJK>
-0x9FA2	0x6CD9	# <CJK>
-0x9FA3	0x6CEA	# <CJK>
-0x9FA4	0x6D1F	# <CJK>
-0x9FA5	0x884D	# <CJK>
-0x9FA6	0x6D36	# <CJK>
-0x9FA7	0x6D2B	# <CJK>
-0x9FA8	0x6D3D	# <CJK>
-0x9FA9	0x6D38	# <CJK>
-0x9FAA	0x6D19	# <CJK>
-0x9FAB	0x6D35	# <CJK>
-0x9FAC	0x6D33	# <CJK>
-0x9FAD	0x6D12	# <CJK>
-0x9FAE	0x6D0C	# <CJK>
-0x9FAF	0x6D63	# <CJK>
-0x9FB0	0x6D93	# <CJK>
-0x9FB1	0x6D64	# <CJK>
-0x9FB2	0x6D5A	# <CJK>
-0x9FB3	0x6D79	# <CJK>
-0x9FB4	0x6D59	# <CJK>
-0x9FB5	0x6D8E	# <CJK>
-0x9FB6	0x6D95	# <CJK>
-0x9FB7	0x6FE4	# <CJK>
-0x9FB8	0x6D85	# <CJK>
-0x9FB9	0x6DF9	# <CJK>
-0x9FBA	0x6E15	# <CJK>
-0x9FBB	0x6E0A	# <CJK>
-0x9FBC	0x6DB5	# <CJK>
-0x9FBD	0x6DC7	# <CJK>
-0x9FBE	0x6DE6	# <CJK>
-0x9FBF	0x6DB8	# <CJK>
-0x9FC0	0x6DC6	# <CJK>
-0x9FC1	0x6DEC	# <CJK>
-0x9FC2	0x6DDE	# <CJK>
-0x9FC3	0x6DCC	# <CJK>
-0x9FC4	0x6DE8	# <CJK>
-0x9FC5	0x6DD2	# <CJK>
-0x9FC6	0x6DC5	# <CJK>
-0x9FC7	0x6DFA	# <CJK>
-0x9FC8	0x6DD9	# <CJK>
-0x9FC9	0x6DE4	# <CJK>
-0x9FCA	0x6DD5	# <CJK>
-0x9FCB	0x6DEA	# <CJK>
-0x9FCC	0x6DEE	# <CJK>
-0x9FCD	0x6E2D	# <CJK>
-0x9FCE	0x6E6E	# <CJK>
-0x9FCF	0x6E2E	# <CJK>
-0x9FD0	0x6E19	# <CJK>
-0x9FD1	0x6E72	# <CJK>
-0x9FD2	0x6E5F	# <CJK>
-0x9FD3	0x6E3E	# <CJK>
-0x9FD4	0x6E23	# <CJK>
-0x9FD5	0x6E6B	# <CJK>
-0x9FD6	0x6E2B	# <CJK>
-0x9FD7	0x6E76	# <CJK>
-0x9FD8	0x6E4D	# <CJK>
-0x9FD9	0x6E1F	# <CJK>
-0x9FDA	0x6E43	# <CJK>
-0x9FDB	0x6E3A	# <CJK>
-0x9FDC	0x6E4E	# <CJK>
-0x9FDD	0x6E24	# <CJK>
-0x9FDE	0x6EFF	# <CJK>
-0x9FDF	0x6E1D	# <CJK>
-0x9FE0	0x6E38	# <CJK>
-0x9FE1	0x6E82	# <CJK>
-0x9FE2	0x6EAA	# <CJK>
-0x9FE3	0x6E98	# <CJK>
-0x9FE4	0x6EC9	# <CJK>
-0x9FE5	0x6EB7	# <CJK>
-0x9FE6	0x6ED3	# <CJK>
-0x9FE7	0x6EBD	# <CJK>
-0x9FE8	0x6EAF	# <CJK>
-0x9FE9	0x6EC4	# <CJK>
-0x9FEA	0x6EB2	# <CJK>
-0x9FEB	0x6ED4	# <CJK>
-0x9FEC	0x6ED5	# <CJK>
-0x9FED	0x6E8F	# <CJK>
-0x9FEE	0x6EA5	# <CJK>
-0x9FEF	0x6EC2	# <CJK>
-0x9FF0	0x6E9F	# <CJK>
-0x9FF1	0x6F41	# <CJK>
-0x9FF2	0x6F11	# <CJK>
-0x9FF3	0x704C	# <CJK>
-0x9FF4	0x6EEC	# <CJK>
-0x9FF5	0x6EF8	# <CJK>
-0x9FF6	0x6EFE	# <CJK>
-0x9FF7	0x6F3F	# <CJK>
-0x9FF8	0x6EF2	# <CJK>
-0x9FF9	0x6F31	# <CJK>
-0x9FFA	0x6EEF	# <CJK>
-0x9FFB	0x6F32	# <CJK>
-0x9FFC	0x6ECC	# <CJK>
-#
-0xA0	0x00A0	# NO-BREAK SPACE # Apple extra: 1-byte halfwidth NBSP
-0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
-0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
-0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
-0xA4	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
-0xA5	0xFF65	# HALFWIDTH KATAKANA MIDDLE DOT
-0xA6	0xFF66	# HALFWIDTH KATAKANA LETTER WO
-0xA7	0xFF67	# HALFWIDTH KATAKANA LETTER SMALL A
-0xA8	0xFF68	# HALFWIDTH KATAKANA LETTER SMALL I
-0xA9	0xFF69	# HALFWIDTH KATAKANA LETTER SMALL U
-0xAA	0xFF6A	# HALFWIDTH KATAKANA LETTER SMALL E
-0xAB	0xFF6B	# HALFWIDTH KATAKANA LETTER SMALL O
-0xAC	0xFF6C	# HALFWIDTH KATAKANA LETTER SMALL YA
-0xAD	0xFF6D	# HALFWIDTH KATAKANA LETTER SMALL YU
-0xAE	0xFF6E	# HALFWIDTH KATAKANA LETTER SMALL YO
-0xAF	0xFF6F	# HALFWIDTH KATAKANA LETTER SMALL TU
-0xB0	0xFF70	# HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0xB1	0xFF71	# HALFWIDTH KATAKANA LETTER A
-0xB2	0xFF72	# HALFWIDTH KATAKANA LETTER I
-0xB3	0xFF73	# HALFWIDTH KATAKANA LETTER U
-0xB4	0xFF74	# HALFWIDTH KATAKANA LETTER E
-0xB5	0xFF75	# HALFWIDTH KATAKANA LETTER O
-0xB6	0xFF76	# HALFWIDTH KATAKANA LETTER KA
-0xB7	0xFF77	# HALFWIDTH KATAKANA LETTER KI
-0xB8	0xFF78	# HALFWIDTH KATAKANA LETTER KU
-0xB9	0xFF79	# HALFWIDTH KATAKANA LETTER KE
-0xBA	0xFF7A	# HALFWIDTH KATAKANA LETTER KO
-0xBB	0xFF7B	# HALFWIDTH KATAKANA LETTER SA
-0xBC	0xFF7C	# HALFWIDTH KATAKANA LETTER SI
-0xBD	0xFF7D	# HALFWIDTH KATAKANA LETTER SU
-0xBE	0xFF7E	# HALFWIDTH KATAKANA LETTER SE
-0xBF	0xFF7F	# HALFWIDTH KATAKANA LETTER SO
-0xC0	0xFF80	# HALFWIDTH KATAKANA LETTER TA
-0xC1	0xFF81	# HALFWIDTH KATAKANA LETTER TI
-0xC2	0xFF82	# HALFWIDTH KATAKANA LETTER TU
-0xC3	0xFF83	# HALFWIDTH KATAKANA LETTER TE
-0xC4	0xFF84	# HALFWIDTH KATAKANA LETTER TO
-0xC5	0xFF85	# HALFWIDTH KATAKANA LETTER NA
-0xC6	0xFF86	# HALFWIDTH KATAKANA LETTER NI
-0xC7	0xFF87	# HALFWIDTH KATAKANA LETTER NU
-0xC8	0xFF88	# HALFWIDTH KATAKANA LETTER NE
-0xC9	0xFF89	# HALFWIDTH KATAKANA LETTER NO
-0xCA	0xFF8A	# HALFWIDTH KATAKANA LETTER HA
-0xCB	0xFF8B	# HALFWIDTH KATAKANA LETTER HI
-0xCC	0xFF8C	# HALFWIDTH KATAKANA LETTER HU
-0xCD	0xFF8D	# HALFWIDTH KATAKANA LETTER HE
-0xCE	0xFF8E	# HALFWIDTH KATAKANA LETTER HO
-0xCF	0xFF8F	# HALFWIDTH KATAKANA LETTER MA
-0xD0	0xFF90	# HALFWIDTH KATAKANA LETTER MI
-0xD1	0xFF91	# HALFWIDTH KATAKANA LETTER MU
-0xD2	0xFF92	# HALFWIDTH KATAKANA LETTER ME
-0xD3	0xFF93	# HALFWIDTH KATAKANA LETTER MO
-0xD4	0xFF94	# HALFWIDTH KATAKANA LETTER YA
-0xD5	0xFF95	# HALFWIDTH KATAKANA LETTER YU
-0xD6	0xFF96	# HALFWIDTH KATAKANA LETTER YO
-0xD7	0xFF97	# HALFWIDTH KATAKANA LETTER RA
-0xD8	0xFF98	# HALFWIDTH KATAKANA LETTER RI
-0xD9	0xFF99	# HALFWIDTH KATAKANA LETTER RU
-0xDA	0xFF9A	# HALFWIDTH KATAKANA LETTER RE
-0xDB	0xFF9B	# HALFWIDTH KATAKANA LETTER RO
-0xDC	0xFF9C	# HALFWIDTH KATAKANA LETTER WA
-0xDD	0xFF9D	# HALFWIDTH KATAKANA LETTER N
-0xDE	0xFF9E	# HALFWIDTH KATAKANA VOICED SOUND MARK
-0xDF	0xFF9F	# HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
-#
-0xE040	0x6F3E	# <CJK>
-0xE041	0x6F13	# <CJK>
-0xE042	0x6EF7	# <CJK>
-0xE043	0x6F86	# <CJK>
-0xE044	0x6F7A	# <CJK>
-0xE045	0x6F78	# <CJK>
-0xE046	0x6F81	# <CJK>
-0xE047	0x6F80	# <CJK>
-0xE048	0x6F6F	# <CJK>
-0xE049	0x6F5B	# <CJK>
-0xE04A	0x6FF3	# <CJK>
-0xE04B	0x6F6D	# <CJK>
-0xE04C	0x6F82	# <CJK>
-0xE04D	0x6F7C	# <CJK>
-0xE04E	0x6F58	# <CJK>
-0xE04F	0x6F8E	# <CJK>
-0xE050	0x6F91	# <CJK>
-0xE051	0x6FC2	# <CJK>
-0xE052	0x6F66	# <CJK>
-0xE053	0x6FB3	# <CJK>
-0xE054	0x6FA3	# <CJK>
-0xE055	0x6FA1	# <CJK>
-0xE056	0x6FA4	# <CJK>
-0xE057	0x6FB9	# <CJK>
-0xE058	0x6FC6	# <CJK>
-0xE059	0x6FAA	# <CJK>
-0xE05A	0x6FDF	# <CJK>
-0xE05B	0x6FD5	# <CJK>
-0xE05C	0x6FEC	# <CJK>
-0xE05D	0x6FD4	# <CJK>
-0xE05E	0x6FD8	# <CJK>
-0xE05F	0x6FF1	# <CJK>
-0xE060	0x6FEE	# <CJK>
-0xE061	0x6FDB	# <CJK>
-0xE062	0x7009	# <CJK>
-0xE063	0x700B	# <CJK>
-0xE064	0x6FFA	# <CJK>
-0xE065	0x7011	# <CJK>
-0xE066	0x7001	# <CJK>
-0xE067	0x700F	# <CJK>
-0xE068	0x6FFE	# <CJK>
-0xE069	0x701B	# <CJK>
-0xE06A	0x701A	# <CJK>
-0xE06B	0x6F74	# <CJK>
-0xE06C	0x701D	# <CJK>
-0xE06D	0x7018	# <CJK>
-0xE06E	0x701F	# <CJK>
-0xE06F	0x7030	# <CJK>
-0xE070	0x703E	# <CJK>
-0xE071	0x7032	# <CJK>
-0xE072	0x7051	# <CJK>
-0xE073	0x7063	# <CJK>
-0xE074	0x7099	# <CJK>
-0xE075	0x7092	# <CJK>
-0xE076	0x70AF	# <CJK>
-0xE077	0x70F1	# <CJK>
-0xE078	0x70AC	# <CJK>
-0xE079	0x70B8	# <CJK>
-0xE07A	0x70B3	# <CJK>
-0xE07B	0x70AE	# <CJK>
-0xE07C	0x70DF	# <CJK>
-0xE07D	0x70CB	# <CJK>
-0xE07E	0x70DD	# <CJK>
-0xE080	0x70D9	# <CJK>
-0xE081	0x7109	# <CJK>
-0xE082	0x70FD	# <CJK>
-0xE083	0x711C	# <CJK>
-0xE084	0x7119	# <CJK>
-0xE085	0x7165	# <CJK>
-0xE086	0x7155	# <CJK>
-0xE087	0x7188	# <CJK>
-0xE088	0x7166	# <CJK>
-0xE089	0x7162	# <CJK>
-0xE08A	0x714C	# <CJK>
-0xE08B	0x7156	# <CJK>
-0xE08C	0x716C	# <CJK>
-0xE08D	0x718F	# <CJK>
-0xE08E	0x71FB	# <CJK>
-0xE08F	0x7184	# <CJK>
-0xE090	0x7195	# <CJK>
-0xE091	0x71A8	# <CJK>
-0xE092	0x71AC	# <CJK>
-0xE093	0x71D7	# <CJK>
-0xE094	0x71B9	# <CJK>
-0xE095	0x71BE	# <CJK>
-0xE096	0x71D2	# <CJK>
-0xE097	0x71C9	# <CJK>
-0xE098	0x71D4	# <CJK>
-0xE099	0x71CE	# <CJK>
-0xE09A	0x71E0	# <CJK>
-0xE09B	0x71EC	# <CJK>
-0xE09C	0x71E7	# <CJK>
-0xE09D	0x71F5	# <CJK>
-0xE09E	0x71FC	# <CJK>
-0xE09F	0x71F9	# <CJK>
-0xE0A0	0x71FF	# <CJK>
-0xE0A1	0x720D	# <CJK>
-0xE0A2	0x7210	# <CJK>
-0xE0A3	0x721B	# <CJK>
-0xE0A4	0x7228	# <CJK>
-0xE0A5	0x722D	# <CJK>
-0xE0A6	0x722C	# <CJK>
-0xE0A7	0x7230	# <CJK>
-0xE0A8	0x7232	# <CJK>
-0xE0A9	0x723B	# <CJK>
-0xE0AA	0x723C	# <CJK>
-0xE0AB	0x723F	# <CJK>
-0xE0AC	0x7240	# <CJK>
-0xE0AD	0x7246	# <CJK>
-0xE0AE	0x724B	# <CJK>
-0xE0AF	0x7258	# <CJK>
-0xE0B0	0x7274	# <CJK>
-0xE0B1	0x727E	# <CJK>
-0xE0B2	0x7282	# <CJK>
-0xE0B3	0x7281	# <CJK>
-0xE0B4	0x7287	# <CJK>
-0xE0B5	0x7292	# <CJK>
-0xE0B6	0x7296	# <CJK>
-0xE0B7	0x72A2	# <CJK>
-0xE0B8	0x72A7	# <CJK>
-0xE0B9	0x72B9	# <CJK>
-0xE0BA	0x72B2	# <CJK>
-0xE0BB	0x72C3	# <CJK>
-0xE0BC	0x72C6	# <CJK>
-0xE0BD	0x72C4	# <CJK>
-0xE0BE	0x72CE	# <CJK>
-0xE0BF	0x72D2	# <CJK>
-0xE0C0	0x72E2	# <CJK>
-0xE0C1	0x72E0	# <CJK>
-0xE0C2	0x72E1	# <CJK>
-0xE0C3	0x72F9	# <CJK>
-0xE0C4	0x72F7	# <CJK>
-0xE0C5	0x500F	# <CJK>
-0xE0C6	0x7317	# <CJK>
-0xE0C7	0x730A	# <CJK>
-0xE0C8	0x731C	# <CJK>
-0xE0C9	0x7316	# <CJK>
-0xE0CA	0x731D	# <CJK>
-0xE0CB	0x7334	# <CJK>
-0xE0CC	0x732F	# <CJK>
-0xE0CD	0x7329	# <CJK>
-0xE0CE	0x7325	# <CJK>
-0xE0CF	0x733E	# <CJK>
-0xE0D0	0x734E	# <CJK>
-0xE0D1	0x734F	# <CJK>
-0xE0D2	0x9ED8	# <CJK>
-0xE0D3	0x7357	# <CJK>
-0xE0D4	0x736A	# <CJK>
-0xE0D5	0x7368	# <CJK>
-0xE0D6	0x7370	# <CJK>
-0xE0D7	0x7378	# <CJK>
-0xE0D8	0x7375	# <CJK>
-0xE0D9	0x737B	# <CJK>
-0xE0DA	0x737A	# <CJK>
-0xE0DB	0x73C8	# <CJK>
-0xE0DC	0x73B3	# <CJK>
-0xE0DD	0x73CE	# <CJK>
-0xE0DE	0x73BB	# <CJK>
-0xE0DF	0x73C0	# <CJK>
-0xE0E0	0x73E5	# <CJK>
-0xE0E1	0x73EE	# <CJK>
-0xE0E2	0x73DE	# <CJK>
-0xE0E3	0x74A2	# <CJK>
-0xE0E4	0x7405	# <CJK>
-0xE0E5	0x746F	# <CJK>
-0xE0E6	0x7425	# <CJK>
-0xE0E7	0x73F8	# <CJK>
-0xE0E8	0x7432	# <CJK>
-0xE0E9	0x743A	# <CJK>
-0xE0EA	0x7455	# <CJK>
-0xE0EB	0x743F	# <CJK>
-0xE0EC	0x745F	# <CJK>
-0xE0ED	0x7459	# <CJK>
-0xE0EE	0x7441	# <CJK>
-0xE0EF	0x745C	# <CJK>
-0xE0F0	0x7469	# <CJK>
-0xE0F1	0x7470	# <CJK>
-0xE0F2	0x7463	# <CJK>
-0xE0F3	0x746A	# <CJK>
-0xE0F4	0x7476	# <CJK>
-0xE0F5	0x747E	# <CJK>
-0xE0F6	0x748B	# <CJK>
-0xE0F7	0x749E	# <CJK>
-0xE0F8	0x74A7	# <CJK>
-0xE0F9	0x74CA	# <CJK>
-0xE0FA	0x74CF	# <CJK>
-0xE0FB	0x74D4	# <CJK>
-0xE0FC	0x73F1	# <CJK>
-0xE140	0x74E0	# <CJK>
-0xE141	0x74E3	# <CJK>
-0xE142	0x74E7	# <CJK>
-0xE143	0x74E9	# <CJK>
-0xE144	0x74EE	# <CJK>
-0xE145	0x74F2	# <CJK>
-0xE146	0x74F0	# <CJK>
-0xE147	0x74F1	# <CJK>
-0xE148	0x74F8	# <CJK>
-0xE149	0x74F7	# <CJK>
-0xE14A	0x7504	# <CJK>
-0xE14B	0x7503	# <CJK>
-0xE14C	0x7505	# <CJK>
-0xE14D	0x750C	# <CJK>
-0xE14E	0x750E	# <CJK>
-0xE14F	0x750D	# <CJK>
-0xE150	0x7515	# <CJK>
-0xE151	0x7513	# <CJK>
-0xE152	0x751E	# <CJK>
-0xE153	0x7526	# <CJK>
-0xE154	0x752C	# <CJK>
-0xE155	0x753C	# <CJK>
-0xE156	0x7544	# <CJK>
-0xE157	0x754D	# <CJK>
-0xE158	0x754A	# <CJK>
-0xE159	0x7549	# <CJK>
-0xE15A	0x755B	# <CJK>
-0xE15B	0x7546	# <CJK>
-0xE15C	0x755A	# <CJK>
-0xE15D	0x7569	# <CJK>
-0xE15E	0x7564	# <CJK>
-0xE15F	0x7567	# <CJK>
-0xE160	0x756B	# <CJK>
-0xE161	0x756D	# <CJK>
-0xE162	0x7578	# <CJK>
-0xE163	0x7576	# <CJK>
-0xE164	0x7586	# <CJK>
-0xE165	0x7587	# <CJK>
-0xE166	0x7574	# <CJK>
-0xE167	0x758A	# <CJK>
-0xE168	0x7589	# <CJK>
-0xE169	0x7582	# <CJK>
-0xE16A	0x7594	# <CJK>
-0xE16B	0x759A	# <CJK>
-0xE16C	0x759D	# <CJK>
-0xE16D	0x75A5	# <CJK>
-0xE16E	0x75A3	# <CJK>
-0xE16F	0x75C2	# <CJK>
-0xE170	0x75B3	# <CJK>
-0xE171	0x75C3	# <CJK>
-0xE172	0x75B5	# <CJK>
-0xE173	0x75BD	# <CJK>
-0xE174	0x75B8	# <CJK>
-0xE175	0x75BC	# <CJK>
-0xE176	0x75B1	# <CJK>
-0xE177	0x75CD	# <CJK>
-0xE178	0x75CA	# <CJK>
-0xE179	0x75D2	# <CJK>
-0xE17A	0x75D9	# <CJK>
-0xE17B	0x75E3	# <CJK>
-0xE17C	0x75DE	# <CJK>
-0xE17D	0x75FE	# <CJK>
-0xE17E	0x75FF	# <CJK>
-0xE180	0x75FC	# <CJK>
-0xE181	0x7601	# <CJK>
-0xE182	0x75F0	# <CJK>
-0xE183	0x75FA	# <CJK>
-0xE184	0x75F2	# <CJK>
-0xE185	0x75F3	# <CJK>
-0xE186	0x760B	# <CJK>
-0xE187	0x760D	# <CJK>
-0xE188	0x7609	# <CJK>
-0xE189	0x761F	# <CJK>
-0xE18A	0x7627	# <CJK>
-0xE18B	0x7620	# <CJK>
-0xE18C	0x7621	# <CJK>
-0xE18D	0x7622	# <CJK>
-0xE18E	0x7624	# <CJK>
-0xE18F	0x7634	# <CJK>
-0xE190	0x7630	# <CJK>
-0xE191	0x763B	# <CJK>
-0xE192	0x7647	# <CJK>
-0xE193	0x7648	# <CJK>
-0xE194	0x7646	# <CJK>
-0xE195	0x765C	# <CJK>
-0xE196	0x7658	# <CJK>
-0xE197	0x7661	# <CJK>
-0xE198	0x7662	# <CJK>
-0xE199	0x7668	# <CJK>
-0xE19A	0x7669	# <CJK>
-0xE19B	0x766A	# <CJK>
-0xE19C	0x7667	# <CJK>
-0xE19D	0x766C	# <CJK>
-0xE19E	0x7670	# <CJK>
-0xE19F	0x7672	# <CJK>
-0xE1A0	0x7676	# <CJK>
-0xE1A1	0x7678	# <CJK>
-0xE1A2	0x767C	# <CJK>
-0xE1A3	0x7680	# <CJK>
-0xE1A4	0x7683	# <CJK>
-0xE1A5	0x7688	# <CJK>
-0xE1A6	0x768B	# <CJK>
-0xE1A7	0x768E	# <CJK>
-0xE1A8	0x7696	# <CJK>
-0xE1A9	0x7693	# <CJK>
-0xE1AA	0x7699	# <CJK>
-0xE1AB	0x769A	# <CJK>
-0xE1AC	0x76B0	# <CJK>
-0xE1AD	0x76B4	# <CJK>
-0xE1AE	0x76B8	# <CJK>
-0xE1AF	0x76B9	# <CJK>
-0xE1B0	0x76BA	# <CJK>
-0xE1B1	0x76C2	# <CJK>
-0xE1B2	0x76CD	# <CJK>
-0xE1B3	0x76D6	# <CJK>
-0xE1B4	0x76D2	# <CJK>
-0xE1B5	0x76DE	# <CJK>
-0xE1B6	0x76E1	# <CJK>
-0xE1B7	0x76E5	# <CJK>
-0xE1B8	0x76E7	# <CJK>
-0xE1B9	0x76EA	# <CJK>
-0xE1BA	0x862F	# <CJK>
-0xE1BB	0x76FB	# <CJK>
-0xE1BC	0x7708	# <CJK>
-0xE1BD	0x7707	# <CJK>
-0xE1BE	0x7704	# <CJK>
-0xE1BF	0x7729	# <CJK>
-0xE1C0	0x7724	# <CJK>
-0xE1C1	0x771E	# <CJK>
-0xE1C2	0x7725	# <CJK>
-0xE1C3	0x7726	# <CJK>
-0xE1C4	0x771B	# <CJK>
-0xE1C5	0x7737	# <CJK>
-0xE1C6	0x7738	# <CJK>
-0xE1C7	0x7747	# <CJK>
-0xE1C8	0x775A	# <CJK>
-0xE1C9	0x7768	# <CJK>
-0xE1CA	0x776B	# <CJK>
-0xE1CB	0x775B	# <CJK>
-0xE1CC	0x7765	# <CJK>
-0xE1CD	0x777F	# <CJK>
-0xE1CE	0x777E	# <CJK>
-0xE1CF	0x7779	# <CJK>
-0xE1D0	0x778E	# <CJK>
-0xE1D1	0x778B	# <CJK>
-0xE1D2	0x7791	# <CJK>
-0xE1D3	0x77A0	# <CJK>
-0xE1D4	0x779E	# <CJK>
-0xE1D5	0x77B0	# <CJK>
-0xE1D6	0x77B6	# <CJK>
-0xE1D7	0x77B9	# <CJK>
-0xE1D8	0x77BF	# <CJK>
-0xE1D9	0x77BC	# <CJK>
-0xE1DA	0x77BD	# <CJK>
-0xE1DB	0x77BB	# <CJK>
-0xE1DC	0x77C7	# <CJK>
-0xE1DD	0x77CD	# <CJK>
-0xE1DE	0x77D7	# <CJK>
-0xE1DF	0x77DA	# <CJK>
-0xE1E0	0x77DC	# <CJK>
-0xE1E1	0x77E3	# <CJK>
-0xE1E2	0x77EE	# <CJK>
-0xE1E3	0x77FC	# <CJK>
-0xE1E4	0x780C	# <CJK>
-0xE1E5	0x7812	# <CJK>
-0xE1E6	0x7926	# <CJK>
-0xE1E7	0x7820	# <CJK>
-0xE1E8	0x792A	# <CJK>
-0xE1E9	0x7845	# <CJK>
-0xE1EA	0x788E	# <CJK>
-0xE1EB	0x7874	# <CJK>
-0xE1EC	0x7886	# <CJK>
-0xE1ED	0x787C	# <CJK>
-0xE1EE	0x789A	# <CJK>
-0xE1EF	0x788C	# <CJK>
-0xE1F0	0x78A3	# <CJK>
-0xE1F1	0x78B5	# <CJK>
-0xE1F2	0x78AA	# <CJK>
-0xE1F3	0x78AF	# <CJK>
-0xE1F4	0x78D1	# <CJK>
-0xE1F5	0x78C6	# <CJK>
-0xE1F6	0x78CB	# <CJK>
-0xE1F7	0x78D4	# <CJK>
-0xE1F8	0x78BE	# <CJK>
-0xE1F9	0x78BC	# <CJK>
-0xE1FA	0x78C5	# <CJK>
-0xE1FB	0x78CA	# <CJK>
-0xE1FC	0x78EC	# <CJK>
-0xE240	0x78E7	# <CJK>
-0xE241	0x78DA	# <CJK>
-0xE242	0x78FD	# <CJK>
-0xE243	0x78F4	# <CJK>
-0xE244	0x7907	# <CJK>
-0xE245	0x7912	# <CJK>
-0xE246	0x7911	# <CJK>
-0xE247	0x7919	# <CJK>
-0xE248	0x792C	# <CJK>
-0xE249	0x792B	# <CJK>
-0xE24A	0x7940	# <CJK>
-0xE24B	0x7960	# <CJK>
-0xE24C	0x7957	# <CJK>
-0xE24D	0x795F	# <CJK>
-0xE24E	0x795A	# <CJK>
-0xE24F	0x7955	# <CJK>
-0xE250	0x7953	# <CJK>
-0xE251	0x797A	# <CJK>
-0xE252	0x797F	# <CJK>
-0xE253	0x798A	# <CJK>
-0xE254	0x799D	# <CJK>
-0xE255	0x79A7	# <CJK>
-0xE256	0x9F4B	# <CJK>
-0xE257	0x79AA	# <CJK>
-0xE258	0x79AE	# <CJK>
-0xE259	0x79B3	# <CJK>
-0xE25A	0x79B9	# <CJK>
-0xE25B	0x79BA	# <CJK>
-0xE25C	0x79C9	# <CJK>
-0xE25D	0x79D5	# <CJK>
-0xE25E	0x79E7	# <CJK>
-0xE25F	0x79EC	# <CJK>
-0xE260	0x79E1	# <CJK>
-0xE261	0x79E3	# <CJK>
-0xE262	0x7A08	# <CJK>
-0xE263	0x7A0D	# <CJK>
-0xE264	0x7A18	# <CJK>
-0xE265	0x7A19	# <CJK>
-0xE266	0x7A20	# <CJK>
-0xE267	0x7A1F	# <CJK>
-0xE268	0x7980	# <CJK>
-0xE269	0x7A31	# <CJK>
-0xE26A	0x7A3B	# <CJK>
-0xE26B	0x7A3E	# <CJK>
-0xE26C	0x7A37	# <CJK>
-0xE26D	0x7A43	# <CJK>
-0xE26E	0x7A57	# <CJK>
-0xE26F	0x7A49	# <CJK>
-0xE270	0x7A61	# <CJK>
-0xE271	0x7A62	# <CJK>
-0xE272	0x7A69	# <CJK>
-0xE273	0x9F9D	# <CJK>
-0xE274	0x7A70	# <CJK>
-0xE275	0x7A79	# <CJK>
-0xE276	0x7A7D	# <CJK>
-0xE277	0x7A88	# <CJK>
-0xE278	0x7A97	# <CJK>
-0xE279	0x7A95	# <CJK>
-0xE27A	0x7A98	# <CJK>
-0xE27B	0x7A96	# <CJK>
-0xE27C	0x7AA9	# <CJK>
-0xE27D	0x7AC8	# <CJK>
-0xE27E	0x7AB0	# <CJK>
-0xE280	0x7AB6	# <CJK>
-0xE281	0x7AC5	# <CJK>
-0xE282	0x7AC4	# <CJK>
-0xE283	0x7ABF	# <CJK>
-0xE284	0x9083	# <CJK>
-0xE285	0x7AC7	# <CJK>
-0xE286	0x7ACA	# <CJK>
-0xE287	0x7ACD	# <CJK>
-0xE288	0x7ACF	# <CJK>
-0xE289	0x7AD5	# <CJK>
-0xE28A	0x7AD3	# <CJK>
-0xE28B	0x7AD9	# <CJK>
-0xE28C	0x7ADA	# <CJK>
-0xE28D	0x7ADD	# <CJK>
-0xE28E	0x7AE1	# <CJK>
-0xE28F	0x7AE2	# <CJK>
-0xE290	0x7AE6	# <CJK>
-0xE291	0x7AED	# <CJK>
-0xE292	0x7AF0	# <CJK>
-0xE293	0x7B02	# <CJK>
-0xE294	0x7B0F	# <CJK>
-0xE295	0x7B0A	# <CJK>
-0xE296	0x7B06	# <CJK>
-0xE297	0x7B33	# <CJK>
-0xE298	0x7B18	# <CJK>
-0xE299	0x7B19	# <CJK>
-0xE29A	0x7B1E	# <CJK>
-0xE29B	0x7B35	# <CJK>
-0xE29C	0x7B28	# <CJK>
-0xE29D	0x7B36	# <CJK>
-0xE29E	0x7B50	# <CJK>
-0xE29F	0x7B7A	# <CJK>
-0xE2A0	0x7B04	# <CJK>
-0xE2A1	0x7B4D	# <CJK>
-0xE2A2	0x7B0B	# <CJK>
-0xE2A3	0x7B4C	# <CJK>
-0xE2A4	0x7B45	# <CJK>
-0xE2A5	0x7B75	# <CJK>
-0xE2A6	0x7B65	# <CJK>
-0xE2A7	0x7B74	# <CJK>
-0xE2A8	0x7B67	# <CJK>
-0xE2A9	0x7B70	# <CJK>
-0xE2AA	0x7B71	# <CJK>
-0xE2AB	0x7B6C	# <CJK>
-0xE2AC	0x7B6E	# <CJK>
-0xE2AD	0x7B9D	# <CJK>
-0xE2AE	0x7B98	# <CJK>
-0xE2AF	0x7B9F	# <CJK>
-0xE2B0	0x7B8D	# <CJK>
-0xE2B1	0x7B9C	# <CJK>
-0xE2B2	0x7B9A	# <CJK>
-0xE2B3	0x7B8B	# <CJK>
-0xE2B4	0x7B92	# <CJK>
-0xE2B5	0x7B8F	# <CJK>
-0xE2B6	0x7B5D	# <CJK>
-0xE2B7	0x7B99	# <CJK>
-0xE2B8	0x7BCB	# <CJK>
-0xE2B9	0x7BC1	# <CJK>
-0xE2BA	0x7BCC	# <CJK>
-0xE2BB	0x7BCF	# <CJK>
-0xE2BC	0x7BB4	# <CJK>
-0xE2BD	0x7BC6	# <CJK>
-0xE2BE	0x7BDD	# <CJK>
-0xE2BF	0x7BE9	# <CJK>
-0xE2C0	0x7C11	# <CJK>
-0xE2C1	0x7C14	# <CJK>
-0xE2C2	0x7BE6	# <CJK>
-0xE2C3	0x7BE5	# <CJK>
-0xE2C4	0x7C60	# <CJK>
-0xE2C5	0x7C00	# <CJK>
-0xE2C6	0x7C07	# <CJK>
-0xE2C7	0x7C13	# <CJK>
-0xE2C8	0x7BF3	# <CJK>
-0xE2C9	0x7BF7	# <CJK>
-0xE2CA	0x7C17	# <CJK>
-0xE2CB	0x7C0D	# <CJK>
-0xE2CC	0x7BF6	# <CJK>
-0xE2CD	0x7C23	# <CJK>
-0xE2CE	0x7C27	# <CJK>
-0xE2CF	0x7C2A	# <CJK>
-0xE2D0	0x7C1F	# <CJK>
-0xE2D1	0x7C37	# <CJK>
-0xE2D2	0x7C2B	# <CJK>
-0xE2D3	0x7C3D	# <CJK>
-0xE2D4	0x7C4C	# <CJK>
-0xE2D5	0x7C43	# <CJK>
-0xE2D6	0x7C54	# <CJK>
-0xE2D7	0x7C4F	# <CJK>
-0xE2D8	0x7C40	# <CJK>
-0xE2D9	0x7C50	# <CJK>
-0xE2DA	0x7C58	# <CJK>
-0xE2DB	0x7C5F	# <CJK>
-0xE2DC	0x7C64	# <CJK>
-0xE2DD	0x7C56	# <CJK>
-0xE2DE	0x7C65	# <CJK>
-0xE2DF	0x7C6C	# <CJK>
-0xE2E0	0x7C75	# <CJK>
-0xE2E1	0x7C83	# <CJK>
-0xE2E2	0x7C90	# <CJK>
-0xE2E3	0x7CA4	# <CJK>
-0xE2E4	0x7CAD	# <CJK>
-0xE2E5	0x7CA2	# <CJK>
-0xE2E6	0x7CAB	# <CJK>
-0xE2E7	0x7CA1	# <CJK>
-0xE2E8	0x7CA8	# <CJK>
-0xE2E9	0x7CB3	# <CJK>
-0xE2EA	0x7CB2	# <CJK>
-0xE2EB	0x7CB1	# <CJK>
-0xE2EC	0x7CAE	# <CJK>
-0xE2ED	0x7CB9	# <CJK>
-0xE2EE	0x7CBD	# <CJK>
-0xE2EF	0x7CC0	# <CJK>
-0xE2F0	0x7CC5	# <CJK>
-0xE2F1	0x7CC2	# <CJK>
-0xE2F2	0x7CD8	# <CJK>
-0xE2F3	0x7CD2	# <CJK>
-0xE2F4	0x7CDC	# <CJK>
-0xE2F5	0x7CE2	# <CJK>
-0xE2F6	0x9B3B	# <CJK>
-0xE2F7	0x7CEF	# <CJK>
-0xE2F8	0x7CF2	# <CJK>
-0xE2F9	0x7CF4	# <CJK>
-0xE2FA	0x7CF6	# <CJK>
-0xE2FB	0x7CFA	# <CJK>
-0xE2FC	0x7D06	# <CJK>
-0xE340	0x7D02	# <CJK>
-0xE341	0x7D1C	# <CJK>
-0xE342	0x7D15	# <CJK>
-0xE343	0x7D0A	# <CJK>
-0xE344	0x7D45	# <CJK>
-0xE345	0x7D4B	# <CJK>
-0xE346	0x7D2E	# <CJK>
-0xE347	0x7D32	# <CJK>
-0xE348	0x7D3F	# <CJK>
-0xE349	0x7D35	# <CJK>
-0xE34A	0x7D46	# <CJK>
-0xE34B	0x7D73	# <CJK>
-0xE34C	0x7D56	# <CJK>
-0xE34D	0x7D4E	# <CJK>
-0xE34E	0x7D72	# <CJK>
-0xE34F	0x7D68	# <CJK>
-0xE350	0x7D6E	# <CJK>
-0xE351	0x7D4F	# <CJK>
-0xE352	0x7D63	# <CJK>
-0xE353	0x7D93	# <CJK>
-0xE354	0x7D89	# <CJK>
-0xE355	0x7D5B	# <CJK>
-0xE356	0x7D8F	# <CJK>
-0xE357	0x7D7D	# <CJK>
-0xE358	0x7D9B	# <CJK>
-0xE359	0x7DBA	# <CJK>
-0xE35A	0x7DAE	# <CJK>
-0xE35B	0x7DA3	# <CJK>
-0xE35C	0x7DB5	# <CJK>
-0xE35D	0x7DC7	# <CJK>
-0xE35E	0x7DBD	# <CJK>
-0xE35F	0x7DAB	# <CJK>
-0xE360	0x7E3D	# <CJK>
-0xE361	0x7DA2	# <CJK>
-0xE362	0x7DAF	# <CJK>
-0xE363	0x7DDC	# <CJK>
-0xE364	0x7DB8	# <CJK>
-0xE365	0x7D9F	# <CJK>
-0xE366	0x7DB0	# <CJK>
-0xE367	0x7DD8	# <CJK>
-0xE368	0x7DDD	# <CJK>
-0xE369	0x7DE4	# <CJK>
-0xE36A	0x7DDE	# <CJK>
-0xE36B	0x7DFB	# <CJK>
-0xE36C	0x7DF2	# <CJK>
-0xE36D	0x7DE1	# <CJK>
-0xE36E	0x7E05	# <CJK>
-0xE36F	0x7E0A	# <CJK>
-0xE370	0x7E23	# <CJK>
-0xE371	0x7E21	# <CJK>
-0xE372	0x7E12	# <CJK>
-0xE373	0x7E31	# <CJK>
-0xE374	0x7E1F	# <CJK>
-0xE375	0x7E09	# <CJK>
-0xE376	0x7E0B	# <CJK>
-0xE377	0x7E22	# <CJK>
-0xE378	0x7E46	# <CJK>
-0xE379	0x7E66	# <CJK>
-0xE37A	0x7E3B	# <CJK>
-0xE37B	0x7E35	# <CJK>
-0xE37C	0x7E39	# <CJK>
-0xE37D	0x7E43	# <CJK>
-0xE37E	0x7E37	# <CJK>
-0xE380	0x7E32	# <CJK>
-0xE381	0x7E3A	# <CJK>
-0xE382	0x7E67	# <CJK>
-0xE383	0x7E5D	# <CJK>
-0xE384	0x7E56	# <CJK>
-0xE385	0x7E5E	# <CJK>
-0xE386	0x7E59	# <CJK>
-0xE387	0x7E5A	# <CJK>
-0xE388	0x7E79	# <CJK>
-0xE389	0x7E6A	# <CJK>
-0xE38A	0x7E69	# <CJK>
-0xE38B	0x7E7C	# <CJK>
-0xE38C	0x7E7B	# <CJK>
-0xE38D	0x7E83	# <CJK>
-0xE38E	0x7DD5	# <CJK>
-0xE38F	0x7E7D	# <CJK>
-0xE390	0x8FAE	# <CJK>
-0xE391	0x7E7F	# <CJK>
-0xE392	0x7E88	# <CJK>
-0xE393	0x7E89	# <CJK>
-0xE394	0x7E8C	# <CJK>
-0xE395	0x7E92	# <CJK>
-0xE396	0x7E90	# <CJK>
-0xE397	0x7E93	# <CJK>
-0xE398	0x7E94	# <CJK>
-0xE399	0x7E96	# <CJK>
-0xE39A	0x7E8E	# <CJK>
-0xE39B	0x7E9B	# <CJK>
-0xE39C	0x7E9C	# <CJK>
-0xE39D	0x7F38	# <CJK>
-0xE39E	0x7F3A	# <CJK>
-0xE39F	0x7F45	# <CJK>
-0xE3A0	0x7F4C	# <CJK>
-0xE3A1	0x7F4D	# <CJK>
-0xE3A2	0x7F4E	# <CJK>
-0xE3A3	0x7F50	# <CJK>
-0xE3A4	0x7F51	# <CJK>
-0xE3A5	0x7F55	# <CJK>
-0xE3A6	0x7F54	# <CJK>
-0xE3A7	0x7F58	# <CJK>
-0xE3A8	0x7F5F	# <CJK>
-0xE3A9	0x7F60	# <CJK>
-0xE3AA	0x7F68	# <CJK>
-0xE3AB	0x7F69	# <CJK>
-0xE3AC	0x7F67	# <CJK>
-0xE3AD	0x7F78	# <CJK>
-0xE3AE	0x7F82	# <CJK>
-0xE3AF	0x7F86	# <CJK>
-0xE3B0	0x7F83	# <CJK>
-0xE3B1	0x7F88	# <CJK>
-0xE3B2	0x7F87	# <CJK>
-0xE3B3	0x7F8C	# <CJK>
-0xE3B4	0x7F94	# <CJK>
-0xE3B5	0x7F9E	# <CJK>
-0xE3B6	0x7F9D	# <CJK>
-0xE3B7	0x7F9A	# <CJK>
-0xE3B8	0x7FA3	# <CJK>
-0xE3B9	0x7FAF	# <CJK>
-0xE3BA	0x7FB2	# <CJK>
-0xE3BB	0x7FB9	# <CJK>
-0xE3BC	0x7FAE	# <CJK>
-0xE3BD	0x7FB6	# <CJK>
-0xE3BE	0x7FB8	# <CJK>
-0xE3BF	0x8B71	# <CJK>
-0xE3C0	0x7FC5	# <CJK>
-0xE3C1	0x7FC6	# <CJK>
-0xE3C2	0x7FCA	# <CJK>
-0xE3C3	0x7FD5	# <CJK>
-0xE3C4	0x7FD4	# <CJK>
-0xE3C5	0x7FE1	# <CJK>
-0xE3C6	0x7FE6	# <CJK>
-0xE3C7	0x7FE9	# <CJK>
-0xE3C8	0x7FF3	# <CJK>
-0xE3C9	0x7FF9	# <CJK>
-0xE3CA	0x98DC	# <CJK>
-0xE3CB	0x8006	# <CJK>
-0xE3CC	0x8004	# <CJK>
-0xE3CD	0x800B	# <CJK>
-0xE3CE	0x8012	# <CJK>
-0xE3CF	0x8018	# <CJK>
-0xE3D0	0x8019	# <CJK>
-0xE3D1	0x801C	# <CJK>
-0xE3D2	0x8021	# <CJK>
-0xE3D3	0x8028	# <CJK>
-0xE3D4	0x803F	# <CJK>
-0xE3D5	0x803B	# <CJK>
-0xE3D6	0x804A	# <CJK>
-0xE3D7	0x8046	# <CJK>
-0xE3D8	0x8052	# <CJK>
-0xE3D9	0x8058	# <CJK>
-0xE3DA	0x805A	# <CJK>
-0xE3DB	0x805F	# <CJK>
-0xE3DC	0x8062	# <CJK>
-0xE3DD	0x8068	# <CJK>
-0xE3DE	0x8073	# <CJK>
-0xE3DF	0x8072	# <CJK>
-0xE3E0	0x8070	# <CJK>
-0xE3E1	0x8076	# <CJK>
-0xE3E2	0x8079	# <CJK>
-0xE3E3	0x807D	# <CJK>
-0xE3E4	0x807F	# <CJK>
-0xE3E5	0x8084	# <CJK>
-0xE3E6	0x8086	# <CJK>
-0xE3E7	0x8085	# <CJK>
-0xE3E8	0x809B	# <CJK>
-0xE3E9	0x8093	# <CJK>
-0xE3EA	0x809A	# <CJK>
-0xE3EB	0x80AD	# <CJK>
-0xE3EC	0x5190	# <CJK>
-0xE3ED	0x80AC	# <CJK>
-0xE3EE	0x80DB	# <CJK>
-0xE3EF	0x80E5	# <CJK>
-0xE3F0	0x80D9	# <CJK>
-0xE3F1	0x80DD	# <CJK>
-0xE3F2	0x80C4	# <CJK>
-0xE3F3	0x80DA	# <CJK>
-0xE3F4	0x80D6	# <CJK>
-0xE3F5	0x8109	# <CJK>
-0xE3F6	0x80EF	# <CJK>
-0xE3F7	0x80F1	# <CJK>
-0xE3F8	0x811B	# <CJK>
-0xE3F9	0x8129	# <CJK>
-0xE3FA	0x8123	# <CJK>
-0xE3FB	0x812F	# <CJK>
-0xE3FC	0x814B	# <CJK>
-0xE440	0x968B	# <CJK>
-0xE441	0x8146	# <CJK>
-0xE442	0x813E	# <CJK>
-0xE443	0x8153	# <CJK>
-0xE444	0x8151	# <CJK>
-0xE445	0x80FC	# <CJK>
-0xE446	0x8171	# <CJK>
-0xE447	0x816E	# <CJK>
-0xE448	0x8165	# <CJK>
-0xE449	0x8166	# <CJK>
-0xE44A	0x8174	# <CJK>
-0xE44B	0x8183	# <CJK>
-0xE44C	0x8188	# <CJK>
-0xE44D	0x818A	# <CJK>
-0xE44E	0x8180	# <CJK>
-0xE44F	0x8182	# <CJK>
-0xE450	0x81A0	# <CJK>
-0xE451	0x8195	# <CJK>
-0xE452	0x81A4	# <CJK>
-0xE453	0x81A3	# <CJK>
-0xE454	0x815F	# <CJK>
-0xE455	0x8193	# <CJK>
-0xE456	0x81A9	# <CJK>
-0xE457	0x81B0	# <CJK>
-0xE458	0x81B5	# <CJK>
-0xE459	0x81BE	# <CJK>
-0xE45A	0x81B8	# <CJK>
-0xE45B	0x81BD	# <CJK>
-0xE45C	0x81C0	# <CJK>
-0xE45D	0x81C2	# <CJK>
-0xE45E	0x81BA	# <CJK>
-0xE45F	0x81C9	# <CJK>
-0xE460	0x81CD	# <CJK>
-0xE461	0x81D1	# <CJK>
-0xE462	0x81D9	# <CJK>
-0xE463	0x81D8	# <CJK>
-0xE464	0x81C8	# <CJK>
-0xE465	0x81DA	# <CJK>
-0xE466	0x81DF	# <CJK>
-0xE467	0x81E0	# <CJK>
-0xE468	0x81E7	# <CJK>
-0xE469	0x81FA	# <CJK>
-0xE46A	0x81FB	# <CJK>
-0xE46B	0x81FE	# <CJK>
-0xE46C	0x8201	# <CJK>
-0xE46D	0x8202	# <CJK>
-0xE46E	0x8205	# <CJK>
-0xE46F	0x8207	# <CJK>
-0xE470	0x820A	# <CJK>
-0xE471	0x820D	# <CJK>
-0xE472	0x8210	# <CJK>
-0xE473	0x8216	# <CJK>
-0xE474	0x8229	# <CJK>
-0xE475	0x822B	# <CJK>
-0xE476	0x8238	# <CJK>
-0xE477	0x8233	# <CJK>
-0xE478	0x8240	# <CJK>
-0xE479	0x8259	# <CJK>
-0xE47A	0x8258	# <CJK>
-0xE47B	0x825D	# <CJK>
-0xE47C	0x825A	# <CJK>
-0xE47D	0x825F	# <CJK>
-0xE47E	0x8264	# <CJK>
-0xE480	0x8262	# <CJK>
-0xE481	0x8268	# <CJK>
-0xE482	0x826A	# <CJK>
-0xE483	0x826B	# <CJK>
-0xE484	0x822E	# <CJK>
-0xE485	0x8271	# <CJK>
-0xE486	0x8277	# <CJK>
-0xE487	0x8278	# <CJK>
-0xE488	0x827E	# <CJK>
-0xE489	0x828D	# <CJK>
-0xE48A	0x8292	# <CJK>
-0xE48B	0x82AB	# <CJK>
-0xE48C	0x829F	# <CJK>
-0xE48D	0x82BB	# <CJK>
-0xE48E	0x82AC	# <CJK>
-0xE48F	0x82E1	# <CJK>
-0xE490	0x82E3	# <CJK>
-0xE491	0x82DF	# <CJK>
-0xE492	0x82D2	# <CJK>
-0xE493	0x82F4	# <CJK>
-0xE494	0x82F3	# <CJK>
-0xE495	0x82FA	# <CJK>
-0xE496	0x8393	# <CJK>
-0xE497	0x8303	# <CJK>
-0xE498	0x82FB	# <CJK>
-0xE499	0x82F9	# <CJK>
-0xE49A	0x82DE	# <CJK>
-0xE49B	0x8306	# <CJK>
-0xE49C	0x82DC	# <CJK>
-0xE49D	0x8309	# <CJK>
-0xE49E	0x82D9	# <CJK>
-0xE49F	0x8335	# <CJK>
-0xE4A0	0x8334	# <CJK>
-0xE4A1	0x8316	# <CJK>
-0xE4A2	0x8332	# <CJK>
-0xE4A3	0x8331	# <CJK>
-0xE4A4	0x8340	# <CJK>
-0xE4A5	0x8339	# <CJK>
-0xE4A6	0x8350	# <CJK>
-0xE4A7	0x8345	# <CJK>
-0xE4A8	0x832F	# <CJK>
-0xE4A9	0x832B	# <CJK>
-0xE4AA	0x8317	# <CJK>
-0xE4AB	0x8318	# <CJK>
-0xE4AC	0x8385	# <CJK>
-0xE4AD	0x839A	# <CJK>
-0xE4AE	0x83AA	# <CJK>
-0xE4AF	0x839F	# <CJK>
-0xE4B0	0x83A2	# <CJK>
-0xE4B1	0x8396	# <CJK>
-0xE4B2	0x8323	# <CJK>
-0xE4B3	0x838E	# <CJK>
-0xE4B4	0x8387	# <CJK>
-0xE4B5	0x838A	# <CJK>
-0xE4B6	0x837C	# <CJK>
-0xE4B7	0x83B5	# <CJK>
-0xE4B8	0x8373	# <CJK>
-0xE4B9	0x8375	# <CJK>
-0xE4BA	0x83A0	# <CJK>
-0xE4BB	0x8389	# <CJK>
-0xE4BC	0x83A8	# <CJK>
-0xE4BD	0x83F4	# <CJK>
-0xE4BE	0x8413	# <CJK>
-0xE4BF	0x83EB	# <CJK>
-0xE4C0	0x83CE	# <CJK>
-0xE4C1	0x83FD	# <CJK>
-0xE4C2	0x8403	# <CJK>
-0xE4C3	0x83D8	# <CJK>
-0xE4C4	0x840B	# <CJK>
-0xE4C5	0x83C1	# <CJK>
-0xE4C6	0x83F7	# <CJK>
-0xE4C7	0x8407	# <CJK>
-0xE4C8	0x83E0	# <CJK>
-0xE4C9	0x83F2	# <CJK>
-0xE4CA	0x840D	# <CJK>
-0xE4CB	0x8422	# <CJK>
-0xE4CC	0x8420	# <CJK>
-0xE4CD	0x83BD	# <CJK>
-0xE4CE	0x8438	# <CJK>
-0xE4CF	0x8506	# <CJK>
-0xE4D0	0x83FB	# <CJK>
-0xE4D1	0x846D	# <CJK>
-0xE4D2	0x842A	# <CJK>
-0xE4D3	0x843C	# <CJK>
-0xE4D4	0x855A	# <CJK>
-0xE4D5	0x8484	# <CJK>
-0xE4D6	0x8477	# <CJK>
-0xE4D7	0x846B	# <CJK>
-0xE4D8	0x84AD	# <CJK>
-0xE4D9	0x846E	# <CJK>
-0xE4DA	0x8482	# <CJK>
-0xE4DB	0x8469	# <CJK>
-0xE4DC	0x8446	# <CJK>
-0xE4DD	0x842C	# <CJK>
-0xE4DE	0x846F	# <CJK>
-0xE4DF	0x8479	# <CJK>
-0xE4E0	0x8435	# <CJK>
-0xE4E1	0x84CA	# <CJK>
-0xE4E2	0x8462	# <CJK>
-0xE4E3	0x84B9	# <CJK>
-0xE4E4	0x84BF	# <CJK>
-0xE4E5	0x849F	# <CJK>
-0xE4E6	0x84D9	# <CJK>
-0xE4E7	0x84CD	# <CJK>
-0xE4E8	0x84BB	# <CJK>
-0xE4E9	0x84DA	# <CJK>
-0xE4EA	0x84D0	# <CJK>
-0xE4EB	0x84C1	# <CJK>
-0xE4EC	0x84C6	# <CJK>
-0xE4ED	0x84D6	# <CJK>
-0xE4EE	0x84A1	# <CJK>
-0xE4EF	0x8521	# <CJK>
-0xE4F0	0x84FF	# <CJK>
-0xE4F1	0x84F4	# <CJK>
-0xE4F2	0x8517	# <CJK>
-0xE4F3	0x8518	# <CJK>
-0xE4F4	0x852C	# <CJK>
-0xE4F5	0x851F	# <CJK>
-0xE4F6	0x8515	# <CJK>
-0xE4F7	0x8514	# <CJK>
-0xE4F8	0x84FC	# <CJK>
-0xE4F9	0x8540	# <CJK>
-0xE4FA	0x8563	# <CJK>
-0xE4FB	0x8558	# <CJK>
-0xE4FC	0x8548	# <CJK>
-0xE540	0x8541	# <CJK>
-0xE541	0x8602	# <CJK>
-0xE542	0x854B	# <CJK>
-0xE543	0x8555	# <CJK>
-0xE544	0x8580	# <CJK>
-0xE545	0x85A4	# <CJK>
-0xE546	0x8588	# <CJK>
-0xE547	0x8591	# <CJK>
-0xE548	0x858A	# <CJK>
-0xE549	0x85A8	# <CJK>
-0xE54A	0x856D	# <CJK>
-0xE54B	0x8594	# <CJK>
-0xE54C	0x859B	# <CJK>
-0xE54D	0x85EA	# <CJK>
-0xE54E	0x8587	# <CJK>
-0xE54F	0x859C	# <CJK>
-0xE550	0x8577	# <CJK>
-0xE551	0x857E	# <CJK>
-0xE552	0x8590	# <CJK>
-0xE553	0x85C9	# <CJK>
-0xE554	0x85BA	# <CJK>
-0xE555	0x85CF	# <CJK>
-0xE556	0x85B9	# <CJK>
-0xE557	0x85D0	# <CJK>
-0xE558	0x85D5	# <CJK>
-0xE559	0x85DD	# <CJK>
-0xE55A	0x85E5	# <CJK>
-0xE55B	0x85DC	# <CJK>
-0xE55C	0x85F9	# <CJK>
-0xE55D	0x860A	# <CJK>
-0xE55E	0x8613	# <CJK>
-0xE55F	0x860B	# <CJK>
-0xE560	0x85FE	# <CJK>
-0xE561	0x85FA	# <CJK>
-0xE562	0x8606	# <CJK>
-0xE563	0x8622	# <CJK>
-0xE564	0x861A	# <CJK>
-0xE565	0x8630	# <CJK>
-0xE566	0x863F	# <CJK>
-0xE567	0x864D	# <CJK>
-0xE568	0x4E55	# <CJK>
-0xE569	0x8654	# <CJK>
-0xE56A	0x865F	# <CJK>
-0xE56B	0x8667	# <CJK>
-0xE56C	0x8671	# <CJK>
-0xE56D	0x8693	# <CJK>
-0xE56E	0x86A3	# <CJK>
-0xE56F	0x86A9	# <CJK>
-0xE570	0x86AA	# <CJK>
-0xE571	0x868B	# <CJK>
-0xE572	0x868C	# <CJK>
-0xE573	0x86B6	# <CJK>
-0xE574	0x86AF	# <CJK>
-0xE575	0x86C4	# <CJK>
-0xE576	0x86C6	# <CJK>
-0xE577	0x86B0	# <CJK>
-0xE578	0x86C9	# <CJK>
-0xE579	0x8823	# <CJK>
-0xE57A	0x86AB	# <CJK>
-0xE57B	0x86D4	# <CJK>
-0xE57C	0x86DE	# <CJK>
-0xE57D	0x86E9	# <CJK>
-0xE57E	0x86EC	# <CJK>
-0xE580	0x86DF	# <CJK>
-0xE581	0x86DB	# <CJK>
-0xE582	0x86EF	# <CJK>
-0xE583	0x8712	# <CJK>
-0xE584	0x8706	# <CJK>
-0xE585	0x8708	# <CJK>
-0xE586	0x8700	# <CJK>
-0xE587	0x8703	# <CJK>
-0xE588	0x86FB	# <CJK>
-0xE589	0x8711	# <CJK>
-0xE58A	0x8709	# <CJK>
-0xE58B	0x870D	# <CJK>
-0xE58C	0x86F9	# <CJK>
-0xE58D	0x870A	# <CJK>
-0xE58E	0x8734	# <CJK>
-0xE58F	0x873F	# <CJK>
-0xE590	0x8737	# <CJK>
-0xE591	0x873B	# <CJK>
-0xE592	0x8725	# <CJK>
-0xE593	0x8729	# <CJK>
-0xE594	0x871A	# <CJK>
-0xE595	0x8760	# <CJK>
-0xE596	0x875F	# <CJK>
-0xE597	0x8778	# <CJK>
-0xE598	0x874C	# <CJK>
-0xE599	0x874E	# <CJK>
-0xE59A	0x8774	# <CJK>
-0xE59B	0x8757	# <CJK>
-0xE59C	0x8768	# <CJK>
-0xE59D	0x876E	# <CJK>
-0xE59E	0x8759	# <CJK>
-0xE59F	0x8753	# <CJK>
-0xE5A0	0x8763	# <CJK>
-0xE5A1	0x876A	# <CJK>
-0xE5A2	0x8805	# <CJK>
-0xE5A3	0x87A2	# <CJK>
-0xE5A4	0x879F	# <CJK>
-0xE5A5	0x8782	# <CJK>
-0xE5A6	0x87AF	# <CJK>
-0xE5A7	0x87CB	# <CJK>
-0xE5A8	0x87BD	# <CJK>
-0xE5A9	0x87C0	# <CJK>
-0xE5AA	0x87D0	# <CJK>
-0xE5AB	0x96D6	# <CJK>
-0xE5AC	0x87AB	# <CJK>
-0xE5AD	0x87C4	# <CJK>
-0xE5AE	0x87B3	# <CJK>
-0xE5AF	0x87C7	# <CJK>
-0xE5B0	0x87C6	# <CJK>
-0xE5B1	0x87BB	# <CJK>
-0xE5B2	0x87EF	# <CJK>
-0xE5B3	0x87F2	# <CJK>
-0xE5B4	0x87E0	# <CJK>
-0xE5B5	0x880F	# <CJK>
-0xE5B6	0x880D	# <CJK>
-0xE5B7	0x87FE	# <CJK>
-0xE5B8	0x87F6	# <CJK>
-0xE5B9	0x87F7	# <CJK>
-0xE5BA	0x880E	# <CJK>
-0xE5BB	0x87D2	# <CJK>
-0xE5BC	0x8811	# <CJK>
-0xE5BD	0x8816	# <CJK>
-0xE5BE	0x8815	# <CJK>
-0xE5BF	0x8822	# <CJK>
-0xE5C0	0x8821	# <CJK>
-0xE5C1	0x8831	# <CJK>
-0xE5C2	0x8836	# <CJK>
-0xE5C3	0x8839	# <CJK>
-0xE5C4	0x8827	# <CJK>
-0xE5C5	0x883B	# <CJK>
-0xE5C6	0x8844	# <CJK>
-0xE5C7	0x8842	# <CJK>
-0xE5C8	0x8852	# <CJK>
-0xE5C9	0x8859	# <CJK>
-0xE5CA	0x885E	# <CJK>
-0xE5CB	0x8862	# <CJK>
-0xE5CC	0x886B	# <CJK>
-0xE5CD	0x8881	# <CJK>
-0xE5CE	0x887E	# <CJK>
-0xE5CF	0x889E	# <CJK>
-0xE5D0	0x8875	# <CJK>
-0xE5D1	0x887D	# <CJK>
-0xE5D2	0x88B5	# <CJK>
-0xE5D3	0x8872	# <CJK>
-0xE5D4	0x8882	# <CJK>
-0xE5D5	0x8897	# <CJK>
-0xE5D6	0x8892	# <CJK>
-0xE5D7	0x88AE	# <CJK>
-0xE5D8	0x8899	# <CJK>
-0xE5D9	0x88A2	# <CJK>
-0xE5DA	0x888D	# <CJK>
-0xE5DB	0x88A4	# <CJK>
-0xE5DC	0x88B0	# <CJK>
-0xE5DD	0x88BF	# <CJK>
-0xE5DE	0x88B1	# <CJK>
-0xE5DF	0x88C3	# <CJK>
-0xE5E0	0x88C4	# <CJK>
-0xE5E1	0x88D4	# <CJK>
-0xE5E2	0x88D8	# <CJK>
-0xE5E3	0x88D9	# <CJK>
-0xE5E4	0x88DD	# <CJK>
-0xE5E5	0x88F9	# <CJK>
-0xE5E6	0x8902	# <CJK>
-0xE5E7	0x88FC	# <CJK>
-0xE5E8	0x88F4	# <CJK>
-0xE5E9	0x88E8	# <CJK>
-0xE5EA	0x88F2	# <CJK>
-0xE5EB	0x8904	# <CJK>
-0xE5EC	0x890C	# <CJK>
-0xE5ED	0x890A	# <CJK>
-0xE5EE	0x8913	# <CJK>
-0xE5EF	0x8943	# <CJK>
-0xE5F0	0x891E	# <CJK>
-0xE5F1	0x8925	# <CJK>
-0xE5F2	0x892A	# <CJK>
-0xE5F3	0x892B	# <CJK>
-0xE5F4	0x8941	# <CJK>
-0xE5F5	0x8944	# <CJK>
-0xE5F6	0x893B	# <CJK>
-0xE5F7	0x8936	# <CJK>
-0xE5F8	0x8938	# <CJK>
-0xE5F9	0x894C	# <CJK>
-0xE5FA	0x891D	# <CJK>
-0xE5FB	0x8960	# <CJK>
-0xE5FC	0x895E	# <CJK>
-0xE640	0x8966	# <CJK>
-0xE641	0x8964	# <CJK>
-0xE642	0x896D	# <CJK>
-0xE643	0x896A	# <CJK>
-0xE644	0x896F	# <CJK>
-0xE645	0x8974	# <CJK>
-0xE646	0x8977	# <CJK>
-0xE647	0x897E	# <CJK>
-0xE648	0x8983	# <CJK>
-0xE649	0x8988	# <CJK>
-0xE64A	0x898A	# <CJK>
-0xE64B	0x8993	# <CJK>
-0xE64C	0x8998	# <CJK>
-0xE64D	0x89A1	# <CJK>
-0xE64E	0x89A9	# <CJK>
-0xE64F	0x89A6	# <CJK>
-0xE650	0x89AC	# <CJK>
-0xE651	0x89AF	# <CJK>
-0xE652	0x89B2	# <CJK>
-0xE653	0x89BA	# <CJK>
-0xE654	0x89BD	# <CJK>
-0xE655	0x89BF	# <CJK>
-0xE656	0x89C0	# <CJK>
-0xE657	0x89DA	# <CJK>
-0xE658	0x89DC	# <CJK>
-0xE659	0x89DD	# <CJK>
-0xE65A	0x89E7	# <CJK>
-0xE65B	0x89F4	# <CJK>
-0xE65C	0x89F8	# <CJK>
-0xE65D	0x8A03	# <CJK>
-0xE65E	0x8A16	# <CJK>
-0xE65F	0x8A10	# <CJK>
-0xE660	0x8A0C	# <CJK>
-0xE661	0x8A1B	# <CJK>
-0xE662	0x8A1D	# <CJK>
-0xE663	0x8A25	# <CJK>
-0xE664	0x8A36	# <CJK>
-0xE665	0x8A41	# <CJK>
-0xE666	0x8A5B	# <CJK>
-0xE667	0x8A52	# <CJK>
-0xE668	0x8A46	# <CJK>
-0xE669	0x8A48	# <CJK>
-0xE66A	0x8A7C	# <CJK>
-0xE66B	0x8A6D	# <CJK>
-0xE66C	0x8A6C	# <CJK>
-0xE66D	0x8A62	# <CJK>
-0xE66E	0x8A85	# <CJK>
-0xE66F	0x8A82	# <CJK>
-0xE670	0x8A84	# <CJK>
-0xE671	0x8AA8	# <CJK>
-0xE672	0x8AA1	# <CJK>
-0xE673	0x8A91	# <CJK>
-0xE674	0x8AA5	# <CJK>
-0xE675	0x8AA6	# <CJK>
-0xE676	0x8A9A	# <CJK>
-0xE677	0x8AA3	# <CJK>
-0xE678	0x8AC4	# <CJK>
-0xE679	0x8ACD	# <CJK>
-0xE67A	0x8AC2	# <CJK>
-0xE67B	0x8ADA	# <CJK>
-0xE67C	0x8AEB	# <CJK>
-0xE67D	0x8AF3	# <CJK>
-0xE67E	0x8AE7	# <CJK>
-0xE680	0x8AE4	# <CJK>
-0xE681	0x8AF1	# <CJK>
-0xE682	0x8B14	# <CJK>
-0xE683	0x8AE0	# <CJK>
-0xE684	0x8AE2	# <CJK>
-0xE685	0x8AF7	# <CJK>
-0xE686	0x8ADE	# <CJK>
-0xE687	0x8ADB	# <CJK>
-0xE688	0x8B0C	# <CJK>
-0xE689	0x8B07	# <CJK>
-0xE68A	0x8B1A	# <CJK>
-0xE68B	0x8AE1	# <CJK>
-0xE68C	0x8B16	# <CJK>
-0xE68D	0x8B10	# <CJK>
-0xE68E	0x8B17	# <CJK>
-0xE68F	0x8B20	# <CJK>
-0xE690	0x8B33	# <CJK>
-0xE691	0x97AB	# <CJK>
-0xE692	0x8B26	# <CJK>
-0xE693	0x8B2B	# <CJK>
-0xE694	0x8B3E	# <CJK>
-0xE695	0x8B28	# <CJK>
-0xE696	0x8B41	# <CJK>
-0xE697	0x8B4C	# <CJK>
-0xE698	0x8B4F	# <CJK>
-0xE699	0x8B4E	# <CJK>
-0xE69A	0x8B49	# <CJK>
-0xE69B	0x8B56	# <CJK>
-0xE69C	0x8B5B	# <CJK>
-0xE69D	0x8B5A	# <CJK>
-0xE69E	0x8B6B	# <CJK>
-0xE69F	0x8B5F	# <CJK>
-0xE6A0	0x8B6C	# <CJK>
-0xE6A1	0x8B6F	# <CJK>
-0xE6A2	0x8B74	# <CJK>
-0xE6A3	0x8B7D	# <CJK>
-0xE6A4	0x8B80	# <CJK>
-0xE6A5	0x8B8C	# <CJK>
-0xE6A6	0x8B8E	# <CJK>
-0xE6A7	0x8B92	# <CJK>
-0xE6A8	0x8B93	# <CJK>
-0xE6A9	0x8B96	# <CJK>
-0xE6AA	0x8B99	# <CJK>
-0xE6AB	0x8B9A	# <CJK>
-0xE6AC	0x8C3A	# <CJK>
-0xE6AD	0x8C41	# <CJK>
-0xE6AE	0x8C3F	# <CJK>
-0xE6AF	0x8C48	# <CJK>
-0xE6B0	0x8C4C	# <CJK>
-0xE6B1	0x8C4E	# <CJK>
-0xE6B2	0x8C50	# <CJK>
-0xE6B3	0x8C55	# <CJK>
-0xE6B4	0x8C62	# <CJK>
-0xE6B5	0x8C6C	# <CJK>
-0xE6B6	0x8C78	# <CJK>
-0xE6B7	0x8C7A	# <CJK>
-0xE6B8	0x8C82	# <CJK>
-0xE6B9	0x8C89	# <CJK>
-0xE6BA	0x8C85	# <CJK>
-0xE6BB	0x8C8A	# <CJK>
-0xE6BC	0x8C8D	# <CJK>
-0xE6BD	0x8C8E	# <CJK>
-0xE6BE	0x8C94	# <CJK>
-0xE6BF	0x8C7C	# <CJK>
-0xE6C0	0x8C98	# <CJK>
-0xE6C1	0x621D	# <CJK>
-0xE6C2	0x8CAD	# <CJK>
-0xE6C3	0x8CAA	# <CJK>
-0xE6C4	0x8CBD	# <CJK>
-0xE6C5	0x8CB2	# <CJK>
-0xE6C6	0x8CB3	# <CJK>
-0xE6C7	0x8CAE	# <CJK>
-0xE6C8	0x8CB6	# <CJK>
-0xE6C9	0x8CC8	# <CJK>
-0xE6CA	0x8CC1	# <CJK>
-0xE6CB	0x8CE4	# <CJK>
-0xE6CC	0x8CE3	# <CJK>
-0xE6CD	0x8CDA	# <CJK>
-0xE6CE	0x8CFD	# <CJK>
-0xE6CF	0x8CFA	# <CJK>
-0xE6D0	0x8CFB	# <CJK>
-0xE6D1	0x8D04	# <CJK>
-0xE6D2	0x8D05	# <CJK>
-0xE6D3	0x8D0A	# <CJK>
-0xE6D4	0x8D07	# <CJK>
-0xE6D5	0x8D0F	# <CJK>
-0xE6D6	0x8D0D	# <CJK>
-0xE6D7	0x8D10	# <CJK>
-0xE6D8	0x9F4E	# <CJK>
-0xE6D9	0x8D13	# <CJK>
-0xE6DA	0x8CCD	# <CJK>
-0xE6DB	0x8D14	# <CJK>
-0xE6DC	0x8D16	# <CJK>
-0xE6DD	0x8D67	# <CJK>
-0xE6DE	0x8D6D	# <CJK>
-0xE6DF	0x8D71	# <CJK>
-0xE6E0	0x8D73	# <CJK>
-0xE6E1	0x8D81	# <CJK>
-0xE6E2	0x8D99	# <CJK>
-0xE6E3	0x8DC2	# <CJK>
-0xE6E4	0x8DBE	# <CJK>
-0xE6E5	0x8DBA	# <CJK>
-0xE6E6	0x8DCF	# <CJK>
-0xE6E7	0x8DDA	# <CJK>
-0xE6E8	0x8DD6	# <CJK>
-0xE6E9	0x8DCC	# <CJK>
-0xE6EA	0x8DDB	# <CJK>
-0xE6EB	0x8DCB	# <CJK>
-0xE6EC	0x8DEA	# <CJK>
-0xE6ED	0x8DEB	# <CJK>
-0xE6EE	0x8DDF	# <CJK>
-0xE6EF	0x8DE3	# <CJK>
-0xE6F0	0x8DFC	# <CJK>
-0xE6F1	0x8E08	# <CJK>
-0xE6F2	0x8E09	# <CJK>
-0xE6F3	0x8DFF	# <CJK>
-0xE6F4	0x8E1D	# <CJK>
-0xE6F5	0x8E1E	# <CJK>
-0xE6F6	0x8E10	# <CJK>
-0xE6F7	0x8E1F	# <CJK>
-0xE6F8	0x8E42	# <CJK>
-0xE6F9	0x8E35	# <CJK>
-0xE6FA	0x8E30	# <CJK>
-0xE6FB	0x8E34	# <CJK>
-0xE6FC	0x8E4A	# <CJK>
-0xE740	0x8E47	# <CJK>
-0xE741	0x8E49	# <CJK>
-0xE742	0x8E4C	# <CJK>
-0xE743	0x8E50	# <CJK>
-0xE744	0x8E48	# <CJK>
-0xE745	0x8E59	# <CJK>
-0xE746	0x8E64	# <CJK>
-0xE747	0x8E60	# <CJK>
-0xE748	0x8E2A	# <CJK>
-0xE749	0x8E63	# <CJK>
-0xE74A	0x8E55	# <CJK>
-0xE74B	0x8E76	# <CJK>
-0xE74C	0x8E72	# <CJK>
-0xE74D	0x8E7C	# <CJK>
-0xE74E	0x8E81	# <CJK>
-0xE74F	0x8E87	# <CJK>
-0xE750	0x8E85	# <CJK>
-0xE751	0x8E84	# <CJK>
-0xE752	0x8E8B	# <CJK>
-0xE753	0x8E8A	# <CJK>
-0xE754	0x8E93	# <CJK>
-0xE755	0x8E91	# <CJK>
-0xE756	0x8E94	# <CJK>
-0xE757	0x8E99	# <CJK>
-0xE758	0x8EAA	# <CJK>
-0xE759	0x8EA1	# <CJK>
-0xE75A	0x8EAC	# <CJK>
-0xE75B	0x8EB0	# <CJK>
-0xE75C	0x8EC6	# <CJK>
-0xE75D	0x8EB1	# <CJK>
-0xE75E	0x8EBE	# <CJK>
-0xE75F	0x8EC5	# <CJK>
-0xE760	0x8EC8	# <CJK>
-0xE761	0x8ECB	# <CJK>
-0xE762	0x8EDB	# <CJK>
-0xE763	0x8EE3	# <CJK>
-0xE764	0x8EFC	# <CJK>
-0xE765	0x8EFB	# <CJK>
-0xE766	0x8EEB	# <CJK>
-0xE767	0x8EFE	# <CJK>
-0xE768	0x8F0A	# <CJK>
-0xE769	0x8F05	# <CJK>
-0xE76A	0x8F15	# <CJK>
-0xE76B	0x8F12	# <CJK>
-0xE76C	0x8F19	# <CJK>
-0xE76D	0x8F13	# <CJK>
-0xE76E	0x8F1C	# <CJK>
-0xE76F	0x8F1F	# <CJK>
-0xE770	0x8F1B	# <CJK>
-0xE771	0x8F0C	# <CJK>
-0xE772	0x8F26	# <CJK>
-0xE773	0x8F33	# <CJK>
-0xE774	0x8F3B	# <CJK>
-0xE775	0x8F39	# <CJK>
-0xE776	0x8F45	# <CJK>
-0xE777	0x8F42	# <CJK>
-0xE778	0x8F3E	# <CJK>
-0xE779	0x8F4C	# <CJK>
-0xE77A	0x8F49	# <CJK>
-0xE77B	0x8F46	# <CJK>
-0xE77C	0x8F4E	# <CJK>
-0xE77D	0x8F57	# <CJK>
-0xE77E	0x8F5C	# <CJK>
-0xE780	0x8F62	# <CJK>
-0xE781	0x8F63	# <CJK>
-0xE782	0x8F64	# <CJK>
-0xE783	0x8F9C	# <CJK>
-0xE784	0x8F9F	# <CJK>
-0xE785	0x8FA3	# <CJK>
-0xE786	0x8FAD	# <CJK>
-0xE787	0x8FAF	# <CJK>
-0xE788	0x8FB7	# <CJK>
-0xE789	0x8FDA	# <CJK>
-0xE78A	0x8FE5	# <CJK>
-0xE78B	0x8FE2	# <CJK>
-0xE78C	0x8FEA	# <CJK>
-0xE78D	0x8FEF	# <CJK>
-0xE78E	0x9087	# <CJK>
-0xE78F	0x8FF4	# <CJK>
-0xE790	0x9005	# <CJK>
-0xE791	0x8FF9	# <CJK>
-0xE792	0x8FFA	# <CJK>
-0xE793	0x9011	# <CJK>
-0xE794	0x9015	# <CJK>
-0xE795	0x9021	# <CJK>
-0xE796	0x900D	# <CJK>
-0xE797	0x901E	# <CJK>
-0xE798	0x9016	# <CJK>
-0xE799	0x900B	# <CJK>
-0xE79A	0x9027	# <CJK>
-0xE79B	0x9036	# <CJK>
-0xE79C	0x9035	# <CJK>
-0xE79D	0x9039	# <CJK>
-0xE79E	0x8FF8	# <CJK>
-0xE79F	0x904F	# <CJK>
-0xE7A0	0x9050	# <CJK>
-0xE7A1	0x9051	# <CJK>
-0xE7A2	0x9052	# <CJK>
-0xE7A3	0x900E	# <CJK>
-0xE7A4	0x9049	# <CJK>
-0xE7A5	0x903E	# <CJK>
-0xE7A6	0x9056	# <CJK>
-0xE7A7	0x9058	# <CJK>
-0xE7A8	0x905E	# <CJK>
-0xE7A9	0x9068	# <CJK>
-0xE7AA	0x906F	# <CJK>
-0xE7AB	0x9076	# <CJK>
-0xE7AC	0x96A8	# <CJK>
-0xE7AD	0x9072	# <CJK>
-0xE7AE	0x9082	# <CJK>
-0xE7AF	0x907D	# <CJK>
-0xE7B0	0x9081	# <CJK>
-0xE7B1	0x9080	# <CJK>
-0xE7B2	0x908A	# <CJK>
-0xE7B3	0x9089	# <CJK>
-0xE7B4	0x908F	# <CJK>
-0xE7B5	0x90A8	# <CJK>
-0xE7B6	0x90AF	# <CJK>
-0xE7B7	0x90B1	# <CJK>
-0xE7B8	0x90B5	# <CJK>
-0xE7B9	0x90E2	# <CJK>
-0xE7BA	0x90E4	# <CJK>
-0xE7BB	0x6248	# <CJK>
-0xE7BC	0x90DB	# <CJK>
-0xE7BD	0x9102	# <CJK>
-0xE7BE	0x9112	# <CJK>
-0xE7BF	0x9119	# <CJK>
-0xE7C0	0x9132	# <CJK>
-0xE7C1	0x9130	# <CJK>
-0xE7C2	0x914A	# <CJK>
-0xE7C3	0x9156	# <CJK>
-0xE7C4	0x9158	# <CJK>
-0xE7C5	0x9163	# <CJK>
-0xE7C6	0x9165	# <CJK>
-0xE7C7	0x9169	# <CJK>
-0xE7C8	0x9173	# <CJK>
-0xE7C9	0x9172	# <CJK>
-0xE7CA	0x918B	# <CJK>
-0xE7CB	0x9189	# <CJK>
-0xE7CC	0x9182	# <CJK>
-0xE7CD	0x91A2	# <CJK>
-0xE7CE	0x91AB	# <CJK>
-0xE7CF	0x91AF	# <CJK>
-0xE7D0	0x91AA	# <CJK>
-0xE7D1	0x91B5	# <CJK>
-0xE7D2	0x91B4	# <CJK>
-0xE7D3	0x91BA	# <CJK>
-0xE7D4	0x91C0	# <CJK>
-0xE7D5	0x91C1	# <CJK>
-0xE7D6	0x91C9	# <CJK>
-0xE7D7	0x91CB	# <CJK>
-0xE7D8	0x91D0	# <CJK>
-0xE7D9	0x91D6	# <CJK>
-0xE7DA	0x91DF	# <CJK>
-0xE7DB	0x91E1	# <CJK>
-0xE7DC	0x91DB	# <CJK>
-0xE7DD	0x91FC	# <CJK>
-0xE7DE	0x91F5	# <CJK>
-0xE7DF	0x91F6	# <CJK>
-0xE7E0	0x921E	# <CJK>
-0xE7E1	0x91FF	# <CJK>
-0xE7E2	0x9214	# <CJK>
-0xE7E3	0x922C	# <CJK>
-0xE7E4	0x9215	# <CJK>
-0xE7E5	0x9211	# <CJK>
-0xE7E6	0x925E	# <CJK>
-0xE7E7	0x9257	# <CJK>
-0xE7E8	0x9245	# <CJK>
-0xE7E9	0x9249	# <CJK>
-0xE7EA	0x9264	# <CJK>
-0xE7EB	0x9248	# <CJK>
-0xE7EC	0x9295	# <CJK>
-0xE7ED	0x923F	# <CJK>
-0xE7EE	0x924B	# <CJK>
-0xE7EF	0x9250	# <CJK>
-0xE7F0	0x929C	# <CJK>
-0xE7F1	0x9296	# <CJK>
-0xE7F2	0x9293	# <CJK>
-0xE7F3	0x929B	# <CJK>
-0xE7F4	0x925A	# <CJK>
-0xE7F5	0x92CF	# <CJK>
-0xE7F6	0x92B9	# <CJK>
-0xE7F7	0x92B7	# <CJK>
-0xE7F8	0x92E9	# <CJK>
-0xE7F9	0x930F	# <CJK>
-0xE7FA	0x92FA	# <CJK>
-0xE7FB	0x9344	# <CJK>
-0xE7FC	0x932E	# <CJK>
-0xE840	0x9319	# <CJK>
-0xE841	0x9322	# <CJK>
-0xE842	0x931A	# <CJK>
-0xE843	0x9323	# <CJK>
-0xE844	0x933A	# <CJK>
-0xE845	0x9335	# <CJK>
-0xE846	0x933B	# <CJK>
-0xE847	0x935C	# <CJK>
-0xE848	0x9360	# <CJK>
-0xE849	0x937C	# <CJK>
-0xE84A	0x936E	# <CJK>
-0xE84B	0x9356	# <CJK>
-0xE84C	0x93B0	# <CJK>
-0xE84D	0x93AC	# <CJK>
-0xE84E	0x93AD	# <CJK>
-0xE84F	0x9394	# <CJK>
-0xE850	0x93B9	# <CJK>
-0xE851	0x93D6	# <CJK>
-0xE852	0x93D7	# <CJK>
-0xE853	0x93E8	# <CJK>
-0xE854	0x93E5	# <CJK>
-0xE855	0x93D8	# <CJK>
-0xE856	0x93C3	# <CJK>
-0xE857	0x93DD	# <CJK>
-0xE858	0x93D0	# <CJK>
-0xE859	0x93C8	# <CJK>
-0xE85A	0x93E4	# <CJK>
-0xE85B	0x941A	# <CJK>
-0xE85C	0x9414	# <CJK>
-0xE85D	0x9413	# <CJK>
-0xE85E	0x9403	# <CJK>
-0xE85F	0x9407	# <CJK>
-0xE860	0x9410	# <CJK>
-0xE861	0x9436	# <CJK>
-0xE862	0x942B	# <CJK>
-0xE863	0x9435	# <CJK>
-0xE864	0x9421	# <CJK>
-0xE865	0x943A	# <CJK>
-0xE866	0x9441	# <CJK>
-0xE867	0x9452	# <CJK>
-0xE868	0x9444	# <CJK>
-0xE869	0x945B	# <CJK>
-0xE86A	0x9460	# <CJK>
-0xE86B	0x9462	# <CJK>
-0xE86C	0x945E	# <CJK>
-0xE86D	0x946A	# <CJK>
-0xE86E	0x9229	# <CJK>
-0xE86F	0x9470	# <CJK>
-0xE870	0x9475	# <CJK>
-0xE871	0x9477	# <CJK>
-0xE872	0x947D	# <CJK>
-0xE873	0x945A	# <CJK>
-0xE874	0x947C	# <CJK>
-0xE875	0x947E	# <CJK>
-0xE876	0x9481	# <CJK>
-0xE877	0x947F	# <CJK>
-0xE878	0x9582	# <CJK>
-0xE879	0x9587	# <CJK>
-0xE87A	0x958A	# <CJK>
-0xE87B	0x9594	# <CJK>
-0xE87C	0x9596	# <CJK>
-0xE87D	0x9598	# <CJK>
-0xE87E	0x9599	# <CJK>
-0xE880	0x95A0	# <CJK>
-0xE881	0x95A8	# <CJK>
-0xE882	0x95A7	# <CJK>
-0xE883	0x95AD	# <CJK>
-0xE884	0x95BC	# <CJK>
-0xE885	0x95BB	# <CJK>
-0xE886	0x95B9	# <CJK>
-0xE887	0x95BE	# <CJK>
-0xE888	0x95CA	# <CJK>
-0xE889	0x6FF6	# <CJK>
-0xE88A	0x95C3	# <CJK>
-0xE88B	0x95CD	# <CJK>
-0xE88C	0x95CC	# <CJK>
-0xE88D	0x95D5	# <CJK>
-0xE88E	0x95D4	# <CJK>
-0xE88F	0x95D6	# <CJK>
-0xE890	0x95DC	# <CJK>
-0xE891	0x95E1	# <CJK>
-0xE892	0x95E5	# <CJK>
-0xE893	0x95E2	# <CJK>
-0xE894	0x9621	# <CJK>
-0xE895	0x9628	# <CJK>
-0xE896	0x962E	# <CJK>
-0xE897	0x962F	# <CJK>
-0xE898	0x9642	# <CJK>
-0xE899	0x964C	# <CJK>
-0xE89A	0x964F	# <CJK>
-0xE89B	0x964B	# <CJK>
-0xE89C	0x9677	# <CJK>
-0xE89D	0x965C	# <CJK>
-0xE89E	0x965E	# <CJK>
-0xE89F	0x965D	# <CJK>
-0xE8A0	0x965F	# <CJK>
-0xE8A1	0x9666	# <CJK>
-0xE8A2	0x9672	# <CJK>
-0xE8A3	0x966C	# <CJK>
-0xE8A4	0x968D	# <CJK>
-0xE8A5	0x9698	# <CJK>
-0xE8A6	0x9695	# <CJK>
-0xE8A7	0x9697	# <CJK>
-0xE8A8	0x96AA	# <CJK>
-0xE8A9	0x96A7	# <CJK>
-0xE8AA	0x96B1	# <CJK>
-0xE8AB	0x96B2	# <CJK>
-0xE8AC	0x96B0	# <CJK>
-0xE8AD	0x96B4	# <CJK>
-0xE8AE	0x96B6	# <CJK>
-0xE8AF	0x96B8	# <CJK>
-0xE8B0	0x96B9	# <CJK>
-0xE8B1	0x96CE	# <CJK>
-0xE8B2	0x96CB	# <CJK>
-0xE8B3	0x96C9	# <CJK>
-0xE8B4	0x96CD	# <CJK>
-0xE8B5	0x894D	# <CJK>
-0xE8B6	0x96DC	# <CJK>
-0xE8B7	0x970D	# <CJK>
-0xE8B8	0x96D5	# <CJK>
-0xE8B9	0x96F9	# <CJK>
-0xE8BA	0x9704	# <CJK>
-0xE8BB	0x9706	# <CJK>
-0xE8BC	0x9708	# <CJK>
-0xE8BD	0x9713	# <CJK>
-0xE8BE	0x970E	# <CJK>
-0xE8BF	0x9711	# <CJK>
-0xE8C0	0x970F	# <CJK>
-0xE8C1	0x9716	# <CJK>
-0xE8C2	0x9719	# <CJK>
-0xE8C3	0x9724	# <CJK>
-0xE8C4	0x972A	# <CJK>
-0xE8C5	0x9730	# <CJK>
-0xE8C6	0x9739	# <CJK>
-0xE8C7	0x973D	# <CJK>
-0xE8C8	0x973E	# <CJK>
-0xE8C9	0x9744	# <CJK>
-0xE8CA	0x9746	# <CJK>
-0xE8CB	0x9748	# <CJK>
-0xE8CC	0x9742	# <CJK>
-0xE8CD	0x9749	# <CJK>
-0xE8CE	0x975C	# <CJK>
-0xE8CF	0x9760	# <CJK>
-0xE8D0	0x9764	# <CJK>
-0xE8D1	0x9766	# <CJK>
-0xE8D2	0x9768	# <CJK>
-0xE8D3	0x52D2	# <CJK>
-0xE8D4	0x976B	# <CJK>
-0xE8D5	0x9771	# <CJK>
-0xE8D6	0x9779	# <CJK>
-0xE8D7	0x9785	# <CJK>
-0xE8D8	0x977C	# <CJK>
-0xE8D9	0x9781	# <CJK>
-0xE8DA	0x977A	# <CJK>
-0xE8DB	0x9786	# <CJK>
-0xE8DC	0x978B	# <CJK>
-0xE8DD	0x978F	# <CJK>
-0xE8DE	0x9790	# <CJK>
-0xE8DF	0x979C	# <CJK>
-0xE8E0	0x97A8	# <CJK>
-0xE8E1	0x97A6	# <CJK>
-0xE8E2	0x97A3	# <CJK>
-0xE8E3	0x97B3	# <CJK>
-0xE8E4	0x97B4	# <CJK>
-0xE8E5	0x97C3	# <CJK>
-0xE8E6	0x97C6	# <CJK>
-0xE8E7	0x97C8	# <CJK>
-0xE8E8	0x97CB	# <CJK>
-0xE8E9	0x97DC	# <CJK>
-0xE8EA	0x97ED	# <CJK>
-0xE8EB	0x9F4F	# <CJK>
-0xE8EC	0x97F2	# <CJK>
-0xE8ED	0x7ADF	# <CJK>
-0xE8EE	0x97F6	# <CJK>
-0xE8EF	0x97F5	# <CJK>
-0xE8F0	0x980F	# <CJK>
-0xE8F1	0x980C	# <CJK>
-0xE8F2	0x9838	# <CJK>
-0xE8F3	0x9824	# <CJK>
-0xE8F4	0x9821	# <CJK>
-0xE8F5	0x9837	# <CJK>
-0xE8F6	0x983D	# <CJK>
-0xE8F7	0x9846	# <CJK>
-0xE8F8	0x984F	# <CJK>
-0xE8F9	0x984B	# <CJK>
-0xE8FA	0x986B	# <CJK>
-0xE8FB	0x986F	# <CJK>
-0xE8FC	0x9870	# <CJK>
-0xE940	0x9871	# <CJK>
-0xE941	0x9874	# <CJK>
-0xE942	0x9873	# <CJK>
-0xE943	0x98AA	# <CJK>
-0xE944	0x98AF	# <CJK>
-0xE945	0x98B1	# <CJK>
-0xE946	0x98B6	# <CJK>
-0xE947	0x98C4	# <CJK>
-0xE948	0x98C3	# <CJK>
-0xE949	0x98C6	# <CJK>
-0xE94A	0x98E9	# <CJK>
-0xE94B	0x98EB	# <CJK>
-0xE94C	0x9903	# <CJK>
-0xE94D	0x9909	# <CJK>
-0xE94E	0x9912	# <CJK>
-0xE94F	0x9914	# <CJK>
-0xE950	0x9918	# <CJK>
-0xE951	0x9921	# <CJK>
-0xE952	0x991D	# <CJK>
-0xE953	0x991E	# <CJK>
-0xE954	0x9924	# <CJK>
-0xE955	0x9920	# <CJK>
-0xE956	0x992C	# <CJK>
-0xE957	0x992E	# <CJK>
-0xE958	0x993D	# <CJK>
-0xE959	0x993E	# <CJK>
-0xE95A	0x9942	# <CJK>
-0xE95B	0x9949	# <CJK>
-0xE95C	0x9945	# <CJK>
-0xE95D	0x9950	# <CJK>
-0xE95E	0x994B	# <CJK>
-0xE95F	0x9951	# <CJK>
-0xE960	0x9952	# <CJK>
-0xE961	0x994C	# <CJK>
-0xE962	0x9955	# <CJK>
-0xE963	0x9997	# <CJK>
-0xE964	0x9998	# <CJK>
-0xE965	0x99A5	# <CJK>
-0xE966	0x99AD	# <CJK>
-0xE967	0x99AE	# <CJK>
-0xE968	0x99BC	# <CJK>
-0xE969	0x99DF	# <CJK>
-0xE96A	0x99DB	# <CJK>
-0xE96B	0x99DD	# <CJK>
-0xE96C	0x99D8	# <CJK>
-0xE96D	0x99D1	# <CJK>
-0xE96E	0x99ED	# <CJK>
-0xE96F	0x99EE	# <CJK>
-0xE970	0x99F1	# <CJK>
-0xE971	0x99F2	# <CJK>
-0xE972	0x99FB	# <CJK>
-0xE973	0x99F8	# <CJK>
-0xE974	0x9A01	# <CJK>
-0xE975	0x9A0F	# <CJK>
-0xE976	0x9A05	# <CJK>
-0xE977	0x99E2	# <CJK>
-0xE978	0x9A19	# <CJK>
-0xE979	0x9A2B	# <CJK>
-0xE97A	0x9A37	# <CJK>
-0xE97B	0x9A45	# <CJK>
-0xE97C	0x9A42	# <CJK>
-0xE97D	0x9A40	# <CJK>
-0xE97E	0x9A43	# <CJK>
-0xE980	0x9A3E	# <CJK>
-0xE981	0x9A55	# <CJK>
-0xE982	0x9A4D	# <CJK>
-0xE983	0x9A5B	# <CJK>
-0xE984	0x9A57	# <CJK>
-0xE985	0x9A5F	# <CJK>
-0xE986	0x9A62	# <CJK>
-0xE987	0x9A65	# <CJK>
-0xE988	0x9A64	# <CJK>
-0xE989	0x9A69	# <CJK>
-0xE98A	0x9A6B	# <CJK>
-0xE98B	0x9A6A	# <CJK>
-0xE98C	0x9AAD	# <CJK>
-0xE98D	0x9AB0	# <CJK>
-0xE98E	0x9ABC	# <CJK>
-0xE98F	0x9AC0	# <CJK>
-0xE990	0x9ACF	# <CJK>
-0xE991	0x9AD1	# <CJK>
-0xE992	0x9AD3	# <CJK>
-0xE993	0x9AD4	# <CJK>
-0xE994	0x9ADE	# <CJK>
-0xE995	0x9ADF	# <CJK>
-0xE996	0x9AE2	# <CJK>
-0xE997	0x9AE3	# <CJK>
-0xE998	0x9AE6	# <CJK>
-0xE999	0x9AEF	# <CJK>
-0xE99A	0x9AEB	# <CJK>
-0xE99B	0x9AEE	# <CJK>
-0xE99C	0x9AF4	# <CJK>
-0xE99D	0x9AF1	# <CJK>
-0xE99E	0x9AF7	# <CJK>
-0xE99F	0x9AFB	# <CJK>
-0xE9A0	0x9B06	# <CJK>
-0xE9A1	0x9B18	# <CJK>
-0xE9A2	0x9B1A	# <CJK>
-0xE9A3	0x9B1F	# <CJK>
-0xE9A4	0x9B22	# <CJK>
-0xE9A5	0x9B23	# <CJK>
-0xE9A6	0x9B25	# <CJK>
-0xE9A7	0x9B27	# <CJK>
-0xE9A8	0x9B28	# <CJK>
-0xE9A9	0x9B29	# <CJK>
-0xE9AA	0x9B2A	# <CJK>
-0xE9AB	0x9B2E	# <CJK>
-0xE9AC	0x9B2F	# <CJK>
-0xE9AD	0x9B32	# <CJK>
-0xE9AE	0x9B44	# <CJK>
-0xE9AF	0x9B43	# <CJK>
-0xE9B0	0x9B4F	# <CJK>
-0xE9B1	0x9B4D	# <CJK>
-0xE9B2	0x9B4E	# <CJK>
-0xE9B3	0x9B51	# <CJK>
-0xE9B4	0x9B58	# <CJK>
-0xE9B5	0x9B74	# <CJK>
-0xE9B6	0x9B93	# <CJK>
-0xE9B7	0x9B83	# <CJK>
-0xE9B8	0x9B91	# <CJK>
-0xE9B9	0x9B96	# <CJK>
-0xE9BA	0x9B97	# <CJK>
-0xE9BB	0x9B9F	# <CJK>
-0xE9BC	0x9BA0	# <CJK>
-0xE9BD	0x9BA8	# <CJK>
-0xE9BE	0x9BB4	# <CJK>
-0xE9BF	0x9BC0	# <CJK>
-0xE9C0	0x9BCA	# <CJK>
-0xE9C1	0x9BB9	# <CJK>
-0xE9C2	0x9BC6	# <CJK>
-0xE9C3	0x9BCF	# <CJK>
-0xE9C4	0x9BD1	# <CJK>
-0xE9C5	0x9BD2	# <CJK>
-0xE9C6	0x9BE3	# <CJK>
-0xE9C7	0x9BE2	# <CJK>
-0xE9C8	0x9BE4	# <CJK>
-0xE9C9	0x9BD4	# <CJK>
-0xE9CA	0x9BE1	# <CJK>
-0xE9CB	0x9C3A	# <CJK>
-0xE9CC	0x9BF2	# <CJK>
-0xE9CD	0x9BF1	# <CJK>
-0xE9CE	0x9BF0	# <CJK>
-0xE9CF	0x9C15	# <CJK>
-0xE9D0	0x9C14	# <CJK>
-0xE9D1	0x9C09	# <CJK>
-0xE9D2	0x9C13	# <CJK>
-0xE9D3	0x9C0C	# <CJK>
-0xE9D4	0x9C06	# <CJK>
-0xE9D5	0x9C08	# <CJK>
-0xE9D6	0x9C12	# <CJK>
-0xE9D7	0x9C0A	# <CJK>
-0xE9D8	0x9C04	# <CJK>
-0xE9D9	0x9C2E	# <CJK>
-0xE9DA	0x9C1B	# <CJK>
-0xE9DB	0x9C25	# <CJK>
-0xE9DC	0x9C24	# <CJK>
-0xE9DD	0x9C21	# <CJK>
-0xE9DE	0x9C30	# <CJK>
-0xE9DF	0x9C47	# <CJK>
-0xE9E0	0x9C32	# <CJK>
-0xE9E1	0x9C46	# <CJK>
-0xE9E2	0x9C3E	# <CJK>
-0xE9E3	0x9C5A	# <CJK>
-0xE9E4	0x9C60	# <CJK>
-0xE9E5	0x9C67	# <CJK>
-0xE9E6	0x9C76	# <CJK>
-0xE9E7	0x9C78	# <CJK>
-0xE9E8	0x9CE7	# <CJK>
-0xE9E9	0x9CEC	# <CJK>
-0xE9EA	0x9CF0	# <CJK>
-0xE9EB	0x9D09	# <CJK>
-0xE9EC	0x9D08	# <CJK>
-0xE9ED	0x9CEB	# <CJK>
-0xE9EE	0x9D03	# <CJK>
-0xE9EF	0x9D06	# <CJK>
-0xE9F0	0x9D2A	# <CJK>
-0xE9F1	0x9D26	# <CJK>
-0xE9F2	0x9DAF	# <CJK>
-0xE9F3	0x9D23	# <CJK>
-0xE9F4	0x9D1F	# <CJK>
-0xE9F5	0x9D44	# <CJK>
-0xE9F6	0x9D15	# <CJK>
-0xE9F7	0x9D12	# <CJK>
-0xE9F8	0x9D41	# <CJK>
-0xE9F9	0x9D3F	# <CJK>
-0xE9FA	0x9D3E	# <CJK>
-0xE9FB	0x9D46	# <CJK>
-0xE9FC	0x9D48	# <CJK>
-0xEA40	0x9D5D	# <CJK>
-0xEA41	0x9D5E	# <CJK>
-0xEA42	0x9D64	# <CJK>
-0xEA43	0x9D51	# <CJK>
-0xEA44	0x9D50	# <CJK>
-0xEA45	0x9D59	# <CJK>
-0xEA46	0x9D72	# <CJK>
-0xEA47	0x9D89	# <CJK>
-0xEA48	0x9D87	# <CJK>
-0xEA49	0x9DAB	# <CJK>
-0xEA4A	0x9D6F	# <CJK>
-0xEA4B	0x9D7A	# <CJK>
-0xEA4C	0x9D9A	# <CJK>
-0xEA4D	0x9DA4	# <CJK>
-0xEA4E	0x9DA9	# <CJK>
-0xEA4F	0x9DB2	# <CJK>
-0xEA50	0x9DC4	# <CJK>
-0xEA51	0x9DC1	# <CJK>
-0xEA52	0x9DBB	# <CJK>
-0xEA53	0x9DB8	# <CJK>
-0xEA54	0x9DBA	# <CJK>
-0xEA55	0x9DC6	# <CJK>
-0xEA56	0x9DCF	# <CJK>
-0xEA57	0x9DC2	# <CJK>
-0xEA58	0x9DD9	# <CJK>
-0xEA59	0x9DD3	# <CJK>
-0xEA5A	0x9DF8	# <CJK>
-0xEA5B	0x9DE6	# <CJK>
-0xEA5C	0x9DED	# <CJK>
-0xEA5D	0x9DEF	# <CJK>
-0xEA5E	0x9DFD	# <CJK>
-0xEA5F	0x9E1A	# <CJK>
-0xEA60	0x9E1B	# <CJK>
-0xEA61	0x9E1E	# <CJK>
-0xEA62	0x9E75	# <CJK>
-0xEA63	0x9E79	# <CJK>
-0xEA64	0x9E7D	# <CJK>
-0xEA65	0x9E81	# <CJK>
-0xEA66	0x9E88	# <CJK>
-0xEA67	0x9E8B	# <CJK>
-0xEA68	0x9E8C	# <CJK>
-0xEA69	0x9E92	# <CJK>
-0xEA6A	0x9E95	# <CJK>
-0xEA6B	0x9E91	# <CJK>
-0xEA6C	0x9E9D	# <CJK>
-0xEA6D	0x9EA5	# <CJK>
-0xEA6E	0x9EA9	# <CJK>
-0xEA6F	0x9EB8	# <CJK>
-0xEA70	0x9EAA	# <CJK>
-0xEA71	0x9EAD	# <CJK>
-0xEA72	0x9761	# <CJK>
-0xEA73	0x9ECC	# <CJK>
-0xEA74	0x9ECE	# <CJK>
-0xEA75	0x9ECF	# <CJK>
-0xEA76	0x9ED0	# <CJK>
-0xEA77	0x9ED4	# <CJK>
-0xEA78	0x9EDC	# <CJK>
-0xEA79	0x9EDE	# <CJK>
-0xEA7A	0x9EDD	# <CJK>
-0xEA7B	0x9EE0	# <CJK>
-0xEA7C	0x9EE5	# <CJK>
-0xEA7D	0x9EE8	# <CJK>
-0xEA7E	0x9EEF	# <CJK>
-0xEA80	0x9EF4	# <CJK>
-0xEA81	0x9EF6	# <CJK>
-0xEA82	0x9EF7	# <CJK>
-0xEA83	0x9EF9	# <CJK>
-0xEA84	0x9EFB	# <CJK>
-0xEA85	0x9EFC	# <CJK>
-0xEA86	0x9EFD	# <CJK>
-0xEA87	0x9F07	# <CJK>
-0xEA88	0x9F08	# <CJK>
-0xEA89	0x76B7	# <CJK>
-0xEA8A	0x9F15	# <CJK>
-0xEA8B	0x9F21	# <CJK>
-0xEA8C	0x9F2C	# <CJK>
-0xEA8D	0x9F3E	# <CJK>
-0xEA8E	0x9F4A	# <CJK>
-0xEA8F	0x9F52	# <CJK>
-0xEA90	0x9F54	# <CJK>
-0xEA91	0x9F63	# <CJK>
-0xEA92	0x9F5F	# <CJK>
-0xEA93	0x9F60	# <CJK>
-0xEA94	0x9F61	# <CJK>
-0xEA95	0x9F66	# <CJK>
-0xEA96	0x9F67	# <CJK>
-0xEA97	0x9F6C	# <CJK>
-0xEA98	0x9F6A	# <CJK>
-0xEA99	0x9F77	# <CJK>
-0xEA9A	0x9F72	# <CJK>
-0xEA9B	0x9F76	# <CJK>
-0xEA9C	0x9F95	# <CJK>
-0xEA9D	0x9F9C	# <CJK>
-0xEA9E	0x9FA0	# <CJK>
-0xEA9F	0x582F	# <CJK>
-0xEAA0	0x69C7	# <CJK>
-0xEAA1	0x9059	# <CJK>
-0xEAA2	0x7464	# <CJK>
-0xEAA3	0x51DC	# <CJK>
-0xEAA4	0x7199	# <CJK>
-#
-0xFD	0x00A9	# COPYRIGHT SIGN # Apple extra
-0xFE	0x2122	# TRADE MARK SIGN # Apple extra
-0xFF	0x2026	# HORIZONTAL ELLIPSIS # Apple extra. Changes mapping of MacOS-J 0x8163
-
-##################
-# Apple extensions
-##################
-
-0x8540	0x2460	# CIRCLED DIGIT ONE
-0x8541	0x2461	# CIRCLED DIGIT TWO
-0x8542	0x2462	# CIRCLED DIGIT THREE
-0x8543	0x2463	# CIRCLED DIGIT FOUR
-0x8544	0x2464	# CIRCLED DIGIT FIVE
-0x8545	0x2465	# CIRCLED DIGIT SIX
-0x8546	0x2466	# CIRCLED DIGIT SEVEN
-0x8547	0x2467	# CIRCLED DIGIT EIGHT
-0x8548	0x2468	# CIRCLED DIGIT NINE
-0x8549	0x2469	# CIRCLED NUMBER TEN
-0x854A	0x246A	# CIRCLED NUMBER ELEVEN
-0x854B	0x246B	# CIRCLED NUMBER TWELVE
-0x854C	0x246C	# CIRCLED NUMBER THIRTEEN
-0x854D	0x246D	# CIRCLED NUMBER FOURTEEN
-0x854E	0x246E	# CIRCLED NUMBER FIFTEEN
-0x854F	0x246F	# CIRCLED NUMBER SIXTEEN
-0x8550	0x2470	# CIRCLED NUMBER SEVENTEEN
-0x8551	0x2471	# CIRCLED NUMBER EIGHTEEN
-0x8552	0x2472	# CIRCLED NUMBER NINETEEN
-0x8553	0x2473	# CIRCLED NUMBER TWENTY
-0x855E	0x2474	# PARENTHESIZED DIGIT ONE
-0x855F	0x2475	# PARENTHESIZED DIGIT TWO
-0x8560	0x2476	# PARENTHESIZED DIGIT THREE
-0x8561	0x2477	# PARENTHESIZED DIGIT FOUR
-0x8562	0x2478	# PARENTHESIZED DIGIT FIVE
-0x8563	0x2479	# PARENTHESIZED DIGIT SIX
-0x8564	0x247A	# PARENTHESIZED DIGIT SEVEN
-0x8565	0x247B	# PARENTHESIZED DIGIT EIGHT
-0x8566	0x247C	# PARENTHESIZED DIGIT NINE
-0x8567	0x247D	# PARENTHESIZED NUMBER TEN
-0x8568	0x247E	# PARENTHESIZED NUMBER ELEVEN
-0x8569	0x247F	# PARENTHESIZED NUMBER TWELVE
-0x856A	0x2480	# PARENTHESIZED NUMBER THIRTEEN
-0x856B	0x2481	# PARENTHESIZED NUMBER FOURTEEN
-0x856C	0x2482	# PARENTHESIZED NUMBER FIFTEEN
-0x856D	0x2483	# PARENTHESIZED NUMBER SIXTEEN
-0x856E	0x2484	# PARENTHESIZED NUMBER SEVENTEEN
-0x856F	0x2485	# PARENTHESIZED NUMBER EIGHTEEN
-0x8570	0x2486	# PARENTHESIZED NUMBER NINETEEN
-0x8571	0x2487	# PARENTHESIZED NUMBER TWENTY
-0x857C	0x2776	# DINGBAT NEGATIVE CIRCLED DIGIT ONE
-0x857D	0x2777	# DINGBAT NEGATIVE CIRCLED DIGIT TWO
-0x857E	0x2778	# DINGBAT NEGATIVE CIRCLED DIGIT THREE
-0x8580	0x2779	# DINGBAT NEGATIVE CIRCLED DIGIT FOUR
-0x8581	0x277A	# DINGBAT NEGATIVE CIRCLED DIGIT FIVE
-0x8582	0x277B	# DINGBAT NEGATIVE CIRCLED DIGIT SIX
-0x8583	0x277C	# DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
-0x8584	0x277D	# DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
-0x8585	0x277E	# DINGBAT NEGATIVE CIRCLED DIGIT NINE
-0x8591	0xF8A1	# digit zero full stop # 0.
-0x8592	0x2488	# DIGIT ONE FULL STOP
-0x8593	0x2489	# DIGIT TWO FULL STOP
-0x8594	0x248A	# DIGIT THREE FULL STOP
-0x8595	0x248B	# DIGIT FOUR FULL STOP
-0x8596	0x248C	# DIGIT FIVE FULL STOP
-0x8597	0x248D	# DIGIT SIX FULL STOP
-0x8598	0x248E	# DIGIT SEVEN FULL STOP
-0x8599	0x248F	# DIGIT EIGHT FULL STOP
-0x859A	0x2490	# DIGIT NINE FULL STOP
-0x859F	0x2160	# ROMAN NUMERAL ONE
-0x85A0	0x2161	# ROMAN NUMERAL TWO
-0x85A1	0x2162	# ROMAN NUMERAL THREE
-0x85A2	0x2163	# ROMAN NUMERAL FOUR
-0x85A3	0x2164	# ROMAN NUMERAL FIVE
-0x85A4	0x2165	# ROMAN NUMERAL SIX
-0x85A5	0x2166	# ROMAN NUMERAL SEVEN
-0x85A6	0x2167	# ROMAN NUMERAL EIGHT
-0x85A7	0x2168	# ROMAN NUMERAL NINE
-0x85A8	0x2169	# ROMAN NUMERAL TEN
-0x85A9	0x216A	# ROMAN NUMERAL ELEVEN
-0x85AA	0x216B	# ROMAN NUMERAL TWELVE
-0x85AB	0xF8A2	# roman numeral thirteen # XIII
-0x85AC	0xF8A3	# roman numeral fourteen # XIV
-0x85AD	0xF8A4	# roman numeral fifteen # XV
-0x85B3	0x2170	# SMALL ROMAN NUMERAL ONE
-0x85B4	0x2171	# SMALL ROMAN NUMERAL TWO
-0x85B5	0x2172	# SMALL ROMAN NUMERAL THREE
-0x85B6	0x2173	# SMALL ROMAN NUMERAL FOUR
-0x85B7	0x2174	# SMALL ROMAN NUMERAL FIVE
-0x85B8	0x2175	# SMALL ROMAN NUMERAL SIX
-0x85B9	0x2176	# SMALL ROMAN NUMERAL SEVEN
-0x85BA	0x2177	# SMALL ROMAN NUMERAL EIGHT
-0x85BB	0x2178	# SMALL ROMAN NUMERAL NINE
-0x85BC	0x2179	# SMALL ROMAN NUMERAL TEN
-0x85BD	0x217A	# SMALL ROMAN NUMERAL ELEVEN
-0x85BE	0x217B	# SMALL ROMAN NUMERAL TWELVE
-0x85BF	0xF8A5	# small roman numeral thirteen # xiii
-0x85C0	0xF8A6	# small roman numeral fourteen # xiv
-0x85C1	0xF8A7	# small roman numeral fifteen # xv
-0x85DB	0x249C	# PARENTHESIZED LATIN SMALL LETTER A
-0x85DC	0x249D	# PARENTHESIZED LATIN SMALL LETTER B
-0x85DD	0x249E	# PARENTHESIZED LATIN SMALL LETTER C
-0x85DE	0x249F	# PARENTHESIZED LATIN SMALL LETTER D
-0x85DF	0x24A0	# PARENTHESIZED LATIN SMALL LETTER E
-0x85E0	0x24A1	# PARENTHESIZED LATIN SMALL LETTER F
-0x85E1	0x24A2	# PARENTHESIZED LATIN SMALL LETTER G
-0x85E2	0x24A3	# PARENTHESIZED LATIN SMALL LETTER H
-0x85E3	0x24A4	# PARENTHESIZED LATIN SMALL LETTER I
-0x85E4	0x24A5	# PARENTHESIZED LATIN SMALL LETTER J
-0x85E5	0x24A6	# PARENTHESIZED LATIN SMALL LETTER K
-0x85E6	0x24A7	# PARENTHESIZED LATIN SMALL LETTER L
-0x85E7	0x24A8	# PARENTHESIZED LATIN SMALL LETTER M
-0x85E8	0x24A9	# PARENTHESIZED LATIN SMALL LETTER N
-0x85E9	0x24AA	# PARENTHESIZED LATIN SMALL LETTER O
-0x85EA	0x24AB	# PARENTHESIZED LATIN SMALL LETTER P
-0x85EB	0x24AC	# PARENTHESIZED LATIN SMALL LETTER Q
-0x85EC	0x24AD	# PARENTHESIZED LATIN SMALL LETTER R
-0x85ED	0x24AE	# PARENTHESIZED LATIN SMALL LETTER S
-0x85EE	0x24AF	# PARENTHESIZED LATIN SMALL LETTER T
-0x85EF	0x24B0	# PARENTHESIZED LATIN SMALL LETTER U
-0x85F0	0x24B1	# PARENTHESIZED LATIN SMALL LETTER V
-0x85F1	0x24B2	# PARENTHESIZED LATIN SMALL LETTER W
-0x85F2	0x24B3	# PARENTHESIZED LATIN SMALL LETTER X
-0x85F3	0x24B4	# PARENTHESIZED LATIN SMALL LETTER Y
-0x85F4	0x24B5	# PARENTHESIZED LATIN SMALL LETTER Z
-0x8640	0x339C	# SQUARE MM
-0x8641	0x339F	# SQUARE MM SQUARED
-0x8642	0x339D	# SQUARE CM
-0x8643	0x33A0	# SQUARE CM SQUARED
-0x8644	0x33A4	# SQUARE CM CUBED
-0x8645	0xF8A8	# square m (meter?)
-0x8646	0x33A1	# SQUARE M SQUARED
-0x8647	0x33A5	# SQUARE M CUBED
-0x8648	0x339E	# SQUARE KM
-0x8649	0x33A2	# SQUARE KM SQUARED
-0x864A	0x338E	# SQUARE MG
-0x864B	0xF8A9	# square g (gram?)
-0x864C	0x338F	# SQUARE KG
-0x864D	0x33C4	# SQUARE CC
-0x864E	0x3396	# SQUARE ML
-0x864F	0x3397	# SQUARE DL
-0x8650	0xF8AA	# square l (liter?) # not U+2113, SCRIPT SMALL L
-0x8651	0x3398	# SQUARE KL
-0x8652	0x33B3	# SQUARE MS
-0x8653	0x33B2	# SQUARE MU S
-0x8654	0x33B1	# SQUARE NS
-0x8655	0x33B0	# SQUARE PS
-0x8656	0x2109	# DEGREE FAHRENHEIT
-0x8657	0x33D4	# SQUARE MB SMALL
-0x8658	0x33CB	# SQUARE HP
-0x8659	0x3390	# SQUARE HZ
-0x865A	0x3385	# SQUARE KB
-0x865B	0x3386	# SQUARE MB
-0x865C	0x3387	# SQUARE GB
-0x865D	0xF8AB	# square TB
-0x869B	0x2116	# NUMERO SIGN
-0x869C	0x33CD	# SQUARE KK
-0x869D	0x2121	# TELEPHONE SIGN
-0x869E	0xF8AC	# FAX sign
-0x869F	0x2664	# WHITE SPADE SUIT
-0x86A0	0x2667	# WHITE CLUB SUIT
-0x86A1	0x2661	# WHITE HEART SUIT
-0x86A2	0x2662	# WHITE DIAMOND SUIT
-0x86A3	0x2660	# BLACK SPADE SUIT
-0x86A4	0x2663	# BLACK CLUB SUIT
-0x86A5	0x2665	# BLACK HEART SUIT
-0x86A6	0x2666	# BLACK DIAMOND SUIT
-0x86B3	0x3020	# POSTAL MARK FACE
-0x86B4	0x260E	# BLACK TELEPHONE
-0x86B5	0x3004	# JAPANESE INDUSTRIAL STANDARD SYMBOL
-0x86C7	0x261E	# WHITE RIGHT POINTING INDEX
-0x86C8	0x261C	# WHITE LEFT POINTING INDEX
-0x86C9	0x261D	# WHITE UP POINTING INDEX
-0x86CA	0x261F	# WHITE DOWN POINTING INDEX
-0x86CB	0x21C6	# LEFTWARDS ARROW OVER RIGHTWARDS ARROW
-0x86CC	0x21C4	# RIGHTWARDS ARROW OVER LEFTWARDS ARROW
-0x86CD	0x21C5	# UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW
-0x86CE	0xF8AD	# downwards arrow leftwards of upwards arrow
-0x86CF	0x21E8	# RIGHTWARDS WHITE ARROW
-0x86D0	0x21E6	# LEFTWARDS WHITE ARROW
-0x86D1	0x21E7	# UPWARDS WHITE ARROW
-0x86D2	0x21E9	# DOWNWARDS WHITE ARROW
-0x86D3	0xF8AE	# rightwards black arrow # not U+279E, HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW
-0x86D4	0xF8AF	# leftwards black arrow
-0x86D5	0xF8B0	# upwards black arrow
-0x86D6	0xF8B1	# downwards black arrow
-0x8740	0x3230	# PARENTHESIZED IDEOGRAPH SUN
-0x8741	0x322A	# PARENTHESIZED IDEOGRAPH MOON
-0x8742	0x322B	# PARENTHESIZED IDEOGRAPH FIRE
-0x8743	0x322C	# PARENTHESIZED IDEOGRAPH WATER
-0x8744	0x322D	# PARENTHESIZED IDEOGRAPH WOOD
-0x8745	0x322E	# PARENTHESIZED IDEOGRAPH METAL
-0x8746	0x322F	# PARENTHESIZED IDEOGRAPH EARTH
-0x8747	0x3240	# PARENTHESIZED IDEOGRAPH FESTIVAL
-0x8748	0x3237	# PARENTHESIZED IDEOGRAPH CONGRATULATION
-0x8749	0x3242	# PARENTHESIZED IDEOGRAPH SELF
-0x874A	0x3243	# PARENTHESIZED IDEOGRAPH REACH
-0x874B	0x3239	# PARENTHESIZED IDEOGRAPH REPRESENT
-0x874C	0x323A	# PARENTHESIZED IDEOGRAPH CALL
-0x874D	0x3231	# PARENTHESIZED IDEOGRAPH STOCK
-0x874E	0x323E	# PARENTHESIZED IDEOGRAPH RESOURCE
-0x874F	0x3234	# PARENTHESIZED IDEOGRAPH NAME
-0x8750	0x3232	# PARENTHESIZED IDEOGRAPH HAVE
-0x8751	0x323B	# PARENTHESIZED IDEOGRAPH STUDY
-0x8752	0x3236	# PARENTHESIZED IDEOGRAPH FINANCIAL
-0x8753	0x3233	# PARENTHESIZED IDEOGRAPH SOCIETY
-0x8754	0x3235	# PARENTHESIZED IDEOGRAPH SPECIAL
-0x8755	0x323C	# PARENTHESIZED IDEOGRAPH SUPERVISE
-0x8756	0x323D	# PARENTHESIZED IDEOGRAPH ENTERPRISE
-0x8757	0x323F	# PARENTHESIZED IDEOGRAPH ALLIANCE
-0x8758	0x3238	# PARENTHESIZED IDEOGRAPH LABOR
-0x8791	0x5927+0x20DD	# ideograph big + COMBINING ENCLOSING CIRCLE
-0x8792	0x5C0F+0x20DD	# ideograph small + COMBINING ENCLOSING CIRCLE
-0x8793	0x32A4	# CIRCLED IDEOGRAPH HIGH
-0x8794	0x32A5	# CIRCLED IDEOGRAPH CENTRE
-0x8795	0x32A6	# CIRCLED IDEOGRAPH LOW
-0x8796	0x32A7	# CIRCLED IDEOGRAPH LEFT
-0x8797	0x32A8	# CIRCLED IDEOGRAPH RIGHT
-0x8798	0x32A9	# CIRCLED IDEOGRAPH MEDICINE
-0x8799	0x3296	# CIRCLED IDEOGRAPH FINANCIAL
-0x879A	0x329D	# CIRCLED IDEOGRAPH EXCELLENT
-0x879B	0x3298	# CIRCLED IDEOGRAPH LABOR
-0x879C	0x329E	# CIRCLED IDEOGRAPH PRINT
-0x879D	0x63A7+0x20DD	# ideograph memo + COMBINING ENCLOSING CIRCLE
-0x879E	0x3299	# CIRCLED IDEOGRAPH SECRET
-0x879F	0x3349	# SQUARE MIRI
-0x87A0	0x3322	# SQUARE SENTI
-0x87A1	0x334D	# SQUARE MEETORU
-0x87A2	0x3314	# SQUARE KIRO
-0x87A3	0x3316	# SQUARE KIROMEETORU
-0x87A4	0x3305	# SQUARE INTI
-0x87A5	0x3333	# SQUARE HUIITO
-0x87A6	0x334E	# SQUARE YAADO
-0x87A7	0x3303	# SQUARE AARU
-0x87A8	0x3336	# SQUARE HEKUTAARU
-0x87A9	0x3318	# SQUARE GURAMU
-0x87AA	0x3315	# SQUARE KIROGURAMU
-0x87AB	0x3327	# SQUARE TON
-0x87AC	0x3351	# SQUARE RITTORU
-0x87AD	0x334A	# SQUARE MIRIBAARU
-0x87AE	0x3339	# SQUARE HERUTU
-0x87AF	0x3357	# SQUARE WATTO
-0x87B0	0x330D	# SQUARE KARORII
-0x87B1	0x3342	# SQUARE HOON
-0x87B2	0x3323	# SQUARE SENTO
-0x87B3	0x3326	# SQUARE DORU
-0x87B4	0x333B	# SQUARE PEEZI
-0x87B5	0x332B	# SQUARE PAASENTO
-0x87BD	0x3300	# SQUARE APAATO
-0x87BE	0x331E	# SQUARE KOOPO
-0x87BF	0x332A	# SQUARE HAITU
-0x87C0	0x3331	# SQUARE BIRU
-0x87C1	0x3347	# SQUARE MANSYON
-0x87E5	0x337E	# SQUARE ERA NAME MEIZI
-0x87E6	0x337D	# SQUARE ERA NAME TAISYOU
-0x87E7	0x337C	# SQUARE ERA NAME SYOUWA
-0x87E8	0x337B	# SQUARE ERA NAME HEISEI
-0x87FA	0x337F	# SQUARE CORPORATION
-0x87FB	0xF8B2	# square "limited company, ltd. [yuugen gaisha]"
-0x87FC	0xF8B3	# square "foundation [zaidan houjin]"
-0x8840	0x222E	# CONTOUR INTEGRAL
-0x8841	0x221F	# RIGHT ANGLE
-0x8842	0x22BF	# RIGHT TRIANGLE
-0x8854	0x301D	# REVERSED DOUBLE PRIME QUOTATION MARK
-0x8855	0xF8B4	# inverted double prime quotation mark # paired with 0x8854; not U+301F, DOUBLE PRIME QUOTE MARK
-0x8868	0x3094	# HIRAGANA LETTER VU
-0x886A	0x30F7	# KATAKANA LETTER VA
-0x886B	0x30F8	# KATAKANA LETTER VI
-0x886C	0x30F9	# KATAKANA LETTER VE
-0x886D	0x30FA	# KATAKANA LETTER VO
-
-##################
-# Vertical forms
-##################
-# Unicodes 0xF8B5-0xF8D6 are Apple corporate Unicode characters.
-# Check U+FE32, I think this should be presentation form of katakana prolonged sound mark.
-# If so, then we can map MacOS Japanese 0xEB5B to it instead of using a corporate char U+F8B8.
-##################
-
-0xEB41	0xF8B5	# presentation form for vertical IDEOGRAPHIC COMMA, U+3001
-0xEB42	0xF8B6	# presentation form for vertical IDEOGRAPHIC FULL STOP, U+3002
-0xEB50	0xF8B7	# presentation form for vertical OVERLINE, U+203E
-0xEB51	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE, U+FF3F
-0xEB5B	0xF8B8	# presentation form for vertical KATAKANA-HIRAGANA PROLONGED SOUND MARK, U+30FC # use corp char U+F8B8 until name for U+FE32 is fixed; should map to fixed U+FE32
-0xEB5C	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH, U+2014
-0xEB5D	0xF8B9	# presentation form for vertical HYPHEN, U+2010
-0xEB60	0xF8BA	# presentation form for vertical WAVE DASH, U+301C
-0xEB61	0xF8BB	# presentation form for vertical DOUBLE VERTICAL LINE, U+2016
-0xEB62	0xF8BC	# presentation form for vertical FULLWIDTH VERTICAL LINE, U+FF5C
-0xEB63	0xF8BD	# presentation form for vertical MIDLINE HORIZONTAL ELLIPSIS, U+22EF
-0xEB64	0xFE30	# PRESENTATION FORM FOR VERTICAL TWO DOT LEADER, U+2025
-0xEB69	0xFE35	# PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS, U+FF08
-0xEB6A	0xFE36	# PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS, U+FF09
-0xEB6B	0xFE39	# PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET, U+3014
-0xEB6C	0xFE3A	# PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET, U+3015
-0xEB6D	0xF8BE	# presentation form for vertical FULLWIDTH LEFT SQUARE BRACKET, U+FF3B
-0xEB6E	0xF8BF	# presentation form for vertical FULLWIDTH RIGHT SQUARE BRACKET, U+FF3D
-0xEB6F	0xFE37	# PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET, U+FF5B
-0xEB70	0xFE38	# PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET, U+FF5D
-0xEB71	0xFE3F	# PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET, U+3008
-0xEB72	0xFE40	# PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET, U+3009
-0xEB73	0xFE3D	# PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET, U+300A
-0xEB74	0xFE3E	# PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET, U+300B
-0xEB75	0xFE41	# PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET, U+300C
-0xEB76	0xFE42	# PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET, U+300D
-0xEB77	0xFE43	# PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET, U+300E
-0xEB78	0xFE44	# PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET, U+300F
-0xEB79	0xFE3B	# PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET, U+3010
-0xEB7A	0xFE3C	# PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET, U+3011
-0xEB81	0xF8C0	# presentation form for vertical FULLWIDTH EQUALS SIGN, U+FF1D
-0xEC9F	0xF8C1	# presentation form for vertical HIRAGANA LETTER SMALL A, U+3041
-0xECA1	0xF8C2	# presentation form for vertical HIRAGANA LETTER SMALL I, U+3043
-0xECA3	0xF8C3	# presentation form for vertical HIRAGANA LETTER SMALL U, U+3045
-0xECA5	0xF8C4	# presentation form for vertical HIRAGANA LETTER SMALL E, U+3047
-0xECA7	0xF8C5	# presentation form for vertical HIRAGANA LETTER SMALL O, U+3049
-0xECC1	0xF8C6	# presentation form for vertical HIRAGANA LETTER SMALL TU, U+3063
-0xECE1	0xF8C7	# presentation form for vertical HIRAGANA LETTER SMALL YA, U+3083
-0xECE3	0xF8C8	# presentation form for vertical HIRAGANA LETTER SMALL YU, U+3085
-0xECE5	0xF8C9	# presentation form for vertical HIRAGANA LETTER SMALL YO, U+3087
-0xECEC	0xF8CA	# presentation form for vertical HIRAGANA LETTER SMALL WA, U+308E
-0xED40	0xF8CB	# presentation form for vertical KATAKANA LETTER SMALL A, U+30A1
-0xED42	0xF8CC	# presentation form for vertical KATAKANA LETTER SMALL I, U+30A3
-0xED44	0xF8CD	# presentation form for vertical KATAKANA LETTER SMALL U, U+30A5
-0xED46	0xF8CE	# presentation form for vertical KATAKANA LETTER SMALL E, U+30A7
-0xED48	0xF8CF	# presentation form for vertical KATAKANA LETTER SMALL O, U+30A9
-0xED62	0xF8D0	# presentation form for vertical KATAKANA LETTER SMALL TU, U+30C3
-0xED83	0xF8D1	# presentation form for vertical KATAKANA LETTER SMALL YA, U+30E3
-0xED85	0xF8D2	# presentation form for vertical KATAKANA LETTER SMALL YU, U+30E5
-0xED87	0xF8D3	# presentation form for vertical KATAKANA LETTER SMALL YO, U+30E7
-0xED8E	0xF8D4	# presentation form for vertical KATAKANA LETTER SMALL WA, U+30EE
-0xED95	0xF8D5	# presentation form for vertical KATAKANA LETTER SMALL KA, U+30F5
-0xED96	0xF8D6	# presentation form for vertical KATAKANA LETTER SMALL KE, U+30F6
-
diff --git a/tools/encoding/macRoman.txt b/tools/encoding/macRoman.txt
deleted file mode 100644
index 3bf88da..0000000
--- a/tools/encoding/macRoman.txt
+++ /dev/null
@@ -1,301 +0,0 @@
-#
-#   Name:             MacOS_Roman [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <9>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Roman code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Roman code order.
-#
-#   One of these mappings requires the use of a corporate character
-#   (for the Apple logo character). See the file "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Roman:
-#   ---------------------
-#
-#   This character set is used for at least the following MacOS
-#   localizations: U.S., British, Canadian French, French, Swiss
-#   French, German, Swiss German, Italian, Swiss Italian, Dutch,
-#   Swedish, Norwegian, Danish, Finnish, Spanish, Catalan,
-#   Portuguese, Brazilian, and the default International system.
-#
-#   Variants of MacRoman are used for Croatian, Icelandic,
-#   Turkish, and Romanian. Separate mapping tables are available
-#   for these encodings.
-#
-#   At least through System 7.5, the bitmap versions of the fonts
-#   Chicago, New York, Geneva, and Monaco do not implement the
-#   full Roman character set; they only support MacOS Roman character
-#   codes up to 0xD8. The TrueType versions of these fonts do
-#   implement the full character set, as do both the bitmap and
-#   TrueType versions of the other standard Roman fonts.
-#
-#   In all MacOS encodings, fonts such as Chicago which are used
-#   as "system" fonts (for menus, dialogs, etc.) have four glyphs
-#   at code points 0x11-0x14 for transient use by the Menu Manager.
-#   These glyphs are not intended as characters for use in normal
-#   text, and the associated code points are not generally
-#   interpreted as associated with these glyphs; they are usually
-#   interpreted (if at all) as the control codes DC1-DC4.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x00B4	# ACUTE ACCENT
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x00C6	# LATIN CAPITAL LIGATURE AE
-0xAF	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	# YEN SIGN
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x220F	# N-ARY PRODUCT
-0xB9	0x03C0	# GREEK SMALL LETTER PI
-0xBA	0x222B	# INTEGRAL
-0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
-0xBD	0x2126	# OHM SIGN
-0xBE	0x00E6	# LATIN SMALL LIGATURE AE
-0xBF	0x00F8	# LATIN SMALL LETTER O WITH STROKE
-0xC0	0x00BF	# INVERTED QUESTION MARK
-0xC1	0x00A1	# INVERTED EXCLAMATION MARK
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
-0xD9	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xDA	0x2044	# FRACTION SLASH
-0xDB	0x00A4	# CURRENCY SIGN
-0xDC	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0xDD	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0xDE	0xFB01	# LATIN SMALL LIGATURE FI
-0xDF	0xFB02	# LATIN SMALL LIGATURE FL
-0xE0	0x2021	# DOUBLE DAGGER
-0xE1	0x00B7	# MIDDLE DOT
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	# PER MILLE SIGN
-0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0xF8FF	# Apple logo
-0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0x0131	# LATIN SMALL LETTER DOTLESS I
-0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
-0xF7	0x02DC	# SMALL TILDE
-0xF8	0x00AF	# MACRON
-0xF9	0x02D8	# BREVE
-0xFA	0x02D9	# DOT ABOVE
-0xFB	0x02DA	# RING ABOVE
-0xFC	0x00B8	# CEDILLA
-0xFD	0x02DD	# DOUBLE ACUTE ACCENT
-0xFE	0x02DB	# OGONEK
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macRomania.txt b/tools/encoding/macRomania.txt
deleted file mode 100644
index 2a84adc..0000000
--- a/tools/encoding/macRomania.txt
+++ /dev/null
@@ -1,285 +0,0 @@
-#
-#   Name:             MacOS_Romanian [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Romanian code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Romanian code order.
-#
-#   One of these mappings requires the use of a corporate character
-#   (for the Apple logo character). See the file "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Romanian:
-#   ------------------------
-#
-#   The MacOS Romanian encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Romanian encoding is being used, you must also check if the
-#   system region code is 39, verRomania.
-#
-#   This character set is a variant of standard MacOS Roman, adding
-#   upper and lower A breve, S cedilla, and T cedilla. It has 6 code
-#   point differences from standard Roman.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x00B4	# ACUTE ACCENT
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x0102	# LATIN CAPITAL LETTER A WITH BREVE
-0xAF	0x015E	# LATIN CAPITAL LETTER S WITH CEDILLA
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	# YEN SIGN
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x220F	# N-ARY PRODUCT
-0xB9	0x03C0	# GREEK SMALL LETTER PI
-0xBA	0x222B	# INTEGRAL
-0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
-0xBD	0x2126	# OHM SIGN
-0xBE	0x0103	# LATIN SMALL LETTER A WITH BREVE
-0xBF	0x015F	# LATIN SMALL LETTER S WITH CEDILLA
-0xC0	0x00BF	# INVERTED QUESTION MARK
-0xC1	0x00A1	# INVERTED EXCLAMATION MARK
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
-0xD9	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xDA	0x2044	# FRACTION SLASH
-0xDB	0x00A4	# CURRENCY SIGN
-0xDC	0x2039	# SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-0xDD	0x203A	# SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-0xDE	0x0162	# LATIN CAPITAL LETTER T WITH CEDILLA
-0xDF	0x0163	# LATIN SMALL LETTER T WITH CEDILLA
-0xE0	0x2021	# DOUBLE DAGGER
-0xE1	0x00B7	# MIDDLE DOT
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	# PER MILLE SIGN
-0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0xF8FF	# Apple logo
-0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0x0131	# LATIN SMALL LETTER DOTLESS I
-0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
-0xF7	0x02DC	# SMALL TILDE
-0xF8	0x00AF	# MACRON
-0xF9	0x02D8	# BREVE
-0xFA	0x02D9	# DOT ABOVE
-0xFB	0x02DA	# RING ABOVE
-0xFC	0x00B8	# CEDILLA
-0xFD	0x02DD	# DOUBLE ACUTE ACCENT
-0xFE	0x02DB	# OGONEK
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macThai.txt b/tools/encoding/macThai.txt
deleted file mode 100644
index b991833..0000000
--- a/tools/encoding/macThai.txt
+++ /dev/null
@@ -1,299 +0,0 @@
-#
-#   Name:             MacOS_Thai [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <6>)
-#   Date:             17 November 1995
-#   Authors:          Peter Edberg <edberg1@applelink.apple.com>
-#                     Judy Kettenhofen
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Thai code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Thai code order.
-#
-#   Notes on MacOS Thai:
-#   --------------------
-#
-#   Codes 0xA1-0xDA and 0xDF-0xFB are the character set from Thai
-#   standard TIS 620-2533, except that the following changes are
-#   made:
-#     0xEE is TRADE MARK SIGN (instead of THAI CHARACTER YAMAKKAN)
-#     0xFA is REGISTERED SIGN (instead of THAI CHARACTER ANGKHANKHU)
-#     0xFB is COPYRIGHT SIGN (instead of THAI CHARACTER KHOMUT)
-#
-#   Codes 0x80-0x82, 0x8D-0x8E, 0x91, 0x9D-0x9E, and 0xDB-0xDE are
-#   various additional punctuation marks (e.g. curly quotes,
-#   ellipsis), no-break space, and two special characters "word join"
-#   and "word break".
-#
-#   Codes 0x83-0x8C, 0x8F, and 0x92-0x9C are for positional variants
-#   of the upper vowels, tone marks, and other signs at 0xD1,
-#   0xD4-0xD7, and 0xE7-0xED. The positional variants would normally
-#   be considered presentation forms only and not characters. In most
-#   cases they are not typed directly; they are selected automatically
-#   at display time by the WorldScript software. However, using the
-#   Thai-DTP keyboard, the presentation forms can in fact be typed
-#   directly using dead keys. Thus they must be treated as real
-#   characters in the MacOS Thai encoding, and  must be mapped to
-#   distinct Unicodes - corporate-zone characters in this case - to
-#   enable roundtrip mapping.
-#
-#   Several code points are undefined and unused (they cannot be
-#   typed using any of the Mac OS Thai keyboard layouts): 0x90, 0x9F,
-#   0xFC-0xFE. In the table below these are mapped to 0xFFFD.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0x81	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0x82	0x2026	# HORIZONTAL ELLIPSIS
-0x83	0xF88C	# form for THAI CHARACTER MAI EK, low left position
-0x84	0xF88F	# form for THAI CHARACTER MAI THO, low left position
-0x85	0xF892	# form for THAI CHARACTER MAI TRI, low left position
-0x86	0xF895	# form for THAI CHARACTER MAI CHATTAWA, low left position
-0x87	0xF898	# form for THAI CHARACTER THANTHAKHAT, low left position
-0x88	0xF88B	# form for THAI CHARACTER MAI EK, low position
-0x89	0xF88E	# form for THAI CHARACTER MAI THO, low position
-0x8A	0xF891	# form for THAI CHARACTER MAI TRI, low position
-0x8B	0xF894	# form for THAI CHARACTER MAI CHATTAWA, low position
-0x8C	0xF897	# form for THAI CHARACTER THANTHAKHAT, low position
-0x8D	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x8E	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x8F	0xF899	# form for THAI CHARACTER NIKHAHIT, left position
-0x90	0xFFFD	# (not used, map to Unicode replacement character)
-0x91	0x2022	# BULLET
-0x92	0xF884	# form for THAI CHARACTER MAI HAN-AKAT, left position
-0x93	0xF889	# form for THAI CHARACTER MAITAIKHU, left position
-0x94	0xF885	# form for THAI CHARACTER SARA I, left position
-0x95	0xF886	# form for THAI CHARACTER SARA II, left position
-0x96	0xF887	# form for THAI CHARACTER SARA UE, left position
-0x97	0xF888	# form for THAI CHARACTER SARA UEE, left position
-0x98	0xF88A	# form for THAI CHARACTER MAI EK, left position
-0x99	0xF88D	# form for THAI CHARACTER MAI THO, left position
-0x9A	0xF890	# form for THAI CHARACTER MAI TRI, left position
-0x9B	0xF893	# form for THAI CHARACTER MAI CHATTAWA, left position
-0x9C	0xF896	# form for THAI CHARACTER THANTHAKHAT, left position
-0x9D	0x2018	# LEFT SINGLE QUOTATION MARK
-0x9E	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x9F	0xFFFD	# (not used, map to Unicode replacement character)
-0xA0	0x00A0	# NO-BREAK SPACE
-0xA1	0x0E01	# THAI CHARACTER KO KAI
-0xA2	0x0E02	# THAI CHARACTER KHO KHAI
-0xA3	0x0E03	# THAI CHARACTER KHO KHUAT
-0xA4	0x0E04	# THAI CHARACTER KHO KHWAI
-0xA5	0x0E05	# THAI CHARACTER KHO KHON
-0xA6	0x0E06	# THAI CHARACTER KHO RAKHANG
-0xA7	0x0E07	# THAI CHARACTER NGO NGU
-0xA8	0x0E08	# THAI CHARACTER CHO CHAN
-0xA9	0x0E09	# THAI CHARACTER CHO CHING
-0xAA	0x0E0A	# THAI CHARACTER CHO CHANG
-0xAB	0x0E0B	# THAI CHARACTER SO SO
-0xAC	0x0E0C	# THAI CHARACTER CHO CHOE
-0xAD	0x0E0D	# THAI CHARACTER YO YING
-0xAE	0x0E0E	# THAI CHARACTER DO CHADA
-0xAF	0x0E0F	# THAI CHARACTER TO PATAK
-0xB0	0x0E10	# THAI CHARACTER THO THAN
-0xB1	0x0E11	# THAI CHARACTER THO NANGMONTHO
-0xB2	0x0E12	# THAI CHARACTER THO PHUTHAO
-0xB3	0x0E13	# THAI CHARACTER NO NEN
-0xB4	0x0E14	# THAI CHARACTER DO DEK
-0xB5	0x0E15	# THAI CHARACTER TO TAO
-0xB6	0x0E16	# THAI CHARACTER THO THUNG
-0xB7	0x0E17	# THAI CHARACTER THO THAHAN
-0xB8	0x0E18	# THAI CHARACTER THO THONG
-0xB9	0x0E19	# THAI CHARACTER NO NU
-0xBA	0x0E1A	# THAI CHARACTER BO BAIMAI
-0xBB	0x0E1B	# THAI CHARACTER PO PLA
-0xBC	0x0E1C	# THAI CHARACTER PHO PHUNG
-0xBD	0x0E1D	# THAI CHARACTER FO FA
-0xBE	0x0E1E	# THAI CHARACTER PHO PHAN
-0xBF	0x0E1F	# THAI CHARACTER FO FAN
-0xC0	0x0E20	# THAI CHARACTER PHO SAMPHAO
-0xC1	0x0E21	# THAI CHARACTER MO MA
-0xC2	0x0E22	# THAI CHARACTER YO YAK
-0xC3	0x0E23	# THAI CHARACTER RO RUA
-0xC4	0x0E24	# THAI CHARACTER RU
-0xC5	0x0E25	# THAI CHARACTER LO LING
-0xC6	0x0E26	# THAI CHARACTER LU
-0xC7	0x0E27	# THAI CHARACTER WO WAEN
-0xC8	0x0E28	# THAI CHARACTER SO SALA
-0xC9	0x0E29	# THAI CHARACTER SO RUSI
-0xCA	0x0E2A	# THAI CHARACTER SO SUA
-0xCB	0x0E2B	# THAI CHARACTER HO HIP
-0xCC	0x0E2C	# THAI CHARACTER LO CHULA
-0xCD	0x0E2D	# THAI CHARACTER O ANG
-0xCE	0x0E2E	# THAI CHARACTER HO NOKHUK
-0xCF	0x0E2F	# THAI CHARACTER PAIYANNOI
-0xD0	0x0E30	# THAI CHARACTER SARA A
-0xD1	0x0E31	# THAI CHARACTER MAI HAN-AKAT
-0xD2	0x0E32	# THAI CHARACTER SARA AA
-0xD3	0x0E33	# THAI CHARACTER SARA AM
-0xD4	0x0E34	# THAI CHARACTER SARA I
-0xD5	0x0E35	# THAI CHARACTER SARA II
-0xD6	0x0E36	# THAI CHARACTER SARA UE
-0xD7	0x0E37	# THAI CHARACTER SARA UEE
-0xD8	0x0E38	# THAI CHARACTER SARA U
-0xD9	0x0E39	# THAI CHARACTER SARA UU
-0xDA	0x0E3A	# THAI CHARACTER PHINTHU
-0xDB	0xFEFF	# ZERO WIDTH NO-BREAK SPACE
-0xDC	0x200B	# ZERO WIDTH SPACE
-0xDD	0x2013	# EN DASH
-0xDE	0x2014	# EM DASH
-0xDF	0x0E3F	# THAI CURRENCY SYMBOL BAHT
-0xE0	0x0E40	# THAI CHARACTER SARA E
-0xE1	0x0E41	# THAI CHARACTER SARA AE
-0xE2	0x0E42	# THAI CHARACTER SARA O
-0xE3	0x0E43	# THAI CHARACTER SARA AI MAIMUAN
-0xE4	0x0E44	# THAI CHARACTER SARA AI MAIMALAI
-0xE5	0x0E45	# THAI CHARACTER LAKKHANGYAO
-0xE6	0x0E46	# THAI CHARACTER MAIYAMOK
-0xE7	0x0E47	# THAI CHARACTER MAITAIKHU
-0xE8	0x0E48	# THAI CHARACTER MAI EK
-0xE9	0x0E49	# THAI CHARACTER MAI THO
-0xEA	0x0E4A	# THAI CHARACTER MAI TRI
-0xEB	0x0E4B	# THAI CHARACTER MAI CHATTAWA
-0xEC	0x0E4C	# THAI CHARACTER THANTHAKHAT
-0xED	0x0E4D	# THAI CHARACTER NIKHAHIT
-0xEE	0x2122	# TRADE MARK SIGN
-0xEF	0x0E4F	# THAI CHARACTER FONGMAN
-0xF0	0x0E50	# THAI DIGIT ZERO
-0xF1	0x0E51	# THAI DIGIT ONE
-0xF2	0x0E52	# THAI DIGIT TWO
-0xF3	0x0E53	# THAI DIGIT THREE
-0xF4	0x0E54	# THAI DIGIT FOUR
-0xF5	0x0E55	# THAI DIGIT FIVE
-0xF6	0x0E56	# THAI DIGIT SIX
-0xF7	0x0E57	# THAI DIGIT SEVEN
-0xF8	0x0E58	# THAI DIGIT EIGHT
-0xF9	0x0E59	# THAI DIGIT NINE
-0xFA	0x00AE	# REGISTERED SIGN
-0xFB	0x00A9	# COPYRIGHT SIGN
-0xFC	0xFFFD	# (not used, map to Unicode replacement character)
-0xFD	0xFFFD	# (not used, map to Unicode replacement character)
-0xFE	0xFFFD	# (not used, map to Unicode replacement character)
-0xFF	0xFFFD	# (not used, map to Unicode replacement character)
diff --git a/tools/encoding/macTurkish.txt b/tools/encoding/macTurkish.txt
deleted file mode 100644
index 6daa774..0000000
--- a/tools/encoding/macTurkish.txt
+++ /dev/null
@@ -1,289 +0,0 @@
-#
-#   Name:             MacOS_Turkish [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Turkish code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Turkish code order.
-#
-#   Two of these mappings requires the use of a corporate character:
-#   for the Apple logo character, and for the one undefined code
-#   point. See the file "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Turkish:
-#   -----------------------
-#
-#   The MacOS Turkish encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Turkish encoding is being used, you must also check if the
-#   system region code is 24, verTurkey.
-#
-#   This character set is a variant of standard MacOS Roman. It adds
-#   upper & lower G with breve, upper & lower S with cedilla, upper I
-#   with dot, and moves the dotless lower i from its position at 0xF5
-#   in standard MacOS Roman to a position at 0xDD here (leaving the
-#   0xF5 code point undefined in MacTurkish). This gives a total of 7
-#   code point differences from standard MacOS Roman.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x00C4	# LATIN CAPITAL LETTER A WITH DIAERESIS
-0x81	0x00C5	# LATIN CAPITAL LETTER A WITH RING ABOVE
-0x82	0x00C7	# LATIN CAPITAL LETTER C WITH CEDILLA
-0x83	0x00C9	# LATIN CAPITAL LETTER E WITH ACUTE
-0x84	0x00D1	# LATIN CAPITAL LETTER N WITH TILDE
-0x85	0x00D6	# LATIN CAPITAL LETTER O WITH DIAERESIS
-0x86	0x00DC	# LATIN CAPITAL LETTER U WITH DIAERESIS
-0x87	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
-0x88	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
-0x89	0x00E2	# LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x8A	0x00E4	# LATIN SMALL LETTER A WITH DIAERESIS
-0x8B	0x00E3	# LATIN SMALL LETTER A WITH TILDE
-0x8C	0x00E5	# LATIN SMALL LETTER A WITH RING ABOVE
-0x8D	0x00E7	# LATIN SMALL LETTER C WITH CEDILLA
-0x8E	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
-0x8F	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
-0x90	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x91	0x00EB	# LATIN SMALL LETTER E WITH DIAERESIS
-0x92	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
-0x93	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
-0x94	0x00EE	# LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x95	0x00EF	# LATIN SMALL LETTER I WITH DIAERESIS
-0x96	0x00F1	# LATIN SMALL LETTER N WITH TILDE
-0x97	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
-0x98	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
-0x99	0x00F4	# LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x9A	0x00F6	# LATIN SMALL LETTER O WITH DIAERESIS
-0x9B	0x00F5	# LATIN SMALL LETTER O WITH TILDE
-0x9C	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
-0x9D	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
-0x9E	0x00FB	# LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x9F	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x00A2	# CENT SIGN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x00DF	# LATIN SMALL LETTER SHARP S
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x00B4	# ACUTE ACCENT
-0xAC	0x00A8	# DIAERESIS
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x00C6	# LATIN CAPITAL LIGATURE AE
-0xAF	0x00D8	# LATIN CAPITAL LETTER O WITH STROKE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00A5	# YEN SIGN
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2211	# N-ARY SUMMATION
-0xB8	0x220F	# N-ARY PRODUCT
-0xB9	0x03C0	# GREEK SMALL LETTER PI
-0xBA	0x222B	# INTEGRAL
-0xBB	0x00AA	# FEMININE ORDINAL INDICATOR
-0xBC	0x00BA	# MASCULINE ORDINAL INDICATOR
-0xBD	0x2126	# OHM SIGN
-0xBE	0x00E6	# LATIN SMALL LIGATURE AE
-0xBF	0x00F8	# LATIN SMALL LETTER O WITH STROKE
-0xC0	0x00BF	# INVERTED QUESTION MARK
-0xC1	0x00A1	# INVERTED EXCLAMATION MARK
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x00C0	# LATIN CAPITAL LETTER A WITH GRAVE
-0xCC	0x00C3	# LATIN CAPITAL LETTER A WITH TILDE
-0xCD	0x00D5	# LATIN CAPITAL LETTER O WITH TILDE
-0xCE	0x0152	# LATIN CAPITAL LIGATURE OE
-0xCF	0x0153	# LATIN SMALL LIGATURE OE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x25CA	# LOZENGE
-0xD8	0x00FF	# LATIN SMALL LETTER Y WITH DIAERESIS
-0xD9	0x0178	# LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xDA	0x011E	# LATIN CAPITAL LETTER G WITH BREVE
-0xDB	0x011F	# LATIN SMALL LETTER G WITH BREVE
-0xDC	0x0130	# LATIN CAPITAL LETTER I WITH DOT ABOVE
-0xDD	0x0131	# LATIN SMALL LETTER DOTLESS I
-0xDE	0x015E	# LATIN CAPITAL LETTER S WITH CEDILLA
-0xDF	0x015F	# LATIN SMALL LETTER S WITH CEDILLA
-0xE0	0x2021	# DOUBLE DAGGER
-0xE1	0x00B7	# MIDDLE DOT
-0xE2	0x201A	# SINGLE LOW-9 QUOTATION MARK
-0xE3	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xE4	0x2030	# PER MILLE SIGN
-0xE5	0x00C2	# LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xE6	0x00CA	# LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xE7	0x00C1	# LATIN CAPITAL LETTER A WITH ACUTE
-0xE8	0x00CB	# LATIN CAPITAL LETTER E WITH DIAERESIS
-0xE9	0x00C8	# LATIN CAPITAL LETTER E WITH GRAVE
-0xEA	0x00CD	# LATIN CAPITAL LETTER I WITH ACUTE
-0xEB	0x00CE	# LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xEC	0x00CF	# LATIN CAPITAL LETTER I WITH DIAERESIS
-0xED	0x00CC	# LATIN CAPITAL LETTER I WITH GRAVE
-0xEE	0x00D3	# LATIN CAPITAL LETTER O WITH ACUTE
-0xEF	0x00D4	# LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xF0	0xF8FF	# Apple logo
-0xF1	0x00D2	# LATIN CAPITAL LETTER O WITH GRAVE
-0xF2	0x00DA	# LATIN CAPITAL LETTER U WITH ACUTE
-0xF3	0x00DB	# LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xF4	0x00D9	# LATIN CAPITAL LETTER U WITH GRAVE
-0xF5	0xF8A0	# undefined1
-0xF6	0x02C6	# MODIFIER LETTER CIRCUMFLEX ACCENT
-0xF7	0x02DC	# SMALL TILDE
-0xF8	0x00AF	# MACRON
-0xF9	0x02D8	# BREVE
-0xFA	0x02D9	# DOT ABOVE
-0xFB	0x02DA	# RING ABOVE
-0xFC	0x00B8	# CEDILLA
-0xFD	0x02DD	# DOUBLE ACUTE ACCENT
-0xFE	0x02DB	# OGONEK
-0xFF	0x02C7	# CARON
diff --git a/tools/encoding/macUkraine.txt b/tools/encoding/macUkraine.txt
deleted file mode 100644
index dba4e10..0000000
--- a/tools/encoding/macUkraine.txt
+++ /dev/null
@@ -1,279 +0,0 @@
-#
-#   Name:             MacOS_Ukrainian [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Ukrainian code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Ukrainian code order.
-#
-#   Notes on MacOS Ukrainian:
-#   -------------------------
-#
-#   The MacOS Ukrainian encoding shares the script code smCyrillic
-#   (7) with the standard MacOS Cyrillic encoding. To determine if
-#   the Ukrainian encoding is being used, you must also check if
-#   the system region code is 62, verUkraine.
-#
-#   This character set is a variant of standard MacOS Cyrillic. It
-#   adds upper & lower GHE WITH UPTURN, for a grand total of 2 code
-#   point differences from standard MacOS Cyrillic.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	# REVERSE SOLIDUS
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-#
-0x80	0x0410	# CYRILLIC CAPITAL LETTER A
-0x81	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x82	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x83	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x84	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x85	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x86	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x87	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x88	0x0418	# CYRILLIC CAPITAL LETTER I
-0x89	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x8A	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x8B	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x8C	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x8D	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x8E	0x041E	# CYRILLIC CAPITAL LETTER O
-0x8F	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x90	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x91	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x92	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x93	0x0423	# CYRILLIC CAPITAL LETTER U
-0x94	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x95	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x96	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x97	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x98	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x99	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x9A	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x9B	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x9C	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x9D	0x042D	# CYRILLIC CAPITAL LETTER E
-0x9E	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x9F	0x042F	# CYRILLIC CAPITAL LETTER YA
-0xA0	0x2020	# DAGGER
-0xA1	0x00B0	# DEGREE SIGN
-0xA2	0x0490	# CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0xA3	0x00A3	# POUND SIGN
-0xA4	0x00A7	# SECTION SIGN
-0xA5	0x2022	# BULLET
-0xA6	0x00B6	# PILCROW SIGN
-0xA7	0x0406	# CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0xA8	0x00AE	# REGISTERED SIGN
-0xA9	0x00A9	# COPYRIGHT SIGN
-0xAA	0x2122	# TRADE MARK SIGN
-0xAB	0x0402	# CYRILLIC CAPITAL LETTER DJE
-0xAC	0x0452	# CYRILLIC SMALL LETTER DJE
-0xAD	0x2260	# NOT EQUAL TO
-0xAE	0x0403	# CYRILLIC CAPITAL LETTER GJE
-0xAF	0x0453	# CYRILLIC SMALL LETTER GJE
-0xB0	0x221E	# INFINITY
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2264	# LESS-THAN OR EQUAL TO
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x0456	# CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0xB5	0x00B5	# MICRO SIGN
-0xB6	0x0491	# CYRILLIC SMALL LETTER GHE WITH UPTURN
-0xB7	0x0408	# CYRILLIC CAPITAL LETTER JE
-0xB8	0x0404	# CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0xB9	0x0454	# CYRILLIC SMALL LETTER UKRAINIAN IE
-0xBA	0x0407	# CYRILLIC CAPITAL LETTER YI
-0xBB	0x0457	# CYRILLIC SMALL LETTER YI
-0xBC	0x0409	# CYRILLIC CAPITAL LETTER LJE
-0xBD	0x0459	# CYRILLIC SMALL LETTER LJE
-0xBE	0x040A	# CYRILLIC CAPITAL LETTER NJE
-0xBF	0x045A	# CYRILLIC SMALL LETTER NJE
-0xC0	0x0458	# CYRILLIC SMALL LETTER JE
-0xC1	0x0405	# CYRILLIC CAPITAL LETTER DZE
-0xC2	0x00AC	# NOT SIGN
-0xC3	0x221A	# SQUARE ROOT
-0xC4	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xC5	0x2248	# ALMOST EQUAL TO
-0xC6	0x2206	# INCREMENT
-0xC7	0x00AB	# LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC8	0x00BB	# RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xC9	0x2026	# HORIZONTAL ELLIPSIS
-0xCA	0x00A0	# NO-BREAK SPACE
-0xCB	0x040B	# CYRILLIC CAPITAL LETTER TSHE
-0xCC	0x045B	# CYRILLIC SMALL LETTER TSHE
-0xCD	0x040C	# CYRILLIC CAPITAL LETTER KJE
-0xCE	0x045C	# CYRILLIC SMALL LETTER KJE
-0xCF	0x0455	# CYRILLIC SMALL LETTER DZE
-0xD0	0x2013	# EN DASH
-0xD1	0x2014	# EM DASH
-0xD2	0x201C	# LEFT DOUBLE QUOTATION MARK
-0xD3	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0xD4	0x2018	# LEFT SINGLE QUOTATION MARK
-0xD5	0x2019	# RIGHT SINGLE QUOTATION MARK
-0xD6	0x00F7	# DIVISION SIGN
-0xD7	0x201E	# DOUBLE LOW-9 QUOTATION MARK
-0xD8	0x040E	# CYRILLIC CAPITAL LETTER SHORT U
-0xD9	0x045E	# CYRILLIC SMALL LETTER SHORT U
-0xDA	0x040F	# CYRILLIC CAPITAL LETTER DZHE
-0xDB	0x045F	# CYRILLIC SMALL LETTER DZHE
-0xDC	0x2116	# NUMERO SIGN
-0xDD	0x0401	# CYRILLIC CAPITAL LETTER IO
-0xDE	0x0451	# CYRILLIC SMALL LETTER IO
-0xDF	0x044F	# CYRILLIC SMALL LETTER YA
-0xE0	0x0430	# CYRILLIC SMALL LETTER A
-0xE1	0x0431	# CYRILLIC SMALL LETTER BE
-0xE2	0x0432	# CYRILLIC SMALL LETTER VE
-0xE3	0x0433	# CYRILLIC SMALL LETTER GHE
-0xE4	0x0434	# CYRILLIC SMALL LETTER DE
-0xE5	0x0435	# CYRILLIC SMALL LETTER IE
-0xE6	0x0436	# CYRILLIC SMALL LETTER ZHE
-0xE7	0x0437	# CYRILLIC SMALL LETTER ZE
-0xE8	0x0438	# CYRILLIC SMALL LETTER I
-0xE9	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0xEA	0x043A	# CYRILLIC SMALL LETTER KA
-0xEB	0x043B	# CYRILLIC SMALL LETTER EL
-0xEC	0x043C	# CYRILLIC SMALL LETTER EM
-0xED	0x043D	# CYRILLIC SMALL LETTER EN
-0xEE	0x043E	# CYRILLIC SMALL LETTER O
-0xEF	0x043F	# CYRILLIC SMALL LETTER PE
-0xF0	0x0440	# CYRILLIC SMALL LETTER ER
-0xF1	0x0441	# CYRILLIC SMALL LETTER ES
-0xF2	0x0442	# CYRILLIC SMALL LETTER TE
-0xF3	0x0443	# CYRILLIC SMALL LETTER U
-0xF4	0x0444	# CYRILLIC SMALL LETTER EF
-0xF5	0x0445	# CYRILLIC SMALL LETTER HA
-0xF6	0x0446	# CYRILLIC SMALL LETTER TSE
-0xF7	0x0447	# CYRILLIC SMALL LETTER CHE
-0xF8	0x0448	# CYRILLIC SMALL LETTER SHA
-0xF9	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0xFA	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0xFB	0x044B	# CYRILLIC SMALL LETTER YERU
-0xFC	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0xFD	0x044D	# CYRILLIC SMALL LETTER E
-0xFE	0x044E	# CYRILLIC SMALL LETTER YU
-0xFF	0x00A4	# CURRENCY SIGN
diff --git a/tools/encoding/shiftjis.txt b/tools/encoding/shiftjis.txt
deleted file mode 100644
index 7db99ab..0000000
--- a/tools/encoding/shiftjis.txt
+++ /dev/null
@@ -1,7096 +0,0 @@
-#
-#	Name:             Shift-JIS to Unicode
-#	Unicode version:  1.1
-#	Table version:    0.9
-#	Table format:     Format A
-#	Date:             8 March 1994
-#	Authors:          Glenn Adams <glenn@metis.com>
-#                     John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
-#
-#	General notes:
-#
-#	This table contains the data the Unicode Consortium has on how
-#       Shift-JIS (a combination of JIS 0201 and JIS 0208) maps into Unicode.
-#
-#	Format:  Three tab-separated columns
-#		 Column #1 is the shift-JIS code (in hex)
-#		 Column #2 is the Unicode (in hex as 0xXXXX)
-#		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point.  Including all these
-#					names in this file increases its size substantially
-#					and needlessly.  The token "<CJK>" is used for the
-#					name of these characters.  If necessary, it can be
-#					expanded algorithmically by a parser or editor.
-#
-#	The entries are ordered by their Shift-JIS codes as follows:
-#		Single-byte characters precede double-byte characters
-#		The single-byte and double-byte blocks are in ascending
-#		hexadecimal order
-#	There is an alternative order some people might be preferred,
-#		where all the entries are in order of the top (or only) byte.
-#		This alternate order can be generated from the one given here
-#		by a simple sort.  
-#
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
-#
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x0022	# QUOTATION MARK
-0x23	0x0023	# NUMBER SIGN
-0x24	0x0024	# DOLLAR SIGN
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x0027	# APOSTROPHE
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x002A	# ASTERISK
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x002D	# HYPHEN-MINUS
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x0040	# COMMERCIAL AT
-0x41	0x0041	# LATIN CAPITAL LETTER A
-0x42	0x0042	# LATIN CAPITAL LETTER B
-0x43	0x0043	# LATIN CAPITAL LETTER C
-0x44	0x0044	# LATIN CAPITAL LETTER D
-0x45	0x0045	# LATIN CAPITAL LETTER E
-0x46	0x0046	# LATIN CAPITAL LETTER F
-0x47	0x0047	# LATIN CAPITAL LETTER G
-0x48	0x0048	# LATIN CAPITAL LETTER H
-0x49	0x0049	# LATIN CAPITAL LETTER I
-0x4A	0x004A	# LATIN CAPITAL LETTER J
-0x4B	0x004B	# LATIN CAPITAL LETTER K
-0x4C	0x004C	# LATIN CAPITAL LETTER L
-0x4D	0x004D	# LATIN CAPITAL LETTER M
-0x4E	0x004E	# LATIN CAPITAL LETTER N
-0x4F	0x004F	# LATIN CAPITAL LETTER O
-0x50	0x0050	# LATIN CAPITAL LETTER P
-0x51	0x0051	# LATIN CAPITAL LETTER Q
-0x52	0x0052	# LATIN CAPITAL LETTER R
-0x53	0x0053	# LATIN CAPITAL LETTER S
-0x54	0x0054	# LATIN CAPITAL LETTER T
-0x55	0x0055	# LATIN CAPITAL LETTER U
-0x56	0x0056	# LATIN CAPITAL LETTER V
-0x57	0x0057	# LATIN CAPITAL LETTER W
-0x58	0x0058	# LATIN CAPITAL LETTER X
-0x59	0x0059	# LATIN CAPITAL LETTER Y
-0x5A	0x005A	# LATIN CAPITAL LETTER Z
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x005C	#REVERSE SOLIDUS (rendered as Halfwidth Yen Sign)
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x005E	# CIRCUMFLEX ACCENT
-0x5F	0x005F	# LOW LINE
-0x60	0x0060	# GRAVE ACCENT
-0x61	0x0061	# LATIN SMALL LETTER A
-0x62	0x0062	# LATIN SMALL LETTER B
-0x63	0x0063	# LATIN SMALL LETTER C
-0x64	0x0064	# LATIN SMALL LETTER D
-0x65	0x0065	# LATIN SMALL LETTER E
-0x66	0x0066	# LATIN SMALL LETTER F
-0x67	0x0067	# LATIN SMALL LETTER G
-0x68	0x0068	# LATIN SMALL LETTER H
-0x69	0x0069	# LATIN SMALL LETTER I
-0x6A	0x006A	# LATIN SMALL LETTER J
-0x6B	0x006B	# LATIN SMALL LETTER K
-0x6C	0x006C	# LATIN SMALL LETTER L
-0x6D	0x006D	# LATIN SMALL LETTER M
-0x6E	0x006E	# LATIN SMALL LETTER N
-0x6F	0x006F	# LATIN SMALL LETTER O
-0x70	0x0070	# LATIN SMALL LETTER P
-0x71	0x0071	# LATIN SMALL LETTER Q
-0x72	0x0072	# LATIN SMALL LETTER R
-0x73	0x0073	# LATIN SMALL LETTER S
-0x74	0x0074	# LATIN SMALL LETTER T
-0x75	0x0075	# LATIN SMALL LETTER U
-0x76	0x0076	# LATIN SMALL LETTER V
-0x77	0x0077	# LATIN SMALL LETTER W
-0x78	0x0078	# LATIN SMALL LETTER X
-0x79	0x0079	# LATIN SMALL LETTER Y
-0x7A	0x007A	# LATIN SMALL LETTER Z
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x007E	# TILDE
-0x8140	0x3000	# IDEOGRAPHIC SPACE
-0x8141	0x3001	# IDEOGRAPHIC COMMA
-0x8142	0x3002	# IDEOGRAPHIC FULL STOP
-0x8143	0xFF0C	# FULLWIDTH COMMA
-0x8144	0xFF0E	# FULLWIDTH FULL STOP
-0x8145	0x30FB	# KATAKANA MIDDLE DOT
-0x8146	0xFF1A	# FULLWIDTH COLON
-0x8147	0xFF1B	# FULLWIDTH SEMICOLON
-0x8148	0xFF1F	# FULLWIDTH QUESTION MARK
-0x8149	0xFF01	# FULLWIDTH EXCLAMATION MARK
-0x814A	0x309B	# KATAKANA-HIRAGANA VOICED SOUND MARK
-0x814B	0x309C	# KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-0x814C	0x00B4	# ACUTE ACCENT
-0x814D	0xFF40	# FULLWIDTH GRAVE ACCENT
-0x814E	0x00A8	# DIAERESIS
-0x814F	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
-0x8150	0xFFE3	# FULLWIDTH MACRON
-0x8151	0xFF3F	# FULLWIDTH LOW LINE
-0x8152	0x30FD	# KATAKANA ITERATION MARK
-0x8153	0x30FE	# KATAKANA VOICED ITERATION MARK
-0x8154	0x309D	# HIRAGANA ITERATION MARK
-0x8155	0x309E	# HIRAGANA VOICED ITERATION MARK
-0x8156	0x3003	# DITTO MARK
-0x8157	0x4EDD	# <CJK>
-0x8158	0x3005	# IDEOGRAPHIC ITERATION MARK
-0x8159	0x3006	# IDEOGRAPHIC CLOSING MARK
-0x815A	0x3007	# IDEOGRAPHIC NUMBER ZERO
-0x815B	0x30FC	# KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0x815C	0x2015	# HORIZONTAL BAR
-0x815D	0x2010	# HYPHEN
-0x815E	0xFF0F	# FULLWIDTH SOLIDUS
-0x815F	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
-0x8160	0x301C	# WAVE DASH
-0x8161	0x2016	# DOUBLE VERTICAL LINE
-0x8162	0xFF5C	# FULLWIDTH VERTICAL LINE
-0x8163	0x2026	# HORIZONTAL ELLIPSIS
-0x8164	0x2025	# TWO DOT LEADER
-0x8165	0x2018	# LEFT SINGLE QUOTATION MARK
-0x8166	0x2019	# RIGHT SINGLE QUOTATION MARK
-0x8167	0x201C	# LEFT DOUBLE QUOTATION MARK
-0x8168	0x201D	# RIGHT DOUBLE QUOTATION MARK
-0x8169	0xFF08	# FULLWIDTH LEFT PARENTHESIS
-0x816A	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
-0x816B	0x3014	# LEFT TORTOISE SHELL BRACKET
-0x816C	0x3015	# RIGHT TORTOISE SHELL BRACKET
-0x816D	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
-0x816E	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
-0x816F	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
-0x8170	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
-0x8171	0x3008	# LEFT ANGLE BRACKET
-0x8172	0x3009	# RIGHT ANGLE BRACKET
-0x8173	0x300A	# LEFT DOUBLE ANGLE BRACKET
-0x8174	0x300B	# RIGHT DOUBLE ANGLE BRACKET
-0x8175	0x300C	# LEFT CORNER BRACKET
-0x8176	0x300D	# RIGHT CORNER BRACKET
-0x8177	0x300E	# LEFT WHITE CORNER BRACKET
-0x8178	0x300F	# RIGHT WHITE CORNER BRACKET
-0x8179	0x3010	# LEFT BLACK LENTICULAR BRACKET
-0x817A	0x3011	# RIGHT BLACK LENTICULAR BRACKET
-0x817B	0xFF0B	# FULLWIDTH PLUS SIGN
-0x817C	0x2212	# MINUS SIGN
-0x817D	0x00B1	# PLUS-MINUS SIGN
-0x817E	0x00D7	# MULTIPLICATION SIGN
-0x8180	0x00F7	# DIVISION SIGN
-0x8181	0xFF1D	# FULLWIDTH EQUALS SIGN
-0x8182	0x2260	# NOT EQUAL TO
-0x8183	0xFF1C	# FULLWIDTH LESS-THAN SIGN
-0x8184	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
-0x8185	0x2266	# LESS-THAN OVER EQUAL TO
-0x8186	0x2267	# GREATER-THAN OVER EQUAL TO
-0x8187	0x221E	# INFINITY
-0x8188	0x2234	# THEREFORE
-0x8189	0x2642	# MALE SIGN
-0x818A	0x2640	# FEMALE SIGN
-0x818B	0x00B0	# DEGREE SIGN
-0x818C	0x2032	# PRIME
-0x818D	0x2033	# DOUBLE PRIME
-0x818E	0x2103	# DEGREE CELSIUS
-0x818F	0xFFE5	# FULLWIDTH YEN SIGN
-0x8190	0xFF04	# FULLWIDTH DOLLAR SIGN
-0x8191	0x00A2	# CENT SIGN
-0x8192	0x00A3	# POUND SIGN
-0x8193	0xFF05	# FULLWIDTH PERCENT SIGN
-0x8194	0xFF03	# FULLWIDTH NUMBER SIGN
-0x8195	0xFF06	# FULLWIDTH AMPERSAND
-0x8196	0xFF0A	# FULLWIDTH ASTERISK
-0x8197	0xFF20	# FULLWIDTH COMMERCIAL AT
-0x8198	0x00A7	# SECTION SIGN
-0x8199	0x2606	# WHITE STAR
-0x819A	0x2605	# BLACK STAR
-0x819B	0x25CB	# WHITE CIRCLE
-0x819C	0x25CF	# BLACK CIRCLE
-0x819D	0x25CE	# BULLSEYE
-0x819E	0x25C7	# WHITE DIAMOND
-0x819F	0x25C6	# BLACK DIAMOND
-0x81A0	0x25A1	# WHITE SQUARE
-0x81A1	0x25A0	# BLACK SQUARE
-0x81A2	0x25B3	# WHITE UP-POINTING TRIANGLE
-0x81A3	0x25B2	# BLACK UP-POINTING TRIANGLE
-0x81A4	0x25BD	# WHITE DOWN-POINTING TRIANGLE
-0x81A5	0x25BC	# BLACK DOWN-POINTING TRIANGLE
-0x81A6	0x203B	# REFERENCE MARK
-0x81A7	0x3012	# POSTAL MARK
-0x81A8	0x2192	# RIGHTWARDS ARROW
-0x81A9	0x2190	# LEFTWARDS ARROW
-0x81AA	0x2191	# UPWARDS ARROW
-0x81AB	0x2193	# DOWNWARDS ARROW
-0x81AC	0x3013	# GETA MARK
-0x81B8	0x2208	# ELEMENT OF
-0x81B9	0x220B	# CONTAINS AS MEMBER
-0x81BA	0x2286	# SUBSET OF OR EQUAL TO
-0x81BB	0x2287	# SUPERSET OF OR EQUAL TO
-0x81BC	0x2282	# SUBSET OF
-0x81BD	0x2283	# SUPERSET OF
-0x81BE	0x222A	# UNION
-0x81BF	0x2229	# INTERSECTION
-0x81C8	0x2227	# LOGICAL AND
-0x81C9	0x2228	# LOGICAL OR
-0x81CA	0x00AC	# NOT SIGN
-0x81CB	0x21D2	# RIGHTWARDS DOUBLE ARROW
-0x81CC	0x21D4	# LEFT RIGHT DOUBLE ARROW
-0x81CD	0x2200	# FOR ALL
-0x81CE	0x2203	# THERE EXISTS
-0x81DA	0x2220	# ANGLE
-0x81DB	0x22A5	# UP TACK
-0x81DC	0x2312	# ARC
-0x81DD	0x2202	# PARTIAL DIFFERENTIAL
-0x81DE	0x2207	# NABLA
-0x81DF	0x2261	# IDENTICAL TO
-0x81E0	0x2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
-0x81E1	0x226A	# MUCH LESS-THAN
-0x81E2	0x226B	# MUCH GREATER-THAN
-0x81E3	0x221A	# SQUARE ROOT
-0x81E4	0x223D	# REVERSED TILDE
-0x81E5	0x221D	# PROPORTIONAL TO
-0x81E6	0x2235	# BECAUSE
-0x81E7	0x222B	# INTEGRAL
-0x81E8	0x222C	# DOUBLE INTEGRAL
-0x81F0	0x212B	# ANGSTROM SIGN
-0x81F1	0x2030	# PER MILLE SIGN
-0x81F2	0x266F	# MUSIC SHARP SIGN
-0x81F3	0x266D	# MUSIC FLAT SIGN
-0x81F4	0x266A	# EIGHTH NOTE
-0x81F5	0x2020	# DAGGER
-0x81F6	0x2021	# DOUBLE DAGGER
-0x81F7	0x00B6	# PILCROW SIGN
-0x81FC	0x25EF	# LARGE CIRCLE
-0x824F	0xFF10	# FULLWIDTH DIGIT ZERO
-0x8250	0xFF11	# FULLWIDTH DIGIT ONE
-0x8251	0xFF12	# FULLWIDTH DIGIT TWO
-0x8252	0xFF13	# FULLWIDTH DIGIT THREE
-0x8253	0xFF14	# FULLWIDTH DIGIT FOUR
-0x8254	0xFF15	# FULLWIDTH DIGIT FIVE
-0x8255	0xFF16	# FULLWIDTH DIGIT SIX
-0x8256	0xFF17	# FULLWIDTH DIGIT SEVEN
-0x8257	0xFF18	# FULLWIDTH DIGIT EIGHT
-0x8258	0xFF19	# FULLWIDTH DIGIT NINE
-0x8260	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
-0x8261	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
-0x8262	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
-0x8263	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
-0x8264	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
-0x8265	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
-0x8266	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
-0x8267	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
-0x8268	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
-0x8269	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
-0x826A	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
-0x826B	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
-0x826C	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
-0x826D	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
-0x826E	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
-0x826F	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
-0x8270	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
-0x8271	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
-0x8272	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
-0x8273	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
-0x8274	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
-0x8275	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
-0x8276	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
-0x8277	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
-0x8278	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
-0x8279	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
-0x8281	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
-0x8282	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
-0x8283	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
-0x8284	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
-0x8285	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
-0x8286	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
-0x8287	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
-0x8288	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
-0x8289	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
-0x828A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
-0x828B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
-0x828C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
-0x828D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
-0x828E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
-0x828F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
-0x8290	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
-0x8291	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
-0x8292	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
-0x8293	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
-0x8294	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
-0x8295	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
-0x8296	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
-0x8297	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
-0x8298	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
-0x8299	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
-0x829A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
-0x829F	0x3041	# HIRAGANA LETTER SMALL A
-0x82A0	0x3042	# HIRAGANA LETTER A
-0x82A1	0x3043	# HIRAGANA LETTER SMALL I
-0x82A2	0x3044	# HIRAGANA LETTER I
-0x82A3	0x3045	# HIRAGANA LETTER SMALL U
-0x82A4	0x3046	# HIRAGANA LETTER U
-0x82A5	0x3047	# HIRAGANA LETTER SMALL E
-0x82A6	0x3048	# HIRAGANA LETTER E
-0x82A7	0x3049	# HIRAGANA LETTER SMALL O
-0x82A8	0x304A	# HIRAGANA LETTER O
-0x82A9	0x304B	# HIRAGANA LETTER KA
-0x82AA	0x304C	# HIRAGANA LETTER GA
-0x82AB	0x304D	# HIRAGANA LETTER KI
-0x82AC	0x304E	# HIRAGANA LETTER GI
-0x82AD	0x304F	# HIRAGANA LETTER KU
-0x82AE	0x3050	# HIRAGANA LETTER GU
-0x82AF	0x3051	# HIRAGANA LETTER KE
-0x82B0	0x3052	# HIRAGANA LETTER GE
-0x82B1	0x3053	# HIRAGANA LETTER KO
-0x82B2	0x3054	# HIRAGANA LETTER GO
-0x82B3	0x3055	# HIRAGANA LETTER SA
-0x82B4	0x3056	# HIRAGANA LETTER ZA
-0x82B5	0x3057	# HIRAGANA LETTER SI
-0x82B6	0x3058	# HIRAGANA LETTER ZI
-0x82B7	0x3059	# HIRAGANA LETTER SU
-0x82B8	0x305A	# HIRAGANA LETTER ZU
-0x82B9	0x305B	# HIRAGANA LETTER SE
-0x82BA	0x305C	# HIRAGANA LETTER ZE
-0x82BB	0x305D	# HIRAGANA LETTER SO
-0x82BC	0x305E	# HIRAGANA LETTER ZO
-0x82BD	0x305F	# HIRAGANA LETTER TA
-0x82BE	0x3060	# HIRAGANA LETTER DA
-0x82BF	0x3061	# HIRAGANA LETTER TI
-0x82C0	0x3062	# HIRAGANA LETTER DI
-0x82C1	0x3063	# HIRAGANA LETTER SMALL TU
-0x82C2	0x3064	# HIRAGANA LETTER TU
-0x82C3	0x3065	# HIRAGANA LETTER DU
-0x82C4	0x3066	# HIRAGANA LETTER TE
-0x82C5	0x3067	# HIRAGANA LETTER DE
-0x82C6	0x3068	# HIRAGANA LETTER TO
-0x82C7	0x3069	# HIRAGANA LETTER DO
-0x82C8	0x306A	# HIRAGANA LETTER NA
-0x82C9	0x306B	# HIRAGANA LETTER NI
-0x82CA	0x306C	# HIRAGANA LETTER NU
-0x82CB	0x306D	# HIRAGANA LETTER NE
-0x82CC	0x306E	# HIRAGANA LETTER NO
-0x82CD	0x306F	# HIRAGANA LETTER HA
-0x82CE	0x3070	# HIRAGANA LETTER BA
-0x82CF	0x3071	# HIRAGANA LETTER PA
-0x82D0	0x3072	# HIRAGANA LETTER HI
-0x82D1	0x3073	# HIRAGANA LETTER BI
-0x82D2	0x3074	# HIRAGANA LETTER PI
-0x82D3	0x3075	# HIRAGANA LETTER HU
-0x82D4	0x3076	# HIRAGANA LETTER BU
-0x82D5	0x3077	# HIRAGANA LETTER PU
-0x82D6	0x3078	# HIRAGANA LETTER HE
-0x82D7	0x3079	# HIRAGANA LETTER BE
-0x82D8	0x307A	# HIRAGANA LETTER PE
-0x82D9	0x307B	# HIRAGANA LETTER HO
-0x82DA	0x307C	# HIRAGANA LETTER BO
-0x82DB	0x307D	# HIRAGANA LETTER PO
-0x82DC	0x307E	# HIRAGANA LETTER MA
-0x82DD	0x307F	# HIRAGANA LETTER MI
-0x82DE	0x3080	# HIRAGANA LETTER MU
-0x82DF	0x3081	# HIRAGANA LETTER ME
-0x82E0	0x3082	# HIRAGANA LETTER MO
-0x82E1	0x3083	# HIRAGANA LETTER SMALL YA
-0x82E2	0x3084	# HIRAGANA LETTER YA
-0x82E3	0x3085	# HIRAGANA LETTER SMALL YU
-0x82E4	0x3086	# HIRAGANA LETTER YU
-0x82E5	0x3087	# HIRAGANA LETTER SMALL YO
-0x82E6	0x3088	# HIRAGANA LETTER YO
-0x82E7	0x3089	# HIRAGANA LETTER RA
-0x82E8	0x308A	# HIRAGANA LETTER RI
-0x82E9	0x308B	# HIRAGANA LETTER RU
-0x82EA	0x308C	# HIRAGANA LETTER RE
-0x82EB	0x308D	# HIRAGANA LETTER RO
-0x82EC	0x308E	# HIRAGANA LETTER SMALL WA
-0x82ED	0x308F	# HIRAGANA LETTER WA
-0x82EE	0x3090	# HIRAGANA LETTER WI
-0x82EF	0x3091	# HIRAGANA LETTER WE
-0x82F0	0x3092	# HIRAGANA LETTER WO
-0x82F1	0x3093	# HIRAGANA LETTER N
-0x8340	0x30A1	# KATAKANA LETTER SMALL A
-0x8341	0x30A2	# KATAKANA LETTER A
-0x8342	0x30A3	# KATAKANA LETTER SMALL I
-0x8343	0x30A4	# KATAKANA LETTER I
-0x8344	0x30A5	# KATAKANA LETTER SMALL U
-0x8345	0x30A6	# KATAKANA LETTER U
-0x8346	0x30A7	# KATAKANA LETTER SMALL E
-0x8347	0x30A8	# KATAKANA LETTER E
-0x8348	0x30A9	# KATAKANA LETTER SMALL O
-0x8349	0x30AA	# KATAKANA LETTER O
-0x834A	0x30AB	# KATAKANA LETTER KA
-0x834B	0x30AC	# KATAKANA LETTER GA
-0x834C	0x30AD	# KATAKANA LETTER KI
-0x834D	0x30AE	# KATAKANA LETTER GI
-0x834E	0x30AF	# KATAKANA LETTER KU
-0x834F	0x30B0	# KATAKANA LETTER GU
-0x8350	0x30B1	# KATAKANA LETTER KE
-0x8351	0x30B2	# KATAKANA LETTER GE
-0x8352	0x30B3	# KATAKANA LETTER KO
-0x8353	0x30B4	# KATAKANA LETTER GO
-0x8354	0x30B5	# KATAKANA LETTER SA
-0x8355	0x30B6	# KATAKANA LETTER ZA
-0x8356	0x30B7	# KATAKANA LETTER SI
-0x8357	0x30B8	# KATAKANA LETTER ZI
-0x8358	0x30B9	# KATAKANA LETTER SU
-0x8359	0x30BA	# KATAKANA LETTER ZU
-0x835A	0x30BB	# KATAKANA LETTER SE
-0x835B	0x30BC	# KATAKANA LETTER ZE
-0x835C	0x30BD	# KATAKANA LETTER SO
-0x835D	0x30BE	# KATAKANA LETTER ZO
-0x835E	0x30BF	# KATAKANA LETTER TA
-0x835F	0x30C0	# KATAKANA LETTER DA
-0x8360	0x30C1	# KATAKANA LETTER TI
-0x8361	0x30C2	# KATAKANA LETTER DI
-0x8362	0x30C3	# KATAKANA LETTER SMALL TU
-0x8363	0x30C4	# KATAKANA LETTER TU
-0x8364	0x30C5	# KATAKANA LETTER DU
-0x8365	0x30C6	# KATAKANA LETTER TE
-0x8366	0x30C7	# KATAKANA LETTER DE
-0x8367	0x30C8	# KATAKANA LETTER TO
-0x8368	0x30C9	# KATAKANA LETTER DO
-0x8369	0x30CA	# KATAKANA LETTER NA
-0x836A	0x30CB	# KATAKANA LETTER NI
-0x836B	0x30CC	# KATAKANA LETTER NU
-0x836C	0x30CD	# KATAKANA LETTER NE
-0x836D	0x30CE	# KATAKANA LETTER NO
-0x836E	0x30CF	# KATAKANA LETTER HA
-0x836F	0x30D0	# KATAKANA LETTER BA
-0x8370	0x30D1	# KATAKANA LETTER PA
-0x8371	0x30D2	# KATAKANA LETTER HI
-0x8372	0x30D3	# KATAKANA LETTER BI
-0x8373	0x30D4	# KATAKANA LETTER PI
-0x8374	0x30D5	# KATAKANA LETTER HU
-0x8375	0x30D6	# KATAKANA LETTER BU
-0x8376	0x30D7	# KATAKANA LETTER PU
-0x8377	0x30D8	# KATAKANA LETTER HE
-0x8378	0x30D9	# KATAKANA LETTER BE
-0x8379	0x30DA	# KATAKANA LETTER PE
-0x837A	0x30DB	# KATAKANA LETTER HO
-0x837B	0x30DC	# KATAKANA LETTER BO
-0x837C	0x30DD	# KATAKANA LETTER PO
-0x837D	0x30DE	# KATAKANA LETTER MA
-0x837E	0x30DF	# KATAKANA LETTER MI
-0x8380	0x30E0	# KATAKANA LETTER MU
-0x8381	0x30E1	# KATAKANA LETTER ME
-0x8382	0x30E2	# KATAKANA LETTER MO
-0x8383	0x30E3	# KATAKANA LETTER SMALL YA
-0x8384	0x30E4	# KATAKANA LETTER YA
-0x8385	0x30E5	# KATAKANA LETTER SMALL YU
-0x8386	0x30E6	# KATAKANA LETTER YU
-0x8387	0x30E7	# KATAKANA LETTER SMALL YO
-0x8388	0x30E8	# KATAKANA LETTER YO
-0x8389	0x30E9	# KATAKANA LETTER RA
-0x838A	0x30EA	# KATAKANA LETTER RI
-0x838B	0x30EB	# KATAKANA LETTER RU
-0x838C	0x30EC	# KATAKANA LETTER RE
-0x838D	0x30ED	# KATAKANA LETTER RO
-0x838E	0x30EE	# KATAKANA LETTER SMALL WA
-0x838F	0x30EF	# KATAKANA LETTER WA
-0x8390	0x30F0	# KATAKANA LETTER WI
-0x8391	0x30F1	# KATAKANA LETTER WE
-0x8392	0x30F2	# KATAKANA LETTER WO
-0x8393	0x30F3	# KATAKANA LETTER N
-0x8394	0x30F4	# KATAKANA LETTER VU
-0x8395	0x30F5	# KATAKANA LETTER SMALL KA
-0x8396	0x30F6	# KATAKANA LETTER SMALL KE
-0x839F	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x83A0	0x0392	# GREEK CAPITAL LETTER BETA
-0x83A1	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x83A2	0x0394	# GREEK CAPITAL LETTER DELTA
-0x83A3	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x83A4	0x0396	# GREEK CAPITAL LETTER ZETA
-0x83A5	0x0397	# GREEK CAPITAL LETTER ETA
-0x83A6	0x0398	# GREEK CAPITAL LETTER THETA
-0x83A7	0x0399	# GREEK CAPITAL LETTER IOTA
-0x83A8	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x83A9	0x039B	# GREEK CAPITAL LETTER LAMDA
-0x83AA	0x039C	# GREEK CAPITAL LETTER MU
-0x83AB	0x039D	# GREEK CAPITAL LETTER NU
-0x83AC	0x039E	# GREEK CAPITAL LETTER XI
-0x83AD	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x83AE	0x03A0	# GREEK CAPITAL LETTER PI
-0x83AF	0x03A1	# GREEK CAPITAL LETTER RHO
-0x83B0	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x83B1	0x03A4	# GREEK CAPITAL LETTER TAU
-0x83B2	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x83B3	0x03A6	# GREEK CAPITAL LETTER PHI
-0x83B4	0x03A7	# GREEK CAPITAL LETTER CHI
-0x83B5	0x03A8	# GREEK CAPITAL LETTER PSI
-0x83B6	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x83BF	0x03B1	# GREEK SMALL LETTER ALPHA
-0x83C0	0x03B2	# GREEK SMALL LETTER BETA
-0x83C1	0x03B3	# GREEK SMALL LETTER GAMMA
-0x83C2	0x03B4	# GREEK SMALL LETTER DELTA
-0x83C3	0x03B5	# GREEK SMALL LETTER EPSILON
-0x83C4	0x03B6	# GREEK SMALL LETTER ZETA
-0x83C5	0x03B7	# GREEK SMALL LETTER ETA
-0x83C6	0x03B8	# GREEK SMALL LETTER THETA
-0x83C7	0x03B9	# GREEK SMALL LETTER IOTA
-0x83C8	0x03BA	# GREEK SMALL LETTER KAPPA
-0x83C9	0x03BB	# GREEK SMALL LETTER LAMDA
-0x83CA	0x03BC	# GREEK SMALL LETTER MU
-0x83CB	0x03BD	# GREEK SMALL LETTER NU
-0x83CC	0x03BE	# GREEK SMALL LETTER XI
-0x83CD	0x03BF	# GREEK SMALL LETTER OMICRON
-0x83CE	0x03C0	# GREEK SMALL LETTER PI
-0x83CF	0x03C1	# GREEK SMALL LETTER RHO
-0x83D0	0x03C3	# GREEK SMALL LETTER SIGMA
-0x83D1	0x03C4	# GREEK SMALL LETTER TAU
-0x83D2	0x03C5	# GREEK SMALL LETTER UPSILON
-0x83D3	0x03C6	# GREEK SMALL LETTER PHI
-0x83D4	0x03C7	# GREEK SMALL LETTER CHI
-0x83D5	0x03C8	# GREEK SMALL LETTER PSI
-0x83D6	0x03C9	# GREEK SMALL LETTER OMEGA
-0x8440	0x0410	# CYRILLIC CAPITAL LETTER A
-0x8441	0x0411	# CYRILLIC CAPITAL LETTER BE
-0x8442	0x0412	# CYRILLIC CAPITAL LETTER VE
-0x8443	0x0413	# CYRILLIC CAPITAL LETTER GHE
-0x8444	0x0414	# CYRILLIC CAPITAL LETTER DE
-0x8445	0x0415	# CYRILLIC CAPITAL LETTER IE
-0x8446	0x0401	# CYRILLIC CAPITAL LETTER IO
-0x8447	0x0416	# CYRILLIC CAPITAL LETTER ZHE
-0x8448	0x0417	# CYRILLIC CAPITAL LETTER ZE
-0x8449	0x0418	# CYRILLIC CAPITAL LETTER I
-0x844A	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
-0x844B	0x041A	# CYRILLIC CAPITAL LETTER KA
-0x844C	0x041B	# CYRILLIC CAPITAL LETTER EL
-0x844D	0x041C	# CYRILLIC CAPITAL LETTER EM
-0x844E	0x041D	# CYRILLIC CAPITAL LETTER EN
-0x844F	0x041E	# CYRILLIC CAPITAL LETTER O
-0x8450	0x041F	# CYRILLIC CAPITAL LETTER PE
-0x8451	0x0420	# CYRILLIC CAPITAL LETTER ER
-0x8452	0x0421	# CYRILLIC CAPITAL LETTER ES
-0x8453	0x0422	# CYRILLIC CAPITAL LETTER TE
-0x8454	0x0423	# CYRILLIC CAPITAL LETTER U
-0x8455	0x0424	# CYRILLIC CAPITAL LETTER EF
-0x8456	0x0425	# CYRILLIC CAPITAL LETTER HA
-0x8457	0x0426	# CYRILLIC CAPITAL LETTER TSE
-0x8458	0x0427	# CYRILLIC CAPITAL LETTER CHE
-0x8459	0x0428	# CYRILLIC CAPITAL LETTER SHA
-0x845A	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
-0x845B	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
-0x845C	0x042B	# CYRILLIC CAPITAL LETTER YERU
-0x845D	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
-0x845E	0x042D	# CYRILLIC CAPITAL LETTER E
-0x845F	0x042E	# CYRILLIC CAPITAL LETTER YU
-0x8460	0x042F	# CYRILLIC CAPITAL LETTER YA
-0x8470	0x0430	# CYRILLIC SMALL LETTER A
-0x8471	0x0431	# CYRILLIC SMALL LETTER BE
-0x8472	0x0432	# CYRILLIC SMALL LETTER VE
-0x8473	0x0433	# CYRILLIC SMALL LETTER GHE
-0x8474	0x0434	# CYRILLIC SMALL LETTER DE
-0x8475	0x0435	# CYRILLIC SMALL LETTER IE
-0x8476	0x0451	# CYRILLIC SMALL LETTER IO
-0x8477	0x0436	# CYRILLIC SMALL LETTER ZHE
-0x8478	0x0437	# CYRILLIC SMALL LETTER ZE
-0x8479	0x0438	# CYRILLIC SMALL LETTER I
-0x847A	0x0439	# CYRILLIC SMALL LETTER SHORT I
-0x847B	0x043A	# CYRILLIC SMALL LETTER KA
-0x847C	0x043B	# CYRILLIC SMALL LETTER EL
-0x847D	0x043C	# CYRILLIC SMALL LETTER EM
-0x847E	0x043D	# CYRILLIC SMALL LETTER EN
-0x8480	0x043E	# CYRILLIC SMALL LETTER O
-0x8481	0x043F	# CYRILLIC SMALL LETTER PE
-0x8482	0x0440	# CYRILLIC SMALL LETTER ER
-0x8483	0x0441	# CYRILLIC SMALL LETTER ES
-0x8484	0x0442	# CYRILLIC SMALL LETTER TE
-0x8485	0x0443	# CYRILLIC SMALL LETTER U
-0x8486	0x0444	# CYRILLIC SMALL LETTER EF
-0x8487	0x0445	# CYRILLIC SMALL LETTER HA
-0x8488	0x0446	# CYRILLIC SMALL LETTER TSE
-0x8489	0x0447	# CYRILLIC SMALL LETTER CHE
-0x848A	0x0448	# CYRILLIC SMALL LETTER SHA
-0x848B	0x0449	# CYRILLIC SMALL LETTER SHCHA
-0x848C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
-0x848D	0x044B	# CYRILLIC SMALL LETTER YERU
-0x848E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
-0x848F	0x044D	# CYRILLIC SMALL LETTER E
-0x8490	0x044E	# CYRILLIC SMALL LETTER YU
-0x8491	0x044F	# CYRILLIC SMALL LETTER YA
-0x849F	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
-0x84A0	0x2502	# BOX DRAWINGS LIGHT VERTICAL
-0x84A1	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
-0x84A2	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
-0x84A3	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
-0x84A4	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
-0x84A5	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0x84A6	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0x84A7	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0x84A8	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0x84A9	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0x84AA	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
-0x84AB	0x2503	# BOX DRAWINGS HEAVY VERTICAL
-0x84AC	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
-0x84AD	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
-0x84AE	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
-0x84AF	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
-0x84B0	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-0x84B1	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-0x84B2	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
-0x84B3	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
-0x84B4	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-0x84B5	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-0x84B6	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-0x84B7	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-0x84B8	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-0x84B9	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-0x84BA	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-0x84BB	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-0x84BC	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-0x84BD	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-0x84BE	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-0x889F	0x4E9C	# <CJK>
-0x88A0	0x5516	# <CJK>
-0x88A1	0x5A03	# <CJK>
-0x88A2	0x963F	# <CJK>
-0x88A3	0x54C0	# <CJK>
-0x88A4	0x611B	# <CJK>
-0x88A5	0x6328	# <CJK>
-0x88A6	0x59F6	# <CJK>
-0x88A7	0x9022	# <CJK>
-0x88A8	0x8475	# <CJK>
-0x88A9	0x831C	# <CJK>
-0x88AA	0x7A50	# <CJK>
-0x88AB	0x60AA	# <CJK>
-0x88AC	0x63E1	# <CJK>
-0x88AD	0x6E25	# <CJK>
-0x88AE	0x65ED	# <CJK>
-0x88AF	0x8466	# <CJK>
-0x88B0	0x82A6	# <CJK>
-0x88B1	0x9BF5	# <CJK>
-0x88B2	0x6893	# <CJK>
-0x88B3	0x5727	# <CJK>
-0x88B4	0x65A1	# <CJK>
-0x88B5	0x6271	# <CJK>
-0x88B6	0x5B9B	# <CJK>
-0x88B7	0x59D0	# <CJK>
-0x88B8	0x867B	# <CJK>
-0x88B9	0x98F4	# <CJK>
-0x88BA	0x7D62	# <CJK>
-0x88BB	0x7DBE	# <CJK>
-0x88BC	0x9B8E	# <CJK>
-0x88BD	0x6216	# <CJK>
-0x88BE	0x7C9F	# <CJK>
-0x88BF	0x88B7	# <CJK>
-0x88C0	0x5B89	# <CJK>
-0x88C1	0x5EB5	# <CJK>
-0x88C2	0x6309	# <CJK>
-0x88C3	0x6697	# <CJK>
-0x88C4	0x6848	# <CJK>
-0x88C5	0x95C7	# <CJK>
-0x88C6	0x978D	# <CJK>
-0x88C7	0x674F	# <CJK>
-0x88C8	0x4EE5	# <CJK>
-0x88C9	0x4F0A	# <CJK>
-0x88CA	0x4F4D	# <CJK>
-0x88CB	0x4F9D	# <CJK>
-0x88CC	0x5049	# <CJK>
-0x88CD	0x56F2	# <CJK>
-0x88CE	0x5937	# <CJK>
-0x88CF	0x59D4	# <CJK>
-0x88D0	0x5A01	# <CJK>
-0x88D1	0x5C09	# <CJK>
-0x88D2	0x60DF	# <CJK>
-0x88D3	0x610F	# <CJK>
-0x88D4	0x6170	# <CJK>
-0x88D5	0x6613	# <CJK>
-0x88D6	0x6905	# <CJK>
-0x88D7	0x70BA	# <CJK>
-0x88D8	0x754F	# <CJK>
-0x88D9	0x7570	# <CJK>
-0x88DA	0x79FB	# <CJK>
-0x88DB	0x7DAD	# <CJK>
-0x88DC	0x7DEF	# <CJK>
-0x88DD	0x80C3	# <CJK>
-0x88DE	0x840E	# <CJK>
-0x88DF	0x8863	# <CJK>
-0x88E0	0x8B02	# <CJK>
-0x88E1	0x9055	# <CJK>
-0x88E2	0x907A	# <CJK>
-0x88E3	0x533B	# <CJK>
-0x88E4	0x4E95	# <CJK>
-0x88E5	0x4EA5	# <CJK>
-0x88E6	0x57DF	# <CJK>
-0x88E7	0x80B2	# <CJK>
-0x88E8	0x90C1	# <CJK>
-0x88E9	0x78EF	# <CJK>
-0x88EA	0x4E00	# <CJK>
-0x88EB	0x58F1	# <CJK>
-0x88EC	0x6EA2	# <CJK>
-0x88ED	0x9038	# <CJK>
-0x88EE	0x7A32	# <CJK>
-0x88EF	0x8328	# <CJK>
-0x88F0	0x828B	# <CJK>
-0x88F1	0x9C2F	# <CJK>
-0x88F2	0x5141	# <CJK>
-0x88F3	0x5370	# <CJK>
-0x88F4	0x54BD	# <CJK>
-0x88F5	0x54E1	# <CJK>
-0x88F6	0x56E0	# <CJK>
-0x88F7	0x59FB	# <CJK>
-0x88F8	0x5F15	# <CJK>
-0x88F9	0x98F2	# <CJK>
-0x88FA	0x6DEB	# <CJK>
-0x88FB	0x80E4	# <CJK>
-0x88FC	0x852D	# <CJK>
-0x8940	0x9662	# <CJK>
-0x8941	0x9670	# <CJK>
-0x8942	0x96A0	# <CJK>
-0x8943	0x97FB	# <CJK>
-0x8944	0x540B	# <CJK>
-0x8945	0x53F3	# <CJK>
-0x8946	0x5B87	# <CJK>
-0x8947	0x70CF	# <CJK>
-0x8948	0x7FBD	# <CJK>
-0x8949	0x8FC2	# <CJK>
-0x894A	0x96E8	# <CJK>
-0x894B	0x536F	# <CJK>
-0x894C	0x9D5C	# <CJK>
-0x894D	0x7ABA	# <CJK>
-0x894E	0x4E11	# <CJK>
-0x894F	0x7893	# <CJK>
-0x8950	0x81FC	# <CJK>
-0x8951	0x6E26	# <CJK>
-0x8952	0x5618	# <CJK>
-0x8953	0x5504	# <CJK>
-0x8954	0x6B1D	# <CJK>
-0x8955	0x851A	# <CJK>
-0x8956	0x9C3B	# <CJK>
-0x8957	0x59E5	# <CJK>
-0x8958	0x53A9	# <CJK>
-0x8959	0x6D66	# <CJK>
-0x895A	0x74DC	# <CJK>
-0x895B	0x958F	# <CJK>
-0x895C	0x5642	# <CJK>
-0x895D	0x4E91	# <CJK>
-0x895E	0x904B	# <CJK>
-0x895F	0x96F2	# <CJK>
-0x8960	0x834F	# <CJK>
-0x8961	0x990C	# <CJK>
-0x8962	0x53E1	# <CJK>
-0x8963	0x55B6	# <CJK>
-0x8964	0x5B30	# <CJK>
-0x8965	0x5F71	# <CJK>
-0x8966	0x6620	# <CJK>
-0x8967	0x66F3	# <CJK>
-0x8968	0x6804	# <CJK>
-0x8969	0x6C38	# <CJK>
-0x896A	0x6CF3	# <CJK>
-0x896B	0x6D29	# <CJK>
-0x896C	0x745B	# <CJK>
-0x896D	0x76C8	# <CJK>
-0x896E	0x7A4E	# <CJK>
-0x896F	0x9834	# <CJK>
-0x8970	0x82F1	# <CJK>
-0x8971	0x885B	# <CJK>
-0x8972	0x8A60	# <CJK>
-0x8973	0x92ED	# <CJK>
-0x8974	0x6DB2	# <CJK>
-0x8975	0x75AB	# <CJK>
-0x8976	0x76CA	# <CJK>
-0x8977	0x99C5	# <CJK>
-0x8978	0x60A6	# <CJK>
-0x8979	0x8B01	# <CJK>
-0x897A	0x8D8A	# <CJK>
-0x897B	0x95B2	# <CJK>
-0x897C	0x698E	# <CJK>
-0x897D	0x53AD	# <CJK>
-0x897E	0x5186	# <CJK>
-0x8980	0x5712	# <CJK>
-0x8981	0x5830	# <CJK>
-0x8982	0x5944	# <CJK>
-0x8983	0x5BB4	# <CJK>
-0x8984	0x5EF6	# <CJK>
-0x8985	0x6028	# <CJK>
-0x8986	0x63A9	# <CJK>
-0x8987	0x63F4	# <CJK>
-0x8988	0x6CBF	# <CJK>
-0x8989	0x6F14	# <CJK>
-0x898A	0x708E	# <CJK>
-0x898B	0x7114	# <CJK>
-0x898C	0x7159	# <CJK>
-0x898D	0x71D5	# <CJK>
-0x898E	0x733F	# <CJK>
-0x898F	0x7E01	# <CJK>
-0x8990	0x8276	# <CJK>
-0x8991	0x82D1	# <CJK>
-0x8992	0x8597	# <CJK>
-0x8993	0x9060	# <CJK>
-0x8994	0x925B	# <CJK>
-0x8995	0x9D1B	# <CJK>
-0x8996	0x5869	# <CJK>
-0x8997	0x65BC	# <CJK>
-0x8998	0x6C5A	# <CJK>
-0x8999	0x7525	# <CJK>
-0x899A	0x51F9	# <CJK>
-0x899B	0x592E	# <CJK>
-0x899C	0x5965	# <CJK>
-0x899D	0x5F80	# <CJK>
-0x899E	0x5FDC	# <CJK>
-0x899F	0x62BC	# <CJK>
-0x89A0	0x65FA	# <CJK>
-0x89A1	0x6A2A	# <CJK>
-0x89A2	0x6B27	# <CJK>
-0x89A3	0x6BB4	# <CJK>
-0x89A4	0x738B	# <CJK>
-0x89A5	0x7FC1	# <CJK>
-0x89A6	0x8956	# <CJK>
-0x89A7	0x9D2C	# <CJK>
-0x89A8	0x9D0E	# <CJK>
-0x89A9	0x9EC4	# <CJK>
-0x89AA	0x5CA1	# <CJK>
-0x89AB	0x6C96	# <CJK>
-0x89AC	0x837B	# <CJK>
-0x89AD	0x5104	# <CJK>
-0x89AE	0x5C4B	# <CJK>
-0x89AF	0x61B6	# <CJK>
-0x89B0	0x81C6	# <CJK>
-0x89B1	0x6876	# <CJK>
-0x89B2	0x7261	# <CJK>
-0x89B3	0x4E59	# <CJK>
-0x89B4	0x4FFA	# <CJK>
-0x89B5	0x5378	# <CJK>
-0x89B6	0x6069	# <CJK>
-0x89B7	0x6E29	# <CJK>
-0x89B8	0x7A4F	# <CJK>
-0x89B9	0x97F3	# <CJK>
-0x89BA	0x4E0B	# <CJK>
-0x89BB	0x5316	# <CJK>
-0x89BC	0x4EEE	# <CJK>
-0x89BD	0x4F55	# <CJK>
-0x89BE	0x4F3D	# <CJK>
-0x89BF	0x4FA1	# <CJK>
-0x89C0	0x4F73	# <CJK>
-0x89C1	0x52A0	# <CJK>
-0x89C2	0x53EF	# <CJK>
-0x89C3	0x5609	# <CJK>
-0x89C4	0x590F	# <CJK>
-0x89C5	0x5AC1	# <CJK>
-0x89C6	0x5BB6	# <CJK>
-0x89C7	0x5BE1	# <CJK>
-0x89C8	0x79D1	# <CJK>
-0x89C9	0x6687	# <CJK>
-0x89CA	0x679C	# <CJK>
-0x89CB	0x67B6	# <CJK>
-0x89CC	0x6B4C	# <CJK>
-0x89CD	0x6CB3	# <CJK>
-0x89CE	0x706B	# <CJK>
-0x89CF	0x73C2	# <CJK>
-0x89D0	0x798D	# <CJK>
-0x89D1	0x79BE	# <CJK>
-0x89D2	0x7A3C	# <CJK>
-0x89D3	0x7B87	# <CJK>
-0x89D4	0x82B1	# <CJK>
-0x89D5	0x82DB	# <CJK>
-0x89D6	0x8304	# <CJK>
-0x89D7	0x8377	# <CJK>
-0x89D8	0x83EF	# <CJK>
-0x89D9	0x83D3	# <CJK>
-0x89DA	0x8766	# <CJK>
-0x89DB	0x8AB2	# <CJK>
-0x89DC	0x5629	# <CJK>
-0x89DD	0x8CA8	# <CJK>
-0x89DE	0x8FE6	# <CJK>
-0x89DF	0x904E	# <CJK>
-0x89E0	0x971E	# <CJK>
-0x89E1	0x868A	# <CJK>
-0x89E2	0x4FC4	# <CJK>
-0x89E3	0x5CE8	# <CJK>
-0x89E4	0x6211	# <CJK>
-0x89E5	0x7259	# <CJK>
-0x89E6	0x753B	# <CJK>
-0x89E7	0x81E5	# <CJK>
-0x89E8	0x82BD	# <CJK>
-0x89E9	0x86FE	# <CJK>
-0x89EA	0x8CC0	# <CJK>
-0x89EB	0x96C5	# <CJK>
-0x89EC	0x9913	# <CJK>
-0x89ED	0x99D5	# <CJK>
-0x89EE	0x4ECB	# <CJK>
-0x89EF	0x4F1A	# <CJK>
-0x89F0	0x89E3	# <CJK>
-0x89F1	0x56DE	# <CJK>
-0x89F2	0x584A	# <CJK>
-0x89F3	0x58CA	# <CJK>
-0x89F4	0x5EFB	# <CJK>
-0x89F5	0x5FEB	# <CJK>
-0x89F6	0x602A	# <CJK>
-0x89F7	0x6094	# <CJK>
-0x89F8	0x6062	# <CJK>
-0x89F9	0x61D0	# <CJK>
-0x89FA	0x6212	# <CJK>
-0x89FB	0x62D0	# <CJK>
-0x89FC	0x6539	# <CJK>
-0x8A40	0x9B41	# <CJK>
-0x8A41	0x6666	# <CJK>
-0x8A42	0x68B0	# <CJK>
-0x8A43	0x6D77	# <CJK>
-0x8A44	0x7070	# <CJK>
-0x8A45	0x754C	# <CJK>
-0x8A46	0x7686	# <CJK>
-0x8A47	0x7D75	# <CJK>
-0x8A48	0x82A5	# <CJK>
-0x8A49	0x87F9	# <CJK>
-0x8A4A	0x958B	# <CJK>
-0x8A4B	0x968E	# <CJK>
-0x8A4C	0x8C9D	# <CJK>
-0x8A4D	0x51F1	# <CJK>
-0x8A4E	0x52BE	# <CJK>
-0x8A4F	0x5916	# <CJK>
-0x8A50	0x54B3	# <CJK>
-0x8A51	0x5BB3	# <CJK>
-0x8A52	0x5D16	# <CJK>
-0x8A53	0x6168	# <CJK>
-0x8A54	0x6982	# <CJK>
-0x8A55	0x6DAF	# <CJK>
-0x8A56	0x788D	# <CJK>
-0x8A57	0x84CB	# <CJK>
-0x8A58	0x8857	# <CJK>
-0x8A59	0x8A72	# <CJK>
-0x8A5A	0x93A7	# <CJK>
-0x8A5B	0x9AB8	# <CJK>
-0x8A5C	0x6D6C	# <CJK>
-0x8A5D	0x99A8	# <CJK>
-0x8A5E	0x86D9	# <CJK>
-0x8A5F	0x57A3	# <CJK>
-0x8A60	0x67FF	# <CJK>
-0x8A61	0x86CE	# <CJK>
-0x8A62	0x920E	# <CJK>
-0x8A63	0x5283	# <CJK>
-0x8A64	0x5687	# <CJK>
-0x8A65	0x5404	# <CJK>
-0x8A66	0x5ED3	# <CJK>
-0x8A67	0x62E1	# <CJK>
-0x8A68	0x64B9	# <CJK>
-0x8A69	0x683C	# <CJK>
-0x8A6A	0x6838	# <CJK>
-0x8A6B	0x6BBB	# <CJK>
-0x8A6C	0x7372	# <CJK>
-0x8A6D	0x78BA	# <CJK>
-0x8A6E	0x7A6B	# <CJK>
-0x8A6F	0x899A	# <CJK>
-0x8A70	0x89D2	# <CJK>
-0x8A71	0x8D6B	# <CJK>
-0x8A72	0x8F03	# <CJK>
-0x8A73	0x90ED	# <CJK>
-0x8A74	0x95A3	# <CJK>
-0x8A75	0x9694	# <CJK>
-0x8A76	0x9769	# <CJK>
-0x8A77	0x5B66	# <CJK>
-0x8A78	0x5CB3	# <CJK>
-0x8A79	0x697D	# <CJK>
-0x8A7A	0x984D	# <CJK>
-0x8A7B	0x984E	# <CJK>
-0x8A7C	0x639B	# <CJK>
-0x8A7D	0x7B20	# <CJK>
-0x8A7E	0x6A2B	# <CJK>
-0x8A80	0x6A7F	# <CJK>
-0x8A81	0x68B6	# <CJK>
-0x8A82	0x9C0D	# <CJK>
-0x8A83	0x6F5F	# <CJK>
-0x8A84	0x5272	# <CJK>
-0x8A85	0x559D	# <CJK>
-0x8A86	0x6070	# <CJK>
-0x8A87	0x62EC	# <CJK>
-0x8A88	0x6D3B	# <CJK>
-0x8A89	0x6E07	# <CJK>
-0x8A8A	0x6ED1	# <CJK>
-0x8A8B	0x845B	# <CJK>
-0x8A8C	0x8910	# <CJK>
-0x8A8D	0x8F44	# <CJK>
-0x8A8E	0x4E14	# <CJK>
-0x8A8F	0x9C39	# <CJK>
-0x8A90	0x53F6	# <CJK>
-0x8A91	0x691B	# <CJK>
-0x8A92	0x6A3A	# <CJK>
-0x8A93	0x9784	# <CJK>
-0x8A94	0x682A	# <CJK>
-0x8A95	0x515C	# <CJK>
-0x8A96	0x7AC3	# <CJK>
-0x8A97	0x84B2	# <CJK>
-0x8A98	0x91DC	# <CJK>
-0x8A99	0x938C	# <CJK>
-0x8A9A	0x565B	# <CJK>
-0x8A9B	0x9D28	# <CJK>
-0x8A9C	0x6822	# <CJK>
-0x8A9D	0x8305	# <CJK>
-0x8A9E	0x8431	# <CJK>
-0x8A9F	0x7CA5	# <CJK>
-0x8AA0	0x5208	# <CJK>
-0x8AA1	0x82C5	# <CJK>
-0x8AA2	0x74E6	# <CJK>
-0x8AA3	0x4E7E	# <CJK>
-0x8AA4	0x4F83	# <CJK>
-0x8AA5	0x51A0	# <CJK>
-0x8AA6	0x5BD2	# <CJK>
-0x8AA7	0x520A	# <CJK>
-0x8AA8	0x52D8	# <CJK>
-0x8AA9	0x52E7	# <CJK>
-0x8AAA	0x5DFB	# <CJK>
-0x8AAB	0x559A	# <CJK>
-0x8AAC	0x582A	# <CJK>
-0x8AAD	0x59E6	# <CJK>
-0x8AAE	0x5B8C	# <CJK>
-0x8AAF	0x5B98	# <CJK>
-0x8AB0	0x5BDB	# <CJK>
-0x8AB1	0x5E72	# <CJK>
-0x8AB2	0x5E79	# <CJK>
-0x8AB3	0x60A3	# <CJK>
-0x8AB4	0x611F	# <CJK>
-0x8AB5	0x6163	# <CJK>
-0x8AB6	0x61BE	# <CJK>
-0x8AB7	0x63DB	# <CJK>
-0x8AB8	0x6562	# <CJK>
-0x8AB9	0x67D1	# <CJK>
-0x8ABA	0x6853	# <CJK>
-0x8ABB	0x68FA	# <CJK>
-0x8ABC	0x6B3E	# <CJK>
-0x8ABD	0x6B53	# <CJK>
-0x8ABE	0x6C57	# <CJK>
-0x8ABF	0x6F22	# <CJK>
-0x8AC0	0x6F97	# <CJK>
-0x8AC1	0x6F45	# <CJK>
-0x8AC2	0x74B0	# <CJK>
-0x8AC3	0x7518	# <CJK>
-0x8AC4	0x76E3	# <CJK>
-0x8AC5	0x770B	# <CJK>
-0x8AC6	0x7AFF	# <CJK>
-0x8AC7	0x7BA1	# <CJK>
-0x8AC8	0x7C21	# <CJK>
-0x8AC9	0x7DE9	# <CJK>
-0x8ACA	0x7F36	# <CJK>
-0x8ACB	0x7FF0	# <CJK>
-0x8ACC	0x809D	# <CJK>
-0x8ACD	0x8266	# <CJK>
-0x8ACE	0x839E	# <CJK>
-0x8ACF	0x89B3	# <CJK>
-0x8AD0	0x8ACC	# <CJK>
-0x8AD1	0x8CAB	# <CJK>
-0x8AD2	0x9084	# <CJK>
-0x8AD3	0x9451	# <CJK>
-0x8AD4	0x9593	# <CJK>
-0x8AD5	0x9591	# <CJK>
-0x8AD6	0x95A2	# <CJK>
-0x8AD7	0x9665	# <CJK>
-0x8AD8	0x97D3	# <CJK>
-0x8AD9	0x9928	# <CJK>
-0x8ADA	0x8218	# <CJK>
-0x8ADB	0x4E38	# <CJK>
-0x8ADC	0x542B	# <CJK>
-0x8ADD	0x5CB8	# <CJK>
-0x8ADE	0x5DCC	# <CJK>
-0x8ADF	0x73A9	# <CJK>
-0x8AE0	0x764C	# <CJK>
-0x8AE1	0x773C	# <CJK>
-0x8AE2	0x5CA9	# <CJK>
-0x8AE3	0x7FEB	# <CJK>
-0x8AE4	0x8D0B	# <CJK>
-0x8AE5	0x96C1	# <CJK>
-0x8AE6	0x9811	# <CJK>
-0x8AE7	0x9854	# <CJK>
-0x8AE8	0x9858	# <CJK>
-0x8AE9	0x4F01	# <CJK>
-0x8AEA	0x4F0E	# <CJK>
-0x8AEB	0x5371	# <CJK>
-0x8AEC	0x559C	# <CJK>
-0x8AED	0x5668	# <CJK>
-0x8AEE	0x57FA	# <CJK>
-0x8AEF	0x5947	# <CJK>
-0x8AF0	0x5B09	# <CJK>
-0x8AF1	0x5BC4	# <CJK>
-0x8AF2	0x5C90	# <CJK>
-0x8AF3	0x5E0C	# <CJK>
-0x8AF4	0x5E7E	# <CJK>
-0x8AF5	0x5FCC	# <CJK>
-0x8AF6	0x63EE	# <CJK>
-0x8AF7	0x673A	# <CJK>
-0x8AF8	0x65D7	# <CJK>
-0x8AF9	0x65E2	# <CJK>
-0x8AFA	0x671F	# <CJK>
-0x8AFB	0x68CB	# <CJK>
-0x8AFC	0x68C4	# <CJK>
-0x8B40	0x6A5F	# <CJK>
-0x8B41	0x5E30	# <CJK>
-0x8B42	0x6BC5	# <CJK>
-0x8B43	0x6C17	# <CJK>
-0x8B44	0x6C7D	# <CJK>
-0x8B45	0x757F	# <CJK>
-0x8B46	0x7948	# <CJK>
-0x8B47	0x5B63	# <CJK>
-0x8B48	0x7A00	# <CJK>
-0x8B49	0x7D00	# <CJK>
-0x8B4A	0x5FBD	# <CJK>
-0x8B4B	0x898F	# <CJK>
-0x8B4C	0x8A18	# <CJK>
-0x8B4D	0x8CB4	# <CJK>
-0x8B4E	0x8D77	# <CJK>
-0x8B4F	0x8ECC	# <CJK>
-0x8B50	0x8F1D	# <CJK>
-0x8B51	0x98E2	# <CJK>
-0x8B52	0x9A0E	# <CJK>
-0x8B53	0x9B3C	# <CJK>
-0x8B54	0x4E80	# <CJK>
-0x8B55	0x507D	# <CJK>
-0x8B56	0x5100	# <CJK>
-0x8B57	0x5993	# <CJK>
-0x8B58	0x5B9C	# <CJK>
-0x8B59	0x622F	# <CJK>
-0x8B5A	0x6280	# <CJK>
-0x8B5B	0x64EC	# <CJK>
-0x8B5C	0x6B3A	# <CJK>
-0x8B5D	0x72A0	# <CJK>
-0x8B5E	0x7591	# <CJK>
-0x8B5F	0x7947	# <CJK>
-0x8B60	0x7FA9	# <CJK>
-0x8B61	0x87FB	# <CJK>
-0x8B62	0x8ABC	# <CJK>
-0x8B63	0x8B70	# <CJK>
-0x8B64	0x63AC	# <CJK>
-0x8B65	0x83CA	# <CJK>
-0x8B66	0x97A0	# <CJK>
-0x8B67	0x5409	# <CJK>
-0x8B68	0x5403	# <CJK>
-0x8B69	0x55AB	# <CJK>
-0x8B6A	0x6854	# <CJK>
-0x8B6B	0x6A58	# <CJK>
-0x8B6C	0x8A70	# <CJK>
-0x8B6D	0x7827	# <CJK>
-0x8B6E	0x6775	# <CJK>
-0x8B6F	0x9ECD	# <CJK>
-0x8B70	0x5374	# <CJK>
-0x8B71	0x5BA2	# <CJK>
-0x8B72	0x811A	# <CJK>
-0x8B73	0x8650	# <CJK>
-0x8B74	0x9006	# <CJK>
-0x8B75	0x4E18	# <CJK>
-0x8B76	0x4E45	# <CJK>
-0x8B77	0x4EC7	# <CJK>
-0x8B78	0x4F11	# <CJK>
-0x8B79	0x53CA	# <CJK>
-0x8B7A	0x5438	# <CJK>
-0x8B7B	0x5BAE	# <CJK>
-0x8B7C	0x5F13	# <CJK>
-0x8B7D	0x6025	# <CJK>
-0x8B7E	0x6551	# <CJK>
-0x8B80	0x673D	# <CJK>
-0x8B81	0x6C42	# <CJK>
-0x8B82	0x6C72	# <CJK>
-0x8B83	0x6CE3	# <CJK>
-0x8B84	0x7078	# <CJK>
-0x8B85	0x7403	# <CJK>
-0x8B86	0x7A76	# <CJK>
-0x8B87	0x7AAE	# <CJK>
-0x8B88	0x7B08	# <CJK>
-0x8B89	0x7D1A	# <CJK>
-0x8B8A	0x7CFE	# <CJK>
-0x8B8B	0x7D66	# <CJK>
-0x8B8C	0x65E7	# <CJK>
-0x8B8D	0x725B	# <CJK>
-0x8B8E	0x53BB	# <CJK>
-0x8B8F	0x5C45	# <CJK>
-0x8B90	0x5DE8	# <CJK>
-0x8B91	0x62D2	# <CJK>
-0x8B92	0x62E0	# <CJK>
-0x8B93	0x6319	# <CJK>
-0x8B94	0x6E20	# <CJK>
-0x8B95	0x865A	# <CJK>
-0x8B96	0x8A31	# <CJK>
-0x8B97	0x8DDD	# <CJK>
-0x8B98	0x92F8	# <CJK>
-0x8B99	0x6F01	# <CJK>
-0x8B9A	0x79A6	# <CJK>
-0x8B9B	0x9B5A	# <CJK>
-0x8B9C	0x4EA8	# <CJK>
-0x8B9D	0x4EAB	# <CJK>
-0x8B9E	0x4EAC	# <CJK>
-0x8B9F	0x4F9B	# <CJK>
-0x8BA0	0x4FA0	# <CJK>
-0x8BA1	0x50D1	# <CJK>
-0x8BA2	0x5147	# <CJK>
-0x8BA3	0x7AF6	# <CJK>
-0x8BA4	0x5171	# <CJK>
-0x8BA5	0x51F6	# <CJK>
-0x8BA6	0x5354	# <CJK>
-0x8BA7	0x5321	# <CJK>
-0x8BA8	0x537F	# <CJK>
-0x8BA9	0x53EB	# <CJK>
-0x8BAA	0x55AC	# <CJK>
-0x8BAB	0x5883	# <CJK>
-0x8BAC	0x5CE1	# <CJK>
-0x8BAD	0x5F37	# <CJK>
-0x8BAE	0x5F4A	# <CJK>
-0x8BAF	0x602F	# <CJK>
-0x8BB0	0x6050	# <CJK>
-0x8BB1	0x606D	# <CJK>
-0x8BB2	0x631F	# <CJK>
-0x8BB3	0x6559	# <CJK>
-0x8BB4	0x6A4B	# <CJK>
-0x8BB5	0x6CC1	# <CJK>
-0x8BB6	0x72C2	# <CJK>
-0x8BB7	0x72ED	# <CJK>
-0x8BB8	0x77EF	# <CJK>
-0x8BB9	0x80F8	# <CJK>
-0x8BBA	0x8105	# <CJK>
-0x8BBB	0x8208	# <CJK>
-0x8BBC	0x854E	# <CJK>
-0x8BBD	0x90F7	# <CJK>
-0x8BBE	0x93E1	# <CJK>
-0x8BBF	0x97FF	# <CJK>
-0x8BC0	0x9957	# <CJK>
-0x8BC1	0x9A5A	# <CJK>
-0x8BC2	0x4EF0	# <CJK>
-0x8BC3	0x51DD	# <CJK>
-0x8BC4	0x5C2D	# <CJK>
-0x8BC5	0x6681	# <CJK>
-0x8BC6	0x696D	# <CJK>
-0x8BC7	0x5C40	# <CJK>
-0x8BC8	0x66F2	# <CJK>
-0x8BC9	0x6975	# <CJK>
-0x8BCA	0x7389	# <CJK>
-0x8BCB	0x6850	# <CJK>
-0x8BCC	0x7C81	# <CJK>
-0x8BCD	0x50C5	# <CJK>
-0x8BCE	0x52E4	# <CJK>
-0x8BCF	0x5747	# <CJK>
-0x8BD0	0x5DFE	# <CJK>
-0x8BD1	0x9326	# <CJK>
-0x8BD2	0x65A4	# <CJK>
-0x8BD3	0x6B23	# <CJK>
-0x8BD4	0x6B3D	# <CJK>
-0x8BD5	0x7434	# <CJK>
-0x8BD6	0x7981	# <CJK>
-0x8BD7	0x79BD	# <CJK>
-0x8BD8	0x7B4B	# <CJK>
-0x8BD9	0x7DCA	# <CJK>
-0x8BDA	0x82B9	# <CJK>
-0x8BDB	0x83CC	# <CJK>
-0x8BDC	0x887F	# <CJK>
-0x8BDD	0x895F	# <CJK>
-0x8BDE	0x8B39	# <CJK>
-0x8BDF	0x8FD1	# <CJK>
-0x8BE0	0x91D1	# <CJK>
-0x8BE1	0x541F	# <CJK>
-0x8BE2	0x9280	# <CJK>
-0x8BE3	0x4E5D	# <CJK>
-0x8BE4	0x5036	# <CJK>
-0x8BE5	0x53E5	# <CJK>
-0x8BE6	0x533A	# <CJK>
-0x8BE7	0x72D7	# <CJK>
-0x8BE8	0x7396	# <CJK>
-0x8BE9	0x77E9	# <CJK>
-0x8BEA	0x82E6	# <CJK>
-0x8BEB	0x8EAF	# <CJK>
-0x8BEC	0x99C6	# <CJK>
-0x8BED	0x99C8	# <CJK>
-0x8BEE	0x99D2	# <CJK>
-0x8BEF	0x5177	# <CJK>
-0x8BF0	0x611A	# <CJK>
-0x8BF1	0x865E	# <CJK>
-0x8BF2	0x55B0	# <CJK>
-0x8BF3	0x7A7A	# <CJK>
-0x8BF4	0x5076	# <CJK>
-0x8BF5	0x5BD3	# <CJK>
-0x8BF6	0x9047	# <CJK>
-0x8BF7	0x9685	# <CJK>
-0x8BF8	0x4E32	# <CJK>
-0x8BF9	0x6ADB	# <CJK>
-0x8BFA	0x91E7	# <CJK>
-0x8BFB	0x5C51	# <CJK>
-0x8BFC	0x5C48	# <CJK>
-0x8C40	0x6398	# <CJK>
-0x8C41	0x7A9F	# <CJK>
-0x8C42	0x6C93	# <CJK>
-0x8C43	0x9774	# <CJK>
-0x8C44	0x8F61	# <CJK>
-0x8C45	0x7AAA	# <CJK>
-0x8C46	0x718A	# <CJK>
-0x8C47	0x9688	# <CJK>
-0x8C48	0x7C82	# <CJK>
-0x8C49	0x6817	# <CJK>
-0x8C4A	0x7E70	# <CJK>
-0x8C4B	0x6851	# <CJK>
-0x8C4C	0x936C	# <CJK>
-0x8C4D	0x52F2	# <CJK>
-0x8C4E	0x541B	# <CJK>
-0x8C4F	0x85AB	# <CJK>
-0x8C50	0x8A13	# <CJK>
-0x8C51	0x7FA4	# <CJK>
-0x8C52	0x8ECD	# <CJK>
-0x8C53	0x90E1	# <CJK>
-0x8C54	0x5366	# <CJK>
-0x8C55	0x8888	# <CJK>
-0x8C56	0x7941	# <CJK>
-0x8C57	0x4FC2	# <CJK>
-0x8C58	0x50BE	# <CJK>
-0x8C59	0x5211	# <CJK>
-0x8C5A	0x5144	# <CJK>
-0x8C5B	0x5553	# <CJK>
-0x8C5C	0x572D	# <CJK>
-0x8C5D	0x73EA	# <CJK>
-0x8C5E	0x578B	# <CJK>
-0x8C5F	0x5951	# <CJK>
-0x8C60	0x5F62	# <CJK>
-0x8C61	0x5F84	# <CJK>
-0x8C62	0x6075	# <CJK>
-0x8C63	0x6176	# <CJK>
-0x8C64	0x6167	# <CJK>
-0x8C65	0x61A9	# <CJK>
-0x8C66	0x63B2	# <CJK>
-0x8C67	0x643A	# <CJK>
-0x8C68	0x656C	# <CJK>
-0x8C69	0x666F	# <CJK>
-0x8C6A	0x6842	# <CJK>
-0x8C6B	0x6E13	# <CJK>
-0x8C6C	0x7566	# <CJK>
-0x8C6D	0x7A3D	# <CJK>
-0x8C6E	0x7CFB	# <CJK>
-0x8C6F	0x7D4C	# <CJK>
-0x8C70	0x7D99	# <CJK>
-0x8C71	0x7E4B	# <CJK>
-0x8C72	0x7F6B	# <CJK>
-0x8C73	0x830E	# <CJK>
-0x8C74	0x834A	# <CJK>
-0x8C75	0x86CD	# <CJK>
-0x8C76	0x8A08	# <CJK>
-0x8C77	0x8A63	# <CJK>
-0x8C78	0x8B66	# <CJK>
-0x8C79	0x8EFD	# <CJK>
-0x8C7A	0x981A	# <CJK>
-0x8C7B	0x9D8F	# <CJK>
-0x8C7C	0x82B8	# <CJK>
-0x8C7D	0x8FCE	# <CJK>
-0x8C7E	0x9BE8	# <CJK>
-0x8C80	0x5287	# <CJK>
-0x8C81	0x621F	# <CJK>
-0x8C82	0x6483	# <CJK>
-0x8C83	0x6FC0	# <CJK>
-0x8C84	0x9699	# <CJK>
-0x8C85	0x6841	# <CJK>
-0x8C86	0x5091	# <CJK>
-0x8C87	0x6B20	# <CJK>
-0x8C88	0x6C7A	# <CJK>
-0x8C89	0x6F54	# <CJK>
-0x8C8A	0x7A74	# <CJK>
-0x8C8B	0x7D50	# <CJK>
-0x8C8C	0x8840	# <CJK>
-0x8C8D	0x8A23	# <CJK>
-0x8C8E	0x6708	# <CJK>
-0x8C8F	0x4EF6	# <CJK>
-0x8C90	0x5039	# <CJK>
-0x8C91	0x5026	# <CJK>
-0x8C92	0x5065	# <CJK>
-0x8C93	0x517C	# <CJK>
-0x8C94	0x5238	# <CJK>
-0x8C95	0x5263	# <CJK>
-0x8C96	0x55A7	# <CJK>
-0x8C97	0x570F	# <CJK>
-0x8C98	0x5805	# <CJK>
-0x8C99	0x5ACC	# <CJK>
-0x8C9A	0x5EFA	# <CJK>
-0x8C9B	0x61B2	# <CJK>
-0x8C9C	0x61F8	# <CJK>
-0x8C9D	0x62F3	# <CJK>
-0x8C9E	0x6372	# <CJK>
-0x8C9F	0x691C	# <CJK>
-0x8CA0	0x6A29	# <CJK>
-0x8CA1	0x727D	# <CJK>
-0x8CA2	0x72AC	# <CJK>
-0x8CA3	0x732E	# <CJK>
-0x8CA4	0x7814	# <CJK>
-0x8CA5	0x786F	# <CJK>
-0x8CA6	0x7D79	# <CJK>
-0x8CA7	0x770C	# <CJK>
-0x8CA8	0x80A9	# <CJK>
-0x8CA9	0x898B	# <CJK>
-0x8CAA	0x8B19	# <CJK>
-0x8CAB	0x8CE2	# <CJK>
-0x8CAC	0x8ED2	# <CJK>
-0x8CAD	0x9063	# <CJK>
-0x8CAE	0x9375	# <CJK>
-0x8CAF	0x967A	# <CJK>
-0x8CB0	0x9855	# <CJK>
-0x8CB1	0x9A13	# <CJK>
-0x8CB2	0x9E78	# <CJK>
-0x8CB3	0x5143	# <CJK>
-0x8CB4	0x539F	# <CJK>
-0x8CB5	0x53B3	# <CJK>
-0x8CB6	0x5E7B	# <CJK>
-0x8CB7	0x5F26	# <CJK>
-0x8CB8	0x6E1B	# <CJK>
-0x8CB9	0x6E90	# <CJK>
-0x8CBA	0x7384	# <CJK>
-0x8CBB	0x73FE	# <CJK>
-0x8CBC	0x7D43	# <CJK>
-0x8CBD	0x8237	# <CJK>
-0x8CBE	0x8A00	# <CJK>
-0x8CBF	0x8AFA	# <CJK>
-0x8CC0	0x9650	# <CJK>
-0x8CC1	0x4E4E	# <CJK>
-0x8CC2	0x500B	# <CJK>
-0x8CC3	0x53E4	# <CJK>
-0x8CC4	0x547C	# <CJK>
-0x8CC5	0x56FA	# <CJK>
-0x8CC6	0x59D1	# <CJK>
-0x8CC7	0x5B64	# <CJK>
-0x8CC8	0x5DF1	# <CJK>
-0x8CC9	0x5EAB	# <CJK>
-0x8CCA	0x5F27	# <CJK>
-0x8CCB	0x6238	# <CJK>
-0x8CCC	0x6545	# <CJK>
-0x8CCD	0x67AF	# <CJK>
-0x8CCE	0x6E56	# <CJK>
-0x8CCF	0x72D0	# <CJK>
-0x8CD0	0x7CCA	# <CJK>
-0x8CD1	0x88B4	# <CJK>
-0x8CD2	0x80A1	# <CJK>
-0x8CD3	0x80E1	# <CJK>
-0x8CD4	0x83F0	# <CJK>
-0x8CD5	0x864E	# <CJK>
-0x8CD6	0x8A87	# <CJK>
-0x8CD7	0x8DE8	# <CJK>
-0x8CD8	0x9237	# <CJK>
-0x8CD9	0x96C7	# <CJK>
-0x8CDA	0x9867	# <CJK>
-0x8CDB	0x9F13	# <CJK>
-0x8CDC	0x4E94	# <CJK>
-0x8CDD	0x4E92	# <CJK>
-0x8CDE	0x4F0D	# <CJK>
-0x8CDF	0x5348	# <CJK>
-0x8CE0	0x5449	# <CJK>
-0x8CE1	0x543E	# <CJK>
-0x8CE2	0x5A2F	# <CJK>
-0x8CE3	0x5F8C	# <CJK>
-0x8CE4	0x5FA1	# <CJK>
-0x8CE5	0x609F	# <CJK>
-0x8CE6	0x68A7	# <CJK>
-0x8CE7	0x6A8E	# <CJK>
-0x8CE8	0x745A	# <CJK>
-0x8CE9	0x7881	# <CJK>
-0x8CEA	0x8A9E	# <CJK>
-0x8CEB	0x8AA4	# <CJK>
-0x8CEC	0x8B77	# <CJK>
-0x8CED	0x9190	# <CJK>
-0x8CEE	0x4E5E	# <CJK>
-0x8CEF	0x9BC9	# <CJK>
-0x8CF0	0x4EA4	# <CJK>
-0x8CF1	0x4F7C	# <CJK>
-0x8CF2	0x4FAF	# <CJK>
-0x8CF3	0x5019	# <CJK>
-0x8CF4	0x5016	# <CJK>
-0x8CF5	0x5149	# <CJK>
-0x8CF6	0x516C	# <CJK>
-0x8CF7	0x529F	# <CJK>
-0x8CF8	0x52B9	# <CJK>
-0x8CF9	0x52FE	# <CJK>
-0x8CFA	0x539A	# <CJK>
-0x8CFB	0x53E3	# <CJK>
-0x8CFC	0x5411	# <CJK>
-0x8D40	0x540E	# <CJK>
-0x8D41	0x5589	# <CJK>
-0x8D42	0x5751	# <CJK>
-0x8D43	0x57A2	# <CJK>
-0x8D44	0x597D	# <CJK>
-0x8D45	0x5B54	# <CJK>
-0x8D46	0x5B5D	# <CJK>
-0x8D47	0x5B8F	# <CJK>
-0x8D48	0x5DE5	# <CJK>
-0x8D49	0x5DE7	# <CJK>
-0x8D4A	0x5DF7	# <CJK>
-0x8D4B	0x5E78	# <CJK>
-0x8D4C	0x5E83	# <CJK>
-0x8D4D	0x5E9A	# <CJK>
-0x8D4E	0x5EB7	# <CJK>
-0x8D4F	0x5F18	# <CJK>
-0x8D50	0x6052	# <CJK>
-0x8D51	0x614C	# <CJK>
-0x8D52	0x6297	# <CJK>
-0x8D53	0x62D8	# <CJK>
-0x8D54	0x63A7	# <CJK>
-0x8D55	0x653B	# <CJK>
-0x8D56	0x6602	# <CJK>
-0x8D57	0x6643	# <CJK>
-0x8D58	0x66F4	# <CJK>
-0x8D59	0x676D	# <CJK>
-0x8D5A	0x6821	# <CJK>
-0x8D5B	0x6897	# <CJK>
-0x8D5C	0x69CB	# <CJK>
-0x8D5D	0x6C5F	# <CJK>
-0x8D5E	0x6D2A	# <CJK>
-0x8D5F	0x6D69	# <CJK>
-0x8D60	0x6E2F	# <CJK>
-0x8D61	0x6E9D	# <CJK>
-0x8D62	0x7532	# <CJK>
-0x8D63	0x7687	# <CJK>
-0x8D64	0x786C	# <CJK>
-0x8D65	0x7A3F	# <CJK>
-0x8D66	0x7CE0	# <CJK>
-0x8D67	0x7D05	# <CJK>
-0x8D68	0x7D18	# <CJK>
-0x8D69	0x7D5E	# <CJK>
-0x8D6A	0x7DB1	# <CJK>
-0x8D6B	0x8015	# <CJK>
-0x8D6C	0x8003	# <CJK>
-0x8D6D	0x80AF	# <CJK>
-0x8D6E	0x80B1	# <CJK>
-0x8D6F	0x8154	# <CJK>
-0x8D70	0x818F	# <CJK>
-0x8D71	0x822A	# <CJK>
-0x8D72	0x8352	# <CJK>
-0x8D73	0x884C	# <CJK>
-0x8D74	0x8861	# <CJK>
-0x8D75	0x8B1B	# <CJK>
-0x8D76	0x8CA2	# <CJK>
-0x8D77	0x8CFC	# <CJK>
-0x8D78	0x90CA	# <CJK>
-0x8D79	0x9175	# <CJK>
-0x8D7A	0x9271	# <CJK>
-0x8D7B	0x783F	# <CJK>
-0x8D7C	0x92FC	# <CJK>
-0x8D7D	0x95A4	# <CJK>
-0x8D7E	0x964D	# <CJK>
-0x8D80	0x9805	# <CJK>
-0x8D81	0x9999	# <CJK>
-0x8D82	0x9AD8	# <CJK>
-0x8D83	0x9D3B	# <CJK>
-0x8D84	0x525B	# <CJK>
-0x8D85	0x52AB	# <CJK>
-0x8D86	0x53F7	# <CJK>
-0x8D87	0x5408	# <CJK>
-0x8D88	0x58D5	# <CJK>
-0x8D89	0x62F7	# <CJK>
-0x8D8A	0x6FE0	# <CJK>
-0x8D8B	0x8C6A	# <CJK>
-0x8D8C	0x8F5F	# <CJK>
-0x8D8D	0x9EB9	# <CJK>
-0x8D8E	0x514B	# <CJK>
-0x8D8F	0x523B	# <CJK>
-0x8D90	0x544A	# <CJK>
-0x8D91	0x56FD	# <CJK>
-0x8D92	0x7A40	# <CJK>
-0x8D93	0x9177	# <CJK>
-0x8D94	0x9D60	# <CJK>
-0x8D95	0x9ED2	# <CJK>
-0x8D96	0x7344	# <CJK>
-0x8D97	0x6F09	# <CJK>
-0x8D98	0x8170	# <CJK>
-0x8D99	0x7511	# <CJK>
-0x8D9A	0x5FFD	# <CJK>
-0x8D9B	0x60DA	# <CJK>
-0x8D9C	0x9AA8	# <CJK>
-0x8D9D	0x72DB	# <CJK>
-0x8D9E	0x8FBC	# <CJK>
-0x8D9F	0x6B64	# <CJK>
-0x8DA0	0x9803	# <CJK>
-0x8DA1	0x4ECA	# <CJK>
-0x8DA2	0x56F0	# <CJK>
-0x8DA3	0x5764	# <CJK>
-0x8DA4	0x58BE	# <CJK>
-0x8DA5	0x5A5A	# <CJK>
-0x8DA6	0x6068	# <CJK>
-0x8DA7	0x61C7	# <CJK>
-0x8DA8	0x660F	# <CJK>
-0x8DA9	0x6606	# <CJK>
-0x8DAA	0x6839	# <CJK>
-0x8DAB	0x68B1	# <CJK>
-0x8DAC	0x6DF7	# <CJK>
-0x8DAD	0x75D5	# <CJK>
-0x8DAE	0x7D3A	# <CJK>
-0x8DAF	0x826E	# <CJK>
-0x8DB0	0x9B42	# <CJK>
-0x8DB1	0x4E9B	# <CJK>
-0x8DB2	0x4F50	# <CJK>
-0x8DB3	0x53C9	# <CJK>
-0x8DB4	0x5506	# <CJK>
-0x8DB5	0x5D6F	# <CJK>
-0x8DB6	0x5DE6	# <CJK>
-0x8DB7	0x5DEE	# <CJK>
-0x8DB8	0x67FB	# <CJK>
-0x8DB9	0x6C99	# <CJK>
-0x8DBA	0x7473	# <CJK>
-0x8DBB	0x7802	# <CJK>
-0x8DBC	0x8A50	# <CJK>
-0x8DBD	0x9396	# <CJK>
-0x8DBE	0x88DF	# <CJK>
-0x8DBF	0x5750	# <CJK>
-0x8DC0	0x5EA7	# <CJK>
-0x8DC1	0x632B	# <CJK>
-0x8DC2	0x50B5	# <CJK>
-0x8DC3	0x50AC	# <CJK>
-0x8DC4	0x518D	# <CJK>
-0x8DC5	0x6700	# <CJK>
-0x8DC6	0x54C9	# <CJK>
-0x8DC7	0x585E	# <CJK>
-0x8DC8	0x59BB	# <CJK>
-0x8DC9	0x5BB0	# <CJK>
-0x8DCA	0x5F69	# <CJK>
-0x8DCB	0x624D	# <CJK>
-0x8DCC	0x63A1	# <CJK>
-0x8DCD	0x683D	# <CJK>
-0x8DCE	0x6B73	# <CJK>
-0x8DCF	0x6E08	# <CJK>
-0x8DD0	0x707D	# <CJK>
-0x8DD1	0x91C7	# <CJK>
-0x8DD2	0x7280	# <CJK>
-0x8DD3	0x7815	# <CJK>
-0x8DD4	0x7826	# <CJK>
-0x8DD5	0x796D	# <CJK>
-0x8DD6	0x658E	# <CJK>
-0x8DD7	0x7D30	# <CJK>
-0x8DD8	0x83DC	# <CJK>
-0x8DD9	0x88C1	# <CJK>
-0x8DDA	0x8F09	# <CJK>
-0x8DDB	0x969B	# <CJK>
-0x8DDC	0x5264	# <CJK>
-0x8DDD	0x5728	# <CJK>
-0x8DDE	0x6750	# <CJK>
-0x8DDF	0x7F6A	# <CJK>
-0x8DE0	0x8CA1	# <CJK>
-0x8DE1	0x51B4	# <CJK>
-0x8DE2	0x5742	# <CJK>
-0x8DE3	0x962A	# <CJK>
-0x8DE4	0x583A	# <CJK>
-0x8DE5	0x698A	# <CJK>
-0x8DE6	0x80B4	# <CJK>
-0x8DE7	0x54B2	# <CJK>
-0x8DE8	0x5D0E	# <CJK>
-0x8DE9	0x57FC	# <CJK>
-0x8DEA	0x7895	# <CJK>
-0x8DEB	0x9DFA	# <CJK>
-0x8DEC	0x4F5C	# <CJK>
-0x8DED	0x524A	# <CJK>
-0x8DEE	0x548B	# <CJK>
-0x8DEF	0x643E	# <CJK>
-0x8DF0	0x6628	# <CJK>
-0x8DF1	0x6714	# <CJK>
-0x8DF2	0x67F5	# <CJK>
-0x8DF3	0x7A84	# <CJK>
-0x8DF4	0x7B56	# <CJK>
-0x8DF5	0x7D22	# <CJK>
-0x8DF6	0x932F	# <CJK>
-0x8DF7	0x685C	# <CJK>
-0x8DF8	0x9BAD	# <CJK>
-0x8DF9	0x7B39	# <CJK>
-0x8DFA	0x5319	# <CJK>
-0x8DFB	0x518A	# <CJK>
-0x8DFC	0x5237	# <CJK>
-0x8E40	0x5BDF	# <CJK>
-0x8E41	0x62F6	# <CJK>
-0x8E42	0x64AE	# <CJK>
-0x8E43	0x64E6	# <CJK>
-0x8E44	0x672D	# <CJK>
-0x8E45	0x6BBA	# <CJK>
-0x8E46	0x85A9	# <CJK>
-0x8E47	0x96D1	# <CJK>
-0x8E48	0x7690	# <CJK>
-0x8E49	0x9BD6	# <CJK>
-0x8E4A	0x634C	# <CJK>
-0x8E4B	0x9306	# <CJK>
-0x8E4C	0x9BAB	# <CJK>
-0x8E4D	0x76BF	# <CJK>
-0x8E4E	0x6652	# <CJK>
-0x8E4F	0x4E09	# <CJK>
-0x8E50	0x5098	# <CJK>
-0x8E51	0x53C2	# <CJK>
-0x8E52	0x5C71	# <CJK>
-0x8E53	0x60E8	# <CJK>
-0x8E54	0x6492	# <CJK>
-0x8E55	0x6563	# <CJK>
-0x8E56	0x685F	# <CJK>
-0x8E57	0x71E6	# <CJK>
-0x8E58	0x73CA	# <CJK>
-0x8E59	0x7523	# <CJK>
-0x8E5A	0x7B97	# <CJK>
-0x8E5B	0x7E82	# <CJK>
-0x8E5C	0x8695	# <CJK>
-0x8E5D	0x8B83	# <CJK>
-0x8E5E	0x8CDB	# <CJK>
-0x8E5F	0x9178	# <CJK>
-0x8E60	0x9910	# <CJK>
-0x8E61	0x65AC	# <CJK>
-0x8E62	0x66AB	# <CJK>
-0x8E63	0x6B8B	# <CJK>
-0x8E64	0x4ED5	# <CJK>
-0x8E65	0x4ED4	# <CJK>
-0x8E66	0x4F3A	# <CJK>
-0x8E67	0x4F7F	# <CJK>
-0x8E68	0x523A	# <CJK>
-0x8E69	0x53F8	# <CJK>
-0x8E6A	0x53F2	# <CJK>
-0x8E6B	0x55E3	# <CJK>
-0x8E6C	0x56DB	# <CJK>
-0x8E6D	0x58EB	# <CJK>
-0x8E6E	0x59CB	# <CJK>
-0x8E6F	0x59C9	# <CJK>
-0x8E70	0x59FF	# <CJK>
-0x8E71	0x5B50	# <CJK>
-0x8E72	0x5C4D	# <CJK>
-0x8E73	0x5E02	# <CJK>
-0x8E74	0x5E2B	# <CJK>
-0x8E75	0x5FD7	# <CJK>
-0x8E76	0x601D	# <CJK>
-0x8E77	0x6307	# <CJK>
-0x8E78	0x652F	# <CJK>
-0x8E79	0x5B5C	# <CJK>
-0x8E7A	0x65AF	# <CJK>
-0x8E7B	0x65BD	# <CJK>
-0x8E7C	0x65E8	# <CJK>
-0x8E7D	0x679D	# <CJK>
-0x8E7E	0x6B62	# <CJK>
-0x8E80	0x6B7B	# <CJK>
-0x8E81	0x6C0F	# <CJK>
-0x8E82	0x7345	# <CJK>
-0x8E83	0x7949	# <CJK>
-0x8E84	0x79C1	# <CJK>
-0x8E85	0x7CF8	# <CJK>
-0x8E86	0x7D19	# <CJK>
-0x8E87	0x7D2B	# <CJK>
-0x8E88	0x80A2	# <CJK>
-0x8E89	0x8102	# <CJK>
-0x8E8A	0x81F3	# <CJK>
-0x8E8B	0x8996	# <CJK>
-0x8E8C	0x8A5E	# <CJK>
-0x8E8D	0x8A69	# <CJK>
-0x8E8E	0x8A66	# <CJK>
-0x8E8F	0x8A8C	# <CJK>
-0x8E90	0x8AEE	# <CJK>
-0x8E91	0x8CC7	# <CJK>
-0x8E92	0x8CDC	# <CJK>
-0x8E93	0x96CC	# <CJK>
-0x8E94	0x98FC	# <CJK>
-0x8E95	0x6B6F	# <CJK>
-0x8E96	0x4E8B	# <CJK>
-0x8E97	0x4F3C	# <CJK>
-0x8E98	0x4F8D	# <CJK>
-0x8E99	0x5150	# <CJK>
-0x8E9A	0x5B57	# <CJK>
-0x8E9B	0x5BFA	# <CJK>
-0x8E9C	0x6148	# <CJK>
-0x8E9D	0x6301	# <CJK>
-0x8E9E	0x6642	# <CJK>
-0x8E9F	0x6B21	# <CJK>
-0x8EA0	0x6ECB	# <CJK>
-0x8EA1	0x6CBB	# <CJK>
-0x8EA2	0x723E	# <CJK>
-0x8EA3	0x74BD	# <CJK>
-0x8EA4	0x75D4	# <CJK>
-0x8EA5	0x78C1	# <CJK>
-0x8EA6	0x793A	# <CJK>
-0x8EA7	0x800C	# <CJK>
-0x8EA8	0x8033	# <CJK>
-0x8EA9	0x81EA	# <CJK>
-0x8EAA	0x8494	# <CJK>
-0x8EAB	0x8F9E	# <CJK>
-0x8EAC	0x6C50	# <CJK>
-0x8EAD	0x9E7F	# <CJK>
-0x8EAE	0x5F0F	# <CJK>
-0x8EAF	0x8B58	# <CJK>
-0x8EB0	0x9D2B	# <CJK>
-0x8EB1	0x7AFA	# <CJK>
-0x8EB2	0x8EF8	# <CJK>
-0x8EB3	0x5B8D	# <CJK>
-0x8EB4	0x96EB	# <CJK>
-0x8EB5	0x4E03	# <CJK>
-0x8EB6	0x53F1	# <CJK>
-0x8EB7	0x57F7	# <CJK>
-0x8EB8	0x5931	# <CJK>
-0x8EB9	0x5AC9	# <CJK>
-0x8EBA	0x5BA4	# <CJK>
-0x8EBB	0x6089	# <CJK>
-0x8EBC	0x6E7F	# <CJK>
-0x8EBD	0x6F06	# <CJK>
-0x8EBE	0x75BE	# <CJK>
-0x8EBF	0x8CEA	# <CJK>
-0x8EC0	0x5B9F	# <CJK>
-0x8EC1	0x8500	# <CJK>
-0x8EC2	0x7BE0	# <CJK>
-0x8EC3	0x5072	# <CJK>
-0x8EC4	0x67F4	# <CJK>
-0x8EC5	0x829D	# <CJK>
-0x8EC6	0x5C61	# <CJK>
-0x8EC7	0x854A	# <CJK>
-0x8EC8	0x7E1E	# <CJK>
-0x8EC9	0x820E	# <CJK>
-0x8ECA	0x5199	# <CJK>
-0x8ECB	0x5C04	# <CJK>
-0x8ECC	0x6368	# <CJK>
-0x8ECD	0x8D66	# <CJK>
-0x8ECE	0x659C	# <CJK>
-0x8ECF	0x716E	# <CJK>
-0x8ED0	0x793E	# <CJK>
-0x8ED1	0x7D17	# <CJK>
-0x8ED2	0x8005	# <CJK>
-0x8ED3	0x8B1D	# <CJK>
-0x8ED4	0x8ECA	# <CJK>
-0x8ED5	0x906E	# <CJK>
-0x8ED6	0x86C7	# <CJK>
-0x8ED7	0x90AA	# <CJK>
-0x8ED8	0x501F	# <CJK>
-0x8ED9	0x52FA	# <CJK>
-0x8EDA	0x5C3A	# <CJK>
-0x8EDB	0x6753	# <CJK>
-0x8EDC	0x707C	# <CJK>
-0x8EDD	0x7235	# <CJK>
-0x8EDE	0x914C	# <CJK>
-0x8EDF	0x91C8	# <CJK>
-0x8EE0	0x932B	# <CJK>
-0x8EE1	0x82E5	# <CJK>
-0x8EE2	0x5BC2	# <CJK>
-0x8EE3	0x5F31	# <CJK>
-0x8EE4	0x60F9	# <CJK>
-0x8EE5	0x4E3B	# <CJK>
-0x8EE6	0x53D6	# <CJK>
-0x8EE7	0x5B88	# <CJK>
-0x8EE8	0x624B	# <CJK>
-0x8EE9	0x6731	# <CJK>
-0x8EEA	0x6B8A	# <CJK>
-0x8EEB	0x72E9	# <CJK>
-0x8EEC	0x73E0	# <CJK>
-0x8EED	0x7A2E	# <CJK>
-0x8EEE	0x816B	# <CJK>
-0x8EEF	0x8DA3	# <CJK>
-0x8EF0	0x9152	# <CJK>
-0x8EF1	0x9996	# <CJK>
-0x8EF2	0x5112	# <CJK>
-0x8EF3	0x53D7	# <CJK>
-0x8EF4	0x546A	# <CJK>
-0x8EF5	0x5BFF	# <CJK>
-0x8EF6	0x6388	# <CJK>
-0x8EF7	0x6A39	# <CJK>
-0x8EF8	0x7DAC	# <CJK>
-0x8EF9	0x9700	# <CJK>
-0x8EFA	0x56DA	# <CJK>
-0x8EFB	0x53CE	# <CJK>
-0x8EFC	0x5468	# <CJK>
-0x8F40	0x5B97	# <CJK>
-0x8F41	0x5C31	# <CJK>
-0x8F42	0x5DDE	# <CJK>
-0x8F43	0x4FEE	# <CJK>
-0x8F44	0x6101	# <CJK>
-0x8F45	0x62FE	# <CJK>
-0x8F46	0x6D32	# <CJK>
-0x8F47	0x79C0	# <CJK>
-0x8F48	0x79CB	# <CJK>
-0x8F49	0x7D42	# <CJK>
-0x8F4A	0x7E4D	# <CJK>
-0x8F4B	0x7FD2	# <CJK>
-0x8F4C	0x81ED	# <CJK>
-0x8F4D	0x821F	# <CJK>
-0x8F4E	0x8490	# <CJK>
-0x8F4F	0x8846	# <CJK>
-0x8F50	0x8972	# <CJK>
-0x8F51	0x8B90	# <CJK>
-0x8F52	0x8E74	# <CJK>
-0x8F53	0x8F2F	# <CJK>
-0x8F54	0x9031	# <CJK>
-0x8F55	0x914B	# <CJK>
-0x8F56	0x916C	# <CJK>
-0x8F57	0x96C6	# <CJK>
-0x8F58	0x919C	# <CJK>
-0x8F59	0x4EC0	# <CJK>
-0x8F5A	0x4F4F	# <CJK>
-0x8F5B	0x5145	# <CJK>
-0x8F5C	0x5341	# <CJK>
-0x8F5D	0x5F93	# <CJK>
-0x8F5E	0x620E	# <CJK>
-0x8F5F	0x67D4	# <CJK>
-0x8F60	0x6C41	# <CJK>
-0x8F61	0x6E0B	# <CJK>
-0x8F62	0x7363	# <CJK>
-0x8F63	0x7E26	# <CJK>
-0x8F64	0x91CD	# <CJK>
-0x8F65	0x9283	# <CJK>
-0x8F66	0x53D4	# <CJK>
-0x8F67	0x5919	# <CJK>
-0x8F68	0x5BBF	# <CJK>
-0x8F69	0x6DD1	# <CJK>
-0x8F6A	0x795D	# <CJK>
-0x8F6B	0x7E2E	# <CJK>
-0x8F6C	0x7C9B	# <CJK>
-0x8F6D	0x587E	# <CJK>
-0x8F6E	0x719F	# <CJK>
-0x8F6F	0x51FA	# <CJK>
-0x8F70	0x8853	# <CJK>
-0x8F71	0x8FF0	# <CJK>
-0x8F72	0x4FCA	# <CJK>
-0x8F73	0x5CFB	# <CJK>
-0x8F74	0x6625	# <CJK>
-0x8F75	0x77AC	# <CJK>
-0x8F76	0x7AE3	# <CJK>
-0x8F77	0x821C	# <CJK>
-0x8F78	0x99FF	# <CJK>
-0x8F79	0x51C6	# <CJK>
-0x8F7A	0x5FAA	# <CJK>
-0x8F7B	0x65EC	# <CJK>
-0x8F7C	0x696F	# <CJK>
-0x8F7D	0x6B89	# <CJK>
-0x8F7E	0x6DF3	# <CJK>
-0x8F80	0x6E96	# <CJK>
-0x8F81	0x6F64	# <CJK>
-0x8F82	0x76FE	# <CJK>
-0x8F83	0x7D14	# <CJK>
-0x8F84	0x5DE1	# <CJK>
-0x8F85	0x9075	# <CJK>
-0x8F86	0x9187	# <CJK>
-0x8F87	0x9806	# <CJK>
-0x8F88	0x51E6	# <CJK>
-0x8F89	0x521D	# <CJK>
-0x8F8A	0x6240	# <CJK>
-0x8F8B	0x6691	# <CJK>
-0x8F8C	0x66D9	# <CJK>
-0x8F8D	0x6E1A	# <CJK>
-0x8F8E	0x5EB6	# <CJK>
-0x8F8F	0x7DD2	# <CJK>
-0x8F90	0x7F72	# <CJK>
-0x8F91	0x66F8	# <CJK>
-0x8F92	0x85AF	# <CJK>
-0x8F93	0x85F7	# <CJK>
-0x8F94	0x8AF8	# <CJK>
-0x8F95	0x52A9	# <CJK>
-0x8F96	0x53D9	# <CJK>
-0x8F97	0x5973	# <CJK>
-0x8F98	0x5E8F	# <CJK>
-0x8F99	0x5F90	# <CJK>
-0x8F9A	0x6055	# <CJK>
-0x8F9B	0x92E4	# <CJK>
-0x8F9C	0x9664	# <CJK>
-0x8F9D	0x50B7	# <CJK>
-0x8F9E	0x511F	# <CJK>
-0x8F9F	0x52DD	# <CJK>
-0x8FA0	0x5320	# <CJK>
-0x8FA1	0x5347	# <CJK>
-0x8FA2	0x53EC	# <CJK>
-0x8FA3	0x54E8	# <CJK>
-0x8FA4	0x5546	# <CJK>
-0x8FA5	0x5531	# <CJK>
-0x8FA6	0x5617	# <CJK>
-0x8FA7	0x5968	# <CJK>
-0x8FA8	0x59BE	# <CJK>
-0x8FA9	0x5A3C	# <CJK>
-0x8FAA	0x5BB5	# <CJK>
-0x8FAB	0x5C06	# <CJK>
-0x8FAC	0x5C0F	# <CJK>
-0x8FAD	0x5C11	# <CJK>
-0x8FAE	0x5C1A	# <CJK>
-0x8FAF	0x5E84	# <CJK>
-0x8FB0	0x5E8A	# <CJK>
-0x8FB1	0x5EE0	# <CJK>
-0x8FB2	0x5F70	# <CJK>
-0x8FB3	0x627F	# <CJK>
-0x8FB4	0x6284	# <CJK>
-0x8FB5	0x62DB	# <CJK>
-0x8FB6	0x638C	# <CJK>
-0x8FB7	0x6377	# <CJK>
-0x8FB8	0x6607	# <CJK>
-0x8FB9	0x660C	# <CJK>
-0x8FBA	0x662D	# <CJK>
-0x8FBB	0x6676	# <CJK>
-0x8FBC	0x677E	# <CJK>
-0x8FBD	0x68A2	# <CJK>
-0x8FBE	0x6A1F	# <CJK>
-0x8FBF	0x6A35	# <CJK>
-0x8FC0	0x6CBC	# <CJK>
-0x8FC1	0x6D88	# <CJK>
-0x8FC2	0x6E09	# <CJK>
-0x8FC3	0x6E58	# <CJK>
-0x8FC4	0x713C	# <CJK>
-0x8FC5	0x7126	# <CJK>
-0x8FC6	0x7167	# <CJK>
-0x8FC7	0x75C7	# <CJK>
-0x8FC8	0x7701	# <CJK>
-0x8FC9	0x785D	# <CJK>
-0x8FCA	0x7901	# <CJK>
-0x8FCB	0x7965	# <CJK>
-0x8FCC	0x79F0	# <CJK>
-0x8FCD	0x7AE0	# <CJK>
-0x8FCE	0x7B11	# <CJK>
-0x8FCF	0x7CA7	# <CJK>
-0x8FD0	0x7D39	# <CJK>
-0x8FD1	0x8096	# <CJK>
-0x8FD2	0x83D6	# <CJK>
-0x8FD3	0x848B	# <CJK>
-0x8FD4	0x8549	# <CJK>
-0x8FD5	0x885D	# <CJK>
-0x8FD6	0x88F3	# <CJK>
-0x8FD7	0x8A1F	# <CJK>
-0x8FD8	0x8A3C	# <CJK>
-0x8FD9	0x8A54	# <CJK>
-0x8FDA	0x8A73	# <CJK>
-0x8FDB	0x8C61	# <CJK>
-0x8FDC	0x8CDE	# <CJK>
-0x8FDD	0x91A4	# <CJK>
-0x8FDE	0x9266	# <CJK>
-0x8FDF	0x937E	# <CJK>
-0x8FE0	0x9418	# <CJK>
-0x8FE1	0x969C	# <CJK>
-0x8FE2	0x9798	# <CJK>
-0x8FE3	0x4E0A	# <CJK>
-0x8FE4	0x4E08	# <CJK>
-0x8FE5	0x4E1E	# <CJK>
-0x8FE6	0x4E57	# <CJK>
-0x8FE7	0x5197	# <CJK>
-0x8FE8	0x5270	# <CJK>
-0x8FE9	0x57CE	# <CJK>
-0x8FEA	0x5834	# <CJK>
-0x8FEB	0x58CC	# <CJK>
-0x8FEC	0x5B22	# <CJK>
-0x8FED	0x5E38	# <CJK>
-0x8FEE	0x60C5	# <CJK>
-0x8FEF	0x64FE	# <CJK>
-0x8FF0	0x6761	# <CJK>
-0x8FF1	0x6756	# <CJK>
-0x8FF2	0x6D44	# <CJK>
-0x8FF3	0x72B6	# <CJK>
-0x8FF4	0x7573	# <CJK>
-0x8FF5	0x7A63	# <CJK>
-0x8FF6	0x84B8	# <CJK>
-0x8FF7	0x8B72	# <CJK>
-0x8FF8	0x91B8	# <CJK>
-0x8FF9	0x9320	# <CJK>
-0x8FFA	0x5631	# <CJK>
-0x8FFB	0x57F4	# <CJK>
-0x8FFC	0x98FE	# <CJK>
-0x9040	0x62ED	# <CJK>
-0x9041	0x690D	# <CJK>
-0x9042	0x6B96	# <CJK>
-0x9043	0x71ED	# <CJK>
-0x9044	0x7E54	# <CJK>
-0x9045	0x8077	# <CJK>
-0x9046	0x8272	# <CJK>
-0x9047	0x89E6	# <CJK>
-0x9048	0x98DF	# <CJK>
-0x9049	0x8755	# <CJK>
-0x904A	0x8FB1	# <CJK>
-0x904B	0x5C3B	# <CJK>
-0x904C	0x4F38	# <CJK>
-0x904D	0x4FE1	# <CJK>
-0x904E	0x4FB5	# <CJK>
-0x904F	0x5507	# <CJK>
-0x9050	0x5A20	# <CJK>
-0x9051	0x5BDD	# <CJK>
-0x9052	0x5BE9	# <CJK>
-0x9053	0x5FC3	# <CJK>
-0x9054	0x614E	# <CJK>
-0x9055	0x632F	# <CJK>
-0x9056	0x65B0	# <CJK>
-0x9057	0x664B	# <CJK>
-0x9058	0x68EE	# <CJK>
-0x9059	0x699B	# <CJK>
-0x905A	0x6D78	# <CJK>
-0x905B	0x6DF1	# <CJK>
-0x905C	0x7533	# <CJK>
-0x905D	0x75B9	# <CJK>
-0x905E	0x771F	# <CJK>
-0x905F	0x795E	# <CJK>
-0x9060	0x79E6	# <CJK>
-0x9061	0x7D33	# <CJK>
-0x9062	0x81E3	# <CJK>
-0x9063	0x82AF	# <CJK>
-0x9064	0x85AA	# <CJK>
-0x9065	0x89AA	# <CJK>
-0x9066	0x8A3A	# <CJK>
-0x9067	0x8EAB	# <CJK>
-0x9068	0x8F9B	# <CJK>
-0x9069	0x9032	# <CJK>
-0x906A	0x91DD	# <CJK>
-0x906B	0x9707	# <CJK>
-0x906C	0x4EBA	# <CJK>
-0x906D	0x4EC1	# <CJK>
-0x906E	0x5203	# <CJK>
-0x906F	0x5875	# <CJK>
-0x9070	0x58EC	# <CJK>
-0x9071	0x5C0B	# <CJK>
-0x9072	0x751A	# <CJK>
-0x9073	0x5C3D	# <CJK>
-0x9074	0x814E	# <CJK>
-0x9075	0x8A0A	# <CJK>
-0x9076	0x8FC5	# <CJK>
-0x9077	0x9663	# <CJK>
-0x9078	0x976D	# <CJK>
-0x9079	0x7B25	# <CJK>
-0x907A	0x8ACF	# <CJK>
-0x907B	0x9808	# <CJK>
-0x907C	0x9162	# <CJK>
-0x907D	0x56F3	# <CJK>
-0x907E	0x53A8	# <CJK>
-0x9080	0x9017	# <CJK>
-0x9081	0x5439	# <CJK>
-0x9082	0x5782	# <CJK>
-0x9083	0x5E25	# <CJK>
-0x9084	0x63A8	# <CJK>
-0x9085	0x6C34	# <CJK>
-0x9086	0x708A	# <CJK>
-0x9087	0x7761	# <CJK>
-0x9088	0x7C8B	# <CJK>
-0x9089	0x7FE0	# <CJK>
-0x908A	0x8870	# <CJK>
-0x908B	0x9042	# <CJK>
-0x908C	0x9154	# <CJK>
-0x908D	0x9310	# <CJK>
-0x908E	0x9318	# <CJK>
-0x908F	0x968F	# <CJK>
-0x9090	0x745E	# <CJK>
-0x9091	0x9AC4	# <CJK>
-0x9092	0x5D07	# <CJK>
-0x9093	0x5D69	# <CJK>
-0x9094	0x6570	# <CJK>
-0x9095	0x67A2	# <CJK>
-0x9096	0x8DA8	# <CJK>
-0x9097	0x96DB	# <CJK>
-0x9098	0x636E	# <CJK>
-0x9099	0x6749	# <CJK>
-0x909A	0x6919	# <CJK>
-0x909B	0x83C5	# <CJK>
-0x909C	0x9817	# <CJK>
-0x909D	0x96C0	# <CJK>
-0x909E	0x88FE	# <CJK>
-0x909F	0x6F84	# <CJK>
-0x90A0	0x647A	# <CJK>
-0x90A1	0x5BF8	# <CJK>
-0x90A2	0x4E16	# <CJK>
-0x90A3	0x702C	# <CJK>
-0x90A4	0x755D	# <CJK>
-0x90A5	0x662F	# <CJK>
-0x90A6	0x51C4	# <CJK>
-0x90A7	0x5236	# <CJK>
-0x90A8	0x52E2	# <CJK>
-0x90A9	0x59D3	# <CJK>
-0x90AA	0x5F81	# <CJK>
-0x90AB	0x6027	# <CJK>
-0x90AC	0x6210	# <CJK>
-0x90AD	0x653F	# <CJK>
-0x90AE	0x6574	# <CJK>
-0x90AF	0x661F	# <CJK>
-0x90B0	0x6674	# <CJK>
-0x90B1	0x68F2	# <CJK>
-0x90B2	0x6816	# <CJK>
-0x90B3	0x6B63	# <CJK>
-0x90B4	0x6E05	# <CJK>
-0x90B5	0x7272	# <CJK>
-0x90B6	0x751F	# <CJK>
-0x90B7	0x76DB	# <CJK>
-0x90B8	0x7CBE	# <CJK>
-0x90B9	0x8056	# <CJK>
-0x90BA	0x58F0	# <CJK>
-0x90BB	0x88FD	# <CJK>
-0x90BC	0x897F	# <CJK>
-0x90BD	0x8AA0	# <CJK>
-0x90BE	0x8A93	# <CJK>
-0x90BF	0x8ACB	# <CJK>
-0x90C0	0x901D	# <CJK>
-0x90C1	0x9192	# <CJK>
-0x90C2	0x9752	# <CJK>
-0x90C3	0x9759	# <CJK>
-0x90C4	0x6589	# <CJK>
-0x90C5	0x7A0E	# <CJK>
-0x90C6	0x8106	# <CJK>
-0x90C7	0x96BB	# <CJK>
-0x90C8	0x5E2D	# <CJK>
-0x90C9	0x60DC	# <CJK>
-0x90CA	0x621A	# <CJK>
-0x90CB	0x65A5	# <CJK>
-0x90CC	0x6614	# <CJK>
-0x90CD	0x6790	# <CJK>
-0x90CE	0x77F3	# <CJK>
-0x90CF	0x7A4D	# <CJK>
-0x90D0	0x7C4D	# <CJK>
-0x90D1	0x7E3E	# <CJK>
-0x90D2	0x810A	# <CJK>
-0x90D3	0x8CAC	# <CJK>
-0x90D4	0x8D64	# <CJK>
-0x90D5	0x8DE1	# <CJK>
-0x90D6	0x8E5F	# <CJK>
-0x90D7	0x78A9	# <CJK>
-0x90D8	0x5207	# <CJK>
-0x90D9	0x62D9	# <CJK>
-0x90DA	0x63A5	# <CJK>
-0x90DB	0x6442	# <CJK>
-0x90DC	0x6298	# <CJK>
-0x90DD	0x8A2D	# <CJK>
-0x90DE	0x7A83	# <CJK>
-0x90DF	0x7BC0	# <CJK>
-0x90E0	0x8AAC	# <CJK>
-0x90E1	0x96EA	# <CJK>
-0x90E2	0x7D76	# <CJK>
-0x90E3	0x820C	# <CJK>
-0x90E4	0x8749	# <CJK>
-0x90E5	0x4ED9	# <CJK>
-0x90E6	0x5148	# <CJK>
-0x90E7	0x5343	# <CJK>
-0x90E8	0x5360	# <CJK>
-0x90E9	0x5BA3	# <CJK>
-0x90EA	0x5C02	# <CJK>
-0x90EB	0x5C16	# <CJK>
-0x90EC	0x5DDD	# <CJK>
-0x90ED	0x6226	# <CJK>
-0x90EE	0x6247	# <CJK>
-0x90EF	0x64B0	# <CJK>
-0x90F0	0x6813	# <CJK>
-0x90F1	0x6834	# <CJK>
-0x90F2	0x6CC9	# <CJK>
-0x90F3	0x6D45	# <CJK>
-0x90F4	0x6D17	# <CJK>
-0x90F5	0x67D3	# <CJK>
-0x90F6	0x6F5C	# <CJK>
-0x90F7	0x714E	# <CJK>
-0x90F8	0x717D	# <CJK>
-0x90F9	0x65CB	# <CJK>
-0x90FA	0x7A7F	# <CJK>
-0x90FB	0x7BAD	# <CJK>
-0x90FC	0x7DDA	# <CJK>
-0x9140	0x7E4A	# <CJK>
-0x9141	0x7FA8	# <CJK>
-0x9142	0x817A	# <CJK>
-0x9143	0x821B	# <CJK>
-0x9144	0x8239	# <CJK>
-0x9145	0x85A6	# <CJK>
-0x9146	0x8A6E	# <CJK>
-0x9147	0x8CCE	# <CJK>
-0x9148	0x8DF5	# <CJK>
-0x9149	0x9078	# <CJK>
-0x914A	0x9077	# <CJK>
-0x914B	0x92AD	# <CJK>
-0x914C	0x9291	# <CJK>
-0x914D	0x9583	# <CJK>
-0x914E	0x9BAE	# <CJK>
-0x914F	0x524D	# <CJK>
-0x9150	0x5584	# <CJK>
-0x9151	0x6F38	# <CJK>
-0x9152	0x7136	# <CJK>
-0x9153	0x5168	# <CJK>
-0x9154	0x7985	# <CJK>
-0x9155	0x7E55	# <CJK>
-0x9156	0x81B3	# <CJK>
-0x9157	0x7CCE	# <CJK>
-0x9158	0x564C	# <CJK>
-0x9159	0x5851	# <CJK>
-0x915A	0x5CA8	# <CJK>
-0x915B	0x63AA	# <CJK>
-0x915C	0x66FE	# <CJK>
-0x915D	0x66FD	# <CJK>
-0x915E	0x695A	# <CJK>
-0x915F	0x72D9	# <CJK>
-0x9160	0x758F	# <CJK>
-0x9161	0x758E	# <CJK>
-0x9162	0x790E	# <CJK>
-0x9163	0x7956	# <CJK>
-0x9164	0x79DF	# <CJK>
-0x9165	0x7C97	# <CJK>
-0x9166	0x7D20	# <CJK>
-0x9167	0x7D44	# <CJK>
-0x9168	0x8607	# <CJK>
-0x9169	0x8A34	# <CJK>
-0x916A	0x963B	# <CJK>
-0x916B	0x9061	# <CJK>
-0x916C	0x9F20	# <CJK>
-0x916D	0x50E7	# <CJK>
-0x916E	0x5275	# <CJK>
-0x916F	0x53CC	# <CJK>
-0x9170	0x53E2	# <CJK>
-0x9171	0x5009	# <CJK>
-0x9172	0x55AA	# <CJK>
-0x9173	0x58EE	# <CJK>
-0x9174	0x594F	# <CJK>
-0x9175	0x723D	# <CJK>
-0x9176	0x5B8B	# <CJK>
-0x9177	0x5C64	# <CJK>
-0x9178	0x531D	# <CJK>
-0x9179	0x60E3	# <CJK>
-0x917A	0x60F3	# <CJK>
-0x917B	0x635C	# <CJK>
-0x917C	0x6383	# <CJK>
-0x917D	0x633F	# <CJK>
-0x917E	0x63BB	# <CJK>
-0x9180	0x64CD	# <CJK>
-0x9181	0x65E9	# <CJK>
-0x9182	0x66F9	# <CJK>
-0x9183	0x5DE3	# <CJK>
-0x9184	0x69CD	# <CJK>
-0x9185	0x69FD	# <CJK>
-0x9186	0x6F15	# <CJK>
-0x9187	0x71E5	# <CJK>
-0x9188	0x4E89	# <CJK>
-0x9189	0x75E9	# <CJK>
-0x918A	0x76F8	# <CJK>
-0x918B	0x7A93	# <CJK>
-0x918C	0x7CDF	# <CJK>
-0x918D	0x7DCF	# <CJK>
-0x918E	0x7D9C	# <CJK>
-0x918F	0x8061	# <CJK>
-0x9190	0x8349	# <CJK>
-0x9191	0x8358	# <CJK>
-0x9192	0x846C	# <CJK>
-0x9193	0x84BC	# <CJK>
-0x9194	0x85FB	# <CJK>
-0x9195	0x88C5	# <CJK>
-0x9196	0x8D70	# <CJK>
-0x9197	0x9001	# <CJK>
-0x9198	0x906D	# <CJK>
-0x9199	0x9397	# <CJK>
-0x919A	0x971C	# <CJK>
-0x919B	0x9A12	# <CJK>
-0x919C	0x50CF	# <CJK>
-0x919D	0x5897	# <CJK>
-0x919E	0x618E	# <CJK>
-0x919F	0x81D3	# <CJK>
-0x91A0	0x8535	# <CJK>
-0x91A1	0x8D08	# <CJK>
-0x91A2	0x9020	# <CJK>
-0x91A3	0x4FC3	# <CJK>
-0x91A4	0x5074	# <CJK>
-0x91A5	0x5247	# <CJK>
-0x91A6	0x5373	# <CJK>
-0x91A7	0x606F	# <CJK>
-0x91A8	0x6349	# <CJK>
-0x91A9	0x675F	# <CJK>
-0x91AA	0x6E2C	# <CJK>
-0x91AB	0x8DB3	# <CJK>
-0x91AC	0x901F	# <CJK>
-0x91AD	0x4FD7	# <CJK>
-0x91AE	0x5C5E	# <CJK>
-0x91AF	0x8CCA	# <CJK>
-0x91B0	0x65CF	# <CJK>
-0x91B1	0x7D9A	# <CJK>
-0x91B2	0x5352	# <CJK>
-0x91B3	0x8896	# <CJK>
-0x91B4	0x5176	# <CJK>
-0x91B5	0x63C3	# <CJK>
-0x91B6	0x5B58	# <CJK>
-0x91B7	0x5B6B	# <CJK>
-0x91B8	0x5C0A	# <CJK>
-0x91B9	0x640D	# <CJK>
-0x91BA	0x6751	# <CJK>
-0x91BB	0x905C	# <CJK>
-0x91BC	0x4ED6	# <CJK>
-0x91BD	0x591A	# <CJK>
-0x91BE	0x592A	# <CJK>
-0x91BF	0x6C70	# <CJK>
-0x91C0	0x8A51	# <CJK>
-0x91C1	0x553E	# <CJK>
-0x91C2	0x5815	# <CJK>
-0x91C3	0x59A5	# <CJK>
-0x91C4	0x60F0	# <CJK>
-0x91C5	0x6253	# <CJK>
-0x91C6	0x67C1	# <CJK>
-0x91C7	0x8235	# <CJK>
-0x91C8	0x6955	# <CJK>
-0x91C9	0x9640	# <CJK>
-0x91CA	0x99C4	# <CJK>
-0x91CB	0x9A28	# <CJK>
-0x91CC	0x4F53	# <CJK>
-0x91CD	0x5806	# <CJK>
-0x91CE	0x5BFE	# <CJK>
-0x91CF	0x8010	# <CJK>
-0x91D0	0x5CB1	# <CJK>
-0x91D1	0x5E2F	# <CJK>
-0x91D2	0x5F85	# <CJK>
-0x91D3	0x6020	# <CJK>
-0x91D4	0x614B	# <CJK>
-0x91D5	0x6234	# <CJK>
-0x91D6	0x66FF	# <CJK>
-0x91D7	0x6CF0	# <CJK>
-0x91D8	0x6EDE	# <CJK>
-0x91D9	0x80CE	# <CJK>
-0x91DA	0x817F	# <CJK>
-0x91DB	0x82D4	# <CJK>
-0x91DC	0x888B	# <CJK>
-0x91DD	0x8CB8	# <CJK>
-0x91DE	0x9000	# <CJK>
-0x91DF	0x902E	# <CJK>
-0x91E0	0x968A	# <CJK>
-0x91E1	0x9EDB	# <CJK>
-0x91E2	0x9BDB	# <CJK>
-0x91E3	0x4EE3	# <CJK>
-0x91E4	0x53F0	# <CJK>
-0x91E5	0x5927	# <CJK>
-0x91E6	0x7B2C	# <CJK>
-0x91E7	0x918D	# <CJK>
-0x91E8	0x984C	# <CJK>
-0x91E9	0x9DF9	# <CJK>
-0x91EA	0x6EDD	# <CJK>
-0x91EB	0x7027	# <CJK>
-0x91EC	0x5353	# <CJK>
-0x91ED	0x5544	# <CJK>
-0x91EE	0x5B85	# <CJK>
-0x91EF	0x6258	# <CJK>
-0x91F0	0x629E	# <CJK>
-0x91F1	0x62D3	# <CJK>
-0x91F2	0x6CA2	# <CJK>
-0x91F3	0x6FEF	# <CJK>
-0x91F4	0x7422	# <CJK>
-0x91F5	0x8A17	# <CJK>
-0x91F6	0x9438	# <CJK>
-0x91F7	0x6FC1	# <CJK>
-0x91F8	0x8AFE	# <CJK>
-0x91F9	0x8338	# <CJK>
-0x91FA	0x51E7	# <CJK>
-0x91FB	0x86F8	# <CJK>
-0x91FC	0x53EA	# <CJK>
-0x9240	0x53E9	# <CJK>
-0x9241	0x4F46	# <CJK>
-0x9242	0x9054	# <CJK>
-0x9243	0x8FB0	# <CJK>
-0x9244	0x596A	# <CJK>
-0x9245	0x8131	# <CJK>
-0x9246	0x5DFD	# <CJK>
-0x9247	0x7AEA	# <CJK>
-0x9248	0x8FBF	# <CJK>
-0x9249	0x68DA	# <CJK>
-0x924A	0x8C37	# <CJK>
-0x924B	0x72F8	# <CJK>
-0x924C	0x9C48	# <CJK>
-0x924D	0x6A3D	# <CJK>
-0x924E	0x8AB0	# <CJK>
-0x924F	0x4E39	# <CJK>
-0x9250	0x5358	# <CJK>
-0x9251	0x5606	# <CJK>
-0x9252	0x5766	# <CJK>
-0x9253	0x62C5	# <CJK>
-0x9254	0x63A2	# <CJK>
-0x9255	0x65E6	# <CJK>
-0x9256	0x6B4E	# <CJK>
-0x9257	0x6DE1	# <CJK>
-0x9258	0x6E5B	# <CJK>
-0x9259	0x70AD	# <CJK>
-0x925A	0x77ED	# <CJK>
-0x925B	0x7AEF	# <CJK>
-0x925C	0x7BAA	# <CJK>
-0x925D	0x7DBB	# <CJK>
-0x925E	0x803D	# <CJK>
-0x925F	0x80C6	# <CJK>
-0x9260	0x86CB	# <CJK>
-0x9261	0x8A95	# <CJK>
-0x9262	0x935B	# <CJK>
-0x9263	0x56E3	# <CJK>
-0x9264	0x58C7	# <CJK>
-0x9265	0x5F3E	# <CJK>
-0x9266	0x65AD	# <CJK>
-0x9267	0x6696	# <CJK>
-0x9268	0x6A80	# <CJK>
-0x9269	0x6BB5	# <CJK>
-0x926A	0x7537	# <CJK>
-0x926B	0x8AC7	# <CJK>
-0x926C	0x5024	# <CJK>
-0x926D	0x77E5	# <CJK>
-0x926E	0x5730	# <CJK>
-0x926F	0x5F1B	# <CJK>
-0x9270	0x6065	# <CJK>
-0x9271	0x667A	# <CJK>
-0x9272	0x6C60	# <CJK>
-0x9273	0x75F4	# <CJK>
-0x9274	0x7A1A	# <CJK>
-0x9275	0x7F6E	# <CJK>
-0x9276	0x81F4	# <CJK>
-0x9277	0x8718	# <CJK>
-0x9278	0x9045	# <CJK>
-0x9279	0x99B3	# <CJK>
-0x927A	0x7BC9	# <CJK>
-0x927B	0x755C	# <CJK>
-0x927C	0x7AF9	# <CJK>
-0x927D	0x7B51	# <CJK>
-0x927E	0x84C4	# <CJK>
-0x9280	0x9010	# <CJK>
-0x9281	0x79E9	# <CJK>
-0x9282	0x7A92	# <CJK>
-0x9283	0x8336	# <CJK>
-0x9284	0x5AE1	# <CJK>
-0x9285	0x7740	# <CJK>
-0x9286	0x4E2D	# <CJK>
-0x9287	0x4EF2	# <CJK>
-0x9288	0x5B99	# <CJK>
-0x9289	0x5FE0	# <CJK>
-0x928A	0x62BD	# <CJK>
-0x928B	0x663C	# <CJK>
-0x928C	0x67F1	# <CJK>
-0x928D	0x6CE8	# <CJK>
-0x928E	0x866B	# <CJK>
-0x928F	0x8877	# <CJK>
-0x9290	0x8A3B	# <CJK>
-0x9291	0x914E	# <CJK>
-0x9292	0x92F3	# <CJK>
-0x9293	0x99D0	# <CJK>
-0x9294	0x6A17	# <CJK>
-0x9295	0x7026	# <CJK>
-0x9296	0x732A	# <CJK>
-0x9297	0x82E7	# <CJK>
-0x9298	0x8457	# <CJK>
-0x9299	0x8CAF	# <CJK>
-0x929A	0x4E01	# <CJK>
-0x929B	0x5146	# <CJK>
-0x929C	0x51CB	# <CJK>
-0x929D	0x558B	# <CJK>
-0x929E	0x5BF5	# <CJK>
-0x929F	0x5E16	# <CJK>
-0x92A0	0x5E33	# <CJK>
-0x92A1	0x5E81	# <CJK>
-0x92A2	0x5F14	# <CJK>
-0x92A3	0x5F35	# <CJK>
-0x92A4	0x5F6B	# <CJK>
-0x92A5	0x5FB4	# <CJK>
-0x92A6	0x61F2	# <CJK>
-0x92A7	0x6311	# <CJK>
-0x92A8	0x66A2	# <CJK>
-0x92A9	0x671D	# <CJK>
-0x92AA	0x6F6E	# <CJK>
-0x92AB	0x7252	# <CJK>
-0x92AC	0x753A	# <CJK>
-0x92AD	0x773A	# <CJK>
-0x92AE	0x8074	# <CJK>
-0x92AF	0x8139	# <CJK>
-0x92B0	0x8178	# <CJK>
-0x92B1	0x8776	# <CJK>
-0x92B2	0x8ABF	# <CJK>
-0x92B3	0x8ADC	# <CJK>
-0x92B4	0x8D85	# <CJK>
-0x92B5	0x8DF3	# <CJK>
-0x92B6	0x929A	# <CJK>
-0x92B7	0x9577	# <CJK>
-0x92B8	0x9802	# <CJK>
-0x92B9	0x9CE5	# <CJK>
-0x92BA	0x52C5	# <CJK>
-0x92BB	0x6357	# <CJK>
-0x92BC	0x76F4	# <CJK>
-0x92BD	0x6715	# <CJK>
-0x92BE	0x6C88	# <CJK>
-0x92BF	0x73CD	# <CJK>
-0x92C0	0x8CC3	# <CJK>
-0x92C1	0x93AE	# <CJK>
-0x92C2	0x9673	# <CJK>
-0x92C3	0x6D25	# <CJK>
-0x92C4	0x589C	# <CJK>
-0x92C5	0x690E	# <CJK>
-0x92C6	0x69CC	# <CJK>
-0x92C7	0x8FFD	# <CJK>
-0x92C8	0x939A	# <CJK>
-0x92C9	0x75DB	# <CJK>
-0x92CA	0x901A	# <CJK>
-0x92CB	0x585A	# <CJK>
-0x92CC	0x6802	# <CJK>
-0x92CD	0x63B4	# <CJK>
-0x92CE	0x69FB	# <CJK>
-0x92CF	0x4F43	# <CJK>
-0x92D0	0x6F2C	# <CJK>
-0x92D1	0x67D8	# <CJK>
-0x92D2	0x8FBB	# <CJK>
-0x92D3	0x8526	# <CJK>
-0x92D4	0x7DB4	# <CJK>
-0x92D5	0x9354	# <CJK>
-0x92D6	0x693F	# <CJK>
-0x92D7	0x6F70	# <CJK>
-0x92D8	0x576A	# <CJK>
-0x92D9	0x58F7	# <CJK>
-0x92DA	0x5B2C	# <CJK>
-0x92DB	0x7D2C	# <CJK>
-0x92DC	0x722A	# <CJK>
-0x92DD	0x540A	# <CJK>
-0x92DE	0x91E3	# <CJK>
-0x92DF	0x9DB4	# <CJK>
-0x92E0	0x4EAD	# <CJK>
-0x92E1	0x4F4E	# <CJK>
-0x92E2	0x505C	# <CJK>
-0x92E3	0x5075	# <CJK>
-0x92E4	0x5243	# <CJK>
-0x92E5	0x8C9E	# <CJK>
-0x92E6	0x5448	# <CJK>
-0x92E7	0x5824	# <CJK>
-0x92E8	0x5B9A	# <CJK>
-0x92E9	0x5E1D	# <CJK>
-0x92EA	0x5E95	# <CJK>
-0x92EB	0x5EAD	# <CJK>
-0x92EC	0x5EF7	# <CJK>
-0x92ED	0x5F1F	# <CJK>
-0x92EE	0x608C	# <CJK>
-0x92EF	0x62B5	# <CJK>
-0x92F0	0x633A	# <CJK>
-0x92F1	0x63D0	# <CJK>
-0x92F2	0x68AF	# <CJK>
-0x92F3	0x6C40	# <CJK>
-0x92F4	0x7887	# <CJK>
-0x92F5	0x798E	# <CJK>
-0x92F6	0x7A0B	# <CJK>
-0x92F7	0x7DE0	# <CJK>
-0x92F8	0x8247	# <CJK>
-0x92F9	0x8A02	# <CJK>
-0x92FA	0x8AE6	# <CJK>
-0x92FB	0x8E44	# <CJK>
-0x92FC	0x9013	# <CJK>
-0x9340	0x90B8	# <CJK>
-0x9341	0x912D	# <CJK>
-0x9342	0x91D8	# <CJK>
-0x9343	0x9F0E	# <CJK>
-0x9344	0x6CE5	# <CJK>
-0x9345	0x6458	# <CJK>
-0x9346	0x64E2	# <CJK>
-0x9347	0x6575	# <CJK>
-0x9348	0x6EF4	# <CJK>
-0x9349	0x7684	# <CJK>
-0x934A	0x7B1B	# <CJK>
-0x934B	0x9069	# <CJK>
-0x934C	0x93D1	# <CJK>
-0x934D	0x6EBA	# <CJK>
-0x934E	0x54F2	# <CJK>
-0x934F	0x5FB9	# <CJK>
-0x9350	0x64A4	# <CJK>
-0x9351	0x8F4D	# <CJK>
-0x9352	0x8FED	# <CJK>
-0x9353	0x9244	# <CJK>
-0x9354	0x5178	# <CJK>
-0x9355	0x586B	# <CJK>
-0x9356	0x5929	# <CJK>
-0x9357	0x5C55	# <CJK>
-0x9358	0x5E97	# <CJK>
-0x9359	0x6DFB	# <CJK>
-0x935A	0x7E8F	# <CJK>
-0x935B	0x751C	# <CJK>
-0x935C	0x8CBC	# <CJK>
-0x935D	0x8EE2	# <CJK>
-0x935E	0x985B	# <CJK>
-0x935F	0x70B9	# <CJK>
-0x9360	0x4F1D	# <CJK>
-0x9361	0x6BBF	# <CJK>
-0x9362	0x6FB1	# <CJK>
-0x9363	0x7530	# <CJK>
-0x9364	0x96FB	# <CJK>
-0x9365	0x514E	# <CJK>
-0x9366	0x5410	# <CJK>
-0x9367	0x5835	# <CJK>
-0x9368	0x5857	# <CJK>
-0x9369	0x59AC	# <CJK>
-0x936A	0x5C60	# <CJK>
-0x936B	0x5F92	# <CJK>
-0x936C	0x6597	# <CJK>
-0x936D	0x675C	# <CJK>
-0x936E	0x6E21	# <CJK>
-0x936F	0x767B	# <CJK>
-0x9370	0x83DF	# <CJK>
-0x9371	0x8CED	# <CJK>
-0x9372	0x9014	# <CJK>
-0x9373	0x90FD	# <CJK>
-0x9374	0x934D	# <CJK>
-0x9375	0x7825	# <CJK>
-0x9376	0x783A	# <CJK>
-0x9377	0x52AA	# <CJK>
-0x9378	0x5EA6	# <CJK>
-0x9379	0x571F	# <CJK>
-0x937A	0x5974	# <CJK>
-0x937B	0x6012	# <CJK>
-0x937C	0x5012	# <CJK>
-0x937D	0x515A	# <CJK>
-0x937E	0x51AC	# <CJK>
-0x9380	0x51CD	# <CJK>
-0x9381	0x5200	# <CJK>
-0x9382	0x5510	# <CJK>
-0x9383	0x5854	# <CJK>
-0x9384	0x5858	# <CJK>
-0x9385	0x5957	# <CJK>
-0x9386	0x5B95	# <CJK>
-0x9387	0x5CF6	# <CJK>
-0x9388	0x5D8B	# <CJK>
-0x9389	0x60BC	# <CJK>
-0x938A	0x6295	# <CJK>
-0x938B	0x642D	# <CJK>
-0x938C	0x6771	# <CJK>
-0x938D	0x6843	# <CJK>
-0x938E	0x68BC	# <CJK>
-0x938F	0x68DF	# <CJK>
-0x9390	0x76D7	# <CJK>
-0x9391	0x6DD8	# <CJK>
-0x9392	0x6E6F	# <CJK>
-0x9393	0x6D9B	# <CJK>
-0x9394	0x706F	# <CJK>
-0x9395	0x71C8	# <CJK>
-0x9396	0x5F53	# <CJK>
-0x9397	0x75D8	# <CJK>
-0x9398	0x7977	# <CJK>
-0x9399	0x7B49	# <CJK>
-0x939A	0x7B54	# <CJK>
-0x939B	0x7B52	# <CJK>
-0x939C	0x7CD6	# <CJK>
-0x939D	0x7D71	# <CJK>
-0x939E	0x5230	# <CJK>
-0x939F	0x8463	# <CJK>
-0x93A0	0x8569	# <CJK>
-0x93A1	0x85E4	# <CJK>
-0x93A2	0x8A0E	# <CJK>
-0x93A3	0x8B04	# <CJK>
-0x93A4	0x8C46	# <CJK>
-0x93A5	0x8E0F	# <CJK>
-0x93A6	0x9003	# <CJK>
-0x93A7	0x900F	# <CJK>
-0x93A8	0x9419	# <CJK>
-0x93A9	0x9676	# <CJK>
-0x93AA	0x982D	# <CJK>
-0x93AB	0x9A30	# <CJK>
-0x93AC	0x95D8	# <CJK>
-0x93AD	0x50CD	# <CJK>
-0x93AE	0x52D5	# <CJK>
-0x93AF	0x540C	# <CJK>
-0x93B0	0x5802	# <CJK>
-0x93B1	0x5C0E	# <CJK>
-0x93B2	0x61A7	# <CJK>
-0x93B3	0x649E	# <CJK>
-0x93B4	0x6D1E	# <CJK>
-0x93B5	0x77B3	# <CJK>
-0x93B6	0x7AE5	# <CJK>
-0x93B7	0x80F4	# <CJK>
-0x93B8	0x8404	# <CJK>
-0x93B9	0x9053	# <CJK>
-0x93BA	0x9285	# <CJK>
-0x93BB	0x5CE0	# <CJK>
-0x93BC	0x9D07	# <CJK>
-0x93BD	0x533F	# <CJK>
-0x93BE	0x5F97	# <CJK>
-0x93BF	0x5FB3	# <CJK>
-0x93C0	0x6D9C	# <CJK>
-0x93C1	0x7279	# <CJK>
-0x93C2	0x7763	# <CJK>
-0x93C3	0x79BF	# <CJK>
-0x93C4	0x7BE4	# <CJK>
-0x93C5	0x6BD2	# <CJK>
-0x93C6	0x72EC	# <CJK>
-0x93C7	0x8AAD	# <CJK>
-0x93C8	0x6803	# <CJK>
-0x93C9	0x6A61	# <CJK>
-0x93CA	0x51F8	# <CJK>
-0x93CB	0x7A81	# <CJK>
-0x93CC	0x6934	# <CJK>
-0x93CD	0x5C4A	# <CJK>
-0x93CE	0x9CF6	# <CJK>
-0x93CF	0x82EB	# <CJK>
-0x93D0	0x5BC5	# <CJK>
-0x93D1	0x9149	# <CJK>
-0x93D2	0x701E	# <CJK>
-0x93D3	0x5678	# <CJK>
-0x93D4	0x5C6F	# <CJK>
-0x93D5	0x60C7	# <CJK>
-0x93D6	0x6566	# <CJK>
-0x93D7	0x6C8C	# <CJK>
-0x93D8	0x8C5A	# <CJK>
-0x93D9	0x9041	# <CJK>
-0x93DA	0x9813	# <CJK>
-0x93DB	0x5451	# <CJK>
-0x93DC	0x66C7	# <CJK>
-0x93DD	0x920D	# <CJK>
-0x93DE	0x5948	# <CJK>
-0x93DF	0x90A3	# <CJK>
-0x93E0	0x5185	# <CJK>
-0x93E1	0x4E4D	# <CJK>
-0x93E2	0x51EA	# <CJK>
-0x93E3	0x8599	# <CJK>
-0x93E4	0x8B0E	# <CJK>
-0x93E5	0x7058	# <CJK>
-0x93E6	0x637A	# <CJK>
-0x93E7	0x934B	# <CJK>
-0x93E8	0x6962	# <CJK>
-0x93E9	0x99B4	# <CJK>
-0x93EA	0x7E04	# <CJK>
-0x93EB	0x7577	# <CJK>
-0x93EC	0x5357	# <CJK>
-0x93ED	0x6960	# <CJK>
-0x93EE	0x8EDF	# <CJK>
-0x93EF	0x96E3	# <CJK>
-0x93F0	0x6C5D	# <CJK>
-0x93F1	0x4E8C	# <CJK>
-0x93F2	0x5C3C	# <CJK>
-0x93F3	0x5F10	# <CJK>
-0x93F4	0x8FE9	# <CJK>
-0x93F5	0x5302	# <CJK>
-0x93F6	0x8CD1	# <CJK>
-0x93F7	0x8089	# <CJK>
-0x93F8	0x8679	# <CJK>
-0x93F9	0x5EFF	# <CJK>
-0x93FA	0x65E5	# <CJK>
-0x93FB	0x4E73	# <CJK>
-0x93FC	0x5165	# <CJK>
-0x9440	0x5982	# <CJK>
-0x9441	0x5C3F	# <CJK>
-0x9442	0x97EE	# <CJK>
-0x9443	0x4EFB	# <CJK>
-0x9444	0x598A	# <CJK>
-0x9445	0x5FCD	# <CJK>
-0x9446	0x8A8D	# <CJK>
-0x9447	0x6FE1	# <CJK>
-0x9448	0x79B0	# <CJK>
-0x9449	0x7962	# <CJK>
-0x944A	0x5BE7	# <CJK>
-0x944B	0x8471	# <CJK>
-0x944C	0x732B	# <CJK>
-0x944D	0x71B1	# <CJK>
-0x944E	0x5E74	# <CJK>
-0x944F	0x5FF5	# <CJK>
-0x9450	0x637B	# <CJK>
-0x9451	0x649A	# <CJK>
-0x9452	0x71C3	# <CJK>
-0x9453	0x7C98	# <CJK>
-0x9454	0x4E43	# <CJK>
-0x9455	0x5EFC	# <CJK>
-0x9456	0x4E4B	# <CJK>
-0x9457	0x57DC	# <CJK>
-0x9458	0x56A2	# <CJK>
-0x9459	0x60A9	# <CJK>
-0x945A	0x6FC3	# <CJK>
-0x945B	0x7D0D	# <CJK>
-0x945C	0x80FD	# <CJK>
-0x945D	0x8133	# <CJK>
-0x945E	0x81BF	# <CJK>
-0x945F	0x8FB2	# <CJK>
-0x9460	0x8997	# <CJK>
-0x9461	0x86A4	# <CJK>
-0x9462	0x5DF4	# <CJK>
-0x9463	0x628A	# <CJK>
-0x9464	0x64AD	# <CJK>
-0x9465	0x8987	# <CJK>
-0x9466	0x6777	# <CJK>
-0x9467	0x6CE2	# <CJK>
-0x9468	0x6D3E	# <CJK>
-0x9469	0x7436	# <CJK>
-0x946A	0x7834	# <CJK>
-0x946B	0x5A46	# <CJK>
-0x946C	0x7F75	# <CJK>
-0x946D	0x82AD	# <CJK>
-0x946E	0x99AC	# <CJK>
-0x946F	0x4FF3	# <CJK>
-0x9470	0x5EC3	# <CJK>
-0x9471	0x62DD	# <CJK>
-0x9472	0x6392	# <CJK>
-0x9473	0x6557	# <CJK>
-0x9474	0x676F	# <CJK>
-0x9475	0x76C3	# <CJK>
-0x9476	0x724C	# <CJK>
-0x9477	0x80CC	# <CJK>
-0x9478	0x80BA	# <CJK>
-0x9479	0x8F29	# <CJK>
-0x947A	0x914D	# <CJK>
-0x947B	0x500D	# <CJK>
-0x947C	0x57F9	# <CJK>
-0x947D	0x5A92	# <CJK>
-0x947E	0x6885	# <CJK>
-0x9480	0x6973	# <CJK>
-0x9481	0x7164	# <CJK>
-0x9482	0x72FD	# <CJK>
-0x9483	0x8CB7	# <CJK>
-0x9484	0x58F2	# <CJK>
-0x9485	0x8CE0	# <CJK>
-0x9486	0x966A	# <CJK>
-0x9487	0x9019	# <CJK>
-0x9488	0x877F	# <CJK>
-0x9489	0x79E4	# <CJK>
-0x948A	0x77E7	# <CJK>
-0x948B	0x8429	# <CJK>
-0x948C	0x4F2F	# <CJK>
-0x948D	0x5265	# <CJK>
-0x948E	0x535A	# <CJK>
-0x948F	0x62CD	# <CJK>
-0x9490	0x67CF	# <CJK>
-0x9491	0x6CCA	# <CJK>
-0x9492	0x767D	# <CJK>
-0x9493	0x7B94	# <CJK>
-0x9494	0x7C95	# <CJK>
-0x9495	0x8236	# <CJK>
-0x9496	0x8584	# <CJK>
-0x9497	0x8FEB	# <CJK>
-0x9498	0x66DD	# <CJK>
-0x9499	0x6F20	# <CJK>
-0x949A	0x7206	# <CJK>
-0x949B	0x7E1B	# <CJK>
-0x949C	0x83AB	# <CJK>
-0x949D	0x99C1	# <CJK>
-0x949E	0x9EA6	# <CJK>
-0x949F	0x51FD	# <CJK>
-0x94A0	0x7BB1	# <CJK>
-0x94A1	0x7872	# <CJK>
-0x94A2	0x7BB8	# <CJK>
-0x94A3	0x8087	# <CJK>
-0x94A4	0x7B48	# <CJK>
-0x94A5	0x6AE8	# <CJK>
-0x94A6	0x5E61	# <CJK>
-0x94A7	0x808C	# <CJK>
-0x94A8	0x7551	# <CJK>
-0x94A9	0x7560	# <CJK>
-0x94AA	0x516B	# <CJK>
-0x94AB	0x9262	# <CJK>
-0x94AC	0x6E8C	# <CJK>
-0x94AD	0x767A	# <CJK>
-0x94AE	0x9197	# <CJK>
-0x94AF	0x9AEA	# <CJK>
-0x94B0	0x4F10	# <CJK>
-0x94B1	0x7F70	# <CJK>
-0x94B2	0x629C	# <CJK>
-0x94B3	0x7B4F	# <CJK>
-0x94B4	0x95A5	# <CJK>
-0x94B5	0x9CE9	# <CJK>
-0x94B6	0x567A	# <CJK>
-0x94B7	0x5859	# <CJK>
-0x94B8	0x86E4	# <CJK>
-0x94B9	0x96BC	# <CJK>
-0x94BA	0x4F34	# <CJK>
-0x94BB	0x5224	# <CJK>
-0x94BC	0x534A	# <CJK>
-0x94BD	0x53CD	# <CJK>
-0x94BE	0x53DB	# <CJK>
-0x94BF	0x5E06	# <CJK>
-0x94C0	0x642C	# <CJK>
-0x94C1	0x6591	# <CJK>
-0x94C2	0x677F	# <CJK>
-0x94C3	0x6C3E	# <CJK>
-0x94C4	0x6C4E	# <CJK>
-0x94C5	0x7248	# <CJK>
-0x94C6	0x72AF	# <CJK>
-0x94C7	0x73ED	# <CJK>
-0x94C8	0x7554	# <CJK>
-0x94C9	0x7E41	# <CJK>
-0x94CA	0x822C	# <CJK>
-0x94CB	0x85E9	# <CJK>
-0x94CC	0x8CA9	# <CJK>
-0x94CD	0x7BC4	# <CJK>
-0x94CE	0x91C6	# <CJK>
-0x94CF	0x7169	# <CJK>
-0x94D0	0x9812	# <CJK>
-0x94D1	0x98EF	# <CJK>
-0x94D2	0x633D	# <CJK>
-0x94D3	0x6669	# <CJK>
-0x94D4	0x756A	# <CJK>
-0x94D5	0x76E4	# <CJK>
-0x94D6	0x78D0	# <CJK>
-0x94D7	0x8543	# <CJK>
-0x94D8	0x86EE	# <CJK>
-0x94D9	0x532A	# <CJK>
-0x94DA	0x5351	# <CJK>
-0x94DB	0x5426	# <CJK>
-0x94DC	0x5983	# <CJK>
-0x94DD	0x5E87	# <CJK>
-0x94DE	0x5F7C	# <CJK>
-0x94DF	0x60B2	# <CJK>
-0x94E0	0x6249	# <CJK>
-0x94E1	0x6279	# <CJK>
-0x94E2	0x62AB	# <CJK>
-0x94E3	0x6590	# <CJK>
-0x94E4	0x6BD4	# <CJK>
-0x94E5	0x6CCC	# <CJK>
-0x94E6	0x75B2	# <CJK>
-0x94E7	0x76AE	# <CJK>
-0x94E8	0x7891	# <CJK>
-0x94E9	0x79D8	# <CJK>
-0x94EA	0x7DCB	# <CJK>
-0x94EB	0x7F77	# <CJK>
-0x94EC	0x80A5	# <CJK>
-0x94ED	0x88AB	# <CJK>
-0x94EE	0x8AB9	# <CJK>
-0x94EF	0x8CBB	# <CJK>
-0x94F0	0x907F	# <CJK>
-0x94F1	0x975E	# <CJK>
-0x94F2	0x98DB	# <CJK>
-0x94F3	0x6A0B	# <CJK>
-0x94F4	0x7C38	# <CJK>
-0x94F5	0x5099	# <CJK>
-0x94F6	0x5C3E	# <CJK>
-0x94F7	0x5FAE	# <CJK>
-0x94F8	0x6787	# <CJK>
-0x94F9	0x6BD8	# <CJK>
-0x94FA	0x7435	# <CJK>
-0x94FB	0x7709	# <CJK>
-0x94FC	0x7F8E	# <CJK>
-0x9540	0x9F3B	# <CJK>
-0x9541	0x67CA	# <CJK>
-0x9542	0x7A17	# <CJK>
-0x9543	0x5339	# <CJK>
-0x9544	0x758B	# <CJK>
-0x9545	0x9AED	# <CJK>
-0x9546	0x5F66	# <CJK>
-0x9547	0x819D	# <CJK>
-0x9548	0x83F1	# <CJK>
-0x9549	0x8098	# <CJK>
-0x954A	0x5F3C	# <CJK>
-0x954B	0x5FC5	# <CJK>
-0x954C	0x7562	# <CJK>
-0x954D	0x7B46	# <CJK>
-0x954E	0x903C	# <CJK>
-0x954F	0x6867	# <CJK>
-0x9550	0x59EB	# <CJK>
-0x9551	0x5A9B	# <CJK>
-0x9552	0x7D10	# <CJK>
-0x9553	0x767E	# <CJK>
-0x9554	0x8B2C	# <CJK>
-0x9555	0x4FF5	# <CJK>
-0x9556	0x5F6A	# <CJK>
-0x9557	0x6A19	# <CJK>
-0x9558	0x6C37	# <CJK>
-0x9559	0x6F02	# <CJK>
-0x955A	0x74E2	# <CJK>
-0x955B	0x7968	# <CJK>
-0x955C	0x8868	# <CJK>
-0x955D	0x8A55	# <CJK>
-0x955E	0x8C79	# <CJK>
-0x955F	0x5EDF	# <CJK>
-0x9560	0x63CF	# <CJK>
-0x9561	0x75C5	# <CJK>
-0x9562	0x79D2	# <CJK>
-0x9563	0x82D7	# <CJK>
-0x9564	0x9328	# <CJK>
-0x9565	0x92F2	# <CJK>
-0x9566	0x849C	# <CJK>
-0x9567	0x86ED	# <CJK>
-0x9568	0x9C2D	# <CJK>
-0x9569	0x54C1	# <CJK>
-0x956A	0x5F6C	# <CJK>
-0x956B	0x658C	# <CJK>
-0x956C	0x6D5C	# <CJK>
-0x956D	0x7015	# <CJK>
-0x956E	0x8CA7	# <CJK>
-0x956F	0x8CD3	# <CJK>
-0x9570	0x983B	# <CJK>
-0x9571	0x654F	# <CJK>
-0x9572	0x74F6	# <CJK>
-0x9573	0x4E0D	# <CJK>
-0x9574	0x4ED8	# <CJK>
-0x9575	0x57E0	# <CJK>
-0x9576	0x592B	# <CJK>
-0x9577	0x5A66	# <CJK>
-0x9578	0x5BCC	# <CJK>
-0x9579	0x51A8	# <CJK>
-0x957A	0x5E03	# <CJK>
-0x957B	0x5E9C	# <CJK>
-0x957C	0x6016	# <CJK>
-0x957D	0x6276	# <CJK>
-0x957E	0x6577	# <CJK>
-0x9580	0x65A7	# <CJK>
-0x9581	0x666E	# <CJK>
-0x9582	0x6D6E	# <CJK>
-0x9583	0x7236	# <CJK>
-0x9584	0x7B26	# <CJK>
-0x9585	0x8150	# <CJK>
-0x9586	0x819A	# <CJK>
-0x9587	0x8299	# <CJK>
-0x9588	0x8B5C	# <CJK>
-0x9589	0x8CA0	# <CJK>
-0x958A	0x8CE6	# <CJK>
-0x958B	0x8D74	# <CJK>
-0x958C	0x961C	# <CJK>
-0x958D	0x9644	# <CJK>
-0x958E	0x4FAE	# <CJK>
-0x958F	0x64AB	# <CJK>
-0x9590	0x6B66	# <CJK>
-0x9591	0x821E	# <CJK>
-0x9592	0x8461	# <CJK>
-0x9593	0x856A	# <CJK>
-0x9594	0x90E8	# <CJK>
-0x9595	0x5C01	# <CJK>
-0x9596	0x6953	# <CJK>
-0x9597	0x98A8	# <CJK>
-0x9598	0x847A	# <CJK>
-0x9599	0x8557	# <CJK>
-0x959A	0x4F0F	# <CJK>
-0x959B	0x526F	# <CJK>
-0x959C	0x5FA9	# <CJK>
-0x959D	0x5E45	# <CJK>
-0x959E	0x670D	# <CJK>
-0x959F	0x798F	# <CJK>
-0x95A0	0x8179	# <CJK>
-0x95A1	0x8907	# <CJK>
-0x95A2	0x8986	# <CJK>
-0x95A3	0x6DF5	# <CJK>
-0x95A4	0x5F17	# <CJK>
-0x95A5	0x6255	# <CJK>
-0x95A6	0x6CB8	# <CJK>
-0x95A7	0x4ECF	# <CJK>
-0x95A8	0x7269	# <CJK>
-0x95A9	0x9B92	# <CJK>
-0x95AA	0x5206	# <CJK>
-0x95AB	0x543B	# <CJK>
-0x95AC	0x5674	# <CJK>
-0x95AD	0x58B3	# <CJK>
-0x95AE	0x61A4	# <CJK>
-0x95AF	0x626E	# <CJK>
-0x95B0	0x711A	# <CJK>
-0x95B1	0x596E	# <CJK>
-0x95B2	0x7C89	# <CJK>
-0x95B3	0x7CDE	# <CJK>
-0x95B4	0x7D1B	# <CJK>
-0x95B5	0x96F0	# <CJK>
-0x95B6	0x6587	# <CJK>
-0x95B7	0x805E	# <CJK>
-0x95B8	0x4E19	# <CJK>
-0x95B9	0x4F75	# <CJK>
-0x95BA	0x5175	# <CJK>
-0x95BB	0x5840	# <CJK>
-0x95BC	0x5E63	# <CJK>
-0x95BD	0x5E73	# <CJK>
-0x95BE	0x5F0A	# <CJK>
-0x95BF	0x67C4	# <CJK>
-0x95C0	0x4E26	# <CJK>
-0x95C1	0x853D	# <CJK>
-0x95C2	0x9589	# <CJK>
-0x95C3	0x965B	# <CJK>
-0x95C4	0x7C73	# <CJK>
-0x95C5	0x9801	# <CJK>
-0x95C6	0x50FB	# <CJK>
-0x95C7	0x58C1	# <CJK>
-0x95C8	0x7656	# <CJK>
-0x95C9	0x78A7	# <CJK>
-0x95CA	0x5225	# <CJK>
-0x95CB	0x77A5	# <CJK>
-0x95CC	0x8511	# <CJK>
-0x95CD	0x7B86	# <CJK>
-0x95CE	0x504F	# <CJK>
-0x95CF	0x5909	# <CJK>
-0x95D0	0x7247	# <CJK>
-0x95D1	0x7BC7	# <CJK>
-0x95D2	0x7DE8	# <CJK>
-0x95D3	0x8FBA	# <CJK>
-0x95D4	0x8FD4	# <CJK>
-0x95D5	0x904D	# <CJK>
-0x95D6	0x4FBF	# <CJK>
-0x95D7	0x52C9	# <CJK>
-0x95D8	0x5A29	# <CJK>
-0x95D9	0x5F01	# <CJK>
-0x95DA	0x97AD	# <CJK>
-0x95DB	0x4FDD	# <CJK>
-0x95DC	0x8217	# <CJK>
-0x95DD	0x92EA	# <CJK>
-0x95DE	0x5703	# <CJK>
-0x95DF	0x6355	# <CJK>
-0x95E0	0x6B69	# <CJK>
-0x95E1	0x752B	# <CJK>
-0x95E2	0x88DC	# <CJK>
-0x95E3	0x8F14	# <CJK>
-0x95E4	0x7A42	# <CJK>
-0x95E5	0x52DF	# <CJK>
-0x95E6	0x5893	# <CJK>
-0x95E7	0x6155	# <CJK>
-0x95E8	0x620A	# <CJK>
-0x95E9	0x66AE	# <CJK>
-0x95EA	0x6BCD	# <CJK>
-0x95EB	0x7C3F	# <CJK>
-0x95EC	0x83E9	# <CJK>
-0x95ED	0x5023	# <CJK>
-0x95EE	0x4FF8	# <CJK>
-0x95EF	0x5305	# <CJK>
-0x95F0	0x5446	# <CJK>
-0x95F1	0x5831	# <CJK>
-0x95F2	0x5949	# <CJK>
-0x95F3	0x5B9D	# <CJK>
-0x95F4	0x5CF0	# <CJK>
-0x95F5	0x5CEF	# <CJK>
-0x95F6	0x5D29	# <CJK>
-0x95F7	0x5E96	# <CJK>
-0x95F8	0x62B1	# <CJK>
-0x95F9	0x6367	# <CJK>
-0x95FA	0x653E	# <CJK>
-0x95FB	0x65B9	# <CJK>
-0x95FC	0x670B	# <CJK>
-0x9640	0x6CD5	# <CJK>
-0x9641	0x6CE1	# <CJK>
-0x9642	0x70F9	# <CJK>
-0x9643	0x7832	# <CJK>
-0x9644	0x7E2B	# <CJK>
-0x9645	0x80DE	# <CJK>
-0x9646	0x82B3	# <CJK>
-0x9647	0x840C	# <CJK>
-0x9648	0x84EC	# <CJK>
-0x9649	0x8702	# <CJK>
-0x964A	0x8912	# <CJK>
-0x964B	0x8A2A	# <CJK>
-0x964C	0x8C4A	# <CJK>
-0x964D	0x90A6	# <CJK>
-0x964E	0x92D2	# <CJK>
-0x964F	0x98FD	# <CJK>
-0x9650	0x9CF3	# <CJK>
-0x9651	0x9D6C	# <CJK>
-0x9652	0x4E4F	# <CJK>
-0x9653	0x4EA1	# <CJK>
-0x9654	0x508D	# <CJK>
-0x9655	0x5256	# <CJK>
-0x9656	0x574A	# <CJK>
-0x9657	0x59A8	# <CJK>
-0x9658	0x5E3D	# <CJK>
-0x9659	0x5FD8	# <CJK>
-0x965A	0x5FD9	# <CJK>
-0x965B	0x623F	# <CJK>
-0x965C	0x66B4	# <CJK>
-0x965D	0x671B	# <CJK>
-0x965E	0x67D0	# <CJK>
-0x965F	0x68D2	# <CJK>
-0x9660	0x5192	# <CJK>
-0x9661	0x7D21	# <CJK>
-0x9662	0x80AA	# <CJK>
-0x9663	0x81A8	# <CJK>
-0x9664	0x8B00	# <CJK>
-0x9665	0x8C8C	# <CJK>
-0x9666	0x8CBF	# <CJK>
-0x9667	0x927E	# <CJK>
-0x9668	0x9632	# <CJK>
-0x9669	0x5420	# <CJK>
-0x966A	0x982C	# <CJK>
-0x966B	0x5317	# <CJK>
-0x966C	0x50D5	# <CJK>
-0x966D	0x535C	# <CJK>
-0x966E	0x58A8	# <CJK>
-0x966F	0x64B2	# <CJK>
-0x9670	0x6734	# <CJK>
-0x9671	0x7267	# <CJK>
-0x9672	0x7766	# <CJK>
-0x9673	0x7A46	# <CJK>
-0x9674	0x91E6	# <CJK>
-0x9675	0x52C3	# <CJK>
-0x9676	0x6CA1	# <CJK>
-0x9677	0x6B86	# <CJK>
-0x9678	0x5800	# <CJK>
-0x9679	0x5E4C	# <CJK>
-0x967A	0x5954	# <CJK>
-0x967B	0x672C	# <CJK>
-0x967C	0x7FFB	# <CJK>
-0x967D	0x51E1	# <CJK>
-0x967E	0x76C6	# <CJK>
-0x9680	0x6469	# <CJK>
-0x9681	0x78E8	# <CJK>
-0x9682	0x9B54	# <CJK>
-0x9683	0x9EBB	# <CJK>
-0x9684	0x57CB	# <CJK>
-0x9685	0x59B9	# <CJK>
-0x9686	0x6627	# <CJK>
-0x9687	0x679A	# <CJK>
-0x9688	0x6BCE	# <CJK>
-0x9689	0x54E9	# <CJK>
-0x968A	0x69D9	# <CJK>
-0x968B	0x5E55	# <CJK>
-0x968C	0x819C	# <CJK>
-0x968D	0x6795	# <CJK>
-0x968E	0x9BAA	# <CJK>
-0x968F	0x67FE	# <CJK>
-0x9690	0x9C52	# <CJK>
-0x9691	0x685D	# <CJK>
-0x9692	0x4EA6	# <CJK>
-0x9693	0x4FE3	# <CJK>
-0x9694	0x53C8	# <CJK>
-0x9695	0x62B9	# <CJK>
-0x9696	0x672B	# <CJK>
-0x9697	0x6CAB	# <CJK>
-0x9698	0x8FC4	# <CJK>
-0x9699	0x4FAD	# <CJK>
-0x969A	0x7E6D	# <CJK>
-0x969B	0x9EBF	# <CJK>
-0x969C	0x4E07	# <CJK>
-0x969D	0x6162	# <CJK>
-0x969E	0x6E80	# <CJK>
-0x969F	0x6F2B	# <CJK>
-0x96A0	0x8513	# <CJK>
-0x96A1	0x5473	# <CJK>
-0x96A2	0x672A	# <CJK>
-0x96A3	0x9B45	# <CJK>
-0x96A4	0x5DF3	# <CJK>
-0x96A5	0x7B95	# <CJK>
-0x96A6	0x5CAC	# <CJK>
-0x96A7	0x5BC6	# <CJK>
-0x96A8	0x871C	# <CJK>
-0x96A9	0x6E4A	# <CJK>
-0x96AA	0x84D1	# <CJK>
-0x96AB	0x7A14	# <CJK>
-0x96AC	0x8108	# <CJK>
-0x96AD	0x5999	# <CJK>
-0x96AE	0x7C8D	# <CJK>
-0x96AF	0x6C11	# <CJK>
-0x96B0	0x7720	# <CJK>
-0x96B1	0x52D9	# <CJK>
-0x96B2	0x5922	# <CJK>
-0x96B3	0x7121	# <CJK>
-0x96B4	0x725F	# <CJK>
-0x96B5	0x77DB	# <CJK>
-0x96B6	0x9727	# <CJK>
-0x96B7	0x9D61	# <CJK>
-0x96B8	0x690B	# <CJK>
-0x96B9	0x5A7F	# <CJK>
-0x96BA	0x5A18	# <CJK>
-0x96BB	0x51A5	# <CJK>
-0x96BC	0x540D	# <CJK>
-0x96BD	0x547D	# <CJK>
-0x96BE	0x660E	# <CJK>
-0x96BF	0x76DF	# <CJK>
-0x96C0	0x8FF7	# <CJK>
-0x96C1	0x9298	# <CJK>
-0x96C2	0x9CF4	# <CJK>
-0x96C3	0x59EA	# <CJK>
-0x96C4	0x725D	# <CJK>
-0x96C5	0x6EC5	# <CJK>
-0x96C6	0x514D	# <CJK>
-0x96C7	0x68C9	# <CJK>
-0x96C8	0x7DBF	# <CJK>
-0x96C9	0x7DEC	# <CJK>
-0x96CA	0x9762	# <CJK>
-0x96CB	0x9EBA	# <CJK>
-0x96CC	0x6478	# <CJK>
-0x96CD	0x6A21	# <CJK>
-0x96CE	0x8302	# <CJK>
-0x96CF	0x5984	# <CJK>
-0x96D0	0x5B5F	# <CJK>
-0x96D1	0x6BDB	# <CJK>
-0x96D2	0x731B	# <CJK>
-0x96D3	0x76F2	# <CJK>
-0x96D4	0x7DB2	# <CJK>
-0x96D5	0x8017	# <CJK>
-0x96D6	0x8499	# <CJK>
-0x96D7	0x5132	# <CJK>
-0x96D8	0x6728	# <CJK>
-0x96D9	0x9ED9	# <CJK>
-0x96DA	0x76EE	# <CJK>
-0x96DB	0x6762	# <CJK>
-0x96DC	0x52FF	# <CJK>
-0x96DD	0x9905	# <CJK>
-0x96DE	0x5C24	# <CJK>
-0x96DF	0x623B	# <CJK>
-0x96E0	0x7C7E	# <CJK>
-0x96E1	0x8CB0	# <CJK>
-0x96E2	0x554F	# <CJK>
-0x96E3	0x60B6	# <CJK>
-0x96E4	0x7D0B	# <CJK>
-0x96E5	0x9580	# <CJK>
-0x96E6	0x5301	# <CJK>
-0x96E7	0x4E5F	# <CJK>
-0x96E8	0x51B6	# <CJK>
-0x96E9	0x591C	# <CJK>
-0x96EA	0x723A	# <CJK>
-0x96EB	0x8036	# <CJK>
-0x96EC	0x91CE	# <CJK>
-0x96ED	0x5F25	# <CJK>
-0x96EE	0x77E2	# <CJK>
-0x96EF	0x5384	# <CJK>
-0x96F0	0x5F79	# <CJK>
-0x96F1	0x7D04	# <CJK>
-0x96F2	0x85AC	# <CJK>
-0x96F3	0x8A33	# <CJK>
-0x96F4	0x8E8D	# <CJK>
-0x96F5	0x9756	# <CJK>
-0x96F6	0x67F3	# <CJK>
-0x96F7	0x85AE	# <CJK>
-0x96F8	0x9453	# <CJK>
-0x96F9	0x6109	# <CJK>
-0x96FA	0x6108	# <CJK>
-0x96FB	0x6CB9	# <CJK>
-0x96FC	0x7652	# <CJK>
-0x96FF	0xFF5E	# <CJK>
-0x9740	0x8AED	# <CJK>
-0x9741	0x8F38	# <CJK>
-0x9742	0x552F	# <CJK>
-0x9743	0x4F51	# <CJK>
-0x9744	0x512A	# <CJK>
-0x9745	0x52C7	# <CJK>
-0x9746	0x53CB	# <CJK>
-0x9747	0x5BA5	# <CJK>
-0x9748	0x5E7D	# <CJK>
-0x9749	0x60A0	# <CJK>
-0x974A	0x6182	# <CJK>
-0x974B	0x63D6	# <CJK>
-0x974C	0x6709	# <CJK>
-0x974D	0x67DA	# <CJK>
-0x974E	0x6E67	# <CJK>
-0x974F	0x6D8C	# <CJK>
-0x9750	0x7336	# <CJK>
-0x9751	0x7337	# <CJK>
-0x9752	0x7531	# <CJK>
-0x9753	0x7950	# <CJK>
-0x9754	0x88D5	# <CJK>
-0x9755	0x8A98	# <CJK>
-0x9756	0x904A	# <CJK>
-0x9757	0x9091	# <CJK>
-0x9758	0x90F5	# <CJK>
-0x9759	0x96C4	# <CJK>
-0x975A	0x878D	# <CJK>
-0x975B	0x5915	# <CJK>
-0x975C	0x4E88	# <CJK>
-0x975D	0x4F59	# <CJK>
-0x975E	0x4E0E	# <CJK>
-0x975F	0x8A89	# <CJK>
-0x9760	0x8F3F	# <CJK>
-0x9761	0x9810	# <CJK>
-0x9762	0x50AD	# <CJK>
-0x9763	0x5E7C	# <CJK>
-0x9764	0x5996	# <CJK>
-0x9765	0x5BB9	# <CJK>
-0x9766	0x5EB8	# <CJK>
-0x9767	0x63DA	# <CJK>
-0x9768	0x63FA	# <CJK>
-0x9769	0x64C1	# <CJK>
-0x976A	0x66DC	# <CJK>
-0x976B	0x694A	# <CJK>
-0x976C	0x69D8	# <CJK>
-0x976D	0x6D0B	# <CJK>
-0x976E	0x6EB6	# <CJK>
-0x976F	0x7194	# <CJK>
-0x9770	0x7528	# <CJK>
-0x9771	0x7AAF	# <CJK>
-0x9772	0x7F8A	# <CJK>
-0x9773	0x8000	# <CJK>
-0x9774	0x8449	# <CJK>
-0x9775	0x84C9	# <CJK>
-0x9776	0x8981	# <CJK>
-0x9777	0x8B21	# <CJK>
-0x9778	0x8E0A	# <CJK>
-0x9779	0x9065	# <CJK>
-0x977A	0x967D	# <CJK>
-0x977B	0x990A	# <CJK>
-0x977C	0x617E	# <CJK>
-0x977D	0x6291	# <CJK>
-0x977E	0x6B32	# <CJK>
-0x9780	0x6C83	# <CJK>
-0x9781	0x6D74	# <CJK>
-0x9782	0x7FCC	# <CJK>
-0x9783	0x7FFC	# <CJK>
-0x9784	0x6DC0	# <CJK>
-0x9785	0x7F85	# <CJK>
-0x9786	0x87BA	# <CJK>
-0x9787	0x88F8	# <CJK>
-0x9788	0x6765	# <CJK>
-0x9789	0x83B1	# <CJK>
-0x978A	0x983C	# <CJK>
-0x978B	0x96F7	# <CJK>
-0x978C	0x6D1B	# <CJK>
-0x978D	0x7D61	# <CJK>
-0x978E	0x843D	# <CJK>
-0x978F	0x916A	# <CJK>
-0x9790	0x4E71	# <CJK>
-0x9791	0x5375	# <CJK>
-0x9792	0x5D50	# <CJK>
-0x9793	0x6B04	# <CJK>
-0x9794	0x6FEB	# <CJK>
-0x9795	0x85CD	# <CJK>
-0x9796	0x862D	# <CJK>
-0x9797	0x89A7	# <CJK>
-0x9798	0x5229	# <CJK>
-0x9799	0x540F	# <CJK>
-0x979A	0x5C65	# <CJK>
-0x979B	0x674E	# <CJK>
-0x979C	0x68A8	# <CJK>
-0x979D	0x7406	# <CJK>
-0x979E	0x7483	# <CJK>
-0x979F	0x75E2	# <CJK>
-0x97A0	0x88CF	# <CJK>
-0x97A1	0x88E1	# <CJK>
-0x97A2	0x91CC	# <CJK>
-0x97A3	0x96E2	# <CJK>
-0x97A4	0x9678	# <CJK>
-0x97A5	0x5F8B	# <CJK>
-0x97A6	0x7387	# <CJK>
-0x97A7	0x7ACB	# <CJK>
-0x97A8	0x844E	# <CJK>
-0x97A9	0x63A0	# <CJK>
-0x97AA	0x7565	# <CJK>
-0x97AB	0x5289	# <CJK>
-0x97AC	0x6D41	# <CJK>
-0x97AD	0x6E9C	# <CJK>
-0x97AE	0x7409	# <CJK>
-0x97AF	0x7559	# <CJK>
-0x97B0	0x786B	# <CJK>
-0x97B1	0x7C92	# <CJK>
-0x97B2	0x9686	# <CJK>
-0x97B3	0x7ADC	# <CJK>
-0x97B4	0x9F8D	# <CJK>
-0x97B5	0x4FB6	# <CJK>
-0x97B6	0x616E	# <CJK>
-0x97B7	0x65C5	# <CJK>
-0x97B8	0x865C	# <CJK>
-0x97B9	0x4E86	# <CJK>
-0x97BA	0x4EAE	# <CJK>
-0x97BB	0x50DA	# <CJK>
-0x97BC	0x4E21	# <CJK>
-0x97BD	0x51CC	# <CJK>
-0x97BE	0x5BEE	# <CJK>
-0x97BF	0x6599	# <CJK>
-0x97C0	0x6881	# <CJK>
-0x97C1	0x6DBC	# <CJK>
-0x97C2	0x731F	# <CJK>
-0x97C3	0x7642	# <CJK>
-0x97C4	0x77AD	# <CJK>
-0x97C5	0x7A1C	# <CJK>
-0x97C6	0x7CE7	# <CJK>
-0x97C7	0x826F	# <CJK>
-0x97C8	0x8AD2	# <CJK>
-0x97C9	0x907C	# <CJK>
-0x97CA	0x91CF	# <CJK>
-0x97CB	0x9675	# <CJK>
-0x97CC	0x9818	# <CJK>
-0x97CD	0x529B	# <CJK>
-0x97CE	0x7DD1	# <CJK>
-0x97CF	0x502B	# <CJK>
-0x97D0	0x5398	# <CJK>
-0x97D1	0x6797	# <CJK>
-0x97D2	0x6DCB	# <CJK>
-0x97D3	0x71D0	# <CJK>
-0x97D4	0x7433	# <CJK>
-0x97D5	0x81E8	# <CJK>
-0x97D6	0x8F2A	# <CJK>
-0x97D7	0x96A3	# <CJK>
-0x97D8	0x9C57	# <CJK>
-0x97D9	0x9E9F	# <CJK>
-0x97DA	0x7460	# <CJK>
-0x97DB	0x5841	# <CJK>
-0x97DC	0x6D99	# <CJK>
-0x97DD	0x7D2F	# <CJK>
-0x97DE	0x985E	# <CJK>
-0x97DF	0x4EE4	# <CJK>
-0x97E0	0x4F36	# <CJK>
-0x97E1	0x4F8B	# <CJK>
-0x97E2	0x51B7	# <CJK>
-0x97E3	0x52B1	# <CJK>
-0x97E4	0x5DBA	# <CJK>
-0x97E5	0x601C	# <CJK>
-0x97E6	0x73B2	# <CJK>
-0x97E7	0x793C	# <CJK>
-0x97E8	0x82D3	# <CJK>
-0x97E9	0x9234	# <CJK>
-0x97EA	0x96B7	# <CJK>
-0x97EB	0x96F6	# <CJK>
-0x97EC	0x970A	# <CJK>
-0x97ED	0x9E97	# <CJK>
-0x97EE	0x9F62	# <CJK>
-0x97EF	0x66A6	# <CJK>
-0x97F0	0x6B74	# <CJK>
-0x97F1	0x5217	# <CJK>
-0x97F2	0x52A3	# <CJK>
-0x97F3	0x70C8	# <CJK>
-0x97F4	0x88C2	# <CJK>
-0x97F5	0x5EC9	# <CJK>
-0x97F6	0x604B	# <CJK>
-0x97F7	0x6190	# <CJK>
-0x97F8	0x6F23	# <CJK>
-0x97F9	0x7149	# <CJK>
-0x97FA	0x7C3E	# <CJK>
-0x97FB	0x7DF4	# <CJK>
-0x97FC	0x806F	# <CJK>
-0x9840	0x84EE	# <CJK>
-0x9841	0x9023	# <CJK>
-0x9842	0x932C	# <CJK>
-0x9843	0x5442	# <CJK>
-0x9844	0x9B6F	# <CJK>
-0x9845	0x6AD3	# <CJK>
-0x9846	0x7089	# <CJK>
-0x9847	0x8CC2	# <CJK>
-0x9848	0x8DEF	# <CJK>
-0x9849	0x9732	# <CJK>
-0x984A	0x52B4	# <CJK>
-0x984B	0x5A41	# <CJK>
-0x984C	0x5ECA	# <CJK>
-0x984D	0x5F04	# <CJK>
-0x984E	0x6717	# <CJK>
-0x984F	0x697C	# <CJK>
-0x9850	0x6994	# <CJK>
-0x9851	0x6D6A	# <CJK>
-0x9852	0x6F0F	# <CJK>
-0x9853	0x7262	# <CJK>
-0x9854	0x72FC	# <CJK>
-0x9855	0x7BED	# <CJK>
-0x9856	0x8001	# <CJK>
-0x9857	0x807E	# <CJK>
-0x9858	0x874B	# <CJK>
-0x9859	0x90CE	# <CJK>
-0x985A	0x516D	# <CJK>
-0x985B	0x9E93	# <CJK>
-0x985C	0x7984	# <CJK>
-0x985D	0x808B	# <CJK>
-0x985E	0x9332	# <CJK>
-0x985F	0x8AD6	# <CJK>
-0x9860	0x502D	# <CJK>
-0x9861	0x548C	# <CJK>
-0x9862	0x8A71	# <CJK>
-0x9863	0x6B6A	# <CJK>
-0x9864	0x8CC4	# <CJK>
-0x9865	0x8107	# <CJK>
-0x9866	0x60D1	# <CJK>
-0x9867	0x67A0	# <CJK>
-0x9868	0x9DF2	# <CJK>
-0x9869	0x4E99	# <CJK>
-0x986A	0x4E98	# <CJK>
-0x986B	0x9C10	# <CJK>
-0x986C	0x8A6B	# <CJK>
-0x986D	0x85C1	# <CJK>
-0x986E	0x8568	# <CJK>
-0x986F	0x6900	# <CJK>
-0x9870	0x6E7E	# <CJK>
-0x9871	0x7897	# <CJK>
-0x9872	0x8155	# <CJK>
-0x989F	0x5F0C	# <CJK>
-0x98A0	0x4E10	# <CJK>
-0x98A1	0x4E15	# <CJK>
-0x98A2	0x4E2A	# <CJK>
-0x98A3	0x4E31	# <CJK>
-0x98A4	0x4E36	# <CJK>
-0x98A5	0x4E3C	# <CJK>
-0x98A6	0x4E3F	# <CJK>
-0x98A7	0x4E42	# <CJK>
-0x98A8	0x4E56	# <CJK>
-0x98A9	0x4E58	# <CJK>
-0x98AA	0x4E82	# <CJK>
-0x98AB	0x4E85	# <CJK>
-0x98AC	0x8C6B	# <CJK>
-0x98AD	0x4E8A	# <CJK>
-0x98AE	0x8212	# <CJK>
-0x98AF	0x5F0D	# <CJK>
-0x98B0	0x4E8E	# <CJK>
-0x98B1	0x4E9E	# <CJK>
-0x98B2	0x4E9F	# <CJK>
-0x98B3	0x4EA0	# <CJK>
-0x98B4	0x4EA2	# <CJK>
-0x98B5	0x4EB0	# <CJK>
-0x98B6	0x4EB3	# <CJK>
-0x98B7	0x4EB6	# <CJK>
-0x98B8	0x4ECE	# <CJK>
-0x98B9	0x4ECD	# <CJK>
-0x98BA	0x4EC4	# <CJK>
-0x98BB	0x4EC6	# <CJK>
-0x98BC	0x4EC2	# <CJK>
-0x98BD	0x4ED7	# <CJK>
-0x98BE	0x4EDE	# <CJK>
-0x98BF	0x4EED	# <CJK>
-0x98C0	0x4EDF	# <CJK>
-0x98C1	0x4EF7	# <CJK>
-0x98C2	0x4F09	# <CJK>
-0x98C3	0x4F5A	# <CJK>
-0x98C4	0x4F30	# <CJK>
-0x98C5	0x4F5B	# <CJK>
-0x98C6	0x4F5D	# <CJK>
-0x98C7	0x4F57	# <CJK>
-0x98C8	0x4F47	# <CJK>
-0x98C9	0x4F76	# <CJK>
-0x98CA	0x4F88	# <CJK>
-0x98CB	0x4F8F	# <CJK>
-0x98CC	0x4F98	# <CJK>
-0x98CD	0x4F7B	# <CJK>
-0x98CE	0x4F69	# <CJK>
-0x98CF	0x4F70	# <CJK>
-0x98D0	0x4F91	# <CJK>
-0x98D1	0x4F6F	# <CJK>
-0x98D2	0x4F86	# <CJK>
-0x98D3	0x4F96	# <CJK>
-0x98D4	0x5118	# <CJK>
-0x98D5	0x4FD4	# <CJK>
-0x98D6	0x4FDF	# <CJK>
-0x98D7	0x4FCE	# <CJK>
-0x98D8	0x4FD8	# <CJK>
-0x98D9	0x4FDB	# <CJK>
-0x98DA	0x4FD1	# <CJK>
-0x98DB	0x4FDA	# <CJK>
-0x98DC	0x4FD0	# <CJK>
-0x98DD	0x4FE4	# <CJK>
-0x98DE	0x4FE5	# <CJK>
-0x98DF	0x501A	# <CJK>
-0x98E0	0x5028	# <CJK>
-0x98E1	0x5014	# <CJK>
-0x98E2	0x502A	# <CJK>
-0x98E3	0x5025	# <CJK>
-0x98E4	0x5005	# <CJK>
-0x98E5	0x4F1C	# <CJK>
-0x98E6	0x4FF6	# <CJK>
-0x98E7	0x5021	# <CJK>
-0x98E8	0x5029	# <CJK>
-0x98E9	0x502C	# <CJK>
-0x98EA	0x4FFE	# <CJK>
-0x98EB	0x4FEF	# <CJK>
-0x98EC	0x5011	# <CJK>
-0x98ED	0x5006	# <CJK>
-0x98EE	0x5043	# <CJK>
-0x98EF	0x5047	# <CJK>
-0x98F0	0x6703	# <CJK>
-0x98F1	0x5055	# <CJK>
-0x98F2	0x5050	# <CJK>
-0x98F3	0x5048	# <CJK>
-0x98F4	0x505A	# <CJK>
-0x98F5	0x5056	# <CJK>
-0x98F6	0x506C	# <CJK>
-0x98F7	0x5078	# <CJK>
-0x98F8	0x5080	# <CJK>
-0x98F9	0x509A	# <CJK>
-0x98FA	0x5085	# <CJK>
-0x98FB	0x50B4	# <CJK>
-0x98FC	0x50B2	# <CJK>
-0x9940	0x50C9	# <CJK>
-0x9941	0x50CA	# <CJK>
-0x9942	0x50B3	# <CJK>
-0x9943	0x50C2	# <CJK>
-0x9944	0x50D6	# <CJK>
-0x9945	0x50DE	# <CJK>
-0x9946	0x50E5	# <CJK>
-0x9947	0x50ED	# <CJK>
-0x9948	0x50E3	# <CJK>
-0x9949	0x50EE	# <CJK>
-0x994A	0x50F9	# <CJK>
-0x994B	0x50F5	# <CJK>
-0x994C	0x5109	# <CJK>
-0x994D	0x5101	# <CJK>
-0x994E	0x5102	# <CJK>
-0x994F	0x5116	# <CJK>
-0x9950	0x5115	# <CJK>
-0x9951	0x5114	# <CJK>
-0x9952	0x511A	# <CJK>
-0x9953	0x5121	# <CJK>
-0x9954	0x513A	# <CJK>
-0x9955	0x5137	# <CJK>
-0x9956	0x513C	# <CJK>
-0x9957	0x513B	# <CJK>
-0x9958	0x513F	# <CJK>
-0x9959	0x5140	# <CJK>
-0x995A	0x5152	# <CJK>
-0x995B	0x514C	# <CJK>
-0x995C	0x5154	# <CJK>
-0x995D	0x5162	# <CJK>
-0x995E	0x7AF8	# <CJK>
-0x995F	0x5169	# <CJK>
-0x9960	0x516A	# <CJK>
-0x9961	0x516E	# <CJK>
-0x9962	0x5180	# <CJK>
-0x9963	0x5182	# <CJK>
-0x9964	0x56D8	# <CJK>
-0x9965	0x518C	# <CJK>
-0x9966	0x5189	# <CJK>
-0x9967	0x518F	# <CJK>
-0x9968	0x5191	# <CJK>
-0x9969	0x5193	# <CJK>
-0x996A	0x5195	# <CJK>
-0x996B	0x5196	# <CJK>
-0x996C	0x51A4	# <CJK>
-0x996D	0x51A6	# <CJK>
-0x996E	0x51A2	# <CJK>
-0x996F	0x51A9	# <CJK>
-0x9970	0x51AA	# <CJK>
-0x9971	0x51AB	# <CJK>
-0x9972	0x51B3	# <CJK>
-0x9973	0x51B1	# <CJK>
-0x9974	0x51B2	# <CJK>
-0x9975	0x51B0	# <CJK>
-0x9976	0x51B5	# <CJK>
-0x9977	0x51BD	# <CJK>
-0x9978	0x51C5	# <CJK>
-0x9979	0x51C9	# <CJK>
-0x997A	0x51DB	# <CJK>
-0x997B	0x51E0	# <CJK>
-0x997C	0x8655	# <CJK>
-0x997D	0x51E9	# <CJK>
-0x997E	0x51ED	# <CJK>
-0x9980	0x51F0	# <CJK>
-0x9981	0x51F5	# <CJK>
-0x9982	0x51FE	# <CJK>
-0x9983	0x5204	# <CJK>
-0x9984	0x520B	# <CJK>
-0x9985	0x5214	# <CJK>
-0x9986	0x520E	# <CJK>
-0x9987	0x5227	# <CJK>
-0x9988	0x522A	# <CJK>
-0x9989	0x522E	# <CJK>
-0x998A	0x5233	# <CJK>
-0x998B	0x5239	# <CJK>
-0x998C	0x524F	# <CJK>
-0x998D	0x5244	# <CJK>
-0x998E	0x524B	# <CJK>
-0x998F	0x524C	# <CJK>
-0x9990	0x525E	# <CJK>
-0x9991	0x5254	# <CJK>
-0x9992	0x526A	# <CJK>
-0x9993	0x5274	# <CJK>
-0x9994	0x5269	# <CJK>
-0x9995	0x5273	# <CJK>
-0x9996	0x527F	# <CJK>
-0x9997	0x527D	# <CJK>
-0x9998	0x528D	# <CJK>
-0x9999	0x5294	# <CJK>
-0x999A	0x5292	# <CJK>
-0x999B	0x5271	# <CJK>
-0x999C	0x5288	# <CJK>
-0x999D	0x5291	# <CJK>
-0x999E	0x8FA8	# <CJK>
-0x999F	0x8FA7	# <CJK>
-0x99A0	0x52AC	# <CJK>
-0x99A1	0x52AD	# <CJK>
-0x99A2	0x52BC	# <CJK>
-0x99A3	0x52B5	# <CJK>
-0x99A4	0x52C1	# <CJK>
-0x99A5	0x52CD	# <CJK>
-0x99A6	0x52D7	# <CJK>
-0x99A7	0x52DE	# <CJK>
-0x99A8	0x52E3	# <CJK>
-0x99A9	0x52E6	# <CJK>
-0x99AA	0x98ED	# <CJK>
-0x99AB	0x52E0	# <CJK>
-0x99AC	0x52F3	# <CJK>
-0x99AD	0x52F5	# <CJK>
-0x99AE	0x52F8	# <CJK>
-0x99AF	0x52F9	# <CJK>
-0x99B0	0x5306	# <CJK>
-0x99B1	0x5308	# <CJK>
-0x99B2	0x7538	# <CJK>
-0x99B3	0x530D	# <CJK>
-0x99B4	0x5310	# <CJK>
-0x99B5	0x530F	# <CJK>
-0x99B6	0x5315	# <CJK>
-0x99B7	0x531A	# <CJK>
-0x99B8	0x5323	# <CJK>
-0x99B9	0x532F	# <CJK>
-0x99BA	0x5331	# <CJK>
-0x99BB	0x5333	# <CJK>
-0x99BC	0x5338	# <CJK>
-0x99BD	0x5340	# <CJK>
-0x99BE	0x5346	# <CJK>
-0x99BF	0x5345	# <CJK>
-0x99C0	0x4E17	# <CJK>
-0x99C1	0x5349	# <CJK>
-0x99C2	0x534D	# <CJK>
-0x99C3	0x51D6	# <CJK>
-0x99C4	0x535E	# <CJK>
-0x99C5	0x5369	# <CJK>
-0x99C6	0x536E	# <CJK>
-0x99C7	0x5918	# <CJK>
-0x99C8	0x537B	# <CJK>
-0x99C9	0x5377	# <CJK>
-0x99CA	0x5382	# <CJK>
-0x99CB	0x5396	# <CJK>
-0x99CC	0x53A0	# <CJK>
-0x99CD	0x53A6	# <CJK>
-0x99CE	0x53A5	# <CJK>
-0x99CF	0x53AE	# <CJK>
-0x99D0	0x53B0	# <CJK>
-0x99D1	0x53B6	# <CJK>
-0x99D2	0x53C3	# <CJK>
-0x99D3	0x7C12	# <CJK>
-0x99D4	0x96D9	# <CJK>
-0x99D5	0x53DF	# <CJK>
-0x99D6	0x66FC	# <CJK>
-0x99D7	0x71EE	# <CJK>
-0x99D8	0x53EE	# <CJK>
-0x99D9	0x53E8	# <CJK>
-0x99DA	0x53ED	# <CJK>
-0x99DB	0x53FA	# <CJK>
-0x99DC	0x5401	# <CJK>
-0x99DD	0x543D	# <CJK>
-0x99DE	0x5440	# <CJK>
-0x99DF	0x542C	# <CJK>
-0x99E0	0x542D	# <CJK>
-0x99E1	0x543C	# <CJK>
-0x99E2	0x542E	# <CJK>
-0x99E3	0x5436	# <CJK>
-0x99E4	0x5429	# <CJK>
-0x99E5	0x541D	# <CJK>
-0x99E6	0x544E	# <CJK>
-0x99E7	0x548F	# <CJK>
-0x99E8	0x5475	# <CJK>
-0x99E9	0x548E	# <CJK>
-0x99EA	0x545F	# <CJK>
-0x99EB	0x5471	# <CJK>
-0x99EC	0x5477	# <CJK>
-0x99ED	0x5470	# <CJK>
-0x99EE	0x5492	# <CJK>
-0x99EF	0x547B	# <CJK>
-0x99F0	0x5480	# <CJK>
-0x99F1	0x5476	# <CJK>
-0x99F2	0x5484	# <CJK>
-0x99F3	0x5490	# <CJK>
-0x99F4	0x5486	# <CJK>
-0x99F5	0x54C7	# <CJK>
-0x99F6	0x54A2	# <CJK>
-0x99F7	0x54B8	# <CJK>
-0x99F8	0x54A5	# <CJK>
-0x99F9	0x54AC	# <CJK>
-0x99FA	0x54C4	# <CJK>
-0x99FB	0x54C8	# <CJK>
-0x99FC	0x54A8	# <CJK>
-0x9A40	0x54AB	# <CJK>
-0x9A41	0x54C2	# <CJK>
-0x9A42	0x54A4	# <CJK>
-0x9A43	0x54BE	# <CJK>
-0x9A44	0x54BC	# <CJK>
-0x9A45	0x54D8	# <CJK>
-0x9A46	0x54E5	# <CJK>
-0x9A47	0x54E6	# <CJK>
-0x9A48	0x550F	# <CJK>
-0x9A49	0x5514	# <CJK>
-0x9A4A	0x54FD	# <CJK>
-0x9A4B	0x54EE	# <CJK>
-0x9A4C	0x54ED	# <CJK>
-0x9A4D	0x54FA	# <CJK>
-0x9A4E	0x54E2	# <CJK>
-0x9A4F	0x5539	# <CJK>
-0x9A50	0x5540	# <CJK>
-0x9A51	0x5563	# <CJK>
-0x9A52	0x554C	# <CJK>
-0x9A53	0x552E	# <CJK>
-0x9A54	0x555C	# <CJK>
-0x9A55	0x5545	# <CJK>
-0x9A56	0x5556	# <CJK>
-0x9A57	0x5557	# <CJK>
-0x9A58	0x5538	# <CJK>
-0x9A59	0x5533	# <CJK>
-0x9A5A	0x555D	# <CJK>
-0x9A5B	0x5599	# <CJK>
-0x9A5C	0x5580	# <CJK>
-0x9A5D	0x54AF	# <CJK>
-0x9A5E	0x558A	# <CJK>
-0x9A5F	0x559F	# <CJK>
-0x9A60	0x557B	# <CJK>
-0x9A61	0x557E	# <CJK>
-0x9A62	0x5598	# <CJK>
-0x9A63	0x559E	# <CJK>
-0x9A64	0x55AE	# <CJK>
-0x9A65	0x557C	# <CJK>
-0x9A66	0x5583	# <CJK>
-0x9A67	0x55A9	# <CJK>
-0x9A68	0x5587	# <CJK>
-0x9A69	0x55A8	# <CJK>
-0x9A6A	0x55DA	# <CJK>
-0x9A6B	0x55C5	# <CJK>
-0x9A6C	0x55DF	# <CJK>
-0x9A6D	0x55C4	# <CJK>
-0x9A6E	0x55DC	# <CJK>
-0x9A6F	0x55E4	# <CJK>
-0x9A70	0x55D4	# <CJK>
-0x9A71	0x5614	# <CJK>
-0x9A72	0x55F7	# <CJK>
-0x9A73	0x5616	# <CJK>
-0x9A74	0x55FE	# <CJK>
-0x9A75	0x55FD	# <CJK>
-0x9A76	0x561B	# <CJK>
-0x9A77	0x55F9	# <CJK>
-0x9A78	0x564E	# <CJK>
-0x9A79	0x5650	# <CJK>
-0x9A7A	0x71DF	# <CJK>
-0x9A7B	0x5634	# <CJK>
-0x9A7C	0x5636	# <CJK>
-0x9A7D	0x5632	# <CJK>
-0x9A7E	0x5638	# <CJK>
-0x9A80	0x566B	# <CJK>
-0x9A81	0x5664	# <CJK>
-0x9A82	0x562F	# <CJK>
-0x9A83	0x566C	# <CJK>
-0x9A84	0x566A	# <CJK>
-0x9A85	0x5686	# <CJK>
-0x9A86	0x5680	# <CJK>
-0x9A87	0x568A	# <CJK>
-0x9A88	0x56A0	# <CJK>
-0x9A89	0x5694	# <CJK>
-0x9A8A	0x568F	# <CJK>
-0x9A8B	0x56A5	# <CJK>
-0x9A8C	0x56AE	# <CJK>
-0x9A8D	0x56B6	# <CJK>
-0x9A8E	0x56B4	# <CJK>
-0x9A8F	0x56C2	# <CJK>
-0x9A90	0x56BC	# <CJK>
-0x9A91	0x56C1	# <CJK>
-0x9A92	0x56C3	# <CJK>
-0x9A93	0x56C0	# <CJK>
-0x9A94	0x56C8	# <CJK>
-0x9A95	0x56CE	# <CJK>
-0x9A96	0x56D1	# <CJK>
-0x9A97	0x56D3	# <CJK>
-0x9A98	0x56D7	# <CJK>
-0x9A99	0x56EE	# <CJK>
-0x9A9A	0x56F9	# <CJK>
-0x9A9B	0x5700	# <CJK>
-0x9A9C	0x56FF	# <CJK>
-0x9A9D	0x5704	# <CJK>
-0x9A9E	0x5709	# <CJK>
-0x9A9F	0x5708	# <CJK>
-0x9AA0	0x570B	# <CJK>
-0x9AA1	0x570D	# <CJK>
-0x9AA2	0x5713	# <CJK>
-0x9AA3	0x5718	# <CJK>
-0x9AA4	0x5716	# <CJK>
-0x9AA5	0x55C7	# <CJK>
-0x9AA6	0x571C	# <CJK>
-0x9AA7	0x5726	# <CJK>
-0x9AA8	0x5737	# <CJK>
-0x9AA9	0x5738	# <CJK>
-0x9AAA	0x574E	# <CJK>
-0x9AAB	0x573B	# <CJK>
-0x9AAC	0x5740	# <CJK>
-0x9AAD	0x574F	# <CJK>
-0x9AAE	0x5769	# <CJK>
-0x9AAF	0x57C0	# <CJK>
-0x9AB0	0x5788	# <CJK>
-0x9AB1	0x5761	# <CJK>
-0x9AB2	0x577F	# <CJK>
-0x9AB3	0x5789	# <CJK>
-0x9AB4	0x5793	# <CJK>
-0x9AB5	0x57A0	# <CJK>
-0x9AB6	0x57B3	# <CJK>
-0x9AB7	0x57A4	# <CJK>
-0x9AB8	0x57AA	# <CJK>
-0x9AB9	0x57B0	# <CJK>
-0x9ABA	0x57C3	# <CJK>
-0x9ABB	0x57C6	# <CJK>
-0x9ABC	0x57D4	# <CJK>
-0x9ABD	0x57D2	# <CJK>
-0x9ABE	0x57D3	# <CJK>
-0x9ABF	0x580A	# <CJK>
-0x9AC0	0x57D6	# <CJK>
-0x9AC1	0x57E3	# <CJK>
-0x9AC2	0x580B	# <CJK>
-0x9AC3	0x5819	# <CJK>
-0x9AC4	0x581D	# <CJK>
-0x9AC5	0x5872	# <CJK>
-0x9AC6	0x5821	# <CJK>
-0x9AC7	0x5862	# <CJK>
-0x9AC8	0x584B	# <CJK>
-0x9AC9	0x5870	# <CJK>
-0x9ACA	0x6BC0	# <CJK>
-0x9ACB	0x5852	# <CJK>
-0x9ACC	0x583D	# <CJK>
-0x9ACD	0x5879	# <CJK>
-0x9ACE	0x5885	# <CJK>
-0x9ACF	0x58B9	# <CJK>
-0x9AD0	0x589F	# <CJK>
-0x9AD1	0x58AB	# <CJK>
-0x9AD2	0x58BA	# <CJK>
-0x9AD3	0x58DE	# <CJK>
-0x9AD4	0x58BB	# <CJK>
-0x9AD5	0x58B8	# <CJK>
-0x9AD6	0x58AE	# <CJK>
-0x9AD7	0x58C5	# <CJK>
-0x9AD8	0x58D3	# <CJK>
-0x9AD9	0x58D1	# <CJK>
-0x9ADA	0x58D7	# <CJK>
-0x9ADB	0x58D9	# <CJK>
-0x9ADC	0x58D8	# <CJK>
-0x9ADD	0x58E5	# <CJK>
-0x9ADE	0x58DC	# <CJK>
-0x9ADF	0x58E4	# <CJK>
-0x9AE0	0x58DF	# <CJK>
-0x9AE1	0x58EF	# <CJK>
-0x9AE2	0x58FA	# <CJK>
-0x9AE3	0x58F9	# <CJK>
-0x9AE4	0x58FB	# <CJK>
-0x9AE5	0x58FC	# <CJK>
-0x9AE6	0x58FD	# <CJK>
-0x9AE7	0x5902	# <CJK>
-0x9AE8	0x590A	# <CJK>
-0x9AE9	0x5910	# <CJK>
-0x9AEA	0x591B	# <CJK>
-0x9AEB	0x68A6	# <CJK>
-0x9AEC	0x5925	# <CJK>
-0x9AED	0x592C	# <CJK>
-0x9AEE	0x592D	# <CJK>
-0x9AEF	0x5932	# <CJK>
-0x9AF0	0x5938	# <CJK>
-0x9AF1	0x593E	# <CJK>
-0x9AF2	0x7AD2	# <CJK>
-0x9AF3	0x5955	# <CJK>
-0x9AF4	0x5950	# <CJK>
-0x9AF5	0x594E	# <CJK>
-0x9AF6	0x595A	# <CJK>
-0x9AF7	0x5958	# <CJK>
-0x9AF8	0x5962	# <CJK>
-0x9AF9	0x5960	# <CJK>
-0x9AFA	0x5967	# <CJK>
-0x9AFB	0x596C	# <CJK>
-0x9AFC	0x5969	# <CJK>
-0x9B40	0x5978	# <CJK>
-0x9B41	0x5981	# <CJK>
-0x9B42	0x599D	# <CJK>
-0x9B43	0x4F5E	# <CJK>
-0x9B44	0x4FAB	# <CJK>
-0x9B45	0x59A3	# <CJK>
-0x9B46	0x59B2	# <CJK>
-0x9B47	0x59C6	# <CJK>
-0x9B48	0x59E8	# <CJK>
-0x9B49	0x59DC	# <CJK>
-0x9B4A	0x598D	# <CJK>
-0x9B4B	0x59D9	# <CJK>
-0x9B4C	0x59DA	# <CJK>
-0x9B4D	0x5A25	# <CJK>
-0x9B4E	0x5A1F	# <CJK>
-0x9B4F	0x5A11	# <CJK>
-0x9B50	0x5A1C	# <CJK>
-0x9B51	0x5A09	# <CJK>
-0x9B52	0x5A1A	# <CJK>
-0x9B53	0x5A40	# <CJK>
-0x9B54	0x5A6C	# <CJK>
-0x9B55	0x5A49	# <CJK>
-0x9B56	0x5A35	# <CJK>
-0x9B57	0x5A36	# <CJK>
-0x9B58	0x5A62	# <CJK>
-0x9B59	0x5A6A	# <CJK>
-0x9B5A	0x5A9A	# <CJK>
-0x9B5B	0x5ABC	# <CJK>
-0x9B5C	0x5ABE	# <CJK>
-0x9B5D	0x5ACB	# <CJK>
-0x9B5E	0x5AC2	# <CJK>
-0x9B5F	0x5ABD	# <CJK>
-0x9B60	0x5AE3	# <CJK>
-0x9B61	0x5AD7	# <CJK>
-0x9B62	0x5AE6	# <CJK>
-0x9B63	0x5AE9	# <CJK>
-0x9B64	0x5AD6	# <CJK>
-0x9B65	0x5AFA	# <CJK>
-0x9B66	0x5AFB	# <CJK>
-0x9B67	0x5B0C	# <CJK>
-0x9B68	0x5B0B	# <CJK>
-0x9B69	0x5B16	# <CJK>
-0x9B6A	0x5B32	# <CJK>
-0x9B6B	0x5AD0	# <CJK>
-0x9B6C	0x5B2A	# <CJK>
-0x9B6D	0x5B36	# <CJK>
-0x9B6E	0x5B3E	# <CJK>
-0x9B6F	0x5B43	# <CJK>
-0x9B70	0x5B45	# <CJK>
-0x9B71	0x5B40	# <CJK>
-0x9B72	0x5B51	# <CJK>
-0x9B73	0x5B55	# <CJK>
-0x9B74	0x5B5A	# <CJK>
-0x9B75	0x5B5B	# <CJK>
-0x9B76	0x5B65	# <CJK>
-0x9B77	0x5B69	# <CJK>
-0x9B78	0x5B70	# <CJK>
-0x9B79	0x5B73	# <CJK>
-0x9B7A	0x5B75	# <CJK>
-0x9B7B	0x5B78	# <CJK>
-0x9B7C	0x6588	# <CJK>
-0x9B7D	0x5B7A	# <CJK>
-0x9B7E	0x5B80	# <CJK>
-0x9B80	0x5B83	# <CJK>
-0x9B81	0x5BA6	# <CJK>
-0x9B82	0x5BB8	# <CJK>
-0x9B83	0x5BC3	# <CJK>
-0x9B84	0x5BC7	# <CJK>
-0x9B85	0x5BC9	# <CJK>
-0x9B86	0x5BD4	# <CJK>
-0x9B87	0x5BD0	# <CJK>
-0x9B88	0x5BE4	# <CJK>
-0x9B89	0x5BE6	# <CJK>
-0x9B8A	0x5BE2	# <CJK>
-0x9B8B	0x5BDE	# <CJK>
-0x9B8C	0x5BE5	# <CJK>
-0x9B8D	0x5BEB	# <CJK>
-0x9B8E	0x5BF0	# <CJK>
-0x9B8F	0x5BF6	# <CJK>
-0x9B90	0x5BF3	# <CJK>
-0x9B91	0x5C05	# <CJK>
-0x9B92	0x5C07	# <CJK>
-0x9B93	0x5C08	# <CJK>
-0x9B94	0x5C0D	# <CJK>
-0x9B95	0x5C13	# <CJK>
-0x9B96	0x5C20	# <CJK>
-0x9B97	0x5C22	# <CJK>
-0x9B98	0x5C28	# <CJK>
-0x9B99	0x5C38	# <CJK>
-0x9B9A	0x5C39	# <CJK>
-0x9B9B	0x5C41	# <CJK>
-0x9B9C	0x5C46	# <CJK>
-0x9B9D	0x5C4E	# <CJK>
-0x9B9E	0x5C53	# <CJK>
-0x9B9F	0x5C50	# <CJK>
-0x9BA0	0x5C4F	# <CJK>
-0x9BA1	0x5B71	# <CJK>
-0x9BA2	0x5C6C	# <CJK>
-0x9BA3	0x5C6E	# <CJK>
-0x9BA4	0x4E62	# <CJK>
-0x9BA5	0x5C76	# <CJK>
-0x9BA6	0x5C79	# <CJK>
-0x9BA7	0x5C8C	# <CJK>
-0x9BA8	0x5C91	# <CJK>
-0x9BA9	0x5C94	# <CJK>
-0x9BAA	0x599B	# <CJK>
-0x9BAB	0x5CAB	# <CJK>
-0x9BAC	0x5CBB	# <CJK>
-0x9BAD	0x5CB6	# <CJK>
-0x9BAE	0x5CBC	# <CJK>
-0x9BAF	0x5CB7	# <CJK>
-0x9BB0	0x5CC5	# <CJK>
-0x9BB1	0x5CBE	# <CJK>
-0x9BB2	0x5CC7	# <CJK>
-0x9BB3	0x5CD9	# <CJK>
-0x9BB4	0x5CE9	# <CJK>
-0x9BB5	0x5CFD	# <CJK>
-0x9BB6	0x5CFA	# <CJK>
-0x9BB7	0x5CED	# <CJK>
-0x9BB8	0x5D8C	# <CJK>
-0x9BB9	0x5CEA	# <CJK>
-0x9BBA	0x5D0B	# <CJK>
-0x9BBB	0x5D15	# <CJK>
-0x9BBC	0x5D17	# <CJK>
-0x9BBD	0x5D5C	# <CJK>
-0x9BBE	0x5D1F	# <CJK>
-0x9BBF	0x5D1B	# <CJK>
-0x9BC0	0x5D11	# <CJK>
-0x9BC1	0x5D14	# <CJK>
-0x9BC2	0x5D22	# <CJK>
-0x9BC3	0x5D1A	# <CJK>
-0x9BC4	0x5D19	# <CJK>
-0x9BC5	0x5D18	# <CJK>
-0x9BC6	0x5D4C	# <CJK>
-0x9BC7	0x5D52	# <CJK>
-0x9BC8	0x5D4E	# <CJK>
-0x9BC9	0x5D4B	# <CJK>
-0x9BCA	0x5D6C	# <CJK>
-0x9BCB	0x5D73	# <CJK>
-0x9BCC	0x5D76	# <CJK>
-0x9BCD	0x5D87	# <CJK>
-0x9BCE	0x5D84	# <CJK>
-0x9BCF	0x5D82	# <CJK>
-0x9BD0	0x5DA2	# <CJK>
-0x9BD1	0x5D9D	# <CJK>
-0x9BD2	0x5DAC	# <CJK>
-0x9BD3	0x5DAE	# <CJK>
-0x9BD4	0x5DBD	# <CJK>
-0x9BD5	0x5D90	# <CJK>
-0x9BD6	0x5DB7	# <CJK>
-0x9BD7	0x5DBC	# <CJK>
-0x9BD8	0x5DC9	# <CJK>
-0x9BD9	0x5DCD	# <CJK>
-0x9BDA	0x5DD3	# <CJK>
-0x9BDB	0x5DD2	# <CJK>
-0x9BDC	0x5DD6	# <CJK>
-0x9BDD	0x5DDB	# <CJK>
-0x9BDE	0x5DEB	# <CJK>
-0x9BDF	0x5DF2	# <CJK>
-0x9BE0	0x5DF5	# <CJK>
-0x9BE1	0x5E0B	# <CJK>
-0x9BE2	0x5E1A	# <CJK>
-0x9BE3	0x5E19	# <CJK>
-0x9BE4	0x5E11	# <CJK>
-0x9BE5	0x5E1B	# <CJK>
-0x9BE6	0x5E36	# <CJK>
-0x9BE7	0x5E37	# <CJK>
-0x9BE8	0x5E44	# <CJK>
-0x9BE9	0x5E43	# <CJK>
-0x9BEA	0x5E40	# <CJK>
-0x9BEB	0x5E4E	# <CJK>
-0x9BEC	0x5E57	# <CJK>
-0x9BED	0x5E54	# <CJK>
-0x9BEE	0x5E5F	# <CJK>
-0x9BEF	0x5E62	# <CJK>
-0x9BF0	0x5E64	# <CJK>
-0x9BF1	0x5E47	# <CJK>
-0x9BF2	0x5E75	# <CJK>
-0x9BF3	0x5E76	# <CJK>
-0x9BF4	0x5E7A	# <CJK>
-0x9BF5	0x9EBC	# <CJK>
-0x9BF6	0x5E7F	# <CJK>
-0x9BF7	0x5EA0	# <CJK>
-0x9BF8	0x5EC1	# <CJK>
-0x9BF9	0x5EC2	# <CJK>
-0x9BFA	0x5EC8	# <CJK>
-0x9BFB	0x5ED0	# <CJK>
-0x9BFC	0x5ECF	# <CJK>
-0x9C40	0x5ED6	# <CJK>
-0x9C41	0x5EE3	# <CJK>
-0x9C42	0x5EDD	# <CJK>
-0x9C43	0x5EDA	# <CJK>
-0x9C44	0x5EDB	# <CJK>
-0x9C45	0x5EE2	# <CJK>
-0x9C46	0x5EE1	# <CJK>
-0x9C47	0x5EE8	# <CJK>
-0x9C48	0x5EE9	# <CJK>
-0x9C49	0x5EEC	# <CJK>
-0x9C4A	0x5EF1	# <CJK>
-0x9C4B	0x5EF3	# <CJK>
-0x9C4C	0x5EF0	# <CJK>
-0x9C4D	0x5EF4	# <CJK>
-0x9C4E	0x5EF8	# <CJK>
-0x9C4F	0x5EFE	# <CJK>
-0x9C50	0x5F03	# <CJK>
-0x9C51	0x5F09	# <CJK>
-0x9C52	0x5F5D	# <CJK>
-0x9C53	0x5F5C	# <CJK>
-0x9C54	0x5F0B	# <CJK>
-0x9C55	0x5F11	# <CJK>
-0x9C56	0x5F16	# <CJK>
-0x9C57	0x5F29	# <CJK>
-0x9C58	0x5F2D	# <CJK>
-0x9C59	0x5F38	# <CJK>
-0x9C5A	0x5F41	# <CJK>
-0x9C5B	0x5F48	# <CJK>
-0x9C5C	0x5F4C	# <CJK>
-0x9C5D	0x5F4E	# <CJK>
-0x9C5E	0x5F2F	# <CJK>
-0x9C5F	0x5F51	# <CJK>
-0x9C60	0x5F56	# <CJK>
-0x9C61	0x5F57	# <CJK>
-0x9C62	0x5F59	# <CJK>
-0x9C63	0x5F61	# <CJK>
-0x9C64	0x5F6D	# <CJK>
-0x9C65	0x5F73	# <CJK>
-0x9C66	0x5F77	# <CJK>
-0x9C67	0x5F83	# <CJK>
-0x9C68	0x5F82	# <CJK>
-0x9C69	0x5F7F	# <CJK>
-0x9C6A	0x5F8A	# <CJK>
-0x9C6B	0x5F88	# <CJK>
-0x9C6C	0x5F91	# <CJK>
-0x9C6D	0x5F87	# <CJK>
-0x9C6E	0x5F9E	# <CJK>
-0x9C6F	0x5F99	# <CJK>
-0x9C70	0x5F98	# <CJK>
-0x9C71	0x5FA0	# <CJK>
-0x9C72	0x5FA8	# <CJK>
-0x9C73	0x5FAD	# <CJK>
-0x9C74	0x5FBC	# <CJK>
-0x9C75	0x5FD6	# <CJK>
-0x9C76	0x5FFB	# <CJK>
-0x9C77	0x5FE4	# <CJK>
-0x9C78	0x5FF8	# <CJK>
-0x9C79	0x5FF1	# <CJK>
-0x9C7A	0x5FDD	# <CJK>
-0x9C7B	0x60B3	# <CJK>
-0x9C7C	0x5FFF	# <CJK>
-0x9C7D	0x6021	# <CJK>
-0x9C7E	0x6060	# <CJK>
-0x9C80	0x6019	# <CJK>
-0x9C81	0x6010	# <CJK>
-0x9C82	0x6029	# <CJK>
-0x9C83	0x600E	# <CJK>
-0x9C84	0x6031	# <CJK>
-0x9C85	0x601B	# <CJK>
-0x9C86	0x6015	# <CJK>
-0x9C87	0x602B	# <CJK>
-0x9C88	0x6026	# <CJK>
-0x9C89	0x600F	# <CJK>
-0x9C8A	0x603A	# <CJK>
-0x9C8B	0x605A	# <CJK>
-0x9C8C	0x6041	# <CJK>
-0x9C8D	0x606A	# <CJK>
-0x9C8E	0x6077	# <CJK>
-0x9C8F	0x605F	# <CJK>
-0x9C90	0x604A	# <CJK>
-0x9C91	0x6046	# <CJK>
-0x9C92	0x604D	# <CJK>
-0x9C93	0x6063	# <CJK>
-0x9C94	0x6043	# <CJK>
-0x9C95	0x6064	# <CJK>
-0x9C96	0x6042	# <CJK>
-0x9C97	0x606C	# <CJK>
-0x9C98	0x606B	# <CJK>
-0x9C99	0x6059	# <CJK>
-0x9C9A	0x6081	# <CJK>
-0x9C9B	0x608D	# <CJK>
-0x9C9C	0x60E7	# <CJK>
-0x9C9D	0x6083	# <CJK>
-0x9C9E	0x609A	# <CJK>
-0x9C9F	0x6084	# <CJK>
-0x9CA0	0x609B	# <CJK>
-0x9CA1	0x6096	# <CJK>
-0x9CA2	0x6097	# <CJK>
-0x9CA3	0x6092	# <CJK>
-0x9CA4	0x60A7	# <CJK>
-0x9CA5	0x608B	# <CJK>
-0x9CA6	0x60E1	# <CJK>
-0x9CA7	0x60B8	# <CJK>
-0x9CA8	0x60E0	# <CJK>
-0x9CA9	0x60D3	# <CJK>
-0x9CAA	0x60B4	# <CJK>
-0x9CAB	0x5FF0	# <CJK>
-0x9CAC	0x60BD	# <CJK>
-0x9CAD	0x60C6	# <CJK>
-0x9CAE	0x60B5	# <CJK>
-0x9CAF	0x60D8	# <CJK>
-0x9CB0	0x614D	# <CJK>
-0x9CB1	0x6115	# <CJK>
-0x9CB2	0x6106	# <CJK>
-0x9CB3	0x60F6	# <CJK>
-0x9CB4	0x60F7	# <CJK>
-0x9CB5	0x6100	# <CJK>
-0x9CB6	0x60F4	# <CJK>
-0x9CB7	0x60FA	# <CJK>
-0x9CB8	0x6103	# <CJK>
-0x9CB9	0x6121	# <CJK>
-0x9CBA	0x60FB	# <CJK>
-0x9CBB	0x60F1	# <CJK>
-0x9CBC	0x610D	# <CJK>
-0x9CBD	0x610E	# <CJK>
-0x9CBE	0x6147	# <CJK>
-0x9CBF	0x613E	# <CJK>
-0x9CC0	0x6128	# <CJK>
-0x9CC1	0x6127	# <CJK>
-0x9CC2	0x614A	# <CJK>
-0x9CC3	0x613F	# <CJK>
-0x9CC4	0x613C	# <CJK>
-0x9CC5	0x612C	# <CJK>
-0x9CC6	0x6134	# <CJK>
-0x9CC7	0x613D	# <CJK>
-0x9CC8	0x6142	# <CJK>
-0x9CC9	0x6144	# <CJK>
-0x9CCA	0x6173	# <CJK>
-0x9CCB	0x6177	# <CJK>
-0x9CCC	0x6158	# <CJK>
-0x9CCD	0x6159	# <CJK>
-0x9CCE	0x615A	# <CJK>
-0x9CCF	0x616B	# <CJK>
-0x9CD0	0x6174	# <CJK>
-0x9CD1	0x616F	# <CJK>
-0x9CD2	0x6165	# <CJK>
-0x9CD3	0x6171	# <CJK>
-0x9CD4	0x615F	# <CJK>
-0x9CD5	0x615D	# <CJK>
-0x9CD6	0x6153	# <CJK>
-0x9CD7	0x6175	# <CJK>
-0x9CD8	0x6199	# <CJK>
-0x9CD9	0x6196	# <CJK>
-0x9CDA	0x6187	# <CJK>
-0x9CDB	0x61AC	# <CJK>
-0x9CDC	0x6194	# <CJK>
-0x9CDD	0x619A	# <CJK>
-0x9CDE	0x618A	# <CJK>
-0x9CDF	0x6191	# <CJK>
-0x9CE0	0x61AB	# <CJK>
-0x9CE1	0x61AE	# <CJK>
-0x9CE2	0x61CC	# <CJK>
-0x9CE3	0x61CA	# <CJK>
-0x9CE4	0x61C9	# <CJK>
-0x9CE5	0x61F7	# <CJK>
-0x9CE6	0x61C8	# <CJK>
-0x9CE7	0x61C3	# <CJK>
-0x9CE8	0x61C6	# <CJK>
-0x9CE9	0x61BA	# <CJK>
-0x9CEA	0x61CB	# <CJK>
-0x9CEB	0x7F79	# <CJK>
-0x9CEC	0x61CD	# <CJK>
-0x9CED	0x61E6	# <CJK>
-0x9CEE	0x61E3	# <CJK>
-0x9CEF	0x61F6	# <CJK>
-0x9CF0	0x61FA	# <CJK>
-0x9CF1	0x61F4	# <CJK>
-0x9CF2	0x61FF	# <CJK>
-0x9CF3	0x61FD	# <CJK>
-0x9CF4	0x61FC	# <CJK>
-0x9CF5	0x61FE	# <CJK>
-0x9CF6	0x6200	# <CJK>
-0x9CF7	0x6208	# <CJK>
-0x9CF8	0x6209	# <CJK>
-0x9CF9	0x620D	# <CJK>
-0x9CFA	0x620C	# <CJK>
-0x9CFB	0x6214	# <CJK>
-0x9CFC	0x621B	# <CJK>
-0x9D40	0x621E	# <CJK>
-0x9D41	0x6221	# <CJK>
-0x9D42	0x622A	# <CJK>
-0x9D43	0x622E	# <CJK>
-0x9D44	0x6230	# <CJK>
-0x9D45	0x6232	# <CJK>
-0x9D46	0x6233	# <CJK>
-0x9D47	0x6241	# <CJK>
-0x9D48	0x624E	# <CJK>
-0x9D49	0x625E	# <CJK>
-0x9D4A	0x6263	# <CJK>
-0x9D4B	0x625B	# <CJK>
-0x9D4C	0x6260	# <CJK>
-0x9D4D	0x6268	# <CJK>
-0x9D4E	0x627C	# <CJK>
-0x9D4F	0x6282	# <CJK>
-0x9D50	0x6289	# <CJK>
-0x9D51	0x627E	# <CJK>
-0x9D52	0x6292	# <CJK>
-0x9D53	0x6293	# <CJK>
-0x9D54	0x6296	# <CJK>
-0x9D55	0x62D4	# <CJK>
-0x9D56	0x6283	# <CJK>
-0x9D57	0x6294	# <CJK>
-0x9D58	0x62D7	# <CJK>
-0x9D59	0x62D1	# <CJK>
-0x9D5A	0x62BB	# <CJK>
-0x9D5B	0x62CF	# <CJK>
-0x9D5C	0x62FF	# <CJK>
-0x9D5D	0x62C6	# <CJK>
-0x9D5E	0x64D4	# <CJK>
-0x9D5F	0x62C8	# <CJK>
-0x9D60	0x62DC	# <CJK>
-0x9D61	0x62CC	# <CJK>
-0x9D62	0x62CA	# <CJK>
-0x9D63	0x62C2	# <CJK>
-0x9D64	0x62C7	# <CJK>
-0x9D65	0x629B	# <CJK>
-0x9D66	0x62C9	# <CJK>
-0x9D67	0x630C	# <CJK>
-0x9D68	0x62EE	# <CJK>
-0x9D69	0x62F1	# <CJK>
-0x9D6A	0x6327	# <CJK>
-0x9D6B	0x6302	# <CJK>
-0x9D6C	0x6308	# <CJK>
-0x9D6D	0x62EF	# <CJK>
-0x9D6E	0x62F5	# <CJK>
-0x9D6F	0x6350	# <CJK>
-0x9D70	0x633E	# <CJK>
-0x9D71	0x634D	# <CJK>
-0x9D72	0x641C	# <CJK>
-0x9D73	0x634F	# <CJK>
-0x9D74	0x6396	# <CJK>
-0x9D75	0x638E	# <CJK>
-0x9D76	0x6380	# <CJK>
-0x9D77	0x63AB	# <CJK>
-0x9D78	0x6376	# <CJK>
-0x9D79	0x63A3	# <CJK>
-0x9D7A	0x638F	# <CJK>
-0x9D7B	0x6389	# <CJK>
-0x9D7C	0x639F	# <CJK>
-0x9D7D	0x63B5	# <CJK>
-0x9D7E	0x636B	# <CJK>
-0x9D80	0x6369	# <CJK>
-0x9D81	0x63BE	# <CJK>
-0x9D82	0x63E9	# <CJK>
-0x9D83	0x63C0	# <CJK>
-0x9D84	0x63C6	# <CJK>
-0x9D85	0x63E3	# <CJK>
-0x9D86	0x63C9	# <CJK>
-0x9D87	0x63D2	# <CJK>
-0x9D88	0x63F6	# <CJK>
-0x9D89	0x63C4	# <CJK>
-0x9D8A	0x6416	# <CJK>
-0x9D8B	0x6434	# <CJK>
-0x9D8C	0x6406	# <CJK>
-0x9D8D	0x6413	# <CJK>
-0x9D8E	0x6426	# <CJK>
-0x9D8F	0x6436	# <CJK>
-0x9D90	0x651D	# <CJK>
-0x9D91	0x6417	# <CJK>
-0x9D92	0x6428	# <CJK>
-0x9D93	0x640F	# <CJK>
-0x9D94	0x6467	# <CJK>
-0x9D95	0x646F	# <CJK>
-0x9D96	0x6476	# <CJK>
-0x9D97	0x644E	# <CJK>
-0x9D98	0x652A	# <CJK>
-0x9D99	0x6495	# <CJK>
-0x9D9A	0x6493	# <CJK>
-0x9D9B	0x64A5	# <CJK>
-0x9D9C	0x64A9	# <CJK>
-0x9D9D	0x6488	# <CJK>
-0x9D9E	0x64BC	# <CJK>
-0x9D9F	0x64DA	# <CJK>
-0x9DA0	0x64D2	# <CJK>
-0x9DA1	0x64C5	# <CJK>
-0x9DA2	0x64C7	# <CJK>
-0x9DA3	0x64BB	# <CJK>
-0x9DA4	0x64D8	# <CJK>
-0x9DA5	0x64C2	# <CJK>
-0x9DA6	0x64F1	# <CJK>
-0x9DA7	0x64E7	# <CJK>
-0x9DA8	0x8209	# <CJK>
-0x9DA9	0x64E0	# <CJK>
-0x9DAA	0x64E1	# <CJK>
-0x9DAB	0x62AC	# <CJK>
-0x9DAC	0x64E3	# <CJK>
-0x9DAD	0x64EF	# <CJK>
-0x9DAE	0x652C	# <CJK>
-0x9DAF	0x64F6	# <CJK>
-0x9DB0	0x64F4	# <CJK>
-0x9DB1	0x64F2	# <CJK>
-0x9DB2	0x64FA	# <CJK>
-0x9DB3	0x6500	# <CJK>
-0x9DB4	0x64FD	# <CJK>
-0x9DB5	0x6518	# <CJK>
-0x9DB6	0x651C	# <CJK>
-0x9DB7	0x6505	# <CJK>
-0x9DB8	0x6524	# <CJK>
-0x9DB9	0x6523	# <CJK>
-0x9DBA	0x652B	# <CJK>
-0x9DBB	0x6534	# <CJK>
-0x9DBC	0x6535	# <CJK>
-0x9DBD	0x6537	# <CJK>
-0x9DBE	0x6536	# <CJK>
-0x9DBF	0x6538	# <CJK>
-0x9DC0	0x754B	# <CJK>
-0x9DC1	0x6548	# <CJK>
-0x9DC2	0x6556	# <CJK>
-0x9DC3	0x6555	# <CJK>
-0x9DC4	0x654D	# <CJK>
-0x9DC5	0x6558	# <CJK>
-0x9DC6	0x655E	# <CJK>
-0x9DC7	0x655D	# <CJK>
-0x9DC8	0x6572	# <CJK>
-0x9DC9	0x6578	# <CJK>
-0x9DCA	0x6582	# <CJK>
-0x9DCB	0x6583	# <CJK>
-0x9DCC	0x8B8A	# <CJK>
-0x9DCD	0x659B	# <CJK>
-0x9DCE	0x659F	# <CJK>
-0x9DCF	0x65AB	# <CJK>
-0x9DD0	0x65B7	# <CJK>
-0x9DD1	0x65C3	# <CJK>
-0x9DD2	0x65C6	# <CJK>
-0x9DD3	0x65C1	# <CJK>
-0x9DD4	0x65C4	# <CJK>
-0x9DD5	0x65CC	# <CJK>
-0x9DD6	0x65D2	# <CJK>
-0x9DD7	0x65DB	# <CJK>
-0x9DD8	0x65D9	# <CJK>
-0x9DD9	0x65E0	# <CJK>
-0x9DDA	0x65E1	# <CJK>
-0x9DDB	0x65F1	# <CJK>
-0x9DDC	0x6772	# <CJK>
-0x9DDD	0x660A	# <CJK>
-0x9DDE	0x6603	# <CJK>
-0x9DDF	0x65FB	# <CJK>
-0x9DE0	0x6773	# <CJK>
-0x9DE1	0x6635	# <CJK>
-0x9DE2	0x6636	# <CJK>
-0x9DE3	0x6634	# <CJK>
-0x9DE4	0x661C	# <CJK>
-0x9DE5	0x664F	# <CJK>
-0x9DE6	0x6644	# <CJK>
-0x9DE7	0x6649	# <CJK>
-0x9DE8	0x6641	# <CJK>
-0x9DE9	0x665E	# <CJK>
-0x9DEA	0x665D	# <CJK>
-0x9DEB	0x6664	# <CJK>
-0x9DEC	0x6667	# <CJK>
-0x9DED	0x6668	# <CJK>
-0x9DEE	0x665F	# <CJK>
-0x9DEF	0x6662	# <CJK>
-0x9DF0	0x6670	# <CJK>
-0x9DF1	0x6683	# <CJK>
-0x9DF2	0x6688	# <CJK>
-0x9DF3	0x668E	# <CJK>
-0x9DF4	0x6689	# <CJK>
-0x9DF5	0x6684	# <CJK>
-0x9DF6	0x6698	# <CJK>
-0x9DF7	0x669D	# <CJK>
-0x9DF8	0x66C1	# <CJK>
-0x9DF9	0x66B9	# <CJK>
-0x9DFA	0x66C9	# <CJK>
-0x9DFB	0x66BE	# <CJK>
-0x9DFC	0x66BC	# <CJK>
-0x9E40	0x66C4	# <CJK>
-0x9E41	0x66B8	# <CJK>
-0x9E42	0x66D6	# <CJK>
-0x9E43	0x66DA	# <CJK>
-0x9E44	0x66E0	# <CJK>
-0x9E45	0x663F	# <CJK>
-0x9E46	0x66E6	# <CJK>
-0x9E47	0x66E9	# <CJK>
-0x9E48	0x66F0	# <CJK>
-0x9E49	0x66F5	# <CJK>
-0x9E4A	0x66F7	# <CJK>
-0x9E4B	0x670F	# <CJK>
-0x9E4C	0x6716	# <CJK>
-0x9E4D	0x671E	# <CJK>
-0x9E4E	0x6726	# <CJK>
-0x9E4F	0x6727	# <CJK>
-0x9E50	0x9738	# <CJK>
-0x9E51	0x672E	# <CJK>
-0x9E52	0x673F	# <CJK>
-0x9E53	0x6736	# <CJK>
-0x9E54	0x6741	# <CJK>
-0x9E55	0x6738	# <CJK>
-0x9E56	0x6737	# <CJK>
-0x9E57	0x6746	# <CJK>
-0x9E58	0x675E	# <CJK>
-0x9E59	0x6760	# <CJK>
-0x9E5A	0x6759	# <CJK>
-0x9E5B	0x6763	# <CJK>
-0x9E5C	0x6764	# <CJK>
-0x9E5D	0x6789	# <CJK>
-0x9E5E	0x6770	# <CJK>
-0x9E5F	0x67A9	# <CJK>
-0x9E60	0x677C	# <CJK>
-0x9E61	0x676A	# <CJK>
-0x9E62	0x678C	# <CJK>
-0x9E63	0x678B	# <CJK>
-0x9E64	0x67A6	# <CJK>
-0x9E65	0x67A1	# <CJK>
-0x9E66	0x6785	# <CJK>
-0x9E67	0x67B7	# <CJK>
-0x9E68	0x67EF	# <CJK>
-0x9E69	0x67B4	# <CJK>
-0x9E6A	0x67EC	# <CJK>
-0x9E6B	0x67B3	# <CJK>
-0x9E6C	0x67E9	# <CJK>
-0x9E6D	0x67B8	# <CJK>
-0x9E6E	0x67E4	# <CJK>
-0x9E6F	0x67DE	# <CJK>
-0x9E70	0x67DD	# <CJK>
-0x9E71	0x67E2	# <CJK>
-0x9E72	0x67EE	# <CJK>
-0x9E73	0x67B9	# <CJK>
-0x9E74	0x67CE	# <CJK>
-0x9E75	0x67C6	# <CJK>
-0x9E76	0x67E7	# <CJK>
-0x9E77	0x6A9C	# <CJK>
-0x9E78	0x681E	# <CJK>
-0x9E79	0x6846	# <CJK>
-0x9E7A	0x6829	# <CJK>
-0x9E7B	0x6840	# <CJK>
-0x9E7C	0x684D	# <CJK>
-0x9E7D	0x6832	# <CJK>
-0x9E7E	0x684E	# <CJK>
-0x9E80	0x68B3	# <CJK>
-0x9E81	0x682B	# <CJK>
-0x9E82	0x6859	# <CJK>
-0x9E83	0x6863	# <CJK>
-0x9E84	0x6877	# <CJK>
-0x9E85	0x687F	# <CJK>
-0x9E86	0x689F	# <CJK>
-0x9E87	0x688F	# <CJK>
-0x9E88	0x68AD	# <CJK>
-0x9E89	0x6894	# <CJK>
-0x9E8A	0x689D	# <CJK>
-0x9E8B	0x689B	# <CJK>
-0x9E8C	0x6883	# <CJK>
-0x9E8D	0x6AAE	# <CJK>
-0x9E8E	0x68B9	# <CJK>
-0x9E8F	0x6874	# <CJK>
-0x9E90	0x68B5	# <CJK>
-0x9E91	0x68A0	# <CJK>
-0x9E92	0x68BA	# <CJK>
-0x9E93	0x690F	# <CJK>
-0x9E94	0x688D	# <CJK>
-0x9E95	0x687E	# <CJK>
-0x9E96	0x6901	# <CJK>
-0x9E97	0x68CA	# <CJK>
-0x9E98	0x6908	# <CJK>
-0x9E99	0x68D8	# <CJK>
-0x9E9A	0x6922	# <CJK>
-0x9E9B	0x6926	# <CJK>
-0x9E9C	0x68E1	# <CJK>
-0x9E9D	0x690C	# <CJK>
-0x9E9E	0x68CD	# <CJK>
-0x9E9F	0x68D4	# <CJK>
-0x9EA0	0x68E7	# <CJK>
-0x9EA1	0x68D5	# <CJK>
-0x9EA2	0x6936	# <CJK>
-0x9EA3	0x6912	# <CJK>
-0x9EA4	0x6904	# <CJK>
-0x9EA5	0x68D7	# <CJK>
-0x9EA6	0x68E3	# <CJK>
-0x9EA7	0x6925	# <CJK>
-0x9EA8	0x68F9	# <CJK>
-0x9EA9	0x68E0	# <CJK>
-0x9EAA	0x68EF	# <CJK>
-0x9EAB	0x6928	# <CJK>
-0x9EAC	0x692A	# <CJK>
-0x9EAD	0x691A	# <CJK>
-0x9EAE	0x6923	# <CJK>
-0x9EAF	0x6921	# <CJK>
-0x9EB0	0x68C6	# <CJK>
-0x9EB1	0x6979	# <CJK>
-0x9EB2	0x6977	# <CJK>
-0x9EB3	0x695C	# <CJK>
-0x9EB4	0x6978	# <CJK>
-0x9EB5	0x696B	# <CJK>
-0x9EB6	0x6954	# <CJK>
-0x9EB7	0x697E	# <CJK>
-0x9EB8	0x696E	# <CJK>
-0x9EB9	0x6939	# <CJK>
-0x9EBA	0x6974	# <CJK>
-0x9EBB	0x693D	# <CJK>
-0x9EBC	0x6959	# <CJK>
-0x9EBD	0x6930	# <CJK>
-0x9EBE	0x6961	# <CJK>
-0x9EBF	0x695E	# <CJK>
-0x9EC0	0x695D	# <CJK>
-0x9EC1	0x6981	# <CJK>
-0x9EC2	0x696A	# <CJK>
-0x9EC3	0x69B2	# <CJK>
-0x9EC4	0x69AE	# <CJK>
-0x9EC5	0x69D0	# <CJK>
-0x9EC6	0x69BF	# <CJK>
-0x9EC7	0x69C1	# <CJK>
-0x9EC8	0x69D3	# <CJK>
-0x9EC9	0x69BE	# <CJK>
-0x9ECA	0x69CE	# <CJK>
-0x9ECB	0x5BE8	# <CJK>
-0x9ECC	0x69CA	# <CJK>
-0x9ECD	0x69DD	# <CJK>
-0x9ECE	0x69BB	# <CJK>
-0x9ECF	0x69C3	# <CJK>
-0x9ED0	0x69A7	# <CJK>
-0x9ED1	0x6A2E	# <CJK>
-0x9ED2	0x6991	# <CJK>
-0x9ED3	0x69A0	# <CJK>
-0x9ED4	0x699C	# <CJK>
-0x9ED5	0x6995	# <CJK>
-0x9ED6	0x69B4	# <CJK>
-0x9ED7	0x69DE	# <CJK>
-0x9ED8	0x69E8	# <CJK>
-0x9ED9	0x6A02	# <CJK>
-0x9EDA	0x6A1B	# <CJK>
-0x9EDB	0x69FF	# <CJK>
-0x9EDC	0x6B0A	# <CJK>
-0x9EDD	0x69F9	# <CJK>
-0x9EDE	0x69F2	# <CJK>
-0x9EDF	0x69E7	# <CJK>
-0x9EE0	0x6A05	# <CJK>
-0x9EE1	0x69B1	# <CJK>
-0x9EE2	0x6A1E	# <CJK>
-0x9EE3	0x69ED	# <CJK>
-0x9EE4	0x6A14	# <CJK>
-0x9EE5	0x69EB	# <CJK>
-0x9EE6	0x6A0A	# <CJK>
-0x9EE7	0x6A12	# <CJK>
-0x9EE8	0x6AC1	# <CJK>
-0x9EE9	0x6A23	# <CJK>
-0x9EEA	0x6A13	# <CJK>
-0x9EEB	0x6A44	# <CJK>
-0x9EEC	0x6A0C	# <CJK>
-0x9EED	0x6A72	# <CJK>
-0x9EEE	0x6A36	# <CJK>
-0x9EEF	0x6A78	# <CJK>
-0x9EF0	0x6A47	# <CJK>
-0x9EF1	0x6A62	# <CJK>
-0x9EF2	0x6A59	# <CJK>
-0x9EF3	0x6A66	# <CJK>
-0x9EF4	0x6A48	# <CJK>
-0x9EF5	0x6A38	# <CJK>
-0x9EF6	0x6A22	# <CJK>
-0x9EF7	0x6A90	# <CJK>
-0x9EF8	0x6A8D	# <CJK>
-0x9EF9	0x6AA0	# <CJK>
-0x9EFA	0x6A84	# <CJK>
-0x9EFB	0x6AA2	# <CJK>
-0x9EFC	0x6AA3	# <CJK>
-0x9F40	0x6A97	# <CJK>
-0x9F41	0x8617	# <CJK>
-0x9F42	0x6ABB	# <CJK>
-0x9F43	0x6AC3	# <CJK>
-0x9F44	0x6AC2	# <CJK>
-0x9F45	0x6AB8	# <CJK>
-0x9F46	0x6AB3	# <CJK>
-0x9F47	0x6AAC	# <CJK>
-0x9F48	0x6ADE	# <CJK>
-0x9F49	0x6AD1	# <CJK>
-0x9F4A	0x6ADF	# <CJK>
-0x9F4B	0x6AAA	# <CJK>
-0x9F4C	0x6ADA	# <CJK>
-0x9F4D	0x6AEA	# <CJK>
-0x9F4E	0x6AFB	# <CJK>
-0x9F4F	0x6B05	# <CJK>
-0x9F50	0x8616	# <CJK>
-0x9F51	0x6AFA	# <CJK>
-0x9F52	0x6B12	# <CJK>
-0x9F53	0x6B16	# <CJK>
-0x9F54	0x9B31	# <CJK>
-0x9F55	0x6B1F	# <CJK>
-0x9F56	0x6B38	# <CJK>
-0x9F57	0x6B37	# <CJK>
-0x9F58	0x76DC	# <CJK>
-0x9F59	0x6B39	# <CJK>
-0x9F5A	0x98EE	# <CJK>
-0x9F5B	0x6B47	# <CJK>
-0x9F5C	0x6B43	# <CJK>
-0x9F5D	0x6B49	# <CJK>
-0x9F5E	0x6B50	# <CJK>
-0x9F5F	0x6B59	# <CJK>
-0x9F60	0x6B54	# <CJK>
-0x9F61	0x6B5B	# <CJK>
-0x9F62	0x6B5F	# <CJK>
-0x9F63	0x6B61	# <CJK>
-0x9F64	0x6B78	# <CJK>
-0x9F65	0x6B79	# <CJK>
-0x9F66	0x6B7F	# <CJK>
-0x9F67	0x6B80	# <CJK>
-0x9F68	0x6B84	# <CJK>
-0x9F69	0x6B83	# <CJK>
-0x9F6A	0x6B8D	# <CJK>
-0x9F6B	0x6B98	# <CJK>
-0x9F6C	0x6B95	# <CJK>
-0x9F6D	0x6B9E	# <CJK>
-0x9F6E	0x6BA4	# <CJK>
-0x9F6F	0x6BAA	# <CJK>
-0x9F70	0x6BAB	# <CJK>
-0x9F71	0x6BAF	# <CJK>
-0x9F72	0x6BB2	# <CJK>
-0x9F73	0x6BB1	# <CJK>
-0x9F74	0x6BB3	# <CJK>
-0x9F75	0x6BB7	# <CJK>
-0x9F76	0x6BBC	# <CJK>
-0x9F77	0x6BC6	# <CJK>
-0x9F78	0x6BCB	# <CJK>
-0x9F79	0x6BD3	# <CJK>
-0x9F7A	0x6BDF	# <CJK>
-0x9F7B	0x6BEC	# <CJK>
-0x9F7C	0x6BEB	# <CJK>
-0x9F7D	0x6BF3	# <CJK>
-0x9F7E	0x6BEF	# <CJK>
-0x9F80	0x9EBE	# <CJK>
-0x9F81	0x6C08	# <CJK>
-0x9F82	0x6C13	# <CJK>
-0x9F83	0x6C14	# <CJK>
-0x9F84	0x6C1B	# <CJK>
-0x9F85	0x6C24	# <CJK>
-0x9F86	0x6C23	# <CJK>
-0x9F87	0x6C5E	# <CJK>
-0x9F88	0x6C55	# <CJK>
-0x9F89	0x6C62	# <CJK>
-0x9F8A	0x6C6A	# <CJK>
-0x9F8B	0x6C82	# <CJK>
-0x9F8C	0x6C8D	# <CJK>
-0x9F8D	0x6C9A	# <CJK>
-0x9F8E	0x6C81	# <CJK>
-0x9F8F	0x6C9B	# <CJK>
-0x9F90	0x6C7E	# <CJK>
-0x9F91	0x6C68	# <CJK>
-0x9F92	0x6C73	# <CJK>
-0x9F93	0x6C92	# <CJK>
-0x9F94	0x6C90	# <CJK>
-0x9F95	0x6CC4	# <CJK>
-0x9F96	0x6CF1	# <CJK>
-0x9F97	0x6CD3	# <CJK>
-0x9F98	0x6CBD	# <CJK>
-0x9F99	0x6CD7	# <CJK>
-0x9F9A	0x6CC5	# <CJK>
-0x9F9B	0x6CDD	# <CJK>
-0x9F9C	0x6CAE	# <CJK>
-0x9F9D	0x6CB1	# <CJK>
-0x9F9E	0x6CBE	# <CJK>
-0x9F9F	0x6CBA	# <CJK>
-0x9FA0	0x6CDB	# <CJK>
-0x9FA1	0x6CEF	# <CJK>
-0x9FA2	0x6CD9	# <CJK>
-0x9FA3	0x6CEA	# <CJK>
-0x9FA4	0x6D1F	# <CJK>
-0x9FA5	0x884D	# <CJK>
-0x9FA6	0x6D36	# <CJK>
-0x9FA7	0x6D2B	# <CJK>
-0x9FA8	0x6D3D	# <CJK>
-0x9FA9	0x6D38	# <CJK>
-0x9FAA	0x6D19	# <CJK>
-0x9FAB	0x6D35	# <CJK>
-0x9FAC	0x6D33	# <CJK>
-0x9FAD	0x6D12	# <CJK>
-0x9FAE	0x6D0C	# <CJK>
-0x9FAF	0x6D63	# <CJK>
-0x9FB0	0x6D93	# <CJK>
-0x9FB1	0x6D64	# <CJK>
-0x9FB2	0x6D5A	# <CJK>
-0x9FB3	0x6D79	# <CJK>
-0x9FB4	0x6D59	# <CJK>
-0x9FB5	0x6D8E	# <CJK>
-0x9FB6	0x6D95	# <CJK>
-0x9FB7	0x6FE4	# <CJK>
-0x9FB8	0x6D85	# <CJK>
-0x9FB9	0x6DF9	# <CJK>
-0x9FBA	0x6E15	# <CJK>
-0x9FBB	0x6E0A	# <CJK>
-0x9FBC	0x6DB5	# <CJK>
-0x9FBD	0x6DC7	# <CJK>
-0x9FBE	0x6DE6	# <CJK>
-0x9FBF	0x6DB8	# <CJK>
-0x9FC0	0x6DC6	# <CJK>
-0x9FC1	0x6DEC	# <CJK>
-0x9FC2	0x6DDE	# <CJK>
-0x9FC3	0x6DCC	# <CJK>
-0x9FC4	0x6DE8	# <CJK>
-0x9FC5	0x6DD2	# <CJK>
-0x9FC6	0x6DC5	# <CJK>
-0x9FC7	0x6DFA	# <CJK>
-0x9FC8	0x6DD9	# <CJK>
-0x9FC9	0x6DE4	# <CJK>
-0x9FCA	0x6DD5	# <CJK>
-0x9FCB	0x6DEA	# <CJK>
-0x9FCC	0x6DEE	# <CJK>
-0x9FCD	0x6E2D	# <CJK>
-0x9FCE	0x6E6E	# <CJK>
-0x9FCF	0x6E2E	# <CJK>
-0x9FD0	0x6E19	# <CJK>
-0x9FD1	0x6E72	# <CJK>
-0x9FD2	0x6E5F	# <CJK>
-0x9FD3	0x6E3E	# <CJK>
-0x9FD4	0x6E23	# <CJK>
-0x9FD5	0x6E6B	# <CJK>
-0x9FD6	0x6E2B	# <CJK>
-0x9FD7	0x6E76	# <CJK>
-0x9FD8	0x6E4D	# <CJK>
-0x9FD9	0x6E1F	# <CJK>
-0x9FDA	0x6E43	# <CJK>
-0x9FDB	0x6E3A	# <CJK>
-0x9FDC	0x6E4E	# <CJK>
-0x9FDD	0x6E24	# <CJK>
-0x9FDE	0x6EFF	# <CJK>
-0x9FDF	0x6E1D	# <CJK>
-0x9FE0	0x6E38	# <CJK>
-0x9FE1	0x6E82	# <CJK>
-0x9FE2	0x6EAA	# <CJK>
-0x9FE3	0x6E98	# <CJK>
-0x9FE4	0x6EC9	# <CJK>
-0x9FE5	0x6EB7	# <CJK>
-0x9FE6	0x6ED3	# <CJK>
-0x9FE7	0x6EBD	# <CJK>
-0x9FE8	0x6EAF	# <CJK>
-0x9FE9	0x6EC4	# <CJK>
-0x9FEA	0x6EB2	# <CJK>
-0x9FEB	0x6ED4	# <CJK>
-0x9FEC	0x6ED5	# <CJK>
-0x9FED	0x6E8F	# <CJK>
-0x9FEE	0x6EA5	# <CJK>
-0x9FEF	0x6EC2	# <CJK>
-0x9FF0	0x6E9F	# <CJK>
-0x9FF1	0x6F41	# <CJK>
-0x9FF2	0x6F11	# <CJK>
-0x9FF3	0x704C	# <CJK>
-0x9FF4	0x6EEC	# <CJK>
-0x9FF5	0x6EF8	# <CJK>
-0x9FF6	0x6EFE	# <CJK>
-0x9FF7	0x6F3F	# <CJK>
-0x9FF8	0x6EF2	# <CJK>
-0x9FF9	0x6F31	# <CJK>
-0x9FFA	0x6EEF	# <CJK>
-0x9FFB	0x6F32	# <CJK>
-0x9FFC	0x6ECC	# <CJK>
-0xA1	0xFF61	# HALFWIDTH IDEOGRAPHIC FULL STOP
-0xA2	0xFF62	# HALFWIDTH LEFT CORNER BRACKET
-0xA3	0xFF63	# HALFWIDTH RIGHT CORNER BRACKET
-0xA4	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
-0xA5	0xFF65	# HALFWIDTH KATAKANA MIDDLE DOT
-0xA6	0xFF66	# HALFWIDTH KATAKANA LETTER WO
-0xA7	0xFF67	# HALFWIDTH KATAKANA LETTER SMALL A
-0xA8	0xFF68	# HALFWIDTH KATAKANA LETTER SMALL I
-0xA9	0xFF69	# HALFWIDTH KATAKANA LETTER SMALL U
-0xAA	0xFF6A	# HALFWIDTH KATAKANA LETTER SMALL E
-0xAB	0xFF6B	# HALFWIDTH KATAKANA LETTER SMALL O
-0xAC	0xFF6C	# HALFWIDTH KATAKANA LETTER SMALL YA
-0xAD	0xFF6D	# HALFWIDTH KATAKANA LETTER SMALL YU
-0xAE	0xFF6E	# HALFWIDTH KATAKANA LETTER SMALL YO
-0xAF	0xFF6F	# HALFWIDTH KATAKANA LETTER SMALL TU
-0xB0	0xFF70	# HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
-0xB1	0xFF71	# HALFWIDTH KATAKANA LETTER A
-0xB2	0xFF72	# HALFWIDTH KATAKANA LETTER I
-0xB3	0xFF73	# HALFWIDTH KATAKANA LETTER U
-0xB4	0xFF74	# HALFWIDTH KATAKANA LETTER E
-0xB5	0xFF75	# HALFWIDTH KATAKANA LETTER O
-0xB6	0xFF76	# HALFWIDTH KATAKANA LETTER KA
-0xB7	0xFF77	# HALFWIDTH KATAKANA LETTER KI
-0xB8	0xFF78	# HALFWIDTH KATAKANA LETTER KU
-0xB9	0xFF79	# HALFWIDTH KATAKANA LETTER KE
-0xBA	0xFF7A	# HALFWIDTH KATAKANA LETTER KO
-0xBB	0xFF7B	# HALFWIDTH KATAKANA LETTER SA
-0xBC	0xFF7C	# HALFWIDTH KATAKANA LETTER SI
-0xBD	0xFF7D	# HALFWIDTH KATAKANA LETTER SU
-0xBE	0xFF7E	# HALFWIDTH KATAKANA LETTER SE
-0xBF	0xFF7F	# HALFWIDTH KATAKANA LETTER SO
-0xC0	0xFF80	# HALFWIDTH KATAKANA LETTER TA
-0xC1	0xFF81	# HALFWIDTH KATAKANA LETTER TI
-0xC2	0xFF82	# HALFWIDTH KATAKANA LETTER TU
-0xC3	0xFF83	# HALFWIDTH KATAKANA LETTER TE
-0xC4	0xFF84	# HALFWIDTH KATAKANA LETTER TO
-0xC5	0xFF85	# HALFWIDTH KATAKANA LETTER NA
-0xC6	0xFF86	# HALFWIDTH KATAKANA LETTER NI
-0xC7	0xFF87	# HALFWIDTH KATAKANA LETTER NU
-0xC8	0xFF88	# HALFWIDTH KATAKANA LETTER NE
-0xC9	0xFF89	# HALFWIDTH KATAKANA LETTER NO
-0xCA	0xFF8A	# HALFWIDTH KATAKANA LETTER HA
-0xCB	0xFF8B	# HALFWIDTH KATAKANA LETTER HI
-0xCC	0xFF8C	# HALFWIDTH KATAKANA LETTER HU
-0xCD	0xFF8D	# HALFWIDTH KATAKANA LETTER HE
-0xCE	0xFF8E	# HALFWIDTH KATAKANA LETTER HO
-0xCF	0xFF8F	# HALFWIDTH KATAKANA LETTER MA
-0xD0	0xFF90	# HALFWIDTH KATAKANA LETTER MI
-0xD1	0xFF91	# HALFWIDTH KATAKANA LETTER MU
-0xD2	0xFF92	# HALFWIDTH KATAKANA LETTER ME
-0xD3	0xFF93	# HALFWIDTH KATAKANA LETTER MO
-0xD4	0xFF94	# HALFWIDTH KATAKANA LETTER YA
-0xD5	0xFF95	# HALFWIDTH KATAKANA LETTER YU
-0xD6	0xFF96	# HALFWIDTH KATAKANA LETTER YO
-0xD7	0xFF97	# HALFWIDTH KATAKANA LETTER RA
-0xD8	0xFF98	# HALFWIDTH KATAKANA LETTER RI
-0xD9	0xFF99	# HALFWIDTH KATAKANA LETTER RU
-0xDA	0xFF9A	# HALFWIDTH KATAKANA LETTER RE
-0xDB	0xFF9B	# HALFWIDTH KATAKANA LETTER RO
-0xDC	0xFF9C	# HALFWIDTH KATAKANA LETTER WA
-0xDD	0xFF9D	# HALFWIDTH KATAKANA LETTER N
-0xDE	0xFF9E	# HALFWIDTH KATAKANA VOICED SOUND MARK
-0xDF	0xFF9F	# HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
-0xE040	0x6F3E	# <CJK>
-0xE041	0x6F13	# <CJK>
-0xE042	0x6EF7	# <CJK>
-0xE043	0x6F86	# <CJK>
-0xE044	0x6F7A	# <CJK>
-0xE045	0x6F78	# <CJK>
-0xE046	0x6F81	# <CJK>
-0xE047	0x6F80	# <CJK>
-0xE048	0x6F6F	# <CJK>
-0xE049	0x6F5B	# <CJK>
-0xE04A	0x6FF3	# <CJK>
-0xE04B	0x6F6D	# <CJK>
-0xE04C	0x6F82	# <CJK>
-0xE04D	0x6F7C	# <CJK>
-0xE04E	0x6F58	# <CJK>
-0xE04F	0x6F8E	# <CJK>
-0xE050	0x6F91	# <CJK>
-0xE051	0x6FC2	# <CJK>
-0xE052	0x6F66	# <CJK>
-0xE053	0x6FB3	# <CJK>
-0xE054	0x6FA3	# <CJK>
-0xE055	0x6FA1	# <CJK>
-0xE056	0x6FA4	# <CJK>
-0xE057	0x6FB9	# <CJK>
-0xE058	0x6FC6	# <CJK>
-0xE059	0x6FAA	# <CJK>
-0xE05A	0x6FDF	# <CJK>
-0xE05B	0x6FD5	# <CJK>
-0xE05C	0x6FEC	# <CJK>
-0xE05D	0x6FD4	# <CJK>
-0xE05E	0x6FD8	# <CJK>
-0xE05F	0x6FF1	# <CJK>
-0xE060	0x6FEE	# <CJK>
-0xE061	0x6FDB	# <CJK>
-0xE062	0x7009	# <CJK>
-0xE063	0x700B	# <CJK>
-0xE064	0x6FFA	# <CJK>
-0xE065	0x7011	# <CJK>
-0xE066	0x7001	# <CJK>
-0xE067	0x700F	# <CJK>
-0xE068	0x6FFE	# <CJK>
-0xE069	0x701B	# <CJK>
-0xE06A	0x701A	# <CJK>
-0xE06B	0x6F74	# <CJK>
-0xE06C	0x701D	# <CJK>
-0xE06D	0x7018	# <CJK>
-0xE06E	0x701F	# <CJK>
-0xE06F	0x7030	# <CJK>
-0xE070	0x703E	# <CJK>
-0xE071	0x7032	# <CJK>
-0xE072	0x7051	# <CJK>
-0xE073	0x7063	# <CJK>
-0xE074	0x7099	# <CJK>
-0xE075	0x7092	# <CJK>
-0xE076	0x70AF	# <CJK>
-0xE077	0x70F1	# <CJK>
-0xE078	0x70AC	# <CJK>
-0xE079	0x70B8	# <CJK>
-0xE07A	0x70B3	# <CJK>
-0xE07B	0x70AE	# <CJK>
-0xE07C	0x70DF	# <CJK>
-0xE07D	0x70CB	# <CJK>
-0xE07E	0x70DD	# <CJK>
-0xE080	0x70D9	# <CJK>
-0xE081	0x7109	# <CJK>
-0xE082	0x70FD	# <CJK>
-0xE083	0x711C	# <CJK>
-0xE084	0x7119	# <CJK>
-0xE085	0x7165	# <CJK>
-0xE086	0x7155	# <CJK>
-0xE087	0x7188	# <CJK>
-0xE088	0x7166	# <CJK>
-0xE089	0x7162	# <CJK>
-0xE08A	0x714C	# <CJK>
-0xE08B	0x7156	# <CJK>
-0xE08C	0x716C	# <CJK>
-0xE08D	0x718F	# <CJK>
-0xE08E	0x71FB	# <CJK>
-0xE08F	0x7184	# <CJK>
-0xE090	0x7195	# <CJK>
-0xE091	0x71A8	# <CJK>
-0xE092	0x71AC	# <CJK>
-0xE093	0x71D7	# <CJK>
-0xE094	0x71B9	# <CJK>
-0xE095	0x71BE	# <CJK>
-0xE096	0x71D2	# <CJK>
-0xE097	0x71C9	# <CJK>
-0xE098	0x71D4	# <CJK>
-0xE099	0x71CE	# <CJK>
-0xE09A	0x71E0	# <CJK>
-0xE09B	0x71EC	# <CJK>
-0xE09C	0x71E7	# <CJK>
-0xE09D	0x71F5	# <CJK>
-0xE09E	0x71FC	# <CJK>
-0xE09F	0x71F9	# <CJK>
-0xE0A0	0x71FF	# <CJK>
-0xE0A1	0x720D	# <CJK>
-0xE0A2	0x7210	# <CJK>
-0xE0A3	0x721B	# <CJK>
-0xE0A4	0x7228	# <CJK>
-0xE0A5	0x722D	# <CJK>
-0xE0A6	0x722C	# <CJK>
-0xE0A7	0x7230	# <CJK>
-0xE0A8	0x7232	# <CJK>
-0xE0A9	0x723B	# <CJK>
-0xE0AA	0x723C	# <CJK>
-0xE0AB	0x723F	# <CJK>
-0xE0AC	0x7240	# <CJK>
-0xE0AD	0x7246	# <CJK>
-0xE0AE	0x724B	# <CJK>
-0xE0AF	0x7258	# <CJK>
-0xE0B0	0x7274	# <CJK>
-0xE0B1	0x727E	# <CJK>
-0xE0B2	0x7282	# <CJK>
-0xE0B3	0x7281	# <CJK>
-0xE0B4	0x7287	# <CJK>
-0xE0B5	0x7292	# <CJK>
-0xE0B6	0x7296	# <CJK>
-0xE0B7	0x72A2	# <CJK>
-0xE0B8	0x72A7	# <CJK>
-0xE0B9	0x72B9	# <CJK>
-0xE0BA	0x72B2	# <CJK>
-0xE0BB	0x72C3	# <CJK>
-0xE0BC	0x72C6	# <CJK>
-0xE0BD	0x72C4	# <CJK>
-0xE0BE	0x72CE	# <CJK>
-0xE0BF	0x72D2	# <CJK>
-0xE0C0	0x72E2	# <CJK>
-0xE0C1	0x72E0	# <CJK>
-0xE0C2	0x72E1	# <CJK>
-0xE0C3	0x72F9	# <CJK>
-0xE0C4	0x72F7	# <CJK>
-0xE0C5	0x500F	# <CJK>
-0xE0C6	0x7317	# <CJK>
-0xE0C7	0x730A	# <CJK>
-0xE0C8	0x731C	# <CJK>
-0xE0C9	0x7316	# <CJK>
-0xE0CA	0x731D	# <CJK>
-0xE0CB	0x7334	# <CJK>
-0xE0CC	0x732F	# <CJK>
-0xE0CD	0x7329	# <CJK>
-0xE0CE	0x7325	# <CJK>
-0xE0CF	0x733E	# <CJK>
-0xE0D0	0x734E	# <CJK>
-0xE0D1	0x734F	# <CJK>
-0xE0D2	0x9ED8	# <CJK>
-0xE0D3	0x7357	# <CJK>
-0xE0D4	0x736A	# <CJK>
-0xE0D5	0x7368	# <CJK>
-0xE0D6	0x7370	# <CJK>
-0xE0D7	0x7378	# <CJK>
-0xE0D8	0x7375	# <CJK>
-0xE0D9	0x737B	# <CJK>
-0xE0DA	0x737A	# <CJK>
-0xE0DB	0x73C8	# <CJK>
-0xE0DC	0x73B3	# <CJK>
-0xE0DD	0x73CE	# <CJK>
-0xE0DE	0x73BB	# <CJK>
-0xE0DF	0x73C0	# <CJK>
-0xE0E0	0x73E5	# <CJK>
-0xE0E1	0x73EE	# <CJK>
-0xE0E2	0x73DE	# <CJK>
-0xE0E3	0x74A2	# <CJK>
-0xE0E4	0x7405	# <CJK>
-0xE0E5	0x746F	# <CJK>
-0xE0E6	0x7425	# <CJK>
-0xE0E7	0x73F8	# <CJK>
-0xE0E8	0x7432	# <CJK>
-0xE0E9	0x743A	# <CJK>
-0xE0EA	0x7455	# <CJK>
-0xE0EB	0x743F	# <CJK>
-0xE0EC	0x745F	# <CJK>
-0xE0ED	0x7459	# <CJK>
-0xE0EE	0x7441	# <CJK>
-0xE0EF	0x745C	# <CJK>
-0xE0F0	0x7469	# <CJK>
-0xE0F1	0x7470	# <CJK>
-0xE0F2	0x7463	# <CJK>
-0xE0F3	0x746A	# <CJK>
-0xE0F4	0x7476	# <CJK>
-0xE0F5	0x747E	# <CJK>
-0xE0F6	0x748B	# <CJK>
-0xE0F7	0x749E	# <CJK>
-0xE0F8	0x74A7	# <CJK>
-0xE0F9	0x74CA	# <CJK>
-0xE0FA	0x74CF	# <CJK>
-0xE0FB	0x74D4	# <CJK>
-0xE0FC	0x73F1	# <CJK>
-0xE140	0x74E0	# <CJK>
-0xE141	0x74E3	# <CJK>
-0xE142	0x74E7	# <CJK>
-0xE143	0x74E9	# <CJK>
-0xE144	0x74EE	# <CJK>
-0xE145	0x74F2	# <CJK>
-0xE146	0x74F0	# <CJK>
-0xE147	0x74F1	# <CJK>
-0xE148	0x74F8	# <CJK>
-0xE149	0x74F7	# <CJK>
-0xE14A	0x7504	# <CJK>
-0xE14B	0x7503	# <CJK>
-0xE14C	0x7505	# <CJK>
-0xE14D	0x750C	# <CJK>
-0xE14E	0x750E	# <CJK>
-0xE14F	0x750D	# <CJK>
-0xE150	0x7515	# <CJK>
-0xE151	0x7513	# <CJK>
-0xE152	0x751E	# <CJK>
-0xE153	0x7526	# <CJK>
-0xE154	0x752C	# <CJK>
-0xE155	0x753C	# <CJK>
-0xE156	0x7544	# <CJK>
-0xE157	0x754D	# <CJK>
-0xE158	0x754A	# <CJK>
-0xE159	0x7549	# <CJK>
-0xE15A	0x755B	# <CJK>
-0xE15B	0x7546	# <CJK>
-0xE15C	0x755A	# <CJK>
-0xE15D	0x7569	# <CJK>
-0xE15E	0x7564	# <CJK>
-0xE15F	0x7567	# <CJK>
-0xE160	0x756B	# <CJK>
-0xE161	0x756D	# <CJK>
-0xE162	0x7578	# <CJK>
-0xE163	0x7576	# <CJK>
-0xE164	0x7586	# <CJK>
-0xE165	0x7587	# <CJK>
-0xE166	0x7574	# <CJK>
-0xE167	0x758A	# <CJK>
-0xE168	0x7589	# <CJK>
-0xE169	0x7582	# <CJK>
-0xE16A	0x7594	# <CJK>
-0xE16B	0x759A	# <CJK>
-0xE16C	0x759D	# <CJK>
-0xE16D	0x75A5	# <CJK>
-0xE16E	0x75A3	# <CJK>
-0xE16F	0x75C2	# <CJK>
-0xE170	0x75B3	# <CJK>
-0xE171	0x75C3	# <CJK>
-0xE172	0x75B5	# <CJK>
-0xE173	0x75BD	# <CJK>
-0xE174	0x75B8	# <CJK>
-0xE175	0x75BC	# <CJK>
-0xE176	0x75B1	# <CJK>
-0xE177	0x75CD	# <CJK>
-0xE178	0x75CA	# <CJK>
-0xE179	0x75D2	# <CJK>
-0xE17A	0x75D9	# <CJK>
-0xE17B	0x75E3	# <CJK>
-0xE17C	0x75DE	# <CJK>
-0xE17D	0x75FE	# <CJK>
-0xE17E	0x75FF	# <CJK>
-0xE180	0x75FC	# <CJK>
-0xE181	0x7601	# <CJK>
-0xE182	0x75F0	# <CJK>
-0xE183	0x75FA	# <CJK>
-0xE184	0x75F2	# <CJK>
-0xE185	0x75F3	# <CJK>
-0xE186	0x760B	# <CJK>
-0xE187	0x760D	# <CJK>
-0xE188	0x7609	# <CJK>
-0xE189	0x761F	# <CJK>
-0xE18A	0x7627	# <CJK>
-0xE18B	0x7620	# <CJK>
-0xE18C	0x7621	# <CJK>
-0xE18D	0x7622	# <CJK>
-0xE18E	0x7624	# <CJK>
-0xE18F	0x7634	# <CJK>
-0xE190	0x7630	# <CJK>
-0xE191	0x763B	# <CJK>
-0xE192	0x7647	# <CJK>
-0xE193	0x7648	# <CJK>
-0xE194	0x7646	# <CJK>
-0xE195	0x765C	# <CJK>
-0xE196	0x7658	# <CJK>
-0xE197	0x7661	# <CJK>
-0xE198	0x7662	# <CJK>
-0xE199	0x7668	# <CJK>
-0xE19A	0x7669	# <CJK>
-0xE19B	0x766A	# <CJK>
-0xE19C	0x7667	# <CJK>
-0xE19D	0x766C	# <CJK>
-0xE19E	0x7670	# <CJK>
-0xE19F	0x7672	# <CJK>
-0xE1A0	0x7676	# <CJK>
-0xE1A1	0x7678	# <CJK>
-0xE1A2	0x767C	# <CJK>
-0xE1A3	0x7680	# <CJK>
-0xE1A4	0x7683	# <CJK>
-0xE1A5	0x7688	# <CJK>
-0xE1A6	0x768B	# <CJK>
-0xE1A7	0x768E	# <CJK>
-0xE1A8	0x7696	# <CJK>
-0xE1A9	0x7693	# <CJK>
-0xE1AA	0x7699	# <CJK>
-0xE1AB	0x769A	# <CJK>
-0xE1AC	0x76B0	# <CJK>
-0xE1AD	0x76B4	# <CJK>
-0xE1AE	0x76B8	# <CJK>
-0xE1AF	0x76B9	# <CJK>
-0xE1B0	0x76BA	# <CJK>
-0xE1B1	0x76C2	# <CJK>
-0xE1B2	0x76CD	# <CJK>
-0xE1B3	0x76D6	# <CJK>
-0xE1B4	0x76D2	# <CJK>
-0xE1B5	0x76DE	# <CJK>
-0xE1B6	0x76E1	# <CJK>
-0xE1B7	0x76E5	# <CJK>
-0xE1B8	0x76E7	# <CJK>
-0xE1B9	0x76EA	# <CJK>
-0xE1BA	0x862F	# <CJK>
-0xE1BB	0x76FB	# <CJK>
-0xE1BC	0x7708	# <CJK>
-0xE1BD	0x7707	# <CJK>
-0xE1BE	0x7704	# <CJK>
-0xE1BF	0x7729	# <CJK>
-0xE1C0	0x7724	# <CJK>
-0xE1C1	0x771E	# <CJK>
-0xE1C2	0x7725	# <CJK>
-0xE1C3	0x7726	# <CJK>
-0xE1C4	0x771B	# <CJK>
-0xE1C5	0x7737	# <CJK>
-0xE1C6	0x7738	# <CJK>
-0xE1C7	0x7747	# <CJK>
-0xE1C8	0x775A	# <CJK>
-0xE1C9	0x7768	# <CJK>
-0xE1CA	0x776B	# <CJK>
-0xE1CB	0x775B	# <CJK>
-0xE1CC	0x7765	# <CJK>
-0xE1CD	0x777F	# <CJK>
-0xE1CE	0x777E	# <CJK>
-0xE1CF	0x7779	# <CJK>
-0xE1D0	0x778E	# <CJK>
-0xE1D1	0x778B	# <CJK>
-0xE1D2	0x7791	# <CJK>
-0xE1D3	0x77A0	# <CJK>
-0xE1D4	0x779E	# <CJK>
-0xE1D5	0x77B0	# <CJK>
-0xE1D6	0x77B6	# <CJK>
-0xE1D7	0x77B9	# <CJK>
-0xE1D8	0x77BF	# <CJK>
-0xE1D9	0x77BC	# <CJK>
-0xE1DA	0x77BD	# <CJK>
-0xE1DB	0x77BB	# <CJK>
-0xE1DC	0x77C7	# <CJK>
-0xE1DD	0x77CD	# <CJK>
-0xE1DE	0x77D7	# <CJK>
-0xE1DF	0x77DA	# <CJK>
-0xE1E0	0x77DC	# <CJK>
-0xE1E1	0x77E3	# <CJK>
-0xE1E2	0x77EE	# <CJK>
-0xE1E3	0x77FC	# <CJK>
-0xE1E4	0x780C	# <CJK>
-0xE1E5	0x7812	# <CJK>
-0xE1E6	0x7926	# <CJK>
-0xE1E7	0x7820	# <CJK>
-0xE1E8	0x792A	# <CJK>
-0xE1E9	0x7845	# <CJK>
-0xE1EA	0x788E	# <CJK>
-0xE1EB	0x7874	# <CJK>
-0xE1EC	0x7886	# <CJK>
-0xE1ED	0x787C	# <CJK>
-0xE1EE	0x789A	# <CJK>
-0xE1EF	0x788C	# <CJK>
-0xE1F0	0x78A3	# <CJK>
-0xE1F1	0x78B5	# <CJK>
-0xE1F2	0x78AA	# <CJK>
-0xE1F3	0x78AF	# <CJK>
-0xE1F4	0x78D1	# <CJK>
-0xE1F5	0x78C6	# <CJK>
-0xE1F6	0x78CB	# <CJK>
-0xE1F7	0x78D4	# <CJK>
-0xE1F8	0x78BE	# <CJK>
-0xE1F9	0x78BC	# <CJK>
-0xE1FA	0x78C5	# <CJK>
-0xE1FB	0x78CA	# <CJK>
-0xE1FC	0x78EC	# <CJK>
-0xE240	0x78E7	# <CJK>
-0xE241	0x78DA	# <CJK>
-0xE242	0x78FD	# <CJK>
-0xE243	0x78F4	# <CJK>
-0xE244	0x7907	# <CJK>
-0xE245	0x7912	# <CJK>
-0xE246	0x7911	# <CJK>
-0xE247	0x7919	# <CJK>
-0xE248	0x792C	# <CJK>
-0xE249	0x792B	# <CJK>
-0xE24A	0x7940	# <CJK>
-0xE24B	0x7960	# <CJK>
-0xE24C	0x7957	# <CJK>
-0xE24D	0x795F	# <CJK>
-0xE24E	0x795A	# <CJK>
-0xE24F	0x7955	# <CJK>
-0xE250	0x7953	# <CJK>
-0xE251	0x797A	# <CJK>
-0xE252	0x797F	# <CJK>
-0xE253	0x798A	# <CJK>
-0xE254	0x799D	# <CJK>
-0xE255	0x79A7	# <CJK>
-0xE256	0x9F4B	# <CJK>
-0xE257	0x79AA	# <CJK>
-0xE258	0x79AE	# <CJK>
-0xE259	0x79B3	# <CJK>
-0xE25A	0x79B9	# <CJK>
-0xE25B	0x79BA	# <CJK>
-0xE25C	0x79C9	# <CJK>
-0xE25D	0x79D5	# <CJK>
-0xE25E	0x79E7	# <CJK>
-0xE25F	0x79EC	# <CJK>
-0xE260	0x79E1	# <CJK>
-0xE261	0x79E3	# <CJK>
-0xE262	0x7A08	# <CJK>
-0xE263	0x7A0D	# <CJK>
-0xE264	0x7A18	# <CJK>
-0xE265	0x7A19	# <CJK>
-0xE266	0x7A20	# <CJK>
-0xE267	0x7A1F	# <CJK>
-0xE268	0x7980	# <CJK>
-0xE269	0x7A31	# <CJK>
-0xE26A	0x7A3B	# <CJK>
-0xE26B	0x7A3E	# <CJK>
-0xE26C	0x7A37	# <CJK>
-0xE26D	0x7A43	# <CJK>
-0xE26E	0x7A57	# <CJK>
-0xE26F	0x7A49	# <CJK>
-0xE270	0x7A61	# <CJK>
-0xE271	0x7A62	# <CJK>
-0xE272	0x7A69	# <CJK>
-0xE273	0x9F9D	# <CJK>
-0xE274	0x7A70	# <CJK>
-0xE275	0x7A79	# <CJK>
-0xE276	0x7A7D	# <CJK>
-0xE277	0x7A88	# <CJK>
-0xE278	0x7A97	# <CJK>
-0xE279	0x7A95	# <CJK>
-0xE27A	0x7A98	# <CJK>
-0xE27B	0x7A96	# <CJK>
-0xE27C	0x7AA9	# <CJK>
-0xE27D	0x7AC8	# <CJK>
-0xE27E	0x7AB0	# <CJK>
-0xE280	0x7AB6	# <CJK>
-0xE281	0x7AC5	# <CJK>
-0xE282	0x7AC4	# <CJK>
-0xE283	0x7ABF	# <CJK>
-0xE284	0x9083	# <CJK>
-0xE285	0x7AC7	# <CJK>
-0xE286	0x7ACA	# <CJK>
-0xE287	0x7ACD	# <CJK>
-0xE288	0x7ACF	# <CJK>
-0xE289	0x7AD5	# <CJK>
-0xE28A	0x7AD3	# <CJK>
-0xE28B	0x7AD9	# <CJK>
-0xE28C	0x7ADA	# <CJK>
-0xE28D	0x7ADD	# <CJK>
-0xE28E	0x7AE1	# <CJK>
-0xE28F	0x7AE2	# <CJK>
-0xE290	0x7AE6	# <CJK>
-0xE291	0x7AED	# <CJK>
-0xE292	0x7AF0	# <CJK>
-0xE293	0x7B02	# <CJK>
-0xE294	0x7B0F	# <CJK>
-0xE295	0x7B0A	# <CJK>
-0xE296	0x7B06	# <CJK>
-0xE297	0x7B33	# <CJK>
-0xE298	0x7B18	# <CJK>
-0xE299	0x7B19	# <CJK>
-0xE29A	0x7B1E	# <CJK>
-0xE29B	0x7B35	# <CJK>
-0xE29C	0x7B28	# <CJK>
-0xE29D	0x7B36	# <CJK>
-0xE29E	0x7B50	# <CJK>
-0xE29F	0x7B7A	# <CJK>
-0xE2A0	0x7B04	# <CJK>
-0xE2A1	0x7B4D	# <CJK>
-0xE2A2	0x7B0B	# <CJK>
-0xE2A3	0x7B4C	# <CJK>
-0xE2A4	0x7B45	# <CJK>
-0xE2A5	0x7B75	# <CJK>
-0xE2A6	0x7B65	# <CJK>
-0xE2A7	0x7B74	# <CJK>
-0xE2A8	0x7B67	# <CJK>
-0xE2A9	0x7B70	# <CJK>
-0xE2AA	0x7B71	# <CJK>
-0xE2AB	0x7B6C	# <CJK>
-0xE2AC	0x7B6E	# <CJK>
-0xE2AD	0x7B9D	# <CJK>
-0xE2AE	0x7B98	# <CJK>
-0xE2AF	0x7B9F	# <CJK>
-0xE2B0	0x7B8D	# <CJK>
-0xE2B1	0x7B9C	# <CJK>
-0xE2B2	0x7B9A	# <CJK>
-0xE2B3	0x7B8B	# <CJK>
-0xE2B4	0x7B92	# <CJK>
-0xE2B5	0x7B8F	# <CJK>
-0xE2B6	0x7B5D	# <CJK>
-0xE2B7	0x7B99	# <CJK>
-0xE2B8	0x7BCB	# <CJK>
-0xE2B9	0x7BC1	# <CJK>
-0xE2BA	0x7BCC	# <CJK>
-0xE2BB	0x7BCF	# <CJK>
-0xE2BC	0x7BB4	# <CJK>
-0xE2BD	0x7BC6	# <CJK>
-0xE2BE	0x7BDD	# <CJK>
-0xE2BF	0x7BE9	# <CJK>
-0xE2C0	0x7C11	# <CJK>
-0xE2C1	0x7C14	# <CJK>
-0xE2C2	0x7BE6	# <CJK>
-0xE2C3	0x7BE5	# <CJK>
-0xE2C4	0x7C60	# <CJK>
-0xE2C5	0x7C00	# <CJK>
-0xE2C6	0x7C07	# <CJK>
-0xE2C7	0x7C13	# <CJK>
-0xE2C8	0x7BF3	# <CJK>
-0xE2C9	0x7BF7	# <CJK>
-0xE2CA	0x7C17	# <CJK>
-0xE2CB	0x7C0D	# <CJK>
-0xE2CC	0x7BF6	# <CJK>
-0xE2CD	0x7C23	# <CJK>
-0xE2CE	0x7C27	# <CJK>
-0xE2CF	0x7C2A	# <CJK>
-0xE2D0	0x7C1F	# <CJK>
-0xE2D1	0x7C37	# <CJK>
-0xE2D2	0x7C2B	# <CJK>
-0xE2D3	0x7C3D	# <CJK>
-0xE2D4	0x7C4C	# <CJK>
-0xE2D5	0x7C43	# <CJK>
-0xE2D6	0x7C54	# <CJK>
-0xE2D7	0x7C4F	# <CJK>
-0xE2D8	0x7C40	# <CJK>
-0xE2D9	0x7C50	# <CJK>
-0xE2DA	0x7C58	# <CJK>
-0xE2DB	0x7C5F	# <CJK>
-0xE2DC	0x7C64	# <CJK>
-0xE2DD	0x7C56	# <CJK>
-0xE2DE	0x7C65	# <CJK>
-0xE2DF	0x7C6C	# <CJK>
-0xE2E0	0x7C75	# <CJK>
-0xE2E1	0x7C83	# <CJK>
-0xE2E2	0x7C90	# <CJK>
-0xE2E3	0x7CA4	# <CJK>
-0xE2E4	0x7CAD	# <CJK>
-0xE2E5	0x7CA2	# <CJK>
-0xE2E6	0x7CAB	# <CJK>
-0xE2E7	0x7CA1	# <CJK>
-0xE2E8	0x7CA8	# <CJK>
-0xE2E9	0x7CB3	# <CJK>
-0xE2EA	0x7CB2	# <CJK>
-0xE2EB	0x7CB1	# <CJK>
-0xE2EC	0x7CAE	# <CJK>
-0xE2ED	0x7CB9	# <CJK>
-0xE2EE	0x7CBD	# <CJK>
-0xE2EF	0x7CC0	# <CJK>
-0xE2F0	0x7CC5	# <CJK>
-0xE2F1	0x7CC2	# <CJK>
-0xE2F2	0x7CD8	# <CJK>
-0xE2F3	0x7CD2	# <CJK>
-0xE2F4	0x7CDC	# <CJK>
-0xE2F5	0x7CE2	# <CJK>
-0xE2F6	0x9B3B	# <CJK>
-0xE2F7	0x7CEF	# <CJK>
-0xE2F8	0x7CF2	# <CJK>
-0xE2F9	0x7CF4	# <CJK>
-0xE2FA	0x7CF6	# <CJK>
-0xE2FB	0x7CFA	# <CJK>
-0xE2FC	0x7D06	# <CJK>
-0xE340	0x7D02	# <CJK>
-0xE341	0x7D1C	# <CJK>
-0xE342	0x7D15	# <CJK>
-0xE343	0x7D0A	# <CJK>
-0xE344	0x7D45	# <CJK>
-0xE345	0x7D4B	# <CJK>
-0xE346	0x7D2E	# <CJK>
-0xE347	0x7D32	# <CJK>
-0xE348	0x7D3F	# <CJK>
-0xE349	0x7D35	# <CJK>
-0xE34A	0x7D46	# <CJK>
-0xE34B	0x7D73	# <CJK>
-0xE34C	0x7D56	# <CJK>
-0xE34D	0x7D4E	# <CJK>
-0xE34E	0x7D72	# <CJK>
-0xE34F	0x7D68	# <CJK>
-0xE350	0x7D6E	# <CJK>
-0xE351	0x7D4F	# <CJK>
-0xE352	0x7D63	# <CJK>
-0xE353	0x7D93	# <CJK>
-0xE354	0x7D89	# <CJK>
-0xE355	0x7D5B	# <CJK>
-0xE356	0x7D8F	# <CJK>
-0xE357	0x7D7D	# <CJK>
-0xE358	0x7D9B	# <CJK>
-0xE359	0x7DBA	# <CJK>
-0xE35A	0x7DAE	# <CJK>
-0xE35B	0x7DA3	# <CJK>
-0xE35C	0x7DB5	# <CJK>
-0xE35D	0x7DC7	# <CJK>
-0xE35E	0x7DBD	# <CJK>
-0xE35F	0x7DAB	# <CJK>
-0xE360	0x7E3D	# <CJK>
-0xE361	0x7DA2	# <CJK>
-0xE362	0x7DAF	# <CJK>
-0xE363	0x7DDC	# <CJK>
-0xE364	0x7DB8	# <CJK>
-0xE365	0x7D9F	# <CJK>
-0xE366	0x7DB0	# <CJK>
-0xE367	0x7DD8	# <CJK>
-0xE368	0x7DDD	# <CJK>
-0xE369	0x7DE4	# <CJK>
-0xE36A	0x7DDE	# <CJK>
-0xE36B	0x7DFB	# <CJK>
-0xE36C	0x7DF2	# <CJK>
-0xE36D	0x7DE1	# <CJK>
-0xE36E	0x7E05	# <CJK>
-0xE36F	0x7E0A	# <CJK>
-0xE370	0x7E23	# <CJK>
-0xE371	0x7E21	# <CJK>
-0xE372	0x7E12	# <CJK>
-0xE373	0x7E31	# <CJK>
-0xE374	0x7E1F	# <CJK>
-0xE375	0x7E09	# <CJK>
-0xE376	0x7E0B	# <CJK>
-0xE377	0x7E22	# <CJK>
-0xE378	0x7E46	# <CJK>
-0xE379	0x7E66	# <CJK>
-0xE37A	0x7E3B	# <CJK>
-0xE37B	0x7E35	# <CJK>
-0xE37C	0x7E39	# <CJK>
-0xE37D	0x7E43	# <CJK>
-0xE37E	0x7E37	# <CJK>
-0xE380	0x7E32	# <CJK>
-0xE381	0x7E3A	# <CJK>
-0xE382	0x7E67	# <CJK>
-0xE383	0x7E5D	# <CJK>
-0xE384	0x7E56	# <CJK>
-0xE385	0x7E5E	# <CJK>
-0xE386	0x7E59	# <CJK>
-0xE387	0x7E5A	# <CJK>
-0xE388	0x7E79	# <CJK>
-0xE389	0x7E6A	# <CJK>
-0xE38A	0x7E69	# <CJK>
-0xE38B	0x7E7C	# <CJK>
-0xE38C	0x7E7B	# <CJK>
-0xE38D	0x7E83	# <CJK>
-0xE38E	0x7DD5	# <CJK>
-0xE38F	0x7E7D	# <CJK>
-0xE390	0x8FAE	# <CJK>
-0xE391	0x7E7F	# <CJK>
-0xE392	0x7E88	# <CJK>
-0xE393	0x7E89	# <CJK>
-0xE394	0x7E8C	# <CJK>
-0xE395	0x7E92	# <CJK>
-0xE396	0x7E90	# <CJK>
-0xE397	0x7E93	# <CJK>
-0xE398	0x7E94	# <CJK>
-0xE399	0x7E96	# <CJK>
-0xE39A	0x7E8E	# <CJK>
-0xE39B	0x7E9B	# <CJK>
-0xE39C	0x7E9C	# <CJK>
-0xE39D	0x7F38	# <CJK>
-0xE39E	0x7F3A	# <CJK>
-0xE39F	0x7F45	# <CJK>
-0xE3A0	0x7F4C	# <CJK>
-0xE3A1	0x7F4D	# <CJK>
-0xE3A2	0x7F4E	# <CJK>
-0xE3A3	0x7F50	# <CJK>
-0xE3A4	0x7F51	# <CJK>
-0xE3A5	0x7F55	# <CJK>
-0xE3A6	0x7F54	# <CJK>
-0xE3A7	0x7F58	# <CJK>
-0xE3A8	0x7F5F	# <CJK>
-0xE3A9	0x7F60	# <CJK>
-0xE3AA	0x7F68	# <CJK>
-0xE3AB	0x7F69	# <CJK>
-0xE3AC	0x7F67	# <CJK>
-0xE3AD	0x7F78	# <CJK>
-0xE3AE	0x7F82	# <CJK>
-0xE3AF	0x7F86	# <CJK>
-0xE3B0	0x7F83	# <CJK>
-0xE3B1	0x7F88	# <CJK>
-0xE3B2	0x7F87	# <CJK>
-0xE3B3	0x7F8C	# <CJK>
-0xE3B4	0x7F94	# <CJK>
-0xE3B5	0x7F9E	# <CJK>
-0xE3B6	0x7F9D	# <CJK>
-0xE3B7	0x7F9A	# <CJK>
-0xE3B8	0x7FA3	# <CJK>
-0xE3B9	0x7FAF	# <CJK>
-0xE3BA	0x7FB2	# <CJK>
-0xE3BB	0x7FB9	# <CJK>
-0xE3BC	0x7FAE	# <CJK>
-0xE3BD	0x7FB6	# <CJK>
-0xE3BE	0x7FB8	# <CJK>
-0xE3BF	0x8B71	# <CJK>
-0xE3C0	0x7FC5	# <CJK>
-0xE3C1	0x7FC6	# <CJK>
-0xE3C2	0x7FCA	# <CJK>
-0xE3C3	0x7FD5	# <CJK>
-0xE3C4	0x7FD4	# <CJK>
-0xE3C5	0x7FE1	# <CJK>
-0xE3C6	0x7FE6	# <CJK>
-0xE3C7	0x7FE9	# <CJK>
-0xE3C8	0x7FF3	# <CJK>
-0xE3C9	0x7FF9	# <CJK>
-0xE3CA	0x98DC	# <CJK>
-0xE3CB	0x8006	# <CJK>
-0xE3CC	0x8004	# <CJK>
-0xE3CD	0x800B	# <CJK>
-0xE3CE	0x8012	# <CJK>
-0xE3CF	0x8018	# <CJK>
-0xE3D0	0x8019	# <CJK>
-0xE3D1	0x801C	# <CJK>
-0xE3D2	0x8021	# <CJK>
-0xE3D3	0x8028	# <CJK>
-0xE3D4	0x803F	# <CJK>
-0xE3D5	0x803B	# <CJK>
-0xE3D6	0x804A	# <CJK>
-0xE3D7	0x8046	# <CJK>
-0xE3D8	0x8052	# <CJK>
-0xE3D9	0x8058	# <CJK>
-0xE3DA	0x805A	# <CJK>
-0xE3DB	0x805F	# <CJK>
-0xE3DC	0x8062	# <CJK>
-0xE3DD	0x8068	# <CJK>
-0xE3DE	0x8073	# <CJK>
-0xE3DF	0x8072	# <CJK>
-0xE3E0	0x8070	# <CJK>
-0xE3E1	0x8076	# <CJK>
-0xE3E2	0x8079	# <CJK>
-0xE3E3	0x807D	# <CJK>
-0xE3E4	0x807F	# <CJK>
-0xE3E5	0x8084	# <CJK>
-0xE3E6	0x8086	# <CJK>
-0xE3E7	0x8085	# <CJK>
-0xE3E8	0x809B	# <CJK>
-0xE3E9	0x8093	# <CJK>
-0xE3EA	0x809A	# <CJK>
-0xE3EB	0x80AD	# <CJK>
-0xE3EC	0x5190	# <CJK>
-0xE3ED	0x80AC	# <CJK>
-0xE3EE	0x80DB	# <CJK>
-0xE3EF	0x80E5	# <CJK>
-0xE3F0	0x80D9	# <CJK>
-0xE3F1	0x80DD	# <CJK>
-0xE3F2	0x80C4	# <CJK>
-0xE3F3	0x80DA	# <CJK>
-0xE3F4	0x80D6	# <CJK>
-0xE3F5	0x8109	# <CJK>
-0xE3F6	0x80EF	# <CJK>
-0xE3F7	0x80F1	# <CJK>
-0xE3F8	0x811B	# <CJK>
-0xE3F9	0x8129	# <CJK>
-0xE3FA	0x8123	# <CJK>
-0xE3FB	0x812F	# <CJK>
-0xE3FC	0x814B	# <CJK>
-0xE440	0x968B	# <CJK>
-0xE441	0x8146	# <CJK>
-0xE442	0x813E	# <CJK>
-0xE443	0x8153	# <CJK>
-0xE444	0x8151	# <CJK>
-0xE445	0x80FC	# <CJK>
-0xE446	0x8171	# <CJK>
-0xE447	0x816E	# <CJK>
-0xE448	0x8165	# <CJK>
-0xE449	0x8166	# <CJK>
-0xE44A	0x8174	# <CJK>
-0xE44B	0x8183	# <CJK>
-0xE44C	0x8188	# <CJK>
-0xE44D	0x818A	# <CJK>
-0xE44E	0x8180	# <CJK>
-0xE44F	0x8182	# <CJK>
-0xE450	0x81A0	# <CJK>
-0xE451	0x8195	# <CJK>
-0xE452	0x81A4	# <CJK>
-0xE453	0x81A3	# <CJK>
-0xE454	0x815F	# <CJK>
-0xE455	0x8193	# <CJK>
-0xE456	0x81A9	# <CJK>
-0xE457	0x81B0	# <CJK>
-0xE458	0x81B5	# <CJK>
-0xE459	0x81BE	# <CJK>
-0xE45A	0x81B8	# <CJK>
-0xE45B	0x81BD	# <CJK>
-0xE45C	0x81C0	# <CJK>
-0xE45D	0x81C2	# <CJK>
-0xE45E	0x81BA	# <CJK>
-0xE45F	0x81C9	# <CJK>
-0xE460	0x81CD	# <CJK>
-0xE461	0x81D1	# <CJK>
-0xE462	0x81D9	# <CJK>
-0xE463	0x81D8	# <CJK>
-0xE464	0x81C8	# <CJK>
-0xE465	0x81DA	# <CJK>
-0xE466	0x81DF	# <CJK>
-0xE467	0x81E0	# <CJK>
-0xE468	0x81E7	# <CJK>
-0xE469	0x81FA	# <CJK>
-0xE46A	0x81FB	# <CJK>
-0xE46B	0x81FE	# <CJK>
-0xE46C	0x8201	# <CJK>
-0xE46D	0x8202	# <CJK>
-0xE46E	0x8205	# <CJK>
-0xE46F	0x8207	# <CJK>
-0xE470	0x820A	# <CJK>
-0xE471	0x820D	# <CJK>
-0xE472	0x8210	# <CJK>
-0xE473	0x8216	# <CJK>
-0xE474	0x8229	# <CJK>
-0xE475	0x822B	# <CJK>
-0xE476	0x8238	# <CJK>
-0xE477	0x8233	# <CJK>
-0xE478	0x8240	# <CJK>
-0xE479	0x8259	# <CJK>
-0xE47A	0x8258	# <CJK>
-0xE47B	0x825D	# <CJK>
-0xE47C	0x825A	# <CJK>
-0xE47D	0x825F	# <CJK>
-0xE47E	0x8264	# <CJK>
-0xE480	0x8262	# <CJK>
-0xE481	0x8268	# <CJK>
-0xE482	0x826A	# <CJK>
-0xE483	0x826B	# <CJK>
-0xE484	0x822E	# <CJK>
-0xE485	0x8271	# <CJK>
-0xE486	0x8277	# <CJK>
-0xE487	0x8278	# <CJK>
-0xE488	0x827E	# <CJK>
-0xE489	0x828D	# <CJK>
-0xE48A	0x8292	# <CJK>
-0xE48B	0x82AB	# <CJK>
-0xE48C	0x829F	# <CJK>
-0xE48D	0x82BB	# <CJK>
-0xE48E	0x82AC	# <CJK>
-0xE48F	0x82E1	# <CJK>
-0xE490	0x82E3	# <CJK>
-0xE491	0x82DF	# <CJK>
-0xE492	0x82D2	# <CJK>
-0xE493	0x82F4	# <CJK>
-0xE494	0x82F3	# <CJK>
-0xE495	0x82FA	# <CJK>
-0xE496	0x8393	# <CJK>
-0xE497	0x8303	# <CJK>
-0xE498	0x82FB	# <CJK>
-0xE499	0x82F9	# <CJK>
-0xE49A	0x82DE	# <CJK>
-0xE49B	0x8306	# <CJK>
-0xE49C	0x82DC	# <CJK>
-0xE49D	0x8309	# <CJK>
-0xE49E	0x82D9	# <CJK>
-0xE49F	0x8335	# <CJK>
-0xE4A0	0x8334	# <CJK>
-0xE4A1	0x8316	# <CJK>
-0xE4A2	0x8332	# <CJK>
-0xE4A3	0x8331	# <CJK>
-0xE4A4	0x8340	# <CJK>
-0xE4A5	0x8339	# <CJK>
-0xE4A6	0x8350	# <CJK>
-0xE4A7	0x8345	# <CJK>
-0xE4A8	0x832F	# <CJK>
-0xE4A9	0x832B	# <CJK>
-0xE4AA	0x8317	# <CJK>
-0xE4AB	0x8318	# <CJK>
-0xE4AC	0x8385	# <CJK>
-0xE4AD	0x839A	# <CJK>
-0xE4AE	0x83AA	# <CJK>
-0xE4AF	0x839F	# <CJK>
-0xE4B0	0x83A2	# <CJK>
-0xE4B1	0x8396	# <CJK>
-0xE4B2	0x8323	# <CJK>
-0xE4B3	0x838E	# <CJK>
-0xE4B4	0x8387	# <CJK>
-0xE4B5	0x838A	# <CJK>
-0xE4B6	0x837C	# <CJK>
-0xE4B7	0x83B5	# <CJK>
-0xE4B8	0x8373	# <CJK>
-0xE4B9	0x8375	# <CJK>
-0xE4BA	0x83A0	# <CJK>
-0xE4BB	0x8389	# <CJK>
-0xE4BC	0x83A8	# <CJK>
-0xE4BD	0x83F4	# <CJK>
-0xE4BE	0x8413	# <CJK>
-0xE4BF	0x83EB	# <CJK>
-0xE4C0	0x83CE	# <CJK>
-0xE4C1	0x83FD	# <CJK>
-0xE4C2	0x8403	# <CJK>
-0xE4C3	0x83D8	# <CJK>
-0xE4C4	0x840B	# <CJK>
-0xE4C5	0x83C1	# <CJK>
-0xE4C6	0x83F7	# <CJK>
-0xE4C7	0x8407	# <CJK>
-0xE4C8	0x83E0	# <CJK>
-0xE4C9	0x83F2	# <CJK>
-0xE4CA	0x840D	# <CJK>
-0xE4CB	0x8422	# <CJK>
-0xE4CC	0x8420	# <CJK>
-0xE4CD	0x83BD	# <CJK>
-0xE4CE	0x8438	# <CJK>
-0xE4CF	0x8506	# <CJK>
-0xE4D0	0x83FB	# <CJK>
-0xE4D1	0x846D	# <CJK>
-0xE4D2	0x842A	# <CJK>
-0xE4D3	0x843C	# <CJK>
-0xE4D4	0x855A	# <CJK>
-0xE4D5	0x8484	# <CJK>
-0xE4D6	0x8477	# <CJK>
-0xE4D7	0x846B	# <CJK>
-0xE4D8	0x84AD	# <CJK>
-0xE4D9	0x846E	# <CJK>
-0xE4DA	0x8482	# <CJK>
-0xE4DB	0x8469	# <CJK>
-0xE4DC	0x8446	# <CJK>
-0xE4DD	0x842C	# <CJK>
-0xE4DE	0x846F	# <CJK>
-0xE4DF	0x8479	# <CJK>
-0xE4E0	0x8435	# <CJK>
-0xE4E1	0x84CA	# <CJK>
-0xE4E2	0x8462	# <CJK>
-0xE4E3	0x84B9	# <CJK>
-0xE4E4	0x84BF	# <CJK>
-0xE4E5	0x849F	# <CJK>
-0xE4E6	0x84D9	# <CJK>
-0xE4E7	0x84CD	# <CJK>
-0xE4E8	0x84BB	# <CJK>
-0xE4E9	0x84DA	# <CJK>
-0xE4EA	0x84D0	# <CJK>
-0xE4EB	0x84C1	# <CJK>
-0xE4EC	0x84C6	# <CJK>
-0xE4ED	0x84D6	# <CJK>
-0xE4EE	0x84A1	# <CJK>
-0xE4EF	0x8521	# <CJK>
-0xE4F0	0x84FF	# <CJK>
-0xE4F1	0x84F4	# <CJK>
-0xE4F2	0x8517	# <CJK>
-0xE4F3	0x8518	# <CJK>
-0xE4F4	0x852C	# <CJK>
-0xE4F5	0x851F	# <CJK>
-0xE4F6	0x8515	# <CJK>
-0xE4F7	0x8514	# <CJK>
-0xE4F8	0x84FC	# <CJK>
-0xE4F9	0x8540	# <CJK>
-0xE4FA	0x8563	# <CJK>
-0xE4FB	0x8558	# <CJK>
-0xE4FC	0x8548	# <CJK>
-0xE540	0x8541	# <CJK>
-0xE541	0x8602	# <CJK>
-0xE542	0x854B	# <CJK>
-0xE543	0x8555	# <CJK>
-0xE544	0x8580	# <CJK>
-0xE545	0x85A4	# <CJK>
-0xE546	0x8588	# <CJK>
-0xE547	0x8591	# <CJK>
-0xE548	0x858A	# <CJK>
-0xE549	0x85A8	# <CJK>
-0xE54A	0x856D	# <CJK>
-0xE54B	0x8594	# <CJK>
-0xE54C	0x859B	# <CJK>
-0xE54D	0x85EA	# <CJK>
-0xE54E	0x8587	# <CJK>
-0xE54F	0x859C	# <CJK>
-0xE550	0x8577	# <CJK>
-0xE551	0x857E	# <CJK>
-0xE552	0x8590	# <CJK>
-0xE553	0x85C9	# <CJK>
-0xE554	0x85BA	# <CJK>
-0xE555	0x85CF	# <CJK>
-0xE556	0x85B9	# <CJK>
-0xE557	0x85D0	# <CJK>
-0xE558	0x85D5	# <CJK>
-0xE559	0x85DD	# <CJK>
-0xE55A	0x85E5	# <CJK>
-0xE55B	0x85DC	# <CJK>
-0xE55C	0x85F9	# <CJK>
-0xE55D	0x860A	# <CJK>
-0xE55E	0x8613	# <CJK>
-0xE55F	0x860B	# <CJK>
-0xE560	0x85FE	# <CJK>
-0xE561	0x85FA	# <CJK>
-0xE562	0x8606	# <CJK>
-0xE563	0x8622	# <CJK>
-0xE564	0x861A	# <CJK>
-0xE565	0x8630	# <CJK>
-0xE566	0x863F	# <CJK>
-0xE567	0x864D	# <CJK>
-0xE568	0x4E55	# <CJK>
-0xE569	0x8654	# <CJK>
-0xE56A	0x865F	# <CJK>
-0xE56B	0x8667	# <CJK>
-0xE56C	0x8671	# <CJK>
-0xE56D	0x8693	# <CJK>
-0xE56E	0x86A3	# <CJK>
-0xE56F	0x86A9	# <CJK>
-0xE570	0x86AA	# <CJK>
-0xE571	0x868B	# <CJK>
-0xE572	0x868C	# <CJK>
-0xE573	0x86B6	# <CJK>
-0xE574	0x86AF	# <CJK>
-0xE575	0x86C4	# <CJK>
-0xE576	0x86C6	# <CJK>
-0xE577	0x86B0	# <CJK>
-0xE578	0x86C9	# <CJK>
-0xE579	0x8823	# <CJK>
-0xE57A	0x86AB	# <CJK>
-0xE57B	0x86D4	# <CJK>
-0xE57C	0x86DE	# <CJK>
-0xE57D	0x86E9	# <CJK>
-0xE57E	0x86EC	# <CJK>
-0xE580	0x86DF	# <CJK>
-0xE581	0x86DB	# <CJK>
-0xE582	0x86EF	# <CJK>
-0xE583	0x8712	# <CJK>
-0xE584	0x8706	# <CJK>
-0xE585	0x8708	# <CJK>
-0xE586	0x8700	# <CJK>
-0xE587	0x8703	# <CJK>
-0xE588	0x86FB	# <CJK>
-0xE589	0x8711	# <CJK>
-0xE58A	0x8709	# <CJK>
-0xE58B	0x870D	# <CJK>
-0xE58C	0x86F9	# <CJK>
-0xE58D	0x870A	# <CJK>
-0xE58E	0x8734	# <CJK>
-0xE58F	0x873F	# <CJK>
-0xE590	0x8737	# <CJK>
-0xE591	0x873B	# <CJK>
-0xE592	0x8725	# <CJK>
-0xE593	0x8729	# <CJK>
-0xE594	0x871A	# <CJK>
-0xE595	0x8760	# <CJK>
-0xE596	0x875F	# <CJK>
-0xE597	0x8778	# <CJK>
-0xE598	0x874C	# <CJK>
-0xE599	0x874E	# <CJK>
-0xE59A	0x8774	# <CJK>
-0xE59B	0x8757	# <CJK>
-0xE59C	0x8768	# <CJK>
-0xE59D	0x876E	# <CJK>
-0xE59E	0x8759	# <CJK>
-0xE59F	0x8753	# <CJK>
-0xE5A0	0x8763	# <CJK>
-0xE5A1	0x876A	# <CJK>
-0xE5A2	0x8805	# <CJK>
-0xE5A3	0x87A2	# <CJK>
-0xE5A4	0x879F	# <CJK>
-0xE5A5	0x8782	# <CJK>
-0xE5A6	0x87AF	# <CJK>
-0xE5A7	0x87CB	# <CJK>
-0xE5A8	0x87BD	# <CJK>
-0xE5A9	0x87C0	# <CJK>
-0xE5AA	0x87D0	# <CJK>
-0xE5AB	0x96D6	# <CJK>
-0xE5AC	0x87AB	# <CJK>
-0xE5AD	0x87C4	# <CJK>
-0xE5AE	0x87B3	# <CJK>
-0xE5AF	0x87C7	# <CJK>
-0xE5B0	0x87C6	# <CJK>
-0xE5B1	0x87BB	# <CJK>
-0xE5B2	0x87EF	# <CJK>
-0xE5B3	0x87F2	# <CJK>
-0xE5B4	0x87E0	# <CJK>
-0xE5B5	0x880F	# <CJK>
-0xE5B6	0x880D	# <CJK>
-0xE5B7	0x87FE	# <CJK>
-0xE5B8	0x87F6	# <CJK>
-0xE5B9	0x87F7	# <CJK>
-0xE5BA	0x880E	# <CJK>
-0xE5BB	0x87D2	# <CJK>
-0xE5BC	0x8811	# <CJK>
-0xE5BD	0x8816	# <CJK>
-0xE5BE	0x8815	# <CJK>
-0xE5BF	0x8822	# <CJK>
-0xE5C0	0x8821	# <CJK>
-0xE5C1	0x8831	# <CJK>
-0xE5C2	0x8836	# <CJK>
-0xE5C3	0x8839	# <CJK>
-0xE5C4	0x8827	# <CJK>
-0xE5C5	0x883B	# <CJK>
-0xE5C6	0x8844	# <CJK>
-0xE5C7	0x8842	# <CJK>
-0xE5C8	0x8852	# <CJK>
-0xE5C9	0x8859	# <CJK>
-0xE5CA	0x885E	# <CJK>
-0xE5CB	0x8862	# <CJK>
-0xE5CC	0x886B	# <CJK>
-0xE5CD	0x8881	# <CJK>
-0xE5CE	0x887E	# <CJK>
-0xE5CF	0x889E	# <CJK>
-0xE5D0	0x8875	# <CJK>
-0xE5D1	0x887D	# <CJK>
-0xE5D2	0x88B5	# <CJK>
-0xE5D3	0x8872	# <CJK>
-0xE5D4	0x8882	# <CJK>
-0xE5D5	0x8897	# <CJK>
-0xE5D6	0x8892	# <CJK>
-0xE5D7	0x88AE	# <CJK>
-0xE5D8	0x8899	# <CJK>
-0xE5D9	0x88A2	# <CJK>
-0xE5DA	0x888D	# <CJK>
-0xE5DB	0x88A4	# <CJK>
-0xE5DC	0x88B0	# <CJK>
-0xE5DD	0x88BF	# <CJK>
-0xE5DE	0x88B1	# <CJK>
-0xE5DF	0x88C3	# <CJK>
-0xE5E0	0x88C4	# <CJK>
-0xE5E1	0x88D4	# <CJK>
-0xE5E2	0x88D8	# <CJK>
-0xE5E3	0x88D9	# <CJK>
-0xE5E4	0x88DD	# <CJK>
-0xE5E5	0x88F9	# <CJK>
-0xE5E6	0x8902	# <CJK>
-0xE5E7	0x88FC	# <CJK>
-0xE5E8	0x88F4	# <CJK>
-0xE5E9	0x88E8	# <CJK>
-0xE5EA	0x88F2	# <CJK>
-0xE5EB	0x8904	# <CJK>
-0xE5EC	0x890C	# <CJK>
-0xE5ED	0x890A	# <CJK>
-0xE5EE	0x8913	# <CJK>
-0xE5EF	0x8943	# <CJK>
-0xE5F0	0x891E	# <CJK>
-0xE5F1	0x8925	# <CJK>
-0xE5F2	0x892A	# <CJK>
-0xE5F3	0x892B	# <CJK>
-0xE5F4	0x8941	# <CJK>
-0xE5F5	0x8944	# <CJK>
-0xE5F6	0x893B	# <CJK>
-0xE5F7	0x8936	# <CJK>
-0xE5F8	0x8938	# <CJK>
-0xE5F9	0x894C	# <CJK>
-0xE5FA	0x891D	# <CJK>
-0xE5FB	0x8960	# <CJK>
-0xE5FC	0x895E	# <CJK>
-0xE640	0x8966	# <CJK>
-0xE641	0x8964	# <CJK>
-0xE642	0x896D	# <CJK>
-0xE643	0x896A	# <CJK>
-0xE644	0x896F	# <CJK>
-0xE645	0x8974	# <CJK>
-0xE646	0x8977	# <CJK>
-0xE647	0x897E	# <CJK>
-0xE648	0x8983	# <CJK>
-0xE649	0x8988	# <CJK>
-0xE64A	0x898A	# <CJK>
-0xE64B	0x8993	# <CJK>
-0xE64C	0x8998	# <CJK>
-0xE64D	0x89A1	# <CJK>
-0xE64E	0x89A9	# <CJK>
-0xE64F	0x89A6	# <CJK>
-0xE650	0x89AC	# <CJK>
-0xE651	0x89AF	# <CJK>
-0xE652	0x89B2	# <CJK>
-0xE653	0x89BA	# <CJK>
-0xE654	0x89BD	# <CJK>
-0xE655	0x89BF	# <CJK>
-0xE656	0x89C0	# <CJK>
-0xE657	0x89DA	# <CJK>
-0xE658	0x89DC	# <CJK>
-0xE659	0x89DD	# <CJK>
-0xE65A	0x89E7	# <CJK>
-0xE65B	0x89F4	# <CJK>
-0xE65C	0x89F8	# <CJK>
-0xE65D	0x8A03	# <CJK>
-0xE65E	0x8A16	# <CJK>
-0xE65F	0x8A10	# <CJK>
-0xE660	0x8A0C	# <CJK>
-0xE661	0x8A1B	# <CJK>
-0xE662	0x8A1D	# <CJK>
-0xE663	0x8A25	# <CJK>
-0xE664	0x8A36	# <CJK>
-0xE665	0x8A41	# <CJK>
-0xE666	0x8A5B	# <CJK>
-0xE667	0x8A52	# <CJK>
-0xE668	0x8A46	# <CJK>
-0xE669	0x8A48	# <CJK>
-0xE66A	0x8A7C	# <CJK>
-0xE66B	0x8A6D	# <CJK>
-0xE66C	0x8A6C	# <CJK>
-0xE66D	0x8A62	# <CJK>
-0xE66E	0x8A85	# <CJK>
-0xE66F	0x8A82	# <CJK>
-0xE670	0x8A84	# <CJK>
-0xE671	0x8AA8	# <CJK>
-0xE672	0x8AA1	# <CJK>
-0xE673	0x8A91	# <CJK>
-0xE674	0x8AA5	# <CJK>
-0xE675	0x8AA6	# <CJK>
-0xE676	0x8A9A	# <CJK>
-0xE677	0x8AA3	# <CJK>
-0xE678	0x8AC4	# <CJK>
-0xE679	0x8ACD	# <CJK>
-0xE67A	0x8AC2	# <CJK>
-0xE67B	0x8ADA	# <CJK>
-0xE67C	0x8AEB	# <CJK>
-0xE67D	0x8AF3	# <CJK>
-0xE67E	0x8AE7	# <CJK>
-0xE680	0x8AE4	# <CJK>
-0xE681	0x8AF1	# <CJK>
-0xE682	0x8B14	# <CJK>
-0xE683	0x8AE0	# <CJK>
-0xE684	0x8AE2	# <CJK>
-0xE685	0x8AF7	# <CJK>
-0xE686	0x8ADE	# <CJK>
-0xE687	0x8ADB	# <CJK>
-0xE688	0x8B0C	# <CJK>
-0xE689	0x8B07	# <CJK>
-0xE68A	0x8B1A	# <CJK>
-0xE68B	0x8AE1	# <CJK>
-0xE68C	0x8B16	# <CJK>
-0xE68D	0x8B10	# <CJK>
-0xE68E	0x8B17	# <CJK>
-0xE68F	0x8B20	# <CJK>
-0xE690	0x8B33	# <CJK>
-0xE691	0x97AB	# <CJK>
-0xE692	0x8B26	# <CJK>
-0xE693	0x8B2B	# <CJK>
-0xE694	0x8B3E	# <CJK>
-0xE695	0x8B28	# <CJK>
-0xE696	0x8B41	# <CJK>
-0xE697	0x8B4C	# <CJK>
-0xE698	0x8B4F	# <CJK>
-0xE699	0x8B4E	# <CJK>
-0xE69A	0x8B49	# <CJK>
-0xE69B	0x8B56	# <CJK>
-0xE69C	0x8B5B	# <CJK>
-0xE69D	0x8B5A	# <CJK>
-0xE69E	0x8B6B	# <CJK>
-0xE69F	0x8B5F	# <CJK>
-0xE6A0	0x8B6C	# <CJK>
-0xE6A1	0x8B6F	# <CJK>
-0xE6A2	0x8B74	# <CJK>
-0xE6A3	0x8B7D	# <CJK>
-0xE6A4	0x8B80	# <CJK>
-0xE6A5	0x8B8C	# <CJK>
-0xE6A6	0x8B8E	# <CJK>
-0xE6A7	0x8B92	# <CJK>
-0xE6A8	0x8B93	# <CJK>
-0xE6A9	0x8B96	# <CJK>
-0xE6AA	0x8B99	# <CJK>
-0xE6AB	0x8B9A	# <CJK>
-0xE6AC	0x8C3A	# <CJK>
-0xE6AD	0x8C41	# <CJK>
-0xE6AE	0x8C3F	# <CJK>
-0xE6AF	0x8C48	# <CJK>
-0xE6B0	0x8C4C	# <CJK>
-0xE6B1	0x8C4E	# <CJK>
-0xE6B2	0x8C50	# <CJK>
-0xE6B3	0x8C55	# <CJK>
-0xE6B4	0x8C62	# <CJK>
-0xE6B5	0x8C6C	# <CJK>
-0xE6B6	0x8C78	# <CJK>
-0xE6B7	0x8C7A	# <CJK>
-0xE6B8	0x8C82	# <CJK>
-0xE6B9	0x8C89	# <CJK>
-0xE6BA	0x8C85	# <CJK>
-0xE6BB	0x8C8A	# <CJK>
-0xE6BC	0x8C8D	# <CJK>
-0xE6BD	0x8C8E	# <CJK>
-0xE6BE	0x8C94	# <CJK>
-0xE6BF	0x8C7C	# <CJK>
-0xE6C0	0x8C98	# <CJK>
-0xE6C1	0x621D	# <CJK>
-0xE6C2	0x8CAD	# <CJK>
-0xE6C3	0x8CAA	# <CJK>
-0xE6C4	0x8CBD	# <CJK>
-0xE6C5	0x8CB2	# <CJK>
-0xE6C6	0x8CB3	# <CJK>
-0xE6C7	0x8CAE	# <CJK>
-0xE6C8	0x8CB6	# <CJK>
-0xE6C9	0x8CC8	# <CJK>
-0xE6CA	0x8CC1	# <CJK>
-0xE6CB	0x8CE4	# <CJK>
-0xE6CC	0x8CE3	# <CJK>
-0xE6CD	0x8CDA	# <CJK>
-0xE6CE	0x8CFD	# <CJK>
-0xE6CF	0x8CFA	# <CJK>
-0xE6D0	0x8CFB	# <CJK>
-0xE6D1	0x8D04	# <CJK>
-0xE6D2	0x8D05	# <CJK>
-0xE6D3	0x8D0A	# <CJK>
-0xE6D4	0x8D07	# <CJK>
-0xE6D5	0x8D0F	# <CJK>
-0xE6D6	0x8D0D	# <CJK>
-0xE6D7	0x8D10	# <CJK>
-0xE6D8	0x9F4E	# <CJK>
-0xE6D9	0x8D13	# <CJK>
-0xE6DA	0x8CCD	# <CJK>
-0xE6DB	0x8D14	# <CJK>
-0xE6DC	0x8D16	# <CJK>
-0xE6DD	0x8D67	# <CJK>
-0xE6DE	0x8D6D	# <CJK>
-0xE6DF	0x8D71	# <CJK>
-0xE6E0	0x8D73	# <CJK>
-0xE6E1	0x8D81	# <CJK>
-0xE6E2	0x8D99	# <CJK>
-0xE6E3	0x8DC2	# <CJK>
-0xE6E4	0x8DBE	# <CJK>
-0xE6E5	0x8DBA	# <CJK>
-0xE6E6	0x8DCF	# <CJK>
-0xE6E7	0x8DDA	# <CJK>
-0xE6E8	0x8DD6	# <CJK>
-0xE6E9	0x8DCC	# <CJK>
-0xE6EA	0x8DDB	# <CJK>
-0xE6EB	0x8DCB	# <CJK>
-0xE6EC	0x8DEA	# <CJK>
-0xE6ED	0x8DEB	# <CJK>
-0xE6EE	0x8DDF	# <CJK>
-0xE6EF	0x8DE3	# <CJK>
-0xE6F0	0x8DFC	# <CJK>
-0xE6F1	0x8E08	# <CJK>
-0xE6F2	0x8E09	# <CJK>
-0xE6F3	0x8DFF	# <CJK>
-0xE6F4	0x8E1D	# <CJK>
-0xE6F5	0x8E1E	# <CJK>
-0xE6F6	0x8E10	# <CJK>
-0xE6F7	0x8E1F	# <CJK>
-0xE6F8	0x8E42	# <CJK>
-0xE6F9	0x8E35	# <CJK>
-0xE6FA	0x8E30	# <CJK>
-0xE6FB	0x8E34	# <CJK>
-0xE6FC	0x8E4A	# <CJK>
-0xE740	0x8E47	# <CJK>
-0xE741	0x8E49	# <CJK>
-0xE742	0x8E4C	# <CJK>
-0xE743	0x8E50	# <CJK>
-0xE744	0x8E48	# <CJK>
-0xE745	0x8E59	# <CJK>
-0xE746	0x8E64	# <CJK>
-0xE747	0x8E60	# <CJK>
-0xE748	0x8E2A	# <CJK>
-0xE749	0x8E63	# <CJK>
-0xE74A	0x8E55	# <CJK>
-0xE74B	0x8E76	# <CJK>
-0xE74C	0x8E72	# <CJK>
-0xE74D	0x8E7C	# <CJK>
-0xE74E	0x8E81	# <CJK>
-0xE74F	0x8E87	# <CJK>
-0xE750	0x8E85	# <CJK>
-0xE751	0x8E84	# <CJK>
-0xE752	0x8E8B	# <CJK>
-0xE753	0x8E8A	# <CJK>
-0xE754	0x8E93	# <CJK>
-0xE755	0x8E91	# <CJK>
-0xE756	0x8E94	# <CJK>
-0xE757	0x8E99	# <CJK>
-0xE758	0x8EAA	# <CJK>
-0xE759	0x8EA1	# <CJK>
-0xE75A	0x8EAC	# <CJK>
-0xE75B	0x8EB0	# <CJK>
-0xE75C	0x8EC6	# <CJK>
-0xE75D	0x8EB1	# <CJK>
-0xE75E	0x8EBE	# <CJK>
-0xE75F	0x8EC5	# <CJK>
-0xE760	0x8EC8	# <CJK>
-0xE761	0x8ECB	# <CJK>
-0xE762	0x8EDB	# <CJK>
-0xE763	0x8EE3	# <CJK>
-0xE764	0x8EFC	# <CJK>
-0xE765	0x8EFB	# <CJK>
-0xE766	0x8EEB	# <CJK>
-0xE767	0x8EFE	# <CJK>
-0xE768	0x8F0A	# <CJK>
-0xE769	0x8F05	# <CJK>
-0xE76A	0x8F15	# <CJK>
-0xE76B	0x8F12	# <CJK>
-0xE76C	0x8F19	# <CJK>
-0xE76D	0x8F13	# <CJK>
-0xE76E	0x8F1C	# <CJK>
-0xE76F	0x8F1F	# <CJK>
-0xE770	0x8F1B	# <CJK>
-0xE771	0x8F0C	# <CJK>
-0xE772	0x8F26	# <CJK>
-0xE773	0x8F33	# <CJK>
-0xE774	0x8F3B	# <CJK>
-0xE775	0x8F39	# <CJK>
-0xE776	0x8F45	# <CJK>
-0xE777	0x8F42	# <CJK>
-0xE778	0x8F3E	# <CJK>
-0xE779	0x8F4C	# <CJK>
-0xE77A	0x8F49	# <CJK>
-0xE77B	0x8F46	# <CJK>
-0xE77C	0x8F4E	# <CJK>
-0xE77D	0x8F57	# <CJK>
-0xE77E	0x8F5C	# <CJK>
-0xE780	0x8F62	# <CJK>
-0xE781	0x8F63	# <CJK>
-0xE782	0x8F64	# <CJK>
-0xE783	0x8F9C	# <CJK>
-0xE784	0x8F9F	# <CJK>
-0xE785	0x8FA3	# <CJK>
-0xE786	0x8FAD	# <CJK>
-0xE787	0x8FAF	# <CJK>
-0xE788	0x8FB7	# <CJK>
-0xE789	0x8FDA	# <CJK>
-0xE78A	0x8FE5	# <CJK>
-0xE78B	0x8FE2	# <CJK>
-0xE78C	0x8FEA	# <CJK>
-0xE78D	0x8FEF	# <CJK>
-0xE78E	0x9087	# <CJK>
-0xE78F	0x8FF4	# <CJK>
-0xE790	0x9005	# <CJK>
-0xE791	0x8FF9	# <CJK>
-0xE792	0x8FFA	# <CJK>
-0xE793	0x9011	# <CJK>
-0xE794	0x9015	# <CJK>
-0xE795	0x9021	# <CJK>
-0xE796	0x900D	# <CJK>
-0xE797	0x901E	# <CJK>
-0xE798	0x9016	# <CJK>
-0xE799	0x900B	# <CJK>
-0xE79A	0x9027	# <CJK>
-0xE79B	0x9036	# <CJK>
-0xE79C	0x9035	# <CJK>
-0xE79D	0x9039	# <CJK>
-0xE79E	0x8FF8	# <CJK>
-0xE79F	0x904F	# <CJK>
-0xE7A0	0x9050	# <CJK>
-0xE7A1	0x9051	# <CJK>
-0xE7A2	0x9052	# <CJK>
-0xE7A3	0x900E	# <CJK>
-0xE7A4	0x9049	# <CJK>
-0xE7A5	0x903E	# <CJK>
-0xE7A6	0x9056	# <CJK>
-0xE7A7	0x9058	# <CJK>
-0xE7A8	0x905E	# <CJK>
-0xE7A9	0x9068	# <CJK>
-0xE7AA	0x906F	# <CJK>
-0xE7AB	0x9076	# <CJK>
-0xE7AC	0x96A8	# <CJK>
-0xE7AD	0x9072	# <CJK>
-0xE7AE	0x9082	# <CJK>
-0xE7AF	0x907D	# <CJK>
-0xE7B0	0x9081	# <CJK>
-0xE7B1	0x9080	# <CJK>
-0xE7B2	0x908A	# <CJK>
-0xE7B3	0x9089	# <CJK>
-0xE7B4	0x908F	# <CJK>
-0xE7B5	0x90A8	# <CJK>
-0xE7B6	0x90AF	# <CJK>
-0xE7B7	0x90B1	# <CJK>
-0xE7B8	0x90B5	# <CJK>
-0xE7B9	0x90E2	# <CJK>
-0xE7BA	0x90E4	# <CJK>
-0xE7BB	0x6248	# <CJK>
-0xE7BC	0x90DB	# <CJK>
-0xE7BD	0x9102	# <CJK>
-0xE7BE	0x9112	# <CJK>
-0xE7BF	0x9119	# <CJK>
-0xE7C0	0x9132	# <CJK>
-0xE7C1	0x9130	# <CJK>
-0xE7C2	0x914A	# <CJK>
-0xE7C3	0x9156	# <CJK>
-0xE7C4	0x9158	# <CJK>
-0xE7C5	0x9163	# <CJK>
-0xE7C6	0x9165	# <CJK>
-0xE7C7	0x9169	# <CJK>
-0xE7C8	0x9173	# <CJK>
-0xE7C9	0x9172	# <CJK>
-0xE7CA	0x918B	# <CJK>
-0xE7CB	0x9189	# <CJK>
-0xE7CC	0x9182	# <CJK>
-0xE7CD	0x91A2	# <CJK>
-0xE7CE	0x91AB	# <CJK>
-0xE7CF	0x91AF	# <CJK>
-0xE7D0	0x91AA	# <CJK>
-0xE7D1	0x91B5	# <CJK>
-0xE7D2	0x91B4	# <CJK>
-0xE7D3	0x91BA	# <CJK>
-0xE7D4	0x91C0	# <CJK>
-0xE7D5	0x91C1	# <CJK>
-0xE7D6	0x91C9	# <CJK>
-0xE7D7	0x91CB	# <CJK>
-0xE7D8	0x91D0	# <CJK>
-0xE7D9	0x91D6	# <CJK>
-0xE7DA	0x91DF	# <CJK>
-0xE7DB	0x91E1	# <CJK>
-0xE7DC	0x91DB	# <CJK>
-0xE7DD	0x91FC	# <CJK>
-0xE7DE	0x91F5	# <CJK>
-0xE7DF	0x91F6	# <CJK>
-0xE7E0	0x921E	# <CJK>
-0xE7E1	0x91FF	# <CJK>
-0xE7E2	0x9214	# <CJK>
-0xE7E3	0x922C	# <CJK>
-0xE7E4	0x9215	# <CJK>
-0xE7E5	0x9211	# <CJK>
-0xE7E6	0x925E	# <CJK>
-0xE7E7	0x9257	# <CJK>
-0xE7E8	0x9245	# <CJK>
-0xE7E9	0x9249	# <CJK>
-0xE7EA	0x9264	# <CJK>
-0xE7EB	0x9248	# <CJK>
-0xE7EC	0x9295	# <CJK>
-0xE7ED	0x923F	# <CJK>
-0xE7EE	0x924B	# <CJK>
-0xE7EF	0x9250	# <CJK>
-0xE7F0	0x929C	# <CJK>
-0xE7F1	0x9296	# <CJK>
-0xE7F2	0x9293	# <CJK>
-0xE7F3	0x929B	# <CJK>
-0xE7F4	0x925A	# <CJK>
-0xE7F5	0x92CF	# <CJK>
-0xE7F6	0x92B9	# <CJK>
-0xE7F7	0x92B7	# <CJK>
-0xE7F8	0x92E9	# <CJK>
-0xE7F9	0x930F	# <CJK>
-0xE7FA	0x92FA	# <CJK>
-0xE7FB	0x9344	# <CJK>
-0xE7FC	0x932E	# <CJK>
-0xE840	0x9319	# <CJK>
-0xE841	0x9322	# <CJK>
-0xE842	0x931A	# <CJK>
-0xE843	0x9323	# <CJK>
-0xE844	0x933A	# <CJK>
-0xE845	0x9335	# <CJK>
-0xE846	0x933B	# <CJK>
-0xE847	0x935C	# <CJK>
-0xE848	0x9360	# <CJK>
-0xE849	0x937C	# <CJK>
-0xE84A	0x936E	# <CJK>
-0xE84B	0x9356	# <CJK>
-0xE84C	0x93B0	# <CJK>
-0xE84D	0x93AC	# <CJK>
-0xE84E	0x93AD	# <CJK>
-0xE84F	0x9394	# <CJK>
-0xE850	0x93B9	# <CJK>
-0xE851	0x93D6	# <CJK>
-0xE852	0x93D7	# <CJK>
-0xE853	0x93E8	# <CJK>
-0xE854	0x93E5	# <CJK>
-0xE855	0x93D8	# <CJK>
-0xE856	0x93C3	# <CJK>
-0xE857	0x93DD	# <CJK>
-0xE858	0x93D0	# <CJK>
-0xE859	0x93C8	# <CJK>
-0xE85A	0x93E4	# <CJK>
-0xE85B	0x941A	# <CJK>
-0xE85C	0x9414	# <CJK>
-0xE85D	0x9413	# <CJK>
-0xE85E	0x9403	# <CJK>
-0xE85F	0x9407	# <CJK>
-0xE860	0x9410	# <CJK>
-0xE861	0x9436	# <CJK>
-0xE862	0x942B	# <CJK>
-0xE863	0x9435	# <CJK>
-0xE864	0x9421	# <CJK>
-0xE865	0x943A	# <CJK>
-0xE866	0x9441	# <CJK>
-0xE867	0x9452	# <CJK>
-0xE868	0x9444	# <CJK>
-0xE869	0x945B	# <CJK>
-0xE86A	0x9460	# <CJK>
-0xE86B	0x9462	# <CJK>
-0xE86C	0x945E	# <CJK>
-0xE86D	0x946A	# <CJK>
-0xE86E	0x9229	# <CJK>
-0xE86F	0x9470	# <CJK>
-0xE870	0x9475	# <CJK>
-0xE871	0x9477	# <CJK>
-0xE872	0x947D	# <CJK>
-0xE873	0x945A	# <CJK>
-0xE874	0x947C	# <CJK>
-0xE875	0x947E	# <CJK>
-0xE876	0x9481	# <CJK>
-0xE877	0x947F	# <CJK>
-0xE878	0x9582	# <CJK>
-0xE879	0x9587	# <CJK>
-0xE87A	0x958A	# <CJK>
-0xE87B	0x9594	# <CJK>
-0xE87C	0x9596	# <CJK>
-0xE87D	0x9598	# <CJK>
-0xE87E	0x9599	# <CJK>
-0xE880	0x95A0	# <CJK>
-0xE881	0x95A8	# <CJK>
-0xE882	0x95A7	# <CJK>
-0xE883	0x95AD	# <CJK>
-0xE884	0x95BC	# <CJK>
-0xE885	0x95BB	# <CJK>
-0xE886	0x95B9	# <CJK>
-0xE887	0x95BE	# <CJK>
-0xE888	0x95CA	# <CJK>
-0xE889	0x6FF6	# <CJK>
-0xE88A	0x95C3	# <CJK>
-0xE88B	0x95CD	# <CJK>
-0xE88C	0x95CC	# <CJK>
-0xE88D	0x95D5	# <CJK>
-0xE88E	0x95D4	# <CJK>
-0xE88F	0x95D6	# <CJK>
-0xE890	0x95DC	# <CJK>
-0xE891	0x95E1	# <CJK>
-0xE892	0x95E5	# <CJK>
-0xE893	0x95E2	# <CJK>
-0xE894	0x9621	# <CJK>
-0xE895	0x9628	# <CJK>
-0xE896	0x962E	# <CJK>
-0xE897	0x962F	# <CJK>
-0xE898	0x9642	# <CJK>
-0xE899	0x964C	# <CJK>
-0xE89A	0x964F	# <CJK>
-0xE89B	0x964B	# <CJK>
-0xE89C	0x9677	# <CJK>
-0xE89D	0x965C	# <CJK>
-0xE89E	0x965E	# <CJK>
-0xE89F	0x965D	# <CJK>
-0xE8A0	0x965F	# <CJK>
-0xE8A1	0x9666	# <CJK>
-0xE8A2	0x9672	# <CJK>
-0xE8A3	0x966C	# <CJK>
-0xE8A4	0x968D	# <CJK>
-0xE8A5	0x9698	# <CJK>
-0xE8A6	0x9695	# <CJK>
-0xE8A7	0x9697	# <CJK>
-0xE8A8	0x96AA	# <CJK>
-0xE8A9	0x96A7	# <CJK>
-0xE8AA	0x96B1	# <CJK>
-0xE8AB	0x96B2	# <CJK>
-0xE8AC	0x96B0	# <CJK>
-0xE8AD	0x96B4	# <CJK>
-0xE8AE	0x96B6	# <CJK>
-0xE8AF	0x96B8	# <CJK>
-0xE8B0	0x96B9	# <CJK>
-0xE8B1	0x96CE	# <CJK>
-0xE8B2	0x96CB	# <CJK>
-0xE8B3	0x96C9	# <CJK>
-0xE8B4	0x96CD	# <CJK>
-0xE8B5	0x894D	# <CJK>
-0xE8B6	0x96DC	# <CJK>
-0xE8B7	0x970D	# <CJK>
-0xE8B8	0x96D5	# <CJK>
-0xE8B9	0x96F9	# <CJK>
-0xE8BA	0x9704	# <CJK>
-0xE8BB	0x9706	# <CJK>
-0xE8BC	0x9708	# <CJK>
-0xE8BD	0x9713	# <CJK>
-0xE8BE	0x970E	# <CJK>
-0xE8BF	0x9711	# <CJK>
-0xE8C0	0x970F	# <CJK>
-0xE8C1	0x9716	# <CJK>
-0xE8C2	0x9719	# <CJK>
-0xE8C3	0x9724	# <CJK>
-0xE8C4	0x972A	# <CJK>
-0xE8C5	0x9730	# <CJK>
-0xE8C6	0x9739	# <CJK>
-0xE8C7	0x973D	# <CJK>
-0xE8C8	0x973E	# <CJK>
-0xE8C9	0x9744	# <CJK>
-0xE8CA	0x9746	# <CJK>
-0xE8CB	0x9748	# <CJK>
-0xE8CC	0x9742	# <CJK>
-0xE8CD	0x9749	# <CJK>
-0xE8CE	0x975C	# <CJK>
-0xE8CF	0x9760	# <CJK>
-0xE8D0	0x9764	# <CJK>
-0xE8D1	0x9766	# <CJK>
-0xE8D2	0x9768	# <CJK>
-0xE8D3	0x52D2	# <CJK>
-0xE8D4	0x976B	# <CJK>
-0xE8D5	0x9771	# <CJK>
-0xE8D6	0x9779	# <CJK>
-0xE8D7	0x9785	# <CJK>
-0xE8D8	0x977C	# <CJK>
-0xE8D9	0x9781	# <CJK>
-0xE8DA	0x977A	# <CJK>
-0xE8DB	0x9786	# <CJK>
-0xE8DC	0x978B	# <CJK>
-0xE8DD	0x978F	# <CJK>
-0xE8DE	0x9790	# <CJK>
-0xE8DF	0x979C	# <CJK>
-0xE8E0	0x97A8	# <CJK>
-0xE8E1	0x97A6	# <CJK>
-0xE8E2	0x97A3	# <CJK>
-0xE8E3	0x97B3	# <CJK>
-0xE8E4	0x97B4	# <CJK>
-0xE8E5	0x97C3	# <CJK>
-0xE8E6	0x97C6	# <CJK>
-0xE8E7	0x97C8	# <CJK>
-0xE8E8	0x97CB	# <CJK>
-0xE8E9	0x97DC	# <CJK>
-0xE8EA	0x97ED	# <CJK>
-0xE8EB	0x9F4F	# <CJK>
-0xE8EC	0x97F2	# <CJK>
-0xE8ED	0x7ADF	# <CJK>
-0xE8EE	0x97F6	# <CJK>
-0xE8EF	0x97F5	# <CJK>
-0xE8F0	0x980F	# <CJK>
-0xE8F1	0x980C	# <CJK>
-0xE8F2	0x9838	# <CJK>
-0xE8F3	0x9824	# <CJK>
-0xE8F4	0x9821	# <CJK>
-0xE8F5	0x9837	# <CJK>
-0xE8F6	0x983D	# <CJK>
-0xE8F7	0x9846	# <CJK>
-0xE8F8	0x984F	# <CJK>
-0xE8F9	0x984B	# <CJK>
-0xE8FA	0x986B	# <CJK>
-0xE8FB	0x986F	# <CJK>
-0xE8FC	0x9870	# <CJK>
-0xE940	0x9871	# <CJK>
-0xE941	0x9874	# <CJK>
-0xE942	0x9873	# <CJK>
-0xE943	0x98AA	# <CJK>
-0xE944	0x98AF	# <CJK>
-0xE945	0x98B1	# <CJK>
-0xE946	0x98B6	# <CJK>
-0xE947	0x98C4	# <CJK>
-0xE948	0x98C3	# <CJK>
-0xE949	0x98C6	# <CJK>
-0xE94A	0x98E9	# <CJK>
-0xE94B	0x98EB	# <CJK>
-0xE94C	0x9903	# <CJK>
-0xE94D	0x9909	# <CJK>
-0xE94E	0x9912	# <CJK>
-0xE94F	0x9914	# <CJK>
-0xE950	0x9918	# <CJK>
-0xE951	0x9921	# <CJK>
-0xE952	0x991D	# <CJK>
-0xE953	0x991E	# <CJK>
-0xE954	0x9924	# <CJK>
-0xE955	0x9920	# <CJK>
-0xE956	0x992C	# <CJK>
-0xE957	0x992E	# <CJK>
-0xE958	0x993D	# <CJK>
-0xE959	0x993E	# <CJK>
-0xE95A	0x9942	# <CJK>
-0xE95B	0x9949	# <CJK>
-0xE95C	0x9945	# <CJK>
-0xE95D	0x9950	# <CJK>
-0xE95E	0x994B	# <CJK>
-0xE95F	0x9951	# <CJK>
-0xE960	0x9952	# <CJK>
-0xE961	0x994C	# <CJK>
-0xE962	0x9955	# <CJK>
-0xE963	0x9997	# <CJK>
-0xE964	0x9998	# <CJK>
-0xE965	0x99A5	# <CJK>
-0xE966	0x99AD	# <CJK>
-0xE967	0x99AE	# <CJK>
-0xE968	0x99BC	# <CJK>
-0xE969	0x99DF	# <CJK>
-0xE96A	0x99DB	# <CJK>
-0xE96B	0x99DD	# <CJK>
-0xE96C	0x99D8	# <CJK>
-0xE96D	0x99D1	# <CJK>
-0xE96E	0x99ED	# <CJK>
-0xE96F	0x99EE	# <CJK>
-0xE970	0x99F1	# <CJK>
-0xE971	0x99F2	# <CJK>
-0xE972	0x99FB	# <CJK>
-0xE973	0x99F8	# <CJK>
-0xE974	0x9A01	# <CJK>
-0xE975	0x9A0F	# <CJK>
-0xE976	0x9A05	# <CJK>
-0xE977	0x99E2	# <CJK>
-0xE978	0x9A19	# <CJK>
-0xE979	0x9A2B	# <CJK>
-0xE97A	0x9A37	# <CJK>
-0xE97B	0x9A45	# <CJK>
-0xE97C	0x9A42	# <CJK>
-0xE97D	0x9A40	# <CJK>
-0xE97E	0x9A43	# <CJK>
-0xE980	0x9A3E	# <CJK>
-0xE981	0x9A55	# <CJK>
-0xE982	0x9A4D	# <CJK>
-0xE983	0x9A5B	# <CJK>
-0xE984	0x9A57	# <CJK>
-0xE985	0x9A5F	# <CJK>
-0xE986	0x9A62	# <CJK>
-0xE987	0x9A65	# <CJK>
-0xE988	0x9A64	# <CJK>
-0xE989	0x9A69	# <CJK>
-0xE98A	0x9A6B	# <CJK>
-0xE98B	0x9A6A	# <CJK>
-0xE98C	0x9AAD	# <CJK>
-0xE98D	0x9AB0	# <CJK>
-0xE98E	0x9ABC	# <CJK>
-0xE98F	0x9AC0	# <CJK>
-0xE990	0x9ACF	# <CJK>
-0xE991	0x9AD1	# <CJK>
-0xE992	0x9AD3	# <CJK>
-0xE993	0x9AD4	# <CJK>
-0xE994	0x9ADE	# <CJK>
-0xE995	0x9ADF	# <CJK>
-0xE996	0x9AE2	# <CJK>
-0xE997	0x9AE3	# <CJK>
-0xE998	0x9AE6	# <CJK>
-0xE999	0x9AEF	# <CJK>
-0xE99A	0x9AEB	# <CJK>
-0xE99B	0x9AEE	# <CJK>
-0xE99C	0x9AF4	# <CJK>
-0xE99D	0x9AF1	# <CJK>
-0xE99E	0x9AF7	# <CJK>
-0xE99F	0x9AFB	# <CJK>
-0xE9A0	0x9B06	# <CJK>
-0xE9A1	0x9B18	# <CJK>
-0xE9A2	0x9B1A	# <CJK>
-0xE9A3	0x9B1F	# <CJK>
-0xE9A4	0x9B22	# <CJK>
-0xE9A5	0x9B23	# <CJK>
-0xE9A6	0x9B25	# <CJK>
-0xE9A7	0x9B27	# <CJK>
-0xE9A8	0x9B28	# <CJK>
-0xE9A9	0x9B29	# <CJK>
-0xE9AA	0x9B2A	# <CJK>
-0xE9AB	0x9B2E	# <CJK>
-0xE9AC	0x9B2F	# <CJK>
-0xE9AD	0x9B32	# <CJK>
-0xE9AE	0x9B44	# <CJK>
-0xE9AF	0x9B43	# <CJK>
-0xE9B0	0x9B4F	# <CJK>
-0xE9B1	0x9B4D	# <CJK>
-0xE9B2	0x9B4E	# <CJK>
-0xE9B3	0x9B51	# <CJK>
-0xE9B4	0x9B58	# <CJK>
-0xE9B5	0x9B74	# <CJK>
-0xE9B6	0x9B93	# <CJK>
-0xE9B7	0x9B83	# <CJK>
-0xE9B8	0x9B91	# <CJK>
-0xE9B9	0x9B96	# <CJK>
-0xE9BA	0x9B97	# <CJK>
-0xE9BB	0x9B9F	# <CJK>
-0xE9BC	0x9BA0	# <CJK>
-0xE9BD	0x9BA8	# <CJK>
-0xE9BE	0x9BB4	# <CJK>
-0xE9BF	0x9BC0	# <CJK>
-0xE9C0	0x9BCA	# <CJK>
-0xE9C1	0x9BB9	# <CJK>
-0xE9C2	0x9BC6	# <CJK>
-0xE9C3	0x9BCF	# <CJK>
-0xE9C4	0x9BD1	# <CJK>
-0xE9C5	0x9BD2	# <CJK>
-0xE9C6	0x9BE3	# <CJK>
-0xE9C7	0x9BE2	# <CJK>
-0xE9C8	0x9BE4	# <CJK>
-0xE9C9	0x9BD4	# <CJK>
-0xE9CA	0x9BE1	# <CJK>
-0xE9CB	0x9C3A	# <CJK>
-0xE9CC	0x9BF2	# <CJK>
-0xE9CD	0x9BF1	# <CJK>
-0xE9CE	0x9BF0	# <CJK>
-0xE9CF	0x9C15	# <CJK>
-0xE9D0	0x9C14	# <CJK>
-0xE9D1	0x9C09	# <CJK>
-0xE9D2	0x9C13	# <CJK>
-0xE9D3	0x9C0C	# <CJK>
-0xE9D4	0x9C06	# <CJK>
-0xE9D5	0x9C08	# <CJK>
-0xE9D6	0x9C12	# <CJK>
-0xE9D7	0x9C0A	# <CJK>
-0xE9D8	0x9C04	# <CJK>
-0xE9D9	0x9C2E	# <CJK>
-0xE9DA	0x9C1B	# <CJK>
-0xE9DB	0x9C25	# <CJK>
-0xE9DC	0x9C24	# <CJK>
-0xE9DD	0x9C21	# <CJK>
-0xE9DE	0x9C30	# <CJK>
-0xE9DF	0x9C47	# <CJK>
-0xE9E0	0x9C32	# <CJK>
-0xE9E1	0x9C46	# <CJK>
-0xE9E2	0x9C3E	# <CJK>
-0xE9E3	0x9C5A	# <CJK>
-0xE9E4	0x9C60	# <CJK>
-0xE9E5	0x9C67	# <CJK>
-0xE9E6	0x9C76	# <CJK>
-0xE9E7	0x9C78	# <CJK>
-0xE9E8	0x9CE7	# <CJK>
-0xE9E9	0x9CEC	# <CJK>
-0xE9EA	0x9CF0	# <CJK>
-0xE9EB	0x9D09	# <CJK>
-0xE9EC	0x9D08	# <CJK>
-0xE9ED	0x9CEB	# <CJK>
-0xE9EE	0x9D03	# <CJK>
-0xE9EF	0x9D06	# <CJK>
-0xE9F0	0x9D2A	# <CJK>
-0xE9F1	0x9D26	# <CJK>
-0xE9F2	0x9DAF	# <CJK>
-0xE9F3	0x9D23	# <CJK>
-0xE9F4	0x9D1F	# <CJK>
-0xE9F5	0x9D44	# <CJK>
-0xE9F6	0x9D15	# <CJK>
-0xE9F7	0x9D12	# <CJK>
-0xE9F8	0x9D41	# <CJK>
-0xE9F9	0x9D3F	# <CJK>
-0xE9FA	0x9D3E	# <CJK>
-0xE9FB	0x9D46	# <CJK>
-0xE9FC	0x9D48	# <CJK>
-0xEA40	0x9D5D	# <CJK>
-0xEA41	0x9D5E	# <CJK>
-0xEA42	0x9D64	# <CJK>
-0xEA43	0x9D51	# <CJK>
-0xEA44	0x9D50	# <CJK>
-0xEA45	0x9D59	# <CJK>
-0xEA46	0x9D72	# <CJK>
-0xEA47	0x9D89	# <CJK>
-0xEA48	0x9D87	# <CJK>
-0xEA49	0x9DAB	# <CJK>
-0xEA4A	0x9D6F	# <CJK>
-0xEA4B	0x9D7A	# <CJK>
-0xEA4C	0x9D9A	# <CJK>
-0xEA4D	0x9DA4	# <CJK>
-0xEA4E	0x9DA9	# <CJK>
-0xEA4F	0x9DB2	# <CJK>
-0xEA50	0x9DC4	# <CJK>
-0xEA51	0x9DC1	# <CJK>
-0xEA52	0x9DBB	# <CJK>
-0xEA53	0x9DB8	# <CJK>
-0xEA54	0x9DBA	# <CJK>
-0xEA55	0x9DC6	# <CJK>
-0xEA56	0x9DCF	# <CJK>
-0xEA57	0x9DC2	# <CJK>
-0xEA58	0x9DD9	# <CJK>
-0xEA59	0x9DD3	# <CJK>
-0xEA5A	0x9DF8	# <CJK>
-0xEA5B	0x9DE6	# <CJK>
-0xEA5C	0x9DED	# <CJK>
-0xEA5D	0x9DEF	# <CJK>
-0xEA5E	0x9DFD	# <CJK>
-0xEA5F	0x9E1A	# <CJK>
-0xEA60	0x9E1B	# <CJK>
-0xEA61	0x9E1E	# <CJK>
-0xEA62	0x9E75	# <CJK>
-0xEA63	0x9E79	# <CJK>
-0xEA64	0x9E7D	# <CJK>
-0xEA65	0x9E81	# <CJK>
-0xEA66	0x9E88	# <CJK>
-0xEA67	0x9E8B	# <CJK>
-0xEA68	0x9E8C	# <CJK>
-0xEA69	0x9E92	# <CJK>
-0xEA6A	0x9E95	# <CJK>
-0xEA6B	0x9E91	# <CJK>
-0xEA6C	0x9E9D	# <CJK>
-0xEA6D	0x9EA5	# <CJK>
-0xEA6E	0x9EA9	# <CJK>
-0xEA6F	0x9EB8	# <CJK>
-0xEA70	0x9EAA	# <CJK>
-0xEA71	0x9EAD	# <CJK>
-0xEA72	0x9761	# <CJK>
-0xEA73	0x9ECC	# <CJK>
-0xEA74	0x9ECE	# <CJK>
-0xEA75	0x9ECF	# <CJK>
-0xEA76	0x9ED0	# <CJK>
-0xEA77	0x9ED4	# <CJK>
-0xEA78	0x9EDC	# <CJK>
-0xEA79	0x9EDE	# <CJK>
-0xEA7A	0x9EDD	# <CJK>
-0xEA7B	0x9EE0	# <CJK>
-0xEA7C	0x9EE5	# <CJK>
-0xEA7D	0x9EE8	# <CJK>
-0xEA7E	0x9EEF	# <CJK>
-0xEA80	0x9EF4	# <CJK>
-0xEA81	0x9EF6	# <CJK>
-0xEA82	0x9EF7	# <CJK>
-0xEA83	0x9EF9	# <CJK>
-0xEA84	0x9EFB	# <CJK>
-0xEA85	0x9EFC	# <CJK>
-0xEA86	0x9EFD	# <CJK>
-0xEA87	0x9F07	# <CJK>
-0xEA88	0x9F08	# <CJK>
-0xEA89	0x76B7	# <CJK>
-0xEA8A	0x9F15	# <CJK>
-0xEA8B	0x9F21	# <CJK>
-0xEA8C	0x9F2C	# <CJK>
-0xEA8D	0x9F3E	# <CJK>
-0xEA8E	0x9F4A	# <CJK>
-0xEA8F	0x9F52	# <CJK>
-0xEA90	0x9F54	# <CJK>
-0xEA91	0x9F63	# <CJK>
-0xEA92	0x9F5F	# <CJK>
-0xEA93	0x9F60	# <CJK>
-0xEA94	0x9F61	# <CJK>
-0xEA95	0x9F66	# <CJK>
-0xEA96	0x9F67	# <CJK>
-0xEA97	0x9F6C	# <CJK>
-0xEA98	0x9F6A	# <CJK>
-0xEA99	0x9F77	# <CJK>
-0xEA9A	0x9F72	# <CJK>
-0xEA9B	0x9F76	# <CJK>
-0xEA9C	0x9F95	# <CJK>
-0xEA9D	0x9F9C	# <CJK>
-0xEA9E	0x9FA0	# <CJK>
-0xEA9F	0x582F	# <CJK>
-0xEAA0	0x69C7	# <CJK>
-0xEAA1	0x9059	# <CJK>
-0xEAA2	0x7464	# <CJK>
-0xEAA3	0x51DC	# <CJK>
-0xEAA4	0x7199	# <CJK>
diff --git a/tools/encoding/symbol.txt b/tools/encoding/symbol.txt
deleted file mode 100644
index 12dcae6..0000000
--- a/tools/encoding/symbol.txt
+++ /dev/null
@@ -1,265 +0,0 @@
-#
-#   Name:             MacOS_Symbol [to Unicode]
-#   Unicode versions: 1.1, 2.0
-#   Table version:    0.2 (from internal ufrm version <4>)
-#   Date:             15 April 1995
-#   Author:           Peter Edberg <edberg1@applelink.apple.com>
-#
-#   Copyright (c) 1995 Apple Computer, Inc.  All Rights reserved.
-#
-#   Apple, the Apple logo, and Macintosh are trademarks of Apple
-#   Computer, Inc., registered in the United States and other countries.
-#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
-#   throughout this document, "Macintosh" can be used to refer to
-#   Macintosh computers and "Unicode" can be used to refer to the
-#   Unicode standard.
-#
-#   Apple makes no warranty or representation, either express or
-#   implied, with respect to these tables, their quality, accuracy, or
-#   fitness for a particular purpose. In no event will Apple be liable
-#   for direct, indirect, special, incidental, or consequential damages
-#   resulting from any defect or inaccuracy in this document or the
-#   accompanying tables.
-#
-#   These mapping tables and character lists are preliminary and
-#   subject to change. Updated tables will be available from the
-#   Unicode Inc. ftp site (unicode.org), the Apple Computer ftp site
-#   (ftp.info.apple.com), the Apple Computer World-Wide Web pages
-#   (http://www.info.apple.com), and possibly on diskette from APDA
-#   (Apple's mail-order distribution service for developers).
-#
-#   Format:
-#   -------
-#
-#   Three tab-separated columns;
-#   '#' begins a comment which continues to the end of the line.
-#     Column #1 is the MacOS Symbol code (in hex as 0xNN)
-#     Column #2 is the Unicode (in hex as 0xNNNN)
-#     Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#   The entries are in MacOS Symbol code order.
-#
-#   Several of these mappings require the use of corporate
-#   characters, including the Apple logo character. See the file
-#   "MacOS-CorpCharList".
-#   NOTE: The graphic image associated with the Apple logo character
-#   is not authorized for use without permission of Apple, and
-#   unauthorized use might constitute trademark infringement.
-#
-#   Notes on MacOS Symbol:
-#   ----------------------
-#
-#   The MacOS Symbol encoding shares the script code smRoman
-#   (0) with the standard MacOS Roman encoding. To determine if
-#   the Symbol encoding is being used, you must check if the
-#   font name is "Symbol".
-#
-#   The layout of the MacOS Symbol character set is identical to
-#   the layout of the Adobe Symbol encoding vector, with the
-#   addition of the Apple logo character at 0xF0.
-#
-#   This character set encodes a number of glyph fragments. Some are
-#   used as extenders: 0x60 is used to extend radical signs, 0xBD and
-#   0xBE are used to extend vertical and horizontal arrows, etc. In
-#   addition, there are top, bottom, and center sections for
-#   parentheses, brackets, integral signs, and other signs that may
-#   extend vertically for 2 or more lines of normal text. In general,
-#   Unicode does not encode such fragments, so corporate characters
-#   are used for round-trip fidelity.
-#
-#   In addition, Symbol separately encodes both serif and sans-serif
-#   forms for copyright, trademark, and registered signs. Unicode
-#   encodes only the abstract characters, so one set of these (the
-#   sans-serif forms) are mapped using corporate characters.
-#
-##################
-
-0x20	0x0020	# SPACE
-0x21	0x0021	# EXCLAMATION MARK
-0x22	0x2200	# FOR ALL
-0x23	0x0023	# NUMBER SIGN
-0x24	0x2203	# THERE EXISTS
-0x25	0x0025	# PERCENT SIGN
-0x26	0x0026	# AMPERSAND
-0x27	0x220D	# SMALL CONTAINS AS MEMBER
-0x28	0x0028	# LEFT PARENTHESIS
-0x29	0x0029	# RIGHT PARENTHESIS
-0x2A	0x2217	# ASTERISK OPERATOR
-0x2B	0x002B	# PLUS SIGN
-0x2C	0x002C	# COMMA
-0x2D	0x2212	# MINUS SIGN
-0x2E	0x002E	# FULL STOP
-0x2F	0x002F	# SOLIDUS
-0x30	0x0030	# DIGIT ZERO
-0x31	0x0031	# DIGIT ONE
-0x32	0x0032	# DIGIT TWO
-0x33	0x0033	# DIGIT THREE
-0x34	0x0034	# DIGIT FOUR
-0x35	0x0035	# DIGIT FIVE
-0x36	0x0036	# DIGIT SIX
-0x37	0x0037	# DIGIT SEVEN
-0x38	0x0038	# DIGIT EIGHT
-0x39	0x0039	# DIGIT NINE
-0x3A	0x003A	# COLON
-0x3B	0x003B	# SEMICOLON
-0x3C	0x003C	# LESS-THAN SIGN
-0x3D	0x003D	# EQUALS SIGN
-0x3E	0x003E	# GREATER-THAN SIGN
-0x3F	0x003F	# QUESTION MARK
-0x40	0x2245	# APPROXIMATELY EQUAL TO
-0x41	0x0391	# GREEK CAPITAL LETTER ALPHA
-0x42	0x0392	# GREEK CAPITAL LETTER BETA
-0x43	0x03A7	# GREEK CAPITAL LETTER CHI
-0x44	0x0394	# GREEK CAPITAL LETTER DELTA
-0x45	0x0395	# GREEK CAPITAL LETTER EPSILON
-0x46	0x03A6	# GREEK CAPITAL LETTER PHI
-0x47	0x0393	# GREEK CAPITAL LETTER GAMMA
-0x48	0x0397	# GREEK CAPITAL LETTER ETA
-0x49	0x0399	# GREEK CAPITAL LETTER IOTA
-0x4A	0x03D1	# GREEK THETA SYMBOL
-0x4B	0x039A	# GREEK CAPITAL LETTER KAPPA
-0x4C	0x039B	# GREEK CAPITAL LETTER LAMBDA
-0x4D	0x039C	# GREEK CAPITAL LETTER MU
-0x4E	0x039D	# GREEK CAPITAL LETTER NU
-0x4F	0x039F	# GREEK CAPITAL LETTER OMICRON
-0x50	0x03A0	# GREEK CAPITAL LETTER PI
-0x51	0x0398	# GREEK CAPITAL LETTER THETA
-0x52	0x03A1	# GREEK CAPITAL LETTER RHO
-0x53	0x03A3	# GREEK CAPITAL LETTER SIGMA
-0x54	0x03A4	# GREEK CAPITAL LETTER TAU
-0x55	0x03A5	# GREEK CAPITAL LETTER UPSILON
-0x56	0x03C2	# GREEK SMALL LETTER FINAL SIGMA
-0x57	0x03A9	# GREEK CAPITAL LETTER OMEGA
-0x58	0x039E	# GREEK CAPITAL LETTER XI
-0x59	0x03A8	# GREEK CAPITAL LETTER PSI
-0x5A	0x0396	# GREEK CAPITAL LETTER ZETA
-0x5B	0x005B	# LEFT SQUARE BRACKET
-0x5C	0x2234	# THEREFORE
-0x5D	0x005D	# RIGHT SQUARE BRACKET
-0x5E	0x22A5	# UP TACK
-0x5F	0x005F	# LOW LINE
-0x60	0xF8E5	# radical extender
-0x61	0x03B1	# GREEK SMALL LETTER ALPHA
-0x62	0x03B2	# GREEK SMALL LETTER BETA
-0x63	0x03C7	# GREEK SMALL LETTER CHI
-0x64	0x03B4	# GREEK SMALL LETTER DELTA
-0x65	0x03B5	# GREEK SMALL LETTER EPSILON
-0x66	0x03C6	# GREEK SMALL LETTER PHI
-0x67	0x03B3	# GREEK SMALL LETTER GAMMA
-0x68	0x03B7	# GREEK SMALL LETTER ETA
-0x69	0x03B9	# GREEK SMALL LETTER IOTA
-0x6A	0x03D5	# GREEK PHI SYMBOL
-0x6B	0x03BA	# GREEK SMALL LETTER KAPPA
-0x6C	0x03BB	# GREEK SMALL LETTER LAMBDA
-0x6D	0x03BC	# GREEK SMALL LETTER MU
-0x6E	0x03BD	# GREEK SMALL LETTER NU
-0x6F	0x03BF	# GREEK SMALL LETTER OMICRON
-0x70	0x03C0	# GREEK SMALL LETTER PI
-0x71	0x03B8	# GREEK SMALL LETTER THETA
-0x72	0x03C1	# GREEK SMALL LETTER RHO
-0x73	0x03C3	# GREEK SMALL LETTER SIGMA
-0x74	0x03C4	# GREEK SMALL LETTER TAU
-0x75	0x03C5	# GREEK SMALL LETTER UPSILON
-0x76	0x03D6	# GREEK PI SYMBOL
-0x77	0x03C9	# GREEK SMALL LETTER OMEGA
-0x78	0x03BE	# GREEK SMALL LETTER XI
-0x79	0x03C8	# GREEK SMALL LETTER PSI
-0x7A	0x03B6	# GREEK SMALL LETTER ZETA
-0x7B	0x007B	# LEFT CURLY BRACKET
-0x7C	0x007C	# VERTICAL LINE
-0x7D	0x007D	# RIGHT CURLY BRACKET
-0x7E	0x223C	# TILDE OPERATOR
-0xA1	0x03D2	# GREEK UPSILON WITH HOOK SYMBOL
-0xA2	0x2032	# PRIME
-0xA3	0x2264	# LESS-THAN OR EQUAL TO
-0xA4	0x2044	# FRACTION SLASH
-0xA5	0x221E	# INFINITY
-0xA6	0x0192	# LATIN SMALL LETTER F WITH HOOK
-0xA7	0x2663	# BLACK CLUB SUIT
-0xA8	0x2666	# BLACK DIAMOND SUIT
-0xA9	0x2665	# BLACK HEART SUIT
-0xAA	0x2660	# BLACK SPADE SUIT
-0xAB	0x2194	# LEFT RIGHT ARROW
-0xAC	0x2190	# LEFTWARDS ARROW
-0xAD	0x2191	# UPWARDS ARROW
-0xAE	0x2192	# RIGHTWARDS ARROW
-0xAF	0x2193	# DOWNWARDS ARROW
-0xB0	0x00B0	# DEGREE SIGN
-0xB1	0x00B1	# PLUS-MINUS SIGN
-0xB2	0x2033	# DOUBLE PRIME
-0xB3	0x2265	# GREATER-THAN OR EQUAL TO
-0xB4	0x00D7	# MULTIPLICATION SIGN
-0xB5	0x221D	# PROPORTIONAL TO
-0xB6	0x2202	# PARTIAL DIFFERENTIAL
-0xB7	0x2022	# BULLET
-0xB8	0x00F7	# DIVISION SIGN
-0xB9	0x2260	# NOT EQUAL TO
-0xBA	0x2261	# IDENTICAL TO
-0xBB	0x2248	# ALMOST EQUAL TO
-0xBC	0x2026	# HORIZONTAL ELLIPSIS
-0xBD	0xF8E6	# vertical arrow extender
-0xBE	0xF8E7	# horizontal arrow extender
-0xBF	0x21B5	# DOWNWARDS ARROW WITH CORNER LEFTWARDS
-0xC0	0x2135	# ALEF SYMBOL
-0xC1	0x2111	# BLACK-LETTER CAPITAL I
-0xC2	0x211C	# BLACK-LETTER CAPITAL R
-0xC3	0x2118	# SCRIPT CAPITAL P
-0xC4	0x2297	# CIRCLED TIMES
-0xC5	0x2295	# CIRCLED PLUS
-0xC6	0x2205	# EMPTY SET
-0xC7	0x2229	# INTERSECTION
-0xC8	0x222A	# UNION
-0xC9	0x2283	# SUPERSET OF
-0xCA	0x2287	# SUPERSET OF OR EQUAL TO
-0xCB	0x2284	# NOT A SUBSET OF
-0xCC	0x2282	# SUBSET OF
-0xCD	0x2286	# SUBSET OF OR EQUAL TO
-0xCE	0x2208	# ELEMENT OF
-0xCF	0x2209	# NOT AN ELEMENT OF
-0xD0	0x2220	# ANGLE
-0xD1	0x2207	# NABLA
-0xD2	0x00AE	# REGISTERED SIGN
-0xD3	0x00A9	# COPYRIGHT SIGN
-0xD4	0x2122	# TRADE MARK SIGN
-0xD5	0x220F	# N-ARY PRODUCT
-0xD6	0x221A	# SQUARE ROOT
-0xD7	0x22C5	# DOT OPERATOR
-0xD8	0x00AC	# NOT SIGN
-0xD9	0x2227	# LOGICAL AND
-0xDA	0x2228	# LOGICAL OR
-0xDB	0x21D4	# LEFT RIGHT DOUBLE ARROW
-0xDC	0x21D0	# LEFTWARDS DOUBLE ARROW
-0xDD	0x21D1	# UPWARDS DOUBLE ARROW
-0xDE	0x21D2	# RIGHTWARDS DOUBLE ARROW
-0xDF	0x21D3	# DOWNWARDS DOUBLE ARROW
-0xE0	0x22C4	# DIAMOND OPERATOR
-0xE1	0x2329	# LEFT-POINTING ANGLE BRACKET
-0xE2	0xF8E8	# registered sign sans serif
-0xE3	0xF8E9	# copyright sign sans serif
-0xE4	0xF8EA	# trade mark sign sans serif
-0xE5	0x2211	# N-ARY SUMMATION
-0xE6	0xF8EB	# left paren top
-0xE7	0xF8EC	# left paren extender
-0xE8	0xF8ED	# left paren bottom
-0xE9	0xF8EE	# left square bracket top
-0xEA	0xF8EF	# left square bracket extender
-0xEB	0xF8F0	# left square bracket bottom
-0xEC	0xF8F1	# left curly bracket top
-0xED	0xF8F2	# left curly bracket mid
-0xEE	0xF8F3	# left curly bracket bottom
-0xEF	0xF8F4	# curly bracket extender
-0xF0	0xF8FF	# Apple logo
-0xF1	0x232A	# RIGHT-POINTING ANGLE BRACKET
-0xF2	0x222B	# INTEGRAL
-0xF3	0x2320	# TOP HALF INTEGRAL
-0xF4	0xF8F5	# integral extender
-0xF5	0x2321	# BOTTOM HALF INTEGRAL
-0xF6	0xF8F6	# right paren top
-0xF7	0xF8F7	# right paren extender
-0xF8	0xF8F8	# right paren bottom
-0xF9	0xF8F9	# right square bracket top
-0xFA	0xF8FA	# right square bracket extender
-0xFB	0xF8FB	# right square bracket bottom
-0xFC	0xF8FC	# right curly bracket top
-0xFD	0xF8FD	# right curly bracket mid
-0xFE	0xF8FE	# right curly bracket bottom
diff --git a/tools/encoding/txt2enc.c b/tools/encoding/txt2enc.c
deleted file mode 100644
index 73870bf..0000000
--- a/tools/encoding/txt2enc.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * txt2enc.c --
- *
- *	Simple program to compile up the encodings tables from the CD that
- *	came with "The Unicode Standard, Version 2.0" into a form that can
- *	be quickly loaded into Tcl.
- *
- * Copyright (c) 1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) txt2enc.c 1.1 98/01/28 11:42:09
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-
-typedef unsigned short Rune;
-
-int
-main(int argc, char **argv)
-{
-    FILE *fp;
-    Rune *toUnicode[256];
-    int i, multiByte, enc, uni, hi, lo, fixmissing, used, maxEnc;
-    int ch, encColumn, uniColumn, fallbackKnown, width;
-    char *fallbackString, *str, *rest, *dot;
-    unsigned int magic, type, symbol, fallbackChar;
-    Rune rune;
-    char buf[256];
-    extern char *optarg;
-    extern int optind, opterr;
-    static char *typeString[] = {"single", "double", "multi"};
-
-    encColumn = 0;
-    uniColumn = 1;
-    fallbackString = "QUESTION MARK";
-    fallbackChar = '\0';
-    fallbackKnown = 0;
-    type = -1;
-    symbol = 0;
-    fixmissing = 1;
-
-    opterr = 0;
-    while (1) {
-	ch = getopt(argc, argv, "e:u:f:t:sm");
-	if (ch == -1) {
-	    break;
-	}
-	switch (ch) {
-	case 'e':
-	    encColumn = atoi(optarg);
-	    break;
-
-	case 'u':
-	    uniColumn = atoi(optarg);
-	    break;
-
-	case 'f':
-	    fallbackKnown = 1;
-	    if (optarg[1] == '\0') {
-		fallbackChar = optarg[0];
-	    } else  {
-		fallbackChar = strtol(optarg, &rest, 16);
-		if (*rest != '\0') {
-		    fallbackChar = '\0';
-		    fallbackKnown = 0;
-		    fallbackString = optarg;
-		}
-	    }
-
-	case 't':
-	    if (strcmp(optarg, "single") == 0) {
-		type = 0;
-	    } else if (strcmp(optarg, "double") == 0) {
-		type = 1;
-	    } else if (strcmp(optarg, "multi") == 0) {
-		type = 2;
-	    } else {
-		goto usage;
-	    }
-	    break;
-
-	case 's':
-	    symbol = 1;
-	    break;
-
-	case 'm':
-	    fixmissing = 0;
-	    break;
-	    
-	default:
-	    goto usage;
-	}
-    }
-
-    if ((optind < argc - 1) || (optind >= argc)) {
-	usage:
-	fputs("usage: mkencoding [-e column] [-u column] [-f fallback] [-t type] [-s] [-m] file\n", stderr);
-	fputs("    -e\tcolumn containing characters in encoding (default: 0)\n", stderr);
-	fputs("    -u\tcolumn containing characters in Unicode (default: 1)\n", stderr);
-	fputs("    -f\tfallback character (default: QUESTION MARK)\n", stderr);
-	fputs("    -t\toverride implicit type with single, double, or multi\n", stderr);
-	fputs("    -s\tsymbol+ascii encoding\n", stderr);
-	fputs("    -m\tdon't implicitly include range 0080 to 00FF\n", stderr);
-	return 1;
-    }
-
-    fp = fopen(argv[argc - 1], "r");
-    if (fp == NULL) {
-        perror(argv[argc - 1]);
-	return 1;
-    }
-
-    for (i = 0; i < 256; i++) {
-        toUnicode[i] = NULL;
-    }
-
-    maxEnc = 0;
-    width = 0;
-    multiByte = 0;
-    while (fgets(buf, sizeof(buf), fp) != NULL) {
-	str = buf;
-	enc = -1;
-	uni = -1;
-	while (isspace(*str)) {
-	    str++;
-	}
-	if (str[0] == '#') {
-	    continue;
-	}
-	for (i = 0; *str != '\0'; i++) {
-	    if (*str == '#') {
-		if (fallbackKnown == 0) {
-		    str++;
-		    while (isspace(*str)) {
-			str++;
-		    }
-		    str[strlen(str) - 1] = '\0';
-		    if (strcmp(str, fallbackString) == 0) {
-			fallbackChar = enc;
-			fallbackKnown = 1;
-		    } else if (strstr(str, fallbackString) != NULL) {
-			fallbackChar = enc;
-		    }
-		}
-		break;
-	    } else {
-		rune = strtol(str, &rest, 16);
-		if (rest == str) {
-		    rest++;
-		} else if (i == uniColumn) {
-		    uni = rune;
-		} else if (i == encColumn) {
-		    enc = rune;
-		    if ((width != 0) && (width != rest - str)) {
-			multiByte = 1;
-		    }
-		    width = rest - str;
-		    if (enc > maxEnc) {
-			maxEnc = enc;
-		    }
-		}
-	    }
-	    while (isspace(*rest)) {
-		rest++;
-	    }
-	    str = rest;
-	}
-	if (enc < 32 || uni < 32) {
-	    continue;
-	}
-	
-	hi = enc >> 8;
-	lo = enc & 0xff;
-	if (toUnicode[hi] == NULL) {
-	    toUnicode[hi] = (Rune *) malloc(256 * sizeof(Rune));
-	    memset(toUnicode[hi], 0, 256 * sizeof(Rune));
-	}
-	toUnicode[hi][lo] = uni;
-    }
-	
-    fclose(fp);
-
-    dot = strrchr(argv[argc - 1], '.');
-    if (dot != NULL) {
-	*dot = '\0';
-    }
-    if (type == -1) {
-	if (multiByte) {
-	    type = 2;
-	} else if (maxEnc > 255) {
-	    type = 1;
-	} else {
-	    type = 0;
-	}
-    }
-    if (type != 1) {
-	if (toUnicode[0] == NULL) {
-	    toUnicode[0] = (Rune *) malloc(256 * sizeof(Rune));
-	    memset(toUnicode[0], 0, 256 * sizeof(Rune));
-	}
-	for (i = 0; i < 0x20; i++) {
-	    toUnicode[0][i] = i;
-	}
-	if (fixmissing) {
-	    for (i = 0x7F; i < 0xa0; i++) {
-		if (toUnicode[i] == NULL && toUnicode[0][i] == 0) {
-		    toUnicode[0][i] = i;
-		}
-	    }
-	}
-    }
-
-    printf("# Encoding file: %s, %s-byte\n", argv[argc - 1], typeString[type]);
-
-    if (fallbackChar == '\0') {
-	fallbackChar = '?';
-    }
-    used = 0;
-    for (hi = 0; hi < 256; hi++) {
-	if (toUnicode[hi] != NULL) {
-	    used++;
-	}
-    }
-    printf("%c\n%04X %d %d\n", "SDM"[type], fallbackChar, symbol, used);
-    
-    for (hi = 0; hi < 256; hi++) {
-	if (toUnicode[hi] != NULL) {
-	    printf("%02X\n", hi);
-	    for (lo = 0; lo < 256; lo++) {
-		printf("%04X", toUnicode[hi][lo]);
-		if ((lo & 0x0f) == 0x0f) {
-		    putchar('\n');
-		}
-	    }
-	}
-    }
-    return 0;
-}
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
deleted file mode 100644
index 159565d..0000000
--- a/tools/genStubs.tcl
+++ /dev/null
@@ -1,877 +0,0 @@
-# genStubs.tcl --
-#
-#	This script generates a set of stub files for a given
-#	interface.  
-#	
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: genStubs.tcl,v 1.3 1999/04/16 00:47:39 stanton Exp $
-
-namespace eval genStubs {
-    # libraryName --
-    #
-    #	The name of the entire library.  This value is used to compute
-    #	the USE_*_STUB_PROCS macro and the name of the init file.
-
-    variable libraryName "UNKNOWN"
-
-    # interfaces --
-    #
-    #	An array indexed by interface name that is used to maintain
-    #   the set of valid interfaces.  The value is empty.
-
-    array set interfaces {}
-
-    # curName --
-    #
-    #	The name of the interface currently being defined.
-
-    variable curName "UNKNOWN"
-
-    # hooks --
-    #
-    #	An array indexed by interface name that contains the set of
-    #	subinterfaces that should be defined for a given interface.
-
-    array set hooks {}
-
-    # stubs --
-    #
-    #	This three dimensional array is indexed first by interface name,
-    #	second by platform name, and third by a numeric offset or the
-    #	constant "lastNum".  The lastNum entry contains the largest
-    #	numeric offset used for a given interface/platform combo.  Each
-    #	numeric offset contains the C function specification that
-    #	should be used for the given entry in the stub table.  The spec
-    #	consists of a list in the form returned by parseDecl.
-
-    array set stubs {}
-
-    # outDir --
-    #
-    #	The directory where the generated files should be placed.
-
-    variable outDir .
-}
-
-# genStubs::library --
-#
-#	This function is used in the declarations file to set the name
-#	of the library that the interfaces are associated with (e.g. "tcl").
-#	This value will be used to define the inline conditional macro.
-#
-# Arguments:
-#	name	The library name.
-#
-# Results:
-#	None.
-
-proc genStubs::library {name} {
-    variable libraryName $name
-}
-
-# genStubs::interface --
-#
-#	This function is used in the declarations file to set the name
-#	of the interface currently being defined.
-#
-# Arguments:
-#	name	The name of the interface.
-#
-# Results:
-#	None.
-
-proc genStubs::interface {name} {
-    variable curName $name
-    variable interfaces
-
-    set interfaces($name) {}
-    return
-}
-
-# genStubs::hooks --
-#
-#	This function defines the subinterface hooks for the current
-#	interface.
-#
-# Arguments:
-#	names	The ordered list of interfaces that are reachable through the
-#		hook vector.
-#
-# Results:
-#	None.
-
-proc genStubs::hooks {names} {
-    variable curName
-    variable hooks
-
-    set hooks($curName) $names
-    return
-}
-
-# genStubs::declare --
-#
-#	This function is used in the declarations file to declare a new
-#	interface entry.
-#
-# Arguments:
-#	index		The index number of the interface.
-#	platform	The platform the interface belongs to.  Should be one
-#			of generic, win, unix, or mac.
-#	decl		The C function declaration, or {} for an undefined
-#			entry.
-#
-# Results:
-#	None.
-
-proc genStubs::declare {args} {
-    variable stubs
-    variable curName
-
-    if {[llength $args] != 3} {
-	puts stderr "wrong # args: declare $args"
-    }
-    lassign $args index platform decl
-
-    # Check for duplicate declarations, then add the declaration and
-    # bump the lastNum counter if necessary.
-
-    if {[info exists stubs($curName,$platform,$index)]} {
-	puts stderr "Duplicate entry: declare $args"
-    }
-    regsub -all "\[ \t\n\]+" [string trim $decl] " " decl
-    set decl [parseDecl $decl]
-    if {$decl != ""} {
-	set stubs($curName,$platform,$index) $decl
-	if {![info exists stubs($curName,$platform,lastNum)] \
-		|| ($index > $stubs($curName,$platform,lastNum))} {
-	    set stubs($curName,$platform,lastNum) $index
-	}
-    }
-    return
-}
-
-# genStubs::rewriteFile --
-#
-#	This function replaces the machine generated portion of the
-#	specified file with new contents.  It looks for the !BEGIN! and
-#	!END! comments to determine where to place the new text.
-#
-# Arguments:
-#	file	The name of the file to modify.
-#	text	The new text to place in the file.
-#
-# Results:
-#	None.
-
-proc genStubs::rewriteFile {file text} {
-    if {![file exist $file]} {
-	puts stderr "Cannot find file: $file"
-	return
-    }
-    set in [open ${file} r]
-    set out [open ${file}.new w]
-
-    while {![eof $in]} {
-	set line [gets $in]
-	if {[regexp {!BEGIN!} $line]} {
-	    break
-	}
-	puts $out $line
-    }
-    puts $out "/* !BEGIN!: Do not edit below this line. */"
-    puts $out $text
-    while {![eof $in]} {
-	set line [gets $in]
-	if {[regexp {!END!} $line]} {
-	    break
-	}
-    }
-    puts $out "/* !END!: Do not edit above this line. */"
-    puts -nonewline $out [read $in]
-    close $in
-    close $out
-    file rename -force ${file}.new ${file}
-    return
-}
-
-# genStubs::addPlatformGuard --
-#
-#	Wrap a string inside a platform #ifdef.
-#
-# Arguments:
-#	plat	Platform to test.
-#
-# Results:
-#	Returns the original text inside an appropriate #ifdef.
-
-proc genStubs::addPlatformGuard {plat text} {
-    switch $plat {
-	win {
-	    return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n"
-	}
-	unix {
-	    return "#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */\n${text}#endif /* UNIX */\n"
-	}		    
-	mac {
-	    return "#ifdef MAC_TCL\n${text}#endif /* MAC_TCL */\n"
-	}
-    }
-    return "$text"
-}
-
-# genStubs::emitSlots --
-#
-#	Generate the stub table slots for the given interface.  If there
-#	are no generic slots, then one table is generated for each
-#	platform, otherwise one table is generated for all platforms.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitSlots {name textVar} {
-    variable stubs
-    upvar $textVar text
-
-    forAllStubs $name makeSlot 1 text {"    void *reserved$i;\n"}
-    return
-}
-
-# genStubs::parseDecl --
-#
-#	Parse a C function declaration into its component parts.
-#
-# Arguments:
-#	decl	The function declaration.
-#
-# Results:
-#	Returns a list of the form {returnType name args}.  The args
-#	element consists of a list of type/name pairs, or a single
-#	element "void".  If the function declaration is malformed
-#	then an error is displayed and the return value is {}.
-
-proc genStubs::parseDecl {decl} {
-    if {![regexp {^(.*)\((.*)\)$} $decl all prefix args]} {
-	puts stderr "Malformed declaration: $decl"
-	return
-    }
-    set prefix [string trim $prefix]
-    if {![regexp {^(.+[ ][*]*)([^ *]+)$} $prefix all rtype fname]} {
-	puts stderr "Bad return type: $decl"
-	return
-    }
-    set rtype [string trim $rtype]
-    foreach arg [split $args ,] {
-	lappend argList [string trim $arg]
-    }
-    if {![string compare [lindex $argList end] "..."]} {
-	if {[llength $argList] != 2} {
-	    puts stderr "Only one argument is allowed in varargs form: $decl"
-	}
-	set arg [parseArg [lindex $argList 0]]
-	if {$arg == "" || ([llength $arg] != 2)} {
-	    puts stderr "Bad argument: '[lindex $argList 0]' in '$decl'"
-	    return
-	}
-	set args [list TCL_VARARGS $arg]
-    } else {
-	set args {}
-	foreach arg $argList {
-	    set argInfo [parseArg $arg]
-	    if {![string compare $argInfo "void"]} {
-		lappend args "void"
-		break
-	    } elseif {[llength $argInfo] == 2 || [llength $argInfo] == 3} {
-		lappend args $argInfo
-	    } else {
-		puts stderr "Bad argument: '$arg' in '$decl'"
-		return
-	    }
-	}
-    }
-    return [list $rtype $fname $args]
-}
-
-# genStubs::parseArg --
-#
-#	This function parses a function argument into a type and name.
-#
-# Arguments:
-#	arg	The argument to parse.
-#
-# Results:
-#	Returns a list of type and name with an optional third array
-#	indicator.  If the argument is malformed, returns "".
-
-proc genStubs::parseArg {arg} {
-    if {![regexp {^(.+[ ][*]*)([^][ *]+)(\[\])?$} $arg all type name array]} {
-	if {$arg == "void"} {
-	    return $arg
-	} else {
-	    return
-	}
-    }
-    set result [list [string trim $type] $name]
-    if {$array != ""} {
-	lappend result $array
-    }
-    return $result
-}
-
-# genStubs::makeDecl --
-#
-#	Generate the prototype for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted declaration string.
-
-proc genStubs::makeDecl {name decl index} {
-    lassign $decl rtype fname args
-
-    append text "/* $index */\n"
-    set line "EXTERN $rtype"
-    set count [expr {2 - ([string length $line] / 8)}]
-    append line [string range "\t\t\t" 0 $count]
-    set pad [expr {24 - [string length $line]}]
-    if {$pad <= 0} {
-	append line " "
-	set pad 0
-    }
-    append line "$fname _ANSI_ARGS_("
-
-    set arg1 [lindex $args 0]
-    switch -exact $arg1 {
-	void {
-	    append line "(void)"
-	}
-	TCL_VARARGS {
-	    set arg [lindex $args 1]
-	    append line "TCL_VARARGS([lindex $arg 0],[lindex $arg 1])"
-	}
-	default {
-	    set sep "("
-	    foreach arg $args {
-		append line $sep
-		set next {}
-		append next [lindex $arg 0] " " [lindex $arg 1] \
-			[lindex $arg 2]
-		if {[string length $line] + [string length $next] \
-			+ $pad > 76} {
-		    append text $line \n
-		    set line "\t\t\t\t"
-		    set pad 28
-		}
-		append line $next
-		set sep ", "
-	    }
-	    append line ")"
-	}
-    }
-    append text $line
-    
-    append text ");\n"
-    return $text
-}
-
-# genStubs::makeMacro --
-#
-#	Generate the inline macro for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted macro definition.
-
-proc genStubs::makeMacro {name decl index} {
-    lassign $decl rtype fname args
-
-    set lfname [string tolower [string index $fname 0]]
-    append lfname [string range $fname 1 end]
-
-    set text "#ifndef $fname\n#define $fname"
-    set arg1 [lindex $args 0]
-    set argList ""
-    switch -exact $arg1 {
-	void {
-	    set argList "()"
-	}
-	TCL_VARARGS {
-	}
-	default {
-	    set sep "("
-	    foreach arg $args {
-		append argList $sep [lindex $arg 1]
-		set sep ", "
-	    }
-	    append argList ")"
-	}
-    }
-    append text " \\\n\t(${name}StubsPtr->$lfname)"
-    append text " /* $index */\n#endif\n"
-    return $text
-}
-
-# genStubs::makeStub --
-#
-#	Emits a stub function definition.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted stub function definition.
-
-proc genStubs::makeStub {name decl index} {
-    lassign $decl rtype fname args
-
-    set lfname [string tolower [string index $fname 0]]
-    append lfname [string range $fname 1 end]
-
-    append text "/* Slot $index */\n" $rtype "\n" $fname
-
-    set arg1 [lindex $args 0]
-
-    if {![string compare $arg1 "TCL_VARARGS"]} {
-	lassign [lindex $args 1] type argName 
-	append text " TCL_VARARGS_DEF($type,$argName)\n\{\n"
-	append text "    " $type " var;\n    va_list argList;\n"
-	if {[string compare $rtype "void"]} {
-	    append text "    " $rtype " resultValue;\n"
-	}
-	append text "\n    var = (" $type ") TCL_VARARGS_START(" \
-		$type "," $argName ",argList);\n\n    "
-	if {[string compare $rtype "void"]} {
-	    append text "resultValue = "
-	}
-	append text "(" $name "StubsPtr->" $lfname "VA)(var, argList);\n"
-	append text "    va_end(argList);\n"
-	if {[string compare $rtype "void"]} {
-	    append text "return resultValue;\n"
-	}
-	append text "\}\n\n"
-	return $text
-    }
-
-    if {![string compare $arg1 "void"]} {
-	set argList "()"
-	set argDecls ""
-    } else {
-	set argList ""
-	set sep "("
-	foreach arg $args {
-	    append argList $sep [lindex $arg 1]
-	    append argDecls "    " [lindex $arg 0] " " \
-		    [lindex $arg 1] [lindex $arg 2] ";\n"
-	    set sep ", "
-	}
-	append argList ")"
-    }
-    append text $argList "\n" $argDecls "{\n    "
-    if {[string compare $rtype "void"]} {
-	append text "return "
-    }
-    append text "(" $name "StubsPtr->" $lfname ")" $argList ";\n}\n\n"
-    return $text
-}
-
-# genStubs::makeSlot --
-#
-#	Generate the stub table entry for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted table entry.
-
-proc genStubs::makeSlot {name decl index} {
-    lassign $decl rtype fname args
-
-    set lfname [string tolower [string index $fname 0]]
-    append lfname [string range $fname 1 end]
-
-    set text "    "
-    append text $rtype " (*" $lfname ") _ANSI_ARGS_("
-
-    set arg1 [lindex $args 0]
-    switch -exact $arg1 {
-	void {
-	    append text "(void)"
-	}
-	TCL_VARARGS {
-	    set arg [lindex $args 1]
-	    append text "TCL_VARARGS([lindex $arg 0],[lindex $arg 1])"
-	}
-	default {
-	    set sep "("
-	    foreach arg $args {
-		append text $sep [lindex $arg 0] " " [lindex $arg 1] \
-			[lindex $arg 2]
-		set sep ", "
-	    }
-	    append text ")"
-	}
-    }
-    
-    append text "); /* $index */\n"
-    return $text
-}
-
-# genStubs::makeInit --
-#
-#	Generate the prototype for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted declaration string.
-
-proc genStubs::makeInit {name decl index} {
-    append text "    " [lindex $decl 1] ", /* " $index " */\n"
-    return $text
-}
-
-# genStubs::forAllStubs --
-#
-#	This function iterates over all of the platforms and invokes
-#	a callback for each slot.  The result of the callback is then
-#	placed inside appropriate platform guards.
-#
-# Arguments:
-#	name		The interface name.
-#	slotProc	The proc to invoke to handle the slot.  It will
-#			have the interface name, the declaration,  and
-#			the index appended.
-#	onAll		If 1, emit the skip string even if there are
-#			definitions for one or more platforms.
-#	textVar		The variable to use for output.
-#	skipString	The string to emit if a slot is skipped.  This
-#			string will be subst'ed in the loop so "$i" can
-#			be used to substitute the index value.
-#
-# Results:
-#	None.
-
-proc genStubs::forAllStubs {name slotProc onAll textVar \
-	{skipString {"/* Slot $i is reserved */\n"}}} {
-    variable stubs
-    upvar $textVar text
-
-    set plats [array names stubs $name,*,lastNum]
-    if {[info exists stubs($name,generic,lastNum)]} {
-	# Emit integrated stubs block
-	set lastNum -1
-	foreach plat [array names stubs $name,*,lastNum] {
-	    if {$stubs($plat) > $lastNum} {
-		set lastNum $stubs($plat)
-	    }
-	}
-	for {set i 0} {$i <= $lastNum} {incr i} {
-	    set slots [array names stubs $name,*,$i]
-	    set emit 0
-	    if {[info exists stubs($name,generic,$i)]} {
-		if {[llength $slots] > 1} {
-		    puts stderr "platform entry duplicates generic entry: $i"
-		}
-		append text [$slotProc $name $stubs($name,generic,$i) $i]
-		set emit 1
-	    } elseif {[llength $slots] > 0} {
-		foreach plat {unix win mac} {
-		    if {[info exists stubs($name,$plat,$i)]} {
-			append text [addPlatformGuard $plat \
-				[$slotProc $name $stubs($name,$plat,$i) $i]]
-			set emit 1
-		    } elseif {$onAll} {
-			append text [eval {addPlatformGuard $plat} $skipString]
-			set emit 1
-		    }
-		}
-	    }
-	    if {$emit == 0} {
-		eval {append text} $skipString
-	    }
-	}
-	
-    } else {
-	# Emit separate stubs blocks per platform
-	foreach plat {unix win mac} {
-	    if {[info exists stubs($name,$plat,lastNum)]} {
-		set lastNum $stubs($name,$plat,lastNum)
-		set temp {}
-		for {set i 0} {$i <= $lastNum} {incr i} {
-		    if {![info exists stubs($name,$plat,$i)]} {
-			eval {append temp} $skipString
-		    } else {
-			append temp [$slotProc $name $stubs($name,$plat,$i) $i]
-		    }
-		}
-		append text [addPlatformGuard $plat $temp]
-	    }
-	}
-    }
-
-}
-
-# genStubs::emitDeclarations --
-#
-#	This function emits the function declarations for this interface.
-#
-# Arguments:
-#	name	The interface name.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitDeclarations {name textVar} {
-    variable stubs
-    upvar $textVar text
-
-    append text "\n/*\n * Exported function declarations:\n */\n\n"
-    forAllStubs $name makeDecl 0 text
-    return
-}
-
-# genStubs::emitMacros --
-#
-#	This function emits the inline macros for an interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitMacros {name textVar} {
-    variable stubs
-    variable libraryName
-    upvar $textVar text
-
-    set upName [string toupper $libraryName]
-    append text "\n#if defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS)\n"
-    append text "\n/*\n * Inline function declarations:\n */\n\n"
-    
-    forAllStubs $name makeMacro 0 text
-
-    append text "\n#endif /* defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS) */\n"
-    return
-}
-
-# genStubs::emitHeader --
-#
-#	This function emits the body of the <name>Decls.h file for
-#	the specified interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#
-# Results:
-#	None.
-
-proc genStubs::emitHeader {name} {
-    variable outDir
-    variable hooks
-
-    set capName [string toupper [string index $name 0]]
-    append capName [string range $name 1 end]
-
-    emitDeclarations $name text
-
-    if {[info exists hooks($name)]} {
-	append text "\ntypedef struct ${capName}StubHooks {\n"
-	foreach hook $hooks($name) {
-	    set capHook [string toupper [string index $hook 0]]
-	    append capHook [string range $hook 1 end]
-	    append text "    struct ${capHook}Stubs *${hook}Stubs;\n"
-	}
-	append text "} ${capName}StubHooks;\n"
-    }
-    append text "\ntypedef struct ${capName}Stubs {\n"
-    append text "    int magic;\n"
-    append text "    struct ${capName}StubHooks *hooks;\n\n"
-
-    emitSlots $name text
-
-    append text "} ${capName}Stubs;\n"
-
-    append text "\nextern ${capName}Stubs *${name}StubsPtr;\n"
-
-    emitMacros $name text
-
-    rewriteFile [file join $outDir ${name}Decls.h] $text
-    return
-}
-
-# genStubs::emitStubs --
-#
-#	This function emits the body of the <name>Stubs.c file for
-#	the specified interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#
-# Results:
-#	None.
-
-proc genStubs::emitStubs {name} {
-    variable outDir
-
-    append text "\n/*\n * Exported stub functions:\n */\n\n"
-    forAllStubs $name makeStub 0 text
-
-    rewriteFile [file join $outDir ${name}Stubs.c] $text
-    return    
-}
-
-# genStubs::emitInit --
-#
-#	Generate the table initializers for an interface.
-#
-# Arguments:
-#	name		The name of the interface to initialize.
-#	textVar		The variable to use for output.
-#
-# Results:
-#	Returns the formatted output.
-
-proc genStubs::emitInit {name textVar} {
-    variable stubs
-    variable hooks
-    upvar $textVar text
-
-    set capName [string toupper [string index $name 0]]
-    append capName [string range $name 1 end]
-
-    if {[info exists hooks($name)]} {
-	append text "\nstatic ${capName}StubHooks ${name}StubHooks;\n"
-    }
-    append text "\n${capName}Stubs ${name}Stubs = \{\n"
-    append text "    TCL_STUB_MAGIC,\n"
-    if {[info exists hooks($name)]} {
-	append text "    &${name}StubHooks,\n"
-    } else {
-	append text "    NULL,\n"
-    }
-    
-    forAllStubs $name makeInit 1 text {"    NULL, /* $i */\n"}
-
-    append text "\};\n"
-    return
-}
-
-# genStubs::emitInits --
-#
-#	This function emits the body of the <name>StubInit.c file for
-#	the specified interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#
-# Results:
-#	None.
-
-proc genStubs::emitInits {} {
-    variable hooks
-    variable outDir
-    variable libraryName
-    variable interfaces
-
-    foreach name [lsort [array names interfaces]] {
-	emitInit $name text
-    }
-
-
-    foreach name [array names hooks] {
-	set capName [string toupper [string index $name 0]]
-	append capName [string range $name 1 end]
-
- 	append text "\nstatic ${capName}StubHooks ${name}StubHooks = \{\n"
-	set sep "    "
-	foreach sub $hooks($name) {
-	    append text $sep "&${sub}Stubs"
-	    set sep ",\n    "
-	}
-	append text "\n\};\n\n"
-    }
-
-    rewriteFile [file join $outDir ${libraryName}StubInit.c] $text
-}
-
-# genStubs::init --
-#
-#	This is the main entry point.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	None.
-
-proc genStubs::init {} {
-    global argv argv0
-    variable outDir
-    variable interfaces
-
-    if {[llength $argv] < 2} {
-	puts stderr "usage: $argv0 outDir declFile ?declFile...?"
-	exit 1
-    }
-
-    set outDir [lindex $argv 0]
-
-    foreach file [lrange $argv 1 end] {
-	source $file
-    }
-
-    foreach name [lsort [array names interfaces]] {
-	puts "Emitting $name"
-	emitHeader $name
-    }
-
-    emitInits
-}
-
-# lassign --
-#
-#	This function emulates the TclX lassign command.
-#
-# Arguments:
-#	valueList	A list containing the values to be assigned.
-#	args		The list of variables to be assigned.
-#
-# Results:
-#	Returns any values that were not assigned to variables.
-
-proc lassign {valueList args} {
-  if {[llength $args] == 0} {
-      error "wrong # args: lassign list varname ?varname..?"
-  }
-
-  uplevel [list foreach $args $valueList {break}]
-  return [lrange $valueList [llength $args] end]
-}
-
-genStubs::init
diff --git a/tools/genWinImage.tcl b/tools/genWinImage.tcl
deleted file mode 100644
index b5fc051..0000000
--- a/tools/genWinImage.tcl
+++ /dev/null
@@ -1,120 +0,0 @@
-# genWinImage.tcl --
-#
-#	This script generates the Windows installer.
-#
-# Copyright (c) 1999 by Scriptics Corporation.
-# All rights reserved.
-# 
-# RCS: @(#) $Id: genWinImage.tcl,v 1.2 1999/04/16 00:47:39 stanton Exp $
-
-
-# This file is insensitive to the directory from which it is invoked.
-
-namespace eval genWinImage {
-    # toolsDir --
-    #
-    # This variable points to the platform specific tools directory.
-
-    variable toolsDir
-
-    # tclBuildDir --
-    #
-    # This variable points to the directory containing the Tcl built tree.
-
-    variable tclBuildDir
-
-    # tkBuildDir --
-    #
-    # This variable points to the directory containing the Tk built tree.
-
-    variable tkBuildDir
-}
-
-# genWinImage::init --
-#
-#	This is the main entry point.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	None.
-
-proc genWinImage::init {} {
-    global tcl_platform argv argv0
-    variable tclBuildDir
-    variable tkBuildDir
-    variable toolsDir
- 
-    puts "\n--- genWiImage.tcl started: \
-	    [clock format [clock seconds] -format "%Y%m%d-%H:%M"] --\n"
-
-    if {$tcl_platform(platform) != "windows"} {
-	puts stderr "ERROR: Cannot build TCL.EXE on Unix systems"
-	exit 1
-    }
-
-    if {[llength $argv] != 3} {
-	puts stderr "usage: $argv0 <tclBuildDir> <tkBuildDir> <toolsDir>"
-	exit 0
-    }
-
-    set tclBuildDir [lindex $argv 0]
-    set tkBuildDir [lindex $argv 1]
-    set toolsDir [lindex $argv 2]
-
-    generateInstallers
- 
-    puts "\n--- genWiImage.tcl finished: \
-	    [clock format [clock seconds] -format "%Y%m%d-%H:%M"] --\n\n"
-}
-
-# genWinImage::generateInstallers --
-#
-#	Perform substitutions on the pro.wse.in file and then
-#	invoke the WSE script twice; once for CD and once for web.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	Leaves proweb.exe and procd.exe sitting in the curent directory.
-
-proc genWinImage::generateInstallers {} {
-    variable toolsDir
-    variable tclBuildDir
-    variable tkBuildDir
-
-    # Now read the "pro/srcs/install/pro.wse.in" file, have Tcl make
-    # appropriate substitutions, write out the resulting file in a
-    # current-working-directory.  Use this new file to perform installation
-    # image creation.  Note that we have to use this technique to set
-    # the value of _WISE_ because wise32 won't use a /d switch for this
-    # variable.
-
-    set __TCLBASEDIR__ [file native $tclBuildDir]
-    set __TKBASEDIR__ [file native $tkBuildDir]
-    set __WISE__ [file native [file join $toolsDir wise]]
-    set f [open tcl.wse.in r]
-    set s [read $f]
-    close $f
-    set s [subst -nocommands -nobackslashes $s]
-    set f [open tcl.wse w]
-    puts $f $s
-    close $f
-
-    set wise32ProgFilePath [file native [file join $__WISE__ wise32.exe]]
-
-    # Run the Wise installer to create the Windows install images.
-
-    if {[catch {exec [file native $wise32ProgFilePath] \
-	    /c tcl.wse} errMsg]} {
-	puts stderr "ERROR: $errMsg"
-    } else {
-	puts "\"TCL.EXE\" created."
-    }
-
-    return
-}
-
-genWinImage::init
diff --git a/tools/index.tcl b/tools/index.tcl
deleted file mode 100644
index f2c162f..0000000
--- a/tools/index.tcl
+++ /dev/null
@@ -1,202 +0,0 @@
-# index.tcl --
-#
-# This file defines procedures that are used during the first pass of
-# the man page conversion.  It is used to extract information used to
-# generate a table of contents and a keyword list.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: index.tcl,v 1.3 1998/09/14 18:40:15 stanton Exp $
-# 
-
-# Global variables used by these scripts:
-#
-# state -	state variable that controls action of text proc.
-#				
-# topics -	array indexed by (package,section,topic) with value
-# 		of topic ID.
-#
-# keywords -	array indexed by keyword string with value of topic ID.
-#
-# curID - 	current topic ID, starts at 0 and is incremented for
-# 		each new topic file.
-#
-# curPkg -	current package name (e.g. Tcl).
-#
-# curSect -	current section title (e.g. "Tcl Built-In Commands").
-#
-
-# getPackages --
-#
-# Generate a sorted list of package names from the topics array.
-#
-# Arguments:
-# none.
-
-proc getPackages {} {
-    global topics
-    foreach i [array names topics] {
-	regsub {^(.*),.*,.*$} $i {\1} i
-	set temp($i) {}
-    }
-    lsort [array names temp]
-}
-
-# getSections --
-#
-# Generate a sorted list of section titles in the specified package
-# from the topics array.
-#
-# Arguments:
-# pkg -			Name of package to search.
-
-proc getSections {pkg} {
-    global topics
-    regsub -all {[][*?\\]} $pkg {\\&} pkg
-    foreach i [array names topics "${pkg},*"] {
-	regsub {^.*,(.*),.*$} $i {\1} i
-	set temp($i) {}
-    }
-    lsort [array names temp]
-}
-
-# getSections --
-#
-# Generate a sorted list of topics in the specified section of the
-# specified package from the topics array.
-#
-# Arguments:
-# pkg -			Name of package to search.
-# sect -		Name of section to search.
-
-proc getTopics {pkg sect} {
-    global topics
-    regsub -all {[][*?\\]} $pkg {\\&} pkg
-    regsub -all {[][*?\\]} $sect {\\&} sect
-    foreach i [array names topics "${pkg},${sect},*"] {
-	regsub {^.*,.*,(.*)$} $i {\1} i
-	set temp($i) {}
-    }
-    lsort [array names temp]
-}
-
-# text --
-#
-# This procedure adds entries to the hypertext arrays topics and keywords.
-#
-# Arguments:
-# string -		Text to index.
-
-
-proc text string {
-    global state curID curPkg curSect topics keywords
-
-    switch $state {
-	NAME {
-	    foreach i [split $string ","] {
-		set topic [string trim $i]
-		set index "$curPkg,$curSect,$topic"
-		if {[info exists topics($index)]
-		    && [string compare $topics($index) $curID] != 0} {
-		    puts stderr "duplicate topic $topic in $curPkg"
-		}
-		set topics($index) $curID
-		lappend keywords($topic) $curID
-	    }
-	}
-	KEY {
-	    foreach i [split $string ","] {
-		lappend keywords([string trim $i]) $curID
-	    }
-	}
-	DT -
-	OFF -
-	DASH {}
-	default {
-	    puts stderr "text: unknown state: $state"
-	}
-    }
-}
-
-
-# macro --
-#
-# This procedure is invoked to process macro invocations that start
-# with "." (instead of ').
-#
-# Arguments:
-# name -	The name of the macro (without the ".").
-# args -	Any additional arguments to the macro.
-
-proc macro {name args} {
-    switch $name {
-	SH {
-	    global state
-
-	    switch $args {
-		NAME {
-		    if {$state == "INIT" } {
-			set state NAME
-		    }
-		}
-		DESCRIPTION {set state DT}
-		INTRODUCTION {set state DT}
-		KEYWORDS {set state KEY}
-		default {set state OFF}
-	    }
-	    
-	}
-	TH {
-	    global state curID curPkg curSect topics keywords
-	    set state INIT
-	    if {[llength $args] != 5} {
-		set args [join $args " "]
-		puts stderr "Bad .TH macro: .$name $args"
-	    }
-	    incr curID
-	    set topic	[lindex $args 0]	;# Tcl_UpVar
-	    set curPkg	[lindex $args 3]	;# Tcl
-	    set curSect	[lindex $args 4]	;# {Tcl Library Procedures}
-	    regsub -all {\\ } $curSect { } curSect
-	    set index "$curPkg,$curSect,$topic"
-	    set topics($index) $curID
-	    lappend keywords($topic) $curID
-	}
-    }
-}
-
-
-# dash --
-#
-# This procedure is invoked to handle dash characters ("\-" in
-# troff).  It only function in pass1 is to terminate the NAME state.
-#
-# Arguments:
-# None.
-
-proc dash {} {
-    global state
-    if {$state == "NAME"} {
-	set state DASH
-    }
-}
-
-
-
-# initGlobals, tab, font, char, macro2 --
-#
-# These procedures do nothing during the first pass. 
-#
-# Arguments:
-# None.
-
-proc initGlobals {} {}
-proc newline {} {}
-proc tab {} {}
-proc font type {}
-proc char name {}
-proc macro2 {name args} {}
-
diff --git a/tools/man2help.tcl b/tools/man2help.tcl
deleted file mode 100644
index e86e78b..0000000
--- a/tools/man2help.tcl
+++ /dev/null
@@ -1,132 +0,0 @@
-# man2help.tcl --
-#
-# This file defines procedures that work in conjunction with the
-# man2tcl program to generate a Windows help file from Tcl manual
-# entries.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# RCS: @(#) $Id: man2help.tcl,v 1.4 1999/02/19 02:14:56 stanton Exp $
-# 
-
-#
-# PASS 1
-#
-
-proc generateContents {basename version files} {
-    global curID topics
-    set curID 0
-    foreach f $files {
-	regsub -all -- {-} [file tail $f] {} curFile
-	puts "Pass 1 -- $f"
-	flush stdout
-	doFile $f
-    }
-    set fd [open "$basename$version.cnt" w]
-    fconfigure $fd -translation crlf
-    puts $fd ":Base $basename$version.hlp"
-    foreach package [getPackages] {
-	foreach section [getSections $package] {
-	    puts $fd "1 $section"
-	    set lastTopic {}
-	    foreach topic [getTopics $package $section] {
-		if {[string compare $lastTopic $topic] != 0} {
-		    set id $topics($package,$section,$topic) 
-		    puts $fd "2 $topic=$id"
-		    set lastTopic $topic
-		}
-	    }
-	}
-    }
-    close $fd
-}
-
-
-#
-# PASS 2
-#
-
-proc generateHelp {basename files} {
-    global curID topics keywords file id_keywords
-    set curID 0
-
-    foreach key [array names keywords] {
-	foreach id $keywords($key) {
-	    lappend id_keywords($id) $key
-	}
-    }
-	    
-    set file [open "$basename.rtf" w]
-    fconfigure $file -translation crlf
-    puts $file "\{\\rtf1\\ansi \\deff0\\deflang1033\{\\fonttbl\{\\f0\\froman\\fcharset0\\fprq2 Times New Roman\;\}\}"
-    foreach f $files {
-	regsub -all -- {-} [file tail $f] {} curFile
-	puts "Pass 2 -- $f"
-	flush stdout
-	initGlobals
-	doFile $f
-	pageBreak
-    }
-    puts $file "\}"
-    close $file
-}
-
-# doFile --
-#
-# Given a file as argument, translate the file to a tcl script and
-# evaluate it.
-#
-# Arguments:
-# file -		Name of file to translate.
-
-proc doFile {file} {
-    if {[catch {eval [exec man2tcl [glob $file]]} msg] &&
-	    [catch {eval [exec ./man2tcl [glob $file]]} msg]} {
-	global errorInfo
-	puts stderr $msg
-	puts "in"
-	puts $errorInfo
-	exit 1
-    }
-}
-
-# doDir --
-#
-# Given a directory as argument, translate all the man pages in
-# that directory.
-#
-# Arguments:
-# dir -			Name of the directory.
-
-proc doDir dir {
-    puts "Generating man pages for $dir..."
-    foreach f [lsort [glob [file join $dir *.\[13n\]]]] {
-	do $f
-    }
-}
-
-# process command line arguments
-
-if {$argc < 3} {
-    puts stderr "usage: $argv0 projectName version manFiles..."
-    exit 1
-}
-
-set baseName [lindex $argv 0]
-set version [lindex $argv 1]
-set files {}
-foreach i [lrange $argv 2 end] {
-    set i [file join $i]
-    if [file isdir $i] {
-	foreach f [lsort [glob [file join $i *.\[13n\]]]] {
-	    lappend files $f
-	}
-    } elseif [file exists $i] {
-	lappend files $i
-    }
-}
-
-source [file join [file dir $argv0] index.tcl]
-generateContents $baseName $version $files
-source [file join [file dir $argv0] man2help2.tcl]
-generateHelp $baseName $files
diff --git a/tools/man2help2.tcl b/tools/man2help2.tcl
deleted file mode 100644
index dce162f..0000000
--- a/tools/man2help2.tcl
+++ /dev/null
@@ -1,962 +0,0 @@
-# man2help2.tcl --
-#
-# This file defines procedures that are used during the second pass of
-# the man page conversion.  It converts the man format input to rtf
-# form suitable for use by the Windows help compiler.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: man2help2.tcl,v 1.3 1998/09/14 18:40:15 stanton Exp $
-# 
-
-# Global variables used by these scripts:
-#
-# state -	state variable that controls action of text proc.
-#				
-# topics -	array indexed by (package,section,topic) with value
-# 		of topic ID.
-#
-# keywords -	array indexed by keyword string with value of topic ID.
-#
-# curID - 	current topic ID, starts at 0 and is incremented for
-# 		each new topic file.
-#
-# curPkg -	current package name (e.g. Tcl).
-#
-# curSect -	current section title (e.g. "Tcl Built-In Commands").
-#
-
-# initGlobals --
-#
-# This procedure is invoked to set the initial values of all of the
-# global variables, before processing a man page.
-#
-# Arguments:
-# None.
-
-proc initGlobals {} {
-    uplevel \#0 unset state
-    global state chars
-
-    set state(paragraphPending) 0
-    set state(breakPending) 0
-    set state(firstIndent) 0
-    set state(leftIndent) 0
-
-    set state(inTP) 0
-    set state(paragraph) 0
-    set state(textState) 0
-    set state(curFont) ""
-    set state(startCode) "{\\b "
-    set state(startEmphasis) "{\\i "
-    set state(endCode) "}"
-    set state(endEmphasis) "}"
-    set state(noFill) 0
-    set state(charCnt) 0
-    set state(offset) [getTwips 0.5i]
-    set state(leftMargin) [getTwips 0.5i]
-    set state(nestingLevel) 0
-    set state(intl) 0
-    setTabs 0.5i
-
-# set up international character table
-
-    array set chars {
-	o^ F4
-    }
-}
-
-
-# beginFont --
-#
-# Arranges for future text to use a special font, rather than
-# the default paragraph font.
-#
-# Arguments:
-# font -		Name of new font to use.
-
-proc beginFont {font} {
-    global file state
-
-    textSetup
-    if {$state(curFont) == $font} {
-	return
-    }
-    endFont
-    puts -nonewline $file $state(start$font)
-    set state(curFont) $font
-}
-
-
-# endFont --
-#
-# Reverts to the default font for the paragraph type.
-#
-# Arguments:
-# None.
-
-proc endFont {} {
-    global state file
-
-    if {$state(curFont) != ""} {
-	puts -nonewline $file $state(end$state(curFont))
-	set state(curFont) ""
-    }
-}
-
-
-# textSetup --
-#
-# This procedure is called the first time that text is output for a
-# paragraph.  It outputs the header information for the paragraph.
-#
-# Arguments:
-# None.
-
-proc textSetup {} {
-    global file state
-
-    if $state(breakPending) {
-	puts $file "\\line"
-    }
-    if $state(paragraphPending) {
-	puts $file [format "\\par\n\\pard\\fi%.0f\\li%.0f" \
-			$state(firstIndent) $state(leftIndent)]
-    }
-    set state(breakPending) 0
-    set state(paragraphPending) 0
-}
-
-
-# text --
-#
-# This procedure adds text to the current state(paragraph).  If this is
-# the first text in the state(paragraph) then header information for the
-# state(paragraph) is output before the text.
-#
-# Arguments:
-# string -		Text to output in the state(paragraph).
-
-proc text {string} {
-    global file state chars
-
-    textSetup
-    regsub -all "(\[\\\\\{\}\])" $string {\\\1}  string
-    regsub -all {	} $string {\\tab } string
-    regsub -all '' $string \"  string
-    regsub -all `` $string \"  string
-
-# Check if this is the beginning of an international character string.
-# If so, look up the sequence in the chars table and substitute the
-# appropriate hex value.
-
-    if {$state(intl)} {
-	if {[regexp {^'([^']*)'} $string dummy ch]} {
-	    if {[info exists chars($ch)]} {
-		regsub {^'[^']*'} $string "\\\\'$chars($ch)" string
-	    } else {
-		puts stderr "Unknown international character '$ch'"
-	    }
-	}
-	set state(intl) 0
-    }
-
-    switch $state(textState) {
-	REF { 
-	    if {$state(inTP) == 0} {
-		set string [insertRef $string]
-	    }
-	}
-	SEE { 
-	    global topics curPkg curSect
-	    foreach i [split $string] {
-		if ![regexp -nocase {^[a-z_0-9]+} [string trim $i] i ] {
-		    continue
-		}
-		if ![catch {set ref $topics($curPkg,$curSect,$i)} ] {
-		    regsub $i $string [link $i $ref] string
-		}
-	    }
-	}
-	KEY {
-	    return
-	}
-    }
-    puts -nonewline $file "$string"
-}
-
-
-
-# insertRef --
-#
-# This procedure looks for a string in the cross reference table and
-# generates a hot-link to the appropriate topic.  Tries to find the
-# nearest reference in the manual.
-#
-# Arguments:
-# string -		Text to output in the state(paragraph).
-
-proc insertRef {string} {
-    global NAME_file curPkg curSect topics curID
-    set path {}
-    set string [string trim $string]
-    set ref {}
-    if [info exists topics($curPkg,$curSect,$string)] {
-	set ref $topics($curPkg,$curSect,$string)
-    } else {
-	set sites [array names topics "$curPkg,*,$string"]
-	set count [llength $sites]
-	if {$count > 0} {
-	    set ref $topics([lindex $sites 0])
-	} else {
-	    set sites [array names topics "*,*,$string"]
-	    set count [llength $sites]
-	    if {$count > 0} {
-		set ref $topics([lindex $sites 0])
-	    }
-	}
-    }
-
-    if {([string compare $ref {}] != 0) && ($ref != $curID)} {
-	set string [link $string $ref]
-    }
-    return $string
-}
-
-
-
-# macro --
-#
-# This procedure is invoked to process macro invocations that start
-# with "." (instead of ').
-#
-# Arguments:
-# name -		The name of the macro (without the ".").
-# args -		Any additional arguments to the macro.
-
-proc macro {name args} {
-    global state file
-    switch $name {
-	AP {
-	    if {[llength $args] != 3 && [llength $args] != 2} {
-		puts stderr "Bad .AP macro: .$name [join $args " "]"
-	    }
-	    newPara 3.75i -3.75i
-	    setTabs {1.25i 2.5i 3.75i}
-	    font B
-	    text [lindex $args 0]
-	    tab
-	    font I
-	    text [lindex $args 1]
-	    tab
-	    font R
-	    if {[llength $args] == 3} {
-		text "([lindex $args 2])"
-	    }
-	    tab
-	}
-	AS {}				;# next page and previous page
-	br {
-	    lineBreak	
-	}
-	BS {}
-	BE {}
-	CE {
-	    decrNestingLevel
-	    set state(noFill) 0
-	    set state(breakPending) 0
-	    newPara 0i
-	}
-	CS {				;# code section
-	    incrNestingLevel
-	    set state(noFill) 1
-	    newPara 0i
-	}
-	DE {
-	    set state(noFill) 0
-	    decrNestingLevel
-	    newPara 0i
-	}
-	DS {
-	    set state(noFill) 1
-	    incrNestingLevel
-	    newPara 0i
-	}
-	fi {
-	    set state(noFill) 0
-	}
-	IP {
-	    IPmacro $args
-	}
-	LP {
-	    newPara 0i
-	}
-	ne {
-	}
-	nf {
-	    set state(noFill) 1
-	}
-	OP {
-	    if {[llength $args] != 3} {
-		puts stderr "Bad .OP macro: .$name [join $args " "]"
-	    }
-	    set state(nestingLevel) 0
-	    set state(breakPending) 1
-	    newPara 0i
-	    setTabs 4c
-	    text "Command-Line Name:"
-	    tab
-	    font B
-	    set x [lindex $args 0]
-	    regsub -all {\\-} $x - x
-	    text $x
-	    lineBreak
-	    font R
-	    text "Database Name:"
-	    tab
-	    font B
-	    text [lindex $args 1]
-	    lineBreak
-	    font R
-	    text "Database Class:"
-	    tab
-	    font B
-	    text [lindex $args 2]
-	    font R
-	    set state(inTP) 0
-	    newPara 0.5i
-	    set state(breakPending) 1
-	}
-	PP {
-	    set state(breakPending) 1
-	    newPara 0i
-	}
-	RE {
-	    decrNestingLevel
-	}
-	RS {
-	    incrNestingLevel
-	}
-	SE {
-	    font R
-	    set state(noFill) 0
-	    set state(nestingLevel) 0
-	    newPara 0i
-	    text "See the "
-	    font B
-	    set temp $state(textState)
-	    set state(textState) REF
-	    text options
-	    set state(textState) $temp
-	    font R
-	    text " manual entry for detailed descriptions of the above options."
-	}
-	SH {
-	    SHmacro $args
-	}
-	SO {
-	    SHmacro "STANDARD OPTIONS"
-	    set state(nestingLevel) 0
-	    newPara 0i
-	    setTabs {4c 8c 12c}
-	    font B
-	    set state(noFill) 1
-	}
-	so {
-	    if {$args != "man.macros"} {
-		puts stderr "Unknown macro: .$name [join $args " "]"
-	    }
-	}
-	sp {					;# needs work
-	    if {$args == ""} {
-		set count 1
-	    } else {
-		set count [lindex $args 0]
-	    }
-	    while {$count > 0} {
-		lineBreak
-		incr count -1
-	    }
-	}
-	ta {
-	    setTabs $args
-	}
-	TH {
-	    THmacro $args
-	}
-	TP {
-	    TPmacro $args
-	}
-	UL {					;# underline
-	    puts -nonewline $file "{\\ul "
-	    text [lindex $args 0]
-	    puts -nonewline $file "}"
-	    if {[llength $args] == 2} {
-		text [lindex $args 1]
-	    }
-	}
-	VE {}
-	VS {}
-	default {
-	    puts stderr "Unknown macro: .$name [join $args " "]"
-	}
-    }
-}
-
-
-# link --
-#
-# This procedure returns the string for  a hot link to a different
-# context location.
-#
-# Arguments:
-# label -		String to display in hot-spot.
-# id -			Context string to jump to.
-
-proc link {label id} {
-    return "{\\uldb $label}{\\v $id}"
-}
-
-
-# font --
-#
-# This procedure is invoked to handle font changes in the text
-# being output.
-#
-# Arguments:
-# type -		Type of font: R, I, B, or S.
-
-proc font {type} {
-    global state
-    switch $type {
-	P -
-	R {
-	    endFont
-	    if {$state(textState) == "REF"} {
-		set state(textState) INSERT
-	    }
-	}
-	C -
-	B {
-	    beginFont Code
-	    if {$state(textState) == "INSERT"} {
-		set state(textState) REF
-	    }
-	}
-	I {
-	    beginFont Emphasis
-	}
-	S {
-	}
-	default {
-	    puts stderr "Unknown font: $type"
-	}
-    }
-}
-
-
-
-# formattedText --
-#
-# Insert a text string that may also have \fB-style font changes
-# and a few other backslash sequences in it.
-#
-# Arguments:
-# text -		Text to insert.
-
-proc formattedText {text} {
-    global chars
-
-    while {$text != ""} {
-	set index [string first \\ $text]
-	if {$index < 0} {
-	    text $text
-	    return
-	}
-	text [string range $text 0 [expr $index-1]]
-	set c [string index $text [expr $index+1]]
-	switch -- $c {
-	    f {
-		font [string index $text [expr $index+2]]
-		set text [string range $text [expr $index+3] end]
-	    }
-	    e {
-		text \\
-		set text [string range $text [expr $index+2] end]
-	    }
-	    - {
-		dash
-		set text [string range $text [expr $index+2] end]
-	    }
-	    | {
-		set text [string range $text [expr $index+2] end]
-	    }
-	    o {
-		text \\'
-		regexp "'([^']*)'(.*)" $text all ch text
-		text $chars($ch)
-	    }
-	    default {
-		puts stderr "Unknown sequence: \\$c"
-		set text [string range $text [expr $index+2] end]
-	    }
-	}
-    }
-}
-
-
-
-# dash --
-#
-# This procedure is invoked to handle dash characters ("\-" in
-# troff).  It outputs a special dash character.
-#
-# Arguments:
-# None.
-
-proc dash {} {
-    global state
-    if {$state(textState) == "NAME"} {
-    	set state(textState) 0
-    }
-    text "-"
-}
-
-
-# tab --
-#
-# This procedure is invoked to handle tabs in the troff input.
-# Right now it does nothing.
-#
-# Arguments:
-# None.
-
-proc tab {} {
-    global file
-
-    textSetup
-    puts -nonewline $file "\\tab "
-}
-
-
-# setTabs --
-#
-# This procedure handles the ".ta" macro, which sets tab stops.
-#
-# Arguments:
-# tabList -	List of tab stops, each consisting of a number
-#			followed by "i" (inch) or "c" (cm).
-
-proc setTabs {tabList} {
-    global file state
-
-    foreach arg $tabList {
-	set distance [expr $state(leftMargin) \
-			  + $state(offset) * $state(nestingLevel) \
-			  + [getTwips $arg]]
-    	puts $file [format "\\tx%.0f" [expr round($distance)]]
-    }
-}
-
-
-
-# lineBreak --
-#
-# Generates a line break in the HTML output.
-#
-# Arguments:
-# None.
-
-proc lineBreak {} {
-    global state
-    textSetup
-    set state(breakPending) 1
-}
-
-
-
-# newline --
-#
-# This procedure is invoked to handle newlines in the troff input.
-# It outputs either a space character or a newline character, depending
-# on fill mode.
-#
-# Arguments:
-# None.
-
-proc newline {} {
-    global state
-
-    if $state(inTP) {
-    	set state(inTP) 0
-	lineBreak
-    } elseif $state(noFill) {
-	lineBreak
-    } else {
-	text " "
-    }
-}
-
-
-# pageBreak --
-#
-# This procedure is invoked to generate a page break.
-#
-# Arguments:
-# None.
-
-proc pageBreak {} {
-    global file
-    puts $file "\\page"
-}
-
-
-# char --
-#
-# This procedure is called to handle a special character.
-#
-# Arguments:
-# name -		Special character named in troff \x or \(xx construct.
-
-proc char {name} {
-    global file state
-
-    switch -exact $name {
-        \\o {
-	    set state(intl) 1
-	}
-	\\\  {
-	    textSetup
-	    puts -nonewline $file " "
-	}
-	\\0 {
-	    textSetup
-	    puts -nonewline $file " \\emspace "
-	}
-	\\\\ {
-	    textSetup
-	    puts -nonewline $file "\\\\"
-	}
-	\\(+- {
-	    textSetup
-	    puts -nonewline $file "\\'b1 "
-	}
-	\\% -
-	\\| {
-	}
-	\\(bu {
-	    textSetup
-	    puts -nonewline $file "·"
-	}
-	default {
-	    puts stderr "Unknown character: $name"
-	}
-    }
-}
-
-
-# macro2 --
-#
-# This procedure handles macros that are invoked with a leading "'"
-# character instead of space.  Right now it just generates an
-# error diagnostic.
-#
-# Arguments:
-# name -		The name of the macro (without the ".").
-# args -		Any additional arguments to the macro.
-
-proc macro2 {name args} {
-    puts stderr "Unknown macro: '$name [join $args " "]"
-}
-
-
-
-# SHmacro --
-#
-# Subsection head; handles the .SH macro.
-#
-# Arguments:
-# name -		Section name.
-
-proc SHmacro {argList} {
-    global file state
-
-    set args [join $argList " "]
-    if {[llength $argList] < 1} {
-	puts stderr "Bad .SH macro: .$name $args"
-    }
-
-    # control what the text proc does with text
-    
-    switch $args {
-	NAME {set state(textState) NAME}
-	DESCRIPTION {set state(textState) INSERT}
-	INTRODUCTION {set state(textState) INSERT}
-	"WIDGET-SPECIFIC OPTIONS" {set state(textState) INSERT}
-	"SEE ALSO" {set state(textState) SEE}
-	KEYWORDS {set state(textState) KEY; return}
-    }
-
-    if {$state(breakPending) != -1} {
-	set state(breakPending) 1
-    } else {
-	set state(breakPending) 0
-    }
-    set state(noFill) 0
-    nextPara 0i
-    font B
-    text $args
-    font R
-    nextPara .5i
-}
-
-
-
-# IPmacro --
-#
-# This procedure is invoked to handle ".IP" macros, which may take any
-# of the following forms:
-#
-# .IP [1]			Translate to a "1Step" state(paragraph).
-# .IP [x] (x > 1)	Translate to a "Step" state(paragraph).
-# .IP				Translate to a "Bullet" state(paragraph).
-# .IP text count	Translate to a FirstBody state(paragraph) with special
-#					indent and tab stop based on "count", and tab after
-#					"text".
-#
-# Arguments:
-# argList -		List of arguments to the .IP macro.
-#
-# HTML limitations: 'count' in '.IP text count' is ignored.
-
-proc IPmacro {argList} {
-    global file state
-
-    set length [llength $argList]
-    if {$length == 0} {
-	newPara 0.5i
-	return
-    }
-    if {$length == 1} {
-	set arg [lindex $argList 0]
-	if {$arg == {[1]}} {
-	    newPara 0.5i
-	    return
-	}
-	if {[regexp {^\[[0-9]*\]$} $arg] == 1} {
-	    newPara 0.5i
-	    return
-	}
-	newPara 0.5i -0.5i
-	setTabs 0.5i
-	formattedText [lindex $argList 0]
-	tab
-	return
-    }
-    if {$length == 2} {
-	set count [lindex $argList 1]
-	set tab [expr $count * 0.1]i
-	newPara $tab -$tab
-	textSetup
-	setTabs $tab
-	formattedText [lindex $argList 0]
-	tab
-	return
-    }
-    puts stderr "Bad .IP macro: .IP [join $argList " "]"
-}
-
-
-# TPmacro --
-#
-# This procedure is invoked to handle ".TP" macros, which may take any
-# of the following forms:
-#
-# .TP x		Translate to an state(indent)ed state(paragraph) with the
-# 			specified state(indent) (in 100 twip units).
-# .TP		Translate to an state(indent)ed state(paragraph) with
-# 			default state(indent).
-#
-# Arguments:
-# argList -		List of arguments to the .IP macro.
-#
-# HTML limitations: 'x' in '.TP x' is ignored.
-
-
-proc TPmacro {argList} {
-    global state
-    set length [llength $argList]
-    if {$length == 0} {
-	set val 0.5i
-    } else {
-	set val [expr ([lindex $argList 0] * 100.0)/1440]i
-    }
-    newPara $val -$val
-    setTabs $val
-    set state(inTP) 1
-    set state(breakPending) 1
-}
-
-
-
-# THmacro --
-#
-# This procedure handles the .TH macro.  It generates the non-scrolling
-# header section for a given man page, and enters information into the
-# table of contents.  The .TH macro has the following form:
-#
-# .TH name section date footer header
-#
-# Arguments:
-# argList -		List of arguments to the .TH macro.
-
-proc THmacro {argList} {
-    global file curPkg curSect curID id_keywords state
-
-    if {[llength $argList] != 5} {
-	set args [join $argList " "]
-	puts stderr "Bad .TH macro: .$name $args"
-    }
-    incr curID
-    set name	[lindex $argList 0]		;# Tcl_UpVar
-    set page	[lindex $argList 1]		;# 3
-    set vers	[lindex $argList 2]		;# 7.4
-    set curPkg	[lindex $argList 3]		;# Tcl
-    set curSect	[lindex $argList 4]		;# {Tcl Library Procedures}
-    
-    regsub -all {\\ } $curSect { } curSect	;# Clean up for [incr\ Tcl]
-
-    puts $file "#{\\footnote $curID}"		;# Context string
-    puts $file "\${\\footnote $name}"		;# Topic title
-    set browse "${curSect}${name}"
-    regsub -all {[ _-]} $browse {} browse
-    puts $file "+{\\footnote $browse}"		;# Browse sequence
-
-    # Suppress duplicates
-    foreach i $id_keywords($curID) {
-	set keys($i) 1
-    }
-    foreach i [array names keys] {
-	set i [string trim $i]
-	if {[string length $i] > 0} {
-	    puts $file "K{\\footnote $i}"	;# Keyword strings
-	}
-    }
-    unset keys
-    puts $file "\\pard\\tx3000\\sb100\\sa100\\fs24\\keepn"
-    font B
-    text $name
-    tab
-    text $curSect
-    font R
-    puts $file "\\fs20"
-    set state(breakPending) -1
-}
-
-# nextPara --
-#
-# Set the indents for a new paragraph, and start a paragraph break
-#
-# Arguments:
-# leftIndent -		The new left margin for body lines.
-# firstIndent -		The offset from the left margin for the first line.
-
-proc nextPara {leftIndent {firstIndent 0i}} {
-    global state
-    set state(leftIndent) [getTwips $leftIndent]
-    set state(firstIndent) [getTwips $firstIndent]
-    set state(paragraphPending) 1
-}
-
-
-# newPara --
-#
-# This procedure sets the left and hanging state(indent)s for a line.
-# State(Indent)s are specified in units of inches or centimeters, and are
-# relative to the current nesting level and left margin.
-#
-# Arguments:
-# leftState(Indent) -		The new left margin for lines after the first.
-# firstState(Indent) -		The new left margin for the first line of a state(paragraph).
-
-proc newPara {leftIndent {firstIndent 0i}} {
-    global state file
-    if $state(paragraph) {
-	puts -nonewline $file "\\line\n"
-    }
-    set state(leftIndent) [expr $state(leftMargin) \
-			       + $state(offset) * $state(nestingLevel) \
-			       + [getTwips $leftIndent]]
-    set state(firstIndent) [getTwips $firstIndent]
-    set state(paragraphPending) 1
-}
-
-
-
-# getTwips --
-#
-# This procedure converts a distance in inches or centimeters into
-# twips (1/1440 of an inch).
-#
-# Arguments:
-# arg -			A number followed by "i" or "c"
-
-proc getTwips {arg} {
-    if {[scan $arg "%f%s" distance units] != 2} {
-	puts stderr "bad distance \"$arg\""
-	return 0
-    }
-    switch -- $units {
-	c	{
-	    set distance [expr $distance * 567]
-	}
-	i	{
-	    set distance [expr $distance * 1440]
-	}
-	default {
-	    puts stderr "bad units in distance \"$arg\""
-	    continue
-	}
-    }
-    return $distance
-}
-
-# incrNestingLevel --
-#
-# This procedure does the work of the .RS macro, which increments
-# the number of state(indent)ations that affect things like .PP.
-#
-# Arguments:
-# None.
-
-proc incrNestingLevel {} {
-    global state
-
-    incr state(nestingLevel)
-    set oldp $state(paragraph)
-    set state(paragraph) 0
-    newPara 0i
-    set state(paragraph) $oldp
-}
-
-# decrNestingLevel --
-#
-# This procedure does the work of the .RE macro, which decrements
-# the number of indentations that affect things like .PP.
-#
-# Arguments:
-# None.
-
-proc decrNestingLevel {} {
-    global state
-    
-    if {$state(nestingLevel) == 0} {
-	puts stderr "Nesting level decremented below 0"
-    } else {
-	incr state(nestingLevel) -1
-    }
-}
-
diff --git a/tools/man2html.tcl b/tools/man2html.tcl
deleted file mode 100644
index cb60887..0000000
--- a/tools/man2html.tcl
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/proj/tcl/install/5.x-sparc/bin/tclsh7.5
-
-if [catch {
-
-# man2html.tcl --
-#
-# This file contains procedures that work in conjunction with the
-# man2tcl program to generate a HTML files from Tcl manual entries.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) man2html.tcl 1.5 96/04/11 20:21:43
-#
-
-set homeDir /home/rjohnson/Projects/tools/generic
-
-# sarray -
-#
-# Save an array to a file so that it can be sourced.
-#
-# Arguments:
-# file -		Name of the output file
-# args -		Name of the arrays to save
-#
-proc sarray {file args} {
-    set file [open $file w]
-    foreach a $args {
-	upvar $a array
-	if ![array exists array] {
-	    puts "sarray: \"$a\" isn't an array"
-	    break
-	}	
-    
-	foreach name [lsort [array names array]] {
-	    regsub -all " " $name "\\ " name1
-	    puts $file "set ${a}($name1) \{$array($name)\}"
-	}
-    }
-    close $file
-}
-
-
-
-# footer --
-#
-# Builds footer info for HTML pages
-#
-# Arguments:
-# None
-
-proc footer {packages} {
-    lappend f "<HR>"
-    set h {[}
-    foreach package $packages {
-	lappend h "<A HREF=\"../$package/contents.html\">$package</A>"
-	lappend h "|"
-    }
-    lappend f [join [lreplace $h end end {]} ] " "]
-    lappend f "<HR>"
-    lappend f "<PRE>Copyright &#169; 1989-1994 The Regents of the University of California."
-    lappend f "Copyright &#169; 1994-1996 Sun Microsystems, Inc."
-    lappend f "</PRE>"
-    return [join $f "\n"]
-}
-
-
-
-
-# doDir --
-#
-# Given a directory as argument, translate all the man pages in
-# that directory.
-#
-# Arguments:
-# dir -			Name of the directory.
-
-proc doDir dir {
-    foreach f [lsort [glob $dir/*.\[13n\]]] {
-	do $f	;# defined in man2html1.tcl & man2html2.tcl
-    }
-}
-
-
-if {$argc < 2} {
-    puts stderr "usage: $argv0 html_dir tcl_dir packages..."
-    puts stderr "usage: $argv0 -clean html_dir"
-    exit 1
-}
-	
-if {[lindex $argv 0] == "-clean"} {
-    set html_dir [lindex $argv 1]
-    puts -nonewline "recursively remove: $html_dir? "
-    flush stdout
-    if {[gets stdin] == "y"} {
-	puts "removing: $html_dir"
-	exec rm -r $html_dir
-    }
-    exit 0
-}
-
-set html_dir [lindex $argv 0]
-set tcl_dir  [lindex $argv 1]
-set packages [lrange $argv 2 end]
-
-#### need to add glob capability to packages ####
-
-# make sure there are doc directories for each package
-
-foreach i $packages {
-    if ![file exists $tcl_dir/$i/doc] {
-	puts stderr "Error: doc directory for package $i is missing"
-	exit 1
-    }
-    if ![file isdirectory $tcl_dir/$i/doc] {
-	puts stderr "Error: $tcl_dir/$i/doc is not a directory"
-	exit 1
-    }
-}
-
-
-# we want to start with a clean sheet
-
-if [file exists $html_dir] {
-    puts stderr "Error: HTML directory already exists"
-    exit 1
-} else {
-    exec mkdir $html_dir
-}
-
-set footer [footer $packages]
-
-
-# make the hyperlink arrays and contents.html for all packages
-	
-foreach package $packages {
-    global homeDir
-    exec mkdir $html_dir/$package
-    
-    # build hyperlink database arrays: NAME_file and KEY_file
-    #
-    puts "\nScanning man pages in $tcl_dir/$package/doc..."
-    source $homeDir/man2html1.tcl
-    
-    doDir $tcl_dir/$package/doc
-
-    # clean up the NAME_file and KEY_file database arrays
-    #
-    catch {unset KEY_file()}
-    foreach name [lsort [array names NAME_file]] {
-	set file_name $NAME_file($name)
-	if {[llength $file_name] > 1} {
-	    set file_name [lsort $file_name]
-	    puts stdout "Warning: '$name' multiply defined in: $file_name; using last"
-	    set NAME_file($name) [lindex $file_name end]
-	}
-    }
-#   sarray $html_dir/$package/xref.tcl NAME_file KEY_file
-
-    # build the contents file from NAME_file
-    #
-    puts "\nGenerating contents.html for $package"
-    doContents $html_dir/$package/contents.html $lib ;# defined in man2html1.tcl
-
-    # now translate the man pages to HTML pages
-    #
-    source $homeDir/man2html2.tcl
-    puts "\nBuilding html pages from man pages in $tcl_dir/$package/doc..."
-    doDir $tcl_dir/$package/doc
-
-    unset NAME_file
-}
-
-	
-
-} result] {
-    global errorInfo
-    puts stderr $result
-    puts stderr "in"
-    puts stderr $errorInfo
-}
-
diff --git a/tools/man2html1.tcl b/tools/man2html1.tcl
deleted file mode 100644
index 2e8ba52..0000000
--- a/tools/man2html1.tcl
+++ /dev/null
@@ -1,269 +0,0 @@
-# man2html1.tcl --
-#
-# This file defines procedures that are used during the first pass of the
-# man page to html conversion process. It is sourced by h.tcl.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) man2html1.tcl 1.2 96/03/21 10:48:29
-#
-
-# Global variables used by these scripts:
-#
-# state -	state variable that controls action of text proc.
-#				
-# curFile -	tail of current man page.
-#
-# file -	file pointer; for both xref.tcl and contents.html
-#
-# NAME_file -	array indexed by NAME and containing file names used
-#		for hyperlinks.
-#
-# KEY_file -	array indexed by KEYWORD and containing file names used
-#		for hyperlinks.
-#
-# lib -		contains package name. Used to label section in contents.html
-#
-# inDT -	in dictionary term. 
-
-
-
-# text --
-#
-# This procedure adds entries to the hypertext arrays NAME_file
-# and KEY_file.
-#
-# DT: might do this: if first word of $dt matches $name and [llength $name==1]
-# 	and [llength $dt > 1], then add to NAME_file. 
-#
-# Arguments:
-# string -		Text to index.
-
-
-proc text string {
-    global state curFile NAME_file KEY_file inDT
-
-    switch $state {
-	NAME {
-	    foreach i [split $string ","] {
-		lappend NAME_file([string trim $i]) $curFile
-	    }
-	}
-	KEY {
-	    foreach i [split $string ","] {
-		lappend KEY_file([string trim $i]) $curFile
-	    }
-	}
-	DT -
-	OFF -
-	DASH {}
-	default {
-	    puts stderr "text: unknown state: $state"
-	}
-    }
-}
-
-
-# macro --
-#
-# This procedure is invoked to process macro invocations that start
-# with "." (instead of ').
-#
-# Arguments:
-# name -	The name of the macro (without the ".").
-# args -	Any additional arguments to the macro.
-
-proc macro {name args} {
-    switch $name {
-	SH {
-	    global state
-
-	    switch $args {
-		NAME {
-		    if {$state == "INIT" } {
-			set state NAME
-		    }
-		}
-		DESCRIPTION {set state DT}
-		INTRODUCTION {set state DT}
-		KEYWORDS {set state KEY}
-		default {set state OFF}
-	    }
-		
-	}
-	TP {
-	    global inDT
-	    set inDT 1
-	}
-	TH {
-	    global lib state inDT
-	    set inDT 0
-	    set state INIT
-	    if {[llength $args] != 5} {
-		    set args [join $args " "]
-		    puts stderr "Bad .TH macro: .$name $args"
-	    }
-	    set lib [lindex $args 3]				;# Tcl or Tk
-	}
-    }
-}
-
-
-
-# dash --
-#
-# This procedure is invoked to handle dash characters ("\-" in
-# troff).  It only function in pass1 is to terminate the NAME state.
-#
-# Arguments:
-# None.
-
-proc dash {} {
-    global state
-    if {$state == "NAME"} {
-	set state DASH
-    }
-}
-
-
-
-# newline --
-#
-# This procedure is invoked to handle newlines in the troff input.
-# It's only purpose is to terminate a DT (dictionary term).
-#
-# Arguments:
-# None.
-
-proc newline {} {
-    global inDT
-    set inDT 0
-}
-
-
-
-
-# initGlobals, tab, font, char, macro2 --
-#
-# These procedures do nothing during the first pass. 
-#
-# Arguments:
-# None.
-
-proc initGlobals {} {}
-proc tab {} {}
-proc font type {}
-proc char name {}
-proc macro2 {name args} {}
-
-
-# doListing --
-#
-# Writes an ls like list to a file. Searches NAME_file for entries
-# that match the input pattern.
-#
-# Arguments:
-# file -		Output file pointer.
-# pattern -		glob style match pattern
-
-proc doListing {file pattern} {
-    global NAME_file
-
-    set max_len 0
-    foreach name [lsort [array names NAME_file]] {
-	set ref $NAME_file($name)
-	    if [string match $pattern $ref] {
-		lappend type $name
-		if {[string length $name] > $max_len} {
-		set max_len [string length $name]
-	    }
-	}
-    }
-    if [catch {llength $type} ] {
-	puts stderr "       doListing: no names matched pattern ($pattern)"
-	return
-    }
-    incr max_len
-    set ncols [expr 90/$max_len]
-    set nrows [expr int( ceil( [llength $type] / $ncols. ) ) ]
-
-#	? max_len ncols nrows
-
-    set index 0
-    foreach f $type {
-	lappend row([expr $index % $nrows]) $f
-	incr index
-    }
-
-    puts -nonewline $file "<PRE>"
-    for {set i 0} {$i<$nrows} {incr i} {
-	foreach name $row($i) {
-	    set str [format "%-*s" $max_len $name]
-	    regsub $name $str "<A HREF=\"$NAME_file($name).html\">$name</A>" str
-	    puts -nonewline $file $str
-	}
-	puts $file {}
-    }
-    puts $file "</PRE>"
-}
-
-
-# doContents --
-#
-# Generates a HTML contents file using the NAME_file array
-# as its input database.
-#
-# Arguments:
-# file -		name of the contents file.
-# packageName -	string used in the title and sub-heads of the HTML page. Normally
-#				name of the package without version numbers.
-
-proc doContents {file packageName} {
-    global footer
-    
-    set file [open $file w]
-    
-    puts $file "<HTML><HEAD><TITLE>$packageName Manual</TITLE></HEAD><BODY>"
-    puts $file "<H3>$packageName</H3>"
-    doListing $file "*.1"
-
-    puts $file "<HR><H3>$packageName Commands</H3>"
-    doListing $file "*.n"
-
-    puts $file "<HR><H3>$packageName Library</H3>"
-    doListing $file "*.3"
-
-    puts $file $footer
-    puts $file "</BODY></HTML>"
-    close $file
-}
-
-
-
-
-# do --
-#
-# This is the toplevel procedure that searches a man page
-# for hypertext links.  It builds a data base consisting of
-# two arrays: NAME_file and KEY file. It runs the man2tcl 
-# program to turn the man page into a script, then it evals 
-# that script.
-#
-# Arguments:
-# fileName -		Name of the file to scan.
-
-proc do fileName {
-    global curFile
-    set curFile [file tail $fileName]
-    set file stdout
-    puts "  Pass 1 -- $fileName"
-    flush stdout
-    if [catch {eval [exec man2tcl [glob $fileName]]} msg] {
-	global errorInfo
-	puts stderr $msg
-	puts "in"
-	puts $errorInfo
-	exit 1
-    }
-}
-
diff --git a/tools/man2html2.tcl b/tools/man2html2.tcl
deleted file mode 100644
index 789b4db..0000000
--- a/tools/man2html2.tcl
+++ /dev/null
@@ -1,871 +0,0 @@
-# man2html2.tcl --
-#
-# This file defines procedures that are used during the second pass of the
-# man page to html conversion process. It is sourced by man2html.tcl.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) man2html2.tcl 1.2 96/03/21 10:48:30
-#
-
-# Global variables used by these scripts:
-#
-# NAME_file -	array indexed by NAME and containing file names used
-#		for hyperlinks.
-#
-# textState -	state variable defining action of 'text' proc.
-#
-# nestStk -	stack oriented list containing currently active
-#		HTML tags (UL, OL, DL). Local to 'nest' proc.
-#
-# inDT -	set by 'TPmacro', cleared by 'newline'. Used to insert
-#		the <DT> tag while in a dictionary list <DL>.
-#
-# curFont -	Name of special font that is currently in
-#		use.  Null means the default paragraph font
-#		is being used.
-#
-# file -	Where to output the generated HTML.
-#
-# fontStart -	Array to map font names to starting sequences.
-#
-# fontEnd -	Array to map font names to ending sequences.
-#
-# noFillCount -	Non-zero means don't fill the next $noFillCount
-#		lines: force a line break at each newline.  Zero
-#		means filling is enabled, so don't output line
-#		breaks for each newline.
-#
-# footer -	info inserted at bottom of each page. Normally read
-#		from the xref.tcl file
-	
-# initGlobals --
-#
-# This procedure is invoked to set the initial values of all of the
-# global variables, before processing a man page.
-#
-# Arguments:
-# None.
-
-proc initGlobals {} {
-    global file noFillCount textState
-    global fontStart fontEnd curFont inPRE charCnt
-
-    nest init
-    set inPRE 0
-    set textState 0
-    set curFont ""
-    set fontStart(Code) "<B>"
-    set fontStart(Emphasis) "<I>"
-    set fontEnd(Code) "</B>"
-    set fontEnd(Emphasis) "</I>"
-    set noFillCount 0
-    set charCnt 0
-    setTabs 0.5i
-}
-
-
-# beginFont --
-#
-# Arranges for future text to use a special font, rather than
-# the default paragraph font.
-#
-# Arguments:
-# font -		Name of new font to use.
-
-proc beginFont font {
-    global curFont file fontStart
-
-    if {$curFont == $font} {
-	return
-    }
-    endFont
-    puts -nonewline $file $fontStart($font)
-    set curFont $font
-}
-
-
-# endFont --
-#
-# Reverts to the default font for the paragraph type.
-#
-# Arguments:
-# None.
-
-proc endFont {} {
-    global curFont file fontEnd
-
-    if {$curFont != ""} {
-    puts -nonewline $file $fontEnd($curFont)
-    set curFont ""
-    }
-}
-
-
-
-# text --
-#
-# This procedure adds text to the current paragraph.  If this is
-# the first text in the paragraph then header information for the
-# paragraph is output before the text.
-#
-# Arguments:
-# string -		Text to output in the paragraph.
-
-proc text string {
-    global file textState inDT charCnt
-
-    set pos [string first "\t" $string]
-    if {$pos >= 0} {
-    	text [string range $string 0 [expr $pos-1]]
-    	tab
-    	text [string range $string [expr $pos+1] end]
-	return    	
-    }
-    incr charCnt [string length $string]
-    regsub -all {&} $string {\&amp;}  string
-    regsub -all {<} $string {\&lt;}  string
-    regsub -all {>} $string {\&gt;}  string
-    regsub -all {"} $string {\&quot;}  string
-    switch $textState {
-	REF { 
-	    if {$inDT == {}} {
-		set string [insertRef $string]
-	    }
-	}
-	SEE { 
-	    global NAME_file
-	    foreach i [split $string] {
-		if ![regexp -nocase {^[a-z_]+} [string trim $i] i ] {
-# 		    puts "Warning: $i in SEE ALSO not found"
-		    continue
-		}
-		if ![catch {set ref $NAME_file($i)} ] {
-		    regsub $i $string "<A HREF=\"$ref.html\">$i</A>" string
-		}
-	    }
-	}
-    }
-    puts -nonewline $file "$string"
-}
-
-
-
-# insertRef --
-#
-#
-# Arguments:
-# string -		Text to output in the paragraph.
-
-proc insertRef string {
-    global NAME_file self
-    set path {}
-    if ![catch {set ref $NAME_file([string trim $string])} ] {
-	if {"$ref.html" != $self} {
-	    set string "<A HREF=\"${path}$ref.html\">$string</A>"
-#	    puts "insertRef: $self $ref.html ---$string--"
-	}
-    }
-    return $string
-}
-
-
-
-# macro --
-#
-# This procedure is invoked to process macro invocations that start
-# with "." (instead of ').
-#
-# Arguments:
-# name -		The name of the macro (without the ".").
-# args -		Any additional arguments to the macro.
-
-proc macro {name args} {
-    switch $name {
-	AP {
-	    if {[llength $args] != 3} {
-		puts stderr "Bad .AP macro: .$name [join $args " "]"
-	    }
-	    setTabs {1.25i 2.5i 3.75i}
-	    TPmacro {}
-	    font B
-	    text "[lindex $args 0]  "
-	    font I
-	    text "[lindex $args 1]"
-	    font R
-	    text " ([lindex $args 2])"
-	    newline
-	}
-	AS {}				;# next page and previous page
-	br {
-	    lineBreak	
-	}
-	BS {}
-	BE {}
-	CE {
-	    global file noFillCount inPRE
-	    puts $file </PRE></BLOCKQUOTE>
-	    set inPRE 0
-	}
-	CS {				;# code section
-	    global file noFillCount inPRE
-	    puts -nonewline $file <BLOCKQUOTE><PRE>
-	    set inPRE 1
-	}
-	DE {
-	    global file noFillCount inPRE
-	    puts $file </PRE></BLOCKQUOTE>
-	    set inPRE 0
-	    set noFillCount 0
-	}
-	DS {
-	    global file noFillCount inPRE
-	    puts -nonewline $file <BLOCKQUOTE><PRE>
-	    set noFillCount 10000000
-	    set inPRE 1
-	}
-	fi {
-	    global noFillCount
-	    set noFillCount 0
-	}
-	IP {
-	    IPmacro $args
-	}
-	LP {
-	    nest decr
-	    nest incr
-	    newPara
-	}
-	ne {
-	}
-	nf {
-	    global noFillCount
-	    set noFillCount 1000000
-	}
-	OP {
-	    global inDT file inPRE 
-	    if {[llength $args] != 3} {
-		puts stderr "Bad .OP macro: .$name [join $args " "]"
-	    }
-	    nest para DL DT
-	    set inPRE 1
-	    puts -nonewline $file <PRE>				
-	    setTabs 4c
-	    text "Command-Line Name:"
-	    tab
-	    font B
-	    set x [lindex $args 0]
-	    regsub -all {\\-} $x - x
-	    text $x
-	    newline
-	    font R
-	    text "Database Name:"
-	    tab
-	    font B
-	    text [lindex $args 1]
-	    newline
-	    font R
-	    text "Database Class:"
-	    tab
-	    font B
-	    text [lindex $args 2]
-	    font R
-	    puts -nonewline $file </PRE>				
-	    set inDT "\n<DD>"			;# next newline writes inDT 
-	    set inPRE 0
-	    newline
-	}
-	PP {
-	    nest decr
-	    nest incr
-	    newPara
-	}
-	RE {
-	    nest decr    
-	}
-	RS {
-	    nest incr
-	}
-	SE {
-	    global noFillCount textState inPRE file
-
-	    font R
-	    puts -nonewline $file </PRE>
-	    set inPRE 0
-	    set noFillCount 0
-	    nest reset
-	    newPara
-	    text "See the "
-	    font B
-	    set temp $textState
-	    set textState REF
-	    text options
-	    set textState $temp
-	    font R
-	    text " manual entry for detailed descriptions of the above options."
-	}
-	SH {
-	    SHmacro $args
-	}
-	SO {
-	    global noFillCount inPRE file
-
-	    SHmacro "STANDARD OPTIONS"
-	    setTabs {4c 8c 12c}
-	    set noFillCount 1000000
-	    puts -nonewline $file <PRE>
-	    set inPRE 1
-	    font B
-	}
-	so {
-	    if {$args != "man.macros"} {
-		puts stderr "Unknown macro: .$name [join $args " "]"
-	    }
-	}
-	sp {					;# needs work
-	    if {$args == ""} {
-		set count 1
-	    } else {
-		set count [lindex $args 0]
-	    }
-	    while {$count > 0} {
-		lineBreak
-		incr count -1
-	    }
-	}
-	ta {
-	    setTabs $args
-	}
-	TH {
-	    THmacro $args
-	}
-	TP {
-	    TPmacro $args
-	}
-	UL {					;# underline
-	    global file
-	    puts -nonewline $file "<B><U>"
-	    text [lindex $args 0]
-	    puts -nonewline $file "</U></B>"
-	    if {[llength $args] == 2} {
-		text [lindex $args 1]
-	    }
-	}
-	VE {
-#	    global file
-#	    puts -nonewline $file "</FONT>"
-	}
-	VS {
-#	    global file
-#	    if {[llength $args] > 0} {
-#		puts -nonewline $file "<BR>"
-#	    }
-#	    puts -nonewline $file "<FONT COLOR=\"GREEN\">"
-	}
-	default {
-	    puts stderr "Unknown macro: .$name [join $args " "]"
-	}
-    }
-
-#	global nestStk; puts "$name [format "%-20s" $args] $nestStk"
-#	flush stdout; flush stderr
-}
-
-
-# font --
-#
-# This procedure is invoked to handle font changes in the text
-# being output.
-#
-# Arguments:
-# type -		Type of font: R, I, B, or S.
-
-proc font type {
-    global textState
-    switch $type {
-	P -
-	R {
-	    endFont
-	    if {$textState == "REF"} {
-		set textState INSERT
-	    }
-	}
-	B {
-	    beginFont Code
-	    if {$textState == "INSERT"} {
-		set textState REF
-	    }
-	}
-	I {
-	    beginFont Emphasis
-	}
-	S {
-	}
-	default {
-	    puts stderr "Unknown font: $type"
-	}
-    }
-}
-
-
-
-# formattedText --
-#
-# Insert a text string that may also have \fB-style font changes
-# and a few other backslash sequences in it.
-#
-# Arguments:
-# text -		Text to insert.
-
-proc formattedText text {
-#	puts "formattedText: $text"
-    while {$text != ""} {
-	set index [string first \\ $text]
-	if {$index < 0} {
-	    text $text
-	    return
-	}
-	text [string range $text 0 [expr $index-1]]
-	set c [string index $text [expr $index+1]]
-	switch -- $c {
-	    f {
-		font [string index $text [expr $index+2]]
-		set text [string range $text [expr $index+3] end]
-	    }
-	    e {
-		text \\
-		set text [string range $text [expr $index+2] end]
-	    }
-	    - {
-		dash
-		set text [string range $text [expr $index+2] end]
-	    }
-	    | {
-		set text [string range $text [expr $index+2] end]
-	    }
-	    default {
-		puts stderr "Unknown sequence: \\$c"
-		set text [string range $text [expr $index+2] end]
-	    }
-	}
-    }
-}
-
-
-
-# dash --
-#
-# This procedure is invoked to handle dash characters ("\-" in
-# troff).  It outputs a special dash character.
-#
-# Arguments:
-# None.
-
-proc dash {} {
-    global textState charCnt
-    if {$textState == "NAME"} {
-    	set textState 0
-    }
-    incr charCnt
-    text "-"
-}
-
-
-# tab --
-#
-# This procedure is invoked to handle tabs in the troff input.
-# Right now it does nothing.
-#
-# Arguments:
-# None.
-
-proc tab {} {
-    global inPRE charCnt tabString
-#	? charCnt
-    if {$inPRE == 1} {
-	set pos [expr $charCnt % [string length $tabString] ]
-	set spaces [string first "1" [string range $tabString $pos end] ]
-	text [format "%*s" [incr spaces] " "]
-    } else {
-#	puts "tab: found tab outside of <PRE> block"
-    }
-}
-
-
-# setTabs --
-#
-# This procedure handles the ".ta" macro, which sets tab stops.
-#
-# Arguments:
-# tabList -	List of tab stops, each consisting of a number
-#			followed by "i" (inch) or "c" (cm).
-
-proc setTabs {tabList} {
-    global file breakPending tabString
-
-#	puts "setTabs: --$tabList--"
-    set last 0
-    set tabString {}
-    set charsPerInch 14.
-    set numTabs [llength $tabList]
-    foreach arg $tabList {
-	if {[scan $arg "%f%s" distance units] != 2} {
-	    puts stderr "bad distance \"$arg\""
-	    return 0
-    	}
-	switch -- $units {
-	    c	{
-		set distance [expr $distance * $charsPerInch / 2.54 ]
-	    }
-	    i	{
-		set distance [expr $distance * $charsPerInch]
-	    }
-	    default {
-		puts stderr "bad units in distance \"$arg\""
-		continue
-	    }
-    	}
-#		? distance
-    	lappend tabString [format "%*s1" [expr round($distance-$last-1)] " "]
-    	set last $distance
-    }
-    set tabString [join $tabString {}]
-#	puts "setTabs: --$tabString--"
-}
-
-
-
-# lineBreak --
-#
-# Generates a line break in the HTML output.
-#
-# Arguments:
-# None.
-
-proc lineBreak {} {
-    global file inPRE
-    puts $file "<BR>"
-}
-
-
-
-# newline --
-#
-# This procedure is invoked to handle newlines in the troff input.
-# It outputs either a space character or a newline character, depending
-# on fill mode.
-#
-# Arguments:
-# None.
-
-proc newline {} {
-    global noFillCount file inDT inPRE charCnt
-
-    if {$inDT != {} } {
-    	puts $file "\n$inDT"
-    	set inDT {}
-    } elseif {$noFillCount == 0 || $inPRE == 1} {
-	puts $file {}
-    } else {
-	lineBreak
-	incr noFillCount -1
-    }
-    set charCnt 0
-}
-
-
-
-# char --
-#
-# This procedure is called to handle a special character.
-#
-# Arguments:
-# name -		Special character named in troff \x or \(xx construct.
-
-proc char name {
-    global file charCnt
-
-    incr charCnt
-#	puts "char: $name"
-    switch -exact $name {
-	\\0 {					;#  \0
-	    puts -nonewline $file " "
-	}
-	\\\\ {					;#  \
-	    puts -nonewline $file "\\"
-	}
-	\\(+- { 				;#  +/-
-	    puts -nonewline $file "&#177;"
-	}
-	\\% {}					;#  \%
-	\\| {					;#  \|
-	}
-	default {
-	    puts stderr "Unknown character: $name"
-	}
-    }
-}
-
-
-# macro2 --
-#
-# This procedure handles macros that are invoked with a leading "'"
-# character instead of space.  Right now it just generates an
-# error diagnostic.
-#
-# Arguments:
-# name -		The name of the macro (without the ".").
-# args -		Any additional arguments to the macro.
-
-proc macro2 {name args} {
-    puts stderr "Unknown macro: '$name [join $args " "]"
-}
-
-
-
-# SHmacro --
-#
-# Subsection head; handles the .SH macro.
-#
-# Arguments:
-# name -		Section name.
-
-proc SHmacro argList {
-    global file noFillCount textState charCnt
-
-    set args [join $argList " "]
-    if {[llength $argList] < 1} {
-	puts stderr "Bad .SH macro: .$name $args"
-    }
-
-    set noFillCount 0
-    nest reset
-
-    puts -nonewline $file "<H3>"
-    text $args
-    puts $file "</H3>"
-
-#	? args textState
-
-    # control what the text proc does with text
-    
-    switch $args {
-	NAME {set textState NAME}
-	DESCRIPTION {set textState INSERT}
-	INTRODUCTION {set textState INSERT}
-	"WIDGET-SPECIFIC OPTIONS" {set textState INSERT}
-	"SEE ALSO" {set textState SEE}
-	KEYWORDS {set textState 0}
-    }
-    set charCnt 0
-}
-
-
-
-# IPmacro --
-#
-# This procedure is invoked to handle ".IP" macros, which may take any
-# of the following forms:
-#
-# .IP [1]			Translate to a "1Step" paragraph.
-# .IP [x] (x > 1)	Translate to a "Step" paragraph.
-# .IP				Translate to a "Bullet" paragraph.
-# .IP text count	Translate to a FirstBody paragraph with special
-#					indent and tab stop based on "count", and tab after
-#					"text".
-#
-# Arguments:
-# argList -		List of arguments to the .IP macro.
-#
-# HTML limitations: 'count' in '.IP text count' is ignored.
-
-proc IPmacro argList {
-    global file
-
-    setTabs 0.5i
-    set length [llength $argList]
-    if {$length == 0} {
-    	nest para UL LI
-	return
-    }
-    if {$length == 1} {
-    	nest para OL LI
-	    return
-	}
-    if {$length > 1} {
-    	nest para DL DT
-	    formattedText [lindex $argList 0]
-	    puts $file "\n<DD>"
-	    return
-    }
-    puts stderr "Bad .IP macro: .IP [join $argList " "]"
-}
-
-
-# TPmacro --
-#
-# This procedure is invoked to handle ".TP" macros, which may take any
-# of the following forms:
-#
-# .TP x		Translate to an indented paragraph with the
-# 			specified indent (in 100 twip units).
-# .TP		Translate to an indented paragraph with
-# 			default indent.
-#
-# Arguments:
-# argList -		List of arguments to the .IP macro.
-#
-# HTML limitations: 'x' in '.TP x' is ignored.
-
-
-proc TPmacro {argList} {
-    global inDT
-    nest para DL DT
-    set inDT "\n<DD>"			;# next newline writes inDT 
-    setTabs 0.5i
-}
-
-
-
-# THmacro --
-#
-# This procedure handles the .TH macro.  It generates the non-scrolling
-# header section for a given man page, and enters information into the
-# table of contents.  The .TH macro has the following form:
-#
-# .TH name section date footer header
-#
-# Arguments:
-# argList -		List of arguments to the .TH macro.
-
-proc THmacro {argList} {
-    global file
-
-    if {[llength $argList] != 5} {
-	set args [join $argList " "]
-	puts stderr "Bad .TH macro: .$name $args"
-    }
-    set name  [lindex $argList 0]		;# Tcl_UpVar
-    set page  [lindex $argList 1]		;# 3
-    set vers  [lindex $argList 2]		;# 7.4
-    set lib   [lindex $argList 3]		;# Tcl
-    set pname [lindex $argList 4]		;# {Tcl Library Procedures}
-
-    puts -nonewline $file "<HTML><HEAD><TITLE>"
-    text "$lib - $name ($page)"
-    puts $file "</TITLE></HEAD><BODY>\n"
-    
-    puts -nonewline $file "<H1><CENTER>"
-    text $pname
-    puts $file "</CENTER></H1>\n"
-}
-
-
-
-# newPara --
-#
-# This procedure sets the left and hanging indents for a line.
-# Indents are specified in units of inches or centimeters, and are
-# relative to the current nesting level and left margin.
-#
-# Arguments:
-# None
-
-proc newPara {} {
-    global file nestStk
-	
-    if {[lindex $nestStk end] != "NEW" } {
-	nest decr    
-    }
-    puts -nonewline $file "<P>"
-}
-
-
-
-# nest --
-#
-# This procedure takes care of inserting the tags associated with the
-# IP, TP, RS, RE, LP and PP macros. Only 'nest para' takes arguments.
-#
-# Arguments:
-# op -				operation: para, incr, decr, reset, init
-# listStart -		begin list tag: OL, UL, DL.
-# listItem -		item tag:       LI, LI, DT.
-
-proc nest {op {listStart "NEW"} {listItem {} } } {
-    global file nestStk inDT charCnt
-#	puts "nest: $op $listStart $listItem"
-    switch $op {
-	para {
-	    set top [lindex $nestStk end]
-	    if {$top == "NEW" } {
-		set nestStk [lreplace $nestStk end end $listStart]
-		puts $file "<$listStart>"
-	    } elseif {$top != $listStart} {
-		puts stderr "nest para: bad stack"
-		exit 1
-	    }
-	    puts $file "\n<$listItem>"
-	    set charCnt 0
-	}
-	incr {
-	   lappend nestStk NEW
-	}
-	decr {
-	    if {[llength $nestStk] == 0} {
-		puts stderr "nest error: nest length is zero"
-		set nestStk NEW
-	    }
-	    set tag [lindex $nestStk end]
-	    if {$tag != "NEW"} {
-		puts $file "</$tag>"
-	    }
-	    set nestStk [lreplace $nestStk end end]
-	}
-	reset {
-	    while {[llength $nestStk] > 0} {
-		nest decr
-	    }
-	    set nestStk NEW
-	}
-	init {
-	    set nestStk NEW
-	    set inDT {}
-	}
-    }
-    set charCnt 0
-}
-
-
-
-# do --
-#
-# This is the toplevel procedure that translates a man page
-# to Frame.  It runs the man2tcl program to turn the man page
-# into a script, then it evals that script.
-#
-# Arguments:
-# fileName -		Name of the file to translate.
-
-proc do fileName {
-    global file self html_dir package footer
-    set self "[file tail $fileName].html"
-    set file [open "$html_dir/$package/$self" w]
-    puts "  Pass 2 -- $fileName"
-    flush stdout
-    initGlobals
-    if [catch {eval [exec man2tcl [glob $fileName]]} msg] {
-	global errorInfo
-	puts stderr $msg
-	puts "in"
-	puts stderr $errorInfo
-	exit 1
-    }
-    nest reset
-    puts $file $footer
-    puts $file "</BODY></HTML>"
-    close $file
-}
-
-
-
diff --git a/tools/man2tcl.c b/tools/man2tcl.c
deleted file mode 100644
index 1b298fa..0000000
--- a/tools/man2tcl.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* 
- * man2tcl.c --
- *
- *	This file contains a program that turns a man page of the
- *	form used for Tcl and Tk into a Tcl script that invokes
- *	a Tcl command for each construct in the man page.  The
- *	script can then be eval'ed to translate the manual entry
- *	into some other format such as MIF or HTML.
- *
- * Usage:
- *
- *	man2tcl ?fileName?
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: man2tcl.c,v 1.3 1999/04/16 00:47:40 stanton Exp $
- */
-
-static char sccsid[] = "@(#) man2tcl.c 1.3 95/08/12 17:34:08";
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-/*
- * Imported things that aren't defined in header files:
- */
-
-extern int errno;
-
-/*
- * Current line number, used for error messages.
- */
-
-static int lineNumber;
-
-/*
- * The variable below is set to 1 if an error occurs anywhere
- * while reading in the file.
- */
-
-static int status;
-
-/*
- * The variable below is set to 1 if output should be generated.
- * If it's 0, it means we're doing a pre-pass to make sure that
- * the file can be properly parsed.
- */
-
-static int writeOutput;
-
-/*
- * Prototypes for procedures defined in this file:
- */
-
-static void		DoMacro(char *line);
-static void		DoText(char *line);
-static void		QuoteText(char *string, int count);
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	This procedure is the main program, which does all of the work
- *	of the program.
- *
- * Results:
- *	None: exits with a 0 return status to indicate success, or
- *	1 to indicate that there were problems in the translation.
- *
- * Side effects:
- *	A Tcl script is output to standard output.  Error messages may
- *	be output on standard error.
- *
- *----------------------------------------------------------------------
- */
-
-int
-main(argc, argv)
-    int argc;			/* Number of command-line arguments. */
-    char **argv;		/* Values of command-line arguments. */
-{
-    FILE *f;
-#define MAX_LINE_SIZE 500
-    char line[MAX_LINE_SIZE];
-    char *p;
-
-    /*
-     * Find the file to read, and open it if it isn't stdin.
-     */
-
-    if (argc == 1) {
-	f = stdin;
-    } else if (argc == 2) {
-	f = fopen(argv[1], "r");
-	if (f == NULL) {
-	    fprintf(stderr, "Couldn't read \"%s\": %s\n", argv[1],
-		    strerror(errno));
-	    exit(1);
-	}
-    } else {
-	fprintf(stderr, "Usage: %s ?fileName?\n", argv[0]);
-    }
-
-    /*
-     * Make two passes over the file.  In the first pass, just check
-     * to make sure we can handle everything.  If there are problems,
-     * generate output and stop.  If everything is OK, make a second
-     * pass to actually generate output.
-     */
-
-    for (writeOutput = 0; writeOutput < 2; writeOutput++) {
-	lineNumber = 0;
-	status = 0;
-	while (fgets(line, MAX_LINE_SIZE, f) != NULL) {
-	    for (p = line; *p != 0; p++) {
-		if (*p == '\n') {
-		    *p = 0;
-		    break;
-		}
-	    }
-	    lineNumber++;
-    
-	    if ((line[0] == '\'') && (line[1] == '\\') && (line[2] == '\"')) {
-		/* 
-		 * This line is a comment.  Ignore it.
-		 */
-    
-		continue;
-	    }
-    
-	    if ((line[0] == '.') || (line[0] == '\'')) {
-		/*
-		 * This line is a macro invocation.
-		 */
-    
-		DoMacro(line);
-	    } else {
-		/*
-		 * This line is text, possibly with formatting characters
-		 * embedded in it.
-		 */
-    
-		DoText(line);
-	    }
-	}
-	if (status != 0) {
-	    break;
-	}
-	fseek(f, 0, SEEK_SET);
-    }
-    exit(status);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DoMacro --
- *
- *	This procedure is called to handle a macro invocation.
- *	It parses the arguments to the macro and generates a
- *	Tcl command to handle the invocation.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	A Tcl command is written to stdout.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DoMacro(line)
-    char *line;			/* The line of text that contains the
-				 * macro invocation. */
-{
-    char *p, *end;
-
-    /*
-     * If there is no macro name, then just skip the whole line.
-     */
-
-    if ((line[1] == 0) || (isspace(line[1]))) {
-	return;
-    }
-
-    if (writeOutput) {
-	printf("macro");
-    }
-    if (*line != '.') {
-	if (writeOutput) {
-	    printf("2");
-	}
-    }
-
-    /*
-     * Parse the arguments to the macro (including the name), in order.
-     */
-
-    p = line+1;
-    while (1) {
-	if (writeOutput) {
-	    putc(' ', stdout);
-	}
-	if (*p == '"')  {
-	    /*
-	     * The argument is delimited by quotes.
-	     */
-
-	    for (end = p+1; *end != '"'; end++) {
-		if (*end == 0) {
-		    fprintf(stderr,
-			"Unclosed quote in macro call on line %d.\n",
-			lineNumber);
-		    status = 1;
-		    break;
-		}
-	    }
-	    QuoteText(p+1, (end-(p+1)));
-	} else {
-	    for (end = p+1;  (*end != 0) && !isspace(*end); end++) {
-		/* Empty loop body. */
-	    }
-	    QuoteText(p, end-p);
-	}
-	if (*end == 0) {
-	    break;
-	}
-	p = end+1;
-	while (isspace(*p)) {
-	    /*
-	     * Skip empty space before next argument.
-	     */
-
-	    p++;
-	}
-	if (*p == 0) {
-	    break;
-	}
-    }
-    if (writeOutput) {
-	putc('\n', stdout);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DoText --
- *
- *	This procedure is called to handle a line of troff text.
- *	It parses the text, generating Tcl commands for text and
- *	for formatting stuff such as font changes.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Tcl commands are written to stdout.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-DoText(line)
-    char *line;			/* The line of text. */
-{
-    char *p, *end;
-
-    /*
-     * Divide the line up into pieces consisting of backslash sequences,
-     * tabs, and other text.
-     */
-
-    p = line;
-    while (*p != 0) {
-	if (*p == '\t') {
-	    if (writeOutput) {
-		printf("tab\n");
-	    }
-	    p++;
-	} else if (*p != '\\') {
-	    /*
-	     * Ordinary text.
-	     */
-
-	    for (end = p+1; (*end != '\\') && (*end != 0); end++) {
-		/* Empty loop body. */
-	    }
-	    if (writeOutput) {
-		printf("text ");
-	    }
-	    QuoteText(p, end-p);
-	    if (writeOutput) {
-		putc('\n', stdout);
-	    }
-	    p = end;
-	} else {
-	    /*
-	     * A backslash sequence.  There are particular ones
-	     * that we understand;  output an error message for
-	     * anything else and just ignore the backslash.
-	     */
-
-	    p++;
-	    if (*p == 'f') {
-		/*
-		 * Font change.
-		 */
-
-		if (writeOutput) {
-		    printf("font %c\n", p[1]);
-		}
-		p += 2;
-	    } else if (*p == '-') {
-		if (writeOutput) {
-		    printf("dash\n");
-		}
-		p++;
-	    } else if (*p == 'e') {
-		if (writeOutput) {
-		    printf("text \\\\\n");
-		}
-		p++;
-	    } else if (*p == '.') {
-		if (writeOutput) {
-		    printf("text .\n");
-		}
-		p++;
-	    } else if (*p == '&') {
-		p++;
-	    } else if (*p == '(') {
-		if ((p[1] == 0) || (p[2] == 0)) {
-		    fprintf(stderr, "Bad \\( sequence on line %d.\n",
-			    lineNumber);
-		    status = 1;
-		} else {
-		    if (writeOutput) {
-			printf("char {\\(%c%c}\n", p[1], p[2]);
-		    }
-		    p += 3;
-		}
-	    } else if (*p != 0) {
-		if (writeOutput) {
-		    printf("char {\\%c}\n", *p);
-		}
-		p++;
-	    }
-	}
-    }
-    if (writeOutput) {
-	printf("newline\n");
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * QuoteText --
- *
- *	Copy the "string" argument to stdout, adding quote characters
- *	around any special Tcl characters so that they'll just be treated
- *	as ordinary text.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Text is written to stdout.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-QuoteText(string, count)
-    char *string;		/* The line of text. */
-    int count;			/* Number of characters to write from string. */
-{
-    if (count == 0) {
-	if (writeOutput) {
-	    printf("{}");
-	}
-	return;
-    }
-    for ( ; count > 0; string++, count--) {
-	if ((*string == '$') || (*string == '[') || (*string == '{')
-		|| (*string == ' ') || (*string == ';') || (*string == '\\')
-		|| (*string == '"') || (*string == '\t')) {
-	    if (writeOutput) {
-		putc('\\', stdout);
-	    }
-	}
-	if (writeOutput) {
-	    putc(*string, stdout);
-	}
-    }
-}
diff --git a/tools/regexpTestLib.tcl b/tools/regexpTestLib.tcl
deleted file mode 100644
index d43cd4e..0000000
--- a/tools/regexpTestLib.tcl
+++ /dev/null
@@ -1,266 +0,0 @@
-# regexpTestLib.tcl --
-#
-# This file contains tcl procedures used by spencer2testregexp.tcl and
-# spencer2regexp.tcl, which are programs written to convert Henry
-# Spencer's test suite to tcl test files.
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-#
-# SCCS: @(#) regexpTestLib.tcl 1.4 98/01/22 14:48:34
-# 
-
-proc readInputFile {} {
-    global inFileName
-    global lineArray
-
-    set fileId [open $inFileName r]
-
-    set i 0
-    while {[gets $fileId line] >= 0} {
-
-	set len [string length $line]
-
-	if {($len > 0) && ([string index $line [expr $len - 1]] == "\\")} {
-	    if {[info exists lineArray(c$i)] == 0} {
-		set lineArray(c$i) 1
-	    } else {
-		incr lineArray(c$i)
-	    }
-	    set line [string range $line 0 [expr $len - 2]]
-	    append lineArray($i) $line
-	    continue
-	}
-	if {[info exists lineArray(c$i)] == 0} {
-	    set lineArray(c$i) 1
-	} else {
-	    incr lineArray(c$i)
-	}
-	append lineArray($i) $line
-	incr i
-    }
-
-    close $fileId
-    return $i
-}
-
-#
-# strings with embedded @'s are truncated
-# unpreceeded @'s are replaced by {}
-# 
-proc removeAts {ls} {
-    set len [llength $ls]
-    set newLs {}
-    foreach item $ls {
-	regsub @.* $item "" newItem
-	lappend newLs $newItem
-    }
-    return $newLs
-}
-
-proc convertErrCode {code} {
-
-    set errMsg "couldn't compile regular expression pattern:"
-
-    if {[string compare $code "INVARG"] == 0} {
-	return "$errMsg invalid argument to regex routine"
-    } elseif {[string compare $code "BADRPT"] == 0} {
-	return "$errMsg ?+* follows nothing"
-    } elseif {[string compare $code "BADBR"] == 0} {
-	return "$errMsg invalid repetition count(s)"
-    } elseif {[string compare $code "BADOPT"] == 0} {
-	return "$errMsg invalid embedded option"
-    } elseif {[string compare $code "EPAREN"] == 0} {
-	return "$errMsg unmatched ()"
-    } elseif {[string compare $code "EBRACE"] == 0} {
-	return "$errMsg unmatched {}"
-    } elseif {[string compare $code "EBRACK"] == 0} {
-	return "$errMsg unmatched \[\]"
-    } elseif {[string compare $code "ERANGE"] == 0} {
-	return "$errMsg invalid character range"
-    } elseif {[string compare $code "ECTYPE"] == 0} {
-	return "$errMsg invalid character class"
-    } elseif {[string compare $code "ECOLLATE"] == 0} {
-	return "$errMsg invalid collating element"
-    } elseif {[string compare $code "EESCAPE"] == 0} {
-	return "$errMsg invalid escape sequence"
-    } elseif {[string compare $code "BADPAT"] == 0} {
-	return "$errMsg invalid regular expression"
-    } elseif {[string compare $code "ESUBREG"] == 0} {
-	return "$errMsg invalid backreference number"
-    } elseif {[string compare $code "IMPOSS"] == 0} {
-	return "$errMsg can never match"
-    }
-    return "$errMsg $code"
-}
-
-proc writeOutputFile {numLines fcn} {
-    global outFileName
-    global lineArray
-
-    # open output file and write file header info to it. 
-
-    set fileId [open $outFileName w]
-
-    puts $fileId "# Commands covered:  $fcn"
-    puts $fileId "#"
-    puts $fileId "# This Tcl-generated file contains tests for the $fcn tcl command."
-    puts $fileId "# Sourcing this file into Tcl runs the tests and generates output for"
-    puts $fileId "# errors.  No output means no errors were found.  Setting VERBOSE to"
-    puts $fileId "# -1 will run tests that are known to fail."
-    puts $fileId "#"
-    puts $fileId "# Copyright (c) 1998 Sun Microsystems, Inc."
-    puts $fileId "#"
-    puts $fileId "# See the file \"license.terms\" for information on usage and redistribution"
-    puts $fileId "# of this file, and for a DISCLAIMER OF ALL WARRANTIES."
-    puts $fileId "#"
-    puts $fileId "\# SCCS: \%Z\% \%M\% \%I\% \%E\% \%U\%"
-    puts $fileId "\nproc print \{arg\} \{puts \$arg\}\n"
-    puts $fileId "if \{\[string compare test \[info procs test\]\] == 1\} \{"
-    puts $fileId "    source defs ; set VERBOSE -1\n\}\n"
-    puts $fileId "if \{\$VERBOSE != -1\} \{"
-    puts $fileId "    proc print \{arg\} \{\}\n\}\n"
-    puts $fileId "#"
-    puts $fileId "# The remainder of this file is Tcl tests that have been"
-    puts $fileId "# converted from Henry Spencer's regexp test suite."
-    puts $fileId "#\n"
-
-    set lineNum 0
-    set srcLineNum 1
-    while {$lineNum < $numLines} {
-
-	set currentLine $lineArray($lineNum)
-
-	# copy comment string to output file and continue
-
-	if {[string index $currentLine 0] == "#"} {
-	    puts $fileId $currentLine
-	    incr srcLineNum $lineArray(c$lineNum)
-	    incr lineNum
-	    continue	    
-	}
-
-	set len [llength $currentLine]
-
-	# copy empty string to output file and continue
-
-	if {$len == 0} {
-	    puts $fileId "\n"
-	    incr srcLineNum $lineArray(c$lineNum)
-	    incr lineNum
-	    continue	    
-	}
-	if {($len < 3)} {
-	    puts "warning: test is too short --\n\t$currentLine"
-	    incr srcLineNum $lineArray(c$lineNum)
-	    incr lineNum
-	    continue
-	}
-
-	puts $fileId [convertTestLine $currentLine $len $lineNum $srcLineNum]
-
-	incr srcLineNum $lineArray(c$lineNum)
-	incr lineNum
-    }
-
-    close $fileId
-}
-
-proc convertTestLine {currentLine len lineNum srcLineNum} {
-
-    regsub -all {(?b)\\} $currentLine {\\\\} currentLine
-    set re [lindex $currentLine 0]
-    set flags [lindex $currentLine 1]
-    set str [lindex $currentLine 2]
-
-    # based on flags, decide whether to skip the test
-
-    if {[findSkipFlag $flags]} {
-	regsub -all {\[|\]|\(|\)|\{|\}|\#} $currentLine {\&} line
-	set msg "\# skipping char mapping test from line $srcLineNum\n"
-	append msg "print \{... skip test from line $srcLineNum:  $line\}"
-	return $msg
-    }
-
-    # perform mapping if '=' flag exists
-
-    set noBraces 0
-    if {[regexp {=|>} $flags] == 1} {
-	regsub -all {_} $currentLine {\\ } currentLine
-	regsub -all {A} $currentLine {\\007} currentLine
-	regsub -all {B} $currentLine {\\b} currentLine
-	regsub -all {E} $currentLine {\\033} currentLine
-	regsub -all {F} $currentLine {\\f} currentLine
-	regsub -all {N} $currentLine {\\n} currentLine
-
-	# if and \r substitutions are made, do not wrap re, flags,
-	# str, and result in braces
-
-	set noBraces [regsub -all {R} $currentLine {\\\u000D} currentLine]
-	regsub -all {T} $currentLine {\\t} currentLine
-	regsub -all {V} $currentLine {\\v} currentLine
-	if {[regexp {=} $flags] == 1} {
-	    set re [lindex $currentLine 0]
-	}
-	set str [lindex $currentLine 2]
-    }
-    set flags [removeFlags $flags]
-
-    # find the test result
-
-    set numVars [expr $len - 3]
-    set vars {}
-    set vals {}
-    set result 0
-    set v 0
-    
-    if {[regsub {\*} "$flags" "" newFlags] == 1} {
-	# an error is expected
-	
-	if {[string compare $str "EMPTY"] == 0} {
-	    # empty regexp is not an error
-	    # skip this test
-	    
-	    return "\# skipping the empty-re test from line $srcLineNum\n"
-	}
-	set flags $newFlags
-	set result "\{1 \{[convertErrCode $str]\}\}"
-    } elseif {$numVars > 0} {
-	# at least 1 match is made
-	
-	if {[regexp {s} $flags] == 1} {
-	    set result "\{0 1\}"
-	} else {
-	    while {$v < $numVars} {
-		append vars " var($v)"
-		append vals " \$var($v)"
-		incr v
-	    }
-	    set tmp [removeAts [lrange $currentLine 3 $len]]
-	    set result "\{0 \{1 $tmp\}\}"
-	    if {$noBraces} {
-		set result "\[subst $result\]"
-	    }
-	}
-    } else {
-	# no match is made
-	
-	set result "\{0 0\}"
-    }
-
-    # set up the test and write it to the output file
-
-    set cmd [prepareCmd $flags $re $str $vars $noBraces]
-    if {$cmd == -1} {
-	return "\# skipping test with metasyntax from line $srcLineNum\n"	    
-    }
-
-    set test "test regexp-1.$srcLineNum \{converted from line $srcLineNum\} \{\n"
-    append test "\tcatch {unset var}\n"
-    append test "\tlist \[catch \{ \n"
-    append test "\t\tset match \[$cmd\] \n"
-    append test "\t\tlist \$match $vals \n"
-    append test "\t\} msg\] \$msg \n"
-    append test "\} $result \n"
-    return $test
-}
-
diff --git a/tools/str2c b/tools/str2c
deleted file mode 100644
index 15cb8e6..0000000
--- a/tools/str2c
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-#
-# Transform text (.ps, .tcl,...) into a C string
-#
-# 1997/10 -- dl
-#
-# $Id: str2c,v 1.2 1999/04/16 00:47:40 stanton Exp $
-#
-# restart with tclsh \
-exec tclsh8.0 "$0" "$@"
-
-# Max string length
-# (some C compiler have a 2048 chars limits (so 2047 real chars with
-#  the tariling 0) so we use 2000 to make the count nice)
-set MAX 2000
-
-if {$argc} {
-    puts stderr "Usage: [file tail [info script]] < text > text.c"
-    exit 1
-}
-
-set r [read stdin]
-
-proc translate {what} {
-    regsub -all {\\} $what {\\\\} what
-    regsub -all {"} $what {\\"} what
-    regsub -all "\n" $what "\\\\n\\\\\n" what;
-    return $what;
-}
-
-set lg [string length $r]
-if {$lg<$MAX} {
-    puts "/*
- * Single part writeable string generated by str2c
- */
-static char data\[\]=\"[translate $r]\";"
-} else {
-    puts "/*
- * Multi parts read only string generated by str2c
- */
-static CONST char * CONST data\[\]= {"
-    set n 1
-    for {set i 0} {$i<$lg} {incr i $MAX} {
-	set part [string range $r $i [expr $i+$MAX-1]]
-	set len  [string length $part];
-	puts "\t/* Start of part $n ($len characters) */"
-	puts "\t\"[translate $part]\","
-	puts "\t/* End of part $n */\n"
-	incr n
-    }
-    puts "\tNULL\t/* End of data marker */\n};"
-    puts "\n/* use for instance with:
-    CONST char * CONST *chunk;
-    for (chunk=data; *chunk; chunk++) {
-        Tcl_AppendResult(interp, *chunk, (char *) NULL);
-    }
-*/"
-}
-
-
-
diff --git a/tools/tcl.hpj.in b/tools/tcl.hpj.in
deleted file mode 100644
index d77b19b..0000000
--- a/tools/tcl.hpj.in
+++ /dev/null
@@ -1,19 +0,0 @@
-; This file is maintained by HCW. Do not modify this file directly.

-

-[OPTIONS]

-HCW=0

-LCID=0x409 0x0 0x0 ;English (United States)

-REPORT=Yes

-TITLE=Tcl/Tk Reference Manual

-CNT=tcl81.cnt

-COPYRIGHT=Copyright © 1999 Scriptics Corporation

-HLP=tcl81.hlp

-

-[FILES]

-tcl.rtf

-

-[WINDOWS]

-main="Tcl/Tk Reference Manual",,0

-

-[CONFIG]

-BrowseButtons()

diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
deleted file mode 100644
index 6274318..0000000
--- a/tools/tcl.wse.in
+++ /dev/null
@@ -1,2330 +0,0 @@
-Document Type: WSE

-item: Global

-  Version=6.01

-  Title=Tcl 8.1 for Windows Installation

-  Flags=00010100

-  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

-  Japanese Font Name=MS Gothic

-  Japanese Font Size=10

-  Start Gradient=0 0 255

-  End Gradient=0 0 0

-  Windows Flags=00000000000000010010110000001000

-  Log Pathname=%MAINDIR%\INSTALL.LOG

-  Message Font=MS Sans Serif

-  Font Size=8

-  Disk Label=tcl8.0a2

-  Disk Filename=setup

-  Patch Flags=0000000000000001

-  Patch Threshold=85

-  Patch Memory=4000

-  Variable Name1=_SYS_

-  Variable Default1=C:\WINDOWS\SYSTEM

-  Variable Flags1=00001000

-  Variable Name2=_ODBC16_

-  Variable Default2=C:\WINDOWS\SYSTEM

-  Variable Flags2=00001000

-  Variable Name3=_WISE_

-  Variable Default3=${__WISE__}

-  Variable Flags3=00001000

-end

-item: Open/Close INSTALL.LOG

-  Flags=00000001

-end

-item: Check if File/Dir Exists

-  Pathname=%SYS%

-  Flags=10000100

-end

-item: Set Variable

-  Variable=SYS

-  Value=%WIN%

-end

-item: End Block

-end

-item: Set Variable

-  Variable=VER

-  Value=8.1

-end

-item: Set Variable

-  Variable=PATCHLEVEL

-  Value=8.1b3

-end

-item: Set Variable

-  Variable=APPTITLE

-  Value=Tcl/Tk %PATCHLEVEL% for Windows

-end

-item: Set Variable

-  Variable=URL

-  Value=http://www.scriptics.com/registration/%PATCHLEVEL%.html

-end

-item: Set Variable

-  Variable=GROUP

-  Value=Tcl

-end

-item: Set Variable

-  Variable=DISABLED

-  Value=!

-end

-item: Set Variable

-  Variable=MAINDIR

-  Value=Tcl

-end

-item: Check Configuration

-  Flags=10111011

-end

-item: Get Registry Key Value

-  Variable=PROGRAM_FILES

-  Key=SOFTWARE\Microsoft\Windows\CurrentVersion

-  Default=C:\Program Files

-  Value Name=ProgramFilesDir

-  Flags=00000100

-end

-item: Set Variable

-  Variable=MAINDIR

-  Value=%PROGRAM_FILES%\%MAINDIR%

-end

-item: Set Variable

-  Variable=EXPLORER

-  Value=1

-end

-item: Else Statement

-end

-item: Set Variable

-  Variable=MAINDIR

-  Value=C:\%MAINDIR%

-end

-item: End Block

-end

-item: Set Variable

-  Variable=BACKUP

-  Value=%MAINDIR%\BACKUP

-end

-item: Set Variable

-  Variable=DOBACKUP

-  Value=B

-end

-item: Set Variable

-  Variable=BRANDING

-  Value=0

-end

-remarked item: If/While Statement

-  Variable=BRANDING

-  Value=1

-end

-remarked item: Read INI Value

-  Variable=NAME

-  Pathname=%INST%\CUSTDATA.INI

-  Section=Registration

-  Item=Name

-end

-remarked item: Read INI Value

-  Variable=COMPANY

-  Pathname=%INST%\CUSTDATA.INI

-  Section=Registration

-  Item=Company

-end

-remarked item: If/While Statement

-  Variable=NAME

-end

-remarked item: Set Variable

-  Variable=DOBRAND

-  Value=1

-end

-remarked item: End Block

-end

-remarked item: End Block

-end

-item: Set Variable

-  Variable=TYPE

-  Value=C

-end

-item: Set Variable

-  Variable=COMPONENTS

-  Value=ABC

-end

-item: Wizard Block

-  Direction Variable=DIRECTION

-  Display Variable=DISPLAY

-  X Position=0

-  Y Position=0

-  Filler Color=8421440

-  Flags=00000001

-end

-item: Custom Dialog Set

-  Name=Splash

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Bienvenue

-    Title German=Willkommen

-    Title Portuguese=Bem-vindo 

-    Title Spanish=Bienvenido

-    Title Italian=Benvenuto

-    Title Danish=Velkommen

-    Title Dutch=Welkom

-    Title Norwegian=Velkommen

-    Title Swedish=Välkommen

-    Width=273

-    Height=250

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=166 214 208 228

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-    end

-    item: Push Button

-      Rectangle=212 214 254 228

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=Cancel

-    end

-    item: Static

-      Rectangle=0 0 268 233

-      Action=2

-      Enabled Color=00000000000000001111111111111111

-      Create Flags=01010000000000000000000000001011

-      Pathname=${__TCLBASEDIR__}\tools\white.bmp

-    end

-    item: Static

-      Rectangle=5 5 268 215

-      Destination Dialog=1

-      Action=2

-      Enabled Color=00000000000000001111111111111111

-      Create Flags=01010000000000000000000000001011

-      Pathname=${__TCLBASEDIR__}\tools\tclSplash.bmp

-    end

-  end

-end

-item: End Block

-end

-item: Wizard Block

-  Direction Variable=DIRECTION

-  Display Variable=DISPLAY

-  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP

-  X Position=9

-  Y Position=10

-  Filler Color=8421440

-  Dialog=Welcome

-  Dialog=Select Destination Directory

-  Dialog=Select Installation Type

-  Dialog=Select Components

-  Dialog=Select Program Manager Group

-  Variable=

-  Variable=

-  Variable=

-  Variable=TYPE

-  Variable=EXPLORER

-  Value=

-  Value=

-  Value=

-  Value=C

-  Value=1

-  Compare=0

-  Compare=0

-  Compare=0

-  Compare=1

-  Compare=0

-  Flags=00000011

-end

-item: Custom Dialog Set

-  Name=Welcome

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Welcome!

-      Text French=Bienvenue !

-      Text German=Willkommen!

-      Text Spanish=¡Bienvenido!

-      Text Italian=Benvenuti!

-    end

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DISABLED

-      Value=!

-      Create Flags=01010000000000010000000000000000

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=85 41 255 130

-      Create Flags=01010000000000000000000000000000

-      Text=This installation program will install %APPTITLE%.

-      Text=

-      Text=Press the Next button to start the installation. You can press the Exit Setup button now if you do not want to install %APPTITLE% at this time. 

-      Text=

-      Text=It is strongly recommended that you exit all Windows programs before running this installation program.

-      Text French=Ce programme d'installation va installer %APPTITLE%.

-      Text French=

-      Text French=Cliquez sur le bouton Suite pour démarrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.

-      Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert.

-      Text German=

-      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen.

-      Text Spanish=Este programa de instalación instalará %APPTITLE%.

-      Text Spanish=

-      Text Spanish=Presione el botón Siguiente para iniciar la instalación. Puede presionar el botón Salir de instalación si no desea instalar %APPTITLE% en este momento.

-      Text Italian=Questo programma installerà %APPTITLE%.

-      Text Italian=

-      Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione.

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-  end

-end

-item: Custom Dialog Set

-  Name=Select Destination Directory

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DIRECTION

-      Value=B

-      Create Flags=01010000000000010000000000000000

-      Flags=0000000000000001

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Select Destination Directory

-      Text French=Sélectionner le répertoire de destination

-      Text German=Zielverzeichnis wählen

-      Text Spanish=Seleccione el directorio de destino

-      Text Italian=Selezionare Directory di destinazione

-    end

-    item: Static

-      Rectangle=86 39 256 114

-      Create Flags=01010000000000000000000000000000

-      Text=Please select the directory where the %APPTITLE% files are to be installed.

-      Text=

-      Text=To install in the default directory below, click Next.

-      Text=

-      Text=To install in a different directory, click Browse and select another directory.

-      Text French=Veuillez sélectionner le répertoire dans lequel les fichiers %APPTITLE% doivent être installés.

-      Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.

-      Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.

-      Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.

-    end

-    item: Static

-      Rectangle=86 130 256 157

-      Action=1

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Push Button

-      Rectangle=205 138 250 153

-      Variable=MAINDIR_SAVE

-      Value=%MAINDIR%

-      Destination Dialog=1

-      Action=2

-      Create Flags=01010000000000010000000000000000

-      Text=Browse

-      Text French=Parcourir

-      Text German=Durchsuchen

-      Text Spanish=Buscar

-      Text Italian=Sfoglie

-    end

-    item: Static

-      Rectangle=91 140 198 151

-      Create Flags=01010000000000000000000000000000

-      Text=%MAINDIR%

-      Text French=%MAINDIR%

-      Text German=%MAINDIR%

-      Text Spanish=%MAINDIR%

-      Text Italian=%MAINDIR%

-    end

-  end

-  item: Dialog

-    Title=Select Destination Directory

-    Title French=Sélectionner le répertoire de destination

-    Title German=Zielverzeichnis wählen

-    Title Spanish=Seleccione el directorio de destino

-    Title Italian=Selezionare Directory di destinazione

-    Width=221

-    Height=173

-    Font Name=Helv

-    Font Size=8

-    item: Listbox

-      Rectangle=5 5 163 149

-      Variable=MAINDIR

-      Create Flags=01010000100000010000000101000000

-      Flags=0000110000100010

-      Text=%MAINDIR%

-      Text French=%MAINDIR%

-      Text German=%MAINDIR%

-      Text Spanish=%MAINDIR%

-      Text Italian=%MAINDIR%

-    end

-    item: Push Button

-      Rectangle=167 6 212 21

-      Create Flags=01010000000000010000000000000001

-      Text=OK

-      Text French=OK

-      Text German=OK

-      Text Spanish=Aceptar

-      Text Italian=OK

-    end

-    item: Push Button

-      Rectangle=167 25 212 40

-      Variable=MAINDIR

-      Value=%MAINDIR_SAVE%

-      Create Flags=01010000000000010000000000000000

-      Flags=0000000000000001

-      Text=Cancel

-      Text French=Annuler

-      Text German=Abbrechen

-      Text Spanish=Cancelar

-      Text Italian=Annulla

-    end

-  end

-end

-remarked item: Custom Dialog Set

-  Name=Select Installation Type

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DIRECTION

-      Value=B

-      Create Flags=01010000000000010000000000000000

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Select Installation Type

-      Text French=Sélectionner les composants

-      Text German=Komponenten auswählen

-      Text Spanish=Seleccione componentes

-      Text Italian=Selezionare i componenti

-    end

-    item: Static

-      Rectangle=194 162 242 172

-      Variable=COMPONENTS

-      Value=MAINDIR

-      Create Flags=01010000000000000000000000000010

-    end

-    item: Static

-      Rectangle=194 153 242 162

-      Variable=COMPONENTS

-      Create Flags=01010000000000000000000000000010

-    end

-    item: Static

-      Rectangle=107 153 196 164

-      Create Flags=01010000000000000000000000000000

-      Text=Disk Space Required:

-      Text French=Espace disque requis :

-      Text German=Notwendiger Speicherplatz:

-      Text Spanish=Espacio requerido en el disco:

-      Text Italian=Spazio su disco necessario:

-    end

-    item: Static

-      Rectangle=107 162 196 172

-      Create Flags=01010000000000000000000000000000

-      Text=Disk Space Remaining:

-      Text French=Espace disque disponible :

-      Text German=Verbleibender Speicherplatz:

-      Text Spanish=Espacio en disco disponible:

-      Text Italian=Spazio su disco disponibile:

-    end

-    item: Static

-      Rectangle=86 145 256 175

-      Action=1

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 42 256 61

-      Create Flags=01010000000000000000000000000000

-      Text=Choose which type of installation to perform by selecting one of the buttons below.

-      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.

-      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.

-      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.

-      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.

-    end

-    item: Radio Button

-      Rectangle=86 74 256 128

-      Variable=TYPE

-      Create Flags=01010000000000010000000000001001

-      Text=&Full Installation (Recommended)

-      Text=&Minimal Installation

-      Text=C&ustom Installation

-      Text=

-    end

-  end

-end

-item: Custom Dialog Set

-  Name=Select Components

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DIRECTION

-      Value=B

-      Create Flags=01010000000000010000000000000000

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Select Components

-      Text French=Sélectionner les composants

-      Text German=Komponenten auswählen

-      Text Spanish=Seleccione componentes

-      Text Italian=Selezionare i componenti

-    end

-    item: Checkbox

-      Rectangle=86 75 256 129

-      Variable=COMPONENTS

-      Create Flags=01010000000000010000000000000011

-      Flags=0000000000000110

-      Text=Tcl Run-Time Files

-      Text=Example Scripts

-      Text=Help Files

-      Text=Header and Library Files

-      Text=

-      Text French=Tcl Run-Time Files

-      Text French=Example Scripts

-      Text French=Help Files

-      Text French=Header and Library Files

-      Text French=

-      Text German=Tcl Run-Time Files

-      Text German=Example Scripts

-      Text German=Help Files

-      Text German=Header and Library Files

-      Text German=

-      Text Spanish=Tcl Run-Time Files

-      Text Spanish=Example Scripts

-      Text Spanish=Help Files

-      Text Spanish=Header and Library Files

-      Text Spanish=

-      Text Italian=Tcl Run-Time Files

-      Text Italian=Example Scripts

-      Text Italian=Help Files

-      Text Italian=Header and Library Files

-      Text Italian=

-    end

-    item: Static

-      Rectangle=194 162 242 172

-      Variable=COMPONENTS

-      Value=MAINDIR

-      Create Flags=01010000000000000000000000000010

-    end

-    item: Static

-      Rectangle=194 153 242 162

-      Variable=COMPONENTS

-      Create Flags=01010000000000000000000000000010

-    end

-    item: Static

-      Rectangle=107 153 196 164

-      Create Flags=01010000000000000000000000000000

-      Text=Disk Space Required:

-      Text French=Espace disque requis :

-      Text German=Notwendiger Speicherplatz:

-      Text Spanish=Espacio requerido en el disco:

-      Text Italian=Spazio su disco necessario:

-    end

-    item: Static

-      Rectangle=107 162 196 172

-      Create Flags=01010000000000000000000000000000

-      Text=Disk Space Remaining:

-      Text French=Espace disque disponible :

-      Text German=Verbleibender Speicherplatz:

-      Text Spanish=Espacio en disco disponible:

-      Text Italian=Spazio su disco disponibile:

-    end

-    item: Static

-      Rectangle=86 145 256 175

-      Action=1

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 42 256 61

-      Create Flags=01010000000000000000000000000000

-      Text=Choose which components to install by checking the boxes below.

-      Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.

-      Text German=Wählen Sie die zu installierenden Komponenten, indem Sie in die entsprechenden Kästchen klicken.

-      Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.

-      Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.

-    end

-  end

-end

-item: Custom Dialog Set

-  Name=Select Program Manager Group

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DIRECTION

-      Value=B

-      Create Flags=01010000000000010000000000000000

-      Flags=0000000000000001

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Select ProgMan Group

-      Text French=Sélectionner le groupe du Gestionnaire de programme 

-      Text German=Bestimmung der Programm-Managergruppe

-      Text Spanish=Seleccione grupo del Administrador de programas

-      Text Italian=Selezionare il gruppo ProgMan 

-    end

-    item: Static

-      Rectangle=86 44 256 68

-      Create Flags=01010000000000000000000000000000

-      Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to:

-      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :

-      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:

-      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:

-      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:

-    end

-    item: Combobox

-      Rectangle=86 69 256 175

-      Variable=GROUP

-      Create Flags=01010000000000010000001000000001

-      Flags=0000000000000001

-      Text=%GROUP%

-      Text French=%GROUP%

-      Text German=%GROUP%

-      Text Spanish=%GROUP%

-      Text Italian=%GROUP%

-    end

-  end

-end

-item: Custom Dialog Set

-  Name=Start Installation

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Next >

-      Text French=&Suite >

-      Text German=&Weiter >

-      Text Spanish=&Siguiente >

-      Text Italian=&Avanti >

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DIRECTION

-      Value=B

-      Create Flags=01010000000000010000000000000000

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Ready to Install!

-      Text French=Prêt à installer !

-      Text German=Installationsbereit!

-      Text Spanish=¡Preparado para la instalación!

-      Text Italian=Pronto per l'installazione!

-    end

-    item: Static

-      Rectangle=86 42 256 102

-      Create Flags=01010000000000000000000000000000

-      Text=You are now ready to install %APPTITLE%.

-      Text=

-      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.

-      Text French=Vous êtes maintenant prêt à installer les fichiers %APPTITLE%.

-      Text French=

-      Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation à nouveau.

-      Text German=Sie können %APPTITLE% nun installieren.

-      Text German=

-      Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben.

-      Text Spanish=Ya está listo para instalar %APPTITLE%.

-      Text Spanish=

-      Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación.

-      Text Italian=Ora è possibile installare %APPTITLE%.

-      Text Italian=

-      Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione.

-    end

-  end

-end

-item: If/While Statement

-  Variable=DISPLAY

-  Value=Select Destination Directory

-end

-item: Set Variable

-  Variable=BACKUP

-  Value=%MAINDIR%\BACKUP

-end

-item: End Block

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=TYPE

-  Value=B

-end

-item: Set Variable

-  Variable=COMPONENTS

-  Value=A

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=DOBACKUP

-  Value=A

-end

-item: Set Variable

-  Variable=BACKUPDIR

-  Value=%BACKUP%

-end

-item: End Block

-end

-remarked item: If/While Statement

-  Variable=BRANDING

-  Value=1

-end

-remarked item: If/While Statement

-  Variable=DOBRAND

-  Value=1

-end

-remarked item: Edit INI File

-  Pathname=%INST%\CUSTDATA.INI

-  Settings=[Registration]

-  Settings=NAME=%NAME%

-  Settings=COMPANY=%COMPANY%

-  Settings=

-end

-remarked item: End Block

-end

-remarked item: End Block

-end

-item: Set Variable

-  Variable=MAINDIRSHORT

-  Value=%MAINDIR%

-  Flags=00010100

-end

-item: Open/Close INSTALL.LOG

-end

-item: Check Disk Space

-  Component=COMPONENTS

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\license.terms

-  Destination=%MAINDIR%\license.txt

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\Readme.binary

-  Destination=%MAINDIR%\Readme.txt

-  Flags=0000000000000010

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=D

-  Flags=00001010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\win\release\tk81.lib

-  Destination=%MAINDIR%\lib\tk81.lib

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\win\release\tkstub81.lib

-  Destination=%MAINDIR%\lib\tkstub81.lib

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tcl81.lib

-  Destination=%MAINDIR%\lib\tcl81.lib

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tclstub81.lib

-  Destination=%MAINDIR%\lib\tclstub81.lib

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\Xutil.h

-  Destination=%MAINDIR%\include\X11\Xutil.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\Xlib.h

-  Destination=%MAINDIR%\include\X11\Xlib.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\Xfuncproto.h

-  Destination=%MAINDIR%\include\X11\Xfuncproto.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\Xatom.h

-  Destination=%MAINDIR%\include\X11\Xatom.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\X.h

-  Destination=%MAINDIR%\include\X11\X.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\keysymdef.h

-  Destination=%MAINDIR%\include\X11\keysymdef.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\keysym.h

-  Destination=%MAINDIR%\include\X11\keysym.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\xlib\X11\cursorfont.h

-  Destination=%MAINDIR%\include\X11\cursorfont.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\generic\tk.h

-  Destination=%MAINDIR%\include\tk.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\generic\tkDecls.h

-  Destination=%MAINDIR%\include\tkDecls.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\generic\tkIntXlibDecls.h

-  Destination=%MAINDIR%\include\tkIntXlibDecls.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\generic\tcl.h

-  Destination=%MAINDIR%\include\tcl.h

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\generic\tclDecls.h

-  Destination=%MAINDIR%\include\tclDecls.h

-  Flags=0000000000000010

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=A

-  Flags=00001010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\msgcat1.0\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.0\pkgIndex.tcl

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\msgcat1.0\msgcat.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.0\msgcat.tcl

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\ksc5601.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\euc-kr.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-kr.enc

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\symbol.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\symbol.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\shiftjis.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\shiftjis.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macUkraine.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macUkraine.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macTurkish.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macTurkish.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macThai.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macThai.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macRomania.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRomania.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macRoman.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macRoman.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macJapan.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macJapan.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macIceland.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macIceland.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macGreek.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macGreek.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macDingbats.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macDingbats.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macCyrillic.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCyrillic.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macCroatian.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCroatian.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\macCentEuro.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\macCentEuro.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\jis0212.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0212.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\jis0208.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0208.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\jis0201.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0201.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-9.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-9.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-8.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-8.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-7.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-7.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-6.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-6.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-5.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-5.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-4.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-4.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-3.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-3.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-2.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-2.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso8859-1.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso8859-1.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso2022.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso2022-kr.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-kr.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\iso2022-jp.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\iso2022-jp.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\gb2312.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb2312.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\gb1988.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb1988.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\gb12345.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\gb12345.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\euc-jp.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-jp.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\dingbats.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\dingbats.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp950.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp950.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp949.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp949.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp936.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp936.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp932.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp932.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp874.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp874.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp869.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp869.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp866.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp866.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp865.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp865.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp864.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp864.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp863.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp863.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp862.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp862.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp861.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp861.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp860.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp860.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp857.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp857.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp855.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp855.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp852.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp852.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp850.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp850.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp775.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp775.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp737.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp737.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp437.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp437.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1258.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1258.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1257.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1257.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1256.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1256.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1255.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1255.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1254.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1254.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1253.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1253.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1252.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1252.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1251.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1251.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\cp1250.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\cp1250.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\big5.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\big5.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\ascii.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ascii.enc

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\opt0.4\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\opt0.4\optparse.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\optparse.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\http2.0\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http2.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\http2.0\http.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http2.0\http.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\msgbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\msgbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\optMenu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\optMenu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\clrpick.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\clrpick.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\entry.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\entry.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\comdlg.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\comdlg.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\bgerror.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\bgerror.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\obsolete.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\obsolete.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\button.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\button.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\xmfbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\xmfbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\console.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\console.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\listbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\listbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\menu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\menu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\dialog.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\dialog.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\focus.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\focus.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\palette.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\palette.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\tkfbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tkfbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\tk.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tk.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\text.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\text.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\tearoff.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tearoff.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\tclIndex

-  Destination=%MAINDIR%\lib\tk%VER%\tclIndex

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\scrlbar.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\scrlbar.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\scale.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\scale.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\safetk.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\safetk.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\http1.0\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\http1.0\http.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\http.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tclreg81.dll

-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\tclreg81.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\dde1.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tcldde81.dll

-  Destination=%MAINDIR%\lib\tcl%VER%\dde1.0\tcldde81.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=C:\WINNT\SYSTEM32\Msvcrt.dll

-  Destination=%MAINDIR%\bin\msvcrt.dll

-  Flags=0010001000000011

-end

-item: Install File

-  Source=${__TKBASEDIR__}\win\release\wish81.exe

-  Destination=%MAINDIR%\bin\wish81.exe

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tclsh81.exe

-  Destination=%MAINDIR%\bin\tclsh81.exe

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tclpip81.dll

-  Destination=%MAINDIR%\bin\tclpip81.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\win\release\tcl81.dll

-  Destination=%MAINDIR%\bin\tcl81.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\win\release\tk81.dll

-  Destination=%MAINDIR%\bin\tk81.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\auto.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\auto.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\history.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\history.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\init.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\init.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\package.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\package.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\parray.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\parray.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\safe.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\safe.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\tclIndex

-  Destination=%MAINDIR%\lib\tcl%VER%\tclIndex

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\word.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\word.tcl

-  Flags=0000000000000010

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=B

-  Flags=00001010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\tai-ku.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\tai-ku.gif

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\teapot.ppm

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\teapot.ppm

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\tcllogo.gif

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\tcllogo.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\pattern.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\pattern.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\noletter.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\noletter.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\letters.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\letters.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\gray25.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\gray25.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\flagup.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagup.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\flagdown.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\flagdown.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\face.bmp

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\face.bmp

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\earthris.gif

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earthris.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\images\earth.gif

-  Destination=%MAINDIR%\lib\tk%VER%\demos\images\earth.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\vscale.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\vscale.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\twind.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\twin\released.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\text.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\text.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\style.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\style.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\states.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\states.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\search.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\search.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\sayings.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\sayings.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\ruler.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\ruler.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\radio.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\radio.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\puzzle.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\puzzle.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\plot.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\plot.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\msgbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\msgbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\menubu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\menubu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\menu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\menu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\label.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\label.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\items.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\items.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\image2.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\image2.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\image1.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\image1.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\icon.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\icon.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\hscale.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\hscale.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\form.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\form.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\ixset

-  Destination=%MAINDIR%\lib\tk%VER%\demos\ixset.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\rolodex

-  Destination=%MAINDIR%\lib\tk%VER%\demos\rolodex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\square

-  Destination=%MAINDIR%\lib\tk%VER%\demos\square.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\Readme

-  Destination=%MAINDIR%\lib\tk%VER%\demos\Readme

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\hello

-  Destination=%MAINDIR%\lib\tk%VER%\demos\hello.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\tclIndex

-  Destination=%MAINDIR%\lib\tk%VER%\demos\tclIndex

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\browse

-  Destination=%MAINDIR%\lib\tk%VER%\demos\browse.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\timer

-  Destination=%MAINDIR%\lib\tk%VER%\demos\timer.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\widget

-  Destination=%MAINDIR%\lib\tk%VER%\demos\widget.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\tcolor

-  Destination=%MAINDIR%\lib\tk%VER%\demos\tcolor.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\rmt

-  Destination=%MAINDIR%\lib\tk%VER%\demos\rmt.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\floor.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\floor.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\filebox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\filebox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\pwrdLogo75.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo75.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\pwrdLogo200.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo200.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\pwrdLogo175.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo175.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\pwrdLogo150.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo150.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\pwrdLogo100.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\pwrdLogo100.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\logoMed.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\logoMed.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\logoLarge.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\logoLarge.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\logo64.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\logo64.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\logo100.gif

-  Destination=%MAINDIR%\lib\tk%VER%\images\logo100.gif

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\images\Readme

-  Destination=%MAINDIR%\lib\tk%VER%\images\Readme

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\arrow.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\arrow.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\bind.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\bind.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\bitmap.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\bitmap.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\button.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\button.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\check.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\check.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\clrpick.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\clrpick.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\colors.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\colors.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\cscroll.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\cscroll.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\ctext.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\ctext.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\dialog1.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog1.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\dialog2.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\dialog2.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\entry1.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\entry1.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TKBASEDIR__}\library\demos\entry2.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\entry2.tcl

-  Flags=0000000000000010

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=C

-  Flags=00001010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\tools\tcl81.cnt

-  Destination=%MAINDIR%\doc\tcl81.cnt

-  Flags=0000000000000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\tools\tcl81.hlp

-  Destination=%MAINDIR%\doc\tcl81.hlp

-  Flags=0000000000000010

-end

-item: End Block

-end

-item: Set Variable

-  Variable=MAINDIR

-  Value=%MAINDIR%

-  Flags=00010100

-end

-item: Include Script

-  Pathname=\\pop\tools\1.2\win32-ix86\wise\INCLUDE\uninstal.wse

-end

-item: Check Configuration

-  Flags=10111011

-end

-item: Get Registry Key Value

-  Variable=GROUPDIR

-  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders

-  Default=%WIN%\Start Menu\Programs

-  Value Name=Programs

-  Flags=00000010

-end

-item: Set Variable

-  Variable=GROUP

-  Value=%GROUPDIR%\%GROUP%

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=A

-  Flags=00001010

-end

-item: Create Shortcut

-  Source=%MAINDIR%\bin\wish81.exe

-  Destination=%GROUP%\Wish.lnk

-  Working Directory=%MAINDIR%

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=A

-  Flags=00001010

-end

-item: Create Shortcut

-  Source=%MAINDIR%\bin\tclsh81.exe

-  Destination=%GROUP%\Tclsh.lnk

-  Working Directory=%MAINDIR%

-  Key Type=1536

-  Flags=00000001

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=C

-  Flags=00001010

-end

-item: Create Shortcut

-  Source=%MAINDIR%\doc\tcl81.hlp

-  Destination=%GROUP%\Tcl Help.lnk

-  Working Directory=%MAINDIR%

-end

-item: End Block

-end

-item: Create Shortcut

-  Source=%MAINDIR%\Readme.txt

-  Destination=%GROUP%\Readme.lnk

-  Working Directory=%MAINDIR%

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=B

-  Flags=00001010

-end

-item: Create Shortcut

-  Source=%MAINDIR%\lib\tk%VER%\demos\widget.tcl

-  Destination=%GROUP%\Widget Tour.lnk

-  Working Directory=%MAINDIR%

-  Key Type=1536

-  Flags=00000001

-end

-item: End Block

-end

-item: Else Statement

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=B

-  Flags=00001010

-end

-item: Add ProgMan Icon

-  Group=%GROUP%

-  Icon Name=Widget Tour

-  Command Line=%MAINDIR%\lib\tk%VER%\demos\widget.tcl

-  Icon Pathname=%MAINDIR%\bin\wish81.exe

-  Default Directory=%MAINDIR%

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=C

-  Flags=00001010

-end

-item: Add ProgMan Icon

-  Group=%GROUP%

-  Icon Name=Tcl Help

-  Command Line=%MAINDIR%\doc\tcl81.hlp

-  Default Directory=%MAINDIR%

-end

-item: End Block

-end

-item: Add ProgMan Icon

-  Group=%GROUP%

-  Icon Name=Readme

-  Command Line=%MAINDIR%\Readme.txt

-  Default Directory=%MAINDIR%

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=A

-  Flags=00001010

-end

-item: Add ProgMan Icon

-  Group=%GROUP%

-  Icon Name=Wish

-  Command Line=%MAINDIR%\bin\wish81.exe

-  Default Directory=%MAINDIR%

-end

-item: End Block

-end

-item: If/While Statement

-  Variable=COMPONENTS

-  Value=A

-  Flags=00001010

-end

-item: Add ProgMan Icon

-  Group=%GROUP%

-  Icon Name=Tclsh

-  Command Line=%MAINDIR%\bin\tclsh81.exe

-  Default Directory=%MAINDIR%

-end

-item: End Block

-end

-item: End Block

-end

-item: Self-Register OCXs/DLLs

-  Description=Updating System Configuration, Please Wait...

-end

-item: Edit Registry

-  Total Keys=1

-  Key=SOFTWARE\Sun\Tcl\%VER%

-  New Value=%MAINDIR%

-  Value Name=Root

-  Root=2

-end

-item: Edit Registry

-  Total Keys=1

-  Key=TclScript\DefaultIcon

-  New Value=%MAINDIR%\bin\tk81.dll

-end

-item: Edit Registry

-  Total Keys=1

-  Key=.tcl

-  New Value=TclScript

-end

-item: Edit Registry

-  Total Keys=1

-  Key=TclScript

-  New Value=TclScript

-end

-item: Edit Registry

-  Total Keys=1

-  Key=TclScript\shell\open\command

-  New Value=%MAINDIRSHORT%\bin\wish81.exe "%%1"

-end

-item: Edit Registry

-  Total Keys=1

-  Key=TclScript\shell\edit

-  New Value=&Edit

-end

-item: Edit Registry

-  Total Keys=1

-  Key=TclScript\shell\edit\command

-  New Value=notepad "%%1"

-end

-item: Add Directory to Path

-  Directory=%MAINDIR%\bin

-end

-item: Check Configuration

-  Flags=10111011

-end

-item: Set Variable

-  Variable=TO_SCRIPTICS

-  Value=A

-end

-item: Else Statement

-end

-item: Set Variable

-  Variable=TO_SCRIPTICS

-end

-item: End Block

-end

-item: Wizard Block

-  Direction Variable=DIRECTION

-  Display Variable=DISPLAY

-  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP

-  X Position=9

-  Y Position=10

-  Filler Color=8421440

-  Flags=00000011

-end

-item: Custom Dialog Set

-  Name=Finished

-  Display Variable=DISPLAY

-  item: Dialog

-    Title=%APPTITLE% Installation

-    Title French=Installation de %APPTITLE%

-    Title German=Installation von %APPTITLE%

-    Title Spanish=Instalación de %APPTITLE%

-    Title Italian=Installazione di %APPTITLE%

-    Width=271

-    Height=224

-    Font Name=Helv

-    Font Size=8

-    item: Push Button

-      Rectangle=150 187 195 202

-      Variable=DIRECTION

-      Value=N

-      Create Flags=01010000000000010000000000000001

-      Text=&Finish

-      Text French=&Fin

-      Text German=&Weiter

-      Text Spanish=&Terminar

-      Text Italian=&Fine

-    end

-    item: Push Button

-      Rectangle=105 187 150 202

-      Variable=DISABLED

-      Value=!

-      Create Flags=01010000000000010000000000000000

-      Text=< &Back

-      Text French=< &Retour

-      Text German=< &Zurück

-      Text Spanish=< &Atrás

-      Text Italian=< &Indietro

-    end

-    item: Push Button

-      Rectangle=211 187 256 202

-      Variable=DISABLED

-      Value=!

-      Action=3

-      Create Flags=01010000000000010000000000000000

-      Text=&Cancel

-      Text French=&Annuler

-      Text German=&Abbrechen

-      Text Spanish=&Cancelar

-      Text Italian=&Annulla

-    end

-    item: Static

-      Rectangle=8 180 256 181

-      Action=3

-      Create Flags=01010000000000000000000000000111

-    end

-    item: Static

-      Rectangle=86 8 258 42

-      Create Flags=01010000000000000000000000000000

-      Flags=0000000000000001

-      Name=Times New Roman

-      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18

-      Text=Installation Completed!

-      Text French=Installation terminée !

-      Text German=Die Installation ist abgeschlossen!

-      Text Spanish=¡Instalación terminada!

-      Text Italian=Installazione completata!

-    end

-    item: Static

-      Rectangle=86 42 256 153

-      Create Flags=01010000000000000000000000000000

-      Text=%APPTITLE% has been successfully installed.

-      Text=

-      Text=Click the Finish button to exit this installation.

-      Text=

-      Text=You can learn more about Tcl/Tk %VER%, including release notes, updates, tutorials, and more at %URL%.  Check the box below to start your web browser and go there now.

-      Text=

-      Text=The installer may ask you to reboot your computer, this is to update your PATH and is not necessary to do immediately.

-      Text French=%APPTITLE% est maintenant installé.

-      Text French=

-      Text French=Cliquez sur le bouton Fin pour quitter l'installation.

-      Text German=%APPTITLE% wurde erfolgreich installiert.

-      Text German=

-      Text German=Klicken Sie auf "Weiter", um die Installation zu beenden.

-      Text Spanish=%APPTITLE% se ha instalado con éxito.

-      Text Spanish=

-      Text Spanish=Presione el botón Terminar para salir de esta instalación.

-      Text Italian=L'installazione %APPTITLE% è stata portata a termine con successo.

-      Text Italian=

-      Text Italian=Premere il pulsante Fine per uscire dall'installazione.

-    end

-    item: Checkbox

-      Rectangle=88 156 245 170

-      Variable=TO_SCRIPTICS

-      Enabled Color=00000000000000001111111111111111

-      Create Flags=01010000000000010000000000000011

-      Text=Take me to learn more about Tcl/Tk %VER%

-      Text=

-    end

-  end

-end

-item: End Block

-end

-item: Check Configuration

-  Flags=10111011

-end

-item: If/While Statement

-  Variable=TO_SCRIPTICS

-  Value=A

-  Flags=00000010

-end

-item: Execute Program

-  Command Line=%URL%

-end

-item: End Block

-end

-item: Execute Program

-  Pathname=explorer

-  Command Line=%GROUP%

-end

-item: End Block

-end

diff --git a/tools/tcl8.1-tk8.1-man-html.tcl b/tools/tcl8.1-tk8.1-man-html.tcl
deleted file mode 100644
index ac01cd2..0000000
--- a/tools/tcl8.1-tk8.1-man-html.tcl
+++ /dev/null
@@ -1,1662 +0,0 @@
-#!/usr/local/bin/tclsh8.0
-#
-# Convert Ousterhout format man pages into highly crosslinked
-# hypertext.
-#
-# Along the way detect many unmatched font changes and other odd
-# things.
-#
-# Note well, this program is a hack rather than a piece of software
-# engineering.  In that sense it's probably a good example of things
-# that a scripting language, like Tcl, can do well.  It is offered as
-# an example of how someone might convert a specific set of man pages
-# into hypertext, not as a general solution to the problem.  If you
-# try to use this, you'll be very much on your own.
-#
-# Copyright (c) 1995-1997 Roger E. Critchlow Jr
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-# 
-# IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-# FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-# ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-# DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# 
-# THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-# IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-# NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-# MODIFICATIONS.
-#
-# Revisions:
-#  May 15, 1995 - initial release
-#  May 16, 1995 - added a back to home link to toplevel table of
-#	contents.
-#  May 18, 1995 - broke toplevel table of contents into separate
-#	pages for each section, and broke long table of contents
-#	into a one page for each man page.
-#  Mar 10, 1996 - updated for tcl7.5b3/tk4.1b3
-#  Apr 14, 1996 - incorporated command line parsing from Tom Tromey,
-#		  <tromey@creche.cygnus.com> -- thanks Tom.
-#		- updated for tcl7.5/tk4.1 final release.
-#		- converted to same copyright as the man pages.
-#  Sep 14, 1996 - made various modifications for tcl7.6b1/tk4.2b1
-#  Oct 18, 1996 - added tcl7.6/tk4.2 to the list of distributions.
-#  Oct 22, 1996 - major hacking on indentation code and elsewhere.
-#  Mar  4, 1997 - 
-#  May 28, 1997 - added tcl8.0b1/tk8.0b1 to the list of distributions
-#		- cleaned source for tclsh8.0 execution
-#		- renamed output files for windoze installation
-#		- added spaces to tables
-#  Oct 24, 1997 - moved from 8.0b1 to 8.0 release
-#
-
-set Version "0.14"
-
-proc parse_command_line {} {
-    global argv Version
-
-    # These variables determine where the man pages come from and where
-    # the converted pages go to.
-    global tcltkdir tkdir tcldir webdir
-
-    # Set defaults based on original code.
-    set tcltkdir ../..
-    set tkdir {}
-    set tcldir {}
-    set webdir ../html
-
-    # Directory names for Tcl and Tk, in priority order.
-    set tclDirList {tcl8.1 tcl8.0 tcl tcl7.4 tcl7.5 tcl7.6}
-    set tkDirList {tk8.1 tk8.0 tk tk4.0 tk4.1 tk4.2}
-
-    # Handle arguments a la GNU:
-    #   --version
-    #   --help
-    #   --srcdir=/path
-    #   --htmldir=/path
-
-    foreach option $argv {
-	switch -glob -- $option {
-	    --version {
-		puts "tcltk-man-html $Version"
-		exit 0
-	    }
-
-	    --help {
-		puts "usage: tcltk-man-html \[OPTION\] ...\n"
-		puts "  --help              print this help, then exit"
-		puts "  --version           print version number, then exit"
-		puts "  --srcdir=DIR        find tcl and tk source below DIR"
-		puts "  --htmldir=DIR       put generated HTML in DIR"
-		exit 0
-	    }
-
-	    --srcdir=* {
-		# length of "--srcdir=" is 9.
-		set tcltkdir [string range $option 9 end]
-	    }
-
-	    --htmldir=* {
-		# length of "--htmldir=" is 10
-		set webdir [string range $option 10 end]
-	    }
-
-	    default {
-		puts stderr "tcltk-man-html: unrecognized option -- `$option'"
-		exit 1
-	    }
-	}
-    }
-
-    # Find Tcl.
-    foreach dir $tclDirList {
-	if {[file isdirectory $tcltkdir/$dir]} then {
-	    set tcldir $dir
-	    break
-	}
-    }
-    if {$tcldir == ""} then {
-	puts stderr "tcltk-man-html: couldn't find Tcl below $tcltkdir"
-	exit 1
-    }
-
-    # Find Tk.
-    foreach dir $tkDirList {
-	if {[file isdirectory $tcltkdir/$dir]} then {
-	    set tkdir $dir
-	    break
-	}
-    }
-    if {$tkdir == ""} then {
-	puts stderr "tcltk-man-html: couldn't find Tk below $tcltkdir"
-	exit 1
-    }
-
-    # the title for the man pages overall
-    global overall_title
-    set overall_title "[capitalize $tcldir]/[capitalize $tkdir] Manual"
-}
-
-proc capitalize {string} {
-    return [string toupper [string index $string 0]][string range $string 1 end]
-}
-
-##
-##
-##
-set manual(report-level) 1;
-
-proc manerror {msg} {
-    global manual;
-    set name {};
-    set subj {};
-    if {[info exists manual(name)]} {
-	set name $manual(name);
-    }
-    if {[info exists manual(section)] && "$manual(section)" != {}} {
-	puts stderr "$name: $manual(section):  $msg";
-    } else {
-	puts stderr "$name: $msg";
-    }
-}
-
-proc manreport {level msg} {
-    global manual;
-    if {$level < $manual(report-level)} {
-	manerror $msg;
-    }
-}
-
-proc fatal {msg} {
-    global manual;
-    manerror $msg;
-    exit 1;
-}
-##
-## parsing
-##
-proc unquote arg {
-    regsub -all \" $arg {} arg;
-    return $arg;
-}
-
-proc parse-directive {line codename restname} {
-    upvar $codename code $restname rest;
-    return [regexp {^(\.[.a-zA-Z0-9]*) *(.*)} $line all code rest];
-}
-
-proc process-text {text} {
-    global manual;
-    # preprocess text
-    regsub -all {\\&} $text \t text;		# some kind of tab?
-    regsub -all {&} $text {\&amp;} text;
-    regsub -all {\\\\} $text {\&#92;} text;	# reverse solidus, ie backslash
-    regsub -all {\\ } $text {\&nbsp;} text;	# non breaking space
-    regsub -all {\\%} $text {} text;		# don't break word following?
-    regsub -all "\\\\\n" $text "\n" text;	# 
-    regsub -all \" $text {\&quot;} text;
-    regsub -all {<} $text {\&lt;} text;
-    regsub -all {>} $text {\&gt;} text;
-    regsub -all {\\-\\\|\\-} $text -- text;	# two hyphens
-    regsub -all -- {\\-\\\^\\-} $text -- text;	# two hyphens
-    regsub -all {\\-} $text - text;		# a hyphen
-    regsub -all {\\0} $text { } text;		# a space
-    # regsub -all {\\\|} $text | text;		# a very thin space 
-    regsub -all {\\e} $text {\&#92;} text;	# reverse solidus, ie backslash
-    regsub -all {\\\(\+-} $text {\&#177;} text;	# plus or minus sign
-    regsub -all {\\fP} $text {\\fR} text;	# a funky font in expr.n
-    regsub -all {\\\.} $text . text;		# a plain .
-    regsub -all "\\\\\n" $text "\\&\#92;\n" text;	# an escaped newline
-    while {[regexp {\\} $text]} {
-	# C R
-	if {[regsub {^([^\\]*)\\fC([^\\]*)\\fR(.*)$} $text {\1<TT>\2</TT>\3} text]} continue
-	# B R
-	if {[regsub {^([^\\]*)\\fB([^\\]*)\\fR(.*)$} $text {\1<B>\2</B>\3} text]} continue
-	# B I
-	if {[regsub {^([^\\]*)\\fB([^\\]*)\\fI(.*)$} $text {\1<B>\2</B>\\fI\3} text]} continue
-	# I R
-	if {[regsub {^([^\\]*)\\fI([^\\]*)\\fR(.*)$} $text {\1<I>\2</I>\3} text]} continue
-	# I B
-	if {[regsub {^([^\\]*)\\fI([^\\]*)\\fB(.*)$} $text {\1<I>\2</I>\\fB\3} text]} continue
-	# B B, I I, R R
-	if {[regsub {^([^\\]*)\\fB([^\\]*)\\fB(.*)$} $text {\1\\fB\2\3} ntext]
-	    || [regsub {^([^\\]*)\\fI([^\\]*)\\fI(.*)$} $text {\1\\fI\2\3} ntext]
-	    || [regsub {^([^\\]*)\\fR([^\\]*)\\fR(.*)$} $text {\1\\fR\2\3} ntext]} {
-	    manerror "process-text: impotent font change: $text";
-	    set text $ntext;
-	    continue;
-	}
-	# unrecognized 
-	manerror "process-text: uncaught backslash: $text"
-	regsub -all {\\} $text {#92;} text
-    }
-    return $text
-}    
-##
-## pass 2 text input and matching
-##
-proc open-text {} {
-    global manual;
-    set manual(text-length) [llength $manual(text)];
-    set manual(text-pointer) 0;
-}
-proc more-text {} {
-    global manual;
-    return [expr $manual(text-pointer) < $manual(text-length)];
-}
-proc next-text {} {
-    global manual;
-    if {[more-text]} {
-	set text [lindex $manual(text) $manual(text-pointer)];
-	incr manual(text-pointer);
-	return $text;
-    }
-    manerror "read past end of text";
-    error "fatal";
-}
-proc is-a-directive {line} {
-    return [expr {[string first . $line] == 0}]
-}
-proc split-directive {line opname restname} {
-    upvar $opname op $restname rest
-    set op [string range $line 0 2];
-    set rest [string trim [string range $line 3 end]];
-}
-proc next-op-is {op restname} {
-    global manual;
-    upvar $restname rest;
-    if {[more-text]} {
-	set text [lindex $manual(text) $manual(text-pointer)];
-	if {[string compare [string range $text 0 2] $op] == 0} {
-	    set rest [string range $text 4 end];
-	    incr manual(text-pointer);
-	    return 1;
-	}
-    }
-    return 0;
-}
-proc backup-text {n} {
-    global manual;
-    if {$manual(text-pointer)-$n >= 0} {
-	incr manual(text-pointer) -$n;
-    }
-}
-proc match-text args {
-    global manual;
-    set nargs [llength $args];
-    if {$manual(text-pointer) + $nargs > $manual(text-length)} {
-	return 0;
-    }
-    set nback 0;
-    foreach arg $args {
-	if { ! [more-text]} {
-	    backup-text $nback;
-	    return 0;
-	}
-	set arg [string trim $arg];
-	set targ [string trim [lindex $manual(text) $manual(text-pointer)]];
-	if {"$arg" == "$targ"} {
-	    incr nback;
-	    incr manual(text-pointer);
-	    continue;
-	}
-	if {[regexp {^@([_a-zA-Z0-9]+)$} $arg all name]} {
-	    upvar $name var;
-	    set var $targ;
-	    incr nback;
-	    incr manual(text-pointer);
-	    continue;
-	}
-	if {[regexp {^(\.[a-zA-Z][a-zA-Z])@([_a-zA-Z0-9]+)$} $arg all op name] && "$op" == "[lindex $targ 0]"} {
-	    upvar $name var;
-	    set var [lrange $targ 1 end];
-	    incr nback;
-	    incr manual(text-pointer);
-	    continue;
-	}
-	backup-text $nback;
-	return 0;
-    }
-    return 1;
-}
-proc expand-next-text {n} {
-    global manual;
-    return [join [lrange $manual(text) $manual(text-pointer) [expr $manual(text-pointer)+$n-1]] \n\n];
-}
-##
-## pass 2 output
-##
-proc man-puts {text} {
-    global manual;
-    lappend manual(output-$manual(wing-file)-$manual(name)) $text;
-}
-
-##
-## build hypertext links to tables of contents
-##
-proc long-toc {text} {
-    global manual;
-    set here M[incr manual(section-toc-n)]
-    set there L[incr manual(long-toc-n)];
-    lappend manual(section-toc) "<DD><A HREF=\"$manual(name).htm#$here\" NAME=\"$there\">$text</A>";
-    return "<A NAME=\"$here\">$text</A>";
-}
-proc option-toc {name class switch} {
-    global manual;
-    if {"$manual(section)" == {WIDGET-SPECIFIC OPTIONS}} {
-	# link the defined option into the long table of contents
-	set link [long-toc "$switch, $name, $class"];
-	regsub -- "$switch, $name, $class" $link "$switch" link;
-	return $link;
-    } elseif {"$manual(name):$manual(section)" == {options:DESCRIPTION}} {
-	# link the defined standard option to the long table of
-	# contents and make a target for the standard option references
-	# from other man pages.
-	set first [lindex $switch 0];
-	set here M$first;
-	set there L[incr manual(long-toc-n)];
-	set manual(standard-option-$first) "<A HREF=\"$manual(name).htm#$here\">$switch, $name, $class</A>";
-	lappend manual(section-toc) "<DD><A HREF=\"$manual(name).htm#$here\" NAME=\"$there\">$switch, $name, $class</A>";
-	return "<A NAME=\"$here\">$switch</A>";
-    } else {
-	error "option-toc in $manual(name) section $manual(section)";
-    }
-}
-proc std-option-toc {name} {
-    global manual;
-    if {[info exists manual(standard-option-$name)]} {
-	lappend manual(section-toc) <DD>$manual(standard-option-$name);
-	return $manual(standard-option-$name);
-    }
-    set here M[incr manual(section-toc-n)]
-    set there L[incr manual(long-toc-n)];
-    set other M$name;
-    lappend manual(section-toc) "<DD><A HREF=\"options.htm#$other\">$name</A>";
-    return "<A HREF=\"options.htm#$other\">$name</A>";
-}
-##
-## process the widget option section
-## in widget and options man pages
-##
-proc output-widget-options {rest} {
-    global manual
-    man-puts <DL>;
-    lappend manual(section-toc) <DL>;
-    backup-text 1;
-    set para {}
-    while {[next-op-is .OP rest]} {
-	switch -exact [llength $rest] {
-	    3 {
-		set switch [lindex $rest 0];
-		set name [lindex $rest 1];
-		set class [lindex $rest 2];
-	    }
-	    5 {
-		set switch [lrange $rest 0 2];
-		set name [lindex $rest 3];
-		set class [lindex $rest 4];
-	    }
-	    default {
-		fatal "bad .OP $rest";
-	    }
-	}
-	if { ! [regexp {^(<.>)([-a-zA-Z0-9 ]+)(</.>)$} $switch all oswitch switch cswitch]} {
-	    if { ! [regexp {^(<.>)([-a-zA-Z0-9 ]+) or ([-a-zA-Z0-9 ]+)(</.>)$} $switch all oswitch switch1 switch2 cswitch]} {
-		error "not Switch: $switch";
-	    } else {
-		set switch "$switch1$cswitch or $oswitch$switch2";
-	    }
-	}
-	if { ! [regexp {^(<.>)([a-zA-Z0-9]*)(</.>)$} $name all oname name cname]} {
-	    error "not Name: $name";
-	}
-	if { ! [regexp {^(<.>)([a-zA-Z0-9]*)(</.>)$} $class all oclass class cclass]} {
-	    error "not Class: $class";
-	}
-	man-puts "$para<DT>Command-Line Name: $oswitch[option-toc $name $class $switch]$cswitch";
-	man-puts "<DT>Database Name: $oname$name$cname";
-	man-puts "<DT>Database Class: $oclass$class$cclass";
-	man-puts <DD>[next-text];
-	set para <P>
-    }
-    man-puts </DL>;
-    lappend manual(section-toc) </DL>;
-}
-
-##
-## process .RS lists
-##
-proc output-RS-list {} {
-    global manual;
-    if {[next-op-is .IP rest]} {
-	output-IP-list .RS .IP $rest;
-	if {[match-text .RE .sp .RS @rest .IP @rest2]} {
-	    man-puts <P>$rest
-	    output-IP-list .RS .IP $rest2
-	}
-	if {[match-text .RE .sp .RS @rest .RE]} {
-	    man-puts <P>$rest
-	    return;
-	}
-	if {[next-op-is .RE rest]} {
-	    return;
-	}
-    }
-    man-puts <DL><P><DD>;
-    while {[more-text]} {
-	set line [next-text];
-	if {[is-a-directive $line]} {
-	    split-directive $line code rest
-	    switch -exact $code {
-		.RE {
-		    break;
-		}
-		.SH {
-		    manerror "unbalanced .RS at section end";
-		    backup-text 1;
-		    break;
-		}
-		default {
-		    output-directive $line;
-		}
-	    }
-	} else {
-	    man-puts $line;
-	}
-    }	
-    man-puts </DL>;
-}
-
-##
-## process .IP lists which may be plain indents,
-## numeric lists, or definition lists
-##
-proc output-IP-list {context code rest} {
-    global manual;
-    if {"$rest" == {}} {
-	# blank label, plain indent, no contents entry
-	man-puts <DL><P><DD>
-	while {[more-text]} {
-	    set line [next-text];
-	    if {[is-a-directive $line]} {
-		split-directive $line code rest
-		if {"$code" == {.IP} && "$rest" == {}} {
-		    man-puts "<P>";
-		    continue;
-		}
-		if {[lsearch {.br .DS .RS} $code] >= 0} {
-		    output-directive $line;
-		} else {
-		    backup-text 1;
-		    break;
-		}
-	    } else {
-		man-puts $line;
-	    }
-	}
-	man-puts </DL>;
-    } else {
-	# labelled list, make contents
-	if {"$context" != {.SH}} {
-	    man-puts <P>;
-	}
-	man-puts <DL>
-	lappend manual(section-toc) <DL>;
-	backup-text 1
-	set accept_RE 0
-	while {[more-text]} {
-	    set line [next-text];
-	    if {[is-a-directive $line]} {
-		split-directive $line code rest
-		switch -exact $code {
-		    .IP {
-			if {$accept_RE} {
-			    output-IP-list .IP $code $rest
-			    continue;
-			}
-			if {"$manual(section)" == {ARGUMENTS} || [regexp {^\[[0-9]+\]$} $rest]} {
-			    man-puts "<P><DT>$rest<DD>";
-			} else {
-			    man-puts "<P><DT>[long-toc $rest]<DD>";
-			}
-			if {"$manual(name):$manual(section)" == {selection:DESCRIPTION}} {
-			    if {[match-text .RE @rest .RS .RS]} {
-				man-puts <DT>[long-toc $rest]<DD>;
-			    }
-			}
-		    }
-		    .sp -
-		    .br -
-		    .DS -
-		    .CS {
-			output-directive $line;
-		    }
-		    .RS {
-			if {[match-text .RS]} {
-			    output-directive $line;
-			    incr accept_RE 1;
-			} elseif {[match-text .CS]} {
-			    output-directive .CS
-			    incr accept_RE 1;
-			} elseif {[match-text .PP]} {
-			    output-directive .PP
-			    incr accept_RE 1;
-			} elseif {[match-text .DS]} {
-			    output-directive .DS
-			    incr accept_RE 1;
-			} else {
-			    output-directive $line;
-			}
-		    }
-		    .PP {
-			if {[match-text @rest1 .br @rest2 .RS]} {
-			    # yet another nroff kludge as above
-			    man-puts "<P><DT>[long-toc $rest1]"
-			    man-puts "<DT>[long-toc $rest2]<DD>"
-			    incr accept_RE 1;
-			} elseif {[match-text @rest .RE]} {
-			    # gad, this is getting ridiculous
-			    if { ! $accept_RE} {
-				man-puts "</DL><P>$rest<DL>"
-				backup-text 1
-				break;
-			    } else {
-				man-puts "<P>$rest"
-				incr accept_RE -1
-			    }
-			} elseif {$accept_RE} {
-			    output-directive $line
-			} else {
-			    backup-text 1
-			    break;
-			}
-		    }
-		    .RE {
-			if { ! $accept_RE} {
-			    backup-text 1;
-			    break;
-			}
-			incr accept_RE -1
-		    }
-		    default {
-			backup-text 1;
-			break;
-		    }
-		}
-	    } else {
-		man-puts $line;
-	    }
-	}
-	man-puts <P></DL>;
-	lappend manual(section-toc) </DL>;
-	if {$accept_RE} {
-	    manerror "missing .RE in output-IP-list"
-	}
-    }
-}
-##
-## handle the NAME section lines
-## there's only one line in the NAME section,
-## consisting of a comma separated list of names,
-## followed by a hyphen and a short description.
-##
-proc output-name {line} {
-    global manual;
-    # split name line into pieces
-    regexp {^([^-]+) - (.*)$} $line all head tail;
-    # output line to manual page untouched
-    man-puts $line
-    # output line to long table of contents
-    lappend manual(section-toc) <DL><DD>$line</DL>
-    # separate out the names for future reference
-    foreach name [split $head ,] {
-	set name [string trim $name];
-	if {[llength $name] > 1} {
-	    manerror "name has a space: {$name}\nfrom: $line";
-	}
-	lappend manual(wing-toc) $name;
-	lappend manual(name-$name) $manual(wing-file)/$manual(name);
-    }
-}
-##
-## build a cross-reference link if appropriate
-##
-proc cross-reference {ref} {
-    global manual;
-    if {[string match Tcl_* $ref]} {
-	set lref $ref;
-    } elseif {[string match Tk_* $ref]} {
-	set lref $ref;
-    } elseif {"$ref" == {Tcl}} {
-	set lref $ref;
-    } else {
-	set lref [string tolower $ref];
-    }
-    ##
-    ## nothing to reference
-    ##
-    if { ! [info exists manual(name-$lref)]} {
-	foreach name {array file history info interp string trace
-	    after clipboard grab image option pack place selection tk tkwait update winfo wm} {
-	    if {[regexp "^$name \[a-z0-9]*\$" $lref] && "$manual(tail)" != "$name.n"} {
-		return "<A HREF=\"../$manual(name-$name).htm\">$ref</A>";
-	    }
-	}
-	if {[lsearch {stdin stdout stderr end} $lref] >= 0} {
-	    # no good place to send these
-	    # tcl tokens?
-	    # also end
-	}
-	return $ref;
-    }
-    ##
-    ## would be a self reference
-    ##
-    foreach name $manual(name-$lref) {
-	if {[lsearch $name $manual(wing-file)/$manual(name)] >= 0} {
-	    return $ref;
-	}
-    }
-    ##
-    ## multiple choices for reference
-    ##
-    if {[llength $manual(name-$lref)] > 1} {
-	set tcl_i [lsearch -glob $manual(name-$lref) *TclCmd*];
-	set tcl_ref [lindex $manual(name-$lref) $tcl_i];
-	set tk_i [lsearch -glob $manual(name-$lref) *TkCmd*];
-	set tk_ref [lindex $manual(name-$lref) $tk_i];
-	if {$tcl_i >= 0 && "$manual(wing-file)" == {TclCmd} ||  "$manual(wing-file)" == {TclLib}} {
-	    return "<A HREF=\"../$tcl_ref.htm\">$ref</A>";
-	}
-	if {$tk_i >= 0 && "$manual(wing-file)" == {TkCmd} || "$manual(wing-file)" == {TkLib}} {
-	    return "<A HREF=\"../$tk_ref.htm\">$ref</A>";
-	}
-	if {"$lref" == {exit} && "$manual(tail)" == {tclsh.1} && $tcl_i >= 0} {
-	    return "<A HREF=\"../$tcl_ref.htm\">$ref</A>";
-	}
-	puts stderr "multiple cross reference to $ref in $manual(name-$lref) from $manual(wing-file)/$manual(tail)";
-	return $ref;
-    }
-    ##
-    ## exceptions, sigh, to the rule
-    ##
-    switch $manual(tail) {
-	canvas.n {
-	    if {$lref == {focus}} {
-		upvar tail tail;
-		set clue [string first command $tail];
-		if {$clue < 0 ||  $clue > 5} {
-		    return $ref;
-		}
-	    }
-	    if {[lsearch {bitmap image text} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	checkbutton.n -
-	radiobutton.n {
-	    if {[lsearch {image} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	menu.n {
-	    if {[lsearch {checkbutton radiobutton} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	options.n {
-	    if {[lsearch {bitmap image set} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	regexp.n {
-	    if {[lsearch {string} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	source.n {
-	    if {[lsearch {text} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	history.n {
-	    if {[lsearch {exec} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	return.n {
-	    if {[lsearch {error continue break} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-	scrollbar.n {
-	    if {[lsearch {set} $lref] >= 0} {
-		return $ref;
-	    }
-	}
-    }
-    ##
-    ## return the cross reference
-    ##
-    return "<A HREF=\"../$manual(name-$lref).htm\">$ref</A>";
-}
-##
-## reference generation errors
-##
-proc reference-error {msg text} {
-    global manual;
-    puts stderr "$manual(tail): $msg: {$text}";
-    return $text;
-}
-##
-## insert as many cross references into this text string as are appropriate
-##
-proc insert-cross-references {text} {
-    global manual;
-    ##
-    ## we identify cross references by:
-    ##     ``quotation''
-    ##    <B>emboldening</B>
-    ##    Tcl_ prefix
-    ##    Tk_ prefix
-    ##	  [a-zA-Z0-9]+ manual entry
-    ## and we avoid messing with already anchored text
-    ##
-    ##
-    ## find where each item lives
-    ##
-    array set offset [list \
-			  anchor [string first {<A } $text] \
-			  end-anchor [string first {</A>} $text] \
-			  quote [string first {``} $text] \
-			  end-quote [string first {''} $text] \
-			  bold [string first {<B>} $text] \
-			  end-bold [string first {</B>} $text] \
-			  tcl [string first {Tcl_} $text] \
-			  tk [string first {Tk_} $text] \
-			  Tcl1 [string first {Tcl manual entry} $text] \
-			  Tcl2 [string first {Tcl overview manual entry} $text] \
-		     ];
-    ##
-    ## accumulate a list
-    ##
-    foreach name [array names offset] {
-	if {$offset($name) >= 0} {
-	    set invert($offset($name)) $name;
-	    lappend offsets $offset($name);
-	}
-    }
-    ##
-    ## if nothing, then we're done.
-    ##
-    if { ! [info exists offsets]} {
-	return $text;
-    }
-    ##
-    ## sort the offsets
-    ##
-    set offsets [lsort -integer $offsets];
-    ##
-    ## see which we want to use
-    ##
-    switch -exact $invert([lindex $offsets 0]) {
-	anchor {
-	    if {$offset(end-anchor) < 0} { return [reference-error {Missing end anchor} $text]; }
-	    set head [string range $text 0 $offset(end-anchor)];
-	    set tail [string range $text [expr $offset(end-anchor)+1] end];
-	    return $head[insert-cross-references $tail]
-	}
-	quote {
-	    if {$offset(end-quote) < 0} { return [reference-error {Missing end quote} $text]; }
-	    if {"$invert([lindex $offsets 1])" == {tk}} { set offsets [lreplace $offsets 1 1]; }
-	    if {"$invert([lindex $offsets 1])" == {tcl}} { set offsets [lreplace $offsets 1 1]; }
-	    switch -exact $invert([lindex $offsets 1]) {
-		end-quote {
-		    set head [string range $text 0 [expr $offset(quote)-1]]
-		    set body [string range $text [expr $offset(quote)+2] [expr $offset(end-quote)-1]];
-		    set tail [string range $text [expr $offset(end-quote)+2] end];
-		    return $head``[cross-reference $body]''[insert-cross-references $tail];
-		}
-		bold -
-		anchor {
-		    set head [string range $text 0 [expr $offset(end-quote)+1]]
-		    set tail [string range $text [expr $offset(end-quote)+2] end];
-		    return $head[insert-cross-references $tail];
-		}
-	    }
-	    return [reference-error {Uncaught quote case} $text];
-	}
-	bold {
-	    if {$offset(end-bold) < 0} { return $text; }
-	    if {"$invert([lindex $offsets 1])" == {tk}} { set offsets [lreplace $offsets 1 1]; }
-	    if {"$invert([lindex $offsets 1])" == {tcl}} { set offsets [lreplace $offsets 1 1]; }
-	    switch -exact $invert([lindex $offsets 1]) {
-		end-bold {
-		    set head [string range $text 0 [expr $offset(bold)-1]]
-		    set body [string range $text [expr $offset(bold)+3] [expr $offset(end-bold)-1]];
-		    set tail [string range $text [expr $offset(end-bold)+4] end];
-		    return $head<B>[cross-reference $body]</B>[insert-cross-references $tail];
-		}
-		anchor {
-		    set head [string range $text 0 [expr $offset(end-bold)+3]]
-		    set tail [string range $text [expr $offset(end-bold)+4] end];
-		    return $head[insert-cross-references $tail];
-		}
-	    }
-	    return [reference-error {Uncaught bold case} $text];
-	}
-	tk {
-	    set head [string range $text 0 [expr $offset(tk)-1]]
-	    set tail [string range $text $offset(tk) end];
-	    if { ! [regexp {^(Tk_[a-zA-Z0-9_]+)(.*)$} $tail all body tail]} { return [reference-error {Tk regexp failed} $text]; }
-	    return $head[cross-reference $body][insert-cross-references $tail];
-	}
-	tcl {
-	    set head [string range $text 0 [expr $offset(tcl)-1]]
-	    set tail [string range $text $offset(tcl) end];
-	    if { ! [regexp {^(Tcl_[a-zA-Z0-9_]+)(.*)$} $tail all body tail]} { return [reference-error {Tcl regexp failed} $text]; }
-	    return $head[cross-reference $body][insert-cross-references $tail];
-	}
-	Tcl1 -
-	Tcl2 {
-	    set off [lindex $offsets 0];
-	    set head [string range $text 0 [expr $off-1]];
-	    set body Tcl
-	    set tail [string range $text [expr $off+3] end];
-	    return $head[cross-reference $body][insert-cross-references $tail];
-	}
-	end-anchor -
-	end-bold -
-	end-quote {
-	    return [reference-error "Out of place $invert([lindex $offsets 0])" $text];
-	}
-    }
-}
-##
-## process formatting directives
-##
-proc output-directive {line} {
-    global manual;
-    # process format directive
-    split-directive $line code rest
-    switch -exact $code {
-	.BS -
-	.BE {
-	    # man-puts <HR>;
-	}
-	.SH {
-	    # drain any open lists
-	    # announce the subject
-	    set manual(section) $rest;
-	    # start our own stack of stuff
-	    set manual($manual(name)-$manual(section)) {};
-	    lappend manual(has-$manual(section)) $manual(name);
-	    man-puts "<H3>[long-toc $manual(section)]</H3>";
-	    # some sections can simply free wheel their way through the text
-	    # some sections can be processed in their own loops
-	    switch -exact $manual(section) {
-		NAME {
-		    if {[lsearch {CrtImgType.3 CrtItemType.3 CrtPhImgFmt.3} $manual(tail)] >= 0} {
-			# these manual pages have two NAME sections
-			if {[info exists manual($manual(tail)-NAME)]} {
-			    return;
-			}
-			set manual($manual(tail)-NAME) 1
-		    }
-		    set names {}
-		    while {1} {
-			set line [next-text];
-			if {[is-a-directive $line]} {
-			    backup-text 1;
-			    output-name [join $names { }]
-			    return;
-			} else {
-			    lappend names [string trim $line]
-			}
-		    }
-		}
-		SYNOPSIS {
-		    lappend manual(section-toc) <DL>;
-		    while {1} {
-			if {[next-op-is .nf rest]
-			 || [next-op-is .br rest]
-			 || [next-op-is .fi rest]} {
-			    continue;
-			}
-			if {[next-op-is .SH rest]
-		         || [next-op-is .BE rest]
-			 || [next-op-is .SO rest]} {
-			    backup-text 1;
-			    break;
-			}
-			if {[next-op-is .sp rest]} {
-			    #man-puts <P>;
-			    continue;
-			}
-			set more [next-text];
-			if {[is-a-directive $more]} {
-			    manerror "in SYNOPSIS found $more";
-			    backup-text 1;
-			    break;
-			} else {
-			    foreach more [split $more \n] {
-				man-puts $more<BR>;
-				if {[lsearch {TclLib TkLib} $manual(wing-file)] < 0} {
-				    lappend manual(section-toc) <DD>$more;
-				}
-			    }
-			}
-		    }
-		    lappend manual(section-toc) </DL>;
-		    return;
-		}
-		{SEE ALSO} {
-		    while {[more-text]} {
-			if {[next-op-is .SH rest]} {
-			    backup-text 1;
-			    return;
-			}
-			set more [next-text];
-			if {[is-a-directive $more]} {
-			    manerror "$more";
-			    backup-text 1;
-			    return;
-			}
-			set nmore {};
-			foreach cr [split $more ,] {
-			    set cr [string trim $cr];
-			    if { ! [regexp {^<B>.*</B>$} $cr]} {
-				set cr <B>$cr</B>;
-			    }
-			    if {[regexp {^<B>(.*)\([13n]\)</B>$} $cr all name]} {
-				set cr <B>$name</B>
-			    }
-			    lappend nmore $cr;
-			}
-			man-puts [join $nmore {, }];
-		    }
-		    return;
-		}
-		KEYWORDS {
-		    while {[more-text]} {
-			if {[next-op-is .SH rest]} {
-			    backup-text 1;
-			    return;
-			}
-			set more [next-text];
-			if {[is-a-directive $more]} {
-			    manerror "$more";
-			    backup-text 1;
-			    return;
-			}
-			set keys {}
-			foreach key [split $more ,] {
-			    set key [string trim $key]
-			    lappend manual(keyword-$key) [list $manual(name) $manual(wing-file)/$manual(name).htm];
-			    set initial [string toupper [string index $key 0]]
-			    lappend keys "<A href=\"../Keywords/$initial.htm\#$key\">$key</A>"
-			}
-			man-puts [join $keys {, }]
-		    }
-		    return;
-		}
-	    }
-	    if {[next-op-is .IP rest]} {
-		output-IP-list .SH .IP $rest;
-		return;
-	    }
-	    if {[next-op-is .PP rest]} {
-		return;
-	    }
-	    return;
-	}
-	.SO {
-	    if {[match-text @stuff .SE]} {
-		output-directive {.SH STANDARD OPTIONS};
-		set opts {};
-		foreach line [split $stuff \n] {
-		    foreach option [split $line \t] {
-			lappend opts $option;
-		    }
-		}
-		man-puts <DL>;
-		lappend manual(section-toc) <DL>;
-		foreach option [lsort $opts] {
-		    man-puts "<DT><B>[std-option-toc $option]</B>";
-		}
-		man-puts </DL>;
-		lappend manual(section-toc) </DL>;
-	    } else {
-		manerror "unexpected .SO format:\n[expand-next-text 2]";
-	    }
-	}
-	.OP {
-	    output-widget-options $rest;
-	    return;
-	}
-	.IP {
-	    output-IP-list .IP .IP $rest;
-	    return;
-	}
-	.PP {
-	    man-puts <P>;
-	}
-	.RS {
-	    output-RS-list;
-	    return;
-	}
-	.RE {
-	    manerror "unexpected .RE";
-	    return;
-	}
-	.br {
-	    man-puts <BR>;
-	    return;
-	}
-	.DE {
-	    manerror "unexpected .DE";
-	    return;
-	}
-	.DS {
-	    if {[next-op-is .ta rest]} {
-		;
-	    }
-	    if {[match-text @stuff .DE]} {
-		man-puts <PRE>$stuff</PRE>;
-	    } elseif {[match-text .fi @ul1 @ul2 .nf @stuff .DE]} {
-		man-puts "<PRE>[lindex $ul1 1][lindex $ul2 1]\n$stuff</PRE>";
-	    } else {
-		manerror "unexpected .DS format:\n[expand-next-text 2]";
-	    }
-	    return;
-	}
-	.CS {
-	    if {[next-op-is .ta rest]} {
-		;
-	    }
-	    if {[match-text @stuff .CE]} {
-		man-puts <PRE>$stuff</PRE>;
-	    } else {
-		manerror "unexpected .CS format:\n[expand-next-text 2]";
-	    }
-	    return;
-	}
-	.CE {
-	    manerror "unexpected .CE";
-	    return;
-	}
-	.sp {
-	    man-puts <P>;
-	}
-	.ta {
-	    # these are tab stop settings for short tables
-	    switch -exact $manual(name):$manual(section) {
-		{bind:MODIFIERS} -
-		{bind:EVENT TYPES} -
-		{bind:BINDING SCRIPTS AND SUBSTITUTIONS} -
-		{expr:OPERANDS} -
-		{expr:MATH FUNCTIONS} -
-		{history:DESCRIPTION} -
-		{history:HISTORY REVISION} -
-		{switch:DESCRIPTION} -
-		{upvar:DESCRIPTION} {
-		    return;			# fix.me
-		}
-		default {
-		    manerror "ignoring $line";
-		}
-	    }
-	}
-	.nf {
-	    if {[match-text @more .fi]} {
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-	    } elseif {[match-text .RS @more .RE .fi]} {
-		man-puts <DL><DD>;
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-		man-puts </DL>;
-	    } elseif {[match-text .RS @more .RS @more2 .RE .RE .fi]} {
-		man-puts <DL><DD>;
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-		man-puts <DL><DD>;
-		foreach more2 [split $more2 \n] {
-		    man-puts $more2<BR>;
-		}
-		man-puts </DL></DL>;
-	    } elseif {[match-text .RS @more .RS @more2 .RE @more3 .RE .fi]} {
-		man-puts <DL><DD>;
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-		man-puts <DL><DD>;
-		foreach more2 [split $more2 \n] {
-		    man-puts $more2<BR>;
-		}
-		man-puts </DL><DD>;
-		foreach more3 [split $more3 \n] {
-		    man-puts $more3<BR>;
-		}
-		man-puts </DL>;
-	    } elseif {[match-text .sp .RS @more .RS @more2 .sp .RE .RE .fi]} {
-		man-puts <P><DL><DD>;
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-		man-puts <DL><DD>;
-		foreach more2 [split $more2 \n] {
-		    man-puts $more2<BR>;
-		}
-		man-puts </DL></DL><P>;
-	    } elseif {[match-text .RS .sp @more .sp .RE .fi]} {
-		man-puts <P><DL><DD>;
-		foreach more [split $more \n] {
-		    man-puts $more<BR>;
-		}
-		man-puts </DL><P>;
-	    } else {
-		manerror "ignoring $line";
-	    }
-	}
-	.fi {
-	    manerror "ignoring $line";
-	}
-	.na -
-	.ad -
-	.UL -
-	.ne {
-	    manerror "ignoring $line";
-	}
-	default {
-	    manerror "unrecognized format directive: $line";
-	}
-    }
-}
-##
-## merge copyright listings
-## 
-proc merge-copyrights {l1 l2} {
-    foreach copyright [concat $l1 $l2] {
-	if {[regexp {^Copyright +\(c\) +([0-9]+) +(by +)?([A-Za-z].*)$} $copyright all date by who]} {
-	    lappend dates($who) $date;
-	    continue;
-	}
-	if {[regexp {^Copyright +\(c\) +([0-9]+)-([0-9]+) +(by +)?([A-Za-z].*)$} $copyright all from to by who]} {
-	    for {set date $from} {$date <= $to} {incr date} {
-		lappend dates($who) $date;
-	    }
-	    continue;
-	}
-	if {[regexp {^Copyright +\(c\) +([0-9]+), *([0-9]+) +(by +)?([A-Za-z].*)$} $copyright all date1 date2 by who]} {
-	    lappend dates($who) $date1 $date2;
-	    continue;
-	}
-	puts "oops: $copyright";
-    }
-    foreach who [array names dates] {
-	set list [lsort $dates($who)];
-	if {[llength $list] == 1 || [lindex $list 0] == [lrange $list end end]} {
-	    lappend merge "Copyright (c) [lindex $list 0] $who";
-	} else {
-	    lappend merge "Copyright (c) [lindex $list 0]-[lrange $list end end] $who";
-	}
-    }
-    return [lsort $merge];
-}
-    
-proc makedirhier {dir} {
-    if { ! [file isdirectory $dir]} {
-	makedirhier [file dirname $dir];
-	if { ! [file isdirectory $dir]} {
-	    if {[catch {exec mkdir $dir} error]} {
-		error "cannot create directory $dir: $error";
-	    }
-	}
-    }
-}
-    
-##
-## foreach of the man directories specified by args
-## convert manpages into hypertext in the directory
-## specified by html.
-##
-proc make-man-pages {html args} {
-    global env manual overall_title;
-    makedirhier $html;
-    if { ! [file isdirectory $html]} {
-	exec mkdir $html;
-    }
-    set manual(short-toc-n) 1;
-    set manual(short-toc-fp) [open $html/contents.htm w];
-    puts $manual(short-toc-fp) "<HTML><HEAD><TITLE>$overall_title</TITLE></HEAD>"
-    puts $manual(short-toc-fp) "<BODY><HR><H3>$overall_title</H3><HR><DL>";
-    set manual(merge-copyrights) {}
-    foreach arg $args {
-	set manual(wing-glob) [lindex $arg 0];
-	set manual(wing-name) [lindex $arg 1];
-	set manual(wing-file) [lindex $arg 2];
-	set manual(wing-description) [lindex $arg 3];
-	set manual(wing-copyrights) {};
-	makedirhier $html/$manual(wing-file);
-	set manual(wing-toc-fp) [open $html/$manual(wing-file)/contents.htm w];
-	# whistle
-	puts stderr "scanning section $manual(wing-name)";
-	# put the entry for this section into the short table of contents
-	puts $manual(short-toc-fp) "<DT><A HREF=\"$manual(wing-file)/contents.htm\">$manual(wing-name)</A><DD>$manual(wing-description)";
-	# initialize the wing table of contents
-	puts $manual(wing-toc-fp) "<HTML><HEAD><TITLE>$manual(wing-name) Manual</TITLE></HEAD>"
-	puts $manual(wing-toc-fp) "<BODY><HR><H3>$manual(wing-name)</H3><HR>";
-	# initialize the short table of contents for this section
-	set manual(wing-toc) {};
-	# initialize the man directory for this section
-	makedirhier $html/$manual(wing-file);
-	# initialize the long table of contents for this section
-	set manual(long-toc-n) 1;
-	# get the manual pages for this section
-	set manual(pages) [lsort [glob $manual(wing-glob)]];
-	if {[lsearch -glob $manual(pages) */options.n] >= 0} {
-	    set n [lsearch $manual(pages) */options.n];
-	    set manual(pages) "[lindex $manual(pages) $n] [lreplace $manual(pages) $n $n]";
-	}
-	# set manual(pages) [lrange $manual(pages) 0 5];
-	foreach manual(page) $manual(pages) {
-	    # whistle
-	    puts stderr "scanning page $manual(page)";
-	    set manual(tail) [file tail $manual(page)];
-	    set manual(name) [file root $manual(tail)];
-	    set manual(section) {};
-	    if {[lsearch {case pack-old menubar} $manual(name)] >= 0} {
-		# obsolete
-		manerror "discarding $manual(name)";
-		continue;
-	    }
-	    set manual(infp) [open "$manual(page)"];
-	    set manual(text) {};
-	    set manual(partial-text) {};
-	    foreach p {.RS .DS .CS .SO} {
-		set manual($p) 0;
-	    }
-	    set manual(stack) {};
-	    set manual(section) {};
-	    set manual(section-toc) {};
-	    set manual(section-toc-n) 1;
-	    set manual(copyrights) {};
-	    lappend manual(all-pages) $manual(wing-file)/$manual(tail);
-	    manreport 100 "$manual(name)";
-	    while {[gets $manual(infp) line] >= 0} {
-		manreport 100 $line;
-		if {[regexp {^[`'][/\\]} $line]} {
-		    if {[regexp {Copyright \(c\).*$} $line copyright]} {
-			lappend manual(copyrights) $copyright;
-		    }
-		    # comment
-		    continue;
-		}
-		if {"$line" == {'}} {
-		    # comment
-		    continue;
-		}
-		if {[parse-directive $line code rest]} {
-		    switch -exact $code {
-			.ad -
-			.na -
-			.so -
-			.ne -
-			.AS -
-			.VE -
-			.VS -
-			. {
-			    # ignore
-			    continue;
-			}
-		    }
-		    if {"$manual(partial-text)" != {}} {
-			lappend manual(text) [process-text $manual(partial-text)];
-			set manual(partial-text) {};
-		    }
-		    switch -exact $code {
-			.SH {
-			    if {[llength $rest] == 0} {
-				gets $manual(infp) rest;
-			    }
-			    lappend manual(text) ".SH [unquote $rest]";
-			}
-			.TH {
-			    lappend manual(text) "$code [unquote $rest]";
-			}
-			.HS -
-			.UL -
-			.ta {
-			    lappend manual(text) "$code [unquote $rest]";
-			}
-			.BS -
-			.BE -
-			.br -
-			.fi -
-			.sp -
-			.nf {
-			    if {"$rest" != {}} {
-				manerror "unexpected argument: $line";
-			    }
-			    lappend manual(text) $code;
-			}
-			.AP {
-			    lappend manual(text) [concat .IP [process-text "[lindex $rest 0] \\fB[lindex $rest 1]\\fR ([lindex $rest 2])"]];
-			}
-			.IP {
-			    regexp {^(.*) +[0-9]+$} $rest all rest
-			    lappend manual(text) ".IP [process-text [unquote [string trim $rest]]]";
-			}
-			.TP {
-			    set next [gets $manual(infp)];
-			    if {"$next" != {'}} {
-				lappend manual(text) ".IP [process-text $next]";
-			    }
-			}
-			.OP {
-			    lappend manual(text) [concat .OP [process-text \
-								  "\\fB[lindex $rest 0]\\fR \\fB[lindex $rest 1]\\fR \\fB[lindex $rest 2]\\fR"]];
-			}
-			.PP -
-			.LP {
-			    lappend manual(text) {.PP};
-			}
-			.RS {
-			    incr manual(.RS);
-			    lappend manual(text) $code;
-			}
-			.RE {
-			    incr manual(.RS) -1;
-			    lappend manual(text) $code;
-			}
-			.SO {
-			    incr manual(.SO);
-			    lappend manual(text) $code;
-			}
-			.SE {
-			    incr manual(.SO) -1;
-			    lappend manual(text) $code;
-			}
-			.DS {
-			    incr manual(.DS);
-			    lappend manual(text) $code;
-			}
-			.DE {
-			    incr manual(.DS) -1;
-			    lappend manual(text) $code;
-			}
-			.CS {
-			    incr manual(.CS);
-			    lappend manual(text) $code;
-			}
-			.CE {
-			    incr manual(.CS) -1;
-			    lappend manual(text) $code;
-			}
-			.de {
-			    while {[gets $manual(infp) line] >= 0} {
-				if {[regexp {^\.\.} $line]} {
-				    break;
-				}
-			    }
-			}
-			.. {
-			    error "found .. outside of .de";
-			}
-			default {
-			    manerror "unrecognized format directive: $line";
-			}
-		    }
-		} else {
-		    if {"$manual(partial-text)" == {}} {
-			set manual(partial-text) $line;
-		    } else {
-			append manual(partial-text) \n$line;
-		    }
-		}
-	    }
-	    if {"$manual(partial-text)" != {}} {
-		lappend manual(text) [process-text $manual(partial-text)];
-	    }
-	    close $manual(infp);
-	    # fixups
-	    if {$manual(.RS) != 0} {
-		if {"$manual(name)" != {selection}} {
-		    puts "unbalanced .RS .RE";
-		}
-	    }
-	    if {$manual(.DS) != 0} {
-		puts "unbalanced .DS .DE";
-	    }
-	    if {$manual(.CS) != 0} {
-		puts "unbalanced .CS .CE";
-	    }
-	    if {$manual(.SO) != 0} {
-		puts "unbalanced .SO .SE";
-	    }
-	    # output conversion
-	    open-text;
-	    if {[next-op-is .HS rest]} {
-		set manual($manual(name)-title) "[lrange $rest 1 end] [lindex $rest 0] manual page";
-		while {[more-text]} {
-		    set line [next-text];
-		    if {[is-a-directive $line]} {
-			output-directive $line;
-		    } else {
-			man-puts $line;
-		    }
-		}
-		man-puts <HR><PRE>;
-		foreach copyright $manual(copyrights) {
-		    man-puts "<A HREF=\"../copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-		}
-		man-puts "<A HREF=\"../copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.</PRE>";
-		set manual(wing-copyrights) [merge-copyrights $manual(wing-copyrights) $manual(copyrights)];
-	    } elseif {[next-op-is .TH rest]} {
-		set manual($manual(name)-title) "[lrange $rest 4 end] - [lindex $rest 0] manual page";
-		while {[more-text]} {
-		    set line [next-text];
-		    if {[is-a-directive $line]} {
-			output-directive $line;
-		    } else {
-			man-puts $line;
-		    }
-		}
-		man-puts <HR><PRE>;
-		foreach copyright $manual(copyrights) {
-		    man-puts "<A HREF=\"../copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-		}
-		man-puts "<A HREF=\"../copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.</PRE>";
-		set manual(wing-copyrights) [merge-copyrights $manual(wing-copyrights) $manual(copyrights)];
-	    } else {
-		manerror "no .HS or .TH record found";
-	    }
-	    #
-	    # make the long table of contents for this page
-	    #
-	    set manual(toc-$manual(wing-file)-$manual(name)) [concat <DL> $manual(section-toc) </DL><HR>];
-	}
-
-	#
-	# make the wing table of contents for the section
-	#
-	set width 0;
-	foreach name $manual(wing-toc) {
-	    if {[string length $name] > $width} {
-		set width [string length $name];
-	    }
-	}
-	set perline [expr 120 / $width];
-	set nrows [expr ([llength $manual(wing-toc)]+$perline)/$perline]
-	set n 0;
-        catch {unset rows}
-	foreach name [lsort $manual(wing-toc)] {
-	    set tail $manual(name-$name);
-	    if {[llength $tail] > 1} {
-		manerror "$name is defined in more than one file: $tail";
-		set tail [lindex $tail [expr [llength $tail]-1]];
-	    }
-	    set tail [file tail $tail];
-	    append rows([expr $n%$nrows]) "<td> <a href=\"$tail.htm\">$name</a>"
-	    incr n;
-	}
-	puts $manual(wing-toc-fp) <table>;
-        foreach row [lsort -integer [array names rows]] {
-	    puts $manual(wing-toc-fp) <tr>$rows($row)</tr>
-	}
-	puts $manual(wing-toc-fp) </table>;
-
-	#
-	# insert wing copyrights
-	#
-	puts $manual(wing-toc-fp) "<HR><PRE>"
-	foreach copyright $manual(wing-copyrights) {
-	    puts $manual(wing-toc-fp) "<A HREF=\"../copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-	}
-	puts $manual(wing-toc-fp) "<A HREF=\"../copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.";
-	puts $manual(wing-toc-fp) "</PRE></BODY></HTML>";
-	close $manual(wing-toc-fp);
-	set manual(merge-copyrights) [merge-copyrights $manual(merge-copyrights) $manual(wing-copyrights)];
-    }
-
-    ##
-    ## build the keyword index.
-    ##
-    proc strcasecmp {a b} { return [string compare [string tolower $a] [string tolower $b]]; }
-    set keys [lsort -command strcasecmp [array names manual keyword-*]];
-    makedirhier $html/Keywords
-    catch {eval exec rm -f [glob $html/Keywords/*]}
-    puts $manual(short-toc-fp) {<DT><A HREF="Keywords/contents.htm">Keywords</A><DD>The keywords from the Tcl/Tk man pages.};
-    set keyfp [open $html/Keywords/contents.htm w];
-    puts $keyfp "<HTML><HEAD><TITLE>Tcl/Tk Keywords</TITLE></HEAD>"
-    puts $keyfp "<BODY><HR><H3>Tcl/Tk Keywords</H3><HR><H2>"
-    foreach a {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} {
-	puts $keyfp "<A HREF=\"$a.htm\">$a</A>"
-	set afp [open $html/Keywords/$a.htm w];
-	puts $afp "<HTML><HEAD><TITLE>Tcl/Tk Keywords - $a</TITLE></HEAD>"
-	puts $afp "<BODY><HR><H3>Tcl/Tk Keywords - $a</H3><HR><H2>"
-	foreach b {A B C D E F G H I J K L M N O P Q R S T U V W X Y Z} {
-	    puts $afp "<A HREF=\"$b.htm\">$b</A>"
-	}
-	puts $afp "</H2><HR><DL>"
-	foreach k $keys {
-	    if {[regexp -nocase -- "^keyword-$a" $k]} {
-		set k [string range $k 8 end]
-		puts $afp "<DT><A NAME=\"$k\">$k</A><DD>"
-		set refs {}
-		foreach man $manual(keyword-$k) {
-		    set name [lindex $man 0];
-		    set file [lindex $man 1]
-		    lappend refs "<A HREF=\"../$file\">$name</A>";
-		}
-		puts $afp [join $refs {, }];
-	    }
-	}
-	puts $afp "</DL><HR><PRE>"
-	# insert merged copyrights
-	foreach copyright $manual(merge-copyrights) {
-	    puts $afp "<A HREF=\"copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-	}
-	puts $afp "<A HREF=\"copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.";
-	puts $afp "</PRE></BODY></HTML>"
-	close $afp
-    }
-    puts $keyfp "</H2><HR><PRE>"
-
-    # insert merged copyrights
-    foreach copyright $manual(merge-copyrights) {
-	puts $keyfp "<A HREF=\"copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-    }
-    puts $keyfp "<A HREF=\"copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.";
-    puts $keyfp </PRE><HR></BODY></HTML>
-    close $keyfp;
-
-    ##
-    ## finish off short table of contents
-    ##
-    puts $manual(short-toc-fp) {<DT><A HREF="http://www.elf.org">Source</A><DD>More information about these man pages.}
-    puts $manual(short-toc-fp) "</DL><HR><PRE>";
-    # insert merged copyrights
-    foreach copyright $manual(merge-copyrights) {
-	puts $manual(short-toc-fp) "<A HREF=\"copyright.htm\">Copyright</A> &#169; [lrange $copyright 2 end]";
-    }
-    puts $manual(short-toc-fp) "<A HREF=\"copyright.htm\">Copyright</A> &#169; 1995-1997 Roger E. Critchlow Jr.";
-    puts $manual(short-toc-fp) "</PRE></BODY></HTML>";
-    close $manual(short-toc-fp);
-
-    ##
-    ## output man pages
-    ##
-    unset manual(section);
-    foreach path $manual(all-pages) {
-	set manual(wing-file) [file dirname $path];
-	set manual(tail) [file tail $path];
-	set manual(name) [file root $manual(tail)];
-	set text $manual(output-$manual(wing-file)-$manual(name));
-	set ntext 0;
-	foreach item $text {
-	    incr ntext [llength [split $item \n]];
-	    incr ntext;
-	}
-	set toc $manual(toc-$manual(wing-file)-$manual(name));
-	set ntoc 0;
-	foreach item $toc {
-	    incr ntoc [llength [split $item \n]];
-	    incr ntoc;
-	}
-	puts stderr "rescanning page $manual(name) $ntoc/$ntext";
-	set manual(outfp) [open $html/$manual(wing-file)/$manual(name).htm w];
-	puts $manual(outfp) "<HTML><HEAD><TITLE>$manual($manual(name)-title)</TITLE></HEAD><BODY>"
-	if {$ntext > 60 && $ntoc > 32
-	    || [lsearch {Hash LinkVar SetVar TraceVar
-		ConfigWidg CrtImgType CrtItemType CrtPhImgFmt DoOneEvent GetBitmap GetColor GetCursor GetJustify GetPixels GetVisual
-		ParseArgv QueueEvent} $manual(tail)] >= 0} {
-	    foreach item $toc {
-		puts $manual(outfp) $item;
-	    }
-	}
-	foreach item $text {
-	    puts $manual(outfp) [insert-cross-references $item];
-	}
-	puts $manual(outfp) </BODY></HTML>;
-	close $manual(outfp);
-    }
-    return {};
-}
-
-set usercmddesc {The interpreters which implement Tcl and Tk.}
-set tclcmddesc {The commands which the <B>tclsh</B> interpreter implements.}
-set tkcmddesc {The additional commands which the <B>wish</B> interpreter implements.}
-set tcllibdesc {The C functions which a Tcl extended C program may use.}
-set tklibdesc {The additional C functions which a Tk extended C program may use.}
-		
-parse_command_line
-
-if {1} {
-    if {[catch {
-	make-man-pages $webdir \
-	    "$tcltkdir/{$tkdir,$tcldir}/doc/*.1 {Tcl/Tk Applications} UserCmd {$usercmddesc}" \
-	    "$tcltkdir/$tcldir/doc/*.n {Tcl Commands} TclCmd {$tclcmddesc}" \
-	    "$tcltkdir/$tkdir/doc/*.n {Tk Commands} TkCmd {$tkcmddesc}" \
-	    "$tcltkdir/$tcldir/doc/*.3 {Tcl Library} TclLib {$tcllibdesc}" \
-	    "$tcltkdir/$tkdir/doc/*.3 {Tk Library} TkLib {$tklibdesc}"
-    } error]} {
-	puts $error\n$errorInfo;
-    }
-}
-
diff --git a/tools/tclSplash.bmp b/tools/tclSplash.bmp
deleted file mode 100644
index 2636c41..0000000
--- a/tools/tclSplash.bmp
+++ /dev/null
diff --git a/tools/tclmin.wse b/tools/tclmin.wse
deleted file mode 100644
index 9b90eab..0000000
--- a/tools/tclmin.wse
+++ /dev/null
@@ -1,247 +0,0 @@
-Document Type: WSE

-item: Global

-  Version=5.0

-  Flags=00000100

-  Split=1420

-  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

-  Japanese Font Name=MS Gothic

-  Japanese Font Size=10

-  Start Gradient=0 0 255

-  End Gradient=0 0 0

-  Windows Flags=00000000000000010010110000001000

-  Message Font=MS Sans Serif

-  Font Size=8

-  Disk Filename=SETUP

-  Patch Flags=0000000000000001

-  Patch Threshold=85

-  Patch Memory=4000

-end

-item: Remark

-  Text=-------

-end

-item: Remark

-  Text=Tcl 8.0 Minimal Installation

-end

-item: Remark

-  Text=-------

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\opt0.4\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\opt0.4\optparse.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\optparse.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\http2.0\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http2.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\http2.0\http.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http2.0\http.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\safe.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\safe.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\history.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\history.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\msgbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\msgbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\optMenu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\optMenu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\clrpick.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\clrpick.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\entry.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\entry.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\comdlg.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\comdlg.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\bgerror.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\bgerror.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\obsolete.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\obsolete.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\button.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\button.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\xmfbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\xmfbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\console.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\console.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\listbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\listbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\menu.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\menu.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\dialog.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\dialog.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\focus.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\focus.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\palette.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\palette.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\tkfbox.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tkfbox.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\tk.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tk.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\text.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\text.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\tearoff.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\tearoff.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\tclIndex

-  Destination=%MAINDIR%\lib\tk%VER%\tclIndex

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\scrlbar.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\scrlbar.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\scale.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\scale.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\library\safetk.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\safetk.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\http1.0\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\http1.0\http.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\http1.0\http.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\pkgIndex.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\tclreg80.dll

-  Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\tclreg80.dll

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\Tcl1680.dll

-  Destination=%SYS32%\Tcl1680.dll

-  Flags=0000001000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\tcl80.dll

-  Destination=%SYS32%\tcl80.dll

-  Flags=0000001000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\tclpip80.dll

-  Destination=%SYS32%\tclpip80.dll

-  Flags=0000001000000010

-end

-item: Install File

-  Source=n:\dist\Bc45\Bin\cw3215.dll

-  Destination=%SYS32%\cw3215.dll

-  Flags=0000001000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\win\tk80.dll

-  Destination=%SYS32%\tk80.dll

-  Flags=0000001000000010

-end

-item: Install File

-  Source=n:\dist\tk8.0\win\wish80.exe

-  Destination=%MAINDIR%\bin\wish80.exe

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\win\tclsh80.exe

-  Destination=%MAINDIR%\bin\tclsh80.exe

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\tclIndex

-  Destination=%MAINDIR%\lib\tcl%VER%\tclIndex

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\init.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\init.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\parray.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\parray.tcl

-  Flags=0000000000000010

-end

-item: Install File

-  Source=n:\dist\tcl8.0\library\word.tcl

-  Destination=%MAINDIR%\lib\tcl%VER%\word.tcl

-  Flags=0000000000000010

-end

diff --git a/tools/uniParse.tcl b/tools/uniParse.tcl
deleted file mode 100644
index f92275f..0000000
--- a/tools/uniParse.tcl
+++ /dev/null
@@ -1,369 +0,0 @@
-namespace eval uni {
-    set shift 9			;# number of bits of data within a page
-    variable pMap		;# map from page to page index, each entry is
-				 # an index into the pages table, indexed by
-				 # page number
-    variable pages		;# map from page index to page info, each
-				 # entry is a list of indices into the groups
-				 # table, the list is indexed by the offset
-    variable groups		;# list of character info values, indexed by
-				 # group number, initialized with the
-				 # unassigned character group
-
-    variable categories {
-	Cn Lu Ll Lt Lm Lo Mn Me Mc Nd Nl No Zs Zl Zp
-	Cc Cf Co Cs Pc Pd Ps Pe Pi Pf Po Sm Sc Sk So
-    }				;# Ordered list of character categories, must
-				 # match the enumeration in the header file.
-
-    variable titleCount 0	;# Count of the number of title case
-				 # characters.  This value is used in the
-				 # regular expression code to allocate enough
-				 # space for the title case variants.
-}
-
-proc uni::getValue {items index} {
-    variable categories
-    variable titleCount
-
-    # Extract character info
-
-    set category [lindex $items 2]
-    if {[scan [lindex $items 12] %4x toupper] == 1} {
-	set toupper [expr {$index - $toupper}]
-    } else {
-	set toupper {}
-    }
-    if {[scan [lindex $items 13] %4x tolower] == 1} {
-	set tolower [expr {$tolower - $index}]
-    } else {
-	set tolower {}
-    }
-    if {[scan [lindex $items 14] %4x totitle] == 1} {
-	set totitle [expr {$index - $totitle}]
-    } else {
-	set totitle {}
-    }
-
-    set categoryIndex [lsearch -exact $categories $category]
-    if {$categoryIndex < 0} {
-	puts "Unexpected character category: $index($category)"
-	set categoryIndex 0
-    } elseif {$category == "Lt"} {
-	incr titleCount
-    }
-
-    return "$categoryIndex,$toupper,$tolower,$totitle"
-}
-
-proc uni::getGroup {value} {
-    variable groups
-
-    set gIndex [lsearch -exact $groups $value]
-    if {$gIndex == -1} {
-	set gIndex [llength $groups]
-	lappend groups $value
-    }
-    return $gIndex
-}
-
-proc uni::addPage {info} {
-    variable pMap
-    variable pages
-    
-    set pIndex [lsearch -exact $pages $info]
-    if {$pIndex == -1} {
-	set pIndex [llength $pages]
-	lappend pages $info
-    }
-    lappend pMap $pIndex
-    return
-}
-    
-proc uni::buildTables {data} {
-    variable shift
-
-    variable pMap {}
-    variable pages {}
-    variable groups {{0,,,}}
-    set info {}			;# temporary page info
-    
-    set mask [expr {(1 << $shift) - 1}]
-
-    set next 0
-
-    foreach line [split $data \n] {
-	if {$line == ""} {
-	    set line "FFFF;;Cn;0;ON;;;;;N;;;;;\n"
-	}
-
-	set items [split $line \;]
-
-	scan [lindex $items 0] %4x index
-	set index [format 0x%0.4x $index]
-	
-	set gIndex [getGroup [getValue $items $index]]
-
-	# Since the input table omits unassigned characters, these will
-	# show up as gaps in the index sequence.  There are a few special cases
-	# where the gaps correspond to a uniform block of assigned characters.
-	# These are indicated as such in the character name.
-
-	# Enter all unassigned characters up to the current character.
-	if {($index > $next) \
-		&& ![regexp "Last>$" [lindex $items 1]]} {
-	    for {} {$next < $index} {incr next} {
-		lappend info 0
-		if {($next & $mask) == $mask} {
-		    addPage $info
-		    set info {}
-		}
-	    }
-	}
-
-	# Enter all assigned characters up to the current character
-	for {set i $next} {$i <= $index} {incr i} {
-	    # Split character index into offset and page number
-	    set offset [expr {$i & $mask}]
-	    set page [expr {($i >> $shift)}]
-
-	    # Add the group index to the info for the current page
-	    lappend info $gIndex
-
-	    # If this is the last entry in the page, add the page
-	    if {$offset == $mask} {
-		addPage $info
-		set info {}
-	    }
-	}
-	set next [expr {$index + 1}]
-    }
-    return
-}
-
-proc uni::main {} {
-    global argc argv0 argv
-    variable pMap
-    variable pages
-    variable groups
-    variable shift
-    variable titleCount
-
-    if {$argc != 2 && $argc != 3} {
-	puts stderr "\nusage: $argv0 <datafile> <outdir> ?optimize?\n"
-	exit 1
-    }
-    set f [open [lindex $argv 0] r]
-    set data [read $f]
-    close $f
-
-    set shift 6
-    buildTables $data
-    puts "X = [llength $pMap]  Y= [llength $pages]  A= [llength $groups]"
-    set size [expr {[llength $pMap] + [llength $pages]*(1<<$shift)}]
-    puts "shift = 6, space = $size"
-    puts "title case count = $titleCount"
-
-    set f [open [file join [lindex $argv 1] tclUniData.c] w]
-    puts $f "/*
- * tclUtfData.c --
- *
- *	Declarations of Unicode character information tables.  This file is
- *	automatically generated by the tools/uniParse.tcl script.  Do not
- *	modify this file by hand.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- * All rights reserved.
- *
- * RCS: @(#) \$Id\$
- */
-
-/*
- * A 16-bit Unicode character is split into two parts in order to index
- * into the following tables.  The lower OFFSET_BITS comprise an offset
- * into a page of characters.  The upper bits comprise the page number.
- */
-
-#define OFFSET_BITS $shift
-
-/*
- * The pageMap is indexed by page number and returns an alternate page number
- * that identifies a unique page of characters.  Many Unicode characters map
- * to the same alternate page number.
- */
-
-static char pageMap\[\] = {"
-    set line "    "
-    set last [expr {[llength $pMap] - 1}]
-    for {set i 0} {$i <= $last} {incr i} {
-	append line [lindex $pMap $i]
-	if {$i != $last} {
-	    append line ", "
-	}
-	if {[string length $line] > 70} {
-	    puts $f $line
-	    set line "    "
-	}
-    }
-    puts $f $line
-    puts $f "};
-
-/*
- * The groupMap is indexed by combining the alternate page number with
- * the page offset and returns a group number that identifies a unique
- * set of character attributes.
- */
-
-static char groupMap\[\] = {"
-    set line "    "
-    set lasti [expr {[llength $pages] - 1}]
-    for {set i 0} {$i <= $lasti} {incr i} {
-	set page [lindex $pages $i]
-	set lastj [expr {[llength $page] - 1}]
-	for {set j 0} {$j <= $lastj} {incr j} {
-	    append line [lindex $page $j]
-	    if {$j != $lastj || $i != $lasti} {
-		append line ", "
-	    }
-	    if {[string length $line] > 70} {
-		puts $f $line
-		set line "    "
-	    }
-	}
-    }
-    puts $f $line
-    puts $f "};
-
-/*
- * Each group represents a unique set of character attributes.  The attributes
- * are encoded into a 32-bit value as follows:
- *
- * Bits 0-4	Character category: see the constants listed below.
- *
- * Bits 5-7	Case delta type: 000 = identity
- *				 010 = add delta for lower
- *				 011 = add delta for lower, add 1 for title
- *				 100 = sutract delta for title/upper
- *				 101 = sub delta for upper, sub 1 for title
- *				 110 = sub delta for upper, add delta for lower
- *
- * Bits 8-21	Reserved for future use.
- *
- * Bits 22-31	Case delta: delta for case conversions.  This should be the
- *			    highest field so we can easily sign extend.
- */
-
-static int groups\[\] = {"
-    set line "    "
-    set last [expr {[llength $groups] - 1}]
-    for {set i 0} {$i <= $last} {incr i} {
-	foreach {type toupper tolower totitle} [split [lindex $groups $i] ,] {}
-	
-	# Compute the case conversion type and delta
-
-	if {$totitle != ""} {
-	    if {$totitle == $toupper} {
-		# subtract delta for title or upper
-		set case 4
-		set delta $toupper
-	    } elseif {$toupper != ""} {
-		# subtract delta for upper, subtract 1 for title
-		set case 5
-		set delta $toupper
-	    } else {
-		# add delta for lower, add 1 for title
-		set case 3
-		set delta $tolower
-	    }
-	} elseif {$toupper != ""} {
-	    # subtract delta for upper, add delta for lower
-	    set case 6
-	    set delta $toupper
-	} elseif {$tolower != ""} {
-	    # add delta for lower
-	    set case 2
-	    set delta $tolower
-	} else {
-	    # noop
-	    set case 0
-	    set delta 0
-	}
-
-	set val [expr {($delta << 22) | ($case << 5) | $type}]
-
-	append line [format "%d" $val]
-	if {$i != $last} {
-	    append line ", "
-	}
-	if {[string length $line] > 65} {
-	    puts $f $line
-	    set line "    "
-	}
-    }
-    puts $f $line
-    puts $f "};
-
-/*
- * The following constants are used to determine the category of a
- * Unicode character.
- */
-
-#define UNICODE_CATEGORY_MASK 0X1F
-
-enum {
-    UNASSIGNED,
-    UPPERCASE_LETTER,
-    LOWERCASE_LETTER,
-    TITLECASE_LETTER,
-    MODIFIER_LETTER,
-    OTHER_LETTER,
-    NON_SPACING_MARK,
-    ENCLOSING_MARK,
-    COMBINING_SPACING_MARK,
-    DECIMAL_DIGIT_NUMBER,
-    LETTER_NUMBER,
-    OTHER_NUMBER,
-    SPACE_SEPARATOR,
-    LINE_SEPARATOR,
-    PARAGRAPH_SEPARATOR,
-    CONTROL,
-    FORMAT,
-    PRIVATE_USE,
-    SURROGATE,
-    CONNECTOR_PUNCTUATION,
-    DASH_PUNCTUATION,
-    OPEN_PUNCTUATION,
-    CLOSE_PUNCTUATION,
-    INITIAL_QUOTE_PUNCTUATION,
-    FINAL_QUOTE_PUNCTUATION,
-    OTHER_PUNCTUATION,
-    MATH_SYMBOL,
-    CURRENCY_SYMBOL,
-    MODIFIER_SYMBOL,
-    OTHER_SYMBOL
-};
-
-/*
- * The following macros extract the fields of the character info.  The
- * GetDelta() macro is complicated because we can't rely on the C compiler
- * to do sign extension on right shifts.
- */
-
-#define GetCaseType(info) (((info) & 0xE0) >> 5)
-#define GetCategory(info) ((info) & 0x1F)
-#define GetDelta(infO) (((info) > 0) ? ((info) >> 22) : (~(~((info)) >> 22)))
-
-/*
- * This macro extracts the information about a character from the
- * Unicode character tables.
- */
-
-#define GetUniCharInfo(ch) (groups\[groupMap\[(pageMap\[(((int)(ch)) & 0xffff) >> OFFSET_BITS\] << OFFSET_BITS) | ((ch) & ((1 << OFFSET_BITS)-1))\]\])
-"
-
-    close $f
-}
-
-uni::main
-
-return
diff --git a/tools/white.bmp b/tools/white.bmp
deleted file mode 100644
index 210bc52..0000000
--- a/tools/white.bmp
+++ /dev/null
diff --git a/unix/Makefile.in b/unix/Makefile.in
deleted file mode 100644
index be01ab2..0000000
--- a/unix/Makefile.in
+++ /dev/null
@@ -1,1249 +0,0 @@
-#
-# This file is a Makefile for Tcl.  If it has the name "Makefile.in"
-# then it is a template for a Makefile;  to generate the actual Makefile,
-# run "./configure", which is a configuration script generated by the
-# "autoconf" program (constructs like "@foo@" will get replaced in the
-# actual Makefile.
-#
-# RCS: @(#) $Id: Makefile.in,v 1.21 1999/04/16 00:48:03 stanton Exp $
-
-# Current Tcl version;  used in various names.
-
-VERSION = @TCL_VERSION@
-
-#----------------------------------------------------------------
-# Things you can change to personalize the Makefile for your own
-# site (you can make these changes in either Makefile.in or
-# Makefile, but changes to Makefile will get lost if you re-run
-# the configuration script).
-#----------------------------------------------------------------
-
-# Default top-level directories in which to install architecture-
-# specific files (exec_prefix) and machine-independent files such
-# as scripts (prefix).  The values specified here may be overridden
-# at configure-time with the --exec-prefix and --prefix options
-# to the "configure" script.
-
-prefix =	@prefix@
-exec_prefix =	@exec_prefix@
-
-# The following definition can be set to non-null for special systems
-# like AFS with replication.  It allows the pathnames used for installation
-# to be different than those used for actually reference files at
-# run-time.  INSTALL_ROOT is prepended to $prefix and $exec_prefix
-# when installing files.
-INSTALL_ROOT =
-
-# Directory from which applications will reference the library of Tcl
-# scripts (note: you can set the TCL_LIBRARY environment variable at
-# run-time to override this value):
-TCL_LIBRARY =	$(prefix)/lib/tcl$(VERSION)
-
-# Package search path.
-TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
-
-# Path name to use when installing library scripts:
-SCRIPT_INSTALL_DIR =	$(INSTALL_ROOT)$(TCL_LIBRARY)
-
-# Directory in which to install libtcl.so or libtcl.a:
-LIB_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/lib
-
-# Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR =	$(exec_prefix)/lib
-
-# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
-
-# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/include
-
-# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR =	$(INSTALL_ROOT)$(prefix)/man
-
-# Directory in which to install manual entry for tclsh:
-MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
-
-# Directory in which to install manual entries for Tcl's C library
-# procedures:
-MAN3_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man3
-
-# Directory in which to install manual entries for the built-in
-# Tcl commands:
-MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
-
-# Libraries built with optimization switches have this additional extension
-TCL_DBGX =		@TCL_DBGX@
-
-# warning flags
-CFLAGS_WARNING =	@CFLAGS_WARNING@
-
-# The default switches for optimization or debugging
-CFLAGS_DEBUG =		@CFLAGS_DEBUG@
-CFLAGS_OPTIMIZE =	@CFLAGS_OPTIMIZE@
-
-# To change the compiler switches, for example to change from optimization to
-# debugging symbols, change the following line:
-#CFLAGS = 		$(CFLAGS_DEBUG)
-#CFLAGS = 		$(CFLAGS_OPTIMIZE)
-#CFLAGS = 		$(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = 		@CFLAGS@
-
-
-# To disable ANSI-C procedure prototypes reverse the comment characters
-# on the following lines:
-PROTO_FLAGS =
-#PROTO_FLAGS = -DNO_PROTOTYPE
-
-# Mathematical functions like sin and atan2 are enabled for expressions
-# by default.  To disable them, reverse the comment characters on the
-# following pairs of lines:
-MATH_FLAGS =
-#MATH_FLAGS = -DTCL_NO_MATH
-MATH_LIBS = @MATH_LIBS@
-#MATH_LIBS =
-
-# If you use the setenv, putenv, or unsetenv procedures to modify
-# environment variables in your application and you'd like those
-# modifications to appear in the "env" Tcl variable, switch the
-# comments on the two lines below so that Tcl provides these
-# procedures instead of your standard C library.
-
-ENV_FLAGS =
-#ENV_FLAGS = -DTclSetEnv=setenv -DTcl_PutEnv=putenv -DTclUnsetEnv=unsetenv
-
-# To compile for non-UNIX systems (so that only the non-UNIX-specific
-# commands are available), reverse the comment characters on the
-# following pairs of lines.  In addition, you'll have to provide your
-# own replacement for the "panic" procedure (see panic.c for what
-# the current one does).
-GENERIC_FLAGS =
-#GENERIC_FLAGS = -DTCL_GENERIC_ONLY
-UNIX_OBJS = tclMtherr.o tclUnixChan.o tclUnixEvent.o tclUnixFCmd.o \
-	tclUnixFile.o tclUnixPipe.o tclUnixSock.o \
-	tclUnixTime.o tclUnixInit.o tclUnixThrd.o 
-#UNIX_OBJS =
-NOTIFY_OBJS = tclUnixNotfy.o
-#NOTIFY_OBJS =
-
-# To enable memory debugging reverse the comment characters on the following
-# lines.  Warning:  if you enable memory debugging, you must do it
-# *everywhere*, including all the code that calls Tcl, and you must use
-# ckalloc and ckfree everywhere instead of malloc and free.
-MEM_DEBUG_FLAGS =
-#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG
-
-# To enable support for stubs in Tcl.
-STUB_LIB_FILE = @STUB_LIB_FILE@
-
-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
-#TCL_STUB_LIB_FILE = libtclstub.a
-
-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@
-#TCL_STUB_LIB_FLAG = -ltclstub
-
-# To enable compilation debugging reverse the comment characters on
-# one of the following lines.
-COMPILE_DEBUG_FLAGS =
-#COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_STATS
-#COMPILE_DEBUG_FLAGS = -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-
-# To compile without backward compatibility and deprecated code
-# uncomment the following
-NO_DEPRECATED_FLAGS=
-#NO_DEPRECATED_FLAGS= -DTCL_NO_DEPRECATED
-
-# Some versions of make, like SGI's, use the following variable to
-# determine which shell to use for executing commands:
-SHELL =		/bin/sh
-
-# Tcl used to let the configure script choose which program to use
-# for installing, but there are just too many different versions of
-# "install" around;  better to use the install-sh script that comes
-# with the distribution, which is slower but guaranteed to work.
-
-INSTALL =		@srcdir@/install-sh -c
-INSTALL_PROGRAM =	${INSTALL}
-INSTALL_DATA =		${INSTALL} -m 644
-
-# The following symbol defines additional compiler flags to enable
-# Tcl itself to be a shared library.  If Tcl isn't going to be a
-# shared library then the symbol has an empty definition.
-
-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
-#TCL_SHLIB_CFLAGS =
-
-# The symbols below provide support for dynamic loading and shared
-# libraries.  See configure.in for a description of what the
-# symbols mean.  The values of the symbols are normally set by the
-# configure script.  You shouldn't normally need to modify any of
-# these definitions by hand.
-
-SHLIB_LD = @SHLIB_LD@
-SHLIB_CFLAGS = @SHLIB_CFLAGS@
-
-SHLIB_SUFFIX = @SHLIB_SUFFIX@
-#SHLIB_SUFFIX =
-
-DLTEST_TARGETS = dltest/pkg5${SHLIB_SUFFIX} dltest/Makefile
-
-# The following symbol is defined to "$(DLTEST_TARGETS)" if dynamic
-# loading is available;  this causes everything in the "dltest"
-# subdirectory to be built when making "tcltest.  If dynamic loading
-# isn't available, configure defines this symbol to an empty string,
-# in which case the shared libraries aren't built.
-BUILD_DLTEST = @BUILD_DLTEST@
-#BUILD_DLTEST =
-
-TCL_LIB_FILE = @TCL_LIB_FILE@
-#TCL_LIB_FILE = libtcl.a
-
-TCL_LIB_FLAG = @TCL_LIB_FLAG@
-#TCL_LIB_FLAG = -ltcl
-
-TCL_EXP_FILE = @TCL_EXP_FILE@
-TCL_BUILD_EXP_FILE = @TCL_BUILD_EXP_FILE@
-
-#----------------------------------------------------------------
-# The information below is modified by the configure script when
-# Makefile is generated from Makefile.in.  You shouldn't normally
-# modify any of this stuff by hand.
-#----------------------------------------------------------------
-
-COMPAT_OBJS =		@LIBOBJS@
-
-AC_FLAGS =		@EXTRA_CFLAGS@ @DEFS@
-RANLIB =		@RANLIB@
-SRC_DIR =		@srcdir@
-TOP_DIR =		@srcdir@/..
-GENERIC_DIR = 		$(TOP_DIR)/generic
-COMPAT_DIR =		$(TOP_DIR)/compat
-TOOL_DIR =		$(TOP_DIR)/tools
-UNIX_DIR = 		$(TOP_DIR)/unix
-# Must be absolute because of the cd dltest $(DLTEST_DIR)/configure below.
-DLTEST_DIR =		@TCL_SRC_DIR@/unix/dltest
-# Must be absolute to so the corresponding tcltest's tcl_library is absolute.
-TCL_BUILDTIME_LIBRARY=  @TCL_SRC_DIR@/library
-
-CC =			@CC@
-
-#----------------------------------------------------------------
-# The information below should be usable as is.  The configure
-# script won't modify it and you shouldn't need to modify it
-# either.
-#----------------------------------------------------------------
-
-
-CC_SWITCHES =	${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${SRC_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
-${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS} \
--DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
-
-STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${SRC_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
-${COMPILE_DEBUG_FLAGS} ${ENV_FLAGS} -DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
-
-LIBS =		@DL_LIBS@ @LIBS@ $(MATH_LIBS) -lc
-
-DEPEND_SWITCHES = ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
-${AC_FLAGS} ${MATH_FLAGS} \
-${GENERIC_FLAGS} ${PROTO_FLAGS} ${MEM_DEBUG_FLAGS} \
--DTCL_SHLIB_EXT=\"${SHLIB_SUFFIX}\"
-
-TCLSH_OBJS = tclAppInit.o
-
-TCLTEST_OBJS = tclTestInit.o tclTest.o tclTestObj.o tclTestProcBodyObj.o \
-	tclThreadTest.o	tclUnixTest.o
-
-XTTEST_OBJS = tclTest.o tclTestObj.o tclUnixTest.o tclXtNotify.o \
-	tclXtTest.o xtTestInit.o
-
-GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
-	tclAsync.o tclBasic.o tclBinary.o \
-	tclCkalloc.o tclClock.o tclCmdAH.o tclCmdIL.o tclCmdMZ.o \
-	tclCompCmds.o tclCompExpr.o tclCompile.o tclDate.o tclEncoding.o \
-	tclEnv.o tclEvent.o tclExecute.o tclFCmd.o tclFileName.o tclGet.o \
-	tclHash.o tclHistory.o tclIndexObj.o tclInterp.o tclIO.o \
-	tclIOCmd.o tclIOSock.o tclIOUtil.o tclLink.o tclListObj.o \
-	tclLiteral.o tclLoad.o tclMain.o tclNamesp.o tclNotify.o \
-	tclObj.o tclPanic.o tclParse.o tclParseExpr.o tclPipe.o \
-	tclPkg.o tclPosixStr.o tclPreserve.o tclProc.o tclRegexp.o \
-	tclResolve.o tclResult.o tclScan.o tclStringObj.o tclThread.o \
-	tclStubInit.o tclStubLib.o tclTimer.o tclUtf.o tclUtil.o tclVar.o
-
-STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS}
-
-OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} @DL_OBJS@
-
-TCL_DECLS = \
-	$(GENERIC_DIR)/tcl.decls \
-	$(GENERIC_DIR)/tclInt.decls
-
-GENERIC_HDRS = \
-	$(GENERIC_DIR)/tcl.h \
-	$(GENERIC_DIR)/tclDecls.h \
-	$(GENERIC_DIR)/tclInt.h \
-	$(GENERIC_DIR)/tclIntDecls.h \
-	$(GENERIC_DIR)/tclIntPlatDecls.h \
-	$(GENERIC_DIR)/tclPatch.h \
-	$(GENERIC_DIR)/tclPlatDecls.h \
-	$(GENERIC_DIR)/tclPort.h \
-	$(GENERIC_DIR)/tclRegexp.h
-
-GENERIC_SRCS = \
-	$(GENERIC_DIR)/regcomp.c \
-	$(GENERIC_DIR)/regexec.c \
-	$(GENERIC_DIR)/regfree.c \
-	$(GENERIC_DIR)/regerror.c \
-	$(GENERIC_DIR)/tclAlloc.c \
-	$(GENERIC_DIR)/tclAsync.c \
-	$(GENERIC_DIR)/tclBasic.c \
-	$(GENERIC_DIR)/tclBinary.c \
-	$(GENERIC_DIR)/tclCkalloc.c \
-	$(GENERIC_DIR)/tclClock.c \
-	$(GENERIC_DIR)/tclCmdAH.c \
-	$(GENERIC_DIR)/tclCmdIL.c \
-	$(GENERIC_DIR)/tclCmdMZ.c \
-	$(GENERIC_DIR)/tclCompCmds.c \
-	$(GENERIC_DIR)/tclCompExpr.c \
-	$(GENERIC_DIR)/tclCompile.c \
-	$(GENERIC_DIR)/tclDate.c \
-	$(GENERIC_DIR)/tclEncoding.c \
-	$(GENERIC_DIR)/tclEnv.c \
-	$(GENERIC_DIR)/tclEvent.c \
-	$(GENERIC_DIR)/tclExecute.c \
-	$(GENERIC_DIR)/tclFCmd.c \
-	$(GENERIC_DIR)/tclFileName.c \
-	$(GENERIC_DIR)/tclGet.c \
-	$(GENERIC_DIR)/tclHash.c \
-	$(GENERIC_DIR)/tclHistory.c \
-	$(GENERIC_DIR)/tclIndexObj.c \
-	$(GENERIC_DIR)/tclInterp.c \
-	$(GENERIC_DIR)/tclIO.c \
-	$(GENERIC_DIR)/tclIOCmd.c \
-	$(GENERIC_DIR)/tclIOSock.c \
-	$(GENERIC_DIR)/tclIOUtil.c \
-	$(GENERIC_DIR)/tclLink.c \
-	$(GENERIC_DIR)/tclListObj.c \
-	$(GENERIC_DIR)/tclLiteral.c \
-	$(GENERIC_DIR)/tclLoad.c \
-	$(GENERIC_DIR)/tclMain.c \
-	$(GENERIC_DIR)/tclNamesp.c \
-	$(GENERIC_DIR)/tclNotify.c \
-	$(GENERIC_DIR)/tclObj.c \
-        $(GENERIC_DIR)/tclParse.c \
-        $(GENERIC_DIR)/tclParseExpr.c \
-	$(GENERIC_DIR)/tclPipe.c \
-	$(GENERIC_DIR)/tclPkg.c \
-	$(GENERIC_DIR)/tclPosixStr.c \
-	$(GENERIC_DIR)/tclPreserve.c \
-	$(GENERIC_DIR)/tclProc.c \
-	$(GENERIC_DIR)/tclRegexp.c \
-	$(GENERIC_DIR)/tclResolve.c \
-	$(GENERIC_DIR)/tclResult.c \
-	$(GENERIC_DIR)/tclScan.c \
-	$(GENERIC_DIR)/tclStubInit.c \
-	$(GENERIC_DIR)/tclStubLib.c \
-	$(GENERIC_DIR)/tclStringObj.c \
-	$(GENERIC_DIR)/tclTest.c \
-	$(GENERIC_DIR)/tclTestObj.c \
-	$(GENERIC_DIR)/tclTestProcBodyObj.c \
-	$(GENERIC_DIR)/tclThread.c \
-	$(GENERIC_DIR)/tclTimer.c \
-	$(GENERIC_DIR)/tclUtil.c \
-	$(GENERIC_DIR)/tclVar.c
-
-STUB_SRCS = \
-	$(GENERIC_DIR)/tclStubLib.c
-
-UNIX_HDRS = \
-	$(UNIX_DIR)/tclUnixPort.h
-
-UNIX_SRCS = \
-	$(UNIX_DIR)/tclAppInit.c \
-	$(UNIX_DIR)/tclMtherr.c \
-	$(UNIX_DIR)/tclUnixChan.c \
-	$(UNIX_DIR)/tclUnixEvent.c \
-	$(UNIX_DIR)/tclUnixFCmd.c \
-	$(UNIX_DIR)/tclUnixFile.c \
-	$(UNIX_DIR)/tclUnixNotfy.c \
-	$(UNIX_DIR)/tclUnixPipe.c \
-	$(UNIX_DIR)/tclUnixSock.c \
-	$(UNIX_DIR)/tclUnixTest.c \
-	$(UNIX_DIR)/tclUnixThrd.c \
-	$(UNIX_DIR)/tclUnixTime.c \
-	$(UNIX_DIR)/tclUnixInit.c
-
-DL_SRCS = \
-	$(UNIX_DIR)/tclLoadAix.c \
-	$(UNIX_DIR)/tclLoadAout.c \
-	$(UNIX_DIR)/tclLoadDl.c \
-	$(UNIX_DIR)/tclLoadDl2.c \
-	$(UNIX_DIR)/tclLoadDld.c \
-	$(GENERIC_DIR)/tclLoadNone.c \
-	$(UNIX_DIR)/tclLoadOSF.c \
-	$(UNIX_DIR)/tclLoadShl.c
-
-# Note: don't include DL_SRCS in SRCS:  most of those files won't
-# compile on the current machine, and they will cause problems for
-# things like "make depend".
-
-SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS)
-
-all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
-
-# The following target is configured by autoconf to generate either
-# a shared library or non-shared library for Tcl.
-${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
-	rm -f ${TCL_LIB_FILE}
-	@MAKE_LIB@
-	$(RANLIB) ${TCL_LIB_FILE}
-
-${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
-	rm -f ${STUB_LIB_FILE}
-	@MAKE_STUB_LIB@
-	$(RANLIB) ${STUB_LIB_FILE}
-
-# Make target which outputs the list of the .o contained in the Tcl lib
-# usefull to build a single big shared library containing Tcl and other
-# extensions.  used for the Tcl Plugin.  -- dl
-# The dependency on OBJS is not there because we just want the list
-# of objects here, not actually building them
-tclLibObjs:
-	@echo ${OBJS}
-# This targets actually build the objects needed for the lib in the above
-# case
-objs: ${OBJS}
-
-
-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
-	${CC} @LD_FLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-		@TCL_LD_SEARCH_FLAGS@ -o tclsh
-
-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
-	${CC} @LD_FLAGS@ ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-		@TCL_LD_SEARCH_FLAGS@ -o tcltest
-
-xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
-	@DL_OBJS@ ${BUILD_DLTEST}
-	${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
-		@DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
-		@TCL_LD_SEARCH_FLAGS@ -lXt -o xttest
-
-
-# Note, in the target below TCL_LIBRARY needs to be set or else
-# "make test" won't work in the case where the compilation directory
-# isn't the same as the source directory.
-
-test: tcltest
-	LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \
-	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
-	./tcltest $(TOP_DIR)/tests/all.tcl
-
-# Useful target to launch a built tcltest with the proper path,...
-runtest: tcltest
-	LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`:${SHLIB_PATH}; export SHLIB_PATH; \
-	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
-	./tcltest
-
-# The following target outputs the name of the top-level source directory
-# for Tcl (it is used by Tk's configure script, for example).  The
-# .NO_PARALLEL line is needed to avoid problems under Sun's "pmake".
-# Note: this target is now obsolete (use the autoconf variable
-# TCL_SRC_DIR from tclConfig.sh instead).
-
-.NO_PARALLEL: topDirName
-topDirName:
-	@cd $(TOP_DIR); pwd
-
-# The following target generates the file generic/tclDate.c 
-# from the yacc grammar found in generic/tclGetDate.y.  This is
-# only run by hand as yacc is not available in all environments.
-# The name of the .c file is different than the name of the .y file
-# so that make doesn't try to automatically regenerate the .c file.
-
-gendate:
-	yacc -l $(GENERIC_DIR)/tclGetDate.y
-	sed -e 's/yy/TclDate/g' -e '/^#include <values.h>/d' \
-	    -e "s/SCCSID/RCS: @(#) \$Id\$"
-	    -e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \
-	    -e '/TclDatenewstate:/d' -e '/#pragma/d' \
-	    <y.tab.c >$(GENERIC_DIR)/tclDate.c
-	rm y.tab.c
-
-# The following targets generate the shared libraries in dltest that
-# are used for testing;  they are included as part of the "tcltest"
-# target (via the BUILD_DLTEST variable) if dynamic loading is supported
-# on this platform. The ".." environment variable stuff is needed
-# because on some platforms tclsh scripts will be executed as part of
-# building the shared libraries, and they need to be able to use the
-# uninstalled tclsh that is present in this directory.  The "make tclsh"
-# command is needed for the same reason (must make sure that it exists).
-
-dltest/pkg5${SHLIB_SUFFIX}: dltest/Makefile
-	if test ! -f tclsh; then $(MAKE) tclsh; else true; fi
-	cd dltest; PATH=..:${PATH} TCL_LIBRARY=../../library $(MAKE)
-
-dltest/Makefile: $(DLTEST_DIR)/configure $(DLTEST_DIR)/Makefile.in tclConfig.sh
-	if test ! -d dltest; then mkdir dltest; else true; fi
-	cd dltest; if test -f configure; then ./configure; else \
-	    $(DLTEST_DIR)/configure; fi
-
-install: install-binaries install-libraries install-man
-
-# Note: before running ranlib below, must cd to target directory because
-# some ranlibs write to current directory, and this might not always be
-# possible (e.g. if installing as root).
-
-install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \
-		tclsh
-	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
-	    do \
-	    if [ ! -d $$i ] ; then \
-		echo "Making directory $$i"; \
-		mkdir -p $$i; \
-		chmod 755 $$i; \
-		else true; \
-		fi; \
-	    done;
-	@echo "Installing $(TCL_LIB_FILE)"
-	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
-	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
-	    echo "Installing $(TCL_EXP_FILE)"; \
-	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-			$(LIB_INSTALL_DIR)/$(TCL_EXP_FILE); \
-	    fi
-	@echo "Installing tclsh"
-	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
-	@echo "Installing tclConfig.sh"
-	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
-	@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
-	    echo "Installing $(TCL_STUB_LIB_FILE)"; \
-	    $(INSTALL_DATA) $(STUB_LIB_FILE) \
-			 $(LIB_INSTALL_DIR)/$(TCL_STUB_LIB_FILE); \
-	    fi
-
-install-libraries:
-	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
-		$(SCRIPT_INSTALL_DIR); \
-	    do \
-	    if [ ! -d $$i ] ; then \
-		echo "Making directory $$i"; \
-		mkdir -p $$i; \
-		chmod 755 $$i; \
-		else true; \
-		fi; \
-	    done;
-	@for i in http2.0 http1.0 opt0.4 encoding msgcat1.0; \
-	    do \
-	    if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
-		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-		mkdir -p $(SCRIPT_INSTALL_DIR)/$$i; \
-		chmod 755 $(SCRIPT_INSTALL_DIR)/$$i; \
-		else true; \
-		fi; \
-	    done;
-	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \
-	    do \
-	    echo "Installing $$i"; \
-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-	    done;
-	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
-	    do \
-	    echo "Installing $$i"; \
-	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
-	    done;
-	@for i in http2.0 http1.0 opt0.4 msgcat1.0; \
-	    do \
-	    for j in $(TOP_DIR)/library/$$i/*.tcl ; \
-		do \
-		echo "Installing $$j"; \
-		$(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/$$i; \
-		done; \
-	    done;
-	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
-		echo "Installing $$i"; \
-		$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \
-	done;
-
-install-man:
-	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
-	    do \
-	    if [ ! -d $$i ] ; then \
-		echo "Making directory $$i"; \
-		mkdir -p $$i; \
-		chmod 755 $$i; \
-		else true; \
-		fi; \
-	    done;
-	@cd $(TOP_DIR)/doc; for i in *.1; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MAN1_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN1_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
-	    done;
-	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
-	@cd $(TOP_DIR)/doc; for i in *.3; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN3_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
-	    done;
-	$(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
-	@cd $(TOP_DIR)/doc; for i in *.n; \
-	    do \
-	    echo "Installing doc/$$i"; \
-	    rm -f $(MANN_INSTALL_DIR)/$$i; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MANN_INSTALL_DIR)/$$i; \
-	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
-	    done;
-	$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
-
-Makefile: $(UNIX_DIR)/Makefile.in
-	$(SHELL) config.status
-
-clean:
-	rm -f *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \
-		errors tclsh tcltest lib.exp
-	if test -f dltest/Makefile; then cd dltest; $(MAKE) clean; fi
-
-distclean: clean
-	rm -rf Makefile config.status config.cache config.log tclConfig.sh \
-		$(PACKAGE).* prototype
-	if test -f dltest/Makefile; then cd dltest; $(MAKE) distclean; fi
-
-depend:
-	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
-
-bp: $(UNIX_DIR)/bp.c
-	$(CC) $(CC_SWITCHES) $(UNIX_DIR)/bp.c -o bp
-
-# Test binaries.  The rules for tclTestInit.o and xtTestInit.o are
-# complicated because they are compiled from tclAppInit.c.  Can't use
-# the "-o" option because this doesn't work on some strange compilers
-# (e.g. UnixWare).
-
-tclTestInit.o: $(UNIX_DIR)/tclAppInit.c
-	@if test -f tclAppInit.o ; then \
-	    rm -f tclAppInit.sav; \
-	    mv tclAppInit.o tclAppInit.sav; \
-	fi;
-	$(CC) -c $(CC_SWITCHES) \
-		-DTCL_BUILDTIME_LIBRARY="\"${TCL_BUILDTIME_LIBRARY}\"" \
-		-DTCL_TEST $(UNIX_DIR)/tclAppInit.c
-	rm -f tclTestInit.o
-	mv tclAppInit.o tclTestInit.o
-	@if test -f tclAppInit.sav ; then \
-	    mv tclAppInit.sav tclAppInit.o; \
-	fi;
-
-xtTestInit.o: $(UNIX_DIR)/tclAppInit.c
-	@if test -f tclAppInit.o ; then \
-	    rm -f tclAppInit.sav; \
-	    mv tclAppInit.o tclAppInit.sav; \
-	fi;
-	$(CC) -c $(CC_SWITCHES) -DTCL_TEST -DTCL_XT_TEST \
-		$(UNIX_DIR)/tclAppInit.c
-	rm -f xtTestInit.o
-	mv tclAppInit.o xtTestInit.o
-	@if test -f tclAppInit.sav ; then \
-	    mv tclAppInit.sav tclAppInit.o; \
-	fi;
-
-# Object files used on all Unix systems:
-
-REGHDRS=$(GENERIC_DIR)/regex.h $(GENERIC_DIR)/regguts.h \
-		$(GENERIC_DIR)/regcustom.h
-regcomp.o: $(REGHDRS) $(GENERIC_DIR)/regcomp.c $(GENERIC_DIR)/regc_lex.c \
-		$(GENERIC_DIR)/regc_color.c $(GENERIC_DIR)/regc_locale.c \
-		$(GENERIC_DIR)/regc_nfa.c $(GENERIC_DIR)/regc_cvec.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/regcomp.c
-
-regexec.o: $(REGHDRS) $(GENERIC_DIR)/regexec.c $(GENERIC_DIR)/rege_dfa.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/regexec.c
-
-regfree.o: $(REGHDRS) $(GENERIC_DIR)/regfree.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/regfree.c
-
-regerror.o: $(REGHDRS) $(GENERIC_DIR)/regerrs.h $(GENERIC_DIR)/regerror.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/regerror.c
-
-tclAppInit.o: $(UNIX_DIR)/tclAppInit.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclAppInit.c
-
-# On unix we want to use the normal malloc/free implementation, so we
-# specifically set the USE_TCLALLOC flag.
-
-tclAlloc.o: $(GENERIC_DIR)/tclAlloc.c
-	$(CC) -c $(CC_SWITCHES) -DUSE_TCLALLOC=0 $(GENERIC_DIR)/tclAlloc.c
-
-tclAsync.o: $(GENERIC_DIR)/tclAsync.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclAsync.c
-
-tclBasic.o: $(GENERIC_DIR)/tclBasic.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c
-
-tclBinary.o: $(GENERIC_DIR)/tclBinary.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c
-
-tclCkalloc.o: $(GENERIC_DIR)/tclCkalloc.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCkalloc.c
-
-tclClock.o: $(GENERIC_DIR)/tclClock.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclClock.c
-
-tclCmdAH.o: $(GENERIC_DIR)/tclCmdAH.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCmdAH.c
-
-tclCmdIL.o: $(GENERIC_DIR)/tclCmdIL.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCmdIL.c
-
-tclCmdMZ.o: $(GENERIC_DIR)/tclCmdMZ.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCmdMZ.c
-
-tclDate.o: $(GENERIC_DIR)/tclDate.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclDate.c
-
-tclCompCmds.o: $(GENERIC_DIR)/tclCompCmds.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCompCmds.c
-
-tclCompExpr.o: $(GENERIC_DIR)/tclCompExpr.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCompExpr.c
-
-tclCompile.o: $(GENERIC_DIR)/tclCompile.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclCompile.c
-
-tclEncoding.o: $(GENERIC_DIR)/tclEncoding.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclEncoding.c
-
-tclEnv.o: $(GENERIC_DIR)/tclEnv.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclEnv.c
-
-tclEvent.o: $(GENERIC_DIR)/tclEvent.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclEvent.c
-
-tclExecute.o: $(GENERIC_DIR)/tclExecute.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclExecute.c
-
-tclFCmd.o: $(GENERIC_DIR)/tclFCmd.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclFCmd.c
-
-tclFileName.o: $(GENERIC_DIR)/tclFileName.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclFileName.c
-
-tclGet.o: $(GENERIC_DIR)/tclGet.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclGet.c
-
-tclHash.o: $(GENERIC_DIR)/tclHash.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclHash.c
-
-tclHistory.o: $(GENERIC_DIR)/tclHistory.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclHistory.c
-
-tclIndexObj.o: $(GENERIC_DIR)/tclIndexObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIndexObj.c
-
-tclInterp.o: $(GENERIC_DIR)/tclInterp.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclInterp.c
-
-tclIO.o: $(GENERIC_DIR)/tclIO.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIO.c
-
-tclIOCmd.o: $(GENERIC_DIR)/tclIOCmd.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIOCmd.c
-
-tclIOSock.o: $(GENERIC_DIR)/tclIOSock.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIOSock.c
-
-tclIOUtil.o: $(GENERIC_DIR)/tclIOUtil.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclIOUtil.c
-
-tclLink.o: $(GENERIC_DIR)/tclLink.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclLink.c
-
-tclListObj.o: $(GENERIC_DIR)/tclListObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclListObj.c
-
-tclLiteral.o: $(GENERIC_DIR)/tclLiteral.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclLiteral.c
-
-tclObj.o: $(GENERIC_DIR)/tclObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclObj.c
-
-tclLoad.o: $(GENERIC_DIR)/tclLoad.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclLoad.c
-
-tclLoadAix.o: $(UNIX_DIR)/tclLoadAix.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadAix.c
-
-tclLoadAout.o: $(UNIX_DIR)/tclLoadAout.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadAout.c
-
-tclLoadDl.o: $(UNIX_DIR)/tclLoadDl.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDl.c
-
-tclLoadDl2.o: $(UNIX_DIR)/tclLoadDl2.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDl2.c
-
-tclLoadDld.o: $(UNIX_DIR)/tclLoadDld.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadDld.c
-
-tclLoadNone.o: $(GENERIC_DIR)/tclLoadNone.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclLoadNone.c
-
-tclLoadOSF.o: $(UNIX_DIR)/tclLoadOSF.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadOSF.c
-
-tclLoadShl.o: $(UNIX_DIR)/tclLoadShl.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclLoadShl.c
-
-tclMain.o: $(GENERIC_DIR)/tclMain.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclMain.c
-
-tclMtherr.o: $(UNIX_DIR)/tclMtherr.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclMtherr.c
-
-tclNamesp.o: $(GENERIC_DIR)/tclNamesp.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclNamesp.c
-
-tclNotify.o: $(GENERIC_DIR)/tclNotify.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclNotify.c
-
-tclParse.o: $(GENERIC_DIR)/tclParse.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclParse.c
-
-tclParseExpr.o: $(GENERIC_DIR)/tclParseExpr.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclParseExpr.c
-
-tclPanic.o: $(GENERIC_DIR)/tclPanic.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclPanic.c
-
-tclPipe.o: $(GENERIC_DIR)/tclPipe.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclPipe.c
-
-tclPkg.o: $(GENERIC_DIR)/tclPkg.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclPkg.c
-
-tclPosixStr.o: $(GENERIC_DIR)/tclPosixStr.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclPosixStr.c
-
-tclPreserve.o: $(GENERIC_DIR)/tclPreserve.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclPreserve.c
-
-tclProc.o: $(GENERIC_DIR)/tclProc.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclProc.c
-
-tclRegexp.o: $(GENERIC_DIR)/tclRegexp.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclRegexp.c
-
-tclResolve.o: $(GENERIC_DIR)/tclResolve.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclResolve.c
-
-tclResult.o: $(GENERIC_DIR)/tclResult.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclResult.c
-
-tclScan.o: $(GENERIC_DIR)/tclScan.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclScan.c
-
-tclStringObj.o: $(GENERIC_DIR)/tclStringObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclStringObj.c
-
-tclStubInit.o: $(GENERIC_DIR)/tclStubInit.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclStubInit.c
-
-tclUtil.o: $(GENERIC_DIR)/tclUtil.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtil.c
-
-tclUtf.o: $(GENERIC_DIR)/tclUtf.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtf.c
-
-tclVar.o: $(GENERIC_DIR)/tclVar.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclVar.c
-
-tclTest.o: $(GENERIC_DIR)/tclTest.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclTest.c
-
-tclTestObj.o: $(GENERIC_DIR)/tclTestObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclTestObj.c
-
-tclTestProcBodyObj.o: $(GENERIC_DIR)/tclTestProcBodyObj.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclTestProcBodyObj.c
-
-tclTimer.o: $(GENERIC_DIR)/tclTimer.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclTimer.c
-
-tclThread.o: $(GENERIC_DIR)/tclThread.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclThread.c
-
-tclThreadTest.o: $(GENERIC_DIR)/tclThreadTest.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclThreadTest.c
-
-tclUnixChan.o: $(UNIX_DIR)/tclUnixChan.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixChan.c
-
-tclUnixEvent.o: $(UNIX_DIR)/tclUnixEvent.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixEvent.c
-
-tclUnixFCmd.o: $(UNIX_DIR)/tclUnixFCmd.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixFCmd.c
-
-tclUnixFile.o: $(UNIX_DIR)/tclUnixFile.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixFile.c
-
-tclUnixNotfy.o: $(UNIX_DIR)/tclUnixNotfy.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixNotfy.c
-
-tclUnixPipe.o: $(UNIX_DIR)/tclUnixPipe.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixPipe.c
-
-tclUnixSock.o: $(UNIX_DIR)/tclUnixSock.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixSock.c
-
-tclUnixTest.o: $(UNIX_DIR)/tclUnixTest.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixTest.c
-
-tclUnixThrd.o: $(UNIX_DIR)/tclUnixThrd.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixThrd.c
-
-tclUnixTime.o: $(UNIX_DIR)/tclUnixTime.c
-	$(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tclUnixTime.c
-
-tclUnixInit.o: $(UNIX_DIR)/tclUnixInit.c $(GENERIC_DIR)/tclInitScript.h tclConfig.sh
-	$(CC) -c $(CC_SWITCHES) -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
-		-DTCL_PACKAGE_PATH="\"${TCL_PACKAGE_PATH}\"" \
-		$(UNIX_DIR)/tclUnixInit.c
-
-# compat binaries, these must be compiled for use in a shared library
-# even though they may be placed in a static executable or library.  Since
-# they are included in both the tcl library and the stub library, they
-# need to be relocatable.
-
-fixstrtod.o: $(COMPAT_DIR)/fixstrtod.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/fixstrtod.c
-
-getcwd.o: $(COMPAT_DIR)/getcwd.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/getcwd.c
-
-opendir.o: $(COMPAT_DIR)/opendir.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/opendir.c
-
-memcmp.o: $(COMPAT_DIR)/memcmp.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/memcmp.c
-
-strncasecmp.o: $(COMPAT_DIR)/strncasecmp.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strncasecmp.c
-
-strstr.o: $(COMPAT_DIR)/strstr.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strstr.c
-
-strtod.o: $(COMPAT_DIR)/strtod.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtod.c
-
-strtol.o: $(COMPAT_DIR)/strtol.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtol.c
-
-strtoul.o: $(COMPAT_DIR)/strtoul.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/strtoul.c
-
-tmpnam.o: $(COMPAT_DIR)/tmpnam.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/tmpnam.c
-
-waitpid.o: $(COMPAT_DIR)/waitpid.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(COMPAT_DIR)/waitpid.c
-
-# Stub library binaries, these must be compiled for use in a shared library
-# even though they will be placed in a static archive
-
-
-tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
-	$(CC) -c $(STUB_CC_SWITCHES) $(GENERIC_DIR)/tclStubLib.c
-
-.c.o:
-	$(CC) -c $(CC_SWITCHES) $<
-
-#
-# Target to regenerate header files and stub files from the *.decls tables.
-#
-
-genstubs:
-	tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
-		$(GENERIC_DIR)/tcl.decls $(GENERIC_DIR)/tclInt.decls
-
-#
-# Target to check that all exported functions have an entry in the stubs
-# tables.
-#
-
-checkstubs:
-	-@for i in `nm -p $(TCL_LIB_FILE) | awk '$$2 ~ /T/ { print $$3 }' \
-		| sort -n`; do \
-		match=0; \
-		for j in $(TCL_DECLS); do \
-		    if [ `grep -c $$i $$j` -gt 0 ]; then \
-			match=1; \
-		    fi; \
-		done; \
-		if [ $$match -eq 0 ]; then echo $$i; fi \
-	done
-
-#
-# Target to check for proper usage of UCHAR macro.
-#
-
-checkuchar:
-	-egrep isalnum\|isalpha\|iscntrl\|isdigit\|islower\|isprint\|ispunct\|isspace\|isupper\|isxdigit\|toupper\|tolower $(SRCS) | grep -v UCHAR
-
-#
-# Target to make sure that only symbols with "Tcl" prefixes are
-# exported.
-#
-
-checkexports: $(TCL_LIB_FILE)
-	-nm -p $(TCL_LIB_FILE) | awk '$$2 ~ /[TDB]/ { print $$3 }' | sort -n | grep -v '^[Tt]cl'
-
-#
-# Target to create a proper Tcl distribution from information in the
-# master source directory.  DISTDIR must be defined to indicate where
-# to put the distribution.
-#
-
-DISTROOT =	/tmp/dist
-DISTNAME =	tcl@TCL_VERSION@@TCL_PATCH_LEVEL@
-ZIPNAME =	tcl@TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@@TCL_PATCH_LEVEL@.zip
-DISTDIR =	$(DISTROOT)/$(DISTNAME)
-$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in
-	autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure
-dist: $(UNIX_DIR)/configure
-	rm -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	mkdir $(DISTDIR)/unix
-	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
-	rm -f $(DISTDIR)/unix/bp.c
-	cp $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
-	chmod 664 $(DISTDIR)/unix/Makefile.in
-	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in \
-		$(UNIX_DIR)/tclConfig.sh.in $(UNIX_DIR)/install-sh \
-		$(UNIX_DIR)/porting.notes $(UNIX_DIR)/porting.old \
-		$(UNIX_DIR)/README $(UNIX_DIR)/ldAix \
-		$(DISTDIR)/unix
-	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
-	chmod 775 $(DISTDIR)/unix/ldAix
-	chmod +x $(DISTDIR)/unix/install-sh
-	tclsh $(UNIX_DIR)/mkLinks.tcl \
-		$(UNIX_DIR)/../doc/*.[13n] > $(DISTDIR)/unix/mkLinks
-	chmod +x $(DISTDIR)/unix/mkLinks
-	mkdir $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/*.c $(GENERIC_DIR)/*.h $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/tclGetDate.y $(DISTDIR)/generic
-	cp -p $(TOP_DIR)/changes $(TOP_DIR)/README* $(TOP_DIR)/license.terms \
-		$(DISTDIR)
-	mkdir $(DISTDIR)/library
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
-		$(TOP_DIR)/library/tclIndex $(DISTDIR)/library
-	for i in http2.0 http1.0 opt0.4 msgcat1.0; \
-	    do \
-		mkdir $(DISTDIR)/library/$$i ;\
-		cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
-	    done;
-	mkdir $(DISTDIR)/library/encoding
-	cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
-	mkdir $(DISTDIR)/doc
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
-		$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
-	mkdir $(DISTDIR)/compat
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/compat/*.c \
-		$(TOP_DIR)/compat/*.h $(TOP_DIR)/compat/README \
-		$(DISTDIR)/compat
-	mkdir $(DISTDIR)/tests
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests
-	cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
-		$(TOP_DIR)/tests/all.tcl $(TOP_DIR)/tests/*.tcl \
-		$(TOP_DIR)/tests/defs.tcl $(DISTDIR)/tests
-	mkdir $(DISTDIR)/tests/pkg
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests/pkg
-	cp -p $(TOP_DIR)/tests/pkg/*.tcl $(DISTDIR)/tests/pkg
-	mkdir $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(TOP_DIR)/win/*.rc \
-		$(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/pkgIndex.tcl $(DISTDIR)/win
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
-	mkdir $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/tclMacProjects.sea.hqx $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
-		$(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/porting.notes $(TOP_DIR)/mac/README $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.exp $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.doc $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.html $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac
-	mkdir $(DISTDIR)/unix/dltest
-	cp -p $(UNIX_DIR)/dltest/*.c $(UNIX_DIR)/dltest/Makefile.in \
-		$(DISTDIR)/unix/dltest
-	cp -p $(UNIX_DIR)/dltest/configure.in $(UNIX_DIR)/dltest/configure \
-		$(UNIX_DIR)/dltest/README $(DISTDIR)/unix/dltest
-	mkdir $(DISTDIR)/tools
-	cp -p $(TOP_DIR)/tools/Makefile.in \
-	    $(TOP_DIR)/tools/README \
-	    $(TOP_DIR)/tools/configure \
-	    $(TOP_DIR)/tools/configure.in \
-	    $(TOP_DIR)/tools/*.tcl \
-	    $(TOP_DIR)/tools/man2tcl.c \
-	    $(TOP_DIR)/tools/tcl.wse.in \
-	    $(TOP_DIR)/tools/*.bmp \
-	    $(TOP_DIR)/tools/tcl.hpj.in \
-		$(DISTDIR)/tools
-
-#
-# The following target can only be used for non-patch releases.  Use
-# the "allpatch" target below for patch releases.
-#
-
-alldist: dist
-	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
-		$(DISTROOT)/$(DISTNAME).tar.gz \
-		$(DISTROOT)/$(ZIPNAME)
-	cd $(DISTROOT); tar cf $(DISTNAME).tar $(DISTNAME); \
-		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
-		compress $(DISTNAME).tar; zip -qr8 $(ZIPNAME) $(DISTNAME)
-
-#
-# The target below is similar to "alldist" except it works for patch
-# releases.  It is needed because patch releases are peculiar: the
-# patch designation appears in the name of the compressed file
-# (e.g. tcl8.0p1.tar.gz) but the extracted source directory doesn't
-# include the patch designation (e.g. tcl8.0).
-#
-
-allpatch: dist
-	rm -f $(DISTROOT)/$(DISTNAME).tar.Z \
-		$(DISTROOT)/$(DISTNAME).tar.gz \
-		$(DISTROOT)/$(ZIPNAME)
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/old
-	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tcl${VERSION}
-	cd $(DISTROOT); tar cf $(DISTNAME).tar tcl${VERSION}; \
-		gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \
-		compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) tcl${VERSION}
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/$(DISTNAME)
-	mv $(DISTROOT)/old $(DISTROOT)/tcl${VERSION}
-
-#
-# This target creates the HTML folder for Tcl & Tk and places it
-# in DISTDIR/html.  It uses the tcl8.1-tk8.1-man-html.tcl tool from
-# the Tcl group's tool workspace.  It depends on the Tcl & Tk being
-# in directories called tcl8.1 & tk8.1 up two directories from the
-# TOOL_DIR.
-#
-
-html: 
-	tclsh $(TOOL_DIR)/tcl8.1-tk8.1-man-html.tcl --htmldir=$(DISTDIR)/html
-
-#
-# Target to create a Macintosh version of the distribution.  This will
-# do a normal distribution and then massage the output to prepare it
-# for moving to the Mac platform.  This requires a few scripts and
-# programs found only in the Tcl group's tool workspace.
-#
-
-macdist: dist machtml
-
-machtml:
-	rm -f $(DISTDIR)/mac/tclMacProjects.sea.hqx
-	rm -rf $(DISTDIR)/doc
-	tclsh $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
-
-#
-# Targets to build Solaris package of the distribution for the current
-# architecture.  To build stream packages for both sun4 and i86pc
-# architectures: 
-#
-#   On the sun4 machine, execute the following:
-#     make distclean; ./configure
-#     make DISTDIR=<distdir> package
-#
-#   Once the build is complete, execute the following on the i86pc
-#   machine:
-#     make DISTDIR=<distdir> package-quick
-#
-# <distdir> is the absolute path to a directory where the build should
-# take place.  These steps will generate the $(PACKAGE).sun4 and
-# $(PACKAGE).i86pc stream packages.  It is important that the packages be
-# built in this fashion in order to ensure that the architecture
-# independent files are exactly the same, including timestamps, in
-# both packages.
-#
-
-PACKAGE=SCRPtcl
-
-package: dist package-config package-common package-binaries package-generate
-package-quick: package-config package-binaries package-generate
-
-#
-# Configure for the current architecture in the dist directory.
-#
-package-config:
-	mkdir -p $(DISTDIR)/unix/`arch`
-	cd $(DISTDIR)/unix/`arch`; \
-        ../configure --prefix=/opt/$(PACKAGE)/$(VERSION) \
-		--exec_prefix=/opt/$(PACKAGE)/$(VERSION)/`arch` \
-		--enable-shared
-	mkdir -p $(DISTDIR)/$(PACKAGE)/$(VERSION)
-	mkdir -p $(DISTDIR)/$(PACKAGE)/$(VERSION)/`arch`
-
-#
-# Build and install the architecture independent files in the dist directory.
-#
-
-package-common:
-	cd $(DISTDIR)/unix/`arch`;\
-	$(MAKE); \
-	$(MAKE) prefix=$(DISTDIR)/$(PACKAGE)/$(VERSION) \
-		exec_prefix=$(DISTDIR)/$(PACKAGE)/$(VERSION)/`arch` \
-		install-libraries install-man
-	mkdir -p $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin
-	sed -e "s/TCLVERSION/$(VERSION)/g" < $(UNIX_DIR)/tclsh.sh \
-		> $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin/tclsh$(VERSION)
-	chmod 755 $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin/tclsh$(VERSION)
-
-#
-# Build and install the architecture specific files in the dist directory.
-#
-
-package-binaries: 
-	cd $(DISTDIR)/unix/`arch`; \
-	$(MAKE); \
-	$(MAKE) install-binaries prefix=$(DISTDIR)/$(PACKAGE)/$(VERSION) \
-		exec_prefix=$(DISTDIR)/$(PACKAGE)/$(VERSION)/`arch`
-
-#
-# Generate a package from the installed files in the dist directory for the
-# current architecture.
-#
-
-package-generate:
-	pkgproto $(DISTDIR)/$(PACKAGE)/$(VERSION)/bin=bin \
-		 $(DISTDIR)/$(PACKAGE)/$(VERSION)/include=include \
-		 $(DISTDIR)/$(PACKAGE)/$(VERSION)/lib=lib \
-		 $(DISTDIR)/$(PACKAGE)/$(VERSION)/man=man \
-		 $(DISTDIR)/$(PACKAGE)/$(VERSION)/`arch`=`arch` \
-	| tclsh $(UNIX_DIR)/mkProto.tcl \
-		$(VERSION) $(UNIX_DIR) > prototype
-	pkgmk -o -d . -f prototype -a `arch`
-	pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
-	rm -rf $(PACKAGE)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/unix/README b/unix/README
deleted file mode 100644
index 77e931e..0000000
--- a/unix/README
+++ /dev/null
@@ -1,109 +0,0 @@
-This is the directory where you configure, compile, test, and install
-UNIX versions of Tcl.  This directory also contains source files for Tcl
-that are specific to UNIX.  Some of the files in this directory are
-used on the PC or Mac platform too, but they all depend on UNIX
-(POSIX/ANSI C) interfaces and some of them only make sense under UNIX.
-
-The rest of this file contains instructions on how to do this.  The
-release should compile and run either "out of the box" or with trivial
-changes on any UNIX-like system that approximates POSIX, BSD, or System
-V.  We know that it runs on workstations from Sun, H-P, DEC, IBM, and
-SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
-a PC running Windows, see the README file in the directory ../win.  To
-compile for a Macintosh, see the README file in the directory ../mac.
-
-RCS: @(#) $Id: README,v 1.4 1999/04/16 00:48:03 stanton Exp $
-
-How To Compile And Install Tcl:
--------------------------------
-
-(a) Check for patches as described in ../README.
-
-(b) If you have already compiled Tcl once in this directory and are now
-    preparing to compile again in the same directory but for a different
-    platform, or if you have applied patches, type "make distclean" to
-    discard all the configuration information computed previously.
-
-(c) Type "./configure".  This runs a configuration script created by GNU
-    autoconf, which configures Tcl for your system and creates a
-    Makefile.  The configure script allows you to customize the Tcl
-    configuration for your site; for details on how you can do this,
-    type "./configure -help" or refer to the autoconf documentation (not
-    included here).  Tcl's "configure" supports the following special
-    switches in addition to the standard ones:
-	--enable-gcc		If this switch is set, Tcl will configure
-				itself to use gcc if it is available on your
-				system.  Note:  it is not safe to modify the
-				Makefile to use gcc after configure is run;
-				if you do this, then information related to
-				dynamic linking will be incorrect.
-	--enable-threads	If this switch is set, Tcl will compile
-				itself with multithreading support.
-	--disable-load		If this switch is specified then Tcl will
-				configure itself not to allow dynamic loading,
-				even if your system appears to support it.
-				Normally you can leave this switch out and
-				Tcl will build itself for dynamic loading
-				if your system supports it.
-	--enable-shared		If this switch is specified, Tcl will compile
-				itself as a shared library if it can figure
-				out how to do that on this platform.
-    Note: be sure to use only absolute path names (those starting with "/")
-    in the --prefix and --exec_prefix options.
-
-(d) Type "make".  This will create a library archive called "libtcl.a"
-    or "libtcl.so" and an interpreter application called "tclsh" that
-    allows you to type Tcl commands interactively or execute script files.
-
-(e) If the make fails then you'll have to personalize the Makefile
-    for your site or possibly modify the distribution in other ways.
-    First check the file "porting.notes" to see if there are hints
-    for compiling on your system.  Then look at the porting Web page
-    described later in this file.  If you need to modify Makefile, there
-    are comments at the beginning of it that describe the things you
-    might want to change and how to change them.
-
-(f) Type "make install" to install Tcl binaries and script files in
-    standard places.  You'll need write permission on the installation
-    directories to do this.  The installation directories are
-    determined by the "configure" script and may be specified with
-    the --prefix and --exec_prefix options to "configure".  See the
-    Makefile for information on what directories were chosen; you
-    can override these choices by modifying the "prefix" and
-    "exec_prefix" variables in the Makefile.
-
-(g) At this point you can play with Tcl by invoking the "tclsh"
-    program and typing Tcl commands.  However, if you haven't installed
-    Tcl then you'll first need to set your TCL_LIBRARY variable to
-    hold the full path name of the "library" subdirectory.  Note that
-    the installed versions of tclsh, libtcl.a, and libtcl.so have a
-    version number in their names, such as "tclsh8.1" or "libtcl8.1.so";
-    to use the installed versions, either specify the version number
-    or create a symbolic link (e.g. from "tclsh" to "tclsh8.1").
-
-If you have trouble compiling Tcl, check out the following Web URL:
-    http://www.scriptics.com/software/install.html#Database
-This is an on-line database of porting information.  We make no
-guarantees that this information is accurate, complete, or up-to-date,
-but you may find it useful.  If you get Tcl running on a new
-configuration, we would be happy to receive new information to add to
-the database.  We're also interested in hearing how to change the
-configuration setup so that Tcl compiles out of the box on more
-platforms.
-
-Test suite
-----------
-
-There is a relatively complete test suite for all of the Tcl core in
-the subdirectory "tests".  To use it just type "make test" in this
-directory.  You should then see a printout of the test files processed.
-If any errors occur, you'll see a much more substantial printout for
-each error.  See the README file in the "tests" directory for more
-information on the test suite.  Note: don't run the tests as superuser:
-this will cause several of them to fail.
-
-The Tcl test suite is very sensitive to proper implementation of
-ANSI C library procedures such as sprintf and sscanf.  If the test
-suite generates errors, most likely they are due to non-conformance
-of your system's ANSI C library;  such problems are unlikely to
-affect any real applications so it's probably safe to ignore them.
diff --git a/unix/configure.in b/unix/configure.in
deleted file mode 100644
index 1e339a4..0000000
--- a/unix/configure.in
+++ /dev/null
@@ -1,1478 +0,0 @@
-dnl	This file is an input file used by the GNU "autoconf" program to
-dnl	generate the file "configure", which is run during Tcl installation
-dnl	to configure the system for the local environment.
-AC_INIT(../generic/tcl.h)
-# RCS: @(#) $Id: configure.in,v 1.31 1999/04/16 00:48:03 stanton Exp $
-
-TCL_VERSION=8.1
-TCL_MAJOR_VERSION=8
-TCL_MINOR_VERSION=1
-TCL_PATCH_LEVEL=b3
-VERSION=${TCL_VERSION}
-
-if test "${prefix}" = "NONE"; then
-    prefix=/usr/local
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-TCL_SRC_DIR=`cd $srcdir/..; pwd`
-
-AC_PROG_RANLIB
-AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available],
-    [tcl_ok=$enableval], [tcl_ok=no])
-if test "$tcl_ok" = "yes"; then
-    AC_PROG_CC
-else
-    CC=${CC-cc}
-AC_SUBST(CC)
-fi
-AC_C_CROSS
-
-# Threads support
-AC_ARG_ENABLE(threads,[  --enable-threads        enable Threads support],,enableval="no")
-
-if test "$enableval" = "yes"; then
-  AC_MSG_RESULT(Will compile with Threads support)
-  AC_DEFINE(TCL_THREADS)
-  AC_DEFINE(_REENTRANT)
-
-  AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
-  if test "$tcl_ok" = "yes"; then
-     # The space is needed
-     THREADS_LIBS=" -lpthread"
-  else
-     AC_MSG_WARN("Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...")
-  fi
-else
-  AC_MSG_RESULT(Will compile without Threads support (normal))
-fi
-
-# set the warning flags depending on whether or not we are using gcc
-if test "${GCC}" = "yes" ; then
-    CFLAGS_WARNING="-Wall -Wconversion"
-else
-    CFLAGS_WARNING=""
-fi
-
-#-----------------------------
-# 64-bit support
-#-----------------------------
-
-AC_ARG_ENABLE(64bit,[  --enable-64bit          enable 64bit support],,enableval="no")
-
-if test "$enableval" = "yes"; then
-  AC_MSG_RESULT(Will compile with 64bit support)
-  do64bit=yes
-else
-  do64bit=no
-fi
-
-#------------------------------------------------------------------------------
-# If we're using GCC, see if the compiler understands -pipe.  If so, use it.
-# It makes compiling go faster.  (This is only a performance feature.)
-#------------------------------------------------------------------------------
-
-if test -z "$no_pipe"; then
-if test -n "$GCC"; then
-  AC_MSG_CHECKING([if the compiler understands -pipe])
-  OLDCC="$CC"  
-  CC="$CC -pipe"
-  AC_TRY_COMPILE(,,
-    AC_MSG_RESULT(yes),
-    CC="$OLDCC"
-    AC_MSG_RESULT(no))
-fi  
-fi
-
-#--------------------------------------------------------------------
-#	Supply substitutes for missing POSIX library procedures, or
-#	set flags so Tcl uses alternate procedures.
-#--------------------------------------------------------------------
-
-# Check if Posix compliant getcwd exists, if not we'll use getwd.
-AC_CHECK_FUNCS(getcwd, , AC_DEFINE(USEGETWD))
-# Nb: if getcwd uses popen and pwd(1) (like SunOS 4) we should really
-# define USEGETWD even if the posix getcwd exists. Add a test ?
-
-AC_REPLACE_FUNCS(opendir strstr)
-
-AC_REPLACE_FUNCS(strtol tmpnam waitpid)
-AC_CHECK_FUNC(strerror, , AC_DEFINE(NO_STRERROR))
-AC_CHECK_FUNC(getwd, , AC_DEFINE(NO_GETWD))
-AC_CHECK_FUNC(wait3, , AC_DEFINE(NO_WAIT3))
-AC_CHECK_FUNC(uname, , AC_DEFINE(NO_UNAME))
-AC_CHECK_FUNC(realpath, , AC_DEFINE(NO_REALPATH))
-
-#--------------------------------------------------------------------
-#	On a few very rare systems, all of the libm.a stuff is
-#	already in libc.a.  Set compiler flags accordingly.
-#	Also, Linux requires the "ieee" library for math to work
-#	right (and it must appear before "-lm").
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
-AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
-
-#--------------------------------------------------------------------
-#       On AIX systems, libbsd.a has to be linked in to support
-#       non-blocking file IO.  This library has to be linked in after
-#       the MATH_LIBS or it breaks the pow() function.  The way to
-#       insure proper sequencing, is to add it to the tail of MATH_LIBS.
-#        This library also supplies gettimeofday.
-#--------------------------------------------------------------------
-libbsd=no
-if test "`uname -s`" = "AIX" ; then
-    AC_CHECK_LIB(bsd, gettimeofday, libbsd=yes)
-    if test $libbsd = yes; then
-	MATH_LIBS="$MATH_LIBS -lbsd"
-    fi
-fi
-
-#--------------------------------------------------------------------
-#	Supply substitutes for missing POSIX header files.  Special
-#	notes:
-#	    - stdlib.h doesn't define strtol, strtoul, or
-#	      strtod insome versions of SunOS
-#	    - some versions of string.h don't declare procedures such
-#	      as strstr
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING(dirent.h)
-AC_TRY_LINK([#include <sys/types.h>
-#include <dirent.h>], [
-#ifndef _POSIX_SOURCE
-#   ifdef __Lynx__
-	/*
-	 * Generate compilation error to make the test fail:  Lynx headers
-	 * are only valid if really in the POSIX environment.
-	 */
-
-	missing_procedure();
-#   endif
-#endif
-DIR *d;
-struct dirent *entryPtr;
-char *p;
-d = opendir("foobar");
-entryPtr = readdir(d);
-p = entryPtr->d_name;
-closedir(d);
-], tcl_ok=yes, tcl_ok=no)
-if test $tcl_ok = no; then
-    AC_DEFINE(NO_DIRENT_H)
-fi
-AC_MSG_RESULT($tcl_ok)
-AC_CHECK_HEADER(errno.h, , AC_DEFINE(NO_ERRNO_H))
-AC_CHECK_HEADER(float.h, , AC_DEFINE(NO_FLOAT_H))
-AC_CHECK_HEADER(values.h, , AC_DEFINE(NO_VALUES_H))
-AC_CHECK_HEADER(limits.h, , AC_DEFINE(NO_LIMITS_H))
-AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0)
-AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0)
-AC_EGREP_HEADER(strtoul, stdlib.h, , tcl_ok=0)
-AC_EGREP_HEADER(strtod, stdlib.h, , tcl_ok=0)
-if test $tcl_ok = 0; then
-    AC_DEFINE(NO_STDLIB_H)
-fi
-AC_CHECK_HEADER(string.h, tcl_ok=1, tcl_ok=0)
-AC_EGREP_HEADER(strstr, string.h, , tcl_ok=0)
-AC_EGREP_HEADER(strerror, string.h, , tcl_ok=0)
-# See also memmove check below for a place where NO_STRING_H can be
-# set and why.
-if test $tcl_ok = 0; then
-    AC_DEFINE(NO_STRING_H)
-fi
-AC_CHECK_HEADER(sys/wait.h, , AC_DEFINE(NO_SYS_WAIT_H))
-AC_CHECK_HEADER(dlfcn.h, , AC_DEFINE(NO_DLFCN_H))
-
-# OS/390 lacks sys/param.h (and doesn't need it, by chance).
-AC_HAVE_HEADERS(unistd.h sys/param.h)
-
-#---------------------------------------------------------------------------
-#	Determine which interface to use to talk to the serial port.
-#	Note that #include lines must begin in leftmost column for
-#	some compilers to recognize them as preprocessor directives.
-#---------------------------------------------------------------------------
-
-AC_MSG_CHECKING([termios vs. termio vs. sgtty])
-AC_TRY_RUN([
-#include <termios.h>
-
-main()
-{
-    struct termios t;
-    if (tcgetattr(0, &t) == 0) {
-	cfsetospeed(&t, 0);
-	t.c_cflag |= PARENB | PARODD | CSIZE | CSTOPB;
-	return 0;
-    }
-    return 1;
-}], tk_ok=termios, tk_ok=no, tk_ok=no)
-if test $tk_ok = termios; then
-    AC_DEFINE(USE_TERMIOS)
-else
-AC_TRY_RUN([
-#include <termio.h>
-
-main()
-{
-    struct termio t;
-    if (ioctl(0, TCGETA, &t) == 0) {
-	t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB;
-	return 0;
-    }
-    return 1;
-}], tk_ok=termio, tk_ok=no, tk_ok=no)
-if test $tk_ok = termio; then
-    AC_DEFINE(USE_TERMIO)
-else
-AC_TRY_RUN([
-#include <sgtty.h>
-
-main()
-{
-    struct sgttyb t;
-    if (ioctl(0, TIOCGETP, &t) == 0) {
-	t.sg_ospeed = 0;
-	t.sg_flags |= ODDP | EVENP | RAW;
-	return 0;
-    }
-    return 1;
-}], tk_ok=sgtty, tk_ok=none, tk_ok=none)
-if test $tk_ok = sgtty; then
-    AC_DEFINE(USE_SGTTY)
-fi
-fi
-fi
-AC_MSG_RESULT($tk_ok)
-
-#--------------------------------------------------------------------
-#	Include sys/select.h if it exists and if it supplies things
-#	that appear to be useful and aren't already in sys/types.h.
-#	This appears to be true only on the RS/6000 under AIX.  Some
-#	systems like OSF/1 have a sys/select.h that's of no use, and
-#	other systems like SCO UNIX have a sys/select.h that's
-#	pernicious.  If "fd_set" isn't defined anywhere then set a
-#	special flag.
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING([fd_set and sys/select])
-AC_TRY_COMPILE([#include <sys/types.h>],
-	[fd_set readMask, writeMask;], tk_ok=yes, tk_ok=no)
-if test $tk_ok = no; then
-    AC_HEADER_EGREP(fd_mask, sys/select.h, tk_ok=yes)
-    if test $tk_ok = yes; then
-	AC_DEFINE(HAVE_SYS_SELECT_H)
-    fi
-fi
-AC_MSG_RESULT($tk_ok)
-if test $tk_ok = no; then
-    AC_DEFINE(NO_FD_SET)
-fi
-
-#------------------------------------------------------------------------------
-#       Find out all about time handling differences.
-#------------------------------------------------------------------------------
-
-AC_CHECK_HEADERS(sys/time.h)
-AC_HEADER_TIME
-AC_STRUCT_TIMEZONE
-
-AC_MSG_CHECKING([tm_tzadj in struct tm])
-AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_tzadj;],
-        [AC_DEFINE(HAVE_TM_TZADJ)
-         AC_MSG_RESULT(yes)],
-         AC_MSG_RESULT(no))
-
-AC_MSG_CHECKING([tm_gmtoff in struct tm])
-AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-        [AC_DEFINE(HAVE_TM_GMTOFF)
-         AC_MSG_RESULT(yes)],
-         AC_MSG_RESULT(no))
-
-#
-# Its important to include time.h in this check, as some systems (like convex)
-# have timezone functions, etc.
-#
-have_timezone=no
-AC_MSG_CHECKING([long timezone variable])
-AC_TRY_COMPILE([#include <time.h>],
-        [extern long timezone;
-         timezone += 1;
-         exit (0);],
-        [have_timezone=yes
-	 AC_DEFINE(HAVE_TIMEZONE_VAR)
-         AC_MSG_RESULT(yes)],
-         AC_MSG_RESULT(no))
-
-#
-# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
-#
-if test "$have_timezone" = no; then
-   AC_MSG_CHECKING([time_t timezone variable])
-   AC_TRY_COMPILE([#include <time.h>],
-        [extern time_t timezone;
-         timezone += 1;
-         exit (0);],
-        [AC_DEFINE(HAVE_TIMEZONE_VAR)
-         AC_MSG_RESULT(yes)],
-         AC_MSG_RESULT(no))
-fi
-
-#
-# AIX does not have a timezone field in struct tm. When the AIX bsd
-# library is used, the timezone global and the gettimeofday methods are
-# to be avoided for timezone deduction instead, we deduce the timezone
-# by comparing the localtime result on a known GMT value.
-#
-if test $libbsd = yes; then
-    AC_DEFINE(USE_DELTA_FOR_TZ)
-fi
-
-#--------------------------------------------------------------------
-#	Some systems (e.g., IRIX 4.0.5) lack the st_blksize field
-#	in struct stat.  But we might be able to use fstatfs instead.
-#--------------------------------------------------------------------
-AC_STRUCT_ST_BLKSIZE
-AC_CHECK_FUNC(fstatfs, , AC_DEFINE(NO_FSTATFS))
-
-#--------------------------------------------------------------------
-#       Some system have no memcmp or it does not work with 8 bit
-#       data, this checks it and add memcmp.o to LIBOBJS if needed
-#--------------------------------------------------------------------
-AC_FUNC_MEMCMP
-
-#--------------------------------------------------------------------
-#       Some system like SunOS 4 and other BSD like systems
-#       have no memmove (we assume they have bcopy instead).
-#       {The replacement define is in compat/string.h}
-#--------------------------------------------------------------------
-AC_CHECK_FUNC(memmove, , AC_DEFINE(NO_MEMMOVE) AC_DEFINE(NO_STRING_H))
-
-#--------------------------------------------------------------------
-#	On some systems strstr is broken: it returns a pointer even
-#	even if the original string is empty.
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING([proper strstr implementation])
-AC_TRY_RUN([
-extern int strstr();
-int main()
-{
-    exit(strstr("\0test", "test") ? 1 : 0);
-}
-], tcl_ok=yes, tcl_ok=no, tcl_ok=no)
-if test $tcl_ok = yes; then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT([broken, using substitute])
-    LIBOBJS="$LIBOBJS strstr.o"
-fi
-
-#--------------------------------------------------------------------
-#	Check for strtoul function.  This is tricky because under some
-#	versions of AIX strtoul returns an incorrect terminator
-#	pointer for the string "0".
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(strtoul, tcl_ok=1, tcl_ok=0)
-AC_TRY_RUN([
-extern int strtoul();
-int main()
-{
-    char *string = "0";
-    char *term;
-    int value;
-    value = strtoul(string, &term, 0);
-    if ((value != 0) || (term != (string+1))) {
-        exit(1);
-    }
-    exit(0);
-}], , tcl_ok=0, tcl_ok=0)
-if test "$tcl_ok" = 0; then
-    test -n "$verbose" && echo "	Adding strtoul.o."
-    LIBOBJS="$LIBOBJS strtoul.o"
-fi
-
-#--------------------------------------------------------------------
-#	Check for the strtod function.  This is tricky because in some
-#	versions of Linux strtod mis-parses strings starting with "+".
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(strtod, tcl_ok=1, tcl_ok=0)
-AC_TRY_RUN([
-extern double strtod();
-int main()
-{
-    char *string = " +69";
-    char *term;
-    double value;
-    value = strtod(string, &term);
-    if ((value != 69) || (term != (string+4))) {
-	exit(1);
-    }
-    exit(0);
-}], , tcl_ok=0, tcl_ok=0)
-if test "$tcl_ok" = 0; then
-    test -n "$verbose" && echo "	Adding strtod.o."
-    LIBOBJS="$LIBOBJS strtod.o"
-fi
-
-#--------------------------------------------------------------------
-#	Under Solaris 2.4, strtod returns the wrong value for the
-#	terminating character under some conditions.  Check for this
-#	and if the problem exists use a substitute procedure
-#	"fixstrtod" that corrects the error.
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(strtod, tcl_strtod=1, tcl_strtod=0)
-if test "$tcl_strtod" = 1; then
-    AC_MSG_CHECKING([for Solaris strtod bug])
-    AC_TRY_RUN([
-extern double strtod();
-int main()
-{
-    char *string = "NaN";
-    char *term;
-    strtod(string, &term);
-    if ((term != string) && (term[-1] == 0)) {
-	exit(1);
-    }
-    exit(0);
-}], tcl_ok=1, tcl_ok=0, tcl_ok=0)
-    if test $tcl_ok = 1; then
-	AC_MSG_RESULT(ok)
-    else
-	AC_MSG_RESULT(buggy)
-	LIBOBJS="$LIBOBJS fixstrtod.o"
-	AC_DEFINE(strtod, fixstrtod)
-    fi
-fi
-
-#--------------------------------------------------------------------
-#	Check for various typedefs and provide substitutes if
-#	they don't exist.
-#--------------------------------------------------------------------
-
-AC_TYPE_MODE_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-#--------------------------------------------------------------------
-#	If a system doesn't have an opendir function (man, that's old!)
-#	then we have to supply a different version of dirent.h which
-#	is compatible with the substitute version of opendir that's
-#	provided.  This version only works with V7-style directories.
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(opendir, , AC_DEFINE(USE_DIRENT2_H))
-
-#--------------------------------------------------------------------
-#	The check below checks whether <sys/wait.h> defines the type
-#	"union wait" correctly.  It's needed because of weirdness in
-#	HP-UX where "union wait" is defined in both the BSD and SYS-V
-#	environments.  Checking the usability of WIFEXITED seems to do
-#	the trick.
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING([union wait])
-AC_TRY_LINK([#include <sys/types.h> 
-#include <sys/wait.h>], [
-union wait x;
-WIFEXITED(x);		/* Generates compiler error if WIFEXITED
-			 * uses an int. */
-], tcl_ok=yes, tcl_ok=no)
-AC_MSG_RESULT($tcl_ok)
-if test $tcl_ok = no; then
-    AC_DEFINE(NO_UNION_WAIT)
-fi
-
-#--------------------------------------------------------------------
-#	Check to see whether the system supports the matherr function
-#	and its associated type "struct exception".
-#--------------------------------------------------------------------
-
-AC_MSG_CHECKING([matherr support])
-AC_TRY_COMPILE([#include <math.h>], [
-struct exception x;
-x.type = DOMAIN;
-x.type = SING;
-], tcl_ok=yes, tcl_ok=no)
-AC_MSG_RESULT($tcl_ok)
-if test $tcl_ok = yes; then
-    AC_DEFINE(NEED_MATHERR)
-fi
-
-#--------------------------------------------------------------------
-#	Check to see whether the system provides a vfork kernel call.
-#	If not, then use fork instead.  Also, check for a problem with
-#	vforks and signals that can cause core dumps if a vforked child
-#	resets a signal handler.  If the problem exists, then use fork
-#	instead of vfork.
-#--------------------------------------------------------------------
-
-AC_TYPE_SIGNAL()
-AC_CHECK_FUNC(vfork, tcl_ok=1, tcl_ok=0)
-if test "$tcl_ok" = 1; then
-    AC_MSG_CHECKING([vfork/signal bug]);
-    AC_TRY_RUN([
-#include <stdio.h>
-#include <signal.h>
-#include <sys/wait.h>
-int gotSignal = 0;
-sigProc(sig)
-    int sig;
-{
-    gotSignal = 1;
-}
-main()
-{
-    int pid, sts;
-    (void) signal(SIGCHLD, sigProc);
-    pid = vfork();
-    if (pid <  0) {
-	exit(1);
-    } else if (pid == 0) {
-	(void) signal(SIGCHLD, SIG_DFL);
-	_exit(0);
-    } else {
-	(void) wait(&sts);
-    }
-    exit((gotSignal) ? 0 : 1);
-}], tcl_ok=1, tcl_ok=0, tcl_ok=0)
-    if test "$tcl_ok" = 1; then
-	AC_MSG_RESULT(ok)
-    else
-	AC_MSG_RESULT([buggy, using fork instead])
-    fi
-fi
-rm -f core
-if test "$tcl_ok" = 0; then
-    AC_DEFINE(vfork, fork)
-fi
-
-#--------------------------------------------------------------------
-#	Check whether there is an strncasecmp function on this system.
-#	This is a bit tricky because under SCO it's in -lsocket and
-#	under Sequent Dynix it's in -linet.
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(strncasecmp, tcl_ok=1, tcl_ok=0)
-if test "$tcl_ok" = 0; then
-    AC_CHECK_LIB(socket, strncasecmp, tcl_ok=1, tcl_ok=0)
-fi
-if test "$tcl_ok" = 0; then
-    AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0)
-fi
-if test "$tcl_ok" = 0; then
-    LIBOBJS="$LIBOBJS strncasecmp.o"
-fi
-
-#--------------------------------------------------------------------
-#	The code below deals with several issues related to gettimeofday:
-#	1. Some systems don't provide a gettimeofday function at all
-#	   (set NO_GETTOD if this is the case).
-#	2. SGI systems don't use the BSD form of the gettimeofday function,
-#	   but they have a BSDgettimeofday function that can be used instead.
-#	3. See if gettimeofday is declared in the <sys/time.h> header file.
-#	   if not, set the GETTOD_NOT_DECLARED flag so that tclPort.h can
-#	   declare it.
-#--------------------------------------------------------------------
-
-AC_CHECK_FUNC(BSDgettimeofday, AC_DEFINE(HAVE_BSDGETTIMEOFDAY),
-	AC_CHECK_FUNC(gettimeofday, , AC_DEFINE(NO_GETTOD)))
-AC_MSG_CHECKING([for gettimeofday declaration])
-AC_EGREP_HEADER(gettimeofday, sys/time.h, AC_MSG_RESULT(present), [
-    AC_MSG_RESULT(missing)
-    AC_DEFINE(GETTOD_NOT_DECLARED)
-])
-
-#--------------------------------------------------------------------
-#	Interactive UNIX requires -linet instead of -lsocket, plus it
-#	needs net/errno.h to define the socket-related error codes.
-#--------------------------------------------------------------------
-
-AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"])
-AC_CHECK_HEADER(net/errno.h, AC_DEFINE(HAVE_NET_ERRNO_H))
-
-#--------------------------------------------------------------------
-#	The following code checks to see whether it is possible to get
-#	signed chars on this platform.  This is needed in order to
-#	properly generate sign-extended ints from character values.
-#--------------------------------------------------------------------
-
-AC_C_CHAR_UNSIGNED
-AC_MSG_CHECKING([signed char declarations])
-AC_TRY_COMPILE(, [
-signed char *p;
-p = 0;
-], tcl_ok=yes, tcl_ok=no)
-AC_MSG_RESULT($tcl_ok)
-if test $tcl_ok = yes; then
-    AC_DEFINE(HAVE_SIGNED_CHAR)
-fi
-
-#--------------------------------------------------------------------
-#	Check for the existence of the -lsocket and -lnsl libraries.
-#	The order here is important, so that they end up in the right
-#	order in the command line generated by make.  Here are some
-#	special considerations:
-#	1. Use "connect" and "accept" to check for -lsocket, and
-#	   "gethostbyname" to check for -lnsl.
-#	2. Use each function name only once:  can't redo a check because
-#	   autoconf caches the results of the last check and won't redo it.
-#	3. Use -lnsl and -lsocket only if they supply procedures that
-#	   aren't already present in the normal libraries.  This is because
-#	   IRIX 5.2 has libraries, but they aren't needed and they're
-#	   bogus:  they goof up name resolution if used.
-#	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
-#	   To get around this problem, check for both libraries together
-#	   if -lsocket doesn't work by itself.
-#--------------------------------------------------------------------
-
-tcl_checkBoth=0
-AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
-if test "$tcl_checkSocket" = 1; then
-    AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", tcl_checkBoth=1)
-fi
-if test "$tcl_checkBoth" = 1; then
-    tk_oldLibs=$LIBS
-    LIBS="$LIBS -lsocket -lnsl"
-    AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs])
-fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
-
-# Add the threads support libraries
-
-LIBS="$LIBS$THREADS_LIBS"
-
-#--------------------------------------------------------------------
-#	The statements below define a collection of symbols related to
-#	dynamic loading and shared libraries:
-#
-#	DL_OBJS -	Name of the object file that implements dynamic
-#			loading for Tcl on this system.
-#	DL_LIBS -	Library file(s) to include in tclsh and other base
-#			applications in order for the "load" command to work.
-#	LD_FLAGS -	Flags to pass to the compiler when linking object
-#			files into an executable application binary such
-#			as tclsh.
-#	LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
-#			that tell the run-time dynamic linker where to look
-#			for shared libraries such as libtcl.so.  Depends on
-#			the variable LIB_RUNTIME_DIR in the Makefile.
-#	MAKE_LIB -	Command to execute to build the Tcl library;
-#			differs depending on whether or not Tcl is being
-#			compiled as a shared library.
-#	SHLIB_CFLAGS -	Flags to pass to cc when compiling the components
-#			of a shared library (may request position-independent
-#			code, among other things).
-#	SHLIB_LD -	Base command to use for combining object files
-#			into a shared library.
-#	SHLIB_LD_LIBS -	Dependent libraries for the linker to scan when
-#			creating shared libraries.  This symbol typically
-#			goes at the end of the "ld" commands that build
-#			shared libraries. The value of the symbol is
-#			"${LIBS}" if all of the dependent libraries should
-#			be specified when creating a shared library.  If
-#			dependent libraries should not be specified (as on
-#			SunOS 4.x, where they cause the link to fail, or in
-#			general if Tcl and Tk aren't themselves shared
-#			libraries), then this symbol has an empty string
-#			as its value.
-#	SHLIB_SUFFIX -	Suffix to use for the names of dynamically loadable
-#			extensions.  An empty string means we don't know how
-#			to use shared libraries on this platform.
-#	TCL_LIB_FILE -	Name of the file that contains the Tcl library, such
-#			as libtcl7.8.so or libtcl7.8.a.
-#	TCL_LIB_SUFFIX -Specifies everything that comes after the "libtcl"
-#			in the shared library name, using the $VERSION variable
-#			to put the version in the right place.  This is used
-#			by platforms that need non-standard library names.
-#			Examples:  ${VERSION}.so.1.1 on NetBSD, since it needs
-#			to have a version after the .so, and ${VERSION}.a
-#			on AIX, since the Tcl shared library needs to have
-#			a .a extension whereas shared objects for loadable
-#			extensions have a .so extension.  Defaults to
-#			${VERSION}${SHLIB_SUFFIX}.
-#	TCL_NEEDS_EXP_FILE -
-#			1 means that an export file is needed to link to a
-#			shared library.
-#
-#	TCL_EXP_FILE -  The name of the installed export / import file which 
-#			should be used to link to the Tcl shared library.
-#			Empty if Tcl is unshared.
-#	TCL_BUILD_EXP_FILE -
-#			The name of the built export / import file which
-#			should be used to link to the Tcl shared library.
-#			Empty if Tcl is unshared.
-#--------------------------------------------------------------------
-
-# Step 1: set the variable "system" to hold the name and version number
-# for the system.  This can usually be done via the "uname" command, but
-# there are a few systems, like Next, where this doesn't work.
-
-AC_MSG_CHECKING([system version (for dynamic loading)])
-if test -f /usr/lib/NextStep/software_version; then
-    system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
-else
-    system=`uname -s`-`uname -r`
-    if test "$?" -ne 0 ; then
-	AC_MSG_RESULT([unknown (can't find uname command)])
-	system=unknown
-    else
-	# Special check for weird MP-RAS system (uname returns weird
-	# results, and the version is kept in special file).
-    
-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-	fi
-	if test "`uname -s`" = "AIX" ; then
-	    system=AIX-`uname -v`.`uname -r`
-	fi
-	AC_MSG_RESULT($system)
-    fi
-fi
-
-# Step 2: check for existence of -ldl library.  This is needed because
-# Linux can use either -ldl or -ldld for dynamic loading.
-
-AC_CHECK_LIB(dl, dlopen, have_dl=yes, have_dl=no)
-
-# Step 3: set configuration options based on system name and version.
-
-do64bit_ok=no
-fullSrcDir=`cd $srcdir; pwd`
-EXTRA_CFLAGS=""
-TCL_EXPORT_FILE_SUFFIX=""
-TCL_UNSHARED_LIB_SUFFIX=""
-TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
-ECHO_VERSION='`echo ${VERSION}`'
-TCL_LIB_VERSIONS_OK=ok
-CFLAGS_DEBUG=-g
-CFLAGS_OPTIMIZE=-O
-TCL_NEEDS_EXP_FILE=0
-TCL_BUILD_EXP_FILE=""
-TCL_EXP_FILE=""
-case $system in
-    AIX-4.[[2-9]])
-	SHLIB_CFLAGS=""
-	SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512 -bnoentry"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	TCL_NEEDS_EXP_FILE=1
-	TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
-	;;
-    AIX-*)
-	SHLIB_CFLAGS=""
-	SHLIB_LD="$fullSrcDir/ldAix /bin/ld -bhalt:4 -bM:SRE -bE:lib.exp -H512 -T512"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o tclLoadAix.o"
-	DL_LIBS="-lld"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	TCL_NEEDS_EXP_FILE=1
-	TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.exp'
-	;;
-    BSD/OS-2.1*|BSD/OS-3*)
-	SHLIB_CFLAGS=""
-	SHLIB_LD="shlicc -r"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    BSD/OS-4.*)
-	SHLIB_CFLAGS="-export-dynamic -fPIC"
-	SHLIB_LD="cc -shared"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS="-export-dynamic"
-	LD_SEARCH_FLAGS=""
-	;;
-    dgux*)
-	SHLIB_CFLAGS="-K PIC"
-	SHLIB_LD="cc -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*|HP-UX-*.11.*)
-	SHLIB_SUFFIX=".sl"
-	AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no)
-	if test "$tcl_ok" = yes; then
-	    SHLIB_CFLAGS="+z"
-	    SHLIB_LD="ld -b"
-	    SHLIB_LD_LIBS=""
-	    DL_OBJS="tclLoadShl.o"
-	    DL_LIBS="-ldld"
-	    LD_FLAGS="-Wl,-E"
-	    LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
-	fi
-	;;
-    IRIX-4.*)
-	SHLIB_CFLAGS="-G 0"
-	SHLIB_SUFFIX=".a"
-	SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
-	SHLIB_LD_LIBS='${LIBS}'
-	DL_OBJS="tclLoadAout.o"
-	DL_LIBS=""
-	LD_FLAGS="-Wl,-D,08000000"
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-	;;
-    IRIX-5.*|IRIX-6.*|IRIX64-6.5*)
-	SHLIB_CFLAGS=""
-	SHLIB_LD="ld -n32 -shared -rdata_shared"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-	if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
-	    EXTRA_CFLAGS="-mabi=n32"
-	    LD_FLAGS="-mabi=n32"
-	else
-	    case $system in
-		IRIX-6.3)
-		    # Use to build 6.2 compatible binaries on 6.3.
-		    EXTRA_CFLAGS="-n32 -D_OLD_TERMIOS"
-		    ;;
-		*)
-		    EXTRA_CFLAGS="-n32"
-		    ;;
-	    esac
-	    LD_FLAGS="-n32"
-	fi
-	;;
-    IRIX64-6.*)
-	SHLIB_CFLAGS=""
-	SHLIB_LD="ld -32 -shared -rdata_shared"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS=""
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-	;;
-    Linux*)
-	SHLIB_CFLAGS="-fPIC"
-	SHLIB_LD_LIBS="${LIBS}"
-	SHLIB_SUFFIX=".so"
-	if test "$have_dl" = yes; then
-	    SHLIB_LD="${CC} -shared"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    LD_FLAGS="-rdynamic"
-	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-	else
-	    AC_CHECK_HEADER(dld.h, [
-		SHLIB_LD="ld -shared"
-		DL_OBJS="tclLoadDld.o"
-		DL_LIBS="-ldld"
-		LD_FLAGS=""
-		LD_SEARCH_FLAGS=""])
-	fi
-	;;
-    MP-RAS-02*)
-	SHLIB_CFLAGS="-K PIC"
-	SHLIB_LD="cc -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    MP-RAS-*)
-	SHLIB_CFLAGS="-K PIC"
-	SHLIB_LD="cc -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS="-Wl,-Bexport"
-	LD_SEARCH_FLAGS=""
-	;;
-    NetBSD-*|FreeBSD-*|OpenBSD-*)
-	# Not available on all versions:  check for include file.
-	AC_CHECK_HEADER(dlfcn.h, [
-	    SHLIB_CFLAGS="-fpic"
-	    SHLIB_LD="ld -Bshareable -x"
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
-	    LD_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-	], [
-	    SHLIB_CFLAGS=""
-	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-	    SHLIB_LD_LIBS='${LIBS}'
-	    SHLIB_SUFFIX=".a"
-	    DL_OBJS="tclLoadAout.o"
-	    DL_LIBS=""
-	    LD_FLAGS=""
-	    LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-	])
-
-	# FreeBSD doesn't handle version numbers with dots.
-
-	TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-	TCL_LIB_VERSIONS_OK=nodots
-	;;
-    NEXTSTEP-*)
-	SHLIB_CFLAGS=""
-	SHLIB_LD="cc -nostdlib -r"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadNext.o"
-	DL_LIBS=""
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    OSF1-1.0|OSF1-1.1|OSF1-1.2)
-	# OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
-	SHLIB_CFLAGS=""
-	# Hack: make package name same as library name
-	SHLIB_LD='ld -R -export $@:'
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadOSF.o"
-	DL_LIBS=""
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    OSF1-1.*)
-	# OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
-	SHLIB_CFLAGS="-fpic"
-	SHLIB_LD="ld -shared"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS=""
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    OSF1-V*)
-        # Digital OSF/1
-	SHLIB_CFLAGS=""
-	SHLIB_LD='ld -shared -expect_unresolved "*"'
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS=""
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-	;;
-    RISCos-*)
-	SHLIB_CFLAGS="-G 0"
-	SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".a"
-	DL_OBJS="tclLoadAout.o"
-	DL_LIBS=""
-	LD_FLAGS="-Wl,-D,08000000"
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	;;
-    SCO_SV-3.2*)
-        # Note, dlopen is available only on SCO 3.2.5 and greater.  However,
-        # this test works, since "uname -s" was non-standard in 3.2.4 and
-        # below.
-	SHLIB_CFLAGS="-Kpic -belf"
-	SHLIB_LD="ld -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS=""
-	LD_FLAGS="-belf -Wl,-Bexport"
-	LD_SEARCH_FLAGS=""
-	;;
-     SINIX*5.4*)
-	SHLIB_CFLAGS="-K PIC"
-	SHLIB_LD="cc -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	;;
-    SunOS-4*)
-	SHLIB_CFLAGS="-PIC"
-	SHLIB_LD="ld"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-
-	# SunOS can't handle version numbers with dots in them in library
-	# specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
-	# requires an extra version number at the end of .so file names.
-	# So, the library has to have a name like libtcl75.so.1.0
-
-	TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-	TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-	TCL_LIB_VERSIONS_OK=nodots
-	;;
-    SunOS-5.[[0-6]]*)
-#    SunOS-5*)
-	SHLIB_CFLAGS="-KPIC"
-	SHLIB_LD="/usr/ccs/bin/ld -G -z text"
-
-	# Note: need the LIBS below, otherwise Tk won't find Tcl's
-	# symbols when dynamically loaded into tclsh.
-
-	SHLIB_LD_LIBS='${LIBS}'
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	LD_FLAGS=""
-	LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-	;;
-    SunOS-5*)
-	SHLIB_CFLAGS="-KPIC"
-	SHLIB_LD="/usr/ccs/bin/ld -G -z text"
-	LD_FLAGS=""
- 
-        do64bit_ok=no
-	if test "$do64bit" = "yes" ; then
-          arch=`isainfo`
-          if test "$arch" = "sparcv9 sparc" ; then
-	    if test "$CC" != "gcc" -a `$CC -v 2>&1 | grep -c gcc` = "0" ; then
-    	      do64bit_ok=yes
-              EXTRA_CFLAGS="-xarch=v9"
-              LD_FLAGS="-xarch=v9"
-	    else 
-	      AC_MSG_WARN("64bit mode not supported using GCC on $system")
-	    fi
-          else
-            AC_MSG_WARN("64bit mode only supported sparcv9 system")
-          fi
-	fi
-        
-        # Note: need the LIBS below, otherwise Tk won't find Tcl's
-        # symbols when dynamically loaded into tclsh.
-
-        SHLIB_LD_LIBS='${LIBS}'
-        SHLIB_SUFFIX=".so"
-        DL_OBJS="tclLoadDl.o"
-        DL_LIBS="-ldl"
-	if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
-	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-	else
-	    LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
-	fi
-        ;;
-    ULTRIX-4.*)
-	SHLIB_CFLAGS="-G 0"
-	SHLIB_SUFFIX=".a"
-	SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
-	SHLIB_LD_LIBS='${LIBS}'
-	DL_OBJS="tclLoadAout.o"
-	DL_LIBS=""
-	LD_FLAGS="-Wl,-D,08000000"
-	LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	;;
-    UNIX_SV* | UnixWare-5*)
-	SHLIB_CFLAGS="-KPIC"
-	SHLIB_LD="cc -G"
-	SHLIB_LD_LIBS=""
-	SHLIB_SUFFIX=".so"
-	DL_OBJS="tclLoadDl.o"
-	DL_LIBS="-ldl"
-	# Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
-	# that don't grok the -Bexport option.  Test that it does.
-	hold_ldflags=$LDFLAGS
-	AC_MSG_CHECKING(for ld accepts -Bexport flag)
-	LDFLAGS="${LDFLAGS} -Wl,-Bexport"
-	AC_TRY_LINK(, [int i;], found=yes, found=no)
-	LDFLAGS=$hold_ldflags
-	AC_MSG_RESULT($found)
-	if test $found = yes; then
-	  LD_FLAGS="-Wl,-Bexport"
-	else
-	  LD_FLAGS=""
-	fi
-	LD_SEARCH_FLAGS=""
-	;;
-esac
-
-if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then
-  AC_MSG_WARN("64bit support being disabled -- not supported on this platform")
-fi
-
-# Step 4: If pseudo-static linking is in use (see K. B. Kenny, "Dynamic
-# Loading for Tcl -- What Became of It?".  Proc. 2nd Tcl/Tk Workshop,
-# New Orleans, LA, Computerized Processes Unlimited, 1994), then we need
-# to determine which of several header files defines the a.out file
-# format (a.out.h, sys/exec.h, or sys/exec_aout.h).  At present, we
-# support only a file format that is more or less version-7-compatible. 
-# In particular,
-#	- a.out files must begin with `struct exec'.
-#	- the N_TXTOFF on the `struct exec' must compute the seek address
-#	  of the text segment
-#	- The `struct exec' must contain a_magic, a_text, a_data, a_bss
-#	  and a_entry fields.
-# The following compilation should succeed if and only if either sys/exec.h
-# or a.out.h is usable for the purpose.
-#
-# Note that the modified COFF format used on MIPS Ultrix 4.x is usable; the
-# `struct exec' includes a second header that contains information that
-# duplicates the v7 fields that are needed.
-
-if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
-    AC_MSG_CHECKING(sys/exec.h)
-    AC_TRY_COMPILE([#include <sys/exec.h>],[
-	struct exec foo;
-	unsigned long seek;
-	int flag;
-#if defined(__mips) || defined(mips)
-	seek = N_TXTOFF (foo.ex_f, foo.ex_o);
-#else
-	seek = N_TXTOFF (foo);
-#endif
-	flag = (foo.a_magic == OMAGIC);
-	return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
-], tcl_ok=usable, tcl_ok=unusable)
-    AC_MSG_RESULT($tcl_ok)
-    if test $tcl_ok = usable; then
-	AC_DEFINE(USE_SYS_EXEC_H)
-    else
-	AC_MSG_CHECKING(a.out.h)
-	AC_TRY_COMPILE([#include <a.out.h>],[
-	    struct exec foo;
-	    unsigned long seek;
-	    int flag;
-#if defined(__mips) || defined(mips)
-	    seek = N_TXTOFF (foo.ex_f, foo.ex_o);
-#else
-	    seek = N_TXTOFF (foo);
-#endif
-	    flag = (foo.a_magic == OMAGIC);
-	    return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
-	], tcl_ok=usable, tcl_ok=unusable)
-	AC_MSG_RESULT($tcl_ok)
-	if test $tcl_ok = usable; then
-	    AC_DEFINE(USE_A_OUT_H)
-	else
-	    AC_MSG_CHECKING(sys/exec_aout.h)
-	    AC_TRY_COMPILE([#include <sys/exec_aout.h>],[
-		struct exec foo;
-		unsigned long seek;
-		int flag;
-#if defined(__mips) || defined(mips)
-		seek = N_TXTOFF (foo.ex_f, foo.ex_o);
-#else
-		seek = N_TXTOFF (foo);
-#endif
-		flag = (foo.a_midmag == OMAGIC);
-		return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
-	    ], tcl_ok=usable, tcl_ok=unusable)
-	    AC_MSG_RESULT($tcl_ok)
-	    if test $tcl_ok = usable; then
-		AC_DEFINE(USE_SYS_EXEC_AOUT_H)
-	    else
-		DL_OBJS=""
-	    fi
-	fi
-    fi
-fi
-
-# Step 5: disable dynamic loading if requested via a command-line switch.
-
-AC_ARG_ENABLE(load, [  --disable-load          disallow dynamic loading and "load" command],
-    [tcl_ok=$enableval], [tcl_ok=yes])
-if test "$tcl_ok" = "no"; then
-    DL_OBJS=""
-fi
-
-if test "x$DL_OBJS" != "x" ; then
-    BUILD_DLTEST="\$(DLTEST_TARGETS)"
-else
-    echo "Can't figure out how to do dynamic loading or shared libraries"
-    echo "on this system."
-    SHLIB_CFLAGS=""
-    SHLIB_LD=""
-    SHLIB_SUFFIX=""
-    DL_OBJS="tclLoadNone.o"
-    DL_LIBS=""
-    LD_FLAGS=""
-    LD_SEARCH_FLAGS=""
-    BUILD_DLTEST=""
-fi
-
-# If we're running gcc, then change the C flags for compiling shared
-# libraries to the right flags for gcc, instead of those for the
-# standard manufacturer compiler.
-
-if test "$DL_OBJS" != "tclLoadNone.o" ; then
-    if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
-	case $system in
-	    AIX-*)
-		;;
-	    BSD/OS*)
-		;;
-	    IRIX*)
-		;;
-	    NetBSD-*|FreeBSD-*|OpenBSD-*)
-		;;
-	    RISCos-*)
-		;;
-	    ULTRIX-4.*)
-		;;
-	    *)
-		SHLIB_CFLAGS="-fPIC"
-		;;
-	esac
-    fi
-fi
-
-# Set the default compiler switches based on the --enable-symbols option 
-
-AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols],
-    [tcl_ok=$enableval], [tcl_ok=no])
-if test "$tcl_ok" = "yes"; then
-    CFLAGS='$(CFLAGS_DEBUG)'
-    TCL_DBGX=g
-else
-    CFLAGS='$(CFLAGS_OPTIMIZE)'
-    TCL_DBGX=""
-fi
-
-#--------------------------------------------------------------------
-#	The statements below check for systems where POSIX-style
-#	non-blocking I/O (O_NONBLOCK) doesn't work or is unimplemented. 
-#	On these systems (mostly older ones), use the old BSD-style
-#	FIONBIO approach instead.
-#--------------------------------------------------------------------
-
-AC_CHECK_HEADERS(sys/ioctl.h)
-AC_CHECK_HEADERS(sys/filio.h)
-AC_MSG_CHECKING([FIONBIO vs. O_NONBLOCK for nonblocking I/O])
-if test -f /usr/lib/NextStep/software_version; then
-    system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
-else
-    system=`uname -s`-`uname -r`
-    if test "$?" -ne 0 ; then
-	system=unknown
-    else
-	# Special check for weird MP-RAS system (uname returns weird
-	# results, and the version is kept in special file).
-    
-	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-	fi
-	if test "`uname -s`" = "AIX" ; then
-	    system=AIX-`uname -v`.`uname -r`
-	fi
-    fi
-fi
-case $system in
-    # There used to be code here to use FIONBIO under AIX.  However, it
-    # was reported that FIONBIO doesn't work under AIX 3.2.5.  Since
-    # using O_NONBLOCK seems fine under AIX 4.*, I removed the FIONBIO
-    # code (JO, 5/31/97).
-
-    OSF*)
-	AC_DEFINE(USE_FIONBIO)
-	AC_MSG_RESULT(FIONBIO)
-	;;
-    SunOS-4*)
-	AC_DEFINE(USE_FIONBIO)
-	AC_MSG_RESULT(FIONBIO)
-	;;
-    ULTRIX-4.*)
-	AC_DEFINE(USE_FIONBIO)
-	AC_MSG_RESULT(FIONBIO)
-	;;
-    *)
-	AC_MSG_RESULT(O_NONBLOCK)
-	;;
-esac
-
-#--------------------------------------------------------------------
-#	The statements below define a collection of symbols related to
-#	building libtcl as a shared library instead of a static library.
-#--------------------------------------------------------------------
-
-realRanlib=$RANLIB
-if test "$TCL_SHARED_LIB_SUFFIX" = "" ; then
-    TCL_SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
-fi
-if test "$TCL_UNSHARED_LIB_SUFFIX" = "" ; then
-    TCL_UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-fi
-AC_ARG_ENABLE(shared,
-    [  --enable-shared         build libtcl as a shared library (on by default)],
-    [tcl_ok=$enableval], [tcl_ok=yes])
-if test "$tcl_ok" = "yes" -a "${SHLIB_SUFFIX}" != "" ; then
-    TCL_SHARED_BUILD=1
-    TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-    TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
-    eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
-    if test "x$DL_OBJS" = "xtclLoadAout.o"; then
-	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
-    else
-	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-	RANLIB=":"
-    fi
-else
-    TCL_SHARED_BUILD=0
-    case $system in
-        BSD/OS*)
-	    ;;
-
-	AIX-*)
-            ;;
-
-        *)
-	    SHLIB_LD_LIBS=""
-	    ;;
-    esac
-    TCL_SHLIB_CFLAGS=""
-    TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
-    eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
-    MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
-fi
-
-# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
-# so that the backslashes quoting the DBX braces are dropped.
-
-# Trick to replace DBGX with TCL_DBGX
-DBGX='${TCL_DBGX}'
-eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
-
-# Note:  in the following variable, it's important to use the absolute
-# path name of the Tcl directory rather than "..":  this is because
-# AIX remembers this path and will attempt to use it at run-time to look
-# up the Tcl library.
-
-if test $TCL_SHARED_BUILD = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-        TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
-    else
-        TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
-    fi
-    TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
-    TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-else
-    TCL_BUILD_EXP_FILE="lib.exp"
-    eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-
-    # Replace DBGX with TCL_DBGX
-    eval "TCL_EXP_FILE=\"${TCL_EXP_FILE}\""
-    
-    TCL_BUILD_LIB_SPEC="-bI:`pwd`/${TCL_BUILD_EXP_FILE}"
-    TCL_LIB_SPEC="-bI:${exec_prefix}/lib/${TCL_EXP_FILE}"    
-fi
-VERSION='${VERSION}'
-eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
-eval "CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX}"
-VERSION=${TCL_VERSION}
-
-#--------------------------------------------------------------------
-#	The statements below define the symbol TCL_PACKAGE_PATH, which
-#	gives a list of directories that may contain packages.  The list
-#	consists of one directory for machine-dependent binaries and
-#	another for platform-independent scripts.
-#--------------------------------------------------------------------
-
-if test "$prefix" != "$exec_prefix"; then
-    TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-else
-    TCL_PACKAGE_PATH="${prefix}/lib"
-fi
-
-#--------------------------------------------------------------------
-#       The statements below define various symbols relating to Tcl
-#       stub support.
-#--------------------------------------------------------------------
-# Replace ${VERSION} with contents of ${TCL_VERSION}
-eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
-# Replace DBGX with TCL_DBGX
-eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
-
-MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
-
-TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
-
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-else
-    TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
-fi
-
-TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}"
-TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}"
-TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
-TCL_STUB_LIB_PATH="${exec_prefix}/lib/${TCL_STUB_LIB_FILE}"
-
-AC_SUBST(STUB_LIB_FILE)
-
-AC_SUBST(TCL_STUB_LIB_FILE)
-AC_SUBST(TCL_STUB_LIB_FLAG)
-AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
-AC_SUBST(TCL_STUB_LIB_SPEC)
-AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
-AC_SUBST(TCL_STUB_LIB_PATH)
-AC_SUBST(MAKE_STUB_LIB)
-
-AC_SUBST(BUILD_DLTEST)
-AC_SUBST(CFLAGS)
-AC_SUBST(CFLAGS_DEBUG)
-AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(CFLAGS_WARNING)
-AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
-AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
-AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
-AC_SUBST(TCL_DBGX)
-AC_SUBST(DL_LIBS)
-AC_SUBST(DL_OBJS)
-AC_SUBST(EXTRA_CFLAGS)
-AC_SUBST(LD_FLAGS)
-AC_SUBST(MAKE_LIB)
-AC_SUBST(MATH_LIBS)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_LD_LIBS)
-AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(TCL_BUILD_LIB_SPEC)
-AC_SUBST(TCL_LD_SEARCH_FLAGS)
-AC_SUBST(TCL_LIB_FILE)
-AC_SUBST(TCL_LIB_FLAG)
-AC_SUBST(TCL_NEEDS_EXP_FILE)
-AC_SUBST(TCL_BUILD_EXP_FILE)
-AC_SUBST(TCL_EXP_FILE)
-AC_SUBST(TCL_LIB_SPEC)
-AC_SUBST(TCL_LIB_VERSIONS_OK)
-AC_SUBST(TCL_MAJOR_VERSION)
-AC_SUBST(TCL_MINOR_VERSION)
-AC_SUBST(TCL_PACKAGE_PATH)
-AC_SUBST(TCL_PATCH_LEVEL)
-AC_SUBST(TCL_SHARED_LIB_SUFFIX)
-AC_SUBST(TCL_SHARED_BUILD)
-AC_SUBST(TCL_SHLIB_CFLAGS)
-AC_SUBST(TCL_SRC_DIR)
-AC_SUBST(TCL_UNSHARED_LIB_SUFFIX)
-AC_SUBST(TCL_VERSION)
-
-AC_OUTPUT(Makefile tclConfig.sh)
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
deleted file mode 100644
index 96b7cc0..0000000
--- a/unix/dltest/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# This Makefile is used to create several test cases for Tcl's load
-# command.  It also illustrates how to take advantage of configuration
-# exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.5 1999/04/16 00:48:06 stanton Exp $
-
-TCL_DBGX =		@TCL_DBGX@
-CC = @CC@
-LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @TCL_LIBS@
-AC_FLAGS =		@EXTRA_CFLAGS@
-SHLIB_CFLAGS =		@SHLIB_CFLAGS@
-SHLIB_LD =		@SHLIB_LD@
-SHLIB_SUFFIX =		@SHLIB_SUFFIX@
-SHLIB_VERSION =		@SHLIB_VERSION@
-SRC_DIR =		@srcdir@
-TCL_VERSION=		@TCL_VERSION@
-
-CFLAGS = -g
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
-	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
-
-all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX}
-
-pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c
-	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${LIBS}
-
-pkgb${SHLIB_SUFFIX}: $(SRC_DIR)/pkgb.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c
-	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${LIBS}
-
-pkgc${SHLIB_SUFFIX}: $(SRC_DIR)/pkgc.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
-	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${LIBS}
-
-pkgd${SHLIB_SUFFIX}: $(SRC_DIR)/pkgd.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
-	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${LIBS}
-
-pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c
-	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c
-	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${LIBS}
-
-clean:
-	rm -f *.o *${SHLIB_SUFFIX} config.cache config.log config.status lib.exp
-
-distclean: clean
-	rm -f Makefile
diff --git a/unix/dltest/README b/unix/dltest/README
deleted file mode 100644
index 7ba3f9f..0000000
--- a/unix/dltest/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains several files for testing Tcl's dynamic
-loading capabilities.  If this directory is present and the files
-in here have been compiled, then the "load" test will use the shared
-libraries present here to run a series of tests.  To compile the
-shared libraries, first type "./configure".  This will read
-configuration information created when Tcl was configured and
-create Makefile from Makefile.in.  Be sure that you have configured
-Tcl before configuring here, since information learned during Tcl's
-configure is needed here.  Then type "make" to create the shared
-libraries.
-
-RCS: @(#) $Id: README,v 1.2 1998/09/14 18:40:18 stanton Exp $
diff --git a/unix/dltest/configure.in b/unix/dltest/configure.in
deleted file mode 100644
index bd7b904..0000000
--- a/unix/dltest/configure.in
+++ /dev/null
@@ -1,33 +0,0 @@
-dnl	This file is an input file used by the GNU "autoconf" program to
-dnl	generate the file "configure", which is run to configure the
-dnl	Makefile in this directory.
-AC_INIT(pkga.c)
-# RCS: @(#) $Id: configure.in,v 1.5 1999/04/16 00:48:06 stanton Exp $
-
-# Recover information that Tcl computed with its configure script.
-
-. ../tclConfig.sh
-
-CC=$TCL_CC
-AC_SUBST(CC)
-SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
-AC_SUBST(SHLIB_CFLAGS)
-EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
-AC_SUBST(EXTRA_CFLAGS)
-SHLIB_LD=$TCL_SHLIB_LD
-AC_SUBST(SHLIB_LD)
-SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS
-AC_SUBST(SHLIB_LD_LIBS)
-SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
-AC_SUBST(SHLIB_SUFFIX)
-SHLIB_VERSION=$TCL_SHLIB_VERSION
-AC_SUBST(SHLIB_VERSION)
-AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
-TCL_LIBS=$TCL_LIBS
-AC_SUBST(TCL_LIBS)
-TCL_VERSION=$TCL_VERSION
-AC_SUBST(TCL_VERSION)
-TCL_DBGX=$TCL_DBGX
-AC_SUBST(TCL_DBGX)
-
-AC_OUTPUT(Makefile)
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
deleted file mode 100644
index 4cda651..0000000
--- a/unix/dltest/pkga.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* 
- * pkga.c --
- *
- *	This file contains a simple Tcl package "pkga" that is intended
- *	for testing the Tcl dynamic loading facilities.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkga.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
- */
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkga_EqCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkga_QuoteCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkga_EqCmd --
- *
- *	This procedure is invoked to process the "pkga_eq" Tcl command.
- *	It expects two arguments and returns 1 if they are the same,
- *	0 if they are different.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkga_EqCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" string1 string2\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    if (strcmp(argv[1], argv[2]) == 0) {
-	interp->result = "1";
-    } else {
-	interp->result = "0";
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkga_quoteCmd --
- *
- *	This procedure is invoked to process the "pkga_quote" Tcl command.
- *	It expects one argument, which it returns as result.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkga_QuoteCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" value\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    strcpy(interp->result, argv[1]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkga_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkga_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    int code;
-
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    code = Tcl_PkgProvide(interp, "Pkga", "1.0");
-    if (code != TCL_OK) {
-	return code;
-    }
-    Tcl_CreateCommand(interp, "pkga_eq", Pkga_EqCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "pkga_quote", Pkga_QuoteCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
deleted file mode 100644
index 5104e7c..0000000
--- a/unix/dltest/pkgb.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * pkgb.c --
- *
- *	This file contains a simple Tcl package "pkgb" that is intended
- *	for testing the Tcl dynamic loading facilities.  It can be used
- *	in both safe and unsafe interpreters.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkgb.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
- */
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkgb_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgb_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgb_SubCmd --
- *
- *	This procedure is invoked to process the "pkgb_sub" Tcl command.
- *	It expects two arguments and returns their difference.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgb_SubCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int first, second;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" num num\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if ((Tcl_GetInt(interp, argv[1], &first) != TCL_OK)
-	    || (Tcl_GetInt(interp, argv[2], &second) != TCL_OK)) {
-	return TCL_ERROR;
-    }
-    sprintf(interp->result, "%d", first - second);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgb_UnsafeCmd --
- *
- *	This procedure is invoked to process the "pkgb_unsafe" Tcl command.
- *	It just returns a constant string.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgb_UnsafeCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    interp->result = "unsafe command invoked";
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgb_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgb_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    int code;
-
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
-    if (code != TCL_OK) {
-	return code;
-    }
-    Tcl_CreateCommand(interp, "pkgb_sub", Pkgb_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "pkgb_unsafe", Pkgb_UnsafeCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgb_SafeInit --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an unsafe interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgb_SafeInit(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_CreateCommand(interp, "pkgb_sub", Pkgb_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
deleted file mode 100644
index 9aac361..0000000
--- a/unix/dltest/pkgc.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * pkgc.c --
- *
- *	This file contains a simple Tcl package "pkgc" that is intended
- *	for testing the Tcl dynamic loading facilities.  It can be used
- *	in both safe and unsafe interpreters.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkgc.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
- */
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkgc_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgc_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgc_SubCmd --
- *
- *	This procedure is invoked to process the "pkgc_sub" Tcl command.
- *	It expects two arguments and returns their difference.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgc_SubCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int first, second;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" num num\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if ((Tcl_GetInt(interp, argv[1], &first) != TCL_OK)
-	    || (Tcl_GetInt(interp, argv[2], &second) != TCL_OK)) {
-	return TCL_ERROR;
-    }
-    sprintf(interp->result, "%d", first - second);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgc_UnsafeCmd --
- *
- *	This procedure is invoked to process the "pkgc_unsafe" Tcl command.
- *	It just returns a constant string.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgc_UnsafeCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    interp->result = "unsafe command invoked";
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgc_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgc_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    int code;
-
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    code = Tcl_PkgProvide(interp, "Pkgc", "1.7.2");
-    if (code != TCL_OK) {
-	return code;
-    }
-    Tcl_CreateCommand(interp, "pkgc_sub", Pkgc_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "pkgc_unsafe", Pkgc_UnsafeCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgc_SafeInit --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an unsafe interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgc_SafeInit(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_CreateCommand(interp, "pkgc_sub", Pkgc_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
deleted file mode 100644
index 8780b47..0000000
--- a/unix/dltest/pkgd.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * pkgd.c --
- *
- *	This file contains a simple Tcl package "pkgd" that is intended
- *	for testing the Tcl dynamic loading facilities.  It can be used
- *	in both safe and unsafe interpreters.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkgd.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
- */
-
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkgd_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgd_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgd_SubCmd --
- *
- *	This procedure is invoked to process the "pkgd_sub" Tcl command.
- *	It expects two arguments and returns their difference.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgd_SubCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int first, second;
-
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" num num\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if ((Tcl_GetInt(interp, argv[1], &first) != TCL_OK)
-	    || (Tcl_GetInt(interp, argv[2], &second) != TCL_OK)) {
-	return TCL_ERROR;
-    }
-    sprintf(interp->result, "%d", first - second);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgd_UnsafeCmd --
- *
- *	This procedure is invoked to process the "pkgd_unsafe" Tcl command.
- *	It just returns a constant string.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-Pkgd_UnsafeCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    interp->result = "unsafe command invoked";
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgd_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgd_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    int code;
-
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    code = Tcl_PkgProvide(interp, "Pkgd", "7.3");
-    if (code != TCL_OK) {
-	return code;
-    }
-    Tcl_CreateCommand(interp, "pkgd_sub", Pkgd_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "pkgd_unsafe", Pkgd_UnsafeCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgd_SafeInit --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an unsafe interpreter.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgd_SafeInit(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    Tcl_CreateCommand(interp, "pkgd_sub", Pkgd_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
deleted file mode 100644
index 6c74366..0000000
--- a/unix/dltest/pkge.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 
- * pkge.c --
- *
- *	This file contains a simple Tcl package "pkge" that is intended
- *	for testing the Tcl dynamic loading facilities.  Its Init
- *	procedure returns an error in order to test how this is handled.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkge.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
- */
-
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkgd_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgd_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkge_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	Returns TCL_ERROR and leaves an error message in interp->result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkge_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    static char script[] = "if 44 {open non_existent}";
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    return Tcl_Eval(interp, script);
-}
diff --git a/unix/dltest/pkgf.c b/unix/dltest/pkgf.c
deleted file mode 100644
index fc7a936..0000000
--- a/unix/dltest/pkgf.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* 
- * pkgf.c --
- *
- *	This file contains a simple Tcl package "pkgf" that is intended
- *	for testing the Tcl dynamic loading facilities.  Its Init
- *	procedure returns an error in order to test how this is handled.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: pkgf.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
- */
-#include "tcl.h"
-
-/*
- * Prototypes for procedures defined later in this file:
- */
-
-static int	Pkgd_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgd_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Pkgf_Init --
- *
- *	This is a package initialization procedure, which is called
- *	by Tcl when this package is to be added to an interpreter.
- *
- * Results:
- *	Returns TCL_ERROR and leaves an error message in interp->result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Pkgf_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter in which the package is
-				 * to be made available. */
-{
-    static char script[] = "if 44 {open non_existent}";
-    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
-	return TCL_ERROR;
-    }
-    return Tcl_Eval(interp, script);
-}
diff --git a/unix/install-sh b/unix/install-sh
deleted file mode 100755
index 0ff4b6a..0000000
--- a/unix/install-sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5; it is not part of GNU.
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# 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}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    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;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-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`
-fi
-
-# Make a temp file name in the proper directory.
-
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-$doit $instcmd $src $dsttmp
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
-
-# Now rename the file to the real destination.
-
-$doit $rmcmd $dst
-$doit $mvcmd $dsttmp $dst
-
-
-exit 0
diff --git a/unix/ldAix b/unix/ldAix
deleted file mode 100755
index b554f9d..0000000
--- a/unix/ldAix
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# ldAix ldCmd ldArg ldArg ...
-#
-# This shell script provides a wrapper for ld under AIX in order to
-# create the .exp file required for linking.  Its arguments consist
-# of the name and arguments that would normally be provided to the
-# ld command.  This script extracts the names of the object files
-# from the argument list, creates a .exp file describing all of the
-# symbols exported by those files, and then invokes "ldCmd" to
-# perform the real link.
-#
-# RCS: @(#) $Id: ldAix,v 1.3 1999/03/10 05:52:52 stanton Exp $
-
-# Extract from the arguments the names of all of the object files.
-
-args=$*
-ofiles=""
-for i do
-    x=`echo $i | grep '[^.].o$'`
-    if test "$x" != ""; then
-	ofiles="$ofiles $i"
-    fi
-done
-
-# Extract the name of the object file that we're linking.
-outputFile=`echo $args | sed -e 's/.*-o \([^ ]*\).*/\1/'`
-
-# Create the export file from all of the object files, using nm followed
-# by sed editing.  Here are some tricky aspects of this:
-#
-# 1. Nm produces different output under AIX 4.1 than under AIX 3.2.5;
-#    the following statements handle both versions.
-# 2. Use the -g switch to nm instead of -e under 4.1 (this shows just
-#    externals, not statics;  -g isn't available under 3.2.5, though).
-# 3. Eliminate lines that end in ":": these are the names of object
-#    files (relevant in 4.1 only).
-# 4. Eliminate entries with the "U" key letter;  these are undefined
-#    symbols (relevant in 4.1 only).
-# 5. Eliminate lines that contain the string "0|extern" preceded by space;
-#    in 3.2.5, these are undefined symbols (address 0).
-# 6. Eliminate lines containing the "unamex" symbol.  In 3.2.5, these
-#    are also undefined symbols.
-# 7. If a line starts with ".", delete the leading ".", since this will
-#    just cause confusion later.
-# 8. Eliminate everything after the first field in a line, so that we're
-#    left with just the symbol name.
-
-nmopts="-g -C"
-osver=`uname -v`
-if test $osver -eq 3; then
-  nmopts="-e"
-fi
-rm -f lib.exp
-echo "#! $outputFile" >lib.exp
-/usr/ccs/bin/nm $nmopts -h $ofiles | sed -e '/:$/d' -e '/ U /d' -e '/[ 	]0|extern/d' -e '/unamex/d' -e 's/^\.//' -e 's/[ 	|].*//' | sort | uniq >>lib.exp
-
-# If we're linking a .a file, then link all the objects together into a 
-# single file "shr.o" and then put that into the archive.  Otherwise link 
-# the object files directly into the .a file.
-
-outputFile=`echo $args | sed -e 's/.*-o \([^ ]*\).*/\1/'`
-noDotA=`echo $outputFile | sed -e '/\.a$/d'`
-echo "noDotA=\"$noDotA\""
-if test "$noDotA" = "" ; then
-    linkArgs=`echo $args | sed -e 's/-o .*\.a /-o shr.o /'`
-    echo $linkArgs
-    eval $linkArgs
-    echo ar cr $outputFile shr.o
-    ar cr $outputFile shr.o
-    rm -f shr.o
-else
-    eval $args
-fi
diff --git a/unix/mkLinks b/unix/mkLinks
deleted file mode 100644
index 0a07ade..0000000
--- a/unix/mkLinks
+++ /dev/null
@@ -1,1254 +0,0 @@
-#!/bin/sh
-# This script is invoked when installing manual entries.  It generates
-# additional links to manual entries, corresponding to the procedure
-# and command names described by the manual entry.  For example, the
-# Tcl manual entry Hash.3 describes procedures Tcl_InitHashTable,
-# Tcl_CreateHashEntry, and many more.  This script will make hard
-# links so that Tcl_InitHashTable.3, Tcl_CreateHashEntry.3, and so
-# on all refer to Hash.3 in the installed directory.
-#
-# Because of the length of command and procedure names, this mechanism
-# only works on machines that support file names longer than 14 characters.
-# This script checks to see if long file names are supported, and it
-# doesn't make any links if they are not.
-#
-# The script takes one argument, which is the name of the directory
-# where the manual entries have been installed.
-
-if test $# != 1; then
-    echo "Usage: mkLinks dir"
-    exit 1
-fi
-
-cd $1
-echo foo > xyzzyTestingAVeryLongFileName.foo
-x=`echo xyzzyTe*`
-rm xyzzyTe*
-if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
-    exit
-fi
-if test -r safe.n; then
-    rm -f Base.n
-    ln safe.n Base.n
-fi
-if test -r http.n; then
-    rm -f Http.n
-    ln http.n Http.n
-fi
-if test -r safe.n; then
-    rm -f Safe\.n
-    ln safe.n Safe\.n
-fi
-if test -r AddErrInfo.3; then
-    rm -f Tcl_AddErrorInfo.3
-    ln AddErrInfo.3 Tcl_AddErrorInfo.3
-fi
-if test -r AddErrInfo.3; then
-    rm -f Tcl_AddObjErrorInfo.3
-    ln AddErrInfo.3 Tcl_AddObjErrorInfo.3
-fi
-if test -r Alloc.3; then
-    rm -f Tcl_Alloc.3
-    ln Alloc.3 Tcl_Alloc.3
-fi
-if test -r AllowExc.3; then
-    rm -f Tcl_AllowExceptions.3
-    ln AllowExc.3 Tcl_AllowExceptions.3
-fi
-if test -r AppInit.3; then
-    rm -f Tcl_AppInit.3
-    ln AppInit.3 Tcl_AppInit.3
-fi
-if test -r ObjectType.3; then
-    rm -f Tcl_AppendAllObjTypes.3
-    ln ObjectType.3 Tcl_AppendAllObjTypes.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_AppendElement.3
-    ln SetResult.3 Tcl_AppendElement.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_AppendObjToObj.3
-    ln StringObj.3 Tcl_AppendObjToObj.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_AppendResult.3
-    ln SetResult.3 Tcl_AppendResult.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_AppendStringsToObj.3
-    ln StringObj.3 Tcl_AppendStringsToObj.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_AppendToObj.3
-    ln StringObj.3 Tcl_AppendToObj.3
-fi
-if test -r Async.3; then
-    rm -f Tcl_AsyncCreate.3
-    ln Async.3 Tcl_AsyncCreate.3
-fi
-if test -r Async.3; then
-    rm -f Tcl_AsyncDelete.3
-    ln Async.3 Tcl_AsyncDelete.3
-fi
-if test -r Async.3; then
-    rm -f Tcl_AsyncInvoke.3
-    ln Async.3 Tcl_AsyncInvoke.3
-fi
-if test -r Async.3; then
-    rm -f Tcl_AsyncMark.3
-    ln Async.3 Tcl_AsyncMark.3
-fi
-if test -r BackgdErr.3; then
-    rm -f Tcl_BackgroundError.3
-    ln BackgdErr.3 Tcl_BackgroundError.3
-fi
-if test -r Backslash.3; then
-    rm -f Tcl_Backslash.3
-    ln Backslash.3 Tcl_Backslash.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_BadChannelOption.3
-    ln CrtChannel.3 Tcl_BadChannelOption.3
-fi
-if test -r CallDel.3; then
-    rm -f Tcl_CallWhenDeleted.3
-    ln CallDel.3 Tcl_CallWhenDeleted.3
-fi
-if test -r DoWhenIdle.3; then
-    rm -f Tcl_CancelIdleCall.3
-    ln DoWhenIdle.3 Tcl_CancelIdleCall.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Close.3
-    ln OpenFileChnl.3 Tcl_Close.3
-fi
-if test -r CmdCmplt.3; then
-    rm -f Tcl_CommandComplete.3
-    ln CmdCmplt.3 Tcl_CommandComplete.3
-fi
-if test -r Concat.3; then
-    rm -f Tcl_Concat.3
-    ln Concat.3 Tcl_Concat.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_ConcatObj.3
-    ln StringObj.3 Tcl_ConcatObj.3
-fi
-if test -r Thread.3; then
-    rm -f Tcl_ConditionNotify.3
-    ln Thread.3 Tcl_ConditionNotify.3
-fi
-if test -r Thread.3; then
-    rm -f Tcl_ConditionWait.3
-    ln Thread.3 Tcl_ConditionWait.3
-fi
-if test -r SplitList.3; then
-    rm -f Tcl_ConvertElement.3
-    ln SplitList.3 Tcl_ConvertElement.3
-fi
-if test -r ObjectType.3; then
-    rm -f Tcl_ConvertToType.3
-    ln ObjectType.3 Tcl_ConvertToType.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_CreateAlias.3
-    ln CrtSlave.3 Tcl_CreateAlias.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_CreateAliasObj.3
-    ln CrtSlave.3 Tcl_CreateAliasObj.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_CreateChannel.3
-    ln CrtChannel.3 Tcl_CreateChannel.3
-fi
-if test -r CrtChnlHdlr.3; then
-    rm -f Tcl_CreateChannelHandler.3
-    ln CrtChnlHdlr.3 Tcl_CreateChannelHandler.3
-fi
-if test -r CrtCloseHdlr.3; then
-    rm -f Tcl_CreateCloseHandler.3
-    ln CrtCloseHdlr.3 Tcl_CreateCloseHandler.3
-fi
-if test -r CrtCommand.3; then
-    rm -f Tcl_CreateCommand.3
-    ln CrtCommand.3 Tcl_CreateCommand.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_CreateEncoding.3
-    ln Encoding.3 Tcl_CreateEncoding.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_CreateEventSource.3
-    ln Notifier.3 Tcl_CreateEventSource.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_CreateExitHandler.3
-    ln Exit.3 Tcl_CreateExitHandler.3
-fi
-if test -r CrtFileHdlr.3; then
-    rm -f Tcl_CreateFileHandler.3
-    ln CrtFileHdlr.3 Tcl_CreateFileHandler.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_CreateHashEntry.3
-    ln Hash.3 Tcl_CreateHashEntry.3
-fi
-if test -r CrtInterp.3; then
-    rm -f Tcl_CreateInterp.3
-    ln CrtInterp.3 Tcl_CreateInterp.3
-fi
-if test -r CrtMathFnc.3; then
-    rm -f Tcl_CreateMathFunc.3
-    ln CrtMathFnc.3 Tcl_CreateMathFunc.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_CreateObjCommand.3
-    ln CrtObjCmd.3 Tcl_CreateObjCommand.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_CreateSlave.3
-    ln CrtSlave.3 Tcl_CreateSlave.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_CreateThreadExitHandler.3
-    ln Exit.3 Tcl_CreateThreadExitHandler.3
-fi
-if test -r CrtTimerHdlr.3; then
-    rm -f Tcl_CreateTimerHandler.3
-    ln CrtTimerHdlr.3 Tcl_CreateTimerHandler.3
-fi
-if test -r CrtTrace.3; then
-    rm -f Tcl_CreateTrace.3
-    ln CrtTrace.3 Tcl_CreateTrace.3
-fi
-if test -r CrtVersion.3; then
-    rm -f Tcl_GetVersion.3
-    ln CrtVersion.3 Tcl_GetVersion.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringAppend.3
-    ln DString.3 Tcl_DStringAppend.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringAppendElement.3
-    ln DString.3 Tcl_DStringAppendElement.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringEndSublist.3
-    ln DString.3 Tcl_DStringEndSublist.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringFree.3
-    ln DString.3 Tcl_DStringFree.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringGetResult.3
-    ln DString.3 Tcl_DStringGetResult.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringInit.3
-    ln DString.3 Tcl_DStringInit.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringLength.3
-    ln DString.3 Tcl_DStringLength.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringResult.3
-    ln DString.3 Tcl_DStringResult.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringSetLength.3
-    ln DString.3 Tcl_DStringSetLength.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringStartSublist.3
-    ln DString.3 Tcl_DStringStartSublist.3
-fi
-if test -r DString.3; then
-    rm -f Tcl_DStringValue.3
-    ln DString.3 Tcl_DStringValue.3
-fi
-if test -r Object.3; then
-    rm -f Tcl_DecrRefCount.3
-    ln Object.3 Tcl_DecrRefCount.3
-fi
-if test -r AssocData.3; then
-    rm -f Tcl_DeleteAssocData.3
-    ln AssocData.3 Tcl_DeleteAssocData.3
-fi
-if test -r CrtChnlHdlr.3; then
-    rm -f Tcl_DeleteChannelHandler.3
-    ln CrtChnlHdlr.3 Tcl_DeleteChannelHandler.3
-fi
-if test -r CrtCloseHdlr.3; then
-    rm -f Tcl_DeleteCloseHandler.3
-    ln CrtCloseHdlr.3 Tcl_DeleteCloseHandler.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_DeleteCommand.3
-    ln CrtObjCmd.3 Tcl_DeleteCommand.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_DeleteCommandFromToken.3
-    ln CrtObjCmd.3 Tcl_DeleteCommandFromToken.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_DeleteEventSource.3
-    ln Notifier.3 Tcl_DeleteEventSource.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_DeleteEvents.3
-    ln Notifier.3 Tcl_DeleteEvents.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_DeleteExitHandler.3
-    ln Exit.3 Tcl_DeleteExitHandler.3
-fi
-if test -r CrtFileHdlr.3; then
-    rm -f Tcl_DeleteFileHandler.3
-    ln CrtFileHdlr.3 Tcl_DeleteFileHandler.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_DeleteHashEntry.3
-    ln Hash.3 Tcl_DeleteHashEntry.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_DeleteHashTable.3
-    ln Hash.3 Tcl_DeleteHashTable.3
-fi
-if test -r CrtInterp.3; then
-    rm -f Tcl_DeleteInterp.3
-    ln CrtInterp.3 Tcl_DeleteInterp.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_DeleteThreadExitHandler.3
-    ln Exit.3 Tcl_DeleteThreadExitHandler.3
-fi
-if test -r CrtTimerHdlr.3; then
-    rm -f Tcl_DeleteTimerHandler.3
-    ln CrtTimerHdlr.3 Tcl_DeleteTimerHandler.3
-fi
-if test -r CrtTrace.3; then
-    rm -f Tcl_DeleteTrace.3
-    ln CrtTrace.3 Tcl_DeleteTrace.3
-fi
-if test -r DetachPids.3; then
-    rm -f Tcl_DetachPids.3
-    ln DetachPids.3 Tcl_DetachPids.3
-fi
-if test -r SaveResult.3; then
-    rm -f Tcl_DiscardResult.3
-    ln SaveResult.3 Tcl_DiscardResult.3
-fi
-if test -r DoOneEvent.3; then
-    rm -f Tcl_DoOneEvent.3
-    ln DoOneEvent.3 Tcl_DoOneEvent.3
-fi
-if test -r DoWhenIdle.3; then
-    rm -f Tcl_DoWhenIdle.3
-    ln DoWhenIdle.3 Tcl_DoWhenIdle.3
-fi
-if test -r CallDel.3; then
-    rm -f Tcl_DontCallWhenDeleted.3
-    ln CallDel.3 Tcl_DontCallWhenDeleted.3
-fi
-if test -r Object.3; then
-    rm -f Tcl_DuplicateObj.3
-    ln Object.3 Tcl_DuplicateObj.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Eof.3
-    ln OpenFileChnl.3 Tcl_Eof.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_Eval.3
-    ln Eval.3 Tcl_Eval.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_Eval2.3
-    ln Eval.3 Tcl_Eval2.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_EvalFile.3
-    ln Eval.3 Tcl_EvalFile.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_EvalObj.3
-    ln Eval.3 Tcl_EvalObj.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_EvalObjv.3
-    ln Eval.3 Tcl_EvalObjv.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_EvalTokens.3
-    ln ParseCmd.3 Tcl_EvalTokens.3
-fi
-if test -r Preserve.3; then
-    rm -f Tcl_EventuallyFree.3
-    ln Preserve.3 Tcl_EventuallyFree.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_Exit.3
-    ln Exit.3 Tcl_Exit.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_ExposeCommand.3
-    ln CrtSlave.3 Tcl_ExposeCommand.3
-fi
-if test -r ExprLong.3; then
-    rm -f Tcl_ExprBoolean.3
-    ln ExprLong.3 Tcl_ExprBoolean.3
-fi
-if test -r ExprLongObj.3; then
-    rm -f Tcl_ExprBooleanObj.3
-    ln ExprLongObj.3 Tcl_ExprBooleanObj.3
-fi
-if test -r ExprLong.3; then
-    rm -f Tcl_ExprDouble.3
-    ln ExprLong.3 Tcl_ExprDouble.3
-fi
-if test -r ExprLongObj.3; then
-    rm -f Tcl_ExprDoubleObj.3
-    ln ExprLongObj.3 Tcl_ExprDoubleObj.3
-fi
-if test -r ExprLong.3; then
-    rm -f Tcl_ExprLong.3
-    ln ExprLong.3 Tcl_ExprLong.3
-fi
-if test -r ExprLongObj.3; then
-    rm -f Tcl_ExprLongObj.3
-    ln ExprLongObj.3 Tcl_ExprLongObj.3
-fi
-if test -r ExprLongObj.3; then
-    rm -f Tcl_ExprObj.3
-    ln ExprLongObj.3 Tcl_ExprObj.3
-fi
-if test -r ExprLong.3; then
-    rm -f Tcl_ExprString.3
-    ln ExprLong.3 Tcl_ExprString.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_ExternalToUtf.3
-    ln Encoding.3 Tcl_ExternalToUtf.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_ExternalToUtfDString.3
-    ln Encoding.3 Tcl_ExternalToUtfDString.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_Finalize.3
-    ln Exit.3 Tcl_Finalize.3
-fi
-if test -r Exit.3; then
-    rm -f Tcl_FinalizeThread.3
-    ln Exit.3 Tcl_FinalizeThread.3
-fi
-if test -r FindExec.3; then
-    rm -f Tcl_FindExecutable.3
-    ln FindExec.3 Tcl_FindExecutable.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_FindHashEntry.3
-    ln Hash.3 Tcl_FindHashEntry.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_FirstHashEntry.3
-    ln Hash.3 Tcl_FirstHashEntry.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Flush.3
-    ln OpenFileChnl.3 Tcl_Flush.3
-fi
-if test -r Alloc.3; then
-    rm -f Tcl_Free.3
-    ln Alloc.3 Tcl_Free.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_FreeEncoding.3
-    ln Encoding.3 Tcl_FreeEncoding.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_FreeParse.3
-    ln ParseCmd.3 Tcl_FreeParse.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_GetAlias.3
-    ln CrtSlave.3 Tcl_GetAlias.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_GetAliasObj.3
-    ln CrtSlave.3 Tcl_GetAliasObj.3
-fi
-if test -r AssocData.3; then
-    rm -f Tcl_GetAssocData.3
-    ln AssocData.3 Tcl_GetAssocData.3
-fi
-if test -r GetInt.3; then
-    rm -f Tcl_GetBoolean.3
-    ln GetInt.3 Tcl_GetBoolean.3
-fi
-if test -r BoolObj.3; then
-    rm -f Tcl_GetBooleanFromObj.3
-    ln BoolObj.3 Tcl_GetBooleanFromObj.3
-fi
-if test -r ByteArrObj.3; then
-    rm -f Tcl_GetByteArrayFromObj.3
-    ln ByteArrObj.3 Tcl_GetByteArrayFromObj.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_GetChannel.3
-    ln OpenFileChnl.3 Tcl_GetChannel.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelBufferSize.3
-    ln CrtChannel.3 Tcl_GetChannelBufferSize.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelHandle.3
-    ln CrtChannel.3 Tcl_GetChannelHandle.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelInstanceData.3
-    ln CrtChannel.3 Tcl_GetChannelInstanceData.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelMode.3
-    ln CrtChannel.3 Tcl_GetChannelMode.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelName.3
-    ln CrtChannel.3 Tcl_GetChannelName.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_GetChannelOption.3
-    ln OpenFileChnl.3 Tcl_GetChannelOption.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_GetChannelType.3
-    ln CrtChannel.3 Tcl_GetChannelType.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_GetCommandInfo.3
-    ln CrtObjCmd.3 Tcl_GetCommandInfo.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_GetCommandName.3
-    ln CrtObjCmd.3 Tcl_GetCommandName.3
-fi
-if test -r GetInt.3; then
-    rm -f Tcl_GetDouble.3
-    ln GetInt.3 Tcl_GetDouble.3
-fi
-if test -r DoubleObj.3; then
-    rm -f Tcl_GetDoubleFromObj.3
-    ln DoubleObj.3 Tcl_GetDoubleFromObj.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_GetEncoding.3
-    ln Encoding.3 Tcl_GetEncoding.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_GetEncodingName.3
-    ln Encoding.3 Tcl_GetEncodingName.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_GetEncodingNames.3
-    ln Encoding.3 Tcl_GetEncodingNames.3
-fi
-if test -r SetErrno.3; then
-    rm -f Tcl_GetErrno.3
-    ln SetErrno.3 Tcl_GetErrno.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_GetHashKey.3
-    ln Hash.3 Tcl_GetHashKey.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_GetHashValue.3
-    ln Hash.3 Tcl_GetHashValue.3
-fi
-if test -r GetIndex.3; then
-    rm -f Tcl_GetIndexFromObj.3
-    ln GetIndex.3 Tcl_GetIndexFromObj.3
-fi
-if test -r GetInt.3; then
-    rm -f Tcl_GetInt.3
-    ln GetInt.3 Tcl_GetInt.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_GetIntFromObj.3
-    ln IntObj.3 Tcl_GetIntFromObj.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_GetInterpPath.3
-    ln CrtSlave.3 Tcl_GetInterpPath.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_GetLongFromObj.3
-    ln IntObj.3 Tcl_GetLongFromObj.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_GetMaster.3
-    ln CrtSlave.3 Tcl_GetMaster.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_GetObjResult.3
-    ln SetResult.3 Tcl_GetObjResult.3
-fi
-if test -r ObjectType.3; then
-    rm -f Tcl_GetObjType.3
-    ln ObjectType.3 Tcl_GetObjType.3
-fi
-if test -r GetOpnFl.3; then
-    rm -f Tcl_GetOpenFile.3
-    ln GetOpnFl.3 Tcl_GetOpenFile.3
-fi
-if test -r SplitPath.3; then
-    rm -f Tcl_GetPathType.3
-    ln SplitPath.3 Tcl_GetPathType.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_GetServiceMode.3
-    ln Notifier.3 Tcl_GetServiceMode.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_GetSlave.3
-    ln CrtSlave.3 Tcl_GetSlave.3
-fi
-if test -r GetStdChan.3; then
-    rm -f Tcl_GetStdChannel.3
-    ln GetStdChan.3 Tcl_GetStdChannel.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_GetString.3
-    ln StringObj.3 Tcl_GetString.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_GetStringFromObj.3
-    ln StringObj.3 Tcl_GetStringFromObj.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_GetStringResult.3
-    ln SetResult.3 Tcl_GetStringResult.3
-fi
-if test -r Thread.3; then
-    rm -f Tcl_GetThreadData.3
-    ln Thread.3 Tcl_GetThreadData.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_GetVar.3
-    ln SetVar.3 Tcl_GetVar.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_GetVar2.3
-    ln SetVar.3 Tcl_GetVar2.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_GetVar2Ex.3
-    ln SetVar.3 Tcl_GetVar2Ex.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Gets.3
-    ln OpenFileChnl.3 Tcl_Gets.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_GetsObj.3
-    ln OpenFileChnl.3 Tcl_GetsObj.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_GlobalEval.3
-    ln Eval.3 Tcl_GlobalEval.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_HashStats.3
-    ln Hash.3 Tcl_HashStats.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_HideCommand.3
-    ln CrtSlave.3 Tcl_HideCommand.3
-fi
-if test -r Object.3; then
-    rm -f Tcl_IncrRefCount.3
-    ln Object.3 Tcl_IncrRefCount.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_InitHashTable.3
-    ln Hash.3 Tcl_InitHashTable.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_InputBlocked.3
-    ln OpenFileChnl.3 Tcl_InputBlocked.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_InputBuffered.3
-    ln OpenFileChnl.3 Tcl_InputBuffered.3
-fi
-if test -r Interp.3; then
-    rm -f Tcl_Interp.3
-    ln Interp.3 Tcl_Interp.3
-fi
-if test -r CrtInterp.3; then
-    rm -f Tcl_InterpDeleted.3
-    ln CrtInterp.3 Tcl_InterpDeleted.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_IsSafe.3
-    ln CrtSlave.3 Tcl_IsSafe.3
-fi
-if test -r Object.3; then
-    rm -f Tcl_IsShared.3
-    ln Object.3 Tcl_IsShared.3
-fi
-if test -r SplitPath.3; then
-    rm -f Tcl_JoinPath.3
-    ln SplitPath.3 Tcl_JoinPath.3
-fi
-if test -r LinkVar.3; then
-    rm -f Tcl_LinkVar.3
-    ln LinkVar.3 Tcl_LinkVar.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjAppendElement.3
-    ln ListObj.3 Tcl_ListObjAppendElement.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjAppendList.3
-    ln ListObj.3 Tcl_ListObjAppendList.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjGetElements.3
-    ln ListObj.3 Tcl_ListObjGetElements.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjIndex.3
-    ln ListObj.3 Tcl_ListObjIndex.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjLength.3
-    ln ListObj.3 Tcl_ListObjLength.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_ListObjReplace.3
-    ln ListObj.3 Tcl_ListObjReplace.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_MakeFileChannel.3
-    ln OpenFileChnl.3 Tcl_MakeFileChannel.3
-fi
-if test -r CrtSlave.3; then
-    rm -f Tcl_MakeSafe.3
-    ln CrtSlave.3 Tcl_MakeSafe.3
-fi
-if test -r OpenTcp.3; then
-    rm -f Tcl_MakeTcpClientChannel.3
-    ln OpenTcp.3 Tcl_MakeTcpClientChannel.3
-fi
-if test -r SplitList.3; then
-    rm -f Tcl_Merge.3
-    ln SplitList.3 Tcl_Merge.3
-fi
-if test -r Thread.3; then
-    rm -f Tcl_MutexLock.3
-    ln Thread.3 Tcl_MutexLock.3
-fi
-if test -r Thread.3; then
-    rm -f Tcl_MutexUnlock.3
-    ln Thread.3 Tcl_MutexUnlock.3
-fi
-if test -r BoolObj.3; then
-    rm -f Tcl_NewBooleanObj.3
-    ln BoolObj.3 Tcl_NewBooleanObj.3
-fi
-if test -r ByteArrObj.3; then
-    rm -f Tcl_NewByteArrayObj.3
-    ln ByteArrObj.3 Tcl_NewByteArrayObj.3
-fi
-if test -r DoubleObj.3; then
-    rm -f Tcl_NewDoubleObj.3
-    ln DoubleObj.3 Tcl_NewDoubleObj.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_NewIntObj.3
-    ln IntObj.3 Tcl_NewIntObj.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_NewListObj.3
-    ln ListObj.3 Tcl_NewListObj.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_NewLongObj.3
-    ln IntObj.3 Tcl_NewLongObj.3
-fi
-if test -r Object.3; then
-    rm -f Tcl_NewObj.3
-    ln Object.3 Tcl_NewObj.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_NewStringObj.3
-    ln StringObj.3 Tcl_NewStringObj.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_NextHashEntry.3
-    ln Hash.3 Tcl_NextHashEntry.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_NotifyChannel.3
-    ln CrtChannel.3 Tcl_NotifyChannel.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_NumUtfChars.3
-    ln Utf.3 Tcl_NumUtfChars.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_ObjGetVar2.3
-    ln SetVar.3 Tcl_ObjGetVar2.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_ObjSetVar2.3
-    ln SetVar.3 Tcl_ObjSetVar2.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_OpenCommandChannel.3
-    ln OpenFileChnl.3 Tcl_OpenCommandChannel.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_OpenFileChannel.3
-    ln OpenFileChnl.3 Tcl_OpenFileChannel.3
-fi
-if test -r OpenTcp.3; then
-    rm -f Tcl_OpenTcpClient.3
-    ln OpenTcp.3 Tcl_OpenTcpClient.3
-fi
-if test -r OpenTcp.3; then
-    rm -f Tcl_OpenTcpServer.3
-    ln OpenTcp.3 Tcl_OpenTcpServer.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_ParseBraces.3
-    ln ParseCmd.3 Tcl_ParseBraces.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_ParseCommand.3
-    ln ParseCmd.3 Tcl_ParseCommand.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_ParseExpr.3
-    ln ParseCmd.3 Tcl_ParseExpr.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_ParseQuotedString.3
-    ln ParseCmd.3 Tcl_ParseQuotedString.3
-fi
-if test -r ParseCmd.3; then
-    rm -f Tcl_ParseVarName.3
-    ln ParseCmd.3 Tcl_ParseVarName.3
-fi
-if test -r PkgRequire.3; then
-    rm -f Tcl_PkgProvide.3
-    ln PkgRequire.3 Tcl_PkgProvide.3
-fi
-if test -r PkgRequire.3; then
-    rm -f Tcl_PkgRequire.3
-    ln PkgRequire.3 Tcl_PkgRequire.3
-fi
-if test -r AddErrInfo.3; then
-    rm -f Tcl_PosixError.3
-    ln AddErrInfo.3 Tcl_PosixError.3
-fi
-if test -r Preserve.3; then
-    rm -f Tcl_Preserve.3
-    ln Preserve.3 Tcl_Preserve.3
-fi
-if test -r PrintDbl.3; then
-    rm -f Tcl_PrintDouble.3
-    ln PrintDbl.3 Tcl_PrintDouble.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_QueueEvent.3
-    ln Notifier.3 Tcl_QueueEvent.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Read.3
-    ln OpenFileChnl.3 Tcl_Read.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_ReadChars.3
-    ln OpenFileChnl.3 Tcl_ReadChars.3
-fi
-if test -r Alloc.3; then
-    rm -f Tcl_Realloc.3
-    ln Alloc.3 Tcl_Realloc.3
-fi
-if test -r DetachPids.3; then
-    rm -f Tcl_ReapDetachedProcs.3
-    ln DetachPids.3 Tcl_ReapDetachedProcs.3
-fi
-if test -r RecordEval.3; then
-    rm -f Tcl_RecordAndEval.3
-    ln RecordEval.3 Tcl_RecordAndEval.3
-fi
-if test -r RecEvalObj.3; then
-    rm -f Tcl_RecordAndEvalObj.3
-    ln RecEvalObj.3 Tcl_RecordAndEvalObj.3
-fi
-if test -r RegExp.3; then
-    rm -f Tcl_RegExpCompile.3
-    ln RegExp.3 Tcl_RegExpCompile.3
-fi
-if test -r RegExp.3; then
-    rm -f Tcl_RegExpExec.3
-    ln RegExp.3 Tcl_RegExpExec.3
-fi
-if test -r RegExp.3; then
-    rm -f Tcl_RegExpMatch.3
-    ln RegExp.3 Tcl_RegExpMatch.3
-fi
-if test -r RegExp.3; then
-    rm -f Tcl_RegExpRange.3
-    ln RegExp.3 Tcl_RegExpRange.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_RegisterChannel.3
-    ln OpenFileChnl.3 Tcl_RegisterChannel.3
-fi
-if test -r ObjectType.3; then
-    rm -f Tcl_RegisterObjType.3
-    ln ObjectType.3 Tcl_RegisterObjType.3
-fi
-if test -r Preserve.3; then
-    rm -f Tcl_Release.3
-    ln Preserve.3 Tcl_Release.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_ResetResult.3
-    ln SetResult.3 Tcl_ResetResult.3
-fi
-if test -r SaveResult.3; then
-    rm -f Tcl_RestoreResult.3
-    ln SaveResult.3 Tcl_RestoreResult.3
-fi
-if test -r SaveResult.3; then
-    rm -f Tcl_SaveResult.3
-    ln SaveResult.3 Tcl_SaveResult.3
-fi
-if test -r SplitList.3; then
-    rm -f Tcl_ScanElement.3
-    ln SplitList.3 Tcl_ScanElement.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Seek.3
-    ln OpenFileChnl.3 Tcl_Seek.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_ServiceAll.3
-    ln Notifier.3 Tcl_ServiceAll.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_ServiceEvent.3
-    ln Notifier.3 Tcl_ServiceEvent.3
-fi
-if test -r AssocData.3; then
-    rm -f Tcl_SetAssocData.3
-    ln AssocData.3 Tcl_SetAssocData.3
-fi
-if test -r BoolObj.3; then
-    rm -f Tcl_SetBooleanObj.3
-    ln BoolObj.3 Tcl_SetBooleanObj.3
-fi
-if test -r ByteArrObj.3; then
-    rm -f Tcl_SetByteArrayLength.3
-    ln ByteArrObj.3 Tcl_SetByteArrayLength.3
-fi
-if test -r ByteArrObj.3; then
-    rm -f Tcl_SetByteArrayObj.3
-    ln ByteArrObj.3 Tcl_SetByteArrayObj.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_SetChannelBufferSize.3
-    ln CrtChannel.3 Tcl_SetChannelBufferSize.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_SetChannelOption.3
-    ln OpenFileChnl.3 Tcl_SetChannelOption.3
-fi
-if test -r CrtObjCmd.3; then
-    rm -f Tcl_SetCommandInfo.3
-    ln CrtObjCmd.3 Tcl_SetCommandInfo.3
-fi
-if test -r CrtChannel.3; then
-    rm -f Tcl_SetDefaultTranslation.3
-    ln CrtChannel.3 Tcl_SetDefaultTranslation.3
-fi
-if test -r DoubleObj.3; then
-    rm -f Tcl_SetDoubleObj.3
-    ln DoubleObj.3 Tcl_SetDoubleObj.3
-fi
-if test -r SetErrno.3; then
-    rm -f Tcl_SetErrno.3
-    ln SetErrno.3 Tcl_SetErrno.3
-fi
-if test -r AddErrInfo.3; then
-    rm -f Tcl_SetErrorCodeVA.3
-    ln AddErrInfo.3 Tcl_SetErrorCodeVA.3
-fi
-if test -r AddErrInfo.3; then
-    rm -f Tcl_SetErrorCode.3
-    ln AddErrInfo.3 Tcl_SetErrorCode.3
-fi
-if test -r Hash.3; then
-    rm -f Tcl_SetHashValue.3
-    ln Hash.3 Tcl_SetHashValue.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_SetIntObj.3
-    ln IntObj.3 Tcl_SetIntObj.3
-fi
-if test -r ListObj.3; then
-    rm -f Tcl_SetListObj.3
-    ln ListObj.3 Tcl_SetListObj.3
-fi
-if test -r IntObj.3; then
-    rm -f Tcl_SetLongObj.3
-    ln IntObj.3 Tcl_SetLongObj.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_SetMaxBlockTime.3
-    ln Notifier.3 Tcl_SetMaxBlockTime.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_SetObjLength.3
-    ln StringObj.3 Tcl_SetObjLength.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_SetObjResult.3
-    ln SetResult.3 Tcl_SetObjResult.3
-fi
-if test -r SetRecLmt.3; then
-    rm -f Tcl_SetRecursionLimit.3
-    ln SetRecLmt.3 Tcl_SetRecursionLimit.3
-fi
-if test -r SetResult.3; then
-    rm -f Tcl_SetResult.3
-    ln SetResult.3 Tcl_SetResult.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_SetServiceMode.3
-    ln Notifier.3 Tcl_SetServiceMode.3
-fi
-if test -r GetStdChan.3; then
-    rm -f Tcl_SetStdChannel.3
-    ln GetStdChan.3 Tcl_SetStdChannel.3
-fi
-if test -r StringObj.3; then
-    rm -f Tcl_SetStringObj.3
-    ln StringObj.3 Tcl_SetStringObj.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_SetSystemEncoding.3
-    ln Encoding.3 Tcl_SetSystemEncoding.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_SetTimer.3
-    ln Notifier.3 Tcl_SetTimer.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_SetVar.3
-    ln SetVar.3 Tcl_SetVar.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_SetVar2.3
-    ln SetVar.3 Tcl_SetVar2.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_SetVar2Ex.3
-    ln SetVar.3 Tcl_SetVar2Ex.3
-fi
-if test -r Sleep.3; then
-    rm -f Tcl_Sleep.3
-    ln Sleep.3 Tcl_Sleep.3
-fi
-if test -r SplitList.3; then
-    rm -f Tcl_SplitList.3
-    ln SplitList.3 Tcl_SplitList.3
-fi
-if test -r SplitPath.3; then
-    rm -f Tcl_SplitPath.3
-    ln SplitPath.3 Tcl_SplitPath.3
-fi
-if test -r StaticPkg.3; then
-    rm -f Tcl_StaticPackage.3
-    ln StaticPkg.3 Tcl_StaticPackage.3
-fi
-if test -r StrMatch.3; then
-    rm -f Tcl_StringMatch.3
-    ln StrMatch.3 Tcl_StringMatch.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Tell.3
-    ln OpenFileChnl.3 Tcl_Tell.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_TraceVar.3
-    ln TraceVar.3 Tcl_TraceVar.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_TraceVar2.3
-    ln TraceVar.3 Tcl_TraceVar2.3
-fi
-if test -r Translate.3; then
-    rm -f Tcl_TranslateFileName.3
-    ln Translate.3 Tcl_TranslateFileName.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UniChar.3
-    ln Utf.3 Tcl_UniChar.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UniCharAtIndex.3
-    ln Utf.3 Tcl_UniCharAtIndex.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UniCharToLower.3
-    ln ToUpper.3 Tcl_UniCharToLower.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UniCharToTitle.3
-    ln ToUpper.3 Tcl_UniCharToTitle.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UniCharToUpper.3
-    ln ToUpper.3 Tcl_UniCharToUpper.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UniCharToUtf.3
-    ln Utf.3 Tcl_UniCharToUtf.3
-fi
-if test -r LinkVar.3; then
-    rm -f Tcl_UnlinkVar.3
-    ln LinkVar.3 Tcl_UnlinkVar.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_UnregisterChannel.3
-    ln OpenFileChnl.3 Tcl_UnregisterChannel.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_UnsetVar.3
-    ln SetVar.3 Tcl_UnsetVar.3
-fi
-if test -r SetVar.3; then
-    rm -f Tcl_UnsetVar2.3
-    ln SetVar.3 Tcl_UnsetVar2.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_UntraceVar.3
-    ln TraceVar.3 Tcl_UntraceVar.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_UntraceVar2.3
-    ln TraceVar.3 Tcl_UntraceVar2.3
-fi
-if test -r UpVar.3; then
-    rm -f Tcl_UpVar.3
-    ln UpVar.3 Tcl_UpVar.3
-fi
-if test -r UpVar.3; then
-    rm -f Tcl_UpVar2.3
-    ln UpVar.3 Tcl_UpVar2.3
-fi
-if test -r LinkVar.3; then
-    rm -f Tcl_UpdateLinkedVar.3
-    ln LinkVar.3 Tcl_UpdateLinkedVar.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfAtIndex.3
-    ln Utf.3 Tcl_UtfAtIndex.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfBackslash.3
-    ln Utf.3 Tcl_UtfBackslash.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfCharComplete.3
-    ln Utf.3 Tcl_UtfCharComplete.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfFindFirst.3
-    ln Utf.3 Tcl_UtfFindFirst.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfFindLast.3
-    ln Utf.3 Tcl_UtfFindLast.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfNext.3
-    ln Utf.3 Tcl_UtfNext.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfPrev.3
-    ln Utf.3 Tcl_UtfPrev.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_UtfToExternal.3
-    ln Encoding.3 Tcl_UtfToExternal.3
-fi
-if test -r Encoding.3; then
-    rm -f Tcl_UtfToExternalDString.3
-    ln Encoding.3 Tcl_UtfToExternalDString.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UtfToLower.3
-    ln ToUpper.3 Tcl_UtfToLower.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UtfToTitle.3
-    ln ToUpper.3 Tcl_UtfToTitle.3
-fi
-if test -r Utf.3; then
-    rm -f Tcl_UtfToUniChar.3
-    ln Utf.3 Tcl_UtfToUniChar.3
-fi
-if test -r ToUpper.3; then
-    rm -f Tcl_UtfToUpper.3
-    ln ToUpper.3 Tcl_UtfToUpper.3
-fi
-if test -r Eval.3; then
-    rm -f Tcl_VarEval.3
-    ln Eval.3 Tcl_VarEval.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_VarTraceInfo.3
-    ln TraceVar.3 Tcl_VarTraceInfo.3
-fi
-if test -r TraceVar.3; then
-    rm -f Tcl_VarTraceInfo2.3
-    ln TraceVar.3 Tcl_VarTraceInfo2.3
-fi
-if test -r Notifier.3; then
-    rm -f Tcl_WaitForEvent.3
-    ln Notifier.3 Tcl_WaitForEvent.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_Write.3
-    ln OpenFileChnl.3 Tcl_Write.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_WriteChars.3
-    ln OpenFileChnl.3 Tcl_WriteChars.3
-fi
-if test -r OpenFileChnl.3; then
-    rm -f Tcl_WriteObj.3
-    ln OpenFileChnl.3 Tcl_WriteObj.3
-fi
-if test -r WrongNumArgs.3; then
-    rm -f Tcl_WrongNumArgs.3
-    ln WrongNumArgs.3 Tcl_WrongNumArgs.3
-fi
-if test -r pkgMkIndex.n; then
-    rm -f pkg_mkIndex.n
-    ln pkgMkIndex.n pkg_mkIndex.n
-fi
-exit 0
diff --git a/unix/mkLinks.tcl b/unix/mkLinks.tcl
deleted file mode 100644
index f9afcb2..0000000
--- a/unix/mkLinks.tcl
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# mkLinks.tcl -- 
-#	This generates the mkLinks script
-# \
-exec tclsh "$0" ${1+"$@"}
-
-puts stdout \
-{#!/bin/sh
-# This script is invoked when installing manual entries.  It generates
-# additional links to manual entries, corresponding to the procedure
-# and command names described by the manual entry.  For example, the
-# Tcl manual entry Hash.3 describes procedures Tcl_InitHashTable,
-# Tcl_CreateHashEntry, and many more.  This script will make hard
-# links so that Tcl_InitHashTable.3, Tcl_CreateHashEntry.3, and so
-# on all refer to Hash.3 in the installed directory.
-#
-# Because of the length of command and procedure names, this mechanism
-# only works on machines that support file names longer than 14 characters.
-# This script checks to see if long file names are supported, and it
-# doesn't make any links if they are not.
-#
-# The script takes one argument, which is the name of the directory
-# where the manual entries have been installed.
-
-if test $# != 1; then
-    echo "Usage: mkLinks dir"
-    exit 1
-fi
-
-cd $1
-echo foo > xyzzyTestingAVeryLongFileName.foo
-x=`echo xyzzyTe*`
-rm xyzzyTe*
-if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
-    exit
-fi
-}
-
-foreach file $argv {
-    set in [open $file]
-    set tail [file tail $file]
-    set ext [file extension $file]
-    set state begin
-    while {[gets $in line] >= 0} {
-	switch $state {
-	    begin {
-		if {[regexp "^.SH NAME" $line]} {
-		    set state name
-		}
-			    }
-					name {
-	    regsub {\\-.*} $line {} line
-	    foreach name [split $line ,] {
-		regsub -all { } $name "" name
-		if {[string compare $tail $name$ext] != 0} {
-		    puts "if test -r $tail; then"
-		    puts "    rm -f $name$ext"
-		    puts "    ln $tail $name$ext"
-		    puts "fi"
-		}
-	    }
-	    set state end
-	}
-	end {
-	    break
-	}
-	}
-    }
-    close $in
-}
-puts "exit 0"
diff --git a/unix/porting.notes b/unix/porting.notes
deleted file mode 100644
index 5376663..0000000
--- a/unix/porting.notes
+++ /dev/null
@@ -1,11 +0,0 @@
-RCS: @(#) $Id: porting.notes,v 1.3 1999/04/16 00:48:03 stanton Exp $
-
-This file used to contain a collection of notes that various people
-had provided about porting Tcl to various machines and operating
-systems.  This information is now available in the Tcl porting
-database at the following location:
-
-    http://www.scriptics.com/software/install.html#Database
-
-If you port Tcl or Tk to a new platform, you can share any information
-you might have by adding a new entry to this database.
diff --git a/unix/porting.old b/unix/porting.old
deleted file mode 100644
index d56c593..0000000
--- a/unix/porting.old
+++ /dev/null
@@ -1,384 +0,0 @@
-This is an old version of the file "porting.notes".  It contains
-porting information that people submitted for Tcl releases numbered
-7.3 and earlier.  You may find information in this file useful if
-there is no information available for your machine in the current
-version of "porting.notes".
-
-I don't have personal access to any of these machines, so I make
-no guarantees that the notes are correct, complete, or up-to-date.
-If you see the word "I" in any explanations, it refers to the person
-who contributed the information, not to me;  this means that I
-probably can't answer any questions about any of this stuff.  In
-some cases, a person has volunteered to act as a contact point for
-questions about porting Tcl to a particular machine;  in these
-cases the person's name and e-mail address are listed.
-
-sccsid = RCS: @(#) $Id: porting.old,v 1.2 1998/09/14 18:40:16 stanton Exp $
-
----------------------------------------------
-Cray machines running UNICOS:
-Contact: John Freeman (jlf@cray.com)
----------------------------------------------
-
-1. There is an error in the strstr function in UNICOS such that if the
-string to be searched is empty (""), the search will continue past the
-end of the string.  Because of this, the history substitution loop
-will sometimes run past the end of its target string and trash
-malloc's free list, resulting in a core dump some time later.  (As you
-can probably guess, this took a while to diagnose.)  I've submitted a
-problem report to the C library maintainers, but in the meantime here
-is a workaround.
-
------------------------------------------------------------------
-diff -c1 -r1.1 tclHistory.c
-*** 1.1	1991/11/12 16:01:58
---- tclHistory.c	1991/11/12 16:14:22
-***************
-*** 23,24 ****
---- 23,29 ----
-  #include "tclInt.h"
-+ 
-+ #ifdef _CRAY
-+ /* There is a bug in strstr in UNICOS; this works around it. */
-+ #define strstr(s1,s2) ((s1)?(*(s1)?strstr((s1),(s2)):0):0)
-+ #endif _CRAY
-
----------------------------------------------
-MIPS systems runing EP/IX:
----------------------------------------------
-
-1. Need to add a line "#include <bsd/sys/time.h>" in tclUnix.h.
-
-2. Need to add "-lbsd" into the line that makes tclTest:
-
-	${CC} ${CFLAGS} tclTest.o libtcl.a -lbsd -o tclTest
-
----------------------------------------------
-IBM RS/6000 systems running AIX:
----------------------------------------------
-
-1. The system version of strtoul is buggy, at least under some
-versions of AIX.  If the expression tests fail, try forcing Tcl
-to use its own version of strtoul instead of the system version.
-To do this, first copy strtoul.c from the compat subdirectory up
-to the main Tcl directory.  Then modify the Makefile so that
-the definition for COMPAT_OBJS includes "strtoul.o".  Note:  the
-"config" script should now detect the buggy strtoul and substitute
-Tcl's version automatically.
-
-2. You may have to comment out the declaration of open in tclUnix.h.
-
-3. You may need to add "-D_BSD -lbsd" to the CFLAGS definition.  This
-causes the system include files to look like BSD include files and
-causes C library routines to act like bsd library routines.  Without
-this, the system may choke on "struct wait".
-
----------------------------------------------
-AT&T 4.03 OS:
----------------------------------------------
-
-Machine: i386/33Mhz i387 32k Cache 16MByte 
-OS: AT&T SYSV Release 4 Version 3
-X: X11R5 fixlevel 9
-Xserver: X386 1.2
-
-1. Change the Tk Makefile as follows:
-XLIB            = -lX11
-	should be changed to:
-XLIB            = -lX11 -lsocket -lnsl
-
--------------------------------------------------------
-Silicon Graphics systems:
--------------------------------------------------------
-
-1. Change the CC variable in the Makefile to:
-
-CC =		cc -xansi -D__STDC__ -signed
-
-2. In  Irix releases 4.0.1 or earlier the C compiler has a buggy optimizer.
-   If Tcl fails its test suite or generates inexplicable errors,
-   compile tclVar.c with -O0 instead of -O.
-
-3. For IRIX 5.1 or later, comments 1 and 2 are no longer relevant,
-but you must add -D_BSD_SIGNALS to CFLAGS to get the proper signal
-routines.
-
-4. Add a "-lsun" switch in the targets for tclsh and tcltest,
-just before ${MATH_LIBS}.
-
-5. Rumor has it that you also need to add the "-lmalloc" library switch
-in the targets for tclsh and tcltest.
-
-6. In IRIX 5.2 you'll have to modify Makefile to fix the following problems:
-    - The "-c" option is illegal with this version of install, but
-      the "-F" switch is needed instead.  Change this in the "INSTALL ="
-      definition line.
-    - The order of file and directory have to be changed in all the
-      invocations of INSTALL_DATA or INSTALL_PROGRAM.
-
----------------------------------------------
-NeXT machines running NeXTStep 3.1:
----------------------------------------------
-
-1. Run configure with predefined CPP:
-	CPP='cc -E' ./configure
-   (If your shell is [t]csh, do a "setenv CPP 'cc -E' ")
-	
-2. Edit Makefile: 
-  -add tmpnam.o to COMPAT_OBJS:
-	COMPAT_OBJS =		 getcwd.o waitpid.o strtod.o tmpnam.o
-  -add the following to AC_FLAGS:
-	-Dstrtod=tcl_strtod 
-
-3. Edit compat/tmpnam.c and replace "/usr/tmp" with "/tmp"
-
-After this, tcl7.0 will be build fine on NeXT (ignore linker warning)
-and run all the tests. There are some formatting problems in printf() or
-scanf() which come from NeXT's lacking POSIX conformance. Ignore those
-errors, they don't matter much.
-
-4. Additional information that may apply to NeXTStep 3.2 only:
-
-    The problem on NEXTSTEP 3.2 is that the configure script makes some
-    bad assumptions about the uid_t and gid_t types.  Actually, the may
-    have been valid for NEXTSTEP 3.0, or it may be NEXTSTEP's rudimentary
-    attempt at POSIX support under 3.2, but no matter what the reason, the
-    configure script sets up the Makefile with CFLAGS '-Duid_t=int' and
-    '-Dgid_t=int', which are, unfortunately, incorrect, since they shoudl
-    actually be (I think) unsigned shorts.  This causes problems when the
-    'stat' structure is included, since it throws off the field offsets
-    from what the 'fstat' function thinks they should be.
-    
-    Anyway, the quick fix is to run configure and then edit the Makefile
-    to remove the uid_t and gid_t defines.  This will allow tcl and Tk to
-    compile and run.  There are some other problems on NEXTSTEP,
-    specifically with %g in the printf family of functions, but making the
-    uid_t and gid_t change will get it up and running.
-
----------------------------------------------
-NeXT machines running NeXTStep 3.2:
----------------------------------------------
-
-1. Run configure with predefined CPP:
-	CPP='cc -E' ./configure
-   (If your shell is [t]csh, do a "setenv CPP 'cc -E' ")
-	
-2. Edit Makefile: 
-  -add tmpnam.o to COMPAT_OBJS:
-	COMPAT_OBJS =		 getcwd.o waitpid.o strtod.o tmpnam.o
-  -add the following to AC_FLAGS:
-	-Dstrtod=tcl_strtod
-  -add '-m' to MATH_LIBS:
-        MATH_LIBS = -m -lm
-  -add '-O2 -arch m68k -arch i386' to CFLAGS:
-	CFLAGS = -O2 -arch m68k -arch i386 
-
--------------------------------------------------
-ISC 2.2 UNIX (using standard ATT SYSV compiler):
--------------------------------------------------
-
-In Makefile, change
-
-CFLAGS =      -g -I. -DTCL_LIBRARY=\"${TCL_LIBRARY}\"
-
-to
-
-CFLAGS =      -g -I. -DPOSIX_JC -DTCL_LIBRARY=\"${TCL_LIBRARY}\"
-
-This brings in the typedef for pid_t, which is needed for
-/usr/include/sys/wait.h in tclUnix.h.
-
----------------------------------------------
-DEC Alphas:
----------------------------------------------
-
-1. There appears to be a compiler/library bug that causes core-dumps
-unless you compile tclVar.c without optimization (remove the -O compiler
-switch).  The problem appears to have been fixed in the 1.3-4 version
-of the compiler.
-
----------------------------------------------
-CDC 4680MP, EP/IX 1.4.3:
----------------------------------------------
-
-The installation was done in the System V environment (-systype sysv)
-with the BSD extensions available (-I/usr/include/bsd and -lbsd).  It was
-built with the 2.20 level C compiler.  The 2.11 level should not be used
-because it has a problem with detecting NaN values in lines like:
-	if (x != x) ...
-which appear in the TCL code.
-
-To make the configure script find the BSD extensions, I set environment
-variable DEFS to "-I/usr/include/bsd" and LIBS to "-lbsd" before
-running it.  I would have also set CC to "cc2.20", but that compiler
-driver has a bug that loader errors (e.g. not finding a library routine,
-which the script uses to tell what is available) do not cause an error
-status to be returned to the shell (but see the comments about "-non_shared"
-below in the 2.1.1 notes).
-
-There is a bug in the <sys/wait.h> include file that mis-defines the
-structure fields and causes WIFEXITED and WIFSIGNALED to return incorrect
-values.  My solution was to create a subdirectory "sys" of the main TCL
-source directory and put a corrected wait.h in it.  The "-I." already on
-all the compile lines causes it to be used instead of the system version.
-To fix this, compare the structure definition in /usr/include/bsd/sys/wait.h
-with /bsd43/include/sys/wait.h (or mail to John Jackson, jrj@cc.purdue.edu,
-and he'll send you a context diff).
-
-After running configure, I made the following changes to Makefile:
-
-	1)  In AC_FLAGS, change:
-		-DNO_WAIT3=1
-	to
-		-DNO_WAIT3=0 -Dwait3=wait2
-	EP/IX (in the System V environment) provides a wait2() system
-	call with what TCL needs (the WNOHANG flag).  The extra parameter
-	TCL passes to what it thinks is wait3() (the resources used by
-	the child process) is always zero and will be safely ignored.
-
-	2)  Change:
-		CC=cc
-	to
-		CC=cc2.20
-	because of the NaN problem mentioned earlier.  Skip this if the
-	default compiler is already 2.20 (or later).
-
-	3)  Add "-lbsd" to the commands that create tclsh and tcltest
-	(look for "-o").
-
----------------------------------------------
-CDC 4680MP, EP/IX 2.1.1:
----------------------------------------------
-
-The installation was done in the System V environment (-systype sysv)
-with the BSD extensions available (-I/usr/include/bsd and -lbsd).  It was
-built with the 3.11 level C compiler.  The 2.11 level should not be used
-because it has a problem with detecting NaN values in lines like:
-	if (x != x) ...
-which appear in the TCL code.  The 2.20 compiler does not have this
-problem.
-
-To make the configure script find the BSD extensions, I set environment
-variable DEFS to:
-
-	"-I/usr/include/bsd -D__STDC__=0 -non_shared"
-
-and LIBS to:
-
-	"-lbsd"
-
-before running it.  The "-non_shared" is needed because with shared
-libraries, the compiler (actually, the loader) does not report an
-error for "missing" routines.  The configuration script depends on this
-error to know what routines are available.  This is the real problem
-I reported above for EP/IX 1.4.3 that I incorrectly attributed to a
-compiler driver bug.  I don't have 1.4.3 available any more, but it's
-possible using "-non_shared" on it would have solved the problem.
-
-The same <sys/wait.h> bug exists at 2.1.1 (yes, I have reported it to
-CDC), and the same fix as described in the 1.4.3 porting notes works.
-
-In addition to the three Makefile changes described in the 1.4.3 notes,
-you can remove the "-non_shared" flag from AC_FLAGS.  It is only needed
-for the configuration step, not the build.
-
-You will get duplicate definition compilation warnings of:
-
-	DBL_MIN
-	DBL_MAX
-	FLT_MIN
-	FLT_MAX
-
-during tclExpr.c.  These can be ignored.
-
-During expr.test, you will get a failure for one of the "fmod" tests
-unless you have CDC patch CC40038311 installed.
-
----------------------------------------------
-Convex systems, OS 10.1 and 10.2:
-Contact: Lennart Sorth (ls@dmi.min.dk)
----------------------------------------------
-
-1. tcl7.0b2 compiles on Convex systems (OS 10.1 and 10.2) by just running 
-  configure, typing make, except tclUnixUtil.c needs to be compiled
-  with option "-pcc" (portable cc, =!ANSI) due to:
-  cc: Error on line 1111 of tclUnixUtil.c: 'waitpid' redeclared:
-  incompatible types.
-
--------------------------------------------------
-Pyramid, OSx 5.1a (UCB universe, GCC installed):
--------------------------------------------------
-
-1. The procedures memcpy, strchr, fmod, and strrchr are all missing,
-so you'll need to provide substitutes for them.  After you do that
-everything should compile fine.  There will be one error in a scan
-test, but it's an obscure one because of a non-ANSI implementation
-of sscanf on the machine;  you can ignore it.
-
-2. You may also have to add "tmpnam.o" to COMPAT_OBJS in Makefile:
-the system version appears to be bad.
-
--------------------------------------------------
-Encore 91, UMAX V 3.0.9.3:
--------------------------------------------------
-
-1. Modify the CFLAGS assignment in file Makefile.in to include the 
--DENCORE flag in Makefile:
-
-	CFLAGS = -O -DENCORE
-
-2. "mkdir" does not by default create the parent directories.  The mkdir
-directives should be modified to "midir -p".
-
--------------------------------------------------
-Sequent machines running Dynix:
-Contact: Andrew Swan (aswan@soda.berkeley.edu)
--------------------------------------------------
-
-1. Use gcc instead of the cc distributed by Sequent
-
-2. The distributed math library does not include the fmod
-   function.  Source for fmod can be retrieved from a BSD
-   source archive (such as ftp.uu.net) and included in the
-   compat directory.  Add fmod.o to the COMPAT_OBJS variable
-   in the Makefile.  You may need to comment out references
-   to 'isnan' and 'finite' in fmod.c
-
-3. If the linker complains that there are two copies of the
-   'tanh' function, use the ar command to extract the objects
-   from the math library and build a new one without tanh.o
-
-4. The *scanf functions in the Sequent libraries are apparently
-   broken, which will cause the scanning tests to fail.  The
-   cases that fail are fairly obscure.  Using GNU libc apparently
-   solves this problem.
-
--------------------------------------------------
-Systems running Interactive 4.0:
--------------------------------------------------
-
-1. Add "-posix -D_SYSV3" to CFLAGS in Makefile (or Makefile.in).
-
--------------------------------------------------
-Systems running FreeBSD 1.1.5.1:
--------------------------------------------------
-
-The following changes comprise the entire porting effort of tcl7.3 to
-FreeBSD (i.e. these were the changes to tclTest.c) and should probably
-be made part of the tcl distribution. The changes only effect the way that
-floating point exceptions are reported. I've choosen to move the changes
-out of tclTest.c and into tclBasic.c.
-
-in tclBasic.c at top-of-file:
-
-#ifdef BSD_NET2
-#include <floatingpoint.h>
-#endif
-
-in tclBasic.c in Tcl_Init():
-
-#ifdef BSD_NET2
-    fpsetround(FP_RN);
-    fpsetmask(0L);
-#endif
-
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
deleted file mode 100644
index b37189e..0000000
--- a/unix/tclAppInit.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * tclAppInit.c --
- *
- *	Provides a default version of the main program and Tcl_AppInit
- *	procedure for Tcl applications (without Tk).
- *
- * Copyright (c) 1993 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclAppInit.c,v 1.5 1999/04/16 00:48:03 stanton Exp $
- */
-
-#ifdef TCL_XT_TEST
-#include <X11/Intrinsic.h>
-#endif
-
-#include "tcl.h"
-
-/*
- * The following variable is a special hack that is needed in order for
- * Sun shared libraries to be used for Tcl.
- */
-
-extern int matherr();
-int *tclDummyMathPtr = (int *) matherr;
-
-
-#ifdef TCL_TEST
-
-#include "tclInt.h"
-
-extern int		Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#ifdef TCL_THREADS
-extern int		TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif
-
-#endif /* TCL_TEST */
-
-#ifdef TCL_XT_TEST
-extern int		Tclxttest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	This is the main program for the application.
- *
- * Results:
- *	None: Tcl_Main never returns here, so this procedure never
- *	returns either.
- *
- * Side effects:
- *	Whatever the application does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-main(argc, argv)
-    int argc;			/* Number of command-line arguments. */
-    char **argv;		/* Values of command-line arguments. */
-{
-#ifdef TCL_TEST
-    /*
-     * Pass the build time location of the tcl library (to find init.tcl)
-     */
-    Tcl_Obj *path;
-    path = Tcl_NewStringObj(TCL_BUILDTIME_LIBRARY, -1);
-    TclSetLibraryPath(Tcl_NewListObj(1,&path));
-
-#endif
-
-#ifdef TCL_XT_TEST
-    XtToolkitInitialize();
-#endif
-
-    Tcl_Main(argc, argv, Tcl_AppInit);
-    return 0;			/* Needed only to prevent compiler warning. */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(interp)
-    Tcl_Interp *interp;		/* Interpreter for application. */
-{
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-#ifdef TCL_TEST
-#ifdef TCL_XT_TEST
-     if (Tclxttest_Init(interp) == TCL_ERROR) {
-	 return TCL_ERROR;
-     }
-#endif
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
-    if (TclObjTest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#ifdef TCL_THREADS
-    if (TclThread_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#endif
-    if (Procbodytest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init,
-            Procbodytest_SafeInit);
-#endif /* TCL_TEST */
-
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     */
-
-    /*
-     * Specify a user-specific startup file to invoke if the application
-     * is run interactively.  Typically the startup file is "~/.apprc"
-     * where "app" is the name of the application.  If this line is deleted
-     * then no user-specific startup file will be run under any conditions.
-     */
-
-    Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY);
-    return TCL_OK;
-}
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
deleted file mode 100644
index c412561..0000000
--- a/unix/tclConfig.sh.in
+++ /dev/null
@@ -1,162 +0,0 @@
-# tclConfig.sh --
-# 
-# This shell script (for sh) is generated automatically by Tcl's
-# configure script.  It will create shell variables for most of
-# the configuration options discovered by the configure script.
-# This script is intended to be included by the configure scripts
-# for Tcl extensions so that they don't have to figure this all
-# out for themselves.
-#
-# The information in this file is specific to a single platform.
-#
-# RCS: @(#) $Id: tclConfig.sh.in,v 1.10 1999/03/11 21:47:39 stanton Exp $
-
-# Tcl's version number.
-TCL_VERSION='@TCL_VERSION@'
-TCL_MAJOR_VERSION='@TCL_MAJOR_VERSION@'
-TCL_MINOR_VERSION='@TCL_MINOR_VERSION@'
-TCL_PATCH_LEVEL='@TCL_PATCH_LEVEL@'
-
-# C compiler to use for compilation.
-TCL_CC='@CC@'
-
-# -D flags for use with the C compiler.
-TCL_DEFS='@DEFS@'
-
-# If TCL was built with debugging symbols, generated libraries contain
-# this string at the end of the library name (before the extension).
-TCL_DBGX=@TCL_DBGX@
-
-# Default flags used in an optimized and debuggable build, respectively.
-TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
-TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
-
-# Flag, 1: we built a shared lib, 0 we didn't
-TCL_SHARED_BUILD=@TCL_SHARED_BUILD@
-
-# The name of the Tcl library (may be either a .a file or a shared library):
-TCL_LIB_FILE='@TCL_LIB_FILE@'
-
-# Flag to indicate whether shared libraries need export files.
-TCL_NEEDS_EXP_FILE=@TCL_NEEDS_EXP_FILE@
-
-# String that can be evaluated to generate the part of the export file
-# name that comes after the "libxxx" (includes version number, if any,
-# extension, and anything else needed).  May depend on the variables
-# VERSION.  On most UNIX systems this is ${VERSION}.exp.
-TCL_EXPORT_FILE_SUFFIX='@CFG_TCL_EXPORT_FILE_SUFFIX@'
-
-# Additional libraries to use when linking Tcl.
-TCL_LIBS='@DL_LIBS@ @LIBS@ @MATH_LIBS@'
-
-# Top-level directory in which Tcl's platform-independent files are
-# installed.
-TCL_PREFIX='@prefix@'
-
-# Top-level directory in which Tcl's platform-specific files (e.g.
-# executables) are installed.
-TCL_EXEC_PREFIX='@exec_prefix@'
-
-# Flags to pass to cc when compiling the components of a shared library:
-TCL_SHLIB_CFLAGS='@SHLIB_CFLAGS@'
-
-# Extra flags to pass to cc:
-TCL_EXTRA_CFLAGS='@EXTRA_CFLAGS@'
-
-# Base command to use for combining object files into a shared library:
-TCL_SHLIB_LD='@SHLIB_LD@'
-
-# Either '$LIBS' (if dependent libraries should be included when linking
-# shared libraries) or an empty string.  See Tcl's configure.in for more
-# explanation.
-TCL_SHLIB_LD_LIBS='@SHLIB_LD_LIBS@'
-
-# Suffix to use for the name of a shared library.
-TCL_SHLIB_SUFFIX='@SHLIB_SUFFIX@'
-
-# Library file(s) to include in tclsh and other base applications
-# in order to provide facilities needed by DLOBJ above.
-TCL_DL_LIBS='@DL_LIBS@'
-
-# Flags to pass to the compiler when linking object files into
-# an executable tclsh or tcltest binary.
-TCL_LD_FLAGS='@LD_FLAGS@'
-
-# Flags to pass to ld, such as "-R /usr/local/tcl/lib", that tell the
-# run-time dynamic linker where to look for shared libraries such as
-# libtcl.so.  Used when linking applications.  Only works if there
-# is a variable "LIB_RUNTIME_DIR" defined in the Makefile.
-TCL_LD_SEARCH_FLAGS='@TCL_LD_SEARCH_FLAGS@'
-
-# Additional object files linked with Tcl to provide compatibility
-# with standard facilities from ANSI C or POSIX.
-TCL_COMPAT_OBJS='@LIBOBJS@'
-
-# Name of the ranlib program to use.
-TCL_RANLIB='@RANLIB@'
-
-# -l flag to pass to the linker to pick up the Tcl library
-TCL_LIB_FLAG='@TCL_LIB_FLAG@'
-
-# String to pass to linker to pick up the Tcl library from its
-# build directory.
-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
-
-# String to pass to linker to pick up the Tcl library from its
-# installed directory.
-TCL_LIB_SPEC='@TCL_LIB_SPEC@'
-
-# Indicates whether a version numbers should be used in -l switches
-# ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
-# use switches like -ltcl75).  SunOS and FreeBSD require "nodots", for
-# example.
-TCL_LIB_VERSIONS_OK='@TCL_LIB_VERSIONS_OK@'
-
-# String that can be evaluated to generate the part of a shared library
-# name that comes after the "libxxx" (includes version number, if any,
-# extension, and anything else needed).  May depend on the variables
-# VERSION and SHLIB_SUFFIX.  On most UNIX systems this is
-# ${VERSION}${SHLIB_SUFFIX}.
-TCL_SHARED_LIB_SUFFIX='@CFG_TCL_SHARED_LIB_SUFFIX@'
-
-# String that can be evaluated to generate the part of an unshared library
-# name that comes after the "libxxx" (includes version number, if any,
-# extension, and anything else needed).  May depend on the variable
-# VERSION.  On most UNIX systems this is ${VERSION}.a.
-TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@'
-
-# Location of the top-level source directory from which Tcl was built.
-# This is the directory that contains a README file as well as
-# subdirectories such as generic, unix, etc.  If Tcl was compiled in a
-# different place than the directory containing the source files, this
-# points to the location of the sources, not the location where Tcl was
-# compiled.
-TCL_SRC_DIR='@TCL_SRC_DIR@'
-
-# List of standard directories in which to look for packages during
-# "package require" commands.  Contains the "prefix" directory plus also
-# the "exec_prefix" directory, if it is different.
-TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@'
-
-# Tcl supports stub.
-TCL_SUPPORTS_STUBS=1
-
-# The name of the Tcl stub library (.a):
-TCL_STUB_LIB_FILE='@TCL_STUB_LIB_FILE@'
-
-# -l flag to pass to the linker to pick up the Tcl stub library
-TCL_STUB_LIB_FLAG='@TCL_STUB_LIB_FLAG@'
-
-# String to pass to linker to pick up the Tcl stub library from its
-# build directory.
-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
-
-# String to pass to linker to pick up the Tcl stub library from its
-# installed directory.
-TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
-
-# Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
-
-# Path to the Tcl stub library in the install directory.
-TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
diff --git a/unix/tclLoadAix.c b/unix/tclLoadAix.c
deleted file mode 100644
index 8fe28a1..0000000
--- a/unix/tclLoadAix.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* 
- * tclLoadAix.c --
- *
- *	This file implements the dlopen and dlsym APIs under the
- *	AIX operating system, to enable the Tcl "load" command to
- *	work.  This code was provided by Jens-Uwe Mager.
- *
- *	This file is subject to the following copyright notice, which is
- *	different from the notice used elsewhere in Tcl.  The file has
- *	been modified to incorporate the file dlfcn.h in-line.
- *
- *	Copyright (c) 1992,1993,1995,1996, Jens-Uwe Mager, Helios Software GmbH
- *	Not derived from licensed software.
-
- *	Permission is granted to freely use, copy, modify, and redistribute
- *	this software, provided that the author is not construed to be liable
- *	for any results of using the software, alterations are clearly marked
- *	as such, and this notice is not modified.
- *
- * RCS: @(#) $Id: tclLoadAix.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- *
- * Note:  this file has been altered from the original in a few
- * ways in order to work properly with Tcl.
- */
-
-/*
- * @(#)dlfcn.c	1.7 revision of 95/08/14  19:08:38
- * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
- * 30159 Hannover, Germany
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ldr.h>
-#include <a.out.h>
-#include <ldfcn.h>
-#include "../compat/dlfcn.h"
-
-/*
- * We simulate dlopen() et al. through a call to load. Because AIX has
- * no call to find an exported symbol we read the loader section of the
- * loaded module and build a list of exported symbols and their virtual
- * address.
- */
-
-typedef struct {
-	char		*name;		/* the symbols's name */
-	void		*addr;		/* its relocated virtual address */
-} Export, *ExportPtr;
-
-/*
- * xlC uses the following structure to list its constructors and
- * destructors. This is gleaned from the output of munch.
- */
-typedef struct {
-	void (*init)(void);		/* call static constructors */
-	void (*term)(void);		/* call static destructors */
-} Cdtor, *CdtorPtr;
-
-/*
- * The void * handle returned from dlopen is actually a ModulePtr.
- */
-typedef struct Module {
-	struct Module	*next;
-	char		*name;		/* module name for refcounting */
-	int		refCnt;		/* the number of references */
-	void		*entry;		/* entry point from load */
-	struct dl_info	*info;		/* optional init/terminate functions */
-	CdtorPtr	cdtors;		/* optional C++ constructors */
-	int		nExports;	/* the number of exports found */
-	ExportPtr	exports;	/* the array of exports */
-} Module, *ModulePtr;
-
-/*
- * We keep a list of all loaded modules to be able to call the fini
- * handlers and destructors at atexit() time.
- */
-static ModulePtr modList;
-
-/*
- * The last error from one of the dl* routines is kept in static
- * variables here. Each error is returned only once to the caller.
- */
-static char errbuf[BUFSIZ];
-static int errvalid;
-
-static void caterr(char *);
-static int readExports(ModulePtr);
-static void terminate(void);
-static void *findMain(void);
-
-VOID *dlopen(const char *path, int mode)
-{
-	register ModulePtr mp;
-	static void *mainModule;
-
-	/*
-	 * Upon the first call register a terminate handler that will
-	 * close all libraries. Also get a reference to the main module
-	 * for use with loadbind.
-	 */
-	if (!mainModule) {
-		if ((mainModule = findMain()) == NULL)
-			return NULL;
-		atexit(terminate);
-	}
-	/*
-	 * Scan the list of modules if we have the module already loaded.
-	 */
-	for (mp = modList; mp; mp = mp->next)
-		if (strcmp(mp->name, path) == 0) {
-			mp->refCnt++;
-			return (VOID *) mp;
-		}
-	if ((mp = (ModulePtr)calloc(1, sizeof(*mp))) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "calloc: ");
-		strcat(errbuf, strerror(errno));
-		return (VOID *) NULL;
-	}
-	mp->name = malloc((unsigned) (strlen(path) + 1));
-	strcpy(mp->name, path);
-	/*
-	 * load should be declared load(const char *...). Thus we
-	 * cast the path to a normal char *. Ugly.
-	 */
-	if ((mp->entry = (void *)load((char *)path, L_NOAUTODEFER, NULL)) == NULL) {
-		free(mp->name);
-		free(mp);
-		errvalid++;
-		strcpy(errbuf, "dlopen: ");
-		strcat(errbuf, path);
-		strcat(errbuf, ": ");
-		/*
-		 * If AIX says the file is not executable, the error
-		 * can be further described by querying the loader about
-		 * the last error.
-		 */
-		if (errno == ENOEXEC) {
-			char *tmp[BUFSIZ/sizeof(char *)];
-			if (loadquery(L_GETMESSAGES, tmp, sizeof(tmp)) == -1)
-				strcpy(errbuf, strerror(errno));
-			else {
-				char **p;
-				for (p = tmp; *p; p++)
-					caterr(*p);
-			}
-		} else
-			strcat(errbuf, strerror(errno));
-		return (VOID *) NULL;
-	}
-	mp->refCnt = 1;
-	mp->next = modList;
-	modList = mp;
-	if (loadbind(0, mainModule, mp->entry) == -1) {
-		dlclose(mp);
-		errvalid++;
-		strcpy(errbuf, "loadbind: ");
-		strcat(errbuf, strerror(errno));
-		return (VOID *) NULL;
-	}
-	/*
-	 * If the user wants global binding, loadbind against all other
-	 * loaded modules.
-	 */
-	if (mode & RTLD_GLOBAL) {
-		register ModulePtr mp1;
-		for (mp1 = mp->next; mp1; mp1 = mp1->next)
-			if (loadbind(0, mp1->entry, mp->entry) == -1) {
-				dlclose(mp);
-				errvalid++;
-				strcpy(errbuf, "loadbind: ");
-				strcat(errbuf, strerror(errno));
-				return (VOID *) NULL;
-			}
-	}
-	if (readExports(mp) == -1) {
-		dlclose(mp);
-		return (VOID *) NULL;
-	}
-	/*
-	 * If there is a dl_info structure, call the init function.
-	 */
-	if (mp->info = (struct dl_info *)dlsym(mp, "dl_info")) {
-		if (mp->info->init)
-			(*mp->info->init)();
-	} else
-		errvalid = 0;
-	/*
-	 * If the shared object was compiled using xlC we will need
-	 * to call static constructors (and later on dlclose destructors).
-	 */
-	if (mp->cdtors = (CdtorPtr)dlsym(mp, "__cdtors")) {
-		while (mp->cdtors->init) {
-			(*mp->cdtors->init)();
-			mp->cdtors++;
-		}
-	} else
-		errvalid = 0;
-	return (VOID *) mp;
-}
-
-/*
- * Attempt to decipher an AIX loader error message and append it
- * to our static error message buffer.
- */
-static void caterr(char *s)
-{
-	register char *p = s;
-
-	while (*p >= '0' && *p <= '9')
-		p++;
-	switch(atoi(s)) {		/* INTL: "C", UTF safe. */
-	case L_ERROR_TOOMANY:
-		strcat(errbuf, "to many errors");
-		break;
-	case L_ERROR_NOLIB:
-		strcat(errbuf, "can't load library");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_UNDEF:
-		strcat(errbuf, "can't find symbol");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_RLDBAD:
-		strcat(errbuf, "bad RLD");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_FORMAT:
-		strcat(errbuf, "bad exec format in");
-		strcat(errbuf, p);
-		break;
-	case L_ERROR_ERRNO:
-		strcat(errbuf, strerror(atoi(++p)));	/* INTL: "C", UTF safe. */
-		break;
-	default:
-		strcat(errbuf, s);
-		break;
-	}
-}
-
-VOID *dlsym(void *handle, const char *symbol)
-{
-	register ModulePtr mp = (ModulePtr)handle;
-	register ExportPtr ep;
-	register int i;
-
-	/*
-	 * Could speed up the search, but I assume that one assigns
-	 * the result to function pointers anyways.
-	 */
-	for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-		if (strcmp(ep->name, symbol) == 0)
-			return ep->addr;
-	errvalid++;
-	strcpy(errbuf, "dlsym: undefined symbol ");
-	strcat(errbuf, symbol);
-	return NULL;
-}
-
-char *dlerror(void)
-{
-	if (errvalid) {
-		errvalid = 0;
-		return errbuf;
-	}
-	return NULL;
-}
-
-int dlclose(void *handle)
-{
-	register ModulePtr mp = (ModulePtr)handle;
-	int result;
-	register ModulePtr mp1;
-
-	if (--mp->refCnt > 0)
-		return 0;
-	if (mp->info && mp->info->fini)
-		(*mp->info->fini)();
-	if (mp->cdtors)
-		while (mp->cdtors->term) {
-			(*mp->cdtors->term)();
-			mp->cdtors++;
-		}
-	result = unload(mp->entry);
-	if (result == -1) {
-		errvalid++;
-		strcpy(errbuf, strerror(errno));
-	}
-	if (mp->exports) {
-		register ExportPtr ep;
-		register int i;
-		for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-			if (ep->name)
-				free(ep->name);
-		free(mp->exports);
-	}
-	if (mp == modList)
-		modList = mp->next;
-	else {
-		for (mp1 = modList; mp1; mp1 = mp1->next)
-			if (mp1->next == mp) {
-				mp1->next = mp->next;
-				break;
-			}
-	}
-	free(mp->name);
-	free(mp);
-	return result;
-}
-
-static void terminate(void)
-{
-	while (modList)
-		dlclose(modList);
-}
-
-/*
- * Build the export table from the XCOFF .loader section.
- */
-static int readExports(ModulePtr mp)
-{
-	LDFILE *ldp = NULL;
-	SCNHDR sh, shdata;
-	LDHDR *lhp;
-	char *ldbuf;
-	LDSYM *ls;
-	int i;
-	ExportPtr ep;
-
-	if ((ldp = ldopen(mp->name, ldp)) == NULL) {
-		struct ld_info *lp;
-		char *buf;
-		int size = 4*1024;
-		if (errno != ENOENT) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-		/*
-		 * The module might be loaded due to the LIBPATH
-		 * environment variable. Search for the loaded
-		 * module using L_GETINFO.
-		 */
-		if ((buf = malloc(size)) == NULL) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-		while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-			free(buf);
-			size += 4*1024;
-			if ((buf = malloc(size)) == NULL) {
-				errvalid++;
-				strcpy(errbuf, "readExports: ");
-				strcat(errbuf, strerror(errno));
-				return -1;
-			}
-		}
-		if (i == -1) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			free(buf);
-			return -1;
-		}
-		/*
-		 * Traverse the list of loaded modules. The entry point
-		 * returned by load() does actually point to the data
-		 * segment origin.
-		 */
-		lp = (struct ld_info *)buf;
-		while (lp) {
-			if (lp->ldinfo_dataorg == mp->entry) {
-				ldp = ldopen(lp->ldinfo_filename, ldp);
-				break;
-			}
-			if (lp->ldinfo_next == 0)
-				lp = NULL;
-			else
-				lp = (struct ld_info *)((char *)lp + lp->ldinfo_next);
-		}
-		free(buf);
-		if (!ldp) {
-			errvalid++;
-			strcpy(errbuf, "readExports: ");
-			strcat(errbuf, strerror(errno));
-			return -1;
-		}
-	}
-	if (TYPE(ldp) != U802TOCMAGIC) {
-		errvalid++;
-		strcpy(errbuf, "readExports: bad magic");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * Get the padding for the data section. This is needed for
-	 * AIX 4.1 compilers. This is used when building the final
-	 * function pointer to the exported symbol.
-	 */
-	if (ldnshread(ldp, _DATA, &shdata) != SUCCESS) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read data section header");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (ldnshread(ldp, _LOADER, &sh) != SUCCESS) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read loader section header");
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * We read the complete loader section in one chunk, this makes
-	 * finding long symbol names residing in the string table easier.
-	 */
-	if ((ldbuf = (char *)malloc(sh.s_size)) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "readExports: ");
-		strcat(errbuf, strerror(errno));
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (FSEEK(ldp, sh.s_scnptr, BEGINNING) != OKFSEEK) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot seek to loader section");
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	if (FREAD(ldbuf, sh.s_size, 1, ldp) != 1) {
-		errvalid++;
-		strcpy(errbuf, "readExports: cannot read loader section");
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	lhp = (LDHDR *)ldbuf;
-	ls = (LDSYM *)(ldbuf+LDHDRSZ);
-	/*
-	 * Count the number of exports to include in our export table.
-	 */
-	for (i = lhp->l_nsyms; i; i--, ls++) {
-		if (!LDR_EXPORT(*ls))
-			continue;
-		mp->nExports++;
-	}
-	if ((mp->exports = (ExportPtr)calloc(mp->nExports, sizeof(*mp->exports))) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "readExports: ");
-		strcat(errbuf, strerror(errno));
-		free(ldbuf);
-		while(ldclose(ldp) == FAILURE)
-			;
-		return -1;
-	}
-	/*
-	 * Fill in the export table. All entries are relative to
-	 * the entry point we got from load.
-	 */
-	ep = mp->exports;
-	ls = (LDSYM *)(ldbuf+LDHDRSZ);
-	for (i = lhp->l_nsyms; i; i--, ls++) {
-		char *symname;
-		char tmpsym[SYMNMLEN+1];
-		if (!LDR_EXPORT(*ls))
-			continue;
-		if (ls->l_zeroes == 0)
-			symname = ls->l_offset+lhp->l_stoff+ldbuf;
-		else {
-			/*
-			 * The l_name member is not zero terminated, we
-			 * must copy the first SYMNMLEN chars and make
-			 * sure we have a zero byte at the end.
-			 */
-			strncpy(tmpsym, ls->l_name, SYMNMLEN);
-			tmpsym[SYMNMLEN] = '\0';
-			symname = tmpsym;
-		}
-		ep->name = malloc((unsigned) (strlen(symname) + 1));
-		strcpy(ep->name, symname);
-		ep->addr = (void *)((unsigned long)mp->entry +
-					ls->l_value - shdata.s_vaddr);
-		ep++;
-	}
-	free(ldbuf);
-	while(ldclose(ldp) == FAILURE)
-		;
-	return 0;
-}
-
-/*
- * Find the main modules entry point. This is used as export pointer
- * for loadbind() to be able to resolve references to the main part.
- */
-static void * findMain(void)
-{
-	struct ld_info *lp;
-	char *buf;
-	int size = 4*1024;
-	int i;
-	void *ret;
-
-	if ((buf = malloc(size)) == NULL) {
-		errvalid++;
-		strcpy(errbuf, "findMain: ");
-		strcat(errbuf, strerror(errno));
-		return NULL;
-	}
-	while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-		free(buf);
-		size += 4*1024;
-		if ((buf = malloc(size)) == NULL) {
-			errvalid++;
-			strcpy(errbuf, "findMain: ");
-			strcat(errbuf, strerror(errno));
-			return NULL;
-		}
-	}
-	if (i == -1) {
-		errvalid++;
-		strcpy(errbuf, "findMain: ");
-		strcat(errbuf, strerror(errno));
-		free(buf);
-		return NULL;
-	}
-	/*
-	 * The first entry is the main module. The entry point
-	 * returned by load() does actually point to the data
-	 * segment origin.
-	 */
-	lp = (struct ld_info *)buf;
-	ret = lp->ldinfo_dataorg;
-	free(buf);
-	return ret;
-}
-
diff --git a/unix/tclLoadAout.c b/unix/tclLoadAout.c
deleted file mode 100644
index 8b6da69..0000000
--- a/unix/tclLoadAout.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/* 
- * tclLoadAout.c --
- *
- *	This procedure provides a version of the TclLoadFile that
- *	provides pseudo-static linking using version-7 compatible
- *	a.out files described in either sys/exec.h or sys/a.out.h.
- *
- * Copyright (c) 1995, by General Electric Company. All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * This work was supported in part by the ARPA Manufacturing Automation
- * and Design Engineering (MADE) Initiative through ARPA contract
- * F33615-94-C-4400.
- *
- * RCS: @(#) $Id: tclLoadAout.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include <fcntl.h>
-#ifdef HAVE_EXEC_AOUT_H
-#   include <sys/exec_aout.h>
-#endif
-
-/*
- * Some systems describe the a.out header in sys/exec.h, and some in
- * a.out.h.
- */
-
-#ifdef USE_SYS_EXEC_H
-#include <sys/exec.h>
-#endif
-#ifdef USE_A_OUT_H
-#include <a.out.h>
-#endif
-#ifdef USE_SYS_EXEC_AOUT_H
-#include <sys/exec_aout.h>
-#define a_magic a_midmag
-#endif
-
-/*
- * TCL_LOADSHIM is the amount by which to shim the break when loading
- */
-
-#ifndef TCL_LOADSHIM
-#define TCL_LOADSHIM 0x4000L
-#endif
-
-/*
- * TCL_LOADALIGN must be a power of 2, and is the alignment to which
- * to force the origin of load modules
- */
-
-#ifndef TCL_LOADALIGN
-#define TCL_LOADALIGN 0x4000L
-#endif
-
-/*
- * TCL_LOADMAX is the maximum size of a load module, and is used as
- * a sanity check when loading
- */
-
-#ifndef TCL_LOADMAX
-#define TCL_LOADMAX 2000000L
-#endif
-
-/*
- * Kernel calls that appear to be missing from the system .h files:
- */
-
-extern char * brk _ANSI_ARGS_((char *));
-extern char * sbrk _ANSI_ARGS_((size_t));
-
-/*
- * The static variable SymbolTableFile contains the file name where the
- * result of the last link was stored.  The file is kept because doing so
- * allows one load module to use the symbols defined in another.
- */
-
-static char * SymbolTableFile = NULL;
-
-/*
- * Type of the dictionary function that begins each load module.
- */
-
-typedef Tcl_PackageInitProc * (* DictFn) _ANSI_ARGS_ ((char * symbol));
-
-/*
- * Prototypes for procedures referenced only in this file:
- */
-
-static int FindLibraries _ANSI_ARGS_((Tcl_Interp * interp, char * fileName,
-				      Tcl_DString * buf));
-static void UnlinkSymbolTable _ANSI_ARGS_((void));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *
- * Bugs:
- *	This function does not attempt to handle the case where the
- *	BSS segment is not executable.  It will therefore fail on
- *	Encore Multimax, Pyramid 90x, and similar machines.  The
- *	reason is that the mprotect() kernel call, which would
- *	otherwise be employed to mark the newly-loaded text segment
- *	executable, results in a system crash on BSD/386.
- *
- *	In an effort to make it fast, this function eschews the
- *	technique of linking the load module once, reading its header
- *	to determine its size, allocating memory for it, and linking
- *	it again.  Instead, it `shims out' memory allocation by
- *	placing the module TCL_LOADSHIM bytes beyond the break,
- *	and assuming that any malloc() calls required to run the
- *	linker will not advance the break beyond that point.  If
- *	the break is advanced beyonnd that point, the load will
- *	fail with an `inconsistent memory allocation' error.
- *	It perhaps ought to retry the link, but the failure has
- *	not been observed in two years of daily use of this function.
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code (UTF-8). */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-  char * inputSymbolTable;	/* Name of the file containing the 
-				 * symbol table from the last link. */
-  Tcl_DString linkCommandBuf;	/* Command to do the run-time relocation
-				 * of the module.*/
-  char * linkCommand;
-  char relocatedFileName [L_tmpnam];
-				/* Name of the file holding the relocated */
-				/* text of the module */
-  int relocatedFd;		/* File descriptor of the file holding
-				 * relocated text */
-  struct exec relocatedHead;	/* Header of the relocated text */
-  unsigned long relocatedSize;	/* Size of the relocated text */
-  char * startAddress;		/* Starting address of the module */
-  DictFn dictionary;		/* Dictionary function in the load module */
-  int status;			/* Status return from Tcl_ calls */
-  char * p;
-
-  *clientDataPtr = NULL;
-  
-  /* Find the file that contains the symbols for the run-time link. */
-
-  if (SymbolTableFile != NULL) {
-    inputSymbolTable = SymbolTableFile;
-  } else if (tclExecutableName == NULL) {
-    Tcl_SetResult (interp, "can't find the tclsh executable", TCL_STATIC);
-    return TCL_ERROR;
-  } else {
-    inputSymbolTable = tclExecutableName;
-  }
-
-  /* Construct the `ld' command that builds the relocated module */
-
-  tmpnam (relocatedFileName);
-  Tcl_DStringInit (&linkCommandBuf);
-  Tcl_DStringAppend (&linkCommandBuf, "exec ld -o ", -1);
-  Tcl_DStringAppend (&linkCommandBuf, relocatedFileName, -1);
-#if defined(__mips) || defined(mips)
-  Tcl_DStringAppend (&linkCommandBuf, " -G 0 ", -1);
-#endif
-  Tcl_DStringAppend (&linkCommandBuf, " -u TclLoadDictionary_", -1);
-  TclGuessPackageName(fileName, &linkCommandBuf);
-  Tcl_DStringAppend (&linkCommandBuf, " -A ", -1);
-  Tcl_DStringAppend (&linkCommandBuf, inputSymbolTable, -1);
-  Tcl_DStringAppend (&linkCommandBuf, " -N -T XXXXXXXX ", -1);
-  Tcl_DStringAppend (&linkCommandBuf, fileName, -1);
-  Tcl_DStringAppend (&linkCommandBuf, " ", -1);
-  if (FindLibraries (interp, fileName, &linkCommandBuf) != TCL_OK) {
-    Tcl_DStringFree (&linkCommandBuf);
-    return TCL_ERROR;
-  }
-  linkCommand = Tcl_DStringValue (&linkCommandBuf);
-
-  /* Determine the starting address, and plug it into the command */
-  
-  startAddress = (char *) (((unsigned long) sbrk (0)
-			    + TCL_LOADSHIM + TCL_LOADALIGN - 1)
-			   & (- TCL_LOADALIGN));
-  p = strstr (linkCommand, "-T") + 3;
-  sprintf (p, "%08lx", (long) startAddress);
-  p [8] = ' ';
-
-  /* Run the linker */
-
-  status = Tcl_Eval (interp, linkCommand);
-  Tcl_DStringFree (&linkCommandBuf);
-  if (status != 0) {
-    return TCL_ERROR;
-  }
-
-  /* Open the linker's result file and read the header */
-
-  relocatedFd = open (relocatedFileName, O_RDONLY);
-  if (relocatedFd < 0) {
-    goto ioError;
-  }
-  status= read (relocatedFd, (char *) & relocatedHead, sizeof relocatedHead);
-  if (status < sizeof relocatedHead) {
-    goto ioError;
-  }
-
-  /* Check the magic number */
-
-  if (relocatedHead.a_magic != OMAGIC) {
-    Tcl_AppendResult (interp, "bad magic number in intermediate file \"",
-		      relocatedFileName, "\"", (char *) NULL);
-    goto failure;
-  }
-
-  /* Make sure that memory allocation is still consistent */
-
-  if ((unsigned long) sbrk (0) > (unsigned long) startAddress) {
-    Tcl_SetResult (interp, "can't load, memory allocation is inconsistent.",
-		   TCL_STATIC);
-    goto failure;
-  }
-
-  /* Make sure that the relocated module's size is reasonable */
-
-  relocatedSize = relocatedHead.a_text + relocatedHead.a_data
-    + relocatedHead.a_bss;
-  if (relocatedSize > TCL_LOADMAX) {
-    Tcl_SetResult (interp, "module too big to load", TCL_STATIC);
-    goto failure;
-  }
-
-  /* Advance the break to protect the loaded module */
-
-  (void) brk (startAddress + relocatedSize);
-
-  /* Seek to the start of the module's text */
-
-#if defined(__mips) || defined(mips)
-  status = lseek (relocatedFd,
-		  N_TXTOFF (relocatedHead.ex_f, relocatedHead.ex_o),
-		  SEEK_SET);
-#else
-  status = lseek (relocatedFd, N_TXTOFF (relocatedHead), SEEK_SET);
-#endif
-  if (status < 0) {
-    goto ioError;
-  }
-
-  /* Read in the module's text and data */
-
-  relocatedSize = relocatedHead.a_text + relocatedHead.a_data;
-  if (read (relocatedFd, startAddress, relocatedSize) < relocatedSize) {
-    brk (startAddress);
-  ioError:
-    Tcl_AppendResult (interp, "error on intermediate file \"",
-		      relocatedFileName, "\": ", Tcl_PosixError (interp),
-		      (char *) NULL);
-  failure:
-    (void) unlink (relocatedFileName);
-    return TCL_ERROR;
-  }
-
-  /* Close the intermediate file. */
-
-  (void) close (relocatedFd);
-
-  /* Arrange things so that intermediate symbol tables eventually get
-   * deleted. */
-
-  if (SymbolTableFile != NULL) {
-    UnlinkSymbolTable ();
-  } else {
-    atexit (UnlinkSymbolTable);
-  }
-  SymbolTableFile = ckalloc (strlen (relocatedFileName) + 1);
-  strcpy (SymbolTableFile, relocatedFileName);
-  
-  /* Look up the entry points in the load module's dictionary. */
-
-  dictionary = (DictFn) startAddress;
-  *proc1Ptr = dictionary (sym1);
-  *proc2Ptr = dictionary (sym2);
-
-  return TCL_OK;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * FindLibraries --
- *
- *	Find the libraries needed to link a load module at run time.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs,
- *	an error message is left in the interp's result.  The -l and -L
- *	flags are concatenated onto the dynamic string `buf'.
- *
- *------------------------------------------------------------------------
- */
-
-static int
-FindLibraries (interp, fileName, buf)
-     Tcl_Interp * interp;	/* Used for error reporting */
-     char * fileName;		/* Name of the load module */
-     Tcl_DString * buf;		/* Buffer where the -l an -L flags */
-{
-  FILE * f;			/* The load module */
-  int c;			/* Byte from the load module */
-  char * p;
-  Tcl_DString ds;
-  CONST char *native;
-
-  /* Open the load module */
-
-  native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-  f = fopen(native, "rb");				/* INTL: Native. */
-  Tcl_DStringFree(&ds);
-  
-  if (f == NULL) {
-    Tcl_AppendResult (interp, "couldn't open \"", fileName, "\": ",
-		      Tcl_PosixError (interp), (char *) NULL);
-    return TCL_ERROR;
-  }
-
-  /* Search for the library list in the load module */
-
-  p = "@LIBS: ";
-  while (*p != '\0' && (c = getc (f)) != EOF) {
-    if (c == *p) {
-      ++p;
-    }
-    else {
-      p = "@LIBS: ";
-      if (c == *p) {
-	++p;
-      }
-    }
-  }
-
-  /* No library list -- this must be an ill-formed module */
-
-  if (c == EOF) {
-    Tcl_AppendResult (interp, "File \"", fileName,
-		      "\" is not a Tcl load module.", (char *) NULL);
-    (void) fclose (f);
-    return TCL_ERROR;
-  }
-
-  /* Accumulate the library list */
-
-  while ((c = getc (f)) != '\0' && c != EOF) {
-    char cc = c;
-    Tcl_DStringAppend (buf, &cc, 1);
-  }
-  (void) fclose (f);
-
-  if (c == EOF) {
-    Tcl_AppendResult (interp, "Library directory in \"", fileName,
-		      "\" ends prematurely.", (char *) NULL);
-    return TCL_ERROR;
-  }
-
-  return TCL_OK;
-}
-
-/*
- *------------------------------------------------------------------------
- *
- * UnlinkSymbolTable --
- *
- *	Remove the symbol table file from the last dynamic link.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The symbol table file from the last dynamic link is removed.
- *	This function is called when (a) a new symbol table is present
- *	because another dynamic link is complete, or (b) the process
- *	is exiting.
- *------------------------------------------------------------------------
- */
-
-static void
-UnlinkSymbolTable ()
-{
-  (void) unlink (SymbolTableFile);
-  ckfree (SymbolTableFile);
-  SymbolTableFile = NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Does nothing.  Can anything be done?
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    char *p, *q, *r;
-    int srcOff, dstOff;
-
-    if (q = strrchr(fileName,'/')) {
-	q++;
-    } else {
-	q = fileName;
-    }
-    if (!strncmp(q,"lib",3)) {
-	q+=3;
-    }
-    p = q;
-    while ((*p) && (*p != '.') && ((*p<'0') || (*p>'9'))) {
-	p++;
-    }
-    if ((p>q+2) && !strncmp(p-2,"_G0.",4)) {
-	p-=2;
-    }
-    if (p<q) {
-	return 0;
-    }
-
-    Tcl_DStringAppend(bufPtr,q, p-q);
-
-    r = Tcl_DStringValue(bufPtr);
-    r += strlen(r) - (p-q);
-
-    /*
-     * Capitalize the string and then recompute the length.
-     */
-
-    Tcl_UtfToTitle(r);
-    Tcl_DStringSetLength(bufPtr, strlen(Tcl_DStringValue(bufPtr)));
-
-    return 1;
-}
diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
deleted file mode 100644
index 2a868d8..0000000
--- a/unix/tclLoadDl.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* 
- * tclLoadDl.c --
- *
- *	This procedure provides a version of the TclLoadFile that
- *	works with the "dlopen" and "dlsym" library procedures for
- *	dynamic loading.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadDl.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#ifdef NO_DLFCN_H
-#   include "../compat/dlfcn.h"
-#else
-#   include <dlfcn.h>
-#endif
-
-/*
- * In some systems, like SunOS 4.1.3, the RTLD_NOW flag isn't defined
- * and this argument to dlopen must always be 1.  The RTLD_GLOBAL
- * flag is needed on some systems (e.g. SCO and UnixWare) but doesn't
- * exist on others;  if it doesn't exist, set it to 0 so it has no effect.
- */
-
-#ifndef RTLD_NOW
-#   define RTLD_NOW 1
-#endif
-
-#ifndef RTLD_GLOBAL
-#   define RTLD_GLOBAL 0
-#endif
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    VOID *handle;
-    Tcl_DString newName, ds;
-    char *native;
-
-    native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-    handle = dlopen(native, RTLD_NOW | RTLD_GLOBAL);	/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    
-    *clientDataPtr = (ClientData) handle;
-    
-    if (handle == NULL) {
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-		"\": ", dlerror(), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /* 
-     * Some platforms still add an underscore to the beginning of symbol
-     * names.  If we can't find a name without an underscore, try again
-     * with the underscore.
-     */
-
-    native = Tcl_UtfToExternalDString(NULL, sym1, -1, &ds);
-    *proc1Ptr = (Tcl_PackageInitProc *) dlsym(handle,	/* INTL: Native. */
-	    native);	
-    if (*proc1Ptr == NULL) {
-	Tcl_DStringInit(&newName);
-	Tcl_DStringAppend(&newName, "_", 1);
-	native = Tcl_DStringAppend(&newName, native, -1);
-	*proc1Ptr = (Tcl_PackageInitProc *) dlsym(handle, /* INTL: Native. */
-		native);
-	Tcl_DStringFree(&newName);
-    }
-    Tcl_DStringFree(&ds);
-
-    native = Tcl_UtfToExternalDString(NULL, sym2, -1, &ds);
-    *proc2Ptr = (Tcl_PackageInitProc *) dlsym(handle,	/* INTL: Native. */
-	    native);
-    if (*proc2Ptr == NULL) {
-	Tcl_DStringInit(&newName);
-	Tcl_DStringAppend(&newName, "_", 1);
-	native = Tcl_DStringAppend(&newName, native, -1);
-	*proc2Ptr = (Tcl_PackageInitProc *) dlsym(handle, /* INTL: Native. */
-		native);
-	Tcl_DStringFree(&newName);
-    }
-    Tcl_DStringFree(&ds);
-    
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Code removed from memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-    VOID *handle;
-
-    handle = (VOID *) clientData;
-    dlclose(handle);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/unix/tclLoadDld.c b/unix/tclLoadDld.c
deleted file mode 100644
index 1f9e702..0000000
--- a/unix/tclLoadDld.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* 
- * tclLoadDld.c --
- *
- *	This procedure provides a version of the TclLoadFile that
- *	works with the "dld_link" and "dld_get_func" library procedures
- *	for dynamic loading.  It has been tested on Linux 1.1.95 and
- *	dld-3.2.7.  This file probably isn't needed anymore, since it
- *	makes more sense to use "dl_open" etc.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadDld.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "dld.h"
-
-/*
- * In some systems, like SunOS 4.1.3, the RTLD_NOW flag isn't defined
- * and this argument to dlopen must always be 1.
- */
-
-#ifndef RTLD_NOW
-#   define RTLD_NOW 1
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    static int firstTime = 1;
-    int returnCode;
-
-    /*
-     *  The dld package needs to know the pathname to the tcl binary.
-     *  If that's not know, return an error.
-     */
-
-    if (firstTime) {
-	if (tclExecutableName == NULL) {
-	    Tcl_SetResult(interp,
-		    "don't know name of application binary file, so can't initialize dynamic loader",
-		    TCL_STATIC);
-	    return TCL_ERROR;
-	}
-	returnCode = dld_init(tclExecutableName);
-	if (returnCode != 0) {
-	    Tcl_AppendResult(interp,
-		    "initialization failed for dynamic loader: ",
-		    dld_strerror(returnCode), (char *) NULL);
-	    return TCL_ERROR;
-	}
-	firstTime = 0;
-    }
-
-    if ((returnCode = dld_link(fileName)) != 0) {
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-	    "\": ", dld_strerror(returnCode), (char *) NULL);
-	return TCL_ERROR;
-    }
-    *proc1Ptr = (Tcl_PackageInitProc *) dld_get_func(sym1);
-    *proc2Ptr = (Tcl_PackageInitProc *) dld_get_func(sym2);
-    *clientDataPtr = strcpy(
-	    (char *) ckalloc((unsigned) (strlen(fileName) + 1)), fileName);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Code removed from memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-    char *fileName;
-
-    handle = (char *) clientData;
-    dld_unlink_by_file(handle, 0);
-    ckfree(handle);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
deleted file mode 100644
index f29c996..0000000
--- a/unix/tclLoadNext.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * tclLoadNext.c --
- *
- *	This procedure provides a version of the TclLoadFile that
- *	works with NeXTs rld_* dynamic loading.  This file provided
- *	by Pedja Bogdanovich.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadNext.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include <mach-o/rld.h>
-#include <streams/streams.h>
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-  struct mach_header *header;
-  char *data;
-  int len, maxlen;
-  char *files[]={fileName,NULL};
-  NXStream *errorStream=NXOpenMemory(0,0,NX_READWRITE);
-
-  if(!rld_load(errorStream,&header,files,NULL)) {
-    NXGetMemoryBuffer(errorStream,&data,&len,&maxlen);
-    Tcl_AppendResult(interp,"couldn't load file \"",fileName,"\": ",data,NULL);
-    NXCloseMemory(errorStream,NX_FREEBUFFER);
-    return TCL_ERROR;
-  }
-  NXCloseMemory(errorStream,NX_FREEBUFFER);
-
-  *proc1Ptr=NULL;
-  if(sym1) {
-    char sym[strlen(sym1)+2];
-    sym[0]='_'; sym[1]=0; strcat(sym,sym1);
-    rld_lookup(NULL,sym,(unsigned long *)proc1Ptr);
-  }
-
-  *proc2Ptr=NULL;
-  if(sym2) {
-    char sym[strlen(sym2)+2];
-    sym[0]='_'; sym[1]=0; strcat(sym,sym2);
-    rld_lookup(NULL,sym,(unsigned long *)proc2Ptr);
-  }
-  *clientDataPtr = NULL;
-
-  return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Does nothing.  Can anything be done?
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/unix/tclLoadOSF.c b/unix/tclLoadOSF.c
deleted file mode 100644
index 9e8b3ad..0000000
--- a/unix/tclLoadOSF.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* 
- * tclLoadOSF.c --
- *
- *	This procedure provides a version of the TclLoadFile that works
- *	under OSF/1 1.0/1.1/1.2 and related systems, utilizing the old OSF/1
- *	/sbin/loader and /usr/include/loader.h.  OSF/1 versions from 1.3 and
- *	on use ELF, rtld, and dlopen()[/usr/include/ldfcn.h].
- *
- *	This is useful for:
- *		OSF/1 1.0, 1.1, 1.2 (from OSF)
- *			includes: MK4 and AD1 (from OSF RI)
- *		OSF/1 1.3 (from OSF) using ROSE
- *		HP OSF/1 1.0 ("Acorn") using COFF
- *
- *	This is likely to be useful for:
- *		Paragon OSF/1 (from Intel) 
- *		HI-OSF/1 (from Hitachi) 
- *
- *	This is NOT to be used on:
- *		Digitial Alpha OSF/1 systems
- *		OSF/1 1.3 or later (from OSF) using ELF
- *			includes: MK6, MK7, AD2, AD3 (from OSF RI)
- *
- *	This approach to things was utter @&^#; thankfully,
- * 	OSF/1 eventually supported dlopen().
- *
- *	John Robert LoVerso <loverso@freebsd.osf.org>
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadOSF.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include <sys/types.h>
-#include <loader.h>
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    ldr_module_t lm;
-    char *pkg;
-
-    lm = (Tcl_PackageInitProc *) load(fileName, LDR_NOFLAGS);
-    if (lm == LDR_NULL_MODULE) {
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-	    "\": ", Tcl_PosixError (interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    *clientDataPtr = NULL;
-    
-    /*
-     * My convention is to use a [OSF loader] package name the same as shlib,
-     * since the idiots never implemented ldr_lookup() and it is otherwise
-     * impossible to get a package name given a module.
-     *
-     * I build loadable modules with a makefile rule like 
-     *		ld ... -export $@: -o $@ $(OBJS)
-     */
-    if ((pkg = strrchr(fileName, '/')) == NULL)
-	pkg = fileName;
-    else
-	pkg++;
-    *proc1Ptr = ldr_lookup_package(pkg, sym1);
-    *proc2Ptr = ldr_lookup_package(pkg, sym2);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Does nothing.  Can anything be done?
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
deleted file mode 100644
index 3330919..0000000
--- a/unix/tclLoadShl.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* 
- * tclLoadShl.c --
- *
- *	This procedure provides a version of the TclLoadFile that works
- *	with the "shl_load" and "shl_findsym" library procedures for
- *	dynamic loading (e.g. for HP machines).
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclLoadShl.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include <dl.h>
-
-/*
- * On some HP machines, dl.h defines EXTERN; remove that definition.
- */
-
-#ifdef EXTERN
-#   undef EXTERN
-#endif
-
-#include "tcl.h"
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.  *proc1Ptr and *proc2Ptr
- *	are filled in with the addresses of the symbols given by
- *	*sym1 and *sym2, or NULL if those symbols can't be found.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    shl_t handle;
-    Tcl_DString newName;
-
-    /*
-     * The flags below used to be BIND_IMMEDIATE; they were changed at
-     * the suggestion of Wolfgang Kechel (wolfgang@prs.de): "This
-     * enables verbosity for missing symbols when loading a shared lib
-     * and allows to load libtk8.0.sl into tclsh8.0 without problems.
-     * In general, this delays resolving symbols until they are actually
-     * needed.  Shared libs do no longer need all libraries linked in
-     * when they are build."
-     */
-
-    handle = shl_load(fileName, BIND_DEFERRED|BIND_VERBOSE, 0L);
-    if (handle == NULL) {
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-    *clientDataPtr = (ClientData) handle;
-
-    /*
-     * Some versions of the HP system software still use "_" at the
-     * beginning of exported symbols while others don't;  try both
-     * forms of each name.
-     */
-
-    if (shl_findsym(&handle, sym1, (short) TYPE_PROCEDURE, (void *) proc1Ptr)
-	    != 0) {
-	Tcl_DStringInit(&newName);
-	Tcl_DStringAppend(&newName, "_", 1);
-	Tcl_DStringAppend(&newName, sym1, -1);
-	if (shl_findsym(&handle, Tcl_DStringValue(&newName),
-		(short) TYPE_PROCEDURE, (void *) proc1Ptr) != 0) {
-	    *proc1Ptr = NULL;
-	}
-	Tcl_DStringFree(&newName);
-    }
-    if (shl_findsym(&handle, sym2, (short) TYPE_PROCEDURE, (void *) proc2Ptr)
-	    != 0) {
-	Tcl_DStringInit(&newName);
-	Tcl_DStringAppend(&newName, "_", 1);
-	Tcl_DStringAppend(&newName, sym2, -1);
-	if (shl_findsym(&handle, Tcl_DStringValue(&newName),
-		(short) TYPE_PROCEDURE, (void *) proc2Ptr) != 0) {
-	    *proc2Ptr = NULL;
-	}
-	Tcl_DStringFree(&newName);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Code removed from memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-    shl_t handle;
-
-    handle = (shl_t) clientData;
-    shl_unload(handle);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/unix/tclMtherr.c b/unix/tclMtherr.c
deleted file mode 100644
index d1150f6..0000000
--- a/unix/tclMtherr.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* 
- * tclMatherr.c --
- *
- *	This function provides a default implementation of the
- *	"matherr" function, for SYS-V systems where it's needed.
- *
- * Copyright (c) 1993-1994 The Regents of the University of California.
- * Copyright (c) 1994 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclMtherr.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include <math.h>
-
-#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
-#define NO_ERRNO_H
-#endif
-
-#ifdef NO_ERRNO_H
-extern int errno;			/* Use errno from tclExecute.c. */
-#define EDOM 33
-#define ERANGE 34
-#endif
-
-/*
- * The following definitions allow matherr to compile on systems
- * that don't really support it.  The compiled procedure is bogus,
- * but it will never be executed on these systems anyway.
- */
-
-#ifndef NEED_MATHERR
-struct exception {
-    int type;
-};
-#define DOMAIN 0
-#define SING 0
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
- * matherr --
- *
- *	This procedure is invoked on Sys-V systems when certain
- *	errors occur in mathematical functions.  Type "man matherr"
- *	for more information on how this function works.
- *
- * Results:
- *	Returns 1 to indicate that we've handled the error
- *	locally.
- *
- * Side effects:
- *	Sets errno based on what's in xPtr.
- *
- *----------------------------------------------------------------------
- */
-
-int
-matherr(xPtr)
-    struct exception *xPtr;	/* Describes error that occurred. */
-{
-    if (TclMathInProgress()) {
-	return 0;
-    }
-    if ((xPtr->type == DOMAIN) || (xPtr->type == SING)) {
-	errno = EDOM;
-    } else {
-	errno = ERANGE;
-    }
-    return 1;
-}
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
deleted file mode 100644
index 4da4f1f..0000000
--- a/unix/tclUnixChan.c
+++ /dev/null
@@ -1,2695 +0,0 @@
-/* 
- * tclUnixChan.c
- *
- *	Common channel driver for Unix channels based on files, command
- *	pipes and TCP sockets.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixChan.c,v 1.10 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include	"tclInt.h"	/* Internal definitions for Tcl. */
-#include	"tclPort.h"	/* Portability features for Tcl. */
-
-/*
- * sys/ioctl.h has already been included by tclPort.h.  Including termios.h
- * or termio.h causes a bunch of warning messages because some duplicate
- * (but not contradictory) #defines exist in termios.h and/or termio.h
- */
-#undef NL0
-#undef NL1
-#undef CR0
-#undef CR1
-#undef CR2
-#undef CR3
-#undef TAB0
-#undef TAB1
-#undef TAB2
-#undef XTABS
-#undef BS0
-#undef BS1
-#undef FF0
-#undef FF1
-#undef ECHO
-#undef NOFLSH
-#undef TOSTOP
-#undef FLUSHO
-#undef PENDIN
-
-#define SUPPORTS_TTY
-
-#ifdef USE_TERMIOS
-#   include <termios.h>
-#   define IOSTATE			struct termios
-#   define GETIOSTATE(fd, statePtr)	tcgetattr((fd), (statePtr))
-#   define SETIOSTATE(fd, statePtr)	tcsetattr((fd), TCSADRAIN, (statePtr))
-#else	/* !USE_TERMIOS */
-#ifdef USE_TERMIO
-#   include <termio.h>
-#   define IOSTATE			struct termio
-#   define GETIOSTATE(fd, statePtr)	ioctl((fd), TCGETA, (statePtr))
-#   define SETIOSTATE(fd, statePtr)	ioctl((fd), TCSETAW, (statePtr))
-#else	/* !USE_TERMIO */
-#ifdef USE_SGTTY
-#   include <sgtty.h>
-#   define IOSTATE			struct sgttyb
-#   define GETIOSTATE(fd, statePtr)	ioctl((fd), TIOCGETP, (statePtr))
-#   define SETIOSTATE(fd, statePtr)	ioctl((fd), TIOCSETP, (statePtr))
-#else	/* !USE_SGTTY */
-#   undef SUPPORTS_TTY
-#endif	/* !USE_SGTTY */
-#endif	/* !USE_TERMIO */
-#endif	/* !USE_TERMIOS */
-
-/*
- * This structure describes per-instance state of a file based channel.
- */
-
-typedef struct FileState {
-    Tcl_Channel channel;	/* Channel associated with this file. */
-    int fd;			/* File handle. */
-    int validMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which operations are valid on the file. */
-    struct FileState *nextPtr;	/* Pointer to next file in list of all
-				 * file channels. */
-} FileState;
-
-#ifdef SUPPORTS_TTY
-
-/*
- * The following structure describes per-instance state of a tty-based
- * channel.
- */
-
-typedef struct TtyState {
-    FileState fs;		/* Per-instance state of the file
-				 * descriptor.  Must be the first field. */
-    IOSTATE savedState;		/* Initial state of device.  Used to reset
-				 * state when device closed. */
-} TtyState;
-
-/*
- * The following structure is used to set or get the serial port
- * attributes in a platform-independant manner.
- */
- 
-typedef struct TtyAttrs {
-    int baud;
-    int parity;
-    int data;
-    int stop;
-} TtyAttrs;
-
-#endif	/* !SUPPORTS_TTY */
-
-typedef struct ThreadSpecificData {
-    /*
-     * List of all file channels currently open.  This is per thread and is
-     * used to match up fd's to channels, which rarely occurs.
-     */
-    
-    FileState *firstFilePtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * This structure describes per-instance state of a tcp based channel.
- */
-
-typedef struct TcpState {
-    Tcl_Channel channel;	/* Channel associated with this file. */
-    int fd;			/* The socket itself. */
-    int flags;			/* ORed combination of the bitfields
-				 * defined below. */
-    Tcl_TcpAcceptProc *acceptProc;
-				/* Proc to call on accept. */
-    ClientData acceptProcData;	/* The data for the accept proc. */
-} TcpState;
-
-/*
- * These bits may be ORed together into the "flags" field of a TcpState
- * structure.
- */
-
-#define TCP_ASYNC_SOCKET	(1<<0)	/* Asynchronous socket. */
-#define TCP_ASYNC_CONNECT	(1<<1)	/* Async connect in progress. */
-
-/*
- * The following defines the maximum length of the listen queue. This is
- * the number of outstanding yet-to-be-serviced requests for a connection
- * on a server socket, more than this number of outstanding requests and
- * the connection request will fail.
- */
-
-#ifndef	SOMAXCONN
-#define SOMAXCONN	100
-#endif
-
-#if	(SOMAXCONN < 100)
-#undef	SOMAXCONN
-#define	SOMAXCONN	100
-#endif
-
-/*
- * The following defines how much buffer space the kernel should maintain
- * for a socket.
- */
-
-#define SOCKET_BUFSIZE	4096
-
-/*
- * Static routines for this file:
- */
-
-static TcpState *	CreateSocket _ANSI_ARGS_((Tcl_Interp *interp,
-			    int port, char *host, int server,
-			    char *myaddr, int myport, int async));
-static int		CreateSocketAddress _ANSI_ARGS_(
-			    (struct sockaddr_in *sockaddrPtr,
-			    char *host, int port));
-static int		FileBlockModeProc _ANSI_ARGS_((
-    			    ClientData instanceData, int mode));
-static int		FileCloseProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static int		FileGetHandleProc _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static int		FileInputProc _ANSI_ARGS_((ClientData instanceData,
-		            char *buf, int toRead, int *errorCode));
-static int		FileOutputProc _ANSI_ARGS_((
-			    ClientData instanceData, char *buf, int toWrite,
-                            int *errorCode));
-static int		FileSeekProc _ANSI_ARGS_((ClientData instanceData,
-			    long offset, int mode, int *errorCode));
-static void		FileWatchProc _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-static void		TcpAccept _ANSI_ARGS_((ClientData data, int mask));
-static int		TcpBlockModeProc _ANSI_ARGS_((ClientData data,
-        		    int mode));
-static int		TcpCloseProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static int		TcpGetHandleProc _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static int		TcpGetOptionProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp, char *optionName,
-			    Tcl_DString *dsPtr));
-static int		TcpInputProc _ANSI_ARGS_((ClientData instanceData,
-		            char *buf, int toRead,  int *errorCode));
-static int		TcpOutputProc _ANSI_ARGS_((ClientData instanceData,
-		            char *buf, int toWrite, int *errorCode));
-static void		TcpWatchProc _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-#ifdef SUPPORTS_TTY
-static int		TtyCloseProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp));
-static void		TtyGetAttributes _ANSI_ARGS_((int fd,
-			    TtyAttrs *ttyPtr));
-static int		TtyGetOptionProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp, char *optionName,
-			    Tcl_DString *dsPtr));
-static FileState *	TtyInit _ANSI_ARGS_((int fd));
-static int		TtyParseMode _ANSI_ARGS_((Tcl_Interp *interp,
-			    CONST char *mode, int *speedPtr, int *parityPtr,
-			    int *dataPtr, int *stopPtr));
-static void		TtySetAttributes _ANSI_ARGS_((int fd,
-			    TtyAttrs *ttyPtr));
-static int		TtySetOptionProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp, char *optionName, 
-			    char *value));
-#endif	/* SUPPORTS_TTY */
-static int		WaitForConnect _ANSI_ARGS_((TcpState *statePtr,
-		            int *errorCodePtr));
-
-/*
- * This structure describes the channel type structure for file based IO:
- */
-
-static Tcl_ChannelType fileChannelType = {
-    "file",				/* Type name. */
-    FileBlockModeProc,			/* Set blocking/nonblocking mode.*/
-    FileCloseProc,			/* Close proc. */
-    FileInputProc,			/* Input proc. */
-    FileOutputProc,			/* Output proc. */
-    FileSeekProc,			/* Seek proc. */
-    NULL,				/* Set option proc. */
-    NULL,				/* Get option proc. */
-    FileWatchProc,			/* Initialize notifier. */
-    FileGetHandleProc,			/* Get OS handles out of channel. */
-};
-
-#ifdef SUPPORTS_TTY
-/*
- * This structure describes the channel type structure for serial IO.
- * Note that this type is a subclass of the "file" type.
- */
-
-static Tcl_ChannelType ttyChannelType = {
-    "tty",				/* Type name. */
-    FileBlockModeProc,			/* Set blocking/nonblocking mode.*/
-    TtyCloseProc,			/* Close proc. */
-    FileInputProc,			/* Input proc. */
-    FileOutputProc,			/* Output proc. */
-    NULL,				/* Seek proc. */
-    TtySetOptionProc,			/* Set option proc. */
-    TtyGetOptionProc,			/* Get option proc. */
-    FileWatchProc,			/* Initialize notifier. */
-    FileGetHandleProc,			/* Get OS handles out of channel. */
-};
-#endif	/* SUPPORTS_TTY */
-
-/*
- * This structure describes the channel type structure for TCP socket
- * based IO:
- */
-
-static Tcl_ChannelType tcpChannelType = {
-    "tcp",				/* Type name. */
-    TcpBlockModeProc,			/* Set blocking/nonblocking mode.*/
-    TcpCloseProc,			/* Close proc. */
-    TcpInputProc,			/* Input proc. */
-    TcpOutputProc,			/* Output proc. */
-    NULL,				/* Seek proc. */
-    NULL,				/* Set option proc. */
-    TcpGetOptionProc,			/* Get option proc. */
-    TcpWatchProc,			/* Initialize notifier. */
-    TcpGetHandleProc,			/* Get OS handles out of channel. */
-};
-
-
-/*
- *----------------------------------------------------------------------
- *
- * FileBlockModeProc --
- *
- *	Helper procedure to set blocking and nonblocking modes on a
- *	file based channel. Invoked by generic IO level code.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-FileBlockModeProc(instanceData, mode)
-    ClientData instanceData;		/* File state. */
-    int mode;				/* The mode to set. Can be one of
-                                         * TCL_MODE_BLOCKING or
-                                         * TCL_MODE_NONBLOCKING. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    int curStatus;
-
-#ifndef USE_FIONBIO
-    curStatus = fcntl(fsPtr->fd, F_GETFL);
-    if (mode == TCL_MODE_BLOCKING) {
-	curStatus &= (~(O_NONBLOCK));
-    } else {
-	curStatus |= O_NONBLOCK;
-    }
-    if (fcntl(fsPtr->fd, F_SETFL, curStatus) < 0) {
-	return errno;
-    }
-    curStatus = fcntl(fsPtr->fd, F_GETFL);
-#else
-    if (mode == TCL_MODE_BLOCKING) {
-	curStatus = 0;
-    } else {
-	curStatus = 1;
-    }
-    if (ioctl(fsPtr->fd, (int) FIONBIO, &curStatus) < 0) {
-	return errno;
-    }
-#endif
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileInputProc --
- *
- *	This procedure is invoked from the generic IO level to read
- *	input from a file based channel.
- *
- * Results:
- *	The number of bytes read is returned or -1 on error. An output
- *	argument contains a POSIX error code if an error occurs, or zero.
- *
- * Side effects:
- *	Reads input from the input device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileInputProc(instanceData, buf, toRead, errorCodePtr)
-    ClientData instanceData;		/* File state. */
-    char *buf;				/* Where to store data read. */
-    int toRead;				/* How much space is available
-                                         * in the buffer? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    int bytesRead;			/* How many bytes were actually
-                                         * read from the input device? */
-
-    *errorCodePtr = 0;
-    
-    /*
-     * Assume there is always enough input available. This will block
-     * appropriately, and read will unblock as soon as a short read is
-     * possible, if the channel is in blocking mode. If the channel is
-     * nonblocking, the read will never block.
-     */
-
-    bytesRead = read(fsPtr->fd, buf, (size_t) toRead);
-    if (bytesRead > -1) {
-        return bytesRead;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileOutputProc--
- *
- *	This procedure is invoked from the generic IO level to write
- *	output to a file channel.
- *
- * Results:
- *	The number of bytes written is returned or -1 on error. An
- *	output argument	contains a POSIX error code if an error occurred,
- *	or zero.
- *
- * Side effects:
- *	Writes output on the output device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileOutputProc(instanceData, buf, toWrite, errorCodePtr)
-    ClientData instanceData;		/* File state. */
-    char *buf;				/* The data buffer. */
-    int toWrite;			/* How many bytes to write? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    int written;
-
-    *errorCodePtr = 0;
-    written = write(fsPtr->fd, buf, (size_t) toWrite);
-    if (written > -1) {
-        return written;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileCloseProc --
- *
- *	This procedure is called from the generic IO level to perform
- *	channel-type-specific cleanup when a file based channel is closed.
- *
- * Results:
- *	0 if successful, errno if failed.
- *
- * Side effects:
- *	Closes the device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileCloseProc(instanceData, interp)
-    ClientData instanceData;	/* File state. */
-    Tcl_Interp *interp;		/* For error reporting - unused. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    FileState **nextPtrPtr;
-    int errorCode = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    Tcl_DeleteFileHandler(fsPtr->fd);
-
-    /*
-     * Do not close standard channels while in thread-exit.
-     */
-
-    if (!TclInExit()
-	    || ((fsPtr->fd != 0) && (fsPtr->fd != 1) && (fsPtr->fd != 2))) {
-	if (close(fsPtr->fd) < 0) {
-	    errorCode = errno;
-	}
-    }
-    for (nextPtrPtr = &(tsdPtr->firstFilePtr); (*nextPtrPtr) != NULL;
-	 nextPtrPtr = &((*nextPtrPtr)->nextPtr)) {
-	if ((*nextPtrPtr) == fsPtr) {
-	    (*nextPtrPtr) = fsPtr->nextPtr;
-	    break;
-	}
-    }
-    ckfree((char *) fsPtr);
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileSeekProc --
- *
- *	This procedure is called by the generic IO level to move the
- *	access point in a file based channel.
- *
- * Results:
- *	-1 if failed, the new position if successful. An output
- *	argument contains the POSIX error code if an error occurred,
- *	or zero.
- *
- * Side effects:
- *	Moves the location at which the channel will be accessed in
- *	future operations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileSeekProc(instanceData, offset, mode, errorCodePtr)
-    ClientData instanceData;			/* File state. */
-    long offset;				/* Offset to seek to. */
-    int mode;					/* Relative to where
-                                                 * should we seek? Can be
-                                                 * one of SEEK_START,
-                                                 * SEEK_SET or SEEK_END. */
-    int *errorCodePtr;				/* To store error code. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    int newLoc;
-
-    newLoc = lseek(fsPtr->fd, offset, mode);
-
-    *errorCodePtr = (newLoc == -1) ? errno : 0;
-    return newLoc;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileWatchProc --
- *
- *	Initialize the notifier to watch the fd from this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the notifier so that a future event on the channel will
- *	be seen by Tcl.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileWatchProc(instanceData, mask)
-    ClientData instanceData;		/* The file state. */
-    int mask;				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-
-    /*
-     * Make sure we only register for events that are valid on this file.
-     * Note that we are passing Tcl_NotifyChannel directly to
-     * Tcl_CreateFileHandler with the channel pointer as the client data.
-     */
-
-    mask &= fsPtr->validMask;
-    if (mask) {
-	Tcl_CreateFileHandler(fsPtr->fd, mask,
-		(Tcl_FileProc *) Tcl_NotifyChannel,
-		(ClientData) fsPtr->channel);
-    } else {
-	Tcl_DeleteFileHandler(fsPtr->fd);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	a file based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileGetHandleProc(instanceData, direction, handlePtr)
-    ClientData instanceData;	/* The file state. */
-    int direction;		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr;	/* Where to store the handle.  */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-
-    if (direction & fsPtr->validMask) {
-	*handlePtr = (ClientData) fsPtr->fd;
-	return TCL_OK;
-    } else {
-	return TCL_ERROR;
-    }
-}
-
-#ifdef SUPPORTS_TTY 
-
-/*
- *----------------------------------------------------------------------
- *
- * TtyCloseProc --
- *
- *	This procedure is called from the generic IO level to perform
- *	channel-type-specific cleanup when a tty based channel is closed.
- *
- * Results:
- *	0 if successful, errno if failed.
- *
- * Side effects:
- *	Restores the settings and closes the device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TtyCloseProc(instanceData, interp)
-    ClientData instanceData;	/* Tty state. */
-    Tcl_Interp *interp;		/* For error reporting - unused. */
-{
-    TtyState *ttyPtr;
-
-    ttyPtr = (TtyState *) instanceData;
-    SETIOSTATE(ttyPtr->fs.fd, &ttyPtr->savedState);
-    return FileCloseProc(instanceData, interp);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TtySetOptionProc --
- *
- *	Sets an option on a channel.
- *
- * Results:
- *	A standard Tcl result. Also sets the interp's result on error if
- *	interp is not NULL.
- *
- * Side effects:
- *	May modify an option on a device.
- *      Sets Error message if needed (by calling Tcl_BadChannelOption).
- *
- *----------------------------------------------------------------------
- */
-
-static int		
-TtySetOptionProc(instanceData, interp, optionName, value)
-    ClientData instanceData;	/* File state. */
-    Tcl_Interp *interp;		/* For error reporting - can be NULL. */
-    char *optionName;		/* Which option to set? */
-    char *value;		/* New value for option. */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    unsigned int len;
-    TtyAttrs tty;
-
-    len = strlen(optionName);
-    if ((len > 1) && (strncmp(optionName, "-mode", len) == 0)) {
-	if (TtyParseMode(interp, value, &tty.baud, &tty.parity, &tty.data,
-		&tty.stop) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	/*
-	 * system calls results should be checked there. -- dl
-	 */
-
-	TtySetAttributes(fsPtr->fd, &tty);
-	return TCL_OK;
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, "mode");
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TtyGetOptionProc --
- *
- *	Gets a mode associated with an IO channel. If the optionName arg
- *	is non NULL, retrieves the value of that option. If the optionName
- *	arg is NULL, retrieves a list of alternating option names and
- *	values for the given channel.
- *
- * Results:
- *	A standard Tcl result. Also sets the supplied DString to the
- *	string value of the option(s) returned.
- *
- * Side effects:
- *	The string returned by this function is in static storage and
- *	may be reused at any time subsequent to the call.
- *      Sets Error message if needed (by calling Tcl_BadChannelOption).
- *
- *----------------------------------------------------------------------
- */
-
-static int		
-TtyGetOptionProc(instanceData, interp, optionName, dsPtr)
-    ClientData instanceData;	/* File state. */
-    Tcl_Interp *interp;		/* For error reporting - can be NULL. */
-    char *optionName;		/* Option to get. */
-    Tcl_DString *dsPtr;		/* Where to store value(s). */
-{
-    FileState *fsPtr = (FileState *) instanceData;
-    unsigned int len;
-    char buf[3 * TCL_INTEGER_SPACE + 16];
-    TtyAttrs tty;
-
-    if (optionName == NULL) {
-	Tcl_DStringAppendElement(dsPtr, "-mode");
-	len = 0;
-    } else {
-	len = strlen(optionName);
-    }
-    if ((len == 0) || 
-	    ((len > 1) && (strncmp(optionName, "-mode", len) == 0))) {
-	TtyGetAttributes(fsPtr->fd, &tty);
-	sprintf(buf, "%d,%c,%d,%d", tty.baud, tty.parity, tty.data, tty.stop);
-	Tcl_DStringAppendElement(dsPtr, buf);
-	return TCL_OK;
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, "mode");
-    }
-}
-
-#undef DIRECT_BAUD
-#ifdef B4800
-#   if (B4800 == 4800)
-#	define DIRECT_BAUD
-#   endif
-#endif
-
-#ifdef DIRECT_BAUD
-#   define TtyGetSpeed(baud)   ((unsigned) (baud))
-#   define TtyGetBaud(speed)   ((int) (speed))
-#else
-
-static struct {int baud; unsigned long speed;} speeds[] = {
-#ifdef B0
-    {0, B0},
-#endif
-#ifdef B50
-    {50, B50},
-#endif
-#ifdef B75
-    {75, B75},
-#endif
-#ifdef B110
-    {110, B110},
-#endif
-#ifdef B134
-    {134, B134},
-#endif
-#ifdef B150
-    {150, B150},
-#endif
-#ifdef B200
-    {200, B200},
-#endif
-#ifdef B300
-    {300, B300},
-#endif
-#ifdef B600
-    {600, B600},
-#endif
-#ifdef B1200
-    {1200, B1200},
-#endif
-#ifdef B1800
-    {1800, B1800},
-#endif
-#ifdef B2400
-    {2400, B2400},
-#endif
-#ifdef B4800
-    {4800, B4800},
-#endif
-#ifdef B9600
-    {9600, B9600},
-#endif
-#ifdef B14400
-    {14400, B14400},
-#endif
-#ifdef B19200
-    {19200, B19200},
-#endif
-#ifdef EXTA
-    {19200, EXTA},
-#endif
-#ifdef B28800
-    {28800, B28800},
-#endif
-#ifdef B38400
-    {38400, B38400},
-#endif
-#ifdef EXTB
-    {38400, EXTB},
-#endif
-#ifdef B57600
-    {57600, B57600},
-#endif
-#ifdef _B57600
-    {57600, _B57600},
-#endif
-#ifdef B76800
-    {76800, B76800},
-#endif
-#ifdef B115200
-    {115200, B115200},
-#endif
-#ifdef _B115200
-    {115200, _B115200},
-#endif
-#ifdef B153600
-    {153600, B153600},
-#endif
-#ifdef B230400
-    {230400, B230400},
-#endif
-#ifdef B307200
-    {307200, B307200},
-#endif
-#ifdef B460800
-    {460800, B460800},
-#endif
-    {-1, 0}
-};
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtyGetSpeed --
- *
- *	Given a baud rate, get the mask value that should be stored in
- *	the termios, termio, or sgttyb structure in order to select that
- *	baud rate.
- *
- * Results:
- *	As above.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static unsigned long
-TtyGetSpeed(baud)
-    int baud;			/* The baud rate to look up. */
-{
-    int bestIdx, bestDiff, i, diff;
-    
-    bestIdx = 0;
-    bestDiff = 1000000;
-    
-    /*
-     * If the baud rate does not correspond to one of the known mask values,
-     * choose the mask value whose baud rate is closest to the specified
-     * baud rate.
-     */
-
-    for (i = 0; speeds[i].baud >= 0; i++) {
-	diff = speeds[i].baud - baud;
-	if (diff < 0) {
-	    diff = -diff;
-	}
-	if (diff < bestDiff) {
-	    bestIdx = i;
-	    bestDiff = diff;
-	}
-    }
-    return speeds[bestIdx].speed;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtyGetBaud --
- *
- *	Given a speed mask value from a termios, termio, or sgttyb
- *	structure, get the baus rate that corresponds to that mask value.
- *
- * Results:
- *	As above.  If the mask value was not recognized, 0 is returned.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-TtyGetBaud(speed)
-    unsigned long speed;	/* Speed mask value to look up. */
-{
-    int i;
-    
-    for (i = 0; speeds[i].baud >= 0; i++) {
-	if (speeds[i].speed == speed) {
-	    return speeds[i].baud;
-	}
-    }
-    return 0;
-}
-
-#endif	/* !DIRECT_BAUD */
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtyGetAttributes --
- *
- *	Get the current attributes of the specified serial device.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-static void
-TtyGetAttributes(fd, ttyPtr)
-    int fd;			/* Open file descriptor for serial port to
-				 * be queried. */
-    TtyAttrs *ttyPtr;		/* Buffer filled with serial port
-				 * attributes. */
-{
-    IOSTATE iostate;
-    int baud, parity, data, stop;
-
-    GETIOSTATE(fd, &iostate);
-
-#ifdef USE_TERMIOS
-    baud = TtyGetBaud(cfgetospeed(&iostate));
-    
-    parity = 'n';
-#ifdef PAREXT
-    switch ((int) (iostate.c_cflag & (PARENB | PARODD | PAREXT))) {
-	case PARENB		      : parity = 'e'; break;
-	case PARENB | PARODD	      :	parity = 'o'; break;
-	case PARENB |	       PAREXT : parity = 's'; break;
-	case PARENB | PARODD | PAREXT :	parity = 'm'; break;
-    }
-#else	/* !PAREXT */
-    switch ((int) (iostate.c_cflag & (PARENB | PARODD))) {
-	case PARENB		      : parity = 'e'; break;
-	case PARENB | PARODD	      :	parity = 'o'; break;
-    }
-#endif	/* !PAREXT */
-
-    data = iostate.c_cflag & CSIZE;
-    data = (data == CS5) ? 5 : (data == CS6) ? 6 : (data == CS7) ? 7 : 8;
-
-    stop = (iostate.c_cflag & CSTOPB) ? 2 : 1;
-#endif	/* USE_TERMIOS */
-
-#ifdef USE_TERMIO
-    baud = TtyGetBaud(iostate.c_cflag & CBAUD);
-
-    parity = 'n';
-    switch (iostate.c_cflag & (PARENB | PARODD | PAREXT)) {
-	case PARENB		      : parity = 'e'; break;
-	case PARENB | PARODD	      :	parity = 'o'; break;
-	case PARENB |	       PAREXT : parity = 's'; break;
-	case PARENB | PARODD | PAREXT :	parity = 'm'; break;
-    }
-
-    data = iostate.c_cflag & CSIZE;
-    data = (data == CS5) ? 5 : (data == CS6) ? 6 : (data == CS7) ? 7 : 8;
-
-    stop = (iostate.c_cflag & CSTOPB) ? 2 : 1;
-#endif	/* USE_TERMIO */
-
-#ifdef USE_SGTTY
-    baud = TtyGetBaud(iostate.sg_ospeed);
-
-    parity = 'n';
-    if (iostate.sg_flags & EVENP) {
-	parity = 'e';
-    } else if (iostate.sg_flags & ODDP) {
-	parity = 'o';
-    }
-
-    data = (iostate.sg_flags & (EVENP | ODDP)) ? 7 : 8;
-
-    stop = 1;
-#endif	/* USE_SGTTY */
-
-    ttyPtr->baud    = baud;
-    ttyPtr->parity  = parity;
-    ttyPtr->data    = data;
-    ttyPtr->stop    = stop;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtySetAttributes --
- *
- *	Set the current attributes of the specified serial device. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-static void
-TtySetAttributes(fd, ttyPtr)
-    int fd;			/* Open file descriptor for serial port to
-				 * be modified. */
-    TtyAttrs *ttyPtr;		/* Buffer containing new attributes for
-				 * serial port. */
-{
-    IOSTATE iostate;
-
-#ifdef USE_TERMIOS
-    int parity, data, flag;
-
-    GETIOSTATE(fd, &iostate);
-    cfsetospeed(&iostate, TtyGetSpeed(ttyPtr->baud));
-    cfsetispeed(&iostate, TtyGetSpeed(ttyPtr->baud));
-
-    flag = 0;
-    parity = ttyPtr->parity;
-    if (parity != 'n') {
-	flag |= PARENB;
-#ifdef PAREXT
-	iostate.c_cflag &= ~PAREXT;
-	if ((parity == 'm') || (parity == 's')) {
-	    flag |= PAREXT;
-	}
-#endif
-	if ((parity == 'm') || (parity == 'o')) {
-	    flag |= PARODD;
-	}
-    }
-    data = ttyPtr->data;
-    flag |= (data == 5) ? CS5 : (data == 6) ? CS6 : (data == 7) ? CS7 : CS8;
-    if (ttyPtr->stop == 2) {
-	flag |= CSTOPB;
-    }
-
-    iostate.c_cflag &= ~(PARENB | PARODD | CSIZE | CSTOPB);
-    iostate.c_cflag |= flag;
-
-#endif	/* USE_TERMIOS */
-
-#ifdef USE_TERMIO
-    int parity, data, flag;
-
-    GETIOSTATE(fd, &iostate);
-    iostate.c_cflag &= ~CBAUD;
-    iostate.c_cflag |= TtyGetSpeed(ttyPtr->baud);
-
-    flag = 0;
-    parity = ttyPtr->parity;
-    if (parity != 'n') {
-	flag |= PARENB;
-	if ((parity == 'm') || (parity == 's')) {
-	    flag |= PAREXT;
-	}
-	if ((parity == 'm') || (parity == 'o')) {
-	    flag |= PARODD;
-	}
-    }
-    data = ttyPtr->data;
-    flag |= (data == 5) ? CS5 : (data == 6) ? CS6 : (data == 7) ? CS7 : CS8;
-    if (ttyPtr->stop == 2) {
-	flag |= CSTOPB;
-    }
-
-    iostate.c_cflag &= ~(PARENB | PARODD | PAREXT | CSIZE | CSTOPB);
-    iostate.c_cflag |= flag;
-
-#endif	/* USE_TERMIO */
-
-#ifdef USE_SGTTY
-    int parity;
-
-    GETIOSTATE(fd, &iostate);
-    iostate.sg_ospeed = TtyGetSpeed(ttyPtr->baud);
-    iostate.sg_ispeed = TtyGetSpeed(ttyPtr->baud);
-
-    parity = ttyPtr->parity;
-    if (parity == 'e') {
-	iostate.sg_flags &= ~ODDP;
-	iostate.sg_flags |= EVENP;
-    } else if (parity == 'o') {
-	iostate.sg_flags &= ~EVENP;
-	iostate.sg_flags |= ODDP;
-    }
-#endif	/* USE_SGTTY */
-
-    SETIOSTATE(fd, &iostate);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtyParseMode --
- *
- *	Parse the "-mode" argument to the fconfigure command.  The argument
- *	is of the form baud,parity,data,stop.
- *
- * Results:
- *	The return value is TCL_OK if the argument was successfully
- *	parsed, TCL_ERROR otherwise.  If TCL_ERROR is returned, an
- *	error message is left in the interp's result (if interp is non-NULL).
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
- 
-static int
-TtyParseMode(interp, mode, speedPtr, parityPtr, dataPtr, stopPtr)
-    Tcl_Interp *interp;		/* If non-NULL, interp for error return. */
-    CONST char *mode;		/* Mode string to be parsed. */
-    int *speedPtr;		/* Filled with baud rate from mode string. */
-    int *parityPtr;		/* Filled with parity from mode string. */
-    int *dataPtr;		/* Filled with data bits from mode string. */
-    int *stopPtr;		/* Filled with stop bits from mode string. */
-{
-    int i, end;
-    char parity;
-    static char *bad = "bad value for -mode";
-
-    i = sscanf(mode, "%d,%c,%d,%d%n", speedPtr, &parity, dataPtr,
-	    stopPtr, &end);
-    if ((i != 4) || (mode[end] != '\0')) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, bad, ": should be baud,parity,data,stop",
-		    NULL);
-	}
-	return TCL_ERROR;
-    }
-    if (strchr("noems", parity) == NULL) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, bad,
-		    " parity: should be n, o, e, m, or s", NULL);
-	}
-	return TCL_ERROR;
-    }
-    *parityPtr = parity;
-    if ((*dataPtr < 5) || (*dataPtr > 8)) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, bad, " data: should be 5, 6, 7, or 8",
-		    NULL);
-	}
-	return TCL_ERROR;
-    }
-    if ((*stopPtr < 0) || (*stopPtr > 2)) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, bad, " stop: should be 1 or 2", NULL);
-	}
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TtyInit --
- *
- *	Given file descriptor that refers to a serial port, 
- *	initialize the serial port to a set of sane values so that
- *	Tcl can talk to a device located on the serial port.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Serial device initialized to non-blocking raw mode, similar to
- *	sockets.  All other modes can be simulated on top of this in Tcl.
- *
- *---------------------------------------------------------------------------
- */
-
-static FileState *
-TtyInit(fd)
-    int fd;			/* Open file descriptor for serial port to
-				 * be initialized. */
-{
-    IOSTATE iostate;
-    TtyState *ttyPtr;
-
-    ttyPtr = (TtyState *) ckalloc((unsigned) sizeof(TtyState));
-    GETIOSTATE(fd, &ttyPtr->savedState);
-
-    iostate = ttyPtr->savedState;
-
-#ifdef USE_TERMIOS
-    iostate.c_iflag = IGNBRK;
-    iostate.c_oflag = 0;
-    iostate.c_lflag = 0;
-    iostate.c_cflag |= CREAD;
-    iostate.c_cc[VMIN] = 1;
-    iostate.c_cc[VTIME] = 0;
-#endif	/* USE_TERMIOS */
-
-#ifdef USE_TERMIO
-    iostate.c_iflag = IGNBRK;
-    iostate.c_oflag = 0;
-    iostate.c_lflag = 0;
-    iostate.c_cflag |= CREAD;
-    iostate.c_cc[VMIN] = 1;
-    iostate.c_cc[VTIME] = 0;
-#endif	/* USE_TERMIO */
-
-#ifdef USE_SGTTY
-    iostate.sg_flags &= (EVENP | ODDP);
-    iostate.sg_flags |= RAW;
-#endif	/* USE_SGTTY */
-
-    SETIOSTATE(fd, &iostate);
-
-    return &ttyPtr->fs;
-}
-#endif	/* SUPPORTS_TTY */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpOpenFileChannel --
- *
- *	Open an file based channel on Unix systems.
- *
- * Results:
- *	The new channel or NULL. If NULL, the output argument
- *	errorCodePtr is set to a POSIX error and an error message is
- *	left in the interp's result if interp is not NULL.
- *
- * Side effects:
- *	May open the channel and may cause creation of a file on the
- *	file system.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpOpenFileChannel(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;			/* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;			/* Name of file to open. */
-    char *modeString;			/* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;			/* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    int fd, seekFlag, mode, channelPermissions;
-    FileState *fsPtr;
-    char *native, *translation;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    Tcl_DString ds, buffer;
-    Tcl_ChannelType *channelTypePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    mode = TclGetOpenMode(interp, modeString, &seekFlag);
-    if (mode == -1) {
-        return NULL;
-    }
-    switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
-	case O_RDONLY:
-	    channelPermissions = TCL_READABLE;
-	    break;
-	case O_WRONLY:
-	    channelPermissions = TCL_WRITABLE;
-	    break;
-	case O_RDWR:
-	    channelPermissions = (TCL_READABLE | TCL_WRITABLE);
-	    break;
-	default:
-            /*
-             * This may occurr if modeString was "", for example.
-             */
-	    panic("TclpOpenFileChannel: invalid mode value");
-	    return NULL;
-    }
-
-    native = Tcl_TranslateFileName(interp, fileName, &buffer);
-    if (native == NULL) {
-	return NULL;
-    }
-    native = Tcl_UtfToExternalDString(NULL, native, -1, &ds);
-    fd = open(native, mode, permissions);		/* INTL: Native. */
-    Tcl_DStringFree(&ds);    
-    Tcl_DStringFree(&buffer);
-
-    if (fd < 0) {
-        if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "couldn't open \"", fileName, "\": ",
-                    Tcl_PosixError(interp), (char *) NULL);
-        }
-        return NULL;
-    }
-
-    /*
-     * Set close-on-exec flag on the fd so that child processes will not
-     * inherit this fd.
-     */
-  
-    fcntl(fd, F_SETFD, FD_CLOEXEC);
-    
-    sprintf(channelName, "file%d", fd);
-    
-#ifdef SUPPORTS_TTY
-    if (isatty(fd)) {
-	/*
-	 * Initialize the serial port to a set of sane parameters.
-	 * Especially important if the remote device is set to echo and
-	 * the serial port driver was also set to echo -- as soon as a char
-	 * were sent to the serial port, the remote device would echo it,
-	 * then the serial driver would echo it back to the device, etc.
-	 */
-	 
-	translation = "auto crlf";
-	channelTypePtr = &ttyChannelType;
-	fsPtr = TtyInit(fd);
-    } else 
-#endif	/* SUPPORTS_TTY */
-    {
-	translation = NULL;
-	channelTypePtr = &fileChannelType;
-	fsPtr = (FileState *) ckalloc((unsigned) sizeof(FileState));
-    }
-
-    fsPtr->nextPtr = tsdPtr->firstFilePtr;
-    tsdPtr->firstFilePtr = fsPtr;
-    fsPtr->validMask = channelPermissions | TCL_EXCEPTION;
-    fsPtr->fd = fd;
-    
-    fsPtr->channel = Tcl_CreateChannel(channelTypePtr, channelName,
-	    (ClientData) fsPtr, channelPermissions);
-
-    if (seekFlag) {
-        if (Tcl_Seek(fsPtr->channel, 0, SEEK_END) < 0) {
-            if (interp != (Tcl_Interp *) NULL) {
-                Tcl_AppendResult(interp, "couldn't seek to end of file on \"",
-                        channelName, "\": ", Tcl_PosixError(interp), NULL);
-            }
-            Tcl_Close(NULL, fsPtr->channel);
-            return NULL;
-        }
-    }
-
-    if (translation != NULL) {
-	/*
-	 * Gotcha.  Most modems need a "\r" at the end of the command
-	 * sequence.  If you just send "at\n", the modem will not respond
-	 * with "OK" because it never got a "\r" to actually invoke the
-	 * command.  So, by default, newlines are translated to "\r\n" on
-	 * output to avoid "bug" reports that the serial port isn't working.
-	 */
-	 
-	if (Tcl_SetChannelOption(interp, fsPtr->channel, "-translation",
-		translation) != TCL_OK) {
-	    Tcl_Close(NULL, fsPtr->channel);
-	    return NULL;
-	}
-    }
-
-    return fsPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeFileChannel --
- *
- *	Makes a Tcl_Channel from an existing OS level file handle.
- *
- * Results:
- *	The Tcl_Channel created around the preexisting OS level file handle.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeFileChannel(handle, mode)
-    ClientData handle;		/* OS level handle. */
-    int mode;			/* ORed combination of TCL_READABLE and
-                                 * TCL_WRITABLE to indicate file mode. */
-{
-    FileState *fsPtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    int fd = (int) handle;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (mode == 0) {
-        return NULL;
-    }
-
-    sprintf(channelName, "file%d", fd);
-
-    /*
-     * Look to see if a channel with this fd and the same mode already exists.
-     * If the fd is used, but the mode doesn't match, return NULL.
-     */
-    
-    for (fsPtr = tsdPtr->firstFilePtr; fsPtr != NULL; fsPtr = fsPtr->nextPtr) {
-	if (fsPtr->fd == fd) {
-	    return ((mode|TCL_EXCEPTION) == fsPtr->validMask) ?
-		    fsPtr->channel : NULL;
-	}
-    }
-
-    fsPtr = (FileState *) ckalloc((unsigned) sizeof(FileState));
-    fsPtr->nextPtr = tsdPtr->firstFilePtr;
-    tsdPtr->firstFilePtr = fsPtr;
-
-    fsPtr->fd = fd;
-    fsPtr->validMask = mode | TCL_EXCEPTION;
-    fsPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName,
-            (ClientData) fsPtr, mode);
-    
-    return fsPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpBlockModeProc --
- *
- *	This procedure is invoked by the generic IO level to set blocking
- *	and nonblocking mode on a TCP socket based channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or nonblocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TcpBlockModeProc(instanceData, mode)
-    ClientData instanceData;		/* Socket state. */
-    int mode;				/* The mode to set. Can be one of
-                                         * TCL_MODE_BLOCKING or
-                                         * TCL_MODE_NONBLOCKING. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    int setting;
-    
-#ifndef	USE_FIONBIO
-    setting = fcntl(statePtr->fd, F_GETFL);
-    if (mode == TCL_MODE_BLOCKING) {
-        statePtr->flags &= (~(TCP_ASYNC_SOCKET));
-        setting &= (~(O_NONBLOCK));
-    } else {
-        statePtr->flags |= TCP_ASYNC_SOCKET;
-        setting |= O_NONBLOCK;
-    }
-    if (fcntl(statePtr->fd, F_SETFL, setting) < 0) {
-        return errno;
-    }
-#endif
-
-#ifdef	USE_FIONBIO
-    if (mode == TCL_MODE_BLOCKING) {
-        statePtr->flags &= (~(TCP_ASYNC_SOCKET));
-        setting = 0;
-        if (ioctl(statePtr->fd, (int) FIONBIO, &setting) == -1) {
-            return errno;
-        }
-    } else {
-        statePtr->flags |= TCP_ASYNC_SOCKET;
-        setting = 1;
-        if (ioctl(statePtr->fd, (int) FIONBIO, &setting) == -1) {
-            return errno;
-        }
-    }
-#endif
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForConnect --
- *
- *	Waits for a connection on an asynchronously opened socket to
- *	be completed.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The socket is connected after this function returns.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForConnect(statePtr, errorCodePtr)
-    TcpState *statePtr;		/* State of the socket. */
-    int *errorCodePtr;		/* Where to store errors? */
-{
-    int timeOut;		/* How long to wait. */
-    int state;			/* Of calling TclWaitForFile. */
-    int flags;			/* fcntl flags for the socket. */
-
-    /*
-     * If an asynchronous connect is in progress, attempt to wait for it
-     * to complete before reading.
-     */
-    
-    if (statePtr->flags & TCP_ASYNC_CONNECT) {
-        if (statePtr->flags & TCP_ASYNC_SOCKET) {
-            timeOut = 0;
-        } else {
-            timeOut = -1;
-        }
-        errno = 0;
-        state = TclUnixWaitForFile(statePtr->fd,
-		TCL_WRITABLE | TCL_EXCEPTION, timeOut);
-        if (!(statePtr->flags & TCP_ASYNC_SOCKET)) {
-#ifndef	USE_FIONBIO
-            flags = fcntl(statePtr->fd, F_GETFL);
-            flags &= (~(O_NONBLOCK));
-            (void) fcntl(statePtr->fd, F_SETFL, flags);
-#endif
-
-#ifdef	USE_FIONBIO
-            flags = 0;
-            (void) ioctl(statePtr->fd, FIONBIO, &flags);
-#endif
-        }
-        if (state & TCL_EXCEPTION) {
-            return -1;
-        }
-        if (state & TCL_WRITABLE) {
-            statePtr->flags &= (~(TCP_ASYNC_CONNECT));
-        } else if (timeOut == 0) {
-            *errorCodePtr = errno = EWOULDBLOCK;
-            return -1;
-        }
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpInputProc --
- *
- *	This procedure is invoked by the generic IO level to read input
- *	from a TCP socket based channel.
- *
- *	NOTE: We cannot share code with FilePipeInputProc because here
- *	we must use recv to obtain the input from the channel, not read.
- *
- * Results:
- *	The number of bytes read is returned or -1 on error. An output
- *	argument contains the POSIX error code on error, or zero if no
- *	error occurred.
- *
- * Side effects:
- *	Reads input from the input device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TcpInputProc(instanceData, buf, bufSize, errorCodePtr)
-    ClientData instanceData;		/* Socket state. */
-    char *buf;				/* Where to store data read. */
-    int bufSize;			/* How much space is available
-                                         * in the buffer? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    int bytesRead, state;
-
-    *errorCodePtr = 0;
-    state = WaitForConnect(statePtr, errorCodePtr);
-    if (state != 0) {
-        return -1;
-    }
-    bytesRead = recv(statePtr->fd, buf, bufSize, 0);
-    if (bytesRead > -1) {
-        return bytesRead;
-    }
-    if (errno == ECONNRESET) {
-
-        /*
-         * Turn ECONNRESET into a soft EOF condition.
-         */
-        
-        return 0;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpOutputProc --
- *
- *	This procedure is invoked by the generic IO level to write output
- *	to a TCP socket based channel.
- *
- *	NOTE: We cannot share code with FilePipeOutputProc because here
- *	we must use send, not write, to get reliable error reporting.
- *
- * Results:
- *	The number of bytes written is returned. An output argument is
- *	set to a POSIX error code if an error occurred, or zero.
- *
- * Side effects:
- *	Writes output on the output device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpOutputProc(instanceData, buf, toWrite, errorCodePtr)
-    ClientData instanceData;		/* Socket state. */
-    char *buf;				/* The data buffer. */
-    int toWrite;			/* How many bytes to write? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    int written;
-    int state;				/* Of waiting for connection. */
-
-    *errorCodePtr = 0;
-    state = WaitForConnect(statePtr, errorCodePtr);
-    if (state != 0) {
-        return -1;
-    }
-    written = send(statePtr->fd, buf, toWrite, 0);
-    if (written > -1) {
-        return written;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpCloseProc --
- *
- *	This procedure is invoked by the generic IO level to perform
- *	channel-type-specific cleanup when a TCP socket based channel
- *	is closed.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the socket of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TcpCloseProc(instanceData, interp)
-    ClientData instanceData;	/* The socket to close. */
-    Tcl_Interp *interp;		/* For error reporting - unused. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    int errorCode = 0;
-
-    /*
-     * Delete a file handler that may be active for this socket if this
-     * is a server socket - the file handler was created automatically
-     * by Tcl as part of the mechanism to accept new client connections.
-     * Channel handlers are already deleted in the generic IO channel
-     * closing code that called this function, so we do not have to
-     * delete them here.
-     */
-
-    Tcl_DeleteFileHandler(statePtr->fd);
-
-    if (close(statePtr->fd) < 0) {
-	errorCode = errno;
-    }
-    ckfree((char *) statePtr);
-
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetOptionProc --
- *
- *	Computes an option value for a TCP socket based channel, or a
- *	list of all options and their values.
- *
- *	Note: This code is based on code contributed by John Haxby.
- *
- * Results:
- *	A standard Tcl result. The value of the specified option or a
- *	list of all options and	their values is returned in the
- *	supplied DString. Sets Error message if needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpGetOptionProc(instanceData, interp, optionName, dsPtr)
-    ClientData instanceData;     /* Socket state. */
-    Tcl_Interp *interp;          /* For error reporting - can be NULL. */
-    char *optionName;	         /* Name of the option to
-				  * retrieve the value for, or
-				  * NULL to get all options and
-				  * their values. */
-    Tcl_DString *dsPtr;	         /* Where to store the computed
-				  * value; initialized by caller. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-    struct sockaddr_in sockname;
-    struct sockaddr_in peername;
-    struct hostent *hostEntPtr;
-    int size = sizeof(struct sockaddr_in);
-    size_t len = 0;
-    char buf[TCL_INTEGER_SPACE];
-
-    if (optionName != (char *) NULL) {
-        len = strlen(optionName);
-    }
-
-    if ((len > 1) && (optionName[1] == 'e') &&
-	    (strncmp(optionName, "-error", len) == 0)) {
-	int optlen;
-	int err, ret;
-    
-	optlen = sizeof(int);
-	ret = getsockopt(statePtr->fd, SOL_SOCKET, SO_ERROR,
-		(char *)&err, &optlen);
-	if (ret < 0) {
-	    err = errno;
-	}
-	if (err != 0) {
-	    Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(err), -1);
-	}
-       return TCL_OK;
-    }
-
-    if ((len == 0) ||
-            ((len > 1) && (optionName[1] == 'p') &&
-                    (strncmp(optionName, "-peername", len) == 0))) {
-        if (getpeername(statePtr->fd, (struct sockaddr *) &peername,
-		&size) >= 0) {
-            if (len == 0) {
-                Tcl_DStringAppendElement(dsPtr, "-peername");
-                Tcl_DStringStartSublist(dsPtr);
-            }
-            Tcl_DStringAppendElement(dsPtr, inet_ntoa(peername.sin_addr));
-            hostEntPtr = gethostbyaddr(			/* INTL: Native. */
-		    (char *) &peername.sin_addr,
-		    sizeof(peername.sin_addr), AF_INET);
-            if (hostEntPtr != NULL) {
-		Tcl_DString ds;
-
-		Tcl_ExternalToUtfDString(NULL, hostEntPtr->h_name, -1, &ds);
-                Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
-            } else {
-                Tcl_DStringAppendElement(dsPtr, inet_ntoa(peername.sin_addr));
-            }
-            TclFormatInt(buf, ntohs(peername.sin_port));
-            Tcl_DStringAppendElement(dsPtr, buf);
-            if (len == 0) {
-                Tcl_DStringEndSublist(dsPtr);
-            } else {
-                return TCL_OK;
-            }
-        } else {
-            /*
-             * getpeername failed - but if we were asked for all the options
-             * (len==0), don't flag an error at that point because it could
-             * be an fconfigure request on a server socket. (which have
-             * no peer). same must be done on win&mac.
-             */
-
-            if (len) {
-                if (interp) {
-                    Tcl_AppendResult(interp, "can't get peername: ",
-                                     Tcl_PosixError(interp),
-                                     (char *) NULL);
-                }
-                return TCL_ERROR;
-            }
-        }
-    }
-
-    if ((len == 0) ||
-            ((len > 1) && (optionName[1] == 's') &&
-                    (strncmp(optionName, "-sockname", len) == 0))) {
-        if (getsockname(statePtr->fd, (struct sockaddr *) &sockname, &size)
-		>= 0) {
-            if (len == 0) {
-                Tcl_DStringAppendElement(dsPtr, "-sockname");
-                Tcl_DStringStartSublist(dsPtr);
-            }
-            Tcl_DStringAppendElement(dsPtr, inet_ntoa(sockname.sin_addr));
-            hostEntPtr = gethostbyaddr(			/* INTL: Native. */
-		    (char *) &sockname.sin_addr,
-                    sizeof(sockname.sin_addr), AF_INET);
-            if (hostEntPtr != (struct hostent *) NULL) {
-		Tcl_DString ds;
-
-		Tcl_ExternalToUtfDString(NULL, hostEntPtr->h_name, -1, &ds);
-                Tcl_DStringAppendElement(dsPtr, Tcl_DStringValue(&ds));
-            } else {
-                Tcl_DStringAppendElement(dsPtr, inet_ntoa(sockname.sin_addr));
-            }
-            TclFormatInt(buf, ntohs(sockname.sin_port));
-            Tcl_DStringAppendElement(dsPtr, buf);
-            if (len == 0) {
-                Tcl_DStringEndSublist(dsPtr);
-            } else {
-                return TCL_OK;
-            }
-        } else {
-	    if (interp) {
-		Tcl_AppendResult(interp, "can't get sockname: ",
-				 Tcl_PosixError(interp),
-				 (char *) NULL);
-	    }
-	    return TCL_ERROR;
-	}
-    }
-
-    if (len > 0) {
-        return Tcl_BadChannelOption(interp, optionName, "peername sockname");
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpWatchProc --
- *
- *	Initialize the notifier to watch the fd from this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the notifier so that a future event on the channel will
- *	be seen by Tcl.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpWatchProc(instanceData, mask)
-    ClientData instanceData;		/* The socket state. */
-    int mask;				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-
-    /*
-     * Make sure we don't mess with server sockets since they will never
-     * be readable or writable at the Tcl level.  This keeps Tcl scripts
-     * from interfering with the -accept behavior.
-     */
-
-    if (!statePtr->acceptProc) {
-	if (mask) {
-	    Tcl_CreateFileHandler(statePtr->fd, mask,
-		    (Tcl_FileProc *) Tcl_NotifyChannel,
-		    (ClientData) statePtr->channel);
-	} else {
-	    Tcl_DeleteFileHandler(statePtr->fd);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from inside
- *	a TCP socket based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-TcpGetHandleProc(instanceData, direction, handlePtr)
-    ClientData instanceData;	/* The socket state. */
-    int direction;		/* Not used. */
-    ClientData *handlePtr;	/* Where to store the handle.  */
-{
-    TcpState *statePtr = (TcpState *) instanceData;
-
-    *handlePtr = (ClientData)statePtr->fd;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateSocket --
- *
- *	This function opens a new socket in client or server mode
- *	and initializes the TcpState structure.
- *
- * Results:
- *	Returns a new TcpState, or NULL with an error in the interp's
- *	result, if interp is not NULL.
- *
- * Side effects:
- *	Opens a socket.
- *
- *----------------------------------------------------------------------
- */
-
-static TcpState *
-CreateSocket(interp, port, host, server, myaddr, myport, async)
-    Tcl_Interp *interp;		/* For error reporting; can be NULL. */
-    int port;			/* Port number to open. */
-    char *host;			/* Name of host on which to open port.
-				 * NULL implies INADDR_ANY */
-    int server;			/* 1 if socket should be a server socket,
-				 * else 0 for a client socket. */
-    char *myaddr;		/* Optional client-side address */
-    int myport;			/* Optional client-side port */
-    int async;			/* If nonzero and creating a client socket,
-                                 * attempt to do an async connect. Otherwise
-                                 * do a synchronous connect or bind. */
-{
-    int status, sock, asyncConnect, curState, origState;
-    struct sockaddr_in sockaddr;	/* socket address */
-    struct sockaddr_in mysockaddr;	/* Socket address for client */
-    TcpState *statePtr;
-
-    sock = -1;
-    origState = 0;
-    if (! CreateSocketAddress(&sockaddr, host, port)) {
-	goto addressError;
-    }
-    if ((myaddr != NULL || myport != 0) &&
-	    ! CreateSocketAddress(&mysockaddr, myaddr, myport)) {
-	goto addressError;
-    }
-
-    sock = socket(AF_INET, SOCK_STREAM, 0);
-    if (sock < 0) {
-	goto addressError;
-    }
-
-    /*
-     * Set the close-on-exec flag so that the socket will not get
-     * inherited by child processes.
-     */
-
-    fcntl(sock, F_SETFD, FD_CLOEXEC);
-    
-    /*
-     * Set kernel space buffering
-     */
-
-    TclSockMinimumBuffers(sock, SOCKET_BUFSIZE);
-
-    asyncConnect = 0;
-    status = 0;
-    if (server) {
-
-	/*
-	 * Set up to reuse server addresses automatically and bind to the
-	 * specified port.
-	 */
-    
-	status = 1;
-	(void) setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &status,
-		sizeof(status));
-	status = bind(sock, (struct sockaddr *) &sockaddr,
-                sizeof(struct sockaddr));
-	if (status != -1) {
-	    status = listen(sock, SOMAXCONN);
-	} 
-    } else {
-	if (myaddr != NULL || myport != 0) { 
-	    curState = 1;
-	    (void) setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-                    (char *) &curState, sizeof(curState));
-	    status = bind(sock, (struct sockaddr *) &mysockaddr,
-		    sizeof(struct sockaddr));
-	    if (status < 0) {
-		goto bindError;
-	    }
-	}
-
-	/*
-	 * Attempt to connect. The connect may fail at present with an
-	 * EINPROGRESS but at a later time it will complete. The caller
-	 * will set up a file handler on the socket if she is interested in
-	 * being informed when the connect completes.
-	 */
-
-        if (async) {
-#ifndef	USE_FIONBIO
-            origState = fcntl(sock, F_GETFL);
-            curState = origState | O_NONBLOCK;
-            status = fcntl(sock, F_SETFL, curState);
-#endif
-
-#ifdef	USE_FIONBIO
-            curState = 1;
-            status = ioctl(sock, FIONBIO, &curState);
-#endif            
-        } else {
-            status = 0;
-        }
-        if (status > -1) {
-            status = connect(sock, (struct sockaddr *) &sockaddr,
-                    sizeof(sockaddr));
-            if (status < 0) {
-                if (errno == EINPROGRESS) {
-                    asyncConnect = 1;
-                    status = 0;
-                }
-            }
-        }
-    }
-
-bindError:
-    if (status < 0) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "couldn't open socket: ",
-                    Tcl_PosixError(interp), (char *) NULL);
-        }
-        if (sock != -1) {
-            close(sock);
-        }
-        return NULL;
-    }
-
-    /*
-     * Allocate a new TcpState for this socket.
-     */
-
-    statePtr = (TcpState *) ckalloc((unsigned) sizeof(TcpState));
-    statePtr->flags = 0;
-    if (asyncConnect) {
-        statePtr->flags = TCP_ASYNC_CONNECT;
-    }
-    statePtr->fd = sock;
-
-    return statePtr;
-
-addressError:
-    if (sock != -1) {
-        close(sock);
-    }
-    if (interp != NULL) {
-	Tcl_AppendResult(interp, "couldn't open socket: ",
-		Tcl_PosixError(interp), (char *) NULL);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateSocketAddress --
- *
- *	This function initializes a sockaddr structure for a host and port.
- *
- * Results:
- *	1 if the host was valid, 0 if the host could not be converted to
- *	an IP address.
- *
- * Side effects:
- *	Fills in the *sockaddrPtr structure.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CreateSocketAddress(sockaddrPtr, host, port)
-    struct sockaddr_in *sockaddrPtr;	/* Socket address */
-    char *host;				/* Host.  NULL implies INADDR_ANY */
-    int port;				/* Port number */
-{
-    struct hostent *hostent;		/* Host database entry */
-    struct in_addr addr;		/* For 64/32 bit madness */
-
-    (void) memset((VOID *) sockaddrPtr, '\0', sizeof(struct sockaddr_in));
-    sockaddrPtr->sin_family = AF_INET;
-    sockaddrPtr->sin_port = htons((unsigned short) (port & 0xFFFF));
-    if (host == NULL) {
-	addr.s_addr = INADDR_ANY;
-    } else {
-	Tcl_DString ds;
-	CONST char *native;
-
-	if (host == NULL) {
-	    native = NULL;
-	} else {
-	    native = Tcl_UtfToExternalDString(NULL, host, -1, &ds);
-	}
-        addr.s_addr = inet_addr(native);		/* INTL: Native. */
-        if (addr.s_addr == -1) {
-            hostent = gethostbyname(native);		/* INTL: Native. */
-            if (hostent != NULL) {
-                memcpy((VOID *) &addr,
-                        (VOID *) hostent->h_addr_list[0],
-                        (size_t) hostent->h_length);
-            } else {
-#ifdef	EHOSTUNREACH
-                errno = EHOSTUNREACH;
-#else
-#ifdef ENXIO
-                errno = ENXIO;
-#endif
-#endif
-		if (native != NULL) {
-		    Tcl_DStringFree(&ds);
-		}
-                return 0;	/* error */
-            }
-        }
-	if (native != NULL) {
-	    Tcl_DStringFree(&ds);
-	}
-    }
-        
-    /*
-     * NOTE: On 64 bit machines the assignment below is rumored to not
-     * do the right thing. Please report errors related to this if you
-     * observe incorrect behavior on 64 bit machines such as DEC Alphas.
-     * Should we modify this code to do an explicit memcpy?
-     */
-
-    sockaddrPtr->sin_addr.s_addr = addr.s_addr;
-    return 1;	/* Success. */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpClient --
- *
- *	Opens a TCP client socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed.  An error message is returned
- *	in the interpreter on failure.
- *
- * Side effects:
- *	Opens a client socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpClient(interp, port, host, myaddr, myport, async)
-    Tcl_Interp *interp;			/* For error reporting; can be NULL. */
-    int port;				/* Port number to open. */
-    char *host;				/* Host on which to open port. */
-    char *myaddr;			/* Client-side address */
-    int myport;				/* Client-side port */
-    int async;				/* If nonzero, attempt to do an
-                                         * asynchronous connect. Otherwise
-                                         * we do a blocking connect. */
-{
-    TcpState *statePtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    statePtr = CreateSocket(interp, port, host, 0, myaddr, myport, async);
-    if (statePtr == NULL) {
-	return NULL;
-    }
-
-    statePtr->acceptProc = NULL;
-    statePtr->acceptProcData = (ClientData) NULL;
-
-    sprintf(channelName, "sock%d", statePtr->fd);
-
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE));
-    if (Tcl_SetChannelOption(interp, statePtr->channel, "-translation",
-	    "auto crlf") == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, statePtr->channel);
-        return NULL;
-    }
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeTcpClientChannel --
- *
- *	Creates a Tcl_Channel from an existing client TCP socket.
- *
- * Results:
- *	The Tcl_Channel wrapped around the preexisting TCP socket.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeTcpClientChannel(sock)
-    ClientData sock;		/* The socket to wrap up into a channel. */
-{
-    TcpState *statePtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    statePtr = (TcpState *) ckalloc((unsigned) sizeof(TcpState));
-    statePtr->fd = (int) sock;
-    statePtr->acceptProc = NULL;
-    statePtr->acceptProcData = (ClientData) NULL;
-
-    sprintf(channelName, "sock%d", statePtr->fd);
-    
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, (TCL_READABLE | TCL_WRITABLE));
-    if (Tcl_SetChannelOption((Tcl_Interp *) NULL, statePtr->channel,
-	    "-translation", "auto crlf") == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, statePtr->channel);
-        return NULL;
-    }
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpServer --
- *
- *	Opens a TCP server socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed. If an error occurred, an
- *	error message is left in the interp's result if interp is
- *	not NULL.
- *
- * Side effects:
- *	Opens a server socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpServer(interp, port, myHost, acceptProc, acceptProcData)
-    Tcl_Interp *interp;			/* For error reporting - may be
-                                         * NULL. */
-    int port;				/* Port number to open. */
-    char *myHost;			/* Name of local host. */
-    Tcl_TcpAcceptProc *acceptProc;	/* Callback for accepting connections
-                                         * from new clients. */
-    ClientData acceptProcData;		/* Data for the callback. */
-{
-    TcpState *statePtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    statePtr = CreateSocket(interp, port, myHost, 1, NULL, 0, 0);
-    if (statePtr == NULL) {
-	return NULL;
-    }
-
-    statePtr->acceptProc = acceptProc;
-    statePtr->acceptProcData = acceptProcData;
-
-    /*
-     * Set up the callback mechanism for accepting connections
-     * from new clients.
-     */
-
-    Tcl_CreateFileHandler(statePtr->fd, TCL_READABLE, TcpAccept,
-            (ClientData) statePtr);
-    sprintf(channelName, "sock%d", statePtr->fd);
-    statePtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-            (ClientData) statePtr, 0);
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpAccept --
- *	Accept a TCP socket connection.  This is called by the event loop.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new connection socket. Calls the registered callback
- *	for the connection acceptance mechanism.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static void
-TcpAccept(data, mask)
-    ClientData data;			/* Callback token. */
-    int mask;				/* Not used. */
-{
-    TcpState *sockState;		/* Client data of server socket. */
-    int newsock;			/* The new client socket */
-    TcpState *newSockState;		/* State for new socket. */
-    struct sockaddr_in addr;		/* The remote address */
-    int len;				/* For accept interface */
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    sockState = (TcpState *) data;
-
-    len = sizeof(struct sockaddr_in);
-    newsock = accept(sockState->fd, (struct sockaddr *) &addr, &len);
-    if (newsock < 0) {
-        return;
-    }
-
-    /*
-     * Set close-on-exec flag to prevent the newly accepted socket from
-     * being inherited by child processes.
-     */
-
-    (void) fcntl(newsock, F_SETFD, FD_CLOEXEC);
-    
-    newSockState = (TcpState *) ckalloc((unsigned) sizeof(TcpState));
-
-    newSockState->flags = 0;
-    newSockState->fd = newsock;
-    newSockState->acceptProc = NULL;
-    newSockState->acceptProcData = NULL;
-        
-    sprintf(channelName, "sock%d", newsock);
-    newSockState->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-	    (ClientData) newSockState, (TCL_READABLE | TCL_WRITABLE));
-
-    Tcl_SetChannelOption(NULL, newSockState->channel, "-translation",
-	    "auto crlf");
-
-    if (sockState->acceptProc != NULL) {
-	(*sockState->acceptProc)(sockState->acceptProcData,
-		newSockState->channel, inet_ntoa(addr.sin_addr),
-		ntohs(addr.sin_port));
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDefaultStdChannel --
- *
- *	Creates channels for standard input, standard output or standard
- *	error output if they do not already exist.
- *
- * Results:
- *	Returns the specified default standard channel, or NULL.
- *
- * Side effects:
- *	May cause the creation of a standard channel and the underlying
- *	file.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpGetDefaultStdChannel(type)
-    int type;			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR. */
-{
-    Tcl_Channel channel = NULL;
-    int fd = 0;			/* Initializations needed to prevent */
-    int mode = 0;		/* compiler warning (used before set). */
-    char *bufMode = NULL;
-
-    switch (type) {
-        case TCL_STDIN:
-            if ((lseek(0, (off_t) 0, SEEK_CUR) == -1) &&
-                    (errno == EBADF)) {
-                return (Tcl_Channel) NULL;
-            }
-	    fd = 0;
-	    mode = TCL_READABLE;
-            bufMode = "line";
-            break;
-        case TCL_STDOUT:
-            if ((lseek(1, (off_t) 0, SEEK_CUR) == -1) &&
-                    (errno == EBADF)) {
-                return (Tcl_Channel) NULL;
-            }
-	    fd = 1;
-	    mode = TCL_WRITABLE;
-            bufMode = "line";
-            break;
-        case TCL_STDERR:
-            if ((lseek(2, (off_t) 0, SEEK_CUR) == -1) &&
-                    (errno == EBADF)) {
-                return (Tcl_Channel) NULL;
-            }
-	    fd = 2;
-	    mode = TCL_WRITABLE;
-	    bufMode = "none";
-            break;
-	default:
-	    panic("TclGetDefaultStdChannel: Unexpected channel type");
-	    break;
-    }
-
-    channel = Tcl_MakeFileChannel((ClientData) fd, mode);
-    if (channel == NULL) {
-	return NULL;
-    }
-
-    /*
-     * Set up the normal channel options for stdio handles.
-     */
-
-    Tcl_SetChannelOption(NULL, channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, channel, "-buffering", bufMode);
-    return channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetOpenFile --
- *
- *	Given a name of a channel registered in the given interpreter,
- *	returns a FILE * for it.
- *
- * Results:
- *	A standard Tcl result. If the channel is registered in the given
- *	interpreter and it is managed by the "file" channel driver, and
- *	it is open for the requested mode, then the output parameter
- *	filePtr is set to a FILE * for the underlying file. On error, the
- *	filePtr is not set, TCL_ERROR is returned and an error message is
- *	left in the interp's result.
- *
- * Side effects:
- *	May invoke fdopen to create the FILE * for the requested file.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_GetOpenFile(interp, string, forWriting, checkUsage, filePtr)
-    Tcl_Interp *interp;		/* Interpreter in which to find file. */
-    char *string;		/* String that identifies file. */
-    int forWriting;		/* 1 means the file is going to be used
-				 * for writing, 0 means for reading. */
-    int checkUsage;		/* 1 means verify that the file was opened
-				 * in a mode that allows the access specified
-				 * by "forWriting". Ignored, we always
-                                 * check that the channel is open for the
-                                 * requested mode. */
-    ClientData *filePtr;	/* Store pointer to FILE structure here. */
-{
-    Tcl_Channel chan;
-    int chanMode;
-    Tcl_ChannelType *chanTypePtr;
-    ClientData data;
-    int fd;
-    FILE *f;
-    
-    chan = Tcl_GetChannel(interp, string, &chanMode);
-    if (chan == (Tcl_Channel) NULL) {
-        return TCL_ERROR;
-    }
-    if ((forWriting) && ((chanMode & TCL_WRITABLE) == 0)) {
-        Tcl_AppendResult(interp,
-                "\"", string, "\" wasn't opened for writing", (char *) NULL);
-        return TCL_ERROR;
-    } else if ((!(forWriting)) && ((chanMode & TCL_READABLE) == 0)) {
-        Tcl_AppendResult(interp,
-                "\"", string, "\" wasn't opened for reading", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /*
-     * We allow creating a FILE * out of file based, pipe based and socket
-     * based channels. We currently do not allow any other channel types,
-     * because it is likely that stdio will not know what to do with them.
-     */
-
-    chanTypePtr = Tcl_GetChannelType(chan);
-    if ((chanTypePtr == &fileChannelType)
-#ifdef SUPPORTS_TTY
-	    || (chanTypePtr == &ttyChannelType)
-#endif	/* SUPPORTS_TTY */
-	    || (chanTypePtr == &tcpChannelType)
-	    || (strcmp(chanTypePtr->typeName, "pipe") == 0)) {
-        if (Tcl_GetChannelHandle(chan,
-		(forWriting ? TCL_WRITABLE : TCL_READABLE),
-		(ClientData*) &data) == TCL_OK) {
-	    fd = (int) data;
-
-	    /*
-	     * The call to fdopen below is probably dangerous, since it will
-	     * truncate an existing file if the file is being opened
-	     * for writing....
-	     */
-        
-	    f = fdopen(fd, (forWriting ? "w" : "r"));
-	    if (f == NULL) {
-		Tcl_AppendResult(interp, "cannot get a FILE * for \"", string,
-			"\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    *filePtr = (ClientData) f;
-	    return TCL_OK;
-	}
-    }
-
-    Tcl_AppendResult(interp, "\"", string,
-            "\" cannot be used to get a FILE *", (char *) NULL);
-    return TCL_ERROR;        
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclUnixWaitForFile --
- *
- *	This procedure waits synchronously for a file to become readable
- *	or writable, with an optional timeout.
- *
- * Results:
- *	The return value is an OR'ed combination of TCL_READABLE,
- *	TCL_WRITABLE, and TCL_EXCEPTION, indicating the conditions
- *	that are present on file at the time of the return.  This
- *	procedure will not return until either "timeout" milliseconds
- *	have elapsed or at least one of the conditions given by mask
- *	has occurred for file (a return value of 0 means that a timeout
- *	occurred).  No normal events will be serviced during the
- *	execution of this procedure.
- *
- * Side effects:
- *	Time passes.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclUnixWaitForFile(fd, mask, timeout)
-    int fd;			/* Handle for file on which to wait. */
-    int mask;			/* What to wait for: OR'ed combination of
-				 * TCL_READABLE, TCL_WRITABLE, and
-				 * TCL_EXCEPTION. */
-    int timeout;		/* Maximum amount of time to wait for one
-				 * of the conditions in mask to occur, in
-				 * milliseconds.  A value of 0 means don't
-				 * wait at all, and a value of -1 means
-				 * wait forever. */
-{
-    Tcl_Time abortTime, now;
-    struct timeval blockTime, *timeoutPtr;
-    int index, bit, numFound, result = 0;
-    fd_mask readyMasks[3*MASK_SIZE];
-				/* This array reflects the readable/writable
-				 * conditions that were found to exist by the
-				 * last call to select. */
-
-    /*
-     * If there is a non-zero finite timeout, compute the time when
-     * we give up.
-     */
-
-    if (timeout > 0) {
-	TclpGetTime(&now);
-	abortTime.sec = now.sec + timeout/1000;
-	abortTime.usec = now.usec + (timeout%1000)*1000;
-	if (abortTime.usec >= 1000000) {
-	    abortTime.usec -= 1000000;
-	    abortTime.sec += 1;
-	}
-	timeoutPtr = &blockTime;
-    } else if (timeout == 0) {
-	timeoutPtr = &blockTime;
-	blockTime.tv_sec = 0;
-	blockTime.tv_usec = 0;
-    } else {
-	timeoutPtr = NULL;
-    }
-
-    /*
-     * Initialize the ready masks and compute the mask offsets.
-     */
-
-    if (fd >= FD_SETSIZE) {
-	panic("TclWaitForFile can't handle file id %d", fd);
-    }
-    memset((VOID *) readyMasks, 0, 3*MASK_SIZE*sizeof(fd_mask));
-    index = fd/(NBBY*sizeof(fd_mask));
-    bit = 1 << (fd%(NBBY*sizeof(fd_mask)));
-    
-    /*
-     * Loop in a mini-event loop of our own, waiting for either the
-     * file to become ready or a timeout to occur.
-     */
-
-    while (1) {
-	if (timeout > 0) {
-	    blockTime.tv_sec = abortTime.sec - now.sec;
-	    blockTime.tv_usec = abortTime.usec - now.usec;
-	    if (blockTime.tv_usec < 0) {
-		blockTime.tv_sec -= 1;
-		blockTime.tv_usec += 1000000;
-	    }
-	    if (blockTime.tv_sec < 0) {
-		blockTime.tv_sec = 0;
-		blockTime.tv_usec = 0;
-	    }
-	}
-	
-	/*
-	 * Set the appropriate bit in the ready masks for the fd.
-	 */
-
-	if (mask & TCL_READABLE) {
-	    readyMasks[index] |= bit;
-	}
-	if (mask & TCL_WRITABLE) {
-	    (readyMasks+MASK_SIZE)[index] |= bit;
-	}
-	if (mask & TCL_EXCEPTION) {
-	    (readyMasks+2*(MASK_SIZE))[index] |= bit;
-	}
-
-	/*
-	 * Wait for the event or a timeout.
-	 */
-
-	numFound = select(fd+1, (SELECT_MASK *) &readyMasks[0],
-		(SELECT_MASK *) &readyMasks[MASK_SIZE],
-		(SELECT_MASK *) &readyMasks[2*MASK_SIZE], timeoutPtr);
-	if (numFound == 1) {
-	    if (readyMasks[index] & bit) {
-		result |= TCL_READABLE;
-	    }
-	    if ((readyMasks+MASK_SIZE)[index] & bit) {
-		result |= TCL_WRITABLE;
-	    }
-	    if ((readyMasks+2*(MASK_SIZE))[index] & bit) {
-		result |= TCL_EXCEPTION;
-	    }
-	    result &= mask;
-	    if (result) {
-		break;
-	    }
-	}
-	if (timeout == 0) {
-	    break;
-	}
-
-	/*
-	 * The select returned early, so we need to recompute the timeout.
-	 */
-
-	TclpGetTime(&now);
-	if ((abortTime.sec < now.sec)
-		|| ((abortTime.sec == now.sec)
-		&& (abortTime.usec <= now.usec))) {
-	    break;
-	}
-    }
-    return result;
-}
diff --git a/unix/tclUnixEvent.c b/unix/tclUnixEvent.c
deleted file mode 100644
index 00371b5..0000000
--- a/unix/tclUnixEvent.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 
- * tclUnixEvent.c --
- *
- *	This file implements Unix specific event related routines.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixEvent.c,v 1.3 1999/04/16 00:48:04 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Sleep --
- *
- *	Delay execution for the specified number of milliseconds.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Time passes.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Sleep(ms)
-    int ms;			/* Number of milliseconds to sleep. */
-{
-    struct timeval delay;
-    Tcl_Time before, after;
-
-    /*
-     * The only trick here is that select appears to return early
-     * under some conditions, so we have to check to make sure that
-     * the right amount of time really has elapsed.  If it's too
-     * early, go back to sleep again.
-     */
-
-    TclpGetTime(&before);
-    after = before;
-    after.sec += ms/1000;
-    after.usec += (ms%1000)*1000;
-    if (after.usec > 1000000) {
-	after.usec -= 1000000;
-	after.sec += 1;
-    }
-    while (1) {
-	delay.tv_sec = after.sec - before.sec;
-	delay.tv_usec = after.usec - before.usec;
-	if (delay.tv_usec < 0) {
-	    delay.tv_usec += 1000000;
-	    delay.tv_sec -= 1;
-	}
-
-	/*
-	 * Special note:  must convert delay.tv_sec to int before comparing
-	 * to zero, since delay.tv_usec is unsigned on some platforms.
-	 */
-
-	if ((((int) delay.tv_sec) < 0)
-		|| ((delay.tv_usec == 0) && (delay.tv_sec == 0))) {
-	    break;
-	}
-	(void) select(0, (SELECT_MASK *) 0, (SELECT_MASK *) 0,
-		(SELECT_MASK *) 0, &delay);
-	TclpGetTime(&before);
-    }
-}
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
deleted file mode 100644
index c8b35eb..0000000
--- a/unix/tclUnixFCmd.c
+++ /dev/null
@@ -1,1391 +0,0 @@
-/*
- * tclUnixFCmd.c
- *
- *      This file implements the unix specific portion of file manipulation 
- *      subcommands of the "file" command.  All filename arguments should
- *	already be translated to native format.
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixFCmd.c,v 1.4 1999/04/16 00:48:04 stanton Exp $
- *
- * Portions of this code were derived from NetBSD source code which has
- * the following copyright notice:
- *
- * Copyright (c) 1988, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include <utime.h>
-#include <grp.h>
-#ifndef HAVE_ST_BLKSIZE
-#ifndef NO_FSTATFS
-#include <sys/statfs.h>
-#endif
-#endif
-
-/*
- * The following constants specify the type of callback when
- * TraverseUnixTree() calls the traverseProc()
- */
-
-#define DOTREE_PRED   1     /* pre-order directory  */
-#define DOTREE_POSTD  2     /* post-order directory */
-#define DOTREE_F      3     /* regular file */
-
-/*
- * Callbacks for file attributes code.
- */
-
-static int		GetGroupAttribute _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		GetOwnerAttribute _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		GetPermissionsAttribute _ANSI_ARGS_((
-			    Tcl_Interp *interp, int objIndex,
-			    CONST char *fileName, Tcl_Obj **attributePtrPtr));
-static int		SetGroupAttribute _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *attributePtr));
-static int		SetOwnerAttribute _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *attributePtr));
-static int		SetPermissionsAttribute _ANSI_ARGS_((
-			    Tcl_Interp *interp, int objIndex,
-			    CONST char *fileName, Tcl_Obj *attributePtr));
-			  
-/*
- * Prototype for the TraverseUnixTree callback function.
- */
-
-typedef int (TraversalProc) _ANSI_ARGS_((Tcl_DString *srcPtr,
-	Tcl_DString *dstPtr, CONST struct stat *statBufPtr, int type,
-	Tcl_DString *errorPtr));
-
-/*
- * Constants and variables necessary for file attributes subcommand.
- */
-
-enum {
-    UNIX_GROUP_ATTRIBUTE,
-    UNIX_OWNER_ATTRIBUTE,
-    UNIX_PERMISSIONS_ATTRIBUTE
-};
-
-char *tclpFileAttrStrings[] = {
-    "-group",
-    "-owner",
-    "-permissions",
-    (char *) NULL
-};
-
-CONST TclFileAttrProcs tclpFileAttrProcs[] = {
-    {GetGroupAttribute,		SetGroupAttribute},
-    {GetOwnerAttribute,		SetOwnerAttribute},
-    {GetPermissionsAttribute,	SetPermissionsAttribute}
-};
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static int		CopyFile _ANSI_ARGS_((CONST char *src,
-			    CONST char *dst, CONST struct stat *statBufPtr));
-static int		CopyFileAtts _ANSI_ARGS_((CONST char *src,
-			    CONST char *dst, CONST struct stat *statBufPtr));
-static int		DoCopyFile _ANSI_ARGS_((Tcl_DString *srcPtr,
-			    Tcl_DString *dstPtr));
-static int		DoCreateDirectory _ANSI_ARGS_((Tcl_DString *pathPtr));
-static int		DoDeleteFile _ANSI_ARGS_((Tcl_DString *pathPtr));
-static int		DoRemoveDirectory _ANSI_ARGS_((Tcl_DString *pathPtr,
-			    int recursive, Tcl_DString *errorPtr));
-static int		DoRenameFile _ANSI_ARGS_((CONST char *src,
-			    CONST char *dst));
-static int		TraversalCopy _ANSI_ARGS_((Tcl_DString *srcPtr,
-			    Tcl_DString *dstPtr, CONST struct stat *statBufPtr,
-			    int type, Tcl_DString *errorPtr));
-static int		TraversalDelete _ANSI_ARGS_((Tcl_DString *srcPtr,
-			    Tcl_DString *dstPtr, CONST struct stat *statBufPtr,
-			    int type, Tcl_DString *errorPtr));
-static int		TraverseUnixTree _ANSI_ARGS_((
-			    TraversalProc *traversalProc,
-			    Tcl_DString *sourcePtr, Tcl_DString *destPtr,
-			    Tcl_DString *errorPtr));
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpRenameFile, DoRenameFile --
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *	If src and dst refer to the same file or directory, does nothing
- *	and returns success.  Otherwise if dst already exists, it will be
- *	deleted and replaced by src subject to the following conditions:
- *	    If src is a directory, dst may be an empty directory.
- *	    If src is a file, dst may be a file.
- *	In any other situation where dst already exists, the rename will
- *	fail.  
- *
- * Results:
- *	If the directory was successfully created, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EEXIST:	    dst is a non-empty directory.
- *	EINVAL:	    src is a root directory or dst is a subdirectory of src.
- *	EISDIR:	    dst is a directory, but src is not.
- *	ENOENT:	    src doesn't exist, or src or dst is "".
- *	ENOTDIR:    src is a directory, but dst is not.  
- *	EXDEV:	    src and dst are on different filesystems.
- *	
- * Side effects:
- *	The implementation of rename may allow cross-filesystem renames,
- *	but the caller should be prepared to emulate it with copy and
- *	delete if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpRenameFile(src, dst)
-    CONST char *src;		/* Pathname of file or dir to be renamed
-				 * (UTF-8). */
-    CONST char *dst;		/* New pathname of file or directory
-				 * (UTF-8). */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-    result = DoRenameFile(Tcl_DStringValue(&srcString),
-	    Tcl_DStringValue(&dstString));
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoRenameFile(src, dst)
-    CONST char *src;		/* Pathname of file or dir to be renamed
-				 * (native). */
-    CONST char *dst;		/* New pathname of file or directory
-				 * (native). */
-{
-    if (rename(src, dst) == 0) {			/* INTL: Native. */
-	return TCL_OK;
-    }
-    if (errno == ENOTEMPTY) {
-	errno = EEXIST;
-    }
-
-    /*
-     * IRIX returns EIO when you attept to move a directory into
-     * itself.  We just map EIO to EINVAL get the right message on SGI.
-     * Most platforms don't return EIO except in really strange cases.
-     */
-    
-    if (errno == EIO) {
-	errno = EINVAL;
-    }
-    
-#ifndef NO_REALPATH
-    /*
-     * SunOS 4.1.4 reports overwriting a non-empty directory with a
-     * directory as EINVAL instead of EEXIST (first rule out the correct
-     * EINVAL result code for moving a directory into itself).  Must be
-     * conditionally compiled because realpath() not defined on all systems.
-     */
-
-    if (errno == EINVAL) {
-	char srcPath[MAXPATHLEN], dstPath[MAXPATHLEN];
-	DIR *dirPtr;
-	struct dirent *dirEntPtr;
-
-	if ((realpath((char *) src, srcPath) != NULL)	/* INTL: Native. */
-		&& (realpath((char *) dst, dstPath) != NULL) /* INTL: Native. */
-		&& (strncmp(srcPath, dstPath, strlen(srcPath)) != 0)) {
-	    dirPtr = opendir(dst);			/* INTL: Native. */
-	    if (dirPtr != NULL) {
-		while (1) {
-		    dirEntPtr = readdir(dirPtr);	/* INTL: Native. */
-		    if (dirEntPtr == NULL) {
-			break;
-		    }
-		    if ((strcmp(dirEntPtr->d_name, ".") != 0) &&
-			    (strcmp(dirEntPtr->d_name, "..") != 0)) {
-			errno = EEXIST;
-			closedir(dirPtr);
-			return TCL_ERROR;
-		    }
-		}
-		closedir(dirPtr);
-	    }
-	}
-	errno = EINVAL;
-    }
-#endif	/* !NO_REALPATH */
-
-    if (strcmp(src, "/") == 0) {
-	/*
-	 * Alpha reports renaming / as EBUSY and Linux reports it as EACCES,
-	 * instead of EINVAL.
-	 */
-	 
-	errno = EINVAL;
-    }
-
-    /*
-     * DEC Alpha OSF1 V3.0 returns EACCES when attempting to move a
-     * file across filesystems and the parent directory of that file is
-     * not writable.  Most other systems return EXDEV.  Does nothing to
-     * correct this behavior.
-     */
-
-    return TCL_ERROR;
-}
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyFile, DoCopyFile --
- *
- *      Copy a single file (not a directory).  If dst already exists and
- *	is not a directory, it is removed.
- *
- * Results:
- *	If the file was successfully copied, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EISDIR:	    src or dst is a directory.
- *	ENOENT:	    src doesn't exist.  src or dst is "".
- *
- * Side effects:
- *      This procedure will also copy symbolic links, block, and
- *      character devices, and fifos.  For symbolic links, the links 
- *      themselves will be copied and not what they point to.  For the
- *	other special file types, the directory entry will be copied and
- *	not the contents of the device that it refers to.
- *
- *---------------------------------------------------------------------------
- */
-
-int 
-TclpCopyFile(src, dst)
-    CONST char *src;		/* Pathname of file to be copied (UTF-8). */
-    CONST char *dst;		/* Pathname of file to copy to (UTF-8). */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-    result = DoCopyFile(&srcString, &dstString);
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoCopyFile(srcPtr, dstPtr)
-    Tcl_DString *srcPtr;	/* Pathname of file to be copied (native). */
-    Tcl_DString *dstPtr;	/* Pathname of file to copy to (native). */
-{
-    struct stat srcStatBuf, dstStatBuf;
-    CONST char *src, *dst;
-
-    src = Tcl_DStringValue(srcPtr);
-    dst = Tcl_DStringValue(dstPtr);
-
-    /*
-     * Have to do a stat() to determine the filetype.
-     */
-    
-    if (lstat(src, &srcStatBuf) != 0) {			/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    if (S_ISDIR(srcStatBuf.st_mode)) {
-	errno = EISDIR;
-	return TCL_ERROR;
-    }
-
-    /*
-     * symlink, and some of the other calls will fail if the target 
-     * exists, so we remove it first
-     */
-    
-    if (lstat(dst, &dstStatBuf) == 0) {			/* INTL: Native. */
-	if (S_ISDIR(dstStatBuf.st_mode)) {
-	    errno = EISDIR;
-	    return TCL_ERROR;
-	}
-    }
-    if (unlink(dst) != 0) {				/* INTL: Native. */
-	if (errno != ENOENT) {
-	    return TCL_ERROR;
-	} 
-    }
-
-    switch ((int) (srcStatBuf.st_mode & S_IFMT)) {
-        case S_IFLNK: {
-	    char link[MAXPATHLEN];
-	    int length;
-
-	    length = readlink(src, link, sizeof(link)); /* INTL: Native. */
-	    if (length == -1) {
-		return TCL_ERROR;
-	    }
-	    link[length] = '\0';
-	    if (symlink(link, dst) < 0) {		/* INTL: Native. */
-		return TCL_ERROR;
-	    }
-	    break;
-	}
-        case S_IFBLK:
-        case S_IFCHR: {
-	    if (mknod(dst, srcStatBuf.st_mode,		/* INTL: Native. */
-		    srcStatBuf.st_rdev) < 0) {
-		return TCL_ERROR;
-	    }
-	    return CopyFileAtts(src, dst, &srcStatBuf);
-	}
-        case S_IFIFO: {
-	    if (mkfifo(dst, srcStatBuf.st_mode) < 0) {	/* INTL: Native. */
-		return TCL_ERROR;
-	    }
-	    return CopyFileAtts(src, dst, &srcStatBuf);
-	}
-        default: {
-	    return CopyFile(src, dst, &srcStatBuf);
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyFile - 
- *
- *      Helper function for TclpCopyFile.  Copies one regular file,
- *	using read() and write().
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *      A file is copied.  Dst will be overwritten if it exists.
- *
- *----------------------------------------------------------------------
- */
-
-static int 
-CopyFile(src, dst, statBufPtr) 
-    CONST char *src;		/* Pathname of file to copy (native). */
-    CONST char *dst;		/* Pathname of file to create/overwrite
-				 * (native). */
-    CONST struct stat *statBufPtr;
-				/* Used to determine mode and blocksize. */
-{
-    int srcFd;
-    int dstFd;
-    u_int blockSize;   /* Optimal I/O blocksize for filesystem */
-    char *buffer;      /* Data buffer for copy */
-    size_t nread;
-
-    if ((srcFd = open(src, O_RDONLY, 0)) < 0) {		/* INTL: Native. */
-	return TCL_ERROR;
-    }
-
-    dstFd = open(dst, O_CREAT | O_TRUNC | O_WRONLY,	/* INTL: Native. */
-	    statBufPtr->st_mode);
-    if (dstFd < 0) {
-	close(srcFd); 
-	return TCL_ERROR;
-    }
-
-#ifdef HAVE_ST_BLKSIZE
-    blockSize = statBufPtr->st_blksize;
-#else
-#ifndef NO_FSTATFS
-    {
-	struct statfs fs;
-	if (fstatfs(srcFd, &fs, sizeof(fs), 0) == 0) {
-	    blockSize = fs.f_bsize;
-	} else {
-	    blockSize = 4096;
-	}
-    }
-#else 
-    blockSize = 4096;
-#endif
-#endif
-
-    buffer = ckalloc(blockSize);
-    while (1) {
-	nread = read(srcFd, buffer, blockSize);
-	if ((nread == -1) || (nread == 0)) {
-	    break;
-	}
-	if (write(dstFd, buffer, nread) != nread) {
-	    nread = (size_t) -1;
-	    break;
-	}
-    }
-	
-    ckfree(buffer);
-    close(srcFd);
-    if ((close(dstFd) != 0) || (nread == -1)) {
-	unlink(dst);					/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    if (CopyFileAtts(src, dst, statBufPtr) == TCL_ERROR) {
-	/*
-	 * The copy succeeded, but setting the permissions failed, so be in
-	 * a consistent state, we remove the file that was created by the
-	 * copy.
-	 */
-
-	unlink(dst);					/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpDeleteFile, DoDeleteFile --
- *
- *      Removes a single file (not a directory).
- *
- * Results:
- *	If the file was successfully deleted, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EISDIR:	    path is a directory.
- *	ENOENT:	    path doesn't exist or is "".
- *
- * Side effects:
- *      The file is deleted, even if it is read-only.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpDeleteFile(path) 
-    CONST char *path;		/* Pathname of file to be removed (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoDeleteFile(&pathString);
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoDeleteFile(pathPtr)
-    Tcl_DString *pathPtr;	/* Pathname of file to be removed (native). */
-{
-    CONST char *path;
-
-    path = Tcl_DStringValue(pathPtr);
-    if (unlink(path) != 0) {				/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCreateDirectory, DoCreateDirectory --
- *
- *      Creates the specified directory.  All parent directories of the
- *	specified directory must already exist.  The directory is
- *	automatically created with permissions so that user can access
- *	the new directory and create new files or subdirectories in it.
- *
- * Results:
- *	If the directory was successfully created, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EEXIST:	    path already exists.
- *	ENOENT:	    a parent directory doesn't exist.
- *
- * Side effects:
- *      A directory is created with the current umask, except that
- *	permission for u+rwx will always be added.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCreateDirectory(path)
-    CONST char *path;		/* Pathname of directory to create (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoCreateDirectory(&pathString);
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoCreateDirectory(pathPtr)
-    Tcl_DString *pathPtr;	/* Pathname of directory to create (native). */
-{
-    mode_t mode;
-    CONST char *path;
-
-    path = Tcl_DStringValue(pathPtr);
-
-    mode = umask(0);
-    umask(mode);
-
-    /*
-     * umask return value is actually the inverse of the permissions.
-     */
-
-    mode = (0777 & ~mode) | S_IRUSR | S_IWUSR | S_IXUSR;
-
-    if (mkdir(path, mode) != 0) {			/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyDirectory --
- *
- *      Recursively copies a directory.  The target directory dst must
- *	not already exist.  Note that this function does not merge two
- *	directory hierarchies, even if the target directory is an an
- *	empty directory.
- *
- * Results:
- *	If the directory was successfully copied, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  See TclpCreateDirectory and TclpCopyFile
- *	for a description of possible values for errno.
- *
- * Side effects:
- *      An exact copy of the directory hierarchy src will be created
- *	with the name dst.  If an error occurs, the error will
- *      be returned immediately, and remaining files will not be
- *	processed.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCopyDirectory(src, dst, errorPtr)
-    CONST char *src;		/* Pathname of directory to be copied
-				 * (UTF-8). */
-    CONST char *dst;		/* Pathname of target directory (UTF-8). */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    Tcl_DString srcString, dstString;
-    int result;
-
-    Tcl_UtfToExternalDString(NULL, src, -1, &srcString);
-    Tcl_UtfToExternalDString(NULL, dst, -1, &dstString);
-
-    result = TraverseUnixTree(TraversalCopy, &srcString, &dstString, errorPtr);
-
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpRemoveDirectory, DoRemoveDirectory --
- *
- *	Removes directory (and its contents, if the recursive flag is set).
- *
- * Results:
- *	If the directory was successfully removed, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  Some possible values for errno are:
- *
- *	EACCES:     path directory can't be read and/or written.
- *	EEXIST:	    path is a non-empty directory.
- *	EINVAL:	    path is a root directory.
- *	ENOENT:	    path doesn't exist or is "".
- * 	ENOTDIR:    path is not a directory.
- *
- * Side effects:
- *	Directory removed.  If an error occurs, the error will be returned
- *	immediately, and remaining files will not be deleted.
- *
- *---------------------------------------------------------------------------
- */
- 
-int
-TclpRemoveDirectory(path, recursive, errorPtr) 
-    CONST char *path;		/* Pathname of directory to be removed
-				 * (UTF-8). */
-    int recursive;		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_UtfToExternalDString(NULL, path, -1, &pathString);
-    result = DoRemoveDirectory(&pathString, recursive, errorPtr);
-    Tcl_DStringFree(&pathString);
-
-    return result;
-}
-
-static int
-DoRemoveDirectory(pathPtr, recursive, errorPtr)
-    Tcl_DString *pathPtr;	/* Pathname of directory to be removed
-				 * (native). */
-    int recursive;		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    CONST char *path;
-
-    path = Tcl_DStringValue(pathPtr);
-    if (rmdir(path) == 0) {				/* INTL: Native. */
-	return TCL_OK;
-    }
-    if (errno == ENOTEMPTY) {
-	errno = EEXIST;
-    }
-    if ((errno != EEXIST) || (recursive == 0)) {
-	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDString(NULL, path, -1, errorPtr);
-	}
-	return TCL_ERROR;
-    }
-    
-    /*
-     * The directory is nonempty, but the recursive flag has been
-     * specified, so we recursively remove all the files in the directory.
-     */
-
-    return TraverseUnixTree(TraversalDelete, pathPtr, NULL, errorPtr);
-}
-	
-/*
- *---------------------------------------------------------------------------
- *
- * TraverseUnixTree --
- *
- *      Traverse directory tree specified by sourcePtr, calling the function 
- *	traverseProc for each file and directory encountered.  If destPtr 
- *	is non-null, each of name in the sourcePtr directory is appended to 
- *	the directory specified by destPtr and passed as the second argument 
- *	to traverseProc() .
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      None caused by TraverseUnixTree, however the user specified 
- *	traverseProc() may change state.  If an error occurs, the error will
- *      be returned immediately, and remaining files will not be processed.
- *
- *---------------------------------------------------------------------------
- */
-
-static int 
-TraverseUnixTree(traverseProc, sourcePtr, targetPtr, errorPtr)
-    TraversalProc *traverseProc;/* Function to call for every file and
-				 * directory in source hierarchy. */
-    Tcl_DString *sourcePtr;	/* Pathname of source directory to be
-				 * traversed (native). */
-    Tcl_DString *targetPtr;	/* Pathname of directory to traverse in
-				 * parallel with source directory (native). */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    struct stat statBuf;
-    CONST char *source, *errfile;
-    int result, sourceLen;
-    int targetLen;
-    struct dirent *dirEntPtr;
-    DIR *dirPtr;
-
-    errfile = NULL;
-    result = TCL_OK;
-    targetLen = 0;		/* lint. */
-
-    source = Tcl_DStringValue(sourcePtr);
-    if (lstat(source, &statBuf) != 0) {			/* INTL: Native. */
-	errfile = source;
-	goto end;
-    }
-    if (!S_ISDIR(statBuf.st_mode)) {
-	/*
-	 * Process the regular file
-	 */
-
-	return (*traverseProc)(sourcePtr, targetPtr, &statBuf, DOTREE_F,
-		errorPtr);
-    }
-    dirPtr = opendir(source);				/* INTL: Native. */
-    if (dirPtr == NULL) {
-	/* 
-	 * Can't read directory
-	 */
-
-	errfile = source;
-	goto end;
-    }
-    result = (*traverseProc)(sourcePtr, targetPtr, &statBuf, DOTREE_PRED,
-	    errorPtr);
-    if (result != TCL_OK) {
-	closedir(dirPtr);
-	return result;
-    }
-    
-    Tcl_DStringAppend(sourcePtr, "/", 1);
-    sourceLen = Tcl_DStringLength(sourcePtr);	
-
-    if (targetPtr != NULL) {
-	Tcl_DStringAppend(targetPtr, "/", 1);
-	targetLen = Tcl_DStringLength(targetPtr);
-    }
-				  
-    while ((dirEntPtr = readdir(dirPtr)) != NULL) {	/* INTL: Native. */
-	if ((strcmp(dirEntPtr->d_name, ".") == 0)
-	        || (strcmp(dirEntPtr->d_name, "..") == 0)) {
-	    continue;
-	}
-
-	/* 
-	 * Append name after slash, and recurse on the file.
-	 */
-
-	Tcl_DStringAppend(sourcePtr, dirEntPtr->d_name, -1);
-	if (targetPtr != NULL) {
-	    Tcl_DStringAppend(targetPtr, dirEntPtr->d_name, -1);
-	}
-	result = TraverseUnixTree(traverseProc, sourcePtr, targetPtr,
-		errorPtr);
-	if (result != TCL_OK) {
-	    break;
-	}
-	
-	/*
-	 * Remove name after slash.
-	 */
-
-	Tcl_DStringSetLength(sourcePtr, sourceLen);
-	if (targetPtr != NULL) {
-	    Tcl_DStringSetLength(targetPtr, targetLen);
-	}
-    }
-    closedir(dirPtr);
-    
-    /*
-     * Strip off the trailing slash we added
-     */
-
-    Tcl_DStringSetLength(sourcePtr, sourceLen - 1);
-    if (targetPtr != NULL) {
-	Tcl_DStringSetLength(targetPtr, targetLen - 1);
-    }
-
-    if (result == TCL_OK) {
-	/*
-	 * Call traverseProc() on a directory after visiting all the
-	 * files in that directory.
-	 */
-
-	result = (*traverseProc)(sourcePtr, targetPtr, &statBuf, DOTREE_POSTD,
-		errorPtr);
-    }
-    end:
-    if (errfile != NULL) {
-	if (errorPtr != NULL) {
-	    Tcl_ExternalToUtfDString(NULL, errfile, -1, errorPtr);
-	}
-	result = TCL_ERROR;
-    }
-	    
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TraversalCopy
- *
- *      Called from TraverseUnixTree in order to execute a recursive copy of a 
- *      directory. 
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      The file or directory src may be copied to dst, depending on 
- *      the value of type.
- *      
- *----------------------------------------------------------------------
- */
-
-static int 
-TraversalCopy(srcPtr, dstPtr, statBufPtr, type, errorPtr) 
-    Tcl_DString *srcPtr;	/* Source pathname to copy (native). */
-    Tcl_DString *dstPtr;	/* Destination pathname of copy (native). */
-    CONST struct stat *statBufPtr;
-				/* Stat info for file specified by srcPtr. */
-    int type;                   /* Reason for call - see TraverseUnixTree(). */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    switch (type) {
-	case DOTREE_F:
-	    if (DoCopyFile(srcPtr, dstPtr) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-
-	case DOTREE_PRED:
-	    if (DoCreateDirectory(dstPtr) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-
-	case DOTREE_POSTD:
-	    if (CopyFileAtts(Tcl_DStringValue(srcPtr),
-		    Tcl_DStringValue(dstPtr), statBufPtr) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-
-    }
-
-    /*
-     * There shouldn't be a problem with src, because we already checked it
-     * to get here.
-     */
-
-    if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(dstPtr),
-		Tcl_DStringLength(dstPtr), errorPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TraversalDelete --
- *
- *      Called by procedure TraverseUnixTree for every file and directory
- *	that it encounters in a directory hierarchy. This procedure unlinks
- *      files, and removes directories after all the containing files 
- *      have been processed.
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      Files or directory specified by src will be deleted.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TraversalDelete(srcPtr, ignore, statBufPtr, type, errorPtr) 
-    Tcl_DString *srcPtr;	/* Source pathname (native). */
-    Tcl_DString *ignore;	/* Destination pathname (not used). */
-    CONST struct stat *statBufPtr;
-				/* Stat info for file specified by srcPtr. */
-    int type;                   /* Reason for call - see TraverseUnixTree(). */
-    Tcl_DString *errorPtr;	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    switch (type) {
-        case DOTREE_F: {
-	    if (DoDeleteFile(srcPtr) == 0) {
-		return TCL_OK;
-	    }
-	    break;
-	}
-        case DOTREE_PRED: {
-	    return TCL_OK;
-	}
-        case DOTREE_POSTD: {
-	    if (DoRemoveDirectory(srcPtr, 0, NULL) == 0) {
-		return TCL_OK;
-	    }
-	    break;
-	}	    
-    }
-    if (errorPtr != NULL) {
-	Tcl_ExternalToUtfDString(NULL, Tcl_DStringValue(srcPtr),
-		Tcl_DStringLength(srcPtr), errorPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * CopyFileAtts --
- *
- *	Copy the file attributes such as owner, group, permissions,
- *	and modification date from one file to another.
- *
- * Results:
- *	Standard Tcl result.
- *
- * Side effects:
- *	user id, group id, permission bits, last modification time, and
- *	last access time are updated in the new file to reflect the
- *	old file.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-CopyFileAtts(src, dst, statBufPtr) 
-    CONST char *src;		/* Path name of source file (native). */
-    CONST char *dst;		/* Path name of target file (native). */
-    CONST struct stat *statBufPtr;
-				/* Stat info for source file */
-{
-    struct utimbuf tval;
-    mode_t newMode;
-    
-    newMode = statBufPtr->st_mode
-	    & (S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO);
-	
-    /* 
-     * Note that if you copy a setuid file that is owned by someone
-     * else, and you are not root, then the copy will be setuid to you.
-     * The most correct implementation would probably be to have the
-     * copy not setuid to anyone if the original file was owned by 
-     * someone else, but this corner case isn't currently handled.
-     * It would require another lstat(), or getuid().
-     */
-    
-    if (chmod(dst, newMode)) {				/* INTL: Native. */
-	newMode &= ~(S_ISUID | S_ISGID);
-	if (chmod(dst, newMode)) {			/* INTL: Native. */
-	    return TCL_ERROR;
-	}
-    }
-
-    tval.actime = statBufPtr->st_atime; 
-    tval.modtime = statBufPtr->st_mtime; 
-
-    if (utime(dst, &tval)) {				/* INTL: Native. */
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * GetGroupAttribute
- *
- *      Gets the group attribute of a file.
- *
- * Results:
- *      Standard TCL result. Returns a new Tcl_Obj in attributePtrPtr
- *	if there is no error.
- *
- * Side effects:
- *      A new object is allocated.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-GetGroupAttribute(interp, objIndex, fileName, attributePtrPtr)
-    Tcl_Interp *interp;		/* The interp we are using for errors. */
-    int objIndex;		/* The index of the attribute. */
-    CONST char *fileName;	/* The name of the file (UTF-8). */
-    Tcl_Obj **attributePtrPtr;	/* A pointer to return the object with. */
-{
-    struct stat statBuf;
-    struct group *groupPtr;
-    int result;
-
-    result = TclStat(fileName, &statBuf);
-    
-    if (result != 0) {
-	Tcl_AppendResult(interp, "could not read \"", fileName, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    groupPtr = getgrgid(statBuf.st_gid);		/* INTL: Native. */
-    if (groupPtr == NULL) {
-	*attributePtrPtr = Tcl_NewIntObj(statBuf.st_gid);
-    } else {
-	Tcl_DString ds;
-	CONST char *utf;
-
-	utf = Tcl_ExternalToUtfDString(NULL, groupPtr->gr_name, -1, &ds); 
-	*attributePtrPtr = Tcl_NewStringObj(utf, -1);
-	Tcl_DStringFree(&ds);
-    }
-    endgrent();
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetOwnerAttribute
- *
- *      Gets the owner attribute of a file.
- *
- * Results:
- *      Standard TCL result. Returns a new Tcl_Obj in attributePtrPtr
- *	if there is no error.
- *
- * Side effects:
- *      A new object is allocated.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-GetOwnerAttribute(interp, objIndex, fileName, attributePtrPtr)
-    Tcl_Interp *interp;		/* The interp we are using for errors. */
-    int objIndex;		/* The index of the attribute. */
-    CONST char *fileName;	/* The name of the file (UTF-8). */
-    Tcl_Obj **attributePtrPtr;	/* A pointer to return the object with. */
-{
-    struct stat statBuf;
-    struct passwd *pwPtr;
-    int result;
-
-    result = TclStat(fileName, &statBuf);
-    
-    if (result != 0) {
-	Tcl_AppendResult(interp, "could not read \"", fileName, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    pwPtr = getpwuid(statBuf.st_uid);			/* INTL: Native. */
-    if (pwPtr == NULL) {
-	*attributePtrPtr = Tcl_NewIntObj(statBuf.st_uid);
-    } else {
-	Tcl_DString ds;
-	CONST char *utf;
-
-	utf = Tcl_ExternalToUtfDString(NULL, pwPtr->pw_name, -1, &ds); 
-	*attributePtrPtr = Tcl_NewStringObj(utf, Tcl_DStringLength(&ds));
-	Tcl_DStringFree(&ds);
-    }
-    endpwent();
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetPermissionsAttribute
- *
- *      Gets the group attribute of a file.
- *
- * Results:
- *      Standard TCL result. Returns a new Tcl_Obj in attributePtrPtr
- *	if there is no error. The object will have ref count 0.
- *
- * Side effects:
- *      A new object is allocated.
- *      
- *----------------------------------------------------------------------
- */
-
-static int
-GetPermissionsAttribute(interp, objIndex, fileName, attributePtrPtr)
-    Tcl_Interp *interp;		    /* The interp we are using for errors. */
-    int objIndex;		    /* The index of the attribute. */
-    CONST char *fileName;	    /* The name of the file (UTF-8). */
-    Tcl_Obj **attributePtrPtr;	    /* A pointer to return the object with. */
-{
-    struct stat statBuf;
-    char returnString[7];
-    int result;
-
-    result = TclStat(fileName, &statBuf);
-    
-    if (result != 0) {
-	Tcl_AppendResult(interp, "could not read \"", fileName, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    sprintf(returnString, "%0#5lo", (statBuf.st_mode & 0x00007FFF));
-
-    *attributePtrPtr = Tcl_NewStringObj(returnString, -1);
-    
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * SetGroupAttribute --
- *
- *      Sets the group of the file to the specified group.
- *
- * Results:
- *      Standard TCL result.
- *
- * Side effects:
- *      As above.
- *      
- *---------------------------------------------------------------------------
- */
-
-static int
-SetGroupAttribute(interp, objIndex, fileName, attributePtr)
-    Tcl_Interp *interp;		    /* The interp for error reporting. */
-    int objIndex;		    /* The index of the attribute. */
-    CONST char *fileName;	    /* The name of the file (UTF-8). */
-    Tcl_Obj *attributePtr;	    /* New group for file. */
-{
-    long gid;
-    int result;
-    Tcl_DString ds;
-    CONST char *native;
-
-    if (Tcl_GetLongFromObj(NULL, attributePtr, &gid) != TCL_OK) {
-	struct group *groupPtr;
-	CONST char *string;
-	int length;
-
-	string = Tcl_GetStringFromObj(attributePtr, &length);
-
-	native = Tcl_UtfToExternalDString(NULL, string, length, &ds);
-	groupPtr = getgrnam(native);			/* INTL: Native. */
-	Tcl_DStringFree(&ds);
-
-	if (groupPtr == NULL) {
-	    endgrent();
-	    Tcl_AppendResult(interp, "could not set group for file \"",
-		    fileName, "\": group \"", string, "\" does not exist",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	gid = groupPtr->gr_gid;
-    }
-
-    native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-    result = chown(native, -1, (gid_t) gid);		/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    endgrent();
-    if (result != 0) {
-	Tcl_AppendResult(interp, "could not set group for file \"",
-		fileName, "\": ", Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }    
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * SetOwnerAttribute --
- *
- *      Sets the owner of the file to the specified owner.
- *
- * Results:
- *      Standard TCL result.
- *
- * Side effects:
- *      As above.
- *      
- *---------------------------------------------------------------------------
- */
-
-static int
-SetOwnerAttribute(interp, objIndex, fileName, attributePtr)
-    Tcl_Interp *interp;		    /* The interp for error reporting. */
-    int objIndex;		    /* The index of the attribute. */
-    CONST char *fileName;	    /* The name of the file (UTF-8). */
-    Tcl_Obj *attributePtr;	    /* New owner for file. */
-{
-    long uid;
-    int result;
-    Tcl_DString ds;
-    CONST char *native;
-
-    if (Tcl_GetLongFromObj(NULL, attributePtr, &uid) != TCL_OK) {
-	struct passwd *pwPtr;
-	CONST char *string;
-	int length;
-
-	string = Tcl_GetStringFromObj(attributePtr, &length);
-
-	native = Tcl_UtfToExternalDString(NULL, string, length, &ds);
-	pwPtr = getpwnam(native);			/* INTL: Native. */
-	Tcl_DStringFree(&ds);
-
-	if (pwPtr == NULL) {
-	    Tcl_AppendResult(interp, "could not set owner for file \"",
-		    fileName, "\": user \"", string, "\" does not exist",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	uid = pwPtr->pw_uid;
-    }
-
-    native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-    result = chown(native, uid, -1);			/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    if (result != 0) {
-	Tcl_AppendResult(interp, "could not set owner for file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }    
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * SetPermissionsAttribute
- *
- *      Sets the file to the given permission.
- *
- * Results:
- *      Standard TCL result.
- *
- * Side effects:
- *      The permission of the file is changed.
- *      
- *---------------------------------------------------------------------------
- */
-
-static int
-SetPermissionsAttribute(interp, objIndex, fileName, attributePtr)
-    Tcl_Interp *interp;		    /* The interp we are using for errors. */
-    int objIndex;		    /* The index of the attribute. */
-    CONST char *fileName;	    /* The name of the file (UTF-8). */
-    Tcl_Obj *attributePtr;	    /* The attribute to set. */
-{
-    long mode;
-    int result;
-    CONST char *native;
-    Tcl_DString ds;
-
-    if (Tcl_GetLongFromObj(interp, attributePtr, &mode) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-    result = chmod(native, (mode_t) mode);		/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    if (result != 0) {
-	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
-		"could not set permissions for file \"", fileName, "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-/*
- *---------------------------------------------------------------------------
- *
- * TclpListVolumes --
- *
- *	Lists the currently mounted volumes, which on UNIX is just /.
- *
- * Results:
- *	A standard Tcl result.  Will always be TCL_OK, since there is no way
- *	that this command can fail.  Also, the interpreter's result is set to 
- *	the list of volumes.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpListVolumes(interp)
-    Tcl_Interp *interp;			/* Interpreter to which to pass
-					 * the volume list. */
-{
-    Tcl_Obj *resultPtr;
-    
-    resultPtr = Tcl_GetObjResult(interp);
-    Tcl_SetStringObj(resultPtr, "/", 1);
-    return TCL_OK;	
-}
-
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
deleted file mode 100644
index 248079d..0000000
--- a/unix/tclUnixFile.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/* 
- * tclUnixFile.c --
- *
- *      This file contains wrappers around UNIX file handling functions.
- *      These wrappers mask differences between Windows and UNIX.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixFile.c,v 1.6 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpFindExecutable --
- *
- *	This procedure computes the absolute path name of the current
- *	application, given its argv[0] value.
- *
- * Results:
- *	A dirty UTF string that is the path to the executable.  At this
- *	point we may not know the system encoding.  Convert the native
- *	string value to UTF using the default encoding.  The assumption
- *	is that we will still be able to parse the path given the path
- *	name contains ASCII string and '/' chars do not conflict with
- *	other UTF chars.
- *
- * Side effects:
- *	The variable tclNativeExecutableName gets filled in with the file
- *	name for the application, if we figured it out.  If we couldn't
- *	figure it out, tclNativeExecutableName is set to NULL.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-TclpFindExecutable(argv0)
-    CONST char *argv0;		/* The value of the application's argv[0]
-				 * (native). */
-{
-    CONST char *name, *p;
-    struct stat statBuf;
-    int length;
-    Tcl_DString buffer, nameString;
-
-    if (argv0 == NULL) {
-	return NULL;
-    }
-    if (tclNativeExecutableName != NULL) {
-	return tclNativeExecutableName;
-    }
-
-    Tcl_DStringInit(&buffer);
-
-    name = argv0;
-    for (p = name; *p != '\0'; p++) {
-	if (*p == '/') {
-	    /*
-	     * The name contains a slash, so use the name directly
-	     * without doing a path search.
-	     */
-
-	    goto gotName;
-	}
-    }
-
-    p = getenv("PATH");					/* INTL: Native. */
-    if (p == NULL) {
-	/*
-	 * There's no PATH environment variable; use the default that
-	 * is used by sh.
-	 */
-
-	p = ":/bin:/usr/bin";
-    } else if (*p == '\0') {
-	/*
-	 * An empty path is equivalent to ".".
-	 */
-
-	p = "./";
-    }
-
-    /*
-     * Search through all the directories named in the PATH variable
-     * to see if argv[0] is in one of them.  If so, use that file
-     * name.
-     */
-
-    while (1) {
-	while (isspace(UCHAR(*p))) {		/* INTL: BUG */
-	    p++;
-	}
-	name = p;
-	while ((*p != ':') && (*p != 0)) {
-	    p++;
-	}
-	Tcl_DStringSetLength(&buffer, 0);
-	if (p != name) {
-	    Tcl_DStringAppend(&buffer, name, p - name);
-	    if (p[-1] != '/') {
-		Tcl_DStringAppend(&buffer, "/", 1);
-	    }
-	}
-	name = Tcl_DStringAppend(&buffer, argv0, -1);
-
-	/*
-	 * INTL: The following calls to access() and stat() should not be
-	 * converted to Tclp routines because they need to operate on native
-	 * strings directly.
-	 */
-
-	if ((access(name, X_OK) == 0)		/* INTL: Native. */
-		&& (stat(name, &statBuf) == 0)	/* INTL: Native. */
-		&& S_ISREG(statBuf.st_mode)) {
-	    goto gotName;
-	}
-	if (*p == '\0') {
-	    break;
-	} else if (*(p+1) == 0) {
-	    p = "./";
-	} else {
-	    p++;
-	}
-    }
-    goto done;
-
-    /*
-     * If the name starts with "/" then just copy it to tclExecutableName.
-     */
-
-    gotName:
-    if (name[0] == '/')  {
-	Tcl_ExternalToUtfDString(NULL, name, -1, &nameString);
-	tclNativeExecutableName = (char *)
-		ckalloc((unsigned) (Tcl_DStringLength(&nameString) + 1));
-	strcpy(tclNativeExecutableName, Tcl_DStringValue(&nameString));
-	Tcl_DStringFree(&nameString);
-	goto done;
-    }
-
-    /*
-     * The name is relative to the current working directory.  First
-     * strip off a leading "./", if any, then add the full path name of
-     * the current working directory.
-     */
-
-    if ((name[0] == '.') && (name[1] == '/')) {
-	name += 2;
-    }
-
-    Tcl_ExternalToUtfDString(NULL, name, -1, &nameString);
-
-    Tcl_DStringFree(&buffer);
-    TclpGetCwd(NULL, &buffer);
-
-    length = Tcl_DStringLength(&buffer) + Tcl_DStringLength(&nameString) + 2;
-    tclNativeExecutableName = (char *) ckalloc((unsigned) length);
-    strcpy(tclNativeExecutableName, Tcl_DStringValue(&buffer));
-    tclNativeExecutableName[Tcl_DStringLength(&buffer)] = '/';
-    strcpy(tclNativeExecutableName + Tcl_DStringLength(&buffer) + 1,
-	    Tcl_DStringValue(&nameString));
-    Tcl_DStringFree(&nameString);
-    
-    done:
-    Tcl_DStringFree(&buffer);
-    return tclNativeExecutableName;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMatchFiles --
- *
- *	This routine is used by the globbing code to search a
- *	directory for all files which match a given pattern.
- *
- * Results: 
- *	If the tail argument is NULL, then the matching files are
- *	added to the the interp's result.  Otherwise, TclDoGlob is called
- *	recursively for each matching subdirectory.  The return value
- *	is a standard Tcl result indicating whether an error occurred
- *	in globbing.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpMatchFiles(interp, separators, dirPtr, pattern, tail)
-    Tcl_Interp *interp;		/* Interpreter to receive results. */
-    char *separators;		/* Path separators to pass to TclDoGlob. */
-    Tcl_DString *dirPtr;	/* Contains path to directory to search. */
-    char *pattern;		/* Pattern to match against. */
-    char *tail;			/* Pointer to end of pattern. Must not
-				 * refer to a static string. */
-{
-    char *native, *dirName, *patternEnd = tail;
-    char savedChar = 0;		/* lint. */
-    DIR *d;
-    Tcl_DString ds;
-    struct stat statBuf;
-    int matchHidden;
-    int result = TCL_OK;
-    int baseLength = Tcl_DStringLength(dirPtr);
-
-    /*
-     * Make sure that the directory part of the name really is a
-     * directory.  If the directory name is "", use the name "."
-     * instead, because some UNIX systems don't treat "" like "."
-     * automatically.  Keep the "" for use in generating file names,
-     * otherwise "glob foo.c" would return "./foo.c".
-     */
-
-    if (Tcl_DStringLength(dirPtr) == 0) {
-	dirName = ".";
-    } else {
-	dirName = Tcl_DStringValue(dirPtr);
-    }
-
-    if ((TclpStat(dirName, &statBuf) != 0)		/* INTL: UTF-8. */
-	    || !S_ISDIR(statBuf.st_mode)) {
-	return TCL_OK;
-    }
-
-    /*
-     * Check to see if the pattern needs to compare with hidden files.
-     */
-
-    if ((pattern[0] == '.')
-	    || ((pattern[0] == '\\') && (pattern[1] == '.'))) {
-	matchHidden = 1;
-    } else {
-	matchHidden = 0;
-    }
-
-    /*
-     * Now open the directory for reading and iterate over the contents.
-     */
-
-    native = Tcl_UtfToExternalDString(NULL, dirName, -1, &ds);
-    d = opendir(native);				/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    if (d == NULL) {
-	Tcl_ResetResult(interp);
-
-	/*
-	 * Strip off a trailing '/' if necessary, before reporting the error.
-	 */
-
-	if (baseLength > 0) {
-	    savedChar = (Tcl_DStringValue(dirPtr))[baseLength-1];
-	    if (savedChar == '/') {
-		(Tcl_DStringValue(dirPtr))[baseLength-1] = '\0';
-	    }
-	}
-	Tcl_AppendResult(interp, "couldn't read directory \"",
-		Tcl_DStringValue(dirPtr), "\": ",
-		Tcl_PosixError(interp), (char *) NULL);
-	if (baseLength > 0) {
-	    (Tcl_DStringValue(dirPtr))[baseLength-1] = savedChar;
-	}
-	return TCL_ERROR;
-    }
-
-    /*
-     * Clean up the end of the pattern and the tail pointer.  Leave
-     * the tail pointing to the first character after the path separator
-     * following the pattern, or NULL.  Also, ensure that the pattern
-     * is null-terminated.
-     */
-
-    if (*tail == '\\') {
-	tail++;
-    }
-    if (*tail == '\0') {
-	tail = NULL;
-    } else {
-	tail++;
-    }
-    savedChar = *patternEnd;
-    *patternEnd = '\0';
-
-    while (1) {
-	char *utf;
-	struct dirent *entryPtr;
-	
-	entryPtr = readdir(d);				/* INTL: Native. */
-	if (entryPtr == NULL) {
-	    break;
-	}
-
-	/*
-	 * Don't match names starting with "." unless the "." is
-	 * present in the pattern.
-	 */
-
-	if (!matchHidden && (*entryPtr->d_name == '.')) {
-	    continue;
-	}
-
-	/*
-	 * Now check to see if the file matches.  If there are more
-	 * characters to be processed, then ensure matching files are
-	 * directories before calling TclDoGlob. Otherwise, just add
-	 * the file to the result.
-	 */
-
-	utf = Tcl_ExternalToUtfDString(NULL, entryPtr->d_name, -1, &ds);
-	if (Tcl_StringMatch(utf, pattern) != 0) {
-	    Tcl_DStringSetLength(dirPtr, baseLength);
-	    Tcl_DStringAppend(dirPtr, utf, -1);
-	    if (tail == NULL) {
-		Tcl_AppendElement(interp, Tcl_DStringValue(dirPtr));
-	    } else if ((TclpStat(Tcl_DStringValue(dirPtr), &statBuf) == 0)
-		    && S_ISDIR(statBuf.st_mode)) {
-		Tcl_DStringAppend(dirPtr, "/", 1);
-		result = TclDoGlob(interp, separators, dirPtr, tail);
-		if (result != TCL_OK) {
-		    Tcl_DStringFree(&ds);
-		    break;
-		}
-	    }
-	}
-	Tcl_DStringFree(&ds);
-    }
-    *patternEnd = savedChar;
-
-    closedir(d);
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpGetUserHome --
- *
- *	This function takes the specified user name and finds their
- *	home directory.
- *
- * Results:
- *	The result is a pointer to a string specifying the user's home
- *	directory, or NULL if the user's home directory could not be
- *	determined.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetUserHome(name, bufferPtr)
-    CONST char *name;		/* User name for desired home directory. */
-    Tcl_DString *bufferPtr;	/* Uninitialized or free DString filled
-				 * with name of user's home directory. */
-{
-    struct passwd *pwPtr;
-    Tcl_DString ds;
-    char *native;
-
-    native = Tcl_UtfToExternalDString(NULL, name, -1, &ds);
-    pwPtr = getpwnam(native);				/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    
-    if (pwPtr == NULL) {
-	endpwent();
-	return NULL;
-    }
-    Tcl_ExternalToUtfDString(NULL, pwPtr->pw_dir, -1, bufferPtr);
-    endpwent();
-    return Tcl_DStringValue(bufferPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpAccess --
- *
- *	This function replaces the library version of access().
- *
- * Results:
- *	See access() documentation.
- *
- * Side effects:
- *	See access() documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpAccess(path, mode)
-    CONST char *path;		/* Path of file to access (UTF-8). */
-    int mode;			/* Permission setting. */
-{
-    int result;
-    Tcl_DString ds;
-    char *native;
-    
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    result = access(native, mode);			/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpChdir --
- *
- *	This function replaces the library version of chdir().
- *
- * Results:
- *	See chdir() documentation.
- *
- * Side effects:
- *	See chdir() documentation.  
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpChdir(dirName)
-    CONST char *dirName;     	/* Path to new working directory (UTF-8). */
-{
-    int result;
-    Tcl_DString ds;
-    char *native;
-
-    native = Tcl_UtfToExternalDString(NULL, dirName, -1, &ds);
-    result = chdir(native);				/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLstat --
- *
- *	This function replaces the library version of lstat().
- *
- * Results:
- *	See lstat() documentation.
- *
- * Side effects:
- *	See lstat() documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLstat(path, bufPtr)
-    CONST char *path;		/* Path of file to stat (UTF-8). */
-    struct stat *bufPtr;	/* Filled with results of stat call. */
-{
-    int result;
-    Tcl_DString ds;
-    char *native;
-    
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    result = lstat(native, bufPtr);			/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpGetCwd --
- *
- *	This function replaces the library version of getcwd().
- *
- * Results:
- *	The result is a pointer to a string specifying the current
- *	directory, or NULL if the current directory could not be
- *	determined.  If NULL is returned, an error message is left in the
- *	interp's result.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetCwd(interp, bufferPtr)
-    Tcl_Interp *interp;		/* If non-NULL, used for error reporting. */
-    Tcl_DString *bufferPtr;	/* Uninitialized or free DString filled
-				 * with name of current directory. */
-{
-    char buffer[MAXPATHLEN+1];
-
-#ifdef USEGETWD
-    if (getwd(buffer) == NULL) {			/* INTL: Native. */
-#else
-    if (getcwd(buffer, MAXPATHLEN + 1) == NULL) {	/* INTL: Native. */
-#endif
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp,
-		    "error getting working directory name: ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	}
-	return NULL;
-    }
-    return Tcl_ExternalToUtfDString(NULL, buffer, -1, bufferPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpReadlink --
- *
- *	This function replaces the library version of readlink().
- *
- * Results:
- *	The result is a pointer to a string specifying the contents
- *	of the symbolic link given by 'path', or NULL if the symbolic
- *	link could not be read.  Storage for the result string is
- *	allocated in bufferPtr; the caller must call Tcl_DStringFree()
- *	when the result is no longer needed.
- *
- * Side effects:
- *	See readlink() documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-TclpReadlink(path, linkPtr)
-    CONST char *path;		/* Path of file to readlink (UTF-8). */
-    Tcl_DString *linkPtr;	/* Uninitialized or free DString filled
-				 * with contents of link (UTF-8). */
-{
-    char link[MAXPATHLEN];
-    int length;
-    char *native;
-    Tcl_DString ds;
-
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    length = readlink(native, link, sizeof(link));	/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    
-    if (length < 0) {
-	return NULL;
-    }
-
-    Tcl_ExternalToUtfDString(NULL, link, length, linkPtr);
-    return Tcl_DStringValue(linkPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpStat --
- *
- *	This function replaces the library version of stat().
- *
- * Results:
- *	See stat() documentation.
- *
- * Side effects:
- *	See stat() documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpStat(path, bufPtr)
-    CONST char *path;		/* Path of file to stat (in UTF-8). */
-    struct stat *bufPtr;	/* Filled with results of stat call. */
-{
-    int result;
-    Tcl_DString ds;
-    char *native;
-    
-    native = Tcl_UtfToExternalDString(NULL, path, -1, &ds);
-    result = stat(native, bufPtr);			/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-
-    return result;
-}
-
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
deleted file mode 100644
index b561133..0000000
--- a/unix/tclUnixInit.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/* 
- * tclUnixInit.c --
- *
- *	Contains the Unix-specific interpreter initialization functions.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixInit.c,v 1.13 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include <locale.h>
-#if defined(__FreeBSD__)
-#   include <floatingpoint.h>
-#endif
-#if defined(__bsdi__)
-#   include <sys/param.h>
-#   if _BSDI_VERSION > 199501
-#	include <dlfcn.h>
-#   endif
-#endif
-
-/*
- * The Init script (common to Windows and Unix platforms) is
- * defined in tkInitScript.h
- */
-#include "tclInitScript.h"
-
-
-/*
- * Default directory in which to look for Tcl library scripts.  The
- * symbol is defined by Makefile.
- */
-
-static char defaultLibraryDir[sizeof(TCL_LIBRARY)+200] = TCL_LIBRARY;
-
-/*
- * Directory in which to look for packages (each package is typically
- * installed as a subdirectory of this directory).  The symbol is
- * defined by Makefile.
- */
-
-static char pkgPath[sizeof(TCL_PACKAGE_PATH)+200] = TCL_PACKAGE_PATH;
-
-typedef struct LocaleTable {
-    CONST char *lang;
-    CONST char *encoding;
-} LocaleTable;
-
-static CONST LocaleTable localeTable[] = {
-    {"ja_JP.SJIS",	"shiftjis"},
-    {"ja_JP.EUC",	"euc-jp"},
-    {"ja_JP.JIS",	"iso2022-jp"},
-    {"ja_JP.mscode",	"shiftjis"},
-    {"ja_JP.ujis",	"euc-jp"},
-    {"ja_JP",		"euc-jp"},
-    {"Ja_JP",		"shiftjis"},
-    {"Jp_JP",		"shiftjis"},
-    {"japan",		"euc-jp"},
-#ifdef hpux
-    {"japanese",	"shiftjis"},	
-    {"ja",		"shiftjis"},	
-#else
-    {"japanese",	"euc-jp"},
-    {"ja",		"euc-jp"},
-#endif
-    {"japanese.sjis",	"shiftjis"},
-    {"japanese.euc",	"euc-jp"},
-    {"japanese-sjis",	"shiftjis"},
-    {"japanese-ujis",	"euc-jp"},
-
-    {"ko",              "euc-kr"},
-    {"ko_KR",           "euc-kr"},
-    {"ko_KR.EUC",       "euc-kr"},
-    {"ko_KR.euc",       "euc-kr"},
-    {"ko_KR.eucKR",     "euc-kr"},
-    {"korean",          "euc-kr"},
-
-    {"zh",		"cp936"},
-
-    {NULL, NULL}
-};
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitPlatform --
- *
- *	Initialize all the platform-dependant things like signals and
- *	floating-point error handling.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitPlatform()
-{
-    tclPlatform = TCL_PLATFORM_UNIX;
-
-    /*
-     * The code below causes SIGPIPE (broken pipe) errors to
-     * be ignored.  This is needed so that Tcl processes don't
-     * die if they create child processes (e.g. using "exec" or
-     * "open") that terminate prematurely.  The signal handler
-     * is only set up when the first interpreter is created;
-     * after this the application can override the handler with
-     * a different one of its own, if it wants.
-     */
-
-#ifdef SIGPIPE
-    (void) signal(SIGPIPE, SIG_IGN);
-#endif /* SIGPIPE */
-
-#ifdef __FreeBSD__
-    fpsetround(FP_RN);
-    fpsetmask(0L);
-#endif
-
-#if defined(__bsdi__) && (_BSDI_VERSION > 199501)
-    /*
-     * Find local symbols. Don't report an error if we fail.
-     */
-    (void) dlopen (NULL, RTLD_NOW);			/* INTL: Native. */
-#endif
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitLibraryPath --
- *
- *	Initialize the library path at startup.  We have a minor
- *	metacircular problem that we don't know the encoding of the
- *	operating system but we may need to talk to operating system
- *	to find the library directories so that we know how to talk to
- *	the operating system.
- *
- *	We do not know the encoding of the operating system.
- *	We do know that the encoding is some multibyte encoding.
- *	In that multibyte encoding, the characters 0..127 are equivalent
- *	    to ascii.
- *
- *	So although we don't know the encoding, it's safe:
- *	    to look for the last slash character in a path in the encoding.
- *	    to append an ascii string to a path.
- *	    to pass those strings back to the operating system.
- *
- *	But any strings that we remembered before we knew the encoding of
- *	the operating system must be translated to UTF-8 once we know the
- *	encoding so that the rest of Tcl can use those strings.
- *
- *	This call sets the library path to strings in the unknown native
- *	encoding.  TclpSetInitialEncodings() will translate the library
- *	path from the native encoding to UTF-8 as soon as it determines
- *	what the native encoding actually is.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitLibraryPath(path)
-CONST char *path;		/* Path to the executable in native 
-				 * multi-byte encoding. */
-{
-#define LIBRARY_SIZE	    32
-    Tcl_Obj *pathPtr, *objPtr;
-    char *str;
-    Tcl_DString buffer, ds;
-    int pathc;
-    char **pathv;
-    char installLib[LIBRARY_SIZE], developLib[LIBRARY_SIZE];
-
-    Tcl_DStringInit(&ds);
-    pathPtr = Tcl_NewObj();
-
-    /*
-     * Initialize the substrings used when locating an executable.  The
-     * installLib variable computes the path as though the executable
-     * is installed.  The developLib computes the path as though the
-     * executable is run from a develpment directory.
-     */
-     
-    sprintf(installLib, "lib/tcl%s", TCL_VERSION);
-    sprintf(developLib, "tcl%s/library",
-	    ((TCL_RELEASE_LEVEL < 2) ? TCL_PATCH_LEVEL : TCL_VERSION));
-
-    /*
-     * Look for the library relative to default encoding dir.
-     */
-
-    str = Tcl_GetDefaultEncodingDir();
-    if ((str != NULL) && (str[0] != '\0')) {
-	objPtr = Tcl_NewStringObj(str, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-    }
-
-    /*
-     * Look for the library relative to the TCL_LIBRARY env variable.
-     * If the last dirname in the TCL_LIBRARY path does not match the
-     * last dirname in the installLib variable, use the last dir name
-     * of installLib in addition to the orginal TCL_LIBRARY path.
-     */
-
-    str = getenv("TCL_LIBRARY");			/* INTL: Native. */
-    Tcl_ExternalToUtfDString(NULL, str, -1, &buffer);
-    str = Tcl_DStringValue(&buffer);
-
-    if ((str != NULL) && (str[0] != '\0')) {
-	/*
-	 * If TCL_LIBRARY is set, search there.
-	 */
-	 
-	objPtr = Tcl_NewStringObj(str, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-
-	Tcl_SplitPath(str, &pathc, &pathv);
-	if ((pathc > 0) && (strcasecmp(installLib + 4, pathv[pathc-1]) != 0)) {
-	    /*
-	     * If TCL_LIBRARY is set but refers to a different tcl
-	     * installation than the current version, try fiddling with the
-	     * specified directory to make it refer to this installation by
-	     * removing the old "tclX.Y" and substituting the current
-	     * version string.
-	     */
-	    
-	    pathv[pathc - 1] = installLib + 4;
-	    str = Tcl_JoinPath(pathc, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(str, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	ckfree((char *) pathv);
-    }
-
-    /*
-     * Look for the library relative to the executable.  Use both the
-     * installLib and developLib because we cannot determine if this
-     * is installed or not.
-     */
-     
-    if (path != NULL) {
-	Tcl_SplitPath(path, &pathc, &pathv);
-	if (pathc > 1) {
-	    pathv[pathc - 2] = installLib;
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 2) {
-	    pathv[pathc - 3] = developLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	ckfree((char *) pathv);
-    }
-
-    /*
-     * Finally, look for the library relative to the compiled-in path.
-     * This is needed when users install Tcl with an exec-prefix that
-     * is different from the prtefix.
-     */
-			      
-    str = defaultLibraryDir;
-    if (str[0] != '\0') {
-        objPtr = Tcl_NewStringObj(str, -1);
-        Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-    }
-
-    TclSetLibraryPath(pathPtr);    
-    Tcl_DStringFree(&buffer);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetInitialEncodings --
- *
- *	Based on the locale, determine the encoding of the operating
- *	system and the default encoding for newly opened files.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The Tcl library path is converted from native encoding to UTF-8.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpSetInitialEncodings()
-{
-    CONST char *encoding;
-    int i;
-    Tcl_Obj *pathPtr;
-    char *langEnv;
-
-    /*
-     * Determine the current encoding from the LC_TYPE or LANG environment
-     * variables.  We previously used setlocale() to determine the locale,
-     * but this does not work on some systems (e.g. Linux/i386 RH 5.0).
-     */
-
-    langEnv = getenv("LC_CTYPE");
-
-    if (langEnv == NULL || langEnv[0] == '\0') {
-	langEnv = getenv("LANG");
-    }
-    if (langEnv == NULL || langEnv[0] == '\0') {
-	langEnv = NULL;
-    }
-
-    encoding = "iso8859-1";
-    if (langEnv != NULL) {
-	for (i = 0; localeTable[i].lang != NULL; i++) {
-	    if (strcmp(localeTable[i].lang, langEnv) == 0) {
-		encoding = localeTable[i].encoding;
-	    }
-	}
-    }
-
-    Tcl_SetSystemEncoding(NULL, encoding);
-
-    /*
-     * Until the system encoding was actually set, the library path was
-     * actually in the native multi-byte encoding, and not really UTF-8
-     * as advertised.  We cheated as follows:
-     *
-     * 1. It was safe to allow the Tcl_SetSystemEncoding() call to 
-     * append the ASCII chars that make up the encoding's filename to 
-     * the names (in the native encoding) of directories in the library 
-     * path, since all Unix multi-byte encodings have ASCII in the
-     * beginning.
-     *
-     * 2. To open the encoding file, the native bytes in the file name
-     * were passed to the OS, without translating from UTF-8 to native,
-     * because the name was already in the native encoding.
-     *
-     * Now that the system encoding was actually successfully set,
-     * translate all the names in the library path to UTF-8.  That way,
-     * next time we search the library path, we'll translate the names 
-     * from UTF-8 to the system encoding which will be the native 
-     * encoding.
-     */
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr != NULL) {
-	int objc;
-	Tcl_Obj **objv;
-	
-	objc = 0;
-	Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-	for (i = 0; i < objc; i++) {
-	    int length;
-	    char *string;
-	    Tcl_DString ds;
-
-	    string = Tcl_GetStringFromObj(objv[i], &length);
-	    Tcl_ExternalToUtfDString(NULL, string, length, &ds);
-	    Tcl_SetStringObj(objv[i], Tcl_DStringValue(&ds), 
-		    Tcl_DStringLength(&ds));
-	    Tcl_DStringFree(&ds);
-	}
-    }
-
-    /*
-     * Keep the iso8859-1 encoding preloaded.  The IO package uses it for
-     * gets on a binary channel.
-     */
-
-    Tcl_GetEncoding(NULL, "iso8859-1");
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetVariables --
- *
- *	Performs platform-specific interpreter initialization related to
- *	the tcl_library and tcl_platform variables, and other platform-
- *	specific things.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets "tcl_library" and "tcl_platform" Tcl variables.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpSetVariables(interp)
-    Tcl_Interp *interp;
-{
-#ifndef NO_UNAME
-    struct utsname name;
-#endif
-    int unameOK;
-    char *user;
-    Tcl_DString ds;
-
-    Tcl_SetVar(interp, "tcl_library", defaultLibraryDir, TCL_GLOBAL_ONLY);
-    Tcl_SetVar(interp, "tcl_pkgPath", pkgPath, TCL_GLOBAL_ONLY);
-    Tcl_SetVar2(interp, "tcl_platform", "platform", "unix", TCL_GLOBAL_ONLY);
-    unameOK = 0;
-#ifndef NO_UNAME
-    if (uname(&name) >= 0) {
-	char *native;
-	
-	unameOK = 1;
-
-	native = Tcl_ExternalToUtfDString(NULL, name.sysname, -1, &ds);
-	Tcl_SetVar2(interp, "tcl_platform", "os", native, TCL_GLOBAL_ONLY);
-	Tcl_DStringFree(&ds);
-	
-	/*
-	 * The following code is a special hack to handle differences in
-	 * the way version information is returned by uname.  On most
-	 * systems the full version number is available in name.release.
-	 * However, under AIX the major version number is in
-	 * name.version and the minor version number is in name.release.
-	 */
-
-	if ((strchr(name.release, '.') != NULL)
-		|| !isdigit(UCHAR(name.version[0]))) {	/* INTL: digit */
-	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
-		    TCL_GLOBAL_ONLY);
-	} else {
-	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.version,
-		    TCL_GLOBAL_ONLY);
-	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", ".",
-		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
-	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
-		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
-	}
-	Tcl_SetVar2(interp, "tcl_platform", "machine", name.machine,
-		TCL_GLOBAL_ONLY);
-    }
-#endif
-    if (!unameOK) {
-	Tcl_SetVar2(interp, "tcl_platform", "os", "", TCL_GLOBAL_ONLY);
-	Tcl_SetVar2(interp, "tcl_platform", "osVersion", "", TCL_GLOBAL_ONLY);
-	Tcl_SetVar2(interp, "tcl_platform", "machine", "", TCL_GLOBAL_ONLY);
-    }
-
-    /*
-     * Copy USER or LOGNAME environment variable into tcl_platform(user)
-     */
-
-    Tcl_DStringInit(&ds);
-    user = TclGetEnv("USER", &ds);
-    if (user == NULL) {
-	user = TclGetEnv("LOGNAME", &ds);
-	if (user == NULL) {
-	    user = "";
-	}
-    }
-    Tcl_SetVar2(interp, "tcl_platform", "user", user, TCL_GLOBAL_ONLY);
-    Tcl_DStringFree(&ds);
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFindVariable --
- *
- *	Locate the entry in environ for a given name.  On Unix this 
- *	routine is case sensetive, on Windows this matches mioxed case.
- *
- * Results:
- *	The return value is the index in environ of an entry with the
- *	name "name", or -1 if there is no such entry.   The integer at
- *	*lengthPtr is filled in with the length of name (if a matching
- *	entry is found) or the length of the environ array (if no matching
- *	entry is found).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpFindVariable(name, lengthPtr)
-    CONST char *name;		/* Name of desired environment variable
-				 * (native). */
-    int *lengthPtr;		/* Used to return length of name (for
-				 * successful searches) or number of non-NULL
-				 * entries in environ (for unsuccessful
-				 * searches). */
-{
-    int i, result = -1;
-    register CONST char *env, *p1, *p2;
-    Tcl_DString envString;
-
-    Tcl_DStringInit(&envString);
-    for (i = 0, env = environ[i]; env != NULL; i++, env = environ[i]) {
-	p1 = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
-	p2 = name;
-
-	for (; *p2 == *p1; p1++, p2++) {
-	    /* NULL loop body. */
-	}
-	if ((*p1 == '=') && (*p2 == '\0')) {
-	    *lengthPtr = p2 - name;
-	    result = i;
-	    goto done;
-	}
-	
-	Tcl_DStringFree(&envString);
-    }
-    
-    *lengthPtr = i;
-
-    done:
-    Tcl_DStringFree(&envString);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Init --
- *
- *	This procedure is typically invoked by Tcl_AppInit procedures
- *	to find and source the "init.tcl" script, which should exist
- *	somewhere on the Tcl library path.
- *
- * Results:
- *	Returns a standard Tcl completion code and sets the interp's
- *	result if there is an error.
- *
- * Side effects:
- *	Depends on what's in the init.tcl script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter to initialize. */
-{
-    Tcl_Obj *pathPtr;
-
-    if (tclPreInitScript != NULL) {
-	if (Tcl_Eval(interp, tclPreInitScript) == TCL_ERROR) {
-	    return (TCL_ERROR);
-	};
-    }
-    
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr == NULL) {
-	pathPtr = Tcl_NewObj();
-    }
-    Tcl_SetVar2Ex(interp, "tcl_libPath", NULL, pathPtr, TCL_GLOBAL_ONLY);
-    return Tcl_Eval(interp, initScript);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SourceRCFile --
- *
- *	This procedure is typically invoked by Tcl_Main of Tk_Main
- *	procedure to source an application specific rc file into the
- *	interpreter at startup time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on what's in the rc script.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SourceRCFile(interp)
-    Tcl_Interp *interp;		/* Interpreter to source rc file into. */
-{
-    Tcl_DString temp;
-    char *fileName;
-    Tcl_Channel errChannel;
-
-    fileName = Tcl_GetVar(interp, "tcl_rcFileName", TCL_GLOBAL_ONLY);
-
-    if (fileName != NULL) {
-        Tcl_Channel c;
-	char *fullName;
-
-        Tcl_DStringInit(&temp);
-	fullName = Tcl_TranslateFileName(interp, fileName, &temp);
-	if (fullName == NULL) {
-	    /*
-	     * Couldn't translate the file name (e.g. it referred to a
-	     * bogus user or there was no HOME environment variable).
-	     * Just do nothing.
-	     */
-	} else {
-
-	    /*
-	     * Test for the existence of the rc file before trying to read it.
-	     */
-
-            c = Tcl_OpenFileChannel(NULL, fullName, "r", 0);
-            if (c != (Tcl_Channel) NULL) {
-                Tcl_Close(NULL, c);
-		if (Tcl_EvalFile(interp, fullName) != TCL_OK) {
-		    errChannel = Tcl_GetStdChannel(TCL_STDERR);
-		    if (errChannel) {
-			Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-			Tcl_WriteChars(errChannel, "\n", 1);
-		    }
-		}
-	    }
-	}
-        Tcl_DStringFree(&temp);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCheckStackSpace --
- *
- *	Detect if we are about to blow the stack.  Called before an 
- *	evaluation can happen when nesting depth is checked.
- *
- * Results:
- *	1 if there is enough stack space to continue; 0 if not.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCheckStackSpace()
-{
-    /*
-     * This function is unimplemented on Unix platforms.
-     */
-
-    return 1;
-}
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
deleted file mode 100644
index bbb34e0..0000000
--- a/unix/tclUnixNotfy.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
- * tclUnixNotify.c --
- *
- *	This file contains the implementation of the select-based
- *	Unix-specific notifier, which is the lowest-level part of the
- *	Tcl event loop.  This file works together with
- *	../generic/tclNotify.c.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixNotfy.c,v 1.3 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-#include <signal.h> 
-
-/*
- * This structure is used to keep track of the notifier info for a 
- * a registered file.
- */
-
-typedef struct FileHandler {
-    int fd;
-    int mask;			/* Mask of desired events: TCL_READABLE,
-				 * etc. */
-    int readyMask;		/* Mask of events that have been seen since the
-				 * last time file handlers were invoked for
-				 * this file. */
-    Tcl_FileProc *proc;		/* Procedure to call, in the style of
-				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
-    struct FileHandler *nextPtr;/* Next in list of all files we care about. */
-} FileHandler;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * file handlers are ready to fire.
- */
-
-typedef struct FileHandlerEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    int fd;			/* File descriptor that is ready.  Used
-				 * to find the FileHandler structure for
-				 * the file (can't point directly to the
-				 * FileHandler structure because it could
-				 * go away while the event is queued). */
-} FileHandlerEvent;
-
-/*
- * The following static structure contains the state information for the
- * select based implementation of the Tcl notifier.  One of these structures
- * is created for each thread that is using the notifier.  
- */
-
-typedef struct ThreadSpecificData {
-    FileHandler *firstFileHandlerPtr;
-				/* Pointer to head of file handler list. */
-    fd_mask checkMasks[3*MASK_SIZE];
-				/* This array is used to build up the masks
-				 * to be used in the next call to select.
-				 * Bits are set in response to calls to
-				 * Tcl_CreateFileHandler. */
-    fd_mask readyMasks[3*MASK_SIZE];
-				/* This array reflects the readable/writable
-				 * conditions that were found to exist by the
-				 * last call to select. */
-    int numFdBits;		/* Number of valid bits in checkMasks
-				 * (one more than highest fd for which
-				 * Tcl_WatchFile has been called). */
-#ifdef TCL_THREADS
-    int onList;			/* True if it is in this list */
-    unsigned int pollState;	/* pollState is used to implement a polling 
-				 * handshake between each thread and the
-				 * notifier thread. Bits defined below. */
-    struct ThreadSpecificData *nextPtr, *prevPtr;
-                                /* All threads that are currently waiting on 
-                                 * an event have their ThreadSpecificData
-                                 * structure on a doubly-linked listed formed
-                                 * from these pointers.  You must hold the
-                                 * notifierMutex lock before accessing these
-                                 * fields. */
-    Tcl_Condition waitCV;     /* Any other thread alerts a notifier
-				 * that an event is ready to be processed
-				 * by signaling this condition variable. */
-    int eventReady;           /* True if an event is ready to be processed.
-                               * Used as condition flag together with
-                               * waitCV above. */
-#endif
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-#ifdef TCL_THREADS
-/*
- * The following static indicates the number of threads that have
- * initialized notifiers.
- *
- * You must hold the notifierMutex lock before accessing this variable.
- */
-
-static int notifierCount = 0;
-
-/*
- * The following variable points to the head of a doubly-linked list of 
- * of ThreadSpecificData structures for all threads that are currently
- * waiting on an event.
- *
- * You must hold the notifierMutex lock before accessing this list.
- */
-
-static ThreadSpecificData *waitingListPtr = NULL;
-
-/*
- * The notifier thread spends all its time in select() waiting for a
- * file descriptor associated with one of the threads on the waitingListPtr
- * list to do something interesting.  But if the contents of the
- * waitingListPtr list ever changes, we need to wake up and restart
- * the select() system call.  You can wake up the notifier thread by
- * writing a single byte to the file descriptor defined below.  This
- * file descriptor is the input-end of a pipe and the notifier thread is
- * listening for data on the output-end of the same pipe.  Hence writing
- * to this file descriptor will cause the select() system call to return
- * and wake up the notifier thread.
- *
- * You must hold the notifierMutex lock before accessing this list.
- */
-
-static int triggerPipe = -1;
-
-/*
- * The notifierMutex locks access to all of the global notifier state. 
- */
-
-TCL_DECLARE_MUTEX(notifierMutex)
-
-/*
- * The notifier thread signals the notifierCV when it has finished
- * initializing the triggerPipe and right before the notifier
- * thread terminates.
- */
-
-static Tcl_Condition notifierCV;
-
-/*
- * The pollState bits
- *	POLL_WANT is set by each thread before it waits on its condition
- *		variable.  It is checked by the notifier before it does
- *		select.
- *	POLL_DONE is set by the notifier if it goes into select after
- *		seeing POLL_WANT.  The idea is to ensure it tries a select
- *		with the same bits the initial thread had set.
- */
-#define POLL_WANT	0x1
-#define POLL_DONE	0x2
-
-/*
- * This is the thread ID of the notifier thread that does select.
- */
-static Tcl_ThreadId notifierThread;
-
-#endif
-
-/*
- * Static routines defined in this file.
- */
-
-#ifdef TCL_THREADS
-static void	NotifierThreadProc _ANSI_ARGS_((ClientData clientData));
-#endif
-static int	FileHandlerEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-		    int flags));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitNotifier --
- *
- *	Initializes the platform specific notifier state.
- *
- * Results:
- *	Returns a handle to the notifier state for this thread..
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_InitNotifier()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-#ifdef TCL_THREADS
-    tsdPtr->eventReady = 0;
-
-    /*
-     * Start the Notifier thread if necessary.
-     */
-
-    Tcl_MutexLock(&notifierMutex);
-    if (notifierCount == 0) {
-	if (TclpThreadCreate(&notifierThread, NotifierThreadProc, NULL) != TCL_OK) {
-	    panic("Tcl_InitNotifier: unable to start notifier thread");
-	}
-    }
-    notifierCount++;
-
-    /*
-     * Wait for the notifier pipe to be created.
-     */
-
-    while (triggerPipe < 0) {
-	Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
-    }
-
-    Tcl_MutexUnlock(&notifierMutex);
-#endif
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FinalizeNotifier --
- *
- *	This function is called to cleanup the notifier state before
- *	a thread is terminated.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May terminate the background notifier thread if this is the
- *	last notifier instance.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FinalizeNotifier(clientData)
-    ClientData clientData;		/* Not used. */
-{
-#ifdef TCL_THREADS
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    Tcl_MutexLock(&notifierMutex);
-    notifierCount--;
-
-    /*
-     * If this is the last thread to use the notifier, close the notifier
-     * pipe and wait for the background thread to terminate.
-     */
-
-    if (notifierCount == 0) {
-	if (triggerPipe < 0) {
-	    panic("Tcl_FinalizeNotifier: notifier pipe not initialized");
-	}
-	close(triggerPipe);
-	Tcl_ConditionWait(&notifierCV, &notifierMutex, NULL);
-    }
-
-    /*
-     * Clean up any synchronization objects in the thread local storage.
-     */
-
-    TclFinalizeCondition(&(tsdPtr->waitCV));
-
-    Tcl_MutexUnlock(&notifierMutex);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AlertNotifier --
- *
- *	Wake up the specified notifier from any thread. This routine
- *	is called by the platform independent notifier code whenever
- *	the Tcl_ThreadAlert routine is called.  This routine is
- *	guaranteed not to be called on a given notifier after
- *	Tcl_FinalizeNotifier is called for that notifier.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Signals the notifier condition variable for the specified
- *	notifier.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AlertNotifier(clientData)
-    ClientData clientData;
-{
-#ifdef TCL_THREADS
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
-    Tcl_MutexLock(&notifierMutex);
-    tsdPtr->eventReady = 1;
-    Tcl_ConditionNotify(&tsdPtr->waitCV);
-    Tcl_MutexUnlock(&notifierMutex);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetTimer --
- *
- *	This procedure sets the current notifier timer value.  This
- *	interface is not implemented in this notifier because we are
- *	always running inside of Tcl_DoOneEvent.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetTimer(timePtr)
-    Tcl_Time *timePtr;		/* Timeout value, may be NULL. */
-{
-    /*
-     * The interval timer doesn't do anything in this implementation,
-     * because the only event loop is via Tcl_DoOneEvent, which passes
-     * timeout values to Tcl_WaitForEvent.
-     */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ServiceModeHook --
- *
- *	This function is invoked whenever the service mode changes.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ServiceModeHook(mode)
-    int mode;			/* Either TCL_SERVICE_ALL, or
-				 * TCL_SERVICE_NONE. */
-{
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateFileHandler --
- *
- *	This procedure registers a file handler with the Xt notifier.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new file handler structure and registers one or more
- *	input procedures with Xt.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateFileHandler(fd, mask, proc, clientData)
-    int fd;			/* Handle of stream to watch. */
-    int mask;			/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, and TCL_EXCEPTION:
-				 * indicates conditions under which
-				 * proc should be called. */
-    Tcl_FileProc *proc;		/* Procedure to call for each
-				 * selected event. */
-    ClientData clientData;	/* Arbitrary data to pass to proc. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    FileHandler *filePtr;
-    int index, bit;
-
-    for (filePtr = tsdPtr->firstFileHandlerPtr; filePtr != NULL;
-	 filePtr = filePtr->nextPtr) {
-	if (filePtr->fd == fd) {
-	    break;
-	}
-    }
-    if (filePtr == NULL) {
-	filePtr = (FileHandler*) ckalloc(sizeof(FileHandler));
-	filePtr->fd = fd;
-	filePtr->readyMask = 0;
-	filePtr->nextPtr = tsdPtr->firstFileHandlerPtr;
-	tsdPtr->firstFileHandlerPtr = filePtr;
-    }
-    filePtr->proc = proc;
-    filePtr->clientData = clientData;
-    filePtr->mask = mask;
-
-    /*
-     * Update the check masks for this file.
-     */
-
-    index = fd/(NBBY*sizeof(fd_mask));
-    bit = 1 << (fd%(NBBY*sizeof(fd_mask)));
-    if (mask & TCL_READABLE) {
-	tsdPtr->checkMasks[index] |= bit;
-    } else {
-	tsdPtr->checkMasks[index] &= ~bit;
-    } 
-    if (mask & TCL_WRITABLE) {
-	(tsdPtr->checkMasks+MASK_SIZE)[index] |= bit;
-    } else {
-	(tsdPtr->checkMasks+MASK_SIZE)[index] &= ~bit;
-    }
-    if (mask & TCL_EXCEPTION) {
-	(tsdPtr->checkMasks+2*(MASK_SIZE))[index] |= bit;
-    } else {
-	(tsdPtr->checkMasks+2*(MASK_SIZE))[index] &= ~bit;
-    }
-    if (tsdPtr->numFdBits <= fd) {
-	tsdPtr->numFdBits = fd+1;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteFileHandler --
- *
- *	Cancel a previously-arranged callback arrangement for
- *	a file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If a callback was previously registered on file, remove it.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteFileHandler(fd)
-    int fd;		/* Stream id for which to remove callback procedure. */
-{
-    FileHandler *filePtr, *prevPtr;
-    int index, bit, i;
-    unsigned long flags;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Find the entry for the given file (and return if there isn't one).
-     */
-
-    for (prevPtr = NULL, filePtr = tsdPtr->firstFileHandlerPtr; ;
-	 prevPtr = filePtr, filePtr = filePtr->nextPtr) {
-	if (filePtr == NULL) {
-	    return;
-	}
-	if (filePtr->fd == fd) {
-	    break;
-	}
-    }
-
-    /*
-     * Update the check masks for this file.
-     */
-
-    index = fd/(NBBY*sizeof(fd_mask));
-    bit = 1 << (fd%(NBBY*sizeof(fd_mask)));
-
-    if (filePtr->mask & TCL_READABLE) {
-	tsdPtr->checkMasks[index] &= ~bit;
-    }
-    if (filePtr->mask & TCL_WRITABLE) {
-	(tsdPtr->checkMasks+MASK_SIZE)[index] &= ~bit;
-    }
-    if (filePtr->mask & TCL_EXCEPTION) {
-	(tsdPtr->checkMasks+2*(MASK_SIZE))[index] &= ~bit;
-    }
-
-    /*
-     * Find current max fd.
-     */
-
-    if (fd+1 == tsdPtr->numFdBits) {
-	for (tsdPtr->numFdBits = 0; index >= 0; index--) {
-	    flags = tsdPtr->checkMasks[index]
-		| (tsdPtr->checkMasks+MASK_SIZE)[index]
-		| (tsdPtr->checkMasks+2*(MASK_SIZE))[index];
-	    if (flags) {
-		for (i = (NBBY*sizeof(fd_mask)); i > 0; i--) {
-		    if (flags & (((unsigned long)1) << (i-1))) {
-			break;
-		    }
-		}
-		tsdPtr->numFdBits = index * (NBBY*sizeof(fd_mask)) + i;
-		break;
-	    }
-	}
-    }
-
-    /*
-     * Clean up information in the callback record.
-     */
-
-    if (prevPtr == NULL) {
-	tsdPtr->firstFileHandlerPtr = filePtr->nextPtr;
-    } else {
-	prevPtr->nextPtr = filePtr->nextPtr;
-    }
-    ckfree((char *) filePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileHandlerEventProc --
- *
- *	This procedure is called by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure is
- *	responsible for actually handling the event by invoking the
- *	callback for the file handler.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the file handler's callback procedure does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileHandlerEventProc(evPtr, flags)
-    Tcl_Event *evPtr;		/* Event to service. */
-    int flags;			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    int mask;
-    FileHandler *filePtr;
-    FileHandlerEvent *fileEvPtr = (FileHandlerEvent *) evPtr;
-    ThreadSpecificData *tsdPtr;
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the file handlers to find the one whose handle matches
-     * the event.  We do this rather than keeping a pointer to the file
-     * handler directly in the event, so that the handler can be deleted
-     * while the event is queued without leaving a dangling pointer.
-     */
-
-    tsdPtr = TCL_TSD_INIT(&dataKey);
-    for (filePtr = tsdPtr->firstFileHandlerPtr; filePtr != NULL;
-	 filePtr = filePtr->nextPtr) {
-	if (filePtr->fd != fileEvPtr->fd) {
-	    continue;
-	}
-
-	/*
-	 * The code is tricky for two reasons:
-	 * 1. The file handler's desired events could have changed
-	 *    since the time when the event was queued, so AND the
-	 *    ready mask with the desired mask.
-	 * 2. The file could have been closed and re-opened since
-	 *    the time when the event was queued.  This is why the
-	 *    ready mask is stored in the file handler rather than
-	 *    the queued event:  it will be zeroed when a new
-	 *    file handler is created for the newly opened file.
-	 */
-
-	mask = filePtr->readyMask & filePtr->mask;
-	filePtr->readyMask = 0;
-	if (mask != 0) {
-	    (*filePtr->proc)(filePtr->clientData, mask);
-	}
-	break;
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitForEvent --
- *
- *	This function is called by Tcl_DoOneEvent to wait for new
- *	events on the message queue.  If the block time is 0, then
- *	Tcl_WaitForEvent just polls without blocking.
- *
- * Results:
- *	Returns -1 if the select would block forever, otherwise
- *	returns 0.
- *
- * Side effects:
- *	Queues file events that are detected by the select.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WaitForEvent(timePtr)
-    Tcl_Time *timePtr;		/* Maximum block time, or NULL. */
-{
-    FileHandler *filePtr;
-    FileHandlerEvent *fileEvPtr;
-    struct timeval timeout, *timeoutPtr;
-    int bit, index, mask;
-#ifdef TCL_THREADS
-    int waitForFiles;
-#else
-    int numFound;
-#endif
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Set up the timeout structure.  Note that if there are no events to
-     * check for, we return with a negative result rather than blocking
-     * forever.
-     */
-
-    if (timePtr) {
-	timeout.tv_sec = timePtr->sec;
-	timeout.tv_usec = timePtr->usec;
-	timeoutPtr = &timeout;
-#ifndef TCL_THREADS
-    } else if (tsdPtr->numFdBits == 0) {
-	/*
-	 * If there are no threads, no timeout, and no fds registered,
-	 * then there are no events possible and we must avoid deadlock.
-	 * Note that this is not entirely correct because there might
-	 * be a signal that could interrupt the select call, but we
-	 * don't handle that case if we aren't using threads.
-	 */
-
-	return -1;
-#endif
-    } else {
-	timeoutPtr = NULL;
-    }
-
-#ifdef TCL_THREADS
-    /*
-     * Place this thread on the list of interested threads, signal the
-     * notifier thread, and wait for a response or a timeout.
-     */
-
-    Tcl_MutexLock(&notifierMutex);
-
-    waitForFiles = (tsdPtr->numFdBits > 0);
-    if (timePtr != NULL && timePtr->sec == 0 && timePtr->usec == 0) {
-	/*
-	 * Cannot emulate a polling select with a polling condition variable.
-	 * Instead, pretend to wait for files and tell the notifier
-	 * thread what we are doing.  The notifier thread makes sure
-	 * it goes through select with its select mask in the same state
-	 * as ours currently is.  We block until that happens.
-	 */
-
-	waitForFiles = 1;
-	tsdPtr->pollState = POLL_WANT;
-	timePtr = NULL;
-    } else {
-	tsdPtr->pollState = 0;
-    }
-
-    if (waitForFiles) {
-        /*
-         * Add the ThreadSpecificData structure of this thread to the list
-         * of ThreadSpecificData structures of all threads that are waiting
-         * on file events.
-         */
-
-
-        tsdPtr->nextPtr = waitingListPtr;
-        if (waitingListPtr) {
-            waitingListPtr->prevPtr = tsdPtr;
-        }
-        tsdPtr->prevPtr = 0;
-        waitingListPtr = tsdPtr;
-	tsdPtr->onList = 1;
-	
-	Tcl_MutexUnlock(&notifierMutex);
-	write(triggerPipe, "", 1);
-	Tcl_MutexLock(&notifierMutex);
-    }
-
-    memset((VOID *) tsdPtr->readyMasks, 0, 3*MASK_SIZE*sizeof(fd_mask));
-
-    if (!tsdPtr->eventReady) {
-
-        Tcl_ConditionWait(&tsdPtr->waitCV, &notifierMutex, timePtr);
-    }
-    tsdPtr->eventReady = 0;
-
-    if (waitForFiles && tsdPtr->onList) {
-	/*
-	 * Remove the ThreadSpecificData structure of this thread from the
-	 * waiting list.  Alert the notifier thread to recompute its select
-	 * masks - skipping this caused a hang when trying to close a pipe
-	 * which the notifier thread was still doing a select on.
-	 */
-
-        if (tsdPtr->prevPtr) {
-            tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
-        } else {
-            waitingListPtr = tsdPtr->nextPtr;
-        }
-        if (tsdPtr->nextPtr) {
-            tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
-        }
-        tsdPtr->nextPtr = tsdPtr->prevPtr = NULL;
-	tsdPtr->onList = 0;
-        Tcl_MutexUnlock(&notifierMutex);
-	write(triggerPipe, "", 1);
-        Tcl_MutexLock(&notifierMutex);
-
-    }
-
-    
-#else
-    memcpy((VOID *) tsdPtr->readyMasks, (VOID *) tsdPtr->checkMasks,
-	    3*MASK_SIZE*sizeof(fd_mask));
-    numFound = select(tsdPtr->numFdBits,
-	    (SELECT_MASK *) &tsdPtr->readyMasks[0],
-	    (SELECT_MASK *) &tsdPtr->readyMasks[MASK_SIZE],
-	    (SELECT_MASK *) &tsdPtr->readyMasks[2*MASK_SIZE], timeoutPtr);
-
-    /*
-     * Some systems don't clear the masks after an error, so
-     * we have to do it here.
-     */
-
-    if (numFound == -1) {
-	memset((VOID *) tsdPtr->readyMasks, 0, 3*MASK_SIZE*sizeof(fd_mask));
-    }
-#endif
-
-    /*
-     * Queue all detected file events before returning.
-     */
-
-    for (filePtr = tsdPtr->firstFileHandlerPtr; (filePtr != NULL);
-	 filePtr = filePtr->nextPtr) {
-	index = filePtr->fd / (NBBY*sizeof(fd_mask));
-	bit = 1 << (filePtr->fd % (NBBY*sizeof(fd_mask)));
-	mask = 0;
-
-	if (tsdPtr->readyMasks[index] & bit) {
-	    mask |= TCL_READABLE;
-	}
-	if ((tsdPtr->readyMasks+MASK_SIZE)[index] & bit) {
-	    mask |= TCL_WRITABLE;
-	}
-	if ((tsdPtr->readyMasks+2*(MASK_SIZE))[index] & bit) {
-	    mask |= TCL_EXCEPTION;
-	}
-
-	if (!mask) {
-	    continue;
-	}
-
-	/*
-	 * Don't bother to queue an event if the mask was previously
-	 * non-zero since an event must still be on the queue.
-	 */
-
-	if (filePtr->readyMask == 0) {
-	    fileEvPtr = (FileHandlerEvent *) ckalloc(
-		sizeof(FileHandlerEvent));
-	    fileEvPtr->header.proc = FileHandlerEventProc;
-	    fileEvPtr->fd = filePtr->fd;
-	    Tcl_QueueEvent((Tcl_Event *) fileEvPtr, TCL_QUEUE_TAIL);
-	}
-	filePtr->readyMask = mask;
-    }
-#ifdef TCL_THREADS
-    Tcl_MutexUnlock(&notifierMutex);
-#endif
-    return 0;
-}
-
-#ifdef TCL_THREADS
-/*
- *----------------------------------------------------------------------
- *
- * NotifierThreadProc --
- *
- *	This routine is the initial (and only) function executed by the
- *	special notifier thread.  Its job is to wait for file descriptors
- *	to become readable or writable or to have an exception condition
- *	and then to notify other threads who are interested in this
- *	information by signalling a condition variable.  Other threads
- *	can signal this notifier thread of a change in their interests
- *	by writing a single byte to a special pipe that the notifier
- *	thread is monitoring.
- *
- * Result:
- *	None.  Once started, this routine never exits.  It dies with
- *	the overall process.
- *
- * Side effects:
- *	The trigger pipe used to signal the notifier thread is created
- *	when the notifier thread first starts.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-NotifierThreadProc(clientData)
-    ClientData clientData;	/* Not used. */
-{
-    ThreadSpecificData *tsdPtr;
-    fd_mask masks[3*MASK_SIZE];
-    long *maskPtr = (long *)masks;	/* masks[] cast to type long[] */
-    int fds[2];
-    int i, status, index, bit, numFdBits, found, receivePipe, word;
-    struct timeval poll = {0., 0.}, *timePtr;
-    int maskSize = 3 * ((MASK_SIZE) / sizeof(long)) * sizeof(fd_mask);
-    char buf[2];
-
-    if (pipe(fds) != 0) {
-	panic("NotifierThreadProc: could not create trigger pipe.");
-    }
-
-    receivePipe = fds[0];
-
-#ifndef USE_FIONBIO
-    status = fcntl(receivePipe, F_GETFL);
-    status |= O_NONBLOCK;
-    if (fcntl(receivePipe, F_SETFL, status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
-    }
-#else
-    if (ioctl(receivePipe, (int) FIONBIO, &status) < 0) {
-	panic("NotifierThreadProc: could not make receive pipe non blocking.");
-    }
-#endif
-
-    /*
-     * Install the write end of the pipe into the global variable.
-     */
-
-    Tcl_MutexLock(&notifierMutex);
-    triggerPipe = fds[1];
-
-    /*
-     * Signal any threads that are waiting.
-     */
-
-    Tcl_ConditionNotify(&notifierCV);
-    Tcl_MutexUnlock(&notifierMutex);
-
-    /*
-     * Look for file events and report them to interested threads.
-     */
-
-    while (1) {
-	/*
-	 * Set up the select mask to include the receive pipe.
-	 */
-
-	memset((VOID *)masks, 0, 3*MASK_SIZE*sizeof(fd_mask));
-        numFdBits = receivePipe + 1;
-	index = receivePipe / (NBBY*sizeof(fd_mask));
-	bit = 1 << (receivePipe % (NBBY*sizeof(fd_mask)));
-	masks[index] |= bit;
-
-	/*
-	 * Add in the check masks from all of the waiting notifiers.
-	 */
-	
-	Tcl_MutexLock(&notifierMutex);
-	timePtr = NULL;
-        for (tsdPtr = waitingListPtr; tsdPtr; tsdPtr = tsdPtr->nextPtr) {
-            for (i = 0; i < maskSize; i++) {
-                maskPtr[i] |= ((long*)tsdPtr->checkMasks)[i];
-            }
-            if (tsdPtr->numFdBits > numFdBits) {
-                numFdBits = tsdPtr->numFdBits;
-            }
-	    if (tsdPtr->pollState & POLL_WANT) {
-		/*
-		 * Here we make sure we go through select() with the same
-		 * mask bits that were present when the thread tried to poll.
-		 */
-
-		tsdPtr->pollState |= POLL_DONE;
-		timePtr = &poll;
-	    }
-        }
-	Tcl_MutexUnlock(&notifierMutex);
-
-	maskSize = 3 * ((MASK_SIZE) / sizeof(long)) * sizeof(fd_mask);
-
-	if (select(numFdBits, (SELECT_MASK *) &masks[0],
-		(SELECT_MASK *) &masks[MASK_SIZE],
-		(SELECT_MASK *) &masks[2*MASK_SIZE], timePtr) == -1) {
-	    /*
-	     * Try again immediately on an error.
-	     */
-
-	    continue;
-        }
-
-	/*
-	 * Alert any threads that are waiting on a ready file descriptor.
-	 */
-
-	Tcl_MutexLock(&notifierMutex);
-        for (tsdPtr = waitingListPtr; tsdPtr; tsdPtr = tsdPtr->nextPtr) {
-	    found = 0;
-
-            for (i = 0; i < maskSize; i++) {
-                word = maskPtr[i] & ((long*)tsdPtr->checkMasks)[i];
-                found |= word;
-                (((long*)(tsdPtr->readyMasks))[i]) = word;
-	    }
-            if (found || (tsdPtr->pollState & POLL_DONE)) {
-                tsdPtr->eventReady = 1;
-		Tcl_ConditionNotify(&tsdPtr->waitCV);
-		if (tsdPtr->onList) {
-		    /*
-		     * Remove the ThreadSpecificData structure of this thread
-		     * from the waiting list. This prevents us from continuously
-		     * spining on select until the other threads runs and
-		     * services the file event.
-		     */
-	    
-		    if (tsdPtr->prevPtr) {
-			tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
-		    } else {
-			waitingListPtr = tsdPtr->nextPtr;
-		    }
-		    if (tsdPtr->nextPtr) {
-			tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
-		    }
-		    tsdPtr->nextPtr = tsdPtr->prevPtr = NULL;
-		    tsdPtr->onList = 0;
-		    tsdPtr->pollState = 0;
-		}
-            }
-        }
-	Tcl_MutexUnlock(&notifierMutex);
-	
-	/*
-	 * Consume the next byte from the notifier pipe if the pipe was
-	 * readable.  Note that there may be multiple bytes pending, but
-	 * to avoid a race condition we only read one at a time.
-	 */
-
-	if ((masks[index] & bit) && (read(receivePipe, buf, 1) == 0)) {
-	    /*
-	     * Someone closed the write end of the pipe so we need to
-	     * shut down the notifier thread.
-	     */
-
-	    break;
-	}
-    }
-
-    /*
-     * Clean up the read end of the pipe and signal any threads waiting on
-     * termination of the notifier thread.
-     */
-
-    close(receivePipe);
-    Tcl_MutexLock(&notifierMutex);
-    triggerPipe = -1;
-    Tcl_ConditionNotify(&notifierCV);
-    Tcl_MutexUnlock(&notifierMutex);
-}
-#endif
diff --git a/unix/tclUnixPipe.c b/unix/tclUnixPipe.c
deleted file mode 100644
index b78715c..0000000
--- a/unix/tclUnixPipe.c
+++ /dev/null
@@ -1,1158 +0,0 @@
-/* 
- * tclUnixPipe.c --
- *
- *	This file implements the UNIX-specific exec pipeline functions,
- *	the "pipe" channel driver, and the "pid" Tcl command.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixPipe.c,v 1.3 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The following macros convert between TclFile's and fd's.  The conversion
- * simple involves shifting fd's up by one to ensure that no valid fd is ever
- * the same as NULL.
- */
-
-#define MakeFile(fd) ((TclFile)(((int)fd)+1))
-#define GetFd(file) (((int)file)-1)
-
-/*
- * This structure describes per-instance state of a pipe based channel.
- */
-
-typedef struct PipeState {
-    Tcl_Channel channel;/* Channel associated with this file. */
-    TclFile inFile;	/* Output from pipe. */
-    TclFile outFile;	/* Input to pipe. */
-    TclFile errorFile;	/* Error output from pipe. */
-    int numPids;	/* How many processes are attached to this pipe? */
-    Tcl_Pid *pidPtr;	/* The process IDs themselves. Allocated by
-                         * the creator of the pipe. */
-    int isNonBlocking;	/* Nonzero when the pipe is in nonblocking mode.
-                         * Used to decide whether to wait for the children
-                         * at close time. */
-} PipeState;
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static int	PipeBlockModeProc _ANSI_ARGS_((ClientData instanceData,
-		    int mode));
-static int	PipeCloseProc _ANSI_ARGS_((ClientData instanceData,
-		    Tcl_Interp *interp));
-static int	PipeGetHandleProc _ANSI_ARGS_((ClientData instanceData,
-		    int direction, ClientData *handlePtr));
-static int	PipeInputProc _ANSI_ARGS_((ClientData instanceData,
-		    char *buf, int toRead, int *errorCode));
-static int	PipeOutputProc _ANSI_ARGS_((
-		    ClientData instanceData, char *buf, int toWrite,
-		    int *errorCode));
-static void	PipeWatchProc _ANSI_ARGS_((ClientData instanceData, int mask));
-static void	RestoreSignals _ANSI_ARGS_((void));
-static int	SetupStdFile _ANSI_ARGS_((TclFile file, int type));
-
-/*
- * This structure describes the channel type structure for command pipe
- * based IO:
- */
-
-static Tcl_ChannelType pipeChannelType = {
-    "pipe",				/* Type name. */
-    PipeBlockModeProc,			/* Set blocking/nonblocking mode.*/
-    PipeCloseProc,			/* Close proc. */
-    PipeInputProc,			/* Input proc. */
-    PipeOutputProc,			/* Output proc. */
-    NULL,				/* Seek proc. */
-    NULL,				/* Set option proc. */
-    NULL,				/* Get option proc. */
-    PipeWatchProc,			/* Initialize notifier. */
-    PipeGetHandleProc,			/* Get OS handles out of channel. */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMakeFile --
- *
- *	Make a TclFile from a channel.
- *
- * Results:
- *	Returns a new TclFile or NULL on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpMakeFile(channel, direction)
-    Tcl_Channel channel;	/* Channel to get file from. */
-    int direction;		/* Either TCL_READABLE or TCL_WRITABLE. */
-{
-    ClientData data;
-
-    if (Tcl_GetChannelHandle(channel, direction, (ClientData *) &data)
-	    == TCL_OK) {
-	return MakeFile((int)data);
-    } else {
-	return (TclFile) NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpOpenFile --
- *
- *	Open a file for use in a pipeline.  
- *
- * Results:
- *	Returns a new TclFile handle or NULL on failure.
- *
- * Side effects:
- *	May cause a file to be created on the file system.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpOpenFile(fname, mode)
-    CONST char *fname;		/* The name of the file to open. */
-    int mode;			/* In what mode to open the file? */
-{
-    int fd;
-    char *native;
-    Tcl_DString ds;
-
-    native = Tcl_UtfToExternalDString(NULL, fname, -1, &ds);
-    fd = open(native, mode, 0666);			/* INTL: Native. */
-    Tcl_DStringFree(&ds);
-    if (fd != -1) {
-        fcntl(fd, F_SETFD, FD_CLOEXEC);
-
-	/*
-	 * If the file is being opened for writing, seek to the end
-	 * so we can append to any data already in the file.
-	 */
-
-	if (mode & O_WRONLY) {
-	    lseek(fd, 0, SEEK_END);
-	}
-
-	/*
-	 * Increment the fd so it can't be 0, which would conflict with
-	 * the NULL return for errors.
-	 */
-
-	return MakeFile(fd);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreateTempFile --
- *
- *	This function creates a temporary file initialized with an
- *	optional string, and returns a file handle with the file pointer
- *	at the beginning of the file.
- *
- * Results:
- *	A handle to a file.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpCreateTempFile(contents)
-    CONST char *contents;	/* String to write into temp file, or NULL. */
-{
-    char fileName[L_tmpnam];
-    int fd;
-
-    tmpnam(fileName);					/* INTL: Native. */
-    fd = open(fileName, O_RDWR|O_CREAT|O_TRUNC, 0666);	/* INTL: Native. */
-    if (fd == -1) {
-	return NULL;
-    }
-    fcntl(fd, F_SETFD, FD_CLOEXEC);
-    unlink(fileName);					/* INTL: Native. */
-
-    if (contents != NULL) {
-	if (write(fd, contents, strlen(contents)) == -1) {
-	    close(fd);
-	    return NULL;
-	}
-	lseek(fd, 0, SEEK_SET);
-    }
-    return MakeFile(fd);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreatePipe --
- *
- *      Creates a pipe - simply calls the pipe() function.
- *
- * Results:
- *      Returns 1 on success, 0 on failure. 
- *
- * Side effects:
- *      Creates a pipe.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCreatePipe(readPipe, writePipe)
-    TclFile *readPipe;		/* Location to store file handle for
-				 * read side of pipe. */
-    TclFile *writePipe;		/* Location to store file handle for
-				 * write side of pipe. */
-{
-    int pipeIds[2];
-
-    if (pipe(pipeIds) != 0) {
-	return 0;
-    }
-
-    fcntl(pipeIds[0], F_SETFD, FD_CLOEXEC);
-    fcntl(pipeIds[1], F_SETFD, FD_CLOEXEC);
-
-    *readPipe = MakeFile(pipeIds[0]);
-    *writePipe = MakeFile(pipeIds[1]);
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCloseFile --
- *
- *	Implements a mechanism to close a UNIX file.
- *
- * Results:
- *	Returns 0 on success, or -1 on error, setting errno.
- *
- * Side effects:
- *	The file is closed.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCloseFile(file)
-    TclFile file;	/* The file to close. */
-{
-    int fd = GetFd(file);
-
-    /*
-     * Refuse to close the fds for stdin, stdout and stderr.
-     */
-    
-    if ((fd == 0) || (fd == 1) || (fd == 2)) {
-        return 0;
-    }
-    
-    Tcl_DeleteFileHandler(fd);
-    return close(fd);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCreateProcess --
- *
- *	Create a child process that has the specified files as its 
- *	standard input, output, and error.  The child process runs
- *	asynchronously and runs with the same environment variables
- *	as the creating process.
- *
- *	The path is searched to find the specified executable.  
- *
- * Results:
- *	The return value is TCL_ERROR and an error message is left in
- *	the interp's result if there was a problem creating the child 
- *	process.  Otherwise, the return value is TCL_OK and *pidPtr is
- *	filled with the process id of the child process.
- * 
- * Side effects:
- *	A process is created.
- *	
- *---------------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-int
-TclpCreateProcess(interp, argc, argv, inputFile, outputFile, errorFile, 
-	pidPtr)
-    Tcl_Interp *interp;		/* Interpreter in which to leave errors that
-				 * occurred when creating the child process.
-				 * Error messages from the child process
-				 * itself are sent to errorFile. */
-    int argc;			/* Number of arguments in following array. */
-    char **argv;		/* Array of argument strings in UTF-8.
-				 * argv[0] contains the name of the executable
-				 * translated using Tcl_TranslateFileName
-				 * call).  Additional arguments have not been
-				 * converted. */
-    TclFile inputFile;		/* If non-NULL, gives the file to use as
-				 * input for the child process.  If inputFile
-				 * file is not readable or is NULL, the child
-				 * will receive no standard input. */
-    TclFile outputFile;		/* If non-NULL, gives the file that
-				 * receives output from the child process.  If
-				 * outputFile file is not writeable or is
-				 * NULL, output from the child will be
-				 * discarded. */
-    TclFile errorFile;		/* If non-NULL, gives the file that
-				 * receives errors from the child process.  If
-				 * errorFile file is not writeable or is NULL,
-				 * errors from the child will be discarded.
-				 * errorFile may be the same as outputFile. */
-    Tcl_Pid *pidPtr;		/* If this procedure is successful, pidPtr
-				 * is filled with the process id of the child
-				 * process. */
-{
-    TclFile errPipeIn, errPipeOut;
-    int joinThisError, count, status, fd;
-    char errSpace[200 + TCL_INTEGER_SPACE];
-    int pid;
-    
-    errPipeIn = NULL;
-    errPipeOut = NULL;
-    pid = -1;
-
-    /*
-     * Create a pipe that the child can use to return error
-     * information if anything goes wrong.
-     */
-
-    if (TclpCreatePipe(&errPipeIn, &errPipeOut) == 0) {
-	Tcl_AppendResult(interp, "couldn't create pipe: ",
-		Tcl_PosixError(interp), (char *) NULL);
-	goto error;
-    }
-
-    joinThisError = (errorFile == outputFile);
-    pid = vfork();
-    if (pid == 0) {
-	Tcl_DString *dsArray;
-	char *oldArgv0;
-	int i;
-
-	fd = GetFd(errPipeOut);
-
-	/*
-	 * Set up stdio file handles for the child process.
-	 */
-
-	if (!SetupStdFile(inputFile, TCL_STDIN)
-		|| !SetupStdFile(outputFile, TCL_STDOUT)
-		|| (!joinThisError && !SetupStdFile(errorFile, TCL_STDERR))
-		|| (joinThisError &&
-			((dup2(1,2) == -1) ||
-			 (fcntl(2, F_SETFD, 0) != 0)))) {
-	    sprintf(errSpace,
-		    "%dforked process couldn't set up input/output: ",
-		    errno);
-	    write(fd, errSpace, (size_t) strlen(errSpace));
-	    _exit(1);
-	}
-
-	/*
-	 * Close the input side of the error pipe.
-	 */
-
-	RestoreSignals();
-	for (i = 0; argv[i] != NULL; i++) {
-	    /*
-	     * How many arguments?
-	     */
-	}
-	oldArgv0 = argv[0];
-	dsArray = (Tcl_DString *) ckalloc(i * sizeof(Tcl_DString));
-	for (i = 0; argv[i] != NULL; i++) {
-	    argv[i] = Tcl_UtfToExternalDString(NULL, argv[i], -1, &dsArray[i]);
-	}
-	execvp(argv[0], argv);				/* INTL: Native. */
-	sprintf(errSpace, "%dcouldn't execute \"%.150s\": ", errno,
-		oldArgv0);
-	write(fd, errSpace, (size_t) strlen(errSpace));
-	_exit(1);
-    }
-    if (pid == -1) {
-	Tcl_AppendResult(interp, "couldn't fork child process: ",
-		Tcl_PosixError(interp), (char *) NULL);
-	goto error;
-    }
-
-    /*
-     * Read back from the error pipe to see if the child started
-     * up OK.  The info in the pipe (if any) consists of a decimal
-     * errno value followed by an error message.
-     */
-
-    TclpCloseFile(errPipeOut);
-    errPipeOut = NULL;
-
-    fd = GetFd(errPipeIn);
-    count = read(fd, errSpace, (size_t) (sizeof(errSpace) - 1));
-    if (count > 0) {
-	char *end;
-	errSpace[count] = 0;
-	errno = strtol(errSpace, &end, 10);
-	Tcl_AppendResult(interp, end, Tcl_PosixError(interp),
-		(char *) NULL);
-	goto error;
-    }
-    
-    TclpCloseFile(errPipeIn);
-    *pidPtr = (Tcl_Pid) pid;
-    return TCL_OK;
-
-    error:
-    if (pid != -1) {
-	/*
-	 * Reap the child process now if an error occurred during its
-	 * startup.
-	 */
-
-	Tcl_WaitPid((Tcl_Pid) pid, &status, WNOHANG);
-    }
-    
-    if (errPipeIn) {
-	TclpCloseFile(errPipeIn);
-    }
-    if (errPipeOut) {
-	TclpCloseFile(errPipeOut);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RestoreSignals --
- *
- *      This procedure is invoked in a forked child process just before
- *      exec-ing a new program to restore all signals to their default
- *      settings.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      Signal settings get changed.
- *
- *----------------------------------------------------------------------
- */
- 
-static void
-RestoreSignals()
-{
-#ifdef SIGABRT
-    signal(SIGABRT, SIG_DFL);
-#endif
-#ifdef SIGALRM
-    signal(SIGALRM, SIG_DFL);
-#endif
-#ifdef SIGFPE
-    signal(SIGFPE, SIG_DFL);
-#endif
-#ifdef SIGHUP
-    signal(SIGHUP, SIG_DFL);
-#endif
-#ifdef SIGILL
-    signal(SIGILL, SIG_DFL);
-#endif
-#ifdef SIGINT
-    signal(SIGINT, SIG_DFL);
-#endif
-#ifdef SIGPIPE
-    signal(SIGPIPE, SIG_DFL);
-#endif
-#ifdef SIGQUIT
-    signal(SIGQUIT, SIG_DFL);
-#endif
-#ifdef SIGSEGV
-    signal(SIGSEGV, SIG_DFL);
-#endif
-#ifdef SIGTERM
-    signal(SIGTERM, SIG_DFL);
-#endif
-#ifdef SIGUSR1
-    signal(SIGUSR1, SIG_DFL);
-#endif
-#ifdef SIGUSR2
-    signal(SIGUSR2, SIG_DFL);
-#endif
-#ifdef SIGCHLD
-    signal(SIGCHLD, SIG_DFL);
-#endif
-#ifdef SIGCONT
-    signal(SIGCONT, SIG_DFL);
-#endif
-#ifdef SIGTSTP
-    signal(SIGTSTP, SIG_DFL);
-#endif
-#ifdef SIGTTIN
-    signal(SIGTTIN, SIG_DFL);
-#endif
-#ifdef SIGTTOU
-    signal(SIGTTOU, SIG_DFL);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetupStdFile --
- *
- *	Set up stdio file handles for the child process, using the
- *	current standard channels if no other files are specified.
- *	If no standard channel is defined, or if no file is associated
- *	with the channel, then the corresponding standard fd is closed.
- *
- * Results:
- *	Returns 1 on success, or 0 on failure.
- *
- * Side effects:
- *	Replaces stdio fds.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetupStdFile(file, type)
-    TclFile file;		/* File to dup, or NULL. */
-    int type;			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR */
-{
-    Tcl_Channel channel;
-    int fd;
-    int targetFd = 0;		/* Initializations here needed only to */
-    int direction = 0;		/* prevent warnings about using uninitialized
-				 * variables. */
-
-    switch (type) {
-	case TCL_STDIN:
-	    targetFd = 0;
-	    direction = TCL_READABLE;
-	    break;
-	case TCL_STDOUT:
-	    targetFd = 1;
-	    direction = TCL_WRITABLE;
-	    break;
-	case TCL_STDERR:
-	    targetFd = 2;
-	    direction = TCL_WRITABLE;
-	    break;
-    }
-
-    if (!file) {
-	channel = Tcl_GetStdChannel(type);
-	if (channel) {
-	    file = TclpMakeFile(channel, direction);
-	}
-    }
-    if (file) {
-	fd = GetFd(file);
-	if (fd != targetFd) {
-	    if (dup2(fd, targetFd) == -1) {
-		return 0;
-	    }
-
-            /*
-             * Must clear the close-on-exec flag for the target FD, since
-             * some systems (e.g. Ultrix) do not clear the CLOEXEC flag on
-             * the target FD.
-             */
-            
-            fcntl(targetFd, F_SETFD, 0);
-	} else {
-	    int result;
-
-	    /*
-	     * Since we aren't dup'ing the file, we need to explicitly clear
-	     * the close-on-exec flag.
-	     */
-
-	    result = fcntl(fd, F_SETFD, 0);
-	}
-    } else {
-	close(targetFd);
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreateCommandChannel --
- *
- *	This function is called by the generic IO level to perform
- *	the platform specific channel initialization for a command
- *	channel.
- *
- * Results:
- *	Returns a new channel or NULL on failure.
- *
- * Side effects:
- *	Allocates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpCreateCommandChannel(readFile, writeFile, errorFile, numPids, pidPtr)
-    TclFile readFile;		/* If non-null, gives the file for reading. */
-    TclFile writeFile;		/* If non-null, gives the file for writing. */
-    TclFile errorFile;		/* If non-null, gives the file where errors
-				 * can be read. */
-    int numPids;		/* The number of pids in the pid array. */
-    Tcl_Pid *pidPtr;		/* An array of process identifiers.
-                                 * Allocated by the caller, freed when
-                                 * the channel is closed or the processes
-                                 * are detached (in a background exec). */
-{
-    char channelName[16 + TCL_INTEGER_SPACE];
-    int channelId;
-    PipeState *statePtr = (PipeState *) ckalloc((unsigned) sizeof(PipeState));
-    int mode;
-
-    statePtr->inFile = readFile;
-    statePtr->outFile = writeFile;
-    statePtr->errorFile = errorFile;
-    statePtr->numPids = numPids;
-    statePtr->pidPtr = pidPtr;
-    statePtr->isNonBlocking = 0;
-
-    mode = 0;
-    if (readFile) {
-        mode |= TCL_READABLE;
-    }
-    if (writeFile) {
-        mode |= TCL_WRITABLE;
-    }
-    
-    /*
-     * Use one of the fds associated with the channel as the
-     * channel id.
-     */
-
-    if (readFile) {
-	channelId = GetFd(readFile);
-    } else if (writeFile) {
-	channelId = GetFd(writeFile);
-    } else if (errorFile) {
-	channelId = GetFd(errorFile);
-    } else {
-	channelId = 0;
-    }
-
-    /*
-     * For backward compatibility with previous versions of Tcl, we
-     * use "file%d" as the base name for pipes even though it would
-     * be more natural to use "pipe%d".
-     */
-
-    sprintf(channelName, "file%d", channelId);
-    statePtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
-            (ClientData) statePtr, mode);
-    return statePtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetAndDetachPids --
- *
- *	This procedure is invoked in the generic implementation of a
- *	background "exec" (An exec when invoked with a terminating "&")
- *	to store a list of the PIDs for processes in a command pipeline
- *	in the interp's result and to detach the processes.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Modifies the interp's result. Detaches processes.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclGetAndDetachPids(interp, chan)
-    Tcl_Interp *interp;
-    Tcl_Channel chan;
-{
-    PipeState *pipePtr;
-    Tcl_ChannelType *chanTypePtr;
-    int i;
-    char buf[TCL_INTEGER_SPACE];
-
-    /*
-     * Punt if the channel is not a command channel.
-     */
-
-    chanTypePtr = Tcl_GetChannelType(chan);
-    if (chanTypePtr != &pipeChannelType) {
-        return;
-    }
-
-    pipePtr = (PipeState *) Tcl_GetChannelInstanceData(chan);
-    for (i = 0; i < pipePtr->numPids; i++) {
-        TclFormatInt(buf, (long) TclpGetPid(pipePtr->pidPtr[i]));
-        Tcl_AppendElement(interp, buf);
-        Tcl_DetachPids(1, &(pipePtr->pidPtr[i]));
-    }
-    if (pipePtr->numPids > 0) {
-        ckfree((char *) pipePtr->pidPtr);
-        pipePtr->numPids = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeBlockModeProc --
- *
- *	Helper procedure to set blocking and nonblocking modes on a
- *	pipe based channel. Invoked by generic IO level code.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-PipeBlockModeProc(instanceData, mode)
-    ClientData instanceData;		/* Pipe state. */
-    int mode;				/* The mode to set. Can be one of
-                                         * TCL_MODE_BLOCKING or
-                                         * TCL_MODE_NONBLOCKING. */
-{
-    PipeState *psPtr = (PipeState *) instanceData;
-    int curStatus;
-    int fd;
-
-#ifndef	USE_FIONBIO    
-    if (psPtr->inFile) {
-        fd = GetFd(psPtr->inFile);
-        curStatus = fcntl(fd, F_GETFL);
-        if (mode == TCL_MODE_BLOCKING) {
-            curStatus &= (~(O_NONBLOCK));
-        } else {
-            curStatus |= O_NONBLOCK;
-        }
-        if (fcntl(fd, F_SETFL, curStatus) < 0) {
-            return errno;
-        }
-        curStatus = fcntl(fd, F_GETFL);
-    }
-    if (psPtr->outFile) {
-        fd = GetFd(psPtr->outFile);
-        curStatus = fcntl(fd, F_GETFL);
-        if (mode == TCL_MODE_BLOCKING) {
-            curStatus &= (~(O_NONBLOCK));
-        } else {
-            curStatus |= O_NONBLOCK;
-        }
-        if (fcntl(fd, F_SETFL, curStatus) < 0) {
-            return errno;
-        }
-    }
-#endif	/* !FIONBIO */
-
-#ifdef	USE_FIONBIO
-    if (psPtr->inFile) {
-        fd = GetFd(psPtr->inFile);
-        if (mode == TCL_MODE_BLOCKING) {
-            curStatus = 0;
-        } else {
-            curStatus = 1;
-        }
-        if (ioctl(fd, (int) FIONBIO, &curStatus) < 0) {
-            return errno;
-        }
-    }
-    if (psPtr->outFile != NULL) {
-        fd = GetFd(psPtr->outFile);
-        if (mode == TCL_MODE_BLOCKING) {
-            curStatus = 0;
-        } else {
-            curStatus = 1;
-        }
-        if (ioctl(fd, (int) FIONBIO,  &curStatus) < 0) {
-            return errno;
-        }
-    }
-#endif	/* USE_FIONBIO */
-    
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeCloseProc --
- *
- *	This procedure is invoked by the generic IO level to perform
- *	channel-type-specific cleanup when a command pipeline channel
- *	is closed.
- *
- * Results:
- *	0 on success, errno otherwise.
- *
- * Side effects:
- *	Closes the command pipeline channel.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-static int
-PipeCloseProc(instanceData, interp)
-    ClientData instanceData;	/* The pipe to close. */
-    Tcl_Interp *interp;		/* For error reporting. */
-{
-    PipeState *pipePtr;
-    Tcl_Channel errChan;
-    int errorCode, result;
-
-    errorCode = 0;
-    result = 0;
-    pipePtr = (PipeState *) instanceData;
-    if (pipePtr->inFile) {
-	if (TclpCloseFile(pipePtr->inFile) < 0) {
-	    errorCode = errno;
-	}
-    }
-    if (pipePtr->outFile) {
-	if ((TclpCloseFile(pipePtr->outFile) < 0) && (errorCode == 0)) {
-	    errorCode = errno;
-	}
-    }
-
-    if (pipePtr->isNonBlocking || TclInExit()) {
-    
-	/*
-         * If the channel is non-blocking or Tcl is being cleaned up, just
-         * detach the children PIDs, reap them (important if we are in a
-         * dynamic load module), and discard the errorFile.
-         */
-        
-        Tcl_DetachPids(pipePtr->numPids, pipePtr->pidPtr);
-        Tcl_ReapDetachedProcs();
-
-        if (pipePtr->errorFile) {
-	    TclpCloseFile(pipePtr->errorFile);
-        }
-    } else {
-        
-	/*
-         * Wrap the error file into a channel and give it to the cleanup
-         * routine.
-         */
-
-        if (pipePtr->errorFile) {
-	    errChan = Tcl_MakeFileChannel(
-		(ClientData) GetFd(pipePtr->errorFile), TCL_READABLE);
-        } else {
-            errChan = NULL;
-        }
-        result = TclCleanupChildren(interp, pipePtr->numPids, pipePtr->pidPtr,
-                errChan);
-    }
-
-    if (pipePtr->numPids != 0) {
-        ckfree((char *) pipePtr->pidPtr);
-    }
-    ckfree((char *) pipePtr);
-    if (errorCode == 0) {
-        return result;
-    }
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeInputProc --
- *
- *	This procedure is invoked from the generic IO level to read
- *	input from a command pipeline based channel.
- *
- * Results:
- *	The number of bytes read is returned or -1 on error. An output
- *	argument contains a POSIX error code if an error occurs, or zero.
- *
- * Side effects:
- *	Reads input from the input device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeInputProc(instanceData, buf, toRead, errorCodePtr)
-    ClientData instanceData;		/* Pipe state. */
-    char *buf;				/* Where to store data read. */
-    int toRead;				/* How much space is available
-                                         * in the buffer? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    PipeState *psPtr = (PipeState *) instanceData;
-    int bytesRead;			/* How many bytes were actually
-                                         * read from the input device? */
-
-    *errorCodePtr = 0;
-    
-    /*
-     * Assume there is always enough input available. This will block
-     * appropriately, and read will unblock as soon as a short read is
-     * possible, if the channel is in blocking mode. If the channel is
-     * nonblocking, the read will never block.
-     */
-
-    bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
-    if (bytesRead > -1) {
-        return bytesRead;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeOutputProc--
- *
- *	This procedure is invoked from the generic IO level to write
- *	output to a command pipeline based channel.
- *
- * Results:
- *	The number of bytes written is returned or -1 on error. An
- *	output argument	contains a POSIX error code if an error occurred,
- *	or zero.
- *
- * Side effects:
- *	Writes output on the output device of the channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeOutputProc(instanceData, buf, toWrite, errorCodePtr)
-    ClientData instanceData;		/* Pipe state. */
-    char *buf;				/* The data buffer. */
-    int toWrite;			/* How many bytes to write? */
-    int *errorCodePtr;			/* Where to store error code. */
-{
-    PipeState *psPtr = (PipeState *) instanceData;
-    int written;
-
-    *errorCodePtr = 0;
-    written = write(GetFd(psPtr->outFile), buf, (size_t) toWrite);
-    if (written > -1) {
-        return written;
-    }
-    *errorCodePtr = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeWatchProc --
- *
- *	Initialize the notifier to watch the fds from this channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the notifier so that a future event on the channel will
- *	be seen by Tcl.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PipeWatchProc(instanceData, mask)
-    ClientData instanceData;		/* The pipe state. */
-    int mask;				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABEL and TCL_EXCEPTION. */
-{
-    PipeState *psPtr = (PipeState *) instanceData;
-    int newmask;
-
-    if (psPtr->inFile) {
-	newmask = mask & (TCL_READABLE | TCL_EXCEPTION);
-	if (newmask) {
-	    Tcl_CreateFileHandler(GetFd(psPtr->inFile), mask,
-		    (Tcl_FileProc *) Tcl_NotifyChannel,
-		    (ClientData) psPtr->channel);
-	} else {
-	    Tcl_DeleteFileHandler(GetFd(psPtr->inFile));
-	}
-    }
-    if (psPtr->outFile) {
-	newmask = mask & (TCL_WRITABLE | TCL_EXCEPTION);
-	if (newmask) {
-	    Tcl_CreateFileHandler(GetFd(psPtr->outFile), mask,
-		    (Tcl_FileProc *) Tcl_NotifyChannel,
-		    (ClientData) psPtr->channel);
-	} else {
-	    Tcl_DeleteFileHandler(GetFd(psPtr->outFile));
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	inside a command pipeline based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeGetHandleProc(instanceData, direction, handlePtr)
-    ClientData instanceData;	/* The pipe state. */
-    int direction;		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr;	/* Where to store the handle.  */
-{
-    PipeState *psPtr = (PipeState *) instanceData;
-
-    if (direction == TCL_READABLE && psPtr->inFile) {
-	*handlePtr = (ClientData) GetFd(psPtr->inFile);
-	return TCL_OK;
-    }
-    if (direction == TCL_WRITABLE && psPtr->outFile) {
-	*handlePtr = (ClientData) GetFd(psPtr->outFile);
-	return TCL_OK;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitPid --
- *
- *	Implements the waitpid system call on Unix systems.
- *
- * Results:
- *	Result of calling waitpid.
- *
- * Side effects:
- *	Waits for a process to terminate.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Pid
-Tcl_WaitPid(pid, statPtr, options)
-    Tcl_Pid pid;
-    int *statPtr;
-    int options;
-{
-    int result;
-    pid_t real_pid;
-
-    real_pid = (pid_t) pid;
-    while (1) {
-	result = (int) waitpid(real_pid, statPtr, options);
-	if ((result != -1) || (errno != EINTR)) {
-	    return (Tcl_Pid) result;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PidObjCmd --
- *
- *	This procedure is invoked to process the "pid" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_PidObjCmd(dummy, interp, objc, objv)
-    ClientData dummy;		/* Not used. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST *objv;	/* Argument strings. */
-{
-    Tcl_Channel chan;
-    Tcl_ChannelType *chanTypePtr;
-    PipeState *pipePtr;
-    int i;
-    Tcl_Obj *resultPtr, *longObjPtr;
-
-    if (objc > 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?channelId?");
-	return TCL_ERROR;
-    }
-    if (objc == 1) {
-	Tcl_SetLongObj(Tcl_GetObjResult(interp), (long) getpid());
-    } else {
-        chan = Tcl_GetChannel(interp, Tcl_GetString(objv[1]), NULL);
-        if (chan == (Tcl_Channel) NULL) {
-	    return TCL_ERROR;
-	}
-	chanTypePtr = Tcl_GetChannelType(chan);
-	if (chanTypePtr != &pipeChannelType) {
-	    return TCL_OK;
-	}
-        pipePtr = (PipeState *) Tcl_GetChannelInstanceData(chan);
-	resultPtr = Tcl_GetObjResult(interp);
-        for (i = 0; i < pipePtr->numPids; i++) {
-	    longObjPtr = Tcl_NewLongObj((long) TclpGetPid(pipePtr->pidPtr[i]));
-	    Tcl_ListObjAppendElement(NULL, resultPtr, longObjPtr);
-	}
-    }
-    return TCL_OK;
-}
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
deleted file mode 100644
index 89ebf7f..0000000
--- a/unix/tclUnixPort.h
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * tclUnixPort.h --
- *
- *	This header file handles porting issues that occur because
- *	of differences between systems.  It reads in UNIX-related
- *	header files and sets up UNIX-related macros for Tcl's UNIX
- *	core.  It should be the only file that contains #ifdefs to
- *	handle different flavors of UNIX.  This file sets up the
- *	union of all UNIX-related things needed by any of the Tcl
- *	core files.  This file depends on configuration #defines such
- *	as NO_DIRENT_H that are set up by the "configure" script.
- *
- *	Much of the material in this file was originally contributed
- *	by Karl Lehenbauer, Mark Diekhans and Peter da Silva.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixPort.h,v 1.11 1999/04/16 00:48:05 stanton Exp $
- */
-
-#ifndef _TCLUNIXPORT
-#define _TCLUNIXPORT
-
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
-
-/*
- *---------------------------------------------------------------------------
- * The following sets of #includes and #ifdefs are required to get Tcl to
- * compile under the various flavors of unix.
- *---------------------------------------------------------------------------
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HAVE_NET_ERRNO_H
-#   include <net/errno.h>
-#endif
-#include <pwd.h>
-#include <signal.h>
-#ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#endif
-#include <sys/types.h>
-#ifdef USE_DIRENT2_H
-#   include "../compat/dirent2.h"
-#else
-#ifdef NO_DIRENT_H
-#   include "../compat/dirent.h"
-#else
-#   include <dirent.h>
-#endif
-#endif
-#include <sys/file.h>
-#ifdef HAVE_SYS_SELECT_H
-#   include <sys/select.h>
-#endif
-#include <sys/stat.h>
-#if TIME_WITH_SYS_TIME
-#   include <sys/time.h>
-#   include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#   include <sys/time.h>
-#else
-#   include <time.h>
-#endif
-#endif
-#ifndef NO_SYS_WAIT_H
-#   include <sys/wait.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#else
-#   include "../compat/unistd.h"
-#endif
-#ifdef	USE_FIONBIO
-    /*
-     * Not using the Posix fcntl(...,O_NONBLOCK,...) interface, instead
-     * we are using ioctl(..,FIONBIO,..).
-     */
-
-#   ifdef HAVE_SYS_FILIO_H
-#	include	<sys/filio.h>	/* For FIONBIO. */
-#   endif
-
-#   ifdef HAVE_SYS_IOCTL_H
-#	include	<sys/ioctl.h>	/* For FIONBIO. */
-#   endif
-#endif	/* USE_FIONBIO */
-
-/*
- * Socket support stuff: This likely needs more work to parameterize for
- * each system.
- */
-
-#include <sys/socket.h>		/* struct sockaddr, SOCK_STREAM, ... */
-#ifndef NO_UNAME
-#   include <sys/utsname.h>	/* uname system call. */
-#endif
-#include <netinet/in.h>		/* struct in_addr, struct sockaddr_in */
-#include <arpa/inet.h>		/* inet_ntoa() */
-#include <netdb.h>		/* gethostbyname() */
-
-/*
- * Some platforms (e.g. SunOS) don't define FLT_MAX and FLT_MIN, so we
- * look for an alternative definition.  If no other alternative is available
- * we use a reasonable guess.
- */
-
-#ifndef NO_FLOAT_H
-#   include <float.h>
-#else
-#ifndef NO_VALUES_H
-#   include <values.h>
-#endif
-#endif
-
-#ifndef FLT_MAX
-#   ifdef MAXFLOAT
-#	define FLT_MAX MAXFLOAT
-#   else
-#	define FLT_MAX 3.402823466E+38F
-#   endif
-#endif
-#ifndef FLT_MIN
-#   ifdef MINFLOAT
-#	define FLT_MIN MINFLOAT
-#   else
-#	define FLT_MIN 1.175494351E-38F
-#   endif
-#endif
-
-/*
- * NeXT doesn't define O_NONBLOCK, so #define it here if necessary.
- */
-
-#ifndef O_NONBLOCK
-#   define O_NONBLOCK 0x80
-#endif
-
-/*
- * HPUX needs the flag O_NONBLOCK to get the right non-blocking I/O
- * semantics, while most other systems need O_NDELAY.  Define the
- * constant NBIO_FLAG to be one of these
- */
-
-#ifdef HPUX
-#  define NBIO_FLAG O_NONBLOCK
-#else
-#  define NBIO_FLAG O_NDELAY
-#endif
-
-/*
- * The type of the status returned by wait varies from UNIX system
- * to UNIX system.  The macro below defines it:
- */
-
-#ifdef _AIX
-#   define WAIT_STATUS_TYPE pid_t
-#else
-#ifndef NO_UNION_WAIT
-#   define WAIT_STATUS_TYPE union wait
-#else
-#   define WAIT_STATUS_TYPE int
-#endif
-#endif
-
-/*
- * Supply definitions for macros to query wait status, if not already
- * defined in header files above.
- */
-
-#ifndef WIFEXITED
-#   define WIFEXITED(stat)  (((*((int *) &(stat))) & 0xff) == 0)
-#endif
-
-#ifndef WEXITSTATUS
-#   define WEXITSTATUS(stat) (((*((int *) &(stat))) >> 8) & 0xff)
-#endif
-
-#ifndef WIFSIGNALED
-#   define WIFSIGNALED(stat) (((*((int *) &(stat)))) && ((*((int *) &(stat))) == ((*((int *) &(stat))) & 0x00ff)))
-#endif
-
-#ifndef WTERMSIG
-#   define WTERMSIG(stat)    ((*((int *) &(stat))) & 0x7f)
-#endif
-
-#ifndef WIFSTOPPED
-#   define WIFSTOPPED(stat)  (((*((int *) &(stat))) & 0xff) == 0177)
-#endif
-
-#ifndef WSTOPSIG
-#   define WSTOPSIG(stat)    (((*((int *) &(stat))) >> 8) & 0xff)
-#endif
-
-/*
- * Define constants for waitpid() system call if they aren't defined
- * by a system header file.
- */
-
-#ifndef WNOHANG
-#   define WNOHANG 1
-#endif
-#ifndef WUNTRACED
-#   define WUNTRACED 2
-#endif
-
-/*
- * Supply macros for seek offsets, if they're not already provided by
- * an include file.
- */
-
-#ifndef SEEK_SET
-#   define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#   define SEEK_CUR 1
-#endif
-#ifndef SEEK_END
-#   define SEEK_END 2
-#endif
-
-/*
- * The stuff below is needed by the "time" command.  If this system has no
- * gettimeofday call, then must use times and the CLK_TCK #define (from
- * sys/param.h) to compute elapsed time.  Unfortunately, some systems only
- * have HZ and no CLK_TCK, and some might not even have HZ.
- */
-
-#ifdef NO_GETTOD
-#   include <sys/times.h>
-#   include <sys/param.h>
-#   ifndef CLK_TCK
-#       ifdef HZ
-#           define CLK_TCK HZ
-#       else
-#           define CLK_TCK 60
-#       endif
-#   endif
-#else
-#   ifdef HAVE_BSDGETTIMEOFDAY
-#	define gettimeofday BSDgettimeofday
-#   endif
-#endif
-
-#ifdef GETTOD_NOT_DECLARED
-EXTERN int		gettimeofday _ANSI_ARGS_((struct timeval *tp,
-			    struct timezone *tzp));
-#endif
-
-/*
- * Define access mode constants if they aren't already defined.
- */
-
-#ifndef F_OK
-#    define F_OK 00
-#endif
-#ifndef X_OK
-#    define X_OK 01
-#endif
-#ifndef W_OK
-#    define W_OK 02
-#endif
-#ifndef R_OK
-#    define R_OK 04
-#endif
-
-/*
- * Define FD_CLOEEXEC (the close-on-exec flag bit) if it isn't
- * already defined.
- */
-
-#ifndef FD_CLOEXEC
-#   define FD_CLOEXEC 1
-#endif
-
-/*
- * On systems without symbolic links (i.e. S_IFLNK isn't defined)
- * define "lstat" to use "stat" instead.
- */
-
-#ifndef S_IFLNK
-#   define lstat	stat
-#endif
-
-/*
- * Define macros to query file type bits, if they're not already
- * defined.
- */
-
-#ifndef S_ISREG
-#   ifdef S_IFREG
-#       define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#   else
-#       define S_ISREG(m) 0
-#   endif
-# endif
-#ifndef S_ISDIR
-#   ifdef S_IFDIR
-#       define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#   else
-#       define S_ISDIR(m) 0
-#   endif
-# endif
-#ifndef S_ISCHR
-#   ifdef S_IFCHR
-#       define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-#   else
-#       define S_ISCHR(m) 0
-#   endif
-# endif
-#ifndef S_ISBLK
-#   ifdef S_IFBLK
-#       define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
-#   else
-#       define S_ISBLK(m) 0
-#   endif
-# endif
-#ifndef S_ISFIFO
-#   ifdef S_IFIFO
-#       define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#   else
-#       define S_ISFIFO(m) 0
-#   endif
-# endif
-#ifndef S_ISLNK
-#   ifdef S_IFLNK
-#       define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-#   else
-#       define S_ISLNK(m) 0
-#   endif
-# endif
-#ifndef S_ISSOCK
-#   ifdef S_IFSOCK
-#       define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
-#   else
-#       define S_ISSOCK(m) 0
-#   endif
-# endif
-
-/*
- * Make sure that MAXPATHLEN is defined.
- */
-
-#ifndef MAXPATHLEN
-#   ifdef PATH_MAX
-#       define MAXPATHLEN PATH_MAX
-#   else
-#       define MAXPATHLEN 2048
-#   endif
-#endif
-
-/*
- * Make sure that L_tmpnam is defined.
- */
-
-#ifndef L_tmpnam
-#   define L_tmpnam 100
-#endif
-
-/*
- * The following macro defines the type of the mask arguments to
- * select:
- */
-
-#ifndef NO_FD_SET
-#   define SELECT_MASK fd_set
-#else
-#   ifndef _AIX
-	typedef long fd_mask;
-#   endif
-#   if defined(_IBMR2)
-#	define SELECT_MASK void
-#   else
-#	define SELECT_MASK int
-#   endif
-#endif
-
-/*
- * Define "NBBY" (number of bits per byte) if it's not already defined.
- */
-
-#ifndef NBBY
-#   define NBBY 8
-#endif
-
-/*
- * The following macro defines the number of fd_masks in an fd_set:
- */
-
-#ifndef FD_SETSIZE
-#   ifdef OPEN_MAX
-#	define FD_SETSIZE OPEN_MAX
-#   else
-#	define FD_SETSIZE 256
-#   endif
-#endif
-#if !defined(howmany)
-#   define howmany(x, y) (((x)+((y)-1))/(y))
-#endif
-#ifndef NFDBITS
-#   define NFDBITS NBBY*sizeof(fd_mask)
-#endif
-#define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)
-
-/*
- * Not all systems declare the errno variable in errno.h. so this
- * file does it explicitly.  The list of system error messages also
- * isn't generally declared in a header file anywhere.
- */
-
-extern int errno;
-
-/*
- * Variables provided by the C library:
- */
-
-#if defined(_sgi) || defined(__sgi)
-#   define environ _environ
-#endif
-extern char **environ;
-
-/*
- * At present (12/91) not all stdlib.h implementations declare strtod.
- * The declaration below is here to ensure that it's declared, so that
- * the compiler won't take the default approach of assuming it returns
- * an int.  There's no ANSI prototype for it because there would end
- * up being too many conflicts with slightly-different prototypes.
- */
-
-extern double strtod();
-
-/*
- *---------------------------------------------------------------------------
- * The following macros and declarations represent the interface between 
- * generic and unix-specific parts of Tcl.  Some of the macros may override 
- * functions declared in tclInt.h.
- *---------------------------------------------------------------------------
- */
-
-/*
- * The default platform eol translation on Unix is TCL_TRANSLATE_LF.
- */
-
-#define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_LF
-
-/*
- * The following macros have trivial definitions, allowing generic code to 
- * address platform-specific issues.
- */
-
-#define TclpAsyncMark(async)
-#define TclpGetPid(pid)		((unsigned long) (pid))
-#define TclpReleaseFile(file)	/* Nothing. */
-
-/*
- * The following macros and declaration wrap the C runtime library
- * functions.
- */
-
-#define TclpExit		exit
-
-#ifdef TclpStat
-#undef TclpStat
-#endif
-
-EXTERN int		TclpLstat _ANSI_ARGS_((CONST char *path, 
-			    struct stat *buf));
-EXTERN int		TclpStat _ANSI_ARGS_((CONST char *path, 
-			    struct stat *buf));
-
-/*
- * Platform specific mutex definition used by memory allocators.
- * These mutexes are statically allocated and explicitly initialized.
- * Most modules do not use this, but instead use Tcl_Mutex types and
- * Tcl_MutexLock and Tcl_MutexUnlock that are self-initializing.
- */
-
-#ifdef TCL_THREADS
-#include <pthread.h>
-typedef pthread_mutex_t TclpMutex;
-EXTERN void	TclpMutexInit _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexLock _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexUnlock _ANSI_ARGS_((TclpMutex *mPtr));
-#else
-typedef int TclpMutex;
-#define	TclpMutexInit(a)
-#define	TclpMutexLock(a)
-#define	TclpMutexUnlock(a)
-#endif /* TCL_THREADS */
-
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
-#endif /* _TCLUNIXPORT */
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
deleted file mode 100644
index 37d430e..0000000
--- a/unix/tclUnixSock.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* 
- * tclUnixSock.c --
- *
- *	This file contains Unix-specific socket related code.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixSock.c,v 1.4 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tcl.h"
-#include "tclPort.h"
-
-/*
- * There is no portable macro for the maximum length
- * of host names returned by gethostbyname().  We should only
- * trust SYS_NMLN if it is at least 255 + 1 bytes to comply with DNS
- * host name limits.
- *
- * Note:  SYS_NMLN is a restriction on "uname" not on gethostbyname!
- *
- * For example HP-UX 10.20 has SYS_NMLN == 9,  while gethostbyname()
- * can return a fully qualified name from DNS of up to 255 bytes.
- *
- * Fix suggested by Viktor Dukhovni (viktor@esm.com)
- */
-
-#if defined(SYS_NMLN) && SYS_NMLEN >= 256
-#define TCL_HOSTNAME_LEN SYS_NMLEN
-#else
-#define TCL_HOSTNAME_LEN 256
-#endif
-
-
-/*
- * The following variable holds the network name of this host.
- */
-
-static char hostname[TCL_HOSTNAME_LEN + 1];
-static int  hostnameInited = 0;
-TCL_DECLARE_MUTEX(hostMutex)
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetHostName --
- *
- *	Returns the name of the local host.
- *
- * Results:
- *	A string containing the network name for this machine, or
- *	an empty string if we can't figure out the name.  The caller 
- *	must not modify or free this string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetHostName()
-{
-#ifndef NO_UNAME
-    struct utsname u;
-    struct hostent *hp;
-#else
-    char buffer[sizeof(hostname)];
-#endif
-    CONST char *native;
-
-    Tcl_MutexLock(&hostMutex);
-    if (hostnameInited) {
-	Tcl_MutexUnlock(&hostMutex);
-        return hostname;
-    }
-
-    native = NULL;
-#ifndef NO_UNAME
-    (VOID *) memset((VOID *) &u, (int) 0, sizeof(struct utsname));
-    if (uname(&u) > -1) {				/* INTL: Native. */
-        hp = gethostbyname(u.nodename);			/* INTL: Native. */
-        if (hp != NULL) {
-	    native = hp->h_name;
-        } else {
-	    native = u.nodename;
-        }
-    }
-#else
-    /*
-     * Uname doesn't exist; try gethostname instead.
-     */
-
-    if (gethostname(buffer, sizeof(buffer)) > -1) {	/* INTL: Native. */
-	native = buffer;
-    }
-#endif
-
-    if (native == NULL) {
-	hostname[0] = 0;
-    } else {
-	Tcl_ExternalToUtf(NULL, NULL, native, -1, 0, NULL, hostname,
-		sizeof(hostname), NULL, NULL, NULL);
-    }
-    hostnameInited = 1;
-    Tcl_MutexUnlock(&hostMutex);
-    return hostname;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpHasSockets --
- *
- *	Detect if sockets are available on this platform.
- *
- * Results:
- *	Returns TCL_OK.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpHasSockets(interp)
-    Tcl_Interp *interp;		/* Not used. */
-{
-    return TCL_OK;
-}
diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c
deleted file mode 100644
index 7c7559b..0000000
--- a/unix/tclUnixTest.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/* 
- * tclUnixTest.c --
- *
- *	Contains platform specific test commands for the Unix platform.
- *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixTest.c,v 1.10 1999/04/16 00:48:05 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- * The headers are needed for the testalarm command that verifies the
- * use of SA_RESTART in signal handlers.
- */
-
-#include <signal.h>
-#include <sys/resource.h>
-
-/*
- * The following macros convert between TclFile's and fd's.  The conversion
- * simple involves shifting fd's up by one to ensure that no valid fd is ever
- * the same as NULL.  Note that this code is duplicated from tclUnixPipe.c
- */
-
-#define MakeFile(fd) ((TclFile)((fd)+1))
-#define GetFd(file) (((int)file)-1)
-
-/*
- * The stuff below is used to keep track of file handlers created and
- * exercised by the "testfilehandler" command.
- */
-
-typedef struct Pipe {
-    TclFile readFile;		/* File handle for reading from the
-				 * pipe.  NULL means pipe doesn't exist yet. */
-    TclFile writeFile;		/* File handle for writing from the
-				 * pipe. */
-    int readCount;		/* Number of times the file handler for
-				 * this file has triggered and the file
-				 * was readable. */
-    int writeCount;		/* Number of times the file handler for
-				 * this file has triggered and the file
-				 * was writable. */
-} Pipe;
-
-#define MAX_PIPES 10
-static Pipe testPipes[MAX_PIPES];
-
-/*
- * The stuff below is used by the testalarm and testgotsig ommands.
- */
-
-static char *gotsig = "0";
-
-/*
- * Forward declarations of procedures defined later in this file:
- */
-
-static void		TestFileHandlerProc _ANSI_ARGS_((ClientData clientData,
-			    int mask));
-static int		TestfilehandlerCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestfilewaitCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestfindexecutableCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgetopenfileCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgetdefencdirCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestsetdefencdirCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-int			TclplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
-static int		TestalarmCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static int		TestgotsigCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-static void 		AlarmHandler _ANSI_ARGS_(());
-
-/*
- *----------------------------------------------------------------------
- *
- * TclplatformtestInit --
- *
- *	Defines commands that test platform specific functionality for
- *	Unix platforms.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Defines new commands.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclplatformtestInit(interp)
-    Tcl_Interp *interp;		/* Interpreter to add commands to. */
-{
-    Tcl_CreateCommand(interp, "testfilehandler", TestfilehandlerCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testfilewait", TestfilewaitCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testfindexecutable", TestfindexecutableCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testgetopenfile", TestgetopenfileCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testgetdefenc", TestgetdefencdirCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testsetdefenc", TestsetdefencdirCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testalarm", TestalarmCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "testgotsig", TestgotsigCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestfilehandlerCmd --
- *
- *	This procedure implements the "testfilehandler" command. It is
- *	used to test Tcl_CreateFileHandler, Tcl_DeleteFileHandler, and
- *	TclWaitForFile.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestfilehandlerCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Pipe *pipePtr;
-    int i, mask, timeout;
-    static int initialized = 0;
-    char buffer[4000];
-    TclFile file;
-
-    /*
-     * NOTE: When we make this code work on Windows also, the following
-     * variable needs to be made Unix-only.
-     */
-    
-    if (!initialized) {
-	for (i = 0; i < MAX_PIPES; i++) {
-	    testPipes[i].readFile = NULL;
-	}
-	initialized = 1;
-    }
-
-    if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " option ... \"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    pipePtr = NULL;
-    if (argc >= 3) {
-	if (Tcl_GetInt(interp, argv[2], &i) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (i >= MAX_PIPES) {
-	    Tcl_AppendResult(interp, "bad index ", argv[2], (char *) NULL);
-	    return TCL_ERROR;
-	}
-	pipePtr = &testPipes[i];
-    }
-
-    if (strcmp(argv[1], "close") == 0) {
-	for (i = 0; i < MAX_PIPES; i++) {
-	    if (testPipes[i].readFile != NULL) {
-		TclpCloseFile(testPipes[i].readFile);
-		testPipes[i].readFile = NULL;
-		TclpCloseFile(testPipes[i].writeFile);
-		testPipes[i].writeFile = NULL;
-	    }
-	}
-    } else if (strcmp(argv[1], "clear") == 0) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " clear index\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	pipePtr->readCount = pipePtr->writeCount = 0;
-    } else if (strcmp(argv[1], "counts") == 0) {
-	char buf[TCL_INTEGER_SPACE * 2];
-	
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " counts index\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-	sprintf(buf, "%d %d", pipePtr->readCount, pipePtr->writeCount);
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(argv[1], "create") == 0) {
-	if (argc != 5) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " create index readMode writeMode\"",
-                    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (pipePtr->readFile == NULL) {
-	    if (!TclpCreatePipe(&pipePtr->readFile, &pipePtr->writeFile)) {
-		Tcl_AppendResult(interp, "couldn't open pipe: ",
-			Tcl_PosixError(interp), (char *) NULL);
-		return TCL_ERROR;
-	    }
-#ifdef O_NONBLOCK
-	    fcntl(GetFd(pipePtr->readFile), F_SETFL, O_NONBLOCK);
-	    fcntl(GetFd(pipePtr->writeFile), F_SETFL, O_NONBLOCK);
-#else
-	    Tcl_SetResult(interp, "can't make pipes non-blocking",
-		    TCL_STATIC);
-	    return TCL_ERROR;
-#endif
-	}
-	pipePtr->readCount = 0;
-	pipePtr->writeCount = 0;
-
-	if (strcmp(argv[3], "readable") == 0) {
-	    Tcl_CreateFileHandler(GetFd(pipePtr->readFile), TCL_READABLE,
-		    TestFileHandlerProc, (ClientData) pipePtr);
-	} else if (strcmp(argv[3], "off") == 0) {
-	    Tcl_DeleteFileHandler(GetFd(pipePtr->readFile));
-	} else if (strcmp(argv[3], "disabled") == 0) {
-	    Tcl_CreateFileHandler(GetFd(pipePtr->readFile), 0,
-		    TestFileHandlerProc, (ClientData) pipePtr);
-	} else {
-	    Tcl_AppendResult(interp, "bad read mode \"", argv[3], "\"",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (strcmp(argv[4], "writable") == 0) {
-	    Tcl_CreateFileHandler(GetFd(pipePtr->writeFile), TCL_WRITABLE,
-		    TestFileHandlerProc, (ClientData) pipePtr);
-	} else if (strcmp(argv[4], "off") == 0) {
-	    Tcl_DeleteFileHandler(GetFd(pipePtr->writeFile));
-	} else if (strcmp(argv[4], "disabled") == 0) {
-	    Tcl_CreateFileHandler(GetFd(pipePtr->writeFile), 0,
-		    TestFileHandlerProc, (ClientData) pipePtr);
-	} else {
-	    Tcl_AppendResult(interp, "bad read mode \"", argv[4], "\"",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-    } else if (strcmp(argv[1], "empty") == 0) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " empty index\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-
-        while (read(GetFd(pipePtr->readFile), buffer, 4000) > 0) {
-            /* Empty loop body. */
-        }
-    } else if (strcmp(argv[1], "fill") == 0) {
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " empty index\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-
-	memset((VOID *) buffer, 'a', 4000);
-        while (write(GetFd(pipePtr->writeFile), buffer, 4000) > 0) {
-            /* Empty loop body. */
-        }
-    } else if (strcmp(argv[1], "fillpartial") == 0) {
-	char buf[TCL_INTEGER_SPACE];
-	
-	if (argc != 3) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " empty index\"", (char *) NULL);
-	    return TCL_ERROR;
-	}
-
-	memset((VOID *) buffer, 'b', 10);
-	TclFormatInt(buf, write(GetFd(pipePtr->writeFile), buffer, 10));
-	Tcl_SetResult(interp, buf, TCL_VOLATILE);
-    } else if (strcmp(argv[1], "oneevent") == 0) {
-	Tcl_DoOneEvent(TCL_FILE_EVENTS|TCL_DONT_WAIT);
-    } else if (strcmp(argv[1], "wait") == 0) {
-	if (argc != 5) {
-	    Tcl_AppendResult(interp, "wrong # arguments: should be \"",
-                    argv[0], " wait index readable/writable timeout\"",
-                    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (pipePtr->readFile == NULL) {
-	    Tcl_AppendResult(interp, "pipe ", argv[2], " doesn't exist",
-		    (char *) NULL);
-	    return TCL_ERROR;
-	}
-	if (strcmp(argv[3], "readable") == 0) {
-	    mask = TCL_READABLE;
-	    file = pipePtr->readFile;
-	} else {
-	    mask = TCL_WRITABLE;
-	    file = pipePtr->writeFile;
-	}
-	if (Tcl_GetInt(interp, argv[4], &timeout) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	i = TclUnixWaitForFile(GetFd(file), mask, timeout);
-	if (i & TCL_READABLE) {
-	    Tcl_AppendElement(interp, "readable");
-	}
-	if (i & TCL_WRITABLE) {
-	    Tcl_AppendElement(interp, "writable");
-	}
-    } else if (strcmp(argv[1], "windowevent") == 0) {
-	Tcl_DoOneEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT);
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be close, clear, counts, create, empty, fill, ",
-		"fillpartial, oneevent, wait, or windowevent",
-		(char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-static void TestFileHandlerProc(clientData, mask)
-    ClientData clientData;	/* Points to a Pipe structure. */
-    int mask;			/* Indicates which events happened:
-				 * TCL_READABLE or TCL_WRITABLE. */
-{
-    Pipe *pipePtr = (Pipe *) clientData;
-
-    if (mask & TCL_READABLE) {
-	pipePtr->readCount++;
-    }
-    if (mask & TCL_WRITABLE) {
-	pipePtr->writeCount++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestfilewaitCmd --
- *
- *	This procedure implements the "testfilewait" command. It is
- *	used to test TclUnixWaitForFile.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestfilewaitCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    int mask, result, timeout;
-    Tcl_Channel channel;
-    int fd;
-    ClientData data;
-
-    if (argc != 4) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" file readable|writable|both timeout\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-    channel = Tcl_GetChannel(interp, argv[1], NULL);
-    if (channel == NULL) {
-	return TCL_ERROR;
-    }
-    if (strcmp(argv[2], "readable") == 0) {
-	mask = TCL_READABLE;
-    } else if (strcmp(argv[2], "writable") == 0){
-	mask = TCL_WRITABLE;
-    } else if (strcmp(argv[2], "both") == 0){
-	mask = TCL_WRITABLE|TCL_READABLE;
-    } else {
-	Tcl_AppendResult(interp, "bad argument \"", argv[2],
-		"\": must be readable, writable, or both", (char *) NULL);
-	return TCL_ERROR;
-    }
-    if (Tcl_GetChannelHandle(channel, 
-	    (mask & TCL_READABLE) ? TCL_READABLE : TCL_WRITABLE,
-	    (ClientData*) &data) != TCL_OK) {
-	Tcl_SetResult(interp, "couldn't get channel file", TCL_STATIC);
-	return TCL_ERROR;
-    }
-    fd = (int) data;
-    if (Tcl_GetInt(interp, argv[3], &timeout) != TCL_OK) {
-	return TCL_ERROR;
-    }
-    result = TclUnixWaitForFile(fd, mask, timeout);
-    if (result & TCL_READABLE) {
-	Tcl_AppendElement(interp, "readable");
-    }
-    if (result & TCL_WRITABLE) {
-	Tcl_AppendElement(interp, "writable");
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestfindexecutableCmd --
- *
- *	This procedure implements the "testfindexecutable" command. It is
- *	used to test Tcl_FindExecutable.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestfindexecutableCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    char *oldName;
-    char *oldNativeName;
-
-    if (argc != 2) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-		" argv0\"", (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    oldName       = tclExecutableName;
-    oldNativeName = tclNativeExecutableName;
-
-    tclExecutableName       = NULL;
-    tclNativeExecutableName = NULL;
-
-    Tcl_FindExecutable(argv[1]);
-    if (tclExecutableName != NULL) {
-	Tcl_SetResult(interp, tclExecutableName, TCL_VOLATILE);
-	ckfree(tclExecutableName);
-    }
-
-    tclExecutableName       = oldName;
-    tclNativeExecutableName = oldNativeName;
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestgetopenfileCmd --
- *
- *	This procedure implements the "testgetopenfile" command. It is
- *	used to get a FILE * value from a registered channel.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetopenfileCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    ClientData filePtr;
-
-    if (argc != 3) {
-        Tcl_AppendResult(interp,
-                "wrong # args: should be \"", argv[0],
-                " channelName forWriting\"",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (Tcl_GetOpenFile(interp, argv[1], atoi(argv[2]), 1, &filePtr)
-            == TCL_ERROR) {
-        return TCL_ERROR;
-    }
-    if (filePtr == (ClientData) NULL) {
-        Tcl_AppendResult(interp,
-                "Tcl_GetOpenFile succeeded but FILE * NULL!", (char *) NULL);
-        return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestsetdefencdirCmd --
- *
- *	This procedure implements the "testsetdefenc" command. It is
- *	used to set the value of tclDefaultEncodingDir.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestsetdefencdirCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 2) {
-        Tcl_AppendResult(interp,
-                "wrong # args: should be \"", argv[0],
-                " defaultDir\"",
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    if (tclDefaultEncodingDir != NULL) {
-	ckfree(tclDefaultEncodingDir);
-	tclDefaultEncodingDir = NULL;
-    }
-    if (*argv[1] != '\0') {
-	tclDefaultEncodingDir = (char *)
-	    ckalloc((unsigned) strlen(argv[1]) + 1);
-	strcpy(tclDefaultEncodingDir, argv[1]);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TestgetdefencdirCmd --
- *
- *	This procedure implements the "testgetdefenc" command. It is
- *	used to get the value of tclDefaultEncodingDir.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgetdefencdirCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    if (argc != 1) {
-        Tcl_AppendResult(interp,
-                "wrong # args: should be \"", argv[0],
-                (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    if (tclDefaultEncodingDir != NULL) {
-        Tcl_AppendResult(interp, tclDefaultEncodingDir, (char *) NULL);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- * TestalarmCmd --
- *
- *	Test that EINTR is handled correctly by generating and
- *	handling a signal.  This requires using the SA_RESTART
- *	flag when registering the signal handler.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Sets up an signal and async handlers.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestalarmCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-#ifdef SA_RESTART
-    unsigned int sec;
-    struct sigaction action;
-
-    if (argc > 1) {
-	Tcl_GetInt(interp, argv[1], (int *)&sec);
-    } else {
-	sec = 1;
-    }
-
-    /*
-     * Setup the signal handling that automatically retries
-     * any interupted I/O system calls.
-     */
-    action.sa_handler = AlarmHandler;
-    memset((void *)&action.sa_mask, 0, sizeof(sigset_t));
-    action.sa_flags = SA_RESTART;
-
-    if (sigaction(SIGALRM, &action, NULL) < 0) {
-	Tcl_AppendResult(interp, "sigaction: ", Tcl_PosixError(interp), NULL);
-	return TCL_ERROR;
-    }
-    if (alarm(sec) < 0) {
-	Tcl_AppendResult(interp, "alarm: ", Tcl_PosixError(interp), NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-#else
-    Tcl_AppendResult(interp, "warning: sigaction SA_RESTART not support on this platform", NULL);
-    return TCL_ERROR;
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AlarmHandler --
- *
- *	Signal handler for the alarm command.
- *
- * Results:
- *	None.
- *
- * Side effects:
- * 	Calls the Tcl Async handler.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AlarmHandler()
-{
-    gotsig = "1";
-}
-
-/*
- *----------------------------------------------------------------------
- * TestgotsigCmd --
- *
- * 	Verify the signal was handled after the testalarm command.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	Resets the value of gotsig back to '0'.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgotsigCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    Tcl_AppendResult(interp, gotsig, (char *) NULL);
-    gotsig = "0";
-    return TCL_OK;
-}
diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c
deleted file mode 100644
index b00bf42..0000000
--- a/unix/tclUnixThrd.c
+++ /dev/null
@@ -1,682 +0,0 @@
-/* 
- * tclUnixThrd.c --
- *
- *	This file implements the UNIX-specific thread support.
- *
- * Copyright (c) 1991-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS:  @(#) tclUnixThrd.c 1.18 98/02/19 14:24:12
- */
-
-#include "tclInt.h"
-
-#ifdef TCL_THREADS
-
-#include "tclPort.h"
-#include "pthread.h"
-
-/*
- * masterLock is used to serialize creation of mutexes, condition
- * variables, and thread local storage.
- * This is the only place that can count on the ability to statically
- * initialize the mutex.
- */
-
-static pthread_mutex_t masterLock = PTHREAD_MUTEX_INITIALIZER;
-
-/*
- * initLock is used to serialize initialization and finalization
- * of Tcl.  It cannot use any dyamically allocated storage.
- */
-
-static pthread_mutex_t initLock = PTHREAD_MUTEX_INITIALIZER;
-
-/*
- * These are for the critical sections inside this file.
- */
-
-#define MASTER_LOCK	pthread_mutex_lock(&masterLock)
-#define MASTER_UNLOCK	pthread_mutex_unlock(&masterLock)
-
-#endif /* TCL_THREADS */
-
-
-
-#ifdef TCL_THREADS
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadCreate --
- *
- *	This procedure creates a new thread.
- *
- * Results:
- *	TCL_OK if the thread could be created.  The thread ID is
- *	returned in a parameter.
- *
- * Side effects:
- *	A new thread is created.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpThreadCreate(idPtr, proc, clientData)
-    Tcl_ThreadId *idPtr;		/* Return, the ID of the thread */
-    Tcl_ThreadCreateProc proc;		/* Main() function of the thread */
-    ClientData clientData;		/* The one argument to Main() */
-{
-    pthread_attr_t attr;
-
-    pthread_attr_init(&attr);
-    pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
-    if (pthread_create((pthread_t *)idPtr, &attr, (void * (*)())proc, (void *)clientData) < 0) {
-	return TCL_ERROR;
-    } else {
-	return TCL_OK;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadExit --
- *
- *	This procedure terminates the current thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This procedure terminates the current thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadExit(status)
-    int status;
-{
-    pthread_exit((VOID *)status);
-}
-#endif /* TCL_THREADS */
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCurrentThread --
- *
- *	This procedure returns the ID of the currently running thread.
- *
- * Results:
- *	A thread ID.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_ThreadId
-Tcl_GetCurrentThread()
-{
-#ifdef TCL_THREADS
-    return (Tcl_ThreadId) pthread_self();
-#else
-    return (Tcl_ThreadId) 0;
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitLock
- *
- *	This procedure is used to grab a lock that serializes initialization
- *	and finalization of Tcl.  On some platforms this may also initialize
- *	the mutex used to serialize creation of more mutexes and thread
- *	local storage keys.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitLock()
-{
-#ifdef TCL_THREADS
-    pthread_mutex_lock(&initLock);
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitUnlock
- *
- *	This procedure is used to release a lock that serializes initialization
- *	and finalization of Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitUnlock()
-{
-#ifdef TCL_THREADS
-    pthread_mutex_unlock(&initLock);
-#endif
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterLock
- *
- *	This procedure is used to grab a lock that serializes creation
- *	and finalization of serialization objects.  This interface is
- *	only needed in finalization; it is hidden during
- *	creation of the objects.
- *
- *	This lock must be different than the initLock because the
- *	initLock is held during creation of syncronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterLock()
-{
-#ifdef TCL_THREADS
-    pthread_mutex_lock(&masterLock);
-#endif
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterUnlock
- *
- *	This procedure is used to release a lock that serializes creation
- *	and finalization of synchronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterUnlock()
-{
-#ifdef TCL_THREADS
-    pthread_mutex_unlock(&masterLock);
-#endif
-}
-
-#ifdef TCL_THREADS
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMutexInit --
- * TclpMutexLock --
- * TclpMutexUnlock --
- *
- *	These procedures use an explicitly initialized mutex.
- *	These are used by memory allocators for their own mutex.
- * 
- * Results:
- *	None.
- *
- * Side effects:
- *	Initialize, Lock, and Unlock the mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMutexInit(mPtr)
-    TclpMutex *mPtr;
-{
-    pthread_mutex_init((pthread_mutex_t *)mPtr, NULL);
-}
-void
-TclpMutexLock(mPtr)
-    TclpMutex *mPtr;
-{
-    pthread_mutex_lock((pthread_mutex_t *)mPtr);
-}
-void
-TclpMutexUnlock(mPtr)
-    TclpMutex *mPtr;
-{
-    pthread_mutex_unlock((pthread_mutex_t *)mPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MutexLock --
- *
- *	This procedure is invoked to lock a mutex.  This procedure
- *	handles initializing the mutex, if necessary.  The caller
- *	can rely on the fact that Tcl_Mutex is an opaque pointer.
- *	This routine will change that pointer from NULL after first use.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May block the current thread.  The mutex is aquired when
- *	this returns.  Will allocate memory for a pthread_mutex_t
- *	and initialize this the first time this Tcl_Mutex is used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexLock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-{
-    pthread_mutex_t *pmutexPtr;
-    if (*mutexPtr == NULL) {
-	MASTER_LOCK;
-	if (*mutexPtr == NULL) {
-	    /* 
-	     * Double inside master lock check to avoid a race.
-	     */
-    
-	    pmutexPtr = (pthread_mutex_t *)ckalloc(sizeof(pthread_mutex_t));
-	    pthread_mutex_init(pmutexPtr, NULL);
-	    *mutexPtr = (Tcl_Mutex)pmutexPtr;
-	    TclRememberMutex(mutexPtr);
-	}
-	MASTER_UNLOCK;
-    }
-    pmutexPtr = *((pthread_mutex_t **)mutexPtr);
-    pthread_mutex_lock(pmutexPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMutexUnlock --
- *
- *	This procedure is invoked to unlock a mutex.  The mutex must
- *	have been locked by Tcl_MutexLock.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex is released when this returns.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexUnlock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-{
-    pthread_mutex_t *pmutexPtr = *(pthread_mutex_t **)mutexPtr;
-    pthread_mutex_unlock(pmutexPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeMutex --
- *
- *	This procedure is invoked to clean up one mutex.  This is only
- *	safe to call at the end of time.
- *
- *	This assumes the Master Lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex list is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeMutex(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-    pthread_mutex_t *pmutexPtr = *(pthread_mutex_t **)mutexPtr;
-    if (pmutexPtr != NULL) {
-	ckfree((char *)pmutexPtr);
-	*mutexPtr = NULL;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyInit --
- *
- *	This procedure initializes a thread specific data block key.
- *	Each thread has table of pointers to thread specific data.
- *	all threads agree on which table entry is used by each module.
- *	this is remembered in a "data key", that is just an index into
- *	this table.  To allow self initialization, the interface
- *	passes a pointer to this key and the first thread to use
- *	the key fills in the pointer to the key.  The key should be
- *	a process-wide static.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Will allocate memory the first time this process calls for
- *	this key.  In this case it modifies its argument
- *	to hold the pointer to information about the key.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeyInit(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-{
-    pthread_key_t *pkeyPtr;
-
-    MASTER_LOCK;
-    if (*keyPtr == NULL) {
-	pkeyPtr = (pthread_key_t *)ckalloc(sizeof(pthread_key_t));
-	pthread_key_create(pkeyPtr, NULL);
-	*keyPtr = (Tcl_ThreadDataKey)pkeyPtr;
-	TclRememberDataKey(keyPtr);
-    }
-    MASTER_UNLOCK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyGet --
- *
- *	This procedure returns a pointer to a block of thread local storage.
- *
- * Results:
- *	A thread-specific pointer to the data structure, or NULL
- *	if the memory has not been assigned to this key for this thread.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclpThreadDataKeyGet(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-{
-    pthread_key_t *pkeyPtr = *(pthread_key_t **)keyPtr;
-    if (pkeyPtr == NULL) {
-	return NULL;
-    } else {
-	return (VOID *)pthread_getspecific(*pkeyPtr);
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeySet --
- *
- *	This procedure sets the pointer to a block of thread local storage.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the thread so future calls to TclpThreadDataKeyGet with
- *	this key will return the data pointer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeySet(keyPtr, data)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-    VOID *data;			/* Thread local storage */
-{
-    pthread_key_t *pkeyPtr = *(pthread_key_t **)keyPtr;
-    pthread_setspecific(*pkeyPtr, data);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadData --
- *
- *	This procedure cleans up the thread-local storage.  This is
- *	called once for each thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees up all thread local storage.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadData(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    VOID *result;
-    pthread_key_t *pkeyPtr;
-
-    if (*keyPtr != NULL) {
-	pkeyPtr = *(pthread_key_t **)keyPtr;
-	result = (VOID *)pthread_getspecific(*pkeyPtr);
-	if (result != NULL) {
-	    ckfree((char *)result);
-	    pthread_setspecific(*pkeyPtr, (void *)NULL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadDataKey --
- *
- *	This procedure is invoked to clean up one key.  This is a
- *	process-wide storage identifier.  The thread finalization code
- *	cleans up the thread local storage itself.
- *
- *	This assumes the master lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The key is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadDataKey(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    pthread_key_t *pkeyPtr;
-    if (*keyPtr != NULL) {
-	pkeyPtr = *(pthread_key_t **)keyPtr;
-	pthread_key_delete(*pkeyPtr);
-	ckfree((char *)pkeyPtr);
-	*keyPtr = NULL;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionWait --
- *
- *	This procedure is invoked to wait on a condition variable.
- *	The mutex is automically released as part of the wait, and
- *	automatically grabbed when the condition is signaled.
- *
- *	The mutex must be held when this procedure is called.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May block the current thread.  The mutex is aquired when
- *	this returns.  Will allocate memory for a pthread_mutex_t
- *	and initialize this the first time this Tcl_Mutex is used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-    Tcl_Condition *condPtr;	/* Really (pthread_cond_t **) */
-    Tcl_Mutex *mutexPtr;	/* Really (pthread_mutex_t **) */
-    Tcl_Time *timePtr;		/* Timeout on waiting period */
-{
-    pthread_cond_t *pcondPtr;
-    pthread_mutex_t *pmutexPtr;
-    struct timespec ptime;
-
-    if (*condPtr == NULL) {
-	MASTER_LOCK;
-
-	/* 
-	 * Double check inside mutex to avoid race,
-	 * then initialize condition variable if necessary.
-	 */
-
-	if (*condPtr == NULL) {
-	    pcondPtr = (pthread_cond_t *)ckalloc(sizeof(pthread_cond_t));
-	    pthread_cond_init(pcondPtr, NULL);
-	    *condPtr = (Tcl_Condition)pcondPtr;
-	    TclRememberCondition(condPtr);
-	}
-	MASTER_UNLOCK;
-    }
-    pmutexPtr = *((pthread_mutex_t **)mutexPtr);
-    pcondPtr = *((pthread_cond_t **)condPtr);
-    if (timePtr == NULL) {
-	pthread_cond_wait(pcondPtr, pmutexPtr);
-    } else {
-	ptime.tv_sec = timePtr->sec + TclpGetSeconds();
-	ptime.tv_nsec = 1000 * timePtr->usec;
-	pthread_cond_timedwait(pcondPtr, pmutexPtr, &ptime);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionNotify --
- *
- *	This procedure is invoked to signal a condition variable.
- *
- *	The mutex must be held during this call to avoid races,
- *	but this interface does not enforce that.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May unblock another thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionNotify(condPtr)
-    Tcl_Condition *condPtr;
-{
-    pthread_cond_t *pcondPtr = *((pthread_cond_t **)condPtr);
-    if (pcondPtr != NULL) {
-	pthread_cond_broadcast(pcondPtr);
-    } else {
-	/*
-	 * Noone has used the condition variable, so there are no waiters.
-	 */
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeCondition --
- *
- *	This procedure is invoked to clean up a condition variable.
- *	This is only safe to call at the end of time.
- *
- *	This assumes the Master Lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The condition variable is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeCondition(condPtr)
-    Tcl_Condition *condPtr;
-{
-    pthread_cond_t *pcondPtr = *(pthread_cond_t **)condPtr;
-    if (pcondPtr != NULL) {
-	pthread_cond_destroy(pcondPtr);
-	ckfree((char *)pcondPtr);
-	*condPtr = NULL;
-    }
-}
-
-
-
-#endif /* TCL_THREADS */
-
diff --git a/unix/tclUnixThrd.h b/unix/tclUnixThrd.h
deleted file mode 100644
index a4f6fc6..0000000
--- a/unix/tclUnixThrd.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * tclUnixThrd.h --
- *
- *      This header file defines things for thread support.
- *
- * Copyright (c) 1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#)
- */
- 
-#ifndef _TCLUNIXTHRD
-#define _TCLUNIXTHRD
-
-#ifdef TCL_THREADS
-
-
-#endif /* TCL_THREADS */
-#endif /* _TCLUNIXTHRD */
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
deleted file mode 100644
index 9427999..0000000
--- a/unix/tclUnixTime.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* 
- * tclUnixTime.c --
- *
- *	Contains Unix specific versions of Tcl functions that
- *	obtain time values from the operating system.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclUnixTime.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
- */
-
-#include "tclInt.h"
-#include "tclPort.h"
-
-/*
- *-----------------------------------------------------------------------------
- *
- * TclpGetSeconds --
- *
- *	This procedure returns the number of seconds from the epoch.  On
- *	most Unix systems the epoch is Midnight Jan 1, 1970 GMT.
- *
- * Results:
- *	Number of seconds from the epoch.
- *
- * Side effects:
- *	None.
- *
- *-----------------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetSeconds()
-{
-    return time((time_t *) NULL);
-}
-
-/*
- *-----------------------------------------------------------------------------
- *
- * TclpGetClicks --
- *
- *	This procedure returns a value that represents the highest resolution
- *	clock available on the system.  There are no garantees on what the
- *	resolution will be.  In Tcl we will call this value a "click".  The
- *	start time is also system dependant.
- *
- * Results:
- *	Number of clicks from some start time.
- *
- * Side effects:
- *	None.
- *
- *-----------------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetClicks()
-{
-    unsigned long now;
-#ifdef NO_GETTOD
-    struct tms dummy;
-#else
-    struct timeval date;
-    struct timezone tz;
-#endif
-
-#ifdef NO_GETTOD
-    now = (unsigned long) times(&dummy);
-#else
-    gettimeofday(&date, &tz);
-    now = date.tv_sec*1000000 + date.tv_usec;
-#endif
-
-    return now;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTimeZone --
- *
- *	Determines the current timezone.  The method varies wildly
- *	between different platform implementations, so its hidden in
- *	this function.
- *
- * Results:
- *	The return value is the local time zone, measured in
- *	minutes away from GMT (-ve for east, +ve for west).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpGetTimeZone (currentTime)
-    unsigned long  currentTime;
-{
-    /*
-     * Determine how a timezone is obtained from "struct tm".  If there is no
-     * time zone in this struct (very lame) then use the timezone variable.
-     * This is done in a way to make the timezone variable the method of last
-     * resort, as some systems have it in addition to a field in "struct tm".
-     * The gettimeofday system call can also be used to determine the time
-     * zone.
-     */
-    
-#if defined(HAVE_TM_TZADJ)
-#   define TCL_GOT_TIMEZONE
-    time_t      curTime = (time_t) currentTime;
-    struct tm  *timeDataPtr = localtime(&curTime);
-    int         timeZone;
-
-    timeZone = timeDataPtr->tm_tzadj  / 60;
-    if (timeDataPtr->tm_isdst) {
-        timeZone += 60;
-    }
-    
-    return timeZone;
-#endif
-
-#if defined(HAVE_TM_GMTOFF) && !defined (TCL_GOT_TIMEZONE)
-#   define TCL_GOT_TIMEZONE
-    time_t     curTime = (time_t) currentTime;
-    struct tm *timeDataPtr = localtime(&curTime);
-    int        timeZone;
-
-    timeZone = -(timeDataPtr->tm_gmtoff / 60);
-    if (timeDataPtr->tm_isdst) {
-        timeZone += 60;
-    }
-    
-    return timeZone;
-#endif
-
-#if defined(USE_DELTA_FOR_TZ)
-#define TCL_GOT_TIMEZONE 1
-    /*
-     * This hack replaces using global var timezone or gettimeofday
-     * in situations where they are buggy such as on AIX when libbsd.a
-     * is linked in.
-     */
-
-    int timeZone;
-    time_t tt;
-    struct tm *stm;
-    tt = 849268800L;      /*    1996-11-29 12:00:00  GMT */
-    stm = localtime(&tt); /* eg 1996-11-29  6:00:00  CST6CDT */
-    /* The calculation below assumes a max of +12 or -12 hours from GMT */
-    timeZone = (12 - stm->tm_hour)*60 + (0 - stm->tm_min);
-    return timeZone;  /* eg +360 for CST6CDT */
-#endif
-
-    /*
-     * Must prefer timezone variable over gettimeofday, as gettimeofday does
-     * not return timezone information on many systems that have moved this
-     * information outside of the kernel.
-     */
-    
-#if defined(HAVE_TIMEZONE_VAR) && !defined (TCL_GOT_TIMEZONE)
-#   define TCL_GOT_TIMEZONE
-    static int setTZ = 0;
-#ifdef TCL_THREADS
-    static Tcl_Mutex tzMutex;
-#endif
-    int        timeZone;
-
-    Tcl_MutexLock(&tzMutex);
-    if (!setTZ) {
-        tzset();
-        setTZ = 1;
-    }
-    Tcl_MutexUnlock(&tzMutex);
-
-    /*
-     * Note: this is not a typo in "timezone" below!  See tzset
-     * documentation for details.
-     */
-
-    timeZone = timezone / 60;
-
-    return timeZone;
-#endif
-
-#if !defined(NO_GETTOD) && !defined (TCL_GOT_TIMEZONE)
-#   define TCL_GOT_TIMEZONE
-    struct timeval  tv;
-    struct timezone tz;
-    int timeZone;
-
-    gettimeofday(&tv, &tz);
-    timeZone = tz.tz_minuteswest;
-    if (tz.tz_dsttime) {
-        timeZone += 60;
-    }
-    
-    return timeZone;
-#endif
-
-#ifndef TCL_GOT_TIMEZONE
-    /*
-     * Cause compile error, we don't know how to get timezone.
-     */
-    error: autoconf did not figure out how to determine the timezone. 
-#endif
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTime --
- *
- *	Gets the current system time in seconds and microseconds
- *	since the beginning of the epoch: 00:00 UCT, January 1, 1970.
- *
- * Results:
- *	Returns the current time in timePtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpGetTime(timePtr)
-    Tcl_Time *timePtr;		/* Location to store time information. */
-{
-    struct timeval tv;
-    struct timezone tz;
-    
-    (void) gettimeofday(&tv, &tz);
-    timePtr->sec = tv.tv_sec;
-    timePtr->usec = tv.tv_usec;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDate --
- *
- *	This function converts between seconds and struct tm.  If
- *	useGMT is true, then the returned date will be in Greenwich
- *	Mean Time (GMT).  Otherwise, it will be in the local time zone.
- *
- * Results:
- *	Returns a static tm structure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpGetDate(time, useGMT)
-    TclpTime_t time;
-    int useGMT;
-{
-    CONST time_t *tp = (CONST time_t *)time;
-
-    if (useGMT) {
-	return gmtime(tp);
-    } else {
-	return localtime(tp);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpStrftime --
- *
- *	On Unix, we can safely call the native strftime implementation.
- *
- * Results:
- *	The normal strftime result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-size_t
-TclpStrftime(s, maxsize, format, t)
-    char *s;
-    size_t maxsize;
-    CONST char *format;
-    CONST struct tm *t;
-{
-    return strftime(s, maxsize, format, t);
-}
diff --git a/unix/tclXtNotify.c b/unix/tclXtNotify.c
deleted file mode 100644
index 0b5a3b5..0000000
--- a/unix/tclXtNotify.c
+++ /dev/null
@@ -1,656 +0,0 @@
-/* 
- * tclXtNotify.c --
- *
- *	This file contains the notifier driver implementation for the
- *	Xt intrinsics.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclXtNotify.c,v 1.3 1999/02/03 02:59:08 stanton Exp $
- */
-
-#include <X11/Intrinsic.h>
-#include <tclInt.h>
-
-/*
- * This structure is used to keep track of the notifier info for a 
- * a registered file.
- */
-
-typedef struct FileHandler {
-    int fd;
-    int mask;			/* Mask of desired events: TCL_READABLE, etc. */
-    int readyMask;		/* Events that have been seen since the
-				   last time FileHandlerEventProc was called
-				   for this file. */
-    XtInputId read;		/* Xt read callback handle. */
-    XtInputId write;		/* Xt write callback handle. */
-    XtInputId except;		/* Xt exception callback handle. */
-    Tcl_FileProc *proc;		/* Procedure to call, in the style of
-				 * Tcl_CreateFileHandler. */
-    ClientData clientData;	/* Argument to pass to proc. */
-    struct FileHandler *nextPtr;/* Next in list of all files we care about. */
-} FileHandler;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * file handlers are ready to fire.
- */
-
-typedef struct FileHandlerEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    int fd;			/* File descriptor that is ready.  Used
-				 * to find the FileHandler structure for
-				 * the file (can't point directly to the
-				 * FileHandler structure because it could
-				 * go away while the event is queued). */
-} FileHandlerEvent;
-
-/*
- * The following static structure contains the state information for the
- * Xt based implementation of the Tcl notifier.
- */
-
-static struct NotifierState {
-    XtAppContext appContext;		/* The context used by the Xt
-                                         * notifier. Can be set with
-                                         * TclSetAppContext. */
-    int appContextCreated;		/* Was it created by us? */
-    XtIntervalId currentTimeout;	/* Handle of current timer. */
-    FileHandler *firstFileHandlerPtr;	/* Pointer to head of file handler
-					 * list. */
-} notifier;
-
-/*
- * The following static indicates whether this module has been initialized.
- */
-
-static int initialized = 0;
-
-/*
- * Static routines defined in this file.
- */
-
-static int		FileHandlerEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-			    int flags));
-static void		FileProc _ANSI_ARGS_((caddr_t clientData,
-			    int *source, XtInputId *id));
-static void		InitNotifier _ANSI_ARGS_((void));
-static void		NotifierExitHandler _ANSI_ARGS_((
-			    ClientData clientData));
-static void		TimerProc _ANSI_ARGS_((caddr_t clientData,
-			    XtIntervalId *id));
-
-/*
- * Functions defined in this file for use by users of the Xt Notifier:
- */
-
-EXTERN XtAppContext	TclSetAppContext _ANSI_ARGS_((XtAppContext ctx));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclSetAppContext --
- *
- *	Set the notifier application context.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the application context used by the notifier. Panics if
- *	the context is already set when called.
- *
- *----------------------------------------------------------------------
- */
-
-XtAppContext
-TclSetAppContext(appContext)
-    XtAppContext	appContext;
-{
-    if (!initialized) {
-        InitNotifier();
-    }
-
-    /*
-     * If we already have a context we check whether we were asked to set a
-     * new context. If so, we panic because we try to prevent switching
-     * contexts by mistake. Otherwise, we return the one we have.
-     */
-    
-    if (notifier.appContext != NULL) {
-        if (appContext != NULL) {
-
-	    /*
-             * We already have a context. We do not allow switching contexts
-             * after initialization, so we panic.
-             */
-        
-            panic("TclSetAppContext:  multiple application contexts");
-
-        }
-    } else {
-
-        /*
-         * If we get here we have not yet gotten a context, so either create
-         * one or use the one supplied by our caller.
-         */
-
-        if (appContext == NULL) {
-
-	    /*
-             * We must create a new context and tell our caller what it is, so
-             * she can use it too.
-             */
-    
-            notifier.appContext = XtCreateApplicationContext();
-            notifier.appContextCreated = 1;
-        } else {
-
-	    /*
-             * Otherwise we remember the context that our caller gave us
-             * and use it.
-             */
-    
-            notifier.appContextCreated = 0;
-            notifier.appContext = appContext;
-        }
-    }
-    
-    return notifier.appContext;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * InitNotifier --
- *
- *	Initializes the notifier state.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new exit handler.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-InitNotifier(void)
-{
-    /*
-     * Only reinitialize if we are not in exit handling. The notifier
-     * can get reinitialized after its own exit handler has run, because
-     * of exit handlers for the I/O and timer sub-systems (order dependency).
-     */
-
-    if (TclInExit()) {
-        return;
-    }
-
-    /*
-     * DO NOT create the application context yet; doing so would prevent
-     * external applications from setting it for us to their own ones.
-     */
-    
-    initialized = 1;
-    memset(&notifier, 0, sizeof(notifier));
-    Tcl_CreateExitHandler(NotifierExitHandler, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NotifierExitHandler --
- *
- *	This function is called to cleanup the notifier state before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Destroys the notifier window.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-NotifierExitHandler(
-    ClientData clientData)	/* Not used. */
-{
-    if (notifier.currentTimeout != 0) {
-        XtRemoveTimeOut(notifier.currentTimeout);
-    }
-    for (; notifier.firstFileHandlerPtr != NULL; ) {
-        Tcl_DeleteFileHandler(notifier.firstFileHandlerPtr->fd);
-    }
-    if (notifier.appContextCreated) {
-        XtDestroyApplicationContext(notifier.appContext);
-        notifier.appContextCreated = 0;
-        notifier.appContext = NULL;
-    }
-    initialized = 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetTimer --
- *
- *	This procedure sets the current notifier timeout value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Replaces any previous timer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetTimer(timePtr)
-    Tcl_Time *timePtr;		/* Timeout value, may be NULL. */
-{
-    long timeout;
-
-    if (!initialized) {
-	InitNotifier();
-    }
-
-    TclSetAppContext(NULL);
-    if (notifier.currentTimeout != 0) {
-	XtRemoveTimeOut(notifier.currentTimeout);
-    }
-    if (timePtr) {
-	timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
-	notifier.currentTimeout =
-            XtAppAddTimeOut(notifier.appContext, (unsigned long) timeout,
-                    TimerProc, NULL);
-    } else {
-	notifier.currentTimeout = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TimerProc --
- *
- *	This procedure is the XtTimerCallbackProc used to handle
- *	timeouts.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *      Processes all queued events.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TimerProc(data, id)
-    caddr_t data;		/* Not used. */
-    XtIntervalId *id;
-{
-    if (*id != notifier.currentTimeout) {
-	return;
-    }
-    notifier.currentTimeout = 0;
-
-    Tcl_ServiceAll();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_CreateFileHandler --
- *
- *	This procedure registers a file handler with the Xt notifier.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new file handler structure and registers one or more
- *	input procedures with Xt.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_CreateFileHandler(fd, mask, proc, clientData)
-    int fd;			/* Handle of stream to watch. */
-    int mask;			/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, and TCL_EXCEPTION:
-				 * indicates conditions under which
-				 * proc should be called. */
-    Tcl_FileProc *proc;		/* Procedure to call for each
-				 * selected event. */
-    ClientData clientData;	/* Arbitrary data to pass to proc. */
-{
-    FileHandler *filePtr;
-
-    if (!initialized) {
-	InitNotifier();
-    }
-
-    TclSetAppContext(NULL);
-
-    for (filePtr = notifier.firstFileHandlerPtr; filePtr != NULL;
-	    filePtr = filePtr->nextPtr) {
-	if (filePtr->fd == fd) {
-	    break;
-	}
-    }
-    if (filePtr == NULL) {
-	filePtr = (FileHandler*) ckalloc(sizeof(FileHandler));
-	filePtr->fd = fd;
-	filePtr->read = 0;
-	filePtr->write = 0;
-	filePtr->except = 0;
-	filePtr->readyMask = 0;
-	filePtr->mask = 0;
-	filePtr->nextPtr = notifier.firstFileHandlerPtr;
-	notifier.firstFileHandlerPtr = filePtr;
-    }
-    filePtr->proc = proc;
-    filePtr->clientData = clientData;
-
-    /*
-     * Register the file with the Xt notifier, if it hasn't been done yet.
-     */
-
-    if (mask & TCL_READABLE) {
-	if (!(filePtr->mask & TCL_READABLE)) {
-	    filePtr->read =
-                XtAppAddInput(notifier.appContext, fd, XtInputReadMask,
-                        FileProc, filePtr);
-	}
-    } else {
-	if (filePtr->mask & TCL_READABLE) {
-	    XtRemoveInput(filePtr->read);
-	}
-    }
-    if (mask & TCL_WRITABLE) {
-	if (!(filePtr->mask & TCL_WRITABLE)) {
-	    filePtr->write =
-                XtAppAddInput(notifier.appContext, fd, XtInputWriteMask,
-                        FileProc, filePtr);
-	}
-    } else {
-	if (filePtr->mask & TCL_WRITABLE) {
-	    XtRemoveInput(filePtr->write);
-	}
-    }
-    if (mask & TCL_EXCEPTION) {
-	if (!(filePtr->mask & TCL_EXCEPTION)) {
-	    filePtr->except =
-                XtAppAddInput(notifier.appContext, fd, XtInputExceptMask,
-                        FileProc, filePtr);
-	}
-    } else {
-	if (filePtr->mask & TCL_EXCEPTION) {
-	    XtRemoveInput(filePtr->except);
-	}
-    }
-    filePtr->mask = mask;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_DeleteFileHandler --
- *
- *	Cancel a previously-arranged callback arrangement for
- *	a file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If a callback was previously registered on file, remove it.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_DeleteFileHandler(fd)
-    int fd;			/* Stream id for which to remove
-				 * callback procedure. */
-{
-    FileHandler *filePtr, *prevPtr;
-
-    if (!initialized) {
-	InitNotifier();
-    }
-
-    TclSetAppContext(NULL);
-
-    /*
-     * Find the entry for the given file (and return if there
-     * isn't one).
-     */
-
-    for (prevPtr = NULL, filePtr = notifier.firstFileHandlerPtr; ;
-	    prevPtr = filePtr, filePtr = filePtr->nextPtr) {
-	if (filePtr == NULL) {
-	    return;
-	}
-	if (filePtr->fd == fd) {
-	    break;
-	}
-    }
-
-    /*
-     * Clean up information in the callback record.
-     */
-
-    if (prevPtr == NULL) {
-	notifier.firstFileHandlerPtr = filePtr->nextPtr;
-    } else {
-	prevPtr->nextPtr = filePtr->nextPtr;
-    }
-    if (filePtr->mask & TCL_READABLE) {
-	XtRemoveInput(filePtr->read);
-    }
-    if (filePtr->mask & TCL_WRITABLE) {
-	XtRemoveInput(filePtr->write);
-    }
-    if (filePtr->mask & TCL_EXCEPTION) {
-	XtRemoveInput(filePtr->except);
-    }
-    ckfree((char *) filePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileProc --
- *
- *	These procedures are called by Xt when a file becomes readable,
- *	writable, or has an exception.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Makes an entry on the Tcl event queue if the event is
- *	interesting.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileProc(clientData, fd, id)
-    caddr_t clientData;
-    int *fd;
-    XtInputId *id;
-{
-    FileHandler *filePtr = (FileHandler *)clientData;
-    FileHandlerEvent *fileEvPtr;
-    int mask = 0;
-
-    /*
-     * Determine which event happened.
-     */
-
-    if (*id == filePtr->read) {
-	mask = TCL_READABLE;
-    } else if (*id == filePtr->write) {
-	mask = TCL_WRITABLE;
-    } else if (*id == filePtr->except) {
-	mask = TCL_EXCEPTION;
-    }
-
-    /*
-     * Ignore unwanted or duplicate events.
-     */
-
-    if (!(filePtr->mask & mask) || (filePtr->readyMask & mask)) {
-	return;
-    }
-    
-    /*
-     * This is an interesting event, so put it onto the event queue.
-     */
-
-    filePtr->readyMask |= mask;
-    fileEvPtr = (FileHandlerEvent *) ckalloc(sizeof(FileHandlerEvent));
-    fileEvPtr->header.proc = FileHandlerEventProc;
-    fileEvPtr->fd = filePtr->fd;
-    Tcl_QueueEvent((Tcl_Event *) fileEvPtr, TCL_QUEUE_TAIL);
-
-    /*
-     * Process events on the Tcl event queue before returning to Xt.
-     */
-
-    Tcl_ServiceAll();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileHandlerEventProc --
- *
- *	This procedure is called by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure is
- *	responsible for actually handling the event by invoking the
- *	callback for the file handler.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the file handler's callback procedure does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileHandlerEventProc(evPtr, flags)
-    Tcl_Event *evPtr;		/* Event to service. */
-    int flags;			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    FileHandler *filePtr;
-    FileHandlerEvent *fileEvPtr = (FileHandlerEvent *) evPtr;
-    int mask;
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the file handlers to find the one whose handle matches
-     * the event.  We do this rather than keeping a pointer to the file
-     * handler directly in the event, so that the handler can be deleted
-     * while the event is queued without leaving a dangling pointer.
-     */
-
-    for (filePtr = notifier.firstFileHandlerPtr; filePtr != NULL;
-	    filePtr = filePtr->nextPtr) {
-	if (filePtr->fd != fileEvPtr->fd) {
-	    continue;
-	}
-
-	/*
-	 * The code is tricky for two reasons:
-	 * 1. The file handler's desired events could have changed
-	 *    since the time when the event was queued, so AND the
-	 *    ready mask with the desired mask.
-	 * 2. The file could have been closed and re-opened since
-	 *    the time when the event was queued.  This is why the
-	 *    ready mask is stored in the file handler rather than
-	 *    the queued event:  it will be zeroed when a new
-	 *    file handler is created for the newly opened file.
-	 */
-
-	mask = filePtr->readyMask & filePtr->mask;
-	filePtr->readyMask = 0;
-	if (mask != 0) {
-	    (*filePtr->proc)(filePtr->clientData, mask);
-	}
-	break;
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitForEvent --
- *
- *	This function is called by Tcl_DoOneEvent to wait for new
- *	events on the message queue.  If the block time is 0, then
- *	Tcl_WaitForEvent just polls without blocking.
- *
- * Results:
- *	Returns 1 if an event was found, else 0.  This ensures that
- *	Tcl_DoOneEvent will return 1, even if the event is handled
- *	by non-Tcl code.
- *
- * Side effects:
- *	Queues file events that are detected by the select.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WaitForEvent(
-    Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
-{
-    int timeout;
-
-    if (!initialized) {
-	InitNotifier();
-    }
-
-    TclSetAppContext(NULL);
-
-    if (timePtr) {
-        timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
-        if (timeout == 0) {
-            if (XtAppPending(notifier.appContext)) {
-                goto process;
-            } else {
-                return 0;
-            }
-        } else {
-            Tcl_SetTimer(timePtr);
-        }
-    }
-process:
-    XtAppProcessEvent(notifier.appContext, XtIMAll);
-    return 1;
-}
diff --git a/unix/tclXtTest.c b/unix/tclXtTest.c
deleted file mode 100644
index da45a57..0000000
--- a/unix/tclXtTest.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
- * tclXtTest.c --
- *
- *	Contains commands for Xt notifier specific tests on Unix.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclXtTest.c,v 1.3 1999/04/16 00:48:06 stanton Exp $
- */
-
-#include <X11/Intrinsic.h>
-#include "tcl.h"
-
-static int	TesteventloopCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * Tclxttest_Init --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tclxttest_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter for application. */
-{
-    Tcl_CreateCommand(interp, "testeventloop", TesteventloopCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TesteventloopCmd --
- *
- *	This procedure implements the "testeventloop" command. It is
- *	used to test the Tcl notifier from an "external" event loop
- *	(i.e. not Tcl_DoOneEvent()).
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TesteventloopCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    static int *framePtr = NULL; /* Pointer to integer on stack frame of
-				  * innermost invocation of the "wait"
-				  * subcommand. */
-
-   if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " option ... \"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "done") == 0) {
-	*framePtr = 1;
-    } else if (strcmp(argv[1], "wait") == 0) {
-	int *oldFramePtr;
-	int done;
-	int oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-
-	/*
-	 * Save the old stack frame pointer and set up the current frame.
-	 */
-
-	oldFramePtr = framePtr;
-	framePtr = &done;
-
-	/*
-	 * Enter an Xt event loop until the flag changes.
-	 * Note that we do not explicitly call Tcl_ServiceEvent().
-	 */
-
-	done = 0;
-	while (!done) {
-	    XtAppProcessEvent(TclSetAppContext(NULL), XtIMAll);
-	}
-	(void) Tcl_SetServiceMode(oldMode);
-	framePtr = oldFramePtr;
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be done or wait", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
diff --git a/win/README b/win/README
deleted file mode 100644
index 5a42354..0000000
--- a/win/README
+++ /dev/null
@@ -1,188 +0,0 @@
-Tcl 8.1 for Windows
-
-by Scott Stanton
-Scriptics Corporation
-scott.stanton@scriptics.com
-
-RCS: @(#) $Id: README,v 1.10 1999/04/16 00:48:06 stanton Exp $
-
-1. Introduction
----------------
-
-This is the directory where you configure and compile the Windows
-version of Tcl.  This directory also contains source files for Tcl
-that are specific to Microsoft Windows.  The rest of this file
-contains information specific to the Windows version of Tcl.
-
-2. Distribution notes
----------------------
-
-Tcl 8.1 for Windows is distributed in binary form in addition to the
-common source release.  The binary distribution is a self-extracting
-archive with a built-in installation script.
-
-Look for the binary release in the same location as the source release
-(ftp.scriptics.com:/pub/tcl or any of the mirror sites).  For most users,
-the binary release will be much easier to install and use.  You only
-need the source release if you plan to modify the core of Tcl, or if
-you need to compile with a different compiler.  With the addition of
-the dynamic loading interface, it is no longer necessary to have the
-source distribution in order to build and use extensions.
-
-3. Compiling Tcl
-----------------
-
-In order to compile Tcl for Windows, you need the following items:
-
-	Tcl 8.1 Source Distribution (plus any patches)
-
-	Visual C++ 2.x/4.x/5.x
-
-In practice, the 8.1.a2 release is built with Visual C++ 5.0
-
-In the "win" subdirectory of the source release, you will find two
-files called "makefile.bc" and "makefile.vc".  These are the makefiles
-for the Borland and Visual C++ compilers respectively.  You should
-copy the appropriate one to "makefile" and update the paths at the
-top of the file to reflect your system configuration.  Now you can use
-"make" (or "nmake" for VC++) to build the tcl libraries and the tclsh
-executable.
-
-In order to use the binaries generated by these makefiles, you will
-need to place the Tcl script library files someplace where Tcl can
-find them.  Tcl looks in one of three places for the library files:
-
-	1) The path specified in the environment variable "TCL_LIBRARY".
-
-	2) In the lib\tcl8.1 directory under the installation directory
-	   as specified in the registry:
-
-		HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.1
-
-	3) Relative to the directory containing the current .exe.
-	    Tcl will look for a directory "..\lib\tcl8.1" relative to the
-	    directory containing the currently running .exe.
-
-Note that in order to run tclsh81.exe, you must ensure that tcl81.dll
-and tclpip81.dll are on your path, in the system directory, or in the 
-directory containing tclsh81.exe.
-
-Note: Tcl no longer provides support for Win32s.
-
-4. Building Extensions
-----------------------
-
-With the Windows compilers you have to worry about how you export symbols
-from DLLs.  tcl.h defines a few macros to help solve this problem:
-EXTERN - all Tcl_ function prototypes use this macro, which implies
-	they are exported.  You'll see this used in tcl.h and tk.h.
-	You should use this in your exported procedures.
-	However, this is not the whole story.
-TCL_STORAGE_CLASS - this is really an import/export flag, depending on if you are
-	importing symbols from a DLL (i.e., a user of the DLL), or if
-	you are exporting symbols from the DLL (i.e., you are building it.)
-	The EXTERN macro includes TCL_STORAGE_CLASS.
-	TCL_STORAGE_CLASS is defined to be either DLLIMPORT or DLLEXPORT as
-	described below.
-STATIC_BUILD - define this if you are *not* building a DLL
-	(e.g., a main program)
-DLL_BUILD - define this if you *are* building a DLL
-DLLIMPORT - If STATIC_BUILD is defined, this becomes nothing.
-	(On UNIX, DLLIMPORT is defined to be empty)
-	Otherwise, this this expands to __declspec(dllimport)
-DLLEXPORT - If STATIC_BUILD is defined, this becomes nothing.
-	(On UNIX, DLLEXPORT is defined to be empty)
-	Otherwise, this this expands to __declspec(dllexport)
-
-EXPORT(type, func)
-	For the Borland compiler, you need to export functions differently.
-	The DLLEXPORT macro is empty, and instead you need to use
-	EXPORT because they had a different order.  Your declaration will
-	look like
-	EXTERN EXPORT(int, Foo_Init)(Tcl_Interp *interp);
-We have not defined EXPORT anywhere.  You can paste this into your C file:
-#ifndef STATIC_BUILD
-#if defined(_MSC_VER)
-#   define EXPORT(a,b) __declspec(dllexport) a b
-#   define DllEntryPoint DllMain
-#else
-#   if defined(__BORLANDC__)
-#       define EXPORT(a,b) a _export b
-#   else
-#       define EXPORT(a,b) a b
-#   endif
-#endif
-#endif
-
-
-How to use these:
-
-Assume your extension is named Foo.  In its Makefile, define
-BUILD_Foo so that you know you are building Foo and not using it.
-Then, in your main header file, foo.h, conditionally define
-EXPORT to be either DLLIMPORT or DLLEXPORT based on the
-presense of BUILD_Foo, like this:
-
-#ifndef _FOO
-#define _FOO
-#include "tcl.h"
-/* Additional includes go here */
-/*
- * if the BUILD_foo macro is defined, the assumption is that we are
- * building the dynamic library.
- */
-#ifdef BUILD_Foo
-#  undef TCL_STORAGE_CLASS
-#  define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-/*
- * Function prototypes for this module.
- */
-EXTERN int Foo_Init _ANSI_ARGS_((Tcl_Interp *interp));
-EXTERN int Foo_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
-/* Additional prototypes go here */
-/*
- * end of foo.h
- * reset TCL_STORAGE_CLASS to DLLIMPORT.
- */
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-#endif /* _FOO */
-
-In your C file, put EXTERN before then functions you need to export.
-If you use Borland, you'll need to use the old EXPORT macro, too.
-
-5. Test suite
--------------
-
-This distribution contains an extensive test suite for Tcl.  Some of
-the tests are timing dependent and will fail from time to time.  If a
-test is failing consistently, please send us a bug report with as much
-detail as you can manage.
-
-In order to run the test suite, you build the "test" target using the
-appropriate makefile for your compiler.
-
-
-6. Known Bugs
--------------
-
-Here is the current list of known bugs/missing features for the
-Windows version of Tcl:
-
-- Clock command fails to handle daylight savings time boundaries for
-  things like "last week".
-- Background processes aren't properly detached on NT.
-- File events only work on sockets and pipes.
-- Files/console/serial ports don't support nonblocking I/O.
-- Environment variables containing international characters aren't
-  imported correctly.
-
-If you have comments or bug reports for the Windows version of Tcl,
-please use the form at:
-
-http://www.scriptics.com/support/bugForm.html
-
-If you have comments or bug reports for the Windows version of Tk,
-please direct them to the comp.lang.tcl newsgroup or the
-wintcl@tclconsortium.org mailing list.
diff --git a/win/README.binary b/win/README.binary
deleted file mode 100644
index 1112ef1..0000000
--- a/win/README.binary
+++ /dev/null
@@ -1,387 +0,0 @@
-Tcl/Tk 8.1b3 for Windows, Binary Distribution
-
-RCS: @(#) $Id: README.binary,v 1.4 1999/04/16 00:48:06 stanton Exp $ 
-
-1. Introduction
---------------- 
-
-This directory contains the binary distribution of Tcl/Tk 8.1b3 for
-Windows.  It was compiled with Microsoft Visual C++ 5.0 using Win32
-API, so that it will run under Windows NT and Windows 95.  The
-information here corresponds to the second beta release of 8.1.
-
-2. Documentation
-----------------
-
-The best way to get started with Tcl is to read one of the introductory
-books on Tcl:
-
-    Practical Programming in Tcl and Tk, 2nd Edition, by Brent Welch,
-    Prentice-Hall, 1997, ISBN 0-13-616830-2
-
-    Tcl and the Tk Toolkit, by John Ousterhout,
-    Addison-Wesley, 1994, ISBN 0-201-63337-X
-
-    Exploring Expect, by Don Libes,
-    O'Reilly and Associates, 1995, ISBN 1-56592-090-2
-
-Other books are listed at
-http://www.scriptics.com/resource/doc/books/
-http://www.tclconsortium.org/resources/books.html
-
-There is also an official home for Tcl and Tk on the Web:
-	http://www.scriptics.com
-These Web pages include information about the latest releases, products
-related to Tcl and Tk, reports on bug fixes and porting issues, HTML
-versions of the manual pages, and pointers to many other Tcl/Tk Web
-pages at other sites.  Check them out!
-
-3. Installation
----------------
-
-The binary release is distributed as a self-extracting archive called
-tcl81.exe.  The setup program which will prompt you for an
-installation directory.  It will create the installation heirarchy
-under the specified directory, and install a wish application icon
-under the program manager group of your choice.
-
-We are no longer supporting use of Tcl with 16-bit versions of
-Windows.  Microsoft has completely dropped support of the Win32s
-subsystem.
-
-4. Summary of changes in Tcl 8.1
---------------------------------
-The most important changes in Tcl 8.1 are summarized below. See
-the README and changes files in the distribution
-for more complete information on what has changed, including both feature
-changes and bug fixes.
-
-Internationalization.  Tcl has undergone a major
-revision to support international character sets:
-
-
-All strings in Tcl are now represented in UTF-8 instead of ASCII, so
-that Tcl now supports the full Unicode character set.
-The representation of ASCII characters is unchanged (in UTF-8 anything
-that looks like an ASCII character is an ASCII character), but
-characters with the high-order bit set, such as those in ISO-8859,
-are represented with multi-byte sequences, as are all Unicode
-characters with values greater than 127.  This change does not affect
-Tcl scripts but it does affect C code that parses strings.
-Tcl automatically translates between UTF-8 and the normal encoding for
-the platform during interactions with the system.
-
-In Tcl scripts the backslash sequence \u can be used to enter
-16-bit Unicode characters.  \o and \x generate
-only 8-bit characters as before.
-
-The fconfigure command now supports a -encoding
-option for specifying the encoding of an open file or socket.  Tcl will
-automatically translate between the specified encoding and UTF-8 during
-I/O.  See the directory library/encoding to find out what encodings are
-supported (eventually there will be an encoding command
-that makes this information more accessible).
-
-There are several new C APIs that support UTF-8 and various encodings.
-See the manual entry Utf.3 for procedures that
-translate between Unicode and UTF-8 and manipulate UTF-8 strings.
-See Encoding.3 for procedures that create new encodings and
-translate between encodings.  See ToUpper.3 for procedures
-that perform case conversions on UTF-8 strings.
-
-Binary data.  Binary data is handled differently in Tcl 8.1 than in
-Tcl 8.0.  Tcl 8.1 uses the UTF-8 facilities to represent binary data:
-the character value zero is represented with a multi-byte sequence, so
-that (once again) strings in Tcl 8.1 never contain null bytes.  This
-means that binary data is now accepted everywhere in Tcl and Tk (in
-Tcl 8.0 the support for binary data was incomplete).  If you have C
-code that needs to manipulate the bytes of binary data (as opposed to
-just passing the data through) you should use a new object type called
-"byte array".  See the manual entry ByteArrObj.3 for information about
-procedures such as Tcl_GetByteArrayFromObj.
-
-New regular expressions.  Tcl 8.1 contains a brand new implementation
-of regular expressions from Henry Spencer.  This new version supports
-almost all of the Perl extensions and it also handles UTF-8 and binary
-data.
-
-Multi-Threading.  Tcl 8.1 is multi-thread safe.  Each thread can
-contain several Tcl interpreters, but a given interpreter can not be
-accessed from more than one thread.  Each thread runs its own event
-loop, and you can post events to other threads. There is not yet
-support for tcl level use of threading except for a test
-command. (Compile tcltest and try testthread.)  Tk 8.1 is not yet
-multi-thread safe, and may never be due to limitations of Xlib.
-
-
-What's new in Tk 8.1
-
-The most important changes in Tk 8.1 are summarized below. See the
-README and changes files in the distribution for more complete
-information on what has changed, including both feature changes and
-bug fixes.
-
-1. Internationalization.  Tk has undergone a major overhaul to support
-the new internationalization features of Tcl.  The font package has
-been rewritten to support arbitrary Unicode characters; when you
-specify a particular font such as "Times 12" Tk may actually use
-additional fonts to display Unicode characters that don't exist in the
-font you chose.  Tk guarantees to find a way to display any Unicode
-character regardless of the font you selected, as long as there is
-some font in the system that contains the Unicode character.  The
-input method support in Tk has also been modified to support full
-Unicode characters.
-
-2. Send/DDE support.  The send command now works on Windows platforms.
-It is implemented using DDE and there is a new dde command that allows
-Tk applications to use DDE to communicate with other Windows
-applications.  send still doesn't work on the Macintosh.
-
-3. Configuration options.  There is a new library of C procedures for
-manipulating widget configuration options using Tcl_Objs instead of
-strings.  This should eventually make Tk much more efficient.  Label,
-button, checkbutton, radiobutton, and menu widgets have been modified
-to use the new library.  See SetOptions.3 for information on the new C
-APIs.
-
-4. More Tcl_Obj support.  Several additional C library procedures have
-been added to support Tcl_Objs.  See the manual entries 3DBorder.3,
-GetAnchor.3, GetBitmap.3, GetColor.3, GetCursor.3, GetFont.3,
-GetJustify.3, and GetPixels.3.
-
-Incompatibilities
-
-Although the 8.1 releases involve substantial changes to the
-implementation of Tcl and Tk, the changes should introduce few
-if any compatibility problems for Tcl scripts or extensions.  Here
-are the compatibility problems that we know of:
-
-The changes to the regular expression package required a few minor
-syntax changes in order to support all the new features:
-
-- Backslash inside brackets is an escape whereas before it was a
-  literal character.  To specify a literal \ in brackets you must
-  write \\.
-
-- Some escapes, such as \d, \s, and \w, now mean special things in a
-  bracket expression.  Other escapes , such as \D, \S, \W, \A and \Z,
-  are illegal.
-  
-- A { followed by a digit will no longer match those two characters.
-  Instead, it will start a bound.  Such sequences should be rare and
-  will often result in an error because the following characters will
-  not look like a valid bound.
-  
-- Backslash followed by an alphanumeric character is either an escape
-  or an error.  Several of the new escapes were treated as literal
-  characters in earlier versions of Tcl.
-  
-- The matching order has changed slightly.  Here is an explanation
-  from Henry Spencer:
-
-    Both the old package and the new package find the match that starts
-    earliest in the string.  Where things get tricky is when there is more
-    than one possible match starting at that point, different in either
-    length or internal details (that is, which subexpressions match where).
-
-    The old package examines possible matches in a complex but well-defined
-    order, and simply reports the first one it finds.  The new package
-    examines all possible matches simultaneously, and reports the longest.
-    For example, (week|wee)(night|knights) matches all of "weeknights".
-
-    When two possible matches are of the same length, priority is decided
-    based on getting the longest possible matches for early subexpressions,
-    with later subexpressions accepting whatever they can get.  This means
-    that either (wee|week)(kly|ly) or (week*)(k?ly) matches "weekly" as
-    week-ly, not wee-kly.  More subtly, when .*|a.c matches "abc", the .*
-    matches the whole string and the a.c doesn't even get a chance to
-    participate. 
-
-    When non-greedy quantifiers are used, things get more complicated.  If
-    all quantifiers in a regular expression are non-greedy, the exact same
-    rules apply except with "longest" replaced by "shortest" everywhere.
-    When greedy and non-greedy quantifiers are mixed, it's complicated and
-    difficult to explain.
-
-Known Problems With These Releases
-
-Both the internationalization support and the new regular expression
-package are large, complicated, and young, which means there are
-likely to be lots of bugs.  We need your help in finding and fixing
-problems.  This is particularly important for internationalization,
-since we don't have the right equipment or knowledge to test
-under very many conditions.  Here are some of the most glaring bugs
-or missing features that we know of:
-
-- We haven't been able to test input methods in Tk under Unix to be
-  sure that the full Unicode character set is being substituted
-  properly in %A substitutions.  This means that it probably doesn't
-  work.  We have been able to test under Windows and the Macintosh.
-
-- In Tk, PostScript generation does not work correctly for characters
-  outside the ASCII subset.
-
-- The threading for Tcl is brand new so there are likely to be bugs,
-  although it is based on early work done by Richard Hipp.  We have
-  done some testing on a multiprocessor Solaris machine, but none on
-  Windows or other flavors of UNIX on a multiprocessor.
-
-6. Known Bugs/Missing Features
-------------------------------
-
-- Clock command fails to handle daylight savings time boundaries for
-  things like "last week".
-- Background processes aren't properly detached on NT.
-- File events only work on sockets and pipes.
-- Files/console/serial ports don't support nonblocking I/O.
-- There is no support for custom cursors/application icons.  The core
-  set of X cursors is supported, although you cannot change their color.
-- Stippling of arcs isn't implemented yet.
-- Some "wm" functions don't map to Windows and aren't implemented;
-  others should map, but just aren't implemented.  The worst offenders
-  are the icon manipulation routines.
-- Color management on some displays doesn't work properly resulting in
-  Tk switching to monochrome mode.
-- Tk seems to fail to draw anything on some Matrox Millenium cards.
-- Printing does not work for images (e.g. GIF) on a canvas.
-- Tk_dialog appears in the upper left corner.  This is a symptom of a
-  larger problem with "wm geometry" when applied to unmapped or
-  iconified windows.
-- PPM images are using the wrong translation mode for writing to
-  files, resulting in CR/LF terminated PPM files.
-- Tk crashes if the display depth changes while it is running.  Tk
-  also doesn't consistently track changes in the system colors.
-
-There may be more that we don't know about, so be sure to submit bug
-reports when you run into problems.  If you have comments or bug
-reports for the Windows version of Tcl, please use our on-line bug
-form at:
-
-http://www.scriptics.com/support/bugForm.html
-
-or post them to the newsgroup comp.lang.tcl.
-
-7. Tcl newsgroup
------------------
-
-There is a network news group "comp.lang.tcl" intended for the exchange
-of information about Tcl, Tk, and related applications.  Feel free to use
-the newsgroup both for general information questions and for bug reports.
-We read the newsgroup and will attempt to fix bugs and problems reported
-to it.
-
-When using comp.lang.tcl, please be sure that your e-mail return address
-is correctly set in your postings.  This allows people to respond directly
-to you, rather than the entire newsgroup, for answers that are not of
-general interest.  A bad e-mail return address may prevent you from
-getting answers to your questions.  You may have to reconfigure your news
-reading software to ensure that it is supplying valid e-mail addresses.
-
-8. Tcl contributed archive
---------------------------
-
-Many people have created exciting packages and applications based on Tcl
-and/or Tk and made them freely available to the Tcl community.  An archive
-of these contributions is kept on the machine ftp.neosoft.com.  You
-can access the archive using anonymous FTP;  the Tcl contributed archive is
-in the directory "/pub/tcl".  The archive also contains several FAQ
-("frequently asked questions") documents that provide solutions to problems
-that are commonly encountered by TCL newcomers.
-
-9. Tcl Resource Center
-----------------------
-Visit http://www.scritics.com/resource/ to see an annotated index of
-many Tcl resources available on the World Wide Web.  This includes
-papers, books, and FAQs, as well as extensions, applications, binary
-releases, and patches.  You can contribute patches by sending them
-to <patches@scriptics.com>.  You can also recommend more URLs for the
-resource center using the forms labeled "Add a Resource".
-
-10. Mailing lists
-----------------
-
-A couple of  Mailing List have been set up to discuss Macintosh or
-Windows related Tcl issues.  In order to use these Mailing Lists you
-must have access to the internet.  To subscribe send a message to:
-	
-	wintcl-request@tclconsortium.org
-	mactcl-request@tclconsortium.org
-	
-In the body of the message (the subject will be ignored) put:
-	
-	subscribe mactcl Joe Blow
-	
-Replacing Joe Blow with your real name, of course.  (Use wintcl
-instead of mactcl if your interested in the Windows list.)  If you
-would just like to receive more information about the list without
-subscribing put the line:
-
-	information mactcl
-	
-in the body instead (or wintcl).
-
-11. Tcl version numbers
-----------------------
-
-Each Tcl release is identified by two numbers separated by a dot, e.g.
-6.7 or 7.0.  If a new release contains changes that are likely to break
-existing C code or Tcl scripts then the major release number increments
-and the minor number resets to zero: 6.0, 7.0, etc.  If a new release
-contains only bug fixes and compatible changes, then the minor number
-increments without changing the major number, e.g. 7.1, 7.2, etc.  If
-you have C code or Tcl scripts that work with release X.Y, then they
-should also work with any release X.Z as long as Z > Y.
-
-Alpha and beta releases have an additional suffix of the form b1 or b1.
-For example, Tcl 7.0b1 is the first beta release of Tcl version 7.0,
-Tcl 7.0b2 is the second beta release, and so on.  A beta release is an
-initial version of a new release, used to fix bugs and bad features before
-declaring the release stable.  An alpha release is like a beta release,
-except it's likely to need even more work before it's "ready for prime
-time".  New releases are normally preceded by one or more alpha and beta
-releases.  We hope that lots of people will try out the alpha and beta
-releases and report problems.  We'll make new alpha/beta releases to fix
-the problems, until eventually there is a beta release that appears to
-be stable.  Once this occurs we'll make the final release.
-
-We can't promise to maintain compatibility among alpha and beta releases.
-For example, release 7.1b2 may not be backward compatible with 7.1b1, even
-though the final 7.1 release will be backward compatible with 7.0.  This
-allows us to change new features as we find problems during beta testing.
-We'll try to minimize incompatibilities between beta releases, but if
-a major problem turns up then we'll fix it even if it introduces an
-incompatibility.  Once the official release is made then there won't
-be any more incompatibilities until the next release with a new major
-version number.
-
-Patch releases have a suffix such as p1 or p2.  These releases contain
-bug fixes only.  A patch release (e.g Tcl 7.6p2) should be completely
-compatible with the base release from which it is derived (e.g. Tcl
-7.6), and you should normally use the highest available patch release.
-
-As of 8.0.3, the patch releases use a second . instead of 'p'.  So, the
-8.0 release went to 8.0p1, 8.0p2, and 8.0.3.  The alphas and betas will
-still use the 'a' and 'b' letters in their tcl_patchLevel.
-
-12. Linking against the binary release
---------------------------------------
-
-In order to link your applications against the .dll files shipped with
-this release, you will need to use the appropriate .lib file for your
-compiler.  In the lib directory of the installation directory, there
-are library files for the Microsoft Visual C++ compiler:
-
-	tcl81.lib
-	tk81.lib
-
-13. Building dynamically loadable extensions
---------------------------------------------
-
-Please refer to the example dynamically loadable extension provided on
-our ftp site:
-
-	ftp://ftp.scriptics.com/pub/tcl/misc/example.zip
-
-This archive contains a template that you can use for building
-extensions that will be loadable on Unix, Windows, and Macintosh
-systems.
diff --git a/win/cat.c b/win/cat.c
deleted file mode 100644
index cdd83a5..0000000
--- a/win/cat.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * cat.c --
- *
- *	Program used when testing tclWinPipe.c
- *
- * Copyright (c) 1996 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: cat.c,v 1.2 1998/09/14 18:40:19 stanton Exp $
- */
-
-#include <stdio.h>
-#include <io.h>
-#include <string.h>
-
-int
-main()
-{   
-    char buf[1024];
-    int n;
-    char *err;
-
-    while (1) {
-	n = read(0, buf, sizeof(buf));
-	if (n <= 0) {
-	    break;
-	}
-        write(1, buf, n);
-    }
-    err = (sizeof(int) == 2) ? "stderr16" : "stderr32";
-    write(2, err, strlen(err));
-
-    return 0;
-}
-	
diff --git a/win/makefile.vc b/win/makefile.vc
deleted file mode 100644
index 25edd12..0000000
--- a/win/makefile.vc
+++ /dev/null
@@ -1,577 +0,0 @@
-# Visual C++ 2.x and 4.0 makefile
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-#
-# RCS: @(#) $Id: makefile.vc,v 1.26 1999/04/16 00:48:07 stanton Exp $
-
-# Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from 
-# location of the compiler directories.
-
-#
-# Project directories
-#
-# ROOT	  = top of source tree
-#
-# TOOLS32 = location of VC++ 32-bit development tools. Note that the
-#	    VC++ 2.0 header files are broken, so you need to use the
-#	    ones that come with the developer network CD's, or later
-#	    versions of VC++.
-#
-# TOOLS16 = location of VC++ 1.5 16-bit tools, needed to build thunking
-#	    library.  This information is optional; if the 16-bit compiler
-#	    is not available, then the 16-bit code will not be built.  
-#	    Tcl will still run without the 16-bit code, but...
-#		A. Under Windows 3.X any calls to the exec command
-#		   will return an error.
-#		B. A 16-bit program to test the behavior of the exec
-#		   command under NT and 95 will not be built.
-# INSTALLDIR = where the install- targets should copy the binaries and
-#	    support files
-#
-
-ROOT		= ..
-TOOLS32		= c:\program files\devstudio\vc
-TOOLS32_rc	= c:\program files\devstudio\sharedide
-TOOLS16		= c:\msvc
-
-INSTALLDIR	= c:\program files\Tcl
-
-# Set this to the appropriate value of /MACHINE: for your platform
-MACHINE	= IX86
-
-# Uncomment the following line to compile with thread support
-#THREADDEFINES = -DTCL_THREADS=1
-
-# Set NODEBUG to 0 to compile with symbols
-NODEBUG = 1
-
-# The following defines can be used to control the amount of debugging
-# code that is added to the compilation.
-#
-#	-DTCL_MEM_DEBUG		Enables the debugging memory allocator.
-#	-DTCL_COMPILE_DEBUG	Enables byte compilation logging.
-#	-DTCL_COMPILE_STATS	Enables byte compilation statistics gathering.
-#	-DUSE_TCLALLOC=0	Disables the Tcl memory allocator in favor
-#				of the native malloc implementation.  This is
-#				needed when using Purify.
-#
-#DEBUGDEFINES = -DTCL_MEM_DEBUG -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-#DEBUGDEFINES = -DUSE_TCLALLOC=0
-
-######################################################################
-# Do not modify below this line
-######################################################################
-
-NAMEPREFIX = tcl
-STUBPREFIX = $(NAMEPREFIX)stub
-DOTVERSION = 8.1
-VERSION = 81
-
-BINROOT		= .
-!IF "$(NODEBUG)" == "1"
-TMPDIRNAME	= Release
-DBGX		=
-!ELSE
-TMPDIRNAME	= Debug
-DBGX		= d
-!ENDIF
-TMPDIR		= $(BINROOT)\$(TMPDIRNAME)
-OUTDIRNAME	= $(TMPDIRNAME)
-OUTDIR		= $(TMPDIR)
-
-TCLLIB		= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)$(DBGX).lib
-TCLDLLNAME	= $(NAMEPREFIX)$(VERSION)$(DBGX).dll
-TCLDLL		= $(OUTDIR)\$(TCLDLLNAME)
-
-TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION)$(DBGX).lib
-TCLSTUBLIB	= $(OUTDIR)\$(TCLSTUBLIBNAME)
-
-TCLPLUGINLIB	= $(OUTDIR)\$(NAMEPREFIX)$(VERSION)p$(DBGX).lib
-TCLPLUGINDLLNAME= $(NAMEPREFIX)$(VERSION)p$(DBGX).dll
-TCLPLUGINDLL	= $(OUTDIR)\$(TCLPLUGINDLLNAME)
-TCL16DLL	= $(OUTDIR)\$(NAMEPREFIX)16$(VERSION)$(DBGX).dll
-TCLSH		= $(OUTDIR)\$(NAMEPREFIX)sh$(VERSION)$(DBGX).exe
-TCLSHP		= $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
-TCLPIPEDLLNAME	= $(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
-TCLPIPEDLL	= $(OUTDIR)\$(TCLPIPEDLLNAME)
-TCLREGDLLNAME	= $(NAMEPREFIX)reg$(VERSION)$(DBGX).dll
-TCLREGDLL	= $(OUTDIR)\$(TCLREGDLLNAME)
-TCLDDEDLLNAME	= $(NAMEPREFIX)dde$(VERSION)$(DBGX).dll
-TCLDDEDLL	= $(OUTDIR)\$(TCLDDEDLLNAME)
-TCLTEST		= $(OUTDIR)\$(NAMEPREFIX)test.exe
-DUMPEXTS	= $(TMPDIR)\dumpexts.exe
-CAT16		= $(TMPDIR)\cat16.exe
-CAT32		= $(TMPDIR)\cat32.exe
-RMDIR		= .\rmd.bat
-MKDIR		= .\mkd.bat
-RM		= del
-
-LIB_INSTALL_DIR	= $(INSTALLDIR)\lib
-BIN_INSTALL_DIR	= $(INSTALLDIR)\bin
-SCRIPT_INSTALL_DIR	= $(INSTALLDIR)\lib\tcl$(DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(INSTALLDIR)\include
-
-TCLSHOBJS = \
-	$(TMPDIR)\tclAppInit.obj
-
-TCLTESTOBJS = \
-	$(TMPDIR)\tclTest.obj \
-	$(TMPDIR)\tclTestObj.obj \
-	$(TMPDIR)\tclTestProcBodyObj.obj \
-	$(TMPDIR)\tclThreadTest.obj \
-	$(TMPDIR)\tclWinTest.obj \
-	$(TMPDIR)\testMain.obj
-
-TCLOBJS = \
-	$(TMPDIR)\regcomp.obj \
-	$(TMPDIR)\regexec.obj \
-	$(TMPDIR)\regfree.obj \
-	$(TMPDIR)\regerror.obj \
-	$(TMPDIR)\strftime.obj \
-	$(TMPDIR)\tclAlloc.obj \
-	$(TMPDIR)\tclAsync.obj \
-	$(TMPDIR)\tclBasic.obj \
-	$(TMPDIR)\tclBinary.obj \
-	$(TMPDIR)\tclCkalloc.obj \
-	$(TMPDIR)\tclClock.obj \
-	$(TMPDIR)\tclCmdAH.obj \
-	$(TMPDIR)\tclCmdIL.obj \
-	$(TMPDIR)\tclCmdMZ.obj \
-	$(TMPDIR)\tclCompCmds.obj \
-	$(TMPDIR)\tclCompExpr.obj \
-	$(TMPDIR)\tclCompile.obj \
-	$(TMPDIR)\tclDate.obj \
-	$(TMPDIR)\tclEncoding.obj \
-	$(TMPDIR)\tclEnv.obj \
-	$(TMPDIR)\tclEvent.obj \
-	$(TMPDIR)\tclExecute.obj \
-	$(TMPDIR)\tclFCmd.obj \
-	$(TMPDIR)\tclFileName.obj \
-	$(TMPDIR)\tclGet.obj \
-	$(TMPDIR)\tclHash.obj \
-	$(TMPDIR)\tclHistory.obj \
-	$(TMPDIR)\tclIndexObj.obj \
-	$(TMPDIR)\tclInterp.obj \
-	$(TMPDIR)\tclIO.obj \
-	$(TMPDIR)\tclIOCmd.obj \
-	$(TMPDIR)\tclIOSock.obj \
-	$(TMPDIR)\tclIOUtil.obj \
-	$(TMPDIR)\tclLink.obj \
-	$(TMPDIR)\tclLiteral.obj \
-	$(TMPDIR)\tclListObj.obj \
-	$(TMPDIR)\tclLoad.obj \
-	$(TMPDIR)\tclMain.obj \
-	$(TMPDIR)\tclNamesp.obj \
-	$(TMPDIR)\tclNotify.obj \
-	$(TMPDIR)\tclObj.obj \
-	$(TMPDIR)\tclPanic.obj \
-	$(TMPDIR)\tclParse.obj \
-	$(TMPDIR)\tclParseExpr.obj \
-	$(TMPDIR)\tclPipe.obj \
-	$(TMPDIR)\tclPkg.obj \
-	$(TMPDIR)\tclPosixStr.obj \
-	$(TMPDIR)\tclPreserve.obj \
-	$(TMPDIR)\tclProc.obj \
-	$(TMPDIR)\tclRegexp.obj \
-	$(TMPDIR)\tclResolve.obj \
-	$(TMPDIR)\tclResult.obj \
-	$(TMPDIR)\tclScan.obj \
-	$(TMPDIR)\tclStringObj.obj \
-	$(TMPDIR)\tclStubInit.obj \
-	$(TMPDIR)\tclStubLib.obj \
-	$(TMPDIR)\tclThread.obj \
-	$(TMPDIR)\tclTimer.obj \
-	$(TMPDIR)\tclUtf.obj \
-	$(TMPDIR)\tclUtil.obj \
-	$(TMPDIR)\tclVar.obj \
-	$(TMPDIR)\tclWin32Dll.obj \
-	$(TMPDIR)\tclWinChan.obj \
-	$(TMPDIR)\tclWinConsole.obj \
-	$(TMPDIR)\tclWinSerial.obj \
-	$(TMPDIR)\tclWinError.obj \
-	$(TMPDIR)\tclWinFCmd.obj \
-	$(TMPDIR)\tclWinFile.obj \
-	$(TMPDIR)\tclWinInit.obj \
-	$(TMPDIR)\tclWinLoad.obj \
-	$(TMPDIR)\tclWinMtherr.obj \
-	$(TMPDIR)\tclWinNotify.obj \
-	$(TMPDIR)\tclWinPipe.obj \
-	$(TMPDIR)\tclWinSock.obj \
-	$(TMPDIR)\tclWinThrd.obj \
-	$(TMPDIR)\tclWinTime.obj 
-
-TCLSTUBOBJS = $(TMPDIR)\tclStubLib.obj \
-
-cc32		= "$(TOOLS32)\bin\cl.exe"
-link32		= "$(TOOLS32)\bin\link.exe"
-rc32		= "$(TOOLS32_rc)\bin\rc.exe"
-include32	= -I"$(TOOLS32)\include"
-lib32		= "$(TOOLS32)\bin\lib.exe"
-
-cc16		= "$(TOOLS16)\bin\cl.exe"
-link16		= "$(TOOLS16)\bin\link.exe"
-rc16		= "$(TOOLS16)\bin\rc.exe"
-include16	= -I"$(TOOLS16)\include"
-
-WINDIR		= $(ROOT)\win
-GENERICDIR	= $(ROOT)\generic
-
-TCL_INCLUDES	= -I$(WINDIR) -I$(GENERICDIR)
-TCL_DEFINES	= -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES)
-
-TCL_CFLAGS	= $(cdebug) $(cflags) $(cvarsdll) $(include32) \
-			$(TCL_INCLUDES) $(TCL_DEFINES)
-CON_CFLAGS	= $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
-DOS_CFLAGS	= $(cdebug) $(cflags) $(include16) -AL 
-DLL16_CFLAGS	= $(cdebug) $(cflags) $(include16) -ALw
-
-######################################################################
-# Link flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-ldebug = /RELEASE
-!ELSE
-ldebug = -debug:full -debugtype:cv
-!ENDIF
-
-# declarations common to all linker options
-lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
-
-# declarations for use on Intel i386, i486, and Pentium systems
-!IF "$(MACHINE)" == "IX86"
-DLLENTRY = @12
-lflags	 = $(lcommon) /MACHINE:$(MACHINE)
-!ELSE
-lflags	 = $(lcommon) /MACHINE:$(MACHINE)
-!ENDIF
-
-conlflags = $(lflags) -subsystem:console -entry:mainCRTStartup
-guilflags = $(lflags) -subsystem:windows -entry:WinMainCRTStartup
-dlllflags = $(lflags) -entry:_DllMainCRTStartup$(DLLENTRY) -dll
-
-!IF "$(MACHINE)" == "PPC"
-libc = libc$(DBGX).lib
-libcdll = crtdll$(DBGX).lib
-!ELSE
-libc = libc$(DBGX).lib oldnames.lib
-libcdll = msvcrt$(DBGX).lib oldnames.lib
-!ENDIF
-
-baselibs   = kernel32.lib $(optlibs) advapi32.lib user32.lib
-winlibs	   = $(baselibs) gdi32.lib comdlg32.lib winspool.lib
-
-guilibs	   = $(libc) $(winlibs)
-conlibs	   = $(libc) $(baselibs)
-guilibsdll = $(libcdll) $(winlibs)
-conlibsdll = $(libcdll) $(baselibs)
-
-######################################################################
-# Compile flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-# This cranks the optimization level to maximize speed
-cdebug = -O2 -Gs -GD
-!ELSE
-cdebug = -Z7 -Od -WX
-!ENDIF
-
-# declarations common to all compiler options
-ccommon = -c -W3 -nologo -YX -Fp$(TMPDIR)\ -Dtry=__try -Dexcept=__except
-
-!IF "$(MACHINE)" == "IX86"
-cflags = $(ccommon) -D_X86_=1
-!ELSE
-!IF "$(MACHINE)" == "MIPS"
-cflags = $(ccommon) -D_MIPS_=1
-!ELSE
-!IF "$(MACHINE)" == "PPC"
-cflags = $(ccommon) -D_PPC_=1
-!ELSE
-!IF "$(MACHINE)" == "ALPHA"
-cflags = $(ccommon) -D_ALPHA_=1
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-cvars	   = -DWIN32 -D_WIN32
-cvarsmt	   = $(cvars) -D_MT
-cvarsdll   = $(cvarsmt) -D_DLL
-
-!IF "$(NODEBUG)" == "1"
-cvarsdll   = $(cvars) -MD
-!ELSE
-cvarsdll   = $(cvars) -MDd
-!ENDIF
-
-######################################################################
-# Project specific targets
-######################################################################
-
-release:    setup $(TCLSH) dlls
-dlls:	    setup $(TCL16DLL) $(TCLPIPEDLL) $(TCLREGDLL) $(TCLDDEDLL)
-all:	    setup $(TCLSH) dlls $(CAT16) $(CAT32) 
-tcltest:    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
-plugin:	    setup $(TCLPLUGINDLL) $(TCLSHP)
-install:    install-binaries install-libraries
-test:	    setup $(TCLTEST) dlls $(CAT16) $(CAT32)
-	copy $(WINDIR)\pkgIndex.tcl $(OUTDIR)
-	set TCL_LIBRARY=$(ROOT)/library
-	$(TCLTEST) << "$(TCLREGDLL)"
-		load [lindex $$argv 0] registry
-		source $(ROOT)/tests/all.tcl
-<<
-
-setup:
-	@$(MKDIR) $(TMPDIR)
-	@$(MKDIR) $(OUTDIR)
-
-$(DUMPEXTS): $(WINDIR)\winDumpExts.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \
-		$(TMPDIR)\winDumpExts.obj 
-
-$(TCLLIB): $(TCLDLL)
-
-$(TCLDLL): $(TCLOBJS) $(TMPDIR)\tcl.def $(TMPDIR)\tcl.res
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tcl.def \
-		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @<<
-$(TCLOBJS)
-<<
-
-$(TCLSTUBLIB): $(TCLSTUBOBJS)
-	$(lib32) /out:$@ $(TCLSTUBOBJS)
-
-$(TCLPLUGINLIB): $(TCLPLUGINDLL)
-
-$(TCLPLUGINDLL): $(TCLOBJS) $(TMPDIR)\plugin.def $(TMPDIR)\tcl.res
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\plugin.def \
-		-out:$@ $(TMPDIR)\tcl.res $(guilibsdll) @<<
-$(TCLOBJS)
-<<
-
-$(TCLSH): $(TCLSHOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLLIB) $(TCLSHOBJS) 
-
-$(TCLSHP): $(TCLSHOBJS) $(TCLPLUGINLIB) $(TMPDIR)\tclsh.res
-	set LIB=$(TOOLS32)\lib
-	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		-out:$@ $(conlibsdll) $(TCLPLUGINLIB) $(TCLSHOBJS) 
-
-$(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\tclsh.res
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(conlflags) $(TMPDIR)\tclsh.res -stack:2300000 \
-		 -out:$@ $(conlibsdll) $(TCLLIB) $(TCLTESTOBJS)
-
-$(TCL16DLL):  $(WINDIR)\tcl16.rc $(WINDIR)\tclWin16.c
-	if exist $(cc16) $(cc16) @<<
-$(DLL16_CFLAGS) -Fo$(TMPDIR)\ $(WINDIR)\tclWin16.c
-<<			   
-	@copy << $(TMPDIR)\tclWin16.def > nul
-LIBRARY $(@B);dll
-EXETYPE WINDOWS
-CODE PRELOAD MOVEABLE DISCARDABLE
-DATA PRELOAD MOVEABLE SINGLE
-HEAPSIZE 1024 
-EXPORTS
-	WEP @1 RESIDENTNAME
-	UTPROC @2 
-<< 
-	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOE @<<
-$(TMPDIR)\tclWin16.obj
-$@
-nul
-$(TOOLS16)\lib\ ldllcew oldnames libw toolhelp
-$(TMPDIR)\tclWin16.def
-<<
-	if exist $(cc16) $(rc16) -i $(GENERICDIR) $(TCL_DEFINES) $(WINDIR)\tcl16.rc $@
-
-$(TCLPIPEDLL): $(WINDIR)\stub16.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $(WINDIR)\stub16.c
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(conlflags) -out:$@ $(TMPDIR)\stub16.obj $(guilibs)
-
-$(TCLDDEDLL): $(TMPDIR)\tclWinDde.obj $(TCLSTUBLIB)
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(dlllflags) -out:$@ $(TMPDIR)\tclWinDde.obj \
-		$(conlibsdll) $(TCLSTUBLIB)
-
-$(TCLREGDLL): $(TMPDIR)\tclWinReg.obj $(TCLSTUBLIB)
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(ldebug) $(dlllflags) -out:$@ $(TMPDIR)\tclWinReg.obj \
-		$(conlibsdll) $(TCLSTUBLIB)
-
-$(CAT32): $(WINDIR)\cat.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB="$(TOOLS32)\lib"
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)
-
-$(CAT16): $(WINDIR)\cat.c
-	if exist $(cc16) $(cc16) $(DOS_CFLAGS) -Fo$(TMPDIR)\ $?
-	set LIB=$(TOOLS16)\lib
-	if exist $(cc16) $(link16) /NOLOGO /ONERROR:NOEXE /NOI /STACK:16384 \
-		$(TMPDIR)\cat.obj,$@,nul,llibce.lib,nul
-
-$(TMPDIR)\tcl.def: $(DUMPEXTS) $(TCLOBJS)
-	$(DUMPEXTS) -o $@ $(TCLDLLNAME) @<<
-$(TCLOBJS)
-<<
-
-$(TMPDIR)\plugin.def: $(DUMPEXTS) $(TCLOBJS)
-	$(DUMPEXTS) -o $@ $(TCLPLUGINDLLNAME) @<<
-$(TCLOBJS)
-<<
-
-install-binaries: $(TCLSH)
-	$(MKDIR) "$(BIN_INSTALL_DIR)"
-	$(MKDIR) "$(LIB_INSTALL_DIR)"
-	@echo installing $(TCLDLLNAME)
-	@copy "$(TCLDLL)" "$(BIN_INSTALL_DIR)"
-	@copy "$(TCLLIB)" "$(LIB_INSTALL_DIR)"
-	@echo installing "$(TCLSH)"
-	@copy "$(TCLSH)" "$(BIN_INSTALL_DIR)"
-	@echo installing $(TCLPIPEDLLNAME)
-	@copy "$(TCLPIPEDLL)" "$(BIN_INSTALL_DIR)"
-	@echo installing $(TCLREGDLLNAME)
-	@copy "$(TCLREGDLL)" "$(LIB_INSTALL_DIR)"
-	@echo installing $(TCLDDEDLLNAME)
-	@copy "$(TCLDDEDLL)" "$(LIB_INSTALL_DIR)"
-	@echo installing $(TCLSTUBLIBNAME)
-	@copy "$(TCLSTUBLIB)" "$(LIB_INSTALL_DIR)"
-
-install-libraries:
-	-@$(MKDIR) "$(LIB_INSTALL_DIR)"
-	-@$(MKDIR) "$(INCLUDE_INSTALL_DIR)"
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)"
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
-	@copy << "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-package ifneeded registry 1.0 "load [list [file join $$dir .. $(TCLREGDLLNAME)]] registry"
-package ifneeded dde 1.0 "load [list [file join $$dir .. $(TCLDDEDLLNAME)]] dde"
-<<
-	-@copy "$(ROOT)\library\http1.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http1.0"
-	-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.0"
-	-@copy "$(ROOT)\library\http2.0\http.tcl"     "$(SCRIPT_INSTALL_DIR)\http2.0"
-	-@copy "$(ROOT)\library\http2.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.0"
-	-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(ROOT)\library\opt0.4\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
-	-@copy "$(GENERICDIR)\tcl.h"         "$(INCLUDE_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\history.tcl" "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\init.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\ldAout.tcl"  "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\parray.tcl"  "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\safe.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\tclIndex"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\package.tcl" "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\word.tcl"    "$(SCRIPT_INSTALL_DIR)"
-	-@copy "$(ROOT)\library\auto.tcl"    "$(SCRIPT_INSTALL_DIR)"
-
-#
-# Regenerate the stubs files.
-#
-
-genstubs:
-	tclsh$(VERSION) $(ROOT)\tools\genStubs.tcl $(GENERICDIR) \
-		$(GENERICDIR)\tcl.decls $(GENERICDIR)\tclInt.decls
-
-#
-# Special case object file targets
-#
-
-$(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c
-	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) $(EXTFLAGS) -Fo$(TMPDIR)\ $?
-
-$(TMPDIR)\testMain.obj: $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -DTCL_TEST -Fo$(TMPDIR)\testMain.obj $?
-
-$(TMPDIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMPDIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMPDIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-$(TMPDIR)\tclAppInit.obj : $(WINDIR)\tclAppInit.c
-	$(cc32) $(TCL_CFLAGS) -Fo$@ $?
-
-# The following objects should be built using the stub interfaces
-
-$(TMPDIR)\tclWinReg.obj : $(WINDIR)\tclWinReg.c
-	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -Fo$@ $?
-
-$(TMPDIR)\tclWinDde.obj : $(WINDIR)\tclWinDde.c
-	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -Fo$@ $?
-
-# The following objects are part of the stub library and should not
-# be built as DLL objects but none of the symbols should be exported
-
-$(TMPDIR)\tclStubLib.obj : $(GENERICDIR)\tclStubLib.c
-	$(cc32) $(TCL_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
-
-
-# Dedependency rules
-
-$(GENERICDIR)\regcomp.c: \
-	$(GENERICDIR)\regguts.h \
-	$(GENERICDIR)\regc_lex.c \
-	$(GENERICDIR)\regc_color.c \
-	$(GENERICDIR)\regc_nfa.c \
-	$(GENERICDIR)\regc_cvec.c \
-	$(GENERICDIR)\regc_locale.c
-$(GENERICDIR)\regcustom.h: \
-	$(GENERICDIR)\tclInt.h \
-	$(GENERICDIR)\tclPort.h \
-	$(GENERICDIR)\regex.h
-$(GENERICDIR)\regexec.c: \
-	$(GENERICDIR)\rege_dfa.c \
-	$(GENERICDIR)\regguts.h
-$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
-
-#
-# Implicit rules
-#
-
-{$(WINDIR)}.c{$(TMPDIR)}.obj:
-    $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
-    $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(ROOT)\compat}.c{$(TMPDIR)}.obj:
-    $(cc32) -DBUILD_tcl $(TCL_CFLAGS) -Fo$(TMPDIR)\ $<
-
-{$(WINDIR)}.rc{$(TMPDIR)}.res:
-	$(rc32) -fo $@ -r -i $(GENERICDIR) -i $(WINDIR) -D__WIN32__ \
-		$(TCL_DEFINES) $<
-
-clean:
-	-@$(RM) $(OUTDIR)\*.exp 
-	-@$(RM) $(OUTDIR)\*.lib 
-	-@$(RM) $(OUTDIR)\*.dll 
-	-@$(RM) $(OUTDIR)\*.exe
-	-@$(RM) $(OUTDIR)\*.pdb
-	-@$(RM) $(TMPDIR)\*.pch
-	-@$(RM) $(TMPDIR)\*.obj
-	-@$(RM) $(TMPDIR)\*.res
-	-@$(RM) $(TMPDIR)\*.def
-	-@$(RM) $(TMPDIR)\*.exe
-	-@$(RMDIR) $(OUTDIR)
-	-@$(RMDIR) $(TMPDIR)
diff --git a/win/mkd.bat b/win/mkd.bat
deleted file mode 100644
index 1e78fc4..0000000
--- a/win/mkd.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-rem RCS: @(#) $Id: mkd.bat,v 1.4 1998/09/30 20:19:35 escoffon Exp $
-
-if exist %1\tag.txt goto end
-
-if "%OS%" == "Windows_NT" goto winnt
-
-md %1
-if errorlevel 1 goto end
-
-goto success
-
-:winnt
-md %1
-if errorlevel 1 goto end
-
-:success
-echo TAG >%1\tag.txt
-echo created directory %1
-
-:end
diff --git a/win/pkgIndex.tcl b/win/pkgIndex.tcl
deleted file mode 100644
index 6c7570a..0000000
--- a/win/pkgIndex.tcl
+++ /dev/null
@@ -1,12 +0,0 @@
-# Tcl package index file, version 1.0
-# This file contains package information for Windows-specific extensions.
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# RCS: @(#) $Id: pkgIndex.tcl,v 1.3 1999/04/16 00:48:07 stanton Exp $
-
-package ifneeded registry 1.0 [list tclPkgSetup $dir registry 1.0 {{tclreg81.dll load registry}}]
-package ifneeded dde 1.0 [list tclPkgSetup $dir dde 1.0 {{tcldde81.dll load dde}}]
diff --git a/win/rmd.bat b/win/rmd.bat
deleted file mode 100644
index 8465b5d..0000000
--- a/win/rmd.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-rem RCS: @(#) $Id: rmd.bat,v 1.4 1998/09/30 20:19:46 escoffon Exp $
-
-if not exist %1\tag.txt goto end
-
-echo Removing directory %1
-
-if "%OS%" == "Windows_NT" goto winnt
-
-cd %1
-if errorlevel 1 goto end
-del *.*
-cd ..
-rmdir %1
-if errorlevel 1 goto end
-goto success
-
-:winnt
-rmdir %1 /s /q
-if errorlevel 1 goto end
-
-:success
-echo deleted directory %1
-
-:end
diff --git a/win/stub16.c b/win/stub16.c
deleted file mode 100644
index 44e18d6..0000000
--- a/win/stub16.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* 
- * stub16.c 
- *
- *	A helper program used for running 16-bit DOS applications under
- *	Windows 95.
- *
- * Copyright (c) 1996 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: stub16.c,v 1.2 1998/09/14 18:40:19 stanton Exp $
- */
-
-#define STRICT
-
-#include <windows.h>
-#include <stdio.h>
-
-static HANDLE		CreateTempFile(void);
-
-/*
- *---------------------------------------------------------------------------
- *
- * main
- *
- *	Entry point for the 32-bit console mode app used by Windows 95 to
- *	help run the 16-bit program specified on the command line.
- *
- *	1. EOF on a pipe that connects a detached 16-bit process and a
- *	32-bit process is never seen.  So, this process runs the 16-bit
- *	process _attached_, and then it is run detached from the calling
- *	32-bit process.  
- * 
- *	2. If a 16-bit process blocks reading from or writing to a pipe,
- *	it never wakes up, and eventually brings the whole system down
- *	with it if you try to kill the process.  This app simulates
- *	pipes.  If any of the stdio handles is a pipe, this program
- *	accumulates information into temp files and forwards it to or
- *	from the DOS application as appropriate.  This means that this
- *	program must receive EOF from a stdin pipe before it will actually
- *	start the DOS app, and the DOS app must finish generating stdout
- *	or stderr before the data will be sent to the next stage of the
- *	pipe.  If the stdio handles are not pipes, no accumulation occurs
- *	and the data is passed straight through to and from the DOS
- *	application.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The child process is created and this process waits for it to
- *	complete.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-main()
-{
-    DWORD dwRead, dwWrite;
-    char *cmdLine;
-    HANDLE hStdInput, hStdOutput, hStdError;
-    HANDLE hFileInput, hFileOutput, hFileError;
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    char buf[8192];
-    DWORD result;
-
-    hFileInput = INVALID_HANDLE_VALUE;
-    hFileOutput = INVALID_HANDLE_VALUE;
-    hFileError = INVALID_HANDLE_VALUE;
-    result = 1;
-
-    /*
-     * Don't get command line from argc, argv, because the command line
-     * tokenizer will have stripped off all the escape sequences needed
-     * for quotes and backslashes, and then we'd have to put them all
-     * back in again.  Get the raw command line and parse off what we
-     * want ourselves.  The command line should be of the form:
-     *
-     * stub16.exe program arg1 arg2 ...
-     */
-
-    cmdLine = strchr(GetCommandLine(), ' ');
-    if (cmdLine == NULL) {
-	return 1;
-    }
-    cmdLine++;
-
-    hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-    hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
-    if (GetFileType(hStdInput) == FILE_TYPE_PIPE) {
-	hFileInput = CreateTempFile();
-	if (hFileInput == INVALID_HANDLE_VALUE) {
-	    goto cleanup;
-	}
-	while (ReadFile(hStdInput, buf, sizeof(buf), &dwRead, NULL) != FALSE) {
-	    if (dwRead == 0) {
-		break;
-	    }
-	    if (WriteFile(hFileInput, buf, dwRead, &dwWrite, NULL) == FALSE) {
-		goto cleanup;
-	    }
-	}
-	SetFilePointer(hFileInput, 0, 0, FILE_BEGIN);
-	SetStdHandle(STD_INPUT_HANDLE, hFileInput);
-    }
-    if (GetFileType(hStdOutput) == FILE_TYPE_PIPE) {
-	hFileOutput = CreateTempFile();
-	if (hFileOutput == INVALID_HANDLE_VALUE) {
-	    goto cleanup;
-	}
-	SetStdHandle(STD_OUTPUT_HANDLE, hFileOutput);
-    }
-    if (GetFileType(hStdError) == FILE_TYPE_PIPE) {
-	hFileError = CreateTempFile();
-	if (hFileError == INVALID_HANDLE_VALUE) {
-	    goto cleanup;
-	}
-	SetStdHandle(STD_ERROR_HANDLE, hFileError);
-    }
-
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-    if (CreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0, NULL, NULL, &si, 
-	    &pi) == FALSE) {
-	goto cleanup;
-    }
-
-    WaitForInputIdle(pi.hProcess, 5000);
-    WaitForSingleObject(pi.hProcess, INFINITE);
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-    result = 0;
-
-    if (hFileOutput != INVALID_HANDLE_VALUE) {
-	SetFilePointer(hFileOutput, 0, 0, FILE_BEGIN);
-	while (ReadFile(hFileOutput, buf, sizeof(buf), &dwRead, NULL) != FALSE) {
-	    if (dwRead == 0) {
-		break;
-	    }
-	    if (WriteFile(hStdOutput, buf, dwRead, &dwWrite, NULL) == FALSE) {
-		break;
-	    }
-	}
-    }
-    if (hFileError != INVALID_HANDLE_VALUE) {
-	SetFilePointer(hFileError, 0, 0, FILE_BEGIN);
-	while (ReadFile(hFileError, buf, sizeof(buf), &dwRead, NULL) != FALSE) {
-	    if (dwRead == 0) {
-		break;
-	    }
-	    if (WriteFile(hStdError, buf, dwRead, &dwWrite, NULL) == FALSE) {
-		break;
-	    }
-	}
-    }
-
-cleanup:
-    if (hFileInput != INVALID_HANDLE_VALUE) {
-	CloseHandle(hFileInput);
-    }
-    if (hFileOutput != INVALID_HANDLE_VALUE) {
-	CloseHandle(hFileOutput);
-    }
-    if (hFileError != INVALID_HANDLE_VALUE) {
-	CloseHandle(hFileError);
-    }
-    CloseHandle(hStdInput);
-    CloseHandle(hStdOutput);
-    CloseHandle(hStdError);
-    ExitProcess(result);
-    return 1;
-}
-
-static HANDLE
-CreateTempFile()
-{
-    char name[MAX_PATH];
-    SECURITY_ATTRIBUTES sa;
-
-    if (GetTempPath(sizeof(name), name) == 0) {
-	return INVALID_HANDLE_VALUE;
-    }
-    if (GetTempFileName(name, "tcl", 0, name) == 0) {
-	return INVALID_HANDLE_VALUE;
-    }
-
-    sa.nLength = sizeof(sa);
-    sa.lpSecurityDescriptor = NULL;
-    sa.bInheritHandle = TRUE;
-    return CreateFile(name, GENERIC_READ | GENERIC_WRITE, 0, &sa, 
-	    CREATE_ALWAYS, FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE,
-	    NULL);
-}
diff --git a/win/tcl.rc b/win/tcl.rc
deleted file mode 100644
index 49f9316..0000000
--- a/win/tcl.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-// RCS: @(#) $Id: tcl.rc,v 1.3 1999/04/16 00:48:07 stanton Exp $
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <tcl.h>
-
-LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 	TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- FILEFLAGSMASK 	0x3fL
- FILEFLAGS 	0x0L
- FILEOS 	0x4	/* VOS__WINDOWS32 */
- FILETYPE 	0x2	/* VFT_DLL */
- FILESUBTYPE 	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */
-        BEGIN
-            VALUE "FileDescription", "Tcl DLL\0"
-            VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".dll\0"
-            VALUE "CompanyName", "Sun Microsystems, Inc\0"
-            VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright (c) 1995-1997\0"
-            VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
-            VALUE "ProductVersion", TCL_PATCH_LEVEL
-        END		    
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-
-
-
-
-
diff --git a/win/tcl16.rc b/win/tcl16.rc
deleted file mode 100644
index 5c44d95..0000000
--- a/win/tcl16.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-// RCS: @(#) $Id: tcl16.rc,v 1.2 1998/09/14 18:40:19 stanton Exp $
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <tcl.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 	TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- FILEFLAGSMASK 	0x3fL
- FILEFLAGS 	0x0L
- FILEOS 	0x1L
- FILETYPE	0x2L
- FILESUBTYPE 	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Tcl16 DLL, 16-bit thunking module\0"
-            VALUE "OriginalFilename", "tcl16" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".dll\0"
-            VALUE "CompanyName", "Sun Microsystems, Inc\0"
-            VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright \251 1995-1996\0"
-            VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
-            VALUE "ProductVersion", TCL_PATCH_LEVEL
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
deleted file mode 100644
index d157656..0000000
--- a/win/tclAppInit.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* 
- * tclAppInit.c --
- *
- *	Provides a default version of the main program and Tcl_AppInit
- *	procedure for Tcl applications (without Tk).  Note that this
- *	program must be built in Win32 console mode to work properly.
- *
- * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclAppInit.c,v 1.5 1999/04/16 00:48:07 stanton Exp $
- */
-
-#include "tcl.h"
-#include <windows.h>
-#include <locale.h>
-
-#ifdef TCL_TEST
-extern int		Procbodytest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Procbodytest_SafeInit _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-extern int		TclObjTest_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#ifdef TCL_THREADS
-extern int		TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp));
-#endif
-#endif /* TCL_TEST */
-
-static void		setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr));
-
-
-/*
- *----------------------------------------------------------------------
- *
- * main --
- *
- *	This is the main program for the application.
- *
- * Results:
- *	None: Tcl_Main never returns here, so this procedure never
- *	returns either.
- *
- * Side effects:
- *	Whatever the application does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-main(argc, argv)
-    int argc;			/* Number of command-line arguments. */
-    char **argv;		/* Values of command-line arguments. */
-{
-    /*
-     * Set up the default locale to be standard "C" locale so parsing
-     * is performed correctly.
-     */
-
-    setlocale(LC_ALL, "C");
-    setargv(&argc, &argv);
-
-    Tcl_Main(argc, argv, Tcl_AppInit);
-    return 0;			/* Needed only to prevent compiler warning. */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AppInit --
- *
- *	This procedure performs application-specific initialization.
- *	Most applications, especially those that incorporate additional
- *	packages, will have their own version of this procedure.
- *
- * Results:
- *	Returns a standard Tcl completion code, and leaves an error
- *	message in the interp's result if an error occurs.
- *
- * Side effects:
- *	Depends on the startup script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_AppInit(interp)
-    Tcl_Interp *interp;		/* Interpreter for application. */
-{
-    if (Tcl_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-
-#ifdef TCL_TEST
-    if (Tcltest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init,
-            (Tcl_PackageInitProc *) NULL);
-    if (TclObjTest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#ifdef TCL_THREADS
-    if (TclThread_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-#endif
-    if (Procbodytest_Init(interp) == TCL_ERROR) {
-	return TCL_ERROR;
-    }
-    Tcl_StaticPackage(interp, "procbodytest", Procbodytest_Init,
-            Procbodytest_SafeInit);
-#endif /* TCL_TEST */
-
-    /*
-     * Call the init procedures for included packages.  Each call should
-     * look like this:
-     *
-     * if (Mod_Init(interp) == TCL_ERROR) {
-     *     return TCL_ERROR;
-     * }
-     *
-     * where "Mod" is the name of the module.
-     */
-
-    /*
-     * Call Tcl_CreateCommand for application-specific commands, if
-     * they weren't already created by the init procedures called above.
-     */
-
-    /*
-     * Specify a user-specific startup file to invoke if the application
-     * is run interactively.  Typically the startup file is "~/.apprc"
-     * where "app" is the name of the application.  If this line is deleted
-     * then no user-specific startup file will be run under any conditions.
-     */
-
-    Tcl_SetVar(interp, "tcl_rcFileName", "~/tclshrc.tcl", TCL_GLOBAL_ONLY);
-    return TCL_OK;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * setargv --
- *
- *	Parse the Windows command line string into argc/argv.  Done here
- *	because we don't trust the builtin argument parser in crt0.  
- *	Windows applications are responsible for breaking their command
- *	line into arguments.
- *
- *	2N backslashes + quote -> N backslashes + begin quoted string
- *	2N + 1 backslashes + quote -> literal
- *	N backslashes + non-quote -> literal
- *	quote + quote in a quoted string -> single quote
- *	quote + quote not in quoted string -> empty string
- *	quote -> begin quoted string
- *
- * Results:
- *	Fills argcPtr with the number of arguments and argvPtr with the
- *	array of arguments.
- *
- * Side effects:
- *	Memory allocated.
- *
- *--------------------------------------------------------------------------
- */
-
-static void
-setargv(argcPtr, argvPtr)
-    int *argcPtr;		/* Filled with number of argument strings. */
-    char ***argvPtr;		/* Filled with argument strings (malloc'd). */
-{
-    char *cmdLine, *p, *arg, *argSpace;
-    char **argv;
-    int argc, size, inquote, copy, slashes;
-    
-    cmdLine = GetCommandLine();	/* INTL: BUG */
-
-    /*
-     * Precompute an overly pessimistic guess at the number of arguments
-     * in the command line by counting non-space spans.
-     */
-
-    size = 2;
-    for (p = cmdLine; *p != '\0'; p++) {
-	if ((*p == ' ') || (*p == '\t')) {	/* INTL: ISO space. */
-	    size++;
-	    while ((*p == ' ') || (*p == '\t')) { /* INTL: ISO space. */
-		p++;
-	    }
-	    if (*p == '\0') {
-		break;
-	    }
-	}
-    }
-    argSpace = (char *) Tcl_Alloc(
-	    (unsigned) (size * sizeof(char *) + strlen(cmdLine) + 1));
-    argv = (char **) argSpace;
-    argSpace += size * sizeof(char *);
-    size--;
-
-    p = cmdLine;
-    for (argc = 0; argc < size; argc++) {
-	argv[argc] = arg = argSpace;
-	while ((*p == ' ') || (*p == '\t')) {	/* INTL: ISO space. */
-	    p++;
-	}
-	if (*p == '\0') {
-	    break;
-	}
-
-	inquote = 0;
-	slashes = 0;
-	while (1) {
-	    copy = 1;
-	    while (*p == '\\') {
-		slashes++;
-		p++;
-	    }
-	    if (*p == '"') {
-		if ((slashes & 1) == 0) {
-		    copy = 0;
-		    if ((inquote) && (p[1] == '"')) {
-			p++;
-			copy = 1;
-		    } else {
-			inquote = !inquote;
-		    }
-                }
-                slashes >>= 1;
-            }
-
-            while (slashes) {
-		*arg = '\\';
-		arg++;
-		slashes--;
-	    }
-
-	    if ((*p == '\0')
-		    || (!inquote && ((*p == ' ') || (*p == '\t')))) { /* INTL: ISO space. */
-		break;
-	    }
-	    if (copy != 0) {
-		*arg = *p;
-		arg++;
-	    }
-	    p++;
-        }
-	*arg = '\0';
-	argSpace = arg + 1;
-    }
-    argv[argc] = NULL;
-
-    *argcPtr = argc;
-    *argvPtr = argv;
-}
diff --git a/win/tclWin16.c b/win/tclWin16.c
deleted file mode 100644
index dd82a34..0000000
--- a/win/tclWin16.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * tclWin16.c --
- *
- *      This file contains code for a 16-bit DLL to handle 32-to-16 bit
- *      thunking. This is necessary for the Win32s SynchSpawn() call.
- *
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWin16.c,v 1.2 1998/09/14 18:40:19 stanton Exp $
- */
-
-#define STRICT
-
-#include <windows.h>  
-#include <toolhelp.h> 
-
-#include <stdio.h>
-#include <string.h>
-
-static int                      WinSpawn(char *command);
-static int                      DosSpawn(char *command, char *fromFileName,
-				    char *toFileName);                                          
-static int                      WaitForExit(int inst);
-
-/*
- * The following data is used to construct a .pif file that wraps the
- * .bat file that runs the 16-bit application (that Jack built).  
- * The .pif file causes the .bat file to run in an iconified window.
- * Otherwise, when we try to exec something, a DOS box pops up, 
- * obscuring everything, and then almost immediately flickers out of
- * existence, which is rather disconcerting.
- */
-
-static char pifData[545] = {
-'\000', '\013', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\200', '\000', '\200', '\000', '\103', '\117', '\115', '\115', 
-'\101', '\116', '\104', '\056', '\103', '\117', '\115', '\000', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040',
-'\040', '\040', '\040', '\020', '\000', '\000', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040',
-'\040', '\040', '\040', '\040', '\040', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\177', '\001', '\000', 
-'\377', '\031', '\120', '\000', '\000', '\007', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000',
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\340', 
-'\040', '\115', '\111', '\103', '\122', '\117', '\123', '\117', 
-'\106', '\124', '\040', '\120', '\111', '\106', '\105', '\130', 
-'\000', '\207', '\001', '\000', '\000', '\161', '\001', '\127', 
-'\111', '\116', '\104', '\117', '\127', '\123', '\040', '\063',
-'\070', '\066', '\040', '\063', '\056', '\060', '\000', '\005', 
-'\002', '\235', '\001', '\150', '\000', '\200', '\002', '\200', 
-'\000', '\144', '\000', '\062', '\000', '\000', '\004', '\000', 
-'\000', '\000', '\004', '\000', '\000', '\002', '\020', '\002', 
-'\000', '\037', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000', '\000', '\000', '\000', '\000', '\057', '\143', '\040', 
-'\146', '\157', '\157', '\056', '\142', '\141', '\164', '\000', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\040', '\040', '\040', 
-'\040', '\040', '\040', '\040', '\040', '\127', '\111', '\116', 
-'\104', '\117', '\127', '\123', '\040', '\062', '\070', '\066', 
-'\040', '\063', '\056', '\060', '\000', '\377', '\377', '\033', 
-'\002', '\006', '\000', '\000', '\000', '\000', '\000', '\000', 
-'\000'
-};
-
-static HINSTANCE hInstance;
-
-
-/*
- *----------------------------------------------------------------------
- *
- * LibMain --
- *
- *      16-bit DLL entry point.
- *
- * Results:
- *      Returns 1.
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-int CALLBACK
-LibMain(
-    HINSTANCE hinst,
-    WORD wDS,
-    WORD cbHeap,
-    LPSTR unused)
-{
-    hInstance   = hinst;
-    wDS         = wDS;          /* lint. */
-    cbHeap      = cbHeap;       /* lint. */
-    unused      = unused;       /* lint. */
-
-    return TRUE;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * UTProc --
- *
- *      Universal Thunk dispatch routine.  Executes a 16-bit DOS
- *      application or a 16-bit or 32-bit Windows application and
- *      waits for it to complete.
- *
- * Results:
- *      1 if the application could be run, 0 or -1 on failure.
- *
- * Side effects:
- *      Executes 16-bit code.
- *
- *----------------------------------------------------------------------
- */
-
-int WINAPI
-UTProc(buf, func)
-    void *buf;
-    DWORD func;
-{
-    char **args;
-
-    args = (char **) buf;
-    if (func == 0) {
-	return DosSpawn(args[0], args[1], args[2]);
-    } else {
-	return WinSpawn(args[0]);
-    }
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * WinSpawn --
- *
- *      Start a 16-bit or 32-bit Windows application with optional 
- *      command line arguments and wait for it to finish.  Windows 
- *      applications do not handle input/output redirection.
- *
- * Results:
- *      The return value is 1 if the application could be run, 0 otherwise.
- *
- * Side effects:
- *      Whatever the application does.
- *
- *-------------------------------------------------------------------------
- */
-
-static int
-WinSpawn(command)
-    char *command;              /* The command line, consisting of the name
-				 * of the executable to run followed by any
-				 * number of arguments to the executable. */
-{
-    return WaitForExit(WinExec(command, SW_SHOW));
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * DosSpawn --
- *
- *      Start a 16-bit DOS program with optional command line arguments
- *      and wait for it to finish.  Input and output can be redirected
- *      from the specified files, but there is no such thing as stderr 
- *      under Win32s.
- *      
- *      This procedure to constructs a temporary .pif file that wraps a
- *      temporary .bat file that runs the 16-bit application.  The .bat
- *      file is necessary to get the redirection symbols '<' and '>' to 
- *      work, because WinExec() doesn't accept them.  The .pif file is
- *      necessary to cause the .bat file to run in an iconified window,
- *      to avoid having a large DOS box pop up, obscuring everything, and 
- *      then almost immediately flicker out of existence, which is rather 
- *      disconcerting.
- *
- * Results:
- *      The return value is 1 if the application could be run, 0 otherwise.
- *
- * Side effects:
- *      Whatever the application does.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-DosSpawn(command, fromFileName, toFileName)
-    char *command;              /* The name of the program, plus any
-				 * arguments, to be run. */
-    char *fromFileName;         /* Standard input for the program is to be
-				 * redirected from this file, or NULL for no
-				 * standard input. */
-    char *toFileName;           /* Standard output for the program is to be
-				 * redirected to this file, or NULL to
-				 * discard standard output. */
-{
-    int result;
-    HFILE batFile, pifFile;
-    char batFileName[144], pifFileName[144];
-
-    GetTempFileName(0, "tcl", 0, batFileName);
-    unlink(batFileName);
-    strcpy(strrchr(batFileName, '.'), ".bat");
-    batFile = _lcreat(batFileName, 0);
-
-    GetTempFileName(0, "tcl", 0, pifFileName);
-    unlink(pifFileName);
-    strcpy(strrchr(pifFileName, '.'), ".pif");
-    pifFile = _lcreat(pifFileName, 0);
-
-    _lwrite(batFile, command, strlen(command));
-    if (fromFileName == NULL) {
-	_lwrite(batFile, " < nul", 6);
-    } else {
-	_lwrite(batFile, " < ", 3);
-	_lwrite(batFile, fromFileName, strlen(fromFileName));
-    }
-    if (toFileName == NULL) {
-	_lwrite(batFile, " > nul", 6);
-    } else {
-	_lwrite(batFile, " > ", 3);
-	_lwrite(batFile, toFileName, strlen(toFileName));
-    }
-    _lwrite(batFile, "\r\n\032", 3);
-    _lclose(batFile);
-
-    strcpy(pifData + 0x1c8, batFileName);
-    _lwrite(pifFile, pifData, sizeof(pifData));
-    _lclose(pifFile);
-
-    result = WaitForExit(WinExec(pifFileName, SW_MINIMIZE));
-
-    unlink(pifFileName);
-    unlink(batFileName);
-
-    return result;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * WaitForExit --
- *
- *      Wait until the application with the given instance handle has
- *      finished.  PeekMessage() is used to yield the processor; 
- *      otherwise, nothing else could execute on the system.
- *
- * Results:
- *      The return value is 1 if the process exited successfully,
- *      or 0 otherwise.
- *
- * Side effects:
- *      None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-WaitForExit(inst)
-    int inst;                   /* Identifies the instance handle of the
-				 * process to wait for. */
-{
-    TASKENTRY te;
-    MSG msg;
-    UINT timer;
-
-    if (inst < 32) {
-	return 0;
-    }
-
-    te.dwSize = sizeof(te);
-    te.hInst = 0;
-    TaskFirst(&te);
-    do {
-	if (te.hInst == (HINSTANCE) inst) {
-	    break;
-	}
-    } while (TaskNext(&te) != FALSE);
-
-    if (te.hInst != (HINSTANCE) inst) {
-	return 0;
-    }
-
-    timer = SetTimer(NULL, 0, 0, NULL);
-    while (1) {
-	if (GetMessage(&msg, NULL, 0, 0) != 0) {
-	    TranslateMessage(&msg);
-	    DispatchMessage(&msg);
-	}
-	TaskFirst(&te);
-	do {
-	    if (te.hInst == (HINSTANCE) inst) {
-		break;
-	    }
-	} while (TaskNext(&te) != FALSE);
-
-	if (te.hInst != (HINSTANCE) inst) {
-	    KillTimer(NULL, timer);
-	    return 1;
-	}
-    }
-}
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
deleted file mode 100644
index 5a90b77..0000000
--- a/win/tclWin32Dll.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/* 
-
- * tclWin32Dll.c --
- *
- *	This file contains the DLL entry point which sets up the 32-to-16-bit
- *	thunking code for SynchSpawn if the library is running under Win32s.
- *
- * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWin32Dll.c,v 1.6 1999/04/16 00:48:07 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * The following data structures are used when loading the thunking 
- * library for execing child processes under Win32s.
- */
-
-typedef DWORD (WINAPI UT32PROC)(LPVOID lpBuff, DWORD dwUserDefined,
-	LPVOID *lpTranslationList);
-
-typedef BOOL (WINAPI UTREGISTER)(HANDLE hModule, LPCSTR SixteenBitDLL,
-	LPCSTR InitName, LPCSTR ProcName, UT32PROC **ThirtyTwoBitThunk,
-	FARPROC UT32Callback, LPVOID Buff);
-
-typedef VOID (WINAPI UTUNREGISTER)(HANDLE hModule);
-
-/* 
- * The following variables keep track of information about this DLL
- * on a per-instance basis.  Each time this DLL is loaded, it gets its own 
- * new data segment with its own copy of all static and global information.
- */
-
-static HINSTANCE hInstance;	/* HINSTANCE of this DLL. */
-static int platformId;		/* Running under NT, 95, or Win32s? */
-
-/*
- * The following function tables are used to dispatch to either the
- * wide-character or multi-byte versions of the operating system calls,
- * depending on whether the Unicode calls are available.
- */
-
-static TclWinProcs asciiProcs = {
-    0,
-
-    (BOOL (WINAPI *)(CONST TCHAR *, LPDCB)) BuildCommDCBA,
-    (TCHAR *(WINAPI *)(TCHAR *)) CharLowerA,
-    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR *, BOOL)) CopyFileA,
-    (BOOL (WINAPI *)(CONST TCHAR *, LPSECURITY_ATTRIBUTES)) CreateDirectoryA,
-    (HANDLE (WINAPI *)(CONST TCHAR *, DWORD, DWORD, SECURITY_ATTRIBUTES *, 
-	    DWORD, DWORD, HANDLE)) CreateFileA,
-    (BOOL (WINAPI *)(CONST TCHAR *, TCHAR *, LPSECURITY_ATTRIBUTES, 
-	    LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, CONST TCHAR *, 
-	    LPSTARTUPINFOA, LPPROCESS_INFORMATION)) CreateProcessA,
-    (BOOL (WINAPI *)(CONST TCHAR *)) DeleteFileA,
-    (HANDLE (WINAPI *)(CONST TCHAR *, WIN32_FIND_DATAT *)) FindFirstFileA,
-    (BOOL (WINAPI *)(HANDLE, WIN32_FIND_DATAT *)) FindNextFileA,
-    (BOOL (WINAPI *)(WCHAR *, LPDWORD)) GetComputerNameA,
-    (DWORD (WINAPI *)(DWORD, WCHAR *)) GetCurrentDirectoryA,
-    (DWORD (WINAPI *)(CONST TCHAR *)) GetFileAttributesA,
-    (DWORD (WINAPI *)(CONST TCHAR *, DWORD nBufferLength, WCHAR *, 
-	    TCHAR **)) GetFullPathNameA,
-    (DWORD (WINAPI *)(HMODULE, WCHAR *, int)) GetModuleFileNameA,
-    (DWORD (WINAPI *)(CONST TCHAR *, WCHAR *, DWORD)) GetShortPathNameA,
-    (UINT (WINAPI *)(CONST TCHAR *, CONST TCHAR *, UINT uUnique, 
-	    WCHAR *)) GetTempFileNameA,
-    (DWORD (WINAPI *)(DWORD, WCHAR *)) GetTempPathA,
-    (BOOL (WINAPI *)(CONST TCHAR *, WCHAR *, DWORD, LPDWORD, LPDWORD, LPDWORD,
-	    WCHAR *, DWORD)) GetVolumeInformationA,
-    (HINSTANCE (WINAPI *)(CONST TCHAR *)) LoadLibraryA,
-    (TCHAR (WINAPI *)(WCHAR *, CONST TCHAR *)) lstrcpyA,
-    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR *)) MoveFileA,
-    (BOOL (WINAPI *)(CONST TCHAR *)) RemoveDirectoryA,
-    (DWORD (WINAPI *)(CONST TCHAR *, CONST TCHAR *, CONST TCHAR *, DWORD, 
-	    WCHAR *, TCHAR **)) SearchPathA,
-    (BOOL (WINAPI *)(CONST TCHAR *)) SetCurrentDirectoryA,
-    (BOOL (WINAPI *)(CONST TCHAR *, DWORD)) SetFileAttributesA,
-};
-
-static TclWinProcs unicodeProcs = {
-    1,
-
-    (BOOL (WINAPI *)(CONST TCHAR *, LPDCB)) BuildCommDCBW,
-    (TCHAR *(WINAPI *)(TCHAR *)) CharLowerW,
-    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR *, BOOL)) CopyFileW,
-    (BOOL (WINAPI *)(CONST TCHAR *, LPSECURITY_ATTRIBUTES)) CreateDirectoryW,
-    (HANDLE (WINAPI *)(CONST TCHAR *, DWORD, DWORD, SECURITY_ATTRIBUTES *, 
-	    DWORD, DWORD, HANDLE)) CreateFileW,
-    (BOOL (WINAPI *)(CONST TCHAR *, TCHAR *, LPSECURITY_ATTRIBUTES, 
-	    LPSECURITY_ATTRIBUTES, BOOL, DWORD, LPVOID, CONST TCHAR *, 
-	    LPSTARTUPINFOA, LPPROCESS_INFORMATION)) CreateProcessW,
-    (BOOL (WINAPI *)(CONST TCHAR *)) DeleteFileW,
-    (HANDLE (WINAPI *)(CONST TCHAR *, WIN32_FIND_DATAT *)) FindFirstFileW,
-    (BOOL (WINAPI *)(HANDLE, WIN32_FIND_DATAT *)) FindNextFileW,
-    (BOOL (WINAPI *)(WCHAR *, LPDWORD)) GetComputerNameW,
-    (DWORD (WINAPI *)(DWORD, WCHAR *)) GetCurrentDirectoryW,
-    (DWORD (WINAPI *)(CONST TCHAR *)) GetFileAttributesW,
-    (DWORD (WINAPI *)(CONST TCHAR *, DWORD nBufferLength, WCHAR *, 
-	    TCHAR **)) GetFullPathNameW,
-    (DWORD (WINAPI *)(HMODULE, WCHAR *, int)) GetModuleFileNameW,
-    (DWORD (WINAPI *)(CONST TCHAR *, WCHAR *, DWORD)) GetShortPathNameW,
-    (UINT (WINAPI *)(CONST TCHAR *, CONST TCHAR *, UINT uUnique, 
-	    WCHAR *)) GetTempFileNameW,
-    (DWORD (WINAPI *)(DWORD, WCHAR *)) GetTempPathW,
-    (BOOL (WINAPI *)(CONST TCHAR *, WCHAR *, DWORD, LPDWORD, LPDWORD, LPDWORD, 
-	    WCHAR *, DWORD)) GetVolumeInformationW,
-    (HINSTANCE (WINAPI *)(CONST TCHAR *)) LoadLibraryW,
-    (TCHAR (WINAPI *)(WCHAR *, CONST TCHAR *)) lstrcpyW,
-    (BOOL (WINAPI *)(CONST TCHAR *, CONST TCHAR *)) MoveFileW,
-    (BOOL (WINAPI *)(CONST TCHAR *)) RemoveDirectoryW,
-    (DWORD (WINAPI *)(CONST TCHAR *, CONST TCHAR *, CONST TCHAR *, DWORD, 
-	    WCHAR *, TCHAR **)) SearchPathW,
-    (BOOL (WINAPI *)(CONST TCHAR *)) SetCurrentDirectoryW,
-    (BOOL (WINAPI *)(CONST TCHAR *, DWORD)) SetFileAttributesW,
-};
-
-TclWinProcs *tclWinProcs;
-static Tcl_Encoding tclWinTCharEncoding;
-
-/*
- * The following declaration is for the VC++ DLL entry point.
- */
-
-BOOL APIENTRY		DllMain(HINSTANCE hInst, DWORD reason, 
-				LPVOID reserved);
-
-
-#ifdef __WIN32__
-#ifndef STATIC_BUILD
-
-
-/*
- *----------------------------------------------------------------------
- *
- * DllEntryPoint --
- *
- *	This wrapper function is used by Borland to invoke the
- *	initialization code for Tcl.  It simply calls the DllMain
- *	routine.
- *
- * Results:
- *	See DllMain.
- *
- * Side effects:
- *	See DllMain.
- *
- *----------------------------------------------------------------------
- */
-
-BOOL APIENTRY
-DllEntryPoint(hInst, reason, reserved)
-    HINSTANCE hInst;		/* Library instance handle. */
-    DWORD reason;		/* Reason this function is being called. */
-    LPVOID reserved;		/* Not used. */
-{
-    return DllMain(hInst, reason, reserved);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DllMain --
- *
- *	This routine is called by the VC++ C run time library init
- *	code, or the DllEntryPoint routine.  It is responsible for
- *	initializing various dynamically loaded libraries.
- *
- * Results:
- *	TRUE on sucess, FALSE on failure.
- *
- * Side effects:
- *	Establishes 32-to-16 bit thunk and initializes sockets library.
- *
- *----------------------------------------------------------------------
- */
-BOOL APIENTRY
-DllMain(hInst, reason, reserved)
-    HINSTANCE hInst;		/* Library instance handle. */
-    DWORD reason;		/* Reason this function is being called. */
-    LPVOID reserved;		/* Not used. */
-{
-    switch (reason) {
-    case DLL_PROCESS_ATTACH:
-	if (hInstance != NULL) {
-	    /*
-	     * Prevents DLL from being loaded multiple times under Win32s,
-	     * since all copies of the DLL share the same data segment and
-	     * Tcl isn't set up to handle that.  Under NT or 95, each time 
-	     * the DLL is loaded, it gets its own private copy of the data 
-	     * segment.
-	     */
-
-	    return FALSE;
-	}
-
-	TclWinInit(hInst);
-	return TRUE;
-
-    case DLL_PROCESS_DETACH:
-	if (hInst == hInstance) {
-	    Tcl_Finalize();
-	}
-	break;
-    }
-
-    return TRUE; 
-}
-
-#endif /* !STATIC_BUILD */
-#endif /* __WIN32__ */
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinSynchSpawn --
- *
- *	32-bit entry point to the 16-bit SynchSpawn code.
- *
- * Results:
- *	1 on success, 0 on failure.
- *
- * Side effects:
- *	Spawns a command and waits for it to complete.
- *
- *----------------------------------------------------------------------
- */
-int 
-TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
-{
-    HINSTANCE hKernel;
-    UTREGISTER *utRegisterProc;
-    UTUNREGISTER *utUnRegisterProc;
-    UT32PROC *ut32Proc;
-    char buffer[] = "TCL16xx.DLL";
-    int result;
-
-    hKernel = LoadLibraryA("kernel32.dll");
-    if (hKernel == NULL) {
-	return 0;
-    }
-
-    /*
-     * Load the Universal Thunking routines from kernel32.dll.
-     */
-
-    utRegisterProc = (UTREGISTER *) GetProcAddress(hKernel, "UTRegister");
-    utUnRegisterProc = (UTUNREGISTER *) GetProcAddress(hKernel, "UTUnRegister");
-    if ((utRegisterProc == NULL) || (utUnRegisterProc == NULL)) {
-	result = 0;
-	goto done;
-    }
-
-    /*
-     * Construct the complete name of tcl16xx.dll.
-     */
-
-    buffer[5] = '0' + TCL_MAJOR_VERSION;
-    buffer[6] = '0' + TCL_MINOR_VERSION;
-
-    /*
-     * Register the Tcl thunk.
-     */
-
-    if ((*utRegisterProc)(hInstance, buffer, NULL, "UTProc", &ut32Proc, 
-	    NULL, NULL) == FALSE) {
-	result = 0;
-	goto done;
-    }
-    if (ut32Proc != NULL) {
-	/*
-	 * Invoke the thunk.
-	 */
-
-	*pidPtr = 0;
-	(*ut32Proc)(args, type, trans);
-	result = 1;
-    } else {
-	/*
-	 * The 16-bit thunking DLL wasn't found.  Return error code that
-	 * indicates this problem.
-	 */
-
-	result = 0;
-    }
-    (*utUnRegisterProc)(hInstance);
-
-    done:
-    FreeLibrary(hKernel);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinGetTclInstance --
- *
- *	Retrieves the global library instance handle.
- *
- * Results:
- *	Returns the global library instance handle.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-HINSTANCE
-TclWinGetTclInstance()
-{
-    return hInstance;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinInit --
- *
- *	This function initializes the internal state of the tcl library.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Initializes the 16-bit thunking library, and the tclPlatformId
- *	variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclWinInit(hInst)
-    HINSTANCE hInst;		/* Library instance handle. */
-{
-    OSVERSIONINFO os;
-
-    hInstance = hInst;
-    os.dwOSVersionInfoSize = sizeof(os);
-    GetVersionEx(&os);
-    platformId = os.dwPlatformId;
-
-    /*
-     * The following code stops Windows 3.x from automatically putting 
-     * up Sharing Violation dialogs, e.g, when someone tries to
-     * access a file that is locked or a drive with no disk in it.
-     * Tcl already returns the appropriate error to the caller, and they 
-     * can decide to put up their own dialog in response to that failure.  
-     *
-     * Under 95 and NT, the system doesn't automatically put up dialogs 
-     * when the above operations fail.
-     */
-
-    if (platformId == VER_PLATFORM_WIN32s) {
-	SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS);
-    }
-
-    tclWinProcs = &asciiProcs;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinGetPlatformId --
- *
- *	Determines whether running under NT, 95, or Win32s, to allow 
- *	runtime conditional code.
- *
- * Results:
- *	The return value is one of:
- *	    VER_PLATFORM_WIN32s		Win32s on Windows 3.1. 
- *	    VER_PLATFORM_WIN32_WINDOWS	Win32 on Windows 95.
- *	    VER_PLATFORM_WIN32_NT	Win32 on Windows NT
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int		
-TclWinGetPlatformId()
-{
-    return platformId;
-}
-
-/*
- *-------------------------------------------------------------------------
- *
- * TclWinNoBackslash --
- *
- *	We're always iterating through a string in Windows, changing the
- *	backslashes to slashes for use in Tcl.
- *
- * Results:
- *	All backslashes in given string are changed to slashes.
- *
- * Side effects:
- *	None.
- *
- *-------------------------------------------------------------------------
- */
-
-char *
-TclWinNoBackslash(
-    char *path)			/* String to change. */
-{
-    char *p;
-
-    for (p = path; *p != '\0'; p++) {
-	if (*p == '\\') {
-	    *p = '/';
-	}
-    }
-    return path;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCheckStackSpace --
- *
- *	Detect if we are about to blow the stack.  Called before an 
- *	evaluation can happen when nesting depth is checked.
- *
- * Results:
- *	1 if there is enough stack space to continue; 0 if not.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCheckStackSpace()
-{
-    /*
-     * We can recurse only if there is at least TCL_WIN_STACK_THRESHOLD
-     * bytes of stack space left.  alloca() is cheap on windows; basically
-     * it just subtracts from the stack pointer causing the OS to throw an
-     * exception if the stack pointer is set below the bottom of the stack.
-     */
-
-    try {
-	alloca(TCL_WIN_STACK_THRESHOLD);
-	return 1;
-    } except (1) {}
-
-    return 0;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinGetPlatform --
- *
- *	This is a kludge that allows the test library to get access
- *	the internal tclPlatform variable.
- *
- * Results:
- *	Returns a pointer to the tclPlatform variable.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclPlatformType *
-TclWinGetPlatform()
-{
-    return &tclPlatform;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclWinSetInterfaces --
- *
- *	A helper proc that allows the test library to change the
- *	tclWinProcs structure to dispatch to either the wide-character
- *	or multi-byte versions of the operating system calls, depending
- *	on whether Unicode is the system encoding.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclWinSetInterfaces(
-    int wide)			/* Non-zero to use wide interfaces, 0
-				 * otherwise. */
-{
-    Tcl_FreeEncoding(tclWinTCharEncoding);
-
-    if (wide) {
-	tclWinProcs = &unicodeProcs;
-	tclWinTCharEncoding = Tcl_GetEncoding(NULL, "unicode");
-    } else {
-	tclWinProcs = &asciiProcs;
-	tclWinTCharEncoding = NULL;
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tcl_WinUtfToTChar, Tcl_WinTCharToUtf --
- *
- *	Convert between UTF-8 and Unicode when running Windows NT or 
- *	the current ANSI code page when running Windows 95.
- *
- *	On Mac, Unix, and Windows 95, all strings exchanged between Tcl
- *	and the OS are "char" oriented.  We need only one Tcl_Encoding to
- *	convert between UTF-8 and the system's native encoding.  We use
- *	NULL to represent that encoding.
- *
- *	On NT, some strings exchanged between Tcl and the OS are "char"
- *	oriented, while others are in Unicode.  We need two Tcl_Encoding
- *	APIs depending on whether we are targeting a "char" or Unicode
- *	interface.  
- *
- *	Calling Tcl_UtfToExternal() or Tcl_ExternalToUtf() with an
- *	encoding of NULL should always used to convert between UTF-8
- *	and the system's "char" oriented encoding.  The following two
- *	functions are used in Windows-specific code to convert between
- *	UTF-8 and Unicode strings (NT) or "char" strings(95).  This saves
- *	you the trouble of writing the following type of fragment over and
- *	over:
- *
- *		if (running NT) {
- *		    encoding <- Tcl_GetEncoding("unicode");
- *		    nativeBuffer <- UtfToExternal(encoding, utfBuffer);
- *		    Tcl_FreeEncoding(encoding);
- *		} else {
- *		    nativeBuffer <- UtfToExternal(NULL, utfBuffer);
- *		}
- *
- *	By convention, in Windows a TCHAR is a character in the ANSI code
- *	page on Windows 95, a Unicode character on Windows NT.  If you
- *	plan on targeting a Unicode interfaces when running on NT and a
- *	"char" oriented interface while running on 95, these functions
- *	should be used.  If you plan on targetting the same "char"
- *	oriented function on both 95 and NT, use Tcl_UtfToExternal()
- *	with an encoding of NULL.
- *
- * Results:
- *	The result is a pointer to the string in the desired target
- *	encoding.  Storage for the result string is allocated in
- *	dsPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-TCHAR *
-Tcl_WinUtfToTChar(string, len, dsPtr)
-    CONST char *string;		/* Source string in UTF-8. */
-    int len;			/* Source string length in bytes, or < 0 for
-				 * strlen(). */
-    Tcl_DString *dsPtr;		/* Uninitialized or free DString in which 
-				 * the converted string is stored. */
-{
-    return (TCHAR *) Tcl_UtfToExternalDString(tclWinTCharEncoding, 
-	    string, len, dsPtr);
-}
-
-char *
-Tcl_WinTCharToUtf(string, len, dsPtr)
-    CONST TCHAR *string;	/* Source string in Unicode when running
-				 * NT, ANSI when running 95. */
-    int len;			/* Source string length in bytes, or < 0 for
-				 * platform-specific string length. */
-    Tcl_DString *dsPtr;		/* Uninitialized or free DString in which 
-				 * the converted string is stored. */
-{
-    return Tcl_ExternalToUtfDString(tclWinTCharEncoding, 
-	    (CONST char *) string, len, dsPtr);
-}
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
deleted file mode 100644
index e2126fb..0000000
--- a/win/tclWinChan.c
+++ /dev/null
@@ -1,1077 +0,0 @@
-/* 
- * tclWinChan.c
- *
- *	Channel drivers for Windows channels based on files, command
- *	pipes and TCP sockets.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinChan.c,v 1.6 1999/04/16 00:48:07 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * State flags used in the info structures below.
- */
-
-#define FILE_PENDING	(1<<0)	/* Message is pending in the queue. */
-#define FILE_ASYNC	(1<<1)	/* Channel is non-blocking. */
-#define FILE_APPEND	(1<<2)	/* File is in append mode. */
-
-#define FILE_TYPE_SERIAL  (FILE_TYPE_PIPE+1)
-#define FILE_TYPE_CONSOLE (FILE_TYPE_PIPE+2)
-
-/*
- * The following structure contains per-instance data for a file based channel.
- */
-
-typedef struct FileInfo {
-    Tcl_Channel channel;	/* Pointer to channel structure. */
-    int validMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which operations are valid on the file. */
-    int watchMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which events should be reported. */
-    int flags;			/* State flags, see above for a list. */
-    HANDLE handle;		/* Input/output file. */
-    struct FileInfo *nextPtr;	/* Pointer to next registered file. */
-} FileInfo;
-
-typedef struct ThreadSpecificData {
-    /*
-     * List of all file channels currently open.
-     */
-
-    FileInfo *firstFilePtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * file events are generated.
- */
-
-typedef struct FileEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    FileInfo *infoPtr;		/* Pointer to file info structure.  Note
-				 * that we still have to verify that the
-				 * file exists before dereferencing this
-				 * pointer. */
-} FileEvent;
-
-/*
- * Static routines for this file:
- */
-
-static int		FileBlockProc _ANSI_ARGS_((ClientData instanceData,
-			    int mode));
-static void		FileChannelExitHandler _ANSI_ARGS_((
-		            ClientData clientData));
-static void		FileCheckProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static int		FileCloseProc _ANSI_ARGS_((ClientData instanceData,
-		            Tcl_Interp *interp));
-static int		FileEventProc _ANSI_ARGS_((Tcl_Event *evPtr, 
-			    int flags));
-static int		FileGetHandleProc _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static ThreadSpecificData *FileInit _ANSI_ARGS_((void));
-static int		FileInputProc _ANSI_ARGS_((ClientData instanceData,
-	            	    char *buf, int toRead, int *errorCode));
-static int		FileOutputProc _ANSI_ARGS_((ClientData instanceData,
-			    char *buf, int toWrite, int *errorCode));
-static int		FileSeekProc _ANSI_ARGS_((ClientData instanceData,
-			    long offset, int mode, int *errorCode));
-static void		FileSetupProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static void		FileWatchProc _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-
-			    
-/*
- * This structure describes the channel type structure for file based IO.
- */
-
-static Tcl_ChannelType fileChannelType = {
-    "file",			/* Type name. */
-    FileBlockProc,		/* Set blocking or non-blocking mode.*/
-    FileCloseProc,		/* Close proc. */
-    FileInputProc,		/* Input proc. */
-    FileOutputProc,		/* Output proc. */
-    FileSeekProc,		/* Seek proc. */
-    NULL,			/* Set option proc. */
-    NULL,			/* Get option proc. */
-    FileWatchProc,		/* Set up the notifier to watch the channel. */
-    FileGetHandleProc,		/* Get an OS handle from channel. */
-};
-
-
-/*
- *----------------------------------------------------------------------
- *
- * FileInit --
- *
- *	This function creates the window used to simulate file events.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new window and creates an exit handler. 
- *
- *----------------------------------------------------------------------
- */
-
-static ThreadSpecificData *
-FileInit()
-{
-    ThreadSpecificData *tsdPtr =
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->firstFilePtr = NULL;
-	Tcl_CreateEventSource(FileSetupProc, FileCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(FileChannelExitHandler, NULL);
-    }
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileChannelExitHandler --
- *
- *	This function is called to cleanup the channel driver before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Destroys the communication window.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileChannelExitHandler(clientData)
-    ClientData clientData;	/* Old window proc */
-{
-    Tcl_DeleteEventSource(FileSetupProc, FileCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-FileSetupProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    FileInfo *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Check to see if there is a ready file.  If so, poll.
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask) {
-	    Tcl_SetMaxBlockTime(&blockTime);
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the file
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileCheckProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    FileEvent *evPtr;
-    FileInfo *infoPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready files that don't already have events
-     * queued (caused by persistent states that won't generate WinSock
-     * events).
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask && !(infoPtr->flags & FILE_PENDING)) {
-	    infoPtr->flags |= FILE_PENDING;
-	    evPtr = (FileEvent *) ckalloc(sizeof(FileEvent));
-	    evPtr->header.proc = FileEventProc;
-	    evPtr->infoPtr = infoPtr;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*----------------------------------------------------------------------
- *
- * FileEventProc --
- *
- *	This function is invoked by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure invokes
- *	Tcl_NotifyChannel on the file.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the notifier callback does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileEventProc(evPtr, flags)
-    Tcl_Event *evPtr;		/* Event to service. */
-    int flags;			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    FileEvent *fileEvPtr = (FileEvent *)evPtr;
-    FileInfo *infoPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the list of watched files for the one whose handle
-     * matches the event.  We do this rather than simply dereferencing
-     * the handle in the event so that files can be deleted while the
-     * event is in the queue.
-     */
-
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL;
-	    infoPtr = infoPtr->nextPtr) {
-	if (fileEvPtr->infoPtr == infoPtr) {
-	    infoPtr->flags &= ~(FILE_PENDING);
-	    Tcl_NotifyChannel(infoPtr->channel, infoPtr->watchMask);
-	    break;
-	}
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileBlockProc --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileBlockProc(instanceData, mode)
-    ClientData instanceData;	/* Instance data for channel. */
-    int mode;			/* TCL_MODE_BLOCKING or
-                                 * TCL_MODE_NONBLOCKING. */
-{
-    FileInfo *infoPtr = (FileInfo *) instanceData;
-    
-    /*
-     * Files on Windows can not be switched between blocking and nonblocking,
-     * hence we have to emulate the behavior. This is done in the input
-     * function by checking against a bit in the state. We set or unset the
-     * bit here to cause the input function to emulate the correct behavior.
-     */
-
-    if (mode == TCL_MODE_NONBLOCKING) {
-	infoPtr->flags |= FILE_ASYNC;
-    } else {
-	infoPtr->flags &= ~(FILE_ASYNC);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileCloseProc --
- *
- *	Closes the IO channel.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the physical channel
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileCloseProc(instanceData, interp)
-    ClientData instanceData;	/* Pointer to FileInfo structure. */
-    Tcl_Interp *interp;		/* Not used. */
-{
-    FileInfo *fileInfoPtr = (FileInfo *) instanceData;
-    FileInfo **nextPtrPtr;
-    int errorCode = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Remove the file from the watch list.
-     */
-
-    FileWatchProc(instanceData, 0);
-
-    /*
-     * Don't close the Win32 handle if the handle is a standard channel
-     * during the exit process.  Otherwise, one thread may kill the stdio
-     * of another.
-     */
-
-    if (!TclInExit() 
-	    || ((GetStdHandle(STD_INPUT_HANDLE) != fileInfoPtr->handle)
-		&& (GetStdHandle(STD_OUTPUT_HANDLE) != fileInfoPtr->handle)
-		&& (GetStdHandle(STD_ERROR_HANDLE) != fileInfoPtr->handle))) {
-	if (CloseHandle(fileInfoPtr->handle) == FALSE) {
-	    TclWinConvertError(GetLastError());
-	    errorCode = errno;
-	}
-    }
-    for (nextPtrPtr = &(tsdPtr->firstFilePtr); (*nextPtrPtr) != NULL;
-	 nextPtrPtr = &((*nextPtrPtr)->nextPtr)) {
-	if ((*nextPtrPtr) == fileInfoPtr) {
-	    (*nextPtrPtr) = fileInfoPtr->nextPtr;
-	    break;
-	}
-    }
-    ckfree((char *)fileInfoPtr);
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileSeekProc --
- *
- *	Seeks on a file-based channel. Returns the new position.
- *
- * Results:
- *	-1 if failed, the new position if successful. If failed, it
- *	also sets *errorCodePtr to the error code.
- *
- * Side effects:
- *	Moves the location at which the channel will be accessed in
- *	future operations.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileSeekProc(instanceData, offset, mode, errorCodePtr)
-    ClientData instanceData;			/* File state. */
-    long offset;				/* Offset to seek to. */
-    int mode;					/* Relative to where
-                                                 * should we seek? */
-    int *errorCodePtr;				/* To store error code. */
-{
-    FileInfo *infoPtr = (FileInfo *) instanceData;
-    DWORD moveMethod;
-    DWORD newPos;
-
-    *errorCodePtr = 0;
-    if (mode == SEEK_SET) {
-        moveMethod = FILE_BEGIN;
-    } else if (mode == SEEK_CUR) {
-        moveMethod = FILE_CURRENT;
-    } else {
-        moveMethod = FILE_END;
-    }
-
-    newPos = SetFilePointer(infoPtr->handle, offset, NULL, moveMethod);
-    if (newPos == 0xFFFFFFFF) {
-        TclWinConvertError(GetLastError());
-        *errorCodePtr = errno;
-	return -1;
-    }
-    return newPos;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileInputProc --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileInputProc(instanceData, buf, bufSize, errorCode)
-    ClientData instanceData;		/* File state. */
-    char *buf;				/* Where to store data read. */
-    int bufSize;			/* How much space is available
-                                         * in the buffer? */
-    int *errorCode;			/* Where to store error code. */
-{
-    FileInfo *infoPtr;
-    DWORD bytesRead;
-
-    *errorCode = 0;
-    infoPtr = (FileInfo *) instanceData;
-
-    /*
-     * Note that we will block on reads from a console buffer until a
-     * full line has been entered.  The only way I know of to get
-     * around this is to write a console driver.  We should probably
-     * do this at some point, but for now, we just block.  The same
-     * problem exists for files being read over the network.
-     */
-
-    if (ReadFile(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &bytesRead,
-            (LPOVERLAPPED) NULL) != FALSE) {
-	return bytesRead;
-    }
-    
-    TclWinConvertError(GetLastError());
-    *errorCode = errno;
-    if (errno == EPIPE) {
-	return 0;
-    }
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileOutputProc --
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileOutputProc(instanceData, buf, toWrite, errorCode)
-    ClientData instanceData;		/* File state. */
-    char *buf;				/* The data buffer. */
-    int toWrite;			/* How many bytes to write? */
-    int *errorCode;			/* Where to store error code. */
-{
-    FileInfo *infoPtr = (FileInfo *) instanceData;
-    DWORD bytesWritten;
-    
-    *errorCode = 0;
-
-    /*
-     * If we are writing to a file that was opened with O_APPEND, we need to
-     * seek to the end of the file before writing the current buffer.
-     */
-
-    if (infoPtr->flags & FILE_APPEND) {
-        SetFilePointer(infoPtr->handle, 0, NULL, FILE_END);
-    }
-
-    if (WriteFile(infoPtr->handle, (LPVOID) buf, (DWORD) toWrite, &bytesWritten,
-            (LPOVERLAPPED) NULL) == FALSE) {
-        TclWinConvertError(GetLastError());
-        *errorCode = errno;
-        return -1;
-    }
-    FlushFileBuffers(infoPtr->handle);
-    return bytesWritten;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileWatchProc --
- *
- *	Called by the notifier to set up to watch for events on this
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FileWatchProc(instanceData, mask)
-    ClientData instanceData;		/* File state. */
-    int mask;				/* What events to watch for; OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    FileInfo *infoPtr = (FileInfo *) instanceData;
-    Tcl_Time blockTime = { 0, 0 };
-
-    /*
-     * Since the file is always ready for events, we set the block time
-     * to zero so we will poll.
-     */
-
-    infoPtr->watchMask = mask & infoPtr->validMask;
-    if (infoPtr->watchMask) {
-	Tcl_SetMaxBlockTime(&blockTime);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * FileGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	a file based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-FileGetHandleProc(instanceData, direction, handlePtr)
-    ClientData instanceData;	/* The file state. */
-    int direction;		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr;	/* Where to store the handle.  */
-{
-    FileInfo *infoPtr = (FileInfo *) instanceData;
-
-    if (direction & infoPtr->validMask) {
-	*handlePtr = (ClientData) infoPtr->handle;
-	return TCL_OK;
-    } else {
-	return TCL_ERROR;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpOpenFileChannel --
- *
- *	Open an File based channel on Unix systems.
- *
- * Results:
- *	The new channel or NULL. If NULL, the output argument
- *	errorCodePtr is set to a POSIX error.
- *
- * Side effects:
- *	May open the channel and may cause creation of a file on the
- *	file system.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpOpenFileChannel(interp, fileName, modeString, permissions)
-    Tcl_Interp *interp;			/* Interpreter for error reporting;
-                                         * can be NULL. */
-    char *fileName;			/* Name of file to open. */
-    char *modeString;			/* A list of POSIX open modes or
-                                         * a string such as "rw". */
-    int permissions;			/* If the open involves creating a
-                                         * file, with what modes to create
-                                         * it? */
-{
-    Tcl_Channel channel = 0;
-    int seekFlag, mode, channelPermissions;
-    DWORD accessMode, createMode, shareMode, flags, consoleParams, type;
-    TCHAR *nativeName;
-    Tcl_DString ds, buffer;
-    DCB dcb;
-    HANDLE handle;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    TclFile readFile = NULL;
-    TclFile writeFile = NULL;
-
-    mode = TclGetOpenMode(interp, modeString, &seekFlag);
-    if (mode == -1) {
-        return NULL;
-    }
-
-    if (Tcl_TranslateFileName(interp, fileName, &ds) == NULL) {
-	return NULL;
-    }
-    nativeName = Tcl_WinUtfToTChar(Tcl_DStringValue(&ds), 
-	    Tcl_DStringLength(&ds), &buffer);
-
-    switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
-	case O_RDONLY:
-	    accessMode = GENERIC_READ;
-	    channelPermissions = TCL_READABLE;
-	    break;
-	case O_WRONLY:
-	    accessMode = GENERIC_WRITE;
-	    channelPermissions = TCL_WRITABLE;
-	    break;
-	case O_RDWR:
-	    accessMode = (GENERIC_READ | GENERIC_WRITE);
-	    channelPermissions = (TCL_READABLE | TCL_WRITABLE);
-	    break;
-	default:
-	    panic("TclpOpenFileChannel: invalid mode value");
-	    break;
-    }
-
-    /*
-     * Map the creation flags to the NT create mode.
-     */
-
-    switch (mode & (O_CREAT | O_EXCL | O_TRUNC)) {
-	case (O_CREAT | O_EXCL):
-	case (O_CREAT | O_EXCL | O_TRUNC):
-	    createMode = CREATE_NEW;
-	    break;
-	case (O_CREAT | O_TRUNC):
-	    createMode = CREATE_ALWAYS;
-	    break;
-	case O_CREAT:
-	    createMode = OPEN_ALWAYS;
-	    break;
-	case O_TRUNC:
-	case (O_TRUNC | O_EXCL):
-	    createMode = TRUNCATE_EXISTING;
-	    break;
-	default:
-	    createMode = OPEN_EXISTING;
-	    break;
-    }
-
-    /*
-     * If the file is being created, get the file attributes from the
-     * permissions argument, else use the existing file attributes.
-     */
-
-    if (mode & O_CREAT) {
-        if (permissions & S_IWRITE) {
-            flags = FILE_ATTRIBUTE_NORMAL;
-        } else {
-            flags = FILE_ATTRIBUTE_READONLY;
-        }
-    } else {
-	flags = (*tclWinProcs->getFileAttributesProc)(nativeName);
-        if (flags == 0xFFFFFFFF) {
-	    flags = 0;
-	}
-    }
-
-    /*
-     * Set up the file sharing mode.  We want to allow simultaneous access.
-     */
-
-    shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-
-    /*
-     * Now we get to create the file.
-     */
-
-    handle = (*tclWinProcs->createFileProc)(nativeName, accessMode, 
-	    shareMode, NULL, createMode, flags, (HANDLE) NULL);
-
-    if (handle == INVALID_HANDLE_VALUE) {
-	DWORD err;
-	err = GetLastError();
-	if ((err & 0xffffL) == ERROR_OPEN_FAILED) {
-	    err = (mode & O_CREAT) ? ERROR_FILE_EXISTS : ERROR_FILE_NOT_FOUND;
-	}
-        TclWinConvertError(err);
-	if (interp != (Tcl_Interp *) NULL) {
-            Tcl_AppendResult(interp, "couldn't open \"", fileName, "\": ",
-			     Tcl_PosixError(interp), (char *) NULL);
-        }
-        Tcl_DStringFree(&buffer);
-        return NULL;
-    }
-    
-    type = GetFileType(handle);
-
-    /*
-     * If the file is a character device, we need to try to figure out
-     * whether it is a serial port, a console, or something else.  We
-     * test for the console case first because this is more common.
-     */
-
-    if (type == FILE_TYPE_CHAR) {
-	if (GetConsoleMode(handle, &consoleParams)) {
-	    type = FILE_TYPE_CONSOLE;
-	} else {
-	    dcb.DCBlength = sizeof( DCB ) ;
-	    if (GetCommState(handle, &dcb)) {
-		type = FILE_TYPE_SERIAL;
-	    }
-	}
-    }
-
-    channel = NULL;
-
-    switch (type)
-    {
-    case FILE_TYPE_SERIAL:
-	channel = TclWinOpenSerialChannel(handle, channelName,
-	        channelPermissions);
-	break;
-    case FILE_TYPE_CONSOLE:
-	channel = TclWinOpenConsoleChannel(handle, channelName,
-	        channelPermissions);
-	break;
-    case FILE_TYPE_PIPE:
-	if (channelPermissions & TCL_READABLE)
-	{
-	    readFile = TclWinMakeFile(handle);
-	}
-	if (channelPermissions & TCL_WRITABLE)
-	{
-	    writeFile = TclWinMakeFile(handle);
-	}
-	channel = TclpCreateCommandChannel(readFile, writeFile, NULL, 0, NULL);
-	break;
-    case FILE_TYPE_CHAR:
-    default:
-	channel = TclWinOpenFileChannel(handle, channelName,
-					channelPermissions,
-					(mode & O_APPEND) ? FILE_APPEND : 0);
-	break;
-
-    }
-
-    Tcl_DStringFree(&buffer);
-    Tcl_DStringFree(&ds);
-
-    if (channel != NULL)
-    {
-	if (seekFlag) {
-	    if (Tcl_Seek(channel, 0, SEEK_END) < 0) {
-		if (interp != (Tcl_Interp *) NULL) {
-		    Tcl_AppendResult(interp,
-			    "could not seek to end of file on \"",
-			    channelName, "\": ", Tcl_PosixError(interp),
-			    (char *) NULL);
-		}
-		Tcl_Close(NULL, channel);
-		return NULL;
-	    }
-	}
-    }
-    return channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeFileChannel --
- *
- *	Creates a Tcl_Channel from an existing platform specific file
- *	handle.
- *
- * Results:
- *	The Tcl_Channel created around the preexisting file.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeFileChannel(rawHandle, mode)
-    ClientData rawHandle;	/* OS level handle */
-    int mode;			/* ORed combination of TCL_READABLE and
-                                 * TCL_WRITABLE to indicate file mode. */
-{
-    char channelName[16 + TCL_INTEGER_SPACE];
-    Tcl_Channel channel = NULL;
-    HANDLE handle = (HANDLE) rawHandle;
-    DCB dcb;
-    DWORD consoleParams;
-    DWORD type;
-    TclFile readFile = NULL;
-    TclFile writeFile = NULL;
-
-    if (mode == 0) {
-	return NULL;
-    }
-
-    type = GetFileType(handle);
-
-    /*
-     * If the file is a character device, we need to try to figure out
-     * whether it is a serial port, a console, or something else.  We
-     * test for the console case first because this is more common.
-     */
-
-    if (type == FILE_TYPE_CHAR) {
-	if (GetConsoleMode(handle, &consoleParams)) {
-	    type = FILE_TYPE_CONSOLE;
-	} else {
-	    dcb.DCBlength = sizeof( DCB ) ;
-	    if (GetCommState(handle, &dcb)) {
-		type = FILE_TYPE_SERIAL;
-	    }
-	}
-    }
-
-    switch (type)
-    {
-    case FILE_TYPE_SERIAL:
-	channel = TclWinOpenSerialChannel(handle, channelName, mode);
-	break;
-    case FILE_TYPE_CONSOLE:
-	channel = TclWinOpenConsoleChannel(handle, channelName, mode);
-	break;
-    case FILE_TYPE_PIPE:
-	if (mode & TCL_READABLE)
-	{
-	    readFile = TclWinMakeFile(handle);
-	}
-	if (mode & TCL_WRITABLE)
-	{
-	    writeFile = TclWinMakeFile(handle);
-	}
-	channel = TclpCreateCommandChannel(readFile, writeFile, NULL, 0, NULL);
-	break;
-    case FILE_TYPE_UNKNOWN:
-	break;
-    case FILE_TYPE_CHAR:
-    default:
-	channel = TclWinOpenFileChannel(handle, channelName, mode, 0);
-	break;
-
-    }
-
-    return channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDefaultStdChannel --
- *
- *	Constructs a channel for the specified standard OS handle.
- *
- * Results:
- *	Returns the specified default standard channel, or NULL.
- *
- * Side effects:
- *	May cause the creation of a standard channel and the underlying
- *	file.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpGetDefaultStdChannel(type)
-    int type;			/* One of TCL_STDIN, TCL_STDOUT, TCL_STDERR. */
-{
-    Tcl_Channel channel;
-    HANDLE handle;
-    int mode;
-    char *bufMode;
-    DWORD handleId;		/* Standard handle to retrieve. */
-
-    switch (type) {
-	case TCL_STDIN:
-	    handleId = STD_INPUT_HANDLE;
-	    mode = TCL_READABLE;
-	    bufMode = "line";
-	    break;
-	case TCL_STDOUT:
-	    handleId = STD_OUTPUT_HANDLE;
-	    mode = TCL_WRITABLE;
-	    bufMode = "line";
-	    break;
-	case TCL_STDERR:
-	    handleId = STD_ERROR_HANDLE;
-	    mode = TCL_WRITABLE;
-	    bufMode = "none";
-	    break;
-	default:
-	    panic("TclGetDefaultStdChannel: Unexpected channel type");
-	    break;
-    }
-    handle = GetStdHandle(handleId);
-
-    /*
-     * Note that we need to check for 0 because Windows will return 0 if this
-     * is not a console mode application, even though this is not a valid
-     * handle. 
-     */
-
-    if ((handle == INVALID_HANDLE_VALUE) || (handle == 0)) {
-	return NULL;
-    }
-
-    channel = Tcl_MakeFileChannel(handle, mode);
-    if (channel == NULL) {
-	return NULL;
-    }
-
-    /*
-     * Set up the normal channel options for stdio handles.
-     */
-
-    if ((Tcl_SetChannelOption((Tcl_Interp *) NULL, channel, "-translation",
-            "auto") == TCL_ERROR)
-	    || (Tcl_SetChannelOption((Tcl_Interp *) NULL, channel, "-eofchar",
-		    "\032 {}") == TCL_ERROR)
-	    || (Tcl_SetChannelOption((Tcl_Interp *) NULL, channel,
-		    "-buffering", bufMode) == TCL_ERROR)) {
-        Tcl_Close((Tcl_Interp *) NULL, channel);
-        return (Tcl_Channel) NULL;
-    }
-    return channel;
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinOpenFileChannel --
- *
- *	Constructs a File channel for the specified standard OS handle.
- *      This is a helper function to break up the construction of 
- *      channels into File, Console, or Serial.
- *
- * Results:
- *	Returns the new channel, or NULL.
- *
- * Side effects:
- *	May open the channel and may cause creation of a file on the
- *	file system.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclWinOpenFileChannel(handle, channelName, permissions, appendMode)
-    HANDLE handle;
-    char *channelName;
-    int permissions;
-    int appendMode;
-{
-    FileInfo *infoPtr;
-    ThreadSpecificData *tsdPtr;
-
-    tsdPtr = FileInit();
-
-    /*
-     * See if a channel with this handle already exists.
-     */
-    
-    for (infoPtr = tsdPtr->firstFilePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->handle == (HANDLE) handle) {
-	    return (permissions == infoPtr->validMask) ? infoPtr->channel : NULL;
-	}
-    }
-
-    infoPtr = (FileInfo *) ckalloc((unsigned) sizeof(FileInfo));
-    infoPtr->nextPtr = tsdPtr->firstFilePtr;
-    tsdPtr->firstFilePtr = infoPtr;
-    infoPtr->validMask = permissions;
-    infoPtr->watchMask = 0;
-    infoPtr->flags = appendMode;
-    infoPtr->handle = handle;
-	
-    wsprintfA(channelName, "file%lx", (int) infoPtr);
-    
-    infoPtr->channel = Tcl_CreateChannel(&fileChannelType, channelName,
-	    (ClientData) infoPtr, permissions);
-    
-    /*
-     * Files have default translation of AUTO and ^Z eof char, which
-     * means that a ^Z will be accepted as EOF when reading.
-     */
-    
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
-
-    return infoPtr->channel;
-}
-
diff --git a/win/tclWinConsole.c b/win/tclWinConsole.c
deleted file mode 100644
index bd50859..0000000
--- a/win/tclWinConsole.c
+++ /dev/null
@@ -1,1272 +0,0 @@
-/* 
- * tclWinConsole.c --
- *
- *	This file implements the Windows-specific console functions,
- *	and the "console" channel driver.
- *
- * Copyright (c) 1999 by Scriptics Corp.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinConsole.c,v 1.2 1999/04/16 00:48:07 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-#include <dos.h>
-#include <fcntl.h>
-#include <io.h>
-#include <sys/stat.h>
-
-/*
- * The following variable is used to tell whether this module has been
- * initialized.
- */
-
-static int initialized = 0;
-
-/*
- * The consoleMutex locks around access to the initialized variable, and it is
- * used to protect background threads from being terminated while they are
- * using APIs that hold locks.
- */
-
-TCL_DECLARE_MUTEX(consoleMutex)
-
-/*
- * Bit masks used in the flags field of the ConsoleInfo structure below.
- */
-
-#define CONSOLE_PENDING	(1<<0)	/* Message is pending in the queue. */
-#define CONSOLE_ASYNC	(1<<1)	/* Channel is non-blocking. */
-
-/*
- * Bit masks used in the sharedFlags field of the ConsoleInfo structure below.
- */
-
-#define CONSOLE_EOF	  (1<<2)  /* Console has reached EOF. */
-#define CONSOLE_BUFFERED  (1<<3)  /* data was read into a buffer by the reader
-				     thread */
-
-#define CONSOLE_BUFFER_SIZE (8*1024)
-/*
- * This structure describes per-instance data for a console based channel.
- */
-
-typedef struct ConsoleInfo {
-    HANDLE handle;
-    int type;
-    struct ConsoleInfo *nextPtr;/* Pointer to next registered console. */
-    Tcl_Channel channel;	/* Pointer to channel structure. */
-    int validMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which operations are valid on the file. */
-    int watchMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which events should be reported. */
-    int flags;			/* State flags, see above for a list. */
-    Tcl_ThreadId threadId;	/* Thread to which events should be reported.
-				 * This value is used by the reader/writer
-				 * threads. */
-    HANDLE writeThread;		/* Handle to writer thread. */
-    HANDLE readThread;		/* Handle to reader thread. */
-    HANDLE writable;		/* Manual-reset event to signal when the
-				 * writer thread has finished waiting for
-				 * the current buffer to be written. */
-    HANDLE readable;		/* Manual-reset event to signal when the
-				 * reader thread has finished waiting for
-				 * input. */
-    HANDLE startWriter;		/* Auto-reset event used by the main thread to
-				 * signal when the writer thread should attempt
-				 * to write to the console. */
-    HANDLE startReader;		/* Auto-reset event used by the main thread to
-				 * signal when the reader thread should attempt
-				 * to read from the console. */
-    DWORD writeError;		/* An error caused by the last background
-				 * write.  Set to 0 if no error has been
-				 * detected.  This word is shared with the
-				 * writer thread so access must be
-				 * synchronized with the writable object.
-				 */
-    char *writeBuf;		/* Current background output buffer.
-				 * Access is synchronized with the writable
-				 * object. */
-    int writeBufLen;		/* Size of write buffer.  Access is
-				 * synchronized with the writable
-				 * object. */
-    int toWrite;		/* Current amount to be written.  Access is
-				 * synchronized with the writable object. */
-    int readFlags;		/* Flags that are shared with the reader
-				 * thread.  Access is synchronized with the
-				 * readable object.  */
-    int bytesRead;              /* number of bytes in the buffer */
-    int offset;                 /* number of bytes read out of the buffer */
-    char buffer[CONSOLE_BUFFER_SIZE];
-                                /* Data consumed by reader thread. */
-} ConsoleInfo;
-
-typedef struct ThreadSpecificData {
-    /*
-     * The following pointer refers to the head of the list of consoles
-     * that are being watched for file events.
-     */
-    
-    ConsoleInfo *firstConsolePtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * console events are generated.
- */
-
-typedef struct ConsoleEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    ConsoleInfo *infoPtr;	/* Pointer to console info structure.  Note
-				 * that we still have to verify that the
-				 * console exists before dereferencing this
-				 * pointer. */
-} ConsoleEvent;
-
-/*
- * Declarations for functions used only in this file.
- */
-
-static int		ApplicationType(Tcl_Interp *interp,
-			    const char *fileName, char *fullName);
-static void		BuildCommandLine(const char *executable, int argc, 
-			    char **argv, Tcl_DString *linePtr);
-static void		CopyChannel(HANDLE dst, HANDLE src);
-static BOOL		HasConsole(void);
-static TclFile		MakeFile(HANDLE handle);
-static char *		MakeTempFile(Tcl_DString *namePtr);
-static int		ConsoleBlockModeProc(ClientData instanceData, int mode);
-static void		ConsoleCheckProc(ClientData clientData, int flags);
-static int		ConsoleCloseProc(ClientData instanceData,
-			    Tcl_Interp *interp);
-static int		ConsoleEventProc(Tcl_Event *evPtr, int flags);
-static void		ConsoleExitHandler(ClientData clientData);
-static int		ConsoleGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
-static ThreadSpecificData *ConsoleInit(void);
-static int		ConsoleInputProc(ClientData instanceData, char *buf,
-			    int toRead, int *errorCode);
-static int		ConsoleOutputProc(ClientData instanceData, char *buf,
-			    int toWrite, int *errorCode);
-static DWORD WINAPI	ConsoleReaderThread(LPVOID arg);
-static void		ConsoleSetupProc(ClientData clientData, int flags);
-static void		ConsoleWatchProc(ClientData instanceData, int mask);
-static DWORD WINAPI	ConsoleWriterThread(LPVOID arg);
-static void		ProcExitHandler(ClientData clientData);
-static int		TempFileName(WCHAR name[MAX_PATH]);
-static int		WaitForRead(ConsoleInfo *infoPtr, int blocking);
-
-/*
- * This structure describes the channel type structure for command console
- * based IO.
- */
-
-static Tcl_ChannelType consoleChannelType = {
-    "console",			/* Type name. */
-    ConsoleBlockModeProc,	/* Set blocking or non-blocking mode.*/
-    ConsoleCloseProc,		/* Close proc. */
-    ConsoleInputProc,		/* Input proc. */
-    ConsoleOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. */
-    NULL,			/* Set option proc. */
-    NULL,			/* Get option proc. */
-    ConsoleWatchProc,		/* Set up notifier to watch the channel. */
-    ConsoleGetHandleProc,	/* Get an OS handle from channel. */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleInit --
- *
- *	This function initializes the static variables for this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new event source.
- *
- *----------------------------------------------------------------------
- */
-
-static ThreadSpecificData *
-ConsoleInit()
-{
-    ThreadSpecificData *tsdPtr;
-
-    /*
-     * Check the initialized flag first, then check again in the mutex.
-     * This is a speed enhancement.
-     */
-
-    if (!initialized) {
-	Tcl_MutexLock(&consoleMutex);
-	if (!initialized) {
-	    initialized = 1;
-	    Tcl_CreateExitHandler(ProcExitHandler, NULL);
-	}
-	Tcl_MutexUnlock(&consoleMutex);
-    }
-
-    tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->firstConsolePtr = NULL;
-	Tcl_CreateEventSource(ConsoleSetupProc, ConsoleCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(ConsoleExitHandler, NULL);
-    }
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleExitHandler --
- *
- *	This function is called to cleanup the console module before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the console event source.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ConsoleExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_DeleteEventSource(ConsoleSetupProc, ConsoleCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcExitHandler --
- *
- *	This function is called to cleanup the process list before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Resets the process list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_MutexLock(&consoleMutex);
-    initialized = 0;
-    Tcl_MutexUnlock(&consoleMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-ConsoleSetupProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    ConsoleInfo *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    int block = 1;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Look to see if any events are already pending.  If they are, poll.
-     */
-
-    for (infoPtr = tsdPtr->firstConsolePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-		block = 0;
-	    }
-	}
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    if (WaitForRead(infoPtr, 0) >= 0) {
-		block = 0;
-	    }
-	}
-    }
-    if (!block) {
-	Tcl_SetMaxBlockTime(&blockTime);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the console
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ConsoleCheckProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    ConsoleInfo *infoPtr;
-    ConsoleEvent *evPtr;
-    int needEvent;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready consoles that don't already have events
-     * queued.
-     */
-
-    for (infoPtr = tsdPtr->firstConsolePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->flags & CONSOLE_PENDING) {
-	    continue;
-	}
-	
-	/*
-	 * Queue an event if the console is signaled for reading or writing.
-	 */
-
-	needEvent = 0;
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-		needEvent = 1;
-	    }
-	}
-	
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    if (WaitForRead(infoPtr, 0) >= 0) {
-		needEvent = 1;
-	    }
-	}
-
-	if (needEvent) {
-	    infoPtr->flags |= CONSOLE_PENDING;
-	    evPtr = (ConsoleEvent *) ckalloc(sizeof(ConsoleEvent));
-	    evPtr->header.proc = ConsoleEventProc;
-	    evPtr->infoPtr = infoPtr;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleBlockModeProc --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleBlockModeProc(
-    ClientData instanceData,	/* Instance data for channel. */
-    int mode)			/* TCL_MODE_BLOCKING or
-                                 * TCL_MODE_NONBLOCKING. */
-{
-    ConsoleInfo *infoPtr = (ConsoleInfo *) instanceData;
-    
-    /*
-     * Consoles on Windows can not be switched between blocking and nonblocking,
-     * hence we have to emulate the behavior. This is done in the input
-     * function by checking against a bit in the state. We set or unset the
-     * bit here to cause the input function to emulate the correct behavior.
-     */
-
-    if (mode == TCL_MODE_NONBLOCKING) {
-	infoPtr->flags |= CONSOLE_ASYNC;
-    } else {
-	infoPtr->flags &= ~(CONSOLE_ASYNC);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleCloseProc --
- *
- *	Closes a console based IO channel.
- *
- * Results:
- *	0 on success, errno otherwise.
- *
- * Side effects:
- *	Closes the physical channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleCloseProc(
-    ClientData instanceData,	/* Pointer to ConsoleInfo structure. */
-    Tcl_Interp *interp)		/* For error reporting. */
-{
-    ConsoleInfo *consolePtr = (ConsoleInfo *) instanceData;
-    int errorCode;
-    ConsoleInfo *infoPtr, **nextPtrPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    errorCode = 0;
-    
-    /*
-     * Clean up the background thread if necessary.  Note that this
-     * must be done before we can close the file, since the 
-     * thread may be blocking trying to read from the console.
-     */
-    
-    if (consolePtr->readThread) {
-	/*
-	 * Forcibly terminate the background thread.  We cannot rely on the
-	 * thread to cleanly terminate itself because we have no way of
-	 * closing the handle without blocking in the case where the
-	 * thread is in the middle of an I/O operation.  Note that we need
-	 * to guard against terminating the thread while it is in the
-	 * middle of Tcl_ThreadAlert because it won't be able to release
-	 * the notifier lock.
-	 */
-
-	Tcl_MutexLock(&consoleMutex);
-	TerminateThread(consolePtr->readThread, 0);
-	Tcl_MutexUnlock(&consoleMutex);
-
-	/*
-	 * Wait for the thread to terminate.  This ensures that we are
-	 * completely cleaned up before we leave this function. 
-	 */
-
-	WaitForSingleObject(consolePtr->readThread, INFINITE);
-	CloseHandle(consolePtr->readThread);
-	CloseHandle(consolePtr->readable);
-	CloseHandle(consolePtr->startReader);
-	consolePtr->readThread = NULL;
-    }
-    consolePtr->validMask &= ~TCL_READABLE;
-
-    /*
-     * Wait for the writer thread to finish the current buffer, then
-     * terminate the thread and close the handles.  If the channel is
-     * nonblocking, there should be no pending write operations.
-     */
-    
-    if (consolePtr->writeThread) {
-	WaitForSingleObject(consolePtr->writable, INFINITE);
-
-	/*
-	 * Forcibly terminate the background thread.  We cannot rely on the
-	 * thread to cleanly terminate itself because we have no way of
-	 * closing the handle without blocking in the case where the
-	 * thread is in the middle of an I/O operation.  Note that we need
-	 * to guard against terminating the thread while it is in the
-	 * middle of Tcl_ThreadAlert because it won't be able to release
-	 * the notifier lock.
-	 */
-
-	Tcl_MutexLock(&consoleMutex);
-	TerminateThread(consolePtr->writeThread, 0);
-	Tcl_MutexUnlock(&consoleMutex);
-
-	/*
-	 * Wait for the thread to terminate.  This ensures that we are
-	 * completely cleaned up before we leave this function. 
-	 */
-
-	WaitForSingleObject(consolePtr->writeThread, INFINITE);
-	CloseHandle(consolePtr->writeThread);
-	CloseHandle(consolePtr->writable);
-	CloseHandle(consolePtr->startWriter);
-	consolePtr->writeThread = NULL;
-    }
-    consolePtr->validMask &= ~TCL_WRITABLE;
-
-
-    /*
-     * Don't close the Win32 handle if the handle is a standard channel
-     * during the exit process.  Otherwise, one thread may kill the stdio
-     * of another.
-     */
-
-    if (!TclInExit() 
-	    || ((GetStdHandle(STD_INPUT_HANDLE) != consolePtr->handle)
-		&& (GetStdHandle(STD_OUTPUT_HANDLE) != consolePtr->handle)
-		&& (GetStdHandle(STD_ERROR_HANDLE) != consolePtr->handle))) {
-	if (CloseHandle(consolePtr->handle) == FALSE) {
-	    TclWinConvertError(GetLastError());
-	    errorCode = errno;
-	}
-    }
-    
-    consolePtr->watchMask &= consolePtr->validMask;
-
-    /*
-     * Remove the file from the list of watched files.
-     */
-
-    for (nextPtrPtr = &(tsdPtr->firstConsolePtr), infoPtr = *nextPtrPtr;
-	    infoPtr != NULL;
-	    nextPtrPtr = &infoPtr->nextPtr, infoPtr = *nextPtrPtr) {
-	if (infoPtr == (ConsoleInfo *)consolePtr) {
-	    *nextPtrPtr = infoPtr->nextPtr;
-	    break;
-	}
-    }
-    if (consolePtr->writeBuf != NULL) {
-	ckfree(consolePtr->writeBuf);
-	consolePtr->writeBuf = 0;
-    }
-    ckfree((char*) consolePtr);
-
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleInputProc --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleInputProc(
-    ClientData instanceData,		/* Console state. */
-    char *buf,				/* Where to store data read. */
-    int bufSize,			/* How much space is available
-                                         * in the buffer? */
-    int *errorCode)			/* Where to store error code. */
-{
-    ConsoleInfo *infoPtr = (ConsoleInfo *) instanceData;
-    DWORD count, bytesRead = 0;
-    int result;
-
-    *errorCode = 0;
-
-    /*
-     * Synchronize with the reader thread.
-     */
-    
-    result = WaitForRead(infoPtr, (infoPtr->flags & CONSOLE_ASYNC) ? 0 : 1);
-    
-    /*
-     * If an error occurred, return immediately.
-     */
-    
-    if (result == -1) {
-	*errorCode = errno;
-	return -1;
-    }
-
-    if (infoPtr->readFlags & CONSOLE_BUFFERED) {
-	/*
-	 * Data is stored in the buffer.
-	 */
-
-	if (bufSize < (infoPtr->bytesRead - infoPtr->offset)) {
-	    memcpy(buf, &infoPtr->buffer[infoPtr->offset], bufSize);
-	    bytesRead = bufSize;
-	    infoPtr->offset += bufSize;
-	} else {
-	    memcpy(buf, &infoPtr->buffer[infoPtr->offset], bufSize);
-	    bytesRead = infoPtr->bytesRead - infoPtr->offset;
-
-	    /*
-	     * Reset the buffer
-	     */
-	    
-	    infoPtr->readFlags &= ~CONSOLE_BUFFERED;
-	    infoPtr->offset = 0;
-	}
-
-	return bytesRead;
-    }
-    
-    /*
-     * Attempt to read bufSize bytes.  The read will return immediately
-     * if there is any data available.  Otherwise it will block until
-     * at least one byte is available or an EOF occurs.
-     */
-
-    if (ReadConsole(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &count,
-		    (LPOVERLAPPED) NULL) == TRUE) {
-	buf[count] = '\0';
-	return count;
-    }
-
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleOutputProc --
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleOutputProc(
-    ClientData instanceData,		/* Console state. */
-    char *buf,				/* The data buffer. */
-    int toWrite,			/* How many bytes to write? */
-    int *errorCode)			/* Where to store error code. */
-{
-    ConsoleInfo *infoPtr = (ConsoleInfo *) instanceData;
-    DWORD bytesWritten, timeout;
-    
-    *errorCode = 0;
-    timeout = (infoPtr->flags & CONSOLE_ASYNC) ? 0 : INFINITE;
-    if (WaitForSingleObject(infoPtr->writable, timeout) == WAIT_TIMEOUT) {
-	/*
-	 * The writer thread is blocked waiting for a write to complete
-	 * and the channel is in non-blocking mode.
-	 */
-
-	errno = EAGAIN;
-	goto error;
-    }
-    
-    /*
-     * Check for a background error on the last write.
-     */
-
-    if (infoPtr->writeError) {
-	TclWinConvertError(infoPtr->writeError);
-	infoPtr->writeError = 0;
-	goto error;
-    }
-
-    if (infoPtr->flags & CONSOLE_ASYNC) {
-	/*
-	 * The console is non-blocking, so copy the data into the output
-	 * buffer and restart the writer thread.
-	 */
-
-	if (toWrite > infoPtr->writeBufLen) {
-	    /*
-	     * Reallocate the buffer to be large enough to hold the data.
-	     */
-
-	    if (infoPtr->writeBuf) {
-		ckfree(infoPtr->writeBuf);
-	    }
-	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
-	}
-	memcpy(infoPtr->writeBuf, buf, toWrite);
-	infoPtr->toWrite = toWrite;
-	ResetEvent(infoPtr->writable);
-	SetEvent(infoPtr->startWriter);
-	bytesWritten = toWrite;
-    } else {
-	/*
-	 * In the blocking case, just try to write the buffer directly.
-	 * This avoids an unnecessary copy.
-	 */
-
-	if (WriteFile(infoPtr->handle, (LPVOID) buf, (DWORD) toWrite,
-		&bytesWritten, (LPOVERLAPPED) NULL) == FALSE) {
-	    TclWinConvertError(GetLastError());
-	    goto error;
-	}
-    }
-    return bytesWritten;
-
-    error:
-    *errorCode = errno;
-    return -1;
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleEventProc --
- *
- *	This function is invoked by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure invokes
- *	Tcl_NotifyChannel on the console.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the notifier callback does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleEventProc(
-    Tcl_Event *evPtr,		/* Event to service. */
-    int flags)			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    ConsoleEvent *consoleEvPtr = (ConsoleEvent *)evPtr;
-    ConsoleInfo *infoPtr;
-    int mask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the list of watched consoles for the one whose handle
-     * matches the event.  We do this rather than simply dereferencing
-     * the handle in the event so that consoles can be deleted while the
-     * event is in the queue.
-     */
-
-    for (infoPtr = tsdPtr->firstConsolePtr; infoPtr != NULL;
-	    infoPtr = infoPtr->nextPtr) {
-	if (consoleEvPtr->infoPtr == infoPtr) {
-	    infoPtr->flags &= ~(CONSOLE_PENDING);
-	    break;
-	}
-    }
-
-    /*
-     * Remove stale events.
-     */
-
-    if (!infoPtr) {
-	return 1;
-    }
-
-    /*
-     * Check to see if the console is readable.  Note
-     * that we can't tell if a console is writable, so we always report it
-     * as being writable unless we have detected EOF.
-     */
-
-    mask = 0;
-    if (infoPtr->watchMask & TCL_WRITABLE) {
-	if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-	  mask = TCL_WRITABLE;
-	}
-    }
-
-    if (infoPtr->watchMask & TCL_READABLE) {
-	if (WaitForRead(infoPtr, 0) >= 0) {
-	    if (infoPtr->readFlags & CONSOLE_EOF) {
-		mask = TCL_READABLE;
-	    } else {
-		mask |= TCL_READABLE;
-	    }
-	} 
-    }
-
-    /*
-     * Inform the channel of the events.
-     */
-
-    Tcl_NotifyChannel(infoPtr->channel, infoPtr->watchMask & mask);
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleWatchProc --
- *
- *	Called by the notifier to set up to watch for events on this
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ConsoleWatchProc(
-    ClientData instanceData,		/* Console state. */
-    int mask)				/* What events to watch for, OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    ConsoleInfo **nextPtrPtr, *ptr;
-    ConsoleInfo *infoPtr = (ConsoleInfo *) instanceData;
-    int oldMask = infoPtr->watchMask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Since most of the work is handled by the background threads,
-     * we just need to update the watchMask and then force the notifier
-     * to poll once. 
-     */
-
-    infoPtr->watchMask = mask & infoPtr->validMask;
-    if (infoPtr->watchMask) {
-	Tcl_Time blockTime = { 0, 0 };
-	if (!oldMask) {
-	    infoPtr->nextPtr = tsdPtr->firstConsolePtr;
-	    tsdPtr->firstConsolePtr = infoPtr;
-	}
-	Tcl_SetMaxBlockTime(&blockTime);
-    } else {
-	if (oldMask) {
-	    /*
-	     * Remove the console from the list of watched consoles.
-	     */
-
-	    for (nextPtrPtr = &(tsdPtr->firstConsolePtr), ptr = *nextPtrPtr;
-		 ptr != NULL;
-		 nextPtrPtr = &ptr->nextPtr, ptr = *nextPtrPtr) {
-		if (infoPtr == ptr) {
-		    *nextPtrPtr = ptr->nextPtr;
-		    break;
-		}
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	inside a command consoleline based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConsoleGetHandleProc(
-    ClientData instanceData,	/* The console state. */
-    int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr)	/* Where to store the handle.  */
-{
-    ConsoleInfo *infoPtr = (ConsoleInfo *) instanceData;
-
-    *handlePtr = (ClientData) infoPtr->handle;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForRead --
- *
- *	Wait until some data is available, the console is at
- *	EOF or the reader thread is blocked waiting for data (if the
- *	channel is in non-blocking mode).
- *
- * Results:
- *	Returns 1 if console is readable.  Returns 0 if there is no data
- *	on the console, but there is buffered data.  Returns -1 if an
- *	error occurred.  If an error occurred, the threads may not
- *	be synchronized.
- *
- * Side effects:
- *	Updates the shared state flags.  If no error occurred,
- *      the reader thread is blocked waiting for a signal from the 
- *      main thread.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForRead(
-    ConsoleInfo *infoPtr,		/* Console state. */
-    int blocking)		/* Indicates whether call should be
-				 * blocking or not. */
-{
-    DWORD timeout, count;
-    HANDLE *handle = infoPtr->handle;
-    INPUT_RECORD input;
-    
-    while (1) {
-	/*
-	 * Synchronize with the reader thread.
-	 */
-       
-	timeout = blocking ? INFINITE : 0;
-	if (WaitForSingleObject(infoPtr->readable, timeout) == WAIT_TIMEOUT) {
-	    /*
-	     * The reader thread is blocked waiting for data and the channel
-	     * is in non-blocking mode.
-	     */
-	    errno = EAGAIN;
-	    return -1;
-	}
-	
-	/*
-	 * At this point, the two threads are synchronized, so it is safe
-	 * to access shared state.
-	 */
-	
-	/*
-	 * If the console has hit EOF, it is always readable.
-	 */
-	
-	if (infoPtr->readFlags & CONSOLE_EOF) {
-	    return 1;
-	}
-	
-	if (PeekConsoleInput(handle, &input, 1, &count) == FALSE) {
-            /*
-	     * Check to see if the peek failed because of EOF.
-	     */
-	    
-	    TclWinConvertError(GetLastError());
-	    
-	    if (errno == EOF) {
-		infoPtr->readFlags |= CONSOLE_EOF;
-		return 1;
-	    }
-
-	    /*
-	     * Ignore errors if there is data in the buffer.
-	     */
-	    
-	    if (infoPtr->readFlags & CONSOLE_BUFFERED) {
-		return 0;
-	    } else {
-		return -1;
-	    }
-	}
-
-	/*
-	 * If there is data in the buffer, the console must be
-	 * readable (since it is a line-oriented device).
-	 */
-
-	if (infoPtr->readFlags & CONSOLE_BUFFERED) {
-	    return 1;
-	}
-
-	
-	/*
-	 * There wasn't any data available, so reset the thread and
-	 * try again.
-	 */
-    
-	ResetEvent(infoPtr->readable);
-	SetEvent(infoPtr->startReader);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleReaderThread --
- *
- *	This function runs in a separate thread and waits for input
- *	to become available on a console.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Signals the main thread when input become available.  May
- *	cause the main thread to wake up by posting a message.  May
- *	one line from the console for each wait operation.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-ConsoleReaderThread(LPVOID arg)
-{
-    ConsoleInfo *infoPtr = (ConsoleInfo *)arg;
-    HANDLE *handle = infoPtr->handle;
-    DWORD count;
-
-    for (;;) {
-	/*
-	 * Wait for the main thread to signal before attempting to wait.
-	 */
-
-	WaitForSingleObject(infoPtr->startReader, INFINITE);
-
-	count = 0;
-
-	/* 
-	 * Look for data on the console, but first ignore any events
-	 * that are not KEY_EVENTs 
-	 */
-	if (ReadConsole(handle, infoPtr->buffer, CONSOLE_BUFFER_SIZE,
-		&infoPtr->bytesRead, NULL) != FALSE) {
-	    /*
-	     * Data was stored in the buffer.
-	     */
-	    
-	    infoPtr->readFlags |= CONSOLE_BUFFERED;
-	} else {
-	    DWORD err;
-	    err = GetLastError();
-	    
-	    if (err == EOF) {
-		infoPtr->readFlags = CONSOLE_EOF;
-	    }
-	}
-
-	/*
-	 * Signal the main thread by signalling the readable event and
-	 * then waking up the notifier thread.
-	 */
-
-	SetEvent(infoPtr->readable);
-
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&consoleMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&consoleMutex);
-    }
-    return 0;			/* NOT REACHED */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConsoleWriterThread --
- *
- *	This function runs in a separate thread and writes data
- *	onto a console.
- *
- * Results:
- *	Always returns 0.
- *
- * Side effects:
- *	Signals the main thread when an output operation is completed.
- *	May cause the main thread to wake up by posting a message.  
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-ConsoleWriterThread(LPVOID arg)
-{
-
-    ConsoleInfo *infoPtr = (ConsoleInfo *)arg;
-    HANDLE *handle = infoPtr->handle;
-    DWORD count, toWrite;
-    char *buf;
-
-    for (;;) {
-	/*
-	 * Wait for the main thread to signal before attempting to write.
-	 */
-
-	WaitForSingleObject(infoPtr->startWriter, INFINITE);
-
-	buf = infoPtr->writeBuf;
-	toWrite = infoPtr->toWrite;
-
-	/*
-	 * Loop until all of the bytes are written or an error occurs.
-	 */
-
-	while (toWrite > 0) {
-	    if (WriteFile(handle, buf, toWrite, &count, NULL) == FALSE) {
-		infoPtr->writeError = GetLastError();
-		break;
-	    } else {
-		toWrite -= count;
-		buf += count;
-	    }
-	}
-
-	/*
-	 * Signal the main thread by signalling the writable event and
-	 * then waking up the notifier thread.
-	 */
-	
-	SetEvent(infoPtr->writable);
-
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&consoleMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&consoleMutex);
-    }
-    return 0;			/* NOT REACHED */
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinOpenConsoleChannel --
- *
- *	Constructs a Console channel for the specified standard OS handle.
- *      This is a helper function to break up the construction of 
- *      channels into File, Console, or Serial.
- *
- * Results:
- *	Returns the new channel, or NULL.
- *
- * Side effects:
- *	May open the channel
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclWinOpenConsoleChannel(handle, channelName, permissions)
-    HANDLE handle;
-    char *channelName;
-    int permissions;
-{
-    char encoding[4 + TCL_INTEGER_SPACE];
-    ConsoleInfo *infoPtr;
-    ThreadSpecificData *tsdPtr;
-    DWORD id;
-
-    tsdPtr = ConsoleInit();
-
-    /*
-     * See if a channel with this handle already exists.
-     */
-    
-    infoPtr = (ConsoleInfo *) ckalloc((unsigned) sizeof(ConsoleInfo));
-    memset(infoPtr, 0, sizeof(ConsoleInfo));
-
-    infoPtr->validMask = permissions;
-    infoPtr->handle = handle;
-
-    wsprintfA(encoding, "cp%d", GetConsoleCP());
-    
-    /*
-     * Use the pointer for the name of the result channel.
-     * This keeps the channel names unique, since some may share
-     * handles (stdin/stdout/stderr for instance).
-     */
-
-    wsprintfA(channelName, "file%lx", (int) infoPtr);
-    
-    infoPtr->channel = Tcl_CreateChannel(&consoleChannelType, channelName,
-            (ClientData) infoPtr, permissions);
-
-    infoPtr->threadId = Tcl_GetCurrentThread();
-
-    if (permissions & TCL_READABLE) {
-	infoPtr->readable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	infoPtr->startReader = CreateEvent(NULL, FALSE, FALSE, NULL);
-	infoPtr->readThread = CreateThread(NULL, 8000, ConsoleReaderThread,
-	        infoPtr, 0, &id);
-	SetThreadPriority(infoPtr->readThread, THREAD_PRIORITY_HIGHEST); 
-    }
-
-    if (permissions & TCL_WRITABLE) {
-	infoPtr->writable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	infoPtr->startWriter = CreateEvent(NULL, FALSE, FALSE, NULL);
-	infoPtr->writeThread = CreateThread(NULL, 8000, ConsoleWriterThread,
-	        infoPtr, 0, &id);
-    }
-
-    /*
-     * Files have default translation of AUTO and ^Z eof char, which
-     * means that a ^Z will be accepted as EOF when reading.
-     */
-    
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-encoding", encoding);
-
-    return infoPtr->channel;
-}
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
deleted file mode 100644
index 9b0ec82..0000000
--- a/win/tclWinDde.c
+++ /dev/null
@@ -1,1287 +0,0 @@
-/* 
- * tclWinDde.c --
- *
- *	This file provides procedures that implement the "send"
- *	command, allowing commands to be passed from interpreter
- *	to interpreter.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinDde.c,v 1.2 1999/04/16 00:48:08 stanton Exp $
- */
-
-#include "tclPort.h"
-#include <ddeml.h>
-
-/*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Registry_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/* 
- * The following structure is used to keep track of the interpreters
- * registered by this process.
- */
-
-typedef struct RegisteredInterp {
-    struct RegisteredInterp *nextPtr;
-				/* The next interp this application knows
-				 * about. */
-    char *name;			/* Interpreter's name (malloc-ed). */
-    Tcl_Interp *interp;		/* The interpreter attached to this name. */
-} RegisteredInterp;
-
-/*
- * Used to keep track of conversations.
- */
-
-typedef struct Conversation {
-    struct Conversation *nextPtr;
-				/* The next conversation in the list. */
-    RegisteredInterp *riPtr;	/* The info we know about the conversation. */
-    HCONV hConv;		/* The DDE handle for this conversation. */
-    Tcl_Obj *returnPackagePtr;	/* The result package for this conversation. */
-} Conversation;
-
-typedef struct ThreadSpecificData {
-    Conversation *currentConversations;
-                                /* A list of conversations currently
-				 * being processed. */
-    RegisteredInterp *interpListPtr;
-                                /* List of all interpreters registered
-				 * in the current process. */
-} ThreadSpecificData;
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following variables cannot be placed in thread-local storage.
- * The Mutex ddeMutex guards access to the ddeInstance.
- */
-static HSZ ddeService = 0;
-static DWORD ddeInstance;       /* The application instance handle given
-				 * to us by DdeInitialize. */
-static int ddeIsServer = 0;
-
-TCL_DECLARE_MUTEX(ddeMutex)
-
-/*
- * Forward declarations for procedures defined later in this file.
- */
-
-static void		    DdeExitProc _ANSI_ARGS_((ClientData clientData));
-static void		    DeleteProc _ANSI_ARGS_((ClientData clientData));
-static Tcl_Obj *	    ExecuteRemoteObject _ANSI_ARGS_((
-				RegisteredInterp *riPtr, 
-				Tcl_Obj *ddeObjectPtr));
-static int		    MakeDdeConnection _ANSI_ARGS_((Tcl_Interp *interp,
-				char *name, HCONV *ddeConvPtr));
-static HDDEDATA CALLBACK    DdeServerProc _ANSI_ARGS_((UINT uType,
-				UINT uFmt, HCONV hConv, HSZ ddeTopic,
-				HSZ ddeItem, HDDEDATA hData, DWORD dwData1, 
-				DWORD dwData2));
-static void		    SetDdeError _ANSI_ARGS_((Tcl_Interp *interp));
-int Tcl_DdeObjCmd(ClientData clientData,	/* Used only for deletion */
-	Tcl_Interp *interp,		/* The interp we are sending from */
-	int objc,			/* Number of arguments */
-	Tcl_Obj *CONST objv[]);	/* The arguments */
-
-EXTERN int Dde_Init(Tcl_Interp *interp);
-
-/*
- *----------------------------------------------------------------------
- *
- * Dde_Init --
- *
- *	This procedure initializes the dde command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Dde_Init(
-    Tcl_Interp *interp)
-{
-    ThreadSpecificData *tsdPtr;
-    
-    if (!Tcl_InitStubs(interp, "8.0", 0)) {
-	return TCL_ERROR;
-    }
-
-    Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd, NULL, NULL);
-
-    tsdPtr = (ThreadSpecificData *)
-	Tcl_GetThreadData((Tcl_ThreadDataKey *) &dataKey, sizeof(ThreadSpecificData));
-    
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->currentConversations = NULL;
-	tsdPtr->interpListPtr = NULL;
-    }
-    Tcl_CreateExitHandler(DdeExitProc, NULL);
-
-    return Tcl_PkgProvide(interp, "dde", "1.0");
-}
-
-
-
-static void
-Initialize()
-{
-    int nameFound = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    
-    /*
-     * See if the application is already registered; if so, remove its
-     * current name from the registry. The deletion of the command
-     * will take care of disposing of this entry.
-     */
-
-    if (tsdPtr->interpListPtr != NULL) {
-	nameFound = 1;
-    }
-
-    /*
-     * Make sure that the DDE server is there. This is done only once,
-     * add an exit handler tear it down.
-     */
-
-    if (ddeInstance == 0) {
-	Tcl_MutexLock(&ddeMutex);
-	if (ddeInstance == 0) {
-	    if (DdeInitialize(&ddeInstance, DdeServerProc,
-		    CBF_SKIP_REGISTRATIONS
-		    | CBF_SKIP_UNREGISTRATIONS
-		    | CBF_FAIL_POKES, 0) 
-		    != DMLERR_NO_ERROR) {
-		DdeUninitialize(ddeInstance);
-		ddeInstance = 0;
-	    }
-	}
-	Tcl_MutexUnlock(&ddeMutex);
-    }
-    if ((ddeService == 0) && (nameFound != 0)) {
-	Tcl_MutexLock(&ddeMutex);
-	if ((ddeService == 0) && (nameFound != 0)) {
-	    ddeIsServer = 1;
-	    Tcl_CreateExitHandler(DdeExitProc, NULL);
-	    ddeService = DdeCreateStringHandle(ddeInstance, "TclEval", 0);
-	    DdeNameService(ddeInstance, ddeService, 0L, DNS_REGISTER);
-	} else {
-	    ddeIsServer = 0;
-	}
-	Tcl_MutexUnlock(&ddeMutex);
-    }
-}    
-
-
-/*
- *--------------------------------------------------------------
- *
- * DdeSetServerName --
- *
- *	This procedure is called to associate an ASCII name with a Dde
- *	server.  If the interpreter has already been named, the
- *	name replaces the old one.
- *
- * Results:
- *	The return value is the name actually given to the interp.
- *	This will normally be the same as name, but if name was already
- *	in use for a Dde Server then a name of the form "name #2" will
- *	be chosen,  with a high enough number to make the name unique.
- *
- * Side effects:
- *	Registration info is saved, thereby allowing the "send" command
- *	to be used later to invoke commands in the application.  In
- *	addition, the "send" command is created in the application's
- *	interpreter.  The registration will be removed automatically
- *	if the interpreter is deleted or the "send" command is removed.
- *
- *--------------------------------------------------------------
- */
-
-static char *
-DdeSetServerName(interp, name)
-    Tcl_Interp *interp;
-    char *name;			/* The name that will be used to
-				 * refer to the interpreter in later
-				 * "send" commands.  Must be globally
-				 * unique. */
-{
-    int suffix, offset;
-    RegisteredInterp *riPtr, *prevPtr;
-    Tcl_DString dString;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * See if the application is already registered; if so, remove its
-     * current name from the registry. The deletion of the command
-     * will take care of disposing of this entry.
-     */
-
-    for (riPtr = tsdPtr->interpListPtr, prevPtr = NULL; riPtr != NULL; 
-	    prevPtr = riPtr, riPtr = riPtr->nextPtr) {
-	if (riPtr->interp == interp) {
-	    if (name != NULL) {
-		if (prevPtr == NULL) {
-		    tsdPtr->interpListPtr = tsdPtr->interpListPtr->nextPtr;
-		} else {
-		    prevPtr->nextPtr = riPtr->nextPtr;
-		}
-		break;
-	    } else {
-		/*
-		 * the name was NULL, so the caller is asking for
-		 * the name of the current interp.
-		 */
-
-		return riPtr->name;
-	    }
-	}
-    }
-
-    if (name == NULL) {
-	/*
-	 * the name was NULL, so the caller is asking for
-	 * the name of the current interp, but it doesn't
-	 * have a name.
-	 */
-
-	return "";
-    }
-    
-    /*
-     * Pick a name to use for the application.  Use "name" if it's not
-     * already in use.  Otherwise add a suffix such as " #2", trying
-     * larger and larger numbers until we eventually find one that is
-     * unique.
-     */
-
-    suffix = 1;
-    offset = 0;
-    Tcl_DStringInit(&dString);
-
-    /*
-     * We have found a unique name. Now add it to the registry.
-     */
-
-    riPtr = (RegisteredInterp *) ckalloc(sizeof(RegisteredInterp));
-    riPtr->interp = interp;
-    riPtr->name = ckalloc(strlen(name) + 1);
-    riPtr->nextPtr = tsdPtr->interpListPtr;
-    tsdPtr->interpListPtr = riPtr;
-    strcpy(riPtr->name, name);
-
-    Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd,
-	    (ClientData) riPtr, DeleteProc);
-    if (Tcl_IsSafe(interp)) {
-	Tcl_HideCommand(interp, "dde", "dde");
-    }
-    Tcl_DStringFree(&dString);
-
-    return riPtr->name;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DeleteProc
- *
- *	This procedure is called when the command "dde" is destroyed.
- *
- * Results:
- *	none
- *
- * Side effects:
- *	The interpreter given by riPtr is unregistered.
- *
- *--------------------------------------------------------------
- */
-
-static void
-DeleteProc(clientData)
-    ClientData clientData;	/* The interp we are deleting passed
-				 * as ClientData. */
-{
-    RegisteredInterp *riPtr = (RegisteredInterp *) clientData;
-    RegisteredInterp *searchPtr, *prevPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    for (searchPtr = tsdPtr->interpListPtr, prevPtr = NULL;
-	    (searchPtr != NULL) && (searchPtr != riPtr);
-	    prevPtr = searchPtr, searchPtr = searchPtr->nextPtr) {
-	/*
-	 * Empty loop body.
-	 */
-    }
-
-    if (searchPtr != NULL) {
-	if (prevPtr == NULL) {
-	    tsdPtr->interpListPtr = tsdPtr->interpListPtr->nextPtr;
-	} else {
-	    prevPtr->nextPtr = searchPtr->nextPtr;
-	}
-    }
-    ckfree(riPtr->name);
-    Tcl_EventuallyFree(clientData, TCL_DYNAMIC);
-}
-
-/*
- *--------------------------------------------------------------
- *
- * ExecuteRemoteObject --
- *
- *	Takes the package delivered by DDE and executes it in
- *	the server's interpreter.
- *
- * Results:
- *	A list Tcl_Obj * that describes what happened. The first
- *	element is the numerical return code (TCL_ERROR, etc.).
- *	The second element is the result of the script. If the
- *	return result was TCL_ERROR, then the third element
- *	will be the value of the global "errorCode", and the
- *	fourth will be the value of the global "errorInfo".
- *	The return result will have a refCount of 0.
- *
- * Side effects:
- *	A Tcl script is run, which can cause all kinds of other
- *	things to happen.
- *
- *--------------------------------------------------------------
- */
-
-static Tcl_Obj *
-ExecuteRemoteObject(
-    RegisteredInterp *riPtr,	    /* Info about this server. */
-    Tcl_Obj *ddeObjectPtr)	    /* The object to execute. */
-{
-    Tcl_Obj *errorObjPtr;
-    Tcl_Obj *returnPackagePtr;
-    int result;
-
-    result = Tcl_EvalObjEx(riPtr->interp, ddeObjectPtr, TCL_EVAL_GLOBAL);
-    returnPackagePtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    Tcl_ListObjAppendElement(NULL, returnPackagePtr,
-	    Tcl_NewIntObj(result));
-    Tcl_ListObjAppendElement(NULL, returnPackagePtr,
-	    Tcl_GetObjResult(riPtr->interp));
-    if (result == TCL_ERROR) {
-	errorObjPtr = Tcl_GetVar2Ex(riPtr->interp, "errorCode", NULL,
-		TCL_GLOBAL_ONLY);
-	Tcl_ListObjAppendElement(NULL, returnPackagePtr, errorObjPtr);
-	errorObjPtr = Tcl_GetVar2Ex(riPtr->interp, "errorInfo", NULL,
-		TCL_GLOBAL_ONLY);
-        Tcl_ListObjAppendElement(NULL, returnPackagePtr, errorObjPtr);
-    }
-
-    return returnPackagePtr;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * DdeServerProc --
- *
- *	Handles all transactions for this server. Can handle
- *	execute, request, and connect protocols. Dde will
- *	call this routine when a client attempts to run a dde
- *	command using this server.
- *
- * Results:
- *	A DDE Handle with the result of the dde command.
- *
- * Side effects:
- *	Depending on which command is executed, arbitrary
- *	Tcl scripts can be run.
- *
- *--------------------------------------------------------------
- */
-
-static HDDEDATA CALLBACK
-DdeServerProc (
-    UINT uType,			/* The type of DDE transaction we
-				 * are performing. */
-    UINT uFmt,			/* The format that data is sent or
-				 * received. */
-    HCONV hConv,		/* The conversation associated with the 
-				 * current transaction. */
-    HSZ ddeTopic,		/* A string handle. Transaction-type 
-				 * dependent. */
-    HSZ ddeItem,		/* A string handle. Transaction-type 
-				 * dependent. */
-    HDDEDATA hData,		/* DDE data. Transaction-type dependent. */
-    DWORD dwData1,		/* Transaction-dependent data. */
-    DWORD dwData2)		/* Transaction-dependent data. */
-{
-    Tcl_DString dString;
-    int len;
-    char *utilString;
-    Tcl_Obj *ddeObjectPtr;
-    HDDEDATA ddeReturn = NULL;
-    RegisteredInterp *riPtr;
-    Conversation *convPtr, *prevConvPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    switch(uType) {
-	case XTYP_CONNECT:
-
-	    /*
-	     * Dde is trying to initialize a conversation with us. Check
-	     * and make sure we have a valid topic.
-	     */
-
-	    len = DdeQueryString(ddeInstance, ddeTopic, NULL, 0, 0);
-	    Tcl_DStringInit(&dString);
-	    Tcl_DStringSetLength(&dString, len);
-	    utilString = Tcl_DStringValue(&dString);
-	    DdeQueryString(ddeInstance, ddeTopic, utilString, len + 1,
-		    CP_WINANSI);
-
-	    for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
-		    riPtr = riPtr->nextPtr) {
-		if (stricmp(utilString, riPtr->name) == 0) {
-		    Tcl_DStringFree(&dString);
-		    return (HDDEDATA) TRUE;
-		}
-	    }
-
-	    Tcl_DStringFree(&dString);
-	    return (HDDEDATA) FALSE;
-
-	case XTYP_CONNECT_CONFIRM:
-
-	    /*
-	     * Dde has decided that we can connect, so it gives us a 
-	     * conversation handle. We need to keep track of it
-	     * so we know which execution result to return in an
-	     * XTYP_REQUEST.
-	     */
-
-	    len = DdeQueryString(ddeInstance, ddeTopic, NULL, 0, 0);
-	    Tcl_DStringInit(&dString);
-	    Tcl_DStringSetLength(&dString, len);
-	    utilString = Tcl_DStringValue(&dString);
-	    DdeQueryString(ddeInstance, ddeTopic, utilString, len + 1, 
-		    CP_WINANSI);
-	    for (riPtr = tsdPtr->interpListPtr; riPtr != NULL; 
-		    riPtr = riPtr->nextPtr) {
-		if (stricmp(riPtr->name, utilString) == 0) {
-		    convPtr = (Conversation *) ckalloc(sizeof(Conversation));
-		    convPtr->nextPtr = tsdPtr->currentConversations;
-		    convPtr->returnPackagePtr = NULL;
-		    convPtr->hConv = hConv;
-		    convPtr->riPtr = riPtr;
-		    tsdPtr->currentConversations = convPtr;
-		    break;
-		}
-	    }
-	    Tcl_DStringFree(&dString);
-	    return (HDDEDATA) TRUE;
-
-	case XTYP_DISCONNECT:
-
-	    /*
-	     * The client has disconnected from our server. Forget this
-	     * conversation.
-	     */
-
-	    for (convPtr = tsdPtr->currentConversations, prevConvPtr = NULL;
-		    convPtr != NULL; 
-		    prevConvPtr = convPtr, convPtr = convPtr->nextPtr) {
-		if (hConv == convPtr->hConv) {
-		    if (prevConvPtr == NULL) {
-			tsdPtr->currentConversations = convPtr->nextPtr;
-		    } else {
-			prevConvPtr->nextPtr = convPtr->nextPtr;
-		    }
-		    if (convPtr->returnPackagePtr != NULL) {
-			Tcl_DecrRefCount(convPtr->returnPackagePtr);
-		    }
-		    ckfree((char *) convPtr);
-		    break;
-		}
-	    }
-	    return (HDDEDATA) TRUE;
-
-	case XTYP_REQUEST:
-
-	    /*
-	     * This could be either a request for a value of a Tcl variable,
-	     * or it could be the send command requesting the results of the
-	     * last execute.
-	     */
-
-	    if (uFmt != CF_TEXT) {
-		return (HDDEDATA) FALSE;
-	    }
-
-	    ddeReturn = (HDDEDATA) FALSE;
-	    for (convPtr = tsdPtr->currentConversations; (convPtr != NULL)
-		    && (convPtr->hConv != hConv); convPtr = convPtr->nextPtr) {
-		/*
-		 * Empty loop body.
-		 */
-	    }
-
-	    if (convPtr != NULL) {
-		char *returnString;
-
-		len = DdeQueryString(ddeInstance, ddeItem, NULL, 0,
-			CP_WINANSI);
-		Tcl_DStringInit(&dString);
-		Tcl_DStringSetLength(&dString, len);
-		utilString = Tcl_DStringValue(&dString);
-		DdeQueryString(ddeInstance, ddeItem, utilString, 
-                        len + 1, CP_WINANSI);
-		if (stricmp(utilString, "$TCLEVAL$EXECUTE$RESULT") == 0) {
-		    returnString =
-		        Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len);
-		    ddeReturn = DdeCreateDataHandle(ddeInstance,
-			    returnString, len+1, 0, ddeItem, CF_TEXT,
-			    0);
-		} else {
-		    Tcl_Obj *variableObjPtr = Tcl_GetVar2Ex(
-			    convPtr->riPtr->interp, utilString, NULL, 
-			    TCL_GLOBAL_ONLY);
-		    if (variableObjPtr != NULL) {
-			returnString = Tcl_GetStringFromObj(variableObjPtr,
-				&len);
-			ddeReturn = DdeCreateDataHandle(ddeInstance,
-				returnString, len+1, 0, ddeItem, CF_TEXT, 0);
-		    } else {
-			ddeReturn = NULL;
-		    }
-		}
-		Tcl_DStringFree(&dString);
-	    }
-	    return ddeReturn;
-
-	case XTYP_EXECUTE: {
-
-	    /*
-	     * Execute this script. The results will be saved into
-	     * a list object which will be retreived later. See
-	     * ExecuteRemoteObject.
-	     */
-
-	    Tcl_Obj *returnPackagePtr;
-
-	    for (convPtr = tsdPtr->currentConversations; (convPtr != NULL)
-		    && (convPtr->hConv != hConv); convPtr = convPtr->nextPtr) {
-		/*
-		 * Empty loop body.
-		 */
-
-	    }
-
-	    if (convPtr == NULL) {
-		return (HDDEDATA) DDE_FNOTPROCESSED;
-	    }
-
-	    utilString = (char *) DdeAccessData(hData, &len);
-	    ddeObjectPtr = Tcl_NewStringObj(utilString, -1);
-	    Tcl_IncrRefCount(ddeObjectPtr);
-	    DdeUnaccessData(hData);
-	    if (convPtr->returnPackagePtr != NULL) {
-		Tcl_DecrRefCount(convPtr->returnPackagePtr);
-	    }
-	    convPtr->returnPackagePtr = NULL;
-	    returnPackagePtr = 
-		    ExecuteRemoteObject(convPtr->riPtr, ddeObjectPtr);
-	    for (convPtr = tsdPtr->currentConversations; (convPtr != NULL)
- 		    && (convPtr->hConv != hConv); convPtr = convPtr->nextPtr) {
-		/*
-		 * Empty loop body.
-		 */
-
-	    }
-	    if (convPtr != NULL) {
-		Tcl_IncrRefCount(returnPackagePtr);
-		convPtr->returnPackagePtr = returnPackagePtr;
-	    }
-	    Tcl_DecrRefCount(ddeObjectPtr);
-	    if (returnPackagePtr == NULL) {
-		return (HDDEDATA) DDE_FNOTPROCESSED;
-	    } else {
-		return (HDDEDATA) DDE_FACK;
-	    }
-	}
-	    
-	case XTYP_WILDCONNECT: {
-
-	    /*
-	     * Dde wants a list of services and topics that we support.
-	     */
-
-	    HSZPAIR *returnPtr;
-	    int i;
-	    int numItems;
-
-	    for (i = 0, riPtr = tsdPtr->interpListPtr; riPtr != NULL;
-		    i++, riPtr = riPtr->nextPtr) {
-		/*
-		 * Empty loop body.
-		 */
-
-	    }
-
-	    numItems = i;
-	    ddeReturn = DdeCreateDataHandle(ddeInstance, NULL,
-		    (numItems + 1) * sizeof(HSZPAIR), 0, 0, 0, 0);
-	    returnPtr = (HSZPAIR *) DdeAccessData(ddeReturn, &len);
-	    for (i = 0, riPtr = tsdPtr->interpListPtr; i < numItems; 
-		    i++, riPtr = riPtr->nextPtr) {
-		returnPtr[i].hszSvc = DdeCreateStringHandle(
-                        ddeInstance, "TclEval", CP_WINANSI);
-		returnPtr[i].hszTopic = DdeCreateStringHandle(
-                        ddeInstance, riPtr->name, CP_WINANSI);
-	    }
-	    returnPtr[i].hszSvc = NULL;
-	    returnPtr[i].hszTopic = NULL;
-	    DdeUnaccessData(ddeReturn);
-	    return ddeReturn;
-	}
-
-    }
-    return NULL;
-}
-
-
-/*
- *--------------------------------------------------------------
- *
- * DdeExitProc --
- *
- *	Gets rid of our DDE server when we go away.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The DDE server is deleted.
- *
- *--------------------------------------------------------------
- */
-
-static void
-DdeExitProc(
-    ClientData clientData)	    /* Not used in this handler. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    DdeNameService(ddeInstance, NULL, 0, DNS_UNREGISTER);
-    DdeUninitialize(ddeInstance);
-    ddeInstance = 0;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * MakeDdeConnection --
- *
- *	This procedure is a utility used to connect to a DDE
- *	server when given a server name and a topic name.
- *
- * Results:
- *	A standard Tcl result.
- *	
- *
- * Side effects:
- *	Passes back a conversation through ddeConvPtr
- *
- *--------------------------------------------------------------
- */
-
-static int
-MakeDdeConnection(
-    Tcl_Interp *interp,		/* Used to report errors. */
-    char *name,			/* The connection to use. */
-    HCONV *ddeConvPtr)
-{
-    HSZ ddeTopic, ddeService;
-    HCONV ddeConv;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    
-    ddeService = DdeCreateStringHandle(ddeInstance, "TclEval", 0);
-    ddeTopic = DdeCreateStringHandle(ddeInstance, name, 0);
-
-    ddeConv = DdeConnect(ddeInstance, ddeService, ddeTopic, NULL);
-    DdeFreeStringHandle(ddeInstance, ddeService);
-    DdeFreeStringHandle(ddeInstance, ddeTopic);
-
-    if (ddeConv == (HCONV) NULL) {
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp, "no registered server named \"",
-		    name, "\"", (char *) NULL);
-	}
-	return TCL_ERROR;
-    }
-
-    *ddeConvPtr = ddeConv;
-    return TCL_OK;
-}
-
-/*
- *--------------------------------------------------------------
- *
- * SetDdeError --
- *
- *	Sets the interp result to a cogent error message
- *	describing the last DDE error.
- *
- * Results:
- *	None.
- *	
- *
- * Side effects:
- *	The interp's result object is changed.
- *
- *--------------------------------------------------------------
- */
-
-static void
-SetDdeError(
-    Tcl_Interp *interp)	    /* The interp to put the message in.*/
-{
-    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
-    int err;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    err = DdeGetLastError(ddeInstance);
-    switch (err) {
-	case DMLERR_DATAACKTIMEOUT:
-	case DMLERR_EXECACKTIMEOUT:
-	case DMLERR_POKEACKTIMEOUT:
-	    Tcl_SetStringObj(resultPtr,
-		    "remote interpreter did not respond", -1);
-	    break;
-
-	case DMLERR_BUSY:
-	    Tcl_SetStringObj(resultPtr, "remote server is busy", -1);
-	    break;
-
-	case DMLERR_NOTPROCESSED:
-	    Tcl_SetStringObj(resultPtr, 
-		    "remote server cannot handle this command", -1);
-	    break;
-
-	default:
-	    Tcl_SetStringObj(resultPtr, "dde command failed", -1);
-    }
-}
-
-/*
- *--------------------------------------------------------------
- *
- * Tcl_DdeObjCmd --
- *
- *	This procedure is invoked to process the "dde" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *--------------------------------------------------------------
- */
-
-int
-Tcl_DdeObjCmd(
-    ClientData clientData,	/* Used only for deletion */
-    Tcl_Interp *interp,		/* The interp we are sending from */
-    int objc,			/* Number of arguments */
-    Tcl_Obj *CONST objv[])	/* The arguments */
-{
-    enum {
-	DDE_SERVERNAME,
-	DDE_EXECUTE,
-	DDE_REQUEST,
-	DDE_SERVICES,
-	DDE_EVAL
-    };
-
-    static char *ddeCommands[] = {"servername", "execute",
-          "request", "services", "eval", 
-	  (char *) NULL};
-    static char *ddeOptions[] = {"-async", (char *) NULL};
-    int index, argIndex;
-    int async = 0;
-    int result = TCL_OK;
-    HSZ ddeService = NULL;
-    HSZ ddeTopic = NULL;
-    HSZ ddeItem = NULL;
-    HDDEDATA ddeData = NULL;
-    HDDEDATA ddeItemData = NULL;
-    HCONV hConv;
-    HSZ ddeCookie = 0;
-    char *serviceName, *topicName, *itemString, *dataString;
-    char *string;
-    int firstArg, length, dataLength;
-    DWORD ddeResult;
-    HDDEDATA ddeReturn;
-    RegisteredInterp *riPtr;
-    Tcl_Interp *sendInterp;
-    Tcl_Obj *objPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Initialize DDE server/client
-     */
-    
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, 
-		"?-async? serviceName topicName value");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], ddeCommands, "command", 0,
-	    &index) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch (index) {
-	case DDE_SERVERNAME:
-	    if ((objc != 3) && (objc != 2)) {
-		Tcl_WrongNumArgs(interp, 1, objv, 
-			"servername ?serverName?");
-		return TCL_ERROR;
-	    }
-	    firstArg = (objc - 1);
-	    break;
-	case DDE_EXECUTE:
-	    if ((objc < 5) || (objc > 6)) {
-		Tcl_WrongNumArgs(interp, 1, objv, 
-			"execute ?-async? serviceName topicName value");
-		return TCL_ERROR;
-	    }
-	    if (Tcl_GetIndexFromObj(NULL, objv[2], ddeOptions, "option", 0,
-		    &argIndex) != TCL_OK) {
-		if (objc != 5) {
-		    Tcl_WrongNumArgs(interp, 1, objv,
-			    "execute ?-async? serviceName topicName value");
-		    return TCL_ERROR;
-		}
-		async = 0;
-		firstArg = 2;
-	    } else {
-		if (objc != 6) {
-		    Tcl_WrongNumArgs(interp, 1, objv,
-			    "execute ?-async? serviceName topicName value");
-		    return TCL_ERROR;
-		}
-		async = 1;
-		firstArg = 3;
-	    }
-	    break;
-	case DDE_REQUEST:
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 1, objv, 
-			"request serviceName topicName value");
-		return TCL_ERROR;
-	    }
-	    firstArg = 2;
-	    break;
-	case DDE_SERVICES:
-	    if (objc != 4) {
-		Tcl_WrongNumArgs(interp, 1, objv,
-			"services serviceName topicName");
-		return TCL_ERROR;
-	    }
-	    firstArg = 2;
-	    break;
-	case DDE_EVAL:
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 1, objv, 
-			"eval ?-async? serviceName args");
-		return TCL_ERROR;
-	    }
-	    if (Tcl_GetIndexFromObj(NULL, objv[2], ddeOptions, "option", 0,
-		    &argIndex) != TCL_OK) {
-		if (objc < 4) {
-		    Tcl_WrongNumArgs(interp, 1, objv,
-			    "eval ?-async? serviceName args");
-		    return TCL_ERROR;
-		}
-		async = 0;
-		firstArg = 2;
-	    } else {
-		if (objc < 5) {
-		    Tcl_WrongNumArgs(interp, 1, objv,
-			    "eval ?-async? serviceName args");
-		    return TCL_ERROR;
-		}
-		async = 1;
-		firstArg = 3;
-	    }
-	    break;
-    }
-
-    if (firstArg != 1) {
-	serviceName = Tcl_GetStringFromObj(objv[firstArg], &length);
-    } else {
-	serviceName = NULL;
-    }
-
-    if (length == 0) {
-	serviceName = NULL;
-    } else if (index != DDE_SERVERNAME) {
-	ddeService = DdeCreateStringHandle(ddeInstance, serviceName,
-		CP_WINANSI);
-    }
-
-    if ((index != DDE_SERVERNAME) &&(index != DDE_EVAL)) {
-	topicName = Tcl_GetStringFromObj(objv[firstArg + 1], &length);
-	if (length == 0) {
-	    topicName = NULL;
-	} else {
-	    ddeTopic = DdeCreateStringHandle(ddeInstance, 
-		    topicName, CP_WINANSI);
-	}
-    }
-
-    switch (index) {
-	case DDE_SERVERNAME: {
-	    serviceName = DdeSetServerName(interp, serviceName);
-	    if (serviceName != NULL) {
-		Tcl_SetStringObj(Tcl_GetObjResult(interp),
-			serviceName, -1);
-		Initialize();
-	    } else {
-		Tcl_ResetResult(interp);
-	    }
-	    break;
-	}
-	case DDE_EXECUTE: {
-	    Initialize();
-	    dataString = Tcl_GetStringFromObj(objv[firstArg + 2], &dataLength);
-	    if (dataLength == 0) {
-		Tcl_SetStringObj(Tcl_GetObjResult(interp),
-			"cannot execute null data", -1);
-		result = TCL_ERROR;
-		break;
-	    }
-	    hConv = DdeConnect(ddeInstance, ddeService, ddeTopic, 
-                    NULL);
-
-	    if (hConv == NULL) {
-		SetDdeError(interp);
-		result = TCL_ERROR;
-		break;
-	    }
-
-	    ddeData = DdeCreateDataHandle(ddeInstance, dataString,
-		    dataLength+1, 0, 0, CF_TEXT, 0);
-	    if (ddeData != NULL) {
-		if (async) {
-		    DdeClientTransaction((LPBYTE) ddeData, 0xFFFFFFFF, hConv, 0, 
-			    CF_TEXT, XTYP_EXECUTE, TIMEOUT_ASYNC, &ddeResult);
-		    DdeAbandonTransaction(ddeInstance, hConv, 
-                            ddeResult);
-		} else {
-		    ddeReturn = DdeClientTransaction((LPBYTE) ddeData, 0xFFFFFFFF,
-			    hConv, 0, CF_TEXT, XTYP_EXECUTE, 30000, NULL);
-		    if (ddeReturn == 0) {
-			SetDdeError(interp);
-			result = TCL_ERROR;
-		    }
-		}
-		DdeFreeDataHandle(ddeData);
-	    } else {
-		SetDdeError(interp);
-		result = TCL_ERROR;
-	    }
-	    DdeDisconnect(hConv);
-	    break;
-	}
-	case DDE_REQUEST: {
-	    Initialize();
-	    itemString = Tcl_GetStringFromObj(objv[firstArg + 2], &length);
-	    if (length == 0) {
-		Tcl_SetStringObj(Tcl_GetObjResult(interp),
-			"cannot request value of null data", -1);
-		return TCL_ERROR;
-	    }
-	    hConv = DdeConnect(ddeInstance, ddeService, ddeTopic, 
-                    NULL);
-	    
-	    if (hConv == NULL) {
-		SetDdeError(interp);
-		result = TCL_ERROR;
-	    } else {
-		Tcl_Obj *returnObjPtr;
-		ddeItem = DdeCreateStringHandle(ddeInstance, 
-                        itemString, CP_WINANSI);
-		if (ddeItem != NULL) {
-		    ddeData = DdeClientTransaction(NULL, 0, hConv, ddeItem,
-			    CF_TEXT, XTYP_REQUEST, 5000, NULL);
-		    if (ddeData == NULL) {
-			SetDdeError(interp);
-			result = TCL_ERROR;
-		    } else {
-			dataString = DdeAccessData(ddeData, &dataLength);
-			returnObjPtr = Tcl_NewStringObj(dataString, -1);
-			DdeUnaccessData(ddeData);
-			DdeFreeDataHandle(ddeData);
-			Tcl_SetObjResult(interp, returnObjPtr);
-		    }
-		} else {
-		    SetDdeError(interp);
-		    result = TCL_ERROR;
-		}
-		DdeDisconnect(hConv);
-	    }
-
-	    break;
-	}
-	case DDE_SERVICES: {
-	    HCONVLIST hConvList;
-	    CONVINFO convInfo;
-	    Tcl_Obj *convListObjPtr, *elementObjPtr;
-	    Tcl_DString dString;
-	    char *name;
-	    
-	    Initialize();
-	    convInfo.cb = sizeof(CONVINFO);
-	    hConvList = DdeConnectList(ddeInstance, ddeService, 
-                    ddeTopic, 0, NULL);
-	    hConv = 0;
-	    convListObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-	    Tcl_DStringInit(&dString);
-
-	    while (hConv = DdeQueryNextServer(hConvList, hConv), hConv != 0) {
-		elementObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-		DdeQueryConvInfo(hConv, QID_SYNC, &convInfo);
-		length = DdeQueryString(ddeInstance, 
-                        convInfo.hszSvcPartner, NULL, 0, CP_WINANSI);
-		Tcl_DStringSetLength(&dString, length);
-		name = Tcl_DStringValue(&dString);
-		DdeQueryString(ddeInstance, convInfo.hszSvcPartner, 
-                        name, length + 1, CP_WINANSI);
-		Tcl_ListObjAppendElement(interp, elementObjPtr,
-			Tcl_NewStringObj(name, length));
-		length = DdeQueryString(ddeInstance, convInfo.hszTopic,
-			NULL, 0, CP_WINANSI);
-		Tcl_DStringSetLength(&dString, length);
-		name = Tcl_DStringValue(&dString);
-		DdeQueryString(ddeInstance, convInfo.hszTopic, name,
-			length + 1, CP_WINANSI);
-		Tcl_ListObjAppendElement(interp, elementObjPtr,
-			Tcl_NewStringObj(name, length));
-		Tcl_ListObjAppendElement(interp, convListObjPtr, elementObjPtr);
-	    }
-	    DdeDisconnectList(hConvList);
-	    Tcl_SetObjResult(interp, convListObjPtr);
-	    Tcl_DStringFree(&dString);
-	    break;
-	}
-	case DDE_EVAL: {
-	    Initialize();
-	    objc -= (async + 3);
-	    ((Tcl_Obj **) objv) += (async + 3);
-
-            /*
-	     * See if the target interpreter is local.  If so, execute
-	     * the command directly without going through the DDE server.
-	     * Don't exchange objects between interps.  The target interp could
-	     * compile an object, producing a bytecode structure that refers to 
-	     * other objects owned by the target interp.  If the target interp 
-	     * is then deleted, the bytecode structure would be referring to 
-	     * deallocated objects.
-	     */
-	    
-	    for (riPtr = tsdPtr->interpListPtr; riPtr != NULL; riPtr
-		     = riPtr->nextPtr) {
-		if (stricmp(serviceName, riPtr->name) == 0) {
-		    break;
-		}
-	    }
-	    
-	    if (riPtr != NULL) {
-		/*
-		 * This command is to a local interp. No need to go through
-		 * the server.
-		 */
-		
-		Tcl_Preserve((ClientData) riPtr);
-		sendInterp = riPtr->interp;
-		Tcl_Preserve((ClientData) sendInterp);
-		
-		/*
-		 * Don't exchange objects between interps.  The target interp would
-		 * compile an object, producing a bytecode structure that refers to 
-		 * other objects owned by the target interp.  If the target interp 
-		 * is then deleted, the bytecode structure would be referring to 
-		 * deallocated objects.
-		 */
-
-		if (objc == 1) {
-		    result = Tcl_EvalObjEx(sendInterp, objv[0], TCL_EVAL_GLOBAL);
-		} else {
-		    objPtr = Tcl_ConcatObj(objc, objv);
-		    Tcl_IncrRefCount(objPtr);
-		    result = Tcl_EvalObjEx(sendInterp, objPtr, TCL_EVAL_GLOBAL);
-		    Tcl_DecrRefCount(objPtr);
-		}
-		if (interp != sendInterp) {
-		    if (result == TCL_ERROR) {
-			/*
-			 * An error occurred, so transfer error information from the
-			 * destination interpreter back to our interpreter.  
-			 */
-			
-			Tcl_ResetResult(interp);
-			objPtr = Tcl_GetVar2Ex(sendInterp, "errorInfo", NULL, 
-				TCL_GLOBAL_ONLY);
-			string = Tcl_GetStringFromObj(objPtr, &length);
-			Tcl_AddObjErrorInfo(interp, string, length);
-			
-			objPtr = Tcl_GetVar2Ex(sendInterp, "errorCode", NULL,
-				TCL_GLOBAL_ONLY);
-			Tcl_SetObjErrorCode(interp, objPtr);
-		    }
-		    Tcl_SetObjResult(interp, Tcl_GetObjResult(sendInterp));
-		}
-		Tcl_Release((ClientData) riPtr);
-		Tcl_Release((ClientData) sendInterp);
-	    } else {
-		/*
-		 * This is a non-local request. Send the script to the server and poll
-		 * it for a result.
-		 */
-		
-		if (MakeDdeConnection(interp, serviceName, &hConv) != TCL_OK) {
-		    goto error;
-		}
-		
-		objPtr = Tcl_ConcatObj(objc, objv);
-		string = Tcl_GetStringFromObj(objPtr, &length);
-		ddeItemData = DdeCreateDataHandle(ddeInstance, string, length+1, 0, 0,
-			CF_TEXT, 0);
-		
-		if (async) {
-		    ddeData = DdeClientTransaction((LPBYTE) ddeItemData, 0xFFFFFFFF, hConv, 0,
-			    CF_TEXT, XTYP_EXECUTE, TIMEOUT_ASYNC, &ddeResult);
-		    DdeAbandonTransaction(ddeInstance, hConv, ddeResult);
-		} else {
-		    ddeData = DdeClientTransaction((LPBYTE) ddeItemData, 0xFFFFFFFF, hConv, 0,
-			    CF_TEXT, XTYP_EXECUTE, 30000, NULL);
-		    if (ddeData != 0) {
-			
-			ddeCookie = DdeCreateStringHandle(ddeInstance, 
-				"$TCLEVAL$EXECUTE$RESULT", CP_WINANSI);
-			ddeData = DdeClientTransaction(NULL, 0, hConv, ddeCookie,
-				CF_TEXT, XTYP_REQUEST, 30000, NULL);
-		    }
-		}
-		
-		
-		Tcl_DecrRefCount(objPtr);
-		
-		if (ddeData == 0) {
-		    SetDdeError(interp);
-		    DdeFreeDataHandle(ddeItemData);
-		    DdeDisconnect(hConv);
-		    goto error;
-		}
-		
-		if (async == 0) {
-		    Tcl_Obj *resultPtr;
-		    
-		    /*
-		     * The return handle has a two or four element list in it. The first
-		     * element is the return code (TCL_OK, TCL_ERROR, etc.). The
-		     * second is the result of the script. If the return code is TCL_ERROR,
-		     * then the third element is the value of the variable "errorCode",
-		     * and the fourth is the value of the variable "errorInfo".
-		     */
-		    
-		    resultPtr = Tcl_NewObj();
-		    length = DdeGetData(ddeData, NULL, 0, 0);
-		    Tcl_SetObjLength(resultPtr, length);
-		    string = Tcl_GetString(resultPtr);
-		    DdeGetData(ddeData, string, length, 0);
-		    Tcl_SetObjLength(resultPtr, strlen(string));
-		    
-		    if (Tcl_ListObjIndex(NULL, resultPtr, 0, &objPtr) != TCL_OK) {
-			Tcl_DecrRefCount(resultPtr);
-			goto error;
-		    }
-		    if (Tcl_GetIntFromObj(NULL, objPtr, &result) != TCL_OK) {
-			Tcl_DecrRefCount(resultPtr);
-			goto error;
-		    }
-		    if (result == TCL_ERROR) {
-			Tcl_ResetResult(interp);
-			
-			if (Tcl_ListObjIndex(NULL, resultPtr, 3, &objPtr) != TCL_OK) {
-			    Tcl_DecrRefCount(resultPtr);
-			    goto error;
-			}
-			length = -1;
-			string = Tcl_GetStringFromObj(objPtr, &length);
-			Tcl_AddObjErrorInfo(interp, string, length);
-			
-			Tcl_ListObjIndex(NULL, resultPtr, 2, &objPtr);
-			Tcl_SetObjErrorCode(interp, objPtr);
-		    }
-		    if (Tcl_ListObjIndex(NULL, resultPtr, 1, &objPtr) != TCL_OK) {
-			Tcl_DecrRefCount(resultPtr);
-			goto error;
-		    }
-		    Tcl_SetObjResult(interp, objPtr);
-		    Tcl_DecrRefCount(resultPtr);
-		}
-	    }
-	}
-    }
-    if (ddeCookie != NULL) {
-	DdeFreeStringHandle(ddeInstance, ddeCookie);
-    }
-    if (ddeItem != NULL) {
-	DdeFreeStringHandle(ddeInstance, ddeItem);
-    }
-    if (ddeItemData != NULL) {
-	DdeFreeDataHandle(ddeItemData);
-    }
-    if (ddeData != NULL) {
-	DdeFreeDataHandle(ddeData);
-    }
-    if (hConv != NULL) {
-	DdeDisconnect(hConv);
-    }
-    return result;
-
-    error:
-    Tcl_SetStringObj(Tcl_GetObjResult(interp),
-	    "invalid data returned from server", -1);
-    if (ddeCookie != NULL) {
-	DdeFreeStringHandle(ddeInstance, ddeCookie);
-    }
-    if (ddeItem != NULL) {
-	DdeFreeStringHandle(ddeInstance, ddeItem);
-    }
-    if (ddeItemData != NULL) {
-	DdeFreeDataHandle(ddeItemData);
-    }
-    if (ddeData != NULL) {
-	DdeFreeDataHandle(ddeData);
-    }
-    if (hConv != NULL) {
-	DdeDisconnect(hConv);
-    }
-    return TCL_ERROR;
-}
diff --git a/win/tclWinError.c b/win/tclWinError.c
deleted file mode 100644
index 7786334..0000000
--- a/win/tclWinError.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/* 
- * tclWinError.c --
- *
- *	This file contains code for converting from Win32 errors to
- *	errno errors.
- *
- * Copyright (c) 1995-1996 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinError.c,v 1.3 1999/04/16 00:48:08 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * The following table contains the mapping from Win32 errors to
- * errno errors.
- */
-
-static char errorTable[] = {
-    0,
-    EINVAL,	/* ERROR_INVALID_FUNCTION	1 */
-    ENOENT,	/* ERROR_FILE_NOT_FOUND		2 */
-    ENOENT,	/* ERROR_PATH_NOT_FOUND		3 */
-    EMFILE,	/* ERROR_TOO_MANY_OPEN_FILES	4 */
-    EACCES,	/* ERROR_ACCESS_DENIED		5 */
-    EBADF,	/* ERROR_INVALID_HANDLE		6 */
-    ENOMEM,	/* ERROR_ARENA_TRASHED		7 */
-    ENOMEM,	/* ERROR_NOT_ENOUGH_MEMORY	8 */
-    ENOMEM,	/* ERROR_INVALID_BLOCK		9 */
-    E2BIG,	/* ERROR_BAD_ENVIRONMENT	10 */
-    ENOEXEC,	/* ERROR_BAD_FORMAT		11 */
-    EACCES,	/* ERROR_INVALID_ACCESS		12 */
-    EINVAL,	/* ERROR_INVALID_DATA		13 */
-    EFAULT,	/* ERROR_OUT_OF_MEMORY		14 */
-    ENOENT,	/* ERROR_INVALID_DRIVE		15 */
-    EACCES,	/* ERROR_CURRENT_DIRECTORY	16 */
-    EXDEV,	/* ERROR_NOT_SAME_DEVICE	17 */
-    ENOENT,	/* ERROR_NO_MORE_FILES		18 */
-    EROFS,	/* ERROR_WRITE_PROTECT		19 */
-    ENXIO,	/* ERROR_BAD_UNIT		20 */
-    EBUSY,	/* ERROR_NOT_READY		21 */
-    EIO,	/* ERROR_BAD_COMMAND		22 */
-    EIO,	/* ERROR_CRC			23 */
-    EIO,	/* ERROR_BAD_LENGTH		24 */
-    EIO,	/* ERROR_SEEK			25 */
-    EIO,	/* ERROR_NOT_DOS_DISK		26 */
-    ENXIO,	/* ERROR_SECTOR_NOT_FOUND	27 */
-    EBUSY,	/* ERROR_OUT_OF_PAPER		28 */
-    EIO,	/* ERROR_WRITE_FAULT		29 */
-    EIO,	/* ERROR_READ_FAULT		30 */
-    EIO,	/* ERROR_GEN_FAILURE		31 */
-    EACCES,	/* ERROR_SHARING_VIOLATION	32 */
-    EACCES,	/* ERROR_LOCK_VIOLATION		33 */
-    ENXIO,	/* ERROR_WRONG_DISK		34 */
-    ENFILE,	/* ERROR_FCB_UNAVAILABLE	35 */
-    ENFILE,	/* ERROR_SHARING_BUFFER_EXCEEDED	36 */
-    EINVAL,	/* 37 */
-    EINVAL,	/* 38 */
-    ENOSPC,	/* ERROR_HANDLE_DISK_FULL	39 */
-    EINVAL,	/* 40 */
-    EINVAL,	/* 41 */
-    EINVAL,	/* 42 */
-    EINVAL,	/* 43 */
-    EINVAL,	/* 44 */
-    EINVAL,	/* 45 */
-    EINVAL,	/* 46 */
-    EINVAL,	/* 47 */
-    EINVAL,	/* 48 */
-    EINVAL,	/* 49 */
-    ENODEV,	/* ERROR_NOT_SUPPORTED		50 */
-    EBUSY,	/* ERROR_REM_NOT_LIST		51 */
-    EEXIST,	/* ERROR_DUP_NAME		52 */
-    ENOENT,	/* ERROR_BAD_NETPATH		53 */
-    EBUSY,	/* ERROR_NETWORK_BUSY		54 */
-    ENODEV,	/* ERROR_DEV_NOT_EXIST		55 */
-    EAGAIN,	/* ERROR_TOO_MANY_CMDS		56 */
-    EIO,	/* ERROR_ADAP_HDW_ERR		57 */
-    EIO,	/* ERROR_BAD_NET_RESP		58 */
-    EIO,	/* ERROR_UNEXP_NET_ERR		59 */
-    EINVAL,	/* ERROR_BAD_REM_ADAP		60 */
-    EFBIG,	/* ERROR_PRINTQ_FULL		61 */
-    ENOSPC,	/* ERROR_NO_SPOOL_SPACE		62 */
-    ENOENT,	/* ERROR_PRINT_CANCELLED	63 */
-    ENOENT,	/* ERROR_NETNAME_DELETED	64 */
-    EACCES,	/* ERROR_NETWORK_ACCESS_DENIED	65 */
-    ENODEV,	/* ERROR_BAD_DEV_TYPE		66 */
-    ENOENT,	/* ERROR_BAD_NET_NAME		67 */
-    ENFILE,	/* ERROR_TOO_MANY_NAMES		68 */
-    EIO,	/* ERROR_TOO_MANY_SESS		69 */
-    EAGAIN,	/* ERROR_SHARING_PAUSED		70 */
-    EINVAL,	/* ERROR_REQ_NOT_ACCEP		71 */
-    EAGAIN,	/* ERROR_REDIR_PAUSED		72 */
-    EINVAL,	/* 73 */
-    EINVAL,	/* 74 */
-    EINVAL,	/* 75 */
-    EINVAL,	/* 76 */
-    EINVAL,	/* 77 */
-    EINVAL,	/* 78 */
-    EINVAL,	/* 79 */
-    EEXIST,	/* ERROR_FILE_EXISTS		80 */
-    EINVAL,	/* 81 */
-    ENOSPC,	/* ERROR_CANNOT_MAKE		82 */
-    EIO,	/* ERROR_FAIL_I24		83 */
-    ENFILE,	/* ERROR_OUT_OF_STRUCTURES	84 */
-    EEXIST,	/* ERROR_ALREADY_ASSIGNED	85 */
-    EPERM,	/* ERROR_INVALID_PASSWORD	86 */
-    EINVAL,	/* ERROR_INVALID_PARAMETER	87 */
-    EIO,	/* ERROR_NET_WRITE_FAULT	88 */
-    EAGAIN,	/* ERROR_NO_PROC_SLOTS		89 */
-    EINVAL,	/* 90 */
-    EINVAL,	/* 91 */
-    EINVAL,	/* 92 */
-    EINVAL,	/* 93 */
-    EINVAL,	/* 94 */
-    EINVAL,	/* 95 */
-    EINVAL,	/* 96 */
-    EINVAL,	/* 97 */
-    EINVAL,	/* 98 */
-    EINVAL,	/* 99 */
-    EINVAL,	/* 100 */
-    EINVAL,	/* 101 */
-    EINVAL,	/* 102 */
-    EINVAL,	/* 103 */
-    EINVAL,	/* 104 */
-    EINVAL,	/* 105 */
-    EINVAL,	/* 106 */
-    EXDEV,	/* ERROR_DISK_CHANGE		107 */
-    EAGAIN,	/* ERROR_DRIVE_LOCKED		108 */
-    EPIPE,	/* ERROR_BROKEN_PIPE		109 */
-    ENOENT,	/* ERROR_OPEN_FAILED		110 */
-    EINVAL,	/* ERROR_BUFFER_OVERFLOW	111 */
-    ENOSPC,	/* ERROR_DISK_FULL		112 */
-    EMFILE,	/* ERROR_NO_MORE_SEARCH_HANDLES	113 */
-    EBADF,	/* ERROR_INVALID_TARGET_HANDLE	114 */
-    EFAULT,	/* ERROR_PROTECTION_VIOLATION	115 */
-    EINVAL,	/* 116 */
-    EINVAL,	/* 117 */
-    EINVAL,	/* 118 */
-    EINVAL,	/* 119 */
-    EINVAL,	/* 120 */
-    EINVAL,	/* 121 */
-    EINVAL,	/* 122 */
-    ENOENT,	/* ERROR_INVALID_NAME		123 */
-    EINVAL,	/* 124 */
-    EINVAL,	/* 125 */
-    EINVAL,	/* 126 */
-    ESRCH,	/* ERROR_PROC_NOT_FOUND		127 */
-    ECHILD,	/* ERROR_WAIT_NO_CHILDREN	128 */
-    ECHILD,	/* ERROR_CHILD_NOT_COMPLETE	129 */
-    EBADF,	/* ERROR_DIRECT_ACCESS_HANDLE	130 */
-    EINVAL,	/* 131 */
-    ESPIPE,	/* ERROR_SEEK_ON_DEVICE		132 */
-    EINVAL,	/* 133 */
-    EINVAL,	/* 134 */
-    EINVAL,	/* 135 */
-    EINVAL,	/* 136 */
-    EINVAL,	/* 137 */
-    EINVAL,	/* 138 */
-    EINVAL,	/* 139 */
-    EINVAL,	/* 140 */
-    EINVAL,	/* 141 */
-    EAGAIN,	/* ERROR_BUSY_DRIVE		142 */
-    EINVAL,	/* 143 */
-    EINVAL,	/* 144 */
-    EEXIST,	/* ERROR_DIR_NOT_EMPTY		145 */
-    EINVAL,	/* 146 */
-    EINVAL,	/* 147 */
-    EINVAL,	/* 148 */
-    EINVAL,	/* 149 */
-    EINVAL,	/* 150 */
-    EINVAL,	/* 151 */
-    EINVAL,	/* 152 */
-    EINVAL,	/* 153 */
-    EINVAL,	/* 154 */
-    EINVAL,	/* 155 */
-    EINVAL,	/* 156 */
-    EINVAL,	/* 157 */
-    EACCES,	/* ERROR_NOT_LOCKED		158 */
-    EINVAL,	/* 159 */
-    EINVAL,	/* 160 */
-    ENOENT,	/* ERROR_BAD_PATHNAME	        161 */
-    EINVAL,	/* 162 */
-    EINVAL,	/* 163 */
-    EINVAL,	/* 164 */
-    EINVAL,	/* 165 */
-    EINVAL,	/* 166 */
-    EACCES,	/* ERROR_LOCK_FAILED		167 */
-    EINVAL,	/* 168 */
-    EINVAL,	/* 169 */
-    EINVAL,	/* 170 */
-    EINVAL,	/* 171 */
-    EINVAL,	/* 172 */
-    EINVAL,	/* 173 */
-    EINVAL,	/* 174 */
-    EINVAL,	/* 175 */
-    EINVAL,	/* 176 */
-    EINVAL,	/* 177 */
-    EINVAL,	/* 178 */
-    EINVAL,	/* 179 */
-    EINVAL,	/* 180 */
-    EINVAL,	/* 181 */
-    EINVAL,	/* 182 */
-    EEXIST,	/* ERROR_ALREADY_EXISTS		183 */
-    ECHILD,	/* ERROR_NO_CHILD_PROCESS	184 */
-    EINVAL,	/* 185 */
-    EINVAL,	/* 186 */
-    EINVAL,	/* 187 */
-    EINVAL,	/* 188 */
-    EINVAL,	/* 189 */
-    EINVAL,	/* 190 */
-    EINVAL,	/* 191 */
-    EINVAL,	/* 192 */
-    EINVAL,	/* 193 */
-    EINVAL,	/* 194 */
-    EINVAL,	/* 195 */
-    EINVAL,	/* 196 */
-    EINVAL,	/* 197 */
-    EINVAL,	/* 198 */
-    EINVAL,	/* 199 */
-    EINVAL,	/* 200 */
-    EINVAL,	/* 201 */
-    EINVAL,	/* 202 */
-    EINVAL,	/* 203 */
-    EINVAL,	/* 204 */
-    EINVAL,	/* 205 */
-    ENAMETOOLONG,/* ERROR_FILENAME_EXCED_RANGE	206 */
-    EINVAL,	/* 207 */
-    EINVAL,	/* 208 */
-    EINVAL,	/* 209 */
-    EINVAL,	/* 210 */
-    EINVAL,	/* 211 */
-    EINVAL,	/* 212 */
-    EINVAL,	/* 213 */
-    EINVAL,	/* 214 */
-    EINVAL,	/* 215 */
-    EINVAL,	/* 216 */
-    EINVAL,	/* 217 */
-    EINVAL,	/* 218 */
-    EINVAL,	/* 219 */
-    EINVAL,	/* 220 */
-    EINVAL,	/* 221 */
-    EINVAL,	/* 222 */
-    EINVAL,	/* 223 */
-    EINVAL,	/* 224 */
-    EINVAL,	/* 225 */
-    EINVAL,	/* 226 */
-    EINVAL,	/* 227 */
-    EINVAL,	/* 228 */
-    EINVAL,	/* 229 */
-    EPIPE,	/* ERROR_BAD_PIPE		230 */
-    EAGAIN,	/* ERROR_PIPE_BUSY		231 */
-    EPIPE,	/* ERROR_NO_DATA		232 */
-    EPIPE,	/* ERROR_PIPE_NOT_CONNECTED	233 */
-    EINVAL,	/* 234 */
-    EINVAL,	/* 235 */
-    EINVAL,	/* 236 */
-    EINVAL,	/* 237 */
-    EINVAL,	/* 238 */
-    EINVAL,	/* 239 */
-    EINVAL,	/* 240 */
-    EINVAL,	/* 241 */
-    EINVAL,	/* 242 */
-    EINVAL,	/* 243 */
-    EINVAL,	/* 244 */
-    EINVAL,	/* 245 */
-    EINVAL,	/* 246 */
-    EINVAL,	/* 247 */
-    EINVAL,	/* 248 */
-    EINVAL,	/* 249 */
-    EINVAL,	/* 250 */
-    EINVAL,	/* 251 */
-    EINVAL,	/* 252 */
-    EINVAL,	/* 253 */
-    EINVAL,	/* 254 */
-    EINVAL,	/* 255 */
-    EINVAL,	/* 256 */
-    EINVAL,	/* 257 */
-    EINVAL,	/* 258 */
-    EINVAL,	/* 259 */
-    EINVAL,	/* 260 */
-    EINVAL,	/* 261 */
-    EINVAL,	/* 262 */
-    EINVAL,	/* 263 */
-    EINVAL,	/* 264 */
-    EINVAL,	/* 265 */
-    EINVAL,	/* 266 */
-    ENOTDIR,	/* ERROR_DIRECTORY		267 */
-};
-
-static const unsigned int tableLen = sizeof(errorTable);
-
-/*
- * The following table contains the mapping from WinSock errors to
- * errno errors.
- */
-
-static int wsaErrorTable[] = {
-    EWOULDBLOCK,	/* WSAEWOULDBLOCK */
-    EINPROGRESS,	/* WSAEINPROGRESS */
-    EALREADY,		/* WSAEALREADY */
-    ENOTSOCK,		/* WSAENOTSOCK */
-    EDESTADDRREQ,	/* WSAEDESTADDRREQ */
-    EMSGSIZE,		/* WSAEMSGSIZE */
-    EPROTOTYPE,		/* WSAEPROTOTYPE */
-    ENOPROTOOPT,	/* WSAENOPROTOOPT */
-    EPROTONOSUPPORT,	/* WSAEPROTONOSUPPORT */
-    ESOCKTNOSUPPORT,	/* WSAESOCKTNOSUPPORT */
-    EOPNOTSUPP,		/* WSAEOPNOTSUPP */
-    EPFNOSUPPORT,	/* WSAEPFNOSUPPORT */
-    EAFNOSUPPORT,	/* WSAEAFNOSUPPORT */
-    EADDRINUSE,		/* WSAEADDRINUSE */
-    EADDRNOTAVAIL,	/* WSAEADDRNOTAVAIL */
-    ENETDOWN,		/* WSAENETDOWN */
-    ENETUNREACH,	/* WSAENETUNREACH */
-    ENETRESET,		/* WSAENETRESET */
-    ECONNABORTED,	/* WSAECONNABORTED */
-    ECONNRESET,		/* WSAECONNRESET */
-    ENOBUFS,		/* WSAENOBUFS */
-    EISCONN,		/* WSAEISCONN */
-    ENOTCONN,		/* WSAENOTCONN */
-    ESHUTDOWN,		/* WSAESHUTDOWN */
-    ETOOMANYREFS,	/* WSAETOOMANYREFS */
-    ETIMEDOUT,		/* WSAETIMEDOUT */
-    ECONNREFUSED,	/* WSAECONNREFUSED */
-    ELOOP,		/* WSAELOOP */
-    ENAMETOOLONG,	/* WSAENAMETOOLONG */
-    EHOSTDOWN,		/* WSAEHOSTDOWN */
-    EHOSTUNREACH,	/* WSAEHOSTUNREACH */
-    ENOTEMPTY,		/* WSAENOTEMPTY */
-    EAGAIN,		/* WSAEPROCLIM */
-    EUSERS,		/* WSAEUSERS */
-    EDQUOT,		/* WSAEDQUOT */
-    ESTALE,		/* WSAESTALE */
-    EREMOTE,		/* WSAEREMOTE */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinConvertError --
- *
- *	This routine converts a Win32 error into an errno value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the errno global variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclWinConvertError(errCode)
-    DWORD errCode;		/* Win32 error code. */
-{
-    if (errCode >= tableLen) {
-	Tcl_SetErrno(EINVAL);
-    } else {
-	Tcl_SetErrno(errorTable[errCode]);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinConvertWSAError --
- *
- *	This routine converts a WinSock error into an errno value.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets the errno global variable.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclWinConvertWSAError(errCode)
-    DWORD errCode;		/* Win32 error code. */
-{
-    if ((errCode >= WSAEWOULDBLOCK) && (errCode <= WSAEREMOTE)) {
-	Tcl_SetErrno(wsaErrorTable[errCode - WSAEWOULDBLOCK]);
-    } else {
-	Tcl_SetErrno(EINVAL);
-    }
-}
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
deleted file mode 100644
index 81f4608..0000000
--- a/win/tclWinFCmd.c
+++ /dev/null
@@ -1,1685 +0,0 @@
-/*
- * tclWinFCmd.c
- *
- *      This file implements the Windows specific portion of file manipulation 
- *      subcommands of the "file" command. 
- *
- * Copyright (c) 1996-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinFCmd.c,v 1.3 1999/04/16 00:48:08 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * The following constants specify the type of callback when
- * TraverseWinTree() calls the traverseProc()
- */
-
-#define DOTREE_PRED   1     /* pre-order directory  */
-#define DOTREE_POSTD  2     /* post-order directory */
-#define DOTREE_F      3     /* regular file */
-
-/*
- * Callbacks for file attributes code.
- */
-
-static int		GetWinFileAttributes _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		GetWinFileLongName _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		GetWinFileShortName _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj **attributePtrPtr));
-static int		SetWinFileAttributes _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *attributePtr));
-static int		CannotSetAttribute _ANSI_ARGS_((Tcl_Interp *interp,
-			    int objIndex, CONST char *fileName,
-			    Tcl_Obj *attributePtr));
-
-/*
- * Constants and variables necessary for file attributes subcommand.
- */
-
-enum {
-    WIN_ARCHIVE_ATTRIBUTE,
-    WIN_HIDDEN_ATTRIBUTE,
-    WIN_LONGNAME_ATTRIBUTE,
-    WIN_READONLY_ATTRIBUTE,
-    WIN_SHORTNAME_ATTRIBUTE,
-    WIN_SYSTEM_ATTRIBUTE
-};
-
-static int attributeArray[] = {FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_HIDDEN,
-	0, FILE_ATTRIBUTE_READONLY, 0, FILE_ATTRIBUTE_SYSTEM};
-
-
-char *tclpFileAttrStrings[] = {
-	"-archive", "-hidden", "-longname", "-readonly",
-	"-shortname", "-system", (char *) NULL
-};
-
-const TclFileAttrProcs tclpFileAttrProcs[] = {
-	{GetWinFileAttributes, SetWinFileAttributes},
-	{GetWinFileAttributes, SetWinFileAttributes},
-	{GetWinFileLongName, CannotSetAttribute},
-	{GetWinFileAttributes, SetWinFileAttributes},
-	{GetWinFileShortName, CannotSetAttribute},
-	{GetWinFileAttributes, SetWinFileAttributes}};
-
-/*
- * Prototype for the TraverseWinTree callback function.
- */
-
-typedef int (TraversalProc)(Tcl_DString *srcPtr, Tcl_DString *dstPtr, 
-	int type, Tcl_DString *errorPtr);
-
-/*
- * Declarations for local procedures defined in this file:
- */
-
-static void		StatError(Tcl_Interp *interp, CONST char *fileName);
-static int		ConvertFileNameFormat(Tcl_Interp *interp, 
-			    int objIndex, CONST char *fileName, int longShort,
-			    Tcl_Obj **attributePtrPtr);
-static int		DoCopyFile(Tcl_DString *srcPtr, Tcl_DString *dstPtr);
-static int		DoCreateDirectory(Tcl_DString *pathPtr);
-static int		DoDeleteFile(Tcl_DString *pathPtr);
-static int		DoRemoveDirectory(Tcl_DString *pathPtr, int recursive, 
-			    Tcl_DString *errorPtr);
-static int		DoRenameFile(const TCHAR *nativeSrc, Tcl_DString *dstPtr);
-static int		TraversalCopy(Tcl_DString *srcPtr, Tcl_DString *dstPtr, 
-			    int type, Tcl_DString *errorPtr);
-static int		TraversalDelete(Tcl_DString *srcPtr, Tcl_DString *dstPtr, 
-			    int type, Tcl_DString *errorPtr);
-static int		TraverseWinTree(TraversalProc *traverseProc,
-			    Tcl_DString *sourcePtr, Tcl_DString *dstPtr, 
-			    Tcl_DString *errorPtr);
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpRenameFile, DoRenameFile --
- *
- *      Changes the name of an existing file or directory, from src to dst.
- *	If src and dst refer to the same file or directory, does nothing
- *	and returns success.  Otherwise if dst already exists, it will be
- *	deleted and replaced by src subject to the following conditions:
- *	    If src is a directory, dst may be an empty directory.
- *	    If src is a file, dst may be a file.
- *	In any other situation where dst already exists, the rename will
- *	fail.  
- *
- * Results:
- *	If the file or directory was successfully renamed, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	ENAMETOOLONG: src or dst names are too long.
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EEXIST:	    dst is a non-empty directory.
- *	EINVAL:	    src is a root directory or dst is a subdirectory of src.
- *	EISDIR:	    dst is a directory, but src is not.
- *	ENOENT:	    src doesn't exist.  src or dst is "".
- *	ENOTDIR:    src is a directory, but dst is not.  
- *	EXDEV:	    src and dst are on different filesystems.
- *
- *	EACCES:     exists an open file already referring to src or dst.
- *	EACCES:     src or dst specify the current working directory (NT).
- *	EACCES:	    src specifies a char device (nul:, com1:, etc.) 
- *	EEXIST:	    dst specifies a char device (nul:, com1:, etc.) (NT)
- *	EACCES:	    dst specifies a char device (nul:, com1:, etc.) (95)
- *	
- * Side effects:
- *	The implementation supports cross-filesystem renames of files,
- *	but the caller should be prepared to emulate cross-filesystem
- *	renames of directories if errno is EXDEV.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpRenameFile(
-    CONST char *src,		/* Pathname of file or dir to be renamed
-				 * (UTF-8). */
-    CONST char *dst)		/* New pathname of file or directory
-				 * (UTF-8). */
-{
-    int result;
-    TCHAR *nativeSrc;
-    Tcl_DString srcString, dstString;
-
-    nativeSrc = Tcl_WinUtfToTChar(src, -1, &srcString);
-    Tcl_WinUtfToTChar(dst, -1, &dstString);
-
-    if ((TclWinGetPlatformId() == VER_PLATFORM_WIN32s) 
-	    && ((Tcl_DStringLength(&srcString) >= MAX_PATH - 1) ||
-		    (Tcl_DStringLength(&dstString) >= MAX_PATH - 1))) {
-	/*
-	 * On Win32s, really long file names cause the MoveFile() call
-	 * to lock up, endlessly throwing an access violation and 
-	 * retrying the operation.
-	 */
-
-	errno = ENAMETOOLONG;
-	result = TCL_ERROR;
-    } else {
-	result = DoRenameFile(nativeSrc, &dstString);
-    }
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoRenameFile(
-    CONST TCHAR *nativeSrc,	/* Pathname of file or dir to be renamed
-				 * (native). */ 
-    Tcl_DString *dstPtr)	/* New pathname for file or directory
-				 * (native). */
-{    
-    const TCHAR *nativeDst;
-    DWORD srcAttr, dstAttr;
-
-    nativeDst = (TCHAR *) Tcl_DStringValue(dstPtr);
-
-    /*
-     * Would throw an exception under NT if one of the arguments is a 
-     * char block device.
-     */
-
-    try {
-	if ((*tclWinProcs->moveFileProc)(nativeSrc, nativeDst) != FALSE) {
-	    return TCL_OK;
-	}
-    } except (-1) {}
-
-    TclWinConvertError(GetLastError());
-
-    srcAttr = (*tclWinProcs->getFileAttributesProc)(nativeSrc);
-    dstAttr = (*tclWinProcs->getFileAttributesProc)(nativeDst);
-    if (srcAttr == 0xffffffff) {
-	if ((*tclWinProcs->getFullPathNameProc)(nativeSrc, 0, NULL, NULL) >= MAX_PATH) {
-	    errno = ENAMETOOLONG;
-	    return TCL_ERROR;
-	}
-	srcAttr = 0;
-    }
-    if (dstAttr == 0xffffffff) {
-	if ((*tclWinProcs->getFullPathNameProc)(nativeDst, 0, NULL, NULL) >= MAX_PATH) {
-	    errno = ENAMETOOLONG;
-	    return TCL_ERROR;
-	}
-	dstAttr = 0;
-    }
-
-    if (errno == EBADF) {
-	errno = EACCES;
-	return TCL_ERROR;
-    }
-    if ((TclWinGetPlatformId() == VER_PLATFORM_WIN32s) && (errno == EACCES)) {
-	if ((srcAttr != 0) && (dstAttr != 0)) {
-	    /*
-	     * Win32s reports trying to overwrite an existing file or directory
-	     * as EACCES.
-	     */
-
-	    errno = EEXIST;
-	}
-    }
-    if (errno == EACCES) {
-	decode:
-	if (srcAttr & FILE_ATTRIBUTE_DIRECTORY) {
-	    TCHAR *nativeSrcRest, *nativeDstRest;
-	    char **srcArgv, **dstArgv;
-	    int size, srcArgc, dstArgc;
-	    WCHAR nativeSrcPath[MAX_PATH];
-	    WCHAR nativeDstPath[MAX_PATH];
-	    Tcl_DString srcString, dstString;
-	    CONST char *src, *dst;
-
-	    size = (*tclWinProcs->getFullPathNameProc)(nativeSrc, MAX_PATH, 
-		    nativeSrcPath, &nativeSrcRest);
-	    if ((size == 0) || (size > MAX_PATH)) {
-		return TCL_ERROR;
-	    }
-	    size = (*tclWinProcs->getFullPathNameProc)(nativeDst, MAX_PATH, 
-		    nativeDstPath, &nativeDstRest);
-	    if ((size == 0) || (size > MAX_PATH)) {
-		return TCL_ERROR;
-	    }
-	    (*tclWinProcs->charLowerProc)((TCHAR *) nativeSrcPath);
-	    (*tclWinProcs->charLowerProc)((TCHAR *) nativeDstPath);
-
-	    src = Tcl_WinTCharToUtf((TCHAR *) nativeSrcPath, -1, &srcString);
-	    dst = Tcl_WinTCharToUtf((TCHAR *) nativeDstPath, -1, &dstString);
-	    if (strncmp(src, dst, Tcl_DStringLength(&srcString)) == 0) {
-		/*
-		 * Trying to move a directory into itself.
-		 */
-
-		errno = EINVAL;
-		Tcl_DStringFree(&srcString);
-		Tcl_DStringFree(&dstString);
-		return TCL_ERROR;
-	    }
-	    Tcl_SplitPath(src, &srcArgc, &srcArgv);
-	    Tcl_SplitPath(dst, &dstArgc, &dstArgv);
-	    Tcl_DStringFree(&srcString);
-	    Tcl_DStringFree(&dstString);
-
-	    if (srcArgc == 1) {
-		/*
-		 * They are trying to move a root directory.  Whether
-		 * or not it is across filesystems, this cannot be
-		 * done.
-		 */
-
-		Tcl_SetErrno(EINVAL);
-	    } else if ((srcArgc > 0) && (dstArgc > 0) &&
-		    (strcmp(srcArgv[0], dstArgv[0]) != 0)) {
-		/*
-		 * If src is a directory and dst filesystem != src
-		 * filesystem, errno should be EXDEV.  It is very
-		 * important to get this behavior, so that the caller
-		 * can respond to a cross filesystem rename by
-		 * simulating it with copy and delete.  The MoveFile
-		 * system call already handles the case of moving a
-		 * file between filesystems.
-		 */
-
-		Tcl_SetErrno(EXDEV);
-	    }
-
-	    ckfree((char *) srcArgv);
-	    ckfree((char *) dstArgv);
-	}
-
-	/*
-	 * Other types of access failure is that dst is a read-only
-	 * filesystem, that an open file referred to src or dest, or that
-	 * src or dest specified the current working directory on the
-	 * current filesystem.  EACCES is returned for those cases.
-	 */
-
-    } else if (Tcl_GetErrno() == EEXIST) {
-	/*
-	 * Reports EEXIST any time the target already exists.  If it makes
-	 * sense, remove the old file and try renaming again.
-	 */
-
-	if (srcAttr & FILE_ATTRIBUTE_DIRECTORY) {
-	    if (dstAttr & FILE_ATTRIBUTE_DIRECTORY) {
-		/*
-		 * Overwrite empty dst directory with src directory.  The
-		 * following call will remove an empty directory.  If it
-		 * fails, it's because it wasn't empty.
-		 */
-
-		if (DoRemoveDirectory(dstPtr, 0, NULL) == TCL_OK) {
-		    /*
-		     * Now that that empty directory is gone, we can try
-		     * renaming again.  If that fails, we'll put this empty
-		     * directory back, for completeness.
-		     */
-
-		    if ((*tclWinProcs->moveFileProc)(nativeSrc, nativeDst) != FALSE) {
-			return TCL_OK;
-		    }
-
-		    /*
-		     * Some new error has occurred.  Don't know what it
-		     * could be, but report this one.
-		     */
-
-		    TclWinConvertError(GetLastError());
-		    (*tclWinProcs->createDirectoryProc)(nativeDst, NULL);
-		    (*tclWinProcs->setFileAttributesProc)(nativeDst, dstAttr);
-		    if (Tcl_GetErrno() == EACCES) {
-			/*
-			 * Decode the EACCES to a more meaningful error.
-			 */
-
-			goto decode;
-		    }
-		}
-	    } else {	/* (dstAttr & FILE_ATTRIBUTE_DIRECTORY) == 0 */
-		Tcl_SetErrno(ENOTDIR);
-	    }
-	} else {    /* (srcAttr & FILE_ATTRIBUTE_DIRECTORY) == 0 */
-	    if (dstAttr & FILE_ATTRIBUTE_DIRECTORY) {
-		Tcl_SetErrno(EISDIR);
-	    } else {
-		/*
-		 * Overwrite existing file by:
-		 * 
-		 * 1. Rename existing file to temp name.
-		 * 2. Rename old file to new name.
-		 * 3. If success, delete temp file.  If failure,
-		 *    put temp file back to old name.
-		 */
-
-		TCHAR *nativeRest, *nativeTmp, *nativePrefix;
-		int result, size;
-		WCHAR tempBuf[MAX_PATH];
-		
-		size = (*tclWinProcs->getFullPathNameProc)(nativeDst, MAX_PATH, 
-			tempBuf, &nativeRest);
-		if ((size == 0) || (size > MAX_PATH) || (nativeRest == NULL)) {
-		    return TCL_ERROR;
-		}
-		nativeTmp = (TCHAR *) tempBuf;
-		((char *) nativeRest)[0] = '\0';
-		((char *) nativeRest)[1] = '\0';    /* In case it's Unicode. */
-
-		result = TCL_ERROR;
-		nativePrefix = (tclWinProcs->useWide) 
-			? (TCHAR *) L"tclr" : (TCHAR *) "tclr";
-		if ((*tclWinProcs->getTempFileNameProc)(nativeTmp, 
-			nativePrefix, 0, tempBuf) != 0) {
-		    /*
-		     * Strictly speaking, need the following DeleteFile and
-		     * MoveFile to be joined as an atomic operation so no
-		     * other app comes along in the meantime and creates the
-		     * same temp file.
-		     */
-		     
-		    nativeTmp = (TCHAR *) tempBuf;
-		    (*tclWinProcs->deleteFileProc)(nativeTmp);
-		    if ((*tclWinProcs->moveFileProc)(nativeDst, nativeTmp) != FALSE) {
-			if ((*tclWinProcs->moveFileProc)(nativeSrc, nativeDst) != FALSE) {
-			    (*tclWinProcs->setFileAttributesProc)(nativeTmp, 
-				    FILE_ATTRIBUTE_NORMAL);
-			    (*tclWinProcs->deleteFileProc)(nativeTmp);
-			    return TCL_OK;
-			} else {
-			    (*tclWinProcs->deleteFileProc)(nativeDst);
-			    (*tclWinProcs->moveFileProc)(nativeTmp, nativeDst);
-			}
-		    } 
-
-		    /*
-		     * Can't backup dst file or move src file.  Return that
-		     * error.  Could happen if an open file refers to dst.
-		     */
-
-		    TclWinConvertError(GetLastError());
-		    if (Tcl_GetErrno() == EACCES) {
-			/*
-			 * Decode the EACCES to a more meaningful error.
-			 */
-
-			goto decode;
-		    }
-		}
-		return result;
-	    }
-	}
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyFile, DoCopyFile --
- *
- *      Copy a single file (not a directory).  If dst already exists and
- *	is not a directory, it is removed.
- *
- * Results:
- *	If the file was successfully copied, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     src or dst parent directory can't be read and/or written.
- *	EISDIR:	    src or dst is a directory.
- *	ENOENT:	    src doesn't exist.  src or dst is "".
- *
- *	EACCES:     exists an open file already referring to dst (95).
- *	EACCES:	    src specifies a char device (nul:, com1:, etc.) (NT)
- *	ENOENT:	    src specifies a char device (nul:, com1:, etc.) (95)
- *
- * Side effects:
- *	It is not an error to copy to a char device.
- *
- *---------------------------------------------------------------------------
- */
-
-int 
-TclpCopyFile(
-    CONST char *src,		/* Pathname of file to be copied (UTF-8). */
-    CONST char *dst)		/* Pathname of file to copy to (UTF-8). */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_WinUtfToTChar(src, -1, &srcString);
-    Tcl_WinUtfToTChar(dst, -1, &dstString);
-    result = DoCopyFile(&srcString, &dstString);
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-static int
-DoCopyFile(
-    Tcl_DString *srcPtr,	/* Pathname of file to be copied (native). */
-    Tcl_DString *dstPtr)	/* Pathname of file to copy to (native). */
-{
-    CONST TCHAR *nativeSrc, *nativeDst;
-
-    nativeSrc = (TCHAR *) Tcl_DStringValue(srcPtr);
-    nativeDst = (TCHAR *) Tcl_DStringValue(dstPtr);
-
-    /*
-     * Would throw an exception under NT if one of the arguments is a char
-     * block device.
-     */
-
-    try {
-	if ((*tclWinProcs->copyFileProc)(nativeSrc, nativeDst, 0) != FALSE) {
-	    return TCL_OK;
-	}
-    } except (-1) {}
-
-    TclWinConvertError(GetLastError());
-    if (Tcl_GetErrno() == EBADF) {
-	Tcl_SetErrno(EACCES);
-	return TCL_ERROR;
-    }
-    if (Tcl_GetErrno() == EACCES) {
-	DWORD srcAttr, dstAttr;
-
-	srcAttr = (*tclWinProcs->getFileAttributesProc)(nativeSrc);
-	dstAttr = (*tclWinProcs->getFileAttributesProc)(nativeDst);
-	if (srcAttr != 0xffffffff) {
-	    if (dstAttr == 0xffffffff) {
-		dstAttr = 0;
-	    }
-	    if ((srcAttr & FILE_ATTRIBUTE_DIRECTORY) ||
-		    (dstAttr & FILE_ATTRIBUTE_DIRECTORY)) {
-		Tcl_SetErrno(EISDIR);
-	    }
-	    if (dstAttr & FILE_ATTRIBUTE_READONLY) {
-		(*tclWinProcs->setFileAttributesProc)(nativeDst, 
-			dstAttr & ~FILE_ATTRIBUTE_READONLY);
-		if ((*tclWinProcs->copyFileProc)(nativeSrc, nativeDst, 0) != FALSE) {
-		    return TCL_OK;
-		}
-		/*
-		 * Still can't copy onto dst.  Return that error, and
-		 * restore attributes of dst.
-		 */
-
-		TclWinConvertError(GetLastError());
-		(*tclWinProcs->setFileAttributesProc)(nativeDst, dstAttr);
-	    }
-	}
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpDeleteFile, DoDeleteFile --
- *
- *      Removes a single file (not a directory).
- *
- * Results:
- *	If the file was successfully deleted, returns TCL_OK.  Otherwise
- *	the return value is TCL_ERROR and errno is set to indicate the
- *	error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EISDIR:	    path is a directory.
- *	ENOENT:	    path doesn't exist or is "".
- *
- *	EACCES:     exists an open file already referring to path.
- *	EACCES:	    path is a char device (nul:, com1:, etc.)
- *
- * Side effects:
- *      The file is deleted, even if it is read-only.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpDeleteFile(
-    CONST char *path)		/* Pathname of file to be removed (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_WinUtfToTChar(path, -1, &pathString);
-    result = DoDeleteFile(&pathString);
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoDeleteFile(
-    Tcl_DString *pathPtr)	/* Pathname of file to be removed (native). */
-{
-    DWORD attr;
-    CONST TCHAR *nativePath;
-
-    nativePath = (TCHAR *) Tcl_DStringValue(pathPtr);
-    
-    if ((*tclWinProcs->deleteFileProc)(nativePath) != FALSE) {
-	return TCL_OK;
-    }
-    TclWinConvertError(GetLastError());
-
-    /*
-     * Win32s thinks that "" is the same as "." and then reports EISDIR
-     * instead of ENOENT.
-     */
-
-    if (tclWinProcs->useWide) {
-	if (((WCHAR *) nativePath)[0] == '\0') {
-	    Tcl_SetErrno(ENOENT);
-	    return TCL_ERROR;
-	}
-    } else {
-	if (((char *) nativePath)[0] == '\0') {
-	    Tcl_SetErrno(ENOENT);
-	    return TCL_ERROR;
-	}
-    }
-    if (Tcl_GetErrno() == EACCES) {
-        attr = (*tclWinProcs->getFileAttributesProc)(nativePath);
-	if (attr != 0xffffffff) {
-	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-		/*
-		 * Windows NT reports removing a directory as EACCES instead
-		 * of EISDIR.
-		 */
-
-		Tcl_SetErrno(EISDIR);
-	    } else if (attr & FILE_ATTRIBUTE_READONLY) {
-		(*tclWinProcs->setFileAttributesProc)(nativePath, 
-			attr & ~FILE_ATTRIBUTE_READONLY);
-		if ((*tclWinProcs->deleteFileProc)(nativePath) != FALSE) {
-		    return TCL_OK;
-		}
-		TclWinConvertError(GetLastError());
-		(*tclWinProcs->setFileAttributesProc)(nativePath, attr);
-	    }
-	}
-    } else if (Tcl_GetErrno() == ENOENT) {
-        attr = (*tclWinProcs->getFileAttributesProc)(nativePath);
-	if (attr != 0xffffffff) {
-	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-	    	/*
-		 * Windows 95 reports removing a directory as ENOENT instead 
-		 * of EISDIR. 
-		 */
-
-		Tcl_SetErrno(EISDIR);
-	    }
-	}
-    } else if (Tcl_GetErrno() == EINVAL) {
-	/*
-	 * Windows NT reports removing a char device as EINVAL instead of
-	 * EACCES.
-	 */
-
-	Tcl_SetErrno(EACCES);
-    }
-
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCreateDirectory --
- *
- *      Creates the specified directory.  All parent directories of the
- *	specified directory must already exist.  The directory is
- *	automatically created with permissions so that user can access
- *	the new directory and create new files or subdirectories in it.
- *
- * Results:
- *	If the directory was successfully created, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR and errno is set to
- *	indicate the error.  Some possible values for errno are:
- *
- *	EACCES:     a parent directory can't be read and/or written.
- *	EEXIST:	    path already exists.
- *	ENOENT:	    a parent directory doesn't exist.
- *
- * Side effects:
- *      A directory is created.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCreateDirectory(
-    CONST char *path)		/* Pathname of directory to create (UTF-8). */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_WinUtfToTChar(path, -1, &pathString);
-    result = DoCreateDirectory(&pathString);
-    Tcl_DStringFree(&pathString);
-    return result;
-}
-
-static int
-DoCreateDirectory(
-    Tcl_DString *pathPtr)	/* Pathname of directory to create (native). */
-{
-    int error;
-    CONST TCHAR *nativePath;
-
-    nativePath = (TCHAR *) Tcl_DStringValue(pathPtr);
-    if ((*tclWinProcs->createDirectoryProc)(nativePath, NULL) == 0) {
-	error = GetLastError();
-	if (TclWinGetPlatformId() == VER_PLATFORM_WIN32s) {
-	    if ((error == ERROR_ACCESS_DENIED) 
-		    && ((*tclWinProcs->getFileAttributesProc)(nativePath) 
-			    != 0xffffffff)) {
-		error = ERROR_FILE_EXISTS;
-	    }
-	}
-	TclWinConvertError(error);
-	return TCL_ERROR;
-    }   
-    return TCL_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpCopyDirectory --
- *
- *      Recursively copies a directory.  The target directory dst must
- *	not already exist.  Note that this function does not merge two
- *	directory hierarchies, even if the target directory is an an
- *	empty directory.
- *
- * Results:
- *	If the directory was successfully copied, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  See TclpCreateDirectory and TclpCopyFile
- *	for a description of possible values for errno.
- *
- * Side effects:
- *      An exact copy of the directory hierarchy src will be created
- *	with the name dst.  If an error occurs, the error will
- *      be returned immediately, and remaining files will not be
- *	processed.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpCopyDirectory(
-    CONST char *src,		/* Pathname of directory to be copied
-				 * (UTF-8). */
-    CONST char *dst,		/* Pathname of target directory (UTF-8). */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    int result;
-    Tcl_DString srcString, dstString;
-
-    Tcl_WinUtfToTChar(src, -1, &srcString);
-    Tcl_WinUtfToTChar(dst, -1, &dstString);
-
-    result = TraverseWinTree(TraversalCopy, &srcString, &dstString, errorPtr);
-
-    Tcl_DStringFree(&srcString);
-    Tcl_DStringFree(&dstString);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpRemoveDirectory, DoRemoveDirectory -- 
- *
- *	Removes directory (and its contents, if the recursive flag is set).
- *
- * Results:
- *	If the directory was successfully removed, returns TCL_OK.
- *	Otherwise the return value is TCL_ERROR, errno is set to indicate
- *	the error, and the pathname of the file that caused the error
- *	is stored in errorPtr.  Some possible values for errno are:
- *
- *	EACCES:     path directory can't be read and/or written.
- *	EEXIST:	    path is a non-empty directory.
- *	EINVAL:	    path is root directory or current directory.
- *	ENOENT:	    path doesn't exist or is "".
- * 	ENOTDIR:    path is not a directory.
- *
- *	EACCES:	    path is a char device (nul:, com1:, etc.) (95)
- *	EINVAL:	    path is a char device (nul:, com1:, etc.) (NT)
- *
- * Side effects:
- *	Directory removed.  If an error occurs, the error will be returned
- *	immediately, and remaining files will not be deleted.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpRemoveDirectory(
-    CONST char *path,		/* Pathname of directory to be removed
-				 * (UTF-8). */
-    int recursive,		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    int result;
-    Tcl_DString pathString;
-
-    Tcl_WinUtfToTChar(path, -1, &pathString);
-    result = DoRemoveDirectory(&pathString, recursive, errorPtr);
-    Tcl_DStringFree(&pathString);
-
-    return result;
-}
-
-static int
-DoRemoveDirectory(
-    Tcl_DString *pathPtr,	/* Pathname of directory to be removed
-				 * (native). */
-    int recursive,		/* If non-zero, removes directories that
-				 * are nonempty.  Otherwise, will only remove
-				 * empty directories. */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    CONST TCHAR *nativePath;
-    DWORD attr;
-
-    nativePath = (TCHAR *) Tcl_DStringValue(pathPtr);
-
-    if ((*tclWinProcs->removeDirectoryProc)(nativePath) != FALSE) {
-	return TCL_OK;
-    }
-    TclWinConvertError(GetLastError());
-
-    /*
-     * Win32s thinks that "" is the same as "." and then reports EACCES
-     * instead of ENOENT.
-     */
-
-
-    if (tclWinProcs->useWide) {
-	if (((WCHAR *) nativePath)[0] == '\0') {
-	    Tcl_SetErrno(ENOENT);
-	    return TCL_ERROR;
-	}
-    } else {
-	if (((char *) nativePath)[0] == '\0') {
-	    Tcl_SetErrno(ENOENT);
-	    return TCL_ERROR;
-	}
-    }
-    if (Tcl_GetErrno() == EACCES) {
-	attr = (*tclWinProcs->getFileAttributesProc)(nativePath);
-	if (attr != 0xffffffff) {
-	    if ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-		/* 
-		 * Windows 95 reports calling RemoveDirectory on a file as an 
-		 * EACCES, not an ENOTDIR.
-		 */
-		
-		Tcl_SetErrno(ENOTDIR);
-		goto end;
-	    }
-
-	    if (attr & FILE_ATTRIBUTE_READONLY) {
-		attr &= ~FILE_ATTRIBUTE_READONLY;
-		if ((*tclWinProcs->setFileAttributesProc)(nativePath, attr) == FALSE) {
-		    goto end;
-		}
-		if ((*tclWinProcs->removeDirectoryProc)(nativePath) != FALSE) {
-		    return TCL_OK;
-		}
-		TclWinConvertError(GetLastError());
-		(*tclWinProcs->setFileAttributesProc)(nativePath, 
-			attr | FILE_ATTRIBUTE_READONLY);
-	    }
-
-	    /* 
-	     * Windows 95 and Win32s report removing a non-empty directory 
-	     * as EACCES, not EEXIST.  If the directory is not empty,
-	     * change errno so caller knows what's going on.
-	     */
-
-	    if (TclWinGetPlatformId() != VER_PLATFORM_WIN32_NT) {
-		char *path, *find;
-		HANDLE handle;
-		WIN32_FIND_DATAA data;
-		Tcl_DString buffer;
-		int len;
-
-		path = (char *) nativePath;
-
-		Tcl_DStringInit(&buffer);
-		len = strlen(path);
-		find = Tcl_DStringAppend(&buffer, path, len);
-		if ((len > 0) && (find[len - 1] != '\\')) {
-		    Tcl_DStringAppend(&buffer, "\\", 1);
-		}
-		find = Tcl_DStringAppend(&buffer, "*.*", 3);
-		handle = FindFirstFileA(find, &data);
-		if (handle != INVALID_HANDLE_VALUE) {
-		    while (1) {
-			if ((strcmp(data.cFileName, ".") != 0)
-				&& (strcmp(data.cFileName, "..") != 0)) {
-			    /*
-			     * Found something in this directory.
-			     */
-
-			    Tcl_SetErrno(EEXIST);
-			    break;
-			}
-			if (FindNextFileA(handle, &data) == FALSE) {
-			    break;
-			}
-		    }
-		    FindClose(handle);
-		}
-		Tcl_DStringFree(&buffer);
-	    }
-	}
-    }
-    if (Tcl_GetErrno() == ENOTEMPTY) {
-	/* 
-	 * The caller depends on EEXIST to signify that the directory is
-	 * not empty, not ENOTEMPTY. 
-	 */
-
-	Tcl_SetErrno(EEXIST);
-    }
-    if ((recursive != 0) && (Tcl_GetErrno() == EEXIST)) {
-	/*
-	 * The directory is nonempty, but the recursive flag has been
-	 * specified, so we recursively remove all the files in the directory.
-	 */
-
-	return TraverseWinTree(TraversalDelete, pathPtr, NULL, errorPtr);
-    }
-    
-    end:
-    if (errorPtr != NULL) {
-	Tcl_WinTCharToUtf(nativePath, -1, errorPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TraverseWinTree --
- *
- *      Traverse directory tree specified by sourcePtr, calling the function 
- *	traverseProc for each file and directory encountered.  If destPtr 
- *	is non-null, each of name in the sourcePtr directory is appended to 
- *	the directory specified by destPtr and passed as the second argument 
- *	to traverseProc() .
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      None caused by TraverseWinTree, however the user specified 
- *	traverseProc() may change state.  If an error occurs, the error will
- *      be returned immediately, and remaining files will not be processed.
- *
- *---------------------------------------------------------------------------
- */
-
-static int 
-TraverseWinTree(
-    TraversalProc *traverseProc,/* Function to call for every file and
-				 * directory in source hierarchy. */
-    Tcl_DString *sourcePtr,	/* Pathname of source directory to be
-				 * traversed (native). */
-    Tcl_DString *targetPtr,	/* Pathname of directory to traverse in
-				 * parallel with source directory (native). */
-    Tcl_DString *errorPtr)	/* If non-NULL, uninitialized or free
-				 * DString filled with UTF-8 name of file
-				 * causing error. */
-{
-    DWORD sourceAttr;
-    TCHAR *nativeSource, *nativeErrfile;
-    int result, found, sourceLen, targetLen, oldSourceLen, oldTargetLen;
-    HANDLE handle;
-    WIN32_FIND_DATAT data;
-
-    nativeErrfile = NULL;
-    result = TCL_OK;
-    oldTargetLen = 0;		/* lint. */
-
-    nativeSource = (TCHAR *) Tcl_DStringValue(sourcePtr);
-    oldSourceLen = Tcl_DStringLength(sourcePtr);
-    sourceAttr = (*tclWinProcs->getFileAttributesProc)(nativeSource);
-    if (sourceAttr == 0xffffffff) {
-	nativeErrfile = nativeSource;
-	goto end;
-    }
-    if ((sourceAttr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-	/*
-	 * Process the regular file
-	 */
-
-	return (*traverseProc)(sourcePtr, targetPtr, DOTREE_F, errorPtr);
-    }
-
-    if (tclWinProcs->useWide) {
-	Tcl_DStringAppend(sourcePtr, (char *) L"\\*.*", 4 * sizeof(WCHAR) + 1);
-	Tcl_DStringSetLength(sourcePtr, Tcl_DStringLength(sourcePtr) - 1);
-    } else {
-	Tcl_DStringAppend(sourcePtr, "\\*.*", 4);
-    }
-    nativeSource = (TCHAR *) Tcl_DStringValue(sourcePtr);
-    handle = (*tclWinProcs->findFirstFileProc)(nativeSource, &data);
-    if (handle == INVALID_HANDLE_VALUE) {      
-	/* 
-	 * Can't read directory
-	 */
-
-	TclWinConvertError(GetLastError());
-	nativeErrfile = nativeSource;
-	goto end;
-    }
-
-    nativeSource[oldSourceLen + 1] = '\0';
-    Tcl_DStringSetLength(sourcePtr, oldSourceLen);
-    result = (*traverseProc)(sourcePtr, targetPtr, DOTREE_PRED, errorPtr);
-    if (result != TCL_OK) {
-	FindClose(handle);
-	return result;
-    }
-
-    sourceLen = oldSourceLen;
-
-    if (tclWinProcs->useWide) {
-	sourceLen += sizeof(WCHAR);
-	Tcl_DStringAppend(sourcePtr, (char *) L"\\", sizeof(WCHAR) + 1);
-	Tcl_DStringSetLength(sourcePtr, sourceLen);
-    } else {
-	sourceLen += 1;
-	Tcl_DStringAppend(sourcePtr, "\\", 1);
-    }
-    if (targetPtr != NULL) {
-	oldTargetLen = Tcl_DStringLength(targetPtr);
-
-	targetLen = oldTargetLen;
-	if (tclWinProcs->useWide) {
-	    targetLen += sizeof(WCHAR);
-	    Tcl_DStringAppend(targetPtr, (char *) L"\\", sizeof(WCHAR) + 1);
-	    Tcl_DStringSetLength(targetPtr, targetLen);
-	} else {
-	    targetLen += 1;
-	    Tcl_DStringAppend(targetPtr, "\\", 1);
-	}
-    }
-
-    found = 1;
-    for ( ; found; found = (*tclWinProcs->findNextFileProc)(handle, &data)) {
-	TCHAR *nativeName;
-	int len;
-
-	if (tclWinProcs->useWide) {
-	    WCHAR *wp;
-
-	    wp = data.w.cFileName;
-	    if (*wp == '.') {
-		wp++;
-		if (*wp == '.') {
-		    wp++;
-		}
-		if (*wp == '\0') {
-		    continue;
-		}
-	    }
-	    nativeName = (TCHAR *) data.w.cFileName;
-	    len = Tcl_UniCharLen(data.w.cFileName) * sizeof(WCHAR);
-	} else {
-	    if ((strcmp(data.a.cFileName, ".") == 0) 
-		    || (strcmp(data.a.cFileName, "..") == 0)) {
-		continue;
-	    }
-	    nativeName = (TCHAR *) data.a.cFileName;
-	    len = strlen(data.a.cFileName);
-	}
-
-	/* 
-	 * Append name after slash, and recurse on the file. 
-	 */
-
-	Tcl_DStringAppend(sourcePtr, (char *) nativeName, len + 1);
-	Tcl_DStringSetLength(sourcePtr, Tcl_DStringLength(sourcePtr) - 1);
-	if (targetPtr != NULL) {
-	    Tcl_DStringAppend(targetPtr, (char *) nativeName, len + 1);
-	    Tcl_DStringSetLength(targetPtr, Tcl_DStringLength(targetPtr) - 1);
-	}
-	result = TraverseWinTree(traverseProc, sourcePtr, targetPtr, 
-		errorPtr);
-	if (result != TCL_OK) {
-	    break;
-	}
-
-	/*
-	 * Remove name after slash.
-	 */
-
-	Tcl_DStringSetLength(sourcePtr, sourceLen);
-	if (targetPtr != NULL) {
-	    Tcl_DStringSetLength(targetPtr, targetLen);
-	}
-    }
-    FindClose(handle);
-
-    /*
-     * Strip off the trailing slash we added
-     */
-
-    Tcl_DStringSetLength(sourcePtr, oldSourceLen + 1);
-    Tcl_DStringSetLength(sourcePtr, oldSourceLen);
-    if (targetPtr != NULL) {
-	Tcl_DStringSetLength(targetPtr, oldTargetLen + 1);
-	Tcl_DStringSetLength(targetPtr, oldTargetLen);
-    }
-    if (result == TCL_OK) {
-	/*
-	 * Call traverseProc() on a directory after visiting all the
-	 * files in that directory.
-	 */
-
-	result = (*traverseProc)(sourcePtr, targetPtr, DOTREE_POSTD, 
-		errorPtr);
-    }
-    end:
-    if (nativeErrfile != NULL) {
-	TclWinConvertError(GetLastError());
-	if (errorPtr != NULL) {
-	    Tcl_WinTCharToUtf(nativeErrfile, -1, errorPtr);
-	}
-	result = TCL_ERROR;
-    }
-	    
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TraversalCopy
- *
- *      Called from TraverseUnixTree in order to execute a recursive
- *      copy of a directory.
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      Depending on the value of type, src may be copied to dst.
- *      
- *----------------------------------------------------------------------
- */
-
-static int 
-TraversalCopy(
-    Tcl_DString *srcPtr,	/* Source pathname to copy. */
-    Tcl_DString *dstPtr,	/* Destination pathname of copy. */
-    int type,			/* Reason for call - see TraverseWinTree() */
-    Tcl_DString *errorPtr)	/* If non-NULL, initialized DString filled
-				 * with UTF-8 name of file causing error. */
-{
-    TCHAR *nativeDst, *nativeSrc;
-    DWORD attr;
-
-    switch (type) {
-	case DOTREE_F: {
-	    if (DoCopyFile(srcPtr, dstPtr) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-	}
-	case DOTREE_PRED: {
-	    if (DoCreateDirectory(dstPtr) == TCL_OK) {
-		nativeSrc = (TCHAR *) Tcl_DStringValue(srcPtr);
-		nativeDst = (TCHAR *) Tcl_DStringValue(dstPtr);
-		attr = (*tclWinProcs->getFileAttributesProc)(nativeSrc);
-		if ((*tclWinProcs->setFileAttributesProc)(nativeDst, attr) != FALSE) {
-		    return TCL_OK;
-		}
-		TclWinConvertError(GetLastError());
-	    }
-	    break;
-	}
-        case DOTREE_POSTD: {
-	    return TCL_OK;
-	}
-    }
-
-    /*
-     * There shouldn't be a problem with src, because we already
-     * checked it to get here.
-     */
-
-    if (errorPtr != NULL) {
-	nativeDst = (TCHAR *) Tcl_DStringValue(dstPtr);
-	Tcl_WinTCharToUtf(nativeDst, -1, errorPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TraversalDelete --
- *
- *      Called by procedure TraverseWinTree for every file and
- *      directory that it encounters in a directory hierarchy. This
- *      procedure unlinks files, and removes directories after all the
- *      containing files have been processed.
- *
- * Results:
- *      Standard Tcl result.
- *
- * Side effects:
- *      Files or directory specified by src will be deleted. If an
- *      error occurs, the windows error is converted to a Posix error
- *      and errno is set accordingly.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TraversalDelete( 
-    Tcl_DString *srcPtr,	/* Source pathname to delete. */
-    Tcl_DString *dstPtr,	/* Not used. */
-    int type,			/* Reason for call - see TraverseWinTree() */
-    Tcl_DString *errorPtr)	/* If non-NULL, initialized DString filled
-				 * with UTF-8 name of file causing error. */
-{
-    TCHAR *nativeSrc;
-
-    switch (type) {
-	case DOTREE_F: {
-	    if (DoDeleteFile(srcPtr) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-	}
-	case DOTREE_PRED: {
-	    return TCL_OK;
-	}
-	case DOTREE_POSTD: {
-	    if (DoRemoveDirectory(srcPtr, 0, NULL) == TCL_OK) {
-		return TCL_OK;
-	    }
-	    break;
-	}
-    }
-
-    if (errorPtr != NULL) {
-	nativeSrc = (TCHAR *) Tcl_DStringValue(srcPtr);
-	Tcl_WinTCharToUtf(nativeSrc, -1, errorPtr);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * StatError --
- *
- *	Sets the object result with the appropriate error.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      The interp's object result is set with an error message
- *	based on the objIndex, fileName and errno.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-StatError(
-    Tcl_Interp *interp,		/* The interp that has the error */
-    CONST char *fileName)	/* The name of the file which caused the 
-				 * error. */
-{
-    TclWinConvertError(GetLastError());
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-	    "could not read \"", fileName, "\": ", Tcl_PosixError(interp), 
-	    (char *) NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetWinFileAttributes --
- *
- *      Returns a Tcl_Obj containing the value of a file attribute.
- *	This routine gets the -hidden, -readonly or -system attribute.
- *
- * Results:
- *      Standard Tcl result and a Tcl_Obj in attributePtrPtr. The object
- *	will have ref count 0. If the return value is not TCL_OK,
- *	attributePtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetWinFileAttributes(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
-{
-    DWORD result;
-    Tcl_DString ds;
-    TCHAR *nativeName;
-
-    nativeName = Tcl_WinUtfToTChar(fileName, -1, &ds);
-    result = (*tclWinProcs->getFileAttributesProc)(nativeName);
-    Tcl_DStringFree(&ds);
-
-    if (result == 0xffffffff) {
-	StatError(interp, fileName);
-	return TCL_ERROR;
-    }
-
-    *attributePtrPtr = Tcl_NewBooleanObj(result & attributeArray[objIndex]);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConvertFileNameFormat --
- *
- *      Returns a Tcl_Obj containing either the long or short version of the 
- *	file name.
- *
- * Results:
- *      Standard Tcl result and a Tcl_Obj in attributePtrPtr. The object
- *	will have ref count 0. If the return value is not TCL_OK,
- *	attributePtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ConvertFileNameFormat(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    int longShort,		/* 0 to short name, 1 to long name. */
-    Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
-{
-    int pathc, i;
-    char **pathv, **newv;
-    char *resultStr;
-    Tcl_DString resultDString;
-    int result = TCL_OK;
-
-    Tcl_SplitPath(fileName, &pathc, &pathv);
-    newv = (char **) ckalloc(pathc * sizeof(char *));
-
-    for (i = 0; i < pathc; i++) {
-	if ((pathv[i][0] == '/')
-		|| ((strlen(pathv[i]) == 3) && (pathv[i][1] == ':'))
-		|| (strcmp(pathv[i], ".") == 0)
-		|| (strcmp(pathv[i], "..") == 0)) {
-	    /*
-	     * Handle "/", "//machine/export", "c:/", "." or ".." by just
-	     * copying the string literally.  Uppercase the drive letter,
-	     * just because it looks better under Windows to do so.
-	     */
-
-	    simple:
-	    pathv[i][0] = (char) Tcl_UniCharToUpper(UCHAR(pathv[i][0]));
-	    newv[i] = (char *) ckalloc(strlen(pathv[i]) + 1);
-	    lstrcpyA(newv[i], pathv[i]);
-	} else {
-	    char *str;
-	    TCHAR *nativeName;
-	    Tcl_DString ds;
-	    WIN32_FIND_DATAT data;
-	    HANDLE handle;
-	    DWORD attr;
-
-	    Tcl_DStringInit(&resultDString);
-	    str = Tcl_JoinPath(i + 1, pathv, &resultDString);
-	    nativeName = Tcl_WinUtfToTChar(str, -1, &ds);
-	    handle = (*tclWinProcs->findFirstFileProc)(nativeName, &data);
-	    if (handle == INVALID_HANDLE_VALUE) {
-		/*
-		 * FindFirstFile() doesn't like root directories.  We 
-		 * would only get a root directory here if the caller
-		 * specified "c:" or "c:." and the current directory on the
-		 * drive was the root directory
-		 */
-
-		attr = (*tclWinProcs->getFileAttributesProc)(nativeName);
-		if ((attr != 0xFFFFFFFF) && (attr & FILE_ATTRIBUTE_DIRECTORY)) {
-		    Tcl_DStringFree(&ds);
-		    Tcl_DStringFree(&resultDString);
-
-		    goto simple;
-		}
-	    }
-	    Tcl_DStringFree(&ds);
-	    Tcl_DStringFree(&resultDString);
-
-	    if (handle == INVALID_HANDLE_VALUE) {
-		pathc = i - 1;
-		StatError(interp, fileName);
-		result = TCL_ERROR;
-		goto cleanup;
-	    }
-	    if (tclWinProcs->useWide) {
-		nativeName = (TCHAR *) data.w.cAlternateFileName;
-		if (longShort) {
-		    if (data.w.cFileName[0] != '\0') {
-			nativeName = (TCHAR *) data.w.cFileName;
-		    } 
-		} else {
-		    if (data.w.cAlternateFileName[0] == '\0') {
-			nativeName = (TCHAR *) data.w.cFileName;
-		    }
-		}
-	    } else {
-		nativeName = (TCHAR *) data.a.cAlternateFileName;
-		if (longShort) {
-		    if (data.a.cFileName[0] != '\0') {
-			nativeName = (TCHAR *) data.a.cFileName;
-		    } 
-		} else {
-		    if (data.a.cAlternateFileName[0] == '\0') {
-			nativeName = (TCHAR *) data.a.cFileName;
-		    }
-		}
-	    }
-
-	    /*
-	     * Purify reports a extraneous UMR in Tcl_WinTCharToUtf() trying 
-	     * to dereference nativeName as a Unicode string.  I have proven 
-	     * to myself that purify is wrong by running the following 
-	     * example when nativeName == data.w.cAlternateFileName and 
-	     * noting that purify doesn't complain about the first line,
-	     * but does complain about the second.
-	     *
-	     *	fprintf(stderr, "%d\n", data.w.cAlternateFileName[0]);
-	     *	fprintf(stderr, "%d\n", ((WCHAR *) nativeName)[0]);
-	     */
-
-	    Tcl_WinTCharToUtf(nativeName, -1, &ds);
-	    newv[i] = ckalloc(Tcl_DStringLength(&ds) + 1);
-	    lstrcpyA(newv[i], Tcl_DStringValue(&ds));
-	    Tcl_DStringFree(&ds);
-	    FindClose(handle);
-	}
-    }
-
-    Tcl_DStringInit(&resultDString);
-    resultStr = Tcl_JoinPath(pathc, newv, &resultDString);
-    *attributePtrPtr = Tcl_NewStringObj(resultStr, 
-	    Tcl_DStringLength(&resultDString));
-    Tcl_DStringFree(&resultDString);
-
-cleanup:
-    for (i = 0; i < pathc; i++) {
-	ckfree(newv[i]);
-    }
-    ckfree((char *) newv);
-    ckfree((char *) pathv);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetWinFileLongName --
- *
- *      Returns a Tcl_Obj containing the short version of the file
- *	name.
- *
- * Results:
- *      Standard Tcl result and a Tcl_Obj in attributePtrPtr. The object
- *	will have ref count 0. If the return value is not TCL_OK,
- *	attributePtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetWinFileLongName(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
-{
-    return ConvertFileNameFormat(interp, objIndex, fileName, 1, attributePtrPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetWinFileShortName --
- *
- *      Returns a Tcl_Obj containing the short version of the file
- *	name.
- *
- * Results:
- *      Standard Tcl result and a Tcl_Obj in attributePtrPtr. The object
- *	will have ref count 0. If the return value is not TCL_OK,
- *	attributePtrPtr is not touched.
- *
- * Side effects:
- *      A new object is allocated if the file is valid.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetWinFileShortName(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj **attributePtrPtr)	/* A pointer to return the object with. */
-{
-    return ConvertFileNameFormat(interp, objIndex, fileName, 0, attributePtrPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetWinFileAttributes --
- *
- *	Set the file attributes to the value given by attributePtr.
- *	This routine sets the -hidden, -readonly, or -system attributes.
- *
- * Results:
- *      Standard TCL error.
- *
- * Side effects:
- *      The file's attribute is set.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetWinFileAttributes(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj *attributePtr)	/* The new value of the attribute. */
-{
-    DWORD fileAttributes;
-    int yesNo;
-    int result;
-    Tcl_DString ds;
-    TCHAR *nativeName;
-
-    nativeName = Tcl_WinUtfToTChar(fileName, -1, &ds);
-    fileAttributes = (*tclWinProcs->getFileAttributesProc)(nativeName);
-
-    if (fileAttributes == 0xffffffff) {
-	StatError(interp, fileName);
-	result = TCL_ERROR;
-	goto end;
-    }
-
-    result = Tcl_GetBooleanFromObj(interp, attributePtr, &yesNo);
-    if (result != TCL_OK) {
-	goto end;
-    }
-
-    if (yesNo) {
-	fileAttributes |= (attributeArray[objIndex]);
-    } else {
-	fileAttributes &= ~(attributeArray[objIndex]);
-    }
-
-    if (!(*tclWinProcs->setFileAttributesProc)(nativeName, fileAttributes)) {
-	StatError(interp, fileName);
-	result = TCL_ERROR;
-	goto end;
-    }
-
-    end:
-    Tcl_DStringFree(&ds);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetWinFileLongName --
- *
- *	The attribute in question is a readonly attribute and cannot
- *	be set.
- *
- * Results:
- *      TCL_ERROR
- *
- * Side effects:
- *      The object result is set to a pertinant error message.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CannotSetAttribute(
-    Tcl_Interp *interp,		/* The interp we are using for errors. */
-    int objIndex,		/* The index of the attribute. */
-    CONST char *fileName,	/* The name of the file. */
-    Tcl_Obj *attributePtr)	/* The new value of the attribute. */
-{
-    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp), 
-	    "cannot set attribute \"", tclpFileAttrStrings[objIndex],
-	    "\" for file \"", fileName, "\": attribute is readonly", 
-	    (char *) NULL);
-    return TCL_ERROR;
-}
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpListVolumes --
- *
- *	Lists the currently mounted volumes
- *
- * Results:
- *	A standard Tcl result.  Will always be TCL_OK, since there is no way
- *	that this command can fail.  Also, the interpreter's result is set to 
- *	the list of volumes.
- *
- * Side effects:
- *	None
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpListVolumes( 
-    Tcl_Interp *interp)		/* Interpreter for returning volume list. */
-{
-    Tcl_Obj *resultPtr, *elemPtr;
-    char buf[40 * 4];		/* There couldn't be more than 30 drives??? */
-    int i;
-    char *p;
-
-    resultPtr = Tcl_GetObjResult(interp);
-
-    /*
-     * On Win32s:
-     * GetLogicalDriveStrings() isn't implemented.
-     * GetLogicalDrives() returns incorrect information.
-     */
-
-    if (GetLogicalDriveStringsA(sizeof(buf), buf) == 0) {
-	/*
-	 * GetVolumeInformation() will detects all drives, but causes
-	 * chattering on empty floppy drives.  We only do this if 
-	 * GetLogicalDriveStrings() didn't work.  It has also been reported
-	 * that on some laptops it takes a while for GetVolumeInformation()
-	 * to return when pinging an empty floppy drive, another reason to 
-	 * try to avoid calling it.
-	 */
-
-	buf[1] = ':';
-	buf[2] = '/';
-	buf[3] = '\0';
-
-	for (i = 0; i < 26; i++) {
-	    buf[0] = (char) ('a' + i);
-	    if (GetVolumeInformationA(buf, NULL, 0, NULL, NULL, NULL, NULL, 0)  
-		    || (GetLastError() == ERROR_NOT_READY)) {
-		elemPtr = Tcl_NewStringObj(buf, -1);
-		Tcl_ListObjAppendElement(NULL, resultPtr, elemPtr);
-	    }
-	}
-    } else {
-	for (p = buf; *p != '\0'; p += 4) {
-	    p[2] = '/';
-	    elemPtr = Tcl_NewStringObj(p, -1);
-	    Tcl_ListObjAppendElement(NULL, resultPtr, elemPtr);
-	}
-    }
-    return TCL_OK;	
-}
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
deleted file mode 100644
index e7dce3f..0000000
--- a/win/tclWinFile.c
+++ /dev/null
@@ -1,956 +0,0 @@
-/* 
- * tclWinFile.c --
- *
- *      This file contains temporary wrappers around UNIX file handling
- *      functions. These wrappers map the UNIX functions to Win32 HANDLE-style
- *      files, which can be manipulated through the Win32 console redirection
- *      interfaces.
- *
- * Copyright (c) 1995-1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinFile.c,v 1.5 1999/04/16 00:48:08 stanton Exp $
- */
-
-#include "tclWinInt.h"
-#include <sys/stat.h>
-#include <shlobj.h>
-#include <lmaccess.h>		/* For TclpGetUserHome(). */
-
-static time_t		ToCTime(FILETIME fileTime);
-
-typedef NET_API_STATUS NET_API_FUNCTION NETUSERGETINFOPROC
-	(LPWSTR servername, LPWSTR username, DWORD level, LPBYTE *bufptr);
-
-typedef NET_API_STATUS NET_API_FUNCTION NETAPIBUFFERFREEPROC
-	(LPVOID Buffer);
-
-typedef NET_API_STATUS NET_API_FUNCTION NETGETDCNAMEPROC
-	(LPWSTR servername, LPWSTR domainname, LPBYTE *bufptr);
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpFindExecutable --
- *
- *	This procedure computes the absolute path name of the current
- *	application, given its argv[0] value.
- *
- * Results:
- *	A dirty UTF string that is the path to the executable.  At this
- *	point we may not know the system encoding.  Convert the native
- *	string value to UTF using the default encoding.  The assumption
- *	is that we will still be able to parse the path given the path
- *	name contains ASCII string and '/' chars do not conflict with
- *	other UTF chars.
- *
- * Side effects:
- *	The variable tclNativeExecutableName gets filled in with the file
- *	name for the application, if we figured it out.  If we couldn't
- *	figure it out, tclNativeExecutableName is set to NULL.
- *
- *---------------------------------------------------------------------------
- */
-
-char *
-TclpFindExecutable(argv0)
-    CONST char *argv0;		/* The value of the application's argv[0]
-				 * (native). */
-{
-    Tcl_DString ds;
-    WCHAR wName[MAX_PATH];
-
-    if (argv0 == NULL) {
-	return NULL;
-    }
-    if (tclNativeExecutableName != NULL) {
-	return tclNativeExecutableName;
-    }
-
-    /*
-     * Under Windows we ignore argv0, and return the path for the file used to
-     * create this process.
-     */
-
-    (*tclWinProcs->getModuleFileNameProc)(NULL, wName, MAX_PATH);
-    Tcl_WinTCharToUtf((TCHAR *) wName, -1, &ds);
-
-    tclNativeExecutableName = ckalloc((unsigned) (Tcl_DStringLength(&ds) + 1));
-    strcpy(tclNativeExecutableName, Tcl_DStringValue(&ds));
-    Tcl_DStringFree(&ds);
-
-    TclWinNoBackslash(tclNativeExecutableName);
-    return tclNativeExecutableName;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMatchFiles --
- *
- *	This routine is used by the globbing code to search a
- *	directory for all files which match a given pattern.
- *
- * Results: 
- *	If the tail argument is NULL, then the matching files are
- *	added to the the interp's result.  Otherwise, TclDoGlob is called
- *	recursively for each matching subdirectory.  The return value
- *	is a standard Tcl result indicating whether an error occurred
- *	in globbing.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------- */
-
-int
-TclpMatchFiles(interp, separators, dirPtr, pattern, tail)
-    Tcl_Interp *interp;		/* Interpreter to receive results. */
-    char *separators;		/* Directory separators to pass to TclDoGlob. */
-    Tcl_DString *dirPtr;	/* Contains path to directory to search. */
-    char *pattern;		/* Pattern to match against. */
-    char *tail;			/* Pointer to end of pattern.  Tail must
-				 * point to a location in pattern. Must not
-				 * point to a static string. */
-{
-    char drivePat[] = "?:\\";
-    const char *message;
-    char *dir, *newPattern, *root;
-    int matchDotFiles;
-    int dirLength, result = TCL_OK;
-    Tcl_DString dirString, patternString;
-    DWORD attr, volFlags;
-    HANDLE handle;
-    WIN32_FIND_DATAT data;
-    BOOL found;
-    Tcl_DString ds;
-    TCHAR *nativeName;
-
-    /*
-     * Convert the path to normalized form since some interfaces only
-     * accept backslashes.  Also, ensure that the directory ends with a
-     * separator character.
-     */
-
-    dirLength = Tcl_DStringLength(dirPtr);
-    Tcl_DStringInit(&dirString);
-    if (dirLength == 0) {
-	Tcl_DStringAppend(&dirString, ".\\", 2);
-    } else {
-	char *p;
-
-	Tcl_DStringAppend(&dirString, Tcl_DStringValue(dirPtr),
-		Tcl_DStringLength(dirPtr));
-	for (p = Tcl_DStringValue(&dirString); *p != '\0'; p++) {
-	    if (*p == '/') {
-		*p = '\\';
-	    }
-	}
-	p--;
-	if ((*p != '\\') && (*p != ':')) {
-	    Tcl_DStringAppend(&dirString, "\\", 1);
-	}
-    }
-    dir = Tcl_DStringValue(&dirString);
-
-    /*
-     * First verify that the specified path is actually a directory.
-     */
-
-    nativeName = Tcl_WinUtfToTChar(dir, Tcl_DStringLength(&dirString), &ds);
-    attr = (*tclWinProcs->getFileAttributesProc)(nativeName);
-    Tcl_DStringFree(&ds);
-
-    if ((attr == 0xffffffff) || ((attr & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
-	Tcl_DStringFree(&dirString);
-	return TCL_OK;
-    }
-
-    /*
-     * Next check the volume information for the directory to see whether
-     * comparisons should be case sensitive or not.  If the root is null, then
-     * we use the root of the current directory.  If the root is just a drive
-     * specifier, we use the root directory of the given drive.
-     */
-
-    switch (Tcl_GetPathType(dir)) {
-	case TCL_PATH_RELATIVE:
-	    found = GetVolumeInformationA(NULL, NULL, 0, NULL, NULL, 
-		    &volFlags, NULL, 0);
-	    break;
-	case TCL_PATH_VOLUME_RELATIVE:
-	    if (dir[0] == '\\') {
-		root = NULL;
-	    } else {
-		root = drivePat;
-		*root = dir[0];
-	    }
-	    found = GetVolumeInformationA(root, NULL, 0, NULL, NULL, 
-		    &volFlags, NULL, 0);
-	    break;
-	case TCL_PATH_ABSOLUTE:
-	    if (dir[1] == ':') {
-		root = drivePat;
-		*root = dir[0];
-		found = GetVolumeInformationA(root, NULL, 0, NULL, NULL, 
-			&volFlags, NULL, 0);
-	    } else if (dir[1] == '\\') {
-		char *p;
-
-		p = strchr(dir + 2, '\\');
-		p = strchr(p + 1, '\\');
-		p++;
-		nativeName = Tcl_WinUtfToTChar(dir, p - dir, &ds);
-		found = (*tclWinProcs->getVolumeInformationProc)(nativeName, 
-			NULL, 0, NULL, NULL, &volFlags, NULL, 0);
-		Tcl_DStringFree(&ds);
-	    }
-	    break;
-    }
-
-    if (found == 0) {
-	message = "couldn't read volume information for \"";
-	goto error;
-    }
-
-    /*
-     * In Windows, although some volumes may support case sensitivity, Windows
-     * doesn't honor case.  So in globbing we need to ignore the case
-     * of file names.
-     */
-
-    Tcl_DStringInit(&patternString);
-    newPattern = Tcl_DStringAppend(&patternString, pattern, tail - pattern);
-    if ((volFlags & FS_CASE_SENSITIVE) == 0) {
-	Tcl_UtfToLower(newPattern);
-    }
-
-    /*
-     * We need to check all files in the directory, so append a *.*
-     * to the path. 
-     */
-
-    dir = Tcl_DStringAppend(&dirString, "*.*", 3);
-    nativeName = Tcl_WinUtfToTChar(dir, -1, &ds);
-    handle = (*tclWinProcs->findFirstFileProc)(nativeName, &data);
-    Tcl_DStringFree(&ds);
-
-    if (handle == INVALID_HANDLE_VALUE) {
-	message = "couldn't read directory \"";
-	goto error;
-    }
-
-    /*
-     * Clean up the tail pointer.  Leave the tail pointing to the 
-     * first character after the path separator or NULL. 
-     */
-
-    if (*tail == '\\') {
-	tail++;
-    }
-    if (*tail == '\0') {
-	tail = NULL;
-    } else {
-	tail++;
-    }
-
-    /*
-     * Check to see if the pattern needs to compare with dot files.
-     */
-
-    if ((newPattern[0] == '.')
-	    || ((pattern[0] == '\\') && (pattern[1] == '.'))) {
-        matchDotFiles = 1;
-    } else {
-        matchDotFiles = 0;
-    }
-
-    /*
-     * Now iterate over all of the files in the directory.
-     */
-
-    for (found = 1; found != 0; 
-	    found = (*tclWinProcs->findNextFileProc)(handle, &data)) {
-	TCHAR *nativeMatchResult;
-	char *name;
-
-	if (tclWinProcs->useWide) {
-	    nativeName = (TCHAR *) data.w.cFileName;
-	} else {
-	    nativeName = (TCHAR *) data.a.cFileName;
-	}
-	name = Tcl_WinTCharToUtf(nativeName, -1, &ds);
-
-	/*
-	 * Check to see if the file matches the pattern.  We need to convert
-	 * the file name to lower case for comparison purposes.  Note that we
-	 * are ignoring the case sensitivity flag because Windows doesn't honor
-	 * case even if the volume is case sensitive.  If the volume also
-	 * doesn't preserve case, then we previously returned the lower case
-	 * form of the name.  This didn't seem quite right since there are
-	 * non-case-preserving volumes that actually return mixed case.  So now
-	 * we are returning exactly what we get from the system.
-	 */
-
-	Tcl_UtfToLower(name);
-	nativeMatchResult = NULL;
-
-	if ((matchDotFiles == 0) && (name[0] == '.')) {
-	    /*
-	     * Ignore hidden files.
-	     */
-	} else if (Tcl_StringMatch(name, newPattern) != 0) {
-	    nativeMatchResult = nativeName;
-	}
-        Tcl_DStringFree(&ds);
-	if (nativeMatchResult == NULL) {
-	    continue;
-	}
-
-	/*
-	 * If the file matches, then we need to process the remainder of the
-	 * path.  If there are more characters to process, then ensure matching
-	 * files are directories and call TclDoGlob. Otherwise, just add the
-	 * file to the result.
-	 */
-
-	name = Tcl_WinTCharToUtf(nativeMatchResult, -1, &ds);
-	Tcl_DStringAppend(dirPtr, name, -1);
-	Tcl_DStringFree(&ds);
-
-	if (tail == NULL) {
-	    Tcl_AppendElement(interp, Tcl_DStringValue(dirPtr));
-	} else {
-	    nativeName = Tcl_WinUtfToTChar(Tcl_DStringValue(dirPtr), 
-		    Tcl_DStringLength(dirPtr), &ds);
-	    attr = (*tclWinProcs->getFileAttributesProc)(nativeName);
-	    Tcl_DStringFree(&ds);
-
-	    if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-		Tcl_DStringAppend(dirPtr, "/", 1);
-		result = TclDoGlob(interp, separators, dirPtr, tail);
-		if (result != TCL_OK) {
-		    break;
-		}
-	    }
-	}
-	Tcl_DStringSetLength(dirPtr, dirLength);
-    }
-
-    FindClose(handle);
-    Tcl_DStringFree(&dirString);
-    Tcl_DStringFree(&patternString);
-
-    return result;
-
-    error:
-    Tcl_DStringFree(&dirString);
-    TclWinConvertError(GetLastError());
-    Tcl_ResetResult(interp);
-    Tcl_AppendResult(interp, message, Tcl_DStringValue(dirPtr), "\": ", 
-	    Tcl_PosixError(interp), (char *) NULL);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetUserHome --
- *
- *	This function takes the passed in user name and finds the
- *	corresponding home directory specified in the password file.
- *
- * Results:
- *	The result is a pointer to a string specifying the user's home
- *	directory, or NULL if the user's home directory could not be
- *	determined.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetUserHome(name, bufferPtr)
-    CONST char *name;		/* User name for desired home directory. */
-    Tcl_DString *bufferPtr;	/* Uninitialized or free DString filled
-				 * with name of user's home directory. */
-{
-    char *result;
-    HINSTANCE netapiInst;
-
-    result = NULL;
-
-    Tcl_DStringInit(bufferPtr);
-
-    netapiInst = LoadLibraryA("netapi32.dll");
-    if (netapiInst != NULL) {
-	NETAPIBUFFERFREEPROC *netApiBufferFreeProc;
-	NETGETDCNAMEPROC *netGetDCNameProc;
-	NETUSERGETINFOPROC *netUserGetInfoProc;
-
-	netApiBufferFreeProc = (NETAPIBUFFERFREEPROC *)
-		GetProcAddress(netapiInst, "NetApiBufferFree");
-	netGetDCNameProc = (NETGETDCNAMEPROC *) 
-		GetProcAddress(netapiInst, "NetGetDCName");
-	netUserGetInfoProc = (NETUSERGETINFOPROC *) 
-		GetProcAddress(netapiInst, "NetUserGetInfo");
-	if ((netUserGetInfoProc != NULL) && (netGetDCNameProc != NULL)
-		&& (netApiBufferFreeProc != NULL)) {
-	    USER_INFO_1 *uiPtr;
-	    Tcl_DString ds;
-	    int nameLen, badDomain;
-	    char *domain;
-	    WCHAR *wName, *wHomeDir, *wDomain;
-	    WCHAR buf[MAX_PATH];
-
-	    badDomain = 0;
-	    nameLen = -1;
-	    wDomain = NULL;
-	    domain = strchr(name, '@');
-	    if (domain != NULL) {
-		Tcl_DStringInit(&ds);
-		wName = Tcl_UtfToUniCharDString(domain + 1, -1, &ds);
-		badDomain = (*netGetDCNameProc)(NULL, wName,
-			(LPBYTE *) &wDomain);
-		Tcl_DStringFree(&ds);
-		nameLen = domain - name;
-	    }
-	    if (badDomain == 0) {
-		Tcl_DStringInit(&ds);
-		wName = Tcl_UtfToUniCharDString(name, nameLen, &ds);
-		if ((*netUserGetInfoProc)(wDomain, wName, 1, 
-			(LPBYTE *) &uiPtr) == 0) {
-		    wHomeDir = uiPtr->usri1_home_dir;
-		    if ((wHomeDir != NULL) && (wHomeDir[0] != L'\0')) {
-			Tcl_UniCharToUtfDString(wHomeDir, lstrlenW(wHomeDir),
-				bufferPtr);
-		    } else {
-			/* 
-			 * User exists but has no home dir.  Return
-			 * "{Windows Drive}:/users/default".
-			 */
-
-			GetWindowsDirectoryW(buf, MAX_PATH);
-			Tcl_UniCharToUtfDString(buf, 2, bufferPtr);
-			Tcl_DStringAppend(bufferPtr, "/users/default", -1);
-		    }
-		    result = Tcl_DStringValue(bufferPtr);
-		    (*netApiBufferFreeProc)((void *) uiPtr);
-		}
-		Tcl_DStringFree(&ds);
-	    }
-	    if (wDomain != NULL) {
-		(*netApiBufferFreeProc)((void *) wDomain);
-	    }
-	}
-	FreeLibrary(netapiInst);
-    }
-    if (result == NULL) {
-	/*
-	 * Look in the "Password Lists" section of system.ini for the 
-	 * local user.  There are also entries in that section that begin 
-	 * with a "*" character that are used by Windows for other 
-	 * purposes; ignore user names beginning with a "*".
-	 */
-
-	char buf[MAX_PATH];
-
-	if (name[0] != '*') {
-	    if (GetPrivateProfileStringA("Password Lists", name, "", buf, 
-		    MAX_PATH, "system.ini") > 0) {
-		/* 
-		 * User exists, but there is no such thing as a home 
-		 * directory in system.ini.  Return "{Windows drive}:/".
-		 */
-
-		GetWindowsDirectoryA(buf, MAX_PATH);
-		Tcl_DStringAppend(bufferPtr, buf, 3);
-		result = Tcl_DStringValue(bufferPtr);
-	    }
-	}
-    }
-
-    return result;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpAccess --
- *
- *	This function replaces the library version of access(), fixing the
- *	following bugs:
- * 
- *	1. access() returns that all files have execute permission.
- *
- * Results:
- *	See access documentation.
- *
- * Side effects:
- *	See access documentation.
- *
- *---------------------------------------------------------------------------
- */
-
-int
-TclpAccess(
-    CONST char *path,		/* Path of file to access (UTF-8). */
-    int mode)			/* Permission setting. */
-{
-    Tcl_DString ds;
-    TCHAR *nativePath;
-    DWORD attr;
-
-    nativePath = Tcl_WinUtfToTChar(path, -1, &ds);
-    attr = (*tclWinProcs->getFileAttributesProc)(nativePath);
-    Tcl_DStringFree(&ds);
-
-    if (attr == 0xffffffff) {
-	/*
-	 * File doesn't exist. 
-	 */
-
-	TclWinConvertError(GetLastError());
-	return -1;
-    }
-
-    if ((mode & W_OK) && (attr & FILE_ATTRIBUTE_READONLY)) {
-	/*
-	 * File is not writable.
-	 */
-
-	Tcl_SetErrno(EACCES);
-	return -1;
-    }
-
-    if (mode & X_OK) {
-        CONST char *p;
-
-	if (attr & FILE_ATTRIBUTE_DIRECTORY) {
-	    /*
-	     * Directories are always executable. 
-	     */
-	    
-	    return 0;
-	}
-	p = strrchr(path, '.');
-	if (p != NULL) {
-	    p++;
-	    if ((stricmp(p, "exe") == 0)
-		    || (stricmp(p, "com") == 0)
-		    || (stricmp(p, "bat") == 0)) {
-		/*
-		 * File that ends with .exe, .com, or .bat is executable.
-		 */
-
-		return 0;
-	    }
-	}
-	Tcl_SetErrno(EACCES);
-	return -1;
-    }
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpChdir --
- *
- *	This function replaces the library version of chdir().
- *
- * Results:
- *	See chdir() documentation.
- *
- * Side effects:
- *	See chdir() documentation.  
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpChdir(path)
-    CONST char *path;     	/* Path to new working directory (UTF-8). */
-{
-    int result;
-    Tcl_DString ds;
-    TCHAR *nativePath;
-
-    nativePath = Tcl_WinUtfToTChar(path, -1, &ds);
-    result = (*tclWinProcs->setCurrentDirectoryProc)(nativePath);
-    Tcl_DStringFree(&ds);
-
-    if (result == 0) {
-	TclWinConvertError(GetLastError());
-	return -1;
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetCwd --
- *
- *	This function replaces the library version of getcwd().
- *
- * Results:
- *	The result is a pointer to a string specifying the current
- *	directory, or NULL if the current directory could not be
- *	determined.  If NULL is returned, an error message is left in the
- *	interp's result.  Storage for the result string is allocated in
- *	bufferPtr; the caller must call Tcl_DStringFree() when the result
- *	is no longer needed.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetCwd(interp, bufferPtr)
-    Tcl_Interp *interp;		/* If non-NULL, used for error reporting. */
-    Tcl_DString *bufferPtr;	/* Uninitialized or free DString filled
-				 * with name of current directory. */
-{
-    WCHAR buffer[MAX_PATH];
-    char *p;
-
-    if ((*tclWinProcs->getCurrentDirectoryProc)(MAX_PATH, buffer) == 0) {
-	TclWinConvertError(GetLastError());
-	if (interp != NULL) {
-	    Tcl_AppendResult(interp,
-		    "error getting working directory name: ",
-		    Tcl_PosixError(interp), (char *) NULL);
-	}
-	return NULL;
-    }
-
-    /*
-     * Watch for the wierd Windows c:\\UNC syntax.
-     */
-
-    if (tclWinProcs->useWide) {
-	WCHAR *native;
-
-	native = (WCHAR *) buffer;
-	if ((native[0] != '\0') && (native[1] == ':') 
-		&& (native[2] == '\\') && (native[3] == '\\')) {
-	    native += 2;
-	}
-	Tcl_WinTCharToUtf((TCHAR *) native, -1, bufferPtr);
-    } else {
-	char *native;
-
-	native = (char *) buffer;
-	if ((native[0] != '\0') && (native[1] == ':') 
-		&& (native[2] == '\\') && (native[3] == '\\')) {
-	    native += 2;
-	}
-	Tcl_WinTCharToUtf((TCHAR *) native, -1, bufferPtr);
-    }
-
-    /*
-     * Convert to forward slashes for easier use in scripts.
-     */
-	      
-    for (p = Tcl_DStringValue(bufferPtr); *p != '\0'; p++) {
-	if (*p == '\\') {
-	    *p = '/';
-	}
-    }
-    return Tcl_DStringValue(bufferPtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpStat --
- *
- *	This function replaces the library version of stat(), fixing 
- *	the following bugs:
- *
- *	1. stat("c:") returns an error.
- *	2. Borland stat() return time in GMT instead of localtime.
- *	3. stat("\\server\mount") would return error.
- *	4. Accepts slashes or backslashes.
- *	5. st_dev and st_rdev were wrong for UNC paths.
- *
- * Results:
- *	See stat documentation.
- *
- * Side effects:
- *	See stat documentation.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpStat(path, statPtr)
-    CONST char *path;		/* Path of file to stat (UTF-8). */
-    struct stat *statPtr;	/* Filled with results of stat call. */
-{
-    Tcl_DString ds;
-    TCHAR *nativePath;
-    WIN32_FIND_DATAT data;
-    HANDLE handle;
-    DWORD attr;
-    WCHAR nativeFullPath[MAX_PATH];
-    TCHAR *nativePart;
-    char *p, *fullPath;
-    int dev, mode;
-
-    /*
-     * Eliminate file names containing wildcard characters, or subsequent 
-     * call to FindFirstFile() will expand them, matching some other file.
-     */
-
-    if (strpbrk(path, "?*") != NULL) {
-	Tcl_SetErrno(ENOENT);
-	return -1;
-    }
-
-    nativePath = Tcl_WinUtfToTChar(path, -1, &ds);
-    handle = (*tclWinProcs->findFirstFileProc)(nativePath, &data);
-    if (handle == INVALID_HANDLE_VALUE) {
-	/* 
-	 * FindFirstFile() doesn't work on root directories, so call
-	 * GetFileAttributes() to see if the specified file exists.
-	 */
-
-	attr = (*tclWinProcs->getFileAttributesProc)(nativePath);
-	if (attr == 0xffffffff) {
-	    Tcl_DStringFree(&ds);
-	    Tcl_SetErrno(ENOENT);
-	    return -1;
-	}
-
-	/* 
-	 * Make up some fake information for this file.  It has the 
-	 * correct file attributes and a time of 0.
-	 */
-
-	memset(&data, 0, sizeof(data));
-	data.a.dwFileAttributes = attr;
-    } else {
-	FindClose(handle);
-    }
-
-    (*tclWinProcs->getFullPathNameProc)(nativePath, MAX_PATH, nativeFullPath,
-	    &nativePart);
-
-    Tcl_DStringFree(&ds);
-    fullPath = Tcl_WinTCharToUtf((TCHAR *) nativeFullPath, -1, &ds);
-
-    dev = -1;
-    if ((fullPath[0] == '\\') && (fullPath[1] == '\\')) {
-	char *p;
-	DWORD dw;
-	TCHAR *nativeVol;
-	Tcl_DString volString;
-
-	p = strchr(fullPath + 2, '\\');
-	p = strchr(p + 1, '\\');
-	if (p == NULL) {
-	    /*
-	     * Add terminating backslash to fullpath or 
-	     * GetVolumeInformation() won't work.
-	     */
-
-	    fullPath = Tcl_DStringAppend(&ds, "\\", 1);
-	    p = fullPath + Tcl_DStringLength(&ds);
-	} else {
-	    p++;
-	}
-	nativeVol = Tcl_WinUtfToTChar(fullPath, p - fullPath, &volString);
-	dw = (DWORD) -1;
-	(*tclWinProcs->getVolumeInformationProc)(nativeVol, NULL, 0, &dw,
-		NULL, NULL, NULL, 0);
-	/*
-	 * GetFullPathName() turns special devices like "NUL" into "\\.\NUL", 
-	 * but GetVolumeInformation() returns failure for "\\.\NUL".  This 
-	 * will cause "NUL" to get a drive number of -1, which makes about 
-	 * as much sense as anything since the special devices don't live on 
-	 * any drive.
-	 */
-
-	dev = dw;
-	Tcl_DStringFree(&volString);
-    } else if ((fullPath[0] != '\0') && (fullPath[1] == ':')) {
-	dev = Tcl_UniCharToLower(fullPath[0]) - 'a';
-    }
-    Tcl_DStringFree(&ds);
-
-    attr = data.a.dwFileAttributes;
-    mode  = (attr & FILE_ATTRIBUTE_DIRECTORY) ? S_IFDIR | S_IEXEC : S_IFREG;
-    mode |= (attr & FILE_ATTRIBUTE_READONLY) ? S_IREAD : S_IREAD | S_IWRITE;
-    p = strrchr(path, '.');
-    if (p != NULL) {
-	if ((lstrcmpiA(p, ".exe") == 0) 
-		|| (lstrcmpiA(p, ".com") == 0) 
-		|| (lstrcmpiA(p, ".bat") == 0)
-		|| (lstrcmpiA(p, ".pif") == 0)) {
-	    mode |= S_IEXEC;
-	}
-    }
-
-    /*
-     * Propagate the S_IREAD, S_IWRITE, S_IEXEC bits to the group and 
-     * other positions.
-     */
-
-    mode |= (mode & 0x0700) >> 3;
-    mode |= (mode & 0x0700) >> 6;
-    
-    statPtr->st_dev	= (dev_t) dev;
-    statPtr->st_ino	= 0;
-    statPtr->st_mode	= (unsigned short) mode;
-    statPtr->st_nlink	= 1;
-    statPtr->st_uid	= 0;
-    statPtr->st_gid	= 0;
-    statPtr->st_rdev	= (dev_t) dev;
-    statPtr->st_size	= data.a.nFileSizeLow;
-    statPtr->st_atime	= ToCTime(data.a.ftLastAccessTime);
-    statPtr->st_mtime	= ToCTime(data.a.ftLastWriteTime);
-    statPtr->st_ctime	= ToCTime(data.a.ftCreationTime);
-    return 0;
-}
-
-static time_t
-ToCTime(
-    FILETIME fileTime)		/* UTC Time to convert to local time_t. */
-{
-    FILETIME localFileTime;
-    SYSTEMTIME systemTime;
-    struct tm tm;
-
-    if (FileTimeToLocalFileTime(&fileTime, &localFileTime) == 0) {
-	return 0;
-    }
-    if (FileTimeToSystemTime(&localFileTime, &systemTime) == 0) {
-	return 0;
-    }
-    tm.tm_sec = systemTime.wSecond;
-    tm.tm_min = systemTime.wMinute;
-    tm.tm_hour = systemTime.wHour;
-    tm.tm_mday = systemTime.wDay;
-    tm.tm_mon = systemTime.wMonth - 1;
-    tm.tm_year = systemTime.wYear - 1900;
-    tm.tm_wday = 0;
-    tm.tm_yday = 0;
-    tm.tm_isdst = -1;
-
-    return mktime(&tm);
-}
-
-#if 0
-
-    /*
-     * Borland's stat doesn't take into account localtime.
-     */
-
-    if ((result == 0) && (buf->st_mtime != 0)) {
-	TIME_ZONE_INFORMATION tz;
-	int time, bias;
-
-	time = GetTimeZoneInformation(&tz);
-	bias = tz.Bias;
-	if (time == TIME_ZONE_ID_DAYLIGHT) {
-	    bias += tz.DaylightBias;
-	}
-	bias *= 60;
-	buf->st_atime -= bias;
-	buf->st_ctime -= bias;
-	buf->st_mtime -= bias;
-    }
-
-#endif
-
-
-#if 0
-/*
- *-------------------------------------------------------------------------
- *
- * TclWinResolveShortcut --
- *
- *	Resolve a potential Windows shortcut to get the actual file or 
- *	directory in question.  
- *
- * Results:
- *	Returns 1 if the shortcut could be resolved, or 0 if there was
- *	an error or if the filename was not a shortcut.
- *	If bufferPtr did hold the name of a shortcut, it is modified to
- *	hold the resolved target of the shortcut instead.
- *
- * Side effects:
- *	Loads and unloads OLE package to determine if filename refers to
- *	a shortcut.
- *
- *-------------------------------------------------------------------------
- */
-
-int
-TclWinResolveShortcut(bufferPtr)
-    Tcl_DString *bufferPtr;	/* Holds name of file to resolve.  On 
-				 * return, holds resolved file name. */
-{
-    HRESULT hres; 
-    IShellLink *psl; 
-    IPersistFile *ppf; 
-    WIN32_FIND_DATA wfd; 
-    WCHAR wpath[MAX_PATH];
-    char *path, *ext;
-    char realFileName[MAX_PATH];
-
-    /*
-     * Windows system calls do not automatically resolve
-     * shortcuts like UNIX automatically will with symbolic links.
-     */
-
-    path = Tcl_DStringValue(bufferPtr);
-    ext = strrchr(path, '.');
-    if ((ext == NULL) || (stricmp(ext, ".lnk") != 0)) {
-	return 0;
-    }
-
-    CoInitialize(NULL);
-    path = Tcl_DStringValue(bufferPtr);
-    realFileName[0] = '\0';
-    hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, 
-	    &IID_IShellLink, &psl); 
-    if (SUCCEEDED(hres)) { 
-	hres = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, &ppf);
-	if (SUCCEEDED(hres)) { 
-	    MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, sizeof(wpath));
-	    hres = ppf->lpVtbl->Load(ppf, wpath, STGM_READ); 
-	    if (SUCCEEDED(hres)) {
-		hres = psl->lpVtbl->Resolve(psl, NULL, 
-			SLR_ANY_MATCH | SLR_NO_UI); 
-		if (SUCCEEDED(hres)) { 
-		    hres = psl->lpVtbl->GetPath(psl, realFileName, MAX_PATH, 
-			    &wfd, 0);
-		} 
-	    } 
-	    ppf->lpVtbl->Release(ppf); 
-	} 
-	psl->lpVtbl->Release(psl); 
-    } 
-    CoUninitialize();
-
-    if (realFileName[0] != '\0') {
-	Tcl_DStringSetLength(bufferPtr, 0);
-	Tcl_DStringAppend(bufferPtr, realFileName, -1);
-	return 1;
-    }
-    return 0;
-}
-#endif
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
deleted file mode 100644
index 7f03f2c..0000000
--- a/win/tclWinInit.c
+++ /dev/null
@@ -1,789 +0,0 @@
-/* 
- * tclWinInit.c --
- *
- *	Contains the Windows-specific interpreter initialization functions.
- *
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinInit.c,v 1.14 1999/04/16 00:48:08 stanton Exp $
- */
-
-#include "tclWinInt.h"
-#include <winreg.h>
-#include <winnt.h>
-#include <winbase.h>
-
-/*
- * The following macro can be defined at compile time to specify
- * the root of the Tcl registry keys.
- */
- 
-#ifndef TCL_REGISTRY_KEY
-#define TCL_REGISTRY_KEY "Software\\Scriptics\\Tcl\\" TCL_VERSION
-#endif
-
-/*
- * The following declaration is a workaround for some Microsoft brain damage.
- * The SYSTEM_INFO structure is different in various releases, even though the
- * layout is the same.  So we overlay our own structure on top of it so we
- * can access the interesting slots in a uniform way.
- */
-
-typedef struct {
-    WORD wProcessorArchitecture;
-    WORD wReserved;
-} OemId;
-
-/*
- * The following macros are missing from some versions of winnt.h.
- */
-
-#ifndef PROCESSOR_ARCHITECTURE_INTEL
-#define PROCESSOR_ARCHITECTURE_INTEL 0
-#endif
-#ifndef PROCESSOR_ARCHITECTURE_MIPS
-#define PROCESSOR_ARCHITECTURE_MIPS  1
-#endif
-#ifndef PROCESSOR_ARCHITECTURE_ALPHA
-#define PROCESSOR_ARCHITECTURE_ALPHA 2
-#endif
-#ifndef PROCESSOR_ARCHITECTURE_PPC
-#define PROCESSOR_ARCHITECTURE_PPC   3
-#endif
-#ifndef PROCESSOR_ARCHITECTURE_UNKNOWN
-#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
-#endif
-
-/*
- * The following arrays contain the human readable strings for the Windows
- * platform and processor values.
- */
-
-
-#define NUMPLATFORMS 3
-static char* platforms[NUMPLATFORMS] = {
-    "Win32s", "Windows 95", "Windows NT"
-};
-
-#define NUMPROCESSORS 4
-static char* processors[NUMPROCESSORS] = {
-    "intel", "mips", "alpha", "ppc"
-};
-
-/*
- * Thread id used for asynchronous notification from signal handlers.
- */
-
-static DWORD mainThreadId;
-
-/*
- * The Init script (common to Windows and Unix platforms) is
- * defined in tkInitScript.h
- */
-
-#include "tclInitScript.h"
-
-static void		AppendEnvironment(Tcl_Obj *listPtr, CONST char *lib);
-static void		AppendDllPath(Tcl_Obj *listPtr, HMODULE hModule,
-			    CONST char *lib);
-static void		AppendRegistry(Tcl_Obj *listPtr, CONST char *lib);
-static int		ToUtf(CONST WCHAR *wSrc, char *dst);
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitPlatform --
- *
- *	Initialize all the platform-dependant things like signals and
- *	floating-point error handling.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitPlatform()
-{
-    tclPlatform = TCL_PLATFORM_WINDOWS;
-
-    /*
-     * The following code stops Windows 3.X and Windows NT 3.51 from 
-     * automatically putting up Sharing Violation dialogs, e.g, when 
-     * someone tries to access a file that is locked or a drive with no 
-     * disk in it.  Tcl already returns the appropriate error to the 
-     * caller, and they can decide to put up their own dialog in response 
-     * to that failure.  
-     *
-     * Under 95 and NT 4.0, this is a NOOP because the system doesn't 
-     * automatically put up dialogs when the above operations fail.
-     */
-
-    SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS);
-
-    /*
-     * Save the id of the first thread to intialize the Tcl library.  This
-     * thread will be used to handle notifications from async event
-     * procedures.  This is not strictly correct.  A better solution involves
-     * using a designated "main" notifier that is kept up to date as threads
-     * come and go.
-     */
-
-    mainThreadId = GetCurrentThreadId();
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpInitLibraryPath --
- *
- *	Initialize the library path at startup.  
- *
- *	This call sets the library path to strings in UTF-8. Any 
- *	pre-existing library path information is assumed to have been 
- *	in the native multibyte encoding.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpInitLibraryPath(path)
-    CONST char *path;		/* Potentially dirty UTF string that is */
-				/* the path to the executable name.     */
-{
-#define LIBRARY_SIZE	    32
-    Tcl_Obj *pathPtr, *objPtr;
-    char *str;
-    Tcl_DString ds;
-    int pathc;
-    char **pathv;
-    char installLib[LIBRARY_SIZE], developLib[LIBRARY_SIZE];
-
-    Tcl_DStringInit(&ds);
-    pathPtr = Tcl_NewObj();
-
-    /*
-     * Initialize the substrings used when locating an executable.  The
-     * installLib variable computes the path as though the executable
-     * is installed.  The developLib computes the path as though the
-     * executable is run from a develpment directory.
-     */
-
-    sprintf(installLib, "lib/tcl%s", TCL_VERSION);
-    sprintf(developLib, "../tcl%s/library",
-	    ((TCL_RELEASE_LEVEL < 2) ? TCL_PATCH_LEVEL : TCL_VERSION));
-
-    /*
-     * Look for the library relative to default encoding dir.
-     */
-
-    str = Tcl_GetDefaultEncodingDir();
-    if ((str != NULL) && (str[0] != '\0')) {
-	objPtr = Tcl_NewStringObj(str, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-    }
-
-    /*
-     * Look for the library relative to the TCL_LIBRARY env variable.
-     * If the last dirname in the TCL_LIBRARY path does not match the
-     * last dirname in the installLib variable, use the last dir name
-     * of installLib in addition to the orginal TCL_LIBRARY path.
-     */
-
-    AppendEnvironment(pathPtr, installLib);
-
-    /*
-     * Look for the library relative to the DLL.  Only use the installLib
-     * because in practice, the DLL is always installed.
-     */
-
-    AppendDllPath(pathPtr, TclWinGetTclInstance(), installLib);
-    
-    /*
-     * Look for the library relative to the executable.  Use both the
-     * installLib and developLib because we cannot determine if this
-     * is installed or not.
-     */
-
-    if (path != NULL) {
-	Tcl_SplitPath(path, &pathc, &pathv);
-	if (pathc > 1) {
-	    pathv[pathc - 2] = installLib;
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 2) {
-	    pathv[pathc - 3] = developLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	ckfree((char *) pathv);
-    }
-
-    TclSetLibraryPath(pathPtr);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * AppendEnvironment --
- *
- *	Append the value of the TCL_LIBRARY environment variable onto the
- *	path pointer.  If the env variable points to another version of
- *	tcl (e.g. "tcl7.6") also append the path to this version (e.g.,
- *	"tcl7.6/../tcl8.1")
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static void
-AppendEnvironment(
-    Tcl_Obj *pathPtr,
-    CONST char *lib)
-{
-    int pathc;
-    WCHAR wBuf[MAX_PATH];
-    char buf[MAX_PATH * TCL_UTF_MAX];
-    Tcl_Obj *objPtr;
-    char *str;
-    Tcl_DString ds;
-    char **pathv;
-
-    /*
-     * The "L" preceeding the TCL_LIBRARY string is used to tell VC++
-     * that this is a unicode string.
-     */
-    
-    if (GetEnvironmentVariableW(L"TCL_LIBRARY", wBuf, MAX_PATH) == 0) {
-        buf[0] = '\0';
-	GetEnvironmentVariableA("TCL_LIBRARY", buf, MAX_PATH);
-    } else {
-	ToUtf(wBuf, buf);
-    }
-
-    if (buf[0] != '\0') {
-	objPtr = Tcl_NewStringObj(buf, -1);
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-
-	TclWinNoBackslash(buf);
-	Tcl_SplitPath(buf, &pathc, &pathv);
-
-	/* 
-	 * The lstrcmpi() will work even if pathv[pathc - 1] is random
-	 * UTF-8 chars because I know lib is ascii.
-	 */
-
-	if ((pathc > 0) && (lstrcmpiA(lib + 4, pathv[pathc - 1]) != 0)) {
-	    /*
-	     * TCL_LIBRARY is set but refers to a different tcl
-	     * installation than the current version.  Try fiddling with the
-	     * specified directory to make it refer to this installation by
-	     * removing the old "tclX.Y" and substituting the current
-	     * version string.
-	     */
-	    
-	    pathv[pathc - 1] = (char *) (lib + 4);
-	    Tcl_DStringInit(&ds);
-	    str = Tcl_JoinPath(pathc, pathv, &ds);
-	    objPtr = Tcl_NewStringObj(str, Tcl_DStringLength(&ds));
-	    Tcl_DStringFree(&ds);
-	} else {
-	    objPtr = Tcl_NewStringObj(buf, -1);
-	}
-	Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	ckfree((char *) pathv);
-    }
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * AppendDllPath --
- *
- *	Append a path onto the path pointer that tries to locate the Tcl
- *	library relative to the location of the Tcl DLL.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static void 
-AppendDllPath(
-    Tcl_Obj *pathPtr, 
-    HMODULE hModule,
-    CONST char *lib)
-{
-    WCHAR wName[MAX_PATH + LIBRARY_SIZE];
-    char name[(MAX_PATH + LIBRARY_SIZE) * TCL_UTF_MAX];
-
-    if (GetModuleFileNameW(hModule, wName, MAX_PATH) == 0) {
-	GetModuleFileNameA(hModule, name, MAX_PATH);
-    } else {
-	ToUtf(wName, name);
-    }
-    if (lib != NULL) {
-	char *end, *p;
-
-	end = strrchr(name, '\\');
-	*end = '\0';
-	p = strrchr(name, '\\');
-	if (p != NULL) {
-	    end = p;
-	}
-	*end = '\\';
-	strcpy(end + 1, lib);
-    }
-    TclWinNoBackslash(name);
-    Tcl_ListObjAppendElement(NULL, pathPtr, Tcl_NewStringObj(name, -1));
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * ToUtf --
- *
- *	Convert a char string to a UTF string.  
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *---------------------------------------------------------------------------
- */
-
-static int
-ToUtf(
-    CONST WCHAR *wSrc,
-    char *dst)
-{
-    char *start;
-
-    start = dst;
-    while (*wSrc != '\0') {
-	dst += Tcl_UniCharToUtf(*wSrc, dst);
-	wSrc++;
-    }
-    *dst = '\0';
-    return dst - start;
-}
-
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetInitialEncodings --
- *
- *	Based on the locale, determine the encoding of the operating
- *	system and the default encoding for newly opened files.
- *
- *	Called at process initialization time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The Tcl library path is converted from native encoding to UTF-8.
- *
- *---------------------------------------------------------------------------
- */
-
-void
-TclpSetInitialEncodings()
-{
-    CONST char *encoding;
-    char buf[4 + TCL_INTEGER_SPACE];
-    int platformId;
-    Tcl_Obj *pathPtr;
-
-    platformId = TclWinGetPlatformId();
-
-    TclWinSetInterfaces(platformId == VER_PLATFORM_WIN32_NT);
-
-    wsprintfA(buf, "cp%d", GetACP());
-    Tcl_SetSystemEncoding(NULL, buf);
-
-    if (platformId != VER_PLATFORM_WIN32_NT) {
-	pathPtr = TclGetLibraryPath();
-	if (pathPtr != NULL) {
-	    int i, objc;
-	    Tcl_Obj **objv;
-	    
-	    objc = 0;
-	    Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
-	    for (i = 0; i < objc; i++) {
-		int length;
-		char *string;
-		Tcl_DString ds;
-
-		string = Tcl_GetStringFromObj(objv[i], &length);
-		Tcl_ExternalToUtfDString(NULL, string, length, &ds);
-		Tcl_SetStringObj(objv[i], Tcl_DStringValue(&ds), 
-			Tcl_DStringLength(&ds));
-		Tcl_DStringFree(&ds);
-	    }
-	}
-    }
-
-    /*
-     * Keep this encoding preloaded.  The IO package uses it for gets on a
-     * binary channel.  
-     */
-
-    encoding = "iso8859-1";
-    Tcl_GetEncoding(NULL, encoding);
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * TclpSetVariables --
- *
- *	Performs platform-specific interpreter initialization related to
- *	the tcl_library and tcl_platform variables, and other platform-
- *	specific things.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets "tcl_library", "tcl_platform", and "env(HOME)" Tcl variables.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpSetVariables(interp)
-    Tcl_Interp *interp;		/* Interp to initialize. */	
-{	    
-    char *ptr;
-    char buffer[TCL_INTEGER_SPACE * 2];
-    SYSTEM_INFO sysInfo;
-    OemId *oemId;
-    OSVERSIONINFOA osInfo;
-    Tcl_DString ds;
-
-    osInfo.dwOSVersionInfoSize = sizeof(osInfo);
-    GetVersionExA(&osInfo);
-
-    oemId = (OemId *) &sysInfo;
-    if (osInfo.dwPlatformId == VER_PLATFORM_WIN32s) {
-	/*
-	 * Since Win32s doesn't support GetSystemInfo, we use a default value.
-	 */
-
-	oemId->wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL;
-    } else {
-	GetSystemInfo(&sysInfo);
-    }
-
-    /*
-     * Define the tcl_platform array.
-     */
-
-    Tcl_SetVar2(interp, "tcl_platform", "platform", "windows",
-	    TCL_GLOBAL_ONLY);
-    if (osInfo.dwPlatformId < NUMPLATFORMS) {
-	Tcl_SetVar2(interp, "tcl_platform", "os",
-		platforms[osInfo.dwPlatformId], TCL_GLOBAL_ONLY);
-    }
-    wsprintfA(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion);
-    Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY);
-    if (oemId->wProcessorArchitecture < NUMPROCESSORS) {
-	Tcl_SetVar2(interp, "tcl_platform", "machine",
-		processors[oemId->wProcessorArchitecture],
-		TCL_GLOBAL_ONLY);
-    }
-
-#ifdef _DEBUG
-    /*
-     * The existence of the "debug" element of the tcl_platform array indicates
-     * that this particular Tcl shell has been compiled with debug information.
-     * Using "info exists tcl_platform(debug)" a Tcl script can direct the 
-     * interpreter to load debug versions of DLLs with the load command.
-     */
-
-    Tcl_SetVar2(interp, "tcl_platform", "debug", "1",
-	    TCL_GLOBAL_ONLY);
-#endif
-
-    /*
-     * Set up the HOME environment variable from the HOMEDRIVE & HOMEPATH
-     * environment variables, if necessary.
-     */
-
-    Tcl_DStringInit(&ds);
-    ptr = Tcl_GetVar2(interp, "env", "HOME", TCL_GLOBAL_ONLY);
-    if (ptr == NULL) {
-	ptr = Tcl_GetVar2(interp, "env", "HOMEDRIVE", TCL_GLOBAL_ONLY);
-	if (ptr != NULL) {
-	    Tcl_DStringAppend(&ds, ptr, -1);
-	}
-	ptr = Tcl_GetVar2(interp, "env", "HOMEPATH", TCL_GLOBAL_ONLY);
-	if (ptr != NULL) {
-	    Tcl_DStringAppend(&ds, ptr, -1);
-	}
-	if (Tcl_DStringLength(&ds) > 0) {
-	    Tcl_SetVar2(interp, "env", "HOME", Tcl_DStringValue(&ds),
-		    TCL_GLOBAL_ONLY);
-	} else {
-	    Tcl_SetVar2(interp, "env", "HOME", "c:\\", TCL_GLOBAL_ONLY);
-	}
-    }
-
-    Tcl_DStringSetLength(&ds, 100);
-    if (GetUserName(Tcl_DStringValue(&ds), &Tcl_DStringLength(&ds)) != 0) {
-	Tcl_SetVar2(interp, "tcl_platform", "user", Tcl_DStringValue(&ds),
-		TCL_GLOBAL_ONLY);
-    } else {
-	Tcl_SetVar2(interp, "tcl_platform", "user", "", TCL_GLOBAL_ONLY);
-    }
-    Tcl_DStringFree(&ds);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFindVariable --
- *
- *	Locate the entry in environ for a given name.  On Unix this 
- *	routine is case sensetive, on Windows this matches mioxed case.
- *
- * Results:
- *	The return value is the index in environ of an entry with the
- *	name "name", or -1 if there is no such entry.   The integer at
- *	*lengthPtr is filled in with the length of name (if a matching
- *	entry is found) or the length of the environ array (if no matching
- *	entry is found).
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpFindVariable(name, lengthPtr)
-    CONST char *name;		/* Name of desired environment variable
-				 * (UTF-8). */
-    int *lengthPtr;		/* Used to return length of name (for
-				 * successful searches) or number of non-NULL
-				 * entries in environ (for unsuccessful
-				 * searches). */
-{
-    int i, length, result = -1;
-    register CONST char *env, *p1, *p2;
-    char *envUpper, *nameUpper;
-    Tcl_DString envString;
-
-    /*
-     * Convert the name to all upper case for the case insensitive
-     * comparison.
-     */
-
-    length = strlen(name);
-    nameUpper = (char *) ckalloc((unsigned) length+1);
-    memcpy((VOID *) nameUpper, (VOID *) name, (size_t) length+1);
-    Tcl_UtfToUpper(nameUpper);
-    
-    Tcl_DStringInit(&envString);
-    for (i = 0, env = environ[i]; env != NULL; i++, env = environ[i]) {
-	/*
-	 * Chop the env string off after the equal sign, then Convert
-	 * the name to all upper case, so we do not have to convert
-	 * all the characters after the equal sign.
-	 */
-	
-	envUpper = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
-	p1 = strchr(envUpper, '=');
-	if (p1 == NULL) {
-	    continue;
-	}
-	length = p1 - envUpper;
-	Tcl_DStringSetLength(&envString, length+1);
-	Tcl_UtfToUpper(envUpper);
-
-	p1 = envUpper;
-	p2 = nameUpper;
-	for (; *p2 == *p1; p1++, p2++) {
-	    /* NULL loop body. */
-	}
-	if ((*p1 == '=') && (*p2 == '\0')) {
-	    *lengthPtr = length;
-	    result = i;
-	    goto done;
-	}
-	
-	Tcl_DStringFree(&envString);
-    }
-    
-    *lengthPtr = i;
-
-    done:
-    Tcl_DStringFree(&envString);
-    ckfree(nameUpper);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Init --
- *
- *	This procedure is typically invoked by Tcl_AppInit procedures
- *	to perform additional initialization for a Tcl interpreter,
- *	such as sourcing the "init.tcl" script.
- *
- * Results:
- *	Returns a standard Tcl completion code and sets the interp's
- *	result if there is an error.
- *
- * Side effects:
- *	Depends on what's in the init.tcl script.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_Init(interp)
-    Tcl_Interp *interp;		/* Interpreter to initialize. */
-{
-    Tcl_Obj *pathPtr;
-
-    if (tclPreInitScript != NULL) {
-	if (Tcl_Eval(interp, tclPreInitScript) == TCL_ERROR) {
-	    return (TCL_ERROR);
-	};
-    }
-
-    pathPtr = TclGetLibraryPath();
-    if (pathPtr == NULL) {
-	pathPtr = Tcl_NewObj();
-    }
-    Tcl_SetVar2Ex(interp, "tcl_libPath", NULL, pathPtr, TCL_GLOBAL_ONLY);
-    return Tcl_Eval(interp, initScript);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SourceRCFile --
- *
- *	This procedure is typically invoked by Tcl_Main of Tk_Main
- *	procedure to source an application specific rc file into the
- *	interpreter at startup time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Depends on what's in the rc script.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SourceRCFile(interp)
-    Tcl_Interp *interp;		/* Interpreter to source rc file into. */
-{
-    Tcl_DString temp;
-    char *fileName;
-    Tcl_Channel errChannel;
-
-    fileName = Tcl_GetVar(interp, "tcl_rcFileName", TCL_GLOBAL_ONLY);
-
-    if (fileName != NULL) {
-        Tcl_Channel c;
-	char *fullName;
-
-        Tcl_DStringInit(&temp);
-	fullName = Tcl_TranslateFileName(interp, fileName, &temp);
-	if (fullName == NULL) {
-	    /*
-	     * Couldn't translate the file name (e.g. it referred to a
-	     * bogus user or there was no HOME environment variable).
-	     * Just do nothing.
-	     */
-	} else {
-
-	    /*
-	     * Test for the existence of the rc file before trying to read it.
-	     */
-
-            c = Tcl_OpenFileChannel(NULL, fullName, "r", 0);
-            if (c != (Tcl_Channel) NULL) {
-                Tcl_Close(NULL, c);
-		if (Tcl_EvalFile(interp, fullName) != TCL_OK) {
-		    errChannel = Tcl_GetStdChannel(TCL_STDERR);
-		    if (errChannel) {
-			Tcl_WriteObj(errChannel, Tcl_GetObjResult(interp));
-			Tcl_WriteChars(errChannel, "\n", 1);
-		    }
-		}
-	    }
-	}
-        Tcl_DStringFree(&temp);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpAsyncMark --
- *
- *	Wake up the main thread from a signal handler.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sends a message to the main thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpAsyncMark(async)
-    Tcl_AsyncHandler async;		/* Token for handler. */
-{
-    /*
-     * Need a way to kick the Windows event loop and tell it to go look at
-     * asynchronous events.
-     */
-
-    PostThreadMessage(mainThreadId, WM_USER, 0, 0);
-}
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
deleted file mode 100644
index 025b728..0000000
--- a/win/tclWinInt.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * tclWinInt.h --
- *
- *	Declarations of Windows-specific shared variables and procedures.
- *
- * Copyright (c) 1994-1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinInt.h,v 1.7 1999/04/16 00:48:09 stanton Exp $
- */
-
-#ifndef _TCLWININT
-#define _TCLWININT
-
-#ifndef _TCLINT
-#include "tclInt.h"
-#endif
-#ifndef _TCLPORT
-#include "tclPort.h"
-#endif
-
-/*
- * The following specifies how much stack space TclpCheckStackSpace()
- * ensures is available.  TclpCheckStackSpace() is called by Tcl_EvalObj()
- * to help avoid overflowing the stack in the case of infinite recursion.
- */
-
-#define TCL_WIN_STACK_THRESHOLD 0x2000
-
-#ifdef BUILD_tcl
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- * Some versions of Borland C have a define for the OSVERSIONINFO for
- * Win32s and for NT, but not for Windows 95.
- */
-
-#ifndef VER_PLATFORM_WIN32_WINDOWS
-#define VER_PLATFORM_WIN32_WINDOWS 1
-#endif
-
-/*
- * The following structure keeps track of whether we are using the 
- * multi-byte or the wide-character interfaces to the operating system.
- * System calls should be made through the following function table.
- */
-
-typedef union {
-    WIN32_FIND_DATAA a;
-    WIN32_FIND_DATAW w;
-} WIN32_FIND_DATAT;
-
-typedef struct TclWinProcs {
-    int useWide;
-
-    BOOL (WINAPI *buildCommDCBProc)(CONST TCHAR *, LPDCB);
-    TCHAR *(WINAPI *charLowerProc)(TCHAR *);
-    BOOL (WINAPI *copyFileProc)(CONST TCHAR *, CONST TCHAR *, BOOL);
-    BOOL (WINAPI *createDirectoryProc)(CONST TCHAR *, LPSECURITY_ATTRIBUTES);
-    HANDLE (WINAPI *createFileProc)(CONST TCHAR *, DWORD, DWORD, 
-	    LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE);
-    BOOL (WINAPI *createProcessProc)(CONST TCHAR *, TCHAR *, 
-	    LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, BOOL, DWORD, 
-	    LPVOID, CONST TCHAR *, LPSTARTUPINFOA, LPPROCESS_INFORMATION);
-    BOOL (WINAPI *deleteFileProc)(CONST TCHAR *);
-    HANDLE (WINAPI *findFirstFileProc)(CONST TCHAR *, WIN32_FIND_DATAT *);
-    BOOL (WINAPI *findNextFileProc)(HANDLE, WIN32_FIND_DATAT *);
-    BOOL (WINAPI *getComputerNameProc)(WCHAR *, LPDWORD);
-    DWORD (WINAPI *getCurrentDirectoryProc)(DWORD, WCHAR *);
-    DWORD (WINAPI *getFileAttributesProc)(CONST TCHAR *);
-    DWORD (WINAPI *getFullPathNameProc)(CONST TCHAR *, DWORD nBufferLength, 
-	    WCHAR *, TCHAR **);
-    DWORD (WINAPI *getModuleFileNameProc)(HMODULE, WCHAR *, int);
-    DWORD (WINAPI *getShortPathNameProc)(CONST TCHAR *, WCHAR *, DWORD); 
-    UINT (WINAPI *getTempFileNameProc)(CONST TCHAR *, CONST TCHAR *, UINT, 
-	    WCHAR *);
-    DWORD (WINAPI *getTempPathProc)(DWORD, WCHAR *);
-    BOOL (WINAPI *getVolumeInformationProc)(CONST TCHAR *, WCHAR *, DWORD, 
-	    LPDWORD, LPDWORD, LPDWORD, WCHAR *, DWORD);
-    HINSTANCE (WINAPI *loadLibraryProc)(CONST TCHAR *);
-    TCHAR (WINAPI *lstrcpyProc)(WCHAR *, CONST TCHAR *);
-    BOOL (WINAPI *moveFileProc)(CONST TCHAR *, CONST TCHAR *);
-    BOOL (WINAPI *removeDirectoryProc)(CONST TCHAR *);
-    DWORD (WINAPI *searchPathProc)(CONST TCHAR *, CONST TCHAR *, 
-	    CONST TCHAR *, DWORD, WCHAR *, TCHAR **);
-    BOOL (WINAPI *setCurrentDirectoryProc)(CONST TCHAR *);
-    BOOL (WINAPI *setFileAttributesProc)(CONST TCHAR *, DWORD);
-} TclWinProcs;
-
-EXTERN TclWinProcs *tclWinProcs;
-EXTERN Tcl_Encoding tclWinTCharEncoding;
-
-/*
- * Declarations of functions that are not accessible by way of the
- * stubs table.
- */
-
-EXTERN TclPlatformType *TclWinGetPlatform(void);
-EXTERN int		TclWinGetPlatformId(void);
-EXTERN void		TclWinInit(HINSTANCE hInst);
-EXTERN void		TclWinSetInterfaces(int);
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
-#include "tclIntPlatDecls.h"
-
-#endif	/* _TCLWININT */
diff --git a/win/tclWinLoad.c b/win/tclWinLoad.c
deleted file mode 100644
index 124f5e2..0000000
--- a/win/tclWinLoad.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* 
- * tclWinLoad.c --
- *
- *	This procedure provides a version of the TclLoadFile that
- *	works with the Windows "LoadLibrary" and "GetProcAddress"
- *	API for dynamic loading.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinLoad.c,v 1.3 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpLoadFile --
- *
- *	Dynamically loads a binary code file into memory and returns
- *	the addresses of two procedures within that file, if they
- *	are defined.
- *
- * Results:
- *	A standard Tcl completion code.  If an error occurs, an error
- *	message is left in the interp's result.
- *
- * Side effects:
- *	New code suddenly appears in memory.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
-    Tcl_Interp *interp;		/* Used for error reporting. */
-    char *fileName;		/* Name of the file containing the desired
-				 * code. */
-    char *sym1, *sym2;		/* Names of two procedures to look up in
-				 * the file's symbol table. */
-    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
-				/* Where to return the addresses corresponding
-				 * to sym1 and sym2. */
-    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
-				 * file which will be passed back to 
-				 * TclpUnloadFile() to unload the file. */
-{
-    HINSTANCE handle;
-    TCHAR *nativeName;
-    Tcl_DString ds;
-
-    nativeName = Tcl_WinUtfToTChar(fileName, -1, &ds);
-    handle = (*tclWinProcs->loadLibraryProc)(nativeName);
-    Tcl_DStringFree(&ds);
-
-    *clientDataPtr = (ClientData) handle;
-    
-    if (handle == NULL) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't load file \"", fileName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * For each symbol, check for both Symbol and _Symbol, since Borland
-     * generates C symbols with a leading '_' by default.
-     */
-
-    *proc1Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym1);
-    if (*proc1Ptr == NULL) {
-	Tcl_DStringAppend(&ds, "_", 1);
-	sym1 = Tcl_DStringAppend(&ds, sym1, -1);
-	*proc1Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym1);
-	Tcl_DStringFree(&ds);
-    }
-    
-    *proc2Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym2);
-    if (*proc2Ptr == NULL) {
-	Tcl_DStringAppend(&ds, "_", 1);
-	sym2 = Tcl_DStringAppend(&ds, sym2, -1);
-	*proc2Ptr = (Tcl_PackageInitProc *) GetProcAddress(handle, sym2);
-	Tcl_DStringFree(&ds);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpUnloadFile --
- *
- *	Unloads a dynamically loaded binary code file from memory.
- *	Code pointers in the formerly loaded file are no longer valid
- *	after calling this function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Code removed from memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpUnloadFile(clientData)
-    ClientData clientData;	/* ClientData returned by a previous call
-				 * to TclpLoadFile().  The clientData is 
-				 * a token that represents the loaded 
-				 * file. */
-{
-    HINSTANCE handle;
-
-    handle = (HINSTANCE) clientData;
-    FreeLibrary(handle);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGuessPackageName --
- *
- *	If the "load" command is invoked without providing a package
- *	name, this procedure is invoked to try to figure it out.
- *
- * Results:
- *	Always returns 0 to indicate that we couldn't figure out a
- *	package name;  generic code will then try to guess the package
- *	from the file name.  A return value of 1 would have meant that
- *	we figured out the package name and put it in bufPtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclGuessPackageName(fileName, bufPtr)
-    char *fileName;		/* Name of file containing package (already
-				 * translated to local form if needed). */
-    Tcl_DString *bufPtr;	/* Initialized empty dstring.  Append
-				 * package name to this if possible. */
-{
-    return 0;
-}
diff --git a/win/tclWinMtherr.c b/win/tclWinMtherr.c
deleted file mode 100644
index 7be9b97..0000000
--- a/win/tclWinMtherr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* 
- * tclWinMtherr.c --
- *
- *	This function provides a default implementation of the
- *	_matherr function for Borland C++.
- *
- * Copyright (c) 1995 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinMtherr.c,v 1.3 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-#include <math.h>
-
-
-/*
- *----------------------------------------------------------------------
- *
- * _matherr --
- *
- *	This procedure is invoked by Borland C++ when certain
- *	errors occur in mathematical functions.  This procedure
- *	replaces the default implementation which generates pop-up
- *	warnings.
- *
- * Results:
- *	Returns 1 to indicate that we've handled the error
- *	locally.
- *
- * Side effects:
- *	Sets errno based on what's in xPtr.
- *
- *----------------------------------------------------------------------
- */
-
-int
-_matherr(xPtr)
-    struct exception *xPtr;	/* Describes error that occurred. */
-{
-    if (!TclMathInProgress()) {
-	return 0;
-    }
-    if ((xPtr->type == DOMAIN) || (xPtr->type == SING)) {
-	errno = EDOM;
-    } else {
-	errno = ERANGE;
-    }
-    return 1;
-}
diff --git a/win/tclWinNotify.c b/win/tclWinNotify.c
deleted file mode 100644
index 896d92c..0000000
--- a/win/tclWinNotify.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/* 
- * tclWinNotify.c --
- *
- *	This file contains Windows-specific procedures for the notifier,
- *	which is the lowest-level part of the Tcl event loop.  This file
- *	works together with ../generic/tclNotify.c.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinNotify.c,v 1.3 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-#include <winsock.h>
-
-/*
- * The follwing static indicates whether this module has been initialized.
- */
-
-static int initialized = 0;
-
-#define INTERVAL_TIMER 1	/* Handle of interval timer. */
-
-#define WM_WAKEUP WM_USER	/* Message that is send by
-				 * Tcl_AlertNotifier. */
-/*
- * The following static structure contains the state information for the
- * Windows implementation of the Tcl notifier.  One of these structures
- * is created for each thread that is using the notifier.  
- */
-
-typedef struct ThreadSpecificData {
-    CRITICAL_SECTION crit;	/* Monitor for this notifier. */
-    DWORD thread;		/* Identifier for thread associated with this
-				 * notifier. */
-    HANDLE event;		/* Event object used to wake up the notifier
-				 * thread. */
-    int pending;		/* Alert message pending, this field is
-				 * locked by the notifierMutex. */
-    HWND hwnd;			/* Messaging window. */
-    int timeout;		/* Current timeout value. */
-    int timerActive;		/* 1 if interval timer is running. */
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following static indicates the number of threads that have
- * initialized notifiers.  It controls the lifetime of the TclNotifier
- * window class.
- *
- * You must hold the notifierMutex lock before accessing this variable.
- */
-
-static int notifierCount = 0;
-TCL_DECLARE_MUTEX(notifierMutex)
-
-/*
- * Static routines defined in this file.
- */
-
-static LRESULT CALLBACK	NotifierProc(HWND hwnd, UINT message,
-			    WPARAM wParam, LPARAM lParam);
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_InitNotifier --
- *
- *	Initializes the platform specific notifier state.
- *
- * Results:
- *	Returns a handle to the notifier state for this thread..
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-ClientData
-Tcl_InitNotifier()
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    WNDCLASS class;
-
-    /*
-     * Register Notifier window class if this is the first thread to
-     * use this module.
-     */
-
-    Tcl_MutexLock(&notifierMutex);
-    if (notifierCount == 0) {
-	class.style = 0;
-	class.cbClsExtra = 0;
-	class.cbWndExtra = 0;
-	class.hInstance = TclWinGetTclInstance();
-	class.hbrBackground = NULL;
-	class.lpszMenuName = NULL;
-	class.lpszClassName = "TclNotifier";
-	class.lpfnWndProc = NotifierProc;
-	class.hIcon = NULL;
-	class.hCursor = NULL;
-
-	if (!RegisterClassA(&class)) {
-	    panic("Unable to register TclNotifier window class");
-	}
-    }
-    notifierCount++;
-    Tcl_MutexUnlock(&notifierMutex);
-
-    tsdPtr->pending = 0;
-    tsdPtr->timerActive = 0;
-
-    InitializeCriticalSection(&tsdPtr->crit);
-
-    tsdPtr->hwnd = NULL;
-    tsdPtr->thread = GetCurrentThreadId();
-    tsdPtr->event = CreateEvent(NULL, TRUE /* manual */,
-	    FALSE /* !signaled */, NULL);
-
-    return (ClientData) tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_FinalizeNotifier --
- *
- *	This function is called to cleanup the notifier state before
- *	a thread is terminated.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May dispose of the notifier window and class.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_FinalizeNotifier(clientData)
-    ClientData clientData;	/* Pointer to notifier data. */
-{
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
-
-    DeleteCriticalSection(&tsdPtr->crit);
-    CloseHandle(tsdPtr->event);
-
-    /*
-     * Clean up the timer and messaging window for this thread.
-     */
-
-    if (tsdPtr->hwnd) {
-	KillTimer(tsdPtr->hwnd, INTERVAL_TIMER);
-	DestroyWindow(tsdPtr->hwnd);
-    }
-
-    /*
-     * If this is the last thread to use the notifier, unregister
-     * the notifier window class.
-     */
-
-    Tcl_MutexLock(&notifierMutex);
-    notifierCount--;
-    if (notifierCount == 0) {
-	UnregisterClassA("TclNotifier", TclWinGetTclInstance());
-    }
-    Tcl_MutexUnlock(&notifierMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_AlertNotifier --
- *
- *	Wake up the specified notifier from any thread. This routine
- *	is called by the platform independent notifier code whenever
- *	the Tcl_ThreadAlert routine is called.  This routine is
- *	guaranteed not to be called on a given notifier after
- *	Tcl_FinalizeNotifier is called for that notifier.  This routine
- *	is typically called from a thread other than the notifier's
- *	thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sends a message to the messaging window for the notifier
- *	if there isn't already one pending.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_AlertNotifier(clientData)
-    ClientData clientData;	/* Pointer to thread data. */
-{
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) clientData;
-
-    /*
-     * Note that we do not need to lock around access to the hwnd
-     * because the race condition has no effect since any race condition
-     * implies that the notifier thread is already awake.
-     */
-
-    if (tsdPtr->hwnd) {
-	/*
-	 * We do need to lock around access to the pending flag.
-	 */
-
-	EnterCriticalSection(&tsdPtr->crit);
-	if (!tsdPtr->pending) {
-	    PostMessage(tsdPtr->hwnd, WM_WAKEUP, 0, 0);
-	}
-	tsdPtr->pending = 1;
-	LeaveCriticalSection(&tsdPtr->crit);
-    } else {
-	SetEvent(tsdPtr->event);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_SetTimer --
- *
- *	This procedure sets the current notifier timer value.  The
- *	notifier will ensure that Tcl_ServiceAll() is called after
- *	the specified interval, even if no events have occurred.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Replaces any previous timer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_SetTimer(
-    Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    UINT timeout;
-
-    /*
-     * We only need to set up an interval timer if we're being called
-     * from an external event loop.  If we don't have a window handle
-     * then we just return immediately and let Tcl_WaitForEvent handle
-     * timeouts.
-     */
-
-    if (!tsdPtr->hwnd) {
-	return;
-    }
-
-    if (!timePtr) {
-	timeout = 0;
-    } else {
-	/*
-	 * Make sure we pass a non-zero value into the timeout argument.
-	 * Windows seems to get confused by zero length timers.
-	 */
-
-	timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
-	if (timeout == 0) {
-	    timeout = 1;
-	}
-    }
-    tsdPtr->timeout = timeout;
-    if (timeout != 0) {
-	tsdPtr->timerActive = 1;
-	SetTimer(tsdPtr->hwnd, INTERVAL_TIMER,
-		    (unsigned long) tsdPtr->timeout, NULL);
-    } else {
-	tsdPtr->timerActive = 0;
-	KillTimer(tsdPtr->hwnd, INTERVAL_TIMER);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ServiceModeHook --
- *
- *	This function is invoked whenever the service mode changes.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	If this is the first time the notifier is set into
- *	TCL_SERVICE_ALL, then the communication window is created.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ServiceModeHook(mode)
-    int mode;			/* Either TCL_SERVICE_ALL, or
-				 * TCL_SERVICE_NONE. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * If this is the first time that the notifier has been used from a
-     * modal loop, then create a communication window.  Note that after
-     * this point, the application needs to service events in a timely
-     * fashion or Windows will hang waiting for the window to respond
-     * to synchronous system messages.  At some point, we may want to
-     * consider destroying the window if we leave the modal loop, but
-     * for now we'll leave it around.
-     */
-
-    if (mode == TCL_SERVICE_ALL && !tsdPtr->hwnd) {
-	tsdPtr->hwnd = CreateWindowA("TclNotifier", "TclNotifier", WS_TILED,
-		0, 0, 0, 0, NULL, NULL, TclWinGetTclInstance(), NULL);
-	/*
-	 * Send an initial message to the window to ensure that we wake up the
-	 * notifier once we get into the modal loop.  This will force the
-	 * notifier to recompute the timeout value and schedule a timer
-	 * if one is needed.
-	 */
-
-	Tcl_AlertNotifier((ClientData)tsdPtr);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NotifierProc --
- *
- *	This procedure is invoked by Windows to process events on
- *	the notifier window.  Messages will be sent to this window
- *	in response to external timer events or calls to
- *	TclpAlertTsdPtr->
- *
- * Results:
- *	A standard windows result.
- *
- * Side effects:
- *	Services any pending events.
- *
- *----------------------------------------------------------------------
- */
-
-static LRESULT CALLBACK
-NotifierProc(
-    HWND hwnd,
-    UINT message,
-    WPARAM wParam,
-    LPARAM lParam)
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (message == WM_WAKEUP) {
-	EnterCriticalSection(&tsdPtr->crit);
-	tsdPtr->pending = 0;
-	LeaveCriticalSection(&tsdPtr->crit);
-    } else if (message != WM_TIMER) {
-	return DefWindowProc(hwnd, message, wParam, lParam);
-    }
-	
-    /*
-     * Process all of the runnable events.
-     */
-
-    Tcl_ServiceAll();
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitForEvent --
- *
- *	This function is called by Tcl_DoOneEvent to wait for new
- *	events on the message queue.  If the block time is 0, then
- *	Tcl_WaitForEvent just polls the event queue without blocking.
- *
- * Results:
- *	Returns -1 if a WM_QUIT message is detected, returns 1 if
- *	a message was dispatched, otherwise returns 0.
- *
- * Side effects:
- *	Dispatches a message to a window procedure, which could do
- *	anything.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_WaitForEvent(
-    Tcl_Time *timePtr)		/* Maximum block time, or NULL. */
-{
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    MSG msg;
-    DWORD timeout, result;
-    int status;
-
-    /*
-     * Compute the timeout in milliseconds.
-     */
-
-    if (timePtr) {
-	timeout = timePtr->sec * 1000 + timePtr->usec / 1000;
-    } else {
-	timeout = INFINITE;
-    }
-
-    /*
-     * Check to see if there are any messages in the queue before waiting
-     * because MsgWaitForMultipleObjects will not wake up if there are events
-     * currently sitting in the queue.
-     */
-
-    if (!PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-	/*
-	 * Wait for something to happen (a signal from another thread, a
-	 * message, or timeout).
-	 */
-
-	result = MsgWaitForMultipleObjects(1, &tsdPtr->event, FALSE, timeout,
-		QS_ALLINPUT);
-    }
-
-    /*
-     * Check to see if there are any messages to process.
-     */
-
-    if (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-	/*
-	 * Retrieve and dispatch the first message.
-	 */
-
-	result = GetMessage(&msg, NULL, 0, 0);
-	if (result == 0) {
-	    /*
-	     * We received a request to exit this thread (WM_QUIT), so
-	     * propagate the quit message and start unwinding.
-	     */
-
-	    PostQuitMessage(msg.wParam);
-	    status = -1;
-	} else if (result == -1) {
-	    /*
-	     * We got an error from the system.  I have no idea why this would
-	     * happen, so we'll just unwind.
-	     */
-
-	    status = -1;
-	} else {
-	    TranslateMessage(&msg);
-	    DispatchMessage(&msg);
-	    status = 1;
-	}
-    } else {
-	status = 0;
-    }
-
-    ResetEvent(tsdPtr->event);
-    return status;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_Sleep --
- *
- *	Delay execution for the specified number of milliseconds.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Time passes.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_Sleep(ms)
-    int ms;			/* Number of milliseconds to sleep. */
-{
-    Sleep(ms);
-}
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
deleted file mode 100644
index d91a860..0000000
--- a/win/tclWinPipe.c
+++ /dev/null
@@ -1,3196 +0,0 @@
-/* 
- * tclWinPipe.c --
- *
- *	This file implements the Windows-specific exec pipeline functions,
- *	the "pipe" channel driver, and the "pid" Tcl command.
- *
- * Copyright (c) 1996-1997 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinPipe.c,v 1.5 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-#include <dos.h>
-#include <fcntl.h>
-#include <io.h>
-#include <sys/stat.h>
-
-/*
- * The following variable is used to tell whether this module has been
- * initialized.
- */
-
-static int initialized = 0;
-
-/*
- * The pipeMutex locks around access to the initialized and procList variables,
- * and it is used to protect background threads from being terminated while
- * they are using APIs that hold locks.
- */
-
-TCL_DECLARE_MUTEX(pipeMutex)
-
-/*
- * The following defines identify the various types of applications that 
- * run under windows.  There is special case code for the various types.
- */
-
-#define APPL_NONE	0
-#define APPL_DOS	1
-#define APPL_WIN3X	2
-#define APPL_WIN32	3
-
-/*
- * The following constants and structures are used to encapsulate the state
- * of various types of files used in a pipeline.
- */
-
-#define WIN32S_PIPE 1		/* Win32s emulated pipe. */
-#define WIN32S_TMPFILE 2	/* Win32s emulated temporary file. */
-#define WIN_FILE 3		/* Basic Win32 file. */
-
-/*
- * This structure encapsulates the common state associated with all file
- * types used in a pipeline.
- */
-
-typedef struct WinFile {
-    int type;			/* One of the file types defined above. */
-    HANDLE handle;		/* Open file handle. */
-} WinFile;
-
-/*
- * The following structure is used to keep track of temporary files under
- * Win32s and delete the disk file when the open handle is closed.
- * The type field will be WIN32S_TMPFILE.
- */
-
-typedef struct TmpFile {
-    WinFile file;		/* Common part. */
-    char name[MAX_PATH];	/* Name of temp file. */
-} TmpFile;
-
-/*
- * The following structure represents a synchronous pipe under Win32s.
- * The type field will be WIN32S_PIPE.  The handle field will refer to
- * an open file when Tcl is reading from the "pipe", otherwise it is
- * INVALID_HANDLE_VALUE.
- */
-
-typedef struct WinPipe {
-    WinFile file;		/* Common part. */
-    struct WinPipe *otherPtr;	/* Pointer to the WinPipe structure that
-				 * corresponds to the other end of this 
-				 * pipe. */
-    char *fileName;		/* The name of the staging file that gets 
-				 * the data written to this pipe.  Malloc'd.
-				 * and shared by both ends of the pipe.  Only
-				 * when both ends are freed will fileName be
-				 * freed and the file it refers to deleted. */
-} WinPipe;
-
-/*
- * This list is used to map from pids to process handles.
- */
-
-typedef struct ProcInfo {
-    HANDLE hProcess;
-    DWORD dwProcessId;
-    struct ProcInfo *nextPtr;
-} ProcInfo;
-
-static ProcInfo *procList;
-
-/*
- * Bit masks used in the flags field of the PipeInfo structure below.
- */
-
-#define PIPE_PENDING	(1<<0)	/* Message is pending in the queue. */
-#define PIPE_ASYNC	(1<<1)	/* Channel is non-blocking. */
-
-/*
- * Bit masks used in the sharedFlags field of the PipeInfo structure below.
- */
-
-#define PIPE_EOF	(1<<2)	/* Pipe has reached EOF. */
-#define PIPE_EXTRABYTE (1<<3)	/* The reader thread has consumed one byte. */
-
-/*
- * This structure describes per-instance data for a pipe based channel.
- */
-
-typedef struct PipeInfo {
-    struct PipeInfo *nextPtr;	/* Pointer to next registered pipe. */
-    Tcl_Channel channel;	/* Pointer to channel structure. */
-    int validMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which operations are valid on the file. */
-    int watchMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which events should be reported. */
-    int flags;			/* State flags, see above for a list. */
-    TclFile readFile;		/* Output from pipe. */
-    TclFile writeFile;		/* Input from pipe. */
-    TclFile errorFile;		/* Error output from pipe. */
-    int numPids;		/* Number of processes attached to pipe. */
-    Tcl_Pid *pidPtr;		/* Pids of attached processes. */
-    Tcl_ThreadId threadId;	/* Thread to which events should be reported.
-				 * This value is used by the reader/writer
-				 * threads. */
-    HANDLE writeThread;		/* Handle to writer thread. */
-    HANDLE readThread;		/* Handle to reader thread. */
-    HANDLE writable;		/* Manual-reset event to signal when the
-				 * writer thread has finished waiting for
-				 * the current buffer to be written. */
-    HANDLE readable;		/* Manual-reset event to signal when the
-				 * reader thread has finished waiting for
-				 * input. */
-    HANDLE startWriter;		/* Auto-reset event used by the main thread to
-				 * signal when the writer thread should attempt
-				 * to write to the pipe. */
-    HANDLE startReader;		/* Auto-reset event used by the main thread to
-				 * signal when the reader thread should attempt
-				 * to read from the pipe. */
-    DWORD writeError;		/* An error caused by the last background
-				 * write.  Set to 0 if no error has been
-				 * detected.  This word is shared with the
-				 * writer thread so access must be
-				 * synchronized with the writable object.
-				 */
-    char *writeBuf;		/* Current background output buffer.
-				 * Access is synchronized with the writable
-				 * object. */
-    int writeBufLen;		/* Size of write buffer.  Access is
-				 * synchronized with the writable
-				 * object. */
-    int toWrite;		/* Current amount to be written.  Access is
-				 * synchronized with the writable object. */
-    int readFlags;		/* Flags that are shared with the reader
-				 * thread.  Access is synchronized with the
-				 * readable object.  */
-    char extraByte;		/* Buffer for extra character consumed by
-				 * reader thread.  This byte is shared with
-				 * the reader thread so access must be
-				 * synchronized with the readable object. */
-} PipeInfo;
-
-typedef struct ThreadSpecificData {
-    /*
-     * The following pointer refers to the head of the list of pipes
-     * that are being watched for file events.
-     */
-    
-    PipeInfo *firstPipePtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * pipe events are generated.
- */
-
-typedef struct PipeEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    PipeInfo *infoPtr;		/* Pointer to pipe info structure.  Note
-				 * that we still have to verify that the
-				 * pipe exists before dereferencing this
-				 * pointer. */
-} PipeEvent;
-
-/*
- * Declarations for functions used only in this file.
- */
-
-static int		ApplicationType(Tcl_Interp *interp,
-			    const char *fileName, char *fullName);
-static void		BuildCommandLine(const char *executable, int argc, 
-			    char **argv, Tcl_DString *linePtr);
-static void		CopyChannel(HANDLE dst, HANDLE src);
-static BOOL		HasConsole(void);
-static char *		MakeTempFile(Tcl_DString *namePtr);
-static int		PipeBlockModeProc(ClientData instanceData, int mode);
-static void		PipeCheckProc(ClientData clientData, int flags);
-static int		PipeClose2Proc(ClientData instanceData,
-			    Tcl_Interp *interp, int flags);
-static int		PipeEventProc(Tcl_Event *evPtr, int flags);
-static void		PipeExitHandler(ClientData clientData);
-static int		PipeGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
-static void		PipeInit(void);
-static int		PipeInputProc(ClientData instanceData, char *buf,
-			    int toRead, int *errorCode);
-static int		PipeOutputProc(ClientData instanceData, char *buf,
-			    int toWrite, int *errorCode);
-static DWORD WINAPI	PipeReaderThread(LPVOID arg);
-static void		PipeSetupProc(ClientData clientData, int flags);
-static void		PipeWatchProc(ClientData instanceData, int mask);
-static DWORD WINAPI	PipeWriterThread(LPVOID arg);
-static void		ProcExitHandler(ClientData clientData);
-static int		TempFileName(WCHAR name[MAX_PATH]);
-static int		WaitForRead(PipeInfo *infoPtr, int blocking);
-
-/*
- * This structure describes the channel type structure for command pipe
- * based IO.
- */
-
-static Tcl_ChannelType pipeChannelType = {
-    "pipe",			/* Type name. */
-    PipeBlockModeProc,		/* Set blocking or non-blocking mode.*/
-    TCL_CLOSE2PROC,		/* Close proc. */
-    PipeInputProc,		/* Input proc. */
-    PipeOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. */
-    NULL,			/* Set option proc. */
-    NULL,			/* Get option proc. */
-    PipeWatchProc,		/* Set up notifier to watch the channel. */
-    PipeGetHandleProc,		/* Get an OS handle from channel. */
-    PipeClose2Proc
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeInit --
- *
- *	This function initializes the static variables for this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new event source.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PipeInit()
-{
-    ThreadSpecificData *tsdPtr;
-
-    /*
-     * Check the initialized flag first, then check again in the mutex.
-     * This is a speed enhancement.
-     */
-
-    if (!initialized) {
-	Tcl_MutexLock(&pipeMutex);
-	if (!initialized) {
-	    initialized = 1;
-	    procList = NULL;
-	    Tcl_CreateExitHandler(ProcExitHandler, NULL);
-	}
-	Tcl_MutexUnlock(&pipeMutex);
-    }
-
-    tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->firstPipePtr = NULL;
-	Tcl_CreateEventSource(PipeSetupProc, PipeCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(PipeExitHandler, NULL);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeExitHandler --
- *
- *	This function is called to cleanup the pipe module before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the pipe event source.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PipeExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_DeleteEventSource(PipeSetupProc, PipeCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcExitHandler --
- *
- *	This function is called to cleanup the process list before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Resets the process list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_MutexLock(&pipeMutex);
-    initialized = 0;
-    Tcl_MutexUnlock(&pipeMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-PipeSetupProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    PipeInfo *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    int block = 1;
-    WinFile *filePtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Look to see if any events are already pending.  If they are, poll.
-     */
-
-    for (infoPtr = tsdPtr->firstPipePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    filePtr = (WinFile*) infoPtr->writeFile;
-	    if ((filePtr->type == WIN32S_PIPE) 
-		    || (WaitForSingleObject(infoPtr->writable, 0)
-			    != WAIT_TIMEOUT)) {
-		block = 0;
-	    }
-	}
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    filePtr = (WinFile*) infoPtr->readFile;
-	    if ((filePtr->type == WIN32S_PIPE) 
-		    || (WaitForRead(infoPtr, 0) >= 0)) {
-		block = 0;
-	    }
-	}
-    }
-    if (!block) {
-	Tcl_SetMaxBlockTime(&blockTime);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the pipe
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PipeCheckProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    PipeInfo *infoPtr;
-    PipeEvent *evPtr;
-    WinFile *filePtr;
-    int needEvent;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready pipes that don't already have events
-     * queued.
-     */
-
-    for (infoPtr = tsdPtr->firstPipePtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->flags & PIPE_PENDING) {
-	    continue;
-	}
-	
-	/*
-	 * Queue an event if the pipe is signaled for reading or writing.
-	 */
-
-	needEvent = 0;
-	filePtr = (WinFile*) infoPtr->writeFile;
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    if ((filePtr->type == WIN32S_PIPE)
-		    || (WaitForSingleObject(infoPtr->writable, 0)
-			    != WAIT_TIMEOUT)) {
-		needEvent = 1;
-	    }
-	}
-	
-	filePtr = (WinFile*) infoPtr->readFile;
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    if ((filePtr->type == WIN32S_PIPE)
-		    || (WaitForRead(infoPtr, 0) >= 0)) {
-		needEvent = 1;
-	    }
-	}
-
-	if (needEvent) {
-	    infoPtr->flags |= PIPE_PENDING;
-	    evPtr = (PipeEvent *) ckalloc(sizeof(PipeEvent));
-	    evPtr->header.proc = PipeEventProc;
-	    evPtr->infoPtr = infoPtr;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinMakeFile --
- *
- *	This function constructs a new TclFile from a given data and
- *	type value.
- *
- * Results:
- *	Returns a newly allocated WinFile as a TclFile.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclWinMakeFile(
-    HANDLE handle)		/* Type-specific data. */
-{
-    WinFile *filePtr;
-
-    filePtr = (WinFile *) ckalloc(sizeof(WinFile));
-    filePtr->type = WIN_FILE;
-    filePtr->handle = handle;
-
-    return (TclFile)filePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TempFileName --
- *
- *	Gets a temporary file name and deals with the fact that the
- *	temporary file path provided by Windows may not actually exist
- *	if the TMP or TEMP environment variables refer to a 
- *	non-existent directory.
- *
- * Results:    
- *	0 if error, non-zero otherwise.  If non-zero is returned, the
- *	name buffer will be filled with a name that can be used to 
- *	construct a temporary file.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TempFileName(name)
-    WCHAR name[MAX_PATH];	/* Buffer in which name for temporary 
-				 * file gets stored. */
-{
-    TCHAR *prefix;
-
-    prefix = (tclWinProcs->useWide) ? (TCHAR *) L"TCL" : (TCHAR *) "TCL";
-    if ((*tclWinProcs->getTempPathProc)(MAX_PATH, name) != 0) {
-	if ((*tclWinProcs->getTempFileNameProc)((TCHAR *) name, prefix, 0, 
-		name) != 0) {
-	    return 1;
-	}
-    }
-    if (tclWinProcs->useWide) {
-	((WCHAR *) name)[0] = '.';
-	((WCHAR *) name)[1] = '\0';
-    } else {
-	((char *) name)[0] = '.';
-	((char *) name)[1] = '\0';
-    }
-    return (*tclWinProcs->getTempFileNameProc)((TCHAR *) name, prefix, 0, 
-	    name);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMakeFile --
- *
- *	Make a TclFile from a channel.
- *
- * Results:
- *	Returns a new TclFile or NULL on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpMakeFile(channel, direction)
-    Tcl_Channel channel;	/* Channel to get file from. */
-    int direction;		/* Either TCL_READABLE or TCL_WRITABLE. */
-{
-    HANDLE handle;
-
-    if (Tcl_GetChannelHandle(channel, direction, 
-	    (ClientData *) &handle) == TCL_OK) {
-	return TclWinMakeFile(handle);
-    } else {
-	return (TclFile) NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpOpenFile --
- *
- *	This function opens files for use in a pipeline.
- *
- * Results:
- *	Returns a newly allocated TclFile structure containing the
- *	file handle.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpOpenFile(path, mode)
-    CONST char *path;		/* The name of the file to open. */
-    int mode;			/* In what mode to open the file? */
-{
-    HANDLE handle;
-    DWORD accessMode, createMode, shareMode, flags;
-    Tcl_DString ds;
-    TCHAR *nativePath;
-    
-    /*
-     * Map the access bits to the NT access mode.
-     */
-
-    switch (mode & (O_RDONLY | O_WRONLY | O_RDWR)) {
-	case O_RDONLY:
-	    accessMode = GENERIC_READ;
-	    break;
-	case O_WRONLY:
-	    accessMode = GENERIC_WRITE;
-	    break;
-	case O_RDWR:
-	    accessMode = (GENERIC_READ | GENERIC_WRITE);
-	    break;
-	default:
-	    TclWinConvertError(ERROR_INVALID_FUNCTION);
-	    return NULL;
-    }
-
-    /*
-     * Map the creation flags to the NT create mode.
-     */
-
-    switch (mode & (O_CREAT | O_EXCL | O_TRUNC)) {
-	case (O_CREAT | O_EXCL):
-	case (O_CREAT | O_EXCL | O_TRUNC):
-	    createMode = CREATE_NEW;
-	    break;
-	case (O_CREAT | O_TRUNC):
-	    createMode = CREATE_ALWAYS;
-	    break;
-	case O_CREAT:
-	    createMode = OPEN_ALWAYS;
-	    break;
-	case O_TRUNC:
-	case (O_TRUNC | O_EXCL):
-	    createMode = TRUNCATE_EXISTING;
-	    break;
-	default:
-	    createMode = OPEN_EXISTING;
-	    break;
-    }
-
-    nativePath = Tcl_WinUtfToTChar(path, -1, &ds);
-
-    /*
-     * If the file is not being created, use the existing file attributes.
-     */
-
-    flags = 0;
-    if (!(mode & O_CREAT)) {
-	flags = (*tclWinProcs->getFileAttributesProc)(nativePath);
-	if (flags == 0xFFFFFFFF) {
-	    flags = 0;
-	}
-    }
-
-    /*
-     * Set up the file sharing mode.  We want to allow simultaneous access.
-     */
-
-    shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-
-    /*
-     * Now we get to create the file.
-     */
-
-    handle = (*tclWinProcs->createFileProc)(nativePath, accessMode, 
-	    shareMode, NULL, createMode, flags, NULL);
-    Tcl_DStringFree(&ds);
-
-    if (handle == INVALID_HANDLE_VALUE) {
-	DWORD err;
-	
-	err = GetLastError();
-	if ((err & 0xffffL) == ERROR_OPEN_FAILED) {
-	    err = (mode & O_CREAT) ? ERROR_FILE_EXISTS : ERROR_FILE_NOT_FOUND;
-	}
-        TclWinConvertError(err);
-        return NULL;
-    }
-
-    /*
-     * Seek to the end of file if we are writing.
-     */
-
-    if (mode & O_WRONLY) {
-	SetFilePointer(handle, 0, NULL, FILE_END);
-    }
-
-    return TclWinMakeFile(handle);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreateTempFile --
- *
- *	This function opens a unique file with the property that it
- *	will be deleted when its file handle is closed.  The temporary
- *	file is created in the system temporary directory.
- *
- * Results:
- *	Returns a valid TclFile, or NULL on failure.
- *
- * Side effects:
- *	Creates a new temporary file.
- *
- *----------------------------------------------------------------------
- */
-
-TclFile
-TclpCreateTempFile(contents)
-    CONST char *contents;	/* String to write into temp file, or NULL. */
-{
-    WCHAR name[MAX_PATH];
-    HANDLE handle;
-
-    if (TempFileName(name) == 0) {
-	return NULL;
-    }
-
-    handle = (*tclWinProcs->createFileProc)((TCHAR *) name, 
-	    GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 
-	    FILE_ATTRIBUTE_TEMPORARY|FILE_FLAG_DELETE_ON_CLOSE, NULL);
-    if (handle == INVALID_HANDLE_VALUE) {
-	goto error;
-    }
-
-    /*
-     * Write the file out, doing line translations on the way.
-     */
-
-    if (contents != NULL) {
-	DWORD result, length;
-	CONST char *p;
-	
-	for (p = contents; *p != '\0'; p++) {
-	    if (*p == '\n') {
-		length = p - contents;
-		if (length > 0) {
-		    if (!WriteFile(handle, contents, length, &result, NULL)) {
-			goto error;
-		    }
-		}
-		if (!WriteFile(handle, "\r\n", 2, &result, NULL)) {
-		    goto error;
-		}
-		contents = p+1;
-	    }
-	}
-	length = p - contents;
-	if (length > 0) {
-	    if (!WriteFile(handle, contents, length, &result, NULL)) {
-		goto error;
-	    }
-	}
-	if (SetFilePointer(handle, 0, NULL, FILE_BEGIN) == 0xFFFFFFFF) {
-	    goto error;
-	}
-    }
-
-    /*
-     * Under Win32s a file created with FILE_FLAG_DELETE_ON_CLOSE won't
-     * actually be deleted when it is closed, so we have to do it ourselves.
-     */
-
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32s) {
-	TmpFile *tmpFilePtr = (TmpFile *) ckalloc(sizeof(TmpFile));
-	tmpFilePtr->file.type = WIN32S_TMPFILE;
-	tmpFilePtr->file.handle = handle;
-	lstrcpyA(tmpFilePtr->name, (char *) name);
-	return (TclFile) tmpFilePtr;
-    } else {
-	return TclWinMakeFile(handle);
-    }
-
-  error:
-    TclWinConvertError(GetLastError());
-    CloseHandle(handle);
-    (*tclWinProcs->deleteFileProc)((TCHAR *) name);
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreatePipe --
- *
- *      Creates an anonymous pipe.  Under Win32s, creates a temp file
- *	that is used to simulate a pipe.
- *
- * Results:
- *      Returns 1 on success, 0 on failure. 
- *
- * Side effects:
- *      Creates a pipe.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCreatePipe(
-    TclFile *readPipe,	/* Location to store file handle for
-				 * read side of pipe. */
-    TclFile *writePipe)	/* Location to store file handle for
-				 * write side of pipe. */
-{
-    HANDLE readHandle, writeHandle;
-
-    if (CreatePipe(&readHandle, &writeHandle, NULL, 0) != 0) {
-	*readPipe = TclWinMakeFile(readHandle);
-	*writePipe = TclWinMakeFile(writeHandle);
-	return 1;
-    }
-
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32s) {
-	WinPipe *readPipePtr, *writePipePtr;
-	char buf[MAX_PATH];
-	int bytes;
-
-	if (TempFileName((WCHAR *) buf) != 0) {
-	    bytes = strlen((char *) buf) + 1;
-	    readPipePtr = (WinPipe *) ckalloc(sizeof(WinPipe));
-	    writePipePtr = (WinPipe *) ckalloc(sizeof(WinPipe));
-
-	    readPipePtr->file.type = WIN32S_PIPE;
-	    readPipePtr->otherPtr = writePipePtr;
-	    readPipePtr->fileName = (char *) ckalloc(bytes);
-	    lstrcpyA(readPipePtr->fileName, buf);
-	    readPipePtr->file.handle = INVALID_HANDLE_VALUE;
-	    writePipePtr->file.type = WIN32S_PIPE;
-	    writePipePtr->otherPtr = readPipePtr;
-	    writePipePtr->fileName = readPipePtr->fileName;
-	    writePipePtr->file.handle = INVALID_HANDLE_VALUE;
-
-	    *readPipe = (TclFile) readPipePtr;
-	    *writePipe = (TclFile) writePipePtr;
-
-	    return 1;
-	}
-    }
-
-    TclWinConvertError(GetLastError());
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCloseFile --
- *
- *	Closes a pipeline file handle.  These handles are created by
- *	TclpOpenFile, TclpCreatePipe, or TclpMakeFile.
- *
- * Results:
- *	0 on success, -1 on failure.
- *
- * Side effects:
- *	The file is closed and deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpCloseFile(
-    TclFile file)	/* The file to close. */
-{
-    WinFile *filePtr = (WinFile *) file;
-    WinPipe *pipePtr;
-
-    switch (filePtr->type) {
-	case WIN_FILE:
-	case WIN32S_TMPFILE:
-	    /*
-	     * Don't close the Win32 handle if the handle is a standard channel
-	     * during the exit process.  Otherwise, one thread may kill the stdio
-	     * of another.
-	     */
-
-	    if (!TclInExit() 
-		    || ((GetStdHandle(STD_INPUT_HANDLE) != filePtr->handle)
-			    && (GetStdHandle(STD_OUTPUT_HANDLE) != filePtr->handle)
-			    && (GetStdHandle(STD_ERROR_HANDLE) != filePtr->handle))) {
-		if (CloseHandle(filePtr->handle) == FALSE) {
-		    TclWinConvertError(GetLastError());
-		    ckfree((char *) filePtr);
-		    return -1;
-		}
-	    }
-	    /*
-	     * Simulate deleting the file on close for Win32s.
-	     */
-
-	    if (filePtr->type == WIN32S_TMPFILE) {
-		DeleteFileA(((TmpFile *) filePtr)->name);
-	    }
-	    break;
-
-	case WIN32S_PIPE:
-	    pipePtr = (WinPipe *) file;
-
-	    if (pipePtr->otherPtr != NULL) {
-		pipePtr->otherPtr->otherPtr = NULL;
-	    } else {
-		if (pipePtr->file.handle != INVALID_HANDLE_VALUE) {
-		    CloseHandle(pipePtr->file.handle);
-		}
-		DeleteFileA(pipePtr->fileName);
-		ckfree((char *) pipePtr->fileName);
-	    }
-	    break;
-
-	default:
-	    panic("TclpCloseFile: unexpected file type");
-    }
-
-    ckfree((char *) filePtr);
-    return 0;
-}
-
-/*
- *--------------------------------------------------------------------------
- *
- * TclpGetPid --
- *
- *	Given a HANDLE to a child process, return the process id for that
- *	child process.
- *
- * Results:
- *	Returns the process id for the child process.  If the pid was not 
- *	known by Tcl, either because the pid was not created by Tcl or the 
- *	child process has already been reaped, -1 is returned.
- *
- * Side effects:
- *	None.
- *
- *--------------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetPid(
-    Tcl_Pid pid)		/* The HANDLE of the child process. */
-{
-    ProcInfo *infoPtr;
-
-    Tcl_MutexLock(&pipeMutex);
-    for (infoPtr = procList; infoPtr != NULL; infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->hProcess == (HANDLE) pid) {
-	    Tcl_MutexUnlock(&pipeMutex);
-	    return infoPtr->dwProcessId;
-	}
-    }
-    Tcl_MutexUnlock(&pipeMutex);
-    return (unsigned long) -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreateProcess --
- *
- *	Create a child process that has the specified files as its 
- *	standard input, output, and error.  The child process runs
- *	synchronously under Win32s and asynchronously under Windows NT
- *	and Windows 95, and runs with the same environment variables
- *	as the creating process.
- *
- *	The complete Windows search path is searched to find the specified 
- *	executable.  If an executable by the given name is not found, 
- *	automatically tries appending ".com", ".exe", and ".bat" to the 
- *	executable name.
- *
- * Results:
- *	The return value is TCL_ERROR and an error message is left in
- *	the interp's result if there was a problem creating the child 
- *	process.  Otherwise, the return value is TCL_OK and *pidPtr is
- *	filled with the process id of the child process.
- * 
- * Side effects:
- *	A process is created.
- *	
- *----------------------------------------------------------------------
- */
-
-int
-TclpCreateProcess(
-    Tcl_Interp *interp,		/* Interpreter in which to leave errors that
-				 * occurred when creating the child process.
-				 * Error messages from the child process
-				 * itself are sent to errorFile. */
-    int argc,			/* Number of arguments in following array. */
-    char **argv,		/* Array of argument strings.  argv[0]
-				 * contains the name of the executable
-				 * converted to native format (using the
-				 * Tcl_TranslateFileName call).  Additional
-				 * arguments have not been converted. */
-    TclFile inputFile,		/* If non-NULL, gives the file to use as
-				 * input for the child process.  If inputFile
-				 * file is not readable or is NULL, the child
-				 * will receive no standard input. */
-    TclFile outputFile,		/* If non-NULL, gives the file that
-				 * receives output from the child process.  If
-				 * outputFile file is not writeable or is
-				 * NULL, output from the child will be
-				 * discarded. */
-    TclFile errorFile,		/* If non-NULL, gives the file that
-				 * receives errors from the child process.  If
-				 * errorFile file is not writeable or is NULL,
-				 * errors from the child will be discarded.
-				 * errorFile may be the same as outputFile. */
-    Tcl_Pid *pidPtr)		/* If this procedure is successful, pidPtr
-				 * is filled with the process id of the child
-				 * process. */
-{
-    int result, applType, createFlags;
-    Tcl_DString cmdLine;	/* Complete command line (TCHAR). */
-    STARTUPINFOA startInfo;
-    PROCESS_INFORMATION procInfo;
-    SECURITY_ATTRIBUTES secAtts;
-    HANDLE hProcess, h, inputHandle, outputHandle, errorHandle;
-    char execPath[MAX_PATH * TCL_UTF_MAX];
-    WinFile *filePtr;
-
-    PipeInit();
-
-    applType = ApplicationType(interp, argv[0], execPath);
-    if (applType == APPL_NONE) {
-	return TCL_ERROR;
-    }
-
-    result = TCL_ERROR;
-    Tcl_DStringInit(&cmdLine);
-
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32s) {
-	/*
-	 * Under Win32s, there are no pipes.  In order to simulate pipe
-	 * behavior, the child processes are run synchronously and their
-	 * I/O is redirected from/to temporary files before the next 
-	 * stage of the pipeline is started.
-	 */
-
-	MSG msg;
-	DWORD status;
-	DWORD args[4];
-	void *trans[5];
-	char *inputFileName, *outputFileName;
-	Tcl_DString inputTempFile, outputTempFile;
-
-	BuildCommandLine(execPath, argc, argv, &cmdLine);
-
-	ZeroMemory(&startInfo, sizeof(startInfo));
-	startInfo.cb = sizeof(startInfo);
-
-	Tcl_DStringInit(&inputTempFile);
-	Tcl_DStringInit(&outputTempFile);
-	outputHandle = INVALID_HANDLE_VALUE;
-
-	inputFileName = NULL;
-	outputFileName = NULL;
-	if (inputFile != NULL) {
-	    filePtr = (WinFile *) inputFile;
-	    switch (filePtr->type) {
-		case WIN_FILE:
-		case WIN32S_TMPFILE: {
-		    h = INVALID_HANDLE_VALUE;
-		    inputFileName = MakeTempFile(&inputTempFile);
-		    if (inputFileName != NULL) {
-			h = CreateFileA((char *) inputFileName, 
-				GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 
-				NULL);
-		    }
-		    if (h == INVALID_HANDLE_VALUE) {
-			Tcl_AppendResult(interp, "couldn't duplicate input handle: ", 
-				Tcl_PosixError(interp), (char *) NULL);
-			goto end32s;
-		    }
-		    CopyChannel(h, filePtr->handle);
-		    CloseHandle(h);
-		    break;
-		}
-		case WIN32S_PIPE: {
-		    inputFileName = (char *) ((WinPipe *) inputFile)->fileName;
-		    break;
-		}
-	    }
-	}
-	if (inputFileName == NULL) {
-	    inputFileName = "nul";
-	}
-	if (outputFile != NULL) {
-	    filePtr = (WinFile *) outputFile;
-	    if (filePtr->type == WIN_FILE) {
-		outputFileName = MakeTempFile(&outputTempFile);
-		if (outputFileName == NULL) {
-		    Tcl_AppendResult(interp, "couldn't duplicate output handle: ",
-			    Tcl_PosixError(interp), (char *) NULL);
-		    goto end32s;
-		}
-		outputHandle = filePtr->handle;
-	    } else if (filePtr->type == WIN32S_PIPE) {
-		outputFileName = (char *) ((WinPipe *) outputFile)->fileName;
-	    }
-	}
-	if (outputFileName == NULL) {
-	    outputFileName = "nul";
-	}
-
-	if (applType == APPL_DOS) {
-	    args[0] = (DWORD) Tcl_DStringValue(&cmdLine);
-	    args[1] = (DWORD) inputFileName;
-	    args[2] = (DWORD) outputFileName;
-	    trans[0] = &args[0];
-	    trans[1] = &args[1];
-	    trans[2] = &args[2];
-	    trans[3] = NULL;
-	    if (TclWinSynchSpawn(args, 0, trans, pidPtr) != 0) {
-		result = TCL_OK;
-	    }
-	} else if (applType == APPL_WIN3X) {
-	    args[0] = (DWORD) Tcl_DStringValue(&cmdLine);
-	    trans[0] = &args[0];
-	    trans[1] = NULL;
-	    if (TclWinSynchSpawn(args, 1, trans, pidPtr) != 0) {
-		result = TCL_OK;
-	    }
-	} else {
-	    if (CreateProcessA(NULL, Tcl_DStringValue(&cmdLine), 
-		    NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, 
-		    &startInfo, &procInfo) != 0) {
-		CloseHandle(procInfo.hThread);
-		while (1) {
-		    if (GetExitCodeProcess(procInfo.hProcess, &status) == FALSE) {
-			break;
-		    }
-		    if (status != STILL_ACTIVE) {
-			break;
-		    }
-		    if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) == TRUE) {
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		    }
-		}
-		*pidPtr = (Tcl_Pid) procInfo.hProcess;
-		if (*pidPtr != 0) {
-		    TclWinAddProcess(procInfo.hProcess, procInfo.dwProcessId);
-		}
-		result = TCL_OK;
-	    }
-	}
-	if (result != TCL_OK) {
-	    TclWinConvertError(GetLastError());
-	    Tcl_AppendResult(interp, "couldn't execute \"", argv[0],
-		    "\": ", Tcl_PosixError(interp), (char *) NULL);
-	}
-
-	end32s:
-	if (outputHandle != INVALID_HANDLE_VALUE) {
-	    /*
-	     * Now copy stuff from temp file to actual output handle. Don't
-	     * close outputHandle because it is associated with the output
-	     * file owned by the caller.
-	     */
-
-	    h = CreateFileA(outputFileName, GENERIC_READ, 0, NULL, OPEN_ALWAYS,
-		    0, NULL);
-	    if (h != INVALID_HANDLE_VALUE) {
-		CopyChannel(outputHandle, h);
-	    }
-	    CloseHandle(h);
-	}
-
-	if (inputFileName == Tcl_DStringValue(&inputTempFile)) {
-	    DeleteFileA(inputFileName);
-	}
-	
-	if (outputFileName == Tcl_DStringValue(&outputTempFile)) {
-	    DeleteFileA(outputFileName);
-	}
-
-	Tcl_DStringFree(&inputTempFile);
-	Tcl_DStringFree(&outputTempFile);
-        Tcl_DStringFree(&cmdLine);
-	return result;
-    }
-    hProcess = GetCurrentProcess();
-
-    /*
-     * STARTF_USESTDHANDLES must be used to pass handles to child process.
-     * Using SetStdHandle() and/or dup2() only works when a console mode 
-     * parent process is spawning an attached console mode child process.
-     */
-
-    ZeroMemory(&startInfo, sizeof(startInfo));
-    startInfo.cb = sizeof(startInfo);
-    startInfo.dwFlags   = STARTF_USESTDHANDLES;
-    startInfo.hStdInput	= INVALID_HANDLE_VALUE;
-    startInfo.hStdOutput= INVALID_HANDLE_VALUE;
-    startInfo.hStdError = INVALID_HANDLE_VALUE;
-
-    secAtts.nLength = sizeof(SECURITY_ATTRIBUTES);
-    secAtts.lpSecurityDescriptor = NULL;
-    secAtts.bInheritHandle = TRUE;
-
-    /*
-     * We have to check the type of each file, since we cannot duplicate 
-     * some file types.  
-     */
-
-    inputHandle = INVALID_HANDLE_VALUE;
-    if (inputFile != NULL) {
-	filePtr = (WinFile *)inputFile;
-	if (filePtr->type == WIN_FILE) {
-	    inputHandle = filePtr->handle;
-	}
-    }
-    outputHandle = INVALID_HANDLE_VALUE;
-    if (outputFile != NULL) {
-	filePtr = (WinFile *)outputFile;
-	if (filePtr->type == WIN_FILE) {
-	    outputHandle = filePtr->handle;
-	}
-    }
-    errorHandle = INVALID_HANDLE_VALUE;
-    if (errorFile != NULL) {
-	filePtr = (WinFile *)errorFile;
-	if (filePtr->type == WIN_FILE) {
-	    errorHandle = filePtr->handle;
-	}
-    }
-
-    /*
-     * Duplicate all the handles which will be passed off as stdin, stdout
-     * and stderr of the child process. The duplicate handles are set to
-     * be inheritable, so the child process can use them.
-     */
-
-    if (inputHandle == INVALID_HANDLE_VALUE) {
-	/* 
-	 * If handle was not set, stdin should return immediate EOF.
-	 * Under Windows95, some applications (both 16 and 32 bit!) 
-	 * cannot read from the NUL device; they read from console
-	 * instead.  When running tk, this is fatal because the child 
-	 * process would hang forever waiting for EOF from the unmapped 
-	 * console window used by the helper application.
-	 *
-	 * Fortunately, the helper application detects a closed pipe 
-	 * as an immediate EOF and can pass that information to the 
-	 * child process.
-	 */
-
-	if (CreatePipe(&startInfo.hStdInput, &h, &secAtts, 0) != FALSE) {
-	    CloseHandle(h);
-	}
-    } else {
-	DuplicateHandle(hProcess, inputHandle, hProcess, &startInfo.hStdInput,
-		0, TRUE, DUPLICATE_SAME_ACCESS);
-    }
-    if (startInfo.hStdInput == INVALID_HANDLE_VALUE) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't duplicate input handle: ",
-		Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-
-    if (outputHandle == INVALID_HANDLE_VALUE) {
-	/*
-	 * If handle was not set, output should be sent to an infinitely 
-	 * deep sink.  Under Windows 95, some 16 bit applications cannot
-	 * have stdout redirected to NUL; they send their output to
-	 * the console instead.  Some applications, like "more" or "dir /p", 
-	 * when outputting multiple pages to the console, also then try and
-	 * read from the console to go the next page.  When running tk, this
-	 * is fatal because the child process would hang forever waiting
-	 * for input from the unmapped console window used by the helper
-	 * application.
-	 *
-	 * Fortunately, the helper application will detect a closed pipe
-	 * as a sink.
-	 */
-
-	if ((TclWinGetPlatformId() == VER_PLATFORM_WIN32_WINDOWS) 
-		&& (applType == APPL_DOS)) {
-	    if (CreatePipe(&h, &startInfo.hStdOutput, &secAtts, 0) != FALSE) {
-		CloseHandle(h);
-	    }
-	} else {
-	    startInfo.hStdOutput = CreateFileA("NUL:", GENERIC_WRITE, 0,
-		    &secAtts, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-	}
-    } else {
-	DuplicateHandle(hProcess, outputHandle, hProcess, &startInfo.hStdOutput, 
-		0, TRUE, DUPLICATE_SAME_ACCESS);
-    }
-    if (startInfo.hStdOutput == INVALID_HANDLE_VALUE) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't duplicate output handle: ",
-		Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-
-    if (errorHandle == INVALID_HANDLE_VALUE) {
-	/*
-	 * If handle was not set, errors should be sent to an infinitely
-	 * deep sink.
-	 */
-
-	startInfo.hStdError = CreateFileA("NUL:", GENERIC_WRITE, 0,
-		&secAtts, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    } else {
-	DuplicateHandle(hProcess, errorHandle, hProcess, &startInfo.hStdError, 
-		0, TRUE, DUPLICATE_SAME_ACCESS);
-    } 
-    if (startInfo.hStdError == INVALID_HANDLE_VALUE) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't duplicate error handle: ",
-		Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-    /* 
-     * If we do not have a console window, then we must run DOS and
-     * WIN32 console mode applications as detached processes. This tells
-     * the loader that the child application should not inherit the
-     * console, and that it should not create a new console window for
-     * the child application.  The child application should get its stdio 
-     * from the redirection handles provided by this application, and run
-     * in the background.
-     *
-     * If we are starting a GUI process, they don't automatically get a 
-     * console, so it doesn't matter if they are started as foreground or
-     * detached processes.  The GUI window will still pop up to the
-     * foreground.
-     */
-
-    if (TclWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
-	if (HasConsole()) {
-	    createFlags = 0;
-	} else if (applType == APPL_DOS) {
-	    /*
-	     * Under NT, 16-bit DOS applications will not run unless they
-	     * can be attached to a console.  If we are running without a
-	     * console, run the 16-bit program as an normal process inside
-	     * of a hidden console application, and then run that hidden
-	     * console as a detached process.
-	     */
-
-	    startInfo.wShowWindow = SW_HIDE;
-	    startInfo.dwFlags |= STARTF_USESHOWWINDOW;
-	    createFlags = CREATE_NEW_CONSOLE;
-	    Tcl_DStringAppend(&cmdLine, "cmd.exe /c ", -1);
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	} 
-    } else {
-	if (HasConsole()) {
-	    createFlags = 0;
-	} else {
-	    createFlags = DETACHED_PROCESS;
-	}
-	
-	if (applType == APPL_DOS) {
-	    /*
-	     * Under Windows 95, 16-bit DOS applications do not work well 
-	     * with pipes:
-	     *
-	     * 1. EOF on a pipe between a detached 16-bit DOS application 
-	     * and another application is not seen at the other
-	     * end of the pipe, so the listening process blocks forever on 
-	     * reads.  This inablity to detect EOF happens when either a 
-	     * 16-bit app or the 32-bit app is the listener.  
-	     *
-	     * 2. If a 16-bit DOS application (detached or not) blocks when 
-	     * writing to a pipe, it will never wake up again, and it
-	     * eventually brings the whole system down around it.
-	     *
-	     * The 16-bit application is run as a normal process inside
-	     * of a hidden helper console app, and this helper may be run
-	     * as a detached process.  If any of the stdio handles is
-	     * a pipe, the helper application accumulates information 
-	     * into temp files and forwards it to or from the DOS 
-	     * application as appropriate.  This means that DOS apps 
-	     * must receive EOF from a stdin pipe before they will actually
-	     * begin, and must finish generating stdout or stderr before 
-	     * the data will be sent to the next stage of the pipe.
-	     *
-	     * The helper app should be located in the same directory as
-	     * the tcl dll.
-	     */
-
-	    if (createFlags != 0) {
-		startInfo.wShowWindow = SW_HIDE;
-		startInfo.dwFlags |= STARTF_USESHOWWINDOW;
-		createFlags = CREATE_NEW_CONSOLE;
-	    }
-	    Tcl_DStringAppend(&cmdLine, "tclpip" STRINGIFY(TCL_MAJOR_VERSION) 
-		    STRINGIFY(TCL_MINOR_VERSION) ".dll ", -1);
-	}
-    }
-    
-    /*
-     * cmdLine gets the full command line used to invoke the executable,
-     * including the name of the executable itself.  The command line
-     * arguments in argv[] are stored in cmdLine separated by spaces. 
-     * Special characters in individual arguments from argv[] must be 
-     * quoted when being stored in cmdLine.
-     *
-     * When calling any application, bear in mind that arguments that 
-     * specify a path name are not converted.  If an argument contains 
-     * forward slashes as path separators, it may or may not be 
-     * recognized as a path name, depending on the program.  In general,
-     * most applications accept forward slashes only as option 
-     * delimiters and backslashes only as paths.
-     *
-     * Additionally, when calling a 16-bit dos or windows application, 
-     * all path names must use the short, cryptic, path format (e.g., 
-     * using ab~1.def instead of "a b.default").  
-     */
-
-    BuildCommandLine(execPath, argc, argv, &cmdLine);
-
-    if ((*tclWinProcs->createProcessProc)(NULL, 
-	    (TCHAR *) Tcl_DStringValue(&cmdLine), NULL, NULL, TRUE, 
-	    createFlags, NULL, NULL, &startInfo, &procInfo) == 0) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't execute \"", argv[0],
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	goto end;
-    }
-
-    /*
-     * This wait is used to force the OS to give some time to the DOS
-     * process.
-     */
-
-    if (applType == APPL_DOS) {
-	WaitForSingleObject(hProcess, 50);
-    }
-
-    /* 
-     * "When an application spawns a process repeatedly, a new thread 
-     * instance will be created for each process but the previous 
-     * instances may not be cleaned up.  This results in a significant 
-     * virtual memory loss each time the process is spawned.  If there 
-     * is a WaitForInputIdle() call between CreateProcess() and
-     * CloseHandle(), the problem does not occur." PSS ID Number: Q124121
-     */
-
-    WaitForInputIdle(procInfo.hProcess, 5000);
-    CloseHandle(procInfo.hThread);
-
-    *pidPtr = (Tcl_Pid) procInfo.hProcess;
-    if (*pidPtr != 0) {
-	TclWinAddProcess(procInfo.hProcess, procInfo.dwProcessId);
-    }
-    result = TCL_OK;
-
-    end:
-    Tcl_DStringFree(&cmdLine);
-    if (startInfo.hStdInput != INVALID_HANDLE_VALUE) {
-        CloseHandle(startInfo.hStdInput);
-    }
-    if (startInfo.hStdOutput != INVALID_HANDLE_VALUE) {
-        CloseHandle(startInfo.hStdOutput);
-    }
-    if (startInfo.hStdError != INVALID_HANDLE_VALUE) {
-	CloseHandle(startInfo.hStdError);
-    }
-    return result;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * HasConsole --
- *
- *	Determines whether the current application is attached to a
- *	console.
- *
- * Results:
- *	Returns TRUE if this application has a console, else FALSE.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static BOOL
-HasConsole()
-{
-    HANDLE handle;
-    
-    handle = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE,
-	    NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    if (handle != INVALID_HANDLE_VALUE) {
-        CloseHandle(handle);
-	return TRUE;
-    } else {
-        return FALSE;
-    }
-}
-
-/*
- *--------------------------------------------------------------------
- *
- * ApplicationType --
- *
- *	Search for the specified program and identify if it refers to a DOS,
- *	Windows 3.X, or Win32 program.  Used to determine how to invoke 
- *	a program, or if it can even be invoked.
- *
- *	It is possible to almost positively identify DOS and Windows 
- *	applications that contain the appropriate magic numbers.  However, 
- *	DOS .com files do not seem to contain a magic number; if the program 
- *	name ends with .com and could not be identified as a Windows .com
- *	file, it will be assumed to be a DOS application, even if it was
- *	just random data.  If the program name does not end with .com, no 
- *	such assumption is made.
- *
- *	The Win32 procedure GetBinaryType incorrectly identifies any 
- *	junk file that ends with .exe as a dos executable and some 
- *	executables that don't end with .exe as not executable.  Plus it 
- *	doesn't exist under win95, so I won't feel bad about reimplementing
- *	functionality.
- *
- * Results:
- *	The return value is one of APPL_DOS, APPL_WIN3X, or APPL_WIN32
- *	if the filename referred to the corresponding application type.
- *	If the file name could not be found or did not refer to any known 
- *	application type, APPL_NONE is returned and an error message is 
- *	left in interp.  .bat files are identified as APPL_DOS.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ApplicationType(interp, originalName, fullName)
-    Tcl_Interp *interp;		/* Interp, for error message. */
-    const char *originalName;	/* Name of the application to find. */
-    char fullName[];		/* Filled with complete path to 
-				 * application. */
-{
-    int applType, i, nameLen, found;
-    HANDLE hFile;
-    TCHAR *rest;
-    char *ext;
-    char buf[2];
-    DWORD attr, read;
-    IMAGE_DOS_HEADER header;
-    Tcl_DString nameBuf, ds;
-    TCHAR *nativeName;
-    WCHAR nativeFullPath[MAX_PATH];
-    static char extensions[][5] = {"", ".com", ".exe", ".bat"};
-
-    /* Look for the program as an external program.  First try the name
-     * as it is, then try adding .com, .exe, and .bat, in that order, to
-     * the name, looking for an executable.
-     *
-     * Using the raw SearchPath() procedure doesn't do quite what is 
-     * necessary.  If the name of the executable already contains a '.' 
-     * character, it will not try appending the specified extension when
-     * searching (in other words, SearchPath will not find the program 
-     * "a.b.exe" if the arguments specified "a.b" and ".exe").   
-     * So, first look for the file as it is named.  Then manually append 
-     * the extensions, looking for a match.  
-     */
-
-    applType = APPL_NONE;
-    Tcl_DStringInit(&nameBuf);
-    Tcl_DStringAppend(&nameBuf, originalName, -1);
-    nameLen = Tcl_DStringLength(&nameBuf);
-
-    for (i = 0; i < (int) (sizeof(extensions) / sizeof(extensions[0])); i++) {
-	Tcl_DStringSetLength(&nameBuf, nameLen);
-	Tcl_DStringAppend(&nameBuf, extensions[i], -1);
-        nativeName = Tcl_WinUtfToTChar(Tcl_DStringValue(&nameBuf), 
-		Tcl_DStringLength(&nameBuf), &ds);
-	found = (*tclWinProcs->searchPathProc)(NULL, nativeName, NULL, 
-		MAX_PATH, nativeFullPath, &rest);
-	Tcl_DStringFree(&ds);
-	if (found == 0) {
-	    continue;
-	}
-
-	/*
-	 * Ignore matches on directories or data files, return if identified
-	 * a known type.
-	 */
-
-	attr = (*tclWinProcs->getFileAttributesProc)((TCHAR *) nativeFullPath);
-	if ((attr == 0xffffffff) || (attr & FILE_ATTRIBUTE_DIRECTORY)) {
-	    continue;
-	}
-	strcpy(fullName, Tcl_WinTCharToUtf((TCHAR *) nativeFullPath, -1, &ds));
-	Tcl_DStringFree(&ds);
-
-	ext = strrchr(fullName, '.');
-	if ((ext != NULL) && (stricmp(ext, ".bat") == 0)) {
-	    applType = APPL_DOS;
-	    break;
-	}
-	
-	hFile = (*tclWinProcs->createFileProc)((TCHAR *) nativeFullPath, 
-		GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 
-		FILE_ATTRIBUTE_NORMAL, NULL);
-	if (hFile == INVALID_HANDLE_VALUE) {
-	    continue;
-	}
-
-	header.e_magic = 0;
-	ReadFile(hFile, (void *) &header, sizeof(header), &read, NULL);
-	if (header.e_magic != IMAGE_DOS_SIGNATURE) {
-	    /* 
-	     * Doesn't have the magic number for relocatable executables.  If 
-	     * filename ends with .com, assume it's a DOS application anyhow.
-	     * Note that we didn't make this assumption at first, because some
-	     * supposed .com files are really 32-bit executables with all the
-	     * magic numbers and everything.  
-	     */
-
-	    CloseHandle(hFile);
-	    if ((ext != NULL) && (strcmp(ext, ".com") == 0)) {
-		applType = APPL_DOS;
-		break;
-	    }
-	    continue;
-	}
-	if (header.e_lfarlc != sizeof(header)) {
-	    /* 
-	     * All Windows 3.X and Win32 and some DOS programs have this value
-	     * set here.  If it doesn't, assume that since it already had the 
-	     * other magic number it was a DOS application.
-	     */
-
-	    CloseHandle(hFile);
-	    applType = APPL_DOS;
-	    break;
-	}
-
-	/* 
-	 * The DWORD at header.e_lfanew points to yet another magic number.
-	 */
-
-	buf[0] = '\0';
-	SetFilePointer(hFile, header.e_lfanew, NULL, FILE_BEGIN);
-	ReadFile(hFile, (void *) buf, 2, &read, NULL);
-	CloseHandle(hFile);
-
-	if ((buf[0] == 'N') && (buf[1] == 'E')) {
-	    applType = APPL_WIN3X;
-	} else if ((buf[0] == 'P') && (buf[1] == 'E')) {
-	    applType = APPL_WIN32;
-	} else {
-	    /*
-	     * Strictly speaking, there should be a test that there
-	     * is an 'L' and 'E' at buf[0..1], to identify the type as 
-	     * DOS, but of course we ran into a DOS executable that 
-	     * _doesn't_ have the magic number -- specifically, one
-	     * compiled using the Lahey Fortran90 compiler.
-	     */
-
-	    applType = APPL_DOS;
-	}
-	break;
-    }
-    Tcl_DStringFree(&nameBuf);
-
-    if (applType == APPL_NONE) {
-	TclWinConvertError(GetLastError());
-	Tcl_AppendResult(interp, "couldn't execute \"", originalName,
-		"\": ", Tcl_PosixError(interp), (char *) NULL);
-	return APPL_NONE;
-    }
-
-    if ((applType == APPL_DOS) || (applType == APPL_WIN3X)) {
-	/* 
-	 * Replace long path name of executable with short path name for 
-	 * 16-bit applications.  Otherwise the application may not be able
-	 * to correctly parse its own command line to separate off the 
-	 * application name from the arguments.
-	 */
-
-	(*tclWinProcs->getShortPathNameProc)((TCHAR *) nativeFullPath, 
-		nativeFullPath, MAX_PATH);
-	strcpy(fullName, Tcl_WinTCharToUtf((TCHAR *) nativeFullPath, -1, &ds));
-	Tcl_DStringFree(&ds);
-    }
-    return applType;
-}
-
-/*    
- *----------------------------------------------------------------------
- *
- * BuildCommandLine --
- *
- *	The command line arguments are stored in linePtr separated
- *	by spaces, in a form that CreateProcess() understands.  Special 
- *	characters in individual arguments from argv[] must be quoted 
- *	when being stored in cmdLine.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-BuildCommandLine(
-    CONST char *executable,	/* Full path of executable (including 
-				 * extension).  Replacement for argv[0]. */
-    int argc,			/* Number of arguments. */
-    char **argv,		/* Argument strings in UTF. */
-    Tcl_DString *linePtr)	/* Initialized Tcl_DString that receives the
-				 * command line (TCHAR). */
-{
-    CONST char *arg, *start, *special;
-    int quote, i;
-    Tcl_DString ds;
-
-    Tcl_DStringInit(&ds);
-
-    for (i = 0; i < argc; i++) {
-	if (i == 0) {
-	    arg = executable;
-	} else {
-	    arg = argv[i];
-	    Tcl_DStringAppend(&ds, " ", 1);
-	}
-
-	quote = 0;
-	if (argv[i][0] == '\0') {
-	    quote = 1;
-	} else {
-	    for (start = argv[i]; *start != '\0'; start++) {
-		if (isspace(*start)) { /* INTL: ISO space. */
-		    quote = 1;
-		    break;
-		}
-	    }
-	}
-	if (quote) {
-	    Tcl_DStringAppend(&ds, "\"", 1);
-	}
-
-	start = arg;	    
-	for (special = arg; ; ) {
-	    if ((*special == '\\') && 
-		    (special[1] == '\\' || special[1] == '"')) {
-		Tcl_DStringAppend(&ds, start, special - start);
-		start = special;
-		while (1) {
-		    special++;
-		    if (*special == '"') {
-			/* 
-			 * N backslashes followed a quote -> insert 
-			 * N * 2 + 1 backslashes then a quote.
-			 */
-
-			Tcl_DStringAppend(&ds, start, special - start);
-			break;
-		    }
-		    if (*special != '\\') {
-			break;
-		    }
-		}
-		Tcl_DStringAppend(&ds, start, special - start);
-		start = special;
-	    }
-	    if (*special == '"') {
-		Tcl_DStringAppend(&ds, start, special - start);
-		Tcl_DStringAppend(&ds, "\\\"", 2);
-		start = special + 1;
-	    }
-	    if (*special == '\0') {
-		break;
-	    }
-	    special++;
-	}
-	Tcl_DStringAppend(&ds, start, special - start);
-	if (quote) {
-	    Tcl_DStringAppend(&ds, "\"", 1);
-	}
-    }
-    Tcl_WinUtfToTChar(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds), linePtr);
-    Tcl_DStringFree(&ds);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MakeTempFile --
- *
- *	Helper function for TclpCreateProcess under Win32s.  Makes a 
- *	temporary file that _won't_ go away automatically when it's file
- *	handle is closed.  Used for simulated pipes, which are written
- *	in one pass and reopened and read in the next pass.
- *
- * Results:
- *	namePtr is filled with the name of the temporary file.
- *
- * Side effects:
- *	A temporary file with the name specified by namePtr is created.  
- *	The caller is responsible for deleting this temporary file.
- *
- *----------------------------------------------------------------------
- */
-
-static char *
-MakeTempFile(namePtr)
-    Tcl_DString *namePtr;	/* Initialized Tcl_DString that is filled 
-				 * with the name of the temporary file that 
-				 * was created. */
-{
-    char name[MAX_PATH];
-
-    if (TempFileName((WCHAR *) name) == 0) {
-	return NULL;
-    }
-
-    Tcl_DStringAppend(namePtr, name, -1);
-    return Tcl_DStringValue(namePtr);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CopyChannel --
- *
- *	Helper function used by TclpCreateProcess under Win32s.  Copies
- *	what remains of source file to destination file; source file 
- *	pointer need not be positioned at the beginning of the file if
- *	all of source file is not desired, but data is copied up to end 
- *	of source file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-CopyChannel(
-    HANDLE dst,			/* Destination file. */
-    HANDLE src)			/* Source file. */
-{
-    char buf[8192];
-    DWORD dwRead, dwWrite;
-
-    while (ReadFile(src, buf, sizeof(buf), &dwRead, NULL) != FALSE) {
-	if (dwRead == 0) {
-	    break;
-	}
-	if (WriteFile(dst, buf, dwRead, &dwWrite, NULL) == FALSE) {
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpCreateCommandChannel --
- *
- *	This function is called by Tcl_OpenCommandChannel to perform
- *	the platform specific channel initialization for a command
- *	channel.
- *
- * Results:
- *	Returns a new channel or NULL on failure.
- *
- * Side effects:
- *	Allocates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclpCreateCommandChannel(
-    TclFile readFile,		/* If non-null, gives the file for reading. */
-    TclFile writeFile,		/* If non-null, gives the file for writing. */
-    TclFile errorFile,		/* If non-null, gives the file where errors
-				 * can be read. */
-    int numPids,		/* The number of pids in the pid array. */
-    Tcl_Pid *pidPtr)		/* An array of process identifiers. */
-{
-    char channelName[16 + TCL_INTEGER_SPACE];
-    int channelId;
-    DWORD id;
-    PipeInfo *infoPtr = (PipeInfo *) ckalloc((unsigned) sizeof(PipeInfo));
-    OSVERSIONINFO os;
-    int useThreads;
-
-    /*
-     * Fetch the OS version info.
-     */
-
-    os.dwOSVersionInfoSize = sizeof(os);
-    GetVersionEx(&os);
-    useThreads = (os.dwPlatformId != VER_PLATFORM_WIN32s);
-
-    PipeInit();
-
-    infoPtr->watchMask = 0;
-    infoPtr->flags = 0;
-    infoPtr->readFlags = 0;
-    infoPtr->readFile = readFile;
-    infoPtr->writeFile = writeFile;
-    infoPtr->errorFile = errorFile;
-    infoPtr->numPids = numPids;
-    infoPtr->pidPtr = pidPtr;
-    infoPtr->writeBuf = 0;
-    infoPtr->writeBufLen = 0;
-    infoPtr->writeError = 0;
-
-    /*
-     * Use one of the fds associated with the channel as the
-     * channel id.
-     */
-
-    if (readFile) {
-	WinPipe *pipePtr = (WinPipe *) readFile;
-	if (pipePtr->file.type == WIN32S_PIPE
-		&& pipePtr->file.handle == INVALID_HANDLE_VALUE) {
-	    pipePtr->file.handle = CreateFileA(pipePtr->fileName, GENERIC_READ,
-		    0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-	}
-	channelId = (int) pipePtr->file.handle;
-    } else if (writeFile) {
-	channelId = (int) ((WinFile*)writeFile)->handle;
-    } else if (errorFile) {
-	channelId = (int) ((WinFile*)errorFile)->handle;
-    } else {
-	channelId = 0;
-    }
-
-    infoPtr->validMask = 0;
-
-    infoPtr->threadId = Tcl_GetCurrentThread();
-
-    if (readFile != NULL) {
-	if (useThreads) {
-	    /*
-	     * Start the background reader thread.
-	     */
-
-	    infoPtr->readable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	    infoPtr->startReader = CreateEvent(NULL, FALSE, FALSE, NULL);
-	    infoPtr->readThread = CreateThread(NULL, 8000, PipeReaderThread,
-		    infoPtr, 0, &id);
-	    SetThreadPriority(infoPtr->readThread, THREAD_PRIORITY_HIGHEST); 
-	} else {
-	    infoPtr->readThread = 0;
-	}
-        infoPtr->validMask |= TCL_READABLE;
-    } else {
-	infoPtr->readThread = 0;
-    }
-    if (writeFile != NULL) {
-	if (useThreads) {
-	    /*
-	     * Start the background writeer thwrite.
-	     */
-
-	    infoPtr->writable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	    infoPtr->startWriter = CreateEvent(NULL, FALSE, FALSE, NULL);
-	    infoPtr->writeThread = CreateThread(NULL, 8000, PipeWriterThread,
-		    infoPtr, 0, &id);
-	    SetThreadPriority(infoPtr->readThread, THREAD_PRIORITY_HIGHEST); 
-	} else {
-	    infoPtr->writeThread = 0;
-	}
-        infoPtr->validMask |= TCL_WRITABLE;
-    }
-
-    /*
-     * For backward compatibility with previous versions of Tcl, we
-     * use "file%d" as the base name for pipes even though it would
-     * be more natural to use "pipe%d".
-     * Use the pointer to keep the channel names unique, in case
-     * channels share handles (stdin/stdout).
-     */
-
-    wsprintfA(channelName, "file%lx", infoPtr);
-    infoPtr->channel = Tcl_CreateChannel(&pipeChannelType, channelName,
-            (ClientData) infoPtr, infoPtr->validMask);
-
-    /*
-     * Pipes have AUTO translation mode on Windows and ^Z eof char, which
-     * means that a ^Z will be appended to them at close. This is needed
-     * for Windows programs that expect a ^Z at EOF.
-     */
-
-    Tcl_SetChannelOption((Tcl_Interp *) NULL, infoPtr->channel,
-	    "-translation", "auto");
-    Tcl_SetChannelOption((Tcl_Interp *) NULL, infoPtr->channel,
-	    "-eofchar", "\032 {}");
-    return infoPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclGetAndDetachPids --
- *
- *	Stores a list of the command PIDs for a command channel in
- *	the interp's result.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Modifies the interp's result.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclGetAndDetachPids(
-    Tcl_Interp *interp,
-    Tcl_Channel chan)
-{
-    PipeInfo *pipePtr;
-    Tcl_ChannelType *chanTypePtr;
-    int i;
-    char buf[TCL_INTEGER_SPACE];
-
-    /*
-     * Punt if the channel is not a command channel.
-     */
-
-    chanTypePtr = Tcl_GetChannelType(chan);
-    if (chanTypePtr != &pipeChannelType) {
-        return;
-    }
-
-    pipePtr = (PipeInfo *) Tcl_GetChannelInstanceData(chan);
-    for (i = 0; i < pipePtr->numPids; i++) {
-        wsprintfA(buf, "%lu", TclpGetPid(pipePtr->pidPtr[i]));
-        Tcl_AppendElement(interp, buf);
-        Tcl_DetachPids(1, &(pipePtr->pidPtr[i]));
-    }
-    if (pipePtr->numPids > 0) {
-        ckfree((char *) pipePtr->pidPtr);
-        pipePtr->numPids = 0;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeBlockModeProc --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeBlockModeProc(
-    ClientData instanceData,	/* Instance data for channel. */
-    int mode)			/* TCL_MODE_BLOCKING or
-                                 * TCL_MODE_NONBLOCKING. */
-{
-    PipeInfo *infoPtr = (PipeInfo *) instanceData;
-    
-    /*
-     * Pipes on Windows can not be switched between blocking and nonblocking,
-     * hence we have to emulate the behavior. This is done in the input
-     * function by checking against a bit in the state. We set or unset the
-     * bit here to cause the input function to emulate the correct behavior.
-     */
-
-    if (mode == TCL_MODE_NONBLOCKING) {
-	infoPtr->flags |= PIPE_ASYNC;
-    } else {
-	infoPtr->flags &= ~(PIPE_ASYNC);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeClose2Proc --
- *
- *	Closes a pipe based IO channel.
- *
- * Results:
- *	0 on success, errno otherwise.
- *
- * Side effects:
- *	Closes the physical channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeClose2Proc(
-    ClientData instanceData,	/* Pointer to PipeInfo structure. */
-    Tcl_Interp *interp,		/* For error reporting. */
-    int flags)			/* Flags that indicate which side to close. */
-{
-    PipeInfo *pipePtr = (PipeInfo *) instanceData;
-    Tcl_Channel errChan;
-    int errorCode, result;
-    PipeInfo *infoPtr, **nextPtrPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    errorCode = 0;
-    if ((!flags || (flags == TCL_CLOSE_READ))
-	    && (pipePtr->readFile != NULL)) {
-	/*
-	 * Clean up the background thread if necessary.  Note that this
-	 * must be done before we can close the file, since the 
-	 * thread may be blocking trying to read from the pipe.
-	 */
-
-	if (pipePtr->readThread) {
-	    /*
-	     * Forcibly terminate the background thread.  We cannot rely on the
-	     * thread to cleanly terminate itself because we have no way of
-	     * closing the pipe handle without blocking in the case where the
-	     * thread is in the middle of an I/O operation.  Note that we need
-	     * to guard against terminating the thread while it is in the
-	     * middle of Tcl_ThreadAlert because it won't be able to release
-	     * the notifier lock.
-	     */
-
-	    Tcl_MutexLock(&pipeMutex);
-	    TerminateThread(pipePtr->readThread, 0);
-	    Tcl_MutexUnlock(&pipeMutex);
-
-	    /*
-	     * Wait for the thread to terminate.  This ensures that we are
-	     * completely cleaned up before we leave this function. 
-	     */
-
-	    WaitForSingleObject(pipePtr->readThread, INFINITE);
-	    CloseHandle(pipePtr->readThread);
-	    CloseHandle(pipePtr->readable);
-	    CloseHandle(pipePtr->startReader);
-	    pipePtr->readThread = NULL;
-	}
-	if (TclpCloseFile(pipePtr->readFile) != 0) {
-	    errorCode = errno;
-	}
-	pipePtr->validMask &= ~TCL_READABLE;
-	pipePtr->readFile = NULL;
-    }
-    if ((!flags || (flags & TCL_CLOSE_WRITE))
-	    && (pipePtr->writeFile != NULL)) {
-	/*
-	 * Wait for the writer thread to finish the current buffer, then
-	 * terminate the thread and close the handles.  If the channel is
-	 * nonblocking, there should be no pending write operations.
-	 */
-
-	if (pipePtr->writeThread) {
-	    WaitForSingleObject(pipePtr->writable, INFINITE);
-
-	    /*
-	     * Forcibly terminate the background thread.  We cannot rely on the
-	     * thread to cleanly terminate itself because we have no way of
-	     * closing the pipe handle without blocking in the case where the
-	     * thread is in the middle of an I/O operation.  Note that we need
-	     * to guard against terminating the thread while it is in the
-	     * middle of Tcl_ThreadAlert because it won't be able to release
-	     * the notifier lock.
-	     */
-
-	    Tcl_MutexLock(&pipeMutex);
-	    TerminateThread(pipePtr->writeThread, 0);
-	    Tcl_MutexUnlock(&pipeMutex);
-
-
-	    /*
-	     * Wait for the thread to terminate.  This ensures that we are
-	     * completely cleaned up before we leave this function. 
-	     */
-
-	    WaitForSingleObject(pipePtr->writeThread, INFINITE);
-	    CloseHandle(pipePtr->writeThread);
-	    CloseHandle(pipePtr->writable);
-	    CloseHandle(pipePtr->startWriter);
-	    pipePtr->writeThread = NULL;
-	}
-	if (TclpCloseFile(pipePtr->writeFile) != 0) {
-	    if (errorCode == 0) {
-		errorCode = errno;
-	    }
-	}
-	pipePtr->validMask &= ~TCL_WRITABLE;
-	pipePtr->writeFile = NULL;
-    }
-
-    pipePtr->watchMask &= pipePtr->validMask;
-
-    /*
-     * Don't free the channel if any of the flags were set.
-     */
-
-    if (flags) {
-	return errorCode;
-    }
-
-    /*
-     * Remove the file from the list of watched files.
-     */
-
-    for (nextPtrPtr = &(tsdPtr->firstPipePtr), infoPtr = *nextPtrPtr;
-	    infoPtr != NULL;
-	    nextPtrPtr = &infoPtr->nextPtr, infoPtr = *nextPtrPtr) {
-	if (infoPtr == (PipeInfo *)pipePtr) {
-	    *nextPtrPtr = infoPtr->nextPtr;
-	    break;
-	}
-    }
-
-    /*
-     * Wrap the error file into a channel and give it to the cleanup
-     * routine.  If we are running in Win32s, just delete the error file
-     * immediately, because it was never used.
-     */
-
-    if (pipePtr->errorFile) {
-	WinFile *filePtr;
-	OSVERSIONINFO os;
-
-	os.dwOSVersionInfoSize = sizeof(os);
-	GetVersionEx(&os);
-	if (os.dwPlatformId == VER_PLATFORM_WIN32s) {
-	    TclpCloseFile(pipePtr->errorFile);
-	    errChan = NULL;
-	} else {
-	    filePtr = (WinFile*)pipePtr->errorFile;
-	    errChan = Tcl_MakeFileChannel((ClientData) filePtr->handle,
-		    TCL_READABLE);
-	    ckfree((char *) filePtr);
-	}
-    } else {
-        errChan = NULL;
-    }
-
-    result = TclCleanupChildren(interp, pipePtr->numPids, pipePtr->pidPtr,
-            errChan);
-
-    if (pipePtr->numPids > 0) {
-        ckfree((char *) pipePtr->pidPtr);
-    }
-
-    if (pipePtr->writeBuf != NULL) {
-	ckfree(pipePtr->writeBuf);
-    }
-
-    ckfree((char*) pipePtr);
-
-    if (errorCode == 0) {
-        return result;
-    }
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeInputProc --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeInputProc(
-    ClientData instanceData,		/* Pipe state. */
-    char *buf,				/* Where to store data read. */
-    int bufSize,			/* How much space is available
-                                         * in the buffer? */
-    int *errorCode)			/* Where to store error code. */
-{
-    PipeInfo *infoPtr = (PipeInfo *) instanceData;
-    WinFile *filePtr = (WinFile*) infoPtr->readFile;
-    DWORD count, bytesRead = 0;
-    int result;
-
-    *errorCode = 0;
-    if (filePtr->type == WIN32S_PIPE) {
-	if (((WinPipe *)filePtr)->otherPtr != NULL) {
-	    panic("PipeInputProc: child process isn't finished writing");
-	}
-	if (filePtr->handle == INVALID_HANDLE_VALUE) {
-	    filePtr->handle = CreateFileA(((WinPipe *)filePtr)->fileName,
-		    GENERIC_READ, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL,
-		    NULL);
-	}
-	if (filePtr->handle == INVALID_HANDLE_VALUE) {
-	    goto error;
-	}
-    } else {
-	/*
-	 * Synchronize with the reader thread.
-	 */
-
-	result = WaitForRead(infoPtr, (infoPtr->flags & PIPE_ASYNC) ? 0 : 1);
-
-	/*
-	 * If an error occurred, return immediately.
-	 */
-
-	if (result == -1) {
-	    *errorCode = errno;
-	    return -1;
-	}
-
-	if (infoPtr->readFlags & PIPE_EXTRABYTE) {
-	    /*
-	     * The reader thread consumed 1 byte as a side effect of
-	     * waiting so we need to move it into the buffer.
-	     */
-
-	    *buf = infoPtr->extraByte;
-	    infoPtr->readFlags &= ~PIPE_EXTRABYTE;
-	    buf++;
-	    bufSize--;
-	    bytesRead = 1;
-
-	    /*
-	     * If further read attempts would block, return what we have.
-	     */
-
-	    if (result == 0) {
-		return bytesRead;
-	    }
-	}
-    }
-
-    /*
-     * Attempt to read bufSize bytes.  The read will return immediately
-     * if there is any data available.  Otherwise it will block until
-     * at least one byte is available or an EOF occurs.
-     */
-
-    if (ReadFile(filePtr->handle, (LPVOID) buf, (DWORD) bufSize, &count,
-	    (LPOVERLAPPED) NULL) == TRUE) {
-	return bytesRead + count;
-    } else if (bytesRead) {
-	/*
-	 * Ignore errors if we have data to return.
-	 */
-
-	return bytesRead;
-    }
-
-    error:
-    TclWinConvertError(GetLastError());
-    if (errno == EPIPE) {
-	infoPtr->readFlags |= PIPE_EOF;
-	return 0;
-    }
-    *errorCode = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeOutputProc --
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeOutputProc(
-    ClientData instanceData,		/* Pipe state. */
-    char *buf,				/* The data buffer. */
-    int toWrite,			/* How many bytes to write? */
-    int *errorCode)			/* Where to store error code. */
-{
-    PipeInfo *infoPtr = (PipeInfo *) instanceData;
-    WinFile *filePtr = (WinFile*) infoPtr->writeFile;
-    DWORD bytesWritten, timeout;
-    
-    *errorCode = 0;
-    timeout = (infoPtr->flags & PIPE_ASYNC) ? 0 : INFINITE;
-    if (WaitForSingleObject(infoPtr->writable, timeout) == WAIT_TIMEOUT) {
-	/*
-	 * The writer thread is blocked waiting for a write to complete
-	 * and the channel is in non-blocking mode.
-	 */
-
-	errno = EAGAIN;
-	goto error;
-    }
-    
-    /*
-     * Check for a background error on the last write.
-     */
-
-    if (infoPtr->writeError) {
-	TclWinConvertError(infoPtr->writeError);
-	infoPtr->writeError = 0;
-	goto error;
-    }
-
-    if (infoPtr->flags & PIPE_ASYNC) {
-	/*
-	 * The pipe is non-blocking, so copy the data into the output
-	 * buffer and restart the writer thread.
-	 */
-
-	if (toWrite > infoPtr->writeBufLen) {
-	    /*
-	     * Reallocate the buffer to be large enough to hold the data.
-	     */
-
-	    if (infoPtr->writeBuf) {
-		ckfree(infoPtr->writeBuf);
-	    }
-	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
-	}
-	memcpy(infoPtr->writeBuf, buf, toWrite);
-	infoPtr->toWrite = toWrite;
-	ResetEvent(infoPtr->writable);
-	SetEvent(infoPtr->startWriter);
-	bytesWritten = toWrite;
-    } else {
-	/*
-	 * In the blocking case, just try to write the buffer directly.
-	 * This avoids an unnecessary copy.
-	 */
-
-	if (WriteFile(filePtr->handle, (LPVOID) buf, (DWORD) toWrite,
-		&bytesWritten, (LPOVERLAPPED) NULL) == FALSE) {
-	    TclWinConvertError(GetLastError());
-	    goto error;
-	}
-    }
-    return bytesWritten;
-
-    error:
-    *errorCode = errno;
-    return -1;
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeEventProc --
- *
- *	This function is invoked by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure invokes
- *	Tcl_NotifyChannel on the pipe.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the notifier callback does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeEventProc(
-    Tcl_Event *evPtr,		/* Event to service. */
-    int flags)			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    PipeEvent *pipeEvPtr = (PipeEvent *)evPtr;
-    PipeInfo *infoPtr;
-    WinFile *filePtr;
-    int mask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the list of watched pipes for the one whose handle
-     * matches the event.  We do this rather than simply dereferencing
-     * the handle in the event so that pipes can be deleted while the
-     * event is in the queue.
-     */
-
-    for (infoPtr = tsdPtr->firstPipePtr; infoPtr != NULL;
-	    infoPtr = infoPtr->nextPtr) {
-	if (pipeEvPtr->infoPtr == infoPtr) {
-	    infoPtr->flags &= ~(PIPE_PENDING);
-	    break;
-	}
-    }
-
-    /*
-     * Remove stale events.
-     */
-
-    if (!infoPtr) {
-	return 1;
-    }
-
-    /*
-     * If we aren't on Win32s, check to see if the pipe is readable.  Note
-     * that we can't tell if a pipe is writable, so we always report it
-     * as being writable unless we have detected EOF.
-     */
-
-    filePtr = (WinFile*) ((PipeInfo*)infoPtr)->writeFile;
-    mask = 0;
-    if (infoPtr->watchMask & TCL_WRITABLE) {
-	if ((filePtr->type == WIN32S_PIPE)
-		|| (WaitForSingleObject(infoPtr->writable, 0)
-			!= WAIT_TIMEOUT)) {
-	    mask = TCL_WRITABLE;
-	}
-    }
-
-    filePtr = (WinFile*) ((PipeInfo*)infoPtr)->readFile;
-    if (infoPtr->watchMask & TCL_READABLE) {
-	if ((filePtr->type == WIN32S_PIPE)
-		|| (WaitForRead(infoPtr, 0) >= 0)) {
-	    if (infoPtr->readFlags & PIPE_EOF) {
-		mask = TCL_READABLE;
-	    } else {
-		mask |= TCL_READABLE;
-	    }
-	} 
-    }
-
-    /*
-     * Inform the channel of the events.
-     */
-
-    Tcl_NotifyChannel(infoPtr->channel, infoPtr->watchMask & mask);
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeWatchProc --
- *
- *	Called by the notifier to set up to watch for events on this
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-PipeWatchProc(
-    ClientData instanceData,		/* Pipe state. */
-    int mask)				/* What events to watch for, OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    PipeInfo **nextPtrPtr, *ptr;
-    PipeInfo *infoPtr = (PipeInfo *) instanceData;
-    int oldMask = infoPtr->watchMask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Since most of the work is handled by the background threads,
-     * we just need to update the watchMask and then force the notifier
-     * to poll once. 
-     */
-
-    infoPtr->watchMask = mask & infoPtr->validMask;
-    if (infoPtr->watchMask) {
-	Tcl_Time blockTime = { 0, 0 };
-	if (!oldMask) {
-	    infoPtr->nextPtr = tsdPtr->firstPipePtr;
-	    tsdPtr->firstPipePtr = infoPtr;
-	}
-	Tcl_SetMaxBlockTime(&blockTime);
-    } else {
-	if (oldMask) {
-	    /*
-	     * Remove the pipe from the list of watched pipes.
-	     */
-
-	    for (nextPtrPtr = &(tsdPtr->firstPipePtr), ptr = *nextPtrPtr;
-		 ptr != NULL;
-		 nextPtrPtr = &ptr->nextPtr, ptr = *nextPtrPtr) {
-		if (infoPtr == ptr) {
-		    *nextPtrPtr = ptr->nextPtr;
-		    break;
-		}
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	inside a command pipeline based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-PipeGetHandleProc(
-    ClientData instanceData,	/* The pipe state. */
-    int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr)	/* Where to store the handle.  */
-{
-    PipeInfo *infoPtr = (PipeInfo *) instanceData;
-    WinFile *filePtr; 
-
-    if (direction == TCL_READABLE && infoPtr->readFile) {
-	filePtr = (WinFile*) infoPtr->readFile;
-	if (filePtr->type == WIN32S_PIPE) {
-	    if (filePtr->handle == INVALID_HANDLE_VALUE) {
-		filePtr->handle = CreateFileA(((WinPipe *)filePtr)->fileName,
-			GENERIC_READ, 0, NULL, OPEN_ALWAYS,
-			FILE_ATTRIBUTE_NORMAL, NULL);
-	    }
-	    if (filePtr->handle == INVALID_HANDLE_VALUE) {
-		return TCL_ERROR;
-	    }
-	}
-	*handlePtr = (ClientData) filePtr->handle;
-	return TCL_OK;
-    }
-    if (direction == TCL_WRITABLE && infoPtr->writeFile) {
-	filePtr = (WinFile*) infoPtr->writeFile;
-	*handlePtr = (ClientData) filePtr->handle;
-	return TCL_OK;
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_WaitPid --
- *
- *	Emulates the waitpid system call.
- *
- * Results:
- *	Returns 0 if the process is still alive, -1 on an error, or
- *	the pid on a clean close.  
- *
- * Side effects:
- *	Unless WNOHANG is set and the wait times out, the process
- *	information record will be deleted and the process handle
- *	will be closed.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Pid
-Tcl_WaitPid(
-    Tcl_Pid pid,
-    int *statPtr,
-    int options)
-{
-    ProcInfo *infoPtr, **prevPtrPtr;
-    int flags;
-    Tcl_Pid result;
-    DWORD ret;
-
-    PipeInit();
-
-    /*
-     * If no pid is specified, do nothing.
-     */
-    
-    if (pid == 0) {
-	*statPtr = 0;
-	return 0;
-    }
-
-    /*
-     * Find the process on the process list.
-     */
-
-    Tcl_MutexLock(&pipeMutex);
-    prevPtrPtr = &procList;
-    for (infoPtr = procList; infoPtr != NULL;
-	    prevPtrPtr = &infoPtr->nextPtr, infoPtr = infoPtr->nextPtr) {
-	 if (infoPtr->hProcess == (HANDLE) pid) {
-	    break;
-	}
-    }
-    Tcl_MutexUnlock(&pipeMutex);
-
-    /*
-     * If the pid is not one of the processes we know about (we started it)
-     * then do nothing.
-     */
-    		     
-    if (infoPtr == NULL) {
-        *statPtr = 0;
-	return 0;
-    }
-
-    /*
-     * Officially "wait" for it to finish. We either poll (WNOHANG) or
-     * wait for an infinite amount of time.
-     */
-    
-    if (options & WNOHANG) {
-	flags = 0;
-    } else {
-	flags = INFINITE;
-    }
-    ret = WaitForSingleObject(infoPtr->hProcess, flags);
-    if (ret == WAIT_TIMEOUT) {
-	*statPtr = 0;
-	if (options & WNOHANG) {
-	    return 0;
-	} else {
-	    result = 0;
-	}
-    } else if (ret != WAIT_FAILED) {
-	GetExitCodeProcess(infoPtr->hProcess, (DWORD*)statPtr);
-	*statPtr = ((*statPtr << 8) & 0xff00);
-	result = pid;
-    } else {
-	errno = ECHILD;
-        *statPtr = ECHILD;
-	result = (Tcl_Pid) -1;
-    }
-
-    /*
-     * Remove the process from the process list and close the process handle.
-     */
-
-    CloseHandle(infoPtr->hProcess);
-    *prevPtrPtr = infoPtr->nextPtr;
-    ckfree((char*)infoPtr);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinAddProcess --
- *
- *     Add a process to the process list so that we can use
- *     Tcl_WaitPid on the process.
- *
- * Results:
- *     None
- *
- * Side effects:
- *	Adds the specified process handle to the process list so
- *	Tcl_WaitPid knows about it.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclWinAddProcess(hProcess, id)
-    HANDLE hProcess;           /* Handle to process */
-    DWORD id;                  /* Global process identifier */
-{
-    ProcInfo *procPtr = (ProcInfo *) ckalloc(sizeof(ProcInfo));
-    procPtr->hProcess = hProcess;
-    procPtr->dwProcessId = id;
-    Tcl_MutexLock(&pipeMutex);
-    procPtr->nextPtr = procList;
-    procList = procPtr;
-    Tcl_MutexUnlock(&pipeMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_PidObjCmd --
- *
- *	This procedure is invoked to process the "pid" Tcl command.
- *	See the user documentation for details on what it does.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-	/* ARGSUSED */
-int
-Tcl_PidObjCmd(
-    ClientData dummy,		/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST *objv)	/* Argument strings. */
-{
-    Tcl_Channel chan;
-    Tcl_ChannelType *chanTypePtr;
-    PipeInfo *pipePtr;
-    int i;
-    Tcl_Obj *resultPtr;
-    char buf[TCL_INTEGER_SPACE];
-
-    if (objc > 2) {
-	Tcl_WrongNumArgs(interp, 1, objv, "?channelId?");
-	return TCL_ERROR;
-    }
-    if (objc == 1) {
-	resultPtr = Tcl_GetObjResult(interp);
-	wsprintfA(buf, "%lu", (unsigned long) getpid());
-	Tcl_SetStringObj(resultPtr, buf, -1);
-    } else {
-        chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL),
-		NULL);
-        if (chan == (Tcl_Channel) NULL) {
-	    return TCL_ERROR;
-	}
-	chanTypePtr = Tcl_GetChannelType(chan);
-	if (chanTypePtr != &pipeChannelType) {
-	    return TCL_OK;
-	}
-
-        pipePtr = (PipeInfo *) Tcl_GetChannelInstanceData(chan);
-	resultPtr = Tcl_GetObjResult(interp);
-        for (i = 0; i < pipePtr->numPids; i++) {
-	    wsprintfA(buf, "%lu", TclpGetPid(pipePtr->pidPtr[i]));
-	    Tcl_ListObjAppendElement(/*interp*/ NULL, resultPtr,
-		    Tcl_NewStringObj(buf, -1));
-	}
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForRead --
- *
- *	Wait until some data is available, the pipe is at
- *	EOF or the reader thread is blocked waiting for data (if the
- *	channel is in non-blocking mode).
- *
- * Results:
- *	Returns 1 if pipe is readable.  Returns 0 if there is no data
- *	on the pipe, but there is buffered data.  Returns -1 if an
- *	error occurred.  If an error occurred, the threads may not
- *	be synchronized.
- *
- * Side effects:
- *	Updates the shared state flags and may consume 1 byte of data
- *	from the pipe.  If no error occurred, the reader thread is
- *	blocked waiting for a signal from the main thread.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForRead(
-    PipeInfo *infoPtr,		/* Pipe state. */
-    int blocking)		/* Indicates whether call should be
-				 * blocking or not. */
-{
-    DWORD timeout, count;
-    HANDLE *handle = ((WinFile *) infoPtr->readFile)->handle;
-
-    while (1) {
-	/*
-	 * Synchronize with the reader thread.
-	 */
-       
-	timeout = blocking ? INFINITE : 0;
-	if (WaitForSingleObject(infoPtr->readable, timeout) == WAIT_TIMEOUT) {
-	    /*
-	     * The reader thread is blocked waiting for data and the channel
-	     * is in non-blocking mode.
-	     */
-
-	    errno = EAGAIN;
-	    return -1;
-	}
-
-	/*
-	 * At this point, the two threads are synchronized, so it is safe
-	 * to access shared state.
-	 */
-
-
-	/*
-	 * If the pipe has hit EOF, it is always readable.
-	 */
-
-	if (infoPtr->readFlags & PIPE_EOF) {
-	    return 1;
-	}
-    
-	/*
-	 * Check to see if there is any data sitting in the pipe.
-	 */
-
-	if (PeekNamedPipe(handle, (LPVOID) NULL, (DWORD) 0,
-		(LPDWORD) NULL, &count, (LPDWORD) NULL) != TRUE) {
-	    TclWinConvertError(GetLastError());
-	    /*
-	     * Check to see if the peek failed because of EOF.
-	     */
-
-	    if (errno == EPIPE) {
-		infoPtr->readFlags |= PIPE_EOF;
-		return 1;
-	    }
-
-	    /*
-	     * Ignore errors if there is data in the buffer.
-	     */
-
-	    if (infoPtr->readFlags & PIPE_EXTRABYTE) {
-		return 0;
-	    } else {
-		return -1;
-	    }
-	}
-
-	/*
-	 * We found some data in the pipe, so it must be readable.
-	 */
-
-	if (count > 0) {
-	    return 1;
-	}
-
-	/*
-	 * The pipe isn't readable, but there is some data sitting
-	 * in the buffer, so return immediately.
-	 */
-
-	if (infoPtr->readFlags & PIPE_EXTRABYTE) {
-	    return 0;
-	}
-
-	/*
-	 * There wasn't any data available, so reset the thread and
-	 * try again.
-	 */
-    
-	ResetEvent(infoPtr->readable);
-	SetEvent(infoPtr->startReader);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeReaderThread --
- *
- *	This function runs in a separate thread and waits for input
- *	to become available on a pipe.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Signals the main thread when input become available.  May
- *	cause the main thread to wake up by posting a message.  May
- *	consume one byte from the pipe for each wait operation.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-PipeReaderThread(LPVOID arg)
-{
-    PipeInfo *infoPtr = (PipeInfo *)arg;
-    HANDLE *handle = ((WinFile *) infoPtr->readFile)->handle;
-    DWORD count, err;
-    int done = 0;
-
-    while (!done) {
-	/*
-	 * Wait for the main thread to signal before attempting to wait.
-	 */
-
-	WaitForSingleObject(infoPtr->startReader, INFINITE);
-
-	/*
-	 * Try waiting for 0 bytes.  This will block until some data is
-	 * available on NT, but will return immediately on Win 95.  So,
-	 * if no data is available after the first read, we block until
-	 * we can read a single byte off of the pipe.
-	 */
-
-	if ((ReadFile(handle, NULL, 0, &count, NULL) == FALSE)
-		|| (PeekNamedPipe(handle, NULL, 0, NULL, &count,
-			NULL) == FALSE)) {
-	    /*
-	     * The error is a result of an EOF condition, so set the
-	     * EOF bit before signalling the main thread.
-	     */
-
-	    err = GetLastError();
-	    if (err == ERROR_BROKEN_PIPE) {
-		infoPtr->readFlags |= PIPE_EOF;
-		done = 1;
-	    } else if (err == ERROR_INVALID_HANDLE) {
-		break;
-	    }
-	} else if (count == 0) {
-	    if (ReadFile(handle, &(infoPtr->extraByte), 1, &count, NULL)
-		    != FALSE) {
-		/*
-		 * One byte was consumed as a side effect of waiting
-		 * for the pipe to become readable.
-		 */
-
-		infoPtr->readFlags |= PIPE_EXTRABYTE;
-	    } else {
-		err = GetLastError();
-		if (err == ERROR_BROKEN_PIPE) {
-		    /*
-		     * The error is a result of an EOF condition, so set the
-		     * EOF bit before signalling the main thread.
-		     */
-
-		    infoPtr->readFlags |= PIPE_EOF;
-		    done = 1;
-		} else if (err == ERROR_INVALID_HANDLE) {
-		    break;
-		}
-	    }
-	}
-
-		
-	/*
-	 * Signal the main thread by signalling the readable event and
-	 * then waking up the notifier thread.
-	 */
-
-	SetEvent(infoPtr->readable);
-	
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&pipeMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&pipeMutex);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * PipeWriterThread --
- *
- *	This function runs in a separate thread and writes data
- *	onto a pipe.
- *
- * Results:
- *	Always returns 0.
- *
- * Side effects:
- *	Signals the main thread when an output operation is completed.
- *	May cause the main thread to wake up by posting a message.  
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-PipeWriterThread(LPVOID arg)
-{
-
-    PipeInfo *infoPtr = (PipeInfo *)arg;
-    HANDLE *handle = ((WinFile *) infoPtr->writeFile)->handle;
-    DWORD count, toWrite;
-    char *buf;
-    int done = 0;
-
-    while (!done) {
-	/*
-	 * Wait for the main thread to signal before attempting to write.
-	 */
-
-	WaitForSingleObject(infoPtr->startWriter, INFINITE);
-
-	buf = infoPtr->writeBuf;
-	toWrite = infoPtr->toWrite;
-
-	/*
-	 * Loop until all of the bytes are written or an error occurs.
-	 */
-
-	while (toWrite > 0) {
-	    if (WriteFile(handle, buf, toWrite, &count, NULL) == FALSE) {
-		infoPtr->writeError = GetLastError();
-		done = 1; 
-		break;
-	    } else {
-		toWrite -= count;
-		buf += count;
-	    }
-	}
-	
-	/*
-	 * Signal the main thread by signalling the writable event and
-	 * then waking up the notifier thread.
-	 */
-
-	SetEvent(infoPtr->writable);
-
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&pipeMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&pipeMutex);
-    }
-    return 0;
-}
-
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
deleted file mode 100644
index 4843383..0000000
--- a/win/tclWinPort.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * tclWinPort.h --
- *
- *	This header file handles porting issues that occur because of
- *	differences between Windows and Unix. It should be the only
- *	file that contains #ifdefs to handle different flavors of OS.
- *
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinPort.h,v 1.8 1999/04/16 00:48:09 stanton Exp $
- */
-
-#ifndef _TCLWINPORT
-#define _TCLWINPORT
-
-#ifndef _TCLINT
-#   include "tclInt.h"
-#endif
-
-#ifdef CHECK_UNICODE_CALLS
-
-#define _UNICODE
-#define UNICODE
-
-#define __TCHAR_DEFINED
-typedef float *_TCHAR;
-
-#define _TCHAR_DEFINED
-typedef float *TCHAR;
-
-#endif
-
-/*
- *---------------------------------------------------------------------------
- * The following sets of #includes and #ifdefs are required to get Tcl to
- * compile under the windows compilers.
- *---------------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <direct.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <float.h>
-#include <io.h>
-#include <malloc.h>
-#include <process.h>
-#include <signal.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/timeb.h>
-#include <tchar.h>
-#include <time.h>
-#include <winsock.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#ifdef BUILD_tcl
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- * Define EINPROGRESS in terms of WSAEINPROGRESS.
- */
-
-#ifndef	EINPROGRESS
-#define EINPROGRESS WSAEINPROGRESS
-#endif
-
-/*
- * If ENOTSUP is not defined, define it to a value that will never occur.
- */
-
-#ifndef ENOTSUP
-#define	ENOTSUP		-1030507
-#endif
-
-/*
- * The following defines redefine the Windows Socket errors as
- * BSD errors so Tcl_PosixError can do the right thing.
- */
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK             EAGAIN
-#endif
-#ifndef EALREADY
-#define EALREADY	149	/* operation already in progress */
-#endif
-#ifndef ENOTSOCK
-#define ENOTSOCK	95	/* Socket operation on non-socket */
-#endif
-#ifndef EDESTADDRREQ
-#define EDESTADDRREQ	96	/* Destination address required */
-#endif
-#ifndef EMSGSIZE
-#define EMSGSIZE	97	/* Message too long */
-#endif
-#ifndef EPROTOTYPE
-#define EPROTOTYPE	98	/* Protocol wrong type for socket */
-#endif
-#ifndef ENOPROTOOPT
-#define ENOPROTOOPT	99	/* Protocol not available */
-#endif
-#ifndef EPROTONOSUPPORT
-#define EPROTONOSUPPORT	120	/* Protocol not supported */
-#endif
-#ifndef ESOCKTNOSUPPORT
-#define ESOCKTNOSUPPORT	121	/* Socket type not supported */
-#endif
-#ifndef EOPNOTSUPP
-#define EOPNOTSUPP	122	/* Operation not supported on socket */
-#endif
-#ifndef EPFNOSUPPORT
-#define EPFNOSUPPORT	123	/* Protocol family not supported */
-#endif
-#ifndef EAFNOSUPPORT
-#define EAFNOSUPPORT	124	/* Address family not supported */
-#endif
-#ifndef EADDRINUSE
-#define EADDRINUSE	125	/* Address already in use */
-#endif
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL	126	/* Can't assign requested address */
-#endif
-#ifndef ENETDOWN
-#define ENETDOWN	127	/* Network is down */
-#endif
-#ifndef ENETUNREACH
-#define ENETUNREACH	128	/* Network is unreachable */
-#endif
-#ifndef ENETRESET
-#define ENETRESET	129	/* Network dropped connection on reset */
-#endif
-#ifndef ECONNABORTED
-#define ECONNABORTED	130	/* Software caused connection abort */
-#endif
-#ifndef ECONNRESET
-#define ECONNRESET	131	/* Connection reset by peer */
-#endif
-#ifndef ENOBUFS
-#define ENOBUFS		132	/* No buffer space available */
-#endif
-#ifndef EISCONN
-#define EISCONN		133	/* Socket is already connected */
-#endif
-#ifndef ENOTCONN
-#define ENOTCONN	134	/* Socket is not connected */
-#endif
-#ifndef ESHUTDOWN
-#define ESHUTDOWN	143	/* Can't send after socket shutdown */
-#endif
-#ifndef ETOOMANYREFS
-#define ETOOMANYREFS	144	/* Too many references: can't splice */
-#endif
-#ifndef ETIMEDOUT
-#define ETIMEDOUT	145	/* Connection timed out */
-#endif
-#ifndef ECONNREFUSED
-#define ECONNREFUSED	146	/* Connection refused */
-#endif
-#ifndef ELOOP
-#define ELOOP		90	/* Symbolic link loop */
-#endif
-#ifndef EHOSTDOWN
-#define EHOSTDOWN	147	/* Host is down */
-#endif
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH	148	/* No route to host */
-#endif
-#ifndef ENOTEMPTY
-#define ENOTEMPTY 	93	/* directory not empty */
-#endif
-#ifndef EUSERS
-#define EUSERS		94	/* Too many users (for UFS) */
-#endif
-#ifndef EDQUOT
-#define EDQUOT		49	/* Disc quota exceeded */
-#endif
-#ifndef ESTALE
-#define ESTALE		151	/* Stale NFS file handle */
-#endif
-#ifndef EREMOTE
-#define EREMOTE		66	/* The object is remote */
-#endif
-
-/*
- * Supply definitions for macros to query wait status, if not already
- * defined in header files above.
- */
-
-#if TCL_UNION_WAIT
-#   define WAIT_STATUS_TYPE union wait
-#else
-#   define WAIT_STATUS_TYPE int
-#endif
-
-#ifndef WIFEXITED
-#   define WIFEXITED(stat)  (((*((int *) &(stat))) & 0xff) == 0)
-#endif
-
-#ifndef WEXITSTATUS
-#   define WEXITSTATUS(stat) (((*((int *) &(stat))) >> 8) & 0xff)
-#endif
-
-#ifndef WIFSIGNALED
-#   define WIFSIGNALED(stat) (((*((int *) &(stat)))) && ((*((int *) &(stat))) == ((*((int *) &(stat))) & 0x00ff)))
-#endif
-
-#ifndef WTERMSIG
-#   define WTERMSIG(stat)    ((*((int *) &(stat))) & 0x7f)
-#endif
-
-#ifndef WIFSTOPPED
-#   define WIFSTOPPED(stat)  (((*((int *) &(stat))) & 0xff) == 0177)
-#endif
-
-#ifndef WSTOPSIG
-#   define WSTOPSIG(stat)    (((*((int *) &(stat))) >> 8) & 0xff)
-#endif
-
-/*
- * Define constants for waitpid() system call if they aren't defined
- * by a system header file.
- */
-
-#ifndef WNOHANG
-#   define WNOHANG 1
-#endif
-#ifndef WUNTRACED
-#   define WUNTRACED 2
-#endif
-
-/*
- * Define access mode constants if they aren't already defined.
- */
-
-#ifndef F_OK
-#    define F_OK 00
-#endif
-#ifndef X_OK
-#    define X_OK 01
-#endif
-#ifndef W_OK
-#    define W_OK 02
-#endif
-#ifndef R_OK
-#    define R_OK 04
-#endif
-
-/*
- * Define macros to query file type bits, if they're not already
- * defined.
- */
-
-#ifndef S_ISREG
-#   ifdef S_IFREG
-#       define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#   else
-#       define S_ISREG(m) 0
-#   endif
-# endif
-#ifndef S_ISDIR
-#   ifdef S_IFDIR
-#       define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#   else
-#       define S_ISDIR(m) 0
-#   endif
-# endif
-#ifndef S_ISCHR
-#   ifdef S_IFCHR
-#       define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-#   else
-#       define S_ISCHR(m) 0
-#   endif
-# endif
-#ifndef S_ISBLK
-#   ifdef S_IFBLK
-#       define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
-#   else
-#       define S_ISBLK(m) 0
-#   endif
-# endif
-#ifndef S_ISFIFO
-#   ifdef S_IFIFO
-#       define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
-#   else
-#       define S_ISFIFO(m) 0
-#   endif
-# endif
-
-/*
- * Define MAXPATHLEN in terms of MAXPATH if available
- */
-
-#ifndef MAXPATH
-#define MAXPATH MAX_PATH
-#endif /* MAXPATH */
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN MAXPATH
-#endif /* MAXPATHLEN */
-
-/*
- * Define pid_t and uid_t if they're not already defined.
- */
-
-#if ! TCL_PID_T
-#   define pid_t int
-#endif
-#if ! TCL_UID_T
-#   define uid_t int
-#endif
-
-/*
- * Visual C++ has some odd names for common functions, so we need to
- * define a few macros to handle them.  Also, it defines EDEADLOCK and
- * EDEADLK as the same value, which confuses Tcl_ErrnoId().
- */
-
-#ifdef _MSC_VER
-#    define environ _environ
-#    define hypot _hypot
-#    define exception _exception
-#    undef EDEADLOCK
-#endif /* _MSC_VER */
-
-/*
- *---------------------------------------------------------------------------
- * The following macros and declarations represent the interface between 
- * generic and windows-specific parts of Tcl.  Some of the macros may 
- * override functions declared in tclInt.h.
- *---------------------------------------------------------------------------
- */
-
-/*
- * The default platform eol translation on Windows is TCL_TRANSLATE_CRLF:
- */
-
-#define	TCL_PLATFORM_TRANSLATION	TCL_TRANSLATE_CRLF
-
-/*
- * Declare dynamic loading extension macro.
- */
-
-#define TCL_SHLIB_EXT ".dll"
-
-/*
- * The following define ensures that we use the native putenv
- * implementation to modify the environment array.  This keeps
- * the C level environment in synch with the system level environment.
- */
-
-#define USE_PUTENV	1
-
-/*
- * The following defines wrap the system memory allocation routines for
- * use by tclAlloc.c.
- */
-
-#define TclpSysAlloc(size, isBin)	((void*)HeapAlloc(GetProcessHeap(), \
-					    (DWORD)0, (DWORD)size))
-#define TclpSysFree(ptr)		(HeapFree(GetProcessHeap(), \
-					    (DWORD)0, (HGLOBAL)ptr))
-#define TclpSysRealloc(ptr, size)	((void*)HeapReAlloc(GetProcessHeap(), \
-					    (DWORD)0, (LPVOID)ptr, (DWORD)size))
-
-/*
- * The following defines map from standard socket names to our internal
- * wrappers that redirect through the winSock function table (see the
- * file tclWinSock.c).
- */
-
-#define getservbyname	TclWinGetServByName
-#define getsockopt	TclWinGetSockOpt
-#define ntohs		TclWinNToHS
-#define setsockopt	TclWinSetSockOpt
-
-/*
- * The following macros have trivial definitions, allowing generic code to 
- * address platform-specific issues.
- */
-
-#define TclpReleaseFile(file)	ckfree((char *) file)
-
-/*
- * The following macros and declarations wrap the C runtime library 
- * functions.
- */
-
-#define TclpExit		exit
-#define TclpLstat		TclpStat
-
-/*
- * Declarations for Windows-only functions.
- */
-
-EXTERN Tcl_Channel  TclWinOpenSerialChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions));
-					 
-EXTERN Tcl_Channel  TclWinOpenConsoleChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions));
-
-EXTERN Tcl_Channel  TclWinOpenFileChannel _ANSI_ARGS_((HANDLE handle,
-                        char *channelName, int permissions, int appendMode));
-
-EXTERN TclFile TclWinMakeFile _ANSI_ARGS_((HANDLE handle));
-
-/*
- * Platform specific mutex definition used by memory allocators.
- * These mutexes are statically allocated and explicitly initialized.
- * Most modules do not use this, but instead use Tcl_Mutex types and
- * Tcl_MutexLock and Tcl_MutexUnlock that are self-initializing.
- */
-
-#ifdef TCL_THREADS
-typedef CRITICAL_SECTION TclpMutex;
-EXTERN void	TclpMutexInit _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexLock _ANSI_ARGS_((TclpMutex *mPtr));
-EXTERN void	TclpMutexUnlock _ANSI_ARGS_((TclpMutex *mPtr));
-#else
-typedef int TclpMutex;
-#define	TclpMutexInit(a)
-#define	TclpMutexLock(a)
-#define	TclpMutexUnlock(a)
-#endif /* TCL_THREADS */
-
-#include "tclPlatDecls.h"
-#include "tclIntPlatDecls.h"
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _TCLWINPORT */
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
deleted file mode 100644
index 479435c..0000000
--- a/win/tclWinReg.c
+++ /dev/null
@@ -1,1403 +0,0 @@
-/*
- * tclWinReg.c --
- *
- *	This file contains the implementation of the "registry" Tcl
- *	built-in command.  This command is built as a dynamically
- *	loadable extension in a separate DLL.
- *
- * Copyright (c) 1997 by Sun Microsystems, Inc.
- * Copyright (c) 1998-1999 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinReg.c,v 1.9 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include <tclPort.h>
-#include <stdlib.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-/*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Registry_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
- * The following macros convert between different endian ints.
- */
-
-#define SWAPWORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x))
-#define SWAPLONG(x) MAKELONG(SWAPWORD(HIWORD(x)), SWAPWORD(LOWORD(x)))
-
-/*
- * The following flag is used in OpenKeys to indicate that the specified
- * key should be created if it doesn't currently exist.
- */
-
-#define REG_CREATE 1
-
-/*
- * The following tables contain the mapping from registry root names
- * to the system predefined keys.
- */
-
-static char *rootKeyNames[] = {
-    "HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT",
-    "HKEY_CURRENT_USER", "HKEY_CURRENT_CONFIG",
-    "HKEY_PERFORMANCE_DATA", "HKEY_DYN_DATA", NULL
-};
-
-static HKEY rootKeys[] = {
-    HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
-    HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, HKEY_DYN_DATA
-};
-
-/*
- * The following table maps from registry types to strings.  Note that
- * the indices for this array are the same as the constants for the
- * known registry types so we don't need a separate table to hold the
- * mapping.
- */
-
-static char *typeNames[] = {
-    "none", "sz", "expand_sz", "binary", "dword",
-    "dword_big_endian", "link", "multi_sz", "resource_list", NULL
-};
-
-static DWORD lastType = REG_RESOURCE_LIST;
-
-/*
- * The following structures allow us to select between the Unicode and ASCII
- * interfaces at run time based on whether Unicode APIs are available.  The
- * Unicode APIs are preferable because they will handle characters outside
- * of the current code page.
- */
-
-typedef struct RegWinProcs {
-    int useWide;
-
-    LONG (WINAPI *regConnectRegistryProc)(TCHAR *, HKEY, PHKEY);
-    LONG (WINAPI *regCreateKeyExProc)(HKEY, CONST TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *, DWORD *); 
-    LONG (WINAPI *regDeleteKeyProc)(HKEY, CONST TCHAR *);
-    LONG (WINAPI *regDeleteValueProc)(HKEY, CONST TCHAR *);
-    LONG (WINAPI *regEnumKeyProc)(HKEY, DWORD, TCHAR *, DWORD);
-    LONG (WINAPI *regEnumKeyExProc)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *);
-    LONG (WINAPI *regEnumValueProc)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *);
-    LONG (WINAPI *regOpenKeyExProc)(HKEY, CONST TCHAR *, DWORD, REGSAM,
-	    HKEY *);
-    LONG (WINAPI *regQueryInfoKeyProc)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *);
-    LONG (WINAPI *regQueryValueExProc)(HKEY, CONST TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *);
-    LONG (WINAPI *regSetValueExProc)(HKEY, CONST TCHAR *, DWORD, DWORD,
-	    CONST BYTE*, DWORD);
-} RegWinProcs;
-
-static RegWinProcs *regWinProcs;
-
-static RegWinProcs asciiProcs = {
-    0,
-
-    (LONG (WINAPI *)(TCHAR *, HKEY, PHKEY)) RegConnectRegistryA,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *,
-	    DWORD *)) RegCreateKeyExA, 
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *)) RegDeleteKeyA,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *)) RegDeleteValueA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD)) RegEnumKeyA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *)) RegEnumKeyExA,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *)) RegEnumValueA,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, REGSAM,
-	    HKEY *)) RegOpenKeyExA,
-    (LONG (WINAPI *)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *)) RegQueryInfoKeyA,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *)) RegQueryValueExA,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, DWORD,
-	    CONST BYTE*, DWORD)) RegSetValueExA,
-};
-
-static RegWinProcs unicodeProcs = {
-    1,
-
-    (LONG (WINAPI *)(TCHAR *, HKEY, PHKEY)) RegConnectRegistryW,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, TCHAR *,
-	    DWORD, REGSAM, SECURITY_ATTRIBUTES *, HKEY *,
-	    DWORD *)) RegCreateKeyExW, 
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *)) RegDeleteKeyW,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *)) RegDeleteValueW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD)) RegEnumKeyW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    TCHAR *, DWORD *, FILETIME *)) RegEnumKeyExW,
-    (LONG (WINAPI *)(HKEY, DWORD, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, BYTE *, DWORD *)) RegEnumValueW,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, REGSAM,
-	    HKEY *)) RegOpenKeyExW,
-    (LONG (WINAPI *)(HKEY, TCHAR *, DWORD *, DWORD *,
-	    DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *, DWORD *,
-	    FILETIME *)) RegQueryInfoKeyW,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD *, DWORD *,
-	    BYTE *, DWORD *)) RegQueryValueExW,
-    (LONG (WINAPI *)(HKEY, CONST TCHAR *, DWORD, DWORD,
-	    CONST BYTE*, DWORD)) RegSetValueExW,
-};
-
-
-/*
- * Declarations for functions defined in this file.
- */
-
-static void		AppendSystemError(Tcl_Interp *interp, DWORD error);
-static DWORD		ConvertDWORD(DWORD type, DWORD value);
-static int		DeleteKey(Tcl_Interp *interp, Tcl_Obj *keyNameObj);
-static int		DeleteValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *valueNameObj);
-static int		GetKeyNames(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *patternObj);
-static int		GetType(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *valueNameObj);
-static int		GetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *valueNameObj);
-static int		GetValueNames(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *patternObj);
-static int		OpenKey(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    REGSAM mode, int flags, HKEY *keyPtr);
-static DWORD		OpenSubKey(char *hostName, HKEY rootKey,
-			    char *keyName, REGSAM mode, int flags,
-			    HKEY *keyPtr);
-static int		ParseKeyName(Tcl_Interp *interp, char *name,
-			    char **hostNamePtr, HKEY *rootKeyPtr,
-			    char **keyNamePtr);
-static DWORD		RecursiveDeleteKey(HKEY hStartKey, TCHAR * pKeyName);
-static int		RegistryObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj * CONST objv[]);
-static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
-			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
-			    Tcl_Obj *typeObj);
-
-EXTERN int Registry_Init(Tcl_Interp *interp);
-
-/*
- *----------------------------------------------------------------------
- *
- * Registry_Init --
- *
- *	This procedure initializes the registry command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Registry_Init(
-    Tcl_Interp *interp)
-{
-    OSVERSIONINFO os;
-
-    if (!Tcl_InitStubs(interp, "8.0", 0)) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Determine if the unicode interfaces are available and select the
-     * appropriate registry function table.
-     */
-
-    os.dwOSVersionInfoSize = sizeof(os);
-    GetVersionEx(&os);
-
-    if (os.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-	regWinProcs = &unicodeProcs;
-    } else {
-	regWinProcs = &asciiProcs;
-    }
-
-    Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd, NULL, NULL);
-    return Tcl_PkgProvide(interp, "registry", "1.0");
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RegistryObjCmd --
- *
- *	This function implements the Tcl "registry" command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-RegistryObjCmd(
-    ClientData clientData,	/* Not used. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj * CONST objv[])	/* Argument values. */
-{
-    int index;
-    char *errString;
-
-    static char *subcommands[] = { "delete", "get", "keys", "set", "type",
-				   "values", (char *) NULL };
-    enum SubCmdIdx { DeleteIdx, GetIdx, KeysIdx, SetIdx, TypeIdx, ValuesIdx };
-
-    if (objc < 2) {
-	Tcl_WrongNumArgs(interp, objc, objv, "option ?arg arg ...?");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObj(interp, objv[1], subcommands, "option", 0, &index)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    switch (index) {
-	case DeleteIdx:			/* delete */
-	    if (objc == 3) {
-		return DeleteKey(interp, objv[2]);
-	    } else if (objc == 4) {
-		return DeleteValue(interp, objv[2], objv[3]);
-	    }
-	    errString = "keyName ?valueName?";
-	    break;
-	case GetIdx:			/* get */
-	    if (objc == 4) {
-		return GetValue(interp, objv[2], objv[3]);
-	    }
-	    errString = "keyName valueName";
-	    break;
-	case KeysIdx:			/* keys */
-	    if (objc == 3) {
-		return GetKeyNames(interp, objv[2], NULL);
-	    } else if (objc == 4) {
-		return GetKeyNames(interp, objv[2], objv[3]);
-	    }
-	    errString = "keyName ?pattern?";
-	    break;
-	case SetIdx:			/* set */
-	    if (objc == 3) {
-		HKEY key;
-
-		/*
-		 * Create the key and then close it immediately.
-		 */
-
-		if (OpenKey(interp, objv[2], KEY_ALL_ACCESS, 1, &key)
-			!= TCL_OK) {
-		    return TCL_ERROR;
-		}
-		RegCloseKey(key);
-		return TCL_OK;
-	    } else if (objc == 5 || objc == 6) {
-		Tcl_Obj *typeObj = (objc == 5) ? NULL : objv[5];
-		return SetValue(interp, objv[2], objv[3], objv[4], typeObj);
-	    }
-	    errString = "keyName ?valueName data ?type??";
-	    break;
-	case TypeIdx:			/* type */
-	    if (objc == 4) {
-		return GetType(interp, objv[2], objv[3]);
-	    }
-	    errString = "keyName valueName";
-	    break;
-	case ValuesIdx:			/* values */
-	    if (objc == 3) {
- 		return GetValueNames(interp, objv[2], NULL);
-	    } else if (objc == 4) {
- 		return GetValueNames(interp, objv[2], objv[3]);
-	    }
-	    errString = "keyName ?pattern?";
-	    break;
-    }
-    Tcl_WrongNumArgs(interp, 2, objv, errString);
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteKey --
- *
- *	This function deletes a registry key.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DeleteKey(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj)	/* Name of key to delete. */
-{
-    char *tail, *buffer, *hostName, *keyName;
-    HKEY rootKey, subkey;
-    DWORD result;
-    int length;
-    Tcl_Obj *resultPtr;
-    Tcl_DString buf;
-
-    /*
-     * Find the parent of the key being deleted and open it.
-     */
-
-    keyName = Tcl_GetStringFromObj(keyNameObj, &length);
-    buffer = ckalloc(length + 1);
-    strcpy(buffer, keyName);
-
-    if (ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName)
-	    != TCL_OK) {
-	ckfree(buffer);
-	return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    if (*keyName == '\0') {
-	Tcl_AppendToObj(resultPtr, "bad key: cannot delete root keys", -1);
-	ckfree(buffer);
-	return TCL_ERROR;
-    }
-
-    tail = strrchr(keyName, '\\');
-    if (tail) {
-	*tail++ = '\0';
-    } else {
-	tail = keyName;
-	keyName = NULL;
-    }
-
-    result = OpenSubKey(hostName, rootKey, keyName,
-	    KEY_ENUMERATE_SUB_KEYS | DELETE, 0, &subkey);
-    if (result != ERROR_SUCCESS) {
-	ckfree(buffer);
-	if (result == ERROR_FILE_NOT_FOUND) {
-	    return TCL_OK;
-	} else {
-	    Tcl_AppendToObj(resultPtr, "unable to delete key: ", -1);
-	    AppendSystemError(interp, result);
-	    return TCL_ERROR;
-	}
-    }
-
-    /*
-     * Now we recursively delete the key and everything below it.
-     */
-
-    tail = Tcl_WinUtfToTChar(tail, -1, &buf);
-    result = RecursiveDeleteKey(subkey, tail);
-    Tcl_DStringFree(&buf);
-
-    if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
-	Tcl_AppendToObj(resultPtr, "unable to delete key: ", -1);
-	AppendSystemError(interp, result);
-	result = TCL_ERROR;
-    } else {
-	result = TCL_OK;
-    }
-
-    RegCloseKey(subkey);
-    ckfree(buffer);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DeleteValue --
- *
- *	This function deletes a value from a registry key.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DeleteValue(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Name of key. */
-    Tcl_Obj *valueNameObj)	/* Name of value to delete. */
-{
-    HKEY key;
-    char *valueName;
-    int length;
-    DWORD result;
-    Tcl_Obj *resultPtr;
-    Tcl_DString ds;
-
-    /*
-     * Attempt to open the key for deletion.
-     */
-
-    if (OpenKey(interp, keyNameObj, KEY_SET_VALUE, 0, &key)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
-    Tcl_WinUtfToTChar(valueName, length, &ds);
-    result = (*regWinProcs->regDeleteValueProc)(key, Tcl_DStringValue(&ds));
-    Tcl_DStringFree(&ds);
-    if (result != ERROR_SUCCESS) {
-	Tcl_AppendStringsToObj(resultPtr, "unable to delete value \"",
-		Tcl_GetString(valueNameObj), "\" from key \"",
-		Tcl_GetString(keyNameObj), "\": ", NULL);
-	AppendSystemError(interp, result);
-	result = TCL_ERROR;
-    } else {
-	result = TCL_OK;
-    }
-    RegCloseKey(key);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetKeyNames --
- *
- *	This function enumerates the subkeys of a given key.  If the
- *	optional pattern is supplied, then only keys that match the
- *	pattern will be returned.
- *
- * Results:
- *	Returns the list of subkeys in the result object of the
- *	interpreter, or an error message on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetKeyNames(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Key to enumerate. */
-    Tcl_Obj *patternObj)	/* Optional match pattern. */
-{
-    HKEY key;
-    DWORD index;
-    char buffer[MAX_PATH+1], *pattern, *name;
-    Tcl_Obj *resultPtr;
-    int result = TCL_OK;
-    Tcl_DString ds;
-
-    /*
-     * Attempt to open the key for enumeration.
-     */
-
-    if (OpenKey(interp, keyNameObj, KEY_ENUMERATE_SUB_KEYS, 0, &key)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    if (patternObj) {
-	pattern = Tcl_GetString(patternObj);
-    } else {
-	pattern = NULL;
-    }
-
-    /*
-     * Enumerate over the subkeys until we get an error, indicating the
-     * end of the list.
-     */
-
-    resultPtr = Tcl_GetObjResult(interp);
-    for (index = 0; (*regWinProcs->regEnumKeyProc)(key, index, buffer,
-	    MAX_PATH+1) == ERROR_SUCCESS; index++) {
-	Tcl_WinTCharToUtf((TCHAR *) buffer, -1, &ds);
-	name = Tcl_DStringValue(&ds);
-	if (pattern && !Tcl_StringMatch(name, pattern)) {
-	    Tcl_DStringFree(&ds);
-	    continue;
-	}
-	result = Tcl_ListObjAppendElement(interp, resultPtr,
-		Tcl_NewStringObj(name, Tcl_DStringLength(&ds)));
-	Tcl_DStringFree(&ds);
-	if (result != TCL_OK) {
-	    break;
-	}
-    }
-
-    RegCloseKey(key);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetType --
- *
- *	This function gets the type of a given registry value and
- *	places it in the interpreter result.
- *
- * Results:
- *	Returns a normal Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetType(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Name of key. */
-    Tcl_Obj *valueNameObj)	/* Name of value to get. */
-{
-    HKEY key;
-    Tcl_Obj *resultPtr;
-    DWORD result;
-    DWORD type;
-    Tcl_DString ds;
-    char *valueName;
-    int length;
-
-    /*
-     * Attempt to open the key for reading.
-     */
-
-    if (OpenKey(interp, keyNameObj, KEY_QUERY_VALUE, 0, &key)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Get the type of the value.
-     */
-
-    resultPtr = Tcl_GetObjResult(interp);
-
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
-    valueName = Tcl_WinUtfToTChar(valueName, length, &ds);
-    result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL, &type,
-	    NULL, NULL);
-    Tcl_DStringFree(&ds);
-    RegCloseKey(key);
-
-    if (result != ERROR_SUCCESS) {
-	Tcl_AppendStringsToObj(resultPtr, "unable to get type of value \"",
-		Tcl_GetString(valueNameObj), "\" from key \"",
-		Tcl_GetString(keyNameObj), "\": ", NULL);
-	AppendSystemError(interp, result);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Set the type into the result.  Watch out for unknown types.
-     * If we don't know about the type, just use the numeric value.
-     */
-
-    if (type > lastType || type < 0) {
-	Tcl_SetIntObj(resultPtr, type);
-    } else {
-	Tcl_SetStringObj(resultPtr, typeNames[type], -1);
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetValue --
- *
- *	This function gets the contents of a registry value and places
- *	a list containing the data and the type in the interpreter
- *	result.
- *
- * Results:
- *	Returns a normal Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetValue(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Name of key. */
-    Tcl_Obj *valueNameObj)	/* Name of value to get. */
-{
-    HKEY key;
-    char *valueName;
-    DWORD result, length, type;
-    Tcl_Obj *resultPtr;
-    Tcl_DString data, buf;
-    int nameLen;
-
-    /*
-     * Attempt to open the key for reading.
-     */
-
-    if (OpenKey(interp, keyNameObj, KEY_QUERY_VALUE, 0, &key)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    /*
-     * Initialize a Dstring to maximum statically allocated size
-     * we could get one more byte by avoiding Tcl_DStringSetLength()
-     * and just setting length to TCL_DSTRING_STATIC_SIZE, but this
-     * should be safer if the implementation of Dstrings changes.
-     *
-     * This allows short values to be read from the registy in one call.
-     * Longer values need a second call with an expanded DString.
-     */
-
-    Tcl_DStringInit(&data);
-    length = TCL_DSTRING_STATIC_SIZE - 1;
-    Tcl_DStringSetLength(&data, length);
-
-    resultPtr = Tcl_GetObjResult(interp);
-
-    valueName = Tcl_GetStringFromObj(valueNameObj, &nameLen);
-    valueName = Tcl_WinUtfToTChar(valueName, nameLen, &buf);
-
-    result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL, &type,
-	    (BYTE *) Tcl_DStringValue(&data), &length);
-    if (result == ERROR_MORE_DATA) {
-        Tcl_DStringSetLength(&data, length);
-        result = (*regWinProcs->regQueryValueExProc)(key, valueName, NULL,
-		&type, (BYTE *) Tcl_DStringValue(&data), &length);
-    }
-    Tcl_DStringFree(&buf);
-    RegCloseKey(key);
-    if (result != ERROR_SUCCESS) {
-	Tcl_AppendStringsToObj(resultPtr, "unable to get value \"",
-		Tcl_GetString(valueNameObj), "\" from key \"",
-		Tcl_GetString(keyNameObj), "\": ", NULL);
-	AppendSystemError(interp, result);
-	Tcl_DStringFree(&data);
-	return TCL_ERROR;
-    }
-
-    /*
-     * If the data is a 32-bit quantity, store it as an integer object.  If it
-     * is a multi-string, store it as a list of strings.  For null-terminated
-     * strings, append up the to first null.  Otherwise, store it as a binary
-     * string.
-     */
-
-    if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) {
-	Tcl_SetIntObj(resultPtr, ConvertDWORD(type,
-		*((DWORD*) Tcl_DStringValue(&data))));
-    } else if (type == REG_MULTI_SZ) {
-	char *p = Tcl_DStringValue(&data);
-	char *end = Tcl_DStringValue(&data) + length;
-
-	/*
-	 * Multistrings are stored as an array of null-terminated strings,
-	 * terminated by two null characters.  Also do a bounds check in
-	 * case we get bogus data.
-	 */
- 
-	while (p < end 	&& ((regWinProcs->useWide) 
-		? *((Tcl_UniChar *)p) : *p) != 0) {
-	    Tcl_WinTCharToUtf((TCHAR *) p, -1, &buf);
-	    Tcl_ListObjAppendElement(interp, resultPtr,
-		    Tcl_NewStringObj(Tcl_DStringValue(&buf),
-			    Tcl_DStringLength(&buf)));
-	    if (regWinProcs->useWide) {
-		while (*((Tcl_UniChar *)p)++ != 0) {}
-	    } else {
-		while (*p++ != '\0') {}
-	    }
-	    Tcl_DStringFree(&buf);
-	}
-    } else if ((type == REG_SZ) || (type == REG_EXPAND_SZ)) {
-	Tcl_WinTCharToUtf((TCHAR *) Tcl_DStringValue(&data), -1, &buf);
-	Tcl_SetStringObj(resultPtr, Tcl_DStringValue(&buf),
-		Tcl_DStringLength(&buf));
-	Tcl_DStringFree(&buf);
-    } else {
-	/*
-	 * Save binary data as a byte array.
-	 */
-
-	Tcl_SetByteArrayObj(resultPtr, Tcl_DStringValue(&data), length);
-    }
-    Tcl_DStringFree(&data);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * GetValueNames --
- *
- *	This function enumerates the values of the a given key.  If
- *	the optional pattern is supplied, then only value names that
- *	match the pattern will be returned.
- *
- * Results:
- *	Returns the list of value names in the result object of the
- *	interpreter, or an error message on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-GetValueNames(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Key to enumerate. */
-    Tcl_Obj *patternObj)	/* Optional match pattern. */
-{
-    HKEY key;
-    Tcl_Obj *resultPtr;
-    DWORD index, size, maxSize, result;
-    Tcl_DString buffer, ds;
-    char *pattern, *name;
-
-    /*
-     * Attempt to open the key for enumeration.
-     */
-
-    if (OpenKey(interp, keyNameObj, KEY_QUERY_VALUE, 0, &key)
-	    != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    resultPtr = Tcl_GetObjResult(interp);
-
-    /*
-     * Query the key to determine the appropriate buffer size to hold the
-     * largest value name plus the terminating null.
-     */
-
-    result = (*regWinProcs->regQueryInfoKeyProc)(key, NULL, NULL, NULL, NULL,
-	    NULL, NULL, &index, &maxSize, NULL, NULL, NULL);
-    if (result != ERROR_SUCCESS) {
-	Tcl_AppendStringsToObj(resultPtr, "unable to query key \"",
-		Tcl_GetString(keyNameObj), "\": ", NULL);
-	AppendSystemError(interp, result);
-	RegCloseKey(key);
-	result = TCL_ERROR;
-	goto done;
-    }
-    maxSize++;
-
-
-    Tcl_DStringInit(&buffer);
-    Tcl_DStringSetLength(&buffer,
-	    (regWinProcs->useWide) ? maxSize*2 : maxSize);
-    index = 0;
-    result = TCL_OK;
-
-    if (patternObj) {
-	pattern = Tcl_GetString(patternObj);
-    } else {
-	pattern = NULL;
-    }
-
-    /*
-     * Enumerate the values under the given subkey until we get an error,
-     * indicating the end of the list.  Note that we need to reset size
-     * after each iteration because RegEnumValue smashes the old value.
-     */
-
-    size = maxSize;
-    while ((*regWinProcs->regEnumValueProc)(key, index,
-	    Tcl_DStringValue(&buffer), &size, NULL, NULL, NULL, NULL)
-	    == ERROR_SUCCESS) {
-
-	if (regWinProcs->useWide) {
-	    size *= 2;
-	}
-
-	Tcl_WinTCharToUtf((TCHAR *) Tcl_DStringValue(&buffer), size, &ds);
-	name = Tcl_DStringValue(&ds);
-	if (!pattern || Tcl_StringMatch(name, pattern)) {
-	    result = Tcl_ListObjAppendElement(interp, resultPtr,
-		    Tcl_NewStringObj(name, Tcl_DStringLength(&ds)));
-	    if (result != TCL_OK) {
-		Tcl_DStringFree(&ds);
-		break;
-	    }
-	}
-	Tcl_DStringFree(&ds);
-
-	index++;
-	size = maxSize;
-    }
-    Tcl_DStringFree(&buffer);
-
-    done:
-    RegCloseKey(key);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OpenKey --
- *
- *	This function opens the specified key.  This function is a
- *	simple wrapper around ParseKeyName and OpenSubKey.
- *
- * Results:
- *	Returns the opened key in the keyPtr argument and a Tcl
- *	result code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-OpenKey(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Key to open. */
-    REGSAM mode,		/* Access mode. */
-    int flags,			/* 0 or REG_CREATE. */
-    HKEY *keyPtr)		/* Returned HKEY. */
-{
-    char *keyName, *buffer, *hostName;
-    int length;
-    HKEY rootKey;
-    DWORD result;
-
-    keyName = Tcl_GetStringFromObj(keyNameObj, &length);
-    buffer = ckalloc(length + 1);
-    strcpy(buffer, keyName);
-
-    result = ParseKeyName(interp, buffer, &hostName, &rootKey, &keyName);
-    if (result == TCL_OK) {
-	result = OpenSubKey(hostName, rootKey, keyName, mode, flags, keyPtr);
-	if (result != ERROR_SUCCESS) {
-	    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
-	    Tcl_AppendToObj(resultPtr, "unable to open key: ", -1);
-	    AppendSystemError(interp, result);
-	    result = TCL_ERROR;
-	} else {
-	    result = TCL_OK;
-	}
-    }
-
-    ckfree(buffer);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * OpenSubKey --
- *
- *	This function opens a given subkey of a root key on the
- *	specified host.
- *
- * Results:
- *	Returns the opened key in the keyPtr and a Windows error code
- *	as the return value.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD
-OpenSubKey(
-    char *hostName,		/* Host to access, or NULL for local. */
-    HKEY rootKey,		/* Root registry key. */
-    char *keyName,		/* Subkey name. */
-    REGSAM mode,		/* Access mode. */
-    int flags,			/* 0 or REG_CREATE. */
-    HKEY *keyPtr)		/* Returned HKEY. */
-{
-    DWORD result;
-    Tcl_DString buf;
-
-    /*
-     * Attempt to open the root key on a remote host if necessary.
-     */
-
-    if (hostName) {
-	hostName = Tcl_WinUtfToTChar(hostName, -1, &buf);
-	result = (*regWinProcs->regConnectRegistryProc)(hostName, rootKey,
-		&rootKey);
-	Tcl_DStringFree(&buf);
-	if (result != ERROR_SUCCESS) {
-	    return result;
-	}
-    }
-
-    /*
-     * Now open the specified key with the requested permissions.  Note
-     * that this key must be closed by the caller.
-     */
-
-    keyName = Tcl_WinUtfToTChar(keyName, -1, &buf);
-    if (flags & REG_CREATE) {
-	DWORD create;
-	result = (*regWinProcs->regCreateKeyExProc)(rootKey, keyName, 0, "",
-		REG_OPTION_NON_VOLATILE, mode, NULL, keyPtr, &create);
-    } else {
-	result = (*regWinProcs->regOpenKeyExProc)(rootKey, keyName, 0, mode,
-		keyPtr);
-    }
-    Tcl_DStringFree(&buf);
-
-    /*
-     * Be sure to close the root key since we are done with it now.
-     */
-
-    if (hostName) {
-	RegCloseKey(rootKey);
-    }
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ParseKeyName --
- *
- *	This function parses a key name into the host, root, and subkey
- *	parts.
- *
- * Results:
- *	The pointers to the start of the host and subkey names are
- *	returned in the hostNamePtr and keyNamePtr variables.  The
- *	specified root HKEY is returned in rootKeyPtr.  Returns
- *	a standard Tcl result.
- *
- *
- * Side effects:
- *	Modifies the name string by inserting nulls.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ParseKeyName(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    char *name,
-    char **hostNamePtr,
-    HKEY *rootKeyPtr,
-    char **keyNamePtr)
-{
-    char *rootName;
-    int result, index;
-    Tcl_Obj *rootObj, *resultPtr = Tcl_GetObjResult(interp);
-
-    /*
-     * Split the key into host and root portions.
-     */
-
-    *hostNamePtr = *keyNamePtr = rootName = NULL;
-    if (name[0] == '\\') {
-	if (name[1] == '\\') {
-	    *hostNamePtr = name;
-	    for (rootName = name+2; *rootName != '\0'; rootName++) {
-		if (*rootName == '\\') {
-		    *rootName++ = '\0';
-		    break;
-		}
-	    }
-	}
-    } else {
-	rootName = name;
-    }
-    if (!rootName) {
-	Tcl_AppendStringsToObj(resultPtr, "bad key \"", name,
-		"\": must start with a valid root", NULL);
-	return TCL_ERROR;
-    }
-
-    /*
-     * Split the root into root and subkey portions.
-     */
-
-    for (*keyNamePtr = rootName; **keyNamePtr != '\0'; (*keyNamePtr)++) {
-	if (**keyNamePtr == '\\') {
-	    **keyNamePtr = '\0';
-	    (*keyNamePtr)++;
-	    break;
-	}
-    }
-
-    /*
-     * Look for a matching root name.
-     */
-
-    rootObj = Tcl_NewStringObj(rootName, -1);
-    result = Tcl_GetIndexFromObj(interp, rootObj, rootKeyNames, "root name",
-	    TCL_EXACT, &index);
-    Tcl_DecrRefCount(rootObj);
-    if (result != TCL_OK) {
-	return TCL_ERROR;
-    }
-    *rootKeyPtr = rootKeys[index];
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * RecursiveDeleteKey --
- *
- *	This function recursively deletes all the keys below a starting
- *	key.  Although Windows 95 does this automatically, we still need
- *	to do this for Windows NT.
- *
- * Results:
- *	Returns a Windows error code.
- *
- * Side effects:
- *	Deletes all of the keys and values below the given key.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD
-RecursiveDeleteKey(
-    HKEY startKey,		/* Parent of key to be deleted. */
-    char *keyName)		/* Name of key to be deleted in external
-				 * encoding, not UTF. */
-{
-    DWORD result, size, maxSize;
-    Tcl_DString subkey;
-    HKEY hKey;
-
-    /*
-     * Do not allow NULL or empty key name.
-     */
-
-    if (!keyName || *keyName == '\0') {
-	return ERROR_BADKEY;
-    }
-
-    result = (*regWinProcs->regOpenKeyExProc)(startKey, keyName, 0,
-	    KEY_ENUMERATE_SUB_KEYS | DELETE | KEY_QUERY_VALUE, &hKey);
-    if (result != ERROR_SUCCESS) {
-	return result;
-    }
-    result = (*regWinProcs->regQueryInfoKeyProc)(hKey, NULL, NULL, NULL, NULL,
-	    &maxSize, NULL, NULL, NULL, NULL, NULL, NULL);
-    maxSize++;
-    if (result != ERROR_SUCCESS) {
-	return result;
-    }
-
-    Tcl_DStringInit(&subkey);
-    Tcl_DStringSetLength(&subkey,
-	    (regWinProcs->useWide) ? maxSize * 2 : maxSize);
-
-    while (result == ERROR_SUCCESS) {
-	/*
-	 * Always get index 0 because key deletion changes ordering.
-	 */
-
-	size = maxSize;
-	result=(*regWinProcs->regEnumKeyExProc)(hKey, 0,
-		Tcl_DStringValue(&subkey), &size, NULL, NULL, NULL, NULL);
-	if (result == ERROR_NO_MORE_ITEMS) {
-	    result = (*regWinProcs->regDeleteKeyProc)(startKey, keyName);
-	    break;
-	} else if (result == ERROR_SUCCESS) {
-	    result = RecursiveDeleteKey(hKey, Tcl_DStringValue(&subkey));
-	}
-    }
-    Tcl_DStringFree(&subkey);
-    RegCloseKey(hKey);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SetValue --
- *
- *	This function sets the contents of a registry value.  If
- *	the key or value does not exist, it will be created.  If it
- *	does exist, then the data and type will be replaced.
- *
- * Results:
- *	Returns a normal Tcl result.
- *
- * Side effects:
- *	May create new keys or values.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SetValue(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    Tcl_Obj *keyNameObj,	/* Name of key. */
-    Tcl_Obj *valueNameObj,	/* Name of value to set. */
-    Tcl_Obj *dataObj,		/* Data to be written. */
-    Tcl_Obj *typeObj)		/* Type of data to be written. */
-{
-    DWORD type, result;
-    HKEY key;
-    int length;
-    char *valueName;
-    Tcl_Obj *resultPtr;
-    Tcl_DString nameBuf;
-
-    if (typeObj == NULL) {
-	type = REG_SZ;
-    } else if (Tcl_GetIndexFromObj(interp, typeObj, typeNames, "type",
-	    0, (int *) &type) != TCL_OK) {
-	if (Tcl_GetIntFromObj(NULL, typeObj, (int*) &type) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	Tcl_ResetResult(interp);
-    }
-    if (OpenKey(interp, keyNameObj, KEY_ALL_ACCESS, 1, &key) != TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    valueName = Tcl_GetStringFromObj(valueNameObj, &length);
-    valueName = Tcl_WinUtfToTChar(valueName, length, &nameBuf);
-    resultPtr = Tcl_GetObjResult(interp);
-
-    if (type == REG_DWORD || type == REG_DWORD_BIG_ENDIAN) {
-	DWORD value;
-	if (Tcl_GetIntFromObj(interp, dataObj, (int*) &value) != TCL_OK) {
-	    RegCloseKey(key);
-	    Tcl_DStringFree(&nameBuf);
-	    return TCL_ERROR;
-	}
-
-	value = ConvertDWORD(type, value);
-	result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type,
-		(BYTE*) &value, sizeof(DWORD));
-    } else if (type == REG_MULTI_SZ) {
-	Tcl_DString data, buf;
-	int objc, i;
-	Tcl_Obj **objv;
-
-	if (Tcl_ListObjGetElements(interp, dataObj, &objc, &objv) != TCL_OK) {
-	    RegCloseKey(key);
-	    Tcl_DStringFree(&nameBuf);
-	    return TCL_ERROR;
-	}
-
-	/*
-	 * Append the elements as null terminated strings.  Note that
-	 * we must not assume the length of the string in case there are
-	 * embedded nulls, which aren't allowed in REG_MULTI_SZ values.
-	 */
-
-	Tcl_DStringInit(&data);
-	for (i = 0; i < objc; i++) {
-	    Tcl_DStringAppend(&data, Tcl_GetString(objv[i]), -1);
-
-	    /*
-	     * Add a null character to separate this value from the next.
-	     * We accomplish this by growing the string by one byte.  Since the
-	     * DString always tacks on an extra null byte, the new byte will
-	     * already be set to null.
-	     */
-
-	    Tcl_DStringSetLength(&data, Tcl_DStringLength(&data)+1);
-	}
-
-	Tcl_WinUtfToTChar(Tcl_DStringValue(&data), Tcl_DStringLength(&data)+1,
-		&buf);
-	result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type,
-		(BYTE *) Tcl_DStringValue(&buf),
-		(DWORD) Tcl_DStringLength(&buf));
-	Tcl_DStringFree(&data);
-	Tcl_DStringFree(&buf);
-    } else if (type == REG_SZ || type == REG_EXPAND_SZ) {
-	Tcl_DString buf;
-	char *data = Tcl_GetStringFromObj(dataObj, &length);
-
-	data = Tcl_WinUtfToTChar(data, length, &buf);
-
-	/*
-	 * Include the null in the length, padding if needed for Unicode.
-	 */
-
-	if (regWinProcs->useWide) {
-	    Tcl_DStringSetLength(&buf, Tcl_DStringLength(&buf)+1);
-	}
-	length = Tcl_DStringLength(&buf) + 1;
-
-	result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type,
-		(BYTE*)data, length);
-	Tcl_DStringFree(&buf);
-    } else {
-	char *data;
-
-	/*
-	 * Store binary data in the registry.
-	 */
-
-	data = Tcl_GetByteArrayFromObj(dataObj, &length);
-	result = (*regWinProcs->regSetValueExProc)(key, valueName, 0, type,
-		(BYTE *)data, length);
-    }
-    Tcl_DStringFree(&nameBuf);
-    RegCloseKey(key);
-    if (result != ERROR_SUCCESS) {
-	Tcl_AppendToObj(resultPtr, "unable to set value: ", -1);
-	AppendSystemError(interp, result);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * AppendSystemError --
- *
- *	This routine formats a Windows system error message and places
- *	it into the interpreter result.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-AppendSystemError(
-    Tcl_Interp *interp,		/* Current interpreter. */
-    DWORD error)		/* Result code from error. */
-{
-    int length;
-    WCHAR *wMsgPtr;
-    char *msg;
-    char id[TCL_INTEGER_SPACE], msgBuf[24 + TCL_INTEGER_SPACE];
-    Tcl_DString ds;
-    Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
-
-    length = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM
-	    | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, error,
-	    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (WCHAR *) &wMsgPtr,
-	    0, NULL);
-    if (length == 0) {
-	char *msgPtr;
-
-	length = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM
-		| FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, error,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) &msgPtr,
-		0, NULL);
-	if (length > 0) {
-	    wMsgPtr = (WCHAR *) LocalAlloc(LPTR, (length + 1) * sizeof(WCHAR));
-	    MultiByteToWideChar(CP_ACP, 0, msgPtr, length + 1, wMsgPtr,
-		    length + 1);
-	    LocalFree(msgPtr);
-	}
-    }
-    if (length == 0) {
-	if (error == ERROR_CALL_NOT_IMPLEMENTED) {
-	    msg = "function not supported under Win32s";
-	} else {
-	    sprintf(msgBuf, "unknown error: %d", error);
-	    msg = msgBuf;
-	}
-    } else {
-	Tcl_Encoding encoding;
-
-	encoding = Tcl_GetEncoding(NULL, "unicode");
-	Tcl_ExternalToUtfDString(encoding, (char *) wMsgPtr, -1, &ds);
-	Tcl_FreeEncoding(encoding);
-	LocalFree(wMsgPtr);
-
-	msg = Tcl_DStringValue(&ds);
-	length = Tcl_DStringLength(&ds);
-
-	/*
-	 * Trim the trailing CR/LF from the system message.
-	 */
-	if (msg[length-1] == '\n') {
-	    msg[--length] = 0;
-	}
-	if (msg[length-1] == '\r') {
-	    msg[--length] = 0;
-	}
-    }
-
-    sprintf(id, "%d", error);
-    Tcl_SetErrorCode(interp, "WINDOWS", id, msg, (char *) NULL);
-    Tcl_AppendToObj(resultPtr, msg, length);
-
-    if (length != 0) {
-	Tcl_DStringFree(&ds);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ConvertDWORD --
- *
- *	This function determines whether a DWORD needs to be byte
- *	swapped, and returns the appropriately swapped value.
- *
- * Results:
- *	Returns a converted DWORD.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD
-ConvertDWORD(
-    DWORD type,			/* Either REG_DWORD or REG_DWORD_BIG_ENDIAN */
-    DWORD value)		/* The value to be converted. */
-{
-    DWORD order = 1;
-    DWORD localType;
-
-    /*
-     * Check to see if the low bit is in the first byte.
-     */
-
-    localType = (*((char*)(&order)) == 1) ? REG_DWORD : REG_DWORD_BIG_ENDIAN;
-    return (type != localType) ? SWAPLONG(value) : value;
-}
diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c
deleted file mode 100644
index 733da67..0000000
--- a/win/tclWinSerial.c
+++ /dev/null
@@ -1,1401 +0,0 @@
-/* 
- * Tclwinserial.c --
- *
- *	This file implements the Windows-specific serial port functions,
- *	and the "serial" channel driver.
- *
- * Copyright (c) 1999 by Scriptics Corp.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinSerial.c,v 1.2 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-#include <dos.h>
-#include <fcntl.h>
-#include <io.h>
-#include <sys/stat.h>
-
-/*
- * The following variable is used to tell whether this module has been
- * initialized.
- */
-
-static int initialized = 0;
-
-/*
- * The serialMutex locks around access to the initialized variable, and it is
- * used to protect background threads from being terminated while they are
- * using APIs that hold locks.
- */
-
-TCL_DECLARE_MUTEX(serialMutex)
-
-/*
- * Bit masks used in the flags field of the SerialInfo structure below.
- */
-
-#define SERIAL_PENDING	(1<<0)	/* Message is pending in the queue. */
-#define SERIAL_ASYNC	(1<<1)	/* Channel is non-blocking. */
-
-/*
- * Bit masks used in the sharedFlags field of the SerialInfo structure below.
- */
-
-#define SERIAL_EOF	 (1<<2)  /* Serial has reached EOF. */
-#define SERIAL_EXTRABYTE (1<<3)  /* Extra byte consumed while waiting for data */
-/*
- * This structure describes per-instance data for a serial based channel.
- */
-
-typedef struct SerialInfo {
-    HANDLE handle;
-    struct SerialInfo *nextPtr;	/* Pointer to next registered serial. */
-    Tcl_Channel channel;	/* Pointer to channel structure. */
-    int validMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which operations are valid on the file. */
-    int watchMask;		/* OR'ed combination of TCL_READABLE,
-				 * TCL_WRITABLE, or TCL_EXCEPTION: indicates
-				 * which events should be reported. */
-    int flags;			/* State flags, see above for a list. */
-    Tcl_ThreadId threadId;	/* Thread to which events should be reported.
-				 * This value is used by the reader/writer
-				 * threads. */
-    HANDLE writeThread;		/* Handle to writer thread. */
-    HANDLE readThread;		/* Handle to reader thread. */
-    HANDLE writable;		/* Manual-reset event to signal when the
-				 * writer thread has finished waiting for
-				 * the current buffer to be written. */
-    HANDLE readable;		/* Manual-reset event to signal when the
-				 * reader thread has finished waiting for
-				 * input. */
-    HANDLE startWriter;		/* Auto-reset event used by the main thread to
-				 * signal when the writer thread should attempt
-				 * to write to the serial. */
-    HANDLE startReader;		/* Auto-reset event used by the main thread to
-				 * signal when the reader thread should attempt
-				 * to read from the serial. */
-    DWORD writeError;		/* An error caused by the last background
-				 * write.  Set to 0 if no error has been
-				 * detected.  This word is shared with the
-				 * writer thread so access must be
-				 * synchronized with the writable object.
-				 */
-    char *writeBuf;		/* Current background output buffer.
-				 * Access is synchronized with the writable
-				 * object. */
-    int writeBufLen;		/* Size of write buffer.  Access is
-				 * synchronized with the writable
-				 * object. */
-    int toWrite;		/* Current amount to be written.  Access is
-				 * synchronized with the writable object. */
-    int readFlags;		/* Flags that are shared with the reader
-				 * thread.  Access is synchronized with the
-				 * readable object.  */
-    int writeFlags;		/* Flags that are shared with the writer
-				 * thread.  Access is synchronized with the
-				 * readable object.  */
-    int readyMask;              /* Events that need to be checked on. */
-    char extraByte;
-    
-} SerialInfo;
-
-typedef struct ThreadSpecificData {
-    /*
-     * The following pointer refers to the head of the list of serials
-     * that are being watched for file events.
-     */
-    
-    SerialInfo *firstSerialPtr;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * serial events are generated.
- */
-
-typedef struct SerialEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    SerialInfo *infoPtr;	/* Pointer to serial info structure.  Note
-				 * that we still have to verify that the
-				 * serial exists before dereferencing this
-				 * pointer. */
-} SerialEvent;
-
-/*
- * Declarations for functions used only in this file.
- */
-
-static int		SerialBlockProc(ClientData instanceData, int mode);
-static void		SerialCheckProc(ClientData clientData, int flags);
-static int		SerialCloseProc(ClientData instanceData,
-			    Tcl_Interp *interp);
-static int		SerialEventProc(Tcl_Event *evPtr, int flags);
-static void		SerialExitHandler(ClientData clientData);
-static int		SerialGetHandleProc(ClientData instanceData,
-			    int direction, ClientData *handlePtr);
-static ThreadSpecificData *SerialInit(void);
-static int		SerialInputProc(ClientData instanceData, char *buf,
-			    int toRead, int *errorCode);
-static int		SerialOutputProc(ClientData instanceData, char *buf,
-			    int toWrite, int *errorCode);
-static DWORD WINAPI	SerialReaderThread(LPVOID arg);
-static void		SerialSetupProc(ClientData clientData, int flags);
-static void		SerialWatchProc(ClientData instanceData, int mask);
-static DWORD WINAPI	SerialWriterThread(LPVOID arg);
-static void		ProcExitHandler(ClientData clientData);
-static int		WaitForRead(SerialInfo *infoPtr, int blocking);
-static int	     SerialGetOptionProc _ANSI_ARGS_((ClientData instanceData, 
-			    Tcl_Interp *interp, char *optionName,
-			    Tcl_DString *dsPtr));
-static int	     SerialSetOptionProc _ANSI_ARGS_((ClientData instanceData,
-			    Tcl_Interp *interp, char *optionName, 
-			    char *value));
-
-/*
- * This structure describes the channel type structure for command serial
- * based IO.
- */
-
-static Tcl_ChannelType serialChannelType = {
-    "serial",			/* Type name. */
-    SerialBlockProc,	        /* Set blocking or non-blocking mode.*/
-    SerialCloseProc,		/* Close proc. */
-    SerialInputProc,		/* Input proc. */
-    SerialOutputProc,		/* Output proc. */
-    NULL,			/* Seek proc. */
-    SerialSetOptionProc,	/* Set option proc. */
-    SerialGetOptionProc,	/* Get option proc. */
-    SerialWatchProc,		/* Set up notifier to watch the channel. */
-    SerialGetHandleProc,	/* Get an OS handle from channel. */
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialInit --
- *
- *	This function initializes the static variables for this file.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Creates a new event source.
- *
- *----------------------------------------------------------------------
- */
-
-static ThreadSpecificData *
-SerialInit()
-{
-    ThreadSpecificData *tsdPtr;
-
-    /*
-     * Check the initialized flag first, then check it again in the mutex.
-     * This is a speed enhancement.
-     */
-    
-    if (!initialized) {
-	Tcl_MutexLock(&serialMutex);
-	if (!initialized) {
-	    initialized = 1;
-	    Tcl_CreateExitHandler(ProcExitHandler, NULL);
-	}
-	Tcl_MutexUnlock(&serialMutex);
-    }
-
-    tsdPtr = (ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->firstSerialPtr = NULL;
-	Tcl_CreateEventSource(SerialSetupProc, SerialCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(SerialExitHandler, NULL);
-    }
-    return tsdPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialExitHandler --
- *
- *	This function is called to cleanup the serial module before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Removes the serial event source.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SerialExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_DeleteEventSource(SerialSetupProc, SerialCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ProcExitHandler --
- *
- *	This function is called to cleanup the process list before
- *	Tcl is unloaded.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Resets the process list.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-ProcExitHandler(
-    ClientData clientData)	/* Old window proc */
-{
-    Tcl_MutexLock(&serialMutex);
-    initialized = 0;
-    Tcl_MutexUnlock(&serialMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-SerialSetupProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    SerialInfo *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    int block = 1;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Look to see if any events are already pending.  If they are, poll.
-     */
-
-    for (infoPtr = tsdPtr->firstSerialPtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-		block = 0;
-	    }
-	}
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    if (WaitForRead(infoPtr, 0) >= 0) {
-		block = 0;
-	    }
-	}
-    }
-    if (!block) {
-	Tcl_SetMaxBlockTime(&blockTime);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the serial
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SerialCheckProc(
-    ClientData data,		/* Not used. */
-    int flags)			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    SerialInfo *infoPtr;
-    SerialEvent *evPtr;
-    int needEvent;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready serials that don't already have events
-     * queued.
-     */
-
-    for (infoPtr = tsdPtr->firstSerialPtr; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->flags & SERIAL_PENDING) {
-	    continue;
-	}
-	
-	/*
-	 * Queue an event if the serial is signaled for reading or writing.
-	 */
-
-	needEvent = 0;
-	if (infoPtr->watchMask & TCL_WRITABLE) {
-	    if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-		needEvent = 1;
-	    }
-	}
-	
-	if (infoPtr->watchMask & TCL_READABLE) {
-	    if (WaitForRead(infoPtr, 0) >= 0) {
-		needEvent = 1;
-	    }
-	}
-
-	if (needEvent) {
-	    infoPtr->flags |= SERIAL_PENDING;
-	    evPtr = (SerialEvent *) ckalloc(sizeof(SerialEvent));
-	    evPtr->header.proc = SerialEventProc;
-	    evPtr->infoPtr = infoPtr;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialBlockProc --
- *
- *	Set blocking or non-blocking mode on channel.
- *
- * Results:
- *	0 if successful, errno when failed.
- *
- * Side effects:
- *	Sets the device into blocking or non-blocking mode.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialBlockProc(
-    ClientData instanceData,	/* Instance data for channel. */
-    int mode)			/* TCL_MODE_BLOCKING or
-                                 * TCL_MODE_NONBLOCKING. */
-{
-    SerialInfo *infoPtr = (SerialInfo *) instanceData;
-    
-    /*
-     * Serial IO on Windows can not be switched between blocking & nonblocking,
-     * hence we have to emulate the behavior. This is done in the input
-     * function by checking against a bit in the state. We set or unset the
-     * bit here to cause the input function to emulate the correct behavior.
-     */
-
-    if (mode == TCL_MODE_NONBLOCKING) {
-	infoPtr->flags |= SERIAL_ASYNC;
-    } else {
-	infoPtr->flags &= ~(SERIAL_ASYNC);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialCloseProc --
- *
- *	Closes a serial based IO channel.
- *
- * Results:
- *	0 on success, errno otherwise.
- *
- * Side effects:
- *	Closes the physical channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialCloseProc(
-    ClientData instanceData,	/* Pointer to SerialInfo structure. */
-    Tcl_Interp *interp)		/* For error reporting. */
-{
-    SerialInfo *serialPtr = (SerialInfo *) instanceData;
-    int errorCode, result = 0;
-    SerialInfo *infoPtr, **nextPtrPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    errorCode = 0;
-    if (serialPtr->readThread) {
-	/*
-	 * Forcibly terminate the background thread.  We cannot rely on the
-	 * thread to cleanly terminate itself because we have no way of
-	 * closing the handle without blocking in the case where the
-	 * thread is in the middle of an I/O operation.  Note that we need
-	 * to guard against terminating the thread while it is in the
-	 * middle of Tcl_ThreadAlert because it won't be able to release
-	 * the notifier lock.
-	 */
-
-	Tcl_MutexLock(&serialMutex);
-	TerminateThread(serialPtr->readThread, 0);
-	Tcl_MutexUnlock(&serialMutex);
-
-	/*
-	 * Wait for the thread to terminate.  This ensures that we are
-	 * completely cleaned up before we leave this function. 
-	 */
-
-	WaitForSingleObject(serialPtr->readThread, INFINITE);
-	CloseHandle(serialPtr->readThread);
-	CloseHandle(serialPtr->readable);
-	CloseHandle(serialPtr->startReader);
-	serialPtr->readThread = NULL;
-    }
-    serialPtr->validMask &= ~TCL_READABLE;
-
-    if (serialPtr->writeThread) {
-	WaitForSingleObject(serialPtr->writable, INFINITE);
-
-	/*
-	 * Forcibly terminate the background thread.  We cannot rely on the
-	 * thread to cleanly terminate itself because we have no way of
-	 * closing the handle without blocking in the case where the
-	 * thread is in the middle of an I/O operation.  Note that we need
-	 * to guard against terminating the thread while it is in the
-	 * middle of Tcl_ThreadAlert because it won't be able to release
-	 * the notifier lock.
-	 */
-
-	Tcl_MutexLock(&serialMutex);
-	TerminateThread(serialPtr->writeThread, 0);
-	Tcl_MutexUnlock(&serialMutex);
-
-	/*
-	 * Wait for the thread to terminate.  This ensures that we are
-	 * completely cleaned up before we leave this function. 
-	 */
-
-	WaitForSingleObject(serialPtr->writeThread, INFINITE);
-	CloseHandle(serialPtr->writeThread);
-	CloseHandle(serialPtr->writable);
-	CloseHandle(serialPtr->startWriter);
-	serialPtr->writeThread = NULL;
-    }
-    serialPtr->validMask &= ~TCL_WRITABLE;
-
-    /*
-     * Don't close the Win32 handle if the handle is a standard channel
-     * during the exit process.  Otherwise, one thread may kill the stdio
-     * of another.
-     */
-
-    if (!TclInExit() 
-	    || ((GetStdHandle(STD_INPUT_HANDLE) != serialPtr->handle)
-		&& (GetStdHandle(STD_OUTPUT_HANDLE) != serialPtr->handle)
-		&& (GetStdHandle(STD_ERROR_HANDLE) != serialPtr->handle))) {
-	if (CloseHandle(serialPtr->handle) == FALSE) {
-	    TclWinConvertError(GetLastError());
-	    errorCode = errno;
-	}
-    }
-    
-    serialPtr->watchMask &= serialPtr->validMask;
-
-    /*
-     * Remove the file from the list of watched files.
-     */
-
-    for (nextPtrPtr = &(tsdPtr->firstSerialPtr), infoPtr = *nextPtrPtr;
-	    infoPtr != NULL;
-	    nextPtrPtr = &infoPtr->nextPtr, infoPtr = *nextPtrPtr) {
-	if (infoPtr == (SerialInfo *)serialPtr) {
-	    *nextPtrPtr = infoPtr->nextPtr;
-	    break;
-	}
-    }
-
-    /*
-     * Wrap the error file into a channel and give it to the cleanup
-     * routine. 
-     */
-
-    if (serialPtr->writeBuf != NULL) {
-	ckfree(serialPtr->writeBuf);
-	serialPtr->writeBuf = NULL;
-    }
-
-    ckfree((char*) serialPtr);
-
-    if (errorCode == 0) {
-        return result;
-    }
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialInputProc --
- *
- *	Reads input from the IO channel into the buffer given. Returns
- *	count of how many bytes were actually read, and an error indication.
- *
- * Results:
- *	A count of how many bytes were read is returned and an error
- *	indication is returned in an output argument.
- *
- * Side effects:
- *	Reads input from the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialInputProc(
-    ClientData instanceData,		/* Serial state. */
-    char *buf,				/* Where to store data read. */
-    int bufSize,			/* How much space is available
-                                         * in the buffer? */
-    int *errorCode)			/* Where to store error code. */
-{
-    SerialInfo *infoPtr = (SerialInfo *) instanceData;
-    DWORD bytesRead = 0;
-    int result;
-    DWORD err;
-
-    *errorCode = 0;
-
-    /*
-     * Synchronize with the reader thread.
-     */
-    
-    result = WaitForRead(infoPtr, (infoPtr->flags & SERIAL_ASYNC) ? 0 : 1);
-    
-    /*
-     * If an error occurred, return immediately.
-     */
-    
-    if (result == -1) {
-	*errorCode = errno;
-	return -1;
-    }
-
-    if (infoPtr->readFlags & SERIAL_EXTRABYTE) {
-
-	/*
-	 * If a byte was consumed waiting, then put it in the buffer.
-	 */
-
-	*buf = infoPtr->extraByte;
-	infoPtr->readFlags &= ~SERIAL_EXTRABYTE;
-	buf++;
-	bufSize--;
-	bytesRead = 1;
-
-	if (result == 0) {
-	    return bytesRead;
-	}
-    }
-
-    if (ReadFile(infoPtr->handle, (LPVOID) buf, (DWORD) bufSize, &bytesRead,
-		 NULL) == FALSE) {
-	err = GetLastError();
-	if (err != ERROR_IO_PENDING) {
-	    goto error;
-	}
-    }
-	
-    return bytesRead;
-	
-    error:
-    TclWinConvertError(GetLastError());
-    *errorCode = errno;
-    return -1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialOutputProc --
- *
- *	Writes the given output on the IO channel. Returns count of how
- *	many characters were actually written, and an error indication.
- *
- * Results:
- *	A count of how many characters were written is returned and an
- *	error indication is returned in an output argument.
- *
- * Side effects:
- *	Writes output on the actual channel.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialOutputProc(
-    ClientData instanceData,		/* Serial state. */
-    char *buf,				/* The data buffer. */
-    int toWrite,			/* How many bytes to write? */
-    int *errorCode)			/* Where to store error code. */
-{
-    SerialInfo *infoPtr = (SerialInfo *) instanceData;
-    DWORD bytesWritten, timeout, err;
-
-    *errorCode = 0;
-    timeout = (infoPtr->flags & SERIAL_ASYNC) ? 0 : INFINITE;
-    if (WaitForSingleObject(infoPtr->writable, timeout) == WAIT_TIMEOUT) {
-	/*
-	 * The writer thread is blocked waiting for a write to complete
-	 * and the channel is in non-blocking mode.
-	 */
-
-	errno = EAGAIN;
-	goto error;
-    }
-    
-    /*
-     * Check for a background error on the last write.
-     */
-
-    if (infoPtr->writeError) {
-	TclWinConvertError(infoPtr->writeError);
-	infoPtr->writeError = 0;
-	goto error;
-    }
-
-    if (infoPtr->flags & SERIAL_ASYNC) {
-	/*
-	 * The serial is non-blocking, so copy the data into the output
-	 * buffer and restart the writer thread.
-	 */
-
-	if (toWrite > infoPtr->writeBufLen) {
-	    /*
-	     * Reallocate the buffer to be large enough to hold the data.
-	     */
-
-	    if (infoPtr->writeBuf) {
-		ckfree(infoPtr->writeBuf);
-	    }
-	    infoPtr->writeBufLen = toWrite;
-	    infoPtr->writeBuf = ckalloc(toWrite);
-	}
-	memcpy(infoPtr->writeBuf, buf, toWrite);
-	infoPtr->toWrite = toWrite;
-	ResetEvent(infoPtr->writable);
-	SetEvent(infoPtr->startWriter);
-	bytesWritten = toWrite;
-    } else {
-	/*
-	 * In the blocking case, just try to write the buffer directly.
-	 * This avoids an unnecessary copy.
-	 */
-	if (WriteFile(infoPtr->handle, (LPVOID) buf, (DWORD) toWrite,
-		&bytesWritten, NULL) == FALSE) {
-	    err = GetLastError();
-	    if (err != ERROR_IO_PENDING) {
-		TclWinConvertError(GetLastError());
-		goto error;
-	    }
-	}
-    }
-    return bytesWritten;
-
-    error:
-    *errorCode = errno;
-    return -1;
-
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialEventProc --
- *
- *	This function is invoked by Tcl_ServiceEvent when a file event
- *	reaches the front of the event queue.  This procedure invokes
- *	Tcl_NotifyChannel on the serial.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the notifier callback does.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialEventProc(
-    Tcl_Event *evPtr,		/* Event to service. */
-    int flags)			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    SerialEvent *serialEvPtr = (SerialEvent *)evPtr;
-    SerialInfo *infoPtr;
-    int mask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Search through the list of watched serials for the one whose handle
-     * matches the event.  We do this rather than simply dereferencing
-     * the handle in the event so that serials can be deleted while the
-     * event is in the queue.
-     */
-
-    for (infoPtr = tsdPtr->firstSerialPtr; infoPtr != NULL;
-	    infoPtr = infoPtr->nextPtr) {
-	if (serialEvPtr->infoPtr == infoPtr) {
-	    infoPtr->flags &= ~(SERIAL_PENDING);
-	    break;
-	}
-    }
-    /*
-     * Remove stale events.
-     */
-
-    if (!infoPtr) {
-	return 1;
-    }
-
-    /*
-     * Check to see if the serial is readable.  Note
-     * that we can't tell if a serial is writable, so we always report it
-     * as being writable unless we have detected EOF.
-     */
-
-    mask = 0;
-    if (infoPtr->watchMask & TCL_WRITABLE) {
-	if (WaitForSingleObject(infoPtr->writable, 0) != WAIT_TIMEOUT) {
-	  mask = TCL_WRITABLE;
-	}
-    }
-
-    if (infoPtr->watchMask & TCL_READABLE) {
-	if (WaitForRead(infoPtr, 0) >= 0) {
-	    if (infoPtr->readFlags & SERIAL_EOF) {
-		mask = TCL_READABLE;
-	    } else {
-		mask |= TCL_READABLE;
-	    }
-	} 
-    }
-
-    /*
-     * Inform the channel of the events.
-     */
-
-    Tcl_NotifyChannel(infoPtr->channel, infoPtr->watchMask & mask);
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialWatchProc --
- *
- *	Called by the notifier to set up to watch for events on this
- *	channel.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SerialWatchProc(
-    ClientData instanceData,		/* Serial state. */
-    int mask)				/* What events to watch for, OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    SerialInfo **nextPtrPtr, *ptr;
-    SerialInfo *infoPtr = (SerialInfo *) instanceData;
-    int oldMask = infoPtr->watchMask;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Since the file is always ready for events, we set the block time
-     * to zero so we will poll.
-     */
-
-    infoPtr->watchMask = mask & infoPtr->validMask;
-    if (infoPtr->watchMask) {
-	Tcl_Time blockTime = { 0, 0 };
-	if (!oldMask) {
-	    infoPtr->nextPtr = tsdPtr->firstSerialPtr;
-	    tsdPtr->firstSerialPtr = infoPtr;
-	}
-	Tcl_SetMaxBlockTime(&blockTime);
-    } else {
-	if (oldMask) {
-	    /*
-	     * Remove the serial port from the list of watched serial ports.
-	     */
-
-	    for (nextPtrPtr = &(tsdPtr->firstSerialPtr), ptr = *nextPtrPtr;
-		 ptr != NULL;
-		 nextPtrPtr = &ptr->nextPtr, ptr = *nextPtrPtr) {
-		if (infoPtr == ptr) {
-		    *nextPtrPtr = ptr->nextPtr;
-		    break;
-		}
-	    }
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialGetHandleProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve OS handles from
- *	inside a command serial port based channel.
- *
- * Results:
- *	Returns TCL_OK with the fd in handlePtr, or TCL_ERROR if
- *	there is no handle for the specified direction. 
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SerialGetHandleProc(
-    ClientData instanceData,	/* The serial state. */
-    int direction,		/* TCL_READABLE or TCL_WRITABLE */
-    ClientData *handlePtr)	/* Where to store the handle.  */
-{
-    SerialInfo *infoPtr = (SerialInfo *) instanceData;
-
-    *handlePtr = (ClientData) infoPtr->handle;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForRead --
- *
- *	Wait until some data is available, the serial is at
- *	EOF or the reader thread is blocked waiting for data (if the
- *	channel is in non-blocking mode).
- *
- * Results:
- *	Returns 1 if serial is readable.  Returns 0 if there is no data
- *	on the serial, but there is buffered data.  Returns -1 if an
- *	error occurred.  If an error occurred, the threads may not
- *	be synchronized.
- *
- * Side effects:
- *	Updates the shared state flags and may consume 1 byte of data
- *	from the serial.  If no error occurred, the reader thread is
- *	blocked waiting for a signal from the main thread.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForRead(
-    SerialInfo *infoPtr,	/* Serial state. */
-    int blocking)		/* Indicates whether call should be
-				 * blocking or not. */
-{
-    DWORD timeout, errors;
-    HANDLE *handle = infoPtr->handle;
-    COMSTAT stat;
-    
-    while (1) {
-	/*
-	 * Synchronize with the reader thread.
-	 */
-	
-	timeout = blocking ? INFINITE : 0;
-	if (WaitForSingleObject(infoPtr->readable, timeout) == WAIT_TIMEOUT) {
-	    /*
-	     * The reader thread is blocked waiting for data and the channel
-	     * is in non-blocking mode.
-	     */
-	    
-	    errno = EAGAIN;
-	    return -1;
-	}
-	
-	/*
-	 * At this point, the two threads are synchronized, so it is safe
-	 * to access shared state.  This code is not called in the ReaderThread
-	 * in blocking mode, so it needs to be checked here.
-	 */
-
-	/*
-	 * If the serial has hit EOF, it is always readable.
-	 */
-    
-	if (infoPtr->readFlags & SERIAL_EOF) {
-	    return 1;
-	}
-	
-	if (ClearCommError(infoPtr->handle, &errors, &stat)) {
-	    /*
-	     * If there are errors, then signal an I/O error.
-	     */
-
-	    if (errors != 0) {
-		errno = EIO;
-		return -1;
-	    }
-	}
-	
-	/*
-	 * If data is in the queue return 1
-	 */
-	
-	if (stat.cbInQue != 0) {
-	    return 1;
-	}
-
-	/*
-	 * if there is an extra byte that was consumed while
-	 * waiting, but no data in the queue, return 0
-	 */
-	
-	if (infoPtr->readFlags & SERIAL_EXTRABYTE) {
-	    return 0;
-	}
-	    
-	ResetEvent(infoPtr->readable);
-	SetEvent(infoPtr->startReader);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialReaderThread --
- *
- *	This function runs in a separate thread and waits for input
- *	to become available on a serial.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Signals the main thread when input become available.  May
- *	cause the main thread to wake up by posting a message.  May
- *	consume one byte from the serial for each wait operation.
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-SerialReaderThread(LPVOID arg)
-{
-    SerialInfo *infoPtr = (SerialInfo *)arg;
-    HANDLE *handle = infoPtr->handle;
-    DWORD mask = EV_RXCHAR;
-    DWORD count;
-    
-    for (;;) {
-	/*
-	 * Wait for the main thread to signal before attempting to wait.
-	 */
-
-	WaitForSingleObject(infoPtr->startReader, INFINITE);
-
-	/*
-	 * Try waiting for a Comm event.
-	 */
-	
-	WaitCommEvent(handle, NULL, NULL);
-	
-
-	/*
-	 * try to read one byte
-	 */
-	
-	if (ReadFile(handle, &(infoPtr->extraByte), 1, &count, NULL)
-		!= FALSE) {
-
-	    /*
-	     * one byte was consumed while waiting to read, keep it
-	     */
-
-	    if (count != 0) {
-		infoPtr->readFlags |= SERIAL_EXTRABYTE;
-	    }
-
-	} else {
-            /*
-	     * There is an error, signal an EOF.
-	     */
-	    
-	    infoPtr->readFlags |= SERIAL_EOF;
-	}
-
-	/*
-	 * Signal the main thread by signalling the readable event and
-	 * then waking up the notifier thread.
-	 */
-
-	SetEvent(infoPtr->readable);
-
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&serialMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&serialMutex);
-    }
-    return 0;			/* NOT REACHED */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialWriterThread --
- *
- *	This function runs in a separate thread and writes data
- *	onto a serial.
- *
- * Results:
- *	Always returns 0.
- *
- * Side effects:
- *	Signals the main thread when an output operation is completed.
- *	May cause the main thread to wake up by posting a message.  
- *
- *----------------------------------------------------------------------
- */
-
-static DWORD WINAPI
-SerialWriterThread(LPVOID arg)
-{
-
-    SerialInfo *infoPtr = (SerialInfo *)arg;
-    HANDLE *handle = infoPtr->handle;
-    DWORD count, toWrite, err;
-    char *buf;
-
-    for (;;) {
-	/*
-	 * Wait for the main thread to signal before attempting to write.
-	 */
-
-	WaitForSingleObject(infoPtr->startWriter, INFINITE);
-
-	buf = infoPtr->writeBuf;
-	toWrite = infoPtr->toWrite;
-
-	/*
-	 * Loop until all of the bytes are written or an error occurs.
-	 */
-
-	while (toWrite > 0) {
-	    if (WriteFile(handle, (LPVOID) buf, (DWORD) toWrite,
-			  &count, NULL) == FALSE) {
-		err = GetLastError();
-		if (err != ERROR_IO_PENDING) {
-		    TclWinConvertError(GetLastError());
-		    infoPtr->writeError = err;
-		    break;
-		}
-	    } else {
-		toWrite -= count;
-		buf += count;
-	    }
-	}
-	
-	/*
-	 * Signal the main thread by signalling the writable event and
-	 * then waking up the notifier thread.
-	 */
-
-	SetEvent(infoPtr->writable);
-
-	/*
-	 * Alert the foreground thread.  Note that we need to treat this like
-	 * a critical section so the foreground thread does not terminate
-	 * this thread while we are holding a mutex in the notifier code.
-	 */
-
-	Tcl_MutexLock(&serialMutex);
-	Tcl_ThreadAlert(infoPtr->threadId);
-	Tcl_MutexUnlock(&serialMutex);
-    }
-    return 0;			/* NOT REACHED */
-}
-
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinOpenSerialChannel --
- *
- *	Constructs a Serial port channel for the specified standard OS handle.
- *      This is a helper function to break up the construction of 
- *      channels into File, Console, or Serial.
- *
- * Results:
- *	Returns the new channel, or NULL.
- *
- * Side effects:
- *	May open the channel
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-TclWinOpenSerialChannel(handle, channelName, permissions)
-    HANDLE handle;
-    char *channelName;
-    int permissions;
-{
-    SerialInfo *infoPtr;
-    COMMTIMEOUTS cto;
-    ThreadSpecificData *tsdPtr;
-    DWORD id;
-
-    tsdPtr = SerialInit();
-
-    SetCommMask(handle, EV_RXCHAR);
-    SetupComm(handle, 4096, 4096);
-    PurgeComm(handle, PURGE_TXABORT | PURGE_RXABORT | PURGE_TXCLEAR
-	      | PURGE_RXCLEAR);
-    cto.ReadIntervalTimeout = MAXDWORD;
-    cto.ReadTotalTimeoutMultiplier = MAXDWORD;
-    cto.ReadTotalTimeoutConstant = 1;
-    cto.WriteTotalTimeoutMultiplier = 0;
-    cto.WriteTotalTimeoutConstant = 0;
-    SetCommTimeouts(handle, &cto);
-    
-    infoPtr = (SerialInfo *) ckalloc((unsigned) sizeof(SerialInfo));
-    memset(infoPtr, 0, sizeof(SerialInfo));
-    
-    infoPtr->validMask = permissions;
-    infoPtr->handle = handle;
-	
-    /*
-     * Use the pointer to keep the channel names unique, in case
-     * the handles are shared between multiple channels (stdin/stdout).
-     */
-
-    wsprintfA(channelName, "file%lx", (int) infoPtr);
-	
-    infoPtr->channel = Tcl_CreateChannel(&serialChannelType, channelName,
-            (ClientData) infoPtr, permissions);
-	
-
-    infoPtr->threadId = Tcl_GetCurrentThread();
-    
-    if (permissions & TCL_READABLE) {
-	infoPtr->readable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	infoPtr->startReader = CreateEvent(NULL, FALSE, FALSE, NULL);
-	infoPtr->readThread = CreateThread(NULL, 8000, SerialReaderThread,
-	        infoPtr, 0, &id);
-    }
-    if (permissions & TCL_WRITABLE) {
-	infoPtr->writable = CreateEvent(NULL, TRUE, TRUE, NULL);
-	infoPtr->startWriter = CreateEvent(NULL, FALSE, FALSE, NULL);
-	infoPtr->writeThread = CreateThread(NULL, 8000, SerialWriterThread,
-	        infoPtr, 0, &id);
-    }
-
-    /*
-     * Files have default translation of AUTO and ^Z eof char, which
-     * means that a ^Z will be accepted as EOF when reading.
-     */
-    
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto");
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "\032 {}");
-
-    return infoPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialSetOptionProc --
- *
- *	Sets an option on a channel.
- *
- * Results:
- *	A standard Tcl result. Also sets the interp's result on error if
- *	interp is not NULL.
- *
- * Side effects:
- *	May modify an option on a device.
- *
- *----------------------------------------------------------------------
- */
-
-static int		
-SerialSetOptionProc(instanceData, interp, optionName, value)
-    ClientData instanceData;	/* File state. */
-    Tcl_Interp *interp;		/* For error reporting - can be NULL. */
-    char *optionName;		/* Which option to set? */
-    char *value;		/* New value for option. */
-{
-    SerialInfo *infoPtr;
-    DCB dcb;
-    int len;
-    BOOL result;
-    Tcl_DString ds;
-    TCHAR *native;
-
-    infoPtr = (SerialInfo *) instanceData;
-
-    len = strlen(optionName);
-    if ((len > 1) && (strncmp(optionName, "-mode", len) == 0)) {
-	if (GetCommState(infoPtr->handle, &dcb)) {
-	    native = Tcl_WinUtfToTChar(value, -1, &ds);
-	    result = (*tclWinProcs->buildCommDCBProc)(native, &dcb);
-	    Tcl_DStringFree(&ds);
-
-	    if ((result == FALSE) || 
-		    (SetCommState(infoPtr->handle, &dcb) == FALSE)) {
-		/*
-		 * one should separate the 2 errors... 
-		 */
-
-                if (interp) {
-                    Tcl_AppendResult(interp, "bad value for -mode: should be ",
-			    "baud,parity,data,stop", NULL);
-		}
-		return TCL_ERROR;
-	    } else {
-		return TCL_OK;
-	    }
-	} else {
-	    if (interp) {
-		Tcl_AppendResult(interp, "can't get comm state", NULL);
-	    }
-	    return TCL_ERROR;
-	}
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, "mode");
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SerialGetOptionProc --
- *
- *	Gets a mode associated with an IO channel. If the optionName arg
- *	is non NULL, retrieves the value of that option. If the optionName
- *	arg is NULL, retrieves a list of alternating option names and
- *	values for the given channel.
- *
- * Results:
- *	A standard Tcl result. Also sets the supplied DString to the
- *	string value of the option(s) returned.
- *
- * Side effects:
- *	The string returned by this function is in static storage and
- *	may be reused at any time subsequent to the call.
- *
- *----------------------------------------------------------------------
- */
-static int		
-SerialGetOptionProc(instanceData, interp, optionName, dsPtr)
-    ClientData instanceData;	/* File state. */
-    Tcl_Interp *interp;          /* For error reporting - can be NULL. */
-    char *optionName;		/* Option to get. */
-    Tcl_DString *dsPtr;		/* Where to store value(s). */
-{
-    SerialInfo *infoPtr;
-    DCB dcb;
-    int len;
-
-    infoPtr = (SerialInfo *) instanceData;
-
-    if (optionName == NULL) {
-	Tcl_DStringAppendElement(dsPtr, "-mode");
-	len = 0;
-    } else {
-	len = strlen(optionName);
-    }
-    if ((len == 0) || 
-	    ((len > 1) && (strncmp(optionName, "-mode", len) == 0))) {
-	if (GetCommState(infoPtr->handle, &dcb) == 0) {
-	    /*
-	     * shouldn't we flag an error instead ? 
-	     */
-
-	    Tcl_DStringAppendElement(dsPtr, "");
-
-	} else {
-	    char parity;
-	    char *stop;
-	    char buf[2 * TCL_INTEGER_SPACE + 16];
-
-	    parity = 'n';
-	    if (dcb.Parity < 4) {
-		parity = "noems"[dcb.Parity];
-	    }
-
-	    stop = (dcb.StopBits == ONESTOPBIT) ? "1" : 
-		    (dcb.StopBits == ONE5STOPBITS) ? "1.5" : "2";
-
-	    wsprintfA(buf, "%d,%c,%d,%s", dcb.BaudRate, parity, dcb.ByteSize,
-		    stop);
-	    Tcl_DStringAppendElement(dsPtr, buf);
-	}
-	return TCL_OK;
-    } else {
-	return Tcl_BadChannelOption(interp, optionName, "mode");
-    }
-}
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
deleted file mode 100644
index bfcc3a6..0000000
--- a/win/tclWinSock.c
+++ /dev/null
@@ -1,2279 +0,0 @@
-/* 
- * tclWinSock.c --
- *
- *	This file contains Windows-specific socket related code.
- *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinSock.c,v 1.8 1999/04/16 00:48:09 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * The following variable is used to tell whether this module has been
- * initialized.
- */
-
-static int initialized = 0;
-
-static int  hostnameInitialized = 0;
-static char hostname[255];	/* This buffer should be big enough for
-                                 * hostname plus domain name. */
-TCL_DECLARE_MUTEX(socketMutex)
-
-/*
- * The following structure contains pointers to all of the WinSock API entry
- * points used by Tcl.  It is initialized by InitSockets.  Since we
- * dynamically load Winsock.dll on demand, we must use this function table
- * to refer to functions in the socket API.
- */
-
-static struct {
-    HINSTANCE hInstance;	/* Handle to WinSock library. */
-    SOCKET (PASCAL FAR *accept)(SOCKET s, struct sockaddr FAR *addr,
-	    int FAR *addrlen);
-    int (PASCAL FAR *bind)(SOCKET s, const struct sockaddr FAR *addr,
-	    int namelen);
-    int (PASCAL FAR *closesocket)(SOCKET s);
-    int (PASCAL FAR *connect)(SOCKET s, const struct sockaddr FAR *name,
-	    int namelen);
-    int (PASCAL FAR *ioctlsocket)(SOCKET s, long cmd, u_long FAR *argp);
-    int (PASCAL FAR *getsockopt)(SOCKET s, int level, int optname,
-	    char FAR * optval, int FAR *optlen);
-    u_short (PASCAL FAR *htons)(u_short hostshort);
-    unsigned long (PASCAL FAR *inet_addr)(const char FAR * cp);
-    char FAR * (PASCAL FAR *inet_ntoa)(struct in_addr in);
-    int (PASCAL FAR *listen)(SOCKET s, int backlog);
-    u_short (PASCAL FAR *ntohs)(u_short netshort);
-    int (PASCAL FAR *recv)(SOCKET s, char FAR * buf, int len, int flags);
-    int (PASCAL FAR *select)(int nfds, fd_set FAR * readfds,
-	    fd_set FAR * writefds, fd_set FAR * exceptfds,
-	    const struct timeval FAR * tiemout);
-    int (PASCAL FAR *send)(SOCKET s, const char FAR * buf, int len, int flags);
-    int (PASCAL FAR *setsockopt)(SOCKET s, int level, int optname,
-	    const char FAR * optval, int optlen);
-    int (PASCAL FAR *shutdown)(SOCKET s, int how);
-    SOCKET (PASCAL FAR *socket)(int af, int type, int protocol);
-    struct hostent FAR * (PASCAL FAR *gethostbyname)(const char FAR * name);
-    struct hostent FAR * (PASCAL FAR *gethostbyaddr)(const char FAR *addr,
-            int addrlen, int addrtype);
-    int (PASCAL FAR *gethostname)(char FAR * name, int namelen);
-    int (PASCAL FAR *getpeername)(SOCKET sock, struct sockaddr FAR *name,
-            int FAR *namelen);
-    struct servent FAR * (PASCAL FAR *getservbyname)(const char FAR * name,
-	    const char FAR * proto);
-    int (PASCAL FAR *getsockname)(SOCKET sock, struct sockaddr FAR *name,
-            int FAR *namelen);
-    int (PASCAL FAR *WSAStartup)(WORD wVersionRequired, LPWSADATA lpWSAData);
-    int (PASCAL FAR *WSACleanup)(void);
-    int (PASCAL FAR *WSAGetLastError)(void);
-    int (PASCAL FAR *WSAAsyncSelect)(SOCKET s, HWND hWnd, u_int wMsg,
-	    long lEvent);
-} winSock;
-
-/*
- * The following defines declare the messages used on socket windows.
- */
-
-#define SOCKET_MESSAGE	WM_USER+1
-
-/*
- * The following structure is used to store the data associated with
- * each socket.
- */
-
-typedef struct SocketInfo {
-    Tcl_Channel channel;	   /* Channel associated with this socket. */
-    SOCKET socket;		   /* Windows SOCKET handle. */
-    int flags;			   /* Bit field comprised of the flags
-				    * described below.  */
-    int watchEvents;		   /* OR'ed combination of FD_READ, FD_WRITE,
-                                    * FD_CLOSE, FD_ACCEPT and FD_CONNECT that
-				    * indicate which events are interesting. */
-    int readyEvents;		   /* OR'ed combination of FD_READ, FD_WRITE,
-                                    * FD_CLOSE, FD_ACCEPT and FD_CONNECT that
-				    * indicate which events have occurred. */
-    int selectEvents;		   /* OR'ed combination of FD_READ, FD_WRITE,
-                                    * FD_CLOSE, FD_ACCEPT and FD_CONNECT that
-				    * indicate which events are currently
-				    * being selected. */
-    Tcl_TcpAcceptProc *acceptProc; /* Proc to call on accept. */
-    ClientData acceptProcData;	   /* The data for the accept proc. */
-    int lastError;		   /* Error code from last message. */
-    struct SocketInfo *nextPtr;	   /* The next socket on the global socket
-				    * list. */
-} SocketInfo;
-
-/*
- * The following structure is what is added to the Tcl event queue when
- * a socket event occurs.
- */
-
-typedef struct SocketEvent {
-    Tcl_Event header;		/* Information that is standard for
-				 * all events. */
-    SOCKET socket;		/* Socket descriptor that is ready.  Used
-				 * to find the SocketInfo structure for
-				 * the file (can't point directly to the
-				 * SocketInfo structure because it could
-				 * go away while the event is queued). */
-} SocketEvent;
-
-/*
- * This defines the minimum buffersize maintained by the kernel.
- */
-
-#define TCP_BUFFER_SIZE 4096
-
-/*
- * The following macros may be used to set the flags field of
- * a SocketInfo structure.
- */
-
-#define SOCKET_ASYNC		(1<<0)	/* The socket is in blocking mode. */
-#define SOCKET_EOF		(1<<1)	/* A zero read happened on
-					 * the socket. */
-#define SOCKET_ASYNC_CONNECT	(1<<2)	/* This socket uses async connect. */
-#define SOCKET_PENDING		(1<<3)	/* A message has been sent
-					 * for this socket */
-
-typedef struct ThreadSpecificData {
-    /*
-     * Every open socket has an entry on the following list.
-     */
-    
-    HWND hwnd;			/* Handle to window for socket messages. */
-    SocketInfo *socketList;
-} ThreadSpecificData;
-
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Static functions defined in this file.
- */
-
-static SocketInfo *	CreateSocket _ANSI_ARGS_((Tcl_Interp *interp,
-			    int port, char *host, int server, char *myaddr,
-			    int myport, int async));
-static int		CreateSocketAddress _ANSI_ARGS_(
-			    (struct sockaddr_in *sockaddrPtr,
-			    char *host, int port));
-static void		InitSockets _ANSI_ARGS_((void));
-static SocketInfo *	NewSocketInfo _ANSI_ARGS_((SOCKET socket));
-static void		SocketCheckProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static int		SocketEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
-			    int flags));
-static void		SocketExitHandler _ANSI_ARGS_((ClientData clientData));
-static LRESULT CALLBACK	SocketProc _ANSI_ARGS_((HWND hwnd, UINT message,
-			    WPARAM wParam, LPARAM lParam));
-static void		SocketSetupProc _ANSI_ARGS_((ClientData clientData,
-			    int flags));
-static void		SocketThreadExitHandler _ANSI_ARGS_((ClientData clientData));
-static int		SocketsEnabled _ANSI_ARGS_((void));
-static void		TcpAccept _ANSI_ARGS_((SocketInfo *infoPtr));
-static int		TcpBlockProc _ANSI_ARGS_((ClientData instanceData,
-			    int mode));
-static int		TcpCloseProc _ANSI_ARGS_((ClientData instanceData,
-	            	    Tcl_Interp *interp));
-static int		TcpGetOptionProc _ANSI_ARGS_((ClientData instanceData,
-		            Tcl_Interp *interp, char *optionName,
-			    Tcl_DString *optionValue));
-static int		TcpInputProc _ANSI_ARGS_((ClientData instanceData,
-	            	    char *buf, int toRead, int *errorCode));
-static int		TcpOutputProc _ANSI_ARGS_((ClientData instanceData,
-	            	    char *buf, int toWrite, int *errorCode));
-static void		TcpWatchProc _ANSI_ARGS_((ClientData instanceData,
-		            int mask));
-static int		TcpGetHandleProc _ANSI_ARGS_((ClientData instanceData,
-		            int direction, ClientData *handlePtr));
-static int		WaitForSocketEvent _ANSI_ARGS_((SocketInfo *infoPtr,
-		            int events, int *errorCodePtr));
-
-/*
- * This structure describes the channel type structure for TCP socket
- * based IO.
- */
-
-static Tcl_ChannelType tcpChannelType = {
-    "tcp",		/* Type name. */
-    TcpBlockProc,	/* Set socket into blocking/non-blocking mode. */
-    TcpCloseProc,	/* Close proc. */
-    TcpInputProc,	/* Input proc. */
-    TcpOutputProc,	/* Output proc. */
-    NULL,		/* Seek proc. */
-    NULL,		/* Set option proc. */
-    TcpGetOptionProc,	/* Get option proc. */
-    TcpWatchProc,	/* Initialize notifier to watch this channel. */
-    TcpGetHandleProc,	/* Get an OS handle from channel. */
-};
-
-/*
- * Define version of Winsock required by Tcl.
- */
-
-#define WSA_VERSION_REQD MAKEWORD(1,1)
-
-/*
- *----------------------------------------------------------------------
- *
- * InitSockets --
- *
- *	Initialize the socket module.  Attempts to load the wsock32.dll
- *	library and set up the winSock function table.  If successful,
- *	registers the event window for the socket notifier code.
- *
- *	Assumes Mutex is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Dynamically loads wsock32.dll, and registers a new window
- *	class and creates a window for use in asynchronous socket
- *	notification.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-InitSockets()
-{
-    WSADATA wsaData;
-    OSVERSIONINFO info;
-    static WNDCLASSA class;
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    if (! initialized) {
-	initialized = 1;
-	Tcl_CreateExitHandler(SocketExitHandler, (ClientData) NULL);
-    
-	/*
-	 * Find out if we're running on Win32s.
-	 */
-    
-	info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-	GetVersionEx(&info);
-    
-	/*
-	 * Check to see if Sockets are supported on this system.  Since
-	 * win32s panics if we call WSAStartup on a system that doesn't
-	 * have winsock.dll, we need to look for it on the system first.
-	 * If we find winsock, then load the library and initialize the
-	 * stub table.
-	 */
-    
-	if ((info.dwPlatformId != VER_PLATFORM_WIN32s)
-		|| (SearchPathA(NULL, "WINSOCK", ".DLL", 0, NULL, NULL) != 0)) {
-	    winSock.hInstance = LoadLibraryA("wsock32.dll");
-	} else {
-	    winSock.hInstance = NULL;
-	}
-    
-	/*
-	 * Initialize the function table.
-	 */
-    
-	if (!SocketsEnabled()) {
-	    return;
-	}
-    
-	winSock.accept = (SOCKET (PASCAL FAR *)(SOCKET s,
-		struct sockaddr FAR *addr, int FAR *addrlen))
-	    GetProcAddress(winSock.hInstance, "accept");
-	winSock.bind = (int (PASCAL FAR *)(SOCKET s,
-		const struct sockaddr FAR *addr, int namelen))
-	    GetProcAddress(winSock.hInstance, "bind");
-	winSock.closesocket = (int (PASCAL FAR *)(SOCKET s))
-	    GetProcAddress(winSock.hInstance, "closesocket");
-	winSock.connect = (int (PASCAL FAR *)(SOCKET s,
-		const struct sockaddr FAR *name, int namelen))
-	    GetProcAddress(winSock.hInstance, "connect");
-	winSock.ioctlsocket = (int (PASCAL FAR *)(SOCKET s, long cmd,
-		u_long FAR *argp))
-	    GetProcAddress(winSock.hInstance, "ioctlsocket");
-	winSock.getsockopt = (int (PASCAL FAR *)(SOCKET s,
-		int level, int optname, char FAR * optval, int FAR *optlen))
-	    GetProcAddress(winSock.hInstance, "getsockopt");
-	winSock.htons = (u_short (PASCAL FAR *)(u_short hostshort))
-	    GetProcAddress(winSock.hInstance, "htons");
-	winSock.inet_addr = (unsigned long (PASCAL FAR *)(const char FAR *cp))
-	    GetProcAddress(winSock.hInstance, "inet_addr");
-	winSock.inet_ntoa = (char FAR * (PASCAL FAR *)(struct in_addr in))
-	    GetProcAddress(winSock.hInstance, "inet_ntoa");
-	winSock.listen = (int (PASCAL FAR *)(SOCKET s, int backlog))
-	    GetProcAddress(winSock.hInstance, "listen");
-	winSock.ntohs = (u_short (PASCAL FAR *)(u_short netshort))
-	    GetProcAddress(winSock.hInstance, "ntohs");
-	winSock.recv = (int (PASCAL FAR *)(SOCKET s, char FAR * buf,
-		int len, int flags)) GetProcAddress(winSock.hInstance, "recv");
-	winSock.select = (int (PASCAL FAR *)(int nfds, fd_set FAR * readfds,
-		fd_set FAR * writefds, fd_set FAR * exceptfds,
-		const struct timeval FAR * tiemout))
-	    GetProcAddress(winSock.hInstance, "select");
-	winSock.send = (int (PASCAL FAR *)(SOCKET s, const char FAR * buf,
-		int len, int flags)) GetProcAddress(winSock.hInstance, "send");
-	winSock.setsockopt = (int (PASCAL FAR *)(SOCKET s, int level,
-		int optname, const char FAR * optval, int optlen))
-	    GetProcAddress(winSock.hInstance, "setsockopt");
-	winSock.shutdown = (int (PASCAL FAR *)(SOCKET s, int how))
-	    GetProcAddress(winSock.hInstance, "shutdown");
-	winSock.socket = (SOCKET (PASCAL FAR *)(int af, int type,
-		int protocol)) GetProcAddress(winSock.hInstance, "socket");
-	winSock.gethostbyaddr = (struct hostent FAR * (PASCAL FAR *)
-		(const char FAR *addr, int addrlen, int addrtype))
-	    GetProcAddress(winSock.hInstance, "gethostbyaddr");
-	winSock.gethostbyname = (struct hostent FAR * (PASCAL FAR *)
-		(const char FAR *name))
-	    GetProcAddress(winSock.hInstance, "gethostbyname");
-	winSock.gethostname = (int (PASCAL FAR *)(char FAR * name,
-		int namelen)) GetProcAddress(winSock.hInstance, "gethostname");
-	winSock.getpeername = (int (PASCAL FAR *)(SOCKET sock,
-		struct sockaddr FAR *name, int FAR *namelen))
-	    GetProcAddress(winSock.hInstance, "getpeername");
-	winSock.getservbyname = (struct servent FAR * (PASCAL FAR *)
-		(const char FAR * name, const char FAR * proto))
-	    GetProcAddress(winSock.hInstance, "getservbyname");
-	winSock.getsockname = (int (PASCAL FAR *)(SOCKET sock,
-		struct sockaddr FAR *name, int FAR *namelen))
-	    GetProcAddress(winSock.hInstance, "getsockname");
-	winSock.WSAStartup = (int (PASCAL FAR *)(WORD wVersionRequired,
-		LPWSADATA lpWSAData)) GetProcAddress(winSock.hInstance, "WSAStartup");
-	winSock.WSACleanup = (int (PASCAL FAR *)(void))
-	    GetProcAddress(winSock.hInstance, "WSACleanup");
-	winSock.WSAGetLastError = (int (PASCAL FAR *)(void))
-	    GetProcAddress(winSock.hInstance, "WSAGetLastError");
-	winSock.WSAAsyncSelect = (int (PASCAL FAR *)(SOCKET s, HWND hWnd,
-		u_int wMsg, long lEvent))
-	    GetProcAddress(winSock.hInstance, "WSAAsyncSelect");
-    
-	/*
-	 * Now check that all fields are properly initialized. If not, return
-	 * zero to indicate that we failed to initialize properly.
-	 */
-    
-	if ((winSock.hInstance == NULL) ||
-		(winSock.accept == NULL) ||
-		(winSock.bind == NULL) ||
-		(winSock.closesocket == NULL) ||
-		(winSock.connect == NULL) ||
-		(winSock.ioctlsocket == NULL) ||
-		(winSock.getsockopt == NULL) ||
-		(winSock.htons == NULL) ||
-		(winSock.inet_addr == NULL) ||
-		(winSock.inet_ntoa == NULL) ||
-		(winSock.listen == NULL) ||
-		(winSock.ntohs == NULL) ||
-		(winSock.recv == NULL) ||
-		(winSock.select == NULL) ||
-		(winSock.send == NULL) ||
-		(winSock.setsockopt == NULL) ||
-		(winSock.socket == NULL) ||
-		(winSock.gethostbyname == NULL) ||
-		(winSock.gethostbyaddr == NULL) ||
-		(winSock.gethostname == NULL) ||
-		(winSock.getpeername == NULL) ||
-		(winSock.getservbyname == NULL) ||
-		(winSock.getsockname == NULL) ||
-		(winSock.WSAStartup == NULL) ||
-		(winSock.WSACleanup == NULL) ||
-		(winSock.WSAGetLastError == NULL) ||
-		(winSock.WSAAsyncSelect == NULL)) {
-	    goto unloadLibrary;
-	}
-	
-	/*
-	 * Create the async notification window with a new class.  We
-	 * must create a new class to avoid a Windows 95 bug that causes
-	 * us to get the wrong message number for socket events if the
-	 * message window is a subclass of a static control.
-	 */
-    
-	class.style = 0;
-	class.cbClsExtra = 0;
-	class.cbWndExtra = 0;
-	class.hInstance = TclWinGetTclInstance();
-	class.hbrBackground = NULL;
-	class.lpszMenuName = NULL;
-	class.lpszClassName = "TclSocket";
-	class.lpfnWndProc = SocketProc;
-	class.hIcon = NULL;
-	class.hCursor = NULL;
-
-	if (!RegisterClassA(&class)) {
-	    TclWinConvertError(GetLastError());
-	    (*winSock.WSACleanup)();
-	    goto unloadLibrary;
-	}
-	
-	/*
-	 * Initialize the winsock library and check the version number.
-	 */
-    
-	if ((*winSock.WSAStartup)(WSA_VERSION_REQD, &wsaData) != 0) {
-	    goto unloadLibrary;
-	}
-	if (wsaData.wVersion != WSA_VERSION_REQD) {
-	    (*winSock.WSACleanup)();
-	    goto unloadLibrary;
-	}
-    }
-
-    /*
-     * Check for per-thread initialization.
-     */
-
-    if (tsdPtr == NULL) {
-	tsdPtr = TCL_TSD_INIT(&dataKey);
-	tsdPtr->socketList = NULL;
-    
-	tsdPtr->hwnd = CreateWindowA("TclSocket", "TclSocket", 
-		WS_TILED, 0, 0, 0, 0, NULL, NULL, class.hInstance, NULL);
-
-	if (tsdPtr->hwnd == NULL) {
-	    goto unloadLibrary;
-	}
-	    
-	Tcl_CreateEventSource(SocketSetupProc, SocketCheckProc, NULL);
-	Tcl_CreateThreadExitHandler(SocketThreadExitHandler, NULL);
-    }
-    return;
-
-unloadLibrary:
-    FreeLibrary(winSock.hInstance);
-    winSock.hInstance = NULL;
-    return;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketsEnabled --
- *
- *	Check that the WinSock DLL is loaded and ready.
- *
- * Results:
- *	1 if it is.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-static int
-SocketsEnabled()
-{
-    int enabled;
-    Tcl_MutexLock(&socketMutex);
-    enabled = (winSock.hInstance != NULL);
-    Tcl_MutexUnlock(&socketMutex);
-    return enabled;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketExitHandler --
- *
- *	Callback invoked during exit clean up to delete the socket
- *	communication window and to release the WinSock DLL.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-static void
-SocketExitHandler(clientData)
-    ClientData clientData;              /* Not used. */
-{
-    Tcl_MutexLock(&socketMutex);
-    if (winSock.hInstance) {
-	UnregisterClassA("TclSocket", TclWinGetTclInstance());
-	(*winSock.WSACleanup)();
-	FreeLibrary(winSock.hInstance);
-	winSock.hInstance = NULL;
-    }
-    initialized = 0;
-    hostnameInitialized = 0;
-    Tcl_MutexUnlock(&socketMutex);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketThreadExitHandler --
- *
- *	Callback invoked during thread clean up to delete the socket
- *	event source.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Delete the event source.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-static void
-SocketThreadExitHandler(clientData)
-    ClientData clientData;              /* Not used. */
-{
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    DestroyWindow(tsdPtr->hwnd);
-
-    Tcl_DeleteEventSource(SocketSetupProc, SocketCheckProc, NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpHasSockets --
- *
- *	This function determines whether sockets are available on the
- *	current system and returns an error in interp if they are not.
- *	Note that interp may be NULL.
- *
- * Results:
- *	Returns TCL_OK if the system supports sockets, or TCL_ERROR with
- *	an error in interp.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpHasSockets(interp)
-    Tcl_Interp *interp;
-{
-    Tcl_MutexLock(&socketMutex);
-    InitSockets();
-    Tcl_MutexUnlock(&socketMutex);
-
-    if (SocketsEnabled()) {
-	return TCL_OK;
-    }
-    if (interp != NULL) {
-	Tcl_AppendResult(interp, "sockets are not available on this system",
-		NULL);
-    }
-    return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketSetupProc --
- *
- *	This procedure is invoked before Tcl_DoOneEvent blocks waiting
- *	for an event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Adjusts the block time if needed.
- *
- *----------------------------------------------------------------------
- */
-
-void
-SocketSetupProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    SocketInfo *infoPtr;
-    Tcl_Time blockTime = { 0, 0 };
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Check to see if there is a ready socket.  If so, poll.
-     */
-
-    for (infoPtr = tsdPtr->socketList; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->readyEvents & infoPtr->watchEvents) {
-	    Tcl_SetMaxBlockTime(&blockTime);
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketCheckProc --
- *
- *	This procedure is called by Tcl_DoOneEvent to check the socket
- *	event source for events. 
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May queue an event.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SocketCheckProc(data, flags)
-    ClientData data;		/* Not used. */
-    int flags;			/* Event flags as passed to Tcl_DoOneEvent. */
-{
-    SocketInfo *infoPtr;
-    SocketEvent *evPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return;
-    }
-    
-    /*
-     * Queue events for any ready sockets that don't already have events
-     * queued (caused by persistent states that won't generate WinSock
-     * events).
-     */
-
-    for (infoPtr = tsdPtr->socketList; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if ((infoPtr->readyEvents & infoPtr->watchEvents)
-		&& !(infoPtr->flags & SOCKET_PENDING)) {
-	    infoPtr->flags |= SOCKET_PENDING;
-	    evPtr = (SocketEvent *) ckalloc(sizeof(SocketEvent));
-	    evPtr->header.proc = SocketEventProc;
-	    evPtr->socket = infoPtr->socket;
-	    Tcl_QueueEvent((Tcl_Event *) evPtr, TCL_QUEUE_TAIL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketEventProc --
- *
- *	This procedure is called by Tcl_ServiceEvent when a socket event
- *	reaches the front of the event queue.  This procedure is
- *	responsible for notifying the generic channel code.
- *
- * Results:
- *	Returns 1 if the event was handled, meaning it should be removed
- *	from the queue.  Returns 0 if the event was not handled, meaning
- *	it should stay on the queue.  The only time the event isn't
- *	handled is if the TCL_FILE_EVENTS flag bit isn't set.
- *
- * Side effects:
- *	Whatever the channel callback procedures do.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-SocketEventProc(evPtr, flags)
-    Tcl_Event *evPtr;		/* Event to service. */
-    int flags;			/* Flags that indicate what events to
-				 * handle, such as TCL_FILE_EVENTS. */
-{
-    SocketInfo *infoPtr;
-    SocketEvent *eventPtr = (SocketEvent *) evPtr;
-    int mask = 0;
-    int events;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (!(flags & TCL_FILE_EVENTS)) {
-	return 0;
-    }
-
-    /*
-     * Find the specified socket on the socket list.
-     */
-
-    for (infoPtr = tsdPtr->socketList; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->socket == eventPtr->socket) {
-	    break;
-	}
-    }
-
-    /*
-     * Discard events that have gone stale.
-     */
-
-    if (!infoPtr) {
-	return 1;
-    }
-
-    infoPtr->flags &= ~SOCKET_PENDING;
-
-    /*
-     * Handle connection requests directly.
-     */
-
-    if (infoPtr->readyEvents & FD_ACCEPT) {
-	TcpAccept(infoPtr);
-	return 1;
-    }
-
-
-    /*
-     * Mask off unwanted events and compute the read/write mask so 
-     * we can notify the channel.
-     */
-
-    events = infoPtr->readyEvents & infoPtr->watchEvents;
-
-    if (events & FD_CLOSE) {
-	/*
-	 * If the socket was closed and the channel is still interested
-	 * in read events, then we need to ensure that we keep polling
-	 * for this event until someone does something with the channel.
-	 * Note that we do this before calling Tcl_NotifyChannel so we don't
-	 * have to watch out for the channel being deleted out from under
-	 * us.  This may cause a redundant trip through the event loop, but
-	 * it's simpler than trying to do unwind protection.
-	 */
-
-	Tcl_Time blockTime = { 0, 0 };
-	Tcl_SetMaxBlockTime(&blockTime);
-	mask |= TCL_READABLE;
-    } else if (events & FD_READ) {
-	fd_set readFds;
-	struct timeval timeout;
-
-	/*
-	 * We must check to see if data is really available, since someone
-	 * could have consumed the data in the meantime.  Turn off async
-	 * notification so select will work correctly.	If the socket is
-	 * still readable, notify the channel driver, otherwise reset the
-	 * async select handler and keep waiting.
-	 */
-
-	(void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd, 0, 0);
-
-	FD_ZERO(&readFds);
-	FD_SET(infoPtr->socket, &readFds);
-	timeout.tv_usec = 0;
-	timeout.tv_sec = 0;
- 
-	if ((*winSock.select)(0, &readFds, NULL, NULL, &timeout) != 0) {
-	    mask |= TCL_READABLE;
-	} else {
-	    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-		    SOCKET_MESSAGE, infoPtr->selectEvents);
-	    infoPtr->readyEvents &= ~(FD_READ);
-	}
-    }
-    if (events & (FD_WRITE | FD_CONNECT)) {
-	mask |= TCL_WRITABLE;
-    }
-
-    if (mask) {
-	Tcl_NotifyChannel(infoPtr->channel, mask);
-    }
-    return 1;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpBlockProc --
- *
- *	Sets a socket into blocking or non-blocking mode.
- *
- * Results:
- *	0 if successful, errno if there was an error.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpBlockProc(instanceData, mode)
-    ClientData	instanceData;	/* The socket to block/un-block. */
-    int mode;			/* TCL_MODE_BLOCKING or
-                                 * TCL_MODE_NONBLOCKING. */
-{
-    SocketInfo *infoPtr = (SocketInfo *) instanceData;
-
-    if (mode == TCL_MODE_NONBLOCKING) {
-	infoPtr->flags |= SOCKET_ASYNC;
-    } else {
-	infoPtr->flags &= ~(SOCKET_ASYNC);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpCloseProc --
- *
- *	This procedure is called by the generic IO level to perform
- *	channel type specific cleanup on a socket based channel
- *	when the channel is closed.
- *
- * Results:
- *	0 if successful, the value of errno if failed.
- *
- * Side effects:
- *	Closes the socket.
- *
- *----------------------------------------------------------------------
- */
-
-    /* ARGSUSED */
-static int
-TcpCloseProc(instanceData, interp)
-    ClientData instanceData;	/* The socket to close. */
-    Tcl_Interp *interp;		/* Unused. */
-{
-    SocketInfo *infoPtr = (SocketInfo *) instanceData;
-    SocketInfo **nextPtrPtr;
-    int errorCode = 0;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (SocketsEnabled()) {
-        
-	/*
-         * Clean up the OS socket handle.  The default Windows setting
-	 * for a socket is SO_DONTLINGER, which does a graceful shutdown
-	 * in the background.
-         */
-    
-        if ((*winSock.closesocket)(infoPtr->socket) == SOCKET_ERROR) {
-            TclWinConvertWSAError((*winSock.WSAGetLastError)());
-            errorCode = Tcl_GetErrno();
-        }
-    }
-
-    /*
-     * Remove the socket from socketList.
-     */
-
-    for (nextPtrPtr = &(tsdPtr->socketList); (*nextPtrPtr) != NULL;
-	 nextPtrPtr = &((*nextPtrPtr)->nextPtr)) {
-	if ((*nextPtrPtr) == infoPtr) {
-	    (*nextPtrPtr) = infoPtr->nextPtr;
-	    break;
-	}
-    }
-
-    ckfree((char *) infoPtr);
-    return errorCode;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * NewSocketInfo --
- *
- *	This function allocates and initializes a new SocketInfo
- *	structure.
- *
- * Results:
- *	Returns a newly allocated SocketInfo.
- *
- * Side effects:
- *	Adds the socket to the global socket list.
- *
- *----------------------------------------------------------------------
- */
-
-static SocketInfo *
-NewSocketInfo(socket)
-    SOCKET socket;
-{
-    SocketInfo *infoPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    infoPtr = (SocketInfo *) ckalloc((unsigned) sizeof(SocketInfo));
-    infoPtr->socket = socket;
-    infoPtr->flags = 0;
-    infoPtr->watchEvents = 0;
-    infoPtr->readyEvents = 0;
-    infoPtr->selectEvents = 0;
-    infoPtr->acceptProc = NULL;
-    infoPtr->lastError = 0;
-
-    infoPtr->nextPtr = tsdPtr->socketList;
-    tsdPtr->socketList = infoPtr;
-
-    return infoPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateSocket --
- *
- *	This function opens a new socket and initializes the
- *	SocketInfo structure.
- *
- * Results:
- *	Returns a new SocketInfo, or NULL with an error in interp.
- *
- * Side effects:
- *	Adds a new socket to the socketList.
- *
- *----------------------------------------------------------------------
- */
-
-static SocketInfo *
-CreateSocket(interp, port, host, server, myaddr, myport, async)
-    Tcl_Interp *interp;		/* For error reporting; can be NULL. */
-    int port;			/* Port number to open. */
-    char *host;			/* Name of host on which to open port. */
-    int server;			/* 1 if socket should be a server socket,
-				 * else 0 for a client socket. */
-    char *myaddr;		/* Optional client-side address */
-    int myport;			/* Optional client-side port */
-    int async;			/* If nonzero, connect client socket
-                                 * asynchronously. */
-{
-    u_long flag = 1;			/* Indicates nonblocking mode. */
-    int asyncConnect = 0;		/* Will be 1 if async connect is
-                                         * in progress. */
-    struct sockaddr_in sockaddr;	/* Socket address */
-    struct sockaddr_in mysockaddr;	/* Socket address for client */
-    SOCKET sock;
-    SocketInfo *infoPtr;		/* The returned value. */
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-        return NULL;
-    }
-
-    if (! CreateSocketAddress(&sockaddr, host, port)) {
-	goto error;
-    }
-    if ((myaddr != NULL || myport != 0) &&
-	    ! CreateSocketAddress(&mysockaddr, myaddr, myport)) {
-	goto error;
-    }
-
-    sock = (*winSock.socket)(AF_INET, SOCK_STREAM, 0);
-    if (sock == INVALID_SOCKET) {
-	goto error;
-    }
-
-    /*
-     * Win-NT has a misfeature that sockets are inherited in child
-     * processes by default.  Turn off the inherit bit.
-     */
-
-    SetHandleInformation( (HANDLE) sock, HANDLE_FLAG_INHERIT, 0 );
-	
-    /*
-     * Set kernel space buffering
-     */
-
-    TclSockMinimumBuffers(sock, TCP_BUFFER_SIZE);
-
-    if (server) {
-	/*
-	 * Bind to the specified port.  Note that we must not call setsockopt
-	 * with SO_REUSEADDR because Microsoft allows addresses to be reused
-	 * even if they are still in use.
-         *
-         * Bind should not be affected by the socket having already been
-         * set into nonblocking mode. If there is trouble, this is one place
-         * to look for bugs.
-	 */
-    
-	if ((*winSock.bind)(sock, (struct sockaddr *) &sockaddr,
-		sizeof(sockaddr)) == SOCKET_ERROR) {
-            goto error;
-        }
-
-        /*
-         * Set the maximum number of pending connect requests to the
-         * max value allowed on each platform (Win32 and Win32s may be
-         * different, and there may be differences between TCP/IP stacks).
-         */
-        
-	if ((*winSock.listen)(sock, SOMAXCONN) == SOCKET_ERROR) {
-	    goto error;
-	}
-
-	/*
-	 * Add this socket to the global list of sockets.
-	 */
-
-	infoPtr = NewSocketInfo(sock);
-
-	/*
-	 * Set up the select mask for connection request events.
-	 */
-
-	infoPtr->selectEvents = FD_ACCEPT;
-	infoPtr->watchEvents |= FD_ACCEPT;
-
-    } else {
-
-        /*
-         * Try to bind to a local port, if specified.
-         */
-        
-	if (myaddr != NULL || myport != 0) { 
-	    if ((*winSock.bind)(sock, (struct sockaddr *) &mysockaddr,
-		    sizeof(struct sockaddr)) == SOCKET_ERROR) {
-		goto error;
-	    }
-	}            
-    
-	/*
-	 * Set the socket into nonblocking mode if the connect should be
-	 * done in the background.
-	 */
-    
-	if (async) {
-	    if ((*winSock.ioctlsocket)(sock, FIONBIO, &flag) == SOCKET_ERROR) {
-		goto error;
-	    }
-	}
-
-	/*
-	 * Attempt to connect to the remote socket.
-	 */
-
-	if ((*winSock.connect)(sock, (struct sockaddr *) &sockaddr,
-		sizeof(sockaddr)) == SOCKET_ERROR) {
-            TclWinConvertWSAError((*winSock.WSAGetLastError)());
-	    if (Tcl_GetErrno() != EWOULDBLOCK) {
-		goto error;
-	    }
-
-	    /*
-	     * The connection is progressing in the background.
-	     */
-
-	    asyncConnect = 1;
-        }
-
-	/*
-	 * Add this socket to the global list of sockets.
-	 */
-
-	infoPtr = NewSocketInfo(sock);
-
-	/*
-	 * Set up the select mask for read/write events.  If the connect
-	 * attempt has not completed, include connect events.
-	 */
-
-	infoPtr->selectEvents = FD_READ | FD_WRITE | FD_CLOSE;
-	if (asyncConnect) {
-	    infoPtr->flags |= SOCKET_ASYNC_CONNECT;
-	    infoPtr->selectEvents |= FD_CONNECT;
-	}
-    }
-
-    /*
-     * Register for interest in events in the select mask.  Note that this
-     * automatically places the socket into non-blocking mode.
-     */
-
-    (*winSock.ioctlsocket)(sock, FIONBIO, &flag);
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-	    SOCKET_MESSAGE, infoPtr->selectEvents);
-
-    return infoPtr;
-
-error:
-    TclWinConvertWSAError((*winSock.WSAGetLastError)());
-    if (interp != NULL) {
-	Tcl_AppendResult(interp, "couldn't open socket: ",
-		Tcl_PosixError(interp), (char *) NULL);
-    }
-    if (sock != INVALID_SOCKET) {
-	(*winSock.closesocket)(sock);
-    }
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateSocketAddress --
- *
- *	This function initializes a sockaddr structure for a host and port.
- *
- * Results:
- *	1 if the host was valid, 0 if the host could not be converted to
- *	an IP address.
- *
- * Side effects:
- *	Fills in the *sockaddrPtr structure.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-CreateSocketAddress(sockaddrPtr, host, port)
-    struct sockaddr_in *sockaddrPtr;	/* Socket address */
-    char *host;				/* Host.  NULL implies INADDR_ANY */
-    int port;				/* Port number */
-{
-    struct hostent *hostent;		/* Host database entry */
-    struct in_addr addr;		/* For 64/32 bit madness */
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-        Tcl_SetErrno(EFAULT);
-        return 0;
-    }
-
-    (void) memset((char *) sockaddrPtr, '\0', sizeof(struct sockaddr_in));
-    sockaddrPtr->sin_family = AF_INET;
-    sockaddrPtr->sin_port = (*winSock.htons)((short) (port & 0xFFFF));
-    if (host == NULL) {
-	addr.s_addr = INADDR_ANY;
-    } else {
-        addr.s_addr = (*winSock.inet_addr)(host);
-        if (addr.s_addr == INADDR_NONE) {
-            hostent = (*winSock.gethostbyname)(host);
-            if (hostent != NULL) {
-                memcpy((char *) &addr,
-                        (char *) hostent->h_addr_list[0],
-                        (size_t) hostent->h_length);
-            } else {
-#ifdef	EHOSTUNREACH
-                Tcl_SetErrno(EHOSTUNREACH);
-#else
-#ifdef ENXIO
-                Tcl_SetErrno(ENXIO);
-#endif
-#endif
-		return 0;	/* Error. */
-	    }
-	}
-    }
-
-    /*
-     * NOTE: On 64 bit machines the assignment below is rumored to not
-     * do the right thing. Please report errors related to this if you
-     * observe incorrect behavior on 64 bit machines such as DEC Alphas.
-     * Should we modify this code to do an explicit memcpy?
-     */
-
-    sockaddrPtr->sin_addr.s_addr = addr.s_addr;
-    return 1;	/* Success. */
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WaitForSocketEvent --
- *
- *	Waits until one of the specified events occurs on a socket.
- *
- * Results:
- *	Returns 1 on success or 0 on failure, with an error code in
- *	errorCodePtr.
- *
- * Side effects:
- *	Processes socket events off the system queue.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-WaitForSocketEvent(infoPtr, events, errorCodePtr)
-    SocketInfo *infoPtr;	/* Information about this socket. */
-    int events;			/* Events to look for. */
-    int *errorCodePtr;		/* Where to store errors? */
-{
-    MSG msg;
-    int result = 1;
-    int oldMode;
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    /*
-     * Be sure to disable event servicing so we are truly modal.
-     */
-
-    oldMode = Tcl_SetServiceMode(TCL_SERVICE_NONE);
-    
-    /*
-     * Reset WSAAsyncSelect so we have a fresh set of events pending.
-     */
-
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd, 0, 0);
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-	    SOCKET_MESSAGE, infoPtr->selectEvents);
-
-    while (1) {
-	/*
-	 * Process all outstanding messages on the socket window.
-	 */
-
-	while (PeekMessage(&msg, tsdPtr->hwnd, 0, 0, PM_REMOVE)) {
-	    DispatchMessage(&msg);
-	}
-	
-	if (infoPtr->lastError) {
-	    *errorCodePtr = infoPtr->lastError;
-	    result = 0;
-	    break;
-	} else if (infoPtr->readyEvents & events) {
-	    break;
-	} else if (infoPtr->flags & SOCKET_ASYNC) {
-	    *errorCodePtr = EWOULDBLOCK;
-	    result = 0;
-	    break;
-	}
-
-	/*
-	 * Wait until something happens.
-	 */
-
-	WaitMessage();
-    }
-    
-
-    (void) Tcl_SetServiceMode(oldMode);
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpClient --
- *
- *	Opens a TCP client socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed.  An error message is returned
- *	in the interpreter on failure.
- *
- * Side effects:
- *	Opens a client socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpClient(interp, port, host, myaddr, myport, async)
-    Tcl_Interp *interp;			/* For error reporting; can be NULL. */
-    int port;				/* Port number to open. */
-    char *host;				/* Host on which to open port. */
-    char *myaddr;			/* Client-side address */
-    int myport;				/* Client-side port */
-    int async;				/* If nonzero, should connect
-                                         * client socket asynchronously. */
-{
-    SocketInfo *infoPtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    infoPtr = CreateSocket(interp, port, host, 0, myaddr, myport, async);
-    if (infoPtr == NULL) {
-	return NULL;
-    }
-
-    wsprintfA(channelName, "sock%d", infoPtr->socket);
-
-    infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-	    (ClientData) infoPtr, (TCL_READABLE | TCL_WRITABLE));
-    if (Tcl_SetChannelOption(interp, infoPtr->channel, "-translation",
-	    "auto crlf") == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, infoPtr->channel);
-        return (Tcl_Channel) NULL;
-    }
-    if (Tcl_SetChannelOption(NULL, infoPtr->channel, "-eofchar", "")
-	    == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, infoPtr->channel);
-        return (Tcl_Channel) NULL;
-    }
-    return infoPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MakeTcpClientChannel --
- *
- *	Creates a Tcl_Channel from an existing client TCP socket.
- *
- * Results:
- *	The Tcl_Channel wrapped around the preexisting TCP socket.
- *
- * Side effects:
- *	None.
- *
- * NOTE: Code contributed by Mark Diekhans (markd@grizzly.com)
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_MakeTcpClientChannel(sock)
-    ClientData sock;		/* The socket to wrap up into a channel. */
-{
-    SocketInfo *infoPtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    if (TclpHasSockets(NULL) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Set kernel space buffering and non-blocking.
-     */
-
-    TclSockMinimumBuffers((SOCKET) sock, TCP_BUFFER_SIZE);
-
-    infoPtr = NewSocketInfo((SOCKET) sock);
-
-    /*
-     * Start watching for read/write events on the socket.
-     */
-
-    infoPtr->selectEvents = FD_READ | FD_CLOSE | FD_WRITE;
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-	    SOCKET_MESSAGE, infoPtr->selectEvents);
-
-    wsprintfA(channelName, "sock%d", infoPtr->socket);
-    infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-	    (ClientData) infoPtr, (TCL_READABLE | TCL_WRITABLE));
-    Tcl_SetChannelOption(NULL, infoPtr->channel, "-translation", "auto crlf");
-    return infoPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_OpenTcpServer --
- *
- *	Opens a TCP server socket and creates a channel around it.
- *
- * Results:
- *	The channel or NULL if failed.  An error message is returned
- *	in the interpreter on failure.
- *
- * Side effects:
- *	Opens a server socket and creates a new channel.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_Channel
-Tcl_OpenTcpServer(interp, port, host, acceptProc, acceptProcData)
-    Tcl_Interp *interp;			/* For error reporting - may be
-                                         * NULL. */
-    int port;				/* Port number to open. */
-    char *host;				/* Name of local host. */
-    Tcl_TcpAcceptProc *acceptProc;	/* Callback for accepting connections
-                                         * from new clients. */
-    ClientData acceptProcData;		/* Data for the callback. */
-{
-    SocketInfo *infoPtr;
-    char channelName[16 + TCL_INTEGER_SPACE];
-
-    if (TclpHasSockets(interp) != TCL_OK) {
-	return NULL;
-    }
-
-    /*
-     * Create a new client socket and wrap it in a channel.
-     */
-
-    infoPtr = CreateSocket(interp, port, host, 1, NULL, 0, 0);
-    if (infoPtr == NULL) {
-	return NULL;
-    }
-
-    infoPtr->acceptProc = acceptProc;
-    infoPtr->acceptProcData = acceptProcData;
-
-    wsprintfA(channelName, "sock%d", infoPtr->socket);
-
-    infoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-	    (ClientData) infoPtr, 0);
-    if (Tcl_SetChannelOption(interp, infoPtr->channel, "-eofchar", "")
-	    == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, infoPtr->channel);
-        return (Tcl_Channel) NULL;
-    }
-
-    return infoPtr->channel;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpAccept --
- *	Accept a TCP socket connection.  This is called by
- *	SocketEventProc and it in turns calls the registered accept
- *	procedure.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Invokes the accept proc which may invoke arbitrary Tcl code.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpAccept(infoPtr)
-    SocketInfo *infoPtr;	/* Socket to accept. */
-{
-    SOCKET newSocket;
-    SocketInfo *newInfoPtr;
-    struct sockaddr_in addr;
-    int len;
-    char channelName[16 + TCL_INTEGER_SPACE];
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    /*
-     * Accept the incoming connection request.
-     */
-
-    len = sizeof(struct sockaddr_in);
-    newSocket = (*winSock.accept)(infoPtr->socket, (struct sockaddr *)&addr,
-	    &len);
-
-    /*
-     * Clear the ready mask so we can detect the next connection request.
-     * Note that connection requests are level triggered, so if there is
-     * a request already pending, a new event will be generated.
-     */
-
-    infoPtr->readyEvents &= ~(FD_ACCEPT);
-
-    if (newSocket == INVALID_SOCKET) {
-        return;
-    }
-
-    /*
-     * Win-NT has a misfeature that sockets are inherited in child
-     * processes by default.  Turn off the inherit bit.
-     */
-
-    SetHandleInformation( (HANDLE) newSocket, HANDLE_FLAG_INHERIT, 0 );
-	
-    /*
-     * Add this socket to the global list of sockets.
-     */
-
-    newInfoPtr = NewSocketInfo(newSocket);
-
-    /*
-     * Select on read/write events and create the channel.
-     */
-
-    newInfoPtr->selectEvents = (FD_READ | FD_WRITE | FD_CLOSE);
-    (void) (*winSock.WSAAsyncSelect)(newInfoPtr->socket, tsdPtr->hwnd, 
-	    SOCKET_MESSAGE, newInfoPtr->selectEvents);
-
-    wsprintfA(channelName, "sock%d", newInfoPtr->socket);
-    newInfoPtr->channel = Tcl_CreateChannel(&tcpChannelType, channelName,
-	    (ClientData) newInfoPtr, (TCL_READABLE | TCL_WRITABLE));
-    if (Tcl_SetChannelOption(NULL, newInfoPtr->channel, "-translation",
-	    "auto crlf") == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, newInfoPtr->channel);
-        return;
-    }
-    if (Tcl_SetChannelOption(NULL, newInfoPtr->channel, "-eofchar", "")
-	    == TCL_ERROR) {
-        Tcl_Close((Tcl_Interp *) NULL, newInfoPtr->channel);
-        return;
-    }
-
-    /*
-     * Invoke the accept callback procedure.
-     */
-
-    if (infoPtr->acceptProc != NULL) {
-	(infoPtr->acceptProc) (infoPtr->acceptProcData, newInfoPtr->channel,
-		(*winSock.inet_ntoa)(addr.sin_addr),
-		(*winSock.ntohs)(addr.sin_port));
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpInputProc --
- *
- *	This procedure is called by the generic IO level to read data from
- *	a socket based channel.
- *
- * Results:
- *	The number of bytes read or -1 on error.
- *
- * Side effects:
- *	Consumes input from the socket.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpInputProc(instanceData, buf, toRead, errorCodePtr)
-    ClientData instanceData;		/* The socket state. */
-    char *buf;				/* Where to store data. */
-    int toRead;				/* Maximum number of bytes to read. */
-    int *errorCodePtr;			/* Where to store error codes. */
-{
-    SocketInfo *infoPtr = (SocketInfo *) instanceData;
-    int bytesRead;
-    int error;
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-    
-    *errorCodePtr = 0;
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-        *errorCodePtr = EFAULT;
-        return -1;
-    }
-
-    /*
-     * First check to see if EOF was already detected, to prevent
-     * calling the socket stack after the first time EOF is detected.
-     */
-
-    if (infoPtr->flags & SOCKET_EOF) {
-	return 0;
-    }
-
-    /*
-     * Check to see if the socket is connected before trying to read.
-     */
-
-    if ((infoPtr->flags & SOCKET_ASYNC_CONNECT)
-	    && ! WaitForSocketEvent(infoPtr,  FD_CONNECT, errorCodePtr)) {
-	return -1;
-    }
-    
-    /*
-     * No EOF, and it is connected, so try to read more from the socket.
-     * Note that we clear the FD_READ bit because read events are level
-     * triggered so a new event will be generated if there is still data
-     * available to be read.  We have to simulate blocking behavior here
-     * since we are always using non-blocking sockets.
-     */
-
-    while (1) {
-	(void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-		0, 0);
-	bytesRead = (*winSock.recv)(infoPtr->socket, buf, toRead, 0);
-	infoPtr->readyEvents &= ~(FD_READ);
-  
-	/*
-	 * Check for end-of-file condition or successful read.
-	 */
-  
-	if (bytesRead == 0) {
-	    infoPtr->flags |= SOCKET_EOF;
-	}
-	if (bytesRead != SOCKET_ERROR) {
-	    break;
-	}
-  
-	/*
-	 * If an error occurs after the FD_CLOSE has arrived,
-	 * then ignore the error and report an EOF.
-	 */
-  
-	if (infoPtr->readyEvents & FD_CLOSE) {
-	    infoPtr->flags |= SOCKET_EOF;
-	    bytesRead = 0;
-	    break;
-	}
-  
-	/*
-	 * Check for error condition or underflow in non-blocking case.
-	 */
-  
-	error = (*winSock.WSAGetLastError)();
-	if ((infoPtr->flags & SOCKET_ASYNC) || (error != WSAEWOULDBLOCK)) {
-	    TclWinConvertWSAError(error);
-	    *errorCodePtr = Tcl_GetErrno();
-	    bytesRead = -1;
-	    break;
-	}
-
-	/*
-	 * In the blocking case, wait until the file becomes readable
-	 * or closed and try again.
-	 */
-
-	if (!WaitForSocketEvent(infoPtr, FD_READ|FD_CLOSE, errorCodePtr)) {
-	    bytesRead = -1;
-	    break;
-  	}
-    }
-    
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
- 	    SOCKET_MESSAGE, infoPtr->selectEvents);
-    return bytesRead;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpOutputProc --
- *
- *	This procedure is called by the generic IO level to write data
- *	to a socket based channel.
- *
- * Results:
- *	The number of bytes written or -1 on failure.
- *
- * Side effects:
- *	Produces output on the socket.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpOutputProc(instanceData, buf, toWrite, errorCodePtr)
-    ClientData instanceData;		/* The socket state. */
-    char *buf;				/* Where to get data. */
-    int toWrite;			/* Maximum number of bytes to write. */
-    int *errorCodePtr;			/* Where to store error codes. */
-{
-    SocketInfo *infoPtr = (SocketInfo *) instanceData;
-    int bytesWritten;
-    int error;
-    ThreadSpecificData *tsdPtr = 
-	(ThreadSpecificData *)TclThreadDataKeyGet(&dataKey);
-
-    *errorCodePtr = 0;
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (! SocketsEnabled()) {
-        *errorCodePtr = EFAULT;
-        return -1;
-    }
-
-    /*
-     * Check to see if the socket is connected before trying to write.
-     */
-    
-    if ((infoPtr->flags & SOCKET_ASYNC_CONNECT)
-	    && ! WaitForSocketEvent(infoPtr,  FD_CONNECT, errorCodePtr)) {
-	return -1;
-    }
-
-    while (1) {
-	(void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-		0, 0);
-	bytesWritten = (*winSock.send)(infoPtr->socket, buf, toWrite, 0);
-	if (bytesWritten != SOCKET_ERROR) {
-	    /*
-	     * Since Windows won't generate a new write event until we hit
-	     * an overflow condition, we need to force the event loop to
-	     * poll until the condition changes.
-	     */
-
-	    if (infoPtr->watchEvents & FD_WRITE) {
-		Tcl_Time blockTime = { 0, 0 };
-		Tcl_SetMaxBlockTime(&blockTime);
-	    }		
-	    break;
-	}
-	
-	/*
-	 * Check for error condition or overflow.  In the event of overflow, we
-	 * need to clear the FD_WRITE flag so we can detect the next writable
-	 * event.  Note that Windows only sends a new writable event after a
-	 * send fails with WSAEWOULDBLOCK.
-	 */
-
-	error = (*winSock.WSAGetLastError)();
-	if (error == WSAEWOULDBLOCK) {
-	    infoPtr->readyEvents &= ~(FD_WRITE);
-	    if (infoPtr->flags & SOCKET_ASYNC) {
-		*errorCodePtr = EWOULDBLOCK;
-		bytesWritten = -1;
-		break;
-	    } 
-	} else {
-	    TclWinConvertWSAError(error);
-	    *errorCodePtr = Tcl_GetErrno();
-	    bytesWritten = -1;
-	    break;
-	}
-
-	/*
-	 * In the blocking case, wait until the file becomes writable
-	 * or closed and try again.
-	 */
-
-	if (!WaitForSocketEvent(infoPtr, FD_WRITE|FD_CLOSE, errorCodePtr)) {
-	    bytesWritten = -1;
-	    break;
-	}
-    }
-
-    (void) (*winSock.WSAAsyncSelect)(infoPtr->socket, tsdPtr->hwnd,
-	    SOCKET_MESSAGE, infoPtr->selectEvents);
-    return bytesWritten;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetOptionProc --
- *
- *	Computes an option value for a TCP socket based channel, or a
- *	list of all options and their values.
- *
- *	Note: This code is based on code contributed by John Haxby.
- *
- * Results:
- *	A standard Tcl result. The value of the specified option or a
- *	list of all options and	their values is returned in the
- *	supplied DString.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpGetOptionProc(instanceData, interp, optionName, dsPtr)
-    ClientData instanceData;		/* Socket state. */
-    Tcl_Interp *interp;                 /* For error reporting - can be NULL */
-    char *optionName;			/* Name of the option to
-                                         * retrieve the value for, or
-                                         * NULL to get all options and
-                                         * their values. */
-    Tcl_DString *dsPtr;			/* Where to store the computed
-                                         * value; initialized by caller. */
-{
-    SocketInfo *infoPtr;
-    struct sockaddr_in sockname;
-    struct sockaddr_in peername;
-    struct hostent *hostEntPtr;
-    SOCKET sock;
-    int size = sizeof(struct sockaddr_in);
-    size_t len = 0;
-    char buf[TCL_INTEGER_SPACE];
-
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-	if (interp) {
-	    Tcl_AppendResult(interp, "winsock is not initialized", NULL);
-	}
-        return TCL_ERROR;
-    }
-    
-    infoPtr = (SocketInfo *) instanceData;
-    sock = (int) infoPtr->socket;
-    if (optionName != (char *) NULL) {
-        len = strlen(optionName);
-    }
-
-    if ((len > 1) && (optionName[1] == 'e') &&
-	    (strncmp(optionName, "-error", len) == 0)) {
-	int optlen;
-	int err, ret;
-    
-	optlen = sizeof(int);
-	ret = TclWinGetSockOpt(sock, SOL_SOCKET, SO_ERROR,
-		(char *)&err, &optlen);
-	if (ret == SOCKET_ERROR) {
-	    err = (*winSock.WSAGetLastError)();
-	}
-	if (err) {
-	    TclWinConvertWSAError(err);
-	    Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), -1);
-	}
-	return TCL_OK;
-    }
-
-    if ((len == 0) ||
-            ((len > 1) && (optionName[1] == 'p') &&
-                    (strncmp(optionName, "-peername", len) == 0))) {
-        if ((*winSock.getpeername)(sock, (struct sockaddr *) &peername, &size)
-                == 0) {
-            if (len == 0) {
-                Tcl_DStringAppendElement(dsPtr, "-peername");
-                Tcl_DStringStartSublist(dsPtr);
-            }
-            Tcl_DStringAppendElement(dsPtr,
-                    (*winSock.inet_ntoa)(peername.sin_addr));
-            hostEntPtr = (*winSock.gethostbyaddr)(
-                (char *) &(peername.sin_addr), sizeof(peername.sin_addr),
-                AF_INET);
-            if (hostEntPtr != (struct hostent *) NULL) {
-                Tcl_DStringAppendElement(dsPtr, hostEntPtr->h_name);
-            } else {
-                Tcl_DStringAppendElement(dsPtr,
-                        (*winSock.inet_ntoa)(peername.sin_addr));
-            }
-	    TclFormatInt(buf, (*winSock.ntohs)(peername.sin_port));
-            Tcl_DStringAppendElement(dsPtr, buf);
-            if (len == 0) {
-                Tcl_DStringEndSublist(dsPtr);
-            } else {
-                return TCL_OK;
-            }
-        } else {
-            /*
-             * getpeername failed - but if we were asked for all the options
-             * (len==0), don't flag an error at that point because it could
-             * be an fconfigure request on a server socket. (which have
-             * no peer). {copied from unix/tclUnixChan.c}
-             */
-            if (len) {
-		TclWinConvertWSAError((*winSock.WSAGetLastError)());
-                if (interp) {
-                    Tcl_AppendResult(interp, "can't get peername: ",
-                                     Tcl_PosixError(interp),
-                                     (char *) NULL);
-                }
-                return TCL_ERROR;
-            }
-        }
-    }
-
-    if ((len == 0) ||
-            ((len > 1) && (optionName[1] == 's') &&
-                    (strncmp(optionName, "-sockname", len) == 0))) {
-        if ((*winSock.getsockname)(sock, (struct sockaddr *) &sockname, &size)
-                == 0) {
-            if (len == 0) {
-                Tcl_DStringAppendElement(dsPtr, "-sockname");
-                Tcl_DStringStartSublist(dsPtr);
-            }
-            Tcl_DStringAppendElement(dsPtr,
-                    (*winSock.inet_ntoa)(sockname.sin_addr));
-            hostEntPtr = (*winSock.gethostbyaddr)(
-                (char *) &(sockname.sin_addr), sizeof(peername.sin_addr),
-                AF_INET);
-            if (hostEntPtr != (struct hostent *) NULL) {
-                Tcl_DStringAppendElement(dsPtr, hostEntPtr->h_name);
-            } else {
-                Tcl_DStringAppendElement(dsPtr,
-                        (*winSock.inet_ntoa)(sockname.sin_addr));
-            }
-            TclFormatInt(buf, (*winSock.ntohs)(sockname.sin_port));
-            Tcl_DStringAppendElement(dsPtr, buf);
-            if (len == 0) {
-                Tcl_DStringEndSublist(dsPtr);
-            } else {
-                return TCL_OK;
-            }
-        } else {
-	    if (interp) {
-		TclWinConvertWSAError((*winSock.WSAGetLastError)());
-		Tcl_AppendResult(interp, "can't get sockname: ",
-				 Tcl_PosixError(interp),
-				 (char *) NULL);
-	    }
-	    return TCL_ERROR;
-	}
-    }
-
-    if (len > 0) {
-        return Tcl_BadChannelOption(interp, optionName, "peername sockname");
-    }
-
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpWatchProc --
- *
- *	Informs the channel driver of the events that the generic
- *	channel code wishes to receive on this socket.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May cause the notifier to poll if any of the specified 
- *	conditions are already true.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-TcpWatchProc(instanceData, mask)
-    ClientData instanceData;		/* The socket state. */
-    int mask;				/* Events of interest; an OR-ed
-                                         * combination of TCL_READABLE,
-                                         * TCL_WRITABLE and TCL_EXCEPTION. */
-{
-    SocketInfo *infoPtr = (SocketInfo *) instanceData;
-    
-    /*
-     * Update the watch events mask.
-     */
-    
-    infoPtr->watchEvents = 0;
-    if (mask & TCL_READABLE) {
-	infoPtr->watchEvents |= (FD_READ|FD_CLOSE|FD_ACCEPT);
-    }
-    if (mask & TCL_WRITABLE) {
-	infoPtr->watchEvents |= (FD_WRITE|FD_CONNECT);
-    }
-
-    /*
-     * If there are any conditions already set, then tell the notifier to poll
-     * rather than block.
-     */
-
-    if (infoPtr->readyEvents & infoPtr->watchEvents) {
-	Tcl_Time blockTime = { 0, 0 };
-	Tcl_SetMaxBlockTime(&blockTime);
-    }		
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TcpGetProc --
- *
- *	Called from Tcl_GetChannelHandle to retrieve an OS handle from inside
- *	a TCP socket based channel.
- *
- * Results:
- *	Returns TCL_OK with the socket in handlePtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TcpGetHandleProc(instanceData, direction, handlePtr)
-    ClientData instanceData;	/* The socket state. */
-    int direction;		/* Not used. */
-    ClientData *handlePtr;	/* Where to store the handle.  */
-{
-    SocketInfo *statePtr = (SocketInfo *) instanceData;
-
-    *handlePtr = (ClientData) statePtr->socket;
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * SocketProc --
- *
- *	This function is called when WSAAsyncSelect has been used
- *	to register interest in a socket event, and the event has
- *	occurred.
- *
- * Results:
- *	0 on success.
- *
- * Side effects:
- *	The flags for the given socket are updated to reflect the
- *	event that occured.
- *
- *----------------------------------------------------------------------
- */
-
-static LRESULT CALLBACK
-SocketProc(hwnd, message, wParam, lParam)
-    HWND hwnd;
-    UINT message;
-    WPARAM wParam;
-    LPARAM lParam;
-{
-    int event, error;
-    SOCKET socket;
-    SocketInfo *infoPtr;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (message != SOCKET_MESSAGE) {
-	return DefWindowProc(hwnd, message, wParam, lParam);
-    }
-
-    event = WSAGETSELECTEVENT(lParam);
-    error = WSAGETSELECTERROR(lParam);
-    socket = (SOCKET) wParam;
-
-    /*
-     * Find the specified socket on the socket list and update its
-     * eventState flag.
-     */
-
-    for (infoPtr = tsdPtr->socketList; infoPtr != NULL; 
-	    infoPtr = infoPtr->nextPtr) {
-	if (infoPtr->socket == socket) {
-	    /*
-	     * Update the socket state.
-	     */
-
-	    if (event & FD_CLOSE) {
-		infoPtr->readyEvents &= ~(FD_WRITE|FD_ACCEPT);
-	    }
-	    if (event & FD_CONNECT) {
-		/*
-		 * The socket is now connected, so clear the async connect
-		 * flag.
-		 */
-
-		infoPtr->flags &= ~(SOCKET_ASYNC_CONNECT);
-
-		/*
-		 * Remember any error that occurred so we can report
-		 * connection failures.
-		 */
-
-		if (error != ERROR_SUCCESS) {
-		    TclWinConvertWSAError(error);
-		    infoPtr->lastError = Tcl_GetErrno();
-		}
-
-	    } 
-	    if(infoPtr->flags & SOCKET_ASYNC_CONNECT) {
-		infoPtr->flags &= ~(SOCKET_ASYNC_CONNECT);
-		if (error != ERROR_SUCCESS) {
-		    TclWinConvertWSAError(error);
-		    infoPtr->lastError = Tcl_GetErrno();
-		}
-		infoPtr->readyEvents |= FD_WRITE;
-	    }
-	    infoPtr->readyEvents |= event;
-	    break;
-	}
-    }
-
-    /*
-     * Flush the Tcl event queue before returning to the event loop.
-     */
-
-    Tcl_ServiceAll();
-
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetHostName --
- *
- *	Returns the name of the local host.
- *
- * Results:
- *	A string containing the network name for this machine, or
- *	an empty string if we can't figure out the name.  The caller 
- *	must not modify or free this string.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-Tcl_GetHostName()
-{
-    DWORD length;
-    WCHAR wbuf[MAX_COMPUTERNAME_LENGTH + 1];
-
-    Tcl_MutexLock(&socketMutex);
-    if (hostnameInitialized) {
-	Tcl_MutexUnlock(&socketMutex);
-        return hostname;
-    }
-
-    if (TclpHasSockets(NULL) == TCL_OK) {
-	/*
-	 * INTL: bug
-	 */
-
-	if ((*winSock.gethostname)(hostname, sizeof(hostname)) == 0) {
-	    hostnameInitialized = 1;
-	    Tcl_MutexUnlock(&socketMutex);
-	    return hostname;
-	}
-    }
-    length = sizeof(hostname);
-    if ((*tclWinProcs->getComputerNameProc)(wbuf, &length) != 0) {
-	/*
-	 * Convert string from native to UTF then change to lowercase.
-	 */
-
-	Tcl_DString ds;
-
-	lstrcpynA(hostname, Tcl_WinTCharToUtf((TCHAR *) wbuf, -1, &ds),
-		sizeof(hostname));
-	Tcl_DStringFree(&ds);
-	Tcl_UtfToLower(hostname);
-    } else {
-	hostname[0] = '\0';
-    }
-    hostnameInitialized = 1;
-    Tcl_MutexUnlock(&socketMutex);
-    return hostname;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclWinGetSockOpt, et al. --
- *
- *	These functions are wrappers that let us bind the WinSock
- *	API dynamically so we can run on systems that don't have
- *	the wsock32.dll.  We need wrappers for these interfaces
- *	because they are called from the generic Tcl code.
- *
- * Results:
- *	As defined for each function.
- *
- * Side effects:
- *	As defined for each function.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclWinGetSockOpt(SOCKET s, int level, int optname, char * optval,
-	int FAR *optlen)
-{
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-        return SOCKET_ERROR;
-    }
-    
-    return (*winSock.getsockopt)(s, level, optname, optval, optlen);
-}
-
-int
-TclWinSetSockOpt(SOCKET s, int level, int optname, const char * optval,
-	int optlen)
-{
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-    if (!SocketsEnabled()) {
-        return SOCKET_ERROR;
-    }
-
-    return (*winSock.setsockopt)(s, level, optname, optval, optlen);
-}
-
-u_short
-TclWinNToHS(u_short netshort)
-{
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-
-    if (!SocketsEnabled()) {
-        return (u_short) -1;
-    }
-
-    return (*winSock.ntohs)(netshort);
-}
-
-struct servent *
-TclWinGetServByName(const char * name, const char * proto)
-{
-    /*
-     * Check that WinSock is initialized; do not call it if not, to
-     * prevent system crashes. This can happen at exit time if the exit
-     * handler for WinSock ran before other exit handlers that want to
-     * use sockets.
-     */
-    if (!SocketsEnabled()) {
-        return (struct servent *) NULL;
-    }
-
-    return (*winSock.getservbyname)(name, proto);
-}
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
deleted file mode 100644
index 826355f..0000000
--- a/win/tclWinTest.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* 
- * tclWinTest.c --
- *
- *	Contains commands for platform specific tests on Windows.
- *
- * Copyright (c) 1996 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinTest.c,v 1.3 1999/04/16 00:48:10 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-/*
- * Forward declarations of procedures defined later in this file:
- */
-int			TclplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp));
-static int		TesteventloopCmd _ANSI_ARGS_((ClientData dummy,
-			    Tcl_Interp *interp, int argc, char **argv));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclplatformtestInit --
- *
- *	Defines commands that test platform specific functionality for
- *	Unix platforms.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Defines new commands.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclplatformtestInit(interp)
-    Tcl_Interp *interp;		/* Interpreter to add commands to. */
-{
-    /*
-     * Add commands for platform specific tests for Windows here.
-     */
-
-    Tcl_CreateCommand(interp, "testeventloop", TesteventloopCmd,
-            (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TesteventloopCmd --
- *
- *	This procedure implements the "testeventloop" command. It is
- *	used to test the Tcl notifier from an "external" event loop
- *	(i.e. not Tcl_DoOneEvent()).
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TesteventloopCmd(clientData, interp, argc, argv)
-    ClientData clientData;		/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
-{
-    static int *framePtr = NULL; /* Pointer to integer on stack frame of
-				  * innermost invocation of the "wait"
-				  * subcommand. */
-
-   if (argc < 2) {
-	Tcl_AppendResult(interp, "wrong # arguments: should be \"", argv[0],
-                " option ... \"", (char *) NULL);
-        return TCL_ERROR;
-    }
-    if (strcmp(argv[1], "done") == 0) {
-	*framePtr = 1;
-    } else if (strcmp(argv[1], "wait") == 0) {
-	int *oldFramePtr;
-	int done;
-	MSG msg;
-	int oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
-
-	/*
-	 * Save the old stack frame pointer and set up the current frame.
-	 */
-
-	oldFramePtr = framePtr;
-	framePtr = &done;
-
-	/*
-	 * Enter a standard Windows event loop until the flag changes.
-	 * Note that we do not explicitly call Tcl_ServiceEvent().
-	 */
-
-	done = 0;
-	while (!done) {
-	    if (!GetMessage(&msg, NULL, 0, 0)) {
-		/*
-		 * The application is exiting, so repost the quit message
-		 * and start unwinding.
-		 */
-
-		PostQuitMessage(msg.wParam);
-		break;
-	    }
-	    TranslateMessage(&msg);
-	    DispatchMessage(&msg);
-	}
-	(void) Tcl_SetServiceMode(oldMode);
-	framePtr = oldFramePtr;
-    } else {
-	Tcl_AppendResult(interp, "bad option \"", argv[1],
-		"\": must be done or wait", (char *) NULL);
-	return TCL_ERROR;
-    }
-    return TCL_OK;
-}
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
deleted file mode 100644
index ade458e..0000000
--- a/win/tclWinThrd.c
+++ /dev/null
@@ -1,900 +0,0 @@
-/* 
- * tclWinThread.c --
- *
- *	This file implements the Windows-specific thread operations.
- *
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * Copyright (c) 1999 by Scriptics Corporation
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS:  @(#) tclWinThrd.c 1.13 98/02/18 14:00:23
- */
-
-#include "tclWinInt.h"
-
-#include <dos.h>
-#include <fcntl.h>
-#include <io.h>
-#include <sys/stat.h>
-
-/*
- * This is the master lock used to serialize access to other
- * serialization data structures.
- */
-
-static CRITICAL_SECTION masterLock;
-static int init = 0;
-#define MASTER_LOCK  EnterCriticalSection(&masterLock)
-#define MASTER_UNLOCK  LeaveCriticalSection(&masterLock)
-
-/*
- * This is the master lock used to serialize initialization and finalization
- * of Tcl as a whole.
- */
-
-static CRITICAL_SECTION initLock;
-
-/*
- * Condition variables are implemented with a combination of a 
- * per-thread Windows Event and a per-condition waiting queue.
- * The idea is that each thread has its own Event that it waits
- * on when it is doing a ConditionWait; it uses the same event for
- * all condition variables because it only waits on one at a time.
- * Each condition variable has a queue of waiting threads, and a 
- * mutex used to serialize access to this queue.
- *
- * Special thanks to David Nichols and
- * Jim Davidson for advice on the Condition Variable implementation.
- */
-
-/*
- * The per-thread event and queue pointers.
- */
-
-typedef struct ThreadSpecificData {
-    HANDLE condEvent;			/* Per-thread condition event */
-    struct ThreadSpecificData *nextPtr;	/* Queue pointers */
-    struct ThreadSpecificData *prevPtr;
-    int flags;				/* See flags below */
-} ThreadSpecificData;
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * State bits for the thread.
- * WIN_THREAD_UNINIT		Uninitialized.  Must be zero because
- *				of the way ThreadSpecificData is created.
- * WIN_THREAD_RUNNING		Running, not waiting.
- * WIN_THREAD_BLOCKED		Waiting, or trying to wait.
- * WIN_THREAD_DEAD		Dying - no per-thread event anymore.
- */ 
-
-#define WIN_THREAD_UNINIT	0x0
-#define WIN_THREAD_RUNNING	0x1
-#define WIN_THREAD_BLOCKED	0x2
-#define WIN_THREAD_DEAD		0x4
-
-/*
- * The per condition queue pointers and the
- * Mutex used to serialize access to the queue.
- */
-
-typedef struct WinCondition {
-    CRITICAL_SECTION condLock;	/* Lock to serialize queuing on the condition */
-    struct ThreadSpecificData *firstPtr;	/* Queue pointers */
-    struct ThreadSpecificData *lastPtr;
-} WinCondition;
-
-static void FinalizeConditionEvent(ClientData data);
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadCreate --
- *
- *	This procedure creates a new thread.
- *
- * Results:
- *	TCL_OK if the thread could be created.  The thread ID is
- *	returned in a parameter.
- *
- * Side effects:
- *	A new thread is created.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpThreadCreate(idPtr, proc, clientData)
-    Tcl_ThreadId *idPtr;		/* Return, the ID of the thread */
-    Tcl_ThreadCreateProc proc;		/* Main() function of the thread */
-    ClientData clientData;		/* The one argument to Main() */
-{
-    HANDLE tHandle;
-
-    tHandle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) proc,
-		(DWORD *)clientData, 0, (DWORD *)idPtr);
-    if (tHandle == NULL) {
-	return TCL_ERROR;
-    } else {
-	return TCL_OK;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadExit --
- *
- *	This procedure terminates the current thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	This procedure terminates the current thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadExit(status)
-    int status;
-{
-    ExitThread((DWORD)status);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_GetCurrentThread --
- *
- *	This procedure returns the ID of the currently running thread.
- *
- * Results:
- *	A thread ID.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-Tcl_ThreadId
-Tcl_GetCurrentThread()
-{
-    return (Tcl_ThreadId)GetCurrentThreadId();
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitLock
- *
- *	This procedure is used to grab a lock that serializes initialization
- *	and finalization of Tcl.  On some platforms this may also initialize
- *	the mutex used to serialize creation of more mutexes and thread
- *	local storage keys.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitLock()
-{
-    if (!init) {
-	/*
-	 * There is a fundamental race here that is solved by creating
-	 * the first Tcl interpreter in a single threaded environment.
-	 * Once the interpreter has been created, it is safe to create
-	 * more threads that create interpreters in parallel.
-	 */
-	init = 1;
-	InitializeCriticalSection(&initLock);
-	InitializeCriticalSection(&masterLock);
-    }
-    EnterCriticalSection(&initLock);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpInitUnlock
- *
- *	This procedure is used to release a lock that serializes initialization
- *	and finalization of Tcl.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the initialization mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpInitUnlock()
-{
-    LeaveCriticalSection(&initLock);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterLock
- *
- *	This procedure is used to grab a lock that serializes creation
- *	of mutexes, condition variables, and thread local storage keys.
- *
- *	This lock must be different than the initLock because the
- *	initLock is held during creation of syncronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Acquire the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterLock()
-{
-    if (!init) {
-	/*
-	 * There is a fundamental race here that is solved by creating
-	 * the first Tcl interpreter in a single threaded environment.
-	 * Once the interpreter has been created, it is safe to create
-	 * more threads that create interpreters in parallel.
-	 */
-	init = 1;
-	InitializeCriticalSection(&initLock);
-	InitializeCriticalSection(&masterLock);
-    }
-    EnterCriticalSection(&masterLock);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMasterUnlock
- *
- *	This procedure is used to release a lock that serializes creation
- *	and deletion of synchronization objects.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Release the master mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMasterUnlock()
-{
-    LeaveCriticalSection(&masterLock);
-}
-
-#ifdef TCL_THREADS
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpMutexInit --
- * TclpMutexLock --
- * TclpMutexUnlock --
- *
- *	These procedures use an explicitly initialized mutex.
- *	These are used by memory allocators for their own mutex.
- * 
- * Results:
- *	None.
- *
- * Side effects:
- *	Initialize, Lock, and Unlock the mutex.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpMutexInit(mPtr)
-    TclpMutex *mPtr;
-{
-    InitializeCriticalSection((CRITICAL_SECTION *)mPtr);
-}
-void
-TclpMutexLock(mPtr)
-    TclpMutex *mPtr;
-{
-    EnterCriticalSection((CRITICAL_SECTION *)mPtr);
-}
-void
-TclpMutexUnlock(mPtr)
-    TclpMutex *mPtr;
-{
-    LeaveCriticalSection((CRITICAL_SECTION *)mPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MutexLock --
- *
- *	This procedure is invoked to lock a mutex.  This is a self 
- *	initializing mutex that is automatically finalized during
- *	Tcl_Finalize.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May block the current thread.  The mutex is aquired when
- *	this returns.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexLock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* The lock */
-{
-    CRITICAL_SECTION *csPtr;
-    if (*mutexPtr == NULL) {
-	MASTER_LOCK;
-
-	/* 
-	 * Double inside master lock check to avoid a race.
-	 */
-
-	if (*mutexPtr == NULL) {
-	    csPtr = (CRITICAL_SECTION *)ckalloc(sizeof(CRITICAL_SECTION));
-	    InitializeCriticalSection(csPtr);
-	    *mutexPtr = (Tcl_Mutex)csPtr;
-	    TclRememberMutex(mutexPtr);
-	}
-	MASTER_UNLOCK;
-    }
-    csPtr = *((CRITICAL_SECTION **)mutexPtr);
-    EnterCriticalSection(csPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_MutexUnlock --
- *
- *	This procedure is invoked to unlock a mutex.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex is released when this returns.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_MutexUnlock(mutexPtr)
-    Tcl_Mutex *mutexPtr;	/* The lock */
-{
-    CRITICAL_SECTION *csPtr = *((CRITICAL_SECTION **)mutexPtr);
-    LeaveCriticalSection(csPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeMutex --
- *
- *	This procedure is invoked to clean up one mutex.  This is only
- *	safe to call at the end of time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The mutex list is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeMutex(mutexPtr)
-    Tcl_Mutex *mutexPtr;
-{
-    CRITICAL_SECTION *csPtr = *(CRITICAL_SECTION **)mutexPtr;
-    if (csPtr != NULL) {
-	ckfree((char *)csPtr);
-	*mutexPtr = NULL;
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyInit --
- *
- *	This procedure initializes a thread specific data block key.
- *	Each thread has table of pointers to thread specific data.
- *	all threads agree on which table entry is used by each module.
- *	this is remembered in a "data key", that is just an index into
- *	this table.  To allow self initialization, the interface
- *	passes a pointer to this key and the first thread to use
- *	the key fills in the pointer to the key.  The key should be
- *	a process-wide static.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Will allocate memory the first time this process calls for
- *	this key.  In this case it modifies its argument
- *	to hold the pointer to information about the key.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeyInit(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (DWORD **) */
-{
-    DWORD *indexPtr;
-
-    MASTER_LOCK;
-    if (*keyPtr == NULL) {
-	indexPtr = (DWORD *)ckalloc(sizeof(DWORD));
-	*indexPtr = TlsAlloc();
-	*keyPtr = (Tcl_ThreadDataKey)indexPtr;
-	TclRememberDataKey(keyPtr);
-    }
-    MASTER_UNLOCK;
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeyGet --
- *
- *	This procedure returns a pointer to a block of thread local storage.
- *
- * Results:
- *	A thread-specific pointer to the data structure, or NULL
- *	if the memory has not been assigned to this key for this thread.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-VOID *
-TclpThreadDataKeyGet(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (DWORD **) */
-{
-    DWORD *indexPtr = *(DWORD **)keyPtr;
-    if (indexPtr == NULL) {
-	return NULL;
-    } else {
-	return (VOID *) TlsGetValue(*indexPtr);
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpThreadDataKeySet --
- *
- *	This procedure sets the pointer to a block of thread local storage.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Sets up the thread so future calls to TclpThreadDataKeyGet with
- *	this key will return the data pointer.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpThreadDataKeySet(keyPtr, data)
-    Tcl_ThreadDataKey *keyPtr;	/* Identifier for the data chunk,
-				 * really (pthread_key_t **) */
-    VOID *data;			/* Thread local storage */
-{
-    DWORD *indexPtr = *(DWORD **)keyPtr;
-    TlsSetValue(*indexPtr, (void *)data);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadData --
- *
- *	This procedure cleans up the thread-local storage.  This is
- *	called once for each thread.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Frees up the memory.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadData(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    VOID *result;
-    DWORD *indexPtr;
-
-    if (*keyPtr != NULL) {
-	indexPtr = *(DWORD **)keyPtr;
-	result = (VOID *)TlsGetValue(*indexPtr);
-	if (result != NULL) {
-	    ckfree((char *)result);
-	    TlsSetValue(*indexPtr, (void *)NULL);
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeThreadDataKey --
- *
- *	This procedure is invoked to clean up one key.  This is a
- *	process-wide storage identifier.  The thread finalization code
- *	cleans up the thread local storage itself.
- *
- *	This assumes the master lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The key is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeThreadDataKey(keyPtr)
-    Tcl_ThreadDataKey *keyPtr;
-{
-    DWORD *indexPtr;
-    if (*keyPtr != NULL) {
-	indexPtr = *(DWORD **)keyPtr;
-	TlsFree(*indexPtr);
-	ckfree((char *)indexPtr);
-	*keyPtr = NULL;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionWait --
- *
- *	This procedure is invoked to wait on a condition variable.
- *	The mutex is automically released as part of the wait, and
- *	automatically grabbed when the condition is signaled.
- *
- *	The mutex must be held when this procedure is called.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May block the current thread.  The mutex is aquired when
- *	this returns.  Will allocate memory for a HANDLE
- *	and initialize this the first time this Tcl_Condition is used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionWait(condPtr, mutexPtr, timePtr)
-    Tcl_Condition *condPtr;	/* Really (WinCondition **) */
-    Tcl_Mutex *mutexPtr;	/* Really (CRITICAL_SECTION **) */
-    Tcl_Time *timePtr;		/* Timeout on waiting period */
-{
-    WinCondition *winCondPtr;	/* Per-condition queue head */
-    CRITICAL_SECTION *csPtr;	/* Caller's Mutex, after casting */
-    DWORD wtime;		/* Windows time value */
-    int timeout;		/* True if we got a timeout */
-    int doExit = 0;		/* True if we need to do exit setup */
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    if (tsdPtr->flags & WIN_THREAD_DEAD) {
-	/*
-	 * No more per-thread event on which to wait.
-	 */
-
-	return;
-    }
-
-    /*
-     * Self initialize the two parts of the contition.
-     * The per-condition and per-thread parts need to be
-     * handled independently.
-     */
-
-    if (tsdPtr->flags == WIN_THREAD_UNINIT) {
-	MASTER_LOCK;
-
-	/* 
-	 * Create the per-thread event and queue pointers.
-	 */
-
-	if (tsdPtr->flags == WIN_THREAD_UNINIT) {
-	    tsdPtr->condEvent = CreateEvent(NULL, TRUE /* manual reset */,
-			FALSE /* non signaled */, NULL);
-	    tsdPtr->nextPtr = NULL;
-	    tsdPtr->prevPtr = NULL;
-	    tsdPtr->flags = WIN_THREAD_RUNNING;
-	    doExit = 1;
-	}
-	MASTER_UNLOCK;
-
-	if (doExit) {
-	    /*
-	     * Create a per-thread exit handler to clean up the condEvent.
-	     * We must be careful do do this outside the Master Lock
-	     * because Tcl_CreateThreadExitHandler uses its own
-	     * ThreadSpecificData, and initializing that may drop
-	     * back into the Master Lock.
-	     */
-	    
-	    Tcl_CreateThreadExitHandler(FinalizeConditionEvent,
-		    (ClientData) tsdPtr);
-	}
-    }
-
-    if (*condPtr == NULL) {
-	MASTER_LOCK;
-
-	/*
-	 * Initialize the per-condition queue pointers and Mutex.
-	 */
-
-	if (*condPtr == NULL) {
-	    winCondPtr = (WinCondition *)ckalloc(sizeof(WinCondition));
-	    InitializeCriticalSection(&winCondPtr->condLock);
-	    winCondPtr->firstPtr = NULL;
-	    winCondPtr->lastPtr = NULL;
-	    *condPtr = (Tcl_Condition)winCondPtr;
-	    TclRememberCondition(condPtr);
-	}
-	MASTER_UNLOCK;
-    }
-    csPtr = *((CRITICAL_SECTION **)mutexPtr);
-    winCondPtr = *((WinCondition **)condPtr);
-    if (timePtr == NULL) {
-	wtime = INFINITE;
-    } else {
-	wtime = timePtr->sec * 1000 + timePtr->usec / 1000;
-    }
-
-    /*
-     * Queue the thread on the condition, using
-     * the per-condition lock for serialization.
-     */
-
-    tsdPtr->flags = WIN_THREAD_BLOCKED;
-    tsdPtr->nextPtr = NULL;
-    EnterCriticalSection(&winCondPtr->condLock);
-    tsdPtr->prevPtr = winCondPtr->lastPtr;		/* A: */
-    winCondPtr->lastPtr = tsdPtr;
-    if (tsdPtr->prevPtr != NULL) {
-        tsdPtr->prevPtr->nextPtr = tsdPtr;
-    }
-    if (winCondPtr->firstPtr == NULL) {
-        winCondPtr->firstPtr = tsdPtr;
-    }
-
-    /*
-     * Unlock the caller's mutex and wait for the condition, or a timeout.
-     * There is a minor issue here in that we don't count down the
-     * timeout if we get notified, but another thread grabs the condition
-     * before we do.  In that race condition we'll wait again for the
-     * full timeout.  Timed waits are dubious anyway.  Either you have
-     * the locking protocol wrong and are masking a deadlock,
-     * or you are using conditions to pause your thread.
-     */
-    
-    LeaveCriticalSection(csPtr);
-    timeout = 0;
-    while (!timeout && (tsdPtr->flags & WIN_THREAD_BLOCKED)) {
-	ResetEvent(tsdPtr->condEvent);
-	LeaveCriticalSection(&winCondPtr->condLock);
-	if (WaitForSingleObject(tsdPtr->condEvent, wtime) == WAIT_TIMEOUT) {
-	    timeout = 1;
-	}
-	EnterCriticalSection(&winCondPtr->condLock);
-    }
-
-    /*
-     * Be careful on timeouts because the signal might arrive right around
-     * time time limit and someone else could have taken us off the queue.
-     */
-    
-    if (timeout) {
-	if (tsdPtr->flags & WIN_THREAD_RUNNING) {
-	    timeout = 0;
-	} else {
-	    /*
-	     * When dequeuing, we can leave the tsdPtr->nextPtr
-	     * and tsdPtr->prevPtr with dangling pointers because
-	     * they are reinitialilzed w/out reading them when the
-	     * thread is enqueued later.
-	     */
-
-            if (winCondPtr->firstPtr == tsdPtr) {
-                winCondPtr->firstPtr = tsdPtr->nextPtr;
-            } else {
-                tsdPtr->prevPtr->nextPtr = tsdPtr->nextPtr;
-            }
-            if (winCondPtr->lastPtr == tsdPtr) {
-                winCondPtr->lastPtr = tsdPtr->prevPtr;
-            } else {
-                tsdPtr->nextPtr->prevPtr = tsdPtr->prevPtr;
-            }
-            tsdPtr->flags = WIN_THREAD_RUNNING;
-	}
-    }
-
-    LeaveCriticalSection(&winCondPtr->condLock);
-    EnterCriticalSection(csPtr);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * Tcl_ConditionNotify --
- *
- *	This procedure is invoked to signal a condition variable.
- *
- *	The mutex must be held during this call to avoid races,
- *	but this interface does not enforce that.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May unblock another thread.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tcl_ConditionNotify(condPtr)
-    Tcl_Condition *condPtr;
-{
-    WinCondition *winCondPtr;
-    ThreadSpecificData *tsdPtr;
-    if (condPtr != NULL) {
-	winCondPtr = *((WinCondition **)condPtr);
-
-	/*
-	 * Loop through all the threads waiting on the condition
-	 * and notify them (i.e., broadcast semantics).  The queue
-	 * manipulation is guarded by the per-condition coordinating mutex.
-	 */
-
-	EnterCriticalSection(&winCondPtr->condLock);
-	while (winCondPtr->firstPtr != NULL) {
-	    tsdPtr = winCondPtr->firstPtr;
-	    winCondPtr->firstPtr = tsdPtr->nextPtr;
-	    if (winCondPtr->lastPtr == tsdPtr) {
-		winCondPtr->lastPtr = NULL;
-	    }
-	    tsdPtr->flags = WIN_THREAD_RUNNING;
-	    tsdPtr->nextPtr = NULL;
-	    tsdPtr->prevPtr = NULL;	/* Not strictly necessary, see A: */
-	    SetEvent(tsdPtr->condEvent);
-	}
-	LeaveCriticalSection(&winCondPtr->condLock);
-    } else {
-	/*
-	 * Noone has used the condition variable, so there are no waiters.
-	 */
-    }
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * FinalizeConditionEvent --
- *
- *	This procedure is invoked to clean up the per-thread
- *	event used to implement condition waiting.
- *	This is only safe to call at the end of time.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The per-thread event is closed.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-FinalizeConditionEvent(data)
-    ClientData data;
-{
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)data;
-    tsdPtr->flags = WIN_THREAD_DEAD;
-    CloseHandle(tsdPtr->condEvent);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpFinalizeCondition --
- *
- *	This procedure is invoked to clean up a condition variable.
- *	This is only safe to call at the end of time.
- *
- *	This assumes the Master Lock is held.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The condition variable is deallocated.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpFinalizeCondition(condPtr)
-    Tcl_Condition *condPtr;
-{
-    WinCondition *winCondPtr = *(WinCondition **)condPtr;
-
-    /*
-     * Note - this is called long after the thread-local storage is
-     * reclaimed.  The per-thread condition waiting event is
-     * reclaimed earlier in a per-thread exit handler, which is
-     * called before thread local storage is reclaimed.
-     */
-
-    if (winCondPtr != NULL) {
-	ckfree((char *)winCondPtr);
-	*condPtr = NULL;
-    }
-}
-#endif /* TCL_THREADS */
diff --git a/win/tclWinThrd.h b/win/tclWinThrd.h
deleted file mode 100644
index 2572d1b..0000000
--- a/win/tclWinThrd.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * tclWinThrd.h --
- *
- *      This header file defines things for thread support.
- *
- * Copyright (c) 1998 Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * SCCS: @(#) tclWinThrd.h 1.2 98/01/27 11:48:05
- */
- 
-#ifndef _TCLWINTHRD
-#define _TCLWINTHRD
-
-#ifdef TCL_THREADS
-
-#endif /* TCL_THREADS */
-
-#endif /* _TCLWINTHRD */
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
deleted file mode 100644
index de0e3dd..0000000
--- a/win/tclWinTime.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* 
- * tclWinTime.c --
- *
- *	Contains Windows specific versions of Tcl functions that
- *	obtain time values from the operating system.
- *
- * Copyright 1995-1998 by Sun Microsystems, Inc.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tclWinTime.c,v 1.4 1999/04/16 00:48:10 stanton Exp $
- */
-
-#include "tclWinInt.h"
-
-#define SECSPERDAY (60L * 60L * 24L)
-#define SECSPERYEAR (SECSPERDAY * 365L)
-#define SECSPER4YEAR (SECSPERYEAR * 4L + SECSPERDAY)
-
-/*
- * The following arrays contain the day of year for the last day of
- * each month, where index 1 is January.
- */
-
-static int normalDays[] = {
-    -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364
-};
-
-static int leapDays[] = {
-    -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
-};
-
-typedef struct ThreadSpecificData {
-    char tzName[64];		/* Time zone name */
-    struct tm tm;		/* time information */
-} ThreadSpecificData;
-static Tcl_ThreadDataKey dataKey;
-
-/*
- * Declarations for functions defined later in this file.
- */
-
-static struct tm *	ComputeGMT _ANSI_ARGS_((const time_t *tp));
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetSeconds --
- *
- *	This procedure returns the number of seconds from the epoch.
- *	On most Unix systems the epoch is Midnight Jan 1, 1970 GMT.
- *
- * Results:
- *	Number of seconds from the epoch.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetSeconds()
-{
-    return (unsigned long) time((time_t *) NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetClicks --
- *
- *	This procedure returns a value that represents the highest
- *	resolution clock available on the system.  There are no
- *	guarantees on what the resolution will be.  In Tcl we will
- *	call this value a "click".  The start time is also system
- *	dependant.
- *
- * Results:
- *	Number of clicks from some start time.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-unsigned long
-TclpGetClicks()
-{
-    return GetTickCount();
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTimeZone --
- *
- *	Determines the current timezone.  The method varies wildly
- *	between different Platform implementations, so its hidden in
- *	this function.
- *
- * Results:
- *	Minutes west of GMT.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclpGetTimeZone (currentTime)
-    unsigned long  currentTime;
-{
-    int timeZone;
-
-    tzset();
-    timeZone = _timezone / 60;
-
-    return timeZone;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTime --
- *
- *	Gets the current system time in seconds and microseconds
- *	since the beginning of the epoch: 00:00 UCT, January 1, 1970.
- *
- * Results:
- *	Returns the current time in timePtr.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TclpGetTime(timePtr)
-    Tcl_Time *timePtr;		/* Location to store time information. */
-{
-    struct timeb t;
-
-    ftime(&t);
-    timePtr->sec = t.time;
-    timePtr->usec = t.millitm * 1000;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetTZName --
- *
- *	Gets the current timezone string.
- *
- * Results:
- *	Returns a pointer to a static string, or NULL on failure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-char *
-TclpGetTZName(int dst)
-{
-    int len;
-    char *zone, *p;
-    TIME_ZONE_INFORMATION tz;
-    Tcl_Encoding encoding;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-    char *name = tsdPtr->tzName;
-
-    /*
-     * tzset() under Borland doesn't seem to set up tzname[] at all.
-     * tzset() under MSVC has the following weird observed behavior:
-     *	 First time we call "clock format [clock seconds] -format %Z -gmt 1"
-     *	 we get "GMT", but on all subsequent calls we get the current time 
-     *	 zone string, even though env(TZ) is GMT and the variable _timezone 
-     *   is 0.
-     */
-
-    name[0] = '\0';
-
-    zone = getenv("TZ");
-    if (zone != NULL) {
-	/*
-	 * TZ is of form "NST-4:30NDT", where "NST" would be the
-	 * name of the standard time zone for this area, "-4:30" is
-	 * the offset from GMT in hours, and "NDT is the name of 
-	 * the daylight savings time zone in this area.  The offset 
-	 * and DST strings are optional.
-	 */
-
-	len = strlen(zone);
-	if (len > 3) {
-	    len = 3;
-	}
-	if (dst != 0) {
-	    /*
-	     * Skip the offset string and get the DST string.
-	     */
-
-	    p = zone + len;
-	    p += strspn(p, "+-:0123456789");
-	    if (*p != '\0') {
-		zone = p;
-		len = strlen(zone);
-		if (len > 3) {
-		    len = 3;
-		}
-	    }
-	}
-	Tcl_ExternalToUtf(NULL, NULL, zone, len, 0, NULL, name,
-		sizeof(tsdPtr->tzName), NULL, NULL, NULL);
-    }
-    if ((name[0] == '\0') 
-	    && (GetTimeZoneInformation(&tz) != TIME_ZONE_ID_UNKNOWN)) {
-	encoding = Tcl_GetEncoding(NULL, "unicode");
-	Tcl_ExternalToUtf(NULL, encoding, 
-		(char *) ((dst) ? tz.DaylightName : tz.StandardName), -1, 
-		0, NULL, name, sizeof(tsdPtr->tzName), NULL, NULL, NULL);
-	Tcl_FreeEncoding(encoding);
-    } 
-    if (name[0] == '\0') {
-	return "%Z";
-    }
-    return name;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TclpGetDate --
- *
- *	This function converts between seconds and struct tm.  If
- *	useGMT is true, then the returned date will be in Greenwich
- *	Mean Time (GMT).  Otherwise, it will be in the local time zone.
- *
- * Results:
- *	Returns a static tm structure.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-struct tm *
-TclpGetDate(t, useGMT)
-    TclpTime_t t;
-    int useGMT;
-{
-    const time_t *tp = (const time_t *) t;
-    struct tm *tmPtr;
-    long time;
-
-    if (!useGMT) {
-	tzset();
-
-	/*
-	 * If we are in the valid range, let the C run-time library
-	 * handle it.  Otherwise we need to fake it.  Note that this
-	 * algorithm ignores daylight savings time before the epoch.
-	 */
-
-	if (*tp >= 0) {
-	    return localtime(tp);
-	}
-
-	time = *tp - _timezone;
-	
-	/*
-	 * If we aren't near to overflowing the long, just add the bias and
-	 * use the normal calculation.  Otherwise we will need to adjust
-	 * the result at the end.
-	 */
-
-	if (*tp < (LONG_MAX - 2 * SECSPERDAY)
-		&& *tp > (LONG_MIN + 2 * SECSPERDAY)) {
-	    tmPtr = ComputeGMT(&time);
-	} else {
-	    tmPtr = ComputeGMT(tp);
-
-	    tzset();
-
-	    /*
-	     * Add the bias directly to the tm structure to avoid overflow.
-	     * Propagate seconds overflow into minutes, hours and days.
-	     */
-
-	    time = tmPtr->tm_sec - _timezone;
-	    tmPtr->tm_sec = (int)(time % 60);
-	    if (tmPtr->tm_sec < 0) {
-		tmPtr->tm_sec += 60;
-		time -= 60;
-	    }
-    
-	    time = tmPtr->tm_min + time/60;
-	    tmPtr->tm_min = (int)(time % 60);
-	    if (tmPtr->tm_min < 0) {
-		tmPtr->tm_min += 60;
-		time -= 60;
-	    }
-
-	    time = tmPtr->tm_hour + time/60;
-	    tmPtr->tm_hour = (int)(time % 24);
-	    if (tmPtr->tm_hour < 0) {
-		tmPtr->tm_hour += 24;
-		time -= 24;
-	    }
-
-	    time /= 24;
-	    tmPtr->tm_mday += time;
-	    tmPtr->tm_yday += time;
-	    tmPtr->tm_wday = (tmPtr->tm_wday + time) % 7;
-	}
-    } else {
-	tmPtr = ComputeGMT(tp);
-    }
-    return tmPtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ComputeGMT --
- *
- *	This function computes GMT given the number of seconds since
- *	the epoch (midnight Jan 1 1970).
- *
- * Results:
- *	Returns a (per thread) statically allocated struct tm.
- *
- * Side effects:
- *	Updates the values of the static struct tm.
- *
- *----------------------------------------------------------------------
- */
-
-static struct tm *
-ComputeGMT(tp)
-    const time_t *tp;
-{
-    struct tm *tmPtr;
-    long tmp, rem;
-    int isLeap;
-    int *days;
-    ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey);
-
-    tmPtr = &tsdPtr->tm;
-
-    /*
-     * Compute the 4 year span containing the specified time.
-     */
-
-    tmp = *tp / SECSPER4YEAR;
-    rem = *tp % SECSPER4YEAR;
-
-    /*
-     * Correct for weird mod semantics so the remainder is always positive.
-     */
-
-    if (rem < 0) {
-	tmp--;
-	rem += SECSPER4YEAR;
-    }
-
-    /*
-     * Compute the year after 1900 by taking the 4 year span and adjusting
-     * for the remainder.  This works because 2000 is a leap year, and
-     * 1900/2100 are out of the range.
-     */
-
-    tmp = (tmp * 4) + 70;
-    isLeap = 0;
-    if (rem >= SECSPERYEAR) {			  /* 1971, etc. */
-	tmp++;
-	rem -= SECSPERYEAR;
-	if (rem >= SECSPERYEAR) {		  /* 1972, etc. */
-	    tmp++;
-	    rem -= SECSPERYEAR;
-	    if (rem >= SECSPERYEAR + SECSPERDAY) { /* 1973, etc. */
-		tmp++;
-		rem -= SECSPERYEAR + SECSPERDAY;
-	    } else {
-		isLeap = 1;
-	    }
-	}
-    }
-    tmPtr->tm_year = tmp;
-
-    /*
-     * Compute the day of year and leave the seconds in the current day in
-     * the remainder.
-     */
-
-    tmPtr->tm_yday = rem / SECSPERDAY;
-    rem %= SECSPERDAY;
-    
-    /*
-     * Compute the time of day.
-     */
-
-    tmPtr->tm_hour = rem / 3600;
-    rem %= 3600;
-    tmPtr->tm_min = rem / 60;
-    tmPtr->tm_sec = rem % 60;
-
-    /*
-     * Compute the month and day of month.
-     */
-
-    days = (isLeap) ? leapDays : normalDays;
-    for (tmp = 1; days[tmp] < tmPtr->tm_yday; tmp++) {
-    }
-    tmPtr->tm_mon = --tmp;
-    tmPtr->tm_mday = tmPtr->tm_yday - days[tmp];
-
-    /*
-     * Compute day of week.  Epoch started on a Thursday.
-     */
-
-    tmPtr->tm_wday = (*tp / SECSPERDAY) + 4;
-    if ((*tp % SECSPERDAY) < 0) {
-	tmPtr->tm_wday--;
-    }
-    tmPtr->tm_wday %= 7;
-    if (tmPtr->tm_wday < 0) {
-	tmPtr->tm_wday += 7;
-    }
-
-    return tmPtr;
-}
diff --git a/win/tclsh.rc b/win/tclsh.rc
deleted file mode 100644
index 44a3f35..0000000
--- a/win/tclsh.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-// RCS: @(#) $Id: tclsh.rc,v 1.3 1999/04/16 00:48:10 stanton Exp $
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <tcl.h>
-
-LANGUAGE 0x9, 0x1	/* LANG_ENGLISH, SUBLANG_DEFAULT */
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 	TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- PRODUCTVERSION TCL_MAJOR_VERSION,TCL_MINOR_VERSION,TCL_RELEASE_LEVEL,TCL_RELEASE_SERIAL
- FILEFLAGSMASK 	0x3fL
- FILEFLAGS 	0x0L
- FILEOS 	0x4	/* VOS__WINDOWS32 */
- FILETYPE 	0x2	/* VFT_DLL */
- FILESUBTYPE 	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Tclsh Application\0"
-            VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".exe\0"
-            VALUE "CompanyName", "Sun Microsystems, Inc\0"
-            VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright (c) 1995-1996\0"
-            VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
-            VALUE "ProductVersion", TCL_PATCH_LEVEL
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
diff --git a/win/winDumpExts.c b/win/winDumpExts.c
deleted file mode 100644
index 80f7c87..0000000
--- a/win/winDumpExts.c
+++ /dev/null
@@ -1,505 +0,0 @@
-/* 
- * winDumpExts.c --
- * Author:   Gordon Chaffee, Scott Stanton
- *
- * History:  The real functionality of this file was written by
- *           Matt Pietrek in 1993 in his pedump utility.  I've
- *           modified it to dump the externals in a bunch of object
- *           files to create a .def file.
- *
- * 10/12/95  Modified by Scott Stanton to support Relocatable Object Module
- *	     Format files for Borland C++ 4.5.
- *
- * Notes:    Visual C++ puts an underscore before each exported symbol.
- *           This file removes them.  I don't know if this is a problem
- *           this other compilers.  If _MSC_VER is defined,
- *           the underscore is removed.  If not, it isn't.  To get a
- *           full dump of an object file, use the -f option.  This can
- *           help determine the something that may be different with a
- *           compiler other than Visual C++.
- *----------------------------------------------------------------------
- *
- * RCS: @(#) $Id: winDumpExts.c,v 1.3 1999/02/02 22:32:17 stanton Exp $
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <string.h>
-#include <process.h>
-
-#ifdef _ALPHA_
-#define e_magic_number IMAGE_FILE_MACHINE_ALPHA
-#else
-#define e_magic_number IMAGE_FILE_MACHINE_I386
-#endif
-
-/*
- *----------------------------------------------------------------------
- * GetArgcArgv --
- * 
- *	Break up a line into argc argv
- *----------------------------------------------------------------------
- */
-int
-GetArgcArgv(char *s, char **argv)
-{
-    int quote = 0;
-    int argc = 0;
-    char *bp;
-
-    bp = s;
-    while (1) {
-	while (isspace(*bp)) {
-	    bp++;
-	}
-	if (*bp == '\n' || *bp == '\0') {
-	    *bp = '\0';
-	    return argc;
-	}
-	if (*bp == '\"') {
-	    quote = 1;
-	    bp++;
-	}
-	argv[argc++] = bp;
-
-	while (*bp != '\0') {
-	    if (quote) {
-		if (*bp == '\"') {
-		    quote = 0;
-		    *bp = '\0';
-		    bp++;
-		    break;
-		}
-		bp++;
-		continue;
-	    }
-	    if (isspace(*bp)) {
-		*bp = '\0';
-		bp++;
-		break;
-	    }
-	    bp++;
-	}
-    }
-}
-
-/*
- *  The names of the first group of possible symbol table storage classes
- */
-char * SzStorageClass1[] = {
-    "NULL","AUTOMATIC","EXTERNAL","STATIC","REGISTER","EXTERNAL_DEF","LABEL",
-    "UNDEFINED_LABEL","MEMBER_OF_STRUCT","ARGUMENT","STRUCT_TAG",
-    "MEMBER_OF_UNION","UNION_TAG","TYPE_DEFINITION","UNDEFINED_STATIC",
-    "ENUM_TAG","MEMBER_OF_ENUM","REGISTER_PARAM","BIT_FIELD"
-};
-
-/*
- * The names of the second group of possible symbol table storage classes
- */
-char * SzStorageClass2[] = {
-    "BLOCK","FUNCTION","END_OF_STRUCT","FILE","SECTION","WEAK_EXTERNAL"
-};
-
-/*
- *----------------------------------------------------------------------
- * GetSZStorageClass --
- *
- *	Given a symbol storage class value, return a descriptive
- *	ASCII string
- *----------------------------------------------------------------------
- */
-PSTR
-GetSZStorageClass(BYTE storageClass)
-{
-	if ( storageClass <= IMAGE_SYM_CLASS_BIT_FIELD )
-		return SzStorageClass1[storageClass];
-	else if ( (storageClass >= IMAGE_SYM_CLASS_BLOCK)
-		      && (storageClass <= IMAGE_SYM_CLASS_WEAK_EXTERNAL) )
-		return SzStorageClass2[storageClass-IMAGE_SYM_CLASS_BLOCK];
-	else
-		return "???";
-}
-
-/*
- *----------------------------------------------------------------------
- * GetSectionName --
- *
- *	Used by DumpSymbolTable, it gives meaningful names to
- *	the non-normal section number.
- *
- * Results:
- *	A name is returned in buffer
- *----------------------------------------------------------------------
- */
-void
-GetSectionName(WORD section, PSTR buffer, unsigned cbBuffer)
-{
-    char tempbuffer[10];
-	
-    switch ( (SHORT)section )
-    {
-      case IMAGE_SYM_UNDEFINED: strcpy(tempbuffer, "UNDEF"); break;
-      case IMAGE_SYM_ABSOLUTE:  strcpy(tempbuffer, "ABS  "); break;
-      case IMAGE_SYM_DEBUG:	  strcpy(tempbuffer, "DEBUG"); break;
-      default: wsprintf(tempbuffer, "%-5X", section);
-    }
-	
-    strncpy(buffer, tempbuffer, cbBuffer-1);
-}
-
-/*
- *----------------------------------------------------------------------
- * DumpSymbolTable --
- *
- *	Dumps a COFF symbol table from an EXE or OBJ.  We only use
- *	it to dump tables from OBJs.
- *----------------------------------------------------------------------
- */
-void
-DumpSymbolTable(PIMAGE_SYMBOL pSymbolTable, FILE *fout, unsigned cSymbols)
-{
-    unsigned i;
-    PSTR stringTable;
-    char sectionName[10];
-	
-    fprintf(fout, "Symbol Table - %X entries  (* = auxillary symbol)\n",
-	    cSymbols);
-
-    fprintf(fout, 
-     "Indx Name                 Value    Section    cAux  Type    Storage\n"
-     "---- -------------------- -------- ---------- ----- ------- --------\n");
-
-    /*
-     * The string table apparently starts right after the symbol table
-     */
-    stringTable = (PSTR)&pSymbolTable[cSymbols]; 
-		
-    for ( i=0; i < cSymbols; i++ ) {
-	fprintf(fout, "%04X ", i);
-	if ( pSymbolTable->N.Name.Short != 0 )
-	    fprintf(fout, "%-20.8s", pSymbolTable->N.ShortName);
-	else
-	    fprintf(fout, "%-20s", stringTable + pSymbolTable->N.Name.Long);
-
-	fprintf(fout, " %08X", pSymbolTable->Value);
-
-	GetSectionName(pSymbolTable->SectionNumber, sectionName,
-		       sizeof(sectionName));
-	fprintf(fout, " sect:%s aux:%X type:%02X st:%s\n",
-	       sectionName,
-	       pSymbolTable->NumberOfAuxSymbols,
-	       pSymbolTable->Type,
-	       GetSZStorageClass(pSymbolTable->StorageClass) );
-#if 0
-	if ( pSymbolTable->NumberOfAuxSymbols )
-	    DumpAuxSymbols(pSymbolTable);
-#endif
-
-	/*
-	 * Take into account any aux symbols
-	 */
-	i += pSymbolTable->NumberOfAuxSymbols;
-	pSymbolTable += pSymbolTable->NumberOfAuxSymbols;
-	pSymbolTable++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- * DumpExternals --
- *
- *	Dumps a COFF symbol table from an EXE or OBJ.  We only use
- *	it to dump tables from OBJs.
- *----------------------------------------------------------------------
- */
-void
-DumpExternals(PIMAGE_SYMBOL pSymbolTable, FILE *fout, unsigned cSymbols)
-{
-    unsigned i;
-    PSTR stringTable;
-    char *s, *f;
-    char symbol[1024];
-	
-    /*
-     * The string table apparently starts right after the symbol table
-     */
-    stringTable = (PSTR)&pSymbolTable[cSymbols]; 
-		
-    for ( i=0; i < cSymbols; i++ ) {
-	if (pSymbolTable->SectionNumber > 0 && pSymbolTable->Type == 0x20) {
-	    if (pSymbolTable->StorageClass == IMAGE_SYM_CLASS_EXTERNAL) {
-		if (pSymbolTable->N.Name.Short != 0) {
-		    strncpy(symbol, pSymbolTable->N.ShortName, 8);
-		    symbol[8] = 0;
-		} else {
-		    s = stringTable + pSymbolTable->N.Name.Long;
-		    strcpy(symbol, s);
-		}
-		s = symbol;
-
-		/*
-		 * Skip to the last @ and ensure it is followed by digits,
-		 * otherwise it is probably part of a C++ mangled name.
-		 */
-
-		f = strrchr(s, '@');
-		if (f && f[1] >= '0' && f[1] <= '9') {
-		    *f = 0;
-		}
-#if defined(_MSC_VER) && defined(_X86_)
-		if (symbol[0] == '_') {
-		    s = &symbol[1];
-		}
-#endif
-		if ((stricmp(s, "DllEntryPoint") != 0) 
-			&& (stricmp(s, "DllMain") != 0)) {
-		    fprintf(fout, "\t%s\n", s);
-		}
-	    }
-	}
-
-	/*
-	 * Take into account any aux symbols
-	 */
-	i += pSymbolTable->NumberOfAuxSymbols;
-	pSymbolTable += pSymbolTable->NumberOfAuxSymbols;
-	pSymbolTable++;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- * DumpObjFile --
- *
- *	Dump an object file--either a full listing or just the exported
- *	symbols.
- *----------------------------------------------------------------------
- */
-void
-DumpObjFile(PIMAGE_FILE_HEADER pImageFileHeader, FILE *fout, int full)
-{
-    PIMAGE_SYMBOL PCOFFSymbolTable;
-    DWORD COFFSymbolCount;
-    
-    PCOFFSymbolTable = (PIMAGE_SYMBOL)
-	((DWORD)pImageFileHeader + pImageFileHeader->PointerToSymbolTable);
-    COFFSymbolCount = pImageFileHeader->NumberOfSymbols;
-
-    if (full) {
-	DumpSymbolTable(PCOFFSymbolTable, fout, COFFSymbolCount);
-    } else {
-	DumpExternals(PCOFFSymbolTable, fout, COFFSymbolCount);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- * SkipToNextRecord --
- *
- *	Skip over the current ROMF record and return the type of the
- *	next record.
- *----------------------------------------------------------------------
- */
-
-BYTE
-SkipToNextRecord(BYTE **ppBuffer)
-{
-    int length;
-    (*ppBuffer)++;		/* Skip over the type.*/
-    length = *((WORD*)(*ppBuffer))++; /* Retrieve the length. */
-    *ppBuffer += length;	/* Skip over the rest. */
-    return **ppBuffer;		/* Return the type. */
-}
-
-/*
- *----------------------------------------------------------------------
- * DumpROMFObjFile --
- *
- *	Dump a Relocatable Object Module Format file, displaying only
- *	the exported symbols.
- *----------------------------------------------------------------------
- */
-void
-DumpROMFObjFile(LPVOID pBuffer, FILE *fout)
-{
-    BYTE type, length;
-    char symbol[1024], *s;
-
-    while (1) {
-	type = SkipToNextRecord(&(BYTE*)pBuffer);
-	if (type == 0x90) {	/* PUBDEF */
-	    if (((BYTE*)pBuffer)[4] != 0) {
-		length = ((BYTE*)pBuffer)[5];
-		strncpy(symbol, ((char*)pBuffer) + 6, length);
-		symbol[length] = '\0';
-		s = symbol;
-		if ((stricmp(s, "DllEntryPoint") != 0) 
-			&& (stricmp(s, "DllMain") != 0)) {
-		    if (s[0] == '_') {
-			s++;
-			fprintf(fout, "\t_%s\n\t%s=_%s\n", s, s, s);
-		    } else {
-			fprintf(fout, "\t%s\n", s);
-		    }
-		}
-	    }
-	} else if (type == 0x8B || type == 0x8A) { /* MODEND */
-	    break;
-	}
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- * DumpFile --
- *
- *	Open up a file, memory map it, and call the appropriate
- *	dumping routine
- *----------------------------------------------------------------------
- */
-void
-DumpFile(LPSTR filename, FILE *fout, int full)
-{
-    HANDLE hFile;
-    HANDLE hFileMapping;
-    LPVOID lpFileBase;
-    PIMAGE_DOS_HEADER dosHeader;
-	
-    hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL,
-		       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-					
-    if (hFile == INVALID_HANDLE_VALUE) {
-	fprintf(stderr, "Couldn't open file with CreateFile()\n");
-	return;
-    }
-
-    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
-    if (hFileMapping == 0) {
-	CloseHandle(hFile);
-	fprintf(stderr, "Couldn't open file mapping with CreateFileMapping()\n");
-	return;
-    }
-
-    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);
-    if (lpFileBase == 0) {
-	CloseHandle(hFileMapping);
-	CloseHandle(hFile);
-	fprintf(stderr, "Couldn't map view of file with MapViewOfFile()\n");
-	return;
-    }
-
-    dosHeader = (PIMAGE_DOS_HEADER)lpFileBase;
-    if (dosHeader->e_magic == IMAGE_DOS_SIGNATURE) {
-#if 0
-	DumpExeFile( dosHeader );
-#else
-	fprintf(stderr, "File is an executable.  I don't dump those.\n");
-	return;
-#endif
-    }
-    /* Does it look like a i386 COFF OBJ file??? */
-    else if ((dosHeader->e_magic == e_magic_number)
-	    && (dosHeader->e_sp == 0)) {
-	/*
-	 * The two tests above aren't what they look like.  They're
-	 * really checking for IMAGE_FILE_HEADER.Machine == i386 (0x14C)
-	 * and IMAGE_FILE_HEADER.SizeOfOptionalHeader == 0;
-	 */
-	DumpObjFile((PIMAGE_FILE_HEADER) lpFileBase, fout, full);
-    } else if (*((BYTE *)lpFileBase) == 0x80) {
-	/*
-	 * This file looks like it might be a ROMF file.
-	 */
-	DumpROMFObjFile(lpFileBase, fout);
-    } else {
-	printf("unrecognized file format\n");
-    }
-    UnmapViewOfFile(lpFileBase);
-    CloseHandle(hFileMapping);
-    CloseHandle(hFile);
-}
-
-void
-main(int argc, char **argv)
-{
-    char *fargv[1000];
-    char cmdline[10000];
-    int i, arg;
-    FILE *fout;
-    int pos;
-    int full = 0;
-    char *outfile = NULL;
-
-    if (argc < 3) {
-      Usage:
-	fprintf(stderr, "Usage: %s ?-o outfile? ?-f(ull)? <dllname> <object filenames> ..\n", argv[0]);
-	exit(1);
-    }
-
-    arg = 1;
-    while (argv[arg][0] == '-') {
-	if (strcmp(argv[arg], "--") == 0) {
-	    arg++;
-	    break;
-	} else if (strcmp(argv[arg], "-f") == 0) {
-	    full = 1;
-	} else if (strcmp(argv[arg], "-o") == 0) {
-	    arg++;
-	    if (arg == argc) {
-		goto Usage;
-	    }
-	    outfile = argv[arg];
-	}
-	arg++;
-    }
-    if (arg == argc) {
-	goto Usage;
-    }
-
-    if (outfile) {
-	fout = fopen(outfile, "w+");
-	if (fout == NULL) {
-	    fprintf(stderr, "Unable to open \'%s\' for writing:\n",
-		    argv[arg]);
-	    perror("");
-	    exit(1);
-	}
-    } else {
-	fout = stdout;
-    }
-    
-    if (! full) {
-	char *dllname = argv[arg];
-	arg++;
-	if (arg == argc) {
-	    goto Usage;
-	}
-	fprintf(fout, "EXPORTS\n");
-    }
-
-    for (; arg < argc; arg++) {
-	if (argv[arg][0] == '@') {
-	    FILE *fargs = fopen(&argv[arg][1], "r");
-	    if (fargs == NULL) {
-		fprintf(stderr, "Unable to open \'%s\' for reading:\n",
-			argv[arg]);
-		perror("");
-		exit(1);
-	    }
-	    pos = 0;
-	    for (i = 0; i < arg; i++) {
-		strcpy(&cmdline[pos], argv[i]);
-		pos += strlen(&cmdline[pos]) + 1;
-		fargv[i] = argv[i];
-	    }
-	    fgets(&cmdline[pos], sizeof(cmdline), fargs);
-	    fprintf(stderr, "%s\n", &cmdline[pos]);
-	    fclose(fargs);
-	    i += GetArgcArgv(&cmdline[pos], &fargv[i]);
-	    argc = i;
-	    argv = fargv;
-	}
-	DumpFile(argv[arg], fout, full);
-    }
-    exit(0);
-}